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=-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 0332FC43468 for ; Mon, 21 Sep 2020 16:34:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AEA4423998 for ; Mon, 21 Sep 2020 16:34:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600706042; bh=viQ5MaISis8I6/xy5sUsHEfiaQ4pyLWi8QwrFpDJ/R4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=F39mmXM6b06jqmmW/ZUZR0U+Jx9plozkc6IpzVNEUwI9NXTHChNXxz/adFkfLVAJs vfPNaw4LPK7cVyDk6X/VFDfD2CMN3wjZOl7axpkSgd2rcBbY/P70hxkTwmzLdhqCC4 woBXd1gK+ktzns2b/sSOdLPUx5Hr3W6dBb9XhF/c= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728154AbgIUQdv (ORCPT ); Mon, 21 Sep 2020 12:33:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:59998 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728626AbgIUQdj (ORCPT ); Mon, 21 Sep 2020 12:33:39 -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 E6CDB239A1; Mon, 21 Sep 2020 16:33:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600706019; bh=viQ5MaISis8I6/xy5sUsHEfiaQ4pyLWi8QwrFpDJ/R4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XvdC1r5keWHmDL5hC5T6e2MUp1VxIL2q0fCTQqoeGhB+PwZ2d5/MYSbpCrTt/Wi7p Prm6klLkNoYhmC1TEy1nEr/7KvUbzqYSMusAQLMdf9KVbRgDVGGPSgBqdUkV95Oshx uv+PcjukSETO1agBWaTqXkIlvzWVnGltCW0xu3no= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Thomas Bogendoerfer , Sasha Levin Subject: [PATCH 4.4 35/46] MIPS: SNI: Fix MIPS_L1_CACHE_SHIFT Date: Mon, 21 Sep 2020 18:27:51 +0200 Message-Id: <20200921162034.903672025@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200921162033.346434578@linuxfoundation.org> References: <20200921162033.346434578@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 596cbda9cb3d3..9d8bc19edc48e 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -817,6 +817,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