Some devices provide the Wi-Fi MAC address through firmware instead of
storing a valid address in the chip efuse.

Try to read the MAC address from firmware before falling back to a
randomly generated address.

Signed-off-by: YuChia-Kan <raspberrykan@stu.hqu.edu.cn>
---
 drivers/net/wireless/realtek/rtw88/main.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/realtek/rtw88/main.c
index cd9254370fcc..b9d8e0f5d15e 100644
--- a/drivers/net/wireless/realtek/rtw88/main.c
+++ b/drivers/net/wireless/realtek/rtw88/main.c
@@ -2060,8 +2060,12 @@ static int rtw_chip_efuse_info_setup(struct rtw_dev *rtwdev)
 	efuse->ext_lna_5g = efuse->lna_type_5g & BIT(3) ? 1 : 0;
 
 	if (!is_valid_ether_addr(efuse->addr)) {
-		eth_random_addr(efuse->addr);
-		dev_warn(rtwdev->dev, "efuse MAC invalid, using random\n");
+		mac_ret = device_get_mac_address(rtwdev->dev, efuse->addr);
+		if (mac_ret) {
+			eth_random_addr(efuse->addr);
+			dev_warn(rtwdev->dev,
+				 "failed to get valid MAC address, using random\n");
+		}
 	}
 
 out_disable:
-- 
2.53.0

YuChia-Kan <raspberrykan@stu.hqu.edu.cn> wrote:
> Some devices provide the Wi-Fi MAC address through firmware instead of
> storing a valid address in the chip efuse.
> 
> Try to read the MAC address from firmware before falling back to a
> randomly generated address.

Please share the board and WiFi chip you are using.

> 
> Signed-off-by: YuChia-Kan <raspberrykan@stu.hqu.edu.cn>
> ---
>  drivers/net/wireless/realtek/rtw88/main.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/realtek/rtw88/main.c
> index cd9254370fcc..b9d8e0f5d15e 100644
> --- a/drivers/net/wireless/realtek/rtw88/main.c
> +++ b/drivers/net/wireless/realtek/rtw88/main.c
> @@ -2060,8 +2060,12 @@ static int rtw_chip_efuse_info_setup(struct rtw_dev *rtwdev)
>         efuse->ext_lna_5g = efuse->lna_type_5g & BIT(3) ? 1 : 0;
> 
>         if (!is_valid_ether_addr(efuse->addr)) {
> -               eth_random_addr(efuse->addr);
> -               dev_warn(rtwdev->dev, "efuse MAC invalid, using random\n");
> +               mac_ret = device_get_mac_address(rtwdev->dev, efuse->addr);

mac_ret isn't declared. 

> +               if (mac_ret) {
> +                       eth_random_addr(efuse->addr);
> +                       dev_warn(rtwdev->dev,
> +                                "failed to get valid MAC address, using random\n");
> +               }
>         }
> 
>  out_disable:
> --
> 2.53.0

Some devices provide the Wi-Fi MAC address through firmware instead of
storing a valid address in the chip efuse.

Try to read the MAC address from firmware before falling back to a
randomly generated address.

Signed-off-by: YuChia-Kan <raspberrykan@stu.hqu.edu.cn>
---
Changes in v2:
- Fix the undeclared mac_ret issue by checking
  device_get_mac_address() directly.

 drivers/net/wireless/realtek/rtw88/main.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/realtek/rtw88/main.c
index cd9254370fcc..0f23498b5c96 100644
--- a/drivers/net/wireless/realtek/rtw88/main.c
+++ b/drivers/net/wireless/realtek/rtw88/main.c
@@ -2060,8 +2060,11 @@ static int rtw_chip_efuse_info_setup(struct rtw_dev *rtwdev)
 	efuse->ext_lna_5g = efuse->lna_type_5g & BIT(3) ? 1 : 0;
 
 	if (!is_valid_ether_addr(efuse->addr)) {
-		eth_random_addr(efuse->addr);
-		dev_warn(rtwdev->dev, "efuse MAC invalid, using random\n");
+		if (device_get_mac_address(rtwdev->dev, efuse->addr)) {
+			eth_random_addr(efuse->addr);
+			dev_warn(rtwdev->dev,
+				 "failed to get valid MAC address, using random\n");
+		}
 	}
 
 out_disable:
-- 
2.53.0

Some devices provide the Wi-Fi MAC address through firmware instead of
storing a valid address in the Wi-Fi chip efuse.

This is the case on the Xiaomi Mi Box 4, which uses an Amlogic S905L
SoC and an RTL8723DS Wi-Fi chip. The Wi-Fi MAC address is stored in the
S905L efuse rather than the RTL8723DS efuse and is provided to the
device through firmware.

Try to read the MAC address from firmware before falling back to a
randomly generated address.

Signed-off-by: YuChia-Kan <raspberrykan@stu.hqu.edu.cn>
---
Changes in v3:
- Add Xiaomi Mi Box 4, Amlogic S905L and RTL8723DS hardware details
  to the commit message.

 drivers/net/wireless/realtek/rtw88/main.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/realtek/rtw88/main.c
index cd9254370fcc..0f23498b5c96 100644
--- a/drivers/net/wireless/realtek/rtw88/main.c
+++ b/drivers/net/wireless/realtek/rtw88/main.c
@@ -2060,8 +2060,11 @@ static int rtw_chip_efuse_info_setup(struct rtw_dev *rtwdev)
 	efuse->ext_lna_5g = efuse->lna_type_5g & BIT(3) ? 1 : 0;
 
 	if (!is_valid_ether_addr(efuse->addr)) {
-		eth_random_addr(efuse->addr);
-		dev_warn(rtwdev->dev, "efuse MAC invalid, using random\n");
+		if (device_get_mac_address(rtwdev->dev, efuse->addr)) {
+			eth_random_addr(efuse->addr);
+			dev_warn(rtwdev->dev,
+				 "failed to get valid MAC address, using random\n");
+		}
 	}
 
 out_disable:
-- 
2.53.0

YuChia-Kan <raspberrykan@stu.hqu.edu.cn> wrote:

> Some devices provide the Wi-Fi MAC address through firmware instead of
> storing a valid address in the Wi-Fi chip efuse.
> 
> This is the case on the Xiaomi Mi Box 4, which uses an Amlogic S905L
> SoC and an RTL8723DS Wi-Fi chip. The Wi-Fi MAC address is stored in the
> S905L efuse rather than the RTL8723DS efuse and is provided to the
> device through firmware.
> 
> Try to read the MAC address from firmware before falling back to a
> randomly generated address.
> 
> Signed-off-by: YuChia-Kan <raspberrykan@stu.hqu.edu.cn>

1 patch(es) applied to rtw-next branch of rtw.git, thanks.

e1c844ef72c0 wifi: rtw88: use firmware MAC address as fallback

---
https://github.com/pkshih/rtw.git

YuChia-Kan <raspberrykan@stu.hqu.edu.cn> wrote:
> Some devices provide the Wi-Fi MAC address through firmware instead of
> storing a valid address in the Wi-Fi chip efuse.
> 
> This is the case on the Xiaomi Mi Box 4, which uses an Amlogic S905L
> SoC and an RTL8723DS Wi-Fi chip. The Wi-Fi MAC address is stored in the
> S905L efuse rather than the RTL8723DS efuse and is provided to the
> device through firmware.
> 
> Try to read the MAC address from firmware before falling back to a
> randomly generated address.
> 
> Signed-off-by: YuChia-Kan <raspberrykan@stu.hqu.edu.cn>

Acked-by: Ping-Ke Shih <pkshih@realtek.com>