From patchwork Fri Dec 16 15:51:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 13075142 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 94440C001B2 for ; Fri, 16 Dec 2022 15:52:24 +0000 (UTC) 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:MIME-Version:Message-ID:Subject:Cc:To: From:Date:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=UjuxAgDfJl+xeTjWobW15MCWpe3G2uzhGJpgJPFWJ/U=; b=3XTI4wgCkKmRNs ZgedJPF8nYawbeX+FCL4YHKZcGVqIv7tfy0jpiKbE1DQQQgK/J4bBALyocP1jsHO/nsUsYMe146Ns Fx83lvTjIDrZwLlpynspaHXtgMQt9oHtBMDkCgE8dKAon1nLD8qtYD9eW+ty5AunhV3z1Hi4irDp6 mAA/fC6DKJauxs8j8lDoRrOzHBWyxaV9M2UmwgjZcH6LRbTf7IM3T9cOaC67hq0dPwdDwkH5TzOC/ O66nbVg5CCOkD5DDehgY0XUDlSq68UhWRnEIbkUVUzNroQAqriI9ih9GTHP+wGOZCNSqjDJ3HFPrC k/zUwCEE7Qp/W4U/gMFg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1p6Cze-00G9d4-Di; Fri, 16 Dec 2022 15:51:26 +0000 Received: from ams.source.kernel.org ([2604:1380:4601:e00::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1p6Cza-00G9YC-VL for linux-arm-kernel@lists.infradead.org; Fri, 16 Dec 2022 15:51:24 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 4A953B81DB3; Fri, 16 Dec 2022 15:51:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DD177C433F0; Fri, 16 Dec 2022 15:51:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1671205878; bh=OCPpXdHlgFzdWE7+Wzzjx744Kv6sP4H4C1kVeRSTqZ4=; h=Date:From:To:Cc:Subject:From; b=XLFP09xq8GDceLpSXzG9ByZtmF/MCvorOgdORK55Q51Tnie/AXhyLBgcMaynYy5qc NRkW5DEMg2f/Jw6n7YkA28cacQEknwoVtVn3lqDaEG3mmgLDDqZX5tlHnihwNymdaE 567H11vzCX0aaYmGCM/lLF+4VxTgG61L8J+tDsMJPJ4wGVoJM2gxd3jVklgh1lWyDx eRg4vtljZu46gikd2AjN0KzmRPvSeur0pwTzCnHgC/wjBNRpCgH9CORebKTCtq9mRc coct1Uq+JTH6dkgwotqkLVTYMG7ksZWdySg/JkEsKWH0DebzkuQIcivr43gCrtTl3I 5HTEOEbIZUyuA== Date: Fri, 16 Dec 2022 15:51:13 +0000 From: Will Deacon To: torvalds@linux-foundation.org Cc: catalin.marinas@arm.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel-team@android.com Subject: [GIT PULL] arm64 fixes for -rc1 Message-ID: <20221216155111.GA8949@willie-the-truck> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221216_075123_173957_9D57042D X-CRM114-Status: GOOD ( 12.50 ) 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 Hi Linus, Please pull these two arm64 fixes for -rc1, fixing issues introduced by the recent pull for 6.2. They're both straightforward: a Kconfig tweak and a revert. Summary in the tag. There are some other fixes kicking around, but they're not urgent at all (things like benign sparse warnings) so I'll get back to them in the new year. Cheers, Will --->8 The following changes since commit 5f4c374760b031f06c69c2fdad1b0e981a1ad42f: Merge branch 'for-next/undef-traps' into for-next/core (2022-12-06 11:34:25 +0000) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git tags/arm64-fixes for you to fetch changes up to c0cd1d541704c45030cbb2031612fdd68e8e15d5: Revert "arm64: errata: Workaround possible Cortex-A715 [ESR|FAR]_ELx corruption" (2022-12-15 17:59:12 +0000) ---------------------------------------------------------------- arm64 fixes for -rc1 - Fix Kconfig dependencies to re-allow the enabling of function graph tracer and shadow call stacks at the same time. - Revert the workaround for CPU erratum #2645198 since the CONFIG_ guards were incorrect and the code has therefore not seen any real exposure in -next. ---------------------------------------------------------------- Ard Biesheuvel (1): ftrace: Allow WITH_ARGS flavour of graph tracer with shadow call stack Will Deacon (1): Revert "arm64: errata: Workaround possible Cortex-A715 [ESR|FAR]_ELx corruption" Documentation/arm64/silicon-errata.rst | 2 -- arch/Kconfig | 2 +- arch/arm64/Kconfig | 16 ---------------- arch/arm64/include/asm/hugetlb.h | 9 --------- arch/arm64/include/asm/pgtable.h | 9 --------- arch/arm64/kernel/cpu_errata.c | 7 ------- arch/arm64/mm/hugetlbpage.c | 21 --------------------- arch/arm64/mm/mmu.c | 21 --------------------- arch/arm64/tools/cpucaps | 1 - 9 files changed, 1 insertion(+), 87 deletions(-)