From patchwork Fri Aug 30 13:30:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 19630 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f200.google.com (mail-vc0-f200.google.com [209.85.220.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0CA3F24694 for ; Fri, 30 Aug 2013 13:30:41 +0000 (UTC) Received: by mail-vc0-f200.google.com with SMTP id hf12sf1975003vcb.3 for ; Fri, 30 Aug 2013 06:30:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=mime-version:x-gm-message-state:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=sJMXiYElmOUIIggw7dVYus73c6FqiD73TZkH8A00S4w=; b=YFfjqXZ/p0bBB9qfmNTInvlE/GNuZW62LR6BB4R9HtDdan2ZF5AFKnXFOVQ4GRJVT/ axYAAe4GuJyGj6Q89tVIqhndXnGM+BrzMPfNQg8WuSNyPoh5Xr6wyr1+l+RbGmzFJdeJ QHdy2MobSHkNSv6IN8ULgMIRSnrHaLpt8288TVKR4sxbA7Shwlxyb8WNPz8KaamXHZR2 PUkA2pDxx3q93ev9y4Nk1fUbGB5PcACcjKCa7gGDGdRsvRzTBb+6vDX7cf4xGoVD9DgD bHR+pXFdY8+6CDALEEMB1VYRWFHMPkdQtoKjmuRdmjrRJEe+To9j7iUMnGzax75jnLJd tP8g== X-Received: by 10.236.70.71 with SMTP id o47mr3019045yhd.12.1377869440615; Fri, 30 Aug 2013 06:30:40 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.71.83 with SMTP id s19ls1175074qeu.7.gmail; Fri, 30 Aug 2013 06:30:40 -0700 (PDT) X-Received: by 10.220.43.19 with SMTP id u19mr8371780vce.3.1377869440519; Fri, 30 Aug 2013 06:30:40 -0700 (PDT) Received: from mail-vb0-f42.google.com (mail-vb0-f42.google.com [209.85.212.42]) by mx.google.com with ESMTPS id ml6si2655423vec.78.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 30 Aug 2013 06:30:40 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.42 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.42; Received: by mail-vb0-f42.google.com with SMTP id e12so1316529vbg.29 for ; Fri, 30 Aug 2013 06:30:40 -0700 (PDT) X-Gm-Message-State: ALoCoQmu3iY6usDIHcU7k85exf/KklJ+tiuuXx53x4uEN9MlKgxoNAwlgGjuCSUt9DtB2U5QzRSJ X-Received: by 10.52.76.38 with SMTP id h6mr6162684vdw.10.1377869440442; Fri, 30 Aug 2013 06:30:40 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp88941vcz; Fri, 30 Aug 2013 06:30:39 -0700 (PDT) X-Received: by 10.180.9.203 with SMTP id c11mr2390560wib.64.1377869439250; Fri, 30 Aug 2013 06:30:39 -0700 (PDT) Received: from mail-we0-f174.google.com (mail-we0-f174.google.com [74.125.82.174]) by mx.google.com with ESMTPS id dh4si4068622wjb.23.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 30 Aug 2013 06:30:39 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.174 is neither permitted nor denied by best guess record for domain of julien.grall@linaro.org) client-ip=74.125.82.174; Received: by mail-we0-f174.google.com with SMTP id q54so1605211wes.33 for ; Fri, 30 Aug 2013 06:30:38 -0700 (PDT) X-Received: by 10.180.39.36 with SMTP id m4mr2494336wik.6.1377869438710; Fri, 30 Aug 2013 06:30:38 -0700 (PDT) Received: from belegaer.uk.xensource.com. ([185.25.64.249]) by mx.google.com with ESMTPSA id o9sm4306202wiz.1.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 30 Aug 2013 06:30:37 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Cc: stefano.stabellini@eu.citrix.com, ian.campbell@citrix.com, patches@linaro.org, Julien Grall Subject: [PATCH 1/7] xen/arm: Introduce MPIDR_HWID_MASK Date: Fri, 30 Aug 2013 14:30:27 +0100 Message-Id: <1377869433-15385-2-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1377869433-15385-1-git-send-email-julien.grall@linaro.org> References: <1377869433-15385-1-git-send-email-julien.grall@linaro.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.212.42 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 Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This define will be use later to retrieve the correct hardware CPU ID. Also replace hardcoded mask in arm32/head.S by this define. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/arm32/head.S | 2 +- xen/include/asm-arm/processor.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index b8334e2..79e95b6 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -98,7 +98,7 @@ past_zImage: beq boot_cpu tst r0, #(1<<30) /* Uniprocessor system? */ bne boot_cpu - bics r12, r0, #(0xff << 24) /* Mask out flags to get CPU ID */ + bics r12, r0, #(~MPIDR_HWID_MASK) /* Mask out flags to get CPU ID */ beq boot_cpu /* If we're CPU 0, boot now */ /* Non-boot CPUs wait here to be woken up one at a time. */ diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h index 12795f3..b884354 100644 --- a/xen/include/asm-arm/processor.h +++ b/xen/include/asm-arm/processor.h @@ -12,6 +12,7 @@ #define MPIDR_SMP (1 << 31) #define MPIDR_AFF0_SHIFT (0) #define MPIDR_AFF0_MASK (0xff << MPIDR_AFF0_SHIFT) +#define MPIDR_HWID_MASK 0xffffff /* TTBCR Translation Table Base Control Register */ #define TTBCR_EAE 0x80000000