From patchwork Thu Jun 10 14:57:06 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catalin Marinas X-Patchwork-Id: 55229 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 75A931007D4 for ; Fri, 11 Jun 2010 01:12:15 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759376Ab0FJPML (ORCPT ); Thu, 10 Jun 2010 11:12:11 -0400 Received: from cam-admin0.cambridge.arm.com ([217.140.96.50]:37458 "EHLO cam-admin0.cambridge.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759377Ab0FJPMK (ORCPT ); Thu, 10 Jun 2010 11:12:10 -0400 Received: from cam-owa2.Emea.Arm.com (cam-owa2.emea.arm.com [10.1.105.18]) by cam-admin0.cambridge.arm.com (8.12.6/8.12.6) with ESMTP id o5AEv7eI016193; Thu, 10 Jun 2010 15:57:07 +0100 (BST) Received: from e102109-lin.cambridge.arm.com ([10.1.255.212]) by cam-owa2.Emea.Arm.com with Microsoft SMTPSVC(6.0.3790.3959); Thu, 10 Jun 2010 15:57:07 +0100 Subject: [PATCH] sata_sil24: Use memory barriers before issuing commands To: linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org From: Catalin Marinas Cc: Tejun Heo , Colin Tuckley Date: Thu, 10 Jun 2010 15:57:06 +0100 Message-ID: <20100610145706.15588.4562.stgit@e102109-lin.cambridge.arm.com> User-Agent: StGit/0.15-83-g972d5 MIME-Version: 1.0 X-OriginalArrivalTime: 10 Jun 2010 14:57:07.0263 (UTC) FILETIME=[321284F0:01CB08AD] Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org The data in the cmd_block buffers may reach the main memory after the writel() to the device ports. This patch introduces two calls to wmb() to ensure the relative ordering. Signed-off-by: Catalin Marinas Tested-by: Colin Tuckley Cc: Tejun Heo --- drivers/ata/sata_sil24.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c index e925051..6392fdb 100644 --- a/drivers/ata/sata_sil24.c +++ b/drivers/ata/sata_sil24.c @@ -622,6 +622,7 @@ static int sil24_exec_polled_cmd(struct ata_port *ap, int pmp, irq_enabled = readl(port + PORT_IRQ_ENABLE_SET); writel(PORT_IRQ_COMPLETE | PORT_IRQ_ERROR, port + PORT_IRQ_ENABLE_CLR); + wmb(); writel((u32)paddr, port + PORT_CMD_ACTIVATE); writel((u64)paddr >> 32, port + PORT_CMD_ACTIVATE + 4); @@ -895,6 +896,7 @@ static unsigned int sil24_qc_issue(struct ata_queued_cmd *qc) paddr = pp->cmd_block_dma + tag * sizeof(*pp->cmd_block); activate = port + PORT_CMD_ACTIVATE + tag * 8; + wmb(); writel((u32)paddr, activate); writel((u64)paddr >> 32, activate + 4);