Revert unrelated changes accidentally committed in r271192.
This commit is contained in:
parent
490356e5b7
commit
1f895058e4
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=271717
@ -1211,11 +1211,6 @@ acpi_set_resource(device_t dev, device_t child, int type, int rid,
|
||||
if (!(type == SYS_RES_IOPORT && start == CONF1_ADDR_PORT))
|
||||
#endif
|
||||
{
|
||||
if (bootverbose)
|
||||
device_printf(dev,
|
||||
"Ignoring %s range %#lx-%#lx for %s\n",
|
||||
type == SYS_RES_MEMORY ? "memory" : "I/O",
|
||||
start, start + count - 1, acpi_name(ad->ad_handle));
|
||||
AcpiOsFree(devinfo);
|
||||
return (0);
|
||||
}
|
||||
|
@ -447,31 +447,25 @@ psycho_attach(device_t dev)
|
||||
panic("%s: failed to set up memory rman", __func__);
|
||||
|
||||
i = OF_getprop_alloc(node, "ranges", sizeof(*range), (void **)&range);
|
||||
/*
|
||||
* Make sure that the expected ranges are present. The
|
||||
* OFW_PCI_CS_MEM64 one is not currently used though.
|
||||
*/
|
||||
if (i != PSYCHO_NRANGE)
|
||||
panic("%s: unsupported number of ranges", __func__);
|
||||
/*
|
||||
* Find the addresses of the various bus spaces.
|
||||
* There should not be multiple ones of one kind.
|
||||
* The physical start addresses of the ranges are the configuration,
|
||||
* memory and I/O handles.
|
||||
*/
|
||||
for (; i >= 0; i--) {
|
||||
for (i = 0; i < PSYCHO_NRANGE; i++) {
|
||||
j = OFW_PCI_RANGE_CS(&range[i]);
|
||||
if (sc->sc_pci_bh[j] != 0)
|
||||
panic("%s: duplicate range for space %d",
|
||||
__func__, j);
|
||||
sc->sc_pci_bh[j] = OFW_PCI_RANGE_PHYS(&range[i]);
|
||||
}
|
||||
|
||||
/*
|
||||
* Make sure that the expected ranges are present. The
|
||||
* OFW_PCI_CS_MEM64 one is not currently used.
|
||||
*/
|
||||
if (sc->sc_pci_bh[OFW_PCI_CS_CONFIG] == 0)
|
||||
panic("%s: missing CONFIG range", __func__);
|
||||
if (sc->sc_pci_bh[OFW_PCI_CS_IO] == 0)
|
||||
panic("%s: missing IO range", __func__);
|
||||
if (sc->sc_pci_bh[OFW_PCI_CS_MEM32] == 0)
|
||||
panic("%s: missing MEM32 range", __func__);
|
||||
|
||||
free(range, M_OFWPROP);
|
||||
|
||||
/* Register the softc, this is needed for paired Psychos. */
|
||||
|
Loading…
Reference in New Issue
Block a user