linux-mips
[Top] [All Lists]

[PATCH v3 2/3] MIPS: update MIPS_L1_CACHE_SHIFT based on MIPS_L1_CACHE_S

To: linux-mips@linux-mips.org
Subject: [PATCH v3 2/3] MIPS: update MIPS_L1_CACHE_SHIFT based on MIPS_L1_CACHE_SHIFT_<N>
From: Florian Fainelli <f.fainelli@gmail.com>
Date: Mon, 13 Jan 2014 22:07:31 -0800
Cc: ralf@linux-mips.org, blogic@openwrt.org, jogo@openwrt.org, mbizon@freebox.fr, cernekee@gmail.com, dgcbueu@gmail.com, Florian Fainelli <florian@openwrt.org>
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/+jvGNO1klaHogczqwEspjv1/cceReyX+pw9WKrZfjw=; b=e4mA/FOXKGs1TaGnPH5t2nzbrXpPVVWzbK1fBHD03kEIw1lXwFmx/olSNVFIi56U2C 6CS7WDIKiEBdVjkR46iFNQpuRqpCulB0PTea8X84cKTWQmbO7SWwuwQeCwke+jAhMOaC ajncKwSXbxNwxxFPS3ZPq8tCqs1iMaK0Gqhv3eTntMtBci/yEIUaBv6E0VqrEiCctJ2O 52eLbt0ZilVbAtIg54cDxbTTbSCG67HxCxjQE56El5npd2YC5+SW5JSbsYMK/BsBfCaM 46Mk0keGT1zP8n25QkxVG5u7WBsvV8gbMnHBvsPHEEUJDyJb4IPHAuLpsHzQE7IkFsVc bXBQ==
In-reply-to: <1389679652-14269-1-git-send-email-f.fainelli@gmail.com>
List-archive: <http://www.linux-mips.org/archives/linux-mips/>
List-help: <mailto:ecartis@linux-mips.org?Subject=help>
List-id: linux-mips <linux-mips.eddie.linux-mips.org>
List-owner: <mailto:ralf@linux-mips.org>
List-post: <mailto:linux-mips@linux-mips.org>
List-software: Ecartis version 1.0.0
List-subscribe: <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips>
List-unsubscribe: <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips>
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <1389679652-14269-1-git-send-email-f.fainelli@gmail.com>
Sender: linux-mips-bounce@linux-mips.org
From: Florian Fainelli <florian@openwrt.org>

All platforms that require a special MIPS_L1_CACHE_SHIFT value have been
updated, such that we can now make MIPS_L1_CACHE_SHIFT default to the
appropriate integer value based on the select MIPS_L1_CACHE_SHIFT_<N>
variable.

Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
Changes since v2:
- rebased on top of john's mips-next-3.14

Changes since v1:
- keep order with MIPS_L1_CACHE_SHIFT_N
- add a default "5" to provide a safe default

 arch/mips/Kconfig | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 3b7a2be..68969d9 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1106,9 +1106,10 @@ config MIPS_L1_CACHE_SHIFT_7
 
 config MIPS_L1_CACHE_SHIFT
        int
-       default "4" if MACH_DECSTATION || MIKROTIK_RB532 || PMC_MSP4200_EVAL || 
SOC_RT288X
-       default "6" if MIPS_CPU_SCACHE
-       default "7" if SGI_IP22 || SGI_IP27 || SGI_IP28 || SNI_RM || 
CPU_CAVIUM_OCTEON
+       default "4" if MIPS_L1_CACHE_SHIFT_4
+       default "5" if MIPS_L1_CACHE_SHIFT_5
+       default "6" if MIPS_L1_CACHE_SHIFT_6
+       default "7" if MIPS_L1_CACHE_SHIFT_7
        default "5"
 
 config HAVE_STD_PC_SERIAL_PORT
-- 
1.8.3.2


<Prev in Thread] Current Thread [Next in Thread>