From 72ad36ce7e7933180893deff7c0496856b40a5fd Mon Sep 17 00:00:00 2001 From: Alexey Sheplyakov Date: Tue, 25 Jan 2022 17:55:03 +0400 Subject: [PATCH 615/631] hwmon: bt1-pvt: define pvt_readl/pvt_writel for Baikal-M SoC On Baikal-M Linux has to call into firmware (ARM-TF) to access PVT registers. Signed-off-by: Alexey Sheplyakov X-feature-Baikal-M --- drivers/hwmon/bt1-pvt.c | 23 +++++++++++++++++++++++ drivers/hwmon/bt1-pvt.h | 8 ++++++++ 2 files changed, 31 insertions(+) diff --git a/drivers/hwmon/bt1-pvt.c b/drivers/hwmon/bt1-pvt.c index 4668e9d10f0d..fa91be300c3b 100644 --- a/drivers/hwmon/bt1-pvt.c +++ b/drivers/hwmon/bt1-pvt.c @@ -30,6 +30,9 @@ #include #include #include +#ifdef CONFIG_ARM64 +#include +#endif #include "bt1-pvt.h" @@ -115,6 +118,7 @@ static const struct polynomial poly_N_to_volt = { }; +#ifdef BT1_PVT_DIRECT_REG_ACCESS static inline u32 pvt_readl(struct pvt_hwmon const *pvt, int reg) { return readl(pvt->regs + reg); } @@ -126,6 +130,25 @@ static inline u32 pvt_readl_relaxed(struct pvt_hwmon const *pvt, int reg) { static inline void pvt_writel(u32 data, struct pvt_hwmon const *pvt, int reg) { writel(data, pvt->regs + reg); } +#else +static inline u32 pvt_readl(struct pvt_hwmon const *pvt, int reg) { + struct arm_smccc_res res; + arm_smccc_smc(BAIKAL_SMC_PVT_ID, PVT_READ, pvt->pvt_id, reg, + 0, 0, 0, 0, &res); + return res.a0; +} + +static inline u32 pvt_readl_relaxed(struct pvt_hwmon const *pvt, int reg) { + return pvt_readl(pvt, reg); +} + +static inline void pvt_writel(u32 data, struct pvt_hwmon const *pvt, int reg) { + struct arm_smccc_res res; + arm_smccc_smc(BAIKAL_SMC_PVT_ID, PVT_WRITE, pvt->pvt_id, reg, + data, 0, 0, 0, &res); +} +#endif + static inline u32 pvt_update(struct pvt_hwmon *pvt, int reg, u32 mask, u32 data) { u32 old; diff --git a/drivers/hwmon/bt1-pvt.h b/drivers/hwmon/bt1-pvt.h index 93b8dd5e7c94..0cea95b01c13 100644 --- a/drivers/hwmon/bt1-pvt.h +++ b/drivers/hwmon/bt1-pvt.h @@ -101,6 +101,13 @@ # define PVT_TOUT_DEF 0 #endif +#define BAIKAL_SMC_PVT_ID 0x82000001 +#define PVT_READ 0 +#define PVT_WRITE 1 +#ifndef CONFIG_ARM64 +#define BT1_PVT_DIRECT_REG_ACCESS +#endif + /* * enum pvt_sensor_type - Baikal-T1 PVT sensor types (correspond to each PVT * sampling mode) @@ -217,6 +224,7 @@ struct pvt_hwmon { enum pvt_sensor_type sensor; struct pvt_cache cache[PVT_SENSORS_NUM]; ktime_t timeout; + int pvt_id; }; /* -- 2.35.2