From patchwork Tue May 11 14:42:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fuad Tabba X-Patchwork-Id: 12251263 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 90DF6C433ED for ; Tue, 11 May 2021 14:45:02 +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 E6B4C61396 for ; Tue, 11 May 2021 14:45:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E6B4C61396 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=gk3kMM/tzllavDwxtWm/AllivSZJqMNnw5SYesgyuTk=; b=Uq17GU++LELDWY 3N7dWj5HmPVx7hZf9Yb4WBlDj+iAdv/Cq8TAbnjAJIERnBT3lLMPUw9zBXmXlj1DCMiyV+sK0SFB4 iRM3FXu0u4/G02fQngLPKtCT/Dewg6qx5+CslKz64zw9G2pUti+vnKBr0XxVREi16lyDBquU5wZ65 fBpw9CUw/kMNYslcLsn7CBBr65JxFHEEXogouKyrR0NBO1BL2XeVq1Azef5mMxAMCORQQR0xb6f+q g0A7ePFa0tzlrcTPW/e7rT1pHTfzpZWsMBRIHQnQRK02D/PkjkoUZ2HYSDicnOv1nzGdkWmtf2XkI W8F60ZFzGEpU7XFX8nJg==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lgTbk-000TK3-UU; Tue, 11 May 2021 14:43:37 +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 1lgTbG-000TEs-At for linux-arm-kernel@desiato.infradead.org; Tue, 11 May 2021 14:43:06 +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=X8uS5WuD5KRPXhFVQzC7JRTXmBEm1qdgTenJ1j4LBVI=; b=E0xpaLjZhOUMzyOvQxnZmzJymq 8Em1AfdZa29alvfX6APq1CrIBo7wiRae5wJLiAlhlpUTdUpVPz5RgcnfSr6AJUGM8bDHSx/BQazQq BkOJldFj+ByDeiUc+b67HcNVDq7NU9uros6R/9MtPANHV2m4yR7ci7MZqYAIH5W0DUyDxDX0WW0LY 66fD8+rmX/fBmytzT9HR6vixWEhkITS1sOQNh82MngoRtXKZ/s33TMP5/+MwY/sJdiAsvlT2b31pK dQb85r9wq5xzhREjC3HaYWpws6GTDLIxKIoUYBzBcX8Y3ajMbXR9isixoMosgcH8OgZTK/i17gBV+ vy/GquVg==; Received: from mail-wr1-x44a.google.com ([2a00:1450:4864:20::44a]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lgTbD-009gUo-O4 for linux-arm-kernel@lists.infradead.org; Tue, 11 May 2021 14:43:05 +0000 Received: by mail-wr1-x44a.google.com with SMTP id c13-20020a5d6ccd0000b029010ec741b84bso178475wrc.23 for ; Tue, 11 May 2021 07:43:02 -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=X8uS5WuD5KRPXhFVQzC7JRTXmBEm1qdgTenJ1j4LBVI=; b=ah9Kk27SQ9bettLiZEHIO4ngZzwIwZ2CT18IeEEU7Egr2j9B+udmscNQHVRrG2NfBO GuaD9prqShAN1m5+9DIDEgtuipLljxNL1LCsiWJ9Q+JE0RteRZ2pQsSJhK92/vfXhNlt gAMld6P4OCsnjwDw5jEKWxWXFyD2jMQKvesCVN1zHtzyruxYJP7ffT0Su+lFGK7qNAX6 PRIGkUnkCwScccVIAmJXl8pKxaXt6xllb+hrgKk0TJg7VG36dZ48lWbXbD4cov4l4vV0 eFRxvch5lwiYVpwLydOYrB4v6AyL6T/pCpdWYyh0ygcBWf6spqs99emRPqieX8iTFiS8 KlSg== 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=X8uS5WuD5KRPXhFVQzC7JRTXmBEm1qdgTenJ1j4LBVI=; b=kADuvVnF1+HYnbW6EGftE41hGuOho2fH2KKwOxS1DnboZLEn0Qx1YOJFkqnsd8ZM5j OReCOw3bkLUsjH84rMVshh+oUtlnHSkwq0ULZQnyrvCOQjFxHx587XLf4I5u5FaBDghp eKS3wc+N8+VzM3TkegXWyPV5yCj+f/EZZH5MxGing1fJYNJru/MFUVU+2wlnQhGUSBBJ 0qLpD98FgQhsNfsJ5SzMAYbGdZJsCQTNgTiMPfRnQSGmb+rGmO5TmYldVRILRt35fw2l +p/gzTaf12rPLbV36VRrfxFAFq36L4Kz3kDGj1qWtgYkuocf4xml3yyRmNb+mtputrDP 58sA== X-Gm-Message-State: AOAM532dqQpGUwP6wDKpShkkv6d31/MhpK7XvG70hka8MAKCK1zyt2TR fvShxS9Wh7R8zNiUnbUfaWQ8LSVfH33E+ATT0i/9ILCtlS81UliKB6zaCJCKc5L4VoGjgLfjn+K bohwh+RWq+fFYM1wlZiAHeLxwUIUZ7bEhq/jHYuUz10peZPWR4Oqab1dSZ3ywYu77Atoz/A8bGS y2fw== X-Google-Smtp-Source: ABdhPJwyZOtmJdffSAOboLrZmkY9x3d6QJ0ERUh9ojGDzsDluuuCQ5qTYbBxpR381rT963FjAamIAlZWFw== X-Received: from tabba.c.googlers.com ([fda3:e722:ac3:10:28:9cb1:c0a8:482]) (user=tabba job=sendgmr) by 2002:a7b:c74d:: with SMTP id w13mr32288041wmk.25.1620744180847; Tue, 11 May 2021 07:43:00 -0700 (PDT) Date: Tue, 11 May 2021 15:42:42 +0100 In-Reply-To: <20210511144252.3779113-1-tabba@google.com> Message-Id: <20210511144252.3779113-4-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 03/13] arm64: Downgrade flush_icache_range to invalidate 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_074303_800963_9352CC5B 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Since __flush_dcache_area is called right before, invalidate_icache_range is sufficient in this case. No functional change intended. Reported-by: Catalin Marinas Reported-by: Will Deacon Link: https://lore.kernel.org/linux-arch/20200511110014.lb9PEahJ4hVOYrbwIb_qUHXyNy9KQzNFdb_I3YlzY6A@z/ Signed-off-by: Fuad Tabba --- arch/arm64/kernel/machine_kexec.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kernel/machine_kexec.c b/arch/arm64/kernel/machine_kexec.c index 90a335c74442..001ffbfc645b 100644 --- a/arch/arm64/kernel/machine_kexec.c +++ b/arch/arm64/kernel/machine_kexec.c @@ -70,8 +70,9 @@ int machine_kexec_post_load(struct kimage *kimage) /* Flush the reloc_code in preparation for its execution. */ __flush_dcache_area(reloc_code, arm64_relocate_new_kernel_size); - flush_icache_range((uintptr_t)reloc_code, (uintptr_t)reloc_code + - arm64_relocate_new_kernel_size); + invalidate_icache_range((uintptr_t)reloc_code, + (uintptr_t)reloc_code + + arm64_relocate_new_kernel_size); return 0; }