From patchwork Tue Jan 24 15:40:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Gondois X-Patchwork-Id: 47753 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2241495wrn; Tue, 24 Jan 2023 08:16:57 -0800 (PST) X-Google-Smtp-Source: AMrXdXsF7tXDERzSMLAg6mxb8TIm201ZPfpOXWn+Hzl/0xFuFYLl5I/3bWXuMEaynh6xpy7UqNCb X-Received: by 2002:a17:906:80cd:b0:86d:b50f:6b00 with SMTP id a13-20020a17090680cd00b0086db50f6b00mr28049974ejx.43.1674577017192; Tue, 24 Jan 2023 08:16:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674577017; cv=none; d=google.com; s=arc-20160816; b=mQNeSNVgJ0lVP79qrHr0LvUvlWnoq7RGn/PhCeNiUQy/oClvjrAHwGIxjBtZnmDV/P E+XviszWS94SsD+WhuYj91NrM5ofTY2d2v6zXJXRrnSyGtZah1Lwja1gDmdlGJlY9JZL 4hsCeWH2xScqaUPhs7hJLLvHtN1trTvb+e/D5VkPOhMW5lufPNrevfSXBUc9xCgDIwpe NDMlUJe1awE8DLJKvWZMz3j7N2h4Nx+eVioRzuABfmqocMe1YMG+3Y0XausUfuA2/cJQ PDowuQqH2dQb0ZFQIctUdJpg6gP30b1sKwLZuMC5dI8BUICSHvLT1LgXl+Es2U2hnbjs yIfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=YRSoVPsyUsPatWUNHNPXVj2c8/Nds+pKyTV9O1rOqRs=; b=DdVuMuyhKWdhkcB2l/PNeLtHjtsIzlCH7JRHBXT6wpMzqbO5EkbcKlVQ4rMBj2U9uO XbZPWpvzbv2VH70znsR308yK6BWT/zeF+aJ3BNHPBx6cUSA8cqXIdueca1rNkLuoAm3c 5E96WMxs9qu/fuo1YjrzXPbdkeuN1ttrxmcitr19X1vzQLHIb1QOWqF0yGDe/t7VlQrD Peu+qK4HKOTybUlz5+oK7bu40PeEvxkztXWi+kmQ2/iDGmC+QxQEt4r7FEm9V+waJ3g2 T2ZgLKork6ZLcHfj3cgpJoIY4dDF+qaljiB0R1A40V3/JaCZSugAeeIEGUeGu25X9p3r m3pg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 24-20020a170906101800b0086f3e470d23si2898150ejm.723.2023.01.24.08.16.32; Tue, 24 Jan 2023 08:16:57 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235348AbjAXPly (ORCPT + 99 others); Tue, 24 Jan 2023 10:41:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53024 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235298AbjAXPlc (ORCPT ); Tue, 24 Jan 2023 10:41:32 -0500 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 4662748A32 for ; Tue, 24 Jan 2023 07:41:23 -0800 (PST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B66AE4B3; Tue, 24 Jan 2023 07:42:04 -0800 (PST) Received: from cam-smtp0.cambridge.arm.com (pierre123.nice.arm.com [10.34.100.128]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id E9F893F5A1; Tue, 24 Jan 2023 07:41:20 -0800 (PST) From: Pierre Gondois To: linux-kernel@vger.kernel.org Cc: Geert Uytterhoeven , Conor Dooley , Dan Carpenter , Pierre Gondois , Catalin Marinas , Will Deacon , Greg Kroah-Hartman , "Rafael J. Wysocki" , Sudeep Holla , Akihiko Odaki , Palmer Dabbelt , Gavin Shan , linux-arm-kernel@lists.infradead.org Subject: [PATCH -next v2 2/3] cacheinfo: Make default acpi_get_cache_info() return an error Date: Tue, 24 Jan 2023 16:40:47 +0100 Message-Id: <20230124154053.355376-3-pierre.gondois@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230124154053.355376-1-pierre.gondois@arm.com> References: <20230124154053.355376-1-pierre.gondois@arm.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755921270427906287?= X-GMAIL-MSGID: =?utf-8?q?1755921270427906287?= commit bd500361a937 ("ACPI: PPTT: Update acpi_find_last_cache_level() to acpi_get_cache_info()") updates the prototype of acpi_get_cache_info(). The cache 'levels' is update through a pointer and not the return value of the function. If CONFIG_ACPI_PPTT is not defined, acpi_get_cache_info() doesn't update its *levels and *split_levels parameters and returns 0. This can lead to a faulty behaviour. Make acpi_get_cache_info() return an error code if CONFIG_ACPI_PPTT is not defined. Also, In init_cache_level(), if no PPTT is present or CONFIG_ACPI_PPTT is not defined, instead of aborting if acpi_get_cache_info() returns an error code, just continue. This allows to try fetching the cache information from clidr_el1. Signed-off-by: Pierre Gondois --- arch/arm64/kernel/cacheinfo.c | 2 +- include/linux/cacheinfo.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kernel/cacheinfo.c b/arch/arm64/kernel/cacheinfo.c index d3fe9542c370..bf348b8d321f 100644 --- a/arch/arm64/kernel/cacheinfo.c +++ b/arch/arm64/kernel/cacheinfo.c @@ -59,7 +59,7 @@ int init_cache_level(unsigned int cpu) } else { ret = acpi_get_cache_info(cpu, &fw_level, NULL); if (ret < 0) - return ret; + fw_level = 0; } if (fw_level < 0) diff --git a/include/linux/cacheinfo.h b/include/linux/cacheinfo.h index dfef57077cd0..908e19d17f49 100644 --- a/include/linux/cacheinfo.h +++ b/include/linux/cacheinfo.h @@ -100,7 +100,7 @@ static inline int acpi_get_cache_info(unsigned int cpu, unsigned int *levels, unsigned int *split_levels) { - return 0; + return -ENOENT; } #else int acpi_get_cache_info(unsigned int cpu,