From patchwork Thu May 20 12:43:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fuad Tabba X-Patchwork-Id: 12270183 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 71BDDC433ED for ; Thu, 20 May 2021 12:46:54 +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 0209461001 for ; Thu, 20 May 2021 12:46:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0209461001 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=jkku/NH5WxgSRSbFk9Q8st7tj/1tkeBJwjoO8i0mmr4=; b=a1F3XI2x6BEDfw c6HCaNKQWNpkfm0LKI2n19pUbuIjxPjRqhNPQ8nRveQg9IKGU3euxGZKHV1dUs8bskfKLTJlvVTaW 6Gg+eIX+8ftmiYP5CGbxQcgUHQdgimidK6HWbjk34cuQSwKfyZNHLAEoPdTNFELtx9p1RSIU7Z2nY T/3bEbMc05p09f5pJM8jOIJNg6Qu3CLqPL9m76V6MSvQluEp1vxN9C3+6gm7SvT6oNr9PNfC/I3wY VVKvXybPJ+RSbHgxDheY6HGSGlJ9Dyvd37E0uoQPy1gMoR7JRkVPNjrfaD/OY2ZbkDsSu74/0gOBf QSTyurEiBMrssKovyjcQ==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lji3M-000uTz-0B; Thu, 20 May 2021 12:45:28 +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 1lji2H-000tym-0H for linux-arm-kernel@desiato.infradead.org; Thu, 20 May 2021 12:44:22 +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=ahqZ8V/+zcLNEI2Yj0kSxAMlF/YVwDMa5CLwXEXBovw=; b=30p5HmOiRXYpEHC/bdaQhQ0zlm mGre2nsNp2im8re4pO2wqLCBOrKRnNWgrkzzZNcLDhmFHnBrp2OxsAPoAbhHNErtE9NwCX1VRia9V Lxz9obgyy2Wtf4rBlEP/kl6I+wLr1SzG9AT+lyhevXmw99isC/an9EV/lq4t0McnaYtwTAzGV7kCb LpTuzsKLYEohUiwXmOrsIXEC4VTIdP5PtHZiUgvCBbPGZXP0dUKvBm2H3Y67rvFi7bTg09AWCkOGf BitG5GzBcYnkcGgzILRNBd7IOy56iFW+i4bmCZ1j8rnv5IimYM63qKCDUd4WbYgHyY+i0l/GxMz/X k2X4pemQ==; Received: from mail-wm1-x34a.google.com ([2a00:1450:4864:20::34a]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lji2E-00GKca-K3 for linux-arm-kernel@lists.infradead.org; Thu, 20 May 2021 12:44:19 +0000 Received: by mail-wm1-x34a.google.com with SMTP id l15-20020a1ced0f0000b029017140e7436dso1388706wmh.2 for ; Thu, 20 May 2021 05:44:16 -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=ahqZ8V/+zcLNEI2Yj0kSxAMlF/YVwDMa5CLwXEXBovw=; b=jaFQlCkHRzqz5XueSEw94oNsFY6IAfkC166o5KByFtwdmIk8KAtjck+ObiAt7Hbhqo dSyXeA9x30RhG/P+HQK+V+uMKucnC3qFBx+7vPeL4a0zpLGvTvDgTK1M4XNlEqXncPYw qwNCy2rNeILSbbu4hiWs2uKIMFbIcmcKBa2hF0T3dE7MFhZwHmq0R8YpmF7aBxM+3EdG vYz4puQTsLl8Yg9pBgeR9PuPmSq79EcomMAs2wkxQE6NKiCpO2/uRityOjImEXE7x5H8 FZzVS5zlRnFATRvvRZznaYdNZUTRr3tdse4IGgnEfJnXgRUewEZLxCuum/8dNtYiNouz QA5w== 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=ahqZ8V/+zcLNEI2Yj0kSxAMlF/YVwDMa5CLwXEXBovw=; b=oisks2lVb0iz76pQYqxv4p8EApovWZy/XD9wn/9veakUhQaRgUfvowUfQyAM9UqHGU YN+7eXLgnNMJ/uHDczej+fNp+u6mQ81O6FS2x5S9FH0Yrx/ZWKXAd9o3m4DOwyBYZ/o5 NnukgJJ/1RIpJc9pR5XJbkWt0gdcFTBYlaHvYbjeD/RmgTrnXSPVFjnTO+WeUrMTKDOz 5eRlDkh+kRXVvm8X8MVQzrSv52f0NhehTqSJsgFXw7wAwGyFIjw8tViZ0ExVKnEOyTVz hcAFeRlqWE9RgIEllZ+Pbp2V3MmkdivLPE6bnNrnmLkU3MPu5PsBTssSrwSoaLQn70y3 k5ew== X-Gm-Message-State: AOAM530g+S2m5gM5qRbRuejc8/XJbv1DUuRTMJdS7qygefIG1Q8RI4YS Rb5PeVrEF3+xcXUF4KFbHlF0bnmhQiWt+2lzNwAqfW05VxGekJBT1j5YWWFksH4bsVa3yxzsJRC MwdpUkAeZFIbEfUdVTU1XYTDKcaq4k93w4HSFGBVNmDMCfCm10s2YWD/szAzP2NI7Q+CcthnJ17 MVlQ== X-Google-Smtp-Source: ABdhPJzevCR+H4S3Z4/LFs3rWnm++FOYggZQ/c+D/IRSwlOvL9U1T/mLPL5s6pq25S6i996P3fiuRBArVA== X-Received: from tabba.c.googlers.com ([fda3:e722:ac3:10:28:9cb1:c0a8:482]) (user=tabba job=sendgmr) by 2002:a05:600c:35cc:: with SMTP id r12mr1505600wmq.1.1621514654469; Thu, 20 May 2021 05:44:14 -0700 (PDT) Date: Thu, 20 May 2021 13:43:51 +0100 In-Reply-To: <20210520124406.2731873-1-tabba@google.com> Message-Id: <20210520124406.2731873-4-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 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-20210520_054418_676381_548D4B1C X-CRM114-Status: UNSURE ( 9.58 ) 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 Signed-off-by: Fuad Tabba Acked-by: Mark Rutland --- 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