Author: qboosh Date: Thu Aug 17 09:15:44 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated from
http://www.kernel.org/pub/linux/kernel/people/jgarzik/libata/2.4.32-libata1.patch.bz2
(mostly applied in 2.4.33, only few hunks remained)
---- Files affected:
SOURCES:
linux-2.4-libata.patch (1.3 -> 1.4)
---- Diffs:
================================================================
Index: SOURCES/linux-2.4-libata.patch
diff -u SOURCES/linux-2.4-libata.patch:1.3 SOURCES/linux-2.4-libata.patch:1.4
--- SOURCES/linux-2.4-libata.patch:1.3 Wed Aug 16 13:30:21 2006
+++ SOURCES/linux-2.4-libata.patch Thu Aug 17 11:15:39 2006
@@ -1,101 +1,28 @@
+The 'combined' branch of
+rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-2.4.git
- Documentation/DocBook/Makefile | 2
- Documentation/DocBook/libata.tmpl | 5 ++
- drivers/pci/quirks.c | 85
++++++++++++++++++++++++++++++++++++++
- drivers/scsi/ata_piix.c | 3 -
- drivers/scsi/libata-core.c | 24 ++++++++--
- include/linux/ioport.h | 1
- kernel/ksyms.c | 1
- kernel/resource.c | 10 ++++
- 12 files changed, 176 insertions(+), 13 deletions(-)
+contains the following updates:
-through these ChangeSets:
-
-<[EMAIL PROTECTED]> (05/03/22 1.1400.199.4)
- [PATCH] libata: support descriptor sense in ctrl page
-
- libata must support the descriptor format sense blocks as they
- are required to properly report results of ATA pass through
- commands as well as other SCSI commands reporting 48b LBAs.
- This patch adjusts the control mode page to properly report
- this.
-
- Signed-off-by: Brett Russ <[EMAIL PROTECTED]>
- Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
-
-<[EMAIL PROTECTED]> (05/01/06 1.1451)
- [PCI] update SATA PCI quirk for Intel ICH7
-
-<[EMAIL PROTECTED]> (04/07/10 1.1429)
- [PCI, libata] Fix "combined mode" PCI quirk for ICH6
-
- The hardware vendor, in their infinite wisdom, make the combined
- mode configuration register different between ICH5 and ICH6.
-
- Take this into account.
-
-<[EMAIL PROTECTED]> (04/06/16 1.1417)
- [libata ata_piix] re-enable combined mode support
-
- We disabled it upstream, and now undo that in our local copy.
-
-<[EMAIL PROTECTED]> (04/06/15 1.1414)
- [libata ata_piix] ->qc_prep hook
-
- Rename ->fill_sg hook to ->qc_prep, and call it unconditionally
- (as opposed to ->fill_sg, which was called only when the
- flag ATA_QCFLAG_SG was set).
-
-<[EMAIL PROTECTED]> (04/06/02 1.1408)
- [libata ata_piix] Use standard headers from include/scsi, not drivers/scsi
-
-<[EMAIL PROTECTED]> (04/05/17 1.1406)
- [libata ata_piix] fix DocBook docs
-
-<[EMAIL PROTECTED]> (04/05/15 1.1403)
- [libata ata_piix] add ->bmdma_setup hook
-
- (2.4 only) since this driver isn't in 2.4 mainline (yet), we need
- to manually apply this patch separately.
-
-<[EMAIL PROTECTED]> (04/04/22 1.1359.17.1)
- [libata] re-merge the rest of the 2.4 junk
-
-diff -Nru a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
---- a/Documentation/DocBook/Makefile 2005-04-27 17:01:32 -04:00
-+++ b/Documentation/DocBook/Makefile 2005-04-27 17:01:32 -04:00
-@@ -82,10 +82,12 @@
- libata.sgml: libata.tmpl $(TOPDIR)/drivers/scsi/libata-core.c \
- $(TOPDIR)/drivers/scsi/libata-scsi.c \
- $(TOPDIR)/drivers/scsi/sata_sil.c \
-+ $(TOPDIR)/drivers/scsi/ata_piix.c \
- $(TOPDIR)/drivers/scsi/sata_via.c
- $(TOPDIR)/scripts/docgen $(TOPDIR)/drivers/scsi/libata-core.c \
- $(TOPDIR)/drivers/scsi/libata-scsi.c \
- $(TOPDIR)/drivers/scsi/sata_sil.c \
-+ $(TOPDIR)/drivers/scsi/ata_piix.c \
- $(TOPDIR)/drivers/scsi/sata_via.c \
- < libata.tmpl > libata.sgml
-
-diff -Nru a/Documentation/DocBook/libata.tmpl
b/Documentation/DocBook/libata.tmpl
---- a/Documentation/DocBook/libata.tmpl 2005-04-27 17:01:32 -04:00
-+++ b/Documentation/DocBook/libata.tmpl 2005-04-27 17:01:32 -04:00
-@@ -267,6 +267,11 @@
- !Idrivers/scsi/libata-scsi.c
- </chapter>
-
-+ <chapter id="PiixInt">
-+ <title>ata_piix Internals</title>
-+!Idrivers/scsi/ata_piix.c
-+ </chapter>
-+
- <chapter id="SILInt">
- <title>sata_sil Internals</title>
- !Idrivers/scsi/sata_sil.c
-diff -Nru a/drivers/pci/quirks.c b/drivers/pci/quirks.c
---- a/drivers/pci/quirks.c 2005-04-27 17:01:32 -04:00
-+++ b/drivers/pci/quirks.c 2005-04-27 17:01:32 -04:00
-@@ -702,6 +702,83 @@
+ drivers/pci/quirks.c | 86 ++
+ drivers/scsi/libata-core.c | 1743
+++++++++++++++++++++++++++---------------
+ include/linux/ioport.h | 1
+ kernel/ksyms.c | 1
+ kernel/resource.c | 10
+
+Jeff Garzik:
+ [libata] resync with kernel 2.6.13
+ [libata sata_sx4] trim trailing whitespace
+ [libata] resync with 2.6.14
+ [libata] resync with 2.6.15-rc3
+ [libata] fix build
+ [libata] combined mode support, using ugly ____request_resource() hack
+ [libata] fix potential oops in pdev_printk() compat helper
+
+diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
+index 1a0408f..c4c17fc 100644
+--- a/drivers/pci/quirks.c
++++ b/drivers/pci/quirks.c
+@@ -702,6 +702,84 @@ static void __init asus_hides_smbus_lpc(
}
}
@@ -119,6 +46,7 @@
+ case 0x2651:
+ case 0x2652:
+ case 0x2653:
++ case 0x2680: /* ESB2 */
+ ich = 6;
+ break;
+ case 0x27c0:
@@ -179,11 +107,10 @@
/*
* The main table of quirks.
*/
-@@ -787,6 +864,14 @@
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_INTEL,
PCI_DEVICE_ID_INTEL_7205_0, asus_hides_smbus_hostbridge },
+@@ -788,6 +866,14 @@ static struct pci_fixup pci_fixups[] __i
{ PCI_FIXUP_HEADER, PCI_VENDOR_ID_INTEL,
PCI_DEVICE_ID_INTEL_82801DB_0, asus_hides_smbus_lpc },
{ PCI_FIXUP_HEADER, PCI_VENDOR_ID_INTEL,
PCI_DEVICE_ID_INTEL_82801BA_0, asus_hides_smbus_lpc },
-+
+
+#ifdef CONFIG_SCSI_SATA
+ /* Fixup BIOSes that configure Parallel ATA (PATA / IDE) and
+ * Serial ATA (SATA) into the same PCI ID.
@@ -191,14 +118,19 @@
+ { PCI_FIXUP_FINAL, PCI_VENDOR_ID_INTEL, PCI_ANY_ID,
+ quirk_intel_ide_combined },
+#endif /* CONFIG_SCSI_SATA */
-
++
{ 0 }
};
-diff -Nru a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
---- a/drivers/scsi/libata-core.c 2005-04-27 17:01:32 -04:00
-+++ b/drivers/scsi/libata-core.c 2005-04-27 17:01:32 -04:00
-@@ -3787,14 +3787,30 @@
+diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
+index ed3b745..26276d8 100644
+--- a/drivers/scsi/libata-core.c
++++ b/drivers/scsi/libata-core.c
+@@ -4218,16 +4737,33 @@ int ata_pci_init_one (struct pci_dev *pd
+ goto err_out;
+ }
+
++ /* FIXME: Should use platform specific mappers for legacy port ranges */
if (legacy_mode) {
if (!request_region(0x1f0, 8, "libata")) {
- disable_dev_on_err = 0;
@@ -232,10 +164,11 @@
} else
legacy_mode |= (1 << 1);
}
-diff -Nru a/include/linux/ioport.h b/include/linux/ioport.h
---- a/include/linux/ioport.h 2005-04-27 17:01:32 -04:00
-+++ b/include/linux/ioport.h 2005-04-27 17:01:32 -04:00
-@@ -85,6 +85,7 @@
+diff --git a/include/linux/ioport.h b/include/linux/ioport.h
+index 94df6d4..1984c5a 100644
+--- a/include/linux/ioport.h
++++ b/include/linux/ioport.h
+@@ -85,6 +85,7 @@ extern struct resource iomem_resource;
extern int check_resource(struct resource *root, unsigned long, unsigned
long);
extern int request_resource(struct resource *root, struct resource *new);
@@ -243,10 +176,11 @@
extern int release_resource(struct resource *new);
extern int allocate_resource(struct resource *root, struct resource *new,
unsigned long size,
-diff -Nru a/kernel/ksyms.c b/kernel/ksyms.c
---- a/kernel/ksyms.c 2005-04-27 17:01:32 -04:00
-+++ b/kernel/ksyms.c 2005-04-27 17:01:32 -04:00
-@@ -448,6 +448,7 @@
+diff --git a/kernel/ksyms.c b/kernel/ksyms.c
+index d1e66c7..5209d2f 100644
+--- a/kernel/ksyms.c
++++ b/kernel/ksyms.c
+@@ -448,6 +448,7 @@ EXPORT_SYMBOL(enable_hlt);
#endif
/* resource handling */
@@ -254,10 +188,11 @@
EXPORT_SYMBOL(request_resource);
EXPORT_SYMBOL(release_resource);
EXPORT_SYMBOL(allocate_resource);
-diff -Nru a/kernel/resource.c b/kernel/resource.c
---- a/kernel/resource.c 2005-04-27 17:01:32 -04:00
-+++ b/kernel/resource.c 2005-04-27 17:01:32 -04:00
-@@ -166,6 +166,16 @@
+diff --git a/kernel/resource.c b/kernel/resource.c
+index cd14435..fe736a2 100644
+--- a/kernel/resource.c
++++ b/kernel/resource.c
+@@ -166,6 +166,16 @@ int request_resource(struct resource *ro
return conflict ? -EBUSY : 0;
}
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/linux-2.4-libata.patch?r1=1.3&r2=1.4&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
