From patchwork Tue Aug 30 13:55:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 12959396 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 76309ECAAD1 for ; Tue, 30 Aug 2022 13:56:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231395AbiH3N4N (ORCPT ); Tue, 30 Aug 2022 09:56:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49754 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229574AbiH3Nz2 (ORCPT ); Tue, 30 Aug 2022 09:55:28 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B839E760FE; Tue, 30 Aug 2022 06:55:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1661867724; x=1693403724; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=8ucy6GgoRbrs0dCrNuA2Jw8XuIgfl/kZE/4ajDL4eiQ=; b=Fu5YCTYGrlUliZ4owWy+yXcJ27vX22lB4OlD161wFmp8l5Qy3dCwFAI5 aq5UCNnm1fG3XAU5hf4tt4T81Ta7MXF9WU82uht+kG3pbxiixBhLJeQpj b24lbt+kA/IbCdGz83D1Mc3AWHhC65vpC0EJTeVTMMly9TPcY7tX9gPZc wtne+ZkytcZhKtqknLdxpw9dpX/3fWU4Fnl5OGYNH6ZCY0qBL1mwNBgCu ZNcKHQ1Wb62oMivm06twhL9eeFM+lMeqfrcM04/i6X+LhI1Bno4K3bGyF B30wKEsSFryyUHBL2ei71MDUICRgsh+jymkJBxQ5gx5R2XPv/cKJvVgS0 A==; X-IronPort-AV: E=McAfee;i="6500,9779,10455"; a="296455637" X-IronPort-AV: E=Sophos;i="5.93,275,1654585200"; d="scan'208";a="296455637" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Aug 2022 06:55:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,275,1654585200"; d="scan'208";a="857108290" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga006.fm.intel.com with ESMTP; 30 Aug 2022 06:55:20 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 37A8D174; Tue, 30 Aug 2022 16:55:34 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: "Rafael J. Wysocki" , Len Brown , Andy Shevchenko , Mika Westerberg Subject: [PATCH v1 1/2] ACPI: PMIC: Use sizeof() instead of hard coded value Date: Tue, 30 Aug 2022 16:55:31 +0300 Message-Id: <20220830135532.28992-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org It's better to use sizeof() of a given buffer than spreading a hard coded value. Signed-off-by: Andy Shevchenko Reviewed-by: Mika Westerberg --- drivers/acpi/pmic/intel_pmic_chtdc_ti.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/acpi/pmic/intel_pmic_chtdc_ti.c b/drivers/acpi/pmic/intel_pmic_chtdc_ti.c index 418eec523025..6c2a6da430ed 100644 --- a/drivers/acpi/pmic/intel_pmic_chtdc_ti.c +++ b/drivers/acpi/pmic/intel_pmic_chtdc_ti.c @@ -87,7 +87,7 @@ static int chtdc_ti_pmic_get_raw_temp(struct regmap *regmap, int reg) { u8 buf[2]; - if (regmap_bulk_read(regmap, reg, buf, 2)) + if (regmap_bulk_read(regmap, reg, buf, sizeof(buf))) return -EIO; /* stored in big-endian */ From patchwork Tue Aug 30 13:55:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 12959397 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2F8E1ECAAD1 for ; Tue, 30 Aug 2022 13:56:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230027AbiH3N4R (ORCPT ); Tue, 30 Aug 2022 09:56:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51998 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230509AbiH3Nzg (ORCPT ); Tue, 30 Aug 2022 09:55:36 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BD83A82D2A; Tue, 30 Aug 2022 06:55:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1661867732; x=1693403732; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ST8BWIGNQi7JwPA+iqczOtk6uPlOmHH+w14IA95KirY=; b=ZULwpNtYWEhNQ/9C45p8rMfAMgh/X5sywUgerfG51vtizv/rYnDaB1hV 1yLHzK5KyHzFtvdbzXvPEtyDMt8N484U+DTUKjyl0mZmriNCbbEyC4nxS GwlvCwpun+1ozxl3Xx+/cPFIOlTT4ApOxetoy0H9QOsCLy3wIgf0Hozs9 XJ819HP5dWw/ZWyDnmkzqcP5TN1J2CXFpxwoWlsVBoHslAejD2NunpvXR AndB5/rXXnvX9U1A71+kpasOxpS+ToYru8Ahhz6bL0vo9FSMiUlw3Q9Hq hOzLcBLDGCRYdKu/0z0+u+9AIrHOWq3ebapxyqsf8J5W6kGjLIYLo1pqk Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10455"; a="296455638" X-IronPort-AV: E=Sophos;i="5.93,275,1654585200"; d="scan'208";a="296455638" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Aug 2022 06:55:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,275,1654585200"; d="scan'208";a="857108291" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga006.fm.intel.com with ESMTP; 30 Aug 2022 06:55:20 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 4283AAD; Tue, 30 Aug 2022 16:55:35 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: "Rafael J. Wysocki" , Len Brown , Andy Shevchenko , Mika Westerberg Subject: [PATCH v1 2/2] ACPI: PMIC: Replace open coded be16_to_cpu() Date: Tue, 30 Aug 2022 16:55:32 +0300 Message-Id: <20220830135532.28992-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220830135532.28992-1-andriy.shevchenko@linux.intel.com> References: <20220830135532.28992-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org It's easier to understand the nature of a data type when it's written explicitly. With that, replace open coded endianess conversion. As a side effect it fixes the returned value of intel_crc_pmic_update_aux() since ACPI PMIC core code expects negative or zero and never uses positive one. While at it, use macros from bits.h to reduce a room for mistake. Signed-off-by: Andy Shevchenko Reported-by: kernel test robot --- drivers/acpi/pmic/intel_pmic_bytcrc.c | 24 ++++++++++++++++++------ drivers/acpi/pmic/intel_pmic_chtdc_ti.c | 13 +++++++++---- 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/drivers/acpi/pmic/intel_pmic_bytcrc.c b/drivers/acpi/pmic/intel_pmic_bytcrc.c index 9ea79f210965..af385cec69f1 100644 --- a/drivers/acpi/pmic/intel_pmic_bytcrc.c +++ b/drivers/acpi/pmic/intel_pmic_bytcrc.c @@ -6,14 +6,20 @@ */ #include +#include #include #include #include #include + +#include + #include "intel_pmic.h" #define PWR_SOURCE_SELECT BIT(1) +#define PMIC_REG_MASK GENMASK(9. 0) + #define PMIC_A0LOCK_REG 0xc5 static struct pmic_table power_table[] = { @@ -219,23 +225,29 @@ static int intel_crc_pmic_update_power(struct regmap *regmap, int reg, static int intel_crc_pmic_get_raw_temp(struct regmap *regmap, int reg) { - int temp_l, temp_h; + __be16 buf; /* * Raw temperature value is 10bits: 8bits in reg * and 2bits in reg-1: bit0,1 */ - if (regmap_read(regmap, reg, &temp_l) || - regmap_read(regmap, reg - 1, &temp_h)) + if (regmap_bulk_read(regmap, reg - 1, buf, sizeof(buf))) return -EIO; - return temp_l | (temp_h & 0x3) << 8; + return be16_to_cpu(buf) & PMIC_REG_MASK; } static int intel_crc_pmic_update_aux(struct regmap *regmap, int reg, int raw) { - return regmap_write(regmap, reg, raw) || - regmap_update_bits(regmap, reg - 1, 0x3, raw >> 8) ? -EIO : 0; + u16 mask = PMIC_REG_MASK; + __be16 buf; + + if (regmap_bulk_read(regmap, reg - 1, buf, sizeof(buf))) + return -EIO; + buf = cpu_to_be16((be16_to_cpu(buf) & ~mask) | (raw & mask)); + if (regmap_bulk_write(regmap, reg - 1, buf, sizeof(buf))) + return -EIO; + return 0; } static int intel_crc_pmic_get_policy(struct regmap *regmap, diff --git a/drivers/acpi/pmic/intel_pmic_chtdc_ti.c b/drivers/acpi/pmic/intel_pmic_chtdc_ti.c index 6c2a6da430ed..376bc80eb50a 100644 --- a/drivers/acpi/pmic/intel_pmic_chtdc_ti.c +++ b/drivers/acpi/pmic/intel_pmic_chtdc_ti.c @@ -8,12 +8,18 @@ */ #include +#include #include #include #include + +#include + #include "intel_pmic.h" /* registers stored in 16bit BE (high:low, total 10bit) */ +#define PMIC_REG_MASK GENMASK(9. 0) + #define CHTDC_TI_VBAT 0x54 #define CHTDC_TI_DIETEMP 0x56 #define CHTDC_TI_BPTHERM 0x58 @@ -73,7 +79,7 @@ static int chtdc_ti_pmic_get_power(struct regmap *regmap, int reg, int bit, if (regmap_read(regmap, reg, &data)) return -EIO; - *value = data & 1; + *value = data & BIT(0); return 0; } @@ -85,13 +91,12 @@ static int chtdc_ti_pmic_update_power(struct regmap *regmap, int reg, int bit, static int chtdc_ti_pmic_get_raw_temp(struct regmap *regmap, int reg) { - u8 buf[2]; + __be16 buf; if (regmap_bulk_read(regmap, reg, buf, sizeof(buf))) return -EIO; - /* stored in big-endian */ - return ((buf[0] & 0x03) << 8) | buf[1]; + return be16_to_cpu(buf) & PMIC_REG_MASK; } static const struct intel_pmic_opregion_data chtdc_ti_pmic_opregion_data = {