From patchwork Fri Sep 27 17:05:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 20677 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f69.google.com (mail-qa0-f69.google.com [209.85.216.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6E3C425E77 for ; Fri, 27 Sep 2013 17:05:44 +0000 (UTC) Received: by mail-qa0-f69.google.com with SMTP id cm18sf914278qab.0 for ; Fri, 27 Sep 2013 10:05:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:message-id:date:from:user-agent :mime-version:to:cc:subject:references:in-reply-to:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe:content-type :content-transfer-encoding; bh=SLzxXpTH/nIMATwGNTredZCnROueuhyp7wHsx+Nu4zY=; b=TgX3C6yyiWWrFOvzQKB7T+1gkhPWG1WwY4OSlJf2tRRkpDpduT8vuVEu3rqJhW1dD3 MMX91dQmoy37qjAcGFWozd1GCO/zmkKTVE8amL8hA+xavejguBqUyboKvmTp7Jg7o7SH esJDMZKd7wvVkMx6hqfymBzQLiC0PpaetKxiJ2SOXGu6AIVHYC2Ca1p9jPehIjTvvvET wLbUp7mH7oYQxFFcV5frhGg6ycXYfPtMyPa6UEaY/lAcsJn9VCMVEGdppafPbj4frqsn HGoErcIo5+W3+PFFuHEVbi4TjVmrvoRUp4KeLv8ofGWPHj/eTYiYKbkY8LMyoTPBeQpd kV0g== X-Gm-Message-State: ALoCoQlQycJVkZEDA5OHA5XHivKWCnOGg/mYF+yYf7JnmdkofwMZzMqvia+TWZcgoNK8i3LBMQXE X-Received: by 10.58.46.114 with SMTP id u18mr603179vem.22.1380301543861; Fri, 27 Sep 2013 10:05:43 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.84.201 with SMTP id b9ls1338097qez.62.gmail; Fri, 27 Sep 2013 10:05:43 -0700 (PDT) X-Received: by 10.220.145.132 with SMTP id d4mr7197602vcv.9.1380301543729; Fri, 27 Sep 2013 10:05:43 -0700 (PDT) Received: from mail-ve0-f181.google.com (mail-ve0-f181.google.com [209.85.128.181]) by mx.google.com with ESMTPS id qu3si2070682vec.26.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 27 Sep 2013 10:05:43 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.181 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.181; Received: by mail-ve0-f181.google.com with SMTP id oy12so2192645veb.26 for ; Fri, 27 Sep 2013 10:05:13 -0700 (PDT) X-Received: by 10.58.168.205 with SMTP id zy13mr7241093veb.19.1380301513619; Fri, 27 Sep 2013 10:05:13 -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 u4csp440066vcz; Fri, 27 Sep 2013 10:05:12 -0700 (PDT) X-Received: by 10.180.12.4 with SMTP id u4mr3458378wib.29.1380301512440; Fri, 27 Sep 2013 10:05:12 -0700 (PDT) Received: from mail-we0-f177.google.com (mail-we0-f177.google.com [74.125.82.177]) by mx.google.com with ESMTPS id vt5si3248816wjc.113.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 27 Sep 2013 10:05:12 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.177 is neither permitted nor denied by best guess record for domain of julien.grall@linaro.org) client-ip=74.125.82.177; Received: by mail-we0-f177.google.com with SMTP id t60so2944479wes.22 for ; Fri, 27 Sep 2013 10:05:11 -0700 (PDT) X-Received: by 10.194.178.166 with SMTP id cz6mr2462958wjc.53.1380301511862; Fri, 27 Sep 2013 10:05:11 -0700 (PDT) Received: from [10.80.2.139] ([185.25.64.249]) by mx.google.com with ESMTPSA id b7sm2963288wiz.8.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 27 Sep 2013 10:05:11 -0700 (PDT) Message-ID: <5245BAC6.7040108@linaro.org> Date: Fri, 27 Sep 2013 18:05:10 +0100 From: Julien Grall User-Agent: Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/20130828 Icedove/17.0.8 MIME-Version: 1.0 To: Andrew Cooper CC: xen-devel@lists.xen.org, Keir Fraser , ian.campbell@citrix.com, patches@linaro.org, tim@xen.org, Jan Beulich , stefano.stabellini@eu.citrix.com Subject: Re: [Xen-devel] [PATCH v3 1/5] xen: Add macros MB and GB References: <1380300997-28099-1-git-send-email-julien.grall@linaro.org> <1380300997-28099-2-git-send-email-julien.grall@linaro.org> <5245B9E8.2090607@citrix.com> In-Reply-To: <5245B9E8.2090607@citrix.com> 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.128.181 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: , On 09/27/2013 06:01 PM, Andrew Cooper wrote: > On 27/09/13 17:56, Julien Grall wrote: >> Signed-off-by: Julien Grall >> CC: Keir Fraser >> CC: Jan Beulich >> >> --- >> Changes in v3: >> - Add GB >> - Move to common code (include/xen/config.h) >> --- >> xen/include/asm-arm/config.h | 1 - >> xen/include/xen/config.h | 3 +++ >> 2 files changed, 3 insertions(+), 1 deletion(-) > > You will also need to delete GB() from xen/include/asm-x86/config.h for > this to compile. Thanks, I forget to check the compilation on x86. I only resend this patch: commit 466457ed4946f7e1ec45f55e6d601a75b84884e5 Author: Julien Grall Date: Thu Sep 26 13:26:40 2013 +0100 xen: Add macros MB and GB Signed-off-by: Julien Grall CC: Keir Fraser CC: Jan Beulich --- Changes in v4: - Remove GB in asm-x86/config.h Changes in v3: - Add GB - Move to common code (include/xen/config.h) diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h index 9e395c2..5b7b1a8 100644 --- a/xen/include/asm-arm/config.h +++ b/xen/include/asm-arm/config.h @@ -142,7 +142,6 @@ #define SLOT0_ENTRY_BITS 39 #define SLOT0(slot) (_AT(vaddr_t,slot) << SLOT0_ENTRY_BITS) #define SLOT0_ENTRY_SIZE SLOT0(1) -#define GB(_gb) (_AC(_gb, UL) << 30) #define VMAP_VIRT_START GB(1) #define VMAP_VIRT_END (VMAP_VIRT_START + GB(1) - 1) diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index cc42a88..3749457 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -128,7 +128,6 @@ extern unsigned char boot_edid_info[128]; #define PML4_ADDR(_slot) \ (((_AC(_slot, UL) >> 8) * _AC(0xffff000000000000,UL)) | \ (_AC(_slot, UL) << PML4_ENTRY_BITS)) -#define GB(_gb) (_AC(_gb, UL) << 30) /* * Memory layout: diff --git a/xen/include/xen/config.h b/xen/include/xen/config.h index a52298e..657c6e5 100644 --- a/xen/include/xen/config.h +++ b/xen/include/xen/config.h @@ -69,6 +69,9 @@ #define __force #define __bitwise +#define MB(_mb) (_AC(_mb, UL) << 20) +#define GB(_gb) (_AC(_gb, UL) << 30) + #ifndef __ASSEMBLY__ int current_domain_id(void);