From patchwork Mon Oct 13 14:58:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 38674 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f199.google.com (mail-lb0-f199.google.com [209.85.217.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A4AD32039B for ; Mon, 13 Oct 2014 15:03:54 +0000 (UTC) Received: by mail-lb0-f199.google.com with SMTP id w7sf4231344lbi.2 for ; Mon, 13 Oct 2014 08:03:52 -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:from:to:date:message-id:in-reply-to :references:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-post:list-help:list-subscribe:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:list-archive:content-type:content-transfer-encoding; bh=5nSziYZ9+r3om72UGOrMlkFJA6DPIn0aOQbY9PJLbyk=; b=chufNeDvHMyJWv6CZmFbRpt8DE0vPnRHJjgTjqMdxWCf4GeW0ooan154FOZiY/RDSq 0QTTTlmtubdPVnAaDtuwBXfIAF15T+ZcOnsfRazGT6KeWOV+4gjlFKBdc6jHNNpBozaY JzYeIfydfGQgCauNjErGRT5m/YJpmhsoAEYf1iDXdBkmApJGpU1FcuY8O/YAhOqSy99f WQRLgGtODQJrKaJWpXtrRnujFlytXgHnTSAcinzX7xGFc//ELjvcdnmKz5k5/xtF9Txl 7MQiHSeyhMzPYqU439jssrvO5pbXWhfQoNlwxg6WMyZMPD7Yw1175ZqAgl+9T/ZL0rBh vsOg== X-Gm-Message-State: ALoCoQnqaapKKDPD5WNX3VgIk6Jf4/15IFrdg7mp5RJKU4oqb2LsvbQPpXRCZm98vD7yvoDy06pf X-Received: by 10.194.88.68 with SMTP id be4mr90355wjb.6.1413212632685; Mon, 13 Oct 2014 08:03:52 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.19.131 with SMTP id f3ls451038lae.38.gmail; Mon, 13 Oct 2014 08:03:52 -0700 (PDT) X-Received: by 10.112.65.5 with SMTP id t5mr4069049lbs.82.1413212632495; Mon, 13 Oct 2014 08:03:52 -0700 (PDT) Received: from mail-lb0-f173.google.com (mail-lb0-f173.google.com [209.85.217.173]) by mx.google.com with ESMTPS id t1si22592122lbo.69.2014.10.13.08.03.52 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 13 Oct 2014 08:03:52 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.173 as permitted sender) client-ip=209.85.217.173; Received: by mail-lb0-f173.google.com with SMTP id 10so6571928lbg.4 for ; Mon, 13 Oct 2014 08:03:52 -0700 (PDT) X-Received: by 10.152.19.195 with SMTP id h3mr24658314lae.71.1413212632397; Mon, 13 Oct 2014 08:03:52 -0700 (PDT) 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.112.84.229 with SMTP id c5csp230987lbz; Mon, 13 Oct 2014 08:03:51 -0700 (PDT) X-Received: by 10.220.133.20 with SMTP id d20mr21436008vct.12.1413212631102; Mon, 13 Oct 2014 08:03:51 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id br3si12638137vcb.4.2014.10.13.08.03.50 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 13 Oct 2014 08:03:51 -0700 (PDT) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) 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 1Xdh7o-0004J1-66; Mon, 13 Oct 2014 15:01:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xdh7m-0004GY-1T for xen-devel@lists.xensource.com; Mon, 13 Oct 2014 15:01:26 +0000 Received: from [85.158.143.35:38074] by server-1.bemta-4.messagelabs.com id BD/91-05872-549EB345; Mon, 13 Oct 2014 15:01:25 +0000 X-Env-Sender: Stefano.Stabellini@citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1413212480!12585469!4 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n X-StarScan-Received: X-StarScan-Version: 6.12.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29280 invoked from network); 13 Oct 2014 15:01:24 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-11.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 13 Oct 2014 15:01:24 -0000 X-IronPort-AV: E=Sophos;i="5.04,711,1406592000"; d="scan'208";a="180809059" Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.3.181.6; Mon, 13 Oct 2014 11:01:09 -0400 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1Xdh7P-0008Ho-Ms; Mon, 13 Oct 2014 16:01:03 +0100 From: Stefano Stabellini To: Date: Mon, 13 Oct 2014 15:58:38 +0100 Message-ID: <1413212324-664-2-git-send-email-stefano.stabellini@eu.citrix.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: MIME-Version: 1.0 X-DLP: MIA2 Cc: julien.grall@citrix.com, Ian.Campbell@citrix.com, Stefano Stabellini Subject: [Xen-devel] [PATCH v5 2/8] xen/arm: rename *_xen_dcache_* operations to *_dcache_* 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: , 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: stefano.stabellini@eu.citrix.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.173 as permitted sender) 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: Signed-off-by: Stefano Stabellini Reviewed-by: Julien Grall --- xen/arch/arm/guestcopy.c | 2 +- xen/arch/arm/kernel.c | 2 +- xen/arch/arm/mm.c | 24 ++++++++++++------------ xen/arch/arm/p2m.c | 4 ++-- xen/arch/arm/smpboot.c | 2 +- xen/include/asm-arm/arm32/page.h | 4 ++-- xen/include/asm-arm/arm64/page.h | 4 ++-- xen/include/asm-arm/page.h | 20 ++++++++++---------- 8 files changed, 31 insertions(+), 31 deletions(-) diff --git a/xen/arch/arm/guestcopy.c b/xen/arch/arm/guestcopy.c index 0173597..7dbaeca 100644 --- a/xen/arch/arm/guestcopy.c +++ b/xen/arch/arm/guestcopy.c @@ -27,7 +27,7 @@ static unsigned long raw_copy_to_guest_helper(void *to, const void *from, p += offset; memcpy(p, from, size); if ( flush_dcache ) - clean_xen_dcache_va_range(p, size); + clean_dcache_va_range(p, size); unmap_domain_page(p - offset); put_page(page); diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c index 1b8ac9a..209c3dd 100644 --- a/xen/arch/arm/kernel.c +++ b/xen/arch/arm/kernel.c @@ -57,7 +57,7 @@ void copy_from_paddr(void *dst, paddr_t paddr, unsigned long len) set_fixmap(FIXMAP_MISC, p, BUFFERABLE); memcpy(dst, src + s, l); - clean_xen_dcache_va_range(dst, l); + clean_dcache_va_range(dst, l); paddr += l; dst += l; diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 675a51b..996687b 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -381,7 +381,7 @@ void flush_page_to_ram(unsigned long mfn) { void *v = map_domain_page(mfn); - clean_and_invalidate_xen_dcache_va_range(v, PAGE_SIZE); + clean_and_invalidate_dcache_va_range(v, PAGE_SIZE); unmap_domain_page(v); } @@ -504,17 +504,17 @@ void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr) /* Clear the copy of the boot pagetables. Each secondary CPU * rebuilds these itself (see head.S) */ memset(boot_pgtable, 0x0, PAGE_SIZE); - clean_and_invalidate_xen_dcache(boot_pgtable); + clean_and_invalidate_dcache(boot_pgtable); #ifdef CONFIG_ARM_64 memset(boot_first, 0x0, PAGE_SIZE); - clean_and_invalidate_xen_dcache(boot_first); + clean_and_invalidate_dcache(boot_first); memset(boot_first_id, 0x0, PAGE_SIZE); - clean_and_invalidate_xen_dcache(boot_first_id); + clean_and_invalidate_dcache(boot_first_id); #endif memset(boot_second, 0x0, PAGE_SIZE); - clean_and_invalidate_xen_dcache(boot_second); + clean_and_invalidate_dcache(boot_second); memset(boot_third, 0x0, PAGE_SIZE); - clean_and_invalidate_xen_dcache(boot_third); + clean_and_invalidate_dcache(boot_third); /* Break up the Xen mapping into 4k pages and protect them separately. */ for ( i = 0; i < LPAE_ENTRIES; i++ ) @@ -552,7 +552,7 @@ void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr) /* Make sure it is clear */ memset(this_cpu(xen_dommap), 0, DOMHEAP_SECOND_PAGES*PAGE_SIZE); - clean_xen_dcache_va_range(this_cpu(xen_dommap), + clean_dcache_va_range(this_cpu(xen_dommap), DOMHEAP_SECOND_PAGES*PAGE_SIZE); #endif } @@ -563,7 +563,7 @@ int init_secondary_pagetables(int cpu) /* Set init_ttbr for this CPU coming up. All CPus share a single setof * pagetables, but rewrite it each time for consistency with 32 bit. */ init_ttbr = (uintptr_t) xen_pgtable + phys_offset; - clean_xen_dcache(init_ttbr); + clean_dcache(init_ttbr); return 0; } #else @@ -598,15 +598,15 @@ int init_secondary_pagetables(int cpu) write_pte(&first[first_table_offset(DOMHEAP_VIRT_START+i*FIRST_SIZE)], pte); } - clean_xen_dcache_va_range(first, PAGE_SIZE); - clean_xen_dcache_va_range(domheap, DOMHEAP_SECOND_PAGES*PAGE_SIZE); + clean_dcache_va_range(first, PAGE_SIZE); + clean_dcache_va_range(domheap, DOMHEAP_SECOND_PAGES*PAGE_SIZE); per_cpu(xen_pgtable, cpu) = first; per_cpu(xen_dommap, cpu) = domheap; /* Set init_ttbr for this CPU coming up */ init_ttbr = __pa(first); - clean_xen_dcache(init_ttbr); + clean_dcache(init_ttbr); return 0; } @@ -1273,7 +1273,7 @@ void clear_and_clean_page(struct page_info *page) void *p = __map_domain_page(page); clear_page(p); - clean_xen_dcache_va_range(p, PAGE_SIZE); + clean_dcache_va_range(p, PAGE_SIZE); unmap_domain_page(p); } diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 70929fc..6ff8c17 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -302,7 +302,7 @@ static inline void p2m_write_pte(lpae_t *p, lpae_t pte, bool_t flush_cache) { write_pte(p, pte); if ( flush_cache ) - clean_xen_dcache(*p); + clean_dcache(*p); } /* @@ -362,7 +362,7 @@ static int p2m_create_table(struct domain *d, lpae_t *entry, clear_page(p); if ( flush_cache ) - clean_xen_dcache_va_range(p, PAGE_SIZE); + clean_dcache_va_range(p, PAGE_SIZE); unmap_domain_page(p); diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c index ee395a1..14054ae 100644 --- a/xen/arch/arm/smpboot.c +++ b/xen/arch/arm/smpboot.c @@ -374,7 +374,7 @@ int __cpu_up(unsigned int cpu) /* Open the gate for this CPU */ smp_up_cpu = cpu_logical_map(cpu); - clean_xen_dcache(smp_up_cpu); + clean_dcache(smp_up_cpu); rc = arch_cpu_up(cpu); diff --git a/xen/include/asm-arm/arm32/page.h b/xen/include/asm-arm/arm32/page.h index 9740672..20a6a7f 100644 --- a/xen/include/asm-arm/arm32/page.h +++ b/xen/include/asm-arm/arm32/page.h @@ -20,11 +20,11 @@ static inline void write_pte(lpae_t *p, lpae_t pte) } /* Inline ASM to flush dcache on register R (may be an inline asm operand) */ -#define __clean_xen_dcache_one(R) STORE_CP32(R, DCCMVAC) +#define __clean_dcache_one(R) STORE_CP32(R, DCCMVAC) /* Inline ASM to clean and invalidate dcache on register R (may be an * inline asm operand) */ -#define __clean_and_invalidate_xen_dcache_one(R) STORE_CP32(R, DCCIMVAC) +#define __clean_and_invalidate_dcache_one(R) STORE_CP32(R, DCCIMVAC) /* * Flush all hypervisor mappings from the TLB and branch predictor of diff --git a/xen/include/asm-arm/arm64/page.h b/xen/include/asm-arm/arm64/page.h index bb10164..101d7a8 100644 --- a/xen/include/asm-arm/arm64/page.h +++ b/xen/include/asm-arm/arm64/page.h @@ -15,11 +15,11 @@ static inline void write_pte(lpae_t *p, lpae_t pte) } /* Inline ASM to flush dcache on register R (may be an inline asm operand) */ -#define __clean_xen_dcache_one(R) "dc cvac, %" #R ";" +#define __clean_dcache_one(R) "dc cvac, %" #R ";" /* Inline ASM to clean and invalidate dcache on register R (may be an * inline asm operand) */ -#define __clean_and_invalidate_xen_dcache_one(R) "dc civac, %" #R ";" +#define __clean_and_invalidate_dcache_one(R) "dc civac, %" #R ";" /* * Flush all hypervisor mappings from the TLB of the local processor. diff --git a/xen/include/asm-arm/page.h b/xen/include/asm-arm/page.h index d758b61..1327b00 100644 --- a/xen/include/asm-arm/page.h +++ b/xen/include/asm-arm/page.h @@ -268,48 +268,48 @@ extern size_t cacheline_bytes; /* Functions for flushing medium-sized areas. * if 'range' is large enough we might want to use model-specific * full-cache flushes. */ -static inline void clean_xen_dcache_va_range(const void *p, unsigned long size) +static inline void clean_dcache_va_range(const void *p, unsigned long size) { const void *end; dsb(sy); /* So the CPU issues all writes to the range */ for ( end = p + size; p < end; p += cacheline_bytes ) - asm volatile (__clean_xen_dcache_one(0) : : "r" (p)); + asm volatile (__clean_dcache_one(0) : : "r" (p)); dsb(sy); /* So we know the flushes happen before continuing */ } -static inline void clean_and_invalidate_xen_dcache_va_range +static inline void clean_and_invalidate_dcache_va_range (const void *p, unsigned long size) { const void *end; dsb(sy); /* So the CPU issues all writes to the range */ for ( end = p + size; p < end; p += cacheline_bytes ) - asm volatile (__clean_and_invalidate_xen_dcache_one(0) : : "r" (p)); + asm volatile (__clean_and_invalidate_dcache_one(0) : : "r" (p)); dsb(sy); /* So we know the flushes happen before continuing */ } /* Macros for flushing a single small item. The predicate is always * compile-time constant so this will compile down to 3 instructions in * the common case. */ -#define clean_xen_dcache(x) do { \ +#define clean_dcache(x) do { \ typeof(x) *_p = &(x); \ if ( sizeof(x) > MIN_CACHELINE_BYTES || sizeof(x) > alignof(x) ) \ - clean_xen_dcache_va_range(_p, sizeof(x)); \ + clean_dcache_va_range(_p, sizeof(x)); \ else \ asm volatile ( \ "dsb sy;" /* Finish all earlier writes */ \ - __clean_xen_dcache_one(0) \ + __clean_dcache_one(0) \ "dsb sy;" /* Finish flush before continuing */ \ : : "r" (_p), "m" (*_p)); \ } while (0) -#define clean_and_invalidate_xen_dcache(x) do { \ +#define clean_and_invalidate_dcache(x) do { \ typeof(x) *_p = &(x); \ if ( sizeof(x) > MIN_CACHELINE_BYTES || sizeof(x) > alignof(x) ) \ - clean_and_invalidate_xen_dcache_va_range(_p, sizeof(x)); \ + clean_and_invalidate_dcache_va_range(_p, sizeof(x)); \ else \ asm volatile ( \ "dsb sy;" /* Finish all earlier writes */ \ - __clean_and_invalidate_xen_dcache_one(0) \ + __clean_and_invalidate_dcache_one(0) \ "dsb sy;" /* Finish flush before continuing */ \ : : "r" (_p), "m" (*_p)); \ } while (0)