diff options
| author | Stewart Smith <stewart@linux.vnet.ibm.com> | 2015-05-22 12:57:02 +1000 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2015-05-22 12:57:02 +1000 |
| commit | 4e6d370ff5208068796dc8440085558ddbdd86d8 (patch) | |
| tree | 897c94addf8c9cb4402485a24be252d2c5b5068d | |
| parent | 522eb5726a1766f0f15330c90749587a2f8d30aa (diff) | |
| parent | ecc227ac5e865b599819376f1e3b14dbccbd2abe (diff) | |
| download | skiboot-4e6d370ff5208068796dc8440085558ddbdd86d8.zip skiboot-4e6d370ff5208068796dc8440085558ddbdd86d8.tar.gz skiboot-4e6d370ff5208068796dc8440085558ddbdd86d8.tar.bz2 | |
Merge remote branch 'ka1/update-2.1.1.1' into update-2.1.1.1skiboot-2.1.1-fw810.30-1
| -rw-r--r-- | platforms/ibm-fsp/firenze.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/platforms/ibm-fsp/firenze.c b/platforms/ibm-fsp/firenze.c index c0a13c0..300b4ff 100644 --- a/platforms/ibm-fsp/firenze.c +++ b/platforms/ibm-fsp/firenze.c @@ -51,6 +51,8 @@ static struct fsp_pcie_inventory *fsp_pcie_inv; static unsigned int fsp_pcie_inv_alloc_count; #define FSP_PCIE_INV_ALLOC_CHUNK 4 +struct lock fsp_pcie_inv_lock = LOCK_UNLOCKED; + static bool firenze_probe(void) { return dt_node_is_compatible(dt_root, "ibm,firenze"); @@ -218,7 +220,9 @@ static void firenze_get_slot_info(struct phb *phb, struct pci_device * pd) return; if (!pd->parent->slot_info->pluggable) return; + lock(&fsp_pcie_inv_lock); firenze_add_pcidev_to_fsp_inventory(phb, pd); + unlock(&fsp_pcie_inv_lock); } static void firenze_setup_phb(struct phb *phb, unsigned int index) |