From patchwork Fri May 8 12:30:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 226062 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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 76437C47247 for ; Fri, 8 May 2020 13:24:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4ACC824987 for ; Fri, 8 May 2020 13:24:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588944274; bh=tlN6HRNqgl/D19qLWJqs7D5lNc+/y7fQd8JarpZtVfI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=XFacqNd62Q5O4alXS2aoz2Pvlx8FRm7Zy/s7moyu4yCZRmri3sv/qeMqQVng0cfdz piht+VXxpy25J59F7K92q4BkFR+UPCCxCDU51s90mnIyoFf/qj064PSxdX3Lc8dW2V IUih8rQF2GoXDm7WiV6uQkJaBMi7ydxEPQLQyuBo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727821AbgEHMgd (ORCPT ); Fri, 8 May 2020 08:36:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:49852 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727819AbgEHMgc (ORCPT ); Fri, 8 May 2020 08:36:32 -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 D32B721582; Fri, 8 May 2020 12:36:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588941392; bh=tlN6HRNqgl/D19qLWJqs7D5lNc+/y7fQd8JarpZtVfI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=l9fAS4nhncjyedgqFQBbZocNhphmxCSaQ6lmPihe7PDHtk6m10rE4r60yV3qnnDav dZrQJFyxmznIVMnmV4G6K9NPnmDtjUHxtV1xNV1wUW6f2imiQtPuiSRBKabCqSqntY gDtccXcC9rp4YmjI8HZlQFNezDmWyTwLxKixQYtY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Florian Fainelli , linux-mips@linux-mips.org, Ralf Baechle Subject: [PATCH 4.4 014/312] MIPS: BMIPS: BMIPS5000 has I cache filing from D cache Date: Fri, 8 May 2020 14:30:05 +0200 Message-Id: <20200508123125.503268790@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200508123124.574959822@linuxfoundation.org> References: <20200508123124.574959822@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Florian Fainelli commit c130d2fd3d59fbd5d269f7d5827bd4ed1d94aec6 upstream. BMIPS5000 and BMIPS52000 processors have their I-cache filling from the D-cache. Since BMIPS_GENERIC does not provide (yet) a cpu-feature-overrides.h file, this was not set anywhere, so make sure the R4K cache detection takes care of that. Fixes: d74b0172e4e2c ("MIPS: BMIPS: Add special cache handling in c-r4k.c") Signed-off-by: Florian Fainelli Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/13010/ Signed-off-by: Ralf Baechle Signed-off-by: Greg Kroah-Hartman --- arch/mips/mm/c-r4k.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/arch/mips/mm/c-r4k.c +++ b/arch/mips/mm/c-r4k.c @@ -1308,6 +1308,10 @@ static void probe_pcache(void) c->icache.flags |= MIPS_CACHE_IC_F_DC; break; + case CPU_BMIPS5000: + c->icache.flags |= MIPS_CACHE_IC_F_DC; + break; + case CPU_LOONGSON2: /* * LOONGSON2 has 4 way icache, but when using indexed cache op,