From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C25E0C433FF for ; Wed, 14 Aug 2019 02:11:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8C8BB214C6 for ; Wed, 14 Aug 2019 02:11:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565748685; bh=tp/TihEb7M9Z4ZC/KrwWjm0E5mpt+2qt7/njaZiu8yg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=zU3x4Q8Sktq/IbxPTj4ohjge4w3Wa1iKEN1oLAadJaIzllKX+KJirmJDSD9gQ8W0v fUmH8xfELTpi+fvaLwZZl1BhJxvcdkIsBRQBoWhX1Byk5fgbNwyWS6ijot+6FEvRDr k+nvhqDE6RlrYD+WSyxNa9lFRkA2VRWV3rg4In/U= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727411AbfHNCLY (ORCPT ); Tue, 13 Aug 2019 22:11:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:43620 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727333AbfHNCLX (ORCPT ); Tue, 13 Aug 2019 22:11:23 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1C87C20844; Wed, 14 Aug 2019 02:11:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565748682; bh=tp/TihEb7M9Z4ZC/KrwWjm0E5mpt+2qt7/njaZiu8yg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bq0ODtPHzagId2SqTIK0FZ2DQgwqgOWZRfsDP4XTP21zXNKmTtODInCobS8FHZLzF /w1pM/dGPLlGaO327xFvwpibvUFNY1/AowHQVcVUtbq/ghrSOO8OvvX/RJxQYNE1NC iGr8pjZOS8f7m75sh7LacLrEcEkXl5Z7G/QZBPzM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Vladimir Kondratiev , Paul Burton , Ralf Baechle , James Hogan , linux-mips@vger.kernel.org, Sasha Levin Subject: [PATCH AUTOSEL 5.2 019/123] mips: fix cacheinfo Date: Tue, 13 Aug 2019 22:09:03 -0400 Message-Id: <20190814021047.14828-19-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190814021047.14828-1-sashal@kernel.org> References: <20190814021047.14828-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-mips-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org From: Vladimir Kondratiev [ Upstream commit b8bea8a5e5d942e62203416ab41edecaed4fda02 ] Because CONFIG_OF defined for MIPS, cacheinfo attempts to fill information from DT, ignoring data filled by architecture routine. This leads to error reported cacheinfo: Unable to detect cache hierarchy for CPU 0 Way to fix this provided in commit fac51482577d ("drivers: base: cacheinfo: fix x86 with CONFIG_OF enabled") Utilize same mechanism to report that cacheinfo set by architecture specific function Signed-off-by: Vladimir Kondratiev Signed-off-by: Paul Burton Cc: Ralf Baechle Cc: James Hogan Cc: linux-mips@vger.kernel.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Sasha Levin --- arch/mips/kernel/cacheinfo.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/mips/kernel/cacheinfo.c b/arch/mips/kernel/cacheinfo.c index e0dd66881da68..f777e44653d57 100644 --- a/arch/mips/kernel/cacheinfo.c +++ b/arch/mips/kernel/cacheinfo.c @@ -69,6 +69,8 @@ static int __populate_cache_leaves(unsigned int cpu) if (c->tcache.waysize) populate_cache(tcache, this_leaf, 3, CACHE_TYPE_UNIFIED); + this_cpu_ci->cpu_map_populated = true; + return 0; } -- 2.20.1