hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PCI: Use common resource list management code instead of private implementation 

Use common resource list management data structure and interfaces
instead of private implementation.

Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Acked-by: Will Deacon <will.deacon@arm.com>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Jiang Liu 2015-02-05 13:44:44 +08:00 committed by Rafael J. Wysocki
parent 90e9782061
commit 14d76b68f2
9 changed files with 27 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/kernel/bios32.c
View File

@ -422,17 +422,16 @@ static int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
static int pcibios_init_resources(int busnr, struct pci_sys_data *sys) static int pcibios_init_resources(int busnr, struct pci_sys_data *sys)
{ {
int ret; int ret;
struct pci_host_bridge_window *window; struct resource_entry *window;
if (list_empty(&sys->resources)) { if (list_empty(&sys->resources)) {
pci_add_resource_offset(&sys->resources, pci_add_resource_offset(&sys->resources,
&iomem_resource, sys->mem_offset); &iomem_resource, sys->mem_offset);
} }
list_for_each_entry(window, &sys->resources, list) { resource_list_for_each_entry(window, &sys->resources)
if (resource_type(window->res) == IORESOURCE_IO) if (resource_type(window->res) == IORESOURCE_IO)
return 0; return 0;
}
sys->io_res.start = (busnr * SZ_64K) ? : pcibios_min_io; sys->io_res.start = (busnr * SZ_64K) ? : pcibios_min_io;
sys->io_res.end = (busnr + 1) * SZ_64K - 1; sys->io_res.end = (busnr + 1) * SZ_64K - 1;

4
arch/x86/pci/bus_numa.c
View File

@ -31,7 +31,7 @@ void x86_pci_root_bus_resources(int bus, struct list_head *resources)
{ {
struct pci_root_info *info = x86_find_pci_root_info(bus); struct pci_root_info *info = x86_find_pci_root_info(bus);
struct pci_root_res *root_res; struct pci_root_res *root_res;
struct pci_host_bridge_window *window; struct resource_entry *window;
bool found = false; bool found = false;
if (!info) if (!info)
@ -41,7 +41,7 @@ void x86_pci_root_bus_resources(int bus, struct list_head *resources)
bus); bus);
/* already added by acpi ? */ /* already added by acpi ? */
list_for_each_entry(window, resources, list) resource_list_for_each_entry(window, resources)
if (window->res->flags & IORESOURCE_BUS) { if (window->res->flags & IORESOURCE_BUS) {
found = true; found = true;
break; break;

18
drivers/pci/bus.c
View File

@ -20,17 +20,16 @@
void pci_add_resource_offset(struct list_head *resources, struct resource *res, void pci_add_resource_offset(struct list_head *resources, struct resource *res,
resource_size_t offset) resource_size_t offset)
{ {
struct pci_host_bridge_window *window; struct resource_entry *entry;
window = kzalloc(sizeof(struct pci_host_bridge_window), GFP_KERNEL); entry = resource_list_create_entry(res, 0);
if (!window) { if (!entry) {
printk(KERN_ERR "PCI: can't add host bridge window %pR\n", res); printk(KERN_ERR "PCI: can't add host bridge window %pR\n", res);
return; return;
} }
window->res = res; entry->offset = offset;
window->offset = offset; resource_list_add_tail(entry, resources);
list_add_tail(&window->list, resources);
} }
EXPORT_SYMBOL(pci_add_resource_offset); EXPORT_SYMBOL(pci_add_resource_offset);
@ -42,12 +41,7 @@ EXPORT_SYMBOL(pci_add_resource);
void pci_free_resource_list(struct list_head *resources) void pci_free_resource_list(struct list_head *resources)
{ {
struct pci_host_bridge_window *window, *tmp; resource_list_free(resources);
list_for_each_entry_safe(window, tmp, resources, list) {
list_del(&window->list);
kfree(window);
}
} }
EXPORT_SYMBOL(pci_free_resource_list); EXPORT_SYMBOL(pci_free_resource_list);

8
drivers/pci/host-bridge.c
View File

@ -35,10 +35,10 @@ void pcibios_resource_to_bus(struct pci_bus *bus, struct pci_bus_region *region,
struct resource *res) struct resource *res)
{ {
struct pci_host_bridge *bridge = find_pci_host_bridge(bus); struct pci_host_bridge *bridge = find_pci_host_bridge(bus);
struct pci_host_bridge_window *window; struct resource_entry *window;
resource_size_t offset = 0; resource_size_t offset = 0;
list_for_each_entry(window, &bridge->windows, list) { resource_list_for_each_entry(window, &bridge->windows) {
if (resource_contains(window->res, res)) { if (resource_contains(window->res, res)) {
offset = window->offset; offset = window->offset;
break; break;
@ -60,10 +60,10 @@ void pcibios_bus_to_resource(struct pci_bus *bus, struct resource *res,
struct pci_bus_region *region) struct pci_bus_region *region)
{ {
struct pci_host_bridge *bridge = find_pci_host_bridge(bus); struct pci_host_bridge *bridge = find_pci_host_bridge(bus);
struct pci_host_bridge_window *window; struct resource_entry *window;
resource_size_t offset = 0; resource_size_t offset = 0;
list_for_each_entry(window, &bridge->windows, list) { resource_list_for_each_entry(window, &bridge->windows) {
struct pci_bus_region bus_region; struct pci_bus_region bus_region;
if (resource_type(res) != resource_type(window->res)) if (resource_type(res) != resource_type(window->res))

4
drivers/pci/host/pci-host-generic.c
View File

@ -149,14 +149,14 @@ static int gen_pci_parse_request_of_pci_ranges(struct gen_pci *pci)
struct device *dev = pci->host.dev.parent; struct device *dev = pci->host.dev.parent;
struct device_node *np = dev->of_node; struct device_node *np = dev->of_node;
resource_size_t iobase; resource_size_t iobase;
struct pci_host_bridge_window *win; struct resource_entry *win;
err = of_pci_get_host_bridge_resources(np, 0, 0xff, &pci->resources, err = of_pci_get_host_bridge_resources(np, 0, 0xff, &pci->resources,
&iobase); &iobase);
if (err) if (err)
return err; return err;
list_for_each_entry(win, &pci->resources, list) { resource_list_for_each_entry(win, &pci->resources) {
struct resource *parent, *res = win->res; struct resource *parent, *res = win->res;
switch (resource_type(res)) { switch (resource_type(res)) {

4
drivers/pci/host/pci-xgene.c
View File

@ -401,11 +401,11 @@ static int xgene_pcie_map_ranges(struct xgene_pcie_port *port,
struct list_head *res, struct list_head *res,
resource_size_t io_base) resource_size_t io_base)
{ {
struct pci_host_bridge_window *window; struct resource_entry *window;
struct device *dev = port->dev; struct device *dev = port->dev;
int ret; int ret;
list_for_each_entry(window, res, list) { resource_list_for_each_entry(window, res) {
struct resource *res = window->res; struct resource *res = window->res;
u64 restype = resource_type(res); u64 restype = resource_type(res);

4
drivers/pci/host/pcie-xilinx.c
View File

@ -737,7 +737,7 @@ static int xilinx_pcie_parse_and_add_res(struct xilinx_pcie_port *port)
resource_size_t offset; resource_size_t offset;
struct of_pci_range_parser parser; struct of_pci_range_parser parser;
struct of_pci_range range; struct of_pci_range range;
struct pci_host_bridge_window *win; struct resource_entry *win;
int err = 0, mem_resno = 0; int err = 0, mem_resno = 0;
/* Get the ranges */ /* Get the ranges */
@ -807,7 +807,7 @@ static int xilinx_pcie_parse_and_add_res(struct xilinx_pcie_port *port)
free_resources: free_resources:
release_child_resources(&iomem_resource); release_child_resources(&iomem_resource);
list_for_each_entry(win, &port->resources, list) resource_list_for_each_entry(win, &port->resources)
devm_kfree(dev, win->res); devm_kfree(dev, win->res);
pci_free_resource_list(&port->resources); pci_free_resource_list(&port->resources);

10
drivers/pci/probe.c
View File

@ -1895,7 +1895,7 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int bus,
int error; int error;
struct pci_host_bridge *bridge; struct pci_host_bridge *bridge;
struct pci_bus *b, *b2; struct pci_bus *b, *b2;
struct pci_host_bridge_window *window, *n; struct resource_entry *window, *n;
struct resource *res; struct resource *res;
resource_size_t offset; resource_size_t offset;
char bus_addr[64]; char bus_addr[64];
@ -1959,8 +1959,8 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int bus,
printk(KERN_INFO "PCI host bridge to bus %s\n", dev_name(&b->dev)); printk(KERN_INFO "PCI host bridge to bus %s\n", dev_name(&b->dev));
/* Add initial resources to the bus */ /* Add initial resources to the bus */
list_for_each_entry_safe(window, n, resources, list) { resource_list_for_each_entry_safe(window, n, resources) {
list_move_tail(&window->list, &bridge->windows); list_move_tail(&window->node, &bridge->windows);
res = window->res; res = window->res;
offset = window->offset; offset = window->offset;
if (res->flags & IORESOURCE_BUS) if (res->flags & IORESOURCE_BUS)
@ -2060,12 +2060,12 @@ void pci_bus_release_busn_res(struct pci_bus *b)
struct pci_bus *pci_scan_root_bus(struct device *parent, int bus, struct pci_bus *pci_scan_root_bus(struct device *parent, int bus,
struct pci_ops *ops, void *sysdata, struct list_head *resources) struct pci_ops *ops, void *sysdata, struct list_head *resources)
{ {
struct pci_host_bridge_window *window; struct resource_entry *window;
bool found = false; bool found = false;
struct pci_bus *b; struct pci_bus *b;
int max; int max;
list_for_each_entry(window, resources, list) resource_list_for_each_entry(window, resources)
if (window->res->flags & IORESOURCE_BUS) { if (window->res->flags & IORESOURCE_BUS) {
found = true; found = true;
break; break;

9
include/linux/pci.h
View File

@ -29,6 +29,7 @@
#include <linux/atomic.h> #include <linux/atomic.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/resource_ext.h>
#include <uapi/linux/pci.h> #include <uapi/linux/pci.h>
#include <linux/pci_ids.h> #include <linux/pci_ids.h>
@ -397,16 +398,10 @@ static inline int pci_channel_offline(struct pci_dev *pdev)
return (pdev->error_state != pci_channel_io_normal); return (pdev->error_state != pci_channel_io_normal);
} }
struct pci_host_bridge_window {
struct list_head list;
struct resource *res; /* host bridge aperture (CPU address) */
resource_size_t offset; /* bus address + offset = CPU address */
};
struct pci_host_bridge { struct pci_host_bridge {
struct device dev; struct device dev;
struct pci_bus *bus; /* root bus */ struct pci_bus *bus; /* root bus */
struct list_head windows; /* pci_host_bridge_windows */ struct list_head windows; /* resource_entry */
void (*release_fn)(struct pci_host_bridge *); void (*release_fn)(struct pci_host_bridge *);
void *release_data; void *release_data;
}; };