Commit 5a57de58 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

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
parents 7b8f0c86 f67092ef

drivers/pci/controller/dwc/pcie-tegra194.c

+3 −1
Original line number Diff line number Diff line
@@ -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;