From patchwork Thu May 20 12:43:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fuad Tabba X-Patchwork-Id: 12270193 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 896B2C433B4 for ; Thu, 20 May 2021 12:48:47 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 10A7561163 for ; Thu, 20 May 2021 12:48:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 10A7561163 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Cc:To:From:Subject:References:Mime-Version: Message-Id:In-Reply-To:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=NqcVqrUZ4LvRKuPbHafDXdp+xBdkpiWaPWqAim8I4DQ=; b=HQDZwy9bxXVPJk hU4zY/+VRiFcLjzOjdPluFrVCkZx9ye7/uCg42JnFIudK40WzYhyOVw2REOpFF/TZ/1gqb0AIqodP wkaqsibh10hOoyqL2Zd0LooxT+mRSLvi0FpPdufZA4R9AZBGQjuQgNJR72MDMZuW3H3kTkkOckztu /keSRYYtG5xLLY4Zmn3WIOqbQnjY8ffnQ1vs8tEtIGwWo57UfnIW4l7ErtBtDPAg/Nb0B1U2R1ysb 5U9hg8dp7D9WJv1cweIC/1YULZzjuarZHeO+6cWIAR5Nxi4dG8azvTX0Imd7XvpkoSs/p8loydZY7 jVUj9jZaN+373ie1vpiA==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lji52-000vnb-65; Thu, 20 May 2021 12:47:14 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lji2P-000u1L-LG for linux-arm-kernel@desiato.infradead.org; Thu, 20 May 2021 12:44:29 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Type:Cc:To:From:Subject: References:Mime-Version:Message-Id:In-Reply-To:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=M2Sla/jf/pjrwPm+RYCmA/9jHt4HgBxeLsb7dVByTVM=; b=y+epkNCtQ6mrhE65cpZF1BafeU b39Ocrx9mNz+pNlgNHL93DiinfmgP6KxhxMi4Nwk6x0+CCjOkjOAJroD/qMGcGdjucFFelvIAmFH7 phMLrlp8nOy0mwm4qhgkmE8FK+0n4OplXfDOrh7lfZ+p3Zj+nEN/p1pnUbiy6YVK3cPpj5r5hq+J8 J3hJtCWde3a7911G9WREf/9Y+mKJh2/ZPsJXxhBeoeAyz2SZ+BLBF9uzW2Dhn3NUSQM8eePIdyTw4 P9/aw1SVEffVfUucTXGSWklIr+2XLTXNVviIaGQhAPOYXKPpYf+awYh8emQ7uloSUj9DQf0/hcBti oqK9151A==; Received: from mail-qv1-xf49.google.com ([2607:f8b0:4864:20::f49]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lji2N-00GKeG-6x for linux-arm-kernel@lists.infradead.org; Thu, 20 May 2021 12:44:28 +0000 Received: by mail-qv1-xf49.google.com with SMTP id v3-20020a0cdd830000b02901efe0c3571eso10208057qvk.5 for ; Thu, 20 May 2021 05:44:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=M2Sla/jf/pjrwPm+RYCmA/9jHt4HgBxeLsb7dVByTVM=; b=v1XCFr3qwxS0yy6U3EwwrxhEaKxYk2fl3rkeuk8jONApryuqjt1b/3uk8ynGx/E80X Um/kWXH1m5kg17CxYoU6k4Z4Aolvgkimrn5zOLSKaDGGX4J1aHf2WcXfoLtW4H1OMEpv DTZ57PwSDZ7ct64b033++p2zvUmAmIw9xEQfUItMQfHvCbVW2gUebSKq+fpi/pHkBEh2 UjDydCePksWSdsLT4GB1yFAIuoCRlWoOlzUt8uH2Y2l2zI53w1f2V9dv2QgpdhTzTqK+ VWdAxVS2cXeJOqtkQrlb6GxN7TweZj7PIPzfi1iLVFRat7ZfliMss3NuQkeo9MA3NJyp lawA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=M2Sla/jf/pjrwPm+RYCmA/9jHt4HgBxeLsb7dVByTVM=; b=fxGRN0XWsfYXLrFETdoS7qk4ZABwNezWz7X3EFQ344VMA3rYXVTrGNsuZ1d8KDK8Uv 8lqjg1J0VW3fJouWmIlafvskpvGKk0qt3+y2XedT8ekgyY6STHJxG84fwORDf9RnTeWn x9UbmrezZmY+V53D4RF0hbl1BO6B8Zr5Cf1N8cjR1o90vO6S1B40sQOjiTrs2M8tzKKI Jlzp7ttOXijuOFKECDhdBWWY8KwplA/FW0t4wClrkYX9D3YGLDSpuHMCw30kcVzzTSt5 EtZgHiVcajsOMIqpjwLLkabRwW4Vu9LaDlpke0YuylVWSxS3N2tXzvYQBK8HnrPvJXcF nM+A== X-Gm-Message-State: AOAM530poowSypRMQK6UJlnM/pBJl4JlIZzi61x/AZ/lkE/DepvcJBOS jLmO99HZ4F3isB1B4w5IiFYUpdz80OrzC2Y46y153XCmgacBiTYKzSnDSxdXRMhpaCttgotRsct sDZ8n0VZlVGKhuQCa7Kptx3xzphBaVoebbIwdqO/PUYLrZ78jbx+gEgpsIL1DdsW/aN/pOLGNzy fRWQ== X-Google-Smtp-Source: ABdhPJxPajU8cRrRpvil8MuEM16kRitkfEByRzrCKJZGiCgn2d9XIT0wRyDJzCumMhqcrJzJ5k2tSSErzQ== X-Received: from tabba.c.googlers.com ([fda3:e722:ac3:10:28:9cb1:c0a8:482]) (user=tabba job=sendgmr) by 2002:a0c:e34b:: with SMTP id a11mr5466553qvm.24.1621514665219; Thu, 20 May 2021 05:44:25 -0700 (PDT) Date: Thu, 20 May 2021 13:43:56 +0100 In-Reply-To: <20210520124406.2731873-1-tabba@google.com> Message-Id: <20210520124406.2731873-9-tabba@google.com> Mime-Version: 1.0 References: <20210520124406.2731873-1-tabba@google.com> X-Mailer: git-send-email 2.31.1.751.gd2f1c929bd-goog Subject: [PATCH v3 08/18] arm64: Move documentation of dcache_by_line_op From: Fuad Tabba To: linux-arm-kernel@lists.infradead.org Cc: will@kernel.org, catalin.marinas@arm.com, mark.rutland@arm.com, maz@kernel.org, ardb@kernel.org, james.morse@arm.com, alexandru.elisei@arm.com, suzuki.poulose@arm.com, robin.murphy@arm.com, tabba@google.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210520_054427_272111_EDE81A84 X-CRM114-Status: GOOD ( 11.70 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The comment describing the macro dcache_by_line_op is placed right before the previous macro of the one it describes, which is a bit confusing. Move it to the macro it describes (dcache_by_line_op). No functional change intended. Signed-off-by: Fuad Tabba Acked-by: Mark Rutland --- arch/arm64/include/asm/assembler.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h index 0a276b46ef50..ced791124b28 100644 --- a/arch/arm64/include/asm/assembler.h +++ b/arch/arm64/include/asm/assembler.h @@ -387,6 +387,14 @@ alternative_cb_end bfi \tcr, \tmp0, \pos, #3 .endm + .macro __dcache_op_workaround_clean_cache, op, addr +alternative_if_not ARM64_WORKAROUND_CLEAN_CACHE + dc \op, \addr +alternative_else + dc civac, \addr +alternative_endif + .endm + /* * Macro to perform a data cache maintenance for the interval * [addr, addr + size) @@ -398,14 +406,6 @@ alternative_cb_end * fixup: optional label to branch to on user fault * Corrupts: addr, size, tmp1, tmp2 */ - .macro __dcache_op_workaround_clean_cache, op, addr -alternative_if_not ARM64_WORKAROUND_CLEAN_CACHE - dc \op, \addr -alternative_else - dc civac, \addr -alternative_endif - .endm - .macro dcache_by_line_op op, domain, addr, size, tmp1, tmp2, fixup dcache_line_size \tmp1, \tmp2 add \size, \addr, \size