leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PCI: Apply the new generic I/O management on PCI IO hosts

Browse Source 
After introducing the new generic I/O space management (Logical PIO), the
original PCI MMIO relevant helpers need to be updated based on the new
interfaces defined in logical PIO.

Adapt the corresponding code to match the changes introduced by logical
PIO.

Tested-by: dann frazier <dann.frazier@canonical.com>
Signed-off-by: Zhichang Yuan <yuanzhichang@hisilicon.com>
Signed-off-by: Gabriele Paoloni <gabriele.paoloni@huawei.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>        # earlier draft
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
This commit is contained in:
Zhichang Yuan 2018-03-15 02:15:53 +08:00 committed by Bjorn Helgaas
parent fcfaab3093
commit 5745392e0c
2 changed files with 18 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
drivers/pci/pci.c
View File

@ -22,6 +22,7 @@
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/log2.h> #include <linux/log2.h>
#include <linux/logic_pio.h>
#include <linux/pci-aspm.h> #include <linux/pci-aspm.h>
#include <linux/pm_wakeup.h> #include <linux/pm_wakeup.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
@ -3440,17 +3441,6 @@ int pci_request_regions_exclusive(struct pci_dev *pdev, const char *res_name)
} }
EXPORT_SYMBOL(pci_request_regions_exclusive); EXPORT_SYMBOL(pci_request_regions_exclusive);
#ifdef PCI_IOBASE
struct io_range {
struct list_head list;
phys_addr_t start;
resource_size_t size;
};
static LIST_HEAD(io_range_list);
static DEFINE_SPINLOCK(io_range_lock);
#endif
/* /*
* Record the PCI IO range (expressed as CPU physical address + size). * Record the PCI IO range (expressed as CPU physical address + size).
* Return a negative value if an error has occured, zero otherwise * Return a negative value if an error has occured, zero otherwise
@ -3458,51 +3448,28 @@ static DEFINE_SPINLOCK(io_range_lock);
int pci_register_io_range(struct fwnode_handle *fwnode, phys_addr_t addr, int pci_register_io_range(struct fwnode_handle *fwnode, phys_addr_t addr,
resource_size_t size) resource_size_t size)
{ {
int err = 0; int ret = 0;
#ifdef PCI_IOBASE #ifdef PCI_IOBASE
struct io_range *range; struct logic_pio_hwaddr *range;
resource_size_t allocated_size = 0;
/* check if the range hasn't been previously recorded */ if (!size || addr + size < addr)
spin_lock(&io_range_lock); return -EINVAL;
list_for_each_entry(range, &io_range_list, list) {
if (addr >= range->start && addr + size <= range->start + size) {
/* range already registered, bail out */
goto end_register;
}
allocated_size += range->size;
}
/* range not registed yet, check for available space */
if (allocated_size + size - 1 > IO_SPACE_LIMIT) {
/* if it's too big check if 64K space can be reserved */
if (allocated_size + SZ_64K - 1 > IO_SPACE_LIMIT) {
err = -E2BIG;
goto end_register;
}
size = SZ_64K;
pr_warn("Requested IO range too big, new size set to 64K\n");
}
/* add the range to the list */
range = kzalloc(sizeof(*range), GFP_ATOMIC); range = kzalloc(sizeof(*range), GFP_ATOMIC);
if (!range) { if (!range)
err = -ENOMEM; return -ENOMEM;
goto end_register;
}
range->start = addr; range->fwnode = fwnode;
range->size = size; range->size = size;
range->hw_start = addr;
range->flags = LOGIC_PIO_CPU_MMIO;
list_add_tail(&range->list, &io_range_list); ret = logic_pio_register_range(range);
if (ret)
end_register: kfree(range);
spin_unlock(&io_range_lock);
#endif #endif
return err; return ret;
} }
phys_addr_t pci_pio_to_address(unsigned long pio) phys_addr_t pci_pio_to_address(unsigned long pio)
@ -3510,21 +3477,10 @@ phys_addr_t pci_pio_to_address(unsigned long pio)
phys_addr_t address = (phys_addr_t)OF_BAD_ADDR; phys_addr_t address = (phys_addr_t)OF_BAD_ADDR;
#ifdef PCI_IOBASE #ifdef PCI_IOBASE
struct io_range *range; if (pio >= MMIO_UPPER_LIMIT)
resource_size_t allocated_size = 0;
if (pio > IO_SPACE_LIMIT)
return address; return address;
spin_lock(&io_range_lock); address = logic_pio_to_hwaddr(pio);
list_for_each_entry(range, &io_range_list, list) {
if (pio >= allocated_size && pio < allocated_size + range->size) {
address = range->start + pio - allocated_size;
break;
}
allocated_size += range->size;
}
spin_unlock(&io_range_lock);
#endif #endif
return address; return address;
@ -3533,21 +3489,7 @@ phys_addr_t pci_pio_to_address(unsigned long pio)
unsigned long __weak pci_address_to_pio(phys_addr_t address) unsigned long __weak pci_address_to_pio(phys_addr_t address)
{ {
#ifdef PCI_IOBASE #ifdef PCI_IOBASE
struct io_range *res; return logic_pio_trans_cpuaddr(address);
resource_size_t offset = 0;
unsigned long addr = -1;
spin_lock(&io_range_lock);
list_for_each_entry(res, &io_range_list, list) {
if (address >= res->start && address < res->start + res->size) {
addr = address - res->start + offset;
break;
}
offset += res->size;
}
spin_unlock(&io_range_lock);
return addr;
#else #else
if (address > IO_SPACE_LIMIT) if (address > IO_SPACE_LIMIT)
return (unsigned long)-1; return (unsigned long)-1;

2
include/asm-generic/io.h
View File

@ -901,7 +901,7 @@ static inline void iounmap(void __iomem *addr)
#define ioport_map ioport_map #define ioport_map ioport_map
static inline void __iomem *ioport_map(unsigned long port, unsigned int nr) static inline void __iomem *ioport_map(unsigned long port, unsigned int nr)
{ {
return PCI_IOBASE + (port & IO_SPACE_LIMIT); return PCI_IOBASE + (port & MMIO_UPPER_LIMIT);
} }
#endif #endif