| Message ID | 1642337235-8618-13-git-send-email-quic_mpubbise@quicinc.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | add support for WCN6750 | expand |
Manikanta Pubbisetty <quic_mpubbise@quicinc.com> writes: > HAL RX descriptor for WCN6750 is same as QCN9074, so use > the DP APIs of QCN9074 for WCN6750. There is one change > wrt to REO configuration though, REO configuration for > WCN6750 is same as WCN6855; Therefore, use reo_setup() > of WCN6855 for WCN6750. > > Tested-on: WCN6750 hw1.0 AHB WLAN.MSL.1.0.1-00573-QCAMSLSWPLZ-1 > Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-01720.1-QCAHSPSWPL_V1_V2_SILICONZ_LITE-1 > Tested-on: QCN9074 hw1.0 PCI WLAN.HK.2.5.0.1-01100-QCAHKSWPL_SILICONZ-1 > Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.4.0.1-00192-QCAHKSWPL_SILICONZ-1 > > Signed-off-by: Manikanta Pubbisetty <quic_mpubbise@quicinc.com> > --- > drivers/net/wireless/ath/ath11k/core.c | 1 + > drivers/net/wireless/ath/ath11k/hw.c | 31 +++++++++++++++++++++++++++++++ > 2 files changed, 32 insertions(+) > > diff --git a/drivers/net/wireless/ath/ath11k/core.c b/drivers/net/wireless/ath/ath11k/core.c > index 347131a..f65347c 100644 > --- a/drivers/net/wireless/ath/ath11k/core.c > +++ b/drivers/net/wireless/ath/ath11k/core.c > @@ -458,6 +458,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { > .num_vdevs = 16 + 1, > .num_peers = 512, > .supports_suspend = false, > + .hal_desc_sz = sizeof(struct hal_rx_desc_qcn9074), You mention nothing about this change in the commit log, I'll add that.
On 4/27/2022 11:02 AM, Kalle Valo wrote: > Manikanta Pubbisetty <quic_mpubbise@quicinc.com> writes: > >> HAL RX descriptor for WCN6750 is same as QCN9074, so use >> the DP APIs of QCN9074 for WCN6750. There is one change >> wrt to REO configuration though, REO configuration for >> WCN6750 is same as WCN6855; Therefore, use reo_setup() >> of WCN6855 for WCN6750. >> >> Tested-on: WCN6750 hw1.0 AHB WLAN.MSL.1.0.1-00573-QCAMSLSWPLZ-1 >> Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-01720.1-QCAHSPSWPL_V1_V2_SILICONZ_LITE-1 >> Tested-on: QCN9074 hw1.0 PCI WLAN.HK.2.5.0.1-01100-QCAHKSWPL_SILICONZ-1 >> Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.4.0.1-00192-QCAHKSWPL_SILICONZ-1 >> >> Signed-off-by: Manikanta Pubbisetty <quic_mpubbise@quicinc.com> >> --- >> drivers/net/wireless/ath/ath11k/core.c | 1 + >> drivers/net/wireless/ath/ath11k/hw.c | 31 +++++++++++++++++++++++++++++++ >> 2 files changed, 32 insertions(+) >> >> diff --git a/drivers/net/wireless/ath/ath11k/core.c b/drivers/net/wireless/ath/ath11k/core.c >> index 347131a..f65347c 100644 >> --- a/drivers/net/wireless/ath/ath11k/core.c >> +++ b/drivers/net/wireless/ath/ath11k/core.c >> @@ -458,6 +458,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { >> .num_vdevs = 16 + 1, >> .num_peers = 512, >> .supports_suspend = false, >> + .hal_desc_sz = sizeof(struct hal_rx_desc_qcn9074), > > You mention nothing about this change in the commit log, I'll add that. > I did mention that "HAL RX descriptor for WCN6750 is same as QCN9074", you were looking at something specific? Thanks, Manikanta
Manikanta Pubbisetty <quic_mpubbise@quicinc.com> writes: > On 4/27/2022 11:02 AM, Kalle Valo wrote: >> Manikanta Pubbisetty <quic_mpubbise@quicinc.com> writes: >> >>> HAL RX descriptor for WCN6750 is same as QCN9074, so use >>> the DP APIs of QCN9074 for WCN6750. There is one change >>> wrt to REO configuration though, REO configuration for >>> WCN6750 is same as WCN6855; Therefore, use reo_setup() >>> of WCN6855 for WCN6750. >>> >>> Tested-on: WCN6750 hw1.0 AHB WLAN.MSL.1.0.1-00573-QCAMSLSWPLZ-1 >>> Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-01720.1-QCAHSPSWPL_V1_V2_SILICONZ_LITE-1 >>> Tested-on: QCN9074 hw1.0 PCI WLAN.HK.2.5.0.1-01100-QCAHKSWPL_SILICONZ-1 >>> Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.4.0.1-00192-QCAHKSWPL_SILICONZ-1 >>> >>> Signed-off-by: Manikanta Pubbisetty <quic_mpubbise@quicinc.com> >>> --- >>> drivers/net/wireless/ath/ath11k/core.c | 1 + >>> drivers/net/wireless/ath/ath11k/hw.c | 31 +++++++++++++++++++++++++++++++ >>> 2 files changed, 32 insertions(+) >>> >>> diff --git a/drivers/net/wireless/ath/ath11k/core.c b/drivers/net/wireless/ath/ath11k/core.c >>> index 347131a..f65347c 100644 >>> --- a/drivers/net/wireless/ath/ath11k/core.c >>> +++ b/drivers/net/wireless/ath/ath11k/core.c >>> @@ -458,6 +458,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { >>> .num_vdevs = 16 + 1, >>> .num_peers = 512, >>> .supports_suspend = false, >>> + .hal_desc_sz = sizeof(struct hal_rx_desc_qcn9074), >> >> You mention nothing about this change in the commit log, I'll add that. >> > > I did mention that "HAL RX descriptor for WCN6750 is same as QCN9074", > you were looking at something specific? If I'm understanding correctly, by accident hal_desc_sz was not initialised for qcn9074. If that's the case, it would be good to mention that in the commit log.
On 4/27/2022 11:18 AM, Kalle Valo wrote: > Manikanta Pubbisetty <quic_mpubbise@quicinc.com> writes: > >> On 4/27/2022 11:02 AM, Kalle Valo wrote: >>> Manikanta Pubbisetty <quic_mpubbise@quicinc.com> writes: >>> >>>> HAL RX descriptor for WCN6750 is same as QCN9074, so use >>>> the DP APIs of QCN9074 for WCN6750. There is one change >>>> wrt to REO configuration though, REO configuration for >>>> WCN6750 is same as WCN6855; Therefore, use reo_setup() >>>> of WCN6855 for WCN6750. >>>> >>>> Tested-on: WCN6750 hw1.0 AHB WLAN.MSL.1.0.1-00573-QCAMSLSWPLZ-1 >>>> Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-01720.1-QCAHSPSWPL_V1_V2_SILICONZ_LITE-1 >>>> Tested-on: QCN9074 hw1.0 PCI WLAN.HK.2.5.0.1-01100-QCAHKSWPL_SILICONZ-1 >>>> Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.4.0.1-00192-QCAHKSWPL_SILICONZ-1 >>>> >>>> Signed-off-by: Manikanta Pubbisetty <quic_mpubbise@quicinc.com> >>>> --- >>>> drivers/net/wireless/ath/ath11k/core.c | 1 + >>>> drivers/net/wireless/ath/ath11k/hw.c | 31 +++++++++++++++++++++++++++++++ >>>> 2 files changed, 32 insertions(+) >>>> >>>> diff --git a/drivers/net/wireless/ath/ath11k/core.c b/drivers/net/wireless/ath/ath11k/core.c >>>> index 347131a..f65347c 100644 >>>> --- a/drivers/net/wireless/ath/ath11k/core.c >>>> +++ b/drivers/net/wireless/ath/ath11k/core.c >>>> @@ -458,6 +458,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { >>>> .num_vdevs = 16 + 1, >>>> .num_peers = 512, >>>> .supports_suspend = false, >>>> + .hal_desc_sz = sizeof(struct hal_rx_desc_qcn9074), >>> >>> You mention nothing about this change in the commit log, I'll add that. >>> >> >> I did mention that "HAL RX descriptor for WCN6750 is same as QCN9074", >> you were looking at something specific? > > If I'm understanding correctly, by accident hal_desc_sz was not > initialised for qcn9074. If that's the case, it would be good to mention > that in the commit log. > If I understand your comment correctly, since HAL RX descriptor is related to data path, I thought of adding it as part of the data path patch. Thanks, Manikanta
Manikanta Pubbisetty <quic_mpubbise@quicinc.com> writes: > On 4/27/2022 11:18 AM, Kalle Valo wrote: >> Manikanta Pubbisetty <quic_mpubbise@quicinc.com> writes: >> >>> On 4/27/2022 11:02 AM, Kalle Valo wrote: >>>> Manikanta Pubbisetty <quic_mpubbise@quicinc.com> writes: >>>> >>>>> HAL RX descriptor for WCN6750 is same as QCN9074, so use >>>>> the DP APIs of QCN9074 for WCN6750. There is one change >>>>> wrt to REO configuration though, REO configuration for >>>>> WCN6750 is same as WCN6855; Therefore, use reo_setup() >>>>> of WCN6855 for WCN6750. >>>>> >>>>> Tested-on: WCN6750 hw1.0 AHB WLAN.MSL.1.0.1-00573-QCAMSLSWPLZ-1 >>>>> Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-01720.1-QCAHSPSWPL_V1_V2_SILICONZ_LITE-1 >>>>> Tested-on: QCN9074 hw1.0 PCI WLAN.HK.2.5.0.1-01100-QCAHKSWPL_SILICONZ-1 >>>>> Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.4.0.1-00192-QCAHKSWPL_SILICONZ-1 >>>>> >>>>> Signed-off-by: Manikanta Pubbisetty <quic_mpubbise@quicinc.com> >>>>> --- >>>>> drivers/net/wireless/ath/ath11k/core.c | 1 + >>>>> drivers/net/wireless/ath/ath11k/hw.c | 31 +++++++++++++++++++++++++++++++ >>>>> 2 files changed, 32 insertions(+) >>>>> >>>>> diff --git a/drivers/net/wireless/ath/ath11k/core.c b/drivers/net/wireless/ath/ath11k/core.c >>>>> index 347131a..f65347c 100644 >>>>> --- a/drivers/net/wireless/ath/ath11k/core.c >>>>> +++ b/drivers/net/wireless/ath/ath11k/core.c >>>>> @@ -458,6 +458,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { >>>>> .num_vdevs = 16 + 1, >>>>> .num_peers = 512, >>>>> .supports_suspend = false, >>>>> + .hal_desc_sz = sizeof(struct hal_rx_desc_qcn9074), >>>> >>>> You mention nothing about this change in the commit log, I'll add that. >>>> >>> >>> I did mention that "HAL RX descriptor for WCN6750 is same as QCN9074", >>> you were looking at something specific? >> >> If I'm understanding correctly, by accident hal_desc_sz was not >> initialised for qcn9074. If that's the case, it would be good to mention >> that in the commit log. >> > > If I understand your comment correctly, since HAL RX descriptor is > related to data path, I thought of adding it as part of the data path > patch. Ah, now I understand better. I thought you were setting hal_desc_sz for qcn9074, but now I checked it and you were actually setting it for wcn6750. It would be better to set hal_desc_sz in patch "ath11k: Add HW params for WCN6750". Actually I would prefer that _all_ existing hw_params fields for wcn6750 would be initialised in patch "ath11k: Add HW params for WCN6750", even if just set to null or invalid values. That way it's easier to track that we are not missing any fields and makes it easier to review other patches. But this is getting more to nitpicking so definitely not a hard requirement.
diff --git a/drivers/net/wireless/ath/ath11k/core.c b/drivers/net/wireless/ath/ath11k/core.c index 347131a..f65347c 100644 --- a/drivers/net/wireless/ath/ath11k/core.c +++ b/drivers/net/wireless/ath/ath11k/core.c @@ -458,6 +458,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { .num_vdevs = 16 + 1, .num_peers = 512, .supports_suspend = false, + .hal_desc_sz = sizeof(struct hal_rx_desc_qcn9074), .supports_regdb = true, .fix_l1ss = true, .credit_flow = true, diff --git a/drivers/net/wireless/ath/ath11k/hw.c b/drivers/net/wireless/ath/ath11k/hw.c index 8d921a6..2bc2232 100644 --- a/drivers/net/wireless/ath/ath11k/hw.c +++ b/drivers/net/wireless/ath/ath11k/hw.c @@ -1013,6 +1013,37 @@ const struct ath11k_hw_ops wcn6750_ops = { .wmi_init_config = ath11k_init_wmi_config_qca6390, .mac_id_to_pdev_id = ath11k_hw_mac_id_to_pdev_id_qca6390, .mac_id_to_srng_id = ath11k_hw_mac_id_to_srng_id_qca6390, + .tx_mesh_enable = ath11k_hw_qcn9074_tx_mesh_enable, + .rx_desc_get_first_msdu = ath11k_hw_qcn9074_rx_desc_get_first_msdu, + .rx_desc_get_last_msdu = ath11k_hw_qcn9074_rx_desc_get_last_msdu, + .rx_desc_get_l3_pad_bytes = ath11k_hw_qcn9074_rx_desc_get_l3_pad_bytes, + .rx_desc_get_hdr_status = ath11k_hw_qcn9074_rx_desc_get_hdr_status, + .rx_desc_encrypt_valid = ath11k_hw_qcn9074_rx_desc_encrypt_valid, + .rx_desc_get_encrypt_type = ath11k_hw_qcn9074_rx_desc_get_encrypt_type, + .rx_desc_get_decap_type = ath11k_hw_qcn9074_rx_desc_get_decap_type, + .rx_desc_get_mesh_ctl = ath11k_hw_qcn9074_rx_desc_get_mesh_ctl, + .rx_desc_get_mpdu_seq_ctl_vld = ath11k_hw_qcn9074_rx_desc_get_mpdu_seq_ctl_vld, + .rx_desc_get_mpdu_fc_valid = ath11k_hw_qcn9074_rx_desc_get_mpdu_fc_valid, + .rx_desc_get_mpdu_start_seq_no = ath11k_hw_qcn9074_rx_desc_get_mpdu_start_seq_no, + .rx_desc_get_msdu_len = ath11k_hw_qcn9074_rx_desc_get_msdu_len, + .rx_desc_get_msdu_sgi = ath11k_hw_qcn9074_rx_desc_get_msdu_sgi, + .rx_desc_get_msdu_rate_mcs = ath11k_hw_qcn9074_rx_desc_get_msdu_rate_mcs, + .rx_desc_get_msdu_rx_bw = ath11k_hw_qcn9074_rx_desc_get_msdu_rx_bw, + .rx_desc_get_msdu_freq = ath11k_hw_qcn9074_rx_desc_get_msdu_freq, + .rx_desc_get_msdu_pkt_type = ath11k_hw_qcn9074_rx_desc_get_msdu_pkt_type, + .rx_desc_get_msdu_nss = ath11k_hw_qcn9074_rx_desc_get_msdu_nss, + .rx_desc_get_mpdu_tid = ath11k_hw_qcn9074_rx_desc_get_mpdu_tid, + .rx_desc_get_mpdu_peer_id = ath11k_hw_qcn9074_rx_desc_get_mpdu_peer_id, + .rx_desc_copy_attn_end_tlv = ath11k_hw_qcn9074_rx_desc_copy_attn_end, + .rx_desc_get_mpdu_start_tag = ath11k_hw_qcn9074_rx_desc_get_mpdu_start_tag, + .rx_desc_get_mpdu_ppdu_id = ath11k_hw_qcn9074_rx_desc_get_mpdu_ppdu_id, + .rx_desc_set_msdu_len = ath11k_hw_qcn9074_rx_desc_set_msdu_len, + .rx_desc_get_attention = ath11k_hw_qcn9074_rx_desc_get_attention, + .rx_desc_get_msdu_payload = ath11k_hw_qcn9074_rx_desc_get_msdu_payload, + .reo_setup = ath11k_hw_wcn6855_reo_setup, + .mpdu_info_get_peerid = ath11k_hw_ipq8074_mpdu_info_get_peerid, + .rx_desc_mac_addr2_valid = ath11k_hw_ipq9074_rx_desc_mac_addr2_valid, + .rx_desc_mpdu_start_addr2 = ath11k_hw_ipq9074_rx_desc_mpdu_start_addr2, }; #define ATH11K_TX_RING_MASK_0 0x1
HAL RX descriptor for WCN6750 is same as QCN9074, so use the DP APIs of QCN9074 for WCN6750. There is one change wrt to REO configuration though, REO configuration for WCN6750 is same as WCN6855; Therefore, use reo_setup() of WCN6855 for WCN6750. Tested-on: WCN6750 hw1.0 AHB WLAN.MSL.1.0.1-00573-QCAMSLSWPLZ-1 Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-01720.1-QCAHSPSWPL_V1_V2_SILICONZ_LITE-1 Tested-on: QCN9074 hw1.0 PCI WLAN.HK.2.5.0.1-01100-QCAHKSWPL_SILICONZ-1 Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.4.0.1-00192-QCAHKSWPL_SILICONZ-1 Signed-off-by: Manikanta Pubbisetty <quic_mpubbise@quicinc.com> --- drivers/net/wireless/ath/ath11k/core.c | 1 + drivers/net/wireless/ath/ath11k/hw.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+)