From patchwork Mon May 24 08:29:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fuad Tabba X-Patchwork-Id: 12276587 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 1513AC04FF3 for ; Mon, 24 May 2021 16:32:01 +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 D57CB613D8 for ; Mon, 24 May 2021 16:32:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D57CB613D8 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=orz/wos7Wp3uEeEwX8j9u7Ksc6exx/XZUeacFgkHU/I=; b=hnARBGKAOnX1ODNBQZEqCMpsQB jGE2Hvl40zpwWz4PZxFi/oQfuKTjWHaEA0FJCc6BFY9+BA5ikvOMQmTNBEt+GbQpKF4SReshY7HQU dijfZzecnyj46GYa64Y1toz/dz2s3/xR0Of6JXQKtbncR8bF6peQYdWxECQv/ehIBgw4ZVveNJn77 NQLorsaSum3QN+l3+HQp8hGZhj/Ys+1W/9l+LKf1kIVqA7YLJLl/hnQtlvcNEvFALhdrM93FTbp6y lxzRbRUFU3dlxqH3G/RiCHKSQKZe7U0AdNHxeAOloYJqe6X237MTGPJuC9z2SBXLd+4ljfaEDsOTa 3LtEwdgw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1llDSb-0016zo-HW; Mon, 24 May 2021 16:29:46 +0000 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 1ll5yW-000lpp-9v for linux-arm-kernel@lists.infradead.org; Mon, 24 May 2021 08:30:13 +0000 Received: by mail-wr1-x449.google.com with SMTP id 7-20020adf95070000b02901104ad3ef04so12741414wrs.16 for ; Mon, 24 May 2021 01:30:10 -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=YmlU9zjuFsIgzZ6SyP/pAHXFug+N0HjjRPVJmEU6amE=; b=AK6u8Xvq7En/tDAkHKoIGSEIgwsijk5UI5oTMMLQh0q7pqqiMLnNU3XFqWlQWTF2BD 6FdHVWaVhoneCmgCOZ0fjqgp35QSIerDZcHJiqhOnVpv6t4asiFuQpyHvG1UEcqh37gK K8Jd4iQl+t4zSMy58a/oQ8yP2INX4q3UmrRuidUtkeYX0yCgMXAUuoVye2FFFxKg2H8g cC5Qz+wxlrl31of2EhgmsnH0T0uZGm1XSkCrZZIAPmnt7ZRJ2bky+Mvzwk1Hmljl52/N 6lnfS0L1DRHBj12um0GM83Th7rGWChkTlX+IZ6VS42yfyYPRQeHDBR6EZExJW6jXsXe6 gDIA== 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=YmlU9zjuFsIgzZ6SyP/pAHXFug+N0HjjRPVJmEU6amE=; b=mf9SLsSM0mB2ovmybg8T1vVKbxpXBLdN/xQKZKuNdNMdDwk1I1c7W86rQwUc3w1lfQ KtXK3v2KZk4Xkiz1Vw+pdwcVL/MBLPfwA7UobzJKwRO2pIBkXgMLbqQBQQs3lwGm3IfW 0kLOoFjX+EjN9UgH1l7C3mE9wRIxNzGE7AhX3pd8j+SRXbt1BLb3edBzisvqn0MWQk21 0Zs1sNCzTxGaKOw0oX4TuMRJ765WbNZggz7Lpra4ydHYf3lp4NZAyaBNw6n7P58c3sVQ 1WEXy0kaZ0AAVbAlBk1gTd3xxLWhSE+e+aWIGzYVJ0cLFth4WAA9L0LcyAHoNwHnv7UH OMZQ== X-Gm-Message-State: AOAM530g4xe1XLvWMBsPWWuiFwk8FE/I69htlG6usQchu8B6V6Z3D6m7 OQ3oR/weED4ljMeiZV0U7P5RV5dFcJSb3QzTy3KItCad35GiZ2Ah/b5lSfmBFVL1gnIPph43Zo7 6JS4FcwVyfKPw0NIfrgi4QyVNam1yNQEHsysFqzgXdZG6ImlK3v0zgDZw76HgzLnC6j6N7QIXBt l19g== X-Google-Smtp-Source: ABdhPJzE/pmeKdCZ4xsFJ7X5tXDpkNBCbOvatQtPsqs38KOLS4YtLK04oZXy7UTHVFEs6v9gDe4mvL35ww== X-Received: from tabba.c.googlers.com ([fda3:e722:ac3:10:28:9cb1:c0a8:482]) (user=tabba job=sendgmr) by 2002:a7b:c92e:: with SMTP id h14mr18397486wml.179.1621845009758; Mon, 24 May 2021 01:30:09 -0700 (PDT) Date: Mon, 24 May 2021 09:29:46 +0100 In-Reply-To: <20210524083001.2586635-1-tabba@google.com> Message-Id: <20210524083001.2586635-4-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 03/18] arm64: Apply errata to swsusp_arch_suspend_exit 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_013012_362284_D543870C X-CRM114-Status: UNSURE ( 9.04 ) X-CRM114-Notice: Please train this message. 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 Arm errata covered by ARM64_WORKAROUND_CLEAN_CACHE require that "dc cvau" instructions get promoted to "dc civac". Reported-by: Mark Rutland Acked-by: Mark Rutland Signed-off-by: Fuad Tabba --- arch/arm64/kernel/hibernate-asm.S | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kernel/hibernate-asm.S b/arch/arm64/kernel/hibernate-asm.S index 8ccca660034e..0ed2f72a6b94 100644 --- a/arch/arm64/kernel/hibernate-asm.S +++ b/arch/arm64/kernel/hibernate-asm.S @@ -91,7 +91,8 @@ SYM_CODE_START(swsusp_arch_suspend_exit) raw_dcache_line_size x2, x3 sub x3, x2, #1 bic x4, x10, x3 -2: dc cvau, x4 /* clean D line / unified line */ +2: /* clean D line / unified line */ +alternative_insn "dc cvau, x4", "dc civac, x4", ARM64_WORKAROUND_CLEAN_CACHE add x4, x4, x2 cmp x4, x1 b.lo 2b