From: Eliav Farber <farbere@amazon.com>
To: <jdelvare@suse.com>, <linux@roeck-us.net>, <robh+dt@kernel.org>,
<mark.rutland@arm.com>, <linux-hwmon@vger.kernel.org>,
<devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Cc: <farbere@amazon.com>, <talel@amazon.com>, <hhhawa@amazon.com>,
<jonnyc@amazon.com>, <hanochu@amazon.com>, <ronenk@amazon.com>,
<itamark@amazon.com>, <shellykz@amazon.com>, <shorer@amazon.com>,
<amitlavi@amazon.com>, <almogbs@amazon.com>, <dwmw@amazon.co.uk>,
<rtanwar@maxlinear.com>
Subject: [PATCH v2 06/16] hwmon: (mr75203) fix multi-channel voltage reading
Date: Wed, 17 Aug 2022 05:43:11 +0000 [thread overview]
Message-ID: <20220817054321.6519-7-farbere@amazon.com> (raw)
In-Reply-To: <20220817054321.6519-1-farbere@amazon.com>
- Fix voltage reading to support number of channels in VM IP (CH_NUM).
- Configure the ip-polling register to enable polling for all channels.
Signed-off-by: Eliav Farber <farbere@amazon.com>
---
drivers/hwmon/mr75203.c | 40 +++++++++++++++++++++++++++++++---------
1 file changed, 31 insertions(+), 9 deletions(-)
diff --git a/drivers/hwmon/mr75203.c b/drivers/hwmon/mr75203.c
index bec63b611eb4..4419e481d47c 100644
--- a/drivers/hwmon/mr75203.c
+++ b/drivers/hwmon/mr75203.c
@@ -69,8 +69,9 @@
/* VM Individual Macro Register */
#define VM_COM_REG_SIZE 0x200
-#define VM_SDIF_DONE(n) (VM_COM_REG_SIZE + 0x34 + 0x200 * (n))
-#define VM_SDIF_DATA(n) (VM_COM_REG_SIZE + 0x40 + 0x200 * (n))
+#define VM_SDIF_DONE(vm) (VM_COM_REG_SIZE + 0x34 + 0x200 * (vm))
+#define VM_SDIF_DATA(vm, ch) \
+ (VM_COM_REG_SIZE + 0x40 + 0x200 * (vm) + 0x4 * (ch))
/* SDA Slave Register */
#define IP_CTRL 0x00
@@ -116,6 +117,7 @@ struct pvt_device {
u32 t_num;
u32 p_num;
u32 v_num;
+ u32 c_num;
u32 ip_freq;
u8 *vm_idx;
};
@@ -181,12 +183,14 @@ static int pvt_read_in(struct device *dev, u32 attr, int channel, long *val)
struct regmap *v_map = pvt->v_map;
u32 n, stat;
u8 vm_idx;
+ u8 ch_idx;
int ret;
- if (channel >= pvt->v_num)
+ if (channel >= pvt->v_num * pvt->c_num)
return -EINVAL;
- vm_idx = pvt->vm_idx[channel];
+ vm_idx = pvt->vm_idx[channel / pvt->c_num];
+ ch_idx = channel % pvt->c_num;
switch (attr) {
case hwmon_in_input:
@@ -197,7 +201,7 @@ static int pvt_read_in(struct device *dev, u32 attr, int channel, long *val)
if (ret)
return ret;
- ret = regmap_read(v_map, VM_SDIF_DATA(vm_idx), &n);
+ ret = regmap_read(v_map, VM_SDIF_DATA(vm_idx, ch_idx), &n);
if(ret < 0)
return ret;
@@ -386,6 +390,20 @@ static int pvt_init(struct pvt_device *pvt)
if (ret)
return ret;
+ val = GENMASK(pvt->c_num - 1, 0) | VM_CH_INIT |
+ IP_POLL << SDIF_ADDR_SFT |
+ SDIF_WRN_W | SDIF_PROG;
+ ret = regmap_write(v_map, SDIF_W, val);
+ if (ret < 0)
+ return ret;
+
+ ret = regmap_read_poll_timeout(v_map, SDIF_STAT,
+ val, !(val & SDIF_BUSY),
+ PVT_POLL_DELAY_US,
+ PVT_POLL_TIMEOUT_US);
+ if (ret)
+ return ret;
+
val = CFG1_VOL_MEAS_MODE | CFG1_PARALLEL_OUT |
CFG1_14_BIT | IP_CFG << SDIF_ADDR_SFT |
SDIF_WRN_W | SDIF_PROG;
@@ -501,7 +519,7 @@ static int pvt_reset_control_deassert(struct device *dev, struct pvt_device *pvt
static int mr75203_probe(struct platform_device *pdev)
{
const struct hwmon_channel_info **pvt_info;
- u32 ts_num, vm_num, pd_num, val, index, i;
+ u32 ts_num, vm_num, pd_num, ch_num, val, index, i;
struct device *dev = &pdev->dev;
u32 *temp_config, *in_config;
struct device *hwmon_dev;
@@ -547,9 +565,11 @@ static int mr75203_probe(struct platform_device *pdev)
ts_num = (val & TS_NUM_MSK) >> TS_NUM_SFT;
pd_num = (val & PD_NUM_MSK) >> PD_NUM_SFT;
vm_num = (val & VM_NUM_MSK) >> VM_NUM_SFT;
+ ch_num = (val & CH_NUM_MSK) >> CH_NUM_SFT;
pvt->t_num = ts_num;
pvt->p_num = pd_num;
pvt->v_num = vm_num;
+ pvt->c_num = ch_num;
val = 0;
if (ts_num)
val++;
@@ -586,6 +606,8 @@ static int mr75203_probe(struct platform_device *pdev)
}
if (vm_num) {
+ u32 total_ch = ch_num * vm_num;
+
ret = pvt_get_regmap(pdev, "vm", pvt);
if (ret)
return ret;
@@ -614,13 +636,13 @@ static int mr75203_probe(struct platform_device *pdev)
pvt->v_num = i;
}
- in_config = devm_kcalloc(dev, vm_num + 1,
+ in_config = devm_kcalloc(dev, total_ch + 1,
sizeof(*in_config), GFP_KERNEL);
if (!in_config)
return -ENOMEM;
- memset32(in_config, HWMON_I_INPUT, vm_num);
- in_config[vm_num] = 0;
+ memset32(in_config, HWMON_I_INPUT, total_ch);
+ in_config[total_ch] = 0;
pvt_in.config = in_config;
pvt_info[index++] = &pvt_in;
--
2.37.1
next prev parent reply other threads:[~2022-08-17 5:44 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-17 5:43 [PATCH v2 00/16] Variety of fixes and new features for mr75203 driver Eliav Farber
2022-08-17 5:43 ` [PATCH v2 01/16] hwmon: (mr75203) fix VM sensor allocation when "intel,vm-map" not defined Eliav Farber
2022-08-18 19:40 ` Guenter Roeck
2022-08-18 20:01 ` [PATCH v2 01/16] hwmon: (mr75203) fix VM sensor allocation when "intel, vm-map" " Farber, Eliav
2022-08-17 5:43 ` [PATCH v2 02/16] hwmon: (mr75203) update pvt->v_num to the actual number of used sensors Eliav Farber
2022-08-18 19:44 ` Guenter Roeck
2022-08-17 5:43 ` [PATCH v2 03/16] hwmon: (mr75203) update Moortec PVT controller intel,vm-map property Eliav Farber
2022-08-18 19:47 ` Guenter Roeck
2022-08-18 20:20 ` [PATCH v2 03/16] hwmon: (mr75203) update Moortec PVT controller intel, vm-map property Farber, Eliav
2022-08-17 5:43 ` [PATCH v2 04/16] hwmon: (mr75203) add Moortec PVT controller reset-control-skip property Eliav Farber
2022-08-18 20:01 ` Guenter Roeck
2022-08-22 11:54 ` Farber, Eliav
2022-08-17 5:43 ` [PATCH v2 05/16] hwmon: (mr75203) add option to skip reset controller Eliav Farber
2022-08-17 5:43 ` Eliav Farber [this message]
2022-08-18 20:03 ` [PATCH v2 06/16] hwmon: (mr75203) fix multi-channel voltage reading Guenter Roeck
2022-08-22 12:37 ` Farber, Eliav
2022-08-17 5:43 ` [PATCH v2 07/16] hwmon: (mr75203) add VM active channels property for Moortec PVT controller Eliav Farber
2022-08-18 20:07 ` Guenter Roeck
2022-08-17 5:43 ` [PATCH v2 08/16] hwmon: (mr75203) add VM active channel support Eliav Farber
2022-08-17 5:43 ` [PATCH v2 09/16] hwmon: (mr75203) add VM pre-scalar property for Moortec PVT controller Eliav Farber
2022-08-18 20:11 ` Guenter Roeck
2022-08-19 7:13 ` Farber, Eliav
2022-08-17 5:43 ` [PATCH v2 10/16] hwmon: (mr75203) add VM pre-scalar support Eliav Farber
2022-08-17 5:43 ` [PATCH v2 11/16] hwmon: (mr75203) add protection for negative voltage value Eliav Farber
2022-08-18 20:13 ` Guenter Roeck
2022-08-17 5:43 ` [PATCH v2 12/16] hwmon: (mr75203) modify the temperature equation Eliav Farber
2022-08-18 20:23 ` Guenter Roeck
2022-08-19 7:44 ` Farber, Eliav
2022-08-19 11:35 ` Guenter Roeck
2022-08-17 5:43 ` [PATCH v2 13/16] hwmon: (mr75203) add thermal coefficient properties for Moortec PVT controller Eliav Farber
2022-08-18 20:25 ` Guenter Roeck
2022-08-22 13:24 ` Farber, Eliav
2022-08-22 16:25 ` Guenter Roeck
2022-08-29 18:46 ` Farber, Eliav
2022-08-17 5:43 ` [PATCH v2 14/16] hwmon: (mr75203) parse thermal coefficients from device-tree Eliav Farber
2022-08-18 20:28 ` Guenter Roeck
2022-08-19 7:57 ` Farber, Eliav
2022-08-19 11:36 ` Guenter Roeck
2022-08-19 11:38 ` Guenter Roeck
2022-08-22 13:41 ` Farber, Eliav
2022-08-22 16:31 ` Guenter Roeck
2022-08-29 18:59 ` Farber, Eliav
2022-08-17 5:43 ` [PATCH v2 15/16] hwmon: (mr75203) fix coding style space errors Eliav Farber
2022-08-17 5:43 ` [PATCH v2 16/16] hwmon: (mr75203) add debugfs to read and write temperature coefficients Eliav Farber
2022-08-18 23:11 ` Guenter Roeck
2022-08-22 13:59 ` Farber, Eliav
2022-08-22 16:28 ` Guenter Roeck
2022-08-29 18:41 ` Farber, Eliav
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=20220817054321.6519-7-farbere@amazon.com \
--to=farbere@amazon.com \
--cc=almogbs@amazon.com \
--cc=amitlavi@amazon.com \
--cc=devicetree@vger.kernel.org \
--cc=dwmw@amazon.co.uk \
--cc=hanochu@amazon.com \
--cc=hhhawa@amazon.com \
--cc=itamark@amazon.com \
--cc=jdelvare@suse.com \
--cc=jonnyc@amazon.com \
--cc=linux-hwmon@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
--cc=ronenk@amazon.com \
--cc=rtanwar@maxlinear.com \
--cc=shellykz@amazon.com \
--cc=shorer@amazon.com \
--cc=talel@amazon.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).