From patchwork Tue Dec 12 22:25:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Neri X-Patchwork-Id: 13490067 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 F1174C4332F for ; Tue, 12 Dec 2023 22:24:18 +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:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id: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=6t972eOu6zyLiQPAhUyQpHkev85p6ofa3lUbJxnGmGU=; b=xQrBC8VYJzNuCg kFEJhyj74UKERy6EN0h85GeVdkOUItKog/7lF+ZtfrL60GPicn+rqqoTumC/b0krPpTu8loOwI153 JXzofTV+5hNs8y0M6kjHuNW/gXDbPnd4/iTIleSbg1pSrGOma9+hpiVntNiJE8dDQ+9M5YN+a8ThP dQwrlhL9+ZJuc1l3RgsB0kfeMEfYqN8clkFr+KDVh2i4Ej86SKlW2t68efPyC8XeHqNqHzjp/6+rl PvIc6OUqraCkZVHI4aX5kV98u/fSgVsAk/fZmexcZO0rxnsdH1Z3Kxa6WuKsjNyWPwW7Xg8hjfawA 0EJu+wCn6hM/i/F2YIMg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rDBAI-00CvDD-09; Tue, 12 Dec 2023 22:23:46 +0000 Received: from mgamail.intel.com ([192.198.163.10]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rDBAC-00Cv9R-18 for linux-arm-kernel@lists.infradead.org; Tue, 12 Dec 2023 22:23:41 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1702419820; x=1733955820; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=JjzpfRR25ptOiQcPUOjeLG2ZsPBSBKfEfUSAHzk+JdM=; b=Xw5Mnkee4gYjOyNcmhlVGHfvrHfPFB3jlRU/brnOVAZJMt1eDZFanGP+ 0u2eRqD3fKiPui+Z7Of8V0MDNCEjRdGMh1+77v3T7ReUH1qUN4SshHVvg G1uZ7E1IaHKNdGXawAezw23wxVPZ24ZmzMAqzKQDy5CW1HgYYdK2V5Ey1 tZiuoCiTWluGDH2zp8EZgH8zUZvsdi2VWeh3oWJnSF7EyyuYsV4MjgnJ+ SO5V+shkx0YqwCo3wkmS0/i9Ln5X1vEMe16szRHnpyy1sblDyKYMed1jp jtvwsa9PA2M0qw5CMnVKeCJH45CS1HVx6XY8VnSCmZfOkSDV80PB5NEEt w==; X-IronPort-AV: E=McAfee;i="6600,9927,10922"; a="2049326" X-IronPort-AV: E=Sophos;i="6.04,271,1695711600"; d="scan'208";a="2049326" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmvoesa104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Dec 2023 14:23:37 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10922"; a="802631196" X-IronPort-AV: E=Sophos;i="6.04,271,1695711600"; d="scan'208";a="802631196" Received: from ranerica-svr.sc.intel.com ([172.25.110.23]) by orsmga008.jf.intel.com with ESMTP; 12 Dec 2023 14:23:37 -0800 From: Ricardo Neri To: x86@kernel.org Cc: Andreas Herrmann , Catalin Marinas , Chen Yu , Len Brown , Radu Rendec , Pierre Gondois , Pu Wen , "Rafael J. Wysocki" , Sudeep Holla , Srinivas Pandruvada , Will Deacon , Zhang Rui , Huang Ying , "Ravi V. Shankar" , stable@vger.kernel.org, linux-kernel@vger.kernel.org, Ricardo Neri , linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 4/4] x86/cacheinfo: Clean out init_cache_level() Date: Tue, 12 Dec 2023 14:25:19 -0800 Message-Id: <20231212222519.12834-5-ricardo.neri-calderon@linux.intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231212222519.12834-1-ricardo.neri-calderon@linux.intel.com> References: <20231212222519.12834-1-ricardo.neri-calderon@linux.intel.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231212_142340_429151_E92A1CDC X-CRM114-Status: GOOD ( 10.41 ) 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: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org init_cache_level() no longer has a purpose on x86. It no longer needs to set num_leaves, and it never had to set num_levels, which was unnecessary on x86. Replace it with "return 0" simply to override the weak function, which would return an error. Cc: Andreas Herrmann Cc: Catalin Marinas Cc: Chen Yu CC: Huang Ying Cc: Len Brown Cc: Radu Rendec Cc: Pierre Gondois Cc: Pu Wen Cc: "Rafael J. Wysocki" Cc: Sudeep Holla Cc: Srinivas Pandruvada Cc: Will Deacon Cc: Zhang Rui Cc: linux-arm-kernel@lists.infradead.org Cc: stable@vger.kernel.org Reviewed-by: Len Brown Signed-off-by: Ricardo Neri --- Changes since v3: * Rebased on v6.7-rc5. Changes since v2: * None Changes since v1: * Introduced this patch. --- arch/x86/kernel/cpu/cacheinfo.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/arch/x86/kernel/cpu/cacheinfo.c b/arch/x86/kernel/cpu/cacheinfo.c index 4125e53a5ef7..1cfe0921ac67 100644 --- a/arch/x86/kernel/cpu/cacheinfo.c +++ b/arch/x86/kernel/cpu/cacheinfo.c @@ -1002,11 +1002,6 @@ static void ci_leaf_init(struct cacheinfo *this_leaf, int init_cache_level(unsigned int cpu) { - struct cpu_cacheinfo *this_cpu_ci = get_cpu_cacheinfo(cpu); - - if (!this_cpu_ci) - return -EINVAL; - this_cpu_ci->num_levels = 3; return 0; }