From patchwork Tue Aug 27 07:49:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 11116273 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3EF4914DB for ; Tue, 27 Aug 2019 08:11:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1DC8F2173E for ; Tue, 27 Aug 2019 08:11:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566893488; bh=vRZy479767kYTIzX9SBMWkovtJFmbdfeRbCf0+4l3c0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=HWmFxChTvxvlygeU3aKAwDDmCNB9EOr9c3sDirf78CTs/NOa3keY7FvfhN7+OxhpL IpIcyDUcu+TU2s2w0GhKVooduKCkdArjzvOFdLgpnfQozIGLkx1zMGr/45QdixjskG Dd1I5tWYxGE+CX8tAhAnqmyf9Y+myBh9uFgRtbdc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730546AbfH0IBK (ORCPT ); Tue, 27 Aug 2019 04:01:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:56936 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731189AbfH0IBJ (ORCPT ); Tue, 27 Aug 2019 04:01:09 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3C7FD2186A; Tue, 27 Aug 2019 08:01:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566892868; bh=vRZy479767kYTIzX9SBMWkovtJFmbdfeRbCf0+4l3c0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=11H/nDAmZPSsWv6bjEyBo94KxIXC5oShvg0gyrHjf6GrtFs483izqsVEaazlmv94t N1AZpdjGyl3mfd4TSGZ0ikc44vI/dzkAdeI4zllbACIvvUzsWqmJClc5UvN8sxyF1g a/sLcFwkKsVPbC7l7x4Opu5LWz3bpGACi7EKE2K8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vladimir Kondratiev , Paul Burton , Ralf Baechle , James Hogan , linux-mips@vger.kernel.org, Sasha Levin Subject: [PATCH 5.2 015/162] mips: fix cacheinfo Date: Tue, 27 Aug 2019 09:49:03 +0200 Message-Id: <20190827072738.866866739@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190827072738.093683223@linuxfoundation.org> References: <20190827072738.093683223@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-mips-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org [ 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; }