diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-06-09 06:35:44 +0000 |
|---|---|---|
| committer | Android Partner Code Review <android-gerrit-partner@google.com> | 2023-06-09 06:35:44 +0000 |
| commit | 0fefbb70317ee5df7ba5c03a9be92191f7b870ee (patch) | |
| tree | ff690c682412264b67e0dcf7ba6939f4bbb19b43 | |
| parent | 00d2954a2693c7b4b4b3eb4d330f1182d768f4d1 (diff) | |
| parent | acc9e539bd81ebdfe4590322e1071dbd90321f3f (diff) | |
| download | bcm4398-0fefbb70317ee5df7ba5c03a9be92191f7b870ee.tar.gz | |
Merge "wifi: disable Multi-NVRAM/CLM support for Proto device." into android14-gs-pixel-5.15-udc-d1
| -rw-r--r-- | dhd_custom_google.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/dhd_custom_google.c b/dhd_custom_google.c index 6f29c56..a35e1f6 100644 --- a/dhd_custom_google.c +++ b/dhd_custom_google.c @@ -77,6 +77,7 @@ static int resched_streak = 0; static int resched_streak_max = 0; static uint64 last_resched_cnt_check_time_ns = 0; static uint64 last_affinity_update_time_ns = 0; +static uint hw_stage_val = 0; /* force to switch to small core at beginning */ static bool is_irq_on_big_core = TRUE; @@ -394,6 +395,11 @@ dhd_get_platform_naming_for_nvram_clmblob_file(download_type_t component, char * return BCME_ERROR; } + if(hw_stage_val < EVT) { + DHD_ERROR(("No multi-NVRAM/CLM support on Proto/Dev device\n")); + return BCME_ERROR; + } + if (component == NVRAM) { #ifdef DHD_LINUX_STD_FW_API nvram_clmblob_file = DHD_NVRAM_NAME; @@ -464,7 +470,7 @@ dhd_wlan_init_hardware_info(void) DHD_ERROR(("%s: Failed to get hw minor\n", __FUNCTION__)); goto exit; } - + hw_stage_val = hw_stage; switch (hw_stage) { case DEV: snprintf(val_revision, MAX_HW_INFO_LEN, "DEV%d.%d", |