From patchwork Mon Mar 5 16:03:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 130668 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp2853728lja; Mon, 5 Mar 2018 08:07:07 -0800 (PST) X-Google-Smtp-Source: AG47ELuNG2UVgq3mLXZXIxpWZ5k0TmZb1Ss6MJSKdCqzcNm5Jb93xLfMBXCPVuDQ5UAGhmgl6zKm X-Received: by 10.36.83.142 with SMTP id n136mr14858070itb.0.1520266027497; Mon, 05 Mar 2018 08:07:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520266027; cv=none; d=google.com; s=arc-20160816; b=Bfc736EOHK55EIPw/QepiKTRg3bHL9/iDwc2Hz9srPnLJBoK8b3JVMIwFXPAVhhm3B P31ltbR90RS0wOij949l7laB/fMSVEEPu4fWHiqEwaX16Z0oV34BHzrRLYek+v/1otZJ 5qijrTG4238LpzSPRPXauGook4J1WYnC/em0r/SQbkA2eCEhRU+hY10lcgBDaD8fep4I rpOjceEuMMA2CXv5MEYrBZoC8huub7rMgdgTCMQv1v5xbf/PJNOJL0zyjUxVkgYvb4u7 vNqg8wy3aI2A1z4salRWon6B+LFa6vN8KMsBKL6FbsTj7JeC47RgkbzS/+rQjA+L08HE t12w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-unsubscribe:list-id :precedence:subject:cc:references:in-reply-to:message-id:date:to :from:dkim-signature:arc-authentication-results; bh=dNiyHCdPEtA5nZCtNcPPXgDiZNfL+s0SYvkxwJbwnoI=; b=lHEz9pXRtgAqj/6y9W6HJ4qPssG40LQVoQ6p0m2GimSR9Nfj1uWQD5HLSFxuEPXBs9 LEdqr6v5EW75kldjB7YBGG6MJ8t+npM8jOP/Pgk8xNyLdgvCEjnSVQB+zNq+fEQu7io4 mfFnBQ2HSnbTY+b2FakmZ3k4Kcim87sjtJ/x52+Y424WnJviYiYrT/brkhJQrJtFKd5w aHbNwzhW3OygFaDy5/NHPO7EGn6ZrsUrpUMZGPfDCY2XGFaccNo4XRR5fw3uBg5Z8xhv utcWpJ9SUWp8uBGQBpc/oDdnTbuz5QMMO4j/xNikWRAhflO8SZwdA2hK59OXnxRbwUdk 8jtw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=KANCjO/V; spf=pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id o15si6062952itc.142.2018.03.05.08.07.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Mar 2018 08:07:07 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=KANCjO/V; spf=pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1essbW-0007Yk-Ce; Mon, 05 Mar 2018 16:04:46 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1essbV-0007W4-9S for xen-devel@lists.xenproject.org; Mon, 05 Mar 2018 16:04:45 +0000 X-Inumbo-ID: c3b08cd5-208e-11e8-ba59-bc764e045a96 Received: from mail-wr0-x241.google.com (unknown [2a00:1450:400c:c0c::241]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id c3b08cd5-208e-11e8-ba59-bc764e045a96; Mon, 05 Mar 2018 17:03:38 +0100 (CET) Received: by mail-wr0-x241.google.com with SMTP id v18so17183736wrv.0 for ; Mon, 05 Mar 2018 08:04:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=h8cbSfDYi1M3J8Na0F5htGHjRncMx5lKgD5V9NV31ZI=; b=KANCjO/VXSp7P930xM+PfjqnDa3r1FltrfU/rJ6SZfY6SqIsd+CHuOymaFt9M8s3FM jEFxWUMJM4zc/t7HXZz+GM+7C5sbcK3G8Y/syj3aMwecHKEhZdbszf+02weSamlhNUYH AhmbCRj27RWMMoanwvp6FWx6dbCLMgjWjblig= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=h8cbSfDYi1M3J8Na0F5htGHjRncMx5lKgD5V9NV31ZI=; b=I7ArSGxXMvayKJFXXL5JeF86aANNbjgVu/9vxblZuDh74u3ZGVzs3B6oY5EWTCe0tY RsEvk/4rUiI345ofY/5As30rv8Ye8hnBESWqbyCoKE9g/o7/qlCM2/UsYqJvOyC7EUZL 17GMd3i5LzDEDKv2fNJalo3XXhZ8QqRWo9igD5VT8LCspdh3jPEnjpLlPYeg3ReQppJF zyRppOO9K1dI9Sv+j0FVwyRgL4r1VC6JlXAME1+PknrgpoGqRgsNd+nPRedEPbPJmoxm JU5UGSqtsF9Fy+oWCJ9BGOV3eletL5o8u4UP/r6HFpoEZpEReopZjGAZp6HTcMA5+rFo veSQ== X-Gm-Message-State: APf1xPDUVabdUqWItPj/2lLOWjIY780FBm3FEvjZyAztVzMKjTncpjZk zjL6HZslfEeOsHUui+Kj05ng/w== X-Received: by 10.223.151.204 with SMTP id t12mr14026558wrb.156.1520265882819; Mon, 05 Mar 2018 08:04:42 -0800 (PST) Received: from e104803-lin.lan (mail.andrep.de. [217.160.17.100]) by smtp.gmail.com with ESMTPSA id y6sm6574381wmy.14.2018.03.05.08.04.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 05 Mar 2018 08:04:42 -0800 (PST) From: Andre Przywara To: Julien Grall , Stefano Stabellini Date: Mon, 5 Mar 2018 16:03:38 +0000 Message-Id: <20180305160415.16760-21-andre.przywara@linaro.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180305160415.16760-1-andre.przywara@linaro.org> References: <20180305160415.16760-1-andre.przywara@linaro.org> Cc: xen-devel@lists.xenproject.org Subject: [Xen-devel] [PATCH 20/57] ARM: GICv2: fix GICH_V2_LR definitions X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" The bit definition for the CPUID mask in the GICv2 LR register was wrong, fortunately the current implementation does not use that bit. Fix it up (it's starting at bit 10, not bit 9) and clean up some nearby definitions on the way. This will be used by the new VGIC shortly. Signed-off-by: Andre Przywara Reviewed-by: Julien Grall --- Changelog RFC ... v1: - new patch xen/arch/arm/gic-v2.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index 618dd94120..031be920cc 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -57,10 +57,11 @@ #define GICH_V2_LR_HW_MASK 0x1 #define GICH_V2_LR_GRP_SHIFT 30 #define GICH_V2_LR_GRP_MASK 0x1 -#define GICH_V2_LR_MAINTENANCE_IRQ (1<<19) -#define GICH_V2_LR_GRP1 (1<<30) -#define GICH_V2_LR_HW (1<<31) -#define GICH_V2_LR_CPUID_SHIFT 9 +#define GICH_V2_LR_MAINTENANCE_IRQ (1U << 19) +#define GICH_V2_LR_GRP1 (1U << 30) +#define GICH_V2_LR_HW (1U << GICH_V2_LR_HW_SHIFT) +#define GICH_V2_LR_CPUID_SHIFT 10 +#define GICH_V2_LR_CPUID_MASK 0x7 #define GICH_V2_VTR_NRLRGS 0x3f #define GICH_V2_VMCR_PRIORITY_MASK 0x1f