From patchwork Tue Dec 6 17:57:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catalin Marinas X-Patchwork-Id: 13066201 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 A8653C3A5A7 for ; Tue, 6 Dec 2022 17:58:37 +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=m08Pqd1o9o06t01Atn4BZZOZeO85G8a0DjhtPg3vI+s=; b=DYuW0g8sJ07NGi cSBTpdi0npxQ0YgB4GiEv0KVjqsjIs8VAcT4Lk15udS8CaRLEpH270DPrcDzQx2RNk1O+ZOVwR8i5 gJUMKbzscmANRHMg5gpibxnHJGHvihH3LoiVGfEmrQ1e75OKEIsjjc66xeVmlPj/hjQEhz+RgggoK oxmtgttmk6KP/DpMWgVAdlebnacBYN1+nyL9l3E2m6kei/yc+dzVJagzpTOy5405O7/RuGy359oqR vzLyG970KWuoCBnNfXkLPSqyyF/EOD6QAQcmToK8a+CxOskGeoaqEAYqXDW2A9gJVJGaX5TqdbQcV eFKidRq/t01Ybd5Rpfpg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1p2cCH-00Gklb-5k; Tue, 06 Dec 2022 17:57:37 +0000 Received: from sin.source.kernel.org ([145.40.73.55]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1p2cCD-00Gkh5-Jb for linux-arm-kernel@lists.infradead.org; Tue, 06 Dec 2022 17:57:35 +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 sin.source.kernel.org (Postfix) with ESMTPS id 18709CE1AD8; Tue, 6 Dec 2022 17:57:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 20CB7C433C1; Tue, 6 Dec 2022 17:57:23 +0000 (UTC) Date: Tue, 6 Dec 2022 17:57:21 +0000 From: Catalin Marinas To: Linus Torvalds Cc: Will Deacon , regressions@leemhuis.info, manivannan.sadhasivam@linaro.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [GIT PULL] arm64 fix/revert for 6.1 Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221206_095733_834672_1FFE6824 X-CRM114-Status: GOOD ( 12.08 ) 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 the revert below. The qcom driver fix is being worked on but not in time for 6.1, so revert the arm64 change that highlighted the issue. Thanks. The following changes since commit 5b47348fc0b18a78c96f8474cc90b7525ad1bbfe: arm64/mm: fix incorrect file_map_count for non-leaf pmd/pud (2022-11-18 19:31:54 +0000) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux tags/arm64-fixes for you to fetch changes up to b7d9aae404841d9999b7476170867ae441e948d2: Revert "arm64: dma: Drop cache invalidation from arch_dma_prep_coherent()" (2022-12-06 17:30:39 +0000) ---------------------------------------------------------------- Revert the dropping of the cache invalidation from the arm64 arch_dma_prep_coherent() as it caused a regression in the qcom_q6v5_mss remoteproc driver. The driver is already buggy but the original arm64 change made the problem obvious. The change will be re-introduced once the driver is fixed. ---------------------------------------------------------------- Will Deacon (1): Revert "arm64: dma: Drop cache invalidation from arch_dma_prep_coherent()" arch/arm64/mm/dma-mapping.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)