Manikanta Pubbisetty <quic_mpubbise@xxxxxxxxxxx> writes:
> WCN6750 uses static window mapping to access the HW registers.
> Unlike QCN9074 which uses 2nd window for CE and 3rd window
> for UMAC register accesses, WCN6750 uses 1st window for UMAC
> and 2nd window for CE registers.
>
> Code is refactored so that WCN6750 can use the existing
> ath11k_pci_read/write() APIs for accessing the registers.
>
> 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@xxxxxxxxxxx>
> ---
> drivers/net/wireless/ath/ath11k/ahb.c | 3 ++
> drivers/net/wireless/ath/ath11k/core.h | 2 +
> drivers/net/wireless/ath/ath11k/pci.c | 4 ++
> drivers/net/wireless/ath/ath11k/pcic.c | 53 +++++++++-----------------
> 4 files changed, 28 insertions(+), 34 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath11k/ahb.c b/drivers/net/wireless/ath/ath11k/ahb.c
> index d73643e3e8dd..d27fc7276977 100644
> --- a/drivers/net/wireless/ath/ath11k/ahb.c
> +++ b/drivers/net/wireless/ath/ath11k/ahb.c
> @@ -42,6 +42,9 @@ const struct ath11k_bus_params ath11k_ahb_hybrid_bus_params = {
> .fixed_bdf_addr = false,
> .fixed_mem_region = false,
> .hybrid_bus_type = true,
> + .static_window_map = true,
> + .dp_window_idx = 1,
> + .ce_window_idx = 2,
> };
Even if the values are zero, please initialise the new fields in every
bus_params structure:
ahb.c:31:static const struct ath11k_bus_params ath11k_ahb_bus_params = {
pci.c:118:static const struct ath11k_bus_params ath11k_pci_bus_params = {
> --- a/drivers/net/wireless/ath/ath11k/pci.c
> +++ b/drivers/net/wireless/ath/ath11k/pci.c
> @@ -771,6 +771,10 @@ static int ath11k_pci_probe(struct pci_dev *pdev,
> ab->bus_params.static_window_map = true;
> ab->pci.ops = &ath11k_pci_ops_qcn9074;
> ab->hw_rev = ATH11K_HW_QCN9074_HW10;
> +
> + /* For QCN9074, CE: 2nd window, UMAC: 3rd window */
> + ab->bus_params.ce_window_idx = 2;
> + ab->bus_params.dp_window_idx = 3;
Bus params are supposed to be const so that you cannot change them. If
there are device specific attributes they should be in hw_params.
I see now that both hw_params and bus_params are not const in struct
ath11k_base and that's why you were able to change them:
struct ath11k_hw_params hw_params;
struct ath11k_bus_params bus_params;
I'll send a separate patch to fix that.
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
