libsensors: Add support for SENSORS_BUS_TYPE_SDIO

Some SDIO drivers, namely WiFi adapter drivers, include hwmon support.

Add support for parsing the device name, so they don't get treated as
platform / virtual devices.

Signed-off-by: Chen-Yu Tsai <wenst@google.com>
This commit is contained in:
Chen-Yu Tsai committed 2023-05-08 15:03:26 +08:00
1 parent e5e053bbb7
commit c3ce1320aa
4 files changed
+16

No files matched your search

+2
View File
@@ -371,6 +371,8 @@ const char *sensors_get_adapter_name(const sensors_bus_id *bus)
return "MDIO adapter";
case SENSORS_BUS_TYPE_SCSI:
return "SCSI adapter";
case SENSORS_BUS_TYPE_SDIO:
return "SDIO adapter";
}
/* bus types with several instances */
+6
View File
@@ -127,6 +127,8 @@ int sensors_parse_chip_name(const char *name, sensors_chip_name *res)
res->bus.type = SENSORS_BUS_TYPE_MDIO;
else if (!strncmp(name, "scsi", dash - name))
res->bus.type = SENSORS_BUS_TYPE_SCSI;
else if (!strncmp(name, "sdio", dash - name))
res->bus.type = SENSORS_BUS_TYPE_SDIO;
else
goto ERROR;
name = dash + 1;
@@ -204,6 +206,10 @@ int sensors_snprintf_chip_name(char *str, size_t size,
case SENSORS_BUS_TYPE_SCSI:
return snprintf(str, size, "%s-scsi-%hd-%x", chip->prefix,
chip->bus.nr, chip->addr);
case SENSORS_BUS_TYPE_SDIO:
return snprintf(str, size, "%s-sdio-%x:%04x:%x", chip->prefix,
chip->bus.nr, (chip->addr >> 3),
(chip->addr & 0x7));
}
return -SENSORS_ERR_CHIP_NAME;
+1
View File
@@ -46,6 +46,7 @@
#define SENSORS_BUS_TYPE_HID 6
#define SENSORS_BUS_TYPE_MDIO 7
#define SENSORS_BUS_TYPE_SCSI 8
#define SENSORS_BUS_TYPE_SDIO 9
#define SENSORS_BUS_NR_ANY (-1)
#define SENSORS_BUS_NR_IGNORE (-2)
+7
View File
@@ -692,6 +692,13 @@ static int classify_device(const char *dev_name,
entry->chip.addr = (bus << 8) + (slot << 4) + fn;
entry->chip.bus.type = SENSORS_BUS_TYPE_SCSI;
entry->chip.bus.nr = domain;
} else
if (subsys && !strcmp(subsys, "sdio") &&
sscanf(dev_name, "mmc%hx:%x:%x", &entry->chip.bus.nr, &slot, &fn) == 3) {
/* mmc host(bus), address, function */
/* adapter(host), channel(bus), id(target), lun */
entry->chip.addr = (slot << 3) + fn;
entry->chip.bus.type = SENSORS_BUS_TYPE_SDIO;
} else {
/* Unknown device */
ret = 0;