Commit 48617f03 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'remotes/lorenzo/pci/misc' 

  - Fix iproc-msi and mvebu __iomem annotations (Ben Dooks)

  - Make mvebu_pci_bridge_emul_ops static (Ben Dooks)

  - Add Marek Vasut and Yoshihiro Shimoda as R-Car maintainers (Simon
    Horman)

  - Fix pcitest.c fd leak (Hewenliang)

* remotes/lorenzo/pci/misc:
  tools: PCI: Fix fd leakage
  MAINTAINERS: Add Marek and Shimoda-san as R-Car PCIE co-maintainers
  PCI: mvebu: mvebu_pcie_map_registers __iomem fix
  PCI: mvebu: Make mvebu_pci_bridge_emul_ops static
  PCI: iproc-msi: Fix __iomem annotation in decode_msi_hwirq()
parents 7bd4c4a7 3c379a59

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -12489,7 +12489,8 @@ F: Documentation/devicetree/bindings/pci/nvidia,tegra20-pcie.txt 
F:	drivers/pci/controller/pci-tegra.c















PCI DRIVER FOR RENESAS R-CAR













M:	Simon Horman <horms@verge.net.au>













M:	Marek Vasut <marek.vasut+renesas@gmail.com>













M:	Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>















L:	linux-pci@vger.kernel.org















L:	linux-renesas-soc@vger.kernel.org















S:	Maintained

































drivers/pci/controller/pci-mvebu.c



+2
−2






























Original line number
Diff line number
Diff line








@@ -554,7 +554,7 @@ mvebu_pci_bridge_emul_pcie_conf_write(struct pci_bridge_emul *bridge,













	}















}





























struct pci_bridge_emul_ops mvebu_pci_bridge_emul_ops = {













static struct pci_bridge_emul_ops mvebu_pci_bridge_emul_ops = {















	.write_base = mvebu_pci_bridge_emul_base_conf_write,















	.read_pcie = mvebu_pci_bridge_emul_pcie_conf_read,















	.write_pcie = mvebu_pci_bridge_emul_pcie_conf_write,










@@ -713,7 +713,7 @@ static void __iomem *mvebu_pcie_map_registers(struct platform_device *pdev,





























	ret = of_address_to_resource(np, 0, &regs);















	if (ret)













		return ERR_PTR(ret);













		return (void __iomem *)ERR_PTR(ret);































	return devm_ioremap_resource(&pdev->dev, &regs);















}

































drivers/pci/controller/pcie-iproc-msi.c



+3
−2






























Original line number
Diff line number
Diff line








@@ -293,11 +293,12 @@ static const struct irq_domain_ops msi_domain_ops = {





























static inline u32 decode_msi_hwirq(struct iproc_msi *msi, u32 eq, u32 head)















{













	u32 *msg, hwirq;













	u32 __iomem *msg;













	u32 hwirq;















	unsigned int offs;































	offs = iproc_msi_eq_offset(msi, eq) + head * sizeof(u32);













	msg = (u32 *)(msi->eq_cpu + offs);













	msg = (u32 __iomem *)(msi->eq_cpu + offs);















	hwirq = readl(msg);















	hwirq = (hwirq >> 5) + (hwirq & 0x1f);

















































tools/pci/pcitest.c



+1
−0






























Original line number
Diff line number
Diff line








@@ -129,6 +129,7 @@ static int run_test(struct pci_test *test)













	}































	fflush(stdout);













	close(fd);















	return (ret < 0) ? ret : 1 - ret; /* return 0 if test succeeded */















}



















































































CRA Git | Maintained and supported by SUSTech CRA and CCSE