Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp3296239pxk; Mon, 21 Sep 2020 09:57:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwMZWD0LmHbKQkv9oq+peDshUZCwK2Y33VtaWobabJYInJarZ6yBALlJafkhuVHo6GIDygP X-Received: by 2002:a17:906:850e:: with SMTP id i14mr398756ejx.168.1600707476160; Mon, 21 Sep 2020 09:57:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600707476; cv=none; d=google.com; s=arc-20160816; b=RahTIxK9a5Rckou7en3ErmzEJzxR5z641nkXm26glMuePLwTkyS+R1pwhkDoW+VDZK Aj8QSdP/YZjY3lB0yMkDCCvM2VpGVkJwjMyGsBhJt3BpIPMeJSnRVdjmmRguFfIzVCVh 6W1mTXSD57Slj9RiITBxgXN6+TUuwAE2KG9S2hvgnDNWqhiLLHfoCRI3IL36gue8n46Y I7yTqFORJvZJpzrpriRFR7T5Jd1SGG120AIhhistkHN5FGif/Yy6YzNnv7ww6mxpCPzr i1d1y+DeQOx8Fq22wAupfcvQAAyUrZ2bnFPPzDXcRsSVv4atRHIsLLl5J5pt3Ctjj4Ld P1vg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=tnCE6Zvu0D/c+Pcivwf3XiWUuF1nOTqGWNr9cXn35Gg=; b=MwwzpS5jEVR9/i5hBHsF99O1tMysMTe8TjFmVrVMBJ+gCGEmOerirZ0OGU8RgsfHNK MusuvQV4s8j8qiqhpPA5W0xx8WIsCBg6Qok5hBG8G8SgilHY9j66416v6w8WpOUVjr/f DTM2P0Dreu9QTBXd4baV7GvDN69q/1Q9eqiHkrHdUHx7ogP0Et1/lNdhh/ye4b3X293R /KtjSerfxiNQroa0euZRgQ8es1UEiEMp6Fm3j18G65JDP2HDaJlh+vjjtytAXLFTt9QB lhdcypRCN1pLqJq/YTWoP+vkaya70YHJFWsCDWJe3hTSfaqjV7ykIMW5dv0jPAqtQV5/ 6+Rg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="y/tP1tpi"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b26si3680737edu.250.2020.09.21.09.57.32; Mon, 21 Sep 2020 09:57:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="y/tP1tpi"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729369AbgIUQqH (ORCPT + 99 others); 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 -- 2.25.1