From patchwork Tue May 11 14:42:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fuad Tabba X-Patchwork-Id: 12251265 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.4 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, URIBL_BLOCKED,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 0B644C433ED for ; Tue, 11 May 2021 14:45:37 +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 6C26661288 for ; Tue, 11 May 2021 14:45:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6C26661288 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=YT6M8TPtCn1e4ajnA8ynUr0GBBHexyHPi6Vdsn7u6e8=; b=V9Ju4FZSTO6zNG 6ntnCvvImNr4wtJ54oCmyDaCkwV4ndbgDqw58zdAF8E7UvYAxmPtUynrsouweg5RJzSe/5Nz1CM97 GyO0zTOsPMkjEUZFdfVwfYQfOh9DELrUrolWoQAfde0HYwhKpFW+Znt1Bq7DP+0bVvrkAXH8Oc/mT tIFfsf8zAH7qq1EvCvRsB0e6wA9oU1EuDfQ9eIN30XneyRjblgx4lxyHlzZ9M45GX59FcjZiDeArV eevT1igL4mmseCnJQE/vr0XOMdeTGPO7HtuTvKmK0vqd3Zg3HsWTYdJnR+O8lN/g4S/4aH7uC8vrZ 0vUNgSPm5OZO/xkTfpqw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lgTbz-000TNh-6C; Tue, 11 May 2021 14:43:51 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lgTbI-000TFD-38 for linux-arm-kernel@desiato.infradead.org; Tue, 11 May 2021 14:43:08 +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=m/UmUoFHs6dE/qmIWg03H9xxYPy7qfidkg1ny1Uz5lo=; b=gQO8T1rHL0j3qqeLitNyaRrNOe 81+FWJ+s6kzQu/epYBP1/Whs9nm39fxe+lCwAD7cwwW69uu9srrlpgsI2Kjwz7qhk9BDky5Sti6kV cj/Nqd/5iPdiy0jG750lYXUqwremAdkFM1oxpe/jJWEAm17TOFvwQ1J9VDONIsFum+y8S1QrBKP4g 1PfZBbxNyQGrWZOQ60oujG+LZg2MHHtzNnE1iHObek1MbCdTpKteNNCGDnrOC5aHDSO0g6Jga3FeP 4yz0iNjUIlBwfVESpVVsFt6GptDfNzHzBoZ4t9X3EiDz3/ard8C8GQHOfLzTncgWfofmfzlLHfgJj GiWDc74A==; 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 1lgTbF-009gV4-K8 for linux-arm-kernel@lists.infradead.org; Tue, 11 May 2021 14:43:06 +0000 Received: by mail-qv1-xf49.google.com with SMTP id d11-20020a0cdb0b0000b02901c0da4391d5so15716915qvk.12 for ; Tue, 11 May 2021 07:43:03 -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=m/UmUoFHs6dE/qmIWg03H9xxYPy7qfidkg1ny1Uz5lo=; b=pB+9I2jN/yjPoYYJURvAPDYZpvmfMzVl69HyreCcGUzwX4y5e5ujHoae06oVgT4UfB 1guHC8Ri19vHyuK2CuNm+cCcQT+YjFuPO8uV5EIGbMVKaQ9bKNGt+Rr3NvgKiK5wkfQp Xn3H6HFIi5LoGMBgWIkXcy+p3KesIK3As4uWZwZ82E6IBt2mMoldN3NiNGwZoNScLhmb eYaZ2OpA6sGaESi9aXO5WmxCE+K6FGhSUqzVVG4B4z4MVQtna7YmfG10JGt6+GuBj1zG TR+X9w06RdAVLeZ0j5x4UuXFpqF+vb/ZWtMHkgt0l4nhe6dUwn/EfzO+gLKMYsnAAsLY Mnpg== 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=m/UmUoFHs6dE/qmIWg03H9xxYPy7qfidkg1ny1Uz5lo=; b=De91ie086JP9F2vqdRF9rWfcEKN4AQDmXUiQXwNoJOTY66gx+gzlgXuM5PzgNQjQvU n8OJemK5lG3tGWqcfZA1zsaxIwua/O6ymGwgMPjj3ofaFECqgEslwfRnnt1B42zD6hbB viw0ZNBLUI0ZsedFoZOWcRdzNxUu8QO97kqP+ycMCNSTomgfVMMJb0EnWOQ5lbNDuFN3 vxsPj1IOQvW79WPAG2MmiyQmbZUmeY0CrWRYjXPM0T+rM2eU1MZ9bzHo8YrcsfzJAhcQ LhErgvUyMf2u8YDfxHa7AMBIh6MYY7+G2eH47bVKZuNg3aRLm+5QkYKnq7JOf1uc5H80 gNDA== X-Gm-Message-State: AOAM533Zz2zjg1J/KKkO2Ij7Xh8RUwvmI4/gkELHGWjbr2lO6BUHK1dn aRVbvh4sZnfv/o0OSk3+tC8A22KnaEgLCPGpt4Y56Q8FfDANTS/KTsd93tpNUyk6HbeK5A4oKcs yijUrY3Z9g4EoeJmlKJld10T6DTY5laxrGGqtO956FMqHTmd3OAAo54DTXhz1h8/yJymDDFRMjo ptwA== X-Google-Smtp-Source: ABdhPJyvqG7S5/6iVZkeBEl9vcrGwXJOLs8M9ukh4GfoTv6eqhy1D/NTUWtjvK2dOCxCdNlS7GpNPAgKfQ== X-Received: from tabba.c.googlers.com ([fda3:e722:ac3:10:28:9cb1:c0a8:482]) (user=tabba job=sendgmr) by 2002:ad4:4441:: with SMTP id l1mr29203377qvt.1.1620744183016; Tue, 11 May 2021 07:43:03 -0700 (PDT) Date: Tue, 11 May 2021 15:42:43 +0100 In-Reply-To: <20210511144252.3779113-1-tabba@google.com> Message-Id: <20210511144252.3779113-5-tabba@google.com> Mime-Version: 1.0 References: <20210511144252.3779113-1-tabba@google.com> X-Mailer: git-send-email 2.31.1.607.g51e8a6a459-goog Subject: [PATCH v1 04/13] 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, tabba@google.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210511_074305_682324_999732AE X-CRM114-Status: GOOD ( 10.79 ) 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 --- 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 6ff7a3a3b238..2bcfc5fdfafd 100644 --- a/arch/arm64/include/asm/assembler.h +++ b/arch/arm64/include/asm/assembler.h @@ -375,6 +375,14 @@ alternative_cb_end bfi \tcr, \tmp0, \pos, #3 .endm + .macro __dcache_op_workaround_clean_cache, op, kaddr +alternative_if_not ARM64_WORKAROUND_CLEAN_CACHE + dc \op, \kaddr +alternative_else + dc civac, \kaddr +alternative_endif + .endm + /* * Macro to perform a data cache maintenance for the interval * [kaddr, kaddr + size) @@ -385,14 +393,6 @@ alternative_cb_end * size: size of the region * Corrupts: kaddr, size, tmp1, tmp2 */ - .macro __dcache_op_workaround_clean_cache, op, kaddr -alternative_if_not ARM64_WORKAROUND_CLEAN_CACHE - dc \op, \kaddr -alternative_else - dc civac, \kaddr -alternative_endif - .endm - .macro dcache_by_line_op op, domain, kaddr, size, tmp1, tmp2 dcache_line_size \tmp1, \tmp2 add \size, \kaddr, \size