From patchwork Mon May 24 08:29:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fuad Tabba X-Patchwork-Id: 12276699 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 14DB7C04FF3 for ; Mon, 24 May 2021 17:24:40 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 BD6E061260 for ; Mon, 24 May 2021 17:24:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BD6E061260 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=bombadil.20210309; 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=MTGVgSxq83YqZbijU6ZFqhplwI5nmKtW4l5vTXl54RE=; b=ECYIFyJJ6qKn/L+u9aoWC9oeAN 8g9ZIO2rD1AKvWoZQf1nShBY1/iSYmFNy8NTad0998J+CnR3AYRbGwWecp14/NNWNgv/b8sJ2Pcm7 VRPX0gWQy4ZLpzSYWUKSec85WuqZb0wQf2ThPlPcQDH+eLqRDXUcAO3BaLEYAkAOxvzOGMPsTTGfP feFqxKY5vlwP6cnurX+MshfoHiLsgem2g171azYNXZmgLA3+qa3aG5Y+i59MierLvHPKZLiTfCFoO V9yL0/+uvLzASmJ3y/UX/WbDRnABoy18T3Tl//oG8lBMs0znNEGW+duveLOmpYnPuNdGSk7154YxK ygwWK6qg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1llEHQ-001G0i-98; Mon, 24 May 2021 17:22:18 +0000 Received: from mail-wr1-x449.google.com ([2a00:1450:4864:20::449]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1ll5yg-000lr2-HG for linux-arm-kernel@lists.infradead.org; Mon, 24 May 2021 08:30:23 +0000 Received: by mail-wr1-x449.google.com with SMTP id p11-20020adfcc8b0000b029011277d49b71so374699wrj.11 for ; Mon, 24 May 2021 01:30:21 -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=9LjdpidEJzf1ulFvn76tTBalozVLzOFzmjCu4klXNvE=; b=hPW2JDsPKJIRCsSZL4xLxc9VrSRIACHUiLAOcUGP/L5h8UW8kBA5DTk/uB2iJ+rYej pKzVD+Xweznqj7qPpVOnju13rf3h8xjXJCpavxIbZ2sYUJg5m+x3KQE5vxAMVLP3wF6U JrHPYIsd/9DSFKebr8EXvZtkHc8gEZAOladvuwdBBaQhamo2Sjh1h9pcdcqid75Grsff wThy6hA+WYYBGFz+w+0MluHK2UCZRYOIzRCrlHf44pBdNVmaxQX+hWFi7JTWcnX7gcwS WRBtKD4LvsBe2auRy6pURAMKe/Y77b4KB2tEvg+rSFvjzvEiMdSRy3gxd8JAXm7/MZdG pgog== 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=9LjdpidEJzf1ulFvn76tTBalozVLzOFzmjCu4klXNvE=; b=BZcJRhuE1xIP2+v4JFvnWEH7PsJ3UwK5zrdQJts5tfYA5xBOzIInnyVsxMVuVuUjcn zmnm2WWYFOjPDJRXM4vNIEtOgfevsv1dBwn3lAOWiaq6Q4jtTkYgLVSDZ1aWVUJyQt6K lF0u9lXjDxCYxeUfZPr4q/qZWGLaH3jKhfF7pxQUebQ4nEK5W7yIuwVhxn+sLoYsqEOL I2trSHgtmdTMea032R1kZ5u4bzci6ITifj9MqxFeA2+Op+vstF3kNPdbe4thOO7jfD9C jHmSieDWGfA60KQi4EJReSZksM5wMDtgakLL3slwTaUtIfnXllHqygjTEeARM8uvYrt4 WXug== X-Gm-Message-State: AOAM5321ztbica1XHZGgod50qU4Jr2E7Tpr1Kdmkwj1XpCkmujBzvCEO LFWEhD1UJm8tRUufpm5TyV7beAHe6BXPgJTW+CXngC5pR67pBOCPp5QcP4HxMcEHh4fEf4YBnza Xrizy7mxGxVgYXi47QdJMa41mkjz6wLeKrj+2GPweMP4e8hmdktplq753iGnrQHOvDp1nLDp+pm 85ZA== X-Google-Smtp-Source: ABdhPJy55MT2AJTnB5EebLZ2pZDWkt07E+g6OPrM8pjAKoMcc3JBouEp3h+7SFgJxp/TpZz97HLSoSSPaQ== X-Received: from tabba.c.googlers.com ([fda3:e722:ac3:10:28:9cb1:c0a8:482]) (user=tabba job=sendgmr) by 2002:a1c:1b95:: with SMTP id b143mr3999902wmb.100.1621845020428; Mon, 24 May 2021 01:30:20 -0700 (PDT) Date: Mon, 24 May 2021 09:29:51 +0100 In-Reply-To: <20210524083001.2586635-1-tabba@google.com> Message-Id: <20210524083001.2586635-9-tabba@google.com> Mime-Version: 1.0 References: <20210524083001.2586635-1-tabba@google.com> X-Mailer: git-send-email 2.31.1.818.g46aad6cb9e-goog Subject: [PATCH v4 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-20210524_013022_591237_F69B2A59 X-CRM114-Status: GOOD ( 11.58 ) 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. Acked-by: Mark Rutland Signed-off-by: Fuad Tabba --- 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