gmac get mac form eeprom

hc

2024-05-10 37f49e37ab4cb5d0bc4c60eb5c6d4dd57db767bb

 kernel/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_linux_platdev.c
old mode 100644new mode 100755
..
..
@@ -42,6 +42,9 @@
42
42
 #else
43
43
 #include <dhd_plat.h>
44
44
 #endif /* CONFIG_WIFI_CONTROL_FUNC */
45
+#ifdef BCMDBUS
46
+#include <dbus.h>
47
+#endif
45
48
 #ifdef CONFIG_DTS
46
49
 #include<linux/regulator/consumer.h>
47
50
 #include<linux/of_gpio.h>
..
..
@@ -167,7 +170,7 @@
167
170
 		return NULL;
168
171
 	plat_data = adapter->wifi_plat_data;
169
172
 	if (plat_data->mem_prealloc) {
170
-#if defined(BCMDHD_MDRIVER) && !defined(DHD_STATIC_IN_DRIVER)
173
+#ifdef BCMDHD_MDRIVER
171
174
 		alloc_ptr = plat_data->mem_prealloc(adapter->bus_type, adapter->index, section, size);
172
175
 #else
173
176
 		alloc_ptr = plat_data->mem_prealloc(section, size);
..
..
@@ -566,7 +569,16 @@
566
569
 		return -ENOMEM;
567
570
 	}
568
571
 	adapter->name = "DHD generic adapter";
572
+	adapter->index = -1;
573
+#if defined(BCMDHD_MDRIVER) && !defined(DHD_STATIC_IN_DRIVER)
574
+#ifdef BCMSDIO
569
575
 	adapter->index = 0;
576
+#elif defined(BCMPCIE)
577
+	adapter->index = 1;
578
+#elif defined(BCMDBUS)
579
+	adapter->index = 2;
580
+#endif
581
+#endif
570
582
 	adapter->bus_type = -1;
571
583
 	adapter->bus_num = -1;
572
584
 	adapter->slot_num = -1;
..
..
@@ -759,11 +771,10 @@
759
771
 		err = dhd_bus_register();
760
772
 	} else {
761
773
 #ifdef DHD_SUPPORT_HDM
762
-		if (dhd_download_fw_on_driverload || hdm_trigger_init)
774
+		if (dhd_download_fw_on_driverload || hdm_trigger_init) {
763
775
 #else
764
-		if (dhd_download_fw_on_driverload)
776
+		if (dhd_download_fw_on_driverload) {
765
777
 #endif /* DHD_SUPPORT_HDM */
766
-		{
767
778
 			/* power up all adapters */
768
779
 			for (i = 0; i < dhd_wifi_platdata->num_adapters; i++) {
769
780
 				int retry = POWERUP_MAX_RETRY;
..
..
@@ -885,9 +896,7 @@
885
896
 	for (i = 0; i < dhd_wifi_platdata->num_adapters; i++) {
886
897
 		bool chip_up = FALSE;
887
898
 		int retry = POWERUP_MAX_RETRY;
888
-#ifndef DHD_INSMOD_NOWAIT
889
899
 		struct semaphore dhd_chipup_sem;
890
-#endif
891
900
 
892
901
 		adapter = &dhd_wifi_platdata->adapters[i];
893
902
 
..
..
@@ -898,18 +907,6 @@
898
907
 			adapter->bus_type, adapter->bus_num, adapter->slot_num));
899
908
 
900
909
 		do {
901
-#ifdef DHD_INSMOD_NOWAIT
902
-			err = wifi_platform_set_power(adapter, TRUE, WIFI_TURNON_DELAY);
903
-			if (err) {
904
-				DHD_ERROR(("%s: wifi pwr on error ! \n", __FUNCTION__));
905
-				wifi_platform_set_power(adapter, FALSE, WIFI_TURNOFF_DELAY);
906
-				continue;
907
-			} else {
908
-				wifi_platform_bus_enumerate(adapter, TRUE);
909
-				chip_up = TRUE;
910
-				break;
911
-			}
912
-#else
913
910
 			sema_init(&dhd_chipup_sem, 0);
914
911
 			err = dhd_bus_reg_sdio_notify(&dhd_chipup_sem);
915
912
 			if (err) {
..
..
@@ -938,7 +935,6 @@
938
935
 			dhd_bus_unreg_sdio_notify();
939
936
 			wifi_platform_set_power(adapter, FALSE, WIFI_TURNOFF_DELAY);
940
937
 			wifi_platform_bus_enumerate(adapter, FALSE);
941
-#endif
942
938
 		} while (retry--);
943
939
 
944
940
 		if (!chip_up) {
..
..
@@ -955,7 +951,6 @@
955
951
 		goto fail;
956
952
 	}
957
953
 
958
-#ifndef DHD_INSMOD_NOWAIT
959
954
 	/*
960
955
 	 * Wait till MMC sdio_register_driver callback called and made driver attach.
961
956
 	 * It's needed to make sync up exit from dhd insmod  and
..
..
@@ -967,7 +962,6 @@
967
962
 		dhd_bus_unregister();
968
963
 		goto fail;
969
964
 	}
970
-#endif
971
965
 
972
966
 	return err;
973
967
 
..
..
@@ -1000,6 +994,7 @@
1000
994
 	wifi_adapter_info_t *adapter;
1001
995
 	s32 timeout = -1;
1002
996
 	int i;
997
+	enum wifi_adapter_status wait_status;
1003
998
 #endif
1004
999
 
1005
1000
 #if !defined(DHD_PRELOAD)
..
..
@@ -1008,7 +1003,7 @@
1008
1003
 		adapter = &dhd_wifi_platdata->adapters[i];
1009
1004
 		wifi_platform_set_power(adapter, FALSE, 0);
1010
1005
 		if (err) {
1011
-			DHD_ERROR(("failed to wifi_platform_set_power off %s\n", adapter->name));
1006
+			DHD_ERROR(("failed to wifi_platform_set_power on %s\n", adapter->name));
1012
1007
 			goto exit;
1013
1008
 		}
1014
1009
 	}
..
..
@@ -1035,8 +1030,12 @@
1035
1030
 			DHD_ERROR(("failed to wifi_platform_set_power on %s\n", adapter->name));
1036
1031
 			goto fail;
1037
1032
 		}
1033
+		if (dhd_download_fw_on_driverload)
1034
+			wait_status = WIFI_STATUS_ATTACH;
1035
+		else
1036
+			wait_status = WIFI_STATUS_DETTACH;
1038
1037
 		timeout = wait_event_interruptible_timeout(adapter->status_event,
1039
-			wifi_get_adapter_status(adapter, WIFI_STATUS_NET_ATTACHED),
1038
+			wifi_get_adapter_status(adapter, wait_status),
1040
1039
 			msecs_to_jiffies(DHD_REGISTRATION_TIMEOUT));
1041
1040
 		if (timeout <= 0) {
1042
1041
 			err = -1;
..
..
@@ -1068,7 +1067,7 @@
1068
1067
 }
1069
1068
 #endif /* BCMDBUS */
1070
1069
 
1071
-static int dhd_wifi_platform_load()
1070
+static int dhd_wifi_platform_load(void)
1072
1071
 {
1073
1072
 	int err = 0;
1074
1073
 	printf("%s: Enter\n", __FUNCTION__);