Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11c6fbd8 authored by Andrew Murray's avatar Andrew Murray Committed by Bjorn Helgaas
Browse files

PCI: designware: Remove unnecessary use of 'conf_lock' spinlock 



Serialization of configuration accesses is provided by 'pci_lock' in
drivers/pci/access.c thus making the driver's 'conf_lock' superfluous.

Signed-off-by: default avatarAndrew Murray <amurray@embedded-bits.co.uk>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarJingoo Han <jg1.han@samsung.com>
Acked-by: default avatarRichard Zhu <r65037@freescale.com>
parent 804f57b1

drivers/pci/host/pci-exynos.c

+0 −1
Original line number Diff line number Diff line
@@ -546,7 +546,6 @@ static int add_pcie_port(struct pcie_port *pp, struct platform_device *pdev) 
	pp->root_bus_nr = -1;

	pp->ops = &exynos_pcie_host_ops;



	spin_lock_init(&pp->conf_lock);

	ret = dw_pcie_host_init(pp);

	if (ret) {

		dev_err(&pdev->dev, "failed to initialize host\n");

drivers/pci/host/pci-imx6.c

+0 −1
Original line number Diff line number Diff line
@@ -501,7 +501,6 @@ static int imx6_add_pcie_port(struct pcie_port *pp, 
	pp->root_bus_nr = -1;

	pp->ops = &imx6_pcie_host_ops;



	spin_lock_init(&pp->conf_lock);

	ret = dw_pcie_host_init(pp);

	if (ret) {

		dev_err(&pdev->dev, "failed to initialize host\n");

drivers/pci/host/pcie-designware.c

+0 −6
Original line number Diff line number Diff line
@@ -639,7 +639,6 @@ static int dw_pcie_rd_conf(struct pci_bus *bus, u32 devfn, int where, 
			int size, u32 *val)

{

	struct pcie_port *pp = sys_to_pcie(bus->sysdata);

	unsigned long flags;

	int ret;



	if (!pp) {
@@ -652,13 +651,11 @@ static int dw_pcie_rd_conf(struct pci_bus *bus, u32 devfn, int where, 
		return PCIBIOS_DEVICE_NOT_FOUND;

	}



	spin_lock_irqsave(&pp->conf_lock, flags);

	if (bus->number != pp->root_bus_nr)

		ret = dw_pcie_rd_other_conf(pp, bus, devfn,

						where, size, val);

	else

		ret = dw_pcie_rd_own_conf(pp, where, size, val);

	spin_unlock_irqrestore(&pp->conf_lock, flags);



	return ret;

}
@@ -667,7 +664,6 @@ static int dw_pcie_wr_conf(struct pci_bus *bus, u32 devfn, 
			int where, int size, u32 val)

{

	struct pcie_port *pp = sys_to_pcie(bus->sysdata);

	unsigned long flags;

	int ret;



	if (!pp) {
@@ -678,13 +674,11 @@ static int dw_pcie_wr_conf(struct pci_bus *bus, u32 devfn, 
	if (dw_pcie_valid_config(pp, bus, PCI_SLOT(devfn)) == 0)

		return PCIBIOS_DEVICE_NOT_FOUND;



	spin_lock_irqsave(&pp->conf_lock, flags);

	if (bus->number != pp->root_bus_nr)

		ret = dw_pcie_wr_other_conf(pp, bus, devfn,

						where, size, val);

	else

		ret = dw_pcie_wr_own_conf(pp, where, size, val);

	spin_unlock_irqrestore(&pp->conf_lock, flags);



	return ret;

}

drivers/pci/host/pcie-designware.h

+0 −1
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ struct pcie_port { 
	void __iomem		*va_cfg1_base;

	u64			io_base;

	u64			mem_base;

	spinlock_t		conf_lock;

	struct resource		cfg;

	struct resource		io;

	struct resource		mem;