From patchwork Thu Aug 26 13:17:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 12459795 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=-21.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_PATCH,INCLUDES_PULL_REQUEST, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 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 B7EB4C432BE for ; Thu, 26 Aug 2021 13:20:30 +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 79D5760FD8 for ; Thu, 26 Aug 2021 13:20:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 79D5760FD8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=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: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=jXbIkSZUClWv0OoPmPhMpOt4yW6nawHFMVY50iFX7jY=; b=mzPrDjUZjzc8zn rjxWN7vZu/sP0vcRhDXXUEaWDAEo7ouDUWsU3ATXC3c0Gec5jNPm8+IsDx7LfZ8/y4QfD83JeLtLd OYj8XZdSeBjn+/KdJQ5dZv58H6+6L7yXwvkVtVR7qvYhWdDXkMICxyYRrn3mQ2wq1bQOvGDpuYNWQ wvbZIaL0VMR2cQE70GRLBgF/GJuAWAp532oV8BQMWdsDmQ9c42LBtdbjGLNw50GNTBCxGVzWdV8Yb VFBB9z3UTtXcrjcQLBox0VE+Pt7sjcwdx9YwRN8+XxTQ42LRHHqPigQ10Qk8rgbcMIc876JbAQPM5 UwBYdyi+zMrKGTNlH+qA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mJFGb-00AE3k-KE; Thu, 26 Aug 2021 13:18:01 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mJFGV-00AE3B-BY for linux-arm-kernel@lists.infradead.org; Thu, 26 Aug 2021 13:17:59 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 40A8260FDC; Thu, 26 Aug 2021 13:17:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1629983872; bh=+0WhsOGBAXJiCcnRXoWh8bBxwlXxEbX15/FAjmhMtj0=; h=Date:From:To:Cc:Subject:From; b=iNynZXTJ+HKm6H3Fk8u67CRapIyxXvrcKOleq9BQIuHtdfhuJiIWGjbayfy7/Lfor M+E2iqd1yIHxGQ0zen14D1fQ0wmvyEccsornwQU2Czm5Jnc7TF0ExpirjfefPPbVt6 l1cCWALw8Wf1cgTgtgEYrGD89DhftKc2NDl42vWhPBF/uC2aaAOvVUHw0GKCow28n5 a8A7FEH9UytHWrEfLw2BzXItMyJeAAjs4Y7Jk0EkBPxSo2erMtt9mDiIgYnlQ1nooY FMYrO1qN7x6NfbvWH8RSoPqZ0uvy/fjkeb9B9i8X8KowDLYzPKcSt3CUZup7s0Lrq0 7OikZ2J2Q8gcA== Date: Thu, 26 Aug 2021 14:17:48 +0100 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 fix for 5.14 Message-ID: <20210826131747.GE26318@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-20210826_061755_455008_7A095BDA X-CRM114-Status: UNSURE ( 9.05 ) 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 Hi Linus, Please pull this single arm64 fix for 5.14. We received a report this week that the generic version of pfn_valid(), which we switched to this merge window in 16c9afc77660 ("arm64/mm: drop HAVE_ARCH_PFN_VALID"), interacts badly with dma_map_resource() due to the following check: /* Don't allow RAM to be mapped */ if (WARN_ON_ONCE(pfn_valid(PHYS_PFN(phys_addr)))) return DMA_MAPPING_ERROR; Since the ongoing saga to determine the semantics of pfn_valid() is unlikely to be resolved this week (does it indicate valid memory, or just the presence of a struct page, or whether that struct page has been initialised?), just revert back to our old version of pfn_valid() for 5.14. Thanks, Will --->8 The following changes since commit bde8fff82e4a4b0f000dbf4d5eadab2079be0b56: arm64: initialize all of CNTHCTL_EL2 (2021-08-19 10:02:10 +0100) 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 3eb9cdffb39701743973382860f214026f4d7825: Partially revert "arm64/mm: drop HAVE_ARCH_PFN_VALID" (2021-08-25 11:33:24 +0100) ---------------------------------------------------------------- arm64 fix for 5.14 - Fix dma_map_resource() by reverting back to old pfn_valid() code ---------------------------------------------------------------- Will Deacon (1): Partially revert "arm64/mm: drop HAVE_ARCH_PFN_VALID" arch/arm64/Kconfig | 1 + arch/arm64/include/asm/page.h | 1 + arch/arm64/mm/init.c | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+)