Attachment 76046 Details for Bug 148638

[patch] Enable the PATA port for Promise PDC2037x (for 10.1 beta9)

promise-2.6.16.patch (text/plain), 3.49 KB, created by Andras Mantia on 2006-04-01 16:31:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andras Mantia

Created: 2006-04-01 16:31:04 UTC

Size: 3.49 KB

patch

obsolete

>diff -ur linux-suse/include/drivers/scsi/libata-core.c linux/include/drivers/scsi/libata-core.c
>--- linux-suse/include/drivers/scsi/libata-core.c	2006-04-01 19:25:10.000000000 +0300
>+++ linux/include/drivers/scsi/libata-core.c	2006-04-01 19:20:53.000000000 +0300
>@@ -4476,6 +4476,7 @@
> 	ap->mwdma_mask = ent->mwdma_mask;
> 	ap->udma_mask = ent->udma_mask;
> 	ap->flags |= ent->host_flags;
>+	ap->flags |= ent->port_flags[port_no];
> 	ap->ops = ent->port_ops;
> 	ap->cbl = ATA_CBL_NONE;
> 	ap->active_tag = ATA_TAG_POISON;
>diff -ur linux-suse/include/drivers/scsi/sata_promise.c linux/include/drivers/scsi/sata_promise.c
>--- linux-suse/include/drivers/scsi/sata_promise.c	2006-04-01 18:42:07.000000000 +0300
>+++ linux/include/drivers/scsi/sata_promise.c	2006-04-01 18:49:13.000000000 +0300
>@@ -165,7 +165,7 @@
> 	/* board_2037x */
> 	{
> 		.sht		= &pdc_ata_sht,
>-		.host_flags	= PDC_COMMON_FLAGS | ATA_FLAG_SATA,
>+		.host_flags	= PDC_COMMON_FLAGS /* | ATA_FLAG_SATA */,
> 		.pio_mask	= 0x1f, /* pio0-4 */
> 		.mwdma_mask	= 0x07, /* mwdma0-2 */
> 		.udma_mask	= 0x7f, /* udma0-6 ; FIXME */
>@@ -323,17 +323,34 @@
> static void pdc_sata_phy_reset(struct ata_port *ap)
> {
> 	pdc_reset_port(ap);
>-	sata_phy_reset(ap);
>+	if (ap->flags & ATA_FLAG_SATA)
>+	  sata_phy_reset(ap);
>+	else
>+	  pdc_pata_phy_reset(ap);
>+}
>+
>+static void pdc_pata_cbl_detect(struct ata_port *ap)
>+{
>+ u8 tmp;
>+ void *mmio = (void *) ap->ioaddr.cmd_addr + PDC_CTLSTAT + 0x03;
>+
>+ tmp = readb(mmio);
>+ 
>+ if (tmp & 0x01)
>+ {
>+  ap->cbl = ATA_CBL_PATA40;
>+  ap->udma_mask &= ATA_UDMA_MASK_40C;
>+ }
>+ else
>+  ap->cbl = ATA_CBL_PATA80;
> }
> 
> 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;
>-
>-	pdc_reset_port(ap);
>+	pdc_pata_cbl_detect(ap);
>+	
> 	ata_port_probe(ap);
>+	
> 	ata_bus_reset(ap);
> }
> 
>@@ -646,6 +663,7 @@
> 	unsigned int board_idx = (unsigned int) ent->driver_data;
> 	int pci_dev_busy = 0;
> 	int rc;
>+	u8 tmp;
> 
> 	if (!printed_version++)
> 		dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");
>@@ -704,6 +722,9 @@
> 
> 	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) {
>@@ -717,7 +738,20 @@
> 		probe_ent->port[3].scr_addr = base + 0x700;
> 		break;
> 	case board_2037x:
>-		probe_ent->n_ports = 2;
>+		/* Some boards have also PATA port */
>+		tmp = readb(mmio_base + PDC_FLASH_CTL+1);
>+		if (!(tmp & 0x80))
>+		{
>+		    probe_ent->n_ports = 3;
>+ 
>+		    pdc_ata_setup_port(&probe_ent->port[2], base + 0x300);
>+
>+		    probe_ent->port_flags[2] = ATA_FLAG_SLAVE_POSS;
>+ 
>+		    printk(KERN_INFO DRV_NAME " PATA port found\n");
>+		}
>+		else
>+	            probe_ent->n_ports = 2;
> 		break;
> 	case board_20771:
> 		probe_ent->n_ports = 2;
>@@ -730,6 +764,9 @@
> 
> 		probe_ent->port[2].scr_addr = base + 0x600;
> 		probe_ent->port[3].scr_addr = base + 0x700;
>+		
>+		probe_ent->port_flags[2] = ATA_FLAG_SATA;
>+		probe_ent->port_flags[3] = ATA_FLAG_SATA;
> 		break;
> 	default:
> 		BUG();
>diff -ur linux-suse/include/linux/libata.h linux/include/linux/libata.h
>--- linux-suse/include/linux/libata.h	2006-04-01 19:21:18.000000000 +0300
>+++ linux/include/linux/libata.h	2006-04-01 19:19:41.000000000 +0300
>@@ -273,6 +273,7 @@
> 	unsigned long		irq;
> 	unsigned int		irq_flags;
> 	unsigned long		host_flags;
>+	unsigned long           port_flags[ATA_MAX_PORTS];
> 	void __iomem		*mmio_base;
> 	void			*private_data;
> };

Actions: View | Diff

Attachments on bug 148638: 66689 | 76046