linux-hwmon.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Chu Lin <linchuyuan@google.com>
To: linux@roeck-us.net
Cc: belgaied@google.com, jasonling@google.com, jdelvare@suse.com,
	linchuyuan@google.com, linux-hwmon@vger.kernel.org,
	linux-kernel@vger.kernel.org, zhongqil@google.com
Subject: [PATCH] hwmon: adm1275: Make sure we are reading enough data for different chips
Date: Wed,  8 Jul 2020 23:53:06 +0000	[thread overview]
Message-ID: <20200708235306.3854404-1-linchuyuan@google.com> (raw)

Issue:
When binding adm1272 to the adm1275 driver, PEC error is reported.
See blow:
adm1275: probe of xxxx failed with error -74

Diagnosis:
Per the datasheet of adm1272 and adm1278 (www.analog.com),
PMON_CONFIG (0xd4) is 16bits wide. On the other hand,
PMON_CONFIG (0xd4) for adm1275 is 8bits wide.
The driver should not assume everything is 8bits wide and read only
8bits from it.

Solution:
if it is adm1272 or adm1278, use i2c_read_word. Else, use i2c_read_byte

Signed-off-by: Chu Lin <linchuyuan@google.com>
---
 drivers/hwmon/pmbus/adm1275.c | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/drivers/hwmon/pmbus/adm1275.c b/drivers/hwmon/pmbus/adm1275.c
index e25f541227da..a0d547d20358 100644
--- a/drivers/hwmon/pmbus/adm1275.c
+++ b/drivers/hwmon/pmbus/adm1275.c
@@ -472,6 +472,7 @@ static int adm1275_probe(struct i2c_client *client,
 	struct adm1275_data *data;
 	const struct i2c_device_id *mid;
 	const struct coefficients *coefficients;
+	s32 (*config_read_fn_ptr)(const struct i2c_client *client, u8 reg);
 	int vindex = -1, voindex = -1, cindex = -1, pindex = -1;
 	int tindex = -1;
 	u32 shunt;
@@ -510,14 +511,6 @@ static int adm1275_probe(struct i2c_client *client,
 			   "Device mismatch: Configured %s, detected %s\n",
 			   id->name, mid->name);
 
-	config = i2c_smbus_read_byte_data(client, ADM1275_PMON_CONFIG);
-	if (config < 0)
-		return config;
-
-	device_config = i2c_smbus_read_byte_data(client, ADM1275_DEVICE_CONFIG);
-	if (device_config < 0)
-		return device_config;
-
 	data = devm_kzalloc(&client->dev, sizeof(struct adm1275_data),
 			    GFP_KERNEL);
 	if (!data)
@@ -532,6 +525,21 @@ static int adm1275_probe(struct i2c_client *client,
 
 	data->id = mid->driver_data;
 
+	/* adm1272 and adm1278 supports temperature monitoring.  The config and device config
+	 * are 16bits wide for these two devices. On the other hand, other devices are 8 bits wide
+	 */
+	if (data->id == adm1272 || data->id == adm1278)
+		config_read_fn_ptr = &i2c_smbus_read_word_data;
+	else
+		config_read_fn_ptr = &i2c_smbus_read_byte_data;
+	config = config_read_fn_ptr(client, ADM1275_PMON_CONFIG);
+	if (config < 0)
+		return config;
+
+	device_config = config_read_fn_ptr(client, ADM1275_DEVICE_CONFIG);
+	if (device_config < 0)
+		return device_config;
+
 	info = &data->info;
 
 	info->pages = 1;
-- 
2.27.0.383.g050319c2ae-goog


             reply	other threads:[~2020-07-08 23:53 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-08 23:53 Chu Lin [this message]
2020-07-09  0:33 ` [PATCH] hwmon: adm1275: Make sure we are reading enough data for different chips Guenter Roeck
2020-07-09  3:30   ` Chu Lin
2020-07-09  3:57     ` Guenter Roeck

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200708235306.3854404-1-linchuyuan@google.com \
    --to=linchuyuan@google.com \
    --cc=belgaied@google.com \
    --cc=jasonling@google.com \
    --cc=jdelvare@suse.com \
    --cc=linux-hwmon@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@roeck-us.net \
    --cc=zhongqil@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).