diff options
| author | Stewart Smith <stewart@linux.vnet.ibm.com> | 2015-05-21 15:23:57 +1000 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2015-05-21 15:23:57 +1000 |
| commit | 417333aa73103b3cc05b27df5e4b328fe71dab5f (patch) | |
| tree | 8b10676b12ea963ef9488e0ff9469375ee334f29 /platforms | |
| parent | cebcccc727a229e0e8e1667a21016d3dd09d6803 (diff) | |
| parent | ecc227ac5e865b599819376f1e3b14dbccbd2abe (diff) | |
| download | skiboot-417333aa73103b3cc05b27df5e4b328fe71dab5f.zip skiboot-417333aa73103b3cc05b27df5e4b328fe71dab5f.tar.gz skiboot-417333aa73103b3cc05b27df5e4b328fe71dab5f.tar.bz2 | |
Merge branch 'update-2.1.1.1' into stableskiboot-5.0.2
Diffstat (limited to 'platforms')
| -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 d473875..cb0fac3 100644 --- a/platforms/ibm-fsp/firenze.c +++ b/platforms/ibm-fsp/firenze.c @@ -49,6 +49,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 struct dt_node *dt_create_i2c_master(struct dt_node *n, uint32_t eng_id) { struct dt_node *i2cm; @@ -365,7 +367,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) |