| Message ID | 1437405004-1296-3-git-send-email-daniel.thompson@linaro.org |
|---|---|
| State | Superseded |
| Headers | show
Return-Path: <patchwork-forward+bncBCAPDLF44QLBBX46WSWQKGQEG67EGGQ@linaro.org> 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 CEAB3202B9 for <linaro@patches.linaro.org>; Mon, 20 Jul 2015 15:10:24 +0000 (UTC) Received: by lbcjj5 with SMTP id jj5sf6626551lbc.1 for <linaro@patches.linaro.org>; Mon, 20 Jul 2015 08:10:23 -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=jk8/k8H32Yei3veKr4D661BMGUri+gQaZbkaFUDz9OoA/gOCWa8DUDNIt/mW0KfCc3 pSQZ8FlLcSx7pMYeVTRkWOo5Z4ALJNOebsKMxDnaQbQSvEOAxIQPhFbfO4c0W343FbnL /hnphYIFh+kwgaQHrIwmN7worRXK7Fiwmgvg9My/fysFdjd3qzOHClQyckyOCx+OwQIg ldH7LMjbnPqb496j7WVU6MjiKVJpqbeLVH4qBXu2MNrZdl+vxekYmfJ2fx5PDKlxJYTz 3mj4dXUpbXU/0lYBAPiAHWNUFipqt69p6gZ32HOMi7sG9oSRWo+5QXqHBaeBtfHcFUWF N6Xw== X-Gm-Message-State: ALoCoQnr4w0EFucuirNSaNh6EaeCBMCh0zJMneibW2daGdSXBgM6zEjpA7455aZjuvfxM7zTu0QE X-Received: by 10.112.98.42 with SMTP id ef10mr15143794lbb.18.1437405023758; Mon, 20 Jul 2015 08:10:23 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.153.5.9 with SMTP id ci9ls814627lad.69.gmail; Mon, 20 Jul 2015 08:10:23 -0700 (PDT) X-Received: by 10.112.26.225 with SMTP id o1mr27903353lbg.5.1437405023422; Mon, 20 Jul 2015 08:10:23 -0700 (PDT) Received: from mail-la0-f47.google.com (mail-la0-f47.google.com. [209.85.215.47]) by mx.google.com with ESMTPS id m2si18147284laj.125.2015.07.20.08.10.23 for <patchwork-forward@linaro.org> (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Jul 2015 08:10:23 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.47 as permitted sender) client-ip=209.85.215.47; Received: by laem6 with SMTP id m6so98993223lae.0 for <patchwork-forward@linaro.org>; Mon, 20 Jul 2015 08:10:23 -0700 (PDT) X-Received: by 10.112.126.101 with SMTP id mx5mr28596550lbb.35.1437405023323; Mon, 20 Jul 2015 08:10:23 -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 l6csp853486lba; Mon, 20 Jul 2015 08:10:22 -0700 (PDT) X-Received: by 10.194.60.226 with SMTP id k2mr54341595wjr.10.1437405022697; Mon, 20 Jul 2015 08:10:22 -0700 (PDT) Received: from mail-wg0-f43.google.com (mail-wg0-f43.google.com. [74.125.82.43]) by mx.google.com with ESMTPS id p3si35644937wjz.93.2015.07.20.08.10.22 for <patches@linaro.org> (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Jul 2015 08:10:22 -0700 (PDT) Received-SPF: pass (google.com: domain of daniel.thompson@linaro.org designates 74.125.82.43 as permitted sender) client-ip=74.125.82.43; Received: by wgmn9 with SMTP id n9so133186658wgm.0 for <patches@linaro.org>; Mon, 20 Jul 2015 08:10:22 -0700 (PDT) X-Received: by 10.180.104.129 with SMTP id ge1mr22871806wib.84.1437405022398; Mon, 20 Jul 2015 08:10:22 -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 z9sm12254158wiv.9.2015.07.20.08.10.21 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Jul 2015 08:10:21 -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 v2 2/5] arm64: mm: Adopt new alternative assembler macros Date: Mon, 20 Jul 2015 16:10:01 +0100 Message-Id: <1437405004-1296-3-git-send-email-daniel.thompson@linaro.org> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1437405004-1296-1-git-send-email-daniel.thompson@linaro.org> References: <1436536130-31438-1-git-send-email-daniel.thompson@linaro.org> <1437405004-1296-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.215.47 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(-)