From patchwork Mon May 24 08:29:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fuad Tabba X-Patchwork-Id: 12276829 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 5556EC04FF3 for ; Mon, 24 May 2021 18:58:20 +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 1755C613F5 for ; Mon, 24 May 2021 18:58:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1755C613F5 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=lKxNrAdwRxO/mdvOFBgWCjzB+ZkmmCIl3B9ouFAgR+0=; b=UEW6rl5boNkzSbybUsu+UKTkBF +2tjN1QupMhzDR/cvbbo8XVr/VNBLRgXhqmO/lQEGigtKutAbxxJVJrWQeWSl/cBjgI9tQJu/kLMW ZPyb+cFDEUjA6q5E4di02KvGPDzcOFj4hl1fU3dZuCgPHzALXJZxEKwLjFkl4b/wQuHM9cOHPPVJe p9P8fSg6FlfrIm/g2iOR1iZdQX+jl+L9ItwyD6EWV9qtU67HnW5iObn4zrdtYQIP12Orhj55V6OEE AQ2OOZkQN3/EQDvobZagNyCkMeEkEnW+B9MYK+ANg399d5oU1DOWOgbeqKdfTvM1K4fXDCSzarvwE uq/orUWA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1llFkN-001Z3c-4X; Mon, 24 May 2021 18:56:15 +0000 Received: from mail-wm1-x349.google.com ([2a00:1450:4864:20::349]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1ll5yS-000lpK-Fk for linux-arm-kernel@lists.infradead.org; Mon, 24 May 2021 08:30:10 +0000 Received: by mail-wm1-x349.google.com with SMTP id y129-20020a1c32870000b029016920cc7087so3843523wmy.4 for ; Mon, 24 May 2021 01:30:07 -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=fNkwKXSUFBBUoQvNQTJZeD58b/vaDnI+SYNs5VjqahQ=; b=dDJ422fpW93rxwBsiFP++pmczY1hD7Y4UWJl2pjpZjJX69KvqBSKN4YFN66oiEQGMk jdoXcFj5SuuZVRzXkt5auZP65rPgnYfrFBOY5d0uEC/D0f+QsBFdAOCYu0NncMlP5SPM +2rr96Oyb0smZ+TBD05P02nC+eBY50tVnurGJtg1CRFFnYbEuzwwIv/CUSbEVwY1rArR vQtFNX+FUWYbLKWwHXPqLEhcw5/NWfnr0LuCE+3lNGQe56moHjq0z7yVIcQpa/vUhCSI zVARzr3oAjCipnNj1o77K00uuJMB7uVUVsB6WujzcD+QPt0mcpZjo+Aav8I2G6eZj6WR MbbA== 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=fNkwKXSUFBBUoQvNQTJZeD58b/vaDnI+SYNs5VjqahQ=; b=CRXgVlr26hjOG6Q5RSuGADnHDTamNqjgKSExkvq1suO9XI2CJkwPxztEMOkVrjtGT/ DfPW6iGs7aBpMQSOZCMoe3KdioSQmlS7ABg86z4aibUK3Qz2882VIPosG58vghBg006a 9ZS0BWePWHWjWC8oXDXo0NGr7QeODbLcOvJ37XJKFWZxVej5CiX+G75LwpQuBoaDtSuI 9mB+0XKvB9VNFCvaCULBvnRPDh60mvI9I0H4YZoTY5dYqAhUR00ByWNV8HZKkIq2zF2c xxod2d4pScuAzuCx95AaSB58iu+QptPqWywG+QKsZlD2e73ohouQLCnTIilV4XaZ3peL QCEQ== X-Gm-Message-State: AOAM53080aJydNAFTPMoJ3+WTdqVt58c82fNir3pqfBMA1fEHpGF3ugh 8SK/8+rlkKp200e5B/vxGO94Gn8FN1KPMFSDS60//UE2zB+rWYITN9PNZWWpzMuDj4fQQgPv/mw R8Fupp7+8TxWrP30D6jIbTfIr2PtTeoC54MLk2aOWL+BmVP0qlUghQ3eA8Jv3s+1DEacmssJdEr mScQ== X-Google-Smtp-Source: ABdhPJyfKIG8pgxclz7CjVCk3bQ6lqU7r9XrUoRVXYuEc55ePvXVFYUwFSk7ZkiBTYiPhONMAZu0cXqsbw== X-Received: from tabba.c.googlers.com ([fda3:e722:ac3:10:28:9cb1:c0a8:482]) (user=tabba job=sendgmr) by 2002:a1c:9dc6:: with SMTP id g189mr5328931wme.59.1621845005772; Mon, 24 May 2021 01:30:05 -0700 (PDT) Date: Mon, 24 May 2021 09:29:44 +0100 In-Reply-To: <20210524083001.2586635-1-tabba@google.com> Message-Id: <20210524083001.2586635-2-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 01/18] arm64: assembler: replace `kaddr` with `addr` 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_013008_549885_BC800E9E X-CRM114-Status: GOOD ( 11.55 ) 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 From: Mark Rutland The `__dcache_op_workaround_clean_cache` and `dcache_by_line_op` macros are only expected to be usedc on kernel memory, without a user fault fixup, and so we named their address variables `kaddr` to make this clear. Subseuqent patches will modify these to also work on user memory with an (optional) user fault fixup, where `kaddr` won't make as much sense. To aid the legibility of patches, this patch (only) replaces `kaddr` with `addr` as a preparatory step. There should be no functional change as a result of this patch. Signed-off-by: Mark Rutland Signed-off-by: Fuad Tabba Cc: Ard Biesheuvel Cc: Catalin Marinas Cc: Fuad Tabba Cc: Will Deacon --- arch/arm64/include/asm/assembler.h | 32 +++++++++++++++--------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h index 8418c1bd8f04..6a0fbc599196 100644 --- a/arch/arm64/include/asm/assembler.h +++ b/arch/arm64/include/asm/assembler.h @@ -377,47 +377,47 @@ alternative_cb_end /* * Macro to perform a data cache maintenance for the interval - * [kaddr, kaddr + size) + * [addr, addr + size) * * op: operation passed to dc instruction * domain: domain used in dsb instruciton - * kaddr: starting virtual address of the region + * addr: starting virtual address of the region * size: size of the region - * Corrupts: kaddr, size, tmp1, tmp2 + * Corrupts: addr, size, tmp1, tmp2 */ - .macro __dcache_op_workaround_clean_cache, op, kaddr + .macro __dcache_op_workaround_clean_cache, op, addr alternative_if_not ARM64_WORKAROUND_CLEAN_CACHE - dc \op, \kaddr + dc \op, \addr alternative_else - dc civac, \kaddr + dc civac, \addr alternative_endif .endm - .macro dcache_by_line_op op, domain, kaddr, size, tmp1, tmp2 + .macro dcache_by_line_op op, domain, addr, size, tmp1, tmp2 dcache_line_size \tmp1, \tmp2 - add \size, \kaddr, \size + add \size, \addr, \size sub \tmp2, \tmp1, #1 - bic \kaddr, \kaddr, \tmp2 + bic \addr, \addr, \tmp2 9998: .ifc \op, cvau - __dcache_op_workaround_clean_cache \op, \kaddr + __dcache_op_workaround_clean_cache \op, \addr .else .ifc \op, cvac - __dcache_op_workaround_clean_cache \op, \kaddr + __dcache_op_workaround_clean_cache \op, \addr .else .ifc \op, cvap - sys 3, c7, c12, 1, \kaddr // dc cvap + sys 3, c7, c12, 1, \addr // dc cvap .else .ifc \op, cvadp - sys 3, c7, c13, 1, \kaddr // dc cvadp + sys 3, c7, c13, 1, \addr // dc cvadp .else - dc \op, \kaddr + dc \op, \addr .endif .endif .endif .endif - add \kaddr, \kaddr, \tmp1 - cmp \kaddr, \size + add \addr, \addr, \tmp1 + cmp \addr, \size b.lo 9998b dsb \domain .endm