* [PATCH v2] Add ISA ACPI sensor driver name support
@ 2020-08-07 17:54 Hoan Tran
2020-08-11 9:38 ` Ondřej Lysoněk
2020-08-12 22:13 ` Hoan Tran
0 siblings, 2 replies; 3+ messages in thread
From: Hoan Tran @ 2020-08-07 17:54 UTC (permalink / raw)
To: lm-sensors
From: Hoan Tran <hoan@os.amperecomputing.com>
ACPI hwmon sensor driver name has a different format such as
APMC0D29:00
APMC0D29:01
compared with DTB. This patch supports this format and gives
the correct device address as below
apm_xgene-isa-0000 => APMC0D29:00
Adapter: ISA adapter
SoC Temperature: +35.0°C
CPU power: 11.00 W
IO power: 20.00 W
apm_xgene-isa-0001 => APMC0D29:01
Adapter: ISA adapter
SoC Temperature: +33.0°C
CPU power: 13.00 W
IO power: 23.83 W
Signed-off-by: Hoan Tran <hoan@os.amperecomputing.com>
---
v2:
Filter A-Z for the name
lib/sysfs.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/sysfs.c b/lib/sysfs.c
index e63688b7..e9db55d4 100644
--- a/lib/sysfs.c
+++ b/lib/sysfs.c
@@ -663,7 +663,7 @@ static int classify_device(const char *dev_name,
if ((!subsys || !strcmp(subsys, "platform") ||
!strcmp(subsys, "of_platform"))) {
/* must be new ISA (platform driver) */
- if (sscanf(dev_name, "%*[a-z0-9_].%d", &entry->chip.addr) != 1)
+ if (sscanf(dev_name, "%*[a-zA-Z0-9_]%*[.:]%d", &entry->chip.addr) != 1)
entry->chip.addr = 0;
entry->chip.bus.type = SENSORS_BUS_TYPE_ISA;
entry->chip.bus.nr = 0;
@@ -938,7 +938,7 @@ int sensors_read_sysfs_attr(const sensors_chip_name *name,
if (res = EOF) {
if (errno = EIO)
return -SENSORS_ERR_IO;
- else
+ else
return -SENSORS_ERR_ACCESS_R;
}
*value /= get_type_scaling(subfeature->type);
@@ -972,7 +972,7 @@ int sensors_write_sysfs_attr(const sensors_chip_name *name,
if (res = EOF) {
if (errno = EIO)
return -SENSORS_ERR_IO;
- else
+ else
return -SENSORS_ERR_ACCESS_W;
}
} else
--
2.24.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] Add ISA ACPI sensor driver name support
2020-08-07 17:54 [PATCH v2] Add ISA ACPI sensor driver name support Hoan Tran
@ 2020-08-11 9:38 ` Ondřej Lysoněk
2020-08-12 22:13 ` Hoan Tran
1 sibling, 0 replies; 3+ messages in thread
From: Ondřej Lysoněk @ 2020-08-11 9:38 UTC (permalink / raw)
To: lm-sensors
Hi,
Thanks for the patch!
Hoan Tran <Hoan@os.amperecomputing.com> writes:
> From: Hoan Tran <hoan@os.amperecomputing.com>
>
> ACPI hwmon sensor driver name has a different format such as
> APMC0D29:00
> APMC0D29:01
Do you know where the number 00/01 comes from? I'm trying to determine
if it's guaranteed to be stable across reboots.
> compared with DTB. This patch supports this format and gives
> the correct device address as below
>
> apm_xgene-isa-0000 => APMC0D29:00
> Adapter: ISA adapter
> SoC Temperature: +35.0°C
> CPU power: 11.00 W
> IO power: 20.00 W
>
> apm_xgene-isa-0001 => APMC0D29:01
> Adapter: ISA adapter
> SoC Temperature: +33.0°C
> CPU power: 13.00 W
> IO power: 23.83 W
>
> Signed-off-by: Hoan Tran <hoan@os.amperecomputing.com>
> ---
> v2:
> Filter A-Z for the name
>
> lib/sysfs.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/lib/sysfs.c b/lib/sysfs.c
> index e63688b7..e9db55d4 100644
> --- a/lib/sysfs.c
> +++ b/lib/sysfs.c
> @@ -663,7 +663,7 @@ static int classify_device(const char *dev_name,
> if ((!subsys || !strcmp(subsys, "platform") ||
> !strcmp(subsys, "of_platform"))) {
> /* must be new ISA (platform driver) */
> - if (sscanf(dev_name, "%*[a-z0-9_].%d", &entry->chip.addr) != 1)
> + if (sscanf(dev_name, "%*[a-zA-Z0-9_]%*[.:]%d", &entry->chip.addr) != 1)
Nit: I think this should be "%*[a-zA-Z0-9_]%*1[.:]%d", so that only a
single '.' or ':' character is matched.
Ondřej
> entry->chip.addr = 0;
> entry->chip.bus.type = SENSORS_BUS_TYPE_ISA;
> entry->chip.bus.nr = 0;
> @@ -938,7 +938,7 @@ int sensors_read_sysfs_attr(const sensors_chip_name *name,
> if (res == EOF) {
> if (errno == EIO)
> return -SENSORS_ERR_IO;
> - else
> + else
> return -SENSORS_ERR_ACCESS_R;
> }
> *value /= get_type_scaling(subfeature->type);
> @@ -972,7 +972,7 @@ int sensors_write_sysfs_attr(const sensors_chip_name *name,
> if (res == EOF) {
> if (errno == EIO)
> return -SENSORS_ERR_IO;
> - else
> + else
> return -SENSORS_ERR_ACCESS_W;
> }
> } else
> --
> 2.24.2
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] Add ISA ACPI sensor driver name support
2020-08-07 17:54 [PATCH v2] Add ISA ACPI sensor driver name support Hoan Tran
2020-08-11 9:38 ` Ondřej Lysoněk
@ 2020-08-12 22:13 ` Hoan Tran
1 sibling, 0 replies; 3+ messages in thread
From: Hoan Tran @ 2020-08-12 22:13 UTC (permalink / raw)
To: lm-sensors
Hi,
On 8/11/20 2:38 AM, Ondřej Lysoněk wrote:
> Hi,
>
> Thanks for the patch!
>
> Hoan Tran <Hoan@os.amperecomputing.com> writes:
>
>> From: Hoan Tran <hoan@os.amperecomputing.com>
>>
>> ACPI hwmon sensor driver name has a different format such as
>> APMC0D29:00
>> APMC0D29:01
>
> Do you know where the number 00/01 comes from? I'm trying to determine
> if it's guaranteed to be stable across reboots.
I think it's based on the ACPI node order inside DSDT.
>
>> compared with DTB. This patch supports this format and gives
>> the correct device address as below
>>
>> apm_xgene-isa-0000 => APMC0D29:00
>> Adapter: ISA adapter
>> SoC Temperature: +35.0°C
>> CPU power: 11.00 W
>> IO power: 20.00 W
>>
>> apm_xgene-isa-0001 => APMC0D29:01
>> Adapter: ISA adapter
>> SoC Temperature: +33.0°C
>> CPU power: 13.00 W
>> IO power: 23.83 W
>>
>> Signed-off-by: Hoan Tran <hoan@os.amperecomputing.com>
>> ---
>> v2:
>> Filter A-Z for the name
>>
>> lib/sysfs.c | 6 +++---
>> 1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/lib/sysfs.c b/lib/sysfs.c
>> index e63688b7..e9db55d4 100644
>> --- a/lib/sysfs.c
>> +++ b/lib/sysfs.c
>> @@ -663,7 +663,7 @@ static int classify_device(const char *dev_name,
>> if ((!subsys || !strcmp(subsys, "platform") ||
>> !strcmp(subsys, "of_platform"))) {
>> /* must be new ISA (platform driver) */
>> - if (sscanf(dev_name, "%*[a-z0-9_].%d", &entry->chip.addr) != 1)
>> + if (sscanf(dev_name, "%*[a-zA-Z0-9_]%*[.:]%d", &entry->chip.addr) != 1)
>
> Nit: I think this should be "%*[a-zA-Z0-9_]%*1[.:]%d", so that only a
> single '.' or ':' character is matched.
Yes, it's true. I can fix it.
Regards
Hoan
>
> Ondřej
>
>> entry->chip.addr = 0;
>> entry->chip.bus.type = SENSORS_BUS_TYPE_ISA;
>> entry->chip.bus.nr = 0;
>> @@ -938,7 +938,7 @@ int sensors_read_sysfs_attr(const sensors_chip_name *name,
>> if (res = EOF) {
>> if (errno = EIO)
>> return -SENSORS_ERR_IO;
>> - else
>> + else
>> return -SENSORS_ERR_ACCESS_R;
>> }
>> *value /= get_type_scaling(subfeature->type);
>> @@ -972,7 +972,7 @@ int sensors_write_sysfs_attr(const sensors_chip_name *name,
>> if (res = EOF) {
>> if (errno = EIO)
>> return -SENSORS_ERR_IO;
>> - else
>> + else
>> return -SENSORS_ERR_ACCESS_W;
>> }
>> } else
>> --
>> 2.24.2
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-08-12 22:13 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-07 17:54 [PATCH v2] Add ISA ACPI sensor driver name support Hoan Tran
2020-08-11 9:38 ` Ondřej Lysoněk
2020-08-12 22:13 ` Hoan Tran
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.