On Tuesday, September 17, 2019 8:44:12 AM CEST Kalle Valo wrote:
> Christian Lamparter <chunkeey@xxxxxxxxx> wrote:
>
> > This patch restores the old behavior that read
> > the chip_id on the QCA988x before resetting the
> > chip. This needs to be done in this order since
> > the unsupported QCA988x AR1A chips fall off the
> > bus when resetted. Otherwise the next MMIO Op
> > after the reset causes a BUS ERROR and panic.
> >
> > Cc: stable@xxxxxxxxxxxxxxx
> > Fixes: 1a7fecb766c8 ("ath10k: reset chip before reading chip_id in probe")
> > Signed-off-by: Christian Lamparter <chunkeey@xxxxxxxxx>
>
> I'll drop this as there's no plan to support QCA988X hw1.0.
Kalle,
I'm surprised about this. And your justification
"no plan to support QCA988X hw1.0" seems very odd in this context,
because this patch does not add any support for the QCA988X hw1.0.
But, I could see how the mails/replies from Tom Psyborg derailed the
topic here. Though, I'm not sure if this is the case or not.
So let set the record straight and show you the result of having that
patch applied and load ath10k_pci with a QCA9880 v1 AR1A:
[ 1491.622282] ath10k_pci 0000:00:00.0: device 003c with chip_id 043200ff isn't supported
(System is all good!)
And without the patch:
[ 900.320000] Data bus error, epc == 86a9a1b0, ra == 86a9a4b0
[ 900.320000] Oops[#1]:
[ 900.320000] CPU: 0 PID: 8127 Comm: insmod Not tainted 5.2.16 #1
[ 900.320000] task: 8790dd50 ti: 86a2c000 task.ti: 86a2c000
[ 900.320000] $ 0 : 00000000 80350000 deadc0de 1000fc03
[ 900.320000] $ 4 : b2080000 8790dd50 1000fc00 ffff00fe
[ 900.320000] $ 8 : 86a2dfe0 0000fc00 00000000 00000000
[ 900.320000] $12 : 00000005 00000000 00000000 00420000
[ 900.320000] $16 : 00000009 8788d400 869f9000 87821800
[ 900.320000] $20 : 00000009 b2080008 b2080000 00000001
[ 900.320000] $24 : 00000000 8006b784
[ 900.320000] $28 : 86a2c000 86a2dba8 b2080004 86a7a5b0
[ 900.320000] Hi : 000000d1
[ 900.320000] Lo : 9ea86180
[ 900.320000] epc : 86a7a5b0 ath10k_pci_cold_reset+0xf88/0x1bb0 [ath10k_pci]
[ 900.320000] Not tainted
[ 900.320000] ra : 86a7a5b0 ath10k_pci_cold_reset+0xf88/0x1bb0 [ath10k_pci]
[ 900.320000] Status: 1000fc03 KERNEL EXL IE
[ 900.320000] Cause : 4080801c
[ 900.320000] PrId : 00019750 (MIPS 74Kc)
[ 900.320000] Modules linked in: ath10k_pci(+) ath10k_core [...]
[ 900.320000] Process insmod (pid: 1127, threadinfo=86a2c000, task=8790dd50, tls=775b1440)
[ 900.320000] Stack : 80301d90 8790dd50 8790dd50 80301d90 8790c430 80067e78 00000000 87821800
00080000 00000000 80373900 86a2dc0c 80373900 0000ea80 00000009 b2080008
b2080000 00000001 80373900 80066964 86a2dc0c 80081e80 8790dd50 86a63924
00000001 00000000 00200200 0000ea80 80373900 80081e80 8790dd50 ffffffff
8788d400 00000009 8788d400 86a2dc58 87821800 80082398 86a2dc5c 86a7d140
...
[ 900.320000] Call Trace:
[ 900.320000] [<86a7a5b0>] ath10k_pci_cold_reset+0xf88/0x1bb0 [ath10k_pci]
[ 900.320000]
[ 900.320000]
Code: 2410000a 0c0621d3 02c02021 <30420400> 10400006 00002021 24040001 0c0208de 2610ffff
[ 900.570000] ---[ end trace 1e4e2b7fd4ac9eb8 ]---
Segmentation fault
Notice the DATA BUS Error! The router is unusable at that point and no longer "working".
As for why this patch was coded this way. It's because this patch follows Michał Kazior
recommendation of how to handle this card in his reply to a previous thread
"ath10k: reset chip after supported check" regarding the same issue. He did check for a
QCA988X Hardware and only then perform the SOC_CHIP_ID_ADDRESS read.
<https://patchwork.kernel.org/patch/10866417/#22549011>
|That makes sense, but I don't see how blacklisting pci slots would
|help someone putting v2 nic into C7v1 mobo? Won't the slot be the same
|regardless what nic is put?
|
|The best thing I can come up with is something like this:
|
|--- a/drivers/net/wireless/ath/ath10k/pci.c
|+++ b/drivers/net/wireless/ath/ath10k/pci.c
|@@ -3629,6 +3629,19 @@ static int ath10k_pci_probe(struct pci_dev *pdev,
| goto err_deinit_irq;
| }
|
|+ if (hw_rev == ATH10K_HW_QCA988X) {
|+ /* v1 can crash the system on chip_reset()
|+ * so all we can do is keep our fingers
|+ * crossed v2 never reports 0 without a
|+ * chip_reset()
|+ */
|+ if (ath10k_pci_soc_read32(ar, SOC_CHIP_ID_ADDRESS) == 0) {
|+ ath10k_err(ar, "qca9880 v1 is chip not supported");
|+ ret = -ENOTSUP;
|+ goto err_free_irq;
|+ }
|+ }
|+
| ret = ath10k_pci_chip_reset(ar);
| if (ret) {
| ath10k_err(ar, "failed to reset chip: %d\n", ret);
|
|I didn't test it. Someone needs to compile and test and make sure v2
|doesn't regress when fw hangs and cold & warm host cpu resets are
|mixed in.
I do hope this helped "to clear things up" since I did not add support
for the QCA9880 v1 AR1A here and don't plan to do so.
Regards,
Christian
