diff options
| author | James Hastings <hastings@cvs.openbsd.org> | 2024-09-04 21:39:19 +0000 |
|---|---|---|
| committer | James Hastings <hastings@cvs.openbsd.org> | 2024-09-04 21:39:19 +0000 |
| commit | 41f085c87ba6ed911e5050e7cbd217566ecce2e4 (patch) | |
| tree | 27c4455cfc8d75e6c0d531f8d0f7ae4ef8d72dd1 | |
| parent | 17e94b65d12fbbd6213fd843a4a5294404c3520b (diff) | |
Push acpi(4) _CRS parsing down after matching skippable and ISA hardware IDs.
ok kettenis@
| -rw-r--r-- | sys/dev/acpi/acpi.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c index 5da2524cb75..46b09fcf159 100644 --- a/sys/dev/acpi/acpi.c +++ b/sys/dev/acpi/acpi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpi.c,v 1.438 2024/08/18 02:53:08 deraadt Exp $ */ +/* $OpenBSD: acpi.c,v 1.439 2024/09/04 21:39:18 hastings Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org> @@ -3249,7 +3249,6 @@ acpi_foundhid(struct aml_node *node, void *arg) aaa.aaa_node = node->parent; aaa.aaa_dev = dev; aaa.aaa_cdev = cdev; - acpi_parse_crs(sc, &aaa); #ifndef SMALL_KERNEL if (!strcmp(cdev, ACPI_DEV_MOUSE)) { @@ -3266,6 +3265,8 @@ acpi_foundhid(struct aml_node *node, void *arg) acpi_matchhids(&aaa, acpi_isa_hids, "none")) return (0); + acpi_parse_crs(sc, &aaa); + aaa.aaa_dmat = acpi_iommu_device_map(node->parent, aaa.aaa_dmat); if (!node->parent->attached) { |