diff options
347 files changed, 10138 insertions, 5417 deletions
diff --git a/Documentation/arm/mem_alignment b/Documentation/arm/mem_alignment index d145ccca169a..c7c7a114c78c 100644 --- a/Documentation/arm/mem_alignment +++ b/Documentation/arm/mem_alignment | |||
| @@ -24,7 +24,7 @@ real bad - it changes the behaviour of all unaligned instructions in user | |||
| 24 | space, and might cause programs to fail unexpectedly. | 24 | space, and might cause programs to fail unexpectedly. |
| 25 | 25 | ||
| 26 | To change the alignment trap behavior, simply echo a number into | 26 | To change the alignment trap behavior, simply echo a number into |
| 27 | /proc/sys/debug/alignment. The number is made up from various bits: | 27 | /proc/cpu/alignment. The number is made up from various bits: |
| 28 | 28 | ||
| 29 | bit behavior when set | 29 | bit behavior when set |
| 30 | --- ----------------- | 30 | --- ----------------- |
diff --git a/Documentation/local_ops.txt b/Documentation/local_ops.txt index f4f8b1c6c8ba..23045b8b50f0 100644 --- a/Documentation/local_ops.txt +++ b/Documentation/local_ops.txt | |||
| @@ -149,7 +149,7 @@ static void do_test_timer(unsigned long data) | |||
| 149 | int cpu; | 149 | int cpu; |
| 150 | 150 | ||
| 151 | /* Increment the counters */ | 151 | /* Increment the counters */ |
| 152 | on_each_cpu(test_each, NULL, 0, 1); | 152 | on_each_cpu(test_each, NULL, 1); |
| 153 | /* Read all the counters */ | 153 | /* Read all the counters */ |
| 154 | printk("Counters read from CPU %d\n", smp_processor_id()); | 154 | printk("Counters read from CPU %d\n", smp_processor_id()); |
| 155 | for_each_online_cpu(cpu) { | 155 | for_each_online_cpu(cpu) { |
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt index 1c7334a3054e..d5b6b1171035 100644 --- a/Documentation/sound/alsa/ALSA-Configuration.txt +++ b/Documentation/sound/alsa/ALSA-Configuration.txt | |||
| @@ -846,6 +846,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. | |||
| 846 | 3stack 3-stack model | 846 | 3stack 3-stack model |
| 847 | toshiba Toshiba A205 | 847 | toshiba Toshiba A205 |
| 848 | acer Acer laptops | 848 | acer Acer laptops |
| 849 | acer-dmic Acer laptops with digital-mic | ||
| 849 | acer-aspire Acer Aspire One | 850 | acer-aspire Acer Aspire One |
| 850 | dell Dell OEM laptops (Vostro 1200) | 851 | dell Dell OEM laptops (Vostro 1200) |
| 851 | zepto Zepto laptops | 852 | zepto Zepto laptops |
| @@ -859,6 +860,8 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. | |||
| 859 | quanta Quanta FL1 | 860 | quanta Quanta FL1 |
| 860 | eeepc-p703 ASUS Eeepc P703 P900A | 861 | eeepc-p703 ASUS Eeepc P703 P900A |
| 861 | eeepc-p901 ASUS Eeepc P901 S101 | 862 | eeepc-p901 ASUS Eeepc P901 S101 |
| 863 | fujitsu FSC Amilo | ||
| 864 | auto auto-config reading BIOS (default) | ||
| 862 | 865 | ||
| 863 | ALC662/663 | 866 | ALC662/663 |
| 864 | 3stack-dig 3-stack (2-channel) with SPDIF | 867 | 3stack-dig 3-stack (2-channel) with SPDIF |
| @@ -902,6 +905,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. | |||
| 902 | 6stack-dig-demo 6-jack digital for Intel demo board | 905 | 6stack-dig-demo 6-jack digital for Intel demo board |
| 903 | acer Acer laptops (Travelmate 3012WTMi, Aspire 5600, etc) | 906 | acer Acer laptops (Travelmate 3012WTMi, Aspire 5600, etc) |
| 904 | acer-aspire Acer Aspire 9810 | 907 | acer-aspire Acer Aspire 9810 |
| 908 | acer-aspire-4930g Acer Aspire 4930G | ||
| 905 | medion Medion Laptops | 909 | medion Medion Laptops |
| 906 | medion-md2 Medion MD2 | 910 | medion-md2 Medion MD2 |
| 907 | targa-dig Targa/MSI | 911 | targa-dig Targa/MSI |
| @@ -917,6 +921,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. | |||
| 917 | mitac Mitac 8252D | 921 | mitac Mitac 8252D |
| 918 | clevo-m720 Clevo M720 laptop series | 922 | clevo-m720 Clevo M720 laptop series |
| 919 | fujitsu-pi2515 Fujitsu AMILO Pi2515 | 923 | fujitsu-pi2515 Fujitsu AMILO Pi2515 |
| 924 | fujitsu-xa3530 Fujitsu AMILO XA3530 | ||
| 920 | 3stack-6ch-intel Intel DG33* boards | 925 | 3stack-6ch-intel Intel DG33* boards |
| 921 | auto auto-config reading BIOS (default) | 926 | auto auto-config reading BIOS (default) |
| 922 | 927 | ||
| @@ -940,6 +945,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. | |||
| 940 | lenovo Lenovo 3000 C200 | 945 | lenovo Lenovo 3000 C200 |
| 941 | dallas Dallas laptops | 946 | dallas Dallas laptops |
| 942 | hp HP TX1000 | 947 | hp HP TX1000 |
| 948 | asus-v1s ASUS V1Sn | ||
| 943 | auto auto-config reading BIOS (default) | 949 | auto auto-config reading BIOS (default) |
| 944 | 950 | ||
| 945 | CMI9880 | 951 | CMI9880 |
| @@ -981,9 +987,10 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. | |||
| 981 | 6stack 6-jack, separate surrounds (default) | 987 | 6stack 6-jack, separate surrounds (default) |
| 982 | 3stack 3-stack, shared surrounds | 988 | 3stack 3-stack, shared surrounds |
| 983 | laptop 2-channel only (FSC V2060, Samsung M50) | 989 | laptop 2-channel only (FSC V2060, Samsung M50) |
| 984 | laptop-eapd 2-channel with EAPD (Samsung R65, ASUS A6J) | 990 | laptop-eapd 2-channel with EAPD (ASUS A6J) |
| 985 | laptop-automute 2-channel with EAPD and HP-automute (Lenovo N100) | 991 | laptop-automute 2-channel with EAPD and HP-automute (Lenovo N100) |
| 986 | ultra 2-channel with EAPD (Samsung Ultra tablet PC) | 992 | ultra 2-channel with EAPD (Samsung Ultra tablet PC) |
| 993 | samsung 2-channel with EAPD (Samsung R65) | ||
| 987 | 994 | ||
| 988 | AD1988/AD1988B/AD1989A/AD1989B | 995 | AD1988/AD1988B/AD1989A/AD1989B |
| 989 | 6stack 6-jack | 996 | 6stack 6-jack |
| @@ -1065,6 +1072,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. | |||
| 1065 | 1072 | ||
| 1066 | STAC9227/9228/9229/927x | 1073 | STAC9227/9228/9229/927x |
| 1067 | ref Reference board | 1074 | ref Reference board |
| 1075 | ref-no-jd Reference board without HP/Mic jack detection | ||
| 1068 | 3stack D965 3stack | 1076 | 3stack D965 3stack |
| 1069 | 5stack D965 5stack + SPDIF | 1077 | 5stack D965 5stack + SPDIF |
| 1070 | dell-3stack Dell Dimension E520 | 1078 | dell-3stack Dell Dimension E520 |
| @@ -1078,6 +1086,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. | |||
| 1078 | 1086 | ||
| 1079 | STAC92HD73* | 1087 | STAC92HD73* |
| 1080 | ref Reference board | 1088 | ref Reference board |
| 1089 | no-jd BIOS setup but without jack-detection | ||
| 1081 | dell-m6-amic Dell desktops/laptops with analog mics | 1090 | dell-m6-amic Dell desktops/laptops with analog mics |
| 1082 | dell-m6-dmic Dell desktops/laptops with digital mics | 1091 | dell-m6-dmic Dell desktops/laptops with digital mics |
| 1083 | dell-m6 Dell desktops/laptops with both type of mics | 1092 | dell-m6 Dell desktops/laptops with both type of mics |
diff --git a/Documentation/sound/alsa/Procfile.txt b/Documentation/sound/alsa/Procfile.txt index f738b296440a..bba2dbb79d81 100644 --- a/Documentation/sound/alsa/Procfile.txt +++ b/Documentation/sound/alsa/Procfile.txt | |||
| @@ -153,6 +153,16 @@ card*/codec#* | |||
| 153 | Shows the general codec information and the attribute of each | 153 | Shows the general codec information and the attribute of each |
| 154 | widget node. | 154 | widget node. |
| 155 | 155 | ||
| 156 | card*/eld#* | ||
| 157 | Available for HDMI or DisplayPort interfaces. | ||
| 158 | Shows ELD(EDID Like Data) info retrieved from the attached HDMI sink, | ||
| 159 | and describes its audio capabilities and configurations. | ||
| 160 | |||
| 161 | Some ELD fields may be modified by doing `echo name hex_value > eld#*`. | ||
| 162 | Only do this if you are sure the HDMI sink provided value is wrong. | ||
| 163 | And if that makes your HDMI audio work, please report to us so that we | ||
| 164 | can fix it in future kernel releases. | ||
| 165 | |||
| 156 | 166 | ||
| 157 | Sequencer Information | 167 | Sequencer Information |
| 158 | --------------------- | 168 | --------------------- |
diff --git a/MAINTAINERS b/MAINTAINERS index 618c1ef4a397..09ed704f4dda 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -779,6 +779,7 @@ ATM | |||
| 779 | P: Chas Williams | 779 | P: Chas Williams |
| 780 | M: chas@cmf.nrl.navy.mil | 780 | M: chas@cmf.nrl.navy.mil |
| 781 | L: linux-atm-general@lists.sourceforge.net (subscribers-only) | 781 | L: linux-atm-general@lists.sourceforge.net (subscribers-only) |
| 782 | L: netdev@vger.kernel.org | ||
| 782 | W: http://linux-atm.sourceforge.net | 783 | W: http://linux-atm.sourceforge.net |
| 783 | S: Maintained | 784 | S: Maintained |
| 784 | 785 | ||
| @@ -1526,10 +1527,10 @@ W: http://ebtables.sourceforge.net/ | |||
| 1526 | S: Maintained | 1527 | S: Maintained |
| 1527 | 1528 | ||
| 1528 | ECRYPT FILE SYSTEM | 1529 | ECRYPT FILE SYSTEM |
| 1529 | P: Mike Halcrow, Phillip Hellewell | 1530 | P: Tyler Hicks, Dustin Kirkland |
| 1530 | M: mhalcrow@us.ibm.com, phillip@hellewell.homeip.net | 1531 | M: tyhicks@linux.vnet.ibm.com, kirkland@canonical.com |
| 1531 | L: ecryptfs-devel@lists.sourceforge.net | 1532 | L: ecryptfs-devel@lists.launchpad.net |
| 1532 | W: http://ecryptfs.sourceforge.net/ | 1533 | W: https://launchpad.net/ecryptfs |
| 1533 | S: Supported | 1534 | S: Supported |
| 1534 | 1535 | ||
| 1535 | EDAC-CORE | 1536 | EDAC-CORE |
| @@ -3758,6 +3759,15 @@ M: drzeus-sdhci@drzeus.cx | |||
| 3758 | L: sdhci-devel@list.drzeus.cx | 3759 | L: sdhci-devel@list.drzeus.cx |
| 3759 | S: Maintained | 3760 | S: Maintained |
| 3760 | 3761 | ||
| 3762 | SECURITY SUBSYSTEM | ||
| 3763 | F: security/ | ||
| 3764 | P: James Morris | ||
| 3765 | M: jmorris@namei.org | ||
| 3766 | L: linux-kernel@vger.kernel.org | ||
| 3767 | L: linux-security-module@vger.kernel.org (suggested Cc:) | ||
| 3768 | T: git kernel.org:pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git | ||
| 3769 | S: Supported | ||
| 3770 | |||
| 3761 | SECURITY CONTACT | 3771 | SECURITY CONTACT |
| 3762 | P: Security Officers | 3772 | P: Security Officers |
| 3763 | M: security@kernel.org | 3773 | M: security@kernel.org |
| @@ -4235,7 +4245,7 @@ M: dedekind@infradead.org | |||
| 4235 | P: Adrian Hunter | 4245 | P: Adrian Hunter |
| 4236 | M: ext-adrian.hunter@nokia.com | 4246 | M: ext-adrian.hunter@nokia.com |
| 4237 | L: linux-mtd@lists.infradead.org | 4247 | L: linux-mtd@lists.infradead.org |
| 4238 | T: git git://git.infradead.org/~dedekind/ubifs-2.6.git | 4248 | T: git git://git.infradead.org/ubifs-2.6.git |
| 4239 | W: http://www.linux-mtd.infradead.org/doc/ubifs.html | 4249 | W: http://www.linux-mtd.infradead.org/doc/ubifs.html |
| 4240 | S: Maintained | 4250 | S: Maintained |
| 4241 | 4251 | ||
| @@ -4289,7 +4299,7 @@ P: Artem Bityutskiy | |||
| 4289 | M: dedekind@infradead.org | 4299 | M: dedekind@infradead.org |
| 4290 | W: http://www.linux-mtd.infradead.org/ | 4300 | W: http://www.linux-mtd.infradead.org/ |
| 4291 | L: linux-mtd@lists.infradead.org | 4301 | L: linux-mtd@lists.infradead.org |
| 4292 | T: git git://git.infradead.org/~dedekind/ubi-2.6.git | 4302 | T: git git://git.infradead.org/ubi-2.6.git |
| 4293 | S: Maintained | 4303 | S: Maintained |
| 4294 | 4304 | ||
| 4295 | USB ACM DRIVER | 4305 | USB ACM DRIVER |
| @@ -1,7 +1,7 @@ | |||
| 1 | VERSION = 2 | 1 | VERSION = 2 |
| 2 | PATCHLEVEL = 6 | 2 | PATCHLEVEL = 6 |
| 3 | SUBLEVEL = 28 | 3 | SUBLEVEL = 28 |
| 4 | EXTRAVERSION = -rc7 | 4 | EXTRAVERSION = -rc8 |
| 5 | NAME = Erotic Pickled Herring | 5 | NAME = Erotic Pickled Herring |
| 6 | 6 | ||
| 7 | # *DOCUMENTATION* | 7 | # *DOCUMENTATION* |
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c index 47ccec95f3e8..ef12794c3c68 100644 --- a/arch/arm/common/sa1111.c +++ b/arch/arm/common/sa1111.c | |||
| @@ -630,7 +630,7 @@ __sa1111_probe(struct device *me, struct resource *mem, int irq) | |||
| 630 | return -ENOMEM; | 630 | return -ENOMEM; |
| 631 | 631 | ||
| 632 | sachip->clk = clk_get(me, "SA1111_CLK"); | 632 | sachip->clk = clk_get(me, "SA1111_CLK"); |
| 633 | if (!sachip->clk) { | 633 | if (IS_ERR(sachip->clk)) { |
| 634 | ret = PTR_ERR(sachip->clk); | 634 | ret = PTR_ERR(sachip->clk); |
| 635 | goto err_free; | 635 | goto err_free; |
| 636 | } | 636 | } |
diff --git a/arch/arm/include/asm/bitops.h b/arch/arm/include/asm/bitops.h index 9a1db20e032a..63a481fbbed4 100644 --- a/arch/arm/include/asm/bitops.h +++ b/arch/arm/include/asm/bitops.h | |||
| @@ -237,6 +237,7 @@ extern int _find_next_bit_be(const unsigned long *p, int size, int offset); | |||
| 237 | #if __LINUX_ARM_ARCH__ < 5 | 237 | #if __LINUX_ARM_ARCH__ < 5 |
| 238 | 238 | ||
| 239 | #include <asm-generic/bitops/ffz.h> | 239 | #include <asm-generic/bitops/ffz.h> |
| 240 | #include <asm-generic/bitops/__fls.h> | ||
| 240 | #include <asm-generic/bitops/__ffs.h> | 241 | #include <asm-generic/bitops/__ffs.h> |
| 241 | #include <asm-generic/bitops/fls.h> | 242 | #include <asm-generic/bitops/fls.h> |
| 242 | #include <asm-generic/bitops/ffs.h> | 243 | #include <asm-generic/bitops/ffs.h> |
| @@ -277,16 +278,19 @@ static inline int constant_fls(int x) | |||
| 277 | * the clz instruction for much better code efficiency. | 278 | * the clz instruction for much better code efficiency. |
| 278 | */ | 279 | */ |
| 279 | 280 | ||
| 280 | #define __fls(x) \ | ||
| 281 | ( __builtin_constant_p(x) ? constant_fls(x) : \ | ||
| 282 | ({ int __r; asm("clz\t%0, %1" : "=r"(__r) : "r"(x) : "cc"); 32-__r; }) ) | ||
| 283 | |||
| 284 | /* Implement fls() in C so that 64-bit args are suitably truncated */ | ||
| 285 | static inline int fls(int x) | 281 | static inline int fls(int x) |
| 286 | { | 282 | { |
| 287 | return __fls(x); | 283 | int ret; |
| 284 | |||
| 285 | if (__builtin_constant_p(x)) | ||
| 286 | return constant_fls(x); | ||
| 287 | |||
| 288 | asm("clz\t%0, %1" : "=r" (ret) : "r" (x) : "cc"); | ||
| 289 | ret = 32 - ret; | ||
| 290 | return ret; | ||
| 288 | } | 291 | } |
| 289 | 292 | ||
| 293 | #define __fls(x) (fls(x) - 1) | ||
| 290 | #define ffs(x) ({ unsigned long __t = (x); fls(__t & -__t); }) | 294 | #define ffs(x) ({ unsigned long __t = (x); fls(__t & -__t); }) |
| 291 | #define __ffs(x) (ffs(x) - 1) | 295 | #define __ffs(x) (ffs(x) - 1) |
| 292 | #define ffz(x) __ffs( ~(x) ) | 296 | #define ffz(x) __ffs( ~(x) ) |
diff --git a/arch/arm/include/asm/processor.h b/arch/arm/include/asm/processor.h index 517a4d6ffc74..6ff33790f47b 100644 --- a/arch/arm/include/asm/processor.h +++ b/arch/arm/include/asm/processor.h | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | #include <asm/types.h> | 23 | #include <asm/types.h> |
| 24 | 24 | ||
| 25 | #ifdef __KERNEL__ | 25 | #ifdef __KERNEL__ |
| 26 | #define STACK_TOP ((current->personality == PER_LINUX_32BIT) ? \ | 26 | #define STACK_TOP ((current->personality & ADDR_LIMIT_32BIT) ? \ |
| 27 | TASK_SIZE : TASK_SIZE_26) | 27 | TASK_SIZE : TASK_SIZE_26) |
| 28 | #define STACK_TOP_MAX TASK_SIZE | 28 | #define STACK_TOP_MAX TASK_SIZE |
| 29 | #endif | 29 | #endif |
diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c index c74f766ffc12..23af3c972c9a 100644 --- a/arch/arm/kernel/armksyms.c +++ b/arch/arm/kernel/armksyms.c | |||
| @@ -115,6 +115,8 @@ EXPORT_SYMBOL(__strnlen_user); | |||
| 115 | EXPORT_SYMBOL(__strncpy_from_user); | 115 | EXPORT_SYMBOL(__strncpy_from_user); |
| 116 | 116 | ||
| 117 | #ifdef CONFIG_MMU | 117 | #ifdef CONFIG_MMU |
| 118 | EXPORT_SYMBOL(copy_page); | ||
| 119 | |||
| 118 | EXPORT_SYMBOL(__copy_from_user); | 120 | EXPORT_SYMBOL(__copy_from_user); |
| 119 | EXPORT_SYMBOL(__copy_to_user); | 121 | EXPORT_SYMBOL(__copy_to_user); |
| 120 | EXPORT_SYMBOL(__clear_user); | 122 | EXPORT_SYMBOL(__clear_user); |
| @@ -181,8 +183,6 @@ EXPORT_SYMBOL(_find_first_bit_be); | |||
| 181 | EXPORT_SYMBOL(_find_next_bit_be); | 183 | EXPORT_SYMBOL(_find_next_bit_be); |
| 182 | #endif | 184 | #endif |
| 183 | 185 | ||
| 184 | EXPORT_SYMBOL(copy_page); | ||
| 185 | |||
| 186 | #ifdef CONFIG_FUNCTION_TRACER | 186 | #ifdef CONFIG_FUNCTION_TRACER |
| 187 | EXPORT_SYMBOL(mcount); | 187 | EXPORT_SYMBOL(mcount); |
| 188 | #endif | 188 | #endif |
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c index 57e6874d0b80..79abc4ddc0cf 100644 --- a/arch/arm/kernel/traps.c +++ b/arch/arm/kernel/traps.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/personality.h> | 18 | #include <linux/personality.h> |
| 19 | #include <linux/kallsyms.h> | 19 | #include <linux/kallsyms.h> |
| 20 | #include <linux/delay.h> | 20 | #include <linux/delay.h> |
| 21 | #include <linux/hardirq.h> | ||
| 21 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 22 | #include <linux/uaccess.h> | 23 | #include <linux/uaccess.h> |
| 23 | 24 | ||
diff --git a/arch/arm/mach-omap1/io.c b/arch/arm/mach-omap1/io.c index b3bd8ca85118..4c3e582f3d3c 100644 --- a/arch/arm/mach-omap1/io.c +++ b/arch/arm/mach-omap1/io.c | |||
| @@ -128,7 +128,7 @@ void __init omap1_map_common_io(void) | |||
| 128 | * Common low-level hardware init for omap1. This should only get called from | 128 | * Common low-level hardware init for omap1. This should only get called from |
| 129 | * board specific init. | 129 | * board specific init. |
| 130 | */ | 130 | */ |
| 131 | void __init omap1_init_common_hw() | 131 | void __init omap1_init_common_hw(void) |
| 132 | { | 132 | { |
| 133 | /* REVISIT: Refer to OMAP5910 Errata, Advisory SYS_1: "Timeout Abort | 133 | /* REVISIT: Refer to OMAP5910 Errata, Advisory SYS_1: "Timeout Abort |
| 134 | * on a Posted Write in the TIPB Bridge". | 134 | * on a Posted Write in the TIPB Bridge". |
diff --git a/arch/arm/mach-pxa/include/mach/reset.h b/arch/arm/mach-pxa/include/mach/reset.h index 7b8842cfa5fc..31e6a7b6ad80 100644 --- a/arch/arm/mach-pxa/include/mach/reset.h +++ b/arch/arm/mach-pxa/include/mach/reset.h | |||
| @@ -12,9 +12,8 @@ extern void clear_reset_status(unsigned int mask); | |||
| 12 | 12 | ||
| 13 | /** | 13 | /** |
| 14 | * init_gpio_reset() - register GPIO as reset generator | 14 | * init_gpio_reset() - register GPIO as reset generator |
| 15 | * | 15 | * @gpio: gpio nr |
| 16 | * @gpio - gpio nr | 16 | * @output: set gpio as out/low instead of input during normal work |
| 17 | * @output - set gpio as out/low instead of input during normal work | ||
| 18 | */ | 17 | */ |
| 19 | extern int init_gpio_reset(int gpio, int output); | 18 | extern int init_gpio_reset(int gpio, int output); |
| 20 | 19 | ||
diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c index 133e65d166b3..2d5884ce0435 100644 --- a/arch/arm/mm/alignment.c +++ b/arch/arm/mm/alignment.c | |||
| @@ -70,6 +70,10 @@ static unsigned long ai_dword; | |||
| 70 | static unsigned long ai_multi; | 70 | static unsigned long ai_multi; |
| 71 | static int ai_usermode; | 71 | static int ai_usermode; |
| 72 | 72 | ||
| 73 | #define UM_WARN (1 << 0) | ||
| 74 | #define UM_FIXUP (1 << 1) | ||
| 75 | #define UM_SIGNAL (1 << 2) | ||
| 76 | |||
| 73 | #ifdef CONFIG_PROC_FS | 77 | #ifdef CONFIG_PROC_FS |
| 74 | static const char *usermode_action[] = { | 78 | static const char *usermode_action[] = { |
| 75 | "ignored", | 79 | "ignored", |
| @@ -754,7 +758,7 @@ do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs) | |||
| 754 | user: | 758 | user: |
| 755 | ai_user += 1; | 759 | ai_user += 1; |
| 756 | 760 | ||
| 757 | if (ai_usermode & 1) | 761 | if (ai_usermode & UM_WARN) |
| 758 | printk("Alignment trap: %s (%d) PC=0x%08lx Instr=0x%0*lx " | 762 | printk("Alignment trap: %s (%d) PC=0x%08lx Instr=0x%0*lx " |
| 759 | "Address=0x%08lx FSR 0x%03x\n", current->comm, | 763 | "Address=0x%08lx FSR 0x%03x\n", current->comm, |
| 760 | task_pid_nr(current), instrptr, | 764 | task_pid_nr(current), instrptr, |
| @@ -762,10 +766,10 @@ do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs) | |||
| 762 | thumb_mode(regs) ? tinstr : instr, | 766 | thumb_mode(regs) ? tinstr : instr, |
| 763 | addr, fsr); | 767 | addr, fsr); |
| 764 | 768 | ||
| 765 | if (ai_usermode & 2) | 769 | if (ai_usermode & UM_FIXUP) |
| 766 | goto fixup; | 770 | goto fixup; |
| 767 | 771 | ||
| 768 | if (ai_usermode & 4) | 772 | if (ai_usermode & UM_SIGNAL) |
| 769 | force_sig(SIGBUS, current); | 773 | force_sig(SIGBUS, current); |
| 770 | else | 774 | else |
| 771 | set_cr(cr_no_alignment); | 775 | set_cr(cr_no_alignment); |
| @@ -796,6 +800,22 @@ static int __init alignment_init(void) | |||
| 796 | res->write_proc = proc_alignment_write; | 800 | res->write_proc = proc_alignment_write; |
| 797 | #endif | 801 | #endif |
| 798 | 802 | ||
| 803 | /* | ||
| 804 | * ARMv6 and later CPUs can perform unaligned accesses for | ||
| 805 | * most single load and store instructions up to word size. | ||
| 806 | * LDM, STM, LDRD and STRD still need to be handled. | ||
| 807 | * | ||
| 808 | * Ignoring the alignment fault is not an option on these | ||
| 809 | * CPUs since we spin re-faulting the instruction without | ||
| 810 | * making any progress. | ||
| 811 | */ | ||
| 812 | if (cpu_architecture() >= CPU_ARCH_ARMv6 && (cr_alignment & CR_U)) { | ||
| 813 | cr_alignment &= ~CR_A; | ||
| 814 | cr_no_alignment &= ~CR_A; | ||
| 815 | set_cr(cr_alignment); | ||
| 816 | ai_usermode = UM_FIXUP; | ||
| 817 | } | ||
| 818 | |||
| 799 | hook_fault_code(1, do_alignment, SIGILL, "alignment exception"); | 819 | hook_fault_code(1, do_alignment, SIGILL, "alignment exception"); |
| 800 | hook_fault_code(3, do_alignment, SIGILL, "alignment exception"); | 820 | hook_fault_code(3, do_alignment, SIGILL, "alignment exception"); |
| 801 | 821 | ||
diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c index 2df8d9facf57..22c9530e91e2 100644 --- a/arch/arm/mm/fault.c +++ b/arch/arm/mm/fault.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 12 | #include <linux/signal.h> | 12 | #include <linux/signal.h> |
| 13 | #include <linux/mm.h> | 13 | #include <linux/mm.h> |
| 14 | #include <linux/hardirq.h> | ||
| 14 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 15 | #include <linux/kprobes.h> | 16 | #include <linux/kprobes.h> |
| 16 | #include <linux/uaccess.h> | 17 | #include <linux/uaccess.h> |
diff --git a/arch/arm/plat-omap/include/mach/omapfb.h b/arch/arm/plat-omap/include/mach/omapfb.h index ec67fb428607..7b74d1255e0b 100644 --- a/arch/arm/plat-omap/include/mach/omapfb.h +++ b/arch/arm/plat-omap/include/mach/omapfb.h | |||
| @@ -353,8 +353,8 @@ struct omapfb_device { | |||
| 353 | u32 pseudo_palette[17]; | 353 | u32 pseudo_palette[17]; |
| 354 | 354 | ||
| 355 | struct lcd_panel *panel; /* LCD panel */ | 355 | struct lcd_panel *panel; /* LCD panel */ |
| 356 | struct lcd_ctrl *ctrl; /* LCD controller */ | 356 | const struct lcd_ctrl *ctrl; /* LCD controller */ |
| 357 | struct lcd_ctrl *int_ctrl; /* internal LCD ctrl */ | 357 | const struct lcd_ctrl *int_ctrl; /* internal LCD ctrl */ |
| 358 | struct lcd_ctrl_extif *ext_if; /* LCD ctrl external | 358 | struct lcd_ctrl_extif *ext_if; /* LCD ctrl external |
| 359 | interface */ | 359 | interface */ |
| 360 | struct device *dev; | 360 | struct device *dev; |
diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c index 9f9a921829c0..dcd9d16da2e9 100644 --- a/arch/arm/plat-omap/sram.c +++ b/arch/arm/plat-omap/sram.c | |||
| @@ -255,7 +255,7 @@ void omap_sram_reprogram_clock(u32 dpllctl, u32 ckctl) | |||
| 255 | if (!_omap_sram_reprogram_clock) | 255 | if (!_omap_sram_reprogram_clock) |
| 256 | omap_sram_error(); | 256 | omap_sram_error(); |
| 257 | 257 | ||
| 258 | return _omap_sram_reprogram_clock(dpllctl, ckctl); | 258 | _omap_sram_reprogram_clock(dpllctl, ckctl); |
| 259 | } | 259 | } |
| 260 | 260 | ||
| 261 | int __init omap1_sram_init(void) | 261 | int __init omap1_sram_init(void) |
| @@ -282,8 +282,8 @@ void omap2_sram_ddr_init(u32 *slow_dll_ctrl, u32 fast_dll_ctrl, | |||
| 282 | if (!_omap2_sram_ddr_init) | 282 | if (!_omap2_sram_ddr_init) |
| 283 | omap_sram_error(); | 283 | omap_sram_error(); |
| 284 | 284 | ||
| 285 | return _omap2_sram_ddr_init(slow_dll_ctrl, fast_dll_ctrl, | 285 | _omap2_sram_ddr_init(slow_dll_ctrl, fast_dll_ctrl, |
| 286 | base_cs, force_unlock); | 286 | base_cs, force_unlock); |
| 287 | } | 287 | } |
| 288 | 288 | ||
| 289 | static void (*_omap2_sram_reprogram_sdrc)(u32 perf_level, u32 dll_val, | 289 | static void (*_omap2_sram_reprogram_sdrc)(u32 perf_level, u32 dll_val, |
| @@ -294,7 +294,7 @@ void omap2_sram_reprogram_sdrc(u32 perf_level, u32 dll_val, u32 mem_type) | |||
| 294 | if (!_omap2_sram_reprogram_sdrc) | 294 | if (!_omap2_sram_reprogram_sdrc) |
| 295 | omap_sram_error(); | 295 | omap_sram_error(); |
| 296 | 296 | ||
| 297 | return _omap2_sram_reprogram_sdrc(perf_level, dll_val, mem_type); | 297 | _omap2_sram_reprogram_sdrc(perf_level, dll_val, mem_type); |
| 298 | } | 298 | } |
| 299 | 299 | ||
| 300 | static u32 (*_omap2_set_prcm)(u32 dpll_ctrl_val, u32 sdrc_rfr_val, int bypass); | 300 | static u32 (*_omap2_set_prcm)(u32 dpll_ctrl_val, u32 sdrc_rfr_val, int bypass); |
diff --git a/arch/arm/plat-orion/pcie.c b/arch/arm/plat-orion/pcie.c index 883902fead89..d41d41d78ad9 100644 --- a/arch/arm/plat-orion/pcie.c +++ b/arch/arm/plat-orion/pcie.c | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | #define PCIE_CONF_REG(r) ((((r) & 0xf00) << 16) | ((r) & 0xfc)) | 35 | #define PCIE_CONF_REG(r) ((((r) & 0xf00) << 16) | ((r) & 0xfc)) |
| 36 | #define PCIE_CONF_BUS(b) (((b) & 0xff) << 16) | 36 | #define PCIE_CONF_BUS(b) (((b) & 0xff) << 16) |
| 37 | #define PCIE_CONF_DEV(d) (((d) & 0x1f) << 11) | 37 | #define PCIE_CONF_DEV(d) (((d) & 0x1f) << 11) |
| 38 | #define PCIE_CONF_FUNC(f) (((f) & 0x3) << 8) | 38 | #define PCIE_CONF_FUNC(f) (((f) & 0x7) << 8) |
| 39 | #define PCIE_CONF_DATA_OFF 0x18fc | 39 | #define PCIE_CONF_DATA_OFF 0x18fc |
| 40 | #define PCIE_MASK_OFF 0x1910 | 40 | #define PCIE_MASK_OFF 0x1910 |
| 41 | #define PCIE_CTRL_OFF 0x1a00 | 41 | #define PCIE_CTRL_OFF 0x1a00 |
diff --git a/arch/ia64/configs/generic_defconfig b/arch/ia64/configs/generic_defconfig index e05f9e1d3faa..27eb67604c53 100644 --- a/arch/ia64/configs/generic_defconfig +++ b/arch/ia64/configs/generic_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.27-rc1 | 3 | # Linux kernel version: 2.6.28-rc7 |
| 4 | # Mon Aug 4 15:38:01 2008 | 4 | # Mon Dec 8 08:12:07 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 6 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 7 | 7 | ||
| @@ -26,6 +26,7 @@ CONFIG_LOG_BUF_SHIFT=20 | |||
| 26 | CONFIG_CGROUPS=y | 26 | CONFIG_CGROUPS=y |
| 27 | # CONFIG_CGROUP_DEBUG is not set | 27 | # CONFIG_CGROUP_DEBUG is not set |
| 28 | # CONFIG_CGROUP_NS is not set | 28 | # CONFIG_CGROUP_NS is not set |
| 29 | # CONFIG_CGROUP_FREEZER is not set | ||
| 29 | # CONFIG_CGROUP_DEVICE is not set | 30 | # CONFIG_CGROUP_DEVICE is not set |
| 30 | CONFIG_CPUSETS=y | 31 | CONFIG_CPUSETS=y |
| 31 | # CONFIG_GROUP_SCHED is not set | 32 | # CONFIG_GROUP_SCHED is not set |
| @@ -46,7 +47,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y | |||
| 46 | CONFIG_SYSCTL=y | 47 | CONFIG_SYSCTL=y |
| 47 | # CONFIG_EMBEDDED is not set | 48 | # CONFIG_EMBEDDED is not set |
| 48 | CONFIG_SYSCTL_SYSCALL=y | 49 | CONFIG_SYSCTL_SYSCALL=y |
| 49 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 50 | CONFIG_KALLSYMS=y | 50 | CONFIG_KALLSYMS=y |
| 51 | CONFIG_KALLSYMS_ALL=y | 51 | CONFIG_KALLSYMS_ALL=y |
| 52 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 52 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -63,7 +63,9 @@ CONFIG_SIGNALFD=y | |||
| 63 | CONFIG_TIMERFD=y | 63 | CONFIG_TIMERFD=y |
| 64 | CONFIG_EVENTFD=y | 64 | CONFIG_EVENTFD=y |
| 65 | CONFIG_SHMEM=y | 65 | CONFIG_SHMEM=y |
| 66 | CONFIG_AIO=y | ||
| 66 | CONFIG_VM_EVENT_COUNTERS=y | 67 | CONFIG_VM_EVENT_COUNTERS=y |
| 68 | CONFIG_PCI_QUIRKS=y | ||
| 67 | CONFIG_SLUB_DEBUG=y | 69 | CONFIG_SLUB_DEBUG=y |
| 68 | # CONFIG_SLAB is not set | 70 | # CONFIG_SLAB is not set |
| 69 | CONFIG_SLUB=y | 71 | CONFIG_SLUB=y |
| @@ -72,15 +74,11 @@ CONFIG_SLUB=y | |||
| 72 | # CONFIG_MARKERS is not set | 74 | # CONFIG_MARKERS is not set |
| 73 | CONFIG_HAVE_OPROFILE=y | 75 | CONFIG_HAVE_OPROFILE=y |
| 74 | # CONFIG_KPROBES is not set | 76 | # CONFIG_KPROBES is not set |
| 75 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
| 76 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
| 77 | CONFIG_HAVE_KPROBES=y | 77 | CONFIG_HAVE_KPROBES=y |
| 78 | CONFIG_HAVE_KRETPROBES=y | 78 | CONFIG_HAVE_KRETPROBES=y |
| 79 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | 79 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
| 80 | CONFIG_HAVE_DMA_ATTRS=y | 80 | CONFIG_HAVE_DMA_ATTRS=y |
| 81 | CONFIG_USE_GENERIC_SMP_HELPERS=y | 81 | CONFIG_USE_GENERIC_SMP_HELPERS=y |
| 82 | # CONFIG_HAVE_CLK is not set | ||
| 83 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 84 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 82 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 85 | CONFIG_SLABINFO=y | 83 | CONFIG_SLABINFO=y |
| 86 | CONFIG_RT_MUTEXES=y | 84 | CONFIG_RT_MUTEXES=y |
| @@ -113,6 +111,7 @@ CONFIG_DEFAULT_AS=y | |||
| 113 | # CONFIG_DEFAULT_NOOP is not set | 111 | # CONFIG_DEFAULT_NOOP is not set |
| 114 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 112 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 115 | CONFIG_CLASSIC_RCU=y | 113 | CONFIG_CLASSIC_RCU=y |
| 114 | # CONFIG_FREEZER is not set | ||
| 116 | 115 | ||
| 117 | # | 116 | # |
| 118 | # Processor type and features | 117 | # Processor type and features |
| @@ -125,8 +124,6 @@ CONFIG_MMU=y | |||
| 125 | CONFIG_SWIOTLB=y | 124 | CONFIG_SWIOTLB=y |
| 126 | CONFIG_IOMMU_HELPER=y | 125 | CONFIG_IOMMU_HELPER=y |
| 127 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 126 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 128 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
| 129 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
| 130 | CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y | 127 | CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y |
| 131 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 128 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 132 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 129 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| @@ -139,13 +136,16 @@ CONFIG_GENERIC_IOMAP=y | |||
| 139 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 136 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 140 | CONFIG_IA64_UNCACHED_ALLOCATOR=y | 137 | CONFIG_IA64_UNCACHED_ALLOCATOR=y |
| 141 | CONFIG_AUDIT_ARCH=y | 138 | CONFIG_AUDIT_ARCH=y |
| 139 | # CONFIG_PARAVIRT_GUEST is not set | ||
| 142 | CONFIG_IA64_GENERIC=y | 140 | CONFIG_IA64_GENERIC=y |
| 143 | # CONFIG_IA64_DIG is not set | 141 | # CONFIG_IA64_DIG is not set |
| 142 | # CONFIG_IA64_DIG_VTD is not set | ||
| 144 | # CONFIG_IA64_HP_ZX1 is not set | 143 | # CONFIG_IA64_HP_ZX1 is not set |
| 145 | # CONFIG_IA64_HP_ZX1_SWIOTLB is not set | 144 | # CONFIG_IA64_HP_ZX1_SWIOTLB is not set |
| 146 | # CONFIG_IA64_SGI_SN2 is not set | 145 | # CONFIG_IA64_SGI_SN2 is not set |
| 147 | # CONFIG_IA64_SGI_UV is not set | 146 | # CONFIG_IA64_SGI_UV is not set |
| 148 | # CONFIG_IA64_HP_SIM is not set | 147 | # CONFIG_IA64_HP_SIM is not set |
| 148 | # CONFIG_IA64_XEN_GUEST is not set | ||
| 149 | # CONFIG_ITANIUM is not set | 149 | # CONFIG_ITANIUM is not set |
| 150 | CONFIG_MCKINLEY=y | 150 | CONFIG_MCKINLEY=y |
| 151 | # CONFIG_IA64_PAGE_SIZE_4KB is not set | 151 | # CONFIG_IA64_PAGE_SIZE_4KB is not set |
| @@ -182,16 +182,17 @@ CONFIG_DISCONTIGMEM_MANUAL=y | |||
| 182 | CONFIG_DISCONTIGMEM=y | 182 | CONFIG_DISCONTIGMEM=y |
| 183 | CONFIG_FLAT_NODE_MEM_MAP=y | 183 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 184 | CONFIG_NEED_MULTIPLE_NODES=y | 184 | CONFIG_NEED_MULTIPLE_NODES=y |
| 185 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 186 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y | 185 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y |
| 187 | CONFIG_PAGEFLAGS_EXTENDED=y | 186 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 188 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 187 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 189 | CONFIG_MIGRATION=y | 188 | CONFIG_MIGRATION=y |
| 190 | CONFIG_RESOURCES_64BIT=y | 189 | CONFIG_RESOURCES_64BIT=y |
| 190 | CONFIG_PHYS_ADDR_T_64BIT=y | ||
| 191 | CONFIG_ZONE_DMA_FLAG=1 | 191 | CONFIG_ZONE_DMA_FLAG=1 |
| 192 | CONFIG_BOUNCE=y | 192 | CONFIG_BOUNCE=y |
| 193 | CONFIG_NR_QUICK=1 | 193 | CONFIG_NR_QUICK=1 |
| 194 | CONFIG_VIRT_TO_BUS=y | 194 | CONFIG_VIRT_TO_BUS=y |
| 195 | CONFIG_UNEVICTABLE_LRU=y | ||
| 195 | CONFIG_MMU_NOTIFIER=y | 196 | CONFIG_MMU_NOTIFIER=y |
| 196 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y | 197 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y |
| 197 | CONFIG_ARCH_DISCONTIGMEM_ENABLE=y | 198 | CONFIG_ARCH_DISCONTIGMEM_ENABLE=y |
| @@ -231,12 +232,12 @@ CONFIG_EFI_VARS=y | |||
| 231 | CONFIG_EFI_PCDP=y | 232 | CONFIG_EFI_PCDP=y |
| 232 | CONFIG_DMIID=y | 233 | CONFIG_DMIID=y |
| 233 | CONFIG_BINFMT_ELF=y | 234 | CONFIG_BINFMT_ELF=y |
| 235 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 236 | # CONFIG_HAVE_AOUT is not set | ||
| 234 | CONFIG_BINFMT_MISC=m | 237 | CONFIG_BINFMT_MISC=m |
| 235 | 238 | ||
| 236 | # CONFIG_DMAR is not set | ||
| 237 | |||
| 238 | # | 239 | # |
| 239 | # Power management and ACPI | 240 | # Power management and ACPI options |
| 240 | # | 241 | # |
| 241 | CONFIG_PM=y | 242 | CONFIG_PM=y |
| 242 | # CONFIG_PM_DEBUG is not set | 243 | # CONFIG_PM_DEBUG is not set |
| @@ -248,7 +249,6 @@ CONFIG_ACPI_PROC_EVENT=y | |||
| 248 | CONFIG_ACPI_BUTTON=m | 249 | CONFIG_ACPI_BUTTON=m |
| 249 | CONFIG_ACPI_FAN=m | 250 | CONFIG_ACPI_FAN=m |
| 250 | CONFIG_ACPI_DOCK=y | 251 | CONFIG_ACPI_DOCK=y |
| 251 | # CONFIG_ACPI_BAY is not set | ||
| 252 | CONFIG_ACPI_PROCESSOR=m | 252 | CONFIG_ACPI_PROCESSOR=m |
| 253 | CONFIG_ACPI_HOTPLUG_CPU=y | 253 | CONFIG_ACPI_HOTPLUG_CPU=y |
| 254 | CONFIG_ACPI_THERMAL=m | 254 | CONFIG_ACPI_THERMAL=m |
| @@ -256,9 +256,7 @@ CONFIG_ACPI_NUMA=y | |||
| 256 | # CONFIG_ACPI_CUSTOM_DSDT is not set | 256 | # CONFIG_ACPI_CUSTOM_DSDT is not set |
| 257 | CONFIG_ACPI_BLACKLIST_YEAR=0 | 257 | CONFIG_ACPI_BLACKLIST_YEAR=0 |
| 258 | # CONFIG_ACPI_DEBUG is not set | 258 | # CONFIG_ACPI_DEBUG is not set |
| 259 | CONFIG_ACPI_EC=y | ||
| 260 | # CONFIG_ACPI_PCI_SLOT is not set | 259 | # CONFIG_ACPI_PCI_SLOT is not set |
| 261 | CONFIG_ACPI_POWER=y | ||
| 262 | CONFIG_ACPI_SYSTEM=y | 260 | CONFIG_ACPI_SYSTEM=y |
| 263 | CONFIG_ACPI_CONTAINER=m | 261 | CONFIG_ACPI_CONTAINER=m |
| 264 | 262 | ||
| @@ -275,7 +273,7 @@ CONFIG_PCI_DOMAINS=y | |||
| 275 | CONFIG_PCI_SYSCALL=y | 273 | CONFIG_PCI_SYSCALL=y |
| 276 | # CONFIG_PCIEPORTBUS is not set | 274 | # CONFIG_PCIEPORTBUS is not set |
| 277 | CONFIG_ARCH_SUPPORTS_MSI=y | 275 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 278 | # CONFIG_PCI_MSI is not set | 276 | CONFIG_PCI_MSI=y |
| 279 | CONFIG_PCI_LEGACY=y | 277 | CONFIG_PCI_LEGACY=y |
| 280 | # CONFIG_PCI_DEBUG is not set | 278 | # CONFIG_PCI_DEBUG is not set |
| 281 | CONFIG_HOTPLUG_PCI=m | 279 | CONFIG_HOTPLUG_PCI=m |
| @@ -286,6 +284,7 @@ CONFIG_HOTPLUG_PCI_ACPI=m | |||
| 286 | # CONFIG_HOTPLUG_PCI_SHPC is not set | 284 | # CONFIG_HOTPLUG_PCI_SHPC is not set |
| 287 | # CONFIG_HOTPLUG_PCI_SGI is not set | 285 | # CONFIG_HOTPLUG_PCI_SGI is not set |
| 288 | # CONFIG_PCCARD is not set | 286 | # CONFIG_PCCARD is not set |
| 287 | CONFIG_DMAR=y | ||
| 289 | CONFIG_NET=y | 288 | CONFIG_NET=y |
| 290 | 289 | ||
| 291 | # | 290 | # |
| @@ -333,6 +332,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 333 | # CONFIG_TIPC is not set | 332 | # CONFIG_TIPC is not set |
| 334 | # CONFIG_ATM is not set | 333 | # CONFIG_ATM is not set |
| 335 | # CONFIG_BRIDGE is not set | 334 | # CONFIG_BRIDGE is not set |
| 335 | # CONFIG_NET_DSA is not set | ||
| 336 | # CONFIG_VLAN_8021Q is not set | 336 | # CONFIG_VLAN_8021Q is not set |
| 337 | # CONFIG_DECNET is not set | 337 | # CONFIG_DECNET is not set |
| 338 | # CONFIG_LLC2 is not set | 338 | # CONFIG_LLC2 is not set |
| @@ -353,11 +353,10 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 353 | # CONFIG_IRDA is not set | 353 | # CONFIG_IRDA is not set |
| 354 | # CONFIG_BT is not set | 354 | # CONFIG_BT is not set |
| 355 | # CONFIG_AF_RXRPC is not set | 355 | # CONFIG_AF_RXRPC is not set |
| 356 | 356 | # CONFIG_PHONET is not set | |
| 357 | # | 357 | CONFIG_WIRELESS=y |
| 358 | # Wireless | ||
| 359 | # | ||
| 360 | # CONFIG_CFG80211 is not set | 358 | # CONFIG_CFG80211 is not set |
| 359 | CONFIG_WIRELESS_OLD_REGULATORY=y | ||
| 361 | # CONFIG_WIRELESS_EXT is not set | 360 | # CONFIG_WIRELESS_EXT is not set |
| 362 | # CONFIG_MAC80211 is not set | 361 | # CONFIG_MAC80211 is not set |
| 363 | # CONFIG_IEEE80211 is not set | 362 | # CONFIG_IEEE80211 is not set |
| @@ -385,7 +384,7 @@ CONFIG_PROC_EVENTS=y | |||
| 385 | # CONFIG_MTD is not set | 384 | # CONFIG_MTD is not set |
| 386 | # CONFIG_PARPORT is not set | 385 | # CONFIG_PARPORT is not set |
| 387 | CONFIG_PNP=y | 386 | CONFIG_PNP=y |
| 388 | # CONFIG_PNP_DEBUG is not set | 387 | # CONFIG_PNP_DEBUG_MESSAGES is not set |
| 389 | 388 | ||
| 390 | # | 389 | # |
| 391 | # Protocols | 390 | # Protocols |
| @@ -419,10 +418,9 @@ CONFIG_SGI_XP=m | |||
| 419 | # CONFIG_HP_ILO is not set | 418 | # CONFIG_HP_ILO is not set |
| 420 | CONFIG_SGI_GRU=m | 419 | CONFIG_SGI_GRU=m |
| 421 | # CONFIG_SGI_GRU_DEBUG is not set | 420 | # CONFIG_SGI_GRU_DEBUG is not set |
| 421 | # CONFIG_C2PORT is not set | ||
| 422 | CONFIG_HAVE_IDE=y | 422 | CONFIG_HAVE_IDE=y |
| 423 | CONFIG_IDE=y | 423 | CONFIG_IDE=y |
| 424 | CONFIG_IDE_MAX_HWIFS=4 | ||
| 425 | CONFIG_BLK_DEV_IDE=y | ||
| 426 | 424 | ||
| 427 | # | 425 | # |
| 428 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | 426 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
| @@ -430,12 +428,12 @@ CONFIG_BLK_DEV_IDE=y | |||
| 430 | CONFIG_IDE_TIMINGS=y | 428 | CONFIG_IDE_TIMINGS=y |
| 431 | CONFIG_IDE_ATAPI=y | 429 | CONFIG_IDE_ATAPI=y |
| 432 | # CONFIG_BLK_DEV_IDE_SATA is not set | 430 | # CONFIG_BLK_DEV_IDE_SATA is not set |
| 433 | CONFIG_BLK_DEV_IDEDISK=y | 431 | CONFIG_IDE_GD=y |
| 434 | # CONFIG_IDEDISK_MULTI_MODE is not set | 432 | CONFIG_IDE_GD_ATA=y |
| 433 | # CONFIG_IDE_GD_ATAPI is not set | ||
| 435 | CONFIG_BLK_DEV_IDECD=y | 434 | CONFIG_BLK_DEV_IDECD=y |
| 436 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y | 435 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y |
| 437 | # CONFIG_BLK_DEV_IDETAPE is not set | 436 | # CONFIG_BLK_DEV_IDETAPE is not set |
| 438 | CONFIG_BLK_DEV_IDEFLOPPY=y | ||
| 439 | CONFIG_BLK_DEV_IDESCSI=m | 437 | CONFIG_BLK_DEV_IDESCSI=m |
| 440 | # CONFIG_BLK_DEV_IDEACPI is not set | 438 | # CONFIG_BLK_DEV_IDEACPI is not set |
| 441 | # CONFIG_IDE_TASK_IOCTL is not set | 439 | # CONFIG_IDE_TASK_IOCTL is not set |
| @@ -705,6 +703,9 @@ CONFIG_TULIP=m | |||
| 705 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 703 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 706 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 704 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| 707 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 705 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
| 706 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
| 707 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
| 708 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
| 708 | CONFIG_NET_PCI=y | 709 | CONFIG_NET_PCI=y |
| 709 | # CONFIG_PCNET32 is not set | 710 | # CONFIG_PCNET32 is not set |
| 710 | # CONFIG_AMD8111_ETH is not set | 711 | # CONFIG_AMD8111_ETH is not set |
| @@ -725,11 +726,11 @@ CONFIG_E100=m | |||
| 725 | # CONFIG_TLAN is not set | 726 | # CONFIG_TLAN is not set |
| 726 | # CONFIG_VIA_RHINE is not set | 727 | # CONFIG_VIA_RHINE is not set |
| 727 | # CONFIG_SC92031 is not set | 728 | # CONFIG_SC92031 is not set |
| 729 | # CONFIG_ATL2 is not set | ||
| 728 | CONFIG_NETDEV_1000=y | 730 | CONFIG_NETDEV_1000=y |
| 729 | # CONFIG_ACENIC is not set | 731 | # CONFIG_ACENIC is not set |
| 730 | # CONFIG_DL2K is not set | 732 | # CONFIG_DL2K is not set |
| 731 | CONFIG_E1000=y | 733 | CONFIG_E1000=y |
| 732 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | ||
| 733 | # CONFIG_E1000E is not set | 734 | # CONFIG_E1000E is not set |
| 734 | # CONFIG_IP1000 is not set | 735 | # CONFIG_IP1000 is not set |
| 735 | CONFIG_IGB=y | 736 | CONFIG_IGB=y |
| @@ -747,18 +748,22 @@ CONFIG_TIGON3=y | |||
| 747 | # CONFIG_QLA3XXX is not set | 748 | # CONFIG_QLA3XXX is not set |
| 748 | # CONFIG_ATL1 is not set | 749 | # CONFIG_ATL1 is not set |
| 749 | # CONFIG_ATL1E is not set | 750 | # CONFIG_ATL1E is not set |
| 751 | # CONFIG_JME is not set | ||
| 750 | CONFIG_NETDEV_10000=y | 752 | CONFIG_NETDEV_10000=y |
| 751 | # CONFIG_CHELSIO_T1 is not set | 753 | # CONFIG_CHELSIO_T1 is not set |
| 752 | # CONFIG_CHELSIO_T3 is not set | 754 | # CONFIG_CHELSIO_T3 is not set |
| 755 | # CONFIG_ENIC is not set | ||
| 753 | # CONFIG_IXGBE is not set | 756 | # CONFIG_IXGBE is not set |
| 754 | # CONFIG_IXGB is not set | 757 | # CONFIG_IXGB is not set |
| 755 | # CONFIG_S2IO is not set | 758 | # CONFIG_S2IO is not set |
| 756 | # CONFIG_MYRI10GE is not set | 759 | # CONFIG_MYRI10GE is not set |
| 757 | # CONFIG_NETXEN_NIC is not set | 760 | # CONFIG_NETXEN_NIC is not set |
| 758 | # CONFIG_NIU is not set | 761 | # CONFIG_NIU is not set |
| 762 | # CONFIG_MLX4_EN is not set | ||
| 759 | # CONFIG_MLX4_CORE is not set | 763 | # CONFIG_MLX4_CORE is not set |
| 760 | # CONFIG_TEHUTI is not set | 764 | # CONFIG_TEHUTI is not set |
| 761 | # CONFIG_BNX2X is not set | 765 | # CONFIG_BNX2X is not set |
| 766 | # CONFIG_QLGE is not set | ||
| 762 | # CONFIG_SFC is not set | 767 | # CONFIG_SFC is not set |
| 763 | # CONFIG_TR is not set | 768 | # CONFIG_TR is not set |
| 764 | 769 | ||
| @@ -826,9 +831,11 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y | |||
| 826 | CONFIG_MOUSE_PS2_SYNAPTICS=y | 831 | CONFIG_MOUSE_PS2_SYNAPTICS=y |
| 827 | CONFIG_MOUSE_PS2_LIFEBOOK=y | 832 | CONFIG_MOUSE_PS2_LIFEBOOK=y |
| 828 | CONFIG_MOUSE_PS2_TRACKPOINT=y | 833 | CONFIG_MOUSE_PS2_TRACKPOINT=y |
| 834 | # CONFIG_MOUSE_PS2_ELANTECH is not set | ||
| 829 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 835 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
| 830 | # CONFIG_MOUSE_SERIAL is not set | 836 | # CONFIG_MOUSE_SERIAL is not set |
| 831 | # CONFIG_MOUSE_APPLETOUCH is not set | 837 | # CONFIG_MOUSE_APPLETOUCH is not set |
| 838 | # CONFIG_MOUSE_BCM5974 is not set | ||
| 832 | # CONFIG_MOUSE_VSXXXAA is not set | 839 | # CONFIG_MOUSE_VSXXXAA is not set |
| 833 | # CONFIG_INPUT_JOYSTICK is not set | 840 | # CONFIG_INPUT_JOYSTICK is not set |
| 834 | # CONFIG_INPUT_TABLET is not set | 841 | # CONFIG_INPUT_TABLET is not set |
| @@ -942,15 +949,16 @@ CONFIG_HWMON=y | |||
| 942 | # CONFIG_SENSORS_VT8231 is not set | 949 | # CONFIG_SENSORS_VT8231 is not set |
| 943 | # CONFIG_SENSORS_W83627HF is not set | 950 | # CONFIG_SENSORS_W83627HF is not set |
| 944 | # CONFIG_SENSORS_W83627EHF is not set | 951 | # CONFIG_SENSORS_W83627EHF is not set |
| 952 | # CONFIG_SENSORS_LIS3LV02D is not set | ||
| 945 | # CONFIG_HWMON_DEBUG_CHIP is not set | 953 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 946 | CONFIG_THERMAL=m | 954 | CONFIG_THERMAL=m |
| 947 | # CONFIG_THERMAL_HWMON is not set | 955 | # CONFIG_THERMAL_HWMON is not set |
| 948 | # CONFIG_WATCHDOG is not set | 956 | # CONFIG_WATCHDOG is not set |
| 957 | CONFIG_SSB_POSSIBLE=y | ||
| 949 | 958 | ||
| 950 | # | 959 | # |
| 951 | # Sonics Silicon Backplane | 960 | # Sonics Silicon Backplane |
| 952 | # | 961 | # |
| 953 | CONFIG_SSB_POSSIBLE=y | ||
| 954 | # CONFIG_SSB is not set | 962 | # CONFIG_SSB is not set |
| 955 | 963 | ||
| 956 | # | 964 | # |
| @@ -959,6 +967,8 @@ CONFIG_SSB_POSSIBLE=y | |||
| 959 | # CONFIG_MFD_CORE is not set | 967 | # CONFIG_MFD_CORE is not set |
| 960 | # CONFIG_MFD_SM501 is not set | 968 | # CONFIG_MFD_SM501 is not set |
| 961 | # CONFIG_HTC_PASIC3 is not set | 969 | # CONFIG_HTC_PASIC3 is not set |
| 970 | # CONFIG_MFD_TMIO is not set | ||
| 971 | # CONFIG_REGULATOR is not set | ||
| 962 | 972 | ||
| 963 | # | 973 | # |
| 964 | # Multimedia devices | 974 | # Multimedia devices |
| @@ -1009,6 +1019,7 @@ CONFIG_VGA_CONSOLE=y | |||
| 1009 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set | 1019 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set |
| 1010 | CONFIG_DUMMY_CONSOLE=y | 1020 | CONFIG_DUMMY_CONSOLE=y |
| 1011 | CONFIG_SOUND=m | 1021 | CONFIG_SOUND=m |
| 1022 | CONFIG_SOUND_OSS_CORE=y | ||
| 1012 | CONFIG_SND=m | 1023 | CONFIG_SND=m |
| 1013 | CONFIG_SND_TIMER=m | 1024 | CONFIG_SND_TIMER=m |
| 1014 | CONFIG_SND_PCM=m | 1025 | CONFIG_SND_PCM=m |
| @@ -1113,8 +1124,7 @@ CONFIG_HID=y | |||
| 1113 | # USB Input Devices | 1124 | # USB Input Devices |
| 1114 | # | 1125 | # |
| 1115 | CONFIG_USB_HID=m | 1126 | CONFIG_USB_HID=m |
| 1116 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | 1127 | # CONFIG_HID_PID is not set |
| 1117 | # CONFIG_HID_FF is not set | ||
| 1118 | # CONFIG_USB_HIDDEV is not set | 1128 | # CONFIG_USB_HIDDEV is not set |
| 1119 | 1129 | ||
| 1120 | # | 1130 | # |
| @@ -1122,6 +1132,34 @@ CONFIG_USB_HID=m | |||
| 1122 | # | 1132 | # |
| 1123 | # CONFIG_USB_KBD is not set | 1133 | # CONFIG_USB_KBD is not set |
| 1124 | # CONFIG_USB_MOUSE is not set | 1134 | # CONFIG_USB_MOUSE is not set |
| 1135 | |||
| 1136 | # | ||
| 1137 | # Special HID drivers | ||
| 1138 | # | ||
| 1139 | CONFIG_HID_COMPAT=y | ||
| 1140 | CONFIG_HID_A4TECH=m | ||
| 1141 | CONFIG_HID_APPLE=m | ||
| 1142 | CONFIG_HID_BELKIN=m | ||
| 1143 | CONFIG_HID_BRIGHT=m | ||
| 1144 | CONFIG_HID_CHERRY=m | ||
| 1145 | CONFIG_HID_CHICONY=m | ||
| 1146 | CONFIG_HID_CYPRESS=m | ||
| 1147 | CONFIG_HID_DELL=m | ||
| 1148 | CONFIG_HID_EZKEY=m | ||
| 1149 | CONFIG_HID_GYRATION=m | ||
| 1150 | CONFIG_HID_LOGITECH=m | ||
| 1151 | # CONFIG_LOGITECH_FF is not set | ||
| 1152 | # CONFIG_LOGIRUMBLEPAD2_FF is not set | ||
| 1153 | CONFIG_HID_MICROSOFT=m | ||
| 1154 | CONFIG_HID_MONTEREY=m | ||
| 1155 | CONFIG_HID_PANTHERLORD=m | ||
| 1156 | # CONFIG_PANTHERLORD_FF is not set | ||
| 1157 | CONFIG_HID_PETALYNX=m | ||
| 1158 | CONFIG_HID_SAMSUNG=m | ||
| 1159 | CONFIG_HID_SONY=m | ||
| 1160 | CONFIG_HID_SUNPLUS=m | ||
| 1161 | # CONFIG_THRUSTMASTER_FF is not set | ||
| 1162 | # CONFIG_ZEROPLUS_FF is not set | ||
| 1125 | CONFIG_USB_SUPPORT=y | 1163 | CONFIG_USB_SUPPORT=y |
| 1126 | CONFIG_USB_ARCH_HAS_HCD=y | 1164 | CONFIG_USB_ARCH_HAS_HCD=y |
| 1127 | CONFIG_USB_ARCH_HAS_OHCI=y | 1165 | CONFIG_USB_ARCH_HAS_OHCI=y |
| @@ -1138,6 +1176,9 @@ CONFIG_USB_DEVICE_CLASS=y | |||
| 1138 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1176 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 1139 | # CONFIG_USB_SUSPEND is not set | 1177 | # CONFIG_USB_SUSPEND is not set |
| 1140 | # CONFIG_USB_OTG is not set | 1178 | # CONFIG_USB_OTG is not set |
| 1179 | CONFIG_USB_MON=y | ||
| 1180 | # CONFIG_USB_WUSB is not set | ||
| 1181 | # CONFIG_USB_WUSB_CBAF is not set | ||
| 1141 | 1182 | ||
| 1142 | # | 1183 | # |
| 1143 | # USB Host Controller Drivers | 1184 | # USB Host Controller Drivers |
| @@ -1155,6 +1196,12 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 1155 | CONFIG_USB_UHCI_HCD=m | 1196 | CONFIG_USB_UHCI_HCD=m |
| 1156 | # CONFIG_USB_SL811_HCD is not set | 1197 | # CONFIG_USB_SL811_HCD is not set |
| 1157 | # CONFIG_USB_R8A66597_HCD is not set | 1198 | # CONFIG_USB_R8A66597_HCD is not set |
| 1199 | # CONFIG_USB_WHCI_HCD is not set | ||
| 1200 | # CONFIG_USB_HWA_HCD is not set | ||
| 1201 | |||
| 1202 | # | ||
| 1203 | # Enable Host or Gadget support to see Inventra options | ||
| 1204 | # | ||
| 1158 | 1205 | ||
| 1159 | # | 1206 | # |
| 1160 | # USB Device Class drivers | 1207 | # USB Device Class drivers |
| @@ -1162,13 +1209,14 @@ CONFIG_USB_UHCI_HCD=m | |||
| 1162 | # CONFIG_USB_ACM is not set | 1209 | # CONFIG_USB_ACM is not set |
| 1163 | # CONFIG_USB_PRINTER is not set | 1210 | # CONFIG_USB_PRINTER is not set |
| 1164 | # CONFIG_USB_WDM is not set | 1211 | # CONFIG_USB_WDM is not set |
| 1212 | # CONFIG_USB_TMC is not set | ||
| 1165 | 1213 | ||
| 1166 | # | 1214 | # |
| 1167 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1215 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; |
| 1168 | # | 1216 | # |
| 1169 | 1217 | ||
| 1170 | # | 1218 | # |
| 1171 | # may also be needed; see USB_STORAGE Help for more information | 1219 | # see USB_STORAGE Help for more information |
| 1172 | # | 1220 | # |
| 1173 | CONFIG_USB_STORAGE=m | 1221 | CONFIG_USB_STORAGE=m |
| 1174 | # CONFIG_USB_STORAGE_DEBUG is not set | 1222 | # CONFIG_USB_STORAGE_DEBUG is not set |
| @@ -1191,7 +1239,6 @@ CONFIG_USB_STORAGE=m | |||
| 1191 | # | 1239 | # |
| 1192 | # CONFIG_USB_MDC800 is not set | 1240 | # CONFIG_USB_MDC800 is not set |
| 1193 | # CONFIG_USB_MICROTEK is not set | 1241 | # CONFIG_USB_MICROTEK is not set |
| 1194 | CONFIG_USB_MON=y | ||
| 1195 | 1242 | ||
| 1196 | # | 1243 | # |
| 1197 | # USB port drivers | 1244 | # USB port drivers |
| @@ -1204,7 +1251,7 @@ CONFIG_USB_MON=y | |||
| 1204 | # CONFIG_USB_EMI62 is not set | 1251 | # CONFIG_USB_EMI62 is not set |
| 1205 | # CONFIG_USB_EMI26 is not set | 1252 | # CONFIG_USB_EMI26 is not set |
| 1206 | # CONFIG_USB_ADUTUX is not set | 1253 | # CONFIG_USB_ADUTUX is not set |
| 1207 | # CONFIG_USB_AUERSWALD is not set | 1254 | # CONFIG_USB_SEVSEG is not set |
| 1208 | # CONFIG_USB_RIO500 is not set | 1255 | # CONFIG_USB_RIO500 is not set |
| 1209 | # CONFIG_USB_LEGOTOWER is not set | 1256 | # CONFIG_USB_LEGOTOWER is not set |
| 1210 | # CONFIG_USB_LCD is not set | 1257 | # CONFIG_USB_LCD is not set |
| @@ -1222,7 +1269,9 @@ CONFIG_USB_MON=y | |||
| 1222 | # CONFIG_USB_IOWARRIOR is not set | 1269 | # CONFIG_USB_IOWARRIOR is not set |
| 1223 | # CONFIG_USB_TEST is not set | 1270 | # CONFIG_USB_TEST is not set |
| 1224 | # CONFIG_USB_ISIGHTFW is not set | 1271 | # CONFIG_USB_ISIGHTFW is not set |
| 1272 | # CONFIG_USB_VST is not set | ||
| 1225 | # CONFIG_USB_GADGET is not set | 1273 | # CONFIG_USB_GADGET is not set |
| 1274 | # CONFIG_UWB is not set | ||
| 1226 | # CONFIG_MMC is not set | 1275 | # CONFIG_MMC is not set |
| 1227 | # CONFIG_MEMSTICK is not set | 1276 | # CONFIG_MEMSTICK is not set |
| 1228 | # CONFIG_NEW_LEDS is not set | 1277 | # CONFIG_NEW_LEDS is not set |
| @@ -1246,6 +1295,15 @@ CONFIG_INFINIBAND_IPOIB_DEBUG=y | |||
| 1246 | # CONFIG_RTC_CLASS is not set | 1295 | # CONFIG_RTC_CLASS is not set |
| 1247 | # CONFIG_DMADEVICES is not set | 1296 | # CONFIG_DMADEVICES is not set |
| 1248 | # CONFIG_UIO is not set | 1297 | # CONFIG_UIO is not set |
| 1298 | # CONFIG_STAGING is not set | ||
| 1299 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 1300 | |||
| 1301 | # | ||
| 1302 | # HP Simulator drivers | ||
| 1303 | # | ||
| 1304 | # CONFIG_HP_SIMETH is not set | ||
| 1305 | # CONFIG_HP_SIMSERIAL is not set | ||
| 1306 | # CONFIG_HP_SIMSCSI is not set | ||
| 1249 | CONFIG_MSPEC=m | 1307 | CONFIG_MSPEC=m |
| 1250 | 1308 | ||
| 1251 | # | 1309 | # |
| @@ -1260,7 +1318,7 @@ CONFIG_EXT3_FS=y | |||
| 1260 | CONFIG_EXT3_FS_XATTR=y | 1318 | CONFIG_EXT3_FS_XATTR=y |
| 1261 | CONFIG_EXT3_FS_POSIX_ACL=y | 1319 | CONFIG_EXT3_FS_POSIX_ACL=y |
| 1262 | CONFIG_EXT3_FS_SECURITY=y | 1320 | CONFIG_EXT3_FS_SECURITY=y |
| 1263 | # CONFIG_EXT4DEV_FS is not set | 1321 | # CONFIG_EXT4_FS is not set |
| 1264 | CONFIG_JBD=y | 1322 | CONFIG_JBD=y |
| 1265 | CONFIG_FS_MBCACHE=y | 1323 | CONFIG_FS_MBCACHE=y |
| 1266 | CONFIG_REISERFS_FS=y | 1324 | CONFIG_REISERFS_FS=y |
| @@ -1271,6 +1329,7 @@ CONFIG_REISERFS_FS_POSIX_ACL=y | |||
| 1271 | CONFIG_REISERFS_FS_SECURITY=y | 1329 | CONFIG_REISERFS_FS_SECURITY=y |
| 1272 | # CONFIG_JFS_FS is not set | 1330 | # CONFIG_JFS_FS is not set |
| 1273 | CONFIG_FS_POSIX_ACL=y | 1331 | CONFIG_FS_POSIX_ACL=y |
| 1332 | CONFIG_FILE_LOCKING=y | ||
| 1274 | CONFIG_XFS_FS=y | 1333 | CONFIG_XFS_FS=y |
| 1275 | # CONFIG_XFS_QUOTA is not set | 1334 | # CONFIG_XFS_QUOTA is not set |
| 1276 | # CONFIG_XFS_POSIX_ACL is not set | 1335 | # CONFIG_XFS_POSIX_ACL is not set |
| @@ -1282,8 +1341,8 @@ CONFIG_DNOTIFY=y | |||
| 1282 | CONFIG_INOTIFY=y | 1341 | CONFIG_INOTIFY=y |
| 1283 | CONFIG_INOTIFY_USER=y | 1342 | CONFIG_INOTIFY_USER=y |
| 1284 | # CONFIG_QUOTA is not set | 1343 | # CONFIG_QUOTA is not set |
| 1285 | CONFIG_AUTOFS_FS=y | 1344 | CONFIG_AUTOFS_FS=m |
| 1286 | CONFIG_AUTOFS4_FS=y | 1345 | CONFIG_AUTOFS4_FS=m |
| 1287 | # CONFIG_FUSE_FS is not set | 1346 | # CONFIG_FUSE_FS is not set |
| 1288 | 1347 | ||
| 1289 | # | 1348 | # |
| @@ -1314,6 +1373,7 @@ CONFIG_PROC_FS=y | |||
| 1314 | CONFIG_PROC_KCORE=y | 1373 | CONFIG_PROC_KCORE=y |
| 1315 | CONFIG_PROC_VMCORE=y | 1374 | CONFIG_PROC_VMCORE=y |
| 1316 | CONFIG_PROC_SYSCTL=y | 1375 | CONFIG_PROC_SYSCTL=y |
| 1376 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 1317 | CONFIG_SYSFS=y | 1377 | CONFIG_SYSFS=y |
| 1318 | CONFIG_TMPFS=y | 1378 | CONFIG_TMPFS=y |
| 1319 | # CONFIG_TMPFS_POSIX_ACL is not set | 1379 | # CONFIG_TMPFS_POSIX_ACL is not set |
| @@ -1356,6 +1416,7 @@ CONFIG_NFS_COMMON=y | |||
| 1356 | CONFIG_SUNRPC=m | 1416 | CONFIG_SUNRPC=m |
| 1357 | CONFIG_SUNRPC_GSS=m | 1417 | CONFIG_SUNRPC_GSS=m |
| 1358 | CONFIG_SUNRPC_XPRT_RDMA=m | 1418 | CONFIG_SUNRPC_XPRT_RDMA=m |
| 1419 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
| 1359 | CONFIG_RPCSEC_GSS_KRB5=m | 1420 | CONFIG_RPCSEC_GSS_KRB5=m |
| 1360 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1421 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1361 | CONFIG_SMB_FS=m | 1422 | CONFIG_SMB_FS=m |
| @@ -1433,38 +1494,6 @@ CONFIG_NLS_KOI8_R=m | |||
| 1433 | CONFIG_NLS_KOI8_U=m | 1494 | CONFIG_NLS_KOI8_U=m |
| 1434 | CONFIG_NLS_UTF8=m | 1495 | CONFIG_NLS_UTF8=m |
| 1435 | # CONFIG_DLM is not set | 1496 | # CONFIG_DLM is not set |
| 1436 | CONFIG_HAVE_KVM=y | ||
| 1437 | CONFIG_VIRTUALIZATION=y | ||
| 1438 | # CONFIG_KVM is not set | ||
| 1439 | |||
| 1440 | # | ||
| 1441 | # Library routines | ||
| 1442 | # | ||
| 1443 | CONFIG_BITREVERSE=y | ||
| 1444 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1445 | # CONFIG_CRC_CCITT is not set | ||
| 1446 | # CONFIG_CRC16 is not set | ||
| 1447 | CONFIG_CRC_T10DIF=y | ||
| 1448 | CONFIG_CRC_ITU_T=m | ||
| 1449 | CONFIG_CRC32=y | ||
| 1450 | # CONFIG_CRC7 is not set | ||
| 1451 | # CONFIG_LIBCRC32C is not set | ||
| 1452 | CONFIG_GENERIC_ALLOCATOR=y | ||
| 1453 | CONFIG_PLIST=y | ||
| 1454 | CONFIG_HAS_IOMEM=y | ||
| 1455 | CONFIG_HAS_IOPORT=y | ||
| 1456 | CONFIG_HAS_DMA=y | ||
| 1457 | CONFIG_GENERIC_HARDIRQS=y | ||
| 1458 | CONFIG_GENERIC_IRQ_PROBE=y | ||
| 1459 | CONFIG_GENERIC_PENDING_IRQ=y | ||
| 1460 | CONFIG_IRQ_PER_CPU=y | ||
| 1461 | |||
| 1462 | # | ||
| 1463 | # HP Simulator drivers | ||
| 1464 | # | ||
| 1465 | # CONFIG_HP_SIMETH is not set | ||
| 1466 | # CONFIG_HP_SIMSERIAL is not set | ||
| 1467 | # CONFIG_HP_SIMSCSI is not set | ||
| 1468 | 1497 | ||
| 1469 | # | 1498 | # |
| 1470 | # Kernel hacking | 1499 | # Kernel hacking |
| @@ -1503,8 +1532,19 @@ CONFIG_DEBUG_MEMORY_INIT=y | |||
| 1503 | # CONFIG_DEBUG_SG is not set | 1532 | # CONFIG_DEBUG_SG is not set |
| 1504 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1533 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 1505 | # CONFIG_RCU_TORTURE_TEST is not set | 1534 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1535 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
| 1506 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1536 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 1537 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | ||
| 1507 | # CONFIG_FAULT_INJECTION is not set | 1538 | # CONFIG_FAULT_INJECTION is not set |
| 1539 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1540 | |||
| 1541 | # | ||
| 1542 | # Tracers | ||
| 1543 | # | ||
| 1544 | # CONFIG_SCHED_TRACER is not set | ||
| 1545 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1546 | # CONFIG_BOOT_TRACER is not set | ||
| 1547 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
| 1508 | # CONFIG_SAMPLES is not set | 1548 | # CONFIG_SAMPLES is not set |
| 1509 | CONFIG_IA64_GRANULE_16MB=y | 1549 | CONFIG_IA64_GRANULE_16MB=y |
| 1510 | # CONFIG_IA64_GRANULE_64MB is not set | 1550 | # CONFIG_IA64_GRANULE_64MB is not set |
| @@ -1519,14 +1559,19 @@ CONFIG_SYSVIPC_COMPAT=y | |||
| 1519 | # | 1559 | # |
| 1520 | # CONFIG_KEYS is not set | 1560 | # CONFIG_KEYS is not set |
| 1521 | # CONFIG_SECURITY is not set | 1561 | # CONFIG_SECURITY is not set |
| 1562 | # CONFIG_SECURITYFS is not set | ||
| 1522 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1563 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1523 | CONFIG_CRYPTO=y | 1564 | CONFIG_CRYPTO=y |
| 1524 | 1565 | ||
| 1525 | # | 1566 | # |
| 1526 | # Crypto core or helper | 1567 | # Crypto core or helper |
| 1527 | # | 1568 | # |
| 1569 | # CONFIG_CRYPTO_FIPS is not set | ||
| 1528 | CONFIG_CRYPTO_ALGAPI=y | 1570 | CONFIG_CRYPTO_ALGAPI=y |
| 1571 | CONFIG_CRYPTO_AEAD=m | ||
| 1529 | CONFIG_CRYPTO_BLKCIPHER=m | 1572 | CONFIG_CRYPTO_BLKCIPHER=m |
| 1573 | CONFIG_CRYPTO_HASH=m | ||
| 1574 | CONFIG_CRYPTO_RNG=m | ||
| 1530 | CONFIG_CRYPTO_MANAGER=m | 1575 | CONFIG_CRYPTO_MANAGER=m |
| 1531 | # CONFIG_CRYPTO_GF128MUL is not set | 1576 | # CONFIG_CRYPTO_GF128MUL is not set |
| 1532 | # CONFIG_CRYPTO_NULL is not set | 1577 | # CONFIG_CRYPTO_NULL is not set |
| @@ -1599,5 +1644,36 @@ CONFIG_CRYPTO_DES=m | |||
| 1599 | # | 1644 | # |
| 1600 | # CONFIG_CRYPTO_DEFLATE is not set | 1645 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1601 | # CONFIG_CRYPTO_LZO is not set | 1646 | # CONFIG_CRYPTO_LZO is not set |
| 1647 | |||
| 1648 | # | ||
| 1649 | # Random Number Generation | ||
| 1650 | # | ||
| 1651 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
| 1602 | CONFIG_CRYPTO_HW=y | 1652 | CONFIG_CRYPTO_HW=y |
| 1603 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1653 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1654 | CONFIG_HAVE_KVM=y | ||
| 1655 | CONFIG_VIRTUALIZATION=y | ||
| 1656 | # CONFIG_KVM is not set | ||
| 1657 | # CONFIG_VIRTIO_PCI is not set | ||
| 1658 | # CONFIG_VIRTIO_BALLOON is not set | ||
| 1659 | |||
| 1660 | # | ||
| 1661 | # Library routines | ||
| 1662 | # | ||
| 1663 | CONFIG_BITREVERSE=y | ||
| 1664 | # CONFIG_CRC_CCITT is not set | ||
| 1665 | # CONFIG_CRC16 is not set | ||
| 1666 | CONFIG_CRC_T10DIF=y | ||
| 1667 | CONFIG_CRC_ITU_T=m | ||
| 1668 | CONFIG_CRC32=y | ||
| 1669 | # CONFIG_CRC7 is not set | ||
| 1670 | # CONFIG_LIBCRC32C is not set | ||
| 1671 | CONFIG_GENERIC_ALLOCATOR=y | ||
| 1672 | CONFIG_PLIST=y | ||
| 1673 | CONFIG_HAS_IOMEM=y | ||
| 1674 | CONFIG_HAS_IOPORT=y | ||
| 1675 | CONFIG_HAS_DMA=y | ||
| 1676 | CONFIG_GENERIC_HARDIRQS=y | ||
| 1677 | CONFIG_GENERIC_IRQ_PROBE=y | ||
| 1678 | CONFIG_GENERIC_PENDING_IRQ=y | ||
| 1679 | CONFIG_IRQ_PER_CPU=y | ||
diff --git a/arch/ia64/hp/sim/Kconfig b/arch/ia64/hp/sim/Kconfig index f92306bbedb8..8d513a8c5266 100644 --- a/arch/ia64/hp/sim/Kconfig +++ b/arch/ia64/hp/sim/Kconfig | |||
| @@ -4,6 +4,7 @@ menu "HP Simulator drivers" | |||
| 4 | 4 | ||
| 5 | config HP_SIMETH | 5 | config HP_SIMETH |
| 6 | bool "Simulated Ethernet " | 6 | bool "Simulated Ethernet " |
| 7 | depends on NET | ||
| 7 | 8 | ||
| 8 | config HP_SIMSERIAL | 9 | config HP_SIMSERIAL |
| 9 | bool "Simulated serial driver support" | 10 | bool "Simulated serial driver support" |
diff --git a/arch/ia64/include/asm/paravirt_privop.h b/arch/ia64/include/asm/paravirt_privop.h index 0b597424fcfc..33c8e55f5775 100644 --- a/arch/ia64/include/asm/paravirt_privop.h +++ b/arch/ia64/include/asm/paravirt_privop.h | |||
| @@ -83,7 +83,6 @@ extern unsigned long ia64_native_getreg_func(int regnum); | |||
| 83 | #define paravirt_getreg(reg) \ | 83 | #define paravirt_getreg(reg) \ |
| 84 | ({ \ | 84 | ({ \ |
| 85 | unsigned long res; \ | 85 | unsigned long res; \ |
| 86 | BUILD_BUG_ON(!__builtin_constant_p(reg)); \ | ||
| 87 | if ((reg) == _IA64_REG_IP) \ | 86 | if ((reg) == _IA64_REG_IP) \ |
| 88 | res = ia64_native_getreg(_IA64_REG_IP); \ | 87 | res = ia64_native_getreg(_IA64_REG_IP); \ |
| 89 | else \ | 88 | else \ |
diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c index 26228e2d01ae..c75b914f2d6b 100644 --- a/arch/ia64/kernel/topology.c +++ b/arch/ia64/kernel/topology.c | |||
| @@ -53,10 +53,12 @@ int __ref arch_register_cpu(int num) | |||
| 53 | } | 53 | } |
| 54 | EXPORT_SYMBOL(arch_register_cpu); | 54 | EXPORT_SYMBOL(arch_register_cpu); |
| 55 | 55 | ||
| 56 | void arch_unregister_cpu(int num) | 56 | void __ref arch_unregister_cpu(int num) |
| 57 | { | 57 | { |
| 58 | unregister_cpu(&sysfs_cpus[num].cpu); | 58 | unregister_cpu(&sysfs_cpus[num].cpu); |
| 59 | #ifdef CONFIG_ACPI | ||
| 59 | unmap_cpu_from_node(num, cpu_to_node(num)); | 60 | unmap_cpu_from_node(num, cpu_to_node(num)); |
| 61 | #endif | ||
| 60 | } | 62 | } |
| 61 | EXPORT_SYMBOL(arch_unregister_cpu); | 63 | EXPORT_SYMBOL(arch_unregister_cpu); |
| 62 | #else | 64 | #else |
diff --git a/arch/ia64/kvm/Makefile b/arch/ia64/kvm/Makefile index 3ab4d6d50704..92cef66ca268 100644 --- a/arch/ia64/kvm/Makefile +++ b/arch/ia64/kvm/Makefile | |||
| @@ -58,7 +58,7 @@ endif | |||
| 58 | kvm-objs := $(common-objs) kvm-ia64.o kvm_fw.o | 58 | kvm-objs := $(common-objs) kvm-ia64.o kvm_fw.o |
| 59 | obj-$(CONFIG_KVM) += kvm.o | 59 | obj-$(CONFIG_KVM) += kvm.o |
| 60 | 60 | ||
| 61 | EXTRA_CFLAGS_vcpu.o += -mfixed-range=f2-f5,f12-f127 | 61 | CFLAGS_vcpu.o += -mfixed-range=f2-f5,f12-f127 |
| 62 | kvm-intel-objs = vmm.o vmm_ivt.o trampoline.o vcpu.o optvfault.o mmio.o \ | 62 | kvm-intel-objs = vmm.o vmm_ivt.o trampoline.o vcpu.o optvfault.o mmio.o \ |
| 63 | vtlb.o process.o | 63 | vtlb.o process.o |
| 64 | #Add link memcpy and memset to avoid possible structure assignment error | 64 | #Add link memcpy and memset to avoid possible structure assignment error |
diff --git a/arch/ia64/kvm/optvfault.S b/arch/ia64/kvm/optvfault.S index 634abad979b5..32254ce9a1bd 100644 --- a/arch/ia64/kvm/optvfault.S +++ b/arch/ia64/kvm/optvfault.S | |||
| @@ -107,10 +107,10 @@ END(kvm_vps_resume_normal) | |||
| 107 | GLOBAL_ENTRY(kvm_vps_resume_handler) | 107 | GLOBAL_ENTRY(kvm_vps_resume_handler) |
| 108 | movl r30 = PAL_VPS_RESUME_HANDLER | 108 | movl r30 = PAL_VPS_RESUME_HANDLER |
| 109 | ;; | 109 | ;; |
| 110 | ld8 r27=[r25] | 110 | ld8 r26=[r25] |
| 111 | shr r17=r17,IA64_ISR_IR_BIT | 111 | shr r17=r17,IA64_ISR_IR_BIT |
| 112 | ;; | 112 | ;; |
| 113 | dep r27=r17,r27,63,1 // bit 63 of r27 indicate whether enable CFLE | 113 | dep r26=r17,r26,63,1 // bit 63 of r26 indicate whether enable CFLE |
| 114 | mov pr=r23,-2 | 114 | mov pr=r23,-2 |
| 115 | br.sptk.many kvm_vps_entry | 115 | br.sptk.many kvm_vps_entry |
| 116 | END(kvm_vps_resume_handler) | 116 | END(kvm_vps_resume_handler) |
| @@ -894,12 +894,15 @@ ENTRY(kvm_resume_to_guest) | |||
| 894 | ;; | 894 | ;; |
| 895 | ld8 r19=[r19] | 895 | ld8 r19=[r19] |
| 896 | mov b0=r29 | 896 | mov b0=r29 |
| 897 | cmp.ne p6,p7 = r0,r0 | 897 | mov r27=cr.isr |
| 898 | ;; | 898 | ;; |
| 899 | tbit.z p6,p7 = r19,IA64_PSR_IC_BIT // p1=vpsr.ic | 899 | tbit.z p6,p7 = r19,IA64_PSR_IC_BIT // p7=vpsr.ic |
| 900 | shr r27=r27,IA64_ISR_IR_BIT | ||
| 900 | ;; | 901 | ;; |
| 901 | (p6) ld8 r26=[r25] | 902 | (p6) ld8 r26=[r25] |
| 902 | (p7) mov b0=r28 | 903 | (p7) mov b0=r28 |
| 904 | ;; | ||
| 905 | (p6) dep r26=r27,r26,63,1 | ||
| 903 | mov pr=r31,-2 | 906 | mov pr=r31,-2 |
| 904 | br.sptk.many b0 // call pal service | 907 | br.sptk.many b0 // call pal service |
| 905 | ;; | 908 | ;; |
diff --git a/arch/ia64/sn/kernel/irq.c b/arch/ia64/sn/kernel/irq.c index 96c31b4180c3..0c66dbdd1d72 100644 --- a/arch/ia64/sn/kernel/irq.c +++ b/arch/ia64/sn/kernel/irq.c | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | * License. See the file "COPYING" in the main directory of this archive | 5 | * License. See the file "COPYING" in the main directory of this archive |
| 6 | * for more details. | 6 | * for more details. |
| 7 | * | 7 | * |
| 8 | * Copyright (c) 2000-2007 Silicon Graphics, Inc. All Rights Reserved. | 8 | * Copyright (c) 2000-2008 Silicon Graphics, Inc. All Rights Reserved. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/irq.h> | 11 | #include <linux/irq.h> |
| @@ -375,6 +375,7 @@ void sn_irq_fixup(struct pci_dev *pci_dev, struct sn_irq_info *sn_irq_info) | |||
| 375 | int cpu = nasid_slice_to_cpuid(nasid, slice); | 375 | int cpu = nasid_slice_to_cpuid(nasid, slice); |
| 376 | #ifdef CONFIG_SMP | 376 | #ifdef CONFIG_SMP |
| 377 | int cpuphys; | 377 | int cpuphys; |
| 378 | irq_desc_t *desc; | ||
| 378 | #endif | 379 | #endif |
| 379 | 380 | ||
| 380 | pci_dev_get(pci_dev); | 381 | pci_dev_get(pci_dev); |
| @@ -391,6 +392,12 @@ void sn_irq_fixup(struct pci_dev *pci_dev, struct sn_irq_info *sn_irq_info) | |||
| 391 | #ifdef CONFIG_SMP | 392 | #ifdef CONFIG_SMP |
| 392 | cpuphys = cpu_physical_id(cpu); | 393 | cpuphys = cpu_physical_id(cpu); |
| 393 | set_irq_affinity_info(sn_irq_info->irq_irq, cpuphys, 0); | 394 | set_irq_affinity_info(sn_irq_info->irq_irq, cpuphys, 0); |
| 395 | desc = irq_to_desc(sn_irq_info->irq_irq); | ||
| 396 | /* | ||
| 397 | * Affinity was set by the PROM, prevent it from | ||
| 398 | * being reset by the request_irq() path. | ||
| 399 | */ | ||
| 400 | desc->status |= IRQ_AFFINITY_SET; | ||
| 394 | #endif | 401 | #endif |
| 395 | } | 402 | } |
| 396 | 403 | ||
diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c index bb1d24929640..02c5b8a9fb60 100644 --- a/arch/ia64/sn/kernel/setup.c +++ b/arch/ia64/sn/kernel/setup.c | |||
| @@ -200,7 +200,7 @@ static int __cpuinitdata shub_1_1_found; | |||
| 200 | * Set flag for enabling shub specific wars | 200 | * Set flag for enabling shub specific wars |
| 201 | */ | 201 | */ |
| 202 | 202 | ||
| 203 | static inline int __init is_shub_1_1(int nasid) | 203 | static inline int __cpuinit is_shub_1_1(int nasid) |
| 204 | { | 204 | { |
| 205 | unsigned long id; | 205 | unsigned long id; |
| 206 | int rev; | 206 | int rev; |
| @@ -212,7 +212,7 @@ static inline int __init is_shub_1_1(int nasid) | |||
| 212 | return rev <= 2; | 212 | return rev <= 2; |
| 213 | } | 213 | } |
| 214 | 214 | ||
| 215 | static void __init sn_check_for_wars(void) | 215 | static void __cpuinit sn_check_for_wars(void) |
| 216 | { | 216 | { |
| 217 | int cnode; | 217 | int cnode; |
| 218 | 218 | ||
| @@ -512,7 +512,6 @@ static void __init sn_init_pdas(char **cmdline_p) | |||
| 512 | for_each_online_node(cnode) { | 512 | for_each_online_node(cnode) { |
| 513 | nodepdaindr[cnode] = | 513 | nodepdaindr[cnode] = |
| 514 | alloc_bootmem_node(NODE_DATA(cnode), sizeof(nodepda_t)); | 514 | alloc_bootmem_node(NODE_DATA(cnode), sizeof(nodepda_t)); |
| 515 | memset(nodepdaindr[cnode], 0, sizeof(nodepda_t)); | ||
| 516 | memset(nodepdaindr[cnode]->phys_cpuid, -1, | 515 | memset(nodepdaindr[cnode]->phys_cpuid, -1, |
| 517 | sizeof(nodepdaindr[cnode]->phys_cpuid)); | 516 | sizeof(nodepdaindr[cnode]->phys_cpuid)); |
| 518 | spin_lock_init(&nodepdaindr[cnode]->ptc_lock); | 517 | spin_lock_init(&nodepdaindr[cnode]->ptc_lock); |
| @@ -521,11 +520,9 @@ static void __init sn_init_pdas(char **cmdline_p) | |||
| 521 | /* | 520 | /* |
| 522 | * Allocate & initialize nodepda for TIOs. For now, put them on node 0. | 521 | * Allocate & initialize nodepda for TIOs. For now, put them on node 0. |
| 523 | */ | 522 | */ |
| 524 | for (cnode = num_online_nodes(); cnode < num_cnodes; cnode++) { | 523 | for (cnode = num_online_nodes(); cnode < num_cnodes; cnode++) |
| 525 | nodepdaindr[cnode] = | 524 | nodepdaindr[cnode] = |
| 526 | alloc_bootmem_node(NODE_DATA(0), sizeof(nodepda_t)); | 525 | alloc_bootmem_node(NODE_DATA(0), sizeof(nodepda_t)); |
| 527 | memset(nodepdaindr[cnode], 0, sizeof(nodepda_t)); | ||
| 528 | } | ||
| 529 | 526 | ||
| 530 | /* | 527 | /* |
| 531 | * Now copy the array of nodepda pointers to each nodepda. | 528 | * Now copy the array of nodepda pointers to each nodepda. |
diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig index 8bd61a640fc9..23597beb66c1 100644 --- a/arch/m68k/configs/amiga_defconfig +++ b/arch/m68k/configs/amiga_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.27-rc6 | 3 | # Linux kernel version: 2.6.28-rc7 |
| 4 | # Wed Sep 10 09:02:00 2008 | 4 | # Tue Dec 2 20:27:42 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -14,7 +14,6 @@ CONFIG_TIME_LOW_RES=y | |||
| 14 | CONFIG_GENERIC_IOMAP=y | 14 | CONFIG_GENERIC_IOMAP=y |
| 15 | CONFIG_NO_IOPORT=y | 15 | CONFIG_NO_IOPORT=y |
| 16 | # CONFIG_NO_DMA is not set | 16 | # CONFIG_NO_DMA is not set |
| 17 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
| 18 | CONFIG_HZ=100 | 17 | CONFIG_HZ=100 |
| 19 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 18 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 20 | 19 | ||
| @@ -67,22 +66,13 @@ CONFIG_SIGNALFD=y | |||
| 67 | CONFIG_TIMERFD=y | 66 | CONFIG_TIMERFD=y |
| 68 | CONFIG_EVENTFD=y | 67 | CONFIG_EVENTFD=y |
| 69 | CONFIG_SHMEM=y | 68 | CONFIG_SHMEM=y |
| 69 | CONFIG_AIO=y | ||
| 70 | CONFIG_VM_EVENT_COUNTERS=y | 70 | CONFIG_VM_EVENT_COUNTERS=y |
| 71 | CONFIG_SLAB=y | 71 | CONFIG_SLAB=y |
| 72 | # CONFIG_SLUB is not set | 72 | # CONFIG_SLUB is not set |
| 73 | # CONFIG_SLOB is not set | 73 | # CONFIG_SLOB is not set |
| 74 | # CONFIG_PROFILING is not set | 74 | # CONFIG_PROFILING is not set |
| 75 | # CONFIG_MARKERS is not set | 75 | # CONFIG_MARKERS is not set |
| 76 | # CONFIG_HAVE_OPROFILE is not set | ||
| 77 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
| 78 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
| 79 | # CONFIG_HAVE_KPROBES is not set | ||
| 80 | # CONFIG_HAVE_KRETPROBES is not set | ||
| 81 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
| 82 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 83 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 84 | # CONFIG_HAVE_CLK is not set | ||
| 85 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 86 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 76 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 87 | CONFIG_SLABINFO=y | 77 | CONFIG_SLABINFO=y |
| 88 | CONFIG_RT_MUTEXES=y | 78 | CONFIG_RT_MUTEXES=y |
| @@ -115,11 +105,11 @@ CONFIG_DEFAULT_AS=y | |||
| 115 | # CONFIG_DEFAULT_NOOP is not set | 105 | # CONFIG_DEFAULT_NOOP is not set |
| 116 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 106 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 117 | CONFIG_CLASSIC_RCU=y | 107 | CONFIG_CLASSIC_RCU=y |
| 108 | # CONFIG_FREEZER is not set | ||
| 118 | 109 | ||
| 119 | # | 110 | # |
| 120 | # Platform dependent setup | 111 | # Platform dependent setup |
| 121 | # | 112 | # |
| 122 | # CONFIG_SUN3 is not set | ||
| 123 | CONFIG_AMIGA=y | 113 | CONFIG_AMIGA=y |
| 124 | # CONFIG_ATARI is not set | 114 | # CONFIG_ATARI is not set |
| 125 | # CONFIG_MAC is not set | 115 | # CONFIG_MAC is not set |
| @@ -148,19 +138,21 @@ CONFIG_DISCONTIGMEM_MANUAL=y | |||
| 148 | CONFIG_DISCONTIGMEM=y | 138 | CONFIG_DISCONTIGMEM=y |
| 149 | CONFIG_FLAT_NODE_MEM_MAP=y | 139 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 150 | CONFIG_NEED_MULTIPLE_NODES=y | 140 | CONFIG_NEED_MULTIPLE_NODES=y |
| 151 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 152 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 153 | CONFIG_PAGEFLAGS_EXTENDED=y | 141 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 154 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 142 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 155 | # CONFIG_RESOURCES_64BIT is not set | 143 | # CONFIG_RESOURCES_64BIT is not set |
| 144 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
| 156 | CONFIG_ZONE_DMA_FLAG=1 | 145 | CONFIG_ZONE_DMA_FLAG=1 |
| 157 | CONFIG_BOUNCE=y | 146 | CONFIG_BOUNCE=y |
| 158 | CONFIG_VIRT_TO_BUS=y | 147 | CONFIG_VIRT_TO_BUS=y |
| 148 | CONFIG_UNEVICTABLE_LRU=y | ||
| 159 | 149 | ||
| 160 | # | 150 | # |
| 161 | # General setup | 151 | # General setup |
| 162 | # | 152 | # |
| 163 | CONFIG_BINFMT_ELF=y | 153 | CONFIG_BINFMT_ELF=y |
| 154 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 155 | CONFIG_HAVE_AOUT=y | ||
| 164 | CONFIG_BINFMT_AOUT=m | 156 | CONFIG_BINFMT_AOUT=m |
| 165 | CONFIG_BINFMT_MISC=m | 157 | CONFIG_BINFMT_MISC=m |
| 166 | CONFIG_ZORRO=y | 158 | CONFIG_ZORRO=y |
| @@ -212,7 +204,6 @@ CONFIG_INET_TCP_DIAG=m | |||
| 212 | CONFIG_TCP_CONG_CUBIC=y | 204 | CONFIG_TCP_CONG_CUBIC=y |
| 213 | CONFIG_DEFAULT_TCP_CONG="cubic" | 205 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 214 | # CONFIG_TCP_MD5SIG is not set | 206 | # CONFIG_TCP_MD5SIG is not set |
| 215 | # CONFIG_IP_VS is not set | ||
| 216 | CONFIG_IPV6=m | 207 | CONFIG_IPV6=m |
| 217 | CONFIG_IPV6_PRIVACY=y | 208 | CONFIG_IPV6_PRIVACY=y |
| 218 | CONFIG_IPV6_ROUTER_PREF=y | 209 | CONFIG_IPV6_ROUTER_PREF=y |
| @@ -262,13 +253,14 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
| 262 | CONFIG_NF_CONNTRACK_SIP=m | 253 | CONFIG_NF_CONNTRACK_SIP=m |
| 263 | CONFIG_NF_CONNTRACK_TFTP=m | 254 | CONFIG_NF_CONNTRACK_TFTP=m |
| 264 | # CONFIG_NF_CT_NETLINK is not set | 255 | # CONFIG_NF_CT_NETLINK is not set |
| 256 | # CONFIG_NETFILTER_TPROXY is not set | ||
| 265 | CONFIG_NETFILTER_XTABLES=m | 257 | CONFIG_NETFILTER_XTABLES=m |
| 266 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 258 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| 267 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 259 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
| 268 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 260 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
| 269 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 261 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
| 270 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
| 271 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 262 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
| 263 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
| 272 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | 264 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m |
| 273 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m | 265 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m |
| 274 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 266 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
| @@ -282,19 +274,22 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | |||
| 282 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 274 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
| 283 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 275 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
| 284 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 276 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
| 277 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | ||
| 285 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 278 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
| 286 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | 279 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m |
| 287 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 280 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
| 288 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 281 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
| 289 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 282 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
| 290 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 283 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
| 284 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
| 291 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 285 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
| 292 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 286 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
| 293 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
| 294 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 287 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
| 295 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | 288 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m |
| 296 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | 289 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m |
| 297 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 290 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
| 291 | CONFIG_NETFILTER_XT_MATCH_RECENT=m | ||
| 292 | # CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set | ||
| 298 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 293 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
| 299 | CONFIG_NETFILTER_XT_MATCH_STATE=m | 294 | CONFIG_NETFILTER_XT_MATCH_STATE=m |
| 300 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | 295 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m |
| @@ -302,20 +297,20 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m | |||
| 302 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 297 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
| 303 | CONFIG_NETFILTER_XT_MATCH_TIME=m | 298 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
| 304 | CONFIG_NETFILTER_XT_MATCH_U32=m | 299 | CONFIG_NETFILTER_XT_MATCH_U32=m |
| 305 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 300 | # CONFIG_IP_VS is not set |
| 306 | 301 | ||
| 307 | # | 302 | # |
| 308 | # IP: Netfilter Configuration | 303 | # IP: Netfilter Configuration |
| 309 | # | 304 | # |
| 305 | CONFIG_NF_DEFRAG_IPV4=m | ||
| 310 | CONFIG_NF_CONNTRACK_IPV4=m | 306 | CONFIG_NF_CONNTRACK_IPV4=m |
| 311 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y | 307 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y |
| 312 | CONFIG_IP_NF_QUEUE=m | 308 | CONFIG_IP_NF_QUEUE=m |
| 313 | CONFIG_IP_NF_IPTABLES=m | 309 | CONFIG_IP_NF_IPTABLES=m |
| 314 | CONFIG_IP_NF_MATCH_RECENT=m | 310 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
| 315 | CONFIG_IP_NF_MATCH_ECN=m | ||
| 316 | CONFIG_IP_NF_MATCH_AH=m | 311 | CONFIG_IP_NF_MATCH_AH=m |
| 312 | CONFIG_IP_NF_MATCH_ECN=m | ||
| 317 | CONFIG_IP_NF_MATCH_TTL=m | 313 | CONFIG_IP_NF_MATCH_TTL=m |
| 318 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
| 319 | CONFIG_IP_NF_FILTER=m | 314 | CONFIG_IP_NF_FILTER=m |
| 320 | CONFIG_IP_NF_TARGET_REJECT=m | 315 | CONFIG_IP_NF_TARGET_REJECT=m |
| 321 | CONFIG_IP_NF_TARGET_LOG=m | 316 | CONFIG_IP_NF_TARGET_LOG=m |
| @@ -323,8 +318,8 @@ CONFIG_IP_NF_TARGET_ULOG=m | |||
| 323 | CONFIG_NF_NAT=m | 318 | CONFIG_NF_NAT=m |
| 324 | CONFIG_NF_NAT_NEEDED=y | 319 | CONFIG_NF_NAT_NEEDED=y |
| 325 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 320 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
| 326 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
| 327 | CONFIG_IP_NF_TARGET_NETMAP=m | 321 | CONFIG_IP_NF_TARGET_NETMAP=m |
| 322 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
| 328 | CONFIG_NF_NAT_SNMP_BASIC=m | 323 | CONFIG_NF_NAT_SNMP_BASIC=m |
| 329 | CONFIG_NF_NAT_PROTO_GRE=m | 324 | CONFIG_NF_NAT_PROTO_GRE=m |
| 330 | CONFIG_NF_NAT_PROTO_UDPLITE=m | 325 | CONFIG_NF_NAT_PROTO_UDPLITE=m |
| @@ -337,9 +332,9 @@ CONFIG_NF_NAT_PPTP=m | |||
| 337 | CONFIG_NF_NAT_H323=m | 332 | CONFIG_NF_NAT_H323=m |
| 338 | CONFIG_NF_NAT_SIP=m | 333 | CONFIG_NF_NAT_SIP=m |
| 339 | CONFIG_IP_NF_MANGLE=m | 334 | CONFIG_IP_NF_MANGLE=m |
| 335 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
| 340 | CONFIG_IP_NF_TARGET_ECN=m | 336 | CONFIG_IP_NF_TARGET_ECN=m |
| 341 | CONFIG_IP_NF_TARGET_TTL=m | 337 | CONFIG_IP_NF_TARGET_TTL=m |
| 342 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
| 343 | CONFIG_IP_NF_RAW=m | 338 | CONFIG_IP_NF_RAW=m |
| 344 | CONFIG_IP_NF_ARPTABLES=m | 339 | CONFIG_IP_NF_ARPTABLES=m |
| 345 | CONFIG_IP_NF_ARPFILTER=m | 340 | CONFIG_IP_NF_ARPFILTER=m |
| @@ -351,16 +346,16 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
| 351 | CONFIG_NF_CONNTRACK_IPV6=m | 346 | CONFIG_NF_CONNTRACK_IPV6=m |
| 352 | CONFIG_IP6_NF_QUEUE=m | 347 | CONFIG_IP6_NF_QUEUE=m |
| 353 | CONFIG_IP6_NF_IPTABLES=m | 348 | CONFIG_IP6_NF_IPTABLES=m |
| 354 | CONFIG_IP6_NF_MATCH_RT=m | 349 | CONFIG_IP6_NF_MATCH_AH=m |
| 355 | CONFIG_IP6_NF_MATCH_OPTS=m | 350 | CONFIG_IP6_NF_MATCH_EUI64=m |
| 356 | CONFIG_IP6_NF_MATCH_FRAG=m | 351 | CONFIG_IP6_NF_MATCH_FRAG=m |
| 352 | CONFIG_IP6_NF_MATCH_OPTS=m | ||
| 357 | CONFIG_IP6_NF_MATCH_HL=m | 353 | CONFIG_IP6_NF_MATCH_HL=m |
| 358 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 354 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
| 359 | CONFIG_IP6_NF_MATCH_AH=m | ||
| 360 | CONFIG_IP6_NF_MATCH_MH=m | 355 | CONFIG_IP6_NF_MATCH_MH=m |
| 361 | CONFIG_IP6_NF_MATCH_EUI64=m | 356 | CONFIG_IP6_NF_MATCH_RT=m |
| 362 | CONFIG_IP6_NF_FILTER=m | ||
| 363 | CONFIG_IP6_NF_TARGET_LOG=m | 357 | CONFIG_IP6_NF_TARGET_LOG=m |
| 358 | CONFIG_IP6_NF_FILTER=m | ||
| 364 | CONFIG_IP6_NF_TARGET_REJECT=m | 359 | CONFIG_IP6_NF_TARGET_REJECT=m |
| 365 | CONFIG_IP6_NF_MANGLE=m | 360 | CONFIG_IP6_NF_MANGLE=m |
| 366 | CONFIG_IP6_NF_TARGET_HL=m | 361 | CONFIG_IP6_NF_TARGET_HL=m |
| @@ -387,6 +382,7 @@ CONFIG_SCTP_HMAC_MD5=y | |||
| 387 | # CONFIG_TIPC is not set | 382 | # CONFIG_TIPC is not set |
| 388 | # CONFIG_ATM is not set | 383 | # CONFIG_ATM is not set |
| 389 | # CONFIG_BRIDGE is not set | 384 | # CONFIG_BRIDGE is not set |
| 385 | # CONFIG_NET_DSA is not set | ||
| 390 | # CONFIG_VLAN_8021Q is not set | 386 | # CONFIG_VLAN_8021Q is not set |
| 391 | # CONFIG_DECNET is not set | 387 | # CONFIG_DECNET is not set |
| 392 | CONFIG_LLC=m | 388 | CONFIG_LLC=m |
| @@ -410,19 +406,8 @@ CONFIG_NET_CLS_ROUTE=y | |||
| 410 | # CONFIG_IRDA is not set | 406 | # CONFIG_IRDA is not set |
| 411 | # CONFIG_BT is not set | 407 | # CONFIG_BT is not set |
| 412 | # CONFIG_AF_RXRPC is not set | 408 | # CONFIG_AF_RXRPC is not set |
| 413 | 409 | # CONFIG_PHONET is not set | |
| 414 | # | 410 | # CONFIG_WIRELESS is not set |
| 415 | # Wireless | ||
| 416 | # | ||
| 417 | # CONFIG_CFG80211 is not set | ||
| 418 | CONFIG_WIRELESS_EXT=y | ||
| 419 | # CONFIG_WIRELESS_EXT_SYSFS is not set | ||
| 420 | # CONFIG_MAC80211 is not set | ||
| 421 | CONFIG_IEEE80211=m | ||
| 422 | # CONFIG_IEEE80211_DEBUG is not set | ||
| 423 | CONFIG_IEEE80211_CRYPT_WEP=m | ||
| 424 | CONFIG_IEEE80211_CRYPT_CCMP=m | ||
| 425 | CONFIG_IEEE80211_CRYPT_TKIP=m | ||
| 426 | # CONFIG_RFKILL is not set | 411 | # CONFIG_RFKILL is not set |
| 427 | # CONFIG_NET_9P is not set | 412 | # CONFIG_NET_9P is not set |
| 428 | 413 | ||
| @@ -470,21 +455,20 @@ CONFIG_ATA_OVER_ETH=m | |||
| 470 | CONFIG_MISC_DEVICES=y | 455 | CONFIG_MISC_DEVICES=y |
| 471 | # CONFIG_EEPROM_93CX6 is not set | 456 | # CONFIG_EEPROM_93CX6 is not set |
| 472 | # CONFIG_ENCLOSURE_SERVICES is not set | 457 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 458 | # CONFIG_C2PORT is not set | ||
| 473 | CONFIG_HAVE_IDE=y | 459 | CONFIG_HAVE_IDE=y |
| 474 | CONFIG_IDE=y | 460 | CONFIG_IDE=y |
| 475 | CONFIG_BLK_DEV_IDE=y | ||
| 476 | 461 | ||
| 477 | # | 462 | # |
| 478 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | 463 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
| 479 | # | 464 | # |
| 480 | CONFIG_IDE_ATAPI=y | ||
| 481 | # CONFIG_BLK_DEV_IDE_SATA is not set | 465 | # CONFIG_BLK_DEV_IDE_SATA is not set |
| 482 | CONFIG_BLK_DEV_IDEDISK=y | 466 | CONFIG_IDE_GD=y |
| 483 | # CONFIG_IDEDISK_MULTI_MODE is not set | 467 | CONFIG_IDE_GD_ATA=y |
| 468 | # CONFIG_IDE_GD_ATAPI is not set | ||
| 484 | CONFIG_BLK_DEV_IDECD=y | 469 | CONFIG_BLK_DEV_IDECD=y |
| 485 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y | 470 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y |
| 486 | # CONFIG_BLK_DEV_IDETAPE is not set | 471 | # CONFIG_BLK_DEV_IDETAPE is not set |
| 487 | CONFIG_BLK_DEV_IDEFLOPPY=m | ||
| 488 | # CONFIG_BLK_DEV_IDESCSI is not set | 472 | # CONFIG_BLK_DEV_IDESCSI is not set |
| 489 | # CONFIG_IDE_TASK_IOCTL is not set | 473 | # CONFIG_IDE_TASK_IOCTL is not set |
| 490 | CONFIG_IDE_PROC_FS=y | 474 | CONFIG_IDE_PROC_FS=y |
| @@ -609,8 +593,12 @@ CONFIG_APNE=m | |||
| 609 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 593 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 610 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 594 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| 611 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 595 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
| 596 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
| 597 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
| 598 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
| 612 | # CONFIG_NET_PCI is not set | 599 | # CONFIG_NET_PCI is not set |
| 613 | # CONFIG_B44 is not set | 600 | # CONFIG_B44 is not set |
| 601 | # CONFIG_CS89x0 is not set | ||
| 614 | # CONFIG_NET_POCKET is not set | 602 | # CONFIG_NET_POCKET is not set |
| 615 | # CONFIG_NETDEV_1000 is not set | 603 | # CONFIG_NETDEV_1000 is not set |
| 616 | # CONFIG_NETDEV_10000 is not set | 604 | # CONFIG_NETDEV_10000 is not set |
| @@ -763,11 +751,11 @@ CONFIG_GEN_RTC_X=y | |||
| 763 | # CONFIG_THERMAL is not set | 751 | # CONFIG_THERMAL is not set |
| 764 | # CONFIG_THERMAL_HWMON is not set | 752 | # CONFIG_THERMAL_HWMON is not set |
| 765 | # CONFIG_WATCHDOG is not set | 753 | # CONFIG_WATCHDOG is not set |
| 754 | CONFIG_SSB_POSSIBLE=y | ||
| 766 | 755 | ||
| 767 | # | 756 | # |
| 768 | # Sonics Silicon Backplane | 757 | # Sonics Silicon Backplane |
| 769 | # | 758 | # |
| 770 | CONFIG_SSB_POSSIBLE=y | ||
| 771 | # CONFIG_SSB is not set | 759 | # CONFIG_SSB is not set |
| 772 | 760 | ||
| 773 | # | 761 | # |
| @@ -777,6 +765,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 777 | # CONFIG_MFD_SM501 is not set | 765 | # CONFIG_MFD_SM501 is not set |
| 778 | # CONFIG_HTC_PASIC3 is not set | 766 | # CONFIG_HTC_PASIC3 is not set |
| 779 | # CONFIG_MFD_TMIO is not set | 767 | # CONFIG_MFD_TMIO is not set |
| 768 | # CONFIG_REGULATOR is not set | ||
| 780 | 769 | ||
| 781 | # | 770 | # |
| 782 | # Multimedia devices | 771 | # Multimedia devices |
| @@ -802,6 +791,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 802 | CONFIG_FB=y | 791 | CONFIG_FB=y |
| 803 | # CONFIG_FIRMWARE_EDID is not set | 792 | # CONFIG_FIRMWARE_EDID is not set |
| 804 | # CONFIG_FB_DDC is not set | 793 | # CONFIG_FB_DDC is not set |
| 794 | # CONFIG_FB_BOOT_VESA_SUPPORT is not set | ||
| 805 | CONFIG_FB_CFB_FILLRECT=y | 795 | CONFIG_FB_CFB_FILLRECT=y |
| 806 | CONFIG_FB_CFB_COPYAREA=y | 796 | CONFIG_FB_CFB_COPYAREA=y |
| 807 | CONFIG_FB_CFB_IMAGEBLIT=y | 797 | CONFIG_FB_CFB_IMAGEBLIT=y |
| @@ -829,6 +819,8 @@ CONFIG_FB_FM2=y | |||
| 829 | # CONFIG_FB_UVESA is not set | 819 | # CONFIG_FB_UVESA is not set |
| 830 | # CONFIG_FB_S1D13XXX is not set | 820 | # CONFIG_FB_S1D13XXX is not set |
| 831 | # CONFIG_FB_VIRTUAL is not set | 821 | # CONFIG_FB_VIRTUAL is not set |
| 822 | # CONFIG_FB_METRONOME is not set | ||
| 823 | # CONFIG_FB_MB862XX is not set | ||
| 832 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 824 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 833 | 825 | ||
| 834 | # | 826 | # |
| @@ -852,12 +844,19 @@ CONFIG_LOGO_LINUX_MONO=y | |||
| 852 | CONFIG_LOGO_LINUX_VGA16=y | 844 | CONFIG_LOGO_LINUX_VGA16=y |
| 853 | CONFIG_LOGO_LINUX_CLUT224=y | 845 | CONFIG_LOGO_LINUX_CLUT224=y |
| 854 | CONFIG_SOUND=m | 846 | CONFIG_SOUND=m |
| 847 | CONFIG_SOUND_OSS_CORE=y | ||
| 855 | CONFIG_DMASOUND_PAULA=m | 848 | CONFIG_DMASOUND_PAULA=m |
| 856 | CONFIG_DMASOUND=m | 849 | CONFIG_DMASOUND=m |
| 857 | CONFIG_HID_SUPPORT=y | 850 | CONFIG_HID_SUPPORT=y |
| 858 | CONFIG_HID=m | 851 | CONFIG_HID=m |
| 859 | # CONFIG_HID_DEBUG is not set | 852 | # CONFIG_HID_DEBUG is not set |
| 860 | CONFIG_HIDRAW=y | 853 | CONFIG_HIDRAW=y |
| 854 | # CONFIG_HID_PID is not set | ||
| 855 | |||
| 856 | # | ||
| 857 | # Special HID drivers | ||
| 858 | # | ||
| 859 | CONFIG_HID_COMPAT=y | ||
| 861 | # CONFIG_USB_SUPPORT is not set | 860 | # CONFIG_USB_SUPPORT is not set |
| 862 | # CONFIG_MMC is not set | 861 | # CONFIG_MMC is not set |
| 863 | # CONFIG_MEMSTICK is not set | 862 | # CONFIG_MEMSTICK is not set |
| @@ -867,6 +866,8 @@ CONFIG_HIDRAW=y | |||
| 867 | # CONFIG_DMADEVICES is not set | 866 | # CONFIG_DMADEVICES is not set |
| 868 | # CONFIG_AUXDISPLAY is not set | 867 | # CONFIG_AUXDISPLAY is not set |
| 869 | # CONFIG_UIO is not set | 868 | # CONFIG_UIO is not set |
| 869 | # CONFIG_STAGING is not set | ||
| 870 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 870 | 871 | ||
| 871 | # | 872 | # |
| 872 | # Character devices | 873 | # Character devices |
| @@ -883,8 +884,9 @@ CONFIG_EXT2_FS=y | |||
| 883 | # CONFIG_EXT2_FS_XIP is not set | 884 | # CONFIG_EXT2_FS_XIP is not set |
| 884 | CONFIG_EXT3_FS=y | 885 | CONFIG_EXT3_FS=y |
| 885 | # CONFIG_EXT3_FS_XATTR is not set | 886 | # CONFIG_EXT3_FS_XATTR is not set |
| 886 | # CONFIG_EXT4DEV_FS is not set | 887 | # CONFIG_EXT4_FS is not set |
| 887 | CONFIG_JBD=y | 888 | CONFIG_JBD=y |
| 889 | CONFIG_JBD2=m | ||
| 888 | CONFIG_REISERFS_FS=m | 890 | CONFIG_REISERFS_FS=m |
| 889 | # CONFIG_REISERFS_CHECK is not set | 891 | # CONFIG_REISERFS_CHECK is not set |
| 890 | # CONFIG_REISERFS_PROC_INFO is not set | 892 | # CONFIG_REISERFS_PROC_INFO is not set |
| @@ -895,6 +897,7 @@ CONFIG_JFS_FS=m | |||
| 895 | # CONFIG_JFS_DEBUG is not set | 897 | # CONFIG_JFS_DEBUG is not set |
| 896 | # CONFIG_JFS_STATISTICS is not set | 898 | # CONFIG_JFS_STATISTICS is not set |
| 897 | # CONFIG_FS_POSIX_ACL is not set | 899 | # CONFIG_FS_POSIX_ACL is not set |
| 900 | CONFIG_FILE_LOCKING=y | ||
| 898 | CONFIG_XFS_FS=m | 901 | CONFIG_XFS_FS=m |
| 899 | # CONFIG_XFS_QUOTA is not set | 902 | # CONFIG_XFS_QUOTA is not set |
| 900 | # CONFIG_XFS_POSIX_ACL is not set | 903 | # CONFIG_XFS_POSIX_ACL is not set |
| @@ -906,6 +909,7 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | |||
| 906 | # CONFIG_OCFS2_FS_STATS is not set | 909 | # CONFIG_OCFS2_FS_STATS is not set |
| 907 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 910 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
| 908 | # CONFIG_OCFS2_DEBUG_FS is not set | 911 | # CONFIG_OCFS2_DEBUG_FS is not set |
| 912 | # CONFIG_OCFS2_COMPAT_JBD is not set | ||
| 909 | CONFIG_DNOTIFY=y | 913 | CONFIG_DNOTIFY=y |
| 910 | CONFIG_INOTIFY=y | 914 | CONFIG_INOTIFY=y |
| 911 | CONFIG_INOTIFY_USER=y | 915 | CONFIG_INOTIFY_USER=y |
| @@ -944,6 +948,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
| 944 | CONFIG_PROC_FS=y | 948 | CONFIG_PROC_FS=y |
| 945 | CONFIG_PROC_KCORE=y | 949 | CONFIG_PROC_KCORE=y |
| 946 | CONFIG_PROC_SYSCTL=y | 950 | CONFIG_PROC_SYSCTL=y |
| 951 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 947 | CONFIG_SYSFS=y | 952 | CONFIG_SYSFS=y |
| 948 | CONFIG_TMPFS=y | 953 | CONFIG_TMPFS=y |
| 949 | # CONFIG_TMPFS_POSIX_ACL is not set | 954 | # CONFIG_TMPFS_POSIX_ACL is not set |
| @@ -986,6 +991,7 @@ CONFIG_EXPORTFS=m | |||
| 986 | CONFIG_NFS_COMMON=y | 991 | CONFIG_NFS_COMMON=y |
| 987 | CONFIG_SUNRPC=m | 992 | CONFIG_SUNRPC=m |
| 988 | CONFIG_SUNRPC_GSS=m | 993 | CONFIG_SUNRPC_GSS=m |
| 994 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
| 989 | CONFIG_RPCSEC_GSS_KRB5=m | 995 | CONFIG_RPCSEC_GSS_KRB5=m |
| 990 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 996 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 991 | CONFIG_SMB_FS=m | 997 | CONFIG_SMB_FS=m |
| @@ -1059,7 +1065,13 @@ CONFIG_MAGIC_SYSRQ=y | |||
| 1059 | # CONFIG_DEBUG_KERNEL is not set | 1065 | # CONFIG_DEBUG_KERNEL is not set |
| 1060 | CONFIG_DEBUG_BUGVERBOSE=y | 1066 | CONFIG_DEBUG_BUGVERBOSE=y |
| 1061 | CONFIG_DEBUG_MEMORY_INIT=y | 1067 | CONFIG_DEBUG_MEMORY_INIT=y |
| 1068 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
| 1062 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1069 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
| 1070 | |||
| 1071 | # | ||
| 1072 | # Tracers | ||
| 1073 | # | ||
| 1074 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
| 1063 | # CONFIG_SAMPLES is not set | 1075 | # CONFIG_SAMPLES is not set |
| 1064 | 1076 | ||
| 1065 | # | 1077 | # |
| @@ -1067,6 +1079,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y | |||
| 1067 | # | 1079 | # |
| 1068 | # CONFIG_KEYS is not set | 1080 | # CONFIG_KEYS is not set |
| 1069 | # CONFIG_SECURITY is not set | 1081 | # CONFIG_SECURITY is not set |
| 1082 | # CONFIG_SECURITYFS is not set | ||
| 1070 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1083 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1071 | CONFIG_XOR_BLOCKS=m | 1084 | CONFIG_XOR_BLOCKS=m |
| 1072 | CONFIG_ASYNC_CORE=m | 1085 | CONFIG_ASYNC_CORE=m |
| @@ -1077,10 +1090,12 @@ CONFIG_CRYPTO=y | |||
| 1077 | # | 1090 | # |
| 1078 | # Crypto core or helper | 1091 | # Crypto core or helper |
| 1079 | # | 1092 | # |
| 1093 | # CONFIG_CRYPTO_FIPS is not set | ||
| 1080 | CONFIG_CRYPTO_ALGAPI=y | 1094 | CONFIG_CRYPTO_ALGAPI=y |
| 1081 | CONFIG_CRYPTO_AEAD=m | 1095 | CONFIG_CRYPTO_AEAD=y |
| 1082 | CONFIG_CRYPTO_BLKCIPHER=m | 1096 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1083 | CONFIG_CRYPTO_HASH=y | 1097 | CONFIG_CRYPTO_HASH=y |
| 1098 | CONFIG_CRYPTO_RNG=y | ||
| 1084 | CONFIG_CRYPTO_MANAGER=y | 1099 | CONFIG_CRYPTO_MANAGER=y |
| 1085 | CONFIG_CRYPTO_GF128MUL=m | 1100 | CONFIG_CRYPTO_GF128MUL=m |
| 1086 | CONFIG_CRYPTO_NULL=m | 1101 | CONFIG_CRYPTO_NULL=m |
| @@ -1154,14 +1169,17 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m | |||
| 1154 | # | 1169 | # |
| 1155 | CONFIG_CRYPTO_DEFLATE=m | 1170 | CONFIG_CRYPTO_DEFLATE=m |
| 1156 | CONFIG_CRYPTO_LZO=m | 1171 | CONFIG_CRYPTO_LZO=m |
| 1172 | |||
| 1173 | # | ||
| 1174 | # Random Number Generation | ||
| 1175 | # | ||
| 1176 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
| 1157 | # CONFIG_CRYPTO_HW is not set | 1177 | # CONFIG_CRYPTO_HW is not set |
| 1158 | 1178 | ||
| 1159 | # | 1179 | # |
| 1160 | # Library routines | 1180 | # Library routines |
| 1161 | # | 1181 | # |
| 1162 | CONFIG_BITREVERSE=y | 1182 | CONFIG_BITREVERSE=y |
| 1163 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1164 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
| 1165 | CONFIG_CRC_CCITT=m | 1183 | CONFIG_CRC_CCITT=m |
| 1166 | CONFIG_CRC16=m | 1184 | CONFIG_CRC16=m |
| 1167 | CONFIG_CRC_T10DIF=y | 1185 | CONFIG_CRC_T10DIF=y |
diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig index c41b854c0284..935108d115a0 100644 --- a/arch/m68k/configs/apollo_defconfig +++ b/arch/m68k/configs/apollo_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.27-rc6 | 3 | # Linux kernel version: 2.6.28-rc7 |
| 4 | # Wed Sep 10 09:02:01 2008 | 4 | # Tue Dec 2 20:27:43 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -14,7 +14,6 @@ CONFIG_TIME_LOW_RES=y | |||
| 14 | CONFIG_GENERIC_IOMAP=y | 14 | CONFIG_GENERIC_IOMAP=y |
| 15 | CONFIG_NO_IOPORT=y | 15 | CONFIG_NO_IOPORT=y |
| 16 | # CONFIG_NO_DMA is not set | 16 | # CONFIG_NO_DMA is not set |
| 17 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
| 18 | CONFIG_HZ=100 | 17 | CONFIG_HZ=100 |
| 19 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 18 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 20 | 19 | ||
| @@ -67,22 +66,13 @@ CONFIG_SIGNALFD=y | |||
| 67 | CONFIG_TIMERFD=y | 66 | CONFIG_TIMERFD=y |
| 68 | CONFIG_EVENTFD=y | 67 | CONFIG_EVENTFD=y |
| 69 | CONFIG_SHMEM=y | 68 | CONFIG_SHMEM=y |
| 69 | CONFIG_AIO=y | ||
| 70 | CONFIG_VM_EVENT_COUNTERS=y | 70 | CONFIG_VM_EVENT_COUNTERS=y |
| 71 | CONFIG_SLAB=y | 71 | CONFIG_SLAB=y |
| 72 | # CONFIG_SLUB is not set | 72 | # CONFIG_SLUB is not set |
| 73 | # CONFIG_SLOB is not set | 73 | # CONFIG_SLOB is not set |
| 74 | # CONFIG_PROFILING is not set | 74 | # CONFIG_PROFILING is not set |
| 75 | # CONFIG_MARKERS is not set | 75 | # CONFIG_MARKERS is not set |
| 76 | # CONFIG_HAVE_OPROFILE is not set | ||
| 77 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
| 78 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
| 79 | # CONFIG_HAVE_KPROBES is not set | ||
| 80 | # CONFIG_HAVE_KRETPROBES is not set | ||
| 81 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
| 82 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 83 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 84 | # CONFIG_HAVE_CLK is not set | ||
| 85 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 86 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 76 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 87 | CONFIG_SLABINFO=y | 77 | CONFIG_SLABINFO=y |
| 88 | CONFIG_RT_MUTEXES=y | 78 | CONFIG_RT_MUTEXES=y |
| @@ -115,11 +105,11 @@ CONFIG_DEFAULT_AS=y | |||
| 115 | # CONFIG_DEFAULT_NOOP is not set | 105 | # CONFIG_DEFAULT_NOOP is not set |
| 116 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 106 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 117 | CONFIG_CLASSIC_RCU=y | 107 | CONFIG_CLASSIC_RCU=y |
| 108 | # CONFIG_FREEZER is not set | ||
| 118 | 109 | ||
| 119 | # | 110 | # |
| 120 | # Platform dependent setup | 111 | # Platform dependent setup |
| 121 | # | 112 | # |
| 122 | # CONFIG_SUN3 is not set | ||
| 123 | # CONFIG_AMIGA is not set | 113 | # CONFIG_AMIGA is not set |
| 124 | # CONFIG_ATARI is not set | 114 | # CONFIG_ATARI is not set |
| 125 | # CONFIG_MAC is not set | 115 | # CONFIG_MAC is not set |
| @@ -148,19 +138,21 @@ CONFIG_DISCONTIGMEM_MANUAL=y | |||
| 148 | CONFIG_DISCONTIGMEM=y | 138 | CONFIG_DISCONTIGMEM=y |
| 149 | CONFIG_FLAT_NODE_MEM_MAP=y | 139 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 150 | CONFIG_NEED_MULTIPLE_NODES=y | 140 | CONFIG_NEED_MULTIPLE_NODES=y |
| 151 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 152 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 153 | CONFIG_PAGEFLAGS_EXTENDED=y | 141 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 154 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 142 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 155 | # CONFIG_RESOURCES_64BIT is not set | 143 | # CONFIG_RESOURCES_64BIT is not set |
| 144 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
| 156 | CONFIG_ZONE_DMA_FLAG=1 | 145 | CONFIG_ZONE_DMA_FLAG=1 |
| 157 | CONFIG_BOUNCE=y | 146 | CONFIG_BOUNCE=y |
| 158 | CONFIG_VIRT_TO_BUS=y | 147 | CONFIG_VIRT_TO_BUS=y |
| 148 | CONFIG_UNEVICTABLE_LRU=y | ||
| 159 | 149 | ||
| 160 | # | 150 | # |
| 161 | # General setup | 151 | # General setup |
| 162 | # | 152 | # |
| 163 | CONFIG_BINFMT_ELF=y | 153 | CONFIG_BINFMT_ELF=y |
| 154 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 155 | CONFIG_HAVE_AOUT=y | ||
| 164 | CONFIG_BINFMT_AOUT=m | 156 | CONFIG_BINFMT_AOUT=m |
| 165 | CONFIG_BINFMT_MISC=m | 157 | CONFIG_BINFMT_MISC=m |
| 166 | CONFIG_HEARTBEAT=y | 158 | CONFIG_HEARTBEAT=y |
| @@ -210,7 +202,6 @@ CONFIG_INET_TCP_DIAG=m | |||
| 210 | CONFIG_TCP_CONG_CUBIC=y | 202 | CONFIG_TCP_CONG_CUBIC=y |
| 211 | CONFIG_DEFAULT_TCP_CONG="cubic" | 203 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 212 | # CONFIG_TCP_MD5SIG is not set | 204 | # CONFIG_TCP_MD5SIG is not set |
| 213 | # CONFIG_IP_VS is not set | ||
| 214 | CONFIG_IPV6=m | 205 | CONFIG_IPV6=m |
| 215 | CONFIG_IPV6_PRIVACY=y | 206 | CONFIG_IPV6_PRIVACY=y |
| 216 | CONFIG_IPV6_ROUTER_PREF=y | 207 | CONFIG_IPV6_ROUTER_PREF=y |
| @@ -260,13 +251,14 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
| 260 | CONFIG_NF_CONNTRACK_SIP=m | 251 | CONFIG_NF_CONNTRACK_SIP=m |
| 261 | CONFIG_NF_CONNTRACK_TFTP=m | 252 | CONFIG_NF_CONNTRACK_TFTP=m |
| 262 | # CONFIG_NF_CT_NETLINK is not set | 253 | # CONFIG_NF_CT_NETLINK is not set |
| 254 | # CONFIG_NETFILTER_TPROXY is not set | ||
| 263 | CONFIG_NETFILTER_XTABLES=m | 255 | CONFIG_NETFILTER_XTABLES=m |
| 264 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 256 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| 265 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 257 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
| 266 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 258 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
| 267 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 259 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
| 268 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
| 269 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 260 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
| 261 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
| 270 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | 262 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m |
| 271 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m | 263 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m |
| 272 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 264 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
| @@ -280,19 +272,22 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | |||
| 280 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 272 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
| 281 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 273 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
| 282 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 274 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
| 275 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | ||
| 283 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 276 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
| 284 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | 277 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m |
| 285 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 278 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
| 286 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 279 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
| 287 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 280 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
| 288 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 281 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
| 282 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
| 289 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 283 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
| 290 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 284 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
| 291 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
| 292 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 285 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
| 293 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | 286 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m |
| 294 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | 287 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m |
| 295 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 288 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
| 289 | CONFIG_NETFILTER_XT_MATCH_RECENT=m | ||
| 290 | # CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set | ||
| 296 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 291 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
| 297 | CONFIG_NETFILTER_XT_MATCH_STATE=m | 292 | CONFIG_NETFILTER_XT_MATCH_STATE=m |
| 298 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | 293 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m |
| @@ -300,20 +295,20 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m | |||
| 300 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 295 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
| 301 | CONFIG_NETFILTER_XT_MATCH_TIME=m | 296 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
| 302 | CONFIG_NETFILTER_XT_MATCH_U32=m | 297 | CONFIG_NETFILTER_XT_MATCH_U32=m |
| 303 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 298 | # CONFIG_IP_VS is not set |
| 304 | 299 | ||
| 305 | # | 300 | # |
| 306 | # IP: Netfilter Configuration | 301 | # IP: Netfilter Configuration |
| 307 | # | 302 | # |
| 303 | CONFIG_NF_DEFRAG_IPV4=m | ||
| 308 | CONFIG_NF_CONNTRACK_IPV4=m | 304 | CONFIG_NF_CONNTRACK_IPV4=m |
| 309 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y | 305 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y |
| 310 | CONFIG_IP_NF_QUEUE=m | 306 | CONFIG_IP_NF_QUEUE=m |
| 311 | CONFIG_IP_NF_IPTABLES=m | 307 | CONFIG_IP_NF_IPTABLES=m |
| 312 | CONFIG_IP_NF_MATCH_RECENT=m | 308 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
| 313 | CONFIG_IP_NF_MATCH_ECN=m | ||
| 314 | CONFIG_IP_NF_MATCH_AH=m | 309 | CONFIG_IP_NF_MATCH_AH=m |
| 310 | CONFIG_IP_NF_MATCH_ECN=m | ||
| 315 | CONFIG_IP_NF_MATCH_TTL=m | 311 | CONFIG_IP_NF_MATCH_TTL=m |
| 316 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
| 317 | CONFIG_IP_NF_FILTER=m | 312 | CONFIG_IP_NF_FILTER=m |
| 318 | CONFIG_IP_NF_TARGET_REJECT=m | 313 | CONFIG_IP_NF_TARGET_REJECT=m |
| 319 | CONFIG_IP_NF_TARGET_LOG=m | 314 | CONFIG_IP_NF_TARGET_LOG=m |
| @@ -321,8 +316,8 @@ CONFIG_IP_NF_TARGET_ULOG=m | |||
| 321 | CONFIG_NF_NAT=m | 316 | CONFIG_NF_NAT=m |
| 322 | CONFIG_NF_NAT_NEEDED=y | 317 | CONFIG_NF_NAT_NEEDED=y |
| 323 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 318 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
| 324 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
| 325 | CONFIG_IP_NF_TARGET_NETMAP=m | 319 | CONFIG_IP_NF_TARGET_NETMAP=m |
| 320 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
| 326 | CONFIG_NF_NAT_SNMP_BASIC=m | 321 | CONFIG_NF_NAT_SNMP_BASIC=m |
| 327 | CONFIG_NF_NAT_PROTO_GRE=m | 322 | CONFIG_NF_NAT_PROTO_GRE=m |
| 328 | CONFIG_NF_NAT_PROTO_UDPLITE=m | 323 | CONFIG_NF_NAT_PROTO_UDPLITE=m |
| @@ -335,9 +330,9 @@ CONFIG_NF_NAT_PPTP=m | |||
| 335 | CONFIG_NF_NAT_H323=m | 330 | CONFIG_NF_NAT_H323=m |
| 336 | CONFIG_NF_NAT_SIP=m | 331 | CONFIG_NF_NAT_SIP=m |
| 337 | CONFIG_IP_NF_MANGLE=m | 332 | CONFIG_IP_NF_MANGLE=m |
| 333 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
| 338 | CONFIG_IP_NF_TARGET_ECN=m | 334 | CONFIG_IP_NF_TARGET_ECN=m |
| 339 | CONFIG_IP_NF_TARGET_TTL=m | 335 | CONFIG_IP_NF_TARGET_TTL=m |
| 340 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
| 341 | CONFIG_IP_NF_RAW=m | 336 | CONFIG_IP_NF_RAW=m |
| 342 | CONFIG_IP_NF_ARPTABLES=m | 337 | CONFIG_IP_NF_ARPTABLES=m |
| 343 | CONFIG_IP_NF_ARPFILTER=m | 338 | CONFIG_IP_NF_ARPFILTER=m |
| @@ -349,16 +344,16 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
| 349 | CONFIG_NF_CONNTRACK_IPV6=m | 344 | CONFIG_NF_CONNTRACK_IPV6=m |
| 350 | CONFIG_IP6_NF_QUEUE=m | 345 | CONFIG_IP6_NF_QUEUE=m |
| 351 | CONFIG_IP6_NF_IPTABLES=m | 346 | CONFIG_IP6_NF_IPTABLES=m |
| 352 | CONFIG_IP6_NF_MATCH_RT=m | 347 | CONFIG_IP6_NF_MATCH_AH=m |
| 353 | CONFIG_IP6_NF_MATCH_OPTS=m | 348 | CONFIG_IP6_NF_MATCH_EUI64=m |
| 354 | CONFIG_IP6_NF_MATCH_FRAG=m | 349 | CONFIG_IP6_NF_MATCH_FRAG=m |
| 350 | CONFIG_IP6_NF_MATCH_OPTS=m | ||
| 355 | CONFIG_IP6_NF_MATCH_HL=m | 351 | CONFIG_IP6_NF_MATCH_HL=m |
| 356 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 352 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
| 357 | CONFIG_IP6_NF_MATCH_AH=m | ||
| 358 | CONFIG_IP6_NF_MATCH_MH=m | 353 | CONFIG_IP6_NF_MATCH_MH=m |
| 359 | CONFIG_IP6_NF_MATCH_EUI64=m | 354 | CONFIG_IP6_NF_MATCH_RT=m |
| 360 | CONFIG_IP6_NF_FILTER=m | ||
| 361 | CONFIG_IP6_NF_TARGET_LOG=m | 355 | CONFIG_IP6_NF_TARGET_LOG=m |
| 356 | CONFIG_IP6_NF_FILTER=m | ||
| 362 | CONFIG_IP6_NF_TARGET_REJECT=m | 357 | CONFIG_IP6_NF_TARGET_REJECT=m |
| 363 | CONFIG_IP6_NF_MANGLE=m | 358 | CONFIG_IP6_NF_MANGLE=m |
| 364 | CONFIG_IP6_NF_TARGET_HL=m | 359 | CONFIG_IP6_NF_TARGET_HL=m |
| @@ -385,6 +380,7 @@ CONFIG_SCTP_HMAC_MD5=y | |||
| 385 | # CONFIG_TIPC is not set | 380 | # CONFIG_TIPC is not set |
| 386 | # CONFIG_ATM is not set | 381 | # CONFIG_ATM is not set |
| 387 | # CONFIG_BRIDGE is not set | 382 | # CONFIG_BRIDGE is not set |
| 383 | # CONFIG_NET_DSA is not set | ||
| 388 | # CONFIG_VLAN_8021Q is not set | 384 | # CONFIG_VLAN_8021Q is not set |
| 389 | # CONFIG_DECNET is not set | 385 | # CONFIG_DECNET is not set |
| 390 | CONFIG_LLC=m | 386 | CONFIG_LLC=m |
| @@ -408,19 +404,8 @@ CONFIG_NET_CLS_ROUTE=y | |||
| 408 | # CONFIG_IRDA is not set | 404 | # CONFIG_IRDA is not set |
| 409 | # CONFIG_BT is not set | 405 | # CONFIG_BT is not set |
| 410 | # CONFIG_AF_RXRPC is not set | 406 | # CONFIG_AF_RXRPC is not set |
| 411 | 407 | # CONFIG_PHONET is not set | |
| 412 | # | 408 | # CONFIG_WIRELESS is not set |
| 413 | # Wireless | ||
| 414 | # | ||
| 415 | # CONFIG_CFG80211 is not set | ||
| 416 | CONFIG_WIRELESS_EXT=y | ||
| 417 | # CONFIG_WIRELESS_EXT_SYSFS is not set | ||
| 418 | # CONFIG_MAC80211 is not set | ||
| 419 | CONFIG_IEEE80211=m | ||
| 420 | # CONFIG_IEEE80211_DEBUG is not set | ||
| 421 | CONFIG_IEEE80211_CRYPT_WEP=m | ||
| 422 | CONFIG_IEEE80211_CRYPT_CCMP=m | ||
| 423 | CONFIG_IEEE80211_CRYPT_TKIP=m | ||
| 424 | # CONFIG_RFKILL is not set | 409 | # CONFIG_RFKILL is not set |
| 425 | # CONFIG_NET_9P is not set | 410 | # CONFIG_NET_9P is not set |
| 426 | 411 | ||
| @@ -458,6 +443,7 @@ CONFIG_ATA_OVER_ETH=m | |||
| 458 | CONFIG_MISC_DEVICES=y | 443 | CONFIG_MISC_DEVICES=y |
| 459 | # CONFIG_EEPROM_93CX6 is not set | 444 | # CONFIG_EEPROM_93CX6 is not set |
| 460 | # CONFIG_ENCLOSURE_SERVICES is not set | 445 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 446 | # CONFIG_C2PORT is not set | ||
| 461 | CONFIG_HAVE_IDE=y | 447 | CONFIG_HAVE_IDE=y |
| 462 | # CONFIG_IDE is not set | 448 | # CONFIG_IDE is not set |
| 463 | 449 | ||
| @@ -540,6 +526,9 @@ CONFIG_NET_ETHERNET=y | |||
| 540 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 526 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 541 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 527 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| 542 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 528 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
| 529 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
| 530 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
| 531 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
| 543 | # CONFIG_B44 is not set | 532 | # CONFIG_B44 is not set |
| 544 | # CONFIG_NETDEV_1000 is not set | 533 | # CONFIG_NETDEV_1000 is not set |
| 545 | # CONFIG_NETDEV_10000 is not set | 534 | # CONFIG_NETDEV_10000 is not set |
| @@ -609,6 +598,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y | |||
| 609 | CONFIG_MOUSE_PS2_SYNAPTICS=y | 598 | CONFIG_MOUSE_PS2_SYNAPTICS=y |
| 610 | CONFIG_MOUSE_PS2_LIFEBOOK=y | 599 | CONFIG_MOUSE_PS2_LIFEBOOK=y |
| 611 | CONFIG_MOUSE_PS2_TRACKPOINT=y | 600 | CONFIG_MOUSE_PS2_TRACKPOINT=y |
| 601 | # CONFIG_MOUSE_PS2_ELANTECH is not set | ||
| 612 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 602 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
| 613 | CONFIG_MOUSE_SERIAL=m | 603 | CONFIG_MOUSE_SERIAL=m |
| 614 | # CONFIG_MOUSE_VSXXXAA is not set | 604 | # CONFIG_MOUSE_VSXXXAA is not set |
| @@ -663,11 +653,11 @@ CONFIG_GEN_RTC_X=y | |||
| 663 | # CONFIG_THERMAL is not set | 653 | # CONFIG_THERMAL is not set |
| 664 | # CONFIG_THERMAL_HWMON is not set | 654 | # CONFIG_THERMAL_HWMON is not set |
| 665 | # CONFIG_WATCHDOG is not set | 655 | # CONFIG_WATCHDOG is not set |
| 656 | CONFIG_SSB_POSSIBLE=y | ||
| 666 | 657 | ||
| 667 | # | 658 | # |
| 668 | # Sonics Silicon Backplane | 659 | # Sonics Silicon Backplane |
| 669 | # | 660 | # |
| 670 | CONFIG_SSB_POSSIBLE=y | ||
| 671 | # CONFIG_SSB is not set | 661 | # CONFIG_SSB is not set |
| 672 | 662 | ||
| 673 | # | 663 | # |
| @@ -677,6 +667,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 677 | # CONFIG_MFD_SM501 is not set | 667 | # CONFIG_MFD_SM501 is not set |
| 678 | # CONFIG_HTC_PASIC3 is not set | 668 | # CONFIG_HTC_PASIC3 is not set |
| 679 | # CONFIG_MFD_TMIO is not set | 669 | # CONFIG_MFD_TMIO is not set |
| 670 | # CONFIG_REGULATOR is not set | ||
| 680 | 671 | ||
| 681 | # | 672 | # |
| 682 | # Multimedia devices | 673 | # Multimedia devices |
| @@ -702,6 +693,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 702 | CONFIG_FB=y | 693 | CONFIG_FB=y |
| 703 | # CONFIG_FIRMWARE_EDID is not set | 694 | # CONFIG_FIRMWARE_EDID is not set |
| 704 | # CONFIG_FB_DDC is not set | 695 | # CONFIG_FB_DDC is not set |
| 696 | # CONFIG_FB_BOOT_VESA_SUPPORT is not set | ||
| 705 | CONFIG_FB_CFB_FILLRECT=y | 697 | CONFIG_FB_CFB_FILLRECT=y |
| 706 | # CONFIG_FB_CFB_COPYAREA is not set | 698 | # CONFIG_FB_CFB_COPYAREA is not set |
| 707 | CONFIG_FB_CFB_IMAGEBLIT=y | 699 | CONFIG_FB_CFB_IMAGEBLIT=y |
| @@ -724,6 +716,8 @@ CONFIG_FB_APOLLO=y | |||
| 724 | # CONFIG_FB_UVESA is not set | 716 | # CONFIG_FB_UVESA is not set |
| 725 | # CONFIG_FB_S1D13XXX is not set | 717 | # CONFIG_FB_S1D13XXX is not set |
| 726 | # CONFIG_FB_VIRTUAL is not set | 718 | # CONFIG_FB_VIRTUAL is not set |
| 719 | # CONFIG_FB_METRONOME is not set | ||
| 720 | # CONFIG_FB_MB862XX is not set | ||
| 727 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 721 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 728 | 722 | ||
| 729 | # | 723 | # |
| @@ -750,6 +744,12 @@ CONFIG_HID_SUPPORT=y | |||
| 750 | CONFIG_HID=m | 744 | CONFIG_HID=m |
| 751 | # CONFIG_HID_DEBUG is not set | 745 | # CONFIG_HID_DEBUG is not set |
| 752 | CONFIG_HIDRAW=y | 746 | CONFIG_HIDRAW=y |
| 747 | # CONFIG_HID_PID is not set | ||
| 748 | |||
| 749 | # | ||
| 750 | # Special HID drivers | ||
| 751 | # | ||
| 752 | CONFIG_HID_COMPAT=y | ||
| 753 | # CONFIG_USB_SUPPORT is not set | 753 | # CONFIG_USB_SUPPORT is not set |
| 754 | # CONFIG_MMC is not set | 754 | # CONFIG_MMC is not set |
| 755 | # CONFIG_MEMSTICK is not set | 755 | # CONFIG_MEMSTICK is not set |
| @@ -758,6 +758,8 @@ CONFIG_HIDRAW=y | |||
| 758 | # CONFIG_RTC_CLASS is not set | 758 | # CONFIG_RTC_CLASS is not set |
| 759 | # CONFIG_DMADEVICES is not set | 759 | # CONFIG_DMADEVICES is not set |
| 760 | # CONFIG_UIO is not set | 760 | # CONFIG_UIO is not set |
| 761 | # CONFIG_STAGING is not set | ||
| 762 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 761 | 763 | ||
| 762 | # | 764 | # |
| 763 | # Character devices | 765 | # Character devices |
| @@ -773,8 +775,9 @@ CONFIG_EXT2_FS=y | |||
| 773 | # CONFIG_EXT2_FS_XIP is not set | 775 | # CONFIG_EXT2_FS_XIP is not set |
| 774 | CONFIG_EXT3_FS=y | 776 | CONFIG_EXT3_FS=y |
| 775 | # CONFIG_EXT3_FS_XATTR is not set | 777 | # CONFIG_EXT3_FS_XATTR is not set |
| 776 | # CONFIG_EXT4DEV_FS is not set | 778 | # CONFIG_EXT4_FS is not set |
| 777 | CONFIG_JBD=y | 779 | CONFIG_JBD=y |
| 780 | CONFIG_JBD2=m | ||
| 778 | CONFIG_REISERFS_FS=m | 781 | CONFIG_REISERFS_FS=m |
| 779 | # CONFIG_REISERFS_CHECK is not set | 782 | # CONFIG_REISERFS_CHECK is not set |
| 780 | # CONFIG_REISERFS_PROC_INFO is not set | 783 | # CONFIG_REISERFS_PROC_INFO is not set |
| @@ -785,6 +788,7 @@ CONFIG_JFS_FS=m | |||
| 785 | # CONFIG_JFS_DEBUG is not set | 788 | # CONFIG_JFS_DEBUG is not set |
| 786 | # CONFIG_JFS_STATISTICS is not set | 789 | # CONFIG_JFS_STATISTICS is not set |
| 787 | # CONFIG_FS_POSIX_ACL is not set | 790 | # CONFIG_FS_POSIX_ACL is not set |
| 791 | CONFIG_FILE_LOCKING=y | ||
| 788 | CONFIG_XFS_FS=m | 792 | CONFIG_XFS_FS=m |
| 789 | # CONFIG_XFS_QUOTA is not set | 793 | # CONFIG_XFS_QUOTA is not set |
| 790 | # CONFIG_XFS_POSIX_ACL is not set | 794 | # CONFIG_XFS_POSIX_ACL is not set |
| @@ -796,6 +800,7 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | |||
| 796 | # CONFIG_OCFS2_FS_STATS is not set | 800 | # CONFIG_OCFS2_FS_STATS is not set |
| 797 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 801 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
| 798 | # CONFIG_OCFS2_DEBUG_FS is not set | 802 | # CONFIG_OCFS2_DEBUG_FS is not set |
| 803 | # CONFIG_OCFS2_COMPAT_JBD is not set | ||
| 799 | CONFIG_DNOTIFY=y | 804 | CONFIG_DNOTIFY=y |
| 800 | CONFIG_INOTIFY=y | 805 | CONFIG_INOTIFY=y |
| 801 | CONFIG_INOTIFY_USER=y | 806 | CONFIG_INOTIFY_USER=y |
| @@ -834,6 +839,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
| 834 | CONFIG_PROC_FS=y | 839 | CONFIG_PROC_FS=y |
| 835 | CONFIG_PROC_KCORE=y | 840 | CONFIG_PROC_KCORE=y |
| 836 | CONFIG_PROC_SYSCTL=y | 841 | CONFIG_PROC_SYSCTL=y |
| 842 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 837 | CONFIG_SYSFS=y | 843 | CONFIG_SYSFS=y |
| 838 | CONFIG_TMPFS=y | 844 | CONFIG_TMPFS=y |
| 839 | # CONFIG_TMPFS_POSIX_ACL is not set | 845 | # CONFIG_TMPFS_POSIX_ACL is not set |
| @@ -877,6 +883,7 @@ CONFIG_EXPORTFS=m | |||
| 877 | CONFIG_NFS_COMMON=y | 883 | CONFIG_NFS_COMMON=y |
| 878 | CONFIG_SUNRPC=y | 884 | CONFIG_SUNRPC=y |
| 879 | CONFIG_SUNRPC_GSS=y | 885 | CONFIG_SUNRPC_GSS=y |
| 886 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
| 880 | CONFIG_RPCSEC_GSS_KRB5=y | 887 | CONFIG_RPCSEC_GSS_KRB5=y |
| 881 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 888 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 882 | CONFIG_SMB_FS=m | 889 | CONFIG_SMB_FS=m |
| @@ -949,7 +956,13 @@ CONFIG_MAGIC_SYSRQ=y | |||
| 949 | # CONFIG_DEBUG_KERNEL is not set | 956 | # CONFIG_DEBUG_KERNEL is not set |
| 950 | CONFIG_DEBUG_BUGVERBOSE=y | 957 | CONFIG_DEBUG_BUGVERBOSE=y |
| 951 | CONFIG_DEBUG_MEMORY_INIT=y | 958 | CONFIG_DEBUG_MEMORY_INIT=y |
| 959 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
| 952 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 960 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
| 961 | |||
| 962 | # | ||
| 963 | # Tracers | ||
| 964 | # | ||
| 965 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
| 953 | # CONFIG_SAMPLES is not set | 966 | # CONFIG_SAMPLES is not set |
| 954 | 967 | ||
| 955 | # | 968 | # |
| @@ -957,6 +970,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y | |||
| 957 | # | 970 | # |
| 958 | # CONFIG_KEYS is not set | 971 | # CONFIG_KEYS is not set |
| 959 | # CONFIG_SECURITY is not set | 972 | # CONFIG_SECURITY is not set |
| 973 | # CONFIG_SECURITYFS is not set | ||
| 960 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 974 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 961 | CONFIG_XOR_BLOCKS=m | 975 | CONFIG_XOR_BLOCKS=m |
| 962 | CONFIG_ASYNC_CORE=m | 976 | CONFIG_ASYNC_CORE=m |
| @@ -967,10 +981,12 @@ CONFIG_CRYPTO=y | |||
| 967 | # | 981 | # |
| 968 | # Crypto core or helper | 982 | # Crypto core or helper |
| 969 | # | 983 | # |
| 984 | # CONFIG_CRYPTO_FIPS is not set | ||
| 970 | CONFIG_CRYPTO_ALGAPI=y | 985 | CONFIG_CRYPTO_ALGAPI=y |
| 971 | CONFIG_CRYPTO_AEAD=m | 986 | CONFIG_CRYPTO_AEAD=y |
| 972 | CONFIG_CRYPTO_BLKCIPHER=y | 987 | CONFIG_CRYPTO_BLKCIPHER=y |
| 973 | CONFIG_CRYPTO_HASH=y | 988 | CONFIG_CRYPTO_HASH=y |
| 989 | CONFIG_CRYPTO_RNG=y | ||
| 974 | CONFIG_CRYPTO_MANAGER=y | 990 | CONFIG_CRYPTO_MANAGER=y |
| 975 | CONFIG_CRYPTO_GF128MUL=m | 991 | CONFIG_CRYPTO_GF128MUL=m |
| 976 | CONFIG_CRYPTO_NULL=m | 992 | CONFIG_CRYPTO_NULL=m |
| @@ -1044,14 +1060,17 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m | |||
| 1044 | # | 1060 | # |
| 1045 | CONFIG_CRYPTO_DEFLATE=m | 1061 | CONFIG_CRYPTO_DEFLATE=m |
| 1046 | CONFIG_CRYPTO_LZO=m | 1062 | CONFIG_CRYPTO_LZO=m |
| 1063 | |||
| 1064 | # | ||
| 1065 | # Random Number Generation | ||
| 1066 | # | ||
| 1067 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
| 1047 | # CONFIG_CRYPTO_HW is not set | 1068 | # CONFIG_CRYPTO_HW is not set |
| 1048 | 1069 | ||
| 1049 | # | 1070 | # |
| 1050 | # Library routines | 1071 | # Library routines |
| 1051 | # | 1072 | # |
| 1052 | CONFIG_BITREVERSE=y | 1073 | CONFIG_BITREVERSE=y |
| 1053 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1054 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
| 1055 | CONFIG_CRC_CCITT=m | 1074 | CONFIG_CRC_CCITT=m |
| 1056 | CONFIG_CRC16=m | 1075 | CONFIG_CRC16=m |
| 1057 | CONFIG_CRC_T10DIF=y | 1076 | CONFIG_CRC_T10DIF=y |
diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig index 654c5acb9e86..a594a1d47b62 100644 --- a/arch/m68k/configs/atari_defconfig +++ b/arch/m68k/configs/atari_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.27-rc6 | 3 | # Linux kernel version: 2.6.28-rc7 |
| 4 | # Wed Sep 10 09:02:02 2008 | 4 | # Tue Dec 2 20:27:44 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -14,7 +14,6 @@ CONFIG_TIME_LOW_RES=y | |||
| 14 | CONFIG_GENERIC_IOMAP=y | 14 | CONFIG_GENERIC_IOMAP=y |
| 15 | CONFIG_NO_IOPORT=y | 15 | CONFIG_NO_IOPORT=y |
| 16 | # CONFIG_NO_DMA is not set | 16 | # CONFIG_NO_DMA is not set |
| 17 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
| 18 | CONFIG_HZ=100 | 17 | CONFIG_HZ=100 |
| 19 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 18 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 20 | 19 | ||
| @@ -67,22 +66,13 @@ CONFIG_SIGNALFD=y | |||
| 67 | CONFIG_TIMERFD=y | 66 | CONFIG_TIMERFD=y |
| 68 | CONFIG_EVENTFD=y | 67 | CONFIG_EVENTFD=y |
| 69 | CONFIG_SHMEM=y | 68 | CONFIG_SHMEM=y |
| 69 | CONFIG_AIO=y | ||
| 70 | CONFIG_VM_EVENT_COUNTERS=y | 70 | CONFIG_VM_EVENT_COUNTERS=y |
| 71 | CONFIG_SLAB=y | 71 | CONFIG_SLAB=y |
| 72 | # CONFIG_SLUB is not set | 72 | # CONFIG_SLUB is not set |
| 73 | # CONFIG_SLOB is not set | 73 | # CONFIG_SLOB is not set |
| 74 | # CONFIG_PROFILING is not set | 74 | # CONFIG_PROFILING is not set |
| 75 | # CONFIG_MARKERS is not set | 75 | # CONFIG_MARKERS is not set |
| 76 | # CONFIG_HAVE_OPROFILE is not set | ||
| 77 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
| 78 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
| 79 | # CONFIG_HAVE_KPROBES is not set | ||
| 80 | # CONFIG_HAVE_KRETPROBES is not set | ||
| 81 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
| 82 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 83 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 84 | # CONFIG_HAVE_CLK is not set | ||
| 85 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 86 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 76 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 87 | CONFIG_SLABINFO=y | 77 | CONFIG_SLABINFO=y |
| 88 | CONFIG_RT_MUTEXES=y | 78 | CONFIG_RT_MUTEXES=y |
| @@ -115,11 +105,11 @@ CONFIG_DEFAULT_AS=y | |||
| 115 | # CONFIG_DEFAULT_NOOP is not set | 105 | # CONFIG_DEFAULT_NOOP is not set |
| 116 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 106 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 117 | CONFIG_CLASSIC_RCU=y | 107 | CONFIG_CLASSIC_RCU=y |
| 108 | # CONFIG_FREEZER is not set | ||
| 118 | 109 | ||
| 119 | # | 110 | # |
| 120 | # Platform dependent setup | 111 | # Platform dependent setup |
| 121 | # | 112 | # |
| 122 | # CONFIG_SUN3 is not set | ||
| 123 | # CONFIG_AMIGA is not set | 113 | # CONFIG_AMIGA is not set |
| 124 | CONFIG_ATARI=y | 114 | CONFIG_ATARI=y |
| 125 | # CONFIG_MAC is not set | 115 | # CONFIG_MAC is not set |
| @@ -148,19 +138,21 @@ CONFIG_DISCONTIGMEM_MANUAL=y | |||
| 148 | CONFIG_DISCONTIGMEM=y | 138 | CONFIG_DISCONTIGMEM=y |
| 149 | CONFIG_FLAT_NODE_MEM_MAP=y | 139 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 150 | CONFIG_NEED_MULTIPLE_NODES=y | 140 | CONFIG_NEED_MULTIPLE_NODES=y |
| 151 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 152 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 153 | CONFIG_PAGEFLAGS_EXTENDED=y | 141 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 154 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 142 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 155 | # CONFIG_RESOURCES_64BIT is not set | 143 | # CONFIG_RESOURCES_64BIT is not set |
| 144 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
| 156 | CONFIG_ZONE_DMA_FLAG=1 | 145 | CONFIG_ZONE_DMA_FLAG=1 |
| 157 | CONFIG_BOUNCE=y | 146 | CONFIG_BOUNCE=y |
| 158 | CONFIG_VIRT_TO_BUS=y | 147 | CONFIG_VIRT_TO_BUS=y |
| 148 | CONFIG_UNEVICTABLE_LRU=y | ||
| 159 | 149 | ||
| 160 | # | 150 | # |
| 161 | # General setup | 151 | # General setup |
| 162 | # | 152 | # |
| 163 | CONFIG_BINFMT_ELF=y | 153 | CONFIG_BINFMT_ELF=y |
| 154 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 155 | CONFIG_HAVE_AOUT=y | ||
| 164 | CONFIG_BINFMT_AOUT=m | 156 | CONFIG_BINFMT_AOUT=m |
| 165 | CONFIG_BINFMT_MISC=m | 157 | CONFIG_BINFMT_MISC=m |
| 166 | CONFIG_STRAM_PROC=y | 158 | CONFIG_STRAM_PROC=y |
| @@ -208,7 +200,6 @@ CONFIG_INET_TCP_DIAG=m | |||
| 208 | CONFIG_TCP_CONG_CUBIC=y | 200 | CONFIG_TCP_CONG_CUBIC=y |
| 209 | CONFIG_DEFAULT_TCP_CONG="cubic" | 201 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 210 | # CONFIG_TCP_MD5SIG is not set | 202 | # CONFIG_TCP_MD5SIG is not set |
| 211 | # CONFIG_IP_VS is not set | ||
| 212 | CONFIG_IPV6=m | 203 | CONFIG_IPV6=m |
| 213 | CONFIG_IPV6_PRIVACY=y | 204 | CONFIG_IPV6_PRIVACY=y |
| 214 | CONFIG_IPV6_ROUTER_PREF=y | 205 | CONFIG_IPV6_ROUTER_PREF=y |
| @@ -258,13 +249,14 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
| 258 | CONFIG_NF_CONNTRACK_SIP=m | 249 | CONFIG_NF_CONNTRACK_SIP=m |
| 259 | CONFIG_NF_CONNTRACK_TFTP=m | 250 | CONFIG_NF_CONNTRACK_TFTP=m |
| 260 | # CONFIG_NF_CT_NETLINK is not set | 251 | # CONFIG_NF_CT_NETLINK is not set |
| 252 | # CONFIG_NETFILTER_TPROXY is not set | ||
| 261 | CONFIG_NETFILTER_XTABLES=m | 253 | CONFIG_NETFILTER_XTABLES=m |
| 262 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 254 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| 263 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 255 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
| 264 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 256 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
| 265 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 257 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
| 266 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
| 267 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 258 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
| 259 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
| 268 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | 260 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m |
| 269 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m | 261 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m |
| 270 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 262 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
| @@ -278,19 +270,22 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | |||
| 278 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 270 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
| 279 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 271 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
| 280 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 272 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
| 273 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | ||
| 281 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 274 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
| 282 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | 275 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m |
| 283 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 276 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
| 284 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 277 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
| 285 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 278 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
| 286 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 279 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
| 280 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
| 287 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 281 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
| 288 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 282 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
| 289 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
| 290 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 283 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
| 291 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | 284 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m |
| 292 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | 285 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m |
| 293 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 286 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
| 287 | CONFIG_NETFILTER_XT_MATCH_RECENT=m | ||
| 288 | # CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set | ||
| 294 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 289 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
| 295 | CONFIG_NETFILTER_XT_MATCH_STATE=m | 290 | CONFIG_NETFILTER_XT_MATCH_STATE=m |
| 296 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | 291 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m |
| @@ -298,20 +293,20 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m | |||
| 298 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 293 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
| 299 | CONFIG_NETFILTER_XT_MATCH_TIME=m | 294 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
| 300 | CONFIG_NETFILTER_XT_MATCH_U32=m | 295 | CONFIG_NETFILTER_XT_MATCH_U32=m |
| 301 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 296 | # CONFIG_IP_VS is not set |
| 302 | 297 | ||
| 303 | # | 298 | # |
| 304 | # IP: Netfilter Configuration | 299 | # IP: Netfilter Configuration |
| 305 | # | 300 | # |
| 301 | CONFIG_NF_DEFRAG_IPV4=m | ||
| 306 | CONFIG_NF_CONNTRACK_IPV4=m | 302 | CONFIG_NF_CONNTRACK_IPV4=m |
| 307 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y | 303 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y |
| 308 | CONFIG_IP_NF_QUEUE=m | 304 | CONFIG_IP_NF_QUEUE=m |
| 309 | CONFIG_IP_NF_IPTABLES=m | 305 | CONFIG_IP_NF_IPTABLES=m |
| 310 | CONFIG_IP_NF_MATCH_RECENT=m | 306 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
| 311 | CONFIG_IP_NF_MATCH_ECN=m | ||
| 312 | CONFIG_IP_NF_MATCH_AH=m | 307 | CONFIG_IP_NF_MATCH_AH=m |
| 308 | CONFIG_IP_NF_MATCH_ECN=m | ||
| 313 | CONFIG_IP_NF_MATCH_TTL=m | 309 | CONFIG_IP_NF_MATCH_TTL=m |
| 314 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
| 315 | CONFIG_IP_NF_FILTER=m | 310 | CONFIG_IP_NF_FILTER=m |
| 316 | CONFIG_IP_NF_TARGET_REJECT=m | 311 | CONFIG_IP_NF_TARGET_REJECT=m |
| 317 | CONFIG_IP_NF_TARGET_LOG=m | 312 | CONFIG_IP_NF_TARGET_LOG=m |
| @@ -319,8 +314,8 @@ CONFIG_IP_NF_TARGET_ULOG=m | |||
| 319 | CONFIG_NF_NAT=m | 314 | CONFIG_NF_NAT=m |
| 320 | CONFIG_NF_NAT_NEEDED=y | 315 | CONFIG_NF_NAT_NEEDED=y |
| 321 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 316 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
| 322 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
| 323 | CONFIG_IP_NF_TARGET_NETMAP=m | 317 | CONFIG_IP_NF_TARGET_NETMAP=m |
| 318 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
| 324 | CONFIG_NF_NAT_SNMP_BASIC=m | 319 | CONFIG_NF_NAT_SNMP_BASIC=m |
| 325 | CONFIG_NF_NAT_PROTO_GRE=m | 320 | CONFIG_NF_NAT_PROTO_GRE=m |
| 326 | CONFIG_NF_NAT_PROTO_UDPLITE=m | 321 | CONFIG_NF_NAT_PROTO_UDPLITE=m |
| @@ -333,9 +328,9 @@ CONFIG_NF_NAT_PPTP=m | |||
| 333 | CONFIG_NF_NAT_H323=m | 328 | CONFIG_NF_NAT_H323=m |
| 334 | CONFIG_NF_NAT_SIP=m | 329 | CONFIG_NF_NAT_SIP=m |
| 335 | CONFIG_IP_NF_MANGLE=m | 330 | CONFIG_IP_NF_MANGLE=m |
| 331 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
| 336 | CONFIG_IP_NF_TARGET_ECN=m | 332 | CONFIG_IP_NF_TARGET_ECN=m |
| 337 | CONFIG_IP_NF_TARGET_TTL=m | 333 | CONFIG_IP_NF_TARGET_TTL=m |
| 338 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
| 339 | CONFIG_IP_NF_RAW=m | 334 | CONFIG_IP_NF_RAW=m |
| 340 | CONFIG_IP_NF_ARPTABLES=m | 335 | CONFIG_IP_NF_ARPTABLES=m |
| 341 | CONFIG_IP_NF_ARPFILTER=m | 336 | CONFIG_IP_NF_ARPFILTER=m |
| @@ -347,16 +342,16 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
| 347 | CONFIG_NF_CONNTRACK_IPV6=m | 342 | CONFIG_NF_CONNTRACK_IPV6=m |
| 348 | CONFIG_IP6_NF_QUEUE=m | 343 | CONFIG_IP6_NF_QUEUE=m |
| 349 | CONFIG_IP6_NF_IPTABLES=m | 344 | CONFIG_IP6_NF_IPTABLES=m |
| 350 | CONFIG_IP6_NF_MATCH_RT=m | 345 | CONFIG_IP6_NF_MATCH_AH=m |
| 351 | CONFIG_IP6_NF_MATCH_OPTS=m | 346 | CONFIG_IP6_NF_MATCH_EUI64=m |
| 352 | CONFIG_IP6_NF_MATCH_FRAG=m | 347 | CONFIG_IP6_NF_MATCH_FRAG=m |
| 348 | CONFIG_IP6_NF_MATCH_OPTS=m | ||
| 353 | CONFIG_IP6_NF_MATCH_HL=m | 349 | CONFIG_IP6_NF_MATCH_HL=m |
| 354 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 350 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
| 355 | CONFIG_IP6_NF_MATCH_AH=m | ||
| 356 | CONFIG_IP6_NF_MATCH_MH=m | 351 | CONFIG_IP6_NF_MATCH_MH=m |
| 357 | CONFIG_IP6_NF_MATCH_EUI64=m | 352 | CONFIG_IP6_NF_MATCH_RT=m |
| 358 | CONFIG_IP6_NF_FILTER=m | ||
| 359 | CONFIG_IP6_NF_TARGET_LOG=m | 353 | CONFIG_IP6_NF_TARGET_LOG=m |
| 354 | CONFIG_IP6_NF_FILTER=m | ||
| 360 | CONFIG_IP6_NF_TARGET_REJECT=m | 355 | CONFIG_IP6_NF_TARGET_REJECT=m |
| 361 | CONFIG_IP6_NF_MANGLE=m | 356 | CONFIG_IP6_NF_MANGLE=m |
| 362 | CONFIG_IP6_NF_TARGET_HL=m | 357 | CONFIG_IP6_NF_TARGET_HL=m |
| @@ -383,6 +378,7 @@ CONFIG_SCTP_HMAC_MD5=y | |||
| 383 | # CONFIG_TIPC is not set | 378 | # CONFIG_TIPC is not set |
| 384 | # CONFIG_ATM is not set | 379 | # CONFIG_ATM is not set |
| 385 | # CONFIG_BRIDGE is not set | 380 | # CONFIG_BRIDGE is not set |
| 381 | # CONFIG_NET_DSA is not set | ||
| 386 | # CONFIG_VLAN_8021Q is not set | 382 | # CONFIG_VLAN_8021Q is not set |
| 387 | # CONFIG_DECNET is not set | 383 | # CONFIG_DECNET is not set |
| 388 | CONFIG_LLC=m | 384 | CONFIG_LLC=m |
| @@ -406,19 +402,8 @@ CONFIG_NET_CLS_ROUTE=y | |||
| 406 | # CONFIG_IRDA is not set | 402 | # CONFIG_IRDA is not set |
| 407 | # CONFIG_BT is not set | 403 | # CONFIG_BT is not set |
| 408 | # CONFIG_AF_RXRPC is not set | 404 | # CONFIG_AF_RXRPC is not set |
| 409 | 405 | # CONFIG_PHONET is not set | |
| 410 | # | 406 | # CONFIG_WIRELESS is not set |
| 411 | # Wireless | ||
| 412 | # | ||
| 413 | # CONFIG_CFG80211 is not set | ||
| 414 | CONFIG_WIRELESS_EXT=y | ||
| 415 | # CONFIG_WIRELESS_EXT_SYSFS is not set | ||
| 416 | # CONFIG_MAC80211 is not set | ||
| 417 | CONFIG_IEEE80211=m | ||
| 418 | # CONFIG_IEEE80211_DEBUG is not set | ||
| 419 | CONFIG_IEEE80211_CRYPT_WEP=m | ||
| 420 | CONFIG_IEEE80211_CRYPT_CCMP=m | ||
| 421 | CONFIG_IEEE80211_CRYPT_TKIP=m | ||
| 422 | # CONFIG_RFKILL is not set | 407 | # CONFIG_RFKILL is not set |
| 423 | # CONFIG_NET_9P is not set | 408 | # CONFIG_NET_9P is not set |
| 424 | 409 | ||
| @@ -462,21 +447,20 @@ CONFIG_ATA_OVER_ETH=m | |||
| 462 | CONFIG_MISC_DEVICES=y | 447 | CONFIG_MISC_DEVICES=y |
| 463 | # CONFIG_EEPROM_93CX6 is not set | 448 | # CONFIG_EEPROM_93CX6 is not set |
| 464 | # CONFIG_ENCLOSURE_SERVICES is not set | 449 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 450 | # CONFIG_C2PORT is not set | ||
| 465 | CONFIG_HAVE_IDE=y | 451 | CONFIG_HAVE_IDE=y |
| 466 | CONFIG_IDE=y | 452 | CONFIG_IDE=y |
| 467 | CONFIG_BLK_DEV_IDE=y | ||
| 468 | 453 | ||
| 469 | # | 454 | # |
| 470 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | 455 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
| 471 | # | 456 | # |
| 472 | CONFIG_IDE_ATAPI=y | ||
| 473 | # CONFIG_BLK_DEV_IDE_SATA is not set | 457 | # CONFIG_BLK_DEV_IDE_SATA is not set |
| 474 | CONFIG_BLK_DEV_IDEDISK=y | 458 | CONFIG_IDE_GD=y |
| 475 | # CONFIG_IDEDISK_MULTI_MODE is not set | 459 | CONFIG_IDE_GD_ATA=y |
| 460 | # CONFIG_IDE_GD_ATAPI is not set | ||
| 476 | CONFIG_BLK_DEV_IDECD=y | 461 | CONFIG_BLK_DEV_IDECD=y |
| 477 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y | 462 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y |
| 478 | # CONFIG_BLK_DEV_IDETAPE is not set | 463 | # CONFIG_BLK_DEV_IDETAPE is not set |
| 479 | CONFIG_BLK_DEV_IDEFLOPPY=m | ||
| 480 | # CONFIG_BLK_DEV_IDESCSI is not set | 464 | # CONFIG_BLK_DEV_IDESCSI is not set |
| 481 | # CONFIG_IDE_TASK_IOCTL is not set | 465 | # CONFIG_IDE_TASK_IOCTL is not set |
| 482 | CONFIG_IDE_PROC_FS=y | 466 | CONFIG_IDE_PROC_FS=y |
| @@ -565,12 +549,15 @@ CONFIG_EQUALIZER=m | |||
| 565 | CONFIG_VETH=m | 549 | CONFIG_VETH=m |
| 566 | # CONFIG_PHYLIB is not set | 550 | # CONFIG_PHYLIB is not set |
| 567 | CONFIG_NET_ETHERNET=y | 551 | CONFIG_NET_ETHERNET=y |
| 568 | CONFIG_MII=m | 552 | CONFIG_MII=y |
| 569 | CONFIG_ATARILANCE=m | 553 | CONFIG_ATARILANCE=m |
| 570 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 554 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
| 571 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 555 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 572 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 556 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| 573 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 557 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
| 558 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
| 559 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
| 560 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
| 574 | # CONFIG_B44 is not set | 561 | # CONFIG_B44 is not set |
| 575 | # CONFIG_NET_POCKET is not set | 562 | # CONFIG_NET_POCKET is not set |
| 576 | # CONFIG_NETDEV_1000 is not set | 563 | # CONFIG_NETDEV_1000 is not set |
| @@ -644,6 +631,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y | |||
| 644 | CONFIG_MOUSE_PS2_SYNAPTICS=y | 631 | CONFIG_MOUSE_PS2_SYNAPTICS=y |
| 645 | CONFIG_MOUSE_PS2_LIFEBOOK=y | 632 | CONFIG_MOUSE_PS2_LIFEBOOK=y |
| 646 | CONFIG_MOUSE_PS2_TRACKPOINT=y | 633 | CONFIG_MOUSE_PS2_TRACKPOINT=y |
| 634 | # CONFIG_MOUSE_PS2_ELANTECH is not set | ||
| 647 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 635 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
| 648 | # CONFIG_MOUSE_SERIAL is not set | 636 | # CONFIG_MOUSE_SERIAL is not set |
| 649 | CONFIG_MOUSE_ATARI=m | 637 | CONFIG_MOUSE_ATARI=m |
| @@ -706,11 +694,11 @@ CONFIG_GEN_RTC_X=y | |||
| 706 | # CONFIG_THERMAL is not set | 694 | # CONFIG_THERMAL is not set |
| 707 | # CONFIG_THERMAL_HWMON is not set | 695 | # CONFIG_THERMAL_HWMON is not set |
| 708 | # CONFIG_WATCHDOG is not set | 696 | # CONFIG_WATCHDOG is not set |
| 697 | CONFIG_SSB_POSSIBLE=y | ||
| 709 | 698 | ||
| 710 | # | 699 | # |
| 711 | # Sonics Silicon Backplane | 700 | # Sonics Silicon Backplane |
| 712 | # | 701 | # |
| 713 | CONFIG_SSB_POSSIBLE=y | ||
| 714 | # CONFIG_SSB is not set | 702 | # CONFIG_SSB is not set |
| 715 | 703 | ||
| 716 | # | 704 | # |
| @@ -720,6 +708,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 720 | # CONFIG_MFD_SM501 is not set | 708 | # CONFIG_MFD_SM501 is not set |
| 721 | # CONFIG_HTC_PASIC3 is not set | 709 | # CONFIG_HTC_PASIC3 is not set |
| 722 | # CONFIG_MFD_TMIO is not set | 710 | # CONFIG_MFD_TMIO is not set |
| 711 | # CONFIG_REGULATOR is not set | ||
| 723 | 712 | ||
| 724 | # | 713 | # |
| 725 | # Multimedia devices | 714 | # Multimedia devices |
| @@ -745,6 +734,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 745 | CONFIG_FB=y | 734 | CONFIG_FB=y |
| 746 | # CONFIG_FIRMWARE_EDID is not set | 735 | # CONFIG_FIRMWARE_EDID is not set |
| 747 | # CONFIG_FB_DDC is not set | 736 | # CONFIG_FB_DDC is not set |
| 737 | # CONFIG_FB_BOOT_VESA_SUPPORT is not set | ||
| 748 | CONFIG_FB_CFB_FILLRECT=y | 738 | CONFIG_FB_CFB_FILLRECT=y |
| 749 | CONFIG_FB_CFB_COPYAREA=y | 739 | CONFIG_FB_CFB_COPYAREA=y |
| 750 | CONFIG_FB_CFB_IMAGEBLIT=y | 740 | CONFIG_FB_CFB_IMAGEBLIT=y |
| @@ -768,6 +758,8 @@ CONFIG_FB_ATARI=y | |||
| 768 | # CONFIG_FB_S1D13XXX is not set | 758 | # CONFIG_FB_S1D13XXX is not set |
| 769 | # CONFIG_FB_ATY is not set | 759 | # CONFIG_FB_ATY is not set |
| 770 | # CONFIG_FB_VIRTUAL is not set | 760 | # CONFIG_FB_VIRTUAL is not set |
| 761 | # CONFIG_FB_METRONOME is not set | ||
| 762 | # CONFIG_FB_MB862XX is not set | ||
| 771 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 763 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 772 | 764 | ||
| 773 | # | 765 | # |
| @@ -790,12 +782,19 @@ CONFIG_LOGO_LINUX_MONO=y | |||
| 790 | CONFIG_LOGO_LINUX_VGA16=y | 782 | CONFIG_LOGO_LINUX_VGA16=y |
| 791 | CONFIG_LOGO_LINUX_CLUT224=y | 783 | CONFIG_LOGO_LINUX_CLUT224=y |
| 792 | CONFIG_SOUND=m | 784 | CONFIG_SOUND=m |
| 785 | CONFIG_SOUND_OSS_CORE=y | ||
| 793 | CONFIG_DMASOUND_ATARI=m | 786 | CONFIG_DMASOUND_ATARI=m |
| 794 | CONFIG_DMASOUND=m | 787 | CONFIG_DMASOUND=m |
| 795 | CONFIG_HID_SUPPORT=y | 788 | CONFIG_HID_SUPPORT=y |
| 796 | CONFIG_HID=m | 789 | CONFIG_HID=m |
| 797 | # CONFIG_HID_DEBUG is not set | 790 | # CONFIG_HID_DEBUG is not set |
| 798 | CONFIG_HIDRAW=y | 791 | CONFIG_HIDRAW=y |
| 792 | # CONFIG_HID_PID is not set | ||
| 793 | |||
| 794 | # | ||
| 795 | # Special HID drivers | ||
| 796 | # | ||
| 797 | CONFIG_HID_COMPAT=y | ||
| 799 | # CONFIG_USB_SUPPORT is not set | 798 | # CONFIG_USB_SUPPORT is not set |
| 800 | # CONFIG_MMC is not set | 799 | # CONFIG_MMC is not set |
| 801 | # CONFIG_MEMSTICK is not set | 800 | # CONFIG_MEMSTICK is not set |
| @@ -805,6 +804,8 @@ CONFIG_HIDRAW=y | |||
| 805 | # CONFIG_DMADEVICES is not set | 804 | # CONFIG_DMADEVICES is not set |
| 806 | # CONFIG_AUXDISPLAY is not set | 805 | # CONFIG_AUXDISPLAY is not set |
| 807 | # CONFIG_UIO is not set | 806 | # CONFIG_UIO is not set |
| 807 | # CONFIG_STAGING is not set | ||
| 808 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 808 | 809 | ||
| 809 | # | 810 | # |
| 810 | # Character devices | 811 | # Character devices |
| @@ -821,10 +822,9 @@ CONFIG_EXT2_FS=y | |||
| 821 | # CONFIG_EXT2_FS_XIP is not set | 822 | # CONFIG_EXT2_FS_XIP is not set |
| 822 | CONFIG_EXT3_FS=y | 823 | CONFIG_EXT3_FS=y |
| 823 | # CONFIG_EXT3_FS_XATTR is not set | 824 | # CONFIG_EXT3_FS_XATTR is not set |
| 824 | CONFIG_EXT4DEV_FS=y | 825 | # CONFIG_EXT4_FS is not set |
| 825 | # CONFIG_EXT4DEV_FS_XATTR is not set | ||
| 826 | CONFIG_JBD=y | 826 | CONFIG_JBD=y |
| 827 | CONFIG_JBD2=y | 827 | CONFIG_JBD2=m |
| 828 | CONFIG_REISERFS_FS=m | 828 | CONFIG_REISERFS_FS=m |
| 829 | # CONFIG_REISERFS_CHECK is not set | 829 | # CONFIG_REISERFS_CHECK is not set |
| 830 | # CONFIG_REISERFS_PROC_INFO is not set | 830 | # CONFIG_REISERFS_PROC_INFO is not set |
| @@ -835,6 +835,7 @@ CONFIG_JFS_FS=m | |||
| 835 | # CONFIG_JFS_DEBUG is not set | 835 | # CONFIG_JFS_DEBUG is not set |
| 836 | # CONFIG_JFS_STATISTICS is not set | 836 | # CONFIG_JFS_STATISTICS is not set |
| 837 | # CONFIG_FS_POSIX_ACL is not set | 837 | # CONFIG_FS_POSIX_ACL is not set |
| 838 | CONFIG_FILE_LOCKING=y | ||
| 838 | CONFIG_XFS_FS=m | 839 | CONFIG_XFS_FS=m |
| 839 | # CONFIG_XFS_QUOTA is not set | 840 | # CONFIG_XFS_QUOTA is not set |
| 840 | # CONFIG_XFS_POSIX_ACL is not set | 841 | # CONFIG_XFS_POSIX_ACL is not set |
| @@ -846,6 +847,7 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | |||
| 846 | # CONFIG_OCFS2_FS_STATS is not set | 847 | # CONFIG_OCFS2_FS_STATS is not set |
| 847 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 848 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
| 848 | # CONFIG_OCFS2_DEBUG_FS is not set | 849 | # CONFIG_OCFS2_DEBUG_FS is not set |
| 850 | # CONFIG_OCFS2_COMPAT_JBD is not set | ||
| 849 | CONFIG_DNOTIFY=y | 851 | CONFIG_DNOTIFY=y |
| 850 | CONFIG_INOTIFY=y | 852 | CONFIG_INOTIFY=y |
| 851 | CONFIG_INOTIFY_USER=y | 853 | CONFIG_INOTIFY_USER=y |
| @@ -884,6 +886,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
| 884 | CONFIG_PROC_FS=y | 886 | CONFIG_PROC_FS=y |
| 885 | CONFIG_PROC_KCORE=y | 887 | CONFIG_PROC_KCORE=y |
| 886 | CONFIG_PROC_SYSCTL=y | 888 | CONFIG_PROC_SYSCTL=y |
| 889 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 887 | CONFIG_SYSFS=y | 890 | CONFIG_SYSFS=y |
| 888 | CONFIG_TMPFS=y | 891 | CONFIG_TMPFS=y |
| 889 | # CONFIG_TMPFS_POSIX_ACL is not set | 892 | # CONFIG_TMPFS_POSIX_ACL is not set |
| @@ -925,6 +928,7 @@ CONFIG_LOCKD_V4=y | |||
| 925 | CONFIG_EXPORTFS=m | 928 | CONFIG_EXPORTFS=m |
| 926 | CONFIG_NFS_COMMON=y | 929 | CONFIG_NFS_COMMON=y |
| 927 | CONFIG_SUNRPC=m | 930 | CONFIG_SUNRPC=m |
| 931 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
| 928 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 932 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 929 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 933 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 930 | CONFIG_SMB_FS=m | 934 | CONFIG_SMB_FS=m |
| @@ -998,7 +1002,13 @@ CONFIG_MAGIC_SYSRQ=y | |||
| 998 | # CONFIG_DEBUG_KERNEL is not set | 1002 | # CONFIG_DEBUG_KERNEL is not set |
| 999 | CONFIG_DEBUG_BUGVERBOSE=y | 1003 | CONFIG_DEBUG_BUGVERBOSE=y |
| 1000 | CONFIG_DEBUG_MEMORY_INIT=y | 1004 | CONFIG_DEBUG_MEMORY_INIT=y |
| 1005 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
| 1001 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1006 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
| 1007 | |||
| 1008 | # | ||
| 1009 | # Tracers | ||
| 1010 | # | ||
| 1011 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
| 1002 | # CONFIG_SAMPLES is not set | 1012 | # CONFIG_SAMPLES is not set |
| 1003 | 1013 | ||
| 1004 | # | 1014 | # |
| @@ -1006,6 +1016,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y | |||
| 1006 | # | 1016 | # |
| 1007 | # CONFIG_KEYS is not set | 1017 | # CONFIG_KEYS is not set |
| 1008 | # CONFIG_SECURITY is not set | 1018 | # CONFIG_SECURITY is not set |
| 1019 | # CONFIG_SECURITYFS is not set | ||
| 1009 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1020 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1010 | CONFIG_XOR_BLOCKS=m | 1021 | CONFIG_XOR_BLOCKS=m |
| 1011 | CONFIG_ASYNC_CORE=m | 1022 | CONFIG_ASYNC_CORE=m |
| @@ -1016,10 +1027,12 @@ CONFIG_CRYPTO=y | |||
| 1016 | # | 1027 | # |
| 1017 | # Crypto core or helper | 1028 | # Crypto core or helper |
| 1018 | # | 1029 | # |
| 1030 | # CONFIG_CRYPTO_FIPS is not set | ||
| 1019 | CONFIG_CRYPTO_ALGAPI=y | 1031 | CONFIG_CRYPTO_ALGAPI=y |
| 1020 | CONFIG_CRYPTO_AEAD=m | 1032 | CONFIG_CRYPTO_AEAD=y |
| 1021 | CONFIG_CRYPTO_BLKCIPHER=m | 1033 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1022 | CONFIG_CRYPTO_HASH=y | 1034 | CONFIG_CRYPTO_HASH=y |
| 1035 | CONFIG_CRYPTO_RNG=y | ||
| 1023 | CONFIG_CRYPTO_MANAGER=y | 1036 | CONFIG_CRYPTO_MANAGER=y |
| 1024 | CONFIG_CRYPTO_GF128MUL=m | 1037 | CONFIG_CRYPTO_GF128MUL=m |
| 1025 | CONFIG_CRYPTO_NULL=m | 1038 | CONFIG_CRYPTO_NULL=m |
| @@ -1093,14 +1106,17 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m | |||
| 1093 | # | 1106 | # |
| 1094 | CONFIG_CRYPTO_DEFLATE=m | 1107 | CONFIG_CRYPTO_DEFLATE=m |
| 1095 | CONFIG_CRYPTO_LZO=m | 1108 | CONFIG_CRYPTO_LZO=m |
| 1109 | |||
| 1110 | # | ||
| 1111 | # Random Number Generation | ||
| 1112 | # | ||
| 1113 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
| 1096 | # CONFIG_CRYPTO_HW is not set | 1114 | # CONFIG_CRYPTO_HW is not set |
| 1097 | 1115 | ||
| 1098 | # | 1116 | # |
| 1099 | # Library routines | 1117 | # Library routines |
| 1100 | # | 1118 | # |
| 1101 | CONFIG_BITREVERSE=y | 1119 | CONFIG_BITREVERSE=y |
| 1102 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1103 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
| 1104 | CONFIG_CRC_CCITT=m | 1120 | CONFIG_CRC_CCITT=m |
| 1105 | CONFIG_CRC16=y | 1121 | CONFIG_CRC16=y |
| 1106 | CONFIG_CRC_T10DIF=y | 1122 | CONFIG_CRC_T10DIF=y |
diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6000_defconfig index 2e44af0fe54a..d3d9814a91de 100644 --- a/arch/m68k/configs/bvme6000_defconfig +++ b/arch/m68k/configs/bvme6000_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.27-rc6 | 3 | # Linux kernel version: 2.6.28-rc7 |
| 4 | # Wed Sep 10 09:02:03 2008 | 4 | # Tue Dec 2 20:27:45 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -14,7 +14,6 @@ CONFIG_TIME_LOW_RES=y | |||
| 14 | CONFIG_GENERIC_IOMAP=y | 14 | CONFIG_GENERIC_IOMAP=y |
| 15 | CONFIG_NO_IOPORT=y | 15 | CONFIG_NO_IOPORT=y |
| 16 | # CONFIG_NO_DMA is not set | 16 | # CONFIG_NO_DMA is not set |
| 17 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
| 18 | CONFIG_HZ=100 | 17 | CONFIG_HZ=100 |
| 19 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 18 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 20 | 19 | ||
| @@ -67,22 +66,13 @@ CONFIG_SIGNALFD=y | |||
| 67 | CONFIG_TIMERFD=y | 66 | CONFIG_TIMERFD=y |
| 68 | CONFIG_EVENTFD=y | 67 | CONFIG_EVENTFD=y |
| 69 | CONFIG_SHMEM=y | 68 | CONFIG_SHMEM=y |
| 69 | CONFIG_AIO=y | ||
| 70 | CONFIG_VM_EVENT_COUNTERS=y | 70 | CONFIG_VM_EVENT_COUNTERS=y |
| 71 | CONFIG_SLAB=y | 71 | CONFIG_SLAB=y |
| 72 | # CONFIG_SLUB is not set | 72 | # CONFIG_SLUB is not set |
| 73 | # CONFIG_SLOB is not set | 73 | # CONFIG_SLOB is not set |
| 74 | # CONFIG_PROFILING is not set | 74 | # CONFIG_PROFILING is not set |
| 75 | # CONFIG_MARKERS is not set | 75 | # CONFIG_MARKERS is not set |
| 76 | # CONFIG_HAVE_OPROFILE is not set | ||
| 77 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
| 78 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
| 79 | # CONFIG_HAVE_KPROBES is not set | ||
| 80 | # CONFIG_HAVE_KRETPROBES is not set | ||
| 81 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
| 82 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 83 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 84 | # CONFIG_HAVE_CLK is not set | ||
| 85 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 86 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 76 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 87 | CONFIG_SLABINFO=y | 77 | CONFIG_SLABINFO=y |
| 88 | CONFIG_RT_MUTEXES=y | 78 | CONFIG_RT_MUTEXES=y |
| @@ -115,11 +105,11 @@ CONFIG_DEFAULT_AS=y | |||
| 115 | # CONFIG_DEFAULT_NOOP is not set | 105 | # CONFIG_DEFAULT_NOOP is not set |
| 116 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 106 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 117 | CONFIG_CLASSIC_RCU=y | 107 | CONFIG_CLASSIC_RCU=y |
| 108 | # CONFIG_FREEZER is not set | ||
| 118 | 109 | ||
| 119 | # | 110 | # |
| 120 | # Platform dependent setup | 111 | # Platform dependent setup |
| 121 | # | 112 | # |
| 122 | # CONFIG_SUN3 is not set | ||
| 123 | # CONFIG_AMIGA is not set | 113 | # CONFIG_AMIGA is not set |
| 124 | # CONFIG_ATARI is not set | 114 | # CONFIG_ATARI is not set |
| 125 | # CONFIG_MAC is not set | 115 | # CONFIG_MAC is not set |
| @@ -151,19 +141,21 @@ CONFIG_DISCONTIGMEM_MANUAL=y | |||
| 151 | CONFIG_DISCONTIGMEM=y | 141 | CONFIG_DISCONTIGMEM=y |
| 152 | CONFIG_FLAT_NODE_MEM_MAP=y | 142 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 153 | CONFIG_NEED_MULTIPLE_NODES=y | 143 | CONFIG_NEED_MULTIPLE_NODES=y |
| 154 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 155 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 156 | CONFIG_PAGEFLAGS_EXTENDED=y | 144 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 157 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 145 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 158 | # CONFIG_RESOURCES_64BIT is not set | 146 | # CONFIG_RESOURCES_64BIT is not set |
| 147 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
| 159 | CONFIG_ZONE_DMA_FLAG=1 | 148 | CONFIG_ZONE_DMA_FLAG=1 |
| 160 | CONFIG_BOUNCE=y | 149 | CONFIG_BOUNCE=y |
| 161 | CONFIG_VIRT_TO_BUS=y | 150 | CONFIG_VIRT_TO_BUS=y |
| 151 | CONFIG_UNEVICTABLE_LRU=y | ||
| 162 | 152 | ||
| 163 | # | 153 | # |
| 164 | # General setup | 154 | # General setup |
| 165 | # | 155 | # |
| 166 | CONFIG_BINFMT_ELF=y | 156 | CONFIG_BINFMT_ELF=y |
| 157 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 158 | CONFIG_HAVE_AOUT=y | ||
| 167 | CONFIG_BINFMT_AOUT=m | 159 | CONFIG_BINFMT_AOUT=m |
| 168 | CONFIG_BINFMT_MISC=m | 160 | CONFIG_BINFMT_MISC=m |
| 169 | CONFIG_PROC_HARDWARE=y | 161 | CONFIG_PROC_HARDWARE=y |
| @@ -212,7 +204,6 @@ CONFIG_INET_TCP_DIAG=m | |||
| 212 | CONFIG_TCP_CONG_CUBIC=y | 204 | CONFIG_TCP_CONG_CUBIC=y |
| 213 | CONFIG_DEFAULT_TCP_CONG="cubic" | 205 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 214 | # CONFIG_TCP_MD5SIG is not set | 206 | # CONFIG_TCP_MD5SIG is not set |
| 215 | # CONFIG_IP_VS is not set | ||
| 216 | CONFIG_IPV6=m | 207 | CONFIG_IPV6=m |
| 217 | CONFIG_IPV6_PRIVACY=y | 208 | CONFIG_IPV6_PRIVACY=y |
| 218 | CONFIG_IPV6_ROUTER_PREF=y | 209 | CONFIG_IPV6_ROUTER_PREF=y |
| @@ -262,13 +253,14 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
| 262 | CONFIG_NF_CONNTRACK_SIP=m | 253 | CONFIG_NF_CONNTRACK_SIP=m |
| 263 | CONFIG_NF_CONNTRACK_TFTP=m | 254 | CONFIG_NF_CONNTRACK_TFTP=m |
| 264 | # CONFIG_NF_CT_NETLINK is not set | 255 | # CONFIG_NF_CT_NETLINK is not set |
| 256 | # CONFIG_NETFILTER_TPROXY is not set | ||
| 265 | CONFIG_NETFILTER_XTABLES=m | 257 | CONFIG_NETFILTER_XTABLES=m |
| 266 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 258 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| 267 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 259 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
| 268 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 260 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
| 269 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 261 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
| 270 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
| 271 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 262 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
| 263 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
| 272 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | 264 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m |
| 273 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m | 265 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m |
| 274 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 266 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
| @@ -282,19 +274,22 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | |||
| 282 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 274 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
| 283 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 275 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
| 284 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 276 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
| 277 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | ||
| 285 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 278 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
| 286 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | 279 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m |
| 287 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 280 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
| 288 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 281 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
| 289 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 282 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
| 290 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 283 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
| 284 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
| 291 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 285 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
| 292 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 286 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
| 293 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
| 294 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 287 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
| 295 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | 288 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m |
| 296 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | 289 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m |
| 297 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 290 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
| 291 | CONFIG_NETFILTER_XT_MATCH_RECENT=m | ||
| 292 | # CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set | ||
| 298 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 293 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
| 299 | CONFIG_NETFILTER_XT_MATCH_STATE=m | 294 | CONFIG_NETFILTER_XT_MATCH_STATE=m |
| 300 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | 295 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m |
| @@ -302,20 +297,20 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m | |||
| 302 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 297 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
| 303 | CONFIG_NETFILTER_XT_MATCH_TIME=m | 298 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
| 304 | CONFIG_NETFILTER_XT_MATCH_U32=m | 299 | CONFIG_NETFILTER_XT_MATCH_U32=m |
| 305 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 300 | # CONFIG_IP_VS is not set |
| 306 | 301 | ||
| 307 | # | 302 | # |
| 308 | # IP: Netfilter Configuration | 303 | # IP: Netfilter Configuration |
| 309 | # | 304 | # |
| 305 | CONFIG_NF_DEFRAG_IPV4=m | ||
| 310 | CONFIG_NF_CONNTRACK_IPV4=m | 306 | CONFIG_NF_CONNTRACK_IPV4=m |
| 311 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y | 307 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y |
| 312 | CONFIG_IP_NF_QUEUE=m | 308 | CONFIG_IP_NF_QUEUE=m |
| 313 | CONFIG_IP_NF_IPTABLES=m | 309 | CONFIG_IP_NF_IPTABLES=m |
| 314 | CONFIG_IP_NF_MATCH_RECENT=m | 310 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
| 315 | CONFIG_IP_NF_MATCH_ECN=m | ||
| 316 | CONFIG_IP_NF_MATCH_AH=m | 311 | CONFIG_IP_NF_MATCH_AH=m |
| 312 | CONFIG_IP_NF_MATCH_ECN=m | ||
| 317 | CONFIG_IP_NF_MATCH_TTL=m | 313 | CONFIG_IP_NF_MATCH_TTL=m |
| 318 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
| 319 | CONFIG_IP_NF_FILTER=m | 314 | CONFIG_IP_NF_FILTER=m |
| 320 | CONFIG_IP_NF_TARGET_REJECT=m | 315 | CONFIG_IP_NF_TARGET_REJECT=m |
| 321 | CONFIG_IP_NF_TARGET_LOG=m | 316 | CONFIG_IP_NF_TARGET_LOG=m |
| @@ -323,8 +318,8 @@ CONFIG_IP_NF_TARGET_ULOG=m | |||
| 323 | CONFIG_NF_NAT=m | 318 | CONFIG_NF_NAT=m |
| 324 | CONFIG_NF_NAT_NEEDED=y | 319 | CONFIG_NF_NAT_NEEDED=y |
| 325 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 320 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
| 326 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
| 327 | CONFIG_IP_NF_TARGET_NETMAP=m | 321 | CONFIG_IP_NF_TARGET_NETMAP=m |
| 322 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
| 328 | CONFIG_NF_NAT_SNMP_BASIC=m | 323 | CONFIG_NF_NAT_SNMP_BASIC=m |
| 329 | CONFIG_NF_NAT_PROTO_GRE=m | 324 | CONFIG_NF_NAT_PROTO_GRE=m |
| 330 | CONFIG_NF_NAT_PROTO_UDPLITE=m | 325 | CONFIG_NF_NAT_PROTO_UDPLITE=m |
| @@ -337,9 +332,9 @@ CONFIG_NF_NAT_PPTP=m | |||
| 337 | CONFIG_NF_NAT_H323=m | 332 | CONFIG_NF_NAT_H323=m |
| 338 | CONFIG_NF_NAT_SIP=m | 333 | CONFIG_NF_NAT_SIP=m |
| 339 | CONFIG_IP_NF_MANGLE=m | 334 | CONFIG_IP_NF_MANGLE=m |
| 335 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
| 340 | CONFIG_IP_NF_TARGET_ECN=m | 336 | CONFIG_IP_NF_TARGET_ECN=m |
| 341 | CONFIG_IP_NF_TARGET_TTL=m | 337 | CONFIG_IP_NF_TARGET_TTL=m |
| 342 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
| 343 | CONFIG_IP_NF_RAW=m | 338 | CONFIG_IP_NF_RAW=m |
| 344 | CONFIG_IP_NF_ARPTABLES=m | 339 | CONFIG_IP_NF_ARPTABLES=m |
| 345 | CONFIG_IP_NF_ARPFILTER=m | 340 | CONFIG_IP_NF_ARPFILTER=m |
| @@ -351,16 +346,16 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
| 351 | CONFIG_NF_CONNTRACK_IPV6=m | 346 | CONFIG_NF_CONNTRACK_IPV6=m |
| 352 | CONFIG_IP6_NF_QUEUE=m | 347 | CONFIG_IP6_NF_QUEUE=m |
| 353 | CONFIG_IP6_NF_IPTABLES=m | 348 | CONFIG_IP6_NF_IPTABLES=m |
| 354 | CONFIG_IP6_NF_MATCH_RT=m | 349 | CONFIG_IP6_NF_MATCH_AH=m |
| 355 | CONFIG_IP6_NF_MATCH_OPTS=m | 350 | CONFIG_IP6_NF_MATCH_EUI64=m |
| 356 | CONFIG_IP6_NF_MATCH_FRAG=m | 351 | CONFIG_IP6_NF_MATCH_FRAG=m |
| 352 | CONFIG_IP6_NF_MATCH_OPTS=m | ||
| 357 | CONFIG_IP6_NF_MATCH_HL=m | 353 | CONFIG_IP6_NF_MATCH_HL=m |
| 358 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 354 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
| 359 | CONFIG_IP6_NF_MATCH_AH=m | ||
| 360 | CONFIG_IP6_NF_MATCH_MH=m | 355 | CONFIG_IP6_NF_MATCH_MH=m |
| 361 | CONFIG_IP6_NF_MATCH_EUI64=m | 356 | CONFIG_IP6_NF_MATCH_RT=m |
| 362 | CONFIG_IP6_NF_FILTER=m | ||
| 363 | CONFIG_IP6_NF_TARGET_LOG=m | 357 | CONFIG_IP6_NF_TARGET_LOG=m |
| 358 | CONFIG_IP6_NF_FILTER=m | ||
| 364 | CONFIG_IP6_NF_TARGET_REJECT=m | 359 | CONFIG_IP6_NF_TARGET_REJECT=m |
| 365 | CONFIG_IP6_NF_MANGLE=m | 360 | CONFIG_IP6_NF_MANGLE=m |
| 366 | CONFIG_IP6_NF_TARGET_HL=m | 361 | CONFIG_IP6_NF_TARGET_HL=m |
| @@ -387,6 +382,7 @@ CONFIG_SCTP_HMAC_MD5=y | |||
| 387 | # CONFIG_TIPC is not set | 382 | # CONFIG_TIPC is not set |
| 388 | # CONFIG_ATM is not set | 383 | # CONFIG_ATM is not set |
| 389 | # CONFIG_BRIDGE is not set | 384 | # CONFIG_BRIDGE is not set |
| 385 | # CONFIG_NET_DSA is not set | ||
| 390 | # CONFIG_VLAN_8021Q is not set | 386 | # CONFIG_VLAN_8021Q is not set |
| 391 | # CONFIG_DECNET is not set | 387 | # CONFIG_DECNET is not set |
| 392 | CONFIG_LLC=m | 388 | CONFIG_LLC=m |
| @@ -410,19 +406,8 @@ CONFIG_NET_CLS_ROUTE=y | |||
| 410 | # CONFIG_IRDA is not set | 406 | # CONFIG_IRDA is not set |
| 411 | # CONFIG_BT is not set | 407 | # CONFIG_BT is not set |
| 412 | # CONFIG_AF_RXRPC is not set | 408 | # CONFIG_AF_RXRPC is not set |
| 413 | 409 | # CONFIG_PHONET is not set | |
| 414 | # | 410 | # CONFIG_WIRELESS is not set |
| 415 | # Wireless | ||
| 416 | # | ||
| 417 | # CONFIG_CFG80211 is not set | ||
| 418 | CONFIG_WIRELESS_EXT=y | ||
| 419 | # CONFIG_WIRELESS_EXT_SYSFS is not set | ||
| 420 | # CONFIG_MAC80211 is not set | ||
| 421 | CONFIG_IEEE80211=m | ||
| 422 | # CONFIG_IEEE80211_DEBUG is not set | ||
| 423 | CONFIG_IEEE80211_CRYPT_WEP=m | ||
| 424 | CONFIG_IEEE80211_CRYPT_CCMP=m | ||
| 425 | CONFIG_IEEE80211_CRYPT_TKIP=m | ||
| 426 | # CONFIG_RFKILL is not set | 411 | # CONFIG_RFKILL is not set |
| 427 | # CONFIG_NET_9P is not set | 412 | # CONFIG_NET_9P is not set |
| 428 | 413 | ||
| @@ -460,6 +445,7 @@ CONFIG_ATA_OVER_ETH=m | |||
| 460 | CONFIG_MISC_DEVICES=y | 445 | CONFIG_MISC_DEVICES=y |
| 461 | # CONFIG_EEPROM_93CX6 is not set | 446 | # CONFIG_EEPROM_93CX6 is not set |
| 462 | # CONFIG_ENCLOSURE_SERVICES is not set | 447 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 448 | # CONFIG_C2PORT is not set | ||
| 463 | CONFIG_HAVE_IDE=y | 449 | CONFIG_HAVE_IDE=y |
| 464 | # CONFIG_IDE is not set | 450 | # CONFIG_IDE is not set |
| 465 | 451 | ||
| @@ -545,6 +531,9 @@ CONFIG_BVME6000_NET=y | |||
| 545 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 531 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 546 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 532 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| 547 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 533 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
| 534 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
| 535 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
| 536 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
| 548 | # CONFIG_B44 is not set | 537 | # CONFIG_B44 is not set |
| 549 | # CONFIG_NETDEV_1000 is not set | 538 | # CONFIG_NETDEV_1000 is not set |
| 550 | # CONFIG_NETDEV_10000 is not set | 539 | # CONFIG_NETDEV_10000 is not set |
| @@ -614,6 +603,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y | |||
| 614 | CONFIG_MOUSE_PS2_SYNAPTICS=y | 603 | CONFIG_MOUSE_PS2_SYNAPTICS=y |
| 615 | CONFIG_MOUSE_PS2_LIFEBOOK=y | 604 | CONFIG_MOUSE_PS2_LIFEBOOK=y |
| 616 | CONFIG_MOUSE_PS2_TRACKPOINT=y | 605 | CONFIG_MOUSE_PS2_TRACKPOINT=y |
| 606 | # CONFIG_MOUSE_PS2_ELANTECH is not set | ||
| 617 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 607 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
| 618 | CONFIG_MOUSE_SERIAL=m | 608 | CONFIG_MOUSE_SERIAL=m |
| 619 | # CONFIG_MOUSE_VSXXXAA is not set | 609 | # CONFIG_MOUSE_VSXXXAA is not set |
| @@ -668,11 +658,11 @@ CONFIG_GEN_RTC_X=y | |||
| 668 | # CONFIG_THERMAL is not set | 658 | # CONFIG_THERMAL is not set |
| 669 | # CONFIG_THERMAL_HWMON is not set | 659 | # CONFIG_THERMAL_HWMON is not set |
| 670 | # CONFIG_WATCHDOG is not set | 660 | # CONFIG_WATCHDOG is not set |
| 661 | CONFIG_SSB_POSSIBLE=y | ||
| 671 | 662 | ||
| 672 | # | 663 | # |
| 673 | # Sonics Silicon Backplane | 664 | # Sonics Silicon Backplane |
| 674 | # | 665 | # |
| 675 | CONFIG_SSB_POSSIBLE=y | ||
| 676 | # CONFIG_SSB is not set | 666 | # CONFIG_SSB is not set |
| 677 | 667 | ||
| 678 | # | 668 | # |
| @@ -682,6 +672,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 682 | # CONFIG_MFD_SM501 is not set | 672 | # CONFIG_MFD_SM501 is not set |
| 683 | # CONFIG_HTC_PASIC3 is not set | 673 | # CONFIG_HTC_PASIC3 is not set |
| 684 | # CONFIG_MFD_TMIO is not set | 674 | # CONFIG_MFD_TMIO is not set |
| 675 | # CONFIG_REGULATOR is not set | ||
| 685 | 676 | ||
| 686 | # | 677 | # |
| 687 | # Multimedia devices | 678 | # Multimedia devices |
| @@ -721,6 +712,12 @@ CONFIG_HID_SUPPORT=y | |||
| 721 | CONFIG_HID=m | 712 | CONFIG_HID=m |
| 722 | # CONFIG_HID_DEBUG is not set | 713 | # CONFIG_HID_DEBUG is not set |
| 723 | CONFIG_HIDRAW=y | 714 | CONFIG_HIDRAW=y |
| 715 | # CONFIG_HID_PID is not set | ||
| 716 | |||
| 717 | # | ||
| 718 | # Special HID drivers | ||
| 719 | # | ||
| 720 | CONFIG_HID_COMPAT=y | ||
| 724 | # CONFIG_USB_SUPPORT is not set | 721 | # CONFIG_USB_SUPPORT is not set |
| 725 | # CONFIG_MMC is not set | 722 | # CONFIG_MMC is not set |
| 726 | # CONFIG_MEMSTICK is not set | 723 | # CONFIG_MEMSTICK is not set |
| @@ -729,6 +726,8 @@ CONFIG_HIDRAW=y | |||
| 729 | # CONFIG_RTC_CLASS is not set | 726 | # CONFIG_RTC_CLASS is not set |
| 730 | # CONFIG_DMADEVICES is not set | 727 | # CONFIG_DMADEVICES is not set |
| 731 | # CONFIG_UIO is not set | 728 | # CONFIG_UIO is not set |
| 729 | # CONFIG_STAGING is not set | ||
| 730 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 732 | 731 | ||
| 733 | # | 732 | # |
| 734 | # Character devices | 733 | # Character devices |
| @@ -744,8 +743,9 @@ CONFIG_EXT2_FS=y | |||
| 744 | # CONFIG_EXT2_FS_XIP is not set | 743 | # CONFIG_EXT2_FS_XIP is not set |
| 745 | CONFIG_EXT3_FS=y | 744 | CONFIG_EXT3_FS=y |
| 746 | # CONFIG_EXT3_FS_XATTR is not set | 745 | # CONFIG_EXT3_FS_XATTR is not set |
| 747 | # CONFIG_EXT4DEV_FS is not set | 746 | # CONFIG_EXT4_FS is not set |
| 748 | CONFIG_JBD=y | 747 | CONFIG_JBD=y |
| 748 | CONFIG_JBD2=m | ||
| 749 | CONFIG_REISERFS_FS=m | 749 | CONFIG_REISERFS_FS=m |
| 750 | # CONFIG_REISERFS_CHECK is not set | 750 | # CONFIG_REISERFS_CHECK is not set |
| 751 | # CONFIG_REISERFS_PROC_INFO is not set | 751 | # CONFIG_REISERFS_PROC_INFO is not set |
| @@ -756,6 +756,7 @@ CONFIG_JFS_FS=m | |||
| 756 | # CONFIG_JFS_DEBUG is not set | 756 | # CONFIG_JFS_DEBUG is not set |
| 757 | # CONFIG_JFS_STATISTICS is not set | 757 | # CONFIG_JFS_STATISTICS is not set |
| 758 | # CONFIG_FS_POSIX_ACL is not set | 758 | # CONFIG_FS_POSIX_ACL is not set |
| 759 | CONFIG_FILE_LOCKING=y | ||
| 759 | CONFIG_XFS_FS=m | 760 | CONFIG_XFS_FS=m |
| 760 | # CONFIG_XFS_QUOTA is not set | 761 | # CONFIG_XFS_QUOTA is not set |
| 761 | # CONFIG_XFS_POSIX_ACL is not set | 762 | # CONFIG_XFS_POSIX_ACL is not set |
| @@ -767,6 +768,7 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | |||
| 767 | # CONFIG_OCFS2_FS_STATS is not set | 768 | # CONFIG_OCFS2_FS_STATS is not set |
| 768 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 769 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
| 769 | # CONFIG_OCFS2_DEBUG_FS is not set | 770 | # CONFIG_OCFS2_DEBUG_FS is not set |
| 771 | # CONFIG_OCFS2_COMPAT_JBD is not set | ||
| 770 | CONFIG_DNOTIFY=y | 772 | CONFIG_DNOTIFY=y |
| 771 | CONFIG_INOTIFY=y | 773 | CONFIG_INOTIFY=y |
| 772 | CONFIG_INOTIFY_USER=y | 774 | CONFIG_INOTIFY_USER=y |
| @@ -805,6 +807,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
| 805 | CONFIG_PROC_FS=y | 807 | CONFIG_PROC_FS=y |
| 806 | CONFIG_PROC_KCORE=y | 808 | CONFIG_PROC_KCORE=y |
| 807 | CONFIG_PROC_SYSCTL=y | 809 | CONFIG_PROC_SYSCTL=y |
| 810 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 808 | CONFIG_SYSFS=y | 811 | CONFIG_SYSFS=y |
| 809 | CONFIG_TMPFS=y | 812 | CONFIG_TMPFS=y |
| 810 | # CONFIG_TMPFS_POSIX_ACL is not set | 813 | # CONFIG_TMPFS_POSIX_ACL is not set |
| @@ -848,6 +851,7 @@ CONFIG_EXPORTFS=m | |||
| 848 | CONFIG_NFS_COMMON=y | 851 | CONFIG_NFS_COMMON=y |
| 849 | CONFIG_SUNRPC=y | 852 | CONFIG_SUNRPC=y |
| 850 | CONFIG_SUNRPC_GSS=y | 853 | CONFIG_SUNRPC_GSS=y |
| 854 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
| 851 | CONFIG_RPCSEC_GSS_KRB5=y | 855 | CONFIG_RPCSEC_GSS_KRB5=y |
| 852 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 856 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 853 | CONFIG_SMB_FS=m | 857 | CONFIG_SMB_FS=m |
| @@ -921,7 +925,13 @@ CONFIG_MAGIC_SYSRQ=y | |||
| 921 | # CONFIG_DEBUG_KERNEL is not set | 925 | # CONFIG_DEBUG_KERNEL is not set |
| 922 | CONFIG_DEBUG_BUGVERBOSE=y | 926 | CONFIG_DEBUG_BUGVERBOSE=y |
| 923 | CONFIG_DEBUG_MEMORY_INIT=y | 927 | CONFIG_DEBUG_MEMORY_INIT=y |
| 928 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
| 924 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 929 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
| 930 | |||
| 931 | # | ||
| 932 | # Tracers | ||
| 933 | # | ||
| 934 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
| 925 | # CONFIG_SAMPLES is not set | 935 | # CONFIG_SAMPLES is not set |
| 926 | 936 | ||
| 927 | # | 937 | # |
| @@ -929,6 +939,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y | |||
| 929 | # | 939 | # |
| 930 | # CONFIG_KEYS is not set | 940 | # CONFIG_KEYS is not set |
| 931 | # CONFIG_SECURITY is not set | 941 | # CONFIG_SECURITY is not set |
| 942 | # CONFIG_SECURITYFS is not set | ||
| 932 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 943 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 933 | CONFIG_XOR_BLOCKS=m | 944 | CONFIG_XOR_BLOCKS=m |
| 934 | CONFIG_ASYNC_CORE=m | 945 | CONFIG_ASYNC_CORE=m |
| @@ -939,10 +950,12 @@ CONFIG_CRYPTO=y | |||
| 939 | # | 950 | # |
| 940 | # Crypto core or helper | 951 | # Crypto core or helper |
| 941 | # | 952 | # |
| 953 | # CONFIG_CRYPTO_FIPS is not set | ||
| 942 | CONFIG_CRYPTO_ALGAPI=y | 954 | CONFIG_CRYPTO_ALGAPI=y |
| 943 | CONFIG_CRYPTO_AEAD=m | 955 | CONFIG_CRYPTO_AEAD=y |
| 944 | CONFIG_CRYPTO_BLKCIPHER=y | 956 | CONFIG_CRYPTO_BLKCIPHER=y |
| 945 | CONFIG_CRYPTO_HASH=y | 957 | CONFIG_CRYPTO_HASH=y |
| 958 | CONFIG_CRYPTO_RNG=y | ||
| 946 | CONFIG_CRYPTO_MANAGER=y | 959 | CONFIG_CRYPTO_MANAGER=y |
| 947 | CONFIG_CRYPTO_GF128MUL=m | 960 | CONFIG_CRYPTO_GF128MUL=m |
| 948 | CONFIG_CRYPTO_NULL=m | 961 | CONFIG_CRYPTO_NULL=m |
| @@ -1016,14 +1029,17 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m | |||
| 1016 | # | 1029 | # |
| 1017 | CONFIG_CRYPTO_DEFLATE=m | 1030 | CONFIG_CRYPTO_DEFLATE=m |
| 1018 | CONFIG_CRYPTO_LZO=m | 1031 | CONFIG_CRYPTO_LZO=m |
| 1032 | |||
| 1033 | # | ||
| 1034 | # Random Number Generation | ||
| 1035 | # | ||
| 1036 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
| 1019 | # CONFIG_CRYPTO_HW is not set | 1037 | # CONFIG_CRYPTO_HW is not set |
| 1020 | 1038 | ||
| 1021 | # | 1039 | # |
| 1022 | # Library routines | 1040 | # Library routines |
| 1023 | # | 1041 | # |
| 1024 | CONFIG_BITREVERSE=m | 1042 | CONFIG_BITREVERSE=m |
| 1025 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1026 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
| 1027 | CONFIG_CRC_CCITT=m | 1043 | CONFIG_CRC_CCITT=m |
| 1028 | CONFIG_CRC16=m | 1044 | CONFIG_CRC16=m |
| 1029 | CONFIG_CRC_T10DIF=y | 1045 | CONFIG_CRC_T10DIF=y |
diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_defconfig index 3570fc89b089..5556ef088d04 100644 --- a/arch/m68k/configs/hp300_defconfig +++ b/arch/m68k/configs/hp300_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.27-rc6 | 3 | # Linux kernel version: 2.6.28-rc7 |
| 4 | # Wed Sep 10 09:02:04 2008 | 4 | # Tue Dec 2 20:27:46 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -14,7 +14,6 @@ CONFIG_TIME_LOW_RES=y | |||
| 14 | CONFIG_GENERIC_IOMAP=y | 14 | CONFIG_GENERIC_IOMAP=y |
| 15 | CONFIG_NO_IOPORT=y | 15 | CONFIG_NO_IOPORT=y |
| 16 | # CONFIG_NO_DMA is not set | 16 | # CONFIG_NO_DMA is not set |
| 17 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
| 18 | CONFIG_HZ=100 | 17 | CONFIG_HZ=100 |
| 19 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 18 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 20 | 19 | ||
| @@ -67,22 +66,13 @@ CONFIG_SIGNALFD=y | |||
| 67 | CONFIG_TIMERFD=y | 66 | CONFIG_TIMERFD=y |
| 68 | CONFIG_EVENTFD=y | 67 | CONFIG_EVENTFD=y |
| 69 | CONFIG_SHMEM=y | 68 | CONFIG_SHMEM=y |
| 69 | CONFIG_AIO=y | ||
| 70 | CONFIG_VM_EVENT_COUNTERS=y | 70 | CONFIG_VM_EVENT_COUNTERS=y |
| 71 | CONFIG_SLAB=y | 71 | CONFIG_SLAB=y |
| 72 | # CONFIG_SLUB is not set | 72 | # CONFIG_SLUB is not set |
| 73 | # CONFIG_SLOB is not set | 73 | # CONFIG_SLOB is not set |
| 74 | # CONFIG_PROFILING is not set | 74 | # CONFIG_PROFILING is not set |
| 75 | # CONFIG_MARKERS is not set | 75 | # CONFIG_MARKERS is not set |
| 76 | # CONFIG_HAVE_OPROFILE is not set | ||
| 77 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
| 78 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
| 79 | # CONFIG_HAVE_KPROBES is not set | ||
| 80 | # CONFIG_HAVE_KRETPROBES is not set | ||
| 81 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
| 82 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 83 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 84 | # CONFIG_HAVE_CLK is not set | ||
| 85 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 86 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 76 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 87 | CONFIG_SLABINFO=y | 77 | CONFIG_SLABINFO=y |
| 88 | CONFIG_RT_MUTEXES=y | 78 | CONFIG_RT_MUTEXES=y |
| @@ -115,11 +105,11 @@ CONFIG_DEFAULT_AS=y | |||
| 115 | # CONFIG_DEFAULT_NOOP is not set | 105 | # CONFIG_DEFAULT_NOOP is not set |
| 116 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 106 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 117 | CONFIG_CLASSIC_RCU=y | 107 | CONFIG_CLASSIC_RCU=y |
| 108 | # CONFIG_FREEZER is not set | ||
| 118 | 109 | ||
| 119 | # | 110 | # |
| 120 | # Platform dependent setup | 111 | # Platform dependent setup |
| 121 | # | 112 | # |
| 122 | # CONFIG_SUN3 is not set | ||
| 123 | # CONFIG_AMIGA is not set | 113 | # CONFIG_AMIGA is not set |
| 124 | # CONFIG_ATARI is not set | 114 | # CONFIG_ATARI is not set |
| 125 | # CONFIG_MAC is not set | 115 | # CONFIG_MAC is not set |
| @@ -149,19 +139,21 @@ CONFIG_DISCONTIGMEM_MANUAL=y | |||
| 149 | CONFIG_DISCONTIGMEM=y | 139 | CONFIG_DISCONTIGMEM=y |
| 150 | CONFIG_FLAT_NODE_MEM_MAP=y | 140 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 151 | CONFIG_NEED_MULTIPLE_NODES=y | 141 | CONFIG_NEED_MULTIPLE_NODES=y |
| 152 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 153 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 154 | CONFIG_PAGEFLAGS_EXTENDED=y | 142 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 155 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 143 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 156 | # CONFIG_RESOURCES_64BIT is not set | 144 | # CONFIG_RESOURCES_64BIT is not set |
| 145 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
| 157 | CONFIG_ZONE_DMA_FLAG=1 | 146 | CONFIG_ZONE_DMA_FLAG=1 |
| 158 | CONFIG_BOUNCE=y | 147 | CONFIG_BOUNCE=y |
| 159 | CONFIG_VIRT_TO_BUS=y | 148 | CONFIG_VIRT_TO_BUS=y |
| 149 | CONFIG_UNEVICTABLE_LRU=y | ||
| 160 | 150 | ||
| 161 | # | 151 | # |
| 162 | # General setup | 152 | # General setup |
| 163 | # | 153 | # |
| 164 | CONFIG_BINFMT_ELF=y | 154 | CONFIG_BINFMT_ELF=y |
| 155 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 156 | CONFIG_HAVE_AOUT=y | ||
| 165 | CONFIG_BINFMT_AOUT=m | 157 | CONFIG_BINFMT_AOUT=m |
| 166 | CONFIG_BINFMT_MISC=m | 158 | CONFIG_BINFMT_MISC=m |
| 167 | CONFIG_HEARTBEAT=y | 159 | CONFIG_HEARTBEAT=y |
| @@ -211,7 +203,6 @@ CONFIG_INET_TCP_DIAG=m | |||
| 211 | CONFIG_TCP_CONG_CUBIC=y | 203 | CONFIG_TCP_CONG_CUBIC=y |
| 212 | CONFIG_DEFAULT_TCP_CONG="cubic" | 204 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 213 | # CONFIG_TCP_MD5SIG is not set | 205 | # CONFIG_TCP_MD5SIG is not set |
| 214 | # CONFIG_IP_VS is not set | ||
| 215 | CONFIG_IPV6=m | 206 | CONFIG_IPV6=m |
| 216 | CONFIG_IPV6_PRIVACY=y | 207 | CONFIG_IPV6_PRIVACY=y |
| 217 | CONFIG_IPV6_ROUTER_PREF=y | 208 | CONFIG_IPV6_ROUTER_PREF=y |
| @@ -261,13 +252,14 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
| 261 | CONFIG_NF_CONNTRACK_SIP=m | 252 | CONFIG_NF_CONNTRACK_SIP=m |
| 262 | CONFIG_NF_CONNTRACK_TFTP=m | 253 | CONFIG_NF_CONNTRACK_TFTP=m |
| 263 | # CONFIG_NF_CT_NETLINK is not set | 254 | # CONFIG_NF_CT_NETLINK is not set |
| 255 | # CONFIG_NETFILTER_TPROXY is not set | ||
| 264 | CONFIG_NETFILTER_XTABLES=m | 256 | CONFIG_NETFILTER_XTABLES=m |
| 265 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 257 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| 266 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 258 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
| 267 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 259 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
| 268 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 260 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
| 269 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
| 270 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 261 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
| 262 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
| 271 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | 263 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m |
| 272 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m | 264 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m |
| 273 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 265 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
| @@ -281,19 +273,22 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | |||
| 281 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 273 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
| 282 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 274 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
| 283 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 275 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
| 276 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | ||
| 284 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 277 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
| 285 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | 278 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m |
| 286 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 279 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
| 287 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 280 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
| 288 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 281 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
| 289 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 282 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
| 283 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
| 290 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 284 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
| 291 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 285 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
| 292 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
| 293 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 286 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
| 294 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | 287 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m |
| 295 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | 288 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m |
| 296 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 289 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
| 290 | CONFIG_NETFILTER_XT_MATCH_RECENT=m | ||
| 291 | # CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set | ||
| 297 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 292 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
| 298 | CONFIG_NETFILTER_XT_MATCH_STATE=m | 293 | CONFIG_NETFILTER_XT_MATCH_STATE=m |
| 299 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | 294 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m |
| @@ -301,20 +296,20 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m | |||
| 301 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 296 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
| 302 | CONFIG_NETFILTER_XT_MATCH_TIME=m | 297 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
| 303 | CONFIG_NETFILTER_XT_MATCH_U32=m | 298 | CONFIG_NETFILTER_XT_MATCH_U32=m |
| 304 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 299 | # CONFIG_IP_VS is not set |
| 305 | 300 | ||
| 306 | # | 301 | # |
| 307 | # IP: Netfilter Configuration | 302 | # IP: Netfilter Configuration |
| 308 | # | 303 | # |
| 304 | CONFIG_NF_DEFRAG_IPV4=m | ||
| 309 | CONFIG_NF_CONNTRACK_IPV4=m | 305 | CONFIG_NF_CONNTRACK_IPV4=m |
| 310 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y | 306 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y |
| 311 | CONFIG_IP_NF_QUEUE=m | 307 | CONFIG_IP_NF_QUEUE=m |
| 312 | CONFIG_IP_NF_IPTABLES=m | 308 | CONFIG_IP_NF_IPTABLES=m |
| 313 | CONFIG_IP_NF_MATCH_RECENT=m | 309 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
| 314 | CONFIG_IP_NF_MATCH_ECN=m | ||
| 315 | CONFIG_IP_NF_MATCH_AH=m | 310 | CONFIG_IP_NF_MATCH_AH=m |
| 311 | CONFIG_IP_NF_MATCH_ECN=m | ||
| 316 | CONFIG_IP_NF_MATCH_TTL=m | 312 | CONFIG_IP_NF_MATCH_TTL=m |
| 317 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
| 318 | CONFIG_IP_NF_FILTER=m | 313 | CONFIG_IP_NF_FILTER=m |
| 319 | CONFIG_IP_NF_TARGET_REJECT=m | 314 | CONFIG_IP_NF_TARGET_REJECT=m |
| 320 | CONFIG_IP_NF_TARGET_LOG=m | 315 | CONFIG_IP_NF_TARGET_LOG=m |
| @@ -322,8 +317,8 @@ CONFIG_IP_NF_TARGET_ULOG=m | |||
| 322 | CONFIG_NF_NAT=m | 317 | CONFIG_NF_NAT=m |
| 323 | CONFIG_NF_NAT_NEEDED=y | 318 | CONFIG_NF_NAT_NEEDED=y |
| 324 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 319 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
| 325 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
| 326 | CONFIG_IP_NF_TARGET_NETMAP=m | 320 | CONFIG_IP_NF_TARGET_NETMAP=m |
| 321 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
| 327 | CONFIG_NF_NAT_SNMP_BASIC=m | 322 | CONFIG_NF_NAT_SNMP_BASIC=m |
| 328 | CONFIG_NF_NAT_PROTO_GRE=m | 323 | CONFIG_NF_NAT_PROTO_GRE=m |
| 329 | CONFIG_NF_NAT_PROTO_UDPLITE=m | 324 | CONFIG_NF_NAT_PROTO_UDPLITE=m |
| @@ -336,9 +331,9 @@ CONFIG_NF_NAT_PPTP=m | |||
| 336 | CONFIG_NF_NAT_H323=m | 331 | CONFIG_NF_NAT_H323=m |
| 337 | CONFIG_NF_NAT_SIP=m | 332 | CONFIG_NF_NAT_SIP=m |
| 338 | CONFIG_IP_NF_MANGLE=m | 333 | CONFIG_IP_NF_MANGLE=m |
| 334 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
| 339 | CONFIG_IP_NF_TARGET_ECN=m | 335 | CONFIG_IP_NF_TARGET_ECN=m |
| 340 | CONFIG_IP_NF_TARGET_TTL=m | 336 | CONFIG_IP_NF_TARGET_TTL=m |
| 341 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
| 342 | CONFIG_IP_NF_RAW=m | 337 | CONFIG_IP_NF_RAW=m |
| 343 | CONFIG_IP_NF_ARPTABLES=m | 338 | CONFIG_IP_NF_ARPTABLES=m |
| 344 | CONFIG_IP_NF_ARPFILTER=m | 339 | CONFIG_IP_NF_ARPFILTER=m |
| @@ -350,16 +345,16 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
| 350 | CONFIG_NF_CONNTRACK_IPV6=m | 345 | CONFIG_NF_CONNTRACK_IPV6=m |
| 351 | CONFIG_IP6_NF_QUEUE=m | 346 | CONFIG_IP6_NF_QUEUE=m |
| 352 | CONFIG_IP6_NF_IPTABLES=m | 347 | CONFIG_IP6_NF_IPTABLES=m |
| 353 | CONFIG_IP6_NF_MATCH_RT=m | 348 | CONFIG_IP6_NF_MATCH_AH=m |
| 354 | CONFIG_IP6_NF_MATCH_OPTS=m | 349 | CONFIG_IP6_NF_MATCH_EUI64=m |
| 355 | CONFIG_IP6_NF_MATCH_FRAG=m | 350 | CONFIG_IP6_NF_MATCH_FRAG=m |
| 351 | CONFIG_IP6_NF_MATCH_OPTS=m | ||
| 356 | CONFIG_IP6_NF_MATCH_HL=m | 352 | CONFIG_IP6_NF_MATCH_HL=m |
| 357 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 353 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
| 358 | CONFIG_IP6_NF_MATCH_AH=m | ||
| 359 | CONFIG_IP6_NF_MATCH_MH=m | 354 | CONFIG_IP6_NF_MATCH_MH=m |
| 360 | CONFIG_IP6_NF_MATCH_EUI64=m | 355 | CONFIG_IP6_NF_MATCH_RT=m |
| 361 | CONFIG_IP6_NF_FILTER=m | ||
| 362 | CONFIG_IP6_NF_TARGET_LOG=m | 356 | CONFIG_IP6_NF_TARGET_LOG=m |
| 357 | CONFIG_IP6_NF_FILTER=m | ||
| 363 | CONFIG_IP6_NF_TARGET_REJECT=m | 358 | CONFIG_IP6_NF_TARGET_REJECT=m |
| 364 | CONFIG_IP6_NF_MANGLE=m | 359 | CONFIG_IP6_NF_MANGLE=m |
| 365 | CONFIG_IP6_NF_TARGET_HL=m | 360 | CONFIG_IP6_NF_TARGET_HL=m |
| @@ -386,6 +381,7 @@ CONFIG_SCTP_HMAC_MD5=y | |||
| 386 | # CONFIG_TIPC is not set | 381 | # CONFIG_TIPC is not set |
| 387 | # CONFIG_ATM is not set | 382 | # CONFIG_ATM is not set |
| 388 | # CONFIG_BRIDGE is not set | 383 | # CONFIG_BRIDGE is not set |
| 384 | # CONFIG_NET_DSA is not set | ||
| 389 | # CONFIG_VLAN_8021Q is not set | 385 | # CONFIG_VLAN_8021Q is not set |
| 390 | # CONFIG_DECNET is not set | 386 | # CONFIG_DECNET is not set |
| 391 | CONFIG_LLC=m | 387 | CONFIG_LLC=m |
| @@ -409,19 +405,8 @@ CONFIG_NET_CLS_ROUTE=y | |||
| 409 | # CONFIG_IRDA is not set | 405 | # CONFIG_IRDA is not set |
| 410 | # CONFIG_BT is not set | 406 | # CONFIG_BT is not set |
| 411 | # CONFIG_AF_RXRPC is not set | 407 | # CONFIG_AF_RXRPC is not set |
| 412 | 408 | # CONFIG_PHONET is not set | |
| 413 | # | 409 | # CONFIG_WIRELESS is not set |
| 414 | # Wireless | ||
| 415 | # | ||
| 416 | # CONFIG_CFG80211 is not set | ||
| 417 | CONFIG_WIRELESS_EXT=y | ||
| 418 | # CONFIG_WIRELESS_EXT_SYSFS is not set | ||
| 419 | # CONFIG_MAC80211 is not set | ||
| 420 | CONFIG_IEEE80211=m | ||
| 421 | # CONFIG_IEEE80211_DEBUG is not set | ||
| 422 | CONFIG_IEEE80211_CRYPT_WEP=m | ||
| 423 | CONFIG_IEEE80211_CRYPT_CCMP=m | ||
| 424 | CONFIG_IEEE80211_CRYPT_TKIP=m | ||
| 425 | # CONFIG_RFKILL is not set | 410 | # CONFIG_RFKILL is not set |
| 426 | # CONFIG_NET_9P is not set | 411 | # CONFIG_NET_9P is not set |
| 427 | 412 | ||
| @@ -459,6 +444,7 @@ CONFIG_ATA_OVER_ETH=m | |||
| 459 | CONFIG_MISC_DEVICES=y | 444 | CONFIG_MISC_DEVICES=y |
| 460 | # CONFIG_EEPROM_93CX6 is not set | 445 | # CONFIG_EEPROM_93CX6 is not set |
| 461 | # CONFIG_ENCLOSURE_SERVICES is not set | 446 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 447 | # CONFIG_C2PORT is not set | ||
| 462 | CONFIG_HAVE_IDE=y | 448 | CONFIG_HAVE_IDE=y |
| 463 | # CONFIG_IDE is not set | 449 | # CONFIG_IDE is not set |
| 464 | 450 | ||
| @@ -542,6 +528,9 @@ CONFIG_HPLANCE=y | |||
| 542 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 528 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 543 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 529 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| 544 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 530 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
| 531 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
| 532 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
| 533 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
| 545 | # CONFIG_B44 is not set | 534 | # CONFIG_B44 is not set |
| 546 | # CONFIG_NETDEV_1000 is not set | 535 | # CONFIG_NETDEV_1000 is not set |
| 547 | # CONFIG_NETDEV_10000 is not set | 536 | # CONFIG_NETDEV_10000 is not set |
| @@ -613,6 +602,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y | |||
| 613 | CONFIG_MOUSE_PS2_SYNAPTICS=y | 602 | CONFIG_MOUSE_PS2_SYNAPTICS=y |
| 614 | CONFIG_MOUSE_PS2_LIFEBOOK=y | 603 | CONFIG_MOUSE_PS2_LIFEBOOK=y |
| 615 | CONFIG_MOUSE_PS2_TRACKPOINT=y | 604 | CONFIG_MOUSE_PS2_TRACKPOINT=y |
| 605 | # CONFIG_MOUSE_PS2_ELANTECH is not set | ||
| 616 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 606 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
| 617 | CONFIG_MOUSE_SERIAL=m | 607 | CONFIG_MOUSE_SERIAL=m |
| 618 | # CONFIG_MOUSE_VSXXXAA is not set | 608 | # CONFIG_MOUSE_VSXXXAA is not set |
| @@ -673,11 +663,11 @@ CONFIG_GEN_RTC_X=y | |||
| 673 | # CONFIG_THERMAL is not set | 663 | # CONFIG_THERMAL is not set |
| 674 | # CONFIG_THERMAL_HWMON is not set | 664 | # CONFIG_THERMAL_HWMON is not set |
| 675 | # CONFIG_WATCHDOG is not set | 665 | # CONFIG_WATCHDOG is not set |
| 666 | CONFIG_SSB_POSSIBLE=y | ||
| 676 | 667 | ||
| 677 | # | 668 | # |
| 678 | # Sonics Silicon Backplane | 669 | # Sonics Silicon Backplane |
| 679 | # | 670 | # |
| 680 | CONFIG_SSB_POSSIBLE=y | ||
| 681 | # CONFIG_SSB is not set | 671 | # CONFIG_SSB is not set |
| 682 | 672 | ||
| 683 | # | 673 | # |
| @@ -687,6 +677,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 687 | # CONFIG_MFD_SM501 is not set | 677 | # CONFIG_MFD_SM501 is not set |
| 688 | # CONFIG_HTC_PASIC3 is not set | 678 | # CONFIG_HTC_PASIC3 is not set |
| 689 | # CONFIG_MFD_TMIO is not set | 679 | # CONFIG_MFD_TMIO is not set |
| 680 | # CONFIG_REGULATOR is not set | ||
| 690 | 681 | ||
| 691 | # | 682 | # |
| 692 | # Multimedia devices | 683 | # Multimedia devices |
| @@ -712,6 +703,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 712 | CONFIG_FB=y | 703 | CONFIG_FB=y |
| 713 | # CONFIG_FIRMWARE_EDID is not set | 704 | # CONFIG_FIRMWARE_EDID is not set |
| 714 | # CONFIG_FB_DDC is not set | 705 | # CONFIG_FB_DDC is not set |
| 706 | # CONFIG_FB_BOOT_VESA_SUPPORT is not set | ||
| 715 | # CONFIG_FB_CFB_FILLRECT is not set | 707 | # CONFIG_FB_CFB_FILLRECT is not set |
| 716 | # CONFIG_FB_CFB_COPYAREA is not set | 708 | # CONFIG_FB_CFB_COPYAREA is not set |
| 717 | CONFIG_FB_CFB_IMAGEBLIT=y | 709 | CONFIG_FB_CFB_IMAGEBLIT=y |
| @@ -734,6 +726,8 @@ CONFIG_FB_HP300=y | |||
| 734 | # CONFIG_FB_UVESA is not set | 726 | # CONFIG_FB_UVESA is not set |
| 735 | # CONFIG_FB_S1D13XXX is not set | 727 | # CONFIG_FB_S1D13XXX is not set |
| 736 | # CONFIG_FB_VIRTUAL is not set | 728 | # CONFIG_FB_VIRTUAL is not set |
| 729 | # CONFIG_FB_METRONOME is not set | ||
| 730 | # CONFIG_FB_MB862XX is not set | ||
| 737 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 731 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 738 | 732 | ||
| 739 | # | 733 | # |
| @@ -760,6 +754,12 @@ CONFIG_HID_SUPPORT=y | |||
| 760 | CONFIG_HID=m | 754 | CONFIG_HID=m |
| 761 | # CONFIG_HID_DEBUG is not set | 755 | # CONFIG_HID_DEBUG is not set |
| 762 | CONFIG_HIDRAW=y | 756 | CONFIG_HIDRAW=y |
| 757 | # CONFIG_HID_PID is not set | ||
| 758 | |||
| 759 | # | ||
| 760 | # Special HID drivers | ||
| 761 | # | ||
| 762 | CONFIG_HID_COMPAT=y | ||
| 763 | # CONFIG_USB_SUPPORT is not set | 763 | # CONFIG_USB_SUPPORT is not set |
| 764 | # CONFIG_MMC is not set | 764 | # CONFIG_MMC is not set |
| 765 | # CONFIG_MEMSTICK is not set | 765 | # CONFIG_MEMSTICK is not set |
| @@ -768,6 +768,8 @@ CONFIG_HIDRAW=y | |||
| 768 | # CONFIG_RTC_CLASS is not set | 768 | # CONFIG_RTC_CLASS is not set |
| 769 | # CONFIG_DMADEVICES is not set | 769 | # CONFIG_DMADEVICES is not set |
| 770 | # CONFIG_UIO is not set | 770 | # CONFIG_UIO is not set |
| 771 | # CONFIG_STAGING is not set | ||
| 772 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 771 | 773 | ||
| 772 | # | 774 | # |
| 773 | # Character devices | 775 | # Character devices |
| @@ -781,8 +783,9 @@ CONFIG_EXT2_FS=y | |||
| 781 | # CONFIG_EXT2_FS_XIP is not set | 783 | # CONFIG_EXT2_FS_XIP is not set |
| 782 | CONFIG_EXT3_FS=y | 784 | CONFIG_EXT3_FS=y |
| 783 | # CONFIG_EXT3_FS_XATTR is not set | 785 | # CONFIG_EXT3_FS_XATTR is not set |
| 784 | # CONFIG_EXT4DEV_FS is not set | 786 | # CONFIG_EXT4_FS is not set |
| 785 | CONFIG_JBD=y | 787 | CONFIG_JBD=y |
| 788 | CONFIG_JBD2=m | ||
| 786 | CONFIG_REISERFS_FS=m | 789 | CONFIG_REISERFS_FS=m |
| 787 | # CONFIG_REISERFS_CHECK is not set | 790 | # CONFIG_REISERFS_CHECK is not set |
| 788 | # CONFIG_REISERFS_PROC_INFO is not set | 791 | # CONFIG_REISERFS_PROC_INFO is not set |
| @@ -793,6 +796,7 @@ CONFIG_JFS_FS=m | |||
| 793 | # CONFIG_JFS_DEBUG is not set | 796 | # CONFIG_JFS_DEBUG is not set |
| 794 | # CONFIG_JFS_STATISTICS is not set | 797 | # CONFIG_JFS_STATISTICS is not set |
| 795 | # CONFIG_FS_POSIX_ACL is not set | 798 | # CONFIG_FS_POSIX_ACL is not set |
| 799 | CONFIG_FILE_LOCKING=y | ||
| 796 | CONFIG_XFS_FS=m | 800 | CONFIG_XFS_FS=m |
| 797 | # CONFIG_XFS_QUOTA is not set | 801 | # CONFIG_XFS_QUOTA is not set |
| 798 | # CONFIG_XFS_POSIX_ACL is not set | 802 | # CONFIG_XFS_POSIX_ACL is not set |
| @@ -804,6 +808,7 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | |||
| 804 | # CONFIG_OCFS2_FS_STATS is not set | 808 | # CONFIG_OCFS2_FS_STATS is not set |
| 805 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 809 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
| 806 | # CONFIG_OCFS2_DEBUG_FS is not set | 810 | # CONFIG_OCFS2_DEBUG_FS is not set |
| 811 | # CONFIG_OCFS2_COMPAT_JBD is not set | ||
| 807 | CONFIG_DNOTIFY=y | 812 | CONFIG_DNOTIFY=y |
| 808 | CONFIG_INOTIFY=y | 813 | CONFIG_INOTIFY=y |
| 809 | CONFIG_INOTIFY_USER=y | 814 | CONFIG_INOTIFY_USER=y |
| @@ -842,6 +847,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
| 842 | CONFIG_PROC_FS=y | 847 | CONFIG_PROC_FS=y |
| 843 | CONFIG_PROC_KCORE=y | 848 | CONFIG_PROC_KCORE=y |
| 844 | CONFIG_PROC_SYSCTL=y | 849 | CONFIG_PROC_SYSCTL=y |
| 850 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 845 | CONFIG_SYSFS=y | 851 | CONFIG_SYSFS=y |
| 846 | CONFIG_TMPFS=y | 852 | CONFIG_TMPFS=y |
| 847 | # CONFIG_TMPFS_POSIX_ACL is not set | 853 | # CONFIG_TMPFS_POSIX_ACL is not set |
| @@ -885,6 +891,7 @@ CONFIG_EXPORTFS=m | |||
| 885 | CONFIG_NFS_COMMON=y | 891 | CONFIG_NFS_COMMON=y |
| 886 | CONFIG_SUNRPC=y | 892 | CONFIG_SUNRPC=y |
| 887 | CONFIG_SUNRPC_GSS=y | 893 | CONFIG_SUNRPC_GSS=y |
| 894 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
| 888 | CONFIG_RPCSEC_GSS_KRB5=y | 895 | CONFIG_RPCSEC_GSS_KRB5=y |
| 889 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 896 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 890 | CONFIG_SMB_FS=m | 897 | CONFIG_SMB_FS=m |
| @@ -957,7 +964,13 @@ CONFIG_MAGIC_SYSRQ=y | |||
| 957 | # CONFIG_DEBUG_KERNEL is not set | 964 | # CONFIG_DEBUG_KERNEL is not set |
| 958 | CONFIG_DEBUG_BUGVERBOSE=y | 965 | CONFIG_DEBUG_BUGVERBOSE=y |
| 959 | CONFIG_DEBUG_MEMORY_INIT=y | 966 | CONFIG_DEBUG_MEMORY_INIT=y |
| 967 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
| 960 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 968 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
| 969 | |||
| 970 | # | ||
| 971 | # Tracers | ||
| 972 | # | ||
| 973 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
| 961 | # CONFIG_SAMPLES is not set | 974 | # CONFIG_SAMPLES is not set |
| 962 | 975 | ||
| 963 | # | 976 | # |
| @@ -965,6 +978,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y | |||
| 965 | # | 978 | # |
| 966 | # CONFIG_KEYS is not set | 979 | # CONFIG_KEYS is not set |
| 967 | # CONFIG_SECURITY is not set | 980 | # CONFIG_SECURITY is not set |
| 981 | # CONFIG_SECURITYFS is not set | ||
| 968 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 982 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 969 | CONFIG_XOR_BLOCKS=m | 983 | CONFIG_XOR_BLOCKS=m |
| 970 | CONFIG_ASYNC_CORE=m | 984 | CONFIG_ASYNC_CORE=m |
| @@ -975,10 +989,12 @@ CONFIG_CRYPTO=y | |||
| 975 | # | 989 | # |
| 976 | # Crypto core or helper | 990 | # Crypto core or helper |
| 977 | # | 991 | # |
| 992 | # CONFIG_CRYPTO_FIPS is not set | ||
| 978 | CONFIG_CRYPTO_ALGAPI=y | 993 | CONFIG_CRYPTO_ALGAPI=y |
| 979 | CONFIG_CRYPTO_AEAD=m | 994 | CONFIG_CRYPTO_AEAD=y |
| 980 | CONFIG_CRYPTO_BLKCIPHER=y | 995 | CONFIG_CRYPTO_BLKCIPHER=y |
| 981 | CONFIG_CRYPTO_HASH=y | 996 | CONFIG_CRYPTO_HASH=y |
| 997 | CONFIG_CRYPTO_RNG=y | ||
| 982 | CONFIG_CRYPTO_MANAGER=y | 998 | CONFIG_CRYPTO_MANAGER=y |
| 983 | CONFIG_CRYPTO_GF128MUL=m | 999 | CONFIG_CRYPTO_GF128MUL=m |
| 984 | CONFIG_CRYPTO_NULL=m | 1000 | CONFIG_CRYPTO_NULL=m |
| @@ -1052,14 +1068,17 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m | |||
| 1052 | # | 1068 | # |
| 1053 | CONFIG_CRYPTO_DEFLATE=m | 1069 | CONFIG_CRYPTO_DEFLATE=m |
| 1054 | CONFIG_CRYPTO_LZO=m | 1070 | CONFIG_CRYPTO_LZO=m |
| 1071 | |||
| 1072 | # | ||
| 1073 | # Random Number Generation | ||
| 1074 | # | ||
| 1075 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
| 1055 | # CONFIG_CRYPTO_HW is not set | 1076 | # CONFIG_CRYPTO_HW is not set |
| 1056 | 1077 | ||
| 1057 | # | 1078 | # |
| 1058 | # Library routines | 1079 | # Library routines |
| 1059 | # | 1080 | # |
| 1060 | CONFIG_BITREVERSE=y | 1081 | CONFIG_BITREVERSE=y |
| 1061 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1062 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
| 1063 | CONFIG_CRC_CCITT=m | 1082 | CONFIG_CRC_CCITT=m |
| 1064 | CONFIG_CRC16=m | 1083 | CONFIG_CRC16=m |
| 1065 | CONFIG_CRC_T10DIF=y | 1084 | CONFIG_CRC_T10DIF=y |
diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig index db6e8822594a..c6de25724a25 100644 --- a/arch/m68k/configs/mac_defconfig +++ b/arch/m68k/configs/mac_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.27-rc6 | 3 | # Linux kernel version: 2.6.28-rc7 |
| 4 | # Wed Sep 10 09:02:06 2008 | 4 | # Tue Dec 2 20:27:47 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -14,7 +14,6 @@ CONFIG_TIME_LOW_RES=y | |||
| 14 | CONFIG_GENERIC_IOMAP=y | 14 | CONFIG_GENERIC_IOMAP=y |
| 15 | CONFIG_NO_IOPORT=y | 15 | CONFIG_NO_IOPORT=y |
| 16 | # CONFIG_NO_DMA is not set | 16 | # CONFIG_NO_DMA is not set |
| 17 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
| 18 | CONFIG_HZ=100 | 17 | CONFIG_HZ=100 |
| 19 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 18 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 20 | 19 | ||
| @@ -67,22 +66,13 @@ CONFIG_SIGNALFD=y | |||
| 67 | CONFIG_TIMERFD=y | 66 | CONFIG_TIMERFD=y |
| 68 | CONFIG_EVENTFD=y | 67 | CONFIG_EVENTFD=y |
| 69 | CONFIG_SHMEM=y | 68 | CONFIG_SHMEM=y |
| 69 | CONFIG_AIO=y | ||
| 70 | CONFIG_VM_EVENT_COUNTERS=y | 70 | CONFIG_VM_EVENT_COUNTERS=y |
| 71 | CONFIG_SLAB=y | 71 | CONFIG_SLAB=y |
| 72 | # CONFIG_SLUB is not set | 72 | # CONFIG_SLUB is not set |
| 73 | # CONFIG_SLOB is not set | 73 | # CONFIG_SLOB is not set |
| 74 | # CONFIG_PROFILING is not set | 74 | # CONFIG_PROFILING is not set |
| 75 | # CONFIG_MARKERS is not set | 75 | # CONFIG_MARKERS is not set |
| 76 | # CONFIG_HAVE_OPROFILE is not set | ||
| 77 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
| 78 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
| 79 | # CONFIG_HAVE_KPROBES is not set | ||
| 80 | # CONFIG_HAVE_KRETPROBES is not set | ||
| 81 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
| 82 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 83 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 84 | # CONFIG_HAVE_CLK is not set | ||
| 85 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 86 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 76 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 87 | CONFIG_SLABINFO=y | 77 | CONFIG_SLABINFO=y |
| 88 | CONFIG_RT_MUTEXES=y | 78 | CONFIG_RT_MUTEXES=y |
| @@ -115,11 +105,11 @@ CONFIG_DEFAULT_AS=y | |||
| 115 | # CONFIG_DEFAULT_NOOP is not set | 105 | # CONFIG_DEFAULT_NOOP is not set |
| 116 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 106 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 117 | CONFIG_CLASSIC_RCU=y | 107 | CONFIG_CLASSIC_RCU=y |
| 108 | # CONFIG_FREEZER is not set | ||
| 118 | 109 | ||
| 119 | # | 110 | # |
| 120 | # Platform dependent setup | 111 | # Platform dependent setup |
| 121 | # | 112 | # |
| 122 | # CONFIG_SUN3 is not set | ||
| 123 | # CONFIG_AMIGA is not set | 113 | # CONFIG_AMIGA is not set |
| 124 | # CONFIG_ATARI is not set | 114 | # CONFIG_ATARI is not set |
| 125 | CONFIG_MAC=y | 115 | CONFIG_MAC=y |
| @@ -150,19 +140,21 @@ CONFIG_DISCONTIGMEM_MANUAL=y | |||
| 150 | CONFIG_DISCONTIGMEM=y | 140 | CONFIG_DISCONTIGMEM=y |
| 151 | CONFIG_FLAT_NODE_MEM_MAP=y | 141 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 152 | CONFIG_NEED_MULTIPLE_NODES=y | 142 | CONFIG_NEED_MULTIPLE_NODES=y |
| 153 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 154 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 155 | CONFIG_PAGEFLAGS_EXTENDED=y | 143 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 156 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 144 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 157 | # CONFIG_RESOURCES_64BIT is not set | 145 | # CONFIG_RESOURCES_64BIT is not set |
| 146 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
| 158 | CONFIG_ZONE_DMA_FLAG=1 | 147 | CONFIG_ZONE_DMA_FLAG=1 |
| 159 | CONFIG_BOUNCE=y | 148 | CONFIG_BOUNCE=y |
| 160 | CONFIG_VIRT_TO_BUS=y | 149 | CONFIG_VIRT_TO_BUS=y |
| 150 | CONFIG_UNEVICTABLE_LRU=y | ||
| 161 | 151 | ||
| 162 | # | 152 | # |
| 163 | # General setup | 153 | # General setup |
| 164 | # | 154 | # |
| 165 | CONFIG_BINFMT_ELF=y | 155 | CONFIG_BINFMT_ELF=y |
| 156 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 157 | CONFIG_HAVE_AOUT=y | ||
| 166 | CONFIG_BINFMT_AOUT=m | 158 | CONFIG_BINFMT_AOUT=m |
| 167 | CONFIG_BINFMT_MISC=m | 159 | CONFIG_BINFMT_MISC=m |
| 168 | # CONFIG_HEARTBEAT is not set | 160 | # CONFIG_HEARTBEAT is not set |
| @@ -209,7 +201,6 @@ CONFIG_INET_TCP_DIAG=m | |||
| 209 | CONFIG_TCP_CONG_CUBIC=y | 201 | CONFIG_TCP_CONG_CUBIC=y |
| 210 | CONFIG_DEFAULT_TCP_CONG="cubic" | 202 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 211 | # CONFIG_TCP_MD5SIG is not set | 203 | # CONFIG_TCP_MD5SIG is not set |
| 212 | # CONFIG_IP_VS is not set | ||
| 213 | CONFIG_IPV6=m | 204 | CONFIG_IPV6=m |
| 214 | CONFIG_IPV6_PRIVACY=y | 205 | CONFIG_IPV6_PRIVACY=y |
| 215 | CONFIG_IPV6_ROUTER_PREF=y | 206 | CONFIG_IPV6_ROUTER_PREF=y |
| @@ -259,13 +250,14 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
| 259 | CONFIG_NF_CONNTRACK_SIP=m | 250 | CONFIG_NF_CONNTRACK_SIP=m |
| 260 | CONFIG_NF_CONNTRACK_TFTP=m | 251 | CONFIG_NF_CONNTRACK_TFTP=m |
| 261 | # CONFIG_NF_CT_NETLINK is not set | 252 | # CONFIG_NF_CT_NETLINK is not set |
| 253 | # CONFIG_NETFILTER_TPROXY is not set | ||
| 262 | CONFIG_NETFILTER_XTABLES=m | 254 | CONFIG_NETFILTER_XTABLES=m |
| 263 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 255 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| 264 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 256 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
| 265 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 257 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
| 266 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 258 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
| 267 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
| 268 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 259 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
| 260 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
| 269 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | 261 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m |
| 270 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m | 262 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m |
| 271 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 263 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
| @@ -279,19 +271,22 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | |||
| 279 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 271 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
| 280 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 272 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
| 281 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 273 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
| 274 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | ||
| 282 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 275 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
| 283 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | 276 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m |
| 284 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 277 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
| 285 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 278 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
| 286 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 279 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
| 287 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 280 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
| 281 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
| 288 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 282 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
| 289 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 283 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
| 290 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
| 291 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 284 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
| 292 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | 285 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m |
| 293 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | 286 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m |
| 294 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 287 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
| 288 | CONFIG_NETFILTER_XT_MATCH_RECENT=m | ||
| 289 | # CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set | ||
| 295 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 290 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
| 296 | CONFIG_NETFILTER_XT_MATCH_STATE=m | 291 | CONFIG_NETFILTER_XT_MATCH_STATE=m |
| 297 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | 292 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m |
| @@ -299,20 +294,20 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m | |||
| 299 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 294 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
| 300 | CONFIG_NETFILTER_XT_MATCH_TIME=m | 295 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
| 301 | CONFIG_NETFILTER_XT_MATCH_U32=m | 296 | CONFIG_NETFILTER_XT_MATCH_U32=m |
| 302 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 297 | # CONFIG_IP_VS is not set |
| 303 | 298 | ||
| 304 | # | 299 | # |
| 305 | # IP: Netfilter Configuration | 300 | # IP: Netfilter Configuration |
| 306 | # | 301 | # |
| 302 | CONFIG_NF_DEFRAG_IPV4=m | ||
| 307 | CONFIG_NF_CONNTRACK_IPV4=m | 303 | CONFIG_NF_CONNTRACK_IPV4=m |
| 308 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y | 304 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y |
| 309 | CONFIG_IP_NF_QUEUE=m | 305 | CONFIG_IP_NF_QUEUE=m |
| 310 | CONFIG_IP_NF_IPTABLES=m | 306 | CONFIG_IP_NF_IPTABLES=m |
| 311 | CONFIG_IP_NF_MATCH_RECENT=m | 307 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
| 312 | CONFIG_IP_NF_MATCH_ECN=m | ||
| 313 | CONFIG_IP_NF_MATCH_AH=m | 308 | CONFIG_IP_NF_MATCH_AH=m |
| 309 | CONFIG_IP_NF_MATCH_ECN=m | ||
| 314 | CONFIG_IP_NF_MATCH_TTL=m | 310 | CONFIG_IP_NF_MATCH_TTL=m |
| 315 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
| 316 | CONFIG_IP_NF_FILTER=m | 311 | CONFIG_IP_NF_FILTER=m |
| 317 | CONFIG_IP_NF_TARGET_REJECT=m | 312 | CONFIG_IP_NF_TARGET_REJECT=m |
| 318 | CONFIG_IP_NF_TARGET_LOG=m | 313 | CONFIG_IP_NF_TARGET_LOG=m |
| @@ -320,8 +315,8 @@ CONFIG_IP_NF_TARGET_ULOG=m | |||
| 320 | CONFIG_NF_NAT=m | 315 | CONFIG_NF_NAT=m |
| 321 | CONFIG_NF_NAT_NEEDED=y | 316 | CONFIG_NF_NAT_NEEDED=y |
| 322 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 317 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
| 323 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
| 324 | CONFIG_IP_NF_TARGET_NETMAP=m | 318 | CONFIG_IP_NF_TARGET_NETMAP=m |
| 319 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
| 325 | CONFIG_NF_NAT_SNMP_BASIC=m | 320 | CONFIG_NF_NAT_SNMP_BASIC=m |
| 326 | CONFIG_NF_NAT_PROTO_GRE=m | 321 | CONFIG_NF_NAT_PROTO_GRE=m |
| 327 | CONFIG_NF_NAT_PROTO_UDPLITE=m | 322 | CONFIG_NF_NAT_PROTO_UDPLITE=m |
| @@ -334,9 +329,9 @@ CONFIG_NF_NAT_PPTP=m | |||
| 334 | CONFIG_NF_NAT_H323=m | 329 | CONFIG_NF_NAT_H323=m |
| 335 | CONFIG_NF_NAT_SIP=m | 330 | CONFIG_NF_NAT_SIP=m |
| 336 | CONFIG_IP_NF_MANGLE=m | 331 | CONFIG_IP_NF_MANGLE=m |
| 332 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
| 337 | CONFIG_IP_NF_TARGET_ECN=m | 333 | CONFIG_IP_NF_TARGET_ECN=m |
| 338 | CONFIG_IP_NF_TARGET_TTL=m | 334 | CONFIG_IP_NF_TARGET_TTL=m |
| 339 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
| 340 | CONFIG_IP_NF_RAW=m | 335 | CONFIG_IP_NF_RAW=m |
| 341 | CONFIG_IP_NF_ARPTABLES=m | 336 | CONFIG_IP_NF_ARPTABLES=m |
| 342 | CONFIG_IP_NF_ARPFILTER=m | 337 | CONFIG_IP_NF_ARPFILTER=m |
| @@ -348,16 +343,16 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
| 348 | CONFIG_NF_CONNTRACK_IPV6=m | 343 | CONFIG_NF_CONNTRACK_IPV6=m |
| 349 | CONFIG_IP6_NF_QUEUE=m | 344 | CONFIG_IP6_NF_QUEUE=m |
| 350 | CONFIG_IP6_NF_IPTABLES=m | 345 | CONFIG_IP6_NF_IPTABLES=m |
| 351 | CONFIG_IP6_NF_MATCH_RT=m | 346 | CONFIG_IP6_NF_MATCH_AH=m |
| 352 | CONFIG_IP6_NF_MATCH_OPTS=m | 347 | CONFIG_IP6_NF_MATCH_EUI64=m |
| 353 | CONFIG_IP6_NF_MATCH_FRAG=m | 348 | CONFIG_IP6_NF_MATCH_FRAG=m |
| 349 | CONFIG_IP6_NF_MATCH_OPTS=m | ||
| 354 | CONFIG_IP6_NF_MATCH_HL=m | 350 | CONFIG_IP6_NF_MATCH_HL=m |
| 355 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 351 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
| 356 | CONFIG_IP6_NF_MATCH_AH=m | ||
| 357 | CONFIG_IP6_NF_MATCH_MH=m | 352 | CONFIG_IP6_NF_MATCH_MH=m |
| 358 | CONFIG_IP6_NF_MATCH_EUI64=m | 353 | CONFIG_IP6_NF_MATCH_RT=m |
| 359 | CONFIG_IP6_NF_FILTER=m | ||
| 360 | CONFIG_IP6_NF_TARGET_LOG=m | 354 | CONFIG_IP6_NF_TARGET_LOG=m |
| 355 | CONFIG_IP6_NF_FILTER=m | ||
| 361 | CONFIG_IP6_NF_TARGET_REJECT=m | 356 | CONFIG_IP6_NF_TARGET_REJECT=m |
| 362 | CONFIG_IP6_NF_MANGLE=m | 357 | CONFIG_IP6_NF_MANGLE=m |
| 363 | CONFIG_IP6_NF_TARGET_HL=m | 358 | CONFIG_IP6_NF_TARGET_HL=m |
| @@ -384,6 +379,7 @@ CONFIG_SCTP_HMAC_MD5=y | |||
| 384 | # CONFIG_TIPC is not set | 379 | # CONFIG_TIPC is not set |
| 385 | # CONFIG_ATM is not set | 380 | # CONFIG_ATM is not set |
| 386 | # CONFIG_BRIDGE is not set | 381 | # CONFIG_BRIDGE is not set |
| 382 | # CONFIG_NET_DSA is not set | ||
| 387 | # CONFIG_VLAN_8021Q is not set | 383 | # CONFIG_VLAN_8021Q is not set |
| 388 | # CONFIG_DECNET is not set | 384 | # CONFIG_DECNET is not set |
| 389 | CONFIG_LLC=m | 385 | CONFIG_LLC=m |
| @@ -410,19 +406,8 @@ CONFIG_NET_CLS_ROUTE=y | |||
| 410 | # CONFIG_IRDA is not set | 406 | # CONFIG_IRDA is not set |
| 411 | # CONFIG_BT is not set | 407 | # CONFIG_BT is not set |
| 412 | # CONFIG_AF_RXRPC is not set | 408 | # CONFIG_AF_RXRPC is not set |
| 413 | 409 | # CONFIG_PHONET is not set | |
| 414 | # | 410 | # CONFIG_WIRELESS is not set |
| 415 | # Wireless | ||
| 416 | # | ||
| 417 | # CONFIG_CFG80211 is not set | ||
| 418 | CONFIG_WIRELESS_EXT=y | ||
| 419 | # CONFIG_WIRELESS_EXT_SYSFS is not set | ||
| 420 | # CONFIG_MAC80211 is not set | ||
| 421 | CONFIG_IEEE80211=m | ||
| 422 | # CONFIG_IEEE80211_DEBUG is not set | ||
| 423 | CONFIG_IEEE80211_CRYPT_WEP=m | ||
| 424 | CONFIG_IEEE80211_CRYPT_CCMP=m | ||
| 425 | CONFIG_IEEE80211_CRYPT_TKIP=m | ||
| 426 | # CONFIG_RFKILL is not set | 411 | # CONFIG_RFKILL is not set |
| 427 | # CONFIG_NET_9P is not set | 412 | # CONFIG_NET_9P is not set |
| 428 | 413 | ||
| @@ -460,21 +445,20 @@ CONFIG_ATA_OVER_ETH=m | |||
| 460 | CONFIG_MISC_DEVICES=y | 445 | CONFIG_MISC_DEVICES=y |
| 461 | # CONFIG_EEPROM_93CX6 is not set | 446 | # CONFIG_EEPROM_93CX6 is not set |
| 462 | # CONFIG_ENCLOSURE_SERVICES is not set | 447 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 448 | # CONFIG_C2PORT is not set | ||
| 463 | CONFIG_HAVE_IDE=y | 449 | CONFIG_HAVE_IDE=y |
| 464 | CONFIG_IDE=y | 450 | CONFIG_IDE=y |
| 465 | CONFIG_BLK_DEV_IDE=y | ||
| 466 | 451 | ||
| 467 | # | 452 | # |
| 468 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | 453 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
| 469 | # | 454 | # |
| 470 | CONFIG_IDE_ATAPI=y | ||
| 471 | # CONFIG_BLK_DEV_IDE_SATA is not set | 455 | # CONFIG_BLK_DEV_IDE_SATA is not set |
| 472 | CONFIG_BLK_DEV_IDEDISK=y | 456 | CONFIG_IDE_GD=y |
| 473 | # CONFIG_IDEDISK_MULTI_MODE is not set | 457 | CONFIG_IDE_GD_ATA=y |
| 458 | # CONFIG_IDE_GD_ATAPI is not set | ||
| 474 | CONFIG_BLK_DEV_IDECD=y | 459 | CONFIG_BLK_DEV_IDECD=y |
| 475 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y | 460 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y |
| 476 | # CONFIG_BLK_DEV_IDETAPE is not set | 461 | # CONFIG_BLK_DEV_IDETAPE is not set |
| 477 | CONFIG_BLK_DEV_IDEFLOPPY=m | ||
| 478 | # CONFIG_BLK_DEV_IDESCSI is not set | 462 | # CONFIG_BLK_DEV_IDESCSI is not set |
| 479 | # CONFIG_IDE_TASK_IOCTL is not set | 463 | # CONFIG_IDE_TASK_IOCTL is not set |
| 480 | CONFIG_IDE_PROC_FS=y | 464 | CONFIG_IDE_PROC_FS=y |
| @@ -581,6 +565,9 @@ CONFIG_MACMACE=y | |||
| 581 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 565 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 582 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 566 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| 583 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 567 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
| 568 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
| 569 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
| 570 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
| 584 | # CONFIG_B44 is not set | 571 | # CONFIG_B44 is not set |
| 585 | # CONFIG_NETDEV_1000 is not set | 572 | # CONFIG_NETDEV_1000 is not set |
| 586 | # CONFIG_NETDEV_10000 is not set | 573 | # CONFIG_NETDEV_10000 is not set |
| @@ -650,6 +637,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y | |||
| 650 | CONFIG_MOUSE_PS2_SYNAPTICS=y | 637 | CONFIG_MOUSE_PS2_SYNAPTICS=y |
| 651 | CONFIG_MOUSE_PS2_LIFEBOOK=y | 638 | CONFIG_MOUSE_PS2_LIFEBOOK=y |
| 652 | CONFIG_MOUSE_PS2_TRACKPOINT=y | 639 | CONFIG_MOUSE_PS2_TRACKPOINT=y |
| 640 | # CONFIG_MOUSE_PS2_ELANTECH is not set | ||
| 653 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 641 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
| 654 | CONFIG_MOUSE_SERIAL=m | 642 | CONFIG_MOUSE_SERIAL=m |
| 655 | # CONFIG_MOUSE_VSXXXAA is not set | 643 | # CONFIG_MOUSE_VSXXXAA is not set |
| @@ -706,11 +694,11 @@ CONFIG_GEN_RTC_X=y | |||
| 706 | # CONFIG_THERMAL is not set | 694 | # CONFIG_THERMAL is not set |
| 707 | # CONFIG_THERMAL_HWMON is not set | 695 | # CONFIG_THERMAL_HWMON is not set |
| 708 | # CONFIG_WATCHDOG is not set | 696 | # CONFIG_WATCHDOG is not set |
| 697 | CONFIG_SSB_POSSIBLE=y | ||
| 709 | 698 | ||
| 710 | # | 699 | # |
| 711 | # Sonics Silicon Backplane | 700 | # Sonics Silicon Backplane |
| 712 | # | 701 | # |
| 713 | CONFIG_SSB_POSSIBLE=y | ||
| 714 | # CONFIG_SSB is not set | 702 | # CONFIG_SSB is not set |
| 715 | 703 | ||
| 716 | # | 704 | # |
| @@ -720,6 +708,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 720 | # CONFIG_MFD_SM501 is not set | 708 | # CONFIG_MFD_SM501 is not set |
| 721 | # CONFIG_HTC_PASIC3 is not set | 709 | # CONFIG_HTC_PASIC3 is not set |
| 722 | # CONFIG_MFD_TMIO is not set | 710 | # CONFIG_MFD_TMIO is not set |
| 711 | # CONFIG_REGULATOR is not set | ||
| 723 | 712 | ||
| 724 | # | 713 | # |
| 725 | # Multimedia devices | 714 | # Multimedia devices |
| @@ -745,6 +734,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 745 | CONFIG_FB=y | 734 | CONFIG_FB=y |
| 746 | # CONFIG_FIRMWARE_EDID is not set | 735 | # CONFIG_FIRMWARE_EDID is not set |
| 747 | # CONFIG_FB_DDC is not set | 736 | # CONFIG_FB_DDC is not set |
| 737 | # CONFIG_FB_BOOT_VESA_SUPPORT is not set | ||
| 748 | CONFIG_FB_CFB_FILLRECT=y | 738 | CONFIG_FB_CFB_FILLRECT=y |
| 749 | CONFIG_FB_CFB_COPYAREA=y | 739 | CONFIG_FB_CFB_COPYAREA=y |
| 750 | CONFIG_FB_CFB_IMAGEBLIT=y | 740 | CONFIG_FB_CFB_IMAGEBLIT=y |
| @@ -768,6 +758,8 @@ CONFIG_FB_MAC=y | |||
| 768 | # CONFIG_FB_UVESA is not set | 758 | # CONFIG_FB_UVESA is not set |
| 769 | # CONFIG_FB_S1D13XXX is not set | 759 | # CONFIG_FB_S1D13XXX is not set |
| 770 | # CONFIG_FB_VIRTUAL is not set | 760 | # CONFIG_FB_VIRTUAL is not set |
| 761 | # CONFIG_FB_METRONOME is not set | ||
| 762 | # CONFIG_FB_MB862XX is not set | ||
| 771 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 763 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 772 | 764 | ||
| 773 | # | 765 | # |
| @@ -796,6 +788,12 @@ CONFIG_HID_SUPPORT=y | |||
| 796 | CONFIG_HID=m | 788 | CONFIG_HID=m |
| 797 | # CONFIG_HID_DEBUG is not set | 789 | # CONFIG_HID_DEBUG is not set |
| 798 | CONFIG_HIDRAW=y | 790 | CONFIG_HIDRAW=y |
| 791 | # CONFIG_HID_PID is not set | ||
| 792 | |||
| 793 | # | ||
| 794 | # Special HID drivers | ||
| 795 | # | ||
| 796 | CONFIG_HID_COMPAT=y | ||
| 799 | # CONFIG_USB_SUPPORT is not set | 797 | # CONFIG_USB_SUPPORT is not set |
| 800 | # CONFIG_MMC is not set | 798 | # CONFIG_MMC is not set |
| 801 | # CONFIG_MEMSTICK is not set | 799 | # CONFIG_MEMSTICK is not set |
| @@ -804,6 +802,8 @@ CONFIG_HIDRAW=y | |||
| 804 | # CONFIG_RTC_CLASS is not set | 802 | # CONFIG_RTC_CLASS is not set |
| 805 | # CONFIG_DMADEVICES is not set | 803 | # CONFIG_DMADEVICES is not set |
| 806 | # CONFIG_UIO is not set | 804 | # CONFIG_UIO is not set |
| 805 | # CONFIG_STAGING is not set | ||
| 806 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 807 | 807 | ||
| 808 | # | 808 | # |
| 809 | # Character devices | 809 | # Character devices |
| @@ -820,8 +820,9 @@ CONFIG_EXT2_FS=y | |||
| 820 | # CONFIG_EXT2_FS_XIP is not set | 820 | # CONFIG_EXT2_FS_XIP is not set |
| 821 | CONFIG_EXT3_FS=y | 821 | CONFIG_EXT3_FS=y |
| 822 | # CONFIG_EXT3_FS_XATTR is not set | 822 | # CONFIG_EXT3_FS_XATTR is not set |
| 823 | # CONFIG_EXT4DEV_FS is not set | 823 | # CONFIG_EXT4_FS is not set |
| 824 | CONFIG_JBD=y | 824 | CONFIG_JBD=y |
| 825 | CONFIG_JBD2=m | ||
| 825 | CONFIG_REISERFS_FS=m | 826 | CONFIG_REISERFS_FS=m |
| 826 | # CONFIG_REISERFS_CHECK is not set | 827 | # CONFIG_REISERFS_CHECK is not set |
| 827 | # CONFIG_REISERFS_PROC_INFO is not set | 828 | # CONFIG_REISERFS_PROC_INFO is not set |
| @@ -832,6 +833,7 @@ CONFIG_JFS_FS=m | |||
| 832 | # CONFIG_JFS_DEBUG is not set | 833 | # CONFIG_JFS_DEBUG is not set |
| 833 | # CONFIG_JFS_STATISTICS is not set | 834 | # CONFIG_JFS_STATISTICS is not set |
| 834 | # CONFIG_FS_POSIX_ACL is not set | 835 | # CONFIG_FS_POSIX_ACL is not set |
| 836 | CONFIG_FILE_LOCKING=y | ||
| 835 | CONFIG_XFS_FS=m | 837 | CONFIG_XFS_FS=m |
| 836 | # CONFIG_XFS_QUOTA is not set | 838 | # CONFIG_XFS_QUOTA is not set |
| 837 | # CONFIG_XFS_POSIX_ACL is not set | 839 | # CONFIG_XFS_POSIX_ACL is not set |
| @@ -843,6 +845,7 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | |||
| 843 | # CONFIG_OCFS2_FS_STATS is not set | 845 | # CONFIG_OCFS2_FS_STATS is not set |
| 844 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 846 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
| 845 | # CONFIG_OCFS2_DEBUG_FS is not set | 847 | # CONFIG_OCFS2_DEBUG_FS is not set |
| 848 | # CONFIG_OCFS2_COMPAT_JBD is not set | ||
| 846 | CONFIG_DNOTIFY=y | 849 | CONFIG_DNOTIFY=y |
| 847 | CONFIG_INOTIFY=y | 850 | CONFIG_INOTIFY=y |
| 848 | CONFIG_INOTIFY_USER=y | 851 | CONFIG_INOTIFY_USER=y |
| @@ -881,6 +884,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
| 881 | CONFIG_PROC_FS=y | 884 | CONFIG_PROC_FS=y |
| 882 | CONFIG_PROC_KCORE=y | 885 | CONFIG_PROC_KCORE=y |
| 883 | CONFIG_PROC_SYSCTL=y | 886 | CONFIG_PROC_SYSCTL=y |
| 887 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 884 | CONFIG_SYSFS=y | 888 | CONFIG_SYSFS=y |
| 885 | CONFIG_TMPFS=y | 889 | CONFIG_TMPFS=y |
| 886 | # CONFIG_TMPFS_POSIX_ACL is not set | 890 | # CONFIG_TMPFS_POSIX_ACL is not set |
| @@ -923,6 +927,7 @@ CONFIG_EXPORTFS=m | |||
| 923 | CONFIG_NFS_COMMON=y | 927 | CONFIG_NFS_COMMON=y |
| 924 | CONFIG_SUNRPC=m | 928 | CONFIG_SUNRPC=m |
| 925 | CONFIG_SUNRPC_GSS=m | 929 | CONFIG_SUNRPC_GSS=m |
| 930 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
| 926 | CONFIG_RPCSEC_GSS_KRB5=m | 931 | CONFIG_RPCSEC_GSS_KRB5=m |
| 927 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 932 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 928 | CONFIG_SMB_FS=m | 933 | CONFIG_SMB_FS=m |
| @@ -996,7 +1001,13 @@ CONFIG_MAGIC_SYSRQ=y | |||
| 996 | # CONFIG_DEBUG_KERNEL is not set | 1001 | # CONFIG_DEBUG_KERNEL is not set |
| 997 | CONFIG_DEBUG_BUGVERBOSE=y | 1002 | CONFIG_DEBUG_BUGVERBOSE=y |
| 998 | CONFIG_DEBUG_MEMORY_INIT=y | 1003 | CONFIG_DEBUG_MEMORY_INIT=y |
| 1004 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
| 999 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1005 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
| 1006 | |||
| 1007 | # | ||
| 1008 | # Tracers | ||
| 1009 | # | ||
| 1010 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
| 1000 | # CONFIG_SAMPLES is not set | 1011 | # CONFIG_SAMPLES is not set |
| 1001 | 1012 | ||
| 1002 | # | 1013 | # |
| @@ -1004,6 +1015,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y | |||
| 1004 | # | 1015 | # |
| 1005 | # CONFIG_KEYS is not set | 1016 | # CONFIG_KEYS is not set |
| 1006 | # CONFIG_SECURITY is not set | 1017 | # CONFIG_SECURITY is not set |
| 1018 | # CONFIG_SECURITYFS is not set | ||
| 1007 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1019 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1008 | CONFIG_XOR_BLOCKS=m | 1020 | CONFIG_XOR_BLOCKS=m |
| 1009 | CONFIG_ASYNC_CORE=m | 1021 | CONFIG_ASYNC_CORE=m |
| @@ -1014,10 +1026,12 @@ CONFIG_CRYPTO=y | |||
| 1014 | # | 1026 | # |
| 1015 | # Crypto core or helper | 1027 | # Crypto core or helper |
| 1016 | # | 1028 | # |
| 1029 | # CONFIG_CRYPTO_FIPS is not set | ||
| 1017 | CONFIG_CRYPTO_ALGAPI=y | 1030 | CONFIG_CRYPTO_ALGAPI=y |
| 1018 | CONFIG_CRYPTO_AEAD=m | 1031 | CONFIG_CRYPTO_AEAD=y |
| 1019 | CONFIG_CRYPTO_BLKCIPHER=m | 1032 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1020 | CONFIG_CRYPTO_HASH=y | 1033 | CONFIG_CRYPTO_HASH=y |
| 1034 | CONFIG_CRYPTO_RNG=y | ||
| 1021 | CONFIG_CRYPTO_MANAGER=y | 1035 | CONFIG_CRYPTO_MANAGER=y |
| 1022 | CONFIG_CRYPTO_GF128MUL=m | 1036 | CONFIG_CRYPTO_GF128MUL=m |
| 1023 | CONFIG_CRYPTO_NULL=m | 1037 | CONFIG_CRYPTO_NULL=m |
| @@ -1091,14 +1105,17 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m | |||
| 1091 | # | 1105 | # |
| 1092 | CONFIG_CRYPTO_DEFLATE=m | 1106 | CONFIG_CRYPTO_DEFLATE=m |
| 1093 | CONFIG_CRYPTO_LZO=m | 1107 | CONFIG_CRYPTO_LZO=m |
| 1108 | |||
| 1109 | # | ||
| 1110 | # Random Number Generation | ||
| 1111 | # | ||
| 1112 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
| 1094 | # CONFIG_CRYPTO_HW is not set | 1113 | # CONFIG_CRYPTO_HW is not set |
| 1095 | 1114 | ||
| 1096 | # | 1115 | # |
| 1097 | # Library routines | 1116 | # Library routines |
| 1098 | # | 1117 | # |
| 1099 | CONFIG_BITREVERSE=y | 1118 | CONFIG_BITREVERSE=y |
| 1100 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1101 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
| 1102 | CONFIG_CRC_CCITT=m | 1119 | CONFIG_CRC_CCITT=m |
| 1103 | CONFIG_CRC16=m | 1120 | CONFIG_CRC16=m |
| 1104 | CONFIG_CRC_T10DIF=y | 1121 | CONFIG_CRC_T10DIF=y |
diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig index 1a806102b999..70693588031e 100644 --- a/arch/m68k/configs/multi_defconfig +++ b/arch/m68k/configs/multi_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.27-rc6 | 3 | # Linux kernel version: 2.6.28-rc7 |
| 4 | # Wed Sep 10 09:02:07 2008 | 4 | # Tue Dec 2 20:27:48 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -14,7 +14,6 @@ CONFIG_TIME_LOW_RES=y | |||
| 14 | CONFIG_GENERIC_IOMAP=y | 14 | CONFIG_GENERIC_IOMAP=y |
| 15 | CONFIG_NO_IOPORT=y | 15 | CONFIG_NO_IOPORT=y |
| 16 | # CONFIG_NO_DMA is not set | 16 | # CONFIG_NO_DMA is not set |
| 17 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
| 18 | CONFIG_HZ=100 | 17 | CONFIG_HZ=100 |
| 19 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 18 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 20 | 19 | ||
| @@ -67,22 +66,13 @@ CONFIG_SIGNALFD=y | |||
| 67 | CONFIG_TIMERFD=y | 66 | CONFIG_TIMERFD=y |
| 68 | CONFIG_EVENTFD=y | 67 | CONFIG_EVENTFD=y |
| 69 | CONFIG_SHMEM=y | 68 | CONFIG_SHMEM=y |
| 69 | CONFIG_AIO=y | ||
| 70 | CONFIG_VM_EVENT_COUNTERS=y | 70 | CONFIG_VM_EVENT_COUNTERS=y |
| 71 | CONFIG_SLAB=y | 71 | CONFIG_SLAB=y |
| 72 | # CONFIG_SLUB is not set | 72 | # CONFIG_SLUB is not set |
| 73 | # CONFIG_SLOB is not set | 73 | # CONFIG_SLOB is not set |
| 74 | # CONFIG_PROFILING is not set | 74 | # CONFIG_PROFILING is not set |
| 75 | # CONFIG_MARKERS is not set | 75 | # CONFIG_MARKERS is not set |
| 76 | # CONFIG_HAVE_OPROFILE is not set | ||
| 77 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
| 78 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
| 79 | # CONFIG_HAVE_KPROBES is not set | ||
| 80 | # CONFIG_HAVE_KRETPROBES is not set | ||
| 81 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
| 82 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 83 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 84 | # CONFIG_HAVE_CLK is not set | ||
| 85 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 86 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 76 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 87 | CONFIG_SLABINFO=y | 77 | CONFIG_SLABINFO=y |
| 88 | CONFIG_RT_MUTEXES=y | 78 | CONFIG_RT_MUTEXES=y |
| @@ -115,11 +105,11 @@ CONFIG_DEFAULT_AS=y | |||
| 115 | # CONFIG_DEFAULT_NOOP is not set | 105 | # CONFIG_DEFAULT_NOOP is not set |
| 116 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 106 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 117 | CONFIG_CLASSIC_RCU=y | 107 | CONFIG_CLASSIC_RCU=y |
| 108 | # CONFIG_FREEZER is not set | ||
| 118 | 109 | ||
| 119 | # | 110 | # |
| 120 | # Platform dependent setup | 111 | # Platform dependent setup |
| 121 | # | 112 | # |
| 122 | # CONFIG_SUN3 is not set | ||
| 123 | CONFIG_AMIGA=y | 113 | CONFIG_AMIGA=y |
| 124 | CONFIG_ATARI=y | 114 | CONFIG_ATARI=y |
| 125 | CONFIG_MAC=y | 115 | CONFIG_MAC=y |
| @@ -154,19 +144,21 @@ CONFIG_DISCONTIGMEM_MANUAL=y | |||
| 154 | CONFIG_DISCONTIGMEM=y | 144 | CONFIG_DISCONTIGMEM=y |
| 155 | CONFIG_FLAT_NODE_MEM_MAP=y | 145 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 156 | CONFIG_NEED_MULTIPLE_NODES=y | 146 | CONFIG_NEED_MULTIPLE_NODES=y |
| 157 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 158 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 159 | CONFIG_PAGEFLAGS_EXTENDED=y | 147 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 160 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 148 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 161 | # CONFIG_RESOURCES_64BIT is not set | 149 | # CONFIG_RESOURCES_64BIT is not set |
| 150 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
| 162 | CONFIG_ZONE_DMA_FLAG=1 | 151 | CONFIG_ZONE_DMA_FLAG=1 |
| 163 | CONFIG_BOUNCE=y | 152 | CONFIG_BOUNCE=y |
| 164 | CONFIG_VIRT_TO_BUS=y | 153 | CONFIG_VIRT_TO_BUS=y |
| 154 | CONFIG_UNEVICTABLE_LRU=y | ||
| 165 | 155 | ||
| 166 | # | 156 | # |
| 167 | # General setup | 157 | # General setup |
| 168 | # | 158 | # |
| 169 | CONFIG_BINFMT_ELF=y | 159 | CONFIG_BINFMT_ELF=y |
| 160 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 161 | CONFIG_HAVE_AOUT=y | ||
| 170 | CONFIG_BINFMT_AOUT=m | 162 | CONFIG_BINFMT_AOUT=m |
| 171 | CONFIG_BINFMT_MISC=m | 163 | CONFIG_BINFMT_MISC=m |
| 172 | CONFIG_ZORRO=y | 164 | CONFIG_ZORRO=y |
| @@ -222,7 +214,6 @@ CONFIG_INET_TCP_DIAG=m | |||
| 222 | CONFIG_TCP_CONG_CUBIC=y | 214 | CONFIG_TCP_CONG_CUBIC=y |
| 223 | CONFIG_DEFAULT_TCP_CONG="cubic" | 215 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 224 | # CONFIG_TCP_MD5SIG is not set | 216 | # CONFIG_TCP_MD5SIG is not set |
| 225 | # CONFIG_IP_VS is not set | ||
| 226 | CONFIG_IPV6=m | 217 | CONFIG_IPV6=m |
| 227 | CONFIG_IPV6_PRIVACY=y | 218 | CONFIG_IPV6_PRIVACY=y |
| 228 | CONFIG_IPV6_ROUTER_PREF=y | 219 | CONFIG_IPV6_ROUTER_PREF=y |
| @@ -272,13 +263,14 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
| 272 | CONFIG_NF_CONNTRACK_SIP=m | 263 | CONFIG_NF_CONNTRACK_SIP=m |
| 273 | CONFIG_NF_CONNTRACK_TFTP=m | 264 | CONFIG_NF_CONNTRACK_TFTP=m |
| 274 | # CONFIG_NF_CT_NETLINK is not set | 265 | # CONFIG_NF_CT_NETLINK is not set |
| 266 | # CONFIG_NETFILTER_TPROXY is not set | ||
| 275 | CONFIG_NETFILTER_XTABLES=m | 267 | CONFIG_NETFILTER_XTABLES=m |
| 276 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 268 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| 277 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 269 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
| 278 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 270 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
| 279 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 271 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
| 280 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
| 281 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 272 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
| 273 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
| 282 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | 274 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m |
| 283 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m | 275 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m |
| 284 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 276 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
| @@ -292,19 +284,22 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | |||
| 292 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 284 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
| 293 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 285 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
| 294 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 286 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
| 287 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | ||
| 295 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 288 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
| 296 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | 289 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m |
| 297 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 290 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
| 298 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 291 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
| 299 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 292 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
| 300 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 293 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
| 294 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
| 301 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 295 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
| 302 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 296 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
| 303 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
| 304 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 297 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
| 305 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | 298 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m |
| 306 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | 299 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m |
| 307 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 300 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
| 301 | CONFIG_NETFILTER_XT_MATCH_RECENT=m | ||
| 302 | # CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set | ||
| 308 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 303 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
| 309 | CONFIG_NETFILTER_XT_MATCH_STATE=m | 304 | CONFIG_NETFILTER_XT_MATCH_STATE=m |
| 310 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | 305 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m |
| @@ -312,20 +307,20 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m | |||
| 312 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 307 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
| 313 | CONFIG_NETFILTER_XT_MATCH_TIME=m | 308 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
| 314 | CONFIG_NETFILTER_XT_MATCH_U32=m | 309 | CONFIG_NETFILTER_XT_MATCH_U32=m |
| 315 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 310 | # CONFIG_IP_VS is not set |
| 316 | 311 | ||
| 317 | # | 312 | # |
| 318 | # IP: Netfilter Configuration | 313 | # IP: Netfilter Configuration |
| 319 | # | 314 | # |
| 315 | CONFIG_NF_DEFRAG_IPV4=m | ||
| 320 | CONFIG_NF_CONNTRACK_IPV4=m | 316 | CONFIG_NF_CONNTRACK_IPV4=m |
| 321 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y | 317 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y |
| 322 | CONFIG_IP_NF_QUEUE=m | 318 | CONFIG_IP_NF_QUEUE=m |
| 323 | CONFIG_IP_NF_IPTABLES=m | 319 | CONFIG_IP_NF_IPTABLES=m |
| 324 | CONFIG_IP_NF_MATCH_RECENT=m | 320 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
| 325 | CONFIG_IP_NF_MATCH_ECN=m | ||
| 326 | CONFIG_IP_NF_MATCH_AH=m | 321 | CONFIG_IP_NF_MATCH_AH=m |
| 322 | CONFIG_IP_NF_MATCH_ECN=m | ||
| 327 | CONFIG_IP_NF_MATCH_TTL=m | 323 | CONFIG_IP_NF_MATCH_TTL=m |
| 328 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
| 329 | CONFIG_IP_NF_FILTER=m | 324 | CONFIG_IP_NF_FILTER=m |
| 330 | CONFIG_IP_NF_TARGET_REJECT=m | 325 | CONFIG_IP_NF_TARGET_REJECT=m |
| 331 | CONFIG_IP_NF_TARGET_LOG=m | 326 | CONFIG_IP_NF_TARGET_LOG=m |
| @@ -333,8 +328,8 @@ CONFIG_IP_NF_TARGET_ULOG=m | |||
| 333 | CONFIG_NF_NAT=m | 328 | CONFIG_NF_NAT=m |
| 334 | CONFIG_NF_NAT_NEEDED=y | 329 | CONFIG_NF_NAT_NEEDED=y |
| 335 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 330 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
| 336 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
| 337 | CONFIG_IP_NF_TARGET_NETMAP=m | 331 | CONFIG_IP_NF_TARGET_NETMAP=m |
| 332 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
| 338 | CONFIG_NF_NAT_SNMP_BASIC=m | 333 | CONFIG_NF_NAT_SNMP_BASIC=m |
| 339 | CONFIG_NF_NAT_PROTO_GRE=m | 334 | CONFIG_NF_NAT_PROTO_GRE=m |
| 340 | CONFIG_NF_NAT_PROTO_UDPLITE=m | 335 | CONFIG_NF_NAT_PROTO_UDPLITE=m |
| @@ -347,9 +342,9 @@ CONFIG_NF_NAT_PPTP=m | |||
| 347 | CONFIG_NF_NAT_H323=m | 342 | CONFIG_NF_NAT_H323=m |
| 348 | CONFIG_NF_NAT_SIP=m | 343 | CONFIG_NF_NAT_SIP=m |
| 349 | CONFIG_IP_NF_MANGLE=m | 344 | CONFIG_IP_NF_MANGLE=m |
| 345 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
| 350 | CONFIG_IP_NF_TARGET_ECN=m | 346 | CONFIG_IP_NF_TARGET_ECN=m |
| 351 | CONFIG_IP_NF_TARGET_TTL=m | 347 | CONFIG_IP_NF_TARGET_TTL=m |
| 352 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
| 353 | CONFIG_IP_NF_RAW=m | 348 | CONFIG_IP_NF_RAW=m |
| 354 | CONFIG_IP_NF_ARPTABLES=m | 349 | CONFIG_IP_NF_ARPTABLES=m |
| 355 | CONFIG_IP_NF_ARPFILTER=m | 350 | CONFIG_IP_NF_ARPFILTER=m |
| @@ -361,16 +356,16 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
| 361 | CONFIG_NF_CONNTRACK_IPV6=m | 356 | CONFIG_NF_CONNTRACK_IPV6=m |
| 362 | CONFIG_IP6_NF_QUEUE=m | 357 | CONFIG_IP6_NF_QUEUE=m |
| 363 | CONFIG_IP6_NF_IPTABLES=m | 358 | CONFIG_IP6_NF_IPTABLES=m |
| 364 | CONFIG_IP6_NF_MATCH_RT=m | 359 | CONFIG_IP6_NF_MATCH_AH=m |
| 365 | CONFIG_IP6_NF_MATCH_OPTS=m | 360 | CONFIG_IP6_NF_MATCH_EUI64=m |
| 366 | CONFIG_IP6_NF_MATCH_FRAG=m | 361 | CONFIG_IP6_NF_MATCH_FRAG=m |
| 362 | CONFIG_IP6_NF_MATCH_OPTS=m | ||
| 367 | CONFIG_IP6_NF_MATCH_HL=m | 363 | CONFIG_IP6_NF_MATCH_HL=m |
| 368 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 364 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
| 369 | CONFIG_IP6_NF_MATCH_AH=m | ||
| 370 | CONFIG_IP6_NF_MATCH_MH=m | 365 | CONFIG_IP6_NF_MATCH_MH=m |
| 371 | CONFIG_IP6_NF_MATCH_EUI64=m | 366 | CONFIG_IP6_NF_MATCH_RT=m |
| 372 | CONFIG_IP6_NF_FILTER=m | ||
| 373 | CONFIG_IP6_NF_TARGET_LOG=m | 367 | CONFIG_IP6_NF_TARGET_LOG=m |
| 368 | CONFIG_IP6_NF_FILTER=m | ||
| 374 | CONFIG_IP6_NF_TARGET_REJECT=m | 369 | CONFIG_IP6_NF_TARGET_REJECT=m |
| 375 | CONFIG_IP6_NF_MANGLE=m | 370 | CONFIG_IP6_NF_MANGLE=m |
| 376 | CONFIG_IP6_NF_TARGET_HL=m | 371 | CONFIG_IP6_NF_TARGET_HL=m |
| @@ -397,6 +392,7 @@ CONFIG_SCTP_HMAC_MD5=y | |||
| 397 | # CONFIG_TIPC is not set | 392 | # CONFIG_TIPC is not set |
| 398 | # CONFIG_ATM is not set | 393 | # CONFIG_ATM is not set |
| 399 | # CONFIG_BRIDGE is not set | 394 | # CONFIG_BRIDGE is not set |
| 395 | # CONFIG_NET_DSA is not set | ||
| 400 | # CONFIG_VLAN_8021Q is not set | 396 | # CONFIG_VLAN_8021Q is not set |
| 401 | # CONFIG_DECNET is not set | 397 | # CONFIG_DECNET is not set |
| 402 | CONFIG_LLC=m | 398 | CONFIG_LLC=m |
| @@ -424,19 +420,8 @@ CONFIG_NET_CLS_ROUTE=y | |||
| 424 | # CONFIG_IRDA is not set | 420 | # CONFIG_IRDA is not set |
| 425 | # CONFIG_BT is not set | 421 | # CONFIG_BT is not set |
| 426 | # CONFIG_AF_RXRPC is not set | 422 | # CONFIG_AF_RXRPC is not set |
| 427 | 423 | # CONFIG_PHONET is not set | |
| 428 | # | 424 | # CONFIG_WIRELESS is not set |
| 429 | # Wireless | ||
| 430 | # | ||
| 431 | # CONFIG_CFG80211 is not set | ||
| 432 | CONFIG_WIRELESS_EXT=y | ||
| 433 | # CONFIG_WIRELESS_EXT_SYSFS is not set | ||
| 434 | # CONFIG_MAC80211 is not set | ||
| 435 | CONFIG_IEEE80211=m | ||
| 436 | # CONFIG_IEEE80211_DEBUG is not set | ||
| 437 | CONFIG_IEEE80211_CRYPT_WEP=m | ||
| 438 | CONFIG_IEEE80211_CRYPT_CCMP=m | ||
| 439 | CONFIG_IEEE80211_CRYPT_TKIP=m | ||
| 440 | # CONFIG_RFKILL is not set | 425 | # CONFIG_RFKILL is not set |
| 441 | # CONFIG_NET_9P is not set | 426 | # CONFIG_NET_9P is not set |
| 442 | 427 | ||
| @@ -486,21 +471,20 @@ CONFIG_ATA_OVER_ETH=m | |||
| 486 | CONFIG_MISC_DEVICES=y | 471 | CONFIG_MISC_DEVICES=y |
| 487 | # CONFIG_EEPROM_93CX6 is not set | 472 | # CONFIG_EEPROM_93CX6 is not set |
| 488 | # CONFIG_ENCLOSURE_SERVICES is not set | 473 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 474 | # CONFIG_C2PORT is not set | ||
| 489 | CONFIG_HAVE_IDE=y | 475 | CONFIG_HAVE_IDE=y |
| 490 | CONFIG_IDE=y | 476 | CONFIG_IDE=y |
| 491 | CONFIG_BLK_DEV_IDE=y | ||
| 492 | 477 | ||
| 493 | # | 478 | # |
| 494 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | 479 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
| 495 | # | 480 | # |
| 496 | CONFIG_IDE_ATAPI=y | ||
| 497 | # CONFIG_BLK_DEV_IDE_SATA is not set | 481 | # CONFIG_BLK_DEV_IDE_SATA is not set |
| 498 | CONFIG_BLK_DEV_IDEDISK=y | 482 | CONFIG_IDE_GD=y |
| 499 | # CONFIG_IDEDISK_MULTI_MODE is not set | 483 | CONFIG_IDE_GD_ATA=y |
| 484 | # CONFIG_IDE_GD_ATAPI is not set | ||
| 500 | CONFIG_BLK_DEV_IDECD=y | 485 | CONFIG_BLK_DEV_IDECD=y |
| 501 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y | 486 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y |
| 502 | # CONFIG_BLK_DEV_IDETAPE is not set | 487 | # CONFIG_BLK_DEV_IDETAPE is not set |
| 503 | CONFIG_BLK_DEV_IDEFLOPPY=m | ||
| 504 | # CONFIG_BLK_DEV_IDESCSI is not set | 488 | # CONFIG_BLK_DEV_IDESCSI is not set |
| 505 | # CONFIG_IDE_TASK_IOCTL is not set | 489 | # CONFIG_IDE_TASK_IOCTL is not set |
| 506 | CONFIG_IDE_PROC_FS=y | 490 | CONFIG_IDE_PROC_FS=y |
| @@ -629,7 +613,7 @@ CONFIG_VETH=m | |||
| 629 | # CONFIG_ARCNET is not set | 613 | # CONFIG_ARCNET is not set |
| 630 | # CONFIG_PHYLIB is not set | 614 | # CONFIG_PHYLIB is not set |
| 631 | CONFIG_NET_ETHERNET=y | 615 | CONFIG_NET_ETHERNET=y |
| 632 | CONFIG_MII=m | 616 | CONFIG_MII=y |
| 633 | CONFIG_ARIADNE=m | 617 | CONFIG_ARIADNE=m |
| 634 | CONFIG_A2065=m | 618 | CONFIG_A2065=m |
| 635 | CONFIG_HYDRA=m | 619 | CONFIG_HYDRA=m |
| @@ -657,8 +641,12 @@ CONFIG_NE2000=m | |||
| 657 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 641 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 658 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 642 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| 659 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 643 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
| 644 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
| 645 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
| 646 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
| 660 | # CONFIG_NET_PCI is not set | 647 | # CONFIG_NET_PCI is not set |
| 661 | # CONFIG_B44 is not set | 648 | # CONFIG_B44 is not set |
| 649 | # CONFIG_CS89x0 is not set | ||
| 662 | # CONFIG_NET_POCKET is not set | 650 | # CONFIG_NET_POCKET is not set |
| 663 | # CONFIG_NETDEV_1000 is not set | 651 | # CONFIG_NETDEV_1000 is not set |
| 664 | # CONFIG_NETDEV_10000 is not set | 652 | # CONFIG_NETDEV_10000 is not set |
| @@ -735,6 +723,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y | |||
| 735 | CONFIG_MOUSE_PS2_SYNAPTICS=y | 723 | CONFIG_MOUSE_PS2_SYNAPTICS=y |
| 736 | CONFIG_MOUSE_PS2_LIFEBOOK=y | 724 | CONFIG_MOUSE_PS2_LIFEBOOK=y |
| 737 | CONFIG_MOUSE_PS2_TRACKPOINT=y | 725 | CONFIG_MOUSE_PS2_TRACKPOINT=y |
| 726 | # CONFIG_MOUSE_PS2_ELANTECH is not set | ||
| 738 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 727 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
| 739 | CONFIG_MOUSE_SERIAL=m | 728 | CONFIG_MOUSE_SERIAL=m |
| 740 | # CONFIG_MOUSE_INPORT is not set | 729 | # CONFIG_MOUSE_INPORT is not set |
| @@ -832,11 +821,11 @@ CONFIG_GEN_RTC_X=y | |||
| 832 | # CONFIG_THERMAL is not set | 821 | # CONFIG_THERMAL is not set |
| 833 | # CONFIG_THERMAL_HWMON is not set | 822 | # CONFIG_THERMAL_HWMON is not set |
| 834 | # CONFIG_WATCHDOG is not set | 823 | # CONFIG_WATCHDOG is not set |
| 824 | CONFIG_SSB_POSSIBLE=y | ||
| 835 | 825 | ||
| 836 | # | 826 | # |
| 837 | # Sonics Silicon Backplane | 827 | # Sonics Silicon Backplane |
| 838 | # | 828 | # |
| 839 | CONFIG_SSB_POSSIBLE=y | ||
| 840 | # CONFIG_SSB is not set | 829 | # CONFIG_SSB is not set |
| 841 | 830 | ||
| 842 | # | 831 | # |
| @@ -846,6 +835,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 846 | # CONFIG_MFD_SM501 is not set | 835 | # CONFIG_MFD_SM501 is not set |
| 847 | # CONFIG_HTC_PASIC3 is not set | 836 | # CONFIG_HTC_PASIC3 is not set |
| 848 | # CONFIG_MFD_TMIO is not set | 837 | # CONFIG_MFD_TMIO is not set |
| 838 | # CONFIG_REGULATOR is not set | ||
| 849 | 839 | ||
| 850 | # | 840 | # |
| 851 | # Multimedia devices | 841 | # Multimedia devices |
| @@ -871,6 +861,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 871 | CONFIG_FB=y | 861 | CONFIG_FB=y |
| 872 | # CONFIG_FIRMWARE_EDID is not set | 862 | # CONFIG_FIRMWARE_EDID is not set |
| 873 | # CONFIG_FB_DDC is not set | 863 | # CONFIG_FB_DDC is not set |
| 864 | # CONFIG_FB_BOOT_VESA_SUPPORT is not set | ||
| 874 | CONFIG_FB_CFB_FILLRECT=y | 865 | CONFIG_FB_CFB_FILLRECT=y |
| 875 | CONFIG_FB_CFB_COPYAREA=y | 866 | CONFIG_FB_CFB_COPYAREA=y |
| 876 | CONFIG_FB_CFB_IMAGEBLIT=y | 867 | CONFIG_FB_CFB_IMAGEBLIT=y |
| @@ -905,6 +896,8 @@ CONFIG_FB_HP300=y | |||
| 905 | # CONFIG_FB_S1D13XXX is not set | 896 | # CONFIG_FB_S1D13XXX is not set |
| 906 | # CONFIG_FB_ATY is not set | 897 | # CONFIG_FB_ATY is not set |
| 907 | # CONFIG_FB_VIRTUAL is not set | 898 | # CONFIG_FB_VIRTUAL is not set |
| 899 | # CONFIG_FB_METRONOME is not set | ||
| 900 | # CONFIG_FB_MB862XX is not set | ||
| 908 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 901 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 909 | 902 | ||
| 910 | # | 903 | # |
| @@ -930,6 +923,7 @@ CONFIG_LOGO_LINUX_VGA16=y | |||
| 930 | CONFIG_LOGO_LINUX_CLUT224=y | 923 | CONFIG_LOGO_LINUX_CLUT224=y |
| 931 | CONFIG_LOGO_MAC_CLUT224=y | 924 | CONFIG_LOGO_MAC_CLUT224=y |
| 932 | CONFIG_SOUND=m | 925 | CONFIG_SOUND=m |
| 926 | CONFIG_SOUND_OSS_CORE=y | ||
| 933 | CONFIG_DMASOUND_ATARI=m | 927 | CONFIG_DMASOUND_ATARI=m |
| 934 | CONFIG_DMASOUND_PAULA=m | 928 | CONFIG_DMASOUND_PAULA=m |
| 935 | CONFIG_DMASOUND_Q40=m | 929 | CONFIG_DMASOUND_Q40=m |
| @@ -938,6 +932,12 @@ CONFIG_HID_SUPPORT=y | |||
| 938 | CONFIG_HID=m | 932 | CONFIG_HID=m |
| 939 | # CONFIG_HID_DEBUG is not set | 933 | # CONFIG_HID_DEBUG is not set |
| 940 | CONFIG_HIDRAW=y | 934 | CONFIG_HIDRAW=y |
| 935 | # CONFIG_HID_PID is not set | ||
| 936 | |||
| 937 | # | ||
| 938 | # Special HID drivers | ||
| 939 | # | ||
| 940 | CONFIG_HID_COMPAT=y | ||
| 941 | # CONFIG_USB_SUPPORT is not set | 941 | # CONFIG_USB_SUPPORT is not set |
| 942 | # CONFIG_MMC is not set | 942 | # CONFIG_MMC is not set |
| 943 | # CONFIG_MEMSTICK is not set | 943 | # CONFIG_MEMSTICK is not set |
| @@ -947,6 +947,8 @@ CONFIG_HIDRAW=y | |||
| 947 | # CONFIG_DMADEVICES is not set | 947 | # CONFIG_DMADEVICES is not set |
| 948 | # CONFIG_AUXDISPLAY is not set | 948 | # CONFIG_AUXDISPLAY is not set |
| 949 | # CONFIG_UIO is not set | 949 | # CONFIG_UIO is not set |
| 950 | # CONFIG_STAGING is not set | ||
| 951 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 950 | 952 | ||
| 951 | # | 953 | # |
| 952 | # Character devices | 954 | # Character devices |
| @@ -973,10 +975,9 @@ CONFIG_EXT2_FS=y | |||
| 973 | # CONFIG_EXT2_FS_XIP is not set | 975 | # CONFIG_EXT2_FS_XIP is not set |
| 974 | CONFIG_EXT3_FS=y | 976 | CONFIG_EXT3_FS=y |
| 975 | # CONFIG_EXT3_FS_XATTR is not set | 977 | # CONFIG_EXT3_FS_XATTR is not set |
| 976 | CONFIG_EXT4DEV_FS=y | 978 | # CONFIG_EXT4_FS is not set |
| 977 | # CONFIG_EXT4DEV_FS_XATTR is not set | ||
| 978 | CONFIG_JBD=y | 979 | CONFIG_JBD=y |
| 979 | CONFIG_JBD2=y | 980 | CONFIG_JBD2=m |
| 980 | CONFIG_REISERFS_FS=m | 981 | CONFIG_REISERFS_FS=m |
| 981 | # CONFIG_REISERFS_CHECK is not set | 982 | # CONFIG_REISERFS_CHECK is not set |
| 982 | # CONFIG_REISERFS_PROC_INFO is not set | 983 | # CONFIG_REISERFS_PROC_INFO is not set |
| @@ -987,6 +988,7 @@ CONFIG_JFS_FS=m | |||
| 987 | # CONFIG_JFS_DEBUG is not set | 988 | # CONFIG_JFS_DEBUG is not set |
| 988 | # CONFIG_JFS_STATISTICS is not set | 989 | # CONFIG_JFS_STATISTICS is not set |
| 989 | # CONFIG_FS_POSIX_ACL is not set | 990 | # CONFIG_FS_POSIX_ACL is not set |
| 991 | CONFIG_FILE_LOCKING=y | ||
| 990 | CONFIG_XFS_FS=m | 992 | CONFIG_XFS_FS=m |
| 991 | # CONFIG_XFS_QUOTA is not set | 993 | # CONFIG_XFS_QUOTA is not set |
| 992 | # CONFIG_XFS_POSIX_ACL is not set | 994 | # CONFIG_XFS_POSIX_ACL is not set |
| @@ -998,6 +1000,7 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | |||
| 998 | # CONFIG_OCFS2_FS_STATS is not set | 1000 | # CONFIG_OCFS2_FS_STATS is not set |
| 999 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 1001 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
| 1000 | # CONFIG_OCFS2_DEBUG_FS is not set | 1002 | # CONFIG_OCFS2_DEBUG_FS is not set |
| 1003 | # CONFIG_OCFS2_COMPAT_JBD is not set | ||
| 1001 | CONFIG_DNOTIFY=y | 1004 | CONFIG_DNOTIFY=y |
| 1002 | CONFIG_INOTIFY=y | 1005 | CONFIG_INOTIFY=y |
| 1003 | CONFIG_INOTIFY_USER=y | 1006 | CONFIG_INOTIFY_USER=y |
| @@ -1036,6 +1039,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
| 1036 | CONFIG_PROC_FS=y | 1039 | CONFIG_PROC_FS=y |
| 1037 | CONFIG_PROC_KCORE=y | 1040 | CONFIG_PROC_KCORE=y |
| 1038 | CONFIG_PROC_SYSCTL=y | 1041 | CONFIG_PROC_SYSCTL=y |
| 1042 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 1039 | CONFIG_SYSFS=y | 1043 | CONFIG_SYSFS=y |
| 1040 | CONFIG_TMPFS=y | 1044 | CONFIG_TMPFS=y |
| 1041 | # CONFIG_TMPFS_POSIX_ACL is not set | 1045 | # CONFIG_TMPFS_POSIX_ACL is not set |
| @@ -1079,6 +1083,7 @@ CONFIG_EXPORTFS=m | |||
| 1079 | CONFIG_NFS_COMMON=y | 1083 | CONFIG_NFS_COMMON=y |
| 1080 | CONFIG_SUNRPC=y | 1084 | CONFIG_SUNRPC=y |
| 1081 | CONFIG_SUNRPC_GSS=y | 1085 | CONFIG_SUNRPC_GSS=y |
| 1086 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
| 1082 | CONFIG_RPCSEC_GSS_KRB5=y | 1087 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1083 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1088 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1084 | CONFIG_SMB_FS=m | 1089 | CONFIG_SMB_FS=m |
| @@ -1156,7 +1161,13 @@ CONFIG_MAGIC_SYSRQ=y | |||
| 1156 | # CONFIG_DEBUG_KERNEL is not set | 1161 | # CONFIG_DEBUG_KERNEL is not set |
| 1157 | CONFIG_DEBUG_BUGVERBOSE=y | 1162 | CONFIG_DEBUG_BUGVERBOSE=y |
| 1158 | CONFIG_DEBUG_MEMORY_INIT=y | 1163 | CONFIG_DEBUG_MEMORY_INIT=y |
| 1164 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
| 1159 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1165 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
| 1166 | |||
| 1167 | # | ||
| 1168 | # Tracers | ||
| 1169 | # | ||
| 1170 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
| 1160 | # CONFIG_SAMPLES is not set | 1171 | # CONFIG_SAMPLES is not set |
| 1161 | 1172 | ||
| 1162 | # | 1173 | # |
| @@ -1164,6 +1175,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y | |||
| 1164 | # | 1175 | # |
| 1165 | # CONFIG_KEYS is not set | 1176 | # CONFIG_KEYS is not set |
| 1166 | # CONFIG_SECURITY is not set | 1177 | # CONFIG_SECURITY is not set |
| 1178 | # CONFIG_SECURITYFS is not set | ||
| 1167 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1179 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1168 | CONFIG_XOR_BLOCKS=m | 1180 | CONFIG_XOR_BLOCKS=m |
| 1169 | CONFIG_ASYNC_CORE=m | 1181 | CONFIG_ASYNC_CORE=m |
| @@ -1174,10 +1186,12 @@ CONFIG_CRYPTO=y | |||
| 1174 | # | 1186 | # |
| 1175 | # Crypto core or helper | 1187 | # Crypto core or helper |
| 1176 | # | 1188 | # |
| 1189 | # CONFIG_CRYPTO_FIPS is not set | ||
| 1177 | CONFIG_CRYPTO_ALGAPI=y | 1190 | CONFIG_CRYPTO_ALGAPI=y |
| 1178 | CONFIG_CRYPTO_AEAD=m | 1191 | CONFIG_CRYPTO_AEAD=y |
| 1179 | CONFIG_CRYPTO_BLKCIPHER=y | 1192 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1180 | CONFIG_CRYPTO_HASH=y | 1193 | CONFIG_CRYPTO_HASH=y |
| 1194 | CONFIG_CRYPTO_RNG=y | ||
| 1181 | CONFIG_CRYPTO_MANAGER=y | 1195 | CONFIG_CRYPTO_MANAGER=y |
| 1182 | CONFIG_CRYPTO_GF128MUL=m | 1196 | CONFIG_CRYPTO_GF128MUL=m |
| 1183 | CONFIG_CRYPTO_NULL=m | 1197 | CONFIG_CRYPTO_NULL=m |
| @@ -1251,14 +1265,17 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m | |||
| 1251 | # | 1265 | # |
| 1252 | CONFIG_CRYPTO_DEFLATE=m | 1266 | CONFIG_CRYPTO_DEFLATE=m |
| 1253 | CONFIG_CRYPTO_LZO=m | 1267 | CONFIG_CRYPTO_LZO=m |
| 1268 | |||
| 1269 | # | ||
| 1270 | # Random Number Generation | ||
| 1271 | # | ||
| 1272 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
| 1254 | # CONFIG_CRYPTO_HW is not set | 1273 | # CONFIG_CRYPTO_HW is not set |
| 1255 | 1274 | ||
| 1256 | # | 1275 | # |
| 1257 | # Library routines | 1276 | # Library routines |
| 1258 | # | 1277 | # |
| 1259 | CONFIG_BITREVERSE=y | 1278 | CONFIG_BITREVERSE=y |
| 1260 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1261 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
| 1262 | CONFIG_CRC_CCITT=m | 1279 | CONFIG_CRC_CCITT=m |
| 1263 | CONFIG_CRC16=y | 1280 | CONFIG_CRC16=y |
| 1264 | CONFIG_CRC_T10DIF=y | 1281 | CONFIG_CRC_T10DIF=y |
diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme147_defconfig index cacb5aef6a37..52d42715bd0b 100644 --- a/arch/m68k/configs/mvme147_defconfig +++ b/arch/m68k/configs/mvme147_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.27-rc6 | 3 | # Linux kernel version: 2.6.28-rc7 |
| 4 | # Wed Sep 10 09:02:08 2008 | 4 | # Tue Dec 2 20:27:50 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -14,7 +14,6 @@ CONFIG_TIME_LOW_RES=y | |||
| 14 | CONFIG_GENERIC_IOMAP=y | 14 | CONFIG_GENERIC_IOMAP=y |
| 15 | CONFIG_NO_IOPORT=y | 15 | CONFIG_NO_IOPORT=y |
| 16 | # CONFIG_NO_DMA is not set | 16 | # CONFIG_NO_DMA is not set |
| 17 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
| 18 | CONFIG_HZ=100 | 17 | CONFIG_HZ=100 |
| 19 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 18 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 20 | 19 | ||
| @@ -67,22 +66,13 @@ CONFIG_SIGNALFD=y | |||
| 67 | CONFIG_TIMERFD=y | 66 | CONFIG_TIMERFD=y |
| 68 | CONFIG_EVENTFD=y | 67 | CONFIG_EVENTFD=y |
| 69 | CONFIG_SHMEM=y | 68 | CONFIG_SHMEM=y |
| 69 | CONFIG_AIO=y | ||
| 70 | CONFIG_VM_EVENT_COUNTERS=y | 70 | CONFIG_VM_EVENT_COUNTERS=y |
| 71 | CONFIG_SLAB=y | 71 | CONFIG_SLAB=y |
| 72 | # CONFIG_SLUB is not set | 72 | # CONFIG_SLUB is not set |
| 73 | # CONFIG_SLOB is not set | 73 | # CONFIG_SLOB is not set |
| 74 | # CONFIG_PROFILING is not set | 74 | # CONFIG_PROFILING is not set |
| 75 | # CONFIG_MARKERS is not set | 75 | # CONFIG_MARKERS is not set |
| 76 | # CONFIG_HAVE_OPROFILE is not set | ||
| 77 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
| 78 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
| 79 | # CONFIG_HAVE_KPROBES is not set | ||
| 80 | # CONFIG_HAVE_KRETPROBES is not set | ||
| 81 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
| 82 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 83 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 84 | # CONFIG_HAVE_CLK is not set | ||
| 85 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 86 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 76 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 87 | CONFIG_SLABINFO=y | 77 | CONFIG_SLABINFO=y |
| 88 | CONFIG_RT_MUTEXES=y | 78 | CONFIG_RT_MUTEXES=y |
| @@ -115,11 +105,11 @@ CONFIG_DEFAULT_AS=y | |||
| 115 | # CONFIG_DEFAULT_NOOP is not set | 105 | # CONFIG_DEFAULT_NOOP is not set |
| 116 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 106 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 117 | CONFIG_CLASSIC_RCU=y | 107 | CONFIG_CLASSIC_RCU=y |
| 108 | # CONFIG_FREEZER is not set | ||
| 118 | 109 | ||
| 119 | # | 110 | # |
| 120 | # Platform dependent setup | 111 | # Platform dependent setup |
| 121 | # | 112 | # |
| 122 | # CONFIG_SUN3 is not set | ||
| 123 | # CONFIG_AMIGA is not set | 113 | # CONFIG_AMIGA is not set |
| 124 | # CONFIG_ATARI is not set | 114 | # CONFIG_ATARI is not set |
| 125 | # CONFIG_MAC is not set | 115 | # CONFIG_MAC is not set |
| @@ -151,19 +141,21 @@ CONFIG_DISCONTIGMEM_MANUAL=y | |||
| 151 | CONFIG_DISCONTIGMEM=y | 141 | CONFIG_DISCONTIGMEM=y |
| 152 | CONFIG_FLAT_NODE_MEM_MAP=y | 142 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 153 | CONFIG_NEED_MULTIPLE_NODES=y | 143 | CONFIG_NEED_MULTIPLE_NODES=y |
| 154 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 155 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 156 | CONFIG_PAGEFLAGS_EXTENDED=y | 144 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 157 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 145 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 158 | # CONFIG_RESOURCES_64BIT is not set | 146 | # CONFIG_RESOURCES_64BIT is not set |
| 147 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
| 159 | CONFIG_ZONE_DMA_FLAG=1 | 148 | CONFIG_ZONE_DMA_FLAG=1 |
| 160 | CONFIG_BOUNCE=y | 149 | CONFIG_BOUNCE=y |
| 161 | CONFIG_VIRT_TO_BUS=y | 150 | CONFIG_VIRT_TO_BUS=y |
| 151 | CONFIG_UNEVICTABLE_LRU=y | ||
| 162 | 152 | ||
| 163 | # | 153 | # |
| 164 | # General setup | 154 | # General setup |
| 165 | # | 155 | # |
| 166 | CONFIG_BINFMT_ELF=y | 156 | CONFIG_BINFMT_ELF=y |
| 157 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 158 | CONFIG_HAVE_AOUT=y | ||
| 167 | CONFIG_BINFMT_AOUT=m | 159 | CONFIG_BINFMT_AOUT=m |
| 168 | CONFIG_BINFMT_MISC=m | 160 | CONFIG_BINFMT_MISC=m |
| 169 | CONFIG_PROC_HARDWARE=y | 161 | CONFIG_PROC_HARDWARE=y |
| @@ -212,7 +204,6 @@ CONFIG_INET_TCP_DIAG=m | |||
| 212 | CONFIG_TCP_CONG_CUBIC=y | 204 | CONFIG_TCP_CONG_CUBIC=y |
| 213 | CONFIG_DEFAULT_TCP_CONG="cubic" | 205 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 214 | # CONFIG_TCP_MD5SIG is not set | 206 | # CONFIG_TCP_MD5SIG is not set |
| 215 | # CONFIG_IP_VS is not set | ||
| 216 | CONFIG_IPV6=m | 207 | CONFIG_IPV6=m |
| 217 | CONFIG_IPV6_PRIVACY=y | 208 | CONFIG_IPV6_PRIVACY=y |
| 218 | CONFIG_IPV6_ROUTER_PREF=y | 209 | CONFIG_IPV6_ROUTER_PREF=y |
| @@ -262,13 +253,14 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
| 262 | CONFIG_NF_CONNTRACK_SIP=m | 253 | CONFIG_NF_CONNTRACK_SIP=m |
| 263 | CONFIG_NF_CONNTRACK_TFTP=m | 254 | CONFIG_NF_CONNTRACK_TFTP=m |
| 264 | # CONFIG_NF_CT_NETLINK is not set | 255 | # CONFIG_NF_CT_NETLINK is not set |
| 256 | # CONFIG_NETFILTER_TPROXY is not set | ||
| 265 | CONFIG_NETFILTER_XTABLES=m | 257 | CONFIG_NETFILTER_XTABLES=m |
| 266 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 258 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| 267 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 259 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
| 268 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 260 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
| 269 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 261 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
| 270 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
| 271 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 262 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
| 263 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
| 272 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | 264 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m |
| 273 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m | 265 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m |
| 274 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 266 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
| @@ -282,19 +274,22 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | |||
| 282 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 274 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
| 283 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 275 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
| 284 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 276 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
| 277 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | ||
| 285 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 278 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
| 286 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | 279 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m |
| 287 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 280 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
| 288 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 281 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
| 289 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 282 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
| 290 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 283 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
| 284 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
| 291 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 285 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
| 292 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 286 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
| 293 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
| 294 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 287 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
| 295 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | 288 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m |
| 296 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | 289 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m |
| 297 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 290 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
| 291 | CONFIG_NETFILTER_XT_MATCH_RECENT=m | ||
| 292 | # CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set | ||
| 298 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 293 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
| 299 | CONFIG_NETFILTER_XT_MATCH_STATE=m | 294 | CONFIG_NETFILTER_XT_MATCH_STATE=m |
| 300 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | 295 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m |
| @@ -302,20 +297,20 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m | |||
| 302 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 297 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
| 303 | CONFIG_NETFILTER_XT_MATCH_TIME=m | 298 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
| 304 | CONFIG_NETFILTER_XT_MATCH_U32=m | 299 | CONFIG_NETFILTER_XT_MATCH_U32=m |
| 305 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 300 | # CONFIG_IP_VS is not set |
| 306 | 301 | ||
| 307 | # | 302 | # |
| 308 | # IP: Netfilter Configuration | 303 | # IP: Netfilter Configuration |
| 309 | # | 304 | # |
| 305 | CONFIG_NF_DEFRAG_IPV4=m | ||
| 310 | CONFIG_NF_CONNTRACK_IPV4=m | 306 | CONFIG_NF_CONNTRACK_IPV4=m |
| 311 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y | 307 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y |
| 312 | CONFIG_IP_NF_QUEUE=m | 308 | CONFIG_IP_NF_QUEUE=m |
| 313 | CONFIG_IP_NF_IPTABLES=m | 309 | CONFIG_IP_NF_IPTABLES=m |
| 314 | CONFIG_IP_NF_MATCH_RECENT=m | 310 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
| 315 | CONFIG_IP_NF_MATCH_ECN=m | ||
| 316 | CONFIG_IP_NF_MATCH_AH=m | 311 | CONFIG_IP_NF_MATCH_AH=m |
| 312 | CONFIG_IP_NF_MATCH_ECN=m | ||
| 317 | CONFIG_IP_NF_MATCH_TTL=m | 313 | CONFIG_IP_NF_MATCH_TTL=m |
| 318 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
| 319 | CONFIG_IP_NF_FILTER=m | 314 | CONFIG_IP_NF_FILTER=m |
| 320 | CONFIG_IP_NF_TARGET_REJECT=m | 315 | CONFIG_IP_NF_TARGET_REJECT=m |
| 321 | CONFIG_IP_NF_TARGET_LOG=m | 316 | CONFIG_IP_NF_TARGET_LOG=m |
| @@ -323,8 +318,8 @@ CONFIG_IP_NF_TARGET_ULOG=m | |||
| 323 | CONFIG_NF_NAT=m | 318 | CONFIG_NF_NAT=m |
| 324 | CONFIG_NF_NAT_NEEDED=y | 319 | CONFIG_NF_NAT_NEEDED=y |
| 325 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 320 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
| 326 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
| 327 | CONFIG_IP_NF_TARGET_NETMAP=m | 321 | CONFIG_IP_NF_TARGET_NETMAP=m |
| 322 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
| 328 | CONFIG_NF_NAT_SNMP_BASIC=m | 323 | CONFIG_NF_NAT_SNMP_BASIC=m |
| 329 | CONFIG_NF_NAT_PROTO_GRE=m | 324 | CONFIG_NF_NAT_PROTO_GRE=m |
| 330 | CONFIG_NF_NAT_PROTO_UDPLITE=m | 325 | CONFIG_NF_NAT_PROTO_UDPLITE=m |
| @@ -337,9 +332,9 @@ CONFIG_NF_NAT_PPTP=m | |||
| 337 | CONFIG_NF_NAT_H323=m | 332 | CONFIG_NF_NAT_H323=m |
| 338 | CONFIG_NF_NAT_SIP=m | 333 | CONFIG_NF_NAT_SIP=m |
| 339 | CONFIG_IP_NF_MANGLE=m | 334 | CONFIG_IP_NF_MANGLE=m |
| 335 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
| 340 | CONFIG_IP_NF_TARGET_ECN=m | 336 | CONFIG_IP_NF_TARGET_ECN=m |
| 341 | CONFIG_IP_NF_TARGET_TTL=m | 337 | CONFIG_IP_NF_TARGET_TTL=m |
| 342 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
| 343 | CONFIG_IP_NF_RAW=m | 338 | CONFIG_IP_NF_RAW=m |
| 344 | CONFIG_IP_NF_ARPTABLES=m | 339 | CONFIG_IP_NF_ARPTABLES=m |
| 345 | CONFIG_IP_NF_ARPFILTER=m | 340 | CONFIG_IP_NF_ARPFILTER=m |
| @@ -351,16 +346,16 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
| 351 | CONFIG_NF_CONNTRACK_IPV6=m | 346 | CONFIG_NF_CONNTRACK_IPV6=m |
| 352 | CONFIG_IP6_NF_QUEUE=m | 347 | CONFIG_IP6_NF_QUEUE=m |
| 353 | CONFIG_IP6_NF_IPTABLES=m | 348 | CONFIG_IP6_NF_IPTABLES=m |
| 354 | CONFIG_IP6_NF_MATCH_RT=m | 349 | CONFIG_IP6_NF_MATCH_AH=m |
| 355 | CONFIG_IP6_NF_MATCH_OPTS=m | 350 | CONFIG_IP6_NF_MATCH_EUI64=m |
| 356 | CONFIG_IP6_NF_MATCH_FRAG=m | 351 | CONFIG_IP6_NF_MATCH_FRAG=m |
| 352 | CONFIG_IP6_NF_MATCH_OPTS=m | ||
| 357 | CONFIG_IP6_NF_MATCH_HL=m | 353 | CONFIG_IP6_NF_MATCH_HL=m |
| 358 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 354 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
| 359 | CONFIG_IP6_NF_MATCH_AH=m | ||
| 360 | CONFIG_IP6_NF_MATCH_MH=m | 355 | CONFIG_IP6_NF_MATCH_MH=m |
| 361 | CONFIG_IP6_NF_MATCH_EUI64=m | 356 | CONFIG_IP6_NF_MATCH_RT=m |
| 362 | CONFIG_IP6_NF_FILTER=m | ||
| 363 | CONFIG_IP6_NF_TARGET_LOG=m | 357 | CONFIG_IP6_NF_TARGET_LOG=m |
| 358 | CONFIG_IP6_NF_FILTER=m | ||
| 364 | CONFIG_IP6_NF_TARGET_REJECT=m | 359 | CONFIG_IP6_NF_TARGET_REJECT=m |
| 365 | CONFIG_IP6_NF_MANGLE=m | 360 | CONFIG_IP6_NF_MANGLE=m |
| 366 | CONFIG_IP6_NF_TARGET_HL=m | 361 | CONFIG_IP6_NF_TARGET_HL=m |
| @@ -387,6 +382,7 @@ CONFIG_SCTP_HMAC_MD5=y | |||
| 387 | # CONFIG_TIPC is not set | 382 | # CONFIG_TIPC is not set |
| 388 | # CONFIG_ATM is not set | 383 | # CONFIG_ATM is not set |
| 389 | # CONFIG_BRIDGE is not set | 384 | # CONFIG_BRIDGE is not set |
| 385 | # CONFIG_NET_DSA is not set | ||
| 390 | # CONFIG_VLAN_8021Q is not set | 386 | # CONFIG_VLAN_8021Q is not set |
| 391 | # CONFIG_DECNET is not set | 387 | # CONFIG_DECNET is not set |
| 392 | CONFIG_LLC=m | 388 | CONFIG_LLC=m |
| @@ -410,19 +406,8 @@ CONFIG_NET_CLS_ROUTE=y | |||
| 410 | # CONFIG_IRDA is not set | 406 | # CONFIG_IRDA is not set |
| 411 | # CONFIG_BT is not set | 407 | # CONFIG_BT is not set |
| 412 | # CONFIG_AF_RXRPC is not set | 408 | # CONFIG_AF_RXRPC is not set |
| 413 | 409 | # CONFIG_PHONET is not set | |
| 414 | # | 410 | # CONFIG_WIRELESS is not set |
| 415 | # Wireless | ||
| 416 | # | ||
| 417 | # CONFIG_CFG80211 is not set | ||
| 418 | CONFIG_WIRELESS_EXT=y | ||
| 419 | # CONFIG_WIRELESS_EXT_SYSFS is not set | ||
| 420 | # CONFIG_MAC80211 is not set | ||
| 421 | CONFIG_IEEE80211=m | ||
| 422 | # CONFIG_IEEE80211_DEBUG is not set | ||
| 423 | CONFIG_IEEE80211_CRYPT_WEP=m | ||
| 424 | CONFIG_IEEE80211_CRYPT_CCMP=m | ||
| 425 | CONFIG_IEEE80211_CRYPT_TKIP=m | ||
| 426 | # CONFIG_RFKILL is not set | 411 | # CONFIG_RFKILL is not set |
| 427 | # CONFIG_NET_9P is not set | 412 | # CONFIG_NET_9P is not set |
| 428 | 413 | ||
| @@ -460,6 +445,7 @@ CONFIG_ATA_OVER_ETH=m | |||
| 460 | CONFIG_MISC_DEVICES=y | 445 | CONFIG_MISC_DEVICES=y |
| 461 | # CONFIG_EEPROM_93CX6 is not set | 446 | # CONFIG_EEPROM_93CX6 is not set |
| 462 | # CONFIG_ENCLOSURE_SERVICES is not set | 447 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 448 | # CONFIG_C2PORT is not set | ||
| 463 | CONFIG_HAVE_IDE=y | 449 | CONFIG_HAVE_IDE=y |
| 464 | # CONFIG_IDE is not set | 450 | # CONFIG_IDE is not set |
| 465 | 451 | ||
| @@ -544,6 +530,9 @@ CONFIG_MVME147_NET=y | |||
| 544 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 530 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 545 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 531 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| 546 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 532 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
| 533 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
| 534 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
| 535 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
| 547 | # CONFIG_B44 is not set | 536 | # CONFIG_B44 is not set |
| 548 | # CONFIG_NETDEV_1000 is not set | 537 | # CONFIG_NETDEV_1000 is not set |
| 549 | # CONFIG_NETDEV_10000 is not set | 538 | # CONFIG_NETDEV_10000 is not set |
| @@ -613,6 +602,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y | |||
| 613 | CONFIG_MOUSE_PS2_SYNAPTICS=y | 602 | CONFIG_MOUSE_PS2_SYNAPTICS=y |
| 614 | CONFIG_MOUSE_PS2_LIFEBOOK=y | 603 | CONFIG_MOUSE_PS2_LIFEBOOK=y |
| 615 | CONFIG_MOUSE_PS2_TRACKPOINT=y | 604 | CONFIG_MOUSE_PS2_TRACKPOINT=y |
| 605 | # CONFIG_MOUSE_PS2_ELANTECH is not set | ||
| 616 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 606 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
| 617 | CONFIG_MOUSE_SERIAL=m | 607 | CONFIG_MOUSE_SERIAL=m |
| 618 | # CONFIG_MOUSE_VSXXXAA is not set | 608 | # CONFIG_MOUSE_VSXXXAA is not set |
| @@ -667,11 +657,11 @@ CONFIG_GEN_RTC_X=y | |||
| 667 | # CONFIG_THERMAL is not set | 657 | # CONFIG_THERMAL is not set |
| 668 | # CONFIG_THERMAL_HWMON is not set | 658 | # CONFIG_THERMAL_HWMON is not set |
| 669 | # CONFIG_WATCHDOG is not set | 659 | # CONFIG_WATCHDOG is not set |
| 660 | CONFIG_SSB_POSSIBLE=y | ||
| 670 | 661 | ||
| 671 | # | 662 | # |
| 672 | # Sonics Silicon Backplane | 663 | # Sonics Silicon Backplane |
| 673 | # | 664 | # |
| 674 | CONFIG_SSB_POSSIBLE=y | ||
| 675 | # CONFIG_SSB is not set | 665 | # CONFIG_SSB is not set |
| 676 | 666 | ||
| 677 | # | 667 | # |
| @@ -681,6 +671,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 681 | # CONFIG_MFD_SM501 is not set | 671 | # CONFIG_MFD_SM501 is not set |
| 682 | # CONFIG_HTC_PASIC3 is not set | 672 | # CONFIG_HTC_PASIC3 is not set |
| 683 | # CONFIG_MFD_TMIO is not set | 673 | # CONFIG_MFD_TMIO is not set |
| 674 | # CONFIG_REGULATOR is not set | ||
| 684 | 675 | ||
| 685 | # | 676 | # |
| 686 | # Multimedia devices | 677 | # Multimedia devices |
| @@ -720,6 +711,12 @@ CONFIG_HID_SUPPORT=y | |||
| 720 | CONFIG_HID=m | 711 | CONFIG_HID=m |
| 721 | # CONFIG_HID_DEBUG is not set | 712 | # CONFIG_HID_DEBUG is not set |
| 722 | CONFIG_HIDRAW=y | 713 | CONFIG_HIDRAW=y |
| 714 | # CONFIG_HID_PID is not set | ||
| 715 | |||
| 716 | # | ||
| 717 | # Special HID drivers | ||
| 718 | # | ||
| 719 | CONFIG_HID_COMPAT=y | ||
| 723 | # CONFIG_USB_SUPPORT is not set | 720 | # CONFIG_USB_SUPPORT is not set |
| 724 | # CONFIG_MMC is not set | 721 | # CONFIG_MMC is not set |
| 725 | # CONFIG_MEMSTICK is not set | 722 | # CONFIG_MEMSTICK is not set |
| @@ -728,6 +725,8 @@ CONFIG_HIDRAW=y | |||
| 728 | # CONFIG_RTC_CLASS is not set | 725 | # CONFIG_RTC_CLASS is not set |
| 729 | # CONFIG_DMADEVICES is not set | 726 | # CONFIG_DMADEVICES is not set |
| 730 | # CONFIG_UIO is not set | 727 | # CONFIG_UIO is not set |
| 728 | # CONFIG_STAGING is not set | ||
| 729 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 731 | 730 | ||
| 732 | # | 731 | # |
| 733 | # Character devices | 732 | # Character devices |
| @@ -743,8 +742,9 @@ CONFIG_EXT2_FS=y | |||
| 743 | # CONFIG_EXT2_FS_XIP is not set | 742 | # CONFIG_EXT2_FS_XIP is not set |
| 744 | CONFIG_EXT3_FS=y | 743 | CONFIG_EXT3_FS=y |
| 745 | # CONFIG_EXT3_FS_XATTR is not set | 744 | # CONFIG_EXT3_FS_XATTR is not set |
| 746 | # CONFIG_EXT4DEV_FS is not set | 745 | # CONFIG_EXT4_FS is not set |
| 747 | CONFIG_JBD=y | 746 | CONFIG_JBD=y |
| 747 | CONFIG_JBD2=m | ||
| 748 | CONFIG_REISERFS_FS=m | 748 | CONFIG_REISERFS_FS=m |
| 749 | # CONFIG_REISERFS_CHECK is not set | 749 | # CONFIG_REISERFS_CHECK is not set |
| 750 | # CONFIG_REISERFS_PROC_INFO is not set | 750 | # CONFIG_REISERFS_PROC_INFO is not set |
| @@ -755,6 +755,7 @@ CONFIG_JFS_FS=m | |||
| 755 | # CONFIG_JFS_DEBUG is not set | 755 | # CONFIG_JFS_DEBUG is not set |
| 756 | # CONFIG_JFS_STATISTICS is not set | 756 | # CONFIG_JFS_STATISTICS is not set |
| 757 | # CONFIG_FS_POSIX_ACL is not set | 757 | # CONFIG_FS_POSIX_ACL is not set |
| 758 | CONFIG_FILE_LOCKING=y | ||
| 758 | CONFIG_XFS_FS=m | 759 | CONFIG_XFS_FS=m |
| 759 | # CONFIG_XFS_QUOTA is not set | 760 | # CONFIG_XFS_QUOTA is not set |
| 760 | # CONFIG_XFS_POSIX_ACL is not set | 761 | # CONFIG_XFS_POSIX_ACL is not set |
| @@ -766,6 +767,7 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | |||
| 766 | # CONFIG_OCFS2_FS_STATS is not set | 767 | # CONFIG_OCFS2_FS_STATS is not set |
| 767 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 768 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
| 768 | # CONFIG_OCFS2_DEBUG_FS is not set | 769 | # CONFIG_OCFS2_DEBUG_FS is not set |
| 770 | # CONFIG_OCFS2_COMPAT_JBD is not set | ||
| 769 | CONFIG_DNOTIFY=y | 771 | CONFIG_DNOTIFY=y |
| 770 | CONFIG_INOTIFY=y | 772 | CONFIG_INOTIFY=y |
| 771 | CONFIG_INOTIFY_USER=y | 773 | CONFIG_INOTIFY_USER=y |
| @@ -804,6 +806,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
| 804 | CONFIG_PROC_FS=y | 806 | CONFIG_PROC_FS=y |
| 805 | CONFIG_PROC_KCORE=y | 807 | CONFIG_PROC_KCORE=y |
| 806 | CONFIG_PROC_SYSCTL=y | 808 | CONFIG_PROC_SYSCTL=y |
| 809 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 807 | CONFIG_SYSFS=y | 810 | CONFIG_SYSFS=y |
| 808 | CONFIG_TMPFS=y | 811 | CONFIG_TMPFS=y |
| 809 | # CONFIG_TMPFS_POSIX_ACL is not set | 812 | # CONFIG_TMPFS_POSIX_ACL is not set |
| @@ -847,6 +850,7 @@ CONFIG_EXPORTFS=m | |||
| 847 | CONFIG_NFS_COMMON=y | 850 | CONFIG_NFS_COMMON=y |
| 848 | CONFIG_SUNRPC=y | 851 | CONFIG_SUNRPC=y |
| 849 | CONFIG_SUNRPC_GSS=y | 852 | CONFIG_SUNRPC_GSS=y |
| 853 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
| 850 | CONFIG_RPCSEC_GSS_KRB5=y | 854 | CONFIG_RPCSEC_GSS_KRB5=y |
| 851 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 855 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 852 | CONFIG_SMB_FS=m | 856 | CONFIG_SMB_FS=m |
| @@ -920,7 +924,13 @@ CONFIG_MAGIC_SYSRQ=y | |||
| 920 | # CONFIG_DEBUG_KERNEL is not set | 924 | # CONFIG_DEBUG_KERNEL is not set |
| 921 | CONFIG_DEBUG_BUGVERBOSE=y | 925 | CONFIG_DEBUG_BUGVERBOSE=y |
| 922 | CONFIG_DEBUG_MEMORY_INIT=y | 926 | CONFIG_DEBUG_MEMORY_INIT=y |
| 927 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
| 923 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 928 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
| 929 | |||
| 930 | # | ||
| 931 | # Tracers | ||
| 932 | # | ||
| 933 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
| 924 | # CONFIG_SAMPLES is not set | 934 | # CONFIG_SAMPLES is not set |
| 925 | 935 | ||
| 926 | # | 936 | # |
| @@ -928,6 +938,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y | |||
| 928 | # | 938 | # |
| 929 | # CONFIG_KEYS is not set | 939 | # CONFIG_KEYS is not set |
| 930 | # CONFIG_SECURITY is not set | 940 | # CONFIG_SECURITY is not set |
| 941 | # CONFIG_SECURITYFS is not set | ||
| 931 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 942 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 932 | CONFIG_XOR_BLOCKS=m | 943 | CONFIG_XOR_BLOCKS=m |
| 933 | CONFIG_ASYNC_CORE=m | 944 | CONFIG_ASYNC_CORE=m |
| @@ -938,10 +949,12 @@ CONFIG_CRYPTO=y | |||
| 938 | # | 949 | # |
| 939 | # Crypto core or helper | 950 | # Crypto core or helper |
| 940 | # | 951 | # |
| 952 | # CONFIG_CRYPTO_FIPS is not set | ||
| 941 | CONFIG_CRYPTO_ALGAPI=y | 953 | CONFIG_CRYPTO_ALGAPI=y |
| 942 | CONFIG_CRYPTO_AEAD=m | 954 | CONFIG_CRYPTO_AEAD=y |
| 943 | CONFIG_CRYPTO_BLKCIPHER=y | 955 | CONFIG_CRYPTO_BLKCIPHER=y |
| 944 | CONFIG_CRYPTO_HASH=y | 956 | CONFIG_CRYPTO_HASH=y |
| 957 | CONFIG_CRYPTO_RNG=y | ||
| 945 | CONFIG_CRYPTO_MANAGER=y | 958 | CONFIG_CRYPTO_MANAGER=y |
| 946 | CONFIG_CRYPTO_GF128MUL=m | 959 | CONFIG_CRYPTO_GF128MUL=m |
| 947 | CONFIG_CRYPTO_NULL=m | 960 | CONFIG_CRYPTO_NULL=m |
| @@ -1015,14 +1028,17 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m | |||
| 1015 | # | 1028 | # |
| 1016 | CONFIG_CRYPTO_DEFLATE=m | 1029 | CONFIG_CRYPTO_DEFLATE=m |
| 1017 | CONFIG_CRYPTO_LZO=m | 1030 | CONFIG_CRYPTO_LZO=m |
| 1031 | |||
| 1032 | # | ||
| 1033 | # Random Number Generation | ||
| 1034 | # | ||
| 1035 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
| 1018 | # CONFIG_CRYPTO_HW is not set | 1036 | # CONFIG_CRYPTO_HW is not set |
| 1019 | 1037 | ||
| 1020 | # | 1038 | # |
| 1021 | # Library routines | 1039 | # Library routines |
| 1022 | # | 1040 | # |
| 1023 | CONFIG_BITREVERSE=y | 1041 | CONFIG_BITREVERSE=y |
| 1024 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1025 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
| 1026 | CONFIG_CRC_CCITT=m | 1042 | CONFIG_CRC_CCITT=m |
| 1027 | CONFIG_CRC16=m | 1043 | CONFIG_CRC16=m |
| 1028 | CONFIG_CRC_T10DIF=y | 1044 | CONFIG_CRC_T10DIF=y |
diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16x_defconfig index a183e25e348d..3403ed2eda79 100644 --- a/arch/m68k/configs/mvme16x_defconfig +++ b/arch/m68k/configs/mvme16x_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.27-rc6 | 3 | # Linux kernel version: 2.6.28-rc7 |
| 4 | # Wed Sep 10 09:02:09 2008 | 4 | # Tue Dec 2 20:27:51 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -14,7 +14,6 @@ CONFIG_TIME_LOW_RES=y | |||
| 14 | CONFIG_GENERIC_IOMAP=y | 14 | CONFIG_GENERIC_IOMAP=y |
| 15 | CONFIG_NO_IOPORT=y | 15 | CONFIG_NO_IOPORT=y |
| 16 | # CONFIG_NO_DMA is not set | 16 | # CONFIG_NO_DMA is not set |
| 17 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
| 18 | CONFIG_HZ=100 | 17 | CONFIG_HZ=100 |
| 19 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 18 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 20 | 19 | ||
| @@ -67,22 +66,13 @@ CONFIG_SIGNALFD=y | |||
| 67 | CONFIG_TIMERFD=y | 66 | CONFIG_TIMERFD=y |
| 68 | CONFIG_EVENTFD=y | 67 | CONFIG_EVENTFD=y |
| 69 | CONFIG_SHMEM=y | 68 | CONFIG_SHMEM=y |
| 69 | CONFIG_AIO=y | ||
| 70 | CONFIG_VM_EVENT_COUNTERS=y | 70 | CONFIG_VM_EVENT_COUNTERS=y |
| 71 | CONFIG_SLAB=y | 71 | CONFIG_SLAB=y |
| 72 | # CONFIG_SLUB is not set | 72 | # CONFIG_SLUB is not set |
| 73 | # CONFIG_SLOB is not set | 73 | # CONFIG_SLOB is not set |
| 74 | # CONFIG_PROFILING is not set | 74 | # CONFIG_PROFILING is not set |
| 75 | # CONFIG_MARKERS is not set | 75 | # CONFIG_MARKERS is not set |
| 76 | # CONFIG_HAVE_OPROFILE is not set | ||
| 77 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
| 78 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
| 79 | # CONFIG_HAVE_KPROBES is not set | ||
| 80 | # CONFIG_HAVE_KRETPROBES is not set | ||
| 81 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
| 82 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 83 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 84 | # CONFIG_HAVE_CLK is not set | ||
| 85 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 86 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 76 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 87 | CONFIG_SLABINFO=y | 77 | CONFIG_SLABINFO=y |
| 88 | CONFIG_RT_MUTEXES=y | 78 | CONFIG_RT_MUTEXES=y |
| @@ -115,11 +105,11 @@ CONFIG_DEFAULT_AS=y | |||
| 115 | # CONFIG_DEFAULT_NOOP is not set | 105 | # CONFIG_DEFAULT_NOOP is not set |
| 116 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 106 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 117 | CONFIG_CLASSIC_RCU=y | 107 | CONFIG_CLASSIC_RCU=y |
| 108 | # CONFIG_FREEZER is not set | ||
| 118 | 109 | ||
| 119 | # | 110 | # |
| 120 | # Platform dependent setup | 111 | # Platform dependent setup |
| 121 | # | 112 | # |
| 122 | # CONFIG_SUN3 is not set | ||
| 123 | # CONFIG_AMIGA is not set | 113 | # CONFIG_AMIGA is not set |
| 124 | # CONFIG_ATARI is not set | 114 | # CONFIG_ATARI is not set |
| 125 | # CONFIG_MAC is not set | 115 | # CONFIG_MAC is not set |
| @@ -151,19 +141,21 @@ CONFIG_DISCONTIGMEM_MANUAL=y | |||
| 151 | CONFIG_DISCONTIGMEM=y | 141 | CONFIG_DISCONTIGMEM=y |
| 152 | CONFIG_FLAT_NODE_MEM_MAP=y | 142 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 153 | CONFIG_NEED_MULTIPLE_NODES=y | 143 | CONFIG_NEED_MULTIPLE_NODES=y |
| 154 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 155 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 156 | CONFIG_PAGEFLAGS_EXTENDED=y | 144 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 157 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 145 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 158 | # CONFIG_RESOURCES_64BIT is not set | 146 | # CONFIG_RESOURCES_64BIT is not set |
| 147 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
| 159 | CONFIG_ZONE_DMA_FLAG=1 | 148 | CONFIG_ZONE_DMA_FLAG=1 |
| 160 | CONFIG_BOUNCE=y | 149 | CONFIG_BOUNCE=y |
| 161 | CONFIG_VIRT_TO_BUS=y | 150 | CONFIG_VIRT_TO_BUS=y |
| 151 | CONFIG_UNEVICTABLE_LRU=y | ||
| 162 | 152 | ||
| 163 | # | 153 | # |
| 164 | # General setup | 154 | # General setup |
| 165 | # | 155 | # |
| 166 | CONFIG_BINFMT_ELF=y | 156 | CONFIG_BINFMT_ELF=y |
| 157 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 158 | CONFIG_HAVE_AOUT=y | ||
| 167 | CONFIG_BINFMT_AOUT=m | 159 | CONFIG_BINFMT_AOUT=m |
| 168 | CONFIG_BINFMT_MISC=m | 160 | CONFIG_BINFMT_MISC=m |
| 169 | CONFIG_PROC_HARDWARE=y | 161 | CONFIG_PROC_HARDWARE=y |
| @@ -212,7 +204,6 @@ CONFIG_INET_TCP_DIAG=m | |||
| 212 | CONFIG_TCP_CONG_CUBIC=y | 204 | CONFIG_TCP_CONG_CUBIC=y |
| 213 | CONFIG_DEFAULT_TCP_CONG="cubic" | 205 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 214 | # CONFIG_TCP_MD5SIG is not set | 206 | # CONFIG_TCP_MD5SIG is not set |
| 215 | # CONFIG_IP_VS is not set | ||
| 216 | CONFIG_IPV6=m | 207 | CONFIG_IPV6=m |
| 217 | CONFIG_IPV6_PRIVACY=y | 208 | CONFIG_IPV6_PRIVACY=y |
| 218 | CONFIG_IPV6_ROUTER_PREF=y | 209 | CONFIG_IPV6_ROUTER_PREF=y |
| @@ -262,13 +253,14 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
| 262 | CONFIG_NF_CONNTRACK_SIP=m | 253 | CONFIG_NF_CONNTRACK_SIP=m |
| 263 | CONFIG_NF_CONNTRACK_TFTP=m | 254 | CONFIG_NF_CONNTRACK_TFTP=m |
| 264 | # CONFIG_NF_CT_NETLINK is not set | 255 | # CONFIG_NF_CT_NETLINK is not set |
| 256 | # CONFIG_NETFILTER_TPROXY is not set | ||
| 265 | CONFIG_NETFILTER_XTABLES=m | 257 | CONFIG_NETFILTER_XTABLES=m |
| 266 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 258 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| 267 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 259 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
| 268 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 260 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
| 269 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 261 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
| 270 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
| 271 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 262 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
| 263 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
| 272 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | 264 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m |
| 273 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m | 265 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m |
| 274 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 266 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
| @@ -282,19 +274,22 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | |||
| 282 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 274 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
| 283 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 275 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
| 284 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 276 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
| 277 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | ||
| 285 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 278 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
| 286 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | 279 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m |
| 287 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 280 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
| 288 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 281 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
| 289 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 282 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
| 290 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 283 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
| 284 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
| 291 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 285 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
| 292 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 286 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
| 293 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
| 294 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 287 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
| 295 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | 288 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m |
| 296 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | 289 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m |
| 297 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 290 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
| 291 | CONFIG_NETFILTER_XT_MATCH_RECENT=m | ||
| 292 | # CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set | ||
| 298 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 293 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
| 299 | CONFIG_NETFILTER_XT_MATCH_STATE=m | 294 | CONFIG_NETFILTER_XT_MATCH_STATE=m |
| 300 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | 295 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m |
| @@ -302,20 +297,20 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m | |||
| 302 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 297 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
| 303 | CONFIG_NETFILTER_XT_MATCH_TIME=m | 298 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
| 304 | CONFIG_NETFILTER_XT_MATCH_U32=m | 299 | CONFIG_NETFILTER_XT_MATCH_U32=m |
| 305 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 300 | # CONFIG_IP_VS is not set |
| 306 | 301 | ||
| 307 | # | 302 | # |
| 308 | # IP: Netfilter Configuration | 303 | # IP: Netfilter Configuration |
| 309 | # | 304 | # |
| 305 | CONFIG_NF_DEFRAG_IPV4=m | ||
| 310 | CONFIG_NF_CONNTRACK_IPV4=m | 306 | CONFIG_NF_CONNTRACK_IPV4=m |
| 311 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y | 307 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y |
| 312 | CONFIG_IP_NF_QUEUE=m | 308 | CONFIG_IP_NF_QUEUE=m |
| 313 | CONFIG_IP_NF_IPTABLES=m | 309 | CONFIG_IP_NF_IPTABLES=m |
| 314 | CONFIG_IP_NF_MATCH_RECENT=m | 310 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
| 315 | CONFIG_IP_NF_MATCH_ECN=m | ||
| 316 | CONFIG_IP_NF_MATCH_AH=m | 311 | CONFIG_IP_NF_MATCH_AH=m |
| 312 | CONFIG_IP_NF_MATCH_ECN=m | ||
| 317 | CONFIG_IP_NF_MATCH_TTL=m | 313 | CONFIG_IP_NF_MATCH_TTL=m |
| 318 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
| 319 | CONFIG_IP_NF_FILTER=m | 314 | CONFIG_IP_NF_FILTER=m |
| 320 | CONFIG_IP_NF_TARGET_REJECT=m | 315 | CONFIG_IP_NF_TARGET_REJECT=m |
| 321 | CONFIG_IP_NF_TARGET_LOG=m | 316 | CONFIG_IP_NF_TARGET_LOG=m |
| @@ -323,8 +318,8 @@ CONFIG_IP_NF_TARGET_ULOG=m | |||
| 323 | CONFIG_NF_NAT=m | 318 | CONFIG_NF_NAT=m |
| 324 | CONFIG_NF_NAT_NEEDED=y | 319 | CONFIG_NF_NAT_NEEDED=y |
| 325 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 320 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
| 326 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
| 327 | CONFIG_IP_NF_TARGET_NETMAP=m | 321 | CONFIG_IP_NF_TARGET_NETMAP=m |
| 322 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
| 328 | CONFIG_NF_NAT_SNMP_BASIC=m | 323 | CONFIG_NF_NAT_SNMP_BASIC=m |
| 329 | CONFIG_NF_NAT_PROTO_GRE=m | 324 | CONFIG_NF_NAT_PROTO_GRE=m |
| 330 | CONFIG_NF_NAT_PROTO_UDPLITE=m | 325 | CONFIG_NF_NAT_PROTO_UDPLITE=m |
| @@ -337,9 +332,9 @@ CONFIG_NF_NAT_PPTP=m | |||
| 337 | CONFIG_NF_NAT_H323=m | 332 | CONFIG_NF_NAT_H323=m |
| 338 | CONFIG_NF_NAT_SIP=m | 333 | CONFIG_NF_NAT_SIP=m |
| 339 | CONFIG_IP_NF_MANGLE=m | 334 | CONFIG_IP_NF_MANGLE=m |
| 335 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
| 340 | CONFIG_IP_NF_TARGET_ECN=m | 336 | CONFIG_IP_NF_TARGET_ECN=m |
| 341 | CONFIG_IP_NF_TARGET_TTL=m | 337 | CONFIG_IP_NF_TARGET_TTL=m |
| 342 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
| 343 | CONFIG_IP_NF_RAW=m | 338 | CONFIG_IP_NF_RAW=m |
| 344 | CONFIG_IP_NF_ARPTABLES=m | 339 | CONFIG_IP_NF_ARPTABLES=m |
| 345 | CONFIG_IP_NF_ARPFILTER=m | 340 | CONFIG_IP_NF_ARPFILTER=m |
| @@ -351,16 +346,16 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
| 351 | CONFIG_NF_CONNTRACK_IPV6=m | 346 | CONFIG_NF_CONNTRACK_IPV6=m |
| 352 | CONFIG_IP6_NF_QUEUE=m | 347 | CONFIG_IP6_NF_QUEUE=m |
| 353 | CONFIG_IP6_NF_IPTABLES=m | 348 | CONFIG_IP6_NF_IPTABLES=m |
| 354 | CONFIG_IP6_NF_MATCH_RT=m | 349 | CONFIG_IP6_NF_MATCH_AH=m |
| 355 | CONFIG_IP6_NF_MATCH_OPTS=m | 350 | CONFIG_IP6_NF_MATCH_EUI64=m |
| 356 | CONFIG_IP6_NF_MATCH_FRAG=m | 351 | CONFIG_IP6_NF_MATCH_FRAG=m |
| 352 | CONFIG_IP6_NF_MATCH_OPTS=m | ||
| 357 | CONFIG_IP6_NF_MATCH_HL=m | 353 | CONFIG_IP6_NF_MATCH_HL=m |
| 358 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 354 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
| 359 | CONFIG_IP6_NF_MATCH_AH=m | ||
| 360 | CONFIG_IP6_NF_MATCH_MH=m | 355 | CONFIG_IP6_NF_MATCH_MH=m |
| 361 | CONFIG_IP6_NF_MATCH_EUI64=m | 356 | CONFIG_IP6_NF_MATCH_RT=m |
| 362 | CONFIG_IP6_NF_FILTER=m | ||
| 363 | CONFIG_IP6_NF_TARGET_LOG=m | 357 | CONFIG_IP6_NF_TARGET_LOG=m |
| 358 | CONFIG_IP6_NF_FILTER=m | ||
| 364 | CONFIG_IP6_NF_TARGET_REJECT=m | 359 | CONFIG_IP6_NF_TARGET_REJECT=m |
| 365 | CONFIG_IP6_NF_MANGLE=m | 360 | CONFIG_IP6_NF_MANGLE=m |
| 366 | CONFIG_IP6_NF_TARGET_HL=m | 361 | CONFIG_IP6_NF_TARGET_HL=m |
| @@ -387,6 +382,7 @@ CONFIG_SCTP_HMAC_MD5=y | |||
| 387 | # CONFIG_TIPC is not set | 382 | # CONFIG_TIPC is not set |
| 388 | # CONFIG_ATM is not set | 383 | # CONFIG_ATM is not set |
| 389 | # CONFIG_BRIDGE is not set | 384 | # CONFIG_BRIDGE is not set |
| 385 | # CONFIG_NET_DSA is not set | ||
| 390 | # CONFIG_VLAN_8021Q is not set | 386 | # CONFIG_VLAN_8021Q is not set |
| 391 | # CONFIG_DECNET is not set | 387 | # CONFIG_DECNET is not set |
| 392 | CONFIG_LLC=m | 388 | CONFIG_LLC=m |
| @@ -410,19 +406,8 @@ CONFIG_NET_CLS_ROUTE=y | |||
| 410 | # CONFIG_IRDA is not set | 406 | # CONFIG_IRDA is not set |
| 411 | # CONFIG_BT is not set | 407 | # CONFIG_BT is not set |
| 412 | # CONFIG_AF_RXRPC is not set | 408 | # CONFIG_AF_RXRPC is not set |
| 413 | 409 | # CONFIG_PHONET is not set | |
| 414 | # | 410 | # CONFIG_WIRELESS is not set |
| 415 | # Wireless | ||
| 416 | # | ||
| 417 | # CONFIG_CFG80211 is not set | ||
| 418 | CONFIG_WIRELESS_EXT=y | ||
| 419 | # CONFIG_WIRELESS_EXT_SYSFS is not set | ||
| 420 | # CONFIG_MAC80211 is not set | ||
| 421 | CONFIG_IEEE80211=m | ||
| 422 | # CONFIG_IEEE80211_DEBUG is not set | ||
| 423 | CONFIG_IEEE80211_CRYPT_WEP=m | ||
| 424 | CONFIG_IEEE80211_CRYPT_CCMP=m | ||
| 425 | CONFIG_IEEE80211_CRYPT_TKIP=m | ||
| 426 | # CONFIG_RFKILL is not set | 411 | # CONFIG_RFKILL is not set |
| 427 | # CONFIG_NET_9P is not set | 412 | # CONFIG_NET_9P is not set |
| 428 | 413 | ||
| @@ -460,6 +445,7 @@ CONFIG_ATA_OVER_ETH=m | |||
| 460 | CONFIG_MISC_DEVICES=y | 445 | CONFIG_MISC_DEVICES=y |
| 461 | # CONFIG_EEPROM_93CX6 is not set | 446 | # CONFIG_EEPROM_93CX6 is not set |
| 462 | # CONFIG_ENCLOSURE_SERVICES is not set | 447 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 448 | # CONFIG_C2PORT is not set | ||
| 463 | CONFIG_HAVE_IDE=y | 449 | CONFIG_HAVE_IDE=y |
| 464 | # CONFIG_IDE is not set | 450 | # CONFIG_IDE is not set |
| 465 | 451 | ||
| @@ -545,6 +531,9 @@ CONFIG_MVME16x_NET=y | |||
| 545 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 531 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 546 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 532 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| 547 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 533 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
| 534 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
| 535 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
| 536 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
| 548 | # CONFIG_B44 is not set | 537 | # CONFIG_B44 is not set |
| 549 | # CONFIG_NETDEV_1000 is not set | 538 | # CONFIG_NETDEV_1000 is not set |
| 550 | # CONFIG_NETDEV_10000 is not set | 539 | # CONFIG_NETDEV_10000 is not set |
| @@ -614,6 +603,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y | |||
| 614 | CONFIG_MOUSE_PS2_SYNAPTICS=y | 603 | CONFIG_MOUSE_PS2_SYNAPTICS=y |
| 615 | CONFIG_MOUSE_PS2_LIFEBOOK=y | 604 | CONFIG_MOUSE_PS2_LIFEBOOK=y |
| 616 | CONFIG_MOUSE_PS2_TRACKPOINT=y | 605 | CONFIG_MOUSE_PS2_TRACKPOINT=y |
| 606 | # CONFIG_MOUSE_PS2_ELANTECH is not set | ||
| 617 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 607 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
| 618 | CONFIG_MOUSE_SERIAL=m | 608 | CONFIG_MOUSE_SERIAL=m |
| 619 | # CONFIG_MOUSE_VSXXXAA is not set | 609 | # CONFIG_MOUSE_VSXXXAA is not set |
| @@ -668,11 +658,11 @@ CONFIG_GEN_RTC_X=y | |||
| 668 | # CONFIG_THERMAL is not set | 658 | # CONFIG_THERMAL is not set |
| 669 | # CONFIG_THERMAL_HWMON is not set | 659 | # CONFIG_THERMAL_HWMON is not set |
| 670 | # CONFIG_WATCHDOG is not set | 660 | # CONFIG_WATCHDOG is not set |
| 661 | CONFIG_SSB_POSSIBLE=y | ||
| 671 | 662 | ||
| 672 | # | 663 | # |
| 673 | # Sonics Silicon Backplane | 664 | # Sonics Silicon Backplane |
| 674 | # | 665 | # |
| 675 | CONFIG_SSB_POSSIBLE=y | ||
| 676 | # CONFIG_SSB is not set | 666 | # CONFIG_SSB is not set |
| 677 | 667 | ||
| 678 | # | 668 | # |
| @@ -682,6 +672,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 682 | # CONFIG_MFD_SM501 is not set | 672 | # CONFIG_MFD_SM501 is not set |
| 683 | # CONFIG_HTC_PASIC3 is not set | 673 | # CONFIG_HTC_PASIC3 is not set |
| 684 | # CONFIG_MFD_TMIO is not set | 674 | # CONFIG_MFD_TMIO is not set |
| 675 | # CONFIG_REGULATOR is not set | ||
| 685 | 676 | ||
| 686 | # | 677 | # |
| 687 | # Multimedia devices | 678 | # Multimedia devices |
| @@ -721,6 +712,12 @@ CONFIG_HID_SUPPORT=y | |||
| 721 | CONFIG_HID=m | 712 | CONFIG_HID=m |
| 722 | # CONFIG_HID_DEBUG is not set | 713 | # CONFIG_HID_DEBUG is not set |
| 723 | CONFIG_HIDRAW=y | 714 | CONFIG_HIDRAW=y |
| 715 | # CONFIG_HID_PID is not set | ||
| 716 | |||
| 717 | # | ||
| 718 | # Special HID drivers | ||
| 719 | # | ||
| 720 | CONFIG_HID_COMPAT=y | ||
| 724 | # CONFIG_USB_SUPPORT is not set | 721 | # CONFIG_USB_SUPPORT is not set |
| 725 | # CONFIG_MMC is not set | 722 | # CONFIG_MMC is not set |
| 726 | # CONFIG_MEMSTICK is not set | 723 | # CONFIG_MEMSTICK is not set |
| @@ -729,6 +726,8 @@ CONFIG_HIDRAW=y | |||
| 729 | # CONFIG_RTC_CLASS is not set | 726 | # CONFIG_RTC_CLASS is not set |
| 730 | # CONFIG_DMADEVICES is not set | 727 | # CONFIG_DMADEVICES is not set |
| 731 | # CONFIG_UIO is not set | 728 | # CONFIG_UIO is not set |
| 729 | # CONFIG_STAGING is not set | ||
| 730 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 732 | 731 | ||
| 733 | # | 732 | # |
| 734 | # Character devices | 733 | # Character devices |
| @@ -745,8 +744,9 @@ CONFIG_EXT2_FS=y | |||
| 745 | # CONFIG_EXT2_FS_XIP is not set | 744 | # CONFIG_EXT2_FS_XIP is not set |
| 746 | CONFIG_EXT3_FS=y | 745 | CONFIG_EXT3_FS=y |
| 747 | # CONFIG_EXT3_FS_XATTR is not set | 746 | # CONFIG_EXT3_FS_XATTR is not set |
| 748 | # CONFIG_EXT4DEV_FS is not set | 747 | # CONFIG_EXT4_FS is not set |
| 749 | CONFIG_JBD=y | 748 | CONFIG_JBD=y |
| 749 | CONFIG_JBD2=m | ||
| 750 | CONFIG_REISERFS_FS=m | 750 | CONFIG_REISERFS_FS=m |
| 751 | # CONFIG_REISERFS_CHECK is not set | 751 | # CONFIG_REISERFS_CHECK is not set |
| 752 | # CONFIG_REISERFS_PROC_INFO is not set | 752 | # CONFIG_REISERFS_PROC_INFO is not set |
| @@ -757,6 +757,7 @@ CONFIG_JFS_FS=m | |||
| 757 | # CONFIG_JFS_DEBUG is not set | 757 | # CONFIG_JFS_DEBUG is not set |
| 758 | # CONFIG_JFS_STATISTICS is not set | 758 | # CONFIG_JFS_STATISTICS is not set |
| 759 | # CONFIG_FS_POSIX_ACL is not set | 759 | # CONFIG_FS_POSIX_ACL is not set |
| 760 | CONFIG_FILE_LOCKING=y | ||
| 760 | CONFIG_XFS_FS=m | 761 | CONFIG_XFS_FS=m |
| 761 | # CONFIG_XFS_QUOTA is not set | 762 | # CONFIG_XFS_QUOTA is not set |
| 762 | # CONFIG_XFS_POSIX_ACL is not set | 763 | # CONFIG_XFS_POSIX_ACL is not set |
| @@ -768,6 +769,7 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | |||
| 768 | # CONFIG_OCFS2_FS_STATS is not set | 769 | # CONFIG_OCFS2_FS_STATS is not set |
| 769 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 770 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
| 770 | # CONFIG_OCFS2_DEBUG_FS is not set | 771 | # CONFIG_OCFS2_DEBUG_FS is not set |
| 772 | # CONFIG_OCFS2_COMPAT_JBD is not set | ||
| 771 | CONFIG_DNOTIFY=y | 773 | CONFIG_DNOTIFY=y |
| 772 | CONFIG_INOTIFY=y | 774 | CONFIG_INOTIFY=y |
| 773 | CONFIG_INOTIFY_USER=y | 775 | CONFIG_INOTIFY_USER=y |
| @@ -806,6 +808,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
| 806 | CONFIG_PROC_FS=y | 808 | CONFIG_PROC_FS=y |
| 807 | CONFIG_PROC_KCORE=y | 809 | CONFIG_PROC_KCORE=y |
| 808 | CONFIG_PROC_SYSCTL=y | 810 | CONFIG_PROC_SYSCTL=y |
| 811 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 809 | CONFIG_SYSFS=y | 812 | CONFIG_SYSFS=y |
| 810 | CONFIG_TMPFS=y | 813 | CONFIG_TMPFS=y |
| 811 | # CONFIG_TMPFS_POSIX_ACL is not set | 814 | # CONFIG_TMPFS_POSIX_ACL is not set |
| @@ -849,6 +852,7 @@ CONFIG_EXPORTFS=m | |||
| 849 | CONFIG_NFS_COMMON=y | 852 | CONFIG_NFS_COMMON=y |
| 850 | CONFIG_SUNRPC=y | 853 | CONFIG_SUNRPC=y |
| 851 | CONFIG_SUNRPC_GSS=y | 854 | CONFIG_SUNRPC_GSS=y |
| 855 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
| 852 | CONFIG_RPCSEC_GSS_KRB5=y | 856 | CONFIG_RPCSEC_GSS_KRB5=y |
| 853 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 857 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 854 | CONFIG_SMB_FS=m | 858 | CONFIG_SMB_FS=m |
| @@ -922,7 +926,13 @@ CONFIG_MAGIC_SYSRQ=y | |||
| 922 | # CONFIG_DEBUG_KERNEL is not set | 926 | # CONFIG_DEBUG_KERNEL is not set |
| 923 | CONFIG_DEBUG_BUGVERBOSE=y | 927 | CONFIG_DEBUG_BUGVERBOSE=y |
| 924 | CONFIG_DEBUG_MEMORY_INIT=y | 928 | CONFIG_DEBUG_MEMORY_INIT=y |
| 929 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
| 925 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 930 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
| 931 | |||
| 932 | # | ||
| 933 | # Tracers | ||
| 934 | # | ||
| 935 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
| 926 | # CONFIG_SAMPLES is not set | 936 | # CONFIG_SAMPLES is not set |
| 927 | 937 | ||
| 928 | # | 938 | # |
| @@ -930,6 +940,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y | |||
| 930 | # | 940 | # |
| 931 | # CONFIG_KEYS is not set | 941 | # CONFIG_KEYS is not set |
| 932 | # CONFIG_SECURITY is not set | 942 | # CONFIG_SECURITY is not set |
| 943 | # CONFIG_SECURITYFS is not set | ||
| 933 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 944 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 934 | CONFIG_XOR_BLOCKS=m | 945 | CONFIG_XOR_BLOCKS=m |
| 935 | CONFIG_ASYNC_CORE=m | 946 | CONFIG_ASYNC_CORE=m |
| @@ -940,10 +951,12 @@ CONFIG_CRYPTO=y | |||
| 940 | # | 951 | # |
| 941 | # Crypto core or helper | 952 | # Crypto core or helper |
| 942 | # | 953 | # |
| 954 | # CONFIG_CRYPTO_FIPS is not set | ||
| 943 | CONFIG_CRYPTO_ALGAPI=y | 955 | CONFIG_CRYPTO_ALGAPI=y |
| 944 | CONFIG_CRYPTO_AEAD=m | 956 | CONFIG_CRYPTO_AEAD=y |
| 945 | CONFIG_CRYPTO_BLKCIPHER=y | 957 | CONFIG_CRYPTO_BLKCIPHER=y |
| 946 | CONFIG_CRYPTO_HASH=y | 958 | CONFIG_CRYPTO_HASH=y |
| 959 | CONFIG_CRYPTO_RNG=y | ||
| 947 | CONFIG_CRYPTO_MANAGER=y | 960 | CONFIG_CRYPTO_MANAGER=y |
| 948 | CONFIG_CRYPTO_GF128MUL=m | 961 | CONFIG_CRYPTO_GF128MUL=m |
| 949 | CONFIG_CRYPTO_NULL=m | 962 | CONFIG_CRYPTO_NULL=m |
| @@ -1017,14 +1030,17 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m | |||
| 1017 | # | 1030 | # |
| 1018 | CONFIG_CRYPTO_DEFLATE=m | 1031 | CONFIG_CRYPTO_DEFLATE=m |
| 1019 | CONFIG_CRYPTO_LZO=m | 1032 | CONFIG_CRYPTO_LZO=m |
| 1033 | |||
| 1034 | # | ||
| 1035 | # Random Number Generation | ||
| 1036 | # | ||
| 1037 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
| 1020 | # CONFIG_CRYPTO_HW is not set | 1038 | # CONFIG_CRYPTO_HW is not set |
| 1021 | 1039 | ||
| 1022 | # | 1040 | # |
| 1023 | # Library routines | 1041 | # Library routines |
| 1024 | # | 1042 | # |
| 1025 | CONFIG_BITREVERSE=y | 1043 | CONFIG_BITREVERSE=y |
| 1026 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1027 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
| 1028 | CONFIG_CRC_CCITT=m | 1044 | CONFIG_CRC_CCITT=m |
| 1029 | CONFIG_CRC16=m | 1045 | CONFIG_CRC16=m |
| 1030 | CONFIG_CRC_T10DIF=y | 1046 | CONFIG_CRC_T10DIF=y |
diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig index 72eaff0776b8..3459c594194b 100644 --- a/arch/m68k/configs/q40_defconfig +++ b/arch/m68k/configs/q40_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.27-rc6 | 3 | # Linux kernel version: 2.6.28-rc7 |
| 4 | # Wed Sep 10 09:02:10 2008 | 4 | # Tue Dec 2 20:27:52 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -14,7 +14,6 @@ CONFIG_TIME_LOW_RES=y | |||
| 14 | CONFIG_GENERIC_IOMAP=y | 14 | CONFIG_GENERIC_IOMAP=y |
| 15 | CONFIG_NO_IOPORT=y | 15 | CONFIG_NO_IOPORT=y |
| 16 | # CONFIG_NO_DMA is not set | 16 | # CONFIG_NO_DMA is not set |
| 17 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
| 18 | CONFIG_HZ=100 | 17 | CONFIG_HZ=100 |
| 19 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 18 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 20 | 19 | ||
| @@ -67,22 +66,13 @@ CONFIG_SIGNALFD=y | |||
| 67 | CONFIG_TIMERFD=y | 66 | CONFIG_TIMERFD=y |
| 68 | CONFIG_EVENTFD=y | 67 | CONFIG_EVENTFD=y |
| 69 | CONFIG_SHMEM=y | 68 | CONFIG_SHMEM=y |
| 69 | CONFIG_AIO=y | ||
| 70 | CONFIG_VM_EVENT_COUNTERS=y | 70 | CONFIG_VM_EVENT_COUNTERS=y |
| 71 | CONFIG_SLAB=y | 71 | CONFIG_SLAB=y |
| 72 | # CONFIG_SLUB is not set | 72 | # CONFIG_SLUB is not set |
| 73 | # CONFIG_SLOB is not set | 73 | # CONFIG_SLOB is not set |
| 74 | # CONFIG_PROFILING is not set | 74 | # CONFIG_PROFILING is not set |
| 75 | # CONFIG_MARKERS is not set | 75 | # CONFIG_MARKERS is not set |
| 76 | # CONFIG_HAVE_OPROFILE is not set | ||
| 77 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
| 78 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
| 79 | # CONFIG_HAVE_KPROBES is not set | ||
| 80 | # CONFIG_HAVE_KRETPROBES is not set | ||
| 81 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
| 82 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 83 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 84 | # CONFIG_HAVE_CLK is not set | ||
| 85 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 86 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 76 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 87 | CONFIG_SLABINFO=y | 77 | CONFIG_SLABINFO=y |
| 88 | CONFIG_RT_MUTEXES=y | 78 | CONFIG_RT_MUTEXES=y |
| @@ -115,11 +105,11 @@ CONFIG_DEFAULT_AS=y | |||
| 115 | # CONFIG_DEFAULT_NOOP is not set | 105 | # CONFIG_DEFAULT_NOOP is not set |
| 116 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 106 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 117 | CONFIG_CLASSIC_RCU=y | 107 | CONFIG_CLASSIC_RCU=y |
| 108 | # CONFIG_FREEZER is not set | ||
| 118 | 109 | ||
| 119 | # | 110 | # |
| 120 | # Platform dependent setup | 111 | # Platform dependent setup |
| 121 | # | 112 | # |
| 122 | # CONFIG_SUN3 is not set | ||
| 123 | # CONFIG_AMIGA is not set | 113 | # CONFIG_AMIGA is not set |
| 124 | # CONFIG_ATARI is not set | 114 | # CONFIG_ATARI is not set |
| 125 | # CONFIG_MAC is not set | 115 | # CONFIG_MAC is not set |
| @@ -148,19 +138,21 @@ CONFIG_DISCONTIGMEM_MANUAL=y | |||
| 148 | CONFIG_DISCONTIGMEM=y | 138 | CONFIG_DISCONTIGMEM=y |
| 149 | CONFIG_FLAT_NODE_MEM_MAP=y | 139 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 150 | CONFIG_NEED_MULTIPLE_NODES=y | 140 | CONFIG_NEED_MULTIPLE_NODES=y |
| 151 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 152 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 153 | CONFIG_PAGEFLAGS_EXTENDED=y | 141 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 154 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 142 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 155 | # CONFIG_RESOURCES_64BIT is not set | 143 | # CONFIG_RESOURCES_64BIT is not set |
| 144 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
| 156 | CONFIG_ZONE_DMA_FLAG=1 | 145 | CONFIG_ZONE_DMA_FLAG=1 |
| 157 | CONFIG_BOUNCE=y | 146 | CONFIG_BOUNCE=y |
| 158 | CONFIG_VIRT_TO_BUS=y | 147 | CONFIG_VIRT_TO_BUS=y |
| 148 | CONFIG_UNEVICTABLE_LRU=y | ||
| 159 | 149 | ||
| 160 | # | 150 | # |
| 161 | # General setup | 151 | # General setup |
| 162 | # | 152 | # |
| 163 | CONFIG_BINFMT_ELF=y | 153 | CONFIG_BINFMT_ELF=y |
| 154 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 155 | CONFIG_HAVE_AOUT=y | ||
| 164 | CONFIG_BINFMT_AOUT=m | 156 | CONFIG_BINFMT_AOUT=m |
| 165 | CONFIG_BINFMT_MISC=m | 157 | CONFIG_BINFMT_MISC=m |
| 166 | CONFIG_HEARTBEAT=y | 158 | CONFIG_HEARTBEAT=y |
| @@ -209,7 +201,6 @@ CONFIG_INET_TCP_DIAG=m | |||
| 209 | CONFIG_TCP_CONG_CUBIC=y | 201 | CONFIG_TCP_CONG_CUBIC=y |
| 210 | CONFIG_DEFAULT_TCP_CONG="cubic" | 202 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 211 | # CONFIG_TCP_MD5SIG is not set | 203 | # CONFIG_TCP_MD5SIG is not set |
| 212 | # CONFIG_IP_VS is not set | ||
| 213 | CONFIG_IPV6=m | 204 | CONFIG_IPV6=m |
| 214 | CONFIG_IPV6_PRIVACY=y | 205 | CONFIG_IPV6_PRIVACY=y |
| 215 | CONFIG_IPV6_ROUTER_PREF=y | 206 | CONFIG_IPV6_ROUTER_PREF=y |
| @@ -259,13 +250,14 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
| 259 | CONFIG_NF_CONNTRACK_SIP=m | 250 | CONFIG_NF_CONNTRACK_SIP=m |
| 260 | CONFIG_NF_CONNTRACK_TFTP=m | 251 | CONFIG_NF_CONNTRACK_TFTP=m |
| 261 | # CONFIG_NF_CT_NETLINK is not set | 252 | # CONFIG_NF_CT_NETLINK is not set |
| 253 | # CONFIG_NETFILTER_TPROXY is not set | ||
| 262 | CONFIG_NETFILTER_XTABLES=m | 254 | CONFIG_NETFILTER_XTABLES=m |
| 263 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 255 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| 264 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 256 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
| 265 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 257 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
| 266 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 258 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
| 267 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
| 268 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 259 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
| 260 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
| 269 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | 261 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m |
| 270 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m | 262 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m |
| 271 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 263 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
| @@ -279,19 +271,22 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | |||
| 279 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 271 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
| 280 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 272 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
| 281 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 273 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
| 274 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | ||
| 282 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 275 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
| 283 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | 276 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m |
| 284 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 277 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
| 285 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 278 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
| 286 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 279 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
| 287 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 280 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
| 281 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
| 288 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 282 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
| 289 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 283 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
| 290 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
| 291 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 284 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
| 292 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | 285 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m |
| 293 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | 286 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m |
| 294 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 287 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
| 288 | CONFIG_NETFILTER_XT_MATCH_RECENT=m | ||
| 289 | # CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set | ||
| 295 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 290 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
| 296 | CONFIG_NETFILTER_XT_MATCH_STATE=m | 291 | CONFIG_NETFILTER_XT_MATCH_STATE=m |
| 297 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | 292 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m |
| @@ -299,20 +294,20 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m | |||
| 299 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 294 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
| 300 | CONFIG_NETFILTER_XT_MATCH_TIME=m | 295 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
| 301 | CONFIG_NETFILTER_XT_MATCH_U32=m | 296 | CONFIG_NETFILTER_XT_MATCH_U32=m |
| 302 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 297 | # CONFIG_IP_VS is not set |
| 303 | 298 | ||
| 304 | # | 299 | # |
| 305 | # IP: Netfilter Configuration | 300 | # IP: Netfilter Configuration |
| 306 | # | 301 | # |
| 302 | CONFIG_NF_DEFRAG_IPV4=m | ||
| 307 | CONFIG_NF_CONNTRACK_IPV4=m | 303 | CONFIG_NF_CONNTRACK_IPV4=m |
| 308 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y | 304 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y |
| 309 | CONFIG_IP_NF_QUEUE=m | 305 | CONFIG_IP_NF_QUEUE=m |
| 310 | CONFIG_IP_NF_IPTABLES=m | 306 | CONFIG_IP_NF_IPTABLES=m |
| 311 | CONFIG_IP_NF_MATCH_RECENT=m | 307 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
| 312 | CONFIG_IP_NF_MATCH_ECN=m | ||
| 313 | CONFIG_IP_NF_MATCH_AH=m | 308 | CONFIG_IP_NF_MATCH_AH=m |
| 309 | CONFIG_IP_NF_MATCH_ECN=m | ||
| 314 | CONFIG_IP_NF_MATCH_TTL=m | 310 | CONFIG_IP_NF_MATCH_TTL=m |
| 315 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
| 316 | CONFIG_IP_NF_FILTER=m | 311 | CONFIG_IP_NF_FILTER=m |
| 317 | CONFIG_IP_NF_TARGET_REJECT=m | 312 | CONFIG_IP_NF_TARGET_REJECT=m |
| 318 | CONFIG_IP_NF_TARGET_LOG=m | 313 | CONFIG_IP_NF_TARGET_LOG=m |
| @@ -320,8 +315,8 @@ CONFIG_IP_NF_TARGET_ULOG=m | |||
| 320 | CONFIG_NF_NAT=m | 315 | CONFIG_NF_NAT=m |
| 321 | CONFIG_NF_NAT_NEEDED=y | 316 | CONFIG_NF_NAT_NEEDED=y |
| 322 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 317 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
| 323 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
| 324 | CONFIG_IP_NF_TARGET_NETMAP=m | 318 | CONFIG_IP_NF_TARGET_NETMAP=m |
| 319 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
| 325 | CONFIG_NF_NAT_SNMP_BASIC=m | 320 | CONFIG_NF_NAT_SNMP_BASIC=m |
| 326 | CONFIG_NF_NAT_PROTO_GRE=m | 321 | CONFIG_NF_NAT_PROTO_GRE=m |
| 327 | CONFIG_NF_NAT_PROTO_UDPLITE=m | 322 | CONFIG_NF_NAT_PROTO_UDPLITE=m |
| @@ -334,9 +329,9 @@ CONFIG_NF_NAT_PPTP=m | |||
| 334 | CONFIG_NF_NAT_H323=m | 329 | CONFIG_NF_NAT_H323=m |
| 335 | CONFIG_NF_NAT_SIP=m | 330 | CONFIG_NF_NAT_SIP=m |
| 336 | CONFIG_IP_NF_MANGLE=m | 331 | CONFIG_IP_NF_MANGLE=m |
| 332 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
| 337 | CONFIG_IP_NF_TARGET_ECN=m | 333 | CONFIG_IP_NF_TARGET_ECN=m |
| 338 | CONFIG_IP_NF_TARGET_TTL=m | 334 | CONFIG_IP_NF_TARGET_TTL=m |
| 339 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
| 340 | CONFIG_IP_NF_RAW=m | 335 | CONFIG_IP_NF_RAW=m |
| 341 | CONFIG_IP_NF_ARPTABLES=m | 336 | CONFIG_IP_NF_ARPTABLES=m |
| 342 | CONFIG_IP_NF_ARPFILTER=m | 337 | CONFIG_IP_NF_ARPFILTER=m |
| @@ -348,16 +343,16 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
| 348 | CONFIG_NF_CONNTRACK_IPV6=m | 343 | CONFIG_NF_CONNTRACK_IPV6=m |
| 349 | CONFIG_IP6_NF_QUEUE=m | 344 | CONFIG_IP6_NF_QUEUE=m |
| 350 | CONFIG_IP6_NF_IPTABLES=m | 345 | CONFIG_IP6_NF_IPTABLES=m |
| 351 | CONFIG_IP6_NF_MATCH_RT=m | 346 | CONFIG_IP6_NF_MATCH_AH=m |
| 352 | CONFIG_IP6_NF_MATCH_OPTS=m | 347 | CONFIG_IP6_NF_MATCH_EUI64=m |
| 353 | CONFIG_IP6_NF_MATCH_FRAG=m | 348 | CONFIG_IP6_NF_MATCH_FRAG=m |
| 349 | CONFIG_IP6_NF_MATCH_OPTS=m | ||
| 354 | CONFIG_IP6_NF_MATCH_HL=m | 350 | CONFIG_IP6_NF_MATCH_HL=m |
| 355 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 351 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
| 356 | CONFIG_IP6_NF_MATCH_AH=m | ||
| 357 | CONFIG_IP6_NF_MATCH_MH=m | 352 | CONFIG_IP6_NF_MATCH_MH=m |
| 358 | CONFIG_IP6_NF_MATCH_EUI64=m | 353 | CONFIG_IP6_NF_MATCH_RT=m |
| 359 | CONFIG_IP6_NF_FILTER=m | ||
| 360 | CONFIG_IP6_NF_TARGET_LOG=m | 354 | CONFIG_IP6_NF_TARGET_LOG=m |
| 355 | CONFIG_IP6_NF_FILTER=m | ||
| 361 | CONFIG_IP6_NF_TARGET_REJECT=m | 356 | CONFIG_IP6_NF_TARGET_REJECT=m |
| 362 | CONFIG_IP6_NF_MANGLE=m | 357 | CONFIG_IP6_NF_MANGLE=m |
| 363 | CONFIG_IP6_NF_TARGET_HL=m | 358 | CONFIG_IP6_NF_TARGET_HL=m |
| @@ -384,6 +379,7 @@ CONFIG_SCTP_HMAC_MD5=y | |||
| 384 | # CONFIG_TIPC is not set | 379 | # CONFIG_TIPC is not set |
| 385 | # CONFIG_ATM is not set | 380 | # CONFIG_ATM is not set |
| 386 | # CONFIG_BRIDGE is not set | 381 | # CONFIG_BRIDGE is not set |
| 382 | # CONFIG_NET_DSA is not set | ||
| 387 | # CONFIG_VLAN_8021Q is not set | 383 | # CONFIG_VLAN_8021Q is not set |
| 388 | # CONFIG_DECNET is not set | 384 | # CONFIG_DECNET is not set |
| 389 | CONFIG_LLC=m | 385 | CONFIG_LLC=m |
| @@ -407,19 +403,8 @@ CONFIG_NET_CLS_ROUTE=y | |||
| 407 | # CONFIG_IRDA is not set | 403 | # CONFIG_IRDA is not set |
| 408 | # CONFIG_BT is not set | 404 | # CONFIG_BT is not set |
| 409 | # CONFIG_AF_RXRPC is not set | 405 | # CONFIG_AF_RXRPC is not set |
| 410 | 406 | # CONFIG_PHONET is not set | |
| 411 | # | 407 | # CONFIG_WIRELESS is not set |
| 412 | # Wireless | ||
| 413 | # | ||
| 414 | # CONFIG_CFG80211 is not set | ||
| 415 | CONFIG_WIRELESS_EXT=y | ||
| 416 | # CONFIG_WIRELESS_EXT_SYSFS is not set | ||
| 417 | # CONFIG_MAC80211 is not set | ||
| 418 | CONFIG_IEEE80211=m | ||
| 419 | # CONFIG_IEEE80211_DEBUG is not set | ||
| 420 | CONFIG_IEEE80211_CRYPT_WEP=m | ||
| 421 | CONFIG_IEEE80211_CRYPT_CCMP=m | ||
| 422 | CONFIG_IEEE80211_CRYPT_TKIP=m | ||
| 423 | # CONFIG_RFKILL is not set | 408 | # CONFIG_RFKILL is not set |
| 424 | # CONFIG_NET_9P is not set | 409 | # CONFIG_NET_9P is not set |
| 425 | 410 | ||
| @@ -458,21 +443,20 @@ CONFIG_ATA_OVER_ETH=m | |||
| 458 | CONFIG_MISC_DEVICES=y | 443 | CONFIG_MISC_DEVICES=y |
| 459 | # CONFIG_EEPROM_93CX6 is not set | 444 | # CONFIG_EEPROM_93CX6 is not set |
| 460 | # CONFIG_ENCLOSURE_SERVICES is not set | 445 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 446 | # CONFIG_C2PORT is not set | ||
| 461 | CONFIG_HAVE_IDE=y | 447 | CONFIG_HAVE_IDE=y |
| 462 | CONFIG_IDE=y | 448 | CONFIG_IDE=y |
| 463 | CONFIG_BLK_DEV_IDE=y | ||
| 464 | 449 | ||
| 465 | # | 450 | # |
| 466 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | 451 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
| 467 | # | 452 | # |
| 468 | CONFIG_IDE_ATAPI=y | ||
| 469 | # CONFIG_BLK_DEV_IDE_SATA is not set | 453 | # CONFIG_BLK_DEV_IDE_SATA is not set |
| 470 | CONFIG_BLK_DEV_IDEDISK=y | 454 | CONFIG_IDE_GD=y |
| 471 | # CONFIG_IDEDISK_MULTI_MODE is not set | 455 | CONFIG_IDE_GD_ATA=y |
| 456 | # CONFIG_IDE_GD_ATAPI is not set | ||
| 472 | CONFIG_BLK_DEV_IDECD=y | 457 | CONFIG_BLK_DEV_IDECD=y |
| 473 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y | 458 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y |
| 474 | # CONFIG_BLK_DEV_IDETAPE is not set | 459 | # CONFIG_BLK_DEV_IDETAPE is not set |
| 475 | CONFIG_BLK_DEV_IDEFLOPPY=m | ||
| 476 | # CONFIG_BLK_DEV_IDESCSI is not set | 460 | # CONFIG_BLK_DEV_IDESCSI is not set |
| 477 | # CONFIG_IDE_TASK_IOCTL is not set | 461 | # CONFIG_IDE_TASK_IOCTL is not set |
| 478 | CONFIG_IDE_PROC_FS=y | 462 | CONFIG_IDE_PROC_FS=y |
| @@ -585,8 +569,12 @@ CONFIG_NE2000=m | |||
| 585 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 569 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 586 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 570 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| 587 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 571 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
| 572 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
| 573 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
| 574 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
| 588 | # CONFIG_NET_PCI is not set | 575 | # CONFIG_NET_PCI is not set |
| 589 | # CONFIG_B44 is not set | 576 | # CONFIG_B44 is not set |
| 577 | # CONFIG_CS89x0 is not set | ||
| 590 | # CONFIG_NETDEV_1000 is not set | 578 | # CONFIG_NETDEV_1000 is not set |
| 591 | # CONFIG_NETDEV_10000 is not set | 579 | # CONFIG_NETDEV_10000 is not set |
| 592 | # CONFIG_TR is not set | 580 | # CONFIG_TR is not set |
| @@ -656,6 +644,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y | |||
| 656 | CONFIG_MOUSE_PS2_SYNAPTICS=y | 644 | CONFIG_MOUSE_PS2_SYNAPTICS=y |
| 657 | CONFIG_MOUSE_PS2_LIFEBOOK=y | 645 | CONFIG_MOUSE_PS2_LIFEBOOK=y |
| 658 | CONFIG_MOUSE_PS2_TRACKPOINT=y | 646 | CONFIG_MOUSE_PS2_TRACKPOINT=y |
| 647 | # CONFIG_MOUSE_PS2_ELANTECH is not set | ||
| 659 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 648 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
| 660 | CONFIG_MOUSE_SERIAL=m | 649 | CONFIG_MOUSE_SERIAL=m |
| 661 | # CONFIG_MOUSE_INPORT is not set | 650 | # CONFIG_MOUSE_INPORT is not set |
| @@ -717,11 +706,11 @@ CONFIG_GEN_RTC_X=y | |||
| 717 | # CONFIG_THERMAL is not set | 706 | # CONFIG_THERMAL is not set |
| 718 | # CONFIG_THERMAL_HWMON is not set | 707 | # CONFIG_THERMAL_HWMON is not set |
| 719 | # CONFIG_WATCHDOG is not set | 708 | # CONFIG_WATCHDOG is not set |
| 709 | CONFIG_SSB_POSSIBLE=y | ||
| 720 | 710 | ||
| 721 | # | 711 | # |
| 722 | # Sonics Silicon Backplane | 712 | # Sonics Silicon Backplane |
| 723 | # | 713 | # |
| 724 | CONFIG_SSB_POSSIBLE=y | ||
| 725 | # CONFIG_SSB is not set | 714 | # CONFIG_SSB is not set |
| 726 | 715 | ||
| 727 | # | 716 | # |
| @@ -731,6 +720,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 731 | # CONFIG_MFD_SM501 is not set | 720 | # CONFIG_MFD_SM501 is not set |
| 732 | # CONFIG_HTC_PASIC3 is not set | 721 | # CONFIG_HTC_PASIC3 is not set |
| 733 | # CONFIG_MFD_TMIO is not set | 722 | # CONFIG_MFD_TMIO is not set |
| 723 | # CONFIG_REGULATOR is not set | ||
| 734 | 724 | ||
| 735 | # | 725 | # |
| 736 | # Multimedia devices | 726 | # Multimedia devices |
| @@ -756,6 +746,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 756 | CONFIG_FB=y | 746 | CONFIG_FB=y |
| 757 | # CONFIG_FIRMWARE_EDID is not set | 747 | # CONFIG_FIRMWARE_EDID is not set |
| 758 | # CONFIG_FB_DDC is not set | 748 | # CONFIG_FB_DDC is not set |
| 749 | # CONFIG_FB_BOOT_VESA_SUPPORT is not set | ||
| 759 | CONFIG_FB_CFB_FILLRECT=y | 750 | CONFIG_FB_CFB_FILLRECT=y |
| 760 | CONFIG_FB_CFB_COPYAREA=y | 751 | CONFIG_FB_CFB_COPYAREA=y |
| 761 | CONFIG_FB_CFB_IMAGEBLIT=y | 752 | CONFIG_FB_CFB_IMAGEBLIT=y |
| @@ -778,6 +769,8 @@ CONFIG_FB_Q40=y | |||
| 778 | # CONFIG_FB_UVESA is not set | 769 | # CONFIG_FB_UVESA is not set |
| 779 | # CONFIG_FB_S1D13XXX is not set | 770 | # CONFIG_FB_S1D13XXX is not set |
| 780 | # CONFIG_FB_VIRTUAL is not set | 771 | # CONFIG_FB_VIRTUAL is not set |
| 772 | # CONFIG_FB_METRONOME is not set | ||
| 773 | # CONFIG_FB_MB862XX is not set | ||
| 781 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 774 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 782 | 775 | ||
| 783 | # | 776 | # |
| @@ -800,12 +793,19 @@ CONFIG_LOGO_LINUX_MONO=y | |||
| 800 | CONFIG_LOGO_LINUX_VGA16=y | 793 | CONFIG_LOGO_LINUX_VGA16=y |
| 801 | CONFIG_LOGO_LINUX_CLUT224=y | 794 | CONFIG_LOGO_LINUX_CLUT224=y |
| 802 | CONFIG_SOUND=m | 795 | CONFIG_SOUND=m |
| 796 | CONFIG_SOUND_OSS_CORE=y | ||
| 803 | CONFIG_DMASOUND_Q40=m | 797 | CONFIG_DMASOUND_Q40=m |
| 804 | CONFIG_DMASOUND=m | 798 | CONFIG_DMASOUND=m |
| 805 | CONFIG_HID_SUPPORT=y | 799 | CONFIG_HID_SUPPORT=y |
| 806 | CONFIG_HID=m | 800 | CONFIG_HID=m |
| 807 | # CONFIG_HID_DEBUG is not set | 801 | # CONFIG_HID_DEBUG is not set |
| 808 | CONFIG_HIDRAW=y | 802 | CONFIG_HIDRAW=y |
| 803 | # CONFIG_HID_PID is not set | ||
| 804 | |||
| 805 | # | ||
| 806 | # Special HID drivers | ||
| 807 | # | ||
| 808 | CONFIG_HID_COMPAT=y | ||
| 809 | # CONFIG_USB_SUPPORT is not set | 809 | # CONFIG_USB_SUPPORT is not set |
| 810 | # CONFIG_MMC is not set | 810 | # CONFIG_MMC is not set |
| 811 | # CONFIG_MEMSTICK is not set | 811 | # CONFIG_MEMSTICK is not set |
| @@ -814,6 +814,8 @@ CONFIG_HIDRAW=y | |||
| 814 | # CONFIG_RTC_CLASS is not set | 814 | # CONFIG_RTC_CLASS is not set |
| 815 | # CONFIG_DMADEVICES is not set | 815 | # CONFIG_DMADEVICES is not set |
| 816 | # CONFIG_UIO is not set | 816 | # CONFIG_UIO is not set |
| 817 | # CONFIG_STAGING is not set | ||
| 818 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 817 | 819 | ||
| 818 | # | 820 | # |
| 819 | # Character devices | 821 | # Character devices |
| @@ -827,8 +829,9 @@ CONFIG_EXT2_FS=y | |||
| 827 | # CONFIG_EXT2_FS_XIP is not set | 829 | # CONFIG_EXT2_FS_XIP is not set |
| 828 | CONFIG_EXT3_FS=y | 830 | CONFIG_EXT3_FS=y |
| 829 | # CONFIG_EXT3_FS_XATTR is not set | 831 | # CONFIG_EXT3_FS_XATTR is not set |
| 830 | # CONFIG_EXT4DEV_FS is not set | 832 | # CONFIG_EXT4_FS is not set |
| 831 | CONFIG_JBD=y | 833 | CONFIG_JBD=y |
| 834 | CONFIG_JBD2=m | ||
| 832 | CONFIG_REISERFS_FS=m | 835 | CONFIG_REISERFS_FS=m |
| 833 | # CONFIG_REISERFS_CHECK is not set | 836 | # CONFIG_REISERFS_CHECK is not set |
| 834 | # CONFIG_REISERFS_PROC_INFO is not set | 837 | # CONFIG_REISERFS_PROC_INFO is not set |
| @@ -839,6 +842,7 @@ CONFIG_JFS_FS=m | |||
| 839 | # CONFIG_JFS_DEBUG is not set | 842 | # CONFIG_JFS_DEBUG is not set |
| 840 | # CONFIG_JFS_STATISTICS is not set | 843 | # CONFIG_JFS_STATISTICS is not set |
| 841 | # CONFIG_FS_POSIX_ACL is not set | 844 | # CONFIG_FS_POSIX_ACL is not set |
| 845 | CONFIG_FILE_LOCKING=y | ||
| 842 | CONFIG_XFS_FS=m | 846 | CONFIG_XFS_FS=m |
| 843 | # CONFIG_XFS_QUOTA is not set | 847 | # CONFIG_XFS_QUOTA is not set |
| 844 | # CONFIG_XFS_POSIX_ACL is not set | 848 | # CONFIG_XFS_POSIX_ACL is not set |
| @@ -850,6 +854,7 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | |||
| 850 | # CONFIG_OCFS2_FS_STATS is not set | 854 | # CONFIG_OCFS2_FS_STATS is not set |
| 851 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 855 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
| 852 | # CONFIG_OCFS2_DEBUG_FS is not set | 856 | # CONFIG_OCFS2_DEBUG_FS is not set |
| 857 | # CONFIG_OCFS2_COMPAT_JBD is not set | ||
| 853 | CONFIG_DNOTIFY=y | 858 | CONFIG_DNOTIFY=y |
| 854 | CONFIG_INOTIFY=y | 859 | CONFIG_INOTIFY=y |
| 855 | CONFIG_INOTIFY_USER=y | 860 | CONFIG_INOTIFY_USER=y |
| @@ -888,6 +893,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
| 888 | CONFIG_PROC_FS=y | 893 | CONFIG_PROC_FS=y |
| 889 | CONFIG_PROC_KCORE=y | 894 | CONFIG_PROC_KCORE=y |
| 890 | CONFIG_PROC_SYSCTL=y | 895 | CONFIG_PROC_SYSCTL=y |
| 896 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 891 | CONFIG_SYSFS=y | 897 | CONFIG_SYSFS=y |
| 892 | CONFIG_TMPFS=y | 898 | CONFIG_TMPFS=y |
| 893 | # CONFIG_TMPFS_POSIX_ACL is not set | 899 | # CONFIG_TMPFS_POSIX_ACL is not set |
| @@ -930,6 +936,7 @@ CONFIG_EXPORTFS=m | |||
| 930 | CONFIG_NFS_COMMON=y | 936 | CONFIG_NFS_COMMON=y |
| 931 | CONFIG_SUNRPC=y | 937 | CONFIG_SUNRPC=y |
| 932 | CONFIG_SUNRPC_GSS=y | 938 | CONFIG_SUNRPC_GSS=y |
| 939 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
| 933 | CONFIG_RPCSEC_GSS_KRB5=y | 940 | CONFIG_RPCSEC_GSS_KRB5=y |
| 934 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 941 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 935 | CONFIG_SMB_FS=m | 942 | CONFIG_SMB_FS=m |
| @@ -1002,7 +1009,13 @@ CONFIG_MAGIC_SYSRQ=y | |||
| 1002 | # CONFIG_DEBUG_KERNEL is not set | 1009 | # CONFIG_DEBUG_KERNEL is not set |
| 1003 | CONFIG_DEBUG_BUGVERBOSE=y | 1010 | CONFIG_DEBUG_BUGVERBOSE=y |
| 1004 | CONFIG_DEBUG_MEMORY_INIT=y | 1011 | CONFIG_DEBUG_MEMORY_INIT=y |
| 1012 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
| 1005 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1013 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
| 1014 | |||
| 1015 | # | ||
| 1016 | # Tracers | ||
| 1017 | # | ||
| 1018 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
| 1006 | # CONFIG_SAMPLES is not set | 1019 | # CONFIG_SAMPLES is not set |
| 1007 | 1020 | ||
| 1008 | # | 1021 | # |
| @@ -1010,6 +1023,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y | |||
| 1010 | # | 1023 | # |
| 1011 | # CONFIG_KEYS is not set | 1024 | # CONFIG_KEYS is not set |
| 1012 | # CONFIG_SECURITY is not set | 1025 | # CONFIG_SECURITY is not set |
| 1026 | # CONFIG_SECURITYFS is not set | ||
| 1013 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1027 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1014 | CONFIG_XOR_BLOCKS=m | 1028 | CONFIG_XOR_BLOCKS=m |
| 1015 | CONFIG_ASYNC_CORE=m | 1029 | CONFIG_ASYNC_CORE=m |
| @@ -1020,10 +1034,12 @@ CONFIG_CRYPTO=y | |||
| 1020 | # | 1034 | # |
| 1021 | # Crypto core or helper | 1035 | # Crypto core or helper |
| 1022 | # | 1036 | # |
| 1037 | # CONFIG_CRYPTO_FIPS is not set | ||
| 1023 | CONFIG_CRYPTO_ALGAPI=y | 1038 | CONFIG_CRYPTO_ALGAPI=y |
| 1024 | CONFIG_CRYPTO_AEAD=m | 1039 | CONFIG_CRYPTO_AEAD=y |
| 1025 | CONFIG_CRYPTO_BLKCIPHER=y | 1040 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1026 | CONFIG_CRYPTO_HASH=y | 1041 | CONFIG_CRYPTO_HASH=y |
| 1042 | CONFIG_CRYPTO_RNG=y | ||
| 1027 | CONFIG_CRYPTO_MANAGER=y | 1043 | CONFIG_CRYPTO_MANAGER=y |
| 1028 | CONFIG_CRYPTO_GF128MUL=m | 1044 | CONFIG_CRYPTO_GF128MUL=m |
| 1029 | CONFIG_CRYPTO_NULL=m | 1045 | CONFIG_CRYPTO_NULL=m |
| @@ -1097,14 +1113,17 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m | |||
| 1097 | # | 1113 | # |
| 1098 | CONFIG_CRYPTO_DEFLATE=m | 1114 | CONFIG_CRYPTO_DEFLATE=m |
| 1099 | CONFIG_CRYPTO_LZO=m | 1115 | CONFIG_CRYPTO_LZO=m |
| 1116 | |||
| 1117 | # | ||
| 1118 | # Random Number Generation | ||
| 1119 | # | ||
| 1120 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
| 1100 | # CONFIG_CRYPTO_HW is not set | 1121 | # CONFIG_CRYPTO_HW is not set |
| 1101 | 1122 | ||
| 1102 | # | 1123 | # |
| 1103 | # Library routines | 1124 | # Library routines |
| 1104 | # | 1125 | # |
| 1105 | CONFIG_BITREVERSE=y | 1126 | CONFIG_BITREVERSE=y |
| 1106 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1107 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
| 1108 | CONFIG_CRC_CCITT=m | 1127 | CONFIG_CRC_CCITT=m |
| 1109 | CONFIG_CRC16=m | 1128 | CONFIG_CRC16=m |
| 1110 | CONFIG_CRC_T10DIF=y | 1129 | CONFIG_CRC_T10DIF=y |
diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig index cb62b96d766e..f404917429fa 100644 --- a/arch/m68k/configs/sun3_defconfig +++ b/arch/m68k/configs/sun3_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.27-rc6 | 3 | # Linux kernel version: 2.6.28-rc7 |
| 4 | # Wed Sep 10 09:02:11 2008 | 4 | # Tue Dec 2 20:27:53 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -14,7 +14,6 @@ CONFIG_TIME_LOW_RES=y | |||
| 14 | CONFIG_GENERIC_IOMAP=y | 14 | CONFIG_GENERIC_IOMAP=y |
| 15 | CONFIG_NO_IOPORT=y | 15 | CONFIG_NO_IOPORT=y |
| 16 | CONFIG_NO_DMA=y | 16 | CONFIG_NO_DMA=y |
| 17 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
| 18 | CONFIG_HZ=100 | 17 | CONFIG_HZ=100 |
| 19 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 18 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 20 | 19 | ||
| @@ -67,22 +66,13 @@ CONFIG_SIGNALFD=y | |||
| 67 | CONFIG_TIMERFD=y | 66 | CONFIG_TIMERFD=y |
| 68 | CONFIG_EVENTFD=y | 67 | CONFIG_EVENTFD=y |
| 69 | CONFIG_SHMEM=y | 68 | CONFIG_SHMEM=y |
| 69 | CONFIG_AIO=y | ||
| 70 | CONFIG_VM_EVENT_COUNTERS=y | 70 | CONFIG_VM_EVENT_COUNTERS=y |
| 71 | CONFIG_SLAB=y | 71 | CONFIG_SLAB=y |
| 72 | # CONFIG_SLUB is not set | 72 | # CONFIG_SLUB is not set |
| 73 | # CONFIG_SLOB is not set | 73 | # CONFIG_SLOB is not set |
| 74 | # CONFIG_PROFILING is not set | 74 | # CONFIG_PROFILING is not set |
| 75 | # CONFIG_MARKERS is not set | 75 | # CONFIG_MARKERS is not set |
| 76 | # CONFIG_HAVE_OPROFILE is not set | ||
| 77 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
| 78 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
| 79 | # CONFIG_HAVE_KPROBES is not set | ||
| 80 | # CONFIG_HAVE_KRETPROBES is not set | ||
| 81 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
| 82 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 83 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 84 | # CONFIG_HAVE_CLK is not set | ||
| 85 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 86 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 76 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 87 | CONFIG_SLABINFO=y | 77 | CONFIG_SLABINFO=y |
| 88 | CONFIG_RT_MUTEXES=y | 78 | CONFIG_RT_MUTEXES=y |
| @@ -115,10 +105,19 @@ CONFIG_DEFAULT_AS=y | |||
| 115 | # CONFIG_DEFAULT_NOOP is not set | 105 | # CONFIG_DEFAULT_NOOP is not set |
| 116 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 106 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 117 | CONFIG_CLASSIC_RCU=y | 107 | CONFIG_CLASSIC_RCU=y |
| 108 | # CONFIG_FREEZER is not set | ||
| 118 | 109 | ||
| 119 | # | 110 | # |
| 120 | # Platform dependent setup | 111 | # Platform dependent setup |
| 121 | # | 112 | # |
| 113 | # CONFIG_AMIGA is not set | ||
| 114 | # CONFIG_ATARI is not set | ||
| 115 | # CONFIG_MAC is not set | ||
| 116 | # CONFIG_APOLLO is not set | ||
| 117 | # CONFIG_VME is not set | ||
| 118 | # CONFIG_HP300 is not set | ||
| 119 | # CONFIG_SUN3X is not set | ||
| 120 | # CONFIG_Q40 is not set | ||
| 122 | CONFIG_SUN3=y | 121 | CONFIG_SUN3=y |
| 123 | 122 | ||
| 124 | # | 123 | # |
| @@ -137,19 +136,21 @@ CONFIG_FLATMEM_MANUAL=y | |||
| 137 | CONFIG_FLATMEM=y | 136 | CONFIG_FLATMEM=y |
| 138 | CONFIG_FLAT_NODE_MEM_MAP=y | 137 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 139 | CONFIG_NEED_MULTIPLE_NODES=y | 138 | CONFIG_NEED_MULTIPLE_NODES=y |
| 140 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 141 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 142 | CONFIG_PAGEFLAGS_EXTENDED=y | 139 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 143 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 140 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 144 | # CONFIG_RESOURCES_64BIT is not set | 141 | # CONFIG_RESOURCES_64BIT is not set |
| 142 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
| 145 | CONFIG_ZONE_DMA_FLAG=1 | 143 | CONFIG_ZONE_DMA_FLAG=1 |
| 146 | CONFIG_BOUNCE=y | 144 | CONFIG_BOUNCE=y |
| 147 | CONFIG_VIRT_TO_BUS=y | 145 | CONFIG_VIRT_TO_BUS=y |
| 146 | CONFIG_UNEVICTABLE_LRU=y | ||
| 148 | 147 | ||
| 149 | # | 148 | # |
| 150 | # General setup | 149 | # General setup |
| 151 | # | 150 | # |
| 152 | CONFIG_BINFMT_ELF=y | 151 | CONFIG_BINFMT_ELF=y |
| 152 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 153 | CONFIG_HAVE_AOUT=y | ||
| 153 | CONFIG_BINFMT_AOUT=m | 154 | CONFIG_BINFMT_AOUT=m |
| 154 | CONFIG_BINFMT_MISC=m | 155 | CONFIG_BINFMT_MISC=m |
| 155 | CONFIG_PROC_HARDWARE=y | 156 | CONFIG_PROC_HARDWARE=y |
| @@ -198,7 +199,6 @@ CONFIG_INET_TCP_DIAG=m | |||
| 198 | CONFIG_TCP_CONG_CUBIC=y | 199 | CONFIG_TCP_CONG_CUBIC=y |
| 199 | CONFIG_DEFAULT_TCP_CONG="cubic" | 200 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 200 | # CONFIG_TCP_MD5SIG is not set | 201 | # CONFIG_TCP_MD5SIG is not set |
| 201 | # CONFIG_IP_VS is not set | ||
| 202 | CONFIG_IPV6=m | 202 | CONFIG_IPV6=m |
| 203 | CONFIG_IPV6_PRIVACY=y | 203 | CONFIG_IPV6_PRIVACY=y |
| 204 | CONFIG_IPV6_ROUTER_PREF=y | 204 | CONFIG_IPV6_ROUTER_PREF=y |
| @@ -248,13 +248,14 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
| 248 | CONFIG_NF_CONNTRACK_SIP=m | 248 | CONFIG_NF_CONNTRACK_SIP=m |
| 249 | CONFIG_NF_CONNTRACK_TFTP=m | 249 | CONFIG_NF_CONNTRACK_TFTP=m |
| 250 | # CONFIG_NF_CT_NETLINK is not set | 250 | # CONFIG_NF_CT_NETLINK is not set |
| 251 | # CONFIG_NETFILTER_TPROXY is not set | ||
| 251 | CONFIG_NETFILTER_XTABLES=m | 252 | CONFIG_NETFILTER_XTABLES=m |
| 252 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 253 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| 253 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 254 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
| 254 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 255 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
| 255 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 256 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
| 256 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
| 257 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 257 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
| 258 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
| 258 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | 259 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m |
| 259 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m | 260 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m |
| 260 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 261 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
| @@ -268,19 +269,22 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | |||
| 268 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 269 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
| 269 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 270 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
| 270 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 271 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
| 272 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | ||
| 271 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 273 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
| 272 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | 274 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m |
| 273 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 275 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
| 274 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 276 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
| 275 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 277 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
| 276 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 278 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
| 279 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
| 277 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 280 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
| 278 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 281 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
| 279 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
| 280 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 282 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
| 281 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | 283 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m |
| 282 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | 284 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m |
| 283 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 285 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
| 286 | CONFIG_NETFILTER_XT_MATCH_RECENT=m | ||
| 287 | # CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set | ||
| 284 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 288 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
| 285 | CONFIG_NETFILTER_XT_MATCH_STATE=m | 289 | CONFIG_NETFILTER_XT_MATCH_STATE=m |
| 286 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | 290 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m |
| @@ -288,20 +292,20 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m | |||
| 288 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 292 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
| 289 | CONFIG_NETFILTER_XT_MATCH_TIME=m | 293 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
| 290 | CONFIG_NETFILTER_XT_MATCH_U32=m | 294 | CONFIG_NETFILTER_XT_MATCH_U32=m |
| 291 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 295 | # CONFIG_IP_VS is not set |
| 292 | 296 | ||
| 293 | # | 297 | # |
| 294 | # IP: Netfilter Configuration | 298 | # IP: Netfilter Configuration |
| 295 | # | 299 | # |
| 300 | CONFIG_NF_DEFRAG_IPV4=m | ||
| 296 | CONFIG_NF_CONNTRACK_IPV4=m | 301 | CONFIG_NF_CONNTRACK_IPV4=m |
| 297 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y | 302 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y |
| 298 | CONFIG_IP_NF_QUEUE=m | 303 | CONFIG_IP_NF_QUEUE=m |
| 299 | CONFIG_IP_NF_IPTABLES=m | 304 | CONFIG_IP_NF_IPTABLES=m |
| 300 | CONFIG_IP_NF_MATCH_RECENT=m | 305 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
| 301 | CONFIG_IP_NF_MATCH_ECN=m | ||
| 302 | CONFIG_IP_NF_MATCH_AH=m | 306 | CONFIG_IP_NF_MATCH_AH=m |
| 307 | CONFIG_IP_NF_MATCH_ECN=m | ||
| 303 | CONFIG_IP_NF_MATCH_TTL=m | 308 | CONFIG_IP_NF_MATCH_TTL=m |
| 304 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
| 305 | CONFIG_IP_NF_FILTER=m | 309 | CONFIG_IP_NF_FILTER=m |
| 306 | CONFIG_IP_NF_TARGET_REJECT=m | 310 | CONFIG_IP_NF_TARGET_REJECT=m |
| 307 | CONFIG_IP_NF_TARGET_LOG=m | 311 | CONFIG_IP_NF_TARGET_LOG=m |
| @@ -309,8 +313,8 @@ CONFIG_IP_NF_TARGET_ULOG=m | |||
| 309 | CONFIG_NF_NAT=m | 313 | CONFIG_NF_NAT=m |
| 310 | CONFIG_NF_NAT_NEEDED=y | 314 | CONFIG_NF_NAT_NEEDED=y |
| 311 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 315 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
| 312 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
| 313 | CONFIG_IP_NF_TARGET_NETMAP=m | 316 | CONFIG_IP_NF_TARGET_NETMAP=m |
| 317 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
| 314 | CONFIG_NF_NAT_SNMP_BASIC=m | 318 | CONFIG_NF_NAT_SNMP_BASIC=m |
| 315 | CONFIG_NF_NAT_PROTO_GRE=m | 319 | CONFIG_NF_NAT_PROTO_GRE=m |
| 316 | CONFIG_NF_NAT_PROTO_UDPLITE=m | 320 | CONFIG_NF_NAT_PROTO_UDPLITE=m |
| @@ -323,9 +327,9 @@ CONFIG_NF_NAT_PPTP=m | |||
| 323 | CONFIG_NF_NAT_H323=m | 327 | CONFIG_NF_NAT_H323=m |
| 324 | CONFIG_NF_NAT_SIP=m | 328 | CONFIG_NF_NAT_SIP=m |
| 325 | CONFIG_IP_NF_MANGLE=m | 329 | CONFIG_IP_NF_MANGLE=m |
| 330 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
| 326 | CONFIG_IP_NF_TARGET_ECN=m | 331 | CONFIG_IP_NF_TARGET_ECN=m |
| 327 | CONFIG_IP_NF_TARGET_TTL=m | 332 | CONFIG_IP_NF_TARGET_TTL=m |
| 328 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
| 329 | CONFIG_IP_NF_RAW=m | 333 | CONFIG_IP_NF_RAW=m |
| 330 | CONFIG_IP_NF_ARPTABLES=m | 334 | CONFIG_IP_NF_ARPTABLES=m |
| 331 | CONFIG_IP_NF_ARPFILTER=m | 335 | CONFIG_IP_NF_ARPFILTER=m |
| @@ -337,16 +341,16 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
| 337 | CONFIG_NF_CONNTRACK_IPV6=m | 341 | CONFIG_NF_CONNTRACK_IPV6=m |
| 338 | CONFIG_IP6_NF_QUEUE=m | 342 | CONFIG_IP6_NF_QUEUE=m |
| 339 | CONFIG_IP6_NF_IPTABLES=m | 343 | CONFIG_IP6_NF_IPTABLES=m |
| 340 | CONFIG_IP6_NF_MATCH_RT=m | 344 | CONFIG_IP6_NF_MATCH_AH=m |
| 341 | CONFIG_IP6_NF_MATCH_OPTS=m | 345 | CONFIG_IP6_NF_MATCH_EUI64=m |
| 342 | CONFIG_IP6_NF_MATCH_FRAG=m | 346 | CONFIG_IP6_NF_MATCH_FRAG=m |
| 347 | CONFIG_IP6_NF_MATCH_OPTS=m | ||
| 343 | CONFIG_IP6_NF_MATCH_HL=m | 348 | CONFIG_IP6_NF_MATCH_HL=m |
| 344 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 349 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
| 345 | CONFIG_IP6_NF_MATCH_AH=m | ||
| 346 | CONFIG_IP6_NF_MATCH_MH=m | 350 | CONFIG_IP6_NF_MATCH_MH=m |
| 347 | CONFIG_IP6_NF_MATCH_EUI64=m | 351 | CONFIG_IP6_NF_MATCH_RT=m |
| 348 | CONFIG_IP6_NF_FILTER=m | ||
| 349 | CONFIG_IP6_NF_TARGET_LOG=m | 352 | CONFIG_IP6_NF_TARGET_LOG=m |
| 353 | CONFIG_IP6_NF_FILTER=m | ||
| 350 | CONFIG_IP6_NF_TARGET_REJECT=m | 354 | CONFIG_IP6_NF_TARGET_REJECT=m |
| 351 | CONFIG_IP6_NF_MANGLE=m | 355 | CONFIG_IP6_NF_MANGLE=m |
| 352 | CONFIG_IP6_NF_TARGET_HL=m | 356 | CONFIG_IP6_NF_TARGET_HL=m |
| @@ -373,6 +377,7 @@ CONFIG_SCTP_HMAC_MD5=y | |||
| 373 | # CONFIG_TIPC is not set | 377 | # CONFIG_TIPC is not set |
| 374 | # CONFIG_ATM is not set | 378 | # CONFIG_ATM is not set |
| 375 | # CONFIG_BRIDGE is not set | 379 | # CONFIG_BRIDGE is not set |
| 380 | # CONFIG_NET_DSA is not set | ||
| 376 | # CONFIG_VLAN_8021Q is not set | 381 | # CONFIG_VLAN_8021Q is not set |
| 377 | # CONFIG_DECNET is not set | 382 | # CONFIG_DECNET is not set |
| 378 | CONFIG_LLC=m | 383 | CONFIG_LLC=m |
| @@ -396,19 +401,8 @@ CONFIG_NET_CLS_ROUTE=y | |||
| 396 | # CONFIG_IRDA is not set | 401 | # CONFIG_IRDA is not set |
| 397 | # CONFIG_BT is not set | 402 | # CONFIG_BT is not set |
| 398 | # CONFIG_AF_RXRPC is not set | 403 | # CONFIG_AF_RXRPC is not set |
| 399 | 404 | # CONFIG_PHONET is not set | |
| 400 | # | 405 | # CONFIG_WIRELESS is not set |
| 401 | # Wireless | ||
| 402 | # | ||
| 403 | # CONFIG_CFG80211 is not set | ||
| 404 | CONFIG_WIRELESS_EXT=y | ||
| 405 | # CONFIG_WIRELESS_EXT_SYSFS is not set | ||
| 406 | # CONFIG_MAC80211 is not set | ||
| 407 | CONFIG_IEEE80211=m | ||
| 408 | # CONFIG_IEEE80211_DEBUG is not set | ||
| 409 | CONFIG_IEEE80211_CRYPT_WEP=m | ||
| 410 | CONFIG_IEEE80211_CRYPT_CCMP=m | ||
| 411 | CONFIG_IEEE80211_CRYPT_TKIP=m | ||
| 412 | # CONFIG_RFKILL is not set | 406 | # CONFIG_RFKILL is not set |
| 413 | # CONFIG_NET_9P is not set | 407 | # CONFIG_NET_9P is not set |
| 414 | 408 | ||
| @@ -446,6 +440,7 @@ CONFIG_ATA_OVER_ETH=m | |||
| 446 | CONFIG_MISC_DEVICES=y | 440 | CONFIG_MISC_DEVICES=y |
| 447 | # CONFIG_EEPROM_93CX6 is not set | 441 | # CONFIG_EEPROM_93CX6 is not set |
| 448 | # CONFIG_ENCLOSURE_SERVICES is not set | 442 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 443 | # CONFIG_C2PORT is not set | ||
| 449 | CONFIG_HAVE_IDE=y | 444 | CONFIG_HAVE_IDE=y |
| 450 | # CONFIG_IDE is not set | 445 | # CONFIG_IDE is not set |
| 451 | 446 | ||
| @@ -531,6 +526,9 @@ CONFIG_SUN3_82586=y | |||
| 531 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 526 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 532 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 527 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| 533 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 528 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
| 529 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
| 530 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
| 531 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
| 534 | # CONFIG_NETDEV_1000 is not set | 532 | # CONFIG_NETDEV_1000 is not set |
| 535 | # CONFIG_NETDEV_10000 is not set | 533 | # CONFIG_NETDEV_10000 is not set |
| 536 | 534 | ||
| @@ -599,6 +597,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y | |||
| 599 | CONFIG_MOUSE_PS2_SYNAPTICS=y | 597 | CONFIG_MOUSE_PS2_SYNAPTICS=y |
| 600 | CONFIG_MOUSE_PS2_LIFEBOOK=y | 598 | CONFIG_MOUSE_PS2_LIFEBOOK=y |
| 601 | CONFIG_MOUSE_PS2_TRACKPOINT=y | 599 | CONFIG_MOUSE_PS2_TRACKPOINT=y |
| 600 | # CONFIG_MOUSE_PS2_ELANTECH is not set | ||
| 602 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 601 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
| 603 | CONFIG_MOUSE_SERIAL=m | 602 | CONFIG_MOUSE_SERIAL=m |
| 604 | # CONFIG_MOUSE_VSXXXAA is not set | 603 | # CONFIG_MOUSE_VSXXXAA is not set |
| @@ -655,16 +654,13 @@ CONFIG_GEN_RTC_X=y | |||
| 655 | # CONFIG_WATCHDOG is not set | 654 | # CONFIG_WATCHDOG is not set |
| 656 | 655 | ||
| 657 | # | 656 | # |
| 658 | # Sonics Silicon Backplane | ||
| 659 | # | ||
| 660 | |||
| 661 | # | ||
| 662 | # Multifunction device drivers | 657 | # Multifunction device drivers |
| 663 | # | 658 | # |
| 664 | # CONFIG_MFD_CORE is not set | 659 | # CONFIG_MFD_CORE is not set |
| 665 | # CONFIG_MFD_SM501 is not set | 660 | # CONFIG_MFD_SM501 is not set |
| 666 | # CONFIG_HTC_PASIC3 is not set | 661 | # CONFIG_HTC_PASIC3 is not set |
| 667 | # CONFIG_MFD_TMIO is not set | 662 | # CONFIG_MFD_TMIO is not set |
| 663 | # CONFIG_REGULATOR is not set | ||
| 668 | 664 | ||
| 669 | # | 665 | # |
| 670 | # Multimedia devices | 666 | # Multimedia devices |
| @@ -690,6 +686,7 @@ CONFIG_GEN_RTC_X=y | |||
| 690 | CONFIG_FB=y | 686 | CONFIG_FB=y |
| 691 | # CONFIG_FIRMWARE_EDID is not set | 687 | # CONFIG_FIRMWARE_EDID is not set |
| 692 | # CONFIG_FB_DDC is not set | 688 | # CONFIG_FB_DDC is not set |
| 689 | # CONFIG_FB_BOOT_VESA_SUPPORT is not set | ||
| 693 | # CONFIG_FB_CFB_FILLRECT is not set | 690 | # CONFIG_FB_CFB_FILLRECT is not set |
| 694 | # CONFIG_FB_CFB_COPYAREA is not set | 691 | # CONFIG_FB_CFB_COPYAREA is not set |
| 695 | # CONFIG_FB_CFB_IMAGEBLIT is not set | 692 | # CONFIG_FB_CFB_IMAGEBLIT is not set |
| @@ -711,6 +708,8 @@ CONFIG_FB=y | |||
| 711 | # CONFIG_FB_UVESA is not set | 708 | # CONFIG_FB_UVESA is not set |
| 712 | # CONFIG_FB_S1D13XXX is not set | 709 | # CONFIG_FB_S1D13XXX is not set |
| 713 | # CONFIG_FB_VIRTUAL is not set | 710 | # CONFIG_FB_VIRTUAL is not set |
| 711 | # CONFIG_FB_METRONOME is not set | ||
| 712 | # CONFIG_FB_MB862XX is not set | ||
| 714 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 713 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 715 | 714 | ||
| 716 | # | 715 | # |
| @@ -737,6 +736,12 @@ CONFIG_HID_SUPPORT=y | |||
| 737 | CONFIG_HID=m | 736 | CONFIG_HID=m |
| 738 | # CONFIG_HID_DEBUG is not set | 737 | # CONFIG_HID_DEBUG is not set |
| 739 | CONFIG_HIDRAW=y | 738 | CONFIG_HIDRAW=y |
| 739 | # CONFIG_HID_PID is not set | ||
| 740 | |||
| 741 | # | ||
| 742 | # Special HID drivers | ||
| 743 | # | ||
| 744 | CONFIG_HID_COMPAT=y | ||
| 740 | # CONFIG_USB_SUPPORT is not set | 745 | # CONFIG_USB_SUPPORT is not set |
| 741 | # CONFIG_MMC is not set | 746 | # CONFIG_MMC is not set |
| 742 | # CONFIG_MEMSTICK is not set | 747 | # CONFIG_MEMSTICK is not set |
| @@ -744,6 +749,8 @@ CONFIG_HIDRAW=y | |||
| 744 | # CONFIG_ACCESSIBILITY is not set | 749 | # CONFIG_ACCESSIBILITY is not set |
| 745 | # CONFIG_RTC_CLASS is not set | 750 | # CONFIG_RTC_CLASS is not set |
| 746 | # CONFIG_UIO is not set | 751 | # CONFIG_UIO is not set |
| 752 | # CONFIG_STAGING is not set | ||
| 753 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 747 | 754 | ||
| 748 | # | 755 | # |
| 749 | # Character devices | 756 | # Character devices |
| @@ -757,8 +764,9 @@ CONFIG_EXT2_FS=y | |||
| 757 | # CONFIG_EXT2_FS_XIP is not set | 764 | # CONFIG_EXT2_FS_XIP is not set |
| 758 | CONFIG_EXT3_FS=y | 765 | CONFIG_EXT3_FS=y |
| 759 | # CONFIG_EXT3_FS_XATTR is not set | 766 | # CONFIG_EXT3_FS_XATTR is not set |
| 760 | # CONFIG_EXT4DEV_FS is not set | 767 | # CONFIG_EXT4_FS is not set |
| 761 | CONFIG_JBD=y | 768 | CONFIG_JBD=y |
| 769 | CONFIG_JBD2=m | ||
| 762 | CONFIG_REISERFS_FS=m | 770 | CONFIG_REISERFS_FS=m |
| 763 | # CONFIG_REISERFS_CHECK is not set | 771 | # CONFIG_REISERFS_CHECK is not set |
| 764 | # CONFIG_REISERFS_PROC_INFO is not set | 772 | # CONFIG_REISERFS_PROC_INFO is not set |
| @@ -769,6 +777,7 @@ CONFIG_JFS_FS=m | |||
| 769 | # CONFIG_JFS_DEBUG is not set | 777 | # CONFIG_JFS_DEBUG is not set |
| 770 | # CONFIG_JFS_STATISTICS is not set | 778 | # CONFIG_JFS_STATISTICS is not set |
| 771 | # CONFIG_FS_POSIX_ACL is not set | 779 | # CONFIG_FS_POSIX_ACL is not set |
| 780 | CONFIG_FILE_LOCKING=y | ||
| 772 | CONFIG_XFS_FS=m | 781 | CONFIG_XFS_FS=m |
| 773 | # CONFIG_XFS_QUOTA is not set | 782 | # CONFIG_XFS_QUOTA is not set |
| 774 | # CONFIG_XFS_POSIX_ACL is not set | 783 | # CONFIG_XFS_POSIX_ACL is not set |
| @@ -780,6 +789,7 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | |||
| 780 | # CONFIG_OCFS2_FS_STATS is not set | 789 | # CONFIG_OCFS2_FS_STATS is not set |
| 781 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 790 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
| 782 | # CONFIG_OCFS2_DEBUG_FS is not set | 791 | # CONFIG_OCFS2_DEBUG_FS is not set |
| 792 | # CONFIG_OCFS2_COMPAT_JBD is not set | ||
| 783 | CONFIG_DNOTIFY=y | 793 | CONFIG_DNOTIFY=y |
| 784 | CONFIG_INOTIFY=y | 794 | CONFIG_INOTIFY=y |
| 785 | CONFIG_INOTIFY_USER=y | 795 | CONFIG_INOTIFY_USER=y |
| @@ -818,6 +828,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
| 818 | CONFIG_PROC_FS=y | 828 | CONFIG_PROC_FS=y |
| 819 | CONFIG_PROC_KCORE=y | 829 | CONFIG_PROC_KCORE=y |
| 820 | CONFIG_PROC_SYSCTL=y | 830 | CONFIG_PROC_SYSCTL=y |
| 831 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 821 | CONFIG_SYSFS=y | 832 | CONFIG_SYSFS=y |
| 822 | CONFIG_TMPFS=y | 833 | CONFIG_TMPFS=y |
| 823 | # CONFIG_TMPFS_POSIX_ACL is not set | 834 | # CONFIG_TMPFS_POSIX_ACL is not set |
| @@ -861,6 +872,7 @@ CONFIG_EXPORTFS=m | |||
| 861 | CONFIG_NFS_COMMON=y | 872 | CONFIG_NFS_COMMON=y |
| 862 | CONFIG_SUNRPC=y | 873 | CONFIG_SUNRPC=y |
| 863 | CONFIG_SUNRPC_GSS=y | 874 | CONFIG_SUNRPC_GSS=y |
| 875 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
| 864 | CONFIG_RPCSEC_GSS_KRB5=y | 876 | CONFIG_RPCSEC_GSS_KRB5=y |
| 865 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 877 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 866 | CONFIG_SMB_FS=m | 878 | CONFIG_SMB_FS=m |
| @@ -934,7 +946,13 @@ CONFIG_MAGIC_SYSRQ=y | |||
| 934 | # CONFIG_DEBUG_KERNEL is not set | 946 | # CONFIG_DEBUG_KERNEL is not set |
| 935 | CONFIG_DEBUG_BUGVERBOSE=y | 947 | CONFIG_DEBUG_BUGVERBOSE=y |
| 936 | CONFIG_DEBUG_MEMORY_INIT=y | 948 | CONFIG_DEBUG_MEMORY_INIT=y |
| 949 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
| 937 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 950 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
| 951 | |||
| 952 | # | ||
| 953 | # Tracers | ||
| 954 | # | ||
| 955 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
| 938 | # CONFIG_SAMPLES is not set | 956 | # CONFIG_SAMPLES is not set |
| 939 | 957 | ||
| 940 | # | 958 | # |
| @@ -942,6 +960,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y | |||
| 942 | # | 960 | # |
| 943 | # CONFIG_KEYS is not set | 961 | # CONFIG_KEYS is not set |
| 944 | # CONFIG_SECURITY is not set | 962 | # CONFIG_SECURITY is not set |
| 963 | # CONFIG_SECURITYFS is not set | ||
| 945 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 964 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 946 | CONFIG_XOR_BLOCKS=m | 965 | CONFIG_XOR_BLOCKS=m |
| 947 | CONFIG_ASYNC_CORE=m | 966 | CONFIG_ASYNC_CORE=m |
| @@ -952,10 +971,12 @@ CONFIG_CRYPTO=y | |||
| 952 | # | 971 | # |
| 953 | # Crypto core or helper | 972 | # Crypto core or helper |
| 954 | # | 973 | # |
| 974 | # CONFIG_CRYPTO_FIPS is not set | ||
| 955 | CONFIG_CRYPTO_ALGAPI=y | 975 | CONFIG_CRYPTO_ALGAPI=y |
| 956 | CONFIG_CRYPTO_AEAD=m | 976 | CONFIG_CRYPTO_AEAD=y |
| 957 | CONFIG_CRYPTO_BLKCIPHER=y | 977 | CONFIG_CRYPTO_BLKCIPHER=y |
| 958 | CONFIG_CRYPTO_HASH=y | 978 | CONFIG_CRYPTO_HASH=y |
| 979 | CONFIG_CRYPTO_RNG=y | ||
| 959 | CONFIG_CRYPTO_MANAGER=y | 980 | CONFIG_CRYPTO_MANAGER=y |
| 960 | CONFIG_CRYPTO_GF128MUL=m | 981 | CONFIG_CRYPTO_GF128MUL=m |
| 961 | CONFIG_CRYPTO_NULL=m | 982 | CONFIG_CRYPTO_NULL=m |
| @@ -1029,14 +1050,17 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m | |||
| 1029 | # | 1050 | # |
| 1030 | CONFIG_CRYPTO_DEFLATE=m | 1051 | CONFIG_CRYPTO_DEFLATE=m |
| 1031 | CONFIG_CRYPTO_LZO=m | 1052 | CONFIG_CRYPTO_LZO=m |
| 1053 | |||
| 1054 | # | ||
| 1055 | # Random Number Generation | ||
| 1056 | # | ||
| 1057 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
| 1032 | # CONFIG_CRYPTO_HW is not set | 1058 | # CONFIG_CRYPTO_HW is not set |
| 1033 | 1059 | ||
| 1034 | # | 1060 | # |
| 1035 | # Library routines | 1061 | # Library routines |
| 1036 | # | 1062 | # |
| 1037 | CONFIG_BITREVERSE=y | 1063 | CONFIG_BITREVERSE=y |
| 1038 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1039 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
| 1040 | CONFIG_CRC_CCITT=m | 1064 | CONFIG_CRC_CCITT=m |
| 1041 | CONFIG_CRC16=m | 1065 | CONFIG_CRC16=m |
| 1042 | CONFIG_CRC_T10DIF=y | 1066 | CONFIG_CRC_T10DIF=y |
diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_defconfig index 04b4363a7050..4d8a1e84e39f 100644 --- a/arch/m68k/configs/sun3x_defconfig +++ b/arch/m68k/configs/sun3x_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.27-rc6 | 3 | # Linux kernel version: 2.6.28-rc7 |
| 4 | # Wed Sep 10 09:02:12 2008 | 4 | # Tue Dec 2 20:27:54 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -14,7 +14,6 @@ CONFIG_TIME_LOW_RES=y | |||
| 14 | CONFIG_GENERIC_IOMAP=y | 14 | CONFIG_GENERIC_IOMAP=y |
| 15 | CONFIG_NO_IOPORT=y | 15 | CONFIG_NO_IOPORT=y |
| 16 | # CONFIG_NO_DMA is not set | 16 | # CONFIG_NO_DMA is not set |
| 17 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
| 18 | CONFIG_HZ=100 | 17 | CONFIG_HZ=100 |
| 19 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 18 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 20 | 19 | ||
| @@ -67,22 +66,13 @@ CONFIG_SIGNALFD=y | |||
| 67 | CONFIG_TIMERFD=y | 66 | CONFIG_TIMERFD=y |
| 68 | CONFIG_EVENTFD=y | 67 | CONFIG_EVENTFD=y |
| 69 | CONFIG_SHMEM=y | 68 | CONFIG_SHMEM=y |
| 69 | CONFIG_AIO=y | ||
| 70 | CONFIG_VM_EVENT_COUNTERS=y | 70 | CONFIG_VM_EVENT_COUNTERS=y |
| 71 | CONFIG_SLAB=y | 71 | CONFIG_SLAB=y |
| 72 | # CONFIG_SLUB is not set | 72 | # CONFIG_SLUB is not set |
| 73 | # CONFIG_SLOB is not set | 73 | # CONFIG_SLOB is not set |
| 74 | # CONFIG_PROFILING is not set | 74 | # CONFIG_PROFILING is not set |
| 75 | # CONFIG_MARKERS is not set | 75 | # CONFIG_MARKERS is not set |
| 76 | # CONFIG_HAVE_OPROFILE is not set | ||
| 77 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
| 78 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
| 79 | # CONFIG_HAVE_KPROBES is not set | ||
| 80 | # CONFIG_HAVE_KRETPROBES is not set | ||
| 81 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
| 82 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 83 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 84 | # CONFIG_HAVE_CLK is not set | ||
| 85 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 86 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 76 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 87 | CONFIG_SLABINFO=y | 77 | CONFIG_SLABINFO=y |
| 88 | CONFIG_RT_MUTEXES=y | 78 | CONFIG_RT_MUTEXES=y |
| @@ -115,11 +105,11 @@ CONFIG_DEFAULT_AS=y | |||
| 115 | # CONFIG_DEFAULT_NOOP is not set | 105 | # CONFIG_DEFAULT_NOOP is not set |
| 116 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 106 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 117 | CONFIG_CLASSIC_RCU=y | 107 | CONFIG_CLASSIC_RCU=y |
| 108 | # CONFIG_FREEZER is not set | ||
| 118 | 109 | ||
| 119 | # | 110 | # |
| 120 | # Platform dependent setup | 111 | # Platform dependent setup |
| 121 | # | 112 | # |
| 122 | # CONFIG_SUN3 is not set | ||
| 123 | # CONFIG_AMIGA is not set | 113 | # CONFIG_AMIGA is not set |
| 124 | # CONFIG_ATARI is not set | 114 | # CONFIG_ATARI is not set |
| 125 | # CONFIG_MAC is not set | 115 | # CONFIG_MAC is not set |
| @@ -148,19 +138,21 @@ CONFIG_DISCONTIGMEM_MANUAL=y | |||
| 148 | CONFIG_DISCONTIGMEM=y | 138 | CONFIG_DISCONTIGMEM=y |
| 149 | CONFIG_FLAT_NODE_MEM_MAP=y | 139 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 150 | CONFIG_NEED_MULTIPLE_NODES=y | 140 | CONFIG_NEED_MULTIPLE_NODES=y |
| 151 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 152 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 153 | CONFIG_PAGEFLAGS_EXTENDED=y | 141 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 154 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 142 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 155 | # CONFIG_RESOURCES_64BIT is not set | 143 | # CONFIG_RESOURCES_64BIT is not set |
| 144 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
| 156 | CONFIG_ZONE_DMA_FLAG=1 | 145 | CONFIG_ZONE_DMA_FLAG=1 |
| 157 | CONFIG_BOUNCE=y | 146 | CONFIG_BOUNCE=y |
| 158 | CONFIG_VIRT_TO_BUS=y | 147 | CONFIG_VIRT_TO_BUS=y |
| 148 | CONFIG_UNEVICTABLE_LRU=y | ||
| 159 | 149 | ||
| 160 | # | 150 | # |
| 161 | # General setup | 151 | # General setup |
| 162 | # | 152 | # |
| 163 | CONFIG_BINFMT_ELF=y | 153 | CONFIG_BINFMT_ELF=y |
| 154 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 155 | CONFIG_HAVE_AOUT=y | ||
| 164 | CONFIG_BINFMT_AOUT=m | 156 | CONFIG_BINFMT_AOUT=m |
| 165 | CONFIG_BINFMT_MISC=m | 157 | CONFIG_BINFMT_MISC=m |
| 166 | CONFIG_PROC_HARDWARE=y | 158 | CONFIG_PROC_HARDWARE=y |
| @@ -209,7 +201,6 @@ CONFIG_INET_TCP_DIAG=m | |||
| 209 | CONFIG_TCP_CONG_CUBIC=y | 201 | CONFIG_TCP_CONG_CUBIC=y |
| 210 | CONFIG_DEFAULT_TCP_CONG="cubic" | 202 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 211 | # CONFIG_TCP_MD5SIG is not set | 203 | # CONFIG_TCP_MD5SIG is not set |
| 212 | # CONFIG_IP_VS is not set | ||
| 213 | CONFIG_IPV6=m | 204 | CONFIG_IPV6=m |
| 214 | CONFIG_IPV6_PRIVACY=y | 205 | CONFIG_IPV6_PRIVACY=y |
| 215 | CONFIG_IPV6_ROUTER_PREF=y | 206 | CONFIG_IPV6_ROUTER_PREF=y |
| @@ -259,13 +250,14 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
| 259 | CONFIG_NF_CONNTRACK_SIP=m | 250 | CONFIG_NF_CONNTRACK_SIP=m |
| 260 | CONFIG_NF_CONNTRACK_TFTP=m | 251 | CONFIG_NF_CONNTRACK_TFTP=m |
| 261 | # CONFIG_NF_CT_NETLINK is not set | 252 | # CONFIG_NF_CT_NETLINK is not set |
| 253 | # CONFIG_NETFILTER_TPROXY is not set | ||
| 262 | CONFIG_NETFILTER_XTABLES=m | 254 | CONFIG_NETFILTER_XTABLES=m |
| 263 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 255 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| 264 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 256 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
| 265 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 257 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
| 266 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 258 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
| 267 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
| 268 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 259 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
| 260 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
| 269 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | 261 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m |
| 270 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m | 262 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m |
| 271 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 263 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
| @@ -279,19 +271,22 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | |||
| 279 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 271 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
| 280 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 272 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
| 281 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 273 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
| 274 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | ||
| 282 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 275 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
| 283 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | 276 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m |
| 284 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 277 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
| 285 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 278 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
| 286 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 279 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
| 287 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 280 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
| 281 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
| 288 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 282 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
| 289 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 283 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
| 290 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
| 291 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 284 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
| 292 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | 285 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m |
| 293 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | 286 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m |
| 294 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 287 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
| 288 | CONFIG_NETFILTER_XT_MATCH_RECENT=m | ||
| 289 | # CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set | ||
| 295 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 290 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
| 296 | CONFIG_NETFILTER_XT_MATCH_STATE=m | 291 | CONFIG_NETFILTER_XT_MATCH_STATE=m |
| 297 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | 292 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m |
| @@ -299,20 +294,20 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m | |||
| 299 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 294 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
| 300 | CONFIG_NETFILTER_XT_MATCH_TIME=m | 295 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
| 301 | CONFIG_NETFILTER_XT_MATCH_U32=m | 296 | CONFIG_NETFILTER_XT_MATCH_U32=m |
| 302 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 297 | # CONFIG_IP_VS is not set |
| 303 | 298 | ||
| 304 | # | 299 | # |
| 305 | # IP: Netfilter Configuration | 300 | # IP: Netfilter Configuration |
| 306 | # | 301 | # |
| 302 | CONFIG_NF_DEFRAG_IPV4=m | ||
| 307 | CONFIG_NF_CONNTRACK_IPV4=m | 303 | CONFIG_NF_CONNTRACK_IPV4=m |
| 308 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y | 304 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y |
| 309 | CONFIG_IP_NF_QUEUE=m | 305 | CONFIG_IP_NF_QUEUE=m |
| 310 | CONFIG_IP_NF_IPTABLES=m | 306 | CONFIG_IP_NF_IPTABLES=m |
| 311 | CONFIG_IP_NF_MATCH_RECENT=m | 307 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
| 312 | CONFIG_IP_NF_MATCH_ECN=m | ||
| 313 | CONFIG_IP_NF_MATCH_AH=m | 308 | CONFIG_IP_NF_MATCH_AH=m |
| 309 | CONFIG_IP_NF_MATCH_ECN=m | ||
| 314 | CONFIG_IP_NF_MATCH_TTL=m | 310 | CONFIG_IP_NF_MATCH_TTL=m |
| 315 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
| 316 | CONFIG_IP_NF_FILTER=m | 311 | CONFIG_IP_NF_FILTER=m |
| 317 | CONFIG_IP_NF_TARGET_REJECT=m | 312 | CONFIG_IP_NF_TARGET_REJECT=m |
| 318 | CONFIG_IP_NF_TARGET_LOG=m | 313 | CONFIG_IP_NF_TARGET_LOG=m |
| @@ -320,8 +315,8 @@ CONFIG_IP_NF_TARGET_ULOG=m | |||
| 320 | CONFIG_NF_NAT=m | 315 | CONFIG_NF_NAT=m |
| 321 | CONFIG_NF_NAT_NEEDED=y | 316 | CONFIG_NF_NAT_NEEDED=y |
| 322 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 317 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
| 323 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
| 324 | CONFIG_IP_NF_TARGET_NETMAP=m | 318 | CONFIG_IP_NF_TARGET_NETMAP=m |
| 319 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
| 325 | CONFIG_NF_NAT_SNMP_BASIC=m | 320 | CONFIG_NF_NAT_SNMP_BASIC=m |
| 326 | CONFIG_NF_NAT_PROTO_GRE=m | 321 | CONFIG_NF_NAT_PROTO_GRE=m |
| 327 | CONFIG_NF_NAT_PROTO_UDPLITE=m | 322 | CONFIG_NF_NAT_PROTO_UDPLITE=m |
| @@ -334,9 +329,9 @@ CONFIG_NF_NAT_PPTP=m | |||
| 334 | CONFIG_NF_NAT_H323=m | 329 | CONFIG_NF_NAT_H323=m |
| 335 | CONFIG_NF_NAT_SIP=m | 330 | CONFIG_NF_NAT_SIP=m |
| 336 | CONFIG_IP_NF_MANGLE=m | 331 | CONFIG_IP_NF_MANGLE=m |
| 332 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
| 337 | CONFIG_IP_NF_TARGET_ECN=m | 333 | CONFIG_IP_NF_TARGET_ECN=m |
| 338 | CONFIG_IP_NF_TARGET_TTL=m | 334 | CONFIG_IP_NF_TARGET_TTL=m |
| 339 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
| 340 | CONFIG_IP_NF_RAW=m | 335 | CONFIG_IP_NF_RAW=m |
| 341 | CONFIG_IP_NF_ARPTABLES=m | 336 | CONFIG_IP_NF_ARPTABLES=m |
| 342 | CONFIG_IP_NF_ARPFILTER=m | 337 | CONFIG_IP_NF_ARPFILTER=m |
| @@ -348,16 +343,16 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
| 348 | CONFIG_NF_CONNTRACK_IPV6=m | 343 | CONFIG_NF_CONNTRACK_IPV6=m |
| 349 | CONFIG_IP6_NF_QUEUE=m | 344 | CONFIG_IP6_NF_QUEUE=m |
| 350 | CONFIG_IP6_NF_IPTABLES=m | 345 | CONFIG_IP6_NF_IPTABLES=m |
| 351 | CONFIG_IP6_NF_MATCH_RT=m | 346 | CONFIG_IP6_NF_MATCH_AH=m |
| 352 | CONFIG_IP6_NF_MATCH_OPTS=m | 347 | CONFIG_IP6_NF_MATCH_EUI64=m |
| 353 | CONFIG_IP6_NF_MATCH_FRAG=m | 348 | CONFIG_IP6_NF_MATCH_FRAG=m |
| 349 | CONFIG_IP6_NF_MATCH_OPTS=m | ||
| 354 | CONFIG_IP6_NF_MATCH_HL=m | 350 | CONFIG_IP6_NF_MATCH_HL=m |
| 355 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 351 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
| 356 | CONFIG_IP6_NF_MATCH_AH=m | ||
| 357 | CONFIG_IP6_NF_MATCH_MH=m | 352 | CONFIG_IP6_NF_MATCH_MH=m |
| 358 | CONFIG_IP6_NF_MATCH_EUI64=m | 353 | CONFIG_IP6_NF_MATCH_RT=m |
| 359 | CONFIG_IP6_NF_FILTER=m | ||
| 360 | CONFIG_IP6_NF_TARGET_LOG=m | 354 | CONFIG_IP6_NF_TARGET_LOG=m |
| 355 | CONFIG_IP6_NF_FILTER=m | ||
| 361 | CONFIG_IP6_NF_TARGET_REJECT=m | 356 | CONFIG_IP6_NF_TARGET_REJECT=m |
| 362 | CONFIG_IP6_NF_MANGLE=m | 357 | CONFIG_IP6_NF_MANGLE=m |
| 363 | CONFIG_IP6_NF_TARGET_HL=m | 358 | CONFIG_IP6_NF_TARGET_HL=m |
| @@ -384,6 +379,7 @@ CONFIG_SCTP_HMAC_MD5=y | |||
| 384 | # CONFIG_TIPC is not set | 379 | # CONFIG_TIPC is not set |
| 385 | # CONFIG_ATM is not set | 380 | # CONFIG_ATM is not set |
| 386 | # CONFIG_BRIDGE is not set | 381 | # CONFIG_BRIDGE is not set |
| 382 | # CONFIG_NET_DSA is not set | ||
| 387 | # CONFIG_VLAN_8021Q is not set | 383 | # CONFIG_VLAN_8021Q is not set |
| 388 | # CONFIG_DECNET is not set | 384 | # CONFIG_DECNET is not set |
| 389 | CONFIG_LLC=m | 385 | CONFIG_LLC=m |
| @@ -407,19 +403,8 @@ CONFIG_NET_CLS_ROUTE=y | |||
| 407 | # CONFIG_IRDA is not set | 403 | # CONFIG_IRDA is not set |
| 408 | # CONFIG_BT is not set | 404 | # CONFIG_BT is not set |
| 409 | # CONFIG_AF_RXRPC is not set | 405 | # CONFIG_AF_RXRPC is not set |
| 410 | 406 | # CONFIG_PHONET is not set | |
| 411 | # | 407 | # CONFIG_WIRELESS is not set |
| 412 | # Wireless | ||
| 413 | # | ||
| 414 | # CONFIG_CFG80211 is not set | ||
| 415 | CONFIG_WIRELESS_EXT=y | ||
| 416 | # CONFIG_WIRELESS_EXT_SYSFS is not set | ||
| 417 | # CONFIG_MAC80211 is not set | ||
| 418 | CONFIG_IEEE80211=m | ||
| 419 | # CONFIG_IEEE80211_DEBUG is not set | ||
| 420 | CONFIG_IEEE80211_CRYPT_WEP=m | ||
| 421 | CONFIG_IEEE80211_CRYPT_CCMP=m | ||
| 422 | CONFIG_IEEE80211_CRYPT_TKIP=m | ||
| 423 | # CONFIG_RFKILL is not set | 408 | # CONFIG_RFKILL is not set |
| 424 | # CONFIG_NET_9P is not set | 409 | # CONFIG_NET_9P is not set |
| 425 | 410 | ||
| @@ -457,6 +442,7 @@ CONFIG_ATA_OVER_ETH=m | |||
| 457 | CONFIG_MISC_DEVICES=y | 442 | CONFIG_MISC_DEVICES=y |
| 458 | # CONFIG_EEPROM_93CX6 is not set | 443 | # CONFIG_EEPROM_93CX6 is not set |
| 459 | # CONFIG_ENCLOSURE_SERVICES is not set | 444 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 445 | # CONFIG_C2PORT is not set | ||
| 460 | CONFIG_HAVE_IDE=y | 446 | CONFIG_HAVE_IDE=y |
| 461 | # CONFIG_IDE is not set | 447 | # CONFIG_IDE is not set |
| 462 | 448 | ||
| @@ -541,6 +527,9 @@ CONFIG_SUN3LANCE=y | |||
| 541 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 527 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 542 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 528 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| 543 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 529 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
| 530 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
| 531 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
| 532 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
| 544 | # CONFIG_B44 is not set | 533 | # CONFIG_B44 is not set |
| 545 | # CONFIG_NETDEV_1000 is not set | 534 | # CONFIG_NETDEV_1000 is not set |
| 546 | # CONFIG_NETDEV_10000 is not set | 535 | # CONFIG_NETDEV_10000 is not set |
| @@ -610,6 +599,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y | |||
| 610 | CONFIG_MOUSE_PS2_SYNAPTICS=y | 599 | CONFIG_MOUSE_PS2_SYNAPTICS=y |
| 611 | CONFIG_MOUSE_PS2_LIFEBOOK=y | 600 | CONFIG_MOUSE_PS2_LIFEBOOK=y |
| 612 | CONFIG_MOUSE_PS2_TRACKPOINT=y | 601 | CONFIG_MOUSE_PS2_TRACKPOINT=y |
| 602 | # CONFIG_MOUSE_PS2_ELANTECH is not set | ||
| 613 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 603 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
| 614 | CONFIG_MOUSE_SERIAL=m | 604 | CONFIG_MOUSE_SERIAL=m |
| 615 | # CONFIG_MOUSE_VSXXXAA is not set | 605 | # CONFIG_MOUSE_VSXXXAA is not set |
| @@ -664,11 +654,11 @@ CONFIG_GEN_RTC_X=y | |||
| 664 | # CONFIG_THERMAL is not set | 654 | # CONFIG_THERMAL is not set |
| 665 | # CONFIG_THERMAL_HWMON is not set | 655 | # CONFIG_THERMAL_HWMON is not set |
| 666 | # CONFIG_WATCHDOG is not set | 656 | # CONFIG_WATCHDOG is not set |
| 657 | CONFIG_SSB_POSSIBLE=y | ||
| 667 | 658 | ||
| 668 | # | 659 | # |
| 669 | # Sonics Silicon Backplane | 660 | # Sonics Silicon Backplane |
| 670 | # | 661 | # |
| 671 | CONFIG_SSB_POSSIBLE=y | ||
| 672 | # CONFIG_SSB is not set | 662 | # CONFIG_SSB is not set |
| 673 | 663 | ||
| 674 | # | 664 | # |
| @@ -678,6 +668,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 678 | # CONFIG_MFD_SM501 is not set | 668 | # CONFIG_MFD_SM501 is not set |
| 679 | # CONFIG_HTC_PASIC3 is not set | 669 | # CONFIG_HTC_PASIC3 is not set |
| 680 | # CONFIG_MFD_TMIO is not set | 670 | # CONFIG_MFD_TMIO is not set |
| 671 | # CONFIG_REGULATOR is not set | ||
| 681 | 672 | ||
| 682 | # | 673 | # |
| 683 | # Multimedia devices | 674 | # Multimedia devices |
| @@ -703,6 +694,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 703 | CONFIG_FB=y | 694 | CONFIG_FB=y |
| 704 | # CONFIG_FIRMWARE_EDID is not set | 695 | # CONFIG_FIRMWARE_EDID is not set |
| 705 | # CONFIG_FB_DDC is not set | 696 | # CONFIG_FB_DDC is not set |
| 697 | # CONFIG_FB_BOOT_VESA_SUPPORT is not set | ||
| 706 | # CONFIG_FB_CFB_FILLRECT is not set | 698 | # CONFIG_FB_CFB_FILLRECT is not set |
| 707 | # CONFIG_FB_CFB_COPYAREA is not set | 699 | # CONFIG_FB_CFB_COPYAREA is not set |
| 708 | # CONFIG_FB_CFB_IMAGEBLIT is not set | 700 | # CONFIG_FB_CFB_IMAGEBLIT is not set |
| @@ -724,6 +716,8 @@ CONFIG_FB=y | |||
| 724 | # CONFIG_FB_UVESA is not set | 716 | # CONFIG_FB_UVESA is not set |
| 725 | # CONFIG_FB_S1D13XXX is not set | 717 | # CONFIG_FB_S1D13XXX is not set |
| 726 | # CONFIG_FB_VIRTUAL is not set | 718 | # CONFIG_FB_VIRTUAL is not set |
| 719 | # CONFIG_FB_METRONOME is not set | ||
| 720 | # CONFIG_FB_MB862XX is not set | ||
| 727 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 721 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 728 | 722 | ||
| 729 | # | 723 | # |
| @@ -750,6 +744,12 @@ CONFIG_HID_SUPPORT=y | |||
| 750 | CONFIG_HID=m | 744 | CONFIG_HID=m |
| 751 | # CONFIG_HID_DEBUG is not set | 745 | # CONFIG_HID_DEBUG is not set |
| 752 | CONFIG_HIDRAW=y | 746 | CONFIG_HIDRAW=y |
| 747 | # CONFIG_HID_PID is not set | ||
| 748 | |||
| 749 | # | ||
| 750 | # Special HID drivers | ||
| 751 | # | ||
| 752 | CONFIG_HID_COMPAT=y | ||
| 753 | # CONFIG_USB_SUPPORT is not set | 753 | # CONFIG_USB_SUPPORT is not set |
| 754 | # CONFIG_MMC is not set | 754 | # CONFIG_MMC is not set |
| 755 | # CONFIG_MEMSTICK is not set | 755 | # CONFIG_MEMSTICK is not set |
| @@ -758,6 +758,8 @@ CONFIG_HIDRAW=y | |||
| 758 | # CONFIG_RTC_CLASS is not set | 758 | # CONFIG_RTC_CLASS is not set |
| 759 | # CONFIG_DMADEVICES is not set | 759 | # CONFIG_DMADEVICES is not set |
| 760 | # CONFIG_UIO is not set | 760 | # CONFIG_UIO is not set |
| 761 | # CONFIG_STAGING is not set | ||
| 762 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 761 | 763 | ||
| 762 | # | 764 | # |
| 763 | # Character devices | 765 | # Character devices |
| @@ -771,8 +773,9 @@ CONFIG_EXT2_FS=y | |||
| 771 | # CONFIG_EXT2_FS_XIP is not set | 773 | # CONFIG_EXT2_FS_XIP is not set |
| 772 | CONFIG_EXT3_FS=y | 774 | CONFIG_EXT3_FS=y |
| 773 | # CONFIG_EXT3_FS_XATTR is not set | 775 | # CONFIG_EXT3_FS_XATTR is not set |
| 774 | # CONFIG_EXT4DEV_FS is not set | 776 | # CONFIG_EXT4_FS is not set |
| 775 | CONFIG_JBD=y | 777 | CONFIG_JBD=y |
| 778 | CONFIG_JBD2=m | ||
| 776 | CONFIG_REISERFS_FS=m | 779 | CONFIG_REISERFS_FS=m |
| 777 | # CONFIG_REISERFS_CHECK is not set | 780 | # CONFIG_REISERFS_CHECK is not set |
| 778 | # CONFIG_REISERFS_PROC_INFO is not set | 781 | # CONFIG_REISERFS_PROC_INFO is not set |
| @@ -783,6 +786,7 @@ CONFIG_JFS_FS=m | |||
| 783 | # CONFIG_JFS_DEBUG is not set | 786 | # CONFIG_JFS_DEBUG is not set |
| 784 | # CONFIG_JFS_STATISTICS is not set | 787 | # CONFIG_JFS_STATISTICS is not set |
| 785 | # CONFIG_FS_POSIX_ACL is not set | 788 | # CONFIG_FS_POSIX_ACL is not set |
| 789 | CONFIG_FILE_LOCKING=y | ||
| 786 | CONFIG_XFS_FS=m | 790 | CONFIG_XFS_FS=m |
| 787 | # CONFIG_XFS_QUOTA is not set | 791 | # CONFIG_XFS_QUOTA is not set |
| 788 | # CONFIG_XFS_POSIX_ACL is not set | 792 | # CONFIG_XFS_POSIX_ACL is not set |
| @@ -794,6 +798,7 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | |||
| 794 | # CONFIG_OCFS2_FS_STATS is not set | 798 | # CONFIG_OCFS2_FS_STATS is not set |
| 795 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 799 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
| 796 | # CONFIG_OCFS2_DEBUG_FS is not set | 800 | # CONFIG_OCFS2_DEBUG_FS is not set |
| 801 | # CONFIG_OCFS2_COMPAT_JBD is not set | ||
| 797 | CONFIG_DNOTIFY=y | 802 | CONFIG_DNOTIFY=y |
| 798 | CONFIG_INOTIFY=y | 803 | CONFIG_INOTIFY=y |
| 799 | CONFIG_INOTIFY_USER=y | 804 | CONFIG_INOTIFY_USER=y |
| @@ -832,6 +837,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
| 832 | CONFIG_PROC_FS=y | 837 | CONFIG_PROC_FS=y |
| 833 | CONFIG_PROC_KCORE=y | 838 | CONFIG_PROC_KCORE=y |
| 834 | CONFIG_PROC_SYSCTL=y | 839 | CONFIG_PROC_SYSCTL=y |
| 840 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 835 | CONFIG_SYSFS=y | 841 | CONFIG_SYSFS=y |
| 836 | CONFIG_TMPFS=y | 842 | CONFIG_TMPFS=y |
| 837 | # CONFIG_TMPFS_POSIX_ACL is not set | 843 | # CONFIG_TMPFS_POSIX_ACL is not set |
| @@ -875,6 +881,7 @@ CONFIG_EXPORTFS=m | |||
| 875 | CONFIG_NFS_COMMON=y | 881 | CONFIG_NFS_COMMON=y |
| 876 | CONFIG_SUNRPC=y | 882 | CONFIG_SUNRPC=y |
| 877 | CONFIG_SUNRPC_GSS=y | 883 | CONFIG_SUNRPC_GSS=y |
| 884 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
| 878 | CONFIG_RPCSEC_GSS_KRB5=y | 885 | CONFIG_RPCSEC_GSS_KRB5=y |
| 879 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 886 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 880 | CONFIG_SMB_FS=m | 887 | CONFIG_SMB_FS=m |
| @@ -948,7 +955,13 @@ CONFIG_MAGIC_SYSRQ=y | |||
| 948 | # CONFIG_DEBUG_KERNEL is not set | 955 | # CONFIG_DEBUG_KERNEL is not set |
| 949 | CONFIG_DEBUG_BUGVERBOSE=y | 956 | CONFIG_DEBUG_BUGVERBOSE=y |
| 950 | CONFIG_DEBUG_MEMORY_INIT=y | 957 | CONFIG_DEBUG_MEMORY_INIT=y |
| 958 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
| 951 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 959 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
| 960 | |||
| 961 | # | ||
| 962 | # Tracers | ||
| 963 | # | ||
| 964 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
| 952 | # CONFIG_SAMPLES is not set | 965 | # CONFIG_SAMPLES is not set |
| 953 | 966 | ||
| 954 | # | 967 | # |
| @@ -956,6 +969,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y | |||
| 956 | # | 969 | # |
| 957 | # CONFIG_KEYS is not set | 970 | # CONFIG_KEYS is not set |
| 958 | # CONFIG_SECURITY is not set | 971 | # CONFIG_SECURITY is not set |
| 972 | # CONFIG_SECURITYFS is not set | ||
| 959 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 973 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 960 | CONFIG_XOR_BLOCKS=m | 974 | CONFIG_XOR_BLOCKS=m |
| 961 | CONFIG_ASYNC_CORE=m | 975 | CONFIG_ASYNC_CORE=m |
| @@ -966,10 +980,12 @@ CONFIG_CRYPTO=y | |||
| 966 | # | 980 | # |
| 967 | # Crypto core or helper | 981 | # Crypto core or helper |
| 968 | # | 982 | # |
| 983 | # CONFIG_CRYPTO_FIPS is not set | ||
| 969 | CONFIG_CRYPTO_ALGAPI=y | 984 | CONFIG_CRYPTO_ALGAPI=y |
| 970 | CONFIG_CRYPTO_AEAD=m | 985 | CONFIG_CRYPTO_AEAD=y |
| 971 | CONFIG_CRYPTO_BLKCIPHER=y | 986 | CONFIG_CRYPTO_BLKCIPHER=y |
| 972 | CONFIG_CRYPTO_HASH=y | 987 | CONFIG_CRYPTO_HASH=y |
| 988 | CONFIG_CRYPTO_RNG=y | ||
| 973 | CONFIG_CRYPTO_MANAGER=y | 989 | CONFIG_CRYPTO_MANAGER=y |
| 974 | CONFIG_CRYPTO_GF128MUL=m | 990 | CONFIG_CRYPTO_GF128MUL=m |
| 975 | CONFIG_CRYPTO_NULL=m | 991 | CONFIG_CRYPTO_NULL=m |
| @@ -1043,14 +1059,17 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m | |||
| 1043 | # | 1059 | # |
| 1044 | CONFIG_CRYPTO_DEFLATE=m | 1060 | CONFIG_CRYPTO_DEFLATE=m |
| 1045 | CONFIG_CRYPTO_LZO=m | 1061 | CONFIG_CRYPTO_LZO=m |
| 1062 | |||
| 1063 | # | ||
| 1064 | # Random Number Generation | ||
| 1065 | # | ||
| 1066 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
| 1046 | # CONFIG_CRYPTO_HW is not set | 1067 | # CONFIG_CRYPTO_HW is not set |
| 1047 | 1068 | ||
| 1048 | # | 1069 | # |
| 1049 | # Library routines | 1070 | # Library routines |
| 1050 | # | 1071 | # |
| 1051 | CONFIG_BITREVERSE=y | 1072 | CONFIG_BITREVERSE=y |
| 1052 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1053 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
| 1054 | CONFIG_CRC_CCITT=m | 1073 | CONFIG_CRC_CCITT=m |
| 1055 | CONFIG_CRC16=m | 1074 | CONFIG_CRC16=m |
| 1056 | CONFIG_CRC_T10DIF=y | 1075 | CONFIG_CRC_T10DIF=y |
diff --git a/arch/mips/Kconfig.debug b/arch/mips/Kconfig.debug index 765c8e287d2b..364ca8938807 100644 --- a/arch/mips/Kconfig.debug +++ b/arch/mips/Kconfig.debug | |||
| @@ -48,7 +48,7 @@ config RUNTIME_DEBUG | |||
| 48 | help | 48 | help |
| 49 | If you say Y here, some debugging macros will do run-time checking. | 49 | If you say Y here, some debugging macros will do run-time checking. |
| 50 | If you say N here, those macros will mostly turn to no-ops. See | 50 | If you say N here, those macros will mostly turn to no-ops. See |
| 51 | include/asm-mips/debug.h for debuging macros. | 51 | arch/mips/include/asm/debug.h for debugging macros. |
| 52 | If unsure, say N. | 52 | If unsure, say N. |
| 53 | 53 | ||
| 54 | endmenu | 54 | endmenu |
diff --git a/arch/mips/configs/fulong_defconfig b/arch/mips/configs/fulong_defconfig index 620980081a30..b6698a232ae9 100644 --- a/arch/mips/configs/fulong_defconfig +++ b/arch/mips/configs/fulong_defconfig | |||
| @@ -1,63 +1,78 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.22-rc4 | 3 | # Linux kernel version: 2.6.28-rc6 |
| 4 | # Mon Jun 11 00:23:51 2007 | 4 | # Fri Nov 28 17:53:48 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Machine selection | 9 | # Machine selection |
| 10 | # | 10 | # |
| 11 | CONFIG_LEMOTE_FULONG=y | ||
| 12 | # CONFIG_MACH_ALCHEMY is not set | 11 | # CONFIG_MACH_ALCHEMY is not set |
| 13 | # CONFIG_BASLER_EXCITE is not set | 12 | # CONFIG_BASLER_EXCITE is not set |
| 13 | # CONFIG_BCM47XX is not set | ||
| 14 | # CONFIG_MIPS_COBALT is not set | 14 | # CONFIG_MIPS_COBALT is not set |
| 15 | # CONFIG_MACH_DECSTATION is not set | 15 | # CONFIG_MACH_DECSTATION is not set |
| 16 | # CONFIG_MACH_JAZZ is not set | 16 | # CONFIG_MACH_JAZZ is not set |
| 17 | # CONFIG_LASAT is not set | ||
| 18 | CONFIG_LEMOTE_FULONG=y | ||
| 17 | # CONFIG_MIPS_MALTA is not set | 19 | # CONFIG_MIPS_MALTA is not set |
| 18 | # CONFIG_WR_PPMC is not set | ||
| 19 | # CONFIG_MIPS_SIM is not set | 20 | # CONFIG_MIPS_SIM is not set |
| 21 | # CONFIG_MACH_EMMA is not set | ||
| 22 | # CONFIG_MACH_VR41XX is not set | ||
| 23 | # CONFIG_NXP_STB220 is not set | ||
| 24 | # CONFIG_NXP_STB225 is not set | ||
| 20 | # CONFIG_PNX8550_JBS is not set | 25 | # CONFIG_PNX8550_JBS is not set |
| 21 | # CONFIG_PNX8550_STB810 is not set | 26 | # CONFIG_PNX8550_STB810 is not set |
| 22 | # CONFIG_MACH_VR41XX is not set | 27 | # CONFIG_PMC_MSP is not set |
| 23 | # CONFIG_PMC_YOSEMITE is not set | 28 | # CONFIG_PMC_YOSEMITE is not set |
| 24 | # CONFIG_MARKEINS is not set | ||
| 25 | # CONFIG_SGI_IP22 is not set | 29 | # CONFIG_SGI_IP22 is not set |
| 26 | # CONFIG_SGI_IP27 is not set | 30 | # CONFIG_SGI_IP27 is not set |
| 31 | # CONFIG_SGI_IP28 is not set | ||
| 27 | # CONFIG_SGI_IP32 is not set | 32 | # CONFIG_SGI_IP32 is not set |
| 28 | # CONFIG_SIBYTE_BIGSUR is not set | ||
| 29 | # CONFIG_SIBYTE_SWARM is not set | ||
| 30 | # CONFIG_SIBYTE_SENTOSA is not set | ||
| 31 | # CONFIG_SIBYTE_RHONE is not set | ||
| 32 | # CONFIG_SIBYTE_CARMEL is not set | ||
| 33 | # CONFIG_SIBYTE_LITTLESUR is not set | ||
| 34 | # CONFIG_SIBYTE_CRHINE is not set | 33 | # CONFIG_SIBYTE_CRHINE is not set |
| 34 | # CONFIG_SIBYTE_CARMEL is not set | ||
| 35 | # CONFIG_SIBYTE_CRHONE is not set | 35 | # CONFIG_SIBYTE_CRHONE is not set |
| 36 | # CONFIG_SIBYTE_RHONE is not set | ||
| 37 | # CONFIG_SIBYTE_SWARM is not set | ||
| 38 | # CONFIG_SIBYTE_LITTLESUR is not set | ||
| 39 | # CONFIG_SIBYTE_SENTOSA is not set | ||
| 40 | # CONFIG_SIBYTE_BIGSUR is not set | ||
| 36 | # CONFIG_SNI_RM is not set | 41 | # CONFIG_SNI_RM is not set |
| 37 | # CONFIG_TOSHIBA_JMR3927 is not set | 42 | # CONFIG_MACH_TX39XX is not set |
| 38 | # CONFIG_TOSHIBA_RBTX4927 is not set | 43 | # CONFIG_MACH_TX49XX is not set |
| 39 | # CONFIG_TOSHIBA_RBTX4938 is not set | 44 | # CONFIG_MIKROTIK_RB532 is not set |
| 45 | # CONFIG_WR_PPMC is not set | ||
| 40 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 46 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 41 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 47 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
| 42 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 48 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
| 49 | CONFIG_ARCH_SUPPORTS_OPROFILE=y | ||
| 43 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 50 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 44 | CONFIG_GENERIC_HWEIGHT=y | 51 | CONFIG_GENERIC_HWEIGHT=y |
| 45 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 52 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 53 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 46 | CONFIG_GENERIC_TIME=y | 54 | CONFIG_GENERIC_TIME=y |
| 55 | CONFIG_GENERIC_CMOS_UPDATE=y | ||
| 47 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 56 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 48 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | 57 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y |
| 58 | CONFIG_CEVT_R4K=y | ||
| 59 | CONFIG_CSRC_R4K=y | ||
| 49 | CONFIG_DMA_NONCOHERENT=y | 60 | CONFIG_DMA_NONCOHERENT=y |
| 50 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 61 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| 51 | CONFIG_EARLY_PRINTK=y | 62 | CONFIG_EARLY_PRINTK=y |
| 52 | CONFIG_SYS_HAS_EARLY_PRINTK=y | 63 | CONFIG_SYS_HAS_EARLY_PRINTK=y |
| 64 | # CONFIG_HOTPLUG_CPU is not set | ||
| 53 | CONFIG_I8259=y | 65 | CONFIG_I8259=y |
| 54 | # CONFIG_NO_IOPORT is not set | 66 | # CONFIG_NO_IOPORT is not set |
| 67 | CONFIG_GENERIC_ISA_DMA=y | ||
| 68 | CONFIG_GENERIC_ISA_DMA_SUPPORT_BROKEN=y | ||
| 55 | # CONFIG_CPU_BIG_ENDIAN is not set | 69 | # CONFIG_CPU_BIG_ENDIAN is not set |
| 56 | CONFIG_CPU_LITTLE_ENDIAN=y | 70 | CONFIG_CPU_LITTLE_ENDIAN=y |
| 57 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y | 71 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y |
| 58 | CONFIG_IRQ_CPU=y | 72 | CONFIG_IRQ_CPU=y |
| 59 | CONFIG_BOOT_ELF32=y | 73 | CONFIG_BOOT_ELF32=y |
| 60 | CONFIG_MIPS_L1_CACHE_SHIFT=5 | 74 | CONFIG_MIPS_L1_CACHE_SHIFT=5 |
| 75 | CONFIG_HAVE_STD_PC_SERIAL_PORT=y | ||
| 61 | 76 | ||
| 62 | # | 77 | # |
| 63 | # CPU selection | 78 | # CPU selection |
| @@ -75,6 +90,7 @@ CONFIG_CPU_LOONGSON2=y | |||
| 75 | # CONFIG_CPU_TX49XX is not set | 90 | # CONFIG_CPU_TX49XX is not set |
| 76 | # CONFIG_CPU_R5000 is not set | 91 | # CONFIG_CPU_R5000 is not set |
| 77 | # CONFIG_CPU_R5432 is not set | 92 | # CONFIG_CPU_R5432 is not set |
| 93 | # CONFIG_CPU_R5500 is not set | ||
| 78 | # CONFIG_CPU_R6000 is not set | 94 | # CONFIG_CPU_R6000 is not set |
| 79 | # CONFIG_CPU_NEVADA is not set | 95 | # CONFIG_CPU_NEVADA is not set |
| 80 | # CONFIG_CPU_R8000 is not set | 96 | # CONFIG_CPU_R8000 is not set |
| @@ -101,7 +117,6 @@ CONFIG_BOARD_SCACHE=y | |||
| 101 | CONFIG_MIPS_MT_DISABLED=y | 117 | CONFIG_MIPS_MT_DISABLED=y |
| 102 | # CONFIG_MIPS_MT_SMP is not set | 118 | # CONFIG_MIPS_MT_SMP is not set |
| 103 | # CONFIG_MIPS_MT_SMTC is not set | 119 | # CONFIG_MIPS_MT_SMTC is not set |
| 104 | # CONFIG_MIPS_VPE_LOADER is not set | ||
| 105 | CONFIG_CPU_HAS_WB=y | 120 | CONFIG_CPU_HAS_WB=y |
| 106 | CONFIG_CPU_HAS_SYNC=y | 121 | CONFIG_CPU_HAS_SYNC=y |
| 107 | CONFIG_GENERIC_HARDIRQS=y | 122 | CONFIG_GENERIC_HARDIRQS=y |
| @@ -109,6 +124,7 @@ CONFIG_GENERIC_IRQ_PROBE=y | |||
| 109 | CONFIG_CPU_SUPPORTS_HIGHMEM=y | 124 | CONFIG_CPU_SUPPORTS_HIGHMEM=y |
| 110 | CONFIG_SYS_SUPPORTS_HIGHMEM=y | 125 | CONFIG_SYS_SUPPORTS_HIGHMEM=y |
| 111 | CONFIG_ARCH_FLATMEM_ENABLE=y | 126 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 127 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
| 112 | CONFIG_ARCH_SPARSEMEM_ENABLE=y | 128 | CONFIG_ARCH_SPARSEMEM_ENABLE=y |
| 113 | CONFIG_SELECT_MEMORY_MODEL=y | 129 | CONFIG_SELECT_MEMORY_MODEL=y |
| 114 | CONFIG_FLATMEM_MANUAL=y | 130 | CONFIG_FLATMEM_MANUAL=y |
| @@ -117,9 +133,17 @@ CONFIG_FLATMEM_MANUAL=y | |||
| 117 | CONFIG_FLATMEM=y | 133 | CONFIG_FLATMEM=y |
| 118 | CONFIG_FLAT_NODE_MEM_MAP=y | 134 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 119 | CONFIG_SPARSEMEM_STATIC=y | 135 | CONFIG_SPARSEMEM_STATIC=y |
| 136 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 120 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 137 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 121 | CONFIG_RESOURCES_64BIT=y | 138 | CONFIG_RESOURCES_64BIT=y |
| 139 | CONFIG_PHYS_ADDR_T_64BIT=y | ||
| 122 | CONFIG_ZONE_DMA_FLAG=0 | 140 | CONFIG_ZONE_DMA_FLAG=0 |
| 141 | CONFIG_VIRT_TO_BUS=y | ||
| 142 | CONFIG_UNEVICTABLE_LRU=y | ||
| 143 | CONFIG_TICK_ONESHOT=y | ||
| 144 | CONFIG_NO_HZ=y | ||
| 145 | CONFIG_HIGH_RES_TIMERS=y | ||
| 146 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 123 | # CONFIG_HZ_48 is not set | 147 | # CONFIG_HZ_48 is not set |
| 124 | # CONFIG_HZ_100 is not set | 148 | # CONFIG_HZ_100 is not set |
| 125 | # CONFIG_HZ_128 is not set | 149 | # CONFIG_HZ_128 is not set |
| @@ -133,37 +157,40 @@ CONFIG_HZ=250 | |||
| 133 | CONFIG_PREEMPT_VOLUNTARY=y | 157 | CONFIG_PREEMPT_VOLUNTARY=y |
| 134 | # CONFIG_PREEMPT is not set | 158 | # CONFIG_PREEMPT is not set |
| 135 | # CONFIG_KEXEC is not set | 159 | # CONFIG_KEXEC is not set |
| 160 | CONFIG_SECCOMP=y | ||
| 136 | CONFIG_LOCKDEP_SUPPORT=y | 161 | CONFIG_LOCKDEP_SUPPORT=y |
| 137 | CONFIG_STACKTRACE_SUPPORT=y | 162 | CONFIG_STACKTRACE_SUPPORT=y |
| 138 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 163 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 139 | 164 | ||
| 140 | # | 165 | # |
| 141 | # Code maturity level options | 166 | # General setup |
| 142 | # | 167 | # |
| 143 | CONFIG_EXPERIMENTAL=y | 168 | CONFIG_EXPERIMENTAL=y |
| 144 | CONFIG_BROKEN_ON_SMP=y | 169 | CONFIG_BROKEN_ON_SMP=y |
| 145 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 170 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 146 | |||
| 147 | # | ||
| 148 | # General setup | ||
| 149 | # | ||
| 150 | CONFIG_LOCALVERSION="lm32" | 171 | CONFIG_LOCALVERSION="lm32" |
| 151 | # CONFIG_LOCALVERSION_AUTO is not set | 172 | # CONFIG_LOCALVERSION_AUTO is not set |
| 152 | CONFIG_SWAP=y | 173 | CONFIG_SWAP=y |
| 153 | CONFIG_SYSVIPC=y | 174 | CONFIG_SYSVIPC=y |
| 154 | # CONFIG_IPC_NS is not set | ||
| 155 | CONFIG_SYSVIPC_SYSCTL=y | 175 | CONFIG_SYSVIPC_SYSCTL=y |
| 156 | CONFIG_POSIX_MQUEUE=y | 176 | CONFIG_POSIX_MQUEUE=y |
| 157 | CONFIG_BSD_PROCESS_ACCT=y | 177 | CONFIG_BSD_PROCESS_ACCT=y |
| 158 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | 178 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set |
| 159 | # CONFIG_TASKSTATS is not set | 179 | # CONFIG_TASKSTATS is not set |
| 160 | # CONFIG_UTS_NS is not set | ||
| 161 | # CONFIG_AUDIT is not set | 180 | # CONFIG_AUDIT is not set |
| 162 | CONFIG_IKCONFIG=y | 181 | CONFIG_IKCONFIG=y |
| 163 | CONFIG_IKCONFIG_PROC=y | 182 | CONFIG_IKCONFIG_PROC=y |
| 164 | CONFIG_LOG_BUF_SHIFT=14 | 183 | CONFIG_LOG_BUF_SHIFT=14 |
| 184 | # CONFIG_CGROUPS is not set | ||
| 185 | # CONFIG_GROUP_SCHED is not set | ||
| 165 | CONFIG_SYSFS_DEPRECATED=y | 186 | CONFIG_SYSFS_DEPRECATED=y |
| 187 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 166 | # CONFIG_RELAY is not set | 188 | # CONFIG_RELAY is not set |
| 189 | CONFIG_NAMESPACES=y | ||
| 190 | # CONFIG_UTS_NS is not set | ||
| 191 | # CONFIG_IPC_NS is not set | ||
| 192 | CONFIG_USER_NS=y | ||
| 193 | CONFIG_PID_NS=y | ||
| 167 | # CONFIG_BLK_DEV_INITRD is not set | 194 | # CONFIG_BLK_DEV_INITRD is not set |
| 168 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 195 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 169 | CONFIG_SYSCTL=y | 196 | CONFIG_SYSCTL=y |
| @@ -175,6 +202,8 @@ CONFIG_HOTPLUG=y | |||
| 175 | CONFIG_PRINTK=y | 202 | CONFIG_PRINTK=y |
| 176 | CONFIG_BUG=y | 203 | CONFIG_BUG=y |
| 177 | CONFIG_ELF_CORE=y | 204 | CONFIG_ELF_CORE=y |
| 205 | # CONFIG_PCSPKR_PLATFORM is not set | ||
| 206 | # CONFIG_COMPAT_BRK is not set | ||
| 178 | CONFIG_BASE_FULL=y | 207 | CONFIG_BASE_FULL=y |
| 179 | CONFIG_FUTEX=y | 208 | CONFIG_FUTEX=y |
| 180 | CONFIG_ANON_INODES=y | 209 | CONFIG_ANON_INODES=y |
| @@ -183,29 +212,33 @@ CONFIG_SIGNALFD=y | |||
| 183 | CONFIG_TIMERFD=y | 212 | CONFIG_TIMERFD=y |
| 184 | CONFIG_EVENTFD=y | 213 | CONFIG_EVENTFD=y |
| 185 | CONFIG_SHMEM=y | 214 | CONFIG_SHMEM=y |
| 215 | CONFIG_AIO=y | ||
| 186 | CONFIG_VM_EVENT_COUNTERS=y | 216 | CONFIG_VM_EVENT_COUNTERS=y |
| 217 | CONFIG_PCI_QUIRKS=y | ||
| 187 | CONFIG_SLAB=y | 218 | CONFIG_SLAB=y |
| 188 | # CONFIG_SLUB is not set | 219 | # CONFIG_SLUB is not set |
| 189 | # CONFIG_SLOB is not set | 220 | # CONFIG_SLOB is not set |
| 221 | CONFIG_PROFILING=y | ||
| 222 | # CONFIG_MARKERS is not set | ||
| 223 | CONFIG_OPROFILE=m | ||
| 224 | CONFIG_HAVE_OPROFILE=y | ||
| 225 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 226 | CONFIG_SLABINFO=y | ||
| 190 | CONFIG_RT_MUTEXES=y | 227 | CONFIG_RT_MUTEXES=y |
| 191 | # CONFIG_TINY_SHMEM is not set | 228 | # CONFIG_TINY_SHMEM is not set |
| 192 | CONFIG_BASE_SMALL=0 | 229 | CONFIG_BASE_SMALL=0 |
| 193 | |||
| 194 | # | ||
| 195 | # Loadable module support | ||
| 196 | # | ||
| 197 | CONFIG_MODULES=y | 230 | CONFIG_MODULES=y |
| 231 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 198 | CONFIG_MODULE_UNLOAD=y | 232 | CONFIG_MODULE_UNLOAD=y |
| 199 | CONFIG_MODULE_FORCE_UNLOAD=y | 233 | CONFIG_MODULE_FORCE_UNLOAD=y |
| 200 | # CONFIG_MODVERSIONS is not set | 234 | # CONFIG_MODVERSIONS is not set |
| 201 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 235 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 202 | CONFIG_KMOD=y | 236 | CONFIG_KMOD=y |
| 203 | |||
| 204 | # | ||
| 205 | # Block layer | ||
| 206 | # | ||
| 207 | CONFIG_BLOCK=y | 237 | CONFIG_BLOCK=y |
| 208 | # CONFIG_BLK_DEV_IO_TRACE is not set | 238 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 239 | CONFIG_BLK_DEV_BSG=y | ||
| 240 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 241 | CONFIG_BLOCK_COMPAT=y | ||
| 209 | 242 | ||
| 210 | # | 243 | # |
| 211 | # IO Schedulers | 244 | # IO Schedulers |
| @@ -219,19 +252,19 @@ CONFIG_IOSCHED_CFQ=y | |||
| 219 | CONFIG_DEFAULT_CFQ=y | 252 | CONFIG_DEFAULT_CFQ=y |
| 220 | # CONFIG_DEFAULT_NOOP is not set | 253 | # CONFIG_DEFAULT_NOOP is not set |
| 221 | CONFIG_DEFAULT_IOSCHED="cfq" | 254 | CONFIG_DEFAULT_IOSCHED="cfq" |
| 255 | CONFIG_CLASSIC_RCU=y | ||
| 256 | CONFIG_FREEZER=y | ||
| 222 | 257 | ||
| 223 | # | 258 | # |
| 224 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 259 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 225 | # | 260 | # |
| 226 | CONFIG_HW_HAS_PCI=y | 261 | CONFIG_HW_HAS_PCI=y |
| 227 | CONFIG_PCI=y | 262 | CONFIG_PCI=y |
| 263 | CONFIG_PCI_DOMAINS=y | ||
| 228 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 264 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 265 | CONFIG_PCI_LEGACY=y | ||
| 229 | CONFIG_ISA=y | 266 | CONFIG_ISA=y |
| 230 | CONFIG_MMU=y | 267 | CONFIG_MMU=y |
| 231 | |||
| 232 | # | ||
| 233 | # PCCARD (PCMCIA/CardBus) support | ||
| 234 | # | ||
| 235 | # CONFIG_PCCARD is not set | 268 | # CONFIG_PCCARD is not set |
| 236 | # CONFIG_HOTPLUG_PCI is not set | 269 | # CONFIG_HOTPLUG_PCI is not set |
| 237 | 270 | ||
| @@ -239,8 +272,9 @@ CONFIG_MMU=y | |||
| 239 | # Executable file formats | 272 | # Executable file formats |
| 240 | # | 273 | # |
| 241 | CONFIG_BINFMT_ELF=y | 274 | CONFIG_BINFMT_ELF=y |
| 275 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 276 | # CONFIG_HAVE_AOUT is not set | ||
| 242 | CONFIG_BINFMT_MISC=y | 277 | CONFIG_BINFMT_MISC=y |
| 243 | # CONFIG_BUILD_ELF64 is not set | ||
| 244 | CONFIG_MIPS32_COMPAT=y | 278 | CONFIG_MIPS32_COMPAT=y |
| 245 | CONFIG_COMPAT=y | 279 | CONFIG_COMPAT=y |
| 246 | CONFIG_SYSVIPC_COMPAT=y | 280 | CONFIG_SYSVIPC_COMPAT=y |
| @@ -251,14 +285,12 @@ CONFIG_BINFMT_ELF32=y | |||
| 251 | # | 285 | # |
| 252 | # Power management options | 286 | # Power management options |
| 253 | # | 287 | # |
| 288 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
| 254 | CONFIG_PM=y | 289 | CONFIG_PM=y |
| 255 | # CONFIG_PM_LEGACY is not set | ||
| 256 | # CONFIG_PM_DEBUG is not set | 290 | # CONFIG_PM_DEBUG is not set |
| 257 | # CONFIG_PM_SYSFS_DEPRECATED is not set | 291 | CONFIG_PM_SLEEP=y |
| 258 | 292 | CONFIG_SUSPEND=y | |
| 259 | # | 293 | CONFIG_SUSPEND_FREEZER=y |
| 260 | # Networking | ||
| 261 | # | ||
| 262 | CONFIG_NET=y | 294 | CONFIG_NET=y |
| 263 | 295 | ||
| 264 | # | 296 | # |
| @@ -271,6 +303,7 @@ CONFIG_XFRM=y | |||
| 271 | # CONFIG_XFRM_USER is not set | 303 | # CONFIG_XFRM_USER is not set |
| 272 | # CONFIG_XFRM_SUB_POLICY is not set | 304 | # CONFIG_XFRM_SUB_POLICY is not set |
| 273 | # CONFIG_XFRM_MIGRATE is not set | 305 | # CONFIG_XFRM_MIGRATE is not set |
| 306 | # CONFIG_XFRM_STATISTICS is not set | ||
| 274 | # CONFIG_NET_KEY is not set | 307 | # CONFIG_NET_KEY is not set |
| 275 | CONFIG_INET=y | 308 | CONFIG_INET=y |
| 276 | CONFIG_IP_MULTICAST=y | 309 | CONFIG_IP_MULTICAST=y |
| @@ -294,18 +327,17 @@ CONFIG_INET_TUNNEL=m | |||
| 294 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | 327 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set |
| 295 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | 328 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set |
| 296 | CONFIG_INET_XFRM_MODE_BEET=y | 329 | CONFIG_INET_XFRM_MODE_BEET=y |
| 330 | # CONFIG_INET_LRO is not set | ||
| 297 | # CONFIG_INET_DIAG is not set | 331 | # CONFIG_INET_DIAG is not set |
| 298 | # CONFIG_TCP_CONG_ADVANCED is not set | 332 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 299 | CONFIG_TCP_CONG_CUBIC=y | 333 | CONFIG_TCP_CONG_CUBIC=y |
| 300 | CONFIG_DEFAULT_TCP_CONG="cubic" | 334 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 301 | # CONFIG_TCP_MD5SIG is not set | 335 | # CONFIG_TCP_MD5SIG is not set |
| 302 | # CONFIG_IP_VS is not set | ||
| 303 | # CONFIG_IPV6 is not set | 336 | # CONFIG_IPV6 is not set |
| 304 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 305 | # CONFIG_INET6_TUNNEL is not set | ||
| 306 | # CONFIG_NETWORK_SECMARK is not set | 337 | # CONFIG_NETWORK_SECMARK is not set |
| 307 | CONFIG_NETFILTER=y | 338 | CONFIG_NETFILTER=y |
| 308 | # CONFIG_NETFILTER_DEBUG is not set | 339 | # CONFIG_NETFILTER_DEBUG is not set |
| 340 | CONFIG_NETFILTER_ADVANCED=y | ||
| 309 | 341 | ||
| 310 | # | 342 | # |
| 311 | # Core Netfilter Configuration | 343 | # Core Netfilter Configuration |
| @@ -313,53 +345,59 @@ CONFIG_NETFILTER=y | |||
| 313 | CONFIG_NETFILTER_NETLINK=m | 345 | CONFIG_NETFILTER_NETLINK=m |
| 314 | CONFIG_NETFILTER_NETLINK_QUEUE=m | 346 | CONFIG_NETFILTER_NETLINK_QUEUE=m |
| 315 | CONFIG_NETFILTER_NETLINK_LOG=m | 347 | CONFIG_NETFILTER_NETLINK_LOG=m |
| 316 | # CONFIG_NF_CONNTRACK_ENABLED is not set | ||
| 317 | # CONFIG_NF_CONNTRACK is not set | 348 | # CONFIG_NF_CONNTRACK is not set |
| 318 | CONFIG_NETFILTER_XTABLES=m | 349 | CONFIG_NETFILTER_XTABLES=m |
| 319 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 350 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| 320 | # CONFIG_NETFILTER_XT_TARGET_DSCP is not set | 351 | # CONFIG_NETFILTER_XT_TARGET_DSCP is not set |
| 321 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 352 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
| 322 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
| 323 | # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set | 353 | # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set |
| 354 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
| 355 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m | ||
| 356 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | ||
| 324 | # CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set | 357 | # CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set |
| 358 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | ||
| 325 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 359 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
| 326 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 360 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
| 327 | # CONFIG_NETFILTER_XT_MATCH_DSCP is not set | 361 | # CONFIG_NETFILTER_XT_MATCH_DSCP is not set |
| 328 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 362 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
| 363 | # CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set | ||
| 364 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | ||
| 329 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 365 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
| 330 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 366 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
| 331 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 367 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
| 332 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 368 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
| 333 | # CONFIG_NETFILTER_XT_MATCH_POLICY is not set | ||
| 334 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | 369 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m |
| 370 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | ||
| 371 | # CONFIG_NETFILTER_XT_MATCH_POLICY is not set | ||
| 335 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 372 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
| 336 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | 373 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m |
| 374 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | ||
| 337 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 375 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
| 376 | CONFIG_NETFILTER_XT_MATCH_RECENT=m | ||
| 377 | # CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set | ||
| 338 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 378 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
| 339 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | 379 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m |
| 340 | CONFIG_NETFILTER_XT_MATCH_STRING=m | 380 | CONFIG_NETFILTER_XT_MATCH_STRING=m |
| 341 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 381 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
| 342 | # CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set | 382 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
| 383 | CONFIG_NETFILTER_XT_MATCH_U32=m | ||
| 384 | # CONFIG_IP_VS is not set | ||
| 343 | 385 | ||
| 344 | # | 386 | # |
| 345 | # IP: Netfilter Configuration | 387 | # IP: Netfilter Configuration |
| 346 | # | 388 | # |
| 389 | # CONFIG_NF_DEFRAG_IPV4 is not set | ||
| 347 | CONFIG_IP_NF_QUEUE=m | 390 | CONFIG_IP_NF_QUEUE=m |
| 348 | CONFIG_IP_NF_IPTABLES=m | 391 | CONFIG_IP_NF_IPTABLES=m |
| 349 | CONFIG_IP_NF_MATCH_IPRANGE=m | 392 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
| 350 | CONFIG_IP_NF_MATCH_TOS=m | ||
| 351 | CONFIG_IP_NF_MATCH_RECENT=m | ||
| 352 | CONFIG_IP_NF_MATCH_ECN=m | ||
| 353 | CONFIG_IP_NF_MATCH_AH=m | 393 | CONFIG_IP_NF_MATCH_AH=m |
| 394 | CONFIG_IP_NF_MATCH_ECN=m | ||
| 354 | CONFIG_IP_NF_MATCH_TTL=m | 395 | CONFIG_IP_NF_MATCH_TTL=m |
| 355 | CONFIG_IP_NF_MATCH_OWNER=m | ||
| 356 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
| 357 | CONFIG_IP_NF_FILTER=m | 396 | CONFIG_IP_NF_FILTER=m |
| 358 | CONFIG_IP_NF_TARGET_REJECT=m | 397 | CONFIG_IP_NF_TARGET_REJECT=m |
| 359 | CONFIG_IP_NF_TARGET_LOG=m | 398 | CONFIG_IP_NF_TARGET_LOG=m |
| 360 | CONFIG_IP_NF_TARGET_ULOG=m | 399 | CONFIG_IP_NF_TARGET_ULOG=m |
| 361 | CONFIG_IP_NF_MANGLE=m | 400 | CONFIG_IP_NF_MANGLE=m |
| 362 | CONFIG_IP_NF_TARGET_TOS=m | ||
| 363 | CONFIG_IP_NF_TARGET_ECN=m | 401 | CONFIG_IP_NF_TARGET_ECN=m |
| 364 | CONFIG_IP_NF_TARGET_TTL=m | 402 | CONFIG_IP_NF_TARGET_TTL=m |
| 365 | CONFIG_IP_NF_RAW=m | 403 | CONFIG_IP_NF_RAW=m |
| @@ -371,6 +409,7 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
| 371 | # CONFIG_TIPC is not set | 409 | # CONFIG_TIPC is not set |
| 372 | # CONFIG_ATM is not set | 410 | # CONFIG_ATM is not set |
| 373 | # CONFIG_BRIDGE is not set | 411 | # CONFIG_BRIDGE is not set |
| 412 | # CONFIG_NET_DSA is not set | ||
| 374 | # CONFIG_VLAN_8021Q is not set | 413 | # CONFIG_VLAN_8021Q is not set |
| 375 | # CONFIG_DECNET is not set | 414 | # CONFIG_DECNET is not set |
| 376 | # CONFIG_LLC2 is not set | 415 | # CONFIG_LLC2 is not set |
| @@ -380,10 +419,6 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
| 380 | # CONFIG_LAPB is not set | 419 | # CONFIG_LAPB is not set |
| 381 | # CONFIG_ECONET is not set | 420 | # CONFIG_ECONET is not set |
| 382 | # CONFIG_WAN_ROUTER is not set | 421 | # CONFIG_WAN_ROUTER is not set |
| 383 | |||
| 384 | # | ||
| 385 | # QoS and/or fair queueing | ||
| 386 | # | ||
| 387 | # CONFIG_NET_SCHED is not set | 422 | # CONFIG_NET_SCHED is not set |
| 388 | CONFIG_NET_CLS_ROUTE=y | 423 | CONFIG_NET_CLS_ROUTE=y |
| 389 | 424 | ||
| @@ -392,23 +427,25 @@ CONFIG_NET_CLS_ROUTE=y | |||
| 392 | # | 427 | # |
| 393 | # CONFIG_NET_PKTGEN is not set | 428 | # CONFIG_NET_PKTGEN is not set |
| 394 | # CONFIG_HAMRADIO is not set | 429 | # CONFIG_HAMRADIO is not set |
| 430 | # CONFIG_CAN is not set | ||
| 395 | # CONFIG_IRDA is not set | 431 | # CONFIG_IRDA is not set |
| 396 | # CONFIG_BT is not set | 432 | # CONFIG_BT is not set |
| 397 | # CONFIG_AF_RXRPC is not set | 433 | # CONFIG_AF_RXRPC is not set |
| 398 | 434 | CONFIG_PHONET=m | |
| 399 | # | 435 | CONFIG_WIRELESS=y |
| 400 | # Wireless | ||
| 401 | # | ||
| 402 | # CONFIG_CFG80211 is not set | 436 | # CONFIG_CFG80211 is not set |
| 437 | CONFIG_WIRELESS_OLD_REGULATORY=y | ||
| 403 | CONFIG_WIRELESS_EXT=y | 438 | CONFIG_WIRELESS_EXT=y |
| 439 | CONFIG_WIRELESS_EXT_SYSFS=y | ||
| 404 | # CONFIG_MAC80211 is not set | 440 | # CONFIG_MAC80211 is not set |
| 405 | CONFIG_IEEE80211=m | 441 | CONFIG_IEEE80211=m |
| 406 | # CONFIG_IEEE80211_DEBUG is not set | 442 | # CONFIG_IEEE80211_DEBUG is not set |
| 407 | CONFIG_IEEE80211_CRYPT_WEP=m | 443 | CONFIG_IEEE80211_CRYPT_WEP=m |
| 408 | # CONFIG_IEEE80211_CRYPT_CCMP is not set | 444 | # CONFIG_IEEE80211_CRYPT_CCMP is not set |
| 409 | # CONFIG_IEEE80211_CRYPT_TKIP is not set | 445 | # CONFIG_IEEE80211_CRYPT_TKIP is not set |
| 410 | # CONFIG_IEEE80211_SOFTMAC is not set | ||
| 411 | # CONFIG_RFKILL is not set | 446 | # CONFIG_RFKILL is not set |
| 447 | CONFIG_NET_9P=m | ||
| 448 | # CONFIG_NET_9P_DEBUG is not set | ||
| 412 | 449 | ||
| 413 | # | 450 | # |
| 414 | # Device Drivers | 451 | # Device Drivers |
| @@ -417,14 +454,13 @@ CONFIG_IEEE80211_CRYPT_WEP=m | |||
| 417 | # | 454 | # |
| 418 | # Generic Driver Options | 455 | # Generic Driver Options |
| 419 | # | 456 | # |
| 457 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| 420 | CONFIG_STANDALONE=y | 458 | CONFIG_STANDALONE=y |
| 421 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 459 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 422 | CONFIG_FW_LOADER=m | 460 | CONFIG_FW_LOADER=m |
| 461 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
| 462 | CONFIG_EXTRA_FIRMWARE="" | ||
| 423 | # CONFIG_SYS_HYPERVISOR is not set | 463 | # CONFIG_SYS_HYPERVISOR is not set |
| 424 | |||
| 425 | # | ||
| 426 | # Connector - unified userspace <-> kernelspace linker | ||
| 427 | # | ||
| 428 | # CONFIG_CONNECTOR is not set | 464 | # CONFIG_CONNECTOR is not set |
| 429 | CONFIG_MTD=m | 465 | CONFIG_MTD=m |
| 430 | # CONFIG_MTD_DEBUG is not set | 466 | # CONFIG_MTD_DEBUG is not set |
| @@ -443,6 +479,7 @@ CONFIG_MTD_BLOCK=m | |||
| 443 | # CONFIG_INFTL is not set | 479 | # CONFIG_INFTL is not set |
| 444 | # CONFIG_RFD_FTL is not set | 480 | # CONFIG_RFD_FTL is not set |
| 445 | # CONFIG_SSFDC is not set | 481 | # CONFIG_SSFDC is not set |
| 482 | # CONFIG_MTD_OOPS is not set | ||
| 446 | 483 | ||
| 447 | # | 484 | # |
| 448 | # RAM/ROM/Flash chip drivers | 485 | # RAM/ROM/Flash chip drivers |
| @@ -482,6 +519,7 @@ CONFIG_MTD_PHYSMAP=m | |||
| 482 | CONFIG_MTD_PHYSMAP_START=0x1fc00000 | 519 | CONFIG_MTD_PHYSMAP_START=0x1fc00000 |
| 483 | CONFIG_MTD_PHYSMAP_LEN=0x80000 | 520 | CONFIG_MTD_PHYSMAP_LEN=0x80000 |
| 484 | CONFIG_MTD_PHYSMAP_BANKWIDTH=1 | 521 | CONFIG_MTD_PHYSMAP_BANKWIDTH=1 |
| 522 | # CONFIG_MTD_INTEL_VR_NOR is not set | ||
| 485 | # CONFIG_MTD_PLATRAM is not set | 523 | # CONFIG_MTD_PLATRAM is not set |
| 486 | 524 | ||
| 487 | # | 525 | # |
| @@ -506,21 +544,9 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=1 | |||
| 506 | # UBI - Unsorted block images | 544 | # UBI - Unsorted block images |
| 507 | # | 545 | # |
| 508 | # CONFIG_MTD_UBI is not set | 546 | # CONFIG_MTD_UBI is not set |
| 509 | |||
| 510 | # | ||
| 511 | # Parallel port support | ||
| 512 | # | ||
| 513 | # CONFIG_PARPORT is not set | 547 | # CONFIG_PARPORT is not set |
| 514 | |||
| 515 | # | ||
| 516 | # Plug and Play support | ||
| 517 | # | ||
| 518 | # CONFIG_PNP is not set | 548 | # CONFIG_PNP is not set |
| 519 | # CONFIG_PNPACPI is not set | 549 | CONFIG_BLK_DEV=y |
| 520 | |||
| 521 | # | ||
| 522 | # Block devices | ||
| 523 | # | ||
| 524 | # CONFIG_BLK_CPQ_DA is not set | 550 | # CONFIG_BLK_CPQ_DA is not set |
| 525 | # CONFIG_BLK_CPQ_CISS_DA is not set | 551 | # CONFIG_BLK_CPQ_CISS_DA is not set |
| 526 | # CONFIG_BLK_DEV_DAC960 is not set | 552 | # CONFIG_BLK_DEV_DAC960 is not set |
| @@ -534,32 +560,28 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m | |||
| 534 | CONFIG_BLK_DEV_RAM=m | 560 | CONFIG_BLK_DEV_RAM=m |
| 535 | CONFIG_BLK_DEV_RAM_COUNT=16 | 561 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 536 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 562 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
| 537 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 563 | # CONFIG_BLK_DEV_XIP is not set |
| 538 | CONFIG_CDROM_PKTCDVD=m | 564 | CONFIG_CDROM_PKTCDVD=m |
| 539 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 565 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
| 540 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 566 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
| 541 | CONFIG_ATA_OVER_ETH=m | 567 | CONFIG_ATA_OVER_ETH=m |
| 542 | 568 | # CONFIG_BLK_DEV_HD is not set | |
| 543 | # | 569 | # CONFIG_MISC_DEVICES is not set |
| 544 | # Misc devices | 570 | CONFIG_HAVE_IDE=y |
| 545 | # | ||
| 546 | # CONFIG_PHANTOM is not set | ||
| 547 | # CONFIG_SGI_IOC4 is not set | ||
| 548 | # CONFIG_TIFM_CORE is not set | ||
| 549 | # CONFIG_BLINK is not set | ||
| 550 | CONFIG_IDE=y | 571 | CONFIG_IDE=y |
| 551 | CONFIG_IDE_MAX_HWIFS=4 | ||
| 552 | CONFIG_BLK_DEV_IDE=y | ||
| 553 | 572 | ||
| 554 | # | 573 | # |
| 555 | # Please see Documentation/ide.txt for help/info on IDE drives | 574 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
| 556 | # | 575 | # |
| 576 | CONFIG_IDE_TIMINGS=y | ||
| 577 | CONFIG_IDE_ATAPI=y | ||
| 557 | # CONFIG_BLK_DEV_IDE_SATA is not set | 578 | # CONFIG_BLK_DEV_IDE_SATA is not set |
| 558 | CONFIG_BLK_DEV_IDEDISK=y | 579 | CONFIG_IDE_GD=y |
| 559 | CONFIG_IDEDISK_MULTI_MODE=y | 580 | CONFIG_IDE_GD_ATA=y |
| 581 | # CONFIG_IDE_GD_ATAPI is not set | ||
| 560 | CONFIG_BLK_DEV_IDECD=y | 582 | CONFIG_BLK_DEV_IDECD=y |
| 583 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y | ||
| 561 | # CONFIG_BLK_DEV_IDETAPE is not set | 584 | # CONFIG_BLK_DEV_IDETAPE is not set |
| 562 | # CONFIG_BLK_DEV_IDEFLOPPY is not set | ||
| 563 | CONFIG_BLK_DEV_IDESCSI=y | 585 | CONFIG_BLK_DEV_IDESCSI=y |
| 564 | CONFIG_IDE_TASK_IOCTL=y | 586 | CONFIG_IDE_TASK_IOCTL=y |
| 565 | CONFIG_IDE_PROC_FS=y | 587 | CONFIG_IDE_PROC_FS=y |
| @@ -568,24 +590,25 @@ CONFIG_IDE_PROC_FS=y | |||
| 568 | # IDE chipset support/bugfixes | 590 | # IDE chipset support/bugfixes |
| 569 | # | 591 | # |
| 570 | CONFIG_IDE_GENERIC=y | 592 | CONFIG_IDE_GENERIC=y |
| 593 | # CONFIG_BLK_DEV_PLATFORM is not set | ||
| 594 | CONFIG_BLK_DEV_IDEDMA_SFF=y | ||
| 595 | |||
| 596 | # | ||
| 597 | # PCI IDE chipsets support | ||
| 598 | # | ||
| 571 | CONFIG_BLK_DEV_IDEPCI=y | 599 | CONFIG_BLK_DEV_IDEPCI=y |
| 572 | CONFIG_IDEPCI_SHARE_IRQ=y | ||
| 573 | CONFIG_IDEPCI_PCIBUS_ORDER=y | 600 | CONFIG_IDEPCI_PCIBUS_ORDER=y |
| 574 | # CONFIG_BLK_DEV_OFFBOARD is not set | 601 | # CONFIG_BLK_DEV_OFFBOARD is not set |
| 575 | CONFIG_BLK_DEV_GENERIC=y | 602 | CONFIG_BLK_DEV_GENERIC=y |
| 576 | # CONFIG_BLK_DEV_OPTI621 is not set | 603 | # CONFIG_BLK_DEV_OPTI621 is not set |
| 577 | CONFIG_BLK_DEV_IDEDMA_PCI=y | 604 | CONFIG_BLK_DEV_IDEDMA_PCI=y |
| 578 | # CONFIG_BLK_DEV_IDEDMA_FORCED is not set | ||
| 579 | # CONFIG_IDEDMA_ONLYDISK is not set | ||
| 580 | # CONFIG_BLK_DEV_AEC62XX is not set | 605 | # CONFIG_BLK_DEV_AEC62XX is not set |
| 581 | # CONFIG_BLK_DEV_ALI15X3 is not set | 606 | # CONFIG_BLK_DEV_ALI15X3 is not set |
| 582 | # CONFIG_BLK_DEV_AMD74XX is not set | 607 | # CONFIG_BLK_DEV_AMD74XX is not set |
| 583 | # CONFIG_BLK_DEV_CMD64X is not set | 608 | # CONFIG_BLK_DEV_CMD64X is not set |
| 584 | # CONFIG_BLK_DEV_TRIFLEX is not set | 609 | # CONFIG_BLK_DEV_TRIFLEX is not set |
| 585 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
| 586 | # CONFIG_BLK_DEV_CS5520 is not set | 610 | # CONFIG_BLK_DEV_CS5520 is not set |
| 587 | # CONFIG_BLK_DEV_CS5530 is not set | 611 | # CONFIG_BLK_DEV_CS5530 is not set |
| 588 | # CONFIG_BLK_DEV_HPT34X is not set | ||
| 589 | # CONFIG_BLK_DEV_HPT366 is not set | 612 | # CONFIG_BLK_DEV_HPT366 is not set |
| 590 | # CONFIG_BLK_DEV_JMICRON is not set | 613 | # CONFIG_BLK_DEV_JMICRON is not set |
| 591 | # CONFIG_BLK_DEV_SC1200 is not set | 614 | # CONFIG_BLK_DEV_SC1200 is not set |
| @@ -601,17 +624,28 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
| 601 | # CONFIG_BLK_DEV_TRM290 is not set | 624 | # CONFIG_BLK_DEV_TRM290 is not set |
| 602 | CONFIG_BLK_DEV_VIA82CXXX=y | 625 | CONFIG_BLK_DEV_VIA82CXXX=y |
| 603 | # CONFIG_BLK_DEV_TC86C001 is not set | 626 | # CONFIG_BLK_DEV_TC86C001 is not set |
| 604 | # CONFIG_IDE_ARM is not set | 627 | |
| 605 | # CONFIG_IDE_CHIPSETS is not set | 628 | # |
| 629 | # Other IDE chipsets support | ||
| 630 | # | ||
| 631 | |||
| 632 | # | ||
| 633 | # Note: most of these also require special kernel boot parameters | ||
| 634 | # | ||
| 635 | # CONFIG_BLK_DEV_4DRIVES is not set | ||
| 636 | # CONFIG_BLK_DEV_ALI14XX is not set | ||
| 637 | # CONFIG_BLK_DEV_DTC2278 is not set | ||
| 638 | # CONFIG_BLK_DEV_HT6560B is not set | ||
| 639 | # CONFIG_BLK_DEV_QD65XX is not set | ||
| 640 | # CONFIG_BLK_DEV_UMC8672 is not set | ||
| 606 | CONFIG_BLK_DEV_IDEDMA=y | 641 | CONFIG_BLK_DEV_IDEDMA=y |
| 607 | # CONFIG_IDEDMA_IVB is not set | ||
| 608 | # CONFIG_BLK_DEV_HD is not set | ||
| 609 | 642 | ||
| 610 | # | 643 | # |
| 611 | # SCSI device support | 644 | # SCSI device support |
| 612 | # | 645 | # |
| 613 | # CONFIG_RAID_ATTRS is not set | 646 | # CONFIG_RAID_ATTRS is not set |
| 614 | CONFIG_SCSI=y | 647 | CONFIG_SCSI=y |
| 648 | CONFIG_SCSI_DMA=y | ||
| 615 | # CONFIG_SCSI_TGT is not set | 649 | # CONFIG_SCSI_TGT is not set |
| 616 | # CONFIG_SCSI_NETLINK is not set | 650 | # CONFIG_SCSI_NETLINK is not set |
| 617 | CONFIG_SCSI_PROC_FS=y | 651 | CONFIG_SCSI_PROC_FS=y |
| @@ -644,88 +678,30 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 644 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 678 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
| 645 | # CONFIG_SCSI_SAS_ATTRS is not set | 679 | # CONFIG_SCSI_SAS_ATTRS is not set |
| 646 | # CONFIG_SCSI_SAS_LIBSAS is not set | 680 | # CONFIG_SCSI_SAS_LIBSAS is not set |
| 647 | 681 | # CONFIG_SCSI_SRP_ATTRS is not set | |
| 648 | # | 682 | # CONFIG_SCSI_LOWLEVEL is not set |
| 649 | # SCSI low-level drivers | 683 | # CONFIG_SCSI_DH is not set |
| 650 | # | ||
| 651 | # CONFIG_ISCSI_TCP is not set | ||
| 652 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | ||
| 653 | # CONFIG_SCSI_3W_9XXX is not set | ||
| 654 | # CONFIG_SCSI_ACARD is not set | ||
| 655 | # CONFIG_SCSI_AACRAID is not set | ||
| 656 | # CONFIG_SCSI_AIC7XXX is not set | ||
| 657 | # CONFIG_SCSI_AIC7XXX_OLD is not set | ||
| 658 | # CONFIG_SCSI_AIC79XX is not set | ||
| 659 | # CONFIG_SCSI_AIC94XX is not set | ||
| 660 | # CONFIG_SCSI_IN2000 is not set | ||
| 661 | # CONFIG_SCSI_ARCMSR is not set | ||
| 662 | # CONFIG_MEGARAID_NEWGEN is not set | ||
| 663 | # CONFIG_MEGARAID_LEGACY is not set | ||
| 664 | # CONFIG_MEGARAID_SAS is not set | ||
| 665 | # CONFIG_SCSI_HPTIOP is not set | ||
| 666 | # CONFIG_SCSI_DMX3191D is not set | ||
| 667 | # CONFIG_SCSI_DTC3280 is not set | ||
| 668 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | ||
| 669 | # CONFIG_SCSI_GENERIC_NCR5380 is not set | ||
| 670 | # CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set | ||
| 671 | # CONFIG_SCSI_IPS is not set | ||
| 672 | # CONFIG_SCSI_INITIO is not set | ||
| 673 | # CONFIG_SCSI_INIA100 is not set | ||
| 674 | # CONFIG_SCSI_NCR53C406A is not set | ||
| 675 | # CONFIG_SCSI_STEX is not set | ||
| 676 | # CONFIG_SCSI_SYM53C8XX_2 is not set | ||
| 677 | # CONFIG_SCSI_PAS16 is not set | ||
| 678 | # CONFIG_SCSI_PSI240I is not set | ||
| 679 | # CONFIG_SCSI_QLOGIC_FAS is not set | ||
| 680 | # CONFIG_SCSI_QLOGIC_1280 is not set | ||
| 681 | # CONFIG_SCSI_QLA_FC is not set | ||
| 682 | # CONFIG_SCSI_QLA_ISCSI is not set | ||
| 683 | # CONFIG_SCSI_LPFC is not set | ||
| 684 | # CONFIG_SCSI_SYM53C416 is not set | ||
| 685 | # CONFIG_SCSI_DC395x is not set | ||
| 686 | # CONFIG_SCSI_DC390T is not set | ||
| 687 | # CONFIG_SCSI_T128 is not set | ||
| 688 | # CONFIG_SCSI_DEBUG is not set | ||
| 689 | # CONFIG_SCSI_SRP is not set | ||
| 690 | # CONFIG_ATA is not set | 684 | # CONFIG_ATA is not set |
| 691 | |||
| 692 | # | ||
| 693 | # Old CD-ROM drivers (not SCSI, not IDE) | ||
| 694 | # | ||
| 695 | # CONFIG_CD_NO_IDESCSI is not set | ||
| 696 | |||
| 697 | # | ||
| 698 | # Multi-device support (RAID and LVM) | ||
| 699 | # | ||
| 700 | # CONFIG_MD is not set | 685 | # CONFIG_MD is not set |
| 701 | |||
| 702 | # | ||
| 703 | # Fusion MPT device support | ||
| 704 | # | ||
| 705 | # CONFIG_FUSION is not set | 686 | # CONFIG_FUSION is not set |
| 706 | # CONFIG_FUSION_SPI is not set | ||
| 707 | # CONFIG_FUSION_FC is not set | ||
| 708 | # CONFIG_FUSION_SAS is not set | ||
| 709 | 687 | ||
| 710 | # | 688 | # |
| 711 | # IEEE 1394 (FireWire) support | 689 | # IEEE 1394 (FireWire) support |
| 712 | # | 690 | # |
| 713 | # CONFIG_FIREWIRE is not set | ||
| 714 | # CONFIG_IEEE1394 is not set | ||
| 715 | 691 | ||
| 716 | # | 692 | # |
| 717 | # I2O device support | 693 | # Enable only one of the two stacks, unless you know what you are doing |
| 718 | # | 694 | # |
| 695 | # CONFIG_FIREWIRE is not set | ||
| 696 | # CONFIG_IEEE1394 is not set | ||
| 719 | # CONFIG_I2O is not set | 697 | # CONFIG_I2O is not set |
| 720 | |||
| 721 | # | ||
| 722 | # Network device support | ||
| 723 | # | ||
| 724 | CONFIG_NETDEVICES=y | 698 | CONFIG_NETDEVICES=y |
| 725 | # CONFIG_DUMMY is not set | 699 | # CONFIG_DUMMY is not set |
| 726 | # CONFIG_BONDING is not set | 700 | # CONFIG_BONDING is not set |
| 701 | CONFIG_MACVLAN=m | ||
| 727 | # CONFIG_EQUALIZER is not set | 702 | # CONFIG_EQUALIZER is not set |
| 728 | # CONFIG_TUN is not set | 703 | # CONFIG_TUN is not set |
| 704 | CONFIG_VETH=m | ||
| 729 | # CONFIG_ARCNET is not set | 705 | # CONFIG_ARCNET is not set |
| 730 | CONFIG_PHYLIB=m | 706 | CONFIG_PHYLIB=m |
| 731 | 707 | ||
| @@ -740,29 +716,32 @@ CONFIG_CICADA_PHY=m | |||
| 740 | # CONFIG_VITESSE_PHY is not set | 716 | # CONFIG_VITESSE_PHY is not set |
| 741 | # CONFIG_SMSC_PHY is not set | 717 | # CONFIG_SMSC_PHY is not set |
| 742 | # CONFIG_BROADCOM_PHY is not set | 718 | # CONFIG_BROADCOM_PHY is not set |
| 743 | # CONFIG_FIXED_PHY is not set | 719 | # CONFIG_ICPLUS_PHY is not set |
| 744 | 720 | # CONFIG_REALTEK_PHY is not set | |
| 745 | # | 721 | # CONFIG_MDIO_BITBANG is not set |
| 746 | # Ethernet (10 or 100Mbit) | ||
| 747 | # | ||
| 748 | CONFIG_NET_ETHERNET=y | 722 | CONFIG_NET_ETHERNET=y |
| 749 | CONFIG_MII=y | 723 | CONFIG_MII=y |
| 724 | # CONFIG_AX88796 is not set | ||
| 750 | # CONFIG_HAPPYMEAL is not set | 725 | # CONFIG_HAPPYMEAL is not set |
| 751 | # CONFIG_SUNGEM is not set | 726 | # CONFIG_SUNGEM is not set |
| 752 | # CONFIG_CASSINI is not set | 727 | # CONFIG_CASSINI is not set |
| 753 | # CONFIG_NET_VENDOR_3COM is not set | 728 | # CONFIG_NET_VENDOR_3COM is not set |
| 754 | # CONFIG_NET_VENDOR_SMC is not set | 729 | # CONFIG_NET_VENDOR_SMC is not set |
| 730 | # CONFIG_SMC91X is not set | ||
| 755 | # CONFIG_DM9000 is not set | 731 | # CONFIG_DM9000 is not set |
| 756 | # CONFIG_NET_VENDOR_RACAL is not set | 732 | # CONFIG_NET_VENDOR_RACAL is not set |
| 757 | |||
| 758 | # | ||
| 759 | # Tulip family network device support | ||
| 760 | # | ||
| 761 | # CONFIG_NET_TULIP is not set | 733 | # CONFIG_NET_TULIP is not set |
| 762 | # CONFIG_AT1700 is not set | 734 | # CONFIG_AT1700 is not set |
| 763 | # CONFIG_DEPCA is not set | 735 | # CONFIG_DEPCA is not set |
| 764 | # CONFIG_HP100 is not set | 736 | # CONFIG_HP100 is not set |
| 765 | # CONFIG_NET_ISA is not set | 737 | # CONFIG_NET_ISA is not set |
| 738 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
| 739 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
| 740 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
| 741 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
| 742 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
| 743 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
| 744 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
| 766 | CONFIG_NET_PCI=y | 745 | CONFIG_NET_PCI=y |
| 767 | # CONFIG_PCNET32 is not set | 746 | # CONFIG_PCNET32 is not set |
| 768 | # CONFIG_AMD8111_ETH is not set | 747 | # CONFIG_AMD8111_ETH is not set |
| @@ -773,7 +752,6 @@ CONFIG_NET_PCI=y | |||
| 773 | # CONFIG_FORCEDETH is not set | 752 | # CONFIG_FORCEDETH is not set |
| 774 | # CONFIG_CS89x0 is not set | 753 | # CONFIG_CS89x0 is not set |
| 775 | # CONFIG_TC35815 is not set | 754 | # CONFIG_TC35815 is not set |
| 776 | # CONFIG_DGRS is not set | ||
| 777 | # CONFIG_EEPRO100 is not set | 755 | # CONFIG_EEPRO100 is not set |
| 778 | # CONFIG_E100 is not set | 756 | # CONFIG_E100 is not set |
| 779 | # CONFIG_FEALNX is not set | 757 | # CONFIG_FEALNX is not set |
| @@ -785,15 +763,21 @@ CONFIG_8139TOO=y | |||
| 785 | # CONFIG_8139TOO_TUNE_TWISTER is not set | 763 | # CONFIG_8139TOO_TUNE_TWISTER is not set |
| 786 | # CONFIG_8139TOO_8129 is not set | 764 | # CONFIG_8139TOO_8129 is not set |
| 787 | # CONFIG_8139_OLD_RX_RESET is not set | 765 | # CONFIG_8139_OLD_RX_RESET is not set |
| 766 | # CONFIG_R6040 is not set | ||
| 788 | # CONFIG_SIS900 is not set | 767 | # CONFIG_SIS900 is not set |
| 789 | # CONFIG_EPIC100 is not set | 768 | # CONFIG_EPIC100 is not set |
| 790 | # CONFIG_SUNDANCE is not set | 769 | # CONFIG_SUNDANCE is not set |
| 770 | # CONFIG_TLAN is not set | ||
| 791 | # CONFIG_VIA_RHINE is not set | 771 | # CONFIG_VIA_RHINE is not set |
| 792 | # CONFIG_SC92031 is not set | 772 | # CONFIG_SC92031 is not set |
| 773 | # CONFIG_ATL2 is not set | ||
| 793 | CONFIG_NETDEV_1000=y | 774 | CONFIG_NETDEV_1000=y |
| 794 | # CONFIG_ACENIC is not set | 775 | # CONFIG_ACENIC is not set |
| 795 | # CONFIG_DL2K is not set | 776 | # CONFIG_DL2K is not set |
| 796 | # CONFIG_E1000 is not set | 777 | # CONFIG_E1000 is not set |
| 778 | # CONFIG_E1000E is not set | ||
| 779 | # CONFIG_IP1000 is not set | ||
| 780 | # CONFIG_IGB is not set | ||
| 797 | # CONFIG_NS83820 is not set | 781 | # CONFIG_NS83820 is not set |
| 798 | # CONFIG_HAMACHI is not set | 782 | # CONFIG_HAMACHI is not set |
| 799 | # CONFIG_YELLOWFIN is not set | 783 | # CONFIG_YELLOWFIN is not set |
| @@ -801,20 +785,29 @@ CONFIG_NETDEV_1000=y | |||
| 801 | # CONFIG_SIS190 is not set | 785 | # CONFIG_SIS190 is not set |
| 802 | # CONFIG_SKGE is not set | 786 | # CONFIG_SKGE is not set |
| 803 | # CONFIG_SKY2 is not set | 787 | # CONFIG_SKY2 is not set |
| 804 | # CONFIG_SK98LIN is not set | ||
| 805 | # CONFIG_VIA_VELOCITY is not set | 788 | # CONFIG_VIA_VELOCITY is not set |
| 806 | # CONFIG_TIGON3 is not set | 789 | # CONFIG_TIGON3 is not set |
| 807 | # CONFIG_BNX2 is not set | 790 | # CONFIG_BNX2 is not set |
| 808 | # CONFIG_QLA3XXX is not set | 791 | # CONFIG_QLA3XXX is not set |
| 809 | # CONFIG_ATL1 is not set | 792 | # CONFIG_ATL1 is not set |
| 793 | # CONFIG_ATL1E is not set | ||
| 794 | # CONFIG_JME is not set | ||
| 810 | CONFIG_NETDEV_10000=y | 795 | CONFIG_NETDEV_10000=y |
| 811 | # CONFIG_CHELSIO_T1 is not set | 796 | # CONFIG_CHELSIO_T1 is not set |
| 812 | # CONFIG_CHELSIO_T3 is not set | 797 | # CONFIG_CHELSIO_T3 is not set |
| 798 | # CONFIG_ENIC is not set | ||
| 799 | # CONFIG_IXGBE is not set | ||
| 813 | # CONFIG_IXGB is not set | 800 | # CONFIG_IXGB is not set |
| 814 | # CONFIG_S2IO is not set | 801 | # CONFIG_S2IO is not set |
| 815 | # CONFIG_MYRI10GE is not set | 802 | # CONFIG_MYRI10GE is not set |
| 816 | # CONFIG_NETXEN_NIC is not set | 803 | # CONFIG_NETXEN_NIC is not set |
| 804 | # CONFIG_NIU is not set | ||
| 805 | # CONFIG_MLX4_EN is not set | ||
| 817 | # CONFIG_MLX4_CORE is not set | 806 | # CONFIG_MLX4_CORE is not set |
| 807 | # CONFIG_TEHUTI is not set | ||
| 808 | # CONFIG_BNX2X is not set | ||
| 809 | # CONFIG_QLGE is not set | ||
| 810 | # CONFIG_SFC is not set | ||
| 818 | # CONFIG_TR is not set | 811 | # CONFIG_TR is not set |
| 819 | 812 | ||
| 820 | # | 813 | # |
| @@ -822,6 +815,7 @@ CONFIG_NETDEV_10000=y | |||
| 822 | # | 815 | # |
| 823 | # CONFIG_WLAN_PRE80211 is not set | 816 | # CONFIG_WLAN_PRE80211 is not set |
| 824 | # CONFIG_WLAN_80211 is not set | 817 | # CONFIG_WLAN_80211 is not set |
| 818 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 825 | 819 | ||
| 826 | # | 820 | # |
| 827 | # USB Network Adapters | 821 | # USB Network Adapters |
| @@ -830,7 +824,6 @@ CONFIG_NETDEV_10000=y | |||
| 830 | # CONFIG_USB_KAWETH is not set | 824 | # CONFIG_USB_KAWETH is not set |
| 831 | # CONFIG_USB_PEGASUS is not set | 825 | # CONFIG_USB_PEGASUS is not set |
| 832 | # CONFIG_USB_RTL8150 is not set | 826 | # CONFIG_USB_RTL8150 is not set |
| 833 | # CONFIG_USB_USBNET_MII is not set | ||
| 834 | # CONFIG_USB_USBNET is not set | 827 | # CONFIG_USB_USBNET is not set |
| 835 | # CONFIG_WAN is not set | 828 | # CONFIG_WAN is not set |
| 836 | # CONFIG_FDDI is not set | 829 | # CONFIG_FDDI is not set |
| @@ -844,25 +837,17 @@ CONFIG_PPP_DEFLATE=m | |||
| 844 | CONFIG_PPP_BSDCOMP=m | 837 | CONFIG_PPP_BSDCOMP=m |
| 845 | CONFIG_PPP_MPPE=m | 838 | CONFIG_PPP_MPPE=m |
| 846 | CONFIG_PPPOE=m | 839 | CONFIG_PPPOE=m |
| 840 | CONFIG_PPPOL2TP=m | ||
| 847 | CONFIG_SLIP=m | 841 | CONFIG_SLIP=m |
| 848 | CONFIG_SLIP_COMPRESSED=y | 842 | CONFIG_SLIP_COMPRESSED=y |
| 849 | CONFIG_SLHC=m | 843 | CONFIG_SLHC=m |
| 850 | CONFIG_SLIP_SMART=y | 844 | CONFIG_SLIP_SMART=y |
| 851 | CONFIG_SLIP_MODE_SLIP6=y | 845 | CONFIG_SLIP_MODE_SLIP6=y |
| 852 | CONFIG_NET_FC=y | 846 | CONFIG_NET_FC=y |
| 853 | # CONFIG_SHAPER is not set | ||
| 854 | # CONFIG_NETCONSOLE is not set | 847 | # CONFIG_NETCONSOLE is not set |
| 855 | # CONFIG_NETPOLL is not set | 848 | # CONFIG_NETPOLL is not set |
| 856 | # CONFIG_NET_POLL_CONTROLLER is not set | 849 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 857 | |||
| 858 | # | ||
| 859 | # ISDN subsystem | ||
| 860 | # | ||
| 861 | # CONFIG_ISDN is not set | 850 | # CONFIG_ISDN is not set |
| 862 | |||
| 863 | # | ||
| 864 | # Telephony Support | ||
| 865 | # | ||
| 866 | # CONFIG_PHONE is not set | 851 | # CONFIG_PHONE is not set |
| 867 | 852 | ||
| 868 | # | 853 | # |
| @@ -870,6 +855,7 @@ CONFIG_NET_FC=y | |||
| 870 | # | 855 | # |
| 871 | CONFIG_INPUT=y | 856 | CONFIG_INPUT=y |
| 872 | CONFIG_INPUT_FF_MEMLESS=y | 857 | CONFIG_INPUT_FF_MEMLESS=y |
| 858 | # CONFIG_INPUT_POLLDEV is not set | ||
| 873 | 859 | ||
| 874 | # | 860 | # |
| 875 | # Userland interfaces | 861 | # Userland interfaces |
| @@ -879,7 +865,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y | |||
| 879 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | 865 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 |
| 880 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | 866 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 |
| 881 | # CONFIG_INPUT_JOYDEV is not set | 867 | # CONFIG_INPUT_JOYDEV is not set |
| 882 | # CONFIG_INPUT_TSDEV is not set | ||
| 883 | # CONFIG_INPUT_EVDEV is not set | 868 | # CONFIG_INPUT_EVDEV is not set |
| 884 | # CONFIG_INPUT_EVBUG is not set | 869 | # CONFIG_INPUT_EVBUG is not set |
| 885 | 870 | ||
| @@ -900,9 +885,11 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y | |||
| 900 | CONFIG_MOUSE_PS2_SYNAPTICS=y | 885 | CONFIG_MOUSE_PS2_SYNAPTICS=y |
| 901 | CONFIG_MOUSE_PS2_LIFEBOOK=y | 886 | CONFIG_MOUSE_PS2_LIFEBOOK=y |
| 902 | CONFIG_MOUSE_PS2_TRACKPOINT=y | 887 | CONFIG_MOUSE_PS2_TRACKPOINT=y |
| 888 | # CONFIG_MOUSE_PS2_ELANTECH is not set | ||
| 903 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 889 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
| 904 | CONFIG_MOUSE_SERIAL=y | 890 | CONFIG_MOUSE_SERIAL=y |
| 905 | # CONFIG_MOUSE_APPLETOUCH is not set | 891 | # CONFIG_MOUSE_APPLETOUCH is not set |
| 892 | # CONFIG_MOUSE_BCM5974 is not set | ||
| 906 | # CONFIG_MOUSE_INPORT is not set | 893 | # CONFIG_MOUSE_INPORT is not set |
| 907 | # CONFIG_MOUSE_LOGIBM is not set | 894 | # CONFIG_MOUSE_LOGIBM is not set |
| 908 | # CONFIG_MOUSE_PC110PAD is not set | 895 | # CONFIG_MOUSE_PC110PAD is not set |
| @@ -927,10 +914,13 @@ CONFIG_SERIO_LIBPS2=y | |||
| 927 | # Character devices | 914 | # Character devices |
| 928 | # | 915 | # |
| 929 | CONFIG_VT=y | 916 | CONFIG_VT=y |
| 917 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 930 | CONFIG_VT_CONSOLE=y | 918 | CONFIG_VT_CONSOLE=y |
| 931 | CONFIG_HW_CONSOLE=y | 919 | CONFIG_HW_CONSOLE=y |
| 932 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 920 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| 921 | CONFIG_DEVKMEM=y | ||
| 933 | # CONFIG_SERIAL_NONSTANDARD is not set | 922 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 923 | # CONFIG_NOZOMI is not set | ||
| 934 | 924 | ||
| 935 | # | 925 | # |
| 936 | # Serial drivers | 926 | # Serial drivers |
| @@ -951,105 +941,152 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
| 951 | CONFIG_UNIX98_PTYS=y | 941 | CONFIG_UNIX98_PTYS=y |
| 952 | CONFIG_LEGACY_PTYS=y | 942 | CONFIG_LEGACY_PTYS=y |
| 953 | CONFIG_LEGACY_PTY_COUNT=256 | 943 | CONFIG_LEGACY_PTY_COUNT=256 |
| 954 | |||
| 955 | # | ||
| 956 | # IPMI | ||
| 957 | # | ||
| 958 | # CONFIG_IPMI_HANDLER is not set | 944 | # CONFIG_IPMI_HANDLER is not set |
| 959 | # CONFIG_WATCHDOG is not set | ||
| 960 | CONFIG_HW_RANDOM=y | 945 | CONFIG_HW_RANDOM=y |
| 961 | CONFIG_RTC=y | ||
| 962 | # CONFIG_DTLK is not set | 946 | # CONFIG_DTLK is not set |
| 963 | # CONFIG_R3964 is not set | 947 | # CONFIG_R3964 is not set |
| 964 | # CONFIG_APPLICOM is not set | 948 | # CONFIG_APPLICOM is not set |
| 965 | # CONFIG_DRM is not set | ||
| 966 | # CONFIG_RAW_DRIVER is not set | 949 | # CONFIG_RAW_DRIVER is not set |
| 967 | |||
| 968 | # | ||
| 969 | # TPM devices | ||
| 970 | # | ||
| 971 | # CONFIG_TCG_TPM is not set | 950 | # CONFIG_TCG_TPM is not set |
| 972 | CONFIG_DEVPORT=y | 951 | CONFIG_DEVPORT=y |
| 973 | CONFIG_I2C=m | 952 | CONFIG_I2C=m |
| 974 | CONFIG_I2C_BOARDINFO=y | 953 | CONFIG_I2C_BOARDINFO=y |
| 975 | CONFIG_I2C_CHARDEV=m | 954 | CONFIG_I2C_CHARDEV=m |
| 955 | CONFIG_I2C_HELPER_AUTO=y | ||
| 976 | 956 | ||
| 977 | # | 957 | # |
| 978 | # I2C Algorithms | 958 | # I2C Hardware Bus support |
| 979 | # | 959 | # |
| 980 | # CONFIG_I2C_ALGOBIT is not set | ||
| 981 | # CONFIG_I2C_ALGOPCF is not set | ||
| 982 | # CONFIG_I2C_ALGOPCA is not set | ||
| 983 | 960 | ||
| 984 | # | 961 | # |
| 985 | # I2C Hardware Bus support | 962 | # PC SMBus host controller drivers |
| 986 | # | 963 | # |
| 987 | # CONFIG_I2C_ALI1535 is not set | 964 | # CONFIG_I2C_ALI1535 is not set |
| 988 | # CONFIG_I2C_ALI1563 is not set | 965 | # CONFIG_I2C_ALI1563 is not set |
| 989 | # CONFIG_I2C_ALI15X3 is not set | 966 | # CONFIG_I2C_ALI15X3 is not set |
| 990 | # CONFIG_I2C_AMD756 is not set | 967 | # CONFIG_I2C_AMD756 is not set |
| 991 | # CONFIG_I2C_AMD8111 is not set | 968 | # CONFIG_I2C_AMD8111 is not set |
| 992 | # CONFIG_I2C_ELEKTOR is not set | ||
| 993 | # CONFIG_I2C_I801 is not set | 969 | # CONFIG_I2C_I801 is not set |
| 994 | # CONFIG_I2C_I810 is not set | 970 | # CONFIG_I2C_ISCH is not set |
| 995 | # CONFIG_I2C_PIIX4 is not set | 971 | # CONFIG_I2C_PIIX4 is not set |
| 996 | # CONFIG_I2C_NFORCE2 is not set | 972 | # CONFIG_I2C_NFORCE2 is not set |
| 997 | # CONFIG_I2C_OCORES is not set | ||
| 998 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 999 | # CONFIG_I2C_PROSAVAGE is not set | ||
| 1000 | # CONFIG_I2C_SAVAGE4 is not set | ||
| 1001 | # CONFIG_I2C_SIMTEC is not set | ||
| 1002 | # CONFIG_I2C_SIS5595 is not set | 973 | # CONFIG_I2C_SIS5595 is not set |
| 1003 | # CONFIG_I2C_SIS630 is not set | 974 | # CONFIG_I2C_SIS630 is not set |
| 1004 | # CONFIG_I2C_SIS96X is not set | 975 | # CONFIG_I2C_SIS96X is not set |
| 1005 | # CONFIG_I2C_STUB is not set | ||
| 1006 | # CONFIG_I2C_TINY_USB is not set | ||
| 1007 | # CONFIG_I2C_VIA is not set | 976 | # CONFIG_I2C_VIA is not set |
| 1008 | CONFIG_I2C_VIAPRO=m | 977 | CONFIG_I2C_VIAPRO=m |
| 978 | |||
| 979 | # | ||
| 980 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 981 | # | ||
| 982 | # CONFIG_I2C_OCORES is not set | ||
| 983 | # CONFIG_I2C_SIMTEC is not set | ||
| 984 | |||
| 985 | # | ||
| 986 | # External I2C/SMBus adapter drivers | ||
| 987 | # | ||
| 988 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 989 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 990 | # CONFIG_I2C_TINY_USB is not set | ||
| 991 | |||
| 992 | # | ||
| 993 | # Graphics adapter I2C/DDC channel drivers | ||
| 994 | # | ||
| 1009 | # CONFIG_I2C_VOODOO3 is not set | 995 | # CONFIG_I2C_VOODOO3 is not set |
| 996 | |||
| 997 | # | ||
| 998 | # Other I2C/SMBus bus drivers | ||
| 999 | # | ||
| 1000 | # CONFIG_I2C_ELEKTOR is not set | ||
| 1010 | # CONFIG_I2C_PCA_ISA is not set | 1001 | # CONFIG_I2C_PCA_ISA is not set |
| 1002 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 1003 | # CONFIG_I2C_STUB is not set | ||
| 1011 | 1004 | ||
| 1012 | # | 1005 | # |
| 1013 | # Miscellaneous I2C Chip support | 1006 | # Miscellaneous I2C Chip support |
| 1014 | # | 1007 | # |
| 1015 | # CONFIG_SENSORS_DS1337 is not set | 1008 | # CONFIG_DS1682 is not set |
| 1016 | # CONFIG_SENSORS_DS1374 is not set | 1009 | # CONFIG_AT24 is not set |
| 1017 | # CONFIG_SENSORS_EEPROM is not set | 1010 | # CONFIG_SENSORS_EEPROM is not set |
| 1018 | # CONFIG_SENSORS_PCF8574 is not set | 1011 | # CONFIG_SENSORS_PCF8574 is not set |
| 1012 | # CONFIG_PCF8575 is not set | ||
| 1019 | # CONFIG_SENSORS_PCA9539 is not set | 1013 | # CONFIG_SENSORS_PCA9539 is not set |
| 1020 | # CONFIG_SENSORS_PCF8591 is not set | 1014 | # CONFIG_SENSORS_PCF8591 is not set |
| 1021 | # CONFIG_SENSORS_MAX6875 is not set | 1015 | # CONFIG_SENSORS_MAX6875 is not set |
| 1016 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 1022 | # CONFIG_I2C_DEBUG_CORE is not set | 1017 | # CONFIG_I2C_DEBUG_CORE is not set |
| 1023 | # CONFIG_I2C_DEBUG_ALGO is not set | 1018 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 1024 | # CONFIG_I2C_DEBUG_BUS is not set | 1019 | # CONFIG_I2C_DEBUG_BUS is not set |
| 1025 | # CONFIG_I2C_DEBUG_CHIP is not set | 1020 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 1026 | |||
| 1027 | # | ||
| 1028 | # SPI support | ||
| 1029 | # | ||
| 1030 | # CONFIG_SPI is not set | 1021 | # CONFIG_SPI is not set |
| 1031 | # CONFIG_SPI_MASTER is not set | 1022 | # CONFIG_W1 is not set |
| 1023 | # CONFIG_POWER_SUPPLY is not set | ||
| 1024 | # CONFIG_HWMON is not set | ||
| 1025 | # CONFIG_THERMAL is not set | ||
| 1026 | # CONFIG_THERMAL_HWMON is not set | ||
| 1027 | # CONFIG_WATCHDOG is not set | ||
| 1028 | CONFIG_SSB_POSSIBLE=y | ||
| 1032 | 1029 | ||
| 1033 | # | 1030 | # |
| 1034 | # Dallas's 1-wire bus | 1031 | # Sonics Silicon Backplane |
| 1035 | # | 1032 | # |
| 1036 | # CONFIG_W1 is not set | 1033 | # CONFIG_SSB is not set |
| 1037 | # CONFIG_HWMON is not set | ||
| 1038 | 1034 | ||
| 1039 | # | 1035 | # |
| 1040 | # Multifunction device drivers | 1036 | # Multifunction device drivers |
| 1041 | # | 1037 | # |
| 1038 | # CONFIG_MFD_CORE is not set | ||
| 1042 | # CONFIG_MFD_SM501 is not set | 1039 | # CONFIG_MFD_SM501 is not set |
| 1040 | # CONFIG_HTC_PASIC3 is not set | ||
| 1041 | # CONFIG_MFD_TMIO is not set | ||
| 1042 | # CONFIG_MFD_WM8400 is not set | ||
| 1043 | # CONFIG_MFD_WM8350_I2C is not set | ||
| 1044 | # CONFIG_REGULATOR is not set | ||
| 1043 | 1045 | ||
| 1044 | # | 1046 | # |
| 1045 | # Multimedia devices | 1047 | # Multimedia devices |
| 1046 | # | 1048 | # |
| 1049 | |||
| 1050 | # | ||
| 1051 | # Multimedia core support | ||
| 1052 | # | ||
| 1047 | CONFIG_VIDEO_DEV=m | 1053 | CONFIG_VIDEO_DEV=m |
| 1048 | CONFIG_VIDEO_V4L1=y | 1054 | CONFIG_VIDEO_V4L2_COMMON=m |
| 1055 | CONFIG_VIDEO_ALLOW_V4L1=y | ||
| 1049 | CONFIG_VIDEO_V4L1_COMPAT=y | 1056 | CONFIG_VIDEO_V4L1_COMPAT=y |
| 1050 | CONFIG_VIDEO_V4L2=y | 1057 | # CONFIG_DVB_CORE is not set |
| 1058 | CONFIG_VIDEO_MEDIA=m | ||
| 1059 | |||
| 1060 | # | ||
| 1061 | # Multimedia drivers | ||
| 1062 | # | ||
| 1063 | CONFIG_MEDIA_ATTACH=y | ||
| 1064 | CONFIG_MEDIA_TUNER=m | ||
| 1065 | CONFIG_MEDIA_TUNER_CUSTOMIZE=y | ||
| 1066 | CONFIG_MEDIA_TUNER_SIMPLE=m | ||
| 1067 | CONFIG_MEDIA_TUNER_TDA8290=m | ||
| 1068 | CONFIG_MEDIA_TUNER_TDA827X=m | ||
| 1069 | CONFIG_MEDIA_TUNER_TDA18271=m | ||
| 1070 | CONFIG_MEDIA_TUNER_TDA9887=m | ||
| 1071 | CONFIG_MEDIA_TUNER_TEA5761=m | ||
| 1072 | CONFIG_MEDIA_TUNER_TEA5767=m | ||
| 1073 | CONFIG_MEDIA_TUNER_MT20XX=m | ||
| 1074 | CONFIG_MEDIA_TUNER_MT2060=m | ||
| 1075 | CONFIG_MEDIA_TUNER_MT2266=m | ||
| 1076 | CONFIG_MEDIA_TUNER_MT2131=m | ||
| 1077 | CONFIG_MEDIA_TUNER_QT1010=m | ||
| 1078 | CONFIG_MEDIA_TUNER_XC2028=m | ||
| 1079 | CONFIG_MEDIA_TUNER_XC5000=m | ||
| 1080 | CONFIG_MEDIA_TUNER_MXL5005S=m | ||
| 1081 | CONFIG_MEDIA_TUNER_MXL5007T=m | ||
| 1082 | CONFIG_VIDEO_V4L2=m | ||
| 1083 | CONFIG_VIDEO_V4L1=m | ||
| 1084 | CONFIG_VIDEOBUF_GEN=m | ||
| 1085 | CONFIG_VIDEOBUF_VMALLOC=m | ||
| 1086 | CONFIG_VIDEOBUF_DMA_CONTIG=m | ||
| 1051 | CONFIG_VIDEO_CAPTURE_DRIVERS=y | 1087 | CONFIG_VIDEO_CAPTURE_DRIVERS=y |
| 1052 | # CONFIG_VIDEO_ADV_DEBUG is not set | 1088 | # CONFIG_VIDEO_ADV_DEBUG is not set |
| 1089 | # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set | ||
| 1053 | CONFIG_VIDEO_HELPER_CHIPS_AUTO=y | 1090 | CONFIG_VIDEO_HELPER_CHIPS_AUTO=y |
| 1054 | # CONFIG_VIDEO_VIVI is not set | 1091 | # CONFIG_VIDEO_VIVI is not set |
| 1055 | # CONFIG_VIDEO_BT848 is not set | 1092 | # CONFIG_VIDEO_BT848 is not set |
| @@ -1058,17 +1095,46 @@ CONFIG_VIDEO_HELPER_CHIPS_AUTO=y | |||
| 1058 | # CONFIG_VIDEO_CPIA2 is not set | 1095 | # CONFIG_VIDEO_CPIA2 is not set |
| 1059 | # CONFIG_VIDEO_SAA5246A is not set | 1096 | # CONFIG_VIDEO_SAA5246A is not set |
| 1060 | # CONFIG_VIDEO_SAA5249 is not set | 1097 | # CONFIG_VIDEO_SAA5249 is not set |
| 1061 | # CONFIG_TUNER_3036 is not set | ||
| 1062 | # CONFIG_VIDEO_STRADIS is not set | 1098 | # CONFIG_VIDEO_STRADIS is not set |
| 1063 | # CONFIG_VIDEO_SAA7134 is not set | 1099 | # CONFIG_VIDEO_SAA7134 is not set |
| 1064 | # CONFIG_VIDEO_MXB is not set | 1100 | # CONFIG_VIDEO_MXB is not set |
| 1065 | # CONFIG_VIDEO_DPC is not set | ||
| 1066 | # CONFIG_VIDEO_HEXIUM_ORION is not set | 1101 | # CONFIG_VIDEO_HEXIUM_ORION is not set |
| 1067 | # CONFIG_VIDEO_HEXIUM_GEMINI is not set | 1102 | # CONFIG_VIDEO_HEXIUM_GEMINI is not set |
| 1068 | # CONFIG_VIDEO_CX88 is not set | 1103 | # CONFIG_VIDEO_CX88 is not set |
| 1069 | # CONFIG_VIDEO_IVTV is not set | 1104 | # CONFIG_VIDEO_IVTV is not set |
| 1070 | # CONFIG_VIDEO_CAFE_CCIC is not set | 1105 | # CONFIG_VIDEO_CAFE_CCIC is not set |
| 1106 | CONFIG_SOC_CAMERA=m | ||
| 1107 | CONFIG_SOC_CAMERA_MT9M001=m | ||
| 1108 | CONFIG_SOC_CAMERA_MT9M111=m | ||
| 1109 | CONFIG_SOC_CAMERA_MT9V022=m | ||
| 1110 | CONFIG_SOC_CAMERA_PLATFORM=m | ||
| 1111 | CONFIG_VIDEO_SH_MOBILE_CEU=m | ||
| 1071 | CONFIG_V4L_USB_DRIVERS=y | 1112 | CONFIG_V4L_USB_DRIVERS=y |
| 1113 | CONFIG_USB_VIDEO_CLASS=m | ||
| 1114 | CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y | ||
| 1115 | CONFIG_USB_GSPCA=m | ||
| 1116 | CONFIG_USB_M5602=m | ||
| 1117 | CONFIG_USB_GSPCA_CONEX=m | ||
| 1118 | CONFIG_USB_GSPCA_ETOMS=m | ||
| 1119 | CONFIG_USB_GSPCA_FINEPIX=m | ||
| 1120 | CONFIG_USB_GSPCA_MARS=m | ||
| 1121 | CONFIG_USB_GSPCA_OV519=m | ||
| 1122 | CONFIG_USB_GSPCA_PAC207=m | ||
| 1123 | CONFIG_USB_GSPCA_PAC7311=m | ||
| 1124 | CONFIG_USB_GSPCA_SONIXB=m | ||
| 1125 | CONFIG_USB_GSPCA_SONIXJ=m | ||
| 1126 | CONFIG_USB_GSPCA_SPCA500=m | ||
| 1127 | CONFIG_USB_GSPCA_SPCA501=m | ||
| 1128 | CONFIG_USB_GSPCA_SPCA505=m | ||
| 1129 | CONFIG_USB_GSPCA_SPCA506=m | ||
| 1130 | CONFIG_USB_GSPCA_SPCA508=m | ||
| 1131 | CONFIG_USB_GSPCA_SPCA561=m | ||
| 1132 | CONFIG_USB_GSPCA_STK014=m | ||
| 1133 | CONFIG_USB_GSPCA_SUNPLUS=m | ||
| 1134 | CONFIG_USB_GSPCA_T613=m | ||
| 1135 | CONFIG_USB_GSPCA_TV8532=m | ||
| 1136 | CONFIG_USB_GSPCA_VC032X=m | ||
| 1137 | CONFIG_USB_GSPCA_ZC3XX=m | ||
| 1072 | # CONFIG_VIDEO_PVRUSB2 is not set | 1138 | # CONFIG_VIDEO_PVRUSB2 is not set |
| 1073 | # CONFIG_VIDEO_EM28XX is not set | 1139 | # CONFIG_VIDEO_EM28XX is not set |
| 1074 | # CONFIG_VIDEO_USBVISION is not set | 1140 | # CONFIG_VIDEO_USBVISION is not set |
| @@ -1079,7 +1145,6 @@ CONFIG_USB_KONICAWC=m | |||
| 1079 | CONFIG_USB_QUICKCAM_MESSENGER=m | 1145 | CONFIG_USB_QUICKCAM_MESSENGER=m |
| 1080 | CONFIG_USB_ET61X251=m | 1146 | CONFIG_USB_ET61X251=m |
| 1081 | # CONFIG_VIDEO_OVCAMCHIP is not set | 1147 | # CONFIG_VIDEO_OVCAMCHIP is not set |
| 1082 | # CONFIG_USB_W9968CF is not set | ||
| 1083 | CONFIG_USB_OV511=m | 1148 | CONFIG_USB_OV511=m |
| 1084 | CONFIG_USB_SE401=m | 1149 | CONFIG_USB_SE401=m |
| 1085 | CONFIG_USB_SN9C102=m | 1150 | CONFIG_USB_SN9C102=m |
| @@ -1088,6 +1153,8 @@ CONFIG_USB_ZC0301=m | |||
| 1088 | CONFIG_USB_PWC=m | 1153 | CONFIG_USB_PWC=m |
| 1089 | # CONFIG_USB_PWC_DEBUG is not set | 1154 | # CONFIG_USB_PWC_DEBUG is not set |
| 1090 | # CONFIG_USB_ZR364XX is not set | 1155 | # CONFIG_USB_ZR364XX is not set |
| 1156 | CONFIG_USB_STKWEBCAM=m | ||
| 1157 | CONFIG_USB_S2255=m | ||
| 1091 | CONFIG_RADIO_ADAPTERS=y | 1158 | CONFIG_RADIO_ADAPTERS=y |
| 1092 | # CONFIG_RADIO_CADET is not set | 1159 | # CONFIG_RADIO_CADET is not set |
| 1093 | # CONFIG_RADIO_RTRACK is not set | 1160 | # CONFIG_RADIO_RTRACK is not set |
| @@ -1104,33 +1171,30 @@ CONFIG_RADIO_ADAPTERS=y | |||
| 1104 | # CONFIG_RADIO_TYPHOON is not set | 1171 | # CONFIG_RADIO_TYPHOON is not set |
| 1105 | # CONFIG_RADIO_ZOLTRIX is not set | 1172 | # CONFIG_RADIO_ZOLTRIX is not set |
| 1106 | # CONFIG_USB_DSBR is not set | 1173 | # CONFIG_USB_DSBR is not set |
| 1107 | # CONFIG_DVB_CORE is not set | 1174 | CONFIG_USB_SI470X=m |
| 1175 | CONFIG_USB_MR800=m | ||
| 1108 | CONFIG_DAB=y | 1176 | CONFIG_DAB=y |
| 1109 | # CONFIG_USB_DABUSB is not set | 1177 | # CONFIG_USB_DABUSB is not set |
| 1110 | 1178 | ||
| 1111 | # | 1179 | # |
| 1112 | # Graphics support | 1180 | # Graphics support |
| 1113 | # | 1181 | # |
| 1114 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | 1182 | # CONFIG_DRM is not set |
| 1115 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | ||
| 1116 | CONFIG_LCD_CLASS_DEVICE=m | ||
| 1117 | |||
| 1118 | # | ||
| 1119 | # Display device support | ||
| 1120 | # | ||
| 1121 | # CONFIG_DISPLAY_SUPPORT is not set | ||
| 1122 | # CONFIG_VGASTATE is not set | 1183 | # CONFIG_VGASTATE is not set |
| 1184 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
| 1123 | CONFIG_FB=y | 1185 | CONFIG_FB=y |
| 1124 | # CONFIG_FIRMWARE_EDID is not set | 1186 | # CONFIG_FIRMWARE_EDID is not set |
| 1125 | # CONFIG_FB_DDC is not set | 1187 | # CONFIG_FB_DDC is not set |
| 1188 | # CONFIG_FB_BOOT_VESA_SUPPORT is not set | ||
| 1126 | CONFIG_FB_CFB_FILLRECT=y | 1189 | CONFIG_FB_CFB_FILLRECT=y |
| 1127 | CONFIG_FB_CFB_COPYAREA=y | 1190 | CONFIG_FB_CFB_COPYAREA=y |
| 1128 | CONFIG_FB_CFB_IMAGEBLIT=y | 1191 | CONFIG_FB_CFB_IMAGEBLIT=y |
| 1192 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | ||
| 1129 | # CONFIG_FB_SYS_FILLRECT is not set | 1193 | # CONFIG_FB_SYS_FILLRECT is not set |
| 1130 | # CONFIG_FB_SYS_COPYAREA is not set | 1194 | # CONFIG_FB_SYS_COPYAREA is not set |
| 1131 | # CONFIG_FB_SYS_IMAGEBLIT is not set | 1195 | # CONFIG_FB_SYS_IMAGEBLIT is not set |
| 1196 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
| 1132 | # CONFIG_FB_SYS_FOPS is not set | 1197 | # CONFIG_FB_SYS_FOPS is not set |
| 1133 | CONFIG_FB_DEFERRED_IO=y | ||
| 1134 | # CONFIG_FB_SVGALIB is not set | 1198 | # CONFIG_FB_SVGALIB is not set |
| 1135 | # CONFIG_FB_MACMODES is not set | 1199 | # CONFIG_FB_MACMODES is not set |
| 1136 | CONFIG_FB_BACKLIGHT=y | 1200 | CONFIG_FB_BACKLIGHT=y |
| @@ -1158,16 +1222,30 @@ CONFIG_FB_RADEON_BACKLIGHT=y | |||
| 1158 | # CONFIG_FB_S3 is not set | 1222 | # CONFIG_FB_S3 is not set |
| 1159 | # CONFIG_FB_SAVAGE is not set | 1223 | # CONFIG_FB_SAVAGE is not set |
| 1160 | # CONFIG_FB_SIS is not set | 1224 | # CONFIG_FB_SIS is not set |
| 1225 | # CONFIG_FB_VIA is not set | ||
| 1161 | # CONFIG_FB_NEOMAGIC is not set | 1226 | # CONFIG_FB_NEOMAGIC is not set |
| 1162 | # CONFIG_FB_KYRO is not set | 1227 | # CONFIG_FB_KYRO is not set |
| 1163 | # CONFIG_FB_3DFX is not set | 1228 | # CONFIG_FB_3DFX is not set |
| 1164 | # CONFIG_FB_VOODOO1 is not set | 1229 | # CONFIG_FB_VOODOO1 is not set |
| 1165 | # CONFIG_FB_SMIVGX is not set | ||
| 1166 | # CONFIG_FB_VT8623 is not set | 1230 | # CONFIG_FB_VT8623 is not set |
| 1167 | # CONFIG_FB_TRIDENT is not set | 1231 | # CONFIG_FB_TRIDENT is not set |
| 1168 | # CONFIG_FB_ARK is not set | 1232 | # CONFIG_FB_ARK is not set |
| 1169 | # CONFIG_FB_PM3 is not set | 1233 | # CONFIG_FB_PM3 is not set |
| 1234 | # CONFIG_FB_CARMINE is not set | ||
| 1170 | # CONFIG_FB_VIRTUAL is not set | 1235 | # CONFIG_FB_VIRTUAL is not set |
| 1236 | # CONFIG_FB_METRONOME is not set | ||
| 1237 | # CONFIG_FB_MB862XX is not set | ||
| 1238 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | ||
| 1239 | CONFIG_LCD_CLASS_DEVICE=m | ||
| 1240 | # CONFIG_LCD_ILI9320 is not set | ||
| 1241 | # CONFIG_LCD_PLATFORM is not set | ||
| 1242 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | ||
| 1243 | # CONFIG_BACKLIGHT_CORGI is not set | ||
| 1244 | |||
| 1245 | # | ||
| 1246 | # Display device support | ||
| 1247 | # | ||
| 1248 | # CONFIG_DISPLAY_SUPPORT is not set | ||
| 1171 | 1249 | ||
| 1172 | # | 1250 | # |
| 1173 | # Console display driver support | 1251 | # Console display driver support |
| @@ -1176,20 +1254,14 @@ CONFIG_FB_RADEON_BACKLIGHT=y | |||
| 1176 | # CONFIG_MDA_CONSOLE is not set | 1254 | # CONFIG_MDA_CONSOLE is not set |
| 1177 | CONFIG_DUMMY_CONSOLE=y | 1255 | CONFIG_DUMMY_CONSOLE=y |
| 1178 | CONFIG_FRAMEBUFFER_CONSOLE=y | 1256 | CONFIG_FRAMEBUFFER_CONSOLE=y |
| 1257 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set | ||
| 1179 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | 1258 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set |
| 1180 | # CONFIG_FONTS is not set | 1259 | # CONFIG_FONTS is not set |
| 1181 | CONFIG_FONT_8x8=y | 1260 | CONFIG_FONT_8x8=y |
| 1182 | CONFIG_FONT_8x16=y | 1261 | CONFIG_FONT_8x16=y |
| 1183 | # CONFIG_LOGO is not set | 1262 | # CONFIG_LOGO is not set |
| 1184 | |||
| 1185 | # | ||
| 1186 | # Sound | ||
| 1187 | # | ||
| 1188 | CONFIG_SOUND=y | 1263 | CONFIG_SOUND=y |
| 1189 | 1264 | CONFIG_SOUND_OSS_CORE=y | |
| 1190 | # | ||
| 1191 | # Advanced Linux Sound Architecture | ||
| 1192 | # | ||
| 1193 | CONFIG_SND=m | 1265 | CONFIG_SND=m |
| 1194 | CONFIG_SND_TIMER=m | 1266 | CONFIG_SND_TIMER=m |
| 1195 | CONFIG_SND_PCM=m | 1267 | CONFIG_SND_PCM=m |
| @@ -1201,28 +1273,22 @@ CONFIG_SND_MIXER_OSS=m | |||
| 1201 | CONFIG_SND_PCM_OSS=m | 1273 | CONFIG_SND_PCM_OSS=m |
| 1202 | CONFIG_SND_PCM_OSS_PLUGINS=y | 1274 | CONFIG_SND_PCM_OSS_PLUGINS=y |
| 1203 | CONFIG_SND_SEQUENCER_OSS=y | 1275 | CONFIG_SND_SEQUENCER_OSS=y |
| 1204 | CONFIG_SND_RTCTIMER=m | ||
| 1205 | CONFIG_SND_SEQ_RTCTIMER_DEFAULT=y | ||
| 1206 | # CONFIG_SND_DYNAMIC_MINORS is not set | 1276 | # CONFIG_SND_DYNAMIC_MINORS is not set |
| 1207 | CONFIG_SND_SUPPORT_OLD_API=y | 1277 | CONFIG_SND_SUPPORT_OLD_API=y |
| 1208 | CONFIG_SND_VERBOSE_PROCFS=y | 1278 | CONFIG_SND_VERBOSE_PROCFS=y |
| 1209 | # CONFIG_SND_VERBOSE_PRINTK is not set | 1279 | # CONFIG_SND_VERBOSE_PRINTK is not set |
| 1210 | # CONFIG_SND_DEBUG is not set | 1280 | # CONFIG_SND_DEBUG is not set |
| 1211 | 1281 | CONFIG_SND_VMASTER=y | |
| 1212 | # | ||
| 1213 | # Generic devices | ||
| 1214 | # | ||
| 1215 | CONFIG_SND_MPU401_UART=m | 1282 | CONFIG_SND_MPU401_UART=m |
| 1216 | CONFIG_SND_AC97_CODEC=m | 1283 | CONFIG_SND_AC97_CODEC=m |
| 1284 | CONFIG_SND_DRIVERS=y | ||
| 1217 | # CONFIG_SND_DUMMY is not set | 1285 | # CONFIG_SND_DUMMY is not set |
| 1218 | # CONFIG_SND_VIRMIDI is not set | 1286 | # CONFIG_SND_VIRMIDI is not set |
| 1219 | # CONFIG_SND_MTPAV is not set | 1287 | # CONFIG_SND_MTPAV is not set |
| 1220 | # CONFIG_SND_SERIAL_U16550 is not set | 1288 | # CONFIG_SND_SERIAL_U16550 is not set |
| 1221 | # CONFIG_SND_MPU401 is not set | 1289 | # CONFIG_SND_MPU401 is not set |
| 1222 | 1290 | # CONFIG_SND_AC97_POWER_SAVE is not set | |
| 1223 | # | 1291 | CONFIG_SND_PCI=y |
| 1224 | # PCI devices | ||
| 1225 | # | ||
| 1226 | # CONFIG_SND_AD1889 is not set | 1292 | # CONFIG_SND_AD1889 is not set |
| 1227 | # CONFIG_SND_ALS300 is not set | 1293 | # CONFIG_SND_ALS300 is not set |
| 1228 | # CONFIG_SND_ALI5451 is not set | 1294 | # CONFIG_SND_ALI5451 is not set |
| @@ -1231,10 +1297,12 @@ CONFIG_SND_AC97_CODEC=m | |||
| 1231 | # CONFIG_SND_AU8810 is not set | 1297 | # CONFIG_SND_AU8810 is not set |
| 1232 | # CONFIG_SND_AU8820 is not set | 1298 | # CONFIG_SND_AU8820 is not set |
| 1233 | # CONFIG_SND_AU8830 is not set | 1299 | # CONFIG_SND_AU8830 is not set |
| 1300 | # CONFIG_SND_AW2 is not set | ||
| 1234 | # CONFIG_SND_AZT3328 is not set | 1301 | # CONFIG_SND_AZT3328 is not set |
| 1235 | # CONFIG_SND_BT87X is not set | 1302 | # CONFIG_SND_BT87X is not set |
| 1236 | # CONFIG_SND_CA0106 is not set | 1303 | # CONFIG_SND_CA0106 is not set |
| 1237 | # CONFIG_SND_CMIPCI is not set | 1304 | # CONFIG_SND_CMIPCI is not set |
| 1305 | # CONFIG_SND_OXYGEN is not set | ||
| 1238 | # CONFIG_SND_CS4281 is not set | 1306 | # CONFIG_SND_CS4281 is not set |
| 1239 | # CONFIG_SND_CS46XX is not set | 1307 | # CONFIG_SND_CS46XX is not set |
| 1240 | # CONFIG_SND_DARLA20 is not set | 1308 | # CONFIG_SND_DARLA20 is not set |
| @@ -1259,6 +1327,7 @@ CONFIG_SND_AC97_CODEC=m | |||
| 1259 | # CONFIG_SND_HDA_INTEL is not set | 1327 | # CONFIG_SND_HDA_INTEL is not set |
| 1260 | # CONFIG_SND_HDSP is not set | 1328 | # CONFIG_SND_HDSP is not set |
| 1261 | # CONFIG_SND_HDSPM is not set | 1329 | # CONFIG_SND_HDSPM is not set |
| 1330 | # CONFIG_SND_HIFIER is not set | ||
| 1262 | # CONFIG_SND_ICE1712 is not set | 1331 | # CONFIG_SND_ICE1712 is not set |
| 1263 | # CONFIG_SND_ICE1724 is not set | 1332 | # CONFIG_SND_ICE1724 is not set |
| 1264 | # CONFIG_SND_INTEL8X0 is not set | 1333 | # CONFIG_SND_INTEL8X0 is not set |
| @@ -1276,43 +1345,26 @@ CONFIG_SND_AC97_CODEC=m | |||
| 1276 | # CONFIG_SND_TRIDENT is not set | 1345 | # CONFIG_SND_TRIDENT is not set |
| 1277 | CONFIG_SND_VIA82XX=m | 1346 | CONFIG_SND_VIA82XX=m |
| 1278 | # CONFIG_SND_VIA82XX_MODEM is not set | 1347 | # CONFIG_SND_VIA82XX_MODEM is not set |
| 1348 | # CONFIG_SND_VIRTUOSO is not set | ||
| 1279 | # CONFIG_SND_VX222 is not set | 1349 | # CONFIG_SND_VX222 is not set |
| 1280 | # CONFIG_SND_YMFPCI is not set | 1350 | # CONFIG_SND_YMFPCI is not set |
| 1281 | # CONFIG_SND_AC97_POWER_SAVE is not set | 1351 | CONFIG_SND_MIPS=y |
| 1282 | 1352 | CONFIG_SND_USB=y | |
| 1283 | # | ||
| 1284 | # ALSA MIPS devices | ||
| 1285 | # | ||
| 1286 | |||
| 1287 | # | ||
| 1288 | # USB devices | ||
| 1289 | # | ||
| 1290 | # CONFIG_SND_USB_AUDIO is not set | 1353 | # CONFIG_SND_USB_AUDIO is not set |
| 1291 | # CONFIG_SND_USB_CAIAQ is not set | 1354 | # CONFIG_SND_USB_CAIAQ is not set |
| 1292 | |||
| 1293 | # | ||
| 1294 | # System on Chip audio support | ||
| 1295 | # | ||
| 1296 | # CONFIG_SND_SOC is not set | 1355 | # CONFIG_SND_SOC is not set |
| 1297 | |||
| 1298 | # | ||
| 1299 | # Open Sound System | ||
| 1300 | # | ||
| 1301 | # CONFIG_SOUND_PRIME is not set | 1356 | # CONFIG_SOUND_PRIME is not set |
| 1302 | CONFIG_AC97_BUS=m | 1357 | CONFIG_AC97_BUS=m |
| 1303 | 1358 | CONFIG_HID_SUPPORT=y | |
| 1304 | # | ||
| 1305 | # HID Devices | ||
| 1306 | # | ||
| 1307 | CONFIG_HID=y | 1359 | CONFIG_HID=y |
| 1308 | # CONFIG_HID_DEBUG is not set | 1360 | # CONFIG_HID_DEBUG is not set |
| 1361 | CONFIG_HIDRAW=y | ||
| 1309 | 1362 | ||
| 1310 | # | 1363 | # |
| 1311 | # USB Input Devices | 1364 | # USB Input Devices |
| 1312 | # | 1365 | # |
| 1313 | CONFIG_USB_HID=m | 1366 | CONFIG_USB_HID=m |
| 1314 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | 1367 | CONFIG_HID_PID=y |
| 1315 | # CONFIG_HID_FF is not set | ||
| 1316 | CONFIG_USB_HIDDEV=y | 1368 | CONFIG_USB_HIDDEV=y |
| 1317 | 1369 | ||
| 1318 | # | 1370 | # |
| @@ -1322,13 +1374,39 @@ CONFIG_USB_HIDDEV=y | |||
| 1322 | # CONFIG_USB_MOUSE is not set | 1374 | # CONFIG_USB_MOUSE is not set |
| 1323 | 1375 | ||
| 1324 | # | 1376 | # |
| 1325 | # USB support | 1377 | # Special HID drivers |
| 1326 | # | 1378 | # |
| 1379 | CONFIG_HID_COMPAT=y | ||
| 1380 | CONFIG_HID_A4TECH=m | ||
| 1381 | CONFIG_HID_APPLE=m | ||
| 1382 | CONFIG_HID_BELKIN=m | ||
| 1383 | CONFIG_HID_BRIGHT=m | ||
| 1384 | CONFIG_HID_CHERRY=m | ||
| 1385 | CONFIG_HID_CHICONY=m | ||
| 1386 | CONFIG_HID_CYPRESS=m | ||
| 1387 | CONFIG_HID_DELL=m | ||
| 1388 | CONFIG_HID_EZKEY=m | ||
| 1389 | CONFIG_HID_GYRATION=m | ||
| 1390 | CONFIG_HID_LOGITECH=m | ||
| 1391 | CONFIG_LOGITECH_FF=y | ||
| 1392 | CONFIG_LOGIRUMBLEPAD2_FF=y | ||
| 1393 | CONFIG_HID_MICROSOFT=m | ||
| 1394 | CONFIG_HID_MONTEREY=m | ||
| 1395 | CONFIG_HID_PANTHERLORD=m | ||
| 1396 | # CONFIG_PANTHERLORD_FF is not set | ||
| 1397 | CONFIG_HID_PETALYNX=m | ||
| 1398 | CONFIG_HID_SAMSUNG=m | ||
| 1399 | CONFIG_HID_SONY=m | ||
| 1400 | CONFIG_HID_SUNPLUS=m | ||
| 1401 | # CONFIG_THRUSTMASTER_FF is not set | ||
| 1402 | CONFIG_ZEROPLUS_FF=m | ||
| 1403 | CONFIG_USB_SUPPORT=y | ||
| 1327 | CONFIG_USB_ARCH_HAS_HCD=y | 1404 | CONFIG_USB_ARCH_HAS_HCD=y |
| 1328 | CONFIG_USB_ARCH_HAS_OHCI=y | 1405 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 1329 | CONFIG_USB_ARCH_HAS_EHCI=y | 1406 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 1330 | CONFIG_USB=y | 1407 | CONFIG_USB=y |
| 1331 | # CONFIG_USB_DEBUG is not set | 1408 | # CONFIG_USB_DEBUG is not set |
| 1409 | CONFIG_USB_ANNOUNCE_NEW_DEVICES=y | ||
| 1332 | 1410 | ||
| 1333 | # | 1411 | # |
| 1334 | # Miscellaneous USB options | 1412 | # Miscellaneous USB options |
| @@ -1338,35 +1416,46 @@ CONFIG_USB_DEVICEFS=y | |||
| 1338 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1416 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 1339 | # CONFIG_USB_SUSPEND is not set | 1417 | # CONFIG_USB_SUSPEND is not set |
| 1340 | # CONFIG_USB_OTG is not set | 1418 | # CONFIG_USB_OTG is not set |
| 1419 | CONFIG_USB_OTG_WHITELIST=y | ||
| 1420 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 1421 | # CONFIG_USB_MON is not set | ||
| 1422 | # CONFIG_USB_WUSB is not set | ||
| 1423 | CONFIG_USB_WUSB_CBAF=m | ||
| 1424 | # CONFIG_USB_WUSB_CBAF_DEBUG is not set | ||
| 1341 | 1425 | ||
| 1342 | # | 1426 | # |
| 1343 | # USB Host Controller Drivers | 1427 | # USB Host Controller Drivers |
| 1344 | # | 1428 | # |
| 1429 | CONFIG_USB_C67X00_HCD=m | ||
| 1345 | CONFIG_USB_EHCI_HCD=y | 1430 | CONFIG_USB_EHCI_HCD=y |
| 1346 | CONFIG_USB_EHCI_SPLIT_ISO=y | ||
| 1347 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 1431 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
| 1348 | CONFIG_USB_EHCI_TT_NEWSCHED=y | 1432 | CONFIG_USB_EHCI_TT_NEWSCHED=y |
| 1349 | # CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set | ||
| 1350 | # CONFIG_USB_ISP116X_HCD is not set | 1433 | # CONFIG_USB_ISP116X_HCD is not set |
| 1434 | CONFIG_USB_ISP1760_HCD=m | ||
| 1351 | CONFIG_USB_OHCI_HCD=y | 1435 | CONFIG_USB_OHCI_HCD=y |
| 1352 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 1436 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
| 1353 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | 1437 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set |
| 1354 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | 1438 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y |
| 1355 | CONFIG_USB_UHCI_HCD=m | 1439 | CONFIG_USB_UHCI_HCD=m |
| 1356 | # CONFIG_USB_SL811_HCD is not set | 1440 | # CONFIG_USB_SL811_HCD is not set |
| 1441 | CONFIG_USB_R8A66597_HCD=m | ||
| 1442 | # CONFIG_USB_WHCI_HCD is not set | ||
| 1443 | # CONFIG_USB_HWA_HCD is not set | ||
| 1357 | 1444 | ||
| 1358 | # | 1445 | # |
| 1359 | # USB Device Class drivers | 1446 | # USB Device Class drivers |
| 1360 | # | 1447 | # |
| 1361 | CONFIG_USB_ACM=y | 1448 | CONFIG_USB_ACM=y |
| 1362 | CONFIG_USB_PRINTER=y | 1449 | CONFIG_USB_PRINTER=y |
| 1450 | CONFIG_USB_WDM=m | ||
| 1451 | CONFIG_USB_TMC=m | ||
| 1363 | 1452 | ||
| 1364 | # | 1453 | # |
| 1365 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1454 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; |
| 1366 | # | 1455 | # |
| 1367 | 1456 | ||
| 1368 | # | 1457 | # |
| 1369 | # may also be needed; see USB_STORAGE Help for more information | 1458 | # see USB_STORAGE Help for more information |
| 1370 | # | 1459 | # |
| 1371 | CONFIG_USB_STORAGE=y | 1460 | CONFIG_USB_STORAGE=y |
| 1372 | # CONFIG_USB_STORAGE_DEBUG is not set | 1461 | # CONFIG_USB_STORAGE_DEBUG is not set |
| @@ -1379,7 +1468,9 @@ CONFIG_USB_STORAGE=y | |||
| 1379 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1468 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| 1380 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1469 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 1381 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1470 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1471 | CONFIG_USB_STORAGE_ONETOUCH=y | ||
| 1382 | # CONFIG_USB_STORAGE_KARMA is not set | 1472 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1473 | CONFIG_USB_STORAGE_CYPRESS_ATACB=y | ||
| 1383 | CONFIG_USB_LIBUSUAL=y | 1474 | CONFIG_USB_LIBUSUAL=y |
| 1384 | 1475 | ||
| 1385 | # | 1476 | # |
| @@ -1387,15 +1478,10 @@ CONFIG_USB_LIBUSUAL=y | |||
| 1387 | # | 1478 | # |
| 1388 | # CONFIG_USB_MDC800 is not set | 1479 | # CONFIG_USB_MDC800 is not set |
| 1389 | # CONFIG_USB_MICROTEK is not set | 1480 | # CONFIG_USB_MICROTEK is not set |
| 1390 | # CONFIG_USB_MON is not set | ||
| 1391 | 1481 | ||
| 1392 | # | 1482 | # |
| 1393 | # USB port drivers | 1483 | # USB port drivers |
| 1394 | # | 1484 | # |
| 1395 | |||
| 1396 | # | ||
| 1397 | # USB Serial Converter support | ||
| 1398 | # | ||
| 1399 | # CONFIG_USB_SERIAL is not set | 1485 | # CONFIG_USB_SERIAL is not set |
| 1400 | 1486 | ||
| 1401 | # | 1487 | # |
| @@ -1404,7 +1490,7 @@ CONFIG_USB_LIBUSUAL=y | |||
| 1404 | # CONFIG_USB_EMI62 is not set | 1490 | # CONFIG_USB_EMI62 is not set |
| 1405 | # CONFIG_USB_EMI26 is not set | 1491 | # CONFIG_USB_EMI26 is not set |
| 1406 | # CONFIG_USB_ADUTUX is not set | 1492 | # CONFIG_USB_ADUTUX is not set |
| 1407 | # CONFIG_USB_AUERSWALD is not set | 1493 | CONFIG_USB_SEVSEG=m |
| 1408 | # CONFIG_USB_RIO500 is not set | 1494 | # CONFIG_USB_RIO500 is not set |
| 1409 | # CONFIG_USB_LEGOTOWER is not set | 1495 | # CONFIG_USB_LEGOTOWER is not set |
| 1410 | # CONFIG_USB_LCD is not set | 1496 | # CONFIG_USB_LCD is not set |
| @@ -1421,56 +1507,75 @@ CONFIG_USB_LIBUSUAL=y | |||
| 1421 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1507 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 1422 | # CONFIG_USB_IOWARRIOR is not set | 1508 | # CONFIG_USB_IOWARRIOR is not set |
| 1423 | # CONFIG_USB_TEST is not set | 1509 | # CONFIG_USB_TEST is not set |
| 1424 | 1510 | CONFIG_USB_ISIGHTFW=m | |
| 1425 | # | 1511 | CONFIG_USB_VST=m |
| 1426 | # USB DSL modem support | ||
| 1427 | # | ||
| 1428 | |||
| 1429 | # | ||
| 1430 | # USB Gadget Support | ||
| 1431 | # | ||
| 1432 | # CONFIG_USB_GADGET is not set | 1512 | # CONFIG_USB_GADGET is not set |
| 1513 | # CONFIG_UWB is not set | ||
| 1433 | # CONFIG_MMC is not set | 1514 | # CONFIG_MMC is not set |
| 1434 | 1515 | # CONFIG_MEMSTICK is not set | |
| 1435 | # | ||
| 1436 | # LED devices | ||
| 1437 | # | ||
| 1438 | # CONFIG_NEW_LEDS is not set | 1516 | # CONFIG_NEW_LEDS is not set |
| 1439 | 1517 | # CONFIG_ACCESSIBILITY is not set | |
| 1440 | # | ||
| 1441 | # LED drivers | ||
| 1442 | # | ||
| 1443 | |||
| 1444 | # | ||
| 1445 | # LED Triggers | ||
| 1446 | # | ||
| 1447 | |||
| 1448 | # | ||
| 1449 | # InfiniBand support | ||
| 1450 | # | ||
| 1451 | # CONFIG_INFINIBAND is not set | 1518 | # CONFIG_INFINIBAND is not set |
| 1519 | CONFIG_RTC_LIB=y | ||
| 1520 | CONFIG_RTC_CLASS=m | ||
| 1452 | 1521 | ||
| 1453 | # | 1522 | # |
| 1454 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | 1523 | # RTC interfaces |
| 1455 | # | 1524 | # |
| 1525 | CONFIG_RTC_INTF_SYSFS=y | ||
| 1526 | CONFIG_RTC_INTF_PROC=y | ||
| 1527 | CONFIG_RTC_INTF_DEV=y | ||
| 1528 | CONFIG_RTC_INTF_DEV_UIE_EMUL=y | ||
| 1529 | # CONFIG_RTC_DRV_TEST is not set | ||
| 1456 | 1530 | ||
| 1457 | # | 1531 | # |
| 1458 | # Real Time Clock | 1532 | # I2C RTC drivers |
| 1459 | # | 1533 | # |
| 1460 | # CONFIG_RTC_CLASS is not set | 1534 | # CONFIG_RTC_DRV_DS1307 is not set |
| 1535 | # CONFIG_RTC_DRV_DS1374 is not set | ||
| 1536 | # CONFIG_RTC_DRV_DS1672 is not set | ||
| 1537 | # CONFIG_RTC_DRV_MAX6900 is not set | ||
| 1538 | # CONFIG_RTC_DRV_RS5C372 is not set | ||
| 1539 | # CONFIG_RTC_DRV_ISL1208 is not set | ||
| 1540 | # CONFIG_RTC_DRV_X1205 is not set | ||
| 1541 | # CONFIG_RTC_DRV_PCF8563 is not set | ||
| 1542 | # CONFIG_RTC_DRV_PCF8583 is not set | ||
| 1543 | # CONFIG_RTC_DRV_M41T80 is not set | ||
| 1544 | # CONFIG_RTC_DRV_S35390A is not set | ||
| 1545 | # CONFIG_RTC_DRV_FM3130 is not set | ||
| 1546 | # CONFIG_RTC_DRV_RX8581 is not set | ||
| 1461 | 1547 | ||
| 1462 | # | 1548 | # |
| 1463 | # DMA Engine support | 1549 | # SPI RTC drivers |
| 1464 | # | 1550 | # |
| 1465 | # CONFIG_DMA_ENGINE is not set | ||
| 1466 | 1551 | ||
| 1467 | # | 1552 | # |
| 1468 | # DMA Clients | 1553 | # Platform RTC drivers |
| 1469 | # | 1554 | # |
| 1555 | CONFIG_RTC_DRV_CMOS=m | ||
| 1556 | # CONFIG_RTC_DRV_DS1286 is not set | ||
| 1557 | # CONFIG_RTC_DRV_DS1511 is not set | ||
| 1558 | # CONFIG_RTC_DRV_DS1553 is not set | ||
| 1559 | # CONFIG_RTC_DRV_DS1742 is not set | ||
| 1560 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 1561 | # CONFIG_RTC_DRV_M48T86 is not set | ||
| 1562 | # CONFIG_RTC_DRV_M48T35 is not set | ||
| 1563 | # CONFIG_RTC_DRV_M48T59 is not set | ||
| 1564 | # CONFIG_RTC_DRV_BQ4802 is not set | ||
| 1565 | # CONFIG_RTC_DRV_V3020 is not set | ||
| 1470 | 1566 | ||
| 1471 | # | 1567 | # |
| 1472 | # DMA Devices | 1568 | # on-CPU RTC drivers |
| 1473 | # | 1569 | # |
| 1570 | # CONFIG_DMADEVICES is not set | ||
| 1571 | CONFIG_UIO=m | ||
| 1572 | CONFIG_UIO_CIF=m | ||
| 1573 | # CONFIG_UIO_PDRV is not set | ||
| 1574 | # CONFIG_UIO_PDRV_GENIRQ is not set | ||
| 1575 | # CONFIG_UIO_SMX is not set | ||
| 1576 | # CONFIG_UIO_SERCOS3 is not set | ||
| 1577 | # CONFIG_STAGING is not set | ||
| 1578 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 1474 | 1579 | ||
| 1475 | # | 1580 | # |
| 1476 | # File systems | 1581 | # File systems |
| @@ -1478,27 +1583,31 @@ CONFIG_USB_LIBUSUAL=y | |||
| 1478 | CONFIG_EXT2_FS=y | 1583 | CONFIG_EXT2_FS=y |
| 1479 | # CONFIG_EXT2_FS_XATTR is not set | 1584 | # CONFIG_EXT2_FS_XATTR is not set |
| 1480 | CONFIG_EXT2_FS_XIP=y | 1585 | CONFIG_EXT2_FS_XIP=y |
| 1481 | CONFIG_FS_XIP=y | ||
| 1482 | CONFIG_EXT3_FS=y | 1586 | CONFIG_EXT3_FS=y |
| 1483 | # CONFIG_EXT3_FS_XATTR is not set | 1587 | # CONFIG_EXT3_FS_XATTR is not set |
| 1484 | # CONFIG_EXT4DEV_FS is not set | 1588 | CONFIG_EXT4_FS=m |
| 1589 | CONFIG_EXT4DEV_COMPAT=y | ||
| 1590 | CONFIG_EXT4_FS_XATTR=y | ||
| 1591 | CONFIG_EXT4_FS_POSIX_ACL=y | ||
| 1592 | CONFIG_EXT4_FS_SECURITY=y | ||
| 1593 | CONFIG_FS_XIP=y | ||
| 1485 | CONFIG_JBD=y | 1594 | CONFIG_JBD=y |
| 1486 | # CONFIG_JBD_DEBUG is not set | 1595 | CONFIG_JBD2=m |
| 1596 | CONFIG_FS_MBCACHE=m | ||
| 1487 | CONFIG_REISERFS_FS=m | 1597 | CONFIG_REISERFS_FS=m |
| 1488 | # CONFIG_REISERFS_CHECK is not set | 1598 | # CONFIG_REISERFS_CHECK is not set |
| 1489 | # CONFIG_REISERFS_PROC_INFO is not set | 1599 | # CONFIG_REISERFS_PROC_INFO is not set |
| 1490 | # CONFIG_REISERFS_FS_XATTR is not set | 1600 | # CONFIG_REISERFS_FS_XATTR is not set |
| 1491 | # CONFIG_JFS_FS is not set | 1601 | # CONFIG_JFS_FS is not set |
| 1492 | CONFIG_FS_POSIX_ACL=y | 1602 | CONFIG_FS_POSIX_ACL=y |
| 1603 | CONFIG_FILE_LOCKING=y | ||
| 1493 | # CONFIG_XFS_FS is not set | 1604 | # CONFIG_XFS_FS is not set |
| 1494 | # CONFIG_GFS2_FS is not set | 1605 | # CONFIG_GFS2_FS is not set |
| 1495 | # CONFIG_OCFS2_FS is not set | 1606 | # CONFIG_OCFS2_FS is not set |
| 1496 | # CONFIG_MINIX_FS is not set | 1607 | CONFIG_DNOTIFY=y |
| 1497 | # CONFIG_ROMFS_FS is not set | ||
| 1498 | CONFIG_INOTIFY=y | 1608 | CONFIG_INOTIFY=y |
| 1499 | CONFIG_INOTIFY_USER=y | 1609 | CONFIG_INOTIFY_USER=y |
| 1500 | # CONFIG_QUOTA is not set | 1610 | # CONFIG_QUOTA is not set |
| 1501 | CONFIG_DNOTIFY=y | ||
| 1502 | CONFIG_AUTOFS_FS=y | 1611 | CONFIG_AUTOFS_FS=y |
| 1503 | CONFIG_AUTOFS4_FS=y | 1612 | CONFIG_AUTOFS4_FS=y |
| 1504 | CONFIG_FUSE_FS=y | 1613 | CONFIG_FUSE_FS=y |
| @@ -1530,11 +1639,11 @@ CONFIG_NTFS_RW=y | |||
| 1530 | CONFIG_PROC_FS=y | 1639 | CONFIG_PROC_FS=y |
| 1531 | CONFIG_PROC_KCORE=y | 1640 | CONFIG_PROC_KCORE=y |
| 1532 | CONFIG_PROC_SYSCTL=y | 1641 | CONFIG_PROC_SYSCTL=y |
| 1642 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 1533 | CONFIG_SYSFS=y | 1643 | CONFIG_SYSFS=y |
| 1534 | CONFIG_TMPFS=y | 1644 | CONFIG_TMPFS=y |
| 1535 | # CONFIG_TMPFS_POSIX_ACL is not set | 1645 | # CONFIG_TMPFS_POSIX_ACL is not set |
| 1536 | # CONFIG_HUGETLB_PAGE is not set | 1646 | # CONFIG_HUGETLB_PAGE is not set |
| 1537 | CONFIG_RAMFS=y | ||
| 1538 | # CONFIG_CONFIGFS_FS is not set | 1647 | # CONFIG_CONFIGFS_FS is not set |
| 1539 | 1648 | ||
| 1540 | # | 1649 | # |
| @@ -1550,25 +1659,23 @@ CONFIG_RAMFS=y | |||
| 1550 | # CONFIG_JFFS2_FS is not set | 1659 | # CONFIG_JFFS2_FS is not set |
| 1551 | # CONFIG_CRAMFS is not set | 1660 | # CONFIG_CRAMFS is not set |
| 1552 | # CONFIG_VXFS_FS is not set | 1661 | # CONFIG_VXFS_FS is not set |
| 1662 | # CONFIG_MINIX_FS is not set | ||
| 1663 | CONFIG_OMFS_FS=m | ||
| 1553 | # CONFIG_HPFS_FS is not set | 1664 | # CONFIG_HPFS_FS is not set |
| 1554 | # CONFIG_QNX4FS_FS is not set | 1665 | # CONFIG_QNX4FS_FS is not set |
| 1666 | # CONFIG_ROMFS_FS is not set | ||
| 1555 | # CONFIG_SYSV_FS is not set | 1667 | # CONFIG_SYSV_FS is not set |
| 1556 | # CONFIG_UFS_FS is not set | 1668 | # CONFIG_UFS_FS is not set |
| 1557 | 1669 | CONFIG_NETWORK_FILESYSTEMS=y | |
| 1558 | # | ||
| 1559 | # Network File Systems | ||
| 1560 | # | ||
| 1561 | CONFIG_NFS_FS=m | 1670 | CONFIG_NFS_FS=m |
| 1562 | CONFIG_NFS_V3=y | 1671 | CONFIG_NFS_V3=y |
| 1563 | CONFIG_NFS_V3_ACL=y | 1672 | CONFIG_NFS_V3_ACL=y |
| 1564 | CONFIG_NFS_V4=y | 1673 | CONFIG_NFS_V4=y |
| 1565 | CONFIG_NFS_DIRECTIO=y | ||
| 1566 | CONFIG_NFSD=m | 1674 | CONFIG_NFSD=m |
| 1567 | CONFIG_NFSD_V2_ACL=y | 1675 | CONFIG_NFSD_V2_ACL=y |
| 1568 | CONFIG_NFSD_V3=y | 1676 | CONFIG_NFSD_V3=y |
| 1569 | CONFIG_NFSD_V3_ACL=y | 1677 | CONFIG_NFSD_V3_ACL=y |
| 1570 | CONFIG_NFSD_V4=y | 1678 | CONFIG_NFSD_V4=y |
| 1571 | CONFIG_NFSD_TCP=y | ||
| 1572 | CONFIG_LOCKD=m | 1679 | CONFIG_LOCKD=m |
| 1573 | CONFIG_LOCKD_V4=y | 1680 | CONFIG_LOCKD_V4=y |
| 1574 | CONFIG_EXPORTFS=m | 1681 | CONFIG_EXPORTFS=m |
| @@ -1576,7 +1683,7 @@ CONFIG_NFS_ACL_SUPPORT=m | |||
| 1576 | CONFIG_NFS_COMMON=y | 1683 | CONFIG_NFS_COMMON=y |
| 1577 | CONFIG_SUNRPC=m | 1684 | CONFIG_SUNRPC=m |
| 1578 | CONFIG_SUNRPC_GSS=m | 1685 | CONFIG_SUNRPC_GSS=m |
| 1579 | # CONFIG_SUNRPC_BIND34 is not set | 1686 | # CONFIG_SUNRPC_REGISTER_V4 is not set |
| 1580 | CONFIG_RPCSEC_GSS_KRB5=m | 1687 | CONFIG_RPCSEC_GSS_KRB5=m |
| 1581 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1688 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1582 | CONFIG_SMB_FS=m | 1689 | CONFIG_SMB_FS=m |
| @@ -1616,10 +1723,6 @@ CONFIG_MSDOS_PARTITION=y | |||
| 1616 | # CONFIG_KARMA_PARTITION is not set | 1723 | # CONFIG_KARMA_PARTITION is not set |
| 1617 | # CONFIG_EFI_PARTITION is not set | 1724 | # CONFIG_EFI_PARTITION is not set |
| 1618 | # CONFIG_SYSV68_PARTITION is not set | 1725 | # CONFIG_SYSV68_PARTITION is not set |
| 1619 | |||
| 1620 | # | ||
| 1621 | # Native Language Support | ||
| 1622 | # | ||
| 1623 | CONFIG_NLS=y | 1726 | CONFIG_NLS=y |
| 1624 | CONFIG_NLS_DEFAULT="utf8" | 1727 | CONFIG_NLS_DEFAULT="utf8" |
| 1625 | # CONFIG_NLS_CODEPAGE_437 is not set | 1728 | # CONFIG_NLS_CODEPAGE_437 is not set |
| @@ -1660,30 +1763,31 @@ CONFIG_NLS_ISO8859_1=y | |||
| 1660 | # CONFIG_NLS_KOI8_R is not set | 1763 | # CONFIG_NLS_KOI8_R is not set |
| 1661 | # CONFIG_NLS_KOI8_U is not set | 1764 | # CONFIG_NLS_KOI8_U is not set |
| 1662 | CONFIG_NLS_UTF8=y | 1765 | CONFIG_NLS_UTF8=y |
| 1663 | |||
| 1664 | # | ||
| 1665 | # Distributed Lock Manager | ||
| 1666 | # | ||
| 1667 | # CONFIG_DLM is not set | 1766 | # CONFIG_DLM is not set |
| 1668 | 1767 | ||
| 1669 | # | 1768 | # |
| 1670 | # Profiling support | ||
| 1671 | # | ||
| 1672 | CONFIG_PROFILING=y | ||
| 1673 | CONFIG_OPROFILE=m | ||
| 1674 | |||
| 1675 | # | ||
| 1676 | # Kernel hacking | 1769 | # Kernel hacking |
| 1677 | # | 1770 | # |
| 1678 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 1771 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
| 1679 | # CONFIG_PRINTK_TIME is not set | 1772 | # CONFIG_PRINTK_TIME is not set |
| 1773 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
| 1680 | # CONFIG_ENABLE_MUST_CHECK is not set | 1774 | # CONFIG_ENABLE_MUST_CHECK is not set |
| 1775 | CONFIG_FRAME_WARN=2048 | ||
| 1681 | # CONFIG_MAGIC_SYSRQ is not set | 1776 | # CONFIG_MAGIC_SYSRQ is not set |
| 1682 | # CONFIG_UNUSED_SYMBOLS is not set | 1777 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1683 | # CONFIG_DEBUG_FS is not set | 1778 | # CONFIG_DEBUG_FS is not set |
| 1684 | # CONFIG_HEADERS_CHECK is not set | 1779 | # CONFIG_HEADERS_CHECK is not set |
| 1685 | # CONFIG_DEBUG_KERNEL is not set | 1780 | # CONFIG_DEBUG_KERNEL is not set |
| 1686 | CONFIG_CROSSCOMPILE=y | 1781 | # CONFIG_DEBUG_MEMORY_INIT is not set |
| 1782 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
| 1783 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1784 | |||
| 1785 | # | ||
| 1786 | # Tracers | ||
| 1787 | # | ||
| 1788 | CONFIG_DYNAMIC_PRINTK_DEBUG=y | ||
| 1789 | # CONFIG_SAMPLES is not set | ||
| 1790 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1687 | CONFIG_CMDLINE="" | 1791 | CONFIG_CMDLINE="" |
| 1688 | 1792 | ||
| 1689 | # | 1793 | # |
| @@ -1691,64 +1795,113 @@ CONFIG_CMDLINE="" | |||
| 1691 | # | 1795 | # |
| 1692 | # CONFIG_KEYS is not set | 1796 | # CONFIG_KEYS is not set |
| 1693 | # CONFIG_SECURITY is not set | 1797 | # CONFIG_SECURITY is not set |
| 1798 | # CONFIG_SECURITYFS is not set | ||
| 1799 | CONFIG_SECURITY_FILE_CAPABILITIES=y | ||
| 1800 | CONFIG_CRYPTO=y | ||
| 1694 | 1801 | ||
| 1695 | # | 1802 | # |
| 1696 | # Cryptographic options | 1803 | # Crypto core or helper |
| 1697 | # | 1804 | # |
| 1698 | CONFIG_CRYPTO=y | 1805 | CONFIG_CRYPTO_FIPS=y |
| 1699 | CONFIG_CRYPTO_ALGAPI=y | 1806 | CONFIG_CRYPTO_ALGAPI=y |
| 1700 | CONFIG_CRYPTO_BLKCIPHER=m | 1807 | CONFIG_CRYPTO_AEAD=y |
| 1808 | CONFIG_CRYPTO_BLKCIPHER=y | ||
| 1701 | CONFIG_CRYPTO_HASH=y | 1809 | CONFIG_CRYPTO_HASH=y |
| 1810 | CONFIG_CRYPTO_RNG=y | ||
| 1702 | CONFIG_CRYPTO_MANAGER=y | 1811 | CONFIG_CRYPTO_MANAGER=y |
| 1812 | CONFIG_CRYPTO_GF128MUL=m | ||
| 1813 | # CONFIG_CRYPTO_NULL is not set | ||
| 1814 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1815 | CONFIG_CRYPTO_AUTHENC=m | ||
| 1816 | # CONFIG_CRYPTO_TEST is not set | ||
| 1817 | |||
| 1818 | # | ||
| 1819 | # Authenticated Encryption with Associated Data | ||
| 1820 | # | ||
| 1821 | CONFIG_CRYPTO_CCM=m | ||
| 1822 | CONFIG_CRYPTO_GCM=m | ||
| 1823 | CONFIG_CRYPTO_SEQIV=m | ||
| 1824 | |||
| 1825 | # | ||
| 1826 | # Block modes | ||
| 1827 | # | ||
| 1828 | CONFIG_CRYPTO_CBC=m | ||
| 1829 | CONFIG_CRYPTO_CTR=m | ||
| 1830 | CONFIG_CRYPTO_CTS=m | ||
| 1831 | CONFIG_CRYPTO_ECB=m | ||
| 1832 | # CONFIG_CRYPTO_LRW is not set | ||
| 1833 | CONFIG_CRYPTO_PCBC=m | ||
| 1834 | CONFIG_CRYPTO_XTS=m | ||
| 1835 | |||
| 1836 | # | ||
| 1837 | # Hash modes | ||
| 1838 | # | ||
| 1703 | CONFIG_CRYPTO_HMAC=y | 1839 | CONFIG_CRYPTO_HMAC=y |
| 1704 | # CONFIG_CRYPTO_XCBC is not set | 1840 | # CONFIG_CRYPTO_XCBC is not set |
| 1705 | # CONFIG_CRYPTO_NULL is not set | 1841 | |
| 1842 | # | ||
| 1843 | # Digest | ||
| 1844 | # | ||
| 1845 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1706 | # CONFIG_CRYPTO_MD4 is not set | 1846 | # CONFIG_CRYPTO_MD4 is not set |
| 1707 | CONFIG_CRYPTO_MD5=m | 1847 | CONFIG_CRYPTO_MD5=m |
| 1848 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1849 | CONFIG_CRYPTO_RMD128=m | ||
| 1850 | CONFIG_CRYPTO_RMD160=m | ||
| 1851 | CONFIG_CRYPTO_RMD256=m | ||
| 1852 | CONFIG_CRYPTO_RMD320=m | ||
| 1708 | CONFIG_CRYPTO_SHA1=m | 1853 | CONFIG_CRYPTO_SHA1=m |
| 1709 | # CONFIG_CRYPTO_SHA256 is not set | 1854 | # CONFIG_CRYPTO_SHA256 is not set |
| 1710 | # CONFIG_CRYPTO_SHA512 is not set | 1855 | # CONFIG_CRYPTO_SHA512 is not set |
| 1711 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1712 | # CONFIG_CRYPTO_TGR192 is not set | 1856 | # CONFIG_CRYPTO_TGR192 is not set |
| 1713 | # CONFIG_CRYPTO_GF128MUL is not set | 1857 | # CONFIG_CRYPTO_WP512 is not set |
| 1714 | CONFIG_CRYPTO_ECB=m | 1858 | |
| 1715 | CONFIG_CRYPTO_CBC=m | 1859 | # |
| 1716 | CONFIG_CRYPTO_PCBC=m | 1860 | # Ciphers |
| 1717 | # CONFIG_CRYPTO_LRW is not set | 1861 | # |
| 1718 | # CONFIG_CRYPTO_CRYPTD is not set | 1862 | CONFIG_CRYPTO_AES=m |
| 1719 | CONFIG_CRYPTO_DES=m | 1863 | # CONFIG_CRYPTO_ANUBIS is not set |
| 1720 | # CONFIG_CRYPTO_FCRYPT is not set | 1864 | CONFIG_CRYPTO_ARC4=m |
| 1721 | # CONFIG_CRYPTO_BLOWFISH is not set | 1865 | # CONFIG_CRYPTO_BLOWFISH is not set |
| 1722 | # CONFIG_CRYPTO_TWOFISH is not set | 1866 | # CONFIG_CRYPTO_CAMELLIA is not set |
| 1723 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1724 | # CONFIG_CRYPTO_AES is not set | ||
| 1725 | # CONFIG_CRYPTO_CAST5 is not set | 1867 | # CONFIG_CRYPTO_CAST5 is not set |
| 1726 | # CONFIG_CRYPTO_CAST6 is not set | 1868 | # CONFIG_CRYPTO_CAST6 is not set |
| 1727 | # CONFIG_CRYPTO_TEA is not set | 1869 | CONFIG_CRYPTO_DES=m |
| 1728 | CONFIG_CRYPTO_ARC4=m | 1870 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1729 | # CONFIG_CRYPTO_KHAZAD is not set | 1871 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1730 | # CONFIG_CRYPTO_ANUBIS is not set | 1872 | CONFIG_CRYPTO_SALSA20=m |
| 1873 | CONFIG_CRYPTO_SEED=m | ||
| 1874 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1875 | # CONFIG_CRYPTO_TEA is not set | ||
| 1876 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1877 | |||
| 1878 | # | ||
| 1879 | # Compression | ||
| 1880 | # | ||
| 1731 | CONFIG_CRYPTO_DEFLATE=m | 1881 | CONFIG_CRYPTO_DEFLATE=m |
| 1732 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1882 | CONFIG_CRYPTO_LZO=m |
| 1733 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1734 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1735 | # CONFIG_CRYPTO_TEST is not set | ||
| 1736 | 1883 | ||
| 1737 | # | 1884 | # |
| 1738 | # Hardware crypto devices | 1885 | # Random Number Generation |
| 1739 | # | 1886 | # |
| 1887 | CONFIG_CRYPTO_ANSI_CPRNG=m | ||
| 1888 | # CONFIG_CRYPTO_HW is not set | ||
| 1740 | 1889 | ||
| 1741 | # | 1890 | # |
| 1742 | # Library routines | 1891 | # Library routines |
| 1743 | # | 1892 | # |
| 1744 | CONFIG_BITREVERSE=y | 1893 | CONFIG_BITREVERSE=y |
| 1745 | CONFIG_CRC_CCITT=y | 1894 | CONFIG_CRC_CCITT=y |
| 1746 | # CONFIG_CRC16 is not set | 1895 | CONFIG_CRC16=m |
| 1747 | # CONFIG_CRC_ITU_T is not set | 1896 | # CONFIG_CRC_T10DIF is not set |
| 1897 | CONFIG_CRC_ITU_T=m | ||
| 1748 | CONFIG_CRC32=y | 1898 | CONFIG_CRC32=y |
| 1899 | CONFIG_CRC7=m | ||
| 1749 | # CONFIG_LIBCRC32C is not set | 1900 | # CONFIG_LIBCRC32C is not set |
| 1750 | CONFIG_ZLIB_INFLATE=m | 1901 | CONFIG_ZLIB_INFLATE=m |
| 1751 | CONFIG_ZLIB_DEFLATE=m | 1902 | CONFIG_ZLIB_DEFLATE=m |
| 1903 | CONFIG_LZO_COMPRESS=m | ||
| 1904 | CONFIG_LZO_DECOMPRESS=m | ||
| 1752 | CONFIG_TEXTSEARCH=y | 1905 | CONFIG_TEXTSEARCH=y |
| 1753 | CONFIG_TEXTSEARCH_KMP=m | 1906 | CONFIG_TEXTSEARCH_KMP=m |
| 1754 | CONFIG_TEXTSEARCH_BM=m | 1907 | CONFIG_TEXTSEARCH_BM=m |
diff --git a/arch/mips/configs/ip22_defconfig b/arch/mips/configs/ip22_defconfig index f719bf5e01aa..115822876417 100644 --- a/arch/mips/configs/ip22_defconfig +++ b/arch/mips/configs/ip22_defconfig | |||
| @@ -1,30 +1,34 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.23-rc2 | 3 | # Linux kernel version: 2.6.28-rc6 |
| 4 | # Tue Aug 7 12:39:49 2007 | 4 | # Fri Nov 28 15:41:33 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Machine selection | 9 | # Machine selection |
| 10 | # | 10 | # |
| 11 | CONFIG_ZONE_DMA=y | ||
| 12 | # CONFIG_MACH_ALCHEMY is not set | 11 | # CONFIG_MACH_ALCHEMY is not set |
| 13 | # CONFIG_BASLER_EXCITE is not set | 12 | # CONFIG_BASLER_EXCITE is not set |
| 13 | # CONFIG_BCM47XX is not set | ||
| 14 | # CONFIG_MIPS_COBALT is not set | 14 | # CONFIG_MIPS_COBALT is not set |
| 15 | # CONFIG_MACH_DECSTATION is not set | 15 | # CONFIG_MACH_DECSTATION is not set |
| 16 | # CONFIG_MACH_JAZZ is not set | 16 | # CONFIG_MACH_JAZZ is not set |
| 17 | # CONFIG_LASAT is not set | ||
| 17 | # CONFIG_LEMOTE_FULONG is not set | 18 | # CONFIG_LEMOTE_FULONG is not set |
| 18 | # CONFIG_MIPS_MALTA is not set | 19 | # CONFIG_MIPS_MALTA is not set |
| 19 | # CONFIG_MIPS_SIM is not set | 20 | # CONFIG_MIPS_SIM is not set |
| 20 | # CONFIG_MARKEINS is not set | 21 | # CONFIG_MACH_EMMA is not set |
| 21 | # CONFIG_MACH_VR41XX is not set | 22 | # CONFIG_MACH_VR41XX is not set |
| 23 | # CONFIG_NXP_STB220 is not set | ||
| 24 | # CONFIG_NXP_STB225 is not set | ||
| 22 | # CONFIG_PNX8550_JBS is not set | 25 | # CONFIG_PNX8550_JBS is not set |
| 23 | # CONFIG_PNX8550_STB810 is not set | 26 | # CONFIG_PNX8550_STB810 is not set |
| 24 | # CONFIG_PMC_MSP is not set | 27 | # CONFIG_PMC_MSP is not set |
| 25 | # CONFIG_PMC_YOSEMITE is not set | 28 | # CONFIG_PMC_YOSEMITE is not set |
| 26 | CONFIG_SGI_IP22=y | 29 | CONFIG_SGI_IP22=y |
| 27 | # CONFIG_SGI_IP27 is not set | 30 | # CONFIG_SGI_IP27 is not set |
| 31 | # CONFIG_SGI_IP28 is not set | ||
| 28 | # CONFIG_SGI_IP32 is not set | 32 | # CONFIG_SGI_IP32 is not set |
| 29 | # CONFIG_SIBYTE_CRHINE is not set | 33 | # CONFIG_SIBYTE_CRHINE is not set |
| 30 | # CONFIG_SIBYTE_CARMEL is not set | 34 | # CONFIG_SIBYTE_CARMEL is not set |
| @@ -35,34 +39,49 @@ CONFIG_SGI_IP22=y | |||
| 35 | # CONFIG_SIBYTE_SENTOSA is not set | 39 | # CONFIG_SIBYTE_SENTOSA is not set |
| 36 | # CONFIG_SIBYTE_BIGSUR is not set | 40 | # CONFIG_SIBYTE_BIGSUR is not set |
| 37 | # CONFIG_SNI_RM is not set | 41 | # CONFIG_SNI_RM is not set |
| 38 | # CONFIG_TOSHIBA_JMR3927 is not set | 42 | # CONFIG_MACH_TX39XX is not set |
| 39 | # CONFIG_TOSHIBA_RBTX4927 is not set | 43 | # CONFIG_MACH_TX49XX is not set |
| 40 | # CONFIG_TOSHIBA_RBTX4938 is not set | 44 | # CONFIG_MIKROTIK_RB532 is not set |
| 41 | # CONFIG_WR_PPMC is not set | 45 | # CONFIG_WR_PPMC is not set |
| 42 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 46 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 43 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 47 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
| 44 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 48 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
| 49 | CONFIG_ARCH_SUPPORTS_OPROFILE=y | ||
| 45 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 50 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 46 | CONFIG_GENERIC_HWEIGHT=y | 51 | CONFIG_GENERIC_HWEIGHT=y |
| 47 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 52 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 53 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 48 | CONFIG_GENERIC_TIME=y | 54 | CONFIG_GENERIC_TIME=y |
| 55 | CONFIG_GENERIC_CMOS_UPDATE=y | ||
| 49 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 56 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 50 | # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set | 57 | # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set |
| 51 | CONFIG_ARC=y | 58 | CONFIG_ARC=y |
| 59 | CONFIG_CEVT_R4K=y | ||
| 60 | CONFIG_CSRC_R4K=y | ||
| 52 | CONFIG_DMA_NONCOHERENT=y | 61 | CONFIG_DMA_NONCOHERENT=y |
| 53 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 62 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| 54 | CONFIG_EARLY_PRINTK=y | 63 | CONFIG_EARLY_PRINTK=y |
| 55 | CONFIG_SYS_HAS_EARLY_PRINTK=y | 64 | CONFIG_SYS_HAS_EARLY_PRINTK=y |
| 65 | # CONFIG_HOTPLUG_CPU is not set | ||
| 66 | CONFIG_I8259=y | ||
| 56 | # CONFIG_NO_IOPORT is not set | 67 | # CONFIG_NO_IOPORT is not set |
| 68 | CONFIG_GENERIC_ISA_DMA=y | ||
| 57 | CONFIG_GENERIC_ISA_DMA_SUPPORT_BROKEN=y | 69 | CONFIG_GENERIC_ISA_DMA_SUPPORT_BROKEN=y |
| 58 | CONFIG_CPU_BIG_ENDIAN=y | 70 | CONFIG_CPU_BIG_ENDIAN=y |
| 59 | # CONFIG_CPU_LITTLE_ENDIAN is not set | 71 | # CONFIG_CPU_LITTLE_ENDIAN is not set |
| 60 | CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y | 72 | CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y |
| 61 | CONFIG_IRQ_CPU=y | 73 | CONFIG_IRQ_CPU=y |
| 62 | CONFIG_SWAP_IO_SPACE=y | 74 | CONFIG_SWAP_IO_SPACE=y |
| 75 | CONFIG_SGI_HAS_INDYDOG=y | ||
| 76 | CONFIG_SGI_HAS_HAL2=y | ||
| 77 | CONFIG_SGI_HAS_SEEQ=y | ||
| 78 | CONFIG_SGI_HAS_WD93=y | ||
| 79 | CONFIG_SGI_HAS_ZILOG=y | ||
| 80 | CONFIG_SGI_HAS_I8042=y | ||
| 81 | CONFIG_DEFAULT_SGI_PARTITION=y | ||
| 63 | CONFIG_ARC32=y | 82 | CONFIG_ARC32=y |
| 64 | CONFIG_BOOT_ELF32=y | 83 | CONFIG_BOOT_ELF32=y |
| 65 | CONFIG_MIPS_L1_CACHE_SHIFT=5 | 84 | CONFIG_MIPS_L1_CACHE_SHIFT=7 |
| 66 | CONFIG_ARC_CONSOLE=y | 85 | CONFIG_ARC_CONSOLE=y |
| 67 | CONFIG_ARC_PROMLIB=y | 86 | CONFIG_ARC_PROMLIB=y |
| 68 | 87 | ||
| @@ -82,6 +101,7 @@ CONFIG_ARC_PROMLIB=y | |||
| 82 | # CONFIG_CPU_TX49XX is not set | 101 | # CONFIG_CPU_TX49XX is not set |
| 83 | CONFIG_CPU_R5000=y | 102 | CONFIG_CPU_R5000=y |
| 84 | # CONFIG_CPU_R5432 is not set | 103 | # CONFIG_CPU_R5432 is not set |
| 104 | # CONFIG_CPU_R5500 is not set | ||
| 85 | # CONFIG_CPU_R6000 is not set | 105 | # CONFIG_CPU_R6000 is not set |
| 86 | # CONFIG_CPU_NEVADA is not set | 106 | # CONFIG_CPU_NEVADA is not set |
| 87 | # CONFIG_CPU_R8000 is not set | 107 | # CONFIG_CPU_R8000 is not set |
| @@ -115,18 +135,24 @@ CONFIG_CPU_HAS_SYNC=y | |||
| 115 | CONFIG_GENERIC_HARDIRQS=y | 135 | CONFIG_GENERIC_HARDIRQS=y |
| 116 | CONFIG_GENERIC_IRQ_PROBE=y | 136 | CONFIG_GENERIC_IRQ_PROBE=y |
| 117 | CONFIG_ARCH_FLATMEM_ENABLE=y | 137 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 138 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
| 118 | CONFIG_SELECT_MEMORY_MODEL=y | 139 | CONFIG_SELECT_MEMORY_MODEL=y |
| 119 | CONFIG_FLATMEM_MANUAL=y | 140 | CONFIG_FLATMEM_MANUAL=y |
| 120 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 141 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| 121 | # CONFIG_SPARSEMEM_MANUAL is not set | 142 | # CONFIG_SPARSEMEM_MANUAL is not set |
| 122 | CONFIG_FLATMEM=y | 143 | CONFIG_FLATMEM=y |
| 123 | CONFIG_FLAT_NODE_MEM_MAP=y | 144 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 124 | # CONFIG_SPARSEMEM_STATIC is not set | 145 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 125 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 146 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 126 | # CONFIG_RESOURCES_64BIT is not set | 147 | # CONFIG_RESOURCES_64BIT is not set |
| 127 | CONFIG_ZONE_DMA_FLAG=1 | 148 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
| 128 | CONFIG_BOUNCE=y | 149 | CONFIG_ZONE_DMA_FLAG=0 |
| 129 | CONFIG_VIRT_TO_BUS=y | 150 | CONFIG_VIRT_TO_BUS=y |
| 151 | CONFIG_UNEVICTABLE_LRU=y | ||
| 152 | CONFIG_TICK_ONESHOT=y | ||
| 153 | CONFIG_NO_HZ=y | ||
| 154 | CONFIG_HIGH_RES_TIMERS=y | ||
| 155 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 130 | # CONFIG_HZ_48 is not set | 156 | # CONFIG_HZ_48 is not set |
| 131 | # CONFIG_HZ_100 is not set | 157 | # CONFIG_HZ_100 is not set |
| 132 | # CONFIG_HZ_128 is not set | 158 | # CONFIG_HZ_128 is not set |
| @@ -159,13 +185,20 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
| 159 | # CONFIG_POSIX_MQUEUE is not set | 185 | # CONFIG_POSIX_MQUEUE is not set |
| 160 | # CONFIG_BSD_PROCESS_ACCT is not set | 186 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 161 | # CONFIG_TASKSTATS is not set | 187 | # CONFIG_TASKSTATS is not set |
| 162 | # CONFIG_USER_NS is not set | ||
| 163 | # CONFIG_AUDIT is not set | 188 | # CONFIG_AUDIT is not set |
| 164 | CONFIG_IKCONFIG=y | 189 | CONFIG_IKCONFIG=y |
| 165 | CONFIG_IKCONFIG_PROC=y | 190 | CONFIG_IKCONFIG_PROC=y |
| 166 | CONFIG_LOG_BUF_SHIFT=14 | 191 | CONFIG_LOG_BUF_SHIFT=14 |
| 192 | # CONFIG_CGROUPS is not set | ||
| 193 | # CONFIG_GROUP_SCHED is not set | ||
| 167 | CONFIG_SYSFS_DEPRECATED=y | 194 | CONFIG_SYSFS_DEPRECATED=y |
| 195 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 168 | CONFIG_RELAY=y | 196 | CONFIG_RELAY=y |
| 197 | CONFIG_NAMESPACES=y | ||
| 198 | CONFIG_UTS_NS=y | ||
| 199 | CONFIG_IPC_NS=y | ||
| 200 | CONFIG_USER_NS=y | ||
| 201 | CONFIG_PID_NS=y | ||
| 169 | # CONFIG_BLK_DEV_INITRD is not set | 202 | # CONFIG_BLK_DEV_INITRD is not set |
| 170 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 203 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 171 | CONFIG_SYSCTL=y | 204 | CONFIG_SYSCTL=y |
| @@ -177,6 +210,8 @@ CONFIG_KALLSYMS=y | |||
| 177 | CONFIG_PRINTK=y | 210 | CONFIG_PRINTK=y |
| 178 | CONFIG_BUG=y | 211 | CONFIG_BUG=y |
| 179 | CONFIG_ELF_CORE=y | 212 | CONFIG_ELF_CORE=y |
| 213 | # CONFIG_PCSPKR_PLATFORM is not set | ||
| 214 | # CONFIG_COMPAT_BRK is not set | ||
| 180 | CONFIG_BASE_FULL=y | 215 | CONFIG_BASE_FULL=y |
| 181 | CONFIG_FUTEX=y | 216 | CONFIG_FUTEX=y |
| 182 | CONFIG_ANON_INODES=y | 217 | CONFIG_ANON_INODES=y |
| @@ -185,14 +220,21 @@ CONFIG_SIGNALFD=y | |||
| 185 | CONFIG_TIMERFD=y | 220 | CONFIG_TIMERFD=y |
| 186 | CONFIG_EVENTFD=y | 221 | CONFIG_EVENTFD=y |
| 187 | CONFIG_SHMEM=y | 222 | CONFIG_SHMEM=y |
| 223 | CONFIG_AIO=y | ||
| 188 | CONFIG_VM_EVENT_COUNTERS=y | 224 | CONFIG_VM_EVENT_COUNTERS=y |
| 189 | CONFIG_SLAB=y | 225 | CONFIG_SLAB=y |
| 190 | # CONFIG_SLUB is not set | 226 | # CONFIG_SLUB is not set |
| 191 | # CONFIG_SLOB is not set | 227 | # CONFIG_SLOB is not set |
| 228 | # CONFIG_PROFILING is not set | ||
| 229 | # CONFIG_MARKERS is not set | ||
| 230 | CONFIG_HAVE_OPROFILE=y | ||
| 231 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 232 | CONFIG_SLABINFO=y | ||
| 192 | CONFIG_RT_MUTEXES=y | 233 | CONFIG_RT_MUTEXES=y |
| 193 | # CONFIG_TINY_SHMEM is not set | 234 | # CONFIG_TINY_SHMEM is not set |
| 194 | CONFIG_BASE_SMALL=0 | 235 | CONFIG_BASE_SMALL=0 |
| 195 | CONFIG_MODULES=y | 236 | CONFIG_MODULES=y |
| 237 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 196 | CONFIG_MODULE_UNLOAD=y | 238 | CONFIG_MODULE_UNLOAD=y |
| 197 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 239 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 198 | CONFIG_MODVERSIONS=y | 240 | CONFIG_MODVERSIONS=y |
| @@ -203,6 +245,7 @@ CONFIG_BLOCK=y | |||
| 203 | # CONFIG_BLK_DEV_IO_TRACE is not set | 245 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 204 | # CONFIG_LSF is not set | 246 | # CONFIG_LSF is not set |
| 205 | # CONFIG_BLK_DEV_BSG is not set | 247 | # CONFIG_BLK_DEV_BSG is not set |
| 248 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 206 | 249 | ||
| 207 | # | 250 | # |
| 208 | # IO Schedulers | 251 | # IO Schedulers |
| @@ -216,6 +259,8 @@ CONFIG_DEFAULT_AS=y | |||
| 216 | # CONFIG_DEFAULT_CFQ is not set | 259 | # CONFIG_DEFAULT_CFQ is not set |
| 217 | # CONFIG_DEFAULT_NOOP is not set | 260 | # CONFIG_DEFAULT_NOOP is not set |
| 218 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 261 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 262 | CONFIG_CLASSIC_RCU=y | ||
| 263 | # CONFIG_FREEZER is not set | ||
| 219 | 264 | ||
| 220 | # | 265 | # |
| 221 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 266 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| @@ -224,29 +269,24 @@ CONFIG_HW_HAS_EISA=y | |||
| 224 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 269 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 225 | # CONFIG_EISA is not set | 270 | # CONFIG_EISA is not set |
| 226 | CONFIG_MMU=y | 271 | CONFIG_MMU=y |
| 227 | 272 | CONFIG_I8253=y | |
| 228 | # | ||
| 229 | # PCCARD (PCMCIA/CardBus) support | ||
| 230 | # | ||
| 231 | 273 | ||
| 232 | # | 274 | # |
| 233 | # Executable file formats | 275 | # Executable file formats |
| 234 | # | 276 | # |
| 235 | CONFIG_BINFMT_ELF=y | 277 | CONFIG_BINFMT_ELF=y |
| 278 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 279 | # CONFIG_HAVE_AOUT is not set | ||
| 236 | CONFIG_BINFMT_MISC=m | 280 | CONFIG_BINFMT_MISC=m |
| 237 | CONFIG_TRAD_SIGNALS=y | 281 | CONFIG_TRAD_SIGNALS=y |
| 238 | 282 | ||
| 239 | # | 283 | # |
| 240 | # Power management options | 284 | # Power management options |
| 241 | # | 285 | # |
| 286 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
| 242 | CONFIG_PM=y | 287 | CONFIG_PM=y |
| 243 | # CONFIG_PM_LEGACY is not set | ||
| 244 | # CONFIG_PM_DEBUG is not set | 288 | # CONFIG_PM_DEBUG is not set |
| 245 | # CONFIG_SUSPEND is not set | 289 | # CONFIG_SUSPEND is not set |
| 246 | |||
| 247 | # | ||
| 248 | # Networking | ||
| 249 | # | ||
| 250 | CONFIG_NET=y | 290 | CONFIG_NET=y |
| 251 | 291 | ||
| 252 | # | 292 | # |
| @@ -259,6 +299,8 @@ CONFIG_XFRM=y | |||
| 259 | CONFIG_XFRM_USER=m | 299 | CONFIG_XFRM_USER=m |
| 260 | # CONFIG_XFRM_SUB_POLICY is not set | 300 | # CONFIG_XFRM_SUB_POLICY is not set |
| 261 | CONFIG_XFRM_MIGRATE=y | 301 | CONFIG_XFRM_MIGRATE=y |
| 302 | # CONFIG_XFRM_STATISTICS is not set | ||
| 303 | CONFIG_XFRM_IPCOMP=m | ||
| 262 | CONFIG_NET_KEY=y | 304 | CONFIG_NET_KEY=y |
| 263 | CONFIG_NET_KEY_MIGRATE=y | 305 | CONFIG_NET_KEY_MIGRATE=y |
| 264 | CONFIG_INET=y | 306 | CONFIG_INET=y |
| @@ -282,42 +324,13 @@ CONFIG_INET_TUNNEL=m | |||
| 282 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 324 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
| 283 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 325 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
| 284 | CONFIG_INET_XFRM_MODE_BEET=m | 326 | CONFIG_INET_XFRM_MODE_BEET=m |
| 327 | # CONFIG_INET_LRO is not set | ||
| 285 | CONFIG_INET_DIAG=y | 328 | CONFIG_INET_DIAG=y |
| 286 | CONFIG_INET_TCP_DIAG=y | 329 | CONFIG_INET_TCP_DIAG=y |
| 287 | # CONFIG_TCP_CONG_ADVANCED is not set | 330 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 288 | CONFIG_TCP_CONG_CUBIC=y | 331 | CONFIG_TCP_CONG_CUBIC=y |
| 289 | CONFIG_DEFAULT_TCP_CONG="cubic" | 332 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 290 | CONFIG_TCP_MD5SIG=y | 333 | CONFIG_TCP_MD5SIG=y |
| 291 | CONFIG_IP_VS=m | ||
| 292 | # CONFIG_IP_VS_DEBUG is not set | ||
| 293 | CONFIG_IP_VS_TAB_BITS=12 | ||
| 294 | |||
| 295 | # | ||
| 296 | # IPVS transport protocol load balancing support | ||
| 297 | # | ||
| 298 | CONFIG_IP_VS_PROTO_TCP=y | ||
| 299 | CONFIG_IP_VS_PROTO_UDP=y | ||
| 300 | CONFIG_IP_VS_PROTO_ESP=y | ||
| 301 | CONFIG_IP_VS_PROTO_AH=y | ||
| 302 | |||
| 303 | # | ||
| 304 | # IPVS scheduler | ||
| 305 | # | ||
| 306 | CONFIG_IP_VS_RR=m | ||
| 307 | CONFIG_IP_VS_WRR=m | ||
| 308 | CONFIG_IP_VS_LC=m | ||
| 309 | CONFIG_IP_VS_WLC=m | ||
| 310 | CONFIG_IP_VS_LBLC=m | ||
| 311 | CONFIG_IP_VS_LBLCR=m | ||
| 312 | CONFIG_IP_VS_DH=m | ||
| 313 | CONFIG_IP_VS_SH=m | ||
| 314 | CONFIG_IP_VS_SED=m | ||
| 315 | CONFIG_IP_VS_NQ=m | ||
| 316 | |||
| 317 | # | ||
| 318 | # IPVS application helper | ||
| 319 | # | ||
| 320 | CONFIG_IP_VS_FTP=m | ||
| 321 | CONFIG_IPV6=m | 334 | CONFIG_IPV6=m |
| 322 | CONFIG_IPV6_PRIVACY=y | 335 | CONFIG_IPV6_PRIVACY=y |
| 323 | CONFIG_IPV6_ROUTER_PREF=y | 336 | CONFIG_IPV6_ROUTER_PREF=y |
| @@ -334,12 +347,16 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m | |||
| 334 | CONFIG_INET6_XFRM_MODE_BEET=m | 347 | CONFIG_INET6_XFRM_MODE_BEET=m |
| 335 | CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m | 348 | CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m |
| 336 | CONFIG_IPV6_SIT=m | 349 | CONFIG_IPV6_SIT=m |
| 350 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
| 337 | CONFIG_IPV6_TUNNEL=m | 351 | CONFIG_IPV6_TUNNEL=m |
| 338 | CONFIG_IPV6_MULTIPLE_TABLES=y | 352 | CONFIG_IPV6_MULTIPLE_TABLES=y |
| 339 | CONFIG_IPV6_SUBTREES=y | 353 | CONFIG_IPV6_SUBTREES=y |
| 354 | CONFIG_IPV6_MROUTE=y | ||
| 355 | CONFIG_IPV6_PIMSM_V2=y | ||
| 340 | CONFIG_NETWORK_SECMARK=y | 356 | CONFIG_NETWORK_SECMARK=y |
| 341 | CONFIG_NETFILTER=y | 357 | CONFIG_NETFILTER=y |
| 342 | # CONFIG_NETFILTER_DEBUG is not set | 358 | # CONFIG_NETFILTER_DEBUG is not set |
| 359 | CONFIG_NETFILTER_ADVANCED=y | ||
| 343 | 360 | ||
| 344 | # | 361 | # |
| 345 | # Core Netfilter Configuration | 362 | # Core Netfilter Configuration |
| @@ -347,12 +364,12 @@ CONFIG_NETFILTER=y | |||
| 347 | CONFIG_NETFILTER_NETLINK=m | 364 | CONFIG_NETFILTER_NETLINK=m |
| 348 | CONFIG_NETFILTER_NETLINK_QUEUE=m | 365 | CONFIG_NETFILTER_NETLINK_QUEUE=m |
| 349 | CONFIG_NETFILTER_NETLINK_LOG=m | 366 | CONFIG_NETFILTER_NETLINK_LOG=m |
| 350 | CONFIG_NF_CONNTRACK_ENABLED=m | ||
| 351 | CONFIG_NF_CONNTRACK=m | 367 | CONFIG_NF_CONNTRACK=m |
| 352 | CONFIG_NF_CT_ACCT=y | 368 | CONFIG_NF_CT_ACCT=y |
| 353 | CONFIG_NF_CONNTRACK_MARK=y | 369 | CONFIG_NF_CONNTRACK_MARK=y |
| 354 | CONFIG_NF_CONNTRACK_SECMARK=y | 370 | CONFIG_NF_CONNTRACK_SECMARK=y |
| 355 | CONFIG_NF_CONNTRACK_EVENTS=y | 371 | CONFIG_NF_CONNTRACK_EVENTS=y |
| 372 | CONFIG_NF_CT_PROTO_DCCP=m | ||
| 356 | CONFIG_NF_CT_PROTO_GRE=m | 373 | CONFIG_NF_CT_PROTO_GRE=m |
| 357 | CONFIG_NF_CT_PROTO_SCTP=m | 374 | CONFIG_NF_CT_PROTO_SCTP=m |
| 358 | CONFIG_NF_CT_PROTO_UDPLITE=m | 375 | CONFIG_NF_CT_PROTO_UDPLITE=m |
| @@ -366,18 +383,22 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
| 366 | CONFIG_NF_CONNTRACK_SIP=m | 383 | CONFIG_NF_CONNTRACK_SIP=m |
| 367 | CONFIG_NF_CONNTRACK_TFTP=m | 384 | CONFIG_NF_CONNTRACK_TFTP=m |
| 368 | CONFIG_NF_CT_NETLINK=m | 385 | CONFIG_NF_CT_NETLINK=m |
| 386 | CONFIG_NETFILTER_TPROXY=m | ||
| 369 | CONFIG_NETFILTER_XTABLES=m | 387 | CONFIG_NETFILTER_XTABLES=m |
| 370 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 388 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| 371 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 389 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
| 390 | CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m | ||
| 372 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 391 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
| 373 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 392 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
| 374 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
| 375 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 393 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
| 394 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
| 376 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | 395 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m |
| 396 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m | ||
| 397 | CONFIG_NETFILTER_XT_TARGET_TPROXY=m | ||
| 377 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 398 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
| 378 | CONFIG_NETFILTER_XT_TARGET_SECMARK=m | 399 | CONFIG_NETFILTER_XT_TARGET_SECMARK=m |
| 379 | CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m | ||
| 380 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 400 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
| 401 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | ||
| 381 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 402 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
| 382 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | 403 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m |
| 383 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | 404 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m |
| @@ -386,39 +407,75 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | |||
| 386 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 407 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
| 387 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 408 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
| 388 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 409 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
| 410 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | ||
| 389 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 411 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
| 412 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | ||
| 390 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 413 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
| 391 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 414 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
| 392 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 415 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
| 393 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 416 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
| 394 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | ||
| 395 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | 417 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m |
| 418 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | ||
| 419 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | ||
| 396 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 420 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
| 397 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | 421 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m |
| 422 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | ||
| 398 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 423 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
| 424 | CONFIG_NETFILTER_XT_MATCH_RECENT=m | ||
| 425 | CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT=y | ||
| 399 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 426 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
| 427 | CONFIG_NETFILTER_XT_MATCH_SOCKET=m | ||
| 400 | CONFIG_NETFILTER_XT_MATCH_STATE=m | 428 | CONFIG_NETFILTER_XT_MATCH_STATE=m |
| 401 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | 429 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m |
| 402 | CONFIG_NETFILTER_XT_MATCH_STRING=m | 430 | CONFIG_NETFILTER_XT_MATCH_STRING=m |
| 403 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 431 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
| 432 | CONFIG_NETFILTER_XT_MATCH_TIME=m | ||
| 404 | CONFIG_NETFILTER_XT_MATCH_U32=m | 433 | CONFIG_NETFILTER_XT_MATCH_U32=m |
| 405 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 434 | CONFIG_IP_VS=m |
| 435 | CONFIG_IP_VS_IPV6=y | ||
| 436 | # CONFIG_IP_VS_DEBUG is not set | ||
| 437 | CONFIG_IP_VS_TAB_BITS=12 | ||
| 438 | |||
| 439 | # | ||
| 440 | # IPVS transport protocol load balancing support | ||
| 441 | # | ||
| 442 | CONFIG_IP_VS_PROTO_TCP=y | ||
| 443 | CONFIG_IP_VS_PROTO_UDP=y | ||
| 444 | CONFIG_IP_VS_PROTO_AH_ESP=y | ||
| 445 | CONFIG_IP_VS_PROTO_ESP=y | ||
| 446 | CONFIG_IP_VS_PROTO_AH=y | ||
| 447 | |||
| 448 | # | ||
| 449 | # IPVS scheduler | ||
| 450 | # | ||
| 451 | CONFIG_IP_VS_RR=m | ||
| 452 | CONFIG_IP_VS_WRR=m | ||
| 453 | CONFIG_IP_VS_LC=m | ||
| 454 | CONFIG_IP_VS_WLC=m | ||
| 455 | CONFIG_IP_VS_LBLC=m | ||
| 456 | CONFIG_IP_VS_LBLCR=m | ||
| 457 | CONFIG_IP_VS_DH=m | ||
| 458 | CONFIG_IP_VS_SH=m | ||
| 459 | CONFIG_IP_VS_SED=m | ||
| 460 | CONFIG_IP_VS_NQ=m | ||
| 461 | |||
| 462 | # | ||
| 463 | # IPVS application helper | ||
| 464 | # | ||
| 465 | CONFIG_IP_VS_FTP=m | ||
| 406 | 466 | ||
| 407 | # | 467 | # |
| 408 | # IP: Netfilter Configuration | 468 | # IP: Netfilter Configuration |
| 409 | # | 469 | # |
| 470 | CONFIG_NF_DEFRAG_IPV4=m | ||
| 410 | CONFIG_NF_CONNTRACK_IPV4=m | 471 | CONFIG_NF_CONNTRACK_IPV4=m |
| 411 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y | 472 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y |
| 412 | CONFIG_IP_NF_QUEUE=m | 473 | CONFIG_IP_NF_QUEUE=m |
| 413 | CONFIG_IP_NF_IPTABLES=m | 474 | CONFIG_IP_NF_IPTABLES=m |
| 414 | CONFIG_IP_NF_MATCH_IPRANGE=m | 475 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
| 415 | CONFIG_IP_NF_MATCH_TOS=m | ||
| 416 | CONFIG_IP_NF_MATCH_RECENT=m | ||
| 417 | CONFIG_IP_NF_MATCH_ECN=m | ||
| 418 | CONFIG_IP_NF_MATCH_AH=m | 476 | CONFIG_IP_NF_MATCH_AH=m |
| 477 | CONFIG_IP_NF_MATCH_ECN=m | ||
| 419 | CONFIG_IP_NF_MATCH_TTL=m | 478 | CONFIG_IP_NF_MATCH_TTL=m |
| 420 | CONFIG_IP_NF_MATCH_OWNER=m | ||
| 421 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
| 422 | CONFIG_IP_NF_FILTER=m | 479 | CONFIG_IP_NF_FILTER=m |
| 423 | CONFIG_IP_NF_TARGET_REJECT=m | 480 | CONFIG_IP_NF_TARGET_REJECT=m |
| 424 | CONFIG_IP_NF_TARGET_LOG=m | 481 | CONFIG_IP_NF_TARGET_LOG=m |
| @@ -426,11 +483,13 @@ CONFIG_IP_NF_TARGET_ULOG=m | |||
| 426 | CONFIG_NF_NAT=m | 483 | CONFIG_NF_NAT=m |
| 427 | CONFIG_NF_NAT_NEEDED=y | 484 | CONFIG_NF_NAT_NEEDED=y |
| 428 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 485 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
| 429 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
| 430 | CONFIG_IP_NF_TARGET_NETMAP=m | 486 | CONFIG_IP_NF_TARGET_NETMAP=m |
| 431 | CONFIG_IP_NF_TARGET_SAME=m | 487 | CONFIG_IP_NF_TARGET_REDIRECT=m |
| 432 | CONFIG_NF_NAT_SNMP_BASIC=m | 488 | CONFIG_NF_NAT_SNMP_BASIC=m |
| 489 | CONFIG_NF_NAT_PROTO_DCCP=m | ||
| 433 | CONFIG_NF_NAT_PROTO_GRE=m | 490 | CONFIG_NF_NAT_PROTO_GRE=m |
| 491 | CONFIG_NF_NAT_PROTO_UDPLITE=m | ||
| 492 | CONFIG_NF_NAT_PROTO_SCTP=m | ||
| 434 | CONFIG_NF_NAT_FTP=m | 493 | CONFIG_NF_NAT_FTP=m |
| 435 | CONFIG_NF_NAT_IRC=m | 494 | CONFIG_NF_NAT_IRC=m |
| 436 | CONFIG_NF_NAT_TFTP=m | 495 | CONFIG_NF_NAT_TFTP=m |
| @@ -439,32 +498,30 @@ CONFIG_NF_NAT_PPTP=m | |||
| 439 | CONFIG_NF_NAT_H323=m | 498 | CONFIG_NF_NAT_H323=m |
| 440 | CONFIG_NF_NAT_SIP=m | 499 | CONFIG_NF_NAT_SIP=m |
| 441 | CONFIG_IP_NF_MANGLE=m | 500 | CONFIG_IP_NF_MANGLE=m |
| 442 | CONFIG_IP_NF_TARGET_TOS=m | 501 | CONFIG_IP_NF_TARGET_CLUSTERIP=m |
| 443 | CONFIG_IP_NF_TARGET_ECN=m | 502 | CONFIG_IP_NF_TARGET_ECN=m |
| 444 | CONFIG_IP_NF_TARGET_TTL=m | 503 | CONFIG_IP_NF_TARGET_TTL=m |
| 445 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
| 446 | CONFIG_IP_NF_RAW=m | 504 | CONFIG_IP_NF_RAW=m |
| 447 | CONFIG_IP_NF_ARPTABLES=m | 505 | CONFIG_IP_NF_ARPTABLES=m |
| 448 | CONFIG_IP_NF_ARPFILTER=m | 506 | CONFIG_IP_NF_ARPFILTER=m |
| 449 | CONFIG_IP_NF_ARP_MANGLE=m | 507 | CONFIG_IP_NF_ARP_MANGLE=m |
| 450 | 508 | ||
| 451 | # | 509 | # |
| 452 | # IPv6: Netfilter Configuration (EXPERIMENTAL) | 510 | # IPv6: Netfilter Configuration |
| 453 | # | 511 | # |
| 454 | CONFIG_NF_CONNTRACK_IPV6=m | 512 | CONFIG_NF_CONNTRACK_IPV6=m |
| 455 | CONFIG_IP6_NF_QUEUE=m | 513 | CONFIG_IP6_NF_QUEUE=m |
| 456 | CONFIG_IP6_NF_IPTABLES=m | 514 | CONFIG_IP6_NF_IPTABLES=m |
| 457 | CONFIG_IP6_NF_MATCH_RT=m | 515 | CONFIG_IP6_NF_MATCH_AH=m |
| 458 | CONFIG_IP6_NF_MATCH_OPTS=m | 516 | CONFIG_IP6_NF_MATCH_EUI64=m |
| 459 | CONFIG_IP6_NF_MATCH_FRAG=m | 517 | CONFIG_IP6_NF_MATCH_FRAG=m |
| 518 | CONFIG_IP6_NF_MATCH_OPTS=m | ||
| 460 | CONFIG_IP6_NF_MATCH_HL=m | 519 | CONFIG_IP6_NF_MATCH_HL=m |
| 461 | CONFIG_IP6_NF_MATCH_OWNER=m | ||
| 462 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 520 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
| 463 | CONFIG_IP6_NF_MATCH_AH=m | ||
| 464 | CONFIG_IP6_NF_MATCH_MH=m | 521 | CONFIG_IP6_NF_MATCH_MH=m |
| 465 | CONFIG_IP6_NF_MATCH_EUI64=m | 522 | CONFIG_IP6_NF_MATCH_RT=m |
| 466 | CONFIG_IP6_NF_FILTER=m | ||
| 467 | CONFIG_IP6_NF_TARGET_LOG=m | 523 | CONFIG_IP6_NF_TARGET_LOG=m |
| 524 | CONFIG_IP6_NF_FILTER=m | ||
| 468 | CONFIG_IP6_NF_TARGET_REJECT=m | 525 | CONFIG_IP6_NF_TARGET_REJECT=m |
| 469 | CONFIG_IP6_NF_MANGLE=m | 526 | CONFIG_IP6_NF_MANGLE=m |
| 470 | CONFIG_IP6_NF_TARGET_HL=m | 527 | CONFIG_IP6_NF_TARGET_HL=m |
| @@ -479,6 +536,7 @@ CONFIG_SCTP_HMAC_MD5=y | |||
| 479 | # CONFIG_TIPC is not set | 536 | # CONFIG_TIPC is not set |
| 480 | # CONFIG_ATM is not set | 537 | # CONFIG_ATM is not set |
| 481 | # CONFIG_BRIDGE is not set | 538 | # CONFIG_BRIDGE is not set |
| 539 | # CONFIG_NET_DSA is not set | ||
| 482 | # CONFIG_VLAN_8021Q is not set | 540 | # CONFIG_VLAN_8021Q is not set |
| 483 | # CONFIG_DECNET is not set | 541 | # CONFIG_DECNET is not set |
| 484 | # CONFIG_LLC2 is not set | 542 | # CONFIG_LLC2 is not set |
| @@ -488,12 +546,7 @@ CONFIG_SCTP_HMAC_MD5=y | |||
| 488 | # CONFIG_LAPB is not set | 546 | # CONFIG_LAPB is not set |
| 489 | # CONFIG_ECONET is not set | 547 | # CONFIG_ECONET is not set |
| 490 | # CONFIG_WAN_ROUTER is not set | 548 | # CONFIG_WAN_ROUTER is not set |
| 491 | |||
| 492 | # | ||
| 493 | # QoS and/or fair queueing | ||
| 494 | # | ||
| 495 | CONFIG_NET_SCHED=y | 549 | CONFIG_NET_SCHED=y |
| 496 | CONFIG_NET_SCH_FIFO=y | ||
| 497 | 550 | ||
| 498 | # | 551 | # |
| 499 | # Queueing/Scheduling | 552 | # Queueing/Scheduling |
| @@ -502,7 +555,7 @@ CONFIG_NET_SCH_CBQ=m | |||
| 502 | CONFIG_NET_SCH_HTB=m | 555 | CONFIG_NET_SCH_HTB=m |
| 503 | CONFIG_NET_SCH_HFSC=m | 556 | CONFIG_NET_SCH_HFSC=m |
| 504 | CONFIG_NET_SCH_PRIO=m | 557 | CONFIG_NET_SCH_PRIO=m |
| 505 | CONFIG_NET_SCH_RR=m | 558 | # CONFIG_NET_SCH_MULTIQ is not set |
| 506 | CONFIG_NET_SCH_RED=m | 559 | CONFIG_NET_SCH_RED=m |
| 507 | CONFIG_NET_SCH_SFQ=m | 560 | CONFIG_NET_SCH_SFQ=m |
| 508 | CONFIG_NET_SCH_TEQL=m | 561 | CONFIG_NET_SCH_TEQL=m |
| @@ -526,6 +579,7 @@ CONFIG_NET_CLS_U32=m | |||
| 526 | # CONFIG_CLS_U32_MARK is not set | 579 | # CONFIG_CLS_U32_MARK is not set |
| 527 | CONFIG_NET_CLS_RSVP=m | 580 | CONFIG_NET_CLS_RSVP=m |
| 528 | CONFIG_NET_CLS_RSVP6=m | 581 | CONFIG_NET_CLS_RSVP6=m |
| 582 | CONFIG_NET_CLS_FLOW=m | ||
| 529 | # CONFIG_NET_EMATCH is not set | 583 | # CONFIG_NET_EMATCH is not set |
| 530 | CONFIG_NET_CLS_ACT=y | 584 | CONFIG_NET_CLS_ACT=y |
| 531 | CONFIG_NET_ACT_POLICE=y | 585 | CONFIG_NET_ACT_POLICE=y |
| @@ -533,35 +587,28 @@ CONFIG_NET_ACT_GACT=m | |||
| 533 | CONFIG_GACT_PROB=y | 587 | CONFIG_GACT_PROB=y |
| 534 | CONFIG_NET_ACT_MIRRED=m | 588 | CONFIG_NET_ACT_MIRRED=m |
| 535 | CONFIG_NET_ACT_IPT=m | 589 | CONFIG_NET_ACT_IPT=m |
| 590 | CONFIG_NET_ACT_NAT=m | ||
| 536 | CONFIG_NET_ACT_PEDIT=m | 591 | CONFIG_NET_ACT_PEDIT=m |
| 537 | CONFIG_NET_ACT_SIMP=m | 592 | CONFIG_NET_ACT_SIMP=m |
| 538 | CONFIG_NET_CLS_POLICE=y | 593 | CONFIG_NET_ACT_SKBEDIT=m |
| 539 | # CONFIG_NET_CLS_IND is not set | 594 | # CONFIG_NET_CLS_IND is not set |
| 595 | CONFIG_NET_SCH_FIFO=y | ||
| 540 | 596 | ||
| 541 | # | 597 | # |
| 542 | # Network testing | 598 | # Network testing |
| 543 | # | 599 | # |
| 544 | # CONFIG_NET_PKTGEN is not set | 600 | # CONFIG_NET_PKTGEN is not set |
| 545 | # CONFIG_HAMRADIO is not set | 601 | # CONFIG_HAMRADIO is not set |
| 602 | # CONFIG_CAN is not set | ||
| 546 | # CONFIG_IRDA is not set | 603 | # CONFIG_IRDA is not set |
| 547 | # CONFIG_BT is not set | 604 | # CONFIG_BT is not set |
| 548 | # CONFIG_AF_RXRPC is not set | 605 | # CONFIG_AF_RXRPC is not set |
| 606 | CONFIG_PHONET=m | ||
| 549 | CONFIG_FIB_RULES=y | 607 | CONFIG_FIB_RULES=y |
| 550 | 608 | # CONFIG_WIRELESS is not set | |
| 551 | # | ||
| 552 | # Wireless | ||
| 553 | # | ||
| 554 | CONFIG_CFG80211=m | ||
| 555 | CONFIG_WIRELESS_EXT=y | 609 | CONFIG_WIRELESS_EXT=y |
| 556 | CONFIG_MAC80211=m | ||
| 557 | # CONFIG_MAC80211_DEBUG is not set | ||
| 558 | CONFIG_IEEE80211=m | 610 | CONFIG_IEEE80211=m |
| 559 | # CONFIG_IEEE80211_DEBUG is not set | ||
| 560 | CONFIG_IEEE80211_CRYPT_WEP=m | 611 | CONFIG_IEEE80211_CRYPT_WEP=m |
| 561 | CONFIG_IEEE80211_CRYPT_CCMP=m | ||
| 562 | CONFIG_IEEE80211_CRYPT_TKIP=m | ||
| 563 | CONFIG_IEEE80211_SOFTMAC=m | ||
| 564 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | ||
| 565 | CONFIG_RFKILL=m | 612 | CONFIG_RFKILL=m |
| 566 | CONFIG_RFKILL_INPUT=m | 613 | CONFIG_RFKILL_INPUT=m |
| 567 | # CONFIG_NET_9P is not set | 614 | # CONFIG_NET_9P is not set |
| @@ -588,7 +635,9 @@ CONFIG_CDROM_PKTCDVD=m | |||
| 588 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 635 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
| 589 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 636 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
| 590 | CONFIG_ATA_OVER_ETH=m | 637 | CONFIG_ATA_OVER_ETH=m |
| 638 | # CONFIG_BLK_DEV_HD is not set | ||
| 591 | # CONFIG_MISC_DEVICES is not set | 639 | # CONFIG_MISC_DEVICES is not set |
| 640 | CONFIG_HAVE_IDE=y | ||
| 592 | # CONFIG_IDE is not set | 641 | # CONFIG_IDE is not set |
| 593 | 642 | ||
| 594 | # | 643 | # |
| @@ -628,20 +677,22 @@ CONFIG_SCSI_SPI_ATTRS=m | |||
| 628 | # CONFIG_SCSI_FC_ATTRS is not set | 677 | # CONFIG_SCSI_FC_ATTRS is not set |
| 629 | CONFIG_SCSI_ISCSI_ATTRS=m | 678 | CONFIG_SCSI_ISCSI_ATTRS=m |
| 630 | # CONFIG_SCSI_SAS_LIBSAS is not set | 679 | # CONFIG_SCSI_SAS_LIBSAS is not set |
| 680 | # CONFIG_SCSI_SRP_ATTRS is not set | ||
| 631 | CONFIG_SCSI_LOWLEVEL=y | 681 | CONFIG_SCSI_LOWLEVEL=y |
| 632 | CONFIG_ISCSI_TCP=m | 682 | CONFIG_ISCSI_TCP=m |
| 633 | CONFIG_SGIWD93_SCSI=y | 683 | CONFIG_SGIWD93_SCSI=y |
| 634 | # CONFIG_SCSI_DEBUG is not set | 684 | # CONFIG_SCSI_DEBUG is not set |
| 685 | # CONFIG_SCSI_DH is not set | ||
| 635 | # CONFIG_ATA is not set | 686 | # CONFIG_ATA is not set |
| 636 | # CONFIG_MD is not set | 687 | # CONFIG_MD is not set |
| 637 | CONFIG_NETDEVICES=y | 688 | CONFIG_NETDEVICES=y |
| 638 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 639 | # CONFIG_IFB is not set | 689 | # CONFIG_IFB is not set |
| 640 | CONFIG_DUMMY=m | 690 | CONFIG_DUMMY=m |
| 641 | CONFIG_BONDING=m | 691 | CONFIG_BONDING=m |
| 642 | CONFIG_MACVLAN=m | 692 | CONFIG_MACVLAN=m |
| 643 | CONFIG_EQUALIZER=m | 693 | CONFIG_EQUALIZER=m |
| 644 | CONFIG_TUN=m | 694 | CONFIG_TUN=m |
| 695 | CONFIG_VETH=m | ||
| 645 | CONFIG_PHYLIB=m | 696 | CONFIG_PHYLIB=m |
| 646 | 697 | ||
| 647 | # | 698 | # |
| @@ -656,11 +707,21 @@ CONFIG_CICADA_PHY=m | |||
| 656 | # CONFIG_SMSC_PHY is not set | 707 | # CONFIG_SMSC_PHY is not set |
| 657 | # CONFIG_BROADCOM_PHY is not set | 708 | # CONFIG_BROADCOM_PHY is not set |
| 658 | # CONFIG_ICPLUS_PHY is not set | 709 | # CONFIG_ICPLUS_PHY is not set |
| 659 | # CONFIG_FIXED_PHY is not set | 710 | CONFIG_REALTEK_PHY=m |
| 711 | CONFIG_MDIO_BITBANG=m | ||
| 660 | CONFIG_NET_ETHERNET=y | 712 | CONFIG_NET_ETHERNET=y |
| 661 | # CONFIG_MII is not set | 713 | CONFIG_MII=m |
| 662 | # CONFIG_AX88796 is not set | 714 | # CONFIG_AX88796 is not set |
| 715 | CONFIG_SMC91X=m | ||
| 663 | # CONFIG_DM9000 is not set | 716 | # CONFIG_DM9000 is not set |
| 717 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
| 718 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
| 719 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
| 720 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
| 721 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
| 722 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
| 723 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
| 724 | # CONFIG_B44 is not set | ||
| 664 | CONFIG_SGISEEQ=y | 725 | CONFIG_SGISEEQ=y |
| 665 | # CONFIG_NETDEV_1000 is not set | 726 | # CONFIG_NETDEV_1000 is not set |
| 666 | # CONFIG_NETDEV_10000 is not set | 727 | # CONFIG_NETDEV_10000 is not set |
| @@ -672,12 +733,12 @@ CONFIG_WLAN_PRE80211=y | |||
| 672 | CONFIG_STRIP=m | 733 | CONFIG_STRIP=m |
| 673 | CONFIG_WLAN_80211=y | 734 | CONFIG_WLAN_80211=y |
| 674 | # CONFIG_LIBERTAS is not set | 735 | # CONFIG_LIBERTAS is not set |
| 736 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 675 | CONFIG_HOSTAP=m | 737 | CONFIG_HOSTAP=m |
| 676 | # CONFIG_HOSTAP_FIRMWARE is not set | 738 | # CONFIG_HOSTAP_FIRMWARE is not set |
| 677 | # CONFIG_WAN is not set | 739 | # CONFIG_WAN is not set |
| 678 | # CONFIG_PPP is not set | 740 | # CONFIG_PPP is not set |
| 679 | # CONFIG_SLIP is not set | 741 | # CONFIG_SLIP is not set |
| 680 | # CONFIG_SHAPER is not set | ||
| 681 | # CONFIG_NETCONSOLE is not set | 742 | # CONFIG_NETCONSOLE is not set |
| 682 | # CONFIG_NETPOLL is not set | 743 | # CONFIG_NETPOLL is not set |
| 683 | # CONFIG_NET_POLL_CONTROLLER is not set | 744 | # CONFIG_NET_POLL_CONTROLLER is not set |
| @@ -699,7 +760,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y | |||
| 699 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | 760 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 |
| 700 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | 761 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 |
| 701 | # CONFIG_INPUT_JOYDEV is not set | 762 | # CONFIG_INPUT_JOYDEV is not set |
| 702 | # CONFIG_INPUT_TSDEV is not set | ||
| 703 | # CONFIG_INPUT_EVDEV is not set | 763 | # CONFIG_INPUT_EVDEV is not set |
| 704 | # CONFIG_INPUT_EVBUG is not set | 764 | # CONFIG_INPUT_EVBUG is not set |
| 705 | 765 | ||
| @@ -720,6 +780,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y | |||
| 720 | # CONFIG_MOUSE_PS2_SYNAPTICS is not set | 780 | # CONFIG_MOUSE_PS2_SYNAPTICS is not set |
| 721 | # CONFIG_MOUSE_PS2_LIFEBOOK is not set | 781 | # CONFIG_MOUSE_PS2_LIFEBOOK is not set |
| 722 | CONFIG_MOUSE_PS2_TRACKPOINT=y | 782 | CONFIG_MOUSE_PS2_TRACKPOINT=y |
| 783 | # CONFIG_MOUSE_PS2_ELANTECH is not set | ||
| 723 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 784 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
| 724 | CONFIG_MOUSE_SERIAL=m | 785 | CONFIG_MOUSE_SERIAL=m |
| 725 | # CONFIG_MOUSE_VSXXXAA is not set | 786 | # CONFIG_MOUSE_VSXXXAA is not set |
| @@ -742,9 +803,11 @@ CONFIG_SERIO_RAW=m | |||
| 742 | # Character devices | 803 | # Character devices |
| 743 | # | 804 | # |
| 744 | CONFIG_VT=y | 805 | CONFIG_VT=y |
| 806 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 745 | CONFIG_VT_CONSOLE=y | 807 | CONFIG_VT_CONSOLE=y |
| 746 | CONFIG_HW_CONSOLE=y | 808 | CONFIG_HW_CONSOLE=y |
| 747 | CONFIG_VT_HW_CONSOLE_BINDING=y | 809 | CONFIG_VT_HW_CONSOLE_BINDING=y |
| 810 | CONFIG_DEVKMEM=y | ||
| 748 | # CONFIG_SERIAL_NONSTANDARD is not set | 811 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 749 | 812 | ||
| 750 | # | 813 | # |
| @@ -761,6 +824,17 @@ CONFIG_UNIX98_PTYS=y | |||
| 761 | CONFIG_LEGACY_PTYS=y | 824 | CONFIG_LEGACY_PTYS=y |
| 762 | CONFIG_LEGACY_PTY_COUNT=256 | 825 | CONFIG_LEGACY_PTY_COUNT=256 |
| 763 | # CONFIG_IPMI_HANDLER is not set | 826 | # CONFIG_IPMI_HANDLER is not set |
| 827 | # CONFIG_HW_RANDOM is not set | ||
| 828 | # CONFIG_R3964 is not set | ||
| 829 | CONFIG_RAW_DRIVER=m | ||
| 830 | CONFIG_MAX_RAW_DEVS=256 | ||
| 831 | # CONFIG_TCG_TPM is not set | ||
| 832 | # CONFIG_I2C is not set | ||
| 833 | # CONFIG_SPI is not set | ||
| 834 | # CONFIG_W1 is not set | ||
| 835 | # CONFIG_POWER_SUPPLY is not set | ||
| 836 | # CONFIG_HWMON is not set | ||
| 837 | CONFIG_THERMAL=m | ||
| 764 | CONFIG_WATCHDOG=y | 838 | CONFIG_WATCHDOG=y |
| 765 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 839 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
| 766 | 840 | ||
| @@ -769,47 +843,50 @@ CONFIG_WATCHDOG=y | |||
| 769 | # | 843 | # |
| 770 | # CONFIG_SOFT_WATCHDOG is not set | 844 | # CONFIG_SOFT_WATCHDOG is not set |
| 771 | CONFIG_INDYDOG=m | 845 | CONFIG_INDYDOG=m |
| 772 | # CONFIG_HW_RANDOM is not set | 846 | CONFIG_SSB_POSSIBLE=y |
| 773 | # CONFIG_RTC is not set | ||
| 774 | # CONFIG_R3964 is not set | ||
| 775 | CONFIG_RAW_DRIVER=m | ||
| 776 | CONFIG_MAX_RAW_DEVS=256 | ||
| 777 | # CONFIG_TCG_TPM is not set | ||
| 778 | # CONFIG_I2C is not set | ||
| 779 | 847 | ||
| 780 | # | 848 | # |
| 781 | # SPI support | 849 | # Sonics Silicon Backplane |
| 782 | # | 850 | # |
| 783 | # CONFIG_SPI is not set | 851 | # CONFIG_SSB is not set |
| 784 | # CONFIG_SPI_MASTER is not set | ||
| 785 | # CONFIG_W1 is not set | ||
| 786 | # CONFIG_POWER_SUPPLY is not set | ||
| 787 | # CONFIG_HWMON is not set | ||
| 788 | 852 | ||
| 789 | # | 853 | # |
| 790 | # Multifunction device drivers | 854 | # Multifunction device drivers |
| 791 | # | 855 | # |
| 856 | # CONFIG_MFD_CORE is not set | ||
| 792 | # CONFIG_MFD_SM501 is not set | 857 | # CONFIG_MFD_SM501 is not set |
| 858 | # CONFIG_HTC_PASIC3 is not set | ||
| 859 | # CONFIG_MFD_TMIO is not set | ||
| 860 | # CONFIG_REGULATOR is not set | ||
| 793 | 861 | ||
| 794 | # | 862 | # |
| 795 | # Multimedia devices | 863 | # Multimedia devices |
| 796 | # | 864 | # |
| 865 | |||
| 866 | # | ||
| 867 | # Multimedia core support | ||
| 868 | # | ||
| 797 | # CONFIG_VIDEO_DEV is not set | 869 | # CONFIG_VIDEO_DEV is not set |
| 798 | # CONFIG_DVB_CORE is not set | 870 | # CONFIG_DVB_CORE is not set |
| 871 | # CONFIG_VIDEO_MEDIA is not set | ||
| 872 | |||
| 873 | # | ||
| 874 | # Multimedia drivers | ||
| 875 | # | ||
| 799 | # CONFIG_DAB is not set | 876 | # CONFIG_DAB is not set |
| 800 | 877 | ||
| 801 | # | 878 | # |
| 802 | # Graphics support | 879 | # Graphics support |
| 803 | # | 880 | # |
| 881 | # CONFIG_VGASTATE is not set | ||
| 882 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 883 | # CONFIG_FB is not set | ||
| 804 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 884 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 805 | 885 | ||
| 806 | # | 886 | # |
| 807 | # Display device support | 887 | # Display device support |
| 808 | # | 888 | # |
| 809 | # CONFIG_DISPLAY_SUPPORT is not set | 889 | # CONFIG_DISPLAY_SUPPORT is not set |
| 810 | # CONFIG_VGASTATE is not set | ||
| 811 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 812 | # CONFIG_FB is not set | ||
| 813 | 890 | ||
| 814 | # | 891 | # |
| 815 | # Console display driver support | 892 | # Console display driver support |
| @@ -823,48 +900,77 @@ CONFIG_LOGO=y | |||
| 823 | # CONFIG_LOGO_LINUX_VGA16 is not set | 900 | # CONFIG_LOGO_LINUX_VGA16 is not set |
| 824 | # CONFIG_LOGO_LINUX_CLUT224 is not set | 901 | # CONFIG_LOGO_LINUX_CLUT224 is not set |
| 825 | CONFIG_LOGO_SGI_CLUT224=y | 902 | CONFIG_LOGO_SGI_CLUT224=y |
| 826 | |||
| 827 | # | ||
| 828 | # Sound | ||
| 829 | # | ||
| 830 | # CONFIG_SOUND is not set | 903 | # CONFIG_SOUND is not set |
| 831 | CONFIG_HID_SUPPORT=y | 904 | CONFIG_HID_SUPPORT=y |
| 832 | CONFIG_HID=y | 905 | CONFIG_HID=y |
| 833 | # CONFIG_HID_DEBUG is not set | 906 | # CONFIG_HID_DEBUG is not set |
| 907 | CONFIG_HIDRAW=y | ||
| 908 | CONFIG_HID_PID=y | ||
| 909 | |||
| 910 | # | ||
| 911 | # Special HID drivers | ||
| 912 | # | ||
| 913 | CONFIG_HID_COMPAT=y | ||
| 834 | CONFIG_USB_SUPPORT=y | 914 | CONFIG_USB_SUPPORT=y |
| 835 | # CONFIG_USB_ARCH_HAS_HCD is not set | 915 | # CONFIG_USB_ARCH_HAS_HCD is not set |
| 836 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 916 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 837 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 917 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
| 918 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 919 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 838 | 920 | ||
| 839 | # | 921 | # |
| 840 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 922 | # Enable Host or Gadget support to see Inventra options |
| 841 | # | 923 | # |
| 842 | 924 | ||
| 843 | # | 925 | # |
| 844 | # USB Gadget Support | 926 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; |
| 845 | # | 927 | # |
| 846 | # CONFIG_USB_GADGET is not set | 928 | # CONFIG_USB_GADGET is not set |
| 847 | # CONFIG_MMC is not set | 929 | # CONFIG_MMC is not set |
| 930 | # CONFIG_MEMSTICK is not set | ||
| 848 | # CONFIG_NEW_LEDS is not set | 931 | # CONFIG_NEW_LEDS is not set |
| 849 | # CONFIG_RTC_CLASS is not set | 932 | # CONFIG_ACCESSIBILITY is not set |
| 933 | CONFIG_RTC_LIB=y | ||
| 934 | CONFIG_RTC_CLASS=y | ||
| 935 | CONFIG_RTC_HCTOSYS=y | ||
| 936 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
| 937 | # CONFIG_RTC_DEBUG is not set | ||
| 850 | 938 | ||
| 851 | # | 939 | # |
| 852 | # DMA Engine support | 940 | # RTC interfaces |
| 853 | # | 941 | # |
| 854 | # CONFIG_DMA_ENGINE is not set | 942 | CONFIG_RTC_INTF_SYSFS=y |
| 943 | CONFIG_RTC_INTF_PROC=y | ||
| 944 | CONFIG_RTC_INTF_DEV=y | ||
| 945 | CONFIG_RTC_INTF_DEV_UIE_EMUL=y | ||
| 946 | # CONFIG_RTC_DRV_TEST is not set | ||
| 855 | 947 | ||
| 856 | # | 948 | # |
| 857 | # DMA Clients | 949 | # SPI RTC drivers |
| 858 | # | 950 | # |
| 859 | 951 | ||
| 860 | # | 952 | # |
| 861 | # DMA Devices | 953 | # Platform RTC drivers |
| 862 | # | 954 | # |
| 955 | # CONFIG_RTC_DRV_CMOS is not set | ||
| 956 | CONFIG_RTC_DRV_DS1286=y | ||
| 957 | # CONFIG_RTC_DRV_DS1511 is not set | ||
| 958 | # CONFIG_RTC_DRV_DS1553 is not set | ||
| 959 | # CONFIG_RTC_DRV_DS1742 is not set | ||
| 960 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 961 | # CONFIG_RTC_DRV_M48T86 is not set | ||
| 962 | # CONFIG_RTC_DRV_M48T35 is not set | ||
| 963 | # CONFIG_RTC_DRV_M48T59 is not set | ||
| 964 | # CONFIG_RTC_DRV_BQ4802 is not set | ||
| 965 | # CONFIG_RTC_DRV_V3020 is not set | ||
| 863 | 966 | ||
| 864 | # | 967 | # |
| 865 | # Userspace I/O | 968 | # on-CPU RTC drivers |
| 866 | # | 969 | # |
| 970 | # CONFIG_DMADEVICES is not set | ||
| 867 | # CONFIG_UIO is not set | 971 | # CONFIG_UIO is not set |
| 972 | # CONFIG_STAGING is not set | ||
| 973 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 868 | 974 | ||
| 869 | # | 975 | # |
| 870 | # File systems | 976 | # File systems |
| @@ -876,29 +982,33 @@ CONFIG_EXT3_FS=y | |||
| 876 | CONFIG_EXT3_FS_XATTR=y | 982 | CONFIG_EXT3_FS_XATTR=y |
| 877 | CONFIG_EXT3_FS_POSIX_ACL=y | 983 | CONFIG_EXT3_FS_POSIX_ACL=y |
| 878 | CONFIG_EXT3_FS_SECURITY=y | 984 | CONFIG_EXT3_FS_SECURITY=y |
| 879 | # CONFIG_EXT4DEV_FS is not set | 985 | CONFIG_EXT4_FS=m |
| 986 | CONFIG_EXT4DEV_COMPAT=y | ||
| 987 | CONFIG_EXT4_FS_XATTR=y | ||
| 988 | CONFIG_EXT4_FS_POSIX_ACL=y | ||
| 989 | CONFIG_EXT4_FS_SECURITY=y | ||
| 880 | CONFIG_JBD=y | 990 | CONFIG_JBD=y |
| 881 | # CONFIG_JBD_DEBUG is not set | 991 | CONFIG_JBD2=m |
| 882 | CONFIG_FS_MBCACHE=y | 992 | CONFIG_FS_MBCACHE=y |
| 883 | # CONFIG_REISERFS_FS is not set | 993 | # CONFIG_REISERFS_FS is not set |
| 884 | # CONFIG_JFS_FS is not set | 994 | # CONFIG_JFS_FS is not set |
| 885 | CONFIG_FS_POSIX_ACL=y | 995 | CONFIG_FS_POSIX_ACL=y |
| 996 | CONFIG_FILE_LOCKING=y | ||
| 886 | CONFIG_XFS_FS=m | 997 | CONFIG_XFS_FS=m |
| 887 | CONFIG_XFS_QUOTA=y | 998 | CONFIG_XFS_QUOTA=y |
| 888 | CONFIG_XFS_SECURITY=y | ||
| 889 | # CONFIG_XFS_POSIX_ACL is not set | 999 | # CONFIG_XFS_POSIX_ACL is not set |
| 890 | # CONFIG_XFS_RT is not set | 1000 | # CONFIG_XFS_RT is not set |
| 891 | # CONFIG_GFS2_FS is not set | 1001 | # CONFIG_XFS_DEBUG is not set |
| 892 | # CONFIG_OCFS2_FS is not set | 1002 | # CONFIG_OCFS2_FS is not set |
| 893 | CONFIG_MINIX_FS=m | 1003 | CONFIG_DNOTIFY=y |
| 894 | # CONFIG_ROMFS_FS is not set | ||
| 895 | CONFIG_INOTIFY=y | 1004 | CONFIG_INOTIFY=y |
| 896 | CONFIG_INOTIFY_USER=y | 1005 | CONFIG_INOTIFY_USER=y |
| 897 | CONFIG_QUOTA=y | 1006 | CONFIG_QUOTA=y |
| 1007 | CONFIG_QUOTA_NETLINK_INTERFACE=y | ||
| 1008 | # CONFIG_PRINT_QUOTA_WARNING is not set | ||
| 898 | # CONFIG_QFMT_V1 is not set | 1009 | # CONFIG_QFMT_V1 is not set |
| 899 | CONFIG_QFMT_V2=m | 1010 | CONFIG_QFMT_V2=m |
| 900 | CONFIG_QUOTACTL=y | 1011 | CONFIG_QUOTACTL=y |
| 901 | CONFIG_DNOTIFY=y | ||
| 902 | CONFIG_AUTOFS_FS=m | 1012 | CONFIG_AUTOFS_FS=m |
| 903 | CONFIG_AUTOFS4_FS=m | 1013 | CONFIG_AUTOFS4_FS=m |
| 904 | CONFIG_FUSE_FS=m | 1014 | CONFIG_FUSE_FS=m |
| @@ -929,11 +1039,11 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
| 929 | CONFIG_PROC_FS=y | 1039 | CONFIG_PROC_FS=y |
| 930 | CONFIG_PROC_KCORE=y | 1040 | CONFIG_PROC_KCORE=y |
| 931 | CONFIG_PROC_SYSCTL=y | 1041 | CONFIG_PROC_SYSCTL=y |
| 1042 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 932 | CONFIG_SYSFS=y | 1043 | CONFIG_SYSFS=y |
| 933 | CONFIG_TMPFS=y | 1044 | CONFIG_TMPFS=y |
| 934 | CONFIG_TMPFS_POSIX_ACL=y | 1045 | CONFIG_TMPFS_POSIX_ACL=y |
| 935 | # CONFIG_HUGETLB_PAGE is not set | 1046 | # CONFIG_HUGETLB_PAGE is not set |
| 936 | CONFIG_RAMFS=y | ||
| 937 | CONFIG_CONFIGFS_FS=m | 1047 | CONFIG_CONFIGFS_FS=m |
| 938 | 1048 | ||
| 939 | # | 1049 | # |
| @@ -949,27 +1059,25 @@ CONFIG_CONFIGFS_FS=m | |||
| 949 | CONFIG_EFS_FS=m | 1059 | CONFIG_EFS_FS=m |
| 950 | # CONFIG_CRAMFS is not set | 1060 | # CONFIG_CRAMFS is not set |
| 951 | # CONFIG_VXFS_FS is not set | 1061 | # CONFIG_VXFS_FS is not set |
| 1062 | CONFIG_MINIX_FS=m | ||
| 1063 | CONFIG_OMFS_FS=m | ||
| 952 | # CONFIG_HPFS_FS is not set | 1064 | # CONFIG_HPFS_FS is not set |
| 953 | # CONFIG_QNX4FS_FS is not set | 1065 | # CONFIG_QNX4FS_FS is not set |
| 1066 | # CONFIG_ROMFS_FS is not set | ||
| 954 | # CONFIG_SYSV_FS is not set | 1067 | # CONFIG_SYSV_FS is not set |
| 955 | CONFIG_UFS_FS=m | 1068 | CONFIG_UFS_FS=m |
| 956 | # CONFIG_UFS_FS_WRITE is not set | 1069 | # CONFIG_UFS_FS_WRITE is not set |
| 957 | # CONFIG_UFS_DEBUG is not set | 1070 | # CONFIG_UFS_DEBUG is not set |
| 958 | 1071 | CONFIG_NETWORK_FILESYSTEMS=y | |
| 959 | # | ||
| 960 | # Network File Systems | ||
| 961 | # | ||
| 962 | CONFIG_NFS_FS=m | 1072 | CONFIG_NFS_FS=m |
| 963 | CONFIG_NFS_V3=y | 1073 | CONFIG_NFS_V3=y |
| 964 | CONFIG_NFS_V3_ACL=y | 1074 | CONFIG_NFS_V3_ACL=y |
| 965 | # CONFIG_NFS_V4 is not set | 1075 | # CONFIG_NFS_V4 is not set |
| 966 | # CONFIG_NFS_DIRECTIO is not set | ||
| 967 | CONFIG_NFSD=m | 1076 | CONFIG_NFSD=m |
| 968 | CONFIG_NFSD_V2_ACL=y | 1077 | CONFIG_NFSD_V2_ACL=y |
| 969 | CONFIG_NFSD_V3=y | 1078 | CONFIG_NFSD_V3=y |
| 970 | CONFIG_NFSD_V3_ACL=y | 1079 | CONFIG_NFSD_V3_ACL=y |
| 971 | # CONFIG_NFSD_V4 is not set | 1080 | # CONFIG_NFSD_V4 is not set |
| 972 | CONFIG_NFSD_TCP=y | ||
| 973 | CONFIG_LOCKD=m | 1081 | CONFIG_LOCKD=m |
| 974 | CONFIG_LOCKD_V4=y | 1082 | CONFIG_LOCKD_V4=y |
| 975 | CONFIG_EXPORTFS=m | 1083 | CONFIG_EXPORTFS=m |
| @@ -977,7 +1085,7 @@ CONFIG_NFS_ACL_SUPPORT=m | |||
| 977 | CONFIG_NFS_COMMON=y | 1085 | CONFIG_NFS_COMMON=y |
| 978 | CONFIG_SUNRPC=m | 1086 | CONFIG_SUNRPC=m |
| 979 | CONFIG_SUNRPC_GSS=m | 1087 | CONFIG_SUNRPC_GSS=m |
| 980 | # CONFIG_SUNRPC_BIND34 is not set | 1088 | # CONFIG_SUNRPC_REGISTER_V4 is not set |
| 981 | CONFIG_RPCSEC_GSS_KRB5=m | 1089 | CONFIG_RPCSEC_GSS_KRB5=m |
| 982 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1090 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 983 | CONFIG_SMB_FS=m | 1091 | CONFIG_SMB_FS=m |
| @@ -986,12 +1094,12 @@ CONFIG_SMB_NLS_REMOTE="cp437" | |||
| 986 | CONFIG_CIFS=m | 1094 | CONFIG_CIFS=m |
| 987 | # CONFIG_CIFS_STATS is not set | 1095 | # CONFIG_CIFS_STATS is not set |
| 988 | # CONFIG_CIFS_WEAK_PW_HASH is not set | 1096 | # CONFIG_CIFS_WEAK_PW_HASH is not set |
| 1097 | CONFIG_CIFS_UPCALL=y | ||
| 989 | # CONFIG_CIFS_XATTR is not set | 1098 | # CONFIG_CIFS_XATTR is not set |
| 990 | # CONFIG_CIFS_DEBUG2 is not set | 1099 | # CONFIG_CIFS_DEBUG2 is not set |
| 991 | # CONFIG_CIFS_EXPERIMENTAL is not set | 1100 | # CONFIG_CIFS_EXPERIMENTAL is not set |
| 992 | # CONFIG_NCP_FS is not set | 1101 | # CONFIG_NCP_FS is not set |
| 993 | CONFIG_CODA_FS=m | 1102 | CONFIG_CODA_FS=m |
| 994 | # CONFIG_CODA_FS_OLD_API is not set | ||
| 995 | # CONFIG_AFS_FS is not set | 1103 | # CONFIG_AFS_FS is not set |
| 996 | 1104 | ||
| 997 | # | 1105 | # |
| @@ -1015,10 +1123,6 @@ CONFIG_SGI_PARTITION=y | |||
| 1015 | # CONFIG_KARMA_PARTITION is not set | 1123 | # CONFIG_KARMA_PARTITION is not set |
| 1016 | # CONFIG_EFI_PARTITION is not set | 1124 | # CONFIG_EFI_PARTITION is not set |
| 1017 | # CONFIG_SYSV68_PARTITION is not set | 1125 | # CONFIG_SYSV68_PARTITION is not set |
| 1018 | |||
| 1019 | # | ||
| 1020 | # Native Language Support | ||
| 1021 | # | ||
| 1022 | CONFIG_NLS=m | 1126 | CONFIG_NLS=m |
| 1023 | CONFIG_NLS_DEFAULT="iso8859-1" | 1127 | CONFIG_NLS_DEFAULT="iso8859-1" |
| 1024 | CONFIG_NLS_CODEPAGE_437=m | 1128 | CONFIG_NLS_CODEPAGE_437=m |
| @@ -1059,30 +1163,32 @@ CONFIG_NLS_ISO8859_15=m | |||
| 1059 | CONFIG_NLS_KOI8_R=m | 1163 | CONFIG_NLS_KOI8_R=m |
| 1060 | CONFIG_NLS_KOI8_U=m | 1164 | CONFIG_NLS_KOI8_U=m |
| 1061 | CONFIG_NLS_UTF8=m | 1165 | CONFIG_NLS_UTF8=m |
| 1062 | |||
| 1063 | # | ||
| 1064 | # Distributed Lock Manager | ||
| 1065 | # | ||
| 1066 | CONFIG_DLM=m | 1166 | CONFIG_DLM=m |
| 1067 | # CONFIG_DLM_DEBUG is not set | 1167 | # CONFIG_DLM_DEBUG is not set |
| 1068 | 1168 | ||
| 1069 | # | 1169 | # |
| 1070 | # Profiling support | ||
| 1071 | # | ||
| 1072 | # CONFIG_PROFILING is not set | ||
| 1073 | |||
| 1074 | # | ||
| 1075 | # Kernel hacking | 1170 | # Kernel hacking |
| 1076 | # | 1171 | # |
| 1077 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 1172 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
| 1078 | # CONFIG_PRINTK_TIME is not set | 1173 | # CONFIG_PRINTK_TIME is not set |
| 1174 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
| 1079 | CONFIG_ENABLE_MUST_CHECK=y | 1175 | CONFIG_ENABLE_MUST_CHECK=y |
| 1176 | CONFIG_FRAME_WARN=1024 | ||
| 1080 | # CONFIG_MAGIC_SYSRQ is not set | 1177 | # CONFIG_MAGIC_SYSRQ is not set |
| 1081 | # CONFIG_UNUSED_SYMBOLS is not set | 1178 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1082 | # CONFIG_DEBUG_FS is not set | 1179 | # CONFIG_DEBUG_FS is not set |
| 1083 | # CONFIG_HEADERS_CHECK is not set | 1180 | # CONFIG_HEADERS_CHECK is not set |
| 1084 | # CONFIG_DEBUG_KERNEL is not set | 1181 | # CONFIG_DEBUG_KERNEL is not set |
| 1085 | CONFIG_CROSSCOMPILE=y | 1182 | CONFIG_DEBUG_MEMORY_INIT=y |
| 1183 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
| 1184 | # CONFIG_SYSCTL_SYSCALL_CHECK is not set | ||
| 1185 | |||
| 1186 | # | ||
| 1187 | # Tracers | ||
| 1188 | # | ||
| 1189 | CONFIG_DYNAMIC_PRINTK_DEBUG=y | ||
| 1190 | # CONFIG_SAMPLES is not set | ||
| 1191 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1086 | CONFIG_CMDLINE="" | 1192 | CONFIG_CMDLINE="" |
| 1087 | 1193 | ||
| 1088 | # | 1194 | # |
| @@ -1091,46 +1197,97 @@ CONFIG_CMDLINE="" | |||
| 1091 | CONFIG_KEYS=y | 1197 | CONFIG_KEYS=y |
| 1092 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | 1198 | CONFIG_KEYS_DEBUG_PROC_KEYS=y |
| 1093 | # CONFIG_SECURITY is not set | 1199 | # CONFIG_SECURITY is not set |
| 1200 | # CONFIG_SECURITYFS is not set | ||
| 1201 | CONFIG_SECURITY_FILE_CAPABILITIES=y | ||
| 1094 | CONFIG_CRYPTO=y | 1202 | CONFIG_CRYPTO=y |
| 1203 | |||
| 1204 | # | ||
| 1205 | # Crypto core or helper | ||
| 1206 | # | ||
| 1207 | CONFIG_CRYPTO_FIPS=y | ||
| 1095 | CONFIG_CRYPTO_ALGAPI=y | 1208 | CONFIG_CRYPTO_ALGAPI=y |
| 1096 | CONFIG_CRYPTO_ABLKCIPHER=m | 1209 | CONFIG_CRYPTO_AEAD=y |
| 1097 | CONFIG_CRYPTO_BLKCIPHER=m | 1210 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1098 | CONFIG_CRYPTO_HASH=y | 1211 | CONFIG_CRYPTO_HASH=y |
| 1212 | CONFIG_CRYPTO_RNG=y | ||
| 1099 | CONFIG_CRYPTO_MANAGER=y | 1213 | CONFIG_CRYPTO_MANAGER=y |
| 1214 | CONFIG_CRYPTO_GF128MUL=m | ||
| 1215 | CONFIG_CRYPTO_NULL=m | ||
| 1216 | CONFIG_CRYPTO_CRYPTD=m | ||
| 1217 | CONFIG_CRYPTO_AUTHENC=m | ||
| 1218 | # CONFIG_CRYPTO_TEST is not set | ||
| 1219 | |||
| 1220 | # | ||
| 1221 | # Authenticated Encryption with Associated Data | ||
| 1222 | # | ||
| 1223 | CONFIG_CRYPTO_CCM=m | ||
| 1224 | CONFIG_CRYPTO_GCM=m | ||
| 1225 | CONFIG_CRYPTO_SEQIV=m | ||
| 1226 | |||
| 1227 | # | ||
| 1228 | # Block modes | ||
| 1229 | # | ||
| 1230 | CONFIG_CRYPTO_CBC=m | ||
| 1231 | CONFIG_CRYPTO_CTR=m | ||
| 1232 | CONFIG_CRYPTO_CTS=m | ||
| 1233 | CONFIG_CRYPTO_ECB=m | ||
| 1234 | CONFIG_CRYPTO_LRW=m | ||
| 1235 | CONFIG_CRYPTO_PCBC=m | ||
| 1236 | CONFIG_CRYPTO_XTS=m | ||
| 1237 | |||
| 1238 | # | ||
| 1239 | # Hash modes | ||
| 1240 | # | ||
| 1100 | CONFIG_CRYPTO_HMAC=y | 1241 | CONFIG_CRYPTO_HMAC=y |
| 1101 | CONFIG_CRYPTO_XCBC=m | 1242 | CONFIG_CRYPTO_XCBC=m |
| 1102 | CONFIG_CRYPTO_NULL=m | 1243 | |
| 1244 | # | ||
| 1245 | # Digest | ||
| 1246 | # | ||
| 1247 | CONFIG_CRYPTO_CRC32C=m | ||
| 1103 | CONFIG_CRYPTO_MD4=m | 1248 | CONFIG_CRYPTO_MD4=m |
| 1104 | CONFIG_CRYPTO_MD5=y | 1249 | CONFIG_CRYPTO_MD5=y |
| 1250 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
| 1251 | CONFIG_CRYPTO_RMD128=m | ||
| 1252 | CONFIG_CRYPTO_RMD160=m | ||
| 1253 | CONFIG_CRYPTO_RMD256=m | ||
| 1254 | CONFIG_CRYPTO_RMD320=m | ||
| 1105 | CONFIG_CRYPTO_SHA1=m | 1255 | CONFIG_CRYPTO_SHA1=m |
| 1106 | CONFIG_CRYPTO_SHA256=m | 1256 | CONFIG_CRYPTO_SHA256=m |
| 1107 | CONFIG_CRYPTO_SHA512=m | 1257 | CONFIG_CRYPTO_SHA512=m |
| 1108 | CONFIG_CRYPTO_WP512=m | ||
| 1109 | CONFIG_CRYPTO_TGR192=m | 1258 | CONFIG_CRYPTO_TGR192=m |
| 1110 | CONFIG_CRYPTO_GF128MUL=m | 1259 | CONFIG_CRYPTO_WP512=m |
| 1111 | CONFIG_CRYPTO_ECB=m | 1260 | |
| 1112 | CONFIG_CRYPTO_CBC=m | 1261 | # |
| 1113 | CONFIG_CRYPTO_PCBC=m | 1262 | # Ciphers |
| 1114 | CONFIG_CRYPTO_LRW=m | 1263 | # |
| 1115 | CONFIG_CRYPTO_CRYPTD=m | ||
| 1116 | CONFIG_CRYPTO_DES=m | ||
| 1117 | CONFIG_CRYPTO_FCRYPT=m | ||
| 1118 | CONFIG_CRYPTO_BLOWFISH=m | ||
| 1119 | CONFIG_CRYPTO_TWOFISH=m | ||
| 1120 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
| 1121 | CONFIG_CRYPTO_SERPENT=m | ||
| 1122 | CONFIG_CRYPTO_AES=m | 1264 | CONFIG_CRYPTO_AES=m |
| 1265 | CONFIG_CRYPTO_ANUBIS=m | ||
| 1266 | CONFIG_CRYPTO_ARC4=m | ||
| 1267 | CONFIG_CRYPTO_BLOWFISH=m | ||
| 1268 | CONFIG_CRYPTO_CAMELLIA=m | ||
| 1123 | CONFIG_CRYPTO_CAST5=m | 1269 | CONFIG_CRYPTO_CAST5=m |
| 1124 | CONFIG_CRYPTO_CAST6=m | 1270 | CONFIG_CRYPTO_CAST6=m |
| 1125 | CONFIG_CRYPTO_TEA=m | 1271 | CONFIG_CRYPTO_DES=m |
| 1126 | CONFIG_CRYPTO_ARC4=m | 1272 | CONFIG_CRYPTO_FCRYPT=m |
| 1127 | CONFIG_CRYPTO_KHAZAD=m | 1273 | CONFIG_CRYPTO_KHAZAD=m |
| 1128 | CONFIG_CRYPTO_ANUBIS=m | 1274 | CONFIG_CRYPTO_SALSA20=m |
| 1275 | CONFIG_CRYPTO_SEED=m | ||
| 1276 | CONFIG_CRYPTO_SERPENT=m | ||
| 1277 | CONFIG_CRYPTO_TEA=m | ||
| 1278 | CONFIG_CRYPTO_TWOFISH=m | ||
| 1279 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
| 1280 | |||
| 1281 | # | ||
| 1282 | # Compression | ||
| 1283 | # | ||
| 1129 | CONFIG_CRYPTO_DEFLATE=m | 1284 | CONFIG_CRYPTO_DEFLATE=m |
| 1130 | CONFIG_CRYPTO_MICHAEL_MIC=m | 1285 | CONFIG_CRYPTO_LZO=m |
| 1131 | CONFIG_CRYPTO_CRC32C=m | 1286 | |
| 1132 | CONFIG_CRYPTO_CAMELLIA=m | 1287 | # |
| 1133 | # CONFIG_CRYPTO_TEST is not set | 1288 | # Random Number Generation |
| 1289 | # | ||
| 1290 | CONFIG_CRYPTO_ANSI_CPRNG=m | ||
| 1134 | # CONFIG_CRYPTO_HW is not set | 1291 | # CONFIG_CRYPTO_HW is not set |
| 1135 | 1292 | ||
| 1136 | # | 1293 | # |
| @@ -1139,12 +1296,15 @@ CONFIG_CRYPTO_CAMELLIA=m | |||
| 1139 | CONFIG_BITREVERSE=m | 1296 | CONFIG_BITREVERSE=m |
| 1140 | # CONFIG_CRC_CCITT is not set | 1297 | # CONFIG_CRC_CCITT is not set |
| 1141 | CONFIG_CRC16=m | 1298 | CONFIG_CRC16=m |
| 1142 | # CONFIG_CRC_ITU_T is not set | 1299 | CONFIG_CRC_T10DIF=m |
| 1300 | CONFIG_CRC_ITU_T=m | ||
| 1143 | CONFIG_CRC32=m | 1301 | CONFIG_CRC32=m |
| 1144 | # CONFIG_CRC7 is not set | 1302 | # CONFIG_CRC7 is not set |
| 1145 | CONFIG_LIBCRC32C=m | 1303 | CONFIG_LIBCRC32C=m |
| 1146 | CONFIG_ZLIB_INFLATE=m | 1304 | CONFIG_ZLIB_INFLATE=m |
| 1147 | CONFIG_ZLIB_DEFLATE=m | 1305 | CONFIG_ZLIB_DEFLATE=m |
| 1306 | CONFIG_LZO_COMPRESS=m | ||
| 1307 | CONFIG_LZO_DECOMPRESS=m | ||
| 1148 | CONFIG_TEXTSEARCH=y | 1308 | CONFIG_TEXTSEARCH=y |
| 1149 | CONFIG_TEXTSEARCH_KMP=m | 1309 | CONFIG_TEXTSEARCH_KMP=m |
| 1150 | CONFIG_TEXTSEARCH_BM=m | 1310 | CONFIG_TEXTSEARCH_BM=m |
diff --git a/arch/mips/configs/ip32_defconfig b/arch/mips/configs/ip32_defconfig index fe4699df9626..de4c7a0a96dd 100644 --- a/arch/mips/configs/ip32_defconfig +++ b/arch/mips/configs/ip32_defconfig | |||
| @@ -1,71 +1,71 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.20 | 3 | # Linux kernel version: 2.6.28-rc7 |
| 4 | # Tue Feb 20 21:47:33 2007 | 4 | # Wed Dec 10 14:39:08 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Machine selection | 9 | # Machine selection |
| 10 | # | 10 | # |
| 11 | CONFIG_ZONE_DMA=y | 11 | # CONFIG_MACH_ALCHEMY is not set |
| 12 | # CONFIG_MIPS_MTX1 is not set | ||
| 13 | # CONFIG_MIPS_BOSPORUS is not set | ||
| 14 | # CONFIG_MIPS_PB1000 is not set | ||
| 15 | # CONFIG_MIPS_PB1100 is not set | ||
| 16 | # CONFIG_MIPS_PB1500 is not set | ||
| 17 | # CONFIG_MIPS_PB1550 is not set | ||
| 18 | # CONFIG_MIPS_PB1200 is not set | ||
| 19 | # CONFIG_MIPS_DB1000 is not set | ||
| 20 | # CONFIG_MIPS_DB1100 is not set | ||
| 21 | # CONFIG_MIPS_DB1500 is not set | ||
| 22 | # CONFIG_MIPS_DB1550 is not set | ||
| 23 | # CONFIG_MIPS_DB1200 is not set | ||
| 24 | # CONFIG_MIPS_MIRAGE is not set | ||
| 25 | # CONFIG_BASLER_EXCITE is not set | 12 | # CONFIG_BASLER_EXCITE is not set |
| 13 | # CONFIG_BCM47XX is not set | ||
| 26 | # CONFIG_MIPS_COBALT is not set | 14 | # CONFIG_MIPS_COBALT is not set |
| 27 | # CONFIG_MACH_DECSTATION is not set | 15 | # CONFIG_MACH_DECSTATION is not set |
| 28 | # CONFIG_MACH_JAZZ is not set | 16 | # CONFIG_MACH_JAZZ is not set |
| 17 | # CONFIG_LASAT is not set | ||
| 18 | # CONFIG_LEMOTE_FULONG is not set | ||
| 29 | # CONFIG_MIPS_MALTA is not set | 19 | # CONFIG_MIPS_MALTA is not set |
| 30 | # CONFIG_WR_PPMC is not set | ||
| 31 | # CONFIG_MIPS_SIM is not set | 20 | # CONFIG_MIPS_SIM is not set |
| 32 | # CONFIG_MOMENCO_JAGUAR_ATX is not set | 21 | # CONFIG_MACH_EMMA is not set |
| 33 | # CONFIG_MIPS_XXS1500 is not set | 22 | # CONFIG_MACH_VR41XX is not set |
| 23 | # CONFIG_NXP_STB220 is not set | ||
| 24 | # CONFIG_NXP_STB225 is not set | ||
| 34 | # CONFIG_PNX8550_JBS is not set | 25 | # CONFIG_PNX8550_JBS is not set |
| 35 | # CONFIG_PNX8550_STB810 is not set | 26 | # CONFIG_PNX8550_STB810 is not set |
| 36 | # CONFIG_MACH_VR41XX is not set | 27 | # CONFIG_PMC_MSP is not set |
| 37 | # CONFIG_PMC_YOSEMITE is not set | 28 | # CONFIG_PMC_YOSEMITE is not set |
| 38 | # CONFIG_MARKEINS is not set | ||
| 39 | # CONFIG_SGI_IP22 is not set | 29 | # CONFIG_SGI_IP22 is not set |
| 40 | # CONFIG_SGI_IP27 is not set | 30 | # CONFIG_SGI_IP27 is not set |
| 31 | # CONFIG_SGI_IP28 is not set | ||
| 41 | CONFIG_SGI_IP32=y | 32 | CONFIG_SGI_IP32=y |
| 42 | # CONFIG_SIBYTE_BIGSUR is not set | ||
| 43 | # CONFIG_SIBYTE_SWARM is not set | ||
| 44 | # CONFIG_SIBYTE_SENTOSA is not set | ||
| 45 | # CONFIG_SIBYTE_RHONE is not set | ||
| 46 | # CONFIG_SIBYTE_CARMEL is not set | ||
| 47 | # CONFIG_SIBYTE_LITTLESUR is not set | ||
| 48 | # CONFIG_SIBYTE_CRHINE is not set | 33 | # CONFIG_SIBYTE_CRHINE is not set |
| 34 | # CONFIG_SIBYTE_CARMEL is not set | ||
| 49 | # CONFIG_SIBYTE_CRHONE is not set | 35 | # CONFIG_SIBYTE_CRHONE is not set |
| 36 | # CONFIG_SIBYTE_RHONE is not set | ||
| 37 | # CONFIG_SIBYTE_SWARM is not set | ||
| 38 | # CONFIG_SIBYTE_LITTLESUR is not set | ||
| 39 | # CONFIG_SIBYTE_SENTOSA is not set | ||
| 40 | # CONFIG_SIBYTE_BIGSUR is not set | ||
| 50 | # CONFIG_SNI_RM is not set | 41 | # CONFIG_SNI_RM is not set |
| 51 | # CONFIG_TOSHIBA_JMR3927 is not set | 42 | # CONFIG_MACH_TX39XX is not set |
| 52 | # CONFIG_TOSHIBA_RBTX4927 is not set | 43 | # CONFIG_MACH_TX49XX is not set |
| 53 | # CONFIG_TOSHIBA_RBTX4938 is not set | 44 | # CONFIG_MIKROTIK_RB532 is not set |
| 45 | # CONFIG_WR_PPMC is not set | ||
| 54 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 46 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 55 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 47 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
| 56 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 48 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
| 49 | CONFIG_ARCH_SUPPORTS_OPROFILE=y | ||
| 57 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 50 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 58 | CONFIG_GENERIC_HWEIGHT=y | 51 | CONFIG_GENERIC_HWEIGHT=y |
| 59 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 52 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 53 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 60 | CONFIG_GENERIC_TIME=y | 54 | CONFIG_GENERIC_TIME=y |
| 55 | CONFIG_GENERIC_CMOS_UPDATE=y | ||
| 61 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 56 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 62 | # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set | 57 | # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set |
| 63 | CONFIG_ARC=y | 58 | CONFIG_ARC=y |
| 59 | CONFIG_CEVT_R4K=y | ||
| 60 | CONFIG_CSRC_R4K=y | ||
| 64 | CONFIG_DMA_NONCOHERENT=y | 61 | CONFIG_DMA_NONCOHERENT=y |
| 65 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 62 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| 63 | # CONFIG_HOTPLUG_CPU is not set | ||
| 64 | # CONFIG_NO_IOPORT is not set | ||
| 66 | CONFIG_CPU_BIG_ENDIAN=y | 65 | CONFIG_CPU_BIG_ENDIAN=y |
| 67 | # CONFIG_CPU_LITTLE_ENDIAN is not set | 66 | # CONFIG_CPU_LITTLE_ENDIAN is not set |
| 68 | CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y | 67 | CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y |
| 68 | CONFIG_IRQ_CPU=y | ||
| 69 | CONFIG_ARC32=y | 69 | CONFIG_ARC32=y |
| 70 | CONFIG_BOOT_ELF32=y | 70 | CONFIG_BOOT_ELF32=y |
| 71 | CONFIG_MIPS_L1_CACHE_SHIFT=5 | 71 | CONFIG_MIPS_L1_CACHE_SHIFT=5 |
| @@ -75,6 +75,7 @@ CONFIG_ARC_PROMLIB=y | |||
| 75 | # | 75 | # |
| 76 | # CPU selection | 76 | # CPU selection |
| 77 | # | 77 | # |
| 78 | # CONFIG_CPU_LOONGSON2 is not set | ||
| 78 | # CONFIG_CPU_MIPS32_R1 is not set | 79 | # CONFIG_CPU_MIPS32_R1 is not set |
| 79 | # CONFIG_CPU_MIPS32_R2 is not set | 80 | # CONFIG_CPU_MIPS32_R2 is not set |
| 80 | # CONFIG_CPU_MIPS64_R1 is not set | 81 | # CONFIG_CPU_MIPS64_R1 is not set |
| @@ -87,6 +88,7 @@ CONFIG_ARC_PROMLIB=y | |||
| 87 | # CONFIG_CPU_TX49XX is not set | 88 | # CONFIG_CPU_TX49XX is not set |
| 88 | CONFIG_CPU_R5000=y | 89 | CONFIG_CPU_R5000=y |
| 89 | # CONFIG_CPU_R5432 is not set | 90 | # CONFIG_CPU_R5432 is not set |
| 91 | # CONFIG_CPU_R5500 is not set | ||
| 90 | # CONFIG_CPU_R6000 is not set | 92 | # CONFIG_CPU_R6000 is not set |
| 91 | # CONFIG_CPU_NEVADA is not set | 93 | # CONFIG_CPU_NEVADA is not set |
| 92 | # CONFIG_CPU_R8000 is not set | 94 | # CONFIG_CPU_R8000 is not set |
| @@ -116,65 +118,73 @@ CONFIG_RM7000_CPU_SCACHE=y | |||
| 116 | CONFIG_MIPS_MT_DISABLED=y | 118 | CONFIG_MIPS_MT_DISABLED=y |
| 117 | # CONFIG_MIPS_MT_SMP is not set | 119 | # CONFIG_MIPS_MT_SMP is not set |
| 118 | # CONFIG_MIPS_MT_SMTC is not set | 120 | # CONFIG_MIPS_MT_SMTC is not set |
| 119 | # CONFIG_MIPS_VPE_LOADER is not set | ||
| 120 | CONFIG_CPU_HAS_LLSC=y | 121 | CONFIG_CPU_HAS_LLSC=y |
| 121 | CONFIG_CPU_HAS_SYNC=y | 122 | CONFIG_CPU_HAS_SYNC=y |
| 122 | CONFIG_GENERIC_HARDIRQS=y | 123 | CONFIG_GENERIC_HARDIRQS=y |
| 123 | CONFIG_GENERIC_IRQ_PROBE=y | 124 | CONFIG_GENERIC_IRQ_PROBE=y |
| 124 | CONFIG_ARCH_FLATMEM_ENABLE=y | 125 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 126 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
| 125 | CONFIG_SELECT_MEMORY_MODEL=y | 127 | CONFIG_SELECT_MEMORY_MODEL=y |
| 126 | CONFIG_FLATMEM_MANUAL=y | 128 | CONFIG_FLATMEM_MANUAL=y |
| 127 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 129 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| 128 | # CONFIG_SPARSEMEM_MANUAL is not set | 130 | # CONFIG_SPARSEMEM_MANUAL is not set |
| 129 | CONFIG_FLATMEM=y | 131 | CONFIG_FLATMEM=y |
| 130 | CONFIG_FLAT_NODE_MEM_MAP=y | 132 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 131 | # CONFIG_SPARSEMEM_STATIC is not set | 133 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 132 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 134 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 133 | CONFIG_RESOURCES_64BIT=y | 135 | CONFIG_RESOURCES_64BIT=y |
| 134 | CONFIG_ZONE_DMA_FLAG=1 | 136 | CONFIG_PHYS_ADDR_T_64BIT=y |
| 137 | CONFIG_ZONE_DMA_FLAG=0 | ||
| 138 | CONFIG_VIRT_TO_BUS=y | ||
| 139 | CONFIG_UNEVICTABLE_LRU=y | ||
| 140 | # CONFIG_NO_HZ is not set | ||
| 141 | # CONFIG_HIGH_RES_TIMERS is not set | ||
| 142 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 135 | # CONFIG_HZ_48 is not set | 143 | # CONFIG_HZ_48 is not set |
| 136 | # CONFIG_HZ_100 is not set | 144 | # CONFIG_HZ_100 is not set |
| 137 | # CONFIG_HZ_128 is not set | 145 | # CONFIG_HZ_128 is not set |
| 138 | # CONFIG_HZ_250 is not set | 146 | CONFIG_HZ_250=y |
| 139 | # CONFIG_HZ_256 is not set | 147 | # CONFIG_HZ_256 is not set |
| 140 | CONFIG_HZ_1000=y | 148 | # CONFIG_HZ_1000 is not set |
| 141 | # CONFIG_HZ_1024 is not set | 149 | # CONFIG_HZ_1024 is not set |
| 142 | CONFIG_SYS_SUPPORTS_ARBIT_HZ=y | 150 | CONFIG_SYS_SUPPORTS_ARBIT_HZ=y |
| 143 | CONFIG_HZ=1000 | 151 | CONFIG_HZ=250 |
| 144 | # CONFIG_PREEMPT_NONE is not set | 152 | CONFIG_PREEMPT_NONE=y |
| 145 | CONFIG_PREEMPT_VOLUNTARY=y | 153 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 146 | # CONFIG_PREEMPT is not set | 154 | # CONFIG_PREEMPT is not set |
| 147 | # CONFIG_KEXEC is not set | 155 | # CONFIG_KEXEC is not set |
| 156 | # CONFIG_SECCOMP is not set | ||
| 148 | CONFIG_LOCKDEP_SUPPORT=y | 157 | CONFIG_LOCKDEP_SUPPORT=y |
| 149 | CONFIG_STACKTRACE_SUPPORT=y | 158 | CONFIG_STACKTRACE_SUPPORT=y |
| 150 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 159 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 151 | 160 | ||
| 152 | # | 161 | # |
| 153 | # Code maturity level options | 162 | # General setup |
| 154 | # | 163 | # |
| 155 | CONFIG_EXPERIMENTAL=y | 164 | CONFIG_EXPERIMENTAL=y |
| 156 | CONFIG_BROKEN_ON_SMP=y | 165 | CONFIG_BROKEN_ON_SMP=y |
| 157 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 166 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 158 | |||
| 159 | # | ||
| 160 | # General setup | ||
| 161 | # | ||
| 162 | CONFIG_LOCALVERSION="" | 167 | CONFIG_LOCALVERSION="" |
| 163 | CONFIG_LOCALVERSION_AUTO=y | 168 | CONFIG_LOCALVERSION_AUTO=y |
| 164 | CONFIG_SWAP=y | 169 | CONFIG_SWAP=y |
| 165 | CONFIG_SYSVIPC=y | 170 | CONFIG_SYSVIPC=y |
| 166 | # CONFIG_IPC_NS is not set | ||
| 167 | CONFIG_SYSVIPC_SYSCTL=y | 171 | CONFIG_SYSVIPC_SYSCTL=y |
| 168 | # CONFIG_POSIX_MQUEUE is not set | 172 | CONFIG_POSIX_MQUEUE=y |
| 169 | CONFIG_BSD_PROCESS_ACCT=y | 173 | CONFIG_BSD_PROCESS_ACCT=y |
| 170 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | 174 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set |
| 171 | # CONFIG_TASKSTATS is not set | 175 | # CONFIG_TASKSTATS is not set |
| 172 | # CONFIG_UTS_NS is not set | 176 | CONFIG_AUDIT=y |
| 173 | # CONFIG_AUDIT is not set | 177 | CONFIG_IKCONFIG=y |
| 174 | # CONFIG_IKCONFIG is not set | 178 | CONFIG_IKCONFIG_PROC=y |
| 179 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 180 | # CONFIG_CGROUPS is not set | ||
| 181 | # CONFIG_GROUP_SCHED is not set | ||
| 175 | CONFIG_SYSFS_DEPRECATED=y | 182 | CONFIG_SYSFS_DEPRECATED=y |
| 183 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 176 | CONFIG_RELAY=y | 184 | CONFIG_RELAY=y |
| 177 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 185 | # CONFIG_NAMESPACES is not set |
| 186 | # CONFIG_BLK_DEV_INITRD is not set | ||
| 187 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
| 178 | CONFIG_SYSCTL=y | 188 | CONFIG_SYSCTL=y |
| 179 | CONFIG_EMBEDDED=y | 189 | CONFIG_EMBEDDED=y |
| 180 | CONFIG_SYSCTL_SYSCALL=y | 190 | CONFIG_SYSCTL_SYSCALL=y |
| @@ -184,27 +194,43 @@ CONFIG_HOTPLUG=y | |||
| 184 | CONFIG_PRINTK=y | 194 | CONFIG_PRINTK=y |
| 185 | CONFIG_BUG=y | 195 | CONFIG_BUG=y |
| 186 | CONFIG_ELF_CORE=y | 196 | CONFIG_ELF_CORE=y |
| 197 | CONFIG_PCSPKR_PLATFORM=y | ||
| 198 | CONFIG_COMPAT_BRK=y | ||
| 187 | CONFIG_BASE_FULL=y | 199 | CONFIG_BASE_FULL=y |
| 188 | CONFIG_FUTEX=y | 200 | CONFIG_FUTEX=y |
| 201 | CONFIG_ANON_INODES=y | ||
| 189 | CONFIG_EPOLL=y | 202 | CONFIG_EPOLL=y |
| 203 | CONFIG_SIGNALFD=y | ||
| 204 | CONFIG_TIMERFD=y | ||
| 205 | CONFIG_EVENTFD=y | ||
| 190 | CONFIG_SHMEM=y | 206 | CONFIG_SHMEM=y |
| 191 | CONFIG_SLAB=y | 207 | CONFIG_AIO=y |
| 192 | CONFIG_VM_EVENT_COUNTERS=y | 208 | CONFIG_VM_EVENT_COUNTERS=y |
| 209 | CONFIG_PCI_QUIRKS=y | ||
| 210 | CONFIG_SLAB=y | ||
| 211 | # CONFIG_SLUB is not set | ||
| 212 | # CONFIG_SLOB is not set | ||
| 213 | CONFIG_PROFILING=y | ||
| 214 | # CONFIG_MARKERS is not set | ||
| 215 | CONFIG_OPROFILE=m | ||
| 216 | CONFIG_HAVE_OPROFILE=y | ||
| 217 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 218 | CONFIG_SLABINFO=y | ||
| 193 | CONFIG_RT_MUTEXES=y | 219 | CONFIG_RT_MUTEXES=y |
| 194 | # CONFIG_TINY_SHMEM is not set | 220 | # CONFIG_TINY_SHMEM is not set |
| 195 | CONFIG_BASE_SMALL=0 | 221 | CONFIG_BASE_SMALL=0 |
| 196 | # CONFIG_SLOB is not set | 222 | CONFIG_MODULES=y |
| 197 | 223 | # CONFIG_MODULE_FORCE_LOAD is not set | |
| 198 | # | 224 | CONFIG_MODULE_UNLOAD=y |
| 199 | # Loadable module support | 225 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 200 | # | 226 | # CONFIG_MODVERSIONS is not set |
| 201 | # CONFIG_MODULES is not set | 227 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 202 | 228 | CONFIG_KMOD=y | |
| 203 | # | ||
| 204 | # Block layer | ||
| 205 | # | ||
| 206 | CONFIG_BLOCK=y | 229 | CONFIG_BLOCK=y |
| 207 | # CONFIG_BLK_DEV_IO_TRACE is not set | 230 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 231 | # CONFIG_BLK_DEV_BSG is not set | ||
| 232 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 233 | CONFIG_BLOCK_COMPAT=y | ||
| 208 | 234 | ||
| 209 | # | 235 | # |
| 210 | # IO Schedulers | 236 | # IO Schedulers |
| @@ -213,59 +239,50 @@ CONFIG_IOSCHED_NOOP=y | |||
| 213 | CONFIG_IOSCHED_AS=y | 239 | CONFIG_IOSCHED_AS=y |
| 214 | CONFIG_IOSCHED_DEADLINE=y | 240 | CONFIG_IOSCHED_DEADLINE=y |
| 215 | CONFIG_IOSCHED_CFQ=y | 241 | CONFIG_IOSCHED_CFQ=y |
| 216 | CONFIG_DEFAULT_AS=y | 242 | # CONFIG_DEFAULT_AS is not set |
| 217 | # CONFIG_DEFAULT_DEADLINE is not set | 243 | # CONFIG_DEFAULT_DEADLINE is not set |
| 218 | # CONFIG_DEFAULT_CFQ is not set | 244 | CONFIG_DEFAULT_CFQ=y |
| 219 | # CONFIG_DEFAULT_NOOP is not set | 245 | # CONFIG_DEFAULT_NOOP is not set |
| 220 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 246 | CONFIG_DEFAULT_IOSCHED="cfq" |
| 247 | CONFIG_CLASSIC_RCU=y | ||
| 248 | # CONFIG_FREEZER is not set | ||
| 221 | 249 | ||
| 222 | # | 250 | # |
| 223 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 251 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 224 | # | 252 | # |
| 225 | CONFIG_HW_HAS_PCI=y | 253 | CONFIG_HW_HAS_PCI=y |
| 226 | CONFIG_PCI=y | 254 | CONFIG_PCI=y |
| 255 | CONFIG_PCI_DOMAINS=y | ||
| 256 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 257 | # CONFIG_PCI_LEGACY is not set | ||
| 227 | CONFIG_MMU=y | 258 | CONFIG_MMU=y |
| 228 | |||
| 229 | # | ||
| 230 | # PCCARD (PCMCIA/CardBus) support | ||
| 231 | # | ||
| 232 | # CONFIG_PCCARD is not set | 259 | # CONFIG_PCCARD is not set |
| 233 | |||
| 234 | # | ||
| 235 | # PCI Hotplug Support | ||
| 236 | # | ||
| 237 | # CONFIG_HOTPLUG_PCI is not set | 260 | # CONFIG_HOTPLUG_PCI is not set |
| 238 | 261 | ||
| 239 | # | 262 | # |
| 240 | # Executable file formats | 263 | # Executable file formats |
| 241 | # | 264 | # |
| 242 | CONFIG_BINFMT_ELF=y | 265 | CONFIG_BINFMT_ELF=y |
| 266 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 267 | # CONFIG_HAVE_AOUT is not set | ||
| 243 | CONFIG_BINFMT_MISC=y | 268 | CONFIG_BINFMT_MISC=y |
| 244 | # CONFIG_BUILD_ELF64 is not set | ||
| 245 | CONFIG_MIPS32_COMPAT=y | 269 | CONFIG_MIPS32_COMPAT=y |
| 246 | CONFIG_COMPAT=y | 270 | CONFIG_COMPAT=y |
| 247 | CONFIG_SYSVIPC_COMPAT=y | 271 | CONFIG_SYSVIPC_COMPAT=y |
| 248 | CONFIG_MIPS32_O32=y | 272 | CONFIG_MIPS32_O32=y |
| 249 | # CONFIG_MIPS32_N32 is not set | 273 | CONFIG_MIPS32_N32=y |
| 250 | CONFIG_BINFMT_ELF32=y | 274 | CONFIG_BINFMT_ELF32=y |
| 251 | 275 | ||
| 252 | # | 276 | # |
| 253 | # Power management options | 277 | # Power management options |
| 254 | # | 278 | # |
| 255 | CONFIG_PM=y | 279 | CONFIG_ARCH_SUSPEND_POSSIBLE=y |
| 256 | # CONFIG_PM_LEGACY is not set | 280 | # CONFIG_PM is not set |
| 257 | # CONFIG_PM_DEBUG is not set | ||
| 258 | # CONFIG_PM_SYSFS_DEPRECATED is not set | ||
| 259 | |||
| 260 | # | ||
| 261 | # Networking | ||
| 262 | # | ||
| 263 | CONFIG_NET=y | 281 | CONFIG_NET=y |
| 264 | 282 | ||
| 265 | # | 283 | # |
| 266 | # Networking options | 284 | # Networking options |
| 267 | # | 285 | # |
| 268 | # CONFIG_NETDEBUG is not set | ||
| 269 | CONFIG_PACKET=y | 286 | CONFIG_PACKET=y |
| 270 | CONFIG_PACKET_MMAP=y | 287 | CONFIG_PACKET_MMAP=y |
| 271 | CONFIG_UNIX=y | 288 | CONFIG_UNIX=y |
| @@ -273,56 +290,83 @@ CONFIG_XFRM=y | |||
| 273 | CONFIG_XFRM_USER=y | 290 | CONFIG_XFRM_USER=y |
| 274 | # CONFIG_XFRM_SUB_POLICY is not set | 291 | # CONFIG_XFRM_SUB_POLICY is not set |
| 275 | CONFIG_XFRM_MIGRATE=y | 292 | CONFIG_XFRM_MIGRATE=y |
| 293 | # CONFIG_XFRM_STATISTICS is not set | ||
| 294 | CONFIG_XFRM_IPCOMP=m | ||
| 276 | CONFIG_NET_KEY=y | 295 | CONFIG_NET_KEY=y |
| 277 | CONFIG_NET_KEY_MIGRATE=y | 296 | CONFIG_NET_KEY_MIGRATE=y |
| 278 | CONFIG_INET=y | 297 | CONFIG_INET=y |
| 279 | # CONFIG_IP_MULTICAST is not set | 298 | CONFIG_IP_MULTICAST=y |
| 280 | # CONFIG_IP_ADVANCED_ROUTER is not set | 299 | # CONFIG_IP_ADVANCED_ROUTER is not set |
| 281 | CONFIG_IP_FIB_HASH=y | 300 | CONFIG_IP_FIB_HASH=y |
| 282 | CONFIG_IP_PNP=y | 301 | CONFIG_IP_PNP=y |
| 283 | # CONFIG_IP_PNP_DHCP is not set | 302 | CONFIG_IP_PNP_DHCP=y |
| 284 | CONFIG_IP_PNP_BOOTP=y | 303 | CONFIG_IP_PNP_BOOTP=y |
| 285 | # CONFIG_IP_PNP_RARP is not set | 304 | # CONFIG_IP_PNP_RARP is not set |
| 286 | # CONFIG_NET_IPIP is not set | 305 | CONFIG_NET_IPIP=m |
| 287 | # CONFIG_NET_IPGRE is not set | 306 | CONFIG_NET_IPGRE=m |
| 307 | # CONFIG_NET_IPGRE_BROADCAST is not set | ||
| 308 | # CONFIG_IP_MROUTE is not set | ||
| 288 | # CONFIG_ARPD is not set | 309 | # CONFIG_ARPD is not set |
| 289 | # CONFIG_SYN_COOKIES is not set | 310 | # CONFIG_SYN_COOKIES is not set |
| 290 | # CONFIG_INET_AH is not set | 311 | CONFIG_INET_AH=m |
| 291 | # CONFIG_INET_ESP is not set | 312 | CONFIG_INET_ESP=m |
| 292 | # CONFIG_INET_IPCOMP is not set | 313 | CONFIG_INET_IPCOMP=m |
| 293 | # CONFIG_INET_XFRM_TUNNEL is not set | 314 | CONFIG_INET_XFRM_TUNNEL=m |
| 294 | # CONFIG_INET_TUNNEL is not set | 315 | CONFIG_INET_TUNNEL=m |
| 295 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | 316 | CONFIG_INET_XFRM_MODE_TRANSPORT=y |
| 296 | CONFIG_INET_XFRM_MODE_TUNNEL=y | 317 | CONFIG_INET_XFRM_MODE_TUNNEL=y |
| 297 | CONFIG_INET_XFRM_MODE_BEET=y | 318 | CONFIG_INET_XFRM_MODE_BEET=y |
| 319 | # CONFIG_INET_LRO is not set | ||
| 298 | CONFIG_INET_DIAG=y | 320 | CONFIG_INET_DIAG=y |
| 299 | CONFIG_INET_TCP_DIAG=y | 321 | CONFIG_INET_TCP_DIAG=y |
| 300 | # CONFIG_TCP_CONG_ADVANCED is not set | 322 | CONFIG_TCP_CONG_ADVANCED=y |
| 323 | CONFIG_TCP_CONG_BIC=m | ||
| 301 | CONFIG_TCP_CONG_CUBIC=y | 324 | CONFIG_TCP_CONG_CUBIC=y |
| 325 | CONFIG_TCP_CONG_WESTWOOD=m | ||
| 326 | CONFIG_TCP_CONG_HTCP=m | ||
| 327 | # CONFIG_TCP_CONG_HSTCP is not set | ||
| 328 | # CONFIG_TCP_CONG_HYBLA is not set | ||
| 329 | # CONFIG_TCP_CONG_VEGAS is not set | ||
| 330 | # CONFIG_TCP_CONG_SCALABLE is not set | ||
| 331 | # CONFIG_TCP_CONG_LP is not set | ||
| 332 | # CONFIG_TCP_CONG_VENO is not set | ||
| 333 | # CONFIG_TCP_CONG_YEAH is not set | ||
| 334 | # CONFIG_TCP_CONG_ILLINOIS is not set | ||
| 335 | # CONFIG_DEFAULT_BIC is not set | ||
| 336 | CONFIG_DEFAULT_CUBIC=y | ||
| 337 | # CONFIG_DEFAULT_HTCP is not set | ||
| 338 | # CONFIG_DEFAULT_VEGAS is not set | ||
| 339 | # CONFIG_DEFAULT_WESTWOOD is not set | ||
| 340 | # CONFIG_DEFAULT_RENO is not set | ||
| 302 | CONFIG_DEFAULT_TCP_CONG="cubic" | 341 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 303 | CONFIG_TCP_MD5SIG=y | 342 | CONFIG_TCP_MD5SIG=y |
| 304 | # CONFIG_IPV6 is not set | 343 | CONFIG_IPV6=m |
| 305 | # CONFIG_INET6_XFRM_TUNNEL is not set | 344 | # CONFIG_IPV6_PRIVACY is not set |
| 306 | # CONFIG_INET6_TUNNEL is not set | 345 | # CONFIG_IPV6_ROUTER_PREF is not set |
| 346 | # CONFIG_IPV6_OPTIMISTIC_DAD is not set | ||
| 347 | CONFIG_INET6_AH=m | ||
| 348 | CONFIG_INET6_ESP=m | ||
| 349 | CONFIG_INET6_IPCOMP=m | ||
| 350 | # CONFIG_IPV6_MIP6 is not set | ||
| 351 | CONFIG_INET6_XFRM_TUNNEL=m | ||
| 352 | CONFIG_INET6_TUNNEL=m | ||
| 353 | CONFIG_INET6_XFRM_MODE_TRANSPORT=m | ||
| 354 | CONFIG_INET6_XFRM_MODE_TUNNEL=m | ||
| 355 | CONFIG_INET6_XFRM_MODE_BEET=m | ||
| 356 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | ||
| 357 | CONFIG_IPV6_SIT=m | ||
| 358 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
| 359 | CONFIG_IPV6_TUNNEL=m | ||
| 360 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | ||
| 361 | # CONFIG_IPV6_MROUTE is not set | ||
| 307 | CONFIG_NETWORK_SECMARK=y | 362 | CONFIG_NETWORK_SECMARK=y |
| 308 | # CONFIG_NETFILTER is not set | 363 | # CONFIG_NETFILTER is not set |
| 309 | |||
| 310 | # | ||
| 311 | # DCCP Configuration (EXPERIMENTAL) | ||
| 312 | # | ||
| 313 | # CONFIG_IP_DCCP is not set | 364 | # CONFIG_IP_DCCP is not set |
| 314 | |||
| 315 | # | ||
| 316 | # SCTP Configuration (EXPERIMENTAL) | ||
| 317 | # | ||
| 318 | # CONFIG_IP_SCTP is not set | 365 | # CONFIG_IP_SCTP is not set |
| 319 | |||
| 320 | # | ||
| 321 | # TIPC Configuration (EXPERIMENTAL) | ||
| 322 | # | ||
| 323 | # CONFIG_TIPC is not set | 366 | # CONFIG_TIPC is not set |
| 324 | # CONFIG_ATM is not set | 367 | # CONFIG_ATM is not set |
| 325 | # CONFIG_BRIDGE is not set | 368 | # CONFIG_BRIDGE is not set |
| 369 | # CONFIG_NET_DSA is not set | ||
| 326 | # CONFIG_VLAN_8021Q is not set | 370 | # CONFIG_VLAN_8021Q is not set |
| 327 | # CONFIG_DECNET is not set | 371 | # CONFIG_DECNET is not set |
| 328 | # CONFIG_LLC2 is not set | 372 | # CONFIG_LLC2 is not set |
| @@ -332,10 +376,6 @@ CONFIG_NETWORK_SECMARK=y | |||
| 332 | # CONFIG_LAPB is not set | 376 | # CONFIG_LAPB is not set |
| 333 | # CONFIG_ECONET is not set | 377 | # CONFIG_ECONET is not set |
| 334 | # CONFIG_WAN_ROUTER is not set | 378 | # CONFIG_WAN_ROUTER is not set |
| 335 | |||
| 336 | # | ||
| 337 | # QoS and/or fair queueing | ||
| 338 | # | ||
| 339 | # CONFIG_NET_SCHED is not set | 379 | # CONFIG_NET_SCHED is not set |
| 340 | 380 | ||
| 341 | # | 381 | # |
| @@ -343,15 +383,14 @@ CONFIG_NETWORK_SECMARK=y | |||
| 343 | # | 383 | # |
| 344 | # CONFIG_NET_PKTGEN is not set | 384 | # CONFIG_NET_PKTGEN is not set |
| 345 | # CONFIG_HAMRADIO is not set | 385 | # CONFIG_HAMRADIO is not set |
| 386 | # CONFIG_CAN is not set | ||
| 346 | # CONFIG_IRDA is not set | 387 | # CONFIG_IRDA is not set |
| 347 | # CONFIG_BT is not set | 388 | # CONFIG_BT is not set |
| 348 | CONFIG_IEEE80211=y | 389 | # CONFIG_AF_RXRPC is not set |
| 349 | # CONFIG_IEEE80211_DEBUG is not set | 390 | # CONFIG_PHONET is not set |
| 350 | CONFIG_IEEE80211_CRYPT_WEP=y | 391 | # CONFIG_WIRELESS is not set |
| 351 | CONFIG_IEEE80211_CRYPT_CCMP=y | 392 | # CONFIG_RFKILL is not set |
| 352 | CONFIG_IEEE80211_SOFTMAC=y | 393 | # CONFIG_NET_9P is not set |
| 353 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | ||
| 354 | CONFIG_WIRELESS_EXT=y | ||
| 355 | 394 | ||
| 356 | # | 395 | # |
| 357 | # Device Drivers | 396 | # Device Drivers |
| @@ -360,60 +399,40 @@ CONFIG_WIRELESS_EXT=y | |||
| 360 | # | 399 | # |
| 361 | # Generic Driver Options | 400 | # Generic Driver Options |
| 362 | # | 401 | # |
| 402 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| 363 | CONFIG_STANDALONE=y | 403 | CONFIG_STANDALONE=y |
| 364 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 404 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 365 | CONFIG_FW_LOADER=y | 405 | CONFIG_FW_LOADER=y |
| 406 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
| 407 | CONFIG_EXTRA_FIRMWARE="" | ||
| 366 | # CONFIG_SYS_HYPERVISOR is not set | 408 | # CONFIG_SYS_HYPERVISOR is not set |
| 367 | |||
| 368 | # | ||
| 369 | # Connector - unified userspace <-> kernelspace linker | ||
| 370 | # | ||
| 371 | CONFIG_CONNECTOR=y | 409 | CONFIG_CONNECTOR=y |
| 372 | CONFIG_PROC_EVENTS=y | 410 | CONFIG_PROC_EVENTS=y |
| 373 | |||
| 374 | # | ||
| 375 | # Memory Technology Devices (MTD) | ||
| 376 | # | ||
| 377 | # CONFIG_MTD is not set | 411 | # CONFIG_MTD is not set |
| 378 | |||
| 379 | # | ||
| 380 | # Parallel port support | ||
| 381 | # | ||
| 382 | # CONFIG_PARPORT is not set | 412 | # CONFIG_PARPORT is not set |
| 383 | 413 | CONFIG_BLK_DEV=y | |
| 384 | # | ||
| 385 | # Plug and Play support | ||
| 386 | # | ||
| 387 | # CONFIG_PNPACPI is not set | ||
| 388 | |||
| 389 | # | ||
| 390 | # Block devices | ||
| 391 | # | ||
| 392 | # CONFIG_BLK_CPQ_DA is not set | 414 | # CONFIG_BLK_CPQ_DA is not set |
| 393 | # CONFIG_BLK_CPQ_CISS_DA is not set | 415 | # CONFIG_BLK_CPQ_CISS_DA is not set |
| 394 | # CONFIG_BLK_DEV_DAC960 is not set | 416 | # CONFIG_BLK_DEV_DAC960 is not set |
| 395 | # CONFIG_BLK_DEV_UMEM is not set | 417 | # CONFIG_BLK_DEV_UMEM is not set |
| 396 | # CONFIG_BLK_DEV_COW_COMMON is not set | 418 | # CONFIG_BLK_DEV_COW_COMMON is not set |
| 397 | CONFIG_BLK_DEV_LOOP=y | 419 | CONFIG_BLK_DEV_LOOP=m |
| 398 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 420 | CONFIG_BLK_DEV_CRYPTOLOOP=m |
| 399 | # CONFIG_BLK_DEV_NBD is not set | 421 | CONFIG_BLK_DEV_NBD=m |
| 400 | # CONFIG_BLK_DEV_SX8 is not set | 422 | # CONFIG_BLK_DEV_SX8 is not set |
| 401 | # CONFIG_BLK_DEV_RAM is not set | 423 | # CONFIG_BLK_DEV_RAM is not set |
| 402 | # CONFIG_BLK_DEV_INITRD is not set | 424 | # CONFIG_CDROM_PKTCDVD is not set |
| 403 | CONFIG_CDROM_PKTCDVD=y | 425 | # CONFIG_ATA_OVER_ETH is not set |
| 404 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 426 | # CONFIG_BLK_DEV_HD is not set |
| 405 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 427 | CONFIG_MISC_DEVICES=y |
| 406 | CONFIG_ATA_OVER_ETH=y | 428 | # CONFIG_PHANTOM is not set |
| 407 | 429 | # CONFIG_EEPROM_93CX6 is not set | |
| 408 | # | ||
| 409 | # Misc devices | ||
| 410 | # | ||
| 411 | CONFIG_SGI_IOC4=y | 430 | CONFIG_SGI_IOC4=y |
| 412 | # CONFIG_TIFM_CORE is not set | 431 | # CONFIG_TIFM_CORE is not set |
| 413 | 432 | # CONFIG_ENCLOSURE_SERVICES is not set | |
| 414 | # | 433 | # CONFIG_HP_ILO is not set |
| 415 | # ATA/ATAPI/MFM/RLL support | 434 | # CONFIG_C2PORT is not set |
| 416 | # | 435 | CONFIG_HAVE_IDE=y |
| 417 | # CONFIG_IDE is not set | 436 | # CONFIG_IDE is not set |
| 418 | 437 | ||
| 419 | # | 438 | # |
| @@ -421,19 +440,20 @@ CONFIG_SGI_IOC4=y | |||
| 421 | # | 440 | # |
| 422 | CONFIG_RAID_ATTRS=y | 441 | CONFIG_RAID_ATTRS=y |
| 423 | CONFIG_SCSI=y | 442 | CONFIG_SCSI=y |
| 443 | CONFIG_SCSI_DMA=y | ||
| 424 | CONFIG_SCSI_TGT=y | 444 | CONFIG_SCSI_TGT=y |
| 425 | CONFIG_SCSI_NETLINK=y | 445 | # CONFIG_SCSI_NETLINK is not set |
| 426 | CONFIG_SCSI_PROC_FS=y | 446 | CONFIG_SCSI_PROC_FS=y |
| 427 | 447 | ||
| 428 | # | 448 | # |
| 429 | # SCSI support type (disk, tape, CD-ROM) | 449 | # SCSI support type (disk, tape, CD-ROM) |
| 430 | # | 450 | # |
| 431 | CONFIG_BLK_DEV_SD=y | 451 | CONFIG_BLK_DEV_SD=y |
| 432 | CONFIG_CHR_DEV_ST=y | 452 | # CONFIG_CHR_DEV_ST is not set |
| 433 | CONFIG_CHR_DEV_OSST=y | 453 | # CONFIG_CHR_DEV_OSST is not set |
| 434 | CONFIG_BLK_DEV_SR=y | 454 | CONFIG_BLK_DEV_SR=y |
| 435 | CONFIG_BLK_DEV_SR_VENDOR=y | 455 | CONFIG_BLK_DEV_SR_VENDOR=y |
| 436 | CONFIG_CHR_DEV_SG=y | 456 | CONFIG_CHR_DEV_SG=m |
| 437 | # CONFIG_CHR_DEV_SCH is not set | 457 | # CONFIG_CHR_DEV_SCH is not set |
| 438 | 458 | ||
| 439 | # | 459 | # |
| @@ -443,35 +463,36 @@ CONFIG_SCSI_MULTI_LUN=y | |||
| 443 | CONFIG_SCSI_CONSTANTS=y | 463 | CONFIG_SCSI_CONSTANTS=y |
| 444 | CONFIG_SCSI_LOGGING=y | 464 | CONFIG_SCSI_LOGGING=y |
| 445 | CONFIG_SCSI_SCAN_ASYNC=y | 465 | CONFIG_SCSI_SCAN_ASYNC=y |
| 466 | CONFIG_SCSI_WAIT_SCAN=m | ||
| 446 | 467 | ||
| 447 | # | 468 | # |
| 448 | # SCSI Transports | 469 | # SCSI Transports |
| 449 | # | 470 | # |
| 450 | CONFIG_SCSI_SPI_ATTRS=y | 471 | CONFIG_SCSI_SPI_ATTRS=y |
| 451 | CONFIG_SCSI_FC_ATTRS=y | 472 | # CONFIG_SCSI_FC_ATTRS is not set |
| 452 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 473 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
| 453 | CONFIG_SCSI_SAS_ATTRS=y | 474 | CONFIG_SCSI_SAS_ATTRS=y |
| 454 | CONFIG_SCSI_SAS_LIBSAS=y | 475 | CONFIG_SCSI_SAS_LIBSAS=y |
| 476 | CONFIG_SCSI_SAS_HOST_SMP=y | ||
| 455 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set | 477 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set |
| 456 | 478 | # CONFIG_SCSI_SRP_ATTRS is not set | |
| 457 | # | 479 | CONFIG_SCSI_LOWLEVEL=y |
| 458 | # SCSI low-level drivers | ||
| 459 | # | ||
| 460 | # CONFIG_ISCSI_TCP is not set | 480 | # CONFIG_ISCSI_TCP is not set |
| 461 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 481 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
| 462 | # CONFIG_SCSI_3W_9XXX is not set | 482 | # CONFIG_SCSI_3W_9XXX is not set |
| 463 | # CONFIG_SCSI_ACARD is not set | 483 | # CONFIG_SCSI_ACARD is not set |
| 464 | # CONFIG_SCSI_AACRAID is not set | 484 | # CONFIG_SCSI_AACRAID is not set |
| 465 | CONFIG_SCSI_AIC7XXX=y | 485 | CONFIG_SCSI_AIC7XXX=y |
| 466 | CONFIG_AIC7XXX_CMDS_PER_DEVICE=8 | 486 | CONFIG_AIC7XXX_CMDS_PER_DEVICE=32 |
| 467 | CONFIG_AIC7XXX_RESET_DELAY_MS=15000 | 487 | CONFIG_AIC7XXX_RESET_DELAY_MS=15000 |
| 468 | CONFIG_AIC7XXX_DEBUG_ENABLE=y | 488 | CONFIG_AIC7XXX_DEBUG_ENABLE=y |
| 469 | CONFIG_AIC7XXX_DEBUG_MASK=0 | 489 | CONFIG_AIC7XXX_DEBUG_MASK=0 |
| 470 | CONFIG_AIC7XXX_REG_PRETTY_PRINT=y | 490 | CONFIG_AIC7XXX_REG_PRETTY_PRINT=y |
| 471 | # CONFIG_SCSI_AIC7XXX_OLD is not set | 491 | # CONFIG_SCSI_AIC7XXX_OLD is not set |
| 472 | # CONFIG_SCSI_AIC79XX is not set | 492 | # CONFIG_SCSI_AIC79XX is not set |
| 473 | CONFIG_SCSI_AIC94XX=y | 493 | # CONFIG_SCSI_AIC94XX is not set |
| 474 | # CONFIG_AIC94XX_DEBUG is not set | 494 | # CONFIG_SCSI_DPT_I2O is not set |
| 495 | # CONFIG_SCSI_ADVANSYS is not set | ||
| 475 | # CONFIG_SCSI_ARCMSR is not set | 496 | # CONFIG_SCSI_ARCMSR is not set |
| 476 | # CONFIG_MEGARAID_NEWGEN is not set | 497 | # CONFIG_MEGARAID_NEWGEN is not set |
| 477 | # CONFIG_MEGARAID_LEGACY is not set | 498 | # CONFIG_MEGARAID_LEGACY is not set |
| @@ -482,6 +503,7 @@ CONFIG_SCSI_AIC94XX=y | |||
| 482 | # CONFIG_SCSI_IPS is not set | 503 | # CONFIG_SCSI_IPS is not set |
| 483 | # CONFIG_SCSI_INITIO is not set | 504 | # CONFIG_SCSI_INITIO is not set |
| 484 | # CONFIG_SCSI_INIA100 is not set | 505 | # CONFIG_SCSI_INIA100 is not set |
| 506 | # CONFIG_SCSI_MVSAS is not set | ||
| 485 | # CONFIG_SCSI_STEX is not set | 507 | # CONFIG_SCSI_STEX is not set |
| 486 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 508 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
| 487 | # CONFIG_SCSI_QLOGIC_1280 is not set | 509 | # CONFIG_SCSI_QLOGIC_1280 is not set |
| @@ -492,147 +514,81 @@ CONFIG_SCSI_AIC94XX=y | |||
| 492 | # CONFIG_SCSI_DC390T is not set | 514 | # CONFIG_SCSI_DC390T is not set |
| 493 | # CONFIG_SCSI_DEBUG is not set | 515 | # CONFIG_SCSI_DEBUG is not set |
| 494 | # CONFIG_SCSI_SRP is not set | 516 | # CONFIG_SCSI_SRP is not set |
| 495 | 517 | # CONFIG_SCSI_DH is not set | |
| 496 | # | ||
| 497 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
| 498 | # | ||
| 499 | # CONFIG_ATA is not set | 518 | # CONFIG_ATA is not set |
| 500 | |||
| 501 | # | ||
| 502 | # Multi-device support (RAID and LVM) | ||
| 503 | # | ||
| 504 | # CONFIG_MD is not set | 519 | # CONFIG_MD is not set |
| 505 | |||
| 506 | # | ||
| 507 | # Fusion MPT device support | ||
| 508 | # | ||
| 509 | # CONFIG_FUSION is not set | 520 | # CONFIG_FUSION is not set |
| 510 | # CONFIG_FUSION_SPI is not set | ||
| 511 | # CONFIG_FUSION_FC is not set | ||
| 512 | # CONFIG_FUSION_SAS is not set | ||
| 513 | 521 | ||
| 514 | # | 522 | # |
| 515 | # IEEE 1394 (FireWire) support | 523 | # IEEE 1394 (FireWire) support |
| 516 | # | 524 | # |
| 517 | # CONFIG_IEEE1394 is not set | ||
| 518 | 525 | ||
| 519 | # | 526 | # |
| 520 | # I2O device support | 527 | # Enable only one of the two stacks, unless you know what you are doing |
| 521 | # | 528 | # |
| 529 | # CONFIG_FIREWIRE is not set | ||
| 530 | # CONFIG_IEEE1394 is not set | ||
| 522 | # CONFIG_I2O is not set | 531 | # CONFIG_I2O is not set |
| 523 | |||
| 524 | # | ||
| 525 | # Network device support | ||
| 526 | # | ||
| 527 | CONFIG_NETDEVICES=y | 532 | CONFIG_NETDEVICES=y |
| 528 | # CONFIG_DUMMY is not set | 533 | CONFIG_DUMMY=m |
| 529 | # CONFIG_BONDING is not set | 534 | CONFIG_BONDING=m |
| 535 | # CONFIG_MACVLAN is not set | ||
| 530 | # CONFIG_EQUALIZER is not set | 536 | # CONFIG_EQUALIZER is not set |
| 531 | # CONFIG_TUN is not set | 537 | # CONFIG_TUN is not set |
| 532 | 538 | # CONFIG_VETH is not set | |
| 533 | # | ||
| 534 | # ARCnet devices | ||
| 535 | # | ||
| 536 | # CONFIG_ARCNET is not set | 539 | # CONFIG_ARCNET is not set |
| 537 | 540 | # CONFIG_PHYLIB is not set | |
| 538 | # | ||
| 539 | # PHY device support | ||
| 540 | # | ||
| 541 | CONFIG_PHYLIB=y | ||
| 542 | |||
| 543 | # | ||
| 544 | # MII PHY device drivers | ||
| 545 | # | ||
| 546 | CONFIG_MARVELL_PHY=y | ||
| 547 | CONFIG_DAVICOM_PHY=y | ||
| 548 | CONFIG_QSEMI_PHY=y | ||
| 549 | CONFIG_LXT_PHY=y | ||
| 550 | CONFIG_CICADA_PHY=y | ||
| 551 | CONFIG_VITESSE_PHY=y | ||
| 552 | CONFIG_SMSC_PHY=y | ||
| 553 | # CONFIG_BROADCOM_PHY is not set | ||
| 554 | # CONFIG_FIXED_PHY is not set | ||
| 555 | |||
| 556 | # | ||
| 557 | # Ethernet (10 or 100Mbit) | ||
| 558 | # | ||
| 559 | CONFIG_NET_ETHERNET=y | 541 | CONFIG_NET_ETHERNET=y |
| 560 | # CONFIG_MII is not set | 542 | CONFIG_MII=y |
| 543 | # CONFIG_AX88796 is not set | ||
| 561 | CONFIG_SGI_O2MACE_ETH=y | 544 | CONFIG_SGI_O2MACE_ETH=y |
| 562 | # CONFIG_HAPPYMEAL is not set | 545 | # CONFIG_HAPPYMEAL is not set |
| 563 | # CONFIG_SUNGEM is not set | 546 | # CONFIG_SUNGEM is not set |
| 564 | # CONFIG_CASSINI is not set | 547 | # CONFIG_CASSINI is not set |
| 565 | # CONFIG_NET_VENDOR_3COM is not set | 548 | # CONFIG_NET_VENDOR_3COM is not set |
| 549 | # CONFIG_SMC91X is not set | ||
| 566 | # CONFIG_DM9000 is not set | 550 | # CONFIG_DM9000 is not set |
| 567 | 551 | CONFIG_NET_TULIP=y | |
| 568 | # | 552 | CONFIG_DE2104X=m |
| 569 | # Tulip family network device support | 553 | CONFIG_TULIP=m |
| 570 | # | 554 | # CONFIG_TULIP_MWI is not set |
| 571 | # CONFIG_NET_TULIP is not set | 555 | CONFIG_TULIP_MMIO=y |
| 556 | # CONFIG_TULIP_NAPI is not set | ||
| 557 | # CONFIG_DE4X5 is not set | ||
| 558 | # CONFIG_WINBOND_840 is not set | ||
| 559 | # CONFIG_DM9102 is not set | ||
| 560 | # CONFIG_ULI526X is not set | ||
| 572 | # CONFIG_HP100 is not set | 561 | # CONFIG_HP100 is not set |
| 562 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
| 563 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
| 564 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
| 565 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
| 566 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
| 567 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
| 568 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
| 573 | # CONFIG_NET_PCI is not set | 569 | # CONFIG_NET_PCI is not set |
| 574 | 570 | # CONFIG_B44 is not set | |
| 575 | # | 571 | # CONFIG_ATL2 is not set |
| 576 | # Ethernet (1000 Mbit) | 572 | # CONFIG_NETDEV_1000 is not set |
| 577 | # | 573 | # CONFIG_NETDEV_10000 is not set |
| 578 | # CONFIG_ACENIC is not set | ||
| 579 | # CONFIG_DL2K is not set | ||
| 580 | # CONFIG_E1000 is not set | ||
| 581 | # CONFIG_NS83820 is not set | ||
| 582 | # CONFIG_HAMACHI is not set | ||
| 583 | # CONFIG_YELLOWFIN is not set | ||
| 584 | # CONFIG_R8169 is not set | ||
| 585 | # CONFIG_SIS190 is not set | ||
| 586 | # CONFIG_SKGE is not set | ||
| 587 | # CONFIG_SKY2 is not set | ||
| 588 | # CONFIG_SK98LIN is not set | ||
| 589 | # CONFIG_TIGON3 is not set | ||
| 590 | # CONFIG_BNX2 is not set | ||
| 591 | CONFIG_QLA3XXX=y | ||
| 592 | # CONFIG_ATL1 is not set | ||
| 593 | |||
| 594 | # | ||
| 595 | # Ethernet (10000 Mbit) | ||
| 596 | # | ||
| 597 | # CONFIG_CHELSIO_T1 is not set | ||
| 598 | CONFIG_CHELSIO_T3=y | ||
| 599 | # CONFIG_IXGB is not set | ||
| 600 | # CONFIG_S2IO is not set | ||
| 601 | # CONFIG_MYRI10GE is not set | ||
| 602 | CONFIG_NETXEN_NIC=y | ||
| 603 | |||
| 604 | # | ||
| 605 | # Token Ring devices | ||
| 606 | # | ||
| 607 | # CONFIG_TR is not set | 574 | # CONFIG_TR is not set |
| 608 | 575 | ||
| 609 | # | 576 | # |
| 610 | # Wireless LAN (non-hamradio) | 577 | # Wireless LAN |
| 611 | # | ||
| 612 | # CONFIG_NET_RADIO is not set | ||
| 613 | |||
| 614 | # | ||
| 615 | # Wan interfaces | ||
| 616 | # | 578 | # |
| 579 | # CONFIG_WLAN_PRE80211 is not set | ||
| 580 | # CONFIG_WLAN_80211 is not set | ||
| 581 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 617 | # CONFIG_WAN is not set | 582 | # CONFIG_WAN is not set |
| 618 | # CONFIG_FDDI is not set | 583 | # CONFIG_FDDI is not set |
| 619 | # CONFIG_HIPPI is not set | 584 | # CONFIG_HIPPI is not set |
| 620 | # CONFIG_PPP is not set | 585 | # CONFIG_PPP is not set |
| 621 | # CONFIG_SLIP is not set | 586 | # CONFIG_SLIP is not set |
| 622 | # CONFIG_NET_FC is not set | 587 | # CONFIG_NET_FC is not set |
| 623 | # CONFIG_SHAPER is not set | ||
| 624 | # CONFIG_NETCONSOLE is not set | 588 | # CONFIG_NETCONSOLE is not set |
| 625 | # CONFIG_NETPOLL is not set | 589 | # CONFIG_NETPOLL is not set |
| 626 | # CONFIG_NET_POLL_CONTROLLER is not set | 590 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 627 | |||
| 628 | # | ||
| 629 | # ISDN subsystem | ||
| 630 | # | ||
| 631 | # CONFIG_ISDN is not set | 591 | # CONFIG_ISDN is not set |
| 632 | |||
| 633 | # | ||
| 634 | # Telephony Support | ||
| 635 | # | ||
| 636 | # CONFIG_PHONE is not set | 592 | # CONFIG_PHONE is not set |
| 637 | 593 | ||
| 638 | # | 594 | # |
| @@ -640,6 +596,7 @@ CONFIG_NETXEN_NIC=y | |||
| 640 | # | 596 | # |
| 641 | CONFIG_INPUT=y | 597 | CONFIG_INPUT=y |
| 642 | # CONFIG_INPUT_FF_MEMLESS is not set | 598 | # CONFIG_INPUT_FF_MEMLESS is not set |
| 599 | # CONFIG_INPUT_POLLDEV is not set | ||
| 643 | 600 | ||
| 644 | # | 601 | # |
| 645 | # Userland interfaces | 602 | # Userland interfaces |
| @@ -649,16 +606,32 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y | |||
| 649 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | 606 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 |
| 650 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | 607 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 |
| 651 | # CONFIG_INPUT_JOYDEV is not set | 608 | # CONFIG_INPUT_JOYDEV is not set |
| 652 | # CONFIG_INPUT_TSDEV is not set | 609 | CONFIG_INPUT_EVDEV=m |
| 653 | # CONFIG_INPUT_EVDEV is not set | ||
| 654 | # CONFIG_INPUT_EVBUG is not set | 610 | # CONFIG_INPUT_EVBUG is not set |
| 655 | 611 | ||
| 656 | # | 612 | # |
| 657 | # Input Device Drivers | 613 | # Input Device Drivers |
| 658 | # | 614 | # |
| 659 | # CONFIG_INPUT_KEYBOARD is not set | 615 | CONFIG_INPUT_KEYBOARD=y |
| 660 | # CONFIG_INPUT_MOUSE is not set | 616 | CONFIG_KEYBOARD_ATKBD=y |
| 617 | # CONFIG_KEYBOARD_SUNKBD is not set | ||
| 618 | # CONFIG_KEYBOARD_LKKBD is not set | ||
| 619 | # CONFIG_KEYBOARD_XTKBD is not set | ||
| 620 | # CONFIG_KEYBOARD_NEWTON is not set | ||
| 621 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
| 622 | CONFIG_INPUT_MOUSE=y | ||
| 623 | CONFIG_MOUSE_PS2=y | ||
| 624 | CONFIG_MOUSE_PS2_ALPS=y | ||
| 625 | CONFIG_MOUSE_PS2_LOGIPS2PP=y | ||
| 626 | CONFIG_MOUSE_PS2_SYNAPTICS=y | ||
| 627 | CONFIG_MOUSE_PS2_LIFEBOOK=y | ||
| 628 | CONFIG_MOUSE_PS2_TRACKPOINT=y | ||
| 629 | # CONFIG_MOUSE_PS2_ELANTECH is not set | ||
| 630 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | ||
| 631 | # CONFIG_MOUSE_SERIAL is not set | ||
| 632 | # CONFIG_MOUSE_VSXXXAA is not set | ||
| 661 | # CONFIG_INPUT_JOYSTICK is not set | 633 | # CONFIG_INPUT_JOYSTICK is not set |
| 634 | # CONFIG_INPUT_TABLET is not set | ||
| 662 | # CONFIG_INPUT_TOUCHSCREEN is not set | 635 | # CONFIG_INPUT_TOUCHSCREEN is not set |
| 663 | # CONFIG_INPUT_MISC is not set | 636 | # CONFIG_INPUT_MISC is not set |
| 664 | 637 | ||
| @@ -669,8 +642,8 @@ CONFIG_SERIO=y | |||
| 669 | # CONFIG_SERIO_I8042 is not set | 642 | # CONFIG_SERIO_I8042 is not set |
| 670 | CONFIG_SERIO_SERPORT=y | 643 | CONFIG_SERIO_SERPORT=y |
| 671 | # CONFIG_SERIO_PCIPS2 is not set | 644 | # CONFIG_SERIO_PCIPS2 is not set |
| 672 | # CONFIG_SERIO_MACEPS2 is not set | 645 | CONFIG_SERIO_MACEPS2=y |
| 673 | # CONFIG_SERIO_LIBPS2 is not set | 646 | CONFIG_SERIO_LIBPS2=y |
| 674 | CONFIG_SERIO_RAW=y | 647 | CONFIG_SERIO_RAW=y |
| 675 | # CONFIG_GAMEPORT is not set | 648 | # CONFIG_GAMEPORT is not set |
| 676 | 649 | ||
| @@ -678,10 +651,13 @@ CONFIG_SERIO_RAW=y | |||
| 678 | # Character devices | 651 | # Character devices |
| 679 | # | 652 | # |
| 680 | CONFIG_VT=y | 653 | CONFIG_VT=y |
| 654 | # CONFIG_CONSOLE_TRANSLATIONS is not set | ||
| 681 | CONFIG_VT_CONSOLE=y | 655 | CONFIG_VT_CONSOLE=y |
| 682 | CONFIG_HW_CONSOLE=y | 656 | CONFIG_HW_CONSOLE=y |
| 683 | CONFIG_VT_HW_CONSOLE_BINDING=y | 657 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| 658 | CONFIG_DEVKMEM=y | ||
| 684 | # CONFIG_SERIAL_NONSTANDARD is not set | 659 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 660 | # CONFIG_NOZOMI is not set | ||
| 685 | 661 | ||
| 686 | # | 662 | # |
| 687 | # Serial drivers | 663 | # Serial drivers |
| @@ -702,192 +678,304 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
| 702 | CONFIG_UNIX98_PTYS=y | 678 | CONFIG_UNIX98_PTYS=y |
| 703 | CONFIG_LEGACY_PTYS=y | 679 | CONFIG_LEGACY_PTYS=y |
| 704 | CONFIG_LEGACY_PTY_COUNT=256 | 680 | CONFIG_LEGACY_PTY_COUNT=256 |
| 705 | |||
| 706 | # | ||
| 707 | # IPMI | ||
| 708 | # | ||
| 709 | # CONFIG_IPMI_HANDLER is not set | 681 | # CONFIG_IPMI_HANDLER is not set |
| 710 | 682 | CONFIG_HW_RANDOM=y | |
| 711 | # | ||
| 712 | # Watchdog Cards | ||
| 713 | # | ||
| 714 | # CONFIG_WATCHDOG is not set | ||
| 715 | # CONFIG_HW_RANDOM is not set | ||
| 716 | # CONFIG_RTC is not set | ||
| 717 | # CONFIG_GEN_RTC is not set | ||
| 718 | # CONFIG_DTLK is not set | ||
| 719 | # CONFIG_R3964 is not set | 683 | # CONFIG_R3964 is not set |
| 720 | # CONFIG_APPLICOM is not set | 684 | # CONFIG_APPLICOM is not set |
| 721 | # CONFIG_DRM is not set | ||
| 722 | # CONFIG_RAW_DRIVER is not set | 685 | # CONFIG_RAW_DRIVER is not set |
| 723 | |||
| 724 | # | ||
| 725 | # TPM devices | ||
| 726 | # | ||
| 727 | # CONFIG_TCG_TPM is not set | 686 | # CONFIG_TCG_TPM is not set |
| 687 | CONFIG_DEVPORT=y | ||
| 688 | # CONFIG_I2C is not set | ||
| 689 | # CONFIG_SPI is not set | ||
| 690 | # CONFIG_W1 is not set | ||
| 691 | # CONFIG_POWER_SUPPLY is not set | ||
| 692 | CONFIG_HWMON=y | ||
| 693 | # CONFIG_HWMON_VID is not set | ||
| 694 | # CONFIG_SENSORS_I5K_AMB is not set | ||
| 695 | # CONFIG_SENSORS_F71805F is not set | ||
| 696 | # CONFIG_SENSORS_F71882FG is not set | ||
| 697 | # CONFIG_SENSORS_IT87 is not set | ||
| 698 | # CONFIG_SENSORS_PC87360 is not set | ||
| 699 | # CONFIG_SENSORS_PC87427 is not set | ||
| 700 | # CONFIG_SENSORS_SIS5595 is not set | ||
| 701 | # CONFIG_SENSORS_SMSC47M1 is not set | ||
| 702 | # CONFIG_SENSORS_SMSC47B397 is not set | ||
| 703 | # CONFIG_SENSORS_VIA686A is not set | ||
| 704 | # CONFIG_SENSORS_VT1211 is not set | ||
| 705 | # CONFIG_SENSORS_VT8231 is not set | ||
| 706 | # CONFIG_SENSORS_W83627HF is not set | ||
| 707 | # CONFIG_SENSORS_W83627EHF is not set | ||
| 708 | # CONFIG_HWMON_DEBUG_CHIP is not set | ||
| 709 | # CONFIG_THERMAL is not set | ||
| 710 | # CONFIG_THERMAL_HWMON is not set | ||
| 711 | CONFIG_WATCHDOG=y | ||
| 712 | # CONFIG_WATCHDOG_NOWAYOUT is not set | ||
| 728 | 713 | ||
| 729 | # | 714 | # |
| 730 | # I2C support | 715 | # Watchdog Device Drivers |
| 731 | # | 716 | # |
| 732 | # CONFIG_I2C is not set | 717 | # CONFIG_SOFT_WATCHDOG is not set |
| 718 | # CONFIG_ALIM7101_WDT is not set | ||
| 733 | 719 | ||
| 734 | # | 720 | # |
| 735 | # SPI support | 721 | # PCI-based Watchdog Cards |
| 736 | # | 722 | # |
| 737 | # CONFIG_SPI is not set | 723 | # CONFIG_PCIPCWATCHDOG is not set |
| 738 | # CONFIG_SPI_MASTER is not set | 724 | # CONFIG_WDTPCI is not set |
| 725 | CONFIG_SSB_POSSIBLE=y | ||
| 739 | 726 | ||
| 740 | # | 727 | # |
| 741 | # Dallas's 1-wire bus | 728 | # Sonics Silicon Backplane |
| 742 | # | 729 | # |
| 743 | # CONFIG_W1 is not set | 730 | # CONFIG_SSB is not set |
| 744 | 731 | ||
| 745 | # | 732 | # |
| 746 | # Hardware Monitoring support | 733 | # Multifunction device drivers |
| 747 | # | 734 | # |
| 748 | # CONFIG_HWMON is not set | 735 | # CONFIG_MFD_CORE is not set |
| 749 | # CONFIG_HWMON_VID is not set | 736 | # CONFIG_MFD_SM501 is not set |
| 737 | # CONFIG_HTC_PASIC3 is not set | ||
| 738 | # CONFIG_MFD_TMIO is not set | ||
| 739 | # CONFIG_REGULATOR is not set | ||
| 750 | 740 | ||
| 751 | # | 741 | # |
| 752 | # Multimedia devices | 742 | # Multimedia devices |
| 753 | # | 743 | # |
| 754 | # CONFIG_VIDEO_DEV is not set | ||
| 755 | 744 | ||
| 756 | # | 745 | # |
| 757 | # Digital Video Broadcasting Devices | 746 | # Multimedia core support |
| 758 | # | 747 | # |
| 759 | # CONFIG_DVB is not set | 748 | CONFIG_VIDEO_DEV=m |
| 749 | CONFIG_VIDEO_V4L2_COMMON=m | ||
| 750 | CONFIG_VIDEO_ALLOW_V4L1=y | ||
| 751 | CONFIG_VIDEO_V4L1_COMPAT=y | ||
| 752 | # CONFIG_DVB_CORE is not set | ||
| 753 | CONFIG_VIDEO_MEDIA=m | ||
| 760 | 754 | ||
| 761 | # | 755 | # |
| 762 | # Graphics support | 756 | # Multimedia drivers |
| 763 | # | 757 | # |
| 764 | # CONFIG_FIRMWARE_EDID is not set | 758 | # CONFIG_MEDIA_ATTACH is not set |
| 765 | # CONFIG_FB is not set | 759 | CONFIG_VIDEO_V4L2=m |
| 760 | CONFIG_VIDEO_V4L1=m | ||
| 761 | CONFIG_VIDEOBUF_GEN=m | ||
| 762 | CONFIG_VIDEOBUF_VMALLOC=m | ||
| 763 | CONFIG_VIDEO_CAPTURE_DRIVERS=y | ||
| 764 | # CONFIG_VIDEO_ADV_DEBUG is not set | ||
| 765 | # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set | ||
| 766 | CONFIG_VIDEO_HELPER_CHIPS_AUTO=y | ||
| 767 | CONFIG_VIDEO_VIVI=m | ||
| 768 | # CONFIG_VIDEO_CPIA is not set | ||
| 769 | # CONFIG_VIDEO_STRADIS is not set | ||
| 770 | # CONFIG_SOC_CAMERA is not set | ||
| 771 | CONFIG_RADIO_ADAPTERS=y | ||
| 772 | # CONFIG_RADIO_GEMTEK_PCI is not set | ||
| 773 | # CONFIG_RADIO_MAXIRADIO is not set | ||
| 774 | # CONFIG_RADIO_MAESTRO is not set | ||
| 775 | CONFIG_DAB=y | ||
| 766 | 776 | ||
| 767 | # | 777 | # |
| 768 | # Console display driver support | 778 | # Graphics support |
| 769 | # | 779 | # |
| 770 | # CONFIG_VGA_CONSOLE is not set | 780 | # CONFIG_DRM is not set |
| 771 | CONFIG_DUMMY_CONSOLE=y | 781 | # CONFIG_VGASTATE is not set |
| 782 | CONFIG_VIDEO_OUTPUT_CONTROL=y | ||
| 783 | CONFIG_FB=y | ||
| 784 | CONFIG_FIRMWARE_EDID=y | ||
| 785 | # CONFIG_FB_DDC is not set | ||
| 786 | # CONFIG_FB_BOOT_VESA_SUPPORT is not set | ||
| 787 | CONFIG_FB_CFB_FILLRECT=y | ||
| 788 | CONFIG_FB_CFB_COPYAREA=y | ||
| 789 | CONFIG_FB_CFB_IMAGEBLIT=y | ||
| 790 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | ||
| 791 | # CONFIG_FB_SYS_FILLRECT is not set | ||
| 792 | # CONFIG_FB_SYS_COPYAREA is not set | ||
| 793 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
| 794 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
| 795 | # CONFIG_FB_SYS_FOPS is not set | ||
| 796 | # CONFIG_FB_SVGALIB is not set | ||
| 797 | # CONFIG_FB_MACMODES is not set | ||
| 798 | # CONFIG_FB_BACKLIGHT is not set | ||
| 799 | # CONFIG_FB_MODE_HELPERS is not set | ||
| 800 | # CONFIG_FB_TILEBLITTING is not set | ||
| 801 | |||
| 802 | # | ||
| 803 | # Frame buffer hardware drivers | ||
| 804 | # | ||
| 805 | # CONFIG_FB_CIRRUS is not set | ||
| 806 | # CONFIG_FB_PM2 is not set | ||
| 807 | # CONFIG_FB_CYBER2000 is not set | ||
| 808 | # CONFIG_FB_ASILIANT is not set | ||
| 809 | # CONFIG_FB_IMSTT is not set | ||
| 810 | # CONFIG_FB_UVESA is not set | ||
| 811 | CONFIG_FB_GBE=y | ||
| 812 | CONFIG_FB_GBE_MEM=4 | ||
| 813 | # CONFIG_FB_S1D13XXX is not set | ||
| 814 | # CONFIG_FB_NVIDIA is not set | ||
| 815 | # CONFIG_FB_RIVA is not set | ||
| 816 | # CONFIG_FB_MATROX is not set | ||
| 817 | # CONFIG_FB_RADEON is not set | ||
| 818 | # CONFIG_FB_ATY128 is not set | ||
| 819 | # CONFIG_FB_ATY is not set | ||
| 820 | # CONFIG_FB_S3 is not set | ||
| 821 | # CONFIG_FB_SAVAGE is not set | ||
| 822 | # CONFIG_FB_SIS is not set | ||
| 823 | # CONFIG_FB_VIA is not set | ||
| 824 | # CONFIG_FB_NEOMAGIC is not set | ||
| 825 | # CONFIG_FB_KYRO is not set | ||
| 826 | # CONFIG_FB_3DFX is not set | ||
| 827 | # CONFIG_FB_VOODOO1 is not set | ||
| 828 | # CONFIG_FB_VT8623 is not set | ||
| 829 | # CONFIG_FB_TRIDENT is not set | ||
| 830 | # CONFIG_FB_ARK is not set | ||
| 831 | # CONFIG_FB_PM3 is not set | ||
| 832 | # CONFIG_FB_CARMINE is not set | ||
| 833 | # CONFIG_FB_VIRTUAL is not set | ||
| 834 | # CONFIG_FB_METRONOME is not set | ||
| 835 | # CONFIG_FB_MB862XX is not set | ||
| 772 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 836 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 773 | 837 | ||
| 774 | # | 838 | # |
| 775 | # Sound | 839 | # Display device support |
| 776 | # | 840 | # |
| 777 | # CONFIG_SOUND is not set | 841 | # CONFIG_DISPLAY_SUPPORT is not set |
| 778 | 842 | ||
| 779 | # | 843 | # |
| 780 | # HID Devices | 844 | # Console display driver support |
| 781 | # | 845 | # |
| 846 | # CONFIG_VGA_CONSOLE is not set | ||
| 847 | CONFIG_DUMMY_CONSOLE=y | ||
| 848 | CONFIG_FRAMEBUFFER_CONSOLE=y | ||
| 849 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set | ||
| 850 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | ||
| 851 | CONFIG_FONTS=y | ||
| 852 | CONFIG_FONT_8x8=y | ||
| 853 | CONFIG_FONT_8x16=y | ||
| 854 | # CONFIG_FONT_6x11 is not set | ||
| 855 | # CONFIG_FONT_7x14 is not set | ||
| 856 | # CONFIG_FONT_PEARL_8x8 is not set | ||
| 857 | # CONFIG_FONT_ACORN_8x8 is not set | ||
| 858 | # CONFIG_FONT_MINI_4x6 is not set | ||
| 859 | # CONFIG_FONT_SUN8x16 is not set | ||
| 860 | # CONFIG_FONT_SUN12x22 is not set | ||
| 861 | # CONFIG_FONT_10x18 is not set | ||
| 862 | CONFIG_LOGO=y | ||
| 863 | # CONFIG_LOGO_LINUX_MONO is not set | ||
| 864 | # CONFIG_LOGO_LINUX_VGA16 is not set | ||
| 865 | # CONFIG_LOGO_LINUX_CLUT224 is not set | ||
| 866 | CONFIG_LOGO_SGI_CLUT224=y | ||
| 867 | # CONFIG_SOUND is not set | ||
| 868 | CONFIG_HID_SUPPORT=y | ||
| 782 | CONFIG_HID=y | 869 | CONFIG_HID=y |
| 783 | # CONFIG_HID_DEBUG is not set | 870 | # CONFIG_HID_DEBUG is not set |
| 871 | # CONFIG_HIDRAW is not set | ||
| 872 | # CONFIG_HID_PID is not set | ||
| 784 | 873 | ||
| 785 | # | 874 | # |
| 786 | # USB support | 875 | # Special HID drivers |
| 787 | # | ||
| 788 | CONFIG_USB_ARCH_HAS_HCD=y | ||
| 789 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
| 790 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
| 791 | # CONFIG_USB is not set | ||
| 792 | |||
| 793 | # | ||
| 794 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
| 795 | # | ||
| 796 | |||
| 797 | # | ||
| 798 | # USB Gadget Support | ||
| 799 | # | ||
| 800 | # CONFIG_USB_GADGET is not set | ||
| 801 | |||
| 802 | # | ||
| 803 | # MMC/SD Card support | ||
| 804 | # | 876 | # |
| 877 | CONFIG_HID_COMPAT=y | ||
| 878 | # CONFIG_USB_SUPPORT is not set | ||
| 879 | # CONFIG_UWB is not set | ||
| 805 | # CONFIG_MMC is not set | 880 | # CONFIG_MMC is not set |
| 806 | 881 | # CONFIG_MEMSTICK is not set | |
| 807 | # | ||
| 808 | # LED devices | ||
| 809 | # | ||
| 810 | # CONFIG_NEW_LEDS is not set | 882 | # CONFIG_NEW_LEDS is not set |
| 811 | 883 | # CONFIG_ACCESSIBILITY is not set | |
| 812 | # | ||
| 813 | # LED drivers | ||
| 814 | # | ||
| 815 | |||
| 816 | # | ||
| 817 | # LED Triggers | ||
| 818 | # | ||
| 819 | |||
| 820 | # | ||
| 821 | # InfiniBand support | ||
| 822 | # | ||
| 823 | # CONFIG_INFINIBAND is not set | 884 | # CONFIG_INFINIBAND is not set |
| 885 | CONFIG_RTC_LIB=y | ||
| 886 | CONFIG_RTC_CLASS=y | ||
| 887 | # CONFIG_RTC_HCTOSYS is not set | ||
| 888 | # CONFIG_RTC_DEBUG is not set | ||
| 824 | 889 | ||
| 825 | # | 890 | # |
| 826 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | 891 | # RTC interfaces |
| 827 | # | 892 | # |
| 893 | # CONFIG_RTC_INTF_SYSFS is not set | ||
| 894 | # CONFIG_RTC_INTF_PROC is not set | ||
| 895 | CONFIG_RTC_INTF_DEV=y | ||
| 896 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
| 897 | # CONFIG_RTC_DRV_TEST is not set | ||
| 828 | 898 | ||
| 829 | # | 899 | # |
| 830 | # Real Time Clock | 900 | # SPI RTC drivers |
| 831 | # | 901 | # |
| 832 | # CONFIG_RTC_CLASS is not set | ||
| 833 | 902 | ||
| 834 | # | 903 | # |
| 835 | # DMA Engine support | 904 | # Platform RTC drivers |
| 836 | # | 905 | # |
| 837 | # CONFIG_DMA_ENGINE is not set | 906 | CONFIG_RTC_DRV_CMOS=y |
| 907 | # CONFIG_RTC_DRV_DS1286 is not set | ||
| 908 | # CONFIG_RTC_DRV_DS1511 is not set | ||
| 909 | # CONFIG_RTC_DRV_DS1553 is not set | ||
| 910 | # CONFIG_RTC_DRV_DS1742 is not set | ||
| 911 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 912 | # CONFIG_RTC_DRV_M48T86 is not set | ||
| 913 | # CONFIG_RTC_DRV_M48T35 is not set | ||
| 914 | # CONFIG_RTC_DRV_M48T59 is not set | ||
| 915 | # CONFIG_RTC_DRV_BQ4802 is not set | ||
| 916 | # CONFIG_RTC_DRV_V3020 is not set | ||
| 838 | 917 | ||
| 839 | # | 918 | # |
| 840 | # DMA Clients | 919 | # on-CPU RTC drivers |
| 841 | # | ||
| 842 | |||
| 843 | # | ||
| 844 | # DMA Devices | ||
| 845 | # | ||
| 846 | |||
| 847 | # | ||
| 848 | # Auxiliary Display support | ||
| 849 | # | ||
| 850 | |||
| 851 | # | ||
| 852 | # Virtualization | ||
| 853 | # | 920 | # |
| 921 | # CONFIG_DMADEVICES is not set | ||
| 922 | # CONFIG_UIO is not set | ||
| 923 | # CONFIG_STAGING is not set | ||
| 924 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 854 | 925 | ||
| 855 | # | 926 | # |
| 856 | # File systems | 927 | # File systems |
| 857 | # | 928 | # |
| 858 | CONFIG_EXT2_FS=y | 929 | CONFIG_EXT2_FS=y |
| 859 | # CONFIG_EXT2_FS_XATTR is not set | 930 | CONFIG_EXT2_FS_XATTR=y |
| 931 | CONFIG_EXT2_FS_POSIX_ACL=y | ||
| 932 | CONFIG_EXT2_FS_SECURITY=y | ||
| 860 | # CONFIG_EXT2_FS_XIP is not set | 933 | # CONFIG_EXT2_FS_XIP is not set |
| 861 | # CONFIG_EXT3_FS is not set | 934 | CONFIG_EXT3_FS=y |
| 862 | # CONFIG_EXT4DEV_FS is not set | 935 | CONFIG_EXT3_FS_XATTR=y |
| 936 | CONFIG_EXT3_FS_POSIX_ACL=y | ||
| 937 | CONFIG_EXT3_FS_SECURITY=y | ||
| 938 | # CONFIG_EXT4_FS is not set | ||
| 939 | CONFIG_JBD=y | ||
| 940 | CONFIG_FS_MBCACHE=y | ||
| 863 | # CONFIG_REISERFS_FS is not set | 941 | # CONFIG_REISERFS_FS is not set |
| 864 | # CONFIG_JFS_FS is not set | 942 | # CONFIG_JFS_FS is not set |
| 865 | CONFIG_FS_POSIX_ACL=y | 943 | CONFIG_FS_POSIX_ACL=y |
| 944 | CONFIG_FILE_LOCKING=y | ||
| 866 | # CONFIG_XFS_FS is not set | 945 | # CONFIG_XFS_FS is not set |
| 867 | # CONFIG_GFS2_FS is not set | 946 | # CONFIG_GFS2_FS is not set |
| 868 | # CONFIG_OCFS2_FS is not set | 947 | # CONFIG_OCFS2_FS is not set |
| 869 | # CONFIG_MINIX_FS is not set | 948 | CONFIG_DNOTIFY=y |
| 870 | # CONFIG_ROMFS_FS is not set | ||
| 871 | CONFIG_INOTIFY=y | 949 | CONFIG_INOTIFY=y |
| 872 | CONFIG_INOTIFY_USER=y | 950 | CONFIG_INOTIFY_USER=y |
| 873 | # CONFIG_QUOTA is not set | 951 | CONFIG_QUOTA=y |
| 874 | CONFIG_DNOTIFY=y | 952 | # CONFIG_QUOTA_NETLINK_INTERFACE is not set |
| 875 | # CONFIG_AUTOFS_FS is not set | 953 | CONFIG_PRINT_QUOTA_WARNING=y |
| 876 | # CONFIG_AUTOFS4_FS is not set | 954 | CONFIG_QFMT_V1=m |
| 877 | CONFIG_FUSE_FS=y | 955 | CONFIG_QFMT_V2=m |
| 956 | CONFIG_QUOTACTL=y | ||
| 957 | CONFIG_AUTOFS_FS=m | ||
| 958 | CONFIG_AUTOFS4_FS=m | ||
| 959 | CONFIG_FUSE_FS=m | ||
| 878 | CONFIG_GENERIC_ACL=y | 960 | CONFIG_GENERIC_ACL=y |
| 879 | 961 | ||
| 880 | # | 962 | # |
| 881 | # CD-ROM/DVD Filesystems | 963 | # CD-ROM/DVD Filesystems |
| 882 | # | 964 | # |
| 883 | # CONFIG_ISO9660_FS is not set | 965 | CONFIG_ISO9660_FS=m |
| 884 | # CONFIG_UDF_FS is not set | 966 | CONFIG_JOLIET=y |
| 967 | CONFIG_ZISOFS=y | ||
| 968 | CONFIG_UDF_FS=m | ||
| 969 | CONFIG_UDF_NLS=y | ||
| 885 | 970 | ||
| 886 | # | 971 | # |
| 887 | # DOS/FAT/NT Filesystems | 972 | # DOS/FAT/NT Filesystems |
| 888 | # | 973 | # |
| 889 | # CONFIG_MSDOS_FS is not set | 974 | CONFIG_FAT_FS=m |
| 890 | # CONFIG_VFAT_FS is not set | 975 | CONFIG_MSDOS_FS=m |
| 976 | CONFIG_VFAT_FS=m | ||
| 977 | CONFIG_FAT_DEFAULT_CODEPAGE=437 | ||
| 978 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | ||
| 891 | # CONFIG_NTFS_FS is not set | 979 | # CONFIG_NTFS_FS is not set |
| 892 | 980 | ||
| 893 | # | 981 | # |
| @@ -896,11 +984,11 @@ CONFIG_GENERIC_ACL=y | |||
| 896 | CONFIG_PROC_FS=y | 984 | CONFIG_PROC_FS=y |
| 897 | CONFIG_PROC_KCORE=y | 985 | CONFIG_PROC_KCORE=y |
| 898 | CONFIG_PROC_SYSCTL=y | 986 | CONFIG_PROC_SYSCTL=y |
| 987 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 899 | CONFIG_SYSFS=y | 988 | CONFIG_SYSFS=y |
| 900 | CONFIG_TMPFS=y | 989 | CONFIG_TMPFS=y |
| 901 | CONFIG_TMPFS_POSIX_ACL=y | 990 | CONFIG_TMPFS_POSIX_ACL=y |
| 902 | # CONFIG_HUGETLB_PAGE is not set | 991 | # CONFIG_HUGETLB_PAGE is not set |
| 903 | CONFIG_RAMFS=y | ||
| 904 | CONFIG_CONFIGFS_FS=y | 992 | CONFIG_CONFIGFS_FS=y |
| 905 | 993 | ||
| 906 | # | 994 | # |
| @@ -916,33 +1004,42 @@ CONFIG_CONFIGFS_FS=y | |||
| 916 | # CONFIG_EFS_FS is not set | 1004 | # CONFIG_EFS_FS is not set |
| 917 | # CONFIG_CRAMFS is not set | 1005 | # CONFIG_CRAMFS is not set |
| 918 | # CONFIG_VXFS_FS is not set | 1006 | # CONFIG_VXFS_FS is not set |
| 1007 | # CONFIG_MINIX_FS is not set | ||
| 1008 | # CONFIG_OMFS_FS is not set | ||
| 919 | # CONFIG_HPFS_FS is not set | 1009 | # CONFIG_HPFS_FS is not set |
| 920 | # CONFIG_QNX4FS_FS is not set | 1010 | # CONFIG_QNX4FS_FS is not set |
| 1011 | # CONFIG_ROMFS_FS is not set | ||
| 921 | # CONFIG_SYSV_FS is not set | 1012 | # CONFIG_SYSV_FS is not set |
| 922 | # CONFIG_UFS_FS is not set | 1013 | # CONFIG_UFS_FS is not set |
| 923 | 1014 | CONFIG_NETWORK_FILESYSTEMS=y | |
| 924 | # | ||
| 925 | # Network File Systems | ||
| 926 | # | ||
| 927 | CONFIG_NFS_FS=y | 1015 | CONFIG_NFS_FS=y |
| 928 | CONFIG_NFS_V3=y | 1016 | CONFIG_NFS_V3=y |
| 929 | # CONFIG_NFS_V3_ACL is not set | 1017 | # CONFIG_NFS_V3_ACL is not set |
| 930 | # CONFIG_NFS_V4 is not set | 1018 | # CONFIG_NFS_V4 is not set |
| 931 | # CONFIG_NFS_DIRECTIO is not set | ||
| 932 | # CONFIG_NFSD is not set | ||
| 933 | CONFIG_ROOT_NFS=y | 1019 | CONFIG_ROOT_NFS=y |
| 1020 | CONFIG_NFSD=m | ||
| 1021 | CONFIG_NFSD_V3=y | ||
| 1022 | # CONFIG_NFSD_V3_ACL is not set | ||
| 1023 | # CONFIG_NFSD_V4 is not set | ||
| 934 | CONFIG_LOCKD=y | 1024 | CONFIG_LOCKD=y |
| 935 | CONFIG_LOCKD_V4=y | 1025 | CONFIG_LOCKD_V4=y |
| 1026 | CONFIG_EXPORTFS=m | ||
| 936 | CONFIG_NFS_COMMON=y | 1027 | CONFIG_NFS_COMMON=y |
| 937 | CONFIG_SUNRPC=y | 1028 | CONFIG_SUNRPC=y |
| 1029 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
| 938 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1030 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 939 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1031 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 940 | # CONFIG_SMB_FS is not set | 1032 | # CONFIG_SMB_FS is not set |
| 941 | # CONFIG_CIFS is not set | 1033 | CONFIG_CIFS=m |
| 1034 | # CONFIG_CIFS_STATS is not set | ||
| 1035 | # CONFIG_CIFS_WEAK_PW_HASH is not set | ||
| 1036 | # CONFIG_CIFS_UPCALL is not set | ||
| 1037 | # CONFIG_CIFS_XATTR is not set | ||
| 1038 | # CONFIG_CIFS_DEBUG2 is not set | ||
| 1039 | # CONFIG_CIFS_EXPERIMENTAL is not set | ||
| 942 | # CONFIG_NCP_FS is not set | 1040 | # CONFIG_NCP_FS is not set |
| 943 | # CONFIG_CODA_FS is not set | 1041 | # CONFIG_CODA_FS is not set |
| 944 | # CONFIG_AFS_FS is not set | 1042 | # CONFIG_AFS_FS is not set |
| 945 | # CONFIG_9P_FS is not set | ||
| 946 | 1043 | ||
| 947 | # | 1044 | # |
| 948 | # Partition Types | 1045 | # Partition Types |
| @@ -953,45 +1050,83 @@ CONFIG_PARTITION_ADVANCED=y | |||
| 953 | # CONFIG_AMIGA_PARTITION is not set | 1050 | # CONFIG_AMIGA_PARTITION is not set |
| 954 | # CONFIG_ATARI_PARTITION is not set | 1051 | # CONFIG_ATARI_PARTITION is not set |
| 955 | # CONFIG_MAC_PARTITION is not set | 1052 | # CONFIG_MAC_PARTITION is not set |
| 956 | # CONFIG_MSDOS_PARTITION is not set | 1053 | CONFIG_MSDOS_PARTITION=y |
| 1054 | # CONFIG_BSD_DISKLABEL is not set | ||
| 1055 | # CONFIG_MINIX_SUBPARTITION is not set | ||
| 1056 | # CONFIG_SOLARIS_X86_PARTITION is not set | ||
| 1057 | # CONFIG_UNIXWARE_DISKLABEL is not set | ||
| 957 | # CONFIG_LDM_PARTITION is not set | 1058 | # CONFIG_LDM_PARTITION is not set |
| 958 | CONFIG_SGI_PARTITION=y | 1059 | CONFIG_SGI_PARTITION=y |
| 959 | # CONFIG_ULTRIX_PARTITION is not set | 1060 | # CONFIG_ULTRIX_PARTITION is not set |
| 960 | # CONFIG_SUN_PARTITION is not set | 1061 | # CONFIG_SUN_PARTITION is not set |
| 961 | # CONFIG_KARMA_PARTITION is not set | 1062 | # CONFIG_KARMA_PARTITION is not set |
| 962 | # CONFIG_EFI_PARTITION is not set | 1063 | # CONFIG_EFI_PARTITION is not set |
| 963 | 1064 | # CONFIG_SYSV68_PARTITION is not set | |
| 964 | # | 1065 | CONFIG_NLS=y |
| 965 | # Native Language Support | 1066 | CONFIG_NLS_DEFAULT="iso8859-1" |
| 966 | # | 1067 | CONFIG_NLS_CODEPAGE_437=m |
| 967 | # CONFIG_NLS is not set | 1068 | CONFIG_NLS_CODEPAGE_737=m |
| 968 | 1069 | CONFIG_NLS_CODEPAGE_775=m | |
| 969 | # | 1070 | CONFIG_NLS_CODEPAGE_850=m |
| 970 | # Distributed Lock Manager | 1071 | CONFIG_NLS_CODEPAGE_852=m |
| 971 | # | 1072 | CONFIG_NLS_CODEPAGE_855=m |
| 972 | CONFIG_DLM=y | 1073 | CONFIG_NLS_CODEPAGE_857=m |
| 973 | CONFIG_DLM_TCP=y | 1074 | CONFIG_NLS_CODEPAGE_860=m |
| 974 | # CONFIG_DLM_SCTP is not set | 1075 | CONFIG_NLS_CODEPAGE_861=m |
| 975 | # CONFIG_DLM_DEBUG is not set | 1076 | CONFIG_NLS_CODEPAGE_862=m |
| 976 | 1077 | CONFIG_NLS_CODEPAGE_863=m | |
| 977 | # | 1078 | CONFIG_NLS_CODEPAGE_864=m |
| 978 | # Profiling support | 1079 | CONFIG_NLS_CODEPAGE_865=m |
| 979 | # | 1080 | CONFIG_NLS_CODEPAGE_866=m |
| 980 | # CONFIG_PROFILING is not set | 1081 | CONFIG_NLS_CODEPAGE_869=m |
| 1082 | CONFIG_NLS_CODEPAGE_936=m | ||
| 1083 | CONFIG_NLS_CODEPAGE_950=m | ||
| 1084 | CONFIG_NLS_CODEPAGE_932=m | ||
| 1085 | CONFIG_NLS_CODEPAGE_949=m | ||
| 1086 | CONFIG_NLS_CODEPAGE_874=m | ||
| 1087 | CONFIG_NLS_ISO8859_8=m | ||
| 1088 | CONFIG_NLS_CODEPAGE_1250=m | ||
| 1089 | CONFIG_NLS_CODEPAGE_1251=m | ||
| 1090 | CONFIG_NLS_ASCII=m | ||
| 1091 | CONFIG_NLS_ISO8859_1=m | ||
| 1092 | CONFIG_NLS_ISO8859_2=m | ||
| 1093 | CONFIG_NLS_ISO8859_3=m | ||
| 1094 | CONFIG_NLS_ISO8859_4=m | ||
| 1095 | CONFIG_NLS_ISO8859_5=m | ||
| 1096 | CONFIG_NLS_ISO8859_6=m | ||
| 1097 | CONFIG_NLS_ISO8859_7=m | ||
| 1098 | CONFIG_NLS_ISO8859_9=m | ||
| 1099 | CONFIG_NLS_ISO8859_13=m | ||
| 1100 | CONFIG_NLS_ISO8859_14=m | ||
| 1101 | CONFIG_NLS_ISO8859_15=m | ||
| 1102 | CONFIG_NLS_KOI8_R=m | ||
| 1103 | CONFIG_NLS_KOI8_U=m | ||
| 1104 | CONFIG_NLS_UTF8=m | ||
| 1105 | # CONFIG_DLM is not set | ||
| 981 | 1106 | ||
| 982 | # | 1107 | # |
| 983 | # Kernel hacking | 1108 | # Kernel hacking |
| 984 | # | 1109 | # |
| 985 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 1110 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
| 986 | # CONFIG_PRINTK_TIME is not set | 1111 | # CONFIG_PRINTK_TIME is not set |
| 1112 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
| 987 | CONFIG_ENABLE_MUST_CHECK=y | 1113 | CONFIG_ENABLE_MUST_CHECK=y |
| 988 | # CONFIG_MAGIC_SYSRQ is not set | 1114 | CONFIG_FRAME_WARN=2048 |
| 1115 | CONFIG_MAGIC_SYSRQ=y | ||
| 989 | # CONFIG_UNUSED_SYMBOLS is not set | 1116 | # CONFIG_UNUSED_SYMBOLS is not set |
| 990 | # CONFIG_DEBUG_FS is not set | 1117 | # CONFIG_DEBUG_FS is not set |
| 991 | # CONFIG_HEADERS_CHECK is not set | 1118 | # CONFIG_HEADERS_CHECK is not set |
| 992 | # CONFIG_DEBUG_KERNEL is not set | 1119 | # CONFIG_DEBUG_KERNEL is not set |
| 993 | CONFIG_LOG_BUF_SHIFT=14 | 1120 | # CONFIG_DEBUG_MEMORY_INIT is not set |
| 994 | CONFIG_CROSSCOMPILE=y | 1121 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
| 1122 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1123 | |||
| 1124 | # | ||
| 1125 | # Tracers | ||
| 1126 | # | ||
| 1127 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
| 1128 | # CONFIG_SAMPLES is not set | ||
| 1129 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 995 | CONFIG_CMDLINE="" | 1130 | CONFIG_CMDLINE="" |
| 996 | 1131 | ||
| 997 | # | 1132 | # |
| @@ -1000,51 +1135,99 @@ CONFIG_CMDLINE="" | |||
| 1000 | CONFIG_KEYS=y | 1135 | CONFIG_KEYS=y |
| 1001 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | 1136 | CONFIG_KEYS_DEBUG_PROC_KEYS=y |
| 1002 | # CONFIG_SECURITY is not set | 1137 | # CONFIG_SECURITY is not set |
| 1138 | # CONFIG_SECURITYFS is not set | ||
| 1139 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
| 1140 | CONFIG_CRYPTO=y | ||
| 1003 | 1141 | ||
| 1004 | # | 1142 | # |
| 1005 | # Cryptographic options | 1143 | # Crypto core or helper |
| 1006 | # | 1144 | # |
| 1007 | CONFIG_CRYPTO=y | 1145 | # CONFIG_CRYPTO_FIPS is not set |
| 1008 | CONFIG_CRYPTO_ALGAPI=y | 1146 | CONFIG_CRYPTO_ALGAPI=y |
| 1147 | CONFIG_CRYPTO_AEAD=y | ||
| 1009 | CONFIG_CRYPTO_BLKCIPHER=y | 1148 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1010 | CONFIG_CRYPTO_HASH=y | 1149 | CONFIG_CRYPTO_HASH=y |
| 1150 | CONFIG_CRYPTO_RNG=y | ||
| 1011 | CONFIG_CRYPTO_MANAGER=y | 1151 | CONFIG_CRYPTO_MANAGER=y |
| 1152 | CONFIG_CRYPTO_GF128MUL=y | ||
| 1153 | CONFIG_CRYPTO_NULL=y | ||
| 1154 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1155 | CONFIG_CRYPTO_AUTHENC=m | ||
| 1156 | # CONFIG_CRYPTO_TEST is not set | ||
| 1157 | |||
| 1158 | # | ||
| 1159 | # Authenticated Encryption with Associated Data | ||
| 1160 | # | ||
| 1161 | # CONFIG_CRYPTO_CCM is not set | ||
| 1162 | # CONFIG_CRYPTO_GCM is not set | ||
| 1163 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1164 | |||
| 1165 | # | ||
| 1166 | # Block modes | ||
| 1167 | # | ||
| 1168 | CONFIG_CRYPTO_CBC=y | ||
| 1169 | # CONFIG_CRYPTO_CTR is not set | ||
| 1170 | # CONFIG_CRYPTO_CTS is not set | ||
| 1171 | CONFIG_CRYPTO_ECB=y | ||
| 1172 | CONFIG_CRYPTO_LRW=y | ||
| 1173 | CONFIG_CRYPTO_PCBC=y | ||
| 1174 | # CONFIG_CRYPTO_XTS is not set | ||
| 1175 | |||
| 1176 | # | ||
| 1177 | # Hash modes | ||
| 1178 | # | ||
| 1012 | CONFIG_CRYPTO_HMAC=y | 1179 | CONFIG_CRYPTO_HMAC=y |
| 1013 | CONFIG_CRYPTO_XCBC=y | 1180 | CONFIG_CRYPTO_XCBC=y |
| 1014 | CONFIG_CRYPTO_NULL=y | 1181 | |
| 1182 | # | ||
| 1183 | # Digest | ||
| 1184 | # | ||
| 1185 | CONFIG_CRYPTO_CRC32C=y | ||
| 1015 | CONFIG_CRYPTO_MD4=y | 1186 | CONFIG_CRYPTO_MD4=y |
| 1016 | CONFIG_CRYPTO_MD5=y | 1187 | CONFIG_CRYPTO_MD5=y |
| 1188 | CONFIG_CRYPTO_MICHAEL_MIC=y | ||
| 1189 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1190 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1191 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1192 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1017 | CONFIG_CRYPTO_SHA1=y | 1193 | CONFIG_CRYPTO_SHA1=y |
| 1018 | CONFIG_CRYPTO_SHA256=y | 1194 | CONFIG_CRYPTO_SHA256=y |
| 1019 | CONFIG_CRYPTO_SHA512=y | 1195 | CONFIG_CRYPTO_SHA512=y |
| 1020 | CONFIG_CRYPTO_WP512=y | ||
| 1021 | CONFIG_CRYPTO_TGR192=y | 1196 | CONFIG_CRYPTO_TGR192=y |
| 1022 | CONFIG_CRYPTO_GF128MUL=y | 1197 | CONFIG_CRYPTO_WP512=y |
| 1023 | CONFIG_CRYPTO_ECB=y | 1198 | |
| 1024 | CONFIG_CRYPTO_CBC=y | 1199 | # |
| 1025 | CONFIG_CRYPTO_PCBC=y | 1200 | # Ciphers |
| 1026 | CONFIG_CRYPTO_LRW=y | 1201 | # |
| 1027 | CONFIG_CRYPTO_DES=y | ||
| 1028 | CONFIG_CRYPTO_FCRYPT=y | ||
| 1029 | CONFIG_CRYPTO_BLOWFISH=y | ||
| 1030 | CONFIG_CRYPTO_TWOFISH=y | ||
| 1031 | CONFIG_CRYPTO_TWOFISH_COMMON=y | ||
| 1032 | CONFIG_CRYPTO_SERPENT=y | ||
| 1033 | CONFIG_CRYPTO_AES=y | 1202 | CONFIG_CRYPTO_AES=y |
| 1203 | CONFIG_CRYPTO_ANUBIS=y | ||
| 1204 | CONFIG_CRYPTO_ARC4=y | ||
| 1205 | CONFIG_CRYPTO_BLOWFISH=y | ||
| 1206 | CONFIG_CRYPTO_CAMELLIA=y | ||
| 1034 | CONFIG_CRYPTO_CAST5=y | 1207 | CONFIG_CRYPTO_CAST5=y |
| 1035 | CONFIG_CRYPTO_CAST6=y | 1208 | CONFIG_CRYPTO_CAST6=y |
| 1036 | CONFIG_CRYPTO_TEA=y | 1209 | CONFIG_CRYPTO_DES=y |
| 1037 | CONFIG_CRYPTO_ARC4=y | 1210 | CONFIG_CRYPTO_FCRYPT=y |
| 1038 | CONFIG_CRYPTO_KHAZAD=y | 1211 | CONFIG_CRYPTO_KHAZAD=y |
| 1039 | CONFIG_CRYPTO_ANUBIS=y | 1212 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1213 | # CONFIG_CRYPTO_SEED is not set | ||
| 1214 | CONFIG_CRYPTO_SERPENT=y | ||
| 1215 | CONFIG_CRYPTO_TEA=y | ||
| 1216 | CONFIG_CRYPTO_TWOFISH=y | ||
| 1217 | CONFIG_CRYPTO_TWOFISH_COMMON=y | ||
| 1218 | |||
| 1219 | # | ||
| 1220 | # Compression | ||
| 1221 | # | ||
| 1040 | CONFIG_CRYPTO_DEFLATE=y | 1222 | CONFIG_CRYPTO_DEFLATE=y |
| 1041 | CONFIG_CRYPTO_MICHAEL_MIC=y | 1223 | # CONFIG_CRYPTO_LZO is not set |
| 1042 | CONFIG_CRYPTO_CRC32C=y | ||
| 1043 | CONFIG_CRYPTO_CAMELLIA=y | ||
| 1044 | 1224 | ||
| 1045 | # | 1225 | # |
| 1046 | # Hardware crypto devices | 1226 | # Random Number Generation |
| 1047 | # | 1227 | # |
| 1228 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
| 1229 | CONFIG_CRYPTO_HW=y | ||
| 1230 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | ||
| 1048 | 1231 | ||
| 1049 | # | 1232 | # |
| 1050 | # Library routines | 1233 | # Library routines |
| @@ -1052,10 +1235,15 @@ CONFIG_CRYPTO_CAMELLIA=y | |||
| 1052 | CONFIG_BITREVERSE=y | 1235 | CONFIG_BITREVERSE=y |
| 1053 | # CONFIG_CRC_CCITT is not set | 1236 | # CONFIG_CRC_CCITT is not set |
| 1054 | CONFIG_CRC16=y | 1237 | CONFIG_CRC16=y |
| 1238 | CONFIG_CRC_T10DIF=y | ||
| 1239 | CONFIG_CRC_ITU_T=m | ||
| 1055 | CONFIG_CRC32=y | 1240 | CONFIG_CRC32=y |
| 1241 | # CONFIG_CRC7 is not set | ||
| 1056 | CONFIG_LIBCRC32C=y | 1242 | CONFIG_LIBCRC32C=y |
| 1243 | CONFIG_AUDIT_GENERIC=y | ||
| 1057 | CONFIG_ZLIB_INFLATE=y | 1244 | CONFIG_ZLIB_INFLATE=y |
| 1058 | CONFIG_ZLIB_DEFLATE=y | 1245 | CONFIG_ZLIB_DEFLATE=y |
| 1059 | CONFIG_PLIST=y | 1246 | CONFIG_PLIST=y |
| 1060 | CONFIG_HAS_IOMEM=y | 1247 | CONFIG_HAS_IOMEM=y |
| 1061 | CONFIG_HAS_IOPORT=y | 1248 | CONFIG_HAS_IOPORT=y |
| 1249 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig index 74daa0cf87e6..1ecdd3b65dc7 100644 --- a/arch/mips/configs/malta_defconfig +++ b/arch/mips/configs/malta_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.23-rc2 | 3 | # Linux kernel version: 2.6.28-rc6 |
| 4 | # Tue Aug 7 12:59:29 2007 | 4 | # Mon Dec 1 08:08:19 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -11,20 +11,25 @@ CONFIG_MIPS=y | |||
| 11 | CONFIG_ZONE_DMA=y | 11 | CONFIG_ZONE_DMA=y |
| 12 | # CONFIG_MACH_ALCHEMY is not set | 12 | # CONFIG_MACH_ALCHEMY is not set |
| 13 | # CONFIG_BASLER_EXCITE is not set | 13 | # CONFIG_BASLER_EXCITE is not set |
| 14 | # CONFIG_BCM47XX is not set | ||
| 14 | # CONFIG_MIPS_COBALT is not set | 15 | # CONFIG_MIPS_COBALT is not set |
| 15 | # CONFIG_MACH_DECSTATION is not set | 16 | # CONFIG_MACH_DECSTATION is not set |
| 16 | # CONFIG_MACH_JAZZ is not set | 17 | # CONFIG_MACH_JAZZ is not set |
| 18 | # CONFIG_LASAT is not set | ||
| 17 | # CONFIG_LEMOTE_FULONG is not set | 19 | # CONFIG_LEMOTE_FULONG is not set |
| 18 | CONFIG_MIPS_MALTA=y | 20 | CONFIG_MIPS_MALTA=y |
| 19 | # CONFIG_MIPS_SIM is not set | 21 | # CONFIG_MIPS_SIM is not set |
| 20 | # CONFIG_MARKEINS is not set | 22 | # CONFIG_MACH_EMMA is not set |
| 21 | # CONFIG_MACH_VR41XX is not set | 23 | # CONFIG_MACH_VR41XX is not set |
| 24 | # CONFIG_NXP_STB220 is not set | ||
| 25 | # CONFIG_NXP_STB225 is not set | ||
| 22 | # CONFIG_PNX8550_JBS is not set | 26 | # CONFIG_PNX8550_JBS is not set |
| 23 | # CONFIG_PNX8550_STB810 is not set | 27 | # CONFIG_PNX8550_STB810 is not set |
| 24 | # CONFIG_PMC_MSP is not set | 28 | # CONFIG_PMC_MSP is not set |
| 25 | # CONFIG_PMC_YOSEMITE is not set | 29 | # CONFIG_PMC_YOSEMITE is not set |
| 26 | # CONFIG_SGI_IP22 is not set | 30 | # CONFIG_SGI_IP22 is not set |
| 27 | # CONFIG_SGI_IP27 is not set | 31 | # CONFIG_SGI_IP27 is not set |
| 32 | # CONFIG_SGI_IP28 is not set | ||
| 28 | # CONFIG_SGI_IP32 is not set | 33 | # CONFIG_SGI_IP32 is not set |
| 29 | # CONFIG_SIBYTE_CRHINE is not set | 34 | # CONFIG_SIBYTE_CRHINE is not set |
| 30 | # CONFIG_SIBYTE_CARMEL is not set | 35 | # CONFIG_SIBYTE_CARMEL is not set |
| @@ -35,13 +40,14 @@ CONFIG_MIPS_MALTA=y | |||
| 35 | # CONFIG_SIBYTE_SENTOSA is not set | 40 | # CONFIG_SIBYTE_SENTOSA is not set |
| 36 | # CONFIG_SIBYTE_BIGSUR is not set | 41 | # CONFIG_SIBYTE_BIGSUR is not set |
| 37 | # CONFIG_SNI_RM is not set | 42 | # CONFIG_SNI_RM is not set |
| 38 | # CONFIG_TOSHIBA_JMR3927 is not set | 43 | # CONFIG_MACH_TX39XX is not set |
| 39 | # CONFIG_TOSHIBA_RBTX4927 is not set | 44 | # CONFIG_MACH_TX49XX is not set |
| 40 | # CONFIG_TOSHIBA_RBTX4938 is not set | 45 | # CONFIG_MIKROTIK_RB532 is not set |
| 41 | # CONFIG_WR_PPMC is not set | 46 | # CONFIG_WR_PPMC is not set |
| 42 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 47 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 43 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 48 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
| 44 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 49 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
| 50 | CONFIG_ARCH_SUPPORTS_OPROFILE=y | ||
| 45 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 51 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 46 | CONFIG_GENERIC_HWEIGHT=y | 52 | CONFIG_GENERIC_HWEIGHT=y |
| 47 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 53 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| @@ -51,21 +57,26 @@ CONFIG_GENERIC_CMOS_UPDATE=y | |||
| 51 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 57 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 52 | # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set | 58 | # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set |
| 53 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 59 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
| 60 | CONFIG_BOOT_RAW=y | ||
| 54 | CONFIG_CEVT_R4K=y | 61 | CONFIG_CEVT_R4K=y |
| 62 | CONFIG_CSRC_R4K=y | ||
| 55 | CONFIG_DMA_NONCOHERENT=y | 63 | CONFIG_DMA_NONCOHERENT=y |
| 56 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 64 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| 57 | CONFIG_EARLY_PRINTK=y | 65 | CONFIG_EARLY_PRINTK=y |
| 58 | CONFIG_SYS_HAS_EARLY_PRINTK=y | 66 | CONFIG_SYS_HAS_EARLY_PRINTK=y |
| 59 | CONFIG_GENERIC_ISA_DMA=y | 67 | # CONFIG_HOTPLUG_CPU is not set |
| 60 | CONFIG_I8259=y | 68 | CONFIG_I8259=y |
| 61 | CONFIG_MIPS_BONITO64=y | 69 | CONFIG_MIPS_BONITO64=y |
| 62 | CONFIG_MIPS_MSC=y | 70 | CONFIG_MIPS_MSC=y |
| 63 | # CONFIG_NO_IOPORT is not set | 71 | # CONFIG_NO_IOPORT is not set |
| 72 | CONFIG_GENERIC_ISA_DMA=y | ||
| 64 | # CONFIG_CPU_BIG_ENDIAN is not set | 73 | # CONFIG_CPU_BIG_ENDIAN is not set |
| 65 | CONFIG_CPU_LITTLE_ENDIAN=y | 74 | CONFIG_CPU_LITTLE_ENDIAN=y |
| 66 | CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y | 75 | CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y |
| 67 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y | 76 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y |
| 68 | CONFIG_IRQ_CPU=y | 77 | CONFIG_IRQ_CPU=y |
| 78 | CONFIG_IRQ_GIC=y | ||
| 79 | CONFIG_MIPS_BOARDS_GEN=y | ||
| 69 | CONFIG_PCI_GT64XXX_PCI0=y | 80 | CONFIG_PCI_GT64XXX_PCI0=y |
| 70 | CONFIG_SWAP_IO_SPACE=y | 81 | CONFIG_SWAP_IO_SPACE=y |
| 71 | CONFIG_BOOT_ELF32=y | 82 | CONFIG_BOOT_ELF32=y |
| @@ -74,10 +85,6 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 | |||
| 74 | # | 85 | # |
| 75 | # CPU selection | 86 | # CPU selection |
| 76 | # | 87 | # |
| 77 | CONFIG_TICK_ONESHOT=y | ||
| 78 | CONFIG_NO_HZ=y | ||
| 79 | CONFIG_HIGH_RES_TIMERS=y | ||
| 80 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 81 | # CONFIG_CPU_LOONGSON2 is not set | 88 | # CONFIG_CPU_LOONGSON2 is not set |
| 82 | # CONFIG_CPU_MIPS32_R1 is not set | 89 | # CONFIG_CPU_MIPS32_R1 is not set |
| 83 | CONFIG_CPU_MIPS32_R2=y | 90 | CONFIG_CPU_MIPS32_R2=y |
| @@ -91,6 +98,7 @@ CONFIG_CPU_MIPS32_R2=y | |||
| 91 | # CONFIG_CPU_TX49XX is not set | 98 | # CONFIG_CPU_TX49XX is not set |
| 92 | # CONFIG_CPU_R5000 is not set | 99 | # CONFIG_CPU_R5000 is not set |
| 93 | # CONFIG_CPU_R5432 is not set | 100 | # CONFIG_CPU_R5432 is not set |
| 101 | # CONFIG_CPU_R5500 is not set | ||
| 94 | # CONFIG_CPU_R6000 is not set | 102 | # CONFIG_CPU_R6000 is not set |
| 95 | # CONFIG_CPU_NEVADA is not set | 103 | # CONFIG_CPU_NEVADA is not set |
| 96 | # CONFIG_CPU_R8000 is not set | 104 | # CONFIG_CPU_R8000 is not set |
| @@ -108,6 +116,7 @@ CONFIG_CPU_MIPSR2=y | |||
| 108 | CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y | 116 | CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y |
| 109 | CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y | 117 | CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y |
| 110 | CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y | 118 | CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y |
| 119 | CONFIG_HARDWARE_WATCHPOINTS=y | ||
| 111 | 120 | ||
| 112 | # | 121 | # |
| 113 | # Kernel type | 122 | # Kernel type |
| @@ -125,6 +134,8 @@ CONFIG_CPU_HAS_PREFETCH=y | |||
| 125 | CONFIG_MIPS_MT_SMP=y | 134 | CONFIG_MIPS_MT_SMP=y |
| 126 | # CONFIG_MIPS_MT_SMTC is not set | 135 | # CONFIG_MIPS_MT_SMTC is not set |
| 127 | CONFIG_MIPS_MT=y | 136 | CONFIG_MIPS_MT=y |
| 137 | # CONFIG_SCHED_SMT is not set | ||
| 138 | CONFIG_SYS_SUPPORTS_SCHED_SMT=y | ||
| 128 | CONFIG_SYS_SUPPORTS_MULTITHREADING=y | 139 | CONFIG_SYS_SUPPORTS_MULTITHREADING=y |
| 129 | CONFIG_MIPS_MT_FPAFF=y | 140 | CONFIG_MIPS_MT_FPAFF=y |
| 130 | # CONFIG_MIPS_VPE_LOADER is not set | 141 | # CONFIG_MIPS_VPE_LOADER is not set |
| @@ -132,7 +143,6 @@ CONFIG_CPU_HAS_LLSC=y | |||
| 132 | # CONFIG_CPU_HAS_SMARTMIPS is not set | 143 | # CONFIG_CPU_HAS_SMARTMIPS is not set |
| 133 | CONFIG_CPU_MIPSR2_IRQ_VI=y | 144 | CONFIG_CPU_MIPSR2_IRQ_VI=y |
| 134 | CONFIG_CPU_MIPSR2_IRQ_EI=y | 145 | CONFIG_CPU_MIPSR2_IRQ_EI=y |
| 135 | CONFIG_CPU_MIPSR2_SRS=y | ||
| 136 | CONFIG_CPU_HAS_SYNC=y | 146 | CONFIG_CPU_HAS_SYNC=y |
| 137 | CONFIG_GENERIC_HARDIRQS=y | 147 | CONFIG_GENERIC_HARDIRQS=y |
| 138 | CONFIG_GENERIC_IRQ_PROBE=y | 148 | CONFIG_GENERIC_IRQ_PROBE=y |
| @@ -140,22 +150,30 @@ CONFIG_IRQ_PER_CPU=y | |||
| 140 | CONFIG_CPU_SUPPORTS_HIGHMEM=y | 150 | CONFIG_CPU_SUPPORTS_HIGHMEM=y |
| 141 | CONFIG_SYS_SUPPORTS_SMARTMIPS=y | 151 | CONFIG_SYS_SUPPORTS_SMARTMIPS=y |
| 142 | CONFIG_ARCH_FLATMEM_ENABLE=y | 152 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 153 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
| 143 | CONFIG_SELECT_MEMORY_MODEL=y | 154 | CONFIG_SELECT_MEMORY_MODEL=y |
| 144 | CONFIG_FLATMEM_MANUAL=y | 155 | CONFIG_FLATMEM_MANUAL=y |
| 145 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 156 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| 146 | # CONFIG_SPARSEMEM_MANUAL is not set | 157 | # CONFIG_SPARSEMEM_MANUAL is not set |
| 147 | CONFIG_FLATMEM=y | 158 | CONFIG_FLATMEM=y |
| 148 | CONFIG_FLAT_NODE_MEM_MAP=y | 159 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 149 | # CONFIG_SPARSEMEM_STATIC is not set | 160 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 150 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 161 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 151 | # CONFIG_RESOURCES_64BIT is not set | 162 | # CONFIG_RESOURCES_64BIT is not set |
| 163 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
| 152 | CONFIG_ZONE_DMA_FLAG=1 | 164 | CONFIG_ZONE_DMA_FLAG=1 |
| 153 | CONFIG_BOUNCE=y | 165 | CONFIG_BOUNCE=y |
| 154 | CONFIG_VIRT_TO_BUS=y | 166 | CONFIG_VIRT_TO_BUS=y |
| 167 | CONFIG_UNEVICTABLE_LRU=y | ||
| 155 | CONFIG_SMP=y | 168 | CONFIG_SMP=y |
| 169 | CONFIG_SMP_UP=y | ||
| 156 | CONFIG_SYS_SUPPORTS_SMP=y | 170 | CONFIG_SYS_SUPPORTS_SMP=y |
| 157 | CONFIG_NR_CPUS_DEFAULT_2=y | 171 | CONFIG_NR_CPUS_DEFAULT_2=y |
| 158 | CONFIG_NR_CPUS=2 | 172 | CONFIG_NR_CPUS=2 |
| 173 | CONFIG_TICK_ONESHOT=y | ||
| 174 | CONFIG_NO_HZ=y | ||
| 175 | CONFIG_HIGH_RES_TIMERS=y | ||
| 176 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 159 | # CONFIG_HZ_48 is not set | 177 | # CONFIG_HZ_48 is not set |
| 160 | CONFIG_HZ_100=y | 178 | CONFIG_HZ_100=y |
| 161 | # CONFIG_HZ_128 is not set | 179 | # CONFIG_HZ_128 is not set |
| @@ -168,7 +186,6 @@ CONFIG_HZ=100 | |||
| 168 | CONFIG_PREEMPT_NONE=y | 186 | CONFIG_PREEMPT_NONE=y |
| 169 | # CONFIG_PREEMPT_VOLUNTARY is not set | 187 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 170 | # CONFIG_PREEMPT is not set | 188 | # CONFIG_PREEMPT is not set |
| 171 | CONFIG_PREEMPT_BKL=y | ||
| 172 | # CONFIG_KEXEC is not set | 189 | # CONFIG_KEXEC is not set |
| 173 | CONFIG_SECCOMP=y | 190 | CONFIG_SECCOMP=y |
| 174 | CONFIG_LOCKDEP_SUPPORT=y | 191 | CONFIG_LOCKDEP_SUPPORT=y |
| @@ -189,13 +206,19 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
| 189 | # CONFIG_POSIX_MQUEUE is not set | 206 | # CONFIG_POSIX_MQUEUE is not set |
| 190 | # CONFIG_BSD_PROCESS_ACCT is not set | 207 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 191 | # CONFIG_TASKSTATS is not set | 208 | # CONFIG_TASKSTATS is not set |
| 192 | # CONFIG_USER_NS is not set | ||
| 193 | # CONFIG_AUDIT is not set | 209 | # CONFIG_AUDIT is not set |
| 194 | # CONFIG_IKCONFIG is not set | 210 | # CONFIG_IKCONFIG is not set |
| 195 | CONFIG_LOG_BUF_SHIFT=15 | 211 | CONFIG_LOG_BUF_SHIFT=15 |
| 196 | # CONFIG_CPUSETS is not set | 212 | # CONFIG_CGROUPS is not set |
| 213 | # CONFIG_GROUP_SCHED is not set | ||
| 197 | CONFIG_SYSFS_DEPRECATED=y | 214 | CONFIG_SYSFS_DEPRECATED=y |
| 215 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 198 | CONFIG_RELAY=y | 216 | CONFIG_RELAY=y |
| 217 | CONFIG_NAMESPACES=y | ||
| 218 | CONFIG_UTS_NS=y | ||
| 219 | CONFIG_IPC_NS=y | ||
| 220 | # CONFIG_USER_NS is not set | ||
| 221 | CONFIG_PID_NS=y | ||
| 199 | # CONFIG_BLK_DEV_INITRD is not set | 222 | # CONFIG_BLK_DEV_INITRD is not set |
| 200 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 223 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 201 | CONFIG_SYSCTL=y | 224 | CONFIG_SYSCTL=y |
| @@ -207,6 +230,8 @@ CONFIG_HOTPLUG=y | |||
| 207 | CONFIG_PRINTK=y | 230 | CONFIG_PRINTK=y |
| 208 | CONFIG_BUG=y | 231 | CONFIG_BUG=y |
| 209 | CONFIG_ELF_CORE=y | 232 | CONFIG_ELF_CORE=y |
| 233 | CONFIG_PCSPKR_PLATFORM=y | ||
| 234 | # CONFIG_COMPAT_BRK is not set | ||
| 210 | CONFIG_BASE_FULL=y | 235 | CONFIG_BASE_FULL=y |
| 211 | CONFIG_FUTEX=y | 236 | CONFIG_FUTEX=y |
| 212 | CONFIG_ANON_INODES=y | 237 | CONFIG_ANON_INODES=y |
| @@ -215,14 +240,23 @@ CONFIG_SIGNALFD=y | |||
| 215 | CONFIG_TIMERFD=y | 240 | CONFIG_TIMERFD=y |
| 216 | CONFIG_EVENTFD=y | 241 | CONFIG_EVENTFD=y |
| 217 | CONFIG_SHMEM=y | 242 | CONFIG_SHMEM=y |
| 243 | CONFIG_AIO=y | ||
| 218 | CONFIG_VM_EVENT_COUNTERS=y | 244 | CONFIG_VM_EVENT_COUNTERS=y |
| 245 | CONFIG_PCI_QUIRKS=y | ||
| 219 | CONFIG_SLAB=y | 246 | CONFIG_SLAB=y |
| 220 | # CONFIG_SLUB is not set | 247 | # CONFIG_SLUB is not set |
| 221 | # CONFIG_SLOB is not set | 248 | # CONFIG_SLOB is not set |
| 249 | # CONFIG_PROFILING is not set | ||
| 250 | # CONFIG_MARKERS is not set | ||
| 251 | CONFIG_HAVE_OPROFILE=y | ||
| 252 | CONFIG_USE_GENERIC_SMP_HELPERS=y | ||
| 253 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 254 | CONFIG_SLABINFO=y | ||
| 222 | CONFIG_RT_MUTEXES=y | 255 | CONFIG_RT_MUTEXES=y |
| 223 | # CONFIG_TINY_SHMEM is not set | 256 | # CONFIG_TINY_SHMEM is not set |
| 224 | CONFIG_BASE_SMALL=0 | 257 | CONFIG_BASE_SMALL=0 |
| 225 | CONFIG_MODULES=y | 258 | CONFIG_MODULES=y |
| 259 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 226 | CONFIG_MODULE_UNLOAD=y | 260 | CONFIG_MODULE_UNLOAD=y |
| 227 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 261 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 228 | CONFIG_MODVERSIONS=y | 262 | CONFIG_MODVERSIONS=y |
| @@ -234,6 +268,7 @@ CONFIG_BLOCK=y | |||
| 234 | # CONFIG_BLK_DEV_IO_TRACE is not set | 268 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 235 | # CONFIG_LSF is not set | 269 | # CONFIG_LSF is not set |
| 236 | # CONFIG_BLK_DEV_BSG is not set | 270 | # CONFIG_BLK_DEV_BSG is not set |
| 271 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 237 | 272 | ||
| 238 | # | 273 | # |
| 239 | # IO Schedulers | 274 | # IO Schedulers |
| @@ -247,19 +282,19 @@ CONFIG_DEFAULT_AS=y | |||
| 247 | # CONFIG_DEFAULT_CFQ is not set | 282 | # CONFIG_DEFAULT_CFQ is not set |
| 248 | # CONFIG_DEFAULT_NOOP is not set | 283 | # CONFIG_DEFAULT_NOOP is not set |
| 249 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 284 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 285 | CONFIG_CLASSIC_RCU=y | ||
| 286 | # CONFIG_FREEZER is not set | ||
| 250 | 287 | ||
| 251 | # | 288 | # |
| 252 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 289 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 253 | # | 290 | # |
| 254 | CONFIG_HW_HAS_PCI=y | 291 | CONFIG_HW_HAS_PCI=y |
| 255 | CONFIG_PCI=y | 292 | CONFIG_PCI=y |
| 293 | CONFIG_PCI_DOMAINS=y | ||
| 256 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 294 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 295 | CONFIG_PCI_LEGACY=y | ||
| 257 | CONFIG_MMU=y | 296 | CONFIG_MMU=y |
| 258 | CONFIG_I8253=y | 297 | CONFIG_I8253=y |
| 259 | |||
| 260 | # | ||
| 261 | # PCCARD (PCMCIA/CardBus) support | ||
| 262 | # | ||
| 263 | # CONFIG_PCCARD is not set | 298 | # CONFIG_PCCARD is not set |
| 264 | # CONFIG_HOTPLUG_PCI is not set | 299 | # CONFIG_HOTPLUG_PCI is not set |
| 265 | 300 | ||
| @@ -267,6 +302,8 @@ CONFIG_I8253=y | |||
| 267 | # Executable file formats | 302 | # Executable file formats |
| 268 | # | 303 | # |
| 269 | CONFIG_BINFMT_ELF=y | 304 | CONFIG_BINFMT_ELF=y |
| 305 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 306 | # CONFIG_HAVE_AOUT is not set | ||
| 270 | # CONFIG_BINFMT_MISC is not set | 307 | # CONFIG_BINFMT_MISC is not set |
| 271 | CONFIG_TRAD_SIGNALS=y | 308 | CONFIG_TRAD_SIGNALS=y |
| 272 | 309 | ||
| @@ -274,12 +311,7 @@ CONFIG_TRAD_SIGNALS=y | |||
| 274 | # Power management options | 311 | # Power management options |
| 275 | # | 312 | # |
| 276 | CONFIG_PM=y | 313 | CONFIG_PM=y |
| 277 | # CONFIG_PM_LEGACY is not set | ||
| 278 | # CONFIG_PM_DEBUG is not set | 314 | # CONFIG_PM_DEBUG is not set |
| 279 | |||
| 280 | # | ||
| 281 | # Networking | ||
| 282 | # | ||
| 283 | CONFIG_NET=y | 315 | CONFIG_NET=y |
| 284 | 316 | ||
| 285 | # | 317 | # |
| @@ -292,6 +324,8 @@ CONFIG_XFRM=y | |||
| 292 | CONFIG_XFRM_USER=m | 324 | CONFIG_XFRM_USER=m |
| 293 | # CONFIG_XFRM_SUB_POLICY is not set | 325 | # CONFIG_XFRM_SUB_POLICY is not set |
| 294 | CONFIG_XFRM_MIGRATE=y | 326 | CONFIG_XFRM_MIGRATE=y |
| 327 | # CONFIG_XFRM_STATISTICS is not set | ||
| 328 | CONFIG_XFRM_IPCOMP=m | ||
| 295 | CONFIG_NET_KEY=y | 329 | CONFIG_NET_KEY=y |
| 296 | CONFIG_NET_KEY_MIGRATE=y | 330 | CONFIG_NET_KEY_MIGRATE=y |
| 297 | CONFIG_INET=y | 331 | CONFIG_INET=y |
| @@ -323,42 +357,13 @@ CONFIG_INET_TUNNEL=m | |||
| 323 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 357 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
| 324 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 358 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
| 325 | CONFIG_INET_XFRM_MODE_BEET=y | 359 | CONFIG_INET_XFRM_MODE_BEET=y |
| 360 | CONFIG_INET_LRO=m | ||
| 326 | CONFIG_INET_DIAG=y | 361 | CONFIG_INET_DIAG=y |
| 327 | CONFIG_INET_TCP_DIAG=y | 362 | CONFIG_INET_TCP_DIAG=y |
| 328 | # CONFIG_TCP_CONG_ADVANCED is not set | 363 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 329 | CONFIG_TCP_CONG_CUBIC=y | 364 | CONFIG_TCP_CONG_CUBIC=y |
| 330 | CONFIG_DEFAULT_TCP_CONG="cubic" | 365 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 331 | CONFIG_TCP_MD5SIG=y | 366 | CONFIG_TCP_MD5SIG=y |
| 332 | CONFIG_IP_VS=m | ||
| 333 | # CONFIG_IP_VS_DEBUG is not set | ||
| 334 | CONFIG_IP_VS_TAB_BITS=12 | ||
| 335 | |||
| 336 | # | ||
| 337 | # IPVS transport protocol load balancing support | ||
| 338 | # | ||
| 339 | CONFIG_IP_VS_PROTO_TCP=y | ||
| 340 | CONFIG_IP_VS_PROTO_UDP=y | ||
| 341 | CONFIG_IP_VS_PROTO_ESP=y | ||
| 342 | CONFIG_IP_VS_PROTO_AH=y | ||
| 343 | |||
| 344 | # | ||
| 345 | # IPVS scheduler | ||
| 346 | # | ||
| 347 | CONFIG_IP_VS_RR=m | ||
| 348 | CONFIG_IP_VS_WRR=m | ||
| 349 | CONFIG_IP_VS_LC=m | ||
| 350 | CONFIG_IP_VS_WLC=m | ||
| 351 | CONFIG_IP_VS_LBLC=m | ||
| 352 | CONFIG_IP_VS_LBLCR=m | ||
| 353 | CONFIG_IP_VS_DH=m | ||
| 354 | CONFIG_IP_VS_SH=m | ||
| 355 | CONFIG_IP_VS_SED=m | ||
| 356 | CONFIG_IP_VS_NQ=m | ||
| 357 | |||
| 358 | # | ||
| 359 | # IPVS application helper | ||
| 360 | # | ||
| 361 | CONFIG_IP_VS_FTP=m | ||
| 362 | CONFIG_IPV6=m | 367 | CONFIG_IPV6=m |
| 363 | CONFIG_IPV6_PRIVACY=y | 368 | CONFIG_IPV6_PRIVACY=y |
| 364 | CONFIG_IPV6_ROUTER_PREF=y | 369 | CONFIG_IPV6_ROUTER_PREF=y |
| @@ -375,11 +380,15 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m | |||
| 375 | CONFIG_INET6_XFRM_MODE_BEET=m | 380 | CONFIG_INET6_XFRM_MODE_BEET=m |
| 376 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | 381 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set |
| 377 | CONFIG_IPV6_SIT=m | 382 | CONFIG_IPV6_SIT=m |
| 383 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
| 378 | CONFIG_IPV6_TUNNEL=m | 384 | CONFIG_IPV6_TUNNEL=m |
| 379 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | 385 | # CONFIG_IPV6_MULTIPLE_TABLES is not set |
| 386 | CONFIG_IPV6_MROUTE=y | ||
| 387 | CONFIG_IPV6_PIMSM_V2=y | ||
| 380 | CONFIG_NETWORK_SECMARK=y | 388 | CONFIG_NETWORK_SECMARK=y |
| 381 | CONFIG_NETFILTER=y | 389 | CONFIG_NETFILTER=y |
| 382 | # CONFIG_NETFILTER_DEBUG is not set | 390 | # CONFIG_NETFILTER_DEBUG is not set |
| 391 | CONFIG_NETFILTER_ADVANCED=y | ||
| 383 | CONFIG_BRIDGE_NETFILTER=y | 392 | CONFIG_BRIDGE_NETFILTER=y |
| 384 | 393 | ||
| 385 | # | 394 | # |
| @@ -388,12 +397,12 @@ CONFIG_BRIDGE_NETFILTER=y | |||
| 388 | CONFIG_NETFILTER_NETLINK=m | 397 | CONFIG_NETFILTER_NETLINK=m |
| 389 | CONFIG_NETFILTER_NETLINK_QUEUE=m | 398 | CONFIG_NETFILTER_NETLINK_QUEUE=m |
| 390 | CONFIG_NETFILTER_NETLINK_LOG=m | 399 | CONFIG_NETFILTER_NETLINK_LOG=m |
| 391 | CONFIG_NF_CONNTRACK_ENABLED=m | ||
| 392 | CONFIG_NF_CONNTRACK=m | 400 | CONFIG_NF_CONNTRACK=m |
| 393 | CONFIG_NF_CT_ACCT=y | 401 | CONFIG_NF_CT_ACCT=y |
| 394 | CONFIG_NF_CONNTRACK_MARK=y | 402 | CONFIG_NF_CONNTRACK_MARK=y |
| 395 | CONFIG_NF_CONNTRACK_SECMARK=y | 403 | CONFIG_NF_CONNTRACK_SECMARK=y |
| 396 | CONFIG_NF_CONNTRACK_EVENTS=y | 404 | CONFIG_NF_CONNTRACK_EVENTS=y |
| 405 | CONFIG_NF_CT_PROTO_DCCP=m | ||
| 397 | CONFIG_NF_CT_PROTO_GRE=m | 406 | CONFIG_NF_CT_PROTO_GRE=m |
| 398 | CONFIG_NF_CT_PROTO_SCTP=m | 407 | CONFIG_NF_CT_PROTO_SCTP=m |
| 399 | CONFIG_NF_CT_PROTO_UDPLITE=m | 408 | CONFIG_NF_CT_PROTO_UDPLITE=m |
| @@ -407,18 +416,22 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
| 407 | CONFIG_NF_CONNTRACK_SIP=m | 416 | CONFIG_NF_CONNTRACK_SIP=m |
| 408 | CONFIG_NF_CONNTRACK_TFTP=m | 417 | CONFIG_NF_CONNTRACK_TFTP=m |
| 409 | CONFIG_NF_CT_NETLINK=m | 418 | CONFIG_NF_CT_NETLINK=m |
| 419 | CONFIG_NETFILTER_TPROXY=m | ||
| 410 | CONFIG_NETFILTER_XTABLES=m | 420 | CONFIG_NETFILTER_XTABLES=m |
| 411 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 421 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| 412 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 422 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
| 423 | # CONFIG_NETFILTER_XT_TARGET_CONNSECMARK is not set | ||
| 413 | # CONFIG_NETFILTER_XT_TARGET_DSCP is not set | 424 | # CONFIG_NETFILTER_XT_TARGET_DSCP is not set |
| 414 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 425 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
| 415 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
| 416 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 426 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
| 427 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
| 417 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | 428 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m |
| 429 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m | ||
| 430 | CONFIG_NETFILTER_XT_TARGET_TPROXY=m | ||
| 418 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 431 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
| 419 | CONFIG_NETFILTER_XT_TARGET_SECMARK=m | 432 | CONFIG_NETFILTER_XT_TARGET_SECMARK=m |
| 420 | # CONFIG_NETFILTER_XT_TARGET_CONNSECMARK is not set | ||
| 421 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 433 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
| 434 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | ||
| 422 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 435 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
| 423 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | 436 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m |
| 424 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | 437 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m |
| @@ -427,40 +440,76 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | |||
| 427 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 440 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
| 428 | # CONFIG_NETFILTER_XT_MATCH_DSCP is not set | 441 | # CONFIG_NETFILTER_XT_MATCH_DSCP is not set |
| 429 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 442 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
| 443 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | ||
| 430 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 444 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
| 445 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | ||
| 431 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 446 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
| 432 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 447 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
| 433 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 448 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
| 434 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 449 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
| 435 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | ||
| 436 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | 450 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m |
| 451 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | ||
| 452 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | ||
| 437 | # CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set | 453 | # CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set |
| 438 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 454 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
| 439 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | 455 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m |
| 456 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | ||
| 440 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 457 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
| 458 | CONFIG_NETFILTER_XT_MATCH_RECENT=m | ||
| 459 | # CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set | ||
| 441 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 460 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
| 461 | CONFIG_NETFILTER_XT_MATCH_SOCKET=m | ||
| 442 | CONFIG_NETFILTER_XT_MATCH_STATE=m | 462 | CONFIG_NETFILTER_XT_MATCH_STATE=m |
| 443 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | 463 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m |
| 444 | CONFIG_NETFILTER_XT_MATCH_STRING=m | 464 | CONFIG_NETFILTER_XT_MATCH_STRING=m |
| 445 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 465 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
| 466 | CONFIG_NETFILTER_XT_MATCH_TIME=m | ||
| 446 | CONFIG_NETFILTER_XT_MATCH_U32=m | 467 | CONFIG_NETFILTER_XT_MATCH_U32=m |
| 447 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 468 | CONFIG_IP_VS=m |
| 469 | CONFIG_IP_VS_IPV6=y | ||
| 470 | # CONFIG_IP_VS_DEBUG is not set | ||
| 471 | CONFIG_IP_VS_TAB_BITS=12 | ||
| 472 | |||
| 473 | # | ||
| 474 | # IPVS transport protocol load balancing support | ||
| 475 | # | ||
| 476 | CONFIG_IP_VS_PROTO_TCP=y | ||
| 477 | CONFIG_IP_VS_PROTO_UDP=y | ||
| 478 | CONFIG_IP_VS_PROTO_AH_ESP=y | ||
| 479 | CONFIG_IP_VS_PROTO_ESP=y | ||
| 480 | CONFIG_IP_VS_PROTO_AH=y | ||
| 481 | |||
| 482 | # | ||
| 483 | # IPVS scheduler | ||
| 484 | # | ||
| 485 | CONFIG_IP_VS_RR=m | ||
| 486 | CONFIG_IP_VS_WRR=m | ||
| 487 | CONFIG_IP_VS_LC=m | ||
| 488 | CONFIG_IP_VS_WLC=m | ||
| 489 | CONFIG_IP_VS_LBLC=m | ||
| 490 | CONFIG_IP_VS_LBLCR=m | ||
| 491 | CONFIG_IP_VS_DH=m | ||
| 492 | CONFIG_IP_VS_SH=m | ||
| 493 | CONFIG_IP_VS_SED=m | ||
| 494 | CONFIG_IP_VS_NQ=m | ||
| 495 | |||
| 496 | # | ||
| 497 | # IPVS application helper | ||
| 498 | # | ||
| 499 | CONFIG_IP_VS_FTP=m | ||
| 448 | 500 | ||
| 449 | # | 501 | # |
| 450 | # IP: Netfilter Configuration | 502 | # IP: Netfilter Configuration |
| 451 | # | 503 | # |
| 504 | CONFIG_NF_DEFRAG_IPV4=m | ||
| 452 | CONFIG_NF_CONNTRACK_IPV4=m | 505 | CONFIG_NF_CONNTRACK_IPV4=m |
| 453 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y | 506 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y |
| 454 | CONFIG_IP_NF_QUEUE=m | 507 | CONFIG_IP_NF_QUEUE=m |
| 455 | CONFIG_IP_NF_IPTABLES=m | 508 | CONFIG_IP_NF_IPTABLES=m |
| 456 | CONFIG_IP_NF_MATCH_IPRANGE=m | 509 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
| 457 | CONFIG_IP_NF_MATCH_TOS=m | ||
| 458 | CONFIG_IP_NF_MATCH_RECENT=m | ||
| 459 | CONFIG_IP_NF_MATCH_ECN=m | ||
| 460 | CONFIG_IP_NF_MATCH_AH=m | 510 | CONFIG_IP_NF_MATCH_AH=m |
| 511 | CONFIG_IP_NF_MATCH_ECN=m | ||
| 461 | CONFIG_IP_NF_MATCH_TTL=m | 512 | CONFIG_IP_NF_MATCH_TTL=m |
| 462 | CONFIG_IP_NF_MATCH_OWNER=m | ||
| 463 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
| 464 | CONFIG_IP_NF_FILTER=m | 513 | CONFIG_IP_NF_FILTER=m |
| 465 | CONFIG_IP_NF_TARGET_REJECT=m | 514 | CONFIG_IP_NF_TARGET_REJECT=m |
| 466 | CONFIG_IP_NF_TARGET_LOG=m | 515 | CONFIG_IP_NF_TARGET_LOG=m |
| @@ -468,11 +517,13 @@ CONFIG_IP_NF_TARGET_ULOG=m | |||
| 468 | CONFIG_NF_NAT=m | 517 | CONFIG_NF_NAT=m |
| 469 | CONFIG_NF_NAT_NEEDED=y | 518 | CONFIG_NF_NAT_NEEDED=y |
| 470 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 519 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
| 471 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
| 472 | CONFIG_IP_NF_TARGET_NETMAP=m | 520 | CONFIG_IP_NF_TARGET_NETMAP=m |
| 473 | CONFIG_IP_NF_TARGET_SAME=m | 521 | CONFIG_IP_NF_TARGET_REDIRECT=m |
| 474 | CONFIG_NF_NAT_SNMP_BASIC=m | 522 | CONFIG_NF_NAT_SNMP_BASIC=m |
| 523 | CONFIG_NF_NAT_PROTO_DCCP=m | ||
| 475 | CONFIG_NF_NAT_PROTO_GRE=m | 524 | CONFIG_NF_NAT_PROTO_GRE=m |
| 525 | CONFIG_NF_NAT_PROTO_UDPLITE=m | ||
| 526 | CONFIG_NF_NAT_PROTO_SCTP=m | ||
| 476 | CONFIG_NF_NAT_FTP=m | 527 | CONFIG_NF_NAT_FTP=m |
| 477 | CONFIG_NF_NAT_IRC=m | 528 | CONFIG_NF_NAT_IRC=m |
| 478 | CONFIG_NF_NAT_TFTP=m | 529 | CONFIG_NF_NAT_TFTP=m |
| @@ -481,40 +532,34 @@ CONFIG_NF_NAT_PPTP=m | |||
| 481 | CONFIG_NF_NAT_H323=m | 532 | CONFIG_NF_NAT_H323=m |
| 482 | CONFIG_NF_NAT_SIP=m | 533 | CONFIG_NF_NAT_SIP=m |
| 483 | CONFIG_IP_NF_MANGLE=m | 534 | CONFIG_IP_NF_MANGLE=m |
| 484 | CONFIG_IP_NF_TARGET_TOS=m | 535 | CONFIG_IP_NF_TARGET_CLUSTERIP=m |
| 485 | CONFIG_IP_NF_TARGET_ECN=m | 536 | CONFIG_IP_NF_TARGET_ECN=m |
| 486 | CONFIG_IP_NF_TARGET_TTL=m | 537 | CONFIG_IP_NF_TARGET_TTL=m |
| 487 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
| 488 | CONFIG_IP_NF_RAW=m | 538 | CONFIG_IP_NF_RAW=m |
| 489 | CONFIG_IP_NF_ARPTABLES=m | 539 | CONFIG_IP_NF_ARPTABLES=m |
| 490 | CONFIG_IP_NF_ARPFILTER=m | 540 | CONFIG_IP_NF_ARPFILTER=m |
| 491 | CONFIG_IP_NF_ARP_MANGLE=m | 541 | CONFIG_IP_NF_ARP_MANGLE=m |
| 492 | 542 | ||
| 493 | # | 543 | # |
| 494 | # IPv6: Netfilter Configuration (EXPERIMENTAL) | 544 | # IPv6: Netfilter Configuration |
| 495 | # | 545 | # |
| 496 | CONFIG_NF_CONNTRACK_IPV6=m | 546 | CONFIG_NF_CONNTRACK_IPV6=m |
| 497 | CONFIG_IP6_NF_QUEUE=m | 547 | CONFIG_IP6_NF_QUEUE=m |
| 498 | CONFIG_IP6_NF_IPTABLES=m | 548 | CONFIG_IP6_NF_IPTABLES=m |
| 499 | CONFIG_IP6_NF_MATCH_RT=m | 549 | CONFIG_IP6_NF_MATCH_AH=m |
| 500 | CONFIG_IP6_NF_MATCH_OPTS=m | 550 | CONFIG_IP6_NF_MATCH_EUI64=m |
| 501 | CONFIG_IP6_NF_MATCH_FRAG=m | 551 | CONFIG_IP6_NF_MATCH_FRAG=m |
| 552 | CONFIG_IP6_NF_MATCH_OPTS=m | ||
| 502 | CONFIG_IP6_NF_MATCH_HL=m | 553 | CONFIG_IP6_NF_MATCH_HL=m |
| 503 | CONFIG_IP6_NF_MATCH_OWNER=m | ||
| 504 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 554 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
| 505 | CONFIG_IP6_NF_MATCH_AH=m | ||
| 506 | CONFIG_IP6_NF_MATCH_MH=m | 555 | CONFIG_IP6_NF_MATCH_MH=m |
| 507 | CONFIG_IP6_NF_MATCH_EUI64=m | 556 | CONFIG_IP6_NF_MATCH_RT=m |
| 508 | CONFIG_IP6_NF_FILTER=m | ||
| 509 | CONFIG_IP6_NF_TARGET_LOG=m | 557 | CONFIG_IP6_NF_TARGET_LOG=m |
| 558 | CONFIG_IP6_NF_FILTER=m | ||
| 510 | CONFIG_IP6_NF_TARGET_REJECT=m | 559 | CONFIG_IP6_NF_TARGET_REJECT=m |
| 511 | CONFIG_IP6_NF_MANGLE=m | 560 | CONFIG_IP6_NF_MANGLE=m |
| 512 | CONFIG_IP6_NF_TARGET_HL=m | 561 | CONFIG_IP6_NF_TARGET_HL=m |
| 513 | CONFIG_IP6_NF_RAW=m | 562 | CONFIG_IP6_NF_RAW=m |
| 514 | |||
| 515 | # | ||
| 516 | # Bridge: Netfilter Configuration | ||
| 517 | # | ||
| 518 | CONFIG_BRIDGE_NF_EBTABLES=m | 563 | CONFIG_BRIDGE_NF_EBTABLES=m |
| 519 | CONFIG_BRIDGE_EBT_BROUTE=m | 564 | CONFIG_BRIDGE_EBT_BROUTE=m |
| 520 | CONFIG_BRIDGE_EBT_T_FILTER=m | 565 | CONFIG_BRIDGE_EBT_T_FILTER=m |
| @@ -523,6 +568,7 @@ CONFIG_BRIDGE_EBT_802_3=m | |||
| 523 | CONFIG_BRIDGE_EBT_AMONG=m | 568 | CONFIG_BRIDGE_EBT_AMONG=m |
| 524 | CONFIG_BRIDGE_EBT_ARP=m | 569 | CONFIG_BRIDGE_EBT_ARP=m |
| 525 | CONFIG_BRIDGE_EBT_IP=m | 570 | CONFIG_BRIDGE_EBT_IP=m |
| 571 | CONFIG_BRIDGE_EBT_IP6=m | ||
| 526 | CONFIG_BRIDGE_EBT_LIMIT=m | 572 | CONFIG_BRIDGE_EBT_LIMIT=m |
| 527 | CONFIG_BRIDGE_EBT_MARK=m | 573 | CONFIG_BRIDGE_EBT_MARK=m |
| 528 | CONFIG_BRIDGE_EBT_PKTTYPE=m | 574 | CONFIG_BRIDGE_EBT_PKTTYPE=m |
| @@ -535,6 +581,7 @@ CONFIG_BRIDGE_EBT_REDIRECT=m | |||
| 535 | CONFIG_BRIDGE_EBT_SNAT=m | 581 | CONFIG_BRIDGE_EBT_SNAT=m |
| 536 | CONFIG_BRIDGE_EBT_LOG=m | 582 | CONFIG_BRIDGE_EBT_LOG=m |
| 537 | CONFIG_BRIDGE_EBT_ULOG=m | 583 | CONFIG_BRIDGE_EBT_ULOG=m |
| 584 | CONFIG_BRIDGE_EBT_NFLOG=m | ||
| 538 | # CONFIG_IP_DCCP is not set | 585 | # CONFIG_IP_DCCP is not set |
| 539 | CONFIG_IP_SCTP=m | 586 | CONFIG_IP_SCTP=m |
| 540 | # CONFIG_SCTP_DBG_MSG is not set | 587 | # CONFIG_SCTP_DBG_MSG is not set |
| @@ -544,8 +591,12 @@ CONFIG_IP_SCTP=m | |||
| 544 | CONFIG_SCTP_HMAC_MD5=y | 591 | CONFIG_SCTP_HMAC_MD5=y |
| 545 | # CONFIG_TIPC is not set | 592 | # CONFIG_TIPC is not set |
| 546 | # CONFIG_ATM is not set | 593 | # CONFIG_ATM is not set |
| 594 | CONFIG_STP=m | ||
| 595 | CONFIG_GARP=m | ||
| 547 | CONFIG_BRIDGE=m | 596 | CONFIG_BRIDGE=m |
| 597 | # CONFIG_NET_DSA is not set | ||
| 548 | CONFIG_VLAN_8021Q=m | 598 | CONFIG_VLAN_8021Q=m |
| 599 | CONFIG_VLAN_8021Q_GVRP=y | ||
| 549 | # CONFIG_DECNET is not set | 600 | # CONFIG_DECNET is not set |
| 550 | CONFIG_LLC=m | 601 | CONFIG_LLC=m |
| 551 | # CONFIG_LLC2 is not set | 602 | # CONFIG_LLC2 is not set |
| @@ -559,12 +610,7 @@ CONFIG_IPDDP_DECAP=y | |||
| 559 | # CONFIG_LAPB is not set | 610 | # CONFIG_LAPB is not set |
| 560 | # CONFIG_ECONET is not set | 611 | # CONFIG_ECONET is not set |
| 561 | # CONFIG_WAN_ROUTER is not set | 612 | # CONFIG_WAN_ROUTER is not set |
| 562 | |||
| 563 | # | ||
| 564 | # QoS and/or fair queueing | ||
| 565 | # | ||
| 566 | CONFIG_NET_SCHED=y | 613 | CONFIG_NET_SCHED=y |
| 567 | CONFIG_NET_SCH_FIFO=y | ||
| 568 | 614 | ||
| 569 | # | 615 | # |
| 570 | # Queueing/Scheduling | 616 | # Queueing/Scheduling |
| @@ -573,7 +619,7 @@ CONFIG_NET_SCH_CBQ=m | |||
| 573 | CONFIG_NET_SCH_HTB=m | 619 | CONFIG_NET_SCH_HTB=m |
| 574 | CONFIG_NET_SCH_HFSC=m | 620 | CONFIG_NET_SCH_HFSC=m |
| 575 | CONFIG_NET_SCH_PRIO=m | 621 | CONFIG_NET_SCH_PRIO=m |
| 576 | CONFIG_NET_SCH_RR=m | 622 | # CONFIG_NET_SCH_MULTIQ is not set |
| 577 | CONFIG_NET_SCH_RED=m | 623 | CONFIG_NET_SCH_RED=m |
| 578 | CONFIG_NET_SCH_SFQ=m | 624 | CONFIG_NET_SCH_SFQ=m |
| 579 | CONFIG_NET_SCH_TEQL=m | 625 | CONFIG_NET_SCH_TEQL=m |
| @@ -597,6 +643,7 @@ CONFIG_NET_CLS_U32=m | |||
| 597 | # CONFIG_CLS_U32_MARK is not set | 643 | # CONFIG_CLS_U32_MARK is not set |
| 598 | CONFIG_NET_CLS_RSVP=m | 644 | CONFIG_NET_CLS_RSVP=m |
| 599 | CONFIG_NET_CLS_RSVP6=m | 645 | CONFIG_NET_CLS_RSVP6=m |
| 646 | CONFIG_NET_CLS_FLOW=m | ||
| 600 | # CONFIG_NET_EMATCH is not set | 647 | # CONFIG_NET_EMATCH is not set |
| 601 | CONFIG_NET_CLS_ACT=y | 648 | CONFIG_NET_CLS_ACT=y |
| 602 | CONFIG_NET_ACT_POLICE=y | 649 | CONFIG_NET_ACT_POLICE=y |
| @@ -604,37 +651,51 @@ CONFIG_NET_ACT_GACT=m | |||
| 604 | CONFIG_GACT_PROB=y | 651 | CONFIG_GACT_PROB=y |
| 605 | CONFIG_NET_ACT_MIRRED=m | 652 | CONFIG_NET_ACT_MIRRED=m |
| 606 | CONFIG_NET_ACT_IPT=m | 653 | CONFIG_NET_ACT_IPT=m |
| 654 | CONFIG_NET_ACT_NAT=m | ||
| 607 | CONFIG_NET_ACT_PEDIT=m | 655 | CONFIG_NET_ACT_PEDIT=m |
| 608 | CONFIG_NET_ACT_SIMP=m | 656 | CONFIG_NET_ACT_SIMP=m |
| 609 | CONFIG_NET_CLS_POLICE=y | 657 | CONFIG_NET_ACT_SKBEDIT=m |
| 610 | CONFIG_NET_CLS_IND=y | 658 | CONFIG_NET_CLS_IND=y |
| 659 | CONFIG_NET_SCH_FIFO=y | ||
| 611 | 660 | ||
| 612 | # | 661 | # |
| 613 | # Network testing | 662 | # Network testing |
| 614 | # | 663 | # |
| 615 | # CONFIG_NET_PKTGEN is not set | 664 | # CONFIG_NET_PKTGEN is not set |
| 616 | # CONFIG_HAMRADIO is not set | 665 | # CONFIG_HAMRADIO is not set |
| 666 | # CONFIG_CAN is not set | ||
| 617 | # CONFIG_IRDA is not set | 667 | # CONFIG_IRDA is not set |
| 618 | # CONFIG_BT is not set | 668 | # CONFIG_BT is not set |
| 619 | # CONFIG_AF_RXRPC is not set | 669 | # CONFIG_AF_RXRPC is not set |
| 670 | CONFIG_PHONET=m | ||
| 620 | CONFIG_FIB_RULES=y | 671 | CONFIG_FIB_RULES=y |
| 621 | 672 | CONFIG_WIRELESS=y | |
| 622 | # | ||
| 623 | # Wireless | ||
| 624 | # | ||
| 625 | CONFIG_CFG80211=m | 673 | CONFIG_CFG80211=m |
| 674 | CONFIG_NL80211=y | ||
| 675 | CONFIG_WIRELESS_OLD_REGULATORY=y | ||
| 626 | CONFIG_WIRELESS_EXT=y | 676 | CONFIG_WIRELESS_EXT=y |
| 677 | CONFIG_WIRELESS_EXT_SYSFS=y | ||
| 627 | CONFIG_MAC80211=m | 678 | CONFIG_MAC80211=m |
| 628 | # CONFIG_MAC80211_DEBUG is not set | 679 | |
| 680 | # | ||
| 681 | # Rate control algorithm selection | ||
| 682 | # | ||
| 683 | CONFIG_MAC80211_RC_PID=y | ||
| 684 | CONFIG_MAC80211_RC_MINSTREL=y | ||
| 685 | CONFIG_MAC80211_RC_DEFAULT_PID=y | ||
| 686 | # CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set | ||
| 687 | CONFIG_MAC80211_RC_DEFAULT="pid" | ||
| 688 | CONFIG_MAC80211_MESH=y | ||
| 689 | CONFIG_MAC80211_LEDS=y | ||
| 690 | # CONFIG_MAC80211_DEBUG_MENU is not set | ||
| 629 | CONFIG_IEEE80211=m | 691 | CONFIG_IEEE80211=m |
| 630 | # CONFIG_IEEE80211_DEBUG is not set | 692 | # CONFIG_IEEE80211_DEBUG is not set |
| 631 | CONFIG_IEEE80211_CRYPT_WEP=m | 693 | CONFIG_IEEE80211_CRYPT_WEP=m |
| 632 | CONFIG_IEEE80211_CRYPT_CCMP=m | 694 | CONFIG_IEEE80211_CRYPT_CCMP=m |
| 633 | CONFIG_IEEE80211_CRYPT_TKIP=m | 695 | CONFIG_IEEE80211_CRYPT_TKIP=m |
| 634 | CONFIG_IEEE80211_SOFTMAC=m | ||
| 635 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | ||
| 636 | CONFIG_RFKILL=m | 696 | CONFIG_RFKILL=m |
| 637 | CONFIG_RFKILL_INPUT=m | 697 | CONFIG_RFKILL_INPUT=m |
| 698 | CONFIG_RFKILL_LEDS=y | ||
| 638 | # CONFIG_NET_9P is not set | 699 | # CONFIG_NET_9P is not set |
| 639 | 700 | ||
| 640 | # | 701 | # |
| @@ -644,9 +705,12 @@ CONFIG_RFKILL_INPUT=m | |||
| 644 | # | 705 | # |
| 645 | # Generic Driver Options | 706 | # Generic Driver Options |
| 646 | # | 707 | # |
| 708 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| 647 | CONFIG_STANDALONE=y | 709 | CONFIG_STANDALONE=y |
| 648 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 710 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 649 | CONFIG_FW_LOADER=y | 711 | CONFIG_FW_LOADER=y |
| 712 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
| 713 | CONFIG_EXTRA_FIRMWARE="" | ||
| 650 | # CONFIG_SYS_HYPERVISOR is not set | 714 | # CONFIG_SYS_HYPERVISOR is not set |
| 651 | CONFIG_CONNECTOR=m | 715 | CONFIG_CONNECTOR=m |
| 652 | CONFIG_MTD=y | 716 | CONFIG_MTD=y |
| @@ -655,6 +719,7 @@ CONFIG_MTD=y | |||
| 655 | CONFIG_MTD_PARTITIONS=y | 719 | CONFIG_MTD_PARTITIONS=y |
| 656 | # CONFIG_MTD_REDBOOT_PARTS is not set | 720 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 657 | # CONFIG_MTD_CMDLINE_PARTS is not set | 721 | # CONFIG_MTD_CMDLINE_PARTS is not set |
| 722 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 658 | 723 | ||
| 659 | # | 724 | # |
| 660 | # User Modules And Translation Layers | 725 | # User Modules And Translation Layers |
| @@ -667,6 +732,7 @@ CONFIG_MTD_BLOCK=y | |||
| 667 | # CONFIG_INFTL is not set | 732 | # CONFIG_INFTL is not set |
| 668 | # CONFIG_RFD_FTL is not set | 733 | # CONFIG_RFD_FTL is not set |
| 669 | # CONFIG_SSFDC is not set | 734 | # CONFIG_SSFDC is not set |
| 735 | CONFIG_MTD_OOPS=m | ||
| 670 | 736 | ||
| 671 | # | 737 | # |
| 672 | # RAM/ROM/Flash chip drivers | 738 | # RAM/ROM/Flash chip drivers |
| @@ -701,6 +767,7 @@ CONFIG_MTD_PHYSMAP=y | |||
| 701 | CONFIG_MTD_PHYSMAP_START=0x0 | 767 | CONFIG_MTD_PHYSMAP_START=0x0 |
| 702 | CONFIG_MTD_PHYSMAP_LEN=0x0 | 768 | CONFIG_MTD_PHYSMAP_LEN=0x0 |
| 703 | CONFIG_MTD_PHYSMAP_BANKWIDTH=0 | 769 | CONFIG_MTD_PHYSMAP_BANKWIDTH=0 |
| 770 | # CONFIG_MTD_INTEL_VR_NOR is not set | ||
| 704 | # CONFIG_MTD_PLATRAM is not set | 771 | # CONFIG_MTD_PLATRAM is not set |
| 705 | 772 | ||
| 706 | # | 773 | # |
| @@ -748,25 +815,26 @@ CONFIG_BLK_DEV_NBD=m | |||
| 748 | CONFIG_BLK_DEV_RAM=y | 815 | CONFIG_BLK_DEV_RAM=y |
| 749 | CONFIG_BLK_DEV_RAM_COUNT=16 | 816 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 750 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 817 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
| 751 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 818 | # CONFIG_BLK_DEV_XIP is not set |
| 752 | CONFIG_CDROM_PKTCDVD=m | 819 | CONFIG_CDROM_PKTCDVD=m |
| 753 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 820 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
| 754 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 821 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
| 755 | CONFIG_ATA_OVER_ETH=m | 822 | CONFIG_ATA_OVER_ETH=m |
| 823 | # CONFIG_BLK_DEV_HD is not set | ||
| 756 | # CONFIG_MISC_DEVICES is not set | 824 | # CONFIG_MISC_DEVICES is not set |
| 825 | CONFIG_HAVE_IDE=y | ||
| 757 | CONFIG_IDE=y | 826 | CONFIG_IDE=y |
| 758 | CONFIG_IDE_MAX_HWIFS=4 | ||
| 759 | CONFIG_BLK_DEV_IDE=y | ||
| 760 | 827 | ||
| 761 | # | 828 | # |
| 762 | # Please see Documentation/ide.txt for help/info on IDE drives | 829 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
| 763 | # | 830 | # |
| 764 | # CONFIG_BLK_DEV_IDE_SATA is not set | 831 | # CONFIG_BLK_DEV_IDE_SATA is not set |
| 765 | CONFIG_BLK_DEV_IDEDISK=y | 832 | CONFIG_IDE_GD=y |
| 766 | # CONFIG_IDEDISK_MULTI_MODE is not set | 833 | CONFIG_IDE_GD_ATA=y |
| 834 | # CONFIG_IDE_GD_ATAPI is not set | ||
| 767 | CONFIG_BLK_DEV_IDECD=y | 835 | CONFIG_BLK_DEV_IDECD=y |
| 836 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y | ||
| 768 | # CONFIG_BLK_DEV_IDETAPE is not set | 837 | # CONFIG_BLK_DEV_IDETAPE is not set |
| 769 | # CONFIG_BLK_DEV_IDEFLOPPY is not set | ||
| 770 | # CONFIG_BLK_DEV_IDESCSI is not set | 838 | # CONFIG_BLK_DEV_IDESCSI is not set |
| 771 | # CONFIG_IDE_TASK_IOCTL is not set | 839 | # CONFIG_IDE_TASK_IOCTL is not set |
| 772 | CONFIG_IDE_PROC_FS=y | 840 | CONFIG_IDE_PROC_FS=y |
| @@ -775,24 +843,25 @@ CONFIG_IDE_PROC_FS=y | |||
| 775 | # IDE chipset support/bugfixes | 843 | # IDE chipset support/bugfixes |
| 776 | # | 844 | # |
| 777 | CONFIG_IDE_GENERIC=y | 845 | CONFIG_IDE_GENERIC=y |
| 846 | # CONFIG_BLK_DEV_PLATFORM is not set | ||
| 847 | CONFIG_BLK_DEV_IDEDMA_SFF=y | ||
| 848 | |||
| 849 | # | ||
| 850 | # PCI IDE chipsets support | ||
| 851 | # | ||
| 778 | CONFIG_BLK_DEV_IDEPCI=y | 852 | CONFIG_BLK_DEV_IDEPCI=y |
| 779 | # CONFIG_IDEPCI_SHARE_IRQ is not set | ||
| 780 | CONFIG_IDEPCI_PCIBUS_ORDER=y | 853 | CONFIG_IDEPCI_PCIBUS_ORDER=y |
| 781 | # CONFIG_BLK_DEV_OFFBOARD is not set | 854 | # CONFIG_BLK_DEV_OFFBOARD is not set |
| 782 | CONFIG_BLK_DEV_GENERIC=y | 855 | CONFIG_BLK_DEV_GENERIC=y |
| 783 | # CONFIG_BLK_DEV_OPTI621 is not set | 856 | # CONFIG_BLK_DEV_OPTI621 is not set |
| 784 | CONFIG_BLK_DEV_IDEDMA_PCI=y | 857 | CONFIG_BLK_DEV_IDEDMA_PCI=y |
| 785 | # CONFIG_BLK_DEV_IDEDMA_FORCED is not set | ||
| 786 | # CONFIG_IDEDMA_ONLYDISK is not set | ||
| 787 | # CONFIG_BLK_DEV_AEC62XX is not set | 858 | # CONFIG_BLK_DEV_AEC62XX is not set |
| 788 | # CONFIG_BLK_DEV_ALI15X3 is not set | 859 | # CONFIG_BLK_DEV_ALI15X3 is not set |
| 789 | # CONFIG_BLK_DEV_AMD74XX is not set | 860 | # CONFIG_BLK_DEV_AMD74XX is not set |
| 790 | # CONFIG_BLK_DEV_CMD64X is not set | 861 | # CONFIG_BLK_DEV_CMD64X is not set |
| 791 | # CONFIG_BLK_DEV_TRIFLEX is not set | 862 | # CONFIG_BLK_DEV_TRIFLEX is not set |
| 792 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
| 793 | # CONFIG_BLK_DEV_CS5520 is not set | 863 | # CONFIG_BLK_DEV_CS5520 is not set |
| 794 | # CONFIG_BLK_DEV_CS5530 is not set | 864 | # CONFIG_BLK_DEV_CS5530 is not set |
| 795 | # CONFIG_BLK_DEV_HPT34X is not set | ||
| 796 | # CONFIG_BLK_DEV_HPT366 is not set | 865 | # CONFIG_BLK_DEV_HPT366 is not set |
| 797 | # CONFIG_BLK_DEV_JMICRON is not set | 866 | # CONFIG_BLK_DEV_JMICRON is not set |
| 798 | # CONFIG_BLK_DEV_SC1200 is not set | 867 | # CONFIG_BLK_DEV_SC1200 is not set |
| @@ -808,10 +877,7 @@ CONFIG_BLK_DEV_IT8213=m | |||
| 808 | # CONFIG_BLK_DEV_TRM290 is not set | 877 | # CONFIG_BLK_DEV_TRM290 is not set |
| 809 | # CONFIG_BLK_DEV_VIA82CXXX is not set | 878 | # CONFIG_BLK_DEV_VIA82CXXX is not set |
| 810 | CONFIG_BLK_DEV_TC86C001=m | 879 | CONFIG_BLK_DEV_TC86C001=m |
| 811 | # CONFIG_IDE_ARM is not set | ||
| 812 | CONFIG_BLK_DEV_IDEDMA=y | 880 | CONFIG_BLK_DEV_IDEDMA=y |
| 813 | # CONFIG_IDEDMA_IVB is not set | ||
| 814 | # CONFIG_BLK_DEV_HD is not set | ||
| 815 | 881 | ||
| 816 | # | 882 | # |
| 817 | # SCSI device support | 883 | # SCSI device support |
| @@ -848,8 +914,10 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 848 | # | 914 | # |
| 849 | CONFIG_SCSI_SPI_ATTRS=m | 915 | CONFIG_SCSI_SPI_ATTRS=m |
| 850 | CONFIG_SCSI_FC_ATTRS=m | 916 | CONFIG_SCSI_FC_ATTRS=m |
| 917 | # CONFIG_SCSI_FC_TGT_ATTRS is not set | ||
| 851 | CONFIG_SCSI_ISCSI_ATTRS=m | 918 | CONFIG_SCSI_ISCSI_ATTRS=m |
| 852 | # CONFIG_SCSI_SAS_LIBSAS is not set | 919 | # CONFIG_SCSI_SAS_LIBSAS is not set |
| 920 | # CONFIG_SCSI_SRP_ATTRS is not set | ||
| 853 | CONFIG_SCSI_LOWLEVEL=y | 921 | CONFIG_SCSI_LOWLEVEL=y |
| 854 | CONFIG_ISCSI_TCP=m | 922 | CONFIG_ISCSI_TCP=m |
| 855 | CONFIG_BLK_DEV_3W_XXXX_RAID=m | 923 | CONFIG_BLK_DEV_3W_XXXX_RAID=m |
| @@ -866,6 +934,7 @@ CONFIG_AIC7XXX_REG_PRETTY_PRINT=y | |||
| 866 | # CONFIG_SCSI_AIC79XX is not set | 934 | # CONFIG_SCSI_AIC79XX is not set |
| 867 | # CONFIG_SCSI_AIC94XX is not set | 935 | # CONFIG_SCSI_AIC94XX is not set |
| 868 | # CONFIG_SCSI_DPT_I2O is not set | 936 | # CONFIG_SCSI_DPT_I2O is not set |
| 937 | # CONFIG_SCSI_ADVANSYS is not set | ||
| 869 | # CONFIG_SCSI_ARCMSR is not set | 938 | # CONFIG_SCSI_ARCMSR is not set |
| 870 | # CONFIG_MEGARAID_NEWGEN is not set | 939 | # CONFIG_MEGARAID_NEWGEN is not set |
| 871 | # CONFIG_MEGARAID_LEGACY is not set | 940 | # CONFIG_MEGARAID_LEGACY is not set |
| @@ -876,6 +945,7 @@ CONFIG_AIC7XXX_REG_PRETTY_PRINT=y | |||
| 876 | # CONFIG_SCSI_IPS is not set | 945 | # CONFIG_SCSI_IPS is not set |
| 877 | # CONFIG_SCSI_INITIO is not set | 946 | # CONFIG_SCSI_INITIO is not set |
| 878 | # CONFIG_SCSI_INIA100 is not set | 947 | # CONFIG_SCSI_INIA100 is not set |
| 948 | # CONFIG_SCSI_MVSAS is not set | ||
| 879 | # CONFIG_SCSI_STEX is not set | 949 | # CONFIG_SCSI_STEX is not set |
| 880 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 950 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
| 881 | # CONFIG_SCSI_QLOGIC_1280 is not set | 951 | # CONFIG_SCSI_QLOGIC_1280 is not set |
| @@ -887,6 +957,7 @@ CONFIG_AIC7XXX_REG_PRETTY_PRINT=y | |||
| 887 | # CONFIG_SCSI_NSP32 is not set | 957 | # CONFIG_SCSI_NSP32 is not set |
| 888 | # CONFIG_SCSI_DEBUG is not set | 958 | # CONFIG_SCSI_DEBUG is not set |
| 889 | # CONFIG_SCSI_SRP is not set | 959 | # CONFIG_SCSI_SRP is not set |
| 960 | # CONFIG_SCSI_DH is not set | ||
| 890 | # CONFIG_ATA is not set | 961 | # CONFIG_ATA is not set |
| 891 | CONFIG_MD=y | 962 | CONFIG_MD=y |
| 892 | CONFIG_BLK_DEV_MD=m | 963 | CONFIG_BLK_DEV_MD=m |
| @@ -905,32 +976,28 @@ CONFIG_DM_SNAPSHOT=m | |||
| 905 | CONFIG_DM_MIRROR=m | 976 | CONFIG_DM_MIRROR=m |
| 906 | CONFIG_DM_ZERO=m | 977 | CONFIG_DM_ZERO=m |
| 907 | CONFIG_DM_MULTIPATH=m | 978 | CONFIG_DM_MULTIPATH=m |
| 908 | CONFIG_DM_MULTIPATH_EMC=m | ||
| 909 | CONFIG_DM_MULTIPATH_RDAC=m | ||
| 910 | # CONFIG_DM_DELAY is not set | 979 | # CONFIG_DM_DELAY is not set |
| 980 | # CONFIG_DM_UEVENT is not set | ||
| 981 | # CONFIG_FUSION is not set | ||
| 911 | 982 | ||
| 912 | # | 983 | # |
| 913 | # Fusion MPT device support | 984 | # IEEE 1394 (FireWire) support |
| 914 | # | 985 | # |
| 915 | # CONFIG_FUSION is not set | ||
| 916 | # CONFIG_FUSION_SPI is not set | ||
| 917 | # CONFIG_FUSION_FC is not set | ||
| 918 | # CONFIG_FUSION_SAS is not set | ||
| 919 | 986 | ||
| 920 | # | 987 | # |
| 921 | # IEEE 1394 (FireWire) support | 988 | # Enable only one of the two stacks, unless you know what you are doing |
| 922 | # | 989 | # |
| 923 | # CONFIG_FIREWIRE is not set | 990 | # CONFIG_FIREWIRE is not set |
| 924 | # CONFIG_IEEE1394 is not set | 991 | # CONFIG_IEEE1394 is not set |
| 925 | # CONFIG_I2O is not set | 992 | # CONFIG_I2O is not set |
| 926 | CONFIG_NETDEVICES=y | 993 | CONFIG_NETDEVICES=y |
| 927 | CONFIG_NETDEVICES_MULTIQUEUE=y | ||
| 928 | CONFIG_IFB=m | 994 | CONFIG_IFB=m |
| 929 | CONFIG_DUMMY=m | 995 | CONFIG_DUMMY=m |
| 930 | CONFIG_BONDING=m | 996 | CONFIG_BONDING=m |
| 931 | CONFIG_MACVLAN=m | 997 | CONFIG_MACVLAN=m |
| 932 | CONFIG_EQUALIZER=m | 998 | CONFIG_EQUALIZER=m |
| 933 | CONFIG_TUN=m | 999 | CONFIG_TUN=m |
| 1000 | CONFIG_VETH=m | ||
| 934 | # CONFIG_ARCNET is not set | 1001 | # CONFIG_ARCNET is not set |
| 935 | CONFIG_PHYLIB=m | 1002 | CONFIG_PHYLIB=m |
| 936 | 1003 | ||
| @@ -946,26 +1013,34 @@ CONFIG_VITESSE_PHY=m | |||
| 946 | CONFIG_SMSC_PHY=m | 1013 | CONFIG_SMSC_PHY=m |
| 947 | CONFIG_BROADCOM_PHY=m | 1014 | CONFIG_BROADCOM_PHY=m |
| 948 | CONFIG_ICPLUS_PHY=m | 1015 | CONFIG_ICPLUS_PHY=m |
| 949 | # CONFIG_FIXED_PHY is not set | 1016 | CONFIG_REALTEK_PHY=m |
| 1017 | CONFIG_MDIO_BITBANG=m | ||
| 950 | CONFIG_NET_ETHERNET=y | 1018 | CONFIG_NET_ETHERNET=y |
| 951 | CONFIG_MII=y | 1019 | CONFIG_MII=y |
| 952 | CONFIG_AX88796=m | 1020 | CONFIG_AX88796=m |
| 1021 | # CONFIG_AX88796_93CX6 is not set | ||
| 953 | # CONFIG_HAPPYMEAL is not set | 1022 | # CONFIG_HAPPYMEAL is not set |
| 954 | # CONFIG_SUNGEM is not set | 1023 | # CONFIG_SUNGEM is not set |
| 955 | # CONFIG_CASSINI is not set | 1024 | # CONFIG_CASSINI is not set |
| 956 | # CONFIG_NET_VENDOR_3COM is not set | 1025 | # CONFIG_NET_VENDOR_3COM is not set |
| 1026 | # CONFIG_SMC91X is not set | ||
| 957 | # CONFIG_DM9000 is not set | 1027 | # CONFIG_DM9000 is not set |
| 958 | # CONFIG_NET_TULIP is not set | 1028 | # CONFIG_NET_TULIP is not set |
| 959 | # CONFIG_HP100 is not set | 1029 | # CONFIG_HP100 is not set |
| 1030 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
| 1031 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
| 1032 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
| 1033 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
| 1034 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
| 1035 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
| 1036 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
| 960 | CONFIG_NET_PCI=y | 1037 | CONFIG_NET_PCI=y |
| 961 | CONFIG_PCNET32=y | 1038 | CONFIG_PCNET32=y |
| 962 | # CONFIG_PCNET32_NAPI is not set | ||
| 963 | # CONFIG_AMD8111_ETH is not set | 1039 | # CONFIG_AMD8111_ETH is not set |
| 964 | # CONFIG_ADAPTEC_STARFIRE is not set | 1040 | # CONFIG_ADAPTEC_STARFIRE is not set |
| 965 | # CONFIG_B44 is not set | 1041 | # CONFIG_B44 is not set |
| 966 | # CONFIG_FORCEDETH is not set | 1042 | # CONFIG_FORCEDETH is not set |
| 967 | CONFIG_TC35815=m | 1043 | CONFIG_TC35815=m |
| 968 | # CONFIG_DGRS is not set | ||
| 969 | # CONFIG_EEPRO100 is not set | 1044 | # CONFIG_EEPRO100 is not set |
| 970 | # CONFIG_E100 is not set | 1045 | # CONFIG_E100 is not set |
| 971 | # CONFIG_FEALNX is not set | 1046 | # CONFIG_FEALNX is not set |
| @@ -973,16 +1048,21 @@ CONFIG_TC35815=m | |||
| 973 | # CONFIG_NE2K_PCI is not set | 1048 | # CONFIG_NE2K_PCI is not set |
| 974 | # CONFIG_8139CP is not set | 1049 | # CONFIG_8139CP is not set |
| 975 | # CONFIG_8139TOO is not set | 1050 | # CONFIG_8139TOO is not set |
| 1051 | # CONFIG_R6040 is not set | ||
| 976 | # CONFIG_SIS900 is not set | 1052 | # CONFIG_SIS900 is not set |
| 977 | # CONFIG_EPIC100 is not set | 1053 | # CONFIG_EPIC100 is not set |
| 978 | # CONFIG_SUNDANCE is not set | 1054 | # CONFIG_SUNDANCE is not set |
| 979 | # CONFIG_TLAN is not set | 1055 | # CONFIG_TLAN is not set |
| 980 | # CONFIG_VIA_RHINE is not set | 1056 | # CONFIG_VIA_RHINE is not set |
| 981 | # CONFIG_SC92031 is not set | 1057 | # CONFIG_SC92031 is not set |
| 1058 | # CONFIG_ATL2 is not set | ||
| 982 | CONFIG_NETDEV_1000=y | 1059 | CONFIG_NETDEV_1000=y |
| 983 | # CONFIG_ACENIC is not set | 1060 | # CONFIG_ACENIC is not set |
| 984 | # CONFIG_DL2K is not set | 1061 | # CONFIG_DL2K is not set |
| 985 | # CONFIG_E1000 is not set | 1062 | # CONFIG_E1000 is not set |
| 1063 | # CONFIG_E1000E is not set | ||
| 1064 | # CONFIG_IP1000 is not set | ||
| 1065 | # CONFIG_IGB is not set | ||
| 986 | # CONFIG_NS83820 is not set | 1066 | # CONFIG_NS83820 is not set |
| 987 | # CONFIG_HAMACHI is not set | 1067 | # CONFIG_HAMACHI is not set |
| 988 | # CONFIG_YELLOWFIN is not set | 1068 | # CONFIG_YELLOWFIN is not set |
| @@ -995,14 +1075,24 @@ CONFIG_NETDEV_1000=y | |||
| 995 | # CONFIG_BNX2 is not set | 1075 | # CONFIG_BNX2 is not set |
| 996 | # CONFIG_QLA3XXX is not set | 1076 | # CONFIG_QLA3XXX is not set |
| 997 | # CONFIG_ATL1 is not set | 1077 | # CONFIG_ATL1 is not set |
| 1078 | # CONFIG_ATL1E is not set | ||
| 1079 | # CONFIG_JME is not set | ||
| 998 | CONFIG_NETDEV_10000=y | 1080 | CONFIG_NETDEV_10000=y |
| 999 | # CONFIG_CHELSIO_T1 is not set | 1081 | # CONFIG_CHELSIO_T1 is not set |
| 1000 | CONFIG_CHELSIO_T3=m | 1082 | CONFIG_CHELSIO_T3=m |
| 1083 | # CONFIG_ENIC is not set | ||
| 1084 | # CONFIG_IXGBE is not set | ||
| 1001 | # CONFIG_IXGB is not set | 1085 | # CONFIG_IXGB is not set |
| 1002 | # CONFIG_S2IO is not set | 1086 | # CONFIG_S2IO is not set |
| 1003 | # CONFIG_MYRI10GE is not set | 1087 | # CONFIG_MYRI10GE is not set |
| 1004 | CONFIG_NETXEN_NIC=m | 1088 | CONFIG_NETXEN_NIC=m |
| 1089 | # CONFIG_NIU is not set | ||
| 1090 | # CONFIG_MLX4_EN is not set | ||
| 1005 | # CONFIG_MLX4_CORE is not set | 1091 | # CONFIG_MLX4_CORE is not set |
| 1092 | # CONFIG_TEHUTI is not set | ||
| 1093 | # CONFIG_BNX2X is not set | ||
| 1094 | # CONFIG_QLGE is not set | ||
| 1095 | # CONFIG_SFC is not set | ||
| 1006 | # CONFIG_TR is not set | 1096 | # CONFIG_TR is not set |
| 1007 | 1097 | ||
| 1008 | # | 1098 | # |
| @@ -1022,6 +1112,7 @@ CONFIG_IPW2200_QOS=y | |||
| 1022 | # CONFIG_IPW2200_DEBUG is not set | 1112 | # CONFIG_IPW2200_DEBUG is not set |
| 1023 | CONFIG_LIBERTAS=m | 1113 | CONFIG_LIBERTAS=m |
| 1024 | # CONFIG_LIBERTAS_DEBUG is not set | 1114 | # CONFIG_LIBERTAS_DEBUG is not set |
| 1115 | # CONFIG_LIBERTAS_THINFIRM is not set | ||
| 1025 | CONFIG_HERMES=m | 1116 | CONFIG_HERMES=m |
| 1026 | CONFIG_PLX_HERMES=m | 1117 | CONFIG_PLX_HERMES=m |
| 1027 | CONFIG_TMD_HERMES=m | 1118 | CONFIG_TMD_HERMES=m |
| @@ -1030,25 +1121,30 @@ CONFIG_PCI_HERMES=m | |||
| 1030 | CONFIG_ATMEL=m | 1121 | CONFIG_ATMEL=m |
| 1031 | CONFIG_PCI_ATMEL=m | 1122 | CONFIG_PCI_ATMEL=m |
| 1032 | CONFIG_PRISM54=m | 1123 | CONFIG_PRISM54=m |
| 1124 | # CONFIG_RTL8180 is not set | ||
| 1125 | # CONFIG_ADM8211 is not set | ||
| 1126 | # CONFIG_MAC80211_HWSIM is not set | ||
| 1127 | # CONFIG_P54_COMMON is not set | ||
| 1128 | # CONFIG_ATH5K is not set | ||
| 1129 | # CONFIG_ATH9K is not set | ||
| 1130 | # CONFIG_IWLCORE is not set | ||
| 1131 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 1132 | # CONFIG_IWLAGN is not set | ||
| 1133 | # CONFIG_IWL3945 is not set | ||
| 1033 | CONFIG_HOSTAP=m | 1134 | CONFIG_HOSTAP=m |
| 1034 | CONFIG_HOSTAP_FIRMWARE=y | 1135 | CONFIG_HOSTAP_FIRMWARE=y |
| 1035 | CONFIG_HOSTAP_FIRMWARE_NVRAM=y | 1136 | CONFIG_HOSTAP_FIRMWARE_NVRAM=y |
| 1036 | CONFIG_HOSTAP_PLX=m | 1137 | CONFIG_HOSTAP_PLX=m |
| 1037 | CONFIG_HOSTAP_PCI=m | 1138 | CONFIG_HOSTAP_PCI=m |
| 1038 | CONFIG_BCM43XX=m | 1139 | # CONFIG_B43 is not set |
| 1039 | CONFIG_BCM43XX_DEBUG=y | 1140 | # CONFIG_B43LEGACY is not set |
| 1040 | CONFIG_BCM43XX_DMA=y | 1141 | # CONFIG_RT2X00 is not set |
| 1041 | CONFIG_BCM43XX_PIO=y | ||
| 1042 | CONFIG_BCM43XX_DMA_AND_PIO_MODE=y | ||
| 1043 | # CONFIG_BCM43XX_DMA_MODE is not set | ||
| 1044 | # CONFIG_BCM43XX_PIO_MODE is not set | ||
| 1045 | # CONFIG_WAN is not set | 1142 | # CONFIG_WAN is not set |
| 1046 | # CONFIG_FDDI is not set | 1143 | # CONFIG_FDDI is not set |
| 1047 | # CONFIG_HIPPI is not set | 1144 | # CONFIG_HIPPI is not set |
| 1048 | # CONFIG_PPP is not set | 1145 | # CONFIG_PPP is not set |
| 1049 | # CONFIG_SLIP is not set | 1146 | # CONFIG_SLIP is not set |
| 1050 | # CONFIG_NET_FC is not set | 1147 | # CONFIG_NET_FC is not set |
| 1051 | # CONFIG_SHAPER is not set | ||
| 1052 | # CONFIG_NETCONSOLE is not set | 1148 | # CONFIG_NETCONSOLE is not set |
| 1053 | # CONFIG_NETPOLL is not set | 1149 | # CONFIG_NETPOLL is not set |
| 1054 | # CONFIG_NET_POLL_CONTROLLER is not set | 1150 | # CONFIG_NET_POLL_CONTROLLER is not set |
| @@ -1070,7 +1166,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y | |||
| 1070 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | 1166 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 |
| 1071 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | 1167 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 |
| 1072 | # CONFIG_INPUT_JOYDEV is not set | 1168 | # CONFIG_INPUT_JOYDEV is not set |
| 1073 | # CONFIG_INPUT_TSDEV is not set | ||
| 1074 | # CONFIG_INPUT_EVDEV is not set | 1169 | # CONFIG_INPUT_EVDEV is not set |
| 1075 | # CONFIG_INPUT_EVBUG is not set | 1170 | # CONFIG_INPUT_EVBUG is not set |
| 1076 | 1171 | ||
| @@ -1099,10 +1194,13 @@ CONFIG_SERIO_SERPORT=y | |||
| 1099 | # Character devices | 1194 | # Character devices |
| 1100 | # | 1195 | # |
| 1101 | CONFIG_VT=y | 1196 | CONFIG_VT=y |
| 1197 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 1102 | CONFIG_VT_CONSOLE=y | 1198 | CONFIG_VT_CONSOLE=y |
| 1103 | CONFIG_HW_CONSOLE=y | 1199 | CONFIG_HW_CONSOLE=y |
| 1104 | CONFIG_VT_HW_CONSOLE_BINDING=y | 1200 | CONFIG_VT_HW_CONSOLE_BINDING=y |
| 1201 | CONFIG_DEVKMEM=y | ||
| 1105 | # CONFIG_SERIAL_NONSTANDARD is not set | 1202 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 1203 | # CONFIG_NOZOMI is not set | ||
| 1106 | 1204 | ||
| 1107 | # | 1205 | # |
| 1108 | # Serial drivers | 1206 | # Serial drivers |
| @@ -1124,101 +1222,165 @@ CONFIG_UNIX98_PTYS=y | |||
| 1124 | CONFIG_LEGACY_PTYS=y | 1222 | CONFIG_LEGACY_PTYS=y |
| 1125 | CONFIG_LEGACY_PTY_COUNT=256 | 1223 | CONFIG_LEGACY_PTY_COUNT=256 |
| 1126 | # CONFIG_IPMI_HANDLER is not set | 1224 | # CONFIG_IPMI_HANDLER is not set |
| 1127 | # CONFIG_WATCHDOG is not set | ||
| 1128 | CONFIG_HW_RANDOM=m | 1225 | CONFIG_HW_RANDOM=m |
| 1129 | CONFIG_RTC=y | ||
| 1130 | # CONFIG_R3964 is not set | 1226 | # CONFIG_R3964 is not set |
| 1131 | # CONFIG_APPLICOM is not set | 1227 | # CONFIG_APPLICOM is not set |
| 1132 | # CONFIG_DRM is not set | ||
| 1133 | # CONFIG_RAW_DRIVER is not set | 1228 | # CONFIG_RAW_DRIVER is not set |
| 1134 | # CONFIG_TCG_TPM is not set | 1229 | # CONFIG_TCG_TPM is not set |
| 1135 | CONFIG_DEVPORT=y | 1230 | CONFIG_DEVPORT=y |
| 1136 | # CONFIG_I2C is not set | 1231 | # CONFIG_I2C is not set |
| 1137 | |||
| 1138 | # | ||
| 1139 | # SPI support | ||
| 1140 | # | ||
| 1141 | # CONFIG_SPI is not set | 1232 | # CONFIG_SPI is not set |
| 1142 | # CONFIG_SPI_MASTER is not set | ||
| 1143 | # CONFIG_W1 is not set | 1233 | # CONFIG_W1 is not set |
| 1144 | # CONFIG_POWER_SUPPLY is not set | 1234 | # CONFIG_POWER_SUPPLY is not set |
| 1145 | # CONFIG_HWMON is not set | 1235 | # CONFIG_HWMON is not set |
| 1236 | # CONFIG_THERMAL is not set | ||
| 1237 | # CONFIG_THERMAL_HWMON is not set | ||
| 1238 | # CONFIG_WATCHDOG is not set | ||
| 1239 | CONFIG_SSB_POSSIBLE=y | ||
| 1240 | |||
| 1241 | # | ||
| 1242 | # Sonics Silicon Backplane | ||
| 1243 | # | ||
| 1244 | # CONFIG_SSB is not set | ||
| 1146 | 1245 | ||
| 1147 | # | 1246 | # |
| 1148 | # Multifunction device drivers | 1247 | # Multifunction device drivers |
| 1149 | # | 1248 | # |
| 1249 | # CONFIG_MFD_CORE is not set | ||
| 1150 | # CONFIG_MFD_SM501 is not set | 1250 | # CONFIG_MFD_SM501 is not set |
| 1251 | # CONFIG_HTC_PASIC3 is not set | ||
| 1252 | # CONFIG_MFD_TMIO is not set | ||
| 1253 | # CONFIG_REGULATOR is not set | ||
| 1151 | 1254 | ||
| 1152 | # | 1255 | # |
| 1153 | # Multimedia devices | 1256 | # Multimedia devices |
| 1154 | # | 1257 | # |
| 1258 | |||
| 1259 | # | ||
| 1260 | # Multimedia core support | ||
| 1261 | # | ||
| 1155 | # CONFIG_VIDEO_DEV is not set | 1262 | # CONFIG_VIDEO_DEV is not set |
| 1156 | # CONFIG_DVB_CORE is not set | 1263 | # CONFIG_DVB_CORE is not set |
| 1264 | # CONFIG_VIDEO_MEDIA is not set | ||
| 1265 | |||
| 1266 | # | ||
| 1267 | # Multimedia drivers | ||
| 1268 | # | ||
| 1157 | # CONFIG_DAB is not set | 1269 | # CONFIG_DAB is not set |
| 1158 | 1270 | ||
| 1159 | # | 1271 | # |
| 1160 | # Graphics support | 1272 | # Graphics support |
| 1161 | # | 1273 | # |
| 1274 | # CONFIG_DRM is not set | ||
| 1275 | # CONFIG_VGASTATE is not set | ||
| 1276 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 1277 | # CONFIG_FB is not set | ||
| 1162 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 1278 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 1163 | 1279 | ||
| 1164 | # | 1280 | # |
| 1165 | # Display device support | 1281 | # Display device support |
| 1166 | # | 1282 | # |
| 1167 | # CONFIG_DISPLAY_SUPPORT is not set | 1283 | # CONFIG_DISPLAY_SUPPORT is not set |
| 1168 | # CONFIG_VGASTATE is not set | ||
| 1169 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 1170 | # CONFIG_FB is not set | ||
| 1171 | 1284 | ||
| 1172 | # | 1285 | # |
| 1173 | # Console display driver support | 1286 | # Console display driver support |
| 1174 | # | 1287 | # |
| 1175 | # CONFIG_VGA_CONSOLE is not set | 1288 | # CONFIG_VGA_CONSOLE is not set |
| 1176 | CONFIG_DUMMY_CONSOLE=y | 1289 | CONFIG_DUMMY_CONSOLE=y |
| 1177 | |||
| 1178 | # | ||
| 1179 | # Sound | ||
| 1180 | # | ||
| 1181 | # CONFIG_SOUND is not set | 1290 | # CONFIG_SOUND is not set |
| 1182 | CONFIG_HID_SUPPORT=y | 1291 | CONFIG_HID_SUPPORT=y |
| 1183 | CONFIG_HID=m | 1292 | CONFIG_HID=m |
| 1184 | # CONFIG_HID_DEBUG is not set | 1293 | # CONFIG_HID_DEBUG is not set |
| 1294 | # CONFIG_HIDRAW is not set | ||
| 1295 | # CONFIG_HID_PID is not set | ||
| 1296 | |||
| 1297 | # | ||
| 1298 | # Special HID drivers | ||
| 1299 | # | ||
| 1300 | CONFIG_HID_COMPAT=y | ||
| 1185 | CONFIG_USB_SUPPORT=y | 1301 | CONFIG_USB_SUPPORT=y |
| 1186 | CONFIG_USB_ARCH_HAS_HCD=y | 1302 | CONFIG_USB_ARCH_HAS_HCD=y |
| 1187 | CONFIG_USB_ARCH_HAS_OHCI=y | 1303 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 1188 | CONFIG_USB_ARCH_HAS_EHCI=y | 1304 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 1189 | # CONFIG_USB is not set | 1305 | # CONFIG_USB is not set |
| 1306 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 1307 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 1190 | 1308 | ||
| 1191 | # | 1309 | # |
| 1192 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1310 | # Enable Host or Gadget support to see Inventra options |
| 1193 | # | 1311 | # |
| 1194 | 1312 | ||
| 1195 | # | 1313 | # |
| 1196 | # USB Gadget Support | 1314 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; |
| 1197 | # | 1315 | # |
| 1198 | # CONFIG_USB_GADGET is not set | 1316 | # CONFIG_USB_GADGET is not set |
| 1317 | # CONFIG_UWB is not set | ||
| 1199 | # CONFIG_MMC is not set | 1318 | # CONFIG_MMC is not set |
| 1200 | # CONFIG_NEW_LEDS is not set | 1319 | # CONFIG_MEMSTICK is not set |
| 1320 | CONFIG_NEW_LEDS=y | ||
| 1321 | CONFIG_LEDS_CLASS=m | ||
| 1322 | |||
| 1323 | # | ||
| 1324 | # LED drivers | ||
| 1325 | # | ||
| 1326 | |||
| 1327 | # | ||
| 1328 | # LED Triggers | ||
| 1329 | # | ||
| 1330 | CONFIG_LEDS_TRIGGERS=y | ||
| 1331 | CONFIG_LEDS_TRIGGER_TIMER=m | ||
| 1332 | CONFIG_LEDS_TRIGGER_IDE_DISK=y | ||
| 1333 | CONFIG_LEDS_TRIGGER_HEARTBEAT=m | ||
| 1334 | CONFIG_LEDS_TRIGGER_BACKLIGHT=m | ||
| 1335 | CONFIG_LEDS_TRIGGER_DEFAULT_ON=m | ||
| 1336 | # CONFIG_ACCESSIBILITY is not set | ||
| 1201 | # CONFIG_INFINIBAND is not set | 1337 | # CONFIG_INFINIBAND is not set |
| 1202 | # CONFIG_RTC_CLASS is not set | 1338 | CONFIG_RTC_LIB=y |
| 1339 | CONFIG_RTC_CLASS=y | ||
| 1340 | CONFIG_RTC_HCTOSYS=y | ||
| 1341 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
| 1342 | # CONFIG_RTC_DEBUG is not set | ||
| 1203 | 1343 | ||
| 1204 | # | 1344 | # |
| 1205 | # DMA Engine support | 1345 | # RTC interfaces |
| 1206 | # | 1346 | # |
| 1207 | # CONFIG_DMA_ENGINE is not set | 1347 | CONFIG_RTC_INTF_SYSFS=y |
| 1348 | CONFIG_RTC_INTF_PROC=y | ||
| 1349 | CONFIG_RTC_INTF_DEV=y | ||
| 1350 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
| 1351 | # CONFIG_RTC_DRV_TEST is not set | ||
| 1208 | 1352 | ||
| 1209 | # | 1353 | # |
| 1210 | # DMA Clients | 1354 | # SPI RTC drivers |
| 1211 | # | 1355 | # |
| 1212 | 1356 | ||
| 1213 | # | 1357 | # |
| 1214 | # DMA Devices | 1358 | # Platform RTC drivers |
| 1215 | # | 1359 | # |
| 1360 | CONFIG_RTC_DRV_CMOS=y | ||
| 1361 | # CONFIG_RTC_DRV_DS1286 is not set | ||
| 1362 | # CONFIG_RTC_DRV_DS1511 is not set | ||
| 1363 | # CONFIG_RTC_DRV_DS1553 is not set | ||
| 1364 | # CONFIG_RTC_DRV_DS1742 is not set | ||
| 1365 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 1366 | # CONFIG_RTC_DRV_M48T86 is not set | ||
| 1367 | # CONFIG_RTC_DRV_M48T35 is not set | ||
| 1368 | # CONFIG_RTC_DRV_M48T59 is not set | ||
| 1369 | # CONFIG_RTC_DRV_BQ4802 is not set | ||
| 1370 | # CONFIG_RTC_DRV_V3020 is not set | ||
| 1216 | 1371 | ||
| 1217 | # | 1372 | # |
| 1218 | # Userspace I/O | 1373 | # on-CPU RTC drivers |
| 1219 | # | 1374 | # |
| 1375 | # CONFIG_DMADEVICES is not set | ||
| 1220 | CONFIG_UIO=m | 1376 | CONFIG_UIO=m |
| 1221 | CONFIG_UIO_CIF=m | 1377 | CONFIG_UIO_CIF=m |
| 1378 | # CONFIG_UIO_PDRV is not set | ||
| 1379 | # CONFIG_UIO_PDRV_GENIRQ is not set | ||
| 1380 | # CONFIG_UIO_SMX is not set | ||
| 1381 | # CONFIG_UIO_SERCOS3 is not set | ||
| 1382 | # CONFIG_STAGING is not set | ||
| 1383 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 1222 | 1384 | ||
| 1223 | # | 1385 | # |
| 1224 | # File systems | 1386 | # File systems |
| @@ -1230,9 +1392,8 @@ CONFIG_EXT3_FS=y | |||
| 1230 | CONFIG_EXT3_FS_XATTR=y | 1392 | CONFIG_EXT3_FS_XATTR=y |
| 1231 | # CONFIG_EXT3_FS_POSIX_ACL is not set | 1393 | # CONFIG_EXT3_FS_POSIX_ACL is not set |
| 1232 | # CONFIG_EXT3_FS_SECURITY is not set | 1394 | # CONFIG_EXT3_FS_SECURITY is not set |
| 1233 | # CONFIG_EXT4DEV_FS is not set | 1395 | # CONFIG_EXT4_FS is not set |
| 1234 | CONFIG_JBD=y | 1396 | CONFIG_JBD=y |
| 1235 | # CONFIG_JBD_DEBUG is not set | ||
| 1236 | CONFIG_FS_MBCACHE=y | 1397 | CONFIG_FS_MBCACHE=y |
| 1237 | CONFIG_REISERFS_FS=m | 1398 | CONFIG_REISERFS_FS=m |
| 1238 | # CONFIG_REISERFS_CHECK is not set | 1399 | # CONFIG_REISERFS_CHECK is not set |
| @@ -1246,22 +1407,22 @@ CONFIG_JFS_SECURITY=y | |||
| 1246 | # CONFIG_JFS_DEBUG is not set | 1407 | # CONFIG_JFS_DEBUG is not set |
| 1247 | # CONFIG_JFS_STATISTICS is not set | 1408 | # CONFIG_JFS_STATISTICS is not set |
| 1248 | CONFIG_FS_POSIX_ACL=y | 1409 | CONFIG_FS_POSIX_ACL=y |
| 1410 | CONFIG_FILE_LOCKING=y | ||
| 1249 | CONFIG_XFS_FS=m | 1411 | CONFIG_XFS_FS=m |
| 1250 | CONFIG_XFS_QUOTA=y | 1412 | CONFIG_XFS_QUOTA=y |
| 1251 | CONFIG_XFS_SECURITY=y | ||
| 1252 | CONFIG_XFS_POSIX_ACL=y | 1413 | CONFIG_XFS_POSIX_ACL=y |
| 1253 | # CONFIG_XFS_RT is not set | 1414 | # CONFIG_XFS_RT is not set |
| 1254 | # CONFIG_GFS2_FS is not set | 1415 | # CONFIG_XFS_DEBUG is not set |
| 1255 | # CONFIG_OCFS2_FS is not set | 1416 | # CONFIG_OCFS2_FS is not set |
| 1256 | CONFIG_MINIX_FS=m | 1417 | CONFIG_DNOTIFY=y |
| 1257 | CONFIG_ROMFS_FS=m | ||
| 1258 | CONFIG_INOTIFY=y | 1418 | CONFIG_INOTIFY=y |
| 1259 | CONFIG_INOTIFY_USER=y | 1419 | CONFIG_INOTIFY_USER=y |
| 1260 | CONFIG_QUOTA=y | 1420 | CONFIG_QUOTA=y |
| 1421 | # CONFIG_QUOTA_NETLINK_INTERFACE is not set | ||
| 1422 | CONFIG_PRINT_QUOTA_WARNING=y | ||
| 1261 | # CONFIG_QFMT_V1 is not set | 1423 | # CONFIG_QFMT_V1 is not set |
| 1262 | CONFIG_QFMT_V2=y | 1424 | CONFIG_QFMT_V2=y |
| 1263 | CONFIG_QUOTACTL=y | 1425 | CONFIG_QUOTACTL=y |
| 1264 | CONFIG_DNOTIFY=y | ||
| 1265 | CONFIG_AUTOFS_FS=y | 1426 | CONFIG_AUTOFS_FS=y |
| 1266 | # CONFIG_AUTOFS4_FS is not set | 1427 | # CONFIG_AUTOFS4_FS is not set |
| 1267 | CONFIG_FUSE_FS=m | 1428 | CONFIG_FUSE_FS=m |
| @@ -1291,11 +1452,11 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
| 1291 | CONFIG_PROC_FS=y | 1452 | CONFIG_PROC_FS=y |
| 1292 | CONFIG_PROC_KCORE=y | 1453 | CONFIG_PROC_KCORE=y |
| 1293 | CONFIG_PROC_SYSCTL=y | 1454 | CONFIG_PROC_SYSCTL=y |
| 1455 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 1294 | CONFIG_SYSFS=y | 1456 | CONFIG_SYSFS=y |
| 1295 | CONFIG_TMPFS=y | 1457 | CONFIG_TMPFS=y |
| 1296 | # CONFIG_TMPFS_POSIX_ACL is not set | 1458 | # CONFIG_TMPFS_POSIX_ACL is not set |
| 1297 | # CONFIG_HUGETLB_PAGE is not set | 1459 | # CONFIG_HUGETLB_PAGE is not set |
| 1298 | CONFIG_RAMFS=y | ||
| 1299 | # CONFIG_CONFIGFS_FS is not set | 1460 | # CONFIG_CONFIGFS_FS is not set |
| 1300 | 1461 | ||
| 1301 | # | 1462 | # |
| @@ -1312,46 +1473,48 @@ CONFIG_EFS_FS=m | |||
| 1312 | CONFIG_JFFS2_FS=m | 1473 | CONFIG_JFFS2_FS=m |
| 1313 | CONFIG_JFFS2_FS_DEBUG=0 | 1474 | CONFIG_JFFS2_FS_DEBUG=0 |
| 1314 | CONFIG_JFFS2_FS_WRITEBUFFER=y | 1475 | CONFIG_JFFS2_FS_WRITEBUFFER=y |
| 1476 | # CONFIG_JFFS2_FS_WBUF_VERIFY is not set | ||
| 1315 | # CONFIG_JFFS2_SUMMARY is not set | 1477 | # CONFIG_JFFS2_SUMMARY is not set |
| 1316 | CONFIG_JFFS2_FS_XATTR=y | 1478 | CONFIG_JFFS2_FS_XATTR=y |
| 1317 | CONFIG_JFFS2_FS_POSIX_ACL=y | 1479 | CONFIG_JFFS2_FS_POSIX_ACL=y |
| 1318 | CONFIG_JFFS2_FS_SECURITY=y | 1480 | CONFIG_JFFS2_FS_SECURITY=y |
| 1319 | CONFIG_JFFS2_COMPRESSION_OPTIONS=y | 1481 | CONFIG_JFFS2_COMPRESSION_OPTIONS=y |
| 1320 | CONFIG_JFFS2_ZLIB=y | 1482 | CONFIG_JFFS2_ZLIB=y |
| 1483 | # CONFIG_JFFS2_LZO is not set | ||
| 1321 | CONFIG_JFFS2_RTIME=y | 1484 | CONFIG_JFFS2_RTIME=y |
| 1322 | CONFIG_JFFS2_RUBIN=y | 1485 | CONFIG_JFFS2_RUBIN=y |
| 1323 | # CONFIG_JFFS2_CMODE_NONE is not set | 1486 | # CONFIG_JFFS2_CMODE_NONE is not set |
| 1324 | CONFIG_JFFS2_CMODE_PRIORITY=y | 1487 | CONFIG_JFFS2_CMODE_PRIORITY=y |
| 1325 | # CONFIG_JFFS2_CMODE_SIZE is not set | 1488 | # CONFIG_JFFS2_CMODE_SIZE is not set |
| 1489 | # CONFIG_JFFS2_CMODE_FAVOURLZO is not set | ||
| 1490 | # CONFIG_UBIFS_FS is not set | ||
| 1326 | CONFIG_CRAMFS=m | 1491 | CONFIG_CRAMFS=m |
| 1327 | CONFIG_VXFS_FS=m | 1492 | CONFIG_VXFS_FS=m |
| 1493 | CONFIG_MINIX_FS=m | ||
| 1494 | # CONFIG_OMFS_FS is not set | ||
| 1328 | # CONFIG_HPFS_FS is not set | 1495 | # CONFIG_HPFS_FS is not set |
| 1329 | # CONFIG_QNX4FS_FS is not set | 1496 | # CONFIG_QNX4FS_FS is not set |
| 1497 | CONFIG_ROMFS_FS=m | ||
| 1330 | CONFIG_SYSV_FS=m | 1498 | CONFIG_SYSV_FS=m |
| 1331 | CONFIG_UFS_FS=m | 1499 | CONFIG_UFS_FS=m |
| 1332 | # CONFIG_UFS_FS_WRITE is not set | 1500 | # CONFIG_UFS_FS_WRITE is not set |
| 1333 | # CONFIG_UFS_DEBUG is not set | 1501 | # CONFIG_UFS_DEBUG is not set |
| 1334 | 1502 | CONFIG_NETWORK_FILESYSTEMS=y | |
| 1335 | # | ||
| 1336 | # Network File Systems | ||
| 1337 | # | ||
| 1338 | CONFIG_NFS_FS=y | 1503 | CONFIG_NFS_FS=y |
| 1339 | CONFIG_NFS_V3=y | 1504 | CONFIG_NFS_V3=y |
| 1340 | # CONFIG_NFS_V3_ACL is not set | 1505 | # CONFIG_NFS_V3_ACL is not set |
| 1341 | # CONFIG_NFS_V4 is not set | 1506 | # CONFIG_NFS_V4 is not set |
| 1342 | # CONFIG_NFS_DIRECTIO is not set | 1507 | CONFIG_ROOT_NFS=y |
| 1343 | CONFIG_NFSD=y | 1508 | CONFIG_NFSD=y |
| 1344 | CONFIG_NFSD_V3=y | 1509 | CONFIG_NFSD_V3=y |
| 1345 | # CONFIG_NFSD_V3_ACL is not set | 1510 | # CONFIG_NFSD_V3_ACL is not set |
| 1346 | # CONFIG_NFSD_V4 is not set | 1511 | # CONFIG_NFSD_V4 is not set |
| 1347 | # CONFIG_NFSD_TCP is not set | ||
| 1348 | CONFIG_ROOT_NFS=y | ||
| 1349 | CONFIG_LOCKD=y | 1512 | CONFIG_LOCKD=y |
| 1350 | CONFIG_LOCKD_V4=y | 1513 | CONFIG_LOCKD_V4=y |
| 1351 | CONFIG_EXPORTFS=y | 1514 | CONFIG_EXPORTFS=y |
| 1352 | CONFIG_NFS_COMMON=y | 1515 | CONFIG_NFS_COMMON=y |
| 1353 | CONFIG_SUNRPC=y | 1516 | CONFIG_SUNRPC=y |
| 1354 | # CONFIG_SUNRPC_BIND34 is not set | 1517 | # CONFIG_SUNRPC_REGISTER_V4 is not set |
| 1355 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1518 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 1356 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1519 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1357 | # CONFIG_SMB_FS is not set | 1520 | # CONFIG_SMB_FS is not set |
| @@ -1365,10 +1528,6 @@ CONFIG_SUNRPC=y | |||
| 1365 | # | 1528 | # |
| 1366 | # CONFIG_PARTITION_ADVANCED is not set | 1529 | # CONFIG_PARTITION_ADVANCED is not set |
| 1367 | CONFIG_MSDOS_PARTITION=y | 1530 | CONFIG_MSDOS_PARTITION=y |
| 1368 | |||
| 1369 | # | ||
| 1370 | # Native Language Support | ||
| 1371 | # | ||
| 1372 | CONFIG_NLS=m | 1531 | CONFIG_NLS=m |
| 1373 | CONFIG_NLS_DEFAULT="iso8859-1" | 1532 | CONFIG_NLS_DEFAULT="iso8859-1" |
| 1374 | CONFIG_NLS_CODEPAGE_437=m | 1533 | CONFIG_NLS_CODEPAGE_437=m |
| @@ -1409,29 +1568,30 @@ CONFIG_NLS_ISO8859_15=m | |||
| 1409 | CONFIG_NLS_KOI8_R=m | 1568 | CONFIG_NLS_KOI8_R=m |
| 1410 | CONFIG_NLS_KOI8_U=m | 1569 | CONFIG_NLS_KOI8_U=m |
| 1411 | CONFIG_NLS_UTF8=m | 1570 | CONFIG_NLS_UTF8=m |
| 1412 | |||
| 1413 | # | ||
| 1414 | # Distributed Lock Manager | ||
| 1415 | # | ||
| 1416 | # CONFIG_DLM is not set | 1571 | # CONFIG_DLM is not set |
| 1417 | 1572 | ||
| 1418 | # | 1573 | # |
| 1419 | # Profiling support | ||
| 1420 | # | ||
| 1421 | # CONFIG_PROFILING is not set | ||
| 1422 | |||
| 1423 | # | ||
| 1424 | # Kernel hacking | 1574 | # Kernel hacking |
| 1425 | # | 1575 | # |
| 1426 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 1576 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
| 1427 | # CONFIG_PRINTK_TIME is not set | 1577 | # CONFIG_PRINTK_TIME is not set |
| 1578 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
| 1428 | CONFIG_ENABLE_MUST_CHECK=y | 1579 | CONFIG_ENABLE_MUST_CHECK=y |
| 1580 | CONFIG_FRAME_WARN=1024 | ||
| 1429 | # CONFIG_MAGIC_SYSRQ is not set | 1581 | # CONFIG_MAGIC_SYSRQ is not set |
| 1430 | # CONFIG_UNUSED_SYMBOLS is not set | 1582 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1431 | # CONFIG_DEBUG_FS is not set | 1583 | # CONFIG_DEBUG_FS is not set |
| 1432 | # CONFIG_HEADERS_CHECK is not set | 1584 | # CONFIG_HEADERS_CHECK is not set |
| 1433 | # CONFIG_DEBUG_KERNEL is not set | 1585 | # CONFIG_DEBUG_KERNEL is not set |
| 1434 | CONFIG_CROSSCOMPILE=y | 1586 | # CONFIG_DEBUG_MEMORY_INIT is not set |
| 1587 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
| 1588 | |||
| 1589 | # | ||
| 1590 | # Tracers | ||
| 1591 | # | ||
| 1592 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
| 1593 | # CONFIG_SAMPLES is not set | ||
| 1594 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1435 | CONFIG_CMDLINE="" | 1595 | CONFIG_CMDLINE="" |
| 1436 | 1596 | ||
| 1437 | # | 1597 | # |
| @@ -1439,51 +1599,103 @@ CONFIG_CMDLINE="" | |||
| 1439 | # | 1599 | # |
| 1440 | # CONFIG_KEYS is not set | 1600 | # CONFIG_KEYS is not set |
| 1441 | # CONFIG_SECURITY is not set | 1601 | # CONFIG_SECURITY is not set |
| 1602 | # CONFIG_SECURITYFS is not set | ||
| 1603 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
| 1442 | CONFIG_XOR_BLOCKS=m | 1604 | CONFIG_XOR_BLOCKS=m |
| 1443 | CONFIG_ASYNC_CORE=m | 1605 | CONFIG_ASYNC_CORE=m |
| 1444 | CONFIG_ASYNC_MEMCPY=m | 1606 | CONFIG_ASYNC_MEMCPY=m |
| 1445 | CONFIG_ASYNC_XOR=m | 1607 | CONFIG_ASYNC_XOR=m |
| 1446 | CONFIG_CRYPTO=y | 1608 | CONFIG_CRYPTO=y |
| 1609 | |||
| 1610 | # | ||
| 1611 | # Crypto core or helper | ||
| 1612 | # | ||
| 1613 | # CONFIG_CRYPTO_FIPS is not set | ||
| 1447 | CONFIG_CRYPTO_ALGAPI=y | 1614 | CONFIG_CRYPTO_ALGAPI=y |
| 1448 | CONFIG_CRYPTO_ABLKCIPHER=m | 1615 | CONFIG_CRYPTO_AEAD=y |
| 1449 | CONFIG_CRYPTO_BLKCIPHER=m | 1616 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1450 | CONFIG_CRYPTO_HASH=y | 1617 | CONFIG_CRYPTO_HASH=y |
| 1618 | CONFIG_CRYPTO_RNG=y | ||
| 1451 | CONFIG_CRYPTO_MANAGER=y | 1619 | CONFIG_CRYPTO_MANAGER=y |
| 1620 | CONFIG_CRYPTO_GF128MUL=m | ||
| 1621 | CONFIG_CRYPTO_NULL=m | ||
| 1622 | CONFIG_CRYPTO_CRYPTD=m | ||
| 1623 | CONFIG_CRYPTO_AUTHENC=m | ||
| 1624 | # CONFIG_CRYPTO_TEST is not set | ||
| 1625 | |||
| 1626 | # | ||
| 1627 | # Authenticated Encryption with Associated Data | ||
| 1628 | # | ||
| 1629 | # CONFIG_CRYPTO_CCM is not set | ||
| 1630 | # CONFIG_CRYPTO_GCM is not set | ||
| 1631 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1632 | |||
| 1633 | # | ||
| 1634 | # Block modes | ||
| 1635 | # | ||
| 1636 | CONFIG_CRYPTO_CBC=m | ||
| 1637 | # CONFIG_CRYPTO_CTR is not set | ||
| 1638 | # CONFIG_CRYPTO_CTS is not set | ||
| 1639 | CONFIG_CRYPTO_ECB=m | ||
| 1640 | CONFIG_CRYPTO_LRW=m | ||
| 1641 | CONFIG_CRYPTO_PCBC=m | ||
| 1642 | # CONFIG_CRYPTO_XTS is not set | ||
| 1643 | |||
| 1644 | # | ||
| 1645 | # Hash modes | ||
| 1646 | # | ||
| 1452 | CONFIG_CRYPTO_HMAC=y | 1647 | CONFIG_CRYPTO_HMAC=y |
| 1453 | CONFIG_CRYPTO_XCBC=m | 1648 | CONFIG_CRYPTO_XCBC=m |
| 1454 | CONFIG_CRYPTO_NULL=m | 1649 | |
| 1650 | # | ||
| 1651 | # Digest | ||
| 1652 | # | ||
| 1653 | CONFIG_CRYPTO_CRC32C=m | ||
| 1455 | CONFIG_CRYPTO_MD4=m | 1654 | CONFIG_CRYPTO_MD4=m |
| 1456 | CONFIG_CRYPTO_MD5=y | 1655 | CONFIG_CRYPTO_MD5=y |
| 1656 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
| 1657 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1658 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1659 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1660 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1457 | CONFIG_CRYPTO_SHA1=m | 1661 | CONFIG_CRYPTO_SHA1=m |
| 1458 | CONFIG_CRYPTO_SHA256=m | 1662 | CONFIG_CRYPTO_SHA256=m |
| 1459 | CONFIG_CRYPTO_SHA512=m | 1663 | CONFIG_CRYPTO_SHA512=m |
| 1460 | CONFIG_CRYPTO_WP512=m | ||
| 1461 | CONFIG_CRYPTO_TGR192=m | 1664 | CONFIG_CRYPTO_TGR192=m |
| 1462 | CONFIG_CRYPTO_GF128MUL=m | 1665 | CONFIG_CRYPTO_WP512=m |
| 1463 | CONFIG_CRYPTO_ECB=m | 1666 | |
| 1464 | CONFIG_CRYPTO_CBC=m | 1667 | # |
| 1465 | CONFIG_CRYPTO_PCBC=m | 1668 | # Ciphers |
| 1466 | CONFIG_CRYPTO_LRW=m | 1669 | # |
| 1467 | CONFIG_CRYPTO_CRYPTD=m | ||
| 1468 | CONFIG_CRYPTO_DES=m | ||
| 1469 | CONFIG_CRYPTO_FCRYPT=m | ||
| 1470 | CONFIG_CRYPTO_BLOWFISH=m | ||
| 1471 | CONFIG_CRYPTO_TWOFISH=m | ||
| 1472 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
| 1473 | CONFIG_CRYPTO_SERPENT=m | ||
| 1474 | CONFIG_CRYPTO_AES=m | 1670 | CONFIG_CRYPTO_AES=m |
| 1671 | CONFIG_CRYPTO_ANUBIS=m | ||
| 1672 | CONFIG_CRYPTO_ARC4=m | ||
| 1673 | CONFIG_CRYPTO_BLOWFISH=m | ||
| 1674 | CONFIG_CRYPTO_CAMELLIA=m | ||
| 1475 | CONFIG_CRYPTO_CAST5=m | 1675 | CONFIG_CRYPTO_CAST5=m |
| 1476 | CONFIG_CRYPTO_CAST6=m | 1676 | CONFIG_CRYPTO_CAST6=m |
| 1477 | CONFIG_CRYPTO_TEA=m | 1677 | CONFIG_CRYPTO_DES=m |
| 1478 | CONFIG_CRYPTO_ARC4=m | 1678 | CONFIG_CRYPTO_FCRYPT=m |
| 1479 | CONFIG_CRYPTO_KHAZAD=m | 1679 | CONFIG_CRYPTO_KHAZAD=m |
| 1480 | CONFIG_CRYPTO_ANUBIS=m | 1680 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1681 | # CONFIG_CRYPTO_SEED is not set | ||
| 1682 | CONFIG_CRYPTO_SERPENT=m | ||
| 1683 | CONFIG_CRYPTO_TEA=m | ||
| 1684 | CONFIG_CRYPTO_TWOFISH=m | ||
| 1685 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
| 1686 | |||
| 1687 | # | ||
| 1688 | # Compression | ||
| 1689 | # | ||
| 1481 | CONFIG_CRYPTO_DEFLATE=m | 1690 | CONFIG_CRYPTO_DEFLATE=m |
| 1482 | CONFIG_CRYPTO_MICHAEL_MIC=m | 1691 | # CONFIG_CRYPTO_LZO is not set |
| 1483 | CONFIG_CRYPTO_CRC32C=m | 1692 | |
| 1484 | CONFIG_CRYPTO_CAMELLIA=m | 1693 | # |
| 1485 | # CONFIG_CRYPTO_TEST is not set | 1694 | # Random Number Generation |
| 1695 | # | ||
| 1696 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
| 1486 | CONFIG_CRYPTO_HW=y | 1697 | CONFIG_CRYPTO_HW=y |
| 1698 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | ||
| 1487 | 1699 | ||
| 1488 | # | 1700 | # |
| 1489 | # Library routines | 1701 | # Library routines |
| @@ -1491,7 +1703,8 @@ CONFIG_CRYPTO_HW=y | |||
| 1491 | CONFIG_BITREVERSE=y | 1703 | CONFIG_BITREVERSE=y |
| 1492 | # CONFIG_CRC_CCITT is not set | 1704 | # CONFIG_CRC_CCITT is not set |
| 1493 | CONFIG_CRC16=m | 1705 | CONFIG_CRC16=m |
| 1494 | # CONFIG_CRC_ITU_T is not set | 1706 | # CONFIG_CRC_T10DIF is not set |
| 1707 | CONFIG_CRC_ITU_T=m | ||
| 1495 | CONFIG_CRC32=y | 1708 | CONFIG_CRC32=y |
| 1496 | # CONFIG_CRC7 is not set | 1709 | # CONFIG_CRC7 is not set |
| 1497 | CONFIG_LIBCRC32C=m | 1710 | CONFIG_LIBCRC32C=m |
diff --git a/arch/mips/include/asm/asmmacro.h b/arch/mips/include/asm/asmmacro.h index 7a881755800f..6c8342ae74db 100644 --- a/arch/mips/include/asm/asmmacro.h +++ b/arch/mips/include/asm/asmmacro.h | |||
| @@ -35,6 +35,16 @@ | |||
| 35 | mtc0 \reg, CP0_TCSTATUS | 35 | mtc0 \reg, CP0_TCSTATUS |
| 36 | _ehb | 36 | _ehb |
| 37 | .endm | 37 | .endm |
| 38 | #elif defined(CONFIG_CPU_MIPSR2) | ||
| 39 | .macro local_irq_enable reg=t0 | ||
| 40 | ei | ||
| 41 | irq_enable_hazard | ||
| 42 | .endm | ||
| 43 | |||
| 44 | .macro local_irq_disable reg=t0 | ||
| 45 | di | ||
| 46 | irq_disable_hazard | ||
| 47 | .endm | ||
| 38 | #else | 48 | #else |
| 39 | .macro local_irq_enable reg=t0 | 49 | .macro local_irq_enable reg=t0 |
| 40 | mfc0 \reg, CP0_STATUS | 50 | mfc0 \reg, CP0_STATUS |
diff --git a/arch/mips/include/asm/pci.h b/arch/mips/include/asm/pci.h index 5510c53b7feb..053e4634acee 100644 --- a/arch/mips/include/asm/pci.h +++ b/arch/mips/include/asm/pci.h | |||
| @@ -79,6 +79,11 @@ static inline void pcibios_penalize_isa_irq(int irq, int active) | |||
| 79 | /* We don't do dynamic PCI IRQ allocation */ | 79 | /* We don't do dynamic PCI IRQ allocation */ |
| 80 | } | 80 | } |
| 81 | 81 | ||
| 82 | #define HAVE_PCI_MMAP | ||
| 83 | |||
| 84 | extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, | ||
| 85 | enum pci_mmap_state mmap_state, int write_combine); | ||
| 86 | |||
| 82 | /* | 87 | /* |
| 83 | * Dynamic DMA mapping stuff. | 88 | * Dynamic DMA mapping stuff. |
| 84 | * MIPS has everything mapped statically. | 89 | * MIPS has everything mapped statically. |
diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S index 759f68066b5d..d0916a55cd77 100644 --- a/arch/mips/kernel/scall32-o32.S +++ b/arch/mips/kernel/scall32-o32.S | |||
| @@ -262,14 +262,11 @@ bad_alignment: | |||
| 262 | LEAF(sys_syscall) | 262 | LEAF(sys_syscall) |
| 263 | subu t0, a0, __NR_O32_Linux # check syscall number | 263 | subu t0, a0, __NR_O32_Linux # check syscall number |
| 264 | sltiu v0, t0, __NR_O32_Linux_syscalls + 1 | 264 | sltiu v0, t0, __NR_O32_Linux_syscalls + 1 |
| 265 | beqz t0, einval # do not recurse | ||
| 265 | sll t1, t0, 3 | 266 | sll t1, t0, 3 |
| 266 | beqz v0, einval | 267 | beqz v0, einval |
| 267 | |||
| 268 | lw t2, sys_call_table(t1) # syscall routine | 268 | lw t2, sys_call_table(t1) # syscall routine |
| 269 | 269 | ||
| 270 | li v1, 4000 - __NR_O32_Linux # index of sys_syscall | ||
| 271 | beq t0, v1, einval # do not recurse | ||
| 272 | |||
| 273 | /* Some syscalls like execve get their arguments from struct pt_regs | 270 | /* Some syscalls like execve get their arguments from struct pt_regs |
| 274 | and claim zero arguments in the syscall table. Thus we have to | 271 | and claim zero arguments in the syscall table. Thus we have to |
| 275 | assume the worst case and shuffle around all potential arguments. | 272 | assume the worst case and shuffle around all potential arguments. |
| @@ -627,7 +624,7 @@ einval: li v0, -ENOSYS | |||
| 627 | sys sys_pselect6 6 | 624 | sys sys_pselect6 6 |
| 628 | sys sys_ppoll 5 | 625 | sys sys_ppoll 5 |
| 629 | sys sys_unshare 1 | 626 | sys sys_unshare 1 |
| 630 | sys sys_splice 4 | 627 | sys sys_splice 6 |
| 631 | sys sys_sync_file_range 7 /* 4305 */ | 628 | sys sys_sync_file_range 7 /* 4305 */ |
| 632 | sys sys_tee 4 | 629 | sys sys_tee 4 |
| 633 | sys sys_vmsplice 4 | 630 | sys sys_vmsplice 4 |
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S index e266b3aa6560..30f3b6317a83 100644 --- a/arch/mips/kernel/scall64-n32.S +++ b/arch/mips/kernel/scall64-n32.S | |||
| @@ -390,7 +390,7 @@ EXPORT(sysn32_call_table) | |||
| 390 | PTR sys_splice | 390 | PTR sys_splice |
| 391 | PTR sys_sync_file_range | 391 | PTR sys_sync_file_range |
| 392 | PTR sys_tee | 392 | PTR sys_tee |
| 393 | PTR sys_vmsplice /* 6270 */ | 393 | PTR compat_sys_vmsplice /* 6270 */ |
| 394 | PTR sys_move_pages | 394 | PTR sys_move_pages |
| 395 | PTR compat_sys_set_robust_list | 395 | PTR compat_sys_set_robust_list |
| 396 | PTR compat_sys_get_robust_list | 396 | PTR compat_sys_get_robust_list |
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S index 6c7ef8313ebd..fefef4af8595 100644 --- a/arch/mips/kernel/scall64-o32.S +++ b/arch/mips/kernel/scall64-o32.S | |||
| @@ -174,14 +174,12 @@ not_o32_scall: | |||
| 174 | END(handle_sys) | 174 | END(handle_sys) |
| 175 | 175 | ||
| 176 | LEAF(sys32_syscall) | 176 | LEAF(sys32_syscall) |
| 177 | sltu v0, a0, __NR_O32_Linux + __NR_O32_Linux_syscalls + 1 | 177 | subu t0, a0, __NR_O32_Linux # check syscall number |
| 178 | sltiu v0, t0, __NR_O32_Linux_syscalls + 1 | ||
| 179 | beqz t0, einval # do not recurse | ||
| 180 | dsll t1, t0, 3 | ||
| 178 | beqz v0, einval | 181 | beqz v0, einval |
| 179 | 182 | ld t2, sys_call_table(t1) # syscall routine | |
| 180 | dsll v0, a0, 3 | ||
| 181 | ld t2, (sys_call_table - (__NR_O32_Linux * 8))(v0) | ||
| 182 | |||
| 183 | li v1, 4000 # indirect syscall number | ||
| 184 | beq a0, v1, einval # do not recurse | ||
| 185 | 183 | ||
| 186 | move a0, a1 # shift argument registers | 184 | move a0, a1 # shift argument registers |
| 187 | move a1, a2 | 185 | move a1, a2 |
| @@ -198,7 +196,7 @@ LEAF(sys32_syscall) | |||
| 198 | jr t2 | 196 | jr t2 |
| 199 | /* Unreached */ | 197 | /* Unreached */ |
| 200 | 198 | ||
| 201 | einval: li v0, -EINVAL | 199 | einval: li v0, -ENOSYS |
| 202 | jr ra | 200 | jr ra |
| 203 | END(sys32_syscall) | 201 | END(sys32_syscall) |
| 204 | 202 | ||
| @@ -512,7 +510,7 @@ sys_call_table: | |||
| 512 | PTR sys_splice | 510 | PTR sys_splice |
| 513 | PTR sys32_sync_file_range /* 4305 */ | 511 | PTR sys32_sync_file_range /* 4305 */ |
| 514 | PTR sys_tee | 512 | PTR sys_tee |
| 515 | PTR sys_vmsplice | 513 | PTR compat_sys_vmsplice |
| 516 | PTR compat_sys_move_pages | 514 | PTR compat_sys_move_pages |
| 517 | PTR compat_sys_set_robust_list | 515 | PTR compat_sys_set_robust_list |
| 518 | PTR compat_sys_get_robust_list /* 4310 */ | 516 | PTR compat_sys_get_robust_list /* 4310 */ |
diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c index 972b2d2b8401..a1b3da6bad5c 100644 --- a/arch/mips/kernel/vpe.c +++ b/arch/mips/kernel/vpe.c | |||
| @@ -1134,7 +1134,7 @@ static int vpe_release(struct inode *inode, struct file *filp) | |||
| 1134 | 1134 | ||
| 1135 | /* It's good to be able to run the SP and if it chokes have a look at | 1135 | /* It's good to be able to run the SP and if it chokes have a look at |
| 1136 | the /dev/rt?. But if we reset the pointer to the shared struct we | 1136 | the /dev/rt?. But if we reset the pointer to the shared struct we |
| 1137 | loose what has happened. So perhaps if garbage is sent to the vpe | 1137 | lose what has happened. So perhaps if garbage is sent to the vpe |
| 1138 | device, use it as a trigger for the reset. Hopefully a nice | 1138 | device, use it as a trigger for the reset. Hopefully a nice |
| 1139 | executable will be along shortly. */ | 1139 | executable will be along shortly. */ |
| 1140 | if (ret < 0) | 1140 | if (ret < 0) |
diff --git a/arch/mips/mm/dma-default.c b/arch/mips/mm/dma-default.c index 5b98d0e731c2..e6708b3ad343 100644 --- a/arch/mips/mm/dma-default.c +++ b/arch/mips/mm/dma-default.c | |||
| @@ -111,6 +111,7 @@ EXPORT_SYMBOL(dma_alloc_coherent); | |||
| 111 | void dma_free_noncoherent(struct device *dev, size_t size, void *vaddr, | 111 | void dma_free_noncoherent(struct device *dev, size_t size, void *vaddr, |
| 112 | dma_addr_t dma_handle) | 112 | dma_addr_t dma_handle) |
| 113 | { | 113 | { |
| 114 | plat_unmap_dma_mem(dma_handle); | ||
| 114 | free_pages((unsigned long) vaddr, get_order(size)); | 115 | free_pages((unsigned long) vaddr, get_order(size)); |
| 115 | } | 116 | } |
| 116 | 117 | ||
| @@ -121,6 +122,8 @@ void dma_free_coherent(struct device *dev, size_t size, void *vaddr, | |||
| 121 | { | 122 | { |
| 122 | unsigned long addr = (unsigned long) vaddr; | 123 | unsigned long addr = (unsigned long) vaddr; |
| 123 | 124 | ||
| 125 | plat_unmap_dma_mem(dma_handle); | ||
| 126 | |||
| 124 | if (!plat_device_is_coherent(dev)) | 127 | if (!plat_device_is_coherent(dev)) |
| 125 | addr = CAC_ADDR(addr); | 128 | addr = CAC_ADDR(addr); |
| 126 | 129 | ||
diff --git a/arch/mips/mti-malta/Makefile b/arch/mips/mti-malta/Makefile index cef2db8d2225..32e847808df1 100644 --- a/arch/mips/mti-malta/Makefile +++ b/arch/mips/mti-malta/Makefile | |||
| @@ -7,9 +7,8 @@ | |||
| 7 | # | 7 | # |
| 8 | obj-y := malta-amon.o malta-cmdline.o \ | 8 | obj-y := malta-amon.o malta-cmdline.o \ |
| 9 | malta-display.o malta-init.o malta-int.o \ | 9 | malta-display.o malta-init.o malta-int.o \ |
| 10 | malta-memory.o malta-mtd.o \ | 10 | malta-memory.o malta-platform.o \ |
| 11 | malta-platform.o malta-reset.o \ | 11 | malta-reset.o malta-setup.o malta-time.o |
| 12 | malta-setup.o malta-time.o | ||
| 13 | 12 | ||
| 14 | obj-$(CONFIG_EARLY_PRINTK) += malta-console.o | 13 | obj-$(CONFIG_EARLY_PRINTK) += malta-console.o |
| 15 | obj-$(CONFIG_PCI) += malta-pci.o | 14 | obj-$(CONFIG_PCI) += malta-pci.o |
diff --git a/arch/mips/mti-malta/malta-mtd.c b/arch/mips/mti-malta/malta-mtd.c deleted file mode 100644 index 8ad9bdf25dce..000000000000 --- a/arch/mips/mti-malta/malta-mtd.c +++ /dev/null | |||
| @@ -1,63 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * This file is subject to the terms and conditions of the GNU General Public | ||
| 3 | * License. See the file "COPYING" in the main directory of this archive | ||
| 4 | * for more details. | ||
| 5 | * | ||
| 6 | * Copyright (C) 2006 MIPS Technologies, Inc. | ||
| 7 | * written by Ralf Baechle <ralf@linux-mips.org> | ||
| 8 | */ | ||
| 9 | |||
| 10 | #include <linux/init.h> | ||
| 11 | #include <linux/platform_device.h> | ||
| 12 | #include <linux/mtd/partitions.h> | ||
| 13 | #include <linux/mtd/physmap.h> | ||
| 14 | #include <mtd/mtd-abi.h> | ||
| 15 | |||
| 16 | static struct mtd_partition malta_mtd_partitions[] = { | ||
| 17 | { | ||
| 18 | .name = "YAMON", | ||
| 19 | .offset = 0x0, | ||
| 20 | .size = 0x100000, | ||
| 21 | .mask_flags = MTD_WRITEABLE | ||
| 22 | }, { | ||
| 23 | .name = "User FS", | ||
| 24 | .offset = 0x100000, | ||
| 25 | .size = 0x2e0000 | ||
| 26 | }, { | ||
| 27 | .name = "Board Config", | ||
| 28 | .offset = 0x3e0000, | ||
| 29 | .size = 0x020000, | ||
| 30 | .mask_flags = MTD_WRITEABLE | ||
| 31 | } | ||
| 32 | }; | ||
| 33 | |||
| 34 | static struct physmap_flash_data malta_flash_data = { | ||
| 35 | .width = 4, | ||
| 36 | .nr_parts = ARRAY_SIZE(malta_mtd_partitions), | ||
| 37 | .parts = malta_mtd_partitions | ||
| 38 | }; | ||
| 39 | |||
| 40 | static struct resource malta_flash_resource = { | ||
| 41 | .start = 0x1e000000, | ||
| 42 | .end = 0x1e3fffff, | ||
| 43 | .flags = IORESOURCE_MEM | ||
| 44 | }; | ||
| 45 | |||
| 46 | static struct platform_device malta_flash = { | ||
| 47 | .name = "physmap-flash", | ||
| 48 | .id = 0, | ||
| 49 | .dev = { | ||
| 50 | .platform_data = &malta_flash_data, | ||
| 51 | }, | ||
| 52 | .num_resources = 1, | ||
| 53 | .resource = &malta_flash_resource, | ||
| 54 | }; | ||
| 55 | |||
| 56 | static int __init malta_mtd_init(void) | ||
| 57 | { | ||
| 58 | platform_device_register(&malta_flash); | ||
| 59 | |||
| 60 | return 0; | ||
| 61 | } | ||
| 62 | |||
| 63 | module_init(malta_mtd_init) | ||
diff --git a/arch/mips/mti-malta/malta-platform.c b/arch/mips/mti-malta/malta-platform.c index 83b9bab3cd3f..72e32a7715be 100644 --- a/arch/mips/mti-malta/malta-platform.c +++ b/arch/mips/mti-malta/malta-platform.c | |||
| @@ -3,10 +3,14 @@ | |||
| 3 | * License. See the file "COPYING" in the main directory of this archive | 3 | * License. See the file "COPYING" in the main directory of this archive |
| 4 | * for more details. | 4 | * for more details. |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2007 MIPS Technologies, Inc. | 6 | * Copyright (C) 2006, 07 MIPS Technologies, Inc. |
| 7 | * written by Ralf Baechle (ralf@linux-mips.org) | 7 | * written by Ralf Baechle (ralf@linux-mips.org) |
| 8 | * written by Ralf Baechle <ralf@linux-mips.org> | ||
| 8 | * | 9 | * |
| 9 | * Probe driver for the Malta's UART ports: | 10 | * Copyright (C) 2008 Wind River Systems, Inc. |
| 11 | * updated by Tiejun Chen <tiejun.chen@windriver.com> | ||
| 12 | * | ||
| 13 | * 1. Probe driver for the Malta's UART ports: | ||
| 10 | * | 14 | * |
| 11 | * o 2 ports in the SMC SuperIO | 15 | * o 2 ports in the SMC SuperIO |
| 12 | * o 1 port in the CBUS UART, a discrete 16550 which normally is only used | 16 | * o 1 port in the CBUS UART, a discrete 16550 which normally is only used |
| @@ -14,10 +18,17 @@ | |||
| 14 | * | 18 | * |
| 15 | * We don't use 8250_platform.c on Malta as it would result in the CBUS | 19 | * We don't use 8250_platform.c on Malta as it would result in the CBUS |
| 16 | * UART becoming ttyS0. | 20 | * UART becoming ttyS0. |
| 21 | * | ||
| 22 | * 2. Register RTC-CMOS platform device on Malta. | ||
| 17 | */ | 23 | */ |
| 18 | #include <linux/module.h> | ||
| 19 | #include <linux/init.h> | 24 | #include <linux/init.h> |
| 20 | #include <linux/serial_8250.h> | 25 | #include <linux/serial_8250.h> |
| 26 | #include <linux/mc146818rtc.h> | ||
| 27 | #include <linux/module.h> | ||
| 28 | #include <linux/mtd/partitions.h> | ||
| 29 | #include <linux/mtd/physmap.h> | ||
| 30 | #include <linux/platform_device.h> | ||
| 31 | #include <mtd/mtd-abi.h> | ||
| 21 | 32 | ||
| 22 | #define SMC_PORT(base, int) \ | 33 | #define SMC_PORT(base, int) \ |
| 23 | { \ | 34 | { \ |
| @@ -45,21 +56,93 @@ static struct plat_serial8250_port uart8250_data[] = { | |||
| 45 | { }, | 56 | { }, |
| 46 | }; | 57 | }; |
| 47 | 58 | ||
| 48 | static struct platform_device uart8250_device = { | 59 | static struct platform_device malta_uart8250_device = { |
| 49 | .name = "serial8250", | 60 | .name = "serial8250", |
| 50 | .id = PLAT8250_DEV_PLATFORM2, | 61 | .id = PLAT8250_DEV_PLATFORM, |
| 51 | .dev = { | 62 | .dev = { |
| 52 | .platform_data = uart8250_data, | 63 | .platform_data = uart8250_data, |
| 53 | }, | 64 | }, |
| 54 | }; | 65 | }; |
| 55 | 66 | ||
| 56 | static int __init uart8250_init(void) | 67 | struct resource malta_rtc_resources[] = { |
| 68 | { | ||
| 69 | .start = RTC_PORT(0), | ||
| 70 | .end = RTC_PORT(7), | ||
| 71 | .flags = IORESOURCE_IO, | ||
| 72 | }, { | ||
| 73 | .start = RTC_IRQ, | ||
| 74 | .end = RTC_IRQ, | ||
| 75 | .flags = IORESOURCE_IRQ, | ||
| 76 | } | ||
| 77 | }; | ||
| 78 | |||
| 79 | static struct platform_device malta_rtc_device = { | ||
| 80 | .name = "rtc_cmos", | ||
| 81 | .id = -1, | ||
| 82 | .resource = malta_rtc_resources, | ||
| 83 | .num_resources = ARRAY_SIZE(malta_rtc_resources), | ||
| 84 | }; | ||
| 85 | |||
| 86 | static struct mtd_partition malta_mtd_partitions[] = { | ||
| 87 | { | ||
| 88 | .name = "YAMON", | ||
| 89 | .offset = 0x0, | ||
| 90 | .size = 0x100000, | ||
| 91 | .mask_flags = MTD_WRITEABLE | ||
| 92 | }, { | ||
| 93 | .name = "User FS", | ||
| 94 | .offset = 0x100000, | ||
| 95 | .size = 0x2e0000 | ||
| 96 | }, { | ||
| 97 | .name = "Board Config", | ||
| 98 | .offset = 0x3e0000, | ||
| 99 | .size = 0x020000, | ||
| 100 | .mask_flags = MTD_WRITEABLE | ||
| 101 | } | ||
| 102 | }; | ||
| 103 | |||
| 104 | static struct physmap_flash_data malta_flash_data = { | ||
| 105 | .width = 4, | ||
| 106 | .nr_parts = ARRAY_SIZE(malta_mtd_partitions), | ||
| 107 | .parts = malta_mtd_partitions | ||
| 108 | }; | ||
| 109 | |||
| 110 | static struct resource malta_flash_resource = { | ||
| 111 | .start = 0x1e000000, | ||
| 112 | .end = 0x1e3fffff, | ||
| 113 | .flags = IORESOURCE_MEM | ||
| 114 | }; | ||
| 115 | |||
| 116 | static struct platform_device malta_flash_device = { | ||
| 117 | .name = "physmap-flash", | ||
| 118 | .id = 0, | ||
| 119 | .dev = { | ||
| 120 | .platform_data = &malta_flash_data, | ||
| 121 | }, | ||
| 122 | .num_resources = 1, | ||
| 123 | .resource = &malta_flash_resource, | ||
| 124 | }; | ||
| 125 | |||
| 126 | static struct platform_device *malta_devices[] __initdata = { | ||
| 127 | &malta_uart8250_device, | ||
| 128 | &malta_rtc_device, | ||
| 129 | &malta_flash_device, | ||
| 130 | }; | ||
| 131 | |||
| 132 | static int __init malta_add_devices(void) | ||
| 57 | { | 133 | { |
| 58 | return platform_device_register(&uart8250_device); | 134 | int err; |
| 59 | } | ||
| 60 | 135 | ||
| 61 | module_init(uart8250_init); | 136 | err = platform_add_devices(malta_devices, ARRAY_SIZE(malta_devices)); |
| 137 | if (err) | ||
| 138 | return err; | ||
| 139 | |||
| 140 | /* | ||
| 141 | * Set RTC to BCD mode to support current alarm code. | ||
| 142 | */ | ||
| 143 | CMOS_WRITE(CMOS_READ(RTC_CONTROL) & ~RTC_DM_BINARY, RTC_CONTROL); | ||
| 144 | |||
| 145 | return 0; | ||
| 146 | } | ||
| 62 | 147 | ||
| 63 | MODULE_AUTHOR("Ralf Baechle <ralf@linux-mips.org>"); | 148 | device_initcall(malta_add_devices); |
| 64 | MODULE_LICENSE("GPL"); | ||
| 65 | MODULE_DESCRIPTION("8250 UART probe driver for the Malta CBUS UART"); | ||
diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c index a377e9d2d029..62cae740e250 100644 --- a/arch/mips/pci/pci.c +++ b/arch/mips/pci/pci.c | |||
| @@ -354,6 +354,30 @@ EXPORT_SYMBOL(PCIBIOS_MIN_IO); | |||
| 354 | EXPORT_SYMBOL(PCIBIOS_MIN_MEM); | 354 | EXPORT_SYMBOL(PCIBIOS_MIN_MEM); |
| 355 | #endif | 355 | #endif |
| 356 | 356 | ||
| 357 | int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, | ||
| 358 | enum pci_mmap_state mmap_state, int write_combine) | ||
| 359 | { | ||
| 360 | unsigned long prot; | ||
| 361 | |||
| 362 | /* | ||
| 363 | * I/O space can be accessed via normal processor loads and stores on | ||
| 364 | * this platform but for now we elect not to do this and portable | ||
| 365 | * drivers should not do this anyway. | ||
| 366 | */ | ||
| 367 | if (mmap_state == pci_mmap_io) | ||
| 368 | return -EINVAL; | ||
| 369 | |||
| 370 | /* | ||
| 371 | * Ignore write-combine; for now only return uncached mappings. | ||
| 372 | */ | ||
| 373 | prot = pgprot_val(vma->vm_page_prot); | ||
| 374 | prot = (prot & ~_CACHE_MASK) | _CACHE_UNCACHED; | ||
| 375 | vma->vm_page_prot = __pgprot(prot); | ||
| 376 | |||
| 377 | return remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff, | ||
| 378 | vma->vm_end - vma->vm_start, vma->vm_page_prot); | ||
| 379 | } | ||
| 380 | |||
| 357 | char * (*pcibios_plat_setup)(char *str) __devinitdata; | 381 | char * (*pcibios_plat_setup)(char *str) __devinitdata; |
| 358 | 382 | ||
| 359 | char *__devinit pcibios_setup(char *str) | 383 | char *__devinit pcibios_setup(char *str) |
diff --git a/arch/mn10300/kernel/entry.S b/arch/mn10300/kernel/entry.S index b7cbb1487af4..62fba8aa9b6e 100644 --- a/arch/mn10300/kernel/entry.S +++ b/arch/mn10300/kernel/entry.S | |||
| @@ -180,6 +180,7 @@ ENTRY(resume_userspace) | |||
| 180 | 180 | ||
| 181 | #ifdef CONFIG_PREEMPT | 181 | #ifdef CONFIG_PREEMPT |
| 182 | ENTRY(resume_kernel) | 182 | ENTRY(resume_kernel) |
| 183 | __cli | ||
| 183 | mov (TI_preempt_count,a2),d0 # non-zero preempt_count ? | 184 | mov (TI_preempt_count,a2),d0 # non-zero preempt_count ? |
| 184 | cmp 0,d0 | 185 | cmp 0,d0 |
| 185 | bne restore_all | 186 | bne restore_all |
| @@ -190,7 +191,7 @@ need_resched: | |||
| 190 | mov (REG_EPSW,fp),d0 | 191 | mov (REG_EPSW,fp),d0 |
| 191 | and EPSW_IM,d0 | 192 | and EPSW_IM,d0 |
| 192 | cmp EPSW_IM_7,d0 # interrupts off (exception path) ? | 193 | cmp EPSW_IM_7,d0 # interrupts off (exception path) ? |
| 193 | beq restore_all | 194 | bne restore_all |
| 194 | call preempt_schedule_irq[],0 | 195 | call preempt_schedule_irq[],0 |
| 195 | jmp need_resched | 196 | jmp need_resched |
| 196 | #endif | 197 | #endif |
diff --git a/arch/mn10300/kernel/gdb-io-serial.c b/arch/mn10300/kernel/gdb-io-serial.c index 9a6d4e8ebe73..11584c51acd9 100644 --- a/arch/mn10300/kernel/gdb-io-serial.c +++ b/arch/mn10300/kernel/gdb-io-serial.c | |||
| @@ -99,6 +99,7 @@ int gdbstub_io_rx_char(unsigned char *_ch, int nonblock) | |||
| 99 | try_again: | 99 | try_again: |
| 100 | /* pull chars out of the buffer */ | 100 | /* pull chars out of the buffer */ |
| 101 | ix = gdbstub_rx_outp; | 101 | ix = gdbstub_rx_outp; |
| 102 | barrier(); | ||
| 102 | if (ix == gdbstub_rx_inp) { | 103 | if (ix == gdbstub_rx_inp) { |
| 103 | if (nonblock) | 104 | if (nonblock) |
| 104 | return -EAGAIN; | 105 | return -EAGAIN; |
| @@ -110,6 +111,7 @@ int gdbstub_io_rx_char(unsigned char *_ch, int nonblock) | |||
| 110 | 111 | ||
| 111 | ch = gdbstub_rx_buffer[ix++]; | 112 | ch = gdbstub_rx_buffer[ix++]; |
| 112 | st = gdbstub_rx_buffer[ix++]; | 113 | st = gdbstub_rx_buffer[ix++]; |
| 114 | barrier(); | ||
| 113 | gdbstub_rx_outp = ix & 0x00000fff; | 115 | gdbstub_rx_outp = ix & 0x00000fff; |
| 114 | 116 | ||
| 115 | if (st & UART_LSR_BI) { | 117 | if (st & UART_LSR_BI) { |
diff --git a/arch/mn10300/kernel/mn10300-serial.c b/arch/mn10300/kernel/mn10300-serial.c index aa07d0cd1905..59b9c4bf9583 100644 --- a/arch/mn10300/kernel/mn10300-serial.c +++ b/arch/mn10300/kernel/mn10300-serial.c | |||
| @@ -566,6 +566,11 @@ static void mn10300_serial_transmit_interrupt(struct mn10300_serial_port *port) | |||
| 566 | { | 566 | { |
| 567 | _enter("%s", port->name); | 567 | _enter("%s", port->name); |
| 568 | 568 | ||
| 569 | if (!port->uart.info || !port->uart.info->port.tty) { | ||
| 570 | mn10300_serial_dis_tx_intr(port); | ||
| 571 | return; | ||
| 572 | } | ||
| 573 | |||
| 569 | if (uart_tx_stopped(&port->uart) || | 574 | if (uart_tx_stopped(&port->uart) || |
| 570 | uart_circ_empty(&port->uart.info->xmit)) | 575 | uart_circ_empty(&port->uart.info->xmit)) |
| 571 | mn10300_serial_dis_tx_intr(port); | 576 | mn10300_serial_dis_tx_intr(port); |
diff --git a/arch/mn10300/kernel/module.c b/arch/mn10300/kernel/module.c index 8fa36893df7a..6b287f2e8e84 100644 --- a/arch/mn10300/kernel/module.c +++ b/arch/mn10300/kernel/module.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* MN10300 Kernel module helper routines | 1 | /* MN10300 Kernel module helper routines |
| 2 | * | 2 | * |
| 3 | * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved. | 3 | * Copyright (C) 2007, 2008 Red Hat, Inc. All Rights Reserved. |
| 4 | * Written by Mark Salter (msalter@redhat.com) | 4 | * Written by Mark Salter (msalter@redhat.com) |
| 5 | * - Derived from arch/i386/kernel/module.c | 5 | * - Derived from arch/i386/kernel/module.c |
| 6 | * | 6 | * |
| @@ -64,21 +64,6 @@ int module_frob_arch_sections(Elf_Ehdr *hdr, | |||
| 64 | return 0; | 64 | return 0; |
| 65 | } | 65 | } |
| 66 | 66 | ||
| 67 | static uint32_t reloc_get16(uint8_t *p) | ||
| 68 | { | ||
| 69 | return p[0] | (p[1] << 8); | ||
| 70 | } | ||
| 71 | |||
| 72 | static uint32_t reloc_get24(uint8_t *p) | ||
| 73 | { | ||
| 74 | return reloc_get16(p) | (p[2] << 16); | ||
| 75 | } | ||
| 76 | |||
| 77 | static uint32_t reloc_get32(uint8_t *p) | ||
| 78 | { | ||
| 79 | return reloc_get16(p) | (reloc_get16(p+2) << 16); | ||
| 80 | } | ||
| 81 | |||
| 82 | static void reloc_put16(uint8_t *p, uint32_t val) | 67 | static void reloc_put16(uint8_t *p, uint32_t val) |
| 83 | { | 68 | { |
| 84 | p[0] = val & 0xff; | 69 | p[0] = val & 0xff; |
| @@ -144,25 +129,19 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, | |||
| 144 | relocation = sym->st_value + rel[i].r_addend; | 129 | relocation = sym->st_value + rel[i].r_addend; |
| 145 | 130 | ||
| 146 | switch (ELF32_R_TYPE(rel[i].r_info)) { | 131 | switch (ELF32_R_TYPE(rel[i].r_info)) { |
| 147 | /* for the first four relocation types, we add the | 132 | /* for the first four relocation types, we simply |
| 148 | * adjustment into the value at the location given */ | 133 | * store the adjustment at the location given */ |
| 149 | case R_MN10300_32: | 134 | case R_MN10300_32: |
| 150 | value = reloc_get32(location); | 135 | reloc_put32(location, relocation); |
| 151 | value += relocation; | ||
| 152 | reloc_put32(location, value); | ||
| 153 | break; | 136 | break; |
| 154 | case R_MN10300_24: | 137 | case R_MN10300_24: |
| 155 | value = reloc_get24(location); | 138 | reloc_put24(location, relocation); |
| 156 | value += relocation; | ||
| 157 | reloc_put24(location, value); | ||
| 158 | break; | 139 | break; |
| 159 | case R_MN10300_16: | 140 | case R_MN10300_16: |
| 160 | value = reloc_get16(location); | 141 | reloc_put16(location, relocation); |
| 161 | value += relocation; | ||
| 162 | reloc_put16(location, value); | ||
| 163 | break; | 142 | break; |
| 164 | case R_MN10300_8: | 143 | case R_MN10300_8: |
| 165 | *location += relocation; | 144 | *location = relocation; |
| 166 | break; | 145 | break; |
| 167 | 146 | ||
| 168 | /* for the next three relocation types, we write the | 147 | /* for the next three relocation types, we write the |
diff --git a/arch/mn10300/kernel/setup.c b/arch/mn10300/kernel/setup.c index 017121ce896f..e1d88ab51008 100644 --- a/arch/mn10300/kernel/setup.c +++ b/arch/mn10300/kernel/setup.c | |||
| @@ -161,7 +161,7 @@ void __init setup_arch(char **cmdline_p) | |||
| 161 | reserve the page it is occupying. */ | 161 | reserve the page it is occupying. */ |
| 162 | if (CONFIG_INTERRUPT_VECTOR_BASE >= CONFIG_KERNEL_RAM_BASE_ADDRESS && | 162 | if (CONFIG_INTERRUPT_VECTOR_BASE >= CONFIG_KERNEL_RAM_BASE_ADDRESS && |
| 163 | CONFIG_INTERRUPT_VECTOR_BASE < memory_end) | 163 | CONFIG_INTERRUPT_VECTOR_BASE < memory_end) |
| 164 | reserve_bootmem(CONFIG_INTERRUPT_VECTOR_BASE, 1, | 164 | reserve_bootmem(CONFIG_INTERRUPT_VECTOR_BASE, PAGE_SIZE, |
| 165 | BOOTMEM_DEFAULT); | 165 | BOOTMEM_DEFAULT); |
| 166 | 166 | ||
| 167 | reserve_bootmem(PAGE_ALIGN(PFN_PHYS(free_pfn)), bootmap_size, | 167 | reserve_bootmem(PAGE_ALIGN(PFN_PHYS(free_pfn)), bootmap_size, |
diff --git a/arch/mn10300/kernel/vmlinux.lds.S b/arch/mn10300/kernel/vmlinux.lds.S index a3e80f444f55..b8259668f7dc 100644 --- a/arch/mn10300/kernel/vmlinux.lds.S +++ b/arch/mn10300/kernel/vmlinux.lds.S | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | #define __VMLINUX_LDS__ | 11 | #define __VMLINUX_LDS__ |
| 12 | #include <asm-generic/vmlinux.lds.h> | 12 | #include <asm-generic/vmlinux.lds.h> |
| 13 | #include <asm/thread_info.h> | 13 | #include <asm/thread_info.h> |
| 14 | #include <asm/page.h> | ||
| 14 | 15 | ||
| 15 | OUTPUT_FORMAT("elf32-am33lin", "elf32-am33lin", "elf32-am33lin") | 16 | OUTPUT_FORMAT("elf32-am33lin", "elf32-am33lin", "elf32-am33lin") |
| 16 | OUTPUT_ARCH(mn10300) | 17 | OUTPUT_ARCH(mn10300) |
| @@ -55,13 +56,13 @@ SECTIONS | |||
| 55 | CONSTRUCTORS | 56 | CONSTRUCTORS |
| 56 | } | 57 | } |
| 57 | 58 | ||
| 58 | . = ALIGN(4096); | 59 | . = ALIGN(PAGE_SIZE); |
| 59 | __nosave_begin = .; | 60 | __nosave_begin = .; |
| 60 | .data_nosave : { *(.data.nosave) } | 61 | .data_nosave : { *(.data.nosave) } |
| 61 | . = ALIGN(4096); | 62 | . = ALIGN(PAGE_SIZE); |
| 62 | __nosave_end = .; | 63 | __nosave_end = .; |
| 63 | 64 | ||
| 64 | . = ALIGN(4096); | 65 | . = ALIGN(PAGE_SIZE); |
| 65 | .data.page_aligned : { *(.data.idt) } | 66 | .data.page_aligned : { *(.data.idt) } |
| 66 | 67 | ||
| 67 | . = ALIGN(32); | 68 | . = ALIGN(32); |
| @@ -78,7 +79,7 @@ SECTIONS | |||
| 78 | .data.init_task : { *(.data.init_task) } | 79 | .data.init_task : { *(.data.init_task) } |
| 79 | 80 | ||
| 80 | /* might get freed after init */ | 81 | /* might get freed after init */ |
| 81 | . = ALIGN(4096); | 82 | . = ALIGN(PAGE_SIZE); |
| 82 | .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) { | 83 | .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) { |
| 83 | __smp_locks = .; | 84 | __smp_locks = .; |
| 84 | *(.smp_locks) | 85 | *(.smp_locks) |
| @@ -86,7 +87,7 @@ SECTIONS | |||
| 86 | } | 87 | } |
| 87 | 88 | ||
| 88 | /* will be freed after init */ | 89 | /* will be freed after init */ |
| 89 | . = ALIGN(4096); /* Init code and data */ | 90 | . = ALIGN(PAGE_SIZE); /* Init code and data */ |
| 90 | __init_begin = .; | 91 | __init_begin = .; |
| 91 | .init.text : { | 92 | .init.text : { |
| 92 | _sinittext = .; | 93 | _sinittext = .; |
| @@ -120,17 +121,14 @@ SECTIONS | |||
| 120 | .exit.data : { *(.exit.data) } | 121 | .exit.data : { *(.exit.data) } |
| 121 | 122 | ||
| 122 | #ifdef CONFIG_BLK_DEV_INITRD | 123 | #ifdef CONFIG_BLK_DEV_INITRD |
| 123 | . = ALIGN(4096); | 124 | . = ALIGN(PAGE_SIZE); |
| 124 | __initramfs_start = .; | 125 | __initramfs_start = .; |
| 125 | .init.ramfs : { *(.init.ramfs) } | 126 | .init.ramfs : { *(.init.ramfs) } |
| 126 | __initramfs_end = .; | 127 | __initramfs_end = .; |
| 127 | #endif | 128 | #endif |
| 128 | 129 | ||
| 129 | . = ALIGN(32); | 130 | PERCPU(32) |
| 130 | __per_cpu_start = .; | 131 | . = ALIGN(PAGE_SIZE); |
| 131 | .data.percpu : { *(.data.percpu) } | ||
| 132 | __per_cpu_end = .; | ||
| 133 | . = ALIGN(4096); | ||
| 134 | __init_end = .; | 132 | __init_end = .; |
| 135 | /* freed after init ends here */ | 133 | /* freed after init ends here */ |
| 136 | 134 | ||
| @@ -145,7 +143,7 @@ SECTIONS | |||
| 145 | _end = . ; | 143 | _end = . ; |
| 146 | 144 | ||
| 147 | /* This is where the kernel creates the early boot page tables */ | 145 | /* This is where the kernel creates the early boot page tables */ |
| 148 | . = ALIGN(4096); | 146 | . = ALIGN(PAGE_SIZE); |
| 149 | pg0 = .; | 147 | pg0 = .; |
| 150 | 148 | ||
| 151 | /* Sections to be discarded */ | 149 | /* Sections to be discarded */ |
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index 8fc6d72849ae..3d3daa674299 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile | |||
| @@ -41,6 +41,7 @@ $(obj)/4xx.o: BOOTCFLAGS += -mcpu=405 | |||
| 41 | $(obj)/ebony.o: BOOTCFLAGS += -mcpu=405 | 41 | $(obj)/ebony.o: BOOTCFLAGS += -mcpu=405 |
| 42 | $(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=405 | 42 | $(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=405 |
| 43 | $(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=405 | 43 | $(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=405 |
| 44 | $(obj)/cuboot-acadia.o: BOOTCFLAGS += -mcpu=405 | ||
| 44 | $(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405 | 45 | $(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405 |
| 45 | $(obj)/virtex405-head.o: BOOTAFLAGS += -mcpu=405 | 46 | $(obj)/virtex405-head.o: BOOTAFLAGS += -mcpu=405 |
| 46 | 47 | ||
diff --git a/arch/powerpc/boot/dts/mpc8349emitx.dts b/arch/powerpc/boot/dts/mpc8349emitx.dts index 2c9d54a35bc3..4bdbaf4993a1 100644 --- a/arch/powerpc/boot/dts/mpc8349emitx.dts +++ b/arch/powerpc/boot/dts/mpc8349emitx.dts | |||
| @@ -91,6 +91,14 @@ | |||
| 91 | interrupts = <18 0x8>; | 91 | interrupts = <18 0x8>; |
| 92 | interrupt-parent = <&ipic>; | 92 | interrupt-parent = <&ipic>; |
| 93 | }; | 93 | }; |
| 94 | |||
| 95 | mcu_pio: mcu@a { | ||
| 96 | #gpio-cells = <2>; | ||
| 97 | compatible = "fsl,mc9s08qg8-mpc8349emitx", | ||
| 98 | "fsl,mcu-mpc8349emitx"; | ||
| 99 | reg = <0x0a>; | ||
| 100 | gpio-controller; | ||
| 101 | }; | ||
| 94 | }; | 102 | }; |
| 95 | 103 | ||
| 96 | spi@7000 { | 104 | spi@7000 { |
| @@ -139,14 +147,6 @@ | |||
| 139 | interrupt-parent = <&ipic>; | 147 | interrupt-parent = <&ipic>; |
| 140 | interrupts = <71 8>; | 148 | interrupts = <71 8>; |
| 141 | }; | 149 | }; |
| 142 | |||
| 143 | mcu_pio: mcu@a { | ||
| 144 | #gpio-cells = <2>; | ||
| 145 | compatible = "fsl,mc9s08qg8-mpc8349emitx", | ||
| 146 | "fsl,mcu-mpc8349emitx"; | ||
| 147 | reg = <0x0a>; | ||
| 148 | gpio-controller; | ||
| 149 | }; | ||
| 150 | }; | 150 | }; |
| 151 | 151 | ||
| 152 | usb@22000 { | 152 | usb@22000 { |
diff --git a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig index e55ff7c47a36..07a674f5344e 100644 --- a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig +++ b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig | |||
| @@ -723,7 +723,7 @@ CONFIG_CICADA_PHY=y | |||
| 723 | # CONFIG_BROADCOM_PHY is not set | 723 | # CONFIG_BROADCOM_PHY is not set |
| 724 | # CONFIG_ICPLUS_PHY is not set | 724 | # CONFIG_ICPLUS_PHY is not set |
| 725 | # CONFIG_REALTEK_PHY is not set | 725 | # CONFIG_REALTEK_PHY is not set |
| 726 | # CONFIG_FIXED_PHY is not set | 726 | CONFIG_FIXED_PHY=y |
| 727 | # CONFIG_MDIO_BITBANG is not set | 727 | # CONFIG_MDIO_BITBANG is not set |
| 728 | # CONFIG_NET_ETHERNET is not set | 728 | # CONFIG_NET_ETHERNET is not set |
| 729 | CONFIG_NETDEV_1000=y | 729 | CONFIG_NETDEV_1000=y |
diff --git a/arch/powerpc/configs/mpc83xx_defconfig b/arch/powerpc/configs/mpc83xx_defconfig index 15eb30c9b3f9..d582014b0a38 100644 --- a/arch/powerpc/configs/mpc83xx_defconfig +++ b/arch/powerpc/configs/mpc83xx_defconfig | |||
| @@ -682,7 +682,7 @@ CONFIG_VITESSE_PHY=y | |||
| 682 | # CONFIG_BROADCOM_PHY is not set | 682 | # CONFIG_BROADCOM_PHY is not set |
| 683 | CONFIG_ICPLUS_PHY=y | 683 | CONFIG_ICPLUS_PHY=y |
| 684 | # CONFIG_REALTEK_PHY is not set | 684 | # CONFIG_REALTEK_PHY is not set |
| 685 | # CONFIG_FIXED_PHY is not set | 685 | CONFIG_FIXED_PHY=y |
| 686 | # CONFIG_MDIO_BITBANG is not set | 686 | # CONFIG_MDIO_BITBANG is not set |
| 687 | CONFIG_NET_ETHERNET=y | 687 | CONFIG_NET_ETHERNET=y |
| 688 | CONFIG_MII=y | 688 | CONFIG_MII=y |
diff --git a/arch/powerpc/include/asm/kvm_ppc.h b/arch/powerpc/include/asm/kvm_ppc.h index 8931ba729d2b..bb62ad876de3 100644 --- a/arch/powerpc/include/asm/kvm_ppc.h +++ b/arch/powerpc/include/asm/kvm_ppc.h | |||
| @@ -104,4 +104,6 @@ static inline void kvmppc_set_pid(struct kvm_vcpu *vcpu, u32 new_pid) | |||
| 104 | } | 104 | } |
| 105 | } | 105 | } |
| 106 | 106 | ||
| 107 | extern void kvmppc_core_destroy_mmu(struct kvm_vcpu *vcpu); | ||
| 108 | |||
| 107 | #endif /* __POWERPC_KVM_PPC_H__ */ | 109 | #endif /* __POWERPC_KVM_PPC_H__ */ |
diff --git a/arch/powerpc/kernel/cpu_setup_44x.S b/arch/powerpc/kernel/cpu_setup_44x.S index 31c18b52affb..10b4ab1008af 100644 --- a/arch/powerpc/kernel/cpu_setup_44x.S +++ b/arch/powerpc/kernel/cpu_setup_44x.S | |||
| @@ -40,6 +40,7 @@ _GLOBAL(__setup_cpu_460gt) | |||
| 40 | mtlr r4 | 40 | mtlr r4 |
| 41 | blr | 41 | blr |
| 42 | 42 | ||
| 43 | _GLOBAL(__setup_cpu_440x5) | ||
| 43 | _GLOBAL(__setup_cpu_440gx) | 44 | _GLOBAL(__setup_cpu_440gx) |
| 44 | _GLOBAL(__setup_cpu_440spe) | 45 | _GLOBAL(__setup_cpu_440spe) |
| 45 | b __fixup_440A_mcheck | 46 | b __fixup_440A_mcheck |
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c index b1eb834bc0fc..7e8719504f39 100644 --- a/arch/powerpc/kernel/cputable.c +++ b/arch/powerpc/kernel/cputable.c | |||
| @@ -39,6 +39,7 @@ extern void __setup_cpu_440epx(unsigned long offset, struct cpu_spec* spec); | |||
| 39 | extern void __setup_cpu_440gx(unsigned long offset, struct cpu_spec* spec); | 39 | extern void __setup_cpu_440gx(unsigned long offset, struct cpu_spec* spec); |
| 40 | extern void __setup_cpu_440grx(unsigned long offset, struct cpu_spec* spec); | 40 | extern void __setup_cpu_440grx(unsigned long offset, struct cpu_spec* spec); |
| 41 | extern void __setup_cpu_440spe(unsigned long offset, struct cpu_spec* spec); | 41 | extern void __setup_cpu_440spe(unsigned long offset, struct cpu_spec* spec); |
| 42 | extern void __setup_cpu_440x5(unsigned long offset, struct cpu_spec* spec); | ||
| 42 | extern void __setup_cpu_460ex(unsigned long offset, struct cpu_spec* spec); | 43 | extern void __setup_cpu_460ex(unsigned long offset, struct cpu_spec* spec); |
| 43 | extern void __setup_cpu_460gt(unsigned long offset, struct cpu_spec* spec); | 44 | extern void __setup_cpu_460gt(unsigned long offset, struct cpu_spec* spec); |
| 44 | extern void __setup_cpu_603(unsigned long offset, struct cpu_spec* spec); | 45 | extern void __setup_cpu_603(unsigned long offset, struct cpu_spec* spec); |
| @@ -1500,6 +1501,8 @@ static struct cpu_spec __initdata cpu_specs[] = { | |||
| 1500 | .cpu_user_features = COMMON_USER_BOOKE, | 1501 | .cpu_user_features = COMMON_USER_BOOKE, |
| 1501 | .icache_bsize = 32, | 1502 | .icache_bsize = 32, |
| 1502 | .dcache_bsize = 32, | 1503 | .dcache_bsize = 32, |
| 1504 | .cpu_setup = __setup_cpu_440x5, | ||
| 1505 | .machine_check = machine_check_440A, | ||
| 1503 | .platform = "ppc440", | 1506 | .platform = "ppc440", |
| 1504 | }, | 1507 | }, |
| 1505 | { /* 460EX */ | 1508 | { /* 460EX */ |
diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c index 1562daf8839a..3a6eaa876ee1 100644 --- a/arch/powerpc/kernel/dma.c +++ b/arch/powerpc/kernel/dma.c | |||
| @@ -75,6 +75,7 @@ static int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl, | |||
| 75 | for_each_sg(sgl, sg, nents, i) { | 75 | for_each_sg(sgl, sg, nents, i) { |
| 76 | sg->dma_address = sg_phys(sg) + get_dma_direct_offset(dev); | 76 | sg->dma_address = sg_phys(sg) + get_dma_direct_offset(dev); |
| 77 | sg->dma_length = sg->length; | 77 | sg->dma_length = sg->length; |
| 78 | __dma_sync_page(sg_page(sg), sg->offset, sg->length, direction); | ||
| 78 | } | 79 | } |
| 79 | 80 | ||
| 80 | return nents; | 81 | return nents; |
diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S index bdc8b0e860e5..d108715129e2 100644 --- a/arch/powerpc/kernel/misc_32.S +++ b/arch/powerpc/kernel/misc_32.S | |||
| @@ -479,6 +479,8 @@ _GLOBAL(_tlbil_pid) | |||
| 479 | * (no broadcast) | 479 | * (no broadcast) |
| 480 | */ | 480 | */ |
| 481 | _GLOBAL(_tlbil_va) | 481 | _GLOBAL(_tlbil_va) |
| 482 | mfmsr r10 | ||
| 483 | wrteei 0 | ||
| 482 | slwi r4,r4,16 | 484 | slwi r4,r4,16 |
| 483 | mtspr SPRN_MAS6,r4 /* assume AS=0 for now */ | 485 | mtspr SPRN_MAS6,r4 /* assume AS=0 for now */ |
| 484 | tlbsx 0,r3 | 486 | tlbsx 0,r3 |
| @@ -490,6 +492,7 @@ _GLOBAL(_tlbil_va) | |||
| 490 | tlbwe | 492 | tlbwe |
| 491 | msync | 493 | msync |
| 492 | isync | 494 | isync |
| 495 | wrtee r10 | ||
| 493 | blr | 496 | blr |
| 494 | #endif /* CONFIG_FSL_BOOKE */ | 497 | #endif /* CONFIG_FSL_BOOKE */ |
| 495 | 498 | ||
diff --git a/arch/powerpc/kvm/44x_tlb.c b/arch/powerpc/kvm/44x_tlb.c index 2e227a412bc2..ad72c6f9811f 100644 --- a/arch/powerpc/kvm/44x_tlb.c +++ b/arch/powerpc/kvm/44x_tlb.c | |||
| @@ -124,6 +124,14 @@ static void kvmppc_44x_shadow_release(struct kvm_vcpu *vcpu, | |||
| 124 | } | 124 | } |
| 125 | } | 125 | } |
| 126 | 126 | ||
| 127 | void kvmppc_core_destroy_mmu(struct kvm_vcpu *vcpu) | ||
| 128 | { | ||
| 129 | int i; | ||
| 130 | |||
| 131 | for (i = 0; i <= tlb_44x_hwater; i++) | ||
| 132 | kvmppc_44x_shadow_release(vcpu, i); | ||
| 133 | } | ||
| 134 | |||
| 127 | void kvmppc_tlbe_set_modified(struct kvm_vcpu *vcpu, unsigned int i) | 135 | void kvmppc_tlbe_set_modified(struct kvm_vcpu *vcpu, unsigned int i) |
| 128 | { | 136 | { |
| 129 | vcpu->arch.shadow_tlb_mod[i] = 1; | 137 | vcpu->arch.shadow_tlb_mod[i] = 1; |
diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c index 90a6fc422b23..fda9baada132 100644 --- a/arch/powerpc/kvm/powerpc.c +++ b/arch/powerpc/kvm/powerpc.c | |||
| @@ -238,6 +238,7 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu) | |||
| 238 | 238 | ||
| 239 | void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu) | 239 | void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu) |
| 240 | { | 240 | { |
| 241 | kvmppc_core_destroy_mmu(vcpu); | ||
| 241 | } | 242 | } |
| 242 | 243 | ||
| 243 | /* Note: clearing MSR[DE] just means that the debug interrupt will not be | 244 | /* Note: clearing MSR[DE] just means that the debug interrupt will not be |
diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c index 7bbf4e4ed430..f0c3b88d50fa 100644 --- a/arch/powerpc/mm/hugetlbpage.c +++ b/arch/powerpc/mm/hugetlbpage.c | |||
| @@ -507,6 +507,9 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, | |||
| 507 | { | 507 | { |
| 508 | struct hstate *hstate = hstate_file(file); | 508 | struct hstate *hstate = hstate_file(file); |
| 509 | int mmu_psize = shift_to_mmu_psize(huge_page_shift(hstate)); | 509 | int mmu_psize = shift_to_mmu_psize(huge_page_shift(hstate)); |
| 510 | |||
| 511 | if (!mmu_huge_psizes[mmu_psize]) | ||
| 512 | return -EINVAL; | ||
| 510 | return slice_get_unmapped_area(addr, len, flags, mmu_psize, 1, 0); | 513 | return slice_get_unmapped_area(addr, len, flags, mmu_psize, 1, 0); |
| 511 | } | 514 | } |
| 512 | 515 | ||
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c index a8397bbad3d4..cf81049e1e51 100644 --- a/arch/powerpc/mm/numa.c +++ b/arch/powerpc/mm/numa.c | |||
| @@ -901,10 +901,17 @@ static void mark_reserved_regions_for_nid(int nid) | |||
| 901 | if (end_pfn > node_ar.end_pfn) | 901 | if (end_pfn > node_ar.end_pfn) |
| 902 | reserve_size = (node_ar.end_pfn << PAGE_SHIFT) | 902 | reserve_size = (node_ar.end_pfn << PAGE_SHIFT) |
| 903 | - (start_pfn << PAGE_SHIFT); | 903 | - (start_pfn << PAGE_SHIFT); |
| 904 | dbg("reserve_bootmem %lx %lx nid=%d\n", physbase, | 904 | /* |
| 905 | reserve_size, node_ar.nid); | 905 | * Only worry about *this* node, others may not |
| 906 | reserve_bootmem_node(NODE_DATA(node_ar.nid), physbase, | 906 | * yet have valid NODE_DATA(). |
| 907 | reserve_size, BOOTMEM_DEFAULT); | 907 | */ |
| 908 | if (node_ar.nid == nid) { | ||
| 909 | dbg("reserve_bootmem %lx %lx nid=%d\n", | ||
| 910 | physbase, reserve_size, node_ar.nid); | ||
| 911 | reserve_bootmem_node(NODE_DATA(node_ar.nid), | ||
| 912 | physbase, reserve_size, | ||
| 913 | BOOTMEM_DEFAULT); | ||
| 914 | } | ||
| 908 | /* | 915 | /* |
| 909 | * if reserved region is contained in the active region | 916 | * if reserved region is contained in the active region |
| 910 | * then done. | 917 | * then done. |
| @@ -929,7 +936,6 @@ static void mark_reserved_regions_for_nid(int nid) | |||
| 929 | void __init do_init_bootmem(void) | 936 | void __init do_init_bootmem(void) |
| 930 | { | 937 | { |
| 931 | int nid; | 938 | int nid; |
| 932 | unsigned int i; | ||
| 933 | 939 | ||
| 934 | min_low_pfn = 0; | 940 | min_low_pfn = 0; |
| 935 | max_low_pfn = lmb_end_of_DRAM() >> PAGE_SHIFT; | 941 | max_low_pfn = lmb_end_of_DRAM() >> PAGE_SHIFT; |
diff --git a/arch/powerpc/platforms/cell/axon_msi.c b/arch/powerpc/platforms/cell/axon_msi.c index 442cf36aa172..0ce45c2b42f8 100644 --- a/arch/powerpc/platforms/cell/axon_msi.c +++ b/arch/powerpc/platforms/cell/axon_msi.c | |||
| @@ -413,6 +413,9 @@ static int axon_msi_probe(struct of_device *device, | |||
| 413 | MSIC_CTRL_IRQ_ENABLE | MSIC_CTRL_ENABLE | | 413 | MSIC_CTRL_IRQ_ENABLE | MSIC_CTRL_ENABLE | |
| 414 | MSIC_CTRL_FIFO_SIZE); | 414 | MSIC_CTRL_FIFO_SIZE); |
| 415 | 415 | ||
| 416 | msic->read_offset = dcr_read(msic->dcr_host, MSIC_WRITE_OFFSET_REG) | ||
| 417 | & MSIC_FIFO_SIZE_MASK; | ||
| 418 | |||
| 416 | device->dev.platform_data = msic; | 419 | device->dev.platform_data = msic; |
| 417 | 420 | ||
| 418 | ppc_md.setup_msi_irqs = axon_msi_setup_msi_irqs; | 421 | ppc_md.setup_msi_irqs = axon_msi_setup_msi_irqs; |
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c index b24e1d085557..1890fb085cde 100644 --- a/arch/powerpc/sysdev/mpic.c +++ b/arch/powerpc/sysdev/mpic.c | |||
| @@ -600,7 +600,7 @@ static int irq_choose_cpu(unsigned int virt_irq) | |||
| 600 | cpuid = first_cpu(tmp); | 600 | cpuid = first_cpu(tmp); |
| 601 | } | 601 | } |
| 602 | 602 | ||
| 603 | return cpuid; | 603 | return get_hard_smp_processor_id(cpuid); |
| 604 | } | 604 | } |
| 605 | #else | 605 | #else |
| 606 | static int irq_choose_cpu(unsigned int virt_irq) | 606 | static int irq_choose_cpu(unsigned int virt_irq) |
diff --git a/arch/s390/kvm/sigp.c b/arch/s390/kvm/sigp.c index 170392687ce0..2a01b9e02801 100644 --- a/arch/s390/kvm/sigp.c +++ b/arch/s390/kvm/sigp.c | |||
| @@ -237,6 +237,11 @@ int kvm_s390_handle_sigp(struct kvm_vcpu *vcpu) | |||
| 237 | u8 order_code; | 237 | u8 order_code; |
| 238 | int rc; | 238 | int rc; |
| 239 | 239 | ||
| 240 | /* sigp in userspace can exit */ | ||
| 241 | if (vcpu->arch.sie_block->gpsw.mask & PSW_MASK_PSTATE) | ||
| 242 | return kvm_s390_inject_program_int(vcpu, | ||
| 243 | PGM_PRIVILEGED_OPERATION); | ||
| 244 | |||
| 240 | order_code = disp2; | 245 | order_code = disp2; |
| 241 | if (base2) | 246 | if (base2) |
| 242 | order_code += vcpu->arch.guest_gprs[base2]; | 247 | order_code += vcpu->arch.guest_gprs[base2]; |
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 80119b3398e7..5c9cbfc14c4d 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig | |||
| @@ -55,6 +55,8 @@ config GENERIC_HARDIRQS | |||
| 55 | 55 | ||
| 56 | config GENERIC_HARDIRQS_NO__DO_IRQ | 56 | config GENERIC_HARDIRQS_NO__DO_IRQ |
| 57 | def_bool y | 57 | def_bool y |
| 58 | depends on SUPERH32 && (!SH_DREAMCAST && !SH_SH4202_MICRODEV && \ | ||
| 59 | !SH_7751_SYSTEMH && !HD64461) | ||
| 58 | 60 | ||
| 59 | config GENERIC_IRQ_PROBE | 61 | config GENERIC_IRQ_PROBE |
| 60 | def_bool y | 62 | def_bool y |
diff --git a/arch/sparc/include/asm/bitops_32.h b/arch/sparc/include/asm/bitops_32.h index 68b98a7e6454..9cf4ae0cd7ba 100644 --- a/arch/sparc/include/asm/bitops_32.h +++ b/arch/sparc/include/asm/bitops_32.h | |||
| @@ -98,6 +98,7 @@ static inline void change_bit(unsigned long nr, volatile unsigned long *addr) | |||
| 98 | #include <asm-generic/bitops/sched.h> | 98 | #include <asm-generic/bitops/sched.h> |
| 99 | #include <asm-generic/bitops/ffs.h> | 99 | #include <asm-generic/bitops/ffs.h> |
| 100 | #include <asm-generic/bitops/fls.h> | 100 | #include <asm-generic/bitops/fls.h> |
| 101 | #include <asm-generic/bitops/__fls.h> | ||
| 101 | #include <asm-generic/bitops/fls64.h> | 102 | #include <asm-generic/bitops/fls64.h> |
| 102 | #include <asm-generic/bitops/hweight.h> | 103 | #include <asm-generic/bitops/hweight.h> |
| 103 | #include <asm-generic/bitops/lock.h> | 104 | #include <asm-generic/bitops/lock.h> |
diff --git a/arch/sparc64/kernel/ptrace.c b/arch/sparc64/kernel/ptrace.c index f43adbc773ca..a941c610e7ce 100644 --- a/arch/sparc64/kernel/ptrace.c +++ b/arch/sparc64/kernel/ptrace.c | |||
| @@ -1014,7 +1014,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) | |||
| 1014 | break; | 1014 | break; |
| 1015 | 1015 | ||
| 1016 | case PTRACE_SETFPREGS64: | 1016 | case PTRACE_SETFPREGS64: |
| 1017 | ret = copy_regset_to_user(child, view, REGSET_FP, | 1017 | ret = copy_regset_from_user(child, view, REGSET_FP, |
| 1018 | 0 * sizeof(u64), | 1018 | 0 * sizeof(u64), |
| 1019 | 33 * sizeof(u64), | 1019 | 33 * sizeof(u64), |
| 1020 | fps); | 1020 | fps); |
diff --git a/arch/sparc64/kernel/visemul.c b/arch/sparc64/kernel/visemul.c index 9e05cb5cb855..b956fd71c131 100644 --- a/arch/sparc64/kernel/visemul.c +++ b/arch/sparc64/kernel/visemul.c | |||
| @@ -131,7 +131,7 @@ | |||
| 131 | #define VIS_OPF_SHIFT 5 | 131 | #define VIS_OPF_SHIFT 5 |
| 132 | #define VIS_OPF_MASK (0x1ff << VIS_OPF_SHIFT) | 132 | #define VIS_OPF_MASK (0x1ff << VIS_OPF_SHIFT) |
| 133 | 133 | ||
| 134 | #define RS1(INSN) (((INSN) >> 24) & 0x1f) | 134 | #define RS1(INSN) (((INSN) >> 14) & 0x1f) |
| 135 | #define RS2(INSN) (((INSN) >> 0) & 0x1f) | 135 | #define RS2(INSN) (((INSN) >> 0) & 0x1f) |
| 136 | #define RD(INSN) (((INSN) >> 25) & 0x1f) | 136 | #define RD(INSN) (((INSN) >> 25) & 0x1f) |
| 137 | 137 | ||
| @@ -445,7 +445,7 @@ static void pdist(struct pt_regs *regs, unsigned int insn) | |||
| 445 | unsigned long i; | 445 | unsigned long i; |
| 446 | 446 | ||
| 447 | rs1 = fpd_regval(f, RS1(insn)); | 447 | rs1 = fpd_regval(f, RS1(insn)); |
| 448 | rs2 = fpd_regval(f, RS1(insn)); | 448 | rs2 = fpd_regval(f, RS2(insn)); |
| 449 | rd = fpd_regaddr(f, RD(insn)); | 449 | rd = fpd_regaddr(f, RD(insn)); |
| 450 | 450 | ||
| 451 | rd_val = *rd; | 451 | rd_val = *rd; |
| @@ -807,6 +807,8 @@ int vis_emul(struct pt_regs *regs, unsigned int insn) | |||
| 807 | if (get_user(insn, (u32 __user *) pc)) | 807 | if (get_user(insn, (u32 __user *) pc)) |
| 808 | return -EFAULT; | 808 | return -EFAULT; |
| 809 | 809 | ||
| 810 | save_and_clear_fpu(); | ||
| 811 | |||
| 810 | opf = (insn & VIS_OPF_MASK) >> VIS_OPF_SHIFT; | 812 | opf = (insn & VIS_OPF_MASK) >> VIS_OPF_SHIFT; |
| 811 | switch (opf) { | 813 | switch (opf) { |
| 812 | default: | 814 | default: |
diff --git a/arch/sparc64/lib/user_fixup.c b/arch/sparc64/lib/user_fixup.c index 19d1fdb17d0e..05a361b0a1a4 100644 --- a/arch/sparc64/lib/user_fixup.c +++ b/arch/sparc64/lib/user_fixup.c | |||
| @@ -24,7 +24,7 @@ static unsigned long compute_size(unsigned long start, unsigned long size, unsig | |||
| 24 | if (fault_addr < start || fault_addr >= end) { | 24 | if (fault_addr < start || fault_addr >= end) { |
| 25 | *offset = 0; | 25 | *offset = 0; |
| 26 | } else { | 26 | } else { |
| 27 | *offset = start - fault_addr; | 27 | *offset = fault_addr - start; |
| 28 | size = end - fault_addr; | 28 | size = end - fault_addr; |
| 29 | } | 29 | } |
| 30 | return size; | 30 | return size; |
diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c index 19d579d74d27..8f44ebb0dec8 100644 --- a/arch/um/drivers/mconsole_kern.c +++ b/arch/um/drivers/mconsole_kern.c | |||
| @@ -16,6 +16,8 @@ | |||
| 16 | #include <linux/slab.h> | 16 | #include <linux/slab.h> |
| 17 | #include <linux/syscalls.h> | 17 | #include <linux/syscalls.h> |
| 18 | #include <linux/utsname.h> | 18 | #include <linux/utsname.h> |
| 19 | #include <linux/socket.h> | ||
| 20 | #include <linux/un.h> | ||
| 19 | #include <linux/workqueue.h> | 21 | #include <linux/workqueue.h> |
| 20 | #include <linux/mutex.h> | 22 | #include <linux/mutex.h> |
| 21 | #include <asm/uaccess.h> | 23 | #include <asm/uaccess.h> |
| @@ -785,7 +787,7 @@ static int __init mconsole_init(void) | |||
| 785 | /* long to avoid size mismatch warnings from gcc */ | 787 | /* long to avoid size mismatch warnings from gcc */ |
| 786 | long sock; | 788 | long sock; |
| 787 | int err; | 789 | int err; |
| 788 | char file[256]; | 790 | char file[UNIX_PATH_MAX]; |
| 789 | 791 | ||
| 790 | if (umid_file_name("mconsole", file, sizeof(file))) | 792 | if (umid_file_name("mconsole", file, sizeof(file))) |
| 791 | return -1; | 793 | return -1; |
diff --git a/arch/x86/include/asm/amd_iommu_types.h b/arch/x86/include/asm/amd_iommu_types.h index 1a30c0440c6b..ac302a2fa339 100644 --- a/arch/x86/include/asm/amd_iommu_types.h +++ b/arch/x86/include/asm/amd_iommu_types.h | |||
| @@ -251,13 +251,6 @@ struct amd_iommu { | |||
| 251 | /* Pointer to PCI device of this IOMMU */ | 251 | /* Pointer to PCI device of this IOMMU */ |
| 252 | struct pci_dev *dev; | 252 | struct pci_dev *dev; |
| 253 | 253 | ||
| 254 | /* | ||
| 255 | * Capability pointer. There could be more than one IOMMU per PCI | ||
| 256 | * device function if there are more than one AMD IOMMU capability | ||
| 257 | * pointers. | ||
| 258 | */ | ||
| 259 | u16 cap_ptr; | ||
| 260 | |||
| 261 | /* physical address of MMIO space */ | 254 | /* physical address of MMIO space */ |
| 262 | u64 mmio_phys; | 255 | u64 mmio_phys; |
| 263 | /* virtual address of MMIO space */ | 256 | /* virtual address of MMIO space */ |
| @@ -266,6 +259,13 @@ struct amd_iommu { | |||
| 266 | /* capabilities of that IOMMU read from ACPI */ | 259 | /* capabilities of that IOMMU read from ACPI */ |
| 267 | u32 cap; | 260 | u32 cap; |
| 268 | 261 | ||
| 262 | /* | ||
| 263 | * Capability pointer. There could be more than one IOMMU per PCI | ||
| 264 | * device function if there are more than one AMD IOMMU capability | ||
| 265 | * pointers. | ||
| 266 | */ | ||
| 267 | u16 cap_ptr; | ||
| 268 | |||
| 269 | /* pci domain of this IOMMU */ | 269 | /* pci domain of this IOMMU */ |
| 270 | u16 pci_seg; | 270 | u16 pci_seg; |
| 271 | 271 | ||
| @@ -284,19 +284,19 @@ struct amd_iommu { | |||
| 284 | /* size of command buffer */ | 284 | /* size of command buffer */ |
| 285 | u32 cmd_buf_size; | 285 | u32 cmd_buf_size; |
| 286 | 286 | ||
| 287 | /* event buffer virtual address */ | ||
| 288 | u8 *evt_buf; | ||
| 289 | /* size of event buffer */ | 287 | /* size of event buffer */ |
| 290 | u32 evt_buf_size; | 288 | u32 evt_buf_size; |
| 289 | /* event buffer virtual address */ | ||
| 290 | u8 *evt_buf; | ||
| 291 | /* MSI number for event interrupt */ | 291 | /* MSI number for event interrupt */ |
| 292 | u16 evt_msi_num; | 292 | u16 evt_msi_num; |
| 293 | 293 | ||
| 294 | /* if one, we need to send a completion wait command */ | ||
| 295 | int need_sync; | ||
| 296 | |||
| 297 | /* true if interrupts for this IOMMU are already enabled */ | 294 | /* true if interrupts for this IOMMU are already enabled */ |
| 298 | bool int_enabled; | 295 | bool int_enabled; |
| 299 | 296 | ||
| 297 | /* if one, we need to send a completion wait command */ | ||
| 298 | int need_sync; | ||
| 299 | |||
| 300 | /* default dma_ops domain for that IOMMU */ | 300 | /* default dma_ops domain for that IOMMU */ |
| 301 | struct dma_ops_domain *default_dom; | 301 | struct dma_ops_domain *default_dom; |
| 302 | }; | 302 | }; |
diff --git a/arch/x86/include/asm/dma-mapping.h b/arch/x86/include/asm/dma-mapping.h index 7f225a4b2a26..097794ff6b79 100644 --- a/arch/x86/include/asm/dma-mapping.h +++ b/arch/x86/include/asm/dma-mapping.h | |||
| @@ -71,15 +71,13 @@ static inline struct dma_mapping_ops *get_dma_ops(struct device *dev) | |||
| 71 | /* Make sure we keep the same behaviour */ | 71 | /* Make sure we keep the same behaviour */ |
| 72 | static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr) | 72 | static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr) |
| 73 | { | 73 | { |
| 74 | #ifdef CONFIG_X86_32 | 74 | #ifdef CONFIG_X86_64 |
| 75 | return 0; | ||
| 76 | #else | ||
| 77 | struct dma_mapping_ops *ops = get_dma_ops(dev); | 75 | struct dma_mapping_ops *ops = get_dma_ops(dev); |
| 78 | if (ops->mapping_error) | 76 | if (ops->mapping_error) |
| 79 | return ops->mapping_error(dev, dma_addr); | 77 | return ops->mapping_error(dev, dma_addr); |
| 80 | 78 | ||
| 81 | return (dma_addr == bad_dma_address); | ||
| 82 | #endif | 79 | #endif |
| 80 | return (dma_addr == bad_dma_address); | ||
| 83 | } | 81 | } |
| 84 | 82 | ||
| 85 | #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f) | 83 | #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f) |
diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h index 4850e4b02b61..ff386ff50ed7 100644 --- a/arch/x86/include/asm/topology.h +++ b/arch/x86/include/asm/topology.h | |||
| @@ -239,7 +239,7 @@ struct pci_bus; | |||
| 239 | void set_pci_bus_resources_arch_default(struct pci_bus *b); | 239 | void set_pci_bus_resources_arch_default(struct pci_bus *b); |
| 240 | 240 | ||
| 241 | #ifdef CONFIG_SMP | 241 | #ifdef CONFIG_SMP |
| 242 | #define mc_capable() (boot_cpu_data.x86_max_cores > 1) | 242 | #define mc_capable() (cpus_weight(per_cpu(cpu_core_map, 0)) != nr_cpu_ids) |
| 243 | #define smt_capable() (smp_num_siblings > 1) | 243 | #define smt_capable() (smp_num_siblings > 1) |
| 244 | #endif | 244 | #endif |
| 245 | 245 | ||
diff --git a/arch/x86/include/asm/vmi.h b/arch/x86/include/asm/vmi.h index b7c0dea119fe..61e08c0a2907 100644 --- a/arch/x86/include/asm/vmi.h +++ b/arch/x86/include/asm/vmi.h | |||
| @@ -223,9 +223,15 @@ struct pci_header { | |||
| 223 | } __attribute__((packed)); | 223 | } __attribute__((packed)); |
| 224 | 224 | ||
| 225 | /* Function prototypes for bootstrapping */ | 225 | /* Function prototypes for bootstrapping */ |
| 226 | #ifdef CONFIG_VMI | ||
| 226 | extern void vmi_init(void); | 227 | extern void vmi_init(void); |
| 228 | extern void vmi_activate(void); | ||
| 227 | extern void vmi_bringup(void); | 229 | extern void vmi_bringup(void); |
| 228 | extern void vmi_apply_boot_page_allocations(void); | 230 | #else |
| 231 | static inline void vmi_init(void) {} | ||
| 232 | static inline void vmi_activate(void) {} | ||
| 233 | static inline void vmi_bringup(void) {} | ||
| 234 | #endif | ||
| 229 | 235 | ||
| 230 | /* State needed to start an application processor in an SMP system. */ | 236 | /* State needed to start an application processor in an SMP system. */ |
| 231 | struct vmi_ap_state { | 237 | struct vmi_ap_state { |
diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c index e4899e0e8787..a7b6dec6fc3f 100644 --- a/arch/x86/kernel/amd_iommu.c +++ b/arch/x86/kernel/amd_iommu.c | |||
| @@ -187,6 +187,8 @@ static int iommu_queue_command(struct amd_iommu *iommu, struct iommu_cmd *cmd) | |||
| 187 | 187 | ||
| 188 | spin_lock_irqsave(&iommu->lock, flags); | 188 | spin_lock_irqsave(&iommu->lock, flags); |
| 189 | ret = __iommu_queue_command(iommu, cmd); | 189 | ret = __iommu_queue_command(iommu, cmd); |
| 190 | if (!ret) | ||
| 191 | iommu->need_sync = 1; | ||
| 190 | spin_unlock_irqrestore(&iommu->lock, flags); | 192 | spin_unlock_irqrestore(&iommu->lock, flags); |
| 191 | 193 | ||
| 192 | return ret; | 194 | return ret; |
| @@ -210,10 +212,13 @@ static int iommu_completion_wait(struct amd_iommu *iommu) | |||
| 210 | cmd.data[0] = CMD_COMPL_WAIT_INT_MASK; | 212 | cmd.data[0] = CMD_COMPL_WAIT_INT_MASK; |
| 211 | CMD_SET_TYPE(&cmd, CMD_COMPL_WAIT); | 213 | CMD_SET_TYPE(&cmd, CMD_COMPL_WAIT); |
| 212 | 214 | ||
| 213 | iommu->need_sync = 0; | ||
| 214 | |||
| 215 | spin_lock_irqsave(&iommu->lock, flags); | 215 | spin_lock_irqsave(&iommu->lock, flags); |
| 216 | 216 | ||
| 217 | if (!iommu->need_sync) | ||
| 218 | goto out; | ||
| 219 | |||
| 220 | iommu->need_sync = 0; | ||
| 221 | |||
| 217 | ret = __iommu_queue_command(iommu, &cmd); | 222 | ret = __iommu_queue_command(iommu, &cmd); |
| 218 | 223 | ||
| 219 | if (ret) | 224 | if (ret) |
| @@ -254,8 +259,6 @@ static int iommu_queue_inv_dev_entry(struct amd_iommu *iommu, u16 devid) | |||
| 254 | 259 | ||
| 255 | ret = iommu_queue_command(iommu, &cmd); | 260 | ret = iommu_queue_command(iommu, &cmd); |
| 256 | 261 | ||
| 257 | iommu->need_sync = 1; | ||
| 258 | |||
| 259 | return ret; | 262 | return ret; |
| 260 | } | 263 | } |
| 261 | 264 | ||
| @@ -281,8 +284,6 @@ static int iommu_queue_inv_iommu_pages(struct amd_iommu *iommu, | |||
| 281 | 284 | ||
| 282 | ret = iommu_queue_command(iommu, &cmd); | 285 | ret = iommu_queue_command(iommu, &cmd); |
| 283 | 286 | ||
| 284 | iommu->need_sync = 1; | ||
| 285 | |||
| 286 | return ret; | 287 | return ret; |
| 287 | } | 288 | } |
| 288 | 289 | ||
| @@ -343,7 +344,7 @@ static int iommu_map(struct protection_domain *dom, | |||
| 343 | u64 __pte, *pte, *page; | 344 | u64 __pte, *pte, *page; |
| 344 | 345 | ||
| 345 | bus_addr = PAGE_ALIGN(bus_addr); | 346 | bus_addr = PAGE_ALIGN(bus_addr); |
| 346 | phys_addr = PAGE_ALIGN(bus_addr); | 347 | phys_addr = PAGE_ALIGN(phys_addr); |
| 347 | 348 | ||
| 348 | /* only support 512GB address spaces for now */ | 349 | /* only support 512GB address spaces for now */ |
| 349 | if (bus_addr > IOMMU_MAP_SIZE_L3 || !(prot & IOMMU_PROT_MASK)) | 350 | if (bus_addr > IOMMU_MAP_SIZE_L3 || !(prot & IOMMU_PROT_MASK)) |
| @@ -599,7 +600,7 @@ static void dma_ops_free_pagetable(struct dma_ops_domain *dma_dom) | |||
| 599 | continue; | 600 | continue; |
| 600 | 601 | ||
| 601 | p2 = IOMMU_PTE_PAGE(p1[i]); | 602 | p2 = IOMMU_PTE_PAGE(p1[i]); |
| 602 | for (j = 0; j < 512; ++i) { | 603 | for (j = 0; j < 512; ++j) { |
| 603 | if (!IOMMU_PTE_PRESENT(p2[j])) | 604 | if (!IOMMU_PTE_PRESENT(p2[j])) |
| 604 | continue; | 605 | continue; |
| 605 | p3 = IOMMU_PTE_PAGE(p2[j]); | 606 | p3 = IOMMU_PTE_PAGE(p2[j]); |
| @@ -762,8 +763,6 @@ static void set_device_domain(struct amd_iommu *iommu, | |||
| 762 | write_unlock_irqrestore(&amd_iommu_devtable_lock, flags); | 763 | write_unlock_irqrestore(&amd_iommu_devtable_lock, flags); |
| 763 | 764 | ||
| 764 | iommu_queue_inv_dev_entry(iommu, devid); | 765 | iommu_queue_inv_dev_entry(iommu, devid); |
| 765 | |||
| 766 | iommu->need_sync = 1; | ||
| 767 | } | 766 | } |
| 768 | 767 | ||
| 769 | /***************************************************************************** | 768 | /***************************************************************************** |
| @@ -858,6 +857,9 @@ static int get_device_resources(struct device *dev, | |||
| 858 | print_devid(_bdf, 1); | 857 | print_devid(_bdf, 1); |
| 859 | } | 858 | } |
| 860 | 859 | ||
| 860 | if (domain_for_device(_bdf) == NULL) | ||
| 861 | set_device_domain(*iommu, *domain, _bdf); | ||
| 862 | |||
| 861 | return 1; | 863 | return 1; |
| 862 | } | 864 | } |
| 863 | 865 | ||
| @@ -908,7 +910,7 @@ static void dma_ops_domain_unmap(struct amd_iommu *iommu, | |||
| 908 | if (address >= dom->aperture_size) | 910 | if (address >= dom->aperture_size) |
| 909 | return; | 911 | return; |
| 910 | 912 | ||
| 911 | WARN_ON(address & 0xfffULL || address > dom->aperture_size); | 913 | WARN_ON(address & ~PAGE_MASK || address >= dom->aperture_size); |
| 912 | 914 | ||
| 913 | pte = dom->pte_pages[IOMMU_PTE_L1_INDEX(address)]; | 915 | pte = dom->pte_pages[IOMMU_PTE_L1_INDEX(address)]; |
| 914 | pte += IOMMU_PTE_L0_INDEX(address); | 916 | pte += IOMMU_PTE_L0_INDEX(address); |
| @@ -920,8 +922,8 @@ static void dma_ops_domain_unmap(struct amd_iommu *iommu, | |||
| 920 | 922 | ||
| 921 | /* | 923 | /* |
| 922 | * This function contains common code for mapping of a physically | 924 | * This function contains common code for mapping of a physically |
| 923 | * contiguous memory region into DMA address space. It is uses by all | 925 | * contiguous memory region into DMA address space. It is used by all |
| 924 | * mapping functions provided by this IOMMU driver. | 926 | * mapping functions provided with this IOMMU driver. |
| 925 | * Must be called with the domain lock held. | 927 | * Must be called with the domain lock held. |
| 926 | */ | 928 | */ |
| 927 | static dma_addr_t __map_single(struct device *dev, | 929 | static dma_addr_t __map_single(struct device *dev, |
| @@ -981,7 +983,8 @@ static void __unmap_single(struct amd_iommu *iommu, | |||
| 981 | dma_addr_t i, start; | 983 | dma_addr_t i, start; |
| 982 | unsigned int pages; | 984 | unsigned int pages; |
| 983 | 985 | ||
| 984 | if ((dma_addr == 0) || (dma_addr + size > dma_dom->aperture_size)) | 986 | if ((dma_addr == bad_dma_address) || |
| 987 | (dma_addr + size > dma_dom->aperture_size)) | ||
| 985 | return; | 988 | return; |
| 986 | 989 | ||
| 987 | pages = iommu_num_pages(dma_addr, size, PAGE_SIZE); | 990 | pages = iommu_num_pages(dma_addr, size, PAGE_SIZE); |
| @@ -1031,8 +1034,7 @@ static dma_addr_t map_single(struct device *dev, phys_addr_t paddr, | |||
| 1031 | if (addr == bad_dma_address) | 1034 | if (addr == bad_dma_address) |
| 1032 | goto out; | 1035 | goto out; |
| 1033 | 1036 | ||
| 1034 | if (unlikely(iommu->need_sync)) | 1037 | iommu_completion_wait(iommu); |
| 1035 | iommu_completion_wait(iommu); | ||
| 1036 | 1038 | ||
| 1037 | out: | 1039 | out: |
| 1038 | spin_unlock_irqrestore(&domain->lock, flags); | 1040 | spin_unlock_irqrestore(&domain->lock, flags); |
| @@ -1060,8 +1062,7 @@ static void unmap_single(struct device *dev, dma_addr_t dma_addr, | |||
| 1060 | 1062 | ||
| 1061 | __unmap_single(iommu, domain->priv, dma_addr, size, dir); | 1063 | __unmap_single(iommu, domain->priv, dma_addr, size, dir); |
| 1062 | 1064 | ||
| 1063 | if (unlikely(iommu->need_sync)) | 1065 | iommu_completion_wait(iommu); |
| 1064 | iommu_completion_wait(iommu); | ||
| 1065 | 1066 | ||
| 1066 | spin_unlock_irqrestore(&domain->lock, flags); | 1067 | spin_unlock_irqrestore(&domain->lock, flags); |
| 1067 | } | 1068 | } |
| @@ -1127,8 +1128,7 @@ static int map_sg(struct device *dev, struct scatterlist *sglist, | |||
| 1127 | goto unmap; | 1128 | goto unmap; |
| 1128 | } | 1129 | } |
| 1129 | 1130 | ||
| 1130 | if (unlikely(iommu->need_sync)) | 1131 | iommu_completion_wait(iommu); |
| 1131 | iommu_completion_wait(iommu); | ||
| 1132 | 1132 | ||
| 1133 | out: | 1133 | out: |
| 1134 | spin_unlock_irqrestore(&domain->lock, flags); | 1134 | spin_unlock_irqrestore(&domain->lock, flags); |
| @@ -1173,8 +1173,7 @@ static void unmap_sg(struct device *dev, struct scatterlist *sglist, | |||
| 1173 | s->dma_address = s->dma_length = 0; | 1173 | s->dma_address = s->dma_length = 0; |
| 1174 | } | 1174 | } |
| 1175 | 1175 | ||
| 1176 | if (unlikely(iommu->need_sync)) | 1176 | iommu_completion_wait(iommu); |
| 1177 | iommu_completion_wait(iommu); | ||
| 1178 | 1177 | ||
| 1179 | spin_unlock_irqrestore(&domain->lock, flags); | 1178 | spin_unlock_irqrestore(&domain->lock, flags); |
| 1180 | } | 1179 | } |
| @@ -1225,8 +1224,7 @@ static void *alloc_coherent(struct device *dev, size_t size, | |||
| 1225 | goto out; | 1224 | goto out; |
| 1226 | } | 1225 | } |
| 1227 | 1226 | ||
| 1228 | if (unlikely(iommu->need_sync)) | 1227 | iommu_completion_wait(iommu); |
| 1229 | iommu_completion_wait(iommu); | ||
| 1230 | 1228 | ||
| 1231 | out: | 1229 | out: |
| 1232 | spin_unlock_irqrestore(&domain->lock, flags); | 1230 | spin_unlock_irqrestore(&domain->lock, flags); |
| @@ -1257,8 +1255,7 @@ static void free_coherent(struct device *dev, size_t size, | |||
| 1257 | 1255 | ||
| 1258 | __unmap_single(iommu, domain->priv, dma_addr, size, DMA_BIDIRECTIONAL); | 1256 | __unmap_single(iommu, domain->priv, dma_addr, size, DMA_BIDIRECTIONAL); |
| 1259 | 1257 | ||
| 1260 | if (unlikely(iommu->need_sync)) | 1258 | iommu_completion_wait(iommu); |
| 1261 | iommu_completion_wait(iommu); | ||
| 1262 | 1259 | ||
| 1263 | spin_unlock_irqrestore(&domain->lock, flags); | 1260 | spin_unlock_irqrestore(&domain->lock, flags); |
| 1264 | 1261 | ||
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c index f98f4e1dba09..0f4c1fd5a1f4 100644 --- a/arch/x86/kernel/mpparse.c +++ b/arch/x86/kernel/mpparse.c | |||
| @@ -604,6 +604,9 @@ static void __init __get_smp_config(unsigned int early) | |||
| 604 | printk(KERN_INFO "Using ACPI for processor (LAPIC) " | 604 | printk(KERN_INFO "Using ACPI for processor (LAPIC) " |
| 605 | "configuration information\n"); | 605 | "configuration information\n"); |
| 606 | 606 | ||
| 607 | if (!mpf) | ||
| 608 | return; | ||
| 609 | |||
| 607 | printk(KERN_INFO "Intel MultiProcessor Specification v1.%d\n", | 610 | printk(KERN_INFO "Intel MultiProcessor Specification v1.%d\n", |
| 608 | mpf->mpf_specification); | 611 | mpf->mpf_specification); |
| 609 | #if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86_32) | 612 | #if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86_32) |
diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c index 0e9f1982b1dd..95777b0faa73 100644 --- a/arch/x86/kernel/paravirt-spinlocks.c +++ b/arch/x86/kernel/paravirt-spinlocks.c | |||
| @@ -7,7 +7,8 @@ | |||
| 7 | 7 | ||
| 8 | #include <asm/paravirt.h> | 8 | #include <asm/paravirt.h> |
| 9 | 9 | ||
| 10 | static void default_spin_lock_flags(struct raw_spinlock *lock, unsigned long flags) | 10 | static inline void |
| 11 | default_spin_lock_flags(raw_spinlock_t *lock, unsigned long flags) | ||
| 11 | { | 12 | { |
| 12 | __raw_spin_lock(lock); | 13 | __raw_spin_lock(lock); |
| 13 | } | 14 | } |
diff --git a/arch/x86/kernel/pci-gart_64.c b/arch/x86/kernel/pci-gart_64.c index a42b02b4df68..ba7ad83e20a8 100644 --- a/arch/x86/kernel/pci-gart_64.c +++ b/arch/x86/kernel/pci-gart_64.c | |||
| @@ -123,6 +123,8 @@ static void free_iommu(unsigned long offset, int size) | |||
| 123 | 123 | ||
| 124 | spin_lock_irqsave(&iommu_bitmap_lock, flags); | 124 | spin_lock_irqsave(&iommu_bitmap_lock, flags); |
| 125 | iommu_area_free(iommu_gart_bitmap, offset, size); | 125 | iommu_area_free(iommu_gart_bitmap, offset, size); |
| 126 | if (offset >= next_bit) | ||
| 127 | next_bit = offset + size; | ||
| 126 | spin_unlock_irqrestore(&iommu_bitmap_lock, flags); | 128 | spin_unlock_irqrestore(&iommu_bitmap_lock, flags); |
| 127 | } | 129 | } |
| 128 | 130 | ||
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 9d5674f7b6cc..bdec76e55594 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c | |||
| @@ -794,6 +794,9 @@ void __init setup_arch(char **cmdline_p) | |||
| 794 | printk(KERN_INFO "Command line: %s\n", boot_command_line); | 794 | printk(KERN_INFO "Command line: %s\n", boot_command_line); |
| 795 | #endif | 795 | #endif |
| 796 | 796 | ||
| 797 | /* VMI may relocate the fixmap; do this before touching ioremap area */ | ||
| 798 | vmi_init(); | ||
| 799 | |||
| 797 | early_cpu_init(); | 800 | early_cpu_init(); |
| 798 | early_ioremap_init(); | 801 | early_ioremap_init(); |
| 799 | 802 | ||
| @@ -880,13 +883,8 @@ void __init setup_arch(char **cmdline_p) | |||
| 880 | check_efer(); | 883 | check_efer(); |
| 881 | #endif | 884 | #endif |
| 882 | 885 | ||
| 883 | #if defined(CONFIG_VMI) && defined(CONFIG_X86_32) | 886 | /* Must be before kernel pagetables are setup */ |
| 884 | /* | 887 | vmi_activate(); |
| 885 | * Must be before kernel pagetables are setup | ||
| 886 | * or fixmap area is touched. | ||
| 887 | */ | ||
| 888 | vmi_init(); | ||
| 889 | #endif | ||
| 890 | 888 | ||
| 891 | /* after early param, so could get panic from serial */ | 889 | /* after early param, so could get panic from serial */ |
| 892 | reserve_early_setup_data(); | 890 | reserve_early_setup_data(); |
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 7b1093397319..f71f96fc9e62 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c | |||
| @@ -294,9 +294,7 @@ static void __cpuinit start_secondary(void *unused) | |||
| 294 | * fragile that we want to limit the things done here to the | 294 | * fragile that we want to limit the things done here to the |
| 295 | * most necessary things. | 295 | * most necessary things. |
| 296 | */ | 296 | */ |
| 297 | #ifdef CONFIG_VMI | ||
| 298 | vmi_bringup(); | 297 | vmi_bringup(); |
| 299 | #endif | ||
| 300 | cpu_init(); | 298 | cpu_init(); |
| 301 | preempt_disable(); | 299 | preempt_disable(); |
| 302 | smp_callin(); | 300 | smp_callin(); |
diff --git a/arch/x86/kernel/vmi_32.c b/arch/x86/kernel/vmi_32.c index 8b6c393ab9fd..22fd6577156a 100644 --- a/arch/x86/kernel/vmi_32.c +++ b/arch/x86/kernel/vmi_32.c | |||
| @@ -960,8 +960,6 @@ static inline int __init activate_vmi(void) | |||
| 960 | 960 | ||
| 961 | void __init vmi_init(void) | 961 | void __init vmi_init(void) |
| 962 | { | 962 | { |
| 963 | unsigned long flags; | ||
| 964 | |||
| 965 | if (!vmi_rom) | 963 | if (!vmi_rom) |
| 966 | probe_vmi_rom(); | 964 | probe_vmi_rom(); |
| 967 | else | 965 | else |
| @@ -973,13 +971,21 @@ void __init vmi_init(void) | |||
| 973 | 971 | ||
| 974 | reserve_top_address(-vmi_rom->virtual_top); | 972 | reserve_top_address(-vmi_rom->virtual_top); |
| 975 | 973 | ||
| 976 | local_irq_save(flags); | ||
| 977 | activate_vmi(); | ||
| 978 | |||
| 979 | #ifdef CONFIG_X86_IO_APIC | 974 | #ifdef CONFIG_X86_IO_APIC |
| 980 | /* This is virtual hardware; timer routing is wired correctly */ | 975 | /* This is virtual hardware; timer routing is wired correctly */ |
| 981 | no_timer_check = 1; | 976 | no_timer_check = 1; |
| 982 | #endif | 977 | #endif |
| 978 | } | ||
| 979 | |||
| 980 | void vmi_activate(void) | ||
| 981 | { | ||
| 982 | unsigned long flags; | ||
| 983 | |||
| 984 | if (!vmi_rom) | ||
| 985 | return; | ||
| 986 | |||
| 987 | local_irq_save(flags); | ||
| 988 | activate_vmi(); | ||
| 983 | local_irq_restore(flags & X86_EFLAGS_IF); | 989 | local_irq_restore(flags & X86_EFLAGS_IF); |
| 984 | } | 990 | } |
| 985 | 991 | ||
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index f1983d9477cd..410ddbc1aa2e 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c | |||
| @@ -1038,13 +1038,13 @@ static int kvm_sync_page(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp) | |||
| 1038 | } | 1038 | } |
| 1039 | 1039 | ||
| 1040 | rmap_write_protect(vcpu->kvm, sp->gfn); | 1040 | rmap_write_protect(vcpu->kvm, sp->gfn); |
| 1041 | kvm_unlink_unsync_page(vcpu->kvm, sp); | ||
| 1041 | if (vcpu->arch.mmu.sync_page(vcpu, sp)) { | 1042 | if (vcpu->arch.mmu.sync_page(vcpu, sp)) { |
| 1042 | kvm_mmu_zap_page(vcpu->kvm, sp); | 1043 | kvm_mmu_zap_page(vcpu->kvm, sp); |
| 1043 | return 1; | 1044 | return 1; |
| 1044 | } | 1045 | } |
| 1045 | 1046 | ||
| 1046 | kvm_mmu_flush_tlb(vcpu); | 1047 | kvm_mmu_flush_tlb(vcpu); |
| 1047 | kvm_unlink_unsync_page(vcpu->kvm, sp); | ||
| 1048 | return 0; | 1048 | return 0; |
| 1049 | } | 1049 | } |
| 1050 | 1050 | ||
diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h index 613ec9aa674a..84eee43bbe74 100644 --- a/arch/x86/kvm/paging_tmpl.h +++ b/arch/x86/kvm/paging_tmpl.h | |||
| @@ -331,6 +331,7 @@ static int FNAME(shadow_walk_entry)(struct kvm_shadow_walk *_sw, | |||
| 331 | r = kvm_read_guest_atomic(vcpu->kvm, gw->pte_gpa[level - 2], | 331 | r = kvm_read_guest_atomic(vcpu->kvm, gw->pte_gpa[level - 2], |
| 332 | &curr_pte, sizeof(curr_pte)); | 332 | &curr_pte, sizeof(curr_pte)); |
| 333 | if (r || curr_pte != gw->ptes[level - 2]) { | 333 | if (r || curr_pte != gw->ptes[level - 2]) { |
| 334 | kvm_mmu_put_page(shadow_page, sptep); | ||
| 334 | kvm_release_pfn_clean(sw->pfn); | 335 | kvm_release_pfn_clean(sw->pfn); |
| 335 | sw->sptep = NULL; | 336 | sw->sptep = NULL; |
| 336 | return 1; | 337 | return 1; |
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index d06b4dc0e2ea..a4018b01e1f9 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c | |||
| @@ -3149,7 +3149,9 @@ static void vmx_intr_assist(struct kvm_vcpu *vcpu) | |||
| 3149 | 3149 | ||
| 3150 | if (cpu_has_virtual_nmis()) { | 3150 | if (cpu_has_virtual_nmis()) { |
| 3151 | if (vcpu->arch.nmi_pending && !vcpu->arch.nmi_injected) { | 3151 | if (vcpu->arch.nmi_pending && !vcpu->arch.nmi_injected) { |
| 3152 | if (vmx_nmi_enabled(vcpu)) { | 3152 | if (vcpu->arch.interrupt.pending) { |
| 3153 | enable_nmi_window(vcpu); | ||
| 3154 | } else if (vmx_nmi_enabled(vcpu)) { | ||
| 3153 | vcpu->arch.nmi_pending = false; | 3155 | vcpu->arch.nmi_pending = false; |
| 3154 | vcpu->arch.nmi_injected = true; | 3156 | vcpu->arch.nmi_injected = true; |
| 3155 | } else { | 3157 | } else { |
diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c index 022cd41ea9b4..202864ad49a7 100644 --- a/arch/x86/oprofile/nmi_int.c +++ b/arch/x86/oprofile/nmi_int.c | |||
| @@ -401,14 +401,13 @@ static int __init ppro_init(char **cpu_type) | |||
| 401 | *cpu_type = "i386/pii"; | 401 | *cpu_type = "i386/pii"; |
| 402 | break; | 402 | break; |
| 403 | case 6 ... 8: | 403 | case 6 ... 8: |
| 404 | case 10 ... 11: | ||
| 404 | *cpu_type = "i386/piii"; | 405 | *cpu_type = "i386/piii"; |
| 405 | break; | 406 | break; |
| 406 | case 9: | 407 | case 9: |
| 408 | case 13: | ||
| 407 | *cpu_type = "i386/p6_mobile"; | 409 | *cpu_type = "i386/p6_mobile"; |
| 408 | break; | 410 | break; |
| 409 | case 10 ... 13: | ||
| 410 | *cpu_type = "i386/p6"; | ||
| 411 | break; | ||
| 412 | case 14: | 411 | case 14: |
| 413 | *cpu_type = "i386/core"; | 412 | *cpu_type = "i386/core"; |
| 414 | break; | 413 | break; |
diff --git a/arch/x86/oprofile/op_model_ppro.c b/arch/x86/oprofile/op_model_ppro.c index 716d26f0e5d4..e9f80c744cf3 100644 --- a/arch/x86/oprofile/op_model_ppro.c +++ b/arch/x86/oprofile/op_model_ppro.c | |||
| @@ -156,6 +156,8 @@ static void ppro_start(struct op_msrs const * const msrs) | |||
| 156 | unsigned int low, high; | 156 | unsigned int low, high; |
| 157 | int i; | 157 | int i; |
| 158 | 158 | ||
| 159 | if (!reset_value) | ||
| 160 | return; | ||
| 159 | for (i = 0; i < num_counters; ++i) { | 161 | for (i = 0; i < num_counters; ++i) { |
| 160 | if (reset_value[i]) { | 162 | if (reset_value[i]) { |
| 161 | CTRL_READ(low, high, msrs, i); | 163 | CTRL_READ(low, high, msrs, i); |
| @@ -171,6 +173,8 @@ static void ppro_stop(struct op_msrs const * const msrs) | |||
| 171 | unsigned int low, high; | 173 | unsigned int low, high; |
| 172 | int i; | 174 | int i; |
| 173 | 175 | ||
| 176 | if (!reset_value) | ||
| 177 | return; | ||
| 174 | for (i = 0; i < num_counters; ++i) { | 178 | for (i = 0; i < num_counters; ++i) { |
| 175 | if (!reset_value[i]) | 179 | if (!reset_value[i]) |
| 176 | continue; | 180 | continue; |
diff --git a/block/blk-barrier.c b/block/blk-barrier.c index 5c99ff8d2db8..6e72d661ae42 100644 --- a/block/blk-barrier.c +++ b/block/blk-barrier.c | |||
| @@ -161,7 +161,7 @@ static inline struct request *start_ordered(struct request_queue *q, | |||
| 161 | /* | 161 | /* |
| 162 | * Prep proxy barrier request. | 162 | * Prep proxy barrier request. |
| 163 | */ | 163 | */ |
| 164 | blkdev_dequeue_request(rq); | 164 | elv_dequeue_request(q, rq); |
| 165 | q->orig_bar_rq = rq; | 165 | q->orig_bar_rq = rq; |
| 166 | rq = &q->bar_rq; | 166 | rq = &q->bar_rq; |
| 167 | blk_rq_init(q, rq); | 167 | blk_rq_init(q, rq); |
| @@ -219,7 +219,7 @@ int blk_do_ordered(struct request_queue *q, struct request **rqp) | |||
| 219 | * This can happen when the queue switches to | 219 | * This can happen when the queue switches to |
| 220 | * ORDERED_NONE while this request is on it. | 220 | * ORDERED_NONE while this request is on it. |
| 221 | */ | 221 | */ |
| 222 | blkdev_dequeue_request(rq); | 222 | elv_dequeue_request(q, rq); |
| 223 | if (__blk_end_request(rq, -EOPNOTSUPP, | 223 | if (__blk_end_request(rq, -EOPNOTSUPP, |
| 224 | blk_rq_bytes(rq))) | 224 | blk_rq_bytes(rq))) |
| 225 | BUG(); | 225 | BUG(); |
diff --git a/block/blk-core.c b/block/blk-core.c index 10e8a64a5a5b..c36aa98fafa3 100644 --- a/block/blk-core.c +++ b/block/blk-core.c | |||
| @@ -592,7 +592,7 @@ blk_init_queue_node(request_fn_proc *rfn, spinlock_t *lock, int node_id) | |||
| 592 | 1 << QUEUE_FLAG_STACKABLE); | 592 | 1 << QUEUE_FLAG_STACKABLE); |
| 593 | q->queue_lock = lock; | 593 | q->queue_lock = lock; |
| 594 | 594 | ||
| 595 | blk_queue_segment_boundary(q, 0xffffffff); | 595 | blk_queue_segment_boundary(q, BLK_SEG_BOUNDARY_MASK); |
| 596 | 596 | ||
| 597 | blk_queue_make_request(q, __make_request); | 597 | blk_queue_make_request(q, __make_request); |
| 598 | blk_queue_max_segment_size(q, MAX_SEGMENT_SIZE); | 598 | blk_queue_max_segment_size(q, MAX_SEGMENT_SIZE); |
| @@ -1637,6 +1637,28 @@ int blk_insert_cloned_request(struct request_queue *q, struct request *rq) | |||
| 1637 | EXPORT_SYMBOL_GPL(blk_insert_cloned_request); | 1637 | EXPORT_SYMBOL_GPL(blk_insert_cloned_request); |
| 1638 | 1638 | ||
| 1639 | /** | 1639 | /** |
| 1640 | * blkdev_dequeue_request - dequeue request and start timeout timer | ||
| 1641 | * @req: request to dequeue | ||
| 1642 | * | ||
| 1643 | * Dequeue @req and start timeout timer on it. This hands off the | ||
| 1644 | * request to the driver. | ||
| 1645 | * | ||
| 1646 | * Block internal functions which don't want to start timer should | ||
| 1647 | * call elv_dequeue_request(). | ||
| 1648 | */ | ||
| 1649 | void blkdev_dequeue_request(struct request *req) | ||
| 1650 | { | ||
| 1651 | elv_dequeue_request(req->q, req); | ||
| 1652 | |||
| 1653 | /* | ||
| 1654 | * We are now handing the request to the hardware, add the | ||
| 1655 | * timeout handler. | ||
| 1656 | */ | ||
| 1657 | blk_add_timer(req); | ||
| 1658 | } | ||
| 1659 | EXPORT_SYMBOL(blkdev_dequeue_request); | ||
| 1660 | |||
| 1661 | /** | ||
| 1640 | * __end_that_request_first - end I/O on a request | 1662 | * __end_that_request_first - end I/O on a request |
| 1641 | * @req: the request being processed | 1663 | * @req: the request being processed |
| 1642 | * @error: %0 for success, < %0 for error | 1664 | * @error: %0 for success, < %0 for error |
| @@ -1774,7 +1796,7 @@ static void end_that_request_last(struct request *req, int error) | |||
| 1774 | blk_queue_end_tag(req->q, req); | 1796 | blk_queue_end_tag(req->q, req); |
| 1775 | 1797 | ||
| 1776 | if (blk_queued_rq(req)) | 1798 | if (blk_queued_rq(req)) |
| 1777 | blkdev_dequeue_request(req); | 1799 | elv_dequeue_request(req->q, req); |
| 1778 | 1800 | ||
| 1779 | if (unlikely(laptop_mode) && blk_fs_request(req)) | 1801 | if (unlikely(laptop_mode) && blk_fs_request(req)) |
| 1780 | laptop_io_completion(); | 1802 | laptop_io_completion(); |
diff --git a/block/blk-map.c b/block/blk-map.c index 0f4b4b881811..2990447f45e9 100644 --- a/block/blk-map.c +++ b/block/blk-map.c | |||
| @@ -224,7 +224,7 @@ int blk_rq_map_user_iov(struct request_queue *q, struct request *rq, | |||
| 224 | */ | 224 | */ |
| 225 | bio_get(bio); | 225 | bio_get(bio); |
| 226 | bio_endio(bio, 0); | 226 | bio_endio(bio, 0); |
| 227 | bio_unmap_user(bio); | 227 | __blk_rq_unmap_user(bio); |
| 228 | return -EINVAL; | 228 | return -EINVAL; |
| 229 | } | 229 | } |
| 230 | 230 | ||
diff --git a/block/blk-settings.c b/block/blk-settings.c index 41392fbe19ff..afa55e14e278 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c | |||
| @@ -125,6 +125,9 @@ void blk_queue_make_request(struct request_queue *q, make_request_fn *mfn) | |||
| 125 | q->nr_requests = BLKDEV_MAX_RQ; | 125 | q->nr_requests = BLKDEV_MAX_RQ; |
| 126 | blk_queue_max_phys_segments(q, MAX_PHYS_SEGMENTS); | 126 | blk_queue_max_phys_segments(q, MAX_PHYS_SEGMENTS); |
| 127 | blk_queue_max_hw_segments(q, MAX_HW_SEGMENTS); | 127 | blk_queue_max_hw_segments(q, MAX_HW_SEGMENTS); |
| 128 | blk_queue_segment_boundary(q, BLK_SEG_BOUNDARY_MASK); | ||
| 129 | blk_queue_max_segment_size(q, MAX_SEGMENT_SIZE); | ||
| 130 | |||
| 128 | q->make_request_fn = mfn; | 131 | q->make_request_fn = mfn; |
| 129 | q->backing_dev_info.ra_pages = | 132 | q->backing_dev_info.ra_pages = |
| 130 | (VM_MAX_READAHEAD * 1024) / PAGE_CACHE_SIZE; | 133 | (VM_MAX_READAHEAD * 1024) / PAGE_CACHE_SIZE; |
| @@ -314,6 +317,7 @@ void blk_queue_stack_limits(struct request_queue *t, struct request_queue *b) | |||
| 314 | /* zero is "infinity" */ | 317 | /* zero is "infinity" */ |
| 315 | t->max_sectors = min_not_zero(t->max_sectors, b->max_sectors); | 318 | t->max_sectors = min_not_zero(t->max_sectors, b->max_sectors); |
| 316 | t->max_hw_sectors = min_not_zero(t->max_hw_sectors, b->max_hw_sectors); | 319 | t->max_hw_sectors = min_not_zero(t->max_hw_sectors, b->max_hw_sectors); |
| 320 | t->seg_boundary_mask = min_not_zero(t->seg_boundary_mask, b->seg_boundary_mask); | ||
| 317 | 321 | ||
| 318 | t->max_phys_segments = min(t->max_phys_segments, b->max_phys_segments); | 322 | t->max_phys_segments = min(t->max_phys_segments, b->max_phys_segments); |
| 319 | t->max_hw_segments = min(t->max_hw_segments, b->max_hw_segments); | 323 | t->max_hw_segments = min(t->max_hw_segments, b->max_hw_segments); |
diff --git a/block/bsg.c b/block/bsg.c index e8bd2475682a..e73e50daf3d0 100644 --- a/block/bsg.c +++ b/block/bsg.c | |||
| @@ -202,6 +202,8 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq, | |||
| 202 | rq->timeout = q->sg_timeout; | 202 | rq->timeout = q->sg_timeout; |
| 203 | if (!rq->timeout) | 203 | if (!rq->timeout) |
| 204 | rq->timeout = BLK_DEFAULT_SG_TIMEOUT; | 204 | rq->timeout = BLK_DEFAULT_SG_TIMEOUT; |
| 205 | if (rq->timeout < BLK_MIN_SG_TIMEOUT) | ||
| 206 | rq->timeout = BLK_MIN_SG_TIMEOUT; | ||
| 205 | 207 | ||
| 206 | return 0; | 208 | return 0; |
| 207 | } | 209 | } |
diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c index 3d3e7a46f38c..67eb93cff699 100644 --- a/block/compat_ioctl.c +++ b/block/compat_ioctl.c | |||
| @@ -677,6 +677,29 @@ static int compat_blkdev_driver_ioctl(struct block_device *bdev, fmode_t mode, | |||
| 677 | case DVD_WRITE_STRUCT: | 677 | case DVD_WRITE_STRUCT: |
| 678 | case DVD_AUTH: | 678 | case DVD_AUTH: |
| 679 | arg = (unsigned long)compat_ptr(arg); | 679 | arg = (unsigned long)compat_ptr(arg); |
| 680 | /* These intepret arg as an unsigned long, not as a pointer, | ||
| 681 | * so we must not do compat_ptr() conversion. */ | ||
| 682 | case HDIO_SET_MULTCOUNT: | ||
| 683 | case HDIO_SET_UNMASKINTR: | ||
| 684 | case HDIO_SET_KEEPSETTINGS: | ||
| 685 | case HDIO_SET_32BIT: | ||
| 686 | case HDIO_SET_NOWERR: | ||
| 687 | case HDIO_SET_DMA: | ||
| 688 | case HDIO_SET_PIO_MODE: | ||
| 689 | case HDIO_SET_NICE: | ||
| 690 | case HDIO_SET_WCACHE: | ||
| 691 | case HDIO_SET_ACOUSTIC: | ||
| 692 | case HDIO_SET_BUSSTATE: | ||
| 693 | case HDIO_SET_ADDRESS: | ||
| 694 | case CDROMEJECT_SW: | ||
| 695 | case CDROM_SET_OPTIONS: | ||
| 696 | case CDROM_CLEAR_OPTIONS: | ||
| 697 | case CDROM_SELECT_SPEED: | ||
| 698 | case CDROM_SELECT_DISC: | ||
| 699 | case CDROM_MEDIA_CHANGED: | ||
| 700 | case CDROM_DRIVE_STATUS: | ||
| 701 | case CDROM_LOCKDOOR: | ||
| 702 | case CDROM_DEBUG: | ||
| 680 | break; | 703 | break; |
| 681 | default: | 704 | default: |
| 682 | /* unknown ioctl number */ | 705 | /* unknown ioctl number */ |
| @@ -699,8 +722,14 @@ long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg) | |||
| 699 | struct backing_dev_info *bdi; | 722 | struct backing_dev_info *bdi; |
| 700 | loff_t size; | 723 | loff_t size; |
| 701 | 724 | ||
| 725 | /* | ||
| 726 | * O_NDELAY can be altered using fcntl(.., F_SETFL, ..), so we have | ||
| 727 | * to updated it before every ioctl. | ||
| 728 | */ | ||
| 702 | if (file->f_flags & O_NDELAY) | 729 | if (file->f_flags & O_NDELAY) |
| 703 | mode |= FMODE_NDELAY_NOW; | 730 | mode |= FMODE_NDELAY; |
| 731 | else | ||
| 732 | mode &= ~FMODE_NDELAY; | ||
| 704 | 733 | ||
| 705 | switch (cmd) { | 734 | switch (cmd) { |
| 706 | case HDIO_GETGEO: | 735 | case HDIO_GETGEO: |
diff --git a/block/elevator.c b/block/elevator.c index 9ac82dde99dd..a6951f76ba0c 100644 --- a/block/elevator.c +++ b/block/elevator.c | |||
| @@ -844,14 +844,7 @@ void elv_dequeue_request(struct request_queue *q, struct request *rq) | |||
| 844 | */ | 844 | */ |
| 845 | if (blk_account_rq(rq)) | 845 | if (blk_account_rq(rq)) |
| 846 | q->in_flight++; | 846 | q->in_flight++; |
| 847 | |||
| 848 | /* | ||
| 849 | * We are now handing the request to the hardware, add the | ||
| 850 | * timeout handler. | ||
| 851 | */ | ||
| 852 | blk_add_timer(rq); | ||
| 853 | } | 847 | } |
| 854 | EXPORT_SYMBOL(elv_dequeue_request); | ||
| 855 | 848 | ||
| 856 | int elv_queue_empty(struct request_queue *q) | 849 | int elv_queue_empty(struct request_queue *q) |
| 857 | { | 850 | { |
diff --git a/block/genhd.c b/block/genhd.c index 27549e470da5..2f7feda61e35 100644 --- a/block/genhd.c +++ b/block/genhd.c | |||
| @@ -1102,6 +1102,7 @@ struct gendisk *alloc_disk_node(int minors, int node_id) | |||
| 1102 | kfree(disk); | 1102 | kfree(disk); |
| 1103 | return NULL; | 1103 | return NULL; |
| 1104 | } | 1104 | } |
| 1105 | disk->node_id = node_id; | ||
| 1105 | if (disk_expand_part_tbl(disk, 0)) { | 1106 | if (disk_expand_part_tbl(disk, 0)) { |
| 1106 | free_part_stats(&disk->part0); | 1107 | free_part_stats(&disk->part0); |
| 1107 | kfree(disk); | 1108 | kfree(disk); |
| @@ -1116,7 +1117,6 @@ struct gendisk *alloc_disk_node(int minors, int node_id) | |||
| 1116 | device_initialize(disk_to_dev(disk)); | 1117 | device_initialize(disk_to_dev(disk)); |
| 1117 | INIT_WORK(&disk->async_notify, | 1118 | INIT_WORK(&disk->async_notify, |
| 1118 | media_change_notify_thread); | 1119 | media_change_notify_thread); |
| 1119 | disk->node_id = node_id; | ||
| 1120 | } | 1120 | } |
| 1121 | return disk; | 1121 | return disk; |
| 1122 | } | 1122 | } |
diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c index 5963cf91a3a0..d0bb92cbefb9 100644 --- a/block/scsi_ioctl.c +++ b/block/scsi_ioctl.c | |||
| @@ -208,6 +208,8 @@ static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq, | |||
| 208 | rq->timeout = q->sg_timeout; | 208 | rq->timeout = q->sg_timeout; |
| 209 | if (!rq->timeout) | 209 | if (!rq->timeout) |
| 210 | rq->timeout = BLK_DEFAULT_SG_TIMEOUT; | 210 | rq->timeout = BLK_DEFAULT_SG_TIMEOUT; |
| 211 | if (rq->timeout < BLK_MIN_SG_TIMEOUT) | ||
| 212 | rq->timeout = BLK_MIN_SG_TIMEOUT; | ||
| 211 | 213 | ||
| 212 | return 0; | 214 | return 0; |
| 213 | } | 215 | } |
diff --git a/crypto/Kconfig b/crypto/Kconfig index 39dbd8e4dde1..dc20a34ba5ef 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig | |||
| @@ -31,35 +31,63 @@ config CRYPTO_FIPS | |||
| 31 | 31 | ||
| 32 | config CRYPTO_ALGAPI | 32 | config CRYPTO_ALGAPI |
| 33 | tristate | 33 | tristate |
| 34 | select CRYPTO_ALGAPI2 | ||
| 34 | help | 35 | help |
| 35 | This option provides the API for cryptographic algorithms. | 36 | This option provides the API for cryptographic algorithms. |
| 36 | 37 | ||
| 38 | config CRYPTO_ALGAPI2 | ||
| 39 | tristate | ||
| 40 | |||
| 37 | config CRYPTO_AEAD | 41 | config CRYPTO_AEAD |
| 38 | tristate | 42 | tristate |
| 43 | select CRYPTO_AEAD2 | ||
| 39 | select CRYPTO_ALGAPI | 44 | select CRYPTO_ALGAPI |
| 40 | 45 | ||
| 46 | config CRYPTO_AEAD2 | ||
| 47 | tristate | ||
| 48 | select CRYPTO_ALGAPI2 | ||
| 49 | |||
| 41 | config CRYPTO_BLKCIPHER | 50 | config CRYPTO_BLKCIPHER |
| 42 | tristate | 51 | tristate |
| 52 | select CRYPTO_BLKCIPHER2 | ||
| 43 | select CRYPTO_ALGAPI | 53 | select CRYPTO_ALGAPI |
| 44 | select CRYPTO_RNG | 54 | |
| 55 | config CRYPTO_BLKCIPHER2 | ||
| 56 | tristate | ||
| 57 | select CRYPTO_ALGAPI2 | ||
| 58 | select CRYPTO_RNG2 | ||
| 45 | 59 | ||
| 46 | config CRYPTO_HASH | 60 | config CRYPTO_HASH |
| 47 | tristate | 61 | tristate |
| 62 | select CRYPTO_HASH2 | ||
| 48 | select CRYPTO_ALGAPI | 63 | select CRYPTO_ALGAPI |
| 49 | 64 | ||
| 65 | config CRYPTO_HASH2 | ||
| 66 | tristate | ||
| 67 | select CRYPTO_ALGAPI2 | ||
| 68 | |||
| 50 | config CRYPTO_RNG | 69 | config CRYPTO_RNG |
| 51 | tristate | 70 | tristate |
| 71 | select CRYPTO_RNG2 | ||
| 52 | select CRYPTO_ALGAPI | 72 | select CRYPTO_ALGAPI |
| 53 | 73 | ||
| 74 | config CRYPTO_RNG2 | ||
| 75 | tristate | ||
| 76 | select CRYPTO_ALGAPI2 | ||
| 77 | |||
| 54 | config CRYPTO_MANAGER | 78 | config CRYPTO_MANAGER |
| 55 | tristate "Cryptographic algorithm manager" | 79 | tristate "Cryptographic algorithm manager" |
| 56 | select CRYPTO_AEAD | 80 | select CRYPTO_MANAGER2 |
| 57 | select CRYPTO_HASH | ||
| 58 | select CRYPTO_BLKCIPHER | ||
| 59 | help | 81 | help |
| 60 | Create default cryptographic template instantiations such as | 82 | Create default cryptographic template instantiations such as |
| 61 | cbc(aes). | 83 | cbc(aes). |
| 62 | 84 | ||
| 85 | config CRYPTO_MANAGER2 | ||
| 86 | def_tristate CRYPTO_MANAGER || (CRYPTO_MANAGER!=n && CRYPTO_ALGAPI=y) | ||
| 87 | select CRYPTO_AEAD2 | ||
| 88 | select CRYPTO_HASH2 | ||
| 89 | select CRYPTO_BLKCIPHER2 | ||
| 90 | |||
| 63 | config CRYPTO_GF128MUL | 91 | config CRYPTO_GF128MUL |
| 64 | tristate "GF(2^128) multiplication functions (EXPERIMENTAL)" | 92 | tristate "GF(2^128) multiplication functions (EXPERIMENTAL)" |
| 65 | depends on EXPERIMENTAL | 93 | depends on EXPERIMENTAL |
diff --git a/crypto/Makefile b/crypto/Makefile index 5862b807334e..cd4a4ed078ff 100644 --- a/crypto/Makefile +++ b/crypto/Makefile | |||
| @@ -9,24 +9,24 @@ obj-$(CONFIG_CRYPTO_FIPS) += fips.o | |||
| 9 | 9 | ||
| 10 | crypto_algapi-$(CONFIG_PROC_FS) += proc.o | 10 | crypto_algapi-$(CONFIG_PROC_FS) += proc.o |
| 11 | crypto_algapi-objs := algapi.o scatterwalk.o $(crypto_algapi-y) | 11 | crypto_algapi-objs := algapi.o scatterwalk.o $(crypto_algapi-y) |
| 12 | obj-$(CONFIG_CRYPTO_ALGAPI) += crypto_algapi.o | 12 | obj-$(CONFIG_CRYPTO_ALGAPI2) += crypto_algapi.o |
| 13 | 13 | ||
| 14 | obj-$(CONFIG_CRYPTO_AEAD) += aead.o | 14 | obj-$(CONFIG_CRYPTO_AEAD2) += aead.o |
| 15 | 15 | ||
| 16 | crypto_blkcipher-objs := ablkcipher.o | 16 | crypto_blkcipher-objs := ablkcipher.o |
| 17 | crypto_blkcipher-objs += blkcipher.o | 17 | crypto_blkcipher-objs += blkcipher.o |
| 18 | obj-$(CONFIG_CRYPTO_BLKCIPHER) += crypto_blkcipher.o | 18 | obj-$(CONFIG_CRYPTO_BLKCIPHER2) += crypto_blkcipher.o |
| 19 | obj-$(CONFIG_CRYPTO_BLKCIPHER) += chainiv.o | 19 | obj-$(CONFIG_CRYPTO_BLKCIPHER2) += chainiv.o |
| 20 | obj-$(CONFIG_CRYPTO_BLKCIPHER) += eseqiv.o | 20 | obj-$(CONFIG_CRYPTO_BLKCIPHER2) += eseqiv.o |
| 21 | obj-$(CONFIG_CRYPTO_SEQIV) += seqiv.o | 21 | obj-$(CONFIG_CRYPTO_SEQIV) += seqiv.o |
| 22 | 22 | ||
| 23 | crypto_hash-objs := hash.o | 23 | crypto_hash-objs := hash.o |
| 24 | crypto_hash-objs += ahash.o | 24 | crypto_hash-objs += ahash.o |
| 25 | obj-$(CONFIG_CRYPTO_HASH) += crypto_hash.o | 25 | obj-$(CONFIG_CRYPTO_HASH2) += crypto_hash.o |
| 26 | 26 | ||
| 27 | cryptomgr-objs := algboss.o testmgr.o | 27 | cryptomgr-objs := algboss.o testmgr.o |
| 28 | 28 | ||
| 29 | obj-$(CONFIG_CRYPTO_MANAGER) += cryptomgr.o | 29 | obj-$(CONFIG_CRYPTO_MANAGER2) += cryptomgr.o |
| 30 | obj-$(CONFIG_CRYPTO_HMAC) += hmac.o | 30 | obj-$(CONFIG_CRYPTO_HMAC) += hmac.o |
| 31 | obj-$(CONFIG_CRYPTO_XCBC) += xcbc.o | 31 | obj-$(CONFIG_CRYPTO_XCBC) += xcbc.o |
| 32 | obj-$(CONFIG_CRYPTO_NULL) += crypto_null.o | 32 | obj-$(CONFIG_CRYPTO_NULL) += crypto_null.o |
| @@ -73,8 +73,8 @@ obj-$(CONFIG_CRYPTO_MICHAEL_MIC) += michael_mic.o | |||
| 73 | obj-$(CONFIG_CRYPTO_CRC32C) += crc32c.o | 73 | obj-$(CONFIG_CRYPTO_CRC32C) += crc32c.o |
| 74 | obj-$(CONFIG_CRYPTO_AUTHENC) += authenc.o | 74 | obj-$(CONFIG_CRYPTO_AUTHENC) += authenc.o |
| 75 | obj-$(CONFIG_CRYPTO_LZO) += lzo.o | 75 | obj-$(CONFIG_CRYPTO_LZO) += lzo.o |
| 76 | obj-$(CONFIG_CRYPTO_RNG) += rng.o | 76 | obj-$(CONFIG_CRYPTO_RNG2) += rng.o |
| 77 | obj-$(CONFIG_CRYPTO_RNG) += krng.o | 77 | obj-$(CONFIG_CRYPTO_RNG2) += krng.o |
| 78 | obj-$(CONFIG_CRYPTO_ANSI_CPRNG) += ansi_cprng.o | 78 | obj-$(CONFIG_CRYPTO_ANSI_CPRNG) += ansi_cprng.o |
| 79 | obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o | 79 | obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o |
| 80 | 80 | ||
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index a0a178dd189c..1423b0c0cd2e 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c | |||
| @@ -174,15 +174,6 @@ static int acpi_battery_get_property(struct power_supply *psy, | |||
| 174 | break; | 174 | break; |
| 175 | case POWER_SUPPLY_PROP_CURRENT_NOW: | 175 | case POWER_SUPPLY_PROP_CURRENT_NOW: |
| 176 | val->intval = battery->current_now * 1000; | 176 | val->intval = battery->current_now * 1000; |
| 177 | /* if power units are mW, convert to mA by | ||
| 178 | dividing by current voltage (mV/1000) */ | ||
| 179 | if (!battery->power_unit) { | ||
| 180 | if (battery->voltage_now) { | ||
| 181 | val->intval /= battery->voltage_now; | ||
| 182 | val->intval *= 1000; | ||
| 183 | } else | ||
| 184 | val->intval = -1; | ||
| 185 | } | ||
| 186 | break; | 177 | break; |
| 187 | case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN: | 178 | case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN: |
| 188 | case POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN: | 179 | case POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN: |
diff --git a/drivers/acpi/toshiba_acpi.c b/drivers/acpi/toshiba_acpi.c index 25f531d892de..40e60fc2e596 100644 --- a/drivers/acpi/toshiba_acpi.c +++ b/drivers/acpi/toshiba_acpi.c | |||
| @@ -824,32 +824,36 @@ static int __init toshiba_acpi_init(void) | |||
| 824 | toshiba_acpi_exit(); | 824 | toshiba_acpi_exit(); |
| 825 | return -ENOMEM; | 825 | return -ENOMEM; |
| 826 | } | 826 | } |
| 827 | } | ||
| 828 | 827 | ||
| 829 | /* Register input device for kill switch */ | 828 | /* Register input device for kill switch */ |
| 830 | toshiba_acpi.poll_dev = input_allocate_polled_device(); | 829 | toshiba_acpi.poll_dev = input_allocate_polled_device(); |
| 831 | if (!toshiba_acpi.poll_dev) { | 830 | if (!toshiba_acpi.poll_dev) { |
| 832 | printk(MY_ERR "unable to allocate kill-switch input device\n"); | 831 | printk(MY_ERR |
| 833 | toshiba_acpi_exit(); | 832 | "unable to allocate kill-switch input device\n"); |
| 834 | return -ENOMEM; | 833 | toshiba_acpi_exit(); |
| 835 | } | 834 | return -ENOMEM; |
| 836 | toshiba_acpi.poll_dev->private = &toshiba_acpi; | 835 | } |
| 837 | toshiba_acpi.poll_dev->poll = bt_poll_rfkill; | 836 | toshiba_acpi.poll_dev->private = &toshiba_acpi; |
| 838 | toshiba_acpi.poll_dev->poll_interval = 1000; /* msecs */ | 837 | toshiba_acpi.poll_dev->poll = bt_poll_rfkill; |
| 839 | 838 | toshiba_acpi.poll_dev->poll_interval = 1000; /* msecs */ | |
| 840 | toshiba_acpi.poll_dev->input->name = toshiba_acpi.rfk_name; | 839 | |
| 841 | toshiba_acpi.poll_dev->input->id.bustype = BUS_HOST; | 840 | toshiba_acpi.poll_dev->input->name = toshiba_acpi.rfk_name; |
| 842 | toshiba_acpi.poll_dev->input->id.vendor = 0x0930; /* Toshiba USB ID */ | 841 | toshiba_acpi.poll_dev->input->id.bustype = BUS_HOST; |
| 843 | set_bit(EV_SW, toshiba_acpi.poll_dev->input->evbit); | 842 | /* Toshiba USB ID */ |
| 844 | set_bit(SW_RFKILL_ALL, toshiba_acpi.poll_dev->input->swbit); | 843 | toshiba_acpi.poll_dev->input->id.vendor = 0x0930; |
| 845 | input_report_switch(toshiba_acpi.poll_dev->input, SW_RFKILL_ALL, TRUE); | 844 | set_bit(EV_SW, toshiba_acpi.poll_dev->input->evbit); |
| 846 | input_sync(toshiba_acpi.poll_dev->input); | 845 | set_bit(SW_RFKILL_ALL, toshiba_acpi.poll_dev->input->swbit); |
| 847 | 846 | input_report_switch(toshiba_acpi.poll_dev->input, | |
| 848 | ret = input_register_polled_device(toshiba_acpi.poll_dev); | 847 | SW_RFKILL_ALL, TRUE); |
| 849 | if (ret) { | 848 | input_sync(toshiba_acpi.poll_dev->input); |
| 850 | printk(MY_ERR "unable to register kill-switch input device\n"); | 849 | |
| 851 | toshiba_acpi_exit(); | 850 | ret = input_register_polled_device(toshiba_acpi.poll_dev); |
| 852 | return ret; | 851 | if (ret) { |
| 852 | printk(MY_ERR | ||
| 853 | "unable to register kill-switch input device\n"); | ||
| 854 | toshiba_acpi_exit(); | ||
| 855 | return ret; | ||
| 856 | } | ||
| 853 | } | 857 | } |
| 854 | 858 | ||
| 855 | return 0; | 859 | return 0; |
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index 78fbec8ceda0..421b7c71e72d 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig | |||
| @@ -153,7 +153,7 @@ config SATA_PROMISE | |||
| 153 | If unsure, say N. | 153 | If unsure, say N. |
| 154 | 154 | ||
| 155 | config SATA_SX4 | 155 | config SATA_SX4 |
| 156 | tristate "Promise SATA SX4 support" | 156 | tristate "Promise SATA SX4 support (Experimental)" |
| 157 | depends on PCI && EXPERIMENTAL | 157 | depends on PCI && EXPERIMENTAL |
| 158 | help | 158 | help |
| 159 | This option enables support for Promise Serial ATA SX4. | 159 | This option enables support for Promise Serial ATA SX4. |
| @@ -219,8 +219,8 @@ config PATA_ACPI | |||
| 219 | otherwise unsupported hardware. | 219 | otherwise unsupported hardware. |
| 220 | 220 | ||
| 221 | config PATA_ALI | 221 | config PATA_ALI |
| 222 | tristate "ALi PATA support (Experimental)" | 222 | tristate "ALi PATA support" |
| 223 | depends on PCI && EXPERIMENTAL | 223 | depends on PCI |
| 224 | help | 224 | help |
| 225 | This option enables support for the ALi ATA interfaces | 225 | This option enables support for the ALi ATA interfaces |
| 226 | found on the many ALi chipsets. | 226 | found on the many ALi chipsets. |
| @@ -263,7 +263,7 @@ config PATA_ATIIXP | |||
| 263 | If unsure, say N. | 263 | If unsure, say N. |
| 264 | 264 | ||
| 265 | config PATA_CMD640_PCI | 265 | config PATA_CMD640_PCI |
| 266 | tristate "CMD640 PCI PATA support (Very Experimental)" | 266 | tristate "CMD640 PCI PATA support (Experimental)" |
| 267 | depends on PCI && EXPERIMENTAL | 267 | depends on PCI && EXPERIMENTAL |
| 268 | help | 268 | help |
| 269 | This option enables support for the CMD640 PCI IDE | 269 | This option enables support for the CMD640 PCI IDE |
| @@ -291,8 +291,8 @@ config PATA_CS5520 | |||
| 291 | If unsure, say N. | 291 | If unsure, say N. |
| 292 | 292 | ||
| 293 | config PATA_CS5530 | 293 | config PATA_CS5530 |
| 294 | tristate "CS5530 PATA support (Experimental)" | 294 | tristate "CS5530 PATA support" |
| 295 | depends on PCI && EXPERIMENTAL | 295 | depends on PCI |
| 296 | help | 296 | help |
| 297 | This option enables support for the Cyrix/NatSemi/AMD CS5530 | 297 | This option enables support for the Cyrix/NatSemi/AMD CS5530 |
| 298 | companion chip used with the MediaGX/Geode processor family. | 298 | companion chip used with the MediaGX/Geode processor family. |
| @@ -309,8 +309,8 @@ config PATA_CS5535 | |||
| 309 | If unsure, say N. | 309 | If unsure, say N. |
| 310 | 310 | ||
| 311 | config PATA_CS5536 | 311 | config PATA_CS5536 |
| 312 | tristate "CS5536 PATA support (Experimental)" | 312 | tristate "CS5536 PATA support" |
| 313 | depends on PCI && X86 && !X86_64 && EXPERIMENTAL | 313 | depends on PCI && X86 && !X86_64 |
| 314 | help | 314 | help |
| 315 | This option enables support for the AMD CS5536 | 315 | This option enables support for the AMD CS5536 |
| 316 | companion chip used with the Geode LX processor family. | 316 | companion chip used with the Geode LX processor family. |
| @@ -363,7 +363,7 @@ config PATA_HPT37X | |||
| 363 | If unsure, say N. | 363 | If unsure, say N. |
| 364 | 364 | ||
| 365 | config PATA_HPT3X2N | 365 | config PATA_HPT3X2N |
| 366 | tristate "HPT 372N/302N PATA support (Very Experimental)" | 366 | tristate "HPT 372N/302N PATA support (Experimental)" |
| 367 | depends on PCI && EXPERIMENTAL | 367 | depends on PCI && EXPERIMENTAL |
| 368 | help | 368 | help |
| 369 | This option enables support for the N variant HPT PATA | 369 | This option enables support for the N variant HPT PATA |
| @@ -389,8 +389,8 @@ config PATA_HPT3X3_DMA | |||
| 389 | problems with DMA on this chipset. | 389 | problems with DMA on this chipset. |
| 390 | 390 | ||
| 391 | config PATA_ISAPNP | 391 | config PATA_ISAPNP |
| 392 | tristate "ISA Plug and Play PATA support (Experimental)" | 392 | tristate "ISA Plug and Play PATA support" |
| 393 | depends on EXPERIMENTAL && ISAPNP | 393 | depends on ISAPNP |
| 394 | help | 394 | help |
| 395 | This option enables support for ISA plug & play ATA | 395 | This option enables support for ISA plug & play ATA |
| 396 | controllers such as those found on old soundcards. | 396 | controllers such as those found on old soundcards. |
| @@ -498,8 +498,8 @@ config PATA_NINJA32 | |||
| 498 | If unsure, say N. | 498 | If unsure, say N. |
| 499 | 499 | ||
| 500 | config PATA_NS87410 | 500 | config PATA_NS87410 |
| 501 | tristate "Nat Semi NS87410 PATA support (Experimental)" | 501 | tristate "Nat Semi NS87410 PATA support" |
| 502 | depends on PCI && EXPERIMENTAL | 502 | depends on PCI |
| 503 | help | 503 | help |
| 504 | This option enables support for the National Semiconductor | 504 | This option enables support for the National Semiconductor |
| 505 | NS87410 PCI-IDE controller. | 505 | NS87410 PCI-IDE controller. |
| @@ -507,8 +507,8 @@ config PATA_NS87410 | |||
| 507 | If unsure, say N. | 507 | If unsure, say N. |
| 508 | 508 | ||
| 509 | config PATA_NS87415 | 509 | config PATA_NS87415 |
| 510 | tristate "Nat Semi NS87415 PATA support (Experimental)" | 510 | tristate "Nat Semi NS87415 PATA support" |
| 511 | depends on PCI && EXPERIMENTAL | 511 | depends on PCI |
| 512 | help | 512 | help |
| 513 | This option enables support for the National Semiconductor | 513 | This option enables support for the National Semiconductor |
| 514 | NS87415 PCI-IDE controller. | 514 | NS87415 PCI-IDE controller. |
| @@ -544,8 +544,8 @@ config PATA_PCMCIA | |||
| 544 | If unsure, say N. | 544 | If unsure, say N. |
| 545 | 545 | ||
| 546 | config PATA_PDC_OLD | 546 | config PATA_PDC_OLD |
| 547 | tristate "Older Promise PATA controller support (Experimental)" | 547 | tristate "Older Promise PATA controller support" |
| 548 | depends on PCI && EXPERIMENTAL | 548 | depends on PCI |
| 549 | help | 549 | help |
| 550 | This option enables support for the Promise 20246, 20262, 20263, | 550 | This option enables support for the Promise 20246, 20262, 20263, |
| 551 | 20265 and 20267 adapters. | 551 | 20265 and 20267 adapters. |
| @@ -559,7 +559,7 @@ config PATA_QDI | |||
| 559 | Support for QDI 6500 and 6580 PATA controllers on VESA local bus. | 559 | Support for QDI 6500 and 6580 PATA controllers on VESA local bus. |
| 560 | 560 | ||
| 561 | config PATA_RADISYS | 561 | config PATA_RADISYS |
| 562 | tristate "RADISYS 82600 PATA support (Very Experimental)" | 562 | tristate "RADISYS 82600 PATA support (Experimental)" |
| 563 | depends on PCI && EXPERIMENTAL | 563 | depends on PCI && EXPERIMENTAL |
| 564 | help | 564 | help |
| 565 | This option enables support for the RADISYS 82600 | 565 | This option enables support for the RADISYS 82600 |
| @@ -586,8 +586,8 @@ config PATA_RZ1000 | |||
| 586 | If unsure, say N. | 586 | If unsure, say N. |
| 587 | 587 | ||
| 588 | config PATA_SC1200 | 588 | config PATA_SC1200 |
| 589 | tristate "SC1200 PATA support (Very Experimental)" | 589 | tristate "SC1200 PATA support" |
| 590 | depends on PCI && EXPERIMENTAL | 590 | depends on PCI |
| 591 | help | 591 | help |
| 592 | This option enables support for the NatSemi/AMD SC1200 SoC | 592 | This option enables support for the NatSemi/AMD SC1200 SoC |
| 593 | companion chip used with the Geode processor family. | 593 | companion chip used with the Geode processor family. |
| @@ -620,8 +620,8 @@ config PATA_SIL680 | |||
| 620 | If unsure, say N. | 620 | If unsure, say N. |
| 621 | 621 | ||
| 622 | config PATA_SIS | 622 | config PATA_SIS |
| 623 | tristate "SiS PATA support (Experimental)" | 623 | tristate "SiS PATA support" |
| 624 | depends on PCI && EXPERIMENTAL | 624 | depends on PCI |
| 625 | help | 625 | help |
| 626 | This option enables support for SiS PATA controllers | 626 | This option enables support for SiS PATA controllers |
| 627 | 627 | ||
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c index d6d97d8f3fa4..c11936e13dd3 100644 --- a/drivers/ata/ata_piix.c +++ b/drivers/ata/ata_piix.c | |||
| @@ -1072,7 +1072,14 @@ static int piix_broken_suspend(void) | |||
| 1072 | * matching is necessary because dmi_system_id.matches is | 1072 | * matching is necessary because dmi_system_id.matches is |
| 1073 | * limited to four entries. | 1073 | * limited to four entries. |
| 1074 | */ | 1074 | */ |
| 1075 | if (!strcmp(dmi_get_system_info(DMI_SYS_VENDOR), "TOSHIBA") && | 1075 | if (dmi_get_system_info(DMI_SYS_VENDOR) && |
| 1076 | dmi_get_system_info(DMI_PRODUCT_NAME) && | ||
| 1077 | dmi_get_system_info(DMI_PRODUCT_VERSION) && | ||
| 1078 | dmi_get_system_info(DMI_PRODUCT_SERIAL) && | ||
| 1079 | dmi_get_system_info(DMI_BOARD_VENDOR) && | ||
| 1080 | dmi_get_system_info(DMI_BOARD_NAME) && | ||
| 1081 | dmi_get_system_info(DMI_BOARD_VERSION) && | ||
| 1082 | !strcmp(dmi_get_system_info(DMI_SYS_VENDOR), "TOSHIBA") && | ||
| 1076 | !strcmp(dmi_get_system_info(DMI_PRODUCT_NAME), "000000") && | 1083 | !strcmp(dmi_get_system_info(DMI_PRODUCT_NAME), "000000") && |
| 1077 | !strcmp(dmi_get_system_info(DMI_PRODUCT_VERSION), "000000") && | 1084 | !strcmp(dmi_get_system_info(DMI_PRODUCT_VERSION), "000000") && |
| 1078 | !strcmp(dmi_get_system_info(DMI_PRODUCT_SERIAL), "000000") && | 1085 | !strcmp(dmi_get_system_info(DMI_PRODUCT_SERIAL), "000000") && |
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 5e2eb740df46..bc6695e3c848 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c | |||
| @@ -4050,17 +4050,70 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { | |||
| 4050 | { "ST3160023AS", "3.42", ATA_HORKAGE_NONCQ }, | 4050 | { "ST3160023AS", "3.42", ATA_HORKAGE_NONCQ }, |
| 4051 | 4051 | ||
| 4052 | /* Seagate NCQ + FLUSH CACHE firmware bug */ | 4052 | /* Seagate NCQ + FLUSH CACHE firmware bug */ |
| 4053 | { "ST31500341AS", "9JU138", ATA_HORKAGE_NONCQ | | 4053 | { "ST31500341AS", "SD15", ATA_HORKAGE_NONCQ | |
| 4054 | ATA_HORKAGE_FIRMWARE_WARN }, | 4054 | ATA_HORKAGE_FIRMWARE_WARN }, |
| 4055 | { "ST31000333AS", "9FZ136", ATA_HORKAGE_NONCQ | | 4055 | { "ST31500341AS", "SD16", ATA_HORKAGE_NONCQ | |
| 4056 | ATA_HORKAGE_FIRMWARE_WARN }, | 4056 | ATA_HORKAGE_FIRMWARE_WARN }, |
| 4057 | { "ST3640623AS", "9FZ164", ATA_HORKAGE_NONCQ | | 4057 | { "ST31500341AS", "SD17", ATA_HORKAGE_NONCQ | |
| 4058 | ATA_HORKAGE_FIRMWARE_WARN }, | 4058 | ATA_HORKAGE_FIRMWARE_WARN }, |
| 4059 | { "ST3640323AS", "9FZ134", ATA_HORKAGE_NONCQ | | 4059 | { "ST31500341AS", "SD18", ATA_HORKAGE_NONCQ | |
| 4060 | ATA_HORKAGE_FIRMWARE_WARN }, | 4060 | ATA_HORKAGE_FIRMWARE_WARN }, |
| 4061 | { "ST3320813AS", "9FZ182", ATA_HORKAGE_NONCQ | | 4061 | { "ST31500341AS", "SD19", ATA_HORKAGE_NONCQ | |
| 4062 | ATA_HORKAGE_FIRMWARE_WARN }, | 4062 | ATA_HORKAGE_FIRMWARE_WARN }, |
| 4063 | { "ST3320613AS", "9FZ162", ATA_HORKAGE_NONCQ | | 4063 | |
| 4064 | { "ST31000333AS", "SD15", ATA_HORKAGE_NONCQ | | ||
| 4065 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4066 | { "ST31000333AS", "SD16", ATA_HORKAGE_NONCQ | | ||
| 4067 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4068 | { "ST31000333AS", "SD17", ATA_HORKAGE_NONCQ | | ||
| 4069 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4070 | { "ST31000333AS", "SD18", ATA_HORKAGE_NONCQ | | ||
| 4071 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4072 | { "ST31000333AS", "SD19", ATA_HORKAGE_NONCQ | | ||
| 4073 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4074 | |||
| 4075 | { "ST3640623AS", "SD15", ATA_HORKAGE_NONCQ | | ||
| 4076 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4077 | { "ST3640623AS", "SD16", ATA_HORKAGE_NONCQ | | ||
| 4078 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4079 | { "ST3640623AS", "SD17", ATA_HORKAGE_NONCQ | | ||
| 4080 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4081 | { "ST3640623AS", "SD18", ATA_HORKAGE_NONCQ | | ||
| 4082 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4083 | { "ST3640623AS", "SD19", ATA_HORKAGE_NONCQ | | ||
| 4084 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4085 | |||
| 4086 | { "ST3640323AS", "SD15", ATA_HORKAGE_NONCQ | | ||
| 4087 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4088 | { "ST3640323AS", "SD16", ATA_HORKAGE_NONCQ | | ||
| 4089 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4090 | { "ST3640323AS", "SD17", ATA_HORKAGE_NONCQ | | ||
| 4091 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4092 | { "ST3640323AS", "SD18", ATA_HORKAGE_NONCQ | | ||
| 4093 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4094 | { "ST3640323AS", "SD19", ATA_HORKAGE_NONCQ | | ||
| 4095 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4096 | |||
| 4097 | { "ST3320813AS", "SD15", ATA_HORKAGE_NONCQ | | ||
| 4098 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4099 | { "ST3320813AS", "SD16", ATA_HORKAGE_NONCQ | | ||
| 4100 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4101 | { "ST3320813AS", "SD17", ATA_HORKAGE_NONCQ | | ||
| 4102 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4103 | { "ST3320813AS", "SD18", ATA_HORKAGE_NONCQ | | ||
| 4104 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4105 | { "ST3320813AS", "SD19", ATA_HORKAGE_NONCQ | | ||
| 4106 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4107 | |||
| 4108 | { "ST3320613AS", "SD15", ATA_HORKAGE_NONCQ | | ||
| 4109 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4110 | { "ST3320613AS", "SD16", ATA_HORKAGE_NONCQ | | ||
| 4111 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4112 | { "ST3320613AS", "SD17", ATA_HORKAGE_NONCQ | | ||
| 4113 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4114 | { "ST3320613AS", "SD18", ATA_HORKAGE_NONCQ | | ||
| 4115 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4116 | { "ST3320613AS", "SD19", ATA_HORKAGE_NONCQ | | ||
| 4064 | ATA_HORKAGE_FIRMWARE_WARN }, | 4117 | ATA_HORKAGE_FIRMWARE_WARN }, |
| 4065 | 4118 | ||
| 4066 | /* Blacklist entries taken from Silicon Image 3124/3132 | 4119 | /* Blacklist entries taken from Silicon Image 3124/3132 |
diff --git a/drivers/ata/pata_hpt366.c b/drivers/ata/pata_hpt366.c index f2b83eabc7c7..e0c4f05d7d57 100644 --- a/drivers/ata/pata_hpt366.c +++ b/drivers/ata/pata_hpt366.c | |||
| @@ -183,7 +183,9 @@ static unsigned long hpt366_filter(struct ata_device *adev, unsigned long mask) | |||
| 183 | mask &= ~(0xF8 << ATA_SHIFT_UDMA); | 183 | mask &= ~(0xF8 << ATA_SHIFT_UDMA); |
| 184 | if (hpt_dma_blacklisted(adev, "UDMA4", bad_ata66_4)) | 184 | if (hpt_dma_blacklisted(adev, "UDMA4", bad_ata66_4)) |
| 185 | mask &= ~(0xF0 << ATA_SHIFT_UDMA); | 185 | mask &= ~(0xF0 << ATA_SHIFT_UDMA); |
| 186 | } | 186 | } else if (adev->class == ATA_DEV_ATAPI) |
| 187 | mask &= ~(ATA_MASK_MWDMA | ATA_MASK_UDMA); | ||
| 188 | |||
| 187 | return ata_bmdma_mode_filter(adev, mask); | 189 | return ata_bmdma_mode_filter(adev, mask); |
| 188 | } | 190 | } |
| 189 | 191 | ||
| @@ -211,11 +213,15 @@ static u32 hpt36x_find_mode(struct ata_port *ap, int speed) | |||
| 211 | 213 | ||
| 212 | static int hpt36x_cable_detect(struct ata_port *ap) | 214 | static int hpt36x_cable_detect(struct ata_port *ap) |
| 213 | { | 215 | { |
| 214 | u8 ata66; | ||
| 215 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); | 216 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); |
| 217 | u8 ata66; | ||
| 216 | 218 | ||
| 219 | /* | ||
| 220 | * Each channel of pata_hpt366 occupies separate PCI function | ||
| 221 | * as the primary channel and bit1 indicates the cable type. | ||
| 222 | */ | ||
| 217 | pci_read_config_byte(pdev, 0x5A, &ata66); | 223 | pci_read_config_byte(pdev, 0x5A, &ata66); |
| 218 | if (ata66 & (1 << ap->port_no)) | 224 | if (ata66 & 2) |
| 219 | return ATA_CBL_PATA40; | 225 | return ATA_CBL_PATA40; |
| 220 | return ATA_CBL_PATA80; | 226 | return ATA_CBL_PATA80; |
| 221 | } | 227 | } |
| @@ -382,10 +388,10 @@ static int hpt36x_init_one(struct pci_dev *dev, const struct pci_device_id *id) | |||
| 382 | /* PCI clocking determines the ATA timing values to use */ | 388 | /* PCI clocking determines the ATA timing values to use */ |
| 383 | /* info_hpt366 is safe against re-entry so we can scribble on it */ | 389 | /* info_hpt366 is safe against re-entry so we can scribble on it */ |
| 384 | switch((reg1 & 0x700) >> 8) { | 390 | switch((reg1 & 0x700) >> 8) { |
| 385 | case 5: | 391 | case 9: |
| 386 | hpriv = &hpt366_40; | 392 | hpriv = &hpt366_40; |
| 387 | break; | 393 | break; |
| 388 | case 9: | 394 | case 5: |
| 389 | hpriv = &hpt366_25; | 395 | hpriv = &hpt366_25; |
| 390 | break; | 396 | break; |
| 391 | default: | 397 | default: |
diff --git a/drivers/ata/pata_ninja32.c b/drivers/ata/pata_ninja32.c index 4e466eae8b46..4dd9a3b031e4 100644 --- a/drivers/ata/pata_ninja32.c +++ b/drivers/ata/pata_ninja32.c | |||
| @@ -44,7 +44,7 @@ | |||
| 44 | #include <linux/libata.h> | 44 | #include <linux/libata.h> |
| 45 | 45 | ||
| 46 | #define DRV_NAME "pata_ninja32" | 46 | #define DRV_NAME "pata_ninja32" |
| 47 | #define DRV_VERSION "0.1.1" | 47 | #define DRV_VERSION "0.1.3" |
| 48 | 48 | ||
| 49 | 49 | ||
| 50 | /** | 50 | /** |
| @@ -130,7 +130,8 @@ static int ninja32_init_one(struct pci_dev *dev, const struct pci_device_id *id) | |||
| 130 | return rc; | 130 | return rc; |
| 131 | pci_set_master(dev); | 131 | pci_set_master(dev); |
| 132 | 132 | ||
| 133 | /* Set up the register mappings */ | 133 | /* Set up the register mappings. We use the I/O mapping as only the |
| 134 | older chips also have MMIO on BAR 1 */ | ||
| 134 | base = host->iomap[0]; | 135 | base = host->iomap[0]; |
| 135 | if (!base) | 136 | if (!base) |
| 136 | return -ENOMEM; | 137 | return -ENOMEM; |
| @@ -167,8 +168,12 @@ static int ninja32_reinit_one(struct pci_dev *pdev) | |||
| 167 | #endif | 168 | #endif |
| 168 | 169 | ||
| 169 | static const struct pci_device_id ninja32[] = { | 170 | static const struct pci_device_id ninja32[] = { |
| 171 | { 0x10FC, 0x0003, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, | ||
| 172 | { 0x1145, 0x8008, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, | ||
| 173 | { 0x1145, 0xf008, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, | ||
| 170 | { 0x1145, 0xf021, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, | 174 | { 0x1145, 0xf021, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, |
| 171 | { 0x1145, 0xf024, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, | 175 | { 0x1145, 0xf024, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, |
| 176 | { 0x1145, 0xf02C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, | ||
| 172 | { }, | 177 | { }, |
| 173 | }; | 178 | }; |
| 174 | 179 | ||
diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c index d34236611752..e4be55e047f6 100644 --- a/drivers/ata/pata_sis.c +++ b/drivers/ata/pata_sis.c | |||
| @@ -56,7 +56,6 @@ static const struct sis_laptop sis_laptop[] = { | |||
| 56 | { 0x5513, 0x1043, 0x1107 }, /* ASUS A6K */ | 56 | { 0x5513, 0x1043, 0x1107 }, /* ASUS A6K */ |
| 57 | { 0x5513, 0x1734, 0x105F }, /* FSC Amilo A1630 */ | 57 | { 0x5513, 0x1734, 0x105F }, /* FSC Amilo A1630 */ |
| 58 | { 0x5513, 0x1071, 0x8640 }, /* EasyNote K5305 */ | 58 | { 0x5513, 0x1071, 0x8640 }, /* EasyNote K5305 */ |
| 59 | { 0x5513, 0x1039, 0x5513 }, /* Targa Visionary 1000 */ | ||
| 60 | /* end marker */ | 59 | /* end marker */ |
| 61 | { 0, } | 60 | { 0, } |
| 62 | }; | 61 | }; |
diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c index 615412364e99..6b969f8c684f 100644 --- a/drivers/atm/horizon.c +++ b/drivers/atm/horizon.c | |||
| @@ -2705,7 +2705,7 @@ static int __devinit hrz_probe(struct pci_dev *pci_dev, const struct pci_device_ | |||
| 2705 | 2705 | ||
| 2706 | /* XXX DEV_LABEL is a guess */ | 2706 | /* XXX DEV_LABEL is a guess */ |
| 2707 | if (!request_region(iobase, HRZ_IO_EXTENT, DEV_LABEL)) { | 2707 | if (!request_region(iobase, HRZ_IO_EXTENT, DEV_LABEL)) { |
| 2708 | return -EINVAL; | 2708 | err = -EINVAL; |
| 2709 | goto out_disable; | 2709 | goto out_disable; |
| 2710 | } | 2710 | } |
| 2711 | 2711 | ||
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c index f20bf359b84f..dc7a8c352da2 100644 --- a/drivers/block/pktcdvd.c +++ b/drivers/block/pktcdvd.c | |||
| @@ -302,7 +302,7 @@ static struct kobj_type kobj_pkt_type_wqueue = { | |||
| 302 | static void pkt_sysfs_dev_new(struct pktcdvd_device *pd) | 302 | static void pkt_sysfs_dev_new(struct pktcdvd_device *pd) |
| 303 | { | 303 | { |
| 304 | if (class_pktcdvd) { | 304 | if (class_pktcdvd) { |
| 305 | pd->dev = device_create(class_pktcdvd, NULL, pd->pkt_dev, NULL, | 305 | pd->dev = device_create(class_pktcdvd, NULL, MKDEV(0, 0), NULL, |
| 306 | "%s", pd->name); | 306 | "%s", pd->name); |
| 307 | if (IS_ERR(pd->dev)) | 307 | if (IS_ERR(pd->dev)) |
| 308 | pd->dev = NULL; | 308 | pd->dev = NULL; |
| @@ -2790,7 +2790,7 @@ static int pkt_new_dev(struct pktcdvd_device *pd, dev_t dev) | |||
| 2790 | return 0; | 2790 | return 0; |
| 2791 | 2791 | ||
| 2792 | out_mem: | 2792 | out_mem: |
| 2793 | blkdev_put(bdev, FMODE_READ|FMODE_WRITE); | 2793 | blkdev_put(bdev, FMODE_READ | FMODE_NDELAY); |
| 2794 | /* This is safe: open() is still holding a reference. */ | 2794 | /* This is safe: open() is still holding a reference. */ |
| 2795 | module_put(THIS_MODULE); | 2795 | module_put(THIS_MODULE); |
| 2796 | return ret; | 2796 | return ret; |
| @@ -2975,7 +2975,7 @@ static int pkt_remove_dev(dev_t pkt_dev) | |||
| 2975 | pkt_debugfs_dev_remove(pd); | 2975 | pkt_debugfs_dev_remove(pd); |
| 2976 | pkt_sysfs_dev_remove(pd); | 2976 | pkt_sysfs_dev_remove(pd); |
| 2977 | 2977 | ||
| 2978 | blkdev_put(pd->bdev, FMODE_READ|FMODE_WRITE); | 2978 | blkdev_put(pd->bdev, FMODE_READ | FMODE_NDELAY); |
| 2979 | 2979 | ||
| 2980 | remove_proc_entry(pd->name, pkt_proc); | 2980 | remove_proc_entry(pd->name, pkt_proc); |
| 2981 | DPRINTK(DRIVER_NAME": writer %s unmapped\n", pd->name); | 2981 | DPRINTK(DRIVER_NAME": writer %s unmapped\n", pd->name); |
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c index d16b02423d61..7d2e91cccb13 100644 --- a/drivers/cdrom/cdrom.c +++ b/drivers/cdrom/cdrom.c | |||
| @@ -2081,10 +2081,6 @@ static int cdrom_read_cdda_bpc(struct cdrom_device_info *cdi, __u8 __user *ubuf, | |||
| 2081 | if (!q) | 2081 | if (!q) |
| 2082 | return -ENXIO; | 2082 | return -ENXIO; |
| 2083 | 2083 | ||
| 2084 | rq = blk_get_request(q, READ, GFP_KERNEL); | ||
| 2085 | if (!rq) | ||
| 2086 | return -ENOMEM; | ||
| 2087 | |||
| 2088 | cdi->last_sense = 0; | 2084 | cdi->last_sense = 0; |
| 2089 | 2085 | ||
| 2090 | while (nframes) { | 2086 | while (nframes) { |
| @@ -2096,9 +2092,17 @@ static int cdrom_read_cdda_bpc(struct cdrom_device_info *cdi, __u8 __user *ubuf, | |||
| 2096 | 2092 | ||
| 2097 | len = nr * CD_FRAMESIZE_RAW; | 2093 | len = nr * CD_FRAMESIZE_RAW; |
| 2098 | 2094 | ||
| 2095 | rq = blk_get_request(q, READ, GFP_KERNEL); | ||
| 2096 | if (!rq) { | ||
| 2097 | ret = -ENOMEM; | ||
| 2098 | break; | ||
| 2099 | } | ||
| 2100 | |||
| 2099 | ret = blk_rq_map_user(q, rq, NULL, ubuf, len, GFP_KERNEL); | 2101 | ret = blk_rq_map_user(q, rq, NULL, ubuf, len, GFP_KERNEL); |
| 2100 | if (ret) | 2102 | if (ret) { |
| 2103 | blk_put_request(rq); | ||
| 2101 | break; | 2104 | break; |
| 2105 | } | ||
| 2102 | 2106 | ||
| 2103 | rq->cmd[0] = GPCMD_READ_CD; | 2107 | rq->cmd[0] = GPCMD_READ_CD; |
| 2104 | rq->cmd[1] = 1 << 2; | 2108 | rq->cmd[1] = 1 << 2; |
| @@ -2124,6 +2128,7 @@ static int cdrom_read_cdda_bpc(struct cdrom_device_info *cdi, __u8 __user *ubuf, | |||
| 2124 | 2128 | ||
| 2125 | if (blk_rq_unmap_user(bio)) | 2129 | if (blk_rq_unmap_user(bio)) |
| 2126 | ret = -EFAULT; | 2130 | ret = -EFAULT; |
| 2131 | blk_put_request(rq); | ||
| 2127 | 2132 | ||
| 2128 | if (ret) | 2133 | if (ret) |
| 2129 | break; | 2134 | break; |
| @@ -2133,7 +2138,6 @@ static int cdrom_read_cdda_bpc(struct cdrom_device_info *cdi, __u8 __user *ubuf, | |||
| 2133 | ubuf += len; | 2138 | ubuf += len; |
| 2134 | } | 2139 | } |
| 2135 | 2140 | ||
| 2136 | blk_put_request(rq); | ||
| 2137 | return ret; | 2141 | return ret; |
| 2138 | } | 2142 | } |
| 2139 | 2143 | ||
diff --git a/drivers/char/cp437.uni b/drivers/char/cp437.uni index 1f06889a96b9..bc6163484f62 100644 --- a/drivers/char/cp437.uni +++ b/drivers/char/cp437.uni | |||
| @@ -27,7 +27,7 @@ | |||
| 27 | 0x0c U+2640 | 27 | 0x0c U+2640 |
| 28 | 0x0d U+266a | 28 | 0x0d U+266a |
| 29 | 0x0e U+266b | 29 | 0x0e U+266b |
| 30 | 0x0f U+263c | 30 | 0x0f U+263c U+00a4 |
| 31 | 0x10 U+25b6 U+25ba | 31 | 0x10 U+25b6 U+25ba |
| 32 | 0x11 U+25c0 U+25c4 | 32 | 0x11 U+25c0 U+25c4 |
| 33 | 0x12 U+2195 | 33 | 0x12 U+2195 |
| @@ -55,7 +55,7 @@ | |||
| 55 | 0x24 U+0024 | 55 | 0x24 U+0024 |
| 56 | 0x25 U+0025 | 56 | 0x25 U+0025 |
| 57 | 0x26 U+0026 | 57 | 0x26 U+0026 |
| 58 | 0x27 U+0027 | 58 | 0x27 U+0027 U+00b4 |
| 59 | 0x28 U+0028 | 59 | 0x28 U+0028 |
| 60 | 0x29 U+0029 | 60 | 0x29 U+0029 |
| 61 | 0x2a U+002a | 61 | 0x2a U+002a |
| @@ -84,7 +84,7 @@ | |||
| 84 | 0x41 U+0041 U+00c0 U+00c1 U+00c2 U+00c3 | 84 | 0x41 U+0041 U+00c0 U+00c1 U+00c2 U+00c3 |
| 85 | 0x42 U+0042 | 85 | 0x42 U+0042 |
| 86 | 0x43 U+0043 U+00a9 | 86 | 0x43 U+0043 U+00a9 |
| 87 | 0x44 U+0044 | 87 | 0x44 U+0044 U+00d0 |
| 88 | 0x45 U+0045 U+00c8 U+00ca U+00cb | 88 | 0x45 U+0045 U+00c8 U+00ca U+00cb |
| 89 | 0x46 U+0046 | 89 | 0x46 U+0046 |
| 90 | 0x47 U+0047 | 90 | 0x47 U+0047 |
| @@ -140,7 +140,7 @@ | |||
| 140 | 0x79 U+0079 U+00fd | 140 | 0x79 U+0079 U+00fd |
| 141 | 0x7a U+007a | 141 | 0x7a U+007a |
| 142 | 0x7b U+007b | 142 | 0x7b U+007b |
| 143 | 0x7c U+007c U+00a5 | 143 | 0x7c U+007c U+00a6 |
| 144 | 0x7d U+007d | 144 | 0x7d U+007d |
| 145 | 0x7e U+007e | 145 | 0x7e U+007e |
| 146 | # | 146 | # |
| @@ -263,10 +263,10 @@ | |||
| 263 | 0xe8 U+03a6 U+00d8 | 263 | 0xe8 U+03a6 U+00d8 |
| 264 | 0xe9 U+0398 | 264 | 0xe9 U+0398 |
| 265 | 0xea U+03a9 U+2126 | 265 | 0xea U+03a9 U+2126 |
| 266 | 0xeb U+03b4 | 266 | 0xeb U+03b4 U+00f0 |
| 267 | 0xec U+221e | 267 | 0xec U+221e |
| 268 | 0xed U+03c6 U+00f8 | 268 | 0xed U+03c6 U+00f8 |
| 269 | 0xee U+03b5 | 269 | 0xee U+03b5 U+2208 |
| 270 | 0xef U+2229 | 270 | 0xef U+2229 |
| 271 | 0xf0 U+2261 | 271 | 0xf0 U+2261 |
| 272 | 0xf1 U+00b1 | 272 | 0xf1 U+00b1 |
diff --git a/drivers/char/serial167.c b/drivers/char/serial167.c index 3b23270eaa65..a8f15e6be594 100644 --- a/drivers/char/serial167.c +++ b/drivers/char/serial167.c | |||
| @@ -418,7 +418,7 @@ static irqreturn_t cd2401_rxerr_interrupt(int irq, void *dev_id) | |||
| 418 | TTY_OVERRUN); | 418 | TTY_OVERRUN); |
| 419 | /* | 419 | /* |
| 420 | If the flip buffer itself is | 420 | If the flip buffer itself is |
| 421 | overflowing, we still loose | 421 | overflowing, we still lose |
| 422 | the next incoming character. | 422 | the next incoming character. |
| 423 | */ | 423 | */ |
| 424 | if (tty_buffer_request_room(tty, 1) != | 424 | if (tty_buffer_request_room(tty, 1) != |
diff --git a/drivers/char/vt.c b/drivers/char/vt.c index a5af6072e2b3..008176edbd64 100644 --- a/drivers/char/vt.c +++ b/drivers/char/vt.c | |||
| @@ -2274,7 +2274,7 @@ rescan_last_byte: | |||
| 2274 | continue; /* nothing to display */ | 2274 | continue; /* nothing to display */ |
| 2275 | } | 2275 | } |
| 2276 | /* Glyph not found */ | 2276 | /* Glyph not found */ |
| 2277 | if ((!(vc->vc_utf && !vc->vc_disp_ctrl) || c < 128) && !(c & ~charmask)) { | 2277 | if ((!(vc->vc_utf && !vc->vc_disp_ctrl) && c < 128) && !(c & ~charmask)) { |
| 2278 | /* In legacy mode use the glyph we get by a 1:1 mapping. | 2278 | /* In legacy mode use the glyph we get by a 1:1 mapping. |
| 2279 | This would make absolutely no sense with Unicode in mind, | 2279 | This would make absolutely no sense with Unicode in mind, |
| 2280 | but do this for ASCII characters since a font may lack | 2280 | but do this for ASCII characters since a font may lack |
diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c index 46610b090415..ab9c01e462ef 100644 --- a/drivers/firewire/fw-ohci.c +++ b/drivers/firewire/fw-ohci.c | |||
| @@ -974,6 +974,7 @@ at_context_queue_packet(struct context *ctx, struct fw_packet *packet) | |||
| 974 | packet->ack = RCODE_SEND_ERROR; | 974 | packet->ack = RCODE_SEND_ERROR; |
| 975 | return -1; | 975 | return -1; |
| 976 | } | 976 | } |
| 977 | packet->payload_bus = payload_bus; | ||
| 977 | 978 | ||
| 978 | d[2].req_count = cpu_to_le16(packet->payload_length); | 979 | d[2].req_count = cpu_to_le16(packet->payload_length); |
| 979 | d[2].data_address = cpu_to_le32(payload_bus); | 980 | d[2].data_address = cpu_to_le32(payload_bus); |
| @@ -1025,7 +1026,6 @@ static int handle_at_packet(struct context *context, | |||
| 1025 | struct driver_data *driver_data; | 1026 | struct driver_data *driver_data; |
| 1026 | struct fw_packet *packet; | 1027 | struct fw_packet *packet; |
| 1027 | struct fw_ohci *ohci = context->ohci; | 1028 | struct fw_ohci *ohci = context->ohci; |
| 1028 | dma_addr_t payload_bus; | ||
| 1029 | int evt; | 1029 | int evt; |
| 1030 | 1030 | ||
| 1031 | if (last->transfer_status == 0) | 1031 | if (last->transfer_status == 0) |
| @@ -1038,9 +1038,8 @@ static int handle_at_packet(struct context *context, | |||
| 1038 | /* This packet was cancelled, just continue. */ | 1038 | /* This packet was cancelled, just continue. */ |
| 1039 | return 1; | 1039 | return 1; |
| 1040 | 1040 | ||
| 1041 | payload_bus = le32_to_cpu(last->data_address); | 1041 | if (packet->payload_bus) |
| 1042 | if (payload_bus != 0) | 1042 | dma_unmap_single(ohci->card.device, packet->payload_bus, |
| 1043 | dma_unmap_single(ohci->card.device, payload_bus, | ||
| 1044 | packet->payload_length, DMA_TO_DEVICE); | 1043 | packet->payload_length, DMA_TO_DEVICE); |
| 1045 | 1044 | ||
| 1046 | evt = le16_to_cpu(last->transfer_status) & 0x1f; | 1045 | evt = le16_to_cpu(last->transfer_status) & 0x1f; |
| @@ -1697,6 +1696,10 @@ static int ohci_cancel_packet(struct fw_card *card, struct fw_packet *packet) | |||
| 1697 | if (packet->ack != 0) | 1696 | if (packet->ack != 0) |
| 1698 | goto out; | 1697 | goto out; |
| 1699 | 1698 | ||
| 1699 | if (packet->payload_bus) | ||
| 1700 | dma_unmap_single(ohci->card.device, packet->payload_bus, | ||
| 1701 | packet->payload_length, DMA_TO_DEVICE); | ||
| 1702 | |||
| 1700 | log_ar_at_event('T', packet->speed, packet->header, 0x20); | 1703 | log_ar_at_event('T', packet->speed, packet->header, 0x20); |
| 1701 | driver_data->packet = NULL; | 1704 | driver_data->packet = NULL; |
| 1702 | packet->ack = RCODE_CANCELLED; | 1705 | packet->ack = RCODE_CANCELLED; |
diff --git a/drivers/firewire/fw-transaction.c b/drivers/firewire/fw-transaction.c index 022ac4fabb67..2884f876397b 100644 --- a/drivers/firewire/fw-transaction.c +++ b/drivers/firewire/fw-transaction.c | |||
| @@ -207,6 +207,7 @@ fw_fill_request(struct fw_packet *packet, int tcode, int tlabel, | |||
| 207 | packet->speed = speed; | 207 | packet->speed = speed; |
| 208 | packet->generation = generation; | 208 | packet->generation = generation; |
| 209 | packet->ack = 0; | 209 | packet->ack = 0; |
| 210 | packet->payload_bus = 0; | ||
| 210 | } | 211 | } |
| 211 | 212 | ||
| 212 | /** | 213 | /** |
| @@ -581,6 +582,8 @@ fw_fill_response(struct fw_packet *response, u32 *request_header, | |||
| 581 | BUG(); | 582 | BUG(); |
| 582 | return; | 583 | return; |
| 583 | } | 584 | } |
| 585 | |||
| 586 | response->payload_bus = 0; | ||
| 584 | } | 587 | } |
| 585 | EXPORT_SYMBOL(fw_fill_response); | 588 | EXPORT_SYMBOL(fw_fill_response); |
| 586 | 589 | ||
diff --git a/drivers/firewire/fw-transaction.h b/drivers/firewire/fw-transaction.h index aed7dbb17cda..839466f0a795 100644 --- a/drivers/firewire/fw-transaction.h +++ b/drivers/firewire/fw-transaction.h | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/list.h> | 27 | #include <linux/list.h> |
| 28 | #include <linux/spinlock_types.h> | 28 | #include <linux/spinlock_types.h> |
| 29 | #include <linux/timer.h> | 29 | #include <linux/timer.h> |
| 30 | #include <linux/types.h> | ||
| 30 | #include <linux/workqueue.h> | 31 | #include <linux/workqueue.h> |
| 31 | 32 | ||
| 32 | #define TCODE_IS_READ_REQUEST(tcode) (((tcode) & ~1) == 4) | 33 | #define TCODE_IS_READ_REQUEST(tcode) (((tcode) & ~1) == 4) |
| @@ -153,6 +154,7 @@ struct fw_packet { | |||
| 153 | size_t header_length; | 154 | size_t header_length; |
| 154 | void *payload; | 155 | void *payload; |
| 155 | size_t payload_length; | 156 | size_t payload_length; |
| 157 | dma_addr_t payload_bus; | ||
| 156 | u32 timestamp; | 158 | u32 timestamp; |
| 157 | 159 | ||
| 158 | /* | 160 | /* |
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index ba89b42f790a..553dd4bc3075 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c | |||
| @@ -847,9 +847,10 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) | |||
| 847 | * and the registers being closely associated. | 847 | * and the registers being closely associated. |
| 848 | * | 848 | * |
| 849 | * According to chipset errata, on the 965GM, MSI interrupts may | 849 | * According to chipset errata, on the 965GM, MSI interrupts may |
| 850 | * be lost or delayed | 850 | * be lost or delayed, but we use them anyways to avoid |
| 851 | * stuck interrupts on some machines. | ||
| 851 | */ | 852 | */ |
| 852 | if (!IS_I945G(dev) && !IS_I945GM(dev) && !IS_I965GM(dev)) | 853 | if (!IS_I945G(dev) && !IS_I945GM(dev)) |
| 853 | pci_enable_msi(dev->pdev); | 854 | pci_enable_msi(dev->pdev); |
| 854 | 855 | ||
| 855 | intel_opregion_init(dev); | 856 | intel_opregion_init(dev); |
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 0a4f39b9a0ec..adc972cc6bfc 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h | |||
| @@ -244,6 +244,10 @@ typedef struct drm_i915_private { | |||
| 244 | * List of objects currently involved in rendering from the | 244 | * List of objects currently involved in rendering from the |
| 245 | * ringbuffer. | 245 | * ringbuffer. |
| 246 | * | 246 | * |
| 247 | * Includes buffers having the contents of their GPU caches | ||
| 248 | * flushed, not necessarily primitives. last_rendering_seqno | ||
| 249 | * represents when the rendering involved will be completed. | ||
| 250 | * | ||
| 247 | * A reference is held on the buffer while on this list. | 251 | * A reference is held on the buffer while on this list. |
| 248 | */ | 252 | */ |
| 249 | struct list_head active_list; | 253 | struct list_head active_list; |
| @@ -253,6 +257,8 @@ typedef struct drm_i915_private { | |||
| 253 | * still have a write_domain which needs to be flushed before | 257 | * still have a write_domain which needs to be flushed before |
| 254 | * unbinding. | 258 | * unbinding. |
| 255 | * | 259 | * |
| 260 | * last_rendering_seqno is 0 while an object is in this list. | ||
| 261 | * | ||
| 256 | * A reference is held on the buffer while on this list. | 262 | * A reference is held on the buffer while on this list. |
| 257 | */ | 263 | */ |
| 258 | struct list_head flushing_list; | 264 | struct list_head flushing_list; |
| @@ -261,6 +267,8 @@ typedef struct drm_i915_private { | |||
| 261 | * LRU list of objects which are not in the ringbuffer and | 267 | * LRU list of objects which are not in the ringbuffer and |
| 262 | * are ready to unbind, but are still in the GTT. | 268 | * are ready to unbind, but are still in the GTT. |
| 263 | * | 269 | * |
| 270 | * last_rendering_seqno is 0 while an object is in this list. | ||
| 271 | * | ||
| 264 | * A reference is not held on the buffer while on this list, | 272 | * A reference is not held on the buffer while on this list, |
| 265 | * as merely being GTT-bound shouldn't prevent its being | 273 | * as merely being GTT-bound shouldn't prevent its being |
| 266 | * freed, and we'll pull it off the list in the free path. | 274 | * freed, and we'll pull it off the list in the free path. |
| @@ -371,8 +379,8 @@ struct drm_i915_gem_object { | |||
| 371 | uint32_t agp_type; | 379 | uint32_t agp_type; |
| 372 | 380 | ||
| 373 | /** | 381 | /** |
| 374 | * Flagging of which individual pages are valid in GEM_DOMAIN_CPU when | 382 | * If present, while GEM_DOMAIN_CPU is in the read domain this array |
| 375 | * GEM_DOMAIN_CPU is not in the object's read domain. | 383 | * flags which individual pages are valid. |
| 376 | */ | 384 | */ |
| 377 | uint8_t *page_cpu_valid; | 385 | uint8_t *page_cpu_valid; |
| 378 | }; | 386 | }; |
| @@ -394,9 +402,6 @@ struct drm_i915_gem_request { | |||
| 394 | /** Time at which this request was emitted, in jiffies. */ | 402 | /** Time at which this request was emitted, in jiffies. */ |
| 395 | unsigned long emitted_jiffies; | 403 | unsigned long emitted_jiffies; |
| 396 | 404 | ||
| 397 | /** Cache domains that were flushed at the start of the request. */ | ||
| 398 | uint32_t flush_domains; | ||
| 399 | |||
| 400 | struct list_head list; | 405 | struct list_head list; |
| 401 | }; | 406 | }; |
| 402 | 407 | ||
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index d58ddef468f8..ad672d854828 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c | |||
| @@ -33,21 +33,21 @@ | |||
| 33 | 33 | ||
| 34 | #define I915_GEM_GPU_DOMAINS (~(I915_GEM_DOMAIN_CPU | I915_GEM_DOMAIN_GTT)) | 34 | #define I915_GEM_GPU_DOMAINS (~(I915_GEM_DOMAIN_CPU | I915_GEM_DOMAIN_GTT)) |
| 35 | 35 | ||
| 36 | static int | 36 | static void |
| 37 | i915_gem_object_set_domain(struct drm_gem_object *obj, | 37 | i915_gem_object_set_to_gpu_domain(struct drm_gem_object *obj, |
| 38 | uint32_t read_domains, | 38 | uint32_t read_domains, |
| 39 | uint32_t write_domain); | 39 | uint32_t write_domain); |
| 40 | static int | 40 | static void i915_gem_object_flush_gpu_write_domain(struct drm_gem_object *obj); |
| 41 | i915_gem_object_set_domain_range(struct drm_gem_object *obj, | 41 | static void i915_gem_object_flush_gtt_write_domain(struct drm_gem_object *obj); |
| 42 | uint64_t offset, | 42 | static void i915_gem_object_flush_cpu_write_domain(struct drm_gem_object *obj); |
| 43 | uint64_t size, | 43 | static int i915_gem_object_set_to_gtt_domain(struct drm_gem_object *obj, |
| 44 | uint32_t read_domains, | 44 | int write); |
| 45 | uint32_t write_domain); | 45 | static int i915_gem_object_set_to_cpu_domain(struct drm_gem_object *obj, |
| 46 | static int | 46 | int write); |
| 47 | i915_gem_set_domain(struct drm_gem_object *obj, | 47 | static int i915_gem_object_set_cpu_read_domain_range(struct drm_gem_object *obj, |
| 48 | struct drm_file *file_priv, | 48 | uint64_t offset, |
| 49 | uint32_t read_domains, | 49 | uint64_t size); |
| 50 | uint32_t write_domain); | 50 | static void i915_gem_object_set_to_full_cpu_read_domain(struct drm_gem_object *obj); |
| 51 | static int i915_gem_object_get_page_list(struct drm_gem_object *obj); | 51 | static int i915_gem_object_get_page_list(struct drm_gem_object *obj); |
| 52 | static void i915_gem_object_free_page_list(struct drm_gem_object *obj); | 52 | static void i915_gem_object_free_page_list(struct drm_gem_object *obj); |
| 53 | static int i915_gem_object_wait_rendering(struct drm_gem_object *obj); | 53 | static int i915_gem_object_wait_rendering(struct drm_gem_object *obj); |
| @@ -162,8 +162,8 @@ i915_gem_pread_ioctl(struct drm_device *dev, void *data, | |||
| 162 | 162 | ||
| 163 | mutex_lock(&dev->struct_mutex); | 163 | mutex_lock(&dev->struct_mutex); |
| 164 | 164 | ||
| 165 | ret = i915_gem_object_set_domain_range(obj, args->offset, args->size, | 165 | ret = i915_gem_object_set_cpu_read_domain_range(obj, args->offset, |
| 166 | I915_GEM_DOMAIN_CPU, 0); | 166 | args->size); |
| 167 | if (ret != 0) { | 167 | if (ret != 0) { |
| 168 | drm_gem_object_unreference(obj); | 168 | drm_gem_object_unreference(obj); |
| 169 | mutex_unlock(&dev->struct_mutex); | 169 | mutex_unlock(&dev->struct_mutex); |
| @@ -260,8 +260,7 @@ i915_gem_gtt_pwrite(struct drm_device *dev, struct drm_gem_object *obj, | |||
| 260 | mutex_unlock(&dev->struct_mutex); | 260 | mutex_unlock(&dev->struct_mutex); |
| 261 | return ret; | 261 | return ret; |
| 262 | } | 262 | } |
| 263 | ret = i915_gem_set_domain(obj, file_priv, | 263 | ret = i915_gem_object_set_to_gtt_domain(obj, 1); |
| 264 | I915_GEM_DOMAIN_GTT, I915_GEM_DOMAIN_GTT); | ||
| 265 | if (ret) | 264 | if (ret) |
| 266 | goto fail; | 265 | goto fail; |
| 267 | 266 | ||
| @@ -320,8 +319,7 @@ i915_gem_shmem_pwrite(struct drm_device *dev, struct drm_gem_object *obj, | |||
| 320 | 319 | ||
| 321 | mutex_lock(&dev->struct_mutex); | 320 | mutex_lock(&dev->struct_mutex); |
| 322 | 321 | ||
| 323 | ret = i915_gem_set_domain(obj, file_priv, | 322 | ret = i915_gem_object_set_to_cpu_domain(obj, 1); |
| 324 | I915_GEM_DOMAIN_CPU, I915_GEM_DOMAIN_CPU); | ||
| 325 | if (ret) { | 323 | if (ret) { |
| 326 | mutex_unlock(&dev->struct_mutex); | 324 | mutex_unlock(&dev->struct_mutex); |
| 327 | return ret; | 325 | return ret; |
| @@ -397,7 +395,8 @@ i915_gem_pwrite_ioctl(struct drm_device *dev, void *data, | |||
| 397 | } | 395 | } |
| 398 | 396 | ||
| 399 | /** | 397 | /** |
| 400 | * Called when user space prepares to use an object | 398 | * Called when user space prepares to use an object with the CPU, either |
| 399 | * through the mmap ioctl's mapping or a GTT mapping. | ||
| 401 | */ | 400 | */ |
| 402 | int | 401 | int |
| 403 | i915_gem_set_domain_ioctl(struct drm_device *dev, void *data, | 402 | i915_gem_set_domain_ioctl(struct drm_device *dev, void *data, |
| @@ -405,11 +404,26 @@ i915_gem_set_domain_ioctl(struct drm_device *dev, void *data, | |||
| 405 | { | 404 | { |
| 406 | struct drm_i915_gem_set_domain *args = data; | 405 | struct drm_i915_gem_set_domain *args = data; |
| 407 | struct drm_gem_object *obj; | 406 | struct drm_gem_object *obj; |
| 407 | uint32_t read_domains = args->read_domains; | ||
| 408 | uint32_t write_domain = args->write_domain; | ||
| 408 | int ret; | 409 | int ret; |
| 409 | 410 | ||
| 410 | if (!(dev->driver->driver_features & DRIVER_GEM)) | 411 | if (!(dev->driver->driver_features & DRIVER_GEM)) |
| 411 | return -ENODEV; | 412 | return -ENODEV; |
| 412 | 413 | ||
| 414 | /* Only handle setting domains to types used by the CPU. */ | ||
| 415 | if (write_domain & ~(I915_GEM_DOMAIN_CPU | I915_GEM_DOMAIN_GTT)) | ||
| 416 | return -EINVAL; | ||
| 417 | |||
| 418 | if (read_domains & ~(I915_GEM_DOMAIN_CPU | I915_GEM_DOMAIN_GTT)) | ||
| 419 | return -EINVAL; | ||
| 420 | |||
| 421 | /* Having something in the write domain implies it's in the read | ||
| 422 | * domain, and only that read domain. Enforce that in the request. | ||
| 423 | */ | ||
| 424 | if (write_domain != 0 && read_domains != write_domain) | ||
| 425 | return -EINVAL; | ||
| 426 | |||
| 413 | obj = drm_gem_object_lookup(dev, file_priv, args->handle); | 427 | obj = drm_gem_object_lookup(dev, file_priv, args->handle); |
| 414 | if (obj == NULL) | 428 | if (obj == NULL) |
| 415 | return -EBADF; | 429 | return -EBADF; |
| @@ -417,10 +431,21 @@ i915_gem_set_domain_ioctl(struct drm_device *dev, void *data, | |||
| 417 | mutex_lock(&dev->struct_mutex); | 431 | mutex_lock(&dev->struct_mutex); |
| 418 | #if WATCH_BUF | 432 | #if WATCH_BUF |
| 419 | DRM_INFO("set_domain_ioctl %p(%d), %08x %08x\n", | 433 | DRM_INFO("set_domain_ioctl %p(%d), %08x %08x\n", |
| 420 | obj, obj->size, args->read_domains, args->write_domain); | 434 | obj, obj->size, read_domains, write_domain); |
| 421 | #endif | 435 | #endif |
| 422 | ret = i915_gem_set_domain(obj, file_priv, | 436 | if (read_domains & I915_GEM_DOMAIN_GTT) { |
| 423 | args->read_domains, args->write_domain); | 437 | ret = i915_gem_object_set_to_gtt_domain(obj, write_domain != 0); |
| 438 | |||
| 439 | /* Silently promote "you're not bound, there was nothing to do" | ||
| 440 | * to success, since the client was just asking us to | ||
| 441 | * make sure everything was done. | ||
| 442 | */ | ||
| 443 | if (ret == -EINVAL) | ||
| 444 | ret = 0; | ||
| 445 | } else { | ||
| 446 | ret = i915_gem_object_set_to_cpu_domain(obj, write_domain != 0); | ||
| 447 | } | ||
| 448 | |||
| 424 | drm_gem_object_unreference(obj); | 449 | drm_gem_object_unreference(obj); |
| 425 | mutex_unlock(&dev->struct_mutex); | 450 | mutex_unlock(&dev->struct_mutex); |
| 426 | return ret; | 451 | return ret; |
| @@ -455,10 +480,9 @@ i915_gem_sw_finish_ioctl(struct drm_device *dev, void *data, | |||
| 455 | obj_priv = obj->driver_private; | 480 | obj_priv = obj->driver_private; |
| 456 | 481 | ||
| 457 | /* Pinned buffers may be scanout, so flush the cache */ | 482 | /* Pinned buffers may be scanout, so flush the cache */ |
| 458 | if ((obj->write_domain & I915_GEM_DOMAIN_CPU) && obj_priv->pin_count) { | 483 | if (obj_priv->pin_count) |
| 459 | i915_gem_clflush_object(obj); | 484 | i915_gem_object_flush_cpu_write_domain(obj); |
| 460 | drm_agp_chipset_flush(dev); | 485 | |
| 461 | } | ||
| 462 | drm_gem_object_unreference(obj); | 486 | drm_gem_object_unreference(obj); |
| 463 | mutex_unlock(&dev->struct_mutex); | 487 | mutex_unlock(&dev->struct_mutex); |
| 464 | return ret; | 488 | return ret; |
| @@ -532,7 +556,7 @@ i915_gem_object_free_page_list(struct drm_gem_object *obj) | |||
| 532 | } | 556 | } |
| 533 | 557 | ||
| 534 | static void | 558 | static void |
| 535 | i915_gem_object_move_to_active(struct drm_gem_object *obj) | 559 | i915_gem_object_move_to_active(struct drm_gem_object *obj, uint32_t seqno) |
| 536 | { | 560 | { |
| 537 | struct drm_device *dev = obj->dev; | 561 | struct drm_device *dev = obj->dev; |
| 538 | drm_i915_private_t *dev_priv = dev->dev_private; | 562 | drm_i915_private_t *dev_priv = dev->dev_private; |
| @@ -546,8 +570,20 @@ i915_gem_object_move_to_active(struct drm_gem_object *obj) | |||
| 546 | /* Move from whatever list we were on to the tail of execution. */ | 570 | /* Move from whatever list we were on to the tail of execution. */ |
| 547 | list_move_tail(&obj_priv->list, | 571 | list_move_tail(&obj_priv->list, |
| 548 | &dev_priv->mm.active_list); | 572 | &dev_priv->mm.active_list); |
| 573 | obj_priv->last_rendering_seqno = seqno; | ||
| 549 | } | 574 | } |
| 550 | 575 | ||
| 576 | static void | ||
| 577 | i915_gem_object_move_to_flushing(struct drm_gem_object *obj) | ||
| 578 | { | ||
| 579 | struct drm_device *dev = obj->dev; | ||
| 580 | drm_i915_private_t *dev_priv = dev->dev_private; | ||
| 581 | struct drm_i915_gem_object *obj_priv = obj->driver_private; | ||
| 582 | |||
| 583 | BUG_ON(!obj_priv->active); | ||
| 584 | list_move_tail(&obj_priv->list, &dev_priv->mm.flushing_list); | ||
| 585 | obj_priv->last_rendering_seqno = 0; | ||
| 586 | } | ||
| 551 | 587 | ||
| 552 | static void | 588 | static void |
| 553 | i915_gem_object_move_to_inactive(struct drm_gem_object *obj) | 589 | i915_gem_object_move_to_inactive(struct drm_gem_object *obj) |
| @@ -562,6 +598,7 @@ i915_gem_object_move_to_inactive(struct drm_gem_object *obj) | |||
| 562 | else | 598 | else |
| 563 | list_move_tail(&obj_priv->list, &dev_priv->mm.inactive_list); | 599 | list_move_tail(&obj_priv->list, &dev_priv->mm.inactive_list); |
| 564 | 600 | ||
| 601 | obj_priv->last_rendering_seqno = 0; | ||
| 565 | if (obj_priv->active) { | 602 | if (obj_priv->active) { |
| 566 | obj_priv->active = 0; | 603 | obj_priv->active = 0; |
| 567 | drm_gem_object_unreference(obj); | 604 | drm_gem_object_unreference(obj); |
| @@ -610,10 +647,28 @@ i915_add_request(struct drm_device *dev, uint32_t flush_domains) | |||
| 610 | 647 | ||
| 611 | request->seqno = seqno; | 648 | request->seqno = seqno; |
| 612 | request->emitted_jiffies = jiffies; | 649 | request->emitted_jiffies = jiffies; |
| 613 | request->flush_domains = flush_domains; | ||
| 614 | was_empty = list_empty(&dev_priv->mm.request_list); | 650 | was_empty = list_empty(&dev_priv->mm.request_list); |
| 615 | list_add_tail(&request->list, &dev_priv->mm.request_list); | 651 | list_add_tail(&request->list, &dev_priv->mm.request_list); |
| 616 | 652 | ||
| 653 | /* Associate any objects on the flushing list matching the write | ||
| 654 | * domain we're flushing with our flush. | ||
| 655 | */ | ||
| 656 | if (flush_domains != 0) { | ||
| 657 | struct drm_i915_gem_object *obj_priv, *next; | ||
| 658 | |||
| 659 | list_for_each_entry_safe(obj_priv, next, | ||
| 660 | &dev_priv->mm.flushing_list, list) { | ||
| 661 | struct drm_gem_object *obj = obj_priv->obj; | ||
| 662 | |||
| 663 | if ((obj->write_domain & flush_domains) == | ||
| 664 | obj->write_domain) { | ||
| 665 | obj->write_domain = 0; | ||
| 666 | i915_gem_object_move_to_active(obj, seqno); | ||
| 667 | } | ||
| 668 | } | ||
| 669 | |||
| 670 | } | ||
| 671 | |||
| 617 | if (was_empty && !dev_priv->mm.suspended) | 672 | if (was_empty && !dev_priv->mm.suspended) |
| 618 | schedule_delayed_work(&dev_priv->mm.retire_work, HZ); | 673 | schedule_delayed_work(&dev_priv->mm.retire_work, HZ); |
| 619 | return seqno; | 674 | return seqno; |
| @@ -676,30 +731,10 @@ i915_gem_retire_request(struct drm_device *dev, | |||
| 676 | __func__, request->seqno, obj); | 731 | __func__, request->seqno, obj); |
| 677 | #endif | 732 | #endif |
| 678 | 733 | ||
| 679 | if (obj->write_domain != 0) { | 734 | if (obj->write_domain != 0) |
| 680 | list_move_tail(&obj_priv->list, | 735 | i915_gem_object_move_to_flushing(obj); |
| 681 | &dev_priv->mm.flushing_list); | 736 | else |
| 682 | } else { | ||
| 683 | i915_gem_object_move_to_inactive(obj); | 737 | i915_gem_object_move_to_inactive(obj); |
| 684 | } | ||
| 685 | } | ||
| 686 | |||
| 687 | if (request->flush_domains != 0) { | ||
| 688 | struct drm_i915_gem_object *obj_priv, *next; | ||
| 689 | |||
| 690 | /* Clear the write domain and activity from any buffers | ||
| 691 | * that are just waiting for a flush matching the one retired. | ||
| 692 | */ | ||
| 693 | list_for_each_entry_safe(obj_priv, next, | ||
| 694 | &dev_priv->mm.flushing_list, list) { | ||
| 695 | struct drm_gem_object *obj = obj_priv->obj; | ||
| 696 | |||
| 697 | if (obj->write_domain & request->flush_domains) { | ||
| 698 | obj->write_domain = 0; | ||
| 699 | i915_gem_object_move_to_inactive(obj); | ||
| 700 | } | ||
| 701 | } | ||
| 702 | |||
| 703 | } | 738 | } |
| 704 | } | 739 | } |
| 705 | 740 | ||
| @@ -892,25 +927,10 @@ i915_gem_object_wait_rendering(struct drm_gem_object *obj) | |||
| 892 | struct drm_i915_gem_object *obj_priv = obj->driver_private; | 927 | struct drm_i915_gem_object *obj_priv = obj->driver_private; |
| 893 | int ret; | 928 | int ret; |
| 894 | 929 | ||
| 895 | /* If there are writes queued to the buffer, flush and | 930 | /* This function only exists to support waiting for existing rendering, |
| 896 | * create a new seqno to wait for. | 931 | * not for emitting required flushes. |
| 897 | */ | 932 | */ |
| 898 | if (obj->write_domain & ~(I915_GEM_DOMAIN_CPU|I915_GEM_DOMAIN_GTT)) { | 933 | BUG_ON((obj->write_domain & I915_GEM_GPU_DOMAINS) != 0); |
| 899 | uint32_t write_domain = obj->write_domain; | ||
| 900 | #if WATCH_BUF | ||
| 901 | DRM_INFO("%s: flushing object %p from write domain %08x\n", | ||
| 902 | __func__, obj, write_domain); | ||
| 903 | #endif | ||
| 904 | i915_gem_flush(dev, 0, write_domain); | ||
| 905 | |||
| 906 | i915_gem_object_move_to_active(obj); | ||
| 907 | obj_priv->last_rendering_seqno = i915_add_request(dev, | ||
| 908 | write_domain); | ||
| 909 | BUG_ON(obj_priv->last_rendering_seqno == 0); | ||
| 910 | #if WATCH_LRU | ||
| 911 | DRM_INFO("%s: flush moves to exec list %p\n", __func__, obj); | ||
| 912 | #endif | ||
| 913 | } | ||
| 914 | 934 | ||
| 915 | /* If there is rendering queued on the buffer being evicted, wait for | 935 | /* If there is rendering queued on the buffer being evicted, wait for |
| 916 | * it. | 936 | * it. |
| @@ -950,24 +970,16 @@ i915_gem_object_unbind(struct drm_gem_object *obj) | |||
| 950 | return -EINVAL; | 970 | return -EINVAL; |
| 951 | } | 971 | } |
| 952 | 972 | ||
| 953 | /* Wait for any rendering to complete | ||
| 954 | */ | ||
| 955 | ret = i915_gem_object_wait_rendering(obj); | ||
| 956 | if (ret) { | ||
| 957 | DRM_ERROR("wait_rendering failed: %d\n", ret); | ||
| 958 | return ret; | ||
| 959 | } | ||
| 960 | |||
| 961 | /* Move the object to the CPU domain to ensure that | 973 | /* Move the object to the CPU domain to ensure that |
| 962 | * any possible CPU writes while it's not in the GTT | 974 | * any possible CPU writes while it's not in the GTT |
| 963 | * are flushed when we go to remap it. This will | 975 | * are flushed when we go to remap it. This will |
| 964 | * also ensure that all pending GPU writes are finished | 976 | * also ensure that all pending GPU writes are finished |
| 965 | * before we unbind. | 977 | * before we unbind. |
| 966 | */ | 978 | */ |
| 967 | ret = i915_gem_object_set_domain(obj, I915_GEM_DOMAIN_CPU, | 979 | ret = i915_gem_object_set_to_cpu_domain(obj, 1); |
| 968 | I915_GEM_DOMAIN_CPU); | ||
| 969 | if (ret) { | 980 | if (ret) { |
| 970 | DRM_ERROR("set_domain failed: %d\n", ret); | 981 | if (ret != -ERESTARTSYS) |
| 982 | DRM_ERROR("set_domain failed: %d\n", ret); | ||
| 971 | return ret; | 983 | return ret; |
| 972 | } | 984 | } |
| 973 | 985 | ||
| @@ -1083,6 +1095,21 @@ i915_gem_evict_something(struct drm_device *dev) | |||
| 1083 | } | 1095 | } |
| 1084 | 1096 | ||
| 1085 | static int | 1097 | static int |
| 1098 | i915_gem_evict_everything(struct drm_device *dev) | ||
| 1099 | { | ||
| 1100 | int ret; | ||
| 1101 | |||
| 1102 | for (;;) { | ||
| 1103 | ret = i915_gem_evict_something(dev); | ||
| 1104 | if (ret != 0) | ||
| 1105 | break; | ||
| 1106 | } | ||
| 1107 | if (ret == -ENOMEM) | ||
| 1108 | return 0; | ||
| 1109 | return ret; | ||
| 1110 | } | ||
| 1111 | |||
| 1112 | static int | ||
| 1086 | i915_gem_object_get_page_list(struct drm_gem_object *obj) | 1113 | i915_gem_object_get_page_list(struct drm_gem_object *obj) |
| 1087 | { | 1114 | { |
| 1088 | struct drm_i915_gem_object *obj_priv = obj->driver_private; | 1115 | struct drm_i915_gem_object *obj_priv = obj->driver_private; |
| @@ -1168,7 +1195,8 @@ i915_gem_object_bind_to_gtt(struct drm_gem_object *obj, unsigned alignment) | |||
| 1168 | 1195 | ||
| 1169 | ret = i915_gem_evict_something(dev); | 1196 | ret = i915_gem_evict_something(dev); |
| 1170 | if (ret != 0) { | 1197 | if (ret != 0) { |
| 1171 | DRM_ERROR("Failed to evict a buffer %d\n", ret); | 1198 | if (ret != -ERESTARTSYS) |
| 1199 | DRM_ERROR("Failed to evict a buffer %d\n", ret); | ||
| 1172 | return ret; | 1200 | return ret; |
| 1173 | } | 1201 | } |
| 1174 | goto search_free; | 1202 | goto search_free; |
| @@ -1228,6 +1256,143 @@ i915_gem_clflush_object(struct drm_gem_object *obj) | |||
| 1228 | drm_clflush_pages(obj_priv->page_list, obj->size / PAGE_SIZE); | 1256 | drm_clflush_pages(obj_priv->page_list, obj->size / PAGE_SIZE); |
| 1229 | } | 1257 | } |
| 1230 | 1258 | ||
| 1259 | /** Flushes any GPU write domain for the object if it's dirty. */ | ||
| 1260 | static void | ||
| 1261 | i915_gem_object_flush_gpu_write_domain(struct drm_gem_object *obj) | ||
| 1262 | { | ||
| 1263 | struct drm_device *dev = obj->dev; | ||
| 1264 | uint32_t seqno; | ||
| 1265 | |||
| 1266 | if ((obj->write_domain & I915_GEM_GPU_DOMAINS) == 0) | ||
| 1267 | return; | ||
| 1268 | |||
| 1269 | /* Queue the GPU write cache flushing we need. */ | ||
| 1270 | i915_gem_flush(dev, 0, obj->write_domain); | ||
| 1271 | seqno = i915_add_request(dev, obj->write_domain); | ||
| 1272 | obj->write_domain = 0; | ||
| 1273 | i915_gem_object_move_to_active(obj, seqno); | ||
| 1274 | } | ||
| 1275 | |||
| 1276 | /** Flushes the GTT write domain for the object if it's dirty. */ | ||
| 1277 | static void | ||
| 1278 | i915_gem_object_flush_gtt_write_domain(struct drm_gem_object *obj) | ||
| 1279 | { | ||
| 1280 | if (obj->write_domain != I915_GEM_DOMAIN_GTT) | ||
| 1281 | return; | ||
| 1282 | |||
| 1283 | /* No actual flushing is required for the GTT write domain. Writes | ||
| 1284 | * to it immediately go to main memory as far as we know, so there's | ||
| 1285 | * no chipset flush. It also doesn't land in render cache. | ||
| 1286 | */ | ||
| 1287 | obj->write_domain = 0; | ||
| 1288 | } | ||
| 1289 | |||
| 1290 | /** Flushes the CPU write domain for the object if it's dirty. */ | ||
| 1291 | static void | ||
| 1292 | i915_gem_object_flush_cpu_write_domain(struct drm_gem_object *obj) | ||
| 1293 | { | ||
| 1294 | struct drm_device *dev = obj->dev; | ||
| 1295 | |||
| 1296 | if (obj->write_domain != I915_GEM_DOMAIN_CPU) | ||
| 1297 | return; | ||
| 1298 | |||
| 1299 | i915_gem_clflush_object(obj); | ||
| 1300 | drm_agp_chipset_flush(dev); | ||
| 1301 | obj->write_domain = 0; | ||
| 1302 | } | ||
| 1303 | |||
| 1304 | /** | ||
| 1305 | * Moves a single object to the GTT read, and possibly write domain. | ||
| 1306 | * | ||
| 1307 | * This function returns when the move is complete, including waiting on | ||
| 1308 | * flushes to occur. | ||
| 1309 | */ | ||
| 1310 | static int | ||
| 1311 | i915_gem_object_set_to_gtt_domain(struct drm_gem_object *obj, int write) | ||
| 1312 | { | ||
| 1313 | struct drm_i915_gem_object *obj_priv = obj->driver_private; | ||
| 1314 | int ret; | ||
| 1315 | |||
| 1316 | /* Not valid to be called on unbound objects. */ | ||
| 1317 | if (obj_priv->gtt_space == NULL) | ||
| 1318 | return -EINVAL; | ||
| 1319 | |||
| 1320 | i915_gem_object_flush_gpu_write_domain(obj); | ||
| 1321 | /* Wait on any GPU rendering and flushing to occur. */ | ||
| 1322 | ret = i915_gem_object_wait_rendering(obj); | ||
| 1323 | if (ret != 0) | ||
| 1324 | return ret; | ||
| 1325 | |||
| 1326 | /* If we're writing through the GTT domain, then CPU and GPU caches | ||
| 1327 | * will need to be invalidated at next use. | ||
| 1328 | */ | ||
| 1329 | if (write) | ||
| 1330 | obj->read_domains &= I915_GEM_DOMAIN_GTT; | ||
| 1331 | |||
| 1332 | i915_gem_object_flush_cpu_write_domain(obj); | ||
| 1333 | |||
| 1334 | /* It should now be out of any other write domains, and we can update | ||
| 1335 | * the domain values for our changes. | ||
| 1336 | */ | ||
| 1337 | BUG_ON((obj->write_domain & ~I915_GEM_DOMAIN_GTT) != 0); | ||
| 1338 | obj->read_domains |= I915_GEM_DOMAIN_GTT; | ||
| 1339 | if (write) { | ||
| 1340 | obj->write_domain = I915_GEM_DOMAIN_GTT; | ||
| 1341 | obj_priv->dirty = 1; | ||
| 1342 | } | ||
| 1343 | |||
| 1344 | return 0; | ||
| 1345 | } | ||
| 1346 | |||
| 1347 | /** | ||
| 1348 | * Moves a single object to the CPU read, and possibly write domain. | ||
| 1349 | * | ||
| 1350 | * This function returns when the move is complete, including waiting on | ||
| 1351 | * flushes to occur. | ||
| 1352 | */ | ||
| 1353 | static int | ||
| 1354 | i915_gem_object_set_to_cpu_domain(struct drm_gem_object *obj, int write) | ||
| 1355 | { | ||
| 1356 | struct drm_device *dev = obj->dev; | ||
| 1357 | int ret; | ||
| 1358 | |||
| 1359 | i915_gem_object_flush_gpu_write_domain(obj); | ||
| 1360 | /* Wait on any GPU rendering and flushing to occur. */ | ||
| 1361 | ret = i915_gem_object_wait_rendering(obj); | ||
| 1362 | if (ret != 0) | ||
| 1363 | return ret; | ||
| 1364 | |||
| 1365 | i915_gem_object_flush_gtt_write_domain(obj); | ||
| 1366 | |||
| 1367 | /* If we have a partially-valid cache of the object in the CPU, | ||
| 1368 | * finish invalidating it and free the per-page flags. | ||
| 1369 | */ | ||
| 1370 | i915_gem_object_set_to_full_cpu_read_domain(obj); | ||
| 1371 | |||
| 1372 | /* Flush the CPU cache if it's still invalid. */ | ||
| 1373 | if ((obj->read_domains & I915_GEM_DOMAIN_CPU) == 0) { | ||
| 1374 | i915_gem_clflush_object(obj); | ||
| 1375 | drm_agp_chipset_flush(dev); | ||
| 1376 | |||
| 1377 | obj->read_domains |= I915_GEM_DOMAIN_CPU; | ||
| 1378 | } | ||
| 1379 | |||
| 1380 | /* It should now be out of any other write domains, and we can update | ||
| 1381 | * the domain values for our changes. | ||
| 1382 | */ | ||
| 1383 | BUG_ON((obj->write_domain & ~I915_GEM_DOMAIN_CPU) != 0); | ||
| 1384 | |||
| 1385 | /* If we're writing through the CPU, then the GPU read domains will | ||
| 1386 | * need to be invalidated at next use. | ||
| 1387 | */ | ||
| 1388 | if (write) { | ||
| 1389 | obj->read_domains &= I915_GEM_DOMAIN_CPU; | ||
| 1390 | obj->write_domain = I915_GEM_DOMAIN_CPU; | ||
| 1391 | } | ||
| 1392 | |||
| 1393 | return 0; | ||
| 1394 | } | ||
| 1395 | |||
| 1231 | /* | 1396 | /* |
| 1232 | * Set the next domain for the specified object. This | 1397 | * Set the next domain for the specified object. This |
| 1233 | * may not actually perform the necessary flushing/invaliding though, | 1398 | * may not actually perform the necessary flushing/invaliding though, |
| @@ -1339,16 +1504,18 @@ i915_gem_clflush_object(struct drm_gem_object *obj) | |||
| 1339 | * MI_FLUSH | 1504 | * MI_FLUSH |
| 1340 | * drm_agp_chipset_flush | 1505 | * drm_agp_chipset_flush |
| 1341 | */ | 1506 | */ |
| 1342 | static int | 1507 | static void |
| 1343 | i915_gem_object_set_domain(struct drm_gem_object *obj, | 1508 | i915_gem_object_set_to_gpu_domain(struct drm_gem_object *obj, |
| 1344 | uint32_t read_domains, | 1509 | uint32_t read_domains, |
| 1345 | uint32_t write_domain) | 1510 | uint32_t write_domain) |
| 1346 | { | 1511 | { |
| 1347 | struct drm_device *dev = obj->dev; | 1512 | struct drm_device *dev = obj->dev; |
| 1348 | struct drm_i915_gem_object *obj_priv = obj->driver_private; | 1513 | struct drm_i915_gem_object *obj_priv = obj->driver_private; |
| 1349 | uint32_t invalidate_domains = 0; | 1514 | uint32_t invalidate_domains = 0; |
| 1350 | uint32_t flush_domains = 0; | 1515 | uint32_t flush_domains = 0; |
| 1351 | int ret; | 1516 | |
| 1517 | BUG_ON(read_domains & I915_GEM_DOMAIN_CPU); | ||
| 1518 | BUG_ON(write_domain == I915_GEM_DOMAIN_CPU); | ||
| 1352 | 1519 | ||
| 1353 | #if WATCH_BUF | 1520 | #if WATCH_BUF |
| 1354 | DRM_INFO("%s: object %p read %08x -> %08x write %08x -> %08x\n", | 1521 | DRM_INFO("%s: object %p read %08x -> %08x write %08x -> %08x\n", |
| @@ -1385,34 +1552,11 @@ i915_gem_object_set_domain(struct drm_gem_object *obj, | |||
| 1385 | DRM_INFO("%s: CPU domain flush %08x invalidate %08x\n", | 1552 | DRM_INFO("%s: CPU domain flush %08x invalidate %08x\n", |
| 1386 | __func__, flush_domains, invalidate_domains); | 1553 | __func__, flush_domains, invalidate_domains); |
| 1387 | #endif | 1554 | #endif |
| 1388 | /* | ||
| 1389 | * If we're invaliding the CPU cache and flushing a GPU cache, | ||
| 1390 | * then pause for rendering so that the GPU caches will be | ||
| 1391 | * flushed before the cpu cache is invalidated | ||
| 1392 | */ | ||
| 1393 | if ((invalidate_domains & I915_GEM_DOMAIN_CPU) && | ||
| 1394 | (flush_domains & ~(I915_GEM_DOMAIN_CPU | | ||
| 1395 | I915_GEM_DOMAIN_GTT))) { | ||
| 1396 | ret = i915_gem_object_wait_rendering(obj); | ||
| 1397 | if (ret) | ||
| 1398 | return ret; | ||
| 1399 | } | ||
| 1400 | i915_gem_clflush_object(obj); | 1555 | i915_gem_clflush_object(obj); |
| 1401 | } | 1556 | } |
| 1402 | 1557 | ||
| 1403 | if ((write_domain | flush_domains) != 0) | 1558 | if ((write_domain | flush_domains) != 0) |
| 1404 | obj->write_domain = write_domain; | 1559 | obj->write_domain = write_domain; |
| 1405 | |||
| 1406 | /* If we're invalidating the CPU domain, clear the per-page CPU | ||
| 1407 | * domain list as well. | ||
| 1408 | */ | ||
| 1409 | if (obj_priv->page_cpu_valid != NULL && | ||
| 1410 | (write_domain != 0 || | ||
| 1411 | read_domains & I915_GEM_DOMAIN_CPU)) { | ||
| 1412 | drm_free(obj_priv->page_cpu_valid, obj->size / PAGE_SIZE, | ||
| 1413 | DRM_MEM_DRIVER); | ||
| 1414 | obj_priv->page_cpu_valid = NULL; | ||
| 1415 | } | ||
| 1416 | obj->read_domains = read_domains; | 1560 | obj->read_domains = read_domains; |
| 1417 | 1561 | ||
| 1418 | dev->invalidate_domains |= invalidate_domains; | 1562 | dev->invalidate_domains |= invalidate_domains; |
| @@ -1423,47 +1567,94 @@ i915_gem_object_set_domain(struct drm_gem_object *obj, | |||
| 1423 | obj->read_domains, obj->write_domain, | 1567 | obj->read_domains, obj->write_domain, |
| 1424 | dev->invalidate_domains, dev->flush_domains); | 1568 | dev->invalidate_domains, dev->flush_domains); |
| 1425 | #endif | 1569 | #endif |
| 1426 | return 0; | ||
| 1427 | } | 1570 | } |
| 1428 | 1571 | ||
| 1429 | /** | 1572 | /** |
| 1430 | * Set the read/write domain on a range of the object. | 1573 | * Moves the object from a partially CPU read to a full one. |
| 1431 | * | 1574 | * |
| 1432 | * Currently only implemented for CPU reads, otherwise drops to normal | 1575 | * Note that this only resolves i915_gem_object_set_cpu_read_domain_range(), |
| 1433 | * i915_gem_object_set_domain(). | 1576 | * and doesn't handle transitioning from !(read_domains & I915_GEM_DOMAIN_CPU). |
| 1434 | */ | 1577 | */ |
| 1435 | static int | 1578 | static void |
| 1436 | i915_gem_object_set_domain_range(struct drm_gem_object *obj, | 1579 | i915_gem_object_set_to_full_cpu_read_domain(struct drm_gem_object *obj) |
| 1437 | uint64_t offset, | ||
| 1438 | uint64_t size, | ||
| 1439 | uint32_t read_domains, | ||
| 1440 | uint32_t write_domain) | ||
| 1441 | { | 1580 | { |
| 1581 | struct drm_device *dev = obj->dev; | ||
| 1442 | struct drm_i915_gem_object *obj_priv = obj->driver_private; | 1582 | struct drm_i915_gem_object *obj_priv = obj->driver_private; |
| 1443 | int ret, i; | ||
| 1444 | 1583 | ||
| 1445 | if (obj->read_domains & I915_GEM_DOMAIN_CPU) | 1584 | if (!obj_priv->page_cpu_valid) |
| 1446 | return 0; | 1585 | return; |
| 1447 | 1586 | ||
| 1448 | if (read_domains != I915_GEM_DOMAIN_CPU || | 1587 | /* If we're partially in the CPU read domain, finish moving it in. |
| 1449 | write_domain != 0) | 1588 | */ |
| 1450 | return i915_gem_object_set_domain(obj, | 1589 | if (obj->read_domains & I915_GEM_DOMAIN_CPU) { |
| 1451 | read_domains, write_domain); | 1590 | int i; |
| 1452 | 1591 | ||
| 1453 | /* Wait on any GPU rendering to the object to be flushed. */ | 1592 | for (i = 0; i <= (obj->size - 1) / PAGE_SIZE; i++) { |
| 1593 | if (obj_priv->page_cpu_valid[i]) | ||
| 1594 | continue; | ||
| 1595 | drm_clflush_pages(obj_priv->page_list + i, 1); | ||
| 1596 | } | ||
| 1597 | drm_agp_chipset_flush(dev); | ||
| 1598 | } | ||
| 1599 | |||
| 1600 | /* Free the page_cpu_valid mappings which are now stale, whether | ||
| 1601 | * or not we've got I915_GEM_DOMAIN_CPU. | ||
| 1602 | */ | ||
| 1603 | drm_free(obj_priv->page_cpu_valid, obj->size / PAGE_SIZE, | ||
| 1604 | DRM_MEM_DRIVER); | ||
| 1605 | obj_priv->page_cpu_valid = NULL; | ||
| 1606 | } | ||
| 1607 | |||
| 1608 | /** | ||
| 1609 | * Set the CPU read domain on a range of the object. | ||
| 1610 | * | ||
| 1611 | * The object ends up with I915_GEM_DOMAIN_CPU in its read flags although it's | ||
| 1612 | * not entirely valid. The page_cpu_valid member of the object flags which | ||
| 1613 | * pages have been flushed, and will be respected by | ||
| 1614 | * i915_gem_object_set_to_cpu_domain() if it's called on to get a valid mapping | ||
| 1615 | * of the whole object. | ||
| 1616 | * | ||
| 1617 | * This function returns when the move is complete, including waiting on | ||
| 1618 | * flushes to occur. | ||
| 1619 | */ | ||
| 1620 | static int | ||
| 1621 | i915_gem_object_set_cpu_read_domain_range(struct drm_gem_object *obj, | ||
| 1622 | uint64_t offset, uint64_t size) | ||
| 1623 | { | ||
| 1624 | struct drm_i915_gem_object *obj_priv = obj->driver_private; | ||
| 1625 | int i, ret; | ||
| 1626 | |||
| 1627 | if (offset == 0 && size == obj->size) | ||
| 1628 | return i915_gem_object_set_to_cpu_domain(obj, 0); | ||
| 1629 | |||
| 1630 | i915_gem_object_flush_gpu_write_domain(obj); | ||
| 1631 | /* Wait on any GPU rendering and flushing to occur. */ | ||
| 1454 | ret = i915_gem_object_wait_rendering(obj); | 1632 | ret = i915_gem_object_wait_rendering(obj); |
| 1455 | if (ret) | 1633 | if (ret != 0) |
| 1456 | return ret; | 1634 | return ret; |
| 1635 | i915_gem_object_flush_gtt_write_domain(obj); | ||
| 1457 | 1636 | ||
| 1637 | /* If we're already fully in the CPU read domain, we're done. */ | ||
| 1638 | if (obj_priv->page_cpu_valid == NULL && | ||
| 1639 | (obj->read_domains & I915_GEM_DOMAIN_CPU) != 0) | ||
| 1640 | return 0; | ||
| 1641 | |||
| 1642 | /* Otherwise, create/clear the per-page CPU read domain flag if we're | ||
| 1643 | * newly adding I915_GEM_DOMAIN_CPU | ||
| 1644 | */ | ||
| 1458 | if (obj_priv->page_cpu_valid == NULL) { | 1645 | if (obj_priv->page_cpu_valid == NULL) { |
| 1459 | obj_priv->page_cpu_valid = drm_calloc(1, obj->size / PAGE_SIZE, | 1646 | obj_priv->page_cpu_valid = drm_calloc(1, obj->size / PAGE_SIZE, |
| 1460 | DRM_MEM_DRIVER); | 1647 | DRM_MEM_DRIVER); |
| 1461 | } | 1648 | if (obj_priv->page_cpu_valid == NULL) |
| 1649 | return -ENOMEM; | ||
| 1650 | } else if ((obj->read_domains & I915_GEM_DOMAIN_CPU) == 0) | ||
| 1651 | memset(obj_priv->page_cpu_valid, 0, obj->size / PAGE_SIZE); | ||
| 1462 | 1652 | ||
| 1463 | /* Flush the cache on any pages that are still invalid from the CPU's | 1653 | /* Flush the cache on any pages that are still invalid from the CPU's |
| 1464 | * perspective. | 1654 | * perspective. |
| 1465 | */ | 1655 | */ |
| 1466 | for (i = offset / PAGE_SIZE; i <= (offset + size - 1) / PAGE_SIZE; i++) { | 1656 | for (i = offset / PAGE_SIZE; i <= (offset + size - 1) / PAGE_SIZE; |
| 1657 | i++) { | ||
| 1467 | if (obj_priv->page_cpu_valid[i]) | 1658 | if (obj_priv->page_cpu_valid[i]) |
| 1468 | continue; | 1659 | continue; |
| 1469 | 1660 | ||
| @@ -1472,39 +1663,14 @@ i915_gem_object_set_domain_range(struct drm_gem_object *obj, | |||
| 1472 | obj_priv->page_cpu_valid[i] = 1; | 1663 | obj_priv->page_cpu_valid[i] = 1; |
| 1473 | } | 1664 | } |
| 1474 | 1665 | ||
| 1475 | return 0; | 1666 | /* It should now be out of any other write domains, and we can update |
| 1476 | } | 1667 | * the domain values for our changes. |
| 1477 | |||
| 1478 | /** | ||
| 1479 | * Once all of the objects have been set in the proper domain, | ||
| 1480 | * perform the necessary flush and invalidate operations. | ||
| 1481 | * | ||
| 1482 | * Returns the write domains flushed, for use in flush tracking. | ||
| 1483 | */ | ||
| 1484 | static uint32_t | ||
| 1485 | i915_gem_dev_set_domain(struct drm_device *dev) | ||
| 1486 | { | ||
| 1487 | uint32_t flush_domains = dev->flush_domains; | ||
| 1488 | |||
| 1489 | /* | ||
| 1490 | * Now that all the buffers are synced to the proper domains, | ||
| 1491 | * flush and invalidate the collected domains | ||
| 1492 | */ | 1668 | */ |
| 1493 | if (dev->invalidate_domains | dev->flush_domains) { | 1669 | BUG_ON((obj->write_domain & ~I915_GEM_DOMAIN_CPU) != 0); |
| 1494 | #if WATCH_EXEC | ||
| 1495 | DRM_INFO("%s: invalidate_domains %08x flush_domains %08x\n", | ||
| 1496 | __func__, | ||
| 1497 | dev->invalidate_domains, | ||
| 1498 | dev->flush_domains); | ||
| 1499 | #endif | ||
| 1500 | i915_gem_flush(dev, | ||
| 1501 | dev->invalidate_domains, | ||
| 1502 | dev->flush_domains); | ||
| 1503 | dev->invalidate_domains = 0; | ||
| 1504 | dev->flush_domains = 0; | ||
| 1505 | } | ||
| 1506 | 1670 | ||
| 1507 | return flush_domains; | 1671 | obj->read_domains |= I915_GEM_DOMAIN_CPU; |
| 1672 | |||
| 1673 | return 0; | ||
| 1508 | } | 1674 | } |
| 1509 | 1675 | ||
| 1510 | /** | 1676 | /** |
| @@ -1585,6 +1751,18 @@ i915_gem_object_pin_and_relocate(struct drm_gem_object *obj, | |||
| 1585 | return -EINVAL; | 1751 | return -EINVAL; |
| 1586 | } | 1752 | } |
| 1587 | 1753 | ||
| 1754 | if (reloc.write_domain & I915_GEM_DOMAIN_CPU || | ||
| 1755 | reloc.read_domains & I915_GEM_DOMAIN_CPU) { | ||
| 1756 | DRM_ERROR("reloc with read/write CPU domains: " | ||
| 1757 | "obj %p target %d offset %d " | ||
| 1758 | "read %08x write %08x", | ||
| 1759 | obj, reloc.target_handle, | ||
| 1760 | (int) reloc.offset, | ||
| 1761 | reloc.read_domains, | ||
| 1762 | reloc.write_domain); | ||
| 1763 | return -EINVAL; | ||
| 1764 | } | ||
| 1765 | |||
| 1588 | if (reloc.write_domain && target_obj->pending_write_domain && | 1766 | if (reloc.write_domain && target_obj->pending_write_domain && |
| 1589 | reloc.write_domain != target_obj->pending_write_domain) { | 1767 | reloc.write_domain != target_obj->pending_write_domain) { |
| 1590 | DRM_ERROR("Write domain conflict: " | 1768 | DRM_ERROR("Write domain conflict: " |
| @@ -1625,19 +1803,11 @@ i915_gem_object_pin_and_relocate(struct drm_gem_object *obj, | |||
| 1625 | continue; | 1803 | continue; |
| 1626 | } | 1804 | } |
| 1627 | 1805 | ||
| 1628 | /* Now that we're going to actually write some data in, | 1806 | ret = i915_gem_object_set_to_gtt_domain(obj, 1); |
| 1629 | * make sure that any rendering using this buffer's contents | 1807 | if (ret != 0) { |
| 1630 | * is completed. | 1808 | drm_gem_object_unreference(target_obj); |
| 1631 | */ | 1809 | i915_gem_object_unpin(obj); |
| 1632 | i915_gem_object_wait_rendering(obj); | 1810 | return -EINVAL; |
| 1633 | |||
| 1634 | /* As we're writing through the gtt, flush | ||
| 1635 | * any CPU writes before we write the relocations | ||
| 1636 | */ | ||
| 1637 | if (obj->write_domain & I915_GEM_DOMAIN_CPU) { | ||
| 1638 | i915_gem_clflush_object(obj); | ||
| 1639 | drm_agp_chipset_flush(dev); | ||
| 1640 | obj->write_domain = 0; | ||
| 1641 | } | 1811 | } |
| 1642 | 1812 | ||
| 1643 | /* Map the page containing the relocation we're going to | 1813 | /* Map the page containing the relocation we're going to |
| @@ -1779,6 +1949,7 @@ i915_gem_execbuffer(struct drm_device *dev, void *data, | |||
| 1779 | int ret, i, pinned = 0; | 1949 | int ret, i, pinned = 0; |
| 1780 | uint64_t exec_offset; | 1950 | uint64_t exec_offset; |
| 1781 | uint32_t seqno, flush_domains; | 1951 | uint32_t seqno, flush_domains; |
| 1952 | int pin_tries; | ||
| 1782 | 1953 | ||
| 1783 | #if WATCH_EXEC | 1954 | #if WATCH_EXEC |
| 1784 | DRM_INFO("buffers_ptr %d buffer_count %d len %08x\n", | 1955 | DRM_INFO("buffers_ptr %d buffer_count %d len %08x\n", |
| @@ -1827,14 +1998,7 @@ i915_gem_execbuffer(struct drm_device *dev, void *data, | |||
| 1827 | return -EBUSY; | 1998 | return -EBUSY; |
| 1828 | } | 1999 | } |
| 1829 | 2000 | ||
| 1830 | /* Zero the gloabl flush/invalidate flags. These | 2001 | /* Look up object handles */ |
| 1831 | * will be modified as each object is bound to the | ||
| 1832 | * gtt | ||
| 1833 | */ | ||
| 1834 | dev->invalidate_domains = 0; | ||
| 1835 | dev->flush_domains = 0; | ||
| 1836 | |||
| 1837 | /* Look up object handles and perform the relocations */ | ||
| 1838 | for (i = 0; i < args->buffer_count; i++) { | 2002 | for (i = 0; i < args->buffer_count; i++) { |
| 1839 | object_list[i] = drm_gem_object_lookup(dev, file_priv, | 2003 | object_list[i] = drm_gem_object_lookup(dev, file_priv, |
| 1840 | exec_list[i].handle); | 2004 | exec_list[i].handle); |
| @@ -1844,17 +2008,39 @@ i915_gem_execbuffer(struct drm_device *dev, void *data, | |||
| 1844 | ret = -EBADF; | 2008 | ret = -EBADF; |
| 1845 | goto err; | 2009 | goto err; |
| 1846 | } | 2010 | } |
| 2011 | } | ||
| 1847 | 2012 | ||
| 1848 | object_list[i]->pending_read_domains = 0; | 2013 | /* Pin and relocate */ |
| 1849 | object_list[i]->pending_write_domain = 0; | 2014 | for (pin_tries = 0; ; pin_tries++) { |
| 1850 | ret = i915_gem_object_pin_and_relocate(object_list[i], | 2015 | ret = 0; |
| 1851 | file_priv, | 2016 | for (i = 0; i < args->buffer_count; i++) { |
| 1852 | &exec_list[i]); | 2017 | object_list[i]->pending_read_domains = 0; |
| 1853 | if (ret) { | 2018 | object_list[i]->pending_write_domain = 0; |
| 1854 | DRM_ERROR("object bind and relocate failed %d\n", ret); | 2019 | ret = i915_gem_object_pin_and_relocate(object_list[i], |
| 2020 | file_priv, | ||
| 2021 | &exec_list[i]); | ||
| 2022 | if (ret) | ||
| 2023 | break; | ||
| 2024 | pinned = i + 1; | ||
| 2025 | } | ||
| 2026 | /* success */ | ||
| 2027 | if (ret == 0) | ||
| 2028 | break; | ||
| 2029 | |||
| 2030 | /* error other than GTT full, or we've already tried again */ | ||
| 2031 | if (ret != -ENOMEM || pin_tries >= 1) { | ||
| 2032 | DRM_ERROR("Failed to pin buffers %d\n", ret); | ||
| 1855 | goto err; | 2033 | goto err; |
| 1856 | } | 2034 | } |
| 1857 | pinned = i + 1; | 2035 | |
| 2036 | /* unpin all of our buffers */ | ||
| 2037 | for (i = 0; i < pinned; i++) | ||
| 2038 | i915_gem_object_unpin(object_list[i]); | ||
| 2039 | |||
| 2040 | /* evict everyone we can from the aperture */ | ||
| 2041 | ret = i915_gem_evict_everything(dev); | ||
| 2042 | if (ret) | ||
| 2043 | goto err; | ||
| 1858 | } | 2044 | } |
| 1859 | 2045 | ||
| 1860 | /* Set the pending read domains for the batch buffer to COMMAND */ | 2046 | /* Set the pending read domains for the batch buffer to COMMAND */ |
| @@ -1864,21 +2050,37 @@ i915_gem_execbuffer(struct drm_device *dev, void *data, | |||
| 1864 | 2050 | ||
| 1865 | i915_verify_inactive(dev, __FILE__, __LINE__); | 2051 | i915_verify_inactive(dev, __FILE__, __LINE__); |
| 1866 | 2052 | ||
| 2053 | /* Zero the global flush/invalidate flags. These | ||
| 2054 | * will be modified as new domains are computed | ||
| 2055 | * for each object | ||
| 2056 | */ | ||
| 2057 | dev->invalidate_domains = 0; | ||
| 2058 | dev->flush_domains = 0; | ||
| 2059 | |||
| 1867 | for (i = 0; i < args->buffer_count; i++) { | 2060 | for (i = 0; i < args->buffer_count; i++) { |
| 1868 | struct drm_gem_object *obj = object_list[i]; | 2061 | struct drm_gem_object *obj = object_list[i]; |
| 1869 | 2062 | ||
| 1870 | /* make sure all previous memory operations have passed */ | 2063 | /* Compute new gpu domains and update invalidate/flush */ |
| 1871 | ret = i915_gem_object_set_domain(obj, | 2064 | i915_gem_object_set_to_gpu_domain(obj, |
| 1872 | obj->pending_read_domains, | 2065 | obj->pending_read_domains, |
| 1873 | obj->pending_write_domain); | 2066 | obj->pending_write_domain); |
| 1874 | if (ret) | ||
| 1875 | goto err; | ||
| 1876 | } | 2067 | } |
| 1877 | 2068 | ||
| 1878 | i915_verify_inactive(dev, __FILE__, __LINE__); | 2069 | i915_verify_inactive(dev, __FILE__, __LINE__); |
| 1879 | 2070 | ||
| 1880 | /* Flush/invalidate caches and chipset buffer */ | 2071 | if (dev->invalidate_domains | dev->flush_domains) { |
| 1881 | flush_domains = i915_gem_dev_set_domain(dev); | 2072 | #if WATCH_EXEC |
| 2073 | DRM_INFO("%s: invalidate_domains %08x flush_domains %08x\n", | ||
| 2074 | __func__, | ||
| 2075 | dev->invalidate_domains, | ||
| 2076 | dev->flush_domains); | ||
| 2077 | #endif | ||
| 2078 | i915_gem_flush(dev, | ||
| 2079 | dev->invalidate_domains, | ||
| 2080 | dev->flush_domains); | ||
| 2081 | if (dev->flush_domains) | ||
| 2082 | (void)i915_add_request(dev, dev->flush_domains); | ||
| 2083 | } | ||
| 1882 | 2084 | ||
| 1883 | i915_verify_inactive(dev, __FILE__, __LINE__); | 2085 | i915_verify_inactive(dev, __FILE__, __LINE__); |
| 1884 | 2086 | ||
| @@ -1898,8 +2100,6 @@ i915_gem_execbuffer(struct drm_device *dev, void *data, | |||
| 1898 | ~0); | 2100 | ~0); |
| 1899 | #endif | 2101 | #endif |
| 1900 | 2102 | ||
| 1901 | (void)i915_add_request(dev, flush_domains); | ||
| 1902 | |||
| 1903 | /* Exec the batchbuffer */ | 2103 | /* Exec the batchbuffer */ |
| 1904 | ret = i915_dispatch_gem_execbuffer(dev, args, exec_offset); | 2104 | ret = i915_dispatch_gem_execbuffer(dev, args, exec_offset); |
| 1905 | if (ret) { | 2105 | if (ret) { |
| @@ -1927,10 +2127,8 @@ i915_gem_execbuffer(struct drm_device *dev, void *data, | |||
| 1927 | i915_file_priv->mm.last_gem_seqno = seqno; | 2127 | i915_file_priv->mm.last_gem_seqno = seqno; |
| 1928 | for (i = 0; i < args->buffer_count; i++) { | 2128 | for (i = 0; i < args->buffer_count; i++) { |
| 1929 | struct drm_gem_object *obj = object_list[i]; | 2129 | struct drm_gem_object *obj = object_list[i]; |
| 1930 | struct drm_i915_gem_object *obj_priv = obj->driver_private; | ||
| 1931 | 2130 | ||
| 1932 | i915_gem_object_move_to_active(obj); | 2131 | i915_gem_object_move_to_active(obj, seqno); |
| 1933 | obj_priv->last_rendering_seqno = seqno; | ||
| 1934 | #if WATCH_LRU | 2132 | #if WATCH_LRU |
| 1935 | DRM_INFO("%s: move to exec list %p\n", __func__, obj); | 2133 | DRM_INFO("%s: move to exec list %p\n", __func__, obj); |
| 1936 | #endif | 2134 | #endif |
| @@ -2061,11 +2259,7 @@ i915_gem_pin_ioctl(struct drm_device *dev, void *data, | |||
| 2061 | /* XXX - flush the CPU caches for pinned objects | 2259 | /* XXX - flush the CPU caches for pinned objects |
| 2062 | * as the X server doesn't manage domains yet | 2260 | * as the X server doesn't manage domains yet |
| 2063 | */ | 2261 | */ |
| 2064 | if (obj->write_domain & I915_GEM_DOMAIN_CPU) { | 2262 | i915_gem_object_flush_cpu_write_domain(obj); |
| 2065 | i915_gem_clflush_object(obj); | ||
| 2066 | drm_agp_chipset_flush(dev); | ||
| 2067 | obj->write_domain = 0; | ||
| 2068 | } | ||
| 2069 | args->offset = obj_priv->gtt_offset; | 2263 | args->offset = obj_priv->gtt_offset; |
| 2070 | drm_gem_object_unreference(obj); | 2264 | drm_gem_object_unreference(obj); |
| 2071 | mutex_unlock(&dev->struct_mutex); | 2265 | mutex_unlock(&dev->struct_mutex); |
| @@ -2167,29 +2361,6 @@ void i915_gem_free_object(struct drm_gem_object *obj) | |||
| 2167 | drm_free(obj->driver_private, 1, DRM_MEM_DRIVER); | 2361 | drm_free(obj->driver_private, 1, DRM_MEM_DRIVER); |
| 2168 | } | 2362 | } |
| 2169 | 2363 | ||
| 2170 | static int | ||
| 2171 | i915_gem_set_domain(struct drm_gem_object *obj, | ||
| 2172 | struct drm_file *file_priv, | ||
| 2173 | uint32_t read_domains, | ||
| 2174 | uint32_t write_domain) | ||
| 2175 | { | ||
| 2176 | struct drm_device *dev = obj->dev; | ||
| 2177 | int ret; | ||
| 2178 | uint32_t flush_domains; | ||
| 2179 | |||
| 2180 | BUG_ON(!mutex_is_locked(&dev->struct_mutex)); | ||
| 2181 | |||
| 2182 | ret = i915_gem_object_set_domain(obj, read_domains, write_domain); | ||
| 2183 | if (ret) | ||
| 2184 | return ret; | ||
| 2185 | flush_domains = i915_gem_dev_set_domain(obj->dev); | ||
| 2186 | |||
| 2187 | if (flush_domains & ~(I915_GEM_DOMAIN_CPU|I915_GEM_DOMAIN_GTT)) | ||
| 2188 | (void) i915_add_request(dev, flush_domains); | ||
| 2189 | |||
| 2190 | return 0; | ||
| 2191 | } | ||
| 2192 | |||
| 2193 | /** Unbinds all objects that are on the given buffer list. */ | 2364 | /** Unbinds all objects that are on the given buffer list. */ |
| 2194 | static int | 2365 | static int |
| 2195 | i915_gem_evict_from_list(struct drm_device *dev, struct list_head *head) | 2366 | i915_gem_evict_from_list(struct drm_device *dev, struct list_head *head) |
diff --git a/drivers/gpu/drm/i915/i915_gem_proc.c b/drivers/gpu/drm/i915/i915_gem_proc.c index 93de15b4c9a7..e8d5abe1250e 100644 --- a/drivers/gpu/drm/i915/i915_gem_proc.c +++ b/drivers/gpu/drm/i915/i915_gem_proc.c | |||
| @@ -166,10 +166,9 @@ static int i915_gem_request_info(char *buf, char **start, off_t offset, | |||
| 166 | list_for_each_entry(gem_request, &dev_priv->mm.request_list, | 166 | list_for_each_entry(gem_request, &dev_priv->mm.request_list, |
| 167 | list) | 167 | list) |
| 168 | { | 168 | { |
| 169 | DRM_PROC_PRINT(" %d @ %d %08x\n", | 169 | DRM_PROC_PRINT(" %d @ %d\n", |
| 170 | gem_request->seqno, | 170 | gem_request->seqno, |
| 171 | (int) (jiffies - gem_request->emitted_jiffies), | 171 | (int) (jiffies - gem_request->emitted_jiffies)); |
| 172 | gem_request->flush_domains); | ||
| 173 | } | 172 | } |
| 174 | if (len > request + offset) | 173 | if (len > request + offset) |
| 175 | return request; | 174 | return request; |
diff --git a/drivers/gpu/drm/i915/i915_gem_tiling.c b/drivers/gpu/drm/i915/i915_gem_tiling.c index e8b85ac4ca04..a8cb69469c64 100644 --- a/drivers/gpu/drm/i915/i915_gem_tiling.c +++ b/drivers/gpu/drm/i915/i915_gem_tiling.c | |||
| @@ -119,9 +119,10 @@ i915_gem_detect_bit_6_swizzle(struct drm_device *dev) | |||
| 119 | dcc & DCC_CHANNEL_XOR_DISABLE) { | 119 | dcc & DCC_CHANNEL_XOR_DISABLE) { |
| 120 | swizzle_x = I915_BIT_6_SWIZZLE_9_10; | 120 | swizzle_x = I915_BIT_6_SWIZZLE_9_10; |
| 121 | swizzle_y = I915_BIT_6_SWIZZLE_9; | 121 | swizzle_y = I915_BIT_6_SWIZZLE_9; |
| 122 | } else if (IS_I965GM(dev) || IS_GM45(dev)) { | 122 | } else if ((IS_I965GM(dev) || IS_GM45(dev)) && |
| 123 | /* GM965 only does bit 11-based channel | 123 | (dcc & DCC_CHANNEL_XOR_BIT_17) == 0) { |
| 124 | * randomization | 124 | /* GM965/GM45 does either bit 11 or bit 17 |
| 125 | * swizzling. | ||
| 125 | */ | 126 | */ |
| 126 | swizzle_x = I915_BIT_6_SWIZZLE_9_10_11; | 127 | swizzle_x = I915_BIT_6_SWIZZLE_9_10_11; |
| 127 | swizzle_y = I915_BIT_6_SWIZZLE_9_11; | 128 | swizzle_y = I915_BIT_6_SWIZZLE_9_11; |
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index 0e476eba36e6..9d24aaeb8a45 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h | |||
| @@ -522,6 +522,7 @@ | |||
| 522 | #define DCC_ADDRESSING_MODE_DUAL_CHANNEL_INTERLEAVED (2 << 0) | 522 | #define DCC_ADDRESSING_MODE_DUAL_CHANNEL_INTERLEAVED (2 << 0) |
| 523 | #define DCC_ADDRESSING_MODE_MASK (3 << 0) | 523 | #define DCC_ADDRESSING_MODE_MASK (3 << 0) |
| 524 | #define DCC_CHANNEL_XOR_DISABLE (1 << 10) | 524 | #define DCC_CHANNEL_XOR_DISABLE (1 << 10) |
| 525 | #define DCC_CHANNEL_XOR_BIT_17 (1 << 9) | ||
| 525 | 526 | ||
| 526 | /** 965 MCH register controlling DRAM channel configuration */ | 527 | /** 965 MCH register controlling DRAM channel configuration */ |
| 527 | #define C0DRB3 0x10206 | 528 | #define C0DRB3 0x10206 |
diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h index 7a183789be97..3bbb871b25d5 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.h +++ b/drivers/gpu/drm/radeon/radeon_drv.h | |||
| @@ -299,7 +299,6 @@ typedef struct drm_radeon_private { | |||
| 299 | atomic_t swi_emitted; | 299 | atomic_t swi_emitted; |
| 300 | int vblank_crtc; | 300 | int vblank_crtc; |
| 301 | uint32_t irq_enable_reg; | 301 | uint32_t irq_enable_reg; |
| 302 | int irq_enabled; | ||
| 303 | uint32_t r500_disp_irq_reg; | 302 | uint32_t r500_disp_irq_reg; |
| 304 | 303 | ||
| 305 | struct radeon_surface surfaces[RADEON_MAX_SURFACES]; | 304 | struct radeon_surface surfaces[RADEON_MAX_SURFACES]; |
diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c index 97c0599fdb1e..99be11418ac2 100644 --- a/drivers/gpu/drm/radeon/radeon_irq.c +++ b/drivers/gpu/drm/radeon/radeon_irq.c | |||
| @@ -44,7 +44,8 @@ void radeon_irq_set_state(struct drm_device *dev, u32 mask, int state) | |||
| 44 | else | 44 | else |
| 45 | dev_priv->irq_enable_reg &= ~mask; | 45 | dev_priv->irq_enable_reg &= ~mask; |
| 46 | 46 | ||
| 47 | RADEON_WRITE(RADEON_GEN_INT_CNTL, dev_priv->irq_enable_reg); | 47 | if (!dev->irq_enabled) |
| 48 | RADEON_WRITE(RADEON_GEN_INT_CNTL, dev_priv->irq_enable_reg); | ||
| 48 | } | 49 | } |
| 49 | 50 | ||
| 50 | static void r500_vbl_irq_set_state(struct drm_device *dev, u32 mask, int state) | 51 | static void r500_vbl_irq_set_state(struct drm_device *dev, u32 mask, int state) |
| @@ -56,7 +57,8 @@ static void r500_vbl_irq_set_state(struct drm_device *dev, u32 mask, int state) | |||
| 56 | else | 57 | else |
| 57 | dev_priv->r500_disp_irq_reg &= ~mask; | 58 | dev_priv->r500_disp_irq_reg &= ~mask; |
| 58 | 59 | ||
| 59 | RADEON_WRITE(R500_DxMODE_INT_MASK, dev_priv->r500_disp_irq_reg); | 60 | if (!dev->irq_enabled) |
| 61 | RADEON_WRITE(R500_DxMODE_INT_MASK, dev_priv->r500_disp_irq_reg); | ||
| 60 | } | 62 | } |
| 61 | 63 | ||
| 62 | int radeon_enable_vblank(struct drm_device *dev, int crtc) | 64 | int radeon_enable_vblank(struct drm_device *dev, int crtc) |
| @@ -355,8 +357,6 @@ void radeon_driver_irq_uninstall(struct drm_device * dev) | |||
| 355 | if (!dev_priv) | 357 | if (!dev_priv) |
| 356 | return; | 358 | return; |
| 357 | 359 | ||
| 358 | dev_priv->irq_enabled = 0; | ||
| 359 | |||
| 360 | if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS690) | 360 | if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS690) |
| 361 | RADEON_WRITE(R500_DxMODE_INT_MASK, 0); | 361 | RADEON_WRITE(R500_DxMODE_INT_MASK, 0); |
| 362 | /* Disable *all* interrupts */ | 362 | /* Disable *all* interrupts */ |
diff --git a/drivers/i2c/busses/i2c-highlander.c b/drivers/i2c/busses/i2c-highlander.c index f4d22ae9d294..e5a8dae4a289 100644 --- a/drivers/i2c/busses/i2c-highlander.c +++ b/drivers/i2c/busses/i2c-highlander.c | |||
| @@ -92,7 +92,7 @@ static void highlander_i2c_setup(struct highlander_i2c_dev *dev) | |||
| 92 | static void smbus_write_data(u8 *src, u16 *dst, int len) | 92 | static void smbus_write_data(u8 *src, u16 *dst, int len) |
| 93 | { | 93 | { |
| 94 | for (; len > 1; len -= 2) { | 94 | for (; len > 1; len -= 2) { |
| 95 | *dst++ = be16_to_cpup((u16 *)src); | 95 | *dst++ = be16_to_cpup((__be16 *)src); |
| 96 | src += 2; | 96 | src += 2; |
| 97 | } | 97 | } |
| 98 | 98 | ||
| @@ -103,7 +103,7 @@ static void smbus_write_data(u8 *src, u16 *dst, int len) | |||
| 103 | static void smbus_read_data(u16 *src, u8 *dst, int len) | 103 | static void smbus_read_data(u16 *src, u8 *dst, int len) |
| 104 | { | 104 | { |
| 105 | for (; len > 1; len -= 2) { | 105 | for (; len > 1; len -= 2) { |
| 106 | *(u16 *)dst = cpu_to_be16p(src++); | 106 | *(__be16 *)dst = cpu_to_be16p(src++); |
| 107 | dst += 2; | 107 | dst += 2; |
| 108 | } | 108 | } |
| 109 | 109 | ||
diff --git a/drivers/i2c/busses/i2c-pmcmsp.c b/drivers/i2c/busses/i2c-pmcmsp.c index dcf2045b5222..0bdb2d7f0570 100644 --- a/drivers/i2c/busses/i2c-pmcmsp.c +++ b/drivers/i2c/busses/i2c-pmcmsp.c | |||
| @@ -486,7 +486,7 @@ static enum pmcmsptwi_xfer_result pmcmsptwi_xfer_cmd( | |||
| 486 | 486 | ||
| 487 | if (cmd->type == MSP_TWI_CMD_WRITE || | 487 | if (cmd->type == MSP_TWI_CMD_WRITE || |
| 488 | cmd->type == MSP_TWI_CMD_WRITE_READ) { | 488 | cmd->type == MSP_TWI_CMD_WRITE_READ) { |
| 489 | __be64 tmp = cpu_to_be64p((u64 *)cmd->write_data); | 489 | u64 tmp = be64_to_cpup((__be64 *)cmd->write_data); |
| 490 | tmp >>= (MSP_MAX_BYTES_PER_RW - cmd->write_len) * 8; | 490 | tmp >>= (MSP_MAX_BYTES_PER_RW - cmd->write_len) * 8; |
| 491 | dev_dbg(&pmcmsptwi_adapter.dev, "Writing 0x%016llx\n", tmp); | 491 | dev_dbg(&pmcmsptwi_adapter.dev, "Writing 0x%016llx\n", tmp); |
| 492 | pmcmsptwi_writel(tmp & 0x00000000ffffffffLL, | 492 | pmcmsptwi_writel(tmp & 0x00000000ffffffffLL, |
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig index 6d7401772a8f..e6857e01d1ba 100644 --- a/drivers/ide/Kconfig +++ b/drivers/ide/Kconfig | |||
| @@ -669,10 +669,12 @@ config BLK_DEV_CELLEB | |||
| 669 | 669 | ||
| 670 | endif | 670 | endif |
| 671 | 671 | ||
| 672 | # TODO: BLK_DEV_IDEDMA_PCI -> BLK_DEV_IDEDMA_SFF | ||
| 672 | config BLK_DEV_IDE_PMAC | 673 | config BLK_DEV_IDE_PMAC |
| 673 | tristate "PowerMac on-board IDE support" | 674 | tristate "PowerMac on-board IDE support" |
| 674 | depends on PPC_PMAC && IDE=y | 675 | depends on PPC_PMAC && IDE=y |
| 675 | select IDE_TIMINGS | 676 | select IDE_TIMINGS |
| 677 | select BLK_DEV_IDEDMA_PCI | ||
| 676 | help | 678 | help |
| 677 | This driver provides support for the on-board IDE controller on | 679 | This driver provides support for the on-board IDE controller on |
| 678 | most of the recent Apple Power Macintoshes and PowerBooks. | 680 | most of the recent Apple Power Macintoshes and PowerBooks. |
| @@ -689,16 +691,6 @@ config BLK_DEV_IDE_PMAC_ATA100FIRST | |||
| 689 | CD-ROM on hda. This option changes this to more natural hda for | 691 | CD-ROM on hda. This option changes this to more natural hda for |
| 690 | hard disk and hdc for CD-ROM. | 692 | hard disk and hdc for CD-ROM. |
| 691 | 693 | ||
| 692 | config BLK_DEV_IDEDMA_PMAC | ||
| 693 | bool "PowerMac IDE DMA support" | ||
| 694 | depends on BLK_DEV_IDE_PMAC | ||
| 695 | select BLK_DEV_IDEDMA_PCI | ||
| 696 | help | ||
| 697 | This option allows the driver for the on-board IDE controller on | ||
| 698 | Power Macintoshes and PowerBooks to use DMA (direct memory access) | ||
| 699 | to transfer data to and from memory. Saying Y is safe and improves | ||
| 700 | performance. | ||
| 701 | |||
| 702 | config BLK_DEV_IDE_AU1XXX | 694 | config BLK_DEV_IDE_AU1XXX |
| 703 | bool "IDE for AMD Alchemy Au1200" | 695 | bool "IDE for AMD Alchemy Au1200" |
| 704 | depends on SOC_AU1200 | 696 | depends on SOC_AU1200 |
| @@ -912,7 +904,7 @@ config BLK_DEV_UMC8672 | |||
| 912 | endif | 904 | endif |
| 913 | 905 | ||
| 914 | config BLK_DEV_IDEDMA | 906 | config BLK_DEV_IDEDMA |
| 915 | def_bool BLK_DEV_IDEDMA_SFF || BLK_DEV_IDEDMA_PMAC || \ | 907 | def_bool BLK_DEV_IDEDMA_SFF || \ |
| 916 | BLK_DEV_IDEDMA_ICS || BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA | 908 | BLK_DEV_IDEDMA_ICS || BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA |
| 917 | 909 | ||
| 918 | endif # IDE | 910 | endif # IDE |
diff --git a/drivers/ide/alim15x3.c b/drivers/ide/alim15x3.c index e56c7b72f9e2..45d2356bb725 100644 --- a/drivers/ide/alim15x3.c +++ b/drivers/ide/alim15x3.c | |||
| @@ -591,7 +591,7 @@ static int __init ali15x3_ide_init(void) | |||
| 591 | 591 | ||
| 592 | static void __exit ali15x3_ide_exit(void) | 592 | static void __exit ali15x3_ide_exit(void) |
| 593 | { | 593 | { |
| 594 | return pci_unregister_driver(&alim15x3_pci_driver); | 594 | pci_unregister_driver(&alim15x3_pci_driver); |
| 595 | } | 595 | } |
| 596 | 596 | ||
| 597 | module_init(ali15x3_ide_init); | 597 | module_init(ali15x3_ide_init); |
diff --git a/drivers/ide/amd74xx.c b/drivers/ide/amd74xx.c index 81ec73134eda..c6bcd3014a29 100644 --- a/drivers/ide/amd74xx.c +++ b/drivers/ide/amd74xx.c | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | * IDE driver for Linux. | 3 | * IDE driver for Linux. |
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2000-2002 Vojtech Pavlik | 5 | * Copyright (c) 2000-2002 Vojtech Pavlik |
| 6 | * Copyright (c) 2007 Bartlomiej Zolnierkiewicz | 6 | * Copyright (c) 2007-2008 Bartlomiej Zolnierkiewicz |
| 7 | * | 7 | * |
| 8 | * Based on the work of: | 8 | * Based on the work of: |
| 9 | * Andre Hedrick | 9 | * Andre Hedrick |
| @@ -263,6 +263,15 @@ static int __devinit amd74xx_probe(struct pci_dev *dev, const struct pci_device_ | |||
| 263 | d.udma_mask = ATA_UDMA5; | 263 | d.udma_mask = ATA_UDMA5; |
| 264 | } | 264 | } |
| 265 | 265 | ||
| 266 | /* | ||
| 267 | * It seems that on some nVidia controllers using AltStatus | ||
| 268 | * register can be unreliable so default to Status register | ||
| 269 | * if the device is in Compatibility Mode. | ||
| 270 | */ | ||
| 271 | if (dev->vendor == PCI_VENDOR_ID_NVIDIA && | ||
| 272 | ide_pci_is_in_compatibility_mode(dev)) | ||
| 273 | d.host_flags |= IDE_HFLAG_BROKEN_ALTSTATUS; | ||
| 274 | |||
| 266 | printk(KERN_INFO "%s %s: UDMA%s controller\n", | 275 | printk(KERN_INFO "%s %s: UDMA%s controller\n", |
| 267 | d.name, pci_name(dev), amd_dma[fls(d.udma_mask) - 1]); | 276 | d.name, pci_name(dev), amd_dma[fls(d.udma_mask) - 1]); |
| 268 | 277 | ||
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c index 7162d67562af..cc35d6dbd410 100644 --- a/drivers/ide/ide-io.c +++ b/drivers/ide/ide-io.c | |||
| @@ -132,10 +132,14 @@ int ide_end_request (ide_drive_t *drive, int uptodate, int nr_sectors) | |||
| 132 | } | 132 | } |
| 133 | EXPORT_SYMBOL(ide_end_request); | 133 | EXPORT_SYMBOL(ide_end_request); |
| 134 | 134 | ||
| 135 | static void ide_complete_power_step(ide_drive_t *drive, struct request *rq, u8 stat, u8 error) | 135 | static void ide_complete_power_step(ide_drive_t *drive, struct request *rq) |
| 136 | { | 136 | { |
| 137 | struct request_pm_state *pm = rq->data; | 137 | struct request_pm_state *pm = rq->data; |
| 138 | 138 | ||
| 139 | #ifdef DEBUG_PM | ||
| 140 | printk(KERN_INFO "%s: complete_power_step(step: %d)\n", | ||
| 141 | drive->name, pm->pm_step); | ||
| 142 | #endif | ||
| 139 | if (drive->media != ide_disk) | 143 | if (drive->media != ide_disk) |
| 140 | return; | 144 | return; |
| 141 | 145 | ||
| @@ -172,7 +176,7 @@ static ide_startstop_t ide_start_power_step(ide_drive_t *drive, struct request * | |||
| 172 | /* Not supported? Switch to next step now. */ | 176 | /* Not supported? Switch to next step now. */ |
| 173 | if (ata_id_flush_enabled(drive->id) == 0 || | 177 | if (ata_id_flush_enabled(drive->id) == 0 || |
| 174 | (drive->dev_flags & IDE_DFLAG_WCACHE) == 0) { | 178 | (drive->dev_flags & IDE_DFLAG_WCACHE) == 0) { |
| 175 | ide_complete_power_step(drive, rq, 0, 0); | 179 | ide_complete_power_step(drive, rq); |
| 176 | return ide_stopped; | 180 | return ide_stopped; |
| 177 | } | 181 | } |
| 178 | if (ata_id_flush_ext_enabled(drive->id)) | 182 | if (ata_id_flush_ext_enabled(drive->id)) |
| @@ -191,7 +195,7 @@ static ide_startstop_t ide_start_power_step(ide_drive_t *drive, struct request * | |||
| 191 | if (drive->media != ide_disk) | 195 | if (drive->media != ide_disk) |
| 192 | pm->pm_step = IDE_PM_RESTORE_DMA; | 196 | pm->pm_step = IDE_PM_RESTORE_DMA; |
| 193 | else | 197 | else |
| 194 | ide_complete_power_step(drive, rq, 0, 0); | 198 | ide_complete_power_step(drive, rq); |
| 195 | return ide_stopped; | 199 | return ide_stopped; |
| 196 | case IDE_PM_IDLE: /* Resume step 2 (idle) */ | 200 | case IDE_PM_IDLE: /* Resume step 2 (idle) */ |
| 197 | args->tf.command = ATA_CMD_IDLEIMMEDIATE; | 201 | args->tf.command = ATA_CMD_IDLEIMMEDIATE; |
| @@ -322,11 +326,8 @@ void ide_end_drive_cmd (ide_drive_t *drive, u8 stat, u8 err) | |||
| 322 | } | 326 | } |
| 323 | } else if (blk_pm_request(rq)) { | 327 | } else if (blk_pm_request(rq)) { |
| 324 | struct request_pm_state *pm = rq->data; | 328 | struct request_pm_state *pm = rq->data; |
| 325 | #ifdef DEBUG_PM | 329 | |
| 326 | printk("%s: complete_power_step(step: %d, stat: %x, err: %x)\n", | 330 | ide_complete_power_step(drive, rq); |
| 327 | drive->name, rq->pm->pm_step, stat, err); | ||
| 328 | #endif | ||
| 329 | ide_complete_power_step(drive, rq, stat, err); | ||
| 330 | if (pm->pm_step == IDE_PM_COMPLETED) | 331 | if (pm->pm_step == IDE_PM_COMPLETED) |
| 331 | ide_complete_pm_request(drive, rq); | 332 | ide_complete_pm_request(drive, rq); |
| 332 | return; | 333 | return; |
| @@ -804,7 +805,7 @@ static ide_startstop_t start_request (ide_drive_t *drive, struct request *rq) | |||
| 804 | struct request_pm_state *pm = rq->data; | 805 | struct request_pm_state *pm = rq->data; |
| 805 | #ifdef DEBUG_PM | 806 | #ifdef DEBUG_PM |
| 806 | printk("%s: start_power_step(step: %d)\n", | 807 | printk("%s: start_power_step(step: %d)\n", |
| 807 | drive->name, rq->pm->pm_step); | 808 | drive->name, pm->pm_step); |
| 808 | #endif | 809 | #endif |
| 809 | startstop = ide_start_power_step(drive, rq); | 810 | startstop = ide_start_power_step(drive, rq); |
| 810 | if (startstop == ide_stopped && | 811 | if (startstop == ide_stopped && |
| @@ -967,14 +968,13 @@ static void ide_do_request (ide_hwgroup_t *hwgroup, int masked_irq) | |||
| 967 | ide_startstop_t startstop; | 968 | ide_startstop_t startstop; |
| 968 | int loops = 0; | 969 | int loops = 0; |
| 969 | 970 | ||
| 970 | /* for atari only: POSSIBLY BROKEN HERE(?) */ | ||
| 971 | ide_get_lock(ide_intr, hwgroup); | ||
| 972 | |||
| 973 | /* caller must own ide_lock */ | 971 | /* caller must own ide_lock */ |
| 974 | BUG_ON(!irqs_disabled()); | 972 | BUG_ON(!irqs_disabled()); |
| 975 | 973 | ||
| 976 | while (!hwgroup->busy) { | 974 | while (!hwgroup->busy) { |
| 977 | hwgroup->busy = 1; | 975 | hwgroup->busy = 1; |
| 976 | /* for atari only */ | ||
| 977 | ide_get_lock(ide_intr, hwgroup); | ||
| 978 | drive = choose_drive(hwgroup); | 978 | drive = choose_drive(hwgroup); |
| 979 | if (drive == NULL) { | 979 | if (drive == NULL) { |
| 980 | int sleeping = 0; | 980 | int sleeping = 0; |
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c index 5d6ba14e211d..c41c3b9b6f02 100644 --- a/drivers/ide/ide-iops.c +++ b/drivers/ide/ide-iops.c | |||
| @@ -457,18 +457,14 @@ int drive_is_ready (ide_drive_t *drive) | |||
| 457 | if (drive->waiting_for_dma) | 457 | if (drive->waiting_for_dma) |
| 458 | return hwif->dma_ops->dma_test_irq(drive); | 458 | return hwif->dma_ops->dma_test_irq(drive); |
| 459 | 459 | ||
| 460 | #if 0 | ||
| 461 | /* need to guarantee 400ns since last command was issued */ | ||
| 462 | udelay(1); | ||
| 463 | #endif | ||
| 464 | |||
| 465 | /* | 460 | /* |
| 466 | * We do a passive status test under shared PCI interrupts on | 461 | * We do a passive status test under shared PCI interrupts on |
| 467 | * cards that truly share the ATA side interrupt, but may also share | 462 | * cards that truly share the ATA side interrupt, but may also share |
| 468 | * an interrupt with another pci card/device. We make no assumptions | 463 | * an interrupt with another pci card/device. We make no assumptions |
| 469 | * about possible isa-pnp and pci-pnp issues yet. | 464 | * about possible isa-pnp and pci-pnp issues yet. |
| 470 | */ | 465 | */ |
| 471 | if (hwif->io_ports.ctl_addr) | 466 | if (hwif->io_ports.ctl_addr && |
| 467 | (hwif->host_flags & IDE_HFLAG_BROKEN_ALTSTATUS) == 0) | ||
| 472 | stat = hwif->tp_ops->read_altstatus(hwif); | 468 | stat = hwif->tp_ops->read_altstatus(hwif); |
| 473 | else | 469 | else |
| 474 | /* Note: this may clear a pending IRQ!! */ | 470 | /* Note: this may clear a pending IRQ!! */ |
| @@ -610,6 +606,7 @@ static const struct drive_list_entry ivb_list[] = { | |||
| 610 | { "TSSTcorp CDDVDW SH-S202N" , "SB01" }, | 606 | { "TSSTcorp CDDVDW SH-S202N" , "SB01" }, |
| 611 | { "TSSTcorp CDDVDW SH-S202H" , "SB00" }, | 607 | { "TSSTcorp CDDVDW SH-S202H" , "SB00" }, |
| 612 | { "TSSTcorp CDDVDW SH-S202H" , "SB01" }, | 608 | { "TSSTcorp CDDVDW SH-S202H" , "SB01" }, |
| 609 | { "SAMSUNG SP0822N" , "WA100-10" }, | ||
| 613 | { NULL , NULL } | 610 | { NULL , NULL } |
| 614 | }; | 611 | }; |
| 615 | 612 | ||
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index 1649ea54f76c..c55bdbd22314 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c | |||
| @@ -266,7 +266,8 @@ static int actual_try_to_identify (ide_drive_t *drive, u8 cmd) | |||
| 266 | /* take a deep breath */ | 266 | /* take a deep breath */ |
| 267 | msleep(50); | 267 | msleep(50); |
| 268 | 268 | ||
| 269 | if (io_ports->ctl_addr) { | 269 | if (io_ports->ctl_addr && |
| 270 | (hwif->host_flags & IDE_HFLAG_BROKEN_ALTSTATUS) == 0) { | ||
| 270 | a = tp_ops->read_altstatus(hwif); | 271 | a = tp_ops->read_altstatus(hwif); |
| 271 | s = tp_ops->read_status(hwif); | 272 | s = tp_ops->read_status(hwif); |
| 272 | if ((a ^ s) & ~ATA_IDX) | 273 | if ((a ^ s) & ~ATA_IDX) |
diff --git a/drivers/ide/pmac.c b/drivers/ide/pmac.c index 2e19d6298536..7c481bb56fab 100644 --- a/drivers/ide/pmac.c +++ b/drivers/ide/pmac.c | |||
| @@ -66,7 +66,6 @@ typedef struct pmac_ide_hwif { | |||
| 66 | struct macio_dev *mdev; | 66 | struct macio_dev *mdev; |
| 67 | u32 timings[4]; | 67 | u32 timings[4]; |
| 68 | volatile u32 __iomem * *kauai_fcr; | 68 | volatile u32 __iomem * *kauai_fcr; |
| 69 | #ifdef CONFIG_BLK_DEV_IDEDMA_PMAC | ||
| 70 | /* Those fields are duplicating what is in hwif. We currently | 69 | /* Those fields are duplicating what is in hwif. We currently |
| 71 | * can't use the hwif ones because of some assumptions that are | 70 | * can't use the hwif ones because of some assumptions that are |
| 72 | * beeing done by the generic code about the kind of dma controller | 71 | * beeing done by the generic code about the kind of dma controller |
| @@ -74,8 +73,6 @@ typedef struct pmac_ide_hwif { | |||
| 74 | */ | 73 | */ |
| 75 | volatile struct dbdma_regs __iomem * dma_regs; | 74 | volatile struct dbdma_regs __iomem * dma_regs; |
| 76 | struct dbdma_cmd* dma_table_cpu; | 75 | struct dbdma_cmd* dma_table_cpu; |
| 77 | #endif | ||
| 78 | |||
| 79 | } pmac_ide_hwif_t; | 76 | } pmac_ide_hwif_t; |
| 80 | 77 | ||
| 81 | enum { | 78 | enum { |
| @@ -222,8 +219,6 @@ static const char* model_name[] = { | |||
| 222 | #define KAUAI_FCR_UATA_RESET_N 0x00000002 | 219 | #define KAUAI_FCR_UATA_RESET_N 0x00000002 |
| 223 | #define KAUAI_FCR_UATA_ENABLE 0x00000001 | 220 | #define KAUAI_FCR_UATA_ENABLE 0x00000001 |
| 224 | 221 | ||
| 225 | #ifdef CONFIG_BLK_DEV_IDEDMA_PMAC | ||
| 226 | |||
| 227 | /* Rounded Multiword DMA timings | 222 | /* Rounded Multiword DMA timings |
| 228 | * | 223 | * |
| 229 | * I gave up finding a generic formula for all controller | 224 | * I gave up finding a generic formula for all controller |
| @@ -413,8 +408,6 @@ static int pmac_ide_build_dmatable(ide_drive_t *drive, struct request *rq); | |||
| 413 | static void pmac_ide_selectproc(ide_drive_t *drive); | 408 | static void pmac_ide_selectproc(ide_drive_t *drive); |
| 414 | static void pmac_ide_kauai_selectproc(ide_drive_t *drive); | 409 | static void pmac_ide_kauai_selectproc(ide_drive_t *drive); |
| 415 | 410 | ||
| 416 | #endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */ | ||
| 417 | |||
| 418 | #define PMAC_IDE_REG(x) \ | 411 | #define PMAC_IDE_REG(x) \ |
| 419 | ((void __iomem *)((drive)->hwif->io_ports.data_addr + (x))) | 412 | ((void __iomem *)((drive)->hwif->io_ports.data_addr + (x))) |
| 420 | 413 | ||
| @@ -584,8 +577,6 @@ pmac_ide_set_pio_mode(ide_drive_t *drive, const u8 pio) | |||
| 584 | pmac_ide_do_update_timings(drive); | 577 | pmac_ide_do_update_timings(drive); |
| 585 | } | 578 | } |
| 586 | 579 | ||
| 587 | #ifdef CONFIG_BLK_DEV_IDEDMA_PMAC | ||
| 588 | |||
| 589 | /* | 580 | /* |
| 590 | * Calculate KeyLargo ATA/66 UDMA timings | 581 | * Calculate KeyLargo ATA/66 UDMA timings |
| 591 | */ | 582 | */ |
| @@ -786,7 +777,6 @@ set_timings_mdma(ide_drive_t *drive, int intf_type, u32 *timings, u32 *timings2, | |||
| 786 | drive->name, speed & 0xf, *timings); | 777 | drive->name, speed & 0xf, *timings); |
| 787 | #endif | 778 | #endif |
| 788 | } | 779 | } |
| 789 | #endif /* #ifdef CONFIG_BLK_DEV_IDEDMA_PMAC */ | ||
| 790 | 780 | ||
| 791 | static void pmac_ide_set_dma_mode(ide_drive_t *drive, const u8 speed) | 781 | static void pmac_ide_set_dma_mode(ide_drive_t *drive, const u8 speed) |
| 792 | { | 782 | { |
| @@ -804,7 +794,6 @@ static void pmac_ide_set_dma_mode(ide_drive_t *drive, const u8 speed) | |||
| 804 | tl[0] = *timings; | 794 | tl[0] = *timings; |
| 805 | tl[1] = *timings2; | 795 | tl[1] = *timings2; |
| 806 | 796 | ||
| 807 | #ifdef CONFIG_BLK_DEV_IDEDMA_PMAC | ||
| 808 | if (speed >= XFER_UDMA_0) { | 797 | if (speed >= XFER_UDMA_0) { |
| 809 | if (pmif->kind == controller_kl_ata4) | 798 | if (pmif->kind == controller_kl_ata4) |
| 810 | ret = set_timings_udma_ata4(&tl[0], speed); | 799 | ret = set_timings_udma_ata4(&tl[0], speed); |
| @@ -817,7 +806,7 @@ static void pmac_ide_set_dma_mode(ide_drive_t *drive, const u8 speed) | |||
| 817 | ret = -1; | 806 | ret = -1; |
| 818 | } else | 807 | } else |
| 819 | set_timings_mdma(drive, pmif->kind, &tl[0], &tl[1], speed); | 808 | set_timings_mdma(drive, pmif->kind, &tl[0], &tl[1], speed); |
| 820 | #endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */ | 809 | |
| 821 | if (ret) | 810 | if (ret) |
| 822 | return; | 811 | return; |
| 823 | 812 | ||
| @@ -1008,9 +997,7 @@ static const struct ide_port_info pmac_port_info = { | |||
| 1008 | .chipset = ide_pmac, | 997 | .chipset = ide_pmac, |
| 1009 | .tp_ops = &pmac_tp_ops, | 998 | .tp_ops = &pmac_tp_ops, |
| 1010 | .port_ops = &pmac_ide_port_ops, | 999 | .port_ops = &pmac_ide_port_ops, |
| 1011 | #ifdef CONFIG_BLK_DEV_IDEDMA_PMAC | ||
| 1012 | .dma_ops = &pmac_dma_ops, | 1000 | .dma_ops = &pmac_dma_ops, |
| 1013 | #endif | ||
| 1014 | .host_flags = IDE_HFLAG_SET_PIO_MODE_KEEP_DMA | | 1001 | .host_flags = IDE_HFLAG_SET_PIO_MODE_KEEP_DMA | |
| 1015 | IDE_HFLAG_POST_SET_MODE | | 1002 | IDE_HFLAG_POST_SET_MODE | |
| 1016 | IDE_HFLAG_MMIO | | 1003 | IDE_HFLAG_MMIO | |
| @@ -1182,7 +1169,7 @@ pmac_ide_macio_attach(struct macio_dev *mdev, const struct of_device_id *match) | |||
| 1182 | pmif->regbase = regbase; | 1169 | pmif->regbase = regbase; |
| 1183 | pmif->irq = irq; | 1170 | pmif->irq = irq; |
| 1184 | pmif->kauai_fcr = NULL; | 1171 | pmif->kauai_fcr = NULL; |
| 1185 | #ifdef CONFIG_BLK_DEV_IDEDMA_PMAC | 1172 | |
| 1186 | if (macio_resource_count(mdev) >= 2) { | 1173 | if (macio_resource_count(mdev) >= 2) { |
| 1187 | if (macio_request_resource(mdev, 1, "ide-pmac (dma)")) | 1174 | if (macio_request_resource(mdev, 1, "ide-pmac (dma)")) |
| 1188 | printk(KERN_WARNING "ide-pmac: can't request DMA " | 1175 | printk(KERN_WARNING "ide-pmac: can't request DMA " |
| @@ -1192,7 +1179,7 @@ pmac_ide_macio_attach(struct macio_dev *mdev, const struct of_device_id *match) | |||
| 1192 | pmif->dma_regs = ioremap(macio_resource_start(mdev, 1), 0x1000); | 1179 | pmif->dma_regs = ioremap(macio_resource_start(mdev, 1), 0x1000); |
| 1193 | } else | 1180 | } else |
| 1194 | pmif->dma_regs = NULL; | 1181 | pmif->dma_regs = NULL; |
| 1195 | #endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */ | 1182 | |
| 1196 | dev_set_drvdata(&mdev->ofdev.dev, pmif); | 1183 | dev_set_drvdata(&mdev->ofdev.dev, pmif); |
| 1197 | 1184 | ||
| 1198 | memset(&hw, 0, sizeof(hw)); | 1185 | memset(&hw, 0, sizeof(hw)); |
| @@ -1300,9 +1287,7 @@ pmac_ide_pci_attach(struct pci_dev *pdev, const struct pci_device_id *id) | |||
| 1300 | 1287 | ||
| 1301 | base = ioremap(rbase, rlen); | 1288 | base = ioremap(rbase, rlen); |
| 1302 | pmif->regbase = (unsigned long) base + 0x2000; | 1289 | pmif->regbase = (unsigned long) base + 0x2000; |
| 1303 | #ifdef CONFIG_BLK_DEV_IDEDMA_PMAC | ||
| 1304 | pmif->dma_regs = base + 0x1000; | 1290 | pmif->dma_regs = base + 0x1000; |
| 1305 | #endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */ | ||
| 1306 | pmif->kauai_fcr = base; | 1291 | pmif->kauai_fcr = base; |
| 1307 | pmif->irq = pdev->irq; | 1292 | pmif->irq = pdev->irq; |
| 1308 | 1293 | ||
| @@ -1434,8 +1419,6 @@ out: | |||
| 1434 | return error; | 1419 | return error; |
| 1435 | } | 1420 | } |
| 1436 | 1421 | ||
| 1437 | #ifdef CONFIG_BLK_DEV_IDEDMA_PMAC | ||
| 1438 | |||
| 1439 | /* | 1422 | /* |
| 1440 | * pmac_ide_build_dmatable builds the DBDMA command list | 1423 | * pmac_ide_build_dmatable builds the DBDMA command list |
| 1441 | * for a transfer and sets the DBDMA channel to point to it. | 1424 | * for a transfer and sets the DBDMA channel to point to it. |
| @@ -1723,13 +1706,6 @@ static int __devinit pmac_ide_init_dma(ide_hwif_t *hwif, | |||
| 1723 | 1706 | ||
| 1724 | return 0; | 1707 | return 0; |
| 1725 | } | 1708 | } |
| 1726 | #else | ||
| 1727 | static int __devinit pmac_ide_init_dma(ide_hwif_t *hwif, | ||
| 1728 | const struct ide_port_info *d) | ||
| 1729 | { | ||
| 1730 | return -EOPNOTSUPP; | ||
| 1731 | } | ||
| 1732 | #endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */ | ||
| 1733 | 1709 | ||
| 1734 | module_init(pmac_ide_probe); | 1710 | module_init(pmac_ide_probe); |
| 1735 | 1711 | ||
diff --git a/drivers/ide/sgiioc4.c b/drivers/ide/sgiioc4.c index 7defa0ae2014..a687a7dfea6f 100644 --- a/drivers/ide/sgiioc4.c +++ b/drivers/ide/sgiioc4.c | |||
| @@ -550,7 +550,7 @@ static const struct ide_dma_ops sgiioc4_dma_ops = { | |||
| 550 | .dma_timeout = ide_dma_timeout, | 550 | .dma_timeout = ide_dma_timeout, |
| 551 | }; | 551 | }; |
| 552 | 552 | ||
| 553 | static const struct ide_port_info sgiioc4_port_info __devinitdata = { | 553 | static const struct ide_port_info sgiioc4_port_info __devinitconst = { |
| 554 | .name = DRV_NAME, | 554 | .name = DRV_NAME, |
| 555 | .chipset = ide_pci, | 555 | .chipset = ide_pci, |
| 556 | .init_dma = ide_dma_sgiioc4, | 556 | .init_dma = ide_dma_sgiioc4, |
| @@ -633,7 +633,7 @@ out: | |||
| 633 | return ret; | 633 | return ret; |
| 634 | } | 634 | } |
| 635 | 635 | ||
| 636 | int | 636 | int __devinit |
| 637 | ioc4_ide_attach_one(struct ioc4_driver_data *idd) | 637 | ioc4_ide_attach_one(struct ioc4_driver_data *idd) |
| 638 | { | 638 | { |
| 639 | /* PCI-RT does not bring out IDE connection. | 639 | /* PCI-RT does not bring out IDE connection. |
| @@ -645,7 +645,7 @@ ioc4_ide_attach_one(struct ioc4_driver_data *idd) | |||
| 645 | return pci_init_sgiioc4(idd->idd_pdev); | 645 | return pci_init_sgiioc4(idd->idd_pdev); |
| 646 | } | 646 | } |
| 647 | 647 | ||
| 648 | static struct ioc4_submodule ioc4_ide_submodule = { | 648 | static struct ioc4_submodule __devinitdata ioc4_ide_submodule = { |
| 649 | .is_name = "IOC4_ide", | 649 | .is_name = "IOC4_ide", |
| 650 | .is_owner = THIS_MODULE, | 650 | .is_owner = THIS_MODULE, |
| 651 | .is_probe = ioc4_ide_attach_one, | 651 | .is_probe = ioc4_ide_attach_one, |
diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c index 9e39f73282ee..79ef5fd928ae 100644 --- a/drivers/ieee1394/nodemgr.c +++ b/drivers/ieee1394/nodemgr.c | |||
| @@ -115,8 +115,14 @@ static int nodemgr_bus_read(struct csr1212_csr *csr, u64 addr, u16 length, | |||
| 115 | return error; | 115 | return error; |
| 116 | } | 116 | } |
| 117 | 117 | ||
| 118 | #define OUI_FREECOM_TECHNOLOGIES_GMBH 0x0001db | ||
| 119 | |||
| 118 | static int nodemgr_get_max_rom(quadlet_t *bus_info_data, void *__ci) | 120 | static int nodemgr_get_max_rom(quadlet_t *bus_info_data, void *__ci) |
| 119 | { | 121 | { |
| 122 | /* Freecom FireWire Hard Drive firmware bug */ | ||
| 123 | if (be32_to_cpu(bus_info_data[3]) >> 8 == OUI_FREECOM_TECHNOLOGIES_GMBH) | ||
| 124 | return 0; | ||
| 125 | |||
| 120 | return (be32_to_cpu(bus_info_data[2]) >> 8) & 0x3; | 126 | return (be32_to_cpu(bus_info_data[2]) >> 8) & 0x3; |
| 121 | } | 127 | } |
| 122 | 128 | ||
| @@ -1685,6 +1691,7 @@ static int nodemgr_host_thread(void *data) | |||
| 1685 | g = get_hpsb_generation(host); | 1691 | g = get_hpsb_generation(host); |
| 1686 | for (i = 0; i < 4 ; i++) { | 1692 | for (i = 0; i < 4 ; i++) { |
| 1687 | msleep_interruptible(63); | 1693 | msleep_interruptible(63); |
| 1694 | try_to_freeze(); | ||
| 1688 | if (kthread_should_stop()) | 1695 | if (kthread_should_stop()) |
| 1689 | goto exit; | 1696 | goto exit; |
| 1690 | 1697 | ||
| @@ -1725,6 +1732,7 @@ static int nodemgr_host_thread(void *data) | |||
| 1725 | /* Sleep 3 seconds */ | 1732 | /* Sleep 3 seconds */ |
| 1726 | for (i = 3000/200; i; i--) { | 1733 | for (i = 3000/200; i; i--) { |
| 1727 | msleep_interruptible(200); | 1734 | msleep_interruptible(200); |
| 1735 | try_to_freeze(); | ||
| 1728 | if (kthread_should_stop()) | 1736 | if (kthread_should_stop()) |
| 1729 | goto exit; | 1737 | goto exit; |
| 1730 | 1738 | ||
diff --git a/drivers/isdn/hardware/avm/b1isa.c b/drivers/isdn/hardware/avm/b1isa.c index 1e288eeb5e2a..6461a32bc838 100644 --- a/drivers/isdn/hardware/avm/b1isa.c +++ b/drivers/isdn/hardware/avm/b1isa.c | |||
| @@ -233,10 +233,8 @@ static void __exit b1isa_exit(void) | |||
| 233 | int i; | 233 | int i; |
| 234 | 234 | ||
| 235 | for (i = 0; i < MAX_CARDS; i++) { | 235 | for (i = 0; i < MAX_CARDS; i++) { |
| 236 | if (!io[i]) | 236 | if (isa_dev[i].resource[0].start) |
| 237 | break; | 237 | b1isa_remove(&isa_dev[i]); |
| 238 | |||
| 239 | b1isa_remove(&isa_dev[i]); | ||
| 240 | } | 238 | } |
| 241 | unregister_capi_driver(&capi_driver_b1isa); | 239 | unregister_capi_driver(&capi_driver_b1isa); |
| 242 | } | 240 | } |
diff --git a/drivers/isdn/hysdn/hysdn_net.c b/drivers/isdn/hysdn/hysdn_net.c index cfa8fa5e44ab..3f2a0a20c19b 100644 --- a/drivers/isdn/hysdn/hysdn_net.c +++ b/drivers/isdn/hysdn/hysdn_net.c | |||
| @@ -83,12 +83,12 @@ net_open(struct net_device *dev) | |||
| 83 | 83 | ||
| 84 | /* Fill in the MAC-level header (if not already set) */ | 84 | /* Fill in the MAC-level header (if not already set) */ |
| 85 | if (!card->mac_addr[0]) { | 85 | if (!card->mac_addr[0]) { |
| 86 | for (i = 0; i < ETH_ALEN - sizeof(unsigned long); i++) | 86 | for (i = 0; i < ETH_ALEN; i++) |
| 87 | dev->dev_addr[i] = 0xfc; | 87 | dev->dev_addr[i] = 0xfc; |
| 88 | if ((in_dev = dev->ip_ptr) != NULL) { | 88 | if ((in_dev = dev->ip_ptr) != NULL) { |
| 89 | struct in_ifaddr *ifa = in_dev->ifa_list; | 89 | struct in_ifaddr *ifa = in_dev->ifa_list; |
| 90 | if (ifa != NULL) | 90 | if (ifa != NULL) |
| 91 | memcpy(dev->dev_addr + (ETH_ALEN - sizeof(unsigned long)), &ifa->ifa_local, sizeof(unsigned long)); | 91 | memcpy(dev->dev_addr + (ETH_ALEN - sizeof(ifa->ifa_local)), &ifa->ifa_local, sizeof(ifa->ifa_local)); |
| 92 | } | 92 | } |
| 93 | } else | 93 | } else |
| 94 | memcpy(dev->dev_addr, card->mac_addr, ETH_ALEN); | 94 | memcpy(dev->dev_addr, card->mac_addr, ETH_ALEN); |
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c index a63161aec487..04e5fd742c2c 100644 --- a/drivers/md/dm-table.c +++ b/drivers/md/dm-table.c | |||
| @@ -668,7 +668,7 @@ static void check_for_valid_limits(struct io_restrictions *rs) | |||
| 668 | if (!rs->max_segment_size) | 668 | if (!rs->max_segment_size) |
| 669 | rs->max_segment_size = MAX_SEGMENT_SIZE; | 669 | rs->max_segment_size = MAX_SEGMENT_SIZE; |
| 670 | if (!rs->seg_boundary_mask) | 670 | if (!rs->seg_boundary_mask) |
| 671 | rs->seg_boundary_mask = -1; | 671 | rs->seg_boundary_mask = BLK_SEG_BOUNDARY_MASK; |
| 672 | if (!rs->bounce_pfn) | 672 | if (!rs->bounce_pfn) |
| 673 | rs->bounce_pfn = -1; | 673 | rs->bounce_pfn = -1; |
| 674 | } | 674 | } |
diff --git a/drivers/message/i2o/i2o_block.c b/drivers/message/i2o/i2o_block.c index 84bdc2ee69e6..a443e136dc41 100644 --- a/drivers/message/i2o/i2o_block.c +++ b/drivers/message/i2o/i2o_block.c | |||
| @@ -354,7 +354,7 @@ static inline void i2o_block_sglist_free(struct i2o_block_request *ireq) | |||
| 354 | * @req: the request to prepare | 354 | * @req: the request to prepare |
| 355 | * | 355 | * |
| 356 | * Allocate the necessary i2o_block_request struct and connect it to | 356 | * Allocate the necessary i2o_block_request struct and connect it to |
| 357 | * the request. This is needed that we not loose the SG list later on. | 357 | * the request. This is needed that we not lose the SG list later on. |
| 358 | * | 358 | * |
| 359 | * Returns BLKPREP_OK on success or BLKPREP_DEFER on failure. | 359 | * Returns BLKPREP_OK on success or BLKPREP_DEFER on failure. |
| 360 | */ | 360 | */ |
diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c index be2b5926d26c..6e53a30bfd38 100644 --- a/drivers/message/i2o/iop.c +++ b/drivers/message/i2o/iop.c | |||
| @@ -49,7 +49,6 @@ static int i2o_hrt_get(struct i2o_controller *c); | |||
| 49 | /** | 49 | /** |
| 50 | * i2o_msg_get_wait - obtain an I2O message from the IOP | 50 | * i2o_msg_get_wait - obtain an I2O message from the IOP |
| 51 | * @c: I2O controller | 51 | * @c: I2O controller |
| 52 | * @msg: pointer to a I2O message pointer | ||
| 53 | * @wait: how long to wait until timeout | 52 | * @wait: how long to wait until timeout |
| 54 | * | 53 | * |
| 55 | * This function waits up to wait seconds for a message slot to be | 54 | * This function waits up to wait seconds for a message slot to be |
diff --git a/drivers/misc/sgi-gru/grufault.c b/drivers/misc/sgi-gru/grufault.c index 8c389d606c30..3ee698ad8599 100644 --- a/drivers/misc/sgi-gru/grufault.c +++ b/drivers/misc/sgi-gru/grufault.c | |||
| @@ -254,7 +254,11 @@ static int atomic_pte_lookup(struct vm_area_struct *vma, unsigned long vaddr, | |||
| 254 | return 1; | 254 | return 1; |
| 255 | 255 | ||
| 256 | *paddr = pte_pfn(pte) << PAGE_SHIFT; | 256 | *paddr = pte_pfn(pte) << PAGE_SHIFT; |
| 257 | #ifdef CONFIG_HUGETLB_PAGE | ||
| 257 | *pageshift = is_vm_hugetlb_page(vma) ? HPAGE_SHIFT : PAGE_SHIFT; | 258 | *pageshift = is_vm_hugetlb_page(vma) ? HPAGE_SHIFT : PAGE_SHIFT; |
| 259 | #else | ||
| 260 | *pageshift = PAGE_SHIFT; | ||
| 261 | #endif | ||
| 258 | return 0; | 262 | return 0; |
| 259 | 263 | ||
| 260 | err: | 264 | err: |
diff --git a/drivers/misc/sgi-gru/grufile.c b/drivers/misc/sgi-gru/grufile.c index 5c027b6b4e5a..650983806392 100644 --- a/drivers/misc/sgi-gru/grufile.c +++ b/drivers/misc/sgi-gru/grufile.c | |||
| @@ -481,7 +481,7 @@ struct vm_operations_struct gru_vm_ops = { | |||
| 481 | .fault = gru_fault, | 481 | .fault = gru_fault, |
| 482 | }; | 482 | }; |
| 483 | 483 | ||
| 484 | module_init(gru_init); | 484 | fs_initcall(gru_init); |
| 485 | module_exit(gru_exit); | 485 | module_exit(gru_exit); |
| 486 | 486 | ||
| 487 | module_param(gru_options, ulong, 0644); | 487 | module_param(gru_options, ulong, 0644); |
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c index 76a76751da36..6659b2275c0c 100644 --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c | |||
| @@ -37,9 +37,9 @@ | |||
| 37 | #define OPCODE_NORM_READ 0x03 /* Read data bytes (low frequency) */ | 37 | #define OPCODE_NORM_READ 0x03 /* Read data bytes (low frequency) */ |
| 38 | #define OPCODE_FAST_READ 0x0b /* Read data bytes (high frequency) */ | 38 | #define OPCODE_FAST_READ 0x0b /* Read data bytes (high frequency) */ |
| 39 | #define OPCODE_PP 0x02 /* Page program (up to 256 bytes) */ | 39 | #define OPCODE_PP 0x02 /* Page program (up to 256 bytes) */ |
| 40 | #define OPCODE_BE_4K 0x20 /* Erase 4KiB block */ | 40 | #define OPCODE_BE_4K 0x20 /* Erase 4KiB block */ |
| 41 | #define OPCODE_BE_32K 0x52 /* Erase 32KiB block */ | 41 | #define OPCODE_BE_32K 0x52 /* Erase 32KiB block */ |
| 42 | #define OPCODE_BE 0xc7 /* Erase whole flash block */ | 42 | #define OPCODE_CHIP_ERASE 0xc7 /* Erase whole flash chip */ |
| 43 | #define OPCODE_SE 0xd8 /* Sector erase (usually 64KiB) */ | 43 | #define OPCODE_SE 0xd8 /* Sector erase (usually 64KiB) */ |
| 44 | #define OPCODE_RDID 0x9f /* Read JEDEC ID */ | 44 | #define OPCODE_RDID 0x9f /* Read JEDEC ID */ |
| 45 | 45 | ||
| @@ -167,7 +167,7 @@ static int wait_till_ready(struct m25p *flash) | |||
| 167 | * | 167 | * |
| 168 | * Returns 0 if successful, non-zero otherwise. | 168 | * Returns 0 if successful, non-zero otherwise. |
| 169 | */ | 169 | */ |
| 170 | static int erase_block(struct m25p *flash) | 170 | static int erase_chip(struct m25p *flash) |
| 171 | { | 171 | { |
| 172 | DEBUG(MTD_DEBUG_LEVEL3, "%s: %s %dKiB\n", | 172 | DEBUG(MTD_DEBUG_LEVEL3, "%s: %s %dKiB\n", |
| 173 | flash->spi->dev.bus_id, __func__, | 173 | flash->spi->dev.bus_id, __func__, |
| @@ -181,7 +181,7 @@ static int erase_block(struct m25p *flash) | |||
| 181 | write_enable(flash); | 181 | write_enable(flash); |
| 182 | 182 | ||
| 183 | /* Set up command buffer. */ | 183 | /* Set up command buffer. */ |
| 184 | flash->command[0] = OPCODE_BE; | 184 | flash->command[0] = OPCODE_CHIP_ERASE; |
| 185 | 185 | ||
| 186 | spi_write(flash->spi, flash->command, 1); | 186 | spi_write(flash->spi, flash->command, 1); |
| 187 | 187 | ||
| @@ -250,15 +250,18 @@ static int m25p80_erase(struct mtd_info *mtd, struct erase_info *instr) | |||
| 250 | 250 | ||
| 251 | mutex_lock(&flash->lock); | 251 | mutex_lock(&flash->lock); |
| 252 | 252 | ||
| 253 | /* REVISIT in some cases we could speed up erasing large regions | 253 | /* whole-chip erase? */ |
| 254 | * by using OPCODE_SE instead of OPCODE_BE_4K | 254 | if (len == flash->mtd.size && erase_chip(flash)) { |
| 255 | */ | ||
| 256 | |||
| 257 | /* now erase those sectors */ | ||
| 258 | if (len == flash->mtd.size && erase_block(flash)) { | ||
| 259 | instr->state = MTD_ERASE_FAILED; | 255 | instr->state = MTD_ERASE_FAILED; |
| 260 | mutex_unlock(&flash->lock); | 256 | mutex_unlock(&flash->lock); |
| 261 | return -EIO; | 257 | return -EIO; |
| 258 | |||
| 259 | /* REVISIT in some cases we could speed up erasing large regions | ||
| 260 | * by using OPCODE_SE instead of OPCODE_BE_4K. We may have set up | ||
| 261 | * to use "small sector erase", but that's not always optimal. | ||
| 262 | */ | ||
| 263 | |||
| 264 | /* "sector"-at-a-time erase */ | ||
| 262 | } else { | 265 | } else { |
| 263 | while (len) { | 266 | while (len) { |
| 264 | if (erase_sector(flash, addr)) { | 267 | if (erase_sector(flash, addr)) { |
| @@ -574,10 +577,11 @@ static struct flash_info *__devinit jedec_probe(struct spi_device *spi) | |||
| 574 | for (tmp = 0, info = m25p_data; | 577 | for (tmp = 0, info = m25p_data; |
| 575 | tmp < ARRAY_SIZE(m25p_data); | 578 | tmp < ARRAY_SIZE(m25p_data); |
| 576 | tmp++, info++) { | 579 | tmp++, info++) { |
| 577 | if (info->jedec_id == jedec) | 580 | if (info->jedec_id == jedec) { |
| 578 | if (ext_jedec != 0 && info->ext_id != ext_jedec) | 581 | if (info->ext_id != 0 && info->ext_id != ext_jedec) |
| 579 | continue; | 582 | continue; |
| 580 | return info; | 583 | return info; |
| 584 | } | ||
| 581 | } | 585 | } |
| 582 | dev_err(&spi->dev, "unrecognized JEDEC id %06x\n", jedec); | 586 | dev_err(&spi->dev, "unrecognized JEDEC id %06x\n", jedec); |
| 583 | return NULL; | 587 | return NULL; |
diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c index 42d844f8f6bf..dfbf3f270cea 100644 --- a/drivers/mtd/maps/physmap.c +++ b/drivers/mtd/maps/physmap.c | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | #include <linux/mtd/partitions.h> | 19 | #include <linux/mtd/partitions.h> |
| 20 | #include <linux/mtd/physmap.h> | 20 | #include <linux/mtd/physmap.h> |
| 21 | #include <linux/mtd/concat.h> | 21 | #include <linux/mtd/concat.h> |
| 22 | #include <asm/io.h> | 22 | #include <linux/io.h> |
| 23 | 23 | ||
| 24 | #define MAX_RESOURCES 4 | 24 | #define MAX_RESOURCES 4 |
| 25 | 25 | ||
| @@ -27,7 +27,6 @@ struct physmap_flash_info { | |||
| 27 | struct mtd_info *mtd[MAX_RESOURCES]; | 27 | struct mtd_info *mtd[MAX_RESOURCES]; |
| 28 | struct mtd_info *cmtd; | 28 | struct mtd_info *cmtd; |
| 29 | struct map_info map[MAX_RESOURCES]; | 29 | struct map_info map[MAX_RESOURCES]; |
| 30 | struct resource *res; | ||
| 31 | #ifdef CONFIG_MTD_PARTITIONS | 30 | #ifdef CONFIG_MTD_PARTITIONS |
| 32 | int nr_parts; | 31 | int nr_parts; |
| 33 | struct mtd_partition *parts; | 32 | struct mtd_partition *parts; |
| @@ -70,16 +69,7 @@ static int physmap_flash_remove(struct platform_device *dev) | |||
| 70 | #endif | 69 | #endif |
| 71 | map_destroy(info->mtd[i]); | 70 | map_destroy(info->mtd[i]); |
| 72 | } | 71 | } |
| 73 | |||
| 74 | if (info->map[i].virt != NULL) | ||
| 75 | iounmap(info->map[i].virt); | ||
| 76 | } | ||
| 77 | |||
| 78 | if (info->res != NULL) { | ||
| 79 | release_resource(info->res); | ||
| 80 | kfree(info->res); | ||
| 81 | } | 72 | } |
| 82 | |||
| 83 | return 0; | 73 | return 0; |
| 84 | } | 74 | } |
| 85 | 75 | ||
| @@ -101,7 +91,8 @@ static int physmap_flash_probe(struct platform_device *dev) | |||
| 101 | if (physmap_data == NULL) | 91 | if (physmap_data == NULL) |
| 102 | return -ENODEV; | 92 | return -ENODEV; |
| 103 | 93 | ||
| 104 | info = kzalloc(sizeof(struct physmap_flash_info), GFP_KERNEL); | 94 | info = devm_kzalloc(&dev->dev, sizeof(struct physmap_flash_info), |
| 95 | GFP_KERNEL); | ||
| 105 | if (info == NULL) { | 96 | if (info == NULL) { |
| 106 | err = -ENOMEM; | 97 | err = -ENOMEM; |
| 107 | goto err_out; | 98 | goto err_out; |
| @@ -114,10 +105,10 @@ static int physmap_flash_probe(struct platform_device *dev) | |||
| 114 | (unsigned long long)(dev->resource[i].end - dev->resource[i].start + 1), | 105 | (unsigned long long)(dev->resource[i].end - dev->resource[i].start + 1), |
| 115 | (unsigned long long)dev->resource[i].start); | 106 | (unsigned long long)dev->resource[i].start); |
| 116 | 107 | ||
| 117 | info->res = request_mem_region(dev->resource[i].start, | 108 | if (!devm_request_mem_region(&dev->dev, |
| 118 | dev->resource[i].end - dev->resource[i].start + 1, | 109 | dev->resource[i].start, |
| 119 | dev->dev.bus_id); | 110 | dev->resource[i].end - dev->resource[i].start + 1, |
| 120 | if (info->res == NULL) { | 111 | dev->dev.bus_id)) { |
| 121 | dev_err(&dev->dev, "Could not reserve memory region\n"); | 112 | dev_err(&dev->dev, "Could not reserve memory region\n"); |
| 122 | err = -ENOMEM; | 113 | err = -ENOMEM; |
| 123 | goto err_out; | 114 | goto err_out; |
| @@ -129,7 +120,8 @@ static int physmap_flash_probe(struct platform_device *dev) | |||
| 129 | info->map[i].bankwidth = physmap_data->width; | 120 | info->map[i].bankwidth = physmap_data->width; |
| 130 | info->map[i].set_vpp = physmap_data->set_vpp; | 121 | info->map[i].set_vpp = physmap_data->set_vpp; |
| 131 | 122 | ||
| 132 | info->map[i].virt = ioremap(info->map[i].phys, info->map[i].size); | 123 | info->map[i].virt = devm_ioremap(&dev->dev, info->map[i].phys, |
| 124 | info->map[i].size); | ||
| 133 | if (info->map[i].virt == NULL) { | 125 | if (info->map[i].virt == NULL) { |
| 134 | dev_err(&dev->dev, "Failed to ioremap flash region\n"); | 126 | dev_err(&dev->dev, "Failed to ioremap flash region\n"); |
| 135 | err = EIO; | 127 | err = EIO; |
diff --git a/drivers/mtd/nand/fsl_upm.c b/drivers/mtd/nand/fsl_upm.c index 024e3fffd4bb..a83192f80eba 100644 --- a/drivers/mtd/nand/fsl_upm.c +++ b/drivers/mtd/nand/fsl_upm.c | |||
| @@ -163,9 +163,11 @@ static int __devinit fun_chip_init(struct fsl_upm_nand *fun, | |||
| 163 | ret = parse_mtd_partitions(&fun->mtd, part_types, &fun->parts, 0); | 163 | ret = parse_mtd_partitions(&fun->mtd, part_types, &fun->parts, 0); |
| 164 | 164 | ||
| 165 | #ifdef CONFIG_MTD_OF_PARTS | 165 | #ifdef CONFIG_MTD_OF_PARTS |
| 166 | if (ret == 0) | 166 | if (ret == 0) { |
| 167 | ret = of_mtd_parse_partitions(fun->dev, &fun->mtd, | 167 | ret = of_mtd_parse_partitions(fun->dev, flash_np, &fun->parts); |
| 168 | flash_np, &fun->parts); | 168 | if (ret < 0) |
| 169 | goto err; | ||
| 170 | } | ||
| 169 | #endif | 171 | #endif |
| 170 | if (ret > 0) | 172 | if (ret > 0) |
| 171 | ret = add_mtd_partitions(&fun->mtd, fun->parts, ret); | 173 | ret = add_mtd_partitions(&fun->mtd, fun->parts, ret); |
diff --git a/drivers/mtd/nand/pasemi_nand.c b/drivers/mtd/nand/pasemi_nand.c index 75c899039023..9bd6c9ac8443 100644 --- a/drivers/mtd/nand/pasemi_nand.c +++ b/drivers/mtd/nand/pasemi_nand.c | |||
| @@ -141,6 +141,7 @@ static int __devinit pasemi_nand_probe(struct of_device *ofdev, | |||
| 141 | } | 141 | } |
| 142 | 142 | ||
| 143 | lpcctl = pci_resource_start(pdev, 0); | 143 | lpcctl = pci_resource_start(pdev, 0); |
| 144 | pci_dev_put(pdev); | ||
| 144 | 145 | ||
| 145 | if (!request_region(lpcctl, 4, driver_name)) { | 146 | if (!request_region(lpcctl, 4, driver_name)) { |
| 146 | err = -EBUSY; | 147 | err = -EBUSY; |
diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c index c0fa9c9edf08..15f0a26730ae 100644 --- a/drivers/mtd/nand/pxa3xx_nand.c +++ b/drivers/mtd/nand/pxa3xx_nand.c | |||
| @@ -269,6 +269,7 @@ static struct pxa3xx_nand_timing stm2GbX16_timing = { | |||
| 269 | 269 | ||
| 270 | static struct pxa3xx_nand_flash stm2GbX16 = { | 270 | static struct pxa3xx_nand_flash stm2GbX16 = { |
| 271 | .timing = &stm2GbX16_timing, | 271 | .timing = &stm2GbX16_timing, |
| 272 | .cmdset = &largepage_cmdset, | ||
| 272 | .page_per_block = 64, | 273 | .page_per_block = 64, |
| 273 | .page_size = 2048, | 274 | .page_size = 2048, |
| 274 | .flash_width = 16, | 275 | .flash_width = 16, |
diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c index e39b21d3e168..a7e4d985f5ef 100644 --- a/drivers/mtd/onenand/omap2.c +++ b/drivers/mtd/onenand/omap2.c | |||
| @@ -32,19 +32,18 @@ | |||
| 32 | #include <linux/platform_device.h> | 32 | #include <linux/platform_device.h> |
| 33 | #include <linux/interrupt.h> | 33 | #include <linux/interrupt.h> |
| 34 | #include <linux/delay.h> | 34 | #include <linux/delay.h> |
| 35 | #include <linux/dma-mapping.h> | ||
| 36 | #include <linux/io.h> | ||
| 35 | 37 | ||
| 36 | #include <asm/io.h> | ||
| 37 | #include <asm/mach/flash.h> | 38 | #include <asm/mach/flash.h> |
| 38 | #include <asm/arch/gpmc.h> | 39 | #include <mach/gpmc.h> |
| 39 | #include <asm/arch/onenand.h> | 40 | #include <mach/onenand.h> |
| 40 | #include <asm/arch/gpio.h> | 41 | #include <mach/gpio.h> |
| 41 | #include <asm/arch/pm.h> | 42 | #include <mach/pm.h> |
| 42 | 43 | ||
| 43 | #include <linux/dma-mapping.h> | 44 | #include <mach/dma.h> |
| 44 | #include <asm/dma-mapping.h> | ||
| 45 | #include <asm/arch/dma.h> | ||
| 46 | 45 | ||
| 47 | #include <asm/arch/board.h> | 46 | #include <mach/board.h> |
| 48 | 47 | ||
| 49 | #define DRIVER_NAME "omap2-onenand" | 48 | #define DRIVER_NAME "omap2-onenand" |
| 50 | 49 | ||
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index f19acf8b9220..017383ad5ec6 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile | |||
| @@ -114,7 +114,7 @@ obj-$(CONFIG_EL2) += 3c503.o 8390p.o | |||
| 114 | obj-$(CONFIG_NE2000) += ne.o 8390p.o | 114 | obj-$(CONFIG_NE2000) += ne.o 8390p.o |
| 115 | obj-$(CONFIG_NE2_MCA) += ne2.o 8390p.o | 115 | obj-$(CONFIG_NE2_MCA) += ne2.o 8390p.o |
| 116 | obj-$(CONFIG_HPLAN) += hp.o 8390p.o | 116 | obj-$(CONFIG_HPLAN) += hp.o 8390p.o |
| 117 | obj-$(CONFIG_HPLAN_PLUS) += hp-plus.o 8390.o | 117 | obj-$(CONFIG_HPLAN_PLUS) += hp-plus.o 8390p.o |
| 118 | obj-$(CONFIG_ULTRA) += smc-ultra.o 8390.o | 118 | obj-$(CONFIG_ULTRA) += smc-ultra.o 8390.o |
| 119 | obj-$(CONFIG_ULTRAMCA) += smc-mca.o 8390.o | 119 | obj-$(CONFIG_ULTRAMCA) += smc-mca.o 8390.o |
| 120 | obj-$(CONFIG_ULTRA32) += smc-ultra32.o 8390.o | 120 | obj-$(CONFIG_ULTRA32) += smc-ultra32.o 8390.o |
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index d07e3f148951..a1a3d0e5d2b4 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c | |||
| @@ -3144,6 +3144,28 @@ bnx2_has_work(struct bnx2_napi *bnapi) | |||
| 3144 | return 0; | 3144 | return 0; |
| 3145 | } | 3145 | } |
| 3146 | 3146 | ||
| 3147 | static void | ||
| 3148 | bnx2_chk_missed_msi(struct bnx2 *bp) | ||
| 3149 | { | ||
| 3150 | struct bnx2_napi *bnapi = &bp->bnx2_napi[0]; | ||
| 3151 | u32 msi_ctrl; | ||
| 3152 | |||
| 3153 | if (bnx2_has_work(bnapi)) { | ||
| 3154 | msi_ctrl = REG_RD(bp, BNX2_PCICFG_MSI_CONTROL); | ||
| 3155 | if (!(msi_ctrl & BNX2_PCICFG_MSI_CONTROL_ENABLE)) | ||
| 3156 | return; | ||
| 3157 | |||
| 3158 | if (bnapi->last_status_idx == bp->idle_chk_status_idx) { | ||
| 3159 | REG_WR(bp, BNX2_PCICFG_MSI_CONTROL, msi_ctrl & | ||
| 3160 | ~BNX2_PCICFG_MSI_CONTROL_ENABLE); | ||
| 3161 | REG_WR(bp, BNX2_PCICFG_MSI_CONTROL, msi_ctrl); | ||
| 3162 | bnx2_msi(bp->irq_tbl[0].vector, bnapi); | ||
| 3163 | } | ||
| 3164 | } | ||
| 3165 | |||
| 3166 | bp->idle_chk_status_idx = bnapi->last_status_idx; | ||
| 3167 | } | ||
| 3168 | |||
| 3147 | static void bnx2_poll_link(struct bnx2 *bp, struct bnx2_napi *bnapi) | 3169 | static void bnx2_poll_link(struct bnx2 *bp, struct bnx2_napi *bnapi) |
| 3148 | { | 3170 | { |
| 3149 | struct status_block *sblk = bnapi->status_blk.msi; | 3171 | struct status_block *sblk = bnapi->status_blk.msi; |
| @@ -3218,14 +3240,15 @@ static int bnx2_poll(struct napi_struct *napi, int budget) | |||
| 3218 | 3240 | ||
| 3219 | work_done = bnx2_poll_work(bp, bnapi, work_done, budget); | 3241 | work_done = bnx2_poll_work(bp, bnapi, work_done, budget); |
| 3220 | 3242 | ||
| 3221 | if (unlikely(work_done >= budget)) | ||
| 3222 | break; | ||
| 3223 | |||
| 3224 | /* bnapi->last_status_idx is used below to tell the hw how | 3243 | /* bnapi->last_status_idx is used below to tell the hw how |
| 3225 | * much work has been processed, so we must read it before | 3244 | * much work has been processed, so we must read it before |
| 3226 | * checking for more work. | 3245 | * checking for more work. |
| 3227 | */ | 3246 | */ |
| 3228 | bnapi->last_status_idx = sblk->status_idx; | 3247 | bnapi->last_status_idx = sblk->status_idx; |
| 3248 | |||
| 3249 | if (unlikely(work_done >= budget)) | ||
| 3250 | break; | ||
| 3251 | |||
| 3229 | rmb(); | 3252 | rmb(); |
| 3230 | if (likely(!bnx2_has_work(bnapi))) { | 3253 | if (likely(!bnx2_has_work(bnapi))) { |
| 3231 | netif_rx_complete(bp->dev, napi); | 3254 | netif_rx_complete(bp->dev, napi); |
| @@ -4570,6 +4593,8 @@ bnx2_init_chip(struct bnx2 *bp) | |||
| 4570 | for (i = 0; i < BNX2_MAX_MSIX_VEC; i++) | 4593 | for (i = 0; i < BNX2_MAX_MSIX_VEC; i++) |
| 4571 | bp->bnx2_napi[i].last_status_idx = 0; | 4594 | bp->bnx2_napi[i].last_status_idx = 0; |
| 4572 | 4595 | ||
| 4596 | bp->idle_chk_status_idx = 0xffff; | ||
| 4597 | |||
| 4573 | bp->rx_mode = BNX2_EMAC_RX_MODE_SORT_MODE; | 4598 | bp->rx_mode = BNX2_EMAC_RX_MODE_SORT_MODE; |
| 4574 | 4599 | ||
| 4575 | /* Set up how to generate a link change interrupt. */ | 4600 | /* Set up how to generate a link change interrupt. */ |
| @@ -5718,6 +5743,10 @@ bnx2_timer(unsigned long data) | |||
| 5718 | if (atomic_read(&bp->intr_sem) != 0) | 5743 | if (atomic_read(&bp->intr_sem) != 0) |
| 5719 | goto bnx2_restart_timer; | 5744 | goto bnx2_restart_timer; |
| 5720 | 5745 | ||
| 5746 | if ((bp->flags & (BNX2_FLAG_USING_MSI | BNX2_FLAG_ONE_SHOT_MSI)) == | ||
| 5747 | BNX2_FLAG_USING_MSI) | ||
| 5748 | bnx2_chk_missed_msi(bp); | ||
| 5749 | |||
| 5721 | bnx2_send_heart_beat(bp); | 5750 | bnx2_send_heart_beat(bp); |
| 5722 | 5751 | ||
| 5723 | bp->stats_blk->stat_FwRxDrop = | 5752 | bp->stats_blk->stat_FwRxDrop = |
diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h index 617d95340160..0b032c3c7b61 100644 --- a/drivers/net/bnx2.h +++ b/drivers/net/bnx2.h | |||
| @@ -378,6 +378,9 @@ struct l2_fhdr { | |||
| 378 | * pci_config_l definition | 378 | * pci_config_l definition |
| 379 | * offset: 0000 | 379 | * offset: 0000 |
| 380 | */ | 380 | */ |
| 381 | #define BNX2_PCICFG_MSI_CONTROL 0x00000058 | ||
| 382 | #define BNX2_PCICFG_MSI_CONTROL_ENABLE (1L<<16) | ||
| 383 | |||
| 381 | #define BNX2_PCICFG_MISC_CONFIG 0x00000068 | 384 | #define BNX2_PCICFG_MISC_CONFIG 0x00000068 |
| 382 | #define BNX2_PCICFG_MISC_CONFIG_TARGET_BYTE_SWAP (1L<<2) | 385 | #define BNX2_PCICFG_MISC_CONFIG_TARGET_BYTE_SWAP (1L<<2) |
| 383 | #define BNX2_PCICFG_MISC_CONFIG_TARGET_MB_WORD_SWAP (1L<<3) | 386 | #define BNX2_PCICFG_MISC_CONFIG_TARGET_MB_WORD_SWAP (1L<<3) |
| @@ -6863,6 +6866,9 @@ struct bnx2 { | |||
| 6863 | 6866 | ||
| 6864 | u8 num_tx_rings; | 6867 | u8 num_tx_rings; |
| 6865 | u8 num_rx_rings; | 6868 | u8 num_rx_rings; |
| 6869 | |||
| 6870 | u32 idle_chk_status_idx; | ||
| 6871 | |||
| 6866 | }; | 6872 | }; |
| 6867 | 6873 | ||
| 6868 | #define REG_RD(bp, offset) \ | 6874 | #define REG_RD(bp, offset) \ |
diff --git a/drivers/net/chelsio/sge.c b/drivers/net/chelsio/sge.c index d6c7d2aa761b..7092df50ff78 100644 --- a/drivers/net/chelsio/sge.c +++ b/drivers/net/chelsio/sge.c | |||
| @@ -1035,10 +1035,6 @@ MODULE_PARM_DESC(copybreak, "Receive copy threshold"); | |||
| 1035 | * @pdev: the PCI device that received the packet | 1035 | * @pdev: the PCI device that received the packet |
| 1036 | * @fl: the SGE free list holding the packet | 1036 | * @fl: the SGE free list holding the packet |
| 1037 | * @len: the actual packet length, excluding any SGE padding | 1037 | * @len: the actual packet length, excluding any SGE padding |
| 1038 | * @dma_pad: padding at beginning of buffer left by SGE DMA | ||
| 1039 | * @skb_pad: padding to be used if the packet is copied | ||
| 1040 | * @copy_thres: length threshold under which a packet should be copied | ||
| 1041 | * @drop_thres: # of remaining buffers before we start dropping packets | ||
| 1042 | * | 1038 | * |
| 1043 | * Get the next packet from a free list and complete setup of the | 1039 | * Get the next packet from a free list and complete setup of the |
| 1044 | * sk_buff. If the packet is small we make a copy and recycle the | 1040 | * sk_buff. If the packet is small we make a copy and recycle the |
diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c index 523b9716a543..d115a6d30f29 100644 --- a/drivers/net/e1000e/ich8lan.c +++ b/drivers/net/e1000e/ich8lan.c | |||
| @@ -1893,12 +1893,17 @@ static s32 e1000_reset_hw_ich8lan(struct e1000_hw *hw) | |||
| 1893 | ctrl |= E1000_CTRL_PHY_RST; | 1893 | ctrl |= E1000_CTRL_PHY_RST; |
| 1894 | } | 1894 | } |
| 1895 | ret_val = e1000_acquire_swflag_ich8lan(hw); | 1895 | ret_val = e1000_acquire_swflag_ich8lan(hw); |
| 1896 | /* Whether or not the swflag was acquired, we need to reset the part */ | ||
| 1896 | hw_dbg(hw, "Issuing a global reset to ich8lan"); | 1897 | hw_dbg(hw, "Issuing a global reset to ich8lan"); |
| 1897 | ew32(CTRL, (ctrl | E1000_CTRL_RST)); | 1898 | ew32(CTRL, (ctrl | E1000_CTRL_RST)); |
| 1898 | msleep(20); | 1899 | msleep(20); |
| 1899 | 1900 | ||
| 1900 | /* release the swflag because it is not reset by hardware reset */ | 1901 | if (!ret_val) { |
| 1901 | e1000_release_swflag_ich8lan(hw); | 1902 | /* release the swflag because it is not reset by |
| 1903 | * hardware reset | ||
| 1904 | */ | ||
| 1905 | e1000_release_swflag_ich8lan(hw); | ||
| 1906 | } | ||
| 1902 | 1907 | ||
| 1903 | ret_val = e1000e_get_auto_rd_done(hw); | 1908 | ret_val = e1000e_get_auto_rd_done(hw); |
| 1904 | if (ret_val) { | 1909 | if (ret_val) { |
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index 91795f78c3e4..122539a0e1fe 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c | |||
| @@ -345,7 +345,6 @@ no_buffers: | |||
| 345 | /** | 345 | /** |
| 346 | * e1000_alloc_jumbo_rx_buffers - Replace used jumbo receive buffers | 346 | * e1000_alloc_jumbo_rx_buffers - Replace used jumbo receive buffers |
| 347 | * @adapter: address of board private structure | 347 | * @adapter: address of board private structure |
| 348 | * @rx_ring: pointer to receive ring structure | ||
| 349 | * @cleaned_count: number of buffers to allocate this pass | 348 | * @cleaned_count: number of buffers to allocate this pass |
| 350 | **/ | 349 | **/ |
| 351 | 350 | ||
diff --git a/drivers/net/enc28j60.c b/drivers/net/enc28j60.c index e1b441effbbe..c414554ac321 100644 --- a/drivers/net/enc28j60.c +++ b/drivers/net/enc28j60.c | |||
| @@ -568,6 +568,17 @@ static u16 erxrdpt_workaround(u16 next_packet_ptr, u16 start, u16 end) | |||
| 568 | return erxrdpt; | 568 | return erxrdpt; |
| 569 | } | 569 | } |
| 570 | 570 | ||
| 571 | /* | ||
| 572 | * Calculate wrap around when reading beyond the end of the RX buffer | ||
| 573 | */ | ||
| 574 | static u16 rx_packet_start(u16 ptr) | ||
| 575 | { | ||
| 576 | if (ptr + RSV_SIZE > RXEND_INIT) | ||
| 577 | return (ptr + RSV_SIZE) - (RXEND_INIT - RXSTART_INIT + 1); | ||
| 578 | else | ||
| 579 | return ptr + RSV_SIZE; | ||
| 580 | } | ||
| 581 | |||
| 571 | static void nolock_rxfifo_init(struct enc28j60_net *priv, u16 start, u16 end) | 582 | static void nolock_rxfifo_init(struct enc28j60_net *priv, u16 start, u16 end) |
| 572 | { | 583 | { |
| 573 | u16 erxrdpt; | 584 | u16 erxrdpt; |
| @@ -938,8 +949,9 @@ static void enc28j60_hw_rx(struct net_device *ndev) | |||
| 938 | skb->dev = ndev; | 949 | skb->dev = ndev; |
| 939 | skb_reserve(skb, NET_IP_ALIGN); | 950 | skb_reserve(skb, NET_IP_ALIGN); |
| 940 | /* copy the packet from the receive buffer */ | 951 | /* copy the packet from the receive buffer */ |
| 941 | enc28j60_mem_read(priv, priv->next_pk_ptr + sizeof(rsv), | 952 | enc28j60_mem_read(priv, |
| 942 | len, skb_put(skb, len)); | 953 | rx_packet_start(priv->next_pk_ptr), |
| 954 | len, skb_put(skb, len)); | ||
| 943 | if (netif_msg_pktdata(priv)) | 955 | if (netif_msg_pktdata(priv)) |
| 944 | dump_packet(__func__, skb->len, skb->data); | 956 | dump_packet(__func__, skb->len, skb->data); |
| 945 | skb->protocol = eth_type_trans(skb, ndev); | 957 | skb->protocol = eth_type_trans(skb, ndev); |
diff --git a/drivers/net/hp-plus.c b/drivers/net/hp-plus.c index fbbd3e660c27..c01e290d09d2 100644 --- a/drivers/net/hp-plus.c +++ b/drivers/net/hp-plus.c | |||
| @@ -230,7 +230,7 @@ static int __init hpp_probe1(struct net_device *dev, int ioaddr) | |||
| 230 | dev->open = &hpp_open; | 230 | dev->open = &hpp_open; |
| 231 | dev->stop = &hpp_close; | 231 | dev->stop = &hpp_close; |
| 232 | #ifdef CONFIG_NET_POLL_CONTROLLER | 232 | #ifdef CONFIG_NET_POLL_CONTROLLER |
| 233 | dev->poll_controller = ei_poll; | 233 | dev->poll_controller = eip_poll; |
| 234 | #endif | 234 | #endif |
| 235 | 235 | ||
| 236 | ei_status.name = name; | 236 | ei_status.name = name; |
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index 1cbae85b1426..20d27e622ec1 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c | |||
| @@ -1980,7 +1980,6 @@ static void igb_configure_rx(struct igb_adapter *adapter) | |||
| 1980 | 1980 | ||
| 1981 | /** | 1981 | /** |
| 1982 | * igb_free_tx_resources - Free Tx Resources per Queue | 1982 | * igb_free_tx_resources - Free Tx Resources per Queue |
| 1983 | * @adapter: board private structure | ||
| 1984 | * @tx_ring: Tx descriptor ring for a specific queue | 1983 | * @tx_ring: Tx descriptor ring for a specific queue |
| 1985 | * | 1984 | * |
| 1986 | * Free all transmit software resources | 1985 | * Free all transmit software resources |
| @@ -2033,7 +2032,6 @@ static void igb_unmap_and_free_tx_resource(struct igb_adapter *adapter, | |||
| 2033 | 2032 | ||
| 2034 | /** | 2033 | /** |
| 2035 | * igb_clean_tx_ring - Free Tx Buffers | 2034 | * igb_clean_tx_ring - Free Tx Buffers |
| 2036 | * @adapter: board private structure | ||
| 2037 | * @tx_ring: ring to be cleaned | 2035 | * @tx_ring: ring to be cleaned |
| 2038 | **/ | 2036 | **/ |
| 2039 | static void igb_clean_tx_ring(struct igb_ring *tx_ring) | 2037 | static void igb_clean_tx_ring(struct igb_ring *tx_ring) |
| @@ -2080,7 +2078,6 @@ static void igb_clean_all_tx_rings(struct igb_adapter *adapter) | |||
| 2080 | 2078 | ||
| 2081 | /** | 2079 | /** |
| 2082 | * igb_free_rx_resources - Free Rx Resources | 2080 | * igb_free_rx_resources - Free Rx Resources |
| 2083 | * @adapter: board private structure | ||
| 2084 | * @rx_ring: ring to clean the resources from | 2081 | * @rx_ring: ring to clean the resources from |
| 2085 | * | 2082 | * |
| 2086 | * Free all receive software resources | 2083 | * Free all receive software resources |
| @@ -2120,7 +2117,6 @@ static void igb_free_all_rx_resources(struct igb_adapter *adapter) | |||
| 2120 | 2117 | ||
| 2121 | /** | 2118 | /** |
| 2122 | * igb_clean_rx_ring - Free Rx Buffers per Queue | 2119 | * igb_clean_rx_ring - Free Rx Buffers per Queue |
| 2123 | * @adapter: board private structure | ||
| 2124 | * @rx_ring: ring to free buffers from | 2120 | * @rx_ring: ring to free buffers from |
| 2125 | **/ | 2121 | **/ |
| 2126 | static void igb_clean_rx_ring(struct igb_ring *rx_ring) | 2122 | static void igb_clean_rx_ring(struct igb_ring *rx_ring) |
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index 8ed823ae639e..5236f633ee36 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c | |||
| @@ -1320,7 +1320,6 @@ static inline void ixgbe_irq_enable(struct ixgbe_adapter *adapter) | |||
| 1320 | * ixgbe_intr - legacy mode Interrupt Handler | 1320 | * ixgbe_intr - legacy mode Interrupt Handler |
| 1321 | * @irq: interrupt number | 1321 | * @irq: interrupt number |
| 1322 | * @data: pointer to a network interface device structure | 1322 | * @data: pointer to a network interface device structure |
| 1323 | * @pt_regs: CPU registers structure | ||
| 1324 | **/ | 1323 | **/ |
| 1325 | static irqreturn_t ixgbe_intr(int irq, void *data) | 1324 | static irqreturn_t ixgbe_intr(int irq, void *data) |
| 1326 | { | 1325 | { |
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index 42394505bb50..590039cbb146 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c | |||
| @@ -70,6 +70,9 @@ static void macvlan_broadcast(struct sk_buff *skb, | |||
| 70 | struct sk_buff *nskb; | 70 | struct sk_buff *nskb; |
| 71 | unsigned int i; | 71 | unsigned int i; |
| 72 | 72 | ||
| 73 | if (skb->protocol == htons(ETH_P_PAUSE)) | ||
| 74 | return; | ||
| 75 | |||
| 73 | for (i = 0; i < MACVLAN_HASH_SIZE; i++) { | 76 | for (i = 0; i < MACVLAN_HASH_SIZE; i++) { |
| 74 | hlist_for_each_entry_rcu(vlan, n, &port->vlan_hash[i], hlist) { | 77 | hlist_for_each_entry_rcu(vlan, n, &port->vlan_hash[i], hlist) { |
| 75 | dev = vlan->dev; | 78 | dev = vlan->dev; |
diff --git a/drivers/net/netx-eth.c b/drivers/net/netx-eth.c index b9bed82e1d21..b289a0a2b945 100644 --- a/drivers/net/netx-eth.c +++ b/drivers/net/netx-eth.c | |||
| @@ -401,6 +401,8 @@ static int netx_eth_drv_probe(struct platform_device *pdev) | |||
| 401 | priv->xmac_base = priv->xc->xmac_base; | 401 | priv->xmac_base = priv->xc->xmac_base; |
| 402 | priv->sram_base = priv->xc->sram_base; | 402 | priv->sram_base = priv->xc->sram_base; |
| 403 | 403 | ||
| 404 | spin_lock_init(&priv->lock); | ||
| 405 | |||
| 404 | ret = pfifo_request(PFIFO_MASK(priv->id)); | 406 | ret = pfifo_request(PFIFO_MASK(priv->id)); |
| 405 | if (ret) { | 407 | if (ret) { |
| 406 | printk("unable to request PFIFO\n"); | 408 | printk("unable to request PFIFO\n"); |
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c index b37a498939ae..0418045166c3 100644 --- a/drivers/net/pcmcia/axnet_cs.c +++ b/drivers/net/pcmcia/axnet_cs.c | |||
| @@ -779,6 +779,7 @@ static struct pcmcia_device_id axnet_ids[] = { | |||
| 779 | PCMCIA_DEVICE_PROD_ID12("IO DATA", "ETXPCM", 0x547e66dc, 0x233adac2), | 779 | PCMCIA_DEVICE_PROD_ID12("IO DATA", "ETXPCM", 0x547e66dc, 0x233adac2), |
| 780 | PCMCIA_DEVICE_PROD_ID12("Linksys", "EtherFast 10/100 PC Card (PCMPC100 V3)", 0x0733cc81, 0x232019a8), | 780 | PCMCIA_DEVICE_PROD_ID12("Linksys", "EtherFast 10/100 PC Card (PCMPC100 V3)", 0x0733cc81, 0x232019a8), |
| 781 | PCMCIA_DEVICE_PROD_ID12("MELCO", "LPC3-TX", 0x481e0094, 0xf91af609), | 781 | PCMCIA_DEVICE_PROD_ID12("MELCO", "LPC3-TX", 0x481e0094, 0xf91af609), |
| 782 | PCMCIA_DEVICE_PROD_ID12("NETGEAR", "FA411", 0x9aa79dc3, 0x40fad875), | ||
| 782 | PCMCIA_DEVICE_PROD_ID12("PCMCIA", "100BASE", 0x281f1c5d, 0x7c2add04), | 783 | PCMCIA_DEVICE_PROD_ID12("PCMCIA", "100BASE", 0x281f1c5d, 0x7c2add04), |
| 783 | PCMCIA_DEVICE_PROD_ID12("PCMCIA", "FastEtherCard", 0x281f1c5d, 0x7ef26116), | 784 | PCMCIA_DEVICE_PROD_ID12("PCMCIA", "FastEtherCard", 0x281f1c5d, 0x7ef26116), |
| 784 | PCMCIA_DEVICE_PROD_ID12("PCMCIA", "FEP501", 0x281f1c5d, 0x2e272058), | 785 | PCMCIA_DEVICE_PROD_ID12("PCMCIA", "FEP501", 0x281f1c5d, 0x2e272058), |
| @@ -1174,7 +1175,6 @@ static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 1174 | * ax_interrupt - handle the interrupts from an 8390 | 1175 | * ax_interrupt - handle the interrupts from an 8390 |
| 1175 | * @irq: interrupt number | 1176 | * @irq: interrupt number |
| 1176 | * @dev_id: a pointer to the net_device | 1177 | * @dev_id: a pointer to the net_device |
| 1177 | * @regs: unused | ||
| 1178 | * | 1178 | * |
| 1179 | * Handle the ether interface interrupts. We pull packets from | 1179 | * Handle the ether interface interrupts. We pull packets from |
| 1180 | * the 8390 via the card specific functions and fire them at the networking | 1180 | * the 8390 via the card specific functions and fire them at the networking |
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c index e40d6301aa7a..ce486f094492 100644 --- a/drivers/net/pcmcia/pcnet_cs.c +++ b/drivers/net/pcmcia/pcnet_cs.c | |||
| @@ -1693,7 +1693,6 @@ static struct pcmcia_device_id pcnet_ids[] = { | |||
| 1693 | PCMCIA_DEVICE_PROD_ID12("National Semiconductor", "InfoMover NE4100", 0x36e1191f, 0xa6617ec8), | 1693 | PCMCIA_DEVICE_PROD_ID12("National Semiconductor", "InfoMover NE4100", 0x36e1191f, 0xa6617ec8), |
| 1694 | PCMCIA_DEVICE_PROD_ID12("NEC", "PC-9801N-J12", 0x18df0ba0, 0xbc912d76), | 1694 | PCMCIA_DEVICE_PROD_ID12("NEC", "PC-9801N-J12", 0x18df0ba0, 0xbc912d76), |
| 1695 | PCMCIA_DEVICE_PROD_ID12("NETGEAR", "FA410TX", 0x9aa79dc3, 0x60e5bc0e), | 1695 | PCMCIA_DEVICE_PROD_ID12("NETGEAR", "FA410TX", 0x9aa79dc3, 0x60e5bc0e), |
| 1696 | PCMCIA_DEVICE_PROD_ID12("NETGEAR", "FA411", 0x9aa79dc3, 0x40fad875), | ||
| 1697 | PCMCIA_DEVICE_PROD_ID12("Network Everywhere", "Fast Ethernet 10/100 PC Card", 0x820a67b6, 0x31ed1a5f), | 1696 | PCMCIA_DEVICE_PROD_ID12("Network Everywhere", "Fast Ethernet 10/100 PC Card", 0x820a67b6, 0x31ed1a5f), |
| 1698 | PCMCIA_DEVICE_PROD_ID12("NextCom K.K.", "Next Hawk", 0xaedaec74, 0xad050ef1), | 1697 | PCMCIA_DEVICE_PROD_ID12("NextCom K.K.", "Next Hawk", 0xaedaec74, 0xad050ef1), |
| 1699 | PCMCIA_DEVICE_PROD_ID12("PCMCIA", "10/100Mbps Ethernet Card", 0x281f1c5d, 0x6e41773b), | 1698 | PCMCIA_DEVICE_PROD_ID12("PCMCIA", "10/100Mbps Ethernet Card", 0x281f1c5d, 0x6e41773b), |
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 55bc24b234e3..25acbbde4a60 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c | |||
| @@ -227,8 +227,17 @@ struct phy_device * get_phy_device(struct mii_bus *bus, int addr) | |||
| 227 | if (r) | 227 | if (r) |
| 228 | return ERR_PTR(r); | 228 | return ERR_PTR(r); |
| 229 | 229 | ||
| 230 | /* If the phy_id is all Fs or all 0s, there is no device there */ | 230 | /* If the phy_id is mostly Fs, there is no device there */ |
| 231 | if ((0xffff == phy_id) || (0x00 == phy_id)) | 231 | if ((phy_id & 0x1fffffff) == 0x1fffffff) |
| 232 | return NULL; | ||
| 233 | |||
| 234 | /* | ||
| 235 | * Broken hardware is sometimes missing the pull down resistor on the | ||
| 236 | * MDIO line, which results in reads to non-existent devices returning | ||
| 237 | * 0 rather than 0xffff. Catch this here and treat 0 as a non-existent | ||
| 238 | * device as well. | ||
| 239 | */ | ||
| 240 | if (phy_id == 0) | ||
| 232 | return NULL; | 241 | return NULL; |
| 233 | 242 | ||
| 234 | dev = phy_device_create(bus, addr, phy_id); | 243 | dev = phy_device_create(bus, addr, phy_id); |
diff --git a/drivers/net/phy/vitesse.c b/drivers/net/phy/vitesse.c index 8874497b6bbf..dd3b2447e85a 100644 --- a/drivers/net/phy/vitesse.c +++ b/drivers/net/phy/vitesse.c | |||
| @@ -34,6 +34,8 @@ | |||
| 34 | #define MII_VSC8244_IMASK_DUPLEX 0x1000 | 34 | #define MII_VSC8244_IMASK_DUPLEX 0x1000 |
| 35 | #define MII_VSC8244_IMASK_MASK 0xf000 | 35 | #define MII_VSC8244_IMASK_MASK 0xf000 |
| 36 | 36 | ||
| 37 | #define MII_VSC8221_IMASK_MASK 0xa000 | ||
| 38 | |||
| 37 | /* Vitesse Interrupt Status Register */ | 39 | /* Vitesse Interrupt Status Register */ |
| 38 | #define MII_VSC8244_ISTAT 0x1a | 40 | #define MII_VSC8244_ISTAT 0x1a |
| 39 | #define MII_VSC8244_ISTAT_STATUS 0x8000 | 41 | #define MII_VSC8244_ISTAT_STATUS 0x8000 |
| @@ -49,6 +51,12 @@ | |||
| 49 | #define MII_VSC8244_AUXCONSTAT_GBIT 0x0010 | 51 | #define MII_VSC8244_AUXCONSTAT_GBIT 0x0010 |
| 50 | #define MII_VSC8244_AUXCONSTAT_100 0x0008 | 52 | #define MII_VSC8244_AUXCONSTAT_100 0x0008 |
| 51 | 53 | ||
| 54 | #define MII_VSC8221_AUXCONSTAT_INIT 0x0004 /* need to set this bit? */ | ||
| 55 | #define MII_VSC8221_AUXCONSTAT_RESERVED 0x0004 | ||
| 56 | |||
| 57 | #define PHY_ID_VSC8244 0x000fc6c0 | ||
| 58 | #define PHY_ID_VSC8221 0x000fc550 | ||
| 59 | |||
| 52 | MODULE_DESCRIPTION("Vitesse PHY driver"); | 60 | MODULE_DESCRIPTION("Vitesse PHY driver"); |
| 53 | MODULE_AUTHOR("Kriston Carson"); | 61 | MODULE_AUTHOR("Kriston Carson"); |
| 54 | MODULE_LICENSE("GPL"); | 62 | MODULE_LICENSE("GPL"); |
| @@ -95,13 +103,15 @@ static int vsc824x_ack_interrupt(struct phy_device *phydev) | |||
| 95 | return (err < 0) ? err : 0; | 103 | return (err < 0) ? err : 0; |
| 96 | } | 104 | } |
| 97 | 105 | ||
| 98 | static int vsc824x_config_intr(struct phy_device *phydev) | 106 | static int vsc82xx_config_intr(struct phy_device *phydev) |
| 99 | { | 107 | { |
| 100 | int err; | 108 | int err; |
| 101 | 109 | ||
| 102 | if (phydev->interrupts == PHY_INTERRUPT_ENABLED) | 110 | if (phydev->interrupts == PHY_INTERRUPT_ENABLED) |
| 103 | err = phy_write(phydev, MII_VSC8244_IMASK, | 111 | err = phy_write(phydev, MII_VSC8244_IMASK, |
| 104 | MII_VSC8244_IMASK_MASK); | 112 | phydev->drv->phy_id == PHY_ID_VSC8244 ? |
| 113 | MII_VSC8244_IMASK_MASK : | ||
| 114 | MII_VSC8221_IMASK_MASK); | ||
| 105 | else { | 115 | else { |
| 106 | /* | 116 | /* |
| 107 | * The Vitesse PHY cannot clear the interrupt | 117 | * The Vitesse PHY cannot clear the interrupt |
| @@ -120,7 +130,7 @@ static int vsc824x_config_intr(struct phy_device *phydev) | |||
| 120 | 130 | ||
| 121 | /* Vitesse 824x */ | 131 | /* Vitesse 824x */ |
| 122 | static struct phy_driver vsc8244_driver = { | 132 | static struct phy_driver vsc8244_driver = { |
| 123 | .phy_id = 0x000fc6c0, | 133 | .phy_id = PHY_ID_VSC8244, |
| 124 | .name = "Vitesse VSC8244", | 134 | .name = "Vitesse VSC8244", |
| 125 | .phy_id_mask = 0x000fffc0, | 135 | .phy_id_mask = 0x000fffc0, |
| 126 | .features = PHY_GBIT_FEATURES, | 136 | .features = PHY_GBIT_FEATURES, |
| @@ -129,19 +139,55 @@ static struct phy_driver vsc8244_driver = { | |||
| 129 | .config_aneg = &genphy_config_aneg, | 139 | .config_aneg = &genphy_config_aneg, |
| 130 | .read_status = &genphy_read_status, | 140 | .read_status = &genphy_read_status, |
| 131 | .ack_interrupt = &vsc824x_ack_interrupt, | 141 | .ack_interrupt = &vsc824x_ack_interrupt, |
| 132 | .config_intr = &vsc824x_config_intr, | 142 | .config_intr = &vsc82xx_config_intr, |
| 133 | .driver = { .owner = THIS_MODULE,}, | 143 | .driver = { .owner = THIS_MODULE,}, |
| 134 | }; | 144 | }; |
| 135 | 145 | ||
| 136 | static int __init vsc8244_init(void) | 146 | static int vsc8221_config_init(struct phy_device *phydev) |
| 137 | { | 147 | { |
| 138 | return phy_driver_register(&vsc8244_driver); | 148 | int err; |
| 149 | |||
| 150 | err = phy_write(phydev, MII_VSC8244_AUX_CONSTAT, | ||
| 151 | MII_VSC8221_AUXCONSTAT_INIT); | ||
| 152 | return err; | ||
| 153 | |||
| 154 | /* Perhaps we should set EXT_CON1 based on the interface? | ||
| 155 | Options are 802.3Z SerDes or SGMII */ | ||
| 156 | } | ||
| 157 | |||
| 158 | /* Vitesse 8221 */ | ||
| 159 | static struct phy_driver vsc8221_driver = { | ||
| 160 | .phy_id = PHY_ID_VSC8221, | ||
| 161 | .phy_id_mask = 0x000ffff0, | ||
| 162 | .name = "Vitesse VSC8221", | ||
| 163 | .features = PHY_GBIT_FEATURES, | ||
| 164 | .flags = PHY_HAS_INTERRUPT, | ||
| 165 | .config_init = &vsc8221_config_init, | ||
| 166 | .config_aneg = &genphy_config_aneg, | ||
| 167 | .read_status = &genphy_read_status, | ||
| 168 | .ack_interrupt = &vsc824x_ack_interrupt, | ||
| 169 | .config_intr = &vsc82xx_config_intr, | ||
| 170 | .driver = { .owner = THIS_MODULE,}, | ||
| 171 | }; | ||
| 172 | |||
| 173 | static int __init vsc82xx_init(void) | ||
| 174 | { | ||
| 175 | int err; | ||
| 176 | |||
| 177 | err = phy_driver_register(&vsc8244_driver); | ||
| 178 | if (err < 0) | ||
| 179 | return err; | ||
| 180 | err = phy_driver_register(&vsc8221_driver); | ||
| 181 | if (err < 0) | ||
| 182 | phy_driver_unregister(&vsc8244_driver); | ||
| 183 | return err; | ||
| 139 | } | 184 | } |
| 140 | 185 | ||
| 141 | static void __exit vsc8244_exit(void) | 186 | static void __exit vsc82xx_exit(void) |
| 142 | { | 187 | { |
| 143 | phy_driver_unregister(&vsc8244_driver); | 188 | phy_driver_unregister(&vsc8244_driver); |
| 189 | phy_driver_unregister(&vsc8221_driver); | ||
| 144 | } | 190 | } |
| 145 | 191 | ||
| 146 | module_init(vsc8244_init); | 192 | module_init(vsc82xx_init); |
| 147 | module_exit(vsc8244_exit); | 193 | module_exit(vsc82xx_exit); |
diff --git a/drivers/net/pppol2tp.c b/drivers/net/pppol2tp.c index 185b1dff10a8..e98d9773158d 100644 --- a/drivers/net/pppol2tp.c +++ b/drivers/net/pppol2tp.c | |||
| @@ -1353,6 +1353,7 @@ static int pppol2tp_release(struct socket *sock) | |||
| 1353 | kfree_skb(skb); | 1353 | kfree_skb(skb); |
| 1354 | sock_put(sk); | 1354 | sock_put(sk); |
| 1355 | } | 1355 | } |
| 1356 | sock_put(sk); | ||
| 1356 | } | 1357 | } |
| 1357 | 1358 | ||
| 1358 | release_sock(sk); | 1359 | release_sock(sk); |
diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c index fa3a460f8e2f..8e8337e8b072 100644 --- a/drivers/net/sis900.c +++ b/drivers/net/sis900.c | |||
| @@ -1630,7 +1630,6 @@ sis900_start_xmit(struct sk_buff *skb, struct net_device *net_dev) | |||
| 1630 | * sis900_interrupt - sis900 interrupt handler | 1630 | * sis900_interrupt - sis900 interrupt handler |
| 1631 | * @irq: the irq number | 1631 | * @irq: the irq number |
| 1632 | * @dev_instance: the client data object | 1632 | * @dev_instance: the client data object |
| 1633 | * @regs: snapshot of processor context | ||
| 1634 | * | 1633 | * |
| 1635 | * The interrupt handler does all of the Rx thread work, | 1634 | * The interrupt handler does all of the Rx thread work, |
| 1636 | * and cleans up after the Tx thread | 1635 | * and cleans up after the Tx thread |
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c index b6435d0d71f9..07599b492359 100644 --- a/drivers/net/spider_net.c +++ b/drivers/net/spider_net.c | |||
| @@ -672,7 +672,6 @@ write_hash: | |||
| 672 | /** | 672 | /** |
| 673 | * spider_net_prepare_tx_descr - fill tx descriptor with skb data | 673 | * spider_net_prepare_tx_descr - fill tx descriptor with skb data |
| 674 | * @card: card structure | 674 | * @card: card structure |
| 675 | * @descr: descriptor structure to fill out | ||
| 676 | * @skb: packet to use | 675 | * @skb: packet to use |
| 677 | * | 676 | * |
| 678 | * returns 0 on success, <0 on failure. | 677 | * returns 0 on success, <0 on failure. |
| @@ -867,7 +866,6 @@ spider_net_release_tx_chain(struct spider_net_card *card, int brutal) | |||
| 867 | /** | 866 | /** |
| 868 | * spider_net_kick_tx_dma - enables TX DMA processing | 867 | * spider_net_kick_tx_dma - enables TX DMA processing |
| 869 | * @card: card structure | 868 | * @card: card structure |
| 870 | * @descr: descriptor address to enable TX processing at | ||
| 871 | * | 869 | * |
| 872 | * This routine will start the transmit DMA running if | 870 | * This routine will start the transmit DMA running if |
| 873 | * it is not already running. This routine ned only be | 871 | * it is not already running. This routine ned only be |
| @@ -1637,7 +1635,6 @@ spider_net_handle_error_irq(struct spider_net_card *card, u32 status_reg, | |||
| 1637 | * spider_net_interrupt - interrupt handler for spider_net | 1635 | * spider_net_interrupt - interrupt handler for spider_net |
| 1638 | * @irq: interrupt number | 1636 | * @irq: interrupt number |
| 1639 | * @ptr: pointer to net_device | 1637 | * @ptr: pointer to net_device |
| 1640 | * @regs: PU registers | ||
| 1641 | * | 1638 | * |
| 1642 | * returns IRQ_HANDLED, if interrupt was for driver, or IRQ_NONE, if no | 1639 | * returns IRQ_HANDLED, if interrupt was for driver, or IRQ_NONE, if no |
| 1643 | * interrupt found raised by card. | 1640 | * interrupt found raised by card. |
| @@ -2419,7 +2416,6 @@ spider_net_undo_pci_setup(struct spider_net_card *card) | |||
| 2419 | 2416 | ||
| 2420 | /** | 2417 | /** |
| 2421 | * spider_net_setup_pci_dev - sets up the device in terms of PCI operations | 2418 | * spider_net_setup_pci_dev - sets up the device in terms of PCI operations |
| 2422 | * @card: card structure | ||
| 2423 | * @pdev: PCI device | 2419 | * @pdev: PCI device |
| 2424 | * | 2420 | * |
| 2425 | * Returns the card structure or NULL if any errors occur | 2421 | * Returns the card structure or NULL if any errors occur |
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c index 4291458955ef..fed7eba65ead 100644 --- a/drivers/net/sungem.c +++ b/drivers/net/sungem.c | |||
| @@ -1142,6 +1142,70 @@ static int gem_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 1142 | return NETDEV_TX_OK; | 1142 | return NETDEV_TX_OK; |
| 1143 | } | 1143 | } |
| 1144 | 1144 | ||
| 1145 | static void gem_pcs_reset(struct gem *gp) | ||
| 1146 | { | ||
| 1147 | int limit; | ||
| 1148 | u32 val; | ||
| 1149 | |||
| 1150 | /* Reset PCS unit. */ | ||
| 1151 | val = readl(gp->regs + PCS_MIICTRL); | ||
| 1152 | val |= PCS_MIICTRL_RST; | ||
| 1153 | writel(val, gp->regs + PCS_MIICTRL); | ||
| 1154 | |||
| 1155 | limit = 32; | ||
| 1156 | while (readl(gp->regs + PCS_MIICTRL) & PCS_MIICTRL_RST) { | ||
| 1157 | udelay(100); | ||
| 1158 | if (limit-- <= 0) | ||
| 1159 | break; | ||
| 1160 | } | ||
| 1161 | if (limit <= 0) | ||
| 1162 | printk(KERN_WARNING "%s: PCS reset bit would not clear.\n", | ||
| 1163 | gp->dev->name); | ||
| 1164 | } | ||
| 1165 | |||
| 1166 | static void gem_pcs_reinit_adv(struct gem *gp) | ||
| 1167 | { | ||
| 1168 | u32 val; | ||
| 1169 | |||
| 1170 | /* Make sure PCS is disabled while changing advertisement | ||
| 1171 | * configuration. | ||
| 1172 | */ | ||
| 1173 | val = readl(gp->regs + PCS_CFG); | ||
| 1174 | val &= ~(PCS_CFG_ENABLE | PCS_CFG_TO); | ||
| 1175 | writel(val, gp->regs + PCS_CFG); | ||
| 1176 | |||
| 1177 | /* Advertise all capabilities except assymetric | ||
| 1178 | * pause. | ||
| 1179 | */ | ||
| 1180 | val = readl(gp->regs + PCS_MIIADV); | ||
| 1181 | val |= (PCS_MIIADV_FD | PCS_MIIADV_HD | | ||
| 1182 | PCS_MIIADV_SP | PCS_MIIADV_AP); | ||
| 1183 | writel(val, gp->regs + PCS_MIIADV); | ||
| 1184 | |||
| 1185 | /* Enable and restart auto-negotiation, disable wrapback/loopback, | ||
| 1186 | * and re-enable PCS. | ||
| 1187 | */ | ||
| 1188 | val = readl(gp->regs + PCS_MIICTRL); | ||
| 1189 | val |= (PCS_MIICTRL_RAN | PCS_MIICTRL_ANE); | ||
| 1190 | val &= ~PCS_MIICTRL_WB; | ||
| 1191 | writel(val, gp->regs + PCS_MIICTRL); | ||
| 1192 | |||
| 1193 | val = readl(gp->regs + PCS_CFG); | ||
| 1194 | val |= PCS_CFG_ENABLE; | ||
| 1195 | writel(val, gp->regs + PCS_CFG); | ||
| 1196 | |||
| 1197 | /* Make sure serialink loopback is off. The meaning | ||
| 1198 | * of this bit is logically inverted based upon whether | ||
| 1199 | * you are in Serialink or SERDES mode. | ||
| 1200 | */ | ||
| 1201 | val = readl(gp->regs + PCS_SCTRL); | ||
| 1202 | if (gp->phy_type == phy_serialink) | ||
| 1203 | val &= ~PCS_SCTRL_LOOP; | ||
| 1204 | else | ||
| 1205 | val |= PCS_SCTRL_LOOP; | ||
| 1206 | writel(val, gp->regs + PCS_SCTRL); | ||
| 1207 | } | ||
| 1208 | |||
| 1145 | #define STOP_TRIES 32 | 1209 | #define STOP_TRIES 32 |
| 1146 | 1210 | ||
| 1147 | /* Must be invoked under gp->lock and gp->tx_lock. */ | 1211 | /* Must be invoked under gp->lock and gp->tx_lock. */ |
| @@ -1168,6 +1232,9 @@ static void gem_reset(struct gem *gp) | |||
| 1168 | 1232 | ||
| 1169 | if (limit <= 0) | 1233 | if (limit <= 0) |
| 1170 | printk(KERN_ERR "%s: SW reset is ghetto.\n", gp->dev->name); | 1234 | printk(KERN_ERR "%s: SW reset is ghetto.\n", gp->dev->name); |
| 1235 | |||
| 1236 | if (gp->phy_type == phy_serialink || gp->phy_type == phy_serdes) | ||
| 1237 | gem_pcs_reinit_adv(gp); | ||
| 1171 | } | 1238 | } |
| 1172 | 1239 | ||
| 1173 | /* Must be invoked under gp->lock and gp->tx_lock. */ | 1240 | /* Must be invoked under gp->lock and gp->tx_lock. */ |
| @@ -1324,7 +1391,7 @@ static int gem_set_link_modes(struct gem *gp) | |||
| 1324 | gp->phy_type == phy_serdes) { | 1391 | gp->phy_type == phy_serdes) { |
| 1325 | u32 pcs_lpa = readl(gp->regs + PCS_MIILP); | 1392 | u32 pcs_lpa = readl(gp->regs + PCS_MIILP); |
| 1326 | 1393 | ||
| 1327 | if (pcs_lpa & PCS_MIIADV_FD) | 1394 | if ((pcs_lpa & PCS_MIIADV_FD) || gp->phy_type == phy_serdes) |
| 1328 | full_duplex = 1; | 1395 | full_duplex = 1; |
| 1329 | speed = SPEED_1000; | 1396 | speed = SPEED_1000; |
| 1330 | } | 1397 | } |
| @@ -1488,6 +1555,9 @@ static void gem_link_timer(unsigned long data) | |||
| 1488 | val = readl(gp->regs + PCS_MIISTAT); | 1555 | val = readl(gp->regs + PCS_MIISTAT); |
| 1489 | 1556 | ||
| 1490 | if ((val & PCS_MIISTAT_LS) != 0) { | 1557 | if ((val & PCS_MIISTAT_LS) != 0) { |
| 1558 | if (gp->lstate == link_up) | ||
| 1559 | goto restart; | ||
| 1560 | |||
| 1491 | gp->lstate = link_up; | 1561 | gp->lstate = link_up; |
| 1492 | netif_carrier_on(gp->dev); | 1562 | netif_carrier_on(gp->dev); |
| 1493 | (void)gem_set_link_modes(gp); | 1563 | (void)gem_set_link_modes(gp); |
| @@ -1708,61 +1778,8 @@ static void gem_init_phy(struct gem *gp) | |||
| 1708 | if (gp->phy_mii.def && gp->phy_mii.def->ops->init) | 1778 | if (gp->phy_mii.def && gp->phy_mii.def->ops->init) |
| 1709 | gp->phy_mii.def->ops->init(&gp->phy_mii); | 1779 | gp->phy_mii.def->ops->init(&gp->phy_mii); |
| 1710 | } else { | 1780 | } else { |
| 1711 | u32 val; | 1781 | gem_pcs_reset(gp); |
| 1712 | int limit; | 1782 | gem_pcs_reinit_adv(gp); |
| 1713 | |||
| 1714 | /* Reset PCS unit. */ | ||
| 1715 | val = readl(gp->regs + PCS_MIICTRL); | ||
| 1716 | val |= PCS_MIICTRL_RST; | ||
| 1717 | writeb(val, gp->regs + PCS_MIICTRL); | ||
| 1718 | |||
| 1719 | limit = 32; | ||
| 1720 | while (readl(gp->regs + PCS_MIICTRL) & PCS_MIICTRL_RST) { | ||
| 1721 | udelay(100); | ||
| 1722 | if (limit-- <= 0) | ||
| 1723 | break; | ||
| 1724 | } | ||
| 1725 | if (limit <= 0) | ||
| 1726 | printk(KERN_WARNING "%s: PCS reset bit would not clear.\n", | ||
| 1727 | gp->dev->name); | ||
| 1728 | |||
| 1729 | /* Make sure PCS is disabled while changing advertisement | ||
| 1730 | * configuration. | ||
| 1731 | */ | ||
| 1732 | val = readl(gp->regs + PCS_CFG); | ||
| 1733 | val &= ~(PCS_CFG_ENABLE | PCS_CFG_TO); | ||
| 1734 | writel(val, gp->regs + PCS_CFG); | ||
| 1735 | |||
| 1736 | /* Advertise all capabilities except assymetric | ||
| 1737 | * pause. | ||
| 1738 | */ | ||
| 1739 | val = readl(gp->regs + PCS_MIIADV); | ||
| 1740 | val |= (PCS_MIIADV_FD | PCS_MIIADV_HD | | ||
| 1741 | PCS_MIIADV_SP | PCS_MIIADV_AP); | ||
| 1742 | writel(val, gp->regs + PCS_MIIADV); | ||
| 1743 | |||
| 1744 | /* Enable and restart auto-negotiation, disable wrapback/loopback, | ||
| 1745 | * and re-enable PCS. | ||
| 1746 | */ | ||
| 1747 | val = readl(gp->regs + PCS_MIICTRL); | ||
| 1748 | val |= (PCS_MIICTRL_RAN | PCS_MIICTRL_ANE); | ||
| 1749 | val &= ~PCS_MIICTRL_WB; | ||
| 1750 | writel(val, gp->regs + PCS_MIICTRL); | ||
| 1751 | |||
| 1752 | val = readl(gp->regs + PCS_CFG); | ||
| 1753 | val |= PCS_CFG_ENABLE; | ||
| 1754 | writel(val, gp->regs + PCS_CFG); | ||
| 1755 | |||
| 1756 | /* Make sure serialink loopback is off. The meaning | ||
| 1757 | * of this bit is logically inverted based upon whether | ||
| 1758 | * you are in Serialink or SERDES mode. | ||
| 1759 | */ | ||
| 1760 | val = readl(gp->regs + PCS_SCTRL); | ||
| 1761 | if (gp->phy_type == phy_serialink) | ||
| 1762 | val &= ~PCS_SCTRL_LOOP; | ||
| 1763 | else | ||
| 1764 | val |= PCS_SCTRL_LOOP; | ||
| 1765 | writel(val, gp->regs + PCS_SCTRL); | ||
| 1766 | } | 1783 | } |
| 1767 | 1784 | ||
| 1768 | /* Default aneg parameters */ | 1785 | /* Default aneg parameters */ |
| @@ -2680,6 +2697,21 @@ static int gem_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) | |||
| 2680 | cmd->speed = 0; | 2697 | cmd->speed = 0; |
| 2681 | cmd->duplex = cmd->port = cmd->phy_address = | 2698 | cmd->duplex = cmd->port = cmd->phy_address = |
| 2682 | cmd->transceiver = cmd->autoneg = 0; | 2699 | cmd->transceiver = cmd->autoneg = 0; |
| 2700 | |||
| 2701 | /* serdes means usually a Fibre connector, with most fixed */ | ||
| 2702 | if (gp->phy_type == phy_serdes) { | ||
| 2703 | cmd->port = PORT_FIBRE; | ||
| 2704 | cmd->supported = (SUPPORTED_1000baseT_Half | | ||
| 2705 | SUPPORTED_1000baseT_Full | | ||
| 2706 | SUPPORTED_FIBRE | SUPPORTED_Autoneg | | ||
| 2707 | SUPPORTED_Pause | SUPPORTED_Asym_Pause); | ||
| 2708 | cmd->advertising = cmd->supported; | ||
| 2709 | cmd->transceiver = XCVR_INTERNAL; | ||
| 2710 | if (gp->lstate == link_up) | ||
| 2711 | cmd->speed = SPEED_1000; | ||
| 2712 | cmd->duplex = DUPLEX_FULL; | ||
| 2713 | cmd->autoneg = 1; | ||
| 2714 | } | ||
| 2683 | } | 2715 | } |
| 2684 | cmd->maxtxpkt = cmd->maxrxpkt = 0; | 2716 | cmd->maxtxpkt = cmd->maxrxpkt = 0; |
| 2685 | 2717 | ||
diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c index cfd4d052d666..2d14255eb103 100644 --- a/drivers/net/wireless/ath5k/base.c +++ b/drivers/net/wireless/ath5k/base.c | |||
| @@ -240,6 +240,10 @@ static u64 ath5k_get_tsf(struct ieee80211_hw *hw); | |||
| 240 | static void ath5k_reset_tsf(struct ieee80211_hw *hw); | 240 | static void ath5k_reset_tsf(struct ieee80211_hw *hw); |
| 241 | static int ath5k_beacon_update(struct ieee80211_hw *hw, | 241 | static int ath5k_beacon_update(struct ieee80211_hw *hw, |
| 242 | struct sk_buff *skb); | 242 | struct sk_buff *skb); |
| 243 | static void ath5k_bss_info_changed(struct ieee80211_hw *hw, | ||
| 244 | struct ieee80211_vif *vif, | ||
| 245 | struct ieee80211_bss_conf *bss_conf, | ||
| 246 | u32 changes); | ||
| 243 | 247 | ||
| 244 | static struct ieee80211_ops ath5k_hw_ops = { | 248 | static struct ieee80211_ops ath5k_hw_ops = { |
| 245 | .tx = ath5k_tx, | 249 | .tx = ath5k_tx, |
| @@ -256,6 +260,7 @@ static struct ieee80211_ops ath5k_hw_ops = { | |||
| 256 | .get_tx_stats = ath5k_get_tx_stats, | 260 | .get_tx_stats = ath5k_get_tx_stats, |
| 257 | .get_tsf = ath5k_get_tsf, | 261 | .get_tsf = ath5k_get_tsf, |
| 258 | .reset_tsf = ath5k_reset_tsf, | 262 | .reset_tsf = ath5k_reset_tsf, |
| 263 | .bss_info_changed = ath5k_bss_info_changed, | ||
| 259 | }; | 264 | }; |
| 260 | 265 | ||
| 261 | /* | 266 | /* |
| @@ -2942,7 +2947,7 @@ static void ath5k_configure_filter(struct ieee80211_hw *hw, | |||
| 2942 | sc->opmode != NL80211_IFTYPE_MESH_POINT && | 2947 | sc->opmode != NL80211_IFTYPE_MESH_POINT && |
| 2943 | test_bit(ATH_STAT_PROMISC, sc->status)) | 2948 | test_bit(ATH_STAT_PROMISC, sc->status)) |
| 2944 | rfilt |= AR5K_RX_FILTER_PROM; | 2949 | rfilt |= AR5K_RX_FILTER_PROM; |
| 2945 | if (sc->opmode == NL80211_IFTYPE_STATION || | 2950 | if ((sc->opmode == NL80211_IFTYPE_STATION && sc->assoc) || |
| 2946 | sc->opmode == NL80211_IFTYPE_ADHOC) { | 2951 | sc->opmode == NL80211_IFTYPE_ADHOC) { |
| 2947 | rfilt |= AR5K_RX_FILTER_BEACON; | 2952 | rfilt |= AR5K_RX_FILTER_BEACON; |
| 2948 | } | 2953 | } |
| @@ -3083,4 +3088,32 @@ ath5k_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb) | |||
| 3083 | end: | 3088 | end: |
| 3084 | return ret; | 3089 | return ret; |
| 3085 | } | 3090 | } |
| 3091 | static void | ||
| 3092 | set_beacon_filter(struct ieee80211_hw *hw, bool enable) | ||
| 3093 | { | ||
| 3094 | struct ath5k_softc *sc = hw->priv; | ||
| 3095 | struct ath5k_hw *ah = sc->ah; | ||
| 3096 | u32 rfilt; | ||
| 3097 | rfilt = ath5k_hw_get_rx_filter(ah); | ||
| 3098 | if (enable) | ||
| 3099 | rfilt |= AR5K_RX_FILTER_BEACON; | ||
| 3100 | else | ||
| 3101 | rfilt &= ~AR5K_RX_FILTER_BEACON; | ||
| 3102 | ath5k_hw_set_rx_filter(ah, rfilt); | ||
| 3103 | sc->filter_flags = rfilt; | ||
| 3104 | } | ||
| 3086 | 3105 | ||
| 3106 | static void ath5k_bss_info_changed(struct ieee80211_hw *hw, | ||
| 3107 | struct ieee80211_vif *vif, | ||
| 3108 | struct ieee80211_bss_conf *bss_conf, | ||
| 3109 | u32 changes) | ||
| 3110 | { | ||
| 3111 | struct ath5k_softc *sc = hw->priv; | ||
| 3112 | if (changes & BSS_CHANGED_ASSOC) { | ||
| 3113 | mutex_lock(&sc->lock); | ||
| 3114 | sc->assoc = bss_conf->assoc; | ||
| 3115 | if (sc->opmode == NL80211_IFTYPE_STATION) | ||
| 3116 | set_beacon_filter(hw, sc->assoc); | ||
| 3117 | mutex_unlock(&sc->lock); | ||
| 3118 | } | ||
| 3119 | } | ||
diff --git a/drivers/net/wireless/ath5k/base.h b/drivers/net/wireless/ath5k/base.h index 06d1054ca94b..facc60ddada2 100644 --- a/drivers/net/wireless/ath5k/base.h +++ b/drivers/net/wireless/ath5k/base.h | |||
| @@ -179,6 +179,7 @@ struct ath5k_softc { | |||
| 179 | 179 | ||
| 180 | struct timer_list calib_tim; /* calibration timer */ | 180 | struct timer_list calib_tim; /* calibration timer */ |
| 181 | int power_level; /* Requested tx power in dbm */ | 181 | int power_level; /* Requested tx power in dbm */ |
| 182 | bool assoc; /* assocate state */ | ||
| 182 | }; | 183 | }; |
| 183 | 184 | ||
| 184 | #define ath5k_hw_hasbssidmask(_ah) \ | 185 | #define ath5k_hw_hasbssidmask(_ah) \ |
diff --git a/drivers/net/wireless/ath5k/debug.c b/drivers/net/wireless/ath5k/debug.c index 19980cbd5d5f..ccaeb5c219d2 100644 --- a/drivers/net/wireless/ath5k/debug.c +++ b/drivers/net/wireless/ath5k/debug.c | |||
| @@ -417,19 +417,19 @@ ath5k_debug_init_device(struct ath5k_softc *sc) | |||
| 417 | sc->debug.debugfs_phydir = debugfs_create_dir(wiphy_name(sc->hw->wiphy), | 417 | sc->debug.debugfs_phydir = debugfs_create_dir(wiphy_name(sc->hw->wiphy), |
| 418 | ath5k_global_debugfs); | 418 | ath5k_global_debugfs); |
| 419 | 419 | ||
| 420 | sc->debug.debugfs_debug = debugfs_create_file("debug", 0666, | 420 | sc->debug.debugfs_debug = debugfs_create_file("debug", S_IWUSR | S_IRUGO, |
| 421 | sc->debug.debugfs_phydir, sc, &fops_debug); | 421 | sc->debug.debugfs_phydir, sc, &fops_debug); |
| 422 | 422 | ||
| 423 | sc->debug.debugfs_registers = debugfs_create_file("registers", 0444, | 423 | sc->debug.debugfs_registers = debugfs_create_file("registers", S_IRUGO, |
| 424 | sc->debug.debugfs_phydir, sc, &fops_registers); | 424 | sc->debug.debugfs_phydir, sc, &fops_registers); |
| 425 | 425 | ||
| 426 | sc->debug.debugfs_tsf = debugfs_create_file("tsf", 0666, | 426 | sc->debug.debugfs_tsf = debugfs_create_file("tsf", S_IWUSR | S_IRUGO, |
| 427 | sc->debug.debugfs_phydir, sc, &fops_tsf); | 427 | sc->debug.debugfs_phydir, sc, &fops_tsf); |
| 428 | 428 | ||
| 429 | sc->debug.debugfs_beacon = debugfs_create_file("beacon", 0666, | 429 | sc->debug.debugfs_beacon = debugfs_create_file("beacon", S_IWUSR | S_IRUGO, |
| 430 | sc->debug.debugfs_phydir, sc, &fops_beacon); | 430 | sc->debug.debugfs_phydir, sc, &fops_beacon); |
| 431 | 431 | ||
| 432 | sc->debug.debugfs_reset = debugfs_create_file("reset", 0222, | 432 | sc->debug.debugfs_reset = debugfs_create_file("reset", S_IWUSR, |
| 433 | sc->debug.debugfs_phydir, sc, &fops_reset); | 433 | sc->debug.debugfs_phydir, sc, &fops_reset); |
| 434 | } | 434 | } |
| 435 | 435 | ||
diff --git a/drivers/net/wireless/ath9k/beacon.c b/drivers/net/wireless/ath9k/beacon.c index 9e15c30bbc06..4dd1c1bda0fb 100644 --- a/drivers/net/wireless/ath9k/beacon.c +++ b/drivers/net/wireless/ath9k/beacon.c | |||
| @@ -170,7 +170,7 @@ static struct ath_buf *ath_beacon_generate(struct ath_softc *sc, int if_id) | |||
| 170 | skb = (struct sk_buff *)bf->bf_mpdu; | 170 | skb = (struct sk_buff *)bf->bf_mpdu; |
| 171 | if (skb) { | 171 | if (skb) { |
| 172 | pci_unmap_single(sc->pdev, bf->bf_dmacontext, | 172 | pci_unmap_single(sc->pdev, bf->bf_dmacontext, |
| 173 | skb_end_pointer(skb) - skb->head, | 173 | skb->len, |
| 174 | PCI_DMA_TODEVICE); | 174 | PCI_DMA_TODEVICE); |
| 175 | } | 175 | } |
| 176 | 176 | ||
| @@ -193,7 +193,7 @@ static struct ath_buf *ath_beacon_generate(struct ath_softc *sc, int if_id) | |||
| 193 | 193 | ||
| 194 | bf->bf_buf_addr = bf->bf_dmacontext = | 194 | bf->bf_buf_addr = bf->bf_dmacontext = |
| 195 | pci_map_single(sc->pdev, skb->data, | 195 | pci_map_single(sc->pdev, skb->data, |
| 196 | skb_end_pointer(skb) - skb->head, | 196 | skb->len, |
| 197 | PCI_DMA_TODEVICE); | 197 | PCI_DMA_TODEVICE); |
| 198 | 198 | ||
| 199 | skb = ieee80211_get_buffered_bc(sc->hw, avp->av_if_data); | 199 | skb = ieee80211_get_buffered_bc(sc->hw, avp->av_if_data); |
| @@ -352,7 +352,7 @@ int ath_beacon_alloc(struct ath_softc *sc, int if_id) | |||
| 352 | if (bf->bf_mpdu != NULL) { | 352 | if (bf->bf_mpdu != NULL) { |
| 353 | skb = (struct sk_buff *)bf->bf_mpdu; | 353 | skb = (struct sk_buff *)bf->bf_mpdu; |
| 354 | pci_unmap_single(sc->pdev, bf->bf_dmacontext, | 354 | pci_unmap_single(sc->pdev, bf->bf_dmacontext, |
| 355 | skb_end_pointer(skb) - skb->head, | 355 | skb->len, |
| 356 | PCI_DMA_TODEVICE); | 356 | PCI_DMA_TODEVICE); |
| 357 | dev_kfree_skb_any(skb); | 357 | dev_kfree_skb_any(skb); |
| 358 | bf->bf_mpdu = NULL; | 358 | bf->bf_mpdu = NULL; |
| @@ -412,7 +412,7 @@ int ath_beacon_alloc(struct ath_softc *sc, int if_id) | |||
| 412 | 412 | ||
| 413 | bf->bf_buf_addr = bf->bf_dmacontext = | 413 | bf->bf_buf_addr = bf->bf_dmacontext = |
| 414 | pci_map_single(sc->pdev, skb->data, | 414 | pci_map_single(sc->pdev, skb->data, |
| 415 | skb_end_pointer(skb) - skb->head, | 415 | skb->len, |
| 416 | PCI_DMA_TODEVICE); | 416 | PCI_DMA_TODEVICE); |
| 417 | bf->bf_mpdu = skb; | 417 | bf->bf_mpdu = skb; |
| 418 | 418 | ||
| @@ -439,7 +439,7 @@ void ath_beacon_return(struct ath_softc *sc, struct ath_vap *avp) | |||
| 439 | if (bf->bf_mpdu != NULL) { | 439 | if (bf->bf_mpdu != NULL) { |
| 440 | struct sk_buff *skb = (struct sk_buff *)bf->bf_mpdu; | 440 | struct sk_buff *skb = (struct sk_buff *)bf->bf_mpdu; |
| 441 | pci_unmap_single(sc->pdev, bf->bf_dmacontext, | 441 | pci_unmap_single(sc->pdev, bf->bf_dmacontext, |
| 442 | skb_end_pointer(skb) - skb->head, | 442 | skb->len, |
| 443 | PCI_DMA_TODEVICE); | 443 | PCI_DMA_TODEVICE); |
| 444 | dev_kfree_skb_any(skb); | 444 | dev_kfree_skb_any(skb); |
| 445 | bf->bf_mpdu = NULL; | 445 | bf->bf_mpdu = NULL; |
diff --git a/drivers/net/wireless/ath9k/recv.c b/drivers/net/wireless/ath9k/recv.c index 4983402af559..504a0444d89f 100644 --- a/drivers/net/wireless/ath9k/recv.c +++ b/drivers/net/wireless/ath9k/recv.c | |||
| @@ -49,10 +49,12 @@ static void ath_rx_buf_link(struct ath_softc *sc, struct ath_buf *bf) | |||
| 49 | ASSERT(skb != NULL); | 49 | ASSERT(skb != NULL); |
| 50 | ds->ds_vdata = skb->data; | 50 | ds->ds_vdata = skb->data; |
| 51 | 51 | ||
| 52 | /* setup rx descriptors */ | 52 | /* setup rx descriptors. The sc_rxbufsize here tells the harware |
| 53 | * how much data it can DMA to us and that we are prepared | ||
| 54 | * to process */ | ||
| 53 | ath9k_hw_setuprxdesc(ah, | 55 | ath9k_hw_setuprxdesc(ah, |
| 54 | ds, | 56 | ds, |
| 55 | skb_tailroom(skb), /* buffer size */ | 57 | sc->sc_rxbufsize, |
| 56 | 0); | 58 | 0); |
| 57 | 59 | ||
| 58 | if (sc->sc_rxlink == NULL) | 60 | if (sc->sc_rxlink == NULL) |
| @@ -398,6 +400,13 @@ static struct sk_buff *ath_rxbuf_alloc(struct ath_softc *sc, | |||
| 398 | * in rx'd frames. | 400 | * in rx'd frames. |
| 399 | */ | 401 | */ |
| 400 | 402 | ||
| 403 | /* Note: the kernel can allocate a value greater than | ||
| 404 | * what we ask it to give us. We really only need 4 KB as that | ||
| 405 | * is this hardware supports and in fact we need at least 3849 | ||
| 406 | * as that is the MAX AMSDU size this hardware supports. | ||
| 407 | * Unfortunately this means we may get 8 KB here from the | ||
| 408 | * kernel... and that is actually what is observed on some | ||
| 409 | * systems :( */ | ||
| 401 | skb = dev_alloc_skb(len + sc->sc_cachelsz - 1); | 410 | skb = dev_alloc_skb(len + sc->sc_cachelsz - 1); |
| 402 | if (skb != NULL) { | 411 | if (skb != NULL) { |
| 403 | off = ((unsigned long) skb->data) % sc->sc_cachelsz; | 412 | off = ((unsigned long) skb->data) % sc->sc_cachelsz; |
| @@ -456,7 +465,7 @@ static int ath_rx_indicate(struct ath_softc *sc, | |||
| 456 | if (nskb != NULL) { | 465 | if (nskb != NULL) { |
| 457 | bf->bf_mpdu = nskb; | 466 | bf->bf_mpdu = nskb; |
| 458 | bf->bf_buf_addr = pci_map_single(sc->pdev, nskb->data, | 467 | bf->bf_buf_addr = pci_map_single(sc->pdev, nskb->data, |
| 459 | skb_end_pointer(nskb) - nskb->head, | 468 | sc->sc_rxbufsize, |
| 460 | PCI_DMA_FROMDEVICE); | 469 | PCI_DMA_FROMDEVICE); |
| 461 | bf->bf_dmacontext = bf->bf_buf_addr; | 470 | bf->bf_dmacontext = bf->bf_buf_addr; |
| 462 | ATH_RX_CONTEXT(nskb)->ctx_rxbuf = bf; | 471 | ATH_RX_CONTEXT(nskb)->ctx_rxbuf = bf; |
| @@ -542,7 +551,7 @@ int ath_rx_init(struct ath_softc *sc, int nbufs) | |||
| 542 | 551 | ||
| 543 | bf->bf_mpdu = skb; | 552 | bf->bf_mpdu = skb; |
| 544 | bf->bf_buf_addr = pci_map_single(sc->pdev, skb->data, | 553 | bf->bf_buf_addr = pci_map_single(sc->pdev, skb->data, |
| 545 | skb_end_pointer(skb) - skb->head, | 554 | sc->sc_rxbufsize, |
| 546 | PCI_DMA_FROMDEVICE); | 555 | PCI_DMA_FROMDEVICE); |
| 547 | bf->bf_dmacontext = bf->bf_buf_addr; | 556 | bf->bf_dmacontext = bf->bf_buf_addr; |
| 548 | ATH_RX_CONTEXT(skb)->ctx_rxbuf = bf; | 557 | ATH_RX_CONTEXT(skb)->ctx_rxbuf = bf; |
| @@ -1007,7 +1016,7 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush) | |||
| 1007 | 1016 | ||
| 1008 | pci_dma_sync_single_for_cpu(sc->pdev, | 1017 | pci_dma_sync_single_for_cpu(sc->pdev, |
| 1009 | bf->bf_buf_addr, | 1018 | bf->bf_buf_addr, |
| 1010 | skb_tailroom(skb), | 1019 | sc->sc_rxbufsize, |
| 1011 | PCI_DMA_FROMDEVICE); | 1020 | PCI_DMA_FROMDEVICE); |
| 1012 | pci_unmap_single(sc->pdev, | 1021 | pci_unmap_single(sc->pdev, |
| 1013 | bf->bf_buf_addr, | 1022 | bf->bf_buf_addr, |
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c index dcce3542d5a7..7a9f901d4ff6 100644 --- a/drivers/net/wireless/ipw2200.c +++ b/drivers/net/wireless/ipw2200.c | |||
| @@ -3897,6 +3897,7 @@ static int ipw_disassociate(void *data) | |||
| 3897 | if (!(priv->status & (STATUS_ASSOCIATED | STATUS_ASSOCIATING))) | 3897 | if (!(priv->status & (STATUS_ASSOCIATED | STATUS_ASSOCIATING))) |
| 3898 | return 0; | 3898 | return 0; |
| 3899 | ipw_send_disassociate(data, 0); | 3899 | ipw_send_disassociate(data, 0); |
| 3900 | netif_carrier_off(priv->net_dev); | ||
| 3900 | return 1; | 3901 | return 1; |
| 3901 | } | 3902 | } |
| 3902 | 3903 | ||
| @@ -10190,6 +10191,9 @@ static int ipw_tx_skb(struct ipw_priv *priv, struct ieee80211_txb *txb, | |||
| 10190 | u16 remaining_bytes; | 10191 | u16 remaining_bytes; |
| 10191 | int fc; | 10192 | int fc; |
| 10192 | 10193 | ||
| 10194 | if (!(priv->status & STATUS_ASSOCIATED)) | ||
| 10195 | goto drop; | ||
| 10196 | |||
| 10193 | hdr_len = ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_ctl)); | 10197 | hdr_len = ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_ctl)); |
| 10194 | switch (priv->ieee->iw_mode) { | 10198 | switch (priv->ieee->iw_mode) { |
| 10195 | case IW_MODE_ADHOC: | 10199 | case IW_MODE_ADHOC: |
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 444c5cc05f03..c4c0371c763b 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
| @@ -1384,9 +1384,11 @@ void iwl_rx_handle(struct iwl_priv *priv) | |||
| 1384 | 1384 | ||
| 1385 | rxq->queue[i] = NULL; | 1385 | rxq->queue[i] = NULL; |
| 1386 | 1386 | ||
| 1387 | pci_dma_sync_single_for_cpu(priv->pci_dev, rxb->aligned_dma_addr, | 1387 | dma_sync_single_range_for_cpu( |
| 1388 | priv->hw_params.rx_buf_size, | 1388 | &priv->pci_dev->dev, rxb->real_dma_addr, |
| 1389 | PCI_DMA_FROMDEVICE); | 1389 | rxb->aligned_dma_addr - rxb->real_dma_addr, |
| 1390 | priv->hw_params.rx_buf_size, | ||
| 1391 | PCI_DMA_FROMDEVICE); | ||
| 1390 | pkt = (struct iwl_rx_packet *)rxb->skb->data; | 1392 | pkt = (struct iwl_rx_packet *)rxb->skb->data; |
| 1391 | 1393 | ||
| 1392 | /* Reclaim a command buffer only if this packet is a response | 1394 | /* Reclaim a command buffer only if this packet is a response |
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c index 4c312c55f90c..01a845851338 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.c +++ b/drivers/net/wireless/iwlwifi/iwl-core.c | |||
| @@ -290,6 +290,9 @@ void iwl_clear_stations_table(struct iwl_priv *priv) | |||
| 290 | priv->num_stations = 0; | 290 | priv->num_stations = 0; |
| 291 | memset(priv->stations, 0, sizeof(priv->stations)); | 291 | memset(priv->stations, 0, sizeof(priv->stations)); |
| 292 | 292 | ||
| 293 | /* clean ucode key table bit map */ | ||
| 294 | priv->ucode_key_table = 0; | ||
| 295 | |||
| 293 | spin_unlock_irqrestore(&priv->sta_lock, flags); | 296 | spin_unlock_irqrestore(&priv->sta_lock, flags); |
| 294 | } | 297 | } |
| 295 | EXPORT_SYMBOL(iwl_clear_stations_table); | 298 | EXPORT_SYMBOL(iwl_clear_stations_table); |
diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wireless/iwlwifi/iwl-sta.c index 61797f3f8d5c..26f7084d3011 100644 --- a/drivers/net/wireless/iwlwifi/iwl-sta.c +++ b/drivers/net/wireless/iwlwifi/iwl-sta.c | |||
| @@ -475,7 +475,7 @@ static int iwl_get_free_ucode_key_index(struct iwl_priv *priv) | |||
| 475 | if (!test_and_set_bit(i, &priv->ucode_key_table)) | 475 | if (!test_and_set_bit(i, &priv->ucode_key_table)) |
| 476 | return i; | 476 | return i; |
| 477 | 477 | ||
| 478 | return -1; | 478 | return WEP_INVALID_OFFSET; |
| 479 | } | 479 | } |
| 480 | 480 | ||
| 481 | int iwl_send_static_wepkey_cmd(struct iwl_priv *priv, u8 send_if_empty) | 481 | int iwl_send_static_wepkey_cmd(struct iwl_priv *priv, u8 send_if_empty) |
| @@ -620,6 +620,9 @@ static int iwl_set_wep_dynamic_key_info(struct iwl_priv *priv, | |||
| 620 | /* else, we are overriding an existing key => no need to allocated room | 620 | /* else, we are overriding an existing key => no need to allocated room |
| 621 | * in uCode. */ | 621 | * in uCode. */ |
| 622 | 622 | ||
| 623 | WARN(priv->stations[sta_id].sta.key.key_offset == WEP_INVALID_OFFSET, | ||
| 624 | "no space for new kew"); | ||
| 625 | |||
| 623 | priv->stations[sta_id].sta.key.key_flags = key_flags; | 626 | priv->stations[sta_id].sta.key.key_flags = key_flags; |
| 624 | priv->stations[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK; | 627 | priv->stations[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK; |
| 625 | priv->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK; | 628 | priv->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK; |
| @@ -637,6 +640,7 @@ static int iwl_set_ccmp_dynamic_key_info(struct iwl_priv *priv, | |||
| 637 | { | 640 | { |
| 638 | unsigned long flags; | 641 | unsigned long flags; |
| 639 | __le16 key_flags = 0; | 642 | __le16 key_flags = 0; |
| 643 | int ret; | ||
| 640 | 644 | ||
| 641 | key_flags |= (STA_KEY_FLG_CCMP | STA_KEY_FLG_MAP_KEY_MSK); | 645 | key_flags |= (STA_KEY_FLG_CCMP | STA_KEY_FLG_MAP_KEY_MSK); |
| 642 | key_flags |= cpu_to_le16(keyconf->keyidx << STA_KEY_FLG_KEYID_POS); | 646 | key_flags |= cpu_to_le16(keyconf->keyidx << STA_KEY_FLG_KEYID_POS); |
| @@ -664,14 +668,18 @@ static int iwl_set_ccmp_dynamic_key_info(struct iwl_priv *priv, | |||
| 664 | /* else, we are overriding an existing key => no need to allocated room | 668 | /* else, we are overriding an existing key => no need to allocated room |
| 665 | * in uCode. */ | 669 | * in uCode. */ |
| 666 | 670 | ||
| 671 | WARN(priv->stations[sta_id].sta.key.key_offset == WEP_INVALID_OFFSET, | ||
| 672 | "no space for new kew"); | ||
| 673 | |||
| 667 | priv->stations[sta_id].sta.key.key_flags = key_flags; | 674 | priv->stations[sta_id].sta.key.key_flags = key_flags; |
| 668 | priv->stations[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK; | 675 | priv->stations[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK; |
| 669 | priv->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK; | 676 | priv->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK; |
| 670 | 677 | ||
| 678 | ret = iwl_send_add_sta(priv, &priv->stations[sta_id].sta, CMD_ASYNC); | ||
| 679 | |||
| 671 | spin_unlock_irqrestore(&priv->sta_lock, flags); | 680 | spin_unlock_irqrestore(&priv->sta_lock, flags); |
| 672 | 681 | ||
| 673 | IWL_DEBUG_INFO("hwcrypto: modify ucode station key info\n"); | 682 | return ret; |
| 674 | return iwl_send_add_sta(priv, &priv->stations[sta_id].sta, CMD_ASYNC); | ||
| 675 | } | 683 | } |
| 676 | 684 | ||
| 677 | static int iwl_set_tkip_dynamic_key_info(struct iwl_priv *priv, | 685 | static int iwl_set_tkip_dynamic_key_info(struct iwl_priv *priv, |
| @@ -696,6 +704,9 @@ static int iwl_set_tkip_dynamic_key_info(struct iwl_priv *priv, | |||
| 696 | /* else, we are overriding an existing key => no need to allocated room | 704 | /* else, we are overriding an existing key => no need to allocated room |
| 697 | * in uCode. */ | 705 | * in uCode. */ |
| 698 | 706 | ||
| 707 | WARN(priv->stations[sta_id].sta.key.key_offset == WEP_INVALID_OFFSET, | ||
| 708 | "no space for new kew"); | ||
| 709 | |||
| 699 | /* This copy is acutally not needed: we get the key with each TX */ | 710 | /* This copy is acutally not needed: we get the key with each TX */ |
| 700 | memcpy(priv->stations[sta_id].keyinfo.key, keyconf->key, 16); | 711 | memcpy(priv->stations[sta_id].keyinfo.key, keyconf->key, 16); |
| 701 | 712 | ||
| @@ -734,6 +745,13 @@ int iwl_remove_dynamic_key(struct iwl_priv *priv, | |||
| 734 | return 0; | 745 | return 0; |
| 735 | } | 746 | } |
| 736 | 747 | ||
| 748 | if (priv->stations[sta_id].sta.key.key_offset == WEP_INVALID_OFFSET) { | ||
| 749 | IWL_WARNING("Removing wrong key %d 0x%x\n", | ||
| 750 | keyconf->keyidx, key_flags); | ||
| 751 | spin_unlock_irqrestore(&priv->sta_lock, flags); | ||
| 752 | return 0; | ||
| 753 | } | ||
| 754 | |||
| 737 | if (!test_and_clear_bit(priv->stations[sta_id].sta.key.key_offset, | 755 | if (!test_and_clear_bit(priv->stations[sta_id].sta.key.key_offset, |
| 738 | &priv->ucode_key_table)) | 756 | &priv->ucode_key_table)) |
| 739 | IWL_ERROR("index %d not used in uCode key table.\n", | 757 | IWL_ERROR("index %d not used in uCode key table.\n", |
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c index fe1867b25ff7..cac732f4047f 100644 --- a/drivers/net/wireless/zd1211rw/zd_mac.c +++ b/drivers/net/wireless/zd1211rw/zd_mac.c | |||
| @@ -615,7 +615,7 @@ static int filter_ack(struct ieee80211_hw *hw, struct ieee80211_hdr *rx_hdr, | |||
| 615 | struct ieee80211_hdr *tx_hdr; | 615 | struct ieee80211_hdr *tx_hdr; |
| 616 | 616 | ||
| 617 | tx_hdr = (struct ieee80211_hdr *)skb->data; | 617 | tx_hdr = (struct ieee80211_hdr *)skb->data; |
| 618 | if (likely(!compare_ether_addr(tx_hdr->addr2, rx_hdr->addr1))) | 618 | if (likely(!memcmp(tx_hdr->addr2, rx_hdr->addr1, ETH_ALEN))) |
| 619 | { | 619 | { |
| 620 | __skb_unlink(skb, q); | 620 | __skb_unlink(skb, q); |
| 621 | tx_status(hw, skb, IEEE80211_TX_STAT_ACK, stats->signal, 1); | 621 | tx_status(hw, skb, IEEE80211_TX_STAT_ACK, stats->signal, 1); |
diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c index 8f63f4c6b85f..9aad608bcf3f 100644 --- a/drivers/pci/pcie/aspm.c +++ b/drivers/pci/pcie/aspm.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/pm.h> | 16 | #include <linux/pm.h> |
| 17 | #include <linux/init.h> | 17 | #include <linux/init.h> |
| 18 | #include <linux/slab.h> | 18 | #include <linux/slab.h> |
| 19 | #include <linux/jiffies.h> | ||
| 19 | #include <linux/pci-aspm.h> | 20 | #include <linux/pci-aspm.h> |
| 20 | #include "../pci.h" | 21 | #include "../pci.h" |
| 21 | 22 | ||
| @@ -161,11 +162,12 @@ static void pcie_check_clock_pm(struct pci_dev *pdev) | |||
| 161 | */ | 162 | */ |
| 162 | static void pcie_aspm_configure_common_clock(struct pci_dev *pdev) | 163 | static void pcie_aspm_configure_common_clock(struct pci_dev *pdev) |
| 163 | { | 164 | { |
| 164 | int pos, child_pos; | 165 | int pos, child_pos, i = 0; |
| 165 | u16 reg16 = 0; | 166 | u16 reg16 = 0; |
| 166 | struct pci_dev *child_dev; | 167 | struct pci_dev *child_dev; |
| 167 | int same_clock = 1; | 168 | int same_clock = 1; |
| 168 | 169 | unsigned long start_jiffies; | |
| 170 | u16 child_regs[8], parent_reg; | ||
| 169 | /* | 171 | /* |
| 170 | * all functions of a slot should have the same Slot Clock | 172 | * all functions of a slot should have the same Slot Clock |
| 171 | * Configuration, so just check one function | 173 | * Configuration, so just check one function |
| @@ -191,16 +193,19 @@ static void pcie_aspm_configure_common_clock(struct pci_dev *pdev) | |||
| 191 | child_pos = pci_find_capability(child_dev, PCI_CAP_ID_EXP); | 193 | child_pos = pci_find_capability(child_dev, PCI_CAP_ID_EXP); |
| 192 | pci_read_config_word(child_dev, child_pos + PCI_EXP_LNKCTL, | 194 | pci_read_config_word(child_dev, child_pos + PCI_EXP_LNKCTL, |
| 193 | ®16); | 195 | ®16); |
| 196 | child_regs[i] = reg16; | ||
| 194 | if (same_clock) | 197 | if (same_clock) |
| 195 | reg16 |= PCI_EXP_LNKCTL_CCC; | 198 | reg16 |= PCI_EXP_LNKCTL_CCC; |
| 196 | else | 199 | else |
| 197 | reg16 &= ~PCI_EXP_LNKCTL_CCC; | 200 | reg16 &= ~PCI_EXP_LNKCTL_CCC; |
| 198 | pci_write_config_word(child_dev, child_pos + PCI_EXP_LNKCTL, | 201 | pci_write_config_word(child_dev, child_pos + PCI_EXP_LNKCTL, |
| 199 | reg16); | 202 | reg16); |
| 203 | i++; | ||
| 200 | } | 204 | } |
| 201 | 205 | ||
| 202 | /* Configure upstream component */ | 206 | /* Configure upstream component */ |
| 203 | pci_read_config_word(pdev, pos + PCI_EXP_LNKCTL, ®16); | 207 | pci_read_config_word(pdev, pos + PCI_EXP_LNKCTL, ®16); |
| 208 | parent_reg = reg16; | ||
| 204 | if (same_clock) | 209 | if (same_clock) |
| 205 | reg16 |= PCI_EXP_LNKCTL_CCC; | 210 | reg16 |= PCI_EXP_LNKCTL_CCC; |
| 206 | else | 211 | else |
| @@ -212,12 +217,30 @@ static void pcie_aspm_configure_common_clock(struct pci_dev *pdev) | |||
| 212 | pci_write_config_word(pdev, pos + PCI_EXP_LNKCTL, reg16); | 217 | pci_write_config_word(pdev, pos + PCI_EXP_LNKCTL, reg16); |
| 213 | 218 | ||
| 214 | /* Wait for link training end */ | 219 | /* Wait for link training end */ |
| 215 | while (1) { | 220 | /* break out after waiting for 1 second */ |
| 221 | start_jiffies = jiffies; | ||
| 222 | while ((jiffies - start_jiffies) < HZ) { | ||
| 216 | pci_read_config_word(pdev, pos + PCI_EXP_LNKSTA, ®16); | 223 | pci_read_config_word(pdev, pos + PCI_EXP_LNKSTA, ®16); |
| 217 | if (!(reg16 & PCI_EXP_LNKSTA_LT)) | 224 | if (!(reg16 & PCI_EXP_LNKSTA_LT)) |
| 218 | break; | 225 | break; |
| 219 | cpu_relax(); | 226 | cpu_relax(); |
| 220 | } | 227 | } |
| 228 | /* training failed -> recover */ | ||
| 229 | if ((jiffies - start_jiffies) >= HZ) { | ||
| 230 | dev_printk (KERN_ERR, &pdev->dev, "ASPM: Could not configure" | ||
| 231 | " common clock\n"); | ||
| 232 | i = 0; | ||
| 233 | list_for_each_entry(child_dev, &pdev->subordinate->devices, | ||
| 234 | bus_list) { | ||
| 235 | child_pos = pci_find_capability(child_dev, | ||
| 236 | PCI_CAP_ID_EXP); | ||
| 237 | pci_write_config_word(child_dev, | ||
| 238 | child_pos + PCI_EXP_LNKCTL, | ||
| 239 | child_regs[i]); | ||
| 240 | i++; | ||
| 241 | } | ||
| 242 | pci_write_config_word(pdev, pos + PCI_EXP_LNKCTL, parent_reg); | ||
| 243 | } | ||
| 221 | } | 244 | } |
| 222 | 245 | ||
| 223 | /* | 246 | /* |
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 5049a47030ac..5f4f85f56cb7 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
| 23 | #include <linux/acpi.h> | 23 | #include <linux/acpi.h> |
| 24 | #include <linux/kallsyms.h> | 24 | #include <linux/kallsyms.h> |
| 25 | #include <linux/dmi.h> | ||
| 25 | #include "pci.h" | 26 | #include "pci.h" |
| 26 | 27 | ||
| 27 | int isa_dma_bridge_buggy; | 28 | int isa_dma_bridge_buggy; |
| @@ -1828,6 +1829,22 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SERVERWORKS, | |||
| 1828 | PCI_DEVICE_ID_SERVERWORKS_HT1000_PXB, | 1829 | PCI_DEVICE_ID_SERVERWORKS_HT1000_PXB, |
| 1829 | ht_enable_msi_mapping); | 1830 | ht_enable_msi_mapping); |
| 1830 | 1831 | ||
| 1832 | /* The P5N32-SLI Premium motherboard from Asus has a problem with msi | ||
| 1833 | * for the MCP55 NIC. It is not yet determined whether the msi problem | ||
| 1834 | * also affects other devices. As for now, turn off msi for this device. | ||
| 1835 | */ | ||
| 1836 | static void __devinit nvenet_msi_disable(struct pci_dev *dev) | ||
| 1837 | { | ||
| 1838 | if (dmi_name_in_vendors("P5N32-SLI PREMIUM")) { | ||
| 1839 | dev_info(&dev->dev, | ||
| 1840 | "Disabling msi for MCP55 NIC on P5N32-SLI Premium\n"); | ||
| 1841 | dev->no_msi = 1; | ||
| 1842 | } | ||
| 1843 | } | ||
| 1844 | DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_NVIDIA, | ||
| 1845 | PCI_DEVICE_ID_NVIDIA_NVENET_15, | ||
| 1846 | nvenet_msi_disable); | ||
| 1847 | |||
| 1831 | static void __devinit nv_msi_ht_cap_quirk(struct pci_dev *dev) | 1848 | static void __devinit nv_msi_ht_cap_quirk(struct pci_dev *dev) |
| 1832 | { | 1849 | { |
| 1833 | struct pci_dev *host_bridge; | 1850 | struct pci_dev *host_bridge; |
diff --git a/drivers/pci/slot.c b/drivers/pci/slot.c index 4dd1c3e157ae..5a8ccb4f604d 100644 --- a/drivers/pci/slot.c +++ b/drivers/pci/slot.c | |||
| @@ -253,6 +253,7 @@ placeholder: | |||
| 253 | __func__, pci_domain_nr(parent), parent->number, slot_nr); | 253 | __func__, pci_domain_nr(parent), parent->number, slot_nr); |
| 254 | 254 | ||
| 255 | out: | 255 | out: |
| 256 | kfree(slot_name); | ||
| 256 | up_write(&pci_bus_sem); | 257 | up_write(&pci_bus_sem); |
| 257 | return slot; | 258 | return slot; |
| 258 | err: | 259 | err: |
diff --git a/drivers/pcmcia/bfin_cf_pcmcia.c b/drivers/pcmcia/bfin_cf_pcmcia.c index bb7338863fb9..b59d4115d20f 100644 --- a/drivers/pcmcia/bfin_cf_pcmcia.c +++ b/drivers/pcmcia/bfin_cf_pcmcia.c | |||
| @@ -334,6 +334,6 @@ static void __exit bfin_cf_exit(void) | |||
| 334 | module_init(bfin_cf_init); | 334 | module_init(bfin_cf_init); |
| 335 | module_exit(bfin_cf_exit); | 335 | module_exit(bfin_cf_exit); |
| 336 | 336 | ||
| 337 | MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>") | 337 | MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>"); |
| 338 | MODULE_DESCRIPTION("BFIN CF/PCMCIA Driver"); | 338 | MODULE_DESCRIPTION("BFIN CF/PCMCIA Driver"); |
| 339 | MODULE_LICENSE("GPL"); | 339 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/rtc/rtc-ds1672.c b/drivers/rtc/rtc-ds1672.c index 341d7a5b45a2..4e91419e8911 100644 --- a/drivers/rtc/rtc-ds1672.c +++ b/drivers/rtc/rtc-ds1672.c | |||
| @@ -209,12 +209,18 @@ static int ds1672_probe(struct i2c_client *client, | |||
| 209 | return err; | 209 | return err; |
| 210 | } | 210 | } |
| 211 | 211 | ||
| 212 | static struct i2c_device_id ds1672_id[] = { | ||
| 213 | { "ds1672", 0 }, | ||
| 214 | { } | ||
| 215 | }; | ||
| 216 | |||
| 212 | static struct i2c_driver ds1672_driver = { | 217 | static struct i2c_driver ds1672_driver = { |
| 213 | .driver = { | 218 | .driver = { |
| 214 | .name = "rtc-ds1672", | 219 | .name = "rtc-ds1672", |
| 215 | }, | 220 | }, |
| 216 | .probe = &ds1672_probe, | 221 | .probe = &ds1672_probe, |
| 217 | .remove = &ds1672_remove, | 222 | .remove = &ds1672_remove, |
| 223 | .id_table = ds1672_id, | ||
| 218 | }; | 224 | }; |
| 219 | 225 | ||
| 220 | static int __init ds1672_init(void) | 226 | static int __init ds1672_init(void) |
diff --git a/drivers/rtc/rtc-max6900.c b/drivers/rtc/rtc-max6900.c index 80782798763f..a4f6665ab3c5 100644 --- a/drivers/rtc/rtc-max6900.c +++ b/drivers/rtc/rtc-max6900.c | |||
| @@ -247,12 +247,18 @@ max6900_probe(struct i2c_client *client, const struct i2c_device_id *id) | |||
| 247 | return 0; | 247 | return 0; |
| 248 | } | 248 | } |
| 249 | 249 | ||
| 250 | static struct i2c_device_id max6900_id[] = { | ||
| 251 | { "max6900", 0 }, | ||
| 252 | { } | ||
| 253 | }; | ||
| 254 | |||
| 250 | static struct i2c_driver max6900_driver = { | 255 | static struct i2c_driver max6900_driver = { |
| 251 | .driver = { | 256 | .driver = { |
| 252 | .name = "rtc-max6900", | 257 | .name = "rtc-max6900", |
| 253 | }, | 258 | }, |
| 254 | .probe = max6900_probe, | 259 | .probe = max6900_probe, |
| 255 | .remove = max6900_remove, | 260 | .remove = max6900_remove, |
| 261 | .id_table = max6900_id, | ||
| 256 | }; | 262 | }; |
| 257 | 263 | ||
| 258 | static int __init max6900_init(void) | 264 | static int __init max6900_init(void) |
diff --git a/drivers/rtc/rtc-starfire.c b/drivers/rtc/rtc-starfire.c index 7ccb0dd700af..5be98bfd7ed3 100644 --- a/drivers/rtc/rtc-starfire.c +++ b/drivers/rtc/rtc-starfire.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | #include <linux/kernel.h> | 6 | #include <linux/kernel.h> |
| 7 | #include <linux/module.h> | 7 | #include <linux/module.h> |
| 8 | #include <linux/init.h> | 8 | #include <linux/init.h> |
| 9 | #include <linux/time.h> | ||
| 10 | #include <linux/rtc.h> | 9 | #include <linux/rtc.h> |
| 11 | #include <linux/platform_device.h> | 10 | #include <linux/platform_device.h> |
| 12 | 11 | ||
| @@ -16,11 +15,6 @@ MODULE_AUTHOR("David S. Miller <davem@davemloft.net>"); | |||
| 16 | MODULE_DESCRIPTION("Starfire RTC driver"); | 15 | MODULE_DESCRIPTION("Starfire RTC driver"); |
| 17 | MODULE_LICENSE("GPL"); | 16 | MODULE_LICENSE("GPL"); |
| 18 | 17 | ||
| 19 | struct starfire_rtc { | ||
| 20 | struct rtc_device *rtc; | ||
| 21 | spinlock_t lock; | ||
| 22 | }; | ||
| 23 | |||
| 24 | static u32 starfire_get_time(void) | 18 | static u32 starfire_get_time(void) |
| 25 | { | 19 | { |
| 26 | static char obp_gettod[32]; | 20 | static char obp_gettod[32]; |
| @@ -35,64 +29,31 @@ static u32 starfire_get_time(void) | |||
| 35 | 29 | ||
| 36 | static int starfire_read_time(struct device *dev, struct rtc_time *tm) | 30 | static int starfire_read_time(struct device *dev, struct rtc_time *tm) |
| 37 | { | 31 | { |
| 38 | struct starfire_rtc *p = dev_get_drvdata(dev); | 32 | rtc_time_to_tm(starfire_get_time(), tm); |
| 39 | unsigned long flags, secs; | 33 | return rtc_valid_tm(tm); |
| 40 | |||
| 41 | spin_lock_irqsave(&p->lock, flags); | ||
| 42 | secs = starfire_get_time(); | ||
| 43 | spin_unlock_irqrestore(&p->lock, flags); | ||
| 44 | |||
| 45 | rtc_time_to_tm(secs, tm); | ||
| 46 | |||
| 47 | return 0; | ||
| 48 | } | ||
| 49 | |||
| 50 | static int starfire_set_time(struct device *dev, struct rtc_time *tm) | ||
| 51 | { | ||
| 52 | unsigned long secs; | ||
| 53 | int err; | ||
| 54 | |||
| 55 | err = rtc_tm_to_time(tm, &secs); | ||
| 56 | if (err) | ||
| 57 | return err; | ||
| 58 | |||
| 59 | /* Do nothing, time is set using the service processor | ||
| 60 | * console on this platform. | ||
| 61 | */ | ||
| 62 | return 0; | ||
| 63 | } | 34 | } |
| 64 | 35 | ||
| 65 | static const struct rtc_class_ops starfire_rtc_ops = { | 36 | static const struct rtc_class_ops starfire_rtc_ops = { |
| 66 | .read_time = starfire_read_time, | 37 | .read_time = starfire_read_time, |
| 67 | .set_time = starfire_set_time, | ||
| 68 | }; | 38 | }; |
| 69 | 39 | ||
| 70 | static int __devinit starfire_rtc_probe(struct platform_device *pdev) | 40 | static int __init starfire_rtc_probe(struct platform_device *pdev) |
| 71 | { | 41 | { |
| 72 | struct starfire_rtc *p = kzalloc(sizeof(*p), GFP_KERNEL); | 42 | struct rtc_device *rtc = rtc_device_register("starfire", &pdev->dev, |
| 73 | 43 | &starfire_rtc_ops, THIS_MODULE); | |
| 74 | if (!p) | 44 | if (IS_ERR(rtc)) |
| 75 | return -ENOMEM; | 45 | return PTR_ERR(rtc); |
| 76 | 46 | ||
| 77 | spin_lock_init(&p->lock); | 47 | platform_set_drvdata(pdev, rtc); |
| 78 | 48 | ||
| 79 | p->rtc = rtc_device_register("starfire", &pdev->dev, | ||
| 80 | &starfire_rtc_ops, THIS_MODULE); | ||
| 81 | if (IS_ERR(p->rtc)) { | ||
| 82 | int err = PTR_ERR(p->rtc); | ||
| 83 | kfree(p); | ||
| 84 | return err; | ||
| 85 | } | ||
| 86 | platform_set_drvdata(pdev, p); | ||
| 87 | return 0; | 49 | return 0; |
| 88 | } | 50 | } |
| 89 | 51 | ||
| 90 | static int __devexit starfire_rtc_remove(struct platform_device *pdev) | 52 | static int __exit starfire_rtc_remove(struct platform_device *pdev) |
| 91 | { | 53 | { |
| 92 | struct starfire_rtc *p = platform_get_drvdata(pdev); | 54 | struct rtc_device *rtc = platform_get_drvdata(pdev); |
| 93 | 55 | ||
| 94 | rtc_device_unregister(p->rtc); | 56 | rtc_device_unregister(rtc); |
| 95 | kfree(p); | ||
| 96 | 57 | ||
| 97 | return 0; | 58 | return 0; |
| 98 | } | 59 | } |
| @@ -102,13 +63,12 @@ static struct platform_driver starfire_rtc_driver = { | |||
| 102 | .name = "rtc-starfire", | 63 | .name = "rtc-starfire", |
| 103 | .owner = THIS_MODULE, | 64 | .owner = THIS_MODULE, |
| 104 | }, | 65 | }, |
| 105 | .probe = starfire_rtc_probe, | 66 | .remove = __exit_p(starfire_rtc_remove), |
| 106 | .remove = __devexit_p(starfire_rtc_remove), | ||
| 107 | }; | 67 | }; |
| 108 | 68 | ||
| 109 | static int __init starfire_rtc_init(void) | 69 | static int __init starfire_rtc_init(void) |
| 110 | { | 70 | { |
| 111 | return platform_driver_register(&starfire_rtc_driver); | 71 | return platform_driver_probe(&starfire_rtc_driver, starfire_rtc_probe); |
| 112 | } | 72 | } |
| 113 | 73 | ||
| 114 | static void __exit starfire_rtc_exit(void) | 74 | static void __exit starfire_rtc_exit(void) |
diff --git a/drivers/rtc/rtc-twl4030.c b/drivers/rtc/rtc-twl4030.c index abe87a4d2665..01d8da9afdc8 100644 --- a/drivers/rtc/rtc-twl4030.c +++ b/drivers/rtc/rtc-twl4030.c | |||
| @@ -337,7 +337,7 @@ static int twl4030_rtc_ioctl(struct device *dev, unsigned int cmd, | |||
| 337 | } | 337 | } |
| 338 | 338 | ||
| 339 | #else | 339 | #else |
| 340 | #define omap_rtc_ioctl NULL | 340 | #define twl4030_rtc_ioctl NULL |
| 341 | #endif | 341 | #endif |
| 342 | 342 | ||
| 343 | static irqreturn_t twl4030_rtc_interrupt(int irq, void *rtc) | 343 | static irqreturn_t twl4030_rtc_interrupt(int irq, void *rtc) |
diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c index 35364f64da7f..c557ba34e1aa 100644 --- a/drivers/s390/scsi/zfcp_erp.c +++ b/drivers/s390/scsi/zfcp_erp.c | |||
| @@ -720,7 +720,6 @@ static int zfcp_erp_adapter_strategy_generic(struct zfcp_erp_action *act, | |||
| 720 | goto failed_openfcp; | 720 | goto failed_openfcp; |
| 721 | 721 | ||
| 722 | atomic_set_mask(ZFCP_STATUS_COMMON_OPEN, &act->adapter->status); | 722 | atomic_set_mask(ZFCP_STATUS_COMMON_OPEN, &act->adapter->status); |
| 723 | schedule_work(&act->adapter->scan_work); | ||
| 724 | 723 | ||
| 725 | return ZFCP_ERP_SUCCEEDED; | 724 | return ZFCP_ERP_SUCCEEDED; |
| 726 | 725 | ||
| @@ -1186,7 +1185,9 @@ static void zfcp_erp_scsi_scan(struct work_struct *work) | |||
| 1186 | container_of(work, struct zfcp_erp_add_work, work); | 1185 | container_of(work, struct zfcp_erp_add_work, work); |
| 1187 | struct zfcp_unit *unit = p->unit; | 1186 | struct zfcp_unit *unit = p->unit; |
| 1188 | struct fc_rport *rport = unit->port->rport; | 1187 | struct fc_rport *rport = unit->port->rport; |
| 1189 | scsi_scan_target(&rport->dev, 0, rport->scsi_target_id, | 1188 | |
| 1189 | if (rport && rport->port_state == FC_PORTSTATE_ONLINE) | ||
| 1190 | scsi_scan_target(&rport->dev, 0, rport->scsi_target_id, | ||
| 1190 | scsilun_to_int((struct scsi_lun *)&unit->fcp_lun), 0); | 1191 | scsilun_to_int((struct scsi_lun *)&unit->fcp_lun), 0); |
| 1191 | atomic_clear_mask(ZFCP_STATUS_UNIT_SCSI_WORK_PENDING, &unit->status); | 1192 | atomic_clear_mask(ZFCP_STATUS_UNIT_SCSI_WORK_PENDING, &unit->status); |
| 1192 | zfcp_unit_put(unit); | 1193 | zfcp_unit_put(unit); |
| @@ -1282,6 +1283,8 @@ static void zfcp_erp_action_cleanup(struct zfcp_erp_action *act, int result) | |||
| 1282 | case ZFCP_ERP_ACTION_REOPEN_ADAPTER: | 1283 | case ZFCP_ERP_ACTION_REOPEN_ADAPTER: |
| 1283 | if (result != ZFCP_ERP_SUCCEEDED) | 1284 | if (result != ZFCP_ERP_SUCCEEDED) |
| 1284 | zfcp_erp_rports_del(adapter); | 1285 | zfcp_erp_rports_del(adapter); |
| 1286 | else | ||
| 1287 | schedule_work(&adapter->scan_work); | ||
| 1285 | zfcp_adapter_put(adapter); | 1288 | zfcp_adapter_put(adapter); |
| 1286 | break; | 1289 | break; |
| 1287 | } | 1290 | } |
diff --git a/drivers/s390/scsi/zfcp_fc.c b/drivers/s390/scsi/zfcp_fc.c index 1a7c80a77ff5..8aab3091a7b1 100644 --- a/drivers/s390/scsi/zfcp_fc.c +++ b/drivers/s390/scsi/zfcp_fc.c | |||
| @@ -50,7 +50,8 @@ static int zfcp_wka_port_get(struct zfcp_wka_port *wka_port) | |||
| 50 | if (mutex_lock_interruptible(&wka_port->mutex)) | 50 | if (mutex_lock_interruptible(&wka_port->mutex)) |
| 51 | return -ERESTARTSYS; | 51 | return -ERESTARTSYS; |
| 52 | 52 | ||
| 53 | if (wka_port->status != ZFCP_WKA_PORT_ONLINE) { | 53 | if (wka_port->status == ZFCP_WKA_PORT_OFFLINE || |
| 54 | wka_port->status == ZFCP_WKA_PORT_CLOSING) { | ||
| 54 | wka_port->status = ZFCP_WKA_PORT_OPENING; | 55 | wka_port->status = ZFCP_WKA_PORT_OPENING; |
| 55 | if (zfcp_fsf_open_wka_port(wka_port)) | 56 | if (zfcp_fsf_open_wka_port(wka_port)) |
| 56 | wka_port->status = ZFCP_WKA_PORT_OFFLINE; | 57 | wka_port->status = ZFCP_WKA_PORT_OFFLINE; |
| @@ -125,8 +126,7 @@ static void _zfcp_fc_incoming_rscn(struct zfcp_fsf_req *fsf_req, u32 range, | |||
| 125 | 126 | ||
| 126 | read_lock_irqsave(&zfcp_data.config_lock, flags); | 127 | read_lock_irqsave(&zfcp_data.config_lock, flags); |
| 127 | list_for_each_entry(port, &fsf_req->adapter->port_list_head, list) { | 128 | list_for_each_entry(port, &fsf_req->adapter->port_list_head, list) { |
| 128 | /* FIXME: ZFCP_STATUS_PORT_DID_DID check is racy */ | 129 | if (!(atomic_read(&port->status) & ZFCP_STATUS_PORT_PHYS_OPEN)) |
| 129 | if (!(atomic_read(&port->status) & ZFCP_STATUS_PORT_DID_DID)) | ||
| 130 | /* Try to connect to unused ports anyway. */ | 130 | /* Try to connect to unused ports anyway. */ |
| 131 | zfcp_erp_port_reopen(port, | 131 | zfcp_erp_port_reopen(port, |
| 132 | ZFCP_STATUS_COMMON_ERP_FAILED, | 132 | ZFCP_STATUS_COMMON_ERP_FAILED, |
| @@ -610,7 +610,6 @@ int zfcp_scan_ports(struct zfcp_adapter *adapter) | |||
| 610 | int ret, i; | 610 | int ret, i; |
| 611 | struct zfcp_gpn_ft *gpn_ft; | 611 | struct zfcp_gpn_ft *gpn_ft; |
| 612 | 612 | ||
| 613 | zfcp_erp_wait(adapter); /* wait until adapter is finished with ERP */ | ||
| 614 | if (fc_host_port_type(adapter->scsi_host) != FC_PORTTYPE_NPORT) | 613 | if (fc_host_port_type(adapter->scsi_host) != FC_PORTTYPE_NPORT) |
| 615 | return 0; | 614 | return 0; |
| 616 | 615 | ||
diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c index d024442ee128..dc0367690405 100644 --- a/drivers/s390/scsi/zfcp_fsf.c +++ b/drivers/s390/scsi/zfcp_fsf.c | |||
| @@ -930,8 +930,10 @@ struct zfcp_fsf_req *zfcp_fsf_abort_fcp_command(unsigned long old_req_id, | |||
| 930 | goto out; | 930 | goto out; |
| 931 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_ABORT_FCP_CMND, | 931 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_ABORT_FCP_CMND, |
| 932 | req_flags, adapter->pool.fsf_req_abort); | 932 | req_flags, adapter->pool.fsf_req_abort); |
| 933 | if (IS_ERR(req)) | 933 | if (IS_ERR(req)) { |
| 934 | req = NULL; | ||
| 934 | goto out; | 935 | goto out; |
| 936 | } | ||
| 935 | 937 | ||
| 936 | if (unlikely(!(atomic_read(&unit->status) & | 938 | if (unlikely(!(atomic_read(&unit->status) & |
| 937 | ZFCP_STATUS_COMMON_UNBLOCKED))) | 939 | ZFCP_STATUS_COMMON_UNBLOCKED))) |
| @@ -1584,6 +1586,7 @@ static void zfcp_fsf_open_wka_port_handler(struct zfcp_fsf_req *req) | |||
| 1584 | wka_port->status = ZFCP_WKA_PORT_OFFLINE; | 1586 | wka_port->status = ZFCP_WKA_PORT_OFFLINE; |
| 1585 | break; | 1587 | break; |
| 1586 | case FSF_PORT_ALREADY_OPEN: | 1588 | case FSF_PORT_ALREADY_OPEN: |
| 1589 | break; | ||
| 1587 | case FSF_GOOD: | 1590 | case FSF_GOOD: |
| 1588 | wka_port->handle = header->port_handle; | 1591 | wka_port->handle = header->port_handle; |
| 1589 | wka_port->status = ZFCP_WKA_PORT_ONLINE; | 1592 | wka_port->status = ZFCP_WKA_PORT_ONLINE; |
| @@ -2113,18 +2116,21 @@ static inline void zfcp_fsf_trace_latency(struct zfcp_fsf_req *fsf_req) | |||
| 2113 | 2116 | ||
| 2114 | static void zfcp_fsf_send_fcp_command_task_handler(struct zfcp_fsf_req *req) | 2117 | static void zfcp_fsf_send_fcp_command_task_handler(struct zfcp_fsf_req *req) |
| 2115 | { | 2118 | { |
| 2116 | struct scsi_cmnd *scpnt = req->data; | 2119 | struct scsi_cmnd *scpnt; |
| 2117 | struct fcp_rsp_iu *fcp_rsp_iu = (struct fcp_rsp_iu *) | 2120 | struct fcp_rsp_iu *fcp_rsp_iu = (struct fcp_rsp_iu *) |
| 2118 | &(req->qtcb->bottom.io.fcp_rsp); | 2121 | &(req->qtcb->bottom.io.fcp_rsp); |
| 2119 | u32 sns_len; | 2122 | u32 sns_len; |
| 2120 | char *fcp_rsp_info = (unsigned char *) &fcp_rsp_iu[1]; | 2123 | char *fcp_rsp_info = (unsigned char *) &fcp_rsp_iu[1]; |
| 2121 | unsigned long flags; | 2124 | unsigned long flags; |
| 2122 | 2125 | ||
| 2123 | if (unlikely(!scpnt)) | ||
| 2124 | return; | ||
| 2125 | |||
| 2126 | read_lock_irqsave(&req->adapter->abort_lock, flags); | 2126 | read_lock_irqsave(&req->adapter->abort_lock, flags); |
| 2127 | 2127 | ||
| 2128 | scpnt = req->data; | ||
| 2129 | if (unlikely(!scpnt)) { | ||
| 2130 | read_unlock_irqrestore(&req->adapter->abort_lock, flags); | ||
| 2131 | return; | ||
| 2132 | } | ||
| 2133 | |||
| 2128 | if (unlikely(req->status & ZFCP_STATUS_FSFREQ_ABORTED)) { | 2134 | if (unlikely(req->status & ZFCP_STATUS_FSFREQ_ABORTED)) { |
| 2129 | set_host_byte(scpnt, DID_SOFT_ERROR); | 2135 | set_host_byte(scpnt, DID_SOFT_ERROR); |
| 2130 | set_driver_byte(scpnt, SUGGEST_RETRY); | 2136 | set_driver_byte(scpnt, SUGGEST_RETRY); |
| @@ -2442,8 +2448,10 @@ struct zfcp_fsf_req *zfcp_fsf_send_fcp_ctm(struct zfcp_adapter *adapter, | |||
| 2442 | goto out; | 2448 | goto out; |
| 2443 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_FCP_CMND, req_flags, | 2449 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_FCP_CMND, req_flags, |
| 2444 | adapter->pool.fsf_req_scsi); | 2450 | adapter->pool.fsf_req_scsi); |
| 2445 | if (IS_ERR(req)) | 2451 | if (IS_ERR(req)) { |
| 2452 | req = NULL; | ||
| 2446 | goto out; | 2453 | goto out; |
| 2454 | } | ||
| 2447 | 2455 | ||
| 2448 | req->status |= ZFCP_STATUS_FSFREQ_TASK_MANAGEMENT; | 2456 | req->status |= ZFCP_STATUS_FSFREQ_TASK_MANAGEMENT; |
| 2449 | req->data = unit; | 2457 | req->data = unit; |
diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c index e46fd3e9f68f..468c880f8b6d 100644 --- a/drivers/s390/scsi/zfcp_scsi.c +++ b/drivers/s390/scsi/zfcp_scsi.c | |||
| @@ -88,7 +88,7 @@ static int zfcp_scsi_queuecommand(struct scsi_cmnd *scpnt, | |||
| 88 | ret = zfcp_fsf_send_fcp_command_task(adapter, unit, scpnt, 0, | 88 | ret = zfcp_fsf_send_fcp_command_task(adapter, unit, scpnt, 0, |
| 89 | ZFCP_REQ_AUTO_CLEANUP); | 89 | ZFCP_REQ_AUTO_CLEANUP); |
| 90 | if (unlikely(ret == -EBUSY)) | 90 | if (unlikely(ret == -EBUSY)) |
| 91 | zfcp_scsi_command_fail(scpnt, DID_NO_CONNECT); | 91 | return SCSI_MLQUEUE_DEVICE_BUSY; |
| 92 | else if (unlikely(ret < 0)) | 92 | else if (unlikely(ret < 0)) |
| 93 | return SCSI_MLQUEUE_HOST_BUSY; | 93 | return SCSI_MLQUEUE_HOST_BUSY; |
| 94 | 94 | ||
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c index 9aa301c1ed07..162cd927d94b 100644 --- a/drivers/scsi/aacraid/linit.c +++ b/drivers/scsi/aacraid/linit.c | |||
| @@ -427,8 +427,8 @@ static int aac_slave_configure(struct scsi_device *sdev) | |||
| 427 | * Firmware has an individual device recovery time typically | 427 | * Firmware has an individual device recovery time typically |
| 428 | * of 35 seconds, give us a margin. | 428 | * of 35 seconds, give us a margin. |
| 429 | */ | 429 | */ |
| 430 | if (sdev->timeout < (45 * HZ)) | 430 | if (sdev->request_queue->rq_timeout < (45 * HZ)) |
| 431 | sdev->timeout = 45 * HZ; | 431 | blk_queue_rq_timeout(sdev->request_queue, 45*HZ); |
| 432 | for (cid = 0; cid < aac->maximum_num_containers; ++cid) | 432 | for (cid = 0; cid < aac->maximum_num_containers; ++cid) |
| 433 | if (aac->fsa_dev[cid].valid) | 433 | if (aac->fsa_dev[cid].valid) |
| 434 | ++num_lsu; | 434 | ++num_lsu; |
diff --git a/drivers/scsi/device_handler/scsi_dh_hp_sw.c b/drivers/scsi/device_handler/scsi_dh_hp_sw.c index 9aec4ca64e56..f7da7530875e 100644 --- a/drivers/scsi/device_handler/scsi_dh_hp_sw.c +++ b/drivers/scsi/device_handler/scsi_dh_hp_sw.c | |||
| @@ -107,6 +107,7 @@ static int hp_sw_tur(struct scsi_device *sdev, struct hp_sw_dh_data *h) | |||
| 107 | struct request *req; | 107 | struct request *req; |
| 108 | int ret; | 108 | int ret; |
| 109 | 109 | ||
| 110 | retry: | ||
| 110 | req = blk_get_request(sdev->request_queue, WRITE, GFP_NOIO); | 111 | req = blk_get_request(sdev->request_queue, WRITE, GFP_NOIO); |
| 111 | if (!req) | 112 | if (!req) |
| 112 | return SCSI_DH_RES_TEMP_UNAVAIL; | 113 | return SCSI_DH_RES_TEMP_UNAVAIL; |
| @@ -121,7 +122,6 @@ static int hp_sw_tur(struct scsi_device *sdev, struct hp_sw_dh_data *h) | |||
| 121 | memset(req->sense, 0, SCSI_SENSE_BUFFERSIZE); | 122 | memset(req->sense, 0, SCSI_SENSE_BUFFERSIZE); |
| 122 | req->sense_len = 0; | 123 | req->sense_len = 0; |
| 123 | 124 | ||
| 124 | retry: | ||
| 125 | ret = blk_execute_rq(req->q, NULL, req, 1); | 125 | ret = blk_execute_rq(req->q, NULL, req, 1); |
| 126 | if (ret == -EIO) { | 126 | if (ret == -EIO) { |
| 127 | if (req->sense_len > 0) { | 127 | if (req->sense_len > 0) { |
| @@ -136,8 +136,10 @@ retry: | |||
| 136 | h->path_state = HP_SW_PATH_ACTIVE; | 136 | h->path_state = HP_SW_PATH_ACTIVE; |
| 137 | ret = SCSI_DH_OK; | 137 | ret = SCSI_DH_OK; |
| 138 | } | 138 | } |
| 139 | if (ret == SCSI_DH_IMM_RETRY) | 139 | if (ret == SCSI_DH_IMM_RETRY) { |
| 140 | blk_put_request(req); | ||
| 140 | goto retry; | 141 | goto retry; |
| 142 | } | ||
| 141 | if (ret == SCSI_DH_DEV_OFFLINED) { | 143 | if (ret == SCSI_DH_DEV_OFFLINED) { |
| 142 | h->path_state = HP_SW_PATH_PASSIVE; | 144 | h->path_state = HP_SW_PATH_PASSIVE; |
| 143 | ret = SCSI_DH_OK; | 145 | ret = SCSI_DH_OK; |
| @@ -200,6 +202,7 @@ static int hp_sw_start_stop(struct scsi_device *sdev, struct hp_sw_dh_data *h) | |||
| 200 | struct request *req; | 202 | struct request *req; |
| 201 | int ret, retry; | 203 | int ret, retry; |
| 202 | 204 | ||
| 205 | retry: | ||
| 203 | req = blk_get_request(sdev->request_queue, WRITE, GFP_NOIO); | 206 | req = blk_get_request(sdev->request_queue, WRITE, GFP_NOIO); |
| 204 | if (!req) | 207 | if (!req) |
| 205 | return SCSI_DH_RES_TEMP_UNAVAIL; | 208 | return SCSI_DH_RES_TEMP_UNAVAIL; |
| @@ -216,7 +219,6 @@ static int hp_sw_start_stop(struct scsi_device *sdev, struct hp_sw_dh_data *h) | |||
| 216 | req->sense_len = 0; | 219 | req->sense_len = 0; |
| 217 | retry = h->retries; | 220 | retry = h->retries; |
| 218 | 221 | ||
| 219 | retry: | ||
| 220 | ret = blk_execute_rq(req->q, NULL, req, 1); | 222 | ret = blk_execute_rq(req->q, NULL, req, 1); |
| 221 | if (ret == -EIO) { | 223 | if (ret == -EIO) { |
| 222 | if (req->sense_len > 0) { | 224 | if (req->sense_len > 0) { |
| @@ -231,8 +233,10 @@ retry: | |||
| 231 | ret = SCSI_DH_OK; | 233 | ret = SCSI_DH_OK; |
| 232 | 234 | ||
| 233 | if (ret == SCSI_DH_RETRY) { | 235 | if (ret == SCSI_DH_RETRY) { |
| 234 | if (--retry) | 236 | if (--retry) { |
| 237 | blk_put_request(req); | ||
| 235 | goto retry; | 238 | goto retry; |
| 239 | } | ||
| 236 | ret = SCSI_DH_IO; | 240 | ret = SCSI_DH_IO; |
| 237 | } | 241 | } |
| 238 | 242 | ||
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c index 87e09f35d3d4..6cad1758243a 100644 --- a/drivers/scsi/ibmvscsi/ibmvscsi.c +++ b/drivers/scsi/ibmvscsi/ibmvscsi.c | |||
| @@ -1442,7 +1442,7 @@ static int ibmvscsi_slave_configure(struct scsi_device *sdev) | |||
| 1442 | spin_lock_irqsave(shost->host_lock, lock_flags); | 1442 | spin_lock_irqsave(shost->host_lock, lock_flags); |
| 1443 | if (sdev->type == TYPE_DISK) { | 1443 | if (sdev->type == TYPE_DISK) { |
| 1444 | sdev->allow_restart = 1; | 1444 | sdev->allow_restart = 1; |
| 1445 | sdev->timeout = 60 * HZ; | 1445 | blk_queue_rq_timeout(sdev->request_queue, 60 * HZ); |
| 1446 | } | 1446 | } |
| 1447 | scsi_adjust_queue_depth(sdev, 0, shost->cmd_per_lun); | 1447 | scsi_adjust_queue_depth(sdev, 0, shost->cmd_per_lun); |
| 1448 | spin_unlock_irqrestore(shost->host_lock, lock_flags); | 1448 | spin_unlock_irqrestore(shost->host_lock, lock_flags); |
diff --git a/drivers/scsi/megaraid/megaraid_sas.c b/drivers/scsi/megaraid/megaraid_sas.c index a454f94623d7..17ce7abe17ee 100644 --- a/drivers/scsi/megaraid/megaraid_sas.c +++ b/drivers/scsi/megaraid/megaraid_sas.c | |||
| @@ -1016,7 +1016,8 @@ static int megasas_slave_configure(struct scsi_device *sdev) | |||
| 1016 | * The RAID firmware may require extended timeouts. | 1016 | * The RAID firmware may require extended timeouts. |
| 1017 | */ | 1017 | */ |
| 1018 | if (sdev->channel >= MEGASAS_MAX_PD_CHANNELS) | 1018 | if (sdev->channel >= MEGASAS_MAX_PD_CHANNELS) |
| 1019 | sdev->timeout = MEGASAS_DEFAULT_CMD_TIMEOUT * HZ; | 1019 | blk_queue_rq_timeout(sdev->request_queue, |
| 1020 | MEGASAS_DEFAULT_CMD_TIMEOUT * HZ); | ||
| 1020 | return 0; | 1021 | return 0; |
| 1021 | } | 1022 | } |
| 1022 | 1023 | ||
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c index 386361778ebb..edfaf241c5ba 100644 --- a/drivers/scsi/scsi_error.c +++ b/drivers/scsi/scsi_error.c | |||
| @@ -932,8 +932,7 @@ static int scsi_eh_try_stu(struct scsi_cmnd *scmd) | |||
| 932 | int i, rtn = NEEDS_RETRY; | 932 | int i, rtn = NEEDS_RETRY; |
| 933 | 933 | ||
| 934 | for (i = 0; rtn == NEEDS_RETRY && i < 2; i++) | 934 | for (i = 0; rtn == NEEDS_RETRY && i < 2; i++) |
| 935 | rtn = scsi_send_eh_cmnd(scmd, stu_command, 6, | 935 | rtn = scsi_send_eh_cmnd(scmd, stu_command, 6, scmd->device->request_queue->rq_timeout, 0); |
| 936 | scmd->device->timeout, 0); | ||
| 937 | 936 | ||
| 938 | if (rtn == SUCCESS) | 937 | if (rtn == SUCCESS) |
| 939 | return 0; | 938 | return 0; |
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index f5d3b96890dc..fa45a1a66867 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c | |||
| @@ -567,15 +567,18 @@ static inline int scsi_host_is_busy(struct Scsi_Host *shost) | |||
| 567 | */ | 567 | */ |
| 568 | static void scsi_run_queue(struct request_queue *q) | 568 | static void scsi_run_queue(struct request_queue *q) |
| 569 | { | 569 | { |
| 570 | struct scsi_device *starved_head = NULL, *sdev = q->queuedata; | 570 | struct scsi_device *sdev = q->queuedata; |
| 571 | struct Scsi_Host *shost = sdev->host; | 571 | struct Scsi_Host *shost = sdev->host; |
| 572 | LIST_HEAD(starved_list); | ||
| 572 | unsigned long flags; | 573 | unsigned long flags; |
| 573 | 574 | ||
| 574 | if (scsi_target(sdev)->single_lun) | 575 | if (scsi_target(sdev)->single_lun) |
| 575 | scsi_single_lun_run(sdev); | 576 | scsi_single_lun_run(sdev); |
| 576 | 577 | ||
| 577 | spin_lock_irqsave(shost->host_lock, flags); | 578 | spin_lock_irqsave(shost->host_lock, flags); |
| 578 | while (!list_empty(&shost->starved_list) && !scsi_host_is_busy(shost)) { | 579 | list_splice_init(&shost->starved_list, &starved_list); |
| 580 | |||
| 581 | while (!list_empty(&starved_list)) { | ||
| 579 | int flagset; | 582 | int flagset; |
| 580 | 583 | ||
| 581 | /* | 584 | /* |
| @@ -588,24 +591,18 @@ static void scsi_run_queue(struct request_queue *q) | |||
| 588 | * scsi_request_fn must get the host_lock before checking | 591 | * scsi_request_fn must get the host_lock before checking |
| 589 | * or modifying starved_list or starved_entry. | 592 | * or modifying starved_list or starved_entry. |
| 590 | */ | 593 | */ |
| 591 | sdev = list_entry(shost->starved_list.next, | 594 | if (scsi_host_is_busy(shost)) |
| 592 | struct scsi_device, starved_entry); | ||
| 593 | /* | ||
| 594 | * The *queue_ready functions can add a device back onto the | ||
| 595 | * starved list's tail, so we must check for a infinite loop. | ||
| 596 | */ | ||
| 597 | if (sdev == starved_head) | ||
| 598 | break; | 595 | break; |
| 599 | if (!starved_head) | ||
| 600 | starved_head = sdev; | ||
| 601 | 596 | ||
| 597 | sdev = list_entry(starved_list.next, | ||
| 598 | struct scsi_device, starved_entry); | ||
| 599 | list_del_init(&sdev->starved_entry); | ||
| 602 | if (scsi_target_is_busy(scsi_target(sdev))) { | 600 | if (scsi_target_is_busy(scsi_target(sdev))) { |
| 603 | list_move_tail(&sdev->starved_entry, | 601 | list_move_tail(&sdev->starved_entry, |
| 604 | &shost->starved_list); | 602 | &shost->starved_list); |
| 605 | continue; | 603 | continue; |
| 606 | } | 604 | } |
| 607 | 605 | ||
| 608 | list_del_init(&sdev->starved_entry); | ||
| 609 | spin_unlock(shost->host_lock); | 606 | spin_unlock(shost->host_lock); |
| 610 | 607 | ||
| 611 | spin_lock(sdev->request_queue->queue_lock); | 608 | spin_lock(sdev->request_queue->queue_lock); |
| @@ -621,6 +618,8 @@ static void scsi_run_queue(struct request_queue *q) | |||
| 621 | 618 | ||
| 622 | spin_lock(shost->host_lock); | 619 | spin_lock(shost->host_lock); |
| 623 | } | 620 | } |
| 621 | /* put any unprocessed entries back */ | ||
| 622 | list_splice(&starved_list, &shost->starved_list); | ||
| 624 | spin_unlock_irqrestore(shost->host_lock, flags); | 623 | spin_unlock_irqrestore(shost->host_lock, flags); |
| 625 | 624 | ||
| 626 | blk_run_queue(q); | 625 | blk_run_queue(q); |
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index c9e1242eaf25..5081b3981d3c 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c | |||
| @@ -757,7 +757,7 @@ static int sd_ioctl(struct block_device *bdev, fmode_t mode, | |||
| 757 | * access to the device is prohibited. | 757 | * access to the device is prohibited. |
| 758 | */ | 758 | */ |
| 759 | error = scsi_nonblockable_ioctl(sdp, cmd, p, | 759 | error = scsi_nonblockable_ioctl(sdp, cmd, p, |
| 760 | (mode & FMODE_NDELAY_NOW) != 0); | 760 | (mode & FMODE_NDELAY) != 0); |
| 761 | if (!scsi_block_when_processing_errors(sdp) || !error) | 761 | if (!scsi_block_when_processing_errors(sdp) || !error) |
| 762 | return error; | 762 | return error; |
| 763 | 763 | ||
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index 62b6633e3a97..45b66b98a516 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c | |||
| @@ -521,7 +521,7 @@ static int sr_block_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd, | |||
| 521 | * if it doesn't recognise the ioctl | 521 | * if it doesn't recognise the ioctl |
| 522 | */ | 522 | */ |
| 523 | ret = scsi_nonblockable_ioctl(sdev, cmd, argp, | 523 | ret = scsi_nonblockable_ioctl(sdev, cmd, argp, |
| 524 | (mode & FMODE_NDELAY_NOW) != 0); | 524 | (mode & FMODE_NDELAY) != 0); |
| 525 | if (ret != -ENODEV) | 525 | if (ret != -ENODEV) |
| 526 | return ret; | 526 | return ret; |
| 527 | return scsi_ioctl(sdev, cmd, argp); | 527 | return scsi_ioctl(sdev, cmd, argp); |
diff --git a/drivers/scsi/stex.c b/drivers/scsi/stex.c index 3790906a77d1..2fa830c0be27 100644 --- a/drivers/scsi/stex.c +++ b/drivers/scsi/stex.c | |||
| @@ -477,7 +477,7 @@ stex_slave_config(struct scsi_device *sdev) | |||
| 477 | { | 477 | { |
| 478 | sdev->use_10_for_rw = 1; | 478 | sdev->use_10_for_rw = 1; |
| 479 | sdev->use_10_for_ms = 1; | 479 | sdev->use_10_for_ms = 1; |
| 480 | sdev->timeout = 60 * HZ; | 480 | blk_queue_rq_timeout(sdev->request_queue, 60 * HZ); |
| 481 | sdev->tagged_supported = 1; | 481 | sdev->tagged_supported = 1; |
| 482 | 482 | ||
| 483 | return 0; | 483 | return 0; |
diff --git a/drivers/serial/ioc3_serial.c b/drivers/serial/ioc3_serial.c index 6dd98f9fb89c..ae3699d77dd0 100644 --- a/drivers/serial/ioc3_serial.c +++ b/drivers/serial/ioc3_serial.c | |||
| @@ -2149,7 +2149,7 @@ out4: | |||
| 2149 | return ret; | 2149 | return ret; |
| 2150 | } | 2150 | } |
| 2151 | 2151 | ||
| 2152 | static struct ioc3_submodule ioc3uart_submodule = { | 2152 | static struct ioc3_submodule ioc3uart_ops = { |
| 2153 | .name = "IOC3uart", | 2153 | .name = "IOC3uart", |
| 2154 | .probe = ioc3uart_probe, | 2154 | .probe = ioc3uart_probe, |
| 2155 | .remove = ioc3uart_remove, | 2155 | .remove = ioc3uart_remove, |
| @@ -2173,7 +2173,7 @@ static int __devinit ioc3uart_init(void) | |||
| 2173 | __func__); | 2173 | __func__); |
| 2174 | return ret; | 2174 | return ret; |
| 2175 | } | 2175 | } |
| 2176 | ret = ioc3_register_submodule(&ioc3uart_submodule); | 2176 | ret = ioc3_register_submodule(&ioc3uart_ops); |
| 2177 | if (ret) | 2177 | if (ret) |
| 2178 | uart_unregister_driver(&ioc3_uart); | 2178 | uart_unregister_driver(&ioc3_uart); |
| 2179 | return ret; | 2179 | return ret; |
| @@ -2181,7 +2181,7 @@ static int __devinit ioc3uart_init(void) | |||
| 2181 | 2181 | ||
| 2182 | static void __devexit ioc3uart_exit(void) | 2182 | static void __devexit ioc3uart_exit(void) |
| 2183 | { | 2183 | { |
| 2184 | ioc3_unregister_submodule(&ioc3uart_submodule); | 2184 | ioc3_unregister_submodule(&ioc3uart_ops); |
| 2185 | uart_unregister_driver(&ioc3_uart); | 2185 | uart_unregister_driver(&ioc3_uart); |
| 2186 | } | 2186 | } |
| 2187 | 2187 | ||
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c index 6117d3db0b66..28c00c3d58f5 100644 --- a/drivers/serial/mpc52xx_uart.c +++ b/drivers/serial/mpc52xx_uart.c | |||
| @@ -591,8 +591,8 @@ mpc52xx_uart_set_termios(struct uart_port *port, struct ktermios *new, | |||
| 591 | /* Update the per-port timeout */ | 591 | /* Update the per-port timeout */ |
| 592 | uart_update_timeout(port, new->c_cflag, baud); | 592 | uart_update_timeout(port, new->c_cflag, baud); |
| 593 | 593 | ||
| 594 | /* Do our best to flush TX & RX, so we don't loose anything */ | 594 | /* Do our best to flush TX & RX, so we don't lose anything */ |
| 595 | /* But we don't wait indefinitly ! */ | 595 | /* But we don't wait indefinitely ! */ |
| 596 | j = 5000000; /* Maximum wait */ | 596 | j = 5000000; /* Maximum wait */ |
| 597 | /* FIXME Can't receive chars since set_termios might be called at early | 597 | /* FIXME Can't receive chars since set_termios might be called at early |
| 598 | * boot for the console, all stuff is not yet ready to receive at that | 598 | * boot for the console, all stuff is not yet ready to receive at that |
diff --git a/drivers/serial/s3c2440.c b/drivers/serial/s3c2440.c index 317d239ab740..29cbb0afef8e 100644 --- a/drivers/serial/s3c2440.c +++ b/drivers/serial/s3c2440.c | |||
| @@ -177,5 +177,5 @@ module_exit(s3c2440_serial_exit); | |||
| 177 | 177 | ||
| 178 | MODULE_DESCRIPTION("Samsung S3C2440,S3C2442 SoC Serial port driver"); | 178 | MODULE_DESCRIPTION("Samsung S3C2440,S3C2442 SoC Serial port driver"); |
| 179 | MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>"); | 179 | MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>"); |
| 180 | MODULE_LICENSE("GPLi v2"); | 180 | MODULE_LICENSE("GPL v2"); |
| 181 | MODULE_ALIAS("platform:s3c2440-uart"); | 181 | MODULE_ALIAS("platform:s3c2440-uart"); |
diff --git a/drivers/sh/maple/maple.c b/drivers/sh/maple/maple.c index d1812d32f47d..63f0de29aa14 100644 --- a/drivers/sh/maple/maple.c +++ b/drivers/sh/maple/maple.c | |||
| @@ -827,7 +827,7 @@ static int __init maple_bus_init(void) | |||
| 827 | 827 | ||
| 828 | maple_queue_cache = | 828 | maple_queue_cache = |
| 829 | kmem_cache_create("maple_queue_cache", 0x400, 0, | 829 | kmem_cache_create("maple_queue_cache", 0x400, 0, |
| 830 | SLAB_POISON|SLAB_HWCACHE_ALIGN, NULL); | 830 | SLAB_HWCACHE_ALIGN, NULL); |
| 831 | 831 | ||
| 832 | if (!maple_queue_cache) | 832 | if (!maple_queue_cache) |
| 833 | goto cleanup_bothirqs; | 833 | goto cleanup_bothirqs; |
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 51d7bdea2869..aad1359a3eb1 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
| @@ -1498,7 +1498,7 @@ static int ftdi_open(struct tty_struct *tty, | |||
| 1498 | priv->interface, buf, 0, WDR_TIMEOUT); | 1498 | priv->interface, buf, 0, WDR_TIMEOUT); |
| 1499 | 1499 | ||
| 1500 | /* Termios defaults are set by usb_serial_init. We don't change | 1500 | /* Termios defaults are set by usb_serial_init. We don't change |
| 1501 | port->tty->termios - this would loose speed settings, etc. | 1501 | port->tty->termios - this would lose speed settings, etc. |
| 1502 | This is same behaviour as serial.c/rs_open() - Kuba */ | 1502 | This is same behaviour as serial.c/rs_open() - Kuba */ |
| 1503 | 1503 | ||
| 1504 | /* ftdi_set_termios will send usb control messages */ | 1504 | /* ftdi_set_termios will send usb control messages */ |
diff --git a/drivers/video/aty/radeon_accel.c b/drivers/video/aty/radeon_accel.c index a547e5d4c8bf..a469a3d6edcb 100644 --- a/drivers/video/aty/radeon_accel.c +++ b/drivers/video/aty/radeon_accel.c | |||
| @@ -5,61 +5,61 @@ | |||
| 5 | * --dte | 5 | * --dte |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #define FLUSH_CACHE_WORKAROUND 1 | 8 | static void radeon_fixup_offset(struct radeonfb_info *rinfo) |
| 9 | |||
| 10 | void radeon_fifo_update_and_wait(struct radeonfb_info *rinfo, int entries) | ||
| 11 | { | 9 | { |
| 12 | int i; | 10 | u32 local_base; |
| 11 | |||
| 12 | /* *** Ugly workaround *** */ | ||
| 13 | /* | ||
| 14 | * On some platforms, the video memory is mapped at 0 in radeon chip space | ||
| 15 | * (like PPCs) by the firmware. X will always move it up so that it's seen | ||
| 16 | * by the chip to be at the same address as the PCI BAR. | ||
| 17 | * That means that when switching back from X, there is a mismatch between | ||
| 18 | * the offsets programmed into the engine. This means that potentially, | ||
| 19 | * accel operations done before radeonfb has a chance to re-init the engine | ||
| 20 | * will have incorrect offsets, and potentially trash system memory ! | ||
| 21 | * | ||
| 22 | * The correct fix is for fbcon to never call any accel op before the engine | ||
| 23 | * has properly been re-initialized (by a call to set_var), but this is a | ||
| 24 | * complex fix. This workaround in the meantime, called before every accel | ||
| 25 | * operation, makes sure the offsets are in sync. | ||
| 26 | */ | ||
| 13 | 27 | ||
| 14 | for (i=0; i<2000000; i++) { | 28 | radeon_fifo_wait (1); |
| 15 | rinfo->fifo_free = INREG(RBBM_STATUS) & 0x7f; | 29 | local_base = INREG(MC_FB_LOCATION) << 16; |
| 16 | if (rinfo->fifo_free >= entries) | 30 | if (local_base == rinfo->fb_local_base) |
| 17 | return; | 31 | return; |
| 18 | udelay(10); | ||
| 19 | } | ||
| 20 | printk(KERN_ERR "radeonfb: FIFO Timeout !\n"); | ||
| 21 | /* XXX Todo: attempt to reset the engine */ | ||
| 22 | } | ||
| 23 | 32 | ||
| 24 | static inline void radeon_fifo_wait(struct radeonfb_info *rinfo, int entries) | 33 | rinfo->fb_local_base = local_base; |
| 25 | { | ||
| 26 | if (entries <= rinfo->fifo_free) | ||
| 27 | rinfo->fifo_free -= entries; | ||
| 28 | else | ||
| 29 | radeon_fifo_update_and_wait(rinfo, entries); | ||
| 30 | } | ||
| 31 | 34 | ||
| 32 | static inline void radeonfb_set_creg(struct radeonfb_info *rinfo, u32 reg, | 35 | radeon_fifo_wait (3); |
| 33 | u32 *cache, u32 new_val) | 36 | OUTREG(DEFAULT_PITCH_OFFSET, (rinfo->pitch << 0x16) | |
| 34 | { | 37 | (rinfo->fb_local_base >> 10)); |
| 35 | if (new_val == *cache) | 38 | OUTREG(DST_PITCH_OFFSET, (rinfo->pitch << 0x16) | (rinfo->fb_local_base >> 10)); |
| 36 | return; | 39 | OUTREG(SRC_PITCH_OFFSET, (rinfo->pitch << 0x16) | (rinfo->fb_local_base >> 10)); |
| 37 | *cache = new_val; | ||
| 38 | radeon_fifo_wait(rinfo, 1); | ||
| 39 | OUTREG(reg, new_val); | ||
| 40 | } | 40 | } |
| 41 | 41 | ||
| 42 | static void radeonfb_prim_fillrect(struct radeonfb_info *rinfo, | 42 | static void radeonfb_prim_fillrect(struct radeonfb_info *rinfo, |
| 43 | const struct fb_fillrect *region) | 43 | const struct fb_fillrect *region) |
| 44 | { | 44 | { |
| 45 | radeonfb_set_creg(rinfo, DP_GUI_MASTER_CNTL, &rinfo->dp_gui_mc_cache, | 45 | radeon_fifo_wait(4); |
| 46 | rinfo->dp_gui_mc_base | GMC_BRUSH_SOLID_COLOR | ROP3_P); | 46 | |
| 47 | radeonfb_set_creg(rinfo, DP_CNTL, &rinfo->dp_cntl_cache, | 47 | OUTREG(DP_GUI_MASTER_CNTL, |
| 48 | DST_X_LEFT_TO_RIGHT | DST_Y_TOP_TO_BOTTOM); | 48 | rinfo->dp_gui_master_cntl /* contains, like GMC_DST_32BPP */ |
| 49 | radeonfb_set_creg(rinfo, DP_BRUSH_FRGD_CLR, &rinfo->dp_brush_fg_cache, | 49 | | GMC_BRUSH_SOLID_COLOR |
| 50 | region->color); | 50 | | ROP3_P); |
| 51 | 51 | if (radeon_get_dstbpp(rinfo->depth) != DST_8BPP) | |
| 52 | /* Ensure the dst cache is flushed and the engine idle before | 52 | OUTREG(DP_BRUSH_FRGD_CLR, rinfo->pseudo_palette[region->color]); |
| 53 | * issuing the operation. | 53 | else |
| 54 | * | 54 | OUTREG(DP_BRUSH_FRGD_CLR, region->color); |
| 55 | * This works around engine lockups on some cards | 55 | OUTREG(DP_WRITE_MSK, 0xffffffff); |
| 56 | */ | 56 | OUTREG(DP_CNTL, (DST_X_LEFT_TO_RIGHT | DST_Y_TOP_TO_BOTTOM)); |
| 57 | #if FLUSH_CACHE_WORKAROUND | 57 | |
| 58 | radeon_fifo_wait(rinfo, 2); | 58 | radeon_fifo_wait(2); |
| 59 | OUTREG(DSTCACHE_CTLSTAT, RB2D_DC_FLUSH_ALL); | 59 | OUTREG(DSTCACHE_CTLSTAT, RB2D_DC_FLUSH_ALL); |
| 60 | OUTREG(WAIT_UNTIL, (WAIT_2D_IDLECLEAN | WAIT_DMA_GUI_IDLE)); | 60 | OUTREG(WAIT_UNTIL, (WAIT_2D_IDLECLEAN | WAIT_DMA_GUI_IDLE)); |
| 61 | #endif | 61 | |
| 62 | radeon_fifo_wait(rinfo, 2); | 62 | radeon_fifo_wait(2); |
| 63 | OUTREG(DST_Y_X, (region->dy << 16) | region->dx); | 63 | OUTREG(DST_Y_X, (region->dy << 16) | region->dx); |
| 64 | OUTREG(DST_WIDTH_HEIGHT, (region->width << 16) | region->height); | 64 | OUTREG(DST_WIDTH_HEIGHT, (region->width << 16) | region->height); |
| 65 | } | 65 | } |
| @@ -70,14 +70,15 @@ void radeonfb_fillrect(struct fb_info *info, const struct fb_fillrect *region) | |||
| 70 | struct fb_fillrect modded; | 70 | struct fb_fillrect modded; |
| 71 | int vxres, vyres; | 71 | int vxres, vyres; |
| 72 | 72 | ||
| 73 | WARN_ON(rinfo->gfx_mode); | 73 | if (info->state != FBINFO_STATE_RUNNING) |
| 74 | if (info->state != FBINFO_STATE_RUNNING || rinfo->gfx_mode) | ||
| 75 | return; | 74 | return; |
| 76 | if (info->flags & FBINFO_HWACCEL_DISABLED) { | 75 | if (info->flags & FBINFO_HWACCEL_DISABLED) { |
| 77 | cfb_fillrect(info, region); | 76 | cfb_fillrect(info, region); |
| 78 | return; | 77 | return; |
| 79 | } | 78 | } |
| 80 | 79 | ||
| 80 | radeon_fixup_offset(rinfo); | ||
| 81 | |||
| 81 | vxres = info->var.xres_virtual; | 82 | vxres = info->var.xres_virtual; |
| 82 | vyres = info->var.yres_virtual; | 83 | vyres = info->var.yres_virtual; |
| 83 | 84 | ||
| @@ -90,10 +91,6 @@ void radeonfb_fillrect(struct fb_info *info, const struct fb_fillrect *region) | |||
| 90 | if(modded.dx + modded.width > vxres) modded.width = vxres - modded.dx; | 91 | if(modded.dx + modded.width > vxres) modded.width = vxres - modded.dx; |
| 91 | if(modded.dy + modded.height > vyres) modded.height = vyres - modded.dy; | 92 | if(modded.dy + modded.height > vyres) modded.height = vyres - modded.dy; |
| 92 | 93 | ||
| 93 | if (info->fix.visual == FB_VISUAL_TRUECOLOR || | ||
| 94 | info->fix.visual == FB_VISUAL_DIRECTCOLOR ) | ||
| 95 | modded.color = ((u32 *) (info->pseudo_palette))[region->color]; | ||
| 96 | |||
| 97 | radeonfb_prim_fillrect(rinfo, &modded); | 94 | radeonfb_prim_fillrect(rinfo, &modded); |
| 98 | } | 95 | } |
| 99 | 96 | ||
| @@ -112,22 +109,22 @@ static void radeonfb_prim_copyarea(struct radeonfb_info *rinfo, | |||
| 112 | if ( xdir < 0 ) { sx += w-1; dx += w-1; } | 109 | if ( xdir < 0 ) { sx += w-1; dx += w-1; } |
| 113 | if ( ydir < 0 ) { sy += h-1; dy += h-1; } | 110 | if ( ydir < 0 ) { sy += h-1; dy += h-1; } |
| 114 | 111 | ||
| 115 | radeonfb_set_creg(rinfo, DP_GUI_MASTER_CNTL, &rinfo->dp_gui_mc_cache, | 112 | radeon_fifo_wait(3); |
| 116 | rinfo->dp_gui_mc_base | | 113 | OUTREG(DP_GUI_MASTER_CNTL, |
| 117 | GMC_BRUSH_NONE | | 114 | rinfo->dp_gui_master_cntl /* i.e. GMC_DST_32BPP */ |
| 118 | GMC_SRC_DATATYPE_COLOR | | 115 | | GMC_BRUSH_NONE |
| 119 | ROP3_S | | 116 | | GMC_SRC_DSTCOLOR |
| 120 | DP_SRC_SOURCE_MEMORY); | 117 | | ROP3_S |
| 121 | radeonfb_set_creg(rinfo, DP_CNTL, &rinfo->dp_cntl_cache, | 118 | | DP_SRC_SOURCE_MEMORY ); |
| 122 | (xdir>=0 ? DST_X_LEFT_TO_RIGHT : 0) | | 119 | OUTREG(DP_WRITE_MSK, 0xffffffff); |
| 123 | (ydir>=0 ? DST_Y_TOP_TO_BOTTOM : 0)); | 120 | OUTREG(DP_CNTL, (xdir>=0 ? DST_X_LEFT_TO_RIGHT : 0) |
| 124 | 121 | | (ydir>=0 ? DST_Y_TOP_TO_BOTTOM : 0)); | |
| 125 | #if FLUSH_CACHE_WORKAROUND | 122 | |
| 126 | radeon_fifo_wait(rinfo, 2); | 123 | radeon_fifo_wait(2); |
| 127 | OUTREG(DSTCACHE_CTLSTAT, RB2D_DC_FLUSH_ALL); | 124 | OUTREG(DSTCACHE_CTLSTAT, RB2D_DC_FLUSH_ALL); |
| 128 | OUTREG(WAIT_UNTIL, (WAIT_2D_IDLECLEAN | WAIT_DMA_GUI_IDLE)); | 125 | OUTREG(WAIT_UNTIL, (WAIT_2D_IDLECLEAN | WAIT_DMA_GUI_IDLE)); |
| 129 | #endif | 126 | |
| 130 | radeon_fifo_wait(rinfo, 3); | 127 | radeon_fifo_wait(3); |
| 131 | OUTREG(SRC_Y_X, (sy << 16) | sx); | 128 | OUTREG(SRC_Y_X, (sy << 16) | sx); |
| 132 | OUTREG(DST_Y_X, (dy << 16) | dx); | 129 | OUTREG(DST_Y_X, (dy << 16) | dx); |
| 133 | OUTREG(DST_HEIGHT_WIDTH, (h << 16) | w); | 130 | OUTREG(DST_HEIGHT_WIDTH, (h << 16) | w); |
| @@ -146,14 +143,15 @@ void radeonfb_copyarea(struct fb_info *info, const struct fb_copyarea *area) | |||
| 146 | modded.width = area->width; | 143 | modded.width = area->width; |
| 147 | modded.height = area->height; | 144 | modded.height = area->height; |
| 148 | 145 | ||
| 149 | WARN_ON(rinfo->gfx_mode); | 146 | if (info->state != FBINFO_STATE_RUNNING) |
| 150 | if (info->state != FBINFO_STATE_RUNNING || rinfo->gfx_mode) | ||
| 151 | return; | 147 | return; |
| 152 | if (info->flags & FBINFO_HWACCEL_DISABLED) { | 148 | if (info->flags & FBINFO_HWACCEL_DISABLED) { |
| 153 | cfb_copyarea(info, area); | 149 | cfb_copyarea(info, area); |
| 154 | return; | 150 | return; |
| 155 | } | 151 | } |
| 156 | 152 | ||
| 153 | radeon_fixup_offset(rinfo); | ||
| 154 | |||
| 157 | vxres = info->var.xres_virtual; | 155 | vxres = info->var.xres_virtual; |
| 158 | vyres = info->var.yres_virtual; | 156 | vyres = info->var.yres_virtual; |
| 159 | 157 | ||
| @@ -170,115 +168,13 @@ void radeonfb_copyarea(struct fb_info *info, const struct fb_copyarea *area) | |||
| 170 | radeonfb_prim_copyarea(rinfo, &modded); | 168 | radeonfb_prim_copyarea(rinfo, &modded); |
| 171 | } | 169 | } |
| 172 | 170 | ||
| 173 | static void radeonfb_prim_imageblit(struct radeonfb_info *rinfo, | ||
| 174 | const struct fb_image *image, | ||
| 175 | u32 fg, u32 bg) | ||
| 176 | { | ||
| 177 | unsigned int dwords; | ||
| 178 | u32 *bits; | ||
| 179 | |||
| 180 | radeonfb_set_creg(rinfo, DP_GUI_MASTER_CNTL, &rinfo->dp_gui_mc_cache, | ||
| 181 | rinfo->dp_gui_mc_base | | ||
| 182 | GMC_BRUSH_NONE | GMC_DST_CLIP_LEAVE | | ||
| 183 | GMC_SRC_DATATYPE_MONO_FG_BG | | ||
| 184 | ROP3_S | | ||
| 185 | GMC_BYTE_ORDER_MSB_TO_LSB | | ||
| 186 | DP_SRC_SOURCE_HOST_DATA); | ||
| 187 | radeonfb_set_creg(rinfo, DP_CNTL, &rinfo->dp_cntl_cache, | ||
| 188 | DST_X_LEFT_TO_RIGHT | DST_Y_TOP_TO_BOTTOM); | ||
| 189 | radeonfb_set_creg(rinfo, DP_SRC_FRGD_CLR, &rinfo->dp_src_fg_cache, fg); | ||
| 190 | radeonfb_set_creg(rinfo, DP_SRC_BKGD_CLR, &rinfo->dp_src_bg_cache, bg); | ||
| 191 | |||
| 192 | /* Ensure the dst cache is flushed and the engine idle before | ||
| 193 | * issuing the operation. | ||
| 194 | * | ||
| 195 | * This works around engine lockups on some cards | ||
| 196 | */ | ||
| 197 | #if FLUSH_CACHE_WORKAROUND | ||
| 198 | radeon_fifo_wait(rinfo, 2); | ||
| 199 | OUTREG(DSTCACHE_CTLSTAT, RB2D_DC_FLUSH_ALL); | ||
| 200 | OUTREG(WAIT_UNTIL, (WAIT_2D_IDLECLEAN | WAIT_DMA_GUI_IDLE)); | ||
| 201 | #endif | ||
| 202 | |||
| 203 | /* X here pads width to a multiple of 32 and uses the clipper to | ||
| 204 | * adjust the result. Is that really necessary ? Things seem to | ||
| 205 | * work ok for me without that and the doco doesn't seem to imply] | ||
| 206 | * there is such a restriction. | ||
| 207 | */ | ||
| 208 | radeon_fifo_wait(rinfo, 4); | ||
| 209 | OUTREG(SC_TOP_LEFT, (image->dy << 16) | image->dx); | ||
| 210 | OUTREG(SC_BOTTOM_RIGHT, ((image->dy + image->height) << 16) | | ||
| 211 | (image->dx + image->width)); | ||
| 212 | OUTREG(DST_Y_X, (image->dy << 16) | image->dx); | ||
| 213 | |||
| 214 | OUTREG(DST_HEIGHT_WIDTH, (image->height << 16) | ((image->width + 31) & ~31)); | ||
| 215 | |||
| 216 | dwords = (image->width + 31) >> 5; | ||
| 217 | dwords *= image->height; | ||
| 218 | bits = (u32*)(image->data); | ||
| 219 | |||
| 220 | while(dwords >= 8) { | ||
| 221 | radeon_fifo_wait(rinfo, 8); | ||
| 222 | #if BITS_PER_LONG == 64 | ||
| 223 | __raw_writeq(*((u64 *)(bits)), rinfo->mmio_base + HOST_DATA0); | ||
| 224 | __raw_writeq(*((u64 *)(bits+2)), rinfo->mmio_base + HOST_DATA2); | ||
| 225 | __raw_writeq(*((u64 *)(bits+4)), rinfo->mmio_base + HOST_DATA4); | ||
| 226 | __raw_writeq(*((u64 *)(bits+6)), rinfo->mmio_base + HOST_DATA6); | ||
| 227 | bits += 8; | ||
| 228 | #else | ||
| 229 | __raw_writel(*(bits++), rinfo->mmio_base + HOST_DATA0); | ||
| 230 | __raw_writel(*(bits++), rinfo->mmio_base + HOST_DATA1); | ||
| 231 | __raw_writel(*(bits++), rinfo->mmio_base + HOST_DATA2); | ||
| 232 | __raw_writel(*(bits++), rinfo->mmio_base + HOST_DATA3); | ||
| 233 | __raw_writel(*(bits++), rinfo->mmio_base + HOST_DATA4); | ||
| 234 | __raw_writel(*(bits++), rinfo->mmio_base + HOST_DATA5); | ||
| 235 | __raw_writel(*(bits++), rinfo->mmio_base + HOST_DATA6); | ||
| 236 | __raw_writel(*(bits++), rinfo->mmio_base + HOST_DATA7); | ||
| 237 | #endif | ||
| 238 | dwords -= 8; | ||
| 239 | } | ||
| 240 | while(dwords--) { | ||
| 241 | radeon_fifo_wait(rinfo, 1); | ||
| 242 | __raw_writel(*(bits++), rinfo->mmio_base + HOST_DATA0); | ||
| 243 | } | ||
| 244 | } | ||
| 245 | |||
| 246 | void radeonfb_imageblit(struct fb_info *info, const struct fb_image *image) | 171 | void radeonfb_imageblit(struct fb_info *info, const struct fb_image *image) |
| 247 | { | 172 | { |
| 248 | struct radeonfb_info *rinfo = info->par; | 173 | struct radeonfb_info *rinfo = info->par; |
| 249 | u32 fg, bg; | ||
| 250 | |||
| 251 | WARN_ON(rinfo->gfx_mode); | ||
| 252 | if (info->state != FBINFO_STATE_RUNNING || rinfo->gfx_mode) | ||
| 253 | return; | ||
| 254 | 174 | ||
| 255 | if (!image->width || !image->height) | 175 | if (info->state != FBINFO_STATE_RUNNING) |
| 256 | return; | 176 | return; |
| 257 | 177 | radeon_engine_idle(); | |
| 258 | /* We only do 1 bpp color expansion for now */ | ||
| 259 | if (info->flags & FBINFO_HWACCEL_DISABLED || image->depth != 1) | ||
| 260 | goto fallback; | ||
| 261 | |||
| 262 | /* Fallback if running out of the screen. We may do clipping | ||
| 263 | * in the future */ | ||
| 264 | if ((image->dx + image->width) > info->var.xres_virtual || | ||
| 265 | (image->dy + image->height) > info->var.yres_virtual) | ||
| 266 | goto fallback; | ||
| 267 | |||
| 268 | if (info->fix.visual == FB_VISUAL_TRUECOLOR || | ||
| 269 | info->fix.visual == FB_VISUAL_DIRECTCOLOR) { | ||
| 270 | fg = ((u32*)(info->pseudo_palette))[image->fg_color]; | ||
| 271 | bg = ((u32*)(info->pseudo_palette))[image->bg_color]; | ||
| 272 | } else { | ||
| 273 | fg = image->fg_color; | ||
| 274 | bg = image->bg_color; | ||
| 275 | } | ||
| 276 | |||
| 277 | radeonfb_prim_imageblit(rinfo, image, fg, bg); | ||
| 278 | return; | ||
| 279 | |||
| 280 | fallback: | ||
| 281 | radeon_engine_idle(rinfo); | ||
| 282 | 178 | ||
| 283 | cfb_imageblit(info, image); | 179 | cfb_imageblit(info, image); |
| 284 | } | 180 | } |
| @@ -289,8 +185,7 @@ int radeonfb_sync(struct fb_info *info) | |||
| 289 | 185 | ||
| 290 | if (info->state != FBINFO_STATE_RUNNING) | 186 | if (info->state != FBINFO_STATE_RUNNING) |
| 291 | return 0; | 187 | return 0; |
| 292 | 188 | radeon_engine_idle(); | |
| 293 | radeon_engine_idle(rinfo); | ||
| 294 | 189 | ||
| 295 | return 0; | 190 | return 0; |
| 296 | } | 191 | } |
| @@ -366,10 +261,9 @@ void radeonfb_engine_init (struct radeonfb_info *rinfo) | |||
| 366 | /* disable 3D engine */ | 261 | /* disable 3D engine */ |
| 367 | OUTREG(RB3D_CNTL, 0); | 262 | OUTREG(RB3D_CNTL, 0); |
| 368 | 263 | ||
| 369 | rinfo->fifo_free = 0; | ||
| 370 | radeonfb_engine_reset(rinfo); | 264 | radeonfb_engine_reset(rinfo); |
| 371 | 265 | ||
| 372 | radeon_fifo_wait(rinfo, 1); | 266 | radeon_fifo_wait (1); |
| 373 | if (IS_R300_VARIANT(rinfo)) { | 267 | if (IS_R300_VARIANT(rinfo)) { |
| 374 | OUTREG(RB2D_DSTCACHE_MODE, INREG(RB2D_DSTCACHE_MODE) | | 268 | OUTREG(RB2D_DSTCACHE_MODE, INREG(RB2D_DSTCACHE_MODE) | |
| 375 | RB2D_DC_AUTOFLUSH_ENABLE | | 269 | RB2D_DC_AUTOFLUSH_ENABLE | |
| @@ -383,7 +277,7 @@ void radeonfb_engine_init (struct radeonfb_info *rinfo) | |||
| 383 | OUTREG(RB2D_DSTCACHE_MODE, 0); | 277 | OUTREG(RB2D_DSTCACHE_MODE, 0); |
| 384 | } | 278 | } |
| 385 | 279 | ||
| 386 | radeon_fifo_wait(rinfo, 3); | 280 | radeon_fifo_wait (3); |
| 387 | /* We re-read MC_FB_LOCATION from card as it can have been | 281 | /* We re-read MC_FB_LOCATION from card as it can have been |
| 388 | * modified by XFree drivers (ouch !) | 282 | * modified by XFree drivers (ouch !) |
| 389 | */ | 283 | */ |
| @@ -394,57 +288,41 @@ void radeonfb_engine_init (struct radeonfb_info *rinfo) | |||
| 394 | OUTREG(DST_PITCH_OFFSET, (rinfo->pitch << 0x16) | (rinfo->fb_local_base >> 10)); | 288 | OUTREG(DST_PITCH_OFFSET, (rinfo->pitch << 0x16) | (rinfo->fb_local_base >> 10)); |
| 395 | OUTREG(SRC_PITCH_OFFSET, (rinfo->pitch << 0x16) | (rinfo->fb_local_base >> 10)); | 289 | OUTREG(SRC_PITCH_OFFSET, (rinfo->pitch << 0x16) | (rinfo->fb_local_base >> 10)); |
| 396 | 290 | ||
| 397 | radeon_fifo_wait(rinfo, 1); | 291 | radeon_fifo_wait (1); |
| 398 | #ifdef __BIG_ENDIAN | 292 | #if defined(__BIG_ENDIAN) |
| 399 | OUTREGP(DP_DATATYPE, HOST_BIG_ENDIAN_EN, ~HOST_BIG_ENDIAN_EN); | 293 | OUTREGP(DP_DATATYPE, HOST_BIG_ENDIAN_EN, ~HOST_BIG_ENDIAN_EN); |
| 400 | #else | 294 | #else |
| 401 | OUTREGP(DP_DATATYPE, 0, ~HOST_BIG_ENDIAN_EN); | 295 | OUTREGP(DP_DATATYPE, 0, ~HOST_BIG_ENDIAN_EN); |
| 402 | #endif | 296 | #endif |
| 403 | radeon_fifo_wait(rinfo, 2); | 297 | radeon_fifo_wait (2); |
| 404 | OUTREG(DEFAULT_SC_TOP_LEFT, 0); | 298 | OUTREG(DEFAULT_SC_TOP_LEFT, 0); |
| 405 | OUTREG(DEFAULT_SC_BOTTOM_RIGHT, (DEFAULT_SC_RIGHT_MAX | | 299 | OUTREG(DEFAULT_SC_BOTTOM_RIGHT, (DEFAULT_SC_RIGHT_MAX | |
| 406 | DEFAULT_SC_BOTTOM_MAX)); | 300 | DEFAULT_SC_BOTTOM_MAX)); |
| 407 | 301 | ||
| 408 | /* set default DP_GUI_MASTER_CNTL */ | ||
| 409 | temp = radeon_get_dstbpp(rinfo->depth); | 302 | temp = radeon_get_dstbpp(rinfo->depth); |
| 410 | rinfo->dp_gui_mc_base = ((temp << 8) | GMC_CLR_CMP_CNTL_DIS); | 303 | rinfo->dp_gui_master_cntl = ((temp << 8) | GMC_CLR_CMP_CNTL_DIS); |
| 411 | 304 | ||
| 412 | rinfo->dp_gui_mc_cache = rinfo->dp_gui_mc_base | | 305 | radeon_fifo_wait (1); |
| 413 | GMC_BRUSH_SOLID_COLOR | | 306 | OUTREG(DP_GUI_MASTER_CNTL, (rinfo->dp_gui_master_cntl | |
| 414 | GMC_SRC_DATATYPE_COLOR; | 307 | GMC_BRUSH_SOLID_COLOR | |
| 415 | radeon_fifo_wait(rinfo, 1); | 308 | GMC_SRC_DATATYPE_COLOR)); |
| 416 | OUTREG(DP_GUI_MASTER_CNTL, rinfo->dp_gui_mc_cache); | ||
| 417 | 309 | ||
| 310 | radeon_fifo_wait (7); | ||
| 418 | 311 | ||
| 419 | /* clear line drawing regs */ | 312 | /* clear line drawing regs */ |
| 420 | radeon_fifo_wait(rinfo, 2); | ||
| 421 | OUTREG(DST_LINE_START, 0); | 313 | OUTREG(DST_LINE_START, 0); |
| 422 | OUTREG(DST_LINE_END, 0); | 314 | OUTREG(DST_LINE_END, 0); |
| 423 | 315 | ||
| 424 | /* set brush and source color regs */ | 316 | /* set brush color regs */ |
| 425 | rinfo->dp_brush_fg_cache = 0xffffffff; | 317 | OUTREG(DP_BRUSH_FRGD_CLR, 0xffffffff); |
| 426 | rinfo->dp_brush_bg_cache = 0x00000000; | 318 | OUTREG(DP_BRUSH_BKGD_CLR, 0x00000000); |
| 427 | rinfo->dp_src_fg_cache = 0xffffffff; | 319 | |
| 428 | rinfo->dp_src_bg_cache = 0x00000000; | 320 | /* set source color regs */ |
| 429 | radeon_fifo_wait(rinfo, 4); | 321 | OUTREG(DP_SRC_FRGD_CLR, 0xffffffff); |
| 430 | OUTREG(DP_BRUSH_FRGD_CLR, rinfo->dp_brush_fg_cache); | 322 | OUTREG(DP_SRC_BKGD_CLR, 0x00000000); |
| 431 | OUTREG(DP_BRUSH_BKGD_CLR, rinfo->dp_brush_bg_cache); | ||
| 432 | OUTREG(DP_SRC_FRGD_CLR, rinfo->dp_src_fg_cache); | ||
| 433 | OUTREG(DP_SRC_BKGD_CLR, rinfo->dp_src_bg_cache); | ||
| 434 | |||
| 435 | /* Default direction */ | ||
| 436 | rinfo->dp_cntl_cache = DST_X_LEFT_TO_RIGHT | DST_Y_TOP_TO_BOTTOM; | ||
| 437 | radeon_fifo_wait(rinfo, 1); | ||
| 438 | OUTREG(DP_CNTL, rinfo->dp_cntl_cache); | ||
| 439 | 323 | ||
| 440 | /* default write mask */ | 324 | /* default write mask */ |
| 441 | radeon_fifo_wait(rinfo, 1); | ||
| 442 | OUTREG(DP_WRITE_MSK, 0xffffffff); | 325 | OUTREG(DP_WRITE_MSK, 0xffffffff); |
| 443 | 326 | ||
| 444 | /* Default to no swapping of host data */ | 327 | radeon_engine_idle (); |
| 445 | radeon_fifo_wait(rinfo, 1); | ||
| 446 | OUTREG(RBBM_GUICNTL, RBBM_GUICNTL_HOST_DATA_SWAP_NONE); | ||
| 447 | |||
| 448 | /* Make sure it's settled */ | ||
| 449 | radeon_engine_idle(rinfo); | ||
| 450 | } | 328 | } |
diff --git a/drivers/video/aty/radeon_backlight.c b/drivers/video/aty/radeon_backlight.c index f343ba83f0ae..1a056adb61c8 100644 --- a/drivers/video/aty/radeon_backlight.c +++ b/drivers/video/aty/radeon_backlight.c | |||
| @@ -66,7 +66,7 @@ static int radeon_bl_update_status(struct backlight_device *bd) | |||
| 66 | level = bd->props.brightness; | 66 | level = bd->props.brightness; |
| 67 | 67 | ||
| 68 | del_timer_sync(&rinfo->lvds_timer); | 68 | del_timer_sync(&rinfo->lvds_timer); |
| 69 | radeon_engine_idle(rinfo); | 69 | radeon_engine_idle(); |
| 70 | 70 | ||
| 71 | lvds_gen_cntl = INREG(LVDS_GEN_CNTL); | 71 | lvds_gen_cntl = INREG(LVDS_GEN_CNTL); |
| 72 | if (level > 0) { | 72 | if (level > 0) { |
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c index b3ffe8205d2b..d0f1a7fc2c9d 100644 --- a/drivers/video/aty/radeon_base.c +++ b/drivers/video/aty/radeon_base.c | |||
| @@ -852,6 +852,7 @@ static int radeonfb_pan_display (struct fb_var_screeninfo *var, | |||
| 852 | if (rinfo->asleep) | 852 | if (rinfo->asleep) |
| 853 | return 0; | 853 | return 0; |
| 854 | 854 | ||
| 855 | radeon_fifo_wait(2); | ||
| 855 | OUTREG(CRTC_OFFSET, ((var->yoffset * var->xres_virtual + var->xoffset) | 856 | OUTREG(CRTC_OFFSET, ((var->yoffset * var->xres_virtual + var->xoffset) |
| 856 | * var->bits_per_pixel / 8) & ~7); | 857 | * var->bits_per_pixel / 8) & ~7); |
| 857 | return 0; | 858 | return 0; |
| @@ -881,6 +882,7 @@ static int radeonfb_ioctl (struct fb_info *info, unsigned int cmd, | |||
| 881 | if (rc) | 882 | if (rc) |
| 882 | return rc; | 883 | return rc; |
| 883 | 884 | ||
| 885 | radeon_fifo_wait(2); | ||
| 884 | if (value & 0x01) { | 886 | if (value & 0x01) { |
| 885 | tmp = INREG(LVDS_GEN_CNTL); | 887 | tmp = INREG(LVDS_GEN_CNTL); |
| 886 | 888 | ||
| @@ -938,7 +940,7 @@ int radeon_screen_blank(struct radeonfb_info *rinfo, int blank, int mode_switch) | |||
| 938 | if (rinfo->lock_blank) | 940 | if (rinfo->lock_blank) |
| 939 | return 0; | 941 | return 0; |
| 940 | 942 | ||
| 941 | radeon_engine_idle(rinfo); | 943 | radeon_engine_idle(); |
| 942 | 944 | ||
| 943 | val = INREG(CRTC_EXT_CNTL); | 945 | val = INREG(CRTC_EXT_CNTL); |
| 944 | val &= ~(CRTC_DISPLAY_DIS | CRTC_HSYNC_DIS | | 946 | val &= ~(CRTC_DISPLAY_DIS | CRTC_HSYNC_DIS | |
| @@ -1046,7 +1048,7 @@ static int radeonfb_blank (int blank, struct fb_info *info) | |||
| 1046 | 1048 | ||
| 1047 | if (rinfo->asleep) | 1049 | if (rinfo->asleep) |
| 1048 | return 0; | 1050 | return 0; |
| 1049 | 1051 | ||
| 1050 | return radeon_screen_blank(rinfo, blank, 0); | 1052 | return radeon_screen_blank(rinfo, blank, 0); |
| 1051 | } | 1053 | } |
| 1052 | 1054 | ||
| @@ -1072,6 +1074,8 @@ static int radeon_setcolreg (unsigned regno, unsigned red, unsigned green, | |||
| 1072 | pindex = regno; | 1074 | pindex = regno; |
| 1073 | 1075 | ||
| 1074 | if (!rinfo->asleep) { | 1076 | if (!rinfo->asleep) { |
| 1077 | radeon_fifo_wait(9); | ||
| 1078 | |||
| 1075 | if (rinfo->bpp == 16) { | 1079 | if (rinfo->bpp == 16) { |
| 1076 | pindex = regno * 8; | 1080 | pindex = regno * 8; |
| 1077 | 1081 | ||
| @@ -1240,6 +1244,8 @@ static void radeon_write_pll_regs(struct radeonfb_info *rinfo, struct radeon_reg | |||
| 1240 | { | 1244 | { |
| 1241 | int i; | 1245 | int i; |
| 1242 | 1246 | ||
| 1247 | radeon_fifo_wait(20); | ||
| 1248 | |||
| 1243 | /* Workaround from XFree */ | 1249 | /* Workaround from XFree */ |
| 1244 | if (rinfo->is_mobility) { | 1250 | if (rinfo->is_mobility) { |
| 1245 | /* A temporal workaround for the occational blanking on certain laptop | 1251 | /* A temporal workaround for the occational blanking on certain laptop |
| @@ -1335,7 +1341,7 @@ static void radeon_lvds_timer_func(unsigned long data) | |||
| 1335 | { | 1341 | { |
| 1336 | struct radeonfb_info *rinfo = (struct radeonfb_info *)data; | 1342 | struct radeonfb_info *rinfo = (struct radeonfb_info *)data; |
| 1337 | 1343 | ||
| 1338 | radeon_engine_idle(rinfo); | 1344 | radeon_engine_idle(); |
| 1339 | 1345 | ||
| 1340 | OUTREG(LVDS_GEN_CNTL, rinfo->pending_lvds_gen_cntl); | 1346 | OUTREG(LVDS_GEN_CNTL, rinfo->pending_lvds_gen_cntl); |
| 1341 | } | 1347 | } |
| @@ -1353,11 +1359,10 @@ void radeon_write_mode (struct radeonfb_info *rinfo, struct radeon_regs *mode, | |||
| 1353 | if (nomodeset) | 1359 | if (nomodeset) |
| 1354 | return; | 1360 | return; |
| 1355 | 1361 | ||
| 1356 | radeon_engine_idle(rinfo); | ||
| 1357 | |||
| 1358 | if (!regs_only) | 1362 | if (!regs_only) |
| 1359 | radeon_screen_blank(rinfo, FB_BLANK_NORMAL, 0); | 1363 | radeon_screen_blank(rinfo, FB_BLANK_NORMAL, 0); |
| 1360 | 1364 | ||
| 1365 | radeon_fifo_wait(31); | ||
| 1361 | for (i=0; i<10; i++) | 1366 | for (i=0; i<10; i++) |
| 1362 | OUTREG(common_regs[i].reg, common_regs[i].val); | 1367 | OUTREG(common_regs[i].reg, common_regs[i].val); |
| 1363 | 1368 | ||
| @@ -1385,6 +1390,7 @@ void radeon_write_mode (struct radeonfb_info *rinfo, struct radeon_regs *mode, | |||
| 1385 | radeon_write_pll_regs(rinfo, mode); | 1390 | radeon_write_pll_regs(rinfo, mode); |
| 1386 | 1391 | ||
| 1387 | if ((primary_mon == MT_DFP) || (primary_mon == MT_LCD)) { | 1392 | if ((primary_mon == MT_DFP) || (primary_mon == MT_LCD)) { |
| 1393 | radeon_fifo_wait(10); | ||
| 1388 | OUTREG(FP_CRTC_H_TOTAL_DISP, mode->fp_crtc_h_total_disp); | 1394 | OUTREG(FP_CRTC_H_TOTAL_DISP, mode->fp_crtc_h_total_disp); |
| 1389 | OUTREG(FP_CRTC_V_TOTAL_DISP, mode->fp_crtc_v_total_disp); | 1395 | OUTREG(FP_CRTC_V_TOTAL_DISP, mode->fp_crtc_v_total_disp); |
| 1390 | OUTREG(FP_H_SYNC_STRT_WID, mode->fp_h_sync_strt_wid); | 1396 | OUTREG(FP_H_SYNC_STRT_WID, mode->fp_h_sync_strt_wid); |
| @@ -1399,6 +1405,7 @@ void radeon_write_mode (struct radeonfb_info *rinfo, struct radeon_regs *mode, | |||
| 1399 | if (!regs_only) | 1405 | if (!regs_only) |
| 1400 | radeon_screen_blank(rinfo, FB_BLANK_UNBLANK, 0); | 1406 | radeon_screen_blank(rinfo, FB_BLANK_UNBLANK, 0); |
| 1401 | 1407 | ||
| 1408 | radeon_fifo_wait(2); | ||
| 1402 | OUTPLL(VCLK_ECP_CNTL, mode->vclk_ecp_cntl); | 1409 | OUTPLL(VCLK_ECP_CNTL, mode->vclk_ecp_cntl); |
| 1403 | 1410 | ||
| 1404 | return; | 1411 | return; |
| @@ -1549,7 +1556,7 @@ static int radeonfb_set_par(struct fb_info *info) | |||
| 1549 | /* We always want engine to be idle on a mode switch, even | 1556 | /* We always want engine to be idle on a mode switch, even |
| 1550 | * if we won't actually change the mode | 1557 | * if we won't actually change the mode |
| 1551 | */ | 1558 | */ |
| 1552 | radeon_engine_idle(rinfo); | 1559 | radeon_engine_idle(); |
| 1553 | 1560 | ||
| 1554 | hSyncStart = mode->xres + mode->right_margin; | 1561 | hSyncStart = mode->xres + mode->right_margin; |
| 1555 | hSyncEnd = hSyncStart + mode->hsync_len; | 1562 | hSyncEnd = hSyncStart + mode->hsync_len; |
| @@ -1844,6 +1851,7 @@ static int radeonfb_set_par(struct fb_info *info) | |||
| 1844 | return 0; | 1851 | return 0; |
| 1845 | } | 1852 | } |
| 1846 | 1853 | ||
| 1854 | |||
| 1847 | static struct fb_ops radeonfb_ops = { | 1855 | static struct fb_ops radeonfb_ops = { |
| 1848 | .owner = THIS_MODULE, | 1856 | .owner = THIS_MODULE, |
| 1849 | .fb_check_var = radeonfb_check_var, | 1857 | .fb_check_var = radeonfb_check_var, |
| @@ -1867,7 +1875,6 @@ static int __devinit radeon_set_fbinfo (struct radeonfb_info *rinfo) | |||
| 1867 | info->par = rinfo; | 1875 | info->par = rinfo; |
| 1868 | info->pseudo_palette = rinfo->pseudo_palette; | 1876 | info->pseudo_palette = rinfo->pseudo_palette; |
| 1869 | info->flags = FBINFO_DEFAULT | 1877 | info->flags = FBINFO_DEFAULT |
| 1870 | | FBINFO_HWACCEL_IMAGEBLIT | ||
| 1871 | | FBINFO_HWACCEL_COPYAREA | 1878 | | FBINFO_HWACCEL_COPYAREA |
| 1872 | | FBINFO_HWACCEL_FILLRECT | 1879 | | FBINFO_HWACCEL_FILLRECT |
| 1873 | | FBINFO_HWACCEL_XPAN | 1880 | | FBINFO_HWACCEL_XPAN |
| @@ -1875,7 +1882,6 @@ static int __devinit radeon_set_fbinfo (struct radeonfb_info *rinfo) | |||
| 1875 | info->fbops = &radeonfb_ops; | 1882 | info->fbops = &radeonfb_ops; |
| 1876 | info->screen_base = rinfo->fb_base; | 1883 | info->screen_base = rinfo->fb_base; |
| 1877 | info->screen_size = rinfo->mapped_vram; | 1884 | info->screen_size = rinfo->mapped_vram; |
| 1878 | |||
| 1879 | /* Fill fix common fields */ | 1885 | /* Fill fix common fields */ |
| 1880 | strlcpy(info->fix.id, rinfo->name, sizeof(info->fix.id)); | 1886 | strlcpy(info->fix.id, rinfo->name, sizeof(info->fix.id)); |
| 1881 | info->fix.smem_start = rinfo->fb_base_phys; | 1887 | info->fix.smem_start = rinfo->fb_base_phys; |
| @@ -1890,25 +1896,8 @@ static int __devinit radeon_set_fbinfo (struct radeonfb_info *rinfo) | |||
| 1890 | info->fix.mmio_len = RADEON_REGSIZE; | 1896 | info->fix.mmio_len = RADEON_REGSIZE; |
| 1891 | info->fix.accel = FB_ACCEL_ATI_RADEON; | 1897 | info->fix.accel = FB_ACCEL_ATI_RADEON; |
| 1892 | 1898 | ||
| 1893 | /* Allocate colormap */ | ||
| 1894 | fb_alloc_cmap(&info->cmap, 256, 0); | 1899 | fb_alloc_cmap(&info->cmap, 256, 0); |
| 1895 | 1900 | ||
| 1896 | /* Setup pixmap used for acceleration */ | ||
| 1897 | #define PIXMAP_SIZE (2048 * 4) | ||
| 1898 | |||
| 1899 | info->pixmap.addr = kmalloc(PIXMAP_SIZE, GFP_KERNEL); | ||
| 1900 | if (!info->pixmap.addr) { | ||
| 1901 | printk(KERN_ERR "radeonfb: Failed to allocate pixmap !\n"); | ||
| 1902 | noaccel = 1; | ||
| 1903 | goto bail; | ||
| 1904 | } | ||
| 1905 | info->pixmap.size = PIXMAP_SIZE; | ||
| 1906 | info->pixmap.flags = FB_PIXMAP_SYSTEM; | ||
| 1907 | info->pixmap.scan_align = 4; | ||
| 1908 | info->pixmap.buf_align = 4; | ||
| 1909 | info->pixmap.access_align = 32; | ||
| 1910 | |||
| 1911 | bail: | ||
| 1912 | if (noaccel) | 1901 | if (noaccel) |
| 1913 | info->flags |= FBINFO_HWACCEL_DISABLED; | 1902 | info->flags |= FBINFO_HWACCEL_DISABLED; |
| 1914 | 1903 | ||
| @@ -2017,6 +2006,7 @@ static void radeon_identify_vram(struct radeonfb_info *rinfo) | |||
| 2017 | u32 tom = INREG(NB_TOM); | 2006 | u32 tom = INREG(NB_TOM); |
| 2018 | tmp = ((((tom >> 16) - (tom & 0xffff) + 1) << 6) * 1024); | 2007 | tmp = ((((tom >> 16) - (tom & 0xffff) + 1) << 6) * 1024); |
| 2019 | 2008 | ||
| 2009 | radeon_fifo_wait(6); | ||
| 2020 | OUTREG(MC_FB_LOCATION, tom); | 2010 | OUTREG(MC_FB_LOCATION, tom); |
| 2021 | OUTREG(DISPLAY_BASE_ADDR, (tom & 0xffff) << 16); | 2011 | OUTREG(DISPLAY_BASE_ADDR, (tom & 0xffff) << 16); |
| 2022 | OUTREG(CRTC2_DISPLAY_BASE_ADDR, (tom & 0xffff) << 16); | 2012 | OUTREG(CRTC2_DISPLAY_BASE_ADDR, (tom & 0xffff) << 16); |
diff --git a/drivers/video/aty/radeon_pm.c b/drivers/video/aty/radeon_pm.c index 3df5015f1d13..675abdafc2d8 100644 --- a/drivers/video/aty/radeon_pm.c +++ b/drivers/video/aty/radeon_pm.c | |||
| @@ -2653,9 +2653,9 @@ int radeonfb_pci_suspend(struct pci_dev *pdev, pm_message_t mesg) | |||
| 2653 | 2653 | ||
| 2654 | if (!(info->flags & FBINFO_HWACCEL_DISABLED)) { | 2654 | if (!(info->flags & FBINFO_HWACCEL_DISABLED)) { |
| 2655 | /* Make sure engine is reset */ | 2655 | /* Make sure engine is reset */ |
| 2656 | radeon_engine_idle(rinfo); | 2656 | radeon_engine_idle(); |
| 2657 | radeonfb_engine_reset(rinfo); | 2657 | radeonfb_engine_reset(rinfo); |
| 2658 | radeon_engine_idle(rinfo); | 2658 | radeon_engine_idle(); |
| 2659 | } | 2659 | } |
| 2660 | 2660 | ||
| 2661 | /* Blank display and LCD */ | 2661 | /* Blank display and LCD */ |
| @@ -2767,7 +2767,7 @@ int radeonfb_pci_resume(struct pci_dev *pdev) | |||
| 2767 | 2767 | ||
| 2768 | rinfo->asleep = 0; | 2768 | rinfo->asleep = 0; |
| 2769 | } else | 2769 | } else |
| 2770 | radeon_engine_idle(rinfo); | 2770 | radeon_engine_idle(); |
| 2771 | 2771 | ||
| 2772 | /* Restore display & engine */ | 2772 | /* Restore display & engine */ |
| 2773 | radeon_write_mode (rinfo, &rinfo->state, 1); | 2773 | radeon_write_mode (rinfo, &rinfo->state, 1); |
diff --git a/drivers/video/aty/radeonfb.h b/drivers/video/aty/radeonfb.h index ea0b5b47acaf..3ea1b00fdd22 100644 --- a/drivers/video/aty/radeonfb.h +++ b/drivers/video/aty/radeonfb.h | |||
| @@ -336,15 +336,7 @@ struct radeonfb_info { | |||
| 336 | int mon2_type; | 336 | int mon2_type; |
| 337 | u8 *mon2_EDID; | 337 | u8 *mon2_EDID; |
| 338 | 338 | ||
| 339 | /* accel bits */ | 339 | u32 dp_gui_master_cntl; |
| 340 | u32 dp_gui_mc_base; | ||
| 341 | u32 dp_gui_mc_cache; | ||
| 342 | u32 dp_cntl_cache; | ||
| 343 | u32 dp_brush_fg_cache; | ||
| 344 | u32 dp_brush_bg_cache; | ||
| 345 | u32 dp_src_fg_cache; | ||
| 346 | u32 dp_src_bg_cache; | ||
| 347 | u32 fifo_free; | ||
| 348 | 340 | ||
| 349 | struct pll_info pll; | 341 | struct pll_info pll; |
| 350 | 342 | ||
| @@ -356,7 +348,6 @@ struct radeonfb_info { | |||
| 356 | int lock_blank; | 348 | int lock_blank; |
| 357 | int dynclk; | 349 | int dynclk; |
| 358 | int no_schedule; | 350 | int no_schedule; |
| 359 | int gfx_mode; | ||
| 360 | enum radeon_pm_mode pm_mode; | 351 | enum radeon_pm_mode pm_mode; |
| 361 | reinit_function_ptr reinit_func; | 352 | reinit_function_ptr reinit_func; |
| 362 | 353 | ||
| @@ -401,14 +392,8 @@ static inline void _radeon_msleep(struct radeonfb_info *rinfo, unsigned long ms) | |||
| 401 | #define OUTREG8(addr,val) writeb(val, (rinfo->mmio_base)+addr) | 392 | #define OUTREG8(addr,val) writeb(val, (rinfo->mmio_base)+addr) |
| 402 | #define INREG16(addr) readw((rinfo->mmio_base)+addr) | 393 | #define INREG16(addr) readw((rinfo->mmio_base)+addr) |
| 403 | #define OUTREG16(addr,val) writew(val, (rinfo->mmio_base)+addr) | 394 | #define OUTREG16(addr,val) writew(val, (rinfo->mmio_base)+addr) |
| 404 | |||
| 405 | #ifdef CONFIG_PPC | ||
| 406 | #define INREG(addr) ({ eieio(); ld_le32(rinfo->mmio_base+(addr)); }) | ||
| 407 | #define OUTREG(addr,val) do { eieio(); st_le32(rinfo->mmio_base+(addr),(val)); } while(0) | ||
| 408 | #else | ||
| 409 | #define INREG(addr) readl((rinfo->mmio_base)+addr) | 395 | #define INREG(addr) readl((rinfo->mmio_base)+addr) |
| 410 | #define OUTREG(addr,val) writel(val, (rinfo->mmio_base)+addr) | 396 | #define OUTREG(addr,val) writel(val, (rinfo->mmio_base)+addr) |
| 411 | #endif | ||
| 412 | 397 | ||
| 413 | static inline void _OUTREGP(struct radeonfb_info *rinfo, u32 addr, | 398 | static inline void _OUTREGP(struct radeonfb_info *rinfo, u32 addr, |
| 414 | u32 val, u32 mask) | 399 | u32 val, u32 mask) |
| @@ -550,7 +535,17 @@ static inline u32 radeon_get_dstbpp(u16 depth) | |||
| 550 | * 2D Engine helper routines | 535 | * 2D Engine helper routines |
| 551 | */ | 536 | */ |
| 552 | 537 | ||
| 553 | extern void radeon_fifo_update_and_wait(struct radeonfb_info *rinfo, int entries); | 538 | static inline void _radeon_fifo_wait(struct radeonfb_info *rinfo, int entries) |
| 539 | { | ||
| 540 | int i; | ||
| 541 | |||
| 542 | for (i=0; i<2000000; i++) { | ||
| 543 | if ((INREG(RBBM_STATUS) & 0x7f) >= entries) | ||
| 544 | return; | ||
| 545 | udelay(1); | ||
| 546 | } | ||
| 547 | printk(KERN_ERR "radeonfb: FIFO Timeout !\n"); | ||
| 548 | } | ||
| 554 | 549 | ||
| 555 | static inline void radeon_engine_flush (struct radeonfb_info *rinfo) | 550 | static inline void radeon_engine_flush (struct radeonfb_info *rinfo) |
| 556 | { | 551 | { |
| @@ -563,7 +558,7 @@ static inline void radeon_engine_flush (struct radeonfb_info *rinfo) | |||
| 563 | /* Ensure FIFO is empty, ie, make sure the flush commands | 558 | /* Ensure FIFO is empty, ie, make sure the flush commands |
| 564 | * has reached the cache | 559 | * has reached the cache |
| 565 | */ | 560 | */ |
| 566 | radeon_fifo_update_and_wait(rinfo, 64); | 561 | _radeon_fifo_wait (rinfo, 64); |
| 567 | 562 | ||
| 568 | /* Wait for the flush to complete */ | 563 | /* Wait for the flush to complete */ |
| 569 | for (i=0; i < 2000000; i++) { | 564 | for (i=0; i < 2000000; i++) { |
| @@ -575,12 +570,12 @@ static inline void radeon_engine_flush (struct radeonfb_info *rinfo) | |||
| 575 | } | 570 | } |
| 576 | 571 | ||
| 577 | 572 | ||
| 578 | static inline void radeon_engine_idle(struct radeonfb_info *rinfo) | 573 | static inline void _radeon_engine_idle(struct radeonfb_info *rinfo) |
| 579 | { | 574 | { |
| 580 | int i; | 575 | int i; |
| 581 | 576 | ||
| 582 | /* ensure FIFO is empty before waiting for idle */ | 577 | /* ensure FIFO is empty before waiting for idle */ |
| 583 | radeon_fifo_update_and_wait (rinfo, 64); | 578 | _radeon_fifo_wait (rinfo, 64); |
| 584 | 579 | ||
| 585 | for (i=0; i<2000000; i++) { | 580 | for (i=0; i<2000000; i++) { |
| 586 | if (((INREG(RBBM_STATUS) & GUI_ACTIVE)) == 0) { | 581 | if (((INREG(RBBM_STATUS) & GUI_ACTIVE)) == 0) { |
| @@ -593,6 +588,8 @@ static inline void radeon_engine_idle(struct radeonfb_info *rinfo) | |||
| 593 | } | 588 | } |
| 594 | 589 | ||
| 595 | 590 | ||
| 591 | #define radeon_engine_idle() _radeon_engine_idle(rinfo) | ||
| 592 | #define radeon_fifo_wait(entries) _radeon_fifo_wait(rinfo,entries) | ||
| 596 | #define radeon_msleep(ms) _radeon_msleep(rinfo,ms) | 593 | #define radeon_msleep(ms) _radeon_msleep(rinfo,ms) |
| 597 | 594 | ||
| 598 | 595 | ||
| @@ -622,7 +619,6 @@ extern void radeonfb_imageblit(struct fb_info *p, const struct fb_image *image); | |||
| 622 | extern int radeonfb_sync(struct fb_info *info); | 619 | extern int radeonfb_sync(struct fb_info *info); |
| 623 | extern void radeonfb_engine_init (struct radeonfb_info *rinfo); | 620 | extern void radeonfb_engine_init (struct radeonfb_info *rinfo); |
| 624 | extern void radeonfb_engine_reset(struct radeonfb_info *rinfo); | 621 | extern void radeonfb_engine_reset(struct radeonfb_info *rinfo); |
| 625 | extern void radeon_fixup_mem_offset(struct radeonfb_info *rinfo); | ||
| 626 | 622 | ||
| 627 | /* Other functions */ | 623 | /* Other functions */ |
| 628 | extern int radeon_screen_blank(struct radeonfb_info *rinfo, int blank, int mode_switch); | 624 | extern int radeon_screen_blank(struct radeonfb_info *rinfo, int blank, int mode_switch); |
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c index 67ff370d80af..0b2adefe9e3d 100644 --- a/drivers/video/console/fbcon.c +++ b/drivers/video/console/fbcon.c | |||
| @@ -3531,12 +3531,18 @@ static void fbcon_exit(void) | |||
| 3531 | softback_buf = 0UL; | 3531 | softback_buf = 0UL; |
| 3532 | 3532 | ||
| 3533 | for (i = 0; i < FB_MAX; i++) { | 3533 | for (i = 0; i < FB_MAX; i++) { |
| 3534 | int pending; | ||
| 3535 | |||
| 3534 | mapped = 0; | 3536 | mapped = 0; |
| 3535 | info = registered_fb[i]; | 3537 | info = registered_fb[i]; |
| 3536 | 3538 | ||
| 3537 | if (info == NULL) | 3539 | if (info == NULL) |
| 3538 | continue; | 3540 | continue; |
| 3539 | 3541 | ||
| 3542 | pending = cancel_work_sync(&info->queue); | ||
| 3543 | DPRINTK("fbcon: %s pending work\n", (pending ? "canceled" : | ||
| 3544 | "no")); | ||
| 3545 | |||
| 3540 | for (j = first_fb_vc; j <= last_fb_vc; j++) { | 3546 | for (j = first_fb_vc; j <= last_fb_vc; j++) { |
| 3541 | if (con2fb_map[j] == i) | 3547 | if (con2fb_map[j] == i) |
| 3542 | mapped = 1; | 3548 | mapped = 1; |
diff --git a/drivers/video/macfb.c b/drivers/video/macfb.c index b790ddff76f9..ee380d5f3410 100644 --- a/drivers/video/macfb.c +++ b/drivers/video/macfb.c | |||
| @@ -164,7 +164,6 @@ static struct fb_var_screeninfo macfb_defined = { | |||
| 164 | }; | 164 | }; |
| 165 | 165 | ||
| 166 | static struct fb_fix_screeninfo macfb_fix = { | 166 | static struct fb_fix_screeninfo macfb_fix = { |
| 167 | .id = "Macintosh ", | ||
| 168 | .type = FB_TYPE_PACKED_PIXELS, | 167 | .type = FB_TYPE_PACKED_PIXELS, |
| 169 | .accel = FB_ACCEL_NONE, | 168 | .accel = FB_ACCEL_NONE, |
| 170 | }; | 169 | }; |
| @@ -760,22 +759,22 @@ static int __init macfb_init(void) | |||
| 760 | 759 | ||
| 761 | switch(ndev->dr_hw) { | 760 | switch(ndev->dr_hw) { |
| 762 | case NUBUS_DRHW_APPLE_MDC: | 761 | case NUBUS_DRHW_APPLE_MDC: |
| 763 | strcat( macfb_fix.id, "Display Card" ); | 762 | strcpy(macfb_fix.id, "Mac Disp. Card"); |
| 764 | macfb_setpalette = mdc_setpalette; | 763 | macfb_setpalette = mdc_setpalette; |
| 765 | macfb_defined.activate = FB_ACTIVATE_NOW; | 764 | macfb_defined.activate = FB_ACTIVATE_NOW; |
| 766 | break; | 765 | break; |
| 767 | case NUBUS_DRHW_APPLE_TFB: | 766 | case NUBUS_DRHW_APPLE_TFB: |
| 768 | strcat( macfb_fix.id, "Toby" ); | 767 | strcpy(macfb_fix.id, "Toby"); |
| 769 | macfb_setpalette = toby_setpalette; | 768 | macfb_setpalette = toby_setpalette; |
| 770 | macfb_defined.activate = FB_ACTIVATE_NOW; | 769 | macfb_defined.activate = FB_ACTIVATE_NOW; |
| 771 | break; | 770 | break; |
| 772 | case NUBUS_DRHW_APPLE_JET: | 771 | case NUBUS_DRHW_APPLE_JET: |
| 773 | strcat( macfb_fix.id, "Jet"); | 772 | strcpy(macfb_fix.id, "Jet"); |
| 774 | macfb_setpalette = jet_setpalette; | 773 | macfb_setpalette = jet_setpalette; |
| 775 | macfb_defined.activate = FB_ACTIVATE_NOW; | 774 | macfb_defined.activate = FB_ACTIVATE_NOW; |
| 776 | break; | 775 | break; |
| 777 | default: | 776 | default: |
| 778 | strcat( macfb_fix.id, "Generic NuBus" ); | 777 | strcpy(macfb_fix.id, "Generic NuBus"); |
| 779 | break; | 778 | break; |
| 780 | } | 779 | } |
| 781 | } | 780 | } |
| @@ -786,21 +785,11 @@ static int __init macfb_init(void) | |||
| 786 | if (!video_is_nubus) | 785 | if (!video_is_nubus) |
| 787 | switch( mac_bi_data.id ) | 786 | switch( mac_bi_data.id ) |
| 788 | { | 787 | { |
| 789 | /* These don't have onboard video. Eventually, we may | ||
| 790 | be able to write separate framebuffer drivers for | ||
| 791 | them (tobyfb.c, hiresfb.c, etc, etc) */ | ||
| 792 | case MAC_MODEL_II: | ||
| 793 | case MAC_MODEL_IIX: | ||
| 794 | case MAC_MODEL_IICX: | ||
| 795 | case MAC_MODEL_IIFX: | ||
| 796 | strcat( macfb_fix.id, "Generic NuBus" ); | ||
| 797 | break; | ||
| 798 | |||
| 799 | /* Valkyrie Quadras */ | 788 | /* Valkyrie Quadras */ |
| 800 | case MAC_MODEL_Q630: | 789 | case MAC_MODEL_Q630: |
| 801 | /* I'm not sure about this one */ | 790 | /* I'm not sure about this one */ |
| 802 | case MAC_MODEL_P588: | 791 | case MAC_MODEL_P588: |
| 803 | strcat( macfb_fix.id, "Valkyrie built-in" ); | 792 | strcpy(macfb_fix.id, "Valkyrie"); |
| 804 | macfb_setpalette = valkyrie_setpalette; | 793 | macfb_setpalette = valkyrie_setpalette; |
| 805 | macfb_defined.activate = FB_ACTIVATE_NOW; | 794 | macfb_defined.activate = FB_ACTIVATE_NOW; |
| 806 | valkyrie_cmap_regs = ioremap(DAC_BASE, 0x1000); | 795 | valkyrie_cmap_regs = ioremap(DAC_BASE, 0x1000); |
| @@ -823,7 +812,7 @@ static int __init macfb_init(void) | |||
| 823 | case MAC_MODEL_Q700: | 812 | case MAC_MODEL_Q700: |
| 824 | case MAC_MODEL_Q900: | 813 | case MAC_MODEL_Q900: |
| 825 | case MAC_MODEL_Q950: | 814 | case MAC_MODEL_Q950: |
| 826 | strcat( macfb_fix.id, "DAFB built-in" ); | 815 | strcpy(macfb_fix.id, "DAFB"); |
| 827 | macfb_setpalette = dafb_setpalette; | 816 | macfb_setpalette = dafb_setpalette; |
| 828 | macfb_defined.activate = FB_ACTIVATE_NOW; | 817 | macfb_defined.activate = FB_ACTIVATE_NOW; |
| 829 | dafb_cmap_regs = ioremap(DAFB_BASE, 0x1000); | 818 | dafb_cmap_regs = ioremap(DAFB_BASE, 0x1000); |
| @@ -831,7 +820,7 @@ static int __init macfb_init(void) | |||
| 831 | 820 | ||
| 832 | /* LC II uses the V8 framebuffer */ | 821 | /* LC II uses the V8 framebuffer */ |
| 833 | case MAC_MODEL_LCII: | 822 | case MAC_MODEL_LCII: |
| 834 | strcat( macfb_fix.id, "V8 built-in" ); | 823 | strcpy(macfb_fix.id, "V8"); |
| 835 | macfb_setpalette = v8_brazil_setpalette; | 824 | macfb_setpalette = v8_brazil_setpalette; |
| 836 | macfb_defined.activate = FB_ACTIVATE_NOW; | 825 | macfb_defined.activate = FB_ACTIVATE_NOW; |
| 837 | v8_brazil_cmap_regs = ioremap(DAC_BASE, 0x1000); | 826 | v8_brazil_cmap_regs = ioremap(DAC_BASE, 0x1000); |
| @@ -843,7 +832,7 @@ static int __init macfb_init(void) | |||
| 843 | case MAC_MODEL_IIVI: | 832 | case MAC_MODEL_IIVI: |
| 844 | case MAC_MODEL_IIVX: | 833 | case MAC_MODEL_IIVX: |
| 845 | case MAC_MODEL_P600: | 834 | case MAC_MODEL_P600: |
| 846 | strcat( macfb_fix.id, "Brazil built-in" ); | 835 | strcpy(macfb_fix.id, "Brazil"); |
| 847 | macfb_setpalette = v8_brazil_setpalette; | 836 | macfb_setpalette = v8_brazil_setpalette; |
| 848 | macfb_defined.activate = FB_ACTIVATE_NOW; | 837 | macfb_defined.activate = FB_ACTIVATE_NOW; |
| 849 | v8_brazil_cmap_regs = ioremap(DAC_BASE, 0x1000); | 838 | v8_brazil_cmap_regs = ioremap(DAC_BASE, 0x1000); |
| @@ -860,7 +849,7 @@ static int __init macfb_init(void) | |||
| 860 | case MAC_MODEL_P460: | 849 | case MAC_MODEL_P460: |
| 861 | macfb_setpalette = v8_brazil_setpalette; | 850 | macfb_setpalette = v8_brazil_setpalette; |
| 862 | macfb_defined.activate = FB_ACTIVATE_NOW; | 851 | macfb_defined.activate = FB_ACTIVATE_NOW; |
| 863 | strcat( macfb_fix.id, "Sonora built-in" ); | 852 | strcpy(macfb_fix.id, "Sonora"); |
| 864 | v8_brazil_cmap_regs = ioremap(DAC_BASE, 0x1000); | 853 | v8_brazil_cmap_regs = ioremap(DAC_BASE, 0x1000); |
| 865 | break; | 854 | break; |
| 866 | 855 | ||
| @@ -871,7 +860,7 @@ static int __init macfb_init(void) | |||
| 871 | case MAC_MODEL_IISI: | 860 | case MAC_MODEL_IISI: |
| 872 | macfb_setpalette = rbv_setpalette; | 861 | macfb_setpalette = rbv_setpalette; |
| 873 | macfb_defined.activate = FB_ACTIVATE_NOW; | 862 | macfb_defined.activate = FB_ACTIVATE_NOW; |
| 874 | strcat( macfb_fix.id, "RBV built-in" ); | 863 | strcpy(macfb_fix.id, "RBV"); |
| 875 | rbv_cmap_regs = ioremap(DAC_BASE, 0x1000); | 864 | rbv_cmap_regs = ioremap(DAC_BASE, 0x1000); |
| 876 | break; | 865 | break; |
| 877 | 866 | ||
| @@ -880,7 +869,7 @@ static int __init macfb_init(void) | |||
| 880 | case MAC_MODEL_C660: | 869 | case MAC_MODEL_C660: |
| 881 | macfb_setpalette = civic_setpalette; | 870 | macfb_setpalette = civic_setpalette; |
| 882 | macfb_defined.activate = FB_ACTIVATE_NOW; | 871 | macfb_defined.activate = FB_ACTIVATE_NOW; |
| 883 | strcat( macfb_fix.id, "Civic built-in" ); | 872 | strcpy(macfb_fix.id, "Civic"); |
| 884 | civic_cmap_regs = ioremap(CIVIC_BASE, 0x1000); | 873 | civic_cmap_regs = ioremap(CIVIC_BASE, 0x1000); |
| 885 | break; | 874 | break; |
| 886 | 875 | ||
| @@ -901,7 +890,7 @@ static int __init macfb_init(void) | |||
| 901 | v8_brazil_cmap_regs = | 890 | v8_brazil_cmap_regs = |
| 902 | ioremap(DAC_BASE, 0x1000); | 891 | ioremap(DAC_BASE, 0x1000); |
| 903 | } | 892 | } |
| 904 | strcat( macfb_fix.id, "LC built-in" ); | 893 | strcpy(macfb_fix.id, "LC"); |
| 905 | break; | 894 | break; |
| 906 | /* We think this may be like the LC II */ | 895 | /* We think this may be like the LC II */ |
| 907 | case MAC_MODEL_CCL: | 896 | case MAC_MODEL_CCL: |
| @@ -911,18 +900,18 @@ static int __init macfb_init(void) | |||
| 911 | v8_brazil_cmap_regs = | 900 | v8_brazil_cmap_regs = |
| 912 | ioremap(DAC_BASE, 0x1000); | 901 | ioremap(DAC_BASE, 0x1000); |
| 913 | } | 902 | } |
| 914 | strcat( macfb_fix.id, "Color Classic built-in" ); | 903 | strcpy(macfb_fix.id, "Color Classic"); |
| 915 | break; | 904 | break; |
| 916 | 905 | ||
| 917 | /* And we *do* mean "weirdos" */ | 906 | /* And we *do* mean "weirdos" */ |
| 918 | case MAC_MODEL_TV: | 907 | case MAC_MODEL_TV: |
| 919 | strcat( macfb_fix.id, "Mac TV built-in" ); | 908 | strcpy(macfb_fix.id, "Mac TV"); |
| 920 | break; | 909 | break; |
| 921 | 910 | ||
| 922 | /* These don't have colour, so no need to worry */ | 911 | /* These don't have colour, so no need to worry */ |
| 923 | case MAC_MODEL_SE30: | 912 | case MAC_MODEL_SE30: |
| 924 | case MAC_MODEL_CLII: | 913 | case MAC_MODEL_CLII: |
| 925 | strcat( macfb_fix.id, "Monochrome built-in" ); | 914 | strcpy(macfb_fix.id, "Monochrome"); |
| 926 | break; | 915 | break; |
| 927 | 916 | ||
| 928 | /* Powerbooks are particularly difficult. Many of | 917 | /* Powerbooks are particularly difficult. Many of |
| @@ -935,7 +924,7 @@ static int __init macfb_init(void) | |||
| 935 | case MAC_MODEL_PB140: | 924 | case MAC_MODEL_PB140: |
| 936 | case MAC_MODEL_PB145: | 925 | case MAC_MODEL_PB145: |
| 937 | case MAC_MODEL_PB170: | 926 | case MAC_MODEL_PB170: |
| 938 | strcat( macfb_fix.id, "DDC built-in" ); | 927 | strcpy(macfb_fix.id, "DDC"); |
| 939 | break; | 928 | break; |
| 940 | 929 | ||
| 941 | /* Internal is GSC, External (if present) is ViSC */ | 930 | /* Internal is GSC, External (if present) is ViSC */ |
| @@ -945,13 +934,13 @@ static int __init macfb_init(void) | |||
| 945 | case MAC_MODEL_PB180: | 934 | case MAC_MODEL_PB180: |
| 946 | case MAC_MODEL_PB210: | 935 | case MAC_MODEL_PB210: |
| 947 | case MAC_MODEL_PB230: | 936 | case MAC_MODEL_PB230: |
| 948 | strcat( macfb_fix.id, "GSC built-in" ); | 937 | strcpy(macfb_fix.id, "GSC"); |
| 949 | break; | 938 | break; |
| 950 | 939 | ||
| 951 | /* Internal is TIM, External is ViSC */ | 940 | /* Internal is TIM, External is ViSC */ |
| 952 | case MAC_MODEL_PB165C: | 941 | case MAC_MODEL_PB165C: |
| 953 | case MAC_MODEL_PB180C: | 942 | case MAC_MODEL_PB180C: |
| 954 | strcat( macfb_fix.id, "TIM built-in" ); | 943 | strcpy(macfb_fix.id, "TIM"); |
| 955 | break; | 944 | break; |
| 956 | 945 | ||
| 957 | /* Internal is CSC, External is Keystone+Ariel. */ | 946 | /* Internal is CSC, External is Keystone+Ariel. */ |
| @@ -963,12 +952,12 @@ static int __init macfb_init(void) | |||
| 963 | case MAC_MODEL_PB280C: | 952 | case MAC_MODEL_PB280C: |
| 964 | macfb_setpalette = csc_setpalette; | 953 | macfb_setpalette = csc_setpalette; |
| 965 | macfb_defined.activate = FB_ACTIVATE_NOW; | 954 | macfb_defined.activate = FB_ACTIVATE_NOW; |
| 966 | strcat( macfb_fix.id, "CSC built-in" ); | 955 | strcpy(macfb_fix.id, "CSC"); |
| 967 | csc_cmap_regs = ioremap(CSC_BASE, 0x1000); | 956 | csc_cmap_regs = ioremap(CSC_BASE, 0x1000); |
| 968 | break; | 957 | break; |
| 969 | 958 | ||
| 970 | default: | 959 | default: |
| 971 | strcat( macfb_fix.id, "Unknown/Unsupported built-in" ); | 960 | strcpy(macfb_fix.id, "Unknown"); |
| 972 | break; | 961 | break; |
| 973 | } | 962 | } |
| 974 | 963 | ||
| @@ -978,16 +967,23 @@ static int __init macfb_init(void) | |||
| 978 | fb_info.pseudo_palette = pseudo_palette; | 967 | fb_info.pseudo_palette = pseudo_palette; |
| 979 | fb_info.flags = FBINFO_DEFAULT; | 968 | fb_info.flags = FBINFO_DEFAULT; |
| 980 | 969 | ||
| 981 | fb_alloc_cmap(&fb_info.cmap, video_cmap_len, 0); | 970 | err = fb_alloc_cmap(&fb_info.cmap, video_cmap_len, 0); |
| 971 | if (err) | ||
| 972 | goto fail_unmap; | ||
| 982 | 973 | ||
| 983 | err = register_framebuffer(&fb_info); | 974 | err = register_framebuffer(&fb_info); |
| 984 | if (!err) | 975 | if (err) |
| 985 | printk("fb%d: %s frame buffer device\n", | 976 | goto fail_dealloc; |
| 986 | fb_info.node, fb_info.fix.id); | 977 | |
| 987 | else { | 978 | printk("fb%d: %s frame buffer device\n", |
| 988 | iounmap(fb_info.screen_base); | 979 | fb_info.node, fb_info.fix.id); |
| 989 | iounmap_macfb(); | 980 | return 0; |
| 990 | } | 981 | |
| 982 | fail_dealloc: | ||
| 983 | fb_dealloc_cmap(&fb_info.cmap); | ||
| 984 | fail_unmap: | ||
| 985 | iounmap(fb_info.screen_base); | ||
| 986 | iounmap_macfb(); | ||
| 991 | return err; | 987 | return err; |
| 992 | } | 988 | } |
| 993 | 989 | ||
diff --git a/drivers/video/mb862xx/mb862xxfb.c b/drivers/video/mb862xx/mb862xxfb.c index 38718d95fbb9..fb64234a3825 100644 --- a/drivers/video/mb862xx/mb862xxfb.c +++ b/drivers/video/mb862xx/mb862xxfb.c | |||
| @@ -927,9 +927,9 @@ static int __devinit mb862xx_pci_probe(struct pci_dev *pdev, | |||
| 927 | } | 927 | } |
| 928 | 928 | ||
| 929 | dev_dbg(dev, "fb phys 0x%llx 0x%lx\n", | 929 | dev_dbg(dev, "fb phys 0x%llx 0x%lx\n", |
| 930 | (u64)par->fb_base_phys, (ulong)par->mapped_vram); | 930 | (unsigned long long)par->fb_base_phys, (ulong)par->mapped_vram); |
| 931 | dev_dbg(dev, "mmio phys 0x%llx 0x%lx\n", | 931 | dev_dbg(dev, "mmio phys 0x%llx 0x%lx\n", |
| 932 | (u64)par->mmio_base_phys, (ulong)par->mmio_len); | 932 | (unsigned long long)par->mmio_base_phys, (ulong)par->mmio_len); |
| 933 | 933 | ||
| 934 | if (mb862xx_pci_gdc_init(par)) | 934 | if (mb862xx_pci_gdc_init(par)) |
| 935 | goto io_unmap; | 935 | goto io_unmap; |
diff --git a/drivers/video/omap/omapfb_main.c b/drivers/video/omap/omapfb_main.c index 5a5e407dc45f..1a49519dafa4 100644 --- a/drivers/video/omap/omapfb_main.c +++ b/drivers/video/omap/omapfb_main.c | |||
| @@ -392,7 +392,7 @@ static void set_fb_fix(struct fb_info *fbi) | |||
| 392 | int bpp; | 392 | int bpp; |
| 393 | 393 | ||
| 394 | rg = &plane->fbdev->mem_desc.region[plane->idx]; | 394 | rg = &plane->fbdev->mem_desc.region[plane->idx]; |
| 395 | fbi->screen_base = (char __iomem *)rg->vaddr; | 395 | fbi->screen_base = rg->vaddr; |
| 396 | fix->smem_start = rg->paddr; | 396 | fix->smem_start = rg->paddr; |
| 397 | fix->smem_len = rg->size; | 397 | fix->smem_len = rg->size; |
| 398 | 398 | ||
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c index a3765e0be4a8..763c1ea5dce5 100644 --- a/drivers/watchdog/hpwdt.c +++ b/drivers/watchdog/hpwdt.c | |||
| @@ -40,6 +40,7 @@ | |||
| 40 | #include <linux/bootmem.h> | 40 | #include <linux/bootmem.h> |
| 41 | #include <linux/slab.h> | 41 | #include <linux/slab.h> |
| 42 | #include <asm/desc.h> | 42 | #include <asm/desc.h> |
| 43 | #include <asm/cacheflush.h> | ||
| 43 | 44 | ||
| 44 | #define PCI_BIOS32_SD_VALUE 0x5F32335F /* "_32_" */ | 45 | #define PCI_BIOS32_SD_VALUE 0x5F32335F /* "_32_" */ |
| 45 | #define CRU_BIOS_SIGNATURE_VALUE 0x55524324 | 46 | #define CRU_BIOS_SIGNATURE_VALUE 0x55524324 |
| @@ -394,6 +395,8 @@ static void __devinit dmi_find_cru(const struct dmi_header *dm) | |||
| 394 | smbios_cru64_ptr->double_offset; | 395 | smbios_cru64_ptr->double_offset; |
| 395 | cru_rom_addr = ioremap(cru_physical_address, | 396 | cru_rom_addr = ioremap(cru_physical_address, |
| 396 | smbios_cru64_ptr->double_length); | 397 | smbios_cru64_ptr->double_length); |
| 398 | set_memory_x((unsigned long)cru_rom_addr & PAGE_MASK, | ||
| 399 | smbios_cru64_ptr->double_length >> PAGE_SHIFT); | ||
| 397 | } | 400 | } |
| 398 | } | 401 | } |
| 399 | } | 402 | } |
| @@ -482,7 +485,7 @@ static int hpwdt_pretimeout(struct notifier_block *nb, unsigned long ulReason, | |||
| 482 | "Management Log for details.\n"); | 485 | "Management Log for details.\n"); |
| 483 | } | 486 | } |
| 484 | 487 | ||
| 485 | return NOTIFY_STOP; | 488 | return NOTIFY_OK; |
| 486 | } | 489 | } |
| 487 | 490 | ||
| 488 | /* | 491 | /* |
diff --git a/drivers/watchdog/iTCO_vendor_support.c b/drivers/watchdog/iTCO_vendor_support.c index ca344a85eb95..2474ebca88f6 100644 --- a/drivers/watchdog/iTCO_vendor_support.c +++ b/drivers/watchdog/iTCO_vendor_support.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * intel TCO vendor specific watchdog driver support | 2 | * intel TCO vendor specific watchdog driver support |
| 3 | * | 3 | * |
| 4 | * (c) Copyright 2006 Wim Van Sebroeck <wim@iguana.be>. | 4 | * (c) Copyright 2006-2008 Wim Van Sebroeck <wim@iguana.be>. |
| 5 | * | 5 | * |
| 6 | * This program is free software; you can redistribute it and/or | 6 | * This program is free software; you can redistribute it and/or |
| 7 | * modify it under the terms of the GNU General Public License | 7 | * modify it under the terms of the GNU General Public License |
| @@ -19,8 +19,7 @@ | |||
| 19 | 19 | ||
| 20 | /* Module and version information */ | 20 | /* Module and version information */ |
| 21 | #define DRV_NAME "iTCO_vendor_support" | 21 | #define DRV_NAME "iTCO_vendor_support" |
| 22 | #define DRV_VERSION "1.01" | 22 | #define DRV_VERSION "1.02" |
| 23 | #define DRV_RELDATE "11-Nov-2006" | ||
| 24 | #define PFX DRV_NAME ": " | 23 | #define PFX DRV_NAME ": " |
| 25 | 24 | ||
| 26 | /* Includes */ | 25 | /* Includes */ |
| @@ -78,24 +77,6 @@ MODULE_PARM_DESC(vendorsupport, "iTCO vendor specific support mode, default=0 (n | |||
| 78 | * 20.6 seconds. | 77 | * 20.6 seconds. |
| 79 | */ | 78 | */ |
| 80 | 79 | ||
| 81 | static void supermicro_old_pre_start(unsigned long acpibase) | ||
| 82 | { | ||
| 83 | unsigned long val32; | ||
| 84 | |||
| 85 | val32 = inl(SMI_EN); | ||
| 86 | val32 &= 0xffffdfff; /* Turn off SMI clearing watchdog */ | ||
| 87 | outl(val32, SMI_EN); /* Needed to activate watchdog */ | ||
| 88 | } | ||
| 89 | |||
| 90 | static void supermicro_old_pre_stop(unsigned long acpibase) | ||
| 91 | { | ||
| 92 | unsigned long val32; | ||
| 93 | |||
| 94 | val32 = inl(SMI_EN); | ||
| 95 | val32 &= 0x00002000; /* Turn on SMI clearing watchdog */ | ||
| 96 | outl(val32, SMI_EN); /* Needed to deactivate watchdog */ | ||
| 97 | } | ||
| 98 | |||
| 99 | static void supermicro_old_pre_keepalive(unsigned long acpibase) | 80 | static void supermicro_old_pre_keepalive(unsigned long acpibase) |
| 100 | { | 81 | { |
| 101 | /* Reload TCO Timer (done in iTCO_wdt_keepalive) + */ | 82 | /* Reload TCO Timer (done in iTCO_wdt_keepalive) + */ |
| @@ -247,18 +228,14 @@ static void supermicro_new_pre_set_heartbeat(unsigned int heartbeat) | |||
| 247 | void iTCO_vendor_pre_start(unsigned long acpibase, | 228 | void iTCO_vendor_pre_start(unsigned long acpibase, |
| 248 | unsigned int heartbeat) | 229 | unsigned int heartbeat) |
| 249 | { | 230 | { |
| 250 | if (vendorsupport == SUPERMICRO_OLD_BOARD) | 231 | if (vendorsupport == SUPERMICRO_NEW_BOARD) |
| 251 | supermicro_old_pre_start(acpibase); | ||
| 252 | else if (vendorsupport == SUPERMICRO_NEW_BOARD) | ||
| 253 | supermicro_new_pre_start(heartbeat); | 232 | supermicro_new_pre_start(heartbeat); |
| 254 | } | 233 | } |
| 255 | EXPORT_SYMBOL(iTCO_vendor_pre_start); | 234 | EXPORT_SYMBOL(iTCO_vendor_pre_start); |
| 256 | 235 | ||
| 257 | void iTCO_vendor_pre_stop(unsigned long acpibase) | 236 | void iTCO_vendor_pre_stop(unsigned long acpibase) |
| 258 | { | 237 | { |
| 259 | if (vendorsupport == SUPERMICRO_OLD_BOARD) | 238 | if (vendorsupport == SUPERMICRO_NEW_BOARD) |
| 260 | supermicro_old_pre_stop(acpibase); | ||
| 261 | else if (vendorsupport == SUPERMICRO_NEW_BOARD) | ||
| 262 | supermicro_new_pre_stop(); | 239 | supermicro_new_pre_stop(); |
| 263 | } | 240 | } |
| 264 | EXPORT_SYMBOL(iTCO_vendor_pre_stop); | 241 | EXPORT_SYMBOL(iTCO_vendor_pre_stop); |
diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c index bfb93bc2ca9f..5b395a4ddfdf 100644 --- a/drivers/watchdog/iTCO_wdt.c +++ b/drivers/watchdog/iTCO_wdt.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * intel TCO Watchdog Driver (Used in i82801 and i6300ESB chipsets) | 2 | * intel TCO Watchdog Driver (Used in i82801 and i6300ESB chipsets) |
| 3 | * | 3 | * |
| 4 | * (c) Copyright 2006-2007 Wim Van Sebroeck <wim@iguana.be>. | 4 | * (c) Copyright 2006-2008 Wim Van Sebroeck <wim@iguana.be>. |
| 5 | * | 5 | * |
| 6 | * This program is free software; you can redistribute it and/or | 6 | * This program is free software; you can redistribute it and/or |
| 7 | * modify it under the terms of the GNU General Public License | 7 | * modify it under the terms of the GNU General Public License |
| @@ -20,34 +20,41 @@ | |||
| 20 | * 82801BAM (ICH2-M) : document number 290687-002, 298242-027, | 20 | * 82801BAM (ICH2-M) : document number 290687-002, 298242-027, |
| 21 | * 82801CA (ICH3-S) : document number 290733-003, 290739-013, | 21 | * 82801CA (ICH3-S) : document number 290733-003, 290739-013, |
| 22 | * 82801CAM (ICH3-M) : document number 290716-001, 290718-007, | 22 | * 82801CAM (ICH3-M) : document number 290716-001, 290718-007, |
| 23 | * 82801DB (ICH4) : document number 290744-001, 290745-020, | 23 | * 82801DB (ICH4) : document number 290744-001, 290745-025, |
| 24 | * 82801DBM (ICH4-M) : document number 252337-001, 252663-005, | 24 | * 82801DBM (ICH4-M) : document number 252337-001, 252663-008, |
| 25 | * 82801E (C-ICH) : document number 273599-001, 273645-002, | 25 | * 82801E (C-ICH) : document number 273599-001, 273645-002, |
| 26 | * 82801EB (ICH5) : document number 252516-001, 252517-003, | 26 | * 82801EB (ICH5) : document number 252516-001, 252517-028, |
| 27 | * 82801ER (ICH5R) : document number 252516-001, 252517-003, | 27 | * 82801ER (ICH5R) : document number 252516-001, 252517-028, |
| 28 | * 82801FB (ICH6) : document number 301473-002, 301474-007, | 28 | * 6300ESB (6300ESB) : document number 300641-004, 300884-013, |
| 29 | * 82801FR (ICH6R) : document number 301473-002, 301474-007, | 29 | * 82801FB (ICH6) : document number 301473-002, 301474-026, |
| 30 | * 82801FBM (ICH6-M) : document number 301473-002, 301474-007, | 30 | * 82801FR (ICH6R) : document number 301473-002, 301474-026, |
| 31 | * 82801FW (ICH6W) : document number 301473-001, 301474-007, | 31 | * 82801FBM (ICH6-M) : document number 301473-002, 301474-026, |
| 32 | * 82801FRW (ICH6RW) : document number 301473-001, 301474-007, | 32 | * 82801FW (ICH6W) : document number 301473-001, 301474-026, |
| 33 | * 82801GB (ICH7) : document number 307013-002, 307014-009, | 33 | * 82801FRW (ICH6RW) : document number 301473-001, 301474-026, |
| 34 | * 82801GR (ICH7R) : document number 307013-002, 307014-009, | 34 | * 631xESB (631xESB) : document number 313082-001, 313075-006, |
| 35 | * 82801GDH (ICH7DH) : document number 307013-002, 307014-009, | 35 | * 632xESB (632xESB) : document number 313082-001, 313075-006, |
| 36 | * 82801GBM (ICH7-M) : document number 307013-002, 307014-009, | 36 | * 82801GB (ICH7) : document number 307013-003, 307014-024, |
| 37 | * 82801GHM (ICH7-M DH) : document number 307013-002, 307014-009, | 37 | * 82801GR (ICH7R) : document number 307013-003, 307014-024, |
| 38 | * 82801HB (ICH8) : document number 313056-003, 313057-009, | 38 | * 82801GDH (ICH7DH) : document number 307013-003, 307014-024, |
| 39 | * 82801HR (ICH8R) : document number 313056-003, 313057-009, | 39 | * 82801GBM (ICH7-M) : document number 307013-003, 307014-024, |
| 40 | * 82801HBM (ICH8M) : document number 313056-003, 313057-009, | 40 | * 82801GHM (ICH7-M DH) : document number 307013-003, 307014-024, |
| 41 | * 82801HH (ICH8DH) : document number 313056-003, 313057-009, | 41 | * 82801GU (ICH7-U) : document number 307013-003, 307014-024, |
| 42 | * 82801HO (ICH8DO) : document number 313056-003, 313057-009, | 42 | * 82801HB (ICH8) : document number 313056-003, 313057-017, |
| 43 | * 82801HEM (ICH8M-E) : document number 313056-003, 313057-009, | 43 | * 82801HR (ICH8R) : document number 313056-003, 313057-017, |
| 44 | * 82801IB (ICH9) : document number 316972-001, 316973-006, | 44 | * 82801HBM (ICH8M) : document number 313056-003, 313057-017, |
| 45 | * 82801IR (ICH9R) : document number 316972-001, 316973-006, | 45 | * 82801HH (ICH8DH) : document number 313056-003, 313057-017, |
| 46 | * 82801IH (ICH9DH) : document number 316972-001, 316973-006, | 46 | * 82801HO (ICH8DO) : document number 313056-003, 313057-017, |
| 47 | * 82801IO (ICH9DO) : document number 316972-001, 316973-006, | 47 | * 82801HEM (ICH8M-E) : document number 313056-003, 313057-017, |
| 48 | * 6300ESB (6300ESB) : document number 300641-003, 300884-010, | 48 | * 82801IB (ICH9) : document number 316972-004, 316973-012, |
| 49 | * 631xESB (631xESB) : document number 313082-001, 313075-005, | 49 | * 82801IR (ICH9R) : document number 316972-004, 316973-012, |
| 50 | * 632xESB (632xESB) : document number 313082-001, 313075-005 | 50 | * 82801IH (ICH9DH) : document number 316972-004, 316973-012, |
| 51 | * 82801IO (ICH9DO) : document number 316972-004, 316973-012, | ||
| 52 | * 82801IBM (ICH9M) : document number 316972-004, 316973-012, | ||
| 53 | * 82801IEM (ICH9M-E) : document number 316972-004, 316973-012, | ||
| 54 | * 82801JIB (ICH10) : document number 319973-002, 319974-002, | ||
| 55 | * 82801JIR (ICH10R) : document number 319973-002, 319974-002, | ||
| 56 | * 82801JD (ICH10D) : document number 319973-002, 319974-002, | ||
| 57 | * 82801JDO (ICH10DO) : document number 319973-002, 319974-002 | ||
| 51 | */ | 58 | */ |
| 52 | 59 | ||
| 53 | /* | 60 | /* |
| @@ -56,8 +63,7 @@ | |||
| 56 | 63 | ||
| 57 | /* Module and version information */ | 64 | /* Module and version information */ |
| 58 | #define DRV_NAME "iTCO_wdt" | 65 | #define DRV_NAME "iTCO_wdt" |
| 59 | #define DRV_VERSION "1.03" | 66 | #define DRV_VERSION "1.04" |
| 60 | #define DRV_RELDATE "30-Apr-2008" | ||
| 61 | #define PFX DRV_NAME ": " | 67 | #define PFX DRV_NAME ": " |
| 62 | 68 | ||
| 63 | /* Includes */ | 69 | /* Includes */ |
| @@ -96,19 +102,26 @@ enum iTCO_chipsets { | |||
| 96 | TCO_ICH6, /* ICH6 & ICH6R */ | 102 | TCO_ICH6, /* ICH6 & ICH6R */ |
| 97 | TCO_ICH6M, /* ICH6-M */ | 103 | TCO_ICH6M, /* ICH6-M */ |
| 98 | TCO_ICH6W, /* ICH6W & ICH6RW */ | 104 | TCO_ICH6W, /* ICH6W & ICH6RW */ |
| 105 | TCO_631XESB, /* 631xESB/632xESB */ | ||
| 99 | TCO_ICH7, /* ICH7 & ICH7R */ | 106 | TCO_ICH7, /* ICH7 & ICH7R */ |
| 100 | TCO_ICH7M, /* ICH7-M */ | 107 | TCO_ICH7DH, /* ICH7DH */ |
| 108 | TCO_ICH7M, /* ICH7-M & ICH7-U */ | ||
| 101 | TCO_ICH7MDH, /* ICH7-M DH */ | 109 | TCO_ICH7MDH, /* ICH7-M DH */ |
| 102 | TCO_ICH8, /* ICH8 & ICH8R */ | 110 | TCO_ICH8, /* ICH8 & ICH8R */ |
| 103 | TCO_ICH8ME, /* ICH8M-E */ | ||
| 104 | TCO_ICH8DH, /* ICH8DH */ | 111 | TCO_ICH8DH, /* ICH8DH */ |
| 105 | TCO_ICH8DO, /* ICH8DO */ | 112 | TCO_ICH8DO, /* ICH8DO */ |
| 106 | TCO_ICH8M, /* ICH8M */ | 113 | TCO_ICH8M, /* ICH8M */ |
| 114 | TCO_ICH8ME, /* ICH8M-E */ | ||
| 107 | TCO_ICH9, /* ICH9 */ | 115 | TCO_ICH9, /* ICH9 */ |
| 108 | TCO_ICH9R, /* ICH9R */ | 116 | TCO_ICH9R, /* ICH9R */ |
| 109 | TCO_ICH9DH, /* ICH9DH */ | 117 | TCO_ICH9DH, /* ICH9DH */ |
| 110 | TCO_ICH9DO, /* ICH9DO */ | 118 | TCO_ICH9DO, /* ICH9DO */ |
| 111 | TCO_631XESB, /* 631xESB/632xESB */ | 119 | TCO_ICH9M, /* ICH9M */ |
| 120 | TCO_ICH9ME, /* ICH9M-E */ | ||
| 121 | TCO_ICH10, /* ICH10 */ | ||
| 122 | TCO_ICH10R, /* ICH10R */ | ||
| 123 | TCO_ICH10D, /* ICH10D */ | ||
| 124 | TCO_ICH10DO, /* ICH10DO */ | ||
| 112 | }; | 125 | }; |
| 113 | 126 | ||
| 114 | static struct { | 127 | static struct { |
| @@ -129,19 +142,26 @@ static struct { | |||
| 129 | {"ICH6 or ICH6R", 2}, | 142 | {"ICH6 or ICH6R", 2}, |
| 130 | {"ICH6-M", 2}, | 143 | {"ICH6-M", 2}, |
| 131 | {"ICH6W or ICH6RW", 2}, | 144 | {"ICH6W or ICH6RW", 2}, |
| 145 | {"631xESB/632xESB", 2}, | ||
| 132 | {"ICH7 or ICH7R", 2}, | 146 | {"ICH7 or ICH7R", 2}, |
| 133 | {"ICH7-M", 2}, | 147 | {"ICH7DH", 2}, |
| 148 | {"ICH7-M or ICH7-U", 2}, | ||
| 134 | {"ICH7-M DH", 2}, | 149 | {"ICH7-M DH", 2}, |
| 135 | {"ICH8 or ICH8R", 2}, | 150 | {"ICH8 or ICH8R", 2}, |
| 136 | {"ICH8M-E", 2}, | ||
| 137 | {"ICH8DH", 2}, | 151 | {"ICH8DH", 2}, |
| 138 | {"ICH8DO", 2}, | 152 | {"ICH8DO", 2}, |
| 139 | {"ICH8M", 2}, | 153 | {"ICH8M", 2}, |
| 154 | {"ICH8M-E", 2}, | ||
| 140 | {"ICH9", 2}, | 155 | {"ICH9", 2}, |
| 141 | {"ICH9R", 2}, | 156 | {"ICH9R", 2}, |
| 142 | {"ICH9DH", 2}, | 157 | {"ICH9DH", 2}, |
| 143 | {"ICH9DO", 2}, | 158 | {"ICH9DO", 2}, |
| 144 | {"631xESB/632xESB", 2}, | 159 | {"ICH9M", 2}, |
| 160 | {"ICH9M-E", 2}, | ||
| 161 | {"ICH10", 2}, | ||
| 162 | {"ICH10R", 2}, | ||
| 163 | {"ICH10D", 2}, | ||
| 164 | {"ICH10DO", 2}, | ||
| 145 | {NULL, 0} | 165 | {NULL, 0} |
| 146 | }; | 166 | }; |
| 147 | 167 | ||
| @@ -175,18 +195,6 @@ static struct pci_device_id iTCO_wdt_pci_tbl[] = { | |||
| 175 | { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH6_0, TCO_ICH6)}, | 195 | { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH6_0, TCO_ICH6)}, |
| 176 | { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH6_1, TCO_ICH6M)}, | 196 | { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH6_1, TCO_ICH6M)}, |
| 177 | { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH6_2, TCO_ICH6W)}, | 197 | { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH6_2, TCO_ICH6W)}, |
| 178 | { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH7_0, TCO_ICH7)}, | ||
| 179 | { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH7_1, TCO_ICH7M)}, | ||
| 180 | { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH7_31, TCO_ICH7MDH)}, | ||
| 181 | { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH8_0, TCO_ICH8)}, | ||
| 182 | { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH8_1, TCO_ICH8ME)}, | ||
| 183 | { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH8_2, TCO_ICH8DH)}, | ||
| 184 | { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH8_3, TCO_ICH8DO)}, | ||
| 185 | { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH8_4, TCO_ICH8M)}, | ||
| 186 | { ITCO_PCI_DEVICE(0x2918, TCO_ICH9)}, | ||
| 187 | { ITCO_PCI_DEVICE(0x2916, TCO_ICH9R)}, | ||
| 188 | { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH9_2, TCO_ICH9DH)}, | ||
| 189 | { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH9_4, TCO_ICH9DO)}, | ||
| 190 | { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ESB2_0, TCO_631XESB)}, | 198 | { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ESB2_0, TCO_631XESB)}, |
| 191 | { ITCO_PCI_DEVICE(0x2671, TCO_631XESB)}, | 199 | { ITCO_PCI_DEVICE(0x2671, TCO_631XESB)}, |
| 192 | { ITCO_PCI_DEVICE(0x2672, TCO_631XESB)}, | 200 | { ITCO_PCI_DEVICE(0x2672, TCO_631XESB)}, |
| @@ -203,6 +211,25 @@ static struct pci_device_id iTCO_wdt_pci_tbl[] = { | |||
| 203 | { ITCO_PCI_DEVICE(0x267d, TCO_631XESB)}, | 211 | { ITCO_PCI_DEVICE(0x267d, TCO_631XESB)}, |
| 204 | { ITCO_PCI_DEVICE(0x267e, TCO_631XESB)}, | 212 | { ITCO_PCI_DEVICE(0x267e, TCO_631XESB)}, |
| 205 | { ITCO_PCI_DEVICE(0x267f, TCO_631XESB)}, | 213 | { ITCO_PCI_DEVICE(0x267f, TCO_631XESB)}, |
| 214 | { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH7_0, TCO_ICH7)}, | ||
| 215 | { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH7_30, TCO_ICH7DH)}, | ||
| 216 | { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH7_1, TCO_ICH7M)}, | ||
| 217 | { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH7_31, TCO_ICH7MDH)}, | ||
| 218 | { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH8_0, TCO_ICH8)}, | ||
| 219 | { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH8_2, TCO_ICH8DH)}, | ||
| 220 | { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH8_3, TCO_ICH8DO)}, | ||
| 221 | { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH8_4, TCO_ICH8M)}, | ||
| 222 | { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH8_1, TCO_ICH8ME)}, | ||
| 223 | { ITCO_PCI_DEVICE(0x2918, TCO_ICH9)}, | ||
| 224 | { ITCO_PCI_DEVICE(0x2916, TCO_ICH9R)}, | ||
| 225 | { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH9_2, TCO_ICH9DH)}, | ||
| 226 | { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH9_4, TCO_ICH9DO)}, | ||
| 227 | { ITCO_PCI_DEVICE(0x2919, TCO_ICH9M)}, | ||
| 228 | { ITCO_PCI_DEVICE(0x2917, TCO_ICH9ME)}, | ||
| 229 | { ITCO_PCI_DEVICE(0x3a18, TCO_ICH10)}, | ||
| 230 | { ITCO_PCI_DEVICE(0x3a16, TCO_ICH10R)}, | ||
| 231 | { ITCO_PCI_DEVICE(0x3a1a, TCO_ICH10D)}, | ||
| 232 | { ITCO_PCI_DEVICE(0x3a14, TCO_ICH10DO)}, | ||
| 206 | { 0, }, /* End of list */ | 233 | { 0, }, /* End of list */ |
| 207 | }; | 234 | }; |
| 208 | MODULE_DEVICE_TABLE(pci, iTCO_wdt_pci_tbl); | 235 | MODULE_DEVICE_TABLE(pci, iTCO_wdt_pci_tbl); |
| @@ -311,6 +338,7 @@ static int iTCO_wdt_unset_NO_REBOOT_bit(void) | |||
| 311 | static int iTCO_wdt_start(void) | 338 | static int iTCO_wdt_start(void) |
| 312 | { | 339 | { |
| 313 | unsigned int val; | 340 | unsigned int val; |
| 341 | unsigned long val32; | ||
| 314 | 342 | ||
| 315 | spin_lock(&iTCO_wdt_private.io_lock); | 343 | spin_lock(&iTCO_wdt_private.io_lock); |
| 316 | 344 | ||
| @@ -323,6 +351,18 @@ static int iTCO_wdt_start(void) | |||
| 323 | return -EIO; | 351 | return -EIO; |
| 324 | } | 352 | } |
| 325 | 353 | ||
| 354 | /* Bit 13: TCO_EN -> 0 = Disables TCO logic generating an SMI# */ | ||
| 355 | val32 = inl(SMI_EN); | ||
| 356 | val32 &= 0xffffdfff; /* Turn off SMI clearing watchdog */ | ||
| 357 | outl(val32, SMI_EN); | ||
| 358 | |||
| 359 | /* Force the timer to its reload value by writing to the TCO_RLD | ||
| 360 | register */ | ||
| 361 | if (iTCO_wdt_private.iTCO_version == 2) | ||
| 362 | outw(0x01, TCO_RLD); | ||
| 363 | else if (iTCO_wdt_private.iTCO_version == 1) | ||
| 364 | outb(0x01, TCO_RLD); | ||
| 365 | |||
| 326 | /* Bit 11: TCO Timer Halt -> 0 = The TCO timer is enabled to count */ | 366 | /* Bit 11: TCO Timer Halt -> 0 = The TCO timer is enabled to count */ |
| 327 | val = inw(TCO1_CNT); | 367 | val = inw(TCO1_CNT); |
| 328 | val &= 0xf7ff; | 368 | val &= 0xf7ff; |
| @@ -338,6 +378,7 @@ static int iTCO_wdt_start(void) | |||
| 338 | static int iTCO_wdt_stop(void) | 378 | static int iTCO_wdt_stop(void) |
| 339 | { | 379 | { |
| 340 | unsigned int val; | 380 | unsigned int val; |
| 381 | unsigned long val32; | ||
| 341 | 382 | ||
| 342 | spin_lock(&iTCO_wdt_private.io_lock); | 383 | spin_lock(&iTCO_wdt_private.io_lock); |
| 343 | 384 | ||
| @@ -349,6 +390,11 @@ static int iTCO_wdt_stop(void) | |||
| 349 | outw(val, TCO1_CNT); | 390 | outw(val, TCO1_CNT); |
| 350 | val = inw(TCO1_CNT); | 391 | val = inw(TCO1_CNT); |
| 351 | 392 | ||
| 393 | /* Bit 13: TCO_EN -> 1 = Enables the TCO logic to generate SMI# */ | ||
| 394 | val32 = inl(SMI_EN); | ||
| 395 | val32 |= 0x00002000; | ||
| 396 | outl(val32, SMI_EN); | ||
| 397 | |||
| 352 | /* Set the NO_REBOOT bit to prevent later reboots, just for sure */ | 398 | /* Set the NO_REBOOT bit to prevent later reboots, just for sure */ |
| 353 | iTCO_wdt_set_NO_REBOOT_bit(); | 399 | iTCO_wdt_set_NO_REBOOT_bit(); |
| 354 | 400 | ||
| @@ -459,7 +505,6 @@ static int iTCO_wdt_open(struct inode *inode, struct file *file) | |||
| 459 | /* | 505 | /* |
| 460 | * Reload and activate timer | 506 | * Reload and activate timer |
| 461 | */ | 507 | */ |
| 462 | iTCO_wdt_keepalive(); | ||
| 463 | iTCO_wdt_start(); | 508 | iTCO_wdt_start(); |
| 464 | return nonseekable_open(inode, file); | 509 | return nonseekable_open(inode, file); |
| 465 | } | 510 | } |
| @@ -604,7 +649,6 @@ static int __devinit iTCO_wdt_init(struct pci_dev *pdev, | |||
| 604 | int ret; | 649 | int ret; |
| 605 | u32 base_address; | 650 | u32 base_address; |
| 606 | unsigned long RCBA; | 651 | unsigned long RCBA; |
| 607 | unsigned long val32; | ||
| 608 | 652 | ||
| 609 | /* | 653 | /* |
| 610 | * Find the ACPI/PM base I/O address which is the base | 654 | * Find the ACPI/PM base I/O address which is the base |
| @@ -644,17 +688,13 @@ static int __devinit iTCO_wdt_init(struct pci_dev *pdev, | |||
| 644 | /* Set the NO_REBOOT bit to prevent later reboots, just for sure */ | 688 | /* Set the NO_REBOOT bit to prevent later reboots, just for sure */ |
| 645 | iTCO_wdt_set_NO_REBOOT_bit(); | 689 | iTCO_wdt_set_NO_REBOOT_bit(); |
| 646 | 690 | ||
| 647 | /* Set the TCO_EN bit in SMI_EN register */ | 691 | /* The TCO logic uses the TCO_EN bit in the SMI_EN register */ |
| 648 | if (!request_region(SMI_EN, 4, "iTCO_wdt")) { | 692 | if (!request_region(SMI_EN, 4, "iTCO_wdt")) { |
| 649 | printk(KERN_ERR PFX | 693 | printk(KERN_ERR PFX |
| 650 | "I/O address 0x%04lx already in use\n", SMI_EN); | 694 | "I/O address 0x%04lx already in use\n", SMI_EN); |
| 651 | ret = -EIO; | 695 | ret = -EIO; |
| 652 | goto out; | 696 | goto out; |
| 653 | } | 697 | } |
| 654 | val32 = inl(SMI_EN); | ||
| 655 | val32 &= 0xffffdfff; /* Turn off SMI clearing watchdog */ | ||
| 656 | outl(val32, SMI_EN); | ||
| 657 | release_region(SMI_EN, 4); | ||
| 658 | 698 | ||
| 659 | /* The TCO I/O registers reside in a 32-byte range pointed to | 699 | /* The TCO I/O registers reside in a 32-byte range pointed to |
| 660 | by the TCOBASE value */ | 700 | by the TCOBASE value */ |
| @@ -662,7 +702,7 @@ static int __devinit iTCO_wdt_init(struct pci_dev *pdev, | |||
| 662 | printk(KERN_ERR PFX "I/O address 0x%04lx already in use\n", | 702 | printk(KERN_ERR PFX "I/O address 0x%04lx already in use\n", |
| 663 | TCOBASE); | 703 | TCOBASE); |
| 664 | ret = -EIO; | 704 | ret = -EIO; |
| 665 | goto out; | 705 | goto unreg_smi_en; |
| 666 | } | 706 | } |
| 667 | 707 | ||
| 668 | printk(KERN_INFO PFX | 708 | printk(KERN_INFO PFX |
| @@ -672,8 +712,9 @@ static int __devinit iTCO_wdt_init(struct pci_dev *pdev, | |||
| 672 | TCOBASE); | 712 | TCOBASE); |
| 673 | 713 | ||
| 674 | /* Clear out the (probably old) status */ | 714 | /* Clear out the (probably old) status */ |
| 675 | outb(0, TCO1_STS); | 715 | outb(8, TCO1_STS); /* Clear the Time Out Status bit */ |
| 676 | outb(3, TCO2_STS); | 716 | outb(2, TCO2_STS); /* Clear SECOND_TO_STS bit */ |
| 717 | outb(4, TCO2_STS); /* Clear BOOT_STS bit */ | ||
| 677 | 718 | ||
| 678 | /* Make sure the watchdog is not running */ | 719 | /* Make sure the watchdog is not running */ |
| 679 | iTCO_wdt_stop(); | 720 | iTCO_wdt_stop(); |
| @@ -701,6 +742,8 @@ static int __devinit iTCO_wdt_init(struct pci_dev *pdev, | |||
| 701 | 742 | ||
| 702 | unreg_region: | 743 | unreg_region: |
| 703 | release_region(TCOBASE, 0x20); | 744 | release_region(TCOBASE, 0x20); |
| 745 | unreg_smi_en: | ||
| 746 | release_region(SMI_EN, 4); | ||
| 704 | out: | 747 | out: |
| 705 | if (iTCO_wdt_private.iTCO_version == 2) | 748 | if (iTCO_wdt_private.iTCO_version == 2) |
| 706 | iounmap(iTCO_wdt_private.gcs); | 749 | iounmap(iTCO_wdt_private.gcs); |
| @@ -718,6 +761,7 @@ static void __devexit iTCO_wdt_cleanup(void) | |||
| 718 | /* Deregister */ | 761 | /* Deregister */ |
| 719 | misc_deregister(&iTCO_wdt_miscdev); | 762 | misc_deregister(&iTCO_wdt_miscdev); |
| 720 | release_region(TCOBASE, 0x20); | 763 | release_region(TCOBASE, 0x20); |
| 764 | release_region(SMI_EN, 4); | ||
| 721 | if (iTCO_wdt_private.iTCO_version == 2) | 765 | if (iTCO_wdt_private.iTCO_version == 2) |
| 722 | iounmap(iTCO_wdt_private.gcs); | 766 | iounmap(iTCO_wdt_private.gcs); |
| 723 | pci_dev_put(iTCO_wdt_private.pdev); | 767 | pci_dev_put(iTCO_wdt_private.pdev); |
| @@ -782,8 +826,8 @@ static int __init iTCO_wdt_init_module(void) | |||
| 782 | { | 826 | { |
| 783 | int err; | 827 | int err; |
| 784 | 828 | ||
| 785 | printk(KERN_INFO PFX "Intel TCO WatchDog Timer Driver v%s (%s)\n", | 829 | printk(KERN_INFO PFX "Intel TCO WatchDog Timer Driver v%s\n", |
| 786 | DRV_VERSION, DRV_RELDATE); | 830 | DRV_VERSION); |
| 787 | 831 | ||
| 788 | err = platform_driver_register(&iTCO_wdt_driver); | 832 | err = platform_driver_register(&iTCO_wdt_driver); |
| 789 | if (err) | 833 | if (err) |
diff --git a/drivers/watchdog/mtx-1_wdt.c b/drivers/watchdog/mtx-1_wdt.c index b4b7b0a4c119..3acce623f209 100644 --- a/drivers/watchdog/mtx-1_wdt.c +++ b/drivers/watchdog/mtx-1_wdt.c | |||
| @@ -98,6 +98,8 @@ static void mtx1_wdt_reset(void) | |||
| 98 | 98 | ||
| 99 | static void mtx1_wdt_start(void) | 99 | static void mtx1_wdt_start(void) |
| 100 | { | 100 | { |
| 101 | unsigned long flags; | ||
| 102 | |||
| 101 | spin_lock_irqsave(&mtx1_wdt_device.lock, flags); | 103 | spin_lock_irqsave(&mtx1_wdt_device.lock, flags); |
| 102 | if (!mtx1_wdt_device.queue) { | 104 | if (!mtx1_wdt_device.queue) { |
| 103 | mtx1_wdt_device.queue = 1; | 105 | mtx1_wdt_device.queue = 1; |
| @@ -110,6 +112,8 @@ static void mtx1_wdt_start(void) | |||
| 110 | 112 | ||
| 111 | static int mtx1_wdt_stop(void) | 113 | static int mtx1_wdt_stop(void) |
| 112 | { | 114 | { |
| 115 | unsigned long flags; | ||
| 116 | |||
| 113 | spin_lock_irqsave(&mtx1_wdt_device.lock, flags); | 117 | spin_lock_irqsave(&mtx1_wdt_device.lock, flags); |
| 114 | if (mtx1_wdt_device.queue) { | 118 | if (mtx1_wdt_device.queue) { |
| 115 | mtx1_wdt_device.queue = 0; | 119 | mtx1_wdt_device.queue = 0; |
diff --git a/fs/block_dev.c b/fs/block_dev.c index db831efbdbbd..99e0ae1a4c78 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c | |||
| @@ -1135,12 +1135,15 @@ static int blkdev_open(struct inode * inode, struct file * filp) | |||
| 1135 | if (res) | 1135 | if (res) |
| 1136 | return res; | 1136 | return res; |
| 1137 | 1137 | ||
| 1138 | if (!(filp->f_mode & FMODE_EXCL)) | 1138 | if (filp->f_mode & FMODE_EXCL) { |
| 1139 | return 0; | 1139 | res = bd_claim(bdev, filp); |
| 1140 | if (res) | ||
| 1141 | goto out_blkdev_put; | ||
| 1142 | } | ||
| 1140 | 1143 | ||
| 1141 | if (!(res = bd_claim(bdev, filp))) | 1144 | return 0; |
| 1142 | return 0; | ||
| 1143 | 1145 | ||
| 1146 | out_blkdev_put: | ||
| 1144 | blkdev_put(bdev, filp->f_mode); | 1147 | blkdev_put(bdev, filp->f_mode); |
| 1145 | return res; | 1148 | return res; |
| 1146 | } | 1149 | } |
| @@ -1203,8 +1206,16 @@ static long block_ioctl(struct file *file, unsigned cmd, unsigned long arg) | |||
| 1203 | { | 1206 | { |
| 1204 | struct block_device *bdev = I_BDEV(file->f_mapping->host); | 1207 | struct block_device *bdev = I_BDEV(file->f_mapping->host); |
| 1205 | fmode_t mode = file->f_mode; | 1208 | fmode_t mode = file->f_mode; |
| 1209 | |||
| 1210 | /* | ||
| 1211 | * O_NDELAY can be altered using fcntl(.., F_SETFL, ..), so we have | ||
| 1212 | * to updated it before every ioctl. | ||
| 1213 | */ | ||
| 1206 | if (file->f_flags & O_NDELAY) | 1214 | if (file->f_flags & O_NDELAY) |
| 1207 | mode |= FMODE_NDELAY_NOW; | 1215 | mode |= FMODE_NDELAY; |
| 1216 | else | ||
| 1217 | mode &= ~FMODE_NDELAY; | ||
| 1218 | |||
| 1208 | return blkdev_ioctl(bdev, mode, cmd, arg); | 1219 | return blkdev_ioctl(bdev, mode, cmd, arg); |
| 1209 | } | 1220 | } |
| 1210 | 1221 | ||
| @@ -1159,6 +1159,7 @@ EXPORT_SYMBOL(remove_arg_zero); | |||
| 1159 | */ | 1159 | */ |
| 1160 | int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs) | 1160 | int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs) |
| 1161 | { | 1161 | { |
| 1162 | unsigned int depth = bprm->recursion_depth; | ||
| 1162 | int try,retval; | 1163 | int try,retval; |
| 1163 | struct linux_binfmt *fmt; | 1164 | struct linux_binfmt *fmt; |
| 1164 | #ifdef __alpha__ | 1165 | #ifdef __alpha__ |
| @@ -1219,8 +1220,15 @@ int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs) | |||
| 1219 | continue; | 1220 | continue; |
| 1220 | read_unlock(&binfmt_lock); | 1221 | read_unlock(&binfmt_lock); |
| 1221 | retval = fn(bprm, regs); | 1222 | retval = fn(bprm, regs); |
| 1223 | /* | ||
| 1224 | * Restore the depth counter to its starting value | ||
| 1225 | * in this call, so we don't have to rely on every | ||
| 1226 | * load_binary function to restore it on return. | ||
| 1227 | */ | ||
| 1228 | bprm->recursion_depth = depth; | ||
| 1222 | if (retval >= 0) { | 1229 | if (retval >= 0) { |
| 1223 | tracehook_report_exec(fmt, bprm, regs); | 1230 | if (depth == 0) |
| 1231 | tracehook_report_exec(fmt, bprm, regs); | ||
| 1224 | put_binfmt(fmt); | 1232 | put_binfmt(fmt); |
| 1225 | allow_write_access(bprm->file); | 1233 | allow_write_access(bprm->file); |
| 1226 | if (bprm->file) | 1234 | if (bprm->file) |
diff --git a/fs/exportfs/expfs.c b/fs/exportfs/expfs.c index 80246bad1b7f..890e01828817 100644 --- a/fs/exportfs/expfs.c +++ b/fs/exportfs/expfs.c | |||
| @@ -367,6 +367,8 @@ struct dentry *exportfs_decode_fh(struct vfsmount *mnt, struct fid *fid, | |||
| 367 | * Try to get any dentry for the given file handle from the filesystem. | 367 | * Try to get any dentry for the given file handle from the filesystem. |
| 368 | */ | 368 | */ |
| 369 | result = nop->fh_to_dentry(mnt->mnt_sb, fid, fh_len, fileid_type); | 369 | result = nop->fh_to_dentry(mnt->mnt_sb, fid, fh_len, fileid_type); |
| 370 | if (!result) | ||
| 371 | result = ERR_PTR(-ESTALE); | ||
| 370 | if (IS_ERR(result)) | 372 | if (IS_ERR(result)) |
| 371 | return result; | 373 | return result; |
| 372 | 374 | ||
| @@ -420,6 +422,8 @@ struct dentry *exportfs_decode_fh(struct vfsmount *mnt, struct fid *fid, | |||
| 420 | 422 | ||
| 421 | target_dir = nop->fh_to_parent(mnt->mnt_sb, fid, | 423 | target_dir = nop->fh_to_parent(mnt->mnt_sb, fid, |
| 422 | fh_len, fileid_type); | 424 | fh_len, fileid_type); |
| 425 | if (!target_dir) | ||
| 426 | goto err_result; | ||
| 423 | err = PTR_ERR(target_dir); | 427 | err = PTR_ERR(target_dir); |
| 424 | if (IS_ERR(target_dir)) | 428 | if (IS_ERR(target_dir)) |
| 425 | goto err_result; | 429 | goto err_result; |
diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c index d2003cdc36aa..db35cfdb3c8b 100644 --- a/fs/ext4/balloc.c +++ b/fs/ext4/balloc.c | |||
| @@ -609,8 +609,8 @@ int ext4_has_free_blocks(struct ext4_sb_info *sbi, s64 nblocks) | |||
| 609 | 609 | ||
| 610 | if (free_blocks - (nblocks + root_blocks + dirty_blocks) < | 610 | if (free_blocks - (nblocks + root_blocks + dirty_blocks) < |
| 611 | EXT4_FREEBLOCKS_WATERMARK) { | 611 | EXT4_FREEBLOCKS_WATERMARK) { |
| 612 | free_blocks = percpu_counter_sum(fbc); | 612 | free_blocks = percpu_counter_sum_positive(fbc); |
| 613 | dirty_blocks = percpu_counter_sum(dbc); | 613 | dirty_blocks = percpu_counter_sum_positive(dbc); |
| 614 | if (dirty_blocks < 0) { | 614 | if (dirty_blocks < 0) { |
| 615 | printk(KERN_CRIT "Dirty block accounting " | 615 | printk(KERN_CRIT "Dirty block accounting " |
| 616 | "went wrong %lld\n", | 616 | "went wrong %lld\n", |
diff --git a/fs/fcntl.c b/fs/fcntl.c index ac4f7db9f134..549daf8005fb 100644 --- a/fs/fcntl.c +++ b/fs/fcntl.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/signal.h> | 19 | #include <linux/signal.h> |
| 20 | #include <linux/rcupdate.h> | 20 | #include <linux/rcupdate.h> |
| 21 | #include <linux/pid_namespace.h> | 21 | #include <linux/pid_namespace.h> |
| 22 | #include <linux/smp_lock.h> | ||
| 22 | 23 | ||
| 23 | #include <asm/poll.h> | 24 | #include <asm/poll.h> |
| 24 | #include <asm/siginfo.h> | 25 | #include <asm/siginfo.h> |
| @@ -175,6 +176,11 @@ static int setfl(int fd, struct file * filp, unsigned long arg) | |||
| 175 | if (error) | 176 | if (error) |
| 176 | return error; | 177 | return error; |
| 177 | 178 | ||
| 179 | /* | ||
| 180 | * We still need a lock here for now to keep multiple FASYNC calls | ||
| 181 | * from racing with each other. | ||
| 182 | */ | ||
| 183 | lock_kernel(); | ||
| 178 | if ((arg ^ filp->f_flags) & FASYNC) { | 184 | if ((arg ^ filp->f_flags) & FASYNC) { |
| 179 | if (filp->f_op && filp->f_op->fasync) { | 185 | if (filp->f_op && filp->f_op->fasync) { |
| 180 | error = filp->f_op->fasync(fd, filp, (arg & FASYNC) != 0); | 186 | error = filp->f_op->fasync(fd, filp, (arg & FASYNC) != 0); |
| @@ -185,6 +191,7 @@ static int setfl(int fd, struct file * filp, unsigned long arg) | |||
| 185 | 191 | ||
| 186 | filp->f_flags = (arg & SETFL_MASK) | (filp->f_flags & ~SETFL_MASK); | 192 | filp->f_flags = (arg & SETFL_MASK) | (filp->f_flags & ~SETFL_MASK); |
| 187 | out: | 193 | out: |
| 194 | unlock_kernel(); | ||
| 188 | return error; | 195 | return error; |
| 189 | } | 196 | } |
| 190 | 197 | ||
diff --git a/fs/inotify.c b/fs/inotify.c index 7bbed1b89825..dae3f28f30d4 100644 --- a/fs/inotify.c +++ b/fs/inotify.c | |||
| @@ -428,11 +428,13 @@ void inotify_unmount_inodes(struct list_head *list) | |||
| 428 | watches = &inode->inotify_watches; | 428 | watches = &inode->inotify_watches; |
| 429 | list_for_each_entry_safe(watch, next_w, watches, i_list) { | 429 | list_for_each_entry_safe(watch, next_w, watches, i_list) { |
| 430 | struct inotify_handle *ih= watch->ih; | 430 | struct inotify_handle *ih= watch->ih; |
| 431 | get_inotify_watch(watch); | ||
| 431 | mutex_lock(&ih->mutex); | 432 | mutex_lock(&ih->mutex); |
| 432 | ih->in_ops->handle_event(watch, watch->wd, IN_UNMOUNT, 0, | 433 | ih->in_ops->handle_event(watch, watch->wd, IN_UNMOUNT, 0, |
| 433 | NULL, NULL); | 434 | NULL, NULL); |
| 434 | inotify_remove_watch_locked(ih, watch); | 435 | inotify_remove_watch_locked(ih, watch); |
| 435 | mutex_unlock(&ih->mutex); | 436 | mutex_unlock(&ih->mutex); |
| 437 | put_inotify_watch(watch); | ||
| 436 | } | 438 | } |
| 437 | mutex_unlock(&inode->inotify_mutex); | 439 | mutex_unlock(&inode->inotify_mutex); |
| 438 | iput(inode); | 440 | iput(inode); |
diff --git a/fs/ioctl.c b/fs/ioctl.c index d152856c371b..43e8b2c0664b 100644 --- a/fs/ioctl.c +++ b/fs/ioctl.c | |||
| @@ -400,11 +400,9 @@ static int ioctl_fioasync(unsigned int fd, struct file *filp, | |||
| 400 | 400 | ||
| 401 | /* Did FASYNC state change ? */ | 401 | /* Did FASYNC state change ? */ |
| 402 | if ((flag ^ filp->f_flags) & FASYNC) { | 402 | if ((flag ^ filp->f_flags) & FASYNC) { |
| 403 | if (filp->f_op && filp->f_op->fasync) { | 403 | if (filp->f_op && filp->f_op->fasync) |
| 404 | lock_kernel(); | ||
| 405 | error = filp->f_op->fasync(fd, filp, on); | 404 | error = filp->f_op->fasync(fd, filp, on); |
| 406 | unlock_kernel(); | 405 | else |
| 407 | } else | ||
| 408 | error = -ENOTTY; | 406 | error = -ENOTTY; |
| 409 | } | 407 | } |
| 410 | if (error) | 408 | if (error) |
| @@ -440,11 +438,17 @@ int do_vfs_ioctl(struct file *filp, unsigned int fd, unsigned int cmd, | |||
| 440 | break; | 438 | break; |
| 441 | 439 | ||
| 442 | case FIONBIO: | 440 | case FIONBIO: |
| 441 | /* BKL needed to avoid races tweaking f_flags */ | ||
| 442 | lock_kernel(); | ||
| 443 | error = ioctl_fionbio(filp, argp); | 443 | error = ioctl_fionbio(filp, argp); |
| 444 | unlock_kernel(); | ||
| 444 | break; | 445 | break; |
| 445 | 446 | ||
| 446 | case FIOASYNC: | 447 | case FIOASYNC: |
| 448 | /* BKL needed to avoid races tweaking f_flags */ | ||
| 449 | lock_kernel(); | ||
| 447 | error = ioctl_fioasync(fd, filp, argp); | 450 | error = ioctl_fioasync(fd, filp, argp); |
| 451 | unlock_kernel(); | ||
| 448 | break; | 452 | break; |
| 449 | 453 | ||
| 450 | case FIOQSIZE: | 454 | case FIOQSIZE: |
diff --git a/fs/lockd/host.c b/fs/lockd/host.c index 9fd8889097b7..70fc63a1727b 100644 --- a/fs/lockd/host.c +++ b/fs/lockd/host.c | |||
| @@ -167,7 +167,8 @@ static struct nlm_host *nlm_lookup_host(struct nlm_lookup_host_info *ni) | |||
| 167 | continue; | 167 | continue; |
| 168 | if (host->h_server != ni->server) | 168 | if (host->h_server != ni->server) |
| 169 | continue; | 169 | continue; |
| 170 | if (!nlm_cmp_addr(nlm_srcaddr(host), ni->src_sap)) | 170 | if (ni->server && |
| 171 | !nlm_cmp_addr(nlm_srcaddr(host), ni->src_sap)) | ||
| 171 | continue; | 172 | continue; |
| 172 | 173 | ||
| 173 | /* Move to head of hash chain. */ | 174 | /* Move to head of hash chain. */ |
diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c index c631a83931ce..56b076736b56 100644 --- a/fs/lockd/svc.c +++ b/fs/lockd/svc.c | |||
| @@ -181,6 +181,7 @@ lockd(void *vrqstp) | |||
| 181 | } | 181 | } |
| 182 | flush_signals(current); | 182 | flush_signals(current); |
| 183 | cancel_delayed_work_sync(&grace_period_end); | 183 | cancel_delayed_work_sync(&grace_period_end); |
| 184 | locks_end_grace(&lockd_manager); | ||
| 184 | if (nlmsvc_ops) | 185 | if (nlmsvc_ops) |
| 185 | nlmsvc_invalidate_all(); | 186 | nlmsvc_invalidate_all(); |
| 186 | nlm_shutdown_hosts(); | 187 | nlm_shutdown_hosts(); |
diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c index bb93946ace22..b79ec930d9f1 100644 --- a/fs/nfsd/nfs4recover.c +++ b/fs/nfsd/nfs4recover.c | |||
| @@ -225,12 +225,12 @@ nfsd4_list_rec_dir(struct dentry *dir, recdir_func *f) | |||
| 225 | return 0; | 225 | return 0; |
| 226 | 226 | ||
| 227 | nfs4_save_user(&uid, &gid); | 227 | nfs4_save_user(&uid, &gid); |
| 228 | INIT_LIST_HEAD(dentries); | ||
| 228 | 229 | ||
| 229 | filp = dentry_open(dget(dir), mntget(rec_dir.mnt), O_RDONLY); | 230 | filp = dentry_open(dget(dir), mntget(rec_dir.mnt), O_RDONLY); |
| 230 | status = PTR_ERR(filp); | 231 | status = PTR_ERR(filp); |
| 231 | if (IS_ERR(filp)) | 232 | if (IS_ERR(filp)) |
| 232 | goto out; | 233 | goto out; |
| 233 | INIT_LIST_HEAD(dentries); | ||
| 234 | status = vfs_readdir(filp, nfsd4_build_dentrylist, &dla); | 234 | status = vfs_readdir(filp, nfsd4_build_dentrylist, &dla); |
| 235 | fput(filp); | 235 | fput(filp); |
| 236 | while (!list_empty(dentries)) { | 236 | while (!list_empty(dentries)) { |
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index b0bebc552a11..1a052ac2bde9 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c | |||
| @@ -3261,6 +3261,7 @@ nfs4_state_shutdown(void) | |||
| 3261 | { | 3261 | { |
| 3262 | cancel_rearming_delayed_workqueue(laundry_wq, &laundromat_work); | 3262 | cancel_rearming_delayed_workqueue(laundry_wq, &laundromat_work); |
| 3263 | destroy_workqueue(laundry_wq); | 3263 | destroy_workqueue(laundry_wq); |
| 3264 | locks_end_grace(&nfsd4_manager); | ||
| 3264 | nfs4_lock_state(); | 3265 | nfs4_lock_state(); |
| 3265 | nfs4_release_reclaim(); | 3266 | nfs4_release_reclaim(); |
| 3266 | __nfs4_state_shutdown(); | 3267 | __nfs4_state_shutdown(); |
diff --git a/fs/proc/base.c b/fs/proc/base.c index 486cf3fe7139..d4677603c889 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c | |||
| @@ -371,7 +371,7 @@ static int lstats_show_proc(struct seq_file *m, void *v) | |||
| 371 | task->latency_record[i].time, | 371 | task->latency_record[i].time, |
| 372 | task->latency_record[i].max); | 372 | task->latency_record[i].max); |
| 373 | for (q = 0; q < LT_BACKTRACEDEPTH; q++) { | 373 | for (q = 0; q < LT_BACKTRACEDEPTH; q++) { |
| 374 | char sym[KSYM_NAME_LEN]; | 374 | char sym[KSYM_SYMBOL_LEN]; |
| 375 | char *c; | 375 | char *c; |
| 376 | if (!task->latency_record[i].backtrace[q]) | 376 | if (!task->latency_record[i].backtrace[q]) |
| 377 | break; | 377 | break; |
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index b770c095e45c..3a8bdd7f5756 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c | |||
| @@ -557,9 +557,9 @@ static u64 swap_pte_to_pagemap_entry(pte_t pte) | |||
| 557 | return swp_type(e) | (swp_offset(e) << MAX_SWAPFILES_SHIFT); | 557 | return swp_type(e) | (swp_offset(e) << MAX_SWAPFILES_SHIFT); |
| 558 | } | 558 | } |
| 559 | 559 | ||
| 560 | static unsigned long pte_to_pagemap_entry(pte_t pte) | 560 | static u64 pte_to_pagemap_entry(pte_t pte) |
| 561 | { | 561 | { |
| 562 | unsigned long pme = 0; | 562 | u64 pme = 0; |
| 563 | if (is_swap_pte(pte)) | 563 | if (is_swap_pte(pte)) |
| 564 | pme = PM_PFRAME(swap_pte_to_pagemap_entry(pte)) | 564 | pme = PM_PFRAME(swap_pte_to_pagemap_entry(pte)) |
| 565 | | PM_PSHIFT(PAGE_SHIFT) | PM_SWAP; | 565 | | PM_PSHIFT(PAGE_SHIFT) | PM_SWAP; |
diff --git a/fs/ubifs/commit.c b/fs/ubifs/commit.c index 0a6aa2cc78f0..b49884c8c10e 100644 --- a/fs/ubifs/commit.c +++ b/fs/ubifs/commit.c | |||
| @@ -234,8 +234,8 @@ int ubifs_bg_thread(void *info) | |||
| 234 | int err; | 234 | int err; |
| 235 | struct ubifs_info *c = info; | 235 | struct ubifs_info *c = info; |
| 236 | 236 | ||
| 237 | ubifs_msg("background thread \"%s\" started, PID %d", | 237 | dbg_msg("background thread \"%s\" started, PID %d", |
| 238 | c->bgt_name, current->pid); | 238 | c->bgt_name, current->pid); |
| 239 | set_freezable(); | 239 | set_freezable(); |
| 240 | 240 | ||
| 241 | while (1) { | 241 | while (1) { |
diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c index 7186400750e7..510ffa0bbda4 100644 --- a/fs/ubifs/debug.c +++ b/fs/ubifs/debug.c | |||
| @@ -101,21 +101,24 @@ static void sprintf_key(const struct ubifs_info *c, const union ubifs_key *key, | |||
| 101 | if (c->key_fmt == UBIFS_SIMPLE_KEY_FMT) { | 101 | if (c->key_fmt == UBIFS_SIMPLE_KEY_FMT) { |
| 102 | switch (type) { | 102 | switch (type) { |
| 103 | case UBIFS_INO_KEY: | 103 | case UBIFS_INO_KEY: |
| 104 | sprintf(p, "(%lu, %s)", key_inum(c, key), | 104 | sprintf(p, "(%lu, %s)", (unsigned long)key_inum(c, key), |
| 105 | get_key_type(type)); | 105 | get_key_type(type)); |
| 106 | break; | 106 | break; |
| 107 | case UBIFS_DENT_KEY: | 107 | case UBIFS_DENT_KEY: |
| 108 | case UBIFS_XENT_KEY: | 108 | case UBIFS_XENT_KEY: |
| 109 | sprintf(p, "(%lu, %s, %#08x)", key_inum(c, key), | 109 | sprintf(p, "(%lu, %s, %#08x)", |
| 110 | (unsigned long)key_inum(c, key), | ||
| 110 | get_key_type(type), key_hash(c, key)); | 111 | get_key_type(type), key_hash(c, key)); |
| 111 | break; | 112 | break; |
| 112 | case UBIFS_DATA_KEY: | 113 | case UBIFS_DATA_KEY: |
| 113 | sprintf(p, "(%lu, %s, %u)", key_inum(c, key), | 114 | sprintf(p, "(%lu, %s, %u)", |
| 115 | (unsigned long)key_inum(c, key), | ||
| 114 | get_key_type(type), key_block(c, key)); | 116 | get_key_type(type), key_block(c, key)); |
| 115 | break; | 117 | break; |
| 116 | case UBIFS_TRUN_KEY: | 118 | case UBIFS_TRUN_KEY: |
| 117 | sprintf(p, "(%lu, %s)", | 119 | sprintf(p, "(%lu, %s)", |
| 118 | key_inum(c, key), get_key_type(type)); | 120 | (unsigned long)key_inum(c, key), |
| 121 | get_key_type(type)); | ||
| 119 | break; | 122 | break; |
| 120 | default: | 123 | default: |
| 121 | sprintf(p, "(bad key type: %#08x, %#08x)", | 124 | sprintf(p, "(bad key type: %#08x, %#08x)", |
| @@ -364,8 +367,8 @@ void dbg_dump_node(const struct ubifs_info *c, const void *node) | |||
| 364 | le32_to_cpu(mst->ihead_lnum)); | 367 | le32_to_cpu(mst->ihead_lnum)); |
| 365 | printk(KERN_DEBUG "\tihead_offs %u\n", | 368 | printk(KERN_DEBUG "\tihead_offs %u\n", |
| 366 | le32_to_cpu(mst->ihead_offs)); | 369 | le32_to_cpu(mst->ihead_offs)); |
| 367 | printk(KERN_DEBUG "\tindex_size %u\n", | 370 | printk(KERN_DEBUG "\tindex_size %llu\n", |
| 368 | le32_to_cpu(mst->index_size)); | 371 | (unsigned long long)le64_to_cpu(mst->index_size)); |
| 369 | printk(KERN_DEBUG "\tlpt_lnum %u\n", | 372 | printk(KERN_DEBUG "\tlpt_lnum %u\n", |
| 370 | le32_to_cpu(mst->lpt_lnum)); | 373 | le32_to_cpu(mst->lpt_lnum)); |
| 371 | printk(KERN_DEBUG "\tlpt_offs %u\n", | 374 | printk(KERN_DEBUG "\tlpt_offs %u\n", |
| @@ -1589,7 +1592,7 @@ static struct fsck_inode *add_inode(struct ubifs_info *c, | |||
| 1589 | 1592 | ||
| 1590 | if (inum > c->highest_inum) { | 1593 | if (inum > c->highest_inum) { |
| 1591 | ubifs_err("too high inode number, max. is %lu", | 1594 | ubifs_err("too high inode number, max. is %lu", |
| 1592 | c->highest_inum); | 1595 | (unsigned long)c->highest_inum); |
| 1593 | return ERR_PTR(-EINVAL); | 1596 | return ERR_PTR(-EINVAL); |
| 1594 | } | 1597 | } |
| 1595 | 1598 | ||
| @@ -1668,16 +1671,18 @@ static struct fsck_inode *read_add_inode(struct ubifs_info *c, | |||
| 1668 | ino_key_init(c, &key, inum); | 1671 | ino_key_init(c, &key, inum); |
| 1669 | err = ubifs_lookup_level0(c, &key, &znode, &n); | 1672 | err = ubifs_lookup_level0(c, &key, &znode, &n); |
| 1670 | if (!err) { | 1673 | if (!err) { |
| 1671 | ubifs_err("inode %lu not found in index", inum); | 1674 | ubifs_err("inode %lu not found in index", (unsigned long)inum); |
| 1672 | return ERR_PTR(-ENOENT); | 1675 | return ERR_PTR(-ENOENT); |
| 1673 | } else if (err < 0) { | 1676 | } else if (err < 0) { |
| 1674 | ubifs_err("error %d while looking up inode %lu", err, inum); | 1677 | ubifs_err("error %d while looking up inode %lu", |
| 1678 | err, (unsigned long)inum); | ||
| 1675 | return ERR_PTR(err); | 1679 | return ERR_PTR(err); |
| 1676 | } | 1680 | } |
| 1677 | 1681 | ||
| 1678 | zbr = &znode->zbranch[n]; | 1682 | zbr = &znode->zbranch[n]; |
| 1679 | if (zbr->len < UBIFS_INO_NODE_SZ) { | 1683 | if (zbr->len < UBIFS_INO_NODE_SZ) { |
| 1680 | ubifs_err("bad node %lu node length %d", inum, zbr->len); | 1684 | ubifs_err("bad node %lu node length %d", |
| 1685 | (unsigned long)inum, zbr->len); | ||
| 1681 | return ERR_PTR(-EINVAL); | 1686 | return ERR_PTR(-EINVAL); |
| 1682 | } | 1687 | } |
| 1683 | 1688 | ||
| @@ -1697,7 +1702,7 @@ static struct fsck_inode *read_add_inode(struct ubifs_info *c, | |||
| 1697 | kfree(ino); | 1702 | kfree(ino); |
| 1698 | if (IS_ERR(fscki)) { | 1703 | if (IS_ERR(fscki)) { |
| 1699 | ubifs_err("error %ld while adding inode %lu node", | 1704 | ubifs_err("error %ld while adding inode %lu node", |
| 1700 | PTR_ERR(fscki), inum); | 1705 | PTR_ERR(fscki), (unsigned long)inum); |
| 1701 | return fscki; | 1706 | return fscki; |
| 1702 | } | 1707 | } |
| 1703 | 1708 | ||
| @@ -1786,7 +1791,8 @@ static int check_leaf(struct ubifs_info *c, struct ubifs_zbranch *zbr, | |||
| 1786 | if (IS_ERR(fscki)) { | 1791 | if (IS_ERR(fscki)) { |
| 1787 | err = PTR_ERR(fscki); | 1792 | err = PTR_ERR(fscki); |
| 1788 | ubifs_err("error %d while processing data node and " | 1793 | ubifs_err("error %d while processing data node and " |
| 1789 | "trying to find inode node %lu", err, inum); | 1794 | "trying to find inode node %lu", |
| 1795 | err, (unsigned long)inum); | ||
| 1790 | goto out_dump; | 1796 | goto out_dump; |
| 1791 | } | 1797 | } |
| 1792 | 1798 | ||
| @@ -1819,7 +1825,8 @@ static int check_leaf(struct ubifs_info *c, struct ubifs_zbranch *zbr, | |||
| 1819 | if (IS_ERR(fscki)) { | 1825 | if (IS_ERR(fscki)) { |
| 1820 | err = PTR_ERR(fscki); | 1826 | err = PTR_ERR(fscki); |
| 1821 | ubifs_err("error %d while processing entry node and " | 1827 | ubifs_err("error %d while processing entry node and " |
| 1822 | "trying to find inode node %lu", err, inum); | 1828 | "trying to find inode node %lu", |
| 1829 | err, (unsigned long)inum); | ||
| 1823 | goto out_dump; | 1830 | goto out_dump; |
| 1824 | } | 1831 | } |
| 1825 | 1832 | ||
| @@ -1832,7 +1839,7 @@ static int check_leaf(struct ubifs_info *c, struct ubifs_zbranch *zbr, | |||
| 1832 | err = PTR_ERR(fscki); | 1839 | err = PTR_ERR(fscki); |
| 1833 | ubifs_err("error %d while processing entry node and " | 1840 | ubifs_err("error %d while processing entry node and " |
| 1834 | "trying to find parent inode node %lu", | 1841 | "trying to find parent inode node %lu", |
| 1835 | err, inum); | 1842 | err, (unsigned long)inum); |
| 1836 | goto out_dump; | 1843 | goto out_dump; |
| 1837 | } | 1844 | } |
| 1838 | 1845 | ||
| @@ -1923,7 +1930,8 @@ static int check_inodes(struct ubifs_info *c, struct fsck_data *fsckd) | |||
| 1923 | fscki->references != 1) { | 1930 | fscki->references != 1) { |
| 1924 | ubifs_err("directory inode %lu has %d " | 1931 | ubifs_err("directory inode %lu has %d " |
| 1925 | "direntries which refer it, but " | 1932 | "direntries which refer it, but " |
| 1926 | "should be 1", fscki->inum, | 1933 | "should be 1", |
| 1934 | (unsigned long)fscki->inum, | ||
| 1927 | fscki->references); | 1935 | fscki->references); |
| 1928 | goto out_dump; | 1936 | goto out_dump; |
| 1929 | } | 1937 | } |
| @@ -1931,27 +1939,29 @@ static int check_inodes(struct ubifs_info *c, struct fsck_data *fsckd) | |||
| 1931 | fscki->references != 0) { | 1939 | fscki->references != 0) { |
| 1932 | ubifs_err("root inode %lu has non-zero (%d) " | 1940 | ubifs_err("root inode %lu has non-zero (%d) " |
| 1933 | "direntries which refer it", | 1941 | "direntries which refer it", |
| 1934 | fscki->inum, fscki->references); | 1942 | (unsigned long)fscki->inum, |
| 1943 | fscki->references); | ||
| 1935 | goto out_dump; | 1944 | goto out_dump; |
| 1936 | } | 1945 | } |
| 1937 | if (fscki->calc_sz != fscki->size) { | 1946 | if (fscki->calc_sz != fscki->size) { |
| 1938 | ubifs_err("directory inode %lu size is %lld, " | 1947 | ubifs_err("directory inode %lu size is %lld, " |
| 1939 | "but calculated size is %lld", | 1948 | "but calculated size is %lld", |
| 1940 | fscki->inum, fscki->size, | 1949 | (unsigned long)fscki->inum, |
| 1941 | fscki->calc_sz); | 1950 | fscki->size, fscki->calc_sz); |
| 1942 | goto out_dump; | 1951 | goto out_dump; |
| 1943 | } | 1952 | } |
| 1944 | if (fscki->calc_cnt != fscki->nlink) { | 1953 | if (fscki->calc_cnt != fscki->nlink) { |
| 1945 | ubifs_err("directory inode %lu nlink is %d, " | 1954 | ubifs_err("directory inode %lu nlink is %d, " |
| 1946 | "but calculated nlink is %d", | 1955 | "but calculated nlink is %d", |
| 1947 | fscki->inum, fscki->nlink, | 1956 | (unsigned long)fscki->inum, |
| 1948 | fscki->calc_cnt); | 1957 | fscki->nlink, fscki->calc_cnt); |
| 1949 | goto out_dump; | 1958 | goto out_dump; |
| 1950 | } | 1959 | } |
| 1951 | } else { | 1960 | } else { |
| 1952 | if (fscki->references != fscki->nlink) { | 1961 | if (fscki->references != fscki->nlink) { |
| 1953 | ubifs_err("inode %lu nlink is %d, but " | 1962 | ubifs_err("inode %lu nlink is %d, but " |
| 1954 | "calculated nlink is %d", fscki->inum, | 1963 | "calculated nlink is %d", |
| 1964 | (unsigned long)fscki->inum, | ||
| 1955 | fscki->nlink, fscki->references); | 1965 | fscki->nlink, fscki->references); |
| 1956 | goto out_dump; | 1966 | goto out_dump; |
| 1957 | } | 1967 | } |
| @@ -1959,20 +1969,21 @@ static int check_inodes(struct ubifs_info *c, struct fsck_data *fsckd) | |||
| 1959 | if (fscki->xattr_sz != fscki->calc_xsz) { | 1969 | if (fscki->xattr_sz != fscki->calc_xsz) { |
| 1960 | ubifs_err("inode %lu has xattr size %u, but " | 1970 | ubifs_err("inode %lu has xattr size %u, but " |
| 1961 | "calculated size is %lld", | 1971 | "calculated size is %lld", |
| 1962 | fscki->inum, fscki->xattr_sz, | 1972 | (unsigned long)fscki->inum, fscki->xattr_sz, |
| 1963 | fscki->calc_xsz); | 1973 | fscki->calc_xsz); |
| 1964 | goto out_dump; | 1974 | goto out_dump; |
| 1965 | } | 1975 | } |
| 1966 | if (fscki->xattr_cnt != fscki->calc_xcnt) { | 1976 | if (fscki->xattr_cnt != fscki->calc_xcnt) { |
| 1967 | ubifs_err("inode %lu has %u xattrs, but " | 1977 | ubifs_err("inode %lu has %u xattrs, but " |
| 1968 | "calculated count is %lld", fscki->inum, | 1978 | "calculated count is %lld", |
| 1979 | (unsigned long)fscki->inum, | ||
| 1969 | fscki->xattr_cnt, fscki->calc_xcnt); | 1980 | fscki->xattr_cnt, fscki->calc_xcnt); |
| 1970 | goto out_dump; | 1981 | goto out_dump; |
| 1971 | } | 1982 | } |
| 1972 | if (fscki->xattr_nms != fscki->calc_xnms) { | 1983 | if (fscki->xattr_nms != fscki->calc_xnms) { |
| 1973 | ubifs_err("inode %lu has xattr names' size %u, but " | 1984 | ubifs_err("inode %lu has xattr names' size %u, but " |
| 1974 | "calculated names' size is %lld", | 1985 | "calculated names' size is %lld", |
| 1975 | fscki->inum, fscki->xattr_nms, | 1986 | (unsigned long)fscki->inum, fscki->xattr_nms, |
| 1976 | fscki->calc_xnms); | 1987 | fscki->calc_xnms); |
| 1977 | goto out_dump; | 1988 | goto out_dump; |
| 1978 | } | 1989 | } |
| @@ -1985,11 +1996,12 @@ out_dump: | |||
| 1985 | ino_key_init(c, &key, fscki->inum); | 1996 | ino_key_init(c, &key, fscki->inum); |
| 1986 | err = ubifs_lookup_level0(c, &key, &znode, &n); | 1997 | err = ubifs_lookup_level0(c, &key, &znode, &n); |
| 1987 | if (!err) { | 1998 | if (!err) { |
| 1988 | ubifs_err("inode %lu not found in index", fscki->inum); | 1999 | ubifs_err("inode %lu not found in index", |
| 2000 | (unsigned long)fscki->inum); | ||
| 1989 | return -ENOENT; | 2001 | return -ENOENT; |
| 1990 | } else if (err < 0) { | 2002 | } else if (err < 0) { |
| 1991 | ubifs_err("error %d while looking up inode %lu", | 2003 | ubifs_err("error %d while looking up inode %lu", |
| 1992 | err, fscki->inum); | 2004 | err, (unsigned long)fscki->inum); |
| 1993 | return err; | 2005 | return err; |
| 1994 | } | 2006 | } |
| 1995 | 2007 | ||
| @@ -2007,7 +2019,7 @@ out_dump: | |||
| 2007 | } | 2019 | } |
| 2008 | 2020 | ||
| 2009 | ubifs_msg("dump of the inode %lu sitting in LEB %d:%d", | 2021 | ubifs_msg("dump of the inode %lu sitting in LEB %d:%d", |
| 2010 | fscki->inum, zbr->lnum, zbr->offs); | 2022 | (unsigned long)fscki->inum, zbr->lnum, zbr->offs); |
| 2011 | dbg_dump_node(c, ino); | 2023 | dbg_dump_node(c, ino); |
| 2012 | kfree(ino); | 2024 | kfree(ino); |
| 2013 | return -EINVAL; | 2025 | return -EINVAL; |
diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c index 526c01ec8003..0422c98e1793 100644 --- a/fs/ubifs/dir.c +++ b/fs/ubifs/dir.c | |||
| @@ -161,7 +161,7 @@ struct inode *ubifs_new_inode(struct ubifs_info *c, const struct inode *dir, | |||
| 161 | return ERR_PTR(-EINVAL); | 161 | return ERR_PTR(-EINVAL); |
| 162 | } | 162 | } |
| 163 | ubifs_warn("running out of inode numbers (current %lu, max %d)", | 163 | ubifs_warn("running out of inode numbers (current %lu, max %d)", |
| 164 | c->highest_inum, INUM_WATERMARK); | 164 | (unsigned long)c->highest_inum, INUM_WATERMARK); |
| 165 | } | 165 | } |
| 166 | 166 | ||
| 167 | inode->i_ino = ++c->highest_inum; | 167 | inode->i_ino = ++c->highest_inum; |
| @@ -428,7 +428,8 @@ static int ubifs_readdir(struct file *file, void *dirent, filldir_t filldir) | |||
| 428 | dbg_gen("feed '%s', ino %llu, new f_pos %#x", | 428 | dbg_gen("feed '%s', ino %llu, new f_pos %#x", |
| 429 | dent->name, (unsigned long long)le64_to_cpu(dent->inum), | 429 | dent->name, (unsigned long long)le64_to_cpu(dent->inum), |
| 430 | key_hash_flash(c, &dent->key)); | 430 | key_hash_flash(c, &dent->key)); |
| 431 | ubifs_assert(dent->ch.sqnum > ubifs_inode(dir)->creat_sqnum); | 431 | ubifs_assert(le64_to_cpu(dent->ch.sqnum) > |
| 432 | ubifs_inode(dir)->creat_sqnum); | ||
| 432 | 433 | ||
| 433 | nm.len = le16_to_cpu(dent->nlen); | 434 | nm.len = le16_to_cpu(dent->nlen); |
| 434 | over = filldir(dirent, dent->name, nm.len, file->f_pos, | 435 | over = filldir(dirent, dent->name, nm.len, file->f_pos, |
diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c index 51cf511d44d9..2624411d9758 100644 --- a/fs/ubifs/file.c +++ b/fs/ubifs/file.c | |||
| @@ -72,7 +72,7 @@ static int read_block(struct inode *inode, void *addr, unsigned int block, | |||
| 72 | return err; | 72 | return err; |
| 73 | } | 73 | } |
| 74 | 74 | ||
| 75 | ubifs_assert(dn->ch.sqnum > ubifs_inode(inode)->creat_sqnum); | 75 | ubifs_assert(le64_to_cpu(dn->ch.sqnum) > ubifs_inode(inode)->creat_sqnum); |
| 76 | 76 | ||
| 77 | len = le32_to_cpu(dn->size); | 77 | len = le32_to_cpu(dn->size); |
| 78 | if (len <= 0 || len > UBIFS_BLOCK_SIZE) | 78 | if (len <= 0 || len > UBIFS_BLOCK_SIZE) |
| @@ -626,7 +626,7 @@ static int populate_page(struct ubifs_info *c, struct page *page, | |||
| 626 | 626 | ||
| 627 | dn = bu->buf + (bu->zbranch[nn].offs - offs); | 627 | dn = bu->buf + (bu->zbranch[nn].offs - offs); |
| 628 | 628 | ||
| 629 | ubifs_assert(dn->ch.sqnum > | 629 | ubifs_assert(le64_to_cpu(dn->ch.sqnum) > |
| 630 | ubifs_inode(inode)->creat_sqnum); | 630 | ubifs_inode(inode)->creat_sqnum); |
| 631 | 631 | ||
| 632 | len = le32_to_cpu(dn->size); | 632 | len = le32_to_cpu(dn->size); |
| @@ -691,32 +691,22 @@ out_err: | |||
| 691 | /** | 691 | /** |
| 692 | * ubifs_do_bulk_read - do bulk-read. | 692 | * ubifs_do_bulk_read - do bulk-read. |
| 693 | * @c: UBIFS file-system description object | 693 | * @c: UBIFS file-system description object |
| 694 | * @page1: first page | 694 | * @bu: bulk-read information |
| 695 | * @page1: first page to read | ||
| 695 | * | 696 | * |
| 696 | * This function returns %1 if the bulk-read is done, otherwise %0 is returned. | 697 | * This function returns %1 if the bulk-read is done, otherwise %0 is returned. |
| 697 | */ | 698 | */ |
| 698 | static int ubifs_do_bulk_read(struct ubifs_info *c, struct page *page1) | 699 | static int ubifs_do_bulk_read(struct ubifs_info *c, struct bu_info *bu, |
| 700 | struct page *page1) | ||
| 699 | { | 701 | { |
| 700 | pgoff_t offset = page1->index, end_index; | 702 | pgoff_t offset = page1->index, end_index; |
| 701 | struct address_space *mapping = page1->mapping; | 703 | struct address_space *mapping = page1->mapping; |
| 702 | struct inode *inode = mapping->host; | 704 | struct inode *inode = mapping->host; |
| 703 | struct ubifs_inode *ui = ubifs_inode(inode); | 705 | struct ubifs_inode *ui = ubifs_inode(inode); |
| 704 | struct bu_info *bu; | ||
| 705 | int err, page_idx, page_cnt, ret = 0, n = 0; | 706 | int err, page_idx, page_cnt, ret = 0, n = 0; |
| 707 | int allocate = bu->buf ? 0 : 1; | ||
| 706 | loff_t isize; | 708 | loff_t isize; |
| 707 | 709 | ||
| 708 | bu = kmalloc(sizeof(struct bu_info), GFP_NOFS); | ||
| 709 | if (!bu) | ||
| 710 | return 0; | ||
| 711 | |||
| 712 | bu->buf_len = c->bulk_read_buf_size; | ||
| 713 | bu->buf = kmalloc(bu->buf_len, GFP_NOFS); | ||
| 714 | if (!bu->buf) | ||
| 715 | goto out_free; | ||
| 716 | |||
| 717 | data_key_init(c, &bu->key, inode->i_ino, | ||
| 718 | offset << UBIFS_BLOCKS_PER_PAGE_SHIFT); | ||
| 719 | |||
| 720 | err = ubifs_tnc_get_bu_keys(c, bu); | 710 | err = ubifs_tnc_get_bu_keys(c, bu); |
| 721 | if (err) | 711 | if (err) |
| 722 | goto out_warn; | 712 | goto out_warn; |
| @@ -735,12 +725,25 @@ static int ubifs_do_bulk_read(struct ubifs_info *c, struct page *page1) | |||
| 735 | * together. If all the pages were like this, bulk-read would | 725 | * together. If all the pages were like this, bulk-read would |
| 736 | * reduce performance, so we turn it off for a while. | 726 | * reduce performance, so we turn it off for a while. |
| 737 | */ | 727 | */ |
| 738 | ui->read_in_a_row = 0; | 728 | goto out_bu_off; |
| 739 | ui->bulk_read = 0; | ||
| 740 | goto out_free; | ||
| 741 | } | 729 | } |
| 742 | 730 | ||
| 743 | if (bu->cnt) { | 731 | if (bu->cnt) { |
| 732 | if (allocate) { | ||
| 733 | /* | ||
| 734 | * Allocate bulk-read buffer depending on how many data | ||
| 735 | * nodes we are going to read. | ||
| 736 | */ | ||
| 737 | bu->buf_len = bu->zbranch[bu->cnt - 1].offs + | ||
| 738 | bu->zbranch[bu->cnt - 1].len - | ||
| 739 | bu->zbranch[0].offs; | ||
| 740 | ubifs_assert(bu->buf_len > 0); | ||
| 741 | ubifs_assert(bu->buf_len <= c->leb_size); | ||
| 742 | bu->buf = kmalloc(bu->buf_len, GFP_NOFS | __GFP_NOWARN); | ||
| 743 | if (!bu->buf) | ||
| 744 | goto out_bu_off; | ||
| 745 | } | ||
| 746 | |||
| 744 | err = ubifs_tnc_bulk_read(c, bu); | 747 | err = ubifs_tnc_bulk_read(c, bu); |
| 745 | if (err) | 748 | if (err) |
| 746 | goto out_warn; | 749 | goto out_warn; |
| @@ -779,13 +782,17 @@ static int ubifs_do_bulk_read(struct ubifs_info *c, struct page *page1) | |||
| 779 | ui->last_page_read = offset + page_idx - 1; | 782 | ui->last_page_read = offset + page_idx - 1; |
| 780 | 783 | ||
| 781 | out_free: | 784 | out_free: |
| 782 | kfree(bu->buf); | 785 | if (allocate) |
| 783 | kfree(bu); | 786 | kfree(bu->buf); |
| 784 | return ret; | 787 | return ret; |
| 785 | 788 | ||
| 786 | out_warn: | 789 | out_warn: |
| 787 | ubifs_warn("ignoring error %d and skipping bulk-read", err); | 790 | ubifs_warn("ignoring error %d and skipping bulk-read", err); |
| 788 | goto out_free; | 791 | goto out_free; |
| 792 | |||
| 793 | out_bu_off: | ||
| 794 | ui->read_in_a_row = ui->bulk_read = 0; | ||
| 795 | goto out_free; | ||
| 789 | } | 796 | } |
| 790 | 797 | ||
| 791 | /** | 798 | /** |
| @@ -803,18 +810,20 @@ static int ubifs_bulk_read(struct page *page) | |||
| 803 | struct ubifs_info *c = inode->i_sb->s_fs_info; | 810 | struct ubifs_info *c = inode->i_sb->s_fs_info; |
| 804 | struct ubifs_inode *ui = ubifs_inode(inode); | 811 | struct ubifs_inode *ui = ubifs_inode(inode); |
| 805 | pgoff_t index = page->index, last_page_read = ui->last_page_read; | 812 | pgoff_t index = page->index, last_page_read = ui->last_page_read; |
| 806 | int ret = 0; | 813 | struct bu_info *bu; |
| 814 | int err = 0, allocated = 0; | ||
| 807 | 815 | ||
| 808 | ui->last_page_read = index; | 816 | ui->last_page_read = index; |
| 809 | |||
| 810 | if (!c->bulk_read) | 817 | if (!c->bulk_read) |
| 811 | return 0; | 818 | return 0; |
| 819 | |||
| 812 | /* | 820 | /* |
| 813 | * Bulk-read is protected by ui_mutex, but it is an optimization, so | 821 | * Bulk-read is protected by @ui->ui_mutex, but it is an optimization, |
| 814 | * don't bother if we cannot lock the mutex. | 822 | * so don't bother if we cannot lock the mutex. |
| 815 | */ | 823 | */ |
| 816 | if (!mutex_trylock(&ui->ui_mutex)) | 824 | if (!mutex_trylock(&ui->ui_mutex)) |
| 817 | return 0; | 825 | return 0; |
| 826 | |||
| 818 | if (index != last_page_read + 1) { | 827 | if (index != last_page_read + 1) { |
| 819 | /* Turn off bulk-read if we stop reading sequentially */ | 828 | /* Turn off bulk-read if we stop reading sequentially */ |
| 820 | ui->read_in_a_row = 1; | 829 | ui->read_in_a_row = 1; |
| @@ -822,6 +831,7 @@ static int ubifs_bulk_read(struct page *page) | |||
| 822 | ui->bulk_read = 0; | 831 | ui->bulk_read = 0; |
| 823 | goto out_unlock; | 832 | goto out_unlock; |
| 824 | } | 833 | } |
| 834 | |||
| 825 | if (!ui->bulk_read) { | 835 | if (!ui->bulk_read) { |
| 826 | ui->read_in_a_row += 1; | 836 | ui->read_in_a_row += 1; |
| 827 | if (ui->read_in_a_row < 3) | 837 | if (ui->read_in_a_row < 3) |
| @@ -829,10 +839,35 @@ static int ubifs_bulk_read(struct page *page) | |||
| 829 | /* Three reads in a row, so switch on bulk-read */ | 839 | /* Three reads in a row, so switch on bulk-read */ |
| 830 | ui->bulk_read = 1; | 840 | ui->bulk_read = 1; |
| 831 | } | 841 | } |
| 832 | ret = ubifs_do_bulk_read(c, page); | 842 | |
| 843 | /* | ||
| 844 | * If possible, try to use pre-allocated bulk-read information, which | ||
| 845 | * is protected by @c->bu_mutex. | ||
| 846 | */ | ||
| 847 | if (mutex_trylock(&c->bu_mutex)) | ||
| 848 | bu = &c->bu; | ||
| 849 | else { | ||
| 850 | bu = kmalloc(sizeof(struct bu_info), GFP_NOFS | __GFP_NOWARN); | ||
| 851 | if (!bu) | ||
| 852 | goto out_unlock; | ||
| 853 | |||
| 854 | bu->buf = NULL; | ||
| 855 | allocated = 1; | ||
| 856 | } | ||
| 857 | |||
| 858 | bu->buf_len = c->max_bu_buf_len; | ||
| 859 | data_key_init(c, &bu->key, inode->i_ino, | ||
| 860 | page->index << UBIFS_BLOCKS_PER_PAGE_SHIFT); | ||
| 861 | err = ubifs_do_bulk_read(c, bu, page); | ||
| 862 | |||
| 863 | if (!allocated) | ||
| 864 | mutex_unlock(&c->bu_mutex); | ||
| 865 | else | ||
| 866 | kfree(bu); | ||
| 867 | |||
| 833 | out_unlock: | 868 | out_unlock: |
| 834 | mutex_unlock(&ui->ui_mutex); | 869 | mutex_unlock(&ui->ui_mutex); |
| 835 | return ret; | 870 | return err; |
| 836 | } | 871 | } |
| 837 | 872 | ||
| 838 | static int ubifs_readpage(struct file *file, struct page *page) | 873 | static int ubifs_readpage(struct file *file, struct page *page) |
diff --git a/fs/ubifs/journal.c b/fs/ubifs/journal.c index 22993f867d19..f91b745908ea 100644 --- a/fs/ubifs/journal.c +++ b/fs/ubifs/journal.c | |||
| @@ -690,8 +690,9 @@ int ubifs_jnl_write_data(struct ubifs_info *c, const struct inode *inode, | |||
| 690 | int dlen = UBIFS_DATA_NODE_SZ + UBIFS_BLOCK_SIZE * WORST_COMPR_FACTOR; | 690 | int dlen = UBIFS_DATA_NODE_SZ + UBIFS_BLOCK_SIZE * WORST_COMPR_FACTOR; |
| 691 | struct ubifs_inode *ui = ubifs_inode(inode); | 691 | struct ubifs_inode *ui = ubifs_inode(inode); |
| 692 | 692 | ||
| 693 | dbg_jnl("ino %lu, blk %u, len %d, key %s", key_inum(c, key), | 693 | dbg_jnl("ino %lu, blk %u, len %d, key %s", |
| 694 | key_block(c, key), len, DBGKEY(key)); | 694 | (unsigned long)key_inum(c, key), key_block(c, key), len, |
| 695 | DBGKEY(key)); | ||
| 695 | ubifs_assert(len <= UBIFS_BLOCK_SIZE); | 696 | ubifs_assert(len <= UBIFS_BLOCK_SIZE); |
| 696 | 697 | ||
| 697 | data = kmalloc(dlen, GFP_NOFS); | 698 | data = kmalloc(dlen, GFP_NOFS); |
| @@ -1128,7 +1129,8 @@ int ubifs_jnl_truncate(struct ubifs_info *c, const struct inode *inode, | |||
| 1128 | ino_t inum = inode->i_ino; | 1129 | ino_t inum = inode->i_ino; |
| 1129 | unsigned int blk; | 1130 | unsigned int blk; |
| 1130 | 1131 | ||
| 1131 | dbg_jnl("ino %lu, size %lld -> %lld", inum, old_size, new_size); | 1132 | dbg_jnl("ino %lu, size %lld -> %lld", |
| 1133 | (unsigned long)inum, old_size, new_size); | ||
| 1132 | ubifs_assert(!ui->data_len); | 1134 | ubifs_assert(!ui->data_len); |
| 1133 | ubifs_assert(S_ISREG(inode->i_mode)); | 1135 | ubifs_assert(S_ISREG(inode->i_mode)); |
| 1134 | ubifs_assert(mutex_is_locked(&ui->ui_mutex)); | 1136 | ubifs_assert(mutex_is_locked(&ui->ui_mutex)); |
diff --git a/fs/ubifs/key.h b/fs/ubifs/key.h index 9ee65086f627..3f1f16bc25c9 100644 --- a/fs/ubifs/key.h +++ b/fs/ubifs/key.h | |||
| @@ -345,7 +345,7 @@ static inline int key_type_flash(const struct ubifs_info *c, const void *k) | |||
| 345 | { | 345 | { |
| 346 | const union ubifs_key *key = k; | 346 | const union ubifs_key *key = k; |
| 347 | 347 | ||
| 348 | return le32_to_cpu(key->u32[1]) >> UBIFS_S_KEY_BLOCK_BITS; | 348 | return le32_to_cpu(key->j32[1]) >> UBIFS_S_KEY_BLOCK_BITS; |
| 349 | } | 349 | } |
| 350 | 350 | ||
| 351 | /** | 351 | /** |
| @@ -416,7 +416,7 @@ static inline unsigned int key_block_flash(const struct ubifs_info *c, | |||
| 416 | { | 416 | { |
| 417 | const union ubifs_key *key = k; | 417 | const union ubifs_key *key = k; |
| 418 | 418 | ||
| 419 | return le32_to_cpu(key->u32[1]) & UBIFS_S_KEY_BLOCK_MASK; | 419 | return le32_to_cpu(key->j32[1]) & UBIFS_S_KEY_BLOCK_MASK; |
| 420 | } | 420 | } |
| 421 | 421 | ||
| 422 | /** | 422 | /** |
diff --git a/fs/ubifs/lpt_commit.c b/fs/ubifs/lpt_commit.c index eed5a0025d63..a41434b42785 100644 --- a/fs/ubifs/lpt_commit.c +++ b/fs/ubifs/lpt_commit.c | |||
| @@ -571,8 +571,6 @@ static struct ubifs_pnode *next_pnode(struct ubifs_info *c, | |||
| 571 | /* We assume here that LEB zero is never an LPT LEB */ | 571 | /* We assume here that LEB zero is never an LPT LEB */ |
| 572 | if (nnode->nbranch[iip].lnum) | 572 | if (nnode->nbranch[iip].lnum) |
| 573 | return ubifs_get_pnode(c, nnode, iip); | 573 | return ubifs_get_pnode(c, nnode, iip); |
| 574 | else | ||
| 575 | return NULL; | ||
| 576 | } | 574 | } |
| 577 | 575 | ||
| 578 | /* Go up while can't go right */ | 576 | /* Go up while can't go right */ |
diff --git a/fs/ubifs/orphan.c b/fs/ubifs/orphan.c index 02d3462f4d3e..9bd5a43d4526 100644 --- a/fs/ubifs/orphan.c +++ b/fs/ubifs/orphan.c | |||
| @@ -105,7 +105,7 @@ int ubifs_add_orphan(struct ubifs_info *c, ino_t inum) | |||
| 105 | list_add_tail(&orphan->list, &c->orph_list); | 105 | list_add_tail(&orphan->list, &c->orph_list); |
| 106 | list_add_tail(&orphan->new_list, &c->orph_new); | 106 | list_add_tail(&orphan->new_list, &c->orph_new); |
| 107 | spin_unlock(&c->orphan_lock); | 107 | spin_unlock(&c->orphan_lock); |
| 108 | dbg_gen("ino %lu", inum); | 108 | dbg_gen("ino %lu", (unsigned long)inum); |
| 109 | return 0; | 109 | return 0; |
| 110 | } | 110 | } |
| 111 | 111 | ||
| @@ -132,14 +132,16 @@ void ubifs_delete_orphan(struct ubifs_info *c, ino_t inum) | |||
| 132 | else { | 132 | else { |
| 133 | if (o->dnext) { | 133 | if (o->dnext) { |
| 134 | spin_unlock(&c->orphan_lock); | 134 | spin_unlock(&c->orphan_lock); |
| 135 | dbg_gen("deleted twice ino %lu", inum); | 135 | dbg_gen("deleted twice ino %lu", |
| 136 | (unsigned long)inum); | ||
| 136 | return; | 137 | return; |
| 137 | } | 138 | } |
| 138 | if (o->cnext) { | 139 | if (o->cnext) { |
| 139 | o->dnext = c->orph_dnext; | 140 | o->dnext = c->orph_dnext; |
| 140 | c->orph_dnext = o; | 141 | c->orph_dnext = o; |
| 141 | spin_unlock(&c->orphan_lock); | 142 | spin_unlock(&c->orphan_lock); |
| 142 | dbg_gen("delete later ino %lu", inum); | 143 | dbg_gen("delete later ino %lu", |
| 144 | (unsigned long)inum); | ||
| 143 | return; | 145 | return; |
| 144 | } | 146 | } |
| 145 | rb_erase(p, &c->orph_tree); | 147 | rb_erase(p, &c->orph_tree); |
| @@ -151,12 +153,12 @@ void ubifs_delete_orphan(struct ubifs_info *c, ino_t inum) | |||
| 151 | } | 153 | } |
| 152 | spin_unlock(&c->orphan_lock); | 154 | spin_unlock(&c->orphan_lock); |
| 153 | kfree(o); | 155 | kfree(o); |
| 154 | dbg_gen("inum %lu", inum); | 156 | dbg_gen("inum %lu", (unsigned long)inum); |
| 155 | return; | 157 | return; |
| 156 | } | 158 | } |
| 157 | } | 159 | } |
| 158 | spin_unlock(&c->orphan_lock); | 160 | spin_unlock(&c->orphan_lock); |
| 159 | dbg_err("missing orphan ino %lu", inum); | 161 | dbg_err("missing orphan ino %lu", (unsigned long)inum); |
| 160 | dbg_dump_stack(); | 162 | dbg_dump_stack(); |
| 161 | } | 163 | } |
| 162 | 164 | ||
| @@ -448,7 +450,7 @@ static void erase_deleted(struct ubifs_info *c) | |||
| 448 | rb_erase(&orphan->rb, &c->orph_tree); | 450 | rb_erase(&orphan->rb, &c->orph_tree); |
| 449 | list_del(&orphan->list); | 451 | list_del(&orphan->list); |
| 450 | c->tot_orphans -= 1; | 452 | c->tot_orphans -= 1; |
| 451 | dbg_gen("deleting orphan ino %lu", orphan->inum); | 453 | dbg_gen("deleting orphan ino %lu", (unsigned long)orphan->inum); |
| 452 | kfree(orphan); | 454 | kfree(orphan); |
| 453 | } | 455 | } |
| 454 | c->orph_dnext = NULL; | 456 | c->orph_dnext = NULL; |
| @@ -536,8 +538,8 @@ static int insert_dead_orphan(struct ubifs_info *c, ino_t inum) | |||
| 536 | list_add_tail(&orphan->list, &c->orph_list); | 538 | list_add_tail(&orphan->list, &c->orph_list); |
| 537 | orphan->dnext = c->orph_dnext; | 539 | orphan->dnext = c->orph_dnext; |
| 538 | c->orph_dnext = orphan; | 540 | c->orph_dnext = orphan; |
| 539 | dbg_mnt("ino %lu, new %d, tot %d", | 541 | dbg_mnt("ino %lu, new %d, tot %d", (unsigned long)inum, |
| 540 | inum, c->new_orphans, c->tot_orphans); | 542 | c->new_orphans, c->tot_orphans); |
| 541 | return 0; | 543 | return 0; |
| 542 | } | 544 | } |
| 543 | 545 | ||
| @@ -609,7 +611,8 @@ static int do_kill_orphans(struct ubifs_info *c, struct ubifs_scan_leb *sleb, | |||
| 609 | n = (le32_to_cpu(orph->ch.len) - UBIFS_ORPH_NODE_SZ) >> 3; | 611 | n = (le32_to_cpu(orph->ch.len) - UBIFS_ORPH_NODE_SZ) >> 3; |
| 610 | for (i = 0; i < n; i++) { | 612 | for (i = 0; i < n; i++) { |
| 611 | inum = le64_to_cpu(orph->inos[i]); | 613 | inum = le64_to_cpu(orph->inos[i]); |
| 612 | dbg_rcvry("deleting orphaned inode %lu", inum); | 614 | dbg_rcvry("deleting orphaned inode %lu", |
| 615 | (unsigned long)inum); | ||
| 613 | err = ubifs_tnc_remove_ino(c, inum); | 616 | err = ubifs_tnc_remove_ino(c, inum); |
| 614 | if (err) | 617 | if (err) |
| 615 | return err; | 618 | return err; |
| @@ -840,8 +843,8 @@ static int dbg_orphan_check(struct ubifs_info *c, struct ubifs_zbranch *zbr, | |||
| 840 | if (inum != ci->last_ino) { | 843 | if (inum != ci->last_ino) { |
| 841 | /* Lowest node type is the inode node, so it comes first */ | 844 | /* Lowest node type is the inode node, so it comes first */ |
| 842 | if (key_type(c, &zbr->key) != UBIFS_INO_KEY) | 845 | if (key_type(c, &zbr->key) != UBIFS_INO_KEY) |
| 843 | ubifs_err("found orphan node ino %lu, type %d", inum, | 846 | ubifs_err("found orphan node ino %lu, type %d", |
| 844 | key_type(c, &zbr->key)); | 847 | (unsigned long)inum, key_type(c, &zbr->key)); |
| 845 | ci->last_ino = inum; | 848 | ci->last_ino = inum; |
| 846 | ci->tot_inos += 1; | 849 | ci->tot_inos += 1; |
| 847 | err = ubifs_tnc_read_node(c, zbr, ci->node); | 850 | err = ubifs_tnc_read_node(c, zbr, ci->node); |
| @@ -853,7 +856,8 @@ static int dbg_orphan_check(struct ubifs_info *c, struct ubifs_zbranch *zbr, | |||
| 853 | /* Must be recorded as an orphan */ | 856 | /* Must be recorded as an orphan */ |
| 854 | if (!dbg_find_check_orphan(&ci->root, inum) && | 857 | if (!dbg_find_check_orphan(&ci->root, inum) && |
| 855 | !dbg_find_orphan(c, inum)) { | 858 | !dbg_find_orphan(c, inum)) { |
| 856 | ubifs_err("missing orphan, ino %lu", inum); | 859 | ubifs_err("missing orphan, ino %lu", |
| 860 | (unsigned long)inum); | ||
| 857 | ci->missing += 1; | 861 | ci->missing += 1; |
| 858 | } | 862 | } |
| 859 | } | 863 | } |
diff --git a/fs/ubifs/recovery.c b/fs/ubifs/recovery.c index 77d26c141cf6..90acac603e63 100644 --- a/fs/ubifs/recovery.c +++ b/fs/ubifs/recovery.c | |||
| @@ -168,12 +168,12 @@ static int write_rcvrd_mst_node(struct ubifs_info *c, | |||
| 168 | struct ubifs_mst_node *mst) | 168 | struct ubifs_mst_node *mst) |
| 169 | { | 169 | { |
| 170 | int err = 0, lnum = UBIFS_MST_LNUM, sz = c->mst_node_alsz; | 170 | int err = 0, lnum = UBIFS_MST_LNUM, sz = c->mst_node_alsz; |
| 171 | uint32_t save_flags; | 171 | __le32 save_flags; |
| 172 | 172 | ||
| 173 | dbg_rcvry("recovery"); | 173 | dbg_rcvry("recovery"); |
| 174 | 174 | ||
| 175 | save_flags = mst->flags; | 175 | save_flags = mst->flags; |
| 176 | mst->flags = cpu_to_le32(le32_to_cpu(mst->flags) | UBIFS_MST_RCVRY); | 176 | mst->flags |= cpu_to_le32(UBIFS_MST_RCVRY); |
| 177 | 177 | ||
| 178 | ubifs_prepare_node(c, mst, UBIFS_MST_NODE_SZ, 1); | 178 | ubifs_prepare_node(c, mst, UBIFS_MST_NODE_SZ, 1); |
| 179 | err = ubi_leb_change(c->ubi, lnum, mst, sz, UBI_SHORTTERM); | 179 | err = ubi_leb_change(c->ubi, lnum, mst, sz, UBI_SHORTTERM); |
| @@ -1435,13 +1435,13 @@ static int fix_size_in_place(struct ubifs_info *c, struct size_entry *e) | |||
| 1435 | err = ubi_leb_change(c->ubi, lnum, c->sbuf, len, UBI_UNKNOWN); | 1435 | err = ubi_leb_change(c->ubi, lnum, c->sbuf, len, UBI_UNKNOWN); |
| 1436 | if (err) | 1436 | if (err) |
| 1437 | goto out; | 1437 | goto out; |
| 1438 | dbg_rcvry("inode %lu at %d:%d size %lld -> %lld ", e->inum, lnum, offs, | 1438 | dbg_rcvry("inode %lu at %d:%d size %lld -> %lld ", |
| 1439 | i_size, e->d_size); | 1439 | (unsigned long)e->inum, lnum, offs, i_size, e->d_size); |
| 1440 | return 0; | 1440 | return 0; |
| 1441 | 1441 | ||
| 1442 | out: | 1442 | out: |
| 1443 | ubifs_warn("inode %lu failed to fix size %lld -> %lld error %d", | 1443 | ubifs_warn("inode %lu failed to fix size %lld -> %lld error %d", |
| 1444 | e->inum, e->i_size, e->d_size, err); | 1444 | (unsigned long)e->inum, e->i_size, e->d_size, err); |
| 1445 | return err; | 1445 | return err; |
| 1446 | } | 1446 | } |
| 1447 | 1447 | ||
| @@ -1472,7 +1472,8 @@ int ubifs_recover_size(struct ubifs_info *c) | |||
| 1472 | return err; | 1472 | return err; |
| 1473 | if (err == -ENOENT) { | 1473 | if (err == -ENOENT) { |
| 1474 | /* Remove data nodes that have no inode */ | 1474 | /* Remove data nodes that have no inode */ |
| 1475 | dbg_rcvry("removing ino %lu", e->inum); | 1475 | dbg_rcvry("removing ino %lu", |
| 1476 | (unsigned long)e->inum); | ||
| 1476 | err = ubifs_tnc_remove_ino(c, e->inum); | 1477 | err = ubifs_tnc_remove_ino(c, e->inum); |
| 1477 | if (err) | 1478 | if (err) |
| 1478 | return err; | 1479 | return err; |
| @@ -1493,8 +1494,8 @@ int ubifs_recover_size(struct ubifs_info *c) | |||
| 1493 | return PTR_ERR(inode); | 1494 | return PTR_ERR(inode); |
| 1494 | if (inode->i_size < e->d_size) { | 1495 | if (inode->i_size < e->d_size) { |
| 1495 | dbg_rcvry("ino %lu size %lld -> %lld", | 1496 | dbg_rcvry("ino %lu size %lld -> %lld", |
| 1496 | e->inum, e->d_size, | 1497 | (unsigned long)e->inum, |
| 1497 | inode->i_size); | 1498 | e->d_size, inode->i_size); |
| 1498 | inode->i_size = e->d_size; | 1499 | inode->i_size = e->d_size; |
| 1499 | ubifs_inode(inode)->ui_size = e->d_size; | 1500 | ubifs_inode(inode)->ui_size = e->d_size; |
| 1500 | e->inode = inode; | 1501 | e->inode = inode; |
diff --git a/fs/ubifs/replay.c b/fs/ubifs/replay.c index 7399692af859..21f7d047c306 100644 --- a/fs/ubifs/replay.c +++ b/fs/ubifs/replay.c | |||
| @@ -1065,7 +1065,7 @@ int ubifs_replay_journal(struct ubifs_info *c) | |||
| 1065 | ubifs_assert(c->bud_bytes <= c->max_bud_bytes || c->need_recovery); | 1065 | ubifs_assert(c->bud_bytes <= c->max_bud_bytes || c->need_recovery); |
| 1066 | dbg_mnt("finished, log head LEB %d:%d, max_sqnum %llu, " | 1066 | dbg_mnt("finished, log head LEB %d:%d, max_sqnum %llu, " |
| 1067 | "highest_inum %lu", c->lhead_lnum, c->lhead_offs, c->max_sqnum, | 1067 | "highest_inum %lu", c->lhead_lnum, c->lhead_offs, c->max_sqnum, |
| 1068 | c->highest_inum); | 1068 | (unsigned long)c->highest_inum); |
| 1069 | out: | 1069 | out: |
| 1070 | destroy_replay_tree(c); | 1070 | destroy_replay_tree(c); |
| 1071 | destroy_bud_list(c); | 1071 | destroy_bud_list(c); |
diff --git a/fs/ubifs/sb.c b/fs/ubifs/sb.c index 2bf753b38889..0f392351dc5a 100644 --- a/fs/ubifs/sb.c +++ b/fs/ubifs/sb.c | |||
| @@ -81,6 +81,7 @@ static int create_default_filesystem(struct ubifs_info *c) | |||
| 81 | int lpt_lebs, lpt_first, orph_lebs, big_lpt, ino_waste, sup_flags = 0; | 81 | int lpt_lebs, lpt_first, orph_lebs, big_lpt, ino_waste, sup_flags = 0; |
| 82 | int min_leb_cnt = UBIFS_MIN_LEB_CNT; | 82 | int min_leb_cnt = UBIFS_MIN_LEB_CNT; |
| 83 | uint64_t tmp64, main_bytes; | 83 | uint64_t tmp64, main_bytes; |
| 84 | __le64 tmp_le64; | ||
| 84 | 85 | ||
| 85 | /* Some functions called from here depend on the @c->key_len filed */ | 86 | /* Some functions called from here depend on the @c->key_len filed */ |
| 86 | c->key_len = UBIFS_SK_LEN; | 87 | c->key_len = UBIFS_SK_LEN; |
| @@ -295,10 +296,10 @@ static int create_default_filesystem(struct ubifs_info *c) | |||
| 295 | ino->ch.node_type = UBIFS_INO_NODE; | 296 | ino->ch.node_type = UBIFS_INO_NODE; |
| 296 | ino->creat_sqnum = cpu_to_le64(++c->max_sqnum); | 297 | ino->creat_sqnum = cpu_to_le64(++c->max_sqnum); |
| 297 | ino->nlink = cpu_to_le32(2); | 298 | ino->nlink = cpu_to_le32(2); |
| 298 | tmp = cpu_to_le64(CURRENT_TIME_SEC.tv_sec); | 299 | tmp_le64 = cpu_to_le64(CURRENT_TIME_SEC.tv_sec); |
| 299 | ino->atime_sec = tmp; | 300 | ino->atime_sec = tmp_le64; |
| 300 | ino->ctime_sec = tmp; | 301 | ino->ctime_sec = tmp_le64; |
| 301 | ino->mtime_sec = tmp; | 302 | ino->mtime_sec = tmp_le64; |
| 302 | ino->atime_nsec = 0; | 303 | ino->atime_nsec = 0; |
| 303 | ino->ctime_nsec = 0; | 304 | ino->ctime_nsec = 0; |
| 304 | ino->mtime_nsec = 0; | 305 | ino->mtime_nsec = 0; |
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c index 8780efbf40ac..d80b2aef42b6 100644 --- a/fs/ubifs/super.c +++ b/fs/ubifs/super.c | |||
| @@ -36,6 +36,12 @@ | |||
| 36 | #include <linux/mount.h> | 36 | #include <linux/mount.h> |
| 37 | #include "ubifs.h" | 37 | #include "ubifs.h" |
| 38 | 38 | ||
| 39 | /* | ||
| 40 | * Maximum amount of memory we may 'kmalloc()' without worrying that we are | ||
| 41 | * allocating too much. | ||
| 42 | */ | ||
| 43 | #define UBIFS_KMALLOC_OK (128*1024) | ||
| 44 | |||
| 39 | /* Slab cache for UBIFS inodes */ | 45 | /* Slab cache for UBIFS inodes */ |
| 40 | struct kmem_cache *ubifs_inode_slab; | 46 | struct kmem_cache *ubifs_inode_slab; |
| 41 | 47 | ||
| @@ -561,18 +567,11 @@ static int init_constants_early(struct ubifs_info *c) | |||
| 561 | * calculations when reporting free space. | 567 | * calculations when reporting free space. |
| 562 | */ | 568 | */ |
| 563 | c->leb_overhead = c->leb_size % UBIFS_MAX_DATA_NODE_SZ; | 569 | c->leb_overhead = c->leb_size % UBIFS_MAX_DATA_NODE_SZ; |
| 564 | /* Buffer size for bulk-reads */ | ||
| 565 | c->bulk_read_buf_size = UBIFS_MAX_BULK_READ * UBIFS_MAX_DATA_NODE_SZ; | ||
| 566 | if (c->bulk_read_buf_size > c->leb_size) | ||
| 567 | c->bulk_read_buf_size = c->leb_size; | ||
| 568 | if (c->bulk_read_buf_size > 128 * 1024) { | ||
| 569 | /* Check if we can kmalloc more than 128KiB */ | ||
| 570 | void *try = kmalloc(c->bulk_read_buf_size, GFP_KERNEL); | ||
| 571 | 570 | ||
| 572 | kfree(try); | 571 | /* Buffer size for bulk-reads */ |
| 573 | if (!try) | 572 | c->max_bu_buf_len = UBIFS_MAX_BULK_READ * UBIFS_MAX_DATA_NODE_SZ; |
| 574 | c->bulk_read_buf_size = 128 * 1024; | 573 | if (c->max_bu_buf_len > c->leb_size) |
| 575 | } | 574 | c->max_bu_buf_len = c->leb_size; |
| 576 | return 0; | 575 | return 0; |
| 577 | } | 576 | } |
| 578 | 577 | ||
| @@ -992,6 +991,34 @@ static void destroy_journal(struct ubifs_info *c) | |||
| 992 | } | 991 | } |
| 993 | 992 | ||
| 994 | /** | 993 | /** |
| 994 | * bu_init - initialize bulk-read information. | ||
| 995 | * @c: UBIFS file-system description object | ||
| 996 | */ | ||
| 997 | static void bu_init(struct ubifs_info *c) | ||
| 998 | { | ||
| 999 | ubifs_assert(c->bulk_read == 1); | ||
| 1000 | |||
| 1001 | if (c->bu.buf) | ||
| 1002 | return; /* Already initialized */ | ||
| 1003 | |||
| 1004 | again: | ||
| 1005 | c->bu.buf = kmalloc(c->max_bu_buf_len, GFP_KERNEL | __GFP_NOWARN); | ||
| 1006 | if (!c->bu.buf) { | ||
| 1007 | if (c->max_bu_buf_len > UBIFS_KMALLOC_OK) { | ||
| 1008 | c->max_bu_buf_len = UBIFS_KMALLOC_OK; | ||
| 1009 | goto again; | ||
| 1010 | } | ||
| 1011 | |||
| 1012 | /* Just disable bulk-read */ | ||
| 1013 | ubifs_warn("Cannot allocate %d bytes of memory for bulk-read, " | ||
| 1014 | "disabling it", c->max_bu_buf_len); | ||
| 1015 | c->mount_opts.bulk_read = 1; | ||
| 1016 | c->bulk_read = 0; | ||
| 1017 | return; | ||
| 1018 | } | ||
| 1019 | } | ||
| 1020 | |||
| 1021 | /** | ||
| 995 | * mount_ubifs - mount UBIFS file-system. | 1022 | * mount_ubifs - mount UBIFS file-system. |
| 996 | * @c: UBIFS file-system description object | 1023 | * @c: UBIFS file-system description object |
| 997 | * | 1024 | * |
| @@ -1059,6 +1086,13 @@ static int mount_ubifs(struct ubifs_info *c) | |||
| 1059 | goto out_free; | 1086 | goto out_free; |
| 1060 | } | 1087 | } |
| 1061 | 1088 | ||
| 1089 | if (c->bulk_read == 1) | ||
| 1090 | bu_init(c); | ||
| 1091 | |||
| 1092 | /* | ||
| 1093 | * We have to check all CRCs, even for data nodes, when we mount the FS | ||
| 1094 | * (specifically, when we are replaying). | ||
| 1095 | */ | ||
| 1062 | c->always_chk_crc = 1; | 1096 | c->always_chk_crc = 1; |
| 1063 | 1097 | ||
| 1064 | err = ubifs_read_superblock(c); | 1098 | err = ubifs_read_superblock(c); |
| @@ -1289,6 +1323,7 @@ out_cbuf: | |||
| 1289 | out_dereg: | 1323 | out_dereg: |
| 1290 | dbg_failure_mode_deregistration(c); | 1324 | dbg_failure_mode_deregistration(c); |
| 1291 | out_free: | 1325 | out_free: |
| 1326 | kfree(c->bu.buf); | ||
| 1292 | vfree(c->ileb_buf); | 1327 | vfree(c->ileb_buf); |
| 1293 | vfree(c->sbuf); | 1328 | vfree(c->sbuf); |
| 1294 | kfree(c->bottom_up_buf); | 1329 | kfree(c->bottom_up_buf); |
| @@ -1325,10 +1360,11 @@ static void ubifs_umount(struct ubifs_info *c) | |||
| 1325 | kfree(c->cbuf); | 1360 | kfree(c->cbuf); |
| 1326 | kfree(c->rcvrd_mst_node); | 1361 | kfree(c->rcvrd_mst_node); |
| 1327 | kfree(c->mst_node); | 1362 | kfree(c->mst_node); |
| 1363 | kfree(c->bu.buf); | ||
| 1364 | vfree(c->ileb_buf); | ||
| 1328 | vfree(c->sbuf); | 1365 | vfree(c->sbuf); |
| 1329 | kfree(c->bottom_up_buf); | 1366 | kfree(c->bottom_up_buf); |
| 1330 | UBIFS_DBG(vfree(c->dbg_buf)); | 1367 | UBIFS_DBG(vfree(c->dbg_buf)); |
| 1331 | vfree(c->ileb_buf); | ||
| 1332 | dbg_failure_mode_deregistration(c); | 1368 | dbg_failure_mode_deregistration(c); |
| 1333 | } | 1369 | } |
| 1334 | 1370 | ||
| @@ -1626,6 +1662,7 @@ static int ubifs_remount_fs(struct super_block *sb, int *flags, char *data) | |||
| 1626 | ubifs_err("invalid or unknown remount parameter"); | 1662 | ubifs_err("invalid or unknown remount parameter"); |
| 1627 | return err; | 1663 | return err; |
| 1628 | } | 1664 | } |
| 1665 | |||
| 1629 | if ((sb->s_flags & MS_RDONLY) && !(*flags & MS_RDONLY)) { | 1666 | if ((sb->s_flags & MS_RDONLY) && !(*flags & MS_RDONLY)) { |
| 1630 | err = ubifs_remount_rw(c); | 1667 | err = ubifs_remount_rw(c); |
| 1631 | if (err) | 1668 | if (err) |
| @@ -1633,6 +1670,14 @@ static int ubifs_remount_fs(struct super_block *sb, int *flags, char *data) | |||
| 1633 | } else if (!(sb->s_flags & MS_RDONLY) && (*flags & MS_RDONLY)) | 1670 | } else if (!(sb->s_flags & MS_RDONLY) && (*flags & MS_RDONLY)) |
| 1634 | ubifs_remount_ro(c); | 1671 | ubifs_remount_ro(c); |
| 1635 | 1672 | ||
| 1673 | if (c->bulk_read == 1) | ||
| 1674 | bu_init(c); | ||
| 1675 | else { | ||
| 1676 | dbg_gen("disable bulk-read"); | ||
| 1677 | kfree(c->bu.buf); | ||
| 1678 | c->bu.buf = NULL; | ||
| 1679 | } | ||
| 1680 | |||
| 1636 | return 0; | 1681 | return 0; |
| 1637 | } | 1682 | } |
| 1638 | 1683 | ||
| @@ -1723,6 +1768,7 @@ static int ubifs_fill_super(struct super_block *sb, void *data, int silent) | |||
| 1723 | mutex_init(&c->log_mutex); | 1768 | mutex_init(&c->log_mutex); |
| 1724 | mutex_init(&c->mst_mutex); | 1769 | mutex_init(&c->mst_mutex); |
| 1725 | mutex_init(&c->umount_mutex); | 1770 | mutex_init(&c->umount_mutex); |
| 1771 | mutex_init(&c->bu_mutex); | ||
| 1726 | init_waitqueue_head(&c->cmt_wq); | 1772 | init_waitqueue_head(&c->cmt_wq); |
| 1727 | c->buds = RB_ROOT; | 1773 | c->buds = RB_ROOT; |
| 1728 | c->old_idx = RB_ROOT; | 1774 | c->old_idx = RB_ROOT; |
diff --git a/fs/ubifs/tnc.c b/fs/ubifs/tnc.c index d27fd918b9c9..6eef5344a145 100644 --- a/fs/ubifs/tnc.c +++ b/fs/ubifs/tnc.c | |||
| @@ -1501,7 +1501,12 @@ out: | |||
| 1501 | * @bu: bulk-read parameters and results | 1501 | * @bu: bulk-read parameters and results |
| 1502 | * | 1502 | * |
| 1503 | * Lookup consecutive data node keys for the same inode that reside | 1503 | * Lookup consecutive data node keys for the same inode that reside |
| 1504 | * consecutively in the same LEB. | 1504 | * consecutively in the same LEB. This function returns zero in case of success |
| 1505 | * and a negative error code in case of failure. | ||
| 1506 | * | ||
| 1507 | * Note, if the bulk-read buffer length (@bu->buf_len) is known, this function | ||
| 1508 | * makes sure bulk-read nodes fit the buffer. Otherwise, this function prepares | ||
| 1509 | * maxumum possible amount of nodes for bulk-read. | ||
| 1505 | */ | 1510 | */ |
| 1506 | int ubifs_tnc_get_bu_keys(struct ubifs_info *c, struct bu_info *bu) | 1511 | int ubifs_tnc_get_bu_keys(struct ubifs_info *c, struct bu_info *bu) |
| 1507 | { | 1512 | { |
| @@ -2677,7 +2682,7 @@ int ubifs_tnc_remove_ino(struct ubifs_info *c, ino_t inum) | |||
| 2677 | struct ubifs_dent_node *xent, *pxent = NULL; | 2682 | struct ubifs_dent_node *xent, *pxent = NULL; |
| 2678 | struct qstr nm = { .name = NULL }; | 2683 | struct qstr nm = { .name = NULL }; |
| 2679 | 2684 | ||
| 2680 | dbg_tnc("ino %lu", inum); | 2685 | dbg_tnc("ino %lu", (unsigned long)inum); |
| 2681 | 2686 | ||
| 2682 | /* | 2687 | /* |
| 2683 | * Walk all extended attribute entries and remove them together with | 2688 | * Walk all extended attribute entries and remove them together with |
| @@ -2697,7 +2702,8 @@ int ubifs_tnc_remove_ino(struct ubifs_info *c, ino_t inum) | |||
| 2697 | } | 2702 | } |
| 2698 | 2703 | ||
| 2699 | xattr_inum = le64_to_cpu(xent->inum); | 2704 | xattr_inum = le64_to_cpu(xent->inum); |
| 2700 | dbg_tnc("xent '%s', ino %lu", xent->name, xattr_inum); | 2705 | dbg_tnc("xent '%s', ino %lu", xent->name, |
| 2706 | (unsigned long)xattr_inum); | ||
| 2701 | 2707 | ||
| 2702 | nm.name = xent->name; | 2708 | nm.name = xent->name; |
| 2703 | nm.len = le16_to_cpu(xent->nlen); | 2709 | nm.len = le16_to_cpu(xent->nlen); |
diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h index a7bd32fa15b9..46b172560a06 100644 --- a/fs/ubifs/ubifs.h +++ b/fs/ubifs/ubifs.h | |||
| @@ -753,7 +753,7 @@ struct ubifs_znode { | |||
| 753 | }; | 753 | }; |
| 754 | 754 | ||
| 755 | /** | 755 | /** |
| 756 | * struct bu_info - bulk-read information | 756 | * struct bu_info - bulk-read information. |
| 757 | * @key: first data node key | 757 | * @key: first data node key |
| 758 | * @zbranch: zbranches of data nodes to bulk read | 758 | * @zbranch: zbranches of data nodes to bulk read |
| 759 | * @buf: buffer to read into | 759 | * @buf: buffer to read into |
| @@ -969,7 +969,10 @@ struct ubifs_mount_opts { | |||
| 969 | * @mst_node: master node | 969 | * @mst_node: master node |
| 970 | * @mst_offs: offset of valid master node | 970 | * @mst_offs: offset of valid master node |
| 971 | * @mst_mutex: protects the master node area, @mst_node, and @mst_offs | 971 | * @mst_mutex: protects the master node area, @mst_node, and @mst_offs |
| 972 | * @bulk_read_buf_size: buffer size for bulk-reads | 972 | * |
| 973 | * @max_bu_buf_len: maximum bulk-read buffer length | ||
| 974 | * @bu_mutex: protects the pre-allocated bulk-read buffer and @c->bu | ||
| 975 | * @bu: pre-allocated bulk-read information | ||
| 973 | * | 976 | * |
| 974 | * @log_lebs: number of logical eraseblocks in the log | 977 | * @log_lebs: number of logical eraseblocks in the log |
| 975 | * @log_bytes: log size in bytes | 978 | * @log_bytes: log size in bytes |
| @@ -1217,7 +1220,10 @@ struct ubifs_info { | |||
| 1217 | struct ubifs_mst_node *mst_node; | 1220 | struct ubifs_mst_node *mst_node; |
| 1218 | int mst_offs; | 1221 | int mst_offs; |
| 1219 | struct mutex mst_mutex; | 1222 | struct mutex mst_mutex; |
| 1220 | int bulk_read_buf_size; | 1223 | |
| 1224 | int max_bu_buf_len; | ||
| 1225 | struct mutex bu_mutex; | ||
| 1226 | struct bu_info bu; | ||
| 1221 | 1227 | ||
| 1222 | int log_lebs; | 1228 | int log_lebs; |
| 1223 | long long log_bytes; | 1229 | long long log_bytes; |
diff --git a/fs/xfs/xfs_rename.c b/fs/xfs/xfs_rename.c index d700dacdb10e..c903130be7fd 100644 --- a/fs/xfs/xfs_rename.c +++ b/fs/xfs/xfs_rename.c | |||
| @@ -212,7 +212,7 @@ xfs_rename( | |||
| 212 | if (unlikely((target_dp->i_d.di_flags & XFS_DIFLAG_PROJINHERIT) && | 212 | if (unlikely((target_dp->i_d.di_flags & XFS_DIFLAG_PROJINHERIT) && |
| 213 | (target_dp->i_d.di_projid != src_ip->i_d.di_projid))) { | 213 | (target_dp->i_d.di_projid != src_ip->i_d.di_projid))) { |
| 214 | error = XFS_ERROR(EXDEV); | 214 | error = XFS_ERROR(EXDEV); |
| 215 | xfs_rename_unlock4(inodes, XFS_ILOCK_SHARED); | 215 | xfs_rename_unlock4(inodes, XFS_ILOCK_EXCL); |
| 216 | xfs_trans_cancel(tp, cancel_flags); | 216 | xfs_trans_cancel(tp, cancel_flags); |
| 217 | goto std_return; | 217 | goto std_return; |
| 218 | } | 218 | } |
diff --git a/include/asm-generic/atomic.h b/include/asm-generic/atomic.h index 4ec0a296bdec..7abdaa91ccd3 100644 --- a/include/asm-generic/atomic.h +++ b/include/asm-generic/atomic.h | |||
| @@ -251,7 +251,7 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u) | |||
| 251 | #define atomic_long_cmpxchg(l, old, new) \ | 251 | #define atomic_long_cmpxchg(l, old, new) \ |
| 252 | (atomic_cmpxchg((atomic_t *)(l), (old), (new))) | 252 | (atomic_cmpxchg((atomic_t *)(l), (old), (new))) |
| 253 | #define atomic_long_xchg(v, new) \ | 253 | #define atomic_long_xchg(v, new) \ |
| 254 | (atomic_xchg((atomic_t *)(l), (new))) | 254 | (atomic_xchg((atomic_t *)(v), (new))) |
| 255 | 255 | ||
| 256 | #endif /* BITS_PER_LONG == 64 */ | 256 | #endif /* BITS_PER_LONG == 64 */ |
| 257 | 257 | ||
diff --git a/include/asm-generic/audit_write.h b/include/asm-generic/audit_write.h index f10d367fb2a5..c5f1c2c920e2 100644 --- a/include/asm-generic/audit_write.h +++ b/include/asm-generic/audit_write.h | |||
| @@ -1,6 +1,8 @@ | |||
| 1 | #include <asm-generic/audit_dir_write.h> | 1 | #include <asm-generic/audit_dir_write.h> |
| 2 | __NR_acct, | 2 | __NR_acct, |
| 3 | #ifdef __NR_swapon | ||
| 3 | __NR_swapon, | 4 | __NR_swapon, |
| 5 | #endif | ||
| 4 | __NR_quotactl, | 6 | __NR_quotactl, |
| 5 | __NR_truncate, | 7 | __NR_truncate, |
| 6 | #ifdef __NR_truncate64 | 8 | #ifdef __NR_truncate64 |
diff --git a/include/asm-mn10300/uaccess.h b/include/asm-mn10300/uaccess.h index 46b9b647f3c3..8a3a4dd55763 100644 --- a/include/asm-mn10300/uaccess.h +++ b/include/asm-mn10300/uaccess.h | |||
| @@ -266,7 +266,7 @@ extern int __get_user_unknown(void); | |||
| 266 | " .section .fixup,\"ax\" \n" \ | 266 | " .section .fixup,\"ax\" \n" \ |
| 267 | "4: \n" \ | 267 | "4: \n" \ |
| 268 | " mov %5,%0 \n" \ | 268 | " mov %5,%0 \n" \ |
| 269 | " jmp 2b \n" \ | 269 | " jmp 3b \n" \ |
| 270 | " .previous \n" \ | 270 | " .previous \n" \ |
| 271 | " .section __ex_table,\"a\"\n" \ | 271 | " .section __ex_table,\"a\"\n" \ |
| 272 | " .balign 4 \n" \ | 272 | " .balign 4 \n" \ |
diff --git a/include/linux/audit.h b/include/linux/audit.h index 6272a395d43c..8f0672d13eb1 100644 --- a/include/linux/audit.h +++ b/include/linux/audit.h | |||
| @@ -391,6 +391,7 @@ extern int audit_classify_arch(int arch); | |||
| 391 | #ifdef CONFIG_AUDITSYSCALL | 391 | #ifdef CONFIG_AUDITSYSCALL |
| 392 | /* These are defined in auditsc.c */ | 392 | /* These are defined in auditsc.c */ |
| 393 | /* Public API */ | 393 | /* Public API */ |
| 394 | extern void audit_finish_fork(struct task_struct *child); | ||
| 394 | extern int audit_alloc(struct task_struct *task); | 395 | extern int audit_alloc(struct task_struct *task); |
| 395 | extern void audit_free(struct task_struct *task); | 396 | extern void audit_free(struct task_struct *task); |
| 396 | extern void audit_syscall_entry(int arch, | 397 | extern void audit_syscall_entry(int arch, |
| @@ -434,7 +435,7 @@ static inline void audit_ptrace(struct task_struct *t) | |||
| 434 | 435 | ||
| 435 | /* Private API (for audit.c only) */ | 436 | /* Private API (for audit.c only) */ |
| 436 | extern unsigned int audit_serial(void); | 437 | extern unsigned int audit_serial(void); |
| 437 | extern void auditsc_get_stamp(struct audit_context *ctx, | 438 | extern int auditsc_get_stamp(struct audit_context *ctx, |
| 438 | struct timespec *t, unsigned int *serial); | 439 | struct timespec *t, unsigned int *serial); |
| 439 | extern int audit_set_loginuid(struct task_struct *task, uid_t loginuid); | 440 | extern int audit_set_loginuid(struct task_struct *task, uid_t loginuid); |
| 440 | #define audit_get_loginuid(t) ((t)->loginuid) | 441 | #define audit_get_loginuid(t) ((t)->loginuid) |
| @@ -504,6 +505,7 @@ static inline int audit_mq_getsetattr(mqd_t mqdes, struct mq_attr *mqstat) | |||
| 504 | extern int audit_n_rules; | 505 | extern int audit_n_rules; |
| 505 | extern int audit_signals; | 506 | extern int audit_signals; |
| 506 | #else | 507 | #else |
| 508 | #define audit_finish_fork(t) | ||
| 507 | #define audit_alloc(t) ({ 0; }) | 509 | #define audit_alloc(t) ({ 0; }) |
| 508 | #define audit_free(t) do { ; } while (0) | 510 | #define audit_free(t) do { ; } while (0) |
| 509 | #define audit_syscall_entry(ta,a,b,c,d,e) do { ; } while (0) | 511 | #define audit_syscall_entry(ta,a,b,c,d,e) do { ; } while (0) |
| @@ -516,7 +518,7 @@ extern int audit_signals; | |||
| 516 | #define audit_inode(n,d) do { ; } while (0) | 518 | #define audit_inode(n,d) do { ; } while (0) |
| 517 | #define audit_inode_child(d,i,p) do { ; } while (0) | 519 | #define audit_inode_child(d,i,p) do { ; } while (0) |
| 518 | #define audit_core_dumps(i) do { ; } while (0) | 520 | #define audit_core_dumps(i) do { ; } while (0) |
| 519 | #define auditsc_get_stamp(c,t,s) do { BUG(); } while (0) | 521 | #define auditsc_get_stamp(c,t,s) (0) |
| 520 | #define audit_get_loginuid(t) (-1) | 522 | #define audit_get_loginuid(t) (-1) |
| 521 | #define audit_get_sessionid(t) (-1) | 523 | #define audit_get_sessionid(t) (-1) |
| 522 | #define audit_log_task_context(b) do { ; } while (0) | 524 | #define audit_log_task_context(b) do { ; } while (0) |
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index a135256b272c..031a315c0509 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h | |||
| @@ -662,6 +662,7 @@ extern unsigned long blk_max_low_pfn, blk_max_pfn; | |||
| 662 | * default timeout for SG_IO if none specified | 662 | * default timeout for SG_IO if none specified |
| 663 | */ | 663 | */ |
| 664 | #define BLK_DEFAULT_SG_TIMEOUT (60 * HZ) | 664 | #define BLK_DEFAULT_SG_TIMEOUT (60 * HZ) |
| 665 | #define BLK_MIN_SG_TIMEOUT (7 * HZ) | ||
| 665 | 666 | ||
| 666 | #ifdef CONFIG_BOUNCE | 667 | #ifdef CONFIG_BOUNCE |
| 667 | extern int init_emergency_isa_pool(void); | 668 | extern int init_emergency_isa_pool(void); |
| @@ -786,6 +787,8 @@ static inline void blk_run_address_space(struct address_space *mapping) | |||
| 786 | blk_run_backing_dev(mapping->backing_dev_info, NULL); | 787 | blk_run_backing_dev(mapping->backing_dev_info, NULL); |
| 787 | } | 788 | } |
| 788 | 789 | ||
| 790 | extern void blkdev_dequeue_request(struct request *req); | ||
| 791 | |||
| 789 | /* | 792 | /* |
| 790 | * blk_end_request() and friends. | 793 | * blk_end_request() and friends. |
| 791 | * __blk_end_request() and end_request() must be called with | 794 | * __blk_end_request() and end_request() must be called with |
| @@ -820,11 +823,6 @@ extern void blk_update_request(struct request *rq, int error, | |||
| 820 | extern unsigned int blk_rq_bytes(struct request *rq); | 823 | extern unsigned int blk_rq_bytes(struct request *rq); |
| 821 | extern unsigned int blk_rq_cur_bytes(struct request *rq); | 824 | extern unsigned int blk_rq_cur_bytes(struct request *rq); |
| 822 | 825 | ||
| 823 | static inline void blkdev_dequeue_request(struct request *req) | ||
| 824 | { | ||
| 825 | elv_dequeue_request(req->q, req); | ||
| 826 | } | ||
| 827 | |||
| 828 | /* | 826 | /* |
| 829 | * Access functions for manipulating queue properties | 827 | * Access functions for manipulating queue properties |
| 830 | */ | 828 | */ |
| @@ -921,6 +919,8 @@ extern void blk_set_cmd_filter_defaults(struct blk_cmd_filter *filter); | |||
| 921 | 919 | ||
| 922 | #define MAX_SEGMENT_SIZE 65536 | 920 | #define MAX_SEGMENT_SIZE 65536 |
| 923 | 921 | ||
| 922 | #define BLK_SEG_BOUNDARY_MASK 0xFFFFFFFFUL | ||
| 923 | |||
| 924 | #define blkdev_entry_to_request(entry) list_entry((entry), struct request, queuelist) | 924 | #define blkdev_entry_to_request(entry) list_entry((entry), struct request, queuelist) |
| 925 | 925 | ||
| 926 | static inline int queue_hardsect_size(struct request_queue *q) | 926 | static inline int queue_hardsect_size(struct request_queue *q) |
diff --git a/include/linux/can/core.h b/include/linux/can/core.h index e9ca210ffa5b..f50785ad4781 100644 --- a/include/linux/can/core.h +++ b/include/linux/can/core.h | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | #include <linux/skbuff.h> | 19 | #include <linux/skbuff.h> |
| 20 | #include <linux/netdevice.h> | 20 | #include <linux/netdevice.h> |
| 21 | 21 | ||
| 22 | #define CAN_VERSION "20071116" | 22 | #define CAN_VERSION "20081130" |
| 23 | 23 | ||
| 24 | /* increment this number each time you change some user-space interface */ | 24 | /* increment this number each time you change some user-space interface */ |
| 25 | #define CAN_ABI_VERSION "8" | 25 | #define CAN_ABI_VERSION "8" |
diff --git a/include/linux/fs.h b/include/linux/fs.h index 0dcdd9458f4b..4a853ef6fd35 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
| @@ -63,23 +63,24 @@ extern int dir_notify_enable; | |||
| 63 | #define MAY_ACCESS 16 | 63 | #define MAY_ACCESS 16 |
| 64 | #define MAY_OPEN 32 | 64 | #define MAY_OPEN 32 |
| 65 | 65 | ||
| 66 | #define FMODE_READ ((__force fmode_t)1) | 66 | /* file is open for reading */ |
| 67 | #define FMODE_WRITE ((__force fmode_t)2) | 67 | #define FMODE_READ ((__force fmode_t)1) |
| 68 | 68 | /* file is open for writing */ | |
| 69 | /* Internal kernel extensions */ | 69 | #define FMODE_WRITE ((__force fmode_t)2) |
| 70 | #define FMODE_LSEEK ((__force fmode_t)4) | 70 | /* file is seekable */ |
| 71 | #define FMODE_PREAD ((__force fmode_t)8) | 71 | #define FMODE_LSEEK ((__force fmode_t)4) |
| 72 | #define FMODE_PWRITE FMODE_PREAD /* These go hand in hand */ | 72 | /* file can be accessed using pread/pwrite */ |
| 73 | 73 | #define FMODE_PREAD ((__force fmode_t)8) | |
| 74 | /* File is being opened for execution. Primary users of this flag are | 74 | #define FMODE_PWRITE FMODE_PREAD /* These go hand in hand */ |
| 75 | distributed filesystems that can use it to achieve correct ETXTBUSY | 75 | /* File is opened for execution with sys_execve / sys_uselib */ |
| 76 | behavior for cross-node execution/opening_for_writing of files */ | 76 | #define FMODE_EXEC ((__force fmode_t)16) |
| 77 | #define FMODE_EXEC ((__force fmode_t)16) | 77 | /* File is opened with O_NDELAY (only set for block devices) */ |
| 78 | 78 | #define FMODE_NDELAY ((__force fmode_t)32) | |
| 79 | #define FMODE_NDELAY ((__force fmode_t)32) | 79 | /* File is opened with O_EXCL (only set for block devices) */ |
| 80 | #define FMODE_EXCL ((__force fmode_t)64) | 80 | #define FMODE_EXCL ((__force fmode_t)64) |
| 81 | /* File is opened using open(.., 3, ..) and is writeable only for ioctls | ||
| 82 | (specialy hack for floppy.c) */ | ||
| 81 | #define FMODE_WRITE_IOCTL ((__force fmode_t)128) | 83 | #define FMODE_WRITE_IOCTL ((__force fmode_t)128) |
| 82 | #define FMODE_NDELAY_NOW ((__force fmode_t)256) | ||
| 83 | 84 | ||
| 84 | #define RW_MASK 1 | 85 | #define RW_MASK 1 |
| 85 | #define RWA_MASK 2 | 86 | #define RWA_MASK 2 |
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index 703eb53cfa2b..9c5bc6be2b09 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | #include <linux/ktime.h> | 6 | #include <linux/ktime.h> |
| 7 | #include <linux/init.h> | 7 | #include <linux/init.h> |
| 8 | #include <linux/types.h> | 8 | #include <linux/types.h> |
| 9 | #include <linux/module.h> | ||
| 9 | #include <linux/kallsyms.h> | 10 | #include <linux/kallsyms.h> |
| 10 | 11 | ||
| 11 | #ifdef CONFIG_FUNCTION_TRACER | 12 | #ifdef CONFIG_FUNCTION_TRACER |
| @@ -231,7 +232,7 @@ ftrace_init_module(unsigned long *start, unsigned long *end) { } | |||
| 231 | 232 | ||
| 232 | struct boot_trace { | 233 | struct boot_trace { |
| 233 | pid_t caller; | 234 | pid_t caller; |
| 234 | char func[KSYM_NAME_LEN]; | 235 | char func[KSYM_SYMBOL_LEN]; |
| 235 | int result; | 236 | int result; |
| 236 | unsigned long long duration; /* usecs */ | 237 | unsigned long long duration; /* usecs */ |
| 237 | ktime_t calltime; | 238 | ktime_t calltime; |
diff --git a/include/linux/ide.h b/include/linux/ide.h index 54525be4b5f8..010fb26a1579 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
| @@ -1296,6 +1296,13 @@ extern int __ide_pci_register_driver(struct pci_driver *driver, struct module *o | |||
| 1296 | #define ide_pci_register_driver(d) pci_register_driver(d) | 1296 | #define ide_pci_register_driver(d) pci_register_driver(d) |
| 1297 | #endif | 1297 | #endif |
| 1298 | 1298 | ||
| 1299 | static inline int ide_pci_is_in_compatibility_mode(struct pci_dev *dev) | ||
| 1300 | { | ||
| 1301 | if ((dev->class >> 8) == PCI_CLASS_STORAGE_IDE && (dev->class & 5) != 5) | ||
| 1302 | return 1; | ||
| 1303 | return 0; | ||
| 1304 | } | ||
| 1305 | |||
| 1299 | void ide_pci_setup_ports(struct pci_dev *, const struct ide_port_info *, int, | 1306 | void ide_pci_setup_ports(struct pci_dev *, const struct ide_port_info *, int, |
| 1300 | hw_regs_t *, hw_regs_t **); | 1307 | hw_regs_t *, hw_regs_t **); |
| 1301 | void ide_setup_pci_noise(struct pci_dev *, const struct ide_port_info *); | 1308 | void ide_setup_pci_noise(struct pci_dev *, const struct ide_port_info *); |
| @@ -1375,6 +1382,7 @@ enum { | |||
| 1375 | IDE_HFLAG_IO_32BIT = (1 << 24), | 1382 | IDE_HFLAG_IO_32BIT = (1 << 24), |
| 1376 | /* unmask IRQs */ | 1383 | /* unmask IRQs */ |
| 1377 | IDE_HFLAG_UNMASK_IRQS = (1 << 25), | 1384 | IDE_HFLAG_UNMASK_IRQS = (1 << 25), |
| 1385 | IDE_HFLAG_BROKEN_ALTSTATUS = (1 << 26), | ||
| 1378 | /* serialize ports if DMA is possible (for sl82c105) */ | 1386 | /* serialize ports if DMA is possible (for sl82c105) */ |
| 1379 | IDE_HFLAG_SERIALIZE_DMA = (1 << 27), | 1387 | IDE_HFLAG_SERIALIZE_DMA = (1 << 27), |
| 1380 | /* force host out of "simplex" mode */ | 1388 | /* force host out of "simplex" mode */ |
diff --git a/include/linux/input.h b/include/linux/input.h index 5341e8251f8c..1a958cd90ce9 100644 --- a/include/linux/input.h +++ b/include/linux/input.h | |||
| @@ -659,6 +659,7 @@ struct input_absinfo { | |||
| 659 | #define SW_RADIO SW_RFKILL_ALL /* deprecated */ | 659 | #define SW_RADIO SW_RFKILL_ALL /* deprecated */ |
| 660 | #define SW_MICROPHONE_INSERT 0x04 /* set = inserted */ | 660 | #define SW_MICROPHONE_INSERT 0x04 /* set = inserted */ |
| 661 | #define SW_DOCK 0x05 /* set = plugged into dock */ | 661 | #define SW_DOCK 0x05 /* set = plugged into dock */ |
| 662 | #define SW_LINEOUT_INSERT 0x06 /* set = inserted */ | ||
| 662 | #define SW_MAX 0x0f | 663 | #define SW_MAX 0x0f |
| 663 | #define SW_CNT (SW_MAX+1) | 664 | #define SW_CNT (SW_MAX+1) |
| 664 | 665 | ||
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 9d77b1d7dca8..e26f54952892 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
| @@ -319,6 +319,7 @@ enum | |||
| 319 | { | 319 | { |
| 320 | NAPI_STATE_SCHED, /* Poll is scheduled */ | 320 | NAPI_STATE_SCHED, /* Poll is scheduled */ |
| 321 | NAPI_STATE_DISABLE, /* Disable pending */ | 321 | NAPI_STATE_DISABLE, /* Disable pending */ |
| 322 | NAPI_STATE_NPSVC, /* Netpoll - don't dequeue from poll_list */ | ||
| 322 | }; | 323 | }; |
| 323 | 324 | ||
| 324 | extern void __napi_schedule(struct napi_struct *n); | 325 | extern void __napi_schedule(struct napi_struct *n); |
| @@ -1497,6 +1498,12 @@ static inline void netif_rx_complete(struct net_device *dev, | |||
| 1497 | { | 1498 | { |
| 1498 | unsigned long flags; | 1499 | unsigned long flags; |
| 1499 | 1500 | ||
| 1501 | /* | ||
| 1502 | * don't let napi dequeue from the cpu poll list | ||
| 1503 | * just in case its running on a different cpu | ||
| 1504 | */ | ||
| 1505 | if (unlikely(test_bit(NAPI_STATE_NPSVC, &napi->state))) | ||
| 1506 | return; | ||
| 1500 | local_irq_save(flags); | 1507 | local_irq_save(flags); |
| 1501 | __netif_rx_complete(dev, napi); | 1508 | __netif_rx_complete(dev, napi); |
| 1502 | local_irq_restore(flags); | 1509 | local_irq_restore(flags); |
diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h index be41b609c88f..e52ce475d19f 100644 --- a/include/linux/netfilter/x_tables.h +++ b/include/linux/netfilter/x_tables.h | |||
| @@ -251,7 +251,7 @@ struct xt_target_param { | |||
| 251 | */ | 251 | */ |
| 252 | struct xt_tgchk_param { | 252 | struct xt_tgchk_param { |
| 253 | const char *table; | 253 | const char *table; |
| 254 | void *entryinfo; | 254 | const void *entryinfo; |
| 255 | const struct xt_target *target; | 255 | const struct xt_target *target; |
| 256 | void *targinfo; | 256 | void *targinfo; |
| 257 | unsigned int hook_mask; | 257 | unsigned int hook_mask; |
diff --git a/include/linux/security.h b/include/linux/security.h index c13f1cec9abb..e3d4ecda2673 100644 --- a/include/linux/security.h +++ b/include/linux/security.h | |||
| @@ -1818,17 +1818,21 @@ static inline int security_settime(struct timespec *ts, struct timezone *tz) | |||
| 1818 | 1818 | ||
| 1819 | static inline int security_vm_enough_memory(long pages) | 1819 | static inline int security_vm_enough_memory(long pages) |
| 1820 | { | 1820 | { |
| 1821 | WARN_ON(current->mm == NULL); | ||
| 1821 | return cap_vm_enough_memory(current->mm, pages); | 1822 | return cap_vm_enough_memory(current->mm, pages); |
| 1822 | } | 1823 | } |
| 1823 | 1824 | ||
| 1824 | static inline int security_vm_enough_memory_kern(long pages) | 1825 | static inline int security_vm_enough_memory_mm(struct mm_struct *mm, long pages) |
| 1825 | { | 1826 | { |
| 1826 | return cap_vm_enough_memory(current->mm, pages); | 1827 | WARN_ON(mm == NULL); |
| 1828 | return cap_vm_enough_memory(mm, pages); | ||
| 1827 | } | 1829 | } |
| 1828 | 1830 | ||
| 1829 | static inline int security_vm_enough_memory_mm(struct mm_struct *mm, long pages) | 1831 | static inline int security_vm_enough_memory_kern(long pages) |
| 1830 | { | 1832 | { |
| 1831 | return cap_vm_enough_memory(mm, pages); | 1833 | /* If current->mm is a kernel thread then we will pass NULL, |
| 1834 | for this specific case that is fine */ | ||
| 1835 | return cap_vm_enough_memory(current->mm, pages); | ||
| 1832 | } | 1836 | } |
| 1833 | 1837 | ||
| 1834 | static inline int security_bprm_alloc(struct linux_binprm *bprm) | 1838 | static inline int security_bprm_alloc(struct linux_binprm *bprm) |
diff --git a/include/linux/smp.h b/include/linux/smp.h index 3f9a60043a97..6e7ba16ff454 100644 --- a/include/linux/smp.h +++ b/include/linux/smp.h | |||
| @@ -146,6 +146,8 @@ static inline void smp_send_reschedule(int cpu) { } | |||
| 146 | }) | 146 | }) |
| 147 | #define smp_call_function_mask(mask, func, info, wait) \ | 147 | #define smp_call_function_mask(mask, func, info, wait) \ |
| 148 | (up_smp_call_function(func, info)) | 148 | (up_smp_call_function(func, info)) |
| 149 | #define smp_call_function_many(mask, func, info, wait) \ | ||
| 150 | (up_smp_call_function(func, info)) | ||
| 149 | static inline void init_call_single_data(void) | 151 | static inline void init_call_single_data(void) |
| 150 | { | 152 | { |
| 151 | } | 153 | } |
diff --git a/include/net/af_unix.h b/include/net/af_unix.h index c29ff1da8a18..1614d78c60ed 100644 --- a/include/net/af_unix.h +++ b/include/net/af_unix.h | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | extern void unix_inflight(struct file *fp); | 9 | extern void unix_inflight(struct file *fp); |
| 10 | extern void unix_notinflight(struct file *fp); | 10 | extern void unix_notinflight(struct file *fp); |
| 11 | extern void unix_gc(void); | 11 | extern void unix_gc(void); |
| 12 | extern void wait_for_unix_gc(void); | ||
| 12 | 13 | ||
| 13 | #define UNIX_HASH_SIZE 256 | 14 | #define UNIX_HASH_SIZE 256 |
| 14 | 15 | ||
diff --git a/include/net/request_sock.h b/include/net/request_sock.h index cac811e51f6d..c7190846e128 100644 --- a/include/net/request_sock.h +++ b/include/net/request_sock.h | |||
| @@ -31,6 +31,7 @@ struct request_sock_ops { | |||
| 31 | int family; | 31 | int family; |
| 32 | int obj_size; | 32 | int obj_size; |
| 33 | struct kmem_cache *slab; | 33 | struct kmem_cache *slab; |
| 34 | char *slab_name; | ||
| 34 | int (*rtx_syn_ack)(struct sock *sk, | 35 | int (*rtx_syn_ack)(struct sock *sk, |
| 35 | struct request_sock *req); | 36 | struct request_sock *req); |
| 36 | void (*send_ack)(struct sock *sk, struct sk_buff *skb, | 37 | void (*send_ack)(struct sock *sk, struct sk_buff *skb, |
diff --git a/include/net/timewait_sock.h b/include/net/timewait_sock.h index 1e1ee3253fd8..97c3b14da55d 100644 --- a/include/net/timewait_sock.h +++ b/include/net/timewait_sock.h | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | 16 | ||
| 17 | struct timewait_sock_ops { | 17 | struct timewait_sock_ops { |
| 18 | struct kmem_cache *twsk_slab; | 18 | struct kmem_cache *twsk_slab; |
| 19 | char *twsk_slab_name; | ||
| 19 | unsigned int twsk_obj_size; | 20 | unsigned int twsk_obj_size; |
| 20 | int (*twsk_unique)(struct sock *sk, | 21 | int (*twsk_unique)(struct sock *sk, |
| 21 | struct sock *sktw, void *twp); | 22 | struct sock *sktw, void *twp); |
diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h index 49d8913c4f86..6e04e6fe79c7 100644 --- a/include/scsi/scsi_transport_fc.h +++ b/include/scsi/scsi_transport_fc.h | |||
| @@ -357,7 +357,7 @@ struct fc_rport { /* aka fc_starget_attrs */ | |||
| 357 | /* bit field values for struct fc_rport "flags" field: */ | 357 | /* bit field values for struct fc_rport "flags" field: */ |
| 358 | #define FC_RPORT_DEVLOSS_PENDING 0x01 | 358 | #define FC_RPORT_DEVLOSS_PENDING 0x01 |
| 359 | #define FC_RPORT_SCAN_PENDING 0x02 | 359 | #define FC_RPORT_SCAN_PENDING 0x02 |
| 360 | #define FC_RPORT_FAST_FAIL_TIMEDOUT 0x03 | 360 | #define FC_RPORT_FAST_FAIL_TIMEDOUT 0x04 |
| 361 | 361 | ||
| 362 | #define dev_to_rport(d) \ | 362 | #define dev_to_rport(d) \ |
| 363 | container_of(d, struct fc_rport, dev) | 363 | container_of(d, struct fc_rport, dev) |
diff --git a/include/sound/jack.h b/include/sound/jack.h index b1b2b8b59adb..7cb25f4b50bb 100644 --- a/include/sound/jack.h +++ b/include/sound/jack.h | |||
| @@ -35,6 +35,7 @@ enum snd_jack_types { | |||
| 35 | SND_JACK_HEADPHONE = 0x0001, | 35 | SND_JACK_HEADPHONE = 0x0001, |
| 36 | SND_JACK_MICROPHONE = 0x0002, | 36 | SND_JACK_MICROPHONE = 0x0002, |
| 37 | SND_JACK_HEADSET = SND_JACK_HEADPHONE | SND_JACK_MICROPHONE, | 37 | SND_JACK_HEADSET = SND_JACK_HEADPHONE | SND_JACK_MICROPHONE, |
| 38 | SND_JACK_LINEOUT = 0x0004, | ||
| 38 | }; | 39 | }; |
| 39 | 40 | ||
| 40 | struct snd_jack { | 41 | struct snd_jack { |
diff --git a/include/video/radeon.h b/include/video/radeon.h index d5dcaf154ba4..1cd09cc5b169 100644 --- a/include/video/radeon.h +++ b/include/video/radeon.h | |||
| @@ -525,9 +525,6 @@ | |||
| 525 | #define CRTC_DISPLAY_DIS (1 << 10) | 525 | #define CRTC_DISPLAY_DIS (1 << 10) |
| 526 | #define CRTC_CRT_ON (1 << 15) | 526 | #define CRTC_CRT_ON (1 << 15) |
| 527 | 527 | ||
| 528 | /* DSTCACHE_MODE bits constants */ | ||
| 529 | #define RB2D_DC_AUTOFLUSH_ENABLE (1 << 8) | ||
| 530 | #define RB2D_DC_DC_DISABLE_IGNORE_PE (1 << 17) | ||
| 531 | 528 | ||
| 532 | /* DSTCACHE_CTLSTAT bit constants */ | 529 | /* DSTCACHE_CTLSTAT bit constants */ |
| 533 | #define RB2D_DC_FLUSH_2D (1 << 0) | 530 | #define RB2D_DC_FLUSH_2D (1 << 0) |
| @@ -869,10 +866,15 @@ | |||
| 869 | #define GMC_DST_16BPP_YVYU422 0x00000c00 | 866 | #define GMC_DST_16BPP_YVYU422 0x00000c00 |
| 870 | #define GMC_DST_32BPP_AYUV444 0x00000e00 | 867 | #define GMC_DST_32BPP_AYUV444 0x00000e00 |
| 871 | #define GMC_DST_16BPP_ARGB4444 0x00000f00 | 868 | #define GMC_DST_16BPP_ARGB4444 0x00000f00 |
| 869 | #define GMC_SRC_MONO 0x00000000 | ||
| 870 | #define GMC_SRC_MONO_LBKGD 0x00001000 | ||
| 871 | #define GMC_SRC_DSTCOLOR 0x00003000 | ||
| 872 | #define GMC_BYTE_ORDER_MSB_TO_LSB 0x00000000 | 872 | #define GMC_BYTE_ORDER_MSB_TO_LSB 0x00000000 |
| 873 | #define GMC_BYTE_ORDER_LSB_TO_MSB 0x00004000 | 873 | #define GMC_BYTE_ORDER_LSB_TO_MSB 0x00004000 |
| 874 | #define GMC_DP_CONVERSION_TEMP_9300 0x00008000 | 874 | #define GMC_DP_CONVERSION_TEMP_9300 0x00008000 |
| 875 | #define GMC_DP_CONVERSION_TEMP_6500 0x00000000 | 875 | #define GMC_DP_CONVERSION_TEMP_6500 0x00000000 |
| 876 | #define GMC_DP_SRC_RECT 0x02000000 | ||
| 877 | #define GMC_DP_SRC_HOST 0x03000000 | ||
| 876 | #define GMC_DP_SRC_HOST_BYTEALIGN 0x04000000 | 878 | #define GMC_DP_SRC_HOST_BYTEALIGN 0x04000000 |
| 877 | #define GMC_3D_FCN_EN_CLR 0x00000000 | 879 | #define GMC_3D_FCN_EN_CLR 0x00000000 |
| 878 | #define GMC_3D_FCN_EN_SET 0x08000000 | 880 | #define GMC_3D_FCN_EN_SET 0x08000000 |
| @@ -883,9 +885,6 @@ | |||
| 883 | #define GMC_WRITE_MASK_LEAVE 0x00000000 | 885 | #define GMC_WRITE_MASK_LEAVE 0x00000000 |
| 884 | #define GMC_WRITE_MASK_SET 0x40000000 | 886 | #define GMC_WRITE_MASK_SET 0x40000000 |
| 885 | #define GMC_CLR_CMP_CNTL_DIS (1 << 28) | 887 | #define GMC_CLR_CMP_CNTL_DIS (1 << 28) |
| 886 | #define GMC_SRC_DATATYPE_MASK (3 << 12) | ||
| 887 | #define GMC_SRC_DATATYPE_MONO_FG_BG (0 << 12) | ||
| 888 | #define GMC_SRC_DATATYPE_MONO_FG_LA (1 << 12) | ||
| 889 | #define GMC_SRC_DATATYPE_COLOR (3 << 12) | 888 | #define GMC_SRC_DATATYPE_COLOR (3 << 12) |
| 890 | #define ROP3_S 0x00cc0000 | 889 | #define ROP3_S 0x00cc0000 |
| 891 | #define ROP3_SRCCOPY 0x00cc0000 | 890 | #define ROP3_SRCCOPY 0x00cc0000 |
| @@ -894,7 +893,6 @@ | |||
| 894 | #define DP_SRC_SOURCE_MASK (7 << 24) | 893 | #define DP_SRC_SOURCE_MASK (7 << 24) |
| 895 | #define GMC_BRUSH_NONE (15 << 4) | 894 | #define GMC_BRUSH_NONE (15 << 4) |
| 896 | #define DP_SRC_SOURCE_MEMORY (2 << 24) | 895 | #define DP_SRC_SOURCE_MEMORY (2 << 24) |
| 897 | #define DP_SRC_SOURCE_HOST_DATA (3 << 24) | ||
| 898 | #define GMC_BRUSH_SOLIDCOLOR 0x000000d0 | 896 | #define GMC_BRUSH_SOLIDCOLOR 0x000000d0 |
| 899 | 897 | ||
| 900 | /* DP_MIX bit constants */ | 898 | /* DP_MIX bit constants */ |
| @@ -980,12 +978,6 @@ | |||
| 980 | #define DISP_PWR_MAN_TV_ENABLE_RST (1 << 25) | 978 | #define DISP_PWR_MAN_TV_ENABLE_RST (1 << 25) |
| 981 | #define DISP_PWR_MAN_AUTO_PWRUP_EN (1 << 26) | 979 | #define DISP_PWR_MAN_AUTO_PWRUP_EN (1 << 26) |
| 982 | 980 | ||
| 983 | /* RBBM_GUICNTL constants */ | ||
| 984 | #define RBBM_GUICNTL_HOST_DATA_SWAP_NONE (0 << 0) | ||
| 985 | #define RBBM_GUICNTL_HOST_DATA_SWAP_16BIT (1 << 0) | ||
| 986 | #define RBBM_GUICNTL_HOST_DATA_SWAP_32BIT (2 << 0) | ||
| 987 | #define RBBM_GUICNTL_HOST_DATA_SWAP_HDW (3 << 0) | ||
| 988 | |||
| 989 | /* masks */ | 981 | /* masks */ |
| 990 | 982 | ||
| 991 | #define CONFIG_MEMSIZE_MASK 0x1f000000 | 983 | #define CONFIG_MEMSIZE_MASK 0x1f000000 |
diff --git a/kernel/audit.c b/kernel/audit.c index 4414e93d8750..ce6d8ea3131e 100644 --- a/kernel/audit.c +++ b/kernel/audit.c | |||
| @@ -61,8 +61,11 @@ | |||
| 61 | 61 | ||
| 62 | #include "audit.h" | 62 | #include "audit.h" |
| 63 | 63 | ||
| 64 | /* No auditing will take place until audit_initialized != 0. | 64 | /* No auditing will take place until audit_initialized == AUDIT_INITIALIZED. |
| 65 | * (Initialization happens after skb_init is called.) */ | 65 | * (Initialization happens after skb_init is called.) */ |
| 66 | #define AUDIT_DISABLED -1 | ||
| 67 | #define AUDIT_UNINITIALIZED 0 | ||
| 68 | #define AUDIT_INITIALIZED 1 | ||
| 66 | static int audit_initialized; | 69 | static int audit_initialized; |
| 67 | 70 | ||
| 68 | #define AUDIT_OFF 0 | 71 | #define AUDIT_OFF 0 |
| @@ -965,6 +968,9 @@ static int __init audit_init(void) | |||
| 965 | { | 968 | { |
| 966 | int i; | 969 | int i; |
| 967 | 970 | ||
| 971 | if (audit_initialized == AUDIT_DISABLED) | ||
| 972 | return 0; | ||
| 973 | |||
| 968 | printk(KERN_INFO "audit: initializing netlink socket (%s)\n", | 974 | printk(KERN_INFO "audit: initializing netlink socket (%s)\n", |
| 969 | audit_default ? "enabled" : "disabled"); | 975 | audit_default ? "enabled" : "disabled"); |
| 970 | audit_sock = netlink_kernel_create(&init_net, NETLINK_AUDIT, 0, | 976 | audit_sock = netlink_kernel_create(&init_net, NETLINK_AUDIT, 0, |
| @@ -976,7 +982,7 @@ static int __init audit_init(void) | |||
| 976 | 982 | ||
| 977 | skb_queue_head_init(&audit_skb_queue); | 983 | skb_queue_head_init(&audit_skb_queue); |
| 978 | skb_queue_head_init(&audit_skb_hold_queue); | 984 | skb_queue_head_init(&audit_skb_hold_queue); |
| 979 | audit_initialized = 1; | 985 | audit_initialized = AUDIT_INITIALIZED; |
| 980 | audit_enabled = audit_default; | 986 | audit_enabled = audit_default; |
| 981 | audit_ever_enabled |= !!audit_default; | 987 | audit_ever_enabled |= !!audit_default; |
| 982 | 988 | ||
| @@ -999,13 +1005,21 @@ __initcall(audit_init); | |||
| 999 | static int __init audit_enable(char *str) | 1005 | static int __init audit_enable(char *str) |
| 1000 | { | 1006 | { |
| 1001 | audit_default = !!simple_strtol(str, NULL, 0); | 1007 | audit_default = !!simple_strtol(str, NULL, 0); |
| 1002 | printk(KERN_INFO "audit: %s%s\n", | 1008 | if (!audit_default) |
| 1003 | audit_default ? "enabled" : "disabled", | 1009 | audit_initialized = AUDIT_DISABLED; |
| 1004 | audit_initialized ? "" : " (after initialization)"); | 1010 | |
| 1005 | if (audit_initialized) { | 1011 | printk(KERN_INFO "audit: %s", audit_default ? "enabled" : "disabled"); |
| 1012 | |||
| 1013 | if (audit_initialized == AUDIT_INITIALIZED) { | ||
| 1006 | audit_enabled = audit_default; | 1014 | audit_enabled = audit_default; |
| 1007 | audit_ever_enabled |= !!audit_default; | 1015 | audit_ever_enabled |= !!audit_default; |
| 1016 | } else if (audit_initialized == AUDIT_UNINITIALIZED) { | ||
| 1017 | printk(" (after initialization)"); | ||
| 1018 | } else { | ||
| 1019 | printk(" (until reboot)"); | ||
| 1008 | } | 1020 | } |
| 1021 | printk("\n"); | ||
| 1022 | |||
| 1009 | return 1; | 1023 | return 1; |
| 1010 | } | 1024 | } |
| 1011 | 1025 | ||
| @@ -1107,9 +1121,7 @@ unsigned int audit_serial(void) | |||
| 1107 | static inline void audit_get_stamp(struct audit_context *ctx, | 1121 | static inline void audit_get_stamp(struct audit_context *ctx, |
| 1108 | struct timespec *t, unsigned int *serial) | 1122 | struct timespec *t, unsigned int *serial) |
| 1109 | { | 1123 | { |
| 1110 | if (ctx) | 1124 | if (!ctx || !auditsc_get_stamp(ctx, t, serial)) { |
| 1111 | auditsc_get_stamp(ctx, t, serial); | ||
| 1112 | else { | ||
| 1113 | *t = CURRENT_TIME; | 1125 | *t = CURRENT_TIME; |
| 1114 | *serial = audit_serial(); | 1126 | *serial = audit_serial(); |
| 1115 | } | 1127 | } |
| @@ -1146,7 +1158,7 @@ struct audit_buffer *audit_log_start(struct audit_context *ctx, gfp_t gfp_mask, | |||
| 1146 | int reserve; | 1158 | int reserve; |
| 1147 | unsigned long timeout_start = jiffies; | 1159 | unsigned long timeout_start = jiffies; |
| 1148 | 1160 | ||
| 1149 | if (!audit_initialized) | 1161 | if (audit_initialized != AUDIT_INITIALIZED) |
| 1150 | return NULL; | 1162 | return NULL; |
| 1151 | 1163 | ||
| 1152 | if (unlikely(audit_filter_type(type))) | 1164 | if (unlikely(audit_filter_type(type))) |
diff --git a/kernel/auditsc.c b/kernel/auditsc.c index cf5bc2f5f9c3..2a3f0afc4d2a 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c | |||
| @@ -1459,7 +1459,6 @@ void audit_free(struct task_struct *tsk) | |||
| 1459 | 1459 | ||
| 1460 | /** | 1460 | /** |
| 1461 | * audit_syscall_entry - fill in an audit record at syscall entry | 1461 | * audit_syscall_entry - fill in an audit record at syscall entry |
| 1462 | * @tsk: task being audited | ||
| 1463 | * @arch: architecture type | 1462 | * @arch: architecture type |
| 1464 | * @major: major syscall type (function) | 1463 | * @major: major syscall type (function) |
| 1465 | * @a1: additional syscall register 1 | 1464 | * @a1: additional syscall register 1 |
| @@ -1548,9 +1547,25 @@ void audit_syscall_entry(int arch, int major, | |||
| 1548 | context->ppid = 0; | 1547 | context->ppid = 0; |
| 1549 | } | 1548 | } |
| 1550 | 1549 | ||
| 1550 | void audit_finish_fork(struct task_struct *child) | ||
| 1551 | { | ||
| 1552 | struct audit_context *ctx = current->audit_context; | ||
| 1553 | struct audit_context *p = child->audit_context; | ||
| 1554 | if (!p || !ctx || !ctx->auditable) | ||
| 1555 | return; | ||
| 1556 | p->arch = ctx->arch; | ||
| 1557 | p->major = ctx->major; | ||
| 1558 | memcpy(p->argv, ctx->argv, sizeof(ctx->argv)); | ||
| 1559 | p->ctime = ctx->ctime; | ||
| 1560 | p->dummy = ctx->dummy; | ||
| 1561 | p->auditable = ctx->auditable; | ||
| 1562 | p->in_syscall = ctx->in_syscall; | ||
| 1563 | p->filterkey = kstrdup(ctx->filterkey, GFP_KERNEL); | ||
| 1564 | p->ppid = current->pid; | ||
| 1565 | } | ||
| 1566 | |||
| 1551 | /** | 1567 | /** |
| 1552 | * audit_syscall_exit - deallocate audit context after a system call | 1568 | * audit_syscall_exit - deallocate audit context after a system call |
| 1553 | * @tsk: task being audited | ||
| 1554 | * @valid: success/failure flag | 1569 | * @valid: success/failure flag |
| 1555 | * @return_code: syscall return value | 1570 | * @return_code: syscall return value |
| 1556 | * | 1571 | * |
| @@ -1942,15 +1957,18 @@ EXPORT_SYMBOL_GPL(__audit_inode_child); | |||
| 1942 | * | 1957 | * |
| 1943 | * Also sets the context as auditable. | 1958 | * Also sets the context as auditable. |
| 1944 | */ | 1959 | */ |
| 1945 | void auditsc_get_stamp(struct audit_context *ctx, | 1960 | int auditsc_get_stamp(struct audit_context *ctx, |
| 1946 | struct timespec *t, unsigned int *serial) | 1961 | struct timespec *t, unsigned int *serial) |
| 1947 | { | 1962 | { |
| 1963 | if (!ctx->in_syscall) | ||
| 1964 | return 0; | ||
| 1948 | if (!ctx->serial) | 1965 | if (!ctx->serial) |
| 1949 | ctx->serial = audit_serial(); | 1966 | ctx->serial = audit_serial(); |
| 1950 | t->tv_sec = ctx->ctime.tv_sec; | 1967 | t->tv_sec = ctx->ctime.tv_sec; |
| 1951 | t->tv_nsec = ctx->ctime.tv_nsec; | 1968 | t->tv_nsec = ctx->ctime.tv_nsec; |
| 1952 | *serial = ctx->serial; | 1969 | *serial = ctx->serial; |
| 1953 | ctx->auditable = 1; | 1970 | ctx->auditable = 1; |
| 1971 | return 1; | ||
| 1954 | } | 1972 | } |
| 1955 | 1973 | ||
| 1956 | /* global counter which is incremented every time something logs in */ | 1974 | /* global counter which is incremented every time something logs in */ |
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index fe00b3b983a8..8185a0f09594 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c | |||
| @@ -702,7 +702,7 @@ static int rebind_subsystems(struct cgroupfs_root *root, | |||
| 702 | * any child cgroups exist. This is theoretically supportable | 702 | * any child cgroups exist. This is theoretically supportable |
| 703 | * but involves complex error handling, so it's being left until | 703 | * but involves complex error handling, so it's being left until |
| 704 | * later */ | 704 | * later */ |
| 705 | if (!list_empty(&cgrp->children)) | 705 | if (root->number_of_cgroups > 1) |
| 706 | return -EBUSY; | 706 | return -EBUSY; |
| 707 | 707 | ||
| 708 | /* Process each subsystem */ | 708 | /* Process each subsystem */ |
diff --git a/kernel/fork.c b/kernel/fork.c index 2a372a0e206f..495da2e9a8b4 100644 --- a/kernel/fork.c +++ b/kernel/fork.c | |||
| @@ -315,17 +315,20 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm) | |||
| 315 | file = tmp->vm_file; | 315 | file = tmp->vm_file; |
| 316 | if (file) { | 316 | if (file) { |
| 317 | struct inode *inode = file->f_path.dentry->d_inode; | 317 | struct inode *inode = file->f_path.dentry->d_inode; |
| 318 | struct address_space *mapping = file->f_mapping; | ||
| 319 | |||
| 318 | get_file(file); | 320 | get_file(file); |
| 319 | if (tmp->vm_flags & VM_DENYWRITE) | 321 | if (tmp->vm_flags & VM_DENYWRITE) |
| 320 | atomic_dec(&inode->i_writecount); | 322 | atomic_dec(&inode->i_writecount); |
| 321 | 323 | spin_lock(&mapping->i_mmap_lock); | |
| 322 | /* insert tmp into the share list, just after mpnt */ | 324 | if (tmp->vm_flags & VM_SHARED) |
| 323 | spin_lock(&file->f_mapping->i_mmap_lock); | 325 | mapping->i_mmap_writable++; |
| 324 | tmp->vm_truncate_count = mpnt->vm_truncate_count; | 326 | tmp->vm_truncate_count = mpnt->vm_truncate_count; |
| 325 | flush_dcache_mmap_lock(file->f_mapping); | 327 | flush_dcache_mmap_lock(mapping); |
| 328 | /* insert tmp into the share list, just after mpnt */ | ||
| 326 | vma_prio_tree_add(tmp, mpnt); | 329 | vma_prio_tree_add(tmp, mpnt); |
| 327 | flush_dcache_mmap_unlock(file->f_mapping); | 330 | flush_dcache_mmap_unlock(mapping); |
| 328 | spin_unlock(&file->f_mapping->i_mmap_lock); | 331 | spin_unlock(&mapping->i_mmap_lock); |
| 329 | } | 332 | } |
| 330 | 333 | ||
| 331 | /* | 334 | /* |
| @@ -1398,6 +1401,7 @@ long do_fork(unsigned long clone_flags, | |||
| 1398 | init_completion(&vfork); | 1401 | init_completion(&vfork); |
| 1399 | } | 1402 | } |
| 1400 | 1403 | ||
| 1404 | audit_finish_fork(p); | ||
| 1401 | tracehook_report_clone(trace, regs, clone_flags, nr, p); | 1405 | tracehook_report_clone(trace, regs, clone_flags, nr, p); |
| 1402 | 1406 | ||
| 1403 | /* | 1407 | /* |
diff --git a/kernel/latencytop.c b/kernel/latencytop.c index 5e7b45c56923..449db466bdbc 100644 --- a/kernel/latencytop.c +++ b/kernel/latencytop.c | |||
| @@ -191,7 +191,7 @@ static int lstats_show(struct seq_file *m, void *v) | |||
| 191 | latency_record[i].time, | 191 | latency_record[i].time, |
| 192 | latency_record[i].max); | 192 | latency_record[i].max); |
| 193 | for (q = 0; q < LT_BACKTRACEDEPTH; q++) { | 193 | for (q = 0; q < LT_BACKTRACEDEPTH; q++) { |
| 194 | char sym[KSYM_NAME_LEN]; | 194 | char sym[KSYM_SYMBOL_LEN]; |
| 195 | char *c; | 195 | char *c; |
| 196 | if (!latency_record[i].backtrace[q]) | 196 | if (!latency_record[i].backtrace[q]) |
| 197 | break; | 197 | break; |
diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c index 895337b16a24..4e5288a831de 100644 --- a/kernel/posix-cpu-timers.c +++ b/kernel/posix-cpu-timers.c | |||
| @@ -311,7 +311,7 @@ static int cpu_clock_sample_group(const clockid_t which_clock, | |||
| 311 | struct task_cputime cputime; | 311 | struct task_cputime cputime; |
| 312 | 312 | ||
| 313 | thread_group_cputime(p, &cputime); | 313 | thread_group_cputime(p, &cputime); |
| 314 | switch (which_clock) { | 314 | switch (CPUCLOCK_WHICH(which_clock)) { |
| 315 | default: | 315 | default: |
| 316 | return -EINVAL; | 316 | return -EINVAL; |
| 317 | case CPUCLOCK_PROF: | 317 | case CPUCLOCK_PROF: |
diff --git a/kernel/power/swap.c b/kernel/power/swap.c index b7713b53d07a..6da14358537c 100644 --- a/kernel/power/swap.c +++ b/kernel/power/swap.c | |||
| @@ -633,7 +633,7 @@ void swsusp_close(fmode_t mode) | |||
| 633 | return; | 633 | return; |
| 634 | } | 634 | } |
| 635 | 635 | ||
| 636 | blkdev_put(resume_bdev, mode); /* move up */ | 636 | blkdev_put(resume_bdev, mode); |
| 637 | } | 637 | } |
| 638 | 638 | ||
| 639 | static int swsusp_header_init(void) | 639 | static int swsusp_header_init(void) |
diff --git a/kernel/relay.c b/kernel/relay.c index 32b0befdcb6a..09ac2008f77b 100644 --- a/kernel/relay.c +++ b/kernel/relay.c | |||
| @@ -1317,12 +1317,9 @@ static ssize_t relay_file_splice_read(struct file *in, | |||
| 1317 | if (ret < 0) | 1317 | if (ret < 0) |
| 1318 | break; | 1318 | break; |
| 1319 | else if (!ret) { | 1319 | else if (!ret) { |
| 1320 | if (spliced) | 1320 | if (flags & SPLICE_F_NONBLOCK) |
| 1321 | break; | ||
| 1322 | if (flags & SPLICE_F_NONBLOCK) { | ||
| 1323 | ret = -EAGAIN; | 1321 | ret = -EAGAIN; |
| 1324 | break; | 1322 | break; |
| 1325 | } | ||
| 1326 | } | 1323 | } |
| 1327 | 1324 | ||
| 1328 | *ppos += ret; | 1325 | *ppos += ret; |
diff --git a/kernel/sched.c b/kernel/sched.c index b7480fb5c3dc..e4bb1dd7b308 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
| @@ -6587,7 +6587,9 @@ migration_call(struct notifier_block *nfb, unsigned long action, void *hcpu) | |||
| 6587 | req = list_entry(rq->migration_queue.next, | 6587 | req = list_entry(rq->migration_queue.next, |
| 6588 | struct migration_req, list); | 6588 | struct migration_req, list); |
| 6589 | list_del_init(&req->list); | 6589 | list_del_init(&req->list); |
| 6590 | spin_unlock_irq(&rq->lock); | ||
| 6590 | complete(&req->done); | 6591 | complete(&req->done); |
| 6592 | spin_lock_irq(&rq->lock); | ||
| 6591 | } | 6593 | } |
| 6592 | spin_unlock_irq(&rq->lock); | 6594 | spin_unlock_irq(&rq->lock); |
| 6593 | break; | 6595 | break; |
diff --git a/kernel/sched_clock.c b/kernel/sched_clock.c index 81787248b60f..e8ab096ddfe3 100644 --- a/kernel/sched_clock.c +++ b/kernel/sched_clock.c | |||
| @@ -118,13 +118,13 @@ static u64 __update_sched_clock(struct sched_clock_data *scd, u64 now) | |||
| 118 | 118 | ||
| 119 | /* | 119 | /* |
| 120 | * scd->clock = clamp(scd->tick_gtod + delta, | 120 | * scd->clock = clamp(scd->tick_gtod + delta, |
| 121 | * max(scd->tick_gtod, scd->clock), | 121 | * max(scd->tick_gtod, scd->clock), |
| 122 | * max(scd->clock, scd->tick_gtod + TICK_NSEC)); | 122 | * scd->tick_gtod + TICK_NSEC); |
| 123 | */ | 123 | */ |
| 124 | 124 | ||
| 125 | clock = scd->tick_gtod + delta; | 125 | clock = scd->tick_gtod + delta; |
| 126 | min_clock = wrap_max(scd->tick_gtod, scd->clock); | 126 | min_clock = wrap_max(scd->tick_gtod, scd->clock); |
| 127 | max_clock = wrap_max(scd->clock, scd->tick_gtod + TICK_NSEC); | 127 | max_clock = scd->tick_gtod + TICK_NSEC; |
| 128 | 128 | ||
| 129 | clock = wrap_max(clock, min_clock); | 129 | clock = wrap_max(clock, min_clock); |
| 130 | clock = wrap_min(clock, max_clock); | 130 | clock = wrap_min(clock, max_clock); |
diff --git a/kernel/softlockup.c b/kernel/softlockup.c index 3953e4aed733..dc0b3be6b7d5 100644 --- a/kernel/softlockup.c +++ b/kernel/softlockup.c | |||
| @@ -188,7 +188,7 @@ static void check_hung_task(struct task_struct *t, unsigned long now) | |||
| 188 | if ((long)(now - t->last_switch_timestamp) < | 188 | if ((long)(now - t->last_switch_timestamp) < |
| 189 | sysctl_hung_task_timeout_secs) | 189 | sysctl_hung_task_timeout_secs) |
| 190 | return; | 190 | return; |
| 191 | if (sysctl_hung_task_warnings < 0) | 191 | if (!sysctl_hung_task_warnings) |
| 192 | return; | 192 | return; |
| 193 | sysctl_hung_task_warnings--; | 193 | sysctl_hung_task_warnings--; |
| 194 | 194 | ||
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index e7acfb482a68..fa05e88aa76f 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c | |||
| @@ -518,6 +518,28 @@ void update_wall_time(void) | |||
| 518 | /* correct the clock when NTP error is too big */ | 518 | /* correct the clock when NTP error is too big */ |
| 519 | clocksource_adjust(offset); | 519 | clocksource_adjust(offset); |
| 520 | 520 | ||
| 521 | /* | ||
| 522 | * Since in the loop above, we accumulate any amount of time | ||
| 523 | * in xtime_nsec over a second into xtime.tv_sec, its possible for | ||
| 524 | * xtime_nsec to be fairly small after the loop. Further, if we're | ||
| 525 | * slightly speeding the clocksource up in clocksource_adjust(), | ||
| 526 | * its possible the required corrective factor to xtime_nsec could | ||
| 527 | * cause it to underflow. | ||
| 528 | * | ||
| 529 | * Now, we cannot simply roll the accumulated second back, since | ||
| 530 | * the NTP subsystem has been notified via second_overflow. So | ||
| 531 | * instead we push xtime_nsec forward by the amount we underflowed, | ||
| 532 | * and add that amount into the error. | ||
| 533 | * | ||
| 534 | * We'll correct this error next time through this function, when | ||
| 535 | * xtime_nsec is not as small. | ||
| 536 | */ | ||
| 537 | if (unlikely((s64)clock->xtime_nsec < 0)) { | ||
| 538 | s64 neg = -(s64)clock->xtime_nsec; | ||
| 539 | clock->xtime_nsec = 0; | ||
| 540 | clock->error += neg << (NTP_SCALE_SHIFT - clock->shift); | ||
| 541 | } | ||
| 542 | |||
| 521 | /* store full nanoseconds into xtime after rounding it up and | 543 | /* store full nanoseconds into xtime after rounding it up and |
| 522 | * add the remainder to the error difference. | 544 | * add the remainder to the error difference. |
| 523 | */ | 545 | */ |
| @@ -220,8 +220,14 @@ build_up: | |||
| 220 | */ | 220 | */ |
| 221 | while ((layers < (MAX_LEVEL - 1)) && (id >= (1 << (layers*IDR_BITS)))) { | 221 | while ((layers < (MAX_LEVEL - 1)) && (id >= (1 << (layers*IDR_BITS)))) { |
| 222 | layers++; | 222 | layers++; |
| 223 | if (!p->count) | 223 | if (!p->count) { |
| 224 | /* special case: if the tree is currently empty, | ||
| 225 | * then we grow the tree by moving the top node | ||
| 226 | * upwards. | ||
| 227 | */ | ||
| 228 | p->layer++; | ||
| 224 | continue; | 229 | continue; |
| 230 | } | ||
| 225 | if (!(new = get_from_free_list(idp))) { | 231 | if (!(new = get_from_free_list(idp))) { |
| 226 | /* | 232 | /* |
| 227 | * The allocation failed. If we built part of | 233 | * The allocation failed. If we built part of |
diff --git a/lib/percpu_counter.c b/lib/percpu_counter.c index a8663890a88c..b255b939bc1b 100644 --- a/lib/percpu_counter.c +++ b/lib/percpu_counter.c | |||
| @@ -62,10 +62,7 @@ s64 __percpu_counter_sum(struct percpu_counter *fbc) | |||
| 62 | for_each_online_cpu(cpu) { | 62 | for_each_online_cpu(cpu) { |
| 63 | s32 *pcount = per_cpu_ptr(fbc->counters, cpu); | 63 | s32 *pcount = per_cpu_ptr(fbc->counters, cpu); |
| 64 | ret += *pcount; | 64 | ret += *pcount; |
| 65 | *pcount = 0; | ||
| 66 | } | 65 | } |
| 67 | fbc->count = ret; | ||
| 68 | |||
| 69 | spin_unlock(&fbc->lock); | 66 | spin_unlock(&fbc->lock); |
| 70 | return ret; | 67 | return ret; |
| 71 | } | 68 | } |
| @@ -104,13 +101,13 @@ void percpu_counter_destroy(struct percpu_counter *fbc) | |||
| 104 | if (!fbc->counters) | 101 | if (!fbc->counters) |
| 105 | return; | 102 | return; |
| 106 | 103 | ||
| 107 | free_percpu(fbc->counters); | ||
| 108 | fbc->counters = NULL; | ||
| 109 | #ifdef CONFIG_HOTPLUG_CPU | 104 | #ifdef CONFIG_HOTPLUG_CPU |
| 110 | mutex_lock(&percpu_counters_lock); | 105 | mutex_lock(&percpu_counters_lock); |
| 111 | list_del(&fbc->list); | 106 | list_del(&fbc->list); |
| 112 | mutex_unlock(&percpu_counters_lock); | 107 | mutex_unlock(&percpu_counters_lock); |
| 113 | #endif | 108 | #endif |
| 109 | free_percpu(fbc->counters); | ||
| 110 | fbc->counters = NULL; | ||
| 114 | } | 111 | } |
| 115 | EXPORT_SYMBOL(percpu_counter_destroy); | 112 | EXPORT_SYMBOL(percpu_counter_destroy); |
| 116 | 113 | ||
diff --git a/mm/backing-dev.c b/mm/backing-dev.c index f2e574dbc300..801c08b046e6 100644 --- a/mm/backing-dev.c +++ b/mm/backing-dev.c | |||
| @@ -176,6 +176,9 @@ int bdi_register(struct backing_dev_info *bdi, struct device *parent, | |||
| 176 | int ret = 0; | 176 | int ret = 0; |
| 177 | struct device *dev; | 177 | struct device *dev; |
| 178 | 178 | ||
| 179 | if (bdi->dev) /* The driver needs to use separate queues per device */ | ||
| 180 | goto exit; | ||
| 181 | |||
| 179 | va_start(args, fmt); | 182 | va_start(args, fmt); |
| 180 | dev = device_create_vargs(bdi_class, parent, MKDEV(0, 0), bdi, fmt, args); | 183 | dev = device_create_vargs(bdi_class, parent, MKDEV(0, 0), bdi, fmt, args); |
| 181 | va_end(args); | 184 | va_end(args); |
diff --git a/mm/migrate.c b/mm/migrate.c index 1e0d6b237f44..037b0967c1e3 100644 --- a/mm/migrate.c +++ b/mm/migrate.c | |||
| @@ -987,25 +987,18 @@ out: | |||
| 987 | /* | 987 | /* |
| 988 | * Determine the nodes of an array of pages and store it in an array of status. | 988 | * Determine the nodes of an array of pages and store it in an array of status. |
| 989 | */ | 989 | */ |
| 990 | static int do_pages_stat(struct mm_struct *mm, unsigned long nr_pages, | 990 | static void do_pages_stat_array(struct mm_struct *mm, unsigned long nr_pages, |
| 991 | const void __user * __user *pages, | 991 | const void __user **pages, int *status) |
| 992 | int __user *status) | ||
| 993 | { | 992 | { |
| 994 | unsigned long i; | 993 | unsigned long i; |
| 995 | int err; | ||
| 996 | 994 | ||
| 997 | down_read(&mm->mmap_sem); | 995 | down_read(&mm->mmap_sem); |
| 998 | 996 | ||
| 999 | for (i = 0; i < nr_pages; i++) { | 997 | for (i = 0; i < nr_pages; i++) { |
| 1000 | const void __user *p; | 998 | unsigned long addr = (unsigned long)(*pages); |
| 1001 | unsigned long addr; | ||
| 1002 | struct vm_area_struct *vma; | 999 | struct vm_area_struct *vma; |
| 1003 | struct page *page; | 1000 | struct page *page; |
| 1004 | 1001 | int err = -EFAULT; | |
| 1005 | err = -EFAULT; | ||
| 1006 | if (get_user(p, pages+i)) | ||
| 1007 | goto out; | ||
| 1008 | addr = (unsigned long) p; | ||
| 1009 | 1002 | ||
| 1010 | vma = find_vma(mm, addr); | 1003 | vma = find_vma(mm, addr); |
| 1011 | if (!vma) | 1004 | if (!vma) |
| @@ -1024,12 +1017,52 @@ static int do_pages_stat(struct mm_struct *mm, unsigned long nr_pages, | |||
| 1024 | 1017 | ||
| 1025 | err = page_to_nid(page); | 1018 | err = page_to_nid(page); |
| 1026 | set_status: | 1019 | set_status: |
| 1027 | put_user(err, status+i); | 1020 | *status = err; |
| 1021 | |||
| 1022 | pages++; | ||
| 1023 | status++; | ||
| 1024 | } | ||
| 1025 | |||
| 1026 | up_read(&mm->mmap_sem); | ||
| 1027 | } | ||
| 1028 | |||
| 1029 | /* | ||
| 1030 | * Determine the nodes of a user array of pages and store it in | ||
| 1031 | * a user array of status. | ||
| 1032 | */ | ||
| 1033 | static int do_pages_stat(struct mm_struct *mm, unsigned long nr_pages, | ||
| 1034 | const void __user * __user *pages, | ||
| 1035 | int __user *status) | ||
| 1036 | { | ||
| 1037 | #define DO_PAGES_STAT_CHUNK_NR 16 | ||
| 1038 | const void __user *chunk_pages[DO_PAGES_STAT_CHUNK_NR]; | ||
| 1039 | int chunk_status[DO_PAGES_STAT_CHUNK_NR]; | ||
| 1040 | unsigned long i, chunk_nr = DO_PAGES_STAT_CHUNK_NR; | ||
| 1041 | int err; | ||
| 1042 | |||
| 1043 | for (i = 0; i < nr_pages; i += chunk_nr) { | ||
| 1044 | if (chunk_nr + i > nr_pages) | ||
| 1045 | chunk_nr = nr_pages - i; | ||
| 1046 | |||
| 1047 | err = copy_from_user(chunk_pages, &pages[i], | ||
| 1048 | chunk_nr * sizeof(*chunk_pages)); | ||
| 1049 | if (err) { | ||
| 1050 | err = -EFAULT; | ||
| 1051 | goto out; | ||
| 1052 | } | ||
| 1053 | |||
| 1054 | do_pages_stat_array(mm, chunk_nr, chunk_pages, chunk_status); | ||
| 1055 | |||
| 1056 | err = copy_to_user(&status[i], chunk_status, | ||
| 1057 | chunk_nr * sizeof(*chunk_status)); | ||
| 1058 | if (err) { | ||
| 1059 | err = -EFAULT; | ||
| 1060 | goto out; | ||
| 1061 | } | ||
| 1028 | } | 1062 | } |
| 1029 | err = 0; | 1063 | err = 0; |
| 1030 | 1064 | ||
| 1031 | out: | 1065 | out: |
| 1032 | up_read(&mm->mmap_sem); | ||
| 1033 | return err; | 1066 | return err; |
| 1034 | } | 1067 | } |
| 1035 | 1068 | ||
diff --git a/mm/page_cgroup.c b/mm/page_cgroup.c index 0b3cbf090a67..ab27ff750519 100644 --- a/mm/page_cgroup.c +++ b/mm/page_cgroup.c | |||
| @@ -49,6 +49,9 @@ static int __init alloc_node_page_cgroup(int nid) | |||
| 49 | start_pfn = NODE_DATA(nid)->node_start_pfn; | 49 | start_pfn = NODE_DATA(nid)->node_start_pfn; |
| 50 | nr_pages = NODE_DATA(nid)->node_spanned_pages; | 50 | nr_pages = NODE_DATA(nid)->node_spanned_pages; |
| 51 | 51 | ||
| 52 | if (!nr_pages) | ||
| 53 | return 0; | ||
| 54 | |||
| 52 | table_size = sizeof(struct page_cgroup) * nr_pages; | 55 | table_size = sizeof(struct page_cgroup) * nr_pages; |
| 53 | 56 | ||
| 54 | base = __alloc_bootmem_node_nopanic(NODE_DATA(nid), | 57 | base = __alloc_bootmem_node_nopanic(NODE_DATA(nid), |
| @@ -535,7 +535,7 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size, | |||
| 535 | struct kmem_cache *c; | 535 | struct kmem_cache *c; |
| 536 | 536 | ||
| 537 | c = slob_alloc(sizeof(struct kmem_cache), | 537 | c = slob_alloc(sizeof(struct kmem_cache), |
| 538 | flags, ARCH_KMALLOC_MINALIGN, -1); | 538 | GFP_KERNEL, ARCH_KMALLOC_MINALIGN, -1); |
| 539 | 539 | ||
| 540 | if (c) { | 540 | if (c) { |
| 541 | c->name = name; | 541 | c->name = name; |
| @@ -3597,7 +3597,7 @@ static int list_locations(struct kmem_cache *s, char *buf, | |||
| 3597 | for (i = 0; i < t.count; i++) { | 3597 | for (i = 0; i < t.count; i++) { |
| 3598 | struct location *l = &t.loc[i]; | 3598 | struct location *l = &t.loc[i]; |
| 3599 | 3599 | ||
| 3600 | if (len > PAGE_SIZE - 100) | 3600 | if (len > PAGE_SIZE - KSYM_SYMBOL_LEN - 100) |
| 3601 | break; | 3601 | break; |
| 3602 | len += sprintf(buf + len, "%7ld ", l->count); | 3602 | len += sprintf(buf + len, "%7ld ", l->count); |
| 3603 | 3603 | ||
| @@ -299,7 +299,6 @@ void lru_add_drain(void) | |||
| 299 | put_cpu(); | 299 | put_cpu(); |
| 300 | } | 300 | } |
| 301 | 301 | ||
| 302 | #if defined(CONFIG_NUMA) || defined(CONFIG_UNEVICTABLE_LRU) | ||
| 303 | static void lru_add_drain_per_cpu(struct work_struct *dummy) | 302 | static void lru_add_drain_per_cpu(struct work_struct *dummy) |
| 304 | { | 303 | { |
| 305 | lru_add_drain(); | 304 | lru_add_drain(); |
| @@ -313,18 +312,6 @@ int lru_add_drain_all(void) | |||
| 313 | return schedule_on_each_cpu(lru_add_drain_per_cpu); | 312 | return schedule_on_each_cpu(lru_add_drain_per_cpu); |
| 314 | } | 313 | } |
| 315 | 314 | ||
| 316 | #else | ||
| 317 | |||
| 318 | /* | ||
| 319 | * Returns 0 for success | ||
| 320 | */ | ||
| 321 | int lru_add_drain_all(void) | ||
| 322 | { | ||
| 323 | lru_add_drain(); | ||
| 324 | return 0; | ||
| 325 | } | ||
| 326 | #endif | ||
| 327 | |||
| 328 | /* | 315 | /* |
| 329 | * Batched page_cache_release(). Decrement the reference count on all the | 316 | * Batched page_cache_release(). Decrement the reference count on all the |
| 330 | * passed pages. If it fell to zero then remove the page from the LRU and | 317 | * passed pages. If it fell to zero then remove the page from the LRU and |
| @@ -445,6 +432,7 @@ void ____pagevec_lru_add(struct pagevec *pvec, enum lru_list lru) | |||
| 445 | for (i = 0; i < pagevec_count(pvec); i++) { | 432 | for (i = 0; i < pagevec_count(pvec); i++) { |
| 446 | struct page *page = pvec->pages[i]; | 433 | struct page *page = pvec->pages[i]; |
| 447 | struct zone *pagezone = page_zone(page); | 434 | struct zone *pagezone = page_zone(page); |
| 435 | int file; | ||
| 448 | 436 | ||
| 449 | if (pagezone != zone) { | 437 | if (pagezone != zone) { |
| 450 | if (zone) | 438 | if (zone) |
| @@ -456,8 +444,12 @@ void ____pagevec_lru_add(struct pagevec *pvec, enum lru_list lru) | |||
| 456 | VM_BUG_ON(PageUnevictable(page)); | 444 | VM_BUG_ON(PageUnevictable(page)); |
| 457 | VM_BUG_ON(PageLRU(page)); | 445 | VM_BUG_ON(PageLRU(page)); |
| 458 | SetPageLRU(page); | 446 | SetPageLRU(page); |
| 459 | if (is_active_lru(lru)) | 447 | file = is_file_lru(lru); |
| 448 | zone->recent_scanned[file]++; | ||
| 449 | if (is_active_lru(lru)) { | ||
| 460 | SetPageActive(page); | 450 | SetPageActive(page); |
| 451 | zone->recent_rotated[file]++; | ||
| 452 | } | ||
| 461 | add_page_to_lru_list(zone, page, lru); | 453 | add_page_to_lru_list(zone, page, lru); |
| 462 | } | 454 | } |
| 463 | if (zone) | 455 | if (zone) |
diff --git a/mm/vmalloc.c b/mm/vmalloc.c index f3f6e0758562..1ddb77ba3995 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c | |||
| @@ -1717,7 +1717,7 @@ static int s_show(struct seq_file *m, void *p) | |||
| 1717 | v->addr, v->addr + v->size, v->size); | 1717 | v->addr, v->addr + v->size, v->size); |
| 1718 | 1718 | ||
| 1719 | if (v->caller) { | 1719 | if (v->caller) { |
| 1720 | char buff[2 * KSYM_NAME_LEN]; | 1720 | char buff[KSYM_SYMBOL_LEN]; |
| 1721 | 1721 | ||
| 1722 | seq_putc(m, ' '); | 1722 | seq_putc(m, ' '); |
| 1723 | sprint_symbol(buff, (unsigned long)v->caller); | 1723 | sprint_symbol(buff, (unsigned long)v->caller); |
diff --git a/net/atm/svc.c b/net/atm/svc.c index de1e4f2f3a43..8fb54dc870b3 100644 --- a/net/atm/svc.c +++ b/net/atm/svc.c | |||
| @@ -293,7 +293,10 @@ static int svc_listen(struct socket *sock,int backlog) | |||
| 293 | error = -EINVAL; | 293 | error = -EINVAL; |
| 294 | goto out; | 294 | goto out; |
| 295 | } | 295 | } |
| 296 | vcc_insert_socket(sk); | 296 | if (test_bit(ATM_VF_LISTEN, &vcc->flags)) { |
| 297 | error = -EADDRINUSE; | ||
| 298 | goto out; | ||
| 299 | } | ||
| 297 | set_bit(ATM_VF_WAITING, &vcc->flags); | 300 | set_bit(ATM_VF_WAITING, &vcc->flags); |
| 298 | prepare_to_wait(sk->sk_sleep, &wait, TASK_UNINTERRUPTIBLE); | 301 | prepare_to_wait(sk->sk_sleep, &wait, TASK_UNINTERRUPTIBLE); |
| 299 | sigd_enq(vcc,as_listen,NULL,NULL,&vcc->local); | 302 | sigd_enq(vcc,as_listen,NULL,NULL,&vcc->local); |
| @@ -307,6 +310,7 @@ static int svc_listen(struct socket *sock,int backlog) | |||
| 307 | goto out; | 310 | goto out; |
| 308 | } | 311 | } |
| 309 | set_bit(ATM_VF_LISTEN,&vcc->flags); | 312 | set_bit(ATM_VF_LISTEN,&vcc->flags); |
| 313 | vcc_insert_socket(sk); | ||
| 310 | sk->sk_max_ack_backlog = backlog > 0 ? backlog : ATM_BACKLOG_DEFAULT; | 314 | sk->sk_max_ack_backlog = backlog > 0 ? backlog : ATM_BACKLOG_DEFAULT; |
| 311 | error = -sk->sk_err; | 315 | error = -sk->sk_err; |
| 312 | out: | 316 | out: |
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c index fa5cda4e552a..45f61c348e36 100644 --- a/net/bridge/br_netfilter.c +++ b/net/bridge/br_netfilter.c | |||
| @@ -101,6 +101,18 @@ static inline __be16 pppoe_proto(const struct sk_buff *skb) | |||
| 101 | pppoe_proto(skb) == htons(PPP_IPV6) && \ | 101 | pppoe_proto(skb) == htons(PPP_IPV6) && \ |
| 102 | brnf_filter_pppoe_tagged) | 102 | brnf_filter_pppoe_tagged) |
| 103 | 103 | ||
| 104 | static void fake_update_pmtu(struct dst_entry *dst, u32 mtu) | ||
| 105 | { | ||
| 106 | } | ||
| 107 | |||
| 108 | static struct dst_ops fake_dst_ops = { | ||
| 109 | .family = AF_INET, | ||
| 110 | .protocol = __constant_htons(ETH_P_IP), | ||
| 111 | .update_pmtu = fake_update_pmtu, | ||
| 112 | .entry_size = sizeof(struct rtable), | ||
| 113 | .entries = ATOMIC_INIT(0), | ||
| 114 | }; | ||
| 115 | |||
| 104 | /* | 116 | /* |
| 105 | * Initialize bogus route table used to keep netfilter happy. | 117 | * Initialize bogus route table used to keep netfilter happy. |
| 106 | * Currently, we fill in the PMTU entry because netfilter | 118 | * Currently, we fill in the PMTU entry because netfilter |
| @@ -117,6 +129,7 @@ void br_netfilter_rtable_init(struct net_bridge *br) | |||
| 117 | rt->u.dst.path = &rt->u.dst; | 129 | rt->u.dst.path = &rt->u.dst; |
| 118 | rt->u.dst.metrics[RTAX_MTU - 1] = 1500; | 130 | rt->u.dst.metrics[RTAX_MTU - 1] = 1500; |
| 119 | rt->u.dst.flags = DST_NOXFRM; | 131 | rt->u.dst.flags = DST_NOXFRM; |
| 132 | rt->u.dst.ops = &fake_dst_ops; | ||
| 120 | } | 133 | } |
| 121 | 134 | ||
| 122 | static inline struct rtable *bridge_parent_rtable(const struct net_device *dev) | 135 | static inline struct rtable *bridge_parent_rtable(const struct net_device *dev) |
diff --git a/net/can/af_can.c b/net/can/af_can.c index 7d4d2b3c137e..3dadb338addd 100644 --- a/net/can/af_can.c +++ b/net/can/af_can.c | |||
| @@ -319,23 +319,52 @@ static struct dev_rcv_lists *find_dev_rcv_lists(struct net_device *dev) | |||
| 319 | return n ? d : NULL; | 319 | return n ? d : NULL; |
| 320 | } | 320 | } |
| 321 | 321 | ||
| 322 | /** | ||
| 323 | * find_rcv_list - determine optimal filterlist inside device filter struct | ||
| 324 | * @can_id: pointer to CAN identifier of a given can_filter | ||
| 325 | * @mask: pointer to CAN mask of a given can_filter | ||
| 326 | * @d: pointer to the device filter struct | ||
| 327 | * | ||
| 328 | * Description: | ||
| 329 | * Returns the optimal filterlist to reduce the filter handling in the | ||
| 330 | * receive path. This function is called by service functions that need | ||
| 331 | * to register or unregister a can_filter in the filter lists. | ||
| 332 | * | ||
| 333 | * A filter matches in general, when | ||
| 334 | * | ||
| 335 | * <received_can_id> & mask == can_id & mask | ||
| 336 | * | ||
| 337 | * so every bit set in the mask (even CAN_EFF_FLAG, CAN_RTR_FLAG) describe | ||
| 338 | * relevant bits for the filter. | ||
| 339 | * | ||
| 340 | * The filter can be inverted (CAN_INV_FILTER bit set in can_id) or it can | ||
| 341 | * filter for error frames (CAN_ERR_FLAG bit set in mask). For error frames | ||
| 342 | * there is a special filterlist and a special rx path filter handling. | ||
| 343 | * | ||
| 344 | * Return: | ||
| 345 | * Pointer to optimal filterlist for the given can_id/mask pair. | ||
| 346 | * Constistency checked mask. | ||
| 347 | * Reduced can_id to have a preprocessed filter compare value. | ||
| 348 | */ | ||
| 322 | static struct hlist_head *find_rcv_list(canid_t *can_id, canid_t *mask, | 349 | static struct hlist_head *find_rcv_list(canid_t *can_id, canid_t *mask, |
| 323 | struct dev_rcv_lists *d) | 350 | struct dev_rcv_lists *d) |
| 324 | { | 351 | { |
| 325 | canid_t inv = *can_id & CAN_INV_FILTER; /* save flag before masking */ | 352 | canid_t inv = *can_id & CAN_INV_FILTER; /* save flag before masking */ |
| 326 | 353 | ||
| 327 | /* filter error frames */ | 354 | /* filter for error frames in extra filterlist */ |
| 328 | if (*mask & CAN_ERR_FLAG) { | 355 | if (*mask & CAN_ERR_FLAG) { |
| 329 | /* clear CAN_ERR_FLAG in list entry */ | 356 | /* clear CAN_ERR_FLAG in filter entry */ |
| 330 | *mask &= CAN_ERR_MASK; | 357 | *mask &= CAN_ERR_MASK; |
| 331 | return &d->rx[RX_ERR]; | 358 | return &d->rx[RX_ERR]; |
| 332 | } | 359 | } |
| 333 | 360 | ||
| 334 | /* ensure valid values in can_mask */ | 361 | /* with cleared CAN_ERR_FLAG we have a simple mask/value filterpair */ |
| 335 | if (*mask & CAN_EFF_FLAG) | 362 | |
| 336 | *mask &= (CAN_EFF_MASK | CAN_EFF_FLAG | CAN_RTR_FLAG); | 363 | #define CAN_EFF_RTR_FLAGS (CAN_EFF_FLAG | CAN_RTR_FLAG) |
| 337 | else | 364 | |
| 338 | *mask &= (CAN_SFF_MASK | CAN_RTR_FLAG); | 365 | /* ensure valid values in can_mask for 'SFF only' frame filtering */ |
| 366 | if ((*mask & CAN_EFF_FLAG) && !(*can_id & CAN_EFF_FLAG)) | ||
| 367 | *mask &= (CAN_SFF_MASK | CAN_EFF_RTR_FLAGS); | ||
| 339 | 368 | ||
| 340 | /* reduce condition testing at receive time */ | 369 | /* reduce condition testing at receive time */ |
| 341 | *can_id &= *mask; | 370 | *can_id &= *mask; |
| @@ -348,15 +377,19 @@ static struct hlist_head *find_rcv_list(canid_t *can_id, canid_t *mask, | |||
| 348 | if (!(*mask)) | 377 | if (!(*mask)) |
| 349 | return &d->rx[RX_ALL]; | 378 | return &d->rx[RX_ALL]; |
| 350 | 379 | ||
| 351 | /* use extra filterset for the subscription of exactly *ONE* can_id */ | 380 | /* extra filterlists for the subscription of a single non-RTR can_id */ |
| 352 | if (*can_id & CAN_EFF_FLAG) { | 381 | if (((*mask & CAN_EFF_RTR_FLAGS) == CAN_EFF_RTR_FLAGS) |
| 353 | if (*mask == (CAN_EFF_MASK | CAN_EFF_FLAG)) { | 382 | && !(*can_id & CAN_RTR_FLAG)) { |
| 354 | /* RFC: a use-case for hash-tables in the future? */ | 383 | |
| 355 | return &d->rx[RX_EFF]; | 384 | if (*can_id & CAN_EFF_FLAG) { |
| 385 | if (*mask == (CAN_EFF_MASK | CAN_EFF_RTR_FLAGS)) { | ||
| 386 | /* RFC: a future use-case for hash-tables? */ | ||
| 387 | return &d->rx[RX_EFF]; | ||
| 388 | } | ||
| 389 | } else { | ||
| 390 | if (*mask == (CAN_SFF_MASK | CAN_EFF_RTR_FLAGS)) | ||
| 391 | return &d->rx_sff[*can_id]; | ||
| 356 | } | 392 | } |
| 357 | } else { | ||
| 358 | if (*mask == CAN_SFF_MASK) | ||
| 359 | return &d->rx_sff[*can_id]; | ||
| 360 | } | 393 | } |
| 361 | 394 | ||
| 362 | /* default: filter via can_id/can_mask */ | 395 | /* default: filter via can_id/can_mask */ |
| @@ -589,7 +622,10 @@ static int can_rcv_filter(struct dev_rcv_lists *d, struct sk_buff *skb) | |||
| 589 | } | 622 | } |
| 590 | } | 623 | } |
| 591 | 624 | ||
| 592 | /* check CAN_ID specific entries */ | 625 | /* check filterlists for single non-RTR can_ids */ |
| 626 | if (can_id & CAN_RTR_FLAG) | ||
| 627 | return matches; | ||
| 628 | |||
| 593 | if (can_id & CAN_EFF_FLAG) { | 629 | if (can_id & CAN_EFF_FLAG) { |
| 594 | hlist_for_each_entry_rcu(r, n, &d->rx[RX_EFF], list) { | 630 | hlist_for_each_entry_rcu(r, n, &d->rx[RX_EFF], list) { |
| 595 | if (r->can_id == can_id) { | 631 | if (r->can_id == can_id) { |
diff --git a/net/can/bcm.c b/net/can/bcm.c index d0dd382001e2..da0d426c0ce4 100644 --- a/net/can/bcm.c +++ b/net/can/bcm.c | |||
| @@ -64,10 +64,11 @@ | |||
| 64 | #define BCM_CAN_DLC_MASK 0x0F /* clean private flags in can_dlc by masking */ | 64 | #define BCM_CAN_DLC_MASK 0x0F /* clean private flags in can_dlc by masking */ |
| 65 | 65 | ||
| 66 | /* get best masking value for can_rx_register() for a given single can_id */ | 66 | /* get best masking value for can_rx_register() for a given single can_id */ |
| 67 | #define REGMASK(id) ((id & CAN_RTR_FLAG) | ((id & CAN_EFF_FLAG) ? \ | 67 | #define REGMASK(id) ((id & CAN_EFF_FLAG) ? \ |
| 68 | (CAN_EFF_MASK | CAN_EFF_FLAG) : CAN_SFF_MASK)) | 68 | (CAN_EFF_MASK | CAN_EFF_FLAG | CAN_RTR_FLAG) : \ |
| 69 | (CAN_SFF_MASK | CAN_EFF_FLAG | CAN_RTR_FLAG)) | ||
| 69 | 70 | ||
| 70 | #define CAN_BCM_VERSION "20080415" | 71 | #define CAN_BCM_VERSION CAN_VERSION |
| 71 | static __initdata const char banner[] = KERN_INFO | 72 | static __initdata const char banner[] = KERN_INFO |
| 72 | "can: broadcast manager protocol (rev " CAN_BCM_VERSION ")\n"; | 73 | "can: broadcast manager protocol (rev " CAN_BCM_VERSION ")\n"; |
| 73 | 74 | ||
diff --git a/net/core/netpoll.c b/net/core/netpoll.c index 6c7af390be0a..dadac6281f20 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c | |||
| @@ -133,9 +133,11 @@ static int poll_one_napi(struct netpoll_info *npinfo, | |||
| 133 | 133 | ||
| 134 | npinfo->rx_flags |= NETPOLL_RX_DROP; | 134 | npinfo->rx_flags |= NETPOLL_RX_DROP; |
| 135 | atomic_inc(&trapped); | 135 | atomic_inc(&trapped); |
| 136 | set_bit(NAPI_STATE_NPSVC, &napi->state); | ||
| 136 | 137 | ||
| 137 | work = napi->poll(napi, budget); | 138 | work = napi->poll(napi, budget); |
| 138 | 139 | ||
| 140 | clear_bit(NAPI_STATE_NPSVC, &napi->state); | ||
| 139 | atomic_dec(&trapped); | 141 | atomic_dec(&trapped); |
| 140 | npinfo->rx_flags &= ~NETPOLL_RX_DROP; | 142 | npinfo->rx_flags &= ~NETPOLL_RX_DROP; |
| 141 | 143 | ||
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index d49ef8301b5b..65f7757465bd 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c | |||
| @@ -149,7 +149,7 @@ void skb_under_panic(struct sk_buff *skb, int sz, void *here) | |||
| 149 | 149 | ||
| 150 | void skb_truesize_bug(struct sk_buff *skb) | 150 | void skb_truesize_bug(struct sk_buff *skb) |
| 151 | { | 151 | { |
| 152 | printk(KERN_ERR "SKB BUG: Invalid truesize (%u) " | 152 | WARN(net_ratelimit(), KERN_ERR "SKB BUG: Invalid truesize (%u) " |
| 153 | "len=%u, sizeof(sk_buff)=%Zd\n", | 153 | "len=%u, sizeof(sk_buff)=%Zd\n", |
| 154 | skb->truesize, skb->len, sizeof(struct sk_buff)); | 154 | skb->truesize, skb->len, sizeof(struct sk_buff)); |
| 155 | } | 155 | } |
diff --git a/net/core/sock.c b/net/core/sock.c index 341e39456952..edf7220889a4 100644 --- a/net/core/sock.c +++ b/net/core/sock.c | |||
| @@ -2035,9 +2035,6 @@ static inline void release_proto_idx(struct proto *prot) | |||
| 2035 | 2035 | ||
| 2036 | int proto_register(struct proto *prot, int alloc_slab) | 2036 | int proto_register(struct proto *prot, int alloc_slab) |
| 2037 | { | 2037 | { |
| 2038 | char *request_sock_slab_name = NULL; | ||
| 2039 | char *timewait_sock_slab_name; | ||
| 2040 | |||
| 2041 | if (alloc_slab) { | 2038 | if (alloc_slab) { |
| 2042 | prot->slab = kmem_cache_create(prot->name, prot->obj_size, 0, | 2039 | prot->slab = kmem_cache_create(prot->name, prot->obj_size, 0, |
| 2043 | SLAB_HWCACHE_ALIGN, NULL); | 2040 | SLAB_HWCACHE_ALIGN, NULL); |
| @@ -2051,12 +2048,12 @@ int proto_register(struct proto *prot, int alloc_slab) | |||
| 2051 | if (prot->rsk_prot != NULL) { | 2048 | if (prot->rsk_prot != NULL) { |
| 2052 | static const char mask[] = "request_sock_%s"; | 2049 | static const char mask[] = "request_sock_%s"; |
| 2053 | 2050 | ||
| 2054 | request_sock_slab_name = kmalloc(strlen(prot->name) + sizeof(mask) - 1, GFP_KERNEL); | 2051 | prot->rsk_prot->slab_name = kmalloc(strlen(prot->name) + sizeof(mask) - 1, GFP_KERNEL); |
| 2055 | if (request_sock_slab_name == NULL) | 2052 | if (prot->rsk_prot->slab_name == NULL) |
| 2056 | goto out_free_sock_slab; | 2053 | goto out_free_sock_slab; |
| 2057 | 2054 | ||
| 2058 | sprintf(request_sock_slab_name, mask, prot->name); | 2055 | sprintf(prot->rsk_prot->slab_name, mask, prot->name); |
| 2059 | prot->rsk_prot->slab = kmem_cache_create(request_sock_slab_name, | 2056 | prot->rsk_prot->slab = kmem_cache_create(prot->rsk_prot->slab_name, |
| 2060 | prot->rsk_prot->obj_size, 0, | 2057 | prot->rsk_prot->obj_size, 0, |
| 2061 | SLAB_HWCACHE_ALIGN, NULL); | 2058 | SLAB_HWCACHE_ALIGN, NULL); |
| 2062 | 2059 | ||
| @@ -2070,14 +2067,14 @@ int proto_register(struct proto *prot, int alloc_slab) | |||
| 2070 | if (prot->twsk_prot != NULL) { | 2067 | if (prot->twsk_prot != NULL) { |
| 2071 | static const char mask[] = "tw_sock_%s"; | 2068 | static const char mask[] = "tw_sock_%s"; |
| 2072 | 2069 | ||
| 2073 | timewait_sock_slab_name = kmalloc(strlen(prot->name) + sizeof(mask) - 1, GFP_KERNEL); | 2070 | prot->twsk_prot->twsk_slab_name = kmalloc(strlen(prot->name) + sizeof(mask) - 1, GFP_KERNEL); |
| 2074 | 2071 | ||
| 2075 | if (timewait_sock_slab_name == NULL) | 2072 | if (prot->twsk_prot->twsk_slab_name == NULL) |
| 2076 | goto out_free_request_sock_slab; | 2073 | goto out_free_request_sock_slab; |
| 2077 | 2074 | ||
| 2078 | sprintf(timewait_sock_slab_name, mask, prot->name); | 2075 | sprintf(prot->twsk_prot->twsk_slab_name, mask, prot->name); |
| 2079 | prot->twsk_prot->twsk_slab = | 2076 | prot->twsk_prot->twsk_slab = |
| 2080 | kmem_cache_create(timewait_sock_slab_name, | 2077 | kmem_cache_create(prot->twsk_prot->twsk_slab_name, |
| 2081 | prot->twsk_prot->twsk_obj_size, | 2078 | prot->twsk_prot->twsk_obj_size, |
| 2082 | 0, SLAB_HWCACHE_ALIGN, | 2079 | 0, SLAB_HWCACHE_ALIGN, |
| 2083 | NULL); | 2080 | NULL); |
| @@ -2093,14 +2090,14 @@ int proto_register(struct proto *prot, int alloc_slab) | |||
| 2093 | return 0; | 2090 | return 0; |
| 2094 | 2091 | ||
| 2095 | out_free_timewait_sock_slab_name: | 2092 | out_free_timewait_sock_slab_name: |
| 2096 | kfree(timewait_sock_slab_name); | 2093 | kfree(prot->twsk_prot->twsk_slab_name); |
| 2097 | out_free_request_sock_slab: | 2094 | out_free_request_sock_slab: |
| 2098 | if (prot->rsk_prot && prot->rsk_prot->slab) { | 2095 | if (prot->rsk_prot && prot->rsk_prot->slab) { |
| 2099 | kmem_cache_destroy(prot->rsk_prot->slab); | 2096 | kmem_cache_destroy(prot->rsk_prot->slab); |
| 2100 | prot->rsk_prot->slab = NULL; | 2097 | prot->rsk_prot->slab = NULL; |
| 2101 | } | 2098 | } |
| 2102 | out_free_request_sock_slab_name: | 2099 | out_free_request_sock_slab_name: |
| 2103 | kfree(request_sock_slab_name); | 2100 | kfree(prot->rsk_prot->slab_name); |
| 2104 | out_free_sock_slab: | 2101 | out_free_sock_slab: |
| 2105 | kmem_cache_destroy(prot->slab); | 2102 | kmem_cache_destroy(prot->slab); |
| 2106 | prot->slab = NULL; | 2103 | prot->slab = NULL; |
| @@ -2123,18 +2120,14 @@ void proto_unregister(struct proto *prot) | |||
| 2123 | } | 2120 | } |
| 2124 | 2121 | ||
| 2125 | if (prot->rsk_prot != NULL && prot->rsk_prot->slab != NULL) { | 2122 | if (prot->rsk_prot != NULL && prot->rsk_prot->slab != NULL) { |
| 2126 | const char *name = kmem_cache_name(prot->rsk_prot->slab); | ||
| 2127 | |||
| 2128 | kmem_cache_destroy(prot->rsk_prot->slab); | 2123 | kmem_cache_destroy(prot->rsk_prot->slab); |
| 2129 | kfree(name); | 2124 | kfree(prot->rsk_prot->slab_name); |
| 2130 | prot->rsk_prot->slab = NULL; | 2125 | prot->rsk_prot->slab = NULL; |
| 2131 | } | 2126 | } |
| 2132 | 2127 | ||
| 2133 | if (prot->twsk_prot != NULL && prot->twsk_prot->twsk_slab != NULL) { | 2128 | if (prot->twsk_prot != NULL && prot->twsk_prot->twsk_slab != NULL) { |
| 2134 | const char *name = kmem_cache_name(prot->twsk_prot->twsk_slab); | ||
| 2135 | |||
| 2136 | kmem_cache_destroy(prot->twsk_prot->twsk_slab); | 2129 | kmem_cache_destroy(prot->twsk_prot->twsk_slab); |
| 2137 | kfree(name); | 2130 | kfree(prot->twsk_prot->twsk_slab_name); |
| 2138 | prot->twsk_prot->twsk_slab = NULL; | 2131 | prot->twsk_prot->twsk_slab = NULL; |
| 2139 | } | 2132 | } |
| 2140 | } | 2133 | } |
diff --git a/net/ipv4/netfilter/nf_nat_rule.c b/net/ipv4/netfilter/nf_nat_rule.c index bea54a685109..8d489e746b21 100644 --- a/net/ipv4/netfilter/nf_nat_rule.c +++ b/net/ipv4/netfilter/nf_nat_rule.c | |||
| @@ -61,7 +61,7 @@ static struct | |||
| 61 | static struct xt_table nat_table = { | 61 | static struct xt_table nat_table = { |
| 62 | .name = "nat", | 62 | .name = "nat", |
| 63 | .valid_hooks = NAT_VALID_HOOKS, | 63 | .valid_hooks = NAT_VALID_HOOKS, |
| 64 | .lock = __RW_LOCK_UNLOCKED(__nat_table.lock), | 64 | .lock = __RW_LOCK_UNLOCKED(nat_table.lock), |
| 65 | .me = THIS_MODULE, | 65 | .me = THIS_MODULE, |
| 66 | .af = AF_INET, | 66 | .af = AF_INET, |
| 67 | }; | 67 | }; |
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index ba85d8831893..fe3b4bdfd251 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c | |||
| @@ -1028,10 +1028,6 @@ unsigned int tcp_sync_mss(struct sock *sk, u32 pmtu) | |||
| 1028 | 1028 | ||
| 1029 | /* Compute the current effective MSS, taking SACKs and IP options, | 1029 | /* Compute the current effective MSS, taking SACKs and IP options, |
| 1030 | * and even PMTU discovery events into account. | 1030 | * and even PMTU discovery events into account. |
| 1031 | * | ||
| 1032 | * LARGESEND note: !tcp_urg_mode is overkill, only frames up to snd_up | ||
| 1033 | * cannot be large. However, taking into account rare use of URG, this | ||
| 1034 | * is not a big flaw. | ||
| 1035 | */ | 1031 | */ |
| 1036 | unsigned int tcp_current_mss(struct sock *sk, int large_allowed) | 1032 | unsigned int tcp_current_mss(struct sock *sk, int large_allowed) |
| 1037 | { | 1033 | { |
| @@ -1046,7 +1042,7 @@ unsigned int tcp_current_mss(struct sock *sk, int large_allowed) | |||
| 1046 | 1042 | ||
| 1047 | mss_now = tp->mss_cache; | 1043 | mss_now = tp->mss_cache; |
| 1048 | 1044 | ||
| 1049 | if (large_allowed && sk_can_gso(sk) && !tcp_urg_mode(tp)) | 1045 | if (large_allowed && sk_can_gso(sk)) |
| 1050 | doing_tso = 1; | 1046 | doing_tso = 1; |
| 1051 | 1047 | ||
| 1052 | if (dst) { | 1048 | if (dst) { |
| @@ -1516,6 +1512,10 @@ static int tcp_mtu_probe(struct sock *sk) | |||
| 1516 | * send_head. This happens as incoming acks open up the remote | 1512 | * send_head. This happens as incoming acks open up the remote |
| 1517 | * window for us. | 1513 | * window for us. |
| 1518 | * | 1514 | * |
| 1515 | * LARGESEND note: !tcp_urg_mode is overkill, only frames between | ||
| 1516 | * snd_up-64k-mss .. snd_up cannot be large. However, taking into | ||
| 1517 | * account rare use of URG, this is not a big flaw. | ||
| 1518 | * | ||
| 1519 | * Returns 1, if no segments are in flight and we have queued segments, but | 1519 | * Returns 1, if no segments are in flight and we have queued segments, but |
| 1520 | * cannot send anything now because of SWS or another problem. | 1520 | * cannot send anything now because of SWS or another problem. |
| 1521 | */ | 1521 | */ |
| @@ -1567,7 +1567,7 @@ static int tcp_write_xmit(struct sock *sk, unsigned int mss_now, int nonagle) | |||
| 1567 | } | 1567 | } |
| 1568 | 1568 | ||
| 1569 | limit = mss_now; | 1569 | limit = mss_now; |
| 1570 | if (tso_segs > 1) | 1570 | if (tso_segs > 1 && !tcp_urg_mode(tp)) |
| 1571 | limit = tcp_mss_split_point(sk, skb, mss_now, | 1571 | limit = tcp_mss_split_point(sk, skb, mss_now, |
| 1572 | cwnd_quota); | 1572 | cwnd_quota); |
| 1573 | 1573 | ||
| @@ -1616,6 +1616,7 @@ void __tcp_push_pending_frames(struct sock *sk, unsigned int cur_mss, | |||
| 1616 | */ | 1616 | */ |
| 1617 | void tcp_push_one(struct sock *sk, unsigned int mss_now) | 1617 | void tcp_push_one(struct sock *sk, unsigned int mss_now) |
| 1618 | { | 1618 | { |
| 1619 | struct tcp_sock *tp = tcp_sk(sk); | ||
| 1619 | struct sk_buff *skb = tcp_send_head(sk); | 1620 | struct sk_buff *skb = tcp_send_head(sk); |
| 1620 | unsigned int tso_segs, cwnd_quota; | 1621 | unsigned int tso_segs, cwnd_quota; |
| 1621 | 1622 | ||
| @@ -1630,7 +1631,7 @@ void tcp_push_one(struct sock *sk, unsigned int mss_now) | |||
| 1630 | BUG_ON(!tso_segs); | 1631 | BUG_ON(!tso_segs); |
| 1631 | 1632 | ||
| 1632 | limit = mss_now; | 1633 | limit = mss_now; |
| 1633 | if (tso_segs > 1) | 1634 | if (tso_segs > 1 && !tcp_urg_mode(tp)) |
| 1634 | limit = tcp_mss_split_point(sk, skb, mss_now, | 1635 | limit = tcp_mss_split_point(sk, skb, mss_now, |
| 1635 | cwnd_quota); | 1636 | cwnd_quota); |
| 1636 | 1637 | ||
diff --git a/net/ipv4/tcp_vegas.c b/net/ipv4/tcp_vegas.c index 14504dada116..a453aac91bd3 100644 --- a/net/ipv4/tcp_vegas.c +++ b/net/ipv4/tcp_vegas.c | |||
| @@ -40,18 +40,14 @@ | |||
| 40 | 40 | ||
| 41 | #include "tcp_vegas.h" | 41 | #include "tcp_vegas.h" |
| 42 | 42 | ||
| 43 | /* Default values of the Vegas variables, in fixed-point representation | 43 | static int alpha = 2; |
| 44 | * with V_PARAM_SHIFT bits to the right of the binary point. | 44 | static int beta = 4; |
| 45 | */ | 45 | static int gamma = 1; |
| 46 | #define V_PARAM_SHIFT 1 | ||
| 47 | static int alpha = 2<<V_PARAM_SHIFT; | ||
| 48 | static int beta = 4<<V_PARAM_SHIFT; | ||
| 49 | static int gamma = 1<<V_PARAM_SHIFT; | ||
| 50 | 46 | ||
| 51 | module_param(alpha, int, 0644); | 47 | module_param(alpha, int, 0644); |
| 52 | MODULE_PARM_DESC(alpha, "lower bound of packets in network (scale by 2)"); | 48 | MODULE_PARM_DESC(alpha, "lower bound of packets in network"); |
| 53 | module_param(beta, int, 0644); | 49 | module_param(beta, int, 0644); |
| 54 | MODULE_PARM_DESC(beta, "upper bound of packets in network (scale by 2)"); | 50 | MODULE_PARM_DESC(beta, "upper bound of packets in network"); |
| 55 | module_param(gamma, int, 0644); | 51 | module_param(gamma, int, 0644); |
| 56 | MODULE_PARM_DESC(gamma, "limit on increase (scale by 2)"); | 52 | MODULE_PARM_DESC(gamma, "limit on increase (scale by 2)"); |
| 57 | 53 | ||
| @@ -172,49 +168,13 @@ static void tcp_vegas_cong_avoid(struct sock *sk, u32 ack, u32 in_flight) | |||
| 172 | return; | 168 | return; |
| 173 | } | 169 | } |
| 174 | 170 | ||
| 175 | /* The key players are v_beg_snd_una and v_beg_snd_nxt. | ||
| 176 | * | ||
| 177 | * These are so named because they represent the approximate values | ||
| 178 | * of snd_una and snd_nxt at the beginning of the current RTT. More | ||
| 179 | * precisely, they represent the amount of data sent during the RTT. | ||
| 180 | * At the end of the RTT, when we receive an ACK for v_beg_snd_nxt, | ||
| 181 | * we will calculate that (v_beg_snd_nxt - v_beg_snd_una) outstanding | ||
| 182 | * bytes of data have been ACKed during the course of the RTT, giving | ||
| 183 | * an "actual" rate of: | ||
| 184 | * | ||
| 185 | * (v_beg_snd_nxt - v_beg_snd_una) / (rtt duration) | ||
| 186 | * | ||
| 187 | * Unfortunately, v_beg_snd_una is not exactly equal to snd_una, | ||
| 188 | * because delayed ACKs can cover more than one segment, so they | ||
| 189 | * don't line up nicely with the boundaries of RTTs. | ||
| 190 | * | ||
| 191 | * Another unfortunate fact of life is that delayed ACKs delay the | ||
| 192 | * advance of the left edge of our send window, so that the number | ||
| 193 | * of bytes we send in an RTT is often less than our cwnd will allow. | ||
| 194 | * So we keep track of our cwnd separately, in v_beg_snd_cwnd. | ||
| 195 | */ | ||
| 196 | |||
| 197 | if (after(ack, vegas->beg_snd_nxt)) { | 171 | if (after(ack, vegas->beg_snd_nxt)) { |
| 198 | /* Do the Vegas once-per-RTT cwnd adjustment. */ | 172 | /* Do the Vegas once-per-RTT cwnd adjustment. */ |
| 199 | u32 old_wnd, old_snd_cwnd; | ||
| 200 | |||
| 201 | |||
| 202 | /* Here old_wnd is essentially the window of data that was | ||
| 203 | * sent during the previous RTT, and has all | ||
| 204 | * been acknowledged in the course of the RTT that ended | ||
| 205 | * with the ACK we just received. Likewise, old_snd_cwnd | ||
| 206 | * is the cwnd during the previous RTT. | ||
| 207 | */ | ||
| 208 | old_wnd = (vegas->beg_snd_nxt - vegas->beg_snd_una) / | ||
| 209 | tp->mss_cache; | ||
| 210 | old_snd_cwnd = vegas->beg_snd_cwnd; | ||
| 211 | 173 | ||
| 212 | /* Save the extent of the current window so we can use this | 174 | /* Save the extent of the current window so we can use this |
| 213 | * at the end of the next RTT. | 175 | * at the end of the next RTT. |
| 214 | */ | 176 | */ |
| 215 | vegas->beg_snd_una = vegas->beg_snd_nxt; | ||
| 216 | vegas->beg_snd_nxt = tp->snd_nxt; | 177 | vegas->beg_snd_nxt = tp->snd_nxt; |
| 217 | vegas->beg_snd_cwnd = tp->snd_cwnd; | ||
| 218 | 178 | ||
| 219 | /* We do the Vegas calculations only if we got enough RTT | 179 | /* We do the Vegas calculations only if we got enough RTT |
| 220 | * samples that we can be reasonably sure that we got | 180 | * samples that we can be reasonably sure that we got |
| @@ -252,22 +212,14 @@ static void tcp_vegas_cong_avoid(struct sock *sk, u32 ack, u32 in_flight) | |||
| 252 | * | 212 | * |
| 253 | * This is: | 213 | * This is: |
| 254 | * (actual rate in segments) * baseRTT | 214 | * (actual rate in segments) * baseRTT |
| 255 | * We keep it as a fixed point number with | ||
| 256 | * V_PARAM_SHIFT bits to the right of the binary point. | ||
| 257 | */ | 215 | */ |
| 258 | target_cwnd = ((u64)old_wnd * vegas->baseRTT); | 216 | target_cwnd = tp->snd_cwnd * vegas->baseRTT / rtt; |
| 259 | target_cwnd <<= V_PARAM_SHIFT; | ||
| 260 | do_div(target_cwnd, rtt); | ||
| 261 | 217 | ||
| 262 | /* Calculate the difference between the window we had, | 218 | /* Calculate the difference between the window we had, |
| 263 | * and the window we would like to have. This quantity | 219 | * and the window we would like to have. This quantity |
| 264 | * is the "Diff" from the Arizona Vegas papers. | 220 | * is the "Diff" from the Arizona Vegas papers. |
| 265 | * | ||
| 266 | * Again, this is a fixed point number with | ||
| 267 | * V_PARAM_SHIFT bits to the right of the binary | ||
| 268 | * point. | ||
| 269 | */ | 221 | */ |
| 270 | diff = (old_wnd << V_PARAM_SHIFT) - target_cwnd; | 222 | diff = tp->snd_cwnd * (rtt-vegas->baseRTT) / vegas->baseRTT; |
| 271 | 223 | ||
| 272 | if (diff > gamma && tp->snd_ssthresh > 2 ) { | 224 | if (diff > gamma && tp->snd_ssthresh > 2 ) { |
| 273 | /* Going too fast. Time to slow down | 225 | /* Going too fast. Time to slow down |
| @@ -282,16 +234,13 @@ static void tcp_vegas_cong_avoid(struct sock *sk, u32 ack, u32 in_flight) | |||
| 282 | * truncation robs us of full link | 234 | * truncation robs us of full link |
| 283 | * utilization. | 235 | * utilization. |
| 284 | */ | 236 | */ |
| 285 | tp->snd_cwnd = min(tp->snd_cwnd, | 237 | tp->snd_cwnd = min(tp->snd_cwnd, (u32)target_cwnd+1); |
| 286 | ((u32)target_cwnd >> | ||
| 287 | V_PARAM_SHIFT)+1); | ||
| 288 | 238 | ||
| 289 | } else if (tp->snd_cwnd <= tp->snd_ssthresh) { | 239 | } else if (tp->snd_cwnd <= tp->snd_ssthresh) { |
| 290 | /* Slow start. */ | 240 | /* Slow start. */ |
| 291 | tcp_slow_start(tp); | 241 | tcp_slow_start(tp); |
| 292 | } else { | 242 | } else { |
| 293 | /* Congestion avoidance. */ | 243 | /* Congestion avoidance. */ |
| 294 | u32 next_snd_cwnd; | ||
| 295 | 244 | ||
| 296 | /* Figure out where we would like cwnd | 245 | /* Figure out where we would like cwnd |
| 297 | * to be. | 246 | * to be. |
| @@ -300,32 +249,25 @@ static void tcp_vegas_cong_avoid(struct sock *sk, u32 ack, u32 in_flight) | |||
| 300 | /* The old window was too fast, so | 249 | /* The old window was too fast, so |
| 301 | * we slow down. | 250 | * we slow down. |
| 302 | */ | 251 | */ |
| 303 | next_snd_cwnd = old_snd_cwnd - 1; | 252 | tp->snd_cwnd--; |
| 304 | } else if (diff < alpha) { | 253 | } else if (diff < alpha) { |
| 305 | /* We don't have enough extra packets | 254 | /* We don't have enough extra packets |
| 306 | * in the network, so speed up. | 255 | * in the network, so speed up. |
| 307 | */ | 256 | */ |
| 308 | next_snd_cwnd = old_snd_cwnd + 1; | 257 | tp->snd_cwnd++; |
| 309 | } else { | 258 | } else { |
| 310 | /* Sending just as fast as we | 259 | /* Sending just as fast as we |
| 311 | * should be. | 260 | * should be. |
| 312 | */ | 261 | */ |
| 313 | next_snd_cwnd = old_snd_cwnd; | ||
| 314 | } | 262 | } |
| 315 | |||
| 316 | /* Adjust cwnd upward or downward, toward the | ||
| 317 | * desired value. | ||
| 318 | */ | ||
| 319 | if (next_snd_cwnd > tp->snd_cwnd) | ||
| 320 | tp->snd_cwnd++; | ||
| 321 | else if (next_snd_cwnd < tp->snd_cwnd) | ||
| 322 | tp->snd_cwnd--; | ||
| 323 | } | 263 | } |
| 324 | 264 | ||
| 325 | if (tp->snd_cwnd < 2) | 265 | if (tp->snd_cwnd < 2) |
| 326 | tp->snd_cwnd = 2; | 266 | tp->snd_cwnd = 2; |
| 327 | else if (tp->snd_cwnd > tp->snd_cwnd_clamp) | 267 | else if (tp->snd_cwnd > tp->snd_cwnd_clamp) |
| 328 | tp->snd_cwnd = tp->snd_cwnd_clamp; | 268 | tp->snd_cwnd = tp->snd_cwnd_clamp; |
| 269 | |||
| 270 | tp->snd_ssthresh = tcp_current_ssthresh(sk); | ||
| 329 | } | 271 | } |
| 330 | 272 | ||
| 331 | /* Wipe the slate clean for the next RTT. */ | 273 | /* Wipe the slate clean for the next RTT. */ |
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index 172438320eec..d0f54d18e19b 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c | |||
| @@ -912,8 +912,13 @@ static void ndisc_recv_na(struct sk_buff *skb) | |||
| 912 | is invalid, but ndisc specs say nothing | 912 | is invalid, but ndisc specs say nothing |
| 913 | about it. It could be misconfiguration, or | 913 | about it. It could be misconfiguration, or |
| 914 | an smart proxy agent tries to help us :-) | 914 | an smart proxy agent tries to help us :-) |
| 915 | |||
| 916 | We should not print the error if NA has been | ||
| 917 | received from loopback - it is just our own | ||
| 918 | unsolicited advertisement. | ||
| 915 | */ | 919 | */ |
| 916 | ND_PRINTK1(KERN_WARNING | 920 | if (skb->pkt_type != PACKET_LOOPBACK) |
| 921 | ND_PRINTK1(KERN_WARNING | ||
| 917 | "ICMPv6 NA: someone advertises our address on %s!\n", | 922 | "ICMPv6 NA: someone advertises our address on %s!\n", |
| 918 | ifp->idev->dev->name); | 923 | ifp->idev->dev->name); |
| 919 | in6_ifa_put(ifp); | 924 | in6_ifa_put(ifp); |
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index 7fef8ea1f5ec..d254446b85b5 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c | |||
| @@ -99,7 +99,7 @@ struct sta_info *sta_info_get(struct ieee80211_local *local, const u8 *addr) | |||
| 99 | 99 | ||
| 100 | sta = rcu_dereference(local->sta_hash[STA_HASH(addr)]); | 100 | sta = rcu_dereference(local->sta_hash[STA_HASH(addr)]); |
| 101 | while (sta) { | 101 | while (sta) { |
| 102 | if (compare_ether_addr(sta->sta.addr, addr) == 0) | 102 | if (memcmp(sta->sta.addr, addr, ETH_ALEN) == 0) |
| 103 | break; | 103 | break; |
| 104 | sta = rcu_dereference(sta->hnext); | 104 | sta = rcu_dereference(sta->hnext); |
| 105 | } | 105 | } |
diff --git a/net/mac80211/wext.c b/net/mac80211/wext.c index 742f811ca416..ab4ddba874be 100644 --- a/net/mac80211/wext.c +++ b/net/mac80211/wext.c | |||
| @@ -271,6 +271,7 @@ static int ieee80211_ioctl_siwmode(struct net_device *dev, | |||
| 271 | __u32 *mode, char *extra) | 271 | __u32 *mode, char *extra) |
| 272 | { | 272 | { |
| 273 | struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); | 273 | struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); |
| 274 | struct ieee80211_local *local = sdata->local; | ||
| 274 | int type; | 275 | int type; |
| 275 | 276 | ||
| 276 | if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) | 277 | if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) |
| @@ -281,6 +282,13 @@ static int ieee80211_ioctl_siwmode(struct net_device *dev, | |||
| 281 | type = NL80211_IFTYPE_STATION; | 282 | type = NL80211_IFTYPE_STATION; |
| 282 | break; | 283 | break; |
| 283 | case IW_MODE_ADHOC: | 284 | case IW_MODE_ADHOC: |
| 285 | /* Setting ad-hoc mode on non ibss channel is not | ||
| 286 | * supported. | ||
| 287 | */ | ||
| 288 | if (local->oper_channel && | ||
| 289 | (local->oper_channel->flags & IEEE80211_CHAN_NO_IBSS)) | ||
| 290 | return -EOPNOTSUPP; | ||
| 291 | |||
| 284 | type = NL80211_IFTYPE_ADHOC; | 292 | type = NL80211_IFTYPE_ADHOC; |
| 285 | break; | 293 | break; |
| 286 | case IW_MODE_REPEAT: | 294 | case IW_MODE_REPEAT: |
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c index 622d7c671cb7..233fdd2d7d21 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c | |||
| @@ -305,9 +305,7 @@ void nf_conntrack_hash_insert(struct nf_conn *ct) | |||
| 305 | hash = hash_conntrack(&ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple); | 305 | hash = hash_conntrack(&ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple); |
| 306 | repl_hash = hash_conntrack(&ct->tuplehash[IP_CT_DIR_REPLY].tuple); | 306 | repl_hash = hash_conntrack(&ct->tuplehash[IP_CT_DIR_REPLY].tuple); |
| 307 | 307 | ||
| 308 | spin_lock_bh(&nf_conntrack_lock); | ||
| 309 | __nf_conntrack_hash_insert(ct, hash, repl_hash); | 308 | __nf_conntrack_hash_insert(ct, hash, repl_hash); |
| 310 | spin_unlock_bh(&nf_conntrack_lock); | ||
| 311 | } | 309 | } |
| 312 | EXPORT_SYMBOL_GPL(nf_conntrack_hash_insert); | 310 | EXPORT_SYMBOL_GPL(nf_conntrack_hash_insert); |
| 313 | 311 | ||
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c index a040d46f85d6..5f4a6516b3b6 100644 --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c | |||
| @@ -1090,7 +1090,7 @@ ctnetlink_create_conntrack(struct nlattr *cda[], | |||
| 1090 | struct nf_conn_help *help; | 1090 | struct nf_conn_help *help; |
| 1091 | struct nf_conntrack_helper *helper; | 1091 | struct nf_conntrack_helper *helper; |
| 1092 | 1092 | ||
| 1093 | ct = nf_conntrack_alloc(&init_net, otuple, rtuple, GFP_KERNEL); | 1093 | ct = nf_conntrack_alloc(&init_net, otuple, rtuple, GFP_ATOMIC); |
| 1094 | if (ct == NULL || IS_ERR(ct)) | 1094 | if (ct == NULL || IS_ERR(ct)) |
| 1095 | return -ENOMEM; | 1095 | return -ENOMEM; |
| 1096 | 1096 | ||
| @@ -1138,7 +1138,7 @@ ctnetlink_create_conntrack(struct nlattr *cda[], | |||
| 1138 | } | 1138 | } |
| 1139 | } | 1139 | } |
| 1140 | 1140 | ||
| 1141 | nf_ct_acct_ext_add(ct, GFP_KERNEL); | 1141 | nf_ct_acct_ext_add(ct, GFP_ATOMIC); |
| 1142 | 1142 | ||
| 1143 | #if defined(CONFIG_NF_CONNTRACK_MARK) | 1143 | #if defined(CONFIG_NF_CONNTRACK_MARK) |
| 1144 | if (cda[CTA_MARK]) | 1144 | if (cda[CTA_MARK]) |
| @@ -1212,13 +1212,14 @@ ctnetlink_new_conntrack(struct sock *ctnl, struct sk_buff *skb, | |||
| 1212 | atomic_inc(&master_ct->ct_general.use); | 1212 | atomic_inc(&master_ct->ct_general.use); |
| 1213 | } | 1213 | } |
| 1214 | 1214 | ||
| 1215 | spin_unlock_bh(&nf_conntrack_lock); | ||
| 1216 | err = -ENOENT; | 1215 | err = -ENOENT; |
| 1217 | if (nlh->nlmsg_flags & NLM_F_CREATE) | 1216 | if (nlh->nlmsg_flags & NLM_F_CREATE) |
| 1218 | err = ctnetlink_create_conntrack(cda, | 1217 | err = ctnetlink_create_conntrack(cda, |
| 1219 | &otuple, | 1218 | &otuple, |
| 1220 | &rtuple, | 1219 | &rtuple, |
| 1221 | master_ct); | 1220 | master_ct); |
| 1221 | spin_unlock_bh(&nf_conntrack_lock); | ||
| 1222 | |||
| 1222 | if (err < 0 && master_ct) | 1223 | if (err < 0 && master_ct) |
| 1223 | nf_ct_put(master_ct); | 1224 | nf_ct_put(master_ct); |
| 1224 | 1225 | ||
diff --git a/net/netfilter/xt_socket.c b/net/netfilter/xt_socket.c index 02a8fed21082..1acc089be7e9 100644 --- a/net/netfilter/xt_socket.c +++ b/net/netfilter/xt_socket.c | |||
| @@ -141,7 +141,7 @@ socket_mt(const struct sk_buff *skb, const struct xt_match_param *par) | |||
| 141 | sk = nf_tproxy_get_sock_v4(dev_net(skb->dev), protocol, | 141 | sk = nf_tproxy_get_sock_v4(dev_net(skb->dev), protocol, |
| 142 | saddr, daddr, sport, dport, par->in, false); | 142 | saddr, daddr, sport, dport, par->in, false); |
| 143 | if (sk != NULL) { | 143 | if (sk != NULL) { |
| 144 | bool wildcard = (inet_sk(sk)->rcv_saddr == 0); | 144 | bool wildcard = (sk->sk_state != TCP_TIME_WAIT && inet_sk(sk)->rcv_saddr == 0); |
| 145 | 145 | ||
| 146 | nf_tproxy_put_sock(sk); | 146 | nf_tproxy_put_sock(sk); |
| 147 | if (wildcard) | 147 | if (wildcard) |
diff --git a/net/netlabel/netlabel_unlabeled.c b/net/netlabel/netlabel_unlabeled.c index e8a5c32b0f10..8c0308032178 100644 --- a/net/netlabel/netlabel_unlabeled.c +++ b/net/netlabel/netlabel_unlabeled.c | |||
| @@ -562,7 +562,6 @@ static int netlbl_unlhsh_remove_addr4(struct net *net, | |||
| 562 | const struct in_addr *mask, | 562 | const struct in_addr *mask, |
| 563 | struct netlbl_audit *audit_info) | 563 | struct netlbl_audit *audit_info) |
| 564 | { | 564 | { |
| 565 | int ret_val = 0; | ||
| 566 | struct netlbl_af4list *list_entry; | 565 | struct netlbl_af4list *list_entry; |
| 567 | struct netlbl_unlhsh_addr4 *entry; | 566 | struct netlbl_unlhsh_addr4 *entry; |
| 568 | struct audit_buffer *audit_buf; | 567 | struct audit_buffer *audit_buf; |
| @@ -574,9 +573,10 @@ static int netlbl_unlhsh_remove_addr4(struct net *net, | |||
| 574 | list_entry = netlbl_af4list_remove(addr->s_addr, mask->s_addr, | 573 | list_entry = netlbl_af4list_remove(addr->s_addr, mask->s_addr, |
| 575 | &iface->addr4_list); | 574 | &iface->addr4_list); |
| 576 | spin_unlock(&netlbl_unlhsh_lock); | 575 | spin_unlock(&netlbl_unlhsh_lock); |
| 577 | if (list_entry == NULL) | 576 | if (list_entry != NULL) |
| 578 | ret_val = -ENOENT; | 577 | entry = netlbl_unlhsh_addr4_entry(list_entry); |
| 579 | entry = netlbl_unlhsh_addr4_entry(list_entry); | 578 | else |
| 579 | entry = NULL; | ||
| 580 | 580 | ||
| 581 | audit_buf = netlbl_audit_start_common(AUDIT_MAC_UNLBL_STCDEL, | 581 | audit_buf = netlbl_audit_start_common(AUDIT_MAC_UNLBL_STCDEL, |
| 582 | audit_info); | 582 | audit_info); |
| @@ -587,19 +587,21 @@ static int netlbl_unlhsh_remove_addr4(struct net *net, | |||
| 587 | addr->s_addr, mask->s_addr); | 587 | addr->s_addr, mask->s_addr); |
| 588 | if (dev != NULL) | 588 | if (dev != NULL) |
| 589 | dev_put(dev); | 589 | dev_put(dev); |
| 590 | if (entry && security_secid_to_secctx(entry->secid, | 590 | if (entry != NULL && |
| 591 | &secctx, | 591 | security_secid_to_secctx(entry->secid, |
| 592 | &secctx_len) == 0) { | 592 | &secctx, &secctx_len) == 0) { |
| 593 | audit_log_format(audit_buf, " sec_obj=%s", secctx); | 593 | audit_log_format(audit_buf, " sec_obj=%s", secctx); |
| 594 | security_release_secctx(secctx, secctx_len); | 594 | security_release_secctx(secctx, secctx_len); |
| 595 | } | 595 | } |
| 596 | audit_log_format(audit_buf, " res=%u", ret_val == 0 ? 1 : 0); | 596 | audit_log_format(audit_buf, " res=%u", entry != NULL ? 1 : 0); |
| 597 | audit_log_end(audit_buf); | 597 | audit_log_end(audit_buf); |
| 598 | } | 598 | } |
| 599 | 599 | ||
| 600 | if (ret_val == 0) | 600 | if (entry == NULL) |
| 601 | call_rcu(&entry->rcu, netlbl_unlhsh_free_addr4); | 601 | return -ENOENT; |
| 602 | return ret_val; | 602 | |
| 603 | call_rcu(&entry->rcu, netlbl_unlhsh_free_addr4); | ||
| 604 | return 0; | ||
| 603 | } | 605 | } |
| 604 | 606 | ||
| 605 | #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) | 607 | #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) |
| @@ -623,7 +625,6 @@ static int netlbl_unlhsh_remove_addr6(struct net *net, | |||
| 623 | const struct in6_addr *mask, | 625 | const struct in6_addr *mask, |
| 624 | struct netlbl_audit *audit_info) | 626 | struct netlbl_audit *audit_info) |
| 625 | { | 627 | { |
| 626 | int ret_val = 0; | ||
| 627 | struct netlbl_af6list *list_entry; | 628 | struct netlbl_af6list *list_entry; |
| 628 | struct netlbl_unlhsh_addr6 *entry; | 629 | struct netlbl_unlhsh_addr6 *entry; |
| 629 | struct audit_buffer *audit_buf; | 630 | struct audit_buffer *audit_buf; |
| @@ -634,9 +635,10 @@ static int netlbl_unlhsh_remove_addr6(struct net *net, | |||
| 634 | spin_lock(&netlbl_unlhsh_lock); | 635 | spin_lock(&netlbl_unlhsh_lock); |
| 635 | list_entry = netlbl_af6list_remove(addr, mask, &iface->addr6_list); | 636 | list_entry = netlbl_af6list_remove(addr, mask, &iface->addr6_list); |
| 636 | spin_unlock(&netlbl_unlhsh_lock); | 637 | spin_unlock(&netlbl_unlhsh_lock); |
| 637 | if (list_entry == NULL) | 638 | if (list_entry != NULL) |
| 638 | ret_val = -ENOENT; | 639 | entry = netlbl_unlhsh_addr6_entry(list_entry); |
| 639 | entry = netlbl_unlhsh_addr6_entry(list_entry); | 640 | else |
| 641 | entry = NULL; | ||
| 640 | 642 | ||
| 641 | audit_buf = netlbl_audit_start_common(AUDIT_MAC_UNLBL_STCDEL, | 643 | audit_buf = netlbl_audit_start_common(AUDIT_MAC_UNLBL_STCDEL, |
| 642 | audit_info); | 644 | audit_info); |
| @@ -647,19 +649,21 @@ static int netlbl_unlhsh_remove_addr6(struct net *net, | |||
| 647 | addr, mask); | 649 | addr, mask); |
| 648 | if (dev != NULL) | 650 | if (dev != NULL) |
| 649 | dev_put(dev); | 651 | dev_put(dev); |
| 650 | if (entry && security_secid_to_secctx(entry->secid, | 652 | if (entry != NULL && |
| 651 | &secctx, | 653 | security_secid_to_secctx(entry->secid, |
| 652 | &secctx_len) == 0) { | 654 | &secctx, &secctx_len) == 0) { |
| 653 | audit_log_format(audit_buf, " sec_obj=%s", secctx); | 655 | audit_log_format(audit_buf, " sec_obj=%s", secctx); |
| 654 | security_release_secctx(secctx, secctx_len); | 656 | security_release_secctx(secctx, secctx_len); |
| 655 | } | 657 | } |
| 656 | audit_log_format(audit_buf, " res=%u", ret_val == 0 ? 1 : 0); | 658 | audit_log_format(audit_buf, " res=%u", entry != NULL ? 1 : 0); |
| 657 | audit_log_end(audit_buf); | 659 | audit_log_end(audit_buf); |
| 658 | } | 660 | } |
| 659 | 661 | ||
| 660 | if (ret_val == 0) | 662 | if (entry == NULL) |
| 661 | call_rcu(&entry->rcu, netlbl_unlhsh_free_addr6); | 663 | return -ENOENT; |
| 662 | return ret_val; | 664 | |
| 665 | call_rcu(&entry->rcu, netlbl_unlhsh_free_addr6); | ||
| 666 | return 0; | ||
| 663 | } | 667 | } |
| 664 | #endif /* IPv6 */ | 668 | #endif /* IPv6 */ |
| 665 | 669 | ||
diff --git a/net/phonet/pep-gprs.c b/net/phonet/pep-gprs.c index 9978afbd9f2a..803eeef0aa85 100644 --- a/net/phonet/pep-gprs.c +++ b/net/phonet/pep-gprs.c | |||
| @@ -155,12 +155,13 @@ static void gprs_data_ready(struct sock *sk, int len) | |||
| 155 | static void gprs_write_space(struct sock *sk) | 155 | static void gprs_write_space(struct sock *sk) |
| 156 | { | 156 | { |
| 157 | struct gprs_dev *dev = sk->sk_user_data; | 157 | struct gprs_dev *dev = sk->sk_user_data; |
| 158 | struct net_device *net = dev->net; | ||
| 158 | unsigned credits = pep_writeable(sk); | 159 | unsigned credits = pep_writeable(sk); |
| 159 | 160 | ||
| 160 | spin_lock_bh(&dev->tx_lock); | 161 | spin_lock_bh(&dev->tx_lock); |
| 161 | dev->tx_max = credits; | 162 | dev->tx_max = credits; |
| 162 | if (credits > skb_queue_len(&dev->tx_queue)) | 163 | if (credits > skb_queue_len(&dev->tx_queue) && netif_running(net)) |
| 163 | netif_wake_queue(dev->net); | 164 | netif_wake_queue(net); |
| 164 | spin_unlock_bh(&dev->tx_lock); | 165 | spin_unlock_bh(&dev->tx_lock); |
| 165 | } | 166 | } |
| 166 | 167 | ||
| @@ -168,6 +169,23 @@ static void gprs_write_space(struct sock *sk) | |||
| 168 | * Network device callbacks | 169 | * Network device callbacks |
| 169 | */ | 170 | */ |
| 170 | 171 | ||
| 172 | static int gprs_open(struct net_device *dev) | ||
| 173 | { | ||
| 174 | struct gprs_dev *gp = netdev_priv(dev); | ||
| 175 | |||
| 176 | gprs_write_space(gp->sk); | ||
| 177 | return 0; | ||
| 178 | } | ||
| 179 | |||
| 180 | static int gprs_close(struct net_device *dev) | ||
| 181 | { | ||
| 182 | struct gprs_dev *gp = netdev_priv(dev); | ||
| 183 | |||
| 184 | netif_stop_queue(dev); | ||
| 185 | flush_work(&gp->tx_work); | ||
| 186 | return 0; | ||
| 187 | } | ||
| 188 | |||
| 171 | static int gprs_xmit(struct sk_buff *skb, struct net_device *net) | 189 | static int gprs_xmit(struct sk_buff *skb, struct net_device *net) |
| 172 | { | 190 | { |
| 173 | struct gprs_dev *dev = netdev_priv(net); | 191 | struct gprs_dev *dev = netdev_priv(net); |
| @@ -254,6 +272,8 @@ static void gprs_setup(struct net_device *net) | |||
| 254 | net->tx_queue_len = 10; | 272 | net->tx_queue_len = 10; |
| 255 | 273 | ||
| 256 | net->destructor = free_netdev; | 274 | net->destructor = free_netdev; |
| 275 | net->open = gprs_open; | ||
| 276 | net->stop = gprs_close; | ||
| 257 | net->hard_start_xmit = gprs_xmit; /* mandatory */ | 277 | net->hard_start_xmit = gprs_xmit; /* mandatory */ |
| 258 | net->change_mtu = gprs_set_mtu; | 278 | net->change_mtu = gprs_set_mtu; |
| 259 | net->get_stats = gprs_get_stats; | 279 | net->get_stats = gprs_get_stats; |
| @@ -318,7 +338,6 @@ int gprs_attach(struct sock *sk) | |||
| 318 | dev->sk = sk; | 338 | dev->sk = sk; |
| 319 | 339 | ||
| 320 | printk(KERN_DEBUG"%s: attached\n", net->name); | 340 | printk(KERN_DEBUG"%s: attached\n", net->name); |
| 321 | gprs_write_space(sk); /* kick off TX */ | ||
| 322 | return net->ifindex; | 341 | return net->ifindex; |
| 323 | 342 | ||
| 324 | out_rel: | 343 | out_rel: |
| @@ -341,7 +360,5 @@ void gprs_detach(struct sock *sk) | |||
| 341 | 360 | ||
| 342 | printk(KERN_DEBUG"%s: detached\n", net->name); | 361 | printk(KERN_DEBUG"%s: detached\n", net->name); |
| 343 | unregister_netdev(net); | 362 | unregister_netdev(net); |
| 344 | flush_scheduled_work(); | ||
| 345 | sock_put(sk); | 363 | sock_put(sk); |
| 346 | skb_queue_purge(&dev->tx_queue); | ||
| 347 | } | 364 | } |
diff --git a/net/phonet/pn_dev.c b/net/phonet/pn_dev.c index 53be9fc82aaa..f93ff8ef47d0 100644 --- a/net/phonet/pn_dev.c +++ b/net/phonet/pn_dev.c | |||
| @@ -115,7 +115,7 @@ int phonet_address_del(struct net_device *dev, u8 addr) | |||
| 115 | pnd = __phonet_get(dev); | 115 | pnd = __phonet_get(dev); |
| 116 | if (!pnd || !test_and_clear_bit(addr >> 2, pnd->addrs)) | 116 | if (!pnd || !test_and_clear_bit(addr >> 2, pnd->addrs)) |
| 117 | err = -EADDRNOTAVAIL; | 117 | err = -EADDRNOTAVAIL; |
| 118 | if (bitmap_empty(pnd->addrs, 64)) | 118 | else if (bitmap_empty(pnd->addrs, 64)) |
| 119 | __phonet_device_free(pnd); | 119 | __phonet_device_free(pnd); |
| 120 | spin_unlock_bh(&pndevs.lock); | 120 | spin_unlock_bh(&pndevs.lock); |
| 121 | return err; | 121 | return err; |
diff --git a/net/phonet/pn_netlink.c b/net/phonet/pn_netlink.c index b1770d66bc8d..242fe8f8c322 100644 --- a/net/phonet/pn_netlink.c +++ b/net/phonet/pn_netlink.c | |||
| @@ -123,6 +123,7 @@ nla_put_failure: | |||
| 123 | 123 | ||
| 124 | static int getaddr_dumpit(struct sk_buff *skb, struct netlink_callback *cb) | 124 | static int getaddr_dumpit(struct sk_buff *skb, struct netlink_callback *cb) |
| 125 | { | 125 | { |
| 126 | struct net *net = sock_net(skb->sk); | ||
| 126 | struct phonet_device *pnd; | 127 | struct phonet_device *pnd; |
| 127 | int dev_idx = 0, dev_start_idx = cb->args[0]; | 128 | int dev_idx = 0, dev_start_idx = cb->args[0]; |
| 128 | int addr_idx = 0, addr_start_idx = cb->args[1]; | 129 | int addr_idx = 0, addr_start_idx = cb->args[1]; |
| @@ -131,6 +132,8 @@ static int getaddr_dumpit(struct sk_buff *skb, struct netlink_callback *cb) | |||
| 131 | list_for_each_entry(pnd, &pndevs.list, list) { | 132 | list_for_each_entry(pnd, &pndevs.list, list) { |
| 132 | u8 addr; | 133 | u8 addr; |
| 133 | 134 | ||
| 135 | if (!net_eq(dev_net(pnd->netdev), net)) | ||
| 136 | continue; | ||
| 134 | if (dev_idx > dev_start_idx) | 137 | if (dev_idx > dev_start_idx) |
| 135 | addr_start_idx = 0; | 138 | addr_start_idx = 0; |
| 136 | if (dev_idx++ < dev_start_idx) | 139 | if (dev_idx++ < dev_start_idx) |
diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c index a7f1ce11bc22..0c1cc7612800 100644 --- a/net/rose/af_rose.c +++ b/net/rose/af_rose.c | |||
| @@ -1072,6 +1072,10 @@ static int rose_sendmsg(struct kiocb *iocb, struct socket *sock, | |||
| 1072 | unsigned char *asmptr; | 1072 | unsigned char *asmptr; |
| 1073 | int n, size, qbit = 0; | 1073 | int n, size, qbit = 0; |
| 1074 | 1074 | ||
| 1075 | /* ROSE empty frame has no meaning : don't send */ | ||
| 1076 | if (len == 0) | ||
| 1077 | return 0; | ||
| 1078 | |||
| 1075 | if (msg->msg_flags & ~(MSG_DONTWAIT|MSG_EOR|MSG_CMSG_COMPAT)) | 1079 | if (msg->msg_flags & ~(MSG_DONTWAIT|MSG_EOR|MSG_CMSG_COMPAT)) |
| 1076 | return -EINVAL; | 1080 | return -EINVAL; |
| 1077 | 1081 | ||
| @@ -1265,6 +1269,12 @@ static int rose_recvmsg(struct kiocb *iocb, struct socket *sock, | |||
| 1265 | skb_reset_transport_header(skb); | 1269 | skb_reset_transport_header(skb); |
| 1266 | copied = skb->len; | 1270 | copied = skb->len; |
| 1267 | 1271 | ||
| 1272 | /* ROSE empty frame has no meaning : ignore it */ | ||
| 1273 | if (copied == 0) { | ||
| 1274 | skb_free_datagram(sk, skb); | ||
| 1275 | return copied; | ||
| 1276 | } | ||
| 1277 | |||
| 1268 | if (copied > size) { | 1278 | if (copied > size) { |
| 1269 | copied = size; | 1279 | copied = size; |
| 1270 | msg->msg_flags |= MSG_TRUNC; | 1280 | msg->msg_flags |= MSG_TRUNC; |
diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c index a11959908d9a..98402f0efa47 100644 --- a/net/sched/sch_netem.c +++ b/net/sched/sch_netem.c | |||
| @@ -46,9 +46,6 @@ | |||
| 46 | layering other disciplines. It does not need to do bandwidth | 46 | layering other disciplines. It does not need to do bandwidth |
| 47 | control either since that can be handled by using token | 47 | control either since that can be handled by using token |
| 48 | bucket or other rate control. | 48 | bucket or other rate control. |
| 49 | |||
| 50 | The simulator is limited by the Linux timer resolution | ||
| 51 | and will create packet bursts on the HZ boundary (1ms). | ||
| 52 | */ | 49 | */ |
| 53 | 50 | ||
| 54 | struct netem_sched_data { | 51 | struct netem_sched_data { |
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c index 95293f549e9c..a1951dcc5776 100644 --- a/net/sunrpc/svcsock.c +++ b/net/sunrpc/svcsock.c | |||
| @@ -1183,7 +1183,11 @@ int svc_addsock(struct svc_serv *serv, | |||
| 1183 | else if (so->state > SS_UNCONNECTED) | 1183 | else if (so->state > SS_UNCONNECTED) |
| 1184 | err = -EISCONN; | 1184 | err = -EISCONN; |
| 1185 | else { | 1185 | else { |
| 1186 | svsk = svc_setup_socket(serv, so, &err, SVC_SOCK_DEFAULTS); | 1186 | if (!try_module_get(THIS_MODULE)) |
| 1187 | err = -ENOENT; | ||
| 1188 | else | ||
| 1189 | svsk = svc_setup_socket(serv, so, &err, | ||
| 1190 | SVC_SOCK_DEFAULTS); | ||
| 1187 | if (svsk) { | 1191 | if (svsk) { |
| 1188 | struct sockaddr_storage addr; | 1192 | struct sockaddr_storage addr; |
| 1189 | struct sockaddr *sin = (struct sockaddr *)&addr; | 1193 | struct sockaddr *sin = (struct sockaddr *)&addr; |
| @@ -1196,7 +1200,8 @@ int svc_addsock(struct svc_serv *serv, | |||
| 1196 | spin_unlock_bh(&serv->sv_lock); | 1200 | spin_unlock_bh(&serv->sv_lock); |
| 1197 | svc_xprt_received(&svsk->sk_xprt); | 1201 | svc_xprt_received(&svsk->sk_xprt); |
| 1198 | err = 0; | 1202 | err = 0; |
| 1199 | } | 1203 | } else |
| 1204 | module_put(THIS_MODULE); | ||
| 1200 | } | 1205 | } |
| 1201 | if (err) { | 1206 | if (err) { |
| 1202 | sockfd_put(so); | 1207 | sockfd_put(so); |
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index eb90f77bb0e2..66d5ac4773ab 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c | |||
| @@ -1343,6 +1343,7 @@ static int unix_dgram_sendmsg(struct kiocb *kiocb, struct socket *sock, | |||
| 1343 | 1343 | ||
| 1344 | if (NULL == siocb->scm) | 1344 | if (NULL == siocb->scm) |
| 1345 | siocb->scm = &tmp_scm; | 1345 | siocb->scm = &tmp_scm; |
| 1346 | wait_for_unix_gc(); | ||
| 1346 | err = scm_send(sock, msg, siocb->scm); | 1347 | err = scm_send(sock, msg, siocb->scm); |
| 1347 | if (err < 0) | 1348 | if (err < 0) |
| 1348 | return err; | 1349 | return err; |
| @@ -1493,6 +1494,7 @@ static int unix_stream_sendmsg(struct kiocb *kiocb, struct socket *sock, | |||
| 1493 | 1494 | ||
| 1494 | if (NULL == siocb->scm) | 1495 | if (NULL == siocb->scm) |
| 1495 | siocb->scm = &tmp_scm; | 1496 | siocb->scm = &tmp_scm; |
| 1497 | wait_for_unix_gc(); | ||
| 1496 | err = scm_send(sock, msg, siocb->scm); | 1498 | err = scm_send(sock, msg, siocb->scm); |
| 1497 | if (err < 0) | 1499 | if (err < 0) |
| 1498 | return err; | 1500 | return err; |
diff --git a/net/unix/garbage.c b/net/unix/garbage.c index 6d4a9a8de5ef..abb3ab34cb1e 100644 --- a/net/unix/garbage.c +++ b/net/unix/garbage.c | |||
| @@ -80,6 +80,7 @@ | |||
| 80 | #include <linux/file.h> | 80 | #include <linux/file.h> |
| 81 | #include <linux/proc_fs.h> | 81 | #include <linux/proc_fs.h> |
| 82 | #include <linux/mutex.h> | 82 | #include <linux/mutex.h> |
| 83 | #include <linux/wait.h> | ||
| 83 | 84 | ||
| 84 | #include <net/sock.h> | 85 | #include <net/sock.h> |
| 85 | #include <net/af_unix.h> | 86 | #include <net/af_unix.h> |
| @@ -91,6 +92,7 @@ | |||
| 91 | static LIST_HEAD(gc_inflight_list); | 92 | static LIST_HEAD(gc_inflight_list); |
| 92 | static LIST_HEAD(gc_candidates); | 93 | static LIST_HEAD(gc_candidates); |
| 93 | static DEFINE_SPINLOCK(unix_gc_lock); | 94 | static DEFINE_SPINLOCK(unix_gc_lock); |
| 95 | static DECLARE_WAIT_QUEUE_HEAD(unix_gc_wait); | ||
| 94 | 96 | ||
| 95 | unsigned int unix_tot_inflight; | 97 | unsigned int unix_tot_inflight; |
| 96 | 98 | ||
| @@ -266,12 +268,16 @@ static void inc_inflight_move_tail(struct unix_sock *u) | |||
| 266 | list_move_tail(&u->link, &gc_candidates); | 268 | list_move_tail(&u->link, &gc_candidates); |
| 267 | } | 269 | } |
| 268 | 270 | ||
| 269 | /* The external entry point: unix_gc() */ | 271 | static bool gc_in_progress = false; |
| 270 | 272 | ||
| 271 | void unix_gc(void) | 273 | void wait_for_unix_gc(void) |
| 272 | { | 274 | { |
| 273 | static bool gc_in_progress = false; | 275 | wait_event(unix_gc_wait, gc_in_progress == false); |
| 276 | } | ||
| 274 | 277 | ||
| 278 | /* The external entry point: unix_gc() */ | ||
| 279 | void unix_gc(void) | ||
| 280 | { | ||
| 275 | struct unix_sock *u; | 281 | struct unix_sock *u; |
| 276 | struct unix_sock *next; | 282 | struct unix_sock *next; |
| 277 | struct sk_buff_head hitlist; | 283 | struct sk_buff_head hitlist; |
| @@ -376,6 +382,7 @@ void unix_gc(void) | |||
| 376 | /* All candidates should have been detached by now. */ | 382 | /* All candidates should have been detached by now. */ |
| 377 | BUG_ON(!list_empty(&gc_candidates)); | 383 | BUG_ON(!list_empty(&gc_candidates)); |
| 378 | gc_in_progress = false; | 384 | gc_in_progress = false; |
| 385 | wake_up(&unix_gc_wait); | ||
| 379 | 386 | ||
| 380 | out: | 387 | out: |
| 381 | spin_unlock(&unix_gc_lock); | 388 | spin_unlock(&unix_gc_lock); |
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 626dbb688499..eb3b1a9f9b12 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c | |||
| @@ -343,9 +343,9 @@ static int ignore_request(struct wiphy *wiphy, enum reg_set_by set_by, | |||
| 343 | return 0; | 343 | return 0; |
| 344 | return -EALREADY; | 344 | return -EALREADY; |
| 345 | } | 345 | } |
| 346 | if (WARN_ON(!is_alpha2_set(alpha2) || !is_an_alpha2(alpha2)), | 346 | if (WARN(!is_alpha2_set(alpha2) || !is_an_alpha2(alpha2), |
| 347 | "Invalid Country IE regulatory hint passed " | 347 | "Invalid Country IE regulatory hint passed " |
| 348 | "to the wireless core\n") | 348 | "to the wireless core\n")) |
| 349 | return -EINVAL; | 349 | return -EINVAL; |
| 350 | /* We ignore Country IE hints for now, as we haven't yet | 350 | /* We ignore Country IE hints for now, as we haven't yet |
| 351 | * added the dot11MultiDomainCapabilityEnabled flag | 351 | * added the dot11MultiDomainCapabilityEnabled flag |
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index 058f04f54b90..fb216c9adf86 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c | |||
| @@ -817,6 +817,7 @@ int xfrm_policy_flush(u8 type, struct xfrm_audit *audit_info) | |||
| 817 | continue; | 817 | continue; |
| 818 | hlist_del(&pol->bydst); | 818 | hlist_del(&pol->bydst); |
| 819 | hlist_del(&pol->byidx); | 819 | hlist_del(&pol->byidx); |
| 820 | list_del(&pol->walk.all); | ||
| 820 | write_unlock_bh(&xfrm_policy_lock); | 821 | write_unlock_bh(&xfrm_policy_lock); |
| 821 | 822 | ||
| 822 | xfrm_audit_policy_delete(pol, 1, audit_info->loginuid, | 823 | xfrm_audit_policy_delete(pol, 1, audit_info->loginuid, |
diff --git a/sound/core/jack.c b/sound/core/jack.c index bd2d9e6b55e9..284432f427f4 100644 --- a/sound/core/jack.c +++ b/sound/core/jack.c | |||
| @@ -34,6 +34,7 @@ static int snd_jack_dev_free(struct snd_device *device) | |||
| 34 | else | 34 | else |
| 35 | input_free_device(jack->input_dev); | 35 | input_free_device(jack->input_dev); |
| 36 | 36 | ||
| 37 | kfree(jack->id); | ||
| 37 | kfree(jack); | 38 | kfree(jack); |
| 38 | 39 | ||
| 39 | return 0; | 40 | return 0; |
| @@ -87,7 +88,7 @@ int snd_jack_new(struct snd_card *card, const char *id, int type, | |||
| 87 | if (jack == NULL) | 88 | if (jack == NULL) |
| 88 | return -ENOMEM; | 89 | return -ENOMEM; |
| 89 | 90 | ||
| 90 | jack->id = id; | 91 | jack->id = kstrdup(id, GFP_KERNEL); |
| 91 | 92 | ||
| 92 | jack->input_dev = input_allocate_device(); | 93 | jack->input_dev = input_allocate_device(); |
| 93 | if (jack->input_dev == NULL) { | 94 | if (jack->input_dev == NULL) { |
| @@ -102,6 +103,9 @@ int snd_jack_new(struct snd_card *card, const char *id, int type, | |||
| 102 | if (type & SND_JACK_HEADPHONE) | 103 | if (type & SND_JACK_HEADPHONE) |
| 103 | input_set_capability(jack->input_dev, EV_SW, | 104 | input_set_capability(jack->input_dev, EV_SW, |
| 104 | SW_HEADPHONE_INSERT); | 105 | SW_HEADPHONE_INSERT); |
| 106 | if (type & SND_JACK_LINEOUT) | ||
| 107 | input_set_capability(jack->input_dev, EV_SW, | ||
| 108 | SW_LINEOUT_INSERT); | ||
| 105 | if (type & SND_JACK_MICROPHONE) | 109 | if (type & SND_JACK_MICROPHONE) |
| 106 | input_set_capability(jack->input_dev, EV_SW, | 110 | input_set_capability(jack->input_dev, EV_SW, |
| 107 | SW_MICROPHONE_INSERT); | 111 | SW_MICROPHONE_INSERT); |
| @@ -153,6 +157,9 @@ void snd_jack_report(struct snd_jack *jack, int status) | |||
| 153 | if (jack->type & SND_JACK_HEADPHONE) | 157 | if (jack->type & SND_JACK_HEADPHONE) |
| 154 | input_report_switch(jack->input_dev, SW_HEADPHONE_INSERT, | 158 | input_report_switch(jack->input_dev, SW_HEADPHONE_INSERT, |
| 155 | status & SND_JACK_HEADPHONE); | 159 | status & SND_JACK_HEADPHONE); |
| 160 | if (jack->type & SND_JACK_LINEOUT) | ||
| 161 | input_report_switch(jack->input_dev, SW_LINEOUT_INSERT, | ||
| 162 | status & SND_JACK_LINEOUT); | ||
| 156 | if (jack->type & SND_JACK_MICROPHONE) | 163 | if (jack->type & SND_JACK_MICROPHONE) |
| 157 | input_report_switch(jack->input_dev, SW_MICROPHONE_INSERT, | 164 | input_report_switch(jack->input_dev, SW_MICROPHONE_INSERT, |
| 158 | status & SND_JACK_MICROPHONE); | 165 | status & SND_JACK_MICROPHONE); |
diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig index 7003711f4fcc..caebf296b62b 100644 --- a/sound/pci/Kconfig +++ b/sound/pci/Kconfig | |||
| @@ -497,129 +497,7 @@ config SND_FM801_TEA575X | |||
| 497 | depends on SND_FM801_TEA575X_BOOL | 497 | depends on SND_FM801_TEA575X_BOOL |
| 498 | default SND_FM801 | 498 | default SND_FM801 |
| 499 | 499 | ||
| 500 | config SND_HDA_INTEL | 500 | source "sound/pci/hda/Kconfig" |
| 501 | tristate "Intel HD Audio" | ||
| 502 | select SND_PCM | ||
| 503 | select SND_VMASTER | ||
| 504 | help | ||
| 505 | Say Y here to include support for Intel "High Definition | ||
| 506 | Audio" (Azalia) motherboard devices. | ||
| 507 | |||
| 508 | To compile this driver as a module, choose M here: the module | ||
| 509 | will be called snd-hda-intel. | ||
| 510 | |||
| 511 | config SND_HDA_HWDEP | ||
| 512 | bool "Build hwdep interface for HD-audio driver" | ||
| 513 | depends on SND_HDA_INTEL | ||
| 514 | select SND_HWDEP | ||
| 515 | help | ||
| 516 | Say Y here to build a hwdep interface for HD-audio driver. | ||
| 517 | This interface can be used for out-of-band communication | ||
| 518 | with codecs for debugging purposes. | ||
| 519 | |||
| 520 | config SND_HDA_INPUT_BEEP | ||
| 521 | bool "Support digital beep via input layer" | ||
| 522 | depends on SND_HDA_INTEL | ||
| 523 | depends on INPUT=y || INPUT=SND_HDA_INTEL | ||
| 524 | help | ||
| 525 | Say Y here to build a digital beep interface for HD-audio | ||
| 526 | driver. This interface is used to generate digital beeps. | ||
| 527 | |||
| 528 | config SND_HDA_CODEC_REALTEK | ||
| 529 | bool "Build Realtek HD-audio codec support" | ||
| 530 | depends on SND_HDA_INTEL | ||
| 531 | default y | ||
| 532 | help | ||
| 533 | Say Y here to include Realtek HD-audio codec support in | ||
| 534 | snd-hda-intel driver, such as ALC880. | ||
| 535 | |||
| 536 | config SND_HDA_CODEC_ANALOG | ||
| 537 | bool "Build Analog Device HD-audio codec support" | ||
| 538 | depends on SND_HDA_INTEL | ||
| 539 | default y | ||
| 540 | help | ||
| 541 | Say Y here to include Analog Device HD-audio codec support in | ||
| 542 | snd-hda-intel driver, such as AD1986A. | ||
| 543 | |||
| 544 | config SND_HDA_CODEC_SIGMATEL | ||
| 545 | bool "Build IDT/Sigmatel HD-audio codec support" | ||
| 546 | depends on SND_HDA_INTEL | ||
| 547 | default y | ||
| 548 | help | ||
| 549 | Say Y here to include IDT (Sigmatel) HD-audio codec support in | ||
| 550 | snd-hda-intel driver, such as STAC9200. | ||
| 551 | |||
| 552 | config SND_HDA_CODEC_VIA | ||
| 553 | bool "Build VIA HD-audio codec support" | ||
| 554 | depends on SND_HDA_INTEL | ||
| 555 | default y | ||
| 556 | help | ||
| 557 | Say Y here to include VIA HD-audio codec support in | ||
| 558 | snd-hda-intel driver, such as VT1708. | ||
| 559 | |||
| 560 | config SND_HDA_CODEC_ATIHDMI | ||
| 561 | bool "Build ATI HDMI HD-audio codec support" | ||
| 562 | depends on SND_HDA_INTEL | ||
| 563 | default y | ||
| 564 | help | ||
| 565 | Say Y here to include ATI HDMI HD-audio codec support in | ||
| 566 | snd-hda-intel driver, such as ATI RS600 HDMI. | ||
| 567 | |||
| 568 | config SND_HDA_CODEC_NVHDMI | ||
| 569 | bool "Build NVIDIA HDMI HD-audio codec support" | ||
| 570 | depends on SND_HDA_INTEL | ||
| 571 | default y | ||
| 572 | help | ||
| 573 | Say Y here to include NVIDIA HDMI HD-audio codec support in | ||
| 574 | snd-hda-intel driver, such as NVIDIA MCP78 HDMI. | ||
| 575 | |||
| 576 | config SND_HDA_CODEC_CONEXANT | ||
| 577 | bool "Build Conexant HD-audio codec support" | ||
| 578 | depends on SND_HDA_INTEL | ||
| 579 | default y | ||
| 580 | help | ||
| 581 | Say Y here to include Conexant HD-audio codec support in | ||
| 582 | snd-hda-intel driver, such as CX20549. | ||
| 583 | |||
| 584 | config SND_HDA_CODEC_CMEDIA | ||
| 585 | bool "Build C-Media HD-audio codec support" | ||
| 586 | depends on SND_HDA_INTEL | ||
| 587 | default y | ||
| 588 | help | ||
| 589 | Say Y here to include C-Media HD-audio codec support in | ||
| 590 | snd-hda-intel driver, such as CMI9880. | ||
| 591 | |||
| 592 | config SND_HDA_CODEC_SI3054 | ||
| 593 | bool "Build Silicon Labs 3054 HD-modem codec support" | ||
| 594 | depends on SND_HDA_INTEL | ||
| 595 | default y | ||
| 596 | help | ||
| 597 | Say Y here to include Silicon Labs 3054 HD-modem codec | ||
| 598 | (and compatibles) support in snd-hda-intel driver. | ||
| 599 | |||
| 600 | config SND_HDA_GENERIC | ||
| 601 | bool "Enable generic HD-audio codec parser" | ||
| 602 | depends on SND_HDA_INTEL | ||
| 603 | default y | ||
| 604 | help | ||
| 605 | Say Y here to enable the generic HD-audio codec parser | ||
| 606 | in snd-hda-intel driver. | ||
| 607 | |||
| 608 | config SND_HDA_POWER_SAVE | ||
| 609 | bool "Aggressive power-saving on HD-audio" | ||
| 610 | depends on SND_HDA_INTEL && EXPERIMENTAL | ||
| 611 | help | ||
| 612 | Say Y here to enable more aggressive power-saving mode on | ||
| 613 | HD-audio driver. The power-saving timeout can be configured | ||
| 614 | via power_save option or over sysfs on-the-fly. | ||
| 615 | |||
| 616 | config SND_HDA_POWER_SAVE_DEFAULT | ||
| 617 | int "Default time-out for HD-audio power-save mode" | ||
| 618 | depends on SND_HDA_POWER_SAVE | ||
| 619 | default 0 | ||
| 620 | help | ||
| 621 | The default time-out value in seconds for HD-audio automatic | ||
| 622 | power-save mode. 0 means to disable the power-save mode. | ||
| 623 | 501 | ||
| 624 | config SND_HDSP | 502 | config SND_HDSP |
| 625 | tristate "RME Hammerfall DSP Audio" | 503 | tristate "RME Hammerfall DSP Audio" |
diff --git a/sound/pci/hda/Kconfig b/sound/pci/hda/Kconfig new file mode 100644 index 000000000000..eb2a19b894a0 --- /dev/null +++ b/sound/pci/hda/Kconfig | |||
| @@ -0,0 +1,188 @@ | |||
| 1 | menuconfig SND_HDA_INTEL | ||
| 2 | tristate "Intel HD Audio" | ||
| 3 | select SND_PCM | ||
| 4 | select SND_VMASTER | ||
| 5 | select SND_JACK if INPUT=y || INPUT=SND | ||
| 6 | help | ||
| 7 | Say Y here to include support for Intel "High Definition | ||
| 8 | Audio" (Azalia) and its compatible devices. | ||
| 9 | |||
| 10 | This option enables the HD-audio controller. Don't forget | ||
| 11 | to choose the appropriate codec options below. | ||
| 12 | |||
| 13 | To compile this driver as a module, choose M here: the module | ||
| 14 | will be called snd-hda-intel. | ||
| 15 | |||
| 16 | if SND_HDA_INTEL | ||
| 17 | |||
| 18 | config SND_HDA_HWDEP | ||
| 19 | bool "Build hwdep interface for HD-audio driver" | ||
| 20 | select SND_HWDEP | ||
| 21 | help | ||
| 22 | Say Y here to build a hwdep interface for HD-audio driver. | ||
| 23 | This interface can be used for out-of-band communication | ||
| 24 | with codecs for debugging purposes. | ||
| 25 | |||
| 26 | config SND_HDA_RECONFIG | ||
| 27 | bool "Allow dynamic codec reconfiguration (EXPERIMENTAL)" | ||
| 28 | depends on SND_HDA_HWDEP && EXPERIMENTAL | ||
| 29 | help | ||
| 30 | Say Y here to enable the HD-audio codec re-configuration feature. | ||
| 31 | This adds the sysfs interfaces to allow user to clear the whole | ||
| 32 | codec configuration, change the codec setup, add extra verbs, | ||
| 33 | and re-configure the codec dynamically. | ||
| 34 | |||
| 35 | config SND_HDA_INPUT_BEEP | ||
| 36 | bool "Support digital beep via input layer" | ||
| 37 | depends on INPUT=y || INPUT=SND_HDA_INTEL | ||
| 38 | help | ||
| 39 | Say Y here to build a digital beep interface for HD-audio | ||
| 40 | driver. This interface is used to generate digital beeps. | ||
| 41 | |||
| 42 | config SND_HDA_CODEC_REALTEK | ||
| 43 | bool "Build Realtek HD-audio codec support" | ||
| 44 | default y | ||
| 45 | help | ||
| 46 | Say Y here to include Realtek HD-audio codec support in | ||
| 47 | snd-hda-intel driver, such as ALC880. | ||
| 48 | |||
| 49 | When the HD-audio driver is built as a module, the codec | ||
| 50 | support code is also built as another module, | ||
| 51 | snd-hda-codec-realtek. | ||
| 52 | This module is automatically loaded at probing. | ||
| 53 | |||
| 54 | config SND_HDA_CODEC_ANALOG | ||
| 55 | bool "Build Analog Device HD-audio codec support" | ||
| 56 | default y | ||
| 57 | help | ||
| 58 | Say Y here to include Analog Device HD-audio codec support in | ||
| 59 | snd-hda-intel driver, such as AD1986A. | ||
| 60 | |||
| 61 | When the HD-audio driver is built as a module, the codec | ||
| 62 | support code is also built as another module, | ||
| 63 | snd-hda-codec-analog. | ||
| 64 | This module is automatically loaded at probing. | ||
| 65 | |||
| 66 | config SND_HDA_CODEC_SIGMATEL | ||
| 67 | bool "Build IDT/Sigmatel HD-audio codec support" | ||
| 68 | default y | ||
| 69 | help | ||
| 70 | Say Y here to include IDT (Sigmatel) HD-audio codec support in | ||
| 71 | snd-hda-intel driver, such as STAC9200. | ||
| 72 | |||
| 73 | When the HD-audio driver is built as a module, the codec | ||
| 74 | support code is also built as another module, | ||
| 75 | snd-hda-codec-idt. | ||
| 76 | This module is automatically loaded at probing. | ||
| 77 | |||
| 78 | config SND_HDA_CODEC_VIA | ||
| 79 | bool "Build VIA HD-audio codec support" | ||
| 80 | default y | ||
| 81 | help | ||
| 82 | Say Y here to include VIA HD-audio codec support in | ||
| 83 | snd-hda-intel driver, such as VT1708. | ||
| 84 | |||
| 85 | When the HD-audio driver is built as a module, the codec | ||
| 86 | support code is also built as another module, | ||
| 87 | snd-hda-codec-via. | ||
| 88 | This module is automatically loaded at probing. | ||
| 89 | |||
| 90 | config SND_HDA_CODEC_ATIHDMI | ||
| 91 | bool "Build ATI HDMI HD-audio codec support" | ||
| 92 | default y | ||
| 93 | help | ||
| 94 | Say Y here to include ATI HDMI HD-audio codec support in | ||
| 95 | snd-hda-intel driver, such as ATI RS600 HDMI. | ||
| 96 | |||
| 97 | When the HD-audio driver is built as a module, the codec | ||
| 98 | support code is also built as another module, | ||
| 99 | snd-hda-codec-atihdmi. | ||
| 100 | This module is automatically loaded at probing. | ||
| 101 | |||
| 102 | config SND_HDA_CODEC_NVHDMI | ||
| 103 | bool "Build NVIDIA HDMI HD-audio codec support" | ||
| 104 | default y | ||
| 105 | help | ||
| 106 | Say Y here to include NVIDIA HDMI HD-audio codec support in | ||
| 107 | snd-hda-intel driver, such as NVIDIA MCP78 HDMI. | ||
| 108 | |||
| 109 | When the HD-audio driver is built as a module, the codec | ||
| 110 | support code is also built as another module, | ||
| 111 | snd-hda-codec-nvhdmi. | ||
| 112 | This module is automatically loaded at probing. | ||
| 113 | |||
| 114 | config SND_HDA_CODEC_INTELHDMI | ||
| 115 | bool "Build INTEL HDMI HD-audio codec support" | ||
| 116 | default y | ||
| 117 | help | ||
| 118 | Say Y here to include INTEL HDMI HD-audio codec support in | ||
| 119 | snd-hda-intel driver, such as Eaglelake integrated HDMI. | ||
| 120 | |||
| 121 | When the HD-audio driver is built as a module, the codec | ||
| 122 | support code is also built as another module, | ||
| 123 | snd-hda-codec-intelhdmi. | ||
| 124 | This module is automatically loaded at probing. | ||
| 125 | |||
| 126 | config SND_HDA_ELD | ||
| 127 | def_bool y | ||
| 128 | depends on SND_HDA_CODEC_INTELHDMI | ||
| 129 | |||
| 130 | config SND_HDA_CODEC_CONEXANT | ||
| 131 | bool "Build Conexant HD-audio codec support" | ||
| 132 | default y | ||
| 133 | help | ||
| 134 | Say Y here to include Conexant HD-audio codec support in | ||
| 135 | snd-hda-intel driver, such as CX20549. | ||
| 136 | |||
| 137 | When the HD-audio driver is built as a module, the codec | ||
| 138 | support code is also built as another module, | ||
| 139 | snd-hda-codec-conexant. | ||
| 140 | This module is automatically loaded at probing. | ||
| 141 | |||
| 142 | config SND_HDA_CODEC_CMEDIA | ||
| 143 | bool "Build C-Media HD-audio codec support" | ||
| 144 | default y | ||
| 145 | help | ||
| 146 | Say Y here to include C-Media HD-audio codec support in | ||
| 147 | snd-hda-intel driver, such as CMI9880. | ||
| 148 | |||
| 149 | When the HD-audio driver is built as a module, the codec | ||
| 150 | support code is also built as another module, | ||
| 151 | snd-hda-codec-cmedia. | ||
| 152 | This module is automatically loaded at probing. | ||
| 153 | |||
| 154 | config SND_HDA_CODEC_SI3054 | ||
| 155 | bool "Build Silicon Labs 3054 HD-modem codec support" | ||
| 156 | default y | ||
| 157 | help | ||
| 158 | Say Y here to include Silicon Labs 3054 HD-modem codec | ||
| 159 | (and compatibles) support in snd-hda-intel driver. | ||
| 160 | |||
| 161 | When the HD-audio driver is built as a module, the codec | ||
| 162 | support code is also built as another module, | ||
| 163 | snd-hda-codec-si3054. | ||
| 164 | This module is automatically loaded at probing. | ||
| 165 | |||
| 166 | config SND_HDA_GENERIC | ||
| 167 | bool "Enable generic HD-audio codec parser" | ||
| 168 | default y | ||
| 169 | help | ||
| 170 | Say Y here to enable the generic HD-audio codec parser | ||
| 171 | in snd-hda-intel driver. | ||
| 172 | |||
| 173 | config SND_HDA_POWER_SAVE | ||
| 174 | bool "Aggressive power-saving on HD-audio" | ||
| 175 | help | ||
| 176 | Say Y here to enable more aggressive power-saving mode on | ||
| 177 | HD-audio driver. The power-saving timeout can be configured | ||
| 178 | via power_save option or over sysfs on-the-fly. | ||
| 179 | |||
| 180 | config SND_HDA_POWER_SAVE_DEFAULT | ||
| 181 | int "Default time-out for HD-audio power-save mode" | ||
| 182 | depends on SND_HDA_POWER_SAVE | ||
| 183 | default 0 | ||
| 184 | help | ||
| 185 | The default time-out value in seconds for HD-audio automatic | ||
| 186 | power-save mode. 0 means to disable the power-save mode. | ||
| 187 | |||
| 188 | endif | ||
diff --git a/sound/pci/hda/Makefile b/sound/pci/hda/Makefile index 1980c6d207e7..50f9d0967251 100644 --- a/sound/pci/hda/Makefile +++ b/sound/pci/hda/Makefile | |||
| @@ -1,20 +1,59 @@ | |||
| 1 | snd-hda-intel-y := hda_intel.o | 1 | snd-hda-intel-objs := hda_intel.o |
| 2 | # since snd-hda-intel is the only driver using hda-codec, | ||
| 3 | # merge it into a single module although it was originally | ||
| 4 | # designed to be individual modules | ||
| 5 | snd-hda-intel-y += hda_codec.o | ||
| 6 | snd-hda-intel-$(CONFIG_PROC_FS) += hda_proc.o | ||
| 7 | snd-hda-intel-$(CONFIG_SND_HDA_HWDEP) += hda_hwdep.o | ||
| 8 | snd-hda-intel-$(CONFIG_SND_HDA_INPUT_BEEP) += hda_beep.o | ||
| 9 | snd-hda-intel-$(CONFIG_SND_HDA_GENERIC) += hda_generic.o | ||
| 10 | snd-hda-intel-$(CONFIG_SND_HDA_CODEC_REALTEK) += patch_realtek.o | ||
| 11 | snd-hda-intel-$(CONFIG_SND_HDA_CODEC_CMEDIA) += patch_cmedia.o | ||
| 12 | snd-hda-intel-$(CONFIG_SND_HDA_CODEC_ANALOG) += patch_analog.o | ||
| 13 | snd-hda-intel-$(CONFIG_SND_HDA_CODEC_SIGMATEL) += patch_sigmatel.o | ||
| 14 | snd-hda-intel-$(CONFIG_SND_HDA_CODEC_SI3054) += patch_si3054.o | ||
| 15 | snd-hda-intel-$(CONFIG_SND_HDA_CODEC_ATIHDMI) += patch_atihdmi.o | ||
| 16 | snd-hda-intel-$(CONFIG_SND_HDA_CODEC_CONEXANT) += patch_conexant.o | ||
| 17 | snd-hda-intel-$(CONFIG_SND_HDA_CODEC_VIA) += patch_via.o | ||
| 18 | snd-hda-intel-$(CONFIG_SND_HDA_CODEC_NVHDMI) += patch_nvhdmi.o | ||
| 19 | 2 | ||
| 3 | snd-hda-codec-y := hda_codec.o | ||
| 4 | snd-hda-codec-$(CONFIG_SND_HDA_GENERIC) += hda_generic.o | ||
| 5 | snd-hda-codec-$(CONFIG_PROC_FS) += hda_proc.o | ||
| 6 | # snd-hda-codec-$(CONFIG_SND_HDA_ELD) += hda_eld.o | ||
| 7 | snd-hda-codec-$(CONFIG_SND_HDA_HWDEP) += hda_hwdep.o | ||
| 8 | snd-hda-codec-$(CONFIG_SND_HDA_INPUT_BEEP) += hda_beep.o | ||
| 9 | |||
| 10 | snd-hda-codec-realtek-objs := patch_realtek.o | ||
| 11 | snd-hda-codec-cmedia-objs := patch_cmedia.o | ||
| 12 | snd-hda-codec-analog-objs := patch_analog.o | ||
| 13 | snd-hda-codec-idt-objs := patch_sigmatel.o | ||
| 14 | snd-hda-codec-si3054-objs := patch_si3054.o | ||
| 15 | snd-hda-codec-atihdmi-objs := patch_atihdmi.o | ||
| 16 | snd-hda-codec-conexant-objs := patch_conexant.o | ||
| 17 | snd-hda-codec-via-objs := patch_via.o | ||
| 18 | snd-hda-codec-nvhdmi-objs := patch_nvhdmi.o | ||
| 19 | snd-hda-codec-intelhdmi-objs := patch_intelhdmi.o hda_eld.o | ||
| 20 | |||
| 21 | # common driver | ||
| 22 | obj-$(CONFIG_SND_HDA_INTEL) := snd-hda-codec.o | ||
| 23 | |||
| 24 | # codec drivers (note: CONFIG_SND_HDA_CODEC_XXX are booleans) | ||
| 25 | ifdef CONFIG_SND_HDA_CODEC_REALTEK | ||
| 26 | obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-realtek.o | ||
| 27 | endif | ||
| 28 | ifdef CONFIG_SND_HDA_CODEC_CMEDIA | ||
| 29 | obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-cmedia.o | ||
| 30 | endif | ||
| 31 | ifdef CONFIG_SND_HDA_CODEC_ANALOG | ||
| 32 | obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-analog.o | ||
| 33 | endif | ||
| 34 | ifdef CONFIG_SND_HDA_CODEC_SIGMATEL | ||
| 35 | obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-idt.o | ||
| 36 | endif | ||
| 37 | ifdef CONFIG_SND_HDA_CODEC_SI3054 | ||
| 38 | obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-si3054.o | ||
| 39 | endif | ||
| 40 | ifdef CONFIG_SND_HDA_CODEC_ATIHDMI | ||
| 41 | obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-atihdmi.o | ||
| 42 | endif | ||
| 43 | ifdef CONFIG_SND_HDA_CODEC_CONEXANT | ||
| 44 | obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-conexant.o | ||
| 45 | endif | ||
| 46 | ifdef CONFIG_SND_HDA_CODEC_VIA | ||
| 47 | obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-via.o | ||
| 48 | endif | ||
| 49 | ifdef CONFIG_SND_HDA_CODEC_NVHDMI | ||
| 50 | obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-nvhdmi.o | ||
| 51 | endif | ||
| 52 | ifdef CONFIG_SND_HDA_CODEC_INTELHDMI | ||
| 53 | obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-intelhdmi.o | ||
| 54 | endif | ||
| 55 | |||
| 56 | # this must be the last entry after codec drivers; | ||
| 57 | # otherwise the codec patches won't be hooked before the PCI probe | ||
| 58 | # when built in kernel | ||
| 20 | obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-intel.o | 59 | obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-intel.o |
diff --git a/sound/pci/hda/hda_beep.c b/sound/pci/hda/hda_beep.c index 3ecd7e797dee..e00421c0d8ba 100644 --- a/sound/pci/hda/hda_beep.c +++ b/sound/pci/hda/hda_beep.c | |||
| @@ -128,6 +128,7 @@ int snd_hda_attach_beep_device(struct hda_codec *codec, int nid) | |||
| 128 | INIT_WORK(&beep->beep_work, &snd_hda_generate_beep); | 128 | INIT_WORK(&beep->beep_work, &snd_hda_generate_beep); |
| 129 | return 0; | 129 | return 0; |
| 130 | } | 130 | } |
| 131 | EXPORT_SYMBOL_HDA(snd_hda_attach_beep_device); | ||
| 131 | 132 | ||
| 132 | void snd_hda_detach_beep_device(struct hda_codec *codec) | 133 | void snd_hda_detach_beep_device(struct hda_codec *codec) |
| 133 | { | 134 | { |
| @@ -140,3 +141,4 @@ void snd_hda_detach_beep_device(struct hda_codec *codec) | |||
| 140 | kfree(beep); | 141 | kfree(beep); |
| 141 | } | 142 | } |
| 142 | } | 143 | } |
| 144 | EXPORT_SYMBOL_HDA(snd_hda_detach_beep_device); | ||
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index eb9164176dab..8459d6ba2055 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c | |||
| @@ -31,15 +31,6 @@ | |||
| 31 | #include <sound/initval.h> | 31 | #include <sound/initval.h> |
| 32 | #include "hda_local.h" | 32 | #include "hda_local.h" |
| 33 | #include <sound/hda_hwdep.h> | 33 | #include <sound/hda_hwdep.h> |
| 34 | #include "hda_patch.h" /* codec presets */ | ||
| 35 | |||
| 36 | #ifdef CONFIG_SND_HDA_POWER_SAVE | ||
| 37 | /* define this option here to hide as static */ | ||
| 38 | static int power_save = CONFIG_SND_HDA_POWER_SAVE_DEFAULT; | ||
| 39 | module_param(power_save, int, 0644); | ||
| 40 | MODULE_PARM_DESC(power_save, "Automatic power-saving timeout " | ||
| 41 | "(in second, 0 = disable)."); | ||
| 42 | #endif | ||
| 43 | 34 | ||
| 44 | /* | 35 | /* |
| 45 | * vendor / preset table | 36 | * vendor / preset table |
| @@ -55,6 +46,7 @@ static struct hda_vendor_id hda_vendor_ids[] = { | |||
| 55 | { 0x1002, "ATI" }, | 46 | { 0x1002, "ATI" }, |
| 56 | { 0x1057, "Motorola" }, | 47 | { 0x1057, "Motorola" }, |
| 57 | { 0x1095, "Silicon Image" }, | 48 | { 0x1095, "Silicon Image" }, |
| 49 | { 0x10de, "Nvidia" }, | ||
| 58 | { 0x10ec, "Realtek" }, | 50 | { 0x10ec, "Realtek" }, |
| 59 | { 0x1106, "VIA" }, | 51 | { 0x1106, "VIA" }, |
| 60 | { 0x111d, "IDT" }, | 52 | { 0x111d, "IDT" }, |
| @@ -66,40 +58,31 @@ static struct hda_vendor_id hda_vendor_ids[] = { | |||
| 66 | { 0x1854, "LG" }, | 58 | { 0x1854, "LG" }, |
| 67 | { 0x1aec, "Wolfson Microelectronics" }, | 59 | { 0x1aec, "Wolfson Microelectronics" }, |
| 68 | { 0x434d, "C-Media" }, | 60 | { 0x434d, "C-Media" }, |
| 61 | { 0x8086, "Intel" }, | ||
| 69 | { 0x8384, "SigmaTel" }, | 62 | { 0x8384, "SigmaTel" }, |
| 70 | {} /* terminator */ | 63 | {} /* terminator */ |
| 71 | }; | 64 | }; |
| 72 | 65 | ||
| 73 | static const struct hda_codec_preset *hda_preset_tables[] = { | 66 | static DEFINE_MUTEX(preset_mutex); |
| 74 | #ifdef CONFIG_SND_HDA_CODEC_REALTEK | 67 | static LIST_HEAD(hda_preset_tables); |
| 75 | snd_hda_preset_realtek, | 68 | |
| 76 | #endif | 69 | int snd_hda_add_codec_preset(struct hda_codec_preset_list *preset) |
| 77 | #ifdef CONFIG_SND_HDA_CODEC_CMEDIA | 70 | { |
| 78 | snd_hda_preset_cmedia, | 71 | mutex_lock(&preset_mutex); |
| 79 | #endif | 72 | list_add_tail(&preset->list, &hda_preset_tables); |
| 80 | #ifdef CONFIG_SND_HDA_CODEC_ANALOG | 73 | mutex_unlock(&preset_mutex); |
| 81 | snd_hda_preset_analog, | 74 | return 0; |
| 82 | #endif | 75 | } |
| 83 | #ifdef CONFIG_SND_HDA_CODEC_SIGMATEL | 76 | EXPORT_SYMBOL_HDA(snd_hda_add_codec_preset); |
| 84 | snd_hda_preset_sigmatel, | 77 | |
| 85 | #endif | 78 | int snd_hda_delete_codec_preset(struct hda_codec_preset_list *preset) |
| 86 | #ifdef CONFIG_SND_HDA_CODEC_SI3054 | 79 | { |
| 87 | snd_hda_preset_si3054, | 80 | mutex_lock(&preset_mutex); |
| 88 | #endif | 81 | list_del(&preset->list); |
| 89 | #ifdef CONFIG_SND_HDA_CODEC_ATIHDMI | 82 | mutex_unlock(&preset_mutex); |
| 90 | snd_hda_preset_atihdmi, | 83 | return 0; |
| 91 | #endif | 84 | } |
| 92 | #ifdef CONFIG_SND_HDA_CODEC_CONEXANT | 85 | EXPORT_SYMBOL_HDA(snd_hda_delete_codec_preset); |
| 93 | snd_hda_preset_conexant, | ||
| 94 | #endif | ||
| 95 | #ifdef CONFIG_SND_HDA_CODEC_VIA | ||
| 96 | snd_hda_preset_via, | ||
| 97 | #endif | ||
| 98 | #ifdef CONFIG_SND_HDA_CODEC_NVHDMI | ||
| 99 | snd_hda_preset_nvhdmi, | ||
| 100 | #endif | ||
| 101 | NULL | ||
| 102 | }; | ||
| 103 | 86 | ||
| 104 | #ifdef CONFIG_SND_HDA_POWER_SAVE | 87 | #ifdef CONFIG_SND_HDA_POWER_SAVE |
| 105 | static void hda_power_work(struct work_struct *work); | 88 | static void hda_power_work(struct work_struct *work); |
| @@ -108,6 +91,72 @@ static void hda_keep_power_on(struct hda_codec *codec); | |||
| 108 | static inline void hda_keep_power_on(struct hda_codec *codec) {} | 91 | static inline void hda_keep_power_on(struct hda_codec *codec) {} |
| 109 | #endif | 92 | #endif |
| 110 | 93 | ||
| 94 | const char *snd_hda_get_jack_location(u32 cfg) | ||
| 95 | { | ||
| 96 | static char *bases[7] = { | ||
| 97 | "N/A", "Rear", "Front", "Left", "Right", "Top", "Bottom", | ||
| 98 | }; | ||
| 99 | static unsigned char specials_idx[] = { | ||
| 100 | 0x07, 0x08, | ||
| 101 | 0x17, 0x18, 0x19, | ||
| 102 | 0x37, 0x38 | ||
| 103 | }; | ||
| 104 | static char *specials[] = { | ||
| 105 | "Rear Panel", "Drive Bar", | ||
| 106 | "Riser", "HDMI", "ATAPI", | ||
| 107 | "Mobile-In", "Mobile-Out" | ||
| 108 | }; | ||
| 109 | int i; | ||
| 110 | cfg = (cfg & AC_DEFCFG_LOCATION) >> AC_DEFCFG_LOCATION_SHIFT; | ||
| 111 | if ((cfg & 0x0f) < 7) | ||
| 112 | return bases[cfg & 0x0f]; | ||
| 113 | for (i = 0; i < ARRAY_SIZE(specials_idx); i++) { | ||
| 114 | if (cfg == specials_idx[i]) | ||
| 115 | return specials[i]; | ||
| 116 | } | ||
| 117 | return "UNKNOWN"; | ||
| 118 | } | ||
| 119 | EXPORT_SYMBOL_HDA(snd_hda_get_jack_location); | ||
| 120 | |||
| 121 | const char *snd_hda_get_jack_connectivity(u32 cfg) | ||
| 122 | { | ||
| 123 | static char *jack_locations[4] = { "Ext", "Int", "Sep", "Oth" }; | ||
| 124 | |||
| 125 | return jack_locations[(cfg >> (AC_DEFCFG_LOCATION_SHIFT + 4)) & 3]; | ||
| 126 | } | ||
| 127 | EXPORT_SYMBOL_HDA(snd_hda_get_jack_connectivity); | ||
| 128 | |||
| 129 | const char *snd_hda_get_jack_type(u32 cfg) | ||
| 130 | { | ||
| 131 | static char *jack_types[16] = { | ||
| 132 | "Line Out", "Speaker", "HP Out", "CD", | ||
| 133 | "SPDIF Out", "Digital Out", "Modem Line", "Modem Hand", | ||
| 134 | "Line In", "Aux", "Mic", "Telephony", | ||
| 135 | "SPDIF In", "Digitial In", "Reserved", "Other" | ||
| 136 | }; | ||
| 137 | |||
| 138 | return jack_types[(cfg & AC_DEFCFG_DEVICE) | ||
| 139 | >> AC_DEFCFG_DEVICE_SHIFT]; | ||
| 140 | } | ||
| 141 | EXPORT_SYMBOL_HDA(snd_hda_get_jack_type); | ||
| 142 | |||
| 143 | /* | ||
| 144 | * Compose a 32bit command word to be sent to the HD-audio controller | ||
| 145 | */ | ||
| 146 | static inline unsigned int | ||
| 147 | make_codec_cmd(struct hda_codec *codec, hda_nid_t nid, int direct, | ||
| 148 | unsigned int verb, unsigned int parm) | ||
| 149 | { | ||
| 150 | u32 val; | ||
| 151 | |||
| 152 | val = (u32)(codec->addr & 0x0f) << 28; | ||
| 153 | val |= (u32)direct << 27; | ||
| 154 | val |= (u32)nid << 20; | ||
| 155 | val |= verb << 8; | ||
| 156 | val |= parm; | ||
| 157 | return val; | ||
| 158 | } | ||
| 159 | |||
| 111 | /** | 160 | /** |
| 112 | * snd_hda_codec_read - send a command and get the response | 161 | * snd_hda_codec_read - send a command and get the response |
| 113 | * @codec: the HDA codec | 162 | * @codec: the HDA codec |
| @@ -124,17 +173,21 @@ unsigned int snd_hda_codec_read(struct hda_codec *codec, hda_nid_t nid, | |||
| 124 | int direct, | 173 | int direct, |
| 125 | unsigned int verb, unsigned int parm) | 174 | unsigned int verb, unsigned int parm) |
| 126 | { | 175 | { |
| 176 | struct hda_bus *bus = codec->bus; | ||
| 127 | unsigned int res; | 177 | unsigned int res; |
| 178 | |||
| 179 | res = make_codec_cmd(codec, nid, direct, verb, parm); | ||
| 128 | snd_hda_power_up(codec); | 180 | snd_hda_power_up(codec); |
| 129 | mutex_lock(&codec->bus->cmd_mutex); | 181 | mutex_lock(&bus->cmd_mutex); |
| 130 | if (!codec->bus->ops.command(codec, nid, direct, verb, parm)) | 182 | if (!bus->ops.command(bus, res)) |
| 131 | res = codec->bus->ops.get_response(codec); | 183 | res = bus->ops.get_response(bus); |
| 132 | else | 184 | else |
| 133 | res = (unsigned int)-1; | 185 | res = (unsigned int)-1; |
| 134 | mutex_unlock(&codec->bus->cmd_mutex); | 186 | mutex_unlock(&bus->cmd_mutex); |
| 135 | snd_hda_power_down(codec); | 187 | snd_hda_power_down(codec); |
| 136 | return res; | 188 | return res; |
| 137 | } | 189 | } |
| 190 | EXPORT_SYMBOL_HDA(snd_hda_codec_read); | ||
| 138 | 191 | ||
| 139 | /** | 192 | /** |
| 140 | * snd_hda_codec_write - send a single command without waiting for response | 193 | * snd_hda_codec_write - send a single command without waiting for response |
| @@ -151,14 +204,19 @@ unsigned int snd_hda_codec_read(struct hda_codec *codec, hda_nid_t nid, | |||
| 151 | int snd_hda_codec_write(struct hda_codec *codec, hda_nid_t nid, int direct, | 204 | int snd_hda_codec_write(struct hda_codec *codec, hda_nid_t nid, int direct, |
| 152 | unsigned int verb, unsigned int parm) | 205 | unsigned int verb, unsigned int parm) |
| 153 | { | 206 | { |
| 207 | struct hda_bus *bus = codec->bus; | ||
| 208 | unsigned int res; | ||
| 154 | int err; | 209 | int err; |
| 210 | |||
| 211 | res = make_codec_cmd(codec, nid, direct, verb, parm); | ||
| 155 | snd_hda_power_up(codec); | 212 | snd_hda_power_up(codec); |
| 156 | mutex_lock(&codec->bus->cmd_mutex); | 213 | mutex_lock(&bus->cmd_mutex); |
| 157 | err = codec->bus->ops.command(codec, nid, direct, verb, parm); | 214 | err = bus->ops.command(bus, res); |
| 158 | mutex_unlock(&codec->bus->cmd_mutex); | 215 | mutex_unlock(&bus->cmd_mutex); |
| 159 | snd_hda_power_down(codec); | 216 | snd_hda_power_down(codec); |
| 160 | return err; | 217 | return err; |
| 161 | } | 218 | } |
| 219 | EXPORT_SYMBOL_HDA(snd_hda_codec_write); | ||
| 162 | 220 | ||
| 163 | /** | 221 | /** |
| 164 | * snd_hda_sequence_write - sequence writes | 222 | * snd_hda_sequence_write - sequence writes |
| @@ -173,6 +231,7 @@ void snd_hda_sequence_write(struct hda_codec *codec, const struct hda_verb *seq) | |||
| 173 | for (; seq->nid; seq++) | 231 | for (; seq->nid; seq++) |
| 174 | snd_hda_codec_write(codec, seq->nid, 0, seq->verb, seq->param); | 232 | snd_hda_codec_write(codec, seq->nid, 0, seq->verb, seq->param); |
| 175 | } | 233 | } |
| 234 | EXPORT_SYMBOL_HDA(snd_hda_sequence_write); | ||
| 176 | 235 | ||
| 177 | /** | 236 | /** |
| 178 | * snd_hda_get_sub_nodes - get the range of sub nodes | 237 | * snd_hda_get_sub_nodes - get the range of sub nodes |
| @@ -194,6 +253,7 @@ int snd_hda_get_sub_nodes(struct hda_codec *codec, hda_nid_t nid, | |||
| 194 | *start_id = (parm >> 16) & 0x7fff; | 253 | *start_id = (parm >> 16) & 0x7fff; |
| 195 | return (int)(parm & 0x7fff); | 254 | return (int)(parm & 0x7fff); |
| 196 | } | 255 | } |
| 256 | EXPORT_SYMBOL_HDA(snd_hda_get_sub_nodes); | ||
| 197 | 257 | ||
| 198 | /** | 258 | /** |
| 199 | * snd_hda_get_connections - get connection list | 259 | * snd_hda_get_connections - get connection list |
| @@ -282,6 +342,7 @@ int snd_hda_get_connections(struct hda_codec *codec, hda_nid_t nid, | |||
| 282 | } | 342 | } |
| 283 | return conns; | 343 | return conns; |
| 284 | } | 344 | } |
| 345 | EXPORT_SYMBOL_HDA(snd_hda_get_connections); | ||
| 285 | 346 | ||
| 286 | 347 | ||
| 287 | /** | 348 | /** |
| @@ -316,6 +377,7 @@ int snd_hda_queue_unsol_event(struct hda_bus *bus, u32 res, u32 res_ex) | |||
| 316 | 377 | ||
| 317 | return 0; | 378 | return 0; |
| 318 | } | 379 | } |
| 380 | EXPORT_SYMBOL_HDA(snd_hda_queue_unsol_event); | ||
| 319 | 381 | ||
| 320 | /* | 382 | /* |
| 321 | * process queued unsolicited events | 383 | * process queued unsolicited events |
| @@ -345,7 +407,7 @@ static void process_unsol_events(struct work_struct *work) | |||
| 345 | /* | 407 | /* |
| 346 | * initialize unsolicited queue | 408 | * initialize unsolicited queue |
| 347 | */ | 409 | */ |
| 348 | static int __devinit init_unsol_queue(struct hda_bus *bus) | 410 | static int init_unsol_queue(struct hda_bus *bus) |
| 349 | { | 411 | { |
| 350 | struct hda_bus_unsolicited *unsol; | 412 | struct hda_bus_unsolicited *unsol; |
| 351 | 413 | ||
| @@ -391,9 +453,24 @@ static int snd_hda_bus_free(struct hda_bus *bus) | |||
| 391 | static int snd_hda_bus_dev_free(struct snd_device *device) | 453 | static int snd_hda_bus_dev_free(struct snd_device *device) |
| 392 | { | 454 | { |
| 393 | struct hda_bus *bus = device->device_data; | 455 | struct hda_bus *bus = device->device_data; |
| 456 | bus->shutdown = 1; | ||
| 394 | return snd_hda_bus_free(bus); | 457 | return snd_hda_bus_free(bus); |
| 395 | } | 458 | } |
| 396 | 459 | ||
| 460 | #ifdef CONFIG_SND_HDA_HWDEP | ||
| 461 | static int snd_hda_bus_dev_register(struct snd_device *device) | ||
| 462 | { | ||
| 463 | struct hda_bus *bus = device->device_data; | ||
| 464 | struct hda_codec *codec; | ||
| 465 | list_for_each_entry(codec, &bus->codec_list, list) { | ||
| 466 | snd_hda_hwdep_add_sysfs(codec); | ||
| 467 | } | ||
| 468 | return 0; | ||
| 469 | } | ||
| 470 | #else | ||
| 471 | #define snd_hda_bus_dev_register NULL | ||
| 472 | #endif | ||
| 473 | |||
| 397 | /** | 474 | /** |
| 398 | * snd_hda_bus_new - create a HDA bus | 475 | * snd_hda_bus_new - create a HDA bus |
| 399 | * @card: the card entry | 476 | * @card: the card entry |
| @@ -402,13 +479,14 @@ static int snd_hda_bus_dev_free(struct snd_device *device) | |||
| 402 | * | 479 | * |
| 403 | * Returns 0 if successful, or a negative error code. | 480 | * Returns 0 if successful, or a negative error code. |
| 404 | */ | 481 | */ |
| 405 | int __devinit snd_hda_bus_new(struct snd_card *card, | 482 | int /*__devinit*/ snd_hda_bus_new(struct snd_card *card, |
| 406 | const struct hda_bus_template *temp, | 483 | const struct hda_bus_template *temp, |
| 407 | struct hda_bus **busp) | 484 | struct hda_bus **busp) |
| 408 | { | 485 | { |
| 409 | struct hda_bus *bus; | 486 | struct hda_bus *bus; |
| 410 | int err; | 487 | int err; |
| 411 | static struct snd_device_ops dev_ops = { | 488 | static struct snd_device_ops dev_ops = { |
| 489 | .dev_register = snd_hda_bus_dev_register, | ||
| 412 | .dev_free = snd_hda_bus_dev_free, | 490 | .dev_free = snd_hda_bus_dev_free, |
| 413 | }; | 491 | }; |
| 414 | 492 | ||
| @@ -430,6 +508,7 @@ int __devinit snd_hda_bus_new(struct snd_card *card, | |||
| 430 | bus->private_data = temp->private_data; | 508 | bus->private_data = temp->private_data; |
| 431 | bus->pci = temp->pci; | 509 | bus->pci = temp->pci; |
| 432 | bus->modelname = temp->modelname; | 510 | bus->modelname = temp->modelname; |
| 511 | bus->power_save = temp->power_save; | ||
| 433 | bus->ops = temp->ops; | 512 | bus->ops = temp->ops; |
| 434 | 513 | ||
| 435 | mutex_init(&bus->cmd_mutex); | 514 | mutex_init(&bus->cmd_mutex); |
| @@ -444,27 +523,42 @@ int __devinit snd_hda_bus_new(struct snd_card *card, | |||
| 444 | *busp = bus; | 523 | *busp = bus; |
| 445 | return 0; | 524 | return 0; |
| 446 | } | 525 | } |
| 526 | EXPORT_SYMBOL_HDA(snd_hda_bus_new); | ||
| 447 | 527 | ||
| 448 | #ifdef CONFIG_SND_HDA_GENERIC | 528 | #ifdef CONFIG_SND_HDA_GENERIC |
| 449 | #define is_generic_config(codec) \ | 529 | #define is_generic_config(codec) \ |
| 450 | (codec->bus->modelname && !strcmp(codec->bus->modelname, "generic")) | 530 | (codec->modelname && !strcmp(codec->modelname, "generic")) |
| 451 | #else | 531 | #else |
| 452 | #define is_generic_config(codec) 0 | 532 | #define is_generic_config(codec) 0 |
| 453 | #endif | 533 | #endif |
| 454 | 534 | ||
| 535 | #ifdef MODULE | ||
| 536 | #define HDA_MODREQ_MAX_COUNT 2 /* two request_modules()'s */ | ||
| 537 | #else | ||
| 538 | #define HDA_MODREQ_MAX_COUNT 0 /* all presets are statically linked */ | ||
| 539 | #endif | ||
| 540 | |||
| 455 | /* | 541 | /* |
| 456 | * find a matching codec preset | 542 | * find a matching codec preset |
| 457 | */ | 543 | */ |
| 458 | static const struct hda_codec_preset __devinit * | 544 | static const struct hda_codec_preset * |
| 459 | find_codec_preset(struct hda_codec *codec) | 545 | find_codec_preset(struct hda_codec *codec) |
| 460 | { | 546 | { |
| 461 | const struct hda_codec_preset **tbl, *preset; | 547 | struct hda_codec_preset_list *tbl; |
| 548 | const struct hda_codec_preset *preset; | ||
| 549 | int mod_requested = 0; | ||
| 462 | 550 | ||
| 463 | if (is_generic_config(codec)) | 551 | if (is_generic_config(codec)) |
| 464 | return NULL; /* use the generic parser */ | 552 | return NULL; /* use the generic parser */ |
| 465 | 553 | ||
| 466 | for (tbl = hda_preset_tables; *tbl; tbl++) { | 554 | again: |
| 467 | for (preset = *tbl; preset->id; preset++) { | 555 | mutex_lock(&preset_mutex); |
| 556 | list_for_each_entry(tbl, &hda_preset_tables, list) { | ||
| 557 | if (!try_module_get(tbl->owner)) { | ||
| 558 | snd_printk(KERN_ERR "hda_codec: cannot module_get\n"); | ||
| 559 | continue; | ||
| 560 | } | ||
| 561 | for (preset = tbl->preset; preset->id; preset++) { | ||
| 468 | u32 mask = preset->mask; | 562 | u32 mask = preset->mask; |
| 469 | if (preset->afg && preset->afg != codec->afg) | 563 | if (preset->afg && preset->afg != codec->afg) |
| 470 | continue; | 564 | continue; |
| @@ -474,23 +568,40 @@ find_codec_preset(struct hda_codec *codec) | |||
| 474 | mask = ~0; | 568 | mask = ~0; |
| 475 | if (preset->id == (codec->vendor_id & mask) && | 569 | if (preset->id == (codec->vendor_id & mask) && |
| 476 | (!preset->rev || | 570 | (!preset->rev || |
| 477 | preset->rev == codec->revision_id)) | 571 | preset->rev == codec->revision_id)) { |
| 572 | mutex_unlock(&preset_mutex); | ||
| 573 | codec->owner = tbl->owner; | ||
| 478 | return preset; | 574 | return preset; |
| 575 | } | ||
| 479 | } | 576 | } |
| 577 | module_put(tbl->owner); | ||
| 578 | } | ||
| 579 | mutex_unlock(&preset_mutex); | ||
| 580 | |||
| 581 | if (mod_requested < HDA_MODREQ_MAX_COUNT) { | ||
| 582 | char name[32]; | ||
| 583 | if (!mod_requested) | ||
| 584 | snprintf(name, sizeof(name), "snd-hda-codec-id:%08x", | ||
| 585 | codec->vendor_id); | ||
| 586 | else | ||
| 587 | snprintf(name, sizeof(name), "snd-hda-codec-id:%04x*", | ||
| 588 | (codec->vendor_id >> 16) & 0xffff); | ||
| 589 | request_module(name); | ||
| 590 | mod_requested++; | ||
| 591 | goto again; | ||
| 480 | } | 592 | } |
| 481 | return NULL; | 593 | return NULL; |
| 482 | } | 594 | } |
| 483 | 595 | ||
| 484 | /* | 596 | /* |
| 485 | * snd_hda_get_codec_name - store the codec name | 597 | * get_codec_name - store the codec name |
| 486 | */ | 598 | */ |
| 487 | void snd_hda_get_codec_name(struct hda_codec *codec, | 599 | static int get_codec_name(struct hda_codec *codec) |
| 488 | char *name, int namelen) | ||
| 489 | { | 600 | { |
| 490 | const struct hda_vendor_id *c; | 601 | const struct hda_vendor_id *c; |
| 491 | const char *vendor = NULL; | 602 | const char *vendor = NULL; |
| 492 | u16 vendor_id = codec->vendor_id >> 16; | 603 | u16 vendor_id = codec->vendor_id >> 16; |
| 493 | char tmp[16]; | 604 | char tmp[16], name[32]; |
| 494 | 605 | ||
| 495 | for (c = hda_vendor_ids; c->id; c++) { | 606 | for (c = hda_vendor_ids; c->id; c++) { |
| 496 | if (c->id == vendor_id) { | 607 | if (c->id == vendor_id) { |
| @@ -503,16 +614,21 @@ void snd_hda_get_codec_name(struct hda_codec *codec, | |||
| 503 | vendor = tmp; | 614 | vendor = tmp; |
| 504 | } | 615 | } |
| 505 | if (codec->preset && codec->preset->name) | 616 | if (codec->preset && codec->preset->name) |
| 506 | snprintf(name, namelen, "%s %s", vendor, codec->preset->name); | 617 | snprintf(name, sizeof(name), "%s %s", vendor, |
| 618 | codec->preset->name); | ||
| 507 | else | 619 | else |
| 508 | snprintf(name, namelen, "%s ID %x", vendor, | 620 | snprintf(name, sizeof(name), "%s ID %x", vendor, |
| 509 | codec->vendor_id & 0xffff); | 621 | codec->vendor_id & 0xffff); |
| 622 | codec->name = kstrdup(name, GFP_KERNEL); | ||
| 623 | if (!codec->name) | ||
| 624 | return -ENOMEM; | ||
| 625 | return 0; | ||
| 510 | } | 626 | } |
| 511 | 627 | ||
| 512 | /* | 628 | /* |
| 513 | * look for an AFG and MFG nodes | 629 | * look for an AFG and MFG nodes |
| 514 | */ | 630 | */ |
| 515 | static void __devinit setup_fg_nodes(struct hda_codec *codec) | 631 | static void /*__devinit*/ setup_fg_nodes(struct hda_codec *codec) |
| 516 | { | 632 | { |
| 517 | int i, total_nodes; | 633 | int i, total_nodes; |
| 518 | hda_nid_t nid; | 634 | hda_nid_t nid; |
| @@ -571,11 +687,15 @@ static void snd_hda_codec_free(struct hda_codec *codec) | |||
| 571 | flush_scheduled_work(); | 687 | flush_scheduled_work(); |
| 572 | #endif | 688 | #endif |
| 573 | list_del(&codec->list); | 689 | list_del(&codec->list); |
| 690 | snd_array_free(&codec->mixers); | ||
| 574 | codec->bus->caddr_tbl[codec->addr] = NULL; | 691 | codec->bus->caddr_tbl[codec->addr] = NULL; |
| 575 | if (codec->patch_ops.free) | 692 | if (codec->patch_ops.free) |
| 576 | codec->patch_ops.free(codec); | 693 | codec->patch_ops.free(codec); |
| 694 | module_put(codec->owner); | ||
| 577 | free_hda_cache(&codec->amp_cache); | 695 | free_hda_cache(&codec->amp_cache); |
| 578 | free_hda_cache(&codec->cmd_cache); | 696 | free_hda_cache(&codec->cmd_cache); |
| 697 | kfree(codec->name); | ||
| 698 | kfree(codec->modelname); | ||
| 579 | kfree(codec->wcaps); | 699 | kfree(codec->wcaps); |
| 580 | kfree(codec); | 700 | kfree(codec); |
| 581 | } | 701 | } |
| @@ -588,7 +708,7 @@ static void snd_hda_codec_free(struct hda_codec *codec) | |||
| 588 | * | 708 | * |
| 589 | * Returns 0 if successful, or a negative error code. | 709 | * Returns 0 if successful, or a negative error code. |
| 590 | */ | 710 | */ |
| 591 | int __devinit snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr, | 711 | int /*__devinit*/ snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr, |
| 592 | struct hda_codec **codecp) | 712 | struct hda_codec **codecp) |
| 593 | { | 713 | { |
| 594 | struct hda_codec *codec; | 714 | struct hda_codec *codec; |
| @@ -617,6 +737,14 @@ int __devinit snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr, | |||
| 617 | mutex_init(&codec->spdif_mutex); | 737 | mutex_init(&codec->spdif_mutex); |
| 618 | init_hda_cache(&codec->amp_cache, sizeof(struct hda_amp_info)); | 738 | init_hda_cache(&codec->amp_cache, sizeof(struct hda_amp_info)); |
| 619 | init_hda_cache(&codec->cmd_cache, sizeof(struct hda_cache_head)); | 739 | init_hda_cache(&codec->cmd_cache, sizeof(struct hda_cache_head)); |
| 740 | snd_array_init(&codec->mixers, sizeof(struct snd_kcontrol *), 32); | ||
| 741 | if (codec->bus->modelname) { | ||
| 742 | codec->modelname = kstrdup(codec->bus->modelname, GFP_KERNEL); | ||
| 743 | if (!codec->modelname) { | ||
| 744 | snd_hda_codec_free(codec); | ||
| 745 | return -ENODEV; | ||
| 746 | } | ||
| 747 | } | ||
| 620 | 748 | ||
| 621 | #ifdef CONFIG_SND_HDA_POWER_SAVE | 749 | #ifdef CONFIG_SND_HDA_POWER_SAVE |
| 622 | INIT_DELAYED_WORK(&codec->power_work, hda_power_work); | 750 | INIT_DELAYED_WORK(&codec->power_work, hda_power_work); |
| @@ -662,12 +790,42 @@ int __devinit snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr, | |||
| 662 | snd_hda_codec_read(codec, nid, 0, | 790 | snd_hda_codec_read(codec, nid, 0, |
| 663 | AC_VERB_GET_SUBSYSTEM_ID, 0); | 791 | AC_VERB_GET_SUBSYSTEM_ID, 0); |
| 664 | } | 792 | } |
| 793 | if (bus->modelname) | ||
| 794 | codec->modelname = kstrdup(bus->modelname, GFP_KERNEL); | ||
| 795 | |||
| 796 | err = snd_hda_codec_configure(codec); | ||
| 797 | if (err < 0) { | ||
| 798 | snd_hda_codec_free(codec); | ||
| 799 | return err; | ||
| 800 | } | ||
| 801 | snd_hda_codec_proc_new(codec); | ||
| 802 | |||
| 803 | snd_hda_create_hwdep(codec); | ||
| 804 | |||
| 805 | sprintf(component, "HDA:%08x,%08x,%08x", codec->vendor_id, | ||
| 806 | codec->subsystem_id, codec->revision_id); | ||
| 807 | snd_component_add(codec->bus->card, component); | ||
| 808 | |||
| 809 | if (codecp) | ||
| 810 | *codecp = codec; | ||
| 811 | return 0; | ||
| 812 | } | ||
| 813 | EXPORT_SYMBOL_HDA(snd_hda_codec_new); | ||
| 814 | |||
| 815 | int snd_hda_codec_configure(struct hda_codec *codec) | ||
| 816 | { | ||
| 817 | int err; | ||
| 665 | 818 | ||
| 666 | codec->preset = find_codec_preset(codec); | 819 | codec->preset = find_codec_preset(codec); |
| 820 | if (!codec->name) { | ||
| 821 | err = get_codec_name(codec); | ||
| 822 | if (err < 0) | ||
| 823 | return err; | ||
| 824 | } | ||
| 667 | /* audio codec should override the mixer name */ | 825 | /* audio codec should override the mixer name */ |
| 668 | if (codec->afg || !*bus->card->mixername) | 826 | if (codec->afg || !*codec->bus->card->mixername) |
| 669 | snd_hda_get_codec_name(codec, bus->card->mixername, | 827 | strlcpy(codec->bus->card->mixername, codec->name, |
| 670 | sizeof(bus->card->mixername)); | 828 | sizeof(codec->bus->card->mixername)); |
| 671 | 829 | ||
| 672 | if (is_generic_config(codec)) { | 830 | if (is_generic_config(codec)) { |
| 673 | err = snd_hda_parse_generic_codec(codec); | 831 | err = snd_hda_parse_generic_codec(codec); |
| @@ -684,25 +842,9 @@ int __devinit snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr, | |||
| 684 | printk(KERN_ERR "hda-codec: No codec parser is available\n"); | 842 | printk(KERN_ERR "hda-codec: No codec parser is available\n"); |
| 685 | 843 | ||
| 686 | patched: | 844 | patched: |
| 687 | if (err < 0) { | 845 | if (!err && codec->patch_ops.unsol_event) |
| 688 | snd_hda_codec_free(codec); | 846 | err = init_unsol_queue(codec->bus); |
| 689 | return err; | 847 | return err; |
| 690 | } | ||
| 691 | |||
| 692 | if (codec->patch_ops.unsol_event) | ||
| 693 | init_unsol_queue(bus); | ||
| 694 | |||
| 695 | snd_hda_codec_proc_new(codec); | ||
| 696 | #ifdef CONFIG_SND_HDA_HWDEP | ||
| 697 | snd_hda_create_hwdep(codec); | ||
| 698 | #endif | ||
| 699 | |||
| 700 | sprintf(component, "HDA:%08x,%08x,%08x", codec->vendor_id, codec->subsystem_id, codec->revision_id); | ||
| 701 | snd_component_add(codec->bus->card, component); | ||
| 702 | |||
| 703 | if (codecp) | ||
| 704 | *codecp = codec; | ||
| 705 | return 0; | ||
| 706 | } | 848 | } |
| 707 | 849 | ||
| 708 | /** | 850 | /** |
| @@ -728,6 +870,7 @@ void snd_hda_codec_setup_stream(struct hda_codec *codec, hda_nid_t nid, | |||
| 728 | msleep(1); | 870 | msleep(1); |
| 729 | snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_STREAM_FORMAT, format); | 871 | snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_STREAM_FORMAT, format); |
| 730 | } | 872 | } |
| 873 | EXPORT_SYMBOL_HDA(snd_hda_codec_setup_stream); | ||
| 731 | 874 | ||
| 732 | void snd_hda_codec_cleanup_stream(struct hda_codec *codec, hda_nid_t nid) | 875 | void snd_hda_codec_cleanup_stream(struct hda_codec *codec, hda_nid_t nid) |
| 733 | { | 876 | { |
| @@ -741,6 +884,7 @@ void snd_hda_codec_cleanup_stream(struct hda_codec *codec, hda_nid_t nid) | |||
| 741 | snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_STREAM_FORMAT, 0); | 884 | snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_STREAM_FORMAT, 0); |
| 742 | #endif | 885 | #endif |
| 743 | } | 886 | } |
| 887 | EXPORT_SYMBOL_HDA(snd_hda_codec_cleanup_stream); | ||
| 744 | 888 | ||
| 745 | /* | 889 | /* |
| 746 | * amp access functions | 890 | * amp access functions |
| @@ -752,17 +896,17 @@ void snd_hda_codec_cleanup_stream(struct hda_codec *codec, hda_nid_t nid) | |||
| 752 | #define INFO_AMP_VOL(ch) (1 << (1 + (ch))) | 896 | #define INFO_AMP_VOL(ch) (1 << (1 + (ch))) |
| 753 | 897 | ||
| 754 | /* initialize the hash table */ | 898 | /* initialize the hash table */ |
| 755 | static void __devinit init_hda_cache(struct hda_cache_rec *cache, | 899 | static void /*__devinit*/ init_hda_cache(struct hda_cache_rec *cache, |
| 756 | unsigned int record_size) | 900 | unsigned int record_size) |
| 757 | { | 901 | { |
| 758 | memset(cache, 0, sizeof(*cache)); | 902 | memset(cache, 0, sizeof(*cache)); |
| 759 | memset(cache->hash, 0xff, sizeof(cache->hash)); | 903 | memset(cache->hash, 0xff, sizeof(cache->hash)); |
| 760 | cache->record_size = record_size; | 904 | snd_array_init(&cache->buf, record_size, 64); |
| 761 | } | 905 | } |
| 762 | 906 | ||
| 763 | static void free_hda_cache(struct hda_cache_rec *cache) | 907 | static void free_hda_cache(struct hda_cache_rec *cache) |
| 764 | { | 908 | { |
| 765 | kfree(cache->buffer); | 909 | snd_array_free(&cache->buf); |
| 766 | } | 910 | } |
| 767 | 911 | ||
| 768 | /* query the hash. allocate an entry if not found. */ | 912 | /* query the hash. allocate an entry if not found. */ |
| @@ -774,35 +918,17 @@ static struct hda_cache_head *get_alloc_hash(struct hda_cache_rec *cache, | |||
| 774 | struct hda_cache_head *info; | 918 | struct hda_cache_head *info; |
| 775 | 919 | ||
| 776 | while (cur != 0xffff) { | 920 | while (cur != 0xffff) { |
| 777 | info = (struct hda_cache_head *)(cache->buffer + | 921 | info = snd_array_elem(&cache->buf, cur); |
| 778 | cur * cache->record_size); | ||
| 779 | if (info->key == key) | 922 | if (info->key == key) |
| 780 | return info; | 923 | return info; |
| 781 | cur = info->next; | 924 | cur = info->next; |
| 782 | } | 925 | } |
| 783 | 926 | ||
| 784 | /* add a new hash entry */ | 927 | /* add a new hash entry */ |
| 785 | if (cache->num_entries >= cache->size) { | 928 | info = snd_array_new(&cache->buf); |
| 786 | /* reallocate the array */ | 929 | if (!info) |
| 787 | unsigned int new_size = cache->size + 64; | 930 | return NULL; |
| 788 | void *new_buffer; | 931 | cur = snd_array_index(&cache->buf, info); |
| 789 | new_buffer = kcalloc(new_size, cache->record_size, GFP_KERNEL); | ||
| 790 | if (!new_buffer) { | ||
| 791 | snd_printk(KERN_ERR "hda_codec: " | ||
| 792 | "can't malloc amp_info\n"); | ||
| 793 | return NULL; | ||
| 794 | } | ||
| 795 | if (cache->buffer) { | ||
| 796 | memcpy(new_buffer, cache->buffer, | ||
| 797 | cache->size * cache->record_size); | ||
| 798 | kfree(cache->buffer); | ||
| 799 | } | ||
| 800 | cache->size = new_size; | ||
| 801 | cache->buffer = new_buffer; | ||
| 802 | } | ||
| 803 | cur = cache->num_entries++; | ||
| 804 | info = (struct hda_cache_head *)(cache->buffer + | ||
| 805 | cur * cache->record_size); | ||
| 806 | info->key = key; | 932 | info->key = key; |
| 807 | info->val = 0; | 933 | info->val = 0; |
| 808 | info->next = cache->hash[idx]; | 934 | info->next = cache->hash[idx]; |
| @@ -840,6 +966,7 @@ u32 query_amp_caps(struct hda_codec *codec, hda_nid_t nid, int direction) | |||
| 840 | } | 966 | } |
| 841 | return info->amp_caps; | 967 | return info->amp_caps; |
| 842 | } | 968 | } |
| 969 | EXPORT_SYMBOL_HDA(query_amp_caps); | ||
| 843 | 970 | ||
| 844 | int snd_hda_override_amp_caps(struct hda_codec *codec, hda_nid_t nid, int dir, | 971 | int snd_hda_override_amp_caps(struct hda_codec *codec, hda_nid_t nid, int dir, |
| 845 | unsigned int caps) | 972 | unsigned int caps) |
| @@ -853,6 +980,7 @@ int snd_hda_override_amp_caps(struct hda_codec *codec, hda_nid_t nid, int dir, | |||
| 853 | info->head.val |= INFO_AMP_CAPS; | 980 | info->head.val |= INFO_AMP_CAPS; |
| 854 | return 0; | 981 | return 0; |
| 855 | } | 982 | } |
| 983 | EXPORT_SYMBOL_HDA(snd_hda_override_amp_caps); | ||
| 856 | 984 | ||
| 857 | /* | 985 | /* |
| 858 | * read the current volume to info | 986 | * read the current volume to info |
| @@ -906,6 +1034,7 @@ int snd_hda_codec_amp_read(struct hda_codec *codec, hda_nid_t nid, int ch, | |||
| 906 | return 0; | 1034 | return 0; |
| 907 | return get_vol_mute(codec, info, nid, ch, direction, index); | 1035 | return get_vol_mute(codec, info, nid, ch, direction, index); |
| 908 | } | 1036 | } |
| 1037 | EXPORT_SYMBOL_HDA(snd_hda_codec_amp_read); | ||
| 909 | 1038 | ||
| 910 | /* | 1039 | /* |
| 911 | * update the AMP value, mask = bit mask to set, val = the value | 1040 | * update the AMP value, mask = bit mask to set, val = the value |
| @@ -925,6 +1054,7 @@ int snd_hda_codec_amp_update(struct hda_codec *codec, hda_nid_t nid, int ch, | |||
| 925 | put_vol_mute(codec, info, nid, ch, direction, idx, val); | 1054 | put_vol_mute(codec, info, nid, ch, direction, idx, val); |
| 926 | return 1; | 1055 | return 1; |
| 927 | } | 1056 | } |
| 1057 | EXPORT_SYMBOL_HDA(snd_hda_codec_amp_update); | ||
| 928 | 1058 | ||
| 929 | /* | 1059 | /* |
| 930 | * update the AMP stereo with the same mask and value | 1060 | * update the AMP stereo with the same mask and value |
| @@ -938,15 +1068,16 @@ int snd_hda_codec_amp_stereo(struct hda_codec *codec, hda_nid_t nid, | |||
| 938 | idx, mask, val); | 1068 | idx, mask, val); |
| 939 | return ret; | 1069 | return ret; |
| 940 | } | 1070 | } |
| 1071 | EXPORT_SYMBOL_HDA(snd_hda_codec_amp_stereo); | ||
| 941 | 1072 | ||
| 942 | #ifdef SND_HDA_NEEDS_RESUME | 1073 | #ifdef SND_HDA_NEEDS_RESUME |
| 943 | /* resume the all amp commands from the cache */ | 1074 | /* resume the all amp commands from the cache */ |
| 944 | void snd_hda_codec_resume_amp(struct hda_codec *codec) | 1075 | void snd_hda_codec_resume_amp(struct hda_codec *codec) |
| 945 | { | 1076 | { |
| 946 | struct hda_amp_info *buffer = codec->amp_cache.buffer; | 1077 | struct hda_amp_info *buffer = codec->amp_cache.buf.list; |
| 947 | int i; | 1078 | int i; |
| 948 | 1079 | ||
| 949 | for (i = 0; i < codec->amp_cache.size; i++, buffer++) { | 1080 | for (i = 0; i < codec->amp_cache.buf.used; i++, buffer++) { |
| 950 | u32 key = buffer->head.key; | 1081 | u32 key = buffer->head.key; |
| 951 | hda_nid_t nid; | 1082 | hda_nid_t nid; |
| 952 | unsigned int idx, dir, ch; | 1083 | unsigned int idx, dir, ch; |
| @@ -963,6 +1094,7 @@ void snd_hda_codec_resume_amp(struct hda_codec *codec) | |||
| 963 | } | 1094 | } |
| 964 | } | 1095 | } |
| 965 | } | 1096 | } |
| 1097 | EXPORT_SYMBOL_HDA(snd_hda_codec_resume_amp); | ||
| 966 | #endif /* SND_HDA_NEEDS_RESUME */ | 1098 | #endif /* SND_HDA_NEEDS_RESUME */ |
| 967 | 1099 | ||
| 968 | /* volume */ | 1100 | /* volume */ |
| @@ -990,6 +1122,7 @@ int snd_hda_mixer_amp_volume_info(struct snd_kcontrol *kcontrol, | |||
| 990 | uinfo->value.integer.max = caps; | 1122 | uinfo->value.integer.max = caps; |
| 991 | return 0; | 1123 | return 0; |
| 992 | } | 1124 | } |
| 1125 | EXPORT_SYMBOL_HDA(snd_hda_mixer_amp_volume_info); | ||
| 993 | 1126 | ||
| 994 | int snd_hda_mixer_amp_volume_get(struct snd_kcontrol *kcontrol, | 1127 | int snd_hda_mixer_amp_volume_get(struct snd_kcontrol *kcontrol, |
| 995 | struct snd_ctl_elem_value *ucontrol) | 1128 | struct snd_ctl_elem_value *ucontrol) |
| @@ -1009,6 +1142,7 @@ int snd_hda_mixer_amp_volume_get(struct snd_kcontrol *kcontrol, | |||
| 1009 | & HDA_AMP_VOLMASK; | 1142 | & HDA_AMP_VOLMASK; |
| 1010 | return 0; | 1143 | return 0; |
| 1011 | } | 1144 | } |
| 1145 | EXPORT_SYMBOL_HDA(snd_hda_mixer_amp_volume_get); | ||
| 1012 | 1146 | ||
| 1013 | int snd_hda_mixer_amp_volume_put(struct snd_kcontrol *kcontrol, | 1147 | int snd_hda_mixer_amp_volume_put(struct snd_kcontrol *kcontrol, |
| 1014 | struct snd_ctl_elem_value *ucontrol) | 1148 | struct snd_ctl_elem_value *ucontrol) |
| @@ -1033,6 +1167,7 @@ int snd_hda_mixer_amp_volume_put(struct snd_kcontrol *kcontrol, | |||
| 1033 | snd_hda_power_down(codec); | 1167 | snd_hda_power_down(codec); |
| 1034 | return change; | 1168 | return change; |
| 1035 | } | 1169 | } |
| 1170 | EXPORT_SYMBOL_HDA(snd_hda_mixer_amp_volume_put); | ||
| 1036 | 1171 | ||
| 1037 | int snd_hda_mixer_amp_tlv(struct snd_kcontrol *kcontrol, int op_flag, | 1172 | int snd_hda_mixer_amp_tlv(struct snd_kcontrol *kcontrol, int op_flag, |
| 1038 | unsigned int size, unsigned int __user *_tlv) | 1173 | unsigned int size, unsigned int __user *_tlv) |
| @@ -1059,6 +1194,7 @@ int snd_hda_mixer_amp_tlv(struct snd_kcontrol *kcontrol, int op_flag, | |||
| 1059 | return -EFAULT; | 1194 | return -EFAULT; |
| 1060 | return 0; | 1195 | return 0; |
| 1061 | } | 1196 | } |
| 1197 | EXPORT_SYMBOL_HDA(snd_hda_mixer_amp_tlv); | ||
| 1062 | 1198 | ||
| 1063 | /* | 1199 | /* |
| 1064 | * set (static) TLV for virtual master volume; recalculated as max 0dB | 1200 | * set (static) TLV for virtual master volume; recalculated as max 0dB |
| @@ -1078,6 +1214,7 @@ void snd_hda_set_vmaster_tlv(struct hda_codec *codec, hda_nid_t nid, int dir, | |||
| 1078 | tlv[2] = -nums * step; | 1214 | tlv[2] = -nums * step; |
| 1079 | tlv[3] = step; | 1215 | tlv[3] = step; |
| 1080 | } | 1216 | } |
| 1217 | EXPORT_SYMBOL_HDA(snd_hda_set_vmaster_tlv); | ||
| 1081 | 1218 | ||
| 1082 | /* find a mixer control element with the given name */ | 1219 | /* find a mixer control element with the given name */ |
| 1083 | static struct snd_kcontrol * | 1220 | static struct snd_kcontrol * |
| @@ -1097,6 +1234,67 @@ struct snd_kcontrol *snd_hda_find_mixer_ctl(struct hda_codec *codec, | |||
| 1097 | { | 1234 | { |
| 1098 | return _snd_hda_find_mixer_ctl(codec, name, 0); | 1235 | return _snd_hda_find_mixer_ctl(codec, name, 0); |
| 1099 | } | 1236 | } |
| 1237 | EXPORT_SYMBOL_HDA(snd_hda_find_mixer_ctl); | ||
| 1238 | |||
| 1239 | /* Add a control element and assign to the codec */ | ||
| 1240 | int snd_hda_ctl_add(struct hda_codec *codec, struct snd_kcontrol *kctl) | ||
| 1241 | { | ||
| 1242 | int err; | ||
| 1243 | struct snd_kcontrol **knewp; | ||
| 1244 | |||
| 1245 | err = snd_ctl_add(codec->bus->card, kctl); | ||
| 1246 | if (err < 0) | ||
| 1247 | return err; | ||
| 1248 | knewp = snd_array_new(&codec->mixers); | ||
| 1249 | if (!knewp) | ||
| 1250 | return -ENOMEM; | ||
| 1251 | *knewp = kctl; | ||
| 1252 | return 0; | ||
| 1253 | } | ||
| 1254 | EXPORT_SYMBOL_HDA(snd_hda_ctl_add); | ||
| 1255 | |||
| 1256 | #ifdef CONFIG_SND_HDA_RECONFIG | ||
| 1257 | /* Clear all controls assigned to the given codec */ | ||
| 1258 | void snd_hda_ctls_clear(struct hda_codec *codec) | ||
| 1259 | { | ||
| 1260 | int i; | ||
| 1261 | struct snd_kcontrol **kctls = codec->mixers.list; | ||
| 1262 | for (i = 0; i < codec->mixers.used; i++) | ||
| 1263 | snd_ctl_remove(codec->bus->card, kctls[i]); | ||
| 1264 | snd_array_free(&codec->mixers); | ||
| 1265 | } | ||
| 1266 | |||
| 1267 | void snd_hda_codec_reset(struct hda_codec *codec) | ||
| 1268 | { | ||
| 1269 | int i; | ||
| 1270 | |||
| 1271 | #ifdef CONFIG_SND_HDA_POWER_SAVE | ||
| 1272 | cancel_delayed_work(&codec->power_work); | ||
| 1273 | flush_scheduled_work(); | ||
| 1274 | #endif | ||
| 1275 | snd_hda_ctls_clear(codec); | ||
| 1276 | /* relase PCMs */ | ||
| 1277 | for (i = 0; i < codec->num_pcms; i++) { | ||
| 1278 | if (codec->pcm_info[i].pcm) { | ||
| 1279 | snd_device_free(codec->bus->card, | ||
| 1280 | codec->pcm_info[i].pcm); | ||
| 1281 | clear_bit(codec->pcm_info[i].device, | ||
| 1282 | codec->bus->pcm_dev_bits); | ||
| 1283 | } | ||
| 1284 | } | ||
| 1285 | if (codec->patch_ops.free) | ||
| 1286 | codec->patch_ops.free(codec); | ||
| 1287 | codec->proc_widget_hook = NULL; | ||
| 1288 | codec->spec = NULL; | ||
| 1289 | free_hda_cache(&codec->amp_cache); | ||
| 1290 | free_hda_cache(&codec->cmd_cache); | ||
| 1291 | codec->num_pcms = 0; | ||
| 1292 | codec->pcm_info = NULL; | ||
| 1293 | codec->preset = NULL; | ||
| 1294 | module_put(codec->owner); | ||
| 1295 | codec->owner = NULL; | ||
| 1296 | } | ||
| 1297 | #endif /* CONFIG_SND_HDA_RECONFIG */ | ||
| 1100 | 1298 | ||
| 1101 | /* create a virtual master control and add slaves */ | 1299 | /* create a virtual master control and add slaves */ |
| 1102 | int snd_hda_add_vmaster(struct hda_codec *codec, char *name, | 1300 | int snd_hda_add_vmaster(struct hda_codec *codec, char *name, |
| @@ -1115,7 +1313,7 @@ int snd_hda_add_vmaster(struct hda_codec *codec, char *name, | |||
| 1115 | kctl = snd_ctl_make_virtual_master(name, tlv); | 1313 | kctl = snd_ctl_make_virtual_master(name, tlv); |
| 1116 | if (!kctl) | 1314 | if (!kctl) |
| 1117 | return -ENOMEM; | 1315 | return -ENOMEM; |
| 1118 | err = snd_ctl_add(codec->bus->card, kctl); | 1316 | err = snd_hda_ctl_add(codec, kctl); |
| 1119 | if (err < 0) | 1317 | if (err < 0) |
| 1120 | return err; | 1318 | return err; |
| 1121 | 1319 | ||
| @@ -1133,6 +1331,7 @@ int snd_hda_add_vmaster(struct hda_codec *codec, char *name, | |||
| 1133 | } | 1331 | } |
| 1134 | return 0; | 1332 | return 0; |
| 1135 | } | 1333 | } |
| 1334 | EXPORT_SYMBOL_HDA(snd_hda_add_vmaster); | ||
| 1136 | 1335 | ||
| 1137 | /* switch */ | 1336 | /* switch */ |
| 1138 | int snd_hda_mixer_amp_switch_info(struct snd_kcontrol *kcontrol, | 1337 | int snd_hda_mixer_amp_switch_info(struct snd_kcontrol *kcontrol, |
| @@ -1146,6 +1345,7 @@ int snd_hda_mixer_amp_switch_info(struct snd_kcontrol *kcontrol, | |||
| 1146 | uinfo->value.integer.max = 1; | 1345 | uinfo->value.integer.max = 1; |
| 1147 | return 0; | 1346 | return 0; |
| 1148 | } | 1347 | } |
| 1348 | EXPORT_SYMBOL_HDA(snd_hda_mixer_amp_switch_info); | ||
| 1149 | 1349 | ||
| 1150 | int snd_hda_mixer_amp_switch_get(struct snd_kcontrol *kcontrol, | 1350 | int snd_hda_mixer_amp_switch_get(struct snd_kcontrol *kcontrol, |
| 1151 | struct snd_ctl_elem_value *ucontrol) | 1351 | struct snd_ctl_elem_value *ucontrol) |
| @@ -1165,6 +1365,7 @@ int snd_hda_mixer_amp_switch_get(struct snd_kcontrol *kcontrol, | |||
| 1165 | HDA_AMP_MUTE) ? 0 : 1; | 1365 | HDA_AMP_MUTE) ? 0 : 1; |
| 1166 | return 0; | 1366 | return 0; |
| 1167 | } | 1367 | } |
| 1368 | EXPORT_SYMBOL_HDA(snd_hda_mixer_amp_switch_get); | ||
| 1168 | 1369 | ||
| 1169 | int snd_hda_mixer_amp_switch_put(struct snd_kcontrol *kcontrol, | 1370 | int snd_hda_mixer_amp_switch_put(struct snd_kcontrol *kcontrol, |
| 1170 | struct snd_ctl_elem_value *ucontrol) | 1371 | struct snd_ctl_elem_value *ucontrol) |
| @@ -1195,6 +1396,7 @@ int snd_hda_mixer_amp_switch_put(struct snd_kcontrol *kcontrol, | |||
| 1195 | snd_hda_power_down(codec); | 1396 | snd_hda_power_down(codec); |
| 1196 | return change; | 1397 | return change; |
| 1197 | } | 1398 | } |
| 1399 | EXPORT_SYMBOL_HDA(snd_hda_mixer_amp_switch_put); | ||
| 1198 | 1400 | ||
| 1199 | /* | 1401 | /* |
| 1200 | * bound volume controls | 1402 | * bound volume controls |
| @@ -1220,6 +1422,7 @@ int snd_hda_mixer_bind_switch_get(struct snd_kcontrol *kcontrol, | |||
| 1220 | mutex_unlock(&codec->spdif_mutex); | 1422 | mutex_unlock(&codec->spdif_mutex); |
| 1221 | return err; | 1423 | return err; |
| 1222 | } | 1424 | } |
| 1425 | EXPORT_SYMBOL_HDA(snd_hda_mixer_bind_switch_get); | ||
| 1223 | 1426 | ||
| 1224 | int snd_hda_mixer_bind_switch_put(struct snd_kcontrol *kcontrol, | 1427 | int snd_hda_mixer_bind_switch_put(struct snd_kcontrol *kcontrol, |
| 1225 | struct snd_ctl_elem_value *ucontrol) | 1428 | struct snd_ctl_elem_value *ucontrol) |
| @@ -1243,6 +1446,7 @@ int snd_hda_mixer_bind_switch_put(struct snd_kcontrol *kcontrol, | |||
| 1243 | mutex_unlock(&codec->spdif_mutex); | 1446 | mutex_unlock(&codec->spdif_mutex); |
| 1244 | return err < 0 ? err : change; | 1447 | return err < 0 ? err : change; |
| 1245 | } | 1448 | } |
| 1449 | EXPORT_SYMBOL_HDA(snd_hda_mixer_bind_switch_put); | ||
| 1246 | 1450 | ||
| 1247 | /* | 1451 | /* |
| 1248 | * generic bound volume/swtich controls | 1452 | * generic bound volume/swtich controls |
| @@ -1262,6 +1466,7 @@ int snd_hda_mixer_bind_ctls_info(struct snd_kcontrol *kcontrol, | |||
| 1262 | mutex_unlock(&codec->spdif_mutex); | 1466 | mutex_unlock(&codec->spdif_mutex); |
| 1263 | return err; | 1467 | return err; |
| 1264 | } | 1468 | } |
| 1469 | EXPORT_SYMBOL_HDA(snd_hda_mixer_bind_ctls_info); | ||
| 1265 | 1470 | ||
| 1266 | int snd_hda_mixer_bind_ctls_get(struct snd_kcontrol *kcontrol, | 1471 | int snd_hda_mixer_bind_ctls_get(struct snd_kcontrol *kcontrol, |
| 1267 | struct snd_ctl_elem_value *ucontrol) | 1472 | struct snd_ctl_elem_value *ucontrol) |
| @@ -1278,6 +1483,7 @@ int snd_hda_mixer_bind_ctls_get(struct snd_kcontrol *kcontrol, | |||
| 1278 | mutex_unlock(&codec->spdif_mutex); | 1483 | mutex_unlock(&codec->spdif_mutex); |
| 1279 | return err; | 1484 | return err; |
| 1280 | } | 1485 | } |
| 1486 | EXPORT_SYMBOL_HDA(snd_hda_mixer_bind_ctls_get); | ||
| 1281 | 1487 | ||
| 1282 | int snd_hda_mixer_bind_ctls_put(struct snd_kcontrol *kcontrol, | 1488 | int snd_hda_mixer_bind_ctls_put(struct snd_kcontrol *kcontrol, |
| 1283 | struct snd_ctl_elem_value *ucontrol) | 1489 | struct snd_ctl_elem_value *ucontrol) |
| @@ -1300,6 +1506,7 @@ int snd_hda_mixer_bind_ctls_put(struct snd_kcontrol *kcontrol, | |||
| 1300 | mutex_unlock(&codec->spdif_mutex); | 1506 | mutex_unlock(&codec->spdif_mutex); |
| 1301 | return err < 0 ? err : change; | 1507 | return err < 0 ? err : change; |
| 1302 | } | 1508 | } |
| 1509 | EXPORT_SYMBOL_HDA(snd_hda_mixer_bind_ctls_put); | ||
| 1303 | 1510 | ||
| 1304 | int snd_hda_mixer_bind_tlv(struct snd_kcontrol *kcontrol, int op_flag, | 1511 | int snd_hda_mixer_bind_tlv(struct snd_kcontrol *kcontrol, int op_flag, |
| 1305 | unsigned int size, unsigned int __user *tlv) | 1512 | unsigned int size, unsigned int __user *tlv) |
| @@ -1316,6 +1523,7 @@ int snd_hda_mixer_bind_tlv(struct snd_kcontrol *kcontrol, int op_flag, | |||
| 1316 | mutex_unlock(&codec->spdif_mutex); | 1523 | mutex_unlock(&codec->spdif_mutex); |
| 1317 | return err; | 1524 | return err; |
| 1318 | } | 1525 | } |
| 1526 | EXPORT_SYMBOL_HDA(snd_hda_mixer_bind_tlv); | ||
| 1319 | 1527 | ||
| 1320 | struct hda_ctl_ops snd_hda_bind_vol = { | 1528 | struct hda_ctl_ops snd_hda_bind_vol = { |
| 1321 | .info = snd_hda_mixer_amp_volume_info, | 1529 | .info = snd_hda_mixer_amp_volume_info, |
| @@ -1323,6 +1531,7 @@ struct hda_ctl_ops snd_hda_bind_vol = { | |||
| 1323 | .put = snd_hda_mixer_amp_volume_put, | 1531 | .put = snd_hda_mixer_amp_volume_put, |
| 1324 | .tlv = snd_hda_mixer_amp_tlv | 1532 | .tlv = snd_hda_mixer_amp_tlv |
| 1325 | }; | 1533 | }; |
| 1534 | EXPORT_SYMBOL_HDA(snd_hda_bind_vol); | ||
| 1326 | 1535 | ||
| 1327 | struct hda_ctl_ops snd_hda_bind_sw = { | 1536 | struct hda_ctl_ops snd_hda_bind_sw = { |
| 1328 | .info = snd_hda_mixer_amp_switch_info, | 1537 | .info = snd_hda_mixer_amp_switch_info, |
| @@ -1330,6 +1539,7 @@ struct hda_ctl_ops snd_hda_bind_sw = { | |||
| 1330 | .put = snd_hda_mixer_amp_switch_put, | 1539 | .put = snd_hda_mixer_amp_switch_put, |
| 1331 | .tlv = snd_hda_mixer_amp_tlv | 1540 | .tlv = snd_hda_mixer_amp_tlv |
| 1332 | }; | 1541 | }; |
| 1542 | EXPORT_SYMBOL_HDA(snd_hda_bind_sw); | ||
| 1333 | 1543 | ||
| 1334 | /* | 1544 | /* |
| 1335 | * SPDIF out controls | 1545 | * SPDIF out controls |
| @@ -1577,9 +1787,11 @@ int snd_hda_create_spdif_out_ctls(struct hda_codec *codec, hda_nid_t nid) | |||
| 1577 | } | 1787 | } |
| 1578 | for (dig_mix = dig_mixes; dig_mix->name; dig_mix++) { | 1788 | for (dig_mix = dig_mixes; dig_mix->name; dig_mix++) { |
| 1579 | kctl = snd_ctl_new1(dig_mix, codec); | 1789 | kctl = snd_ctl_new1(dig_mix, codec); |
| 1790 | if (!kctl) | ||
| 1791 | return -ENOMEM; | ||
| 1580 | kctl->id.index = idx; | 1792 | kctl->id.index = idx; |
| 1581 | kctl->private_value = nid; | 1793 | kctl->private_value = nid; |
| 1582 | err = snd_ctl_add(codec->bus->card, kctl); | 1794 | err = snd_hda_ctl_add(codec, kctl); |
| 1583 | if (err < 0) | 1795 | if (err < 0) |
| 1584 | return err; | 1796 | return err; |
| 1585 | } | 1797 | } |
| @@ -1589,6 +1801,7 @@ int snd_hda_create_spdif_out_ctls(struct hda_codec *codec, hda_nid_t nid) | |||
| 1589 | codec->spdif_status = convert_to_spdif_status(codec->spdif_ctls); | 1801 | codec->spdif_status = convert_to_spdif_status(codec->spdif_ctls); |
| 1590 | return 0; | 1802 | return 0; |
| 1591 | } | 1803 | } |
| 1804 | EXPORT_SYMBOL_HDA(snd_hda_create_spdif_out_ctls); | ||
| 1592 | 1805 | ||
| 1593 | /* | 1806 | /* |
| 1594 | * SPDIF sharing with analog output | 1807 | * SPDIF sharing with analog output |
| @@ -1623,9 +1836,10 @@ int snd_hda_create_spdif_share_sw(struct hda_codec *codec, | |||
| 1623 | if (!mout->dig_out_nid) | 1836 | if (!mout->dig_out_nid) |
| 1624 | return 0; | 1837 | return 0; |
| 1625 | /* ATTENTION: here mout is passed as private_data, instead of codec */ | 1838 | /* ATTENTION: here mout is passed as private_data, instead of codec */ |
| 1626 | return snd_ctl_add(codec->bus->card, | 1839 | return snd_hda_ctl_add(codec, |
| 1627 | snd_ctl_new1(&spdif_share_sw, mout)); | 1840 | snd_ctl_new1(&spdif_share_sw, mout)); |
| 1628 | } | 1841 | } |
| 1842 | EXPORT_SYMBOL_HDA(snd_hda_create_spdif_share_sw); | ||
| 1629 | 1843 | ||
| 1630 | /* | 1844 | /* |
| 1631 | * SPDIF input | 1845 | * SPDIF input |
| @@ -1725,7 +1939,7 @@ int snd_hda_create_spdif_in_ctls(struct hda_codec *codec, hda_nid_t nid) | |||
| 1725 | for (dig_mix = dig_in_ctls; dig_mix->name; dig_mix++) { | 1939 | for (dig_mix = dig_in_ctls; dig_mix->name; dig_mix++) { |
| 1726 | kctl = snd_ctl_new1(dig_mix, codec); | 1940 | kctl = snd_ctl_new1(dig_mix, codec); |
| 1727 | kctl->private_value = nid; | 1941 | kctl->private_value = nid; |
| 1728 | err = snd_ctl_add(codec->bus->card, kctl); | 1942 | err = snd_hda_ctl_add(codec, kctl); |
| 1729 | if (err < 0) | 1943 | if (err < 0) |
| 1730 | return err; | 1944 | return err; |
| 1731 | } | 1945 | } |
| @@ -1735,6 +1949,7 @@ int snd_hda_create_spdif_in_ctls(struct hda_codec *codec, hda_nid_t nid) | |||
| 1735 | AC_DIG1_ENABLE; | 1949 | AC_DIG1_ENABLE; |
| 1736 | return 0; | 1950 | return 0; |
| 1737 | } | 1951 | } |
| 1952 | EXPORT_SYMBOL_HDA(snd_hda_create_spdif_in_ctls); | ||
| 1738 | 1953 | ||
| 1739 | #ifdef SND_HDA_NEEDS_RESUME | 1954 | #ifdef SND_HDA_NEEDS_RESUME |
| 1740 | /* | 1955 | /* |
| @@ -1761,10 +1976,14 @@ int snd_hda_create_spdif_in_ctls(struct hda_codec *codec, hda_nid_t nid) | |||
| 1761 | int snd_hda_codec_write_cache(struct hda_codec *codec, hda_nid_t nid, | 1976 | int snd_hda_codec_write_cache(struct hda_codec *codec, hda_nid_t nid, |
| 1762 | int direct, unsigned int verb, unsigned int parm) | 1977 | int direct, unsigned int verb, unsigned int parm) |
| 1763 | { | 1978 | { |
| 1979 | struct hda_bus *bus = codec->bus; | ||
| 1980 | unsigned int res; | ||
| 1764 | int err; | 1981 | int err; |
| 1982 | |||
| 1983 | res = make_codec_cmd(codec, nid, direct, verb, parm); | ||
| 1765 | snd_hda_power_up(codec); | 1984 | snd_hda_power_up(codec); |
| 1766 | mutex_lock(&codec->bus->cmd_mutex); | 1985 | mutex_lock(&bus->cmd_mutex); |
| 1767 | err = codec->bus->ops.command(codec, nid, direct, verb, parm); | 1986 | err = bus->ops.command(bus, res); |
| 1768 | if (!err) { | 1987 | if (!err) { |
| 1769 | struct hda_cache_head *c; | 1988 | struct hda_cache_head *c; |
| 1770 | u32 key = build_cmd_cache_key(nid, verb); | 1989 | u32 key = build_cmd_cache_key(nid, verb); |
| @@ -1772,18 +1991,19 @@ int snd_hda_codec_write_cache(struct hda_codec *codec, hda_nid_t nid, | |||
| 1772 | if (c) | 1991 | if (c) |
| 1773 | c->val = parm; | 1992 | c->val = parm; |
| 1774 | } | 1993 | } |
| 1775 | mutex_unlock(&codec->bus->cmd_mutex); | 1994 | mutex_unlock(&bus->cmd_mutex); |
| 1776 | snd_hda_power_down(codec); | 1995 | snd_hda_power_down(codec); |
| 1777 | return err; | 1996 | return err; |
| 1778 | } | 1997 | } |
| 1998 | EXPORT_SYMBOL_HDA(snd_hda_codec_write_cache); | ||
| 1779 | 1999 | ||
| 1780 | /* resume the all commands from the cache */ | 2000 | /* resume the all commands from the cache */ |
| 1781 | void snd_hda_codec_resume_cache(struct hda_codec *codec) | 2001 | void snd_hda_codec_resume_cache(struct hda_codec *codec) |
| 1782 | { | 2002 | { |
| 1783 | struct hda_cache_head *buffer = codec->cmd_cache.buffer; | 2003 | struct hda_cache_head *buffer = codec->cmd_cache.buf.list; |
| 1784 | int i; | 2004 | int i; |
| 1785 | 2005 | ||
| 1786 | for (i = 0; i < codec->cmd_cache.size; i++, buffer++) { | 2006 | for (i = 0; i < codec->cmd_cache.buf.used; i++, buffer++) { |
| 1787 | u32 key = buffer->key; | 2007 | u32 key = buffer->key; |
| 1788 | if (!key) | 2008 | if (!key) |
| 1789 | continue; | 2009 | continue; |
| @@ -1791,6 +2011,7 @@ void snd_hda_codec_resume_cache(struct hda_codec *codec) | |||
| 1791 | get_cmd_cache_cmd(key), buffer->val); | 2011 | get_cmd_cache_cmd(key), buffer->val); |
| 1792 | } | 2012 | } |
| 1793 | } | 2013 | } |
| 2014 | EXPORT_SYMBOL_HDA(snd_hda_codec_resume_cache); | ||
| 1794 | 2015 | ||
| 1795 | /** | 2016 | /** |
| 1796 | * snd_hda_sequence_write_cache - sequence writes with caching | 2017 | * snd_hda_sequence_write_cache - sequence writes with caching |
| @@ -1808,6 +2029,7 @@ void snd_hda_sequence_write_cache(struct hda_codec *codec, | |||
| 1808 | snd_hda_codec_write_cache(codec, seq->nid, 0, seq->verb, | 2029 | snd_hda_codec_write_cache(codec, seq->nid, 0, seq->verb, |
| 1809 | seq->param); | 2030 | seq->param); |
| 1810 | } | 2031 | } |
| 2032 | EXPORT_SYMBOL_HDA(snd_hda_sequence_write_cache); | ||
| 1811 | #endif /* SND_HDA_NEEDS_RESUME */ | 2033 | #endif /* SND_HDA_NEEDS_RESUME */ |
| 1812 | 2034 | ||
| 1813 | /* | 2035 | /* |
| @@ -1868,6 +2090,17 @@ static void hda_set_power_state(struct hda_codec *codec, hda_nid_t fg, | |||
| 1868 | } | 2090 | } |
| 1869 | } | 2091 | } |
| 1870 | 2092 | ||
| 2093 | #ifdef CONFIG_SND_HDA_HWDEP | ||
| 2094 | /* execute additional init verbs */ | ||
| 2095 | static void hda_exec_init_verbs(struct hda_codec *codec) | ||
| 2096 | { | ||
| 2097 | if (codec->init_verbs.list) | ||
| 2098 | snd_hda_sequence_write(codec, codec->init_verbs.list); | ||
| 2099 | } | ||
| 2100 | #else | ||
| 2101 | static inline void hda_exec_init_verbs(struct hda_codec *codec) {} | ||
| 2102 | #endif | ||
| 2103 | |||
| 1871 | #ifdef SND_HDA_NEEDS_RESUME | 2104 | #ifdef SND_HDA_NEEDS_RESUME |
| 1872 | /* | 2105 | /* |
| 1873 | * call suspend and power-down; used both from PM and power-save | 2106 | * call suspend and power-down; used both from PM and power-save |
| @@ -1894,6 +2127,7 @@ static void hda_call_codec_resume(struct hda_codec *codec) | |||
| 1894 | hda_set_power_state(codec, | 2127 | hda_set_power_state(codec, |
| 1895 | codec->afg ? codec->afg : codec->mfg, | 2128 | codec->afg ? codec->afg : codec->mfg, |
| 1896 | AC_PWRST_D0); | 2129 | AC_PWRST_D0); |
| 2130 | hda_exec_init_verbs(codec); | ||
| 1897 | if (codec->patch_ops.resume) | 2131 | if (codec->patch_ops.resume) |
| 1898 | codec->patch_ops.resume(codec); | 2132 | codec->patch_ops.resume(codec); |
| 1899 | else { | 2133 | else { |
| @@ -1914,28 +2148,37 @@ static void hda_call_codec_resume(struct hda_codec *codec) | |||
| 1914 | * | 2148 | * |
| 1915 | * Returns 0 if successful, otherwise a negative error code. | 2149 | * Returns 0 if successful, otherwise a negative error code. |
| 1916 | */ | 2150 | */ |
| 1917 | int __devinit snd_hda_build_controls(struct hda_bus *bus) | 2151 | int /*__devinit*/ snd_hda_build_controls(struct hda_bus *bus) |
| 1918 | { | 2152 | { |
| 1919 | struct hda_codec *codec; | 2153 | struct hda_codec *codec; |
| 1920 | 2154 | ||
| 1921 | list_for_each_entry(codec, &bus->codec_list, list) { | 2155 | list_for_each_entry(codec, &bus->codec_list, list) { |
| 1922 | int err = 0; | 2156 | int err = snd_hda_codec_build_controls(codec); |
| 1923 | /* fake as if already powered-on */ | ||
| 1924 | hda_keep_power_on(codec); | ||
| 1925 | /* then fire up */ | ||
| 1926 | hda_set_power_state(codec, | ||
| 1927 | codec->afg ? codec->afg : codec->mfg, | ||
| 1928 | AC_PWRST_D0); | ||
| 1929 | /* continue to initialize... */ | ||
| 1930 | if (codec->patch_ops.init) | ||
| 1931 | err = codec->patch_ops.init(codec); | ||
| 1932 | if (!err && codec->patch_ops.build_controls) | ||
| 1933 | err = codec->patch_ops.build_controls(codec); | ||
| 1934 | snd_hda_power_down(codec); | ||
| 1935 | if (err < 0) | 2157 | if (err < 0) |
| 1936 | return err; | 2158 | return err; |
| 1937 | } | 2159 | } |
| 2160 | return 0; | ||
| 2161 | } | ||
| 2162 | EXPORT_SYMBOL_HDA(snd_hda_build_controls); | ||
| 1938 | 2163 | ||
| 2164 | int snd_hda_codec_build_controls(struct hda_codec *codec) | ||
| 2165 | { | ||
| 2166 | int err = 0; | ||
| 2167 | /* fake as if already powered-on */ | ||
| 2168 | hda_keep_power_on(codec); | ||
| 2169 | /* then fire up */ | ||
| 2170 | hda_set_power_state(codec, | ||
| 2171 | codec->afg ? codec->afg : codec->mfg, | ||
| 2172 | AC_PWRST_D0); | ||
| 2173 | hda_exec_init_verbs(codec); | ||
| 2174 | /* continue to initialize... */ | ||
| 2175 | if (codec->patch_ops.init) | ||
| 2176 | err = codec->patch_ops.init(codec); | ||
| 2177 | if (!err && codec->patch_ops.build_controls) | ||
| 2178 | err = codec->patch_ops.build_controls(codec); | ||
| 2179 | snd_hda_power_down(codec); | ||
| 2180 | if (err < 0) | ||
| 2181 | return err; | ||
| 1939 | return 0; | 2182 | return 0; |
| 1940 | } | 2183 | } |
| 1941 | 2184 | ||
| @@ -2028,6 +2271,7 @@ unsigned int snd_hda_calc_stream_format(unsigned int rate, | |||
| 2028 | 2271 | ||
| 2029 | return val; | 2272 | return val; |
| 2030 | } | 2273 | } |
| 2274 | EXPORT_SYMBOL_HDA(snd_hda_calc_stream_format); | ||
| 2031 | 2275 | ||
| 2032 | /** | 2276 | /** |
| 2033 | * snd_hda_query_supported_pcm - query the supported PCM rates and formats | 2277 | * snd_hda_query_supported_pcm - query the supported PCM rates and formats |
| @@ -2042,7 +2286,7 @@ unsigned int snd_hda_calc_stream_format(unsigned int rate, | |||
| 2042 | * | 2286 | * |
| 2043 | * Returns 0 if successful, otherwise a negative error code. | 2287 | * Returns 0 if successful, otherwise a negative error code. |
| 2044 | */ | 2288 | */ |
| 2045 | int snd_hda_query_supported_pcm(struct hda_codec *codec, hda_nid_t nid, | 2289 | static int snd_hda_query_supported_pcm(struct hda_codec *codec, hda_nid_t nid, |
| 2046 | u32 *ratesp, u64 *formatsp, unsigned int *bpsp) | 2290 | u32 *ratesp, u64 *formatsp, unsigned int *bpsp) |
| 2047 | { | 2291 | { |
| 2048 | int i; | 2292 | int i; |
| @@ -2207,6 +2451,7 @@ int snd_hda_is_supported_format(struct hda_codec *codec, hda_nid_t nid, | |||
| 2207 | 2451 | ||
| 2208 | return 1; | 2452 | return 1; |
| 2209 | } | 2453 | } |
| 2454 | EXPORT_SYMBOL_HDA(snd_hda_is_supported_format); | ||
| 2210 | 2455 | ||
| 2211 | /* | 2456 | /* |
| 2212 | * PCM stuff | 2457 | * PCM stuff |
| @@ -2236,8 +2481,8 @@ static int hda_pcm_default_cleanup(struct hda_pcm_stream *hinfo, | |||
| 2236 | return 0; | 2481 | return 0; |
| 2237 | } | 2482 | } |
| 2238 | 2483 | ||
| 2239 | static int __devinit set_pcm_default_values(struct hda_codec *codec, | 2484 | static int set_pcm_default_values(struct hda_codec *codec, |
| 2240 | struct hda_pcm_stream *info) | 2485 | struct hda_pcm_stream *info) |
| 2241 | { | 2486 | { |
| 2242 | /* query support PCM information from the given NID */ | 2487 | /* query support PCM information from the given NID */ |
| 2243 | if (info->nid && (!info->rates || !info->formats)) { | 2488 | if (info->nid && (!info->rates || !info->formats)) { |
| @@ -2263,6 +2508,110 @@ static int __devinit set_pcm_default_values(struct hda_codec *codec, | |||
| 2263 | return 0; | 2508 | return 0; |
| 2264 | } | 2509 | } |
| 2265 | 2510 | ||
| 2511 | /* | ||
| 2512 | * get the empty PCM device number to assign | ||
| 2513 | */ | ||
| 2514 | static int get_empty_pcm_device(struct hda_bus *bus, int type) | ||
| 2515 | { | ||
| 2516 | static const char *dev_name[HDA_PCM_NTYPES] = { | ||
| 2517 | "Audio", "SPDIF", "HDMI", "Modem" | ||
| 2518 | }; | ||
| 2519 | /* starting device index for each PCM type */ | ||
| 2520 | static int dev_idx[HDA_PCM_NTYPES] = { | ||
| 2521 | [HDA_PCM_TYPE_AUDIO] = 0, | ||
| 2522 | [HDA_PCM_TYPE_SPDIF] = 1, | ||
| 2523 | [HDA_PCM_TYPE_HDMI] = 3, | ||
| 2524 | [HDA_PCM_TYPE_MODEM] = 6 | ||
| 2525 | }; | ||
| 2526 | /* normal audio device indices; not linear to keep compatibility */ | ||
| 2527 | static int audio_idx[4] = { 0, 2, 4, 5 }; | ||
| 2528 | int i, dev; | ||
| 2529 | |||
| 2530 | switch (type) { | ||
| 2531 | case HDA_PCM_TYPE_AUDIO: | ||
| 2532 | for (i = 0; i < ARRAY_SIZE(audio_idx); i++) { | ||
| 2533 | dev = audio_idx[i]; | ||
| 2534 | if (!test_bit(dev, bus->pcm_dev_bits)) | ||
| 2535 | break; | ||
| 2536 | } | ||
| 2537 | if (i >= ARRAY_SIZE(audio_idx)) { | ||
| 2538 | snd_printk(KERN_WARNING "Too many audio devices\n"); | ||
| 2539 | return -EAGAIN; | ||
| 2540 | } | ||
| 2541 | break; | ||
| 2542 | case HDA_PCM_TYPE_SPDIF: | ||
| 2543 | case HDA_PCM_TYPE_HDMI: | ||
| 2544 | case HDA_PCM_TYPE_MODEM: | ||
| 2545 | dev = dev_idx[type]; | ||
| 2546 | if (test_bit(dev, bus->pcm_dev_bits)) { | ||
| 2547 | snd_printk(KERN_WARNING "%s already defined\n", | ||
| 2548 | dev_name[type]); | ||
| 2549 | return -EAGAIN; | ||
| 2550 | } | ||
| 2551 | break; | ||
| 2552 | default: | ||
| 2553 | snd_printk(KERN_WARNING "Invalid PCM type %d\n", type); | ||
| 2554 | return -EINVAL; | ||
| 2555 | } | ||
| 2556 | set_bit(dev, bus->pcm_dev_bits); | ||
| 2557 | return dev; | ||
| 2558 | } | ||
| 2559 | |||
| 2560 | /* | ||
| 2561 | * attach a new PCM stream | ||
| 2562 | */ | ||
| 2563 | static int snd_hda_attach_pcm(struct hda_codec *codec, struct hda_pcm *pcm) | ||
| 2564 | { | ||
| 2565 | struct hda_bus *bus = codec->bus; | ||
| 2566 | struct hda_pcm_stream *info; | ||
| 2567 | int stream, err; | ||
| 2568 | |||
| 2569 | if (snd_BUG_ON(!pcm->name)) | ||
| 2570 | return -EINVAL; | ||
| 2571 | for (stream = 0; stream < 2; stream++) { | ||
| 2572 | info = &pcm->stream[stream]; | ||
| 2573 | if (info->substreams) { | ||
| 2574 | err = set_pcm_default_values(codec, info); | ||
| 2575 | if (err < 0) | ||
| 2576 | return err; | ||
| 2577 | } | ||
| 2578 | } | ||
| 2579 | return bus->ops.attach_pcm(bus, codec, pcm); | ||
| 2580 | } | ||
| 2581 | |||
| 2582 | /* assign all PCMs of the given codec */ | ||
| 2583 | int snd_hda_codec_build_pcms(struct hda_codec *codec) | ||
| 2584 | { | ||
| 2585 | unsigned int pcm; | ||
| 2586 | int err; | ||
| 2587 | |||
| 2588 | if (!codec->num_pcms) { | ||
| 2589 | if (!codec->patch_ops.build_pcms) | ||
| 2590 | return 0; | ||
| 2591 | err = codec->patch_ops.build_pcms(codec); | ||
| 2592 | if (err < 0) | ||
| 2593 | return err; | ||
| 2594 | } | ||
| 2595 | for (pcm = 0; pcm < codec->num_pcms; pcm++) { | ||
| 2596 | struct hda_pcm *cpcm = &codec->pcm_info[pcm]; | ||
| 2597 | int dev; | ||
| 2598 | |||
| 2599 | if (!cpcm->stream[0].substreams && !cpcm->stream[1].substreams) | ||
| 2600 | return 0; /* no substreams assigned */ | ||
| 2601 | |||
| 2602 | if (!cpcm->pcm) { | ||
| 2603 | dev = get_empty_pcm_device(codec->bus, cpcm->pcm_type); | ||
| 2604 | if (dev < 0) | ||
| 2605 | return 0; | ||
| 2606 | cpcm->device = dev; | ||
| 2607 | err = snd_hda_attach_pcm(codec, cpcm); | ||
| 2608 | if (err < 0) | ||
| 2609 | return err; | ||
| 2610 | } | ||
| 2611 | } | ||
| 2612 | return 0; | ||
| 2613 | } | ||
| 2614 | |||
| 2266 | /** | 2615 | /** |
| 2267 | * snd_hda_build_pcms - build PCM information | 2616 | * snd_hda_build_pcms - build PCM information |
| 2268 | * @bus: the BUS | 2617 | * @bus: the BUS |
| @@ -2294,27 +2643,13 @@ int __devinit snd_hda_build_pcms(struct hda_bus *bus) | |||
| 2294 | struct hda_codec *codec; | 2643 | struct hda_codec *codec; |
| 2295 | 2644 | ||
| 2296 | list_for_each_entry(codec, &bus->codec_list, list) { | 2645 | list_for_each_entry(codec, &bus->codec_list, list) { |
| 2297 | unsigned int pcm, s; | 2646 | int err = snd_hda_codec_build_pcms(codec); |
| 2298 | int err; | ||
| 2299 | if (!codec->patch_ops.build_pcms) | ||
| 2300 | continue; | ||
| 2301 | err = codec->patch_ops.build_pcms(codec); | ||
| 2302 | if (err < 0) | 2647 | if (err < 0) |
| 2303 | return err; | 2648 | return err; |
| 2304 | for (pcm = 0; pcm < codec->num_pcms; pcm++) { | ||
| 2305 | for (s = 0; s < 2; s++) { | ||
| 2306 | struct hda_pcm_stream *info; | ||
| 2307 | info = &codec->pcm_info[pcm].stream[s]; | ||
| 2308 | if (!info->substreams) | ||
| 2309 | continue; | ||
| 2310 | err = set_pcm_default_values(codec, info); | ||
| 2311 | if (err < 0) | ||
| 2312 | return err; | ||
| 2313 | } | ||
| 2314 | } | ||
| 2315 | } | 2649 | } |
| 2316 | return 0; | 2650 | return 0; |
| 2317 | } | 2651 | } |
| 2652 | EXPORT_SYMBOL_HDA(snd_hda_build_pcms); | ||
| 2318 | 2653 | ||
| 2319 | /** | 2654 | /** |
| 2320 | * snd_hda_check_board_config - compare the current codec with the config table | 2655 | * snd_hda_check_board_config - compare the current codec with the config table |
| @@ -2333,11 +2668,11 @@ int snd_hda_check_board_config(struct hda_codec *codec, | |||
| 2333 | int num_configs, const char **models, | 2668 | int num_configs, const char **models, |
| 2334 | const struct snd_pci_quirk *tbl) | 2669 | const struct snd_pci_quirk *tbl) |
| 2335 | { | 2670 | { |
| 2336 | if (codec->bus->modelname && models) { | 2671 | if (codec->modelname && models) { |
| 2337 | int i; | 2672 | int i; |
| 2338 | for (i = 0; i < num_configs; i++) { | 2673 | for (i = 0; i < num_configs; i++) { |
| 2339 | if (models[i] && | 2674 | if (models[i] && |
| 2340 | !strcmp(codec->bus->modelname, models[i])) { | 2675 | !strcmp(codec->modelname, models[i])) { |
| 2341 | snd_printd(KERN_INFO "hda_codec: model '%s' is " | 2676 | snd_printd(KERN_INFO "hda_codec: model '%s' is " |
| 2342 | "selected\n", models[i]); | 2677 | "selected\n", models[i]); |
| 2343 | return i; | 2678 | return i; |
| @@ -2370,6 +2705,7 @@ int snd_hda_check_board_config(struct hda_codec *codec, | |||
| 2370 | } | 2705 | } |
| 2371 | return -1; | 2706 | return -1; |
| 2372 | } | 2707 | } |
| 2708 | EXPORT_SYMBOL_HDA(snd_hda_check_board_config); | ||
| 2373 | 2709 | ||
| 2374 | /** | 2710 | /** |
| 2375 | * snd_hda_add_new_ctls - create controls from the array | 2711 | * snd_hda_add_new_ctls - create controls from the array |
| @@ -2390,7 +2726,7 @@ int snd_hda_add_new_ctls(struct hda_codec *codec, struct snd_kcontrol_new *knew) | |||
| 2390 | kctl = snd_ctl_new1(knew, codec); | 2726 | kctl = snd_ctl_new1(knew, codec); |
| 2391 | if (!kctl) | 2727 | if (!kctl) |
| 2392 | return -ENOMEM; | 2728 | return -ENOMEM; |
| 2393 | err = snd_ctl_add(codec->bus->card, kctl); | 2729 | err = snd_hda_ctl_add(codec, kctl); |
| 2394 | if (err < 0) { | 2730 | if (err < 0) { |
| 2395 | if (!codec->addr) | 2731 | if (!codec->addr) |
| 2396 | return err; | 2732 | return err; |
| @@ -2398,13 +2734,14 @@ int snd_hda_add_new_ctls(struct hda_codec *codec, struct snd_kcontrol_new *knew) | |||
| 2398 | if (!kctl) | 2734 | if (!kctl) |
| 2399 | return -ENOMEM; | 2735 | return -ENOMEM; |
| 2400 | kctl->id.device = codec->addr; | 2736 | kctl->id.device = codec->addr; |
| 2401 | err = snd_ctl_add(codec->bus->card, kctl); | 2737 | err = snd_hda_ctl_add(codec, kctl); |
| 2402 | if (err < 0) | 2738 | if (err < 0) |
| 2403 | return err; | 2739 | return err; |
| 2404 | } | 2740 | } |
| 2405 | } | 2741 | } |
| 2406 | return 0; | 2742 | return 0; |
| 2407 | } | 2743 | } |
| 2744 | EXPORT_SYMBOL_HDA(snd_hda_add_new_ctls); | ||
| 2408 | 2745 | ||
| 2409 | #ifdef CONFIG_SND_HDA_POWER_SAVE | 2746 | #ifdef CONFIG_SND_HDA_POWER_SAVE |
| 2410 | static void hda_set_power_state(struct hda_codec *codec, hda_nid_t fg, | 2747 | static void hda_set_power_state(struct hda_codec *codec, hda_nid_t fg, |
| @@ -2414,6 +2751,7 @@ static void hda_power_work(struct work_struct *work) | |||
| 2414 | { | 2751 | { |
| 2415 | struct hda_codec *codec = | 2752 | struct hda_codec *codec = |
| 2416 | container_of(work, struct hda_codec, power_work.work); | 2753 | container_of(work, struct hda_codec, power_work.work); |
| 2754 | struct hda_bus *bus = codec->bus; | ||
| 2417 | 2755 | ||
| 2418 | if (!codec->power_on || codec->power_count) { | 2756 | if (!codec->power_on || codec->power_count) { |
| 2419 | codec->power_transition = 0; | 2757 | codec->power_transition = 0; |
| @@ -2421,8 +2759,8 @@ static void hda_power_work(struct work_struct *work) | |||
| 2421 | } | 2759 | } |
| 2422 | 2760 | ||
| 2423 | hda_call_codec_suspend(codec); | 2761 | hda_call_codec_suspend(codec); |
| 2424 | if (codec->bus->ops.pm_notify) | 2762 | if (bus->ops.pm_notify) |
| 2425 | codec->bus->ops.pm_notify(codec); | 2763 | bus->ops.pm_notify(bus); |
| 2426 | } | 2764 | } |
| 2427 | 2765 | ||
| 2428 | static void hda_keep_power_on(struct hda_codec *codec) | 2766 | static void hda_keep_power_on(struct hda_codec *codec) |
| @@ -2433,29 +2771,39 @@ static void hda_keep_power_on(struct hda_codec *codec) | |||
| 2433 | 2771 | ||
| 2434 | void snd_hda_power_up(struct hda_codec *codec) | 2772 | void snd_hda_power_up(struct hda_codec *codec) |
| 2435 | { | 2773 | { |
| 2774 | struct hda_bus *bus = codec->bus; | ||
| 2775 | |||
| 2436 | codec->power_count++; | 2776 | codec->power_count++; |
| 2437 | if (codec->power_on || codec->power_transition) | 2777 | if (codec->power_on || codec->power_transition) |
| 2438 | return; | 2778 | return; |
| 2439 | 2779 | ||
| 2440 | codec->power_on = 1; | 2780 | codec->power_on = 1; |
| 2441 | if (codec->bus->ops.pm_notify) | 2781 | if (bus->ops.pm_notify) |
| 2442 | codec->bus->ops.pm_notify(codec); | 2782 | bus->ops.pm_notify(bus); |
| 2443 | hda_call_codec_resume(codec); | 2783 | hda_call_codec_resume(codec); |
| 2444 | cancel_delayed_work(&codec->power_work); | 2784 | cancel_delayed_work(&codec->power_work); |
| 2445 | codec->power_transition = 0; | 2785 | codec->power_transition = 0; |
| 2446 | } | 2786 | } |
| 2787 | EXPORT_SYMBOL_HDA(snd_hda_power_up); | ||
| 2788 | |||
| 2789 | #define power_save(codec) \ | ||
| 2790 | ((codec)->bus->power_save ? *(codec)->bus->power_save : 0) | ||
| 2791 | |||
| 2792 | #define power_save(codec) \ | ||
| 2793 | ((codec)->bus->power_save ? *(codec)->bus->power_save : 0) | ||
| 2447 | 2794 | ||
| 2448 | void snd_hda_power_down(struct hda_codec *codec) | 2795 | void snd_hda_power_down(struct hda_codec *codec) |
| 2449 | { | 2796 | { |
| 2450 | --codec->power_count; | 2797 | --codec->power_count; |
| 2451 | if (!codec->power_on || codec->power_count || codec->power_transition) | 2798 | if (!codec->power_on || codec->power_count || codec->power_transition) |
| 2452 | return; | 2799 | return; |
| 2453 | if (power_save) { | 2800 | if (power_save(codec)) { |
| 2454 | codec->power_transition = 1; /* avoid reentrance */ | 2801 | codec->power_transition = 1; /* avoid reentrance */ |
| 2455 | schedule_delayed_work(&codec->power_work, | 2802 | schedule_delayed_work(&codec->power_work, |
| 2456 | msecs_to_jiffies(power_save * 1000)); | 2803 | msecs_to_jiffies(power_save(codec) * 1000)); |
| 2457 | } | 2804 | } |
| 2458 | } | 2805 | } |
| 2806 | EXPORT_SYMBOL_HDA(snd_hda_power_down); | ||
| 2459 | 2807 | ||
| 2460 | int snd_hda_check_amp_list_power(struct hda_codec *codec, | 2808 | int snd_hda_check_amp_list_power(struct hda_codec *codec, |
| 2461 | struct hda_loopback_check *check, | 2809 | struct hda_loopback_check *check, |
| @@ -2492,6 +2840,7 @@ int snd_hda_check_amp_list_power(struct hda_codec *codec, | |||
| 2492 | } | 2840 | } |
| 2493 | return 0; | 2841 | return 0; |
| 2494 | } | 2842 | } |
| 2843 | EXPORT_SYMBOL_HDA(snd_hda_check_amp_list_power); | ||
| 2495 | #endif | 2844 | #endif |
| 2496 | 2845 | ||
| 2497 | /* | 2846 | /* |
| @@ -2511,6 +2860,7 @@ int snd_hda_ch_mode_info(struct hda_codec *codec, | |||
| 2511 | chmode[uinfo->value.enumerated.item].channels); | 2860 | chmode[uinfo->value.enumerated.item].channels); |
| 2512 | return 0; | 2861 | return 0; |
| 2513 | } | 2862 | } |
| 2863 | EXPORT_SYMBOL_HDA(snd_hda_ch_mode_info); | ||
| 2514 | 2864 | ||
| 2515 | int snd_hda_ch_mode_get(struct hda_codec *codec, | 2865 | int snd_hda_ch_mode_get(struct hda_codec *codec, |
| 2516 | struct snd_ctl_elem_value *ucontrol, | 2866 | struct snd_ctl_elem_value *ucontrol, |
| @@ -2528,6 +2878,7 @@ int snd_hda_ch_mode_get(struct hda_codec *codec, | |||
| 2528 | } | 2878 | } |
| 2529 | return 0; | 2879 | return 0; |
| 2530 | } | 2880 | } |
| 2881 | EXPORT_SYMBOL_HDA(snd_hda_ch_mode_get); | ||
| 2531 | 2882 | ||
| 2532 | int snd_hda_ch_mode_put(struct hda_codec *codec, | 2883 | int snd_hda_ch_mode_put(struct hda_codec *codec, |
| 2533 | struct snd_ctl_elem_value *ucontrol, | 2884 | struct snd_ctl_elem_value *ucontrol, |
| @@ -2548,6 +2899,7 @@ int snd_hda_ch_mode_put(struct hda_codec *codec, | |||
| 2548 | snd_hda_sequence_write_cache(codec, chmode[mode].sequence); | 2899 | snd_hda_sequence_write_cache(codec, chmode[mode].sequence); |
| 2549 | return 1; | 2900 | return 1; |
| 2550 | } | 2901 | } |
| 2902 | EXPORT_SYMBOL_HDA(snd_hda_ch_mode_put); | ||
| 2551 | 2903 | ||
| 2552 | /* | 2904 | /* |
| 2553 | * input MUX helper | 2905 | * input MUX helper |
| @@ -2568,6 +2920,7 @@ int snd_hda_input_mux_info(const struct hda_input_mux *imux, | |||
| 2568 | strcpy(uinfo->value.enumerated.name, imux->items[index].label); | 2920 | strcpy(uinfo->value.enumerated.name, imux->items[index].label); |
| 2569 | return 0; | 2921 | return 0; |
| 2570 | } | 2922 | } |
| 2923 | EXPORT_SYMBOL_HDA(snd_hda_input_mux_info); | ||
| 2571 | 2924 | ||
| 2572 | int snd_hda_input_mux_put(struct hda_codec *codec, | 2925 | int snd_hda_input_mux_put(struct hda_codec *codec, |
| 2573 | const struct hda_input_mux *imux, | 2926 | const struct hda_input_mux *imux, |
| @@ -2589,6 +2942,7 @@ int snd_hda_input_mux_put(struct hda_codec *codec, | |||
| 2589 | *cur_val = idx; | 2942 | *cur_val = idx; |
| 2590 | return 1; | 2943 | return 1; |
| 2591 | } | 2944 | } |
| 2945 | EXPORT_SYMBOL_HDA(snd_hda_input_mux_put); | ||
| 2592 | 2946 | ||
| 2593 | 2947 | ||
| 2594 | /* | 2948 | /* |
| @@ -2641,6 +2995,7 @@ int snd_hda_multi_out_dig_open(struct hda_codec *codec, | |||
| 2641 | mutex_unlock(&codec->spdif_mutex); | 2995 | mutex_unlock(&codec->spdif_mutex); |
| 2642 | return 0; | 2996 | return 0; |
| 2643 | } | 2997 | } |
| 2998 | EXPORT_SYMBOL_HDA(snd_hda_multi_out_dig_open); | ||
| 2644 | 2999 | ||
| 2645 | int snd_hda_multi_out_dig_prepare(struct hda_codec *codec, | 3000 | int snd_hda_multi_out_dig_prepare(struct hda_codec *codec, |
| 2646 | struct hda_multi_out *mout, | 3001 | struct hda_multi_out *mout, |
| @@ -2653,6 +3008,7 @@ int snd_hda_multi_out_dig_prepare(struct hda_codec *codec, | |||
| 2653 | mutex_unlock(&codec->spdif_mutex); | 3008 | mutex_unlock(&codec->spdif_mutex); |
| 2654 | return 0; | 3009 | return 0; |
| 2655 | } | 3010 | } |
| 3011 | EXPORT_SYMBOL_HDA(snd_hda_multi_out_dig_prepare); | ||
| 2656 | 3012 | ||
| 2657 | /* | 3013 | /* |
| 2658 | * release the digital out | 3014 | * release the digital out |
| @@ -2665,6 +3021,7 @@ int snd_hda_multi_out_dig_close(struct hda_codec *codec, | |||
| 2665 | mutex_unlock(&codec->spdif_mutex); | 3021 | mutex_unlock(&codec->spdif_mutex); |
| 2666 | return 0; | 3022 | return 0; |
| 2667 | } | 3023 | } |
| 3024 | EXPORT_SYMBOL_HDA(snd_hda_multi_out_dig_close); | ||
| 2668 | 3025 | ||
| 2669 | /* | 3026 | /* |
| 2670 | * set up more restrictions for analog out | 3027 | * set up more restrictions for analog out |
| @@ -2704,6 +3061,7 @@ int snd_hda_multi_out_analog_open(struct hda_codec *codec, | |||
| 2704 | return snd_pcm_hw_constraint_step(substream->runtime, 0, | 3061 | return snd_pcm_hw_constraint_step(substream->runtime, 0, |
| 2705 | SNDRV_PCM_HW_PARAM_CHANNELS, 2); | 3062 | SNDRV_PCM_HW_PARAM_CHANNELS, 2); |
| 2706 | } | 3063 | } |
| 3064 | EXPORT_SYMBOL_HDA(snd_hda_multi_out_analog_open); | ||
| 2707 | 3065 | ||
| 2708 | /* | 3066 | /* |
| 2709 | * set up the i/o for analog out | 3067 | * set up the i/o for analog out |
| @@ -2762,6 +3120,7 @@ int snd_hda_multi_out_analog_prepare(struct hda_codec *codec, | |||
| 2762 | } | 3120 | } |
| 2763 | return 0; | 3121 | return 0; |
| 2764 | } | 3122 | } |
| 3123 | EXPORT_SYMBOL_HDA(snd_hda_multi_out_analog_prepare); | ||
| 2765 | 3124 | ||
| 2766 | /* | 3125 | /* |
| 2767 | * clean up the setting for analog out | 3126 | * clean up the setting for analog out |
| @@ -2788,6 +3147,7 @@ int snd_hda_multi_out_analog_cleanup(struct hda_codec *codec, | |||
| 2788 | mutex_unlock(&codec->spdif_mutex); | 3147 | mutex_unlock(&codec->spdif_mutex); |
| 2789 | return 0; | 3148 | return 0; |
| 2790 | } | 3149 | } |
| 3150 | EXPORT_SYMBOL_HDA(snd_hda_multi_out_analog_cleanup); | ||
| 2791 | 3151 | ||
| 2792 | /* | 3152 | /* |
| 2793 | * Helper for automatic pin configuration | 3153 | * Helper for automatic pin configuration |
| @@ -3073,11 +3433,13 @@ int snd_hda_parse_pin_def_config(struct hda_codec *codec, | |||
| 3073 | 3433 | ||
| 3074 | return 0; | 3434 | return 0; |
| 3075 | } | 3435 | } |
| 3436 | EXPORT_SYMBOL_HDA(snd_hda_parse_pin_def_config); | ||
| 3076 | 3437 | ||
| 3077 | /* labels for input pins */ | 3438 | /* labels for input pins */ |
| 3078 | const char *auto_pin_cfg_labels[AUTO_PIN_LAST] = { | 3439 | const char *auto_pin_cfg_labels[AUTO_PIN_LAST] = { |
| 3079 | "Mic", "Front Mic", "Line", "Front Line", "CD", "Aux" | 3440 | "Mic", "Front Mic", "Line", "Front Line", "CD", "Aux" |
| 3080 | }; | 3441 | }; |
| 3442 | EXPORT_SYMBOL_HDA(auto_pin_cfg_labels); | ||
| 3081 | 3443 | ||
| 3082 | 3444 | ||
| 3083 | #ifdef CONFIG_PM | 3445 | #ifdef CONFIG_PM |
| @@ -3105,11 +3467,11 @@ int snd_hda_suspend(struct hda_bus *bus, pm_message_t state) | |||
| 3105 | } | 3467 | } |
| 3106 | return 0; | 3468 | return 0; |
| 3107 | } | 3469 | } |
| 3470 | EXPORT_SYMBOL_HDA(snd_hda_suspend); | ||
| 3108 | 3471 | ||
| 3109 | /** | 3472 | /** |
| 3110 | * snd_hda_resume - resume the codecs | 3473 | * snd_hda_resume - resume the codecs |
| 3111 | * @bus: the HDA bus | 3474 | * @bus: the HDA bus |
| 3112 | * @state: resume state | ||
| 3113 | * | 3475 | * |
| 3114 | * Returns 0 if successful. | 3476 | * Returns 0 if successful. |
| 3115 | * | 3477 | * |
| @@ -3126,16 +3488,79 @@ int snd_hda_resume(struct hda_bus *bus) | |||
| 3126 | } | 3488 | } |
| 3127 | return 0; | 3489 | return 0; |
| 3128 | } | 3490 | } |
| 3129 | #ifdef CONFIG_SND_HDA_POWER_SAVE | 3491 | EXPORT_SYMBOL_HDA(snd_hda_resume); |
| 3130 | int snd_hda_codecs_inuse(struct hda_bus *bus) | 3492 | #endif /* CONFIG_PM */ |
| 3131 | { | ||
| 3132 | struct hda_codec *codec; | ||
| 3133 | 3493 | ||
| 3134 | list_for_each_entry(codec, &bus->codec_list, list) { | 3494 | /* |
| 3135 | if (snd_hda_codec_needs_resume(codec)) | 3495 | * generic arrays |
| 3136 | return 1; | 3496 | */ |
| 3497 | |||
| 3498 | /* get a new element from the given array | ||
| 3499 | * if it exceeds the pre-allocated array size, re-allocate the array | ||
| 3500 | */ | ||
| 3501 | void *snd_array_new(struct snd_array *array) | ||
| 3502 | { | ||
| 3503 | if (array->used >= array->alloced) { | ||
| 3504 | int num = array->alloced + array->alloc_align; | ||
| 3505 | void *nlist; | ||
| 3506 | if (snd_BUG_ON(num >= 4096)) | ||
| 3507 | return NULL; | ||
| 3508 | nlist = kcalloc(num + 1, array->elem_size, GFP_KERNEL); | ||
| 3509 | if (!nlist) | ||
| 3510 | return NULL; | ||
| 3511 | if (array->list) { | ||
| 3512 | memcpy(nlist, array->list, | ||
| 3513 | array->elem_size * array->alloced); | ||
| 3514 | kfree(array->list); | ||
| 3515 | } | ||
| 3516 | array->list = nlist; | ||
| 3517 | array->alloced = num; | ||
| 3137 | } | 3518 | } |
| 3138 | return 0; | 3519 | return snd_array_elem(array, array->used++); |
| 3139 | } | 3520 | } |
| 3140 | #endif | 3521 | EXPORT_SYMBOL_HDA(snd_array_new); |
| 3141 | #endif | 3522 | |
| 3523 | /* free the given array elements */ | ||
| 3524 | void snd_array_free(struct snd_array *array) | ||
| 3525 | { | ||
| 3526 | kfree(array->list); | ||
| 3527 | array->used = 0; | ||
| 3528 | array->alloced = 0; | ||
| 3529 | array->list = NULL; | ||
| 3530 | } | ||
| 3531 | EXPORT_SYMBOL_HDA(snd_array_free); | ||
| 3532 | |||
| 3533 | /* | ||
| 3534 | * used by hda_proc.c and hda_eld.c | ||
| 3535 | */ | ||
| 3536 | void snd_print_pcm_rates(int pcm, char *buf, int buflen) | ||
| 3537 | { | ||
| 3538 | static unsigned int rates[] = { | ||
| 3539 | 8000, 11025, 16000, 22050, 32000, 44100, 48000, 88200, | ||
| 3540 | 96000, 176400, 192000, 384000 | ||
| 3541 | }; | ||
| 3542 | int i, j; | ||
| 3543 | |||
| 3544 | for (i = 0, j = 0; i < ARRAY_SIZE(rates); i++) | ||
| 3545 | if (pcm & (1 << i)) | ||
| 3546 | j += snprintf(buf + j, buflen - j, " %d", rates[i]); | ||
| 3547 | |||
| 3548 | buf[j] = '\0'; /* necessary when j == 0 */ | ||
| 3549 | } | ||
| 3550 | EXPORT_SYMBOL_HDA(snd_print_pcm_rates); | ||
| 3551 | |||
| 3552 | void snd_print_pcm_bits(int pcm, char *buf, int buflen) | ||
| 3553 | { | ||
| 3554 | static unsigned int bits[] = { 8, 16, 20, 24, 32 }; | ||
| 3555 | int i, j; | ||
| 3556 | |||
| 3557 | for (i = 0, j = 0; i < ARRAY_SIZE(bits); i++) | ||
| 3558 | if (pcm & (AC_SUPPCM_BITS_8 << i)) | ||
| 3559 | j += snprintf(buf + j, buflen - j, " %d", bits[i]); | ||
| 3560 | |||
| 3561 | buf[j] = '\0'; /* necessary when j == 0 */ | ||
| 3562 | } | ||
| 3563 | EXPORT_SYMBOL_HDA(snd_print_pcm_bits); | ||
| 3564 | |||
| 3565 | MODULE_DESCRIPTION("HDA codec core"); | ||
| 3566 | MODULE_LICENSE("GPL"); | ||
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h index 60468f562400..5587d416229f 100644 --- a/sound/pci/hda/hda_codec.h +++ b/sound/pci/hda/hda_codec.h | |||
| @@ -520,6 +520,36 @@ enum { | |||
| 520 | #define HDA_MAX_CODEC_ADDRESS 0x0f | 520 | #define HDA_MAX_CODEC_ADDRESS 0x0f |
| 521 | 521 | ||
| 522 | /* | 522 | /* |
| 523 | * generic arrays | ||
| 524 | */ | ||
| 525 | struct snd_array { | ||
| 526 | unsigned int used; | ||
| 527 | unsigned int alloced; | ||
| 528 | unsigned int elem_size; | ||
| 529 | unsigned int alloc_align; | ||
| 530 | void *list; | ||
| 531 | }; | ||
| 532 | |||
| 533 | void *snd_array_new(struct snd_array *array); | ||
| 534 | void snd_array_free(struct snd_array *array); | ||
| 535 | static inline void snd_array_init(struct snd_array *array, unsigned int size, | ||
| 536 | unsigned int align) | ||
| 537 | { | ||
| 538 | array->elem_size = size; | ||
| 539 | array->alloc_align = align; | ||
| 540 | } | ||
| 541 | |||
| 542 | static inline void *snd_array_elem(struct snd_array *array, unsigned int idx) | ||
| 543 | { | ||
| 544 | return array->list + idx * array->elem_size; | ||
| 545 | } | ||
| 546 | |||
| 547 | static inline unsigned int snd_array_index(struct snd_array *array, void *ptr) | ||
| 548 | { | ||
| 549 | return (unsigned long)(ptr - array->list) / array->elem_size; | ||
| 550 | } | ||
| 551 | |||
| 552 | /* | ||
| 523 | * Structures | 553 | * Structures |
| 524 | */ | 554 | */ |
| 525 | 555 | ||
| @@ -536,15 +566,17 @@ typedef u16 hda_nid_t; | |||
| 536 | /* bus operators */ | 566 | /* bus operators */ |
| 537 | struct hda_bus_ops { | 567 | struct hda_bus_ops { |
| 538 | /* send a single command */ | 568 | /* send a single command */ |
| 539 | int (*command)(struct hda_codec *codec, hda_nid_t nid, int direct, | 569 | int (*command)(struct hda_bus *bus, unsigned int cmd); |
| 540 | unsigned int verb, unsigned int parm); | ||
| 541 | /* get a response from the last command */ | 570 | /* get a response from the last command */ |
| 542 | unsigned int (*get_response)(struct hda_codec *codec); | 571 | unsigned int (*get_response)(struct hda_bus *bus); |
| 543 | /* free the private data */ | 572 | /* free the private data */ |
| 544 | void (*private_free)(struct hda_bus *); | 573 | void (*private_free)(struct hda_bus *); |
| 574 | /* attach a PCM stream */ | ||
| 575 | int (*attach_pcm)(struct hda_bus *bus, struct hda_codec *codec, | ||
| 576 | struct hda_pcm *pcm); | ||
| 545 | #ifdef CONFIG_SND_HDA_POWER_SAVE | 577 | #ifdef CONFIG_SND_HDA_POWER_SAVE |
| 546 | /* notify power-up/down from codec to controller */ | 578 | /* notify power-up/down from codec to controller */ |
| 547 | void (*pm_notify)(struct hda_codec *codec); | 579 | void (*pm_notify)(struct hda_bus *bus); |
| 548 | #endif | 580 | #endif |
| 549 | }; | 581 | }; |
| 550 | 582 | ||
| @@ -553,6 +585,7 @@ struct hda_bus_template { | |||
| 553 | void *private_data; | 585 | void *private_data; |
| 554 | struct pci_dev *pci; | 586 | struct pci_dev *pci; |
| 555 | const char *modelname; | 587 | const char *modelname; |
| 588 | int *power_save; | ||
| 556 | struct hda_bus_ops ops; | 589 | struct hda_bus_ops ops; |
| 557 | }; | 590 | }; |
| 558 | 591 | ||
| @@ -569,6 +602,7 @@ struct hda_bus { | |||
| 569 | void *private_data; | 602 | void *private_data; |
| 570 | struct pci_dev *pci; | 603 | struct pci_dev *pci; |
| 571 | const char *modelname; | 604 | const char *modelname; |
| 605 | int *power_save; | ||
| 572 | struct hda_bus_ops ops; | 606 | struct hda_bus_ops ops; |
| 573 | 607 | ||
| 574 | /* codec linked list */ | 608 | /* codec linked list */ |
| @@ -581,10 +615,12 @@ struct hda_bus { | |||
| 581 | /* unsolicited event queue */ | 615 | /* unsolicited event queue */ |
| 582 | struct hda_bus_unsolicited *unsol; | 616 | struct hda_bus_unsolicited *unsol; |
| 583 | 617 | ||
| 584 | struct snd_info_entry *proc; | 618 | /* assigned PCMs */ |
| 619 | DECLARE_BITMAP(pcm_dev_bits, SNDRV_PCM_DEVICES); | ||
| 585 | 620 | ||
| 586 | /* misc op flags */ | 621 | /* misc op flags */ |
| 587 | unsigned int needs_damn_long_delay :1; | 622 | unsigned int needs_damn_long_delay :1; |
| 623 | unsigned int shutdown :1; /* being unloaded */ | ||
| 588 | }; | 624 | }; |
| 589 | 625 | ||
| 590 | /* | 626 | /* |
| @@ -604,6 +640,16 @@ struct hda_codec_preset { | |||
| 604 | int (*patch)(struct hda_codec *codec); | 640 | int (*patch)(struct hda_codec *codec); |
| 605 | }; | 641 | }; |
| 606 | 642 | ||
| 643 | struct hda_codec_preset_list { | ||
| 644 | const struct hda_codec_preset *preset; | ||
| 645 | struct module *owner; | ||
| 646 | struct list_head list; | ||
| 647 | }; | ||
| 648 | |||
| 649 | /* initial hook */ | ||
| 650 | int snd_hda_add_codec_preset(struct hda_codec_preset_list *preset); | ||
| 651 | int snd_hda_delete_codec_preset(struct hda_codec_preset_list *preset); | ||
| 652 | |||
| 607 | /* ops set by the preset patch */ | 653 | /* ops set by the preset patch */ |
| 608 | struct hda_codec_ops { | 654 | struct hda_codec_ops { |
| 609 | int (*build_controls)(struct hda_codec *codec); | 655 | int (*build_controls)(struct hda_codec *codec); |
| @@ -635,10 +681,7 @@ struct hda_amp_info { | |||
| 635 | 681 | ||
| 636 | struct hda_cache_rec { | 682 | struct hda_cache_rec { |
| 637 | u16 hash[64]; /* hash table for index */ | 683 | u16 hash[64]; /* hash table for index */ |
| 638 | unsigned int num_entries; /* number of assigned entries */ | 684 | struct snd_array buf; /* record entries */ |
| 639 | unsigned int size; /* allocated size */ | ||
| 640 | unsigned int record_size; /* record size (including header) */ | ||
| 641 | void *buffer; /* hash table entries */ | ||
| 642 | }; | 685 | }; |
| 643 | 686 | ||
| 644 | /* PCM callbacks */ | 687 | /* PCM callbacks */ |
| @@ -680,7 +723,8 @@ struct hda_pcm { | |||
| 680 | char *name; | 723 | char *name; |
| 681 | struct hda_pcm_stream stream[2]; | 724 | struct hda_pcm_stream stream[2]; |
| 682 | unsigned int pcm_type; /* HDA_PCM_TYPE_XXX */ | 725 | unsigned int pcm_type; /* HDA_PCM_TYPE_XXX */ |
| 683 | int device; /* assigned device number */ | 726 | int device; /* device number to assign */ |
| 727 | struct snd_pcm *pcm; /* assigned PCM instance */ | ||
| 684 | }; | 728 | }; |
| 685 | 729 | ||
| 686 | /* codec information */ | 730 | /* codec information */ |
| @@ -699,6 +743,9 @@ struct hda_codec { | |||
| 699 | 743 | ||
| 700 | /* detected preset */ | 744 | /* detected preset */ |
| 701 | const struct hda_codec_preset *preset; | 745 | const struct hda_codec_preset *preset; |
| 746 | struct module *owner; | ||
| 747 | const char *name; /* codec name */ | ||
| 748 | const char *modelname; /* model name for preset */ | ||
| 702 | 749 | ||
| 703 | /* set by patch */ | 750 | /* set by patch */ |
| 704 | struct hda_codec_ops patch_ops; | 751 | struct hda_codec_ops patch_ops; |
| @@ -718,6 +765,8 @@ struct hda_codec { | |||
| 718 | hda_nid_t start_nid; | 765 | hda_nid_t start_nid; |
| 719 | u32 *wcaps; | 766 | u32 *wcaps; |
| 720 | 767 | ||
| 768 | struct snd_array mixers; /* list of assigned mixer elements */ | ||
| 769 | |||
| 721 | struct hda_cache_rec amp_cache; /* cache for amp access */ | 770 | struct hda_cache_rec amp_cache; /* cache for amp access */ |
| 722 | struct hda_cache_rec cmd_cache; /* cache for other commands */ | 771 | struct hda_cache_rec cmd_cache; /* cache for other commands */ |
| 723 | 772 | ||
| @@ -727,7 +776,11 @@ struct hda_codec { | |||
| 727 | unsigned int spdif_in_enable; /* SPDIF input enable? */ | 776 | unsigned int spdif_in_enable; /* SPDIF input enable? */ |
| 728 | hda_nid_t *slave_dig_outs; /* optional digital out slave widgets */ | 777 | hda_nid_t *slave_dig_outs; /* optional digital out slave widgets */ |
| 729 | 778 | ||
| 779 | #ifdef CONFIG_SND_HDA_HWDEP | ||
| 730 | struct snd_hwdep *hwdep; /* assigned hwdep device */ | 780 | struct snd_hwdep *hwdep; /* assigned hwdep device */ |
| 781 | struct snd_array init_verbs; /* additional init verbs */ | ||
| 782 | struct snd_array hints; /* additional hints */ | ||
| 783 | #endif | ||
| 731 | 784 | ||
| 732 | /* misc flags */ | 785 | /* misc flags */ |
| 733 | unsigned int spdif_status_reset :1; /* needs to toggle SPDIF for each | 786 | unsigned int spdif_status_reset :1; /* needs to toggle SPDIF for each |
| @@ -740,6 +793,10 @@ struct hda_codec { | |||
| 740 | int power_count; /* current (global) power refcount */ | 793 | int power_count; /* current (global) power refcount */ |
| 741 | struct delayed_work power_work; /* delayed task for powerdown */ | 794 | struct delayed_work power_work; /* delayed task for powerdown */ |
| 742 | #endif | 795 | #endif |
| 796 | |||
| 797 | /* codec-specific additional proc output */ | ||
| 798 | void (*proc_widget_hook)(struct snd_info_buffer *buffer, | ||
| 799 | struct hda_codec *codec, hda_nid_t nid); | ||
| 743 | }; | 800 | }; |
| 744 | 801 | ||
| 745 | /* direction */ | 802 | /* direction */ |
| @@ -799,11 +856,13 @@ void snd_hda_codec_resume_cache(struct hda_codec *codec); | |||
| 799 | * Mixer | 856 | * Mixer |
| 800 | */ | 857 | */ |
| 801 | int snd_hda_build_controls(struct hda_bus *bus); | 858 | int snd_hda_build_controls(struct hda_bus *bus); |
| 859 | int snd_hda_codec_build_controls(struct hda_codec *codec); | ||
| 802 | 860 | ||
| 803 | /* | 861 | /* |
| 804 | * PCM | 862 | * PCM |
| 805 | */ | 863 | */ |
| 806 | int snd_hda_build_pcms(struct hda_bus *bus); | 864 | int snd_hda_build_pcms(struct hda_bus *bus); |
| 865 | int snd_hda_codec_build_pcms(struct hda_codec *codec); | ||
| 807 | void snd_hda_codec_setup_stream(struct hda_codec *codec, hda_nid_t nid, | 866 | void snd_hda_codec_setup_stream(struct hda_codec *codec, hda_nid_t nid, |
| 808 | u32 stream_tag, | 867 | u32 stream_tag, |
| 809 | int channel_id, int format); | 868 | int channel_id, int format); |
| @@ -812,8 +871,6 @@ unsigned int snd_hda_calc_stream_format(unsigned int rate, | |||
| 812 | unsigned int channels, | 871 | unsigned int channels, |
| 813 | unsigned int format, | 872 | unsigned int format, |
| 814 | unsigned int maxbps); | 873 | unsigned int maxbps); |
| 815 | int snd_hda_query_supported_pcm(struct hda_codec *codec, hda_nid_t nid, | ||
| 816 | u32 *ratesp, u64 *formatsp, unsigned int *bpsp); | ||
| 817 | int snd_hda_is_supported_format(struct hda_codec *codec, hda_nid_t nid, | 874 | int snd_hda_is_supported_format(struct hda_codec *codec, hda_nid_t nid, |
| 818 | unsigned int format); | 875 | unsigned int format); |
| 819 | 876 | ||
| @@ -831,18 +888,38 @@ int snd_hda_resume(struct hda_bus *bus); | |||
| 831 | #endif | 888 | #endif |
| 832 | 889 | ||
| 833 | /* | 890 | /* |
| 891 | * get widget information | ||
| 892 | */ | ||
| 893 | const char *snd_hda_get_jack_connectivity(u32 cfg); | ||
| 894 | const char *snd_hda_get_jack_type(u32 cfg); | ||
| 895 | const char *snd_hda_get_jack_location(u32 cfg); | ||
| 896 | |||
| 897 | /* | ||
| 834 | * power saving | 898 | * power saving |
| 835 | */ | 899 | */ |
| 836 | #ifdef CONFIG_SND_HDA_POWER_SAVE | 900 | #ifdef CONFIG_SND_HDA_POWER_SAVE |
| 837 | void snd_hda_power_up(struct hda_codec *codec); | 901 | void snd_hda_power_up(struct hda_codec *codec); |
| 838 | void snd_hda_power_down(struct hda_codec *codec); | 902 | void snd_hda_power_down(struct hda_codec *codec); |
| 839 | #define snd_hda_codec_needs_resume(codec) codec->power_count | 903 | #define snd_hda_codec_needs_resume(codec) codec->power_count |
| 840 | int snd_hda_codecs_inuse(struct hda_bus *bus); | ||
| 841 | #else | 904 | #else |
| 842 | static inline void snd_hda_power_up(struct hda_codec *codec) {} | 905 | static inline void snd_hda_power_up(struct hda_codec *codec) {} |
| 843 | static inline void snd_hda_power_down(struct hda_codec *codec) {} | 906 | static inline void snd_hda_power_down(struct hda_codec *codec) {} |
| 844 | #define snd_hda_codec_needs_resume(codec) 1 | 907 | #define snd_hda_codec_needs_resume(codec) 1 |
| 845 | #define snd_hda_codecs_inuse(bus) 1 | 908 | #endif |
| 909 | |||
| 910 | /* | ||
| 911 | * Codec modularization | ||
| 912 | */ | ||
| 913 | |||
| 914 | /* Export symbols only for communication with codec drivers; | ||
| 915 | * When built in kernel, all HD-audio drivers are supposed to be statically | ||
| 916 | * linked to the kernel. Thus, the symbols don't have to (or shouldn't) be | ||
| 917 | * exported unless it's built as a module. | ||
| 918 | */ | ||
| 919 | #ifdef MODULE | ||
| 920 | #define EXPORT_SYMBOL_HDA(sym) EXPORT_SYMBOL_GPL(sym) | ||
| 921 | #else | ||
| 922 | #define EXPORT_SYMBOL_HDA(sym) | ||
| 846 | #endif | 923 | #endif |
| 847 | 924 | ||
| 848 | #endif /* __SOUND_HDA_CODEC_H */ | 925 | #endif /* __SOUND_HDA_CODEC_H */ |
diff --git a/sound/pci/hda/hda_eld.c b/sound/pci/hda/hda_eld.c new file mode 100644 index 000000000000..fcad5ec31773 --- /dev/null +++ b/sound/pci/hda/hda_eld.c | |||
| @@ -0,0 +1,590 @@ | |||
| 1 | /* | ||
| 2 | * Generic routines and proc interface for ELD(EDID Like Data) information | ||
| 3 | * | ||
| 4 | * Copyright(c) 2008 Intel Corporation. | ||
| 5 | * | ||
| 6 | * Authors: | ||
| 7 | * Wu Fengguang <wfg@linux.intel.com> | ||
| 8 | * | ||
| 9 | * This driver is free software; you can redistribute it and/or modify | ||
| 10 | * it under the terms of the GNU General Public License as published by | ||
| 11 | * the Free Software Foundation; either version 2 of the License, or | ||
| 12 | * (at your option) any later version. | ||
| 13 | * | ||
| 14 | * This driver is distributed in the hope that it will be useful, | ||
| 15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 17 | * GNU General Public License for more details. | ||
| 18 | * | ||
| 19 | * You should have received a copy of the GNU General Public License | ||
| 20 | * along with this program; if not, write to the Free Software | ||
| 21 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
| 22 | */ | ||
| 23 | |||
| 24 | #include <linux/init.h> | ||
| 25 | #include <sound/core.h> | ||
| 26 | #include <asm/unaligned.h> | ||
| 27 | #include "hda_codec.h" | ||
| 28 | #include "hda_local.h" | ||
| 29 | |||
| 30 | enum eld_versions { | ||
| 31 | ELD_VER_CEA_861D = 2, | ||
| 32 | ELD_VER_PARTIAL = 31, | ||
| 33 | }; | ||
| 34 | |||
| 35 | enum cea_edid_versions { | ||
| 36 | CEA_EDID_VER_NONE = 0, | ||
| 37 | CEA_EDID_VER_CEA861 = 1, | ||
| 38 | CEA_EDID_VER_CEA861A = 2, | ||
| 39 | CEA_EDID_VER_CEA861BCD = 3, | ||
| 40 | CEA_EDID_VER_RESERVED = 4, | ||
| 41 | }; | ||
| 42 | |||
| 43 | static char *cea_speaker_allocation_names[] = { | ||
| 44 | /* 0 */ "FL/FR", | ||
| 45 | /* 1 */ "LFE", | ||
| 46 | /* 2 */ "FC", | ||
| 47 | /* 3 */ "RL/RR", | ||
| 48 | /* 4 */ "RC", | ||
| 49 | /* 5 */ "FLC/FRC", | ||
| 50 | /* 6 */ "RLC/RRC", | ||
| 51 | /* 7 */ "FLW/FRW", | ||
| 52 | /* 8 */ "FLH/FRH", | ||
| 53 | /* 9 */ "TC", | ||
| 54 | /* 10 */ "FCH", | ||
| 55 | }; | ||
| 56 | |||
| 57 | static char *eld_connection_type_names[4] = { | ||
| 58 | "HDMI", | ||
| 59 | "DisplayPort", | ||
| 60 | "2-reserved", | ||
| 61 | "3-reserved" | ||
| 62 | }; | ||
| 63 | |||
| 64 | enum cea_audio_coding_types { | ||
| 65 | AUDIO_CODING_TYPE_REF_STREAM_HEADER = 0, | ||
| 66 | AUDIO_CODING_TYPE_LPCM = 1, | ||
| 67 | AUDIO_CODING_TYPE_AC3 = 2, | ||
| 68 | AUDIO_CODING_TYPE_MPEG1 = 3, | ||
| 69 | AUDIO_CODING_TYPE_MP3 = 4, | ||
| 70 | AUDIO_CODING_TYPE_MPEG2 = 5, | ||
| 71 | AUDIO_CODING_TYPE_AACLC = 6, | ||
| 72 | AUDIO_CODING_TYPE_DTS = 7, | ||
| 73 | AUDIO_CODING_TYPE_ATRAC = 8, | ||
| 74 | AUDIO_CODING_TYPE_SACD = 9, | ||
| 75 | AUDIO_CODING_TYPE_EAC3 = 10, | ||
| 76 | AUDIO_CODING_TYPE_DTS_HD = 11, | ||
| 77 | AUDIO_CODING_TYPE_MLP = 12, | ||
| 78 | AUDIO_CODING_TYPE_DST = 13, | ||
| 79 | AUDIO_CODING_TYPE_WMAPRO = 14, | ||
| 80 | AUDIO_CODING_TYPE_REF_CXT = 15, | ||
| 81 | /* also include valid xtypes below */ | ||
| 82 | AUDIO_CODING_TYPE_HE_AAC = 15, | ||
| 83 | AUDIO_CODING_TYPE_HE_AAC2 = 16, | ||
| 84 | AUDIO_CODING_TYPE_MPEG_SURROUND = 17, | ||
| 85 | }; | ||
| 86 | |||
| 87 | enum cea_audio_coding_xtypes { | ||
| 88 | AUDIO_CODING_XTYPE_HE_REF_CT = 0, | ||
| 89 | AUDIO_CODING_XTYPE_HE_AAC = 1, | ||
| 90 | AUDIO_CODING_XTYPE_HE_AAC2 = 2, | ||
| 91 | AUDIO_CODING_XTYPE_MPEG_SURROUND = 3, | ||
| 92 | AUDIO_CODING_XTYPE_FIRST_RESERVED = 4, | ||
| 93 | }; | ||
| 94 | |||
| 95 | static char *cea_audio_coding_type_names[] = { | ||
| 96 | /* 0 */ "undefined", | ||
| 97 | /* 1 */ "LPCM", | ||
| 98 | /* 2 */ "AC-3", | ||
| 99 | /* 3 */ "MPEG1", | ||
| 100 | /* 4 */ "MP3", | ||
| 101 | /* 5 */ "MPEG2", | ||
| 102 | /* 6 */ "AAC-LC", | ||
| 103 | /* 7 */ "DTS", | ||
| 104 | /* 8 */ "ATRAC", | ||
| 105 | /* 9 */ "DSD (One Bit Audio)", | ||
| 106 | /* 10 */ "E-AC-3/DD+ (Dolby Digital Plus)", | ||
| 107 | /* 11 */ "DTS-HD", | ||
| 108 | /* 12 */ "MLP (Dolby TrueHD)", | ||
| 109 | /* 13 */ "DST", | ||
| 110 | /* 14 */ "WMAPro", | ||
| 111 | /* 15 */ "HE-AAC", | ||
| 112 | /* 16 */ "HE-AACv2", | ||
| 113 | /* 17 */ "MPEG Surround", | ||
| 114 | }; | ||
| 115 | |||
| 116 | /* | ||
| 117 | * The following two lists are shared between | ||
| 118 | * - HDMI audio InfoFrame (source to sink) | ||
| 119 | * - CEA E-EDID Extension (sink to source) | ||
| 120 | */ | ||
| 121 | |||
| 122 | /* | ||
| 123 | * SS1:SS0 index => sample size | ||
| 124 | */ | ||
| 125 | static int cea_sample_sizes[4] = { | ||
| 126 | 0, /* 0: Refer to Stream Header */ | ||
| 127 | AC_SUPPCM_BITS_16, /* 1: 16 bits */ | ||
| 128 | AC_SUPPCM_BITS_20, /* 2: 20 bits */ | ||
| 129 | AC_SUPPCM_BITS_24, /* 3: 24 bits */ | ||
| 130 | }; | ||
| 131 | |||
| 132 | /* | ||
| 133 | * SF2:SF1:SF0 index => sampling frequency | ||
| 134 | */ | ||
| 135 | static int cea_sampling_frequencies[8] = { | ||
| 136 | 0, /* 0: Refer to Stream Header */ | ||
| 137 | SNDRV_PCM_RATE_32000, /* 1: 32000Hz */ | ||
| 138 | SNDRV_PCM_RATE_44100, /* 2: 44100Hz */ | ||
| 139 | SNDRV_PCM_RATE_48000, /* 3: 48000Hz */ | ||
| 140 | SNDRV_PCM_RATE_88200, /* 4: 88200Hz */ | ||
| 141 | SNDRV_PCM_RATE_96000, /* 5: 96000Hz */ | ||
| 142 | SNDRV_PCM_RATE_176400, /* 6: 176400Hz */ | ||
| 143 | SNDRV_PCM_RATE_192000, /* 7: 192000Hz */ | ||
| 144 | }; | ||
| 145 | |||
| 146 | static unsigned char hdmi_get_eld_byte(struct hda_codec *codec, hda_nid_t nid, | ||
| 147 | int byte_index) | ||
| 148 | { | ||
| 149 | unsigned int val; | ||
| 150 | |||
| 151 | val = snd_hda_codec_read(codec, nid, 0, | ||
| 152 | AC_VERB_GET_HDMI_ELDD, byte_index); | ||
| 153 | |||
| 154 | #ifdef BE_PARANOID | ||
| 155 | printk(KERN_INFO "HDMI: ELD data byte %d: 0x%x\n", byte_index, val); | ||
| 156 | #endif | ||
| 157 | |||
| 158 | if ((val & AC_ELDD_ELD_VALID) == 0) { | ||
| 159 | snd_printd(KERN_INFO "HDMI: invalid ELD data byte %d\n", | ||
| 160 | byte_index); | ||
| 161 | val = 0; | ||
| 162 | } | ||
| 163 | |||
| 164 | return val & AC_ELDD_ELD_DATA; | ||
| 165 | } | ||
| 166 | |||
| 167 | #define GRAB_BITS(buf, byte, lowbit, bits) \ | ||
| 168 | ({ \ | ||
| 169 | BUILD_BUG_ON(lowbit > 7); \ | ||
| 170 | BUILD_BUG_ON(bits > 8); \ | ||
| 171 | BUILD_BUG_ON(bits <= 0); \ | ||
| 172 | \ | ||
| 173 | (buf[byte] >> (lowbit)) & ((1 << (bits)) - 1); \ | ||
| 174 | }) | ||
| 175 | |||
| 176 | static void hdmi_update_short_audio_desc(struct cea_sad *a, | ||
| 177 | const unsigned char *buf) | ||
| 178 | { | ||
| 179 | int i; | ||
| 180 | int val; | ||
| 181 | |||
| 182 | val = GRAB_BITS(buf, 1, 0, 7); | ||
| 183 | a->rates = 0; | ||
| 184 | for (i = 0; i < 7; i++) | ||
| 185 | if (val & (1 << i)) | ||
| 186 | a->rates |= cea_sampling_frequencies[i + 1]; | ||
| 187 | |||
| 188 | a->channels = GRAB_BITS(buf, 0, 0, 3); | ||
| 189 | a->channels++; | ||
| 190 | |||
| 191 | a->format = GRAB_BITS(buf, 0, 3, 4); | ||
| 192 | switch (a->format) { | ||
| 193 | case AUDIO_CODING_TYPE_REF_STREAM_HEADER: | ||
| 194 | snd_printd(KERN_INFO | ||
| 195 | "HDMI: audio coding type 0 not expected\n"); | ||
| 196 | break; | ||
| 197 | |||
| 198 | case AUDIO_CODING_TYPE_LPCM: | ||
| 199 | val = GRAB_BITS(buf, 2, 0, 3); | ||
| 200 | a->sample_bits = 0; | ||
| 201 | for (i = 0; i < 3; i++) | ||
| 202 | if (val & (1 << i)) | ||
| 203 | a->sample_bits |= cea_sample_sizes[i + 1]; | ||
| 204 | break; | ||
| 205 | |||
| 206 | case AUDIO_CODING_TYPE_AC3: | ||
| 207 | case AUDIO_CODING_TYPE_MPEG1: | ||
| 208 | case AUDIO_CODING_TYPE_MP3: | ||
| 209 | case AUDIO_CODING_TYPE_MPEG2: | ||
| 210 | case AUDIO_CODING_TYPE_AACLC: | ||
| 211 | case AUDIO_CODING_TYPE_DTS: | ||
| 212 | case AUDIO_CODING_TYPE_ATRAC: | ||
| 213 | a->max_bitrate = GRAB_BITS(buf, 2, 0, 8); | ||
| 214 | a->max_bitrate *= 8000; | ||
| 215 | break; | ||
| 216 | |||
| 217 | case AUDIO_CODING_TYPE_SACD: | ||
| 218 | break; | ||
| 219 | |||
| 220 | case AUDIO_CODING_TYPE_EAC3: | ||
| 221 | break; | ||
| 222 | |||
| 223 | case AUDIO_CODING_TYPE_DTS_HD: | ||
| 224 | break; | ||
| 225 | |||
| 226 | case AUDIO_CODING_TYPE_MLP: | ||
| 227 | break; | ||
| 228 | |||
| 229 | case AUDIO_CODING_TYPE_DST: | ||
| 230 | break; | ||
| 231 | |||
| 232 | case AUDIO_CODING_TYPE_WMAPRO: | ||
| 233 | a->profile = GRAB_BITS(buf, 2, 0, 3); | ||
| 234 | break; | ||
| 235 | |||
| 236 | case AUDIO_CODING_TYPE_REF_CXT: | ||
| 237 | a->format = GRAB_BITS(buf, 2, 3, 5); | ||
| 238 | if (a->format == AUDIO_CODING_XTYPE_HE_REF_CT || | ||
| 239 | a->format >= AUDIO_CODING_XTYPE_FIRST_RESERVED) { | ||
| 240 | snd_printd(KERN_INFO | ||
| 241 | "HDMI: audio coding xtype %d not expected\n", | ||
| 242 | a->format); | ||
| 243 | a->format = 0; | ||
| 244 | } else | ||
| 245 | a->format += AUDIO_CODING_TYPE_HE_AAC - | ||
| 246 | AUDIO_CODING_XTYPE_HE_AAC; | ||
| 247 | break; | ||
| 248 | } | ||
| 249 | } | ||
| 250 | |||
| 251 | /* | ||
| 252 | * Be careful, ELD buf could be totally rubbish! | ||
| 253 | */ | ||
| 254 | static int hdmi_update_eld(struct hdmi_eld *e, | ||
| 255 | const unsigned char *buf, int size) | ||
| 256 | { | ||
| 257 | int mnl; | ||
| 258 | int i; | ||
| 259 | |||
| 260 | e->eld_ver = GRAB_BITS(buf, 0, 3, 5); | ||
| 261 | if (e->eld_ver != ELD_VER_CEA_861D && | ||
| 262 | e->eld_ver != ELD_VER_PARTIAL) { | ||
| 263 | snd_printd(KERN_INFO "HDMI: Unknown ELD version %d\n", | ||
| 264 | e->eld_ver); | ||
| 265 | goto out_fail; | ||
| 266 | } | ||
| 267 | |||
| 268 | e->eld_size = size; | ||
| 269 | e->baseline_len = GRAB_BITS(buf, 2, 0, 8); | ||
| 270 | mnl = GRAB_BITS(buf, 4, 0, 5); | ||
| 271 | e->cea_edid_ver = GRAB_BITS(buf, 4, 5, 3); | ||
| 272 | |||
| 273 | e->support_hdcp = GRAB_BITS(buf, 5, 0, 1); | ||
| 274 | e->support_ai = GRAB_BITS(buf, 5, 1, 1); | ||
| 275 | e->conn_type = GRAB_BITS(buf, 5, 2, 2); | ||
| 276 | e->sad_count = GRAB_BITS(buf, 5, 4, 4); | ||
| 277 | |||
| 278 | e->aud_synch_delay = GRAB_BITS(buf, 6, 0, 8) * 2; | ||
| 279 | e->spk_alloc = GRAB_BITS(buf, 7, 0, 7); | ||
| 280 | |||
| 281 | e->port_id = get_unaligned_le64(buf + 8); | ||
| 282 | |||
| 283 | /* not specified, but the spec's tendency is little endian */ | ||
| 284 | e->manufacture_id = get_unaligned_le16(buf + 16); | ||
| 285 | e->product_id = get_unaligned_le16(buf + 18); | ||
| 286 | |||
| 287 | if (mnl > ELD_MAX_MNL) { | ||
| 288 | snd_printd(KERN_INFO "HDMI: MNL is reserved value %d\n", mnl); | ||
| 289 | goto out_fail; | ||
| 290 | } else if (ELD_FIXED_BYTES + mnl > size) { | ||
| 291 | snd_printd(KERN_INFO "HDMI: out of range MNL %d\n", mnl); | ||
| 292 | goto out_fail; | ||
| 293 | } else | ||
| 294 | strlcpy(e->monitor_name, buf + ELD_FIXED_BYTES, mnl); | ||
| 295 | |||
| 296 | for (i = 0; i < e->sad_count; i++) { | ||
| 297 | if (ELD_FIXED_BYTES + mnl + 3 * (i + 1) > size) { | ||
| 298 | snd_printd(KERN_INFO "HDMI: out of range SAD %d\n", i); | ||
| 299 | goto out_fail; | ||
| 300 | } | ||
| 301 | hdmi_update_short_audio_desc(e->sad + i, | ||
| 302 | buf + ELD_FIXED_BYTES + mnl + 3 * i); | ||
| 303 | } | ||
| 304 | |||
| 305 | return 0; | ||
| 306 | |||
| 307 | out_fail: | ||
| 308 | e->eld_ver = 0; | ||
| 309 | return -EINVAL; | ||
| 310 | } | ||
| 311 | |||
| 312 | static int hdmi_present_sense(struct hda_codec *codec, hda_nid_t nid) | ||
| 313 | { | ||
| 314 | return snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_PIN_SENSE, 0); | ||
| 315 | } | ||
| 316 | |||
| 317 | static int hdmi_eld_valid(struct hda_codec *codec, hda_nid_t nid) | ||
| 318 | { | ||
| 319 | int eldv; | ||
| 320 | int present; | ||
| 321 | |||
| 322 | present = hdmi_present_sense(codec, nid); | ||
| 323 | eldv = (present & AC_PINSENSE_ELDV); | ||
| 324 | present = (present & AC_PINSENSE_PRESENCE); | ||
| 325 | |||
| 326 | #ifdef CONFIG_SND_DEBUG_VERBOSE | ||
| 327 | printk(KERN_INFO "HDMI: sink_present = %d, eld_valid = %d\n", | ||
| 328 | !!present, !!eldv); | ||
| 329 | #endif | ||
| 330 | |||
| 331 | return eldv && present; | ||
| 332 | } | ||
| 333 | |||
| 334 | int snd_hdmi_get_eld_size(struct hda_codec *codec, hda_nid_t nid) | ||
| 335 | { | ||
| 336 | return snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_HDMI_DIP_SIZE, | ||
| 337 | AC_DIPSIZE_ELD_BUF); | ||
| 338 | } | ||
| 339 | |||
| 340 | int snd_hdmi_get_eld(struct hdmi_eld *eld, | ||
| 341 | struct hda_codec *codec, hda_nid_t nid) | ||
| 342 | { | ||
| 343 | int i; | ||
| 344 | int ret; | ||
| 345 | int size; | ||
| 346 | unsigned char *buf; | ||
| 347 | |||
| 348 | if (!hdmi_eld_valid(codec, nid)) | ||
| 349 | return -ENOENT; | ||
| 350 | |||
| 351 | size = snd_hdmi_get_eld_size(codec, nid); | ||
| 352 | if (size == 0) { | ||
| 353 | /* wfg: workaround for ASUS P5E-VM HDMI board */ | ||
| 354 | snd_printd(KERN_INFO "HDMI: ELD buf size is 0, force 128\n"); | ||
| 355 | size = 128; | ||
| 356 | } | ||
| 357 | if (size < ELD_FIXED_BYTES || size > PAGE_SIZE) { | ||
| 358 | snd_printd(KERN_INFO "HDMI: invalid ELD buf size %d\n", size); | ||
| 359 | return -ERANGE; | ||
| 360 | } | ||
| 361 | |||
| 362 | buf = kmalloc(size, GFP_KERNEL); | ||
| 363 | if (!buf) | ||
| 364 | return -ENOMEM; | ||
| 365 | |||
| 366 | for (i = 0; i < size; i++) | ||
| 367 | buf[i] = hdmi_get_eld_byte(codec, nid, i); | ||
| 368 | |||
| 369 | ret = hdmi_update_eld(eld, buf, size); | ||
| 370 | |||
| 371 | kfree(buf); | ||
| 372 | return ret; | ||
| 373 | } | ||
| 374 | |||
| 375 | static void hdmi_show_short_audio_desc(struct cea_sad *a) | ||
| 376 | { | ||
| 377 | char buf[SND_PRINT_RATES_ADVISED_BUFSIZE]; | ||
| 378 | char buf2[8 + SND_PRINT_BITS_ADVISED_BUFSIZE] = ", bits ="; | ||
| 379 | |||
| 380 | if (!a->format) | ||
| 381 | return; | ||
| 382 | |||
| 383 | snd_print_pcm_rates(a->rates, buf, sizeof(buf)); | ||
| 384 | |||
| 385 | if (a->format == AUDIO_CODING_TYPE_LPCM) | ||
| 386 | snd_print_pcm_bits(a->sample_bits, buf2 + 8, sizeof(buf2 - 8)); | ||
| 387 | else if (a->max_bitrate) | ||
| 388 | snprintf(buf2, sizeof(buf2), | ||
| 389 | ", max bitrate = %d", a->max_bitrate); | ||
| 390 | else | ||
| 391 | buf2[0] = '\0'; | ||
| 392 | |||
| 393 | printk(KERN_INFO "HDMI: supports coding type %s:" | ||
| 394 | " channels = %d, rates =%s%s\n", | ||
| 395 | cea_audio_coding_type_names[a->format], | ||
| 396 | a->channels, | ||
| 397 | buf, | ||
| 398 | buf2); | ||
| 399 | } | ||
| 400 | |||
| 401 | void snd_print_channel_allocation(int spk_alloc, char *buf, int buflen) | ||
| 402 | { | ||
| 403 | int i, j; | ||
| 404 | |||
| 405 | for (i = 0, j = 0; i < ARRAY_SIZE(cea_speaker_allocation_names); i++) { | ||
| 406 | if (spk_alloc & (1 << i)) | ||
| 407 | j += snprintf(buf + j, buflen - j, " %s", | ||
| 408 | cea_speaker_allocation_names[i]); | ||
| 409 | } | ||
| 410 | buf[j] = '\0'; /* necessary when j == 0 */ | ||
| 411 | } | ||
| 412 | |||
| 413 | void snd_hdmi_show_eld(struct hdmi_eld *e) | ||
| 414 | { | ||
| 415 | int i; | ||
| 416 | |||
| 417 | printk(KERN_INFO "HDMI: detected monitor %s at connection type %s\n", | ||
| 418 | e->monitor_name, | ||
| 419 | eld_connection_type_names[e->conn_type]); | ||
| 420 | |||
| 421 | if (e->spk_alloc) { | ||
| 422 | char buf[SND_PRINT_CHANNEL_ALLOCATION_ADVISED_BUFSIZE]; | ||
| 423 | snd_print_channel_allocation(e->spk_alloc, buf, sizeof(buf)); | ||
| 424 | printk(KERN_INFO "HDMI: available speakers:%s\n", buf); | ||
| 425 | } | ||
| 426 | |||
| 427 | for (i = 0; i < e->sad_count; i++) | ||
| 428 | hdmi_show_short_audio_desc(e->sad + i); | ||
| 429 | } | ||
| 430 | |||
| 431 | #ifdef CONFIG_PROC_FS | ||
| 432 | |||
| 433 | static void hdmi_print_sad_info(int i, struct cea_sad *a, | ||
| 434 | struct snd_info_buffer *buffer) | ||
| 435 | { | ||
| 436 | char buf[SND_PRINT_RATES_ADVISED_BUFSIZE]; | ||
| 437 | |||
| 438 | snd_iprintf(buffer, "sad%d_coding_type\t[0x%x] %s\n", | ||
| 439 | i, a->format, cea_audio_coding_type_names[a->format]); | ||
| 440 | snd_iprintf(buffer, "sad%d_channels\t\t%d\n", i, a->channels); | ||
| 441 | |||
| 442 | snd_print_pcm_rates(a->rates, buf, sizeof(buf)); | ||
| 443 | snd_iprintf(buffer, "sad%d_rates\t\t[0x%x]%s\n", i, a->rates, buf); | ||
| 444 | |||
| 445 | if (a->format == AUDIO_CODING_TYPE_LPCM) { | ||
| 446 | snd_print_pcm_bits(a->sample_bits, buf, sizeof(buf)); | ||
| 447 | snd_iprintf(buffer, "sad%d_bits\t\t[0x%x]%s\n", | ||
| 448 | i, a->sample_bits, buf); | ||
| 449 | } | ||
| 450 | |||
| 451 | if (a->max_bitrate) | ||
| 452 | snd_iprintf(buffer, "sad%d_max_bitrate\t%d\n", | ||
| 453 | i, a->max_bitrate); | ||
| 454 | |||
| 455 | if (a->profile) | ||
| 456 | snd_iprintf(buffer, "sad%d_profile\t\t%d\n", i, a->profile); | ||
| 457 | } | ||
| 458 | |||
| 459 | static void hdmi_print_eld_info(struct snd_info_entry *entry, | ||
| 460 | struct snd_info_buffer *buffer) | ||
| 461 | { | ||
| 462 | struct hdmi_eld *e = entry->private_data; | ||
| 463 | char buf[SND_PRINT_CHANNEL_ALLOCATION_ADVISED_BUFSIZE]; | ||
| 464 | int i; | ||
| 465 | static char *eld_versoin_names[32] = { | ||
| 466 | "reserved", | ||
| 467 | "reserved", | ||
| 468 | "CEA-861D or below", | ||
| 469 | [3 ... 30] = "reserved", | ||
| 470 | [31] = "partial" | ||
| 471 | }; | ||
| 472 | static char *cea_edid_version_names[8] = { | ||
| 473 | "no CEA EDID Timing Extension block present", | ||
| 474 | "CEA-861", | ||
| 475 | "CEA-861-A", | ||
| 476 | "CEA-861-B, C or D", | ||
| 477 | [4 ... 7] = "reserved" | ||
| 478 | }; | ||
| 479 | |||
| 480 | snd_iprintf(buffer, "monitor_name\t\t%s\n", e->monitor_name); | ||
| 481 | snd_iprintf(buffer, "connection_type\t\t%s\n", | ||
| 482 | eld_connection_type_names[e->conn_type]); | ||
| 483 | snd_iprintf(buffer, "eld_version\t\t[0x%x] %s\n", e->eld_ver, | ||
| 484 | eld_versoin_names[e->eld_ver]); | ||
| 485 | snd_iprintf(buffer, "edid_version\t\t[0x%x] %s\n", e->cea_edid_ver, | ||
| 486 | cea_edid_version_names[e->cea_edid_ver]); | ||
| 487 | snd_iprintf(buffer, "manufacture_id\t\t0x%x\n", e->manufacture_id); | ||
| 488 | snd_iprintf(buffer, "product_id\t\t0x%x\n", e->product_id); | ||
| 489 | snd_iprintf(buffer, "port_id\t\t\t0x%llx\n", (long long)e->port_id); | ||
| 490 | snd_iprintf(buffer, "support_hdcp\t\t%d\n", e->support_hdcp); | ||
| 491 | snd_iprintf(buffer, "support_ai\t\t%d\n", e->support_ai); | ||
| 492 | snd_iprintf(buffer, "audio_sync_delay\t%d\n", e->aud_synch_delay); | ||
| 493 | |||
| 494 | snd_print_channel_allocation(e->spk_alloc, buf, sizeof(buf)); | ||
| 495 | snd_iprintf(buffer, "speakers\t\t[0x%x]%s\n", e->spk_alloc, buf); | ||
| 496 | |||
| 497 | snd_iprintf(buffer, "sad_count\t\t%d\n", e->sad_count); | ||
| 498 | |||
| 499 | for (i = 0; i < e->sad_count; i++) | ||
| 500 | hdmi_print_sad_info(i, e->sad + i, buffer); | ||
| 501 | } | ||
| 502 | |||
| 503 | static void hdmi_write_eld_info(struct snd_info_entry *entry, | ||
| 504 | struct snd_info_buffer *buffer) | ||
| 505 | { | ||
| 506 | struct hdmi_eld *e = entry->private_data; | ||
| 507 | char line[64]; | ||
| 508 | char name[64]; | ||
| 509 | char *sname; | ||
| 510 | long long val; | ||
| 511 | int n; | ||
| 512 | |||
| 513 | while (!snd_info_get_line(buffer, line, sizeof(line))) { | ||
| 514 | if (sscanf(line, "%s %llx", name, &val) != 2) | ||
| 515 | continue; | ||
| 516 | /* | ||
| 517 | * We don't allow modification to these fields: | ||
| 518 | * monitor_name manufacture_id product_id | ||
| 519 | * eld_version edid_version | ||
| 520 | */ | ||
| 521 | if (!strcmp(name, "connection_type")) | ||
| 522 | e->conn_type = val; | ||
| 523 | else if (!strcmp(name, "port_id")) | ||
| 524 | e->port_id = val; | ||
| 525 | else if (!strcmp(name, "support_hdcp")) | ||
| 526 | e->support_hdcp = val; | ||
| 527 | else if (!strcmp(name, "support_ai")) | ||
| 528 | e->support_ai = val; | ||
| 529 | else if (!strcmp(name, "audio_sync_delay")) | ||
| 530 | e->aud_synch_delay = val; | ||
| 531 | else if (!strcmp(name, "speakers")) | ||
| 532 | e->spk_alloc = val; | ||
| 533 | else if (!strcmp(name, "sad_count")) | ||
| 534 | e->sad_count = val; | ||
| 535 | else if (!strncmp(name, "sad", 3)) { | ||
| 536 | sname = name + 4; | ||
| 537 | n = name[3] - '0'; | ||
| 538 | if (name[4] >= '0' && name[4] <= '9') { | ||
| 539 | sname++; | ||
| 540 | n = 10 * n + name[4] - '0'; | ||
| 541 | } | ||
| 542 | if (n < 0 || n > 31) /* double the CEA limit */ | ||
| 543 | continue; | ||
| 544 | if (!strcmp(sname, "_coding_type")) | ||
| 545 | e->sad[n].format = val; | ||
| 546 | else if (!strcmp(sname, "_channels")) | ||
| 547 | e->sad[n].channels = val; | ||
| 548 | else if (!strcmp(sname, "_rates")) | ||
| 549 | e->sad[n].rates = val; | ||
| 550 | else if (!strcmp(sname, "_bits")) | ||
| 551 | e->sad[n].sample_bits = val; | ||
| 552 | else if (!strcmp(sname, "_max_bitrate")) | ||
| 553 | e->sad[n].max_bitrate = val; | ||
| 554 | else if (!strcmp(sname, "_profile")) | ||
| 555 | e->sad[n].profile = val; | ||
| 556 | if (n >= e->sad_count) | ||
| 557 | e->sad_count = n + 1; | ||
| 558 | } | ||
| 559 | } | ||
| 560 | } | ||
| 561 | |||
| 562 | |||
| 563 | int snd_hda_eld_proc_new(struct hda_codec *codec, struct hdmi_eld *eld) | ||
| 564 | { | ||
| 565 | char name[32]; | ||
| 566 | struct snd_info_entry *entry; | ||
| 567 | int err; | ||
| 568 | |||
| 569 | snprintf(name, sizeof(name), "eld#%d", codec->addr); | ||
| 570 | err = snd_card_proc_new(codec->bus->card, name, &entry); | ||
| 571 | if (err < 0) | ||
| 572 | return err; | ||
| 573 | |||
| 574 | snd_info_set_text_ops(entry, eld, hdmi_print_eld_info); | ||
| 575 | entry->c.text.write = hdmi_write_eld_info; | ||
| 576 | entry->mode |= S_IWUSR; | ||
| 577 | eld->proc_entry = entry; | ||
| 578 | |||
| 579 | return 0; | ||
| 580 | } | ||
| 581 | |||
| 582 | void snd_hda_eld_proc_free(struct hda_codec *codec, struct hdmi_eld *eld) | ||
| 583 | { | ||
| 584 | if (!codec->bus->shutdown && eld->proc_entry) { | ||
| 585 | snd_device_free(codec->bus->card, eld->proc_entry); | ||
| 586 | eld->proc_entry = NULL; | ||
| 587 | } | ||
| 588 | } | ||
| 589 | |||
| 590 | #endif /* CONFIG_PROC_FS */ | ||
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c index 0ca30894f7c6..65745e96dc70 100644 --- a/sound/pci/hda/hda_generic.c +++ b/sound/pci/hda/hda_generic.c | |||
| @@ -723,7 +723,8 @@ static int create_mixer(struct hda_codec *codec, struct hda_gnode *node, | |||
| 723 | if (is_loopback) | 723 | if (is_loopback) |
| 724 | add_input_loopback(codec, node->nid, HDA_INPUT, index); | 724 | add_input_loopback(codec, node->nid, HDA_INPUT, index); |
| 725 | snd_printdd("[%s] NID=0x%x, DIR=IN, IDX=0x%x\n", name, node->nid, index); | 725 | snd_printdd("[%s] NID=0x%x, DIR=IN, IDX=0x%x\n", name, node->nid, index); |
| 726 | if ((err = snd_ctl_add(codec->bus->card, snd_ctl_new1(&knew, codec))) < 0) | 726 | err = snd_hda_ctl_add(codec, snd_ctl_new1(&knew, codec)); |
| 727 | if (err < 0) | ||
| 727 | return err; | 728 | return err; |
| 728 | created = 1; | 729 | created = 1; |
| 729 | } else if ((node->wid_caps & AC_WCAP_OUT_AMP) && | 730 | } else if ((node->wid_caps & AC_WCAP_OUT_AMP) && |
| @@ -732,7 +733,8 @@ static int create_mixer(struct hda_codec *codec, struct hda_gnode *node, | |||
| 732 | if (is_loopback) | 733 | if (is_loopback) |
| 733 | add_input_loopback(codec, node->nid, HDA_OUTPUT, 0); | 734 | add_input_loopback(codec, node->nid, HDA_OUTPUT, 0); |
| 734 | snd_printdd("[%s] NID=0x%x, DIR=OUT\n", name, node->nid); | 735 | snd_printdd("[%s] NID=0x%x, DIR=OUT\n", name, node->nid); |
| 735 | if ((err = snd_ctl_add(codec->bus->card, snd_ctl_new1(&knew, codec))) < 0) | 736 | err = snd_hda_ctl_add(codec, snd_ctl_new1(&knew, codec)); |
| 737 | if (err < 0) | ||
| 736 | return err; | 738 | return err; |
| 737 | created = 1; | 739 | created = 1; |
| 738 | } | 740 | } |
| @@ -745,14 +747,16 @@ static int create_mixer(struct hda_codec *codec, struct hda_gnode *node, | |||
| 745 | (node->amp_in_caps & AC_AMPCAP_NUM_STEPS)) { | 747 | (node->amp_in_caps & AC_AMPCAP_NUM_STEPS)) { |
| 746 | knew = (struct snd_kcontrol_new)HDA_CODEC_VOLUME(name, node->nid, index, HDA_INPUT); | 748 | knew = (struct snd_kcontrol_new)HDA_CODEC_VOLUME(name, node->nid, index, HDA_INPUT); |
| 747 | snd_printdd("[%s] NID=0x%x, DIR=IN, IDX=0x%x\n", name, node->nid, index); | 749 | snd_printdd("[%s] NID=0x%x, DIR=IN, IDX=0x%x\n", name, node->nid, index); |
| 748 | if ((err = snd_ctl_add(codec->bus->card, snd_ctl_new1(&knew, codec))) < 0) | 750 | err = snd_hda_ctl_add(codec, snd_ctl_new1(&knew, codec)); |
| 751 | if (err < 0) | ||
| 749 | return err; | 752 | return err; |
| 750 | created = 1; | 753 | created = 1; |
| 751 | } else if ((node->wid_caps & AC_WCAP_OUT_AMP) && | 754 | } else if ((node->wid_caps & AC_WCAP_OUT_AMP) && |
| 752 | (node->amp_out_caps & AC_AMPCAP_NUM_STEPS)) { | 755 | (node->amp_out_caps & AC_AMPCAP_NUM_STEPS)) { |
| 753 | knew = (struct snd_kcontrol_new)HDA_CODEC_VOLUME(name, node->nid, 0, HDA_OUTPUT); | 756 | knew = (struct snd_kcontrol_new)HDA_CODEC_VOLUME(name, node->nid, 0, HDA_OUTPUT); |
| 754 | snd_printdd("[%s] NID=0x%x, DIR=OUT\n", name, node->nid); | 757 | snd_printdd("[%s] NID=0x%x, DIR=OUT\n", name, node->nid); |
| 755 | if ((err = snd_ctl_add(codec->bus->card, snd_ctl_new1(&knew, codec))) < 0) | 758 | err = snd_hda_ctl_add(codec, snd_ctl_new1(&knew, codec)); |
| 759 | if (err < 0) | ||
| 756 | return err; | 760 | return err; |
| 757 | created = 1; | 761 | created = 1; |
| 758 | } | 762 | } |
| @@ -849,8 +853,8 @@ static int build_input_controls(struct hda_codec *codec) | |||
| 849 | } | 853 | } |
| 850 | 854 | ||
| 851 | /* create input MUX if multiple sources are available */ | 855 | /* create input MUX if multiple sources are available */ |
| 852 | if ((err = snd_ctl_add(codec->bus->card, | 856 | err = snd_hda_ctl_add(codec, snd_ctl_new1(&cap_sel, codec)); |
| 853 | snd_ctl_new1(&cap_sel, codec))) < 0) | 857 | if (err < 0) |
| 854 | return err; | 858 | return err; |
| 855 | 859 | ||
| 856 | /* no volume control? */ | 860 | /* no volume control? */ |
| @@ -867,8 +871,8 @@ static int build_input_controls(struct hda_codec *codec) | |||
| 867 | HDA_CODEC_VOLUME(name, adc_node->nid, | 871 | HDA_CODEC_VOLUME(name, adc_node->nid, |
| 868 | spec->input_mux.items[i].index, | 872 | spec->input_mux.items[i].index, |
| 869 | HDA_INPUT); | 873 | HDA_INPUT); |
| 870 | if ((err = snd_ctl_add(codec->bus->card, | 874 | err = snd_hda_ctl_add(codec, snd_ctl_new1(&knew, codec)); |
| 871 | snd_ctl_new1(&knew, codec))) < 0) | 875 | if (err < 0) |
| 872 | return err; | 876 | return err; |
| 873 | } | 877 | } |
| 874 | 878 | ||
| @@ -1097,3 +1101,4 @@ int snd_hda_parse_generic_codec(struct hda_codec *codec) | |||
| 1097 | snd_hda_generic_free(codec); | 1101 | snd_hda_generic_free(codec); |
| 1098 | return err; | 1102 | return err; |
| 1099 | } | 1103 | } |
| 1104 | EXPORT_SYMBOL(snd_hda_parse_generic_codec); | ||
diff --git a/sound/pci/hda/hda_hwdep.c b/sound/pci/hda/hda_hwdep.c index 6e18a422d993..300ab407cf42 100644 --- a/sound/pci/hda/hda_hwdep.c +++ b/sound/pci/hda/hda_hwdep.c | |||
| @@ -23,10 +23,12 @@ | |||
| 23 | #include <linux/pci.h> | 23 | #include <linux/pci.h> |
| 24 | #include <linux/compat.h> | 24 | #include <linux/compat.h> |
| 25 | #include <linux/mutex.h> | 25 | #include <linux/mutex.h> |
| 26 | #include <linux/ctype.h> | ||
| 26 | #include <sound/core.h> | 27 | #include <sound/core.h> |
| 27 | #include "hda_codec.h" | 28 | #include "hda_codec.h" |
| 28 | #include "hda_local.h" | 29 | #include "hda_local.h" |
| 29 | #include <sound/hda_hwdep.h> | 30 | #include <sound/hda_hwdep.h> |
| 31 | #include <sound/minors.h> | ||
| 30 | 32 | ||
| 31 | /* | 33 | /* |
| 32 | * write/read an out-of-bound verb | 34 | * write/read an out-of-bound verb |
| @@ -95,7 +97,26 @@ static int hda_hwdep_open(struct snd_hwdep *hw, struct file *file) | |||
| 95 | return 0; | 97 | return 0; |
| 96 | } | 98 | } |
| 97 | 99 | ||
| 98 | int __devinit snd_hda_create_hwdep(struct hda_codec *codec) | 100 | static void clear_hwdep_elements(struct hda_codec *codec) |
| 101 | { | ||
| 102 | char **head; | ||
| 103 | int i; | ||
| 104 | |||
| 105 | /* clear init verbs */ | ||
| 106 | snd_array_free(&codec->init_verbs); | ||
| 107 | /* clear hints */ | ||
| 108 | head = codec->hints.list; | ||
| 109 | for (i = 0; i < codec->hints.used; i++, head++) | ||
| 110 | kfree(*head); | ||
| 111 | snd_array_free(&codec->hints); | ||
| 112 | } | ||
| 113 | |||
| 114 | static void hwdep_free(struct snd_hwdep *hwdep) | ||
| 115 | { | ||
| 116 | clear_hwdep_elements(hwdep->private_data); | ||
| 117 | } | ||
| 118 | |||
| 119 | int /*__devinit*/ snd_hda_create_hwdep(struct hda_codec *codec) | ||
| 99 | { | 120 | { |
| 100 | char hwname[16]; | 121 | char hwname[16]; |
| 101 | struct snd_hwdep *hwdep; | 122 | struct snd_hwdep *hwdep; |
| @@ -109,6 +130,7 @@ int __devinit snd_hda_create_hwdep(struct hda_codec *codec) | |||
| 109 | sprintf(hwdep->name, "HDA Codec %d", codec->addr); | 130 | sprintf(hwdep->name, "HDA Codec %d", codec->addr); |
| 110 | hwdep->iface = SNDRV_HWDEP_IFACE_HDA; | 131 | hwdep->iface = SNDRV_HWDEP_IFACE_HDA; |
| 111 | hwdep->private_data = codec; | 132 | hwdep->private_data = codec; |
| 133 | hwdep->private_free = hwdep_free; | ||
| 112 | hwdep->exclusive = 1; | 134 | hwdep->exclusive = 1; |
| 113 | 135 | ||
| 114 | hwdep->ops.open = hda_hwdep_open; | 136 | hwdep->ops.open = hda_hwdep_open; |
| @@ -117,5 +139,215 @@ int __devinit snd_hda_create_hwdep(struct hda_codec *codec) | |||
| 117 | hwdep->ops.ioctl_compat = hda_hwdep_ioctl_compat; | 139 | hwdep->ops.ioctl_compat = hda_hwdep_ioctl_compat; |
| 118 | #endif | 140 | #endif |
| 119 | 141 | ||
| 142 | snd_array_init(&codec->init_verbs, sizeof(struct hda_verb), 32); | ||
| 143 | snd_array_init(&codec->hints, sizeof(char *), 32); | ||
| 144 | |||
| 120 | return 0; | 145 | return 0; |
| 121 | } | 146 | } |
| 147 | |||
| 148 | #ifdef CONFIG_SND_HDA_RECONFIG | ||
| 149 | |||
| 150 | /* | ||
| 151 | * sysfs interface | ||
| 152 | */ | ||
| 153 | |||
| 154 | static int clear_codec(struct hda_codec *codec) | ||
| 155 | { | ||
| 156 | snd_hda_codec_reset(codec); | ||
| 157 | clear_hwdep_elements(codec); | ||
| 158 | return 0; | ||
| 159 | } | ||
| 160 | |||
| 161 | static int reconfig_codec(struct hda_codec *codec) | ||
| 162 | { | ||
| 163 | int err; | ||
| 164 | |||
| 165 | snd_printk(KERN_INFO "hda-codec: reconfiguring\n"); | ||
| 166 | snd_hda_codec_reset(codec); | ||
| 167 | err = snd_hda_codec_configure(codec); | ||
| 168 | if (err < 0) | ||
| 169 | return err; | ||
| 170 | /* rebuild PCMs */ | ||
| 171 | err = snd_hda_codec_build_pcms(codec); | ||
| 172 | if (err < 0) | ||
| 173 | return err; | ||
| 174 | /* rebuild mixers */ | ||
| 175 | err = snd_hda_codec_build_controls(codec); | ||
| 176 | if (err < 0) | ||
| 177 | return err; | ||
| 178 | return 0; | ||
| 179 | } | ||
| 180 | |||
| 181 | /* | ||
| 182 | * allocate a string at most len chars, and remove the trailing EOL | ||
| 183 | */ | ||
| 184 | static char *kstrndup_noeol(const char *src, size_t len) | ||
| 185 | { | ||
| 186 | char *s = kstrndup(src, len, GFP_KERNEL); | ||
| 187 | char *p; | ||
| 188 | if (!s) | ||
| 189 | return NULL; | ||
| 190 | p = strchr(s, '\n'); | ||
| 191 | if (p) | ||
| 192 | *p = 0; | ||
| 193 | return s; | ||
| 194 | } | ||
| 195 | |||
| 196 | #define CODEC_INFO_SHOW(type) \ | ||
| 197 | static ssize_t type##_show(struct device *dev, \ | ||
| 198 | struct device_attribute *attr, \ | ||
| 199 | char *buf) \ | ||
| 200 | { \ | ||
| 201 | struct snd_hwdep *hwdep = dev_get_drvdata(dev); \ | ||
| 202 | struct hda_codec *codec = hwdep->private_data; \ | ||
| 203 | return sprintf(buf, "0x%x\n", codec->type); \ | ||
| 204 | } | ||
| 205 | |||
| 206 | #define CODEC_INFO_STR_SHOW(type) \ | ||
| 207 | static ssize_t type##_show(struct device *dev, \ | ||
| 208 | struct device_attribute *attr, \ | ||
| 209 | char *buf) \ | ||
| 210 | { \ | ||
| 211 | struct snd_hwdep *hwdep = dev_get_drvdata(dev); \ | ||
| 212 | struct hda_codec *codec = hwdep->private_data; \ | ||
| 213 | return sprintf(buf, "%s\n", \ | ||
| 214 | codec->type ? codec->type : ""); \ | ||
| 215 | } | ||
| 216 | |||
| 217 | CODEC_INFO_SHOW(vendor_id); | ||
| 218 | CODEC_INFO_SHOW(subsystem_id); | ||
| 219 | CODEC_INFO_SHOW(revision_id); | ||
| 220 | CODEC_INFO_SHOW(afg); | ||
| 221 | CODEC_INFO_SHOW(mfg); | ||
| 222 | CODEC_INFO_STR_SHOW(name); | ||
| 223 | CODEC_INFO_STR_SHOW(modelname); | ||
| 224 | |||
| 225 | #define CODEC_INFO_STORE(type) \ | ||
| 226 | static ssize_t type##_store(struct device *dev, \ | ||
| 227 | struct device_attribute *attr, \ | ||
| 228 | const char *buf, size_t count) \ | ||
| 229 | { \ | ||
| 230 | struct snd_hwdep *hwdep = dev_get_drvdata(dev); \ | ||
| 231 | struct hda_codec *codec = hwdep->private_data; \ | ||
| 232 | char *after; \ | ||
| 233 | codec->type = simple_strtoul(buf, &after, 0); \ | ||
| 234 | return count; \ | ||
| 235 | } | ||
| 236 | |||
| 237 | #define CODEC_INFO_STR_STORE(type) \ | ||
| 238 | static ssize_t type##_store(struct device *dev, \ | ||
| 239 | struct device_attribute *attr, \ | ||
| 240 | const char *buf, size_t count) \ | ||
| 241 | { \ | ||
| 242 | struct snd_hwdep *hwdep = dev_get_drvdata(dev); \ | ||
| 243 | struct hda_codec *codec = hwdep->private_data; \ | ||
| 244 | char *s = kstrndup_noeol(buf, 64); \ | ||
| 245 | if (!s) \ | ||
| 246 | return -ENOMEM; \ | ||
| 247 | kfree(codec->type); \ | ||
| 248 | codec->type = s; \ | ||
| 249 | return count; \ | ||
| 250 | } | ||
| 251 | |||
| 252 | CODEC_INFO_STORE(vendor_id); | ||
| 253 | CODEC_INFO_STORE(subsystem_id); | ||
| 254 | CODEC_INFO_STORE(revision_id); | ||
| 255 | CODEC_INFO_STR_STORE(name); | ||
| 256 | CODEC_INFO_STR_STORE(modelname); | ||
| 257 | |||
| 258 | #define CODEC_ACTION_STORE(type) \ | ||
| 259 | static ssize_t type##_store(struct device *dev, \ | ||
| 260 | struct device_attribute *attr, \ | ||
| 261 | const char *buf, size_t count) \ | ||
| 262 | { \ | ||
| 263 | struct snd_hwdep *hwdep = dev_get_drvdata(dev); \ | ||
| 264 | struct hda_codec *codec = hwdep->private_data; \ | ||
| 265 | int err = 0; \ | ||
| 266 | if (*buf) \ | ||
| 267 | err = type##_codec(codec); \ | ||
| 268 | return err < 0 ? err : count; \ | ||
| 269 | } | ||
| 270 | |||
| 271 | CODEC_ACTION_STORE(reconfig); | ||
| 272 | CODEC_ACTION_STORE(clear); | ||
| 273 | |||
| 274 | static ssize_t init_verbs_store(struct device *dev, | ||
| 275 | struct device_attribute *attr, | ||
| 276 | const char *buf, size_t count) | ||
| 277 | { | ||
| 278 | struct snd_hwdep *hwdep = dev_get_drvdata(dev); | ||
| 279 | struct hda_codec *codec = hwdep->private_data; | ||
| 280 | char *p; | ||
| 281 | struct hda_verb verb, *v; | ||
| 282 | |||
| 283 | verb.nid = simple_strtoul(buf, &p, 0); | ||
| 284 | verb.verb = simple_strtoul(p, &p, 0); | ||
| 285 | verb.param = simple_strtoul(p, &p, 0); | ||
| 286 | if (!verb.nid || !verb.verb || !verb.param) | ||
| 287 | return -EINVAL; | ||
| 288 | v = snd_array_new(&codec->init_verbs); | ||
| 289 | if (!v) | ||
| 290 | return -ENOMEM; | ||
| 291 | *v = verb; | ||
| 292 | return count; | ||
| 293 | } | ||
| 294 | |||
| 295 | static ssize_t hints_store(struct device *dev, | ||
| 296 | struct device_attribute *attr, | ||
| 297 | const char *buf, size_t count) | ||
| 298 | { | ||
| 299 | struct snd_hwdep *hwdep = dev_get_drvdata(dev); | ||
| 300 | struct hda_codec *codec = hwdep->private_data; | ||
| 301 | char *p; | ||
| 302 | char **hint; | ||
| 303 | |||
| 304 | if (!*buf || isspace(*buf) || *buf == '#' || *buf == '\n') | ||
| 305 | return count; | ||
| 306 | p = kstrndup_noeol(buf, 1024); | ||
| 307 | if (!p) | ||
| 308 | return -ENOMEM; | ||
| 309 | hint = snd_array_new(&codec->hints); | ||
| 310 | if (!hint) { | ||
| 311 | kfree(p); | ||
| 312 | return -ENOMEM; | ||
| 313 | } | ||
| 314 | *hint = p; | ||
| 315 | return count; | ||
| 316 | } | ||
| 317 | |||
| 318 | #define CODEC_ATTR_RW(type) \ | ||
| 319 | __ATTR(type, 0644, type##_show, type##_store) | ||
| 320 | #define CODEC_ATTR_RO(type) \ | ||
| 321 | __ATTR_RO(type) | ||
| 322 | #define CODEC_ATTR_WO(type) \ | ||
| 323 | __ATTR(type, 0200, NULL, type##_store) | ||
| 324 | |||
| 325 | static struct device_attribute codec_attrs[] = { | ||
| 326 | CODEC_ATTR_RW(vendor_id), | ||
| 327 | CODEC_ATTR_RW(subsystem_id), | ||
| 328 | CODEC_ATTR_RW(revision_id), | ||
| 329 | CODEC_ATTR_RO(afg), | ||
| 330 | CODEC_ATTR_RO(mfg), | ||
| 331 | CODEC_ATTR_RW(name), | ||
| 332 | CODEC_ATTR_RW(modelname), | ||
| 333 | CODEC_ATTR_WO(init_verbs), | ||
| 334 | CODEC_ATTR_WO(hints), | ||
| 335 | CODEC_ATTR_WO(reconfig), | ||
| 336 | CODEC_ATTR_WO(clear), | ||
| 337 | }; | ||
| 338 | |||
| 339 | /* | ||
| 340 | * create sysfs files on hwdep directory | ||
| 341 | */ | ||
| 342 | int snd_hda_hwdep_add_sysfs(struct hda_codec *codec) | ||
| 343 | { | ||
| 344 | struct snd_hwdep *hwdep = codec->hwdep; | ||
| 345 | int i; | ||
| 346 | |||
| 347 | for (i = 0; i < ARRAY_SIZE(codec_attrs); i++) | ||
| 348 | snd_add_device_sysfs_file(SNDRV_DEVICE_TYPE_HWDEP, hwdep->card, | ||
| 349 | hwdep->device, &codec_attrs[i]); | ||
| 350 | return 0; | ||
| 351 | } | ||
| 352 | |||
| 353 | #endif /* CONFIG_SND_HDA_RECONFIG */ | ||
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 35722ec920cb..a26ae8c4cf70 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c | |||
| @@ -83,7 +83,10 @@ module_param(enable_msi, int, 0444); | |||
| 83 | MODULE_PARM_DESC(enable_msi, "Enable Message Signaled Interrupt (MSI)"); | 83 | MODULE_PARM_DESC(enable_msi, "Enable Message Signaled Interrupt (MSI)"); |
| 84 | 84 | ||
| 85 | #ifdef CONFIG_SND_HDA_POWER_SAVE | 85 | #ifdef CONFIG_SND_HDA_POWER_SAVE |
| 86 | /* power_save option is defined in hda_codec.c */ | 86 | static int power_save = CONFIG_SND_HDA_POWER_SAVE_DEFAULT; |
| 87 | module_param(power_save, int, 0644); | ||
| 88 | MODULE_PARM_DESC(power_save, "Automatic power-saving timeout " | ||
| 89 | "(in second, 0 = disable)."); | ||
| 87 | 90 | ||
| 88 | /* reset the HD-audio controller in power save mode. | 91 | /* reset the HD-audio controller in power save mode. |
| 89 | * this may give more power-saving, but will take longer time to | 92 | * this may give more power-saving, but will take longer time to |
| @@ -292,6 +295,8 @@ enum { | |||
| 292 | /* Define VIA HD Audio Device ID*/ | 295 | /* Define VIA HD Audio Device ID*/ |
| 293 | #define VIA_HDAC_DEVICE_ID 0x3288 | 296 | #define VIA_HDAC_DEVICE_ID 0x3288 |
| 294 | 297 | ||
| 298 | /* HD Audio class code */ | ||
| 299 | #define PCI_CLASS_MULTIMEDIA_HD_AUDIO 0x0403 | ||
| 295 | 300 | ||
| 296 | /* | 301 | /* |
| 297 | */ | 302 | */ |
| @@ -392,6 +397,7 @@ struct azx { | |||
| 392 | unsigned int msi :1; | 397 | unsigned int msi :1; |
| 393 | unsigned int irq_pending_warned :1; | 398 | unsigned int irq_pending_warned :1; |
| 394 | unsigned int via_dmapos_patch :1; /* enable DMA-position fix for VIA */ | 399 | unsigned int via_dmapos_patch :1; /* enable DMA-position fix for VIA */ |
| 400 | unsigned int probing :1; /* codec probing phase */ | ||
| 395 | 401 | ||
| 396 | /* for debugging */ | 402 | /* for debugging */ |
| 397 | unsigned int last_cmd; /* last issued command (to sync) */ | 403 | unsigned int last_cmd; /* last issued command (to sync) */ |
| @@ -414,6 +420,7 @@ enum { | |||
| 414 | AZX_DRIVER_ULI, | 420 | AZX_DRIVER_ULI, |
| 415 | AZX_DRIVER_NVIDIA, | 421 | AZX_DRIVER_NVIDIA, |
| 416 | AZX_DRIVER_TERA, | 422 | AZX_DRIVER_TERA, |
| 423 | AZX_DRIVER_GENERIC, | ||
| 417 | AZX_NUM_DRIVERS, /* keep this as last entry */ | 424 | AZX_NUM_DRIVERS, /* keep this as last entry */ |
| 418 | }; | 425 | }; |
| 419 | 426 | ||
| @@ -427,6 +434,7 @@ static char *driver_short_names[] __devinitdata = { | |||
| 427 | [AZX_DRIVER_ULI] = "HDA ULI M5461", | 434 | [AZX_DRIVER_ULI] = "HDA ULI M5461", |
| 428 | [AZX_DRIVER_NVIDIA] = "HDA NVidia", | 435 | [AZX_DRIVER_NVIDIA] = "HDA NVidia", |
| 429 | [AZX_DRIVER_TERA] = "HDA Teradici", | 436 | [AZX_DRIVER_TERA] = "HDA Teradici", |
| 437 | [AZX_DRIVER_GENERIC] = "HD-Audio Generic", | ||
| 430 | }; | 438 | }; |
| 431 | 439 | ||
| 432 | /* | 440 | /* |
| @@ -527,9 +535,9 @@ static void azx_free_cmd_io(struct azx *chip) | |||
| 527 | } | 535 | } |
| 528 | 536 | ||
| 529 | /* send a command */ | 537 | /* send a command */ |
| 530 | static int azx_corb_send_cmd(struct hda_codec *codec, u32 val) | 538 | static int azx_corb_send_cmd(struct hda_bus *bus, u32 val) |
| 531 | { | 539 | { |
| 532 | struct azx *chip = codec->bus->private_data; | 540 | struct azx *chip = bus->private_data; |
| 533 | unsigned int wp; | 541 | unsigned int wp; |
| 534 | 542 | ||
| 535 | /* add command to corb */ | 543 | /* add command to corb */ |
| @@ -577,9 +585,9 @@ static void azx_update_rirb(struct azx *chip) | |||
| 577 | } | 585 | } |
| 578 | 586 | ||
| 579 | /* receive a response */ | 587 | /* receive a response */ |
| 580 | static unsigned int azx_rirb_get_response(struct hda_codec *codec) | 588 | static unsigned int azx_rirb_get_response(struct hda_bus *bus) |
| 581 | { | 589 | { |
| 582 | struct azx *chip = codec->bus->private_data; | 590 | struct azx *chip = bus->private_data; |
| 583 | unsigned long timeout; | 591 | unsigned long timeout; |
| 584 | 592 | ||
| 585 | again: | 593 | again: |
| @@ -596,7 +604,7 @@ static unsigned int azx_rirb_get_response(struct hda_codec *codec) | |||
| 596 | } | 604 | } |
| 597 | if (time_after(jiffies, timeout)) | 605 | if (time_after(jiffies, timeout)) |
| 598 | break; | 606 | break; |
| 599 | if (codec->bus->needs_damn_long_delay) | 607 | if (bus->needs_damn_long_delay) |
| 600 | msleep(2); /* temporary workaround */ | 608 | msleep(2); /* temporary workaround */ |
| 601 | else { | 609 | else { |
| 602 | udelay(10); | 610 | udelay(10); |
| @@ -624,6 +632,14 @@ static unsigned int azx_rirb_get_response(struct hda_codec *codec) | |||
| 624 | goto again; | 632 | goto again; |
| 625 | } | 633 | } |
| 626 | 634 | ||
| 635 | if (chip->probing) { | ||
| 636 | /* If this critical timeout happens during the codec probing | ||
| 637 | * phase, this is likely an access to a non-existing codec | ||
| 638 | * slot. Better to return an error and reset the system. | ||
| 639 | */ | ||
| 640 | return -1; | ||
| 641 | } | ||
| 642 | |||
| 627 | snd_printk(KERN_ERR "hda_intel: azx_get_response timeout, " | 643 | snd_printk(KERN_ERR "hda_intel: azx_get_response timeout, " |
| 628 | "switching to single_cmd mode: last cmd=0x%08x\n", | 644 | "switching to single_cmd mode: last cmd=0x%08x\n", |
| 629 | chip->last_cmd); | 645 | chip->last_cmd); |
| @@ -646,9 +662,9 @@ static unsigned int azx_rirb_get_response(struct hda_codec *codec) | |||
| 646 | */ | 662 | */ |
| 647 | 663 | ||
| 648 | /* send a command */ | 664 | /* send a command */ |
| 649 | static int azx_single_send_cmd(struct hda_codec *codec, u32 val) | 665 | static int azx_single_send_cmd(struct hda_bus *bus, u32 val) |
| 650 | { | 666 | { |
| 651 | struct azx *chip = codec->bus->private_data; | 667 | struct azx *chip = bus->private_data; |
| 652 | int timeout = 50; | 668 | int timeout = 50; |
| 653 | 669 | ||
| 654 | while (timeout--) { | 670 | while (timeout--) { |
| @@ -671,9 +687,9 @@ static int azx_single_send_cmd(struct hda_codec *codec, u32 val) | |||
| 671 | } | 687 | } |
| 672 | 688 | ||
| 673 | /* receive a response */ | 689 | /* receive a response */ |
| 674 | static unsigned int azx_single_get_response(struct hda_codec *codec) | 690 | static unsigned int azx_single_get_response(struct hda_bus *bus) |
| 675 | { | 691 | { |
| 676 | struct azx *chip = codec->bus->private_data; | 692 | struct azx *chip = bus->private_data; |
| 677 | int timeout = 50; | 693 | int timeout = 50; |
| 678 | 694 | ||
| 679 | while (timeout--) { | 695 | while (timeout--) { |
| @@ -696,38 +712,29 @@ static unsigned int azx_single_get_response(struct hda_codec *codec) | |||
| 696 | */ | 712 | */ |
| 697 | 713 | ||
| 698 | /* send a command */ | 714 | /* send a command */ |
| 699 | static int azx_send_cmd(struct hda_codec *codec, hda_nid_t nid, | 715 | static int azx_send_cmd(struct hda_bus *bus, unsigned int val) |
| 700 | int direct, unsigned int verb, | ||
| 701 | unsigned int para) | ||
| 702 | { | 716 | { |
| 703 | struct azx *chip = codec->bus->private_data; | 717 | struct azx *chip = bus->private_data; |
| 704 | u32 val; | ||
| 705 | |||
| 706 | val = (u32)(codec->addr & 0x0f) << 28; | ||
| 707 | val |= (u32)direct << 27; | ||
| 708 | val |= (u32)nid << 20; | ||
| 709 | val |= verb << 8; | ||
| 710 | val |= para; | ||
| 711 | chip->last_cmd = val; | ||
| 712 | 718 | ||
| 719 | chip->last_cmd = val; | ||
| 713 | if (chip->single_cmd) | 720 | if (chip->single_cmd) |
| 714 | return azx_single_send_cmd(codec, val); | 721 | return azx_single_send_cmd(bus, val); |
| 715 | else | 722 | else |
| 716 | return azx_corb_send_cmd(codec, val); | 723 | return azx_corb_send_cmd(bus, val); |
| 717 | } | 724 | } |
| 718 | 725 | ||
| 719 | /* get a response */ | 726 | /* get a response */ |
| 720 | static unsigned int azx_get_response(struct hda_codec *codec) | 727 | static unsigned int azx_get_response(struct hda_bus *bus) |
| 721 | { | 728 | { |
| 722 | struct azx *chip = codec->bus->private_data; | 729 | struct azx *chip = bus->private_data; |
| 723 | if (chip->single_cmd) | 730 | if (chip->single_cmd) |
| 724 | return azx_single_get_response(codec); | 731 | return azx_single_get_response(bus); |
| 725 | else | 732 | else |
| 726 | return azx_rirb_get_response(codec); | 733 | return azx_rirb_get_response(bus); |
| 727 | } | 734 | } |
| 728 | 735 | ||
| 729 | #ifdef CONFIG_SND_HDA_POWER_SAVE | 736 | #ifdef CONFIG_SND_HDA_POWER_SAVE |
| 730 | static void azx_power_notify(struct hda_codec *codec); | 737 | static void azx_power_notify(struct hda_bus *bus); |
| 731 | #endif | 738 | #endif |
| 732 | 739 | ||
| 733 | /* reset codec link */ | 740 | /* reset codec link */ |
| @@ -1184,6 +1191,28 @@ static int azx_setup_controller(struct azx *chip, struct azx_dev *azx_dev) | |||
| 1184 | return 0; | 1191 | return 0; |
| 1185 | } | 1192 | } |
| 1186 | 1193 | ||
| 1194 | /* | ||
| 1195 | * Probe the given codec address | ||
| 1196 | */ | ||
| 1197 | static int probe_codec(struct azx *chip, int addr) | ||
| 1198 | { | ||
| 1199 | unsigned int cmd = (addr << 28) | (AC_NODE_ROOT << 20) | | ||
| 1200 | (AC_VERB_PARAMETERS << 8) | AC_PAR_VENDOR_ID; | ||
| 1201 | unsigned int res; | ||
| 1202 | |||
| 1203 | chip->probing = 1; | ||
| 1204 | azx_send_cmd(chip->bus, cmd); | ||
| 1205 | res = azx_get_response(chip->bus); | ||
| 1206 | chip->probing = 0; | ||
| 1207 | if (res == -1) | ||
| 1208 | return -EIO; | ||
| 1209 | snd_printdd("hda_intel: codec #%d probed OK\n", addr); | ||
| 1210 | return 0; | ||
| 1211 | } | ||
| 1212 | |||
| 1213 | static int azx_attach_pcm_stream(struct hda_bus *bus, struct hda_codec *codec, | ||
| 1214 | struct hda_pcm *cpcm); | ||
| 1215 | static void azx_stop_chip(struct azx *chip); | ||
| 1187 | 1216 | ||
| 1188 | /* | 1217 | /* |
| 1189 | * Codec initialization | 1218 | * Codec initialization |
| @@ -1194,21 +1223,12 @@ static unsigned int azx_max_codecs[AZX_NUM_DRIVERS] __devinitdata = { | |||
| 1194 | [AZX_DRIVER_TERA] = 1, | 1223 | [AZX_DRIVER_TERA] = 1, |
| 1195 | }; | 1224 | }; |
| 1196 | 1225 | ||
| 1197 | /* number of slots to probe as default | ||
| 1198 | * this can be different from azx_max_codecs[] -- e.g. some boards | ||
| 1199 | * report wrongly the non-existing 4th slot availability | ||
| 1200 | */ | ||
| 1201 | static unsigned int azx_default_codecs[AZX_NUM_DRIVERS] __devinitdata = { | ||
| 1202 | [AZX_DRIVER_ICH] = 3, | ||
| 1203 | [AZX_DRIVER_ATI] = 3, | ||
| 1204 | }; | ||
| 1205 | |||
| 1206 | static int __devinit azx_codec_create(struct azx *chip, const char *model, | 1226 | static int __devinit azx_codec_create(struct azx *chip, const char *model, |
| 1207 | unsigned int codec_probe_mask) | 1227 | unsigned int codec_probe_mask) |
| 1208 | { | 1228 | { |
| 1209 | struct hda_bus_template bus_temp; | 1229 | struct hda_bus_template bus_temp; |
| 1210 | int c, codecs, audio_codecs, err; | 1230 | int c, codecs, err; |
| 1211 | int def_slots, max_slots; | 1231 | int max_slots; |
| 1212 | 1232 | ||
| 1213 | memset(&bus_temp, 0, sizeof(bus_temp)); | 1233 | memset(&bus_temp, 0, sizeof(bus_temp)); |
| 1214 | bus_temp.private_data = chip; | 1234 | bus_temp.private_data = chip; |
| @@ -1216,7 +1236,9 @@ static int __devinit azx_codec_create(struct azx *chip, const char *model, | |||
| 1216 | bus_temp.pci = chip->pci; | 1236 | bus_temp.pci = chip->pci; |
| 1217 | bus_temp.ops.command = azx_send_cmd; | 1237 | bus_temp.ops.command = azx_send_cmd; |
| 1218 | bus_temp.ops.get_response = azx_get_response; | 1238 | bus_temp.ops.get_response = azx_get_response; |
| 1239 | bus_temp.ops.attach_pcm = azx_attach_pcm_stream; | ||
| 1219 | #ifdef CONFIG_SND_HDA_POWER_SAVE | 1240 | #ifdef CONFIG_SND_HDA_POWER_SAVE |
| 1241 | bus_temp.power_save = &power_save; | ||
| 1220 | bus_temp.ops.pm_notify = azx_power_notify; | 1242 | bus_temp.ops.pm_notify = azx_power_notify; |
| 1221 | #endif | 1243 | #endif |
| 1222 | 1244 | ||
| @@ -1227,33 +1249,43 @@ static int __devinit azx_codec_create(struct azx *chip, const char *model, | |||
| 1227 | if (chip->driver_type == AZX_DRIVER_NVIDIA) | 1249 | if (chip->driver_type == AZX_DRIVER_NVIDIA) |
| 1228 | chip->bus->needs_damn_long_delay = 1; | 1250 | chip->bus->needs_damn_long_delay = 1; |
| 1229 | 1251 | ||
| 1230 | codecs = audio_codecs = 0; | 1252 | codecs = 0; |
| 1231 | max_slots = azx_max_codecs[chip->driver_type]; | 1253 | max_slots = azx_max_codecs[chip->driver_type]; |
| 1232 | if (!max_slots) | 1254 | if (!max_slots) |
| 1233 | max_slots = AZX_MAX_CODECS; | 1255 | max_slots = AZX_MAX_CODECS; |
| 1234 | def_slots = azx_default_codecs[chip->driver_type]; | 1256 | |
| 1235 | if (!def_slots) | 1257 | /* First try to probe all given codec slots */ |
| 1236 | def_slots = max_slots; | 1258 | for (c = 0; c < max_slots; c++) { |
| 1237 | for (c = 0; c < def_slots; c++) { | 1259 | if ((chip->codec_mask & (1 << c)) & codec_probe_mask) { |
| 1260 | if (probe_codec(chip, c) < 0) { | ||
| 1261 | /* Some BIOSen give you wrong codec addresses | ||
| 1262 | * that don't exist | ||
| 1263 | */ | ||
| 1264 | snd_printk(KERN_WARNING | ||
| 1265 | "hda_intel: Codec #%d probe error; " | ||
| 1266 | "disabling it...\n", c); | ||
| 1267 | chip->codec_mask &= ~(1 << c); | ||
| 1268 | /* More badly, accessing to a non-existing | ||
| 1269 | * codec often screws up the controller chip, | ||
| 1270 | * and distrubs the further communications. | ||
| 1271 | * Thus if an error occurs during probing, | ||
| 1272 | * better to reset the controller chip to | ||
| 1273 | * get back to the sanity state. | ||
| 1274 | */ | ||
| 1275 | azx_stop_chip(chip); | ||
| 1276 | azx_init_chip(chip); | ||
| 1277 | } | ||
| 1278 | } | ||
| 1279 | } | ||
| 1280 | |||
| 1281 | /* Then create codec instances */ | ||
| 1282 | for (c = 0; c < max_slots; c++) { | ||
| 1238 | if ((chip->codec_mask & (1 << c)) & codec_probe_mask) { | 1283 | if ((chip->codec_mask & (1 << c)) & codec_probe_mask) { |
| 1239 | struct hda_codec *codec; | 1284 | struct hda_codec *codec; |
| 1240 | err = snd_hda_codec_new(chip->bus, c, &codec); | 1285 | err = snd_hda_codec_new(chip->bus, c, &codec); |
| 1241 | if (err < 0) | 1286 | if (err < 0) |
| 1242 | continue; | 1287 | continue; |
| 1243 | codecs++; | 1288 | codecs++; |
| 1244 | if (codec->afg) | ||
| 1245 | audio_codecs++; | ||
| 1246 | } | ||
| 1247 | } | ||
| 1248 | if (!audio_codecs) { | ||
| 1249 | /* probe additional slots if no codec is found */ | ||
| 1250 | for (; c < max_slots; c++) { | ||
| 1251 | if ((chip->codec_mask & (1 << c)) & codec_probe_mask) { | ||
| 1252 | err = snd_hda_codec_new(chip->bus, c, NULL); | ||
| 1253 | if (err < 0) | ||
| 1254 | continue; | ||
| 1255 | codecs++; | ||
| 1256 | } | ||
| 1257 | } | 1289 | } |
| 1258 | } | 1290 | } |
| 1259 | if (!codecs) { | 1291 | if (!codecs) { |
| @@ -1722,111 +1754,59 @@ static struct snd_pcm_ops azx_pcm_ops = { | |||
| 1722 | 1754 | ||
| 1723 | static void azx_pcm_free(struct snd_pcm *pcm) | 1755 | static void azx_pcm_free(struct snd_pcm *pcm) |
| 1724 | { | 1756 | { |
| 1725 | kfree(pcm->private_data); | 1757 | struct azx_pcm *apcm = pcm->private_data; |
| 1758 | if (apcm) { | ||
| 1759 | apcm->chip->pcm[pcm->device] = NULL; | ||
| 1760 | kfree(apcm); | ||
| 1761 | } | ||
| 1726 | } | 1762 | } |
| 1727 | 1763 | ||
| 1728 | static int __devinit create_codec_pcm(struct azx *chip, struct hda_codec *codec, | 1764 | static int |
| 1729 | struct hda_pcm *cpcm) | 1765 | azx_attach_pcm_stream(struct hda_bus *bus, struct hda_codec *codec, |
| 1766 | struct hda_pcm *cpcm) | ||
| 1730 | { | 1767 | { |
| 1731 | int err; | 1768 | struct azx *chip = bus->private_data; |
| 1732 | struct snd_pcm *pcm; | 1769 | struct snd_pcm *pcm; |
| 1733 | struct azx_pcm *apcm; | 1770 | struct azx_pcm *apcm; |
| 1771 | int pcm_dev = cpcm->device; | ||
| 1772 | int s, err; | ||
| 1734 | 1773 | ||
| 1735 | /* if no substreams are defined for both playback and capture, | 1774 | if (pcm_dev >= AZX_MAX_PCMS) { |
| 1736 | * it's just a placeholder. ignore it. | 1775 | snd_printk(KERN_ERR SFX "Invalid PCM device number %d\n", |
| 1737 | */ | 1776 | pcm_dev); |
| 1738 | if (!cpcm->stream[0].substreams && !cpcm->stream[1].substreams) | ||
| 1739 | return 0; | ||
| 1740 | |||
| 1741 | if (snd_BUG_ON(!cpcm->name)) | ||
| 1742 | return -EINVAL; | 1777 | return -EINVAL; |
| 1743 | 1778 | } | |
| 1744 | err = snd_pcm_new(chip->card, cpcm->name, cpcm->device, | 1779 | if (chip->pcm[pcm_dev]) { |
| 1745 | cpcm->stream[0].substreams, | 1780 | snd_printk(KERN_ERR SFX "PCM %d already exists\n", pcm_dev); |
| 1746 | cpcm->stream[1].substreams, | 1781 | return -EBUSY; |
| 1782 | } | ||
| 1783 | err = snd_pcm_new(chip->card, cpcm->name, pcm_dev, | ||
| 1784 | cpcm->stream[SNDRV_PCM_STREAM_PLAYBACK].substreams, | ||
| 1785 | cpcm->stream[SNDRV_PCM_STREAM_CAPTURE].substreams, | ||
| 1747 | &pcm); | 1786 | &pcm); |
| 1748 | if (err < 0) | 1787 | if (err < 0) |
| 1749 | return err; | 1788 | return err; |
| 1750 | strcpy(pcm->name, cpcm->name); | 1789 | strcpy(pcm->name, cpcm->name); |
| 1751 | apcm = kmalloc(sizeof(*apcm), GFP_KERNEL); | 1790 | apcm = kzalloc(sizeof(*apcm), GFP_KERNEL); |
| 1752 | if (apcm == NULL) | 1791 | if (apcm == NULL) |
| 1753 | return -ENOMEM; | 1792 | return -ENOMEM; |
| 1754 | apcm->chip = chip; | 1793 | apcm->chip = chip; |
| 1755 | apcm->codec = codec; | 1794 | apcm->codec = codec; |
| 1756 | apcm->hinfo[0] = &cpcm->stream[0]; | ||
| 1757 | apcm->hinfo[1] = &cpcm->stream[1]; | ||
| 1758 | pcm->private_data = apcm; | 1795 | pcm->private_data = apcm; |
| 1759 | pcm->private_free = azx_pcm_free; | 1796 | pcm->private_free = azx_pcm_free; |
| 1760 | if (cpcm->stream[0].substreams) | 1797 | if (cpcm->pcm_type == HDA_PCM_TYPE_MODEM) |
| 1761 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &azx_pcm_ops); | 1798 | pcm->dev_class = SNDRV_PCM_CLASS_MODEM; |
| 1762 | if (cpcm->stream[1].substreams) | 1799 | chip->pcm[pcm_dev] = pcm; |
| 1763 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &azx_pcm_ops); | 1800 | cpcm->pcm = pcm; |
| 1801 | for (s = 0; s < 2; s++) { | ||
| 1802 | apcm->hinfo[s] = &cpcm->stream[s]; | ||
| 1803 | if (cpcm->stream[s].substreams) | ||
| 1804 | snd_pcm_set_ops(pcm, s, &azx_pcm_ops); | ||
| 1805 | } | ||
| 1806 | /* buffer pre-allocation */ | ||
| 1764 | snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG, | 1807 | snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG, |
| 1765 | snd_dma_pci_data(chip->pci), | 1808 | snd_dma_pci_data(chip->pci), |
| 1766 | 1024 * 64, 32 * 1024 * 1024); | 1809 | 1024 * 64, 32 * 1024 * 1024); |
| 1767 | chip->pcm[cpcm->device] = pcm; | ||
| 1768 | return 0; | ||
| 1769 | } | ||
| 1770 | |||
| 1771 | static int __devinit azx_pcm_create(struct azx *chip) | ||
| 1772 | { | ||
| 1773 | static const char *dev_name[HDA_PCM_NTYPES] = { | ||
| 1774 | "Audio", "SPDIF", "HDMI", "Modem" | ||
| 1775 | }; | ||
| 1776 | /* starting device index for each PCM type */ | ||
| 1777 | static int dev_idx[HDA_PCM_NTYPES] = { | ||
| 1778 | [HDA_PCM_TYPE_AUDIO] = 0, | ||
| 1779 | [HDA_PCM_TYPE_SPDIF] = 1, | ||
| 1780 | [HDA_PCM_TYPE_HDMI] = 3, | ||
| 1781 | [HDA_PCM_TYPE_MODEM] = 6 | ||
| 1782 | }; | ||
| 1783 | /* normal audio device indices; not linear to keep compatibility */ | ||
| 1784 | static int audio_idx[4] = { 0, 2, 4, 5 }; | ||
| 1785 | struct hda_codec *codec; | ||
| 1786 | int c, err; | ||
| 1787 | int num_devs[HDA_PCM_NTYPES]; | ||
| 1788 | |||
| 1789 | err = snd_hda_build_pcms(chip->bus); | ||
| 1790 | if (err < 0) | ||
| 1791 | return err; | ||
| 1792 | |||
| 1793 | /* create audio PCMs */ | ||
| 1794 | memset(num_devs, 0, sizeof(num_devs)); | ||
| 1795 | list_for_each_entry(codec, &chip->bus->codec_list, list) { | ||
| 1796 | for (c = 0; c < codec->num_pcms; c++) { | ||
| 1797 | struct hda_pcm *cpcm = &codec->pcm_info[c]; | ||
| 1798 | int type = cpcm->pcm_type; | ||
| 1799 | switch (type) { | ||
| 1800 | case HDA_PCM_TYPE_AUDIO: | ||
| 1801 | if (num_devs[type] >= ARRAY_SIZE(audio_idx)) { | ||
| 1802 | snd_printk(KERN_WARNING | ||
| 1803 | "Too many audio devices\n"); | ||
| 1804 | continue; | ||
| 1805 | } | ||
| 1806 | cpcm->device = audio_idx[num_devs[type]]; | ||
| 1807 | break; | ||
| 1808 | case HDA_PCM_TYPE_SPDIF: | ||
| 1809 | case HDA_PCM_TYPE_HDMI: | ||
| 1810 | case HDA_PCM_TYPE_MODEM: | ||
| 1811 | if (num_devs[type]) { | ||
| 1812 | snd_printk(KERN_WARNING | ||
| 1813 | "%s already defined\n", | ||
| 1814 | dev_name[type]); | ||
| 1815 | continue; | ||
| 1816 | } | ||
| 1817 | cpcm->device = dev_idx[type]; | ||
| 1818 | break; | ||
| 1819 | default: | ||
| 1820 | snd_printk(KERN_WARNING | ||
| 1821 | "Invalid PCM type %d\n", type); | ||
| 1822 | continue; | ||
| 1823 | } | ||
| 1824 | num_devs[type]++; | ||
| 1825 | err = create_codec_pcm(chip, codec, cpcm); | ||
| 1826 | if (err < 0) | ||
| 1827 | return err; | ||
| 1828 | } | ||
| 1829 | } | ||
| 1830 | return 0; | 1810 | return 0; |
| 1831 | } | 1811 | } |
| 1832 | 1812 | ||
| @@ -1903,13 +1883,13 @@ static void azx_stop_chip(struct azx *chip) | |||
| 1903 | 1883 | ||
| 1904 | #ifdef CONFIG_SND_HDA_POWER_SAVE | 1884 | #ifdef CONFIG_SND_HDA_POWER_SAVE |
| 1905 | /* power-up/down the controller */ | 1885 | /* power-up/down the controller */ |
| 1906 | static void azx_power_notify(struct hda_codec *codec) | 1886 | static void azx_power_notify(struct hda_bus *bus) |
| 1907 | { | 1887 | { |
| 1908 | struct azx *chip = codec->bus->private_data; | 1888 | struct azx *chip = bus->private_data; |
| 1909 | struct hda_codec *c; | 1889 | struct hda_codec *c; |
| 1910 | int power_on = 0; | 1890 | int power_on = 0; |
| 1911 | 1891 | ||
| 1912 | list_for_each_entry(c, &codec->bus->codec_list, list) { | 1892 | list_for_each_entry(c, &bus->codec_list, list) { |
| 1913 | if (c->power_on) { | 1893 | if (c->power_on) { |
| 1914 | power_on = 1; | 1894 | power_on = 1; |
| 1915 | break; | 1895 | break; |
| @@ -1926,6 +1906,18 @@ static void azx_power_notify(struct hda_codec *codec) | |||
| 1926 | /* | 1906 | /* |
| 1927 | * power management | 1907 | * power management |
| 1928 | */ | 1908 | */ |
| 1909 | |||
| 1910 | static int snd_hda_codecs_inuse(struct hda_bus *bus) | ||
| 1911 | { | ||
| 1912 | struct hda_codec *codec; | ||
| 1913 | |||
| 1914 | list_for_each_entry(codec, &bus->codec_list, list) { | ||
| 1915 | if (snd_hda_codec_needs_resume(codec)) | ||
| 1916 | return 1; | ||
| 1917 | } | ||
| 1918 | return 0; | ||
| 1919 | } | ||
| 1920 | |||
| 1929 | static int azx_suspend(struct pci_dev *pci, pm_message_t state) | 1921 | static int azx_suspend(struct pci_dev *pci, pm_message_t state) |
| 1930 | { | 1922 | { |
| 1931 | struct snd_card *card = pci_get_drvdata(pci); | 1923 | struct snd_card *card = pci_get_drvdata(pci); |
| @@ -2095,6 +2087,10 @@ static struct snd_pci_quirk probe_mask_list[] __devinitdata = { | |||
| 2095 | SND_PCI_QUIRK(0x1014, 0x05b7, "Thinkpad Z60", 0x01), | 2087 | SND_PCI_QUIRK(0x1014, 0x05b7, "Thinkpad Z60", 0x01), |
| 2096 | SND_PCI_QUIRK(0x17aa, 0x2010, "Thinkpad X/T/R60", 0x01), | 2088 | SND_PCI_QUIRK(0x17aa, 0x2010, "Thinkpad X/T/R60", 0x01), |
| 2097 | SND_PCI_QUIRK(0x17aa, 0x20ac, "Thinkpad X/T/R61", 0x01), | 2089 | SND_PCI_QUIRK(0x17aa, 0x20ac, "Thinkpad X/T/R61", 0x01), |
| 2090 | /* broken BIOS */ | ||
| 2091 | SND_PCI_QUIRK(0x1028, 0x20ac, "Dell Studio Desktop", 0x01), | ||
| 2092 | /* including bogus ALC268 in slot#2 that conflicts with ALC888 */ | ||
| 2093 | SND_PCI_QUIRK(0x17c0, 0x4085, "Medion MD96630", 0x01), | ||
| 2098 | {} | 2094 | {} |
| 2099 | }; | 2095 | }; |
| 2100 | 2096 | ||
| @@ -2229,6 +2225,7 @@ static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci, | |||
| 2229 | chip->playback_streams = ATIHDMI_NUM_PLAYBACK; | 2225 | chip->playback_streams = ATIHDMI_NUM_PLAYBACK; |
| 2230 | chip->capture_streams = ATIHDMI_NUM_CAPTURE; | 2226 | chip->capture_streams = ATIHDMI_NUM_CAPTURE; |
| 2231 | break; | 2227 | break; |
| 2228 | case AZX_DRIVER_GENERIC: | ||
| 2232 | default: | 2229 | default: |
| 2233 | chip->playback_streams = ICH6_NUM_PLAYBACK; | 2230 | chip->playback_streams = ICH6_NUM_PLAYBACK; |
| 2234 | chip->capture_streams = ICH6_NUM_CAPTURE; | 2231 | chip->capture_streams = ICH6_NUM_CAPTURE; |
| @@ -2338,40 +2335,30 @@ static int __devinit azx_probe(struct pci_dev *pci, | |||
| 2338 | } | 2335 | } |
| 2339 | 2336 | ||
| 2340 | err = azx_create(card, pci, dev, pci_id->driver_data, &chip); | 2337 | err = azx_create(card, pci, dev, pci_id->driver_data, &chip); |
| 2341 | if (err < 0) { | 2338 | if (err < 0) |
| 2342 | snd_card_free(card); | 2339 | goto out_free; |
| 2343 | return err; | ||
| 2344 | } | ||
| 2345 | card->private_data = chip; | 2340 | card->private_data = chip; |
| 2346 | 2341 | ||
| 2347 | /* create codec instances */ | 2342 | /* create codec instances */ |
| 2348 | err = azx_codec_create(chip, model[dev], probe_mask[dev]); | 2343 | err = azx_codec_create(chip, model[dev], probe_mask[dev]); |
| 2349 | if (err < 0) { | 2344 | if (err < 0) |
| 2350 | snd_card_free(card); | 2345 | goto out_free; |
| 2351 | return err; | ||
| 2352 | } | ||
| 2353 | 2346 | ||
| 2354 | /* create PCM streams */ | 2347 | /* create PCM streams */ |
| 2355 | err = azx_pcm_create(chip); | 2348 | err = snd_hda_build_pcms(chip->bus); |
| 2356 | if (err < 0) { | 2349 | if (err < 0) |
| 2357 | snd_card_free(card); | 2350 | goto out_free; |
| 2358 | return err; | ||
| 2359 | } | ||
| 2360 | 2351 | ||
| 2361 | /* create mixer controls */ | 2352 | /* create mixer controls */ |
| 2362 | err = azx_mixer_create(chip); | 2353 | err = azx_mixer_create(chip); |
| 2363 | if (err < 0) { | 2354 | if (err < 0) |
| 2364 | snd_card_free(card); | 2355 | goto out_free; |
| 2365 | return err; | ||
| 2366 | } | ||
| 2367 | 2356 | ||
| 2368 | snd_card_set_dev(card, &pci->dev); | 2357 | snd_card_set_dev(card, &pci->dev); |
| 2369 | 2358 | ||
| 2370 | err = snd_card_register(card); | 2359 | err = snd_card_register(card); |
| 2371 | if (err < 0) { | 2360 | if (err < 0) |
| 2372 | snd_card_free(card); | 2361 | goto out_free; |
| 2373 | return err; | ||
| 2374 | } | ||
| 2375 | 2362 | ||
| 2376 | pci_set_drvdata(pci, card); | 2363 | pci_set_drvdata(pci, card); |
| 2377 | chip->running = 1; | 2364 | chip->running = 1; |
| @@ -2380,6 +2367,9 @@ static int __devinit azx_probe(struct pci_dev *pci, | |||
| 2380 | 2367 | ||
| 2381 | dev++; | 2368 | dev++; |
| 2382 | return err; | 2369 | return err; |
| 2370 | out_free: | ||
| 2371 | snd_card_free(card); | ||
| 2372 | return err; | ||
| 2383 | } | 2373 | } |
| 2384 | 2374 | ||
| 2385 | static void __devexit azx_remove(struct pci_dev *pci) | 2375 | static void __devexit azx_remove(struct pci_dev *pci) |
| @@ -2453,6 +2443,11 @@ static struct pci_device_id azx_ids[] = { | |||
| 2453 | { PCI_DEVICE(0x10de, 0x0bd7), .driver_data = AZX_DRIVER_NVIDIA }, | 2443 | { PCI_DEVICE(0x10de, 0x0bd7), .driver_data = AZX_DRIVER_NVIDIA }, |
| 2454 | /* Teradici */ | 2444 | /* Teradici */ |
| 2455 | { PCI_DEVICE(0x6549, 0x1200), .driver_data = AZX_DRIVER_TERA }, | 2445 | { PCI_DEVICE(0x6549, 0x1200), .driver_data = AZX_DRIVER_TERA }, |
| 2446 | /* AMD Generic, PCI class code and Vendor ID for HD Audio */ | ||
| 2447 | { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_ANY_ID), | ||
| 2448 | .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8, | ||
| 2449 | .class_mask = 0xffffff, | ||
| 2450 | .driver_data = AZX_DRIVER_GENERIC }, | ||
| 2456 | { 0, } | 2451 | { 0, } |
| 2457 | }; | 2452 | }; |
| 2458 | MODULE_DEVICE_TABLE(pci, azx_ids); | 2453 | MODULE_DEVICE_TABLE(pci, azx_ids); |
diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h index 7957fefda730..6f2fe0f9fdd8 100644 --- a/sound/pci/hda/hda_local.h +++ b/sound/pci/hda/hda_local.h | |||
| @@ -96,6 +96,8 @@ struct snd_kcontrol *snd_hda_find_mixer_ctl(struct hda_codec *codec, | |||
| 96 | const char *name); | 96 | const char *name); |
| 97 | int snd_hda_add_vmaster(struct hda_codec *codec, char *name, | 97 | int snd_hda_add_vmaster(struct hda_codec *codec, char *name, |
| 98 | unsigned int *tlv, const char **slaves); | 98 | unsigned int *tlv, const char **slaves); |
| 99 | void snd_hda_codec_reset(struct hda_codec *codec); | ||
| 100 | int snd_hda_codec_configure(struct hda_codec *codec); | ||
| 99 | 101 | ||
| 100 | /* amp value bits */ | 102 | /* amp value bits */ |
| 101 | #define HDA_AMP_MUTE 0x80 | 103 | #define HDA_AMP_MUTE 0x80 |
| @@ -282,6 +284,12 @@ int snd_hda_codec_proc_new(struct hda_codec *codec); | |||
| 282 | static inline int snd_hda_codec_proc_new(struct hda_codec *codec) { return 0; } | 284 | static inline int snd_hda_codec_proc_new(struct hda_codec *codec) { return 0; } |
| 283 | #endif | 285 | #endif |
| 284 | 286 | ||
| 287 | #define SND_PRINT_RATES_ADVISED_BUFSIZE 80 | ||
| 288 | void snd_print_pcm_rates(int pcm, char *buf, int buflen); | ||
| 289 | |||
| 290 | #define SND_PRINT_BITS_ADVISED_BUFSIZE 16 | ||
| 291 | void snd_print_pcm_bits(int pcm, char *buf, int buflen); | ||
| 292 | |||
| 285 | /* | 293 | /* |
| 286 | * Misc | 294 | * Misc |
| 287 | */ | 295 | */ |
| @@ -364,17 +372,17 @@ int snd_hda_parse_pin_def_config(struct hda_codec *codec, | |||
| 364 | /* amp values */ | 372 | /* amp values */ |
| 365 | #define AMP_IN_MUTE(idx) (0x7080 | ((idx)<<8)) | 373 | #define AMP_IN_MUTE(idx) (0x7080 | ((idx)<<8)) |
| 366 | #define AMP_IN_UNMUTE(idx) (0x7000 | ((idx)<<8)) | 374 | #define AMP_IN_UNMUTE(idx) (0x7000 | ((idx)<<8)) |
| 367 | #define AMP_OUT_MUTE 0xb080 | 375 | #define AMP_OUT_MUTE 0xb080 |
| 368 | #define AMP_OUT_UNMUTE 0xb000 | 376 | #define AMP_OUT_UNMUTE 0xb000 |
| 369 | #define AMP_OUT_ZERO 0xb000 | 377 | #define AMP_OUT_ZERO 0xb000 |
| 370 | /* pinctl values */ | 378 | /* pinctl values */ |
| 371 | #define PIN_IN (AC_PINCTL_IN_EN) | 379 | #define PIN_IN (AC_PINCTL_IN_EN) |
| 372 | #define PIN_VREFHIZ (AC_PINCTL_IN_EN | AC_PINCTL_VREF_HIZ) | 380 | #define PIN_VREFHIZ (AC_PINCTL_IN_EN | AC_PINCTL_VREF_HIZ) |
| 373 | #define PIN_VREF50 (AC_PINCTL_IN_EN | AC_PINCTL_VREF_50) | 381 | #define PIN_VREF50 (AC_PINCTL_IN_EN | AC_PINCTL_VREF_50) |
| 374 | #define PIN_VREFGRD (AC_PINCTL_IN_EN | AC_PINCTL_VREF_GRD) | 382 | #define PIN_VREFGRD (AC_PINCTL_IN_EN | AC_PINCTL_VREF_GRD) |
| 375 | #define PIN_VREF80 (AC_PINCTL_IN_EN | AC_PINCTL_VREF_80) | 383 | #define PIN_VREF80 (AC_PINCTL_IN_EN | AC_PINCTL_VREF_80) |
| 376 | #define PIN_VREF100 (AC_PINCTL_IN_EN | AC_PINCTL_VREF_100) | 384 | #define PIN_VREF100 (AC_PINCTL_IN_EN | AC_PINCTL_VREF_100) |
| 377 | #define PIN_OUT (AC_PINCTL_OUT_EN) | 385 | #define PIN_OUT (AC_PINCTL_OUT_EN) |
| 378 | #define PIN_HP (AC_PINCTL_OUT_EN | AC_PINCTL_HP_EN) | 386 | #define PIN_HP (AC_PINCTL_OUT_EN | AC_PINCTL_HP_EN) |
| 379 | #define PIN_HP_AMP (AC_PINCTL_HP_EN) | 387 | #define PIN_HP_AMP (AC_PINCTL_HP_EN) |
| 380 | 388 | ||
| @@ -393,10 +401,26 @@ u32 query_amp_caps(struct hda_codec *codec, hda_nid_t nid, int direction); | |||
| 393 | int snd_hda_override_amp_caps(struct hda_codec *codec, hda_nid_t nid, int dir, | 401 | int snd_hda_override_amp_caps(struct hda_codec *codec, hda_nid_t nid, int dir, |
| 394 | unsigned int caps); | 402 | unsigned int caps); |
| 395 | 403 | ||
| 404 | int snd_hda_ctl_add(struct hda_codec *codec, struct snd_kcontrol *kctl); | ||
| 405 | void snd_hda_ctls_clear(struct hda_codec *codec); | ||
| 406 | |||
| 396 | /* | 407 | /* |
| 397 | * hwdep interface | 408 | * hwdep interface |
| 398 | */ | 409 | */ |
| 410 | #ifdef CONFIG_SND_HDA_HWDEP | ||
| 399 | int snd_hda_create_hwdep(struct hda_codec *codec); | 411 | int snd_hda_create_hwdep(struct hda_codec *codec); |
| 412 | #else | ||
| 413 | static inline int snd_hda_create_hwdep(struct hda_codec *codec) { return 0; } | ||
| 414 | #endif | ||
| 415 | |||
| 416 | #ifdef CONFIG_SND_HDA_RECONFIG | ||
| 417 | int snd_hda_hwdep_add_sysfs(struct hda_codec *codec); | ||
| 418 | #else | ||
| 419 | static inline int snd_hda_hwdep_add_sysfs(struct hda_codec *codec) | ||
| 420 | { | ||
| 421 | return 0; | ||
| 422 | } | ||
| 423 | #endif | ||
| 400 | 424 | ||
| 401 | /* | 425 | /* |
| 402 | * power-management | 426 | * power-management |
| @@ -430,4 +454,66 @@ int snd_hda_check_amp_list_power(struct hda_codec *codec, | |||
| 430 | #define get_amp_direction(kc) (((kc)->private_value >> 18) & 0x1) | 454 | #define get_amp_direction(kc) (((kc)->private_value >> 18) & 0x1) |
| 431 | #define get_amp_index(kc) (((kc)->private_value >> 19) & 0xf) | 455 | #define get_amp_index(kc) (((kc)->private_value >> 19) & 0xf) |
| 432 | 456 | ||
| 457 | /* | ||
| 458 | * CEA Short Audio Descriptor data | ||
| 459 | */ | ||
| 460 | struct cea_sad { | ||
| 461 | int channels; | ||
| 462 | int format; /* (format == 0) indicates invalid SAD */ | ||
| 463 | int rates; | ||
| 464 | int sample_bits; /* for LPCM */ | ||
| 465 | int max_bitrate; /* for AC3...ATRAC */ | ||
| 466 | int profile; /* for WMAPRO */ | ||
| 467 | }; | ||
| 468 | |||
| 469 | #define ELD_FIXED_BYTES 20 | ||
| 470 | #define ELD_MAX_MNL 16 | ||
| 471 | #define ELD_MAX_SAD 16 | ||
| 472 | |||
| 473 | /* | ||
| 474 | * ELD: EDID Like Data | ||
| 475 | */ | ||
| 476 | struct hdmi_eld { | ||
| 477 | int eld_size; | ||
| 478 | int baseline_len; | ||
| 479 | int eld_ver; /* (eld_ver == 0) indicates invalid ELD */ | ||
| 480 | int cea_edid_ver; | ||
| 481 | char monitor_name[ELD_MAX_MNL + 1]; | ||
| 482 | int manufacture_id; | ||
| 483 | int product_id; | ||
| 484 | u64 port_id; | ||
| 485 | int support_hdcp; | ||
| 486 | int support_ai; | ||
| 487 | int conn_type; | ||
| 488 | int aud_synch_delay; | ||
| 489 | int spk_alloc; | ||
| 490 | int sad_count; | ||
| 491 | struct cea_sad sad[ELD_MAX_SAD]; | ||
| 492 | #ifdef CONFIG_PROC_FS | ||
| 493 | struct snd_info_entry *proc_entry; | ||
| 494 | #endif | ||
| 495 | }; | ||
| 496 | |||
| 497 | int snd_hdmi_get_eld_size(struct hda_codec *codec, hda_nid_t nid); | ||
| 498 | int snd_hdmi_get_eld(struct hdmi_eld *, struct hda_codec *, hda_nid_t); | ||
| 499 | void snd_hdmi_show_eld(struct hdmi_eld *eld); | ||
| 500 | |||
| 501 | #ifdef CONFIG_PROC_FS | ||
| 502 | int snd_hda_eld_proc_new(struct hda_codec *codec, struct hdmi_eld *eld); | ||
| 503 | void snd_hda_eld_proc_free(struct hda_codec *codec, struct hdmi_eld *eld); | ||
| 504 | #else | ||
| 505 | static inline int snd_hda_eld_proc_new(struct hda_codec *codec, | ||
| 506 | struct hdmi_eld *eld) | ||
| 507 | { | ||
| 508 | return 0; | ||
| 509 | } | ||
| 510 | static inline void snd_hda_eld_proc_free(struct hda_codec *codec, | ||
| 511 | struct hdmi_eld *eld) | ||
| 512 | { | ||
| 513 | } | ||
| 514 | #endif | ||
| 515 | |||
| 516 | #define SND_PRINT_CHANNEL_ALLOCATION_ADVISED_BUFSIZE 80 | ||
| 517 | void snd_print_channel_allocation(int spk_alloc, char *buf, int buflen); | ||
| 518 | |||
| 433 | #endif /* __SOUND_HDA_LOCAL_H */ | 519 | #endif /* __SOUND_HDA_LOCAL_H */ |
diff --git a/sound/pci/hda/hda_patch.h b/sound/pci/hda/hda_patch.h deleted file mode 100644 index dfbcfa88da44..000000000000 --- a/sound/pci/hda/hda_patch.h +++ /dev/null | |||
| @@ -1,22 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * HDA Patches - included by hda_codec.c | ||
| 3 | */ | ||
| 4 | |||
| 5 | /* Realtek codecs */ | ||
| 6 | extern struct hda_codec_preset snd_hda_preset_realtek[]; | ||
| 7 | /* C-Media codecs */ | ||
| 8 | extern struct hda_codec_preset snd_hda_preset_cmedia[]; | ||
| 9 | /* Analog Devices codecs */ | ||
| 10 | extern struct hda_codec_preset snd_hda_preset_analog[]; | ||
| 11 | /* SigmaTel codecs */ | ||
| 12 | extern struct hda_codec_preset snd_hda_preset_sigmatel[]; | ||
| 13 | /* SiLabs 3054/3055 modem codecs */ | ||
| 14 | extern struct hda_codec_preset snd_hda_preset_si3054[]; | ||
| 15 | /* ATI HDMI codecs */ | ||
| 16 | extern struct hda_codec_preset snd_hda_preset_atihdmi[]; | ||
| 17 | /* Conexant audio codec */ | ||
| 18 | extern struct hda_codec_preset snd_hda_preset_conexant[]; | ||
| 19 | /* VIA codecs */ | ||
| 20 | extern struct hda_codec_preset snd_hda_preset_via[]; | ||
| 21 | /* NVIDIA HDMI codecs */ | ||
| 22 | extern struct hda_codec_preset snd_hda_preset_nvhdmi[]; | ||
diff --git a/sound/pci/hda/hda_proc.c b/sound/pci/hda/hda_proc.c index c39af986bff1..7ca66d654148 100644 --- a/sound/pci/hda/hda_proc.c +++ b/sound/pci/hda/hda_proc.c | |||
| @@ -91,31 +91,21 @@ static void print_amp_vals(struct snd_info_buffer *buffer, | |||
| 91 | 91 | ||
| 92 | static void print_pcm_rates(struct snd_info_buffer *buffer, unsigned int pcm) | 92 | static void print_pcm_rates(struct snd_info_buffer *buffer, unsigned int pcm) |
| 93 | { | 93 | { |
| 94 | static unsigned int rates[] = { | 94 | char buf[SND_PRINT_RATES_ADVISED_BUFSIZE]; |
| 95 | 8000, 11025, 16000, 22050, 32000, 44100, 48000, 88200, | ||
| 96 | 96000, 176400, 192000, 384000 | ||
| 97 | }; | ||
| 98 | int i; | ||
| 99 | 95 | ||
| 100 | pcm &= AC_SUPPCM_RATES; | 96 | pcm &= AC_SUPPCM_RATES; |
| 101 | snd_iprintf(buffer, " rates [0x%x]:", pcm); | 97 | snd_iprintf(buffer, " rates [0x%x]:", pcm); |
| 102 | for (i = 0; i < ARRAY_SIZE(rates); i++) | 98 | snd_print_pcm_rates(pcm, buf, sizeof(buf)); |
| 103 | if (pcm & (1 << i)) | 99 | snd_iprintf(buffer, "%s\n", buf); |
| 104 | snd_iprintf(buffer, " %d", rates[i]); | ||
| 105 | snd_iprintf(buffer, "\n"); | ||
| 106 | } | 100 | } |
| 107 | 101 | ||
| 108 | static void print_pcm_bits(struct snd_info_buffer *buffer, unsigned int pcm) | 102 | static void print_pcm_bits(struct snd_info_buffer *buffer, unsigned int pcm) |
| 109 | { | 103 | { |
| 110 | static unsigned int bits[] = { 8, 16, 20, 24, 32 }; | 104 | char buf[SND_PRINT_BITS_ADVISED_BUFSIZE]; |
| 111 | int i; | ||
| 112 | 105 | ||
| 113 | pcm = (pcm >> 16) & 0xff; | 106 | snd_iprintf(buffer, " bits [0x%x]:", (pcm >> 16) & 0xff); |
| 114 | snd_iprintf(buffer, " bits [0x%x]:", pcm); | 107 | snd_print_pcm_bits(pcm, buf, sizeof(buf)); |
| 115 | for (i = 0; i < ARRAY_SIZE(bits); i++) | 108 | snd_iprintf(buffer, "%s\n", buf); |
| 116 | if (pcm & (1 << i)) | ||
| 117 | snd_iprintf(buffer, " %d", bits[i]); | ||
| 118 | snd_iprintf(buffer, "\n"); | ||
| 119 | } | 109 | } |
| 120 | 110 | ||
| 121 | static void print_pcm_formats(struct snd_info_buffer *buffer, | 111 | static void print_pcm_formats(struct snd_info_buffer *buffer, |
| @@ -145,32 +135,6 @@ static void print_pcm_caps(struct snd_info_buffer *buffer, | |||
| 145 | print_pcm_formats(buffer, stream); | 135 | print_pcm_formats(buffer, stream); |
| 146 | } | 136 | } |
| 147 | 137 | ||
| 148 | static const char *get_jack_location(u32 cfg) | ||
| 149 | { | ||
| 150 | static char *bases[7] = { | ||
| 151 | "N/A", "Rear", "Front", "Left", "Right", "Top", "Bottom", | ||
| 152 | }; | ||
| 153 | static unsigned char specials_idx[] = { | ||
| 154 | 0x07, 0x08, | ||
| 155 | 0x17, 0x18, 0x19, | ||
| 156 | 0x37, 0x38 | ||
| 157 | }; | ||
| 158 | static char *specials[] = { | ||
| 159 | "Rear Panel", "Drive Bar", | ||
| 160 | "Riser", "HDMI", "ATAPI", | ||
| 161 | "Mobile-In", "Mobile-Out" | ||
| 162 | }; | ||
| 163 | int i; | ||
| 164 | cfg = (cfg & AC_DEFCFG_LOCATION) >> AC_DEFCFG_LOCATION_SHIFT; | ||
| 165 | if ((cfg & 0x0f) < 7) | ||
| 166 | return bases[cfg & 0x0f]; | ||
| 167 | for (i = 0; i < ARRAY_SIZE(specials_idx); i++) { | ||
| 168 | if (cfg == specials_idx[i]) | ||
| 169 | return specials[i]; | ||
| 170 | } | ||
| 171 | return "UNKNOWN"; | ||
| 172 | } | ||
| 173 | |||
| 174 | static const char *get_jack_connection(u32 cfg) | 138 | static const char *get_jack_connection(u32 cfg) |
| 175 | { | 139 | { |
| 176 | static char *names[16] = { | 140 | static char *names[16] = { |
| @@ -206,13 +170,6 @@ static void print_pin_caps(struct snd_info_buffer *buffer, | |||
| 206 | int *supports_vref) | 170 | int *supports_vref) |
| 207 | { | 171 | { |
| 208 | static char *jack_conns[4] = { "Jack", "N/A", "Fixed", "Both" }; | 172 | static char *jack_conns[4] = { "Jack", "N/A", "Fixed", "Both" }; |
| 209 | static char *jack_types[16] = { | ||
| 210 | "Line Out", "Speaker", "HP Out", "CD", | ||
| 211 | "SPDIF Out", "Digital Out", "Modem Line", "Modem Hand", | ||
| 212 | "Line In", "Aux", "Mic", "Telephony", | ||
| 213 | "SPDIF In", "Digitial In", "Reserved", "Other" | ||
| 214 | }; | ||
| 215 | static char *jack_locations[4] = { "Ext", "Int", "Sep", "Oth" }; | ||
| 216 | unsigned int caps, val; | 173 | unsigned int caps, val; |
| 217 | 174 | ||
| 218 | caps = snd_hda_param_read(codec, nid, AC_PAR_PIN_CAP); | 175 | caps = snd_hda_param_read(codec, nid, AC_PAR_PIN_CAP); |
| @@ -274,9 +231,9 @@ static void print_pin_caps(struct snd_info_buffer *buffer, | |||
| 274 | caps = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_CONFIG_DEFAULT, 0); | 231 | caps = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_CONFIG_DEFAULT, 0); |
| 275 | snd_iprintf(buffer, " Pin Default 0x%08x: [%s] %s at %s %s\n", caps, | 232 | snd_iprintf(buffer, " Pin Default 0x%08x: [%s] %s at %s %s\n", caps, |
| 276 | jack_conns[(caps & AC_DEFCFG_PORT_CONN) >> AC_DEFCFG_PORT_CONN_SHIFT], | 233 | jack_conns[(caps & AC_DEFCFG_PORT_CONN) >> AC_DEFCFG_PORT_CONN_SHIFT], |
| 277 | jack_types[(caps & AC_DEFCFG_DEVICE) >> AC_DEFCFG_DEVICE_SHIFT], | 234 | snd_hda_get_jack_type(caps), |
| 278 | jack_locations[(caps >> (AC_DEFCFG_LOCATION_SHIFT + 4)) & 3], | 235 | snd_hda_get_jack_connectivity(caps), |
| 279 | get_jack_location(caps)); | 236 | snd_hda_get_jack_location(caps)); |
| 280 | snd_iprintf(buffer, " Conn = %s, Color = %s\n", | 237 | snd_iprintf(buffer, " Conn = %s, Color = %s\n", |
| 281 | get_jack_connection(caps), | 238 | get_jack_connection(caps), |
| 282 | get_jack_color(caps)); | 239 | get_jack_color(caps)); |
| @@ -457,17 +414,6 @@ static void print_conn_list(struct snd_info_buffer *buffer, | |||
| 457 | } | 414 | } |
| 458 | } | 415 | } |
| 459 | 416 | ||
| 460 | static void print_realtek_coef(struct snd_info_buffer *buffer, | ||
| 461 | struct hda_codec *codec, hda_nid_t nid) | ||
| 462 | { | ||
| 463 | int coeff = snd_hda_codec_read(codec, nid, 0, | ||
| 464 | AC_VERB_GET_PROC_COEF, 0); | ||
| 465 | snd_iprintf(buffer, " Processing Coefficient: 0x%02x\n", coeff); | ||
| 466 | coeff = snd_hda_codec_read(codec, nid, 0, | ||
| 467 | AC_VERB_GET_COEF_INDEX, 0); | ||
| 468 | snd_iprintf(buffer, " Coefficient Index: 0x%02x\n", coeff); | ||
| 469 | } | ||
| 470 | |||
| 471 | static void print_gpio(struct snd_info_buffer *buffer, | 417 | static void print_gpio(struct snd_info_buffer *buffer, |
| 472 | struct hda_codec *codec, hda_nid_t nid) | 418 | struct hda_codec *codec, hda_nid_t nid) |
| 473 | { | 419 | { |
| @@ -500,12 +446,13 @@ static void print_gpio(struct snd_info_buffer *buffer, | |||
| 500 | for (i = 0; i < max; ++i) | 446 | for (i = 0; i < max; ++i) |
| 501 | snd_iprintf(buffer, | 447 | snd_iprintf(buffer, |
| 502 | " IO[%d]: enable=%d, dir=%d, wake=%d, " | 448 | " IO[%d]: enable=%d, dir=%d, wake=%d, " |
| 503 | "sticky=%d, data=%d\n", i, | 449 | "sticky=%d, data=%d, unsol=%d\n", i, |
| 504 | (enable & (1<<i)) ? 1 : 0, | 450 | (enable & (1<<i)) ? 1 : 0, |
| 505 | (direction & (1<<i)) ? 1 : 0, | 451 | (direction & (1<<i)) ? 1 : 0, |
| 506 | (wake & (1<<i)) ? 1 : 0, | 452 | (wake & (1<<i)) ? 1 : 0, |
| 507 | (sticky & (1<<i)) ? 1 : 0, | 453 | (sticky & (1<<i)) ? 1 : 0, |
| 508 | (data & (1<<i)) ? 1 : 0); | 454 | (data & (1<<i)) ? 1 : 0, |
| 455 | (unsol & (1<<i)) ? 1 : 0); | ||
| 509 | /* FIXME: add GPO and GPI pin information */ | 456 | /* FIXME: add GPO and GPI pin information */ |
| 510 | } | 457 | } |
| 511 | 458 | ||
| @@ -513,12 +460,11 @@ static void print_codec_info(struct snd_info_entry *entry, | |||
| 513 | struct snd_info_buffer *buffer) | 460 | struct snd_info_buffer *buffer) |
| 514 | { | 461 | { |
| 515 | struct hda_codec *codec = entry->private_data; | 462 | struct hda_codec *codec = entry->private_data; |
| 516 | char buf[32]; | ||
| 517 | hda_nid_t nid; | 463 | hda_nid_t nid; |
| 518 | int i, nodes; | 464 | int i, nodes; |
| 519 | 465 | ||
| 520 | snd_hda_get_codec_name(codec, buf, sizeof(buf)); | 466 | snd_iprintf(buffer, "Codec: %s\n", |
| 521 | snd_iprintf(buffer, "Codec: %s\n", buf); | 467 | codec->name ? codec->name : "Not Set"); |
| 522 | snd_iprintf(buffer, "Address: %d\n", codec->addr); | 468 | snd_iprintf(buffer, "Address: %d\n", codec->addr); |
| 523 | snd_iprintf(buffer, "Vendor Id: 0x%x\n", codec->vendor_id); | 469 | snd_iprintf(buffer, "Vendor Id: 0x%x\n", codec->vendor_id); |
| 524 | snd_iprintf(buffer, "Subsystem Id: 0x%x\n", codec->subsystem_id); | 470 | snd_iprintf(buffer, "Subsystem Id: 0x%x\n", codec->subsystem_id); |
| @@ -547,6 +493,8 @@ static void print_codec_info(struct snd_info_entry *entry, | |||
| 547 | } | 493 | } |
| 548 | 494 | ||
| 549 | print_gpio(buffer, codec, codec->afg); | 495 | print_gpio(buffer, codec, codec->afg); |
| 496 | if (codec->proc_widget_hook) | ||
| 497 | codec->proc_widget_hook(buffer, codec, codec->afg); | ||
| 550 | 498 | ||
| 551 | for (i = 0; i < nodes; i++, nid++) { | 499 | for (i = 0; i < nodes; i++, nid++) { |
| 552 | unsigned int wid_caps = | 500 | unsigned int wid_caps = |
| @@ -649,9 +597,8 @@ static void print_codec_info(struct snd_info_entry *entry, | |||
| 649 | if (wid_caps & AC_WCAP_PROC_WID) | 597 | if (wid_caps & AC_WCAP_PROC_WID) |
| 650 | print_proc_caps(buffer, codec, nid); | 598 | print_proc_caps(buffer, codec, nid); |
| 651 | 599 | ||
| 652 | /* NID 0x20 == Realtek Define Registers */ | 600 | if (codec->proc_widget_hook) |
| 653 | if (codec->vendor_id == 0x10ec && nid == 0x20) | 601 | codec->proc_widget_hook(buffer, codec, nid); |
| 654 | print_realtek_coef(buffer, codec, nid); | ||
| 655 | } | 602 | } |
| 656 | snd_hda_power_down(codec); | 603 | snd_hda_power_down(codec); |
| 657 | } | 604 | } |
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c index 686c77491dea..26247cfe749d 100644 --- a/sound/pci/hda/patch_analog.c +++ b/sound/pci/hda/patch_analog.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | #include <sound/core.h> | 27 | #include <sound/core.h> |
| 28 | #include "hda_codec.h" | 28 | #include "hda_codec.h" |
| 29 | #include "hda_local.h" | 29 | #include "hda_local.h" |
| 30 | #include "hda_patch.h" | ||
| 31 | 30 | ||
| 32 | struct ad198x_spec { | 31 | struct ad198x_spec { |
| 33 | struct snd_kcontrol_new *mixers[5]; | 32 | struct snd_kcontrol_new *mixers[5]; |
| @@ -67,8 +66,7 @@ struct ad198x_spec { | |||
| 67 | 66 | ||
| 68 | /* dynamic controls, init_verbs and input_mux */ | 67 | /* dynamic controls, init_verbs and input_mux */ |
| 69 | struct auto_pin_cfg autocfg; | 68 | struct auto_pin_cfg autocfg; |
| 70 | unsigned int num_kctl_alloc, num_kctl_used; | 69 | struct snd_array kctls; |
| 71 | struct snd_kcontrol_new *kctl_alloc; | ||
| 72 | struct hda_input_mux private_imux; | 70 | struct hda_input_mux private_imux; |
| 73 | hda_nid_t private_dac_nids[AUTO_CFG_MAX_OUTS]; | 71 | hda_nid_t private_dac_nids[AUTO_CFG_MAX_OUTS]; |
| 74 | 72 | ||
| @@ -154,6 +152,8 @@ static const char *ad_slave_sws[] = { | |||
| 154 | NULL | 152 | NULL |
| 155 | }; | 153 | }; |
| 156 | 154 | ||
| 155 | static void ad198x_free_kctls(struct hda_codec *codec); | ||
| 156 | |||
| 157 | static int ad198x_build_controls(struct hda_codec *codec) | 157 | static int ad198x_build_controls(struct hda_codec *codec) |
| 158 | { | 158 | { |
| 159 | struct ad198x_spec *spec = codec->spec; | 159 | struct ad198x_spec *spec = codec->spec; |
| @@ -202,6 +202,7 @@ static int ad198x_build_controls(struct hda_codec *codec) | |||
| 202 | return err; | 202 | return err; |
| 203 | } | 203 | } |
| 204 | 204 | ||
| 205 | ad198x_free_kctls(codec); /* no longer needed */ | ||
| 205 | return 0; | 206 | return 0; |
| 206 | } | 207 | } |
| 207 | 208 | ||
| @@ -375,16 +376,27 @@ static int ad198x_build_pcms(struct hda_codec *codec) | |||
| 375 | return 0; | 376 | return 0; |
| 376 | } | 377 | } |
| 377 | 378 | ||
| 378 | static void ad198x_free(struct hda_codec *codec) | 379 | static void ad198x_free_kctls(struct hda_codec *codec) |
| 379 | { | 380 | { |
| 380 | struct ad198x_spec *spec = codec->spec; | 381 | struct ad198x_spec *spec = codec->spec; |
| 381 | unsigned int i; | ||
| 382 | 382 | ||
| 383 | if (spec->kctl_alloc) { | 383 | if (spec->kctls.list) { |
| 384 | for (i = 0; i < spec->num_kctl_used; i++) | 384 | struct snd_kcontrol_new *kctl = spec->kctls.list; |
| 385 | kfree(spec->kctl_alloc[i].name); | 385 | int i; |
| 386 | kfree(spec->kctl_alloc); | 386 | for (i = 0; i < spec->kctls.used; i++) |
| 387 | kfree(kctl[i].name); | ||
| 387 | } | 388 | } |
| 389 | snd_array_free(&spec->kctls); | ||
| 390 | } | ||
| 391 | |||
| 392 | static void ad198x_free(struct hda_codec *codec) | ||
| 393 | { | ||
| 394 | struct ad198x_spec *spec = codec->spec; | ||
| 395 | |||
| 396 | if (!spec) | ||
| 397 | return; | ||
| 398 | |||
| 399 | ad198x_free_kctls(codec); | ||
| 388 | kfree(codec->spec); | 400 | kfree(codec->spec); |
| 389 | } | 401 | } |
| 390 | 402 | ||
| @@ -629,6 +641,36 @@ static struct snd_kcontrol_new ad1986a_laptop_eapd_mixers[] = { | |||
| 629 | HDA_BIND_SW("Master Playback Switch", &ad1986a_laptop_master_sw), | 641 | HDA_BIND_SW("Master Playback Switch", &ad1986a_laptop_master_sw), |
| 630 | HDA_CODEC_VOLUME("PCM Playback Volume", 0x03, 0x0, HDA_OUTPUT), | 642 | HDA_CODEC_VOLUME("PCM Playback Volume", 0x03, 0x0, HDA_OUTPUT), |
| 631 | HDA_CODEC_MUTE("PCM Playback Switch", 0x03, 0x0, HDA_OUTPUT), | 643 | HDA_CODEC_MUTE("PCM Playback Switch", 0x03, 0x0, HDA_OUTPUT), |
| 644 | HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x17, 0, HDA_OUTPUT), | ||
| 645 | HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x17, 0, HDA_OUTPUT), | ||
| 646 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x13, 0x0, HDA_OUTPUT), | ||
| 647 | HDA_CODEC_MUTE("Mic Playback Switch", 0x13, 0x0, HDA_OUTPUT), | ||
| 648 | HDA_CODEC_VOLUME("Mic Boost", 0x0f, 0x0, HDA_OUTPUT), | ||
| 649 | HDA_CODEC_VOLUME("Capture Volume", 0x12, 0x0, HDA_OUTPUT), | ||
| 650 | HDA_CODEC_MUTE("Capture Switch", 0x12, 0x0, HDA_OUTPUT), | ||
| 651 | { | ||
| 652 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
| 653 | .name = "Capture Source", | ||
| 654 | .info = ad198x_mux_enum_info, | ||
| 655 | .get = ad198x_mux_enum_get, | ||
| 656 | .put = ad198x_mux_enum_put, | ||
| 657 | }, | ||
| 658 | { | ||
| 659 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
| 660 | .name = "External Amplifier", | ||
| 661 | .info = ad198x_eapd_info, | ||
| 662 | .get = ad198x_eapd_get, | ||
| 663 | .put = ad198x_eapd_put, | ||
| 664 | .private_value = 0x1b | (1 << 8), /* port-D, inversed */ | ||
| 665 | }, | ||
| 666 | { } /* end */ | ||
| 667 | }; | ||
| 668 | |||
| 669 | static struct snd_kcontrol_new ad1986a_samsung_mixers[] = { | ||
| 670 | HDA_BIND_VOL("Master Playback Volume", &ad1986a_laptop_master_vol), | ||
| 671 | HDA_BIND_SW("Master Playback Switch", &ad1986a_laptop_master_sw), | ||
| 672 | HDA_CODEC_VOLUME("PCM Playback Volume", 0x03, 0x0, HDA_OUTPUT), | ||
| 673 | HDA_CODEC_MUTE("PCM Playback Switch", 0x03, 0x0, HDA_OUTPUT), | ||
| 632 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x13, 0x0, HDA_OUTPUT), | 674 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x13, 0x0, HDA_OUTPUT), |
| 633 | HDA_CODEC_MUTE("Mic Playback Switch", 0x13, 0x0, HDA_OUTPUT), | 675 | HDA_CODEC_MUTE("Mic Playback Switch", 0x13, 0x0, HDA_OUTPUT), |
| 634 | HDA_CODEC_VOLUME("Mic Boost", 0x0f, 0x0, HDA_OUTPUT), | 676 | HDA_CODEC_VOLUME("Mic Boost", 0x0f, 0x0, HDA_OUTPUT), |
| @@ -917,6 +959,7 @@ enum { | |||
| 917 | AD1986A_LAPTOP_EAPD, | 959 | AD1986A_LAPTOP_EAPD, |
| 918 | AD1986A_LAPTOP_AUTOMUTE, | 960 | AD1986A_LAPTOP_AUTOMUTE, |
| 919 | AD1986A_ULTRA, | 961 | AD1986A_ULTRA, |
| 962 | AD1986A_SAMSUNG, | ||
| 920 | AD1986A_MODELS | 963 | AD1986A_MODELS |
| 921 | }; | 964 | }; |
| 922 | 965 | ||
| @@ -927,6 +970,7 @@ static const char *ad1986a_models[AD1986A_MODELS] = { | |||
| 927 | [AD1986A_LAPTOP_EAPD] = "laptop-eapd", | 970 | [AD1986A_LAPTOP_EAPD] = "laptop-eapd", |
| 928 | [AD1986A_LAPTOP_AUTOMUTE] = "laptop-automute", | 971 | [AD1986A_LAPTOP_AUTOMUTE] = "laptop-automute", |
| 929 | [AD1986A_ULTRA] = "ultra", | 972 | [AD1986A_ULTRA] = "ultra", |
| 973 | [AD1986A_SAMSUNG] = "samsung", | ||
| 930 | }; | 974 | }; |
| 931 | 975 | ||
| 932 | static struct snd_pci_quirk ad1986a_cfg_tbl[] = { | 976 | static struct snd_pci_quirk ad1986a_cfg_tbl[] = { |
| @@ -949,9 +993,9 @@ static struct snd_pci_quirk ad1986a_cfg_tbl[] = { | |||
| 949 | SND_PCI_QUIRK(0x1179, 0xff40, "Toshiba", AD1986A_LAPTOP_EAPD), | 993 | SND_PCI_QUIRK(0x1179, 0xff40, "Toshiba", AD1986A_LAPTOP_EAPD), |
| 950 | SND_PCI_QUIRK(0x144d, 0xb03c, "Samsung R55", AD1986A_3STACK), | 994 | SND_PCI_QUIRK(0x144d, 0xb03c, "Samsung R55", AD1986A_3STACK), |
| 951 | SND_PCI_QUIRK(0x144d, 0xc01e, "FSC V2060", AD1986A_LAPTOP), | 995 | SND_PCI_QUIRK(0x144d, 0xc01e, "FSC V2060", AD1986A_LAPTOP), |
| 952 | SND_PCI_QUIRK(0x144d, 0xc023, "Samsung X60", AD1986A_LAPTOP_EAPD), | 996 | SND_PCI_QUIRK(0x144d, 0xc023, "Samsung X60", AD1986A_SAMSUNG), |
| 953 | SND_PCI_QUIRK(0x144d, 0xc024, "Samsung R65", AD1986A_LAPTOP_EAPD), | 997 | SND_PCI_QUIRK(0x144d, 0xc024, "Samsung R65", AD1986A_SAMSUNG), |
| 954 | SND_PCI_QUIRK(0x144d, 0xc026, "Samsung X11", AD1986A_LAPTOP_EAPD), | 998 | SND_PCI_QUIRK(0x144d, 0xc026, "Samsung X11", AD1986A_SAMSUNG), |
| 955 | SND_PCI_QUIRK(0x144d, 0xc027, "Samsung Q1", AD1986A_ULTRA), | 999 | SND_PCI_QUIRK(0x144d, 0xc027, "Samsung Q1", AD1986A_ULTRA), |
| 956 | SND_PCI_QUIRK(0x144d, 0xc504, "Samsung Q35", AD1986A_3STACK), | 1000 | SND_PCI_QUIRK(0x144d, 0xc504, "Samsung Q35", AD1986A_3STACK), |
| 957 | SND_PCI_QUIRK(0x17aa, 0x1011, "Lenovo M55", AD1986A_LAPTOP), | 1001 | SND_PCI_QUIRK(0x17aa, 0x1011, "Lenovo M55", AD1986A_LAPTOP), |
| @@ -1033,6 +1077,17 @@ static int patch_ad1986a(struct hda_codec *codec) | |||
| 1033 | break; | 1077 | break; |
| 1034 | case AD1986A_LAPTOP_EAPD: | 1078 | case AD1986A_LAPTOP_EAPD: |
| 1035 | spec->mixers[0] = ad1986a_laptop_eapd_mixers; | 1079 | spec->mixers[0] = ad1986a_laptop_eapd_mixers; |
| 1080 | spec->num_init_verbs = 2; | ||
| 1081 | spec->init_verbs[1] = ad1986a_eapd_init_verbs; | ||
| 1082 | spec->multiout.max_channels = 2; | ||
| 1083 | spec->multiout.num_dacs = 1; | ||
| 1084 | spec->multiout.dac_nids = ad1986a_laptop_dac_nids; | ||
| 1085 | if (!is_jack_available(codec, 0x25)) | ||
| 1086 | spec->multiout.dig_out_nid = 0; | ||
| 1087 | spec->input_mux = &ad1986a_laptop_eapd_capture_source; | ||
| 1088 | break; | ||
| 1089 | case AD1986A_SAMSUNG: | ||
| 1090 | spec->mixers[0] = ad1986a_samsung_mixers; | ||
| 1036 | spec->num_init_verbs = 3; | 1091 | spec->num_init_verbs = 3; |
| 1037 | spec->init_verbs[1] = ad1986a_eapd_init_verbs; | 1092 | spec->init_verbs[1] = ad1986a_eapd_init_verbs; |
| 1038 | spec->init_verbs[2] = ad1986a_automic_verbs; | 1093 | spec->init_verbs[2] = ad1986a_automic_verbs; |
| @@ -2452,9 +2507,6 @@ static struct hda_amp_list ad1988_loopbacks[] = { | |||
| 2452 | * Automatic parse of I/O pins from the BIOS configuration | 2507 | * Automatic parse of I/O pins from the BIOS configuration |
| 2453 | */ | 2508 | */ |
| 2454 | 2509 | ||
| 2455 | #define NUM_CONTROL_ALLOC 32 | ||
| 2456 | #define NUM_VERB_ALLOC 32 | ||
| 2457 | |||
| 2458 | enum { | 2510 | enum { |
| 2459 | AD_CTL_WIDGET_VOL, | 2511 | AD_CTL_WIDGET_VOL, |
| 2460 | AD_CTL_WIDGET_MUTE, | 2512 | AD_CTL_WIDGET_MUTE, |
| @@ -2472,27 +2524,15 @@ static int add_control(struct ad198x_spec *spec, int type, const char *name, | |||
| 2472 | { | 2524 | { |
| 2473 | struct snd_kcontrol_new *knew; | 2525 | struct snd_kcontrol_new *knew; |
| 2474 | 2526 | ||
| 2475 | if (spec->num_kctl_used >= spec->num_kctl_alloc) { | 2527 | snd_array_init(&spec->kctls, sizeof(*knew), 32); |
| 2476 | int num = spec->num_kctl_alloc + NUM_CONTROL_ALLOC; | 2528 | knew = snd_array_new(&spec->kctls); |
| 2477 | 2529 | if (!knew) | |
| 2478 | knew = kcalloc(num + 1, sizeof(*knew), GFP_KERNEL); /* array + terminator */ | 2530 | return -ENOMEM; |
| 2479 | if (! knew) | ||
| 2480 | return -ENOMEM; | ||
| 2481 | if (spec->kctl_alloc) { | ||
| 2482 | memcpy(knew, spec->kctl_alloc, sizeof(*knew) * spec->num_kctl_alloc); | ||
| 2483 | kfree(spec->kctl_alloc); | ||
| 2484 | } | ||
| 2485 | spec->kctl_alloc = knew; | ||
| 2486 | spec->num_kctl_alloc = num; | ||
| 2487 | } | ||
| 2488 | |||
| 2489 | knew = &spec->kctl_alloc[spec->num_kctl_used]; | ||
| 2490 | *knew = ad1988_control_templates[type]; | 2531 | *knew = ad1988_control_templates[type]; |
| 2491 | knew->name = kstrdup(name, GFP_KERNEL); | 2532 | knew->name = kstrdup(name, GFP_KERNEL); |
| 2492 | if (! knew->name) | 2533 | if (! knew->name) |
| 2493 | return -ENOMEM; | 2534 | return -ENOMEM; |
| 2494 | knew->private_value = val; | 2535 | knew->private_value = val; |
| 2495 | spec->num_kctl_used++; | ||
| 2496 | return 0; | 2536 | return 0; |
| 2497 | } | 2537 | } |
| 2498 | 2538 | ||
| @@ -2846,8 +2886,8 @@ static int ad1988_parse_auto_config(struct hda_codec *codec) | |||
| 2846 | if (spec->autocfg.dig_in_pin) | 2886 | if (spec->autocfg.dig_in_pin) |
| 2847 | spec->dig_in_nid = AD1988_SPDIF_IN; | 2887 | spec->dig_in_nid = AD1988_SPDIF_IN; |
| 2848 | 2888 | ||
| 2849 | if (spec->kctl_alloc) | 2889 | if (spec->kctls.list) |
| 2850 | spec->mixers[spec->num_mixers++] = spec->kctl_alloc; | 2890 | spec->mixers[spec->num_mixers++] = spec->kctls.list; |
| 2851 | 2891 | ||
| 2852 | spec->init_verbs[spec->num_init_verbs++] = ad1988_6stack_init_verbs; | 2892 | spec->init_verbs[spec->num_init_verbs++] = ad1988_6stack_init_verbs; |
| 2853 | 2893 | ||
| @@ -3861,6 +3901,7 @@ static const char *ad1884a_models[AD1884A_MODELS] = { | |||
| 3861 | static struct snd_pci_quirk ad1884a_cfg_tbl[] = { | 3901 | static struct snd_pci_quirk ad1884a_cfg_tbl[] = { |
| 3862 | SND_PCI_QUIRK(0x103c, 0x3030, "HP", AD1884A_MOBILE), | 3902 | SND_PCI_QUIRK(0x103c, 0x3030, "HP", AD1884A_MOBILE), |
| 3863 | SND_PCI_QUIRK(0x103c, 0x3056, "HP", AD1884A_MOBILE), | 3903 | SND_PCI_QUIRK(0x103c, 0x3056, "HP", AD1884A_MOBILE), |
| 3904 | SND_PCI_QUIRK(0x103c, 0x30e6, "HP 6730b", AD1884A_LAPTOP), | ||
| 3864 | SND_PCI_QUIRK(0x103c, 0x30e7, "HP EliteBook 8530p", AD1884A_LAPTOP), | 3905 | SND_PCI_QUIRK(0x103c, 0x30e7, "HP EliteBook 8530p", AD1884A_LAPTOP), |
| 3865 | SND_PCI_QUIRK(0x103c, 0x3614, "HP 6730s", AD1884A_LAPTOP), | 3906 | SND_PCI_QUIRK(0x103c, 0x3614, "HP 6730s", AD1884A_LAPTOP), |
| 3866 | SND_PCI_QUIRK(0x17aa, 0x20ac, "Thinkpad X300", AD1884A_THINKPAD), | 3907 | SND_PCI_QUIRK(0x17aa, 0x20ac, "Thinkpad X300", AD1884A_THINKPAD), |
| @@ -4267,7 +4308,7 @@ static int patch_ad1882(struct hda_codec *codec) | |||
| 4267 | /* | 4308 | /* |
| 4268 | * patch entries | 4309 | * patch entries |
| 4269 | */ | 4310 | */ |
| 4270 | struct hda_codec_preset snd_hda_preset_analog[] = { | 4311 | static struct hda_codec_preset snd_hda_preset_analog[] = { |
| 4271 | { .id = 0x11d4184a, .name = "AD1884A", .patch = patch_ad1884a }, | 4312 | { .id = 0x11d4184a, .name = "AD1884A", .patch = patch_ad1884a }, |
| 4272 | { .id = 0x11d41882, .name = "AD1882", .patch = patch_ad1882 }, | 4313 | { .id = 0x11d41882, .name = "AD1882", .patch = patch_ad1882 }, |
| 4273 | { .id = 0x11d41883, .name = "AD1883", .patch = patch_ad1884a }, | 4314 | { .id = 0x11d41883, .name = "AD1883", .patch = patch_ad1884a }, |
| @@ -4285,3 +4326,26 @@ struct hda_codec_preset snd_hda_preset_analog[] = { | |||
| 4285 | { .id = 0x11d4989b, .name = "AD1989B", .patch = patch_ad1988 }, | 4326 | { .id = 0x11d4989b, .name = "AD1989B", .patch = patch_ad1988 }, |
| 4286 | {} /* terminator */ | 4327 | {} /* terminator */ |
| 4287 | }; | 4328 | }; |
| 4329 | |||
| 4330 | MODULE_ALIAS("snd-hda-codec-id:11d4*"); | ||
| 4331 | |||
| 4332 | MODULE_LICENSE("GPL"); | ||
| 4333 | MODULE_DESCRIPTION("Analog Devices HD-audio codec"); | ||
| 4334 | |||
| 4335 | static struct hda_codec_preset_list analog_list = { | ||
| 4336 | .preset = snd_hda_preset_analog, | ||
| 4337 | .owner = THIS_MODULE, | ||
| 4338 | }; | ||
| 4339 | |||
| 4340 | static int __init patch_analog_init(void) | ||
| 4341 | { | ||
| 4342 | return snd_hda_add_codec_preset(&analog_list); | ||
| 4343 | } | ||
| 4344 | |||
| 4345 | static void __exit patch_analog_exit(void) | ||
| 4346 | { | ||
| 4347 | snd_hda_delete_codec_preset(&analog_list); | ||
| 4348 | } | ||
| 4349 | |||
| 4350 | module_init(patch_analog_init) | ||
| 4351 | module_exit(patch_analog_exit) | ||
diff --git a/sound/pci/hda/patch_atihdmi.c b/sound/pci/hda/patch_atihdmi.c index ba61575983fd..233e4778bba9 100644 --- a/sound/pci/hda/patch_atihdmi.c +++ b/sound/pci/hda/patch_atihdmi.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | #include <sound/core.h> | 27 | #include <sound/core.h> |
| 28 | #include "hda_codec.h" | 28 | #include "hda_codec.h" |
| 29 | #include "hda_local.h" | 29 | #include "hda_local.h" |
| 30 | #include "hda_patch.h" | ||
| 31 | 30 | ||
| 32 | struct atihdmi_spec { | 31 | struct atihdmi_spec { |
| 33 | struct hda_multi_out multiout; | 32 | struct hda_multi_out multiout; |
| @@ -187,13 +186,40 @@ static int patch_atihdmi(struct hda_codec *codec) | |||
| 187 | /* | 186 | /* |
| 188 | * patch entries | 187 | * patch entries |
| 189 | */ | 188 | */ |
| 190 | struct hda_codec_preset snd_hda_preset_atihdmi[] = { | 189 | static struct hda_codec_preset snd_hda_preset_atihdmi[] = { |
| 191 | { .id = 0x1002793c, .name = "ATI RS600 HDMI", .patch = patch_atihdmi }, | 190 | { .id = 0x1002793c, .name = "RS600 HDMI", .patch = patch_atihdmi }, |
| 192 | { .id = 0x10027919, .name = "ATI RS600 HDMI", .patch = patch_atihdmi }, | 191 | { .id = 0x10027919, .name = "RS600 HDMI", .patch = patch_atihdmi }, |
| 193 | { .id = 0x1002791a, .name = "ATI RS690/780 HDMI", .patch = patch_atihdmi }, | 192 | { .id = 0x1002791a, .name = "RS690/780 HDMI", .patch = patch_atihdmi }, |
| 194 | { .id = 0x1002aa01, .name = "ATI R6xx HDMI", .patch = patch_atihdmi }, | 193 | { .id = 0x1002aa01, .name = "R6xx HDMI", .patch = patch_atihdmi }, |
| 195 | { .id = 0x10951390, .name = "SiI1390 HDMI", .patch = patch_atihdmi }, | 194 | { .id = 0x10951390, .name = "SiI1390 HDMI", .patch = patch_atihdmi }, |
| 196 | { .id = 0x10951392, .name = "SiI1392 HDMI", .patch = patch_atihdmi }, | ||
| 197 | { .id = 0x17e80047, .name = "Chrontel HDMI", .patch = patch_atihdmi }, | 195 | { .id = 0x17e80047, .name = "Chrontel HDMI", .patch = patch_atihdmi }, |
| 198 | {} /* terminator */ | 196 | {} /* terminator */ |
| 199 | }; | 197 | }; |
| 198 | |||
| 199 | MODULE_ALIAS("snd-hda-codec-id:1002793c"); | ||
| 200 | MODULE_ALIAS("snd-hda-codec-id:10027919"); | ||
| 201 | MODULE_ALIAS("snd-hda-codec-id:1002791a"); | ||
| 202 | MODULE_ALIAS("snd-hda-codec-id:1002aa01"); | ||
| 203 | MODULE_ALIAS("snd-hda-codec-id:10951390"); | ||
| 204 | MODULE_ALIAS("snd-hda-codec-id:17e80047"); | ||
| 205 | |||
| 206 | MODULE_LICENSE("GPL"); | ||
| 207 | MODULE_DESCRIPTION("ATI HDMI HD-audio codec"); | ||
| 208 | |||
| 209 | static struct hda_codec_preset_list atihdmi_list = { | ||
| 210 | .preset = snd_hda_preset_atihdmi, | ||
| 211 | .owner = THIS_MODULE, | ||
| 212 | }; | ||
| 213 | |||
| 214 | static int __init patch_atihdmi_init(void) | ||
| 215 | { | ||
| 216 | return snd_hda_add_codec_preset(&atihdmi_list); | ||
| 217 | } | ||
| 218 | |||
| 219 | static void __exit patch_atihdmi_exit(void) | ||
| 220 | { | ||
| 221 | snd_hda_delete_codec_preset(&atihdmi_list); | ||
| 222 | } | ||
| 223 | |||
| 224 | module_init(patch_atihdmi_init) | ||
| 225 | module_exit(patch_atihdmi_exit) | ||
diff --git a/sound/pci/hda/patch_cmedia.c b/sound/pci/hda/patch_cmedia.c index 6ef57fbfb6eb..f3ebe837f2d5 100644 --- a/sound/pci/hda/patch_cmedia.c +++ b/sound/pci/hda/patch_cmedia.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | #include <sound/core.h> | 28 | #include <sound/core.h> |
| 29 | #include "hda_codec.h" | 29 | #include "hda_codec.h" |
| 30 | #include "hda_local.h" | 30 | #include "hda_local.h" |
| 31 | #include "hda_patch.h" | ||
| 32 | #define NUM_PINS 11 | 31 | #define NUM_PINS 11 |
| 33 | 32 | ||
| 34 | 33 | ||
| @@ -736,8 +735,32 @@ static int patch_cmi9880(struct hda_codec *codec) | |||
| 736 | /* | 735 | /* |
| 737 | * patch entries | 736 | * patch entries |
| 738 | */ | 737 | */ |
| 739 | struct hda_codec_preset snd_hda_preset_cmedia[] = { | 738 | static struct hda_codec_preset snd_hda_preset_cmedia[] = { |
| 740 | { .id = 0x13f69880, .name = "CMI9880", .patch = patch_cmi9880 }, | 739 | { .id = 0x13f69880, .name = "CMI9880", .patch = patch_cmi9880 }, |
| 741 | { .id = 0x434d4980, .name = "CMI9880", .patch = patch_cmi9880 }, | 740 | { .id = 0x434d4980, .name = "CMI9880", .patch = patch_cmi9880 }, |
| 742 | {} /* terminator */ | 741 | {} /* terminator */ |
| 743 | }; | 742 | }; |
| 743 | |||
| 744 | MODULE_ALIAS("snd-hda-codec-id:13f69880"); | ||
| 745 | MODULE_ALIAS("snd-hda-codec-id:434d4980"); | ||
| 746 | |||
| 747 | MODULE_LICENSE("GPL"); | ||
| 748 | MODULE_DESCRIPTION("C-Media HD-audio codec"); | ||
| 749 | |||
| 750 | static struct hda_codec_preset_list cmedia_list = { | ||
| 751 | .preset = snd_hda_preset_cmedia, | ||
| 752 | .owner = THIS_MODULE, | ||
| 753 | }; | ||
| 754 | |||
| 755 | static int __init patch_cmedia_init(void) | ||
| 756 | { | ||
| 757 | return snd_hda_add_codec_preset(&cmedia_list); | ||
| 758 | } | ||
| 759 | |||
| 760 | static void __exit patch_cmedia_exit(void) | ||
| 761 | { | ||
| 762 | snd_hda_delete_codec_preset(&cmedia_list); | ||
| 763 | } | ||
| 764 | |||
| 765 | module_init(patch_cmedia_init) | ||
| 766 | module_exit(patch_cmedia_exit) | ||
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index 7c1eb23f0cec..b20e1cede00b 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | #include <sound/core.h> | 27 | #include <sound/core.h> |
| 28 | #include "hda_codec.h" | 28 | #include "hda_codec.h" |
| 29 | #include "hda_local.h" | 29 | #include "hda_local.h" |
| 30 | #include "hda_patch.h" | ||
| 31 | 30 | ||
| 32 | #define CXT_PIN_DIR_IN 0x00 | 31 | #define CXT_PIN_DIR_IN 0x00 |
| 33 | #define CXT_PIN_DIR_OUT 0x01 | 32 | #define CXT_PIN_DIR_OUT 0x01 |
| @@ -86,8 +85,6 @@ struct conexant_spec { | |||
| 86 | 85 | ||
| 87 | /* dynamic controls, init_verbs and input_mux */ | 86 | /* dynamic controls, init_verbs and input_mux */ |
| 88 | struct auto_pin_cfg autocfg; | 87 | struct auto_pin_cfg autocfg; |
| 89 | unsigned int num_kctl_alloc, num_kctl_used; | ||
| 90 | struct snd_kcontrol_new *kctl_alloc; | ||
| 91 | struct hda_input_mux private_imux; | 88 | struct hda_input_mux private_imux; |
| 92 | hda_nid_t private_dac_nids[AUTO_CFG_MAX_OUTS]; | 89 | hda_nid_t private_dac_nids[AUTO_CFG_MAX_OUTS]; |
| 93 | 90 | ||
| @@ -344,15 +341,6 @@ static int conexant_init(struct hda_codec *codec) | |||
| 344 | 341 | ||
| 345 | static void conexant_free(struct hda_codec *codec) | 342 | static void conexant_free(struct hda_codec *codec) |
| 346 | { | 343 | { |
| 347 | struct conexant_spec *spec = codec->spec; | ||
| 348 | unsigned int i; | ||
| 349 | |||
| 350 | if (spec->kctl_alloc) { | ||
| 351 | for (i = 0; i < spec->num_kctl_used; i++) | ||
| 352 | kfree(spec->kctl_alloc[i].name); | ||
| 353 | kfree(spec->kctl_alloc); | ||
| 354 | } | ||
| 355 | |||
| 356 | kfree(codec->spec); | 344 | kfree(codec->spec); |
| 357 | } | 345 | } |
| 358 | 346 | ||
| @@ -1782,7 +1770,7 @@ static int patch_cxt5051(struct hda_codec *codec) | |||
| 1782 | /* | 1770 | /* |
| 1783 | */ | 1771 | */ |
| 1784 | 1772 | ||
| 1785 | struct hda_codec_preset snd_hda_preset_conexant[] = { | 1773 | static struct hda_codec_preset snd_hda_preset_conexant[] = { |
| 1786 | { .id = 0x14f15045, .name = "CX20549 (Venice)", | 1774 | { .id = 0x14f15045, .name = "CX20549 (Venice)", |
| 1787 | .patch = patch_cxt5045 }, | 1775 | .patch = patch_cxt5045 }, |
| 1788 | { .id = 0x14f15047, .name = "CX20551 (Waikiki)", | 1776 | { .id = 0x14f15047, .name = "CX20551 (Waikiki)", |
| @@ -1791,3 +1779,28 @@ struct hda_codec_preset snd_hda_preset_conexant[] = { | |||
| 1791 | .patch = patch_cxt5051 }, | 1779 | .patch = patch_cxt5051 }, |
| 1792 | {} /* terminator */ | 1780 | {} /* terminator */ |
| 1793 | }; | 1781 | }; |
| 1782 | |||
| 1783 | MODULE_ALIAS("snd-hda-codec-id:14f15045"); | ||
| 1784 | MODULE_ALIAS("snd-hda-codec-id:14f15047"); | ||
| 1785 | MODULE_ALIAS("snd-hda-codec-id:14f15051"); | ||
| 1786 | |||
| 1787 | MODULE_LICENSE("GPL"); | ||
| 1788 | MODULE_DESCRIPTION("Conexant HD-audio codec"); | ||
| 1789 | |||
| 1790 | static struct hda_codec_preset_list conexant_list = { | ||
| 1791 | .preset = snd_hda_preset_conexant, | ||
| 1792 | .owner = THIS_MODULE, | ||
| 1793 | }; | ||
| 1794 | |||
| 1795 | static int __init patch_conexant_init(void) | ||
| 1796 | { | ||
| 1797 | return snd_hda_add_codec_preset(&conexant_list); | ||
| 1798 | } | ||
| 1799 | |||
| 1800 | static void __exit patch_conexant_exit(void) | ||
| 1801 | { | ||
| 1802 | snd_hda_delete_codec_preset(&conexant_list); | ||
| 1803 | } | ||
| 1804 | |||
| 1805 | module_init(patch_conexant_init) | ||
| 1806 | module_exit(patch_conexant_exit) | ||
diff --git a/sound/pci/hda/patch_intelhdmi.c b/sound/pci/hda/patch_intelhdmi.c new file mode 100644 index 000000000000..3564f4e4b74c --- /dev/null +++ b/sound/pci/hda/patch_intelhdmi.c | |||
| @@ -0,0 +1,711 @@ | |||
| 1 | /* | ||
| 2 | * | ||
| 3 | * patch_intelhdmi.c - Patch for Intel HDMI codecs | ||
| 4 | * | ||
| 5 | * Copyright(c) 2008 Intel Corporation. All rights reserved. | ||
| 6 | * | ||
| 7 | * Authors: | ||
| 8 | * Jiang Zhe <zhe.jiang@intel.com> | ||
| 9 | * Wu Fengguang <wfg@linux.intel.com> | ||
| 10 | * | ||
| 11 | * Maintained by: | ||
| 12 | * Wu Fengguang <wfg@linux.intel.com> | ||
| 13 | * | ||
| 14 | * This program is free software; you can redistribute it and/or modify it | ||
| 15 | * under the terms of the GNU General Public License as published by the Free | ||
| 16 | * Software Foundation; either version 2 of the License, or (at your option) | ||
| 17 | * any later version. | ||
| 18 | * | ||
| 19 | * This program is distributed in the hope that it will be useful, but | ||
| 20 | * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY | ||
| 21 | * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
| 22 | * for more details. | ||
| 23 | * | ||
| 24 | * You should have received a copy of the GNU General Public License | ||
| 25 | * along with this program; if not, write to the Free Software Foundation, | ||
| 26 | * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | ||
| 27 | */ | ||
| 28 | |||
| 29 | #include <linux/init.h> | ||
| 30 | #include <linux/delay.h> | ||
| 31 | #include <linux/slab.h> | ||
| 32 | #include <sound/core.h> | ||
| 33 | #include "hda_codec.h" | ||
| 34 | #include "hda_local.h" | ||
| 35 | |||
| 36 | #define CVT_NID 0x02 /* audio converter */ | ||
| 37 | #define PIN_NID 0x03 /* HDMI output pin */ | ||
| 38 | |||
| 39 | #define INTEL_HDMI_EVENT_TAG 0x08 | ||
| 40 | |||
| 41 | struct intel_hdmi_spec { | ||
| 42 | struct hda_multi_out multiout; | ||
| 43 | struct hda_pcm pcm_rec; | ||
| 44 | struct hdmi_eld sink_eld; | ||
| 45 | }; | ||
| 46 | |||
| 47 | static struct hda_verb pinout_enable_verb[] = { | ||
| 48 | {PIN_NID, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, | ||
| 49 | {} /* terminator */ | ||
| 50 | }; | ||
| 51 | |||
| 52 | static struct hda_verb pinout_disable_verb[] = { | ||
| 53 | {PIN_NID, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x00}, | ||
| 54 | {} | ||
| 55 | }; | ||
| 56 | |||
| 57 | static struct hda_verb unsolicited_response_verb[] = { | ||
| 58 | {PIN_NID, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | | ||
| 59 | INTEL_HDMI_EVENT_TAG}, | ||
| 60 | {} | ||
| 61 | }; | ||
| 62 | |||
| 63 | static struct hda_verb def_chan_map[] = { | ||
| 64 | {CVT_NID, AC_VERB_SET_HDMI_CHAN_SLOT, 0x00}, | ||
| 65 | {CVT_NID, AC_VERB_SET_HDMI_CHAN_SLOT, 0x11}, | ||
| 66 | {CVT_NID, AC_VERB_SET_HDMI_CHAN_SLOT, 0x22}, | ||
| 67 | {CVT_NID, AC_VERB_SET_HDMI_CHAN_SLOT, 0x33}, | ||
| 68 | {CVT_NID, AC_VERB_SET_HDMI_CHAN_SLOT, 0x44}, | ||
| 69 | {CVT_NID, AC_VERB_SET_HDMI_CHAN_SLOT, 0x55}, | ||
| 70 | {CVT_NID, AC_VERB_SET_HDMI_CHAN_SLOT, 0x66}, | ||
| 71 | {CVT_NID, AC_VERB_SET_HDMI_CHAN_SLOT, 0x77}, | ||
| 72 | {} | ||
| 73 | }; | ||
| 74 | |||
| 75 | |||
| 76 | struct hdmi_audio_infoframe { | ||
| 77 | u8 type; /* 0x84 */ | ||
| 78 | u8 ver; /* 0x01 */ | ||
| 79 | u8 len; /* 0x0a */ | ||
| 80 | |||
| 81 | u8 checksum; /* PB0 */ | ||
| 82 | u8 CC02_CT47; /* CC in bits 0:2, CT in 4:7 */ | ||
| 83 | u8 SS01_SF24; | ||
| 84 | u8 CXT04; | ||
| 85 | u8 CA; | ||
| 86 | u8 LFEPBL01_LSV36_DM_INH7; | ||
| 87 | u8 reserved[5]; /* PB6 - PB10 */ | ||
| 88 | }; | ||
| 89 | |||
| 90 | /* | ||
| 91 | * CEA speaker placement: | ||
| 92 | * | ||
| 93 | * FLH FCH FRH | ||
| 94 | * FLW FL FLC FC FRC FR FRW | ||
| 95 | * | ||
| 96 | * LFE | ||
| 97 | * TC | ||
| 98 | * | ||
| 99 | * RL RLC RC RRC RR | ||
| 100 | * | ||
| 101 | * The Left/Right Surround channel _notions_ LS/RS in SMPTE 320M corresponds to | ||
| 102 | * CEA RL/RR; The SMPTE channel _assignment_ C/LFE is swapped to CEA LFE/FC. | ||
| 103 | */ | ||
| 104 | enum cea_speaker_placement { | ||
| 105 | FL = (1 << 0), /* Front Left */ | ||
| 106 | FC = (1 << 1), /* Front Center */ | ||
| 107 | FR = (1 << 2), /* Front Right */ | ||
| 108 | FLC = (1 << 3), /* Front Left Center */ | ||
| 109 | FRC = (1 << 4), /* Front Right Center */ | ||
| 110 | RL = (1 << 5), /* Rear Left */ | ||
| 111 | RC = (1 << 6), /* Rear Center */ | ||
| 112 | RR = (1 << 7), /* Rear Right */ | ||
| 113 | RLC = (1 << 8), /* Rear Left Center */ | ||
| 114 | RRC = (1 << 9), /* Rear Right Center */ | ||
| 115 | LFE = (1 << 10), /* Low Frequency Effect */ | ||
| 116 | FLW = (1 << 11), /* Front Left Wide */ | ||
| 117 | FRW = (1 << 12), /* Front Right Wide */ | ||
| 118 | FLH = (1 << 13), /* Front Left High */ | ||
| 119 | FCH = (1 << 14), /* Front Center High */ | ||
| 120 | FRH = (1 << 15), /* Front Right High */ | ||
| 121 | TC = (1 << 16), /* Top Center */ | ||
| 122 | }; | ||
| 123 | |||
| 124 | /* | ||
| 125 | * ELD SA bits in the CEA Speaker Allocation data block | ||
| 126 | */ | ||
| 127 | static int eld_speaker_allocation_bits[] = { | ||
| 128 | [0] = FL | FR, | ||
| 129 | [1] = LFE, | ||
| 130 | [2] = FC, | ||
| 131 | [3] = RL | RR, | ||
| 132 | [4] = RC, | ||
| 133 | [5] = FLC | FRC, | ||
| 134 | [6] = RLC | RRC, | ||
| 135 | /* the following are not defined in ELD yet */ | ||
| 136 | [7] = FLW | FRW, | ||
| 137 | [8] = FLH | FRH, | ||
| 138 | [9] = TC, | ||
| 139 | [10] = FCH, | ||
| 140 | }; | ||
| 141 | |||
| 142 | struct cea_channel_speaker_allocation { | ||
| 143 | int ca_index; | ||
| 144 | int speakers[8]; | ||
| 145 | |||
| 146 | /* derived values, just for convenience */ | ||
| 147 | int channels; | ||
| 148 | int spk_mask; | ||
| 149 | }; | ||
| 150 | |||
| 151 | /* | ||
| 152 | * This is an ordered list! | ||
| 153 | * | ||
| 154 | * The preceding ones have better chances to be selected by | ||
| 155 | * hdmi_setup_channel_allocation(). | ||
| 156 | */ | ||
| 157 | static struct cea_channel_speaker_allocation channel_allocations[] = { | ||
| 158 | /* channel: 8 7 6 5 4 3 2 1 */ | ||
| 159 | { .ca_index = 0x00, .speakers = { 0, 0, 0, 0, 0, 0, FR, FL } }, | ||
| 160 | /* 2.1 */ | ||
| 161 | { .ca_index = 0x01, .speakers = { 0, 0, 0, 0, 0, LFE, FR, FL } }, | ||
| 162 | /* Dolby Surround */ | ||
| 163 | { .ca_index = 0x02, .speakers = { 0, 0, 0, 0, FC, 0, FR, FL } }, | ||
| 164 | { .ca_index = 0x03, .speakers = { 0, 0, 0, 0, FC, LFE, FR, FL } }, | ||
| 165 | { .ca_index = 0x04, .speakers = { 0, 0, 0, RC, 0, 0, FR, FL } }, | ||
| 166 | { .ca_index = 0x05, .speakers = { 0, 0, 0, RC, 0, LFE, FR, FL } }, | ||
| 167 | { .ca_index = 0x06, .speakers = { 0, 0, 0, RC, FC, 0, FR, FL } }, | ||
| 168 | { .ca_index = 0x07, .speakers = { 0, 0, 0, RC, FC, LFE, FR, FL } }, | ||
| 169 | { .ca_index = 0x08, .speakers = { 0, 0, RR, RL, 0, 0, FR, FL } }, | ||
| 170 | { .ca_index = 0x09, .speakers = { 0, 0, RR, RL, 0, LFE, FR, FL } }, | ||
| 171 | { .ca_index = 0x0a, .speakers = { 0, 0, RR, RL, FC, 0, FR, FL } }, | ||
| 172 | /* 5.1 */ | ||
| 173 | { .ca_index = 0x0b, .speakers = { 0, 0, RR, RL, FC, LFE, FR, FL } }, | ||
| 174 | { .ca_index = 0x0c, .speakers = { 0, RC, RR, RL, 0, 0, FR, FL } }, | ||
| 175 | { .ca_index = 0x0d, .speakers = { 0, RC, RR, RL, 0, LFE, FR, FL } }, | ||
| 176 | { .ca_index = 0x0e, .speakers = { 0, RC, RR, RL, FC, 0, FR, FL } }, | ||
| 177 | /* 6.1 */ | ||
| 178 | { .ca_index = 0x0f, .speakers = { 0, RC, RR, RL, FC, LFE, FR, FL } }, | ||
| 179 | { .ca_index = 0x10, .speakers = { RRC, RLC, RR, RL, 0, 0, FR, FL } }, | ||
| 180 | { .ca_index = 0x11, .speakers = { RRC, RLC, RR, RL, 0, LFE, FR, FL } }, | ||
| 181 | { .ca_index = 0x12, .speakers = { RRC, RLC, RR, RL, FC, 0, FR, FL } }, | ||
| 182 | /* 7.1 */ | ||
| 183 | { .ca_index = 0x13, .speakers = { RRC, RLC, RR, RL, FC, LFE, FR, FL } }, | ||
| 184 | { .ca_index = 0x14, .speakers = { FRC, FLC, 0, 0, 0, 0, FR, FL } }, | ||
| 185 | { .ca_index = 0x15, .speakers = { FRC, FLC, 0, 0, 0, LFE, FR, FL } }, | ||
| 186 | { .ca_index = 0x16, .speakers = { FRC, FLC, 0, 0, FC, 0, FR, FL } }, | ||
| 187 | { .ca_index = 0x17, .speakers = { FRC, FLC, 0, 0, FC, LFE, FR, FL } }, | ||
| 188 | { .ca_index = 0x18, .speakers = { FRC, FLC, 0, RC, 0, 0, FR, FL } }, | ||
| 189 | { .ca_index = 0x19, .speakers = { FRC, FLC, 0, RC, 0, LFE, FR, FL } }, | ||
| 190 | { .ca_index = 0x1a, .speakers = { FRC, FLC, 0, RC, FC, 0, FR, FL } }, | ||
| 191 | { .ca_index = 0x1b, .speakers = { FRC, FLC, 0, RC, FC, LFE, FR, FL } }, | ||
| 192 | { .ca_index = 0x1c, .speakers = { FRC, FLC, RR, RL, 0, 0, FR, FL } }, | ||
| 193 | { .ca_index = 0x1d, .speakers = { FRC, FLC, RR, RL, 0, LFE, FR, FL } }, | ||
| 194 | { .ca_index = 0x1e, .speakers = { FRC, FLC, RR, RL, FC, 0, FR, FL } }, | ||
| 195 | { .ca_index = 0x1f, .speakers = { FRC, FLC, RR, RL, FC, LFE, FR, FL } }, | ||
| 196 | { .ca_index = 0x20, .speakers = { 0, FCH, RR, RL, FC, 0, FR, FL } }, | ||
| 197 | { .ca_index = 0x21, .speakers = { 0, FCH, RR, RL, FC, LFE, FR, FL } }, | ||
| 198 | { .ca_index = 0x22, .speakers = { TC, 0, RR, RL, FC, 0, FR, FL } }, | ||
| 199 | { .ca_index = 0x23, .speakers = { TC, 0, RR, RL, FC, LFE, FR, FL } }, | ||
| 200 | { .ca_index = 0x24, .speakers = { FRH, FLH, RR, RL, 0, 0, FR, FL } }, | ||
| 201 | { .ca_index = 0x25, .speakers = { FRH, FLH, RR, RL, 0, LFE, FR, FL } }, | ||
| 202 | { .ca_index = 0x26, .speakers = { FRW, FLW, RR, RL, 0, 0, FR, FL } }, | ||
| 203 | { .ca_index = 0x27, .speakers = { FRW, FLW, RR, RL, 0, LFE, FR, FL } }, | ||
| 204 | { .ca_index = 0x28, .speakers = { TC, RC, RR, RL, FC, 0, FR, FL } }, | ||
| 205 | { .ca_index = 0x29, .speakers = { TC, RC, RR, RL, FC, LFE, FR, FL } }, | ||
| 206 | { .ca_index = 0x2a, .speakers = { FCH, RC, RR, RL, FC, 0, FR, FL } }, | ||
| 207 | { .ca_index = 0x2b, .speakers = { FCH, RC, RR, RL, FC, LFE, FR, FL } }, | ||
| 208 | { .ca_index = 0x2c, .speakers = { TC, FCH, RR, RL, FC, 0, FR, FL } }, | ||
| 209 | { .ca_index = 0x2d, .speakers = { TC, FCH, RR, RL, FC, LFE, FR, FL } }, | ||
| 210 | { .ca_index = 0x2e, .speakers = { FRH, FLH, RR, RL, FC, 0, FR, FL } }, | ||
| 211 | { .ca_index = 0x2f, .speakers = { FRH, FLH, RR, RL, FC, LFE, FR, FL } }, | ||
| 212 | { .ca_index = 0x30, .speakers = { FRW, FLW, RR, RL, FC, 0, FR, FL } }, | ||
| 213 | { .ca_index = 0x31, .speakers = { FRW, FLW, RR, RL, FC, LFE, FR, FL } }, | ||
| 214 | }; | ||
| 215 | |||
| 216 | /* | ||
| 217 | * HDMI routines | ||
| 218 | */ | ||
| 219 | |||
| 220 | #ifdef BE_PARANOID | ||
| 221 | static void hdmi_get_dip_index(struct hda_codec *codec, hda_nid_t nid, | ||
| 222 | int *packet_index, int *byte_index) | ||
| 223 | { | ||
| 224 | int val; | ||
| 225 | |||
| 226 | val = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_HDMI_DIP_INDEX, 0); | ||
| 227 | |||
| 228 | *packet_index = val >> 5; | ||
| 229 | *byte_index = val & 0x1f; | ||
| 230 | } | ||
| 231 | #endif | ||
| 232 | |||
| 233 | static void hdmi_set_dip_index(struct hda_codec *codec, hda_nid_t nid, | ||
| 234 | int packet_index, int byte_index) | ||
| 235 | { | ||
| 236 | int val; | ||
| 237 | |||
| 238 | val = (packet_index << 5) | (byte_index & 0x1f); | ||
| 239 | |||
| 240 | snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_HDMI_DIP_INDEX, val); | ||
| 241 | } | ||
| 242 | |||
| 243 | static void hdmi_write_dip_byte(struct hda_codec *codec, hda_nid_t nid, | ||
| 244 | unsigned char val) | ||
| 245 | { | ||
| 246 | snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_HDMI_DIP_DATA, val); | ||
| 247 | } | ||
| 248 | |||
| 249 | static void hdmi_enable_output(struct hda_codec *codec) | ||
| 250 | { | ||
| 251 | /* Enable Audio InfoFrame Transmission */ | ||
| 252 | hdmi_set_dip_index(codec, PIN_NID, 0x0, 0x0); | ||
| 253 | snd_hda_codec_write(codec, PIN_NID, 0, AC_VERB_SET_HDMI_DIP_XMIT, | ||
| 254 | AC_DIPXMIT_BEST); | ||
| 255 | /* Unmute */ | ||
| 256 | if (get_wcaps(codec, PIN_NID) & AC_WCAP_OUT_AMP) | ||
| 257 | snd_hda_codec_write(codec, PIN_NID, 0, | ||
| 258 | AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE); | ||
| 259 | /* Enable pin out */ | ||
| 260 | snd_hda_sequence_write(codec, pinout_enable_verb); | ||
| 261 | } | ||
| 262 | |||
| 263 | static void hdmi_disable_output(struct hda_codec *codec) | ||
| 264 | { | ||
| 265 | snd_hda_sequence_write(codec, pinout_disable_verb); | ||
| 266 | if (get_wcaps(codec, PIN_NID) & AC_WCAP_OUT_AMP) | ||
| 267 | snd_hda_codec_write(codec, PIN_NID, 0, | ||
| 268 | AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE); | ||
| 269 | |||
| 270 | /* | ||
| 271 | * FIXME: noises may arise when playing music after reloading the | ||
| 272 | * kernel module, until the next X restart or monitor repower. | ||
| 273 | */ | ||
| 274 | } | ||
| 275 | |||
| 276 | static int hdmi_get_channel_count(struct hda_codec *codec) | ||
| 277 | { | ||
| 278 | return 1 + snd_hda_codec_read(codec, CVT_NID, 0, | ||
| 279 | AC_VERB_GET_CVT_CHAN_COUNT, 0); | ||
| 280 | } | ||
| 281 | |||
| 282 | static void hdmi_set_channel_count(struct hda_codec *codec, int chs) | ||
| 283 | { | ||
| 284 | snd_hda_codec_write(codec, CVT_NID, 0, | ||
| 285 | AC_VERB_SET_CVT_CHAN_COUNT, chs - 1); | ||
| 286 | |||
| 287 | if (chs != hdmi_get_channel_count(codec)) | ||
| 288 | snd_printd(KERN_INFO "HDMI channel count: expect %d, get %d\n", | ||
| 289 | chs, hdmi_get_channel_count(codec)); | ||
| 290 | } | ||
| 291 | |||
| 292 | static void hdmi_debug_channel_mapping(struct hda_codec *codec) | ||
| 293 | { | ||
| 294 | #ifdef CONFIG_SND_DEBUG_VERBOSE | ||
| 295 | int i; | ||
| 296 | int slot; | ||
| 297 | |||
| 298 | for (i = 0; i < 8; i++) { | ||
| 299 | slot = snd_hda_codec_read(codec, CVT_NID, 0, | ||
| 300 | AC_VERB_GET_HDMI_CHAN_SLOT, i); | ||
| 301 | printk(KERN_DEBUG "HDMI: ASP channel %d => slot %d\n", | ||
| 302 | slot >> 4, slot & 0x7); | ||
| 303 | } | ||
| 304 | #endif | ||
| 305 | } | ||
| 306 | |||
| 307 | static void hdmi_parse_eld(struct hda_codec *codec) | ||
| 308 | { | ||
| 309 | struct intel_hdmi_spec *spec = codec->spec; | ||
| 310 | struct hdmi_eld *eld = &spec->sink_eld; | ||
| 311 | |||
| 312 | if (!snd_hdmi_get_eld(eld, codec, PIN_NID)) | ||
| 313 | snd_hdmi_show_eld(eld); | ||
| 314 | } | ||
| 315 | |||
| 316 | |||
| 317 | /* | ||
| 318 | * Audio InfoFrame routines | ||
| 319 | */ | ||
| 320 | |||
| 321 | static void hdmi_debug_dip_size(struct hda_codec *codec) | ||
| 322 | { | ||
| 323 | #ifdef CONFIG_SND_DEBUG_VERBOSE | ||
| 324 | int i; | ||
| 325 | int size; | ||
| 326 | |||
| 327 | size = snd_hdmi_get_eld_size(codec, PIN_NID); | ||
| 328 | printk(KERN_DEBUG "HDMI: ELD buf size is %d\n", size); | ||
| 329 | |||
| 330 | for (i = 0; i < 8; i++) { | ||
| 331 | size = snd_hda_codec_read(codec, PIN_NID, 0, | ||
| 332 | AC_VERB_GET_HDMI_DIP_SIZE, i); | ||
| 333 | printk(KERN_DEBUG "HDMI: DIP GP[%d] buf size is %d\n", i, size); | ||
| 334 | } | ||
| 335 | #endif | ||
| 336 | } | ||
| 337 | |||
| 338 | static void hdmi_clear_dip_buffers(struct hda_codec *codec) | ||
| 339 | { | ||
| 340 | #ifdef BE_PARANOID | ||
| 341 | int i, j; | ||
| 342 | int size; | ||
| 343 | int pi, bi; | ||
| 344 | for (i = 0; i < 8; i++) { | ||
| 345 | size = snd_hda_codec_read(codec, PIN_NID, 0, | ||
| 346 | AC_VERB_GET_HDMI_DIP_SIZE, i); | ||
| 347 | if (size == 0) | ||
| 348 | continue; | ||
| 349 | |||
| 350 | hdmi_set_dip_index(codec, PIN_NID, i, 0x0); | ||
| 351 | for (j = 1; j < 1000; j++) { | ||
| 352 | hdmi_write_dip_byte(codec, PIN_NID, 0x0); | ||
| 353 | hdmi_get_dip_index(codec, PIN_NID, &pi, &bi); | ||
| 354 | if (pi != i) | ||
| 355 | snd_printd(KERN_INFO "dip index %d: %d != %d\n", | ||
| 356 | bi, pi, i); | ||
| 357 | if (bi == 0) /* byte index wrapped around */ | ||
| 358 | break; | ||
| 359 | } | ||
| 360 | snd_printd(KERN_INFO | ||
| 361 | "HDMI: DIP GP[%d] buf reported size=%d, written=%d\n", | ||
| 362 | i, size, j); | ||
| 363 | } | ||
| 364 | #endif | ||
| 365 | } | ||
| 366 | |||
| 367 | static void hdmi_fill_audio_infoframe(struct hda_codec *codec, | ||
| 368 | struct hdmi_audio_infoframe *ai) | ||
| 369 | { | ||
| 370 | u8 *params = (u8 *)ai; | ||
| 371 | int i; | ||
| 372 | |||
| 373 | hdmi_debug_dip_size(codec); | ||
| 374 | hdmi_clear_dip_buffers(codec); /* be paranoid */ | ||
| 375 | |||
| 376 | hdmi_set_dip_index(codec, PIN_NID, 0x0, 0x0); | ||
| 377 | for (i = 0; i < sizeof(ai); i++) | ||
| 378 | hdmi_write_dip_byte(codec, PIN_NID, params[i]); | ||
| 379 | } | ||
| 380 | |||
| 381 | /* | ||
| 382 | * Compute derived values in channel_allocations[]. | ||
| 383 | */ | ||
| 384 | static void init_channel_allocations(void) | ||
| 385 | { | ||
| 386 | int i, j; | ||
| 387 | struct cea_channel_speaker_allocation *p; | ||
| 388 | |||
| 389 | for (i = 0; i < ARRAY_SIZE(channel_allocations); i++) { | ||
| 390 | p = channel_allocations + i; | ||
| 391 | p->channels = 0; | ||
| 392 | p->spk_mask = 0; | ||
| 393 | for (j = 0; j < ARRAY_SIZE(p->speakers); j++) | ||
| 394 | if (p->speakers[j]) { | ||
| 395 | p->channels++; | ||
| 396 | p->spk_mask |= p->speakers[j]; | ||
| 397 | } | ||
| 398 | } | ||
| 399 | } | ||
| 400 | |||
| 401 | /* | ||
| 402 | * The transformation takes two steps: | ||
| 403 | * | ||
| 404 | * eld->spk_alloc => (eld_speaker_allocation_bits[]) => spk_mask | ||
| 405 | * spk_mask => (channel_allocations[]) => ai->CA | ||
| 406 | * | ||
| 407 | * TODO: it could select the wrong CA from multiple candidates. | ||
| 408 | */ | ||
| 409 | static int hdmi_setup_channel_allocation(struct hda_codec *codec, | ||
| 410 | struct hdmi_audio_infoframe *ai) | ||
| 411 | { | ||
| 412 | struct intel_hdmi_spec *spec = codec->spec; | ||
| 413 | struct hdmi_eld *eld = &spec->sink_eld; | ||
| 414 | int i; | ||
| 415 | int spk_mask = 0; | ||
| 416 | int channels = 1 + (ai->CC02_CT47 & 0x7); | ||
| 417 | char buf[SND_PRINT_CHANNEL_ALLOCATION_ADVISED_BUFSIZE]; | ||
| 418 | |||
| 419 | /* | ||
| 420 | * CA defaults to 0 for basic stereo audio | ||
| 421 | */ | ||
| 422 | if (!eld->eld_ver) | ||
| 423 | return 0; | ||
| 424 | if (!eld->spk_alloc) | ||
| 425 | return 0; | ||
| 426 | if (channels <= 2) | ||
| 427 | return 0; | ||
| 428 | |||
| 429 | /* | ||
| 430 | * expand ELD's speaker allocation mask | ||
| 431 | * | ||
| 432 | * ELD tells the speaker mask in a compact(paired) form, | ||
| 433 | * expand ELD's notions to match the ones used by Audio InfoFrame. | ||
| 434 | */ | ||
| 435 | for (i = 0; i < ARRAY_SIZE(eld_speaker_allocation_bits); i++) { | ||
| 436 | if (eld->spk_alloc & (1 << i)) | ||
| 437 | spk_mask |= eld_speaker_allocation_bits[i]; | ||
| 438 | } | ||
| 439 | |||
| 440 | /* search for the first working match in the CA table */ | ||
| 441 | for (i = 0; i < ARRAY_SIZE(channel_allocations); i++) { | ||
| 442 | if (channels == channel_allocations[i].channels && | ||
| 443 | (spk_mask & channel_allocations[i].spk_mask) == | ||
| 444 | channel_allocations[i].spk_mask) { | ||
| 445 | ai->CA = channel_allocations[i].ca_index; | ||
| 446 | break; | ||
| 447 | } | ||
| 448 | } | ||
| 449 | |||
| 450 | snd_print_channel_allocation(eld->spk_alloc, buf, sizeof(buf)); | ||
| 451 | snd_printdd(KERN_INFO | ||
| 452 | "HDMI: select CA 0x%x for %d-channel allocation: %s\n", | ||
| 453 | ai->CA, channels, buf); | ||
| 454 | |||
| 455 | return ai->CA; | ||
| 456 | } | ||
| 457 | |||
| 458 | static void hdmi_setup_channel_mapping(struct hda_codec *codec, | ||
| 459 | struct hdmi_audio_infoframe *ai) | ||
| 460 | { | ||
| 461 | if (!ai->CA) | ||
| 462 | return; | ||
| 463 | |||
| 464 | /* | ||
| 465 | * TODO: adjust channel mapping if necessary | ||
| 466 | * ALSA sequence is front/surr/clfe/side? | ||
| 467 | */ | ||
| 468 | |||
| 469 | snd_hda_sequence_write(codec, def_chan_map); | ||
| 470 | hdmi_debug_channel_mapping(codec); | ||
| 471 | } | ||
| 472 | |||
| 473 | |||
| 474 | static void hdmi_setup_audio_infoframe(struct hda_codec *codec, | ||
| 475 | struct snd_pcm_substream *substream) | ||
| 476 | { | ||
| 477 | struct hdmi_audio_infoframe ai = { | ||
| 478 | .type = 0x84, | ||
| 479 | .ver = 0x01, | ||
| 480 | .len = 0x0a, | ||
| 481 | .CC02_CT47 = substream->runtime->channels - 1, | ||
| 482 | }; | ||
| 483 | |||
| 484 | hdmi_setup_channel_allocation(codec, &ai); | ||
| 485 | hdmi_setup_channel_mapping(codec, &ai); | ||
| 486 | |||
| 487 | hdmi_fill_audio_infoframe(codec, &ai); | ||
| 488 | } | ||
| 489 | |||
| 490 | |||
| 491 | /* | ||
| 492 | * Unsolicited events | ||
| 493 | */ | ||
| 494 | |||
| 495 | static void hdmi_intrinsic_event(struct hda_codec *codec, unsigned int res) | ||
| 496 | { | ||
| 497 | int pind = !!(res & AC_UNSOL_RES_PD); | ||
| 498 | int eldv = !!(res & AC_UNSOL_RES_ELDV); | ||
| 499 | |||
| 500 | printk(KERN_INFO | ||
| 501 | "HDMI hot plug event: Presence_Detect=%d ELD_Valid=%d\n", | ||
| 502 | pind, eldv); | ||
| 503 | |||
| 504 | if (pind && eldv) { | ||
| 505 | hdmi_parse_eld(codec); | ||
| 506 | /* TODO: do real things about ELD */ | ||
| 507 | } | ||
| 508 | } | ||
| 509 | |||
| 510 | static void hdmi_non_intrinsic_event(struct hda_codec *codec, unsigned int res) | ||
| 511 | { | ||
| 512 | int subtag = (res & AC_UNSOL_RES_SUBTAG) >> AC_UNSOL_RES_SUBTAG_SHIFT; | ||
| 513 | int cp_state = !!(res & AC_UNSOL_RES_CP_STATE); | ||
| 514 | int cp_ready = !!(res & AC_UNSOL_RES_CP_READY); | ||
| 515 | |||
| 516 | printk(KERN_INFO | ||
| 517 | "HDMI content protection event: SUBTAG=0x%x CP_STATE=%d CP_READY=%d\n", | ||
| 518 | subtag, | ||
| 519 | cp_state, | ||
| 520 | cp_ready); | ||
| 521 | |||
| 522 | /* TODO */ | ||
| 523 | if (cp_state) | ||
| 524 | ; | ||
| 525 | if (cp_ready) | ||
| 526 | ; | ||
| 527 | } | ||
| 528 | |||
| 529 | |||
| 530 | static void intel_hdmi_unsol_event(struct hda_codec *codec, unsigned int res) | ||
| 531 | { | ||
| 532 | int tag = res >> AC_UNSOL_RES_TAG_SHIFT; | ||
| 533 | int subtag = (res & AC_UNSOL_RES_SUBTAG) >> AC_UNSOL_RES_SUBTAG_SHIFT; | ||
| 534 | |||
| 535 | if (tag != INTEL_HDMI_EVENT_TAG) { | ||
| 536 | snd_printd(KERN_INFO "Unexpected HDMI event tag 0x%x\n", tag); | ||
| 537 | return; | ||
| 538 | } | ||
| 539 | |||
| 540 | if (subtag == 0) | ||
| 541 | hdmi_intrinsic_event(codec, res); | ||
| 542 | else | ||
| 543 | hdmi_non_intrinsic_event(codec, res); | ||
| 544 | } | ||
| 545 | |||
| 546 | /* | ||
| 547 | * Callbacks | ||
| 548 | */ | ||
| 549 | |||
| 550 | static int intel_hdmi_playback_pcm_open(struct hda_pcm_stream *hinfo, | ||
| 551 | struct hda_codec *codec, | ||
| 552 | struct snd_pcm_substream *substream) | ||
| 553 | { | ||
| 554 | struct intel_hdmi_spec *spec = codec->spec; | ||
| 555 | |||
| 556 | return snd_hda_multi_out_dig_open(codec, &spec->multiout); | ||
| 557 | } | ||
| 558 | |||
| 559 | static int intel_hdmi_playback_pcm_close(struct hda_pcm_stream *hinfo, | ||
| 560 | struct hda_codec *codec, | ||
| 561 | struct snd_pcm_substream *substream) | ||
| 562 | { | ||
| 563 | struct intel_hdmi_spec *spec = codec->spec; | ||
| 564 | |||
| 565 | hdmi_disable_output(codec); | ||
| 566 | |||
| 567 | return snd_hda_multi_out_dig_close(codec, &spec->multiout); | ||
| 568 | } | ||
| 569 | |||
| 570 | static int intel_hdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo, | ||
| 571 | struct hda_codec *codec, | ||
| 572 | unsigned int stream_tag, | ||
| 573 | unsigned int format, | ||
| 574 | struct snd_pcm_substream *substream) | ||
| 575 | { | ||
| 576 | struct intel_hdmi_spec *spec = codec->spec; | ||
| 577 | |||
| 578 | snd_hda_multi_out_dig_prepare(codec, &spec->multiout, stream_tag, | ||
| 579 | format, substream); | ||
| 580 | |||
| 581 | hdmi_set_channel_count(codec, substream->runtime->channels); | ||
| 582 | |||
| 583 | hdmi_setup_audio_infoframe(codec, substream); | ||
| 584 | |||
| 585 | hdmi_enable_output(codec); | ||
| 586 | |||
| 587 | return 0; | ||
| 588 | } | ||
| 589 | |||
| 590 | static struct hda_pcm_stream intel_hdmi_pcm_playback = { | ||
| 591 | .substreams = 1, | ||
| 592 | .channels_min = 2, | ||
| 593 | .channels_max = 8, | ||
| 594 | .nid = CVT_NID, /* NID to query formats and rates and setup streams */ | ||
| 595 | .ops = { | ||
| 596 | .open = intel_hdmi_playback_pcm_open, | ||
| 597 | .close = intel_hdmi_playback_pcm_close, | ||
| 598 | .prepare = intel_hdmi_playback_pcm_prepare | ||
| 599 | }, | ||
| 600 | }; | ||
| 601 | |||
| 602 | static int intel_hdmi_build_pcms(struct hda_codec *codec) | ||
| 603 | { | ||
| 604 | struct intel_hdmi_spec *spec = codec->spec; | ||
| 605 | struct hda_pcm *info = &spec->pcm_rec; | ||
| 606 | |||
| 607 | codec->num_pcms = 1; | ||
| 608 | codec->pcm_info = info; | ||
| 609 | |||
| 610 | info->name = "INTEL HDMI"; | ||
| 611 | info->pcm_type = HDA_PCM_TYPE_HDMI; | ||
| 612 | info->stream[SNDRV_PCM_STREAM_PLAYBACK] = intel_hdmi_pcm_playback; | ||
| 613 | |||
| 614 | return 0; | ||
| 615 | } | ||
| 616 | |||
| 617 | static int intel_hdmi_build_controls(struct hda_codec *codec) | ||
| 618 | { | ||
| 619 | struct intel_hdmi_spec *spec = codec->spec; | ||
| 620 | int err; | ||
| 621 | |||
| 622 | err = snd_hda_create_spdif_out_ctls(codec, spec->multiout.dig_out_nid); | ||
| 623 | if (err < 0) | ||
| 624 | return err; | ||
| 625 | |||
| 626 | return 0; | ||
| 627 | } | ||
| 628 | |||
| 629 | static int intel_hdmi_init(struct hda_codec *codec) | ||
| 630 | { | ||
| 631 | /* disable audio output as early as possible */ | ||
| 632 | hdmi_disable_output(codec); | ||
| 633 | |||
| 634 | snd_hda_sequence_write(codec, unsolicited_response_verb); | ||
| 635 | |||
| 636 | return 0; | ||
| 637 | } | ||
| 638 | |||
| 639 | static void intel_hdmi_free(struct hda_codec *codec) | ||
| 640 | { | ||
| 641 | struct intel_hdmi_spec *spec = codec->spec; | ||
| 642 | |||
| 643 | snd_hda_eld_proc_free(codec, &spec->sink_eld); | ||
| 644 | kfree(spec); | ||
| 645 | } | ||
| 646 | |||
| 647 | static struct hda_codec_ops intel_hdmi_patch_ops = { | ||
| 648 | .init = intel_hdmi_init, | ||
| 649 | .free = intel_hdmi_free, | ||
| 650 | .build_pcms = intel_hdmi_build_pcms, | ||
| 651 | .build_controls = intel_hdmi_build_controls, | ||
| 652 | .unsol_event = intel_hdmi_unsol_event, | ||
| 653 | }; | ||
| 654 | |||
| 655 | static int patch_intel_hdmi(struct hda_codec *codec) | ||
| 656 | { | ||
| 657 | struct intel_hdmi_spec *spec; | ||
| 658 | |||
| 659 | spec = kzalloc(sizeof(*spec), GFP_KERNEL); | ||
| 660 | if (spec == NULL) | ||
| 661 | return -ENOMEM; | ||
| 662 | |||
| 663 | spec->multiout.num_dacs = 0; /* no analog */ | ||
| 664 | spec->multiout.max_channels = 8; | ||
| 665 | spec->multiout.dig_out_nid = CVT_NID; | ||
| 666 | |||
| 667 | codec->spec = spec; | ||
| 668 | codec->patch_ops = intel_hdmi_patch_ops; | ||
| 669 | |||
| 670 | snd_hda_eld_proc_new(codec, &spec->sink_eld); | ||
| 671 | |||
| 672 | init_channel_allocations(); | ||
| 673 | |||
| 674 | return 0; | ||
| 675 | } | ||
| 676 | |||
| 677 | static struct hda_codec_preset snd_hda_preset_intelhdmi[] = { | ||
| 678 | { .id = 0x808629fb, .name = "G45 DEVCL", .patch = patch_intel_hdmi }, | ||
| 679 | { .id = 0x80862801, .name = "G45 DEVBLC", .patch = patch_intel_hdmi }, | ||
| 680 | { .id = 0x80862802, .name = "G45 DEVCTG", .patch = patch_intel_hdmi }, | ||
| 681 | { .id = 0x80862803, .name = "G45 DEVELK", .patch = patch_intel_hdmi }, | ||
| 682 | { .id = 0x10951392, .name = "SiI1392 HDMI", .patch = patch_intel_hdmi }, | ||
| 683 | {} /* terminator */ | ||
| 684 | }; | ||
| 685 | |||
| 686 | MODULE_ALIAS("snd-hda-codec-id:808629fb"); | ||
| 687 | MODULE_ALIAS("snd-hda-codec-id:80862801"); | ||
| 688 | MODULE_ALIAS("snd-hda-codec-id:80862802"); | ||
| 689 | MODULE_ALIAS("snd-hda-codec-id:80862803"); | ||
| 690 | MODULE_ALIAS("snd-hda-codec-id:10951392"); | ||
| 691 | |||
| 692 | MODULE_LICENSE("GPL"); | ||
| 693 | MODULE_DESCRIPTION("Intel HDMI HD-audio codec"); | ||
| 694 | |||
| 695 | static struct hda_codec_preset_list intel_list = { | ||
| 696 | .preset = snd_hda_preset_intelhdmi, | ||
| 697 | .owner = THIS_MODULE, | ||
| 698 | }; | ||
| 699 | |||
| 700 | static int __init patch_intelhdmi_init(void) | ||
| 701 | { | ||
| 702 | return snd_hda_add_codec_preset(&intel_list); | ||
| 703 | } | ||
| 704 | |||
| 705 | static void __exit patch_intelhdmi_exit(void) | ||
| 706 | { | ||
| 707 | snd_hda_delete_codec_preset(&intel_list); | ||
| 708 | } | ||
| 709 | |||
| 710 | module_init(patch_intelhdmi_init) | ||
| 711 | module_exit(patch_intelhdmi_exit) | ||
diff --git a/sound/pci/hda/patch_nvhdmi.c b/sound/pci/hda/patch_nvhdmi.c index 2eed2c8b98da..0270fda0bda5 100644 --- a/sound/pci/hda/patch_nvhdmi.c +++ b/sound/pci/hda/patch_nvhdmi.c | |||
| @@ -158,8 +158,34 @@ static int patch_nvhdmi(struct hda_codec *codec) | |||
| 158 | /* | 158 | /* |
| 159 | * patch entries | 159 | * patch entries |
| 160 | */ | 160 | */ |
| 161 | struct hda_codec_preset snd_hda_preset_nvhdmi[] = { | 161 | static struct hda_codec_preset snd_hda_preset_nvhdmi[] = { |
| 162 | { .id = 0x10de0002, .name = "NVIDIA MCP78 HDMI", .patch = patch_nvhdmi }, | 162 | { .id = 0x10de0002, .name = "MCP78 HDMI", .patch = patch_nvhdmi }, |
| 163 | { .id = 0x10de0007, .name = "NVIDIA MCP7A HDMI", .patch = patch_nvhdmi }, | 163 | { .id = 0x10de0007, .name = "MCP7A HDMI", .patch = patch_nvhdmi }, |
| 164 | { .id = 0x10de0067, .name = "MCP67 HDMI", .patch = patch_nvhdmi }, | ||
| 164 | {} /* terminator */ | 165 | {} /* terminator */ |
| 165 | }; | 166 | }; |
| 167 | |||
| 168 | MODULE_ALIAS("snd-hda-codec-id:10de0002"); | ||
| 169 | MODULE_ALIAS("snd-hda-codec-id:10de0007"); | ||
| 170 | MODULE_ALIAS("snd-hda-codec-id:10de0067"); | ||
| 171 | |||
| 172 | MODULE_LICENSE("GPL"); | ||
| 173 | MODULE_DESCRIPTION("Nvidia HDMI HD-audio codec"); | ||
| 174 | |||
| 175 | static struct hda_codec_preset_list nvhdmi_list = { | ||
| 176 | .preset = snd_hda_preset_nvhdmi, | ||
| 177 | .owner = THIS_MODULE, | ||
| 178 | }; | ||
| 179 | |||
| 180 | static int __init patch_nvhdmi_init(void) | ||
| 181 | { | ||
| 182 | return snd_hda_add_codec_preset(&nvhdmi_list); | ||
| 183 | } | ||
| 184 | |||
| 185 | static void __exit patch_nvhdmi_exit(void) | ||
| 186 | { | ||
| 187 | snd_hda_delete_codec_preset(&nvhdmi_list); | ||
| 188 | } | ||
| 189 | |||
| 190 | module_init(patch_nvhdmi_init) | ||
| 191 | module_exit(patch_nvhdmi_exit) | ||
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index a378c0145125..0bd4e6bf354d 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | #include <sound/core.h> | 30 | #include <sound/core.h> |
| 31 | #include "hda_codec.h" | 31 | #include "hda_codec.h" |
| 32 | #include "hda_local.h" | 32 | #include "hda_local.h" |
| 33 | #include "hda_patch.h" | ||
| 34 | 33 | ||
| 35 | #define ALC880_FRONT_EVENT 0x01 | 34 | #define ALC880_FRONT_EVENT 0x01 |
| 36 | #define ALC880_DCVOL_EVENT 0x02 | 35 | #define ALC880_DCVOL_EVENT 0x02 |
| @@ -114,6 +113,7 @@ enum { | |||
| 114 | ALC268_3ST, | 113 | ALC268_3ST, |
| 115 | ALC268_TOSHIBA, | 114 | ALC268_TOSHIBA, |
| 116 | ALC268_ACER, | 115 | ALC268_ACER, |
| 116 | ALC268_ACER_DMIC, | ||
| 117 | ALC268_ACER_ASPIRE_ONE, | 117 | ALC268_ACER_ASPIRE_ONE, |
| 118 | ALC268_DELL, | 118 | ALC268_DELL, |
| 119 | ALC268_ZEPTO, | 119 | ALC268_ZEPTO, |
| @@ -130,6 +130,8 @@ enum { | |||
| 130 | ALC269_QUANTA_FL1, | 130 | ALC269_QUANTA_FL1, |
| 131 | ALC269_ASUS_EEEPC_P703, | 131 | ALC269_ASUS_EEEPC_P703, |
| 132 | ALC269_ASUS_EEEPC_P901, | 132 | ALC269_ASUS_EEEPC_P901, |
| 133 | ALC269_FUJITSU, | ||
| 134 | ALC269_LIFEBOOK, | ||
| 133 | ALC269_AUTO, | 135 | ALC269_AUTO, |
| 134 | ALC269_MODEL_LAST /* last tag */ | 136 | ALC269_MODEL_LAST /* last tag */ |
| 135 | }; | 137 | }; |
| @@ -152,6 +154,7 @@ enum { | |||
| 152 | enum { | 154 | enum { |
| 153 | ALC660VD_3ST, | 155 | ALC660VD_3ST, |
| 154 | ALC660VD_3ST_DIG, | 156 | ALC660VD_3ST_DIG, |
| 157 | ALC660VD_ASUS_V1S, | ||
| 155 | ALC861VD_3ST, | 158 | ALC861VD_3ST, |
| 156 | ALC861VD_3ST_DIG, | 159 | ALC861VD_3ST_DIG, |
| 157 | ALC861VD_6ST_DIG, | 160 | ALC861VD_6ST_DIG, |
| @@ -212,6 +215,7 @@ enum { | |||
| 212 | ALC883_TARGA_2ch_DIG, | 215 | ALC883_TARGA_2ch_DIG, |
| 213 | ALC883_ACER, | 216 | ALC883_ACER, |
| 214 | ALC883_ACER_ASPIRE, | 217 | ALC883_ACER_ASPIRE, |
| 218 | ALC888_ACER_ASPIRE_4930G, | ||
| 215 | ALC883_MEDION, | 219 | ALC883_MEDION, |
| 216 | ALC883_MEDION_MD2, | 220 | ALC883_MEDION_MD2, |
| 217 | ALC883_LAPTOP_EAPD, | 221 | ALC883_LAPTOP_EAPD, |
| @@ -225,9 +229,11 @@ enum { | |||
| 225 | ALC883_MITAC, | 229 | ALC883_MITAC, |
| 226 | ALC883_CLEVO_M720, | 230 | ALC883_CLEVO_M720, |
| 227 | ALC883_FUJITSU_PI2515, | 231 | ALC883_FUJITSU_PI2515, |
| 232 | ALC888_FUJITSU_XA3530, | ||
| 228 | ALC883_3ST_6ch_INTEL, | 233 | ALC883_3ST_6ch_INTEL, |
| 229 | ALC888_ASUS_M90V, | 234 | ALC888_ASUS_M90V, |
| 230 | ALC888_ASUS_EEE1601, | 235 | ALC888_ASUS_EEE1601, |
| 236 | ALC1200_ASUS_P5Q, | ||
| 231 | ALC883_AUTO, | 237 | ALC883_AUTO, |
| 232 | ALC883_MODEL_LAST, | 238 | ALC883_MODEL_LAST, |
| 233 | }; | 239 | }; |
| @@ -239,6 +245,7 @@ struct alc_spec { | |||
| 239 | /* codec parameterization */ | 245 | /* codec parameterization */ |
| 240 | struct snd_kcontrol_new *mixers[5]; /* mixer arrays */ | 246 | struct snd_kcontrol_new *mixers[5]; /* mixer arrays */ |
| 241 | unsigned int num_mixers; | 247 | unsigned int num_mixers; |
| 248 | struct snd_kcontrol_new *cap_mixer; /* capture mixer */ | ||
| 242 | 249 | ||
| 243 | const struct hda_verb *init_verbs[5]; /* initialization verbs | 250 | const struct hda_verb *init_verbs[5]; /* initialization verbs |
| 244 | * don't forget NULL | 251 | * don't forget NULL |
| @@ -268,6 +275,7 @@ struct alc_spec { | |||
| 268 | hda_nid_t *adc_nids; | 275 | hda_nid_t *adc_nids; |
| 269 | hda_nid_t *capsrc_nids; | 276 | hda_nid_t *capsrc_nids; |
| 270 | hda_nid_t dig_in_nid; /* digital-in NID; optional */ | 277 | hda_nid_t dig_in_nid; /* digital-in NID; optional */ |
| 278 | unsigned char is_mix_capture; /* matrix-style capture (non-mux) */ | ||
| 271 | 279 | ||
| 272 | /* capture source */ | 280 | /* capture source */ |
| 273 | unsigned int num_mux_defs; | 281 | unsigned int num_mux_defs; |
| @@ -284,8 +292,7 @@ struct alc_spec { | |||
| 284 | 292 | ||
| 285 | /* dynamic controls, init_verbs and input_mux */ | 293 | /* dynamic controls, init_verbs and input_mux */ |
| 286 | struct auto_pin_cfg autocfg; | 294 | struct auto_pin_cfg autocfg; |
| 287 | unsigned int num_kctl_alloc, num_kctl_used; | 295 | struct snd_array kctls; |
| 288 | struct snd_kcontrol_new *kctl_alloc; | ||
| 289 | struct hda_input_mux private_imux; | 296 | struct hda_input_mux private_imux; |
| 290 | hda_nid_t private_dac_nids[AUTO_CFG_MAX_OUTS]; | 297 | hda_nid_t private_dac_nids[AUTO_CFG_MAX_OUTS]; |
| 291 | 298 | ||
| @@ -323,6 +330,7 @@ struct alc_config_preset { | |||
| 323 | struct snd_kcontrol_new *mixers[5]; /* should be identical size | 330 | struct snd_kcontrol_new *mixers[5]; /* should be identical size |
| 324 | * with spec | 331 | * with spec |
| 325 | */ | 332 | */ |
| 333 | struct snd_kcontrol_new *cap_mixer; /* capture mixer */ | ||
| 326 | const struct hda_verb *init_verbs[5]; | 334 | const struct hda_verb *init_verbs[5]; |
| 327 | unsigned int num_dacs; | 335 | unsigned int num_dacs; |
| 328 | hda_nid_t *dac_nids; | 336 | hda_nid_t *dac_nids; |
| @@ -375,14 +383,39 @@ static int alc_mux_enum_put(struct snd_kcontrol *kcontrol, | |||
| 375 | { | 383 | { |
| 376 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); | 384 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); |
| 377 | struct alc_spec *spec = codec->spec; | 385 | struct alc_spec *spec = codec->spec; |
| 386 | const struct hda_input_mux *imux; | ||
| 378 | unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id); | 387 | unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id); |
| 379 | unsigned int mux_idx = adc_idx >= spec->num_mux_defs ? 0 : adc_idx; | 388 | unsigned int mux_idx; |
| 380 | hda_nid_t nid = spec->capsrc_nids ? | 389 | hda_nid_t nid = spec->capsrc_nids ? |
| 381 | spec->capsrc_nids[adc_idx] : spec->adc_nids[adc_idx]; | 390 | spec->capsrc_nids[adc_idx] : spec->adc_nids[adc_idx]; |
| 382 | return snd_hda_input_mux_put(codec, &spec->input_mux[mux_idx], ucontrol, | ||
| 383 | nid, &spec->cur_mux[adc_idx]); | ||
| 384 | } | ||
| 385 | 391 | ||
| 392 | mux_idx = adc_idx >= spec->num_mux_defs ? 0 : adc_idx; | ||
| 393 | imux = &spec->input_mux[mux_idx]; | ||
| 394 | |||
| 395 | if (spec->is_mix_capture) { | ||
| 396 | /* Matrix-mixer style (e.g. ALC882) */ | ||
| 397 | unsigned int *cur_val = &spec->cur_mux[adc_idx]; | ||
| 398 | unsigned int i, idx; | ||
| 399 | |||
| 400 | idx = ucontrol->value.enumerated.item[0]; | ||
| 401 | if (idx >= imux->num_items) | ||
| 402 | idx = imux->num_items - 1; | ||
| 403 | if (*cur_val == idx) | ||
| 404 | return 0; | ||
| 405 | for (i = 0; i < imux->num_items; i++) { | ||
| 406 | unsigned int v = (i == idx) ? 0 : HDA_AMP_MUTE; | ||
| 407 | snd_hda_codec_amp_stereo(codec, nid, HDA_INPUT, | ||
| 408 | imux->items[i].index, | ||
| 409 | HDA_AMP_MUTE, v); | ||
| 410 | } | ||
| 411 | *cur_val = idx; | ||
| 412 | return 1; | ||
| 413 | } else { | ||
| 414 | /* MUX style (e.g. ALC880) */ | ||
| 415 | return snd_hda_input_mux_put(codec, imux, ucontrol, nid, | ||
| 416 | &spec->cur_mux[adc_idx]); | ||
| 417 | } | ||
| 418 | } | ||
| 386 | 419 | ||
| 387 | /* | 420 | /* |
| 388 | * channel mode setting | 421 | * channel mode setting |
| @@ -717,6 +750,43 @@ static int alc_eapd_ctrl_put(struct snd_kcontrol *kcontrol, | |||
| 717 | #endif /* CONFIG_SND_DEBUG */ | 750 | #endif /* CONFIG_SND_DEBUG */ |
| 718 | 751 | ||
| 719 | /* | 752 | /* |
| 753 | */ | ||
| 754 | static void add_mixer(struct alc_spec *spec, struct snd_kcontrol_new *mix) | ||
| 755 | { | ||
| 756 | if (snd_BUG_ON(spec->num_mixers >= ARRAY_SIZE(spec->mixers))) | ||
| 757 | return; | ||
| 758 | spec->mixers[spec->num_mixers++] = mix; | ||
| 759 | } | ||
| 760 | |||
| 761 | static void add_verb(struct alc_spec *spec, const struct hda_verb *verb) | ||
| 762 | { | ||
| 763 | if (snd_BUG_ON(spec->num_init_verbs >= ARRAY_SIZE(spec->init_verbs))) | ||
| 764 | return; | ||
| 765 | spec->init_verbs[spec->num_init_verbs++] = verb; | ||
| 766 | } | ||
| 767 | |||
| 768 | #ifdef CONFIG_PROC_FS | ||
| 769 | /* | ||
| 770 | * hook for proc | ||
| 771 | */ | ||
| 772 | static void print_realtek_coef(struct snd_info_buffer *buffer, | ||
| 773 | struct hda_codec *codec, hda_nid_t nid) | ||
| 774 | { | ||
| 775 | int coeff; | ||
| 776 | |||
| 777 | if (nid != 0x20) | ||
| 778 | return; | ||
| 779 | coeff = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_PROC_COEF, 0); | ||
| 780 | snd_iprintf(buffer, " Processing Coefficient: 0x%02x\n", coeff); | ||
| 781 | coeff = snd_hda_codec_read(codec, nid, 0, | ||
| 782 | AC_VERB_GET_COEF_INDEX, 0); | ||
| 783 | snd_iprintf(buffer, " Coefficient Index: 0x%02x\n", coeff); | ||
| 784 | } | ||
| 785 | #else | ||
| 786 | #define print_realtek_coef NULL | ||
| 787 | #endif | ||
| 788 | |||
| 789 | /* | ||
| 720 | * set up from the preset table | 790 | * set up from the preset table |
| 721 | */ | 791 | */ |
| 722 | static void setup_preset(struct alc_spec *spec, | 792 | static void setup_preset(struct alc_spec *spec, |
| @@ -725,11 +795,11 @@ static void setup_preset(struct alc_spec *spec, | |||
| 725 | int i; | 795 | int i; |
| 726 | 796 | ||
| 727 | for (i = 0; i < ARRAY_SIZE(preset->mixers) && preset->mixers[i]; i++) | 797 | for (i = 0; i < ARRAY_SIZE(preset->mixers) && preset->mixers[i]; i++) |
| 728 | spec->mixers[spec->num_mixers++] = preset->mixers[i]; | 798 | add_mixer(spec, preset->mixers[i]); |
| 799 | spec->cap_mixer = preset->cap_mixer; | ||
| 729 | for (i = 0; i < ARRAY_SIZE(preset->init_verbs) && preset->init_verbs[i]; | 800 | for (i = 0; i < ARRAY_SIZE(preset->init_verbs) && preset->init_verbs[i]; |
| 730 | i++) | 801 | i++) |
| 731 | spec->init_verbs[spec->num_init_verbs++] = | 802 | add_verb(spec, preset->init_verbs[i]); |
| 732 | preset->init_verbs[i]; | ||
| 733 | 803 | ||
| 734 | spec->channel_mode = preset->channel_mode; | 804 | spec->channel_mode = preset->channel_mode; |
| 735 | spec->num_channel_mode = preset->num_channel_mode; | 805 | spec->num_channel_mode = preset->num_channel_mode; |
| @@ -1107,6 +1177,226 @@ static void alc_fix_pincfg(struct hda_codec *codec, | |||
| 1107 | } | 1177 | } |
| 1108 | 1178 | ||
| 1109 | /* | 1179 | /* |
| 1180 | * ALC888 | ||
| 1181 | */ | ||
| 1182 | |||
| 1183 | /* | ||
| 1184 | * 2ch mode | ||
| 1185 | */ | ||
| 1186 | static struct hda_verb alc888_4ST_ch2_intel_init[] = { | ||
| 1187 | /* Mic-in jack as mic in */ | ||
| 1188 | { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 }, | ||
| 1189 | { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE }, | ||
| 1190 | /* Line-in jack as Line in */ | ||
| 1191 | { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN }, | ||
| 1192 | { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE }, | ||
| 1193 | /* Line-Out as Front */ | ||
| 1194 | { 0x17, AC_VERB_SET_CONNECT_SEL, 0x00}, | ||
| 1195 | { } /* end */ | ||
| 1196 | }; | ||
| 1197 | |||
| 1198 | /* | ||
| 1199 | * 4ch mode | ||
| 1200 | */ | ||
| 1201 | static struct hda_verb alc888_4ST_ch4_intel_init[] = { | ||
| 1202 | /* Mic-in jack as mic in */ | ||
| 1203 | { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 }, | ||
| 1204 | { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE }, | ||
| 1205 | /* Line-in jack as Surround */ | ||
| 1206 | { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT }, | ||
| 1207 | { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE }, | ||
| 1208 | /* Line-Out as Front */ | ||
| 1209 | { 0x17, AC_VERB_SET_CONNECT_SEL, 0x00}, | ||
| 1210 | { } /* end */ | ||
| 1211 | }; | ||
| 1212 | |||
| 1213 | /* | ||
| 1214 | * 6ch mode | ||
| 1215 | */ | ||
| 1216 | static struct hda_verb alc888_4ST_ch6_intel_init[] = { | ||
| 1217 | /* Mic-in jack as CLFE */ | ||
| 1218 | { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT }, | ||
| 1219 | { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE }, | ||
| 1220 | /* Line-in jack as Surround */ | ||
| 1221 | { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT }, | ||
| 1222 | { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE }, | ||
| 1223 | /* Line-Out as CLFE (workaround because Mic-in is not loud enough) */ | ||
| 1224 | { 0x17, AC_VERB_SET_CONNECT_SEL, 0x03}, | ||
| 1225 | { } /* end */ | ||
| 1226 | }; | ||
| 1227 | |||
| 1228 | /* | ||
| 1229 | * 8ch mode | ||
| 1230 | */ | ||
| 1231 | static struct hda_verb alc888_4ST_ch8_intel_init[] = { | ||
| 1232 | /* Mic-in jack as CLFE */ | ||
| 1233 | { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT }, | ||
| 1234 | { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE }, | ||
| 1235 | /* Line-in jack as Surround */ | ||
| 1236 | { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT }, | ||
| 1237 | { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE }, | ||
| 1238 | /* Line-Out as Side */ | ||
| 1239 | { 0x17, AC_VERB_SET_CONNECT_SEL, 0x03}, | ||
| 1240 | { } /* end */ | ||
| 1241 | }; | ||
| 1242 | |||
| 1243 | static struct hda_channel_mode alc888_4ST_8ch_intel_modes[4] = { | ||
| 1244 | { 2, alc888_4ST_ch2_intel_init }, | ||
| 1245 | { 4, alc888_4ST_ch4_intel_init }, | ||
| 1246 | { 6, alc888_4ST_ch6_intel_init }, | ||
| 1247 | { 8, alc888_4ST_ch8_intel_init }, | ||
| 1248 | }; | ||
| 1249 | |||
| 1250 | /* | ||
| 1251 | * ALC888 Fujitsu Siemens Amillo xa3530 | ||
| 1252 | */ | ||
| 1253 | |||
| 1254 | static struct hda_verb alc888_fujitsu_xa3530_verbs[] = { | ||
| 1255 | /* Front Mic: set to PIN_IN (empty by default) */ | ||
| 1256 | {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, | ||
| 1257 | /* Connect Internal HP to Front */ | ||
| 1258 | {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, | ||
| 1259 | {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, | ||
| 1260 | {0x14, AC_VERB_SET_CONNECT_SEL, 0x00}, | ||
| 1261 | /* Connect Bass HP to Front */ | ||
| 1262 | {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, | ||
| 1263 | {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, | ||
| 1264 | {0x15, AC_VERB_SET_CONNECT_SEL, 0x00}, | ||
| 1265 | /* Connect Line-Out side jack (SPDIF) to Side */ | ||
| 1266 | {0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, | ||
| 1267 | {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, | ||
| 1268 | {0x17, AC_VERB_SET_CONNECT_SEL, 0x03}, | ||
| 1269 | /* Connect Mic jack to CLFE */ | ||
| 1270 | {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, | ||
| 1271 | {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, | ||
| 1272 | {0x18, AC_VERB_SET_CONNECT_SEL, 0x02}, | ||
| 1273 | /* Connect Line-in jack to Surround */ | ||
| 1274 | {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, | ||
| 1275 | {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, | ||
| 1276 | {0x1a, AC_VERB_SET_CONNECT_SEL, 0x01}, | ||
| 1277 | /* Connect HP out jack to Front */ | ||
| 1278 | {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, | ||
| 1279 | {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, | ||
| 1280 | {0x1b, AC_VERB_SET_CONNECT_SEL, 0x00}, | ||
| 1281 | /* Enable unsolicited event for HP jack and Line-out jack */ | ||
| 1282 | {0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN}, | ||
| 1283 | {0x17, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN}, | ||
| 1284 | {} | ||
| 1285 | }; | ||
| 1286 | |||
| 1287 | static void alc888_fujitsu_xa3530_automute(struct hda_codec *codec) | ||
| 1288 | { | ||
| 1289 | unsigned int present; | ||
| 1290 | unsigned int bits; | ||
| 1291 | /* Line out presence */ | ||
| 1292 | present = snd_hda_codec_read(codec, 0x17, 0, | ||
| 1293 | AC_VERB_GET_PIN_SENSE, 0) & 0x80000000; | ||
| 1294 | /* HP out presence */ | ||
| 1295 | present = present || snd_hda_codec_read(codec, 0x1b, 0, | ||
| 1296 | AC_VERB_GET_PIN_SENSE, 0) & 0x80000000; | ||
| 1297 | bits = present ? HDA_AMP_MUTE : 0; | ||
| 1298 | /* Toggle internal speakers muting */ | ||
| 1299 | snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0, | ||
| 1300 | HDA_AMP_MUTE, bits); | ||
| 1301 | /* Toggle internal bass muting */ | ||
| 1302 | snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0, | ||
| 1303 | HDA_AMP_MUTE, bits); | ||
| 1304 | } | ||
| 1305 | |||
| 1306 | static void alc888_fujitsu_xa3530_unsol_event(struct hda_codec *codec, | ||
| 1307 | unsigned int res) | ||
| 1308 | { | ||
| 1309 | if (res >> 26 == ALC880_HP_EVENT) | ||
| 1310 | alc888_fujitsu_xa3530_automute(codec); | ||
| 1311 | } | ||
| 1312 | |||
| 1313 | |||
| 1314 | /* | ||
| 1315 | * ALC888 Acer Aspire 4930G model | ||
| 1316 | */ | ||
| 1317 | |||
| 1318 | static struct hda_verb alc888_acer_aspire_4930g_verbs[] = { | ||
| 1319 | /* Front Mic: set to PIN_IN (empty by default) */ | ||
| 1320 | {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, | ||
| 1321 | /* Unselect Front Mic by default in input mixer 3 */ | ||
| 1322 | {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0xb)}, | ||
| 1323 | /* Enable unsolicited event for HP jack */ | ||
| 1324 | {0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN}, | ||
| 1325 | /* Connect Internal HP to front */ | ||
| 1326 | {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, | ||
| 1327 | {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, | ||
| 1328 | {0x14, AC_VERB_SET_CONNECT_SEL, 0x00}, | ||
| 1329 | /* Connect HP out to front */ | ||
| 1330 | {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, | ||
| 1331 | {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, | ||
| 1332 | {0x15, AC_VERB_SET_CONNECT_SEL, 0x00}, | ||
| 1333 | { } | ||
| 1334 | }; | ||
| 1335 | |||
| 1336 | static struct hda_input_mux alc888_2_capture_sources[2] = { | ||
| 1337 | /* Front mic only available on one ADC */ | ||
| 1338 | { | ||
| 1339 | .num_items = 4, | ||
| 1340 | .items = { | ||
| 1341 | { "Mic", 0x0 }, | ||
| 1342 | { "Line", 0x2 }, | ||
| 1343 | { "CD", 0x4 }, | ||
| 1344 | { "Front Mic", 0xb }, | ||
| 1345 | }, | ||
| 1346 | }, | ||
| 1347 | { | ||
| 1348 | .num_items = 3, | ||
| 1349 | .items = { | ||
| 1350 | { "Mic", 0x0 }, | ||
| 1351 | { "Line", 0x2 }, | ||
| 1352 | { "CD", 0x4 }, | ||
| 1353 | }, | ||
| 1354 | } | ||
| 1355 | }; | ||
| 1356 | |||
| 1357 | static struct snd_kcontrol_new alc888_base_mixer[] = { | ||
| 1358 | HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), | ||
| 1359 | HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT), | ||
| 1360 | HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT), | ||
| 1361 | HDA_BIND_MUTE("Surround Playback Switch", 0x0d, 2, HDA_INPUT), | ||
| 1362 | HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x0, | ||
| 1363 | HDA_OUTPUT), | ||
| 1364 | HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0e, 2, 0x0, HDA_OUTPUT), | ||
| 1365 | HDA_BIND_MUTE_MONO("Center Playback Switch", 0x0e, 1, 2, HDA_INPUT), | ||
| 1366 | HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 2, HDA_INPUT), | ||
| 1367 | HDA_CODEC_VOLUME("Side Playback Volume", 0x0f, 0x0, HDA_OUTPUT), | ||
| 1368 | HDA_BIND_MUTE("Side Playback Switch", 0x0f, 2, HDA_INPUT), | ||
| 1369 | HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT), | ||
| 1370 | HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT), | ||
| 1371 | HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT), | ||
| 1372 | HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT), | ||
| 1373 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), | ||
| 1374 | HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT), | ||
| 1375 | HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), | ||
| 1376 | HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT), | ||
| 1377 | HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT), | ||
| 1378 | { } /* end */ | ||
| 1379 | }; | ||
| 1380 | |||
| 1381 | static void alc888_acer_aspire_4930g_automute(struct hda_codec *codec) | ||
| 1382 | { | ||
| 1383 | unsigned int present; | ||
| 1384 | unsigned int bits; | ||
| 1385 | present = snd_hda_codec_read(codec, 0x15, 0, | ||
| 1386 | AC_VERB_GET_PIN_SENSE, 0) & 0x80000000; | ||
| 1387 | bits = present ? HDA_AMP_MUTE : 0; | ||
| 1388 | snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0, | ||
| 1389 | HDA_AMP_MUTE, bits); | ||
| 1390 | } | ||
| 1391 | |||
| 1392 | static void alc888_acer_aspire_4930g_unsol_event(struct hda_codec *codec, | ||
| 1393 | unsigned int res) | ||
| 1394 | { | ||
| 1395 | if (res >> 26 == ALC880_HP_EVENT) | ||
| 1396 | alc888_acer_aspire_4930g_automute(codec); | ||
| 1397 | } | ||
| 1398 | |||
| 1399 | /* | ||
| 1110 | * ALC880 3-stack model | 1400 | * ALC880 3-stack model |
| 1111 | * | 1401 | * |
| 1112 | * DAC: Front = 0x02 (0x0c), Surr = 0x05 (0x0f), CLFE = 0x04 (0x0e) | 1402 | * DAC: Front = 0x02 (0x0c), Surr = 0x05 (0x0f), CLFE = 0x04 (0x0e) |
| @@ -1205,49 +1495,126 @@ static struct snd_kcontrol_new alc880_three_stack_mixer[] = { | |||
| 1205 | }; | 1495 | }; |
| 1206 | 1496 | ||
| 1207 | /* capture mixer elements */ | 1497 | /* capture mixer elements */ |
| 1208 | static struct snd_kcontrol_new alc880_capture_mixer[] = { | 1498 | static int alc_cap_vol_info(struct snd_kcontrol *kcontrol, |
| 1209 | HDA_CODEC_VOLUME("Capture Volume", 0x07, 0x0, HDA_INPUT), | 1499 | struct snd_ctl_elem_info *uinfo) |
| 1210 | HDA_CODEC_MUTE("Capture Switch", 0x07, 0x0, HDA_INPUT), | 1500 | { |
| 1211 | HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x08, 0x0, HDA_INPUT), | 1501 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); |
| 1212 | HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x08, 0x0, HDA_INPUT), | 1502 | struct alc_spec *spec = codec->spec; |
| 1213 | HDA_CODEC_VOLUME_IDX("Capture Volume", 2, 0x09, 0x0, HDA_INPUT), | 1503 | int err; |
| 1214 | HDA_CODEC_MUTE_IDX("Capture Switch", 2, 0x09, 0x0, HDA_INPUT), | ||
| 1215 | { | ||
| 1216 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
| 1217 | /* The multiple "Capture Source" controls confuse alsamixer | ||
| 1218 | * So call somewhat different.. | ||
| 1219 | */ | ||
| 1220 | /* .name = "Capture Source", */ | ||
| 1221 | .name = "Input Source", | ||
| 1222 | .count = 3, | ||
| 1223 | .info = alc_mux_enum_info, | ||
| 1224 | .get = alc_mux_enum_get, | ||
| 1225 | .put = alc_mux_enum_put, | ||
| 1226 | }, | ||
| 1227 | { } /* end */ | ||
| 1228 | }; | ||
| 1229 | 1504 | ||
| 1230 | /* capture mixer elements (in case NID 0x07 not available) */ | 1505 | mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */ |
| 1231 | static struct snd_kcontrol_new alc880_capture_alt_mixer[] = { | 1506 | kcontrol->private_value = HDA_COMPOSE_AMP_VAL(spec->adc_nids[0], 3, 0, |
| 1232 | HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT), | 1507 | HDA_INPUT); |
| 1233 | HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT), | 1508 | err = snd_hda_mixer_amp_volume_info(kcontrol, uinfo); |
| 1234 | HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x09, 0x0, HDA_INPUT), | 1509 | mutex_unlock(&codec->spdif_mutex); /* reuse spdif_mutex */ |
| 1235 | HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x09, 0x0, HDA_INPUT), | 1510 | return err; |
| 1236 | { | 1511 | } |
| 1237 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 1512 | |
| 1238 | /* The multiple "Capture Source" controls confuse alsamixer | 1513 | static int alc_cap_vol_tlv(struct snd_kcontrol *kcontrol, int op_flag, |
| 1239 | * So call somewhat different.. | 1514 | unsigned int size, unsigned int __user *tlv) |
| 1240 | */ | 1515 | { |
| 1241 | /* .name = "Capture Source", */ | 1516 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); |
| 1242 | .name = "Input Source", | 1517 | struct alc_spec *spec = codec->spec; |
| 1243 | .count = 2, | 1518 | int err; |
| 1244 | .info = alc_mux_enum_info, | ||
| 1245 | .get = alc_mux_enum_get, | ||
| 1246 | .put = alc_mux_enum_put, | ||
| 1247 | }, | ||
| 1248 | { } /* end */ | ||
| 1249 | }; | ||
| 1250 | 1519 | ||
| 1520 | mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */ | ||
| 1521 | kcontrol->private_value = HDA_COMPOSE_AMP_VAL(spec->adc_nids[0], 3, 0, | ||
| 1522 | HDA_INPUT); | ||
| 1523 | err = snd_hda_mixer_amp_tlv(kcontrol, op_flag, size, tlv); | ||
| 1524 | mutex_unlock(&codec->spdif_mutex); /* reuse spdif_mutex */ | ||
| 1525 | return err; | ||
| 1526 | } | ||
| 1527 | |||
| 1528 | typedef int (*getput_call_t)(struct snd_kcontrol *kcontrol, | ||
| 1529 | struct snd_ctl_elem_value *ucontrol); | ||
| 1530 | |||
| 1531 | static int alc_cap_getput_caller(struct snd_kcontrol *kcontrol, | ||
| 1532 | struct snd_ctl_elem_value *ucontrol, | ||
| 1533 | getput_call_t func) | ||
| 1534 | { | ||
| 1535 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); | ||
| 1536 | struct alc_spec *spec = codec->spec; | ||
| 1537 | unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id); | ||
| 1538 | int err; | ||
| 1539 | |||
| 1540 | mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */ | ||
| 1541 | kcontrol->private_value = HDA_COMPOSE_AMP_VAL(spec->adc_nids[adc_idx], | ||
| 1542 | 3, 0, HDA_INPUT); | ||
| 1543 | err = func(kcontrol, ucontrol); | ||
| 1544 | mutex_unlock(&codec->spdif_mutex); /* reuse spdif_mutex */ | ||
| 1545 | return err; | ||
| 1546 | } | ||
| 1547 | |||
| 1548 | static int alc_cap_vol_get(struct snd_kcontrol *kcontrol, | ||
| 1549 | struct snd_ctl_elem_value *ucontrol) | ||
| 1550 | { | ||
| 1551 | return alc_cap_getput_caller(kcontrol, ucontrol, | ||
| 1552 | snd_hda_mixer_amp_volume_get); | ||
| 1553 | } | ||
| 1554 | |||
| 1555 | static int alc_cap_vol_put(struct snd_kcontrol *kcontrol, | ||
| 1556 | struct snd_ctl_elem_value *ucontrol) | ||
| 1557 | { | ||
| 1558 | return alc_cap_getput_caller(kcontrol, ucontrol, | ||
| 1559 | snd_hda_mixer_amp_volume_put); | ||
| 1560 | } | ||
| 1561 | |||
| 1562 | /* capture mixer elements */ | ||
| 1563 | #define alc_cap_sw_info snd_ctl_boolean_stereo_info | ||
| 1564 | |||
| 1565 | static int alc_cap_sw_get(struct snd_kcontrol *kcontrol, | ||
| 1566 | struct snd_ctl_elem_value *ucontrol) | ||
| 1567 | { | ||
| 1568 | return alc_cap_getput_caller(kcontrol, ucontrol, | ||
| 1569 | snd_hda_mixer_amp_switch_get); | ||
| 1570 | } | ||
| 1571 | |||
| 1572 | static int alc_cap_sw_put(struct snd_kcontrol *kcontrol, | ||
| 1573 | struct snd_ctl_elem_value *ucontrol) | ||
| 1574 | { | ||
| 1575 | return alc_cap_getput_caller(kcontrol, ucontrol, | ||
| 1576 | snd_hda_mixer_amp_switch_put); | ||
| 1577 | } | ||
| 1578 | |||
| 1579 | #define DEFINE_CAPMIX(num) \ | ||
| 1580 | static struct snd_kcontrol_new alc_capture_mixer ## num[] = { \ | ||
| 1581 | { \ | ||
| 1582 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \ | ||
| 1583 | .name = "Capture Switch", \ | ||
| 1584 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, \ | ||
| 1585 | .count = num, \ | ||
| 1586 | .info = alc_cap_sw_info, \ | ||
| 1587 | .get = alc_cap_sw_get, \ | ||
| 1588 | .put = alc_cap_sw_put, \ | ||
| 1589 | }, \ | ||
| 1590 | { \ | ||
| 1591 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \ | ||
| 1592 | .name = "Capture Volume", \ | ||
| 1593 | .access = (SNDRV_CTL_ELEM_ACCESS_READWRITE | \ | ||
| 1594 | SNDRV_CTL_ELEM_ACCESS_TLV_READ | \ | ||
| 1595 | SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK), \ | ||
| 1596 | .count = num, \ | ||
| 1597 | .info = alc_cap_vol_info, \ | ||
| 1598 | .get = alc_cap_vol_get, \ | ||
| 1599 | .put = alc_cap_vol_put, \ | ||
| 1600 | .tlv = { .c = alc_cap_vol_tlv }, \ | ||
| 1601 | }, \ | ||
| 1602 | { \ | ||
| 1603 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \ | ||
| 1604 | /* .name = "Capture Source", */ \ | ||
| 1605 | .name = "Input Source", \ | ||
| 1606 | .count = num, \ | ||
| 1607 | .info = alc_mux_enum_info, \ | ||
| 1608 | .get = alc_mux_enum_get, \ | ||
| 1609 | .put = alc_mux_enum_put, \ | ||
| 1610 | }, \ | ||
| 1611 | { } /* end */ \ | ||
| 1612 | } | ||
| 1613 | |||
| 1614 | /* up to three ADCs */ | ||
| 1615 | DEFINE_CAPMIX(1); | ||
| 1616 | DEFINE_CAPMIX(2); | ||
| 1617 | DEFINE_CAPMIX(3); | ||
| 1251 | 1618 | ||
| 1252 | 1619 | ||
| 1253 | /* | 1620 | /* |
| @@ -1533,18 +1900,6 @@ static struct snd_kcontrol_new alc880_tcl_s700_mixer[] = { | |||
| 1533 | HDA_CODEC_MUTE("Mic Playback Switch", 0x0B, 0x0, HDA_INPUT), | 1900 | HDA_CODEC_MUTE("Mic Playback Switch", 0x0B, 0x0, HDA_INPUT), |
| 1534 | HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT), | 1901 | HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT), |
| 1535 | HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT), | 1902 | HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT), |
| 1536 | { | ||
| 1537 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
| 1538 | /* The multiple "Capture Source" controls confuse alsamixer | ||
| 1539 | * So call somewhat different.. | ||
| 1540 | */ | ||
| 1541 | /* .name = "Capture Source", */ | ||
| 1542 | .name = "Input Source", | ||
| 1543 | .count = 1, | ||
| 1544 | .info = alc_mux_enum_info, | ||
| 1545 | .get = alc_mux_enum_get, | ||
| 1546 | .put = alc_mux_enum_put, | ||
| 1547 | }, | ||
| 1548 | { } /* end */ | 1903 | { } /* end */ |
| 1549 | }; | 1904 | }; |
| 1550 | 1905 | ||
| @@ -1619,6 +1974,7 @@ static const char *alc_slave_vols[] = { | |||
| 1619 | "Speaker Playback Volume", | 1974 | "Speaker Playback Volume", |
| 1620 | "Mono Playback Volume", | 1975 | "Mono Playback Volume", |
| 1621 | "Line-Out Playback Volume", | 1976 | "Line-Out Playback Volume", |
| 1977 | "PCM Playback Volume", | ||
| 1622 | NULL, | 1978 | NULL, |
| 1623 | }; | 1979 | }; |
| 1624 | 1980 | ||
| @@ -1638,6 +1994,9 @@ static const char *alc_slave_sws[] = { | |||
| 1638 | /* | 1994 | /* |
| 1639 | * build control elements | 1995 | * build control elements |
| 1640 | */ | 1996 | */ |
| 1997 | |||
| 1998 | static void alc_free_kctls(struct hda_codec *codec); | ||
| 1999 | |||
| 1641 | static int alc_build_controls(struct hda_codec *codec) | 2000 | static int alc_build_controls(struct hda_codec *codec) |
| 1642 | { | 2001 | { |
| 1643 | struct alc_spec *spec = codec->spec; | 2002 | struct alc_spec *spec = codec->spec; |
| @@ -1649,7 +2008,11 @@ static int alc_build_controls(struct hda_codec *codec) | |||
| 1649 | if (err < 0) | 2008 | if (err < 0) |
| 1650 | return err; | 2009 | return err; |
| 1651 | } | 2010 | } |
| 1652 | 2011 | if (spec->cap_mixer) { | |
| 2012 | err = snd_hda_add_new_ctls(codec, spec->cap_mixer); | ||
| 2013 | if (err < 0) | ||
| 2014 | return err; | ||
| 2015 | } | ||
| 1653 | if (spec->multiout.dig_out_nid) { | 2016 | if (spec->multiout.dig_out_nid) { |
| 1654 | err = snd_hda_create_spdif_out_ctls(codec, | 2017 | err = snd_hda_create_spdif_out_ctls(codec, |
| 1655 | spec->multiout.dig_out_nid); | 2018 | spec->multiout.dig_out_nid); |
| @@ -1684,6 +2047,7 @@ static int alc_build_controls(struct hda_codec *codec) | |||
| 1684 | return err; | 2047 | return err; |
| 1685 | } | 2048 | } |
| 1686 | 2049 | ||
| 2050 | alc_free_kctls(codec); /* no longer needed */ | ||
| 1687 | return 0; | 2051 | return 0; |
| 1688 | } | 2052 | } |
| 1689 | 2053 | ||
| @@ -2774,19 +3138,27 @@ static int alc_build_pcms(struct hda_codec *codec) | |||
| 2774 | return 0; | 3138 | return 0; |
| 2775 | } | 3139 | } |
| 2776 | 3140 | ||
| 3141 | static void alc_free_kctls(struct hda_codec *codec) | ||
| 3142 | { | ||
| 3143 | struct alc_spec *spec = codec->spec; | ||
| 3144 | |||
| 3145 | if (spec->kctls.list) { | ||
| 3146 | struct snd_kcontrol_new *kctl = spec->kctls.list; | ||
| 3147 | int i; | ||
| 3148 | for (i = 0; i < spec->kctls.used; i++) | ||
| 3149 | kfree(kctl[i].name); | ||
| 3150 | } | ||
| 3151 | snd_array_free(&spec->kctls); | ||
| 3152 | } | ||
| 3153 | |||
| 2777 | static void alc_free(struct hda_codec *codec) | 3154 | static void alc_free(struct hda_codec *codec) |
| 2778 | { | 3155 | { |
| 2779 | struct alc_spec *spec = codec->spec; | 3156 | struct alc_spec *spec = codec->spec; |
| 2780 | unsigned int i; | ||
| 2781 | 3157 | ||
| 2782 | if (!spec) | 3158 | if (!spec) |
| 2783 | return; | 3159 | return; |
| 2784 | 3160 | ||
| 2785 | if (spec->kctl_alloc) { | 3161 | alc_free_kctls(codec); |
| 2786 | for (i = 0; i < spec->num_kctl_used; i++) | ||
| 2787 | kfree(spec->kctl_alloc[i].name); | ||
| 2788 | kfree(spec->kctl_alloc); | ||
| 2789 | } | ||
| 2790 | kfree(spec); | 3162 | kfree(spec); |
| 2791 | codec->spec = NULL; /* to be sure */ | 3163 | codec->spec = NULL; /* to be sure */ |
| 2792 | } | 3164 | } |
| @@ -3268,6 +3640,8 @@ static struct alc_config_preset alc880_presets[] = { | |||
| 3268 | alc880_gpio2_init_verbs }, | 3640 | alc880_gpio2_init_verbs }, |
| 3269 | .num_dacs = ARRAY_SIZE(alc880_dac_nids), | 3641 | .num_dacs = ARRAY_SIZE(alc880_dac_nids), |
| 3270 | .dac_nids = alc880_dac_nids, | 3642 | .dac_nids = alc880_dac_nids, |
| 3643 | .adc_nids = alc880_adc_nids_alt, /* FIXME: correct? */ | ||
| 3644 | .num_adc_nids = 1, /* single ADC */ | ||
| 3271 | .hp_nid = 0x03, | 3645 | .hp_nid = 0x03, |
| 3272 | .num_channel_mode = ARRAY_SIZE(alc880_2_jack_modes), | 3646 | .num_channel_mode = ARRAY_SIZE(alc880_2_jack_modes), |
| 3273 | .channel_mode = alc880_2_jack_modes, | 3647 | .channel_mode = alc880_2_jack_modes, |
| @@ -3532,9 +3906,6 @@ static struct alc_config_preset alc880_presets[] = { | |||
| 3532 | * Automatic parse of I/O pins from the BIOS configuration | 3906 | * Automatic parse of I/O pins from the BIOS configuration |
| 3533 | */ | 3907 | */ |
| 3534 | 3908 | ||
| 3535 | #define NUM_CONTROL_ALLOC 32 | ||
| 3536 | #define NUM_VERB_ALLOC 32 | ||
| 3537 | |||
| 3538 | enum { | 3909 | enum { |
| 3539 | ALC_CTL_WIDGET_VOL, | 3910 | ALC_CTL_WIDGET_VOL, |
| 3540 | ALC_CTL_WIDGET_MUTE, | 3911 | ALC_CTL_WIDGET_MUTE, |
| @@ -3552,29 +3923,15 @@ static int add_control(struct alc_spec *spec, int type, const char *name, | |||
| 3552 | { | 3923 | { |
| 3553 | struct snd_kcontrol_new *knew; | 3924 | struct snd_kcontrol_new *knew; |
| 3554 | 3925 | ||
| 3555 | if (spec->num_kctl_used >= spec->num_kctl_alloc) { | 3926 | snd_array_init(&spec->kctls, sizeof(*knew), 32); |
| 3556 | int num = spec->num_kctl_alloc + NUM_CONTROL_ALLOC; | 3927 | knew = snd_array_new(&spec->kctls); |
| 3557 | 3928 | if (!knew) | |
| 3558 | /* array + terminator */ | 3929 | return -ENOMEM; |
| 3559 | knew = kcalloc(num + 1, sizeof(*knew), GFP_KERNEL); | ||
| 3560 | if (!knew) | ||
| 3561 | return -ENOMEM; | ||
| 3562 | if (spec->kctl_alloc) { | ||
| 3563 | memcpy(knew, spec->kctl_alloc, | ||
| 3564 | sizeof(*knew) * spec->num_kctl_alloc); | ||
| 3565 | kfree(spec->kctl_alloc); | ||
| 3566 | } | ||
| 3567 | spec->kctl_alloc = knew; | ||
| 3568 | spec->num_kctl_alloc = num; | ||
| 3569 | } | ||
| 3570 | |||
| 3571 | knew = &spec->kctl_alloc[spec->num_kctl_used]; | ||
| 3572 | *knew = alc880_control_templates[type]; | 3930 | *knew = alc880_control_templates[type]; |
| 3573 | knew->name = kstrdup(name, GFP_KERNEL); | 3931 | knew->name = kstrdup(name, GFP_KERNEL); |
| 3574 | if (!knew->name) | 3932 | if (!knew->name) |
| 3575 | return -ENOMEM; | 3933 | return -ENOMEM; |
| 3576 | knew->private_value = val; | 3934 | knew->private_value = val; |
| 3577 | spec->num_kctl_used++; | ||
| 3578 | return 0; | 3935 | return 0; |
| 3579 | } | 3936 | } |
| 3580 | 3937 | ||
| @@ -3898,10 +4255,10 @@ static int alc880_parse_auto_config(struct hda_codec *codec) | |||
| 3898 | if (spec->autocfg.dig_in_pin) | 4255 | if (spec->autocfg.dig_in_pin) |
| 3899 | spec->dig_in_nid = ALC880_DIGIN_NID; | 4256 | spec->dig_in_nid = ALC880_DIGIN_NID; |
| 3900 | 4257 | ||
| 3901 | if (spec->kctl_alloc) | 4258 | if (spec->kctls.list) |
| 3902 | spec->mixers[spec->num_mixers++] = spec->kctl_alloc; | 4259 | add_mixer(spec, spec->kctls.list); |
| 3903 | 4260 | ||
| 3904 | spec->init_verbs[spec->num_init_verbs++] = alc880_volume_init_verbs; | 4261 | add_verb(spec, alc880_volume_init_verbs); |
| 3905 | 4262 | ||
| 3906 | spec->num_mux_defs = 1; | 4263 | spec->num_mux_defs = 1; |
| 3907 | spec->input_mux = &spec->private_imux; | 4264 | spec->input_mux = &spec->private_imux; |
| @@ -3925,6 +4282,17 @@ static void alc880_auto_init(struct hda_codec *codec) | |||
| 3925 | * OK, here we have finally the patch for ALC880 | 4282 | * OK, here we have finally the patch for ALC880 |
| 3926 | */ | 4283 | */ |
| 3927 | 4284 | ||
| 4285 | static void set_capture_mixer(struct alc_spec *spec) | ||
| 4286 | { | ||
| 4287 | static struct snd_kcontrol_new *caps[3] = { | ||
| 4288 | alc_capture_mixer1, | ||
| 4289 | alc_capture_mixer2, | ||
| 4290 | alc_capture_mixer3, | ||
| 4291 | }; | ||
| 4292 | if (spec->num_adc_nids > 0 && spec->num_adc_nids <= 3) | ||
| 4293 | spec->cap_mixer = caps[spec->num_adc_nids - 1]; | ||
| 4294 | } | ||
| 4295 | |||
| 3928 | static int patch_alc880(struct hda_codec *codec) | 4296 | static int patch_alc880(struct hda_codec *codec) |
| 3929 | { | 4297 | { |
| 3930 | struct alc_spec *spec; | 4298 | struct alc_spec *spec; |
| @@ -3980,16 +4348,12 @@ static int patch_alc880(struct hda_codec *codec) | |||
| 3980 | if (wcap != AC_WID_AUD_IN) { | 4348 | if (wcap != AC_WID_AUD_IN) { |
| 3981 | spec->adc_nids = alc880_adc_nids_alt; | 4349 | spec->adc_nids = alc880_adc_nids_alt; |
| 3982 | spec->num_adc_nids = ARRAY_SIZE(alc880_adc_nids_alt); | 4350 | spec->num_adc_nids = ARRAY_SIZE(alc880_adc_nids_alt); |
| 3983 | spec->mixers[spec->num_mixers] = | ||
| 3984 | alc880_capture_alt_mixer; | ||
| 3985 | spec->num_mixers++; | ||
| 3986 | } else { | 4351 | } else { |
| 3987 | spec->adc_nids = alc880_adc_nids; | 4352 | spec->adc_nids = alc880_adc_nids; |
| 3988 | spec->num_adc_nids = ARRAY_SIZE(alc880_adc_nids); | 4353 | spec->num_adc_nids = ARRAY_SIZE(alc880_adc_nids); |
| 3989 | spec->mixers[spec->num_mixers] = alc880_capture_mixer; | ||
| 3990 | spec->num_mixers++; | ||
| 3991 | } | 4354 | } |
| 3992 | } | 4355 | } |
| 4356 | set_capture_mixer(spec); | ||
| 3993 | 4357 | ||
| 3994 | spec->vmaster_nid = 0x0c; | 4358 | spec->vmaster_nid = 0x0c; |
| 3995 | 4359 | ||
| @@ -4000,6 +4364,7 @@ static int patch_alc880(struct hda_codec *codec) | |||
| 4000 | if (!spec->loopback.amplist) | 4364 | if (!spec->loopback.amplist) |
| 4001 | spec->loopback.amplist = alc880_loopbacks; | 4365 | spec->loopback.amplist = alc880_loopbacks; |
| 4002 | #endif | 4366 | #endif |
| 4367 | codec->proc_widget_hook = print_realtek_coef; | ||
| 4003 | 4368 | ||
| 4004 | return 0; | 4369 | return 0; |
| 4005 | } | 4370 | } |
| @@ -4024,11 +4389,6 @@ static hda_nid_t alc260_adc_nids_alt[1] = { | |||
| 4024 | 0x05, | 4389 | 0x05, |
| 4025 | }; | 4390 | }; |
| 4026 | 4391 | ||
| 4027 | static hda_nid_t alc260_hp_adc_nids[2] = { | ||
| 4028 | /* ADC1, 0 */ | ||
| 4029 | 0x05, 0x04 | ||
| 4030 | }; | ||
| 4031 | |||
| 4032 | /* NIDs used when simultaneous access to both ADCs makes sense. Note that | 4392 | /* NIDs used when simultaneous access to both ADCs makes sense. Note that |
| 4033 | * alc260_capture_mixer assumes ADC0 (nid 0x04) is the first ADC. | 4393 | * alc260_capture_mixer assumes ADC0 (nid 0x04) is the first ADC. |
| 4034 | */ | 4394 | */ |
| @@ -4157,13 +4517,13 @@ static void alc260_hp_master_update(struct hda_codec *codec, | |||
| 4157 | struct alc_spec *spec = codec->spec; | 4517 | struct alc_spec *spec = codec->spec; |
| 4158 | unsigned int val = spec->master_sw ? PIN_HP : 0; | 4518 | unsigned int val = spec->master_sw ? PIN_HP : 0; |
| 4159 | /* change HP and line-out pins */ | 4519 | /* change HP and line-out pins */ |
| 4160 | snd_hda_codec_write(codec, 0x0f, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, | 4520 | snd_hda_codec_write(codec, hp, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, |
| 4161 | val); | 4521 | val); |
| 4162 | snd_hda_codec_write(codec, 0x10, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, | 4522 | snd_hda_codec_write(codec, line, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, |
| 4163 | val); | 4523 | val); |
| 4164 | /* mono (speaker) depending on the HP jack sense */ | 4524 | /* mono (speaker) depending on the HP jack sense */ |
| 4165 | val = (val && !spec->jack_present) ? PIN_OUT : 0; | 4525 | val = (val && !spec->jack_present) ? PIN_OUT : 0; |
| 4166 | snd_hda_codec_write(codec, 0x11, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, | 4526 | snd_hda_codec_write(codec, mono, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, |
| 4167 | val); | 4527 | val); |
| 4168 | } | 4528 | } |
| 4169 | 4529 | ||
| @@ -4242,7 +4602,7 @@ static struct snd_kcontrol_new alc260_hp_3013_mixer[] = { | |||
| 4242 | .info = snd_ctl_boolean_mono_info, | 4602 | .info = snd_ctl_boolean_mono_info, |
| 4243 | .get = alc260_hp_master_sw_get, | 4603 | .get = alc260_hp_master_sw_get, |
| 4244 | .put = alc260_hp_master_sw_put, | 4604 | .put = alc260_hp_master_sw_put, |
| 4245 | .private_value = (0x10 << 16) | (0x15 << 8) | 0x11 | 4605 | .private_value = (0x15 << 16) | (0x10 << 8) | 0x11 |
| 4246 | }, | 4606 | }, |
| 4247 | HDA_CODEC_VOLUME("Front Playback Volume", 0x09, 0x0, HDA_OUTPUT), | 4607 | HDA_CODEC_VOLUME("Front Playback Volume", 0x09, 0x0, HDA_OUTPUT), |
| 4248 | HDA_CODEC_MUTE("Front Playback Switch", 0x10, 0x0, HDA_OUTPUT), | 4608 | HDA_CODEC_MUTE("Front Playback Switch", 0x10, 0x0, HDA_OUTPUT), |
| @@ -4295,7 +4655,7 @@ static void alc260_hp_3013_automute(struct hda_codec *codec) | |||
| 4295 | present = snd_hda_codec_read(codec, 0x15, 0, | 4655 | present = snd_hda_codec_read(codec, 0x15, 0, |
| 4296 | AC_VERB_GET_PIN_SENSE, 0); | 4656 | AC_VERB_GET_PIN_SENSE, 0); |
| 4297 | spec->jack_present = (present & AC_PINSENSE_PRESENCE) != 0; | 4657 | spec->jack_present = (present & AC_PINSENSE_PRESENCE) != 0; |
| 4298 | alc260_hp_master_update(codec, 0x10, 0x15, 0x11); | 4658 | alc260_hp_master_update(codec, 0x15, 0x10, 0x11); |
| 4299 | } | 4659 | } |
| 4300 | 4660 | ||
| 4301 | static void alc260_hp_3013_unsol_event(struct hda_codec *codec, | 4661 | static void alc260_hp_3013_unsol_event(struct hda_codec *codec, |
| @@ -4427,45 +4787,6 @@ static struct snd_kcontrol_new alc260_replacer_672v_mixer[] = { | |||
| 4427 | { } /* end */ | 4787 | { } /* end */ |
| 4428 | }; | 4788 | }; |
| 4429 | 4789 | ||
| 4430 | /* capture mixer elements */ | ||
| 4431 | static struct snd_kcontrol_new alc260_capture_mixer[] = { | ||
| 4432 | HDA_CODEC_VOLUME("Capture Volume", 0x04, 0x0, HDA_INPUT), | ||
| 4433 | HDA_CODEC_MUTE("Capture Switch", 0x04, 0x0, HDA_INPUT), | ||
| 4434 | HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x05, 0x0, HDA_INPUT), | ||
| 4435 | HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x05, 0x0, HDA_INPUT), | ||
| 4436 | { | ||
| 4437 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
| 4438 | /* The multiple "Capture Source" controls confuse alsamixer | ||
| 4439 | * So call somewhat different.. | ||
| 4440 | */ | ||
| 4441 | /* .name = "Capture Source", */ | ||
| 4442 | .name = "Input Source", | ||
| 4443 | .count = 2, | ||
| 4444 | .info = alc_mux_enum_info, | ||
| 4445 | .get = alc_mux_enum_get, | ||
| 4446 | .put = alc_mux_enum_put, | ||
| 4447 | }, | ||
| 4448 | { } /* end */ | ||
| 4449 | }; | ||
| 4450 | |||
| 4451 | static struct snd_kcontrol_new alc260_capture_alt_mixer[] = { | ||
| 4452 | HDA_CODEC_VOLUME("Capture Volume", 0x05, 0x0, HDA_INPUT), | ||
| 4453 | HDA_CODEC_MUTE("Capture Switch", 0x05, 0x0, HDA_INPUT), | ||
| 4454 | { | ||
| 4455 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
| 4456 | /* The multiple "Capture Source" controls confuse alsamixer | ||
| 4457 | * So call somewhat different.. | ||
| 4458 | */ | ||
| 4459 | /* .name = "Capture Source", */ | ||
| 4460 | .name = "Input Source", | ||
| 4461 | .count = 1, | ||
| 4462 | .info = alc_mux_enum_info, | ||
| 4463 | .get = alc_mux_enum_get, | ||
| 4464 | .put = alc_mux_enum_put, | ||
| 4465 | }, | ||
| 4466 | { } /* end */ | ||
| 4467 | }; | ||
| 4468 | |||
| 4469 | /* | 4790 | /* |
| 4470 | * initialization verbs | 4791 | * initialization verbs |
| 4471 | */ | 4792 | */ |
| @@ -5282,7 +5603,6 @@ static struct hda_verb alc260_volume_init_verbs[] = { | |||
| 5282 | static int alc260_parse_auto_config(struct hda_codec *codec) | 5603 | static int alc260_parse_auto_config(struct hda_codec *codec) |
| 5283 | { | 5604 | { |
| 5284 | struct alc_spec *spec = codec->spec; | 5605 | struct alc_spec *spec = codec->spec; |
| 5285 | unsigned int wcap; | ||
| 5286 | int err; | 5606 | int err; |
| 5287 | static hda_nid_t alc260_ignore[] = { 0x17, 0 }; | 5607 | static hda_nid_t alc260_ignore[] = { 0x17, 0 }; |
| 5288 | 5608 | ||
| @@ -5293,7 +5613,7 @@ static int alc260_parse_auto_config(struct hda_codec *codec) | |||
| 5293 | err = alc260_auto_create_multi_out_ctls(spec, &spec->autocfg); | 5613 | err = alc260_auto_create_multi_out_ctls(spec, &spec->autocfg); |
| 5294 | if (err < 0) | 5614 | if (err < 0) |
| 5295 | return err; | 5615 | return err; |
| 5296 | if (!spec->kctl_alloc) | 5616 | if (!spec->kctls.list) |
| 5297 | return 0; /* can't find valid BIOS pin config */ | 5617 | return 0; /* can't find valid BIOS pin config */ |
| 5298 | err = alc260_auto_create_analog_input_ctls(spec, &spec->autocfg); | 5618 | err = alc260_auto_create_analog_input_ctls(spec, &spec->autocfg); |
| 5299 | if (err < 0) | 5619 | if (err < 0) |
| @@ -5303,28 +5623,14 @@ static int alc260_parse_auto_config(struct hda_codec *codec) | |||
| 5303 | 5623 | ||
| 5304 | if (spec->autocfg.dig_out_pin) | 5624 | if (spec->autocfg.dig_out_pin) |
| 5305 | spec->multiout.dig_out_nid = ALC260_DIGOUT_NID; | 5625 | spec->multiout.dig_out_nid = ALC260_DIGOUT_NID; |
| 5306 | if (spec->kctl_alloc) | 5626 | if (spec->kctls.list) |
| 5307 | spec->mixers[spec->num_mixers++] = spec->kctl_alloc; | 5627 | add_mixer(spec, spec->kctls.list); |
| 5308 | 5628 | ||
| 5309 | spec->init_verbs[spec->num_init_verbs++] = alc260_volume_init_verbs; | 5629 | add_verb(spec, alc260_volume_init_verbs); |
| 5310 | 5630 | ||
| 5311 | spec->num_mux_defs = 1; | 5631 | spec->num_mux_defs = 1; |
| 5312 | spec->input_mux = &spec->private_imux; | 5632 | spec->input_mux = &spec->private_imux; |
| 5313 | 5633 | ||
| 5314 | /* check whether NID 0x04 is valid */ | ||
| 5315 | wcap = get_wcaps(codec, 0x04); | ||
| 5316 | wcap = (wcap & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT; /* get type */ | ||
| 5317 | if (wcap != AC_WID_AUD_IN || spec->input_mux->num_items == 1) { | ||
| 5318 | spec->adc_nids = alc260_adc_nids_alt; | ||
| 5319 | spec->num_adc_nids = ARRAY_SIZE(alc260_adc_nids_alt); | ||
| 5320 | spec->mixers[spec->num_mixers] = alc260_capture_alt_mixer; | ||
| 5321 | } else { | ||
| 5322 | spec->adc_nids = alc260_adc_nids; | ||
| 5323 | spec->num_adc_nids = ARRAY_SIZE(alc260_adc_nids); | ||
| 5324 | spec->mixers[spec->num_mixers] = alc260_capture_mixer; | ||
| 5325 | } | ||
| 5326 | spec->num_mixers++; | ||
| 5327 | |||
| 5328 | store_pin_configs(codec); | 5634 | store_pin_configs(codec); |
| 5329 | return 1; | 5635 | return 1; |
| 5330 | } | 5636 | } |
| @@ -5394,12 +5700,11 @@ static struct alc_config_preset alc260_presets[] = { | |||
| 5394 | [ALC260_BASIC] = { | 5700 | [ALC260_BASIC] = { |
| 5395 | .mixers = { alc260_base_output_mixer, | 5701 | .mixers = { alc260_base_output_mixer, |
| 5396 | alc260_input_mixer, | 5702 | alc260_input_mixer, |
| 5397 | alc260_pc_beep_mixer, | 5703 | alc260_pc_beep_mixer }, |
| 5398 | alc260_capture_mixer }, | ||
| 5399 | .init_verbs = { alc260_init_verbs }, | 5704 | .init_verbs = { alc260_init_verbs }, |
| 5400 | .num_dacs = ARRAY_SIZE(alc260_dac_nids), | 5705 | .num_dacs = ARRAY_SIZE(alc260_dac_nids), |
| 5401 | .dac_nids = alc260_dac_nids, | 5706 | .dac_nids = alc260_dac_nids, |
| 5402 | .num_adc_nids = ARRAY_SIZE(alc260_adc_nids), | 5707 | .num_adc_nids = ARRAY_SIZE(alc260_dual_adc_nids), |
| 5403 | .adc_nids = alc260_adc_nids, | 5708 | .adc_nids = alc260_adc_nids, |
| 5404 | .num_channel_mode = ARRAY_SIZE(alc260_modes), | 5709 | .num_channel_mode = ARRAY_SIZE(alc260_modes), |
| 5405 | .channel_mode = alc260_modes, | 5710 | .channel_mode = alc260_modes, |
| @@ -5407,14 +5712,13 @@ static struct alc_config_preset alc260_presets[] = { | |||
| 5407 | }, | 5712 | }, |
| 5408 | [ALC260_HP] = { | 5713 | [ALC260_HP] = { |
| 5409 | .mixers = { alc260_hp_output_mixer, | 5714 | .mixers = { alc260_hp_output_mixer, |
| 5410 | alc260_input_mixer, | 5715 | alc260_input_mixer }, |
| 5411 | alc260_capture_alt_mixer }, | ||
| 5412 | .init_verbs = { alc260_init_verbs, | 5716 | .init_verbs = { alc260_init_verbs, |
| 5413 | alc260_hp_unsol_verbs }, | 5717 | alc260_hp_unsol_verbs }, |
| 5414 | .num_dacs = ARRAY_SIZE(alc260_dac_nids), | 5718 | .num_dacs = ARRAY_SIZE(alc260_dac_nids), |
| 5415 | .dac_nids = alc260_dac_nids, | 5719 | .dac_nids = alc260_dac_nids, |
| 5416 | .num_adc_nids = ARRAY_SIZE(alc260_hp_adc_nids), | 5720 | .num_adc_nids = ARRAY_SIZE(alc260_adc_nids_alt), |
| 5417 | .adc_nids = alc260_hp_adc_nids, | 5721 | .adc_nids = alc260_adc_nids_alt, |
| 5418 | .num_channel_mode = ARRAY_SIZE(alc260_modes), | 5722 | .num_channel_mode = ARRAY_SIZE(alc260_modes), |
| 5419 | .channel_mode = alc260_modes, | 5723 | .channel_mode = alc260_modes, |
| 5420 | .input_mux = &alc260_capture_source, | 5724 | .input_mux = &alc260_capture_source, |
| @@ -5423,14 +5727,13 @@ static struct alc_config_preset alc260_presets[] = { | |||
| 5423 | }, | 5727 | }, |
| 5424 | [ALC260_HP_DC7600] = { | 5728 | [ALC260_HP_DC7600] = { |
| 5425 | .mixers = { alc260_hp_dc7600_mixer, | 5729 | .mixers = { alc260_hp_dc7600_mixer, |
| 5426 | alc260_input_mixer, | 5730 | alc260_input_mixer }, |
| 5427 | alc260_capture_alt_mixer }, | ||
| 5428 | .init_verbs = { alc260_init_verbs, | 5731 | .init_verbs = { alc260_init_verbs, |
| 5429 | alc260_hp_dc7600_verbs }, | 5732 | alc260_hp_dc7600_verbs }, |
| 5430 | .num_dacs = ARRAY_SIZE(alc260_dac_nids), | 5733 | .num_dacs = ARRAY_SIZE(alc260_dac_nids), |
| 5431 | .dac_nids = alc260_dac_nids, | 5734 | .dac_nids = alc260_dac_nids, |
| 5432 | .num_adc_nids = ARRAY_SIZE(alc260_hp_adc_nids), | 5735 | .num_adc_nids = ARRAY_SIZE(alc260_adc_nids_alt), |
| 5433 | .adc_nids = alc260_hp_adc_nids, | 5736 | .adc_nids = alc260_adc_nids_alt, |
| 5434 | .num_channel_mode = ARRAY_SIZE(alc260_modes), | 5737 | .num_channel_mode = ARRAY_SIZE(alc260_modes), |
| 5435 | .channel_mode = alc260_modes, | 5738 | .channel_mode = alc260_modes, |
| 5436 | .input_mux = &alc260_capture_source, | 5739 | .input_mux = &alc260_capture_source, |
| @@ -5439,14 +5742,13 @@ static struct alc_config_preset alc260_presets[] = { | |||
| 5439 | }, | 5742 | }, |
| 5440 | [ALC260_HP_3013] = { | 5743 | [ALC260_HP_3013] = { |
| 5441 | .mixers = { alc260_hp_3013_mixer, | 5744 | .mixers = { alc260_hp_3013_mixer, |
| 5442 | alc260_input_mixer, | 5745 | alc260_input_mixer }, |
| 5443 | alc260_capture_alt_mixer }, | ||
| 5444 | .init_verbs = { alc260_hp_3013_init_verbs, | 5746 | .init_verbs = { alc260_hp_3013_init_verbs, |
| 5445 | alc260_hp_3013_unsol_verbs }, | 5747 | alc260_hp_3013_unsol_verbs }, |
| 5446 | .num_dacs = ARRAY_SIZE(alc260_dac_nids), | 5748 | .num_dacs = ARRAY_SIZE(alc260_dac_nids), |
| 5447 | .dac_nids = alc260_dac_nids, | 5749 | .dac_nids = alc260_dac_nids, |
| 5448 | .num_adc_nids = ARRAY_SIZE(alc260_hp_adc_nids), | 5750 | .num_adc_nids = ARRAY_SIZE(alc260_adc_nids_alt), |
| 5449 | .adc_nids = alc260_hp_adc_nids, | 5751 | .adc_nids = alc260_adc_nids_alt, |
| 5450 | .num_channel_mode = ARRAY_SIZE(alc260_modes), | 5752 | .num_channel_mode = ARRAY_SIZE(alc260_modes), |
| 5451 | .channel_mode = alc260_modes, | 5753 | .channel_mode = alc260_modes, |
| 5452 | .input_mux = &alc260_capture_source, | 5754 | .input_mux = &alc260_capture_source, |
| @@ -5454,8 +5756,7 @@ static struct alc_config_preset alc260_presets[] = { | |||
| 5454 | .init_hook = alc260_hp_3013_automute, | 5756 | .init_hook = alc260_hp_3013_automute, |
| 5455 | }, | 5757 | }, |
| 5456 | [ALC260_FUJITSU_S702X] = { | 5758 | [ALC260_FUJITSU_S702X] = { |
| 5457 | .mixers = { alc260_fujitsu_mixer, | 5759 | .mixers = { alc260_fujitsu_mixer }, |
| 5458 | alc260_capture_mixer }, | ||
| 5459 | .init_verbs = { alc260_fujitsu_init_verbs }, | 5760 | .init_verbs = { alc260_fujitsu_init_verbs }, |
| 5460 | .num_dacs = ARRAY_SIZE(alc260_dac_nids), | 5761 | .num_dacs = ARRAY_SIZE(alc260_dac_nids), |
| 5461 | .dac_nids = alc260_dac_nids, | 5762 | .dac_nids = alc260_dac_nids, |
| @@ -5467,8 +5768,7 @@ static struct alc_config_preset alc260_presets[] = { | |||
| 5467 | .input_mux = alc260_fujitsu_capture_sources, | 5768 | .input_mux = alc260_fujitsu_capture_sources, |
| 5468 | }, | 5769 | }, |
| 5469 | [ALC260_ACER] = { | 5770 | [ALC260_ACER] = { |
| 5470 | .mixers = { alc260_acer_mixer, | 5771 | .mixers = { alc260_acer_mixer }, |
| 5471 | alc260_capture_mixer }, | ||
| 5472 | .init_verbs = { alc260_acer_init_verbs }, | 5772 | .init_verbs = { alc260_acer_init_verbs }, |
| 5473 | .num_dacs = ARRAY_SIZE(alc260_dac_nids), | 5773 | .num_dacs = ARRAY_SIZE(alc260_dac_nids), |
| 5474 | .dac_nids = alc260_dac_nids, | 5774 | .dac_nids = alc260_dac_nids, |
| @@ -5480,8 +5780,7 @@ static struct alc_config_preset alc260_presets[] = { | |||
| 5480 | .input_mux = alc260_acer_capture_sources, | 5780 | .input_mux = alc260_acer_capture_sources, |
| 5481 | }, | 5781 | }, |
| 5482 | [ALC260_WILL] = { | 5782 | [ALC260_WILL] = { |
| 5483 | .mixers = { alc260_will_mixer, | 5783 | .mixers = { alc260_will_mixer }, |
| 5484 | alc260_capture_mixer }, | ||
| 5485 | .init_verbs = { alc260_init_verbs, alc260_will_verbs }, | 5784 | .init_verbs = { alc260_init_verbs, alc260_will_verbs }, |
| 5486 | .num_dacs = ARRAY_SIZE(alc260_dac_nids), | 5785 | .num_dacs = ARRAY_SIZE(alc260_dac_nids), |
| 5487 | .dac_nids = alc260_dac_nids, | 5786 | .dac_nids = alc260_dac_nids, |
| @@ -5493,8 +5792,7 @@ static struct alc_config_preset alc260_presets[] = { | |||
| 5493 | .input_mux = &alc260_capture_source, | 5792 | .input_mux = &alc260_capture_source, |
| 5494 | }, | 5793 | }, |
| 5495 | [ALC260_REPLACER_672V] = { | 5794 | [ALC260_REPLACER_672V] = { |
| 5496 | .mixers = { alc260_replacer_672v_mixer, | 5795 | .mixers = { alc260_replacer_672v_mixer }, |
| 5497 | alc260_capture_mixer }, | ||
| 5498 | .init_verbs = { alc260_init_verbs, alc260_replacer_672v_verbs }, | 5796 | .init_verbs = { alc260_init_verbs, alc260_replacer_672v_verbs }, |
| 5499 | .num_dacs = ARRAY_SIZE(alc260_dac_nids), | 5797 | .num_dacs = ARRAY_SIZE(alc260_dac_nids), |
| 5500 | .dac_nids = alc260_dac_nids, | 5798 | .dac_nids = alc260_dac_nids, |
| @@ -5509,8 +5807,7 @@ static struct alc_config_preset alc260_presets[] = { | |||
| 5509 | }, | 5807 | }, |
| 5510 | #ifdef CONFIG_SND_DEBUG | 5808 | #ifdef CONFIG_SND_DEBUG |
| 5511 | [ALC260_TEST] = { | 5809 | [ALC260_TEST] = { |
| 5512 | .mixers = { alc260_test_mixer, | 5810 | .mixers = { alc260_test_mixer }, |
| 5513 | alc260_capture_mixer }, | ||
| 5514 | .init_verbs = { alc260_test_init_verbs }, | 5811 | .init_verbs = { alc260_test_init_verbs }, |
| 5515 | .num_dacs = ARRAY_SIZE(alc260_test_dac_nids), | 5812 | .num_dacs = ARRAY_SIZE(alc260_test_dac_nids), |
| 5516 | .dac_nids = alc260_test_dac_nids, | 5813 | .dac_nids = alc260_test_dac_nids, |
| @@ -5569,6 +5866,21 @@ static int patch_alc260(struct hda_codec *codec) | |||
| 5569 | spec->stream_digital_playback = &alc260_pcm_digital_playback; | 5866 | spec->stream_digital_playback = &alc260_pcm_digital_playback; |
| 5570 | spec->stream_digital_capture = &alc260_pcm_digital_capture; | 5867 | spec->stream_digital_capture = &alc260_pcm_digital_capture; |
| 5571 | 5868 | ||
| 5869 | if (!spec->adc_nids && spec->input_mux) { | ||
| 5870 | /* check whether NID 0x04 is valid */ | ||
| 5871 | unsigned int wcap = get_wcaps(codec, 0x04); | ||
| 5872 | wcap = (wcap & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT; | ||
| 5873 | /* get type */ | ||
| 5874 | if (wcap != AC_WID_AUD_IN || spec->input_mux->num_items == 1) { | ||
| 5875 | spec->adc_nids = alc260_adc_nids_alt; | ||
| 5876 | spec->num_adc_nids = ARRAY_SIZE(alc260_adc_nids_alt); | ||
| 5877 | } else { | ||
| 5878 | spec->adc_nids = alc260_adc_nids; | ||
| 5879 | spec->num_adc_nids = ARRAY_SIZE(alc260_adc_nids); | ||
| 5880 | } | ||
| 5881 | } | ||
| 5882 | set_capture_mixer(spec); | ||
| 5883 | |||
| 5572 | spec->vmaster_nid = 0x08; | 5884 | spec->vmaster_nid = 0x08; |
| 5573 | 5885 | ||
| 5574 | codec->patch_ops = alc_patch_ops; | 5886 | codec->patch_ops = alc_patch_ops; |
| @@ -5578,6 +5890,7 @@ static int patch_alc260(struct hda_codec *codec) | |||
| 5578 | if (!spec->loopback.amplist) | 5890 | if (!spec->loopback.amplist) |
| 5579 | spec->loopback.amplist = alc260_loopbacks; | 5891 | spec->loopback.amplist = alc260_loopbacks; |
| 5580 | #endif | 5892 | #endif |
| 5893 | codec->proc_widget_hook = print_realtek_coef; | ||
| 5581 | 5894 | ||
| 5582 | return 0; | 5895 | return 0; |
| 5583 | } | 5896 | } |
| @@ -5625,36 +5938,6 @@ static struct hda_input_mux alc882_capture_source = { | |||
| 5625 | { "CD", 0x4 }, | 5938 | { "CD", 0x4 }, |
| 5626 | }, | 5939 | }, |
| 5627 | }; | 5940 | }; |
| 5628 | #define alc882_mux_enum_info alc_mux_enum_info | ||
| 5629 | #define alc882_mux_enum_get alc_mux_enum_get | ||
| 5630 | |||
| 5631 | static int alc882_mux_enum_put(struct snd_kcontrol *kcontrol, | ||
| 5632 | struct snd_ctl_elem_value *ucontrol) | ||
| 5633 | { | ||
| 5634 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); | ||
| 5635 | struct alc_spec *spec = codec->spec; | ||
| 5636 | const struct hda_input_mux *imux = spec->input_mux; | ||
| 5637 | unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id); | ||
| 5638 | hda_nid_t nid = spec->capsrc_nids ? | ||
| 5639 | spec->capsrc_nids[adc_idx] : spec->adc_nids[adc_idx]; | ||
| 5640 | unsigned int *cur_val = &spec->cur_mux[adc_idx]; | ||
| 5641 | unsigned int i, idx; | ||
| 5642 | |||
| 5643 | idx = ucontrol->value.enumerated.item[0]; | ||
| 5644 | if (idx >= imux->num_items) | ||
| 5645 | idx = imux->num_items - 1; | ||
| 5646 | if (*cur_val == idx) | ||
| 5647 | return 0; | ||
| 5648 | for (i = 0; i < imux->num_items; i++) { | ||
| 5649 | unsigned int v = (i == idx) ? 0 : HDA_AMP_MUTE; | ||
| 5650 | snd_hda_codec_amp_stereo(codec, nid, HDA_INPUT, | ||
| 5651 | imux->items[i].index, | ||
| 5652 | HDA_AMP_MUTE, v); | ||
| 5653 | } | ||
| 5654 | *cur_val = idx; | ||
| 5655 | return 1; | ||
| 5656 | } | ||
| 5657 | |||
| 5658 | /* | 5941 | /* |
| 5659 | * 2ch mode | 5942 | * 2ch mode |
| 5660 | */ | 5943 | */ |
| @@ -6337,49 +6620,6 @@ static struct hda_verb alc882_auto_init_verbs[] = { | |||
| 6337 | { } | 6620 | { } |
| 6338 | }; | 6621 | }; |
| 6339 | 6622 | ||
| 6340 | /* capture mixer elements */ | ||
| 6341 | static struct snd_kcontrol_new alc882_capture_alt_mixer[] = { | ||
| 6342 | HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT), | ||
| 6343 | HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT), | ||
| 6344 | HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x09, 0x0, HDA_INPUT), | ||
| 6345 | HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x09, 0x0, HDA_INPUT), | ||
| 6346 | { | ||
| 6347 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
| 6348 | /* The multiple "Capture Source" controls confuse alsamixer | ||
| 6349 | * So call somewhat different.. | ||
| 6350 | */ | ||
| 6351 | /* .name = "Capture Source", */ | ||
| 6352 | .name = "Input Source", | ||
| 6353 | .count = 2, | ||
| 6354 | .info = alc882_mux_enum_info, | ||
| 6355 | .get = alc882_mux_enum_get, | ||
| 6356 | .put = alc882_mux_enum_put, | ||
| 6357 | }, | ||
| 6358 | { } /* end */ | ||
| 6359 | }; | ||
| 6360 | |||
| 6361 | static struct snd_kcontrol_new alc882_capture_mixer[] = { | ||
| 6362 | HDA_CODEC_VOLUME("Capture Volume", 0x07, 0x0, HDA_INPUT), | ||
| 6363 | HDA_CODEC_MUTE("Capture Switch", 0x07, 0x0, HDA_INPUT), | ||
| 6364 | HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x08, 0x0, HDA_INPUT), | ||
| 6365 | HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x08, 0x0, HDA_INPUT), | ||
| 6366 | HDA_CODEC_VOLUME_IDX("Capture Volume", 2, 0x09, 0x0, HDA_INPUT), | ||
| 6367 | HDA_CODEC_MUTE_IDX("Capture Switch", 2, 0x09, 0x0, HDA_INPUT), | ||
| 6368 | { | ||
| 6369 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
| 6370 | /* The multiple "Capture Source" controls confuse alsamixer | ||
| 6371 | * So call somewhat different.. | ||
| 6372 | */ | ||
| 6373 | /* .name = "Capture Source", */ | ||
| 6374 | .name = "Input Source", | ||
| 6375 | .count = 3, | ||
| 6376 | .info = alc882_mux_enum_info, | ||
| 6377 | .get = alc882_mux_enum_get, | ||
| 6378 | .put = alc882_mux_enum_put, | ||
| 6379 | }, | ||
| 6380 | { } /* end */ | ||
| 6381 | }; | ||
| 6382 | |||
| 6383 | #ifdef CONFIG_SND_HDA_POWER_SAVE | 6623 | #ifdef CONFIG_SND_HDA_POWER_SAVE |
| 6384 | #define alc882_loopbacks alc880_loopbacks | 6624 | #define alc882_loopbacks alc880_loopbacks |
| 6385 | #endif | 6625 | #endif |
| @@ -6508,8 +6748,7 @@ static struct alc_config_preset alc882_presets[] = { | |||
| 6508 | .init_hook = alc885_imac24_init_hook, | 6748 | .init_hook = alc885_imac24_init_hook, |
| 6509 | }, | 6749 | }, |
| 6510 | [ALC882_TARGA] = { | 6750 | [ALC882_TARGA] = { |
| 6511 | .mixers = { alc882_targa_mixer, alc882_chmode_mixer, | 6751 | .mixers = { alc882_targa_mixer, alc882_chmode_mixer }, |
| 6512 | alc882_capture_mixer }, | ||
| 6513 | .init_verbs = { alc882_init_verbs, alc882_targa_verbs}, | 6752 | .init_verbs = { alc882_init_verbs, alc882_targa_verbs}, |
| 6514 | .num_dacs = ARRAY_SIZE(alc882_dac_nids), | 6753 | .num_dacs = ARRAY_SIZE(alc882_dac_nids), |
| 6515 | .dac_nids = alc882_dac_nids, | 6754 | .dac_nids = alc882_dac_nids, |
| @@ -6525,8 +6764,7 @@ static struct alc_config_preset alc882_presets[] = { | |||
| 6525 | .init_hook = alc882_targa_automute, | 6764 | .init_hook = alc882_targa_automute, |
| 6526 | }, | 6765 | }, |
| 6527 | [ALC882_ASUS_A7J] = { | 6766 | [ALC882_ASUS_A7J] = { |
| 6528 | .mixers = { alc882_asus_a7j_mixer, alc882_chmode_mixer, | 6767 | .mixers = { alc882_asus_a7j_mixer, alc882_chmode_mixer }, |
| 6529 | alc882_capture_mixer }, | ||
| 6530 | .init_verbs = { alc882_init_verbs, alc882_asus_a7j_verbs}, | 6768 | .init_verbs = { alc882_init_verbs, alc882_asus_a7j_verbs}, |
| 6531 | .num_dacs = ARRAY_SIZE(alc882_dac_nids), | 6769 | .num_dacs = ARRAY_SIZE(alc882_dac_nids), |
| 6532 | .dac_nids = alc882_dac_nids, | 6770 | .dac_nids = alc882_dac_nids, |
| @@ -6831,6 +7069,7 @@ static int patch_alc882(struct hda_codec *codec) | |||
| 6831 | spec->stream_digital_playback = &alc882_pcm_digital_playback; | 7069 | spec->stream_digital_playback = &alc882_pcm_digital_playback; |
| 6832 | spec->stream_digital_capture = &alc882_pcm_digital_capture; | 7070 | spec->stream_digital_capture = &alc882_pcm_digital_capture; |
| 6833 | 7071 | ||
| 7072 | spec->is_mix_capture = 1; /* matrix-style capture */ | ||
| 6834 | if (!spec->adc_nids && spec->input_mux) { | 7073 | if (!spec->adc_nids && spec->input_mux) { |
| 6835 | /* check whether NID 0x07 is valid */ | 7074 | /* check whether NID 0x07 is valid */ |
| 6836 | unsigned int wcap = get_wcaps(codec, 0x07); | 7075 | unsigned int wcap = get_wcaps(codec, 0x07); |
| @@ -6840,17 +7079,13 @@ static int patch_alc882(struct hda_codec *codec) | |||
| 6840 | spec->adc_nids = alc882_adc_nids_alt; | 7079 | spec->adc_nids = alc882_adc_nids_alt; |
| 6841 | spec->num_adc_nids = ARRAY_SIZE(alc882_adc_nids_alt); | 7080 | spec->num_adc_nids = ARRAY_SIZE(alc882_adc_nids_alt); |
| 6842 | spec->capsrc_nids = alc882_capsrc_nids_alt; | 7081 | spec->capsrc_nids = alc882_capsrc_nids_alt; |
| 6843 | spec->mixers[spec->num_mixers] = | ||
| 6844 | alc882_capture_alt_mixer; | ||
| 6845 | spec->num_mixers++; | ||
| 6846 | } else { | 7082 | } else { |
| 6847 | spec->adc_nids = alc882_adc_nids; | 7083 | spec->adc_nids = alc882_adc_nids; |
| 6848 | spec->num_adc_nids = ARRAY_SIZE(alc882_adc_nids); | 7084 | spec->num_adc_nids = ARRAY_SIZE(alc882_adc_nids); |
| 6849 | spec->capsrc_nids = alc882_capsrc_nids; | 7085 | spec->capsrc_nids = alc882_capsrc_nids; |
| 6850 | spec->mixers[spec->num_mixers] = alc882_capture_mixer; | ||
| 6851 | spec->num_mixers++; | ||
| 6852 | } | 7086 | } |
| 6853 | } | 7087 | } |
| 7088 | set_capture_mixer(spec); | ||
| 6854 | 7089 | ||
| 6855 | spec->vmaster_nid = 0x0c; | 7090 | spec->vmaster_nid = 0x0c; |
| 6856 | 7091 | ||
| @@ -6861,6 +7096,7 @@ static int patch_alc882(struct hda_codec *codec) | |||
| 6861 | if (!spec->loopback.amplist) | 7096 | if (!spec->loopback.amplist) |
| 6862 | spec->loopback.amplist = alc882_loopbacks; | 7097 | spec->loopback.amplist = alc882_loopbacks; |
| 6863 | #endif | 7098 | #endif |
| 7099 | codec->proc_widget_hook = print_realtek_coef; | ||
| 6864 | 7100 | ||
| 6865 | return 0; | 7101 | return 0; |
| 6866 | } | 7102 | } |
| @@ -6879,6 +7115,8 @@ static int patch_alc882(struct hda_codec *codec) | |||
| 6879 | #define ALC883_DIGOUT_NID 0x06 | 7115 | #define ALC883_DIGOUT_NID 0x06 |
| 6880 | #define ALC883_DIGIN_NID 0x0a | 7116 | #define ALC883_DIGIN_NID 0x0a |
| 6881 | 7117 | ||
| 7118 | #define ALC1200_DIGOUT_NID 0x10 | ||
| 7119 | |||
| 6882 | static hda_nid_t alc883_dac_nids[4] = { | 7120 | static hda_nid_t alc883_dac_nids[4] = { |
| 6883 | /* front, rear, clfe, rear_surr */ | 7121 | /* front, rear, clfe, rear_surr */ |
| 6884 | 0x02, 0x03, 0x04, 0x05 | 7122 | 0x02, 0x03, 0x04, 0x05 |
| @@ -6889,8 +7127,20 @@ static hda_nid_t alc883_adc_nids[2] = { | |||
| 6889 | 0x08, 0x09, | 7127 | 0x08, 0x09, |
| 6890 | }; | 7128 | }; |
| 6891 | 7129 | ||
| 7130 | static hda_nid_t alc883_adc_nids_alt[1] = { | ||
| 7131 | /* ADC1 */ | ||
| 7132 | 0x08, | ||
| 7133 | }; | ||
| 7134 | |||
| 7135 | static hda_nid_t alc883_adc_nids_rev[2] = { | ||
| 7136 | /* ADC2-1 */ | ||
| 7137 | 0x09, 0x08 | ||
| 7138 | }; | ||
| 7139 | |||
| 6892 | static hda_nid_t alc883_capsrc_nids[2] = { 0x23, 0x22 }; | 7140 | static hda_nid_t alc883_capsrc_nids[2] = { 0x23, 0x22 }; |
| 6893 | 7141 | ||
| 7142 | static hda_nid_t alc883_capsrc_nids_rev[2] = { 0x22, 0x23 }; | ||
| 7143 | |||
| 6894 | /* input MUX */ | 7144 | /* input MUX */ |
| 6895 | /* FIXME: should be a matrix-type input source selection */ | 7145 | /* FIXME: should be a matrix-type input source selection */ |
| 6896 | 7146 | ||
| @@ -6957,11 +7207,6 @@ static struct hda_input_mux alc883_asus_eee1601_capture_source = { | |||
| 6957 | }, | 7207 | }, |
| 6958 | }; | 7208 | }; |
| 6959 | 7209 | ||
| 6960 | #define alc883_mux_enum_info alc_mux_enum_info | ||
| 6961 | #define alc883_mux_enum_get alc_mux_enum_get | ||
| 6962 | /* ALC883 has the ALC882-type input selection */ | ||
| 6963 | #define alc883_mux_enum_put alc882_mux_enum_put | ||
| 6964 | |||
| 6965 | /* | 7210 | /* |
| 6966 | * 2ch mode | 7211 | * 2ch mode |
| 6967 | */ | 7212 | */ |
| @@ -7115,19 +7360,6 @@ static struct snd_kcontrol_new alc883_base_mixer[] = { | |||
| 7115 | HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), | 7360 | HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), |
| 7116 | HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT), | 7361 | HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT), |
| 7117 | HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT), | 7362 | HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT), |
| 7118 | HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT), | ||
| 7119 | HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT), | ||
| 7120 | HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x09, 0x0, HDA_INPUT), | ||
| 7121 | HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x09, 0x0, HDA_INPUT), | ||
| 7122 | { | ||
| 7123 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
| 7124 | /* .name = "Capture Source", */ | ||
| 7125 | .name = "Input Source", | ||
| 7126 | .count = 2, | ||
| 7127 | .info = alc883_mux_enum_info, | ||
| 7128 | .get = alc883_mux_enum_get, | ||
| 7129 | .put = alc883_mux_enum_put, | ||
| 7130 | }, | ||
| 7131 | { } /* end */ | 7363 | { } /* end */ |
| 7132 | }; | 7364 | }; |
| 7133 | 7365 | ||
| @@ -7145,19 +7377,6 @@ static struct snd_kcontrol_new alc883_mitac_mixer[] = { | |||
| 7145 | HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), | 7377 | HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), |
| 7146 | HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT), | 7378 | HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT), |
| 7147 | HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), | 7379 | HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), |
| 7148 | HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT), | ||
| 7149 | HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT), | ||
| 7150 | HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x09, 0x0, HDA_INPUT), | ||
| 7151 | HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x09, 0x0, HDA_INPUT), | ||
| 7152 | { | ||
| 7153 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
| 7154 | /* .name = "Capture Source", */ | ||
| 7155 | .name = "Input Source", | ||
| 7156 | .count = 2, | ||
| 7157 | .info = alc883_mux_enum_info, | ||
| 7158 | .get = alc883_mux_enum_get, | ||
| 7159 | .put = alc883_mux_enum_put, | ||
| 7160 | }, | ||
| 7161 | { } /* end */ | 7380 | { } /* end */ |
| 7162 | }; | 7381 | }; |
| 7163 | 7382 | ||
| @@ -7172,19 +7391,6 @@ static struct snd_kcontrol_new alc883_clevo_m720_mixer[] = { | |||
| 7172 | HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), | 7391 | HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), |
| 7173 | HDA_CODEC_VOLUME("Int Mic Boost", 0x19, 0, HDA_INPUT), | 7392 | HDA_CODEC_VOLUME("Int Mic Boost", 0x19, 0, HDA_INPUT), |
| 7174 | HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), | 7393 | HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), |
| 7175 | HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT), | ||
| 7176 | HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT), | ||
| 7177 | HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x09, 0x0, HDA_INPUT), | ||
| 7178 | HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x09, 0x0, HDA_INPUT), | ||
| 7179 | { | ||
| 7180 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
| 7181 | /* .name = "Capture Source", */ | ||
| 7182 | .name = "Input Source", | ||
| 7183 | .count = 2, | ||
| 7184 | .info = alc883_mux_enum_info, | ||
| 7185 | .get = alc883_mux_enum_get, | ||
| 7186 | .put = alc883_mux_enum_put, | ||
| 7187 | }, | ||
| 7188 | { } /* end */ | 7394 | { } /* end */ |
| 7189 | }; | 7395 | }; |
| 7190 | 7396 | ||
| @@ -7199,19 +7405,6 @@ static struct snd_kcontrol_new alc883_2ch_fujitsu_pi2515_mixer[] = { | |||
| 7199 | HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), | 7405 | HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), |
| 7200 | HDA_CODEC_VOLUME("Int Mic Boost", 0x19, 0, HDA_INPUT), | 7406 | HDA_CODEC_VOLUME("Int Mic Boost", 0x19, 0, HDA_INPUT), |
| 7201 | HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), | 7407 | HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), |
| 7202 | HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT), | ||
| 7203 | HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT), | ||
| 7204 | HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x09, 0x0, HDA_INPUT), | ||
| 7205 | HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x09, 0x0, HDA_INPUT), | ||
| 7206 | { | ||
| 7207 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
| 7208 | /* .name = "Capture Source", */ | ||
| 7209 | .name = "Input Source", | ||
| 7210 | .count = 2, | ||
| 7211 | .info = alc883_mux_enum_info, | ||
| 7212 | .get = alc883_mux_enum_get, | ||
| 7213 | .put = alc883_mux_enum_put, | ||
| 7214 | }, | ||
| 7215 | { } /* end */ | 7408 | { } /* end */ |
| 7216 | }; | 7409 | }; |
| 7217 | 7410 | ||
| @@ -7231,19 +7424,6 @@ static struct snd_kcontrol_new alc883_3ST_2ch_mixer[] = { | |||
| 7231 | HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), | 7424 | HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), |
| 7232 | HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT), | 7425 | HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT), |
| 7233 | HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT), | 7426 | HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT), |
| 7234 | HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT), | ||
| 7235 | HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT), | ||
| 7236 | HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x09, 0x0, HDA_INPUT), | ||
| 7237 | HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x09, 0x0, HDA_INPUT), | ||
| 7238 | { | ||
| 7239 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
| 7240 | /* .name = "Capture Source", */ | ||
| 7241 | .name = "Input Source", | ||
| 7242 | .count = 2, | ||
| 7243 | .info = alc883_mux_enum_info, | ||
| 7244 | .get = alc883_mux_enum_get, | ||
| 7245 | .put = alc883_mux_enum_put, | ||
| 7246 | }, | ||
| 7247 | { } /* end */ | 7427 | { } /* end */ |
| 7248 | }; | 7428 | }; |
| 7249 | 7429 | ||
| @@ -7269,17 +7449,6 @@ static struct snd_kcontrol_new alc883_3ST_6ch_mixer[] = { | |||
| 7269 | HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), | 7449 | HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), |
| 7270 | HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT), | 7450 | HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT), |
| 7271 | HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT), | 7451 | HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT), |
| 7272 | HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT), | ||
| 7273 | HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT), | ||
| 7274 | { | ||
| 7275 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
| 7276 | /* .name = "Capture Source", */ | ||
| 7277 | .name = "Input Source", | ||
| 7278 | .count = 1, | ||
| 7279 | .info = alc883_mux_enum_info, | ||
| 7280 | .get = alc883_mux_enum_get, | ||
| 7281 | .put = alc883_mux_enum_put, | ||
| 7282 | }, | ||
| 7283 | { } /* end */ | 7452 | { } /* end */ |
| 7284 | }; | 7453 | }; |
| 7285 | 7454 | ||
| @@ -7306,19 +7475,6 @@ static struct snd_kcontrol_new alc883_3ST_6ch_intel_mixer[] = { | |||
| 7306 | HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), | 7475 | HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), |
| 7307 | HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT), | 7476 | HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT), |
| 7308 | HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT), | 7477 | HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT), |
| 7309 | HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT), | ||
| 7310 | HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT), | ||
| 7311 | HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x09, 0x0, HDA_INPUT), | ||
| 7312 | HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x09, 0x0, HDA_INPUT), | ||
| 7313 | { | ||
| 7314 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
| 7315 | /* .name = "Capture Source", */ | ||
| 7316 | .name = "Input Source", | ||
| 7317 | .count = 2, | ||
| 7318 | .info = alc883_mux_enum_info, | ||
| 7319 | .get = alc883_mux_enum_get, | ||
| 7320 | .put = alc883_mux_enum_put, | ||
| 7321 | }, | ||
| 7322 | { } /* end */ | 7478 | { } /* end */ |
| 7323 | }; | 7479 | }; |
| 7324 | 7480 | ||
| @@ -7344,18 +7500,6 @@ static struct snd_kcontrol_new alc883_fivestack_mixer[] = { | |||
| 7344 | HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), | 7500 | HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), |
| 7345 | HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT), | 7501 | HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT), |
| 7346 | HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT), | 7502 | HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT), |
| 7347 | HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT), | ||
| 7348 | HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT), | ||
| 7349 | |||
| 7350 | { | ||
| 7351 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
| 7352 | /* .name = "Capture Source", */ | ||
| 7353 | .name = "Input Source", | ||
| 7354 | .count = 1, | ||
| 7355 | .info = alc883_mux_enum_info, | ||
| 7356 | .get = alc883_mux_enum_get, | ||
| 7357 | .put = alc883_mux_enum_put, | ||
| 7358 | }, | ||
| 7359 | { } /* end */ | 7503 | { } /* end */ |
| 7360 | }; | 7504 | }; |
| 7361 | 7505 | ||
| @@ -7376,19 +7520,6 @@ static struct snd_kcontrol_new alc883_tagra_mixer[] = { | |||
| 7376 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), | 7520 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), |
| 7377 | HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT), | 7521 | HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT), |
| 7378 | HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), | 7522 | HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), |
| 7379 | HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT), | ||
| 7380 | HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT), | ||
| 7381 | HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x09, 0x0, HDA_INPUT), | ||
| 7382 | HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x09, 0x0, HDA_INPUT), | ||
| 7383 | { | ||
| 7384 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
| 7385 | /* .name = "Capture Source", */ | ||
| 7386 | .name = "Input Source", | ||
| 7387 | .count = 2, | ||
| 7388 | .info = alc883_mux_enum_info, | ||
| 7389 | .get = alc883_mux_enum_get, | ||
| 7390 | .put = alc883_mux_enum_put, | ||
| 7391 | }, | ||
| 7392 | { } /* end */ | 7523 | { } /* end */ |
| 7393 | }; | 7524 | }; |
| 7394 | 7525 | ||
| @@ -7404,19 +7535,6 @@ static struct snd_kcontrol_new alc883_tagra_2ch_mixer[] = { | |||
| 7404 | HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), | 7535 | HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), |
| 7405 | HDA_CODEC_VOLUME("Int Mic Boost", 0x19, 0, HDA_INPUT), | 7536 | HDA_CODEC_VOLUME("Int Mic Boost", 0x19, 0, HDA_INPUT), |
| 7406 | HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), | 7537 | HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), |
| 7407 | HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT), | ||
| 7408 | HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT), | ||
| 7409 | HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x09, 0x0, HDA_INPUT), | ||
| 7410 | HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x09, 0x0, HDA_INPUT), | ||
| 7411 | { | ||
| 7412 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
| 7413 | /* .name = "Capture Source", */ | ||
| 7414 | .name = "Input Source", | ||
| 7415 | .count = 2, | ||
| 7416 | .info = alc883_mux_enum_info, | ||
| 7417 | .get = alc883_mux_enum_get, | ||
| 7418 | .put = alc883_mux_enum_put, | ||
| 7419 | }, | ||
| 7420 | { } /* end */ | 7538 | { } /* end */ |
| 7421 | }; | 7539 | }; |
| 7422 | 7540 | ||
| @@ -7429,17 +7547,6 @@ static struct snd_kcontrol_new alc883_lenovo_101e_2ch_mixer[] = { | |||
| 7429 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), | 7547 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), |
| 7430 | HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT), | 7548 | HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT), |
| 7431 | HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), | 7549 | HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), |
| 7432 | HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT), | ||
| 7433 | HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT), | ||
| 7434 | { | ||
| 7435 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
| 7436 | /* .name = "Capture Source", */ | ||
| 7437 | .name = "Input Source", | ||
| 7438 | .count = 1, | ||
| 7439 | .info = alc883_mux_enum_info, | ||
| 7440 | .get = alc883_mux_enum_get, | ||
| 7441 | .put = alc883_mux_enum_put, | ||
| 7442 | }, | ||
| 7443 | { } /* end */ | 7550 | { } /* end */ |
| 7444 | }; | 7551 | }; |
| 7445 | 7552 | ||
| @@ -7453,19 +7560,6 @@ static struct snd_kcontrol_new alc883_lenovo_nb0763_mixer[] = { | |||
| 7453 | HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), | 7560 | HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), |
| 7454 | HDA_CODEC_VOLUME("iMic Playback Volume", 0x0b, 0x1, HDA_INPUT), | 7561 | HDA_CODEC_VOLUME("iMic Playback Volume", 0x0b, 0x1, HDA_INPUT), |
| 7455 | HDA_CODEC_MUTE("iMic Playback Switch", 0x0b, 0x1, HDA_INPUT), | 7562 | HDA_CODEC_MUTE("iMic Playback Switch", 0x0b, 0x1, HDA_INPUT), |
| 7456 | HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT), | ||
| 7457 | HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT), | ||
| 7458 | HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x09, 0x0, HDA_INPUT), | ||
| 7459 | HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x09, 0x0, HDA_INPUT), | ||
| 7460 | { | ||
| 7461 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
| 7462 | /* .name = "Capture Source", */ | ||
| 7463 | .name = "Input Source", | ||
| 7464 | .count = 2, | ||
| 7465 | .info = alc883_mux_enum_info, | ||
| 7466 | .get = alc883_mux_enum_get, | ||
| 7467 | .put = alc883_mux_enum_put, | ||
| 7468 | }, | ||
| 7469 | { } /* end */ | 7563 | { } /* end */ |
| 7470 | }; | 7564 | }; |
| 7471 | 7565 | ||
| @@ -7479,19 +7573,6 @@ static struct snd_kcontrol_new alc883_medion_md2_mixer[] = { | |||
| 7479 | HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), | 7573 | HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), |
| 7480 | HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT), | 7574 | HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT), |
| 7481 | HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT), | 7575 | HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT), |
| 7482 | HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT), | ||
| 7483 | HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT), | ||
| 7484 | HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x09, 0x0, HDA_INPUT), | ||
| 7485 | HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x09, 0x0, HDA_INPUT), | ||
| 7486 | { | ||
| 7487 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
| 7488 | /* .name = "Capture Source", */ | ||
| 7489 | .name = "Input Source", | ||
| 7490 | .count = 2, | ||
| 7491 | .info = alc883_mux_enum_info, | ||
| 7492 | .get = alc883_mux_enum_get, | ||
| 7493 | .put = alc883_mux_enum_put, | ||
| 7494 | }, | ||
| 7495 | { } /* end */ | 7576 | { } /* end */ |
| 7496 | }; | 7577 | }; |
| 7497 | 7578 | ||
| @@ -7504,19 +7585,6 @@ static struct snd_kcontrol_new alc883_acer_aspire_mixer[] = { | |||
| 7504 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), | 7585 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), |
| 7505 | HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT), | 7586 | HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT), |
| 7506 | HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), | 7587 | HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), |
| 7507 | HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT), | ||
| 7508 | HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT), | ||
| 7509 | HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x09, 0x0, HDA_INPUT), | ||
| 7510 | HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x09, 0x0, HDA_INPUT), | ||
| 7511 | { | ||
| 7512 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
| 7513 | /* .name = "Capture Source", */ | ||
| 7514 | .name = "Input Source", | ||
| 7515 | .count = 2, | ||
| 7516 | .info = alc883_mux_enum_info, | ||
| 7517 | .get = alc883_mux_enum_get, | ||
| 7518 | .put = alc883_mux_enum_put, | ||
| 7519 | }, | ||
| 7520 | { } /* end */ | 7588 | { } /* end */ |
| 7521 | }; | 7589 | }; |
| 7522 | 7590 | ||
| @@ -7544,19 +7612,6 @@ static struct snd_kcontrol_new alc888_lenovo_sky_mixer[] = { | |||
| 7544 | HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), | 7612 | HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), |
| 7545 | HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT), | 7613 | HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT), |
| 7546 | HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), | 7614 | HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), |
| 7547 | HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT), | ||
| 7548 | HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT), | ||
| 7549 | HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x09, 0x0, HDA_INPUT), | ||
| 7550 | HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x09, 0x0, HDA_INPUT), | ||
| 7551 | { | ||
| 7552 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
| 7553 | /* .name = "Capture Source", */ | ||
| 7554 | .name = "Input Source", | ||
| 7555 | .count = 2, | ||
| 7556 | .info = alc883_mux_enum_info, | ||
| 7557 | .get = alc883_mux_enum_get, | ||
| 7558 | .put = alc883_mux_enum_put, | ||
| 7559 | }, | ||
| 7560 | { } /* end */ | 7615 | { } /* end */ |
| 7561 | }; | 7616 | }; |
| 7562 | 7617 | ||
| @@ -7587,6 +7642,10 @@ static struct snd_kcontrol_new alc883_asus_eee1601_mixer[] = { | |||
| 7587 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), | 7642 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), |
| 7588 | HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT), | 7643 | HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT), |
| 7589 | HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), | 7644 | HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), |
| 7645 | { } /* end */ | ||
| 7646 | }; | ||
| 7647 | |||
| 7648 | static struct snd_kcontrol_new alc883_asus_eee1601_cap_mixer[] = { | ||
| 7590 | HDA_BIND_VOL("Capture Volume", &alc883_bind_cap_vol), | 7649 | HDA_BIND_VOL("Capture Volume", &alc883_bind_cap_vol), |
| 7591 | HDA_BIND_SW("Capture Switch", &alc883_bind_cap_switch), | 7650 | HDA_BIND_SW("Capture Switch", &alc883_bind_cap_switch), |
| 7592 | { | 7651 | { |
| @@ -7594,9 +7653,9 @@ static struct snd_kcontrol_new alc883_asus_eee1601_mixer[] = { | |||
| 7594 | /* .name = "Capture Source", */ | 7653 | /* .name = "Capture Source", */ |
| 7595 | .name = "Input Source", | 7654 | .name = "Input Source", |
| 7596 | .count = 1, | 7655 | .count = 1, |
| 7597 | .info = alc883_mux_enum_info, | 7656 | .info = alc_mux_enum_info, |
| 7598 | .get = alc883_mux_enum_get, | 7657 | .get = alc_mux_enum_get, |
| 7599 | .put = alc883_mux_enum_put, | 7658 | .put = alc_mux_enum_put, |
| 7600 | }, | 7659 | }, |
| 7601 | { } /* end */ | 7660 | { } /* end */ |
| 7602 | }; | 7661 | }; |
| @@ -8251,27 +8310,6 @@ static struct hda_verb alc883_auto_init_verbs[] = { | |||
| 8251 | { } | 8310 | { } |
| 8252 | }; | 8311 | }; |
| 8253 | 8312 | ||
| 8254 | /* capture mixer elements */ | ||
| 8255 | static struct snd_kcontrol_new alc883_capture_mixer[] = { | ||
| 8256 | HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT), | ||
| 8257 | HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT), | ||
| 8258 | HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x09, 0x0, HDA_INPUT), | ||
| 8259 | HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x09, 0x0, HDA_INPUT), | ||
| 8260 | { | ||
| 8261 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
| 8262 | /* The multiple "Capture Source" controls confuse alsamixer | ||
| 8263 | * So call somewhat different.. | ||
| 8264 | */ | ||
| 8265 | /* .name = "Capture Source", */ | ||
| 8266 | .name = "Input Source", | ||
| 8267 | .count = 2, | ||
| 8268 | .info = alc882_mux_enum_info, | ||
| 8269 | .get = alc882_mux_enum_get, | ||
| 8270 | .put = alc882_mux_enum_put, | ||
| 8271 | }, | ||
| 8272 | { } /* end */ | ||
| 8273 | }; | ||
| 8274 | |||
| 8275 | static struct hda_verb alc888_asus_m90v_verbs[] = { | 8313 | static struct hda_verb alc888_asus_m90v_verbs[] = { |
| 8276 | {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, | 8314 | {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, |
| 8277 | {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, | 8315 | {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, |
| @@ -8394,6 +8432,7 @@ static const char *alc883_models[ALC883_MODEL_LAST] = { | |||
| 8394 | [ALC883_TARGA_2ch_DIG] = "targa-2ch-dig", | 8432 | [ALC883_TARGA_2ch_DIG] = "targa-2ch-dig", |
| 8395 | [ALC883_ACER] = "acer", | 8433 | [ALC883_ACER] = "acer", |
| 8396 | [ALC883_ACER_ASPIRE] = "acer-aspire", | 8434 | [ALC883_ACER_ASPIRE] = "acer-aspire", |
| 8435 | [ALC888_ACER_ASPIRE_4930G] = "acer-aspire-4930g", | ||
| 8397 | [ALC883_MEDION] = "medion", | 8436 | [ALC883_MEDION] = "medion", |
| 8398 | [ALC883_MEDION_MD2] = "medion-md2", | 8437 | [ALC883_MEDION_MD2] = "medion-md2", |
| 8399 | [ALC883_LAPTOP_EAPD] = "laptop-eapd", | 8438 | [ALC883_LAPTOP_EAPD] = "laptop-eapd", |
| @@ -8407,7 +8446,9 @@ static const char *alc883_models[ALC883_MODEL_LAST] = { | |||
| 8407 | [ALC883_MITAC] = "mitac", | 8446 | [ALC883_MITAC] = "mitac", |
| 8408 | [ALC883_CLEVO_M720] = "clevo-m720", | 8447 | [ALC883_CLEVO_M720] = "clevo-m720", |
| 8409 | [ALC883_FUJITSU_PI2515] = "fujitsu-pi2515", | 8448 | [ALC883_FUJITSU_PI2515] = "fujitsu-pi2515", |
| 8449 | [ALC888_FUJITSU_XA3530] = "fujitsu-xa3530", | ||
| 8410 | [ALC883_3ST_6ch_INTEL] = "3stack-6ch-intel", | 8450 | [ALC883_3ST_6ch_INTEL] = "3stack-6ch-intel", |
| 8451 | [ALC1200_ASUS_P5Q] = "asus-p5q", | ||
| 8411 | [ALC883_AUTO] = "auto", | 8452 | [ALC883_AUTO] = "auto", |
| 8412 | }; | 8453 | }; |
| 8413 | 8454 | ||
| @@ -8418,6 +8459,8 @@ static struct snd_pci_quirk alc883_cfg_tbl[] = { | |||
| 8418 | SND_PCI_QUIRK(0x1025, 0x0110, "Acer Aspire", ALC883_ACER_ASPIRE), | 8459 | SND_PCI_QUIRK(0x1025, 0x0110, "Acer Aspire", ALC883_ACER_ASPIRE), |
| 8419 | SND_PCI_QUIRK(0x1025, 0x0112, "Acer Aspire 9303", ALC883_ACER_ASPIRE), | 8460 | SND_PCI_QUIRK(0x1025, 0x0112, "Acer Aspire 9303", ALC883_ACER_ASPIRE), |
| 8420 | SND_PCI_QUIRK(0x1025, 0x0121, "Acer Aspire 5920G", ALC883_ACER_ASPIRE), | 8461 | SND_PCI_QUIRK(0x1025, 0x0121, "Acer Aspire 5920G", ALC883_ACER_ASPIRE), |
| 8462 | SND_PCI_QUIRK(0x1025, 0x013e, "Acer Aspire 4930G", | ||
| 8463 | ALC888_ACER_ASPIRE_4930G), | ||
| 8421 | SND_PCI_QUIRK(0x1025, 0, "Acer laptop", ALC883_ACER), /* default Acer */ | 8464 | SND_PCI_QUIRK(0x1025, 0, "Acer laptop", ALC883_ACER), /* default Acer */ |
| 8422 | SND_PCI_QUIRK(0x1028, 0x020d, "Dell Inspiron 530", ALC888_6ST_DELL), | 8465 | SND_PCI_QUIRK(0x1028, 0x020d, "Dell Inspiron 530", ALC888_6ST_DELL), |
| 8423 | SND_PCI_QUIRK(0x103c, 0x2a3d, "HP Pavillion", ALC883_6ST_DIG), | 8466 | SND_PCI_QUIRK(0x103c, 0x2a3d, "HP Pavillion", ALC883_6ST_DIG), |
| @@ -8426,6 +8469,7 @@ static struct snd_pci_quirk alc883_cfg_tbl[] = { | |||
| 8426 | SND_PCI_QUIRK(0x103c, 0x2a61, "HP Nettle", ALC883_6ST_DIG), | 8469 | SND_PCI_QUIRK(0x103c, 0x2a61, "HP Nettle", ALC883_6ST_DIG), |
| 8427 | SND_PCI_QUIRK(0x1043, 0x1873, "Asus M90V", ALC888_ASUS_M90V), | 8470 | SND_PCI_QUIRK(0x1043, 0x1873, "Asus M90V", ALC888_ASUS_M90V), |
| 8428 | SND_PCI_QUIRK(0x1043, 0x8249, "Asus M2A-VM HDMI", ALC883_3ST_6ch_DIG), | 8471 | SND_PCI_QUIRK(0x1043, 0x8249, "Asus M2A-VM HDMI", ALC883_3ST_6ch_DIG), |
| 8472 | SND_PCI_QUIRK(0x1043, 0x82fe, "Asus P5Q-EM HDMI", ALC1200_ASUS_P5Q), | ||
| 8429 | SND_PCI_QUIRK(0x1043, 0x835f, "Asus Eee 1601", ALC888_ASUS_EEE1601), | 8473 | SND_PCI_QUIRK(0x1043, 0x835f, "Asus Eee 1601", ALC888_ASUS_EEE1601), |
| 8430 | SND_PCI_QUIRK(0x105b, 0x0ce8, "Foxconn P35AX-S", ALC883_6ST_DIG), | 8474 | SND_PCI_QUIRK(0x105b, 0x0ce8, "Foxconn P35AX-S", ALC883_6ST_DIG), |
| 8431 | SND_PCI_QUIRK(0x105b, 0x6668, "Foxconn", ALC883_6ST_DIG), | 8475 | SND_PCI_QUIRK(0x105b, 0x6668, "Foxconn", ALC883_6ST_DIG), |
| @@ -8452,6 +8496,7 @@ static struct snd_pci_quirk alc883_cfg_tbl[] = { | |||
| 8452 | SND_PCI_QUIRK(0x1462, 0x6668, "MSI", ALC883_6ST_DIG), | 8496 | SND_PCI_QUIRK(0x1462, 0x6668, "MSI", ALC883_6ST_DIG), |
| 8453 | SND_PCI_QUIRK(0x1462, 0x7187, "MSI", ALC883_6ST_DIG), | 8497 | SND_PCI_QUIRK(0x1462, 0x7187, "MSI", ALC883_6ST_DIG), |
| 8454 | SND_PCI_QUIRK(0x1462, 0x7250, "MSI", ALC883_6ST_DIG), | 8498 | SND_PCI_QUIRK(0x1462, 0x7250, "MSI", ALC883_6ST_DIG), |
| 8499 | SND_PCI_QUIRK(0x1462, 0x7260, "MSI 7260", ALC883_TARGA_DIG), | ||
| 8455 | SND_PCI_QUIRK(0x1462, 0x7267, "MSI", ALC883_3ST_6ch_DIG), | 8500 | SND_PCI_QUIRK(0x1462, 0x7267, "MSI", ALC883_3ST_6ch_DIG), |
| 8456 | SND_PCI_QUIRK(0x1462, 0x7280, "MSI", ALC883_6ST_DIG), | 8501 | SND_PCI_QUIRK(0x1462, 0x7280, "MSI", ALC883_6ST_DIG), |
| 8457 | SND_PCI_QUIRK(0x1462, 0x7327, "MSI", ALC883_6ST_DIG), | 8502 | SND_PCI_QUIRK(0x1462, 0x7327, "MSI", ALC883_6ST_DIG), |
| @@ -8463,6 +8508,8 @@ static struct snd_pci_quirk alc883_cfg_tbl[] = { | |||
| 8463 | SND_PCI_QUIRK(0x15d9, 0x8780, "Supermicro PDSBA", ALC883_3ST_6ch), | 8508 | SND_PCI_QUIRK(0x15d9, 0x8780, "Supermicro PDSBA", ALC883_3ST_6ch), |
| 8464 | SND_PCI_QUIRK(0x161f, 0x2054, "Medion laptop", ALC883_MEDION), | 8509 | SND_PCI_QUIRK(0x161f, 0x2054, "Medion laptop", ALC883_MEDION), |
| 8465 | SND_PCI_QUIRK(0x1734, 0x1108, "Fujitsu AMILO Pi2515", ALC883_FUJITSU_PI2515), | 8510 | SND_PCI_QUIRK(0x1734, 0x1108, "Fujitsu AMILO Pi2515", ALC883_FUJITSU_PI2515), |
| 8511 | SND_PCI_QUIRK(0x1734, 0x113d, "Fujitsu AMILO Xa3530", | ||
| 8512 | ALC888_FUJITSU_XA3530), | ||
| 8466 | SND_PCI_QUIRK(0x17aa, 0x101e, "Lenovo 101e", ALC883_LENOVO_101E_2ch), | 8513 | SND_PCI_QUIRK(0x17aa, 0x101e, "Lenovo 101e", ALC883_LENOVO_101E_2ch), |
| 8467 | SND_PCI_QUIRK(0x17aa, 0x2085, "Lenovo NB0763", ALC883_LENOVO_NB0763), | 8514 | SND_PCI_QUIRK(0x17aa, 0x2085, "Lenovo NB0763", ALC883_LENOVO_NB0763), |
| 8468 | SND_PCI_QUIRK(0x17aa, 0x3bfc, "Lenovo NB0763", ALC883_LENOVO_NB0763), | 8515 | SND_PCI_QUIRK(0x17aa, 0x3bfc, "Lenovo NB0763", ALC883_LENOVO_NB0763), |
| @@ -8553,6 +8600,8 @@ static struct alc_config_preset alc883_presets[] = { | |||
| 8553 | .init_verbs = { alc883_init_verbs, alc883_tagra_verbs}, | 8600 | .init_verbs = { alc883_init_verbs, alc883_tagra_verbs}, |
| 8554 | .num_dacs = ARRAY_SIZE(alc883_dac_nids), | 8601 | .num_dacs = ARRAY_SIZE(alc883_dac_nids), |
| 8555 | .dac_nids = alc883_dac_nids, | 8602 | .dac_nids = alc883_dac_nids, |
| 8603 | .adc_nids = alc883_adc_nids_alt, | ||
| 8604 | .num_adc_nids = ARRAY_SIZE(alc883_adc_nids_alt), | ||
| 8556 | .dig_out_nid = ALC883_DIGOUT_NID, | 8605 | .dig_out_nid = ALC883_DIGOUT_NID, |
| 8557 | .num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes), | 8606 | .num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes), |
| 8558 | .channel_mode = alc883_3ST_2ch_modes, | 8607 | .channel_mode = alc883_3ST_2ch_modes, |
| @@ -8586,6 +8635,26 @@ static struct alc_config_preset alc883_presets[] = { | |||
| 8586 | .unsol_event = alc883_acer_aspire_unsol_event, | 8635 | .unsol_event = alc883_acer_aspire_unsol_event, |
| 8587 | .init_hook = alc883_acer_aspire_automute, | 8636 | .init_hook = alc883_acer_aspire_automute, |
| 8588 | }, | 8637 | }, |
| 8638 | [ALC888_ACER_ASPIRE_4930G] = { | ||
| 8639 | .mixers = { alc888_base_mixer, | ||
| 8640 | alc883_chmode_mixer }, | ||
| 8641 | .init_verbs = { alc883_init_verbs, alc880_gpio1_init_verbs, | ||
| 8642 | alc888_acer_aspire_4930g_verbs }, | ||
| 8643 | .num_dacs = ARRAY_SIZE(alc883_dac_nids), | ||
| 8644 | .dac_nids = alc883_dac_nids, | ||
| 8645 | .num_adc_nids = ARRAY_SIZE(alc883_adc_nids_rev), | ||
| 8646 | .adc_nids = alc883_adc_nids_rev, | ||
| 8647 | .capsrc_nids = alc883_capsrc_nids_rev, | ||
| 8648 | .dig_out_nid = ALC883_DIGOUT_NID, | ||
| 8649 | .num_channel_mode = ARRAY_SIZE(alc883_3ST_6ch_modes), | ||
| 8650 | .channel_mode = alc883_3ST_6ch_modes, | ||
| 8651 | .need_dac_fix = 1, | ||
| 8652 | .num_mux_defs = | ||
| 8653 | ARRAY_SIZE(alc888_2_capture_sources), | ||
| 8654 | .input_mux = alc888_2_capture_sources, | ||
| 8655 | .unsol_event = alc888_acer_aspire_4930g_unsol_event, | ||
| 8656 | .init_hook = alc888_acer_aspire_4930g_automute, | ||
| 8657 | }, | ||
| 8589 | [ALC883_MEDION] = { | 8658 | [ALC883_MEDION] = { |
| 8590 | .mixers = { alc883_fivestack_mixer, | 8659 | .mixers = { alc883_fivestack_mixer, |
| 8591 | alc883_chmode_mixer }, | 8660 | alc883_chmode_mixer }, |
| @@ -8593,6 +8662,8 @@ static struct alc_config_preset alc883_presets[] = { | |||
| 8593 | alc883_medion_eapd_verbs }, | 8662 | alc883_medion_eapd_verbs }, |
| 8594 | .num_dacs = ARRAY_SIZE(alc883_dac_nids), | 8663 | .num_dacs = ARRAY_SIZE(alc883_dac_nids), |
| 8595 | .dac_nids = alc883_dac_nids, | 8664 | .dac_nids = alc883_dac_nids, |
| 8665 | .adc_nids = alc883_adc_nids_alt, | ||
| 8666 | .num_adc_nids = ARRAY_SIZE(alc883_adc_nids_alt), | ||
| 8596 | .num_channel_mode = ARRAY_SIZE(alc883_sixstack_modes), | 8667 | .num_channel_mode = ARRAY_SIZE(alc883_sixstack_modes), |
| 8597 | .channel_mode = alc883_sixstack_modes, | 8668 | .channel_mode = alc883_sixstack_modes, |
| 8598 | .input_mux = &alc883_capture_source, | 8669 | .input_mux = &alc883_capture_source, |
| @@ -8635,6 +8706,8 @@ static struct alc_config_preset alc883_presets[] = { | |||
| 8635 | .init_verbs = { alc883_init_verbs, alc883_lenovo_101e_verbs}, | 8706 | .init_verbs = { alc883_init_verbs, alc883_lenovo_101e_verbs}, |
| 8636 | .num_dacs = ARRAY_SIZE(alc883_dac_nids), | 8707 | .num_dacs = ARRAY_SIZE(alc883_dac_nids), |
| 8637 | .dac_nids = alc883_dac_nids, | 8708 | .dac_nids = alc883_dac_nids, |
| 8709 | .adc_nids = alc883_adc_nids_alt, | ||
| 8710 | .num_adc_nids = ARRAY_SIZE(alc883_adc_nids_alt), | ||
| 8638 | .num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes), | 8711 | .num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes), |
| 8639 | .channel_mode = alc883_3ST_2ch_modes, | 8712 | .channel_mode = alc883_3ST_2ch_modes, |
| 8640 | .input_mux = &alc883_lenovo_101e_capture_source, | 8713 | .input_mux = &alc883_lenovo_101e_capture_source, |
| @@ -8725,14 +8798,30 @@ static struct alc_config_preset alc883_presets[] = { | |||
| 8725 | .unsol_event = alc883_2ch_fujitsu_pi2515_unsol_event, | 8798 | .unsol_event = alc883_2ch_fujitsu_pi2515_unsol_event, |
| 8726 | .init_hook = alc883_2ch_fujitsu_pi2515_automute, | 8799 | .init_hook = alc883_2ch_fujitsu_pi2515_automute, |
| 8727 | }, | 8800 | }, |
| 8801 | [ALC888_FUJITSU_XA3530] = { | ||
| 8802 | .mixers = { alc888_base_mixer, alc883_chmode_mixer }, | ||
| 8803 | .init_verbs = { alc883_init_verbs, | ||
| 8804 | alc888_fujitsu_xa3530_verbs }, | ||
| 8805 | .num_dacs = ARRAY_SIZE(alc883_dac_nids), | ||
| 8806 | .dac_nids = alc883_dac_nids, | ||
| 8807 | .num_adc_nids = ARRAY_SIZE(alc883_adc_nids_rev), | ||
| 8808 | .adc_nids = alc883_adc_nids_rev, | ||
| 8809 | .capsrc_nids = alc883_capsrc_nids_rev, | ||
| 8810 | .dig_out_nid = ALC883_DIGOUT_NID, | ||
| 8811 | .num_channel_mode = ARRAY_SIZE(alc888_4ST_8ch_intel_modes), | ||
| 8812 | .channel_mode = alc888_4ST_8ch_intel_modes, | ||
| 8813 | .num_mux_defs = | ||
| 8814 | ARRAY_SIZE(alc888_2_capture_sources), | ||
| 8815 | .input_mux = alc888_2_capture_sources, | ||
| 8816 | .unsol_event = alc888_fujitsu_xa3530_unsol_event, | ||
| 8817 | .init_hook = alc888_fujitsu_xa3530_automute, | ||
| 8818 | }, | ||
| 8728 | [ALC888_LENOVO_SKY] = { | 8819 | [ALC888_LENOVO_SKY] = { |
| 8729 | .mixers = { alc888_lenovo_sky_mixer, alc883_chmode_mixer }, | 8820 | .mixers = { alc888_lenovo_sky_mixer, alc883_chmode_mixer }, |
| 8730 | .init_verbs = { alc883_init_verbs, alc888_lenovo_sky_verbs}, | 8821 | .init_verbs = { alc883_init_verbs, alc888_lenovo_sky_verbs}, |
| 8731 | .num_dacs = ARRAY_SIZE(alc883_dac_nids), | 8822 | .num_dacs = ARRAY_SIZE(alc883_dac_nids), |
| 8732 | .dac_nids = alc883_dac_nids, | 8823 | .dac_nids = alc883_dac_nids, |
| 8733 | .dig_out_nid = ALC883_DIGOUT_NID, | 8824 | .dig_out_nid = ALC883_DIGOUT_NID, |
| 8734 | .num_adc_nids = ARRAY_SIZE(alc883_adc_nids), | ||
| 8735 | .adc_nids = alc883_adc_nids, | ||
| 8736 | .num_channel_mode = ARRAY_SIZE(alc883_sixstack_modes), | 8825 | .num_channel_mode = ARRAY_SIZE(alc883_sixstack_modes), |
| 8737 | .channel_mode = alc883_sixstack_modes, | 8826 | .channel_mode = alc883_sixstack_modes, |
| 8738 | .need_dac_fix = 1, | 8827 | .need_dac_fix = 1, |
| @@ -8756,6 +8845,7 @@ static struct alc_config_preset alc883_presets[] = { | |||
| 8756 | }, | 8845 | }, |
| 8757 | [ALC888_ASUS_EEE1601] = { | 8846 | [ALC888_ASUS_EEE1601] = { |
| 8758 | .mixers = { alc883_asus_eee1601_mixer }, | 8847 | .mixers = { alc883_asus_eee1601_mixer }, |
| 8848 | .cap_mixer = alc883_asus_eee1601_cap_mixer, | ||
| 8759 | .init_verbs = { alc883_init_verbs, alc888_asus_eee1601_verbs }, | 8849 | .init_verbs = { alc883_init_verbs, alc888_asus_eee1601_verbs }, |
| 8760 | .num_dacs = ARRAY_SIZE(alc883_dac_nids), | 8850 | .num_dacs = ARRAY_SIZE(alc883_dac_nids), |
| 8761 | .dac_nids = alc883_dac_nids, | 8851 | .dac_nids = alc883_dac_nids, |
| @@ -8768,6 +8858,17 @@ static struct alc_config_preset alc883_presets[] = { | |||
| 8768 | .unsol_event = alc883_eee1601_unsol_event, | 8858 | .unsol_event = alc883_eee1601_unsol_event, |
| 8769 | .init_hook = alc883_eee1601_inithook, | 8859 | .init_hook = alc883_eee1601_inithook, |
| 8770 | }, | 8860 | }, |
| 8861 | [ALC1200_ASUS_P5Q] = { | ||
| 8862 | .mixers = { alc883_base_mixer, alc883_chmode_mixer }, | ||
| 8863 | .init_verbs = { alc883_init_verbs }, | ||
| 8864 | .num_dacs = ARRAY_SIZE(alc883_dac_nids), | ||
| 8865 | .dac_nids = alc883_dac_nids, | ||
| 8866 | .dig_out_nid = ALC1200_DIGOUT_NID, | ||
| 8867 | .dig_in_nid = ALC883_DIGIN_NID, | ||
| 8868 | .num_channel_mode = ARRAY_SIZE(alc883_sixstack_modes), | ||
| 8869 | .channel_mode = alc883_sixstack_modes, | ||
| 8870 | .input_mux = &alc883_capture_source, | ||
| 8871 | }, | ||
| 8771 | }; | 8872 | }; |
| 8772 | 8873 | ||
| 8773 | 8874 | ||
| @@ -8862,8 +8963,6 @@ static int alc883_parse_auto_config(struct hda_codec *codec) | |||
| 8862 | 8963 | ||
| 8863 | /* hack - override the init verbs */ | 8964 | /* hack - override the init verbs */ |
| 8864 | spec->init_verbs[0] = alc883_auto_init_verbs; | 8965 | spec->init_verbs[0] = alc883_auto_init_verbs; |
| 8865 | spec->mixers[spec->num_mixers] = alc883_capture_mixer; | ||
| 8866 | spec->num_mixers++; | ||
| 8867 | 8966 | ||
| 8868 | return 1; /* config found */ | 8967 | return 1; /* config found */ |
| 8869 | } | 8968 | } |
| @@ -8946,9 +9045,15 @@ static int patch_alc883(struct hda_codec *codec) | |||
| 8946 | spec->stream_digital_playback = &alc883_pcm_digital_playback; | 9045 | spec->stream_digital_playback = &alc883_pcm_digital_playback; |
| 8947 | spec->stream_digital_capture = &alc883_pcm_digital_capture; | 9046 | spec->stream_digital_capture = &alc883_pcm_digital_capture; |
| 8948 | 9047 | ||
| 8949 | spec->num_adc_nids = ARRAY_SIZE(alc883_adc_nids); | 9048 | if (!spec->num_adc_nids) { |
| 8950 | spec->adc_nids = alc883_adc_nids; | 9049 | spec->num_adc_nids = ARRAY_SIZE(alc883_adc_nids); |
| 8951 | spec->capsrc_nids = alc883_capsrc_nids; | 9050 | spec->adc_nids = alc883_adc_nids; |
| 9051 | } | ||
| 9052 | if (!spec->capsrc_nids) | ||
| 9053 | spec->capsrc_nids = alc883_capsrc_nids; | ||
| 9054 | spec->is_mix_capture = 1; /* matrix-style capture */ | ||
| 9055 | if (!spec->cap_mixer) | ||
| 9056 | set_capture_mixer(spec); | ||
| 8952 | 9057 | ||
| 8953 | spec->vmaster_nid = 0x0c; | 9058 | spec->vmaster_nid = 0x0c; |
| 8954 | 9059 | ||
| @@ -8960,6 +9065,7 @@ static int patch_alc883(struct hda_codec *codec) | |||
| 8960 | if (!spec->loopback.amplist) | 9065 | if (!spec->loopback.amplist) |
| 8961 | spec->loopback.amplist = alc883_loopbacks; | 9066 | spec->loopback.amplist = alc883_loopbacks; |
| 8962 | #endif | 9067 | #endif |
| 9068 | codec->proc_widget_hook = print_realtek_coef; | ||
| 8963 | 9069 | ||
| 8964 | return 0; | 9070 | return 0; |
| 8965 | } | 9071 | } |
| @@ -9439,20 +9545,6 @@ static struct snd_kcontrol_new alc262_toshiba_s06_mixer[] = { | |||
| 9439 | HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT), | 9545 | HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT), |
| 9440 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), | 9546 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), |
| 9441 | HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), | 9547 | HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), |
| 9442 | HDA_CODEC_VOLUME("Capture Volume", 0x09, 0x0, HDA_INPUT), | ||
| 9443 | HDA_CODEC_MUTE("Capture Switch", 0x09, 0x0, HDA_INPUT), | ||
| 9444 | { | ||
| 9445 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
| 9446 | /* The multiple "Capture Source" controls confuse alsamixer | ||
| 9447 | * So call somewhat different.. | ||
| 9448 | */ | ||
| 9449 | /* .name = "Capture Source", */ | ||
| 9450 | .name = "Input Source", | ||
| 9451 | .count = 1, | ||
| 9452 | .info = alc_mux_enum_info, | ||
| 9453 | .get = alc_mux_enum_get, | ||
| 9454 | .put = alc_mux_enum_put, | ||
| 9455 | }, | ||
| 9456 | { } /* end */ | 9548 | { } /* end */ |
| 9457 | }; | 9549 | }; |
| 9458 | 9550 | ||
| @@ -9969,7 +10061,7 @@ static int alc262_ultra_mux_enum_put(struct snd_kcontrol *kcontrol, | |||
| 9969 | struct alc_spec *spec = codec->spec; | 10061 | struct alc_spec *spec = codec->spec; |
| 9970 | int ret; | 10062 | int ret; |
| 9971 | 10063 | ||
| 9972 | ret = alc882_mux_enum_put(kcontrol, ucontrol); | 10064 | ret = alc_mux_enum_put(kcontrol, ucontrol); |
| 9973 | if (!ret) | 10065 | if (!ret) |
| 9974 | return 0; | 10066 | return 0; |
| 9975 | /* reprogram the HP pin as mic or HP according to the input source */ | 10067 | /* reprogram the HP pin as mic or HP according to the input source */ |
| @@ -9986,8 +10078,8 @@ static struct snd_kcontrol_new alc262_ultra_capture_mixer[] = { | |||
| 9986 | { | 10078 | { |
| 9987 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 10079 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
| 9988 | .name = "Capture Source", | 10080 | .name = "Capture Source", |
| 9989 | .info = alc882_mux_enum_info, | 10081 | .info = alc_mux_enum_info, |
| 9990 | .get = alc882_mux_enum_get, | 10082 | .get = alc_mux_enum_get, |
| 9991 | .put = alc262_ultra_mux_enum_put, | 10083 | .put = alc262_ultra_mux_enum_put, |
| 9992 | }, | 10084 | }, |
| 9993 | { } /* end */ | 10085 | { } /* end */ |
| @@ -10380,10 +10472,10 @@ static int alc262_parse_auto_config(struct hda_codec *codec) | |||
| 10380 | if (spec->autocfg.dig_in_pin) | 10472 | if (spec->autocfg.dig_in_pin) |
| 10381 | spec->dig_in_nid = ALC262_DIGIN_NID; | 10473 | spec->dig_in_nid = ALC262_DIGIN_NID; |
| 10382 | 10474 | ||
| 10383 | if (spec->kctl_alloc) | 10475 | if (spec->kctls.list) |
| 10384 | spec->mixers[spec->num_mixers++] = spec->kctl_alloc; | 10476 | add_mixer(spec, spec->kctls.list); |
| 10385 | 10477 | ||
| 10386 | spec->init_verbs[spec->num_init_verbs++] = alc262_volume_init_verbs; | 10478 | add_verb(spec, alc262_volume_init_verbs); |
| 10387 | spec->num_mux_defs = 1; | 10479 | spec->num_mux_defs = 1; |
| 10388 | spec->input_mux = &spec->private_imux; | 10480 | spec->input_mux = &spec->private_imux; |
| 10389 | 10481 | ||
| @@ -10466,6 +10558,8 @@ static struct snd_pci_quirk alc262_cfg_tbl[] = { | |||
| 10466 | SND_PCI_QUIRK(0x104d, 0x820f, "Sony ASSAMD", ALC262_SONY_ASSAMD), | 10558 | SND_PCI_QUIRK(0x104d, 0x820f, "Sony ASSAMD", ALC262_SONY_ASSAMD), |
| 10467 | SND_PCI_QUIRK(0x104d, 0x900e, "Sony ASSAMD", ALC262_SONY_ASSAMD), | 10559 | SND_PCI_QUIRK(0x104d, 0x900e, "Sony ASSAMD", ALC262_SONY_ASSAMD), |
| 10468 | SND_PCI_QUIRK(0x104d, 0x9015, "Sony 0x9015", ALC262_SONY_ASSAMD), | 10560 | SND_PCI_QUIRK(0x104d, 0x9015, "Sony 0x9015", ALC262_SONY_ASSAMD), |
| 10561 | SND_PCI_QUIRK(0x104d, 0x9033, "Sony VAIO VGN-SR19XN", | ||
| 10562 | ALC262_SONY_ASSAMD), | ||
| 10469 | SND_PCI_QUIRK(0x1179, 0x0001, "Toshiba dynabook SS RX1", | 10563 | SND_PCI_QUIRK(0x1179, 0x0001, "Toshiba dynabook SS RX1", |
| 10470 | ALC262_TOSHIBA_RX1), | 10564 | ALC262_TOSHIBA_RX1), |
| 10471 | SND_PCI_QUIRK(0x1179, 0xff7b, "Toshiba S06", ALC262_TOSHIBA_S06), | 10565 | SND_PCI_QUIRK(0x1179, 0xff7b, "Toshiba S06", ALC262_TOSHIBA_S06), |
| @@ -10624,7 +10718,8 @@ static struct alc_config_preset alc262_presets[] = { | |||
| 10624 | .init_hook = alc262_hippo_automute, | 10718 | .init_hook = alc262_hippo_automute, |
| 10625 | }, | 10719 | }, |
| 10626 | [ALC262_ULTRA] = { | 10720 | [ALC262_ULTRA] = { |
| 10627 | .mixers = { alc262_ultra_mixer, alc262_ultra_capture_mixer }, | 10721 | .mixers = { alc262_ultra_mixer }, |
| 10722 | .cap_mixer = alc262_ultra_capture_mixer, | ||
| 10628 | .init_verbs = { alc262_ultra_verbs }, | 10723 | .init_verbs = { alc262_ultra_verbs }, |
| 10629 | .num_dacs = ARRAY_SIZE(alc262_dac_nids), | 10724 | .num_dacs = ARRAY_SIZE(alc262_dac_nids), |
| 10630 | .dac_nids = alc262_dac_nids, | 10725 | .dac_nids = alc262_dac_nids, |
| @@ -10750,6 +10845,7 @@ static int patch_alc262(struct hda_codec *codec) | |||
| 10750 | spec->stream_digital_playback = &alc262_pcm_digital_playback; | 10845 | spec->stream_digital_playback = &alc262_pcm_digital_playback; |
| 10751 | spec->stream_digital_capture = &alc262_pcm_digital_capture; | 10846 | spec->stream_digital_capture = &alc262_pcm_digital_capture; |
| 10752 | 10847 | ||
| 10848 | spec->is_mix_capture = 1; | ||
| 10753 | if (!spec->adc_nids && spec->input_mux) { | 10849 | if (!spec->adc_nids && spec->input_mux) { |
| 10754 | /* check whether NID 0x07 is valid */ | 10850 | /* check whether NID 0x07 is valid */ |
| 10755 | unsigned int wcap = get_wcaps(codec, 0x07); | 10851 | unsigned int wcap = get_wcaps(codec, 0x07); |
| @@ -10760,17 +10856,14 @@ static int patch_alc262(struct hda_codec *codec) | |||
| 10760 | spec->adc_nids = alc262_adc_nids_alt; | 10856 | spec->adc_nids = alc262_adc_nids_alt; |
| 10761 | spec->num_adc_nids = ARRAY_SIZE(alc262_adc_nids_alt); | 10857 | spec->num_adc_nids = ARRAY_SIZE(alc262_adc_nids_alt); |
| 10762 | spec->capsrc_nids = alc262_capsrc_nids_alt; | 10858 | spec->capsrc_nids = alc262_capsrc_nids_alt; |
| 10763 | spec->mixers[spec->num_mixers] = | ||
| 10764 | alc262_capture_alt_mixer; | ||
| 10765 | spec->num_mixers++; | ||
| 10766 | } else { | 10859 | } else { |
| 10767 | spec->adc_nids = alc262_adc_nids; | 10860 | spec->adc_nids = alc262_adc_nids; |
| 10768 | spec->num_adc_nids = ARRAY_SIZE(alc262_adc_nids); | 10861 | spec->num_adc_nids = ARRAY_SIZE(alc262_adc_nids); |
| 10769 | spec->capsrc_nids = alc262_capsrc_nids; | 10862 | spec->capsrc_nids = alc262_capsrc_nids; |
| 10770 | spec->mixers[spec->num_mixers] = alc262_capture_mixer; | ||
| 10771 | spec->num_mixers++; | ||
| 10772 | } | 10863 | } |
| 10773 | } | 10864 | } |
| 10865 | if (!spec->cap_mixer) | ||
| 10866 | set_capture_mixer(spec); | ||
| 10774 | 10867 | ||
| 10775 | spec->vmaster_nid = 0x0c; | 10868 | spec->vmaster_nid = 0x0c; |
| 10776 | 10869 | ||
| @@ -10781,6 +10874,7 @@ static int patch_alc262(struct hda_codec *codec) | |||
| 10781 | if (!spec->loopback.amplist) | 10874 | if (!spec->loopback.amplist) |
| 10782 | spec->loopback.amplist = alc262_loopbacks; | 10875 | spec->loopback.amplist = alc262_loopbacks; |
| 10783 | #endif | 10876 | #endif |
| 10877 | codec->proc_widget_hook = print_realtek_coef; | ||
| 10784 | 10878 | ||
| 10785 | return 0; | 10879 | return 0; |
| 10786 | } | 10880 | } |
| @@ -10942,6 +11036,22 @@ static struct snd_kcontrol_new alc268_acer_mixer[] = { | |||
| 10942 | { } | 11036 | { } |
| 10943 | }; | 11037 | }; |
| 10944 | 11038 | ||
| 11039 | static struct snd_kcontrol_new alc268_acer_dmic_mixer[] = { | ||
| 11040 | /* output mixer control */ | ||
| 11041 | HDA_BIND_VOL("Master Playback Volume", &alc268_acer_bind_master_vol), | ||
| 11042 | { | ||
| 11043 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
| 11044 | .name = "Master Playback Switch", | ||
| 11045 | .info = snd_hda_mixer_amp_switch_info, | ||
| 11046 | .get = snd_hda_mixer_amp_switch_get, | ||
| 11047 | .put = alc268_acer_master_sw_put, | ||
| 11048 | .private_value = HDA_COMPOSE_AMP_VAL(0x14, 3, 0, HDA_OUTPUT), | ||
| 11049 | }, | ||
| 11050 | HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT), | ||
| 11051 | HDA_CODEC_VOLUME("Line In Boost", 0x1a, 0, HDA_INPUT), | ||
| 11052 | { } | ||
| 11053 | }; | ||
| 11054 | |||
| 10945 | static struct hda_verb alc268_acer_aspire_one_verbs[] = { | 11055 | static struct hda_verb alc268_acer_aspire_one_verbs[] = { |
| 10946 | {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, | 11056 | {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, |
| 10947 | {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP}, | 11057 | {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP}, |
| @@ -11218,10 +11328,6 @@ static struct hda_verb alc268_volume_init_verbs[] = { | |||
| 11218 | { } | 11328 | { } |
| 11219 | }; | 11329 | }; |
| 11220 | 11330 | ||
| 11221 | #define alc268_mux_enum_info alc_mux_enum_info | ||
| 11222 | #define alc268_mux_enum_get alc_mux_enum_get | ||
| 11223 | #define alc268_mux_enum_put alc_mux_enum_put | ||
| 11224 | |||
| 11225 | static struct snd_kcontrol_new alc268_capture_alt_mixer[] = { | 11331 | static struct snd_kcontrol_new alc268_capture_alt_mixer[] = { |
| 11226 | HDA_CODEC_VOLUME("Capture Volume", 0x23, 0x0, HDA_OUTPUT), | 11332 | HDA_CODEC_VOLUME("Capture Volume", 0x23, 0x0, HDA_OUTPUT), |
| 11227 | HDA_CODEC_MUTE("Capture Switch", 0x23, 0x0, HDA_OUTPUT), | 11333 | HDA_CODEC_MUTE("Capture Switch", 0x23, 0x0, HDA_OUTPUT), |
| @@ -11233,9 +11339,9 @@ static struct snd_kcontrol_new alc268_capture_alt_mixer[] = { | |||
| 11233 | /* .name = "Capture Source", */ | 11339 | /* .name = "Capture Source", */ |
| 11234 | .name = "Input Source", | 11340 | .name = "Input Source", |
| 11235 | .count = 1, | 11341 | .count = 1, |
| 11236 | .info = alc268_mux_enum_info, | 11342 | .info = alc_mux_enum_info, |
| 11237 | .get = alc268_mux_enum_get, | 11343 | .get = alc_mux_enum_get, |
| 11238 | .put = alc268_mux_enum_put, | 11344 | .put = alc_mux_enum_put, |
| 11239 | }, | 11345 | }, |
| 11240 | { } /* end */ | 11346 | { } /* end */ |
| 11241 | }; | 11347 | }; |
| @@ -11253,9 +11359,9 @@ static struct snd_kcontrol_new alc268_capture_mixer[] = { | |||
| 11253 | /* .name = "Capture Source", */ | 11359 | /* .name = "Capture Source", */ |
| 11254 | .name = "Input Source", | 11360 | .name = "Input Source", |
| 11255 | .count = 2, | 11361 | .count = 2, |
| 11256 | .info = alc268_mux_enum_info, | 11362 | .info = alc_mux_enum_info, |
| 11257 | .get = alc268_mux_enum_get, | 11363 | .get = alc_mux_enum_get, |
| 11258 | .put = alc268_mux_enum_put, | 11364 | .put = alc_mux_enum_put, |
| 11259 | }, | 11365 | }, |
| 11260 | { } /* end */ | 11366 | { } /* end */ |
| 11261 | }; | 11367 | }; |
| @@ -11274,6 +11380,15 @@ static struct hda_input_mux alc268_acer_capture_source = { | |||
| 11274 | .num_items = 3, | 11380 | .num_items = 3, |
| 11275 | .items = { | 11381 | .items = { |
| 11276 | { "Mic", 0x0 }, | 11382 | { "Mic", 0x0 }, |
| 11383 | { "Internal Mic", 0x1 }, | ||
| 11384 | { "Line", 0x2 }, | ||
| 11385 | }, | ||
| 11386 | }; | ||
| 11387 | |||
| 11388 | static struct hda_input_mux alc268_acer_dmic_capture_source = { | ||
| 11389 | .num_items = 3, | ||
| 11390 | .items = { | ||
| 11391 | { "Mic", 0x0 }, | ||
| 11277 | { "Internal Mic", 0x6 }, | 11392 | { "Internal Mic", 0x6 }, |
| 11278 | { "Line", 0x2 }, | 11393 | { "Line", 0x2 }, |
| 11279 | }, | 11394 | }, |
| @@ -11512,13 +11627,13 @@ static int alc268_parse_auto_config(struct hda_codec *codec) | |||
| 11512 | if (spec->autocfg.dig_out_pin) | 11627 | if (spec->autocfg.dig_out_pin) |
| 11513 | spec->multiout.dig_out_nid = ALC268_DIGOUT_NID; | 11628 | spec->multiout.dig_out_nid = ALC268_DIGOUT_NID; |
| 11514 | 11629 | ||
| 11515 | if (spec->kctl_alloc) | 11630 | if (spec->kctls.list) |
| 11516 | spec->mixers[spec->num_mixers++] = spec->kctl_alloc; | 11631 | add_mixer(spec, spec->kctls.list); |
| 11517 | 11632 | ||
| 11518 | if (spec->autocfg.speaker_pins[0] != 0x1d) | 11633 | if (spec->autocfg.speaker_pins[0] != 0x1d) |
| 11519 | spec->mixers[spec->num_mixers++] = alc268_beep_mixer; | 11634 | add_mixer(spec, alc268_beep_mixer); |
| 11520 | 11635 | ||
| 11521 | spec->init_verbs[spec->num_init_verbs++] = alc268_volume_init_verbs; | 11636 | add_verb(spec, alc268_volume_init_verbs); |
| 11522 | spec->num_mux_defs = 1; | 11637 | spec->num_mux_defs = 1; |
| 11523 | spec->input_mux = &spec->private_imux; | 11638 | spec->input_mux = &spec->private_imux; |
| 11524 | 11639 | ||
| @@ -11554,6 +11669,7 @@ static const char *alc268_models[ALC268_MODEL_LAST] = { | |||
| 11554 | [ALC268_3ST] = "3stack", | 11669 | [ALC268_3ST] = "3stack", |
| 11555 | [ALC268_TOSHIBA] = "toshiba", | 11670 | [ALC268_TOSHIBA] = "toshiba", |
| 11556 | [ALC268_ACER] = "acer", | 11671 | [ALC268_ACER] = "acer", |
| 11672 | [ALC268_ACER_DMIC] = "acer-dmic", | ||
| 11557 | [ALC268_ACER_ASPIRE_ONE] = "acer-aspire", | 11673 | [ALC268_ACER_ASPIRE_ONE] = "acer-aspire", |
| 11558 | [ALC268_DELL] = "dell", | 11674 | [ALC268_DELL] = "dell", |
| 11559 | [ALC268_ZEPTO] = "zepto", | 11675 | [ALC268_ZEPTO] = "zepto", |
| @@ -11649,6 +11765,23 @@ static struct alc_config_preset alc268_presets[] = { | |||
| 11649 | .unsol_event = alc268_acer_unsol_event, | 11765 | .unsol_event = alc268_acer_unsol_event, |
| 11650 | .init_hook = alc268_acer_init_hook, | 11766 | .init_hook = alc268_acer_init_hook, |
| 11651 | }, | 11767 | }, |
| 11768 | [ALC268_ACER_DMIC] = { | ||
| 11769 | .mixers = { alc268_acer_dmic_mixer, alc268_capture_alt_mixer, | ||
| 11770 | alc268_beep_mixer }, | ||
| 11771 | .init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs, | ||
| 11772 | alc268_acer_verbs }, | ||
| 11773 | .num_dacs = ARRAY_SIZE(alc268_dac_nids), | ||
| 11774 | .dac_nids = alc268_dac_nids, | ||
| 11775 | .num_adc_nids = ARRAY_SIZE(alc268_adc_nids_alt), | ||
| 11776 | .adc_nids = alc268_adc_nids_alt, | ||
| 11777 | .capsrc_nids = alc268_capsrc_nids, | ||
| 11778 | .hp_nid = 0x02, | ||
| 11779 | .num_channel_mode = ARRAY_SIZE(alc268_modes), | ||
| 11780 | .channel_mode = alc268_modes, | ||
| 11781 | .input_mux = &alc268_acer_dmic_capture_source, | ||
| 11782 | .unsol_event = alc268_acer_unsol_event, | ||
| 11783 | .init_hook = alc268_acer_init_hook, | ||
| 11784 | }, | ||
| 11652 | [ALC268_ACER_ASPIRE_ONE] = { | 11785 | [ALC268_ACER_ASPIRE_ONE] = { |
| 11653 | .mixers = { alc268_acer_aspire_one_mixer, | 11786 | .mixers = { alc268_acer_aspire_one_mixer, |
| 11654 | alc268_capture_alt_mixer }, | 11787 | alc268_capture_alt_mixer }, |
| @@ -11787,15 +11920,11 @@ static int patch_alc268(struct hda_codec *codec) | |||
| 11787 | if (wcap != AC_WID_AUD_IN || spec->input_mux->num_items == 1) { | 11920 | if (wcap != AC_WID_AUD_IN || spec->input_mux->num_items == 1) { |
| 11788 | spec->adc_nids = alc268_adc_nids_alt; | 11921 | spec->adc_nids = alc268_adc_nids_alt; |
| 11789 | spec->num_adc_nids = ARRAY_SIZE(alc268_adc_nids_alt); | 11922 | spec->num_adc_nids = ARRAY_SIZE(alc268_adc_nids_alt); |
| 11790 | spec->mixers[spec->num_mixers] = | 11923 | add_mixer(spec, alc268_capture_alt_mixer); |
| 11791 | alc268_capture_alt_mixer; | ||
| 11792 | spec->num_mixers++; | ||
| 11793 | } else { | 11924 | } else { |
| 11794 | spec->adc_nids = alc268_adc_nids; | 11925 | spec->adc_nids = alc268_adc_nids; |
| 11795 | spec->num_adc_nids = ARRAY_SIZE(alc268_adc_nids); | 11926 | spec->num_adc_nids = ARRAY_SIZE(alc268_adc_nids); |
| 11796 | spec->mixers[spec->num_mixers] = | 11927 | add_mixer(spec, alc268_capture_mixer); |
| 11797 | alc268_capture_mixer; | ||
| 11798 | spec->num_mixers++; | ||
| 11799 | } | 11928 | } |
| 11800 | spec->capsrc_nids = alc268_capsrc_nids; | 11929 | spec->capsrc_nids = alc268_capsrc_nids; |
| 11801 | /* set default input source */ | 11930 | /* set default input source */ |
| @@ -11811,6 +11940,8 @@ static int patch_alc268(struct hda_codec *codec) | |||
| 11811 | if (board_config == ALC268_AUTO) | 11940 | if (board_config == ALC268_AUTO) |
| 11812 | spec->init_hook = alc268_auto_init; | 11941 | spec->init_hook = alc268_auto_init; |
| 11813 | 11942 | ||
| 11943 | codec->proc_widget_hook = print_realtek_coef; | ||
| 11944 | |||
| 11814 | return 0; | 11945 | return 0; |
| 11815 | } | 11946 | } |
| 11816 | 11947 | ||
| @@ -11893,6 +12024,31 @@ static struct snd_kcontrol_new alc269_quanta_fl1_mixer[] = { | |||
| 11893 | { } | 12024 | { } |
| 11894 | }; | 12025 | }; |
| 11895 | 12026 | ||
| 12027 | static struct snd_kcontrol_new alc269_lifebook_mixer[] = { | ||
| 12028 | /* output mixer control */ | ||
| 12029 | HDA_BIND_VOL("Master Playback Volume", &alc268_acer_bind_master_vol), | ||
| 12030 | { | ||
| 12031 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
| 12032 | .name = "Master Playback Switch", | ||
| 12033 | .info = snd_hda_mixer_amp_switch_info, | ||
| 12034 | .get = snd_hda_mixer_amp_switch_get, | ||
| 12035 | .put = alc268_acer_master_sw_put, | ||
| 12036 | .private_value = HDA_COMPOSE_AMP_VAL(0x14, 3, 0, HDA_OUTPUT), | ||
| 12037 | }, | ||
| 12038 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), | ||
| 12039 | HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), | ||
| 12040 | HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT), | ||
| 12041 | HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x0b, 0x01, HDA_INPUT), | ||
| 12042 | HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x0b, 0x01, HDA_INPUT), | ||
| 12043 | HDA_CODEC_VOLUME("Internal Mic Boost", 0x19, 0, HDA_INPUT), | ||
| 12044 | HDA_CODEC_VOLUME("Dock Mic Playback Volume", 0x0b, 0x03, HDA_INPUT), | ||
| 12045 | HDA_CODEC_MUTE("Dock Mic Playback Switch", 0x0b, 0x03, HDA_INPUT), | ||
| 12046 | HDA_CODEC_VOLUME("Dock Mic Boost", 0x1b, 0, HDA_INPUT), | ||
| 12047 | HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x04, HDA_INPUT), | ||
| 12048 | HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x04, HDA_INPUT), | ||
| 12049 | { } | ||
| 12050 | }; | ||
| 12051 | |||
| 11896 | /* bind volumes of both NID 0x0c and 0x0d */ | 12052 | /* bind volumes of both NID 0x0c and 0x0d */ |
| 11897 | static struct hda_bind_ctls alc269_epc_bind_vol = { | 12053 | static struct hda_bind_ctls alc269_epc_bind_vol = { |
| 11898 | .ops = &snd_hda_bind_vol, | 12054 | .ops = &snd_hda_bind_vol, |
| @@ -11911,28 +12067,18 @@ static struct snd_kcontrol_new alc269_eeepc_mixer[] = { | |||
| 11911 | }; | 12067 | }; |
| 11912 | 12068 | ||
| 11913 | /* capture mixer elements */ | 12069 | /* capture mixer elements */ |
| 11914 | static struct snd_kcontrol_new alc269_capture_mixer[] = { | 12070 | static struct snd_kcontrol_new alc269_epc_capture_mixer[] = { |
| 11915 | HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT), | 12071 | HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT), |
| 11916 | HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT), | 12072 | HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT), |
| 11917 | { | 12073 | HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT), |
| 11918 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
| 11919 | /* The multiple "Capture Source" controls confuse alsamixer | ||
| 11920 | * So call somewhat different.. | ||
| 11921 | */ | ||
| 11922 | /* .name = "Capture Source", */ | ||
| 11923 | .name = "Input Source", | ||
| 11924 | .count = 1, | ||
| 11925 | .info = alc_mux_enum_info, | ||
| 11926 | .get = alc_mux_enum_get, | ||
| 11927 | .put = alc_mux_enum_put, | ||
| 11928 | }, | ||
| 11929 | { } /* end */ | 12074 | { } /* end */ |
| 11930 | }; | 12075 | }; |
| 11931 | 12076 | ||
| 11932 | /* capture mixer elements */ | 12077 | /* FSC amilo */ |
| 11933 | static struct snd_kcontrol_new alc269_epc_capture_mixer[] = { | 12078 | static struct snd_kcontrol_new alc269_fujitsu_mixer[] = { |
| 11934 | HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT), | 12079 | HDA_CODEC_MUTE("Speaker Playback Switch", 0x14, 0x0, HDA_OUTPUT), |
| 11935 | HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT), | 12080 | HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT), |
| 12081 | HDA_BIND_VOL("PCM Playback Volume", &alc269_epc_bind_vol), | ||
| 11936 | { } /* end */ | 12082 | { } /* end */ |
| 11937 | }; | 12083 | }; |
| 11938 | 12084 | ||
| @@ -11953,6 +12099,20 @@ static struct hda_verb alc269_quanta_fl1_verbs[] = { | |||
| 11953 | { } | 12099 | { } |
| 11954 | }; | 12100 | }; |
| 11955 | 12101 | ||
| 12102 | static struct hda_verb alc269_lifebook_verbs[] = { | ||
| 12103 | {0x15, AC_VERB_SET_CONNECT_SEL, 0x01}, | ||
| 12104 | {0x1a, AC_VERB_SET_CONNECT_SEL, 0x01}, | ||
| 12105 | {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, | ||
| 12106 | {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP}, | ||
| 12107 | {0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN}, | ||
| 12108 | {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, | ||
| 12109 | {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP}, | ||
| 12110 | {0x1a, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN}, | ||
| 12111 | {0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_MIC_EVENT}, | ||
| 12112 | {0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, | ||
| 12113 | { } | ||
| 12114 | }; | ||
| 12115 | |||
| 11956 | /* toggle speaker-output according to the hp-jack state */ | 12116 | /* toggle speaker-output according to the hp-jack state */ |
| 11957 | static void alc269_quanta_fl1_speaker_automute(struct hda_codec *codec) | 12117 | static void alc269_quanta_fl1_speaker_automute(struct hda_codec *codec) |
| 11958 | { | 12118 | { |
| @@ -11978,6 +12138,37 @@ static void alc269_quanta_fl1_speaker_automute(struct hda_codec *codec) | |||
| 11978 | AC_VERB_SET_PROC_COEF, 0x480); | 12138 | AC_VERB_SET_PROC_COEF, 0x480); |
| 11979 | } | 12139 | } |
| 11980 | 12140 | ||
| 12141 | /* toggle speaker-output according to the hp-jacks state */ | ||
| 12142 | static void alc269_lifebook_speaker_automute(struct hda_codec *codec) | ||
| 12143 | { | ||
| 12144 | unsigned int present; | ||
| 12145 | unsigned char bits; | ||
| 12146 | |||
| 12147 | /* Check laptop headphone socket */ | ||
| 12148 | present = snd_hda_codec_read(codec, 0x15, 0, | ||
| 12149 | AC_VERB_GET_PIN_SENSE, 0) & 0x80000000; | ||
| 12150 | |||
| 12151 | /* Check port replicator headphone socket */ | ||
| 12152 | present |= snd_hda_codec_read(codec, 0x1a, 0, | ||
| 12153 | AC_VERB_GET_PIN_SENSE, 0) & 0x80000000; | ||
| 12154 | |||
| 12155 | bits = present ? AMP_IN_MUTE(0) : 0; | ||
| 12156 | snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 0, | ||
| 12157 | AMP_IN_MUTE(0), bits); | ||
| 12158 | snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 1, | ||
| 12159 | AMP_IN_MUTE(0), bits); | ||
| 12160 | |||
| 12161 | snd_hda_codec_write(codec, 0x20, 0, | ||
| 12162 | AC_VERB_SET_COEF_INDEX, 0x0c); | ||
| 12163 | snd_hda_codec_write(codec, 0x20, 0, | ||
| 12164 | AC_VERB_SET_PROC_COEF, 0x680); | ||
| 12165 | |||
| 12166 | snd_hda_codec_write(codec, 0x20, 0, | ||
| 12167 | AC_VERB_SET_COEF_INDEX, 0x0c); | ||
| 12168 | snd_hda_codec_write(codec, 0x20, 0, | ||
| 12169 | AC_VERB_SET_PROC_COEF, 0x480); | ||
| 12170 | } | ||
| 12171 | |||
| 11981 | static void alc269_quanta_fl1_mic_automute(struct hda_codec *codec) | 12172 | static void alc269_quanta_fl1_mic_automute(struct hda_codec *codec) |
| 11982 | { | 12173 | { |
| 11983 | unsigned int present; | 12174 | unsigned int present; |
| @@ -11988,6 +12179,29 @@ static void alc269_quanta_fl1_mic_automute(struct hda_codec *codec) | |||
| 11988 | AC_VERB_SET_CONNECT_SEL, present ? 0x0 : 0x1); | 12179 | AC_VERB_SET_CONNECT_SEL, present ? 0x0 : 0x1); |
| 11989 | } | 12180 | } |
| 11990 | 12181 | ||
| 12182 | static void alc269_lifebook_mic_autoswitch(struct hda_codec *codec) | ||
| 12183 | { | ||
| 12184 | unsigned int present_laptop; | ||
| 12185 | unsigned int present_dock; | ||
| 12186 | |||
| 12187 | present_laptop = snd_hda_codec_read(codec, 0x18, 0, | ||
| 12188 | AC_VERB_GET_PIN_SENSE, 0) & 0x80000000; | ||
| 12189 | |||
| 12190 | present_dock = snd_hda_codec_read(codec, 0x1b, 0, | ||
| 12191 | AC_VERB_GET_PIN_SENSE, 0) & 0x80000000; | ||
| 12192 | |||
| 12193 | /* Laptop mic port overrides dock mic port, design decision */ | ||
| 12194 | if (present_dock) | ||
| 12195 | snd_hda_codec_write(codec, 0x23, 0, | ||
| 12196 | AC_VERB_SET_CONNECT_SEL, 0x3); | ||
| 12197 | if (present_laptop) | ||
| 12198 | snd_hda_codec_write(codec, 0x23, 0, | ||
| 12199 | AC_VERB_SET_CONNECT_SEL, 0x0); | ||
| 12200 | if (!present_dock && !present_laptop) | ||
| 12201 | snd_hda_codec_write(codec, 0x23, 0, | ||
| 12202 | AC_VERB_SET_CONNECT_SEL, 0x1); | ||
| 12203 | } | ||
| 12204 | |||
| 11991 | static void alc269_quanta_fl1_unsol_event(struct hda_codec *codec, | 12205 | static void alc269_quanta_fl1_unsol_event(struct hda_codec *codec, |
| 11992 | unsigned int res) | 12206 | unsigned int res) |
| 11993 | { | 12207 | { |
| @@ -11997,12 +12211,27 @@ static void alc269_quanta_fl1_unsol_event(struct hda_codec *codec, | |||
| 11997 | alc269_quanta_fl1_mic_automute(codec); | 12211 | alc269_quanta_fl1_mic_automute(codec); |
| 11998 | } | 12212 | } |
| 11999 | 12213 | ||
| 12214 | static void alc269_lifebook_unsol_event(struct hda_codec *codec, | ||
| 12215 | unsigned int res) | ||
| 12216 | { | ||
| 12217 | if ((res >> 26) == ALC880_HP_EVENT) | ||
| 12218 | alc269_lifebook_speaker_automute(codec); | ||
| 12219 | if ((res >> 26) == ALC880_MIC_EVENT) | ||
| 12220 | alc269_lifebook_mic_autoswitch(codec); | ||
| 12221 | } | ||
| 12222 | |||
| 12000 | static void alc269_quanta_fl1_init_hook(struct hda_codec *codec) | 12223 | static void alc269_quanta_fl1_init_hook(struct hda_codec *codec) |
| 12001 | { | 12224 | { |
| 12002 | alc269_quanta_fl1_speaker_automute(codec); | 12225 | alc269_quanta_fl1_speaker_automute(codec); |
| 12003 | alc269_quanta_fl1_mic_automute(codec); | 12226 | alc269_quanta_fl1_mic_automute(codec); |
| 12004 | } | 12227 | } |
| 12005 | 12228 | ||
| 12229 | static void alc269_lifebook_init_hook(struct hda_codec *codec) | ||
| 12230 | { | ||
| 12231 | alc269_lifebook_speaker_automute(codec); | ||
| 12232 | alc269_lifebook_mic_autoswitch(codec); | ||
| 12233 | } | ||
| 12234 | |||
| 12006 | static struct hda_verb alc269_eeepc_dmic_init_verbs[] = { | 12235 | static struct hda_verb alc269_eeepc_dmic_init_verbs[] = { |
| 12007 | {0x15, AC_VERB_SET_CONNECT_SEL, 0x01}, | 12236 | {0x15, AC_VERB_SET_CONNECT_SEL, 0x01}, |
| 12008 | {0x23, AC_VERB_SET_CONNECT_SEL, 0x05}, | 12237 | {0x23, AC_VERB_SET_CONNECT_SEL, 0x05}, |
| @@ -12303,17 +12532,17 @@ static int alc269_parse_auto_config(struct hda_codec *codec) | |||
| 12303 | if (spec->autocfg.dig_out_pin) | 12532 | if (spec->autocfg.dig_out_pin) |
| 12304 | spec->multiout.dig_out_nid = ALC269_DIGOUT_NID; | 12533 | spec->multiout.dig_out_nid = ALC269_DIGOUT_NID; |
| 12305 | 12534 | ||
| 12306 | if (spec->kctl_alloc) | 12535 | if (spec->kctls.list) |
| 12307 | spec->mixers[spec->num_mixers++] = spec->kctl_alloc; | 12536 | add_mixer(spec, spec->kctls.list); |
| 12308 | 12537 | ||
| 12309 | /* create a beep mixer control if the pin 0x1d isn't assigned */ | 12538 | /* create a beep mixer control if the pin 0x1d isn't assigned */ |
| 12310 | for (i = 0; i < ARRAY_SIZE(spec->autocfg.input_pins); i++) | 12539 | for (i = 0; i < ARRAY_SIZE(spec->autocfg.input_pins); i++) |
| 12311 | if (spec->autocfg.input_pins[i] == 0x1d) | 12540 | if (spec->autocfg.input_pins[i] == 0x1d) |
| 12312 | break; | 12541 | break; |
| 12313 | if (i >= ARRAY_SIZE(spec->autocfg.input_pins)) | 12542 | if (i >= ARRAY_SIZE(spec->autocfg.input_pins)) |
| 12314 | spec->mixers[spec->num_mixers++] = alc269_beep_mixer; | 12543 | add_mixer(spec, alc269_beep_mixer); |
| 12315 | 12544 | ||
| 12316 | spec->init_verbs[spec->num_init_verbs++] = alc269_init_verbs; | 12545 | add_verb(spec, alc269_init_verbs); |
| 12317 | spec->num_mux_defs = 1; | 12546 | spec->num_mux_defs = 1; |
| 12318 | spec->input_mux = &spec->private_imux; | 12547 | spec->input_mux = &spec->private_imux; |
| 12319 | /* set default input source */ | 12548 | /* set default input source */ |
| @@ -12325,8 +12554,8 @@ static int alc269_parse_auto_config(struct hda_codec *codec) | |||
| 12325 | if (err < 0) | 12554 | if (err < 0) |
| 12326 | return err; | 12555 | return err; |
| 12327 | 12556 | ||
| 12328 | spec->mixers[spec->num_mixers] = alc269_capture_mixer; | 12557 | if (!spec->cap_mixer) |
| 12329 | spec->num_mixers++; | 12558 | set_capture_mixer(spec); |
| 12330 | 12559 | ||
| 12331 | store_pin_configs(codec); | 12560 | store_pin_configs(codec); |
| 12332 | return 1; | 12561 | return 1; |
| @@ -12355,7 +12584,9 @@ static const char *alc269_models[ALC269_MODEL_LAST] = { | |||
| 12355 | [ALC269_BASIC] = "basic", | 12584 | [ALC269_BASIC] = "basic", |
| 12356 | [ALC269_QUANTA_FL1] = "quanta", | 12585 | [ALC269_QUANTA_FL1] = "quanta", |
| 12357 | [ALC269_ASUS_EEEPC_P703] = "eeepc-p703", | 12586 | [ALC269_ASUS_EEEPC_P703] = "eeepc-p703", |
| 12358 | [ALC269_ASUS_EEEPC_P901] = "eeepc-p901" | 12587 | [ALC269_ASUS_EEEPC_P901] = "eeepc-p901", |
| 12588 | [ALC269_FUJITSU] = "fujitsu", | ||
| 12589 | [ALC269_LIFEBOOK] = "lifebook" | ||
| 12359 | }; | 12590 | }; |
| 12360 | 12591 | ||
| 12361 | static struct snd_pci_quirk alc269_cfg_tbl[] = { | 12592 | static struct snd_pci_quirk alc269_cfg_tbl[] = { |
| @@ -12366,12 +12597,14 @@ static struct snd_pci_quirk alc269_cfg_tbl[] = { | |||
| 12366 | ALC269_ASUS_EEEPC_P901), | 12597 | ALC269_ASUS_EEEPC_P901), |
| 12367 | SND_PCI_QUIRK(0x1043, 0x834a, "ASUS Eeepc S101", | 12598 | SND_PCI_QUIRK(0x1043, 0x834a, "ASUS Eeepc S101", |
| 12368 | ALC269_ASUS_EEEPC_P901), | 12599 | ALC269_ASUS_EEEPC_P901), |
| 12600 | SND_PCI_QUIRK(0x1734, 0x115d, "FSC Amilo", ALC269_FUJITSU), | ||
| 12601 | SND_PCI_QUIRK(0x10cf, 0x1475, "Lifebook ICH9M-based", ALC269_LIFEBOOK), | ||
| 12369 | {} | 12602 | {} |
| 12370 | }; | 12603 | }; |
| 12371 | 12604 | ||
| 12372 | static struct alc_config_preset alc269_presets[] = { | 12605 | static struct alc_config_preset alc269_presets[] = { |
| 12373 | [ALC269_BASIC] = { | 12606 | [ALC269_BASIC] = { |
| 12374 | .mixers = { alc269_base_mixer, alc269_capture_mixer }, | 12607 | .mixers = { alc269_base_mixer }, |
| 12375 | .init_verbs = { alc269_init_verbs }, | 12608 | .init_verbs = { alc269_init_verbs }, |
| 12376 | .num_dacs = ARRAY_SIZE(alc269_dac_nids), | 12609 | .num_dacs = ARRAY_SIZE(alc269_dac_nids), |
| 12377 | .dac_nids = alc269_dac_nids, | 12610 | .dac_nids = alc269_dac_nids, |
| @@ -12393,7 +12626,8 @@ static struct alc_config_preset alc269_presets[] = { | |||
| 12393 | .init_hook = alc269_quanta_fl1_init_hook, | 12626 | .init_hook = alc269_quanta_fl1_init_hook, |
| 12394 | }, | 12627 | }, |
| 12395 | [ALC269_ASUS_EEEPC_P703] = { | 12628 | [ALC269_ASUS_EEEPC_P703] = { |
| 12396 | .mixers = { alc269_eeepc_mixer, alc269_epc_capture_mixer }, | 12629 | .mixers = { alc269_eeepc_mixer }, |
| 12630 | .cap_mixer = alc269_epc_capture_mixer, | ||
| 12397 | .init_verbs = { alc269_init_verbs, | 12631 | .init_verbs = { alc269_init_verbs, |
| 12398 | alc269_eeepc_amic_init_verbs }, | 12632 | alc269_eeepc_amic_init_verbs }, |
| 12399 | .num_dacs = ARRAY_SIZE(alc269_dac_nids), | 12633 | .num_dacs = ARRAY_SIZE(alc269_dac_nids), |
| @@ -12406,7 +12640,8 @@ static struct alc_config_preset alc269_presets[] = { | |||
| 12406 | .init_hook = alc269_eeepc_amic_inithook, | 12640 | .init_hook = alc269_eeepc_amic_inithook, |
| 12407 | }, | 12641 | }, |
| 12408 | [ALC269_ASUS_EEEPC_P901] = { | 12642 | [ALC269_ASUS_EEEPC_P901] = { |
| 12409 | .mixers = { alc269_eeepc_mixer, alc269_epc_capture_mixer}, | 12643 | .mixers = { alc269_eeepc_mixer }, |
| 12644 | .cap_mixer = alc269_epc_capture_mixer, | ||
| 12410 | .init_verbs = { alc269_init_verbs, | 12645 | .init_verbs = { alc269_init_verbs, |
| 12411 | alc269_eeepc_dmic_init_verbs }, | 12646 | alc269_eeepc_dmic_init_verbs }, |
| 12412 | .num_dacs = ARRAY_SIZE(alc269_dac_nids), | 12647 | .num_dacs = ARRAY_SIZE(alc269_dac_nids), |
| @@ -12418,6 +12653,32 @@ static struct alc_config_preset alc269_presets[] = { | |||
| 12418 | .unsol_event = alc269_eeepc_dmic_unsol_event, | 12653 | .unsol_event = alc269_eeepc_dmic_unsol_event, |
| 12419 | .init_hook = alc269_eeepc_dmic_inithook, | 12654 | .init_hook = alc269_eeepc_dmic_inithook, |
| 12420 | }, | 12655 | }, |
| 12656 | [ALC269_FUJITSU] = { | ||
| 12657 | .mixers = { alc269_fujitsu_mixer, alc269_beep_mixer }, | ||
| 12658 | .cap_mixer = alc269_epc_capture_mixer, | ||
| 12659 | .init_verbs = { alc269_init_verbs, | ||
| 12660 | alc269_eeepc_dmic_init_verbs }, | ||
| 12661 | .num_dacs = ARRAY_SIZE(alc269_dac_nids), | ||
| 12662 | .dac_nids = alc269_dac_nids, | ||
| 12663 | .hp_nid = 0x03, | ||
| 12664 | .num_channel_mode = ARRAY_SIZE(alc269_modes), | ||
| 12665 | .channel_mode = alc269_modes, | ||
| 12666 | .input_mux = &alc269_eeepc_dmic_capture_source, | ||
| 12667 | .unsol_event = alc269_eeepc_dmic_unsol_event, | ||
| 12668 | .init_hook = alc269_eeepc_dmic_inithook, | ||
| 12669 | }, | ||
| 12670 | [ALC269_LIFEBOOK] = { | ||
| 12671 | .mixers = { alc269_lifebook_mixer }, | ||
| 12672 | .init_verbs = { alc269_init_verbs, alc269_lifebook_verbs }, | ||
| 12673 | .num_dacs = ARRAY_SIZE(alc269_dac_nids), | ||
| 12674 | .dac_nids = alc269_dac_nids, | ||
| 12675 | .hp_nid = 0x03, | ||
| 12676 | .num_channel_mode = ARRAY_SIZE(alc269_modes), | ||
| 12677 | .channel_mode = alc269_modes, | ||
| 12678 | .input_mux = &alc269_capture_source, | ||
| 12679 | .unsol_event = alc269_lifebook_unsol_event, | ||
| 12680 | .init_hook = alc269_lifebook_init_hook, | ||
| 12681 | }, | ||
| 12421 | }; | 12682 | }; |
| 12422 | 12683 | ||
| 12423 | static int patch_alc269(struct hda_codec *codec) | 12684 | static int patch_alc269(struct hda_codec *codec) |
| @@ -12472,6 +12733,8 @@ static int patch_alc269(struct hda_codec *codec) | |||
| 12472 | spec->adc_nids = alc269_adc_nids; | 12733 | spec->adc_nids = alc269_adc_nids; |
| 12473 | spec->num_adc_nids = ARRAY_SIZE(alc269_adc_nids); | 12734 | spec->num_adc_nids = ARRAY_SIZE(alc269_adc_nids); |
| 12474 | spec->capsrc_nids = alc269_capsrc_nids; | 12735 | spec->capsrc_nids = alc269_capsrc_nids; |
| 12736 | if (!spec->cap_mixer) | ||
| 12737 | set_capture_mixer(spec); | ||
| 12475 | 12738 | ||
| 12476 | codec->patch_ops = alc_patch_ops; | 12739 | codec->patch_ops = alc_patch_ops; |
| 12477 | if (board_config == ALC269_AUTO) | 12740 | if (board_config == ALC269_AUTO) |
| @@ -12480,6 +12743,7 @@ static int patch_alc269(struct hda_codec *codec) | |||
| 12480 | if (!spec->loopback.amplist) | 12743 | if (!spec->loopback.amplist) |
| 12481 | spec->loopback.amplist = alc269_loopbacks; | 12744 | spec->loopback.amplist = alc269_loopbacks; |
| 12482 | #endif | 12745 | #endif |
| 12746 | codec->proc_widget_hook = print_realtek_coef; | ||
| 12483 | 12747 | ||
| 12484 | return 0; | 12748 | return 0; |
| 12485 | } | 12749 | } |
| @@ -12612,17 +12876,6 @@ static struct snd_kcontrol_new alc861_base_mixer[] = { | |||
| 12612 | HDA_CODEC_MUTE("Front Mic Playback Switch", 0x10, 0x01, HDA_OUTPUT), | 12876 | HDA_CODEC_MUTE("Front Mic Playback Switch", 0x10, 0x01, HDA_OUTPUT), |
| 12613 | HDA_CODEC_MUTE("Headphone Playback Switch", 0x1a, 0x03, HDA_INPUT), | 12877 | HDA_CODEC_MUTE("Headphone Playback Switch", 0x1a, 0x03, HDA_INPUT), |
| 12614 | 12878 | ||
| 12615 | /* Capture mixer control */ | ||
| 12616 | HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT), | ||
| 12617 | HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT), | ||
| 12618 | { | ||
| 12619 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
| 12620 | .name = "Capture Source", | ||
| 12621 | .count = 1, | ||
| 12622 | .info = alc_mux_enum_info, | ||
| 12623 | .get = alc_mux_enum_get, | ||
| 12624 | .put = alc_mux_enum_put, | ||
| 12625 | }, | ||
| 12626 | { } /* end */ | 12879 | { } /* end */ |
| 12627 | }; | 12880 | }; |
| 12628 | 12881 | ||
| @@ -12646,17 +12899,6 @@ static struct snd_kcontrol_new alc861_3ST_mixer[] = { | |||
| 12646 | HDA_CODEC_MUTE("Front Mic Playback Switch", 0x10, 0x01, HDA_OUTPUT), | 12899 | HDA_CODEC_MUTE("Front Mic Playback Switch", 0x10, 0x01, HDA_OUTPUT), |
| 12647 | HDA_CODEC_MUTE("Headphone Playback Switch", 0x1a, 0x03, HDA_INPUT), | 12900 | HDA_CODEC_MUTE("Headphone Playback Switch", 0x1a, 0x03, HDA_INPUT), |
| 12648 | 12901 | ||
| 12649 | /* Capture mixer control */ | ||
| 12650 | HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT), | ||
| 12651 | HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT), | ||
| 12652 | { | ||
| 12653 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
| 12654 | .name = "Capture Source", | ||
| 12655 | .count = 1, | ||
| 12656 | .info = alc_mux_enum_info, | ||
| 12657 | .get = alc_mux_enum_get, | ||
| 12658 | .put = alc_mux_enum_put, | ||
| 12659 | }, | ||
| 12660 | { | 12902 | { |
| 12661 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 12903 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
| 12662 | .name = "Channel Mode", | 12904 | .name = "Channel Mode", |
| @@ -12674,18 +12916,6 @@ static struct snd_kcontrol_new alc861_toshiba_mixer[] = { | |||
| 12674 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x15, 0x01, HDA_INPUT), | 12916 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x15, 0x01, HDA_INPUT), |
| 12675 | HDA_CODEC_MUTE("Mic Playback Switch", 0x15, 0x01, HDA_INPUT), | 12917 | HDA_CODEC_MUTE("Mic Playback Switch", 0x15, 0x01, HDA_INPUT), |
| 12676 | 12918 | ||
| 12677 | /*Capture mixer control */ | ||
| 12678 | HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT), | ||
| 12679 | HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT), | ||
| 12680 | { | ||
| 12681 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
| 12682 | .name = "Capture Source", | ||
| 12683 | .count = 1, | ||
| 12684 | .info = alc_mux_enum_info, | ||
| 12685 | .get = alc_mux_enum_get, | ||
| 12686 | .put = alc_mux_enum_put, | ||
| 12687 | }, | ||
| 12688 | |||
| 12689 | { } /* end */ | 12919 | { } /* end */ |
| 12690 | }; | 12920 | }; |
| 12691 | 12921 | ||
| @@ -12709,17 +12939,6 @@ static struct snd_kcontrol_new alc861_uniwill_m31_mixer[] = { | |||
| 12709 | HDA_CODEC_MUTE("Front Mic Playback Switch", 0x10, 0x01, HDA_OUTPUT), | 12939 | HDA_CODEC_MUTE("Front Mic Playback Switch", 0x10, 0x01, HDA_OUTPUT), |
| 12710 | HDA_CODEC_MUTE("Headphone Playback Switch", 0x1a, 0x03, HDA_INPUT), | 12940 | HDA_CODEC_MUTE("Headphone Playback Switch", 0x1a, 0x03, HDA_INPUT), |
| 12711 | 12941 | ||
| 12712 | /* Capture mixer control */ | ||
| 12713 | HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT), | ||
| 12714 | HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT), | ||
| 12715 | { | ||
| 12716 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
| 12717 | .name = "Capture Source", | ||
| 12718 | .count = 1, | ||
| 12719 | .info = alc_mux_enum_info, | ||
| 12720 | .get = alc_mux_enum_get, | ||
| 12721 | .put = alc_mux_enum_put, | ||
| 12722 | }, | ||
| 12723 | { | 12942 | { |
| 12724 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 12943 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
| 12725 | .name = "Channel Mode", | 12944 | .name = "Channel Mode", |
| @@ -12751,17 +12970,6 @@ static struct snd_kcontrol_new alc861_asus_mixer[] = { | |||
| 12751 | HDA_CODEC_MUTE("Front Mic Playback Switch", 0x10, 0x01, HDA_OUTPUT), | 12970 | HDA_CODEC_MUTE("Front Mic Playback Switch", 0x10, 0x01, HDA_OUTPUT), |
| 12752 | HDA_CODEC_MUTE("Headphone Playback Switch", 0x1a, 0x03, HDA_OUTPUT), | 12971 | HDA_CODEC_MUTE("Headphone Playback Switch", 0x1a, 0x03, HDA_OUTPUT), |
| 12753 | 12972 | ||
| 12754 | /* Capture mixer control */ | ||
| 12755 | HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT), | ||
| 12756 | HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT), | ||
| 12757 | { | ||
| 12758 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
| 12759 | .name = "Capture Source", | ||
| 12760 | .count = 1, | ||
| 12761 | .info = alc_mux_enum_info, | ||
| 12762 | .get = alc_mux_enum_get, | ||
| 12763 | .put = alc_mux_enum_put, | ||
| 12764 | }, | ||
| 12765 | { | 12973 | { |
| 12766 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 12974 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
| 12767 | .name = "Channel Mode", | 12975 | .name = "Channel Mode", |
| @@ -13293,25 +13501,6 @@ static int alc861_auto_create_analog_input_ctls(struct alc_spec *spec, | |||
| 13293 | return 0; | 13501 | return 0; |
| 13294 | } | 13502 | } |
| 13295 | 13503 | ||
| 13296 | static struct snd_kcontrol_new alc861_capture_mixer[] = { | ||
| 13297 | HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT), | ||
| 13298 | HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT), | ||
| 13299 | |||
| 13300 | { | ||
| 13301 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
| 13302 | /* The multiple "Capture Source" controls confuse alsamixer | ||
| 13303 | * So call somewhat different.. | ||
| 13304 | */ | ||
| 13305 | /* .name = "Capture Source", */ | ||
| 13306 | .name = "Input Source", | ||
| 13307 | .count = 1, | ||
| 13308 | .info = alc_mux_enum_info, | ||
| 13309 | .get = alc_mux_enum_get, | ||
| 13310 | .put = alc_mux_enum_put, | ||
| 13311 | }, | ||
| 13312 | { } /* end */ | ||
| 13313 | }; | ||
| 13314 | |||
| 13315 | static void alc861_auto_set_output_and_unmute(struct hda_codec *codec, | 13504 | static void alc861_auto_set_output_and_unmute(struct hda_codec *codec, |
| 13316 | hda_nid_t nid, | 13505 | hda_nid_t nid, |
| 13317 | int pin_type, int dac_idx) | 13506 | int pin_type, int dac_idx) |
| @@ -13402,18 +13591,17 @@ static int alc861_parse_auto_config(struct hda_codec *codec) | |||
| 13402 | if (spec->autocfg.dig_out_pin) | 13591 | if (spec->autocfg.dig_out_pin) |
| 13403 | spec->multiout.dig_out_nid = ALC861_DIGOUT_NID; | 13592 | spec->multiout.dig_out_nid = ALC861_DIGOUT_NID; |
| 13404 | 13593 | ||
| 13405 | if (spec->kctl_alloc) | 13594 | if (spec->kctls.list) |
| 13406 | spec->mixers[spec->num_mixers++] = spec->kctl_alloc; | 13595 | add_mixer(spec, spec->kctls.list); |
| 13407 | 13596 | ||
| 13408 | spec->init_verbs[spec->num_init_verbs++] = alc861_auto_init_verbs; | 13597 | add_verb(spec, alc861_auto_init_verbs); |
| 13409 | 13598 | ||
| 13410 | spec->num_mux_defs = 1; | 13599 | spec->num_mux_defs = 1; |
| 13411 | spec->input_mux = &spec->private_imux; | 13600 | spec->input_mux = &spec->private_imux; |
| 13412 | 13601 | ||
| 13413 | spec->adc_nids = alc861_adc_nids; | 13602 | spec->adc_nids = alc861_adc_nids; |
| 13414 | spec->num_adc_nids = ARRAY_SIZE(alc861_adc_nids); | 13603 | spec->num_adc_nids = ARRAY_SIZE(alc861_adc_nids); |
| 13415 | spec->mixers[spec->num_mixers] = alc861_capture_mixer; | 13604 | set_capture_mixer(spec); |
| 13416 | spec->num_mixers++; | ||
| 13417 | 13605 | ||
| 13418 | store_pin_configs(codec); | 13606 | store_pin_configs(codec); |
| 13419 | return 1; | 13607 | return 1; |
| @@ -13644,6 +13832,7 @@ static int patch_alc861(struct hda_codec *codec) | |||
| 13644 | if (!spec->loopback.amplist) | 13832 | if (!spec->loopback.amplist) |
| 13645 | spec->loopback.amplist = alc861_loopbacks; | 13833 | spec->loopback.amplist = alc861_loopbacks; |
| 13646 | #endif | 13834 | #endif |
| 13835 | codec->proc_widget_hook = print_realtek_coef; | ||
| 13647 | 13836 | ||
| 13648 | return 0; | 13837 | return 0; |
| 13649 | } | 13838 | } |
| @@ -13709,11 +13898,6 @@ static struct hda_input_mux alc861vd_hp_capture_source = { | |||
| 13709 | }, | 13898 | }, |
| 13710 | }; | 13899 | }; |
| 13711 | 13900 | ||
| 13712 | #define alc861vd_mux_enum_info alc_mux_enum_info | ||
| 13713 | #define alc861vd_mux_enum_get alc_mux_enum_get | ||
| 13714 | /* ALC861VD has the ALC882-type input selection (but has only one ADC) */ | ||
| 13715 | #define alc861vd_mux_enum_put alc882_mux_enum_put | ||
| 13716 | |||
| 13717 | /* | 13901 | /* |
| 13718 | * 2ch mode | 13902 | * 2ch mode |
| 13719 | */ | 13903 | */ |
| @@ -13759,25 +13943,6 @@ static struct snd_kcontrol_new alc861vd_chmode_mixer[] = { | |||
| 13759 | { } /* end */ | 13943 | { } /* end */ |
| 13760 | }; | 13944 | }; |
| 13761 | 13945 | ||
| 13762 | static struct snd_kcontrol_new alc861vd_capture_mixer[] = { | ||
| 13763 | HDA_CODEC_VOLUME("Capture Volume", 0x09, 0x0, HDA_INPUT), | ||
| 13764 | HDA_CODEC_MUTE("Capture Switch", 0x09, 0x0, HDA_INPUT), | ||
| 13765 | |||
| 13766 | { | ||
| 13767 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
| 13768 | /* The multiple "Capture Source" controls confuse alsamixer | ||
| 13769 | * So call somewhat different.. | ||
| 13770 | */ | ||
| 13771 | /* .name = "Capture Source", */ | ||
| 13772 | .name = "Input Source", | ||
| 13773 | .count = 1, | ||
| 13774 | .info = alc861vd_mux_enum_info, | ||
| 13775 | .get = alc861vd_mux_enum_get, | ||
| 13776 | .put = alc861vd_mux_enum_put, | ||
| 13777 | }, | ||
| 13778 | { } /* end */ | ||
| 13779 | }; | ||
| 13780 | |||
| 13781 | /* Pin assignment: Front=0x14, Rear=0x15, CLFE=0x16, Side=0x17 | 13946 | /* Pin assignment: Front=0x14, Rear=0x15, CLFE=0x16, Side=0x17 |
| 13782 | * Mic=0x18, Front Mic=0x19, Line-In=0x1a, HP=0x1b | 13947 | * Mic=0x18, Front Mic=0x19, Line-In=0x1a, HP=0x1b |
| 13783 | */ | 13948 | */ |
| @@ -14169,6 +14334,7 @@ static void alc861vd_dallas_unsol_event(struct hda_codec *codec, unsigned int re | |||
| 14169 | static const char *alc861vd_models[ALC861VD_MODEL_LAST] = { | 14334 | static const char *alc861vd_models[ALC861VD_MODEL_LAST] = { |
| 14170 | [ALC660VD_3ST] = "3stack-660", | 14335 | [ALC660VD_3ST] = "3stack-660", |
| 14171 | [ALC660VD_3ST_DIG] = "3stack-660-digout", | 14336 | [ALC660VD_3ST_DIG] = "3stack-660-digout", |
| 14337 | [ALC660VD_ASUS_V1S] = "asus-v1s", | ||
| 14172 | [ALC861VD_3ST] = "3stack", | 14338 | [ALC861VD_3ST] = "3stack", |
| 14173 | [ALC861VD_3ST_DIG] = "3stack-digout", | 14339 | [ALC861VD_3ST_DIG] = "3stack-digout", |
| 14174 | [ALC861VD_6ST_DIG] = "6stack-digout", | 14340 | [ALC861VD_6ST_DIG] = "6stack-digout", |
| @@ -14183,7 +14349,7 @@ static struct snd_pci_quirk alc861vd_cfg_tbl[] = { | |||
| 14183 | SND_PCI_QUIRK(0x103c, 0x30bf, "HP TX1000", ALC861VD_HP), | 14349 | SND_PCI_QUIRK(0x103c, 0x30bf, "HP TX1000", ALC861VD_HP), |
| 14184 | SND_PCI_QUIRK(0x1043, 0x12e2, "Asus z35m", ALC660VD_3ST), | 14350 | SND_PCI_QUIRK(0x1043, 0x12e2, "Asus z35m", ALC660VD_3ST), |
| 14185 | SND_PCI_QUIRK(0x1043, 0x1339, "Asus G1", ALC660VD_3ST), | 14351 | SND_PCI_QUIRK(0x1043, 0x1339, "Asus G1", ALC660VD_3ST), |
| 14186 | SND_PCI_QUIRK(0x1043, 0x1633, "Asus V1Sn", ALC861VD_LENOVO), | 14352 | SND_PCI_QUIRK(0x1043, 0x1633, "Asus V1Sn", ALC660VD_ASUS_V1S), |
| 14187 | SND_PCI_QUIRK(0x1043, 0x81e7, "ASUS", ALC660VD_3ST_DIG), | 14353 | SND_PCI_QUIRK(0x1043, 0x81e7, "ASUS", ALC660VD_3ST_DIG), |
| 14188 | SND_PCI_QUIRK(0x10de, 0x03f0, "Realtek ALC660 demo", ALC660VD_3ST), | 14354 | SND_PCI_QUIRK(0x10de, 0x03f0, "Realtek ALC660 demo", ALC660VD_3ST), |
| 14189 | SND_PCI_QUIRK(0x1179, 0xff00, "Toshiba A135", ALC861VD_LENOVO), | 14355 | SND_PCI_QUIRK(0x1179, 0xff00, "Toshiba A135", ALC861VD_LENOVO), |
| @@ -14290,6 +14456,21 @@ static struct alc_config_preset alc861vd_presets[] = { | |||
| 14290 | .unsol_event = alc861vd_dallas_unsol_event, | 14456 | .unsol_event = alc861vd_dallas_unsol_event, |
| 14291 | .init_hook = alc861vd_dallas_automute, | 14457 | .init_hook = alc861vd_dallas_automute, |
| 14292 | }, | 14458 | }, |
| 14459 | [ALC660VD_ASUS_V1S] = { | ||
| 14460 | .mixers = { alc861vd_lenovo_mixer }, | ||
| 14461 | .init_verbs = { alc861vd_volume_init_verbs, | ||
| 14462 | alc861vd_3stack_init_verbs, | ||
| 14463 | alc861vd_eapd_verbs, | ||
| 14464 | alc861vd_lenovo_unsol_verbs }, | ||
| 14465 | .num_dacs = ARRAY_SIZE(alc660vd_dac_nids), | ||
| 14466 | .dac_nids = alc660vd_dac_nids, | ||
| 14467 | .dig_out_nid = ALC861VD_DIGOUT_NID, | ||
| 14468 | .num_channel_mode = ARRAY_SIZE(alc861vd_3stack_2ch_modes), | ||
| 14469 | .channel_mode = alc861vd_3stack_2ch_modes, | ||
| 14470 | .input_mux = &alc861vd_capture_source, | ||
| 14471 | .unsol_event = alc861vd_lenovo_unsol_event, | ||
| 14472 | .init_hook = alc861vd_lenovo_automute, | ||
| 14473 | }, | ||
| 14293 | }; | 14474 | }; |
| 14294 | 14475 | ||
| 14295 | /* | 14476 | /* |
| @@ -14514,11 +14695,10 @@ static int alc861vd_parse_auto_config(struct hda_codec *codec) | |||
| 14514 | if (spec->autocfg.dig_out_pin) | 14695 | if (spec->autocfg.dig_out_pin) |
| 14515 | spec->multiout.dig_out_nid = ALC861VD_DIGOUT_NID; | 14696 | spec->multiout.dig_out_nid = ALC861VD_DIGOUT_NID; |
| 14516 | 14697 | ||
| 14517 | if (spec->kctl_alloc) | 14698 | if (spec->kctls.list) |
| 14518 | spec->mixers[spec->num_mixers++] = spec->kctl_alloc; | 14699 | add_mixer(spec, spec->kctls.list); |
| 14519 | 14700 | ||
| 14520 | spec->init_verbs[spec->num_init_verbs++] | 14701 | add_verb(spec, alc861vd_volume_init_verbs); |
| 14521 | = alc861vd_volume_init_verbs; | ||
| 14522 | 14702 | ||
| 14523 | spec->num_mux_defs = 1; | 14703 | spec->num_mux_defs = 1; |
| 14524 | spec->input_mux = &spec->private_imux; | 14704 | spec->input_mux = &spec->private_imux; |
| @@ -14585,7 +14765,7 @@ static int patch_alc861vd(struct hda_codec *codec) | |||
| 14585 | spec->stream_name_analog = "ALC660-VD Analog"; | 14765 | spec->stream_name_analog = "ALC660-VD Analog"; |
| 14586 | spec->stream_name_digital = "ALC660-VD Digital"; | 14766 | spec->stream_name_digital = "ALC660-VD Digital"; |
| 14587 | /* always turn on EAPD */ | 14767 | /* always turn on EAPD */ |
| 14588 | spec->init_verbs[spec->num_init_verbs++] = alc660vd_eapd_verbs; | 14768 | add_verb(spec, alc660vd_eapd_verbs); |
| 14589 | } else { | 14769 | } else { |
| 14590 | spec->stream_name_analog = "ALC861VD Analog"; | 14770 | spec->stream_name_analog = "ALC861VD Analog"; |
| 14591 | spec->stream_name_digital = "ALC861VD Digital"; | 14771 | spec->stream_name_digital = "ALC861VD Digital"; |
| @@ -14600,9 +14780,9 @@ static int patch_alc861vd(struct hda_codec *codec) | |||
| 14600 | spec->adc_nids = alc861vd_adc_nids; | 14780 | spec->adc_nids = alc861vd_adc_nids; |
| 14601 | spec->num_adc_nids = ARRAY_SIZE(alc861vd_adc_nids); | 14781 | spec->num_adc_nids = ARRAY_SIZE(alc861vd_adc_nids); |
| 14602 | spec->capsrc_nids = alc861vd_capsrc_nids; | 14782 | spec->capsrc_nids = alc861vd_capsrc_nids; |
| 14783 | spec->is_mix_capture = 1; | ||
| 14603 | 14784 | ||
| 14604 | spec->mixers[spec->num_mixers] = alc861vd_capture_mixer; | 14785 | set_capture_mixer(spec); |
| 14605 | spec->num_mixers++; | ||
| 14606 | 14786 | ||
| 14607 | spec->vmaster_nid = 0x02; | 14787 | spec->vmaster_nid = 0x02; |
| 14608 | 14788 | ||
| @@ -14614,6 +14794,7 @@ static int patch_alc861vd(struct hda_codec *codec) | |||
| 14614 | if (!spec->loopback.amplist) | 14794 | if (!spec->loopback.amplist) |
| 14615 | spec->loopback.amplist = alc861vd_loopbacks; | 14795 | spec->loopback.amplist = alc861vd_loopbacks; |
| 14616 | #endif | 14796 | #endif |
| 14797 | codec->proc_widget_hook = print_realtek_coef; | ||
| 14617 | 14798 | ||
| 14618 | return 0; | 14799 | return 0; |
| 14619 | } | 14800 | } |
| @@ -14689,10 +14870,6 @@ static struct hda_input_mux alc663_m51va_capture_source = { | |||
| 14689 | }, | 14870 | }, |
| 14690 | }; | 14871 | }; |
| 14691 | 14872 | ||
| 14692 | #define alc662_mux_enum_info alc_mux_enum_info | ||
| 14693 | #define alc662_mux_enum_get alc_mux_enum_get | ||
| 14694 | #define alc662_mux_enum_put alc882_mux_enum_put | ||
| 14695 | |||
| 14696 | /* | 14873 | /* |
| 14697 | * 2ch mode | 14874 | * 2ch mode |
| 14698 | */ | 14875 | */ |
| @@ -15278,25 +15455,6 @@ static struct hda_verb alc662_ecs_init_verbs[] = { | |||
| 15278 | {} | 15455 | {} |
| 15279 | }; | 15456 | }; |
| 15280 | 15457 | ||
| 15281 | /* capture mixer elements */ | ||
| 15282 | static struct snd_kcontrol_new alc662_capture_mixer[] = { | ||
| 15283 | HDA_CODEC_VOLUME("Capture Volume", 0x09, 0x0, HDA_INPUT), | ||
| 15284 | HDA_CODEC_MUTE("Capture Switch", 0x09, 0x0, HDA_INPUT), | ||
| 15285 | { | ||
| 15286 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
| 15287 | /* The multiple "Capture Source" controls confuse alsamixer | ||
| 15288 | * So call somewhat different.. | ||
| 15289 | */ | ||
| 15290 | /* .name = "Capture Source", */ | ||
| 15291 | .name = "Input Source", | ||
| 15292 | .count = 1, | ||
| 15293 | .info = alc662_mux_enum_info, | ||
| 15294 | .get = alc662_mux_enum_get, | ||
| 15295 | .put = alc662_mux_enum_put, | ||
| 15296 | }, | ||
| 15297 | { } /* end */ | ||
| 15298 | }; | ||
| 15299 | |||
| 15300 | static struct snd_kcontrol_new alc662_auto_capture_mixer[] = { | 15458 | static struct snd_kcontrol_new alc662_auto_capture_mixer[] = { |
| 15301 | HDA_CODEC_VOLUME("Capture Volume", 0x09, 0x0, HDA_INPUT), | 15459 | HDA_CODEC_VOLUME("Capture Volume", 0x09, 0x0, HDA_INPUT), |
| 15302 | HDA_CODEC_MUTE("Capture Switch", 0x09, 0x0, HDA_INPUT), | 15460 | HDA_CODEC_MUTE("Capture Switch", 0x09, 0x0, HDA_INPUT), |
| @@ -15868,7 +16026,7 @@ static struct snd_pci_quirk alc662_cfg_tbl[] = { | |||
| 15868 | 16026 | ||
| 15869 | static struct alc_config_preset alc662_presets[] = { | 16027 | static struct alc_config_preset alc662_presets[] = { |
| 15870 | [ALC662_3ST_2ch_DIG] = { | 16028 | [ALC662_3ST_2ch_DIG] = { |
| 15871 | .mixers = { alc662_3ST_2ch_mixer, alc662_capture_mixer }, | 16029 | .mixers = { alc662_3ST_2ch_mixer }, |
| 15872 | .init_verbs = { alc662_init_verbs }, | 16030 | .init_verbs = { alc662_init_verbs }, |
| 15873 | .num_dacs = ARRAY_SIZE(alc662_dac_nids), | 16031 | .num_dacs = ARRAY_SIZE(alc662_dac_nids), |
| 15874 | .dac_nids = alc662_dac_nids, | 16032 | .dac_nids = alc662_dac_nids, |
| @@ -15879,8 +16037,7 @@ static struct alc_config_preset alc662_presets[] = { | |||
| 15879 | .input_mux = &alc662_capture_source, | 16037 | .input_mux = &alc662_capture_source, |
| 15880 | }, | 16038 | }, |
| 15881 | [ALC662_3ST_6ch_DIG] = { | 16039 | [ALC662_3ST_6ch_DIG] = { |
| 15882 | .mixers = { alc662_3ST_6ch_mixer, alc662_chmode_mixer, | 16040 | .mixers = { alc662_3ST_6ch_mixer, alc662_chmode_mixer }, |
| 15883 | alc662_capture_mixer }, | ||
| 15884 | .init_verbs = { alc662_init_verbs }, | 16041 | .init_verbs = { alc662_init_verbs }, |
| 15885 | .num_dacs = ARRAY_SIZE(alc662_dac_nids), | 16042 | .num_dacs = ARRAY_SIZE(alc662_dac_nids), |
| 15886 | .dac_nids = alc662_dac_nids, | 16043 | .dac_nids = alc662_dac_nids, |
| @@ -15892,8 +16049,7 @@ static struct alc_config_preset alc662_presets[] = { | |||
| 15892 | .input_mux = &alc662_capture_source, | 16049 | .input_mux = &alc662_capture_source, |
| 15893 | }, | 16050 | }, |
| 15894 | [ALC662_3ST_6ch] = { | 16051 | [ALC662_3ST_6ch] = { |
| 15895 | .mixers = { alc662_3ST_6ch_mixer, alc662_chmode_mixer, | 16052 | .mixers = { alc662_3ST_6ch_mixer, alc662_chmode_mixer }, |
| 15896 | alc662_capture_mixer }, | ||
| 15897 | .init_verbs = { alc662_init_verbs }, | 16053 | .init_verbs = { alc662_init_verbs }, |
| 15898 | .num_dacs = ARRAY_SIZE(alc662_dac_nids), | 16054 | .num_dacs = ARRAY_SIZE(alc662_dac_nids), |
| 15899 | .dac_nids = alc662_dac_nids, | 16055 | .dac_nids = alc662_dac_nids, |
| @@ -15903,8 +16059,7 @@ static struct alc_config_preset alc662_presets[] = { | |||
| 15903 | .input_mux = &alc662_capture_source, | 16059 | .input_mux = &alc662_capture_source, |
| 15904 | }, | 16060 | }, |
| 15905 | [ALC662_5ST_DIG] = { | 16061 | [ALC662_5ST_DIG] = { |
| 15906 | .mixers = { alc662_base_mixer, alc662_chmode_mixer, | 16062 | .mixers = { alc662_base_mixer, alc662_chmode_mixer }, |
| 15907 | alc662_capture_mixer }, | ||
| 15908 | .init_verbs = { alc662_init_verbs }, | 16063 | .init_verbs = { alc662_init_verbs }, |
| 15909 | .num_dacs = ARRAY_SIZE(alc662_dac_nids), | 16064 | .num_dacs = ARRAY_SIZE(alc662_dac_nids), |
| 15910 | .dac_nids = alc662_dac_nids, | 16065 | .dac_nids = alc662_dac_nids, |
| @@ -15915,7 +16070,7 @@ static struct alc_config_preset alc662_presets[] = { | |||
| 15915 | .input_mux = &alc662_capture_source, | 16070 | .input_mux = &alc662_capture_source, |
| 15916 | }, | 16071 | }, |
| 15917 | [ALC662_LENOVO_101E] = { | 16072 | [ALC662_LENOVO_101E] = { |
| 15918 | .mixers = { alc662_lenovo_101e_mixer, alc662_capture_mixer }, | 16073 | .mixers = { alc662_lenovo_101e_mixer }, |
| 15919 | .init_verbs = { alc662_init_verbs, alc662_sue_init_verbs }, | 16074 | .init_verbs = { alc662_init_verbs, alc662_sue_init_verbs }, |
| 15920 | .num_dacs = ARRAY_SIZE(alc662_dac_nids), | 16075 | .num_dacs = ARRAY_SIZE(alc662_dac_nids), |
| 15921 | .dac_nids = alc662_dac_nids, | 16076 | .dac_nids = alc662_dac_nids, |
| @@ -15926,7 +16081,7 @@ static struct alc_config_preset alc662_presets[] = { | |||
| 15926 | .init_hook = alc662_lenovo_101e_all_automute, | 16081 | .init_hook = alc662_lenovo_101e_all_automute, |
| 15927 | }, | 16082 | }, |
| 15928 | [ALC662_ASUS_EEEPC_P701] = { | 16083 | [ALC662_ASUS_EEEPC_P701] = { |
| 15929 | .mixers = { alc662_eeepc_p701_mixer, alc662_capture_mixer }, | 16084 | .mixers = { alc662_eeepc_p701_mixer }, |
| 15930 | .init_verbs = { alc662_init_verbs, | 16085 | .init_verbs = { alc662_init_verbs, |
| 15931 | alc662_eeepc_sue_init_verbs }, | 16086 | alc662_eeepc_sue_init_verbs }, |
| 15932 | .num_dacs = ARRAY_SIZE(alc662_dac_nids), | 16087 | .num_dacs = ARRAY_SIZE(alc662_dac_nids), |
| @@ -15938,7 +16093,7 @@ static struct alc_config_preset alc662_presets[] = { | |||
| 15938 | .init_hook = alc662_eeepc_inithook, | 16093 | .init_hook = alc662_eeepc_inithook, |
| 15939 | }, | 16094 | }, |
| 15940 | [ALC662_ASUS_EEEPC_EP20] = { | 16095 | [ALC662_ASUS_EEEPC_EP20] = { |
| 15941 | .mixers = { alc662_eeepc_ep20_mixer, alc662_capture_mixer, | 16096 | .mixers = { alc662_eeepc_ep20_mixer, |
| 15942 | alc662_chmode_mixer }, | 16097 | alc662_chmode_mixer }, |
| 15943 | .init_verbs = { alc662_init_verbs, | 16098 | .init_verbs = { alc662_init_verbs, |
| 15944 | alc662_eeepc_ep20_sue_init_verbs }, | 16099 | alc662_eeepc_ep20_sue_init_verbs }, |
| @@ -15951,7 +16106,7 @@ static struct alc_config_preset alc662_presets[] = { | |||
| 15951 | .init_hook = alc662_eeepc_ep20_inithook, | 16106 | .init_hook = alc662_eeepc_ep20_inithook, |
| 15952 | }, | 16107 | }, |
| 15953 | [ALC662_ECS] = { | 16108 | [ALC662_ECS] = { |
| 15954 | .mixers = { alc662_ecs_mixer, alc662_capture_mixer }, | 16109 | .mixers = { alc662_ecs_mixer }, |
| 15955 | .init_verbs = { alc662_init_verbs, | 16110 | .init_verbs = { alc662_init_verbs, |
| 15956 | alc662_ecs_init_verbs }, | 16111 | alc662_ecs_init_verbs }, |
| 15957 | .num_dacs = ARRAY_SIZE(alc662_dac_nids), | 16112 | .num_dacs = ARRAY_SIZE(alc662_dac_nids), |
| @@ -15963,7 +16118,7 @@ static struct alc_config_preset alc662_presets[] = { | |||
| 15963 | .init_hook = alc662_eeepc_inithook, | 16118 | .init_hook = alc662_eeepc_inithook, |
| 15964 | }, | 16119 | }, |
| 15965 | [ALC663_ASUS_M51VA] = { | 16120 | [ALC663_ASUS_M51VA] = { |
| 15966 | .mixers = { alc663_m51va_mixer, alc662_capture_mixer}, | 16121 | .mixers = { alc663_m51va_mixer }, |
| 15967 | .init_verbs = { alc662_init_verbs, alc663_m51va_init_verbs }, | 16122 | .init_verbs = { alc662_init_verbs, alc663_m51va_init_verbs }, |
| 15968 | .num_dacs = ARRAY_SIZE(alc662_dac_nids), | 16123 | .num_dacs = ARRAY_SIZE(alc662_dac_nids), |
| 15969 | .dac_nids = alc662_dac_nids, | 16124 | .dac_nids = alc662_dac_nids, |
| @@ -15975,7 +16130,7 @@ static struct alc_config_preset alc662_presets[] = { | |||
| 15975 | .init_hook = alc663_m51va_inithook, | 16130 | .init_hook = alc663_m51va_inithook, |
| 15976 | }, | 16131 | }, |
| 15977 | [ALC663_ASUS_G71V] = { | 16132 | [ALC663_ASUS_G71V] = { |
| 15978 | .mixers = { alc663_g71v_mixer, alc662_capture_mixer}, | 16133 | .mixers = { alc663_g71v_mixer }, |
| 15979 | .init_verbs = { alc662_init_verbs, alc663_g71v_init_verbs }, | 16134 | .init_verbs = { alc662_init_verbs, alc663_g71v_init_verbs }, |
| 15980 | .num_dacs = ARRAY_SIZE(alc662_dac_nids), | 16135 | .num_dacs = ARRAY_SIZE(alc662_dac_nids), |
| 15981 | .dac_nids = alc662_dac_nids, | 16136 | .dac_nids = alc662_dac_nids, |
| @@ -15987,7 +16142,7 @@ static struct alc_config_preset alc662_presets[] = { | |||
| 15987 | .init_hook = alc663_g71v_inithook, | 16142 | .init_hook = alc663_g71v_inithook, |
| 15988 | }, | 16143 | }, |
| 15989 | [ALC663_ASUS_H13] = { | 16144 | [ALC663_ASUS_H13] = { |
| 15990 | .mixers = { alc663_m51va_mixer, alc662_capture_mixer}, | 16145 | .mixers = { alc663_m51va_mixer }, |
| 15991 | .init_verbs = { alc662_init_verbs, alc663_m51va_init_verbs }, | 16146 | .init_verbs = { alc662_init_verbs, alc663_m51va_init_verbs }, |
| 15992 | .num_dacs = ARRAY_SIZE(alc662_dac_nids), | 16147 | .num_dacs = ARRAY_SIZE(alc662_dac_nids), |
| 15993 | .dac_nids = alc662_dac_nids, | 16148 | .dac_nids = alc662_dac_nids, |
| @@ -15998,7 +16153,7 @@ static struct alc_config_preset alc662_presets[] = { | |||
| 15998 | .init_hook = alc663_m51va_inithook, | 16153 | .init_hook = alc663_m51va_inithook, |
| 15999 | }, | 16154 | }, |
| 16000 | [ALC663_ASUS_G50V] = { | 16155 | [ALC663_ASUS_G50V] = { |
| 16001 | .mixers = { alc663_g50v_mixer, alc662_capture_mixer}, | 16156 | .mixers = { alc663_g50v_mixer }, |
| 16002 | .init_verbs = { alc662_init_verbs, alc663_g50v_init_verbs }, | 16157 | .init_verbs = { alc662_init_verbs, alc663_g50v_init_verbs }, |
| 16003 | .num_dacs = ARRAY_SIZE(alc662_dac_nids), | 16158 | .num_dacs = ARRAY_SIZE(alc662_dac_nids), |
| 16004 | .dac_nids = alc662_dac_nids, | 16159 | .dac_nids = alc662_dac_nids, |
| @@ -16010,7 +16165,8 @@ static struct alc_config_preset alc662_presets[] = { | |||
| 16010 | .init_hook = alc663_g50v_inithook, | 16165 | .init_hook = alc663_g50v_inithook, |
| 16011 | }, | 16166 | }, |
| 16012 | [ALC663_ASUS_MODE1] = { | 16167 | [ALC663_ASUS_MODE1] = { |
| 16013 | .mixers = { alc663_m51va_mixer, alc662_auto_capture_mixer }, | 16168 | .mixers = { alc663_m51va_mixer }, |
| 16169 | .cap_mixer = alc662_auto_capture_mixer, | ||
| 16014 | .init_verbs = { alc662_init_verbs, | 16170 | .init_verbs = { alc662_init_verbs, |
| 16015 | alc663_21jd_amic_init_verbs }, | 16171 | alc663_21jd_amic_init_verbs }, |
| 16016 | .num_dacs = ARRAY_SIZE(alc662_dac_nids), | 16172 | .num_dacs = ARRAY_SIZE(alc662_dac_nids), |
| @@ -16024,7 +16180,8 @@ static struct alc_config_preset alc662_presets[] = { | |||
| 16024 | .init_hook = alc663_mode1_inithook, | 16180 | .init_hook = alc663_mode1_inithook, |
| 16025 | }, | 16181 | }, |
| 16026 | [ALC662_ASUS_MODE2] = { | 16182 | [ALC662_ASUS_MODE2] = { |
| 16027 | .mixers = { alc662_1bjd_mixer, alc662_auto_capture_mixer }, | 16183 | .mixers = { alc662_1bjd_mixer }, |
| 16184 | .cap_mixer = alc662_auto_capture_mixer, | ||
| 16028 | .init_verbs = { alc662_init_verbs, | 16185 | .init_verbs = { alc662_init_verbs, |
| 16029 | alc662_1bjd_amic_init_verbs }, | 16186 | alc662_1bjd_amic_init_verbs }, |
| 16030 | .num_dacs = ARRAY_SIZE(alc662_dac_nids), | 16187 | .num_dacs = ARRAY_SIZE(alc662_dac_nids), |
| @@ -16037,7 +16194,8 @@ static struct alc_config_preset alc662_presets[] = { | |||
| 16037 | .init_hook = alc662_mode2_inithook, | 16194 | .init_hook = alc662_mode2_inithook, |
| 16038 | }, | 16195 | }, |
| 16039 | [ALC663_ASUS_MODE3] = { | 16196 | [ALC663_ASUS_MODE3] = { |
| 16040 | .mixers = { alc663_two_hp_m1_mixer, alc662_auto_capture_mixer }, | 16197 | .mixers = { alc663_two_hp_m1_mixer }, |
| 16198 | .cap_mixer = alc662_auto_capture_mixer, | ||
| 16041 | .init_verbs = { alc662_init_verbs, | 16199 | .init_verbs = { alc662_init_verbs, |
| 16042 | alc663_two_hp_amic_m1_init_verbs }, | 16200 | alc663_two_hp_amic_m1_init_verbs }, |
| 16043 | .num_dacs = ARRAY_SIZE(alc662_dac_nids), | 16201 | .num_dacs = ARRAY_SIZE(alc662_dac_nids), |
| @@ -16051,8 +16209,8 @@ static struct alc_config_preset alc662_presets[] = { | |||
| 16051 | .init_hook = alc663_mode3_inithook, | 16209 | .init_hook = alc663_mode3_inithook, |
| 16052 | }, | 16210 | }, |
| 16053 | [ALC663_ASUS_MODE4] = { | 16211 | [ALC663_ASUS_MODE4] = { |
| 16054 | .mixers = { alc663_asus_21jd_clfe_mixer, | 16212 | .mixers = { alc663_asus_21jd_clfe_mixer }, |
| 16055 | alc662_auto_capture_mixer}, | 16213 | .cap_mixer = alc662_auto_capture_mixer, |
| 16056 | .init_verbs = { alc662_init_verbs, | 16214 | .init_verbs = { alc662_init_verbs, |
| 16057 | alc663_21jd_amic_init_verbs}, | 16215 | alc663_21jd_amic_init_verbs}, |
| 16058 | .num_dacs = ARRAY_SIZE(alc662_dac_nids), | 16216 | .num_dacs = ARRAY_SIZE(alc662_dac_nids), |
| @@ -16066,8 +16224,8 @@ static struct alc_config_preset alc662_presets[] = { | |||
| 16066 | .init_hook = alc663_mode4_inithook, | 16224 | .init_hook = alc663_mode4_inithook, |
| 16067 | }, | 16225 | }, |
| 16068 | [ALC663_ASUS_MODE5] = { | 16226 | [ALC663_ASUS_MODE5] = { |
| 16069 | .mixers = { alc663_asus_15jd_clfe_mixer, | 16227 | .mixers = { alc663_asus_15jd_clfe_mixer }, |
| 16070 | alc662_auto_capture_mixer }, | 16228 | .cap_mixer = alc662_auto_capture_mixer, |
| 16071 | .init_verbs = { alc662_init_verbs, | 16229 | .init_verbs = { alc662_init_verbs, |
| 16072 | alc663_15jd_amic_init_verbs }, | 16230 | alc663_15jd_amic_init_verbs }, |
| 16073 | .num_dacs = ARRAY_SIZE(alc662_dac_nids), | 16231 | .num_dacs = ARRAY_SIZE(alc662_dac_nids), |
| @@ -16081,7 +16239,8 @@ static struct alc_config_preset alc662_presets[] = { | |||
| 16081 | .init_hook = alc663_mode5_inithook, | 16239 | .init_hook = alc663_mode5_inithook, |
| 16082 | }, | 16240 | }, |
| 16083 | [ALC663_ASUS_MODE6] = { | 16241 | [ALC663_ASUS_MODE6] = { |
| 16084 | .mixers = { alc663_two_hp_m2_mixer, alc662_auto_capture_mixer }, | 16242 | .mixers = { alc663_two_hp_m2_mixer }, |
| 16243 | .cap_mixer = alc662_auto_capture_mixer, | ||
| 16085 | .init_verbs = { alc662_init_verbs, | 16244 | .init_verbs = { alc662_init_verbs, |
| 16086 | alc663_two_hp_amic_m2_init_verbs }, | 16245 | alc663_two_hp_amic_m2_init_verbs }, |
| 16087 | .num_dacs = ARRAY_SIZE(alc662_dac_nids), | 16246 | .num_dacs = ARRAY_SIZE(alc662_dac_nids), |
| @@ -16342,24 +16501,20 @@ static int alc662_parse_auto_config(struct hda_codec *codec) | |||
| 16342 | if (spec->autocfg.dig_out_pin) | 16501 | if (spec->autocfg.dig_out_pin) |
| 16343 | spec->multiout.dig_out_nid = ALC880_DIGOUT_NID; | 16502 | spec->multiout.dig_out_nid = ALC880_DIGOUT_NID; |
| 16344 | 16503 | ||
| 16345 | if (spec->kctl_alloc) | 16504 | if (spec->kctls.list) |
| 16346 | spec->mixers[spec->num_mixers++] = spec->kctl_alloc; | 16505 | add_mixer(spec, spec->kctls.list); |
| 16347 | 16506 | ||
| 16348 | spec->num_mux_defs = 1; | 16507 | spec->num_mux_defs = 1; |
| 16349 | spec->input_mux = &spec->private_imux; | 16508 | spec->input_mux = &spec->private_imux; |
| 16350 | 16509 | ||
| 16351 | spec->init_verbs[spec->num_init_verbs++] = alc662_auto_init_verbs; | 16510 | add_verb(spec, alc662_auto_init_verbs); |
| 16352 | if (codec->vendor_id == 0x10ec0663) | 16511 | if (codec->vendor_id == 0x10ec0663) |
| 16353 | spec->init_verbs[spec->num_init_verbs++] = | 16512 | add_verb(spec, alc663_auto_init_verbs); |
| 16354 | alc663_auto_init_verbs; | ||
| 16355 | 16513 | ||
| 16356 | err = alc_auto_add_mic_boost(codec); | 16514 | err = alc_auto_add_mic_boost(codec); |
| 16357 | if (err < 0) | 16515 | if (err < 0) |
| 16358 | return err; | 16516 | return err; |
| 16359 | 16517 | ||
| 16360 | spec->mixers[spec->num_mixers] = alc662_capture_mixer; | ||
| 16361 | spec->num_mixers++; | ||
| 16362 | |||
| 16363 | store_pin_configs(codec); | 16518 | store_pin_configs(codec); |
| 16364 | return 1; | 16519 | return 1; |
| 16365 | } | 16520 | } |
| @@ -16435,6 +16590,10 @@ static int patch_alc662(struct hda_codec *codec) | |||
| 16435 | spec->adc_nids = alc662_adc_nids; | 16590 | spec->adc_nids = alc662_adc_nids; |
| 16436 | spec->num_adc_nids = ARRAY_SIZE(alc662_adc_nids); | 16591 | spec->num_adc_nids = ARRAY_SIZE(alc662_adc_nids); |
| 16437 | spec->capsrc_nids = alc662_capsrc_nids; | 16592 | spec->capsrc_nids = alc662_capsrc_nids; |
| 16593 | spec->is_mix_capture = 1; | ||
| 16594 | |||
| 16595 | if (!spec->cap_mixer) | ||
| 16596 | set_capture_mixer(spec); | ||
| 16438 | 16597 | ||
| 16439 | spec->vmaster_nid = 0x02; | 16598 | spec->vmaster_nid = 0x02; |
| 16440 | 16599 | ||
| @@ -16445,6 +16604,7 @@ static int patch_alc662(struct hda_codec *codec) | |||
| 16445 | if (!spec->loopback.amplist) | 16604 | if (!spec->loopback.amplist) |
| 16446 | spec->loopback.amplist = alc662_loopbacks; | 16605 | spec->loopback.amplist = alc662_loopbacks; |
| 16447 | #endif | 16606 | #endif |
| 16607 | codec->proc_widget_hook = print_realtek_coef; | ||
| 16448 | 16608 | ||
| 16449 | return 0; | 16609 | return 0; |
| 16450 | } | 16610 | } |
| @@ -16452,7 +16612,7 @@ static int patch_alc662(struct hda_codec *codec) | |||
| 16452 | /* | 16612 | /* |
| 16453 | * patch entries | 16613 | * patch entries |
| 16454 | */ | 16614 | */ |
| 16455 | struct hda_codec_preset snd_hda_preset_realtek[] = { | 16615 | static struct hda_codec_preset snd_hda_preset_realtek[] = { |
| 16456 | { .id = 0x10ec0260, .name = "ALC260", .patch = patch_alc260 }, | 16616 | { .id = 0x10ec0260, .name = "ALC260", .patch = patch_alc260 }, |
| 16457 | { .id = 0x10ec0262, .name = "ALC262", .patch = patch_alc262 }, | 16617 | { .id = 0x10ec0262, .name = "ALC262", .patch = patch_alc262 }, |
| 16458 | { .id = 0x10ec0267, .name = "ALC267", .patch = patch_alc268 }, | 16618 | { .id = 0x10ec0267, .name = "ALC267", .patch = patch_alc268 }, |
| @@ -16484,3 +16644,26 @@ struct hda_codec_preset snd_hda_preset_realtek[] = { | |||
| 16484 | { .id = 0x10ec0889, .name = "ALC889", .patch = patch_alc883 }, | 16644 | { .id = 0x10ec0889, .name = "ALC889", .patch = patch_alc883 }, |
| 16485 | {} /* terminator */ | 16645 | {} /* terminator */ |
| 16486 | }; | 16646 | }; |
| 16647 | |||
| 16648 | MODULE_ALIAS("snd-hda-codec-id:10ec*"); | ||
| 16649 | |||
| 16650 | MODULE_LICENSE("GPL"); | ||
| 16651 | MODULE_DESCRIPTION("Realtek HD-audio codec"); | ||
| 16652 | |||
| 16653 | static struct hda_codec_preset_list realtek_list = { | ||
| 16654 | .preset = snd_hda_preset_realtek, | ||
| 16655 | .owner = THIS_MODULE, | ||
| 16656 | }; | ||
| 16657 | |||
| 16658 | static int __init patch_realtek_init(void) | ||
| 16659 | { | ||
| 16660 | return snd_hda_add_codec_preset(&realtek_list); | ||
| 16661 | } | ||
| 16662 | |||
| 16663 | static void __exit patch_realtek_exit(void) | ||
| 16664 | { | ||
| 16665 | snd_hda_delete_codec_preset(&realtek_list); | ||
| 16666 | } | ||
| 16667 | |||
| 16668 | module_init(patch_realtek_init) | ||
| 16669 | module_exit(patch_realtek_exit) | ||
diff --git a/sound/pci/hda/patch_si3054.c b/sound/pci/hda/patch_si3054.c index 9332b63e406c..43b436c5d01b 100644 --- a/sound/pci/hda/patch_si3054.c +++ b/sound/pci/hda/patch_si3054.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | #include <sound/core.h> | 28 | #include <sound/core.h> |
| 29 | #include "hda_codec.h" | 29 | #include "hda_codec.h" |
| 30 | #include "hda_local.h" | 30 | #include "hda_local.h" |
| 31 | #include "hda_patch.h" | ||
| 32 | 31 | ||
| 33 | /* si3054 verbs */ | 32 | /* si3054 verbs */ |
| 34 | #define SI3054_VERB_READ_NODE 0x900 | 33 | #define SI3054_VERB_READ_NODE 0x900 |
| @@ -283,7 +282,7 @@ static int patch_si3054(struct hda_codec *codec) | |||
| 283 | /* | 282 | /* |
| 284 | * patch entries | 283 | * patch entries |
| 285 | */ | 284 | */ |
| 286 | struct hda_codec_preset snd_hda_preset_si3054[] = { | 285 | static struct hda_codec_preset snd_hda_preset_si3054[] = { |
| 287 | { .id = 0x163c3055, .name = "Si3054", .patch = patch_si3054 }, | 286 | { .id = 0x163c3055, .name = "Si3054", .patch = patch_si3054 }, |
| 288 | { .id = 0x163c3155, .name = "Si3054", .patch = patch_si3054 }, | 287 | { .id = 0x163c3155, .name = "Si3054", .patch = patch_si3054 }, |
| 289 | { .id = 0x11c13026, .name = "Si3054", .patch = patch_si3054 }, | 288 | { .id = 0x11c13026, .name = "Si3054", .patch = patch_si3054 }, |
| @@ -301,3 +300,35 @@ struct hda_codec_preset snd_hda_preset_si3054[] = { | |||
| 301 | {} | 300 | {} |
| 302 | }; | 301 | }; |
| 303 | 302 | ||
| 303 | MODULE_ALIAS("snd-hda-codec-id:163c3055"); | ||
| 304 | MODULE_ALIAS("snd-hda-codec-id:163c3155"); | ||
| 305 | MODULE_ALIAS("snd-hda-codec-id:11c13026"); | ||
| 306 | MODULE_ALIAS("snd-hda-codec-id:11c13055"); | ||
| 307 | MODULE_ALIAS("snd-hda-codec-id:11c13155"); | ||
| 308 | MODULE_ALIAS("snd-hda-codec-id:10573055"); | ||
| 309 | MODULE_ALIAS("snd-hda-codec-id:10573057"); | ||
| 310 | MODULE_ALIAS("snd-hda-codec-id:10573155"); | ||
| 311 | MODULE_ALIAS("snd-hda-codec-id:11063288"); | ||
| 312 | MODULE_ALIAS("snd-hda-codec-id:15433155"); | ||
| 313 | MODULE_ALIAS("snd-hda-codec-id:18540018"); | ||
| 314 | |||
| 315 | MODULE_LICENSE("GPL"); | ||
| 316 | MODULE_DESCRIPTION("Si3054 HD-audio modem codec"); | ||
| 317 | |||
| 318 | static struct hda_codec_preset_list si3054_list = { | ||
| 319 | .preset = snd_hda_preset_si3054, | ||
| 320 | .owner = THIS_MODULE, | ||
| 321 | }; | ||
| 322 | |||
| 323 | static int __init patch_si3054_init(void) | ||
| 324 | { | ||
| 325 | return snd_hda_add_codec_preset(&si3054_list); | ||
| 326 | } | ||
| 327 | |||
| 328 | static void __exit patch_si3054_exit(void) | ||
| 329 | { | ||
| 330 | snd_hda_delete_codec_preset(&si3054_list); | ||
| 331 | } | ||
| 332 | |||
| 333 | module_init(patch_si3054_init) | ||
| 334 | module_exit(patch_si3054_exit) | ||
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index 5dd3e89f620a..71c3ccfcde16 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c | |||
| @@ -30,17 +30,17 @@ | |||
| 30 | #include <linux/pci.h> | 30 | #include <linux/pci.h> |
| 31 | #include <sound/core.h> | 31 | #include <sound/core.h> |
| 32 | #include <sound/asoundef.h> | 32 | #include <sound/asoundef.h> |
| 33 | #include <sound/jack.h> | ||
| 33 | #include "hda_codec.h" | 34 | #include "hda_codec.h" |
| 34 | #include "hda_local.h" | 35 | #include "hda_local.h" |
| 35 | #include "hda_patch.h" | ||
| 36 | #include "hda_beep.h" | 36 | #include "hda_beep.h" |
| 37 | 37 | ||
| 38 | #define NUM_CONTROL_ALLOC 32 | 38 | enum { |
| 39 | 39 | STAC_VREF_EVENT = 1, | |
| 40 | #define STAC_VREF_EVENT 0x00 | 40 | STAC_INSERT_EVENT, |
| 41 | #define STAC_INSERT_EVENT 0x10 | 41 | STAC_PWR_EVENT, |
| 42 | #define STAC_PWR_EVENT 0x20 | 42 | STAC_HP_EVENT, |
| 43 | #define STAC_HP_EVENT 0x30 | 43 | }; |
| 44 | 44 | ||
| 45 | enum { | 45 | enum { |
| 46 | STAC_REF, | 46 | STAC_REF, |
| @@ -69,6 +69,7 @@ enum { | |||
| 69 | }; | 69 | }; |
| 70 | 70 | ||
| 71 | enum { | 71 | enum { |
| 72 | STAC_92HD73XX_NO_JD, /* no jack-detection */ | ||
| 72 | STAC_92HD73XX_REF, | 73 | STAC_92HD73XX_REF, |
| 73 | STAC_DELL_M6_AMIC, | 74 | STAC_DELL_M6_AMIC, |
| 74 | STAC_DELL_M6_DMIC, | 75 | STAC_DELL_M6_DMIC, |
| @@ -127,6 +128,7 @@ enum { | |||
| 127 | }; | 128 | }; |
| 128 | 129 | ||
| 129 | enum { | 130 | enum { |
| 131 | STAC_D965_REF_NO_JD, /* no jack-detection */ | ||
| 130 | STAC_D965_REF, | 132 | STAC_D965_REF, |
| 131 | STAC_D965_3ST, | 133 | STAC_D965_3ST, |
| 132 | STAC_D965_5ST, | 134 | STAC_D965_5ST, |
| @@ -135,6 +137,19 @@ enum { | |||
| 135 | STAC_927X_MODELS | 137 | STAC_927X_MODELS |
| 136 | }; | 138 | }; |
| 137 | 139 | ||
| 140 | struct sigmatel_event { | ||
| 141 | hda_nid_t nid; | ||
| 142 | unsigned char type; | ||
| 143 | unsigned char tag; | ||
| 144 | int data; | ||
| 145 | }; | ||
| 146 | |||
| 147 | struct sigmatel_jack { | ||
| 148 | hda_nid_t nid; | ||
| 149 | int type; | ||
| 150 | struct snd_jack *jack; | ||
| 151 | }; | ||
| 152 | |||
| 138 | struct sigmatel_spec { | 153 | struct sigmatel_spec { |
| 139 | struct snd_kcontrol_new *mixers[4]; | 154 | struct snd_kcontrol_new *mixers[4]; |
| 140 | unsigned int num_mixers; | 155 | unsigned int num_mixers; |
| @@ -168,6 +183,12 @@ struct sigmatel_spec { | |||
| 168 | hda_nid_t *pwr_nids; | 183 | hda_nid_t *pwr_nids; |
| 169 | hda_nid_t *dac_list; | 184 | hda_nid_t *dac_list; |
| 170 | 185 | ||
| 186 | /* jack detection */ | ||
| 187 | struct snd_array jacks; | ||
| 188 | |||
| 189 | /* events */ | ||
| 190 | struct snd_array events; | ||
| 191 | |||
| 171 | /* playback */ | 192 | /* playback */ |
| 172 | struct hda_input_mux *mono_mux; | 193 | struct hda_input_mux *mono_mux; |
| 173 | struct hda_input_mux *amp_mux; | 194 | struct hda_input_mux *amp_mux; |
| @@ -197,7 +218,6 @@ struct sigmatel_spec { | |||
| 197 | hda_nid_t *pin_nids; | 218 | hda_nid_t *pin_nids; |
| 198 | unsigned int num_pins; | 219 | unsigned int num_pins; |
| 199 | unsigned int *pin_configs; | 220 | unsigned int *pin_configs; |
| 200 | unsigned int *bios_pin_configs; | ||
| 201 | 221 | ||
| 202 | /* codec specific stuff */ | 222 | /* codec specific stuff */ |
| 203 | struct hda_verb *init; | 223 | struct hda_verb *init; |
| @@ -225,8 +245,7 @@ struct sigmatel_spec { | |||
| 225 | 245 | ||
| 226 | /* dynamic controls and input_mux */ | 246 | /* dynamic controls and input_mux */ |
| 227 | struct auto_pin_cfg autocfg; | 247 | struct auto_pin_cfg autocfg; |
| 228 | unsigned int num_kctl_alloc, num_kctl_used; | 248 | struct snd_array kctls; |
| 229 | struct snd_kcontrol_new *kctl_alloc; | ||
| 230 | struct hda_input_mux private_dimux; | 249 | struct hda_input_mux private_dimux; |
| 231 | struct hda_input_mux private_imux; | 250 | struct hda_input_mux private_imux; |
| 232 | struct hda_input_mux private_smux; | 251 | struct hda_input_mux private_smux; |
| @@ -572,12 +591,12 @@ static int stac92xx_smux_enum_put(struct snd_kcontrol *kcontrol, | |||
| 572 | else | 591 | else |
| 573 | nid = codec->slave_dig_outs[smux_idx - 1]; | 592 | nid = codec->slave_dig_outs[smux_idx - 1]; |
| 574 | if (spec->cur_smux[smux_idx] == smux->num_items - 1) | 593 | if (spec->cur_smux[smux_idx] == smux->num_items - 1) |
| 575 | val = AMP_OUT_MUTE; | 594 | val = HDA_AMP_MUTE; |
| 576 | else | 595 | else |
| 577 | val = AMP_OUT_UNMUTE; | 596 | val = 0; |
| 578 | /* un/mute SPDIF out */ | 597 | /* un/mute SPDIF out */ |
| 579 | snd_hda_codec_write_cache(codec, nid, 0, | 598 | snd_hda_codec_amp_stereo(codec, nid, HDA_OUTPUT, 0, |
| 580 | AC_VERB_SET_AMP_GAIN_MUTE, val); | 599 | HDA_AMP_MUTE, val); |
| 581 | } | 600 | } |
| 582 | return 0; | 601 | return 0; |
| 583 | } | 602 | } |
| @@ -1236,9 +1255,14 @@ static const char *slave_sws[] = { | |||
| 1236 | NULL | 1255 | NULL |
| 1237 | }; | 1256 | }; |
| 1238 | 1257 | ||
| 1258 | static void stac92xx_free_kctls(struct hda_codec *codec); | ||
| 1259 | static int stac92xx_add_jack(struct hda_codec *codec, hda_nid_t nid, int type); | ||
| 1260 | |||
| 1239 | static int stac92xx_build_controls(struct hda_codec *codec) | 1261 | static int stac92xx_build_controls(struct hda_codec *codec) |
| 1240 | { | 1262 | { |
| 1241 | struct sigmatel_spec *spec = codec->spec; | 1263 | struct sigmatel_spec *spec = codec->spec; |
| 1264 | struct auto_pin_cfg *cfg = &spec->autocfg; | ||
| 1265 | hda_nid_t nid; | ||
| 1242 | int err; | 1266 | int err; |
| 1243 | int i; | 1267 | int i; |
| 1244 | 1268 | ||
| @@ -1253,7 +1277,7 @@ static int stac92xx_build_controls(struct hda_codec *codec) | |||
| 1253 | } | 1277 | } |
| 1254 | if (spec->num_dmuxes > 0) { | 1278 | if (spec->num_dmuxes > 0) { |
| 1255 | stac_dmux_mixer.count = spec->num_dmuxes; | 1279 | stac_dmux_mixer.count = spec->num_dmuxes; |
| 1256 | err = snd_ctl_add(codec->bus->card, | 1280 | err = snd_hda_ctl_add(codec, |
| 1257 | snd_ctl_new1(&stac_dmux_mixer, codec)); | 1281 | snd_ctl_new1(&stac_dmux_mixer, codec)); |
| 1258 | if (err < 0) | 1282 | if (err < 0) |
| 1259 | return err; | 1283 | return err; |
| @@ -1308,6 +1332,37 @@ static int stac92xx_build_controls(struct hda_codec *codec) | |||
| 1308 | return err; | 1332 | return err; |
| 1309 | } | 1333 | } |
| 1310 | 1334 | ||
| 1335 | stac92xx_free_kctls(codec); /* no longer needed */ | ||
| 1336 | |||
| 1337 | /* create jack input elements */ | ||
| 1338 | if (spec->hp_detect) { | ||
| 1339 | for (i = 0; i < cfg->hp_outs; i++) { | ||
| 1340 | int type = SND_JACK_HEADPHONE; | ||
| 1341 | nid = cfg->hp_pins[i]; | ||
| 1342 | /* jack detection */ | ||
| 1343 | if (cfg->hp_outs == i) | ||
| 1344 | type |= SND_JACK_LINEOUT; | ||
| 1345 | err = stac92xx_add_jack(codec, nid, type); | ||
| 1346 | if (err < 0) | ||
| 1347 | return err; | ||
| 1348 | } | ||
| 1349 | } | ||
| 1350 | for (i = 0; i < cfg->line_outs; i++) { | ||
| 1351 | err = stac92xx_add_jack(codec, cfg->line_out_pins[i], | ||
| 1352 | SND_JACK_LINEOUT); | ||
| 1353 | if (err < 0) | ||
| 1354 | return err; | ||
| 1355 | } | ||
| 1356 | for (i = 0; i < AUTO_PIN_LAST; i++) { | ||
| 1357 | nid = cfg->input_pins[i]; | ||
| 1358 | if (nid) { | ||
| 1359 | err = stac92xx_add_jack(codec, nid, | ||
| 1360 | SND_JACK_MICROPHONE); | ||
| 1361 | if (err < 0) | ||
| 1362 | return err; | ||
| 1363 | } | ||
| 1364 | } | ||
| 1365 | |||
| 1311 | return 0; | 1366 | return 0; |
| 1312 | } | 1367 | } |
| 1313 | 1368 | ||
| @@ -1611,6 +1666,7 @@ static unsigned int *stac92hd73xx_brd_tbl[STAC_92HD73XX_MODELS] = { | |||
| 1611 | }; | 1666 | }; |
| 1612 | 1667 | ||
| 1613 | static const char *stac92hd73xx_models[STAC_92HD73XX_MODELS] = { | 1668 | static const char *stac92hd73xx_models[STAC_92HD73XX_MODELS] = { |
| 1669 | [STAC_92HD73XX_NO_JD] = "no-jd", | ||
| 1614 | [STAC_92HD73XX_REF] = "ref", | 1670 | [STAC_92HD73XX_REF] = "ref", |
| 1615 | [STAC_DELL_M6_AMIC] = "dell-m6-amic", | 1671 | [STAC_DELL_M6_AMIC] = "dell-m6-amic", |
| 1616 | [STAC_DELL_M6_DMIC] = "dell-m6-dmic", | 1672 | [STAC_DELL_M6_DMIC] = "dell-m6-dmic", |
| @@ -1640,6 +1696,8 @@ static struct snd_pci_quirk stac92hd73xx_cfg_tbl[] = { | |||
| 1640 | "unknown Dell", STAC_DELL_M6_DMIC), | 1696 | "unknown Dell", STAC_DELL_M6_DMIC), |
| 1641 | SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x029f, | 1697 | SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x029f, |
| 1642 | "Dell Studio 1537", STAC_DELL_M6_DMIC), | 1698 | "Dell Studio 1537", STAC_DELL_M6_DMIC), |
| 1699 | SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02a0, | ||
| 1700 | "Dell Studio 17", STAC_DELL_M6_DMIC), | ||
| 1643 | {} /* terminator */ | 1701 | {} /* terminator */ |
| 1644 | }; | 1702 | }; |
| 1645 | 1703 | ||
| @@ -2027,6 +2085,7 @@ static unsigned int dell_3st_pin_configs[14] = { | |||
| 2027 | }; | 2085 | }; |
| 2028 | 2086 | ||
| 2029 | static unsigned int *stac927x_brd_tbl[STAC_927X_MODELS] = { | 2087 | static unsigned int *stac927x_brd_tbl[STAC_927X_MODELS] = { |
| 2088 | [STAC_D965_REF_NO_JD] = ref927x_pin_configs, | ||
| 2030 | [STAC_D965_REF] = ref927x_pin_configs, | 2089 | [STAC_D965_REF] = ref927x_pin_configs, |
| 2031 | [STAC_D965_3ST] = d965_3st_pin_configs, | 2090 | [STAC_D965_3ST] = d965_3st_pin_configs, |
| 2032 | [STAC_D965_5ST] = d965_5st_pin_configs, | 2091 | [STAC_D965_5ST] = d965_5st_pin_configs, |
| @@ -2035,6 +2094,7 @@ static unsigned int *stac927x_brd_tbl[STAC_927X_MODELS] = { | |||
| 2035 | }; | 2094 | }; |
| 2036 | 2095 | ||
| 2037 | static const char *stac927x_models[STAC_927X_MODELS] = { | 2096 | static const char *stac927x_models[STAC_927X_MODELS] = { |
| 2097 | [STAC_D965_REF_NO_JD] = "ref-no-jd", | ||
| 2038 | [STAC_D965_REF] = "ref", | 2098 | [STAC_D965_REF] = "ref", |
| 2039 | [STAC_D965_3ST] = "3stack", | 2099 | [STAC_D965_3ST] = "3stack", |
| 2040 | [STAC_D965_5ST] = "5stack", | 2100 | [STAC_D965_5ST] = "5stack", |
| @@ -2193,12 +2253,11 @@ static int stac92xx_save_bios_config_regs(struct hda_codec *codec) | |||
| 2193 | int i; | 2253 | int i; |
| 2194 | struct sigmatel_spec *spec = codec->spec; | 2254 | struct sigmatel_spec *spec = codec->spec; |
| 2195 | 2255 | ||
| 2196 | if (! spec->bios_pin_configs) { | 2256 | kfree(spec->pin_configs); |
| 2197 | spec->bios_pin_configs = kcalloc(spec->num_pins, | 2257 | spec->pin_configs = kcalloc(spec->num_pins, sizeof(*spec->pin_configs), |
| 2198 | sizeof(*spec->bios_pin_configs), GFP_KERNEL); | 2258 | GFP_KERNEL); |
| 2199 | if (! spec->bios_pin_configs) | 2259 | if (!spec->pin_configs) |
| 2200 | return -ENOMEM; | 2260 | return -ENOMEM; |
| 2201 | } | ||
| 2202 | 2261 | ||
| 2203 | for (i = 0; i < spec->num_pins; i++) { | 2262 | for (i = 0; i < spec->num_pins; i++) { |
| 2204 | hda_nid_t nid = spec->pin_nids[i]; | 2263 | hda_nid_t nid = spec->pin_nids[i]; |
| @@ -2208,7 +2267,7 @@ static int stac92xx_save_bios_config_regs(struct hda_codec *codec) | |||
| 2208 | AC_VERB_GET_CONFIG_DEFAULT, 0x00); | 2267 | AC_VERB_GET_CONFIG_DEFAULT, 0x00); |
| 2209 | snd_printdd(KERN_INFO "hda_codec: pin nid %2.2x bios pin config %8.8x\n", | 2268 | snd_printdd(KERN_INFO "hda_codec: pin nid %2.2x bios pin config %8.8x\n", |
| 2210 | nid, pin_cfg); | 2269 | nid, pin_cfg); |
| 2211 | spec->bios_pin_configs[i] = pin_cfg; | 2270 | spec->pin_configs[i] = pin_cfg; |
| 2212 | } | 2271 | } |
| 2213 | 2272 | ||
| 2214 | return 0; | 2273 | return 0; |
| @@ -2250,6 +2309,39 @@ static void stac92xx_set_config_regs(struct hda_codec *codec) | |||
| 2250 | spec->pin_configs[i]); | 2309 | spec->pin_configs[i]); |
| 2251 | } | 2310 | } |
| 2252 | 2311 | ||
| 2312 | static int stac_save_pin_cfgs(struct hda_codec *codec, unsigned int *pins) | ||
| 2313 | { | ||
| 2314 | struct sigmatel_spec *spec = codec->spec; | ||
| 2315 | |||
| 2316 | if (!pins) | ||
| 2317 | return stac92xx_save_bios_config_regs(codec); | ||
| 2318 | |||
| 2319 | kfree(spec->pin_configs); | ||
| 2320 | spec->pin_configs = kmemdup(pins, | ||
| 2321 | spec->num_pins * sizeof(*pins), | ||
| 2322 | GFP_KERNEL); | ||
| 2323 | if (!spec->pin_configs) | ||
| 2324 | return -ENOMEM; | ||
| 2325 | |||
| 2326 | stac92xx_set_config_regs(codec); | ||
| 2327 | return 0; | ||
| 2328 | } | ||
| 2329 | |||
| 2330 | static void stac_change_pin_config(struct hda_codec *codec, hda_nid_t nid, | ||
| 2331 | unsigned int cfg) | ||
| 2332 | { | ||
| 2333 | struct sigmatel_spec *spec = codec->spec; | ||
| 2334 | int i; | ||
| 2335 | |||
| 2336 | for (i = 0; i < spec->num_pins; i++) { | ||
| 2337 | if (spec->pin_nids[i] == nid) { | ||
| 2338 | spec->pin_configs[i] = cfg; | ||
| 2339 | stac92xx_set_config_reg(codec, nid, cfg); | ||
| 2340 | break; | ||
| 2341 | } | ||
| 2342 | } | ||
| 2343 | } | ||
| 2344 | |||
| 2253 | /* | 2345 | /* |
| 2254 | * Analog playback callbacks | 2346 | * Analog playback callbacks |
| 2255 | */ | 2347 | */ |
| @@ -2327,7 +2419,7 @@ static int stac92xx_capture_pcm_prepare(struct hda_pcm_stream *hinfo, | |||
| 2327 | 2419 | ||
| 2328 | if (spec->powerdown_adcs) { | 2420 | if (spec->powerdown_adcs) { |
| 2329 | msleep(40); | 2421 | msleep(40); |
| 2330 | snd_hda_codec_write_cache(codec, nid, 0, | 2422 | snd_hda_codec_write(codec, nid, 0, |
| 2331 | AC_VERB_SET_POWER_STATE, AC_PWRST_D0); | 2423 | AC_VERB_SET_POWER_STATE, AC_PWRST_D0); |
| 2332 | } | 2424 | } |
| 2333 | snd_hda_codec_setup_stream(codec, nid, stream_tag, 0, format); | 2425 | snd_hda_codec_setup_stream(codec, nid, stream_tag, 0, format); |
| @@ -2343,7 +2435,7 @@ static int stac92xx_capture_pcm_cleanup(struct hda_pcm_stream *hinfo, | |||
| 2343 | 2435 | ||
| 2344 | snd_hda_codec_cleanup_stream(codec, nid); | 2436 | snd_hda_codec_cleanup_stream(codec, nid); |
| 2345 | if (spec->powerdown_adcs) | 2437 | if (spec->powerdown_adcs) |
| 2346 | snd_hda_codec_write_cache(codec, nid, 0, | 2438 | snd_hda_codec_write(codec, nid, 0, |
| 2347 | AC_VERB_SET_POWER_STATE, AC_PWRST_D3); | 2439 | AC_VERB_SET_POWER_STATE, AC_PWRST_D3); |
| 2348 | return 0; | 2440 | return 0; |
| 2349 | } | 2441 | } |
| @@ -2475,6 +2567,9 @@ static int stac92xx_hp_switch_get(struct snd_kcontrol *kcontrol, | |||
| 2475 | return 0; | 2567 | return 0; |
| 2476 | } | 2568 | } |
| 2477 | 2569 | ||
| 2570 | static void stac_issue_unsol_event(struct hda_codec *codec, hda_nid_t nid, | ||
| 2571 | unsigned char type); | ||
| 2572 | |||
| 2478 | static int stac92xx_hp_switch_put(struct snd_kcontrol *kcontrol, | 2573 | static int stac92xx_hp_switch_put(struct snd_kcontrol *kcontrol, |
| 2479 | struct snd_ctl_elem_value *ucontrol) | 2574 | struct snd_ctl_elem_value *ucontrol) |
| 2480 | { | 2575 | { |
| @@ -2487,7 +2582,7 @@ static int stac92xx_hp_switch_put(struct snd_kcontrol *kcontrol, | |||
| 2487 | /* check to be sure that the ports are upto date with | 2582 | /* check to be sure that the ports are upto date with |
| 2488 | * switch changes | 2583 | * switch changes |
| 2489 | */ | 2584 | */ |
| 2490 | codec->patch_ops.unsol_event(codec, STAC_HP_EVENT << 26); | 2585 | stac_issue_unsol_event(codec, nid, STAC_HP_EVENT); |
| 2491 | 2586 | ||
| 2492 | return 1; | 2587 | return 1; |
| 2493 | } | 2588 | } |
| @@ -2527,7 +2622,7 @@ static int stac92xx_io_switch_put(struct snd_kcontrol *kcontrol, struct snd_ctl_ | |||
| 2527 | * appropriately according to the pin direction | 2622 | * appropriately according to the pin direction |
| 2528 | */ | 2623 | */ |
| 2529 | if (spec->hp_detect) | 2624 | if (spec->hp_detect) |
| 2530 | codec->patch_ops.unsol_event(codec, STAC_HP_EVENT << 26); | 2625 | stac_issue_unsol_event(codec, nid, STAC_HP_EVENT); |
| 2531 | 2626 | ||
| 2532 | return 1; | 2627 | return 1; |
| 2533 | } | 2628 | } |
| @@ -2622,28 +2717,16 @@ static int stac92xx_add_control_temp(struct sigmatel_spec *spec, | |||
| 2622 | { | 2717 | { |
| 2623 | struct snd_kcontrol_new *knew; | 2718 | struct snd_kcontrol_new *knew; |
| 2624 | 2719 | ||
| 2625 | if (spec->num_kctl_used >= spec->num_kctl_alloc) { | 2720 | snd_array_init(&spec->kctls, sizeof(*knew), 32); |
| 2626 | int num = spec->num_kctl_alloc + NUM_CONTROL_ALLOC; | 2721 | knew = snd_array_new(&spec->kctls); |
| 2627 | 2722 | if (!knew) | |
| 2628 | knew = kcalloc(num + 1, sizeof(*knew), GFP_KERNEL); /* array + terminator */ | 2723 | return -ENOMEM; |
| 2629 | if (! knew) | ||
| 2630 | return -ENOMEM; | ||
| 2631 | if (spec->kctl_alloc) { | ||
| 2632 | memcpy(knew, spec->kctl_alloc, sizeof(*knew) * spec->num_kctl_alloc); | ||
| 2633 | kfree(spec->kctl_alloc); | ||
| 2634 | } | ||
| 2635 | spec->kctl_alloc = knew; | ||
| 2636 | spec->num_kctl_alloc = num; | ||
| 2637 | } | ||
| 2638 | |||
| 2639 | knew = &spec->kctl_alloc[spec->num_kctl_used]; | ||
| 2640 | *knew = *ktemp; | 2724 | *knew = *ktemp; |
| 2641 | knew->index = idx; | 2725 | knew->index = idx; |
| 2642 | knew->name = kstrdup(name, GFP_KERNEL); | 2726 | knew->name = kstrdup(name, GFP_KERNEL); |
| 2643 | if (!knew->name) | 2727 | if (!knew->name) |
| 2644 | return -ENOMEM; | 2728 | return -ENOMEM; |
| 2645 | knew->private_value = val; | 2729 | knew->private_value = val; |
| 2646 | spec->num_kctl_used++; | ||
| 2647 | return 0; | 2730 | return 0; |
| 2648 | } | 2731 | } |
| 2649 | 2732 | ||
| @@ -3520,8 +3603,8 @@ static int stac92xx_parse_auto_config(struct hda_codec *codec, hda_nid_t dig_out | |||
| 3520 | if (dig_in && spec->autocfg.dig_in_pin) | 3603 | if (dig_in && spec->autocfg.dig_in_pin) |
| 3521 | spec->dig_in_nid = dig_in; | 3604 | spec->dig_in_nid = dig_in; |
| 3522 | 3605 | ||
| 3523 | if (spec->kctl_alloc) | 3606 | if (spec->kctls.list) |
| 3524 | spec->mixers[spec->num_mixers++] = spec->kctl_alloc; | 3607 | spec->mixers[spec->num_mixers++] = spec->kctls.list; |
| 3525 | 3608 | ||
| 3526 | spec->input_mux = &spec->private_imux; | 3609 | spec->input_mux = &spec->private_imux; |
| 3527 | spec->dinput_mux = &spec->private_dimux; | 3610 | spec->dinput_mux = &spec->private_dimux; |
| @@ -3628,8 +3711,8 @@ static int stac9200_parse_auto_config(struct hda_codec *codec) | |||
| 3628 | if (spec->autocfg.dig_in_pin) | 3711 | if (spec->autocfg.dig_in_pin) |
| 3629 | spec->dig_in_nid = 0x04; | 3712 | spec->dig_in_nid = 0x04; |
| 3630 | 3713 | ||
| 3631 | if (spec->kctl_alloc) | 3714 | if (spec->kctls.list) |
| 3632 | spec->mixers[spec->num_mixers++] = spec->kctl_alloc; | 3715 | spec->mixers[spec->num_mixers++] = spec->kctls.list; |
| 3633 | 3716 | ||
| 3634 | spec->input_mux = &spec->private_imux; | 3717 | spec->input_mux = &spec->private_imux; |
| 3635 | spec->dinput_mux = &spec->private_dimux; | 3718 | spec->dinput_mux = &spec->private_dimux; |
| @@ -3673,13 +3756,101 @@ static void stac_gpio_set(struct hda_codec *codec, unsigned int mask, | |||
| 3673 | AC_VERB_SET_GPIO_DATA, gpiostate); /* sync */ | 3756 | AC_VERB_SET_GPIO_DATA, gpiostate); /* sync */ |
| 3674 | } | 3757 | } |
| 3675 | 3758 | ||
| 3759 | static int stac92xx_add_jack(struct hda_codec *codec, | ||
| 3760 | hda_nid_t nid, int type) | ||
| 3761 | { | ||
| 3762 | #ifdef CONFIG_SND_JACK | ||
| 3763 | struct sigmatel_spec *spec = codec->spec; | ||
| 3764 | struct sigmatel_jack *jack; | ||
| 3765 | int def_conf = snd_hda_codec_read(codec, nid, | ||
| 3766 | 0, AC_VERB_GET_CONFIG_DEFAULT, 0); | ||
| 3767 | int connectivity = get_defcfg_connect(def_conf); | ||
| 3768 | char name[32]; | ||
| 3769 | |||
| 3770 | if (connectivity && connectivity != AC_JACK_PORT_FIXED) | ||
| 3771 | return 0; | ||
| 3772 | |||
| 3773 | snd_array_init(&spec->jacks, sizeof(*jack), 32); | ||
| 3774 | jack = snd_array_new(&spec->jacks); | ||
| 3775 | if (!jack) | ||
| 3776 | return -ENOMEM; | ||
| 3777 | jack->nid = nid; | ||
| 3778 | jack->type = type; | ||
| 3779 | |||
| 3780 | sprintf(name, "%s at %s %s Jack", | ||
| 3781 | snd_hda_get_jack_type(def_conf), | ||
| 3782 | snd_hda_get_jack_connectivity(def_conf), | ||
| 3783 | snd_hda_get_jack_location(def_conf)); | ||
| 3784 | |||
| 3785 | return snd_jack_new(codec->bus->card, name, type, &jack->jack); | ||
| 3786 | #else | ||
| 3787 | return 0; | ||
| 3788 | #endif | ||
| 3789 | } | ||
| 3790 | |||
| 3791 | static int stac_add_event(struct sigmatel_spec *spec, hda_nid_t nid, | ||
| 3792 | unsigned char type, int data) | ||
| 3793 | { | ||
| 3794 | struct sigmatel_event *event; | ||
| 3795 | |||
| 3796 | snd_array_init(&spec->events, sizeof(*event), 32); | ||
| 3797 | event = snd_array_new(&spec->events); | ||
| 3798 | if (!event) | ||
| 3799 | return -ENOMEM; | ||
| 3800 | event->nid = nid; | ||
| 3801 | event->type = type; | ||
| 3802 | event->tag = spec->events.used; | ||
| 3803 | event->data = data; | ||
| 3804 | |||
| 3805 | return event->tag; | ||
| 3806 | } | ||
| 3807 | |||
| 3808 | static struct sigmatel_event *stac_get_event(struct hda_codec *codec, | ||
| 3809 | hda_nid_t nid, unsigned char type) | ||
| 3810 | { | ||
| 3811 | struct sigmatel_spec *spec = codec->spec; | ||
| 3812 | struct sigmatel_event *event = spec->events.list; | ||
| 3813 | int i; | ||
| 3814 | |||
| 3815 | for (i = 0; i < spec->events.used; i++, event++) { | ||
| 3816 | if (event->nid == nid && event->type == type) | ||
| 3817 | return event; | ||
| 3818 | } | ||
| 3819 | return NULL; | ||
| 3820 | } | ||
| 3821 | |||
| 3822 | static struct sigmatel_event *stac_get_event_from_tag(struct hda_codec *codec, | ||
| 3823 | unsigned char tag) | ||
| 3824 | { | ||
| 3825 | struct sigmatel_spec *spec = codec->spec; | ||
| 3826 | struct sigmatel_event *event = spec->events.list; | ||
| 3827 | int i; | ||
| 3828 | |||
| 3829 | for (i = 0; i < spec->events.used; i++, event++) { | ||
| 3830 | if (event->tag == tag) | ||
| 3831 | return event; | ||
| 3832 | } | ||
| 3833 | return NULL; | ||
| 3834 | } | ||
| 3835 | |||
| 3676 | static void enable_pin_detect(struct hda_codec *codec, hda_nid_t nid, | 3836 | static void enable_pin_detect(struct hda_codec *codec, hda_nid_t nid, |
| 3677 | unsigned int event) | 3837 | unsigned int type) |
| 3678 | { | 3838 | { |
| 3679 | if (get_wcaps(codec, nid) & AC_WCAP_UNSOL_CAP) | 3839 | struct sigmatel_event *event; |
| 3680 | snd_hda_codec_write_cache(codec, nid, 0, | 3840 | int tag; |
| 3681 | AC_VERB_SET_UNSOLICITED_ENABLE, | 3841 | |
| 3682 | (AC_USRSP_EN | event)); | 3842 | if (!(get_wcaps(codec, nid) & AC_WCAP_UNSOL_CAP)) |
| 3843 | return; | ||
| 3844 | event = stac_get_event(codec, nid, type); | ||
| 3845 | if (event) | ||
| 3846 | tag = event->tag; | ||
| 3847 | else | ||
| 3848 | tag = stac_add_event(codec->spec, nid, type, 0); | ||
| 3849 | if (tag < 0) | ||
| 3850 | return; | ||
| 3851 | snd_hda_codec_write_cache(codec, nid, 0, | ||
| 3852 | AC_VERB_SET_UNSOLICITED_ENABLE, | ||
| 3853 | AC_USRSP_EN | tag); | ||
| 3683 | } | 3854 | } |
| 3684 | 3855 | ||
| 3685 | static int is_nid_hp_pin(struct auto_pin_cfg *cfg, hda_nid_t nid) | 3856 | static int is_nid_hp_pin(struct auto_pin_cfg *cfg, hda_nid_t nid) |
| @@ -3701,7 +3872,7 @@ static void stac92xx_power_down(struct hda_codec *codec) | |||
| 3701 | for (dac = spec->dac_list; *dac; dac++) | 3872 | for (dac = spec->dac_list; *dac; dac++) |
| 3702 | if (!is_in_dac_nids(spec, *dac) && | 3873 | if (!is_in_dac_nids(spec, *dac) && |
| 3703 | spec->multiout.hp_nid != *dac) | 3874 | spec->multiout.hp_nid != *dac) |
| 3704 | snd_hda_codec_write_cache(codec, *dac, 0, | 3875 | snd_hda_codec_write(codec, *dac, 0, |
| 3705 | AC_VERB_SET_POWER_STATE, AC_PWRST_D3); | 3876 | AC_VERB_SET_POWER_STATE, AC_PWRST_D3); |
| 3706 | } | 3877 | } |
| 3707 | 3878 | ||
| @@ -3720,7 +3891,7 @@ static int stac92xx_init(struct hda_codec *codec) | |||
| 3720 | /* power down adcs initially */ | 3891 | /* power down adcs initially */ |
| 3721 | if (spec->powerdown_adcs) | 3892 | if (spec->powerdown_adcs) |
| 3722 | for (i = 0; i < spec->num_adcs; i++) | 3893 | for (i = 0; i < spec->num_adcs; i++) |
| 3723 | snd_hda_codec_write_cache(codec, | 3894 | snd_hda_codec_write(codec, |
| 3724 | spec->adc_nids[i], 0, | 3895 | spec->adc_nids[i], 0, |
| 3725 | AC_VERB_SET_POWER_STATE, AC_PWRST_D3); | 3896 | AC_VERB_SET_POWER_STATE, AC_PWRST_D3); |
| 3726 | 3897 | ||
| @@ -3736,37 +3907,51 @@ static int stac92xx_init(struct hda_codec *codec) | |||
| 3736 | /* set up pins */ | 3907 | /* set up pins */ |
| 3737 | if (spec->hp_detect) { | 3908 | if (spec->hp_detect) { |
| 3738 | /* Enable unsolicited responses on the HP widget */ | 3909 | /* Enable unsolicited responses on the HP widget */ |
| 3739 | for (i = 0; i < cfg->hp_outs; i++) | 3910 | for (i = 0; i < cfg->hp_outs; i++) { |
| 3740 | enable_pin_detect(codec, cfg->hp_pins[i], | 3911 | hda_nid_t nid = cfg->hp_pins[i]; |
| 3741 | STAC_HP_EVENT); | 3912 | enable_pin_detect(codec, nid, STAC_HP_EVENT); |
| 3913 | } | ||
| 3742 | /* force to enable the first line-out; the others are set up | 3914 | /* force to enable the first line-out; the others are set up |
| 3743 | * in unsol_event | 3915 | * in unsol_event |
| 3744 | */ | 3916 | */ |
| 3745 | stac92xx_auto_set_pinctl(codec, spec->autocfg.line_out_pins[0], | 3917 | stac92xx_auto_set_pinctl(codec, spec->autocfg.line_out_pins[0], |
| 3746 | AC_PINCTL_OUT_EN); | 3918 | AC_PINCTL_OUT_EN); |
| 3747 | stac92xx_auto_init_hp_out(codec); | ||
| 3748 | /* fake event to set up pins */ | 3919 | /* fake event to set up pins */ |
| 3749 | codec->patch_ops.unsol_event(codec, STAC_HP_EVENT << 26); | 3920 | stac_issue_unsol_event(codec, spec->autocfg.hp_pins[0], |
| 3921 | STAC_HP_EVENT); | ||
| 3750 | } else { | 3922 | } else { |
| 3751 | stac92xx_auto_init_multi_out(codec); | 3923 | stac92xx_auto_init_multi_out(codec); |
| 3752 | stac92xx_auto_init_hp_out(codec); | 3924 | stac92xx_auto_init_hp_out(codec); |
| 3925 | for (i = 0; i < cfg->hp_outs; i++) | ||
| 3926 | stac_toggle_power_map(codec, cfg->hp_pins[i], 1); | ||
| 3753 | } | 3927 | } |
| 3754 | for (i = 0; i < AUTO_PIN_LAST; i++) { | 3928 | for (i = 0; i < AUTO_PIN_LAST; i++) { |
| 3755 | hda_nid_t nid = cfg->input_pins[i]; | 3929 | hda_nid_t nid = cfg->input_pins[i]; |
| 3756 | if (nid) { | 3930 | if (nid) { |
| 3757 | unsigned int pinctl; | 3931 | unsigned int pinctl, conf; |
| 3758 | if (i == AUTO_PIN_MIC || i == AUTO_PIN_FRONT_MIC) { | 3932 | if (i == AUTO_PIN_MIC || i == AUTO_PIN_FRONT_MIC) { |
| 3759 | /* for mic pins, force to initialize */ | 3933 | /* for mic pins, force to initialize */ |
| 3760 | pinctl = stac92xx_get_vref(codec, nid); | 3934 | pinctl = stac92xx_get_vref(codec, nid); |
| 3935 | pinctl |= AC_PINCTL_IN_EN; | ||
| 3936 | stac92xx_auto_set_pinctl(codec, nid, pinctl); | ||
| 3761 | } else { | 3937 | } else { |
| 3762 | pinctl = snd_hda_codec_read(codec, nid, 0, | 3938 | pinctl = snd_hda_codec_read(codec, nid, 0, |
| 3763 | AC_VERB_GET_PIN_WIDGET_CONTROL, 0); | 3939 | AC_VERB_GET_PIN_WIDGET_CONTROL, 0); |
| 3764 | /* if PINCTL already set then skip */ | 3940 | /* if PINCTL already set then skip */ |
| 3765 | if (pinctl & AC_PINCTL_IN_EN) | 3941 | if (!(pinctl & AC_PINCTL_IN_EN)) { |
| 3766 | continue; | 3942 | pinctl |= AC_PINCTL_IN_EN; |
| 3943 | stac92xx_auto_set_pinctl(codec, nid, | ||
| 3944 | pinctl); | ||
| 3945 | } | ||
| 3946 | } | ||
| 3947 | conf = snd_hda_codec_read(codec, nid, 0, | ||
| 3948 | AC_VERB_GET_CONFIG_DEFAULT, 0); | ||
| 3949 | if (get_defcfg_connect(conf) != AC_JACK_PORT_FIXED) { | ||
| 3950 | enable_pin_detect(codec, nid, | ||
| 3951 | STAC_INSERT_EVENT); | ||
| 3952 | stac_issue_unsol_event(codec, nid, | ||
| 3953 | STAC_INSERT_EVENT); | ||
| 3767 | } | 3954 | } |
| 3768 | pinctl |= AC_PINCTL_IN_EN; | ||
| 3769 | stac92xx_auto_set_pinctl(codec, nid, pinctl); | ||
| 3770 | } | 3955 | } |
| 3771 | } | 3956 | } |
| 3772 | for (i = 0; i < spec->num_dmics; i++) | 3957 | for (i = 0; i < spec->num_dmics; i++) |
| @@ -3781,7 +3966,6 @@ static int stac92xx_init(struct hda_codec *codec) | |||
| 3781 | for (i = 0; i < spec->num_pwrs; i++) { | 3966 | for (i = 0; i < spec->num_pwrs; i++) { |
| 3782 | hda_nid_t nid = spec->pwr_nids[i]; | 3967 | hda_nid_t nid = spec->pwr_nids[i]; |
| 3783 | int pinctl, def_conf; | 3968 | int pinctl, def_conf; |
| 3784 | int event = STAC_PWR_EVENT; | ||
| 3785 | 3969 | ||
| 3786 | if (is_nid_hp_pin(cfg, nid) && spec->hp_detect) | 3970 | if (is_nid_hp_pin(cfg, nid) && spec->hp_detect) |
| 3787 | continue; /* already has an unsol event */ | 3971 | continue; /* already has an unsol event */ |
| @@ -3804,30 +3988,54 @@ static int stac92xx_init(struct hda_codec *codec) | |||
| 3804 | stac_toggle_power_map(codec, nid, 1); | 3988 | stac_toggle_power_map(codec, nid, 1); |
| 3805 | continue; | 3989 | continue; |
| 3806 | } | 3990 | } |
| 3807 | enable_pin_detect(codec, spec->pwr_nids[i], event | i); | 3991 | if (!stac_get_event(codec, nid, STAC_INSERT_EVENT)) { |
| 3808 | codec->patch_ops.unsol_event(codec, (event | i) << 26); | 3992 | enable_pin_detect(codec, nid, STAC_PWR_EVENT); |
| 3993 | stac_issue_unsol_event(codec, nid, STAC_PWR_EVENT); | ||
| 3994 | } | ||
| 3809 | } | 3995 | } |
| 3810 | if (spec->dac_list) | 3996 | if (spec->dac_list) |
| 3811 | stac92xx_power_down(codec); | 3997 | stac92xx_power_down(codec); |
| 3812 | return 0; | 3998 | return 0; |
| 3813 | } | 3999 | } |
| 3814 | 4000 | ||
| 4001 | static void stac92xx_free_jacks(struct hda_codec *codec) | ||
| 4002 | { | ||
| 4003 | #ifdef CONFIG_SND_JACK | ||
| 4004 | /* free jack instances manually when clearing/reconfiguring */ | ||
| 4005 | struct sigmatel_spec *spec = codec->spec; | ||
| 4006 | if (!codec->bus->shutdown && spec->jacks.list) { | ||
| 4007 | struct sigmatel_jack *jacks = spec->jacks.list; | ||
| 4008 | int i; | ||
| 4009 | for (i = 0; i < spec->jacks.used; i++) | ||
| 4010 | snd_device_free(codec->bus->card, &jacks[i].jack); | ||
| 4011 | } | ||
| 4012 | snd_array_free(&spec->jacks); | ||
| 4013 | #endif | ||
| 4014 | } | ||
| 4015 | |||
| 4016 | static void stac92xx_free_kctls(struct hda_codec *codec) | ||
| 4017 | { | ||
| 4018 | struct sigmatel_spec *spec = codec->spec; | ||
| 4019 | |||
| 4020 | if (spec->kctls.list) { | ||
| 4021 | struct snd_kcontrol_new *kctl = spec->kctls.list; | ||
| 4022 | int i; | ||
| 4023 | for (i = 0; i < spec->kctls.used; i++) | ||
| 4024 | kfree(kctl[i].name); | ||
| 4025 | } | ||
| 4026 | snd_array_free(&spec->kctls); | ||
| 4027 | } | ||
| 4028 | |||
| 3815 | static void stac92xx_free(struct hda_codec *codec) | 4029 | static void stac92xx_free(struct hda_codec *codec) |
| 3816 | { | 4030 | { |
| 3817 | struct sigmatel_spec *spec = codec->spec; | 4031 | struct sigmatel_spec *spec = codec->spec; |
| 3818 | int i; | ||
| 3819 | 4032 | ||
| 3820 | if (! spec) | 4033 | if (! spec) |
| 3821 | return; | 4034 | return; |
| 3822 | 4035 | ||
| 3823 | if (spec->kctl_alloc) { | 4036 | kfree(spec->pin_configs); |
| 3824 | for (i = 0; i < spec->num_kctl_used; i++) | 4037 | stac92xx_free_jacks(codec); |
| 3825 | kfree(spec->kctl_alloc[i].name); | 4038 | snd_array_free(&spec->events); |
| 3826 | kfree(spec->kctl_alloc); | ||
| 3827 | } | ||
| 3828 | |||
| 3829 | if (spec->bios_pin_configs) | ||
| 3830 | kfree(spec->bios_pin_configs); | ||
| 3831 | 4039 | ||
| 3832 | kfree(spec); | 4040 | kfree(spec); |
| 3833 | snd_hda_detach_beep_device(codec); | 4041 | snd_hda_detach_beep_device(codec); |
| @@ -3874,20 +4082,13 @@ static void stac92xx_reset_pinctl(struct hda_codec *codec, hda_nid_t nid, | |||
| 3874 | pin_ctl & ~flag); | 4082 | pin_ctl & ~flag); |
| 3875 | } | 4083 | } |
| 3876 | 4084 | ||
| 3877 | static int get_hp_pin_presence(struct hda_codec *codec, hda_nid_t nid) | 4085 | static int get_pin_presence(struct hda_codec *codec, hda_nid_t nid) |
| 3878 | { | 4086 | { |
| 3879 | if (!nid) | 4087 | if (!nid) |
| 3880 | return 0; | 4088 | return 0; |
| 3881 | if (snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_PIN_SENSE, 0x00) | 4089 | if (snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_PIN_SENSE, 0x00) |
| 3882 | & (1 << 31)) { | 4090 | & (1 << 31)) |
| 3883 | unsigned int pinctl; | 4091 | return 1; |
| 3884 | pinctl = snd_hda_codec_read(codec, nid, 0, | ||
| 3885 | AC_VERB_GET_PIN_WIDGET_CONTROL, 0); | ||
| 3886 | if (pinctl & AC_PINCTL_IN_EN) | ||
| 3887 | return 0; /* mic- or line-input */ | ||
| 3888 | else | ||
| 3889 | return 1; /* HP-output */ | ||
| 3890 | } | ||
| 3891 | return 0; | 4092 | return 0; |
| 3892 | } | 4093 | } |
| 3893 | 4094 | ||
| @@ -3911,7 +4112,7 @@ static int no_hp_sensing(struct sigmatel_spec *spec, int i) | |||
| 3911 | return 0; | 4112 | return 0; |
| 3912 | } | 4113 | } |
| 3913 | 4114 | ||
| 3914 | static void stac92xx_hp_detect(struct hda_codec *codec, unsigned int res) | 4115 | static void stac92xx_hp_detect(struct hda_codec *codec) |
| 3915 | { | 4116 | { |
| 3916 | struct sigmatel_spec *spec = codec->spec; | 4117 | struct sigmatel_spec *spec = codec->spec; |
| 3917 | struct auto_pin_cfg *cfg = &spec->autocfg; | 4118 | struct auto_pin_cfg *cfg = &spec->autocfg; |
| @@ -3927,7 +4128,14 @@ static void stac92xx_hp_detect(struct hda_codec *codec, unsigned int res) | |||
| 3927 | break; | 4128 | break; |
| 3928 | if (no_hp_sensing(spec, i)) | 4129 | if (no_hp_sensing(spec, i)) |
| 3929 | continue; | 4130 | continue; |
| 3930 | presence = get_hp_pin_presence(codec, cfg->hp_pins[i]); | 4131 | presence = get_pin_presence(codec, cfg->hp_pins[i]); |
| 4132 | if (presence) { | ||
| 4133 | unsigned int pinctl; | ||
| 4134 | pinctl = snd_hda_codec_read(codec, cfg->hp_pins[i], 0, | ||
| 4135 | AC_VERB_GET_PIN_WIDGET_CONTROL, 0); | ||
| 4136 | if (pinctl & AC_PINCTL_IN_EN) | ||
| 4137 | presence = 0; /* mic- or line-input */ | ||
| 4138 | } | ||
| 3931 | } | 4139 | } |
| 3932 | 4140 | ||
| 3933 | if (presence) { | 4141 | if (presence) { |
| @@ -4004,50 +4212,145 @@ static void stac_toggle_power_map(struct hda_codec *codec, hda_nid_t nid, | |||
| 4004 | 4212 | ||
| 4005 | static void stac92xx_pin_sense(struct hda_codec *codec, hda_nid_t nid) | 4213 | static void stac92xx_pin_sense(struct hda_codec *codec, hda_nid_t nid) |
| 4006 | { | 4214 | { |
| 4007 | stac_toggle_power_map(codec, nid, get_hp_pin_presence(codec, nid)); | 4215 | stac_toggle_power_map(codec, nid, get_pin_presence(codec, nid)); |
| 4216 | } | ||
| 4217 | |||
| 4218 | static void stac92xx_report_jack(struct hda_codec *codec, hda_nid_t nid) | ||
| 4219 | { | ||
| 4220 | struct sigmatel_spec *spec = codec->spec; | ||
| 4221 | struct sigmatel_jack *jacks = spec->jacks.list; | ||
| 4222 | |||
| 4223 | if (jacks) { | ||
| 4224 | int i; | ||
| 4225 | for (i = 0; i < spec->jacks.used; i++) { | ||
| 4226 | if (jacks->nid == nid) { | ||
| 4227 | unsigned int pin_ctl = | ||
| 4228 | snd_hda_codec_read(codec, nid, | ||
| 4229 | 0, AC_VERB_GET_PIN_WIDGET_CONTROL, | ||
| 4230 | 0x00); | ||
| 4231 | int type = jacks->type; | ||
| 4232 | if (type == (SND_JACK_LINEOUT | ||
| 4233 | | SND_JACK_HEADPHONE)) | ||
| 4234 | type = (pin_ctl & AC_PINCTL_HP_EN) | ||
| 4235 | ? SND_JACK_HEADPHONE : SND_JACK_LINEOUT; | ||
| 4236 | snd_jack_report(jacks->jack, | ||
| 4237 | get_pin_presence(codec, nid) | ||
| 4238 | ? type : 0); | ||
| 4239 | } | ||
| 4240 | jacks++; | ||
| 4241 | } | ||
| 4242 | } | ||
| 4243 | } | ||
| 4244 | |||
| 4245 | static void stac_issue_unsol_event(struct hda_codec *codec, hda_nid_t nid, | ||
| 4246 | unsigned char type) | ||
| 4247 | { | ||
| 4248 | struct sigmatel_event *event = stac_get_event(codec, nid, type); | ||
| 4249 | if (!event) | ||
| 4250 | return; | ||
| 4251 | codec->patch_ops.unsol_event(codec, (unsigned)event->tag << 26); | ||
| 4008 | } | 4252 | } |
| 4009 | 4253 | ||
| 4010 | static void stac92xx_unsol_event(struct hda_codec *codec, unsigned int res) | 4254 | static void stac92xx_unsol_event(struct hda_codec *codec, unsigned int res) |
| 4011 | { | 4255 | { |
| 4012 | struct sigmatel_spec *spec = codec->spec; | 4256 | struct sigmatel_spec *spec = codec->spec; |
| 4013 | int idx = res >> 26 & 0x0f; | 4257 | struct sigmatel_event *event; |
| 4258 | int tag, data; | ||
| 4014 | 4259 | ||
| 4015 | switch ((res >> 26) & 0x70) { | 4260 | tag = (res >> 26) & 0x7f; |
| 4261 | event = stac_get_event_from_tag(codec, tag); | ||
| 4262 | if (!event) | ||
| 4263 | return; | ||
| 4264 | |||
| 4265 | switch (event->type) { | ||
| 4016 | case STAC_HP_EVENT: | 4266 | case STAC_HP_EVENT: |
| 4017 | stac92xx_hp_detect(codec, res); | 4267 | stac92xx_hp_detect(codec); |
| 4018 | /* fallthru */ | 4268 | /* fallthru */ |
| 4269 | case STAC_INSERT_EVENT: | ||
| 4019 | case STAC_PWR_EVENT: | 4270 | case STAC_PWR_EVENT: |
| 4020 | if (spec->num_pwrs > 0) | 4271 | if (spec->num_pwrs > 0) |
| 4021 | stac92xx_pin_sense(codec, idx); | 4272 | stac92xx_pin_sense(codec, event->nid); |
| 4273 | stac92xx_report_jack(codec, event->nid); | ||
| 4022 | break; | 4274 | break; |
| 4023 | case STAC_VREF_EVENT: { | 4275 | case STAC_VREF_EVENT: |
| 4024 | int data = snd_hda_codec_read(codec, codec->afg, 0, | 4276 | data = snd_hda_codec_read(codec, codec->afg, 0, |
| 4025 | AC_VERB_GET_GPIO_DATA, 0); | 4277 | AC_VERB_GET_GPIO_DATA, 0); |
| 4026 | /* toggle VREF state based on GPIOx status */ | 4278 | /* toggle VREF state based on GPIOx status */ |
| 4027 | snd_hda_codec_write(codec, codec->afg, 0, 0x7e0, | 4279 | snd_hda_codec_write(codec, codec->afg, 0, 0x7e0, |
| 4028 | !!(data & (1 << idx))); | 4280 | !!(data & (1 << event->data))); |
| 4029 | break; | 4281 | break; |
| 4030 | } | ||
| 4031 | } | 4282 | } |
| 4032 | } | 4283 | } |
| 4033 | 4284 | ||
| 4285 | #ifdef CONFIG_PROC_FS | ||
| 4286 | static void stac92hd_proc_hook(struct snd_info_buffer *buffer, | ||
| 4287 | struct hda_codec *codec, hda_nid_t nid) | ||
| 4288 | { | ||
| 4289 | if (nid == codec->afg) | ||
| 4290 | snd_iprintf(buffer, "Power-Map: 0x%02x\n", | ||
| 4291 | snd_hda_codec_read(codec, nid, 0, 0x0fec, 0x0)); | ||
| 4292 | } | ||
| 4293 | |||
| 4294 | static void analog_loop_proc_hook(struct snd_info_buffer *buffer, | ||
| 4295 | struct hda_codec *codec, | ||
| 4296 | unsigned int verb) | ||
| 4297 | { | ||
| 4298 | snd_iprintf(buffer, "Analog Loopback: 0x%02x\n", | ||
| 4299 | snd_hda_codec_read(codec, codec->afg, 0, verb, 0)); | ||
| 4300 | } | ||
| 4301 | |||
| 4302 | /* stac92hd71bxx, stac92hd73xx */ | ||
| 4303 | static void stac92hd7x_proc_hook(struct snd_info_buffer *buffer, | ||
| 4304 | struct hda_codec *codec, hda_nid_t nid) | ||
| 4305 | { | ||
| 4306 | stac92hd_proc_hook(buffer, codec, nid); | ||
| 4307 | if (nid == codec->afg) | ||
| 4308 | analog_loop_proc_hook(buffer, codec, 0xfa0); | ||
| 4309 | } | ||
| 4310 | |||
| 4311 | static void stac9205_proc_hook(struct snd_info_buffer *buffer, | ||
| 4312 | struct hda_codec *codec, hda_nid_t nid) | ||
| 4313 | { | ||
| 4314 | if (nid == codec->afg) | ||
| 4315 | analog_loop_proc_hook(buffer, codec, 0xfe0); | ||
| 4316 | } | ||
| 4317 | |||
| 4318 | static void stac927x_proc_hook(struct snd_info_buffer *buffer, | ||
| 4319 | struct hda_codec *codec, hda_nid_t nid) | ||
| 4320 | { | ||
| 4321 | if (nid == codec->afg) | ||
| 4322 | analog_loop_proc_hook(buffer, codec, 0xfeb); | ||
| 4323 | } | ||
| 4324 | #else | ||
| 4325 | #define stac92hd_proc_hook NULL | ||
| 4326 | #define stac92hd7x_proc_hook NULL | ||
| 4327 | #define stac9205_proc_hook NULL | ||
| 4328 | #define stac927x_proc_hook NULL | ||
| 4329 | #endif | ||
| 4330 | |||
| 4034 | #ifdef SND_HDA_NEEDS_RESUME | 4331 | #ifdef SND_HDA_NEEDS_RESUME |
| 4035 | static int stac92xx_resume(struct hda_codec *codec) | 4332 | static int stac92xx_resume(struct hda_codec *codec) |
| 4036 | { | 4333 | { |
| 4037 | struct sigmatel_spec *spec = codec->spec; | 4334 | struct sigmatel_spec *spec = codec->spec; |
| 4038 | 4335 | ||
| 4039 | stac92xx_set_config_regs(codec); | 4336 | stac92xx_set_config_regs(codec); |
| 4040 | snd_hda_sequence_write(codec, spec->init); | 4337 | stac92xx_init(codec); |
| 4041 | stac_gpio_set(codec, spec->gpio_mask, | ||
| 4042 | spec->gpio_dir, spec->gpio_data); | ||
| 4043 | snd_hda_codec_resume_amp(codec); | 4338 | snd_hda_codec_resume_amp(codec); |
| 4044 | snd_hda_codec_resume_cache(codec); | 4339 | snd_hda_codec_resume_cache(codec); |
| 4045 | /* power down inactive DACs */ | 4340 | /* fake event to set up pins again to override cached values */ |
| 4046 | if (spec->dac_list) | ||
| 4047 | stac92xx_power_down(codec); | ||
| 4048 | /* invoke unsolicited event to reset the HP state */ | ||
| 4049 | if (spec->hp_detect) | 4341 | if (spec->hp_detect) |
| 4050 | codec->patch_ops.unsol_event(codec, STAC_HP_EVENT << 26); | 4342 | stac_issue_unsol_event(codec, spec->autocfg.hp_pins[0], |
| 4343 | STAC_HP_EVENT); | ||
| 4344 | return 0; | ||
| 4345 | } | ||
| 4346 | |||
| 4347 | static int stac92xx_suspend(struct hda_codec *codec, pm_message_t state) | ||
| 4348 | { | ||
| 4349 | struct sigmatel_spec *spec = codec->spec; | ||
| 4350 | if (spec->eapd_mask) | ||
| 4351 | stac_gpio_set(codec, spec->gpio_mask, | ||
| 4352 | spec->gpio_dir, spec->gpio_data & | ||
| 4353 | ~spec->eapd_mask); | ||
| 4051 | return 0; | 4354 | return 0; |
| 4052 | } | 4355 | } |
| 4053 | #endif | 4356 | #endif |
| @@ -4059,6 +4362,7 @@ static struct hda_codec_ops stac92xx_patch_ops = { | |||
| 4059 | .free = stac92xx_free, | 4362 | .free = stac92xx_free, |
| 4060 | .unsol_event = stac92xx_unsol_event, | 4363 | .unsol_event = stac92xx_unsol_event, |
| 4061 | #ifdef SND_HDA_NEEDS_RESUME | 4364 | #ifdef SND_HDA_NEEDS_RESUME |
| 4365 | .suspend = stac92xx_suspend, | ||
| 4062 | .resume = stac92xx_resume, | 4366 | .resume = stac92xx_resume, |
| 4063 | #endif | 4367 | #endif |
| 4064 | }; | 4368 | }; |
| @@ -4081,14 +4385,12 @@ static int patch_stac9200(struct hda_codec *codec) | |||
| 4081 | if (spec->board_config < 0) { | 4385 | if (spec->board_config < 0) { |
| 4082 | snd_printdd(KERN_INFO "hda_codec: Unknown model for STAC9200, using BIOS defaults\n"); | 4386 | snd_printdd(KERN_INFO "hda_codec: Unknown model for STAC9200, using BIOS defaults\n"); |
| 4083 | err = stac92xx_save_bios_config_regs(codec); | 4387 | err = stac92xx_save_bios_config_regs(codec); |
| 4084 | if (err < 0) { | 4388 | } else |
| 4085 | stac92xx_free(codec); | 4389 | err = stac_save_pin_cfgs(codec, |
| 4086 | return err; | 4390 | stac9200_brd_tbl[spec->board_config]); |
| 4087 | } | 4391 | if (err < 0) { |
| 4088 | spec->pin_configs = spec->bios_pin_configs; | 4392 | stac92xx_free(codec); |
| 4089 | } else { | 4393 | return err; |
| 4090 | spec->pin_configs = stac9200_brd_tbl[spec->board_config]; | ||
| 4091 | stac92xx_set_config_regs(codec); | ||
| 4092 | } | 4394 | } |
| 4093 | 4395 | ||
| 4094 | spec->multiout.max_channels = 2; | 4396 | spec->multiout.max_channels = 2; |
| @@ -4144,14 +4446,12 @@ static int patch_stac925x(struct hda_codec *codec) | |||
| 4144 | snd_printdd(KERN_INFO "hda_codec: Unknown model for STAC925x," | 4446 | snd_printdd(KERN_INFO "hda_codec: Unknown model for STAC925x," |
| 4145 | "using BIOS defaults\n"); | 4447 | "using BIOS defaults\n"); |
| 4146 | err = stac92xx_save_bios_config_regs(codec); | 4448 | err = stac92xx_save_bios_config_regs(codec); |
| 4147 | if (err < 0) { | 4449 | } else |
| 4148 | stac92xx_free(codec); | 4450 | err = stac_save_pin_cfgs(codec, |
| 4149 | return err; | 4451 | stac925x_brd_tbl[spec->board_config]); |
| 4150 | } | 4452 | if (err < 0) { |
| 4151 | spec->pin_configs = spec->bios_pin_configs; | 4453 | stac92xx_free(codec); |
| 4152 | } else if (stac925x_brd_tbl[spec->board_config] != NULL){ | 4454 | return err; |
| 4153 | spec->pin_configs = stac925x_brd_tbl[spec->board_config]; | ||
| 4154 | stac92xx_set_config_regs(codec); | ||
| 4155 | } | 4455 | } |
| 4156 | 4456 | ||
| 4157 | spec->multiout.max_channels = 2; | 4457 | spec->multiout.max_channels = 2; |
| @@ -4233,14 +4533,12 @@ again: | |||
| 4233 | snd_printdd(KERN_INFO "hda_codec: Unknown model for" | 4533 | snd_printdd(KERN_INFO "hda_codec: Unknown model for" |
| 4234 | " STAC92HD73XX, using BIOS defaults\n"); | 4534 | " STAC92HD73XX, using BIOS defaults\n"); |
| 4235 | err = stac92xx_save_bios_config_regs(codec); | 4535 | err = stac92xx_save_bios_config_regs(codec); |
| 4236 | if (err < 0) { | 4536 | } else |
| 4237 | stac92xx_free(codec); | 4537 | err = stac_save_pin_cfgs(codec, |
| 4238 | return err; | 4538 | stac92hd73xx_brd_tbl[spec->board_config]); |
| 4239 | } | 4539 | if (err < 0) { |
| 4240 | spec->pin_configs = spec->bios_pin_configs; | 4540 | stac92xx_free(codec); |
| 4241 | } else { | 4541 | return err; |
| 4242 | spec->pin_configs = stac92hd73xx_brd_tbl[spec->board_config]; | ||
| 4243 | stac92xx_set_config_regs(codec); | ||
| 4244 | } | 4542 | } |
| 4245 | 4543 | ||
| 4246 | spec->multiout.num_dacs = snd_hda_get_connections(codec, 0x0a, | 4544 | spec->multiout.num_dacs = snd_hda_get_connections(codec, 0x0a, |
| @@ -4254,14 +4552,17 @@ again: | |||
| 4254 | 4552 | ||
| 4255 | switch (spec->multiout.num_dacs) { | 4553 | switch (spec->multiout.num_dacs) { |
| 4256 | case 0x3: /* 6 Channel */ | 4554 | case 0x3: /* 6 Channel */ |
| 4555 | spec->multiout.hp_nid = 0x17; | ||
| 4257 | spec->mixer = stac92hd73xx_6ch_mixer; | 4556 | spec->mixer = stac92hd73xx_6ch_mixer; |
| 4258 | spec->init = stac92hd73xx_6ch_core_init; | 4557 | spec->init = stac92hd73xx_6ch_core_init; |
| 4259 | break; | 4558 | break; |
| 4260 | case 0x4: /* 8 Channel */ | 4559 | case 0x4: /* 8 Channel */ |
| 4560 | spec->multiout.hp_nid = 0x18; | ||
| 4261 | spec->mixer = stac92hd73xx_8ch_mixer; | 4561 | spec->mixer = stac92hd73xx_8ch_mixer; |
| 4262 | spec->init = stac92hd73xx_8ch_core_init; | 4562 | spec->init = stac92hd73xx_8ch_core_init; |
| 4263 | break; | 4563 | break; |
| 4264 | case 0x5: /* 10 Channel */ | 4564 | case 0x5: /* 10 Channel */ |
| 4565 | spec->multiout.hp_nid = 0x19; | ||
| 4265 | spec->mixer = stac92hd73xx_10ch_mixer; | 4566 | spec->mixer = stac92hd73xx_10ch_mixer; |
| 4266 | spec->init = stac92hd73xx_10ch_core_init; | 4567 | spec->init = stac92hd73xx_10ch_core_init; |
| 4267 | }; | 4568 | }; |
| @@ -4351,8 +4652,13 @@ again: | |||
| 4351 | return err; | 4652 | return err; |
| 4352 | } | 4653 | } |
| 4353 | 4654 | ||
| 4655 | if (spec->board_config == STAC_92HD73XX_NO_JD) | ||
| 4656 | spec->hp_detect = 0; | ||
| 4657 | |||
| 4354 | codec->patch_ops = stac92xx_patch_ops; | 4658 | codec->patch_ops = stac92xx_patch_ops; |
| 4355 | 4659 | ||
| 4660 | codec->proc_widget_hook = stac92hd7x_proc_hook; | ||
| 4661 | |||
| 4356 | return 0; | 4662 | return 0; |
| 4357 | } | 4663 | } |
| 4358 | 4664 | ||
| @@ -4413,14 +4719,12 @@ again: | |||
| 4413 | snd_printdd(KERN_INFO "hda_codec: Unknown model for" | 4719 | snd_printdd(KERN_INFO "hda_codec: Unknown model for" |
| 4414 | " STAC92HD83XXX, using BIOS defaults\n"); | 4720 | " STAC92HD83XXX, using BIOS defaults\n"); |
| 4415 | err = stac92xx_save_bios_config_regs(codec); | 4721 | err = stac92xx_save_bios_config_regs(codec); |
| 4416 | if (err < 0) { | 4722 | } else |
| 4417 | stac92xx_free(codec); | 4723 | err = stac_save_pin_cfgs(codec, |
| 4418 | return err; | 4724 | stac92hd83xxx_brd_tbl[spec->board_config]); |
| 4419 | } | 4725 | if (err < 0) { |
| 4420 | spec->pin_configs = spec->bios_pin_configs; | 4726 | stac92xx_free(codec); |
| 4421 | } else { | 4727 | return err; |
| 4422 | spec->pin_configs = stac92hd83xxx_brd_tbl[spec->board_config]; | ||
| 4423 | stac92xx_set_config_regs(codec); | ||
| 4424 | } | 4728 | } |
| 4425 | 4729 | ||
| 4426 | err = stac92xx_parse_auto_config(codec, 0x1d, 0); | 4730 | err = stac92xx_parse_auto_config(codec, 0x1d, 0); |
| @@ -4441,56 +4745,10 @@ again: | |||
| 4441 | 4745 | ||
| 4442 | codec->patch_ops = stac92xx_patch_ops; | 4746 | codec->patch_ops = stac92xx_patch_ops; |
| 4443 | 4747 | ||
| 4444 | return 0; | 4748 | codec->proc_widget_hook = stac92hd_proc_hook; |
| 4445 | } | ||
| 4446 | |||
| 4447 | #ifdef SND_HDA_NEEDS_RESUME | ||
| 4448 | static void stac92hd71xx_set_power_state(struct hda_codec *codec, int pwr) | ||
| 4449 | { | ||
| 4450 | struct sigmatel_spec *spec = codec->spec; | ||
| 4451 | int i; | ||
| 4452 | snd_hda_codec_write_cache(codec, codec->afg, 0, | ||
| 4453 | AC_VERB_SET_POWER_STATE, pwr); | ||
| 4454 | |||
| 4455 | msleep(1); | ||
| 4456 | for (i = 0; i < spec->num_adcs; i++) { | ||
| 4457 | snd_hda_codec_write_cache(codec, | ||
| 4458 | spec->adc_nids[i], 0, | ||
| 4459 | AC_VERB_SET_POWER_STATE, pwr); | ||
| 4460 | } | ||
| 4461 | }; | ||
| 4462 | |||
| 4463 | static int stac92hd71xx_resume(struct hda_codec *codec) | ||
| 4464 | { | ||
| 4465 | stac92hd71xx_set_power_state(codec, AC_PWRST_D0); | ||
| 4466 | return stac92xx_resume(codec); | ||
| 4467 | } | ||
| 4468 | |||
| 4469 | static int stac92hd71xx_suspend(struct hda_codec *codec, pm_message_t state) | ||
| 4470 | { | ||
| 4471 | struct sigmatel_spec *spec = codec->spec; | ||
| 4472 | 4749 | ||
| 4473 | stac92hd71xx_set_power_state(codec, AC_PWRST_D3); | ||
| 4474 | if (spec->eapd_mask) | ||
| 4475 | stac_gpio_set(codec, spec->gpio_mask, | ||
| 4476 | spec->gpio_dir, spec->gpio_data & | ||
| 4477 | ~spec->eapd_mask); | ||
| 4478 | return 0; | 4750 | return 0; |
| 4479 | }; | 4751 | } |
| 4480 | |||
| 4481 | #endif | ||
| 4482 | |||
| 4483 | static struct hda_codec_ops stac92hd71bxx_patch_ops = { | ||
| 4484 | .build_controls = stac92xx_build_controls, | ||
| 4485 | .build_pcms = stac92xx_build_pcms, | ||
| 4486 | .init = stac92xx_init, | ||
| 4487 | .free = stac92xx_free, | ||
| 4488 | .unsol_event = stac92xx_unsol_event, | ||
| 4489 | #ifdef SND_HDA_NEEDS_RESUME | ||
| 4490 | .resume = stac92hd71xx_resume, | ||
| 4491 | .suspend = stac92hd71xx_suspend, | ||
| 4492 | #endif | ||
| 4493 | }; | ||
| 4494 | 4752 | ||
| 4495 | static struct hda_input_mux stac92hd71bxx_dmux = { | 4753 | static struct hda_input_mux stac92hd71bxx_dmux = { |
| 4496 | .num_items = 4, | 4754 | .num_items = 4, |
| @@ -4527,14 +4785,12 @@ again: | |||
| 4527 | snd_printdd(KERN_INFO "hda_codec: Unknown model for" | 4785 | snd_printdd(KERN_INFO "hda_codec: Unknown model for" |
| 4528 | " STAC92HD71BXX, using BIOS defaults\n"); | 4786 | " STAC92HD71BXX, using BIOS defaults\n"); |
| 4529 | err = stac92xx_save_bios_config_regs(codec); | 4787 | err = stac92xx_save_bios_config_regs(codec); |
| 4530 | if (err < 0) { | 4788 | } else |
| 4531 | stac92xx_free(codec); | 4789 | err = stac_save_pin_cfgs(codec, |
| 4532 | return err; | 4790 | stac92hd71bxx_brd_tbl[spec->board_config]); |
| 4533 | } | 4791 | if (err < 0) { |
| 4534 | spec->pin_configs = spec->bios_pin_configs; | 4792 | stac92xx_free(codec); |
| 4535 | } else { | 4793 | return err; |
| 4536 | spec->pin_configs = stac92hd71bxx_brd_tbl[spec->board_config]; | ||
| 4537 | stac92xx_set_config_regs(codec); | ||
| 4538 | } | 4794 | } |
| 4539 | 4795 | ||
| 4540 | if (spec->board_config > STAC_92HD71BXX_REF) { | 4796 | if (spec->board_config > STAC_92HD71BXX_REF) { |
| @@ -4557,21 +4813,21 @@ again: | |||
| 4557 | switch (spec->board_config) { | 4813 | switch (spec->board_config) { |
| 4558 | case STAC_HP_M4: | 4814 | case STAC_HP_M4: |
| 4559 | /* Enable VREF power saving on GPIO1 detect */ | 4815 | /* Enable VREF power saving on GPIO1 detect */ |
| 4816 | err = stac_add_event(spec, codec->afg, | ||
| 4817 | STAC_VREF_EVENT, 0x02); | ||
| 4818 | if (err < 0) | ||
| 4819 | return err; | ||
| 4560 | snd_hda_codec_write_cache(codec, codec->afg, 0, | 4820 | snd_hda_codec_write_cache(codec, codec->afg, 0, |
| 4561 | AC_VERB_SET_GPIO_UNSOLICITED_RSP_MASK, 0x02); | 4821 | AC_VERB_SET_GPIO_UNSOLICITED_RSP_MASK, 0x02); |
| 4562 | snd_hda_codec_write_cache(codec, codec->afg, 0, | 4822 | snd_hda_codec_write_cache(codec, codec->afg, 0, |
| 4563 | AC_VERB_SET_UNSOLICITED_ENABLE, | 4823 | AC_VERB_SET_UNSOLICITED_ENABLE, |
| 4564 | (AC_USRSP_EN | STAC_VREF_EVENT | 0x01)); | 4824 | AC_USRSP_EN | err); |
| 4565 | spec->gpio_mask |= 0x02; | 4825 | spec->gpio_mask |= 0x02; |
| 4566 | break; | 4826 | break; |
| 4567 | } | 4827 | } |
| 4568 | if ((codec->revision_id & 0xf) == 0 || | 4828 | if ((codec->revision_id & 0xf) == 0 || |
| 4569 | (codec->revision_id & 0xf) == 1) { | 4829 | (codec->revision_id & 0xf) == 1) |
| 4570 | #ifdef SND_HDA_NEEDS_RESUME | ||
| 4571 | codec->patch_ops = stac92hd71bxx_patch_ops; | ||
| 4572 | #endif | ||
| 4573 | spec->stream_delay = 40; /* 40 milliseconds */ | 4830 | spec->stream_delay = 40; /* 40 milliseconds */ |
| 4574 | } | ||
| 4575 | 4831 | ||
| 4576 | /* no output amps */ | 4832 | /* no output amps */ |
| 4577 | spec->num_pwrs = 0; | 4833 | spec->num_pwrs = 0; |
| @@ -4580,15 +4836,11 @@ again: | |||
| 4580 | 4836 | ||
| 4581 | /* disable VSW */ | 4837 | /* disable VSW */ |
| 4582 | spec->init = &stac92hd71bxx_analog_core_init[HD_DISABLE_PORTF]; | 4838 | spec->init = &stac92hd71bxx_analog_core_init[HD_DISABLE_PORTF]; |
| 4583 | stac92xx_set_config_reg(codec, 0xf, 0x40f000f0); | 4839 | stac_change_pin_config(codec, 0xf, 0x40f000f0); |
| 4584 | break; | 4840 | break; |
| 4585 | case 0x111d7603: /* 6 Port with Analog Mixer */ | 4841 | case 0x111d7603: /* 6 Port with Analog Mixer */ |
| 4586 | if ((codec->revision_id & 0xf) == 1) { | 4842 | if ((codec->revision_id & 0xf) == 1) |
| 4587 | #ifdef SND_HDA_NEEDS_RESUME | ||
| 4588 | codec->patch_ops = stac92hd71bxx_patch_ops; | ||
| 4589 | #endif | ||
| 4590 | spec->stream_delay = 40; /* 40 milliseconds */ | 4843 | spec->stream_delay = 40; /* 40 milliseconds */ |
| 4591 | } | ||
| 4592 | 4844 | ||
| 4593 | /* no output amps */ | 4845 | /* no output amps */ |
| 4594 | spec->num_pwrs = 0; | 4846 | spec->num_pwrs = 0; |
| @@ -4618,7 +4870,7 @@ again: | |||
| 4618 | switch (spec->board_config) { | 4870 | switch (spec->board_config) { |
| 4619 | case STAC_HP_M4: | 4871 | case STAC_HP_M4: |
| 4620 | /* enable internal microphone */ | 4872 | /* enable internal microphone */ |
| 4621 | stac92xx_set_config_reg(codec, 0x0e, 0x01813040); | 4873 | stac_change_pin_config(codec, 0x0e, 0x01813040); |
| 4622 | stac92xx_auto_set_pinctl(codec, 0x0e, | 4874 | stac92xx_auto_set_pinctl(codec, 0x0e, |
| 4623 | AC_PINCTL_IN_EN | AC_PINCTL_VREF_80); | 4875 | AC_PINCTL_IN_EN | AC_PINCTL_VREF_80); |
| 4624 | /* fallthru */ | 4876 | /* fallthru */ |
| @@ -4663,6 +4915,8 @@ again: | |||
| 4663 | return err; | 4915 | return err; |
| 4664 | } | 4916 | } |
| 4665 | 4917 | ||
| 4918 | codec->proc_widget_hook = stac92hd7x_proc_hook; | ||
| 4919 | |||
| 4666 | return 0; | 4920 | return 0; |
| 4667 | }; | 4921 | }; |
| 4668 | 4922 | ||
| @@ -4724,14 +4978,12 @@ static int patch_stac922x(struct hda_codec *codec) | |||
| 4724 | snd_printdd(KERN_INFO "hda_codec: Unknown model for STAC922x, " | 4978 | snd_printdd(KERN_INFO "hda_codec: Unknown model for STAC922x, " |
| 4725 | "using BIOS defaults\n"); | 4979 | "using BIOS defaults\n"); |
| 4726 | err = stac92xx_save_bios_config_regs(codec); | 4980 | err = stac92xx_save_bios_config_regs(codec); |
| 4727 | if (err < 0) { | 4981 | } else |
| 4728 | stac92xx_free(codec); | 4982 | err = stac_save_pin_cfgs(codec, |
| 4729 | return err; | 4983 | stac922x_brd_tbl[spec->board_config]); |
| 4730 | } | 4984 | if (err < 0) { |
| 4731 | spec->pin_configs = spec->bios_pin_configs; | 4985 | stac92xx_free(codec); |
| 4732 | } else if (stac922x_brd_tbl[spec->board_config] != NULL) { | 4986 | return err; |
| 4733 | spec->pin_configs = stac922x_brd_tbl[spec->board_config]; | ||
| 4734 | stac92xx_set_config_regs(codec); | ||
| 4735 | } | 4987 | } |
| 4736 | 4988 | ||
| 4737 | spec->adc_nids = stac922x_adc_nids; | 4989 | spec->adc_nids = stac922x_adc_nids; |
| @@ -4794,14 +5046,12 @@ static int patch_stac927x(struct hda_codec *codec) | |||
| 4794 | snd_printdd(KERN_INFO "hda_codec: Unknown model for" | 5046 | snd_printdd(KERN_INFO "hda_codec: Unknown model for" |
| 4795 | "STAC927x, using BIOS defaults\n"); | 5047 | "STAC927x, using BIOS defaults\n"); |
| 4796 | err = stac92xx_save_bios_config_regs(codec); | 5048 | err = stac92xx_save_bios_config_regs(codec); |
| 4797 | if (err < 0) { | 5049 | } else |
| 4798 | stac92xx_free(codec); | 5050 | err = stac_save_pin_cfgs(codec, |
| 4799 | return err; | 5051 | stac927x_brd_tbl[spec->board_config]); |
| 4800 | } | 5052 | if (err < 0) { |
| 4801 | spec->pin_configs = spec->bios_pin_configs; | 5053 | stac92xx_free(codec); |
| 4802 | } else { | 5054 | return err; |
| 4803 | spec->pin_configs = stac927x_brd_tbl[spec->board_config]; | ||
| 4804 | stac92xx_set_config_regs(codec); | ||
| 4805 | } | 5055 | } |
| 4806 | 5056 | ||
| 4807 | spec->digbeep_nid = 0x23; | 5057 | spec->digbeep_nid = 0x23; |
| @@ -4831,15 +5081,15 @@ static int patch_stac927x(struct hda_codec *codec) | |||
| 4831 | case 0x10280209: | 5081 | case 0x10280209: |
| 4832 | case 0x1028022e: | 5082 | case 0x1028022e: |
| 4833 | /* correct the device field to SPDIF out */ | 5083 | /* correct the device field to SPDIF out */ |
| 4834 | stac92xx_set_config_reg(codec, 0x21, 0x01442070); | 5084 | stac_change_pin_config(codec, 0x21, 0x01442070); |
| 4835 | break; | 5085 | break; |
| 4836 | }; | 5086 | }; |
| 4837 | /* configure the analog microphone on some laptops */ | 5087 | /* configure the analog microphone on some laptops */ |
| 4838 | stac92xx_set_config_reg(codec, 0x0c, 0x90a79130); | 5088 | stac_change_pin_config(codec, 0x0c, 0x90a79130); |
| 4839 | /* correct the front output jack as a hp out */ | 5089 | /* correct the front output jack as a hp out */ |
| 4840 | stac92xx_set_config_reg(codec, 0x0f, 0x0227011f); | 5090 | stac_change_pin_config(codec, 0x0f, 0x0227011f); |
| 4841 | /* correct the front input jack as a mic */ | 5091 | /* correct the front input jack as a mic */ |
| 4842 | stac92xx_set_config_reg(codec, 0x0e, 0x02a79130); | 5092 | stac_change_pin_config(codec, 0x0e, 0x02a79130); |
| 4843 | /* fallthru */ | 5093 | /* fallthru */ |
| 4844 | case STAC_DELL_3ST: | 5094 | case STAC_DELL_3ST: |
| 4845 | /* GPIO2 High = Enable EAPD */ | 5095 | /* GPIO2 High = Enable EAPD */ |
| @@ -4887,6 +5137,8 @@ static int patch_stac927x(struct hda_codec *codec) | |||
| 4887 | 5137 | ||
| 4888 | codec->patch_ops = stac92xx_patch_ops; | 5138 | codec->patch_ops = stac92xx_patch_ops; |
| 4889 | 5139 | ||
| 5140 | codec->proc_widget_hook = stac927x_proc_hook; | ||
| 5141 | |||
| 4890 | /* | 5142 | /* |
| 4891 | * !!FIXME!! | 5143 | * !!FIXME!! |
| 4892 | * The STAC927x seem to require fairly long delays for certain | 5144 | * The STAC927x seem to require fairly long delays for certain |
| @@ -4899,6 +5151,10 @@ static int patch_stac927x(struct hda_codec *codec) | |||
| 4899 | */ | 5151 | */ |
| 4900 | codec->bus->needs_damn_long_delay = 1; | 5152 | codec->bus->needs_damn_long_delay = 1; |
| 4901 | 5153 | ||
| 5154 | /* no jack detecion for ref-no-jd model */ | ||
| 5155 | if (spec->board_config == STAC_D965_REF_NO_JD) | ||
| 5156 | spec->hp_detect = 0; | ||
| 5157 | |||
| 4902 | return 0; | 5158 | return 0; |
| 4903 | } | 5159 | } |
| 4904 | 5160 | ||
| @@ -4921,14 +5177,12 @@ static int patch_stac9205(struct hda_codec *codec) | |||
| 4921 | if (spec->board_config < 0) { | 5177 | if (spec->board_config < 0) { |
| 4922 | snd_printdd(KERN_INFO "hda_codec: Unknown model for STAC9205, using BIOS defaults\n"); | 5178 | snd_printdd(KERN_INFO "hda_codec: Unknown model for STAC9205, using BIOS defaults\n"); |
| 4923 | err = stac92xx_save_bios_config_regs(codec); | 5179 | err = stac92xx_save_bios_config_regs(codec); |
| 4924 | if (err < 0) { | 5180 | } else |
| 4925 | stac92xx_free(codec); | 5181 | err = stac_save_pin_cfgs(codec, |
| 4926 | return err; | 5182 | stac9205_brd_tbl[spec->board_config]); |
| 4927 | } | 5183 | if (err < 0) { |
| 4928 | spec->pin_configs = spec->bios_pin_configs; | 5184 | stac92xx_free(codec); |
| 4929 | } else { | 5185 | return err; |
| 4930 | spec->pin_configs = stac9205_brd_tbl[spec->board_config]; | ||
| 4931 | stac92xx_set_config_regs(codec); | ||
| 4932 | } | 5186 | } |
| 4933 | 5187 | ||
| 4934 | spec->digbeep_nid = 0x23; | 5188 | spec->digbeep_nid = 0x23; |
| @@ -4955,15 +5209,18 @@ static int patch_stac9205(struct hda_codec *codec) | |||
| 4955 | switch (spec->board_config){ | 5209 | switch (spec->board_config){ |
| 4956 | case STAC_9205_DELL_M43: | 5210 | case STAC_9205_DELL_M43: |
| 4957 | /* Enable SPDIF in/out */ | 5211 | /* Enable SPDIF in/out */ |
| 4958 | stac92xx_set_config_reg(codec, 0x1f, 0x01441030); | 5212 | stac_change_pin_config(codec, 0x1f, 0x01441030); |
| 4959 | stac92xx_set_config_reg(codec, 0x20, 0x1c410030); | 5213 | stac_change_pin_config(codec, 0x20, 0x1c410030); |
| 4960 | 5214 | ||
| 4961 | /* Enable unsol response for GPIO4/Dock HP connection */ | 5215 | /* Enable unsol response for GPIO4/Dock HP connection */ |
| 5216 | err = stac_add_event(spec, codec->afg, STAC_VREF_EVENT, 0x01); | ||
| 5217 | if (err < 0) | ||
| 5218 | return err; | ||
| 4962 | snd_hda_codec_write_cache(codec, codec->afg, 0, | 5219 | snd_hda_codec_write_cache(codec, codec->afg, 0, |
| 4963 | AC_VERB_SET_GPIO_UNSOLICITED_RSP_MASK, 0x10); | 5220 | AC_VERB_SET_GPIO_UNSOLICITED_RSP_MASK, 0x10); |
| 4964 | snd_hda_codec_write_cache(codec, codec->afg, 0, | 5221 | snd_hda_codec_write_cache(codec, codec->afg, 0, |
| 4965 | AC_VERB_SET_UNSOLICITED_ENABLE, | 5222 | AC_VERB_SET_UNSOLICITED_ENABLE, |
| 4966 | (AC_USRSP_EN | STAC_HP_EVENT)); | 5223 | AC_USRSP_EN | err); |
| 4967 | 5224 | ||
| 4968 | spec->gpio_dir = 0x0b; | 5225 | spec->gpio_dir = 0x0b; |
| 4969 | spec->eapd_mask = 0x01; | 5226 | spec->eapd_mask = 0x01; |
| @@ -5001,6 +5258,8 @@ static int patch_stac9205(struct hda_codec *codec) | |||
| 5001 | 5258 | ||
| 5002 | codec->patch_ops = stac92xx_patch_ops; | 5259 | codec->patch_ops = stac92xx_patch_ops; |
| 5003 | 5260 | ||
| 5261 | codec->proc_widget_hook = stac9205_proc_hook; | ||
| 5262 | |||
| 5004 | return 0; | 5263 | return 0; |
| 5005 | } | 5264 | } |
| 5006 | 5265 | ||
| @@ -5057,29 +5316,11 @@ static struct hda_verb vaio_ar_init[] = { | |||
| 5057 | {} | 5316 | {} |
| 5058 | }; | 5317 | }; |
| 5059 | 5318 | ||
| 5060 | /* bind volumes of both NID 0x02 and 0x05 */ | ||
| 5061 | static struct hda_bind_ctls vaio_bind_master_vol = { | ||
| 5062 | .ops = &snd_hda_bind_vol, | ||
| 5063 | .values = { | ||
| 5064 | HDA_COMPOSE_AMP_VAL(0x02, 3, 0, HDA_OUTPUT), | ||
| 5065 | HDA_COMPOSE_AMP_VAL(0x05, 3, 0, HDA_OUTPUT), | ||
| 5066 | 0 | ||
| 5067 | }, | ||
| 5068 | }; | ||
| 5069 | |||
| 5070 | /* bind volumes of both NID 0x02 and 0x05 */ | ||
| 5071 | static struct hda_bind_ctls vaio_bind_master_sw = { | ||
| 5072 | .ops = &snd_hda_bind_sw, | ||
| 5073 | .values = { | ||
| 5074 | HDA_COMPOSE_AMP_VAL(0x02, 3, 0, HDA_OUTPUT), | ||
| 5075 | HDA_COMPOSE_AMP_VAL(0x05, 3, 0, HDA_OUTPUT), | ||
| 5076 | 0, | ||
| 5077 | }, | ||
| 5078 | }; | ||
| 5079 | |||
| 5080 | static struct snd_kcontrol_new vaio_mixer[] = { | 5319 | static struct snd_kcontrol_new vaio_mixer[] = { |
| 5081 | HDA_BIND_VOL("Master Playback Volume", &vaio_bind_master_vol), | 5320 | HDA_CODEC_VOLUME("Headphone Playback Volume", 0x02, 0, HDA_OUTPUT), |
| 5082 | HDA_BIND_SW("Master Playback Switch", &vaio_bind_master_sw), | 5321 | HDA_CODEC_MUTE("Headphone Playback Switch", 0x02, 0, HDA_OUTPUT), |
| 5322 | HDA_CODEC_VOLUME("Speaker Playback Volume", 0x05, 0, HDA_OUTPUT), | ||
| 5323 | HDA_CODEC_MUTE("Speaker Playback Switch", 0x05, 0, HDA_OUTPUT), | ||
| 5083 | /* HDA_CODEC_VOLUME("CD Capture Volume", 0x07, 0, HDA_INPUT), */ | 5324 | /* HDA_CODEC_VOLUME("CD Capture Volume", 0x07, 0, HDA_INPUT), */ |
| 5084 | HDA_CODEC_VOLUME("Capture Volume", 0x09, 0, HDA_INPUT), | 5325 | HDA_CODEC_VOLUME("Capture Volume", 0x09, 0, HDA_INPUT), |
| 5085 | HDA_CODEC_MUTE("Capture Switch", 0x09, 0, HDA_INPUT), | 5326 | HDA_CODEC_MUTE("Capture Switch", 0x09, 0, HDA_INPUT), |
| @@ -5095,8 +5336,10 @@ static struct snd_kcontrol_new vaio_mixer[] = { | |||
| 5095 | }; | 5336 | }; |
| 5096 | 5337 | ||
| 5097 | static struct snd_kcontrol_new vaio_ar_mixer[] = { | 5338 | static struct snd_kcontrol_new vaio_ar_mixer[] = { |
| 5098 | HDA_BIND_VOL("Master Playback Volume", &vaio_bind_master_vol), | 5339 | HDA_CODEC_VOLUME("Headphone Playback Volume", 0x02, 0, HDA_OUTPUT), |
| 5099 | HDA_BIND_SW("Master Playback Switch", &vaio_bind_master_sw), | 5340 | HDA_CODEC_MUTE("Headphone Playback Switch", 0x02, 0, HDA_OUTPUT), |
| 5341 | HDA_CODEC_VOLUME("Speaker Playback Volume", 0x05, 0, HDA_OUTPUT), | ||
| 5342 | HDA_CODEC_MUTE("Speaker Playback Switch", 0x05, 0, HDA_OUTPUT), | ||
| 5100 | /* HDA_CODEC_VOLUME("CD Capture Volume", 0x07, 0, HDA_INPUT), */ | 5343 | /* HDA_CODEC_VOLUME("CD Capture Volume", 0x07, 0, HDA_INPUT), */ |
| 5101 | HDA_CODEC_VOLUME("Capture Volume", 0x09, 0, HDA_INPUT), | 5344 | HDA_CODEC_VOLUME("Capture Volume", 0x09, 0, HDA_INPUT), |
| 5102 | HDA_CODEC_MUTE("Capture Switch", 0x09, 0, HDA_INPUT), | 5345 | HDA_CODEC_MUTE("Capture Switch", 0x09, 0, HDA_INPUT), |
| @@ -5137,7 +5380,7 @@ static int stac9872_vaio_init(struct hda_codec *codec) | |||
| 5137 | 5380 | ||
| 5138 | static void stac9872_vaio_hp_detect(struct hda_codec *codec, unsigned int res) | 5381 | static void stac9872_vaio_hp_detect(struct hda_codec *codec, unsigned int res) |
| 5139 | { | 5382 | { |
| 5140 | if (get_hp_pin_presence(codec, 0x0a)) { | 5383 | if (get_pin_presence(codec, 0x0a)) { |
| 5141 | stac92xx_reset_pinctl(codec, 0x0f, AC_PINCTL_OUT_EN); | 5384 | stac92xx_reset_pinctl(codec, 0x0f, AC_PINCTL_OUT_EN); |
| 5142 | stac92xx_set_pinctl(codec, 0x0a, AC_PINCTL_OUT_EN); | 5385 | stac92xx_set_pinctl(codec, 0x0a, AC_PINCTL_OUT_EN); |
| 5143 | } else { | 5386 | } else { |
| @@ -5248,7 +5491,7 @@ static int patch_stac9872(struct hda_codec *codec) | |||
| 5248 | /* | 5491 | /* |
| 5249 | * patch entries | 5492 | * patch entries |
| 5250 | */ | 5493 | */ |
| 5251 | struct hda_codec_preset snd_hda_preset_sigmatel[] = { | 5494 | static struct hda_codec_preset snd_hda_preset_sigmatel[] = { |
| 5252 | { .id = 0x83847690, .name = "STAC9200", .patch = patch_stac9200 }, | 5495 | { .id = 0x83847690, .name = "STAC9200", .patch = patch_stac9200 }, |
| 5253 | { .id = 0x83847882, .name = "STAC9220 A1", .patch = patch_stac922x }, | 5496 | { .id = 0x83847882, .name = "STAC9220 A1", .patch = patch_stac922x }, |
| 5254 | { .id = 0x83847680, .name = "STAC9221 A1", .patch = patch_stac922x }, | 5497 | { .id = 0x83847680, .name = "STAC9221 A1", .patch = patch_stac922x }, |
| @@ -5312,3 +5555,27 @@ struct hda_codec_preset snd_hda_preset_sigmatel[] = { | |||
| 5312 | { .id = 0x111d76b7, .name = "92HD71B5X", .patch = patch_stac92hd71bxx }, | 5555 | { .id = 0x111d76b7, .name = "92HD71B5X", .patch = patch_stac92hd71bxx }, |
| 5313 | {} /* terminator */ | 5556 | {} /* terminator */ |
| 5314 | }; | 5557 | }; |
| 5558 | |||
| 5559 | MODULE_ALIAS("snd-hda-codec-id:8384*"); | ||
| 5560 | MODULE_ALIAS("snd-hda-codec-id:111d*"); | ||
| 5561 | |||
| 5562 | MODULE_LICENSE("GPL"); | ||
| 5563 | MODULE_DESCRIPTION("IDT/Sigmatel HD-audio codec"); | ||
| 5564 | |||
| 5565 | static struct hda_codec_preset_list sigmatel_list = { | ||
| 5566 | .preset = snd_hda_preset_sigmatel, | ||
| 5567 | .owner = THIS_MODULE, | ||
| 5568 | }; | ||
| 5569 | |||
| 5570 | static int __init patch_sigmatel_init(void) | ||
| 5571 | { | ||
| 5572 | return snd_hda_add_codec_preset(&sigmatel_list); | ||
| 5573 | } | ||
| 5574 | |||
| 5575 | static void __exit patch_sigmatel_exit(void) | ||
| 5576 | { | ||
| 5577 | snd_hda_delete_codec_preset(&sigmatel_list); | ||
| 5578 | } | ||
| 5579 | |||
| 5580 | module_init(patch_sigmatel_init) | ||
| 5581 | module_exit(patch_sigmatel_exit) | ||
diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c index 63e4871e5d8f..c761394cbe84 100644 --- a/sound/pci/hda/patch_via.c +++ b/sound/pci/hda/patch_via.c | |||
| @@ -47,15 +47,11 @@ | |||
| 47 | #include <sound/asoundef.h> | 47 | #include <sound/asoundef.h> |
| 48 | #include "hda_codec.h" | 48 | #include "hda_codec.h" |
| 49 | #include "hda_local.h" | 49 | #include "hda_local.h" |
| 50 | #include "hda_patch.h" | ||
| 51 | 50 | ||
| 52 | /* amp values */ | 51 | /* amp values */ |
| 53 | #define AMP_VAL_IDX_SHIFT 19 | 52 | #define AMP_VAL_IDX_SHIFT 19 |
| 54 | #define AMP_VAL_IDX_MASK (0x0f<<19) | 53 | #define AMP_VAL_IDX_MASK (0x0f<<19) |
| 55 | 54 | ||
| 56 | #define NUM_CONTROL_ALLOC 32 | ||
| 57 | #define NUM_VERB_ALLOC 32 | ||
| 58 | |||
| 59 | /* Pin Widget NID */ | 55 | /* Pin Widget NID */ |
| 60 | #define VT1708_HP_NID 0x13 | 56 | #define VT1708_HP_NID 0x13 |
| 61 | #define VT1708_DIGOUT_NID 0x14 | 57 | #define VT1708_DIGOUT_NID 0x14 |
| @@ -145,8 +141,6 @@ enum { | |||
| 145 | AUTO_SEQ_SIDE | 141 | AUTO_SEQ_SIDE |
| 146 | }; | 142 | }; |
| 147 | 143 | ||
| 148 | #define get_amp_nid(kc) ((kc)->private_value & 0xffff) | ||
| 149 | |||
| 150 | /* Some VT1708S based boards gets the micboost setting wrong, so we have | 144 | /* Some VT1708S based boards gets the micboost setting wrong, so we have |
| 151 | * to apply some brute-force and re-write the TLV's by software. */ | 145 | * to apply some brute-force and re-write the TLV's by software. */ |
| 152 | static int mic_boost_tlv(struct snd_kcontrol *kcontrol, int op_flag, | 146 | static int mic_boost_tlv(struct snd_kcontrol *kcontrol, int op_flag, |
| @@ -227,8 +221,7 @@ struct via_spec { | |||
| 227 | 221 | ||
| 228 | /* dynamic controls, init_verbs and input_mux */ | 222 | /* dynamic controls, init_verbs and input_mux */ |
| 229 | struct auto_pin_cfg autocfg; | 223 | struct auto_pin_cfg autocfg; |
| 230 | unsigned int num_kctl_alloc, num_kctl_used; | 224 | struct snd_array kctls; |
| 231 | struct snd_kcontrol_new *kctl_alloc; | ||
| 232 | struct hda_input_mux private_imux[2]; | 225 | struct hda_input_mux private_imux[2]; |
| 233 | hda_nid_t private_dac_nids[AUTO_CFG_MAX_OUTS]; | 226 | hda_nid_t private_dac_nids[AUTO_CFG_MAX_OUTS]; |
| 234 | 227 | ||
| @@ -272,33 +265,31 @@ static int via_add_control(struct via_spec *spec, int type, const char *name, | |||
| 272 | { | 265 | { |
| 273 | struct snd_kcontrol_new *knew; | 266 | struct snd_kcontrol_new *knew; |
| 274 | 267 | ||
| 275 | if (spec->num_kctl_used >= spec->num_kctl_alloc) { | 268 | snd_array_init(&spec->kctls, sizeof(*knew), 32); |
| 276 | int num = spec->num_kctl_alloc + NUM_CONTROL_ALLOC; | 269 | knew = snd_array_new(&spec->kctls); |
| 277 | 270 | if (!knew) | |
| 278 | /* array + terminator */ | 271 | return -ENOMEM; |
| 279 | knew = kcalloc(num + 1, sizeof(*knew), GFP_KERNEL); | ||
| 280 | if (!knew) | ||
| 281 | return -ENOMEM; | ||
| 282 | if (spec->kctl_alloc) { | ||
| 283 | memcpy(knew, spec->kctl_alloc, | ||
| 284 | sizeof(*knew) * spec->num_kctl_alloc); | ||
| 285 | kfree(spec->kctl_alloc); | ||
| 286 | } | ||
| 287 | spec->kctl_alloc = knew; | ||
| 288 | spec->num_kctl_alloc = num; | ||
| 289 | } | ||
| 290 | |||
| 291 | knew = &spec->kctl_alloc[spec->num_kctl_used]; | ||
| 292 | *knew = vt1708_control_templates[type]; | 272 | *knew = vt1708_control_templates[type]; |
| 293 | knew->name = kstrdup(name, GFP_KERNEL); | 273 | knew->name = kstrdup(name, GFP_KERNEL); |
| 294 | |||
| 295 | if (!knew->name) | 274 | if (!knew->name) |
| 296 | return -ENOMEM; | 275 | return -ENOMEM; |
| 297 | knew->private_value = val; | 276 | knew->private_value = val; |
| 298 | spec->num_kctl_used++; | ||
| 299 | return 0; | 277 | return 0; |
| 300 | } | 278 | } |
| 301 | 279 | ||
| 280 | static void via_free_kctls(struct hda_codec *codec) | ||
| 281 | { | ||
| 282 | struct via_spec *spec = codec->spec; | ||
| 283 | |||
| 284 | if (spec->kctls.list) { | ||
| 285 | struct snd_kcontrol_new *kctl = spec->kctls.list; | ||
| 286 | int i; | ||
| 287 | for (i = 0; i < spec->kctls.used; i++) | ||
| 288 | kfree(kctl[i].name); | ||
| 289 | } | ||
| 290 | snd_array_free(&spec->kctls); | ||
| 291 | } | ||
| 292 | |||
| 302 | /* create input playback/capture controls for the given pin */ | 293 | /* create input playback/capture controls for the given pin */ |
| 303 | static int via_new_analog_input(struct via_spec *spec, hda_nid_t pin, | 294 | static int via_new_analog_input(struct via_spec *spec, hda_nid_t pin, |
| 304 | const char *ctlname, int idx, int mix_nid) | 295 | const char *ctlname, int idx, int mix_nid) |
| @@ -896,6 +887,7 @@ static int via_build_controls(struct hda_codec *codec) | |||
| 896 | if (err < 0) | 887 | if (err < 0) |
| 897 | return err; | 888 | return err; |
| 898 | } | 889 | } |
| 890 | via_free_kctls(codec); /* no longer needed */ | ||
| 899 | return 0; | 891 | return 0; |
| 900 | } | 892 | } |
| 901 | 893 | ||
| @@ -941,17 +933,11 @@ static int via_build_pcms(struct hda_codec *codec) | |||
| 941 | static void via_free(struct hda_codec *codec) | 933 | static void via_free(struct hda_codec *codec) |
| 942 | { | 934 | { |
| 943 | struct via_spec *spec = codec->spec; | 935 | struct via_spec *spec = codec->spec; |
| 944 | unsigned int i; | ||
| 945 | 936 | ||
| 946 | if (!spec) | 937 | if (!spec) |
| 947 | return; | 938 | return; |
| 948 | 939 | ||
| 949 | if (spec->kctl_alloc) { | 940 | via_free_kctls(codec); |
| 950 | for (i = 0; i < spec->num_kctl_used; i++) | ||
| 951 | kfree(spec->kctl_alloc[i].name); | ||
| 952 | kfree(spec->kctl_alloc); | ||
| 953 | } | ||
| 954 | |||
| 955 | kfree(codec->spec); | 941 | kfree(codec->spec); |
| 956 | } | 942 | } |
| 957 | 943 | ||
| @@ -1373,8 +1359,8 @@ static int vt1708_parse_auto_config(struct hda_codec *codec) | |||
| 1373 | if (spec->autocfg.dig_in_pin) | 1359 | if (spec->autocfg.dig_in_pin) |
| 1374 | spec->dig_in_nid = VT1708_DIGIN_NID; | 1360 | spec->dig_in_nid = VT1708_DIGIN_NID; |
| 1375 | 1361 | ||
| 1376 | if (spec->kctl_alloc) | 1362 | if (spec->kctls.list) |
| 1377 | spec->mixers[spec->num_mixers++] = spec->kctl_alloc; | 1363 | spec->mixers[spec->num_mixers++] = spec->kctls.list; |
| 1378 | 1364 | ||
| 1379 | spec->init_verbs[spec->num_iverbs++] = vt1708_volume_init_verbs; | 1365 | spec->init_verbs[spec->num_iverbs++] = vt1708_volume_init_verbs; |
| 1380 | 1366 | ||
| @@ -1846,8 +1832,8 @@ static int vt1709_parse_auto_config(struct hda_codec *codec) | |||
| 1846 | if (spec->autocfg.dig_in_pin) | 1832 | if (spec->autocfg.dig_in_pin) |
| 1847 | spec->dig_in_nid = VT1709_DIGIN_NID; | 1833 | spec->dig_in_nid = VT1709_DIGIN_NID; |
| 1848 | 1834 | ||
| 1849 | if (spec->kctl_alloc) | 1835 | if (spec->kctls.list) |
| 1850 | spec->mixers[spec->num_mixers++] = spec->kctl_alloc; | 1836 | spec->mixers[spec->num_mixers++] = spec->kctls.list; |
| 1851 | 1837 | ||
| 1852 | spec->input_mux = &spec->private_imux[0]; | 1838 | spec->input_mux = &spec->private_imux[0]; |
| 1853 | 1839 | ||
| @@ -2390,8 +2376,8 @@ static int vt1708B_parse_auto_config(struct hda_codec *codec) | |||
| 2390 | if (spec->autocfg.dig_in_pin) | 2376 | if (spec->autocfg.dig_in_pin) |
| 2391 | spec->dig_in_nid = VT1708B_DIGIN_NID; | 2377 | spec->dig_in_nid = VT1708B_DIGIN_NID; |
| 2392 | 2378 | ||
| 2393 | if (spec->kctl_alloc) | 2379 | if (spec->kctls.list) |
| 2394 | spec->mixers[spec->num_mixers++] = spec->kctl_alloc; | 2380 | spec->mixers[spec->num_mixers++] = spec->kctls.list; |
| 2395 | 2381 | ||
| 2396 | spec->input_mux = &spec->private_imux[0]; | 2382 | spec->input_mux = &spec->private_imux[0]; |
| 2397 | 2383 | ||
| @@ -2855,8 +2841,8 @@ static int vt1708S_parse_auto_config(struct hda_codec *codec) | |||
| 2855 | 2841 | ||
| 2856 | spec->extra_dig_out_nid = 0x15; | 2842 | spec->extra_dig_out_nid = 0x15; |
| 2857 | 2843 | ||
| 2858 | if (spec->kctl_alloc) | 2844 | if (spec->kctls.list) |
| 2859 | spec->mixers[spec->num_mixers++] = spec->kctl_alloc; | 2845 | spec->mixers[spec->num_mixers++] = spec->kctls.list; |
| 2860 | 2846 | ||
| 2861 | spec->input_mux = &spec->private_imux[0]; | 2847 | spec->input_mux = &spec->private_imux[0]; |
| 2862 | 2848 | ||
| @@ -3174,8 +3160,8 @@ static int vt1702_parse_auto_config(struct hda_codec *codec) | |||
| 3174 | 3160 | ||
| 3175 | spec->extra_dig_out_nid = 0x1B; | 3161 | spec->extra_dig_out_nid = 0x1B; |
| 3176 | 3162 | ||
| 3177 | if (spec->kctl_alloc) | 3163 | if (spec->kctls.list) |
| 3178 | spec->mixers[spec->num_mixers++] = spec->kctl_alloc; | 3164 | spec->mixers[spec->num_mixers++] = spec->kctls.list; |
| 3179 | 3165 | ||
| 3180 | spec->input_mux = &spec->private_imux[0]; | 3166 | spec->input_mux = &spec->private_imux[0]; |
| 3181 | 3167 | ||
| @@ -3262,74 +3248,97 @@ static int patch_vt1702(struct hda_codec *codec) | |||
| 3262 | /* | 3248 | /* |
| 3263 | * patch entries | 3249 | * patch entries |
| 3264 | */ | 3250 | */ |
| 3265 | struct hda_codec_preset snd_hda_preset_via[] = { | 3251 | static struct hda_codec_preset snd_hda_preset_via[] = { |
| 3266 | { .id = 0x11061708, .name = "VIA VT1708", .patch = patch_vt1708}, | 3252 | { .id = 0x11061708, .name = "VT1708", .patch = patch_vt1708}, |
| 3267 | { .id = 0x11061709, .name = "VIA VT1708", .patch = patch_vt1708}, | 3253 | { .id = 0x11061709, .name = "VT1708", .patch = patch_vt1708}, |
| 3268 | { .id = 0x1106170A, .name = "VIA VT1708", .patch = patch_vt1708}, | 3254 | { .id = 0x1106170a, .name = "VT1708", .patch = patch_vt1708}, |
| 3269 | { .id = 0x1106170B, .name = "VIA VT1708", .patch = patch_vt1708}, | 3255 | { .id = 0x1106170b, .name = "VT1708", .patch = patch_vt1708}, |
| 3270 | { .id = 0x1106E710, .name = "VIA VT1709 10-Ch", | 3256 | { .id = 0x1106e710, .name = "VT1709 10-Ch", |
| 3271 | .patch = patch_vt1709_10ch}, | 3257 | .patch = patch_vt1709_10ch}, |
| 3272 | { .id = 0x1106E711, .name = "VIA VT1709 10-Ch", | 3258 | { .id = 0x1106e711, .name = "VT1709 10-Ch", |
| 3273 | .patch = patch_vt1709_10ch}, | 3259 | .patch = patch_vt1709_10ch}, |
| 3274 | { .id = 0x1106E712, .name = "VIA VT1709 10-Ch", | 3260 | { .id = 0x1106e712, .name = "VT1709 10-Ch", |
| 3275 | .patch = patch_vt1709_10ch}, | 3261 | .patch = patch_vt1709_10ch}, |
| 3276 | { .id = 0x1106E713, .name = "VIA VT1709 10-Ch", | 3262 | { .id = 0x1106e713, .name = "VT1709 10-Ch", |
| 3277 | .patch = patch_vt1709_10ch}, | 3263 | .patch = patch_vt1709_10ch}, |
| 3278 | { .id = 0x1106E714, .name = "VIA VT1709 6-Ch", | 3264 | { .id = 0x1106e714, .name = "VT1709 6-Ch", |
| 3279 | .patch = patch_vt1709_6ch}, | 3265 | .patch = patch_vt1709_6ch}, |
| 3280 | { .id = 0x1106E715, .name = "VIA VT1709 6-Ch", | 3266 | { .id = 0x1106e715, .name = "VT1709 6-Ch", |
| 3281 | .patch = patch_vt1709_6ch}, | 3267 | .patch = patch_vt1709_6ch}, |
| 3282 | { .id = 0x1106E716, .name = "VIA VT1709 6-Ch", | 3268 | { .id = 0x1106e716, .name = "VT1709 6-Ch", |
| 3283 | .patch = patch_vt1709_6ch}, | 3269 | .patch = patch_vt1709_6ch}, |
| 3284 | { .id = 0x1106E717, .name = "VIA VT1709 6-Ch", | 3270 | { .id = 0x1106e717, .name = "VT1709 6-Ch", |
| 3285 | .patch = patch_vt1709_6ch}, | 3271 | .patch = patch_vt1709_6ch}, |
| 3286 | { .id = 0x1106E720, .name = "VIA VT1708B 8-Ch", | 3272 | { .id = 0x1106e720, .name = "VT1708B 8-Ch", |
| 3287 | .patch = patch_vt1708B_8ch}, | 3273 | .patch = patch_vt1708B_8ch}, |
| 3288 | { .id = 0x1106E721, .name = "VIA VT1708B 8-Ch", | 3274 | { .id = 0x1106e721, .name = "VT1708B 8-Ch", |
| 3289 | .patch = patch_vt1708B_8ch}, | 3275 | .patch = patch_vt1708B_8ch}, |
| 3290 | { .id = 0x1106E722, .name = "VIA VT1708B 8-Ch", | 3276 | { .id = 0x1106e722, .name = "VT1708B 8-Ch", |
| 3291 | .patch = patch_vt1708B_8ch}, | 3277 | .patch = patch_vt1708B_8ch}, |
| 3292 | { .id = 0x1106E723, .name = "VIA VT1708B 8-Ch", | 3278 | { .id = 0x1106e723, .name = "VT1708B 8-Ch", |
| 3293 | .patch = patch_vt1708B_8ch}, | 3279 | .patch = patch_vt1708B_8ch}, |
| 3294 | { .id = 0x1106E724, .name = "VIA VT1708B 4-Ch", | 3280 | { .id = 0x1106e724, .name = "VT1708B 4-Ch", |
| 3295 | .patch = patch_vt1708B_4ch}, | 3281 | .patch = patch_vt1708B_4ch}, |
| 3296 | { .id = 0x1106E725, .name = "VIA VT1708B 4-Ch", | 3282 | { .id = 0x1106e725, .name = "VT1708B 4-Ch", |
| 3297 | .patch = patch_vt1708B_4ch}, | 3283 | .patch = patch_vt1708B_4ch}, |
| 3298 | { .id = 0x1106E726, .name = "VIA VT1708B 4-Ch", | 3284 | { .id = 0x1106e726, .name = "VT1708B 4-Ch", |
| 3299 | .patch = patch_vt1708B_4ch}, | 3285 | .patch = patch_vt1708B_4ch}, |
| 3300 | { .id = 0x1106E727, .name = "VIA VT1708B 4-Ch", | 3286 | { .id = 0x1106e727, .name = "VT1708B 4-Ch", |
| 3301 | .patch = patch_vt1708B_4ch}, | 3287 | .patch = patch_vt1708B_4ch}, |
| 3302 | { .id = 0x11060397, .name = "VIA VT1708S", | 3288 | { .id = 0x11060397, .name = "VT1708S", |
| 3303 | .patch = patch_vt1708S}, | 3289 | .patch = patch_vt1708S}, |
| 3304 | { .id = 0x11061397, .name = "VIA VT1708S", | 3290 | { .id = 0x11061397, .name = "VT1708S", |
| 3305 | .patch = patch_vt1708S}, | 3291 | .patch = patch_vt1708S}, |
| 3306 | { .id = 0x11062397, .name = "VIA VT1708S", | 3292 | { .id = 0x11062397, .name = "VT1708S", |
| 3307 | .patch = patch_vt1708S}, | 3293 | .patch = patch_vt1708S}, |
| 3308 | { .id = 0x11063397, .name = "VIA VT1708S", | 3294 | { .id = 0x11063397, .name = "VT1708S", |
| 3309 | .patch = patch_vt1708S}, | 3295 | .patch = patch_vt1708S}, |
| 3310 | { .id = 0x11064397, .name = "VIA VT1708S", | 3296 | { .id = 0x11064397, .name = "VT1708S", |
| 3311 | .patch = patch_vt1708S}, | 3297 | .patch = patch_vt1708S}, |
| 3312 | { .id = 0x11065397, .name = "VIA VT1708S", | 3298 | { .id = 0x11065397, .name = "VT1708S", |
| 3313 | .patch = patch_vt1708S}, | 3299 | .patch = patch_vt1708S}, |
| 3314 | { .id = 0x11066397, .name = "VIA VT1708S", | 3300 | { .id = 0x11066397, .name = "VT1708S", |
| 3315 | .patch = patch_vt1708S}, | 3301 | .patch = patch_vt1708S}, |
| 3316 | { .id = 0x11067397, .name = "VIA VT1708S", | 3302 | { .id = 0x11067397, .name = "VT1708S", |
| 3317 | .patch = patch_vt1708S}, | 3303 | .patch = patch_vt1708S}, |
| 3318 | { .id = 0x11060398, .name = "VIA VT1702", | 3304 | { .id = 0x11060398, .name = "VT1702", |
| 3319 | .patch = patch_vt1702}, | 3305 | .patch = patch_vt1702}, |
| 3320 | { .id = 0x11061398, .name = "VIA VT1702", | 3306 | { .id = 0x11061398, .name = "VT1702", |
| 3321 | .patch = patch_vt1702}, | 3307 | .patch = patch_vt1702}, |
| 3322 | { .id = 0x11062398, .name = "VIA VT1702", | 3308 | { .id = 0x11062398, .name = "VT1702", |
| 3323 | .patch = patch_vt1702}, | 3309 | .patch = patch_vt1702}, |
| 3324 | { .id = 0x11063398, .name = "VIA VT1702", | 3310 | { .id = 0x11063398, .name = "VT1702", |
| 3325 | .patch = patch_vt1702}, | 3311 | .patch = patch_vt1702}, |
| 3326 | { .id = 0x11064398, .name = "VIA VT1702", | 3312 | { .id = 0x11064398, .name = "VT1702", |
| 3327 | .patch = patch_vt1702}, | 3313 | .patch = patch_vt1702}, |
| 3328 | { .id = 0x11065398, .name = "VIA VT1702", | 3314 | { .id = 0x11065398, .name = "VT1702", |
| 3329 | .patch = patch_vt1702}, | 3315 | .patch = patch_vt1702}, |
| 3330 | { .id = 0x11066398, .name = "VIA VT1702", | 3316 | { .id = 0x11066398, .name = "VT1702", |
| 3331 | .patch = patch_vt1702}, | 3317 | .patch = patch_vt1702}, |
| 3332 | { .id = 0x11067398, .name = "VIA VT1702", | 3318 | { .id = 0x11067398, .name = "VT1702", |
| 3333 | .patch = patch_vt1702}, | 3319 | .patch = patch_vt1702}, |
| 3334 | {} /* terminator */ | 3320 | {} /* terminator */ |
| 3335 | }; | 3321 | }; |
| 3322 | |||
| 3323 | MODULE_ALIAS("snd-hda-codec-id:1106*"); | ||
| 3324 | |||
| 3325 | static struct hda_codec_preset_list via_list = { | ||
| 3326 | .preset = snd_hda_preset_via, | ||
| 3327 | .owner = THIS_MODULE, | ||
| 3328 | }; | ||
| 3329 | |||
| 3330 | MODULE_LICENSE("GPL"); | ||
| 3331 | MODULE_DESCRIPTION("VIA HD-audio codec"); | ||
| 3332 | |||
| 3333 | static int __init patch_via_init(void) | ||
| 3334 | { | ||
| 3335 | return snd_hda_add_codec_preset(&via_list); | ||
| 3336 | } | ||
| 3337 | |||
| 3338 | static void __exit patch_via_exit(void) | ||
| 3339 | { | ||
| 3340 | snd_hda_delete_codec_preset(&via_list); | ||
| 3341 | } | ||
| 3342 | |||
| 3343 | module_init(patch_via_init) | ||
| 3344 | module_exit(patch_via_exit) | ||