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>, "Michal Simek" <michal.simek@xilinx.com>, "Sören Brinkmann" <soren.brinkmann@xilinx.com>, linux-arm-kernel@lists.infradead.org Subject: [PATCH 16/16] pci/host: xilinx: convert to use generic config accesses Date: Fri, 9 Jan 2015 20:34:50 -0600 [thread overview] Message-ID: <1420857290-8373-17-git-send-email-robh@kernel.org> (raw) In-Reply-To: <1420857290-8373-1-git-send-email-robh@kernel.org> Convert the Xilinx host PCI driver to use the generic config access functions. Signed-off-by: Rob Herring <robh@kernel.org> Cc: Bjorn Helgaas <bhelgaas@google.com> Cc: Michal Simek <michal.simek@xilinx.com> Cc: "Sören Brinkmann" <soren.brinkmann@xilinx.com> Cc: linux-pci@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org --- drivers/pci/host/pcie-xilinx.c | 88 +++++------------------------------------- 1 file changed, 9 insertions(+), 79 deletions(-) diff --git a/drivers/pci/host/pcie-xilinx.c b/drivers/pci/host/pcie-xilinx.c index ef3ebaf..f67d036 100644 --- a/drivers/pci/host/pcie-xilinx.c +++ b/drivers/pci/host/pcie-xilinx.c @@ -189,7 +189,7 @@ static bool xilinx_pcie_valid_device(struct pci_bus *bus, unsigned int devfn) } /** - * xilinx_pcie_config_base - Get configuration base + * xilinx_pcie_map_bus - Get configuration base * @bus: PCI Bus structure * @devfn: Device/function * @where: Offset from base @@ -197,96 +197,26 @@ static bool xilinx_pcie_valid_device(struct pci_bus *bus, unsigned int devfn) * Return: Base address of the configuration space needed to be * accessed. */ -static void __iomem *xilinx_pcie_config_base(struct pci_bus *bus, - unsigned int devfn, int where) +static void __iomem *xilinx_pcie_map_bus(struct pci_bus *bus, + unsigned int devfn, int where) { struct xilinx_pcie_port *port = sys_to_pcie(bus->sysdata); int relbus; + if (!xilinx_pcie_valid_device(bus, devfn)) + return NULL; + relbus = (bus->number << ECAM_BUS_NUM_SHIFT) | (devfn << ECAM_DEV_NUM_SHIFT); return port->reg_base + relbus + where; } -/** - * xilinx_pcie_read_config - Read configuration space - * @bus: PCI Bus structure - * @devfn: Device/function - * @where: Offset from base - * @size: Byte/word/dword - * @val: Value to be read - * - * Return: PCIBIOS_SUCCESSFUL on success - * PCIBIOS_DEVICE_NOT_FOUND on failure - */ -static int xilinx_pcie_read_config(struct pci_bus *bus, unsigned int devfn, - int where, int size, u32 *val) -{ - void __iomem *addr; - - if (!xilinx_pcie_valid_device(bus, devfn)) { - *val = 0xFFFFFFFF; - return PCIBIOS_DEVICE_NOT_FOUND; - } - - addr = xilinx_pcie_config_base(bus, devfn, where); - - switch (size) { - case 1: - *val = readb(addr); - break; - case 2: - *val = readw(addr); - break; - default: - *val = readl(addr); - break; - } - - return PCIBIOS_SUCCESSFUL; -} - -/** - * xilinx_pcie_write_config - Write configuration space - * @bus: PCI Bus structure - * @devfn: Device/function - * @where: Offset from base - * @size: Byte/word/dword - * @val: Value to be written to device - * - * Return: PCIBIOS_SUCCESSFUL on success - * PCIBIOS_DEVICE_NOT_FOUND on failure - */ -static int xilinx_pcie_write_config(struct pci_bus *bus, unsigned int devfn, - int where, int size, u32 val) -{ - void __iomem *addr; - - if (!xilinx_pcie_valid_device(bus, devfn)) - return PCIBIOS_DEVICE_NOT_FOUND; - - addr = xilinx_pcie_config_base(bus, devfn, where); - - switch (size) { - case 1: - writeb(val, addr); - break; - case 2: - writew(val, addr); - break; - default: - writel(val, addr); - break; - } - - return PCIBIOS_SUCCESSFUL; -} - /* PCIe operations */ static struct pci_ops xilinx_pcie_ops = { - .read = xilinx_pcie_read_config, - .write = xilinx_pcie_write_config, + .map_bus = xilinx_pcie_map_bus, + .read = pci_generic_config_read, + .write = pci_generic_config_write, }; /* MSI functions */ -- 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 16/16] pci/host: xilinx: convert to use generic config accesses Date: Fri, 9 Jan 2015 20:34:50 -0600 [thread overview] Message-ID: <1420857290-8373-17-git-send-email-robh@kernel.org> (raw) In-Reply-To: <1420857290-8373-1-git-send-email-robh@kernel.org> Convert the Xilinx host PCI driver to use the generic config access functions. Signed-off-by: Rob Herring <robh@kernel.org> Cc: Bjorn Helgaas <bhelgaas@google.com> Cc: Michal Simek <michal.simek@xilinx.com> Cc: "S?ren Brinkmann" <soren.brinkmann@xilinx.com> Cc: linux-pci at vger.kernel.org Cc: linux-arm-kernel at lists.infradead.org --- drivers/pci/host/pcie-xilinx.c | 88 +++++------------------------------------- 1 file changed, 9 insertions(+), 79 deletions(-) diff --git a/drivers/pci/host/pcie-xilinx.c b/drivers/pci/host/pcie-xilinx.c index ef3ebaf..f67d036 100644 --- a/drivers/pci/host/pcie-xilinx.c +++ b/drivers/pci/host/pcie-xilinx.c @@ -189,7 +189,7 @@ static bool xilinx_pcie_valid_device(struct pci_bus *bus, unsigned int devfn) } /** - * xilinx_pcie_config_base - Get configuration base + * xilinx_pcie_map_bus - Get configuration base * @bus: PCI Bus structure * @devfn: Device/function * @where: Offset from base @@ -197,96 +197,26 @@ static bool xilinx_pcie_valid_device(struct pci_bus *bus, unsigned int devfn) * Return: Base address of the configuration space needed to be * accessed. */ -static void __iomem *xilinx_pcie_config_base(struct pci_bus *bus, - unsigned int devfn, int where) +static void __iomem *xilinx_pcie_map_bus(struct pci_bus *bus, + unsigned int devfn, int where) { struct xilinx_pcie_port *port = sys_to_pcie(bus->sysdata); int relbus; + if (!xilinx_pcie_valid_device(bus, devfn)) + return NULL; + relbus = (bus->number << ECAM_BUS_NUM_SHIFT) | (devfn << ECAM_DEV_NUM_SHIFT); return port->reg_base + relbus + where; } -/** - * xilinx_pcie_read_config - Read configuration space - * @bus: PCI Bus structure - * @devfn: Device/function - * @where: Offset from base - * @size: Byte/word/dword - * @val: Value to be read - * - * Return: PCIBIOS_SUCCESSFUL on success - * PCIBIOS_DEVICE_NOT_FOUND on failure - */ -static int xilinx_pcie_read_config(struct pci_bus *bus, unsigned int devfn, - int where, int size, u32 *val) -{ - void __iomem *addr; - - if (!xilinx_pcie_valid_device(bus, devfn)) { - *val = 0xFFFFFFFF; - return PCIBIOS_DEVICE_NOT_FOUND; - } - - addr = xilinx_pcie_config_base(bus, devfn, where); - - switch (size) { - case 1: - *val = readb(addr); - break; - case 2: - *val = readw(addr); - break; - default: - *val = readl(addr); - break; - } - - return PCIBIOS_SUCCESSFUL; -} - -/** - * xilinx_pcie_write_config - Write configuration space - * @bus: PCI Bus structure - * @devfn: Device/function - * @where: Offset from base - * @size: Byte/word/dword - * @val: Value to be written to device - * - * Return: PCIBIOS_SUCCESSFUL on success - * PCIBIOS_DEVICE_NOT_FOUND on failure - */ -static int xilinx_pcie_write_config(struct pci_bus *bus, unsigned int devfn, - int where, int size, u32 val) -{ - void __iomem *addr; - - if (!xilinx_pcie_valid_device(bus, devfn)) - return PCIBIOS_DEVICE_NOT_FOUND; - - addr = xilinx_pcie_config_base(bus, devfn, where); - - switch (size) { - case 1: - writeb(val, addr); - break; - case 2: - writew(val, addr); - break; - default: - writel(val, addr); - break; - } - - return PCIBIOS_SUCCESSFUL; -} - /* PCIe operations */ static struct pci_ops xilinx_pcie_ops = { - .read = xilinx_pcie_read_config, - .write = xilinx_pcie_write_config, + .map_bus = xilinx_pcie_map_bus, + .read = pci_generic_config_read, + .write = pci_generic_config_write, }; /* MSI functions */ -- 2.1.0
next prev parent reply other threads:[~2015-01-10 2:36 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 ` [PATCH 06/16] ARM: cns3xxx: convert PCI to use generic config accesses Rob Herring 2015-01-10 2:34 ` 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 ` Rob Herring [this message] 2015-01-10 2:34 ` [PATCH 16/16] pci/host: xilinx: " 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-17-git-send-email-robh@kernel.org \ --to=robh@kernel.org \ --cc=arnd@arndb.de \ --cc=bhelgaas@google.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pci@vger.kernel.org \ --cc=michal.simek@xilinx.com \ --cc=soren.brinkmann@xilinx.com \ /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.