Merge branch 'pci/host/tegra194'

bjorn-helgaas · bjorn-helgaas · commit 5a57de58a3d1 · 2021-07-06T10:56:28.000-05:00
- 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
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -1926,7 +1926,7 @@ static int tegra_pcie_ep_raise_msi_irq(struct tegra_pcie_dw *pcie, u16 irq)`
`1926`	`1926`	`if (unlikely(irq > 31))`
`1927`	`1927`	`return -EINVAL;`
`1928`	`1928`
`1929`		`- appl_writel(pcie, (1 << irq), APPL_MSI_CTRL_1);`
	`1929`	`+ appl_writel(pcie, BIT(irq), APPL_MSI_CTRL_1);`
`1930`	`1930`
`1931`	`1931`	`return 0;`
`1932`	`1932`	`}`
`@@ -2314,6 +2314,8 @@ static int tegra_pcie_dw_resume_noirq(struct device *dev)`
`2314`	`2314`	`goto fail_host_init;`
`2315`	`2315`	`}`
`2316`	`2316`
	`2317`	`+ dw_pcie_setup_rc(&pcie->pci.pp);`
	`2318`	`+`
`2317`	`2319`	`ret = tegra_pcie_dw_start_link(&pcie->pci);`
`2318`	`2320`	`if (ret < 0)`
`2319`	`2321`	`goto fail_host_init;`