iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arch/sh: pci: don't use disabled resources

Browse Source 
In pcibios_scanbus(), we provide to the PCI core the usable MEM and IO
regions using pci_add_resource_offset(). We travel through all
resources available in the "struct pci_channel".

Also, in register_pci_controller(), we travel through all resources to
request them, making sure they don't conflict with already requested
resources.

However, some resources may be disabled, in which case they should not
be requested nor provided to the PCI core.

In the current situation, none of the resources are disabled. However,
follow-up patches in this series will make some resources disabled,
making this preliminary change necessary.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Rich Felker <dalias@libc.org>
This commit is contained in:
Thomas Petazzoni 2017-12-04 16:09:02 +01:00 committed by Rich Felker
parent ce88313069
commit 3aeb93a014
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/sh/drivers/pci/pci.c
View File

@ -49,6 +49,8 @@ static void pcibios_scanbus(struct pci_channel *hose)
for (i = 0; i < hose->nr_resources; i++) { for (i = 0; i < hose->nr_resources; i++) {
res = hose->resources + i; res = hose->resources + i;
offset = 0; offset = 0;
if (res->flags & IORESOURCE_DISABLED)
continue;
if (res->flags & IORESOURCE_IO) if (res->flags & IORESOURCE_IO)
offset = hose->io_offset; offset = hose->io_offset;
else if (res->flags & IORESOURCE_MEM) else if (res->flags & IORESOURCE_MEM)
@ -102,6 +104,9 @@ int register_pci_controller(struct pci_channel *hose)
for (i = 0; i < hose->nr_resources; i++) { for (i = 0; i < hose->nr_resources; i++) {
struct resource *res = hose->resources + i; struct resource *res = hose->resources + i;
if (res->flags & IORESOURCE_DISABLED)
continue;
if (res->flags & IORESOURCE_IO) { if (res->flags & IORESOURCE_IO) {
if (request_resource(&ioport_resource, res) < 0) if (request_resource(&ioport_resource, res) < 0)
goto out; goto out;