From patchwork Wed Jan 23 10:27:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Baltieri X-Patchwork-Id: 14244 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 6608523E00 for ; Wed, 23 Jan 2013 10:28:13 +0000 (UTC) Received: from mail-vc0-f172.google.com (mail-vc0-f172.google.com [209.85.220.172]) by fiordland.canonical.com (Postfix) with ESMTP id DECE9A1985C for ; Wed, 23 Jan 2013 10:28:12 +0000 (UTC) Received: by mail-vc0-f172.google.com with SMTP id l6so6555310vcl.3 for ; Wed, 23 Jan 2013 02:28:12 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=tdrQGfbF6QKz4P5wwVaduhp50+I1WGYctSorAHsWmQw=; b=fQyqlUqGzp9CpddTmmU4Lh7vU3TOfq8rRL0GKgzzWVOp4SEYx7gN16Or9EU4L2LMoY tnTJMAl1De7R+Oy/2+VX8fuMZ1JIGi9UJYLd05ToQh+zoMdZbp4wKb9biTJdNr+n/rH2 w042jGeMS32PkwMbmnMP1AtVAopTXyOcXw76n1OBzHXrS0japszQlzNP1v4HIwhRJmow H8KNOVs05igT5p5dhyuEhGmyNnfWGFWK6m0NcozhnDYUZSIDVCN6y5CYkKHdM/H5EWiE YH8lKavDUx4dQKhtuJXkS6KRL0D34eYWKSQ9qdnaiozPtHscerdWAIO+vhzxO+DSV69x l0Xg== X-Received: by 10.52.176.6 with SMTP id ce6mr621874vdc.57.1358936892313; Wed, 23 Jan 2013 02:28:12 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.58.145.101 with SMTP id st5csp2301veb; Wed, 23 Jan 2013 02:28:11 -0800 (PST) X-Received: by 10.180.20.198 with SMTP id p6mr26198325wie.19.1358936890764; Wed, 23 Jan 2013 02:28:10 -0800 (PST) Received: from mail-wi0-f172.google.com (mail-wi0-f172.google.com [209.85.212.172]) by mx.google.com with ESMTPS id fx5si6259067wib.87.2013.01.23.02.28.10 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 23 Jan 2013 02:28:10 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.172 is neither permitted nor denied by best guess record for domain of fabio.baltieri@linaro.org) client-ip=209.85.212.172; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.172 is neither permitted nor denied by best guess record for domain of fabio.baltieri@linaro.org) smtp.mail=fabio.baltieri@linaro.org Received: by mail-wi0-f172.google.com with SMTP id o1so544944wic.5 for ; Wed, 23 Jan 2013 02:28:10 -0800 (PST) X-Received: by 10.194.240.129 with SMTP id wa1mr1514824wjc.21.1358936890322; Wed, 23 Jan 2013 02:28:10 -0800 (PST) Received: from localhost ([2a01:2003:1:1e91:8e70:5aff:feac:ad8]) by mx.google.com with ESMTPS id hg17sm26118494wib.1.2013.01.23.02.28.03 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 23 Jan 2013 02:28:09 -0800 (PST) From: Fabio Baltieri To: Linus Walleij , Srinidhi Kasagar , linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, Maxime Coquelin , Fabio Baltieri Subject: [PATCH] ARM: mach-ux500: enable 128KB way L2 cache on DB8540 Date: Wed, 23 Jan 2013 11:27:58 +0100 Message-Id: <1358936878-29806-1-git-send-email-fabio.baltieri@linaro.org> X-Mailer: git-send-email 1.7.12.1 X-Gm-Message-State: ALoCoQnUgNaz1JwrXlTamD/SA5cDEyss+mu+yYMNlQDrbw5Nn61KXdvJ+L1g0hvumN47qTtudybc From: Maxime Coquelin DB8540 L2 was configured with 64KB way size, but it has 128KB as AP9540. Fix this by modifying ux500_l2x0_init() to use 128KB way size for all cpus in the x540 family. Signed-off-by: Maxime Coquelin Acked-by: Linus Walleij Signed-off-by: Fabio Baltieri --- arch/arm/mach-ux500/cache-l2x0.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-ux500/cache-l2x0.c b/arch/arm/mach-ux500/cache-l2x0.c index 75d5b51..1682dfe 100644 --- a/arch/arm/mach-ux500/cache-l2x0.c +++ b/arch/arm/mach-ux500/cache-l2x0.c @@ -46,8 +46,8 @@ static int __init ux500_l2x0_init(void) /* Unlock before init */ ux500_l2x0_unlock(); - /* DB9540's L2 has 128KB way size */ - if (cpu_is_u9540()) + /* DBx540's L2 has 128KB way size */ + if (cpu_is_ux540_family()) /* 128KB way size */ aux_val |= (0x4 << L2X0_AUX_CTRL_WAY_SIZE_SHIFT); else