| Message ID | 4675465.4Qhqy6WU4X@wuerfel (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
Hi, Arnd, Thanks you very much! To understand your idea more clear, I have some questions on your patch sketch. Please check it below. On 2016/11/24 7:23, Arnd Bergmann wrote: > On Wednesday, November 23, 2016 6:07:11 PM CET Arnd Bergmann wrote: >> On Wednesday, November 23, 2016 3:22:33 PM CET Gabriele Paoloni wrote: >>> From: Arnd Bergmann [mailto:arnd@arndb.de] >>>> On Friday, November 18, 2016 5:03:11 PM CET Gabriele Paoloni wrote: >> >> Please don't proliferate the use of >> pci_pio_to_address/pci_address_to_pio here, computing the physical >> address from the logical address is trivial, you just need to >> subtract the start of the range that you already use when matching >> the port number range. >> >> The only thing we need here is to make of_address_to_resource() >> return the correct logical port number that was registered for >> a given host device when asked to translate an address that >> does not have a CPU address associated with it. > > Ok, I admit this was a little harder than I expected, but see below > for a rough outline of how I think it can be done. > > This makes it possible to translate bus specific I/O port numbers > from device nodes into Linux port numbers, and gives a way to register > them. We could take this further and completely remove pci_pio_to_address > and pci_address_to_pio if we make the I/O port translation always > go through the io_range list, looking up up the hostbridge by fwnode, > but we don't have to do that now. > > The patch is completely untested and probably buggy, it just seemed > easier to put out a prototype than to keep going in circles with the > discussion. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c > index bf601d4df8cf..6cadf0501bb0 100644 > --- a/drivers/acpi/pci_root.c > +++ b/drivers/acpi/pci_root.c > @@ -730,7 +730,8 @@ static void acpi_pci_root_validate_resources(struct device *dev, > } > } > > -static void acpi_pci_root_remap_iospace(struct resource_entry *entry) > +static void acpi_pci_root_remap_iospace(struct fwnode_handle *node, > + struct resource_entry *entry) > { > #ifdef PCI_IOBASE > struct resource *res = entry->res; > @@ -739,11 +740,7 @@ static void acpi_pci_root_remap_iospace(struct resource_entry *entry) > resource_size_t length = resource_size(res); > unsigned long port; > > - if (pci_register_io_range(cpu_addr, length)) > - goto err; > - > - port = pci_address_to_pio(cpu_addr); > - if (port == (unsigned long)-1) > + if (pci_register_io_range(node, cpu_addr, length, &port)) > goto err; > > res->start = port; > @@ -781,7 +778,8 @@ int acpi_pci_probe_root_resources(struct acpi_pci_root_info *info) > else { > resource_list_for_each_entry_safe(entry, tmp, list) { > if (entry->res->flags & IORESOURCE_IO) > - acpi_pci_root_remap_iospace(entry); > + acpi_pci_root_remap_iospace(&device->fwnode, > + entry); > > if (entry->res->flags & IORESOURCE_DISABLED) > resource_list_destroy_entry(entry); I think those changes in pci_root.c is only to match the new definition of pci_register_io_range() and work for PCI I/O. It doesn't make sense for LPC, is it right? > diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c > index a50025a3777f..df96955a43f8 100644 > --- a/drivers/block/nbd.c > +++ b/drivers/block/nbd.c > @@ -760,8 +760,10 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd, > set_bit(NBD_RUNNING, &nbd->runtime_flags); > blk_mq_update_nr_hw_queues(&nbd->tag_set, nbd->num_connections); > args = kcalloc(num_connections, sizeof(*args), GFP_KERNEL); > - if (!args) > + if (!args) { > + error = -ENOMEM; > goto out_err; > + } > nbd->task_recv = current; > mutex_unlock(&nbd->config_lock); > I think change here is none of the business.:) > diff --git a/drivers/of/address.c b/drivers/of/address.c > index 02b2903fe9d2..5decaba96eed 100644 > --- a/drivers/of/address.c > +++ b/drivers/of/address.c > @@ -2,6 +2,7 @@ > #define pr_fmt(fmt) "OF: " fmt > > #include <linux/device.h> > +#include <linux/fwnode.h> > #include <linux/io.h> > #include <linux/ioport.h> > #include <linux/module.h> > @@ -323,14 +324,9 @@ int of_pci_range_to_resource(struct of_pci_range *range, > > if (res->flags & IORESOURCE_IO) { > unsigned long port; > - err = pci_register_io_range(range->cpu_addr, range->size); > + err = pci_register_io_range(&np->fwnode, range->cpu_addr, range->size, &port); > if (err) > goto invalid_range; > - port = pci_address_to_pio(range->cpu_addr); > - if (port == (unsigned long)-1) { > - err = -EINVAL; > - goto invalid_range; > - } > res->start = port; > } else { > if ((sizeof(resource_size_t) < 8) && > @@ -479,7 +475,7 @@ static int of_empty_ranges_quirk(struct device_node *np) > return false; > } > > -static int of_translate_one(struct device_node *parent, struct of_bus *bus, > +static u64 of_translate_one(struct device_node *parent, struct of_bus *bus, > struct of_bus *pbus, __be32 *addr, > int na, int ns, int pna, const char *rprop) > { > @@ -507,7 +503,7 @@ static int of_translate_one(struct device_node *parent, struct of_bus *bus, > ranges = of_get_property(parent, rprop, &rlen); > if (ranges == NULL && !of_empty_ranges_quirk(parent)) { > pr_debug("no ranges; cannot translate\n"); > - return 1; > + return OF_BAD_ADDR; > } > if (ranges == NULL || rlen == 0) { > offset = of_read_number(addr, na); > @@ -528,7 +524,7 @@ static int of_translate_one(struct device_node *parent, struct of_bus *bus, > } > if (offset == OF_BAD_ADDR) { > pr_debug("not found !\n"); > - return 1; > + return offset; > } > memcpy(addr, ranges + na, 4 * pna); > > @@ -537,7 +533,10 @@ static int of_translate_one(struct device_node *parent, struct of_bus *bus, > pr_debug("with offset: %llx\n", (unsigned long long)offset); > > /* Translate it into parent bus space */ > - return pbus->translate(addr, offset, pna); > + if (pbus->translate(addr, offset, pna)) > + return OF_BAD_ADDR; > + > + return offset; > } > > /* > @@ -549,9 +548,14 @@ static int of_translate_one(struct device_node *parent, struct of_bus *bus, > * that translation is impossible (that is we are not dealing with a value > * that can be mapped to a cpu physical address). This is not really specified > * that way, but this is traditionally the way IBM at least do things > + * > + * Whenever the translation fails, the *host pointer will be set to the > + * device that lacks a tranlation, and the return code is relative to > + * that node. > */ > static u64 __of_translate_address(struct device_node *dev, > - const __be32 *in_addr, const char *rprop) > + const __be32 *in_addr, const char *rprop, > + struct device_node **host) > { > struct device_node *parent = NULL; > struct of_bus *bus, *pbus; > @@ -564,6 +568,7 @@ static u64 __of_translate_address(struct device_node *dev, > /* Increase refcount at current level */ > of_node_get(dev); > > + *host = NULL; > /* Get parent & match bus type */ > parent = of_get_parent(dev); > if (parent == NULL) > @@ -600,8 +605,9 @@ static u64 __of_translate_address(struct device_node *dev, > pbus = of_match_bus(parent); > pbus->count_cells(dev, &pna, &pns); > if (!OF_CHECK_COUNTS(pna, pns)) { > - pr_err("Bad cell count for %s\n", > - of_node_full_name(dev)); > + pr_debug("Bad cell count for %s\n", > + of_node_full_name(dev)); > + *host = of_node_get(parent); > break; > } I don't think here is the right place to fill *host. I think you want to return the parent where the of_translate_one() failed for the 'ranges' property missing. So, I think this seems better: if (of_translate_one(dev, bus, pbus, addr, na, ns, pna, rprop)) { *host = of_node_get(dev); break; } > > @@ -609,7 +615,9 @@ static u64 __of_translate_address(struct device_node *dev, > pbus->name, pna, pns, of_node_full_name(parent)); > > /* Apply bus translation */ > - if (of_translate_one(dev, bus, pbus, addr, na, ns, pna, rprop)) > + result = of_translate_one(dev, bus, pbus, addr, na, ns, > + pna, rprop); > + if (result == OF_BAD_ADDR) > break; > > /* Complete the move up one level */ > @@ -628,13 +636,32 @@ static u64 __of_translate_address(struct device_node *dev, > > u64 of_translate_address(struct device_node *dev, const __be32 *in_addr) > { > - return __of_translate_address(dev, in_addr, "ranges"); > + struct device_node *host; > + u64 ret; > + > + ret = __of_translate_address(dev, in_addr, "ranges", &host); > + if (host) { > + of_node_put(host); > + return OF_BAD_ADDR; > + } > + > + return ret; > } > EXPORT_SYMBOL(of_translate_address); > > u64 of_translate_dma_address(struct device_node *dev, const __be32 *in_addr) > { > - return __of_translate_address(dev, in_addr, "dma-ranges"); > + struct device_node *host; > + u64 ret; > + > + ret = __of_translate_address(dev, in_addr, "dma-ranges", &host); > + > + if (host) { > + of_node_put(host); > + return OF_BAD_ADDR; > + } > + > + return ret; > } > EXPORT_SYMBOL(of_translate_dma_address); > > @@ -676,29 +703,48 @@ const __be32 *of_get_address(struct device_node *dev, int index, u64 *size, > } > EXPORT_SYMBOL(of_get_address); > > +extern unsigned long extio_translate(struct fwnode_handle *node, unsigned long offset); > + > +u64 of_translate_ioport(struct device_node *dev, const __be32 *in_addr) > +{ > + u64 taddr; > + unsigned long port; > + struct device_node *host; > + > + taddr = __of_translate_address(dev, in_addr, "ranges", &host); > + if (host) { > + /* host specific port access */ > + port = extio_translate(&host->fwnode, taddr); > + of_node_put(host); > + } else { > + /* memory mapped I/O range */ > + port = pci_address_to_pio(taddr); > + if (port == (unsigned long)-1) > + return OF_BAD_ADDR; > + } > + > + return port; > +} > + > static int __of_address_to_resource(struct device_node *dev, > const __be32 *addrp, u64 size, unsigned int flags, > const char *name, struct resource *r) > { > u64 taddr; > > - if ((flags & (IORESOURCE_IO | IORESOURCE_MEM)) == 0) > + if (flags & IORESOURCE_MEM) > + taddr = of_translate_address(dev, addrp); > + else if (flags & IORESOURCE_IO) > + taddr = of_translate_ioport(dev, addrp); > + else > return -EINVAL; > - taddr = of_translate_address(dev, addrp); > + > if (taddr == OF_BAD_ADDR) > return -EINVAL; > memset(r, 0, sizeof(struct resource)); > - if (flags & IORESOURCE_IO) { > - unsigned long port; > - port = pci_address_to_pio(taddr); > - if (port == (unsigned long)-1) > - return -EINVAL; > - r->start = port; > - r->end = port + size - 1; > - } else { > - r->start = taddr; > - r->end = taddr + size - 1; > - } > + > + r->start = taddr; > + r->end = taddr + size - 1; > r->flags = flags; > r->name = name ? name : dev->full_name; > > diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c > index eda6a7cf0e54..320ab9fbf6af 100644 > --- a/drivers/pci/pci.c > +++ b/drivers/pci/pci.c > @@ -3249,6 +3249,7 @@ EXPORT_SYMBOL(pci_request_regions_exclusive); > #ifdef PCI_IOBASE > struct io_range { > struct list_head list; > + struct fwnode_handle *node; > phys_addr_t start; > resource_size_t size; > }; > @@ -3257,11 +3258,14 @@ static LIST_HEAD(io_range_list); > static DEFINE_SPINLOCK(io_range_lock); > #endif > > +#define IO_RANGE_IOEXT (resource_size_t)(-1ull) > + > /* > * 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) > +int __weak pci_register_io_range(struct fwnode_handle *node, phys_addr_t addr, > + resource_size_t size, unsigned long *port) > { > int err = 0; > > @@ -3272,7 +3276,12 @@ int __weak pci_register_io_range(phys_addr_t addr, resource_size_t size) > /* check if the range hasn't been previously recorded */ > spin_lock(&io_range_lock); > list_for_each_entry(range, &io_range_list, list) { > - if (addr >= range->start && addr + size <= range->start + size) { > + if (node == range->node) > + goto end_register; > + I don't think it is safe to only check the node had been registered. For PCI/PCIE, there is only one I/O windows in bridge, it seems ok. But for non-pci devices, such as ISA/LPC, I wonder it is possible there are several disjoint I/O 'ranges' entries... What parameters are necessary for linux PIO allocation? 1) For those bus devices which have no MMIO( that is to say, indirectIO is using), I think 'addr' is not needed, but 'size' is mandatory; I am thinking for our LPC, as there is no cpu address, we should not input 'addr' for the io range register. With 'size' as parameter, we implement a new io range register function where can assign an unique linux PIO for this register calling. The output linux PIO can allocate from a sub-range of whole I/O space of [0, IO_SPACE_LIMIT]. This sub-range is specific for indirectIO, I want to define a new macro, such as EXTIO_LIMIT, to represent the upper limit of indirect IO space. #if defined(CONFIG_PCI) && defined(CONFIG_INDIRECT_PIO) #define EXTIO_LIMIT PCIBIOS_MIN_IO #elif defined(CONFIG_INDIRECT_PIO) #define EXTIO_LIMIT 0x1000 #else #define EXTIO_LIMIT 0x00 #end We should do some checkings to ensure EXTIO_LIMIT < IO_SPACE_LIMIT. Then when someone call pci_register_io_range() or a new function for the linux PIO register, we can allocate linux PIO from [0, EXTIO_LIMIT) for indirectIO bus, from [EXTIO_LIMIT, IO_SPACE_LIMIT] for MMIO; But there are issues confused me yet. For example, how to know the IO size for the indirectIO bus? You known, there is no 'ranges' property for those buses.... 2) For PCI MMIO, I think 'addr' is needed As for the current pci_register_io_range()/pci_address_to_pio(), I have two doubts: 2.1) If there are multiple PCI host bridges which support I/O transaction, I wonder whether the first host bridge can access the downstream devices with bus I/O address in [0, PCIBIOS_MIN_IO) for the first host bridge, pci_address_to_pio() will return a linux PIO range start from 0. But when calling __pci_assign_resource() to allocate the linux PIO for PCI/PCIE devices/buses which are just children of first host bus, it can not allocate linux PIO less than PCIBIOS_MIN_IO, which means kernel can not called in/out() with port less than PCIBIOS_MIN_IO. But we had ioremap [PCI_IOBASE + 0, PCI_IOBASE + size) to [pci_ioadd, pci_ioadd + size) before. static int __pci_assign_resource(struct pci_bus *bus, struct pci_dev *dev, int resno, resource_size_t size, resource_size_t align) { struct resource *res = dev->resource + resno; resource_size_t min; int ret; min = (res->flags & IORESOURCE_IO) ? PCIBIOS_MIN_IO : PCIBIOS_MIN_MEM; and in the later function: static int pci_bus_alloc_from_region(struct pci_bus *bus, struct resource *res, resource_size_t size, resource_size_t align, resource_size_t min, unsigned long type_mask, resource_size_t (*alignf)(void *, .... pci_bus_for_each_resource(bus, r, i) { resource_size_t min_used = min; .... if (avail.start) min_used = avail.start; max = avail.end; /* Ok, try it out.. */ ret = allocate_resource(r, res, size, min_used, max, align, alignf, alignf_data); After allocate_resource(), a IO resource is allocated, but whose 'start' is not less than min_used.( since avail.start is 0, min_used will keep the 'min' without change to avail.start; Should be PCIBIOS_MIN_IO). 2.2) Is it possible the return linux PIO isn't page-aligned? When calling pci_remap_iospace(const struct resource *res, phys_addr_t phys_addr), if res->start is not page-aligned, it seems that ioremap_page_range() will meet some issues for duplication iorempa for same virtual page. of-course, if we always configure the I/O ranges size as page-aligned, it will be OK. I found PowerPC will ensure the 'vaddress' and the 'size' are page-aligned before ioremap, do we need to improve the current handling in pci_register_io_range/pci_address_to_pio? Thanks, Zhichang > + if (addr != IO_RANGE_IOEXT && > + addr >= range->start && > + addr + size <= range->start + size) { > /* range already registered, bail out */ > goto end_register; > } > @@ -3298,6 +3307,7 @@ int __weak pci_register_io_range(phys_addr_t addr, resource_size_t size) > goto end_register; > } > > + range->node = node; > range->start = addr; > range->size = size; > > @@ -3305,11 +3315,26 @@ int __weak pci_register_io_range(phys_addr_t addr, resource_size_t size) > > end_register: > spin_unlock(&io_range_lock); > + > + *port = allocated_size; > +#else > + /* > + * powerpc and microblaze have their own registration, > + * just look up the value here > + */ > + *port = pci_address_to_pio(addr); > #endif > > return err; > } > > +#ifdef CONFIG_IOEXT > +int ioext_register_io_range > +{ > + return pci_register_io_range(node, IO_RANGE_IOEXT, size, port); > +} > +#endif > + > phys_addr_t pci_pio_to_address(unsigned long pio) > { > phys_addr_t address = (phys_addr_t)OF_BAD_ADDR; > diff --git a/include/linux/pci.h b/include/linux/pci.h > index 6bd94a803e8f..b7a8fa3da3ca 100644 > --- a/include/linux/pci.h > +++ b/include/linux/pci.h > @@ -1192,7 +1192,8 @@ int __must_check pci_bus_alloc_resource(struct pci_bus *bus, > void *alignf_data); > > > -int pci_register_io_range(phys_addr_t addr, resource_size_t size); > +int pci_register_io_range(struct fwnode_handle *node, phys_addr_t addr, > + resource_size_t size, unsigned long *port); > unsigned long pci_address_to_pio(phys_addr_t addr); > phys_addr_t pci_pio_to_address(unsigned long pio); > int pci_remap_iospace(const struct resource *res, phys_addr_t phys_addr); > > > . > -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thursday, November 24, 2016 5:12:49 PM CET zhichang.yuan wrote: > On 2016/11/24 7:23, Arnd Bergmann wrote: > > On Wednesday, November 23, 2016 6:07:11 PM CET Arnd Bergmann wrote: > >> On Wednesday, November 23, 2016 3:22:33 PM CET Gabriele Paoloni wrote: > >>> From: Arnd Bergmann [mailto:arnd@arndb.de] > >>>> On Friday, November 18, 2016 5:03:11 PM CET Gabriele Paoloni wrote: > >> > > @@ -781,7 +778,8 @@ int acpi_pci_probe_root_resources(struct acpi_pci_root_info *info) > > else { > > resource_list_for_each_entry_safe(entry, tmp, list) { > > if (entry->res->flags & IORESOURCE_IO) > > - acpi_pci_root_remap_iospace(entry); > > + acpi_pci_root_remap_iospace(&device->fwnode, > > + entry); > > > > if (entry->res->flags & IORESOURCE_DISABLED) > > resource_list_destroy_entry(entry); > > I think those changes in pci_root.c is only to match the new definition of > pci_register_io_range() and work for PCI I/O. It doesn't make sense for LPC, is > it right? Right, we wouldn't call acpi_pci_probe_root_resources() for LPC, the change is just that we always pass the fwnode pointer to allow matching based on that for any I/O space that does not have a physical memory address associated with it. I tried to keep this part general, so in theory that allows us to have more than one I/O space without a CPU mapping, even though we don't strictly need that for supporting your LPC controller. > > diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c > > index a50025a3777f..df96955a43f8 100644 > > --- a/drivers/block/nbd.c > > +++ b/drivers/block/nbd.c > > @@ -760,8 +760,10 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd, > > set_bit(NBD_RUNNING, &nbd->runtime_flags); > > blk_mq_update_nr_hw_queues(&nbd->tag_set, nbd->num_connections); > > args = kcalloc(num_connections, sizeof(*args), GFP_KERNEL); > > - if (!args) > > + if (!args) { > > + error = -ENOMEM; > > goto out_err; > > + } > > nbd->task_recv = current; > > mutex_unlock(&nbd->config_lock); > > > I think change here is none of the business.:) Right, sorry about that, I forgot to commit this bugfix before looking at the I/O space stuff. > > + *host = NULL; > > /* Get parent & match bus type */ > > parent = of_get_parent(dev); > > if (parent == NULL) > > @@ -600,8 +605,9 @@ static u64 __of_translate_address(struct device_node *dev, > > pbus = of_match_bus(parent); > > pbus->count_cells(dev, &pna, &pns); > > if (!OF_CHECK_COUNTS(pna, pns)) { > > - pr_err("Bad cell count for %s\n", > > - of_node_full_name(dev)); > > + pr_debug("Bad cell count for %s\n", > > + of_node_full_name(dev)); > > + *host = of_node_get(parent); > > break; > > } > I don't think here is the right place to fill *host. I think you want to return > the parent where the of_translate_one() failed for the 'ranges' property > missing. So, I think this seems better: > > if (of_translate_one(dev, bus, pbus, addr, na, ns, pna, rprop)) { > *host = of_node_get(dev); > break; > } You are right, I got the wrong place. The parent node will have a #address-cells but won't have ranges for the I/O space. > > @@ -3272,7 +3276,12 @@ int __weak pci_register_io_range(phys_addr_t addr, resource_size_t size) > > /* check if the range hasn't been previously recorded */ > > spin_lock(&io_range_lock); > > list_for_each_entry(range, &io_range_list, list) { > > - if (addr >= range->start && addr + size <= range->start + size) { > > + if (node == range->node) > > + goto end_register; > > + > I don't think it is safe to only check the node had been registered. For > PCI/PCIE, there is only one I/O windows in bridge, it seems ok. But for non-pci > devices, such as ISA/LPC, I wonder it is possible there are several disjoint I/O > 'ranges' entries... I think this part is completely safe, I can't imagine why you'd have more than one range of I/O ports that have valid translations. Do you have a specific example in mind where that would not be the case, or are you just worried about the principle in general? > What parameters are necessary for linux PIO allocation? > 1) For those bus devices which have no MMIO( that is to say, indirectIO is > using), I think 'addr' is not needed, but 'size' is mandatory; Agreed. > I am thinking for our LPC, as there is no cpu address, we should not input > 'addr' for the io range register. With 'size' as parameter, we implement a new > io range register function where can assign an unique linux PIO for this > register calling. The output linux PIO can allocate from a sub-range of whole > I/O space of [0, IO_SPACE_LIMIT]. This sub-range is specific for indirectIO, I > want to define a new macro, such as EXTIO_LIMIT, to represent the upper limit of > indirect IO space. > > #if defined(CONFIG_PCI) && defined(CONFIG_INDIRECT_PIO) > #define EXTIO_LIMIT PCIBIOS_MIN_IO > #elif defined(CONFIG_INDIRECT_PIO) > #define EXTIO_LIMIT 0x1000 > #else > #define EXTIO_LIMIT 0x00 > #end > > We should do some checkings to ensure EXTIO_LIMIT < IO_SPACE_LIMIT. I think we don't need to limit the EXTIO range at all. For your specific case of LPC, we know it is limited, but my prototype patch leaves this part generic enough to also allow using it for a PCI host with indirect I/O space, and that can have a larger size. > Then when someone call pci_register_io_range() or a new function for the linux > PIO register, we can allocate linux PIO from [0, EXTIO_LIMIT) for indirectIO > bus, from [EXTIO_LIMIT, IO_SPACE_LIMIT] for MMIO; > > But there are issues confused me yet. For example, how to know the IO size for > the indirectIO bus? You known, there is no 'ranges' property for those buses.... Good point. We normally call pci_register_io_range() from of_pci_range_to_resource and its ACPI equivalent. When there is no ranges, we obviously won't call it, but there is also no size associated with it. I think this is ok because the host driver would already know the size based on the hardware register layout, and it can just register that directly. > 2) For PCI MMIO, I think 'addr' is needed So far I assumed it was, but actually we can perhaps remove the address if we manage to kill off pci_address_to_pio() and pci_pio_to_address. > As for the current pci_register_io_range()/pci_address_to_pio(), I have two doubts: > > 2.1) If there are multiple PCI host bridges which support I/O transaction, I > wonder whether the first host bridge can access the downstream devices with bus > I/O address in [0, PCIBIOS_MIN_IO) > > for the first host bridge, pci_address_to_pio() will return a linux PIO range > start from 0. > But when calling __pci_assign_resource() to allocate the linux PIO for PCI/PCIE > devices/buses which are just children of first host bus, it can not allocate > linux PIO less than PCIBIOS_MIN_IO, which means kernel can not called in/out() > with port less than PCIBIOS_MIN_IO. But we had ioremap [PCI_IOBASE + 0, > PCI_IOBASE + size) to [pci_ioadd, pci_ioadd + size) before. > > > static int __pci_assign_resource(struct pci_bus *bus, struct pci_dev *dev, > int resno, resource_size_t size, resource_size_t align) > { > struct resource *res = dev->resource + resno; > resource_size_t min; > int ret; > > min = (res->flags & IORESOURCE_IO) ? PCIBIOS_MIN_IO : PCIBIOS_MIN_MEM; > > > and in the later function: > > static int pci_bus_alloc_from_region(struct pci_bus *bus, struct resource *res, > resource_size_t size, resource_size_t align, > resource_size_t min, unsigned long type_mask, > resource_size_t (*alignf)(void *, > > .... > pci_bus_for_each_resource(bus, r, i) { > resource_size_t min_used = min; > .... > if (avail.start) > min_used = avail.start; > > max = avail.end; > > /* Ok, try it out.. */ > ret = allocate_resource(r, res, size, min_used, max, > align, alignf, alignf_data); > > After allocate_resource(), a IO resource is allocated, but whose 'start' is not > less than min_used.( since avail.start is 0, min_used will keep the 'min' > without change to avail.start; Should be PCIBIOS_MIN_IO). I'm not completely sure I'm following here. Generally speaking, addresses below PCIBIOS_MIN_IO are intended for PCI-ISA bridges and PCI devices with hardcoded port numbers for ISA compatibility, while __pci_assign_resource is meant to do dynamic assignment of I/O resources above PCIBIOS_MIN_IO so it does not conflict with the legacy ISA ports. Does that address your concern? > 2.2) Is it possible the return linux PIO isn't page-aligned? > > When calling pci_remap_iospace(const struct resource *res, phys_addr_t > phys_addr), if res->start is not page-aligned, it seems that > ioremap_page_range() will meet some issues for duplication iorempa for same > virtual page. > > of-course, if we always configure the I/O ranges size as page-aligned, it will > be OK. > > I found PowerPC will ensure the 'vaddress' and the 'size' are page-aligned > before ioremap, do we need to improve the current handling in > pci_register_io_range/pci_address_to_pio? I think it would be a good idea to enforce page-alignment here, even though everything could still work if it's not page-aligned. The requirement for ioremap_page_range() is that the offset within a page must be the same for the virtual and physical addresses. Adding page-alignment to pci_register_io_range() could be an enhancement that we can do independent of the other patches. Thanks a lot for your detailed analysis and feedback. Arnd -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index bf601d4df8cf..6cadf0501bb0 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c @@ -730,7 +730,8 @@ static void acpi_pci_root_validate_resources(struct device *dev, } } -static void acpi_pci_root_remap_iospace(struct resource_entry *entry) +static void acpi_pci_root_remap_iospace(struct fwnode_handle *node, + struct resource_entry *entry) { #ifdef PCI_IOBASE struct resource *res = entry->res; @@ -739,11 +740,7 @@ static void acpi_pci_root_remap_iospace(struct resource_entry *entry) resource_size_t length = resource_size(res); unsigned long port; - if (pci_register_io_range(cpu_addr, length)) - goto err; - - port = pci_address_to_pio(cpu_addr); - if (port == (unsigned long)-1) + if (pci_register_io_range(node, cpu_addr, length, &port)) goto err; res->start = port; @@ -781,7 +778,8 @@ int acpi_pci_probe_root_resources(struct acpi_pci_root_info *info) else { resource_list_for_each_entry_safe(entry, tmp, list) { if (entry->res->flags & IORESOURCE_IO) - acpi_pci_root_remap_iospace(entry); + acpi_pci_root_remap_iospace(&device->fwnode, + entry); if (entry->res->flags & IORESOURCE_DISABLED) resource_list_destroy_entry(entry); diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index a50025a3777f..df96955a43f8 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -760,8 +760,10 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd, set_bit(NBD_RUNNING, &nbd->runtime_flags); blk_mq_update_nr_hw_queues(&nbd->tag_set, nbd->num_connections); args = kcalloc(num_connections, sizeof(*args), GFP_KERNEL); - if (!args) + if (!args) { + error = -ENOMEM; goto out_err; + } nbd->task_recv = current; mutex_unlock(&nbd->config_lock); diff --git a/drivers/of/address.c b/drivers/of/address.c index 02b2903fe9d2..5decaba96eed 100644 --- a/drivers/of/address.c +++ b/drivers/of/address.c @@ -2,6 +2,7 @@ #define pr_fmt(fmt) "OF: " fmt #include <linux/device.h> +#include <linux/fwnode.h> #include <linux/io.h> #include <linux/ioport.h> #include <linux/module.h> @@ -323,14 +324,9 @@ int of_pci_range_to_resource(struct of_pci_range *range, if (res->flags & IORESOURCE_IO) { unsigned long port; - err = pci_register_io_range(range->cpu_addr, range->size); + err = pci_register_io_range(&np->fwnode, range->cpu_addr, range->size, &port); if (err) goto invalid_range; - port = pci_address_to_pio(range->cpu_addr); - if (port == (unsigned long)-1) { - err = -EINVAL; - goto invalid_range; - } res->start = port; } else { if ((sizeof(resource_size_t) < 8) && @@ -479,7 +475,7 @@ static int of_empty_ranges_quirk(struct device_node *np) return false; } -static int of_translate_one(struct device_node *parent, struct of_bus *bus, +static u64 of_translate_one(struct device_node *parent, struct of_bus *bus, struct of_bus *pbus, __be32 *addr, int na, int ns, int pna, const char *rprop) { @@ -507,7 +503,7 @@ static int of_translate_one(struct device_node *parent, struct of_bus *bus, ranges = of_get_property(parent, rprop, &rlen); if (ranges == NULL && !of_empty_ranges_quirk(parent)) { pr_debug("no ranges; cannot translate\n"); - return 1; + return OF_BAD_ADDR; } if (ranges == NULL || rlen == 0) { offset = of_read_number(addr, na); @@ -528,7 +524,7 @@ static int of_translate_one(struct device_node *parent, struct of_bus *bus, } if (offset == OF_BAD_ADDR) { pr_debug("not found !\n"); - return 1; + return offset; } memcpy(addr, ranges + na, 4 * pna); @@ -537,7 +533,10 @@ static int of_translate_one(struct device_node *parent, struct of_bus *bus, pr_debug("with offset: %llx\n", (unsigned long long)offset); /* Translate it into parent bus space */ - return pbus->translate(addr, offset, pna); + if (pbus->translate(addr, offset, pna)) + return OF_BAD_ADDR; + + return offset; } /* @@ -549,9 +548,14 @@ static int of_translate_one(struct device_node *parent, struct of_bus *bus, * that translation is impossible (that is we are not dealing with a value * that can be mapped to a cpu physical address). This is not really specified * that way, but this is traditionally the way IBM at least do things + * + * Whenever the translation fails, the *host pointer will be set to the + * device that lacks a tranlation, and the return code is relative to + * that node. */ static u64 __of_translate_address(struct device_node *dev, - const __be32 *in_addr, const char *rprop) + const __be32 *in_addr, const char *rprop, + struct device_node **host) { struct device_node *parent = NULL; struct of_bus *bus, *pbus; @@ -564,6 +568,7 @@ static u64 __of_translate_address(struct device_node *dev, /* Increase refcount at current level */ of_node_get(dev); + *host = NULL; /* Get parent & match bus type */ parent = of_get_parent(dev); if (parent == NULL) @@ -600,8 +605,9 @@ static u64 __of_translate_address(struct device_node *dev, pbus = of_match_bus(parent); pbus->count_cells(dev, &pna, &pns); if (!OF_CHECK_COUNTS(pna, pns)) { - pr_err("Bad cell count for %s\n", - of_node_full_name(dev)); + pr_debug("Bad cell count for %s\n", + of_node_full_name(dev)); + *host = of_node_get(parent); break; } @@ -609,7 +615,9 @@ static u64 __of_translate_address(struct device_node *dev, pbus->name, pna, pns, of_node_full_name(parent)); /* Apply bus translation */ - if (of_translate_one(dev, bus, pbus, addr, na, ns, pna, rprop)) + result = of_translate_one(dev, bus, pbus, addr, na, ns, + pna, rprop); + if (result == OF_BAD_ADDR) break; /* Complete the move up one level */ @@ -628,13 +636,32 @@ static u64 __of_translate_address(struct device_node *dev, u64 of_translate_address(struct device_node *dev, const __be32 *in_addr) { - return __of_translate_address(dev, in_addr, "ranges"); + struct device_node *host; + u64 ret; + + ret = __of_translate_address(dev, in_addr, "ranges", &host); + if (host) { + of_node_put(host); + return OF_BAD_ADDR; + } + + return ret; } EXPORT_SYMBOL(of_translate_address); u64 of_translate_dma_address(struct device_node *dev, const __be32 *in_addr) { - return __of_translate_address(dev, in_addr, "dma-ranges"); + struct device_node *host; + u64 ret; + + ret = __of_translate_address(dev, in_addr, "dma-ranges", &host); + + if (host) { + of_node_put(host); + return OF_BAD_ADDR; + } + + return ret; } EXPORT_SYMBOL(of_translate_dma_address); @@ -676,29 +703,48 @@ const __be32 *of_get_address(struct device_node *dev, int index, u64 *size, } EXPORT_SYMBOL(of_get_address); +extern unsigned long extio_translate(struct fwnode_handle *node, unsigned long offset); + +u64 of_translate_ioport(struct device_node *dev, const __be32 *in_addr) +{ + u64 taddr; + unsigned long port; + struct device_node *host; + + taddr = __of_translate_address(dev, in_addr, "ranges", &host); + if (host) { + /* host specific port access */ + port = extio_translate(&host->fwnode, taddr); + of_node_put(host); + } else { + /* memory mapped I/O range */ + port = pci_address_to_pio(taddr); + if (port == (unsigned long)-1) + return OF_BAD_ADDR; + } + + return port; +} + static int __of_address_to_resource(struct device_node *dev, const __be32 *addrp, u64 size, unsigned int flags, const char *name, struct resource *r) { u64 taddr; - if ((flags & (IORESOURCE_IO | IORESOURCE_MEM)) == 0) + if (flags & IORESOURCE_MEM) + taddr = of_translate_address(dev, addrp); + else if (flags & IORESOURCE_IO) + taddr = of_translate_ioport(dev, addrp); + else return -EINVAL; - taddr = of_translate_address(dev, addrp); + if (taddr == OF_BAD_ADDR) return -EINVAL; memset(r, 0, sizeof(struct resource)); - if (flags & IORESOURCE_IO) { - unsigned long port; - port = pci_address_to_pio(taddr); - if (port == (unsigned long)-1) - return -EINVAL; - r->start = port; - r->end = port + size - 1; - } else { - r->start = taddr; - r->end = taddr + size - 1; - } + + r->start = taddr; + r->end = taddr + size - 1; r->flags = flags; r->name = name ? name : dev->full_name; diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index eda6a7cf0e54..320ab9fbf6af 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -3249,6 +3249,7 @@ EXPORT_SYMBOL(pci_request_regions_exclusive); #ifdef PCI_IOBASE struct io_range { struct list_head list; + struct fwnode_handle *node; phys_addr_t start; resource_size_t size; }; @@ -3257,11 +3258,14 @@ static LIST_HEAD(io_range_list); static DEFINE_SPINLOCK(io_range_lock); #endif +#define IO_RANGE_IOEXT (resource_size_t)(-1ull) + /* * 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) +int __weak pci_register_io_range(struct fwnode_handle *node, phys_addr_t addr, + resource_size_t size, unsigned long *port) { int err = 0; @@ -3272,7 +3276,12 @@ int __weak pci_register_io_range(phys_addr_t addr, resource_size_t size) /* check if the range hasn't been previously recorded */ spin_lock(&io_range_lock); list_for_each_entry(range, &io_range_list, list) { - if (addr >= range->start && addr + size <= range->start + size) { + if (node == range->node) + goto end_register; + + if (addr != IO_RANGE_IOEXT && + addr >= range->start && + addr + size <= range->start + size) { /* range already registered, bail out */ goto end_register; } @@ -3298,6 +3307,7 @@ int __weak pci_register_io_range(phys_addr_t addr, resource_size_t size) goto end_register; } + range->node = node; range->start = addr; range->size = size; @@ -3305,11 +3315,26 @@ int __weak pci_register_io_range(phys_addr_t addr, resource_size_t size) end_register: spin_unlock(&io_range_lock); + + *port = allocated_size; +#else + /* + * powerpc and microblaze have their own registration, + * just look up the value here + */ + *port = pci_address_to_pio(addr); #endif return err; } +#ifdef CONFIG_IOEXT +int ioext_register_io_range +{ + return pci_register_io_range(node, IO_RANGE_IOEXT, size, port); +} +#endif + phys_addr_t pci_pio_to_address(unsigned long pio) { phys_addr_t address = (phys_addr_t)OF_BAD_ADDR; diff --git a/include/linux/pci.h b/include/linux/pci.h index 6bd94a803e8f..b7a8fa3da3ca 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1192,7 +1192,8 @@ int __must_check pci_bus_alloc_resource(struct pci_bus *bus, void *alignf_data); -int pci_register_io_range(phys_addr_t addr, resource_size_t size); +int pci_register_io_range(struct fwnode_handle *node, phys_addr_t addr, + resource_size_t size, unsigned long *port); unsigned long pci_address_to_pio(phys_addr_t addr); phys_addr_t pci_pio_to_address(unsigned long pio); int pci_remap_iospace(const struct resource *res, phys_addr_t phys_addr);