From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 15 Oct 2024 10:21:34 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1t0coA-004aeo-1q for lore@lore.pengutronix.de; Tue, 15 Oct 2024 10:21:34 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1t0coA-0000nB-1Y for lore@pengutronix.de; Tue, 15 Oct 2024 10:21:34 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=xY4nrYWMeBOgyjEjmf4OfupVsLoyV9qeHlnZD7dmBLs=; b=tjxDgKJsp08KOdnmc6u0R2wvgJ 5sR0+Jfc6BHnPIY/fDgHsl/pNzPJne970KSO2URW6goXdKmfubHlg7qyl/UFIgcl4bc/2+HjPRCHU /sjlhP85yzY0lhikUMcM8Z3Vp+8xqBZBjuHFXd55h/FQQz/WVIBnLiehT6hWSXYprrB4X8kOJN+Kg tnnZncxeAWnGL+ZY2YhFXwe2uzT7Zyg/lHtPyASevdWViA69v7aBn06kFxhEnWJ5TizQkPaJaNV0O ZNieluCHTPvRS0SnKUI9SdZwIWT60r3uHarD20STyrBm5s2U0tYAHWTaYNaPLxdbiGMLFYZfJU7U3 UGLK2UAA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t0cnd-00000007Uib-2VKP; Tue, 15 Oct 2024 08:21:01 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1t0cnB-00000007Uh8-0cJy for barebox@lists.infradead.org; Tue, 15 Oct 2024 08:20:34 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1t0cn9-0000hh-Jl; Tue, 15 Oct 2024 10:20:31 +0200 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1t0cn9-001zBG-71; Tue, 15 Oct 2024 10:20:31 +0200 Received: from localhost ([::1] helo=dude05.red.stw.pengutronix.de) by dude05.red.stw.pengutronix.de with esmtp (Exim 4.96) (envelope-from ) id 1t0cn9-006z6H-0Q; Tue, 15 Oct 2024 10:20:31 +0200 From: Ahmad Fatoum To: barebox@lists.infradead.org Cc: Ahmad Fatoum Date: Tue, 15 Oct 2024 10:20:29 +0200 Message-Id: <20241015082029.1664824-1-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241015_012033_200934_79493C51 X-CRM114-Status: UNSURE ( 9.46 ) X-CRM114-Notice: Please train this message. X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-5.1 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH] fixup! dma: give dma_alloc_coherent a device parameter X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) Should've been part of the original patch. This fixes CI failure for ARM64. Signed-off-by: Ahmad Fatoum --- arch/arm/cpu/mmu_64.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/cpu/mmu_64.c b/arch/arm/cpu/mmu_64.c index 94a19b1aec3c..bc1a44d0a7b8 100644 --- a/arch/arm/cpu/mmu_64.c +++ b/arch/arm/cpu/mmu_64.c @@ -390,9 +390,9 @@ void dma_flush_range(void *ptr, size_t size) v8_flush_dcache_range(start, end); } -void *dma_alloc_writecombine(size_t size, dma_addr_t *dma_handle) +void *dma_alloc_writecombine(struct device *dev, size_t size, dma_addr_t *dma_handle) { - return dma_alloc_map(size, dma_handle, ARCH_MAP_WRITECOMBINE); + return dma_alloc_map(dev, size, dma_handle, ARCH_MAP_WRITECOMBINE); } static void init_range(size_t total_level0_tables) -- 2.39.5