summaryrefslogtreecommitdiffstats
path: root/sys/dev/acpica
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/acpica')
-rw-r--r--sys/dev/acpica/acpi.c34
-rw-r--r--sys/dev/acpica/acpi_cpu.c4
-rw-r--r--sys/dev/acpica/acpi_pci.c26
-rw-r--r--sys/dev/acpica/acpi_pcib_acpi.c185
-rw-r--r--sys/dev/acpica/acpi_resource.c595
-rw-r--r--sys/dev/acpica/acpi_thermal.c1
-rw-r--r--sys/dev/acpica/acpivar.h22
7 files changed, 486 insertions, 381 deletions
diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c
index 3cef351..9352be9 100644
--- a/sys/dev/acpica/acpi.c
+++ b/sys/dev/acpica/acpi.c
@@ -151,6 +151,7 @@ static ACPI_STATUS acpi_sleep_disable(struct acpi_softc *sc);
static ACPI_STATUS acpi_EnterSleepState(struct acpi_softc *sc, int state);
static void acpi_shutdown_final(void *arg, int howto);
static void acpi_enable_fixed_events(struct acpi_softc *sc);
+static BOOLEAN acpi_has_hid(ACPI_HANDLE handle);
static int acpi_wake_sleep_prep(ACPI_HANDLE handle, int sstate);
static int acpi_wake_run_prep(ACPI_HANDLE handle, int sstate);
static int acpi_wake_prep_walk(int sstate);
@@ -1243,7 +1244,7 @@ acpi_alloc_resource(device_t bus, device_t child, int type, int *rid,
/*
* First attempt at allocating the resource. For direct children,
* use resource_list_alloc() to handle reserved resources. For
- * other dveices, pass the request up to our parent.
+ * other devices, pass the request up to our parent.
*/
if (bus == device_get_parent(child)) {
ad = device_get_ivars(child);
@@ -1855,6 +1856,13 @@ acpi_probe_child(ACPI_HANDLE handle, UINT32 level, void *context, void **status)
break;
if (acpi_parse_prw(handle, &prw) == 0)
AcpiSetupGpeForWake(handle, prw.gpe_handle, prw.gpe_bit);
+
+ /*
+ * Ignore devices that do not have a _HID or _CID. They should
+ * be discovered by other buses (e.g. the PCI bus driver).
+ */
+ if (!acpi_has_hid(handle))
+ break;
/* FALLTHROUGH */
case ACPI_TYPE_PROCESSOR:
case ACPI_TYPE_THERMAL:
@@ -2043,6 +2051,30 @@ acpi_BatteryIsPresent(device_t dev)
}
/*
+ * Returns true if a device has at least one valid device ID.
+ */
+static BOOLEAN
+acpi_has_hid(ACPI_HANDLE h)
+{
+ ACPI_DEVICE_INFO *devinfo;
+ BOOLEAN ret;
+
+ if (h == NULL ||
+ ACPI_FAILURE(AcpiGetObjectInfo(h, &devinfo)))
+ return (FALSE);
+
+ ret = FALSE;
+ if ((devinfo->Valid & ACPI_VALID_HID) != 0)
+ ret = TRUE;
+ else if ((devinfo->Valid & ACPI_VALID_CID) != 0)
+ if (devinfo->CompatibleIdList.Count > 0)
+ ret = TRUE;
+
+ AcpiOsFree(devinfo);
+ return (ret);
+}
+
+/*
* Match a HID string against a handle
*/
BOOLEAN
diff --git a/sys/dev/acpica/acpi_cpu.c b/sys/dev/acpica/acpi_cpu.c
index 8cb6858..d26903d 100644
--- a/sys/dev/acpica/acpi_cpu.c
+++ b/sys/dev/acpica/acpi_cpu.c
@@ -856,6 +856,8 @@ acpi_cpu_cx_list(struct acpi_cpu_softc *sc)
sbuf_printf(&sb, "C%d/%d ", i + 1, sc->cpu_cx_states[i].trans_lat);
if (sc->cpu_cx_states[i].type < ACPI_STATE_C3)
sc->cpu_non_c3 = i;
+ else
+ cpu_can_deep_sleep = 1;
}
sbuf_trim(&sb);
sbuf_finish(&sb);
@@ -925,11 +927,9 @@ acpi_cpu_idle()
/* Find the lowest state that has small enough latency. */
cx_next_idx = 0;
-#ifndef __ia64__
if (cpu_disable_deep_sleep)
i = min(sc->cpu_cx_lowest, sc->cpu_non_c3);
else
-#endif
i = sc->cpu_cx_lowest;
for (; i >= 0; i--) {
if (sc->cpu_cx_states[i].trans_lat * 3 <= sc->cpu_prev_sleep) {
diff --git a/sys/dev/acpica/acpi_pci.c b/sys/dev/acpica/acpi_pci.c
index 76cbacb..44db74a 100644
--- a/sys/dev/acpica/acpi_pci.c
+++ b/sys/dev/acpica/acpi_pci.c
@@ -209,38 +209,24 @@ acpi_pci_update_device(ACPI_HANDLE handle, device_t pci_child)
device_t child;
/*
- * Lookup and remove the unused device that acpi0 creates when it walks
- * the namespace creating devices.
+ * Occasionally a PCI device may show up as an ACPI device
+ * with a _HID. (For example, the TabletPC TC1000 has a
+ * second PCI-ISA bridge that has a _HID for an
+ * acpi_sysresource device.) In that case, leave ACPI-CA's
+ * device data pointing at the ACPI-enumerated device.
*/
child = acpi_get_device(handle);
if (child != NULL) {
- if (device_is_alive(child)) {
- /*
- * The TabletPC TC1000 has a second PCI-ISA bridge
- * that has a _HID for an acpi_sysresource device.
- * In that case, leave ACPI-CA's device data pointing
- * at the ACPI-enumerated device.
- */
- device_printf(child,
- "Conflicts with PCI device %d:%d:%d\n",
- pci_get_bus(pci_child), pci_get_slot(pci_child),
- pci_get_function(pci_child));
- return;
- }
KASSERT(device_get_parent(child) ==
devclass_get_device(devclass_find("acpi"), 0),
("%s: child (%s)'s parent is not acpi0", __func__,
acpi_name(handle)));
- device_delete_child(device_get_parent(child), child);
+ return;
}
/*
* Update ACPI-CA to use the PCI enumerated device_t for this handle.
*/
- status = AcpiDetachData(handle, acpi_fake_objhandler);
- if (ACPI_FAILURE(status))
- printf("WARNING: Unable to detach object data from %s - %s\n",
- acpi_name(handle), AcpiFormatException(status));
status = AcpiAttachData(handle, acpi_fake_objhandler, pci_child);
if (ACPI_FAILURE(status))
printf("WARNING: Unable to attach object data to %s - %s\n",
diff --git a/sys/dev/acpica/acpi_pcib_acpi.c b/sys/dev/acpica/acpi_pcib_acpi.c
index e4efeff..99e3f1f 100644
--- a/sys/dev/acpica/acpi_pcib_acpi.c
+++ b/sys/dev/acpica/acpi_pcib_acpi.c
@@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/bus.h>
#include <sys/kernel.h>
+#include <sys/limits.h>
#include <sys/malloc.h>
#include <sys/module.h>
#include <sys/rman.h>
@@ -62,6 +63,9 @@ struct acpi_hpcib_softc {
int ap_bus; /* bios-assigned bus number */
ACPI_BUFFER ap_prt; /* interrupt routing table */
+#ifdef NEW_PCIB
+ struct pcib_host_resources ap_host_res;
+#endif
};
static int acpi_pcib_acpi_probe(device_t bus);
@@ -87,6 +91,11 @@ static struct resource *acpi_pcib_acpi_alloc_resource(device_t dev,
device_t child, int type, int *rid,
u_long start, u_long end, u_long count,
u_int flags);
+#ifdef NEW_PCIB
+static int acpi_pcib_acpi_adjust_resource(device_t dev,
+ device_t child, int type, struct resource *r,
+ u_long start, u_long end);
+#endif
static device_method_t acpi_pcib_acpi_methods[] = {
/* Device interface */
@@ -101,7 +110,11 @@ static device_method_t acpi_pcib_acpi_methods[] = {
DEVMETHOD(bus_read_ivar, acpi_pcib_read_ivar),
DEVMETHOD(bus_write_ivar, acpi_pcib_write_ivar),
DEVMETHOD(bus_alloc_resource, acpi_pcib_acpi_alloc_resource),
+#ifdef NEW_PCIB
+ DEVMETHOD(bus_adjust_resource, acpi_pcib_acpi_adjust_resource),
+#else
DEVMETHOD(bus_adjust_resource, bus_generic_adjust_resource),
+#endif
DEVMETHOD(bus_release_resource, bus_generic_release_resource),
DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource),
@@ -149,6 +162,113 @@ acpi_pcib_acpi_probe(device_t dev)
return (0);
}
+#ifdef NEW_PCIB
+static ACPI_STATUS
+acpi_pcib_producer_handler(ACPI_RESOURCE *res, void *context)
+{
+ struct acpi_hpcib_softc *sc;
+ UINT64 length, min, max;
+ u_int flags;
+ int error, type;
+
+ sc = context;
+ switch (res->Type) {
+ case ACPI_RESOURCE_TYPE_START_DEPENDENT:
+ case ACPI_RESOURCE_TYPE_END_DEPENDENT:
+ panic("host bridge has depenedent resources");
+ case ACPI_RESOURCE_TYPE_ADDRESS16:
+ case ACPI_RESOURCE_TYPE_ADDRESS32:
+ case ACPI_RESOURCE_TYPE_ADDRESS64:
+ case ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64:
+ if (res->Data.Address.ProducerConsumer != ACPI_PRODUCER)
+ break;
+ switch (res->Type) {
+ case ACPI_RESOURCE_TYPE_ADDRESS16:
+ min = res->Data.Address16.Minimum;
+ max = res->Data.Address16.Maximum;
+ length = res->Data.Address16.AddressLength;
+ break;
+ case ACPI_RESOURCE_TYPE_ADDRESS32:
+ min = res->Data.Address32.Minimum;
+ max = res->Data.Address32.Maximum;
+ length = res->Data.Address32.AddressLength;
+ break;
+ case ACPI_RESOURCE_TYPE_ADDRESS64:
+ min = res->Data.Address64.Minimum;
+ max = res->Data.Address64.Maximum;
+ length = res->Data.Address64.AddressLength;
+ break;
+ default:
+ KASSERT(res->Type ==
+ ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64,
+ ("should never happen"));
+ min = res->Data.ExtAddress64.Minimum;
+ max = res->Data.ExtAddress64.Maximum;
+ length = res->Data.ExtAddress64.AddressLength;
+ break;
+ }
+ if (length == 0 ||
+ res->Data.Address.MinAddressFixed != ACPI_ADDRESS_FIXED ||
+ res->Data.Address.MaxAddressFixed != ACPI_ADDRESS_FIXED)
+ break;
+ flags = 0;
+ switch (res->Data.Address.ResourceType) {
+ case ACPI_MEMORY_RANGE:
+ type = SYS_RES_MEMORY;
+ if (res->Type != ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64) {
+ if (res->Data.Address.Info.Mem.Caching ==
+ ACPI_PREFETCHABLE_MEMORY)
+ flags |= RF_PREFETCHABLE;
+ } else {
+ /*
+ * XXX: Parse prefetch flag out of
+ * TypeSpecific.
+ */
+ }
+ break;
+ case ACPI_IO_RANGE:
+ type = SYS_RES_IOPORT;
+ break;
+#ifdef PCI_RES_BUS
+ case ACPI_BUS_NUMBER_RANGE:
+ type = PCI_RES_BUS;
+ break;
+#endif
+ default:
+ return (AE_OK);
+ }
+
+ if (min + length - 1 != max)
+ device_printf(sc->ap_dev,
+ "Length mismatch for %d range: %jx vs %jx\n", type,
+ (uintmax_t)max - min + 1, (uintmax_t)length);
+#ifdef __i386__
+ if (min > ULONG_MAX) {
+ device_printf(sc->ap_dev,
+ "Ignoring %d range above 4GB (%#jx-%#jx)\n",
+ type, (uintmax_t)min, (uintmax_t)max);
+ break;
+ }
+ if (max > ULONG_MAX) {
+ device_printf(sc->ap_dev,
+ "Truncating end of %d range above 4GB (%#jx-%#jx)\n",
+ type, (uintmax_t)min, (uintmax_t)max);
+ max = ULONG_MAX;
+ }
+#endif
+ error = pcib_host_res_decodes(&sc->ap_host_res, type, min, max,
+ flags);
+ if (error)
+ panic("Failed to manage %d range (%#jx-%#jx): %d",
+ type, (uintmax_t)min, (uintmax_t)max, error);
+ break;
+ default:
+ break;
+ }
+ return (AE_OK);
+}
+#endif
+
static int
acpi_pcib_acpi_attach(device_t dev)
{
@@ -179,6 +299,22 @@ acpi_pcib_acpi_attach(device_t dev)
sc->ap_segment = 0;
}
+#ifdef NEW_PCIB
+ /*
+ * Determine which address ranges this bridge decodes and setup
+ * resource managers for those ranges.
+ */
+ if (pcib_host_res_init(sc->ap_dev, &sc->ap_host_res) != 0)
+ panic("failed to init hostb resources");
+ if (!acpi_disabled("hostres")) {
+ status = AcpiWalkResources(sc->ap_handle, "_CRS",
+ acpi_pcib_producer_handler, sc);
+ if (ACPI_FAILURE(status) && status != AE_NOT_FOUND)
+ device_printf(sc->ap_dev, "failed to parse resources: %s\n",
+ AcpiFormatException(status));
+ }
+#endif
+
/*
* Get our base bus number by evaluating _BBN.
* If this doesn't work, we assume we're bus number 0.
@@ -357,32 +493,37 @@ acpi_pcib_map_msi(device_t pcib, device_t dev, int irq, uint64_t *addr,
return (PCIB_MAP_MSI(device_get_parent(bus), dev, irq, addr, data));
}
-static u_long acpi_host_mem_start = 0x80000000;
-TUNABLE_ULONG("hw.acpi.host_mem_start", &acpi_host_mem_start);
-
struct resource *
acpi_pcib_acpi_alloc_resource(device_t dev, device_t child, int type, int *rid,
u_long start, u_long end, u_long count, u_int flags)
{
- /*
- * If no memory preference is given, use upper 32MB slot most
- * bioses use for their memory window. Typically other bridges
- * before us get in the way to assert their preferences on memory.
- * Hardcoding like this sucks, so a more MD/MI way needs to be
- * found to do it. This is typically only used on older laptops
- * that don't have pci busses behind pci bridge, so assuming > 32MB
- * is likely OK.
- *
- * PCI-PCI bridges may allocate smaller ranges for their windows,
- * but the heuristics here should apply to those, so we allow
- * several different end addresses.
- */
- if (type == SYS_RES_MEMORY && start == 0UL && (end == ~0UL ||
- end == 0xffffffff))
- start = acpi_host_mem_start;
- if (type == SYS_RES_IOPORT && start == 0UL && (end == ~0UL ||
- end == 0xffff || end == 0xffffffff))
- start = 0x1000;
+#ifdef NEW_PCIB
+ struct acpi_hpcib_softc *sc;
+#endif
+
+#if defined(__i386__) || defined(__amd64__)
+ start = hostb_alloc_start(type, start, end, count);
+#endif
+
+#ifdef NEW_PCIB
+ sc = device_get_softc(dev);
+ return (pcib_host_res_alloc(&sc->ap_host_res, child, type, rid, start, end,
+ count, flags));
+#else
return (bus_generic_alloc_resource(dev, child, type, rid, start, end,
count, flags));
+#endif
+}
+
+#ifdef NEW_PCIB
+int
+acpi_pcib_acpi_adjust_resource(device_t dev, device_t child, int type,
+ struct resource *r, u_long start, u_long end)
+{
+ struct acpi_hpcib_softc *sc;
+
+ sc = device_get_softc(dev);
+ return (pcib_host_res_adjust(&sc->ap_host_res, child, type, r, start,
+ end));
}
+#endif
diff --git a/sys/dev/acpica/acpi_resource.c b/sys/dev/acpica/acpi_resource.c
index c83b679..ce6732f 100644
--- a/sys/dev/acpica/acpi_resource.c
+++ b/sys/dev/acpica/acpi_resource.c
@@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/bus.h>
+#include <sys/limits.h>
#include <sys/malloc.h>
#include <sys/module.h>
@@ -139,332 +140,278 @@ acpi_config_intr(device_t dev, ACPI_RESOURCE *res)
INTR_POLARITY_HIGH : INTR_POLARITY_LOW);
}
-/*
- * Fetch a device's resources and associate them with the device.
- *
- * Note that it might be nice to also locate ACPI-specific resource items, such
- * as GPE bits.
- *
- * We really need to split the resource-fetching code out from the
- * resource-parsing code, since we may want to use the parsing
- * code for _PRS someday.
- */
-ACPI_STATUS
-acpi_parse_resources(device_t dev, ACPI_HANDLE handle,
- struct acpi_parse_resource_set *set, void *arg)
-{
- ACPI_BUFFER buf;
- ACPI_RESOURCE *res;
- char *curr, *last;
- ACPI_STATUS status;
- void *context;
+struct acpi_resource_context {
+ struct acpi_parse_resource_set *set;
+ device_t dev;
+ void *context;
+};
- ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
+#ifdef ACPI_DEBUG_OUTPUT
+static const char *
+acpi_address_range_name(UINT8 ResourceType)
+{
+ static char buf[16];
+
+ switch (ResourceType) {
+ case ACPI_MEMORY_RANGE:
+ return ("Memory");
+ case ACPI_IO_RANGE:
+ return ("IO");
+ case ACPI_BUS_NUMBER_RANGE:
+ return ("Bus Number");
+ default:
+ snprintf(buf, sizeof(buf), "type %u", ResourceType);
+ return (buf);
+ }
+}
+#endif
+
+static ACPI_STATUS
+acpi_parse_resource(ACPI_RESOURCE *res, void *context)
+{
+ struct acpi_parse_resource_set *set;
+ struct acpi_resource_context *arc;
+ UINT64 min, max, length, gran;
+ const char *name;
+ device_t dev;
- /*
- * Special-case some devices that abuse _PRS/_CRS to mean
- * something other than "I consume this resource".
- *
- * XXX do we really need this? It's only relevant once
- * we start always-allocating these resources, and even
- * then, the only special-cased device is likely to be
- * the PCI interrupt link.
- */
+ arc = context;
+ dev = arc->dev;
+ set = arc->set;
- /* Fetch the device's current resources. */
- buf.Length = ACPI_ALLOCATE_BUFFER;
- if (ACPI_FAILURE((status = AcpiGetCurrentResources(handle, &buf)))) {
- if (status != AE_NOT_FOUND && status != AE_TYPE)
- printf("can't fetch resources for %s - %s\n",
- acpi_name(handle), AcpiFormatException(status));
- return_ACPI_STATUS (status);
- }
- ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "%s - got %ld bytes of resources\n",
- acpi_name(handle), (long)buf.Length));
- set->set_init(dev, arg, &context);
-
- /* Iterate through the resources */
- curr = buf.Pointer;
- last = (char *)buf.Pointer + buf.Length;
- while (curr < last) {
- res = (ACPI_RESOURCE *)curr;
- curr += res->Length;
-
- /* Handle the individual resource types */
- switch(res->Type) {
- case ACPI_RESOURCE_TYPE_END_TAG:
- ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "EndTag\n"));
- curr = last;
+ switch (res->Type) {
+ case ACPI_RESOURCE_TYPE_END_TAG:
+ ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "EndTag\n"));
+ break;
+ case ACPI_RESOURCE_TYPE_FIXED_IO:
+ if (res->Data.FixedIo.AddressLength <= 0)
break;
- case ACPI_RESOURCE_TYPE_FIXED_IO:
- if (res->Data.FixedIo.AddressLength <= 0)
- break;
- ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "FixedIo 0x%x/%d\n",
- res->Data.FixedIo.Address,
- res->Data.FixedIo.AddressLength));
- set->set_ioport(dev, context,
- res->Data.FixedIo.Address,
- res->Data.FixedIo.AddressLength);
+ ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "FixedIo 0x%x/%d\n",
+ res->Data.FixedIo.Address, res->Data.FixedIo.AddressLength));
+ set->set_ioport(dev, arc->context, res->Data.FixedIo.Address,
+ res->Data.FixedIo.AddressLength);
+ break;
+ case ACPI_RESOURCE_TYPE_IO:
+ if (res->Data.Io.AddressLength <= 0)
break;
- case ACPI_RESOURCE_TYPE_IO:
- if (res->Data.Io.AddressLength <= 0)
- break;
- if (res->Data.Io.Minimum == res->Data.Io.Maximum) {
- ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "Io 0x%x/%d\n",
- res->Data.Io.Minimum,
- res->Data.Io.AddressLength));
- set->set_ioport(dev, context,
- res->Data.Io.Minimum,
- res->Data.Io.AddressLength);
- } else {
- ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "Io 0x%x-0x%x/%d\n",
- res->Data.Io.Minimum,
- res->Data.Io.Maximum,
- res->Data.Io.AddressLength));
- set->set_iorange(dev, context,
- res->Data.Io.Minimum,
- res->Data.Io.Maximum,
- res->Data.Io.AddressLength,
- res->Data.Io.Alignment);
- }
+ if (res->Data.Io.Minimum == res->Data.Io.Maximum) {
+ ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "Io 0x%x/%d\n",
+ res->Data.Io.Minimum, res->Data.Io.AddressLength));
+ set->set_ioport(dev, arc->context, res->Data.Io.Minimum,
+ res->Data.Io.AddressLength);
+ } else {
+ ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "Io 0x%x-0x%x/%d\n",
+ res->Data.Io.Minimum, res->Data.Io.Maximum,
+ res->Data.Io.AddressLength));
+ set->set_iorange(dev, arc->context, res->Data.Io.Minimum,
+ res->Data.Io.Maximum, res->Data.Io.AddressLength,
+ res->Data.Io.Alignment);
+ }
+ break;
+ case ACPI_RESOURCE_TYPE_FIXED_MEMORY32:
+ if (res->Data.FixedMemory32.AddressLength <= 0)
break;
- case ACPI_RESOURCE_TYPE_FIXED_MEMORY32:
- if (res->Data.FixedMemory32.AddressLength <= 0)
- break;
- ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "FixedMemory32 0x%x/%d\n",
- res->Data.FixedMemory32.Address,
- res->Data.FixedMemory32.AddressLength));
- set->set_memory(dev, context,
- res->Data.FixedMemory32.Address,
- res->Data.FixedMemory32.AddressLength);
+ ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "FixedMemory32 0x%x/%d\n",
+ res->Data.FixedMemory32.Address,
+ res->Data.FixedMemory32.AddressLength));
+ set->set_memory(dev, arc->context, res->Data.FixedMemory32.Address,
+ res->Data.FixedMemory32.AddressLength);
+ break;
+ case ACPI_RESOURCE_TYPE_MEMORY32:
+ if (res->Data.Memory32.AddressLength <= 0)
break;
- case ACPI_RESOURCE_TYPE_MEMORY32:
- if (res->Data.Memory32.AddressLength <= 0)
- break;
- if (res->Data.Memory32.Minimum ==
- res->Data.Memory32.Maximum) {
-
- ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "Memory32 0x%x/%d\n",
- res->Data.Memory32.Minimum,
- res->Data.Memory32.AddressLength));
- set->set_memory(dev, context,
- res->Data.Memory32.Minimum,
- res->Data.Memory32.AddressLength);
- } else {
- ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "Memory32 0x%x-0x%x/%d\n",
- res->Data.Memory32.Minimum,
- res->Data.Memory32.Maximum,
- res->Data.Memory32.AddressLength));
- set->set_memoryrange(dev, context,
- res->Data.Memory32.Minimum,
- res->Data.Memory32.Maximum,
- res->Data.Memory32.AddressLength,
- res->Data.Memory32.Alignment);
- }
+ if (res->Data.Memory32.Minimum == res->Data.Memory32.Maximum) {
+ ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "Memory32 0x%x/%d\n",
+ res->Data.Memory32.Minimum, res->Data.Memory32.AddressLength));
+ set->set_memory(dev, arc->context, res->Data.Memory32.Minimum,
+ res->Data.Memory32.AddressLength);
+ } else {
+ ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "Memory32 0x%x-0x%x/%d\n",
+ res->Data.Memory32.Minimum, res->Data.Memory32.Maximum,
+ res->Data.Memory32.AddressLength));
+ set->set_memoryrange(dev, arc->context, res->Data.Memory32.Minimum,
+ res->Data.Memory32.Maximum, res->Data.Memory32.AddressLength,
+ res->Data.Memory32.Alignment);
+ }
+ break;
+ case ACPI_RESOURCE_TYPE_MEMORY24:
+ if (res->Data.Memory24.AddressLength <= 0)
break;
- case ACPI_RESOURCE_TYPE_MEMORY24:
- if (res->Data.Memory24.AddressLength <= 0)
- break;
- if (res->Data.Memory24.Minimum ==
- res->Data.Memory24.Maximum) {
-
- ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "Memory24 0x%x/%d\n",
- res->Data.Memory24.Minimum,
- res->Data.Memory24.AddressLength));
- set->set_memory(dev, context, res->Data.Memory24.Minimum,
- res->Data.Memory24.AddressLength);
- } else {
- ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "Memory24 0x%x-0x%x/%d\n",
- res->Data.Memory24.Minimum,
- res->Data.Memory24.Maximum,
- res->Data.Memory24.AddressLength));
- set->set_memoryrange(dev, context,
- res->Data.Memory24.Minimum,
- res->Data.Memory24.Maximum,
- res->Data.Memory24.AddressLength,
- res->Data.Memory24.Alignment);
- }
+ if (res->Data.Memory24.Minimum == res->Data.Memory24.Maximum) {
+ ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "Memory24 0x%x/%d\n",
+ res->Data.Memory24.Minimum, res->Data.Memory24.AddressLength));
+ set->set_memory(dev, arc->context, res->Data.Memory24.Minimum,
+ res->Data.Memory24.AddressLength);
+ } else {
+ ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "Memory24 0x%x-0x%x/%d\n",
+ res->Data.Memory24.Minimum, res->Data.Memory24.Maximum,
+ res->Data.Memory24.AddressLength));
+ set->set_memoryrange(dev, arc->context, res->Data.Memory24.Minimum,
+ res->Data.Memory24.Maximum, res->Data.Memory24.AddressLength,
+ res->Data.Memory24.Alignment);
+ }
+ break;
+ case ACPI_RESOURCE_TYPE_IRQ:
+ /*
+ * from 1.0b 6.4.2
+ * "This structure is repeated for each separate interrupt
+ * required"
+ */
+ set->set_irq(dev, arc->context, res->Data.Irq.Interrupts,
+ res->Data.Irq.InterruptCount, res->Data.Irq.Triggering,
+ res->Data.Irq.Polarity);
+ break;
+ case ACPI_RESOURCE_TYPE_DMA:
+ /*
+ * from 1.0b 6.4.3
+ * "This structure is repeated for each separate DMA channel
+ * required"
+ */
+ set->set_drq(dev, arc->context, res->Data.Dma.Channels,
+ res->Data.Dma.ChannelCount);
+ break;
+ case ACPI_RESOURCE_TYPE_START_DEPENDENT:
+ ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "start dependent functions\n"));
+ set->set_start_dependent(dev, arc->context,
+ res->Data.StartDpf.CompatibilityPriority);
+ break;
+ case ACPI_RESOURCE_TYPE_END_DEPENDENT:
+ ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "end dependent functions\n"));
+ set->set_end_dependent(dev, arc->context);
+ break;
+ case ACPI_RESOURCE_TYPE_ADDRESS16:
+ case ACPI_RESOURCE_TYPE_ADDRESS32:
+ case ACPI_RESOURCE_TYPE_ADDRESS64:
+ case ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64:
+ switch (res->Type) {
+ case ACPI_RESOURCE_TYPE_ADDRESS16:
+ gran = res->Data.Address16.Granularity;
+ min = res->Data.Address16.Minimum;
+ max = res->Data.Address16.Maximum;
+ length = res->Data.Address16.AddressLength;
+ name = "Address16";
break;
- case ACPI_RESOURCE_TYPE_IRQ:
- /*
- * from 1.0b 6.4.2
- * "This structure is repeated for each separate interrupt
- * required"
- */
- set->set_irq(dev, context, res->Data.Irq.Interrupts,
- res->Data.Irq.InterruptCount, res->Data.Irq.Triggering,
- res->Data.Irq.Polarity);
+ case ACPI_RESOURCE_TYPE_ADDRESS32:
+ gran = res->Data.Address32.Granularity;
+ min = res->Data.Address32.Minimum;
+ max = res->Data.Address32.Maximum;
+ length = res->Data.Address32.AddressLength;
+ name = "Address32";
break;
- case ACPI_RESOURCE_TYPE_DMA:
- /*
- * from 1.0b 6.4.3
- * "This structure is repeated for each separate dma channel
- * required"
- */
- set->set_drq(dev, context, res->Data.Dma.Channels,
- res->Data.Dma.ChannelCount);
+ case ACPI_RESOURCE_TYPE_ADDRESS64:
+ gran = res->Data.Address64.Granularity;
+ min = res->Data.Address64.Minimum;
+ max = res->Data.Address64.Maximum;
+ length = res->Data.Address64.AddressLength;
+ name = "Address64";
break;
- case ACPI_RESOURCE_TYPE_START_DEPENDENT:
- ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "start dependent functions\n"));
- set->set_start_dependent(dev, context,
- res->Data.StartDpf.CompatibilityPriority);
+ default:
+ KASSERT(res->Type == ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64,
+ ("should never happen"));
+ gran = res->Data.ExtAddress64.Granularity;
+ min = res->Data.ExtAddress64.Minimum;
+ max = res->Data.ExtAddress64.Maximum;
+ length = res->Data.ExtAddress64.AddressLength;
+ name = "ExtAddress64";
break;
- case ACPI_RESOURCE_TYPE_END_DEPENDENT:
- ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "end dependent functions\n"));
- set->set_end_dependent(dev, context);
+ }
+ if (length <= 0)
break;
- case ACPI_RESOURCE_TYPE_ADDRESS32:
- if (res->Data.Address32.AddressLength <= 0)
- break;
- if (res->Data.Address32.ProducerConsumer != ACPI_CONSUMER) {
- ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES,
- "ignored Address32 %s producer\n",
- res->Data.Address32.ResourceType == ACPI_IO_RANGE ?
- "IO" : "Memory"));
- break;
- }
- if (res->Data.Address32.ResourceType != ACPI_MEMORY_RANGE &&
- res->Data.Address32.ResourceType != ACPI_IO_RANGE) {
- ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES,
- "ignored Address32 for non-memory, non-I/O\n"));
- break;
- }
+ if (res->Data.Address.ProducerConsumer != ACPI_CONSUMER) {
+ ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES,
+ "ignored %s %s producer\n", name,
+ acpi_address_range_name(res->Data.Address.ResourceType)));
+ break;
+ }
+ if (res->Data.Address.ResourceType != ACPI_MEMORY_RANGE &&
+ res->Data.Address.ResourceType != ACPI_IO_RANGE) {
+ ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES,
+ "ignored %s for non-memory, non-I/O\n", name));
+ break;
+ }
- if (res->Data.Address32.MinAddressFixed == ACPI_ADDRESS_FIXED &&
- res->Data.Address32.MaxAddressFixed == ACPI_ADDRESS_FIXED) {
-
- if (res->Data.Address32.ResourceType == ACPI_MEMORY_RANGE) {
- ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES,
- "Address32/Memory 0x%x/%d\n",
- res->Data.Address32.Minimum,
- res->Data.Address32.AddressLength));
- set->set_memory(dev, context,
- res->Data.Address32.Minimum,
- res->Data.Address32.AddressLength);
- } else {
- ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES,
- "Address32/IO 0x%x/%d\n",
- res->Data.Address32.Minimum,
- res->Data.Address32.AddressLength));
- set->set_ioport(dev, context,
- res->Data.Address32.Minimum,
- res->Data.Address32.AddressLength);
- }
- } else {
- if (res->Data.Address32.ResourceType == ACPI_MEMORY_RANGE) {
- ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES,
- "Address32/Memory 0x%x-0x%x/%d\n",
- res->Data.Address32.Minimum,
- res->Data.Address32.Maximum,
- res->Data.Address32.AddressLength));
- set->set_memoryrange(dev, context,
- res->Data.Address32.Minimum,
- res->Data.Address32.Maximum,
- res->Data.Address32.AddressLength,
- res->Data.Address32.Granularity);
- } else {
- ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES,
- "Address32/IO 0x%x-0x%x/%d\n",
- res->Data.Address32.Minimum,
- res->Data.Address32.Maximum,
- res->Data.Address32.AddressLength));
- set->set_iorange(dev, context,
- res->Data.Address32.Minimum,
- res->Data.Address32.Maximum,
- res->Data.Address32.AddressLength,
- res->Data.Address32.Granularity);
- }
- }
+#ifdef __i386__
+ if (min > ULONG_MAX || (res->Data.Address.MaxAddressFixed && max >
+ ULONG_MAX)) {
+ ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "ignored %s above 4G\n",
+ name));
break;
- case ACPI_RESOURCE_TYPE_ADDRESS16:
- if (res->Data.Address16.AddressLength <= 0)
- break;
- if (res->Data.Address16.ProducerConsumer != ACPI_CONSUMER) {
- ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES,
- "ignored Address16 %s producer\n",
- res->Data.Address16.ResourceType == ACPI_IO_RANGE ?
- "IO" : "Memory"));
- break;
+ }
+ if (max > ULONG_MAX)
+ max = ULONG_MAX;
+#endif
+ if (res->Data.Address.MinAddressFixed == ACPI_ADDRESS_FIXED &&
+ res->Data.Address.MaxAddressFixed == ACPI_ADDRESS_FIXED) {
+ if (res->Data.Address.ResourceType == ACPI_MEMORY_RANGE) {
+ ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "%s/Memory 0x%jx/%ju\n",
+ name, (uintmax_t)min, (uintmax_t)length));
+ set->set_memory(dev, arc->context, min, length);
+ } else {
+ ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "%s/IO 0x%jx/%ju\n", name,
+ (uintmax_t)min, (uintmax_t)length));
+ set->set_ioport(dev, arc->context, min, length);
}
- if (res->Data.Address16.ResourceType != ACPI_MEMORY_RANGE &&
- res->Data.Address16.ResourceType != ACPI_IO_RANGE) {
+ } else {
+ if (res->Data.Address32.ResourceType == ACPI_MEMORY_RANGE) {
ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES,
- "ignored Address16 for non-memory, non-I/O\n"));
- break;
- }
-
- if (res->Data.Address16.MinAddressFixed == ACPI_ADDRESS_FIXED &&
- res->Data.Address16.MaxAddressFixed == ACPI_ADDRESS_FIXED) {
-
- if (res->Data.Address16.ResourceType == ACPI_MEMORY_RANGE) {
- ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES,
- "Address16/Memory 0x%x/%d\n",
- res->Data.Address16.Minimum,
- res->Data.Address16.AddressLength));
- set->set_memory(dev, context,
- res->Data.Address16.Minimum,
- res->Data.Address16.AddressLength);
- } else {
- ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES,
- "Address16/IO 0x%x/%d\n",
- res->Data.Address16.Minimum,
- res->Data.Address16.AddressLength));
- set->set_ioport(dev, context,
- res->Data.Address16.Minimum,
- res->Data.Address16.AddressLength);
- }
+ "%s/Memory 0x%jx-0x%jx/%ju\n", name, (uintmax_t)min,
+ (uintmax_t)max, (uintmax_t)length));
+ set->set_memoryrange(dev, arc->context, min, max, length, gran);
} else {
- if (res->Data.Address16.ResourceType == ACPI_MEMORY_RANGE) {
- ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES,
- "Address16/Memory 0x%x-0x%x/%d\n",
- res->Data.Address16.Minimum,
- res->Data.Address16.Maximum,
- res->Data.Address16.AddressLength));
- set->set_memoryrange(dev, context,
- res->Data.Address16.Minimum,
- res->Data.Address16.Maximum,
- res->Data.Address16.AddressLength,
- res->Data.Address16.Granularity);
- } else {
- ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES,
- "Address16/IO 0x%x-0x%x/%d\n",
- res->Data.Address16.Minimum,
- res->Data.Address16.Maximum,
- res->Data.Address16.AddressLength));
- set->set_iorange(dev, context,
- res->Data.Address16.Minimum,
- res->Data.Address16.Maximum,
- res->Data.Address16.AddressLength,
- res->Data.Address16.Granularity);
- }
- }
- break;
- case ACPI_RESOURCE_TYPE_ADDRESS64:
- ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES,
- "unimplemented Address64 resource\n"));
- break;
- case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:
- if (res->Data.ExtendedIrq.ProducerConsumer != ACPI_CONSUMER) {
- ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES,
- "ignored ExtIRQ producer\n"));
- break;
+ ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "%s/IO 0x%jx-0x%jx/%ju\n",
+ name, (uintmax_t)min, (uintmax_t)max, (uintmax_t)length));
+ set->set_iorange(dev, arc->context, min, max, length, gran);
}
- set->set_ext_irq(dev, context, res->Data.ExtendedIrq.Interrupts,
- res->Data.ExtendedIrq.InterruptCount,
- res->Data.ExtendedIrq.Triggering,
- res->Data.ExtendedIrq.Polarity);
- break;
- case ACPI_RESOURCE_TYPE_VENDOR:
- ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES,
- "unimplemented VendorSpecific resource\n"));
- break;
- default:
+ }
+ break;
+ case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:
+ if (res->Data.ExtendedIrq.ProducerConsumer != ACPI_CONSUMER) {
+ ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "ignored ExtIRQ producer\n"));
break;
}
- }
+ set->set_ext_irq(dev, arc->context, res->Data.ExtendedIrq.Interrupts,
+ res->Data.ExtendedIrq.InterruptCount,
+ res->Data.ExtendedIrq.Triggering, res->Data.ExtendedIrq.Polarity);
+ break;
+ case ACPI_RESOURCE_TYPE_VENDOR:
+ ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES,
+ "unimplemented VendorSpecific resource\n"));
+ break;
+ default:
+ break;
+ }
+ return (AE_OK);
+}
+
+/*
+ * Fetch a device's resources and associate them with the device.
+ *
+ * Note that it might be nice to also locate ACPI-specific resource items, such
+ * as GPE bits.
+ *
+ * We really need to split the resource-fetching code out from the
+ * resource-parsing code, since we may want to use the parsing
+ * code for _PRS someday.
+ */
+ACPI_STATUS
+acpi_parse_resources(device_t dev, ACPI_HANDLE handle,
+ struct acpi_parse_resource_set *set, void *arg)
+{
+ struct acpi_resource_context arc;
+ ACPI_STATUS status;
- AcpiOsFree(buf.Pointer);
- set->set_done(dev, context);
+ ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
+
+ set->set_init(dev, arg, &arc.context);
+ arc.set = set;
+ arc.dev = dev;
+ status = AcpiWalkResources(handle, "_CRS", acpi_parse_resource, &arc);
+ if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
+ printf("can't fetch resources for %s - %s\n",
+ acpi_name(handle), AcpiFormatException(status));
+ return_ACPI_STATUS (status);
+ }
+ set->set_done(dev, arc.context);
return_ACPI_STATUS (AE_OK);
}
@@ -475,20 +422,20 @@ acpi_parse_resources(device_t dev, ACPI_HANDLE handle,
static void acpi_res_set_init(device_t dev, void *arg, void **context);
static void acpi_res_set_done(device_t dev, void *context);
static void acpi_res_set_ioport(device_t dev, void *context,
- u_int32_t base, u_int32_t length);
+ uint64_t base, uint64_t length);
static void acpi_res_set_iorange(device_t dev, void *context,
- u_int32_t low, u_int32_t high,
- u_int32_t length, u_int32_t align);
+ uint64_t low, uint64_t high,
+ uint64_t length, uint64_t align);
static void acpi_res_set_memory(device_t dev, void *context,
- u_int32_t base, u_int32_t length);
+ uint64_t base, uint64_t length);
static void acpi_res_set_memoryrange(device_t dev, void *context,
- u_int32_t low, u_int32_t high,
- u_int32_t length, u_int32_t align);
-static void acpi_res_set_irq(device_t dev, void *context, u_int8_t *irq,
+ uint64_t low, uint64_t high,
+ uint64_t length, uint64_t align);
+static void acpi_res_set_irq(device_t dev, void *context, uint8_t *irq,
int count, int trig, int pol);
static void acpi_res_set_ext_irq(device_t dev, void *context,
- u_int32_t *irq, int count, int trig, int pol);
-static void acpi_res_set_drq(device_t dev, void *context, u_int8_t *drq,
+ uint32_t *irq, int count, int trig, int pol);
+static void acpi_res_set_drq(device_t dev, void *context, uint8_t *drq,
int count);
static void acpi_res_set_start_dependent(device_t dev, void *context,
int preference);
@@ -539,8 +486,8 @@ acpi_res_set_done(device_t dev, void *context)
}
static void
-acpi_res_set_ioport(device_t dev, void *context, u_int32_t base,
- u_int32_t length)
+acpi_res_set_ioport(device_t dev, void *context, uint64_t base,
+ uint64_t length)
{
struct acpi_res_context *cp = (struct acpi_res_context *)context;
@@ -550,8 +497,8 @@ acpi_res_set_ioport(device_t dev, void *context, u_int32_t base,
}
static void
-acpi_res_set_iorange(device_t dev, void *context, u_int32_t low,
- u_int32_t high, u_int32_t length, u_int32_t align)
+acpi_res_set_iorange(device_t dev, void *context, uint64_t low,
+ uint64_t high, uint64_t length, uint64_t align)
{
struct acpi_res_context *cp = (struct acpi_res_context *)context;
@@ -561,8 +508,8 @@ acpi_res_set_iorange(device_t dev, void *context, u_int32_t low,
}
static void
-acpi_res_set_memory(device_t dev, void *context, u_int32_t base,
- u_int32_t length)
+acpi_res_set_memory(device_t dev, void *context, uint64_t base,
+ uint64_t length)
{
struct acpi_res_context *cp = (struct acpi_res_context *)context;
@@ -573,8 +520,8 @@ acpi_res_set_memory(device_t dev, void *context, u_int32_t base,
}
static void
-acpi_res_set_memoryrange(device_t dev, void *context, u_int32_t low,
- u_int32_t high, u_int32_t length, u_int32_t align)
+acpi_res_set_memoryrange(device_t dev, void *context, uint64_t low,
+ uint64_t high, uint64_t length, uint64_t align)
{
struct acpi_res_context *cp = (struct acpi_res_context *)context;
@@ -584,7 +531,7 @@ acpi_res_set_memoryrange(device_t dev, void *context, u_int32_t low,
}
static void
-acpi_res_set_irq(device_t dev, void *context, u_int8_t *irq, int count,
+acpi_res_set_irq(device_t dev, void *context, uint8_t *irq, int count,
int trig, int pol)
{
struct acpi_res_context *cp = (struct acpi_res_context *)context;
@@ -600,7 +547,7 @@ acpi_res_set_irq(device_t dev, void *context, u_int8_t *irq, int count,
}
static void
-acpi_res_set_ext_irq(device_t dev, void *context, u_int32_t *irq, int count,
+acpi_res_set_ext_irq(device_t dev, void *context, uint32_t *irq, int count,
int trig, int pol)
{
struct acpi_res_context *cp = (struct acpi_res_context *)context;
@@ -616,7 +563,7 @@ acpi_res_set_ext_irq(device_t dev, void *context, u_int32_t *irq, int count,
}
static void
-acpi_res_set_drq(device_t dev, void *context, u_int8_t *drq, int count)
+acpi_res_set_drq(device_t dev, void *context, uint8_t *drq, int count)
{
struct acpi_res_context *cp = (struct acpi_res_context *)context;
diff --git a/sys/dev/acpica/acpi_thermal.c b/sys/dev/acpica/acpi_thermal.c
index 7226b6c..18996bd 100644
--- a/sys/dev/acpica/acpi_thermal.c
+++ b/sys/dev/acpica/acpi_thermal.c
@@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$");
#include <sys/kthread.h>
#include <sys/malloc.h>
#include <sys/module.h>
-#include <sys/bus.h>
#include <sys/proc.h>
#include <sys/reboot.h>
#include <sys/sysctl.h>
diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h
index a74cd75..8735776 100644
--- a/sys/dev/acpica/acpivar.h
+++ b/sys/dev/acpica/acpivar.h
@@ -355,19 +355,19 @@ BOOLEAN acpi_MatchHid(ACPI_HANDLE h, const char *hid);
struct acpi_parse_resource_set {
void (*set_init)(device_t dev, void *arg, void **context);
void (*set_done)(device_t dev, void *context);
- void (*set_ioport)(device_t dev, void *context, uint32_t base,
- uint32_t length);
- void (*set_iorange)(device_t dev, void *context, uint32_t low,
- uint32_t high, uint32_t length, uint32_t align);
- void (*set_memory)(device_t dev, void *context, uint32_t base,
- uint32_t length);
- void (*set_memoryrange)(device_t dev, void *context, uint32_t low,
- uint32_t high, uint32_t length, uint32_t align);
- void (*set_irq)(device_t dev, void *context, u_int8_t *irq,
+ void (*set_ioport)(device_t dev, void *context, uint64_t base,
+ uint64_t length);
+ void (*set_iorange)(device_t dev, void *context, uint64_t low,
+ uint64_t high, uint64_t length, uint64_t align);
+ void (*set_memory)(device_t dev, void *context, uint64_t base,
+ uint64_t length);
+ void (*set_memoryrange)(device_t dev, void *context, uint64_t low,
+ uint64_t high, uint64_t length, uint64_t align);
+ void (*set_irq)(device_t dev, void *context, uint8_t *irq,
int count, int trig, int pol);
- void (*set_ext_irq)(device_t dev, void *context, u_int32_t *irq,
+ void (*set_ext_irq)(device_t dev, void *context, uint32_t *irq,
int count, int trig, int pol);
- void (*set_drq)(device_t dev, void *context, u_int8_t *drq,
+ void (*set_drq)(device_t dev, void *context, uint8_t *drq,
int count);
void (*set_start_dependent)(device_t dev, void *context,
int preference);
OpenPOWER on IntegriCloud