From patchwork Mon Jul 30 11:58:20 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Vorontsov X-Patchwork-Id: 10369 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 992CB23E02 for ; Mon, 30 Jul 2012 12:02:05 +0000 (UTC) Received: from mail-yw0-f52.google.com (mail-yw0-f52.google.com [209.85.213.52]) by fiordland.canonical.com (Postfix) with ESMTP id 69362A18AD2 for ; Mon, 30 Jul 2012 12:02:05 +0000 (UTC) Received: by mail-yw0-f52.google.com with SMTP id p61so4596899yhp.11 for ; Mon, 30 Jul 2012 05:02:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=E9yTu11wNKpaH4QPZsA1FdZoIal2QGv6XbGSEqSob7c=; b=K6TKD729z1y0yqiuBAOYjslyQc7J63xo4jzbypAs7aXIu1Q0OAhCK8CyvyWM0NLQok cpFbq3A3Pd4cw6bxPpEWN5IwCKwt/wKdiEYzjNuFo+CnqtL1zfRLn8Ak5RHLrmb1CFx9 CUu74DWdhrpTYYs4Ed2nLPNfjjVfp5RXrl0nvIJEo3AvWhjElnTIQXmChmAWhwL7eOsn d2ZOlBuw48tDcI/+gQXIfFNUVgGbF0XFwkOe8B9+jCGu3EDi2HJN7AgRzUMpUi0zcAUY QHD5CAFHrKKbVf1R5IuR6yDe4Uv6ObVPrefThUr8cBd0AmXE15W7AHCxKgqPdJ33AlVu BKAg== Received: by 10.50.219.194 with SMTP id pq2mr10642772igc.25.1343649724814; Mon, 30 Jul 2012 05:02:04 -0700 (PDT) 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.50.87.40 with SMTP id u8csp84614igz; Mon, 30 Jul 2012 05:02:04 -0700 (PDT) Received: by 10.236.179.98 with SMTP id g62mr9743720yhm.44.1343649724236; Mon, 30 Jul 2012 05:02:04 -0700 (PDT) Received: from mail-yx0-f178.google.com (mail-yx0-f178.google.com [209.85.213.178]) by mx.google.com with ESMTPS id l5si8827879yhk.100.2012.07.30.05.02.04 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 30 Jul 2012 05:02:04 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.213.178 is neither permitted nor denied by best guess record for domain of anton.vorontsov@linaro.org) client-ip=209.85.213.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.213.178 is neither permitted nor denied by best guess record for domain of anton.vorontsov@linaro.org) smtp.mail=anton.vorontsov@linaro.org Received: by yenl6 with SMTP id l6so5346650yen.37 for ; Mon, 30 Jul 2012 05:02:04 -0700 (PDT) Received: by 10.68.221.106 with SMTP id qd10mr35302049pbc.42.1343649723484; Mon, 30 Jul 2012 05:02:03 -0700 (PDT) Received: from localhost (c-71-204-165-222.hsd1.ca.comcast.net. [71.204.165.222]) by mx.google.com with ESMTPS id qi8sm7815511pbc.36.2012.07.30.05.02.02 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 30 Jul 2012 05:02:03 -0700 (PDT) From: Anton Vorontsov To: Russell King , Jason Wessel , Greg Kroah-Hartman , Alan Cox Cc: =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= , Colin Cross , John Stultz , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linaro-kernel@lists.linaro.org, patches@linaro.org, kernel-team@android.com, kgdb-bugreport@lists.sourceforge.net Subject: [PATCH 11/11] ARM: Get rid of .LCcralign local label usage in alignment_trap macro Date: Mon, 30 Jul 2012 04:58:20 -0700 Message-Id: <1343649500-18491-11-git-send-email-anton.vorontsov@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <20120730115719.GA5742@lizard> References: <20120730115719.GA5742@lizard> X-Gm-Message-State: ALoCoQkMM0I6/ZBoz9yjXLYBrlYgmgPxKUaOHvMm7KJbXUH534x4o6+MESrxU8UZk/WfulV/5OuK This makes the code more izolated. The downside of this is that we now have an additional branch and the code itself is 8 bytes longer. But on the bright side, this new layout can be more cache friendly since cr_alignment address might be already in the cache line (not that I measured anything, it's just fun to think about it). Signed-off-by: Anton Vorontsov --- arch/arm/kernel/entry-armv.S | 2 -- arch/arm/kernel/entry-header.S | 6 +++++- arch/arm/kernel/kgdb_fiq_entry.S | 3 --- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index 6aeb9b8..6b04ab5 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -266,8 +266,6 @@ __pabt_svc: ENDPROC(__pabt_svc) .align 5 -.LCcralign: - .word cr_alignment #ifdef MULTI_DABORT .LCprocfns: .word processor diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S index c3c09ac..5a05e7f 100644 --- a/arch/arm/kernel/entry-header.S +++ b/arch/arm/kernel/entry-header.S @@ -38,9 +38,13 @@ .macro alignment_trap, rtemp #ifdef CONFIG_ALIGNMENT_TRAP - ldr \rtemp, .LCcralign + ldr \rtemp, 1f ldr \rtemp, [\rtemp] mcr p15, 0, \rtemp, c1, c0 + b 2f +1: + .word cr_alignment +2: #endif .endm diff --git a/arch/arm/kernel/kgdb_fiq_entry.S b/arch/arm/kernel/kgdb_fiq_entry.S index 7be3726..e7c05fc 100644 --- a/arch/arm/kernel/kgdb_fiq_entry.S +++ b/arch/arm/kernel/kgdb_fiq_entry.S @@ -18,9 +18,6 @@ .text -@ This is needed for usr_entry/alignment_trap -.LCcralign: - .long cr_alignment .LCdohandle: .long kgdb_fiq_do_handle