From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 31 May 2023 12:24:56 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1q4J0j-0047rx-Mf for lore@lore.pengutronix.de; Wed, 31 May 2023 12:24:56 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1q4J0h-0002tY-DZ for lore@pengutronix.de; Wed, 31 May 2023 12:24:55 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject: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=IvHblOaqeBUzGqmzR6yx7jUHpvAER3VHbkirJg8/L/c=; b=0Sd1BWIIdb/V94 f+B64aNs7kMr5cM4w7LsFnB1k8rWsQlS4xPCcCzZUYVVo7X4yaangLuANg0XXTDjqhuXl2iE0FRz+ scyb8TNzHxbL1h6H5dz5hOh7aFbzNgK82+QMvqefKoBcIreZGiBc3Z3RbUZcAgFeKIRoCJ9FoQ9mf oZOU4Kg0ibRCKY4Y7cErbqhicUTM4wlyMebRn3qgPkQn9lIiMxzZQTXyhdAJHOswn+AzxM21wTnPc 5JbrpNmvpAMnTgkTxnoKMsYDquBNsk55C+lysew9nvVAHCsGsedW6+/hiSMYgGnB0WpEgM8UDfIrE +BNq9yqR6s1OXS1APoIA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q4IzY-00H0cx-1F; Wed, 31 May 2023 10:23:44 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q4IzV-00H0aN-0N for barebox@lists.infradead.org; Wed, 31 May 2023 10:23:42 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1q4IzT-0002pe-Ri; Wed, 31 May 2023 12:23:39 +0200 Received: from [2a0a:edc0:0:1101:1d::28] (helo=dude02.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1q4IzT-0045JD-6s; Wed, 31 May 2023 12:23:39 +0200 Received: from sha by dude02.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1q4IzS-003XXM-9s; Wed, 31 May 2023 12:23:38 +0200 From: Sascha Hauer To: Barebox List Date: Wed, 31 May 2023 12:23:37 +0200 Message-Id: <20230531102337.843892-1-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230531_032341_154119_CB5E30A2 X-CRM114-Status: GOOD ( 14.64 ) 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: , Cc: Denis Orlov 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.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-5.0 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, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH] Revert "dma: use dma/cpu conversions correctly in dma_map/unmap_single" X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) This reverts commit d13d870986eeecc58d8652268557e4a159b9d4c4. While the patch itself is correct, it at least breaks USB on the Raspberry Pi 3b. With this patch dma_sync_single_for_device() is passed the DMA address. This is correct as even the prototype suggests that it should get a dma_addr_t. Unfortunately this is not what the function implements and also not what the users expect. Most if not all users simply pass a CPU pointer casted to unsigned long. dma_sync_single_for_device() on ARM then takes the DMA address as a CPU pointer and does cache maintenance on it. Before we can merge this patch again dma_sync_single_for_device() must get a struct device * argument and (on ARM) the cpu_to_dma() conversion must be reverted before doing cache maintenance. --- drivers/dma/map.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/dma/map.c b/drivers/dma/map.c index fea04c38a3..114c0f7db3 100644 --- a/drivers/dma/map.c +++ b/drivers/dma/map.c @@ -23,15 +23,17 @@ static inline void *dma_to_cpu(struct device *dev, dma_addr_t addr) dma_addr_t dma_map_single(struct device *dev, void *ptr, size_t size, enum dma_data_direction dir) { - dma_addr_t ret = cpu_to_dma(dev, ptr); + unsigned long addr = (unsigned long)ptr; - dma_sync_single_for_device(ret, size, dir); + dma_sync_single_for_device(addr, size, dir); - return ret; + return cpu_to_dma(dev, ptr); } void dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size, enum dma_data_direction dir) { - dma_sync_single_for_cpu(dma_addr, size, dir); + unsigned long addr = (unsigned long)dma_to_cpu(dev, dma_addr); + + dma_sync_single_for_cpu(addr, size, dir); } -- 2.39.2