From: Ben Greear <[email protected]>
Allow sensors tool to read radio's temperature, example:
mt7921_phy17-pci-1800
Adapter: PCI adapter
temp1: +72.0°C
Signed-off-by: Ben Greear <[email protected]>
---
v2: Add mutex to protect mcu call, fix nits.
.../net/wireless/mediatek/mt76/mt7921/init.c | 56 +++++++++++++++++++
.../net/wireless/mediatek/mt76/mt7921/mcu.c | 17 ++++++
.../wireless/mediatek/mt76/mt7921/mt7921.h | 1 +
3 files changed, 74 insertions(+)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/init.c b/drivers/net/wireless/mediatek/mt76/mt7921/init.c
index c15ce1a19000..01ad28102c8c 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7921/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/init.c
@@ -2,6 +2,9 @@
/* Copyright (C) 2020 MediaTek Inc. */
#include <linux/etherdevice.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
+#include <linux/thermal.h>
#include <linux/firmware.h>
#include "mt7921.h"
#include "../mt76_connac2_mac.h"
@@ -58,6 +61,53 @@ static const struct ieee80211_iface_combination if_comb_chanctx[] = {
}
};
+static ssize_t mt7921_thermal_temp_show(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
+{
+ switch (to_sensor_dev_attr(attr)->index) {
+ case 0:
+ struct mt7921_phy *phy = dev_get_drvdata(dev);
+ struct mt7921_dev *mdev = phy->dev;
+ int temperature;
+
+ mt7921_mutex_acquire(mdev);
+ temperature = mt7921_mcu_get_temperature(phy);
+ mt7921_mutex_release(mdev);
+
+ if (temperature < 0)
+ return temperature;
+ /* display in millidegree Celcius */
+ return sprintf(buf, "%u\n", temperature * 1000);
+ default:
+ return -EINVAL;
+ }
+}
+static SENSOR_DEVICE_ATTR_RO(temp1_input, mt7921_thermal_temp, 0);
+
+static struct attribute *mt7921_hwmon_attrs[] = {
+ &sensor_dev_attr_temp1_input.dev_attr.attr,
+ NULL,
+};
+ATTRIBUTE_GROUPS(mt7921_hwmon);
+
+static int mt7921_thermal_init(struct mt7921_phy *phy)
+{
+ struct wiphy *wiphy = phy->mt76->hw->wiphy;
+ struct device *hwmon;
+ const char *name;
+
+ name = devm_kasprintf(&wiphy->dev, GFP_KERNEL, "mt7921_%s",
+ wiphy_name(wiphy));
+
+ hwmon = devm_hwmon_device_register_with_groups(&wiphy->dev, name, phy,
+ mt7921_hwmon_groups);
+ if (IS_ERR(hwmon))
+ return PTR_ERR(hwmon);
+
+ return 0;
+}
+
static void
mt7921_regd_notifier(struct wiphy *wiphy,
struct regulatory_request *request)
@@ -384,6 +434,12 @@ static void mt7921_init_work(struct work_struct *work)
return;
}
+ ret = mt7921_thermal_init(&dev->phy);
+ if (ret) {
+ dev_err(dev->mt76.dev, "thermal_init failed\n");
+ return;
+ }
+
/* we support chip reset now */
dev->hw_init_done = true;
diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
index 9c4dcc0e5a7c..abeedacc28f2 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
@@ -1346,6 +1346,23 @@ int mt7921_mcu_set_clc(struct mt7921_dev *dev, u8 *alpha2,
return 0;
}
+int mt7921_mcu_get_temperature(struct mt7921_phy *phy)
+{
+ struct mt7921_dev *dev = phy->dev;
+ struct {
+ u8 ctrl_id;
+ u8 action;
+ u8 band_idx;
+ u8 rsv[5];
+ } req = {
+ .ctrl_id = THERMAL_SENSOR_TEMP_QUERY,
+ .band_idx = phy->mt76->band_idx,
+ };
+
+ return mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD(THERMAL_CTRL), &req,
+ sizeof(req), true);
+}
+
int mt7921_mcu_set_rxfilter(struct mt7921_dev *dev, u32 fif,
u8 bit_op, u32 bit_map)
{
diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
index 706f00df6836..85fddf99d497 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
@@ -568,6 +568,7 @@ int mt7921_mcu_set_sniffer(struct mt7921_dev *dev, struct ieee80211_vif *vif,
bool enable);
int mt7921_mcu_config_sniffer(struct mt7921_vif *vif,
struct ieee80211_chanctx_conf *ctx);
+int mt7921_mcu_get_temperature(struct mt7921_phy *phy);
int mt7921_usb_sdio_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
enum mt76_txq_id qid, struct mt76_wcid *wcid,
--
2.40.0
On Fri, May 19, 2023 at 09:36:11AM -0700, [email protected] wrote:
> From: Ben Greear <[email protected]>
>
> Allow sensors tool to read radio's temperature, example:
>
> mt7921_phy17-pci-1800
> Adapter: PCI adapter
> temp1: +72.0°C
>
> Signed-off-by: Ben Greear <[email protected]>
Hi Ben,
me again.
...
> @@ -58,6 +61,53 @@ static const struct ieee80211_iface_combination if_comb_chanctx[] = {
> }
> };
>
> +static ssize_t mt7921_thermal_temp_show(struct device *dev,
> + struct device_attribute *attr,
> + char *buf)
> +{
> + switch (to_sensor_dev_attr(attr)->index) {
> + case 0:
> + struct mt7921_phy *phy = dev_get_drvdata(dev);
> + struct mt7921_dev *mdev = phy->dev;
> + int temperature;
> +
> + mt7921_mutex_acquire(mdev);
> + temperature = mt7921_mcu_get_temperature(phy);
> + mt7921_mutex_release(mdev);
> +
> + if (temperature < 0)
> + return temperature;
> + /* display in millidegree Celcius */
nit: s/Celcius/Celsius/
Did I get that wrong last time?
If so, sorry.
> + return sprintf(buf, "%u\n", temperature * 1000);
clang-16 does not seem to like this:
drivers/net/wireless/mediatek/mt76/mt7921/init.c:63:3: error: expected expression
struct mt7921_phy *phy = dev_get_drvdata(dev);
^
drivers/net/wireless/mediatek/mt76/mt7921/init.c:64:29: error: use of undeclared identifier 'phy'
struct mt7921_dev *mdev = phy->dev;
^
drivers/net/wireless/mediatek/mt76/mt7921/init.c:68:44: error: use of undeclared identifier 'phy'
temperature = mt7921_mcu_get_temperature(phy);
^
drivers/net/wireless/mediatek/mt76/mt7921/init.c:64:22: warning: mixing declarations and code is incompatible with standards before C99 [-Wdeclaration-after-statement]
struct mt7921_dev *mdev = phy->dev;
^
1 warning and 3 errors generated.
I think a fix is:
diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/init.c b/drivers/net/wireless/mediatek/mt76/mt7921/init.c
index af9b1d5e520b..9655dbd5cfc8 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7921/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/init.c
@@ -59,7 +59,7 @@ static ssize_t mt7921_thermal_temp_show(struct device *dev,
char *buf)
{
switch (to_sensor_dev_attr(attr)->index) {
- case 0:
+ case 0: {
struct mt7921_phy *phy = dev_get_drvdata(dev);
struct mt7921_dev *mdev = phy->dev;
int temperature;
@@ -72,6 +72,7 @@ static ssize_t mt7921_thermal_temp_show(struct device *dev,
return temperature;
/* display in millidegree Celcius */
return sprintf(buf, "%u\n", temperature * 1000);
+ }
default:
return -EINVAL;
}
> + default:
> + return -EINVAL;
> + }
> +}
> +static SENSOR_DEVICE_ATTR_RO(temp1_input, mt7921_thermal_temp, 0);
...
[email protected] writes:
> From: Ben Greear <[email protected]>
>
> Allow sensors tool to read radio's temperature, example:
>
> mt7921_phy17-pci-1800
> Adapter: PCI adapter
> temp1: +72.0°C
>
> Signed-off-by: Ben Greear <[email protected]>
Cosmetic issues in the title, there are two spaces after "mt7921:" and
no need for period at the end. This is the recommended style:
wifi: mt76: mt7921: Support temp sensor
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches