diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2016-07-07 11:49:54 +1000 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2016-07-08 16:37:07 +1000 |
| commit | 63bbcd4568d85291df0b954608a9d5ea1142bc45 (patch) | |
| tree | 97a10e4c57de2c6c28482652a151bc7d28d7372d | |
| parent | 6480d96563482066557460e85d9113d4cbea7540 (diff) | |
| download | blackbird-skiboot-63bbcd4568d85291df0b954608a9d5ea1142bc45.tar.gz blackbird-skiboot-63bbcd4568d85291df0b954608a9d5ea1142bc45.zip | |
pci: get_reserved_pe_number() needs to take the PHB as argument
The value might be different for different PHB instances
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
| -rw-r--r-- | core/pci.c | 2 | ||||
| -rw-r--r-- | hw/p7ioc-phb.c | 2 | ||||
| -rw-r--r-- | hw/phb3.c | 2 | ||||
| -rw-r--r-- | include/pci.h | 2 |
4 files changed, 4 insertions, 4 deletions
@@ -289,7 +289,7 @@ static void pci_check_clear_freeze(struct phb *phb) /* Retrieve the reserved PE number */ pe_number = OPAL_PARAMETER; if (phb->ops->get_reserved_pe_number) - pe_number = phb->ops->get_reserved_pe_number(); + pe_number = phb->ops->get_reserved_pe_number(phb); if (pe_number < 0) return; diff --git a/hw/p7ioc-phb.c b/hw/p7ioc-phb.c index 98ecb56a..96554c8a 100644 --- a/hw/p7ioc-phb.c +++ b/hw/p7ioc-phb.c @@ -1635,7 +1635,7 @@ static uint8_t p7ioc_choose_bus(struct phb *phb __unused, return al; } -static int64_t p7ioc_get_reserved_pe_number(void) +static int64_t p7ioc_get_reserved_pe_number(struct phb *phb __unused) { return 127; } @@ -269,7 +269,7 @@ static uint8_t phb3_choose_bus(struct phb *phb __unused, return candidate; } -static int64_t phb3_get_reserved_pe_number(void) +static int64_t phb3_get_reserved_pe_number(struct phb *phb __unused) { return PHB3_RESERVED_PE_NUM; } diff --git a/include/pci.h b/include/pci.h index 83c96837..c459554a 100644 --- a/include/pci.h +++ b/include/pci.h @@ -185,7 +185,7 @@ struct phb_ops { uint8_t (*choose_bus)(struct phb *phb, struct pci_device *bridge, uint8_t candidate, uint8_t *max_bus, bool *use_max); - int64_t (*get_reserved_pe_number)(void); + int64_t (*get_reserved_pe_number)(struct phb *phb); /* * Device init method is called after a device has been detected |
