From patchwork Mon Sep 21 16:27:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 263621 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=-14.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, 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 EB710C43465 for ; Mon, 21 Sep 2020 16:54:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B56732076E for ; Mon, 21 Sep 2020 16:54:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600707287; bh=KuQ7WsiQdU7W+wsv5xwC3uJiGeKES0h4kXV6+8tt670=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=KiiBePHsONwFOpGwouQM0fkV3IbtYPg0xSYgdoIy+F65ah6q7lbhZZALESMM5O8oE afkyrhtBPLeruf5+nf+UPKRdabKnXxvCMJz6PzdNCen7orsKcZxHQr9NcTKRV8C78P 5X54odOjd1FBohLK9aWNn72gyulZiZ0dXtp7RFv4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728500AbgIUQqH (ORCPT ); Mon, 21 Sep 2020 12:46:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:52188 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726810AbgIUQqG (ORCPT ); Mon, 21 Sep 2020 12:46:06 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 84D1923788; Mon, 21 Sep 2020 16:46:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600706766; bh=KuQ7WsiQdU7W+wsv5xwC3uJiGeKES0h4kXV6+8tt670=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=y/tP1tpiZg15FcI6e5dg2Tjd8KZDKhzjf9+9fLRD42yIeFZaMpPJcQmyUqrxEiUwb ytABo8Wn/jFqElWMG1GKMppGX6PTNMuDtZuyAGb946CtysDyitlxLgDXvThgwFwhxn oPrfX8weu5rRapTdpsQ9jh4tr8Te/gipKnwyX6tY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Thomas Bogendoerfer , Sasha Levin Subject: [PATCH 5.8 058/118] MIPS: SNI: Fix MIPS_L1_CACHE_SHIFT Date: Mon, 21 Sep 2020 18:27:50 +0200 Message-Id: <20200921162039.045341333@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200921162036.324813383@linuxfoundation.org> References: <20200921162036.324813383@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Thomas Bogendoerfer [ Upstream commit 564c836fd945a94b5dd46597d6b7adb464092650 ] Commit 930beb5ac09a ("MIPS: introduce MIPS_L1_CACHE_SHIFT_") forgot to select the correct MIPS_L1_CACHE_SHIFT for SNI RM. This breaks non coherent DMA because of a wrong allocation alignment. Fixes: 930beb5ac09a ("MIPS: introduce MIPS_L1_CACHE_SHIFT_") Signed-off-by: Thomas Bogendoerfer Signed-off-by: Sasha Levin --- arch/mips/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index c43ad3b3cea4b..daa24f1e14831 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -876,6 +876,7 @@ config SNI_RM select I8253 select I8259 select ISA + select MIPS_L1_CACHE_SHIFT_6 select SWAP_IO_SPACE if CPU_BIG_ENDIAN select SYS_HAS_CPU_R4X00 select SYS_HAS_CPU_R5000