Skip to contentSkip to conversation

ath10k: Avoid override CE5 configuration for QCA99X0 chipsets

PATCH In review Maharaja Kennadyrajan 3 participants 8 messages Apr 23, 2020 – Jun 8, 2020 Qualcomm Atheros ATH10K wireless driver

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ath10k: Avoid override CE5 configuration for QCA99X0 chipsets

As the exisiting CE configurations are defined in global, there are the chances of QCA99X0 family chipsets CE configurations are getting changed by the ath10k_pci_override_ce_config() function.

The override will be hit and CE5 configurations will be changed, when the user bring up the QCA99X0 chipsets along with QCA6174 or QCA9377 chipset. (Bring up QCA99X0 family chipsets after QCA6174 or QCA9377).

Hence, fixing this issue by moving the global CE configuration to radio specific CE configuration.

Tested hardware: QCA9888 & QCA6174
Tested firmware: 10.4-3.10-00047 & WLAN.RM.4.4.1.c3-00058

---
 drivers/net/wireless/ath/ath10k/ce.h   |  2 +-
 drivers/net/wireless/ath/ath10k/pci.c  | 74 ++++++++++++++++++++++++++--------
 drivers/net/wireless/ath/ath10k/pci.h  |  4 ++
 drivers/net/wireless/ath/ath10k/snoc.c |  4 +-
 4 files changed, 64 insertions(+), 20 deletions(-)
drivers/net/wireless/ath/ath10k/ce.h +1 -1
index a7478c2..9711f0e 100644
@@ -419,7 +419,7 @@ struct ce_pipe_config {
 #define PIPEDIR_INOUT   3  /* bidirectional */
 
 /* Establish a mapping between a service/direction and a pipe. */
-struct service_to_pipe {
+struct ce_service_to_pipe {
 	__le32 service_id;
 	__le32 pipedir;
 	__le32 pipenum;
drivers/net/wireless/ath/ath10k/pci.c +57 -17

192 lines not on this page · raw message

drivers/net/wireless/ath/ath10k/pci.h +4 -0
index 4455ed6c5..e3cbd25 100644
@@ -183,6 +183,10 @@ struct ath10k_pci {
 	 * this struct.
 	 */
 	struct ath10k_ahb ahb[0];
+
+	struct ce_attr *attr;
+	struct ce_pipe_config *pipe_config;
+	struct ce_service_to_pipe *serv_to_pipe;
 };
 
 static inline struct ath10k_pci *ath10k_pci_priv(struct ath10k *ar)
drivers/net/wireless/ath/ath10k/snoc.c +2 -2
index 21081b4..3e870aa 100644
@@ -356,7 +356,7 @@
 	},
 };
 
-static struct service_to_pipe target_service_to_ce_map_wlan[] = {
+static struct ce_service_to_pipe target_service_to_ce_map_wlan[] = {
 	{
 		__cpu_to_le32(ATH10K_HTC_SVC_ID_WMI_DATA_VO),
 		__cpu_to_le32(PIPEDIR_OUT),	/* out = UL = host -> target */
@@ -769,7 +769,7 @@ static int ath10k_snoc_hif_map_service_to_pipe(struct ath10k *ar,
 					       u16 service_id,
 					       u8 *ul_pipe, u8 *dl_pipe)
 {
-	const struct service_to_pipe *entry;
+	const struct ce_service_to_pipe *entry;
 	bool ul_set = false, dl_set = false;
 	int i;
 
Signature · 6 lines
1.9.1

_______________________________________________
ath10k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath10k
#1 lore raw
Quoted 10 lines · Maharaja Kennadyrajan

As the exisiting CE configurations are defined in global, there are the chances of QCA99X0 family chipsets CE configurations are getting changed by the ath10k_pci_override_ce_config() function.

The override will be hit and CE5 configurations will be changed, when the user bring up the QCA99X0 chipsets along with QCA6174 or QCA9377 chipset. (Bring up QCA99X0 family chipsets after QCA6174 or QCA9377).

Quoted 8 lines

Hence, fixing this issue by moving the global CE configuration to radio specific CE configuration.

Tested hardware: QCA9888 & QCA6174
Tested firmware: 10.4-3.10-00047 & WLAN.RM.4.4.1.c3-00058

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

521fc37be3d8 ath10k: Avoid override CE5 configuration for QCA99X0 chipsets

Signature · 3 lines
https://patchwork.kernel.org/patch/11505695/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
#2 lore raw
In reply to Maharaja Kennadyrajan
Quoted 10 lines · Maharaja Kennadyrajan

As the exisiting CE configurations are defined in global, there are the chances of QCA99X0 family chipsets CE configurations are getting changed by the ath10k_pci_override_ce_config() function.

The override will be hit and CE5 configurations will be changed, when the user bring up the QCA99X0 chipsets along with QCA6174 or QCA9377 chipset. (Bring up QCA99X0 family chipsets after QCA6174 or QCA9377).

Quoted 8 lines

Hence, fixing this issue by moving the global CE configuration to radio specific CE configuration.

Tested hardware: QCA9888 & QCA6174
Tested firmware: 10.4-3.10-00047 & WLAN.RM.4.4.1.c3-00058

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

521fc37be3d8 ath10k: Avoid override CE5 configuration for QCA99X0 chipsets

Signature · 8 lines
https://patchwork.kernel.org/patch/11505695/

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

_______________________________________________
ath10k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath10k
#3 lore raw

Am 05.05.2020 um 09:34 schrieb Kalle Valo:

Quoted 15 lines
Quoted 13 lines · Maharaja Kennadyrajan

As the exisiting CE configurations are defined in global, there are the chances of QCA99X0 family chipsets CE configurations are getting changed by the ath10k_pci_override_ce_config() function.

The override will be hit and CE5 configurations will be changed, when the user bring up the QCA99X0 chipsets along with QCA6174 or QCA9377 chipset. (Bring up QCA99X0 family chipsets after QCA6174 or QCA9377).

Hence, fixing this issue by moving the global CE configuration to radio specific CE configuration.

Quoted 8 lines
Quoted 5 lines

Tested hardware: QCA9888 & QCA6174
Tested firmware: 10.4-3.10-00047 & WLAN.RM.4.4.1.c3-00058

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

521fc37be3d8 ath10k: Avoid override CE5 configuration for QCA99X0 chipsets

this patch will crash on ipq4019 devices. i reverted it and it worked again

#4 lore raw
Quoted 20 lines · Sebastian Gottschall

Am 05.05.2020 um 09:34 schrieb Kalle Valo:

Quoted 18 lines
Quoted 16 lines · Maharaja Kennadyrajan

As the exisiting CE configurations are defined in global, there are the chances of QCA99X0 family chipsets CE configurations are getting changed by the ath10k_pci_override_ce_config() function.

The override will be hit and CE5 configurations will be changed, when the user bring up the QCA99X0 chipsets along with QCA6174 or QCA9377 chipset. (Bring up QCA99X0 family chipsets after QCA6174 or QCA9377).

Hence, fixing this issue by moving the global CE configuration to radio specific CE configuration.

Tested hardware: QCA9888 & QCA6174
Tested firmware: 10.4-3.10-00047 & WLAN.RM.4.4.1.c3-00058

Quoted 8 lines
Quoted 6 lines
Quoted 2 lines

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

521fc37be3d8 ath10k: Avoid override CE5 configuration for QCA99X0 chipsets

this patch will crash on ipq4019 devices. i reverted it and it worked again

Yeah, that patch is buggy but this should fix it:

commit 32221df6765b3773ff1af37c77f8531ebc48f246

Author:     Arnd Bergmann <[email protected]>
AuthorDate: Sat May 9 14:06:33 2020 +0200
Commit:     Kalle Valo <[email protected]>
CommitDate: Tue May 12 10:33:13 2020 +0300

ath10k: fix ath10k_pci struct layout

Signature · 6 lines
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

_______________________________________________
ath10k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath10k
#5 lore raw

will check it

Am 29.05.2020 um 17:36 schrieb Kalle Valo:

Quoted 38 lines
Quoted 20 lines · Sebastian Gottschall

Am 05.05.2020 um 09:34 schrieb Kalle Valo:

Quoted 18 lines
Quoted 16 lines · Maharaja Kennadyrajan

As the exisiting CE configurations are defined in global, there are the chances of QCA99X0 family chipsets CE configurations are getting changed by the ath10k_pci_override_ce_config() function.

The override will be hit and CE5 configurations will be changed, when the user bring up the QCA99X0 chipsets along with QCA6174 or QCA9377 chipset. (Bring up QCA99X0 family chipsets after QCA6174 or QCA9377).

Hence, fixing this issue by moving the global CE configuration to radio specific CE configuration.

Tested hardware: QCA9888 & QCA6174
Tested firmware: 10.4-3.10-00047 & WLAN.RM.4.4.1.c3-00058

Quoted 6 lines
Quoted 5 lines
Quoted 2 lines

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

521fc37be3d8 ath10k: Avoid override CE5 configuration for QCA99X0 chipsets

this patch will crash on ipq4019 devices. i reverted it and it worked again

Yeah, that patch is buggy but this should fix it:

commit 32221df6765b3773ff1af37c77f8531ebc48f246

Author:     Arnd Bergmann <[email protected]>
AuthorDate: Sat May 9 14:06:33 2020 +0200
Commit:     Kalle Valo <[email protected]>
CommitDate: Tue May 12 10:33:13 2020 +0300

ath10k: fix ath10k_pci struct layout

#6 lore raw
In reply to Kalle Valo
Quoted 9 lines

Yeah, that patch is buggy but this should fix it:

commit 32221df6765b3773ff1af37c77f8531ebc48f246

Author:     Arnd Bergmann <[email protected]>
AuthorDate: Sat May 9 14:06:33 2020 +0200
Commit:     Kalle Valo <[email protected]>
CommitDate: Tue May 12 10:33:13 2020 +0300

ath10k: fix ath10k_pci struct layout

this patch seem to be totally unrelated to the crash issue, the patch was already part of the test tree while testing. the crash is caused by ar_pci->pipe_config beeing NULL on ipq4019 chipsets.
originally pipe_config is allocated by ath10k_pci_probe. but ath10k_pci_probe is never used for ahb chipsets so the code must fix ath10k_ahb_probe to allocate these fields, or a more generic solution must be found

Quoted 1 line

_______________________________________________
ath10k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath10k

#7 lore raw
Quoted 8 lines · Sebastian Gottschall
Quoted 8 lines

Yeah, that patch is buggy but this should fix it:

commit 32221df6765b3773ff1af37c77f8531ebc48f246

Author:     Arnd Bergmann <[email protected]>
AuthorDate: Sat May 9 14:06:33 2020 +0200
Commit:     Kalle Valo <[email protected]>
CommitDate: Tue May 12 10:33:13 2020 +0300
Quoted 8 lines
Quoted 1 line

ath10k: fix ath10k_pci struct layout

this patch seem to be totally unrelated to the crash issue, the patch was already part of the test tree while testing.
the crash is caused by ar_pci->pipe_config beeing NULL on ipq4019 chipsets. originally pipe_config is allocated by ath10k_pci_probe. but ath10k_pci_probe is never used for ahb chipsets
so the code must fix ath10k_ahb_probe to allocate these fields, or a more generic solution must be found

Maharaja, please investigate. It seems your patch caused a regression:

521fc37be3d8 ath10k: Avoid override CE5 configuration for QCA99X0 chipsets

Signature · 6 lines
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

_______________________________________________
ath10k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath10k