From ce0984ec5db9152548582ca9b6b440c0b7cc0153 Mon Sep 17 00:00:00 2001 From: "Alexandros C. Couloumbis" Date: Wed, 8 Dec 2010 21:20:40 +0000 Subject: [PATCH] linux/generic: update & refresh 2.6.36 & 2.6.37. (closes #8324) SVN-Revision: 24370 --- ...-cfi_show_amd_extended_table_version.patch | 29 ++++--------- .../089-mtd-samsung-flash.patch | 41 ++++++++++--------- ...-cfi_show_amd_extended_table_version.patch | 29 ++++--------- .../030-pci_disable_common_quirks.patch | 2 +- .../089-mtd-samsung-flash.patch | 12 +++--- .../patches-2.6.37/400-ledtrig_morse.patch | 6 +-- .../patches-2.6.37/402-ledtrig_netdev.patch | 2 +- .../801-usb_serial_endpoint_size.patch | 6 +-- .../generic/patches-2.6.37/922-gpiommc.patch | 2 +- .../generic/patches-2.6.37/930-crashlog.patch | 2 +- .../patches-2.6.37/980-vm_exports.patch | 4 +- 11 files changed, 55 insertions(+), 80 deletions(-) diff --git a/target/linux/generic/patches-2.6.36/014-cfi_show_amd_extended_table_version.patch b/target/linux/generic/patches-2.6.36/014-cfi_show_amd_extended_table_version.patch index 55a6c2e7d3..5e16d96486 100644 --- a/target/linux/generic/patches-2.6.36/014-cfi_show_amd_extended_table_version.patch +++ b/target/linux/generic/patches-2.6.36/014-cfi_show_amd_extended_table_version.patch @@ -1,30 +1,15 @@ --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c -@@ -371,6 +371,8 @@ static struct cfi_fixup fixup_table[] = - static void cfi_fixup_major_minor(struct cfi_private *cfi, - struct cfi_pri_amdstd *extp) - { -+ // manufacturers defined in include/linux/mtd/cfi.h -+ - if (cfi->mfr == CFI_MFR_SAMSUNG && cfi->id == 0x257e && - extp->MajorVersion == '0') - extp->MajorVersion = '1'; -@@ -403,6 +405,9 @@ struct mtd_info *cfi_cmdset_0002(struct +@@ -418,9 +418,9 @@ struct mtd_info *cfi_cmdset_0002(struct - mtd->reboot_notifier.notifier_call = cfi_amdstd_reboot; - -+ printk(" CFI mfr 0x%08x\n", cfi->mfr); // TODO: Is there a more general place to print this info? -+ printk(" CFI id 0x%08x\n", cfi->id); -+ - if (cfi->cfi_mode==CFI_MODE_CFI){ - unsigned char bootloc; - __u16 adr = primary?cfi->cfiq->P_ADR:cfi->cfiq->A_ADR; -@@ -420,7 +425,7 @@ struct mtd_info *cfi_cmdset_0002(struct + /* * Valid primary extension versions are: 1.0, 1.1, 1.2, 1.3, 1.4 - * see: http://www.amd.com/us-en/assets/content_type/DownloadableAssets/cfi_r20.pdf, page 19 - * http://www.amd.com/us-en/assets/content_type/DownloadableAssets/cfi_100_20011201.pdf +- * see: http://www.amd.com/us-en/assets/content_type/DownloadableAssets/cfi_r20.pdf, page 19 +- * http://www.amd.com/us-en/assets/content_type/DownloadableAssets/cfi_100_20011201.pdf - * http://www.spansion.com/Support/Datasheets/s29ws-p_00_a12_e.pdf -+ * http://www.spansion.com/Support/AppNotes/CFI_Spec_AN_03.pdf ++ * see: Spec 1.3 http://cs.ozerki.net/zap/pub/axim-x5/docs/cfi_r20.pdf, page 19 ++ * http://www.spansion.com/Support/AppNotes/cfi_100_20011201.pdf ++ * Spec 1.4 http://www.spansion.com/Support/AppNotes/CFI_Spec_AN_03.pdf, page 9 */ if (extp->MajorVersion != '1' || (extp->MajorVersion == '1' && (extp->MinorVersion < '0' || extp->MinorVersion > '4'))) { diff --git a/target/linux/generic/patches-2.6.36/089-mtd-samsung-flash.patch b/target/linux/generic/patches-2.6.36/089-mtd-samsung-flash.patch index 1d13d4ed5b..bdbb325b86 100644 --- a/target/linux/generic/patches-2.6.36/089-mtd-samsung-flash.patch +++ b/target/linux/generic/patches-2.6.36/089-mtd-samsung-flash.patch @@ -1,36 +1,39 @@ --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c -@@ -373,9 +373,32 @@ static void cfi_fixup_major_minor(struct +@@ -371,9 +371,34 @@ static struct cfi_fixup fixup_table[] = + static void cfi_fixup_major_minor(struct cfi_private *cfi, + struct cfi_pri_amdstd *extp) { - // manufacturers defined in include/linux/mtd/cfi.h - - if (cfi->mfr == CFI_MFR_SAMSUNG && cfi->id == 0x257e && - extp->MajorVersion == '0') +- extp->MajorVersion = '1'; ++ /* Manufacturers are defined in include/linux/mtd/cfi.h */ ++ + if (cfi->mfr == CFI_MFR_SAMSUNG && -+ extp->MajorVersion == '0') { -+ printk(" Fixed Samsung's Amd/Fujitsu Extended Query version from %c.%c", -+ extp->MajorVersion, extp->MinorVersion); ++ extp->MajorVersion == '0') { ++ printk(" Fixed Samsung's Amd/Fujitsu Extended Query version from %c.%c", ++ extp->MajorVersion, extp->MinorVersion); + - extp->MajorVersion = '1'; -+ extp->MinorVersion = '0'; ++ extp->MajorVersion = '1'; ++ extp->MinorVersion = '0'; + -+ printk(" to %c.%c.\n", -+ extp->MajorVersion, extp->MinorVersion); ++ printk(" to %c.%c.\n", ++ extp->MajorVersion, extp->MinorVersion); + } + + if (cfi->mfr == CFI_MFR_SAMSUNG && -+ extp->MajorVersion == '3' && extp->MinorVersion == '3') { -+ printk(KERN_NOTICE " Newer Samsung flash detected, " -+ "should be compatibile with Amd/Fujitsu.\n"); ++ extp->MajorVersion == '3' && extp->MinorVersion == '3') { ++ printk(KERN_NOTICE " Newer Samsung flash detected, " ++ "should be compatible with Amd/Fujitsu.\n"); + -+ printk(" Fixed Samsung's Amd/Fujitsu Extended Query version from %c.%c", -+ extp->MajorVersion, extp->MinorVersion); ++ printk(" Fixed Samsung's Amd/Fujitsu Extended Query version from %c.%c", ++ extp->MajorVersion, extp->MinorVersion); + -+ extp->MajorVersion = '1'; // set to 1.3 (last defined version) -+ extp->MinorVersion = '3'; ++ extp->MajorVersion = '1'; // set to 1.3 ++ extp->MinorVersion = '3'; + -+ printk(" to %c.%c.\n", -+ extp->MajorVersion, extp->MinorVersion); ++ printk(" to %c.%c.\n", ++ extp->MajorVersion, extp->MinorVersion); + } } diff --git a/target/linux/generic/patches-2.6.37/014-cfi_show_amd_extended_table_version.patch b/target/linux/generic/patches-2.6.37/014-cfi_show_amd_extended_table_version.patch index 6da34f78f9..38ba76df46 100644 --- a/target/linux/generic/patches-2.6.37/014-cfi_show_amd_extended_table_version.patch +++ b/target/linux/generic/patches-2.6.37/014-cfi_show_amd_extended_table_version.patch @@ -1,30 +1,15 @@ --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c -@@ -392,6 +392,8 @@ static struct cfi_fixup fixup_table[] = - static void cfi_fixup_major_minor(struct cfi_private *cfi, - struct cfi_pri_amdstd *extp) - { -+ // manufacturers defined in include/linux/mtd/cfi.h -+ - if (cfi->mfr == CFI_MFR_SAMSUNG && cfi->id == 0x257e && - extp->MajorVersion == '0') - extp->MajorVersion = '1'; -@@ -431,6 +433,9 @@ struct mtd_info *cfi_cmdset_0002(struct +@@ -446,9 +446,9 @@ struct mtd_info *cfi_cmdset_0002(struct - mtd->reboot_notifier.notifier_call = cfi_amdstd_reboot; - -+ printk(" CFI mfr 0x%08x\n", cfi->mfr); // TODO: Is there a more general place to print this info? -+ printk(" CFI id 0x%08x\n", cfi->id); -+ - if (cfi->cfi_mode==CFI_MODE_CFI){ - unsigned char bootloc; - __u16 adr = primary?cfi->cfiq->P_ADR:cfi->cfiq->A_ADR; -@@ -448,7 +453,7 @@ struct mtd_info *cfi_cmdset_0002(struct + /* * Valid primary extension versions are: 1.0, 1.1, 1.2, 1.3, 1.4 - * see: http://cs.ozerki.net/zap/pub/axim-x5/docs/cfi_r20.pdf, page 19 - * http://www.spansion.com/Support/AppNotes/cfi_100_20011201.pdf +- * see: http://cs.ozerki.net/zap/pub/axim-x5/docs/cfi_r20.pdf, page 19 +- * http://www.spansion.com/Support/AppNotes/cfi_100_20011201.pdf - * http://www.spansion.com/Support/Datasheets/s29ws-p_00_a12_e.pdf -+ * http://www.spansion.com/Support/AppNotes/CFI_Spec_AN_03.pdf ++ * see: Spec 1.3 http://cs.ozerki.net/zap/pub/axim-x5/docs/cfi_r20.pdf, page 19 ++ * http://www.spansion.com/Support/AppNotes/cfi_100_20011201.pdf ++ * Spec 1.4 http://www.spansion.com/Support/AppNotes/CFI_Spec_AN_03.pdf, page 9 */ if (extp->MajorVersion != '1' || (extp->MajorVersion == '1' && (extp->MinorVersion < '0' || extp->MinorVersion > '4'))) { diff --git a/target/linux/generic/patches-2.6.37/030-pci_disable_common_quirks.patch b/target/linux/generic/patches-2.6.37/030-pci_disable_common_quirks.patch index a1a591563a..fdb7e818ea 100644 --- a/target/linux/generic/patches-2.6.37/030-pci_disable_common_quirks.patch +++ b/target/linux/generic/patches-2.6.37/030-pci_disable_common_quirks.patch @@ -33,7 +33,7 @@ /* Enable 1k I/O space granularity on the Intel P64H2 */ static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev) { -@@ -2648,6 +2651,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I +@@ -2666,6 +2669,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1518, quirk_i82576_sriov); #endif /* CONFIG_PCI_IOV */ diff --git a/target/linux/generic/patches-2.6.37/089-mtd-samsung-flash.patch b/target/linux/generic/patches-2.6.37/089-mtd-samsung-flash.patch index e4e56a0e17..cb9f7bfaca 100644 --- a/target/linux/generic/patches-2.6.37/089-mtd-samsung-flash.patch +++ b/target/linux/generic/patches-2.6.37/089-mtd-samsung-flash.patch @@ -1,12 +1,14 @@ --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c -@@ -394,9 +394,33 @@ static void cfi_fixup_major_minor(struct +@@ -392,9 +392,35 @@ static struct cfi_fixup fixup_table[] = + static void cfi_fixup_major_minor(struct cfi_private *cfi, + struct cfi_pri_amdstd *extp) { - // manufacturers defined in include/linux/mtd/cfi.h - - if (cfi->mfr == CFI_MFR_SAMSUNG && cfi->id == 0x257e && - extp->MajorVersion == '0') - extp->MajorVersion = '1'; ++ /* Manufacturers are defined in include/linux/mtd/cfi.h */ ++ + if (cfi->mfr == CFI_MFR_SAMSUNG && + extp->MajorVersion == '0') { + printk(" Fixed Samsung's Amd/Fujitsu Extended Query version from %c.%c", @@ -22,12 +24,12 @@ + if (cfi->mfr == CFI_MFR_SAMSUNG && + extp->MajorVersion == '3' && extp->MinorVersion == '3') { + printk(KERN_NOTICE " Newer Samsung flash detected, " -+ "should be compatibile with Amd/Fujitsu.\n"); ++ "should be compatible with Amd/Fujitsu.\n"); + + printk(" Fixed Samsung's Amd/Fujitsu Extended Query version from %c.%c", + extp->MajorVersion, extp->MinorVersion); + -+ extp->MajorVersion = '1'; // set to 1.3 (last defined version) ++ extp->MajorVersion = '1'; // set to 1.3 + extp->MinorVersion = '3'; + + printk(" to %c.%c.\n", diff --git a/target/linux/generic/patches-2.6.37/400-ledtrig_morse.patch b/target/linux/generic/patches-2.6.37/400-ledtrig_morse.patch index 3252cd5b85..8d90184556 100644 --- a/target/linux/generic/patches-2.6.37/400-ledtrig_morse.patch +++ b/target/linux/generic/patches-2.6.37/400-ledtrig_morse.patch @@ -1,8 +1,8 @@ --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig -@@ -407,4 +407,8 @@ endif # LEDS_TRIGGERS - - endif # LEDS_CLASS +@@ -439,4 +439,8 @@ config LEDS_TRIGGER_DEFAULT_ON + comment "iptables trigger is under Netfilter config (LED target)" + depends on LEDS_TRIGGERS +config LEDS_TRIGGER_MORSE + tristate "LED Morse Trigger" diff --git a/target/linux/generic/patches-2.6.37/402-ledtrig_netdev.patch b/target/linux/generic/patches-2.6.37/402-ledtrig_netdev.patch index 7f559e19e5..45a42ef8fb 100644 --- a/target/linux/generic/patches-2.6.37/402-ledtrig_netdev.patch +++ b/target/linux/generic/patches-2.6.37/402-ledtrig_netdev.patch @@ -1,6 +1,6 @@ --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig -@@ -411,4 +411,11 @@ config LEDS_TRIGGER_MORSE +@@ -443,4 +443,11 @@ config LEDS_TRIGGER_MORSE tristate "LED Morse Trigger" depends on LEDS_TRIGGERS diff --git a/target/linux/generic/patches-2.6.37/801-usb_serial_endpoint_size.patch b/target/linux/generic/patches-2.6.37/801-usb_serial_endpoint_size.patch index aa64c686f3..45a096d873 100644 --- a/target/linux/generic/patches-2.6.37/801-usb_serial_endpoint_size.patch +++ b/target/linux/generic/patches-2.6.37/801-usb_serial_endpoint_size.patch @@ -1,6 +1,6 @@ --- a/drivers/usb/serial/usb-serial.c +++ b/drivers/usb/serial/usb-serial.c -@@ -60,6 +60,7 @@ static struct usb_driver usb_serial_driv +@@ -61,6 +61,7 @@ static struct usb_driver usb_serial_driv drivers depend on it. */ @@ -8,7 +8,7 @@ static int debug; /* initially all NULL */ static struct usb_serial *serial_table[SERIAL_TTY_MINORS]; -@@ -912,7 +913,7 @@ int usb_serial_probe(struct usb_interfac +@@ -913,7 +914,7 @@ int usb_serial_probe(struct usb_interfac } buffer_size = serial->type->bulk_in_size; if (!buffer_size) @@ -17,7 +17,7 @@ port->bulk_in_size = buffer_size; port->bulk_in_endpointAddress = endpoint->bEndpointAddress; port->bulk_in_buffer = kmalloc(buffer_size, GFP_KERNEL); -@@ -1385,3 +1386,5 @@ MODULE_LICENSE("GPL"); +@@ -1388,3 +1389,5 @@ MODULE_LICENSE("GPL"); module_param(debug, bool, S_IRUGO | S_IWUSR); MODULE_PARM_DESC(debug, "Debug enabled or not"); diff --git a/target/linux/generic/patches-2.6.37/922-gpiommc.patch b/target/linux/generic/patches-2.6.37/922-gpiommc.patch index 8eb66e4563..bae87f21b0 100644 --- a/target/linux/generic/patches-2.6.37/922-gpiommc.patch +++ b/target/linux/generic/patches-2.6.37/922-gpiommc.patch @@ -829,7 +829,7 @@ +be done automatically. --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -2706,6 +2706,11 @@ T: git git://git.kernel.org/pub/scm/linu +@@ -2708,6 +2708,11 @@ T: git git://git.kernel.org/pub/scm/linu S: Maintained F: drivers/media/video/gspca/ diff --git a/target/linux/generic/patches-2.6.37/930-crashlog.patch b/target/linux/generic/patches-2.6.37/930-crashlog.patch index b2fa27b08f..fa275ce147 100644 --- a/target/linux/generic/patches-2.6.37/930-crashlog.patch +++ b/target/linux/generic/patches-2.6.37/930-crashlog.patch @@ -15,7 +15,7 @@ +#endif --- a/init/Kconfig +++ b/init/Kconfig -@@ -780,6 +780,10 @@ config RELAY +@@ -793,6 +793,10 @@ config RELAY If unsure, say N. diff --git a/target/linux/generic/patches-2.6.37/980-vm_exports.patch b/target/linux/generic/patches-2.6.37/980-vm_exports.patch index 5f0c3d4836..e93971a752 100644 --- a/target/linux/generic/patches-2.6.37/980-vm_exports.patch +++ b/target/linux/generic/patches-2.6.37/980-vm_exports.patch @@ -104,7 +104,7 @@ * We enter with non-exclusive mmap_sem (to exclude vma changes, --- a/mm/vmalloc.c +++ b/mm/vmalloc.c -@@ -1186,6 +1186,7 @@ void unmap_kernel_range(unsigned long ad +@@ -1192,6 +1192,7 @@ void unmap_kernel_range(unsigned long ad vunmap_page_range(addr, end); flush_tlb_kernel_range(addr, end); } @@ -112,7 +112,7 @@ int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages) { -@@ -1301,6 +1302,7 @@ struct vm_struct *get_vm_area(unsigned l +@@ -1307,6 +1308,7 @@ struct vm_struct *get_vm_area(unsigned l return __get_vm_area_node(size, 1, flags, VMALLOC_START, VMALLOC_END, -1, GFP_KERNEL, __builtin_return_address(0)); }