Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wifi: add new chip capability WIGIG

Browse Source 
Add a new chip capability WIGIG, for chips that
can operate on the 60GHz band. This capability is
mapped to the vendor HAL feature WIFI_FEATURE_INFRA_60G.

Bug: 147522435
Test: atest VtsHalWifiV1_0TargetTest VtsHalWifiNanV1_0TargetTest VtsHalWifiApV1_0TargetTest \
            VtsHalWifiV1_1TargetTest \
            VtsHalWifiV1_2TargetTest VtsHalWifiNanV1_2TargetTest \
            VtsHalWifiV1_3TargetTest \
            VtsHalWifiApV1_4TargetTest VtsHalWifiNanV1_4TargetTest VtsHalWifiRttV1_4TargetTest
Change-Id: I37b1121c62acadb621dca5e38671c78817f592e1
This commit is contained in:
Jimmy Chen
2019-12-23 17:53:40 +02:00
parent 5f9687319b
commit 1bdf1a79f4
18 changed files with 130 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wifi/1.0/vts/functional/Android.bp
View File

@@ -30,6 +30,8 @@ cc_library_static {
],
static_libs: [
"android.hardware.wifi@1.0",
"android.hardware.wifi@1.3",
"android.hardware.wifi@1.5",
"libwifi-system-iface",
],
}
@@ -49,6 +51,8 @@ cc_test {
"android.hardware.wifi@1.1",
"android.hardware.wifi@1.2",
"android.hardware.wifi@1.3",
"android.hardware.wifi@1.4",
"android.hardware.wifi@1.5",
"libwifi-system-iface",
],
test_suites: [

19
wifi/1.0/vts/functional/wifi_chip_hidl_test.cpp
View File

@@ -18,7 +18,6 @@
#include <android/hardware/wifi/1.0/IWifi.h>
#include <android/hardware/wifi/1.0/IWifiChip.h>
#include <android/hardware/wifi/1.3/IWifiChip.h>
#include <gtest/gtest.h>
#include <hidl/GtestPrinter.h>
#include <hidl/ServiceManagement.h>
@@ -94,23 +93,7 @@ class WifiChipHidlTest : public ::testing::TestWithParam<std::string> {
uint32_t configureChipForStaIfaceAndGetCapabilities() {
configureChipForIfaceType(IfaceType::STA, true);
sp<::android::hardware::wifi::V1_3::IWifiChip> chip_converted =
::android::hardware::wifi::V1_3::IWifiChip::castFrom(wifi_chip_);
std::pair<WifiStatus, uint32_t> status_and_caps;
if (chip_converted != nullptr) {
// Call the newer HAL version
status_and_caps = HIDL_INVOKE(chip_converted, getCapabilities_1_3);
} else {
status_and_caps = HIDL_INVOKE(wifi_chip_, getCapabilities);
}
if (status_and_caps.first.code != WifiStatusCode::SUCCESS) {
EXPECT_EQ(WifiStatusCode::ERROR_NOT_SUPPORTED, status_and_caps.first.code);
return 0;
}
return status_and_caps.second;
return getChipCapabilitiesLatest(wifi_chip_);
}
std::string getIfaceName(const sp<IWifiIface>& iface) {

23
wifi/1.0/vts/functional/wifi_hidl_test_utils.cpp
View File

@@ -16,6 +16,8 @@
#include <android/log.h>
#include <android/hardware/wifi/1.3/IWifiChip.h>
#include <android/hardware/wifi/1.5/IWifiChip.h>
#include <wifi_system/interface_tool.h>
#include "wifi_hidl_call_util.h"
@@ -208,3 +210,24 @@ void stopWifi(const std::string& instance_name) {
ASSERT_NE(wifi, nullptr);
HIDL_INVOKE(wifi, stop);
}
uint32_t getChipCapabilitiesLatest(const sp<IWifiChip>& wifi_chip) {
sp<::android::hardware::wifi::V1_5::IWifiChip> chip_converted15 =
::android::hardware::wifi::V1_5::IWifiChip::castFrom(wifi_chip);
sp<::android::hardware::wifi::V1_3::IWifiChip> chip_converted13 =
::android::hardware::wifi::V1_3::IWifiChip::castFrom(wifi_chip);
std::pair<WifiStatus, uint32_t> status_and_caps;
if (chip_converted15 != nullptr) {
// Call the newer HAL 1.5 version
status_and_caps = HIDL_INVOKE(chip_converted15, getCapabilities_1_5);
} else if (chip_converted13 != nullptr) {
// Call the newer HAL 1.3 version
status_and_caps = HIDL_INVOKE(chip_converted13, getCapabilities_1_3);
} else {
status_and_caps = HIDL_INVOKE(wifi_chip, getCapabilities);
}
EXPECT_EQ(WifiStatusCode::SUCCESS, status_and_caps.first.code);
return status_and_caps.second;
}

2
wifi/1.0/vts/functional/wifi_hidl_test_utils.h
View File

@@ -51,3 +51,5 @@ bool configureChipToSupportIfaceType(
android::hardware::wifi::V1_0::ChipModeId* configured_mode_id);
// Used to trigger IWifi.stop() at the end of every test.
void stopWifi(const std::string& instance_name);
uint32_t getChipCapabilitiesLatest(
const android::sp<android::hardware::wifi::V1_0::IWifiChip>& wifi_chip);

2
wifi/1.1/vts/functional/Android.bp
View File

@@ -26,6 +26,8 @@ cc_test {
"android.hardware.wifi@1.1",
"android.hardware.wifi@1.2",
"android.hardware.wifi@1.3",
"android.hardware.wifi@1.4",
"android.hardware.wifi@1.5",
"libwifi-system-iface",
],
test_suites: [

16
wifi/1.1/vts/functional/wifi_chip_hidl_test.cpp
View File

@@ -18,7 +18,6 @@
#include <android/hardware/wifi/1.1/IWifi.h>
#include <android/hardware/wifi/1.1/IWifiChip.h>
#include <android/hardware/wifi/1.3/IWifiChip.h>
#include <gtest/gtest.h>
#include <hidl/GtestPrinter.h>
#include <hidl/ServiceManagement.h>
@@ -64,20 +63,7 @@ class WifiChipHidlTest : public ::testing::TestWithParam<std::string> {
EXPECT_TRUE(configureChipToSupportIfaceType(
wifi_chip_, IfaceType::STA, &mode_id));
sp<::android::hardware::wifi::V1_3::IWifiChip> chip_converted =
::android::hardware::wifi::V1_3::IWifiChip::castFrom(wifi_chip_);
std::pair<WifiStatus, uint32_t> status_and_caps;
if (chip_converted != nullptr) {
// Call the newer HAL version
status_and_caps = HIDL_INVOKE(chip_converted, getCapabilities_1_3);
} else {
status_and_caps = HIDL_INVOKE(wifi_chip_, getCapabilities);
}
EXPECT_EQ(WifiStatusCode::SUCCESS, status_and_caps.first.code);
return status_and_caps.second;
return getChipCapabilitiesLatest(wifi_chip_);
}
sp<IWifiChip> wifi_chip_;

5
wifi/1.2/vts/functional/Android.bp
View File

@@ -27,6 +27,8 @@ cc_test {
"android.hardware.wifi@1.1",
"android.hardware.wifi@1.2",
"android.hardware.wifi@1.3",
"android.hardware.wifi@1.4",
"android.hardware.wifi@1.5",
"libwifi-system-iface",
],
disable_framework: true,
@@ -47,6 +49,9 @@ cc_test {
"android.hardware.wifi@1.0",
"android.hardware.wifi@1.1",
"android.hardware.wifi@1.2",
"android.hardware.wifi@1.3",
"android.hardware.wifi@1.4",
"android.hardware.wifi@1.5",
"libwifi-system-iface",
],
test_suites: [

15
wifi/1.2/vts/functional/wifi_chip_hidl_test.cpp
View File

@@ -111,20 +111,7 @@ class WifiChipHidlTest : public ::testing::TestWithParam<std::string> {
EXPECT_TRUE(
configureChipToSupportIfaceType(wifi_chip_, IfaceType::STA, &mode_id));
sp<::android::hardware::wifi::V1_3::IWifiChip> chip_converted =
::android::hardware::wifi::V1_3::IWifiChip::castFrom(wifi_chip_);
std::pair<WifiStatus, uint32_t> status_and_caps;
if (chip_converted != nullptr) {
// Call the newer HAL version
status_and_caps = HIDL_INVOKE(chip_converted, getCapabilities_1_3);
} else {
status_and_caps = HIDL_INVOKE(wifi_chip_, getCapabilities);
}
EXPECT_EQ(WifiStatusCode::SUCCESS, status_and_caps.first.code);
return status_and_caps.second;
return getChipCapabilitiesLatest(wifi_chip_);
}
sp<IWifiChip> wifi_chip_;

9
wifi/1.3/vts/functional/Android.bp
View File

@@ -27,8 +27,13 @@ cc_test {
"android.hardware.wifi@1.1",
"android.hardware.wifi@1.2",
"android.hardware.wifi@1.3",
"libwifi-system-iface"
"android.hardware.wifi@1.4",
"android.hardware.wifi@1.5",
"libwifi-system-iface",
],
disable_framework: true,
test_suites: ["general-tests", "vts"],
test_suites: [
"general-tests",
"vts",
],
}

5
wifi/1.3/vts/functional/wifi_chip_hidl_test.cpp
View File

@@ -68,10 +68,7 @@ class WifiChipHidlTest : public ::testing::TestWithParam<std::string> {
ChipModeId mode_id;
EXPECT_TRUE(configureChipToSupportIfaceType(wifi_chip_, IfaceType::STA,
&mode_id));
const auto& status_and_caps =
HIDL_INVOKE(wifi_chip_, getCapabilities_1_3);
EXPECT_EQ(WifiStatusCode::SUCCESS, status_and_caps.first.code);
return status_and_caps.second;
return getChipCapabilitiesLatest(wifi_chip_);
}
sp<IWifiChip> wifi_chip_;

1
wifi/1.5/Android.bp
View File

@@ -5,6 +5,7 @@ hidl_interface {
root: "android.hardware",
srcs: [
"IWifi.hal",
"IWifiChip.hal",
],
interfaces: [
"android.hardware.wifi@1.0",

51
wifi/1.5/IWifiChip.hal Normal file
View File

@@ -0,0 +1,51 @@
/*
* Copyright 2020 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.hardware.wifi@1.5;
import @1.0::WifiStatus;
import @1.0::IWifiIface;
import @1.3::IWifiChip;
import @1.4::IWifiChip;
/**
* Interface that represents a chip that must be configured as a single unit.
*/
interface IWifiChip extends @1.4::IWifiChip {
/**
* Capabilities exposed by this chip.
*/
enum ChipCapabilityMask : @1.3::IWifiChip.ChipCapabilityMask {
/**
* chip can operate in the 60GHz band(WiGig chip)
*/
WIGIG = 1 << 14,
};
/**
* Get the capabilities supported by this chip.
*
* @return status WifiStatus of the operation.
* Possible status codes:
* |WifiStatusCode.SUCCESS|,
* |WifiStatusCode.ERROR_WIFI_CHIP_INVALID|,
* |WifiStatusCode.ERROR_NOT_AVAILABLE|,
* |WifiStatusCode.ERROR_UNKNOWN|
* @return capabilities Bitset of |ChipCapabilityMask| values.
*/
getCapabilities_1_5()
generates (WifiStatus status, bitfield<ChipCapabilityMask> capabilities);
};

13
wifi/1.5/default/hidl_struct_util.cpp
View File

@@ -69,9 +69,9 @@ convertLegacyLoggerFeatureToHidlStaIfaceCapability(uint32_t feature) {
return {};
}
V1_3::IWifiChip::ChipCapabilityMask convertLegacyFeatureToHidlChipCapability(
uint32_t feature) {
using HidlChipCaps = V1_3::IWifiChip::ChipCapabilityMask;
V1_5::IWifiChip::ChipCapabilityMask convertLegacyFeatureToHidlChipCapability(
uint64_t feature) {
using HidlChipCaps = V1_5::IWifiChip::ChipCapabilityMask;
switch (feature) {
case WIFI_FEATURE_SET_TX_POWER_LIMIT:
return HidlChipCaps::SET_TX_POWER_LIMIT;
@@ -81,6 +81,8 @@ V1_3::IWifiChip::ChipCapabilityMask convertLegacyFeatureToHidlChipCapability(
return HidlChipCaps::D2D_RTT;
case WIFI_FEATURE_D2AP_RTT:
return HidlChipCaps::D2AP_RTT;
case WIFI_FEATURE_INFRA_60G:
return HidlChipCaps::WIGIG;
case WIFI_FEATURE_SET_LATENCY_MODE:
return HidlChipCaps::SET_LATENCY_MODE;
case WIFI_FEATURE_P2P_RAND_MAC:
@@ -126,7 +128,7 @@ convertLegacyFeatureToHidlStaIfaceCapability(uint64_t feature) {
}
bool convertLegacyFeaturesToHidlChipCapabilities(
uint32_t legacy_feature_set, uint32_t legacy_logger_feature_set,
uint64_t legacy_feature_set, uint32_t legacy_logger_feature_set,
uint32_t* hidl_caps) {
if (!hidl_caps) {
return false;
@@ -143,10 +145,11 @@ bool convertLegacyFeaturesToHidlChipCapabilities(
convertLegacyLoggerFeatureToHidlChipCapability(feature);
}
}
std::vector<uint32_t> features = {WIFI_FEATURE_SET_TX_POWER_LIMIT,
std::vector<uint64_t> features = {WIFI_FEATURE_SET_TX_POWER_LIMIT,
WIFI_FEATURE_USE_BODY_HEAD_SAR,
WIFI_FEATURE_D2D_RTT,
WIFI_FEATURE_D2AP_RTT,
WIFI_FEATURE_INFRA_60G,
WIFI_FEATURE_SET_LATENCY_MODE,
WIFI_FEATURE_P2P_RAND_MAC};
for (const auto feature : features) {

4
wifi/1.5/default/hidl_struct_util.h
View File

@@ -22,10 +22,10 @@
#include <android/hardware/wifi/1.0/IWifiChip.h>
#include <android/hardware/wifi/1.0/types.h>
#include <android/hardware/wifi/1.2/types.h>
#include <android/hardware/wifi/1.3/IWifiChip.h>
#include <android/hardware/wifi/1.3/types.h>
#include <android/hardware/wifi/1.4/IWifiChipEventCallback.h>
#include <android/hardware/wifi/1.4/types.h>
#include <android/hardware/wifi/1.5/IWifiChip.h>
#include "wifi_legacy_hal.h"
@@ -45,7 +45,7 @@ using namespace android::hardware::wifi::V1_0;
// Chip conversion methods.
bool convertLegacyFeaturesToHidlChipCapabilities(
uint32_t legacy_feature_set, uint32_t legacy_logger_feature_set,
uint64_t legacy_feature_set, uint32_t legacy_logger_feature_set,
uint32_t* hidl_caps);
bool convertLegacyDebugRingBufferStatusToHidl(
const legacy_hal::wifi_ring_buffer_status& legacy_status,

14
wifi/1.5/default/wifi_chip.cpp
View File

@@ -628,6 +628,13 @@ Return<void> WifiChip::getCapabilities_1_3(getCapabilities_cb hidl_status_cb) {
hidl_status_cb);
}
Return<void> WifiChip::getCapabilities_1_5(
getCapabilities_1_5_cb hidl_status_cb) {
return validateAndCall(this, WifiStatusCode::ERROR_WIFI_CHIP_INVALID,
&WifiChip::getCapabilitiesInternal_1_5,
hidl_status_cb);
}
Return<void> WifiChip::debug(const hidl_handle& handle,
const hidl_vec<hidl_string>&) {
if (handle != nullptr && handle->numFds >= 1) {
@@ -1237,8 +1244,13 @@ WifiStatus WifiChip::selectTxPowerScenarioInternal_1_2(
}
std::pair<WifiStatus, uint32_t> WifiChip::getCapabilitiesInternal_1_3() {
// Deprecated support for this callback.
return {createWifiStatus(WifiStatusCode::ERROR_NOT_SUPPORTED), 0};
}
std::pair<WifiStatus, uint32_t> WifiChip::getCapabilitiesInternal_1_5() {
legacy_hal::wifi_error legacy_status;
uint32_t legacy_feature_set;
uint64_t legacy_feature_set;
uint32_t legacy_logger_feature_set;
const auto ifname = getFirstActiveWlanIfaceName();
std::tie(legacy_status, legacy_feature_set) =

7
wifi/1.5/default/wifi_chip.h
View File

@@ -22,8 +22,8 @@
#include <mutex>
#include <android-base/macros.h>
#include <android/hardware/wifi/1.4/IWifiChip.h>
#include <android/hardware/wifi/1.4/IWifiRttController.h>
#include <android/hardware/wifi/1.5/IWifiChip.h>
#include "hidl_callback_util.h"
#include "ringbuffer.h"
@@ -48,7 +48,7 @@ using namespace android::hardware::wifi::V1_0;
* Since there is only a single chip instance used today, there is no
* identifying handle information stored here.
*/
class WifiChip : public V1_4::IWifiChip {
class WifiChip : public V1_5::IWifiChip {
public:
WifiChip(ChipId chip_id, bool is_primary,
const std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal,
@@ -153,6 +153,8 @@ class WifiChip : public V1_4::IWifiChip {
selectTxPowerScenario_cb hidl_status_cb) override;
Return<void> getCapabilities_1_3(
getCapabilities_cb hidl_status_cb) override;
Return<void> getCapabilities_1_5(
getCapabilities_1_5_cb hidl_status_cb) override;
Return<void> debug(const hidl_handle& handle,
const hidl_vec<hidl_string>& options) override;
Return<void> createRttController_1_4(
@@ -226,6 +228,7 @@ class WifiChip : public V1_4::IWifiChip {
const sp<V1_2::IWifiChipEventCallback>& event_callback);
WifiStatus selectTxPowerScenarioInternal_1_2(TxPowerScenario scenario);
std::pair<WifiStatus, uint32_t> getCapabilitiesInternal_1_3();
std::pair<WifiStatus, uint32_t> getCapabilitiesInternal_1_5();
std::pair<WifiStatus, sp<V1_4::IWifiRttController>>
createRttControllerInternal_1_4(const sp<IWifiIface>& bound_iface);
WifiStatus registerEventCallbackInternal_1_4(

4
wifi/1.5/default/wifi_legacy_hal.cpp
View File

@@ -486,7 +486,7 @@ WifiLegacyHal::requestFirmwareMemoryDump(const std::string& iface_name) {
return {status, std::move(firmware_dump)};
}
std::pair<wifi_error, uint32_t> WifiLegacyHal::getSupportedFeatureSet(
std::pair<wifi_error, uint64_t> WifiLegacyHal::getSupportedFeatureSet(
const std::string& iface_name) {
feature_set set = 0, chip_set = 0;
wifi_error status = WIFI_SUCCESS;
@@ -502,7 +502,7 @@ std::pair<wifi_error, uint32_t> WifiLegacyHal::getSupportedFeatureSet(
status = global_func_table_.wifi_get_supported_feature_set(iface_handle,
&set);
}
return {status, static_cast<uint32_t>(set | chip_set)};
return {status, static_cast<uint64_t>(set | chip_set)};
}
std::pair<wifi_error, PacketFilterCapabilities>

2
wifi/1.5/default/wifi_legacy_hal.h
View File

@@ -196,7 +196,7 @@ class WifiLegacyHal {
const std::string& iface_name);
std::pair<wifi_error, std::vector<uint8_t>> requestFirmwareMemoryDump(
const std::string& iface_name);
std::pair<wifi_error, uint32_t> getSupportedFeatureSet(
std::pair<wifi_error, uint64_t> getSupportedFeatureSet(
const std::string& iface_name);
// APF functions.
std::pair<wifi_error, PacketFilterCapabilities> getPacketFilterCapabilities(