From: Greg Kroah-Hartman Date: Mon, 2 Dec 2019 09:16:19 +0000 (+0100) Subject: drop ath10k-restore-qca9880-ar1a-v1-detection.patch from 4.9 and 4.4 queues X-Git-Tag: v5.4.2~57 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2a442359aae10dfab04bb2c6f33f7f26589204f4;p=thirdparty%2Fkernel%2Fstable-queue.git drop ath10k-restore-qca9880-ar1a-v1-detection.patch from 4.9 and 4.4 queues --- diff --git a/queue-4.4/ath10k-restore-qca9880-ar1a-v1-detection.patch b/queue-4.4/ath10k-restore-qca9880-ar1a-v1-detection.patch deleted file mode 100644 index 41a561b68f7..00000000000 --- a/queue-4.4/ath10k-restore-qca9880-ar1a-v1-detection.patch +++ /dev/null @@ -1,81 +0,0 @@ -From f2d15dee3c98df2bf315aab121c49a4bbdea237b Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 29 Nov 2019 21:53:50 +0100 -Subject: ath10k: restore QCA9880-AR1A (v1) detection - -From: Christian Lamparter - -commit f8914a14623a79b73f72b2b1ee4cd9b2cb91b735 upstream - -Signed-off-by: Sasha Levin ---- - drivers/net/wireless/ath/ath10k/pci.c | 27 +++++++++++++++++++++------ - 1 file changed, 21 insertions(+), 6 deletions(-) - -diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c -index 907fd60c42415..5814050250215 100644 ---- a/drivers/net/wireless/ath/ath10k/pci.c -+++ b/drivers/net/wireless/ath/ath10k/pci.c -@@ -2988,12 +2988,13 @@ static int ath10k_pci_probe(struct pci_dev *pdev, - struct ath10k_pci *ar_pci; - enum ath10k_hw_rev hw_rev; - u32 chip_id; -- bool pci_ps; -+ bool pci_ps, is_qca988x = false; - - switch (pci_dev->device) { - case QCA988X_2_0_DEVICE_ID: - hw_rev = ATH10K_HW_QCA988X; - pci_ps = false; -+ is_qca988x = true; - break; - case QCA6164_2_1_DEVICE_ID: - case QCA6174_2_1_DEVICE_ID: -@@ -3087,6 +3088,19 @@ static int ath10k_pci_probe(struct pci_dev *pdev, - goto err_deinit_irq; - } - -+ /* Read CHIP_ID before reset to catch QCA9880-AR1A v1 devices that -+ * fall off the bus during chip_reset. These chips have the same pci -+ * device id as the QCA9880 BR4A or 2R4E. So that's why the check. -+ */ -+ if (is_qca988x) { -+ chip_id = ath10k_pci_soc_read32(ar, SOC_CHIP_ID_ADDRESS); -+ if (chip_id != 0xffffffff) { -+ if (!ath10k_pci_chip_is_supported(pdev->device, -+ chip_id)) -+ goto err_unsupported; -+ } -+ } -+ - ret = ath10k_pci_chip_reset(ar); - if (ret) { - ath10k_err(ar, "failed to reset chip: %d\n", ret); -@@ -3099,11 +3113,8 @@ static int ath10k_pci_probe(struct pci_dev *pdev, - goto err_free_irq; - } - -- if (!ath10k_pci_chip_is_supported(pdev->device, chip_id)) { -- ath10k_err(ar, "device %04x with chip_id %08x isn't supported\n", -- pdev->device, chip_id); -- goto err_free_irq; -- } -+ if (!ath10k_pci_chip_is_supported(pdev->device, chip_id)) -+ goto err_unsupported; - - ret = ath10k_core_register(ar, chip_id); - if (ret) { -@@ -3113,6 +3124,10 @@ static int ath10k_pci_probe(struct pci_dev *pdev, - - return 0; - -+err_unsupported: -+ ath10k_err(ar, "device %04x with chip_id %08x isn't supported\n", -+ pdev->device, bus_params.chip_id); -+ - err_free_irq: - ath10k_pci_free_irq(ar); - ath10k_pci_kill_tasklet(ar); --- -2.20.1 - diff --git a/queue-4.4/series b/queue-4.4/series index e75936f0ae3..f9a264d7944 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -74,4 +74,3 @@ acpi-apei-switch-estatus-pool-to-use-vmalloc-memory.patch scsi-libsas-check-smp-phy-control-function-result.patch powerpc-pseries-dlpar-fix-a-missing-check-in-dlpar_p.patch mtd-remove-a-debug-trace-in-mtdpart.c.patch -ath10k-restore-qca9880-ar1a-v1-detection.patch diff --git a/queue-4.9/ath10k-restore-qca9880-ar1a-v1-detection.patch b/queue-4.9/ath10k-restore-qca9880-ar1a-v1-detection.patch deleted file mode 100644 index 55ab404304d..00000000000 --- a/queue-4.9/ath10k-restore-qca9880-ar1a-v1-detection.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 181f18952d6a29de3c471c85ae524e8878c1f3e2 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 29 Nov 2019 21:52:21 +0100 -Subject: ath10k: restore QCA9880-AR1A (v1) detection - -From: Christian Lamparter - -commit f8914a14623a79b73f72b2b1ee4cd9b2cb91b735 upstream - -Signed-off-by: Sasha Levin ---- - drivers/net/wireless/ath/ath10k/pci.c | 27 +++++++++++++++++++++------ - 1 file changed, 21 insertions(+), 6 deletions(-) - -diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c -index d84a362a084ac..192708019e1cd 100644 ---- a/drivers/net/wireless/ath/ath10k/pci.c -+++ b/drivers/net/wireless/ath/ath10k/pci.c -@@ -3171,7 +3171,7 @@ static int ath10k_pci_probe(struct pci_dev *pdev, - struct ath10k_pci *ar_pci; - enum ath10k_hw_rev hw_rev; - u32 chip_id; -- bool pci_ps; -+ bool pci_ps, is_qca988x = false; - int (*pci_soft_reset)(struct ath10k *ar); - int (*pci_hard_reset)(struct ath10k *ar); - u32 (*targ_cpu_to_ce_addr)(struct ath10k *ar, u32 addr); -@@ -3180,6 +3180,7 @@ static int ath10k_pci_probe(struct pci_dev *pdev, - case QCA988X_2_0_DEVICE_ID: - hw_rev = ATH10K_HW_QCA988X; - pci_ps = false; -+ is_qca988x = true; - pci_soft_reset = ath10k_pci_warm_reset; - pci_hard_reset = ath10k_pci_qca988x_chip_reset; - targ_cpu_to_ce_addr = ath10k_pci_qca988x_targ_cpu_to_ce_addr; -@@ -3299,6 +3300,19 @@ static int ath10k_pci_probe(struct pci_dev *pdev, - goto err_deinit_irq; - } - -+ /* Read CHIP_ID before reset to catch QCA9880-AR1A v1 devices that -+ * fall off the bus during chip_reset. These chips have the same pci -+ * device id as the QCA9880 BR4A or 2R4E. So that's why the check. -+ */ -+ if (is_qca988x) { -+ chip_id = ath10k_pci_soc_read32(ar, SOC_CHIP_ID_ADDRESS); -+ if (chip_id != 0xffffffff) { -+ if (!ath10k_pci_chip_is_supported(pdev->device, -+ chip_id)) -+ goto err_unsupported; -+ } -+ } -+ - ret = ath10k_pci_chip_reset(ar); - if (ret) { - ath10k_err(ar, "failed to reset chip: %d\n", ret); -@@ -3311,11 +3325,8 @@ static int ath10k_pci_probe(struct pci_dev *pdev, - goto err_free_irq; - } - -- if (!ath10k_pci_chip_is_supported(pdev->device, chip_id)) { -- ath10k_err(ar, "device %04x with chip_id %08x isn't supported\n", -- pdev->device, chip_id); -- goto err_free_irq; -- } -+ if (!ath10k_pci_chip_is_supported(pdev->device, chip_id)) -+ goto err_unsupported; - - ret = ath10k_core_register(ar, chip_id); - if (ret) { -@@ -3325,6 +3336,10 @@ static int ath10k_pci_probe(struct pci_dev *pdev, - - return 0; - -+err_unsupported: -+ ath10k_err(ar, "device %04x with chip_id %08x isn't supported\n", -+ pdev->device, bus_params.chip_id); -+ - err_free_irq: - ath10k_pci_free_irq(ar); - ath10k_pci_rx_retry_sync(ar); --- -2.20.1 - diff --git a/queue-4.9/series b/queue-4.9/series index 7336be6d350..c220f636998 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -102,5 +102,4 @@ acpi-apei-switch-estatus-pool-to-use-vmalloc-memory.patch scsi-libsas-check-smp-phy-control-function-result.patch powerpc-pseries-dlpar-fix-a-missing-check-in-dlpar_p.patch mtd-remove-a-debug-trace-in-mtdpart.c.patch -ath10k-restore-qca9880-ar1a-v1-detection.patch mm-gup-add-missing-refcount-overflow-checks-on-x86-a.patch