rpms/kernel/devel kernel-2.6.spec, 1.2147, 1.2148 linux-2.6-sata-promise-pata-ports.patch, 1.1, 1.2

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31261

Modified Files:
	kernel-2.6.spec linux-2.6-sata-promise-pata-ports.patch 
Log Message:
make pata on promise-sata work again



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2147
retrieving revision 1.2148
diff -u -r1.2147 -r1.2148
--- kernel-2.6.spec	21 Apr 2006 03:49:37 -0000	1.2147
+++ kernel-2.6.spec	21 Apr 2006 17:42:16 -0000	1.2148
@@ -986,7 +986,7 @@
 %patch2104 -p1
 
 # Enable PATA ports on Promise SATA.
-#%patch2200 -p1
+%patch2200 -p1
 # Silence silly SATA printk.
 %patch2201 -p1
 # Fix AHCI Suspend.
@@ -1663,6 +1663,9 @@
 %endif
 
 %changelog
+* Fri Apr 21 2006 Dave Jones <davej at redhat.com>
+- Make Promise PATA on SATA work again (thanks Jim Bevier)
+
 * Thu Apr 20 2006 Dave Jones <davej at redhat.com>
 - 2.6.17rc2-git3
 - Make AHCI suspend/resume work.

linux-2.6-sata-promise-pata-ports.patch:
 drivers/scsi/libata-core.c  |    1 
 drivers/scsi/sata_promise.c |   52 ++++++++++++++++++++++++++++++++++++++------
 include/linux/libata.h      |    1 
 3 files changed, 48 insertions(+), 6 deletions(-)

Index: linux-2.6-sata-promise-pata-ports.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-sata-promise-pata-ports.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-sata-promise-pata-ports.patch	2 Mar 2006 04:47:18 -0000	1.1
+++ linux-2.6-sata-promise-pata-ports.patch	21 Apr 2006 17:42:16 -0000	1.2
@@ -22,7 +22,7 @@
 diff -Nru a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c
 --- a/drivers/scsi/sata_promise.c	2006-02-08 10:08:08.000000000 -0700
 +++ b/drivers/scsi/sata_promise.c	2006-02-08 11:26:47.000000000 -0700
-@@ -165,7 +165,7 @@
+@@ -172,7 +172,7 @@
  	/* board_2037x */
  	{
  		.sht		= &pdc_ata_sht,
@@ -31,7 +31,7 @@
  		.pio_mask	= 0x1f, /* pio0-4 */
  		.mwdma_mask	= 0x07, /* mwdma0-2 */
  		.udma_mask	= 0x7f, /* udma0-6 ; FIXME */
-@@ -322,15 +322,34 @@
+@@ -360,15 +360,34 @@
  
  static void pdc_sata_phy_reset(struct ata_port *ap)
  {
@@ -70,7 +70,7 @@
  
  	pdc_reset_port(ap);
  	ata_port_probe(ap);
-@@ -646,6 +665,7 @@
+@@ -673,6 +692,7 @@
  	unsigned int board_idx = (unsigned int) ent->driver_data;
  	int pci_dev_busy = 0;
  	int rc;
@@ -78,7 +78,7 @@
  
  	if (!printed_version++)
  		dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");
-@@ -705,6 +725,9 @@
+@@ -741,6 +761,9 @@
  	probe_ent->port[0].scr_addr = base + 0x400;
  	probe_ent->port[1].scr_addr = base + 0x500;
  
@@ -88,7 +88,7 @@
  	/* notice 4-port boards */
  	switch (board_idx) {
  	case board_20319:
-@@ -715,9 +738,23 @@
+@@ -755,13 +778,27 @@
  
  		probe_ent->port[2].scr_addr = base + 0x600;
  		probe_ent->port[3].scr_addr = base + 0x700;
@@ -96,6 +96,10 @@
 +		probe_ent->port_flags[2] = ATA_FLAG_SATA;	/* pata fix */
 +		probe_ent->port_flags[3] = ATA_FLAG_SATA;	/* pata fix */
  		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;
 +/*		probe_ent->n_ports = 2; */			/* pata fix */
@@ -113,7 +117,7 @@
  		break;
  	case board_20771:
  		probe_ent->n_ports = 2;
-@@ -730,6 +767,9 @@
+@@ -774,6 +811,9 @@
  
  		probe_ent->port[2].scr_addr = base + 0x600;
  		probe_ent->port[3].scr_addr = base + 0x700;
@@ -126,11 +130,12 @@
 diff -Nru a/include/linux/libata.h b/include/linux/libata.h
 --- a/include/linux/libata.h	2006-02-08 11:40:54.000000000 -0700
 +++ b/include/linux/libata.h	2006-02-08 11:45:02.000000000 -0700
-@@ -237,6 +237,7 @@
+@@ -281,6 +281,7 @@
  	unsigned long		irq;
  	unsigned int		irq_flags;
  	unsigned long		host_flags;
 +	unsigned long		port_flags[ATA_MAX_PORTS];	/* pata fix */
+	unsigned long		host_set_flags;
  	void __iomem		*mmio_base;
  	void			*private_data;
  };