diff options
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/common/fs/hsfs.c | 7 | ||||
| -rw-r--r-- | usr/src/uts/i86pc/io/pci/pci_boot.c | 45 |
2 files changed, 45 insertions, 7 deletions
diff --git a/usr/src/common/fs/hsfs.c b/usr/src/common/fs/hsfs.c index acbb27bcb6..5d3a5db5db 100644 --- a/usr/src/common/fs/hsfs.c +++ b/usr/src/common/fs/hsfs.c @@ -209,14 +209,15 @@ find(char *path, fileid_t *filep) q++; c = *q; *q = '\0'; + n = dlook(path, filep); + *q = c; + path = q; - if ((n = dlook(path, filep)) != 0) { + if (n != 0) { if (c == '\0') break; if (opendir(n, filep)) return (0); - *q = c; - path = q; continue; } else { return (0); diff --git a/usr/src/uts/i86pc/io/pci/pci_boot.c b/usr/src/uts/i86pc/io/pci/pci_boot.c index c9bff2bd53..88d2d75190 100644 --- a/usr/src/uts/i86pc/io/pci/pci_boot.c +++ b/usr/src/uts/i86pc/io/pci/pci_boot.c @@ -70,6 +70,7 @@ static void add_model_prop(dev_info_t *, uint_t); static void add_bus_range_prop(int); static void add_ppb_ranges_prop(int); static void add_bus_available_prop(int); +static void alloc_res_array(); /* * Enumerate all PCI devices @@ -79,8 +80,7 @@ pci_setup_tree() { uchar_t i, root_bus_addr = 0; - pci_bus_res = (struct pci_bus_resource *)kmem_zalloc( - (pci_bios_nbus + 1) * sizeof (struct pci_bus_resource), KM_SLEEP); + alloc_res_array(); for (i = 0; i <= pci_bios_nbus; i++) { pci_bus_res[i].par_bus = (uchar_t)-1; pci_bus_res[i].root_addr = (uchar_t)-1; @@ -994,9 +994,18 @@ add_ppb_props(dev_info_t *dip, uchar_t bus, uchar_t dev, uchar_t func) uint_t val, io_range[2], mem_range[2], pmem_range[2]; uchar_t secbus = pci_getb(bus, dev, func, PCI_BCNF_SECBUS); uchar_t subbus = pci_getb(bus, dev, func, PCI_BCNF_SUBBUS); - ASSERT(secbus != 0 && secbus <= pci_bios_nbus); - ASSERT(pci_bus_res[secbus].dip == NULL); + ASSERT(secbus <= subbus); + /* + * Some BIOSes lie about max pci busses, we allow for + * such mistakes here + */ + if (subbus > pci_bios_nbus) { + pci_bios_nbus = subbus; + alloc_res_array(); + } + + ASSERT(pci_bus_res[secbus].dip == NULL); pci_bus_res[secbus].dip = dip; pci_bus_res[secbus].par_bus = bus; @@ -1231,3 +1240,31 @@ add_bus_available_prop(int bus) i * sizeof (struct pci_phys_spec) / sizeof (int)); kmem_free(sp, count * sizeof (*sp)); } + +static void +alloc_res_array(void) +{ + static int array_max = 0; + int old_max; + void *old_res; + + if (array_max > pci_bios_nbus + 1) + return; /* array is big enough */ + + old_max = array_max; + old_res = pci_bus_res; + + if (array_max == 0) + array_max = 16; /* start with a reasonable number */ + + while (array_max < pci_bios_nbus + 1) + array_max <<= 1; + pci_bus_res = (struct pci_bus_resource *)kmem_zalloc( + array_max * sizeof (struct pci_bus_resource), KM_SLEEP); + + if (old_res) { /* copy content and free old array */ + bcopy(old_res, pci_bus_res, + old_max * sizeof (struct pci_bus_resource)); + kmem_free(old_res, old_max * sizeof (struct pci_bus_resource)); + } +} |