Author: baggins Date: Wed Sep 20 15:48:39 2006 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- up to 2.6.18
---- Files affected:
SOURCES:
linux-2.6-sata-promise-pata-ports.patch (1.1.2.1 -> 1.1.2.2)
---- Diffs:
================================================================
Index: SOURCES/linux-2.6-sata-promise-pata-ports.patch
diff -u SOURCES/linux-2.6-sata-promise-pata-ports.patch:1.1.2.1
SOURCES/linux-2.6-sata-promise-pata-ports.patch:1.1.2.2
--- SOURCES/linux-2.6-sata-promise-pata-ports.patch:1.1.2.1 Wed Jun 21
16:43:02 2006
+++ SOURCES/linux-2.6-sata-promise-pata-ports.patch Wed Sep 20 17:48:34 2006
@@ -7,7 +7,7 @@
ap->flags |= ent->host_flags;
+ ap->flags |= ent->port_flags[port_no]; /* pata fix */
ap->ops = ent->port_ops;
- ap->cbl = ATA_CBL_NONE;
+ ap->hw_sata_spd_limit = UINT_MAX;
ap->active_tag = ATA_TAG_POISON;
diff -urN linux-2.6.17.1/drivers/scsi/sata_promise.c
mod/drivers/scsi/sata_promise.c
--- linux-2.6.17.1/drivers/scsi/sata_promise.c 2006-06-20 11:31:55.000000000
+0200
@@ -21,7 +21,7 @@
.pio_mask = 0x1f, /* pio0-4 */
.mwdma_mask = 0x07, /* mwdma0-2 */
.udma_mask = 0x7f, /* udma0-6 ; FIXME */
-@@ -359,15 +359,34 @@
+@@ -359,8 +359,16 @@
static void pdc_sata_phy_reset(struct ata_port *ap)
{
@@ -39,27 +39,7 @@
+ pdc_pata_phy_reset(ap); /* pata fix */
}
- static void pdc_pata_phy_reset(struct ata_port *ap)
- {
- /* FIXME: add cable detect. Don't assume 40-pin cable */
-- ap->cbl = ATA_CBL_PATA40;
-- ap->udma_mask &= ATA_UDMA_MASK_40C;
-+/* ap->cbl = ATA_CBL_PATA40; */ /* pata fix */
-+/* ap->udma_mask &= ATA_UDMA_MASK_40C; */ /* pata fix */
-+ /* add cable detection code for pata drives */ /* pata fix */
-+ u8 tmp; /* pata fix */
-+ void *mmio = (void *) ap->ioaddr.cmd_addr + PDC_CTLSTAT + 0x03; /* pata
fix */
-+ tmp = readb(mmio); /* pata fix */
-+ if (tmp & 0x01) /* pata fix */
-+ { /* pata fix */
-+ ap->cbl = ATA_CBL_PATA40; /* pata fix */
-+ ap->udma_mask &= ATA_UDMA_MASK_40C; /* pata fix */
-+ } /* pata fix */
-+ else /* pata fix */
-+ ap->cbl = ATA_CBL_PATA80; /* pata fix */
-
- pdc_reset_port(ap);
- ata_port_probe(ap);
+ static void pdc_pata_cbl_detect(struct ata_port *ap)
@@ -672,6 +691,7 @@
unsigned int board_idx = (unsigned int) ent->driver_data;
int pci_dev_busy = 0;
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/linux-2.6-sata-promise-pata-ports.patch?r1=1.1.2.1&r2=1.1.2.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
