ath10k: implement set_base_macaddr to fix rx-bssid mask in multiple APs conf
PATCH v2 1/1 ath10k: implement set_base_macaddr to fix rx-bssid mask in multiple APs conf
Many integrated QCA9984 WiFis in various IPQ806x platform routers from various vendors (Netgear R7800, ZyXEL NBG6817, TP-LINK C2600, etc.) have either blank, bogus or non-unique MAC-addresses in their calibration data.
As a result, OpenWrt utilizes a discouraged binary calibration data patching method that allows to modify the device's MAC-addresses right at the source. This is because the ath10k' firmware extracts the MAC address from the supplied radio/calibration data and issues a response to the ath10k linux driver. Which was designed to take the main MAC in ath10k_wmi_event_ready().
Part of the "setting an alternate MAC" issue was already tackled by a patch from Brian Norris:
commit 9d5804662ce1
("ath10k: retrieve MAC address from system firmware if provided") by allowing the option to specify an alternate MAC-address with the established device_get_mac_address() function which extracts the right address from DeviceTree/fwnode mac-address or local-mac-address properties and saves it for later.
However, Ben Greear noted that the Qualcomm's ath10k firmware is liable to not properly calculate its rx-bssid mask in this case. This can cause issues in the popluar "multiple AP with a single ath10k instance" configurations.
To improve MAC address handling, Felix Fietkau suggested to call pdev_set_base_macaddr_cmdid before bringing up the first vif and use the first vif MAC address there. Which is in ath10k_core_start().
This patch implement Felix Fietkau's request to
"call pdev_set_base_macaddr_cmdid before bringing up the first vif". The pdev_set_base_macaddr_cmdid is already declared for all devices and version. The driver just needed the support code for this function.
Tested on:
QCA9880/CUS223, firmwares: 10.2.4.13-2, 10.2.4.70.44, 10.2.4-1.0-00041 QCA9887/MR33 firmware:10.2.4-1.0-00033
QCA4019/RT-AC58U firmware: 10.4-3.4-00104, 10.4-3.5.3-00057 QCA9984/R7800 firmware: Candela Technologies (CT) Firmware
---
Changed from v1:
- removed support for obsolete, untested firmwares
- removed unsupported TLV ops
- don't error-out on unsupported platforms
--- drivers/net/wireless/ath/ath10k/core.c | 7 +++++++ drivers/net/wireless/ath/ath10k/wmi-ops.h | 18 ++++++++++++++++++ drivers/net/wireless/ath/ath10k/wmi.c | 21 +++++++++++++++++++++ drivers/net/wireless/ath/ath10k/wmi.h | 4 ++++ 4 files changed, 50 insertions(+)
drivers/net/wireless/ath/ath10k/core.c +7 -0
@@ -2649,6 +2649,13 @@ int ath10k_core_start(struct ath10k *ar, enum ath10k_firmware_mode mode, goto err_hif_stop; } + status =ath10k_wmi_pdev_set_base_macaddr (ar, ar->mac_addr); +if (status && status != -EOPNOTSUPP ) { +ath10k_err (ar, +"failed to set base mac address: %d\n" , status); + goto err_hif_stop; + } +/* Some firmware revisions do not properly set up hardware rx filter * registers. *
drivers/net/wireless/ath/ath10k/wmi-ops.h +18 -0
@@ -66,6 +66,8 @@ struct wmi_ops {struct sk_buff *(*gen_pdev_suspend)(struct ath10k *ar,u32 suspend_opt);struct sk_buff *(*gen_pdev_resume)(struct ath10k *ar); +struct sk_buff *(*gen_pdev_set_base_macaddr)(struct ath10k *ar, +const u8 macaddr[ETH_ALEN ]);struct sk_buff *(*gen_pdev_set_rd)(struct ath10k *ar,u16 rd,u16 rd2g,u16 rd5g,u16 ctl2g,u16 ctl5g,enum wmi_dfs_region dfs_reg);
@@ -506,6 +508,22 @@ ath10k_wmi_pdev_set_regdomain(struct ath10k *ar, u16 rd, u16 rd2g, u16 rd5g, ar->wmi.cmd->pdev_set_regdomain_cmdid); } +static inline int +ath10k_wmi_pdev_set_base_macaddr (struct ath10k *ar,const u8 macaddr[ETH_ALEN ]) +{ +struct sk_buff *skb; + +if (!ar->wmi.ops->gen_pdev_set_base_macaddr) +return -EOPNOTSUPP ; + + skb = ar->wmi.ops->gen_pdev_set_base_macaddr (ar, macaddr); +if (IS_ERR (skb)) +return PTR_ERR (skb); + +return ath10k_wmi_cmd_send (ar, skb, + ar->wmi.cmd->pdev_set_base_macaddr_cmdid); +} +static inline int ath10k_wmi_pdev_suspend_target (struct ath10k *ar,u32 suspend_opt) {
drivers/net/wireless/ath/ath10k/wmi.c +21 -0
@@ -6239,6 +6239,25 @@ int ath10k_wmi_connect(struct ath10k *ar)return 0 ; } +static struct sk_buff * +ath10k_wmi_op_gen_pdev_set_base_macaddr (struct ath10k *ar, +const u8 macaddr[ETH_ALEN ]) +{ +struct wmi_pdev_set_base_macaddr_cmd *cmd; +struct sk_buff *skb; + + skb =ath10k_wmi_alloc_skb (ar,sizeof (*cmd)); +if (!skb) +return ERR_PTR (-ENOMEM ); + + cmd = (struct wmi_pdev_set_base_macaddr_cmd *)skb->data; +ether_addr_copy (cmd->mac_addr.addr, macaddr); + +ath10k_dbg (ar,ATH10K_DBG_WMI , +"wmi pdev basemac %pM\n" , macaddr); +return skb; +} +static struct sk_buff * ath10k_wmi_op_gen_pdev_set_rd(struct ath10k *ar, u16 rd, u16 rd2g, u16 rd5g, u16 ctl2g, u16 ctl5g,
@@ -9115,6 +9134,7 @@ static const struct wmi_ops wmi_10_2_4_ops = { .gen_peer_create = ath10k_wmi_op_gen_peer_create, .gen_peer_delete = ath10k_wmi_op_gen_peer_delete, .gen_peer_flush = ath10k_wmi_op_gen_peer_flush, + .gen_pdev_set_base_macaddr = ath10k_wmi_op_gen_pdev_set_base_macaddr, .gen_peer_set_param = ath10k_wmi_op_gen_peer_set_param, .gen_set_psmode = ath10k_wmi_op_gen_set_psmode, .gen_set_sta_ps = ath10k_wmi_op_gen_set_sta_ps,
@@ -9166,6 +9186,7 @@ static const struct wmi_ops wmi_10_4_ops = { .gen_pdev_suspend = ath10k_wmi_op_gen_pdev_suspend, .gen_pdev_resume = ath10k_wmi_op_gen_pdev_resume, + .gen_pdev_set_base_macaddr = ath10k_wmi_op_gen_pdev_set_base_macaddr, .gen_pdev_set_rd = ath10k_wmi_10x_op_gen_pdev_set_rd, .gen_pdev_set_param = ath10k_wmi_op_gen_pdev_set_param, .gen_init = ath10k_wmi_10_4_op_gen_init,
drivers/net/wireless/ath/ath10k/wmi.h +4 -0
@@ -4083,6 +4083,10 @@ struct wmi_pdev_set_param_cmd {__le32 param_value; } __packed; +struct wmi_pdev_set_base_macaddr_cmd { +struct wmi_mac_addr mac_addr; +} __packed; +/* valid period is 1 ~ 60000ms, unit in millisecond */ #define WMI_PDEV_PARAM_CAL_PERIOD_MAX 60000
Signature · 7 lines
2.20.1 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Hi,
Quoted 50 lines · Christian Lamparter
Many integrated QCA9984 WiFis in various IPQ806x platform routers from various vendors (Netgear R7800, ZyXEL NBG6817, TP-LINK C2600, etc.) have either blank, bogus or non-unique MAC-addresses in their calibration data.
As a result, OpenWrt utilizes a discouraged binary calibration data patching method that allows to modify the device's MAC-addresses right at the source. This is because the ath10k' firmware extracts the MAC address from the supplied radio/calibration data and issues a response to the ath10k linux driver. Which was designed to take the main MAC in
ath10k_wmi_event_ready().Part of the "setting an alternate MAC" issue was already tackled by a patch from Brian Norris:
commit9d5804662ce1
("ath10k: retrieve MAC address from system firmware if provided") by allowing the option to specify an alternate MAC-address with the establisheddevice_get_mac_address()function which extracts the right address from DeviceTree/fwnode mac-address or local-mac-address properties and saves it for later.However, Ben Greear noted that the Qualcomm's ath10k firmware is liable to not properly calculate its rx-bssid mask in this case. This can cause issues in the popluar "multiple AP with a single ath10k instance" configurations.
To improve MAC address handling, Felix Fietkau suggested to call
pdev_set_base_macaddr_cmdidbefore bringing up the first vif and use the first vif MAC address there. Which is inath10k_core_start().This patch implement Felix Fietkau's request to
"callpdev_set_base_macaddr_cmdidbefore bringing up the first vif". Thepdev_set_base_macaddr_cmdidis already declared for all devices and version. The driver just needed the support code for this function.Tested on:
QCA9880/CUS223, firmwares: 10.2.4.13-2, 10.2.4.70.44, 10.2.4-1.0-00041 QCA9887/MR33 firmware:10.2.4-1.0-00033
QCA4019/RT-AC58U firmware: 10.4-3.4-00104, 10.4-3.5.3-00057 QCA9984/R7800 firmware: Candela Technologies (CT) FirmwareFixes 9d5804662ce1 ("ath10k: retrieve MAC address from system firmware if provided")Cc Brian Norris <[email protected]>Cc Ben Greear <[email protected]>Cc Felix Fietkau <[email protected]>Cc Mathias Kresin <[email protected]>Signed-off-by Christian Lamparter <[email protected]>
Quoted 6 lines
---
Changed from v1:
- removed support for obsolete, untested firmwares
- removed unsupported TLV ops
- don't error-out on unsupported platforms
This doesn't break WCN3990 this time (which doesn't support this command), and I correctly hit the EOPNOTSUPP path:
_______________________________________________
ath10k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath10k
Quoted 42 lines · Christian Lamparter
Many integrated QCA9984 WiFis in various IPQ806x platform routers from various vendors (Netgear R7800, ZyXEL NBG6817, TP-LINK C2600, etc.) have either blank, bogus or non-unique MAC-addresses in their calibration data.
As a result, OpenWrt utilizes a discouraged binary calibration data patching method that allows to modify the device's MAC-addresses right at the source. This is because the ath10k' firmware extracts the MAC address from the supplied radio/calibration data and issues a response to the ath10k linux driver. Which was designed to take the main MAC in
ath10k_wmi_event_ready().Part of the "setting an alternate MAC" issue was already tackled by a patch from Brian Norris:
commit9d5804662ce1
("ath10k: retrieve MAC address from system firmware if provided") by allowing the option to specify an alternate MAC-address with the establisheddevice_get_mac_address()function which extracts the right address from DeviceTree/fwnode mac-address or local-mac-address properties and saves it for later.However, Ben Greear noted that the Qualcomm's ath10k firmware is liable to not properly calculate its rx-bssid mask in this case. This can cause issues in the popluar "multiple AP with a single ath10k instance" configurations.
To improve MAC address handling, Felix Fietkau suggested to call
pdev_set_base_macaddr_cmdidbefore bringing up the first vif and use the first vif MAC address there. Which is inath10k_core_start().This patch implement Felix Fietkau's request to
"callpdev_set_base_macaddr_cmdidbefore bringing up the first vif". Thepdev_set_base_macaddr_cmdidis already declared for all devices and version. The driver just needed the support code for this function.Tested on:
QCA9880/CUS223, firmwares: 10.2.4.13-2, 10.2.4.70.44, 10.2.4-1.0-00041 QCA9887/MR33 firmware:10.2.4-1.0-00033
QCA4019/RT-AC58U firmware: 10.4-3.4-00104, 10.4-3.5.3-00057 QCA9984/R7800 firmware: Candela Technologies (CT) Firmware
Quoted 9 lines
Fixes 9d5804662ce1 ("ath10k: retrieve MAC address from system firmware if provided")Cc Brian Norris <[email protected]>Cc Ben Greear <[email protected]>Cc Felix Fietkau <[email protected]>Cc Mathias Kresin <[email protected]>Signed-off-by Christian Lamparter <[email protected]>Tested-by Brian Norris <[email protected]>Signed-off-by Kalle Valo <[email protected]>
Patch applied to ath-next branch of ath.git, thanks.
05e7ba24b10d ath10k: implement set_base_macaddr to fix rx-bssid mask in multiple APs conf
Signature · 9 lines
https://patchwork.kernel.org/patch/10796625/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Quoted 42 lines · Christian Lamparter
Many integrated QCA9984 WiFis in various IPQ806x platform routers from various vendors (Netgear R7800, ZyXEL NBG6817, TP-LINK C2600, etc.) have either blank, bogus or non-unique MAC-addresses in their calibration data.
As a result, OpenWrt utilizes a discouraged binary calibration data patching method that allows to modify the device's MAC-addresses right at the source. This is because the ath10k' firmware extracts the MAC address from the supplied radio/calibration data and issues a response to the ath10k linux driver. Which was designed to take the main MAC in
ath10k_wmi_event_ready().Part of the "setting an alternate MAC" issue was already tackled by a patch from Brian Norris:
commit9d5804662ce1
("ath10k: retrieve MAC address from system firmware if provided") by allowing the option to specify an alternate MAC-address with the establisheddevice_get_mac_address()function which extracts the right address from DeviceTree/fwnode mac-address or local-mac-address properties and saves it for later.However, Ben Greear noted that the Qualcomm's ath10k firmware is liable to not properly calculate its rx-bssid mask in this case. This can cause issues in the popluar "multiple AP with a single ath10k instance" configurations.
To improve MAC address handling, Felix Fietkau suggested to call
pdev_set_base_macaddr_cmdidbefore bringing up the first vif and use the first vif MAC address there. Which is inath10k_core_start().This patch implement Felix Fietkau's request to
"callpdev_set_base_macaddr_cmdidbefore bringing up the first vif". Thepdev_set_base_macaddr_cmdidis already declared for all devices and version. The driver just needed the support code for this function.Tested on:
QCA9880/CUS223, firmwares: 10.2.4.13-2, 10.2.4.70.44, 10.2.4-1.0-00041 QCA9887/MR33 firmware:10.2.4-1.0-00033
QCA4019/RT-AC58U firmware: 10.4-3.4-00104, 10.4-3.5.3-00057 QCA9984/R7800 firmware: Candela Technologies (CT) Firmware
Quoted 9 lines
Fixes 9d5804662ce1 ("ath10k: retrieve MAC address from system firmware if provided")Cc Brian Norris <[email protected]>Cc Ben Greear <[email protected]>Cc Felix Fietkau <[email protected]>Cc Mathias Kresin <[email protected]>Signed-off-by Christian Lamparter <[email protected]>Tested-by Brian Norris <[email protected]>Signed-off-by Kalle Valo <[email protected]>
Patch applied to ath-next branch of ath.git, thanks.
05e7ba24b10d ath10k: implement set_base_macaddr to fix rx-bssid mask in multiple APs conf
Signature · 3 lines
https://patchwork.kernel.org/patch/10796625/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches