Module Name: src
Committed By: jmcneill
Date: Mon Dec 30 11:44:16 UTC 2024
Modified Files:
src/sys/dev/acpi: acpi.c acpi_i2c.c
Log Message:
acpi: Ensure that non-child I2C HID devices are properly claimed.
To generate a diff of this commit:
cvs rdiff -u -r1.301 -r1.302 src/sys/dev/acpi/acpi.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/acpi/acpi_i2c.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/acpi.c
diff -u src/sys/dev/acpi/acpi.c:1.301 src/sys/dev/acpi/acpi.c:1.302
--- src/sys/dev/acpi/acpi.c:1.301 Thu Dec 19 14:19:53 2024
+++ src/sys/dev/acpi/acpi.c Mon Dec 30 11:44:16 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.301 2024/12/19 14:19:53 riastradh Exp $ */
+/* $NetBSD: acpi.c,v 1.302 2024/12/30 11:44:16 jmcneill Exp $ */
/*-
* Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -100,7 +100,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.301 2024/12/19 14:19:53 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.302 2024/12/30 11:44:16 jmcneill Exp $");
#include "pci.h"
#include "opt_acpi.h"
@@ -1058,6 +1058,11 @@ acpi_rescan_node(struct acpi_softc *sc,
}
}
+ /* Dependency scanning may have claimed this device. */
+ if (ad->ad_device != NULL) {
+ return;
+ }
+
aa.aa_node = ad;
aa.aa_iot = sc->sc_iot;
aa.aa_memt = sc->sc_memt;
Index: src/sys/dev/acpi/acpi_i2c.c
diff -u src/sys/dev/acpi/acpi_i2c.c:1.17 src/sys/dev/acpi/acpi_i2c.c:1.18
--- src/sys/dev/acpi/acpi_i2c.c:1.17 Sat Dec 14 12:52:39 2024
+++ src/sys/dev/acpi/acpi_i2c.c Mon Dec 30 11:44:16 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_i2c.c,v 1.17 2024/12/14 12:52:39 jmcneill Exp $ */
+/* $NetBSD: acpi_i2c.c,v 1.18 2024/12/30 11:44:16 jmcneill Exp $ */
/*-
* Copyright (c) 2017, 2021 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include "iic.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_i2c.c,v 1.17 2024/12/14 12:52:39 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_i2c.c,v 1.18 2024/12/30 11:44:16 jmcneill Exp $");
#include <sys/device.h>
@@ -189,6 +189,8 @@ acpi_enter_i2chid_devs(device_t dev, str
i2cc.i2c_addr != 0 &&
i2cc.res_src == devnode) {
aprint_debug_dev(dev, "claiming %s\n", ad->ad_name);
+ ad->ad_device = dev;
+ acpi_claim_childdevs(dev, ad);
acpi_enter_i2c_device(ad, array);
}
}
