ath10k: pci: Only dump ATH10K_MEM_REGION_TYPE_IOREG when safe (d2393801) · Commits · 戴 / test

ath10k_pci_dump_memory_reg() will try to access memory of type ATH10K_MEM_REGION_TYPE_IOREG however, if a hardware restart is in progress this can crash a system. Individual ioread32() time has been observed to jump from 15-20 ticks to > 80k ticks followed by a secure-watchdog bite and a system reset. Work around this corner case by only issuing the read transaction when the driver state is ATH10K_STATE_ON. Tested-on: QCA9988 PCI 10.4-3.9.0.2-00044 Fixes: ("ath10k: add memory dump support QCA9984") Signed-off-by:

Bryan O'Donoghue <bryan.odonoghue@linaro.org> Signed-off-by:

Kalle Valo <kvalo@codeaurora.org>

drivers/net/wireless/ath/ath10k/pci.c

+17 −2

Original line number	Diff line number	Diff line
		@@ -1604,11 +1604,22 @@ static int ath10k_pci_dump_memory_reg(struct ath10k *ar,
		{
		struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);
		u32 i;
		int ret;

		mutex_lock(&ar->conf_mutex);
		if (ar->state != ATH10K_STATE_ON) {
		ath10k_warn(ar, "Skipping pci_dump_memory_reg invalid state\n");
		ret = -EIO;
		goto done;
		}

		for (i = 0; i < region->len; i += 4)
		(u32 )(buf + i) = ioread32(ar_pci->mem + region->start + i);

		return region->len;
		ret = region->len;
		done:
		mutex_unlock(&ar->conf_mutex);
		return ret;
		}

		/* if an error happened returns < 0, otherwise the length */
		@@ -1704,7 +1715,11 @@ static void ath10k_pci_dump_memory(struct ath10k *ar,
		count = ath10k_pci_dump_memory_sram(ar, current_region, buf);
		break;
		case ATH10K_MEM_REGION_TYPE_IOREG:
		count = ath10k_pci_dump_memory_reg(ar, current_region, buf);
		ret = ath10k_pci_dump_memory_reg(ar, current_region, buf);
		if (ret < 0)
		break;

		count = ret;
		break;
		default:
		ret = ath10k_pci_dump_memory_generic(ar, current_region, buf);

Admin message