* [PATCH #upstream-fixes] pata_via: fix SATA cable detection on cx700
@ 2008-02-07 1:18 Tejun Heo
2008-02-07 1:46 ` Alan Cox
2008-02-11 19:30 ` Jeff Garzik
0 siblings, 2 replies; 3+ messages in thread
From: Tejun Heo @ 2008-02-07 1:18 UTC (permalink / raw)
To: Jeff Garzik, IDE/ATA development list
The first port of cx700 is SATA. Fix cable detection.
Signed-off-by: Tejun Heo <htejun@gmail.com>
---
drivers/ata/pata_via.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c
index 39627ab..d119a68 100644
--- a/drivers/ata/pata_via.c
+++ b/drivers/ata/pata_via.c
@@ -84,6 +84,7 @@ enum {
VIA_BAD_ID = 0x100, /* Has wrong vendor ID (0x1107) */
VIA_BAD_AST = 0x200, /* Don't touch Address Setup Timing */
VIA_NO_ENABLES = 0x400, /* Has no enablebits */
+ VIA_SATA_PATA = 0x800, /* SATA/PATA combined configuration */
};
/*
@@ -100,7 +101,7 @@ static const struct via_isa_bridge {
{ "vx800", PCI_DEVICE_ID_VIA_VX800, 0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },
{ "vt8237s", PCI_DEVICE_ID_VIA_8237S, 0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },
{ "vt8251", PCI_DEVICE_ID_VIA_8251, 0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },
- { "cx700", PCI_DEVICE_ID_VIA_CX700, 0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },
+ { "cx700", PCI_DEVICE_ID_VIA_CX700, 0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST | VIA_SATA_PATA },
{ "vt6410", PCI_DEVICE_ID_VIA_6410, 0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST | VIA_NO_ENABLES},
{ "vt8237a", PCI_DEVICE_ID_VIA_8237A, 0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },
{ "vt8237", PCI_DEVICE_ID_VIA_8237, 0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },
@@ -172,6 +173,9 @@ static int via_cable_detect(struct ata_port *ap) {
if (via_cable_override(pdev))
return ATA_CBL_PATA40_SHORT;
+ if ((config->flags & VIA_SATA_PATA) && ap->port_no == 0)
+ return ATA_CBL_SATA;
+
/* Early chips are 40 wire */
if ((config->flags & VIA_UDMA) < VIA_UDMA_66)
return ATA_CBL_PATA40;
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH #upstream-fixes] pata_via: fix SATA cable detection on cx700
2008-02-07 1:18 [PATCH #upstream-fixes] pata_via: fix SATA cable detection on cx700 Tejun Heo
@ 2008-02-07 1:46 ` Alan Cox
2008-02-11 19:30 ` Jeff Garzik
1 sibling, 0 replies; 3+ messages in thread
From: Alan Cox @ 2008-02-07 1:46 UTC (permalink / raw)
To: Tejun Heo; +Cc: Jeff Garzik, IDE/ATA development list
On Thu, 07 Feb 2008 10:18:53 +0900
Tejun Heo <htejun@gmail.com> wrote:
> The first port of cx700 is SATA. Fix cable detection.
That should be set anyway by the drive detect but it does no harm and
fixes stuff if there is no drive.
Acked-by: Alan Cox <alan@redhat.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH #upstream-fixes] pata_via: fix SATA cable detection on cx700
2008-02-07 1:18 [PATCH #upstream-fixes] pata_via: fix SATA cable detection on cx700 Tejun Heo
2008-02-07 1:46 ` Alan Cox
@ 2008-02-11 19:30 ` Jeff Garzik
1 sibling, 0 replies; 3+ messages in thread
From: Jeff Garzik @ 2008-02-11 19:30 UTC (permalink / raw)
To: Tejun Heo; +Cc: IDE/ATA development list
Tejun Heo wrote:
> The first port of cx700 is SATA. Fix cable detection.
>
> Signed-off-by: Tejun Heo <htejun@gmail.com>
> ---
> drivers/ata/pata_via.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
applied
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-02-11 19:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-02-07 1:18 [PATCH #upstream-fixes] pata_via: fix SATA cable detection on cx700 Tejun Heo
2008-02-07 1:46 ` Alan Cox
2008-02-11 19:30 ` 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).