From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_MUTT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 016AFC43381 for ; Sun, 24 Mar 2019 03:37:53 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BF25F217D8 for ; Sun, 24 Mar 2019 03:37:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="XuYtQVqB"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="K1rWmquY" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BF25F217D8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=G0E7NEuqr6G5aNHjl6RFxjm6kgb/8P9zyMkIvEhxxFU=; b=XuYtQVqBKvJs+g m2B7jYA6Z38JW1tH/Y1O3BZfv9o8m283wczw/BP8djCf3M6kILiOLfrmPtwSLytafVBlwywNL+5A6 d0TV+Rbv6VC1AJGvH25UDJuc0PJerrb1//oU3Zo0qAfs/b+xu6+T2X8rj1w1uG+juMSlcIi7+H2lr s1aua7hSAjC3s9nkKHltkztE4yf5ZzJfAHwYwWVwx8MJ/aR1lbqf1nfjtWTO9SgthknsPKlAmqbYN asWDY6EHyMn2cMMt3N/TZJMpq/xCVfHLbKG/S6zCc6hZkxBBJ+6ZDrwHeiPWegHOdHbybq+JncgHP L6ovvl6WNi5JnA+iDtOA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h7txE-00040u-EP; Sun, 24 Mar 2019 03:37:48 +0000 Received: from mail-pg1-x544.google.com ([2607:f8b0:4864:20::544]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h7txA-00040R-6g for linux-arm-kernel@lists.infradead.org; Sun, 24 Mar 2019 03:37:45 +0000 Received: by mail-pg1-x544.google.com with SMTP id l11so4104163pgq.10 for ; Sat, 23 Mar 2019 20:37:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=2ZdnWU8H1n2w3qlfjTQNLhGu3vhvAcS3owxVA/UeG0w=; b=K1rWmquYoIgE7cS6A4dxyE1I68p2TVMBOEeK0SY3ws5oo9juhJyujhrFJe0/LR9Cp/ vE7Vt5cOb7QUdoQkrX+XH9I99DsNNx8ZiNT6lgS+6B52lDx1eGOpBnaRl3SFyyzGsuLU EfCENTtIbJcHOmaQ+i0MXznQkJfTDkhlfeW5fM5xF/lUcdUUDRwVdgv8z19oSfoat68G tyi7H8p6pclfTAJGAZvuGa3fXW+Ht41YOeI1guYNVFCqsaW0yKHPRSXezzCrijMQZGZO 8/rqg1r/rhRJHF8DopTqJBKmzy0FPyIGEho3vLqRise+kPdQMIPrkw3OdrkbjwiIAez9 I5yA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=2ZdnWU8H1n2w3qlfjTQNLhGu3vhvAcS3owxVA/UeG0w=; b=ggXJkJS+SbYr4Q1Wdmez5Mh2ye0/iDuzG8oCrq7gzBYId7/OWb43M0VEPygxGTBLp9 ZXaH9mDVVnTjBeThpt2aGijrDqwW2XCSUraf7NeFZ0wziDM/Kbe77H9pMj+3+cpNwF55 FTGjtUoZliY0ZkLqZAZfTEA2HH41HyeAYiSs+ayQCkuNmnM1ia5+UpoXcwbBnhkRz3DY LCLAZ0thtTqpXCa9bua/Q6xp1WKaVT2zr5nE/8lwRGzzew8neCSEYJK8bApE4Sr5KlqP UqNOp1Gy36nQ8TgU2OM2bz+kbonLS01OFCSM9rkyU03bfD0lLwMRlJITBwf7ALxYjCLd lCQQ== X-Gm-Message-State: APjAAAWfMdGE4WNxAG0wPxeVzpnWmLIZS1P9OqOrJ/d8e7k9CCTQqJd8 GAMs28/H5mBWkbNDE2gH1DI= X-Google-Smtp-Source: APXvYqwosod2n0oiTyFxUlLhX8i3d1o9NhNcrAgvwyfQhGLpt0UjmX2pcnK1IpxGTs0h2B/08CY34Q== X-Received: by 2002:a17:902:2983:: with SMTP id h3mr18521320plb.332.1553398662944; Sat, 23 Mar 2019 20:37:42 -0700 (PDT) Received: from icarus ([2001:268:c0a4:5125:c70:4af9:86e2:2]) by smtp.gmail.com with ESMTPSA id i21sm15101081pfa.14.2019.03.23.20.37.36 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 23 Mar 2019 20:37:42 -0700 (PDT) Date: Sun, 24 Mar 2019 12:38:29 +0900 From: William Breathitt Gray To: Andy Shevchenko Subject: Re: [PATCH v10 10/10] thermal: intel: intel_soc_dts_iosf: Utilize for_each_set_clump8 macro Message-ID: <20190324033747.GA7697@icarus> References: <20190322190243.GA9224@smile.fi.intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20190322190243.GA9224@smile.fi.intel.com> User-Agent: Mutt/1.11.4 (2019-03-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190323_203744_272718_9381A239 X-CRM114-Status: GOOD ( 21.49 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arch@vger.kernel.org, yamada.masahiro@socionext.com, linus.walleij@linaro.org, linux@rasmusvillemoes.dk, linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, bgolaszewski@baylibre.com, akpm@linux-foundation.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, Mar 22, 2019 at 09:02:43PM +0200, Andy Shevchenko wrote: > On Thu, Mar 14, 2019 at 09:32:57PM +0900, William Breathitt Gray wrote: > > Utilize for_each_set_clump8 macro, and the bitmap_set_value8 and > > bitmap_get_value8 functions, where appropriate. In addition, remove the > > now unnecessary temp_mask and temp_shift members of the > > intel_soc_dts_sensor_entry structure. > > One comment below, otherwise > Tested-by: Andy Shevchenko > Thanks! Thank you for testing out the patch. I'll fix the bug your pointed out and add the Tested-by line. I have a couple minor comments below. > > > > > Cc: Andy Shevchenko > > Signed-off-by: William Breathitt Gray > > --- > > drivers/thermal/intel/intel_soc_dts_iosf.c | 29 +++++++++++++--------- > > drivers/thermal/intel/intel_soc_dts_iosf.h | 2 -- > > 2 files changed, 17 insertions(+), 14 deletions(-) > > > > diff --git a/drivers/thermal/intel/intel_soc_dts_iosf.c b/drivers/thermal/intel/intel_soc_dts_iosf.c > > index e0813dfaa278..b66f554670f7 100644 > > --- a/drivers/thermal/intel/intel_soc_dts_iosf.c > > +++ b/drivers/thermal/intel/intel_soc_dts_iosf.c > > @@ -15,6 +15,7 @@ > > > > #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > > > > +#include > > #include > > #include > > #include > > @@ -111,6 +112,7 @@ static int update_trip_temp(struct intel_soc_dts_sensor_entry *dts, > > { > > int status; > > u32 temp_out; > > + unsigned long update_ptps; > > u32 out; > > u32 store_ptps; > > u32 store_ptmc; > > @@ -129,8 +131,9 @@ static int update_trip_temp(struct intel_soc_dts_sensor_entry *dts, > > if (status) > > return status; > > > > - out = (store_ptps & ~(0xFF << (thres_index * 8))); > > - out |= (temp_out & 0xFF) << (thres_index * 8); > > + update_ptps = store_ptps; > > + bitmap_set_value8(&update_ptps, 32, temp_out & 0xFF, thres_index * 8); I chose to hardcode a bitmap width of 32 here because that is the width of the store_ptps variables, but I don't think we necessarily use all 32 bits here. Would the actual width of store_ptps be the number of writable trip count bits (writable_trip_count * 8)? > > + out = update_ptps; > > status = iosf_mbi_write(BT_MBI_UNIT_PMC, MBI_REG_WRITE, > > SOC_DTS_OFFSET_PTPS, out); > > if (status) > > @@ -232,6 +235,7 @@ static int sys_get_curr_temp(struct thermal_zone_device *tzd, > > u32 out; > > struct intel_soc_dts_sensor_entry *dts; > > struct intel_soc_dts_sensors *sensors; > > + unsigned long temp_raw; > > > > dts = tzd->devdata; > > sensors = dts->sensors; > > @@ -240,7 +244,8 @@ static int sys_get_curr_temp(struct thermal_zone_device *tzd, > > if (status) > > return status; > > > > - out = (out & dts->temp_mask) >> dts->temp_shift; > > + temp_raw = out; > > + out = bitmap_get_value8(&temp_raw, 32, dts->id * 8); Same question as above: what is the maximum bitmap width here if not 32? William Breathitt Gray > > out -= SOC_DTS_TJMAX_ENCODING; > > *temp = sensors->tj_max - out * 1000; > > > > @@ -290,10 +295,13 @@ static int add_dts_thermal_zone(int id, struct intel_soc_dts_sensor_entry *dts, > > { > > char name[10]; > > int trip_count = 0; > > + int writable_trip_count = 0; > > int trip_mask = 0; > > u32 store_ptps; > > int ret; > > - int i; > > + unsigned int i; > > + unsigned long trip; > > + unsigned long ptps; > > > > /* Store status to restor on exit */ > > ret = iosf_mbi_read(BT_MBI_UNIT_PMC, MBI_REG_READ, > > @@ -302,11 +310,10 @@ static int add_dts_thermal_zone(int id, struct intel_soc_dts_sensor_entry *dts, > > goto err_ret; > > > > dts->id = id; > > - dts->temp_mask = 0x00FF << (id * 8); > > - dts->temp_shift = id * 8; > > if (notification_support) { > > trip_count = min(SOC_MAX_DTS_TRIPS, trip_cnt); > > - trip_mask = BIT(trip_count - read_only_trip_cnt) - 1; > > + writable_trip_count = trip_count - read_only_trip_cnt; > > + trip_mask = GENMASK(writable_trip_count - 1, 0); > > } > > > > /* Check if the writable trip we provide is not used by BIOS */ > > @@ -315,11 +322,9 @@ static int add_dts_thermal_zone(int id, struct intel_soc_dts_sensor_entry *dts, > > if (ret) > > trip_mask = 0; > > else { > > - for (i = 0; i < trip_count; ++i) { > > - if (trip_mask & BIT(i)) > > - if (store_ptps & (0xff << (i * 8))) > > - trip_mask &= ~BIT(i); > > - } > > + ptps = store_ptps; > > + for_each_set_clump8(i, trip, ptps, writable_trip_count * 8) > > It seems you didn't notice gcc warnings, the ptps should be pointer, i.e. &ptps. > After changing here manually seems working. > > > + trip_mask &= ~BIT(i / 8); > > } > > dts->trip_mask = trip_mask; > > dts->trip_count = trip_count; > > diff --git a/drivers/thermal/intel/intel_soc_dts_iosf.h b/drivers/thermal/intel/intel_soc_dts_iosf.h > > index 625e37bf93dc..d0362d7acdef 100644 > > --- a/drivers/thermal/intel/intel_soc_dts_iosf.h > > +++ b/drivers/thermal/intel/intel_soc_dts_iosf.h > > @@ -33,8 +33,6 @@ struct intel_soc_dts_sensors; > > > > struct intel_soc_dts_sensor_entry { > > int id; > > - u32 temp_mask; > > - u32 temp_shift; > > u32 store_status; > > u32 trip_mask; > > u32 trip_count; > > -- > > 2.21.0 > > > > -- > With Best Regards, > Andy Shevchenko > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel