public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'pci/host/tegra194'

Browse source 
- 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
This commit is contained in:
Bjorn Helgaas 2021-07-06 10:56:28 -05:00
commit 5a57de58a3
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/pci/controller/dwc/pcie-tegra194.c
View file

@ -1926,7 +1926,7 @@ static int tegra_pcie_ep_raise_msi_irq(struct tegra_pcie_dw *pcie, u16 irq)
if (unlikely(irq > 31)) if (unlikely(irq > 31))
return -EINVAL; return -EINVAL;
appl_writel(pcie, (1 << irq), APPL_MSI_CTRL_1); appl_writel(pcie, BIT(irq), APPL_MSI_CTRL_1);
return 0; return 0;
} }
@ -2314,6 +2314,8 @@ static int tegra_pcie_dw_resume_noirq(struct device *dev)
goto fail_host_init; goto fail_host_init;
} }
dw_pcie_setup_rc(&pcie->pci.pp);
ret = tegra_pcie_dw_start_link(&pcie->pci); ret = tegra_pcie_dw_start_link(&pcie->pci);
if (ret < 0) if (ret < 0)
goto fail_host_init; goto fail_host_init;