Author: qboosh                       Date: Fri Aug 18 08:32:14 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- added partial ata_piix update (ICH8 SATA + ICH7 PATA); ICH6/7/8 combined mode 
left broken

---- Files affected:
SOURCES:
   linux-2.4-libata-update.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.4-libata-update.patch
diff -u SOURCES/linux-2.4-libata-update.patch:1.2 
SOURCES/linux-2.4-libata-update.patch:1.3
--- SOURCES/linux-2.4-libata-update.patch:1.2   Fri Aug 18 09:59:53 2006
+++ SOURCES/linux-2.4-libata-update.patch       Fri Aug 18 10:32:08 2006
@@ -114,3 +114,44 @@
        /* initialize adapter */
        rc = ahci_host_init(probe_ent);
        if (rc)
+--- linux-2.4.33/drivers/scsi/ata_piix.c.orig  2006-08-11 06:18:20.000000000 
+0200
++++ linux-2.4.33/drivers/scsi/ata_piix.c       2006-08-18 10:11:43.235971000 
+0200
+@@ -100,6 +100,7 @@
+       { 0x8086, 0x7111, PCI_ANY_ID, PCI_ANY_ID, 0, 0, piix4_pata },
+       { 0x8086, 0x24db, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich5_pata },
+       { 0x8086, 0x25a2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich5_pata },
++      { 0x8086, 0x27df, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich5_pata },
+ #endif
+ 
+       /* NOTE: The following PCI ids must be kept in sync with the
+@@ -116,6 +117,9 @@
+       { 0x8086, 0x27c0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich7_sata },
+       { 0x8086, 0x27c4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich7_sata },
+       { 0x8086, 0x2680, PCI_ANY_ID, PCI_ANY_ID, 0, 0, esb2_sata },
++      { 0x8086, 0x2820, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich7_sata },
++      { 0x8086, 0x2825, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich7_sata },
++      { 0x8086, 0x2828, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich7_sata },
+ 
+       { }     /* terminate list */
+ };
+--- linux-2.4.33/drivers/pci/quirks.c.orig     2006-08-18 10:01:07.925971000 
+0200
++++ linux-2.4.33/drivers/pci/quirks.c  2006-08-18 10:14:03.235971000 +0200
+@@ -748,6 +748,9 @@
+       case 0x27c4:
+               ich = 7;
+               break;
++      case 0x2828:    /* ICH8M */
++              ich = 8;
++              break;
+       default:
+               /* we do not handle this PCI device */
+               return;
+@@ -767,7 +770,7 @@
+               else
+                       return;                 /* not in combined mode */
+       } else {
+-              WARN_ON((ich != 6) && (ich != 7));
++              WARN_ON((ich != 6) && (ich != 7) && (ich != 8));
+               tmp &= 0x3;  /* interesting bits 1:0 */
+               if (tmp & (1 << 0))
+                       comb = (1 << 2);        /* PATA port 0, SATA port 1 */
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/SOURCES/linux-2.4-libata-update.patch?r1=1.2&r2=1.3&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to