diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2021-07-06 18:56:28 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2021-07-06 18:56:28 +0300 |
| commit | 5a57de58a3d1ebc9a3dc106b0e7007c3ccbf052f (patch) | |
| tree | 8f83294f8d679b45142f3a9d03b81dd0ee19d782 /drivers | |
| parent | 7b8f0c867a565827b0fe3a8a25d62317063c5ced (diff) | |
| parent | f67092eff2bd40650aad54a1a1910160f41d864a (diff) | |
| download | linux-5a57de58a3d1ebc9a3dc106b0e7007c3ccbf052f.tar.xz | |
Merge branch 'pci/host/tegra194'
- Fix host init during resume (Vidya Sagar)
- Fix ill-defined MSI IRQ shift behavior (Jon Hunter)
* pci/host/tegra194:
PCI: tegra194: Fix tegra_pcie_ep_raise_msi_irq() ill-defined shift
PCI: tegra194: Fix host initialization during resume
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pci/controller/dwc/pcie-tegra194.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/controller/dwc/pcie-tegra194.c index bafd2c6ab3c2..5a64c6139e6c 100644 --- a/drivers/pci/controller/dwc/pcie-tegra194.c +++ b/drivers/pci/controller/dwc/pcie-tegra194.c @@ -1926,7 +1926,7 @@ static int tegra_pcie_ep_raise_msi_irq(struct tegra_pcie_dw *pcie, u16 irq) if (unlikely(irq > 31)) return -EINVAL; - appl_writel(pcie, (1 << irq), APPL_MSI_CTRL_1); + appl_writel(pcie, BIT(irq), APPL_MSI_CTRL_1); return 0; } @@ -2314,6 +2314,8 @@ static int tegra_pcie_dw_resume_noirq(struct device *dev) goto fail_host_init; } + dw_pcie_setup_rc(&pcie->pci.pp); + ret = tegra_pcie_dw_start_link(&pcie->pci); if (ret < 0) goto fail_host_init; |