From patchwork Thu Mar 26 18:08:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Dooks X-Patchwork-Id: 6101311 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 48D3F9F350 for ; Thu, 26 Mar 2015 18:11:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 484E320429 for ; Thu, 26 Mar 2015 18:11:43 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4325620425 for ; Thu, 26 Mar 2015 18:11:42 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YbCDf-0006CH-Tn; Thu, 26 Mar 2015 18:09:27 +0000 Received: from ducie-dc1.codethink.co.uk ([185.25.241.215]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YbCDW-000659-Np for linux-arm-kernel@lists.infradead.org; Thu, 26 Mar 2015 18:09:19 +0000 Received: from localhost (localhost [127.0.0.1]) by ducie-dc1.codethink.co.uk (Postfix) with ESMTP id 6356B46070A; Thu, 26 Mar 2015 18:08:56 +0000 (GMT) X-Virus-Scanned: Debian amavisd-new at ducie-dc1.codethink.co.uk Received: from ducie-dc1.codethink.co.uk ([127.0.0.1]) by localhost (ducie-dc1.codethink.co.uk [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 07YlhNABVJ-5; Thu, 26 Mar 2015 18:08:54 +0000 (GMT) Received: from rainbowdash.ducie.codethink.co.uk (rainbowdash.dyn.ducie.codethink.co.uk [10.24.2.193]) by ducie-dc1.codethink.co.uk (Postfix) with ESMTPS id A6889460928; Thu, 26 Mar 2015 18:08:54 +0000 (GMT) Received: from ben by rainbowdash.ducie.codethink.co.uk with local (Exim 4.84) (envelope-from ) id 1YbCD8-0003m3-Fp; Thu, 26 Mar 2015 18:08:54 +0000 From: Ben Dooks To: linux-kernel@lists.codethink.co.uk Subject: [PATCH] dma: at_xdmac: use __le32 for dma addresses Date: Thu, 26 Mar 2015 18:08:53 +0000 Message-Id: <1427393333-14473-1-git-send-email-ben.dooks@codethink.co.uk> X-Mailer: git-send-email 2.1.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150326_110918_963644_F621B79F X-CRM114-Status: UNSURE ( 9.86 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) Cc: Russell King , Vinod Koul , Nicolas Ferre , Ben Dooks , dmaengine@vger.kernel.org, Dan Williams , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The at_xdmac uses a lli structure with a mix of dma_addr_t and __le32 in it. As Russell King pointed out, dma_addr_t could be a non 32-bit size depending on the kernel configuration. Change all references of this to __le32 to better match the hardware representation. Note, this does nothing to fix the discussion of dma vs physical addresses also brought up during these discussions. This patch depends on the __le32 descriptor updates posted previously. Signed-off-by: Ben Dooks --- CC: Russell King CC: Nicolas Ferre CC: Dan Williams CC: Vinod Koul CC: linux-arm-kernel@lists.infradead.org CC: dmaengine@vger.kernel.org --- drivers/dma/at_xdmac.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/dma/at_xdmac.c b/drivers/dma/at_xdmac.c index 65a37be..d9dd71c 100644 --- a/drivers/dma/at_xdmac.c +++ b/drivers/dma/at_xdmac.c @@ -231,10 +231,10 @@ struct at_xdmac { /* Linked List Descriptor */ struct at_xdmac_lld { - dma_addr_t mbr_nda; /* Next Descriptor Member */ + __le32 mbr_nda; /* Next Descriptor Member */ __le32 mbr_ubc; /* Microblock Control Member */ - dma_addr_t mbr_sa; /* Source Address Member */ - dma_addr_t mbr_da; /* Destination Address Member */ + __le32 mbr_sa; /* Source Address Member */ + __le32 mbr_da; /* Destination Address Member */ __le32 mbr_cfg; /* Configuration Register */ };