| Message ID | 20240314204651.11075-1-quic_alokad@quicinc.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 020e08ae5e68cbc0791e8d842443a86eb6aa99f6 |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | wifi: ath12k: use correct flag field for 320 MHz | expand |
On 3/14/2024 1:46 PM, Aloka Dixit wrote: > WMI_PEER_EXT_320MHZ (0x2) is defined as an extended flag, replace > peer_flags by peer_flags_ext while sending peer data. > > Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1 > > Fixes: 6734cf9b4cc7 ("wifi: ath12k: peer assoc for 320 MHz") > Signed-off-by: Aloka Dixit <quic_alokad@quicinc.com> Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com>
Aloka Dixit <quic_alokad@quicinc.com> writes: > WMI_PEER_EXT_320MHZ (0x2) is defined as an extended flag, replace > peer_flags by peer_flags_ext while sending peer data. > > Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1 > > Fixes: 6734cf9b4cc7 ("wifi: ath12k: peer assoc for 320 MHz") > Signed-off-by: Aloka Dixit <quic_alokad@quicinc.com> What does this fix from user's point of view? Does it mean that 320 MHz chanels were broken before and this commit fixes that? I can ammend the commit message.
Kalle Valo <kvalo@kernel.org> writes: > Aloka Dixit <quic_alokad@quicinc.com> writes: > >> WMI_PEER_EXT_320MHZ (0x2) is defined as an extended flag, replace >> peer_flags by peer_flags_ext while sending peer data. >> >> Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1 >> >> Fixes: 6734cf9b4cc7 ("wifi: ath12k: peer assoc for 320 MHz") >> Signed-off-by: Aloka Dixit <quic_alokad@quicinc.com> > > What does this fix from user's point of view? Does it mean that 320 MHz > chanels were broken before and this commit fixes that? I can ammend the > commit message. And what about WCN7850? Does it work the same?
On 3/18/2024 10:54 AM, Kalle Valo wrote: > Kalle Valo <kvalo@kernel.org> writes: > >> Aloka Dixit <quic_alokad@quicinc.com> writes: >> >>> WMI_PEER_EXT_320MHZ (0x2) is defined as an extended flag, replace >>> peer_flags by peer_flags_ext while sending peer data. >>> >>> Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1 >>> >>> Fixes: 6734cf9b4cc7 ("wifi: ath12k: peer assoc for 320 MHz") >>> Signed-off-by: Aloka Dixit <quic_alokad@quicinc.com> >> >> What does this fix from user's point of view? Does it mean that 320 MHz >> chanels were broken before and this commit fixes that? I can ammend the >> commit message. > > And what about WCN7850? Does it work the same? > Hi Kalle, 320 MHz association was broken. It was a re-basing error while sending the original patch because the correct field was added during testing, still used that way internally too. I have not tested WCN7850 on this patch but yes will require the same field. Current code was setting QOS bit instead of 320MHz.
Aloka Dixit <quic_alokad@quicinc.com> writes: > On 3/18/2024 10:54 AM, Kalle Valo wrote: >> Kalle Valo <kvalo@kernel.org> writes: >> >>> Aloka Dixit <quic_alokad@quicinc.com> writes: >>> >>>> WMI_PEER_EXT_320MHZ (0x2) is defined as an extended flag, replace >>>> peer_flags by peer_flags_ext while sending peer data. >>>> >>>> Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1 >>>> >>>> Fixes: 6734cf9b4cc7 ("wifi: ath12k: peer assoc for 320 MHz") >>>> Signed-off-by: Aloka Dixit <quic_alokad@quicinc.com> >>> >>> What does this fix from user's point of view? Does it mean that 320 MHz >>> chanels were broken before and this commit fixes that? I can ammend the >>> commit message. >> And what about WCN7850? Does it work the same? > > 320 MHz association was broken. It was a re-basing error while sending > the original patch because the correct field was added during testing, > still used that way internally too. I have not tested WCN7850 on this > patch but yes will require the same field. Current code was setting > QOS bit instead of 320MHz. Thanks, does this look ok: https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git/commit/?h=pending&id=c4ade6bdf3d1a2d9d05606a85431f154559d5a80
On 3/18/2024 11:49 AM, Kalle Valo wrote: > Aloka Dixit <quic_alokad@quicinc.com> writes: > >> On 3/18/2024 10:54 AM, Kalle Valo wrote: >>> Kalle Valo <kvalo@kernel.org> writes: >>> >>>> Aloka Dixit <quic_alokad@quicinc.com> writes: >>>> >>>>> WMI_PEER_EXT_320MHZ (0x2) is defined as an extended flag, replace >>>>> peer_flags by peer_flags_ext while sending peer data. >>>>> >>>>> Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1 >>>>> >>>>> Fixes: 6734cf9b4cc7 ("wifi: ath12k: peer assoc for 320 MHz") >>>>> Signed-off-by: Aloka Dixit <quic_alokad@quicinc.com> >>>> >>>> What does this fix from user's point of view? Does it mean that 320 MHz >>>> chanels were broken before and this commit fixes that? I can ammend the >>>> commit message. >>> And what about WCN7850? Does it work the same? >> >> 320 MHz association was broken. It was a re-basing error while sending >> the original patch because the correct field was added during testing, >> still used that way internally too. I have not tested WCN7850 on this >> patch but yes will require the same field. Current code was setting >> QOS bit instead of 320MHz. > > Thanks, does this look ok: > > https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git/commit/?h=pending&id=c4ade6bdf3d1a2d9d05606a85431f154559d5a80 > Perfect, thanks!
Aloka Dixit <quic_alokad@quicinc.com> wrote: > Due to an error during rebasing the patchset 320 MHz channel support got > broken. ath12k was setting the QoS bit instead of the correct flag. > WMI_PEER_EXT_320MHZ (0x2) is defined as an extended flag, replace > peer_flags by peer_flags_ext while sending peer data. > > This affected both QCN9274 and WCN7850 which use the same flag. > > Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1 > > Fixes: 6734cf9b4cc7 ("wifi: ath12k: peer assoc for 320 MHz") > Signed-off-by: Aloka Dixit <quic_alokad@quicinc.com> > Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com> > Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com> Patch applied to ath-next branch of ath.git, thanks. 020e08ae5e68 wifi: ath12k: use correct flag field for 320 MHz channels
diff --git a/drivers/net/wireless/ath/ath12k/wmi.c b/drivers/net/wireless/ath/ath12k/wmi.c index 9d69a1769926..34de3d16efc0 100644 --- a/drivers/net/wireless/ath/ath12k/wmi.c +++ b/drivers/net/wireless/ath/ath12k/wmi.c @@ -1900,7 +1900,7 @@ static void ath12k_wmi_copy_peer_flags(struct wmi_peer_assoc_complete_cmd *cmd, if (arg->bw_160) cmd->peer_flags |= cpu_to_le32(WMI_PEER_160MHZ); if (arg->bw_320) - cmd->peer_flags |= cpu_to_le32(WMI_PEER_EXT_320MHZ); + cmd->peer_flags_ext |= cpu_to_le32(WMI_PEER_EXT_320MHZ); /* Typically if STBC is enabled for VHT it should be enabled * for HT as well
WMI_PEER_EXT_320MHZ (0x2) is defined as an extended flag, replace peer_flags by peer_flags_ext while sending peer data. Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1 Fixes: 6734cf9b4cc7 ("wifi: ath12k: peer assoc for 320 MHz") Signed-off-by: Aloka Dixit <quic_alokad@quicinc.com> --- drivers/net/wireless/ath/ath12k/wmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: a2a4cf3541db8066af7e6d4eb6e9e6445f6d9658