Attachment 103107 Details for Bug 176249

[patch] Patch for 2.6.18 as in SUSE 10.2 Beta1

promise-2.6.18.patch (text/plain), 3.72 KB, created by Andras Mantia on 2006-10-30 22:36:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andras Mantia

Created: 2006-10-30 22:36:48 UTC

Size: 3.72 KB

patch

obsolete

>diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c
>index d627812..931852e 100644
>--- a/drivers/ata/sata_promise.c
>+++ b/drivers/ata/sata_promise.c
>@@ -175,7 +175,7 @@ static const struct ata_port_info pdc_po
> 	/* board_2037x */
> 	{
> 		.sht		= &pdc_ata_sht,
>-		.flags		= PDC_COMMON_FLAGS | ATA_FLAG_SATA,
>+		.flags		= PDC_COMMON_FLAGS /* | ATA_FLAG_SATA */,
> 		.pio_mask	= 0x1f, /* pio0-4 */
> 		.mwdma_mask	= 0x07, /* mwdma0-2 */
> 		.udma_mask	= 0x7f, /* udma0-6 ; FIXME */
>@@ -371,23 +354,27 @@ static void pdc_reset_port(struct ata_po
> 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 __iomem *mmio = (void *) ap->ioaddr.cmd_addr + PDC_CTLSTAT + 0x03;
>+	void __iomem *mmio =
>+		(void __iomem *) 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)
> {
> 	pdc_pata_cbl_detect(ap);
>@@ -695,6 +682,7 @@ static int pdc_ata_init_one (struct pci_
> 	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");
>@@ -759,6 +747,9 @@ 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:
>@@ -773,13 +764,29 @@ 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[2] = ATA_FLAG_SATA;
>+		probe_ent->_port_flags[3] = ATA_FLAG_SATA;
> 		break;
> 	case board_2057x:
> 		/* Override hotplug offset for SATAII150 */
> 		hp->hotplug_offset = PDC2_SATA_PLUG_CSR;
> 		/* Fall through */
> 	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;
>diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
>index b4abd68..8ba7e25 100644
>--- a/drivers/ata/libata-core.c
>+++ b/drivers/ata/libata-core.c
>@@ -5293,13 +5310,13 @@ void ata_port_init(struct ata_port *ap, 
> 		ap->pio_mask = ent->pinfo2->pio_mask;
> 		ap->mwdma_mask = ent->pinfo2->mwdma_mask;
> 		ap->udma_mask = ent->pinfo2->udma_mask;
>-		ap->flags |= ent->pinfo2->flags;
>+		ap->flags |= ent->pinfo2->flags | ent->_port_flags[port_no];
> 		ap->ops = ent->pinfo2->port_ops;
> 	} else {
> 		ap->pio_mask = ent->pio_mask;
> 		ap->mwdma_mask = ent->mwdma_mask;
> 		ap->udma_mask = ent->udma_mask;
>-		ap->flags |= ent->port_flags;
>+		ap->flags |= ent->port_flags | ent->_port_flags[port_no];
> 		ap->ops = ent->port_ops;
> 	}
> 	ap->hw_sata_spd_limit = UINT_MAX;
>diff --git a/include/linux/libata.h b/include/linux/libata.h
>index d6a3d4b..8363cce 100644
>--- a/include/linux/libata.h
>+++ b/include/linux/libata.h
>@@ -372,6 +378,7 @@ struct ata_probe_ent {
> 	unsigned int		irq_flags;
> 	unsigned long		port_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 176249: 83772 | 83773 | 84155 | 84156 | 103107