git: a0bcfa78313b - main - superio: Handle conflicting devid via prefer/extid

The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=a0bcfa78313b429a958149e045f4069b2ed8c984

commit a0bcfa78313b429a958149e045f4069b2ed8c984
Author:     Stéphane Rochoy <stephane.rochoy@stormshield.eu>
AuthorDate: 2023-07-01 17:19:44 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2023-07-01 17:19:51 +0000

    superio: Handle conflicting devid via prefer/extid
    
    Reviewed by: imp
    Pull Request: https://github.com/freebsd/freebsd-src/pull/719
---
 sys/dev/superio/superio.c | 20 ++++++++++++++++++++
 sys/dev/superio/superio.h |  1 +
 2 files changed, 21 insertions(+)

diff --git a/sys/dev/superio/superio.c b/sys/dev/superio/superio.c
index 1e4782277c0e..6db2b0685c1c 100644
--- a/sys/dev/superio/superio.c
+++ b/sys/dev/superio/superio.c
@@ -93,6 +93,7 @@ struct siosc {
 	superio_vendor_t		vendor;
 	uint16_t			devid;
 	uint8_t				revid;
+	int				extid;
 	uint8_t				current_ldn;
 	uint8_t				ldn_reg;
 	uint8_t				enable_reg;
@@ -292,6 +293,7 @@ static const struct {
 	superio_vendor_t	vendor;
 	uint16_t		devid;
 	uint16_t		mask;
+	int			extid; /* Extra ID: used to handle conflicting devid. */
 	const char		*descr;
 	const struct sio_device	*devices;
 } superio_table[] = {
@@ -483,6 +485,7 @@ superio_detect(device_t dev, bool claim, struct siosc *sc)
 	int error;
 	int rid;
 	int i, m;
+	int prefer;
 
 	error = bus_get_resource(dev, SYS_RES_IOPORT, 0, &port, &count);
 	if (error != 0)
@@ -507,6 +510,11 @@ superio_detect(device_t dev, bool claim, struct siosc *sc)
 		return (ENXIO);
 	}
 
+	prefer = 0;
+	resource_int_value(device_get_name(dev), device_get_unit(dev), "prefer", &prefer);
+	if (bootverbose && prefer > 0)
+		device_printf(dev, "prefer extid %d\n", prefer);
+
 	for (m = 0; methods_table[m] != NULL; m++) {
 		methods_table[m]->enter(res, port);
 		if (methods_table[m]->vendor == SUPERIO_VENDOR_ITE) {
@@ -533,6 +541,8 @@ superio_detect(device_t dev, bool claim, struct siosc *sc)
 				continue;
 			if ((superio_table[i].devid & ~mask) != (devid & ~mask))
 				continue;
+			if (prefer > 0 && prefer != superio_table[i].extid)
+				continue;
 			break;
 		}
 
@@ -558,6 +568,7 @@ superio_detect(device_t dev, bool claim, struct siosc *sc)
 	sc->io_port = port;
 	sc->devid = devid;
 	sc->revid = revid;
+	sc->extid = superio_table[i].extid;
 
 	KASSERT(sc->vendor == SUPERIO_VENDOR_ITE ||
 	    sc->vendor == SUPERIO_VENDOR_NUVOTON ||
@@ -877,6 +888,15 @@ superio_revid(device_t dev)
 	return (sc->revid);
 }
 
+int
+superio_extid(device_t dev)
+{
+	device_t sio_dev = device_get_parent(dev);
+	struct siosc *sc = device_get_softc(sio_dev);
+
+	return (sc->extid);
+}
+
 uint8_t
 superio_ldn_read(device_t dev, uint8_t ldn, uint8_t reg)
 {
diff --git a/sys/dev/superio/superio.h b/sys/dev/superio/superio.h
index 997bcb2c6efd..b12df6ef8a82 100644
--- a/sys/dev/superio/superio.h
+++ b/sys/dev/superio/superio.h
@@ -49,6 +49,7 @@ typedef enum superio_dev_type {
 superio_vendor_t superio_vendor(device_t dev);
 uint16_t superio_devid(device_t dev);
 uint8_t superio_revid(device_t dev);
+int superio_extid(device_t dev);
 uint8_t superio_read(device_t dev, uint8_t reg);
 uint8_t superio_ldn_read(device_t dev, uint8_t ldn, uint8_t reg);
 void superio_write(device_t dev, uint8_t reg, uint8_t val);