AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-01-14 15:06:08 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

ath10k: use ath10k_do_pci_wake/sleep

Browse Source 
This removes some remaining direct use of the wake
register which could interfere with power state
tracking of the target device. This will allow
initialization code reordering.

Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
This commit is contained in:
Michal Kazior 2013-11-08 08:01:30 +01:00 committed by Kalle Valo
parent 8630e3ad92
commit 5b2589fcff
1 changed files with 26 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
drivers/net/wireless/ath/ath10k/pci.c
View File

@ -52,7 +52,7 @@ static int ath10k_pci_post_rx_pipe(struct ath10k_pci_pipe *pipe_info,
int num); int num);
static void ath10k_pci_rx_pipe_cleanup(struct ath10k_pci_pipe *pipe_info); static void ath10k_pci_rx_pipe_cleanup(struct ath10k_pci_pipe *pipe_info);
static void ath10k_pci_stop_ce(struct ath10k *ar); static void ath10k_pci_stop_ce(struct ath10k *ar);
static void ath10k_pci_device_reset(struct ath10k *ar); static int ath10k_pci_device_reset(struct ath10k *ar);
static int ath10k_pci_wait_for_target_init(struct ath10k *ar); static int ath10k_pci_wait_for_target_init(struct ath10k *ar);
static int ath10k_pci_start_intr(struct ath10k *ar); static int ath10k_pci_start_intr(struct ath10k *ar);
static void ath10k_pci_stop_intr(struct ath10k *ar); static void ath10k_pci_stop_intr(struct ath10k *ar);
@ -526,21 +526,6 @@ static bool ath10k_pci_target_is_awake(struct ath10k *ar)
return (RTC_STATE_V_GET(val) == RTC_STATE_V_ON); return (RTC_STATE_V_GET(val) == RTC_STATE_V_ON);
} }
static int ath10k_pci_wait(struct ath10k *ar)
{
int n = 100;
while (n-- && !ath10k_pci_target_is_awake(ar))
msleep(10);
if (n < 0) {
ath10k_warn("Unable to wakeup target\n");
return -ETIMEDOUT;
}
return 0;
}
int ath10k_do_pci_wake(struct ath10k *ar) int ath10k_do_pci_wake(struct ath10k *ar)
{ {
struct ath10k_pci *ar_pci = ath10k_pci_priv(ar); struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);
@ -1855,7 +1840,11 @@ static int ath10k_pci_hif_power_up(struct ath10k *ar)
* is in an unexpected state. We try to catch that here in order to * is in an unexpected state. We try to catch that here in order to
* reset the Target and retry the probe. * reset the Target and retry the probe.
*/ */
ath10k_pci_device_reset(ar); ret = ath10k_pci_device_reset(ar);
if (ret) {
ath10k_err("failed to reset target: %d\n", ret);
goto err_irq;
}
ret = ath10k_pci_wait_for_target_init(ar); ret = ath10k_pci_wait_for_target_init(ar);
if (ret) if (ret)
@ -2156,19 +2145,10 @@ static int ath10k_pci_start_intr_legacy(struct ath10k *ar)
if (ret < 0) if (ret < 0)
return ret; return ret;
/* ret = ath10k_do_pci_wake(ar);
* Make sure to wake the Target before enabling Legacy
* Interrupt.
*/
iowrite32(PCIE_SOC_WAKE_V_MASK,
ar_pci->mem + PCIE_LOCAL_BASE_ADDRESS +
PCIE_SOC_WAKE_ADDRESS);
ret = ath10k_pci_wait(ar);
if (ret) { if (ret) {
ath10k_warn("Failed to enable legacy interrupt, target did not wake up: %d\n",
ret);
free_irq(ar_pci->pdev->irq, ar); free_irq(ar_pci->pdev->irq, ar);
ath10k_err("failed to wake up target: %d\n", ret);
return ret; return ret;
} }
@ -2184,10 +2164,8 @@ static int ath10k_pci_start_intr_legacy(struct ath10k *ar)
PCIE_INTR_CE_MASK_ALL, PCIE_INTR_CE_MASK_ALL,
ar_pci->mem + (SOC_CORE_BASE_ADDRESS | ar_pci->mem + (SOC_CORE_BASE_ADDRESS |
PCIE_INTR_ENABLE_ADDRESS)); PCIE_INTR_ENABLE_ADDRESS));
iowrite32(PCIE_SOC_WAKE_RESET,
ar_pci->mem + PCIE_LOCAL_BASE_ADDRESS +
PCIE_SOC_WAKE_ADDRESS);
ath10k_do_pci_sleep(ar);
ath10k_info("legacy interrupt handling\n"); ath10k_info("legacy interrupt handling\n");
return 0; return 0;
} }
@ -2263,15 +2241,9 @@ static int ath10k_pci_wait_for_target_init(struct ath10k *ar)
int wait_limit = 300; /* 3 sec */ int wait_limit = 300; /* 3 sec */
int ret; int ret;
/* Wait for Target to finish initialization before we proceed. */ ret = ath10k_do_pci_wake(ar);
iowrite32(PCIE_SOC_WAKE_V_MASK,
ar_pci->mem + PCIE_LOCAL_BASE_ADDRESS +
PCIE_SOC_WAKE_ADDRESS);
ret = ath10k_pci_wait(ar);
if (ret) { if (ret) {
ath10k_warn("Failed to reset target, target did not wake up: %d\n", ath10k_err("failed to wake up target: %d\n", ret);
ret);
return ret; return ret;
} }
@ -2288,31 +2260,26 @@ static int ath10k_pci_wait_for_target_init(struct ath10k *ar)
} }
if (wait_limit < 0) { if (wait_limit < 0) {
ath10k_err("Target stalled\n"); ath10k_err("target stalled\n");
iowrite32(PCIE_SOC_WAKE_RESET, ret = -EIO;
ar_pci->mem + PCIE_LOCAL_BASE_ADDRESS + goto out;
PCIE_SOC_WAKE_ADDRESS);
return -EIO;
} }
iowrite32(PCIE_SOC_WAKE_RESET, out:
ar_pci->mem + PCIE_LOCAL_BASE_ADDRESS + ath10k_do_pci_sleep(ar);
PCIE_SOC_WAKE_ADDRESS); return ret;
return 0;
} }
static void ath10k_pci_device_reset(struct ath10k *ar) static int ath10k_pci_device_reset(struct ath10k *ar)
{ {
int i; int i, ret;
u32 val; u32 val;
ath10k_pci_reg_write32(ar, PCIE_SOC_WAKE_ADDRESS, ret = ath10k_do_pci_wake(ar);
PCIE_SOC_WAKE_V_MASK); if (ret) {
for (i = 0; i < ATH_PCI_RESET_WAIT_MAX; i++) { ath10k_err("failed to wake up target: %d\n",
if (ath10k_pci_target_is_awake(ar)) ret);
break; return ret;
msleep(1);
} }
/* Put Target, including PCIe, into RESET. */ /* Put Target, including PCIe, into RESET. */
@ -2338,7 +2305,8 @@ static void ath10k_pci_device_reset(struct ath10k *ar)
msleep(1); msleep(1);
} }
ath10k_pci_reg_write32(ar, PCIE_SOC_WAKE_ADDRESS, PCIE_SOC_WAKE_RESET); ath10k_do_pci_sleep(ar);
return 0;
} }
static void ath10k_pci_dump_features(struct ath10k_pci *ar_pci) static void ath10k_pci_dump_features(struct ath10k_pci *ar_pci)