p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pci-v4.14-fixes-5 

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJZ4RkCAAoJEFmIoMA60/r8jCgP+gONdweWNbvYXxa3U9UD2iAL
 3bALZJ8mAtplGoeaKyfMinHnel++3MmqxUI7Mqxrk4MJ0XaE6twS5G21e0WtLhE3
 aLWoxg6D8Cseb9QX99WU1aQPfNmwFJzL+JjIIEuPaq3ww9ENyglSbj5iKQXe9VXx
 kUVirAEKXm/n34YKmUAYsPZe6BmvuZJbLUY4g79WtFogzdeYfYj3OL+9lDbNawvT
 XylseZbttlvbbPsiefVp4K9UOBZK88Q5VjxP74jDAScpH67PMaExibxDpGIKnXGb
 X9743lRBU739sNfjTLIlbCg62So5KgT7FoU+RK0kxD60lo1+eYNx9ln/AdkjdZwb
 R+rNlmPm2wTPhiXuG9zub31tJ9xdxqkN8EWPT0Im/OFNpwaao/kerF86xDWLvEpG
 Nj3Y0qVS8XFqV/oy+hqL/ckCpt7i3wv4Lq5RO1yx7keC4OgftQyxlRbX1hGEYrhU
 R3yajv/xvtEdQ2faJD/jgAyc5yc1mamORS+HHYRW5lAR08IvXapcFFM8BZTCd2zl
 2uhvxJhC/sRSSbEaXjppO0Pz4jOFYz8tziyUkBNCtH7NNtMJwPh4ChCydZqYqYO6
 d3z89kt9W3YCFZJ8s9fQd1VqC+m0exSS5pcsclaRC+YMQ1QbzFCy6FhciL2GCppt
 FQfCH0ZedZOOBE8XLluC
 =Gl0v
 -----END PGP SIGNATURE-----

Merge tag 'pci-v4.14-fixes-5' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

Pull PCI fixes from Bjorn Helgaas:

 - revert Tegra MSI change that caused a regression on TrimSlice
   (Thierry Reding)

 - finish Aardvark conversion to host bridge IRQ mapping. We missed
   Aardvark the first time around so it regressed (Thomas Petazzoni)

* tag 'pci-v4.14-fixes-5' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  PCI: aardvark: Move to struct pci_host_bridge IRQ mapping functions
  Revert "PCI: tegra: Do not allocate MSI target memory"
This commit is contained in:
Linus Torvalds 2017-10-13 13:28:19 -07:00
parent 997301a860 407dae1e44
commit e837d9134b
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/pci/host/pci-aardvark.c
View File

@ -935,6 +935,8 @@ static int advk_pcie_probe(struct platform_device *pdev)
bridge->sysdata = pcie;
bridge->busnr = 0;
bridge->ops = &advk_pcie_ops;
bridge->map_irq = of_irq_parse_and_map_pci;
bridge->swizzle_irq = pci_common_swizzle;
ret = pci_scan_root_bus_bridge(bridge);
if (ret < 0) {

22
drivers/pci/host/pci-tegra.c
View File

@ -233,6 +233,7 @@ struct tegra_msi {
struct msi_controller chip;
DECLARE_BITMAP(used, INT_PCI_MSI_NR);
struct irq_domain *domain;
unsigned long pages;
struct mutex lock;
u64 phys;
int irq;
@ -1529,22 +1530,9 @@ static int tegra_pcie_enable_msi(struct tegra_pcie *pcie)
goto err;
}
/*
* The PCI host bridge on Tegra contains some logic that intercepts
* MSI writes, which means that the MSI target address doesn't have
* to point to actual physical memory. Rather than allocating one 4
* KiB page of system memory that's never used, we can simply pick
* an arbitrary address within an area reserved for system memory
* in the FPCI address map.
*
* However, in order to avoid confusion, we pick an address that
* doesn't map to physical memory. The FPCI address map reserves a
* 1012 GiB region for system memory and memory-mapped I/O. Since
* none of the Tegra SoCs that contain this PCI host bridge can
* address more than 16 GiB of system memory, the last 4 KiB of
* these 1012 GiB is a good candidate.
*/
msi->phys = 0xfcfffff000;
/* setup AFI/FPCI range */
msi->pages = __get_free_pages(GFP_KERNEL, 0);
msi->phys = virt_to_phys((void *)msi->pages);
afi_writel(pcie, msi->phys >> soc->msi_base_shift, AFI_MSI_FPCI_BAR_ST);
afi_writel(pcie, msi->phys, AFI_MSI_AXI_BAR_ST);
@ -1596,6 +1584,8 @@ static int tegra_pcie_disable_msi(struct tegra_pcie *pcie)
afi_writel(pcie, 0, AFI_MSI_EN_VEC6);
afi_writel(pcie, 0, AFI_MSI_EN_VEC7);
free_pages(msi->pages, 0);
if (msi->irq > 0)
free_irq(msi->irq, pcie);