The patch titled
sata_promise: unbreak 20619
has been added to the -mm tree. Its filename is
sata_promise-unbreak-20619.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: sata_promise: unbreak 20619
From: Mikael Pettersson <mikpe@xxxxxxxx>
The PATA support patch for sata_promise appears, from code inspection, to
break the PATA-only 20619 chip.
The patch removes the SATA flag from the TX2plus SATA+PATA boards' common
flags, with the intention of adding it back via the _port_flags[] entries for
those boards' SATA ports.
However, it unconditionally marks ports 0 and 1 as SATA for all boards. This
causes the 20619 (TX4000) to announce its first two PATA ports as SATA |
ATA_FLAG_SLAVE_POSS.
I don't have a TX4000 so I don't know what the actual consequences of this bug
are, but surely this isn't Ok.
Fixed by moving the port 0 and 1 settings as SATA into the TX4 and TX2plus
specific initialisation code.
Signed-off-by: Mikael Pettersson <mikpe@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/ata/sata_promise.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff -puN drivers/ata/sata_promise.c~sata_promise-unbreak-20619 drivers/ata/sata_promise.c
--- a/drivers/ata/sata_promise.c~sata_promise-unbreak-20619
+++ a/drivers/ata/sata_promise.c
@@ -957,9 +957,6 @@ static int pdc_ata_init_one (struct pci_
probe_ent->port[0].scr_addr = base + 0x400;
probe_ent->port[1].scr_addr = base + 0x500;
- probe_ent->_port_flags[0] = ATA_FLAG_SATA;
- probe_ent->_port_flags[1] = ATA_FLAG_SATA;
-
/* notice 4-port boards */
switch (board_idx) {
case board_40518:
@@ -974,6 +971,8 @@ static int pdc_ata_init_one (struct pci_
probe_ent->port[2].scr_addr = base + 0x600;
probe_ent->port[3].scr_addr = base + 0x700;
+ probe_ent->_port_flags[0] = ATA_FLAG_SATA;
+ probe_ent->_port_flags[1] = ATA_FLAG_SATA;
probe_ent->_port_flags[2] = ATA_FLAG_SATA;
probe_ent->_port_flags[3] = ATA_FLAG_SATA;
break;
@@ -995,6 +994,8 @@ static int pdc_ata_init_one (struct pci_
}
else
probe_ent->n_ports = 2;
+ probe_ent->_port_flags[0] = ATA_FLAG_SATA;
+ probe_ent->_port_flags[1] = ATA_FLAG_SATA;
break;
case board_20619:
probe_ent->n_ports = 4;
_
Patches currently in -mm which might be from mikpe@xxxxxxxx are
git-libata-all.patch
sata_promise-atapi-support.patch
sata_promise-unbreak-20619.patch
sata_promise-2037x-patapi-support.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
