From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758557AbdJQEWK (ORCPT ); Tue, 17 Oct 2017 00:22:10 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:44267 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753175AbdJQEWI (ORCPT ); Tue, 17 Oct 2017 00:22:08 -0400 X-Google-Smtp-Source: AOwi7QBvMNfRBS8m40n6jgEGcPk6+doplOiOFgEWJDZlQ+Nsqv+DGlisq8GoA898aIEY3vW1nmrF2Q== Date: Mon, 16 Oct 2017 21:22:05 -0700 From: Eduardo Valentin To: Daniel Lezcano Cc: rui.zhang@intel.com, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, kevin.wangtao@linaro.org Subject: Re: [PATCH 08/25] thermal/drivers/hisi: Fix configuration register setting Message-ID: <20171017042204.GA6470@localhost.localdomain> References: <79a5f10c-0fb7-3e4f-caac-c1625904b137@linaro.org> <1507658570-32675-1-git-send-email-daniel.lezcano@linaro.org> <1507658570-32675-8-git-send-email-daniel.lezcano@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1507658570-32675-8-git-send-email-daniel.lezcano@linaro.org> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Oct 10, 2017 at 08:02:33PM +0200, Daniel Lezcano wrote: > The TEMP0_CFG configuration register contains different field to set up the > temperature controller. However in the code, nothing prevents a setup to > overwrite the previous one: eg. writing the hdak value overwrites the sensor > selection, the sensor selection overwrites the hdak value. > > In order to prevent such thing, use a regmap-like mechanism by reading the > value before, set the corresponding bits and write the result. > > Signed-off-by: Daniel Lezcano > --- > drivers/thermal/hisi_thermal.c | 34 +++++++++++++++++++++++++++++----- > 1 file changed, 29 insertions(+), 5 deletions(-) > > diff --git a/drivers/thermal/hisi_thermal.c b/drivers/thermal/hisi_thermal.c > index 8e8a117..5688556 100644 > --- a/drivers/thermal/hisi_thermal.c > +++ b/drivers/thermal/hisi_thermal.c > @@ -30,6 +30,8 @@ > #define TEMP0_TH (0x4) > #define TEMP0_RST_TH (0x8) > #define TEMP0_CFG (0xC) > +#define TEMP0_CFG_SS_MSK (0xF000) > +#define TEMP0_CFG_HDAK_MSK (0x30) > #define TEMP0_EN (0x10) > #define TEMP0_INT_EN (0x14) > #define TEMP0_INT_CLR (0x18) > @@ -132,19 +134,41 @@ static inline void hisi_thermal_enable(void __iomem *addr, int value) > writel(value, addr + TEMP0_EN); > } > > -static inline void hisi_thermal_sensor_select(void __iomem *addr, int sensor) > +static inline int hisi_thermal_get_temperature(void __iomem *addr) > { > - writel((sensor << 12), addr + TEMP0_CFG); > + return hisi_thermal_step_to_temp(readl(addr + TEMP0_VALUE)); > } > > -static inline int hisi_thermal_get_temperature(void __iomem *addr) > +/* > + * Temperature configuration register - Sensor selection > + * > + * Bits [19:12] > + * > + * 0x0: local sensor (default) > + * 0x1: remote sensor 1 (ACPU cluster 1) > + * 0x2: remote sensor 2 (ACPU cluster 0) > + * 0x3: remote sensor 3 (G3D) > + */ > +static inline void hisi_thermal_sensor_select(void __iomem *addr, int sensor) > { > - return hisi_thermal_step_to_temp(readl(addr + TEMP0_VALUE)); > + writel((readl(addr + TEMP0_CFG) & ~TEMP0_CFG_SS_MSK ) | ERROR: space prohibited before that close parenthesis ')' #135: FILE: drivers/thermal/hisi_thermal.c:154: + writel((readl(addr + TEMP0_CFG) & ~TEMP0_CFG_SS_MSK ) | > + (sensor << 12), addr + TEMP0_CFG); > } > > +/* > + * Temperature configuration register - Hdak conversion polling interval > + * > + * Bits [5:4] > + * > + * 0x0 : 0.768 ms > + * 0x1 : 6.144 ms > + * 0x2 : 49.152 ms > + * 0x3 : 393.216 ms > + */ > static inline void hisi_thermal_hdak_set(void __iomem *addr, int value) > { > - writel(value, addr + TEMP0_CFG); > + writel((readl(addr + TEMP0_CFG) & ~TEMP0_CFG_HDAK_MSK) | > + (value << 4), addr + TEMP0_CFG); > } > > static long hisi_thermal_get_sensor_temp(struct hisi_thermal_data *data, > -- > 2.7.4 >