From nobody Tue Dec 2 02:31:38 2025 Received: from m16.mail.163.com (m16.mail.163.com [117.135.210.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D2424310771; Thu, 20 Nov 2025 08:20:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=117.135.210.2 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763626853; cv=none; b=d0T8+D+7f2Bbt8IKXBxjOfrCooSqtXhBY5cMSViBOA/TanQ/gjA9PUuIpfKbFPwL7Ijp3vatqEE3lQceNXv/gvvRVfMhF7dpoxV8eMaKO4R6ehV+M5Y0oNTD8VZ7oNZqGyr84uLPMGB1wSPxfs45jjhVhOOC3yAElctVkFVNHUc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763626853; c=relaxed/simple; bh=lYjURJI/C7CMPXnFlir38vOMNoN22hi9E3n+0ppauSU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=WfFYFnzqaBDF73b2UNIRAqEgjI7BIFRKMNj49HPXqPerhvzkNF9JiQV/+sbBJs7azYrAu2/ax3Ut1bauvLqcVfpzlGb4BIPJq5/zKJs3pARR/Y+8MdvCOO6QzF7J9KRggFMNtFcufOMC2Uv2W1496sa82PH3EvT+jPYf5g1gVkI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=oGXceGih; arc=none smtp.client-ip=117.135.210.2 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="oGXceGih" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-Id; bh=YJcLR15i/Rdlyp5 qMquBKHLn/ND7Dul6I3YoAw088Mo=; b=oGXceGihS2v6WjilQrdh81pEEXKFCRg KxmmBirmUldDPpDdDpm9BzoEdkxvT06G8qIph04hWP3SVqJ2PyXxwDzOwM1zXd0Q veCCZ2PaWiLu5OfuULJgIr0zVLKN5KeGOQi+eE9+XtLtZz9c/HNT6hTux5i2Au8g f9gilP7QjLu4= Received: from localhost.localdomain (unknown []) by gzga-smtp-mtada-g0-2 (Coremail) with SMTP id _____wA3BPAwzx5p45f2BA--.17S10; Thu, 20 Nov 2025 16:20:14 +0800 (CST) From: Wenliang Yan To: linux@roeck-us.net, Jean Delvare Cc: Wenliang Yan , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Jonathan Corbet , linux-hwmon@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 8/8] hwmon: (ina3221) Modify write/read functions for 'in' and 'curr' attribute Date: Thu, 20 Nov 2025 03:19:21 -0500 Message-Id: <20251120081921.39412-9-wenliang202407@163.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20251120081921.39412-1-wenliang202407@163.com> References: <20251120081921.39412-1-wenliang202407@163.com> X-CM-TRANSID: _____wA3BPAwzx5p45f2BA--.17S10 X-Coremail-Antispam: 1Uf129KBjvJXoWxurW5uFy5GFW7urWftF1DWrg_yoWrKr18p3 yUGFWrtrWjq3WSgrs2kF4DWrn8trWxW3y2yr9rK39Yva1UA34qkFyrW3Wq93y5GryfWF4x JayxtFW8ua1Dtr7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0JUWRR_UUUUU= X-CM-SenderInfo: xzhqzxhdqjjiisuqlqqrwthudrp/xtbCvx7kuGkezz7ZkQAA3z Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Modified the relevant read/write functions for 'in' and 'curr' attributes, adding support for crit, lcrit, crit_alarm, and lcrit_alarm features. Signed-off-by: Wenliang Yan --- drivers/hwmon/ina3221.c | 96 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 92 insertions(+), 4 deletions(-) diff --git a/drivers/hwmon/ina3221.c b/drivers/hwmon/ina3221.c index af6d9ca5ae28..5ffa0f622e25 100644 --- a/drivers/hwmon/ina3221.c +++ b/drivers/hwmon/ina3221.c @@ -380,6 +380,12 @@ static const u8 ina3221_in_reg[] =3D { INA3221_SHUNT_SUM, }; =20 +static const u8 alert_flag[] =3D { + F_AFF1, + F_AFF2, + F_AFF3, +}; + static int ina3221_read_chip(struct device *dev, u32 attr, long *val) { struct ina3221_data *ina =3D dev_get_drvdata(dev); @@ -442,6 +448,38 @@ static int ina3221_read_in(struct device *dev, u32 att= r, int channel, long *val) case hwmon_in_enable: *val =3D ina3221_is_enabled(ina, channel); return 0; + case hwmon_in_crit: + case hwmon_in_lcrit: + if (!ina3221_is_enabled(ina, channel)) + return -ENODATA; + + if (channel >=3D INA3221_NUM_CHANNELS) + return -EOPNOTSUPP; + + reg =3D limit_regs[channel]; + ret =3D ina3221_read_value(ina, reg, ®val); + if (ret) + return ret; + /* + * Scale of bus voltage (mV): LSB is 8mV + */ + *val =3D regval * 8; + return 0; + case hwmon_in_crit_alarm: + case hwmon_in_lcrit_alarm: + /* No actual register read if channel is disabled */ + if (!ina3221_is_enabled(ina, channel)) { + /* Return 0 for alert flags */ + *val =3D 0; + return 0; + } + + reg =3D alert_flag[channel]; + ret =3D regmap_field_read(ina->fields[reg], ®val); + if (ret) + return ret; + *val =3D regval; + return 0; default: return -EOPNOTSUPP; } @@ -501,6 +539,25 @@ static int ina3221_read_curr(struct device *dev, u32 a= ttr, /* Return current in mA */ *val =3D DIV_ROUND_CLOSEST(voltage_nv, resistance_uo); return 0; + case hwmon_curr_lcrit: + if (!resistance_uo) + return -ENODATA; + + if (channel >=3D INA3221_NUM_CHANNELS) + return -EOPNOTSUPP; + + reg =3D limit_regs[channel]; + ret =3D ina3221_read_value(ina, reg, ®val); + if (ret) + return ret; + + /* Return current in mA */ + *val =3D DIV_ROUND_CLOSEST(regval * ina->current_lsb_uA, 1000); + return 0; + case hwmon_curr_lcrit_alarm: + reg =3D alert_flag[channel]; + + fallthrough; case hwmon_curr_crit_alarm: case hwmon_curr_max_alarm: /* No actual register read if channel is disabled */ @@ -698,10 +755,9 @@ static int ina3221_write_chip(struct device *dev, u32 = attr, long val) } } =20 -static int ina3221_write_curr(struct device *dev, u32 attr, - int channel, long val) +static int ina3221_write_curr_shunt(struct ina3221_data *ina, u32 attr, + int channel, long val) { - struct ina3221_data *ina =3D dev_get_drvdata(dev); struct ina3221_input *input =3D ina->inputs; u8 reg =3D ina3221_curr_reg[attr][channel]; int resistance_uo, current_ma, voltage_uv; @@ -744,6 +800,22 @@ static int ina3221_write_curr(struct device *dev, u32 = attr, return regmap_write(ina->regmap, reg, regval); } =20 +static int ina3221_write_curr(struct device *dev, u32 attr, + int channel, long val) +{ + struct ina3221_data *ina =3D dev_get_drvdata(dev); + + switch (attr) { + case hwmon_curr_crit: + case hwmon_curr_max: + return ina3221_write_curr_shunt(ina, attr, channel, val); + case hwmon_curr_lcrit: + return sq52210_alert_limit_write(ina, SQ52210_ALERT_SUL, channel, val); + default: + return 0; + } +} + static int ina3221_write_enable(struct device *dev, int channel, bool enab= le) { struct ina3221_data *ina =3D dev_get_drvdata(dev); @@ -792,6 +864,22 @@ static int ina3221_write_enable(struct device *dev, in= t channel, bool enable) return ret; } =20 +static int ina3221_write_in(struct device *dev, u32 attr, int channel, lon= g val) +{ + struct ina3221_data *ina =3D dev_get_drvdata(dev); + + switch (attr) { + case hwmon_in_lcrit: + return sq52210_alert_limit_write(ina, SQ52210_ALERT_BUL, channel, val); + case hwmon_in_crit: + return sq52210_alert_limit_write(ina, SQ52210_ALERT_BOL, channel, val); + case hwmon_in_enable: + return ina3221_write_enable(dev, channel, val); + default: + return 0; + } +} + static int ina3221_write_power(struct device *dev, u32 attr, int channel, = long val) { struct ina3221_data *ina =3D dev_get_drvdata(dev); @@ -841,7 +929,7 @@ static int ina3221_write(struct device *dev, enum hwmon= _sensor_types type, break; case hwmon_in: /* 0-align channel ID */ - ret =3D ina3221_write_enable(dev, channel - 1, val); + ret =3D ina3221_write_in(dev, attr, channel - 1, val); break; case hwmon_curr: ret =3D ina3221_write_curr(dev, attr, channel, val); --=20 2.17.1