From: Liviu Dudau <Liviu.Dudau@arm.com>
To: linux-pci <linux-pci@vger.kernel.org>,
Bjorn Helgaas <bhelgaas@google.com>,
Catalin Marinas <Catalin.Marinas@arm.com>,
Will Deacon <Will.Deacon@arm.com>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Arnd Bergmann <arnd@arndb.de>,
linaro-kernel <linaro-kernel@lists.linaro.org>,
Tanmay Inamdar <tinamdar@apm.com>,
Grant Likely <grant.likely@secretlab.ca>,
Sinan Kaya <okaya@codeaurora.org>,
Jingoo Han <jg1.han@samsung.com>,
Kukjin Kim <kgene.kim@samsung.com>,
Suravee Suthikulanit <suravee.suthikulpanit@amd.com>
Cc: LKML <linux-kernel@vger.kernel.org>,
Device Tree ML <devicetree@vger.kernel.org>,
LAKML <linux-arm-kernel@lists.infradead.org>
Subject: [PATCH v8 3/9] pci: Introduce pci_register_io_range() helper function.
Date: Tue, 1 Jul 2014 19:43:28 +0100 [thread overview]
Message-ID: <1404240214-9804-4-git-send-email-Liviu.Dudau@arm.com> (raw)
In-Reply-To: <1404240214-9804-1-git-send-email-Liviu.Dudau@arm.com>
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 <Liviu.Dudau@arm.com>
---
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 <linux/module.h>
#include <linux/of_address.h>
#include <linux/pci_regs.h>
+#include <linux/slab.h>
#include <linux/string.h>
/* 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)
+{
+#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
next prev parent reply other threads:[~2014-07-01 18:47 UTC|newest]
Thread overview: 92+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-01 18:43 [PATCH v8 0/9] Support for creating generic PCI host bridges from DT Liviu Dudau
2014-07-01 18:43 ` [PATCH v8 1/9] Fix ioport_map() for !CONFIG_GENERIC_IOMAP cases Liviu Dudau
2014-07-01 18:43 ` [PATCH v8 2/9] pci: Export find_pci_host_bridge() function Liviu Dudau
2014-07-02 18:06 ` Tanmay Inamdar
2014-07-02 19:12 ` Arnd Bergmann
2014-07-02 20:43 ` Tanmay Inamdar
2014-07-03 9:53 ` Liviu Dudau
2014-07-03 10:26 ` Arnd Bergmann
2014-07-07 23:27 ` Bjorn Helgaas
2014-07-08 10:42 ` Liviu Dudau
2014-07-01 18:43 ` Liviu Dudau [this message]
2014-07-01 19:36 ` [PATCH v8 3/9] pci: Introduce pci_register_io_range() helper function Arnd Bergmann
2014-07-01 20:45 ` Liviu Dudau
2014-07-02 12:30 ` Arnd Bergmann
2014-07-02 14:23 ` Liviu Dudau
2014-07-02 14:58 ` Arnd Bergmann
2014-07-02 11:22 ` Will Deacon
2014-07-02 16:00 ` Liviu Dudau
2014-07-02 12:38 ` Arnd Bergmann
2014-07-02 13:20 ` Liviu Dudau
2014-07-08 0:14 ` Bjorn Helgaas
2014-07-08 7:00 ` Arnd Bergmann
2014-07-08 21:29 ` Bjorn Helgaas
2014-07-08 22:45 ` Liviu Dudau
2014-07-09 6:32 ` Arnd Bergmann
2014-07-09 9:13 ` Liviu Dudau
2014-07-09 6:20 ` Arnd Bergmann
2014-07-09 9:14 ` Liviu Dudau
2014-07-09 15:21 ` Bjorn Helgaas
2014-07-08 10:40 ` Liviu Dudau
2014-07-08 14:14 ` Arnd Bergmann
2014-07-09 8:59 ` Liviu Dudau
2014-07-01 18:43 ` [PATCH v8 4/9] pci: OF: Fix the conversion of IO ranges into IO resources Liviu Dudau
2014-07-05 19:25 ` Rob Herring
2014-07-05 20:46 ` Arnd Bergmann
2014-07-07 11:11 ` Liviu Dudau
2014-07-07 21:22 ` Arnd Bergmann
2014-07-08 10:03 ` Liviu Dudau
2014-07-09 8:31 ` Arnd Bergmann
2014-07-09 9:27 ` Liviu Dudau
2014-07-16 14:35 ` Rob Herring
2014-07-16 14:47 ` Liviu Dudau
2014-07-16 14:47 ` Arnd Bergmann
2014-07-01 18:43 ` [PATCH v8 5/9] pci: Create pci_host_bridge before its associated bus in pci_create_root_bus Liviu Dudau
2014-07-01 18:43 ` [PATCH v8 6/9] pci: Introduce a domain number for pci_host_bridge Liviu Dudau
2014-07-08 0:59 ` Bjorn Helgaas
2014-07-08 10:46 ` Liviu Dudau
2014-07-08 18:41 ` Bjorn Helgaas
2014-07-08 22:48 ` Liviu Dudau
2014-07-09 15:10 ` Bjorn Helgaas
2014-07-10 9:47 ` Liviu Dudau
2014-07-10 22:36 ` Bjorn Helgaas
2014-07-11 9:30 ` Liviu Dudau
2014-07-11 14:11 ` Catalin Marinas
2014-07-11 15:08 ` Liviu Dudau
2014-07-11 16:09 ` Catalin Marinas
2014-07-11 17:02 ` Bjorn Helgaas
2014-07-11 18:02 ` Catalin Marinas
2014-07-14 16:39 ` Catalin Marinas
2014-07-22 3:15 ` Bjorn Helgaas
2014-07-25 15:42 ` Catalin Marinas
2014-07-01 18:43 ` [PATCH v8 7/9] pci: of: Parse and map the IRQ when adding the PCI device Liviu Dudau
2014-07-02 11:17 ` Will Deacon
2014-07-05 19:04 ` Rob Herring
2014-07-01 18:43 ` [PATCH v8 8/9] pci: Add support for creating a generic host_bridge from device tree Liviu Dudau
2014-07-01 20:50 ` [RESEND] " Liviu Dudau
2014-07-01 21:04 ` Liviu Dudau
2014-07-02 11:22 ` Will Deacon
2014-07-02 17:23 ` Liviu Dudau
2014-07-02 17:31 ` Will Deacon
2014-07-02 19:09 ` Arnd Bergmann
2014-07-08 1:01 ` Bjorn Helgaas
2014-07-08 10:29 ` Liviu Dudau
2014-07-08 21:33 ` Bjorn Helgaas
2014-07-08 22:27 ` Liviu Dudau
2014-07-08 22:37 ` Bjorn Helgaas
2014-07-08 22:57 ` Liviu Dudau
2014-07-09 6:47 ` Arnd Bergmann
2014-07-11 7:43 ` Jingoo Han
2014-07-11 9:08 ` Liviu Dudau
2014-07-01 18:43 ` [PATCH v8 9/9] pci: Remap I/O bus resources into CPU space with pci_remap_iospace() Liviu Dudau
2014-07-14 16:54 ` Catalin Marinas
2014-07-14 16:56 ` Liviu Dudau
2014-07-14 18:15 ` Arnd Bergmann
2014-07-15 0:14 ` Liviu Dudau
2014-07-15 9:09 ` Catalin Marinas
2014-07-06 15:23 ` [PATCH v8 0/9] Support for creating generic PCI host bridges from DT Rob Herring
2014-07-07 11:12 ` Liviu Dudau
2014-07-08 17:18 ` Liviu Dudau
2014-07-11 0:44 ` Tanmay Inamdar
2014-07-11 7:33 ` Jingoo Han
2014-07-11 9:11 ` Liviu Dudau
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=1404240214-9804-4-git-send-email-Liviu.Dudau@arm.com \
--to=liviu.dudau@arm.com \
--cc=Catalin.Marinas@arm.com \
--cc=Will.Deacon@arm.com \
--cc=arnd@arndb.de \
--cc=benh@kernel.crashing.org \
--cc=bhelgaas@google.com \
--cc=devicetree@vger.kernel.org \
--cc=grant.likely@secretlab.ca \
--cc=jg1.han@samsung.com \
--cc=kgene.kim@samsung.com \
--cc=linaro-kernel@lists.linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=okaya@codeaurora.org \
--cc=suravee.suthikulpanit@amd.com \
--cc=tinamdar@apm.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®