wifi: rtl8xxxu: Don't print the vendor/product/serial
PATCH 1/3 wifi: rtl8xxxu: Don't print the vendor/product/serial
Most devices have a vendor name, product name, and serial number in the efuse, but it's pretty useless. It duplicates the information already printed by the USB subsystem:
usb 1-4: New USB device found, idVendor=0bda, idProduct=8178, bcdDevice= 2.00 usb 1-4: New USB device strings: Mfr=1, Product=2, SerialNumber=3 usb 1-4: Product: 802.11n WLAN Adapter
usb 1-4: Manufacturer: Realtek
usb 1-4: SerialNumber: 00e04c000001
-> usb 1-4: Vendor: Realtek
-> usb 1-4: Product: 802.11n WLAN Adapter
usb 1-4: New USB device found, idVendor=0bda, idProduct=818b, bcdDevice= 2.00 usb 1-4: New USB device strings: Mfr=1, Product=2, SerialNumber=3 usb 1-4: Product: 802.11n NIC
usb 1-4: Manufacturer: Realtek
usb 1-4: SerialNumber: 00e04c000001
-> usb 1-4: Vendor: Realtek
-> usb 1-4: Product: 802.11n NIC
-> usb 1-4: Serial not available.
usb 1-4: New USB device found, idVendor=0bda, idProduct=f179, bcdDevice= 0.00 usb 1-4: New USB device strings: Mfr=1, Product=2, SerialNumber=3 usb 1-4: Product: 802.11n
usb 1-4: Manufacturer: Realtek
usb 1-4: SerialNumber: 002E2DC0041F
-> usb 1-4: Vendor: Realtek
-> usb 1-4: Product: 802.11n
usb 1-4: New USB device found, idVendor=0bda, idProduct=8179, bcdDevice= 0.00 usb 1-4: New USB device strings: Mfr=1, Product=2, SerialNumber=3 usb 1-4: Product: 802.11n NIC
usb 1-4: Manufacturer: Realtek
usb 1-4: SerialNumber: 00E04C0001
-> usb 1-4: Vendor: Realtek
-> usb 1-4: Product: 802.11n NIC
-> usb 1-4: Serial: 00E04C0001
Also, that data is not interpreted correctly in all cases:
usb 3-1.1.2: New USB device found, idVendor=0bda, idProduct=8179, bcdDevice= 0.00 usb 3-1.1.2: New USB device strings: Mfr=1, Product=2, SerialNumber=3 usb 3-1.1.2: Product: 802.11n NIC
usb 3-1.1.2: Manufacturer: Realtek
usb 3-1.1.2: Vendor: Realtek
usb 3-1.1.2: Product: \x03802.11n NI
usb 3-1.1.2: Serial: \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff
--- .../realtek/rtl8xxxu/rtl8xxxu_8188e.c | 4 -- .../realtek/rtl8xxxu/rtl8xxxu_8188f.c | 3 -- .../realtek/rtl8xxxu/rtl8xxxu_8192c.c | 5 -- .../realtek/rtl8xxxu/rtl8xxxu_8192e.c | 54 ------------------- .../realtek/rtl8xxxu/rtl8xxxu_8723a.c | 4 -- .../realtek/rtl8xxxu/rtl8xxxu_8723b.c | 3 -- 6 files changed, 73 deletions(-)
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c +0 -4
@@ -568,10 +568,6 @@ static int rtl8188eu_parse_efuse(struct rtl8xxxu_priv *priv) priv->default_crystal_cap = efuse->xtal_k &0x3f ; -dev_info (&priv->udev->dev,"Vendor: %.7s\n" , efuse->vendor_name); -dev_info (&priv->udev->dev,"Product: %.11s\n" , efuse->device_name); -dev_info (&priv->udev->dev,"Serial: %.11s\n" , efuse->serial); -return 0 ; }
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c +0 -3
@@ -734,9 +734,6 @@ static int rtl8188fu_parse_efuse(struct rtl8xxxu_priv *priv) priv->default_crystal_cap = efuse->xtal_k &0x3f ; -dev_info (&priv->udev->dev,"Vendor: %.7s\n" , efuse->vendor_name); -dev_info (&priv->udev->dev,"Product: %.7s\n" , efuse->device_name); -return 0 ; }
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c +0 -5
@@ -441,11 +441,6 @@ static int rtl8192cu_parse_efuse(struct rtl8xxxu_priv *priv) efuse->ht20_max_power_offset, sizeof(efuse->ht20_max_power_offset)); -dev_info (&priv->udev->dev,"Vendor: %.7s\n" , - efuse->vendor_name); -dev_info (&priv->udev->dev,"Product: %.20s\n" , - efuse->device_name); - priv->power_base = &rtl8192c_power_base;if (efuse->rf_regulatory &0x20 ) {
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c +0 -54
69 lines not on this page · raw message
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c +0 -4
@@ -222,10 +222,6 @@ static int rtl8723au_parse_efuse(struct rtl8xxxu_priv *priv) priv->power_base = &rtl8723a_power_base; -dev_info (&priv->udev->dev,"Vendor: %.7s\n" , - efuse->vendor_name); -dev_info (&priv->udev->dev,"Product: %.41s\n" , - efuse->device_name);return 0 ; }
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c +0 -3
@@ -494,9 +494,6 @@ static int rtl8723bu_parse_efuse(struct rtl8xxxu_priv *priv) priv->default_crystal_cap = priv->efuse_wifi.efuse8723bu.xtal_k &0x3f ; -dev_info (&priv->udev->dev,"Vendor: %.7s\n" , efuse->vendor_name); -dev_info (&priv->udev->dev,"Product: %.41s\n" , efuse->device_name); -return 0 ; }
Signature · 1 line
2.39.2
PATCH 2/3 wifi: rtl8xxxu: Add rtl8xxxu_write{8,16,32}_{set,clear}
Also add rtl8xxxu_write32_mask, rtl8xxxu_write_rfreg_mask.
These helper functions make it easier to modify only parts of a register by eliminating the call to the register reading function and the bit manipulations.
--- .../net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 12 +++ .../wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 79 +++++++++++++++++++ 2 files changed, 91 insertions(+)
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h +12 -0
@@ -1953,10 +1953,22 @@ u32 rtl8xxxu_read32(struct rtl8xxxu_priv *priv, u16 addr);int rtl8xxxu_write8 (struct rtl8xxxu_priv *priv,u16 addr,u8 val);int rtl8xxxu_write16 (struct rtl8xxxu_priv *priv,u16 addr,u16 val);int rtl8xxxu_write32 (struct rtl8xxxu_priv *priv,u16 addr,u32 val); +int rtl8xxxu_write8_set (struct rtl8xxxu_priv *priv,u16 addr,u8 bits); +int rtl8xxxu_write8_clear (struct rtl8xxxu_priv *priv,u16 addr,u8 bits); +int rtl8xxxu_write16_set (struct rtl8xxxu_priv *priv,u16 addr,u16 bits); +int rtl8xxxu_write16_clear (struct rtl8xxxu_priv *priv,u16 addr,u16 bits); +int rtl8xxxu_write32_set (struct rtl8xxxu_priv *priv,u16 addr,u32 bits); +int rtl8xxxu_write32_clear (struct rtl8xxxu_priv *priv,u16 addr,u32 bits); +int rtl8xxxu_write32_mask (struct rtl8xxxu_priv *priv,u16 addr, +u32 mask,u32 val); +u32 rtl8xxxu_read_rfreg (struct rtl8xxxu_priv *priv,enum rtl8xxxu_rfpath path,u8 reg);int rtl8xxxu_write_rfreg (struct rtl8xxxu_priv *priv,enum rtl8xxxu_rfpath path,u8 reg,u32 data); +int rtl8xxxu_write_rfreg_mask (struct rtl8xxxu_priv *priv, +enum rtl8xxxu_rfpath path,u8 reg, +u32 mask,u32 val);void rtl8xxxu_save_regs (struct rtl8xxxu_priv *priv,const u32 *regs,u32 *backup,int count); void rtl8xxxu_restore_regs(struct rtl8xxxu_priv *priv, const u32 *regs,
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +79 -0
85 lines not on this page · raw message
Signature · 1 line
2.39.2
RE: [PATCH 2/3] wifi: rtl8xxxu: Add rtl8xxxu_write{8,16,32}_{set,clear}
Quoted 9 lines
-----Original Message-----
From: Bitterblue Smith <[email protected]>
Sent: Tuesday, April 18, 2023 1:07 AM
To: [email protected]
Cc: Jes Sorensen <[email protected]>; Ping-Ke Shih <[email protected]>
Subject: [PATCH 2/3] wifi: rtl8xxxu: Add rtl8xxxu_write{8,16,32}_{set,clear}
Quoted 7 lines
Also add
rtl8xxxu_write32_mask,rtl8xxxu_write_rfreg_mask.These helper functions make it easier to modify only parts of a register by eliminating the call to the register reading function and the bit manipulations.
Signed-off-by Bitterblue Smith <[email protected]>
[...]
PATCH 3/3 wifi: rtl8xxxu: Simplify setting the initial gain
In reply to Bitterblue SmithThe goal of writing 0x6954341e / 0x6955341e to REG_OFDM0_XA_AGC_CORE1 appears to be setting the initial gain, which is stored in bits 0..6. Bits 7..31 are the same as what the phy init tables write.
Modify only bits 0..6 so that we don't have to care about the values of the others. This way we don't have to add another "else if" for the RTL8192FU.
Why we need to change the initial gain from the default 0x20 to 0x1e? Not sure. Some of the vendor drivers change it to 0x1e before scanning and then restore it to the original value after.
--- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +2 -4
@@ -7034,10 +7034,8 @@ static int rtl8xxxu_start(struct ieee80211_hw *hw)rtl8xxxu_write16 (priv,REG_RXFLTMAP2 ,0xffff );rtl8xxxu_write16 (priv,REG_RXFLTMAP0 ,0xffff ); -if (priv->rtl_chip ==RTL8188E ) -rtl8xxxu_write32 (priv,REG_OFDM0_XA_AGC_CORE1 ,0x6955341e ); -else -rtl8xxxu_write32 (priv,REG_OFDM0_XA_AGC_CORE1 ,0x6954341e ); +rtl8xxxu_write32_mask (priv,REG_OFDM0_XA_AGC_CORE1 , +OFDM0_X_AGC_CORE1_IGI_MASK ,0x1e );return ret;
Signature · 1 line
2.39.2
RE: [PATCH 3/3] wifi: rtl8xxxu: Simplify setting the initial gain
Quoted 13 lines
-----Original Message-----
From: Bitterblue Smith <[email protected]>
Sent: Tuesday, April 18, 2023 1:08 AM
To: [email protected]
Cc: Jes Sorensen <[email protected]>; Ping-Ke Shih <[email protected]>
Subject: [PATCH 3/3] wifi: rtl8xxxu: Simplify setting the initial gainThe goal of writing
0x6954341e/0x6955341etoREG_OFDM0_XA_AGC_CORE1appears to be setting the initial gain, which is stored in bits 0..6. Bits 7..31 are the same as what the phy init tables write.
Quoted 7 lines
Modify only bits 0..6 so that we don't have to care about the values of the others. This way we don't have to add another "else if" for the RTL8192FU.
Why we need to change the initial gain from the default
0x20to0x1e? Not sure. Some of the vendor drivers change it to0x1ebefore scanning and then restore it to the original value after.
When WiFi gets connected, it will try to adjust initial gain for target AP. If we scan in this situation, change it to 0x1e to have better coverage to find APs.
Quoted 2 lines
Signed-off-by Bitterblue Smith <[email protected]>
Quoted 26 lines
--- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +2
-5@@ -7034,10 +7034,8 @@ static int rtl8xxxu_start(struct ieee80211_hw *hw)rtl8xxxu_write16 (priv,REG_RXFLTMAP2 ,0xffff );rtl8xxxu_write16 (priv,REG_RXFLTMAP0 ,0xffff ); -if (priv->rtl_chip ==RTL8188E ) -rtl8xxxu_write32 (priv,REG_OFDM0_XA_AGC_CORE1 ,0x6955341e ); -else -rtl8xxxu_write32 (priv,REG_OFDM0_XA_AGC_CORE1 ,0x6954341e ); +rtl8xxxu_write32_mask (priv,REG_OFDM0_XA_AGC_CORE1 , +OFDM0_X_AGC_CORE1_IGI_MASK ,0x1e );return ret; --2.39.2
------Please consider the environment before printing this e-mail.
Re: [PATCH 3/3] wifi: rtl8xxxu: Simplify setting the initial gain
Quoted 17 lines · Ping-Ke Shih
Quoted 17 lines
-----Original Message-----
From: Bitterblue Smith <[email protected]>
Sent: Tuesday, April 18, 2023 1:08 AM
To: [email protected]
Cc: Jes Sorensen <[email protected]>; Ping-Ke Shih <[email protected]>
Subject: [PATCH 3/3] wifi: rtl8xxxu: Simplify setting the initial gainThe goal of writing
0x6954341e/0x6955341etoREG_OFDM0_XA_AGC_CORE1appears to be setting the initial gain, which is stored in bits 0..6. Bits 7..31 are the same as what the phy init tables write.Modify only bits 0..6 so that we don't have to care about the values of the others. This way we don't have to add another "else if" for the RTL8192FU.
Quoted 8 lines
Quoted 3 lines
Why we need to change the initial gain from the default
0x20to0x1e? Not sure. Some of the vendor drivers change it to0x1ebefore scanning and then restore it to the original value after.When WiFi gets connected, it will try to adjust initial gain for target AP. If we scan in this situation, change it to
0x1eto have better coverage to find APs.
I see. I'll remember that if I implement the dynamic initial gain.
Quoted 57 lines
-----Original Message-----
From: Bitterblue Smith <[email protected]>
Sent: Tuesday, April 18, 2023 1:06 AM
To: [email protected]
Cc: Jes Sorensen <[email protected]>; Ping-Ke Shih <[email protected]>
Subject: [PATCH 1/3] wifi: rtl8xxxu: Don't print the vendor/product/serialMost devices have a vendor name, product name, and serial number in the efuse, but it's pretty useless. It duplicates the information already printed by the USB subsystem:
usb 1-4: New USB device found, idVendor=0bda, idProduct=8178, bcdDevice= 2.00 usb 1-4: New USB device strings: Mfr=1, Product=2, SerialNumber=3 usb 1-4: Product: 802.11n WLAN Adapter
usb 1-4: Manufacturer: Realtek
usb 1-4: SerialNumber:00e04c000001
-> usb 1-4: Vendor: Realtek
-> usb 1-4: Product: 802.11n WLAN Adapterusb 1-4: New USB device found, idVendor=0bda, idProduct=818b, bcdDevice= 2.00 usb 1-4: New USB device strings: Mfr=1, Product=2, SerialNumber=3 usb 1-4: Product: 802.11n NIC
usb 1-4: Manufacturer: Realtek
usb 1-4: SerialNumber:00e04c000001
-> usb 1-4: Vendor: Realtek
-> usb 1-4: Product: 802.11n NIC
-> usb 1-4: Serial not available.usb 1-4: New USB device found, idVendor=0bda, idProduct=f179, bcdDevice= 0.00 usb 1-4: New USB device strings: Mfr=1, Product=2, SerialNumber=3 usb 1-4: Product: 802.11n
usb 1-4: Manufacturer: Realtek
usb 1-4: SerialNumber: 002E2DC0041F
-> usb 1-4: Vendor: Realtek
-> usb 1-4: Product: 802.11nusb 1-4: New USB device found, idVendor=0bda, idProduct=8179, bcdDevice= 0.00 usb 1-4: New USB device strings: Mfr=1, Product=2, SerialNumber=3 usb 1-4: Product: 802.11n NIC
usb 1-4: Manufacturer: Realtek
usb 1-4: SerialNumber: 00E04C0001
-> usb 1-4: Vendor: Realtek
-> usb 1-4: Product: 802.11n NIC
-> usb 1-4: Serial: 00E04C0001Also, that data is not interpreted correctly in all cases:
usb 3-1.1.2: New USB device found, idVendor=0bda, idProduct=8179, bcdDevice= 0.00 usb 3-1.1.2: New USB device strings: Mfr=1, Product=2, SerialNumber=3 usb 3-1.1.2: Product: 802.11n NIC
usb 3-1.1.2: Manufacturer: Realtek
usb 3-1.1.2: Vendor: Realtek
usb 3-1.1.2: Product: \x03802.11n NI
usb 3-1.1.2: Serial: \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff
Quoted 2 lines
[...]
Quoted 48 lines · Bitterblue Smith
Most devices have a vendor name, product name, and serial number in the efuse, but it's pretty useless. It duplicates the information already printed by the USB subsystem:
usb 1-4: New USB device found, idVendor=0bda, idProduct=8178, bcdDevice= 2.00 usb 1-4: New USB device strings: Mfr=1, Product=2, SerialNumber=3 usb 1-4: Product: 802.11n WLAN Adapter
usb 1-4: Manufacturer: Realtek
usb 1-4: SerialNumber:00e04c000001
-> usb 1-4: Vendor: Realtek
-> usb 1-4: Product: 802.11n WLAN Adapterusb 1-4: New USB device found, idVendor=0bda, idProduct=818b, bcdDevice= 2.00 usb 1-4: New USB device strings: Mfr=1, Product=2, SerialNumber=3 usb 1-4: Product: 802.11n NIC
usb 1-4: Manufacturer: Realtek
usb 1-4: SerialNumber:00e04c000001
-> usb 1-4: Vendor: Realtek
-> usb 1-4: Product: 802.11n NIC
-> usb 1-4: Serial not available.usb 1-4: New USB device found, idVendor=0bda, idProduct=f179, bcdDevice= 0.00 usb 1-4: New USB device strings: Mfr=1, Product=2, SerialNumber=3 usb 1-4: Product: 802.11n
usb 1-4: Manufacturer: Realtek
usb 1-4: SerialNumber: 002E2DC0041F
-> usb 1-4: Vendor: Realtek
-> usb 1-4: Product: 802.11nusb 1-4: New USB device found, idVendor=0bda, idProduct=8179, bcdDevice= 0.00 usb 1-4: New USB device strings: Mfr=1, Product=2, SerialNumber=3 usb 1-4: Product: 802.11n NIC
usb 1-4: Manufacturer: Realtek
usb 1-4: SerialNumber: 00E04C0001
-> usb 1-4: Vendor: Realtek
-> usb 1-4: Product: 802.11n NIC
-> usb 1-4: Serial: 00E04C0001Also, that data is not interpreted correctly in all cases:
usb 3-1.1.2: New USB device found, idVendor=0bda, idProduct=8179, bcdDevice= 0.00 usb 3-1.1.2: New USB device strings: Mfr=1, Product=2, SerialNumber=3 usb 3-1.1.2: Product: 802.11n NIC
usb 3-1.1.2: Manufacturer: Realtek
usb 3-1.1.2: Vendor: Realtek
usb 3-1.1.2: Product: \x03802.11n NI
usb 3-1.1.2: Serial: \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff
Quoted 3 lines
Signed-off-by Bitterblue Smith <[email protected]>Reviewed-by Ping-Ke Shih <[email protected]>
3 patches applied to wireless-next.git, thanks.
af8678e6c5bd wifi: rtl8xxxu: Don't print the vendor/product/serial cd85c8b059c5 wifi: rtl8xxxu: Add rtl8xxxu_write{8,16,32}_{set,clear} c8bc37602779 wifi: rtl8xxxu: Simplify setting the initial gain
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches