From patchwork Thu Feb 1 17:22:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Klimov X-Patchwork-Id: 13541492 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 02F7BC4828D for ; Thu, 1 Feb 2024 17:22:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=b0LUPPbLgmn4Gi+XJKogXnHPDa4SqTUPH/SjDt7NZr4=; b=ycZGtTayZMekxw xenWGIO3ys6zXuQDTSu3VX5wxSJqp6xwPF6q8LPmToDP89vLvcTH7w6X9WO8J4mhAK43Uv1JqRxEu L8d2q9u2HMJZv9O+S0RU8sfiYOblc0/jaa48+nf0CBhQjHftbsPhSnUjzi46BMRONDqdQpdh+W37f qrWacSUOVGC/D4NkraXYW5Xs2505/9oTkls2sY4PAY5F6PllZXhZvKviV7MYg4Q+EVO8a40J65s6U o1B/BJr3EC8ZAeDyjwVFjfuBpgIB9TPcePyhII/Mz/zNvo+XD1cY8HQhteGPmI+dyjqENtI+MOA7b 3/ah0ouGKWaGfbCltTOQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rValn-00000008m9R-2ieL; Thu, 01 Feb 2024 17:22:35 +0000 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rVali-00000008m5a-2l75 for linux-arm-kernel@lists.infradead.org; Thu, 01 Feb 2024 17:22:31 +0000 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-33b130f605eso715440f8f.1 for ; Thu, 01 Feb 2024 09:22:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1706808148; x=1707412948; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=655phT6p/xX4gabPq+CgbuzehrB6Qvw3RCd729athhY=; b=cwMLuTD93GhtTcYu2WV7eIJmgtvUkCflS/ErknbKVVEIR5Xq7Zsm3SpDsJ+G3wQi69 nZVZA/2x3hyZi9YQczVjun1nxHZS7N8/c2Qbvo3IwZRMQ/tzmqs7YqZnrtR+0ACTBgk4 dCH3xfdoYiQ3A+kQRrDgteAgsPH4DCdu2Fu1aV5YyK4DhjvFNPXWkvADdOZJX/UL9fy8 mfOi1hmPKC2mjj/APTSM/2Nw8V+gdwoPuHfKjLX3ruQ/T28UGsy0yxKRbiI5bozuhlXp /B7USKGarcz2othMjhgHIs//zywnh7mk9QI2EWWq5TRZimhb+RPNSbDk0XAf8smSHshZ xmNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706808148; x=1707412948; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=655phT6p/xX4gabPq+CgbuzehrB6Qvw3RCd729athhY=; b=UWFNbog7miTjWAAbtnwDJwyMNkofXPkkuILpnDQEEMdWuw8pkWMXHQAQfBBIuQ4lhr DpdJF3FJ8sMJ5R/KxQBKNXH6OXIV91h3zSl6JjSpGHHWmvpoOeGhyYHiN/L6C1FVXAFq sYjbxenIOsW9gE7BVCKJkccQ4kRZbGup6SAfgf6MYi4E05xGNp9Pk73/aiXzDvOOxMSC iPzuOj+H+rOx5ym2OBAnElPdle8yK4aQbp914r9fWHkZYVNxT42Dlso1GiBjyHX7rZVn wNLQ4firN/uU4zcWYNm0r2gQ+xClRExaPy63FcM+dw6WDG/q0AY4dKb/XkbgN1899F2w ZCkw== X-Gm-Message-State: AOJu0YxkO5+f2xKwuoykkJZw25S+WsVXrN0jBYh4QAqKhdvmqopeIgv0 iJy2xyHYVj9HO5oPiDkTrX5bXIgREBMDd+/pdeZB2+34K8gLz3TLjf6CClXD4EOwlxyXvYZIVeT zTPRRmA== X-Google-Smtp-Source: AGHT+IFOsiz899UMNmir60Feb50FhEcxnYz80YcKYleMfajNk/aqDsleyVRR78NvhALhRngCdU0V3w== X-Received: by 2002:adf:f590:0:b0:339:39ea:aaa3 with SMTP id f16-20020adff590000000b0033939eaaaa3mr4042470wro.54.1706808148176; Thu, 01 Feb 2024 09:22:28 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCUdrtxBDnY1A3xcSW6aLqqdnaZ61n5bIgrQUbPZtoaim07Ow3vHyyZM7skGO5J14mICRMK8c/V12CHhtfZnPhvhARkbATId9ksintnLX7edGzdXf0n0m+hwRVJ+fABZYnzWuHcFrxVq6D5Okm72XGhVO4ZTJQuUWlnkY9V3I1q7kiEN/h+QNnUgzwUUUKrT26bAYd0qzSvFpYjcUCHAfE+3Nly0aL3OMbUAOlvnhZgc5Cl9AFH2cYyLIgvIEJFSYmxYNNGlTIwYfNy6dDtj2BFnIJDlHnovmzTDwoD55AwIgfi9GH92V1Ibn+IFZd3U8s9FEz7fpqAbR7z3RFrw0O1l5MweKVBCIC7443Hxw8diGijYa05UCV4QCliR0W1McSSdYdYlCdl6JX8hU/Yvrmz74jao1Dk/BEaiF4XGe9NNpnpedjpot8YAJqydMOO8P+ME/LbWMuQ3YS8b2wcmvEKS556Epq3q5Kfwt90HwTHiUjHBftpZq8dLMmYhWMwlTHjKZdrSBmTVbSDSlWsm51XYoaorqwsdI/jMTcuyTgRoopkLOGogGhm8bxqECVH4Dp4= Received: from tux.Home ([2a02:c7c:7213:c700:e992:6869:474c:a63f]) by smtp.gmail.com with ESMTPSA id f15-20020a056000036f00b00337d84efaf7sm16733582wrf.74.2024.02.01.09.22.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Feb 2024 09:22:27 -0800 (PST) From: Alexey Klimov To: krzysztof.kozlowski@linaro.org, alim.akhtar@samsung.com, linux-samsung-soc@vger.kernel.org, semen.protsenko@linaro.org, peter.griffin@linaro.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, klimov.linux@gmail.com, kernel-team@android.com, tudor.ambarus@linaro.org, andre.draszik@linaro.org, saravanak@google.com, willmcvicker@google.com, arnd@arndb.de Subject: [PATCH 4/4] soc: samsung: exynos-chipid: fix revision calculation for gs101 Date: Thu, 1 Feb 2024 17:22:24 +0000 Message-ID: <20240201172224.574238-4-alexey.klimov@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240201172224.574238-1-alexey.klimov@linaro.org> References: <20240201172224.574238-1-alexey.klimov@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240201_092230_716927_A932400F X-CRM114-Status: GOOD ( 16.36 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The main revision for gs101 SoC is not reported in the CHIPID_REV register. The gs101 Product ID and revisions registers have a behaviour split between old Exynos SoCs and new SoCs. The sub-revision is reported in CHIPID_REV register in [19:16] bits but main revision is still present in Product ID [7:0]. To construct soc_info->revision correctly for gs101 the main_rev should not be reset from a value read from CHIPID_REV. Signed-off-by: Alexey Klimov --- drivers/soc/samsung/exynos-chipid.c | 20 ++++++++++++++++---- include/linux/soc/samsung/exynos-chipid.h | 1 + 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/drivers/soc/samsung/exynos-chipid.c b/drivers/soc/samsung/exynos-chipid.c index 7fee6094db12..3b952ffd8cf7 100644 --- a/drivers/soc/samsung/exynos-chipid.c +++ b/drivers/soc/samsung/exynos-chipid.c @@ -87,14 +87,26 @@ static int exynos_chipid_get_chipid_info(struct regmap *regmap, soc_info->product_id = val & EXYNOS_MASK; if (data->rev_reg != EXYNOS_CHIPID_REG_PRO_ID) { - ret = regmap_read(regmap, data->rev_reg, &val); + unsigned int val2; + + ret = regmap_read(regmap, data->rev_reg, &val2); if (ret < 0) return ret; + + if (data->main_rev_shift == 0) + main_rev = (val >> data->main_rev_shift) + & EXYNOS_REV_PART_MASK_GS101; + else + main_rev = (val2 >> data->main_rev_shift) + & EXYNOS_REV_PART_MASK; + + sub_rev = (val2 >> data->sub_rev_shift) & EXYNOS_REV_PART_MASK; + } else { + main_rev = (val >> data->main_rev_shift) & EXYNOS_REV_PART_MASK; + sub_rev = (val >> data->sub_rev_shift) & EXYNOS_REV_PART_MASK; } - main_rev = (val >> data->main_rev_shift) & EXYNOS_REV_PART_MASK; - sub_rev = (val >> data->sub_rev_shift) & EXYNOS_REV_PART_MASK; - soc_info->revision = (main_rev << EXYNOS_REV_PART_SHIFT) | sub_rev; + soc_info->revision = (main_rev << EXYNOS_REV_PART_SHIFT) | sub_rev; return 0; } diff --git a/include/linux/soc/samsung/exynos-chipid.h b/include/linux/soc/samsung/exynos-chipid.h index 62f0e2531068..1eb13068f513 100644 --- a/include/linux/soc/samsung/exynos-chipid.h +++ b/include/linux/soc/samsung/exynos-chipid.h @@ -10,6 +10,7 @@ #define EXYNOS_CHIPID_REG_PRO_ID 0x00 #define EXYNOS_REV_PART_MASK 0xf +#define EXYNOS_REV_PART_MASK_GS101 0xff #define EXYNOS_REV_PART_SHIFT 4 #define EXYNOS_MASK 0xfffff000