From: Rob Herring <robh@kernel.org> To: linux-kernel@vger.kernel.org Cc: Arnd Bergmann <arnd@arndb.de>, linux-pci@vger.kernel.org, Bjorn Helgaas <bhelgaas@google.com>, Rob Herring <robh@kernel.org>, Krzysztof Halasa <khalasa@piap.pl>, Russell King <linux@arm.linux.org.uk>, linux-arm-kernel@lists.infradead.org Subject: [PATCH 06/16] ARM: cns3xxx: convert PCI to use generic config accesses Date: Fri, 9 Jan 2015 20:34:40 -0600 [thread overview] Message-ID: <1420857290-8373-7-git-send-email-robh@kernel.org> (raw) In-Reply-To: <1420857290-8373-1-git-send-email-robh@kernel.org> Convert the cns3xxx PCI driver to use the generic config access functions. This changes accesses from __raw_readl/__raw_writel to readl/writel. Signed-off-by: Rob Herring <robh@kernel.org> Cc: Krzysztof Halasa <khalasa@piap.pl> Cc: Russell King <linux@arm.linux.org.uk> Cc: linux-arm-kernel@lists.infradead.org --- arch/arm/mach-cns3xxx/pcie.c | 52 +++++++++----------------------------------- 1 file changed, 10 insertions(+), 42 deletions(-) diff --git a/arch/arm/mach-cns3xxx/pcie.c b/arch/arm/mach-cns3xxx/pcie.c index 45d6bd0..19b4e20 100644 --- a/arch/arm/mach-cns3xxx/pcie.c +++ b/arch/arm/mach-cns3xxx/pcie.c @@ -54,8 +54,8 @@ static struct cns3xxx_pcie *pbus_to_cnspci(struct pci_bus *bus) return sysdata_to_cnspci(bus->sysdata); } -static void __iomem *cns3xxx_pci_cfg_base(struct pci_bus *bus, - unsigned int devfn, int where) +static void __iomem *cns3xxx_pci_map_bus(struct pci_bus *bus, + unsigned int devfn, int where) { struct cns3xxx_pcie *cnspci = pbus_to_cnspci(bus); int busno = bus->number; @@ -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, int where, int size, u32 *val) { - u32 v; - void __iomem *base; + int ret; u32 mask = (0x1ull << (size * 8)) - 1; int shift = (where % 4) * 8; - base = cns3xxx_pci_cfg_base(bus, devfn, where); - if (!base) { - *val = 0xffffffff; - return PCIBIOS_SUCCESSFUL; - } - - v = __raw_readl(base); + ret = pci_generic_config_read32(bus, devfn, where, size, val); - if (bus->number == 0 && devfn == 0 && - (where & 0xffc) == PCI_CLASS_REVISION) { + if (ret == PCIBIOS_SUCCESSFUL && !bus->number && !devfn && + (where & 0xffc) == PCI_CLASS_REVISION) /* * RC's class is 0xb, but Linux PCI driver needs 0x604 * for a PCIe bridge. So we must fixup the class code * to 0x604 here. */ - v &= 0xff; - 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); + *val = (((((*val << shift) & 0xff) | (0x604 << 16)) >> shift) & mask; - return PCIBIOS_SUCCESSFUL; + return ret; } 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 = { + .map_bus = cns3xxx_pci_map_bus, .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) -- 2.1.0
WARNING: multiple messages have this Message-ID (diff)
From: robh@kernel.org (Rob Herring) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 06/16] ARM: cns3xxx: convert PCI to use generic config accesses Date: Fri, 9 Jan 2015 20:34:40 -0600 [thread overview] Message-ID: <1420857290-8373-7-git-send-email-robh@kernel.org> (raw) In-Reply-To: <1420857290-8373-1-git-send-email-robh@kernel.org> Convert the cns3xxx PCI driver to use the generic config access functions. This changes accesses from __raw_readl/__raw_writel to readl/writel. Signed-off-by: Rob Herring <robh@kernel.org> Cc: Krzysztof Halasa <khalasa@piap.pl> Cc: Russell King <linux@arm.linux.org.uk> Cc: linux-arm-kernel at lists.infradead.org --- arch/arm/mach-cns3xxx/pcie.c | 52 +++++++++----------------------------------- 1 file changed, 10 insertions(+), 42 deletions(-) diff --git a/arch/arm/mach-cns3xxx/pcie.c b/arch/arm/mach-cns3xxx/pcie.c index 45d6bd0..19b4e20 100644 --- a/arch/arm/mach-cns3xxx/pcie.c +++ b/arch/arm/mach-cns3xxx/pcie.c @@ -54,8 +54,8 @@ static struct cns3xxx_pcie *pbus_to_cnspci(struct pci_bus *bus) return sysdata_to_cnspci(bus->sysdata); } -static void __iomem *cns3xxx_pci_cfg_base(struct pci_bus *bus, - unsigned int devfn, int where) +static void __iomem *cns3xxx_pci_map_bus(struct pci_bus *bus, + unsigned int devfn, int where) { struct cns3xxx_pcie *cnspci = pbus_to_cnspci(bus); int busno = bus->number; @@ -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, int where, int size, u32 *val) { - u32 v; - void __iomem *base; + int ret; u32 mask = (0x1ull << (size * 8)) - 1; int shift = (where % 4) * 8; - base = cns3xxx_pci_cfg_base(bus, devfn, where); - if (!base) { - *val = 0xffffffff; - return PCIBIOS_SUCCESSFUL; - } - - v = __raw_readl(base); + ret = pci_generic_config_read32(bus, devfn, where, size, val); - if (bus->number == 0 && devfn == 0 && - (where & 0xffc) == PCI_CLASS_REVISION) { + if (ret == PCIBIOS_SUCCESSFUL && !bus->number && !devfn && + (where & 0xffc) == PCI_CLASS_REVISION) /* * RC's class is 0xb, but Linux PCI driver needs 0x604 * for a PCIe bridge. So we must fixup the class code * to 0x604 here. */ - v &= 0xff; - 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); + *val = (((((*val << shift) & 0xff) | (0x604 << 16)) >> shift) & mask; - return PCIBIOS_SUCCESSFUL; + return ret; } 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 = { + .map_bus = cns3xxx_pci_map_bus, .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) -- 2.1.0
next prev parent reply other threads:[~2015-01-10 2:35 UTC|newest] Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-01-10 2:34 [PATCH 00/16] PCI generic configuration space accessors Rob Herring 2015-01-10 2:34 ` Rob Herring 2015-01-10 2:34 ` Rob Herring 2015-01-10 2:34 ` Rob Herring 2015-01-10 2:34 ` Rob Herring 2015-01-10 2:34 ` [PATCH 01/16] frv: add struct pci_ops member names to initialization Rob Herring 2015-01-10 2:34 ` [PATCH 02/16] mips: " Rob Herring 2015-01-10 2:34 ` [PATCH 03/16] mn10300: " Rob Herring 2015-01-10 2:34 ` [PATCH 04/16] powerpc: " Rob Herring 2015-01-10 2:34 ` Rob Herring 2015-01-10 2:34 ` [PATCH 05/16] pci: introduce common pci config space accessors Rob Herring 2015-01-12 10:01 ` Thierry Reding 2015-01-12 10:04 ` Thierry Reding 2015-01-10 2:34 ` Rob Herring [this message] 2015-01-10 2:34 ` [PATCH 06/16] ARM: cns3xxx: convert PCI to use generic config accesses Rob Herring 2015-01-29 6:16 ` Krzysztof Hałasa 2015-01-29 6:16 ` Krzysztof Hałasa 2015-01-29 14:35 ` Bjorn Helgaas 2015-01-29 14:35 ` Bjorn Helgaas 2015-01-10 2:34 ` [PATCH 07/16] ARM: integrator: " Rob Herring 2015-01-10 2:34 ` Rob Herring 2015-01-10 21:40 ` Linus Walleij 2015-01-10 21:40 ` Linus Walleij 2015-01-10 21:40 ` Linus Walleij 2015-01-10 21:53 ` Arnd Bergmann 2015-01-10 21:53 ` Arnd Bergmann 2015-01-10 21:53 ` Arnd Bergmann 2015-01-12 0:05 ` Linus Walleij 2015-01-12 0:05 ` Linus Walleij 2015-01-12 0:05 ` Linus Walleij 2015-01-22 20:33 ` Bjorn Helgaas 2015-01-22 20:33 ` Bjorn Helgaas 2015-01-22 20:33 ` Bjorn Helgaas 2015-01-26 18:22 ` Bjorn Helgaas 2015-01-26 18:22 ` Bjorn Helgaas 2015-01-26 18:22 ` Bjorn Helgaas 2015-01-26 23:22 ` Linus Walleij 2015-01-26 23:22 ` Linus Walleij 2015-01-26 23:22 ` Linus Walleij 2015-01-10 2:34 ` [PATCH 08/16] ARM: sa1100: " Rob Herring 2015-01-10 2:34 ` Rob Herring 2015-01-10 2:34 ` [PATCH 09/16] ARM: ks8695: " Rob Herring 2015-01-10 2:34 ` Rob Herring 2015-01-12 12:38 ` Greg Ungerer 2015-01-12 12:38 ` Greg Ungerer 2015-01-10 2:34 ` [PATCH 10/16] powerpc: fsl_pci: " Rob Herring 2015-01-10 2:34 ` Rob Herring 2015-01-10 2:34 ` [PATCH 11/16] powerpc: powermac: " Rob Herring 2015-01-10 2:34 ` Rob Herring 2015-01-10 2:34 ` [PATCH 12/16] pci/host: generic: convert " Rob Herring 2015-01-10 2:34 ` Rob Herring 2015-01-12 17:51 ` Will Deacon 2015-01-12 17:51 ` Will Deacon 2015-01-12 17:51 ` Will Deacon 2015-01-10 2:34 ` [PATCH 13/16] pci/host: rcar-gen2: " Rob Herring 2015-01-10 2:34 ` Rob Herring 2015-01-12 9:25 ` Geert Uytterhoeven 2015-01-12 9:25 ` Geert Uytterhoeven 2015-01-10 2:34 ` [PATCH 14/16] pci/host: tegra: " Rob Herring 2015-01-12 10:07 ` Thierry Reding 2015-01-10 2:34 ` [PATCH 15/16] pci/host: xgene: " Rob Herring 2015-01-10 2:34 ` Rob Herring 2015-01-10 2:34 ` [PATCH 16/16] pci/host: xilinx: " Rob Herring 2015-01-10 2:34 ` Rob Herring 2015-01-22 21:03 ` [PATCH 00/16] PCI generic configuration space accessors Bjorn Helgaas 2015-01-22 21:03 ` Bjorn Helgaas 2015-01-22 21:03 ` Bjorn Helgaas 2015-01-22 21:03 ` Bjorn Helgaas 2015-01-22 21:03 ` Bjorn Helgaas 2015-01-22 23:47 ` Rob Herring 2015-01-22 23:47 ` Rob Herring 2015-01-22 23:47 ` Rob Herring 2015-01-22 23:47 ` Rob Herring 2015-01-22 23:47 ` Rob Herring
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1420857290-8373-7-git-send-email-robh@kernel.org \ --to=robh@kernel.org \ --cc=arnd@arndb.de \ --cc=bhelgaas@google.com \ --cc=khalasa@piap.pl \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pci@vger.kernel.org \ --cc=linux@arm.linux.org.uk \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.