Per the RAA228228 datasheet, READ_TEMPERATURE_1 is not a supported PMBus
command.
Signed-off-by: Grant Peltier <[email protected]>
---
drivers/hwmon/pmbus/isl68137.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/hwmon/pmbus/isl68137.c b/drivers/hwmon/pmbus/isl68137.c
index 0c622711ef7e..58aa95a3c010 100644
--- a/drivers/hwmon/pmbus/isl68137.c
+++ b/drivers/hwmon/pmbus/isl68137.c
@@ -67,6 +67,7 @@ enum variants {
raa_dmpvr1_2rail,
raa_dmpvr2_1rail,
raa_dmpvr2_2rail,
+ raa_dmpvr2_2rail_nontc,
raa_dmpvr2_3rail,
raa_dmpvr2_hv,
};
@@ -241,6 +242,10 @@ static int isl68137_probe(struct i2c_client *client,
info->pages = 1;
info->read_word_data = raa_dmpvr2_read_word_data;
break;
+ case raa_dmpvr2_2rail_nontc:
+ info->func[0] &= ~PMBUS_HAVE_TEMP;
+ info->func[1] &= ~PMBUS_HAVE_TEMP;
+ fallthrough;
case raa_dmpvr2_2rail:
info->pages = 2;
info->read_word_data = raa_dmpvr2_read_word_data;
@@ -304,7 +309,7 @@ static const struct i2c_device_id raa_dmpvr_id[] = {
{"raa228000", raa_dmpvr2_hv},
{"raa228004", raa_dmpvr2_hv},
{"raa228006", raa_dmpvr2_hv},
- {"raa228228", raa_dmpvr2_2rail},
+ {"raa228228", raa_dmpvr2_2rail_nontc},
{"raa229001", raa_dmpvr2_2rail},
{"raa229004", raa_dmpvr2_2rail},
{}
--
2.20.1
On 8/10/20 11:36 AM, Grant Peltier wrote:
> Per the RAA228228 datasheet, READ_TEMPERATURE_1 is not a supported PMBus
> command.
>
> Signed-off-by: Grant Peltier <[email protected]>
Please copy [email protected] on hwmon patches. This patch is not
in the hwmon patchwork, which in general almost guarantees that it gets lost
since I usually pull patches from there. As it happens, you are lucky
that I noticed. Patch applied.
Guenter
> ---
> drivers/hwmon/pmbus/isl68137.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/hwmon/pmbus/isl68137.c b/drivers/hwmon/pmbus/isl68137.c
> index 0c622711ef7e..58aa95a3c010 100644
> --- a/drivers/hwmon/pmbus/isl68137.c
> +++ b/drivers/hwmon/pmbus/isl68137.c
> @@ -67,6 +67,7 @@ enum variants {
> raa_dmpvr1_2rail,
> raa_dmpvr2_1rail,
> raa_dmpvr2_2rail,
> + raa_dmpvr2_2rail_nontc,
> raa_dmpvr2_3rail,
> raa_dmpvr2_hv,
> };
> @@ -241,6 +242,10 @@ static int isl68137_probe(struct i2c_client *client,
> info->pages = 1;
> info->read_word_data = raa_dmpvr2_read_word_data;
> break;
> + case raa_dmpvr2_2rail_nontc:
> + info->func[0] &= ~PMBUS_HAVE_TEMP;
> + info->func[1] &= ~PMBUS_HAVE_TEMP;
> + fallthrough;
> case raa_dmpvr2_2rail:
> info->pages = 2;
> info->read_word_data = raa_dmpvr2_read_word_data;
> @@ -304,7 +309,7 @@ static const struct i2c_device_id raa_dmpvr_id[] = {
> {"raa228000", raa_dmpvr2_hv},
> {"raa228004", raa_dmpvr2_hv},
> {"raa228006", raa_dmpvr2_hv},
> - {"raa228228", raa_dmpvr2_2rail},
> + {"raa228228", raa_dmpvr2_2rail_nontc},
> {"raa229001", raa_dmpvr2_2rail},
> {"raa229004", raa_dmpvr2_2rail},
> {}
>
Ah, my apologies. Duly noted for the future. Thanks for catching it.
Grant
-----Original Message-----
From: Guenter Roeck <[email protected]> On Behalf Of Guenter Roeck
Sent: Tuesday, August 11, 2020 12:17 PM
To: Grant Peltier <[email protected]>
Cc: Grant Peltier <[email protected]>; [email protected]; Adam Vaughn <[email protected]>
Subject: Re: [PATCH] hwmon: (pmbus/isl68137) remove READ_TEMPERATURE_1 telemetry for RAA228228
On 8/10/20 11:36 AM, Grant Peltier wrote:
> Per the RAA228228 datasheet, READ_TEMPERATURE_1 is not a supported
> PMBus command.
>
> Signed-off-by: Grant Peltier <[email protected]>
Please copy [email protected] on hwmon patches. This patch is not in the hwmon patchwork, which in general almost guarantees that it gets lost since I usually pull patches from there. As it happens, you are lucky that I noticed. Patch applied.
Guenter
> ---
> drivers/hwmon/pmbus/isl68137.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/hwmon/pmbus/isl68137.c
> b/drivers/hwmon/pmbus/isl68137.c index 0c622711ef7e..58aa95a3c010
> 100644
> --- a/drivers/hwmon/pmbus/isl68137.c
> +++ b/drivers/hwmon/pmbus/isl68137.c
> @@ -67,6 +67,7 @@ enum variants {
> raa_dmpvr1_2rail,
> raa_dmpvr2_1rail,
> raa_dmpvr2_2rail,
> + raa_dmpvr2_2rail_nontc,
> raa_dmpvr2_3rail,
> raa_dmpvr2_hv,
> };
> @@ -241,6 +242,10 @@ static int isl68137_probe(struct i2c_client *client,
> info->pages = 1;
> info->read_word_data = raa_dmpvr2_read_word_data;
> break;
> + case raa_dmpvr2_2rail_nontc:
> + info->func[0] &= ~PMBUS_HAVE_TEMP;
> + info->func[1] &= ~PMBUS_HAVE_TEMP;
> + fallthrough;
> case raa_dmpvr2_2rail:
> info->pages = 2;
> info->read_word_data = raa_dmpvr2_read_word_data; @@ -304,7 +309,7
> @@ static const struct i2c_device_id raa_dmpvr_id[] = {
> {"raa228000", raa_dmpvr2_hv},
> {"raa228004", raa_dmpvr2_hv},
> {"raa228006", raa_dmpvr2_hv},
> - {"raa228228", raa_dmpvr2_2rail},
> + {"raa228228", raa_dmpvr2_2rail_nontc},
> {"raa229001", raa_dmpvr2_2rail},
> {"raa229004", raa_dmpvr2_2rail},
> {}
>
Jason pointed me to the patch
https://github.com/torvalds/linux/commit/294f69e662d1570703e9b56e95be37a9fd3afba5.
Nvm...
- Alex Qiu
On Tue, Oct 13, 2020 at 11:18 AM Alex Qiu <[email protected]> wrote:
>
> (Intercepting the email thread...)
>
> Hi Grant,
>
> Looks like you made a typo in your patch:
>
> > + case raa_dmpvr2_2rail_nontc:
> > + info->func[0] &= ~PMBUS_HAVE_TEMP;
> > + info->func[1] &= ~PMBUS_HAVE_TEMP;
> > + fallthrough;
>
> Did you mean "/* fallthrough */" instead of "fallthrough;"?
>
> - Alex Qiu
(Intercepting the email thread...)
Hi Grant,
Looks like you made a typo in your patch:
> + case raa_dmpvr2_2rail_nontc:
> + info->func[0] &= ~PMBUS_HAVE_TEMP;
> + info->func[1] &= ~PMBUS_HAVE_TEMP;
> + fallthrough;
Did you mean "/* fallthrough */" instead of "fallthrough;"?
- Alex Qiu
On 10/13/20 11:18 AM, Alex Qiu wrote:
> (Intercepting the email thread...)
>
> Hi Grant,
>
> Looks like you made a typo in your patch:
>
>> + case raa_dmpvr2_2rail_nontc:
>> + info->func[0] &= ~PMBUS_HAVE_TEMP;
>> + info->func[1] &= ~PMBUS_HAVE_TEMP;
>> + fallthrough;
>
> Did you mean "/* fallthrough */" instead of "fallthrough;"?
>
No, that is the fancy new way to indicate fallthrough in the kernel.
It is converted to either
__attribute__((__fallthrough__))
or to
do {} while (0)
in include/linux/compiler_attributes.h.
Guenter