| Message ID | 1437564065-4356-3-git-send-email-daniel.thompson@linaro.org |
|---|---|
| State | Accepted |
| Commit | 271d35eb77d0f53177b44968417b630d1fee8b99 |
| Headers | show
Return-Path: <patchwork-forward+bncBCAPDLF44QLBBMPZXWWQKGQEMSFR6WI@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f70.google.com (mail-la0-f70.google.com [209.85.215.70]) by patches.linaro.org (Postfix) with ESMTPS id F13D120323 for <linaro@patches.linaro.org>; Wed, 22 Jul 2015 11:21:22 +0000 (UTC) Received: by lafd3 with SMTP id d3sf57531571laf.1 for <linaro@patches.linaro.org>; Wed, 22 Jul 2015 04:21:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version: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=zwnbCeRl/Ij4a24sh8GKS9H8/BK6xn3y4Us0HWpaRQM=; b=gfRbFB+6nvk92img5OcHAgOPX1d0Rpxw80K957baF/ucnN2JTyZ62HLLjCX/0M+UEU NDcpodtSUpeRbeQc6vftA+fm4SzNlaThIss71hRiJ+sljPi9cpbQG09SnjM5gN2+3Mdv XtbxlGkroffsws3p0cjVK16kMBkG67qgg+cTwG9WzcI1UiFiV8Lq1xoRdhd6737scJi0 6PpqJ5YuI09aBesE1PbYf0y2xhOR6QcnsyILIsGX75CwvxUNHV8LUxIUjR7E1Im1v4xO NmOBAf28oeNLVYEVe+Ud/+F1e8YVDszWXpvroufY2xofbxQfLZgYqrWjuwWL2C+dXut7 yf/g== X-Gm-Message-State: ALoCoQnrMxIMWWYYArfGLmO/lncdK8aA1luRrTIbH+AHgSdt8skEFJ0n0MCx1DilY9EJfUBPScp+ X-Received: by 10.152.6.103 with SMTP id z7mr977167laz.8.1437564081964; Wed, 22 Jul 2015 04:21:21 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.224.129 with SMTP id rc1ls70833lac.25.gmail; Wed, 22 Jul 2015 04:21:21 -0700 (PDT) X-Received: by 10.112.125.166 with SMTP id mr6mr1842485lbb.83.1437564081824; Wed, 22 Jul 2015 04:21:21 -0700 (PDT) Received: from mail-lb0-f169.google.com (mail-lb0-f169.google.com. [209.85.217.169]) by mx.google.com with ESMTPS id d2si951460laa.7.2015.07.22.04.21.21 for <patchwork-forward@linaro.org> (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Jul 2015 04:21:21 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.169 as permitted sender) client-ip=209.85.217.169; Received: by lbbzr7 with SMTP id zr7so134491400lbb.1 for <patchwork-forward@linaro.org>; Wed, 22 Jul 2015 04:21:21 -0700 (PDT) X-Received: by 10.112.220.7 with SMTP id ps7mr1853682lbc.72.1437564081735; Wed, 22 Jul 2015 04:21:21 -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.112.7.198 with SMTP id l6csp2046566lba; Wed, 22 Jul 2015 04:21:21 -0700 (PDT) X-Received: by 10.180.14.101 with SMTP id o5mr5759266wic.82.1437564079301; Wed, 22 Jul 2015 04:21:19 -0700 (PDT) Received: from mail-wi0-f172.google.com (mail-wi0-f172.google.com. [209.85.212.172]) by mx.google.com with ESMTPS id f4si1966880wjn.95.2015.07.22.04.21.19 for <patches@linaro.org> (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Jul 2015 04:21:19 -0700 (PDT) Received-SPF: pass (google.com: domain of daniel.thompson@linaro.org designates 209.85.212.172 as permitted sender) client-ip=209.85.212.172; Received: by wibud3 with SMTP id ud3so167284851wib.0 for <patches@linaro.org>; Wed, 22 Jul 2015 04:21:19 -0700 (PDT) X-Received: by 10.180.100.74 with SMTP id ew10mr42367198wib.12.1437564079066; Wed, 22 Jul 2015 04:21:19 -0700 (PDT) Received: from wychelm.lan (cpc4-aztw19-0-0-cust71.18-1.cable.virginm.net. [82.33.25.72]) by smtp.gmail.com with ESMTPSA id j7sm1901235wjz.11.2015.07.22.04.21.17 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Jul 2015 04:21:18 -0700 (PDT) From: Daniel Thompson <daniel.thompson@linaro.org> To: Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will.deacon@arm.com> Cc: Daniel Thompson <daniel.thompson@linaro.org>, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, patches@linaro.org, linaro-kernel@lists.linaro.org, John Stultz <john.stultz@linaro.org>, Sumit Semwal <sumit.semwal@linaro.org>, Christoffer Dall <christoffer.dall@linaro.org>, Marc Zyngier <marc.zyngier@arm.com>, Andre Przywara <andre.przywara@arm.com> Subject: [PATCH v3 2/5] arm64: mm: Adopt new alternative assembler macros Date: Wed, 22 Jul 2015 12:21:02 +0100 Message-Id: <1437564065-4356-3-git-send-email-daniel.thompson@linaro.org> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1437564065-4356-1-git-send-email-daniel.thompson@linaro.org> References: <1436536130-31438-1-git-send-email-daniel.thompson@linaro.org> <1437564065-4356-1-git-send-email-daniel.thompson@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: daniel.thompson@linaro.org 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.169 as permitted sender) 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: <patchwork-forward.linaro.org> X-Google-Group-Id: 836684582541 List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Unsubscribe: <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com>, <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe> |
diff --git a/arch/arm64/mm/cache.S b/arch/arm64/mm/cache.S index bdeb5d38c2dd..eb48d5df4a0f 100644 --- a/arch/arm64/mm/cache.S +++ b/arch/arm64/mm/cache.S @@ -143,7 +143,12 @@ __dma_clean_range: dcache_line_size x2, x3 sub x3, x2, #1 bic x0, x0, x3 -1: alternative_insn "dc cvac, x0", "dc civac, x0", ARM64_WORKAROUND_CLEAN_CACHE +1: +alternative_if_not ARM64_WORKAROUND_CLEAN_CACHE + dc cvac, x0 +alternative_else + dc civac, x0 +alternative_endif add x0, x0, x2 cmp x0, x1 b.lo 1b
Convert the dynamic patching for ARM64_WORKAROUND_CLEAN_CACHE over to the newly added alternative assembler macros. Signed-off-by: Daniel Thompson <daniel.thompson@linaro.org> --- arch/arm64/mm/cache.S | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)