2024-05-24 02:40:39

by Baochen Qiang

Subject: [PATCH] wifi: ath12k: fix wrong definition of CE ring's base address

Base address of CE ring is defined as u32, currently this works
because DMA mask configured as 32 bit:

#define ATH12K_PCI_DMA_MASK 32

However this mask could be changed once firmware bugs are fixed
to fully support 36 bit DMA addressing. So to protect against any
future changes to the DMA mask, change the type of the fields that
are dependent upon it.

This is found during code review. Compile tested only.

Fixes: d889913205cf ("wifi: ath12k: driver for Qualcomm Wi-Fi 7 devices")
Signed-off-by: Baochen Qiang <[email protected]>
---
drivers/net/wireless/ath/ath12k/ce.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/ath/ath12k/ce.h b/drivers/net/wireless/ath/ath12k/ce.h
index 79af3b6159f1..857bc5f9e946 100644
--- a/drivers/net/wireless/ath/ath12k/ce.h
+++ b/drivers/net/wireless/ath/ath12k/ce.h
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: BSD-3-Clause-Clear */
/*
* Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.
- * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2021-2022, 2024 Qualcomm Innovation Center, Inc. All rights reserved.
*/

#ifndef ATH12K_CE_H
@@ -119,7 +119,7 @@ struct ath12k_ce_ring {
/* Host address space */
void *base_addr_owner_space_unaligned;
/* CE address space */
- u32 base_addr_ce_space_unaligned;
+ dma_addr_t base_addr_ce_space_unaligned;

/* Actual start of descriptors.
* Aligned to descriptor-size boundary.
@@ -129,7 +129,7 @@ struct ath12k_ce_ring {
void *base_addr_owner_space;

/* CE address space */
- u32 base_addr_ce_space;
+ dma_addr_t base_addr_ce_space;

/* HAL ring id */
u32 hal_ring_id;

base-commit: fae0804439b5833308ab7d8563c643edb0fa174c
--
2.25.1

2024-05-24 16:27:59

by Jeff Johnson

Subject: Re: [PATCH] wifi: ath12k: fix wrong definition of CE ring's base address

On 5/23/2024 7:40 PM, Baochen Qiang wrote:
> Base address of CE ring is defined as u32, currently this works
> because DMA mask configured as 32 bit:
>
> #define ATH12K_PCI_DMA_MASK 32
>
> However this mask could be changed once firmware bugs are fixed
> to fully support 36 bit DMA addressing. So to protect against any
> future changes to the DMA mask, change the type of the fields that
> are dependent upon it.
>
> This is found during code review. Compile tested only.
>
> Fixes: d889913205cf ("wifi: ath12k: driver for Qualcomm Wi-Fi 7 devices")
> Signed-off-by: Baochen Qiang <[email protected]>
Acked-by: Jeff Johnson <[email protected]>

2024-05-28 17:47:05

by Kalle Valo

Subject: Re: [PATCH] wifi: ath12k: fix wrong definition of CE ring's base address

Baochen Qiang <[email protected]> wrote:

> Base address of CE ring is defined as u32, currently this works
> because DMA mask configured as 32 bit:
>
> #define ATH12K_PCI_DMA_MASK 32
>
> However this mask could be changed once firmware bugs are fixed
> to fully support 36 bit DMA addressing. So to protect against any
> future changes to the DMA mask, change the type of the fields that
> are dependent upon it.
>
> This is found during code review. Compile tested only.
>
> Fixes: d889913205cf ("wifi: ath12k: driver for Qualcomm Wi-Fi 7 devices")
> Signed-off-by: Baochen Qiang <[email protected]>
> Acked-by: Jeff Johnson <[email protected]>
> Signed-off-by: Kalle Valo <[email protected]>

Patch applied to ath-next branch of ath.git, thanks.

0ae570703754 wifi: ath12k: fix wrong definition of CE ring's base address

--
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches