Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423162AbWJRXic (ORCPT ); Wed, 18 Oct 2006 19:38:32 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1423165AbWJRXiK (ORCPT ); Wed, 18 Oct 2006 19:38:10 -0400 Received: from [63.64.152.142] ([63.64.152.142]:51214 "EHLO gitlost.site") by vger.kernel.org with ESMTP id S1423161AbWJRXiG (ORCPT ); Wed, 18 Oct 2006 19:38:06 -0400 From: Chris Leech Subject: [PATCH 4/7] I/OAT: Remove the use of writeq from the ioatdma driver Date: Wed, 18 Oct 2006 16:46:55 -0700 To: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, akpm@osdl.org, jeff@garzik.org Message-Id: <20061018234655.26671.3357.stgit@gitlost.site> In-Reply-To: <20061018234417.26671.56773.stgit@gitlost.site> References: <20061018234417.26671.56773.stgit@gitlost.site> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1306 Lines: 37 There's only one now anyway, and it's not in a performance path, so make it behave the same on 32-bit and 64-bit CPUs. Signed-off-by: Chris Leech --- drivers/dma/ioatdma.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/dma/ioatdma.c b/drivers/dma/ioatdma.c index ceb03ee..2800c19 100644 --- a/drivers/dma/ioatdma.c +++ b/drivers/dma/ioatdma.c @@ -608,13 +608,11 @@ static void ioat_start_null_desc(struct list_add_tail(&desc->node, &ioat_chan->used_desc); spin_unlock_bh(&ioat_chan->desc_lock); -#if (BITS_PER_LONG == 64) - writeq(desc->phys, ioat_chan->reg_base + IOAT_CHAINADDR_OFFSET); -#else - writel((u32) desc->phys, + writel(((u64) desc->phys) & 0x00000000FFFFFFFF, ioat_chan->reg_base + IOAT_CHAINADDR_OFFSET_LOW); - writel(0, ioat_chan->reg_base + IOAT_CHAINADDR_OFFSET_HIGH); -#endif + writel(((u64) desc->phys) >> 32, + ioat_chan->reg_base + IOAT_CHAINADDR_OFFSET_HIGH); + writeb(IOAT_CHANCMD_START, ioat_chan->reg_base + IOAT_CHANCMD_OFFSET); } - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/