From patchwork Thu May 20 12:43:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fuad Tabba X-Patchwork-Id: 12270195 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 8837DC433ED for ; Thu, 20 May 2021 12:49:13 +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 0C28961163 for ; Thu, 20 May 2021 12:49:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0C28961163 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=ynVYVKTg0UV97aS4ty1ynSREQvcX2qj/vNa28o+iFB8=; b=cRhD6PJJMllz8X PQrxz3rXUgjCr2mfX4mNjm++Ah1JKow8PpOS/zmiGBoZvWEmNKjd582M8uH3AgvzauJJWnhpQ2bh/ RleNepZYHXT/s0LvOPzLp7PLpPLgwhQe2VjcB3xiToIsE783j2JI7y2UkBhrKrHPk+KEUUrMSrddZ T/+s58wyD1I7LkMV+M+dgxgwI9QPXvWHDXYF2ie0RLp3mUdExroZzwuAI18Zs+MJZj44p1VfRzbah JZW8fFgSc4g4c05K1dxnhvQe5pTloKuz1jQt/7ZzFfHV+SLHp0EoIYUnRVhNhtuNRiK96CH+oy7Xt R0TFrYhHFM4rs3BV+YKw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lji5Q-000w7v-Io; Thu, 20 May 2021 12:47:36 +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 1lji2S-000u1c-5g for linux-arm-kernel@desiato.infradead.org; Thu, 20 May 2021 12:44:32 +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=7BZZdjgKJC74gmsJNzueWJli3QPBatE8jTGovmrrUAs=; b=P+Uy7diUFtnZy93o+aRjcJL3Hx RBr7Me6ZS8NdX5Q5CB1SITULYbwK+zp7RmLYJGJuXsuef0SMPMLzhR9oNtrNWPWzr0b4H4gjiy+WJ mGnnxO3WCZN59Zy+XoItY13R4JJCTO1e25Mm578PKyLtKnU037qd/RYhgjnJb/sWn3XR/9ioxl2mC 9eBESD2zyV0feVmt5AiiV7+Tx3v4+x0HzS1qxQrCz//3zJ4AvLUBrPCX8M+t2Ctf7JDvCqbYUkoZs B39M2hiP/7oKj9wgrDcKxdE6DuyfrdTJRVu7YNEiJdo5vyOLKRCOnp43KTdaDqkJe4RW81b/P/rb3 InBFZpgA==; Received: from mail-qk1-x749.google.com ([2607:f8b0:4864:20::749]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lji2P-00GKen-LB for linux-arm-kernel@lists.infradead.org; Thu, 20 May 2021 12:44:30 +0000 Received: by mail-qk1-x749.google.com with SMTP id u126-20020a3792840000b02902e769005fe1so12373784qkd.2 for ; Thu, 20 May 2021 05:44:28 -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=7BZZdjgKJC74gmsJNzueWJli3QPBatE8jTGovmrrUAs=; b=I6u/tY6xm6POIbz2zVrsnpPDbqOgjLtwd8hqC1FyaI12DEHWLRae3xwycFSHcN+O6K cL2I0uIGNZvSvMyejjwh7aZA5nRqAYVK54P4IfL3gdrrPW/99Oqp0D75ejxjGtjGqig5 41hvo2AJFm3UoCixLlRtjj73PNpGGfaz2N5uZJSK4q6LsHQh8e00riCRtNkNRk0y4SUs K64SgqNy1Nwq5qoVsxynBt8+0ct4bdoPW/mBq1R661hMVHVJNCYL9NH1oId6mMgdSszX 8gRMex8oUQF4opmFupl1GTTGtJiKdTG76fXOMSLHzr/4Y2UlTU3lN3Md1EJrIAgPw731 joEA== 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=7BZZdjgKJC74gmsJNzueWJli3QPBatE8jTGovmrrUAs=; b=JK1VLqD2xgvtkPj/vqT+79Qr0mV8bL3KkPBg1AIbhvOR6IG4YGxyWpjYQteubtblCx Jypq7nnhhhAPjAGZsK6LCm/1tUECyyM311YCw2oTbFgvMO9Z6cwD3fLDLH6zwyI5sy2i R7V5KQPvqPigtZ0GWyzuTlXk8IUolHytLssKZh89Wk08cVsa9ABvX18y/0BYJAC13MMq 3JdTtQ+1DNjkyecCLogVVD1FYqCs21R/AegG3DUrYFrwzEw6keMpIMcUJn60ep6el3LQ zuWOc1QvHbhNGPBfjhBM8m/krWK3oYHzUY4IkvsDgqwhCnEsVrTjSFsVkYd6xljwWZdQ U++Q== X-Gm-Message-State: AOAM5303kxWMUhs//ED/2nm2dqmqpZ66QakBoywiEM3iSZNWpZYYxqal snAJ5eqgMLym0xhWgH0A0IVac8EX1RIKHkIRxEcobf1bR6ctkBQrkT+6eON6JhKd6kIGDXWDjdU PxoUnGoycg/NfuayA7kuWc3lKGokGqBXfAAR3JdSIO09qYwt5QoTD0px9ROesTT2+cDuCSo+NLm VuTQ== X-Google-Smtp-Source: ABdhPJxJjaFlPkXGH99ACDYlC204HuHXeyuL7Til9z/qiZBe9kR7XPH6Pzn3O4AhvG6vuKFVN1skAlB+KA== X-Received: from tabba.c.googlers.com ([fda3:e722:ac3:10:28:9cb1:c0a8:482]) (user=tabba job=sendgmr) by 2002:a0c:e98a:: with SMTP id z10mr5304774qvn.36.1621514667193; Thu, 20 May 2021 05:44:27 -0700 (PDT) Date: Thu, 20 May 2021 13:43:57 +0100 In-Reply-To: <20210520124406.2731873-1-tabba@google.com> Message-Id: <20210520124406.2731873-10-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 09/18] arm64: Fix comments to refer to correct function __flush_icache_range 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_054429_718152_7AED53B9 X-CRM114-Status: GOOD ( 18.73 ) 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 Many comments refer to the function flush_icache_range, where the intent is in fact __flush_icache_range. Fix these comments to refer to the intended function. That's probably due to commit 3b8c9f1cdfc506e9 ("arm64: IPI each CPU after invalidating the I-cache for kernel mappings"), which renamed flush_icache_range() to __flush_icache_range() and added a wrapper. No functional change intended. Signed-off-by: Fuad Tabba Acked-by: Mark Rutland --- arch/arm64/kernel/hibernate-asm.S | 4 ++-- arch/arm64/mm/cache.S | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/kernel/hibernate-asm.S b/arch/arm64/kernel/hibernate-asm.S index 0ed2f72a6b94..ef2ab7caf815 100644 --- a/arch/arm64/kernel/hibernate-asm.S +++ b/arch/arm64/kernel/hibernate-asm.S @@ -45,7 +45,7 @@ * Because this code has to be copied to a 'safe' page, it can't call out to * other functions by PC-relative address. Also remember that it may be * mid-way through over-writing other functions. For this reason it contains - * code from flush_icache_range() and uses the copy_page() macro. + * code from __flush_icache_range() and uses the copy_page() macro. * * This 'safe' page is mapped via ttbr0, and executed from there. This function * switches to a copy of the linear map in ttbr1, performs the restore, then @@ -87,7 +87,7 @@ SYM_CODE_START(swsusp_arch_suspend_exit) copy_page x0, x1, x2, x3, x4, x5, x6, x7, x8, x9 add x1, x10, #PAGE_SIZE - /* Clean the copied page to PoU - based on flush_icache_range() */ + /* Clean the copied page to PoU - based on __flush_icache_range() */ raw_dcache_line_size x2, x3 sub x3, x2, #1 bic x4, x10, x3 diff --git a/arch/arm64/mm/cache.S b/arch/arm64/mm/cache.S index 7318a40dd6ca..80da4b8718b6 100644 --- a/arch/arm64/mm/cache.S +++ b/arch/arm64/mm/cache.S @@ -50,7 +50,7 @@ alternative_else_nop_endif .endm /* - * flush_icache_range(start,end) + * __flush_icache_range(start,end) * * Ensure that the I and D caches are coherent within specified region. * This is typically used when code has been written to a memory region,