Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp2477161lqp; Sun, 24 Mar 2024 22:33:06 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCXXYUgzXoKAwbHwWGIPRmL0QIjVxHLYbCz67cAKRXN6BqKzbwzYVugvXGTl+IMwZREsRZN4UoADM2myENZ8W2hQ1oxR+IvbGyu5XSIfag== X-Google-Smtp-Source: AGHT+IFaY3zgamhnFUnfdDnhtlWY0GYj8ochQ0lfSWzk9i1IeYo/bQODD086sqV5gqfmZlO5qx2f X-Received: by 2002:a05:6a20:2589:b0:1a3:c38d:960c with SMTP id k9-20020a056a20258900b001a3c38d960cmr2444519pzd.3.1711344785876; Sun, 24 Mar 2024 22:33:05 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711344785; cv=pass; d=google.com; s=arc-20160816; b=mjlTZq59D/niewOxOfqicTWB05IgCSNwSOLabM7BoyLEqOFvthQF4dEOVC7U9AIvCh fq2Rh29SElEk7YaMvUgvlf8dJXLV1TNMk73Z8+EmYdAaZNRaDi+/Nu9REdMblEeiczt3 UTI9ueUFOfz6YDqmekemH/mNyUhwu0HYRkgg4KcIGSX7tgkC2m8Aw5p0SNQQbzGtDgz7 O1JIhKf/dp+P1eKz0MlZli/7c6L7/sV8HVIdgjEjmoHVkRcAszqNf0STfCcEJXVqwj+A 7WAlU8vVr6Gg7a+wRcygcwg6CP6R/ynJ3Xl4ozSJLDiSq2qADH0CDjUb06L6gz5Caxid vM2A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=3339GJEqVPvvBZI5TNVAjK2hdpTd/rEO+ll91fKCeac=; fh=r1WMkugsGxqamZ7PxJSEMgIPNU2PW7bIi8XBOy6Zr6E=; b=aX8ZGIDVdCegXAOxBb3vL8PcCCOIw0cWNZOuuyqLQalOM5/y2/lnOCnsCJ68R5HGSU 1O3jeuRohyOwvJFerex6ReQIwgL5BMc/zoyiLWrjGfsIuolbWcHIIpuYkfhdO58Eq4kq D+F+9xj1VXKg7K0/8eKvip5AuqunexTarsky9q4wzau1evdGWYGByu4F7zvJ3d9+6JqG TwMShGEgRwR95ShH/RRlaVOLYX6ktMYXiquuXRQncHPDlY2PPwJy/EUwEbY/27Rhbna3 1CYDKeSs6cYiBSevDYieOzTWqp/jQpJ4xUl1zOHtdfo5OrqbIt+wSjHgD41Oo63ZWC9+ 20Ow==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=CC34KpjX; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-113968-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-113968-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id om10-20020a17090b3a8a00b0029c70cfed3csi7316514pjb.40.2024.03.24.22.33.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Mar 2024 22:33:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-113968-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=CC34KpjX; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-113968-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-113968-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id C58BE2853C0 for ; Mon, 25 Mar 2024 05:32:24 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0D2BE21E347; Sun, 24 Mar 2024 23:11:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="CC34KpjX" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0935E1F1AC4; Sun, 24 Mar 2024 22:57:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711321079; cv=none; b=FmG2iOg3SjPYYigJkfiZgOkP4fu/EYoYgMg8qAIDOErHSRHgjo5ryL4itgtDtlAQLAZoXLIvjC04T3QxxV2DdU3J8EzuJvVcATY9YoBDbz5u7fZ7qFn/i6gNW/pEO0guIRIRB9WqY9eSmnHmrF+E5jlRcdrnh3DjF9scpi78CW8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711321079; c=relaxed/simple; bh=q9cK5+CVva2zWZ5121iREcxRFvY+SrqSNGS/pgZCZmo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XIXuwNPByV82tHvhVRw3Tw3qUq0RXrCVgodyY75ggieIVuho5KscM16dr4Hl/ug9y9CVoUb1J5iLAspnUX9qzp/yI6hJCco1PjtKYgCUqLEPbKem8IhK/BfFQ5DvjGBSxOuG+wCn/6DAN1aR4YFGIP7T+rHRxRUo4bMFd6AxVFE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=CC34KpjX; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3376AC43394; Sun, 24 Mar 2024 22:57:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711321077; bh=q9cK5+CVva2zWZ5121iREcxRFvY+SrqSNGS/pgZCZmo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CC34KpjXW3CE5xSHGcA7S3VyFU6Nhho72r+vDmJPob9LYLvW3TeKGiTY0Id5PKGv0 iNkHfsg8QjrSZlVrr8fTaEbqO8hWXyo+bUqmWp09MkKBjHnrcSdDLIrkZaNLvqFFnd O9TygAex69XkLcpZxdqEUwjJg3IBqY9m1AoTwCugA21TxXm8cJenG3ag2GfhlIk3ac 2g9bwMYyYc98zWLzob6vSdWE5S5iHyA+50tD0i5Sn8JsXIk9MxE5EzoxdEfib8fhxm +1Aj1oE8YG04kheWXG/gos4XS/yNCe2jZDL4ToYs/a84CrqSFdaGOxSHSucgSCuy1g BB7b5Iv/FXYuA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Peng Fan , Sascha Hauer , Daniel Lezcano , Sasha Levin Subject: [PATCH 6.7 641/713] thermal/drivers/qoriq: Fix getting tmu range Date: Sun, 24 Mar 2024 18:46:07 -0400 Message-ID: <20240324224720.1345309-642-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324224720.1345309-1-sashal@kernel.org> References: <20240324224720.1345309-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Peng Fan [ Upstream commit 4d0642074c67ed9928e9d68734ace439aa06e403 ] TMU Version 1 has 4 TTRCRs, while TMU Version >=2 has 16 TTRCRs. So limit the len to 4 will report "invalid range data" for i.MX93. This patch drop the local array with allocated ttrcr array and able to support larger tmu ranges. Fixes: f12d60c81fce ("thermal/drivers/qoriq: Support version 2.1") Tested-by: Sascha Hauer Signed-off-by: Peng Fan Signed-off-by: Daniel Lezcano Link: https://lore.kernel.org/r/20240226003657.3012880-1-peng.fan@oss.nxp.com Signed-off-by: Sasha Levin --- drivers/thermal/qoriq_thermal.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/thermal/qoriq_thermal.c b/drivers/thermal/qoriq_thermal.c index ccc2eea7f9f54..404f01cca4dab 100644 --- a/drivers/thermal/qoriq_thermal.c +++ b/drivers/thermal/qoriq_thermal.c @@ -57,6 +57,9 @@ #define REGS_TTRnCR(n) (0xf10 + 4 * (n)) /* Temperature Range n * Control Register */ +#define NUM_TTRCR_V1 4 +#define NUM_TTRCR_MAX 16 + #define REGS_IPBRR(n) (0xbf8 + 4 * (n)) /* IP Block Revision * Register n */ @@ -71,6 +74,7 @@ struct qoriq_sensor { struct qoriq_tmu_data { int ver; + u32 ttrcr[NUM_TTRCR_MAX]; struct regmap *regmap; struct clk *clk; struct qoriq_sensor sensor[SITES_MAX]; @@ -182,17 +186,17 @@ static int qoriq_tmu_calibration(struct device *dev, struct qoriq_tmu_data *data) { int i, val, len; - u32 range[4]; const u32 *calibration; struct device_node *np = dev->of_node; len = of_property_count_u32_elems(np, "fsl,tmu-range"); - if (len < 0 || len > 4) { + if (len < 0 || (data->ver == TMU_VER1 && len > NUM_TTRCR_V1) || + (data->ver > TMU_VER1 && len > NUM_TTRCR_MAX)) { dev_err(dev, "invalid range data.\n"); return len; } - val = of_property_read_u32_array(np, "fsl,tmu-range", range, len); + val = of_property_read_u32_array(np, "fsl,tmu-range", data->ttrcr, len); if (val != 0) { dev_err(dev, "failed to read range data.\n"); return val; @@ -200,7 +204,7 @@ static int qoriq_tmu_calibration(struct device *dev, /* Init temperature range registers */ for (i = 0; i < len; i++) - regmap_write(data->regmap, REGS_TTRnCR(i), range[i]); + regmap_write(data->regmap, REGS_TTRnCR(i), data->ttrcr[i]); calibration = of_get_property(np, "fsl,tmu-calibration", &len); if (calibration == NULL || len % 8) { -- 2.43.0