From patchwork Wed Mar 5 04:46:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 25725 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f200.google.com (mail-ie0-f200.google.com [209.85.223.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 884C320540 for ; Wed, 5 Mar 2014 04:48:58 +0000 (UTC) Received: by mail-ie0-f200.google.com with SMTP id lx4sf1834630iec.3 for ; Tue, 04 Mar 2014 20:48:58 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:cc:subject:precedence:list-id:list-unsubscribe:list-post :list-help:list-subscribe:mime-version:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list :list-archive:content-type:content-transfer-encoding; bh=jVFdMFq6LzR+9QMBiZMaj9Kk5B6MrWGQXdmGP6mQfrw=; b=nEQP0EKVn/2/heulk7R+YvMo1EeA0gopvV8agavnCfQyWd+12F2cu3DgueBVw/JlMo aEbYzGZv6vYkVbNAeUsr0eYLjUjIxxkF91+C1Zg/9o99fj97bZd3PwYI/NQQZYVK0som 3bShERNw3qgVdJFsT1QE9TvT06DDkeoygaZEE+iIbktm27tgfFiSVDSJMGz7EblQ9Yoi Fz5nseLONReBV50H61O1SXPi93FSQAHIIxf3qHrt915yxuw5sYYY9TPQ9wgLzqZ99dya PbflkZkPtqLac1IFu8CGheJB2jjp2k9ru7vjrk2R2lkw93cE/kdE5TZu5AEMvuFeWPaY c6Gw== X-Gm-Message-State: ALoCoQniGc9QwE3jL9bItyQbL4J/N4gIiZEDAa40K9fGFwCbdK7VoXmaUpH/z0VH6rQsNFpIZh4i X-Received: by 10.182.52.136 with SMTP id t8mr416181obo.41.1393994938043; Tue, 04 Mar 2014 20:48:58 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.30.201 with SMTP id d67ls134691qgd.62.gmail; Tue, 04 Mar 2014 20:48:57 -0800 (PST) X-Received: by 10.52.37.161 with SMTP id z1mr2341396vdj.29.1393994937905; Tue, 04 Mar 2014 20:48:57 -0800 (PST) Received: from mail-vc0-f180.google.com (mail-vc0-f180.google.com [209.85.220.180]) by mx.google.com with ESMTPS id sq4si379323vdc.2.2014.03.04.20.48.57 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Mar 2014 20:48:57 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.180 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.180; Received: by mail-vc0-f180.google.com with SMTP id ks9so495010vcb.39 for ; Tue, 04 Mar 2014 20:48:57 -0800 (PST) X-Received: by 10.58.37.232 with SMTP id b8mr67595vek.27.1393994937829; Tue, 04 Mar 2014 20:48:57 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.130.193 with SMTP id u1csp176668vcs; Tue, 4 Mar 2014 20:48:57 -0800 (PST) X-Received: by 10.58.186.132 with SMTP id fk4mr2739032vec.9.1393994937372; Tue, 04 Mar 2014 20:48:57 -0800 (PST) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id f5si368221vej.73.2014.03.04.20.48.56 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 04 Mar 2014 20:48:57 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xen.org designates 50.57.142.19 as permitted sender) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3jH-0002us-0E; Wed, 05 Mar 2014 04:46:51 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3jF-0002un-81 for xen-devel@lists.xenproject.org; Wed, 05 Mar 2014 04:46:49 +0000 Received: from [85.158.143.35:63712] by server-3.bemta-4.messagelabs.com id 57/DA-11539-83CA6135; Wed, 05 Mar 2014 04:46:48 +0000 X-Env-Sender: julien.grall@linaro.org X-Msg-Ref: server-7.tower-21.messagelabs.com!1393994806!10034259!1 X-Originating-IP: [209.85.160.41] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9046 invoked from network); 5 Mar 2014 04:46:47 -0000 Received: from mail-pb0-f41.google.com (HELO mail-pb0-f41.google.com) (209.85.160.41) by server-7.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 5 Mar 2014 04:46:47 -0000 Received: by mail-pb0-f41.google.com with SMTP id jt11so551948pbb.0 for ; Tue, 04 Mar 2014 20:46:45 -0800 (PST) X-Received: by 10.67.14.69 with SMTP id fe5mr4287217pad.120.1393994805852; Tue, 04 Mar 2014 20:46:45 -0800 (PST) Received: from localhost.localdomain (z88l218.static.ctm.net. [202.175.88.218]) by mx.google.com with ESMTPSA id vn10sm3154534pbc.21.2014.03.04.20.46.42 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Mar 2014 20:46:45 -0800 (PST) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Wed, 5 Mar 2014 12:46:21 +0800 Message-Id: <1393994786-17098-2-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1393994786-17098-1-git-send-email-julien.grall@linaro.org> References: <1393994786-17098-1-git-send-email-julien.grall@linaro.org> Cc: stefano.stabellini@citrix.com, Julien Grall , tim@xen.org, ian.campbell@citrix.com Subject: [Xen-devel] [PATCH v2 1/6] xen/arm32: proc-v7.S: Rename v7_init and ACTLR_V7_SMP X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: julien.grall@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.180 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: The function v7_init and the define ACTLR_V7_SMP are Cortex A15/A7 specific. To avoid misuse when new ARMv7 processors will be supported, create one label per processor type and rename ACTLR_V7_SMP in ACTRL_CAXX_SMP Signed-off-by: Julien Grall --- Changes in v2: - Patch added --- xen/arch/arm/arm32/proc-v7.S | 12 +++++++----- xen/include/asm-arm/arm32/processor.h | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/xen/arch/arm/arm32/proc-v7.S b/xen/arch/arm/arm32/proc-v7.S index 2c8cb9c..8fb42db 100644 --- a/xen/arch/arm/arm32/proc-v7.S +++ b/xen/arch/arm/arm32/proc-v7.S @@ -20,10 +20,12 @@ #include #include -v7_init: +ca15mp_init: +ca7mp_init: +brahma15mp_init: /* Set up the SMP bit in ACTLR */ mrc CP32(r0, ACTLR) - orr r0, r0, #(ACTLR_V7_SMP) /* enable SMP bit */ + orr r0, r0, #(ACTLR_CAXX_SMP) /* enable SMP bit */ mcr CP32(r0, ACTLR) mov pc, lr @@ -32,7 +34,7 @@ v7_init: __v7_ca15mp_proc_info: .long 0x410FC0F0 /* Cortex-A15 */ .long 0xFF0FFFF0 /* Mask */ - .long v7_init + .long ca15mp_init .size __v7_ca15mp_proc_info, . - __v7_ca15mp_proc_info .section ".init.proc.info", #alloc, #execinstr @@ -40,7 +42,7 @@ __v7_ca15mp_proc_info: __v7_ca7mp_proc_info: .long 0x410FC070 /* Cortex-A7 */ .long 0xFF0FFFF0 /* Mask */ - .long v7_init + .long ca7mp_init .size __v7_ca7mp_proc_info, . - __v7_ca7mp_proc_info .section ".init.proc.info", #alloc, #execinstr @@ -48,7 +50,7 @@ __v7_ca7mp_proc_info: __v7_brahma15mp_proc_info: .long 0x420F00F2 /* Broadcom Brahma-B15 */ .long 0xFF0FFFFF /* Mask */ - .long v7_init + .long brahma15mp_init .size __v7_brahma15mp_proc_info, . - __v7_brahma15mp_proc_info /* diff --git a/xen/include/asm-arm/arm32/processor.h b/xen/include/asm-arm/arm32/processor.h index d1b89d0..8a35cee 100644 --- a/xen/include/asm-arm/arm32/processor.h +++ b/xen/include/asm-arm/arm32/processor.h @@ -1,7 +1,7 @@ #ifndef __ASM_ARM_ARM32_PROCESSOR_H #define __ASM_ARM_ARM32_PROCESSOR_H -#define ACTLR_V7_SMP (1<<6) +#define ACTLR_CAXX_SMP (1<<6) #ifndef __ASSEMBLY__ /* On stack VCPU state */