Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754611AbaGHAO0 (ORCPT ); Mon, 7 Jul 2014 20:14:26 -0400 Received: from mail-ig0-f178.google.com ([209.85.213.178]:62881 "EHLO mail-ig0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754957AbaGHAOV (ORCPT ); Mon, 7 Jul 2014 20:14:21 -0400 Date: Mon, 7 Jul 2014 18:14:18 -0600 From: Bjorn Helgaas To: Liviu Dudau Cc: linux-pci , Catalin Marinas , Will Deacon , Benjamin Herrenschmidt , Arnd Bergmann , linaro-kernel , Tanmay Inamdar , Grant Likely , Sinan Kaya , Jingoo Han , Kukjin Kim , Suravee Suthikulanit , LKML , Device Tree ML , LAKML Subject: Re: [PATCH v8 3/9] pci: Introduce pci_register_io_range() helper function. Message-ID: <20140708001418.GB22939@google.com> References: <1404240214-9804-1-git-send-email-Liviu.Dudau@arm.com> <1404240214-9804-4-git-send-email-Liviu.Dudau@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1404240214-9804-4-git-send-email-Liviu.Dudau@arm.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Jul 01, 2014 at 07:43:28PM +0100, Liviu Dudau wrote: > Some architectures do not have a simple view of the PCI I/O space > and instead use a range of CPU addresses that map to bus addresses. For > some architectures these ranges will be expressed by OF bindings > in a device tree file. > > Introduce a pci_register_io_range() helper function with a generic > implementation that can be used by such architectures to keep track > of the I/O ranges described by the PCI bindings. If the PCI_IOBASE > macro is not defined that signals lack of support for PCI and we > return an error. > > Signed-off-by: Liviu Dudau > --- > drivers/of/address.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++ > include/linux/of_address.h | 1 + > 2 files changed, 62 insertions(+) > > diff --git a/drivers/of/address.c b/drivers/of/address.c > index 5edfcb0..1345733 100644 > --- a/drivers/of/address.c > +++ b/drivers/of/address.c > @@ -5,6 +5,7 @@ > #include > #include > #include > +#include > #include > > /* Max address size we deal with */ > @@ -601,12 +602,72 @@ const __be32 *of_get_address(struct device_node *dev, int index, u64 *size, > } > EXPORT_SYMBOL(of_get_address); > > +struct io_range { > + struct list_head list; > + phys_addr_t start; > + resource_size_t size; > +}; > + > +static LIST_HEAD(io_range_list); > + > +/* > + * Record the PCI IO range (expressed as CPU physical address + size). > + * Return a negative value if an error has occured, zero otherwise > + */ > +int __weak pci_register_io_range(phys_addr_t addr, resource_size_t size) I don't understand the interface here. What's the mapping from CPU physical address to bus I/O port? For example, I have the following machine in mind: HWP0002:00: PCI Root Bridge (domain 0000 [bus 00-1b]) HWP0002:00: memory-mapped IO port space [mem 0xf8010000000-0xf8010000fff] HWP0002:00: host bridge window [io 0x0000-0x0fff] HWP0002:09: PCI Root Bridge (domain 0001 [bus 00-1b]) HWP0002:09: memory-mapped IO port space [mem 0xf8110000000-0xf8110000fff] HWP0002:09: host bridge window [io 0x1000000-0x1000fff] (PCI address [0x0-0xfff]) The CPU physical memory [mem 0xf8010000000-0xf8010000fff] is translated by the bridge to I/O ports 0x0000-0x0fff on PCI bus 0000:00. Drivers use, e.g., "inb(0)" to access it. Similarly, [mem 0xf8110000000-0xf8110000fff] is translated by the second bridge to I/O ports 0x0000-0x0fff on PCI bus 0001:00. Drivers use "inb(0x1000000)" to access it. pci_register_io_range() seems sort of like it's intended to track the memory-mapped IO port spaces, e.g., [mem 0xf8010000000-0xf8010000fff]. But I would think you'd want to keep track of at least the base port number on the PCI bus, too. Or is that why it's weak? Here's what these look like in /proc/iomem and /proc/ioports (note that there are two resource structs for each memory-mapped IO port space: one IORESOURCE_MEM for the memory-mapped area (used only by the host bridge driver), and one IORESOURCE_IO for the I/O port space (this becomes the parent of a region used by a regular device driver): /proc/iomem: PCI Bus 0000:00 I/O Ports 00000000-00000fff PCI Bus 0001:00 I/O Ports 01000000-01000fff /proc/ioports: 00000000-00000fff : PCI Bus 0000:00 01000000-01000fff : PCI Bus 0001:00 > +{ > +#ifdef PCI_IOBASE > + struct io_range *res; > + resource_size_t allocated_size = 0; > + > + /* check if the range hasn't been previously recorded */ > + list_for_each_entry(res, &io_range_list, list) { > + if (addr >= res->start && addr + size <= res->start + size) > + return 0; > + allocated_size += res->size; > + } > + > + /* range not registed yet, check for available space */ > + if (allocated_size + size - 1 > IO_SPACE_LIMIT) > + return -E2BIG; > + > + /* add the range to the list */ > + res = kzalloc(sizeof(*res), GFP_KERNEL); > + if (!res) > + return -ENOMEM; > + > + res->start = addr; > + res->size = size; > + > + list_add_tail(&res->list, &io_range_list); > + > + return 0; > +#else > + return -EINVAL; > +#endif > +} > + > unsigned long __weak pci_address_to_pio(phys_addr_t address) > { > +#ifdef PCI_IOBASE > + struct io_range *res; > + resource_size_t offset = 0; > + > + list_for_each_entry(res, &io_range_list, list) { > + if (address >= res->start && > + address < res->start + res->size) { > + return res->start - address + offset; > + } > + offset += res->size; > + } > + > + return (unsigned long)-1; > +#else > if (address > IO_SPACE_LIMIT) > return (unsigned long)-1; > > return (unsigned long) address; > +#endif > } > > static int __of_address_to_resource(struct device_node *dev, > diff --git a/include/linux/of_address.h b/include/linux/of_address.h > index c13b878..ac4aac4 100644 > --- a/include/linux/of_address.h > +++ b/include/linux/of_address.h > @@ -55,6 +55,7 @@ extern void __iomem *of_iomap(struct device_node *device, int index); > extern const __be32 *of_get_address(struct device_node *dev, int index, > u64 *size, unsigned int *flags); > > +extern int pci_register_io_range(phys_addr_t addr, resource_size_t size); > extern unsigned long pci_address_to_pio(phys_addr_t addr); > > extern int of_pci_range_parser_init(struct of_pci_range_parser *parser, > -- > 2.0.0 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/