linux-ide.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2] sata_sil24: Use memory barriers before issuing commands
@ 2010-06-10 16:02 Catalin Marinas
  2010-06-10 16:12 ` Tejun Heo
  2010-06-10 20:14 ` Jeff Garzik
  0 siblings, 2 replies; 17+ messages in thread
From: Catalin Marinas @ 2010-06-10 16:02 UTC (permalink / raw)
  To: linux-ide, linux-kernel; +Cc: Tejun Heo, Colin Tuckley, Jeff Garzik

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 <catalin.marinas@arm.com>
Tested-by: Colin Tuckley <colin.tuckley@arm.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Jeff Garzik <jeff@garzik.org>
---
 drivers/ata/sata_sil24.c |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c
index e925051..a5d5aff 100644
--- a/drivers/ata/sata_sil24.c
+++ b/drivers/ata/sata_sil24.c
@@ -622,6 +622,11 @@ 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);
 
+	/*
+	 * The barrier is required to ensure that writes to cmd_block reach
+	 * the memory before the write to PORT_CMD_ACTIVATE.
+	 */
+	wmb();
 	writel((u32)paddr, port + PORT_CMD_ACTIVATE);
 	writel((u64)paddr >> 32, port + PORT_CMD_ACTIVATE + 4);
 
@@ -895,6 +900,11 @@ 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;
 
+	/*
+	 * The barrier is required to ensure that writes to cmd_block reach
+	 * the memory before the write to PORT_CMD_ACTIVATE.
+	 */
+	wmb();
 	writel((u32)paddr, activate);
 	writel((u64)paddr >> 32, activate + 4);
 


^ permalink raw reply related	[flat|nested] 17+ messages in thread

end of thread, other threads:[~2010-06-23 13:00 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-06-10 16:02 [PATCH v2] sata_sil24: Use memory barriers before issuing commands Catalin Marinas
2010-06-10 16:12 ` Tejun Heo
2010-06-10 16:23   ` Catalin Marinas
2010-06-10 16:42     ` Catalin Marinas
2010-06-11  0:43     ` Robert Hancock
2010-06-11  1:38       ` Nick Piggin
2010-06-11  9:16         ` FUJITA Tomonori
2010-06-11  9:41         ` Catalin Marinas
2010-06-11 10:11           ` Nick Piggin
2010-06-11 11:04             ` Catalin Marinas
2010-06-12  1:30               ` Robert Hancock
2010-06-15 11:10                 ` Catalin Marinas
2010-06-15 11:31                   ` Nick Piggin
2010-06-19 22:32                     ` Catalin Marinas
2010-06-14  0:35           ` FUJITA Tomonori
2010-06-23 13:00       ` Mark Lord
2010-06-10 20:14 ` Jeff Garzik

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).