From: Heiner Kallweit <hkallweit1@gmail.com>
To: Realtek linux nic maintainers <nic_swsd@realtek.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Eric Dumazet <edumazet@google.com>,
David Miller <davem@davemloft.net>,
Andrew Lunn <andrew+netdev@lunn.ch>,
Simon Horman <horms@kernel.org>
Cc: "netdev@vger.kernel.org" <netdev@vger.kernel.org>
Subject: [PATCH net-next 1/2] r8169: prepare for extending hwmon support
Date: Mon, 6 Jan 2025 19:01:16 +0100 [thread overview]
Message-ID: <cf9d1c92-de68-44ea-9dec-ceba17c2aec9@gmail.com> (raw)
In-Reply-To: <97bc1a93-d5d5-4444-86f2-a0b9cc89b0c8@gmail.com>
This factors out the temperature value calculation and
prepares for adding further temperature attributes.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
drivers/net/ethernet/realtek/r8169_main.c | 23 +++++++++++++++++------
1 file changed, 17 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index 5724f650f..38f915956 100644
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -5338,17 +5338,28 @@ static bool rtl_aspm_is_safe(struct rtl8169_private *tp)
return false;
}
+static int r8169_hwmon_get_temp(int raw)
+{
+ if (raw >= 512)
+ raw -= 1024;
+
+ return 1000 * raw / 2;
+}
+
static int r8169_hwmon_read(struct device *dev, enum hwmon_sensor_types type,
u32 attr, int channel, long *val)
{
struct rtl8169_private *tp = dev_get_drvdata(dev);
- int val_raw;
-
- val_raw = phy_read_paged(tp->phydev, 0xbd8, 0x12) & 0x3ff;
- if (val_raw >= 512)
- val_raw -= 1024;
+ int raw;
- *val = 1000 * val_raw / 2;
+ switch (attr) {
+ case hwmon_temp_input:
+ raw = phy_read_paged(tp->phydev, 0xbd8, 0x12) & 0x3ff;
+ *val = r8169_hwmon_get_temp(raw);
+ break;
+ default:
+ return -EINVAL;
+ }
return 0;
}
--
2.47.1
next prev parent reply other threads:[~2025-01-06 18:01 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-06 18:00 [PATCH net-next 0/2] r8169: extend hwmon support Heiner Kallweit
2025-01-06 18:01 ` Heiner Kallweit [this message]
2025-01-06 21:08 ` [PATCH net-next 1/2] r8169: prepare for extending " Andrew Lunn
2025-01-06 18:05 ` [PATCH net-next 2/2] r8169: add support for reading over-temp threshold Heiner Kallweit
2025-01-06 21:15 ` Andrew Lunn
2025-01-06 22:31 ` Heiner Kallweit
2025-01-06 23:16 ` Andrew Lunn
2025-01-07 7:06 ` Heiner Kallweit
2025-01-06 23:30 ` Jakub Kicinski
2025-01-07 7:07 ` Heiner Kallweit
2025-01-08 22:13 ` [PATCH net-next 0/2] r8169: extend hwmon support Heiner Kallweit
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=cf9d1c92-de68-44ea-9dec-ceba17c2aec9@gmail.com \
--to=hkallweit1@gmail.com \
--cc=andrew+netdev@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=horms@kernel.org \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nic_swsd@realtek.com \
--cc=pabeni@redhat.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).