From mboxrd@z Thu Jan 1 00:00:00 1970 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, 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 0C49CC43460 for ; Mon, 17 May 2021 07:59:55 +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 98E1A61209 for ; Mon, 17 May 2021 07:59:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 98E1A61209 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=CXhi4lzPuXmvRYQfwVk4309bnGF41hksGbwEngGPmz8=; b=pCqSUhj2GHiS21 L4flrTZtIXKSlJDdVkI8MbLkRwG2/kJ0N7pHgFgi1gT8lhD2vJVZUy4ZU0bHoAyO5EEYXbu/b4wrc f81PehSd7VTDDMkhwanlR7dxCr9QyVhGAy9uKHMRih0byaVZpQg4+3UsLBjaCkpv16kYow821rwWu QvJ60Wxjr7PKJsbFrN3HmLOeYR/TPUkFqWOsiq6m4lGQNTOm79JeV6822NSMd2F8g/gwbSERmzLC/ aFDUH+lWVZhsIPnwWkEf194y1yAcqyOCVT/tx+AMUU8lbCWMow2zQGH1y2FaxOP5+LXoMIQWd237N N8I0IKbLSi/X0nx4H6VA==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1liY8U-00E7yZ-QD; Mon, 17 May 2021 07:58:01 +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 1liY2S-00E6aB-Cz for linux-arm-kernel@desiato.infradead.org; Mon, 17 May 2021 07:51:44 +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=GGoPLHDONIt+FatAKZW3+YCjiZQxlf9ftdwwMILI57c=; b=m5nXttI6xw7YOSvRd6pz+6muqi 9dYDC9F1DX0FEFqGJrfRjFnKu+lh8eQ7IqJ6tiNzDCrrg4l3uHdxCe1VHTCzyfHENDFB2yuzner+j MtPJ4Qtcc3mKzeUFOPlwUHkxNaYBvyxZJTHX1+VEnLKxju7CyoJ7cD+1ryQzJ3g3l025l9/ascxI4 5e6iR7B/hAPuKlZxz5V2BnXHs6m8hEX7RkNvQQOl0KSxOyNrggP/p/Ll4kWqQWL1HDpJYKF8ZPoCw GaZGXWYWx1IsSty24NftuVLjQFqBZ0lBwC4qTCreChKbCe/XBo0wmKB/3rbE9nmvNVILA55UYuuwG yQNrkCLA==; 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 1liY2P-00DYxL-Ra for linux-arm-kernel@lists.infradead.org; Mon, 17 May 2021 07:51:43 +0000 Received: by mail-wr1-x449.google.com with SMTP id j33-20020adf91240000b029010e4009d2ffso3469483wrj.0 for ; Mon, 17 May 2021 00:51:40 -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=GGoPLHDONIt+FatAKZW3+YCjiZQxlf9ftdwwMILI57c=; b=M7tmJ7U1f8M7BxV1KyTpRyvlwwNaPlJYSWGjZgprvoWqPpFYIOiaLmbcEewtf/GjaG aymj0yscKVkgysHgFCh5L+HRf84jEqdXjBRxNaXq20yMyCxcwf3OcP5nDKvdnjgNMCpr ODc59rpWIkEjuY4OIc2QRC6m6te1o+H5MxFn3G00SgOHrnidEQ+oXkm/bgvYO84aW3kp CFbBSThRN95PkcTHi821nwvi1BXRo/FnLHAtPInC/I7u3W3yOpYfevQeSw5Fl1oEGWHK I5gWTSoezBYJYkacdN5TFiOGn1LbEKVEaw1BiXK8VIuICVOhoUnkfbzZ51GNTuL7/YCE i10Q== 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=GGoPLHDONIt+FatAKZW3+YCjiZQxlf9ftdwwMILI57c=; b=OI9csfHC781atYP4yftQxjNZgOKH2h7IjDfdNcx7PtOsTkT5k4NmuL813C5tkmyMfv yQCBhG5Ya0PLg2j469kA8fkZXlEjK53WtyJixXZJfsHx7Ps4ugfV0QXkNzXn1P44uhyD LAZdtFhH/3t7/Jbt4NEXbQy16GeTvuk2QqL8LPTXl88FbCJqgz3USZwppSJ4/SEvndfE dDoZb0uOnhoDUOjzgHOj74UArTBTX4atmH581Vlx4gv9LzKVcJ1YFXzdlYdUShpkeqc3 NMbs8SDKSF44tur/W3nQt4LeNu0fomszyyzoOgoKbskb2HqyjhHi7XKKX6GtfGLSzG3K cEkg== X-Gm-Message-State: AOAM530EsMjfLzZh1BM84QGnKAq1t5Y4Wul2GrQeKmLasF7uaWNmkm+w /aNhq499NOcD6w0ThbwEyyprBekc13zO1NGHGWq272Yi1qVuZN4l9+9/MFjBg1uQMkyjsR1Yfz5 bwyPszMDsgGwJeCtGP95XlxBkiZ6UdZeOtwmkfvdDqhVBGqc6efEmxyZN35CaVa5b5U6emejJly Fx6A== X-Google-Smtp-Source: ABdhPJwd2Uv2LjASOIkVaNHztEHIHgrSu29f2kCojee28++/mvIv0GI+h365kLNVX4/AC+YaOEa/M7LBOg== X-Received: from tabba.c.googlers.com ([fda3:e722:ac3:10:28:9cb1:c0a8:482]) (user=tabba job=sendgmr) by 2002:a1c:1bcc:: with SMTP id b195mr6032377wmb.51.1621237899017; Mon, 17 May 2021 00:51:39 -0700 (PDT) Date: Mon, 17 May 2021 08:51:14 +0100 In-Reply-To: <20210517075124.152151-1-tabba@google.com> Message-Id: <20210517075124.152151-7-tabba@google.com> Mime-Version: 1.0 References: <20210517075124.152151-1-tabba@google.com> X-Mailer: git-send-email 2.31.1.751.gd2f1c929bd-goog Subject: [PATCH v2 06/16] 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-20210517_005141_910342_4611F7A1 X-CRM114-Status: GOOD ( 10.92 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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 -- 2.31.1.751.gd2f1c929bd-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel