[PATCH v2] wifi: ath12k: fix ath12k_hal_tx_cmd_ext_desc_setup() info1 override

[PATCH v2] wifi: ath12k: fix ath12k_hal_tx_cmd_ext_desc_setup() info1 override

[Nicolas Escande]

Since inception there is an obvious typo laying around in
ath12k_hal_tx_cmd_ext_desc_setup(). Instead of intitializing + adding
flags to tcl_ext_cmd->info1, we initialize + override. This will be needed
in the future to make broadcast frames work with ethernet encapsulation.

Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1

Signed-off-by: Nicolas Escande <nico.escande@gmail.com>
---
v2:
  - removed spurious 'fbx' from title
  - removed fixes tag as the problem it fixes is not yet enabled mainstream
    see https://lore.kernel.org/linux-wireless/23d62bef-2393-4232-93ff-82ca4dbc4524@oss.qualcomm.com/ 
v1: 
  - initial version
---
 drivers/net/wireless/ath/ath12k/dp_tx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/ath/ath12k/dp_tx.c b/drivers/net/wireless/ath/ath12k/dp_tx.c
index e0b85f959cd4a..00437736e0322 100644
--- a/drivers/net/wireless/ath/ath12k/dp_tx.c
+++ b/drivers/net/wireless/ath/ath12k/dp_tx.c
@@ -117,7 +117,7 @@ static void ath12k_hal_tx_cmd_ext_desc_setup(struct ath12k_base *ab,
 			       le32_encode_bits(ti->data_len,
 						HAL_TX_MSDU_EXT_INFO1_BUF_LEN);
 
-	tcl_ext_cmd->info1 = le32_encode_bits(1, HAL_TX_MSDU_EXT_INFO1_EXTN_OVERRIDE) |
+	tcl_ext_cmd->info1 |= le32_encode_bits(1, HAL_TX_MSDU_EXT_INFO1_EXTN_OVERRIDE) |
 				le32_encode_bits(ti->encap_type,
 						 HAL_TX_MSDU_EXT_INFO1_ENCAP_TYPE) |
 				le32_encode_bits(ti->encrypt_type,
-- 
2.48.1

Re: [PATCH v2] wifi: ath12k: fix ath12k_hal_tx_cmd_ext_desc_setup() info1 override

[Jeff Johnson]

On 1/26/2025 11:13 PM, Nicolas Escande wrote:
> Since inception there is an obvious typo laying around in
> ath12k_hal_tx_cmd_ext_desc_setup(). Instead of intitializing + adding

WARNING:TYPO_SPELLING: 'intitializing' may be misspelled - perhaps 'initializing'?

I'll fix in the 'pending' branch

Re: [PATCH v2] wifi: ath12k: fix ath12k_hal_tx_cmd_ext_desc_setup() info1 override

[Vasanthakumar Thiagarajan]

On 1/27/2025 12:43 PM, Nicolas Escande wrote:
> Since inception there is an obvious typo laying around in
> ath12k_hal_tx_cmd_ext_desc_setup(). Instead of intitializing + adding
> flags to tcl_ext_cmd->info1, we initialize + override. This will be needed
> in the future to make broadcast frames work with ethernet encapsulation.
> 
> Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1
> 
> Signed-off-by: Nicolas Escande <nico.escande@gmail.com>
> ---
> v2:
>    - removed spurious 'fbx' from title
>    - removed fixes tag as the problem it fixes is not yet enabled mainstream
>      see https://lore.kernel.org/linux-wireless/23d62bef-2393-4232-93ff-82ca4dbc4524@oss.qualcomm.com/
> v1:
>    - initial version
> ---
>   drivers/net/wireless/ath/ath12k/dp_tx.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/wireless/ath/ath12k/dp_tx.c b/drivers/net/wireless/ath/ath12k/dp_tx.c
> index e0b85f959cd4a..00437736e0322 100644
> --- a/drivers/net/wireless/ath/ath12k/dp_tx.c
> +++ b/drivers/net/wireless/ath/ath12k/dp_tx.c
> @@ -117,7 +117,7 @@ static void ath12k_hal_tx_cmd_ext_desc_setup(struct ath12k_base *ab,
>   			       le32_encode_bits(ti->data_len,
>   						HAL_TX_MSDU_EXT_INFO1_BUF_LEN);
>   
> -	tcl_ext_cmd->info1 = le32_encode_bits(1, HAL_TX_MSDU_EXT_INFO1_EXTN_OVERRIDE) |
> +	tcl_ext_cmd->info1 |= le32_encode_bits(1, HAL_TX_MSDU_EXT_INFO1_EXTN_OVERRIDE) |
>   				le32_encode_bits(ti->encap_type,
>   						 HAL_TX_MSDU_EXT_INFO1_ENCAP_TYPE) |
>   				le32_encode_bits(ti->encrypt_type,

Reviewed-by: Vasanthakumar Thiagarajan <vasanthakumar.thiagarajan@oss.qualcomm.com>

Re: [PATCH v2] wifi: ath12k: fix ath12k_hal_tx_cmd_ext_desc_setup() info1 override

[Jeff Johnson]

On Mon, 27 Jan 2025 08:13:06 +0100, Nicolas Escande wrote:
> Since inception there is an obvious typo laying around in
> ath12k_hal_tx_cmd_ext_desc_setup(). Instead of intitializing + adding
> flags to tcl_ext_cmd->info1, we initialize + override. This will be needed
> in the future to make broadcast frames work with ethernet encapsulation.
> 
> Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1
> 
> [...]

Applied, thanks!

[1/1] wifi: ath12k: fix ath12k_hal_tx_cmd_ext_desc_setup() info1 override
      commit: df11edfba49e5fb69f4c9e7cb76082b89c417f78

Best regards,
-- 
Jeff Johnson <jeff.johnson@oss.qualcomm.com>