diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/acpi/acpi.c | 7 | ||||
| -rw-r--r-- | sys/dev/acpi/acpiprt.c | 77 |
2 files changed, 55 insertions, 29 deletions
diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c index eb443762454..edc725bbfe6 100644 --- a/sys/dev/acpi/acpi.c +++ b/sys/dev/acpi/acpi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpi.c,v 1.63 2006/11/25 16:26:08 marco Exp $ */ +/* $OpenBSD: acpi.c,v 1.64 2006/11/27 15:20:26 jordan Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org> @@ -658,7 +658,7 @@ acpi_foundprt(struct aml_node *node, void *arg) memset(&aaa, 0, sizeof(aaa)); aaa.aaa_iot = sc->sc_iot; aaa.aaa_memt = sc->sc_memt; - aaa.aaa_node = node->parent; + aaa.aaa_node = node; aaa.aaa_dev = dev; aaa.aaa_name = "acpiprt"; @@ -782,6 +782,9 @@ acpi_attach(struct device *parent, struct device *self, void *aux) } } + /* Perform post-parsing fixups */ + aml_postparse(); + /* Walk AML Tree */ //aml_walkroot(); diff --git a/sys/dev/acpi/acpiprt.c b/sys/dev/acpi/acpiprt.c index 61a0a824b9f..5d06c7c8d9f 100644 --- a/sys/dev/acpi/acpiprt.c +++ b/sys/dev/acpi/acpiprt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpiprt.c,v 1.3 2006/11/27 12:39:04 kettenis Exp $ */ +/* $OpenBSD: acpiprt.c,v 1.4 2006/11/27 15:20:26 jordan Exp $ */ /* * Copyright (c) 2006 Mark Kettenis <kettenis@openbsd.org> * @@ -85,7 +85,7 @@ acpiprt_attach(struct device *parent, struct device *self, void *aux) int i; sc->sc_acpi = (struct acpi_softc *)parent; - sc->sc_devnode = aa->aaa_node->child; + sc->sc_devnode = aa->aaa_node; sc->sc_bus = acpiprt_getpcibus(sc, sc->sc_devnode); printf(": bus %d (%s)", sc->sc_bus, sc->sc_devnode->parent->name); @@ -106,11 +106,34 @@ acpiprt_attach(struct device *parent, struct device *self, void *aux) acpiprt_prt_add(sc, res.v_package[i]); } +int +acpiprt_getirq(union acpi_resource *crs, void *arg); + +int +acpiprt_getirq(union acpi_resource *crs, void *arg) +{ + int *irq = (int *)arg; + int typ; + + typ=AML_CRSTYPE(crs); + switch (typ) { + case SR_IRQ: + *irq = ffs(aml_letohost16(crs->sr_irq.irq_mask)) - 1; + break; + case LR_EXTIRQ: + *irq = aml_letohost32(crs->lr_extirq.irq[0]); + break; + default: + printf("Unknown interrupt : %x\n", typ); + } + return (0); +} + void acpiprt_prt_add(struct acpiprt_softc *sc, struct aml_value *v) { struct aml_node *node; - struct aml_value res; + struct aml_value res, *pp; int addr, pin, irq; struct mp_intr_map *map; struct ioapic_softc *apic; @@ -122,20 +145,25 @@ acpiprt_prt_add(struct acpiprt_softc *sc, struct aml_value *v) addr = aml_val2int(v->v_package[0]); pin = aml_val2int(v->v_package[1]); + if (pin > 3) { + return; + } - if (v->v_package[2]->type == AML_OBJTYPE_NAMEREF || - v->v_package[2]->type == AML_OBJTYPE_OBJREF) { - if (v->v_package[2]->type == AML_OBJTYPE_NAMEREF) - node = aml_searchname(sc->sc_devnode, - v->v_package[2]->v_nameref); - else - node = v->v_package[2]->v_objref.ref->node; - if (node == NULL) { - printf(" invalid node!\n"); - return; - } - - if (aml_evalname(sc->sc_acpi, node, "_STA", 0, NULL, NULL)) { + pp = v->v_package[2]; + if (pp->type == AML_OBJTYPE_NAMEREF) { + node = aml_searchname(sc->sc_devnode, pp->v_nameref); + if (node == NULL) { + printf("Invalid device!\n"); + return; + } + pp = node->value; + } + if (pp->type == AML_OBJTYPE_OBJREF) { + pp = pp->v_objref.ref; + } + if (pp->type == AML_OBJTYPE_DEVICE) { + node = pp->node; + if (aml_evalname(sc->sc_acpi, node, "_STA", 0, NULL, &res)) { printf("no _STA method\n"); } @@ -147,24 +175,19 @@ acpiprt_prt_add(struct acpiprt_softc *sc, struct aml_value *v) printf("invalid _CRS object\n"); return; } - - if ((res.v_buffer[0] >> 3) == 0x4) { - irq = res.v_buffer[1] + (res.v_buffer[2] << 8); - irq = ffs(irq) - 1; - } else { - printf("unexpected _CSR object\n"); - return; - } - } else + aml_parse_resource(res.length, res.v_buffer, + acpiprt_getirq, + &irq); + } else { irq = aml_val2int(v->v_package[3]); - + } apic = ioapic_find_bybase(irq); map = malloc(sizeof (struct mp_intr_map), M_DEVBUF, M_NOWAIT); if (map == NULL) return; -#if ACPI_DEBUG +#ifdef ACPI_DEBUG printf("%s: addr 0x%x pin %d irq %d\n", DEVNAME(sc), addr, pin, irq); #endif |