Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit feec85fc authored by Gabriel Biren's avatar Gabriel Biren Committed by Android (Google) Code Review
Browse files

Merge changes I86e0c465,I537588c4 

* changes:
  Remove any references to DEBUG_ capabilities in the Vendor HAL service.
  Remove DEBUG_ capabilities from ChipCapabilityMask.
parents 968ba124 bff0e408

wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/IWifiChip.aidl

+16 −24
Original line number Diff line number Diff line
@@ -85,22 +85,14 @@ interface IWifiChip { 
  const int NO_POWER_CAP_CONSTANT = 0x7FFFFFFF;

  @Backing(type="int") @VintfStability

  enum ChipCapabilityMask {

    DEBUG_MEMORY_FIRMWARE_DUMP = (1 << 0),

    DEBUG_MEMORY_DRIVER_DUMP = (1 << 1),

    DEBUG_RING_BUFFER_CONNECT_EVENT = (1 << 2),

    DEBUG_RING_BUFFER_POWER_EVENT = (1 << 3),

    DEBUG_RING_BUFFER_WAKELOCK_EVENT = (1 << 4),

    DEBUG_RING_BUFFER_VENDOR_DATA = (1 << 5),

    DEBUG_HOST_WAKE_REASON_STATS = (1 << 6),

    DEBUG_ERROR_ALERTS = (1 << 7),

    SET_TX_POWER_LIMIT = (1 << 8),

    D2D_RTT = (1 << 9),

    D2AP_RTT = (1 << 10),

    USE_BODY_HEAD_SAR = (1 << 11),

    SET_LATENCY_MODE = (1 << 12),

    P2P_RAND_MAC = (1 << 13),

    WIGIG = (1 << 14),

    SET_AFC_CHANNEL_ALLOWANCE = (1 << 15),

    SET_TX_POWER_LIMIT = (1 << 0) /* 1 */,

    D2D_RTT = (1 << 1) /* 2 */,

    D2AP_RTT = (1 << 2) /* 4 */,

    USE_BODY_HEAD_SAR = (1 << 3) /* 8 */,

    SET_LATENCY_MODE = (1 << 4) /* 16 */,

    P2P_RAND_MAC = (1 << 5) /* 32 */,

    WIGIG = (1 << 6) /* 64 */,

    SET_AFC_CHANNEL_ALLOWANCE = (1 << 7) /* 128 */,

  }

  @VintfStability

  parcelable ChipConcurrencyCombinationLimit {
@@ -132,9 +124,9 @@ interface IWifiChip { 
  }

  @Backing(type="int") @VintfStability

  enum CoexRestriction {

    WIFI_DIRECT = (1 << 0),

    SOFTAP = (1 << 1),

    WIFI_AWARE = (1 << 2),

    WIFI_DIRECT = (1 << 0) /* 1 */,

    SOFTAP = (1 << 1) /* 2 */,

    WIFI_AWARE = (1 << 2) /* 4 */,

  }

  @VintfStability

  parcelable CoexUnsafeChannel {
@@ -162,13 +154,13 @@ interface IWifiChip { 
  }

  @Backing(type="int") @VintfStability

  enum UsableChannelFilter {

    CELLULAR_COEXISTENCE = (1 << 0),

    CONCURRENCY = (1 << 1),

    NAN_INSTANT_MODE = (1 << 2),

    CELLULAR_COEXISTENCE = (1 << 0) /* 1 */,

    CONCURRENCY = (1 << 1) /* 2 */,

    NAN_INSTANT_MODE = (1 << 2) /* 4 */,

  }

  @Backing(type="int") @VintfStability

  enum ChannelCategoryMask {

    INDOOR_CHANNEL = (1 << 0),

    DFS_CHANNEL = (1 << 1),

    INDOOR_CHANNEL = (1 << 0) /* 1 */,

    DFS_CHANNEL = (1 << 1) /* 2 */,

  }

}

wifi/aidl/android/hardware/wifi/IWifiChip.aidl

+8 −42
Original line number Diff line number Diff line
@@ -45,72 +45,39 @@ interface IWifiChip { 
    @VintfStability

    @Backing(type="int")

    enum ChipCapabilityMask {

        /**

         * Memory dump of Firmware.

         */

        DEBUG_MEMORY_FIRMWARE_DUMP = 1 << 0,

        /**

         * Memory dump of Driver.

         */

        DEBUG_MEMORY_DRIVER_DUMP = 1 << 1,

        /**

         * Connectivity events reported via debug ring buffer.

         */

        DEBUG_RING_BUFFER_CONNECT_EVENT = 1 << 2,

        /**

         * Power events reported via debug ring buffer.

         */

        DEBUG_RING_BUFFER_POWER_EVENT = 1 << 3,

        /**

         * Wakelock events reported via debug ring buffer.

         */

        DEBUG_RING_BUFFER_WAKELOCK_EVENT = 1 << 4,

        /**

         * Vendor data reported via debug ring buffer.

         * This mostly contains firmware event logs.

         */

        DEBUG_RING_BUFFER_VENDOR_DATA = 1 << 5,

        /**

         * Host wake reasons stats collection.

         */

        DEBUG_HOST_WAKE_REASON_STATS = 1 << 6,

        /**

         * Error alerts.

         */

        DEBUG_ERROR_ALERTS = 1 << 7,

        /**

         * Set/Reset Tx Power limits.

         */

        SET_TX_POWER_LIMIT = 1 << 8,

        SET_TX_POWER_LIMIT = 1 << 0,

        /**

         * Device to Device RTT.

         */

        D2D_RTT = 1 << 9,

        D2D_RTT = 1 << 1,

        /**

         * Device to AP RTT.

         */

        D2AP_RTT = 1 << 10,

        D2AP_RTT = 1 << 2,

        /**

         * Set/Reset Tx Power limits.

         */

        USE_BODY_HEAD_SAR = 1 << 11,

        USE_BODY_HEAD_SAR = 1 << 3,

        /**

         * Set Latency Mode.

         */

        SET_LATENCY_MODE = 1 << 12,

        SET_LATENCY_MODE = 1 << 4,

        /**

         * Support P2P MAC randomization.

         */

        P2P_RAND_MAC = 1 << 13,

        P2P_RAND_MAC = 1 << 5,

        /**

         * Chip can operate in the 60GHz band (WiGig chip).

         */

        WIGIG = 1 << 14,

        WIGIG = 1 << 6,

        /**

         * Chip supports setting allowed channels along with PSD in 6GHz band

         * for AFC purposes.

         */

        SET_AFC_CHANNEL_ALLOWANCE = 1 << 15,

        SET_AFC_CHANNEL_ALLOWANCE = 1 << 7,

    }



    /**
@@ -540,7 +507,6 @@ interface IWifiChip { 
     * API to enable/disable alert notifications from the chip.

     * These alerts must be used to notify the framework of any fatal error events

     * that the chip encounters via |IWifiChipEventCallback.onDebugErrorAlert| method.

     * Must fail if |ChipCapabilityMask.DEBUG_ERROR_ALERTS| is not set.

     *

     * @param enable true to enable, false to disable.

     * @throws ServiceSpecificException with one of the following values:

wifi/aidl/default/aidl_struct_util.cpp

+1 −37
Original line number Diff line number Diff line
@@ -41,23 +41,6 @@ inline std::vector<int32_t> uintToIntVec(const std::vector<uint32_t>& in) { 
    return std::vector<int32_t>(in.begin(), in.end());

}



IWifiChip::ChipCapabilityMask convertLegacyLoggerFeatureToAidlChipCapability(uint32_t feature) {

    switch (feature) {

        case legacy_hal::WIFI_LOGGER_MEMORY_DUMP_SUPPORTED:

            return IWifiChip::ChipCapabilityMask::DEBUG_MEMORY_FIRMWARE_DUMP;

        case legacy_hal::WIFI_LOGGER_DRIVER_DUMP_SUPPORTED:

            return IWifiChip::ChipCapabilityMask::DEBUG_MEMORY_DRIVER_DUMP;

        case legacy_hal::WIFI_LOGGER_CONNECT_EVENT_SUPPORTED:

            return IWifiChip::ChipCapabilityMask::DEBUG_RING_BUFFER_CONNECT_EVENT;

        case legacy_hal::WIFI_LOGGER_POWER_EVENT_SUPPORTED:

            return IWifiChip::ChipCapabilityMask::DEBUG_RING_BUFFER_POWER_EVENT;

        case legacy_hal::WIFI_LOGGER_WAKE_LOCK_SUPPORTED:

            return IWifiChip::ChipCapabilityMask::DEBUG_RING_BUFFER_WAKELOCK_EVENT;

    };

    CHECK(false) << "Unknown legacy feature: " << feature;

    return {};

}



IWifiStaIface::StaIfaceCapabilityMask convertLegacyLoggerFeatureToAidlStaIfaceCapability(

        uint32_t feature) {

    switch (feature) {
@@ -125,23 +108,11 @@ IWifiStaIface::StaIfaceCapabilityMask convertLegacyFeatureToAidlStaIfaceCapabili 
    return {};

}



bool convertLegacyFeaturesToAidlChipCapabilities(uint64_t legacy_feature_set,

                                                 uint32_t legacy_logger_feature_set,

                                                 uint32_t* aidl_caps) {

bool convertLegacyFeaturesToAidlChipCapabilities(uint64_t legacy_feature_set, uint32_t* aidl_caps) {

    if (!aidl_caps) {

        return false;

    }

    *aidl_caps = {};

    for (const auto feature : {legacy_hal::WIFI_LOGGER_MEMORY_DUMP_SUPPORTED,

                               legacy_hal::WIFI_LOGGER_DRIVER_DUMP_SUPPORTED,

                               legacy_hal::WIFI_LOGGER_CONNECT_EVENT_SUPPORTED,

                               legacy_hal::WIFI_LOGGER_POWER_EVENT_SUPPORTED,

                               legacy_hal::WIFI_LOGGER_WAKE_LOCK_SUPPORTED}) {

        if (feature & legacy_logger_feature_set) {

            *aidl_caps |=

                    static_cast<uint32_t>(convertLegacyLoggerFeatureToAidlChipCapability(feature));

        }

    }

    std::vector<uint64_t> features = {WIFI_FEATURE_SET_TX_POWER_LIMIT,

                                      WIFI_FEATURE_USE_BODY_HEAD_SAR,

                                      WIFI_FEATURE_D2D_RTT,
@@ -156,13 +127,6 @@ bool convertLegacyFeaturesToAidlChipCapabilities(uint64_t legacy_feature_set, 
        }

    }



    // There are no flags for these 3 in the legacy feature set. Adding them to

    // the set because all the current devices support it.

    *aidl_caps |=

            static_cast<uint32_t>(IWifiChip::ChipCapabilityMask::DEBUG_RING_BUFFER_VENDOR_DATA);

    *aidl_caps |=

            static_cast<uint32_t>(IWifiChip::ChipCapabilityMask::DEBUG_HOST_WAKE_REASON_STATS);

    *aidl_caps |= static_cast<uint32_t>(IWifiChip::ChipCapabilityMask::DEBUG_ERROR_ALERTS);

    return true;

}

wifi/aidl/default/aidl_struct_util.h

+1 −3
Original line number Diff line number Diff line
@@ -37,9 +37,7 @@ namespace wifi { 
namespace aidl_struct_util {



// Chip conversion methods.

bool convertLegacyFeaturesToAidlChipCapabilities(uint64_t legacy_feature_set,

                                                 uint32_t legacy_logger_feature_set,

                                                 uint32_t* aidl_caps);

bool convertLegacyFeaturesToAidlChipCapabilities(uint64_t legacy_feature_set, uint32_t* aidl_caps);

bool convertLegacyDebugRingBufferStatusToAidl(

        const legacy_hal::wifi_ring_buffer_status& legacy_status,

        WifiDebugRingBufferStatus* aidl_status);

wifi/aidl/default/tests/aidl_struct_util_unit_tests.cpp

+3 −9
Original line number Diff line number Diff line
@@ -661,18 +661,12 @@ TEST_F(AidlStructUtilTest, CanConvertLegacyFeaturesToAidl) { 
    using AidlChipCaps = IWifiChip::ChipCapabilityMask;



    uint32_t aidl_caps;



    uint32_t legacy_feature_set = WIFI_FEATURE_D2D_RTT | WIFI_FEATURE_SET_LATENCY_MODE;

    uint32_t legacy_logger_feature_set = legacy_hal::WIFI_LOGGER_DRIVER_DUMP_SUPPORTED;



    ASSERT_TRUE(aidl_struct_util::convertLegacyFeaturesToAidlChipCapabilities(

            legacy_feature_set, legacy_logger_feature_set, &aidl_caps));

    ASSERT_TRUE(aidl_struct_util::convertLegacyFeaturesToAidlChipCapabilities(legacy_feature_set,

                                                                              &aidl_caps));



    EXPECT_EQ((uint32_t)AidlChipCaps::DEBUG_RING_BUFFER_VENDOR_DATA |

                      (uint32_t)AidlChipCaps::DEBUG_HOST_WAKE_REASON_STATS |

                      (uint32_t)AidlChipCaps::DEBUG_ERROR_ALERTS | (uint32_t)AidlChipCaps::D2D_RTT |

                      (uint32_t)AidlChipCaps::SET_LATENCY_MODE |

                      (uint32_t)AidlChipCaps::DEBUG_MEMORY_DRIVER_DUMP,

    EXPECT_EQ((uint32_t)AidlChipCaps::D2D_RTT | (uint32_t)AidlChipCaps::SET_LATENCY_MODE,

              aidl_caps);

}