[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20121228190350.765365454@decadent.org.uk>
Date: Fri, 28 Dec 2012 20:05:08 +0100
From: Ben Hutchings <ben@...adent.org.uk>
To: linux-kernel@...r.kernel.org, stable@...r.kernel.org
Cc: akpm@...ux-foundation.org, alan@...rguk.ukuu.org.uk,
Aaron Lu <aaron.lu@...el.com>,
Phillip Wood <phillip.wood@...elm.org.uk>,
Szymon Janc <szymon@...c.net.pl>,
Dutra Julio <dutra.julio@...il.com>,
Alan Cox <alan@...ux.intel.com>,
Jeff Garzik <jgarzik@...hat.com>
Subject: [ 098/173] libata: set dma_mode to 0xff in reset
3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aaron Lu <aaron.lu@...el.com>
commit 5416912af75de9cba5d1c75b99a7888b0bbbd2fb upstream.
ata_device->dma_mode's initial value is zero, which is not a valid dma
mode, but ata_dma_enabled will return true for this value. This patch
sets dma_mode to 0xff in reset function, so that ata_dma_enabled will
not return true for this case, or it will cause problem for pata_acpi.
The corrsponding bugzilla page is at:
https://bugzilla.kernel.org/show_bug.cgi?id=49151
Reported-by: Phillip Wood <phillip.wood@...elm.org.uk>
Signed-off-by: Aaron Lu <aaron.lu@...el.com>
Tested-by: Szymon Janc <szymon@...c.net.pl>
Tested-by: Dutra Julio <dutra.julio@...il.com>
Acked-by: Alan Cox <alan@...ux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@...hat.com>
Signed-off-by: Ben Hutchings <ben@...adent.org.uk>
---
drivers/ata/libata-core.c | 1 +
drivers/ata/libata-eh.c | 1 +
2 files changed, 2 insertions(+)
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index caffe73..583f26d 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -2559,6 +2559,7 @@ int ata_bus_probe(struct ata_port *ap)
* bus as we may be talking too fast.
*/
dev->pio_mode = XFER_PIO_0;
+ dev->dma_mode = 0xff;
/* If the controller has a pio mode setup function
* then use it to set the chipset to rights. Don't
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index e60437c..bf039b0 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -2657,6 +2657,7 @@ int ata_eh_reset(struct ata_link *link, int classify,
* bus as we may be talking too fast.
*/
dev->pio_mode = XFER_PIO_0;
+ dev->dma_mode = 0xff;
/* If the controller has a pio mode setup function
* then use it to set the chipset to rights. Don't
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists