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

Commit 802b7c06 authored by Rob Herring's avatar Rob Herring Committed by Bjorn Helgaas
Browse files

ARM: cns3xxx: Convert PCI to use generic config accessors 



Convert the cns3xxx PCI driver to use the generic config access functions.

This changes accesses from __raw_readl/__raw_writel to readl/writel.

[arnd: remove extra open parenthesis]
Signed-off-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarKrzysztof Hałasa <khalasa@piap.pl>
CC: Russell King <linux@arm.linux.org.uk>
CC: linux-arm-kernel@lists.infradead.org
parent 1f94a94f

arch/arm/mach-cns3xxx/pcie.c

+10 −42
Original line number Original line Diff line number Diff line
@@ -54,7 +54,7 @@ static struct cns3xxx_pcie *pbus_to_cnspci(struct pci_bus *bus) 
	return sysdata_to_cnspci(bus->sysdata);

	return sysdata_to_cnspci(bus->sysdata);

}

}





static void __iomem *cns3xxx_pci_cfg_base(struct pci_bus *bus,

static void __iomem *cns3xxx_pci_map_bus(struct pci_bus *bus,

					 unsigned int devfn, int where)

					 unsigned int devfn, int where)

{

{

	struct cns3xxx_pcie *cnspci = pbus_to_cnspci(bus);

	struct cns3xxx_pcie *cnspci = pbus_to_cnspci(bus);
@@ -91,55 +91,22 @@ static void __iomem *cns3xxx_pci_cfg_base(struct pci_bus *bus, 
static int cns3xxx_pci_read_config(struct pci_bus *bus, unsigned int devfn,

static int cns3xxx_pci_read_config(struct pci_bus *bus, unsigned int devfn,

				   int where, int size, u32 *val)

				   int where, int size, u32 *val)

{

{

	u32 v;

	int ret;

	void __iomem *base;

	u32 mask = (0x1ull << (size * 8)) - 1;

	u32 mask = (0x1ull << (size * 8)) - 1;

	int shift = (where % 4) * 8;

	int shift = (where % 4) * 8;





	base = cns3xxx_pci_cfg_base(bus, devfn, where);

	ret = pci_generic_config_read32(bus, devfn, where, size, val);

	if (!base) {

		*val = 0xffffffff;

		return PCIBIOS_SUCCESSFUL;

	}



	v = __raw_readl(base);





	if (bus->number == 0 && devfn == 0 &&

	if (ret == PCIBIOS_SUCCESSFUL && !bus->number && !devfn &&

			(where & 0xffc) == PCI_CLASS_REVISION) {

	    (where & 0xffc) == PCI_CLASS_REVISION)

		/*

		/*

		 * RC's class is 0xb, but Linux PCI driver needs 0x604

		 * RC's class is 0xb, but Linux PCI driver needs 0x604

		 * for a PCIe bridge. So we must fixup the class code

		 * for a PCIe bridge. So we must fixup the class code

		 * to 0x604 here.

		 * to 0x604 here.

		 */

		 */

		v &= 0xff;

		*val = ((((*val << shift) & 0xff) | (0x604 << 16)) >> shift) & mask;

		v |= 0x604 << 16;

	}



	*val = (v >> shift) & mask;



	return PCIBIOS_SUCCESSFUL;

}



static int cns3xxx_pci_write_config(struct pci_bus *bus, unsigned int devfn,

				    int where, int size, u32 val)

{

	u32 v;

	void __iomem *base;

	u32 mask = (0x1ull << (size * 8)) - 1;

	int shift = (where % 4) * 8;



	base = cns3xxx_pci_cfg_base(bus, devfn, where);

	if (!base)

		return PCIBIOS_SUCCESSFUL;



	v = __raw_readl(base);



	v &= ~(mask << shift);

	v |= (val & mask) << shift;



	__raw_writel(v, base);





	return PCIBIOS_SUCCESSFUL;

	return ret;

}

}





static int cns3xxx_pci_setup(int nr, struct pci_sys_data *sys)

static int cns3xxx_pci_setup(int nr, struct pci_sys_data *sys)
@@ -158,8 +125,9 @@ static int cns3xxx_pci_setup(int nr, struct pci_sys_data *sys) 
}

}





static struct pci_ops cns3xxx_pcie_ops = {

static struct pci_ops cns3xxx_pcie_ops = {

	.map_bus = cns3xxx_pci_map_bus,

	.read = cns3xxx_pci_read_config,

	.read = cns3xxx_pci_read_config,

	.write = cns3xxx_pci_write_config,

	.write = pci_generic_config_write,

};

};





static int cns3xxx_pcie_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)

static int cns3xxx_pcie_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)