diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-05 12:56:57 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-05 12:56:57 -0400 |
| commit | 616ad8c44281c0c6711a72b560e01ec335ff27e0 (patch) | |
| tree | 0a20453ffedb09db6fb41a0c2208ccc2c7751d3a | |
| parent | 99809963c99e1ed868d9ebeb4a5e7ee1cbe0309f (diff) | |
| parent | b380b0d4f7dffcc235c0facefa537d4655619101 (diff) | |
Merge branch 'linus' into x86/defconfig
1869 files changed, 62212 insertions, 19817 deletions
diff --git a/Documentation/ABI/testing/sysfs-firmware-sgi_uv b/Documentation/ABI/testing/sysfs-firmware-sgi_uv new file mode 100644 index 000000000000..4573fd4b7876 --- /dev/null +++ b/Documentation/ABI/testing/sysfs-firmware-sgi_uv | |||
| @@ -0,0 +1,27 @@ | |||
| 1 | What: /sys/firmware/sgi_uv/ | ||
| 2 | Date: August 2008 | ||
| 3 | Contact: Russ Anderson <rja@sgi.com> | ||
| 4 | Description: | ||
| 5 | The /sys/firmware/sgi_uv directory contains information | ||
| 6 | about the SGI UV platform. | ||
| 7 | |||
| 8 | Under that directory are a number of files: | ||
| 9 | |||
| 10 | partition_id | ||
| 11 | coherence_id | ||
| 12 | |||
| 13 | The partition_id entry contains the partition id. | ||
| 14 | SGI UV systems can be partitioned into multiple physical | ||
| 15 | machines, which each partition running a unique copy | ||
| 16 | of the operating system. Each partition will have a unique | ||
| 17 | partition id. To display the partition id, use the command: | ||
| 18 | |||
| 19 | cat /sys/firmware/sgi_uv/partition_id | ||
| 20 | |||
| 21 | The coherence_id entry contains the coherence id. | ||
| 22 | A partitioned SGI UV system can have one or more coherence | ||
| 23 | domain. The coherence id indicates which coherence domain | ||
| 24 | this partition is in. To display the coherence id, use the | ||
| 25 | command: | ||
| 26 | |||
| 27 | cat /sys/firmware/sgi_uv/coherence_id | ||
diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile index 1d1b34500b69..1615350b7b53 100644 --- a/Documentation/DocBook/Makefile +++ b/Documentation/DocBook/Makefile | |||
| @@ -102,6 +102,13 @@ C-procfs-example = procfs_example.xml | |||
| 102 | C-procfs-example2 = $(addprefix $(obj)/,$(C-procfs-example)) | 102 | C-procfs-example2 = $(addprefix $(obj)/,$(C-procfs-example)) |
| 103 | $(obj)/procfs-guide.xml: $(C-procfs-example2) | 103 | $(obj)/procfs-guide.xml: $(C-procfs-example2) |
| 104 | 104 | ||
| 105 | # List of programs to build | ||
| 106 | ##oops, this is a kernel module::hostprogs-y := procfs_example | ||
| 107 | obj-m += procfs_example.o | ||
| 108 | |||
| 109 | # Tell kbuild to always build the programs | ||
| 110 | always := $(hostprogs-y) | ||
| 111 | |||
| 105 | notfoundtemplate = echo "*** You have to install docbook-utils or xmlto ***"; \ | 112 | notfoundtemplate = echo "*** You have to install docbook-utils or xmlto ***"; \ |
| 106 | exit 1 | 113 | exit 1 |
| 107 | db2xtemplate = db2TYPE -o $(dir $@) $< | 114 | db2xtemplate = db2TYPE -o $(dir $@) $< |
diff --git a/Documentation/DocBook/procfs_example.c b/Documentation/DocBook/procfs_example.c index 7064084c1c5e..2f3de0fb8365 100644 --- a/Documentation/DocBook/procfs_example.c +++ b/Documentation/DocBook/procfs_example.c | |||
| @@ -189,8 +189,6 @@ static int __init init_procfs_example(void) | |||
| 189 | return 0; | 189 | return 0; |
| 190 | 190 | ||
| 191 | no_symlink: | 191 | no_symlink: |
| 192 | remove_proc_entry("tty", example_dir); | ||
| 193 | no_tty: | ||
| 194 | remove_proc_entry("bar", example_dir); | 192 | remove_proc_entry("bar", example_dir); |
| 195 | no_bar: | 193 | no_bar: |
| 196 | remove_proc_entry("foo", example_dir); | 194 | remove_proc_entry("foo", example_dir); |
| @@ -206,7 +204,6 @@ out: | |||
| 206 | static void __exit cleanup_procfs_example(void) | 204 | static void __exit cleanup_procfs_example(void) |
| 207 | { | 205 | { |
| 208 | remove_proc_entry("jiffies_too", example_dir); | 206 | remove_proc_entry("jiffies_too", example_dir); |
| 209 | remove_proc_entry("tty", example_dir); | ||
| 210 | remove_proc_entry("bar", example_dir); | 207 | remove_proc_entry("bar", example_dir); |
| 211 | remove_proc_entry("foo", example_dir); | 208 | remove_proc_entry("foo", example_dir); |
| 212 | remove_proc_entry("jiffies", example_dir); | 209 | remove_proc_entry("jiffies", example_dir); |
| @@ -222,3 +219,4 @@ module_exit(cleanup_procfs_example); | |||
| 222 | 219 | ||
| 223 | MODULE_AUTHOR("Erik Mouw"); | 220 | MODULE_AUTHOR("Erik Mouw"); |
| 224 | MODULE_DESCRIPTION("procfs examples"); | 221 | MODULE_DESCRIPTION("procfs examples"); |
| 222 | MODULE_LICENSE("GPL"); | ||
diff --git a/Documentation/Makefile b/Documentation/Makefile new file mode 100644 index 000000000000..94b945733534 --- /dev/null +++ b/Documentation/Makefile | |||
| @@ -0,0 +1,3 @@ | |||
| 1 | obj-m := DocBook/ accounting/ auxdisplay/ connector/ \ | ||
| 2 | filesystems/configfs/ ia64/ networking/ \ | ||
| 3 | pcmcia/ spi/ video4linux/ vm/ watchdog/src/ | ||
diff --git a/Documentation/accounting/Makefile b/Documentation/accounting/Makefile new file mode 100644 index 000000000000..31929eb875b1 --- /dev/null +++ b/Documentation/accounting/Makefile | |||
| @@ -0,0 +1,10 @@ | |||
| 1 | # kbuild trick to avoid linker error. Can be omitted if a module is built. | ||
| 2 | obj- := dummy.o | ||
| 3 | |||
| 4 | # List of programs to build | ||
| 5 | hostprogs-y := getdelays | ||
| 6 | |||
| 7 | # Tell kbuild to always build the programs | ||
| 8 | always := $(hostprogs-y) | ||
| 9 | |||
| 10 | HOSTCFLAGS_getdelays.o += -I$(objtree)/usr/include | ||
diff --git a/Documentation/accounting/getdelays.c b/Documentation/accounting/getdelays.c index 3f7755f3963f..cc49400b4af8 100644 --- a/Documentation/accounting/getdelays.c +++ b/Documentation/accounting/getdelays.c | |||
| @@ -201,13 +201,19 @@ void print_delayacct(struct taskstats *t) | |||
| 201 | "RECLAIM %12s%15s\n" | 201 | "RECLAIM %12s%15s\n" |
| 202 | " %15llu%15llu\n", | 202 | " %15llu%15llu\n", |
| 203 | "count", "real total", "virtual total", "delay total", | 203 | "count", "real total", "virtual total", "delay total", |
| 204 | t->cpu_count, t->cpu_run_real_total, t->cpu_run_virtual_total, | 204 | (unsigned long long)t->cpu_count, |
| 205 | t->cpu_delay_total, | 205 | (unsigned long long)t->cpu_run_real_total, |
| 206 | (unsigned long long)t->cpu_run_virtual_total, | ||
| 207 | (unsigned long long)t->cpu_delay_total, | ||
| 206 | "count", "delay total", | 208 | "count", "delay total", |
| 207 | t->blkio_count, t->blkio_delay_total, | 209 | (unsigned long long)t->blkio_count, |
| 208 | "count", "delay total", t->swapin_count, t->swapin_delay_total, | 210 | (unsigned long long)t->blkio_delay_total, |
| 209 | "count", "delay total", | 211 | "count", "delay total", |
| 210 | t->freepages_count, t->freepages_delay_total); | 212 | (unsigned long long)t->swapin_count, |
| 213 | (unsigned long long)t->swapin_delay_total, | ||
| 214 | "count", "delay total", | ||
| 215 | (unsigned long long)t->freepages_count, | ||
| 216 | (unsigned long long)t->freepages_delay_total); | ||
| 211 | } | 217 | } |
| 212 | 218 | ||
| 213 | void task_context_switch_counts(struct taskstats *t) | 219 | void task_context_switch_counts(struct taskstats *t) |
| @@ -215,14 +221,17 @@ void task_context_switch_counts(struct taskstats *t) | |||
| 215 | printf("\n\nTask %15s%15s\n" | 221 | printf("\n\nTask %15s%15s\n" |
| 216 | " %15llu%15llu\n", | 222 | " %15llu%15llu\n", |
| 217 | "voluntary", "nonvoluntary", | 223 | "voluntary", "nonvoluntary", |
| 218 | t->nvcsw, t->nivcsw); | 224 | (unsigned long long)t->nvcsw, (unsigned long long)t->nivcsw); |
| 219 | } | 225 | } |
| 220 | 226 | ||
| 221 | void print_cgroupstats(struct cgroupstats *c) | 227 | void print_cgroupstats(struct cgroupstats *c) |
| 222 | { | 228 | { |
| 223 | printf("sleeping %llu, blocked %llu, running %llu, stopped %llu, " | 229 | printf("sleeping %llu, blocked %llu, running %llu, stopped %llu, " |
| 224 | "uninterruptible %llu\n", c->nr_sleeping, c->nr_io_wait, | 230 | "uninterruptible %llu\n", (unsigned long long)c->nr_sleeping, |
| 225 | c->nr_running, c->nr_stopped, c->nr_uninterruptible); | 231 | (unsigned long long)c->nr_io_wait, |
| 232 | (unsigned long long)c->nr_running, | ||
| 233 | (unsigned long long)c->nr_stopped, | ||
| 234 | (unsigned long long)c->nr_uninterruptible); | ||
| 226 | } | 235 | } |
| 227 | 236 | ||
| 228 | 237 | ||
diff --git a/Documentation/arm/Samsung-S3C24XX/GPIO.txt b/Documentation/arm/Samsung-S3C24XX/GPIO.txt index b5d20c0b2ab4..ea7ccfc4b274 100644 --- a/Documentation/arm/Samsung-S3C24XX/GPIO.txt +++ b/Documentation/arm/Samsung-S3C24XX/GPIO.txt | |||
| @@ -13,6 +13,21 @@ Introduction | |||
| 13 | data-sheet/users manual to find out the complete list. | 13 | data-sheet/users manual to find out the complete list. |
| 14 | 14 | ||
| 15 | 15 | ||
| 16 | GPIOLIB | ||
| 17 | ------- | ||
| 18 | |||
| 19 | With the event of the GPIOLIB in drivers/gpio, support for some | ||
| 20 | of the GPIO functions such as reading and writing a pin will | ||
| 21 | be removed in favour of this common access method. | ||
| 22 | |||
| 23 | Once all the extant drivers have been converted, the functions | ||
| 24 | listed below will be removed (they may be marked as __deprecated | ||
| 25 | in the near future). | ||
| 26 | |||
| 27 | - s3c2410_gpio_getpin | ||
| 28 | - s3c2410_gpio_setpin | ||
| 29 | |||
| 30 | |||
| 16 | Headers | 31 | Headers |
| 17 | ------- | 32 | ------- |
| 18 | 33 | ||
diff --git a/Documentation/arm/Samsung-S3C24XX/Overview.txt b/Documentation/arm/Samsung-S3C24XX/Overview.txt index 014a8ec4877d..cff6227b4484 100644 --- a/Documentation/arm/Samsung-S3C24XX/Overview.txt +++ b/Documentation/arm/Samsung-S3C24XX/Overview.txt | |||
| @@ -8,9 +8,10 @@ Introduction | |||
| 8 | 8 | ||
| 9 | The Samsung S3C24XX range of ARM9 System-on-Chip CPUs are supported | 9 | The Samsung S3C24XX range of ARM9 System-on-Chip CPUs are supported |
| 10 | by the 's3c2410' architecture of ARM Linux. Currently the S3C2410, | 10 | by the 's3c2410' architecture of ARM Linux. Currently the S3C2410, |
| 11 | S3C2412, S3C2413, S3C2440 and S3C2442 devices are supported. | 11 | S3C2412, S3C2413, S3C2440, S3C2442 and S3C2443 devices are supported. |
| 12 | |||
| 13 | Support for the S3C2400 and S3C24A0 series are in progress. | ||
| 12 | 14 | ||
| 13 | Support for the S3C2400 series is in progress. | ||
| 14 | 15 | ||
| 15 | Configuration | 16 | Configuration |
| 16 | ------------- | 17 | ------------- |
| @@ -38,6 +39,22 @@ Layout | |||
| 38 | Register, kernel and platform data definitions are held in the | 39 | Register, kernel and platform data definitions are held in the |
| 39 | arch/arm/mach-s3c2410 directory./include/mach | 40 | arch/arm/mach-s3c2410 directory./include/mach |
| 40 | 41 | ||
| 42 | arch/arm/plat-s3c24xx: | ||
| 43 | |||
| 44 | Files in here are either common to all the s3c24xx family, | ||
| 45 | or are common to only some of them with names to indicate this | ||
| 46 | status. The files that are not common to all are generally named | ||
| 47 | with the initial cpu they support in the series to ensure a short | ||
| 48 | name without any possibility of confusion with newer devices. | ||
| 49 | |||
| 50 | As an example, initially s3c244x would cover s3c2440 and s3c2442, but | ||
| 51 | with the s3c2443 which does not share many of the same drivers in | ||
| 52 | this directory, the name becomes invalid. We stick to s3c2440-<x> | ||
| 53 | to indicate a driver that is s3c2440 and s3c2442 compatible. | ||
| 54 | |||
| 55 | This does mean that to find the status of any given SoC, a number | ||
| 56 | of directories may need to be searched. | ||
| 57 | |||
| 41 | 58 | ||
| 42 | Machines | 59 | Machines |
| 43 | -------- | 60 | -------- |
| @@ -159,6 +176,17 @@ NAND | |||
| 159 | For more information see Documentation/arm/Samsung-S3C24XX/NAND.txt | 176 | For more information see Documentation/arm/Samsung-S3C24XX/NAND.txt |
| 160 | 177 | ||
| 161 | 178 | ||
| 179 | SD/MMC | ||
| 180 | ------ | ||
| 181 | |||
| 182 | The SD/MMC hardware pre S3C2443 is supported in the current | ||
| 183 | kernel, the driver is drivers/mmc/host/s3cmci.c and supports | ||
| 184 | 1 and 4 bit SD or MMC cards. | ||
| 185 | |||
| 186 | The SDIO behaviour of this driver has not been fully tested. There is no | ||
| 187 | current support for hardware SDIO interrupts. | ||
| 188 | |||
| 189 | |||
| 162 | Serial | 190 | Serial |
| 163 | ------ | 191 | ------ |
| 164 | 192 | ||
| @@ -178,6 +206,9 @@ GPIO | |||
| 178 | The core contains support for manipulating the GPIO, see the | 206 | The core contains support for manipulating the GPIO, see the |
| 179 | documentation in GPIO.txt in the same directory as this file. | 207 | documentation in GPIO.txt in the same directory as this file. |
| 180 | 208 | ||
| 209 | Newer kernels carry GPIOLIB, and support is being moved towards | ||
| 210 | this with some of the older support in line to be removed. | ||
| 211 | |||
| 181 | 212 | ||
| 182 | Clock Management | 213 | Clock Management |
| 183 | ---------------- | 214 | ---------------- |
diff --git a/Documentation/auxdisplay/Makefile b/Documentation/auxdisplay/Makefile new file mode 100644 index 000000000000..51fe23332c81 --- /dev/null +++ b/Documentation/auxdisplay/Makefile | |||
| @@ -0,0 +1,10 @@ | |||
| 1 | # kbuild trick to avoid linker error. Can be omitted if a module is built. | ||
| 2 | obj- := dummy.o | ||
| 3 | |||
| 4 | # List of programs to build | ||
| 5 | hostprogs-y := cfag12864b-example | ||
| 6 | |||
| 7 | # Tell kbuild to always build the programs | ||
| 8 | always := $(hostprogs-y) | ||
| 9 | |||
| 10 | HOSTCFLAGS_cfag12864b-example.o += -I$(objtree)/usr/include | ||
diff --git a/Documentation/connector/Makefile b/Documentation/connector/Makefile new file mode 100644 index 000000000000..8df1a7285a06 --- /dev/null +++ b/Documentation/connector/Makefile | |||
| @@ -0,0 +1,11 @@ | |||
| 1 | ifneq ($(CONFIG_CONNECTOR),) | ||
| 2 | obj-m += cn_test.o | ||
| 3 | endif | ||
| 4 | |||
| 5 | # List of programs to build | ||
| 6 | hostprogs-y := ucon | ||
| 7 | |||
| 8 | # Tell kbuild to always build the programs | ||
| 9 | always := $(hostprogs-y) | ||
| 10 | |||
| 11 | HOSTCFLAGS_ucon.o += -I$(objtree)/usr/include | ||
diff --git a/Documentation/cpu-hotplug.txt b/Documentation/cpu-hotplug.txt index ba0aacde94fb..94bbc27ddd4f 100644 --- a/Documentation/cpu-hotplug.txt +++ b/Documentation/cpu-hotplug.txt | |||
| @@ -59,15 +59,10 @@ apicid values in those tables for disabled apics. In the event BIOS doesn't | |||
| 59 | mark such hot-pluggable cpus as disabled entries, one could use this | 59 | mark such hot-pluggable cpus as disabled entries, one could use this |
| 60 | parameter "additional_cpus=x" to represent those cpus in the cpu_possible_map. | 60 | parameter "additional_cpus=x" to represent those cpus in the cpu_possible_map. |
| 61 | 61 | ||
| 62 | s390 uses the number of cpus it detects at IPL time to also the number of bits | ||
| 63 | in cpu_possible_map. If it is desired to add additional cpus at a later time | ||
| 64 | the number should be specified using this option or the possible_cpus option. | ||
| 65 | |||
| 66 | possible_cpus=n [s390 only] use this to set hotpluggable cpus. | 62 | possible_cpus=n [s390 only] use this to set hotpluggable cpus. |
| 67 | This option sets possible_cpus bits in | 63 | This option sets possible_cpus bits in |
| 68 | cpu_possible_map. Thus keeping the numbers of bits set | 64 | cpu_possible_map. Thus keeping the numbers of bits set |
| 69 | constant even if the machine gets rebooted. | 65 | constant even if the machine gets rebooted. |
| 70 | This option overrides additional_cpus. | ||
| 71 | 66 | ||
| 72 | CPU maps and such | 67 | CPU maps and such |
| 73 | ----------------- | 68 | ----------------- |
diff --git a/Documentation/devices.txt b/Documentation/devices.txt index e6244cde26e9..05c80645e4ee 100644 --- a/Documentation/devices.txt +++ b/Documentation/devices.txt | |||
| @@ -2560,9 +2560,6 @@ Your cooperation is appreciated. | |||
| 2560 | 96 = /dev/usb/hiddev0 1st USB HID device | 2560 | 96 = /dev/usb/hiddev0 1st USB HID device |
| 2561 | ... | 2561 | ... |
| 2562 | 111 = /dev/usb/hiddev15 16th USB HID device | 2562 | 111 = /dev/usb/hiddev15 16th USB HID device |
| 2563 | 112 = /dev/usb/auer0 1st auerswald ISDN device | ||
| 2564 | ... | ||
| 2565 | 127 = /dev/usb/auer15 16th auerswald ISDN device | ||
| 2566 | 128 = /dev/usb/brlvgr0 First Braille Voyager device | 2563 | 128 = /dev/usb/brlvgr0 First Braille Voyager device |
| 2567 | ... | 2564 | ... |
| 2568 | 131 = /dev/usb/brlvgr3 Fourth Braille Voyager device | 2565 | 131 = /dev/usb/brlvgr3 Fourth Braille Voyager device |
diff --git a/Documentation/dontdiff b/Documentation/dontdiff index 881e6dd03aea..27809357da58 100644 --- a/Documentation/dontdiff +++ b/Documentation/dontdiff | |||
| @@ -5,6 +5,8 @@ | |||
| 5 | *.css | 5 | *.css |
| 6 | *.dvi | 6 | *.dvi |
| 7 | *.eps | 7 | *.eps |
| 8 | *.fw.gen.S | ||
| 9 | *.fw | ||
| 8 | *.gif | 10 | *.gif |
| 9 | *.grep | 11 | *.grep |
| 10 | *.grp | 12 | *.grp |
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index 17cab3c74e8b..eb1a47b97427 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt | |||
| @@ -19,15 +19,6 @@ Who: Pavel Machek <pavel@suse.cz> | |||
| 19 | 19 | ||
| 20 | --------------------------- | 20 | --------------------------- |
| 21 | 21 | ||
| 22 | What: old NCR53C9x driver | ||
| 23 | When: October 2007 | ||
| 24 | Why: Replaced by the much better esp_scsi driver. Actual low-level | ||
| 25 | driver can be ported over almost trivially. | ||
| 26 | Who: David Miller <davem@davemloft.net> | ||
| 27 | Christoph Hellwig <hch@lst.de> | ||
| 28 | |||
| 29 | --------------------------- | ||
| 30 | |||
| 31 | What: Video4Linux API 1 ioctls and video_decoder.h from Video devices. | 22 | What: Video4Linux API 1 ioctls and video_decoder.h from Video devices. |
| 32 | When: December 2008 | 23 | When: December 2008 |
| 33 | Files: include/linux/video_decoder.h include/linux/videodev.h | 24 | Files: include/linux/video_decoder.h include/linux/videodev.h |
diff --git a/Documentation/filesystems/configfs/Makefile b/Documentation/filesystems/configfs/Makefile new file mode 100644 index 000000000000..be7ec5e67dbc --- /dev/null +++ b/Documentation/filesystems/configfs/Makefile | |||
| @@ -0,0 +1,3 @@ | |||
| 1 | ifneq ($(CONFIG_CONFIGFS_FS),) | ||
| 2 | obj-m += configfs_example_explicit.o configfs_example_macros.o | ||
| 3 | endif | ||
diff --git a/Documentation/filesystems/ext4.txt b/Documentation/filesystems/ext4.txt index 80e193d82e2e..0d5394920a31 100644 --- a/Documentation/filesystems/ext4.txt +++ b/Documentation/filesystems/ext4.txt | |||
| @@ -26,6 +26,12 @@ Mailing list: linux-ext4@vger.kernel.org | |||
| 26 | 26 | ||
| 27 | git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git | 27 | git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git |
| 28 | 28 | ||
| 29 | - Note that it is highly important to install the mke2fs.conf file | ||
| 30 | that comes with the e2fsprogs 1.41.x sources in /etc/mke2fs.conf. If | ||
| 31 | you have edited the /etc/mke2fs.conf file installed on your system, | ||
| 32 | you will need to merge your changes with the version from e2fsprogs | ||
| 33 | 1.41.x. | ||
| 34 | |||
| 29 | - Create a new filesystem using the ext4dev filesystem type: | 35 | - Create a new filesystem using the ext4dev filesystem type: |
| 30 | 36 | ||
| 31 | # mke2fs -t ext4dev /dev/hda1 | 37 | # mke2fs -t ext4dev /dev/hda1 |
diff --git a/Documentation/filesystems/ntfs.txt b/Documentation/filesystems/ntfs.txt index e79ee2db183a..ac2a261c5f7d 100644 --- a/Documentation/filesystems/ntfs.txt +++ b/Documentation/filesystems/ntfs.txt | |||
| @@ -40,7 +40,7 @@ Web site | |||
| 40 | ======== | 40 | ======== |
| 41 | 41 | ||
| 42 | There is plenty of additional information on the linux-ntfs web site | 42 | There is plenty of additional information on the linux-ntfs web site |
| 43 | at http://linux-ntfs.sourceforge.net/ | 43 | at http://www.linux-ntfs.org/ |
| 44 | 44 | ||
| 45 | The web site has a lot of additional information, such as a comprehensive | 45 | The web site has a lot of additional information, such as a comprehensive |
| 46 | FAQ, documentation on the NTFS on-disk format, information on the Linux-NTFS | 46 | FAQ, documentation on the NTFS on-disk format, information on the Linux-NTFS |
| @@ -272,7 +272,7 @@ And you would know that /dev/hda2 has a size of 37768814 - 4209030 + 1 = | |||
| 272 | For Win2k and later dynamic disks, you can for example use the ldminfo utility | 272 | For Win2k and later dynamic disks, you can for example use the ldminfo utility |
| 273 | which is part of the Linux LDM tools (the latest version at the time of | 273 | which is part of the Linux LDM tools (the latest version at the time of |
| 274 | writing is linux-ldm-0.0.8.tar.bz2). You can download it from: | 274 | writing is linux-ldm-0.0.8.tar.bz2). You can download it from: |
| 275 | http://linux-ntfs.sourceforge.net/downloads.html | 275 | http://www.linux-ntfs.org/ |
| 276 | Simply extract the downloaded archive (tar xvjf linux-ldm-0.0.8.tar.bz2), go | 276 | Simply extract the downloaded archive (tar xvjf linux-ldm-0.0.8.tar.bz2), go |
| 277 | into it (cd linux-ldm-0.0.8) and change to the test directory (cd test). You | 277 | into it (cd linux-ldm-0.0.8) and change to the test directory (cd test). You |
| 278 | will find the precompiled (i386) ldminfo utility there. NOTE: You will not be | 278 | will find the precompiled (i386) ldminfo utility there. NOTE: You will not be |
diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt index 64557821ee59..394eb2cc1c39 100644 --- a/Documentation/filesystems/proc.txt +++ b/Documentation/filesystems/proc.txt | |||
| @@ -1339,6 +1339,25 @@ Enables/Disables the protection of the per-process proc entries "maps" and | |||
| 1339 | "smaps". When enabled, the contents of these files are visible only to | 1339 | "smaps". When enabled, the contents of these files are visible only to |
| 1340 | readers that are allowed to ptrace() the given process. | 1340 | readers that are allowed to ptrace() the given process. |
| 1341 | 1341 | ||
| 1342 | msgmni | ||
| 1343 | ------ | ||
| 1344 | |||
| 1345 | Maximum number of message queue ids on the system. | ||
| 1346 | This value scales to the amount of lowmem. It is automatically recomputed | ||
| 1347 | upon memory add/remove or ipc namespace creation/removal. | ||
| 1348 | When a value is written into this file, msgmni's value becomes fixed, i.e. it | ||
| 1349 | is not recomputed anymore when one of the above events occurs. | ||
| 1350 | Use auto_msgmni to change this behavior. | ||
| 1351 | |||
| 1352 | auto_msgmni | ||
| 1353 | ----------- | ||
| 1354 | |||
| 1355 | Enables/Disables automatic recomputing of msgmni upon memory add/remove or | ||
| 1356 | upon ipc namespace creation/removal (see the msgmni description above). | ||
| 1357 | Echoing "1" into this file enables msgmni automatic recomputing. | ||
| 1358 | Echoing "0" turns it off. | ||
| 1359 | auto_msgmni default value is 1. | ||
| 1360 | |||
| 1342 | 1361 | ||
| 1343 | 2.4 /proc/sys/vm - The virtual memory subsystem | 1362 | 2.4 /proc/sys/vm - The virtual memory subsystem |
| 1344 | ----------------------------------------------- | 1363 | ----------------------------------------------- |
diff --git a/Documentation/filesystems/quota.txt b/Documentation/filesystems/quota.txt index a590c4093eff..5e8de25bf0f1 100644 --- a/Documentation/filesystems/quota.txt +++ b/Documentation/filesystems/quota.txt | |||
| @@ -3,14 +3,14 @@ Quota subsystem | |||
| 3 | =============== | 3 | =============== |
| 4 | 4 | ||
| 5 | Quota subsystem allows system administrator to set limits on used space and | 5 | Quota subsystem allows system administrator to set limits on used space and |
| 6 | number of used inodes (inode is a filesystem structure which is associated | 6 | number of used inodes (inode is a filesystem structure which is associated with |
| 7 | with each file or directory) for users and/or groups. For both used space and | 7 | each file or directory) for users and/or groups. For both used space and number |
| 8 | number of used inodes there are actually two limits. The first one is called | 8 | of used inodes there are actually two limits. The first one is called softlimit |
| 9 | softlimit and the second one hardlimit. An user can never exceed a hardlimit | 9 | and the second one hardlimit. An user can never exceed a hardlimit for any |
| 10 | for any resource. User is allowed to exceed softlimit but only for limited | 10 | resource (unless he has CAP_SYS_RESOURCE capability). User is allowed to exceed |
| 11 | period of time. This period is called "grace period" or "grace time". When | 11 | softlimit but only for limited period of time. This period is called "grace |
| 12 | grace time is over, user is not able to allocate more space/inodes until he | 12 | period" or "grace time". When grace time is over, user is not able to allocate |
| 13 | frees enough of them to get below softlimit. | 13 | more space/inodes until he frees enough of them to get below softlimit. |
| 14 | 14 | ||
| 15 | Quota limits (and amount of grace time) are set independently for each | 15 | Quota limits (and amount of grace time) are set independently for each |
| 16 | filesystem. | 16 | filesystem. |
| @@ -53,6 +53,12 @@ in parentheses): | |||
| 53 | QUOTA_NL_BSOFTLONGWARN - space (block) softlimit is exceeded | 53 | QUOTA_NL_BSOFTLONGWARN - space (block) softlimit is exceeded |
| 54 | longer than given grace period. | 54 | longer than given grace period. |
| 55 | QUOTA_NL_BSOFTWARN - space (block) softlimit | 55 | QUOTA_NL_BSOFTWARN - space (block) softlimit |
| 56 | - four warnings are also defined for the event when user stops | ||
| 57 | exceeding some limit: | ||
| 58 | QUOTA_NL_IHARDBELOW - inode hardlimit | ||
| 59 | QUOTA_NL_ISOFTBELOW - inode softlimit | ||
| 60 | QUOTA_NL_BHARDBELOW - space (block) hardlimit | ||
| 61 | QUOTA_NL_BSOFTBELOW - space (block) softlimit | ||
| 56 | QUOTA_NL_A_DEV_MAJOR (u32) | 62 | QUOTA_NL_A_DEV_MAJOR (u32) |
| 57 | - major number of a device with the affected filesystem | 63 | - major number of a device with the affected filesystem |
| 58 | QUOTA_NL_A_DEV_MINOR (u32) | 64 | QUOTA_NL_A_DEV_MINOR (u32) |
diff --git a/Documentation/filesystems/ubifs.txt b/Documentation/filesystems/ubifs.txt index 540e9e7f59c5..6a0d70a22f05 100644 --- a/Documentation/filesystems/ubifs.txt +++ b/Documentation/filesystems/ubifs.txt | |||
| @@ -57,7 +57,7 @@ Similarly to JFFS2, UBIFS supports on-the-flight compression which makes | |||
| 57 | it possible to fit quite a lot of data to the flash. | 57 | it possible to fit quite a lot of data to the flash. |
| 58 | 58 | ||
| 59 | Similarly to JFFS2, UBIFS is tolerant of unclean reboots and power-cuts. | 59 | Similarly to JFFS2, UBIFS is tolerant of unclean reboots and power-cuts. |
| 60 | It does not need stuff like ckfs.ext2. UBIFS automatically replays its | 60 | It does not need stuff like fsck.ext2. UBIFS automatically replays its |
| 61 | journal and recovers from crashes, ensuring that the on-flash data | 61 | journal and recovers from crashes, ensuring that the on-flash data |
| 62 | structures are consistent. | 62 | structures are consistent. |
| 63 | 63 | ||
diff --git a/Documentation/hwmon/ibmaem b/Documentation/hwmon/ibmaem index 2fefaf582a43..e98bdfea3467 100644 --- a/Documentation/hwmon/ibmaem +++ b/Documentation/hwmon/ibmaem | |||
| @@ -1,8 +1,11 @@ | |||
| 1 | Kernel driver ibmaem | 1 | Kernel driver ibmaem |
| 2 | ====================== | 2 | ====================== |
| 3 | 3 | ||
| 4 | This driver talks to the IBM Systems Director Active Energy Manager, known | ||
| 5 | henceforth as AEM. | ||
| 6 | |||
| 4 | Supported systems: | 7 | Supported systems: |
| 5 | * Any recent IBM System X server with Active Energy Manager support. | 8 | * Any recent IBM System X server with AEM support. |
| 6 | This includes the x3350, x3550, x3650, x3655, x3755, x3850 M2, | 9 | This includes the x3350, x3550, x3650, x3655, x3755, x3850 M2, |
| 7 | x3950 M2, and certain HS2x/LS2x/QS2x blades. The IPMI host interface | 10 | x3950 M2, and certain HS2x/LS2x/QS2x blades. The IPMI host interface |
| 8 | driver ("ipmi-si") needs to be loaded for this driver to do anything. | 11 | driver ("ipmi-si") needs to be loaded for this driver to do anything. |
| @@ -14,24 +17,22 @@ Author: Darrick J. Wong | |||
| 14 | Description | 17 | Description |
| 15 | ----------- | 18 | ----------- |
| 16 | 19 | ||
| 17 | This driver implements sensor reading support for the energy and power | 20 | This driver implements sensor reading support for the energy and power meters |
| 18 | meters available on various IBM System X hardware through the BMC. All | 21 | available on various IBM System X hardware through the BMC. All sensor banks |
| 19 | sensor banks will be exported as platform devices; this driver can talk | 22 | will be exported as platform devices; this driver can talk to both v1 and v2 |
| 20 | to both v1 and v2 interfaces. This driver is completely separate from the | 23 | interfaces. This driver is completely separate from the older ibmpex driver. |
| 21 | older ibmpex driver. | ||
| 22 | 24 | ||
| 23 | The v1 AEM interface has a simple set of features to monitor energy use. | 25 | The v1 AEM interface has a simple set of features to monitor energy use. There |
| 24 | There is a register that displays an estimate of raw energy consumption | 26 | is a register that displays an estimate of raw energy consumption since the |
| 25 | since the last BMC reset, and a power sensor that returns average power | 27 | last BMC reset, and a power sensor that returns average power use over a |
| 26 | use over a configurable interval. | 28 | configurable interval. |
| 27 | 29 | ||
| 28 | The v2 AEM interface is a bit more sophisticated, being able to present | 30 | The v2 AEM interface is a bit more sophisticated, being able to present a wider |
| 29 | a wider range of energy and power use registers, the power cap as | 31 | range of energy and power use registers, the power cap as set by the AEM |
| 30 | set by the AEM software, and temperature sensors. | 32 | software, and temperature sensors. |
| 31 | 33 | ||
| 32 | Special Features | 34 | Special Features |
| 33 | ---------------- | 35 | ---------------- |
| 34 | 36 | ||
| 35 | The "power_cap" value displays the current system power cap, as set by | 37 | The "power_cap" value displays the current system power cap, as set by the AEM |
| 36 | the Active Energy Manager software. Setting the power cap from the host | 38 | software. Setting the power cap from the host is not currently supported. |
| 37 | is not currently supported. | ||
diff --git a/Documentation/ia64/Makefile b/Documentation/ia64/Makefile new file mode 100644 index 000000000000..b75db69ec483 --- /dev/null +++ b/Documentation/ia64/Makefile | |||
| @@ -0,0 +1,8 @@ | |||
| 1 | # kbuild trick to avoid linker error. Can be omitted if a module is built. | ||
| 2 | obj- := dummy.o | ||
| 3 | |||
| 4 | # List of programs to build | ||
| 5 | hostprogs-y := aliasing-test | ||
| 6 | |||
| 7 | # Tell kbuild to always build the programs | ||
| 8 | always := $(hostprogs-y) | ||
diff --git a/Documentation/ioctl-number.txt b/Documentation/ioctl-number.txt index 3bb5f466a90d..1c6b545635a2 100644 --- a/Documentation/ioctl-number.txt +++ b/Documentation/ioctl-number.txt | |||
| @@ -105,7 +105,6 @@ Code Seq# Include File Comments | |||
| 105 | 'T' all linux/soundcard.h conflict! | 105 | 'T' all linux/soundcard.h conflict! |
| 106 | 'T' all asm-i386/ioctls.h conflict! | 106 | 'T' all asm-i386/ioctls.h conflict! |
| 107 | 'U' 00-EF linux/drivers/usb/usb.h | 107 | 'U' 00-EF linux/drivers/usb/usb.h |
| 108 | 'U' F0-FF drivers/usb/auerswald.c | ||
| 109 | 'V' all linux/vt.h | 108 | 'V' all linux/vt.h |
| 110 | 'W' 00-1F linux/watchdog.h conflict! | 109 | 'W' 00-1F linux/watchdog.h conflict! |
| 111 | 'W' 00-1F linux/wanrouter.h conflict! | 110 | 'W' 00-1F linux/wanrouter.h conflict! |
diff --git a/Documentation/ja_JP/HOWTO b/Documentation/ja_JP/HOWTO index 488c77fa3aae..0775cf4798b2 100644 --- a/Documentation/ja_JP/HOWTO +++ b/Documentation/ja_JP/HOWTO | |||
| @@ -11,14 +11,14 @@ for non English (read: Japanese) speakers and is not intended as a | |||
| 11 | fork. So if you have any comments or updates for this file, please try | 11 | fork. So if you have any comments or updates for this file, please try |
| 12 | to update the original English file first. | 12 | to update the original English file first. |
| 13 | 13 | ||
| 14 | Last Updated: 2007/11/16 | 14 | Last Updated: 2008/08/21 |
| 15 | ================================== | 15 | ================================== |
| 16 | ã“ã‚Œã¯ã€ | 16 | ã“ã‚Œã¯ã€ |
| 17 | linux-2.6.24/Documentation/HOWTO | 17 | linux-2.6.27/Documentation/HOWTO |
| 18 | ã®å’Œè¨³ã§ã™ã€‚ | 18 | ã®å’Œè¨³ã§ã™ã€‚ |
| 19 | 19 | ||
| 20 | 翻訳団体： JF プãƒã‚¸ã‚§ã‚¯ãƒˆ < http://www.linux.or.jp/JF/ > | 20 | 翻訳団体： JF プãƒã‚¸ã‚§ã‚¯ãƒˆ < http://www.linux.or.jp/JF/ > |
| 21 | 翻訳日： 2007/11/10 | 21 | 翻訳日： 2008/8/5 |
| 22 | 翻訳者： Tsugikazu Shibata <tshibata at ab dot jp dot nec dot com> | 22 | 翻訳者： Tsugikazu Shibata <tshibata at ab dot jp dot nec dot com> |
| 23 | æ ¡æ£è€…： æ¾å€‰ã•ã‚“ <nbh--mats at nifty dot com> | 23 | æ ¡æ£è€…： æ¾å€‰ã•ã‚“ <nbh--mats at nifty dot com> |
| 24 | å°æž— é›…å…¸ã•ã‚“ (Masanori Kobayasi) <zap03216 at nifty dot ne dot jp> | 24 | å°æž— é›…å…¸ã•ã‚“ (Masanori Kobayasi) <zap03216 at nifty dot ne dot jp> |
| @@ -287,13 +287,15 @@ Linux カーãƒãƒ«ã®é–‹ç™ºãƒ—ãƒã‚»ã‚¹ã¯ç¾åœ¨å¹¾ã¤ã‹ã®ç•°ãªã‚‹ãƒ¡ã‚¤ãƒ³ã‚ | |||
| 287 | ã«å®‰å®šã—ãŸçŠ¶æ…‹ã«ã‚ã‚‹ã¨åˆ¤æ–ã—ãŸã¨ãã«ãƒªãƒªãƒ¼ã‚¹ã•ã‚Œã¾ã™ã€‚目標ã¯æ¯Žé€±æ–° | 287 | ã«å®‰å®šã—ãŸçŠ¶æ…‹ã«ã‚ã‚‹ã¨åˆ¤æ–ã—ãŸã¨ãã«ãƒªãƒªãƒ¼ã‚¹ã•ã‚Œã¾ã™ã€‚目標ã¯æ¯Žé€±æ–° |
| 288 | ã—ã„ -rc カーãƒãƒ«ã‚’リリースã™ã‚‹ã“ã¨ã§ã™ã€‚ | 288 | ã—ã„ -rc カーãƒãƒ«ã‚’リリースã™ã‚‹ã“ã¨ã§ã™ã€‚ |
| 289 | 289 | ||
| 290 | - 以下㮠URL ã§å„ -rc リリースã«å˜åœ¨ã™ã‚‹æ—¢çŸ¥ã®å¾Œæˆ»ã‚Šå•é¡Œã®ãƒªã‚¹ãƒˆ | ||
| 291 | ãŒè¿½è·¡ã•ã‚Œã¾ã™- | ||
| 292 | http://kernelnewbies.org/known_regressions | ||
| 293 | |||
| 294 | - ã“ã®ãƒ—ãƒã‚»ã‚¹ã¯ã‚«ãƒ¼ãƒãƒ«ãŒ 「準備ãŒã§ããŸã€ã¨è€ƒãˆã‚‰ã‚Œã‚‹ã¾ã§ç¶™ç¶šã—ã¾ | 290 | - ã“ã®ãƒ—ãƒã‚»ã‚¹ã¯ã‚«ãƒ¼ãƒãƒ«ãŒ 「準備ãŒã§ããŸã€ã¨è€ƒãˆã‚‰ã‚Œã‚‹ã¾ã§ç¶™ç¶šã—ã¾ |
| 295 | ã™ã€‚ã“ã®ãƒ—ãƒã‚»ã‚¹ã¯ã ã„ãŸã„ 6週間継続ã—ã¾ã™ã€‚ | 291 | ã™ã€‚ã“ã®ãƒ—ãƒã‚»ã‚¹ã¯ã ã„ãŸã„ 6週間継続ã—ã¾ã™ã€‚ |
| 296 | 292 | ||
| 293 | - å„リリースã§ã®æ—¢çŸ¥ã®å¾Œæˆ»ã‚Šå•é¡Œ(regression: ã“ã®ãƒªãƒªãƒ¼ã‚¹ã®ä¸ã§æ–°è¦ | ||
| 294 | ã«ä½œã‚Šè¾¼ã¾ã‚ŒãŸå•é¡Œã‚’指ã™) ã¯ãã®éƒ½åº¦ Linux-kernel メーリングリスト | ||
| 295 | ã«æŠ•ç¨¿ã•ã‚Œã¾ã™ã€‚ゴールã¨ã—ã¦ã¯ã€ã‚«ãƒ¼ãƒãƒ«ãŒ 「準備ãŒã§ããŸã€ã¨å®£è¨€ | ||
| 296 | ã™ã‚‹å‰ã«ã“ã®ãƒªã‚¹ãƒˆã®é•·ã•ã‚’ゼãƒã«æ¸›ã‚‰ã™ã“ã¨ã§ã™ãŒã€ç¾å®Ÿã«ã¯ã€æ•°å€‹ã® | ||
| 297 | 後戻りå•é¡ŒãŒãƒªãƒªãƒ¼ã‚¹æ™‚ã«ãŸã³ãŸã³æ®‹ã£ã¦ã—ã¾ã„ã¾ã™ã€‚ | ||
| 298 | |||
| 297 | Andrew Morton ㌠Linux-kernel メーリングリストã«ã‚«ãƒ¼ãƒãƒ«ãƒªãƒªãƒ¼ã‚¹ã«ã¤ã„ | 299 | Andrew Morton ㌠Linux-kernel メーリングリストã«ã‚«ãƒ¼ãƒãƒ«ãƒªãƒªãƒ¼ã‚¹ã«ã¤ã„ |
| 298 | ã¦æ›¸ã„ãŸã“ã¨ã‚’ã“ã“ã§è¨€ã£ã¦ãŠãã“ã¨ã¯ä¾¡å€¤ãŒã‚ã‚Šã¾ã™- | 300 | ã¦æ›¸ã„ãŸã“ã¨ã‚’ã“ã“ã§è¨€ã£ã¦ãŠãã“ã¨ã¯ä¾¡å€¤ãŒã‚ã‚Šã¾ã™- |
| 299 | 「カーãƒãƒ«ãŒã„ã¤ãƒªãƒªãƒ¼ã‚¹ã•ã‚Œã‚‹ã‹ã¯èª°ã‚‚知りã¾ã›ã‚“。ãªãœãªã‚‰ã€ã“ã‚Œã¯ç¾ | 301 | 「カーãƒãƒ«ãŒã„ã¤ãƒªãƒªãƒ¼ã‚¹ã•ã‚Œã‚‹ã‹ã¯èª°ã‚‚知りã¾ã›ã‚“。ãªãœãªã‚‰ã€ã“ã‚Œã¯ç¾ |
| @@ -303,18 +305,20 @@ Andrew Morton ㌠Linux-kernel メーリングリストã«ã‚«ãƒ¼ãƒãƒ«ãƒªãƒªãƒ¼ã | |||
| 303 | 2.6.x.y -stable カーãƒãƒ«ãƒ„リー | 305 | 2.6.x.y -stable カーãƒãƒ«ãƒ„リー |
| 304 | --------------------------- | 306 | --------------------------- |
| 305 | 307 | ||
| 306 | ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã«4ã¤ç›®ã®æ•°å—ãŒã¤ã„ãŸã‚«ãƒ¼ãƒãƒ«ã¯ -stable カーãƒãƒ«ã§ã™ã€‚ã“れ㫠| 308 | ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç•ªå·ãŒ4ã¤ã®æ•°å—ã«åˆ†ã‹ã‚Œã¦ã„るカーãƒãƒ«ã¯ -stable カーãƒãƒ«ã§ã™ã€‚ |
| 307 | ã¯ã€2.6.x カーãƒãƒ«ã§è¦‹ã¤ã‹ã£ãŸã‚»ã‚ュリティå•é¡Œã‚„é‡å¤§ãªå¾Œæˆ»ã‚Šã«å¯¾ã™ã‚‹æ¯” | 309 | ã“ã‚Œã«ã¯ã€2.6.x カーãƒãƒ«ã§è¦‹ã¤ã‹ã£ãŸã‚»ã‚ュリティå•é¡Œã‚„é‡å¤§ãªå¾Œæˆ»ã‚Šã«å¯¾ |
| 308 | 較的å°ã•ã„é‡è¦ãªä¿®æ£ãŒå«ã¾ã‚Œã¾ã™ã€‚ | 310 | ã™ã‚‹æ¯”較的å°ã•ã„é‡è¦ãªä¿®æ£ãŒå«ã¾ã‚Œã¾ã™ã€‚ |
| 309 | 311 | ||
| 310 | ã“ã‚Œã¯ã€é–‹ç™º/実験的ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ãƒ†ã‚¹ãƒˆã«å”力ã™ã‚‹ã“ã¨ã«èˆˆå‘³ãŒç„¡ã〠| 312 | ã“ã‚Œã¯ã€é–‹ç™º/実験的ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ãƒ†ã‚¹ãƒˆã«å”力ã™ã‚‹ã“ã¨ã«èˆˆå‘³ãŒç„¡ã〠|
| 311 | 最新ã®å®‰å®šã—ãŸã‚«ãƒ¼ãƒãƒ«ã‚’使ã„ãŸã„ユーザã«æŽ¨å¥¨ã™ã‚‹ãƒ–ランãƒã§ã™ã€‚ | 313 | 最新ã®å®‰å®šã—ãŸã‚«ãƒ¼ãƒãƒ«ã‚’使ã„ãŸã„ユーザã«æŽ¨å¥¨ã™ã‚‹ãƒ–ランãƒã§ã™ã€‚ |
| 312 | 314 | ||
| 313 | ã‚‚ã—ã€2.6.x.y カーãƒãƒ«ãŒå˜åœ¨ã—ãªã„å ´åˆã«ã¯ã€ç•ªå·ãŒä¸€ç•ªå¤§ãã„ 2.6.x | 315 | ã‚‚ã—ã€2.6.x.y カーãƒãƒ«ãŒå˜åœ¨ã—ãªã„å ´åˆã«ã¯ã€ç•ªå·ãŒä¸€ç•ªå¤§ãã„ 2.6.x ㌠|
| 314 | ãŒæœ€æ–°ã®å®‰å®šç‰ˆã‚«ãƒ¼ãƒãƒ«ã§ã™ã€‚ | 316 | 最新ã®å®‰å®šç‰ˆã‚«ãƒ¼ãƒãƒ«ã§ã™ã€‚ |
| 315 | 317 | ||
| 316 | 2.6.x.y 㯠"stable" ãƒãƒ¼ãƒ <stable@kernel.org> ã§ãƒ¡ãƒ³ãƒ†ã•ã‚Œã¦ãŠã‚Šã€ã | 318 | 2.6.x.y 㯠"stable" ãƒãƒ¼ãƒ <stable@kernel.org> ã§ãƒ¡ãƒ³ãƒ†ã•ã‚Œã¦ãŠã‚Šã€å¿… |
| 317 | ã„ãŸã„隔週ã§ãƒªãƒªãƒ¼ã‚¹ã•ã‚Œã¦ã„ã¾ã™ã€‚ | 319 | è¦ã«å¿œã˜ã¦ãƒªãƒªãƒ¼ã‚¹ã•ã‚Œã¾ã™ã€‚通常ã®ãƒªãƒªãƒ¼ã‚¹æœŸé–“㯠2週間毎ã§ã™ãŒã€å·®ã—迫㣠|
| 320 | ãŸå•é¡ŒãŒãªã‘ã‚Œã°ã‚‚ã†å°‘ã—é•·ããªã‚‹ã“ã¨ã‚‚ã‚ã‚Šã¾ã™ã€‚ã‚»ã‚ュリティ関連ã®å•é¡Œ | ||
| 321 | ã®å ´åˆã¯ã“ã‚Œã«å¯¾ã—ã¦ã ã„ãŸã„ã®å ´åˆã€ã™ãã«ãƒªãƒªãƒ¼ã‚¹ãŒã•ã‚Œã¾ã™ã€‚ | ||
| 318 | 322 | ||
| 319 | カーãƒãƒ«ãƒ„リーã«å…¥ã£ã¦ã„ã‚‹ã€Documentation/stable_kernel_rules.txt ファ | 323 | カーãƒãƒ«ãƒ„リーã«å…¥ã£ã¦ã„ã‚‹ã€Documentation/stable_kernel_rules.txt ファ |
| 320 | イルã«ã¯ã©ã®ã‚ˆã†ãªç¨®é¡žã®å¤‰æ›´ãŒ -stable ツリーã«å—ã‘入れå¯èƒ½ã‹ã€ã¾ãŸãƒª | 324 | イルã«ã¯ã©ã®ã‚ˆã†ãªç¨®é¡žã®å¤‰æ›´ãŒ -stable ツリーã«å—ã‘入れå¯èƒ½ã‹ã€ã¾ãŸãƒª |
| @@ -341,7 +345,9 @@ linux-kernel メーリングリストã§åŽé›†ã•ã‚ŒãŸå¤šæ•°ã®ãƒ‘ッãƒã¨åŒæ | |||
| 341 | メインラインã¸å…¥ã‚Œã‚‹ã‚ˆã†ã« Linus ã«ãƒ—ッシュã—ã¾ã™ã€‚ | 345 | メインラインã¸å…¥ã‚Œã‚‹ã‚ˆã†ã« Linus ã«ãƒ—ッシュã—ã¾ã™ã€‚ |
| 342 | 346 | ||
| 343 | メインカーãƒãƒ«ãƒ„リーã«å«ã‚ã‚‹ãŸã‚ã« Linus ã«é€ã‚‹å‰ã«ã€ã™ã¹ã¦ã®æ–°ã—ã„パッ | 347 | メインカーãƒãƒ«ãƒ„リーã«å«ã‚ã‚‹ãŸã‚ã« Linus ã«é€ã‚‹å‰ã«ã€ã™ã¹ã¦ã®æ–°ã—ã„パッ |
| 344 | ãƒãŒ -mm ツリーã§ãƒ†ã‚¹ãƒˆã•ã‚Œã‚‹ã“ã¨ãŒå¼·ã推奨ã•ã‚Œã¾ã™ã€‚ | 348 | ãƒãŒ -mm ツリーã§ãƒ†ã‚¹ãƒˆã•ã‚Œã‚‹ã“ã¨ãŒå¼·ã推奨ã•ã‚Œã¦ã„ã¾ã™ã€‚マージウィン |
| 349 | ドウãŒé–‹ãå‰ã« -mm ツリーã«ç¾ã‚Œãªã‹ã£ãŸãƒ‘ッãƒã¯ãƒ¡ã‚¤ãƒ³ãƒ©ã‚¤ãƒ³ã«ãƒžãƒ¼ã‚¸ã• | ||
| 350 | れるã“ã¨ã¯å›°é›£ã«ãªã‚Šã¾ã™ã€‚ | ||
| 345 | 351 | ||
| 346 | ã“れらã®ã‚«ãƒ¼ãƒãƒ«ã¯å®‰å®šã—ã¦å‹•ä½œã™ã¹ãシステムã¨ã—ã¦ä½¿ã†ã®ã«ã¯é©åˆ‡ã§ã¯ã‚ | 352 | ã“れらã®ã‚«ãƒ¼ãƒãƒ«ã¯å®‰å®šã—ã¦å‹•ä½œã™ã¹ãシステムã¨ã—ã¦ä½¿ã†ã®ã«ã¯é©åˆ‡ã§ã¯ã‚ |
| 347 | ã‚Šã¾ã›ã‚“ã—ã€ã‚«ãƒ¼ãƒãƒ«ãƒ–ランãƒã®ä¸ã§ã‚‚ã‚‚ã£ã¨ã‚‚動作ã«ãƒªã‚¹ã‚¯ãŒé«˜ã„ã‚‚ã®ã§ã™ã€‚ | 353 | ã‚Šã¾ã›ã‚“ã—ã€ã‚«ãƒ¼ãƒãƒ«ãƒ–ランãƒã®ä¸ã§ã‚‚ã‚‚ã£ã¨ã‚‚動作ã«ãƒªã‚¹ã‚¯ãŒé«˜ã„ã‚‚ã®ã§ã™ã€‚ |
| @@ -395,13 +401,15 @@ linux-kernel メーリングリストã§åŽé›†ã•ã‚ŒãŸå¤šæ•°ã®ãƒ‘ッãƒã¨åŒæ | |||
| 395 | - pcmcia, Dominik Brodowski <linux@dominikbrodowski.net> | 401 | - pcmcia, Dominik Brodowski <linux@dominikbrodowski.net> |
| 396 | git.kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git | 402 | git.kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git |
| 397 | 403 | ||
| 398 | - SCSI, James Bottomley <James.Bottomley@SteelEye.com> | 404 | - SCSI, James Bottomley <James.Bottomley@hansenpartnership.com> |
| 399 | git.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git | 405 | git.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git |
| 400 | 406 | ||
| 407 | - x86, Ingo Molnar <mingo@elte.hu> | ||
| 408 | git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git | ||
| 409 | |||
| 401 | quilt ツリー- | 410 | quilt ツリー- |
| 402 | - USB, PCI ドライãƒã‚³ã‚¢ã¨ I2C, Greg Kroah-Hartman <gregkh@suse.de> | 411 | - USB, ドライãƒã‚³ã‚¢ã¨ I2C, Greg Kroah-Hartman <gregkh@suse.de> |
| 403 | kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/ | 412 | kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/ |
| 404 | - x86-64 㨠i386 ã®ä»²é–“ Andi Kleen <ak@suse.de> | ||
| 405 | 413 | ||
| 406 | ãã®ä»–ã®ã‚«ãƒ¼ãƒãƒ«ãƒ„リー㯠http://git.kernel.org/ 㨠MAINTAINERS ファ | 414 | ãã®ä»–ã®ã‚«ãƒ¼ãƒãƒ«ãƒ„リー㯠http://git.kernel.org/ 㨠MAINTAINERS ファ |
| 407 | イルã«ä¸€è¦§è¡¨ãŒã‚ã‚Šã¾ã™ã€‚ | 415 | イルã«ä¸€è¦§è¡¨ãŒã‚ã‚Šã¾ã™ã€‚ |
| @@ -412,13 +420,32 @@ linux-kernel メーリングリストã§åŽé›†ã•ã‚ŒãŸå¤šæ•°ã®ãƒ‘ッãƒã¨åŒæ | |||
| 412 | bugzilla.kernel.org 㯠Linux カーãƒãƒ«é–‹ç™ºè€…ãŒã‚«ãƒ¼ãƒãƒ«ã®ãƒã‚°ã‚’追跡ã™ã‚‹ | 420 | bugzilla.kernel.org 㯠Linux カーãƒãƒ«é–‹ç™ºè€…ãŒã‚«ãƒ¼ãƒãƒ«ã®ãƒã‚°ã‚’追跡ã™ã‚‹ |
| 413 | å ´æ‰€ã§ã™ã€‚ユーザã¯è¦‹ã¤ã‘ãŸãƒã‚°ã®å…¨ã¦ã‚’ã“ã®ãƒ„ールã§å ±å‘Šã™ã¹ãã§ã™ã€‚ | 421 | å ´æ‰€ã§ã™ã€‚ユーザã¯è¦‹ã¤ã‘ãŸãƒã‚°ã®å…¨ã¦ã‚’ã“ã®ãƒ„ールã§å ±å‘Šã™ã¹ãã§ã™ã€‚ |
| 414 | ã©ã† kernel bugzilla を使ã†ã‹ã®è©³ç´°ã¯ã€ä»¥ä¸‹ã‚’å‚ç…§ã—ã¦ãã ã•ã„- | 422 | ã©ã† kernel bugzilla を使ã†ã‹ã®è©³ç´°ã¯ã€ä»¥ä¸‹ã‚’å‚ç…§ã—ã¦ãã ã•ã„- |
| 415 | http://test.kernel.org/bugzilla/faq.html | 423 | http://bugzilla.kernel.org/page.cgi?id=faq.html |
| 416 | |||
| 417 | メインカーãƒãƒ«ã‚½ãƒ¼ã‚¹ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã«ã‚るファイル REPORTING-BUGS ã¯ã‚«ãƒ¼ãƒ | 424 | メインカーãƒãƒ«ã‚½ãƒ¼ã‚¹ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã«ã‚るファイル REPORTING-BUGS ã¯ã‚«ãƒ¼ãƒ |
| 418 | ルãƒã‚°ã‚‰ã—ã„ã‚‚ã®ã«ã¤ã„ã¦ã©ã†ãƒ¬ãƒãƒ¼ãƒˆã™ã‚‹ã‹ã®è‰¯ã„テンプレートã§ã‚ã‚Šã€å• | 425 | ルãƒã‚°ã‚‰ã—ã„ã‚‚ã®ã«ã¤ã„ã¦ã©ã†ãƒ¬ãƒãƒ¼ãƒˆã™ã‚‹ã‹ã®è‰¯ã„テンプレートã§ã‚ã‚Šã€å• |
| 419 | é¡Œã®è¿½è·¡ã‚’助ã‘ã‚‹ãŸã‚ã«ã‚«ãƒ¼ãƒãƒ«é–‹ç™ºè€…ã«ã¨ã£ã¦ã©ã‚“ãªæƒ…å ±ãŒå¿…è¦ãªã®ã‹ã®è©³ | 426 | é¡Œã®è¿½è·¡ã‚’助ã‘ã‚‹ãŸã‚ã«ã‚«ãƒ¼ãƒãƒ«é–‹ç™ºè€…ã«ã¨ã£ã¦ã©ã‚“ãªæƒ…å ±ãŒå¿…è¦ãªã®ã‹ã®è©³ |
| 420 | ç´°ãŒæ›¸ã‹ã‚Œã¦ã„ã¾ã™ã€‚ | 427 | ç´°ãŒæ›¸ã‹ã‚Œã¦ã„ã¾ã™ã€‚ |
| 421 | 428 | ||
| 429 | ãƒã‚°ãƒ¬ãƒãƒ¼ãƒˆã®ç®¡ç† | ||
| 430 | ------------------- | ||
| 431 | |||
| 432 | ã‚ãªãŸã®ãƒãƒƒã‚ングã®ã‚¹ã‚ルを訓練ã™ã‚‹æœ€é«˜ã®æ–¹æ³•ã®ã²ã¨ã¤ã«ã€ä»–人ãŒãƒ¬ãƒãƒ¼ | ||
| 433 | トã—ãŸãƒã‚°ã‚’ä¿®æ£ã™ã‚‹ã“ã¨ãŒã‚ã‚Šã¾ã™ã€‚ã‚ãªãŸãŒã‚«ãƒ¼ãƒãƒ«ã‚’より安定化ã•ã›ã‚‹ | ||
| 434 | ã“ã«å¯„与ã™ã‚‹ã¨ã„ã†ã“ã¨ã ã‘ã§ãªãã€ã‚ãªãŸã¯ ç¾å®Ÿã®å•é¡Œã‚’ä¿®æ£ã™ã‚‹ã“ã¨ã‚’ | ||
| 435 | å¦ã³ã€è‡ªåˆ†ã®ã‚¹ã‚ルも強化ã§ãã€ã¾ãŸä»–ã®é–‹ç™ºè€…ãŒã‚ãªãŸã®å˜åœ¨ã«æ°—ãŒã¤ã | ||
| 436 | ã¾ã™ã€‚ãƒã‚°ã‚’ä¿®æ£ã™ã‚‹ã“ã¨ã¯ã€å¤šãã®é–‹ç™ºè€…ã®ä¸ã‹ã‚‰è‡ªåˆ†ãŒåŠŸç¸¾ã‚’ã‚ã’る最善 | ||
| 437 | ã®é“ã§ã™ã€ãªãœãªã‚‰å¤šãã®äººã¯ä»–人ã®ãƒã‚°ã®ä¿®æ£ã«æ™‚間を浪費ã™ã‚‹ã“ã¨ã‚’好㾠| ||
| 438 | ãªã„ã‹ã‚‰ã§ã™ã€‚ | ||
| 439 | |||
| 440 | ã™ã§ã«ãƒ¬ãƒãƒ¼ãƒˆã•ã‚ŒãŸãƒã‚°ã®ãŸã‚ã«ä»•äº‹ã‚’ã™ã‚‹ãŸã‚ã«ã¯ã€ | ||
| 441 | http://bugzilla.kernel.org ã«è¡Œã£ã¦ãã ã•ã„。もã—今後ã®ãƒã‚°ãƒ¬ãƒãƒ¼ãƒˆã« | ||
| 442 | ã¤ã„ã¦ã‚¢ãƒ‰ãƒã‚¤ã‚¹ã‚’å—ã‘ãŸã„ã®ã§ã‚ã‚Œã°ã€bugme-new メーリングリスト(æ–°ã— | ||
| 443 | ã„ãƒã‚°ãƒ¬ãƒãƒ¼ãƒˆã ã‘ãŒã“ã“ã«ãƒ¡ãƒ¼ãƒ«ã•ã‚Œã‚‹) ã¾ãŸã¯ bugme-janitor メーリン | ||
| 444 | グリスト(bugzilla ã®å¤‰æ›´æ¯Žã«ã“ã“ã«ãƒ¡ãƒ¼ãƒ«ã•ã‚Œã‚‹)ã‚’è³¼èªã§ãã¾ã™ã€‚ | ||
| 445 | |||
| 446 | http://lists.linux-foundation.org/mailman/listinfo/bugme-new | ||
| 447 | http://lists.linux-foundation.org/mailman/listinfo/bugme-janitors | ||
| 448 | |||
| 422 | メーリングリスト | 449 | メーリングリスト |
| 423 | ------------- | 450 | ------------- |
| 424 | 451 | ||
diff --git a/Documentation/ja_JP/SubmitChecklist b/Documentation/ja_JP/SubmitChecklist new file mode 100644 index 000000000000..6c42e071d723 --- /dev/null +++ b/Documentation/ja_JP/SubmitChecklist | |||
| @@ -0,0 +1,111 @@ | |||
| 1 | NOTE: | ||
| 2 | This is a version of Documentation/SubmitChecklist into Japanese. | ||
| 3 | This document is maintained by Takenori Nagano <t-nagano@ah.jp.nec.com> | ||
| 4 | and the JF Project team <http://www.linux.or.jp/JF/>. | ||
| 5 | If you find any difference between this document and the original file | ||
| 6 | or a problem with the translation, | ||
| 7 | please contact the maintainer of this file or JF project. | ||
| 8 | |||
| 9 | Please also note that the purpose of this file is to be easier to read | ||
| 10 | for non English (read: Japanese) speakers and is not intended as a | ||
| 11 | fork. So if you have any comments or updates of this file, please try | ||
| 12 | to update the original English file first. | ||
| 13 | |||
| 14 | Last Updated: 2008/07/14 | ||
| 15 | ================================== | ||
| 16 | ã“ã‚Œã¯ã€ | ||
| 17 | linux-2.6.26/Documentation/SubmitChecklist ã®å’Œè¨³ã§ã™ã€‚ | ||
| 18 | |||
| 19 | 翻訳団体： JF プãƒã‚¸ã‚§ã‚¯ãƒˆ < http://www.linux.or.jp/JF/ > | ||
| 20 | 翻訳日： 2008/07/14 | ||
| 21 | 翻訳者： Takenori Nagano <t-nagano at ah dot jp dot nec dot com> | ||
| 22 | æ ¡æ£è€…： Masanori Kobayashi ã•ã‚“ <zap03216 at nifty dot ne dot jp> | ||
| 23 | ================================== | ||
| 24 | |||
| 25 | |||
| 26 | Linux カーãƒãƒ«ãƒ‘ッãƒæŠ•ç¨¿è€…å‘ã‘ãƒã‚§ãƒƒã‚¯ãƒªã‚¹ãƒˆ | ||
| 27 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
| 28 | |||
| 29 | 本書ã§ã¯ã€ãƒ‘ッãƒã‚’ã‚ˆã‚Šç´ æ—©ãå–り込んã§ã‚‚らã„ãŸã„開発者ãŒå®Ÿè·µã™ã¹ã基本的ãªäº‹æŸ„ | ||
| 30 | ã‚’ã„ãã¤ã‹ç´¹ä»‹ã—ã¾ã™ã€‚ã“ã“ã«ã‚ã‚‹å…¨ã¦ã®äº‹æŸ„ã¯ã€Documentation/SubmittingPatches | ||
| 31 | ãªã©ã®Linuxカーãƒãƒ«ãƒ‘ッãƒæŠ•ç¨¿ã«éš›ã—ã¦ã®å¿ƒå¾—を補足ã™ã‚‹ã‚‚ã®ã§ã™ã€‚ | ||
| 32 | |||
| 33 | 1: 妥当ãªCONFIGオプションや変更ã•ã‚ŒãŸCONFIGオプションã€ã¤ã¾ã‚Š =y, =m, =n | ||
| 34 | å…¨ã¦ã§æ£ã—ãビルドã§ãã‚‹ã“ã¨ã‚’確èªã—ã¦ãã ã•ã„。ãã®éš›ã€gccåŠã³ãƒªãƒ³ã‚«ãŒ | ||
| 35 | warningã‚„errorを出ã—ã¦ã„ãªã„ã“ã¨ã‚‚確èªã—ã¦ãã ã•ã„。 | ||
| 36 | |||
| 37 | 2: allnoconfig, allmodconfig オプションを用ã„ã¦æ£ã—ãビルドã§ãã‚‹ã“ã¨ã‚’ | ||
| 38 | 確èªã—ã¦ãã ã•ã„。 | ||
| 39 | |||
| 40 | 3: 手許ã®ã‚¯ãƒã‚¹ã‚³ãƒ³ãƒ‘イルツールやOSDLã®PLMã®ã‚ˆã†ãªã‚‚ã®ã‚’用ã„ã¦ã€è¤‡æ•°ã® | ||
| 41 | アーã‚テクãƒãƒ£ã«ãŠã„ã¦ã‚‚æ£ã—ãビルドã§ãã‚‹ã“ã¨ã‚’確èªã—ã¦ãã ã•ã„。 | ||
| 42 | |||
| 43 | 4: 64bité•·ã®'unsigned long'を使用ã—ã¦ã„ã‚‹ppc64ã¯ã€ã‚¯ãƒã‚¹ã‚³ãƒ³ãƒ‘イルã§ã® | ||
| 44 | ãƒã‚§ãƒƒã‚¯ã«é©å½“ãªã‚¢ãƒ¼ã‚テクãƒãƒ£ã§ã™ã€‚ | ||
| 45 | |||
| 46 | 5: カーãƒãƒ«ã‚³ãƒ¼ãƒ‡ã‚£ãƒ³ã‚°ã‚¹ã‚¿ã‚¤ãƒ«ã«æº–æ‹ ã—ã¦ã„ã‚‹ã‹ã©ã†ã‹ç¢ºèªã—ã¦ãã ã•ã„(!) | ||
| 47 | |||
| 48 | 6: CONFIGオプションã®è¿½åŠ ・変更をã—ãŸå ´åˆã«ã¯ã€CONFIGメニューãŒå£Šã‚Œã¦ã„ãªã„ | ||
| 49 | ã“ã¨ã‚’確èªã—ã¦ãã ã•ã„。 | ||
| 50 | |||
| 51 | 7: æ–°ã—ãKconfigã®ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã‚’è¿½åŠ ã™ã‚‹éš›ã«ã¯ã€å¿…ãšãã®helpも記述ã—ã¦ãã ã•ã„。 | ||
| 52 | |||
| 53 | 8: é©åˆ‡ãªKconfigã®ä¾å˜é–¢ä¿‚を考ãˆãªãŒã‚‰æ…Žé‡ã«ãƒã‚§ãƒƒã‚¯ã—ã¦ãã ã•ã„。 | ||
| 54 | ãŸã ã—ã€ã“ã®ä½œæ¥ã¯ãƒžã‚·ãƒ³ã‚’使ã£ãŸãƒ†ã‚¹ãƒˆã§ãã¡ã‚“ã¨è¡Œã†ã®ãŒã¨ã¦ã‚‚困難ã§ã™ã€‚ | ||
| 55 | ã†ã¾ãã‚„ã‚‹ã«ã¯ã€è‡ªåˆ†ã®é ã§è€ƒãˆã‚‹ã“ã¨ã§ã™ã€‚ | ||
| 56 | |||
| 57 | 9: sparseを利用ã—ã¦ã¡ã‚ƒã‚“ã¨ã—ãŸã‚³ãƒ¼ãƒ‰ãƒã‚§ãƒƒã‚¯ã‚’ã—ã¦ãã ã•ã„。 | ||
| 58 | |||
| 59 | 10: 'make checkstack' 㨠'make namespacecheck' を利用ã—ã€å•é¡ŒãŒç™ºè¦‹ã•ã‚ŒãŸã‚‰ | ||
| 60 | ä¿®æ£ã—ã¦ãã ã•ã„。'make checkstack' ã¯æ˜Žç¤ºçš„ã«å•é¡Œã‚’示ã—ã¾ã›ã‚“ãŒã€ã©ã‚Œã‹ | ||
| 61 | １ã¤ã®é–¢æ•°ãŒ512ãƒã‚¤ãƒˆã‚ˆã‚Šå¤§ãã„スタックを使ã£ã¦ã„ã‚Œã°ã€ä¿®æ£ã™ã¹ã候補㨠| ||
| 62 | ãªã‚Šã¾ã™ã€‚ | ||
| 63 | |||
| 64 | 11: ã‚°ãƒãƒ¼ãƒãƒ«ãªkernel API を説明ã™ã‚‹ kernel-doc をソースã®ä¸ã«å«ã‚ã¦ãã ã•ã„。 | ||
| 65 | ( staticãªé–¢æ•°ã«ãŠã„ã¦ã¯å¿…é ˆã§ã¯ã‚ã‚Šã¾ã›ã‚“ãŒã€å«ã‚ã¦ã‚‚らã£ã¦ã‚‚çµæ§‹ã§ã™ ) | ||
| 66 | ãã—ã¦ã€'make htmldocs' ã‚‚ã—ã㯠'make mandocs' を利用ã—ã¦è¿½è¨˜ã—㟠| ||
| 67 | ドã‚ュメントã®ãƒã‚§ãƒƒã‚¯ã‚’è¡Œã„ã€å•é¡ŒãŒè¦‹ã¤ã‹ã£ãŸå ´åˆã«ã¯ä¿®æ£ã‚’è¡Œã£ã¦ãã ã•ã„。 | ||
| 68 | |||
| 69 | 12: CONFIG_PREEMPT, CONFIG_DEBUG_PREEMPT, CONFIG_DEBUG_SLAB, | ||
| 70 | CONFIG_DEBUG_PAGEALLOC, CONFIG_DEBUG_MUTEXES, CONFIG_DEBUG_SPINLOCK, | ||
| 71 | CONFIG_DEBUG_SPINLOCK_SLEEP ã“れら全ã¦ã‚’åŒæ™‚ã«æœ‰åŠ¹ã«ã—ã¦å‹•ä½œç¢ºèªã‚’ | ||
| 72 | è¡Œã£ã¦ãã ã•ã„。 | ||
| 73 | |||
| 74 | 13: CONFIG_SMP, CONFIG_PREEMPT を有効ã«ã—ãŸå ´åˆã¨ç„¡åŠ¹ã«ã—ãŸå ´åˆã®ä¸¡æ–¹ã§ | ||
| 75 | ビルドã—ãŸä¸Šã€å‹•ä½œç¢ºèªã‚’è¡Œã£ã¦ãã ã•ã„。 | ||
| 76 | |||
| 77 | 14: ã‚‚ã—パッãƒãŒãƒ‡ã‚£ã‚¹ã‚¯ã®I/O性能ãªã©ã«å½±éŸ¿ã‚’与ãˆã‚‹ã‚ˆã†ã§ã‚ã‚Œã°ã€ | ||
| 78 | 'CONFIG_LBD'オプションを有効ã«ã—ãŸå ´åˆã¨ç„¡åŠ¹ã«ã—ãŸå ´åˆã®ä¸¡æ–¹ã§ | ||
| 79 | テストを実施ã—ã¦ã¿ã¦ãã ã•ã„。 | ||
| 80 | |||
| 81 | 15: lockdepã®æ©Ÿèƒ½ã‚’å…¨ã¦æœ‰åŠ¹ã«ã—ãŸä¸Šã§ã€å…¨ã¦ã®ã‚³ãƒ¼ãƒ‰ãƒ‘スを評価ã—ã¦ãã ã•ã„。 | ||
| 82 | |||
| 83 | 16: /proc ã«æ–°ã—ã„ã‚¨ãƒ³ãƒˆãƒªã‚’è¿½åŠ ã—ãŸå ´åˆã«ã¯ã€Documentation/ é…下㫠| ||
| 84 | å¿…ãšãƒ‰ã‚ãƒ¥ãƒ¡ãƒ³ãƒˆã‚’è¿½åŠ ã—ã¦ãã ã•ã„。 | ||
| 85 | |||
| 86 | 17: æ–°ã—ã„ãƒ–ãƒ¼ãƒˆãƒ‘ãƒ©ãƒ¡ãƒ¼ã‚¿ã‚’è¿½åŠ ã—ãŸå ´åˆã«ã¯ã€ | ||
| 87 | å¿…ãšDocumentation/kernel-parameters.txt ã«èª¬æ˜Žã‚’è¿½åŠ ã—ã¦ãã ã•ã„。 | ||
| 88 | |||
| 89 | 18: æ–°ã—ãmoduleã«ãƒ‘ãƒ©ãƒ¡ãƒ¼ã‚¿ã‚’è¿½åŠ ã—ãŸå ´åˆã«ã¯ã€MODULE_PARM_DESC()ã‚’ | ||
| 90 | 利用ã—ã¦å¿…ãšãã®èª¬æ˜Žã‚’記述ã—ã¦ãã ã•ã„。 | ||
| 91 | |||
| 92 | 19: æ–°ã—ã„userspaceインタフェースを作æˆã—ãŸå ´åˆã«ã¯ã€Documentation/ABI/ ã« | ||
| 93 | Documentation/ABI/README ã‚’å‚考ã«ã—ã¦å¿…ãšãƒ‰ã‚ãƒ¥ãƒ¡ãƒ³ãƒˆã‚’è¿½åŠ ã—ã¦ãã ã•ã„。 | ||
| 94 | |||
| 95 | 20: 'make headers_check'を実行ã—ã¦å…¨ãå•é¡ŒãŒãªã„ã“ã¨ã‚’確èªã—ã¦ãã ã•ã„。 | ||
| 96 | |||
| 97 | 21: å°‘ãªãã¨ã‚‚slabã‚¢ãƒã‚±ãƒ¼ã‚·ãƒ§ãƒ³ã¨pageã‚¢ãƒã‚±ãƒ¼ã‚·ãƒ§ãƒ³ã«å¤±æ•—ã—ãŸå ´åˆã® | ||
| 98 | 挙動ã«ã¤ã„ã¦ã€fault-injectionを利用ã—ã¦ç¢ºèªã—ã¦ãã ã•ã„。 | ||
| 99 | Documentation/fault-injection/ ã‚’å‚ç…§ã—ã¦ãã ã•ã„。 | ||
| 100 | |||
| 101 | è¿½åŠ ã—ãŸã‚³ãƒ¼ãƒ‰ãŒã‹ãªã‚Šã®é‡ã§ã‚ã£ãŸãªã‚‰ã°ã€ã‚µãƒ–システム特有㮠| ||
| 102 | fault-injectionã‚’è¿½åŠ ã—ãŸã»ã†ãŒè‰¯ã„ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。 | ||
| 103 | |||
| 104 | 22: æ–°ãŸã«è¿½åŠ ã—ãŸã‚³ãƒ¼ãƒ‰ã¯ã€`gcc -W'ã§ã‚³ãƒ³ãƒ‘イルã—ã¦ãã ã•ã„。 | ||
| 105 | ã“ã®ã‚ªãƒ—ションã¯å¤§é‡ã®ä¸è¦ãªãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’出力ã—ã¾ã™ãŒã€ | ||
| 106 | "warning: comparison between signed and unsigned" ã®ã‚ˆã†ãªãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã¯ã€ | ||
| 107 | ãƒã‚°ã‚’見ã¤ã‘ã‚‹ã®ã«å½¹ã«ç«‹ã¡ã¾ã™ã€‚ | ||
| 108 | |||
| 109 | 23: 投稿ã—ãŸãƒ‘ッãƒãŒ -mm パッãƒã‚»ãƒƒãƒˆã«ãƒžãƒ¼ã‚¸ã•ã‚ŒãŸå¾Œã€å…¨ã¦ã®æ—¢å˜ã®ãƒ‘ッãƒã‚„ | ||
| 110 | VM, VFS ãŠã‚ˆã³ãã®ä»–ã®ã‚µãƒ–システムã«é–¢ã™ã‚‹æ§˜ã€…ãªå¤‰æ›´ã¨ã€ç¾æ™‚点ã§ã‚‚å…±å˜ | ||
| 111 | ã§ãã‚‹ã“ã¨ã‚’確èªã™ã‚‹ãƒ†ã‚¹ãƒˆã‚’è¡Œã£ã¦ãã ã•ã„。 | ||
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index e7bea3e85304..1150444a21ab 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
| @@ -365,6 +365,8 @@ and is between 256 and 4096 characters. It is defined in the file | |||
| 365 | no delay (0). | 365 | no delay (0). |
| 366 | Format: integer | 366 | Format: integer |
| 367 | 367 | ||
| 368 | bootmem_debug [KNL] Enable bootmem allocator debug messages. | ||
| 369 | |||
| 368 | bttv.card= [HW,V4L] bttv (bt848 + bt878 based grabber cards) | 370 | bttv.card= [HW,V4L] bttv (bt848 + bt878 based grabber cards) |
| 369 | bttv.radio= Most important insmod options are available as | 371 | bttv.radio= Most important insmod options are available as |
| 370 | kernel args too. | 372 | kernel args too. |
| @@ -1072,6 +1074,9 @@ and is between 256 and 4096 characters. It is defined in the file | |||
| 1072 | 1074 | ||
| 1073 | * [no]ncq: Turn on or off NCQ. | 1075 | * [no]ncq: Turn on or off NCQ. |
| 1074 | 1076 | ||
| 1077 | * nohrst, nosrst, norst: suppress hard, soft | ||
| 1078 | and both resets. | ||
| 1079 | |||
| 1075 | If there are multiple matching configurations changing | 1080 | If there are multiple matching configurations changing |
| 1076 | the same attribute, the last one is used. | 1081 | the same attribute, the last one is used. |
| 1077 | 1082 | ||
diff --git a/Documentation/lguest/lguest.c b/Documentation/lguest/lguest.c index b88b0ea54e90..7228369d1014 100644 --- a/Documentation/lguest/lguest.c +++ b/Documentation/lguest/lguest.c | |||
| @@ -895,6 +895,9 @@ static void handle_console_output(int fd, struct virtqueue *vq, bool timeout) | |||
| 895 | } | 895 | } |
| 896 | } | 896 | } |
| 897 | 897 | ||
| 898 | /* This is called when we no longer want to hear about Guest changes to a | ||
| 899 | * virtqueue. This is more efficient in high-traffic cases, but it means we | ||
| 900 | * have to set a timer to check if any more changes have occurred. */ | ||
| 898 | static void block_vq(struct virtqueue *vq) | 901 | static void block_vq(struct virtqueue *vq) |
| 899 | { | 902 | { |
| 900 | struct itimerval itm; | 903 | struct itimerval itm; |
| @@ -939,6 +942,11 @@ static void handle_net_output(int fd, struct virtqueue *vq, bool timeout) | |||
| 939 | if (!timeout && num) | 942 | if (!timeout && num) |
| 940 | block_vq(vq); | 943 | block_vq(vq); |
| 941 | 944 | ||
| 945 | /* We never quite know how long should we wait before we check the | ||
| 946 | * queue again for more packets. We start at 500 microseconds, and if | ||
| 947 | * we get fewer packets than last time, we assume we made the timeout | ||
| 948 | * too small and increase it by 10 microseconds. Otherwise, we drop it | ||
| 949 | * by one microsecond every time. It seems to work well enough. */ | ||
| 942 | if (timeout) { | 950 | if (timeout) { |
| 943 | if (num < last_timeout_num) | 951 | if (num < last_timeout_num) |
| 944 | timeout_usec += 10; | 952 | timeout_usec += 10; |
| @@ -1447,21 +1455,6 @@ static void configure_device(int fd, const char *tapif, u32 ipaddr) | |||
| 1447 | err(1, "Bringing interface %s up", tapif); | 1455 | err(1, "Bringing interface %s up", tapif); |
| 1448 | } | 1456 | } |
| 1449 | 1457 | ||
| 1450 | static void get_mac(int fd, const char *tapif, unsigned char hwaddr[6]) | ||
| 1451 | { | ||
| 1452 | struct ifreq ifr; | ||
| 1453 | |||
| 1454 | memset(&ifr, 0, sizeof(ifr)); | ||
| 1455 | strcpy(ifr.ifr_name, tapif); | ||
| 1456 | |||
| 1457 | /* SIOC stands for Socket I/O Control. G means Get (vs S for Set | ||
| 1458 | * above). IF means Interface, and HWADDR is hardware address. | ||
| 1459 | * Simple! */ | ||
| 1460 | if (ioctl(fd, SIOCGIFHWADDR, &ifr) != 0) | ||
| 1461 | err(1, "getting hw address for %s", tapif); | ||
| 1462 | memcpy(hwaddr, ifr.ifr_hwaddr.sa_data, 6); | ||
| 1463 | } | ||
| 1464 | |||
| 1465 | static int get_tun_device(char tapif[IFNAMSIZ]) | 1458 | static int get_tun_device(char tapif[IFNAMSIZ]) |
| 1466 | { | 1459 | { |
| 1467 | struct ifreq ifr; | 1460 | struct ifreq ifr; |
| @@ -1531,11 +1524,8 @@ static void setup_tun_net(char *arg) | |||
| 1531 | p = strchr(arg, ':'); | 1524 | p = strchr(arg, ':'); |
| 1532 | if (p) { | 1525 | if (p) { |
| 1533 | str2mac(p+1, conf.mac); | 1526 | str2mac(p+1, conf.mac); |
| 1527 | add_feature(dev, VIRTIO_NET_F_MAC); | ||
| 1534 | *p = '\0'; | 1528 | *p = '\0'; |
| 1535 | } else { | ||
| 1536 | p = arg + strlen(arg); | ||
| 1537 | /* None supplied; query the randomly assigned mac. */ | ||
| 1538 | get_mac(ipfd, tapif, conf.mac); | ||
| 1539 | } | 1529 | } |
| 1540 | 1530 | ||
| 1541 | /* arg is now either an IP address or a bridge name */ | 1531 | /* arg is now either an IP address or a bridge name */ |
| @@ -1547,13 +1537,10 @@ static void setup_tun_net(char *arg) | |||
| 1547 | /* Set up the tun device. */ | 1537 | /* Set up the tun device. */ |
| 1548 | configure_device(ipfd, tapif, ip); | 1538 | configure_device(ipfd, tapif, ip); |
| 1549 | 1539 | ||
| 1550 | /* Tell Guest what MAC address to use. */ | ||
| 1551 | add_feature(dev, VIRTIO_NET_F_MAC); | ||
| 1552 | add_feature(dev, VIRTIO_F_NOTIFY_ON_EMPTY); | 1540 | add_feature(dev, VIRTIO_F_NOTIFY_ON_EMPTY); |
| 1553 | /* Expect Guest to handle everything except UFO */ | 1541 | /* Expect Guest to handle everything except UFO */ |
| 1554 | add_feature(dev, VIRTIO_NET_F_CSUM); | 1542 | add_feature(dev, VIRTIO_NET_F_CSUM); |
| 1555 | add_feature(dev, VIRTIO_NET_F_GUEST_CSUM); | 1543 | add_feature(dev, VIRTIO_NET_F_GUEST_CSUM); |
| 1556 | add_feature(dev, VIRTIO_NET_F_MAC); | ||
| 1557 | add_feature(dev, VIRTIO_NET_F_GUEST_TSO4); | 1544 | add_feature(dev, VIRTIO_NET_F_GUEST_TSO4); |
| 1558 | add_feature(dev, VIRTIO_NET_F_GUEST_TSO6); | 1545 | add_feature(dev, VIRTIO_NET_F_GUEST_TSO6); |
| 1559 | add_feature(dev, VIRTIO_NET_F_GUEST_ECN); | 1546 | add_feature(dev, VIRTIO_NET_F_GUEST_ECN); |
diff --git a/Documentation/networking/Makefile b/Documentation/networking/Makefile new file mode 100644 index 000000000000..6d8af1ac56c4 --- /dev/null +++ b/Documentation/networking/Makefile | |||
| @@ -0,0 +1,8 @@ | |||
| 1 | # kbuild trick to avoid linker error. Can be omitted if a module is built. | ||
| 2 | obj- := dummy.o | ||
| 3 | |||
| 4 | # List of programs to build | ||
| 5 | hostprogs-y := ifenslave | ||
| 6 | |||
| 7 | # Tell kbuild to always build the programs | ||
| 8 | always := $(hostprogs-y) | ||
diff --git a/Documentation/networking/ifenslave.c b/Documentation/networking/ifenslave.c index a12059886755..1b96ccda3836 100644 --- a/Documentation/networking/ifenslave.c +++ b/Documentation/networking/ifenslave.c | |||
| @@ -1081,7 +1081,7 @@ static int set_if_addr(char *master_ifname, char *slave_ifname) | |||
| 1081 | 1081 | ||
| 1082 | } | 1082 | } |
| 1083 | 1083 | ||
| 1084 | ipaddr = ifr.ifr_addr.sa_data; | 1084 | ipaddr = (unsigned char *)ifr.ifr_addr.sa_data; |
| 1085 | v_print("Interface '%s': set IP %s to %d.%d.%d.%d\n", | 1085 | v_print("Interface '%s': set IP %s to %d.%d.%d.%d\n", |
| 1086 | slave_ifname, ifra[i].desc, | 1086 | slave_ifname, ifra[i].desc, |
| 1087 | ipaddr[0], ipaddr[1], ipaddr[2], ipaddr[3]); | 1087 | ipaddr[0], ipaddr[1], ipaddr[2], ipaddr[3]); |
diff --git a/Documentation/pcmcia/Makefile b/Documentation/pcmcia/Makefile new file mode 100644 index 000000000000..accde871ae77 --- /dev/null +++ b/Documentation/pcmcia/Makefile | |||
| @@ -0,0 +1,10 @@ | |||
| 1 | # kbuild trick to avoid linker error. Can be omitted if a module is built. | ||
| 2 | obj- := dummy.o | ||
| 3 | |||
| 4 | # List of programs to build | ||
| 5 | hostprogs-y := crc32hash | ||
| 6 | |||
| 7 | # Tell kbuild to always build the programs | ||
| 8 | always := $(hostprogs-y) | ||
| 9 | |||
| 10 | HOSTCFLAGS_crc32hash.o += -I$(objtree)/usr/include | ||
diff --git a/Documentation/pcmcia/crc32hash.c b/Documentation/pcmcia/crc32hash.c index cbc36d299af8..4210e5abab8a 100644 --- a/Documentation/pcmcia/crc32hash.c +++ b/Documentation/pcmcia/crc32hash.c | |||
| @@ -26,7 +26,7 @@ int main(int argc, char **argv) { | |||
| 26 | printf("no string passed as argument\n"); | 26 | printf("no string passed as argument\n"); |
| 27 | return -1; | 27 | return -1; |
| 28 | } | 28 | } |
| 29 | result = crc32(argv[1], strlen(argv[1])); | 29 | result = crc32((unsigned char const *)argv[1], strlen(argv[1])); |
| 30 | printf("0x%x\n", result); | 30 | printf("0x%x\n", result); |
| 31 | return 0; | 31 | return 0; |
| 32 | } | 32 | } |
diff --git a/Documentation/rfkill.txt b/Documentation/rfkill.txt index 28b6ec87c642..6fcb3060dec5 100644 --- a/Documentation/rfkill.txt +++ b/Documentation/rfkill.txt | |||
| @@ -363,6 +363,11 @@ This rule exists because users of the rfkill subsystem expect to get (and set, | |||
| 363 | when possible) the overall transmitter rfkill state, not of a particular rfkill | 363 | when possible) the overall transmitter rfkill state, not of a particular rfkill |
| 364 | line. | 364 | line. |
| 365 | 365 | ||
| 366 | 5. During suspend, the rfkill class will attempt to soft-block the radio | ||
| 367 | through a call to rfkill->toggle_radio, and will try to restore its previous | ||
| 368 | state during resume. After a rfkill class is suspended, it will *not* call | ||
| 369 | rfkill->toggle_radio until it is resumed. | ||
| 370 | |||
| 366 | Example of a WLAN wireless driver connected to the rfkill subsystem: | 371 | Example of a WLAN wireless driver connected to the rfkill subsystem: |
| 367 | -------------------------------------------------------------------- | 372 | -------------------------------------------------------------------- |
| 368 | 373 | ||
diff --git a/Documentation/scsi/ChangeLog.megaraid_sas b/Documentation/scsi/ChangeLog.megaraid_sas index 716fcc1cafb5..c851ef497795 100644 --- a/Documentation/scsi/ChangeLog.megaraid_sas +++ b/Documentation/scsi/ChangeLog.megaraid_sas | |||
| @@ -1,3 +1,26 @@ | |||
| 1 | |||
| 2 | 1 Release Date : Thur.July. 24 11:41:51 PST 2008 - | ||
| 3 | (emaild-id:megaraidlinux@lsi.com) | ||
| 4 | Sumant Patro | ||
| 5 | Bo Yang | ||
| 6 | |||
| 7 | 2 Current Version : 00.00.04.01 | ||
| 8 | 3 Older Version : 00.00.03.22 | ||
| 9 | |||
| 10 | 1. Add the new controller (0078, 0079) support to the driver | ||
| 11 | Those controllers are LSI's next generatation(gen2) SAS controllers. | ||
| 12 | |||
| 13 | 1 Release Date : Mon.June. 23 10:12:45 PST 2008 - | ||
| 14 | (emaild-id:megaraidlinux@lsi.com) | ||
| 15 | Sumant Patro | ||
| 16 | Bo Yang | ||
| 17 | |||
| 18 | 2 Current Version : 00.00.03.22 | ||
| 19 | 3 Older Version : 00.00.03.20 | ||
| 20 | |||
| 21 | 1. Add shutdown DCMD cmd to the shutdown routine to make FW shutdown proper. | ||
| 22 | 2. Unexpected interrupt occurs in HWR Linux driver, add the dumy readl pci flush will fix this issue. | ||
| 23 | |||
| 1 | 1 Release Date : Mon. March 10 11:02:31 PDT 2008 - | 24 | 1 Release Date : Mon. March 10 11:02:31 PDT 2008 - |
| 2 | (emaild-id:megaraidlinux@lsi.com) | 25 | (emaild-id:megaraidlinux@lsi.com) |
| 3 | Sumant Patro | 26 | Sumant Patro |
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt index 6f6d117ac7e2..b117e42a6166 100644 --- a/Documentation/sound/alsa/ALSA-Configuration.txt +++ b/Documentation/sound/alsa/ALSA-Configuration.txt | |||
| @@ -1144,8 +1144,6 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. | |||
| 1144 | 1144 | ||
| 1145 | This module supports autoprobe and multiple cards. | 1145 | This module supports autoprobe and multiple cards. |
| 1146 | 1146 | ||
| 1147 | Power management is _not_ supported. | ||
| 1148 | |||
| 1149 | Module snd-ice1712 | 1147 | Module snd-ice1712 |
| 1150 | ------------------ | 1148 | ------------------ |
| 1151 | 1149 | ||
| @@ -1628,8 +1626,6 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. | |||
| 1628 | 1626 | ||
| 1629 | This module supports autoprobe and multiple cards. | 1627 | This module supports autoprobe and multiple cards. |
| 1630 | 1628 | ||
| 1631 | Power management is _not_ supported. | ||
| 1632 | |||
| 1633 | Module snd-pcsp | 1629 | Module snd-pcsp |
| 1634 | ----------------- | 1630 | ----------------- |
| 1635 | 1631 | ||
| @@ -2081,13 +2077,11 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. | |||
| 2081 | Module snd-virtuoso | 2077 | Module snd-virtuoso |
| 2082 | ------------------- | 2078 | ------------------- |
| 2083 | 2079 | ||
| 2084 | Module for sound cards based on the Asus AV200 chip, i.e., | 2080 | Module for sound cards based on the Asus AV100/AV200 chips, |
| 2085 | Xonar D2 and Xonar D2X. | 2081 | i.e., Xonar D1, DX, D2 and D2X. |
| 2086 | 2082 | ||
| 2087 | This module supports autoprobe and multiple cards. | 2083 | This module supports autoprobe and multiple cards. |
| 2088 | 2084 | ||
| 2089 | Power management is _not_ supported. | ||
| 2090 | |||
| 2091 | Module snd-vx222 | 2085 | Module snd-vx222 |
| 2092 | ---------------- | 2086 | ---------------- |
| 2093 | 2087 | ||
diff --git a/Documentation/spi/Makefile b/Documentation/spi/Makefile new file mode 100644 index 000000000000..a5b03c88beae --- /dev/null +++ b/Documentation/spi/Makefile | |||
| @@ -0,0 +1,11 @@ | |||
| 1 | # kbuild trick to avoid linker error. Can be omitted if a module is built. | ||
| 2 | obj- := dummy.o | ||
| 3 | |||
| 4 | # List of programs to build | ||
| 5 | hostprogs-y := spidev_test spidev_fdx | ||
| 6 | |||
| 7 | # Tell kbuild to always build the programs | ||
| 8 | always := $(hostprogs-y) | ||
| 9 | |||
| 10 | HOSTCFLAGS_spidev_test.o += -I$(objtree)/usr/include | ||
| 11 | HOSTCFLAGS_spidev_fdx.o += -I$(objtree)/usr/include | ||
diff --git a/Documentation/usb/auerswald.txt b/Documentation/usb/auerswald.txt deleted file mode 100644 index 7ee4d8f69116..000000000000 --- a/Documentation/usb/auerswald.txt +++ /dev/null | |||
| @@ -1,30 +0,0 @@ | |||
| 1 | Auerswald USB kernel driver | ||
| 2 | =========================== | ||
| 3 | |||
| 4 | What is it? What can I do with it? | ||
| 5 | ================================== | ||
| 6 | The auerswald USB kernel driver connects your linux 2.4.x | ||
| 7 | system to the auerswald usb-enabled devices. | ||
| 8 | |||
| 9 | There are two types of auerswald usb devices: | ||
| 10 | a) small PBX systems (ISDN) | ||
| 11 | b) COMfort system telephones (ISDN) | ||
| 12 | |||
| 13 | The driver installation creates the devices | ||
| 14 | /dev/usb/auer0..15. These devices carry a vendor- | ||
| 15 | specific protocol. You may run all auerswald java | ||
| 16 | software on it. The java software needs a native | ||
| 17 | library "libAuerUsbJNINative.so" installed on | ||
| 18 | your system. This library is available from | ||
| 19 | auerswald and shipped as part of the java software. | ||
| 20 | |||
| 21 | You may create the devices with: | ||
| 22 | mknod -m 666 /dev/usb/auer0 c 180 112 | ||
| 23 | ... | ||
| 24 | mknod -m 666 /dev/usb/auer15 c 180 127 | ||
| 25 | |||
| 26 | Future plans | ||
| 27 | ============ | ||
| 28 | - Connection to ISDN4LINUX (the hisax interface) | ||
| 29 | |||
| 30 | The maintainer of this driver is wolfgang@iksw-muees.de | ||
diff --git a/Documentation/usb/power-management.txt b/Documentation/usb/power-management.txt index b2fc4d4a9917..9d31140e3f5b 100644 --- a/Documentation/usb/power-management.txt +++ b/Documentation/usb/power-management.txt | |||
| @@ -436,7 +436,12 @@ post_reset; the USB core guarantees that this is true of internal | |||
| 436 | suspend/resume events as well. | 436 | suspend/resume events as well. |
| 437 | 437 | ||
| 438 | If a driver wants to block all suspend/resume calls during some | 438 | If a driver wants to block all suspend/resume calls during some |
| 439 | critical section, it can simply acquire udev->pm_mutex. | 439 | critical section, it can simply acquire udev->pm_mutex. Note that |
| 440 | calls to resume may be triggered indirectly. Block IO due to memory | ||
| 441 | allocations can make the vm subsystem resume a device. Thus while | ||
| 442 | holding this lock you must not allocate memory with GFP_KERNEL or | ||
| 443 | GFP_NOFS. | ||
| 444 | |||
| 440 | Alternatively, if the critical section might call some of the | 445 | Alternatively, if the critical section might call some of the |
| 441 | usb_autopm_* routines, the driver can avoid deadlock by doing: | 446 | usb_autopm_* routines, the driver can avoid deadlock by doing: |
| 442 | 447 | ||
diff --git a/Documentation/video4linux/Makefile b/Documentation/video4linux/Makefile new file mode 100644 index 000000000000..1ed0e98d057d --- /dev/null +++ b/Documentation/video4linux/Makefile | |||
| @@ -0,0 +1,8 @@ | |||
| 1 | # kbuild trick to avoid linker error. Can be omitted if a module is built. | ||
| 2 | obj- := dummy.o | ||
| 3 | |||
| 4 | # List of programs to build | ||
| 5 | hostprogs-y := v4lgrab | ||
| 6 | |||
| 7 | # Tell kbuild to always build the programs | ||
| 8 | always := $(hostprogs-y) | ||
diff --git a/Documentation/vm/Makefile b/Documentation/vm/Makefile new file mode 100644 index 000000000000..6f562f778b28 --- /dev/null +++ b/Documentation/vm/Makefile | |||
| @@ -0,0 +1,8 @@ | |||
| 1 | # kbuild trick to avoid linker error. Can be omitted if a module is built. | ||
| 2 | obj- := dummy.o | ||
| 3 | |||
| 4 | # List of programs to build | ||
| 5 | hostprogs-y := slabinfo | ||
| 6 | |||
| 7 | # Tell kbuild to always build the programs | ||
| 8 | always := $(hostprogs-y) | ||
diff --git a/Documentation/vm/page_migration b/Documentation/vm/page_migration index 99f89aa10169..d5fdfd34bbaf 100644 --- a/Documentation/vm/page_migration +++ b/Documentation/vm/page_migration | |||
| @@ -18,10 +18,11 @@ migrate_pages function call takes two sets of nodes and moves pages of a | |||
| 18 | process that are located on the from nodes to the destination nodes. | 18 | process that are located on the from nodes to the destination nodes. |
| 19 | Page migration functions are provided by the numactl package by Andi Kleen | 19 | Page migration functions are provided by the numactl package by Andi Kleen |
| 20 | (a version later than 0.9.3 is required. Get it from | 20 | (a version later than 0.9.3 is required. Get it from |
| 21 | ftp://ftp.suse.com/pub/people/ak). numactl provided libnuma which | 21 | ftp://oss.sgi.com/www/projects/libnuma/download/). numactl provides libnuma |
| 22 | provides an interface similar to other numa functionality for page migration. | 22 | which provides an interface similar to other numa functionality for page |
| 23 | cat /proc/<pid>/numa_maps allows an easy review of where the pages of | 23 | migration. cat /proc/<pid>/numa_maps allows an easy review of where the |
| 24 | a process are located. See also the numa_maps manpage in the numactl package. | 24 | pages of a process are located. See also the numa_maps documentation in the |
| 25 | proc(5) man page. | ||
| 25 | 26 | ||
| 26 | Manual migration is useful if for example the scheduler has relocated | 27 | Manual migration is useful if for example the scheduler has relocated |
| 27 | a process to a processor on a distant node. A batch scheduler or an | 28 | a process to a processor on a distant node. A batch scheduler or an |
diff --git a/Documentation/watchdog/src/Makefile b/Documentation/watchdog/src/Makefile new file mode 100644 index 000000000000..40e5f46e4740 --- /dev/null +++ b/Documentation/watchdog/src/Makefile | |||
| @@ -0,0 +1,8 @@ | |||
| 1 | # kbuild trick to avoid linker error. Can be omitted if a module is built. | ||
| 2 | obj- := dummy.o | ||
| 3 | |||
| 4 | # List of programs to build | ||
| 5 | hostprogs-y := watchdog-simple watchdog-test | ||
| 6 | |||
| 7 | # Tell kbuild to always build the programs | ||
| 8 | always := $(hostprogs-y) | ||
diff --git a/MAINTAINERS b/MAINTAINERS index b343814a1ace..ced3c202f8e6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -175,12 +175,18 @@ M: bcrl@kvack.org | |||
| 175 | L: linux-aio@kvack.org | 175 | L: linux-aio@kvack.org |
| 176 | S: Supported | 176 | S: Supported |
| 177 | 177 | ||
| 178 | ABIT UGURU HARDWARE MONITOR DRIVER | 178 | ABIT UGURU 1,2 HARDWARE MONITOR DRIVER |
| 179 | P: Hans de Goede | 179 | P: Hans de Goede |
| 180 | M: j.w.r.degoede@hhs.nl | 180 | M: j.w.r.degoede@hhs.nl |
| 181 | L: lm-sensors@lm-sensors.org | 181 | L: lm-sensors@lm-sensors.org |
| 182 | S: Maintained | 182 | S: Maintained |
| 183 | 183 | ||
| 184 | ABIT UGURU 3 HARDWARE MONITOR DRIVER | ||
| 185 | P: Alistair John Strachan | ||
| 186 | M: alistair@devzero.co.uk | ||
| 187 | L: lm-sensors@lm-sensors.org | ||
| 188 | S: Maintained | ||
| 189 | |||
| 184 | ACENIC DRIVER | 190 | ACENIC DRIVER |
| 185 | P: Jes Sorensen | 191 | P: Jes Sorensen |
| 186 | M: jes@trained-monkey.org | 192 | M: jes@trained-monkey.org |
| @@ -413,6 +419,12 @@ L: linux-laptop@vger.kernel.org | |||
| 413 | W: http://www.canb.auug.org.au/~sfr/ | 419 | W: http://www.canb.auug.org.au/~sfr/ |
| 414 | S: Supported | 420 | S: Supported |
| 415 | 421 | ||
| 422 | APPLE BCM5974 MULTITOUCH DRIVER | ||
| 423 | P: Henrik Rydberg | ||
| 424 | M: rydberg@euromail.se | ||
| 425 | L: linux-input@vger.kernel.org | ||
| 426 | S: Maintained | ||
| 427 | |||
| 416 | APPLE SMC DRIVER | 428 | APPLE SMC DRIVER |
| 417 | P: Nicolas Boichat | 429 | P: Nicolas Boichat |
| 418 | M: nicolas@boichat.ch | 430 | M: nicolas@boichat.ch |
| @@ -936,94 +948,19 @@ M: joern@lazybastard.org | |||
| 936 | L: linux-mtd@lists.infradead.org | 948 | L: linux-mtd@lists.infradead.org |
| 937 | S: Maintained | 949 | S: Maintained |
| 938 | 950 | ||
| 939 | BLUETOOTH SUBSYSTEM | 951 | BLUETOOTH DRIVERS |
| 940 | P: Marcel Holtmann | 952 | P: Marcel Holtmann |
| 941 | M: marcel@holtmann.org | 953 | M: marcel@holtmann.org |
| 942 | P: Maxim Krasnyansky | ||
| 943 | M: maxk@qualcomm.com | ||
| 944 | L: linux-bluetooth@vger.kernel.org | 954 | L: linux-bluetooth@vger.kernel.org |
| 945 | W: http://bluez.sf.net | 955 | W: http://www.bluez.org/ |
| 946 | W: http://www.bluez.org | ||
| 947 | W: http://www.holtmann.org/linux/bluetooth/ | ||
| 948 | T: git kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6.git | ||
| 949 | S: Maintained | ||
| 950 | |||
| 951 | BLUETOOTH RFCOMM LAYER | ||
| 952 | P: Marcel Holtmann | ||
| 953 | M: marcel@holtmann.org | ||
| 954 | P: Maxim Krasnyansky | ||
| 955 | M: maxk@qualcomm.com | ||
| 956 | S: Maintained | ||
| 957 | |||
| 958 | BLUETOOTH BNEP LAYER | ||
| 959 | P: Marcel Holtmann | ||
| 960 | M: marcel@holtmann.org | ||
| 961 | P: Maxim Krasnyansky | ||
| 962 | M: maxk@qualcomm.com | ||
| 963 | S: Maintained | ||
| 964 | |||
| 965 | BLUETOOTH CMTP LAYER | ||
| 966 | P: Marcel Holtmann | ||
| 967 | M: marcel@holtmann.org | ||
| 968 | S: Maintained | ||
| 969 | |||
| 970 | BLUETOOTH HIDP LAYER | ||
| 971 | P: Marcel Holtmann | ||
| 972 | M: marcel@holtmann.org | ||
| 973 | S: Maintained | ||
| 974 | |||
| 975 | BLUETOOTH HCI UART DRIVER | ||
| 976 | P: Marcel Holtmann | ||
| 977 | M: marcel@holtmann.org | ||
| 978 | P: Maxim Krasnyansky | ||
| 979 | M: maxk@qualcomm.com | ||
| 980 | S: Maintained | ||
| 981 | |||
| 982 | BLUETOOTH HCI USB DRIVER | ||
| 983 | P: Marcel Holtmann | ||
| 984 | M: marcel@holtmann.org | ||
| 985 | P: Maxim Krasnyansky | ||
| 986 | M: maxk@qualcomm.com | ||
| 987 | S: Maintained | ||
| 988 | |||
| 989 | BLUETOOTH HCI BCM203X DRIVER | ||
| 990 | P: Marcel Holtmann | ||
| 991 | M: marcel@holtmann.org | ||
| 992 | S: Maintained | ||
| 993 | |||
| 994 | BLUETOOTH HCI BPA10X DRIVER | ||
| 995 | P: Marcel Holtmann | ||
| 996 | M: marcel@holtmann.org | ||
| 997 | S: Maintained | ||
| 998 | |||
| 999 | BLUETOOTH HCI BFUSB DRIVER | ||
| 1000 | P: Marcel Holtmann | ||
| 1001 | M: marcel@holtmann.org | ||
| 1002 | S: Maintained | ||
| 1003 | |||
| 1004 | BLUETOOTH HCI DTL1 DRIVER | ||
| 1005 | P: Marcel Holtmann | ||
| 1006 | M: marcel@holtmann.org | ||
| 1007 | S: Maintained | ||
| 1008 | |||
| 1009 | BLUETOOTH HCI BLUECARD DRIVER | ||
| 1010 | P: Marcel Holtmann | ||
| 1011 | M: marcel@holtmann.org | ||
| 1012 | S: Maintained | 956 | S: Maintained |
| 1013 | 957 | ||
| 1014 | BLUETOOTH HCI BT3C DRIVER | 958 | BLUETOOTH SUBSYSTEM |
| 1015 | P: Marcel Holtmann | ||
| 1016 | M: marcel@holtmann.org | ||
| 1017 | S: Maintained | ||
| 1018 | |||
| 1019 | BLUETOOTH HCI BTUART DRIVER | ||
| 1020 | P: Marcel Holtmann | 959 | P: Marcel Holtmann |
| 1021 | M: marcel@holtmann.org | 960 | M: marcel@holtmann.org |
| 1022 | S: Maintained | 961 | L: linux-bluetooth@vger.kernel.org |
| 1023 | 962 | W: http://www.bluez.org/ | |
| 1024 | BLUETOOTH HCI VHCI DRIVER | 963 | T: git kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6.git |
| 1025 | P: Maxim Krasnyansky | ||
| 1026 | M: maxk@qualcomm.com | ||
| 1027 | S: Maintained | 964 | S: Maintained |
| 1028 | 965 | ||
| 1029 | BONDING DRIVER | 966 | BONDING DRIVER |
| @@ -2462,7 +2399,7 @@ L: kernel-janitors@vger.kernel.org | |||
| 2462 | W: http://www.kerneljanitors.org/ | 2399 | W: http://www.kerneljanitors.org/ |
| 2463 | S: Maintained | 2400 | S: Maintained |
| 2464 | 2401 | ||
| 2465 | KERNEL NFSD | 2402 | KERNEL NFSD, SUNRPC, AND LOCKD SERVERS |
| 2466 | P: J. Bruce Fields | 2403 | P: J. Bruce Fields |
| 2467 | M: bfields@fieldses.org | 2404 | M: bfields@fieldses.org |
| 2468 | P: Neil Brown | 2405 | P: Neil Brown |
| @@ -2928,6 +2865,12 @@ M: jirislaby@gmail.com | |||
| 2928 | L: linux-kernel@vger.kernel.org | 2865 | L: linux-kernel@vger.kernel.org |
| 2929 | S: Maintained | 2866 | S: Maintained |
| 2930 | 2867 | ||
| 2868 | MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CONTROLLER | ||
| 2869 | P: Felipe Balbi | ||
| 2870 | M: felipe.balbi@nokia.com | ||
| 2871 | L: linux-usb@vger.kernel.org | ||
| 2872 | S: Maintained | ||
| 2873 | |||
| 2931 | MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE) | 2874 | MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE) |
| 2932 | P: Andrew Gallatin | 2875 | P: Andrew Gallatin |
| 2933 | M: gallatin@myri.com | 2876 | M: gallatin@myri.com |
| @@ -3076,9 +3019,10 @@ M: horms@verge.net.au | |||
| 3076 | P: Julian Anastasov | 3019 | P: Julian Anastasov |
| 3077 | M: ja@ssi.bg | 3020 | M: ja@ssi.bg |
| 3078 | L: netdev@vger.kernel.org | 3021 | L: netdev@vger.kernel.org |
| 3022 | L: lvs-devel@vger.kernel.org | ||
| 3079 | S: Maintained | 3023 | S: Maintained |
| 3080 | 3024 | ||
| 3081 | NFS CLIENT | 3025 | NFS, SUNRPC, AND LOCKD CLIENTS |
| 3082 | P: Trond Myklebust | 3026 | P: Trond Myklebust |
| 3083 | M: Trond.Myklebust@netapp.com | 3027 | M: Trond.Myklebust@netapp.com |
| 3084 | L: linux-nfs@vger.kernel.org | 3028 | L: linux-nfs@vger.kernel.org |
| @@ -3113,7 +3057,7 @@ P: Anton Altaparmakov | |||
| 3113 | M: aia21@cantab.net | 3057 | M: aia21@cantab.net |
| 3114 | L: linux-ntfs-dev@lists.sourceforge.net | 3058 | L: linux-ntfs-dev@lists.sourceforge.net |
| 3115 | L: linux-kernel@vger.kernel.org | 3059 | L: linux-kernel@vger.kernel.org |
| 3116 | W: http://linux-ntfs.sf.net/ | 3060 | W: http://www.linux-ntfs.org/ |
| 3117 | T: git kernel.org:/pub/scm/linux/kernel/git/aia21/ntfs-2.6.git | 3061 | T: git kernel.org:/pub/scm/linux/kernel/git/aia21/ntfs-2.6.git |
| 3118 | S: Maintained | 3062 | S: Maintained |
| 3119 | 3063 | ||
| @@ -3741,6 +3685,16 @@ L: linux-visws-devel@lists.sf.net | |||
| 3741 | W: http://linux-visws.sf.net | 3685 | W: http://linux-visws.sf.net |
| 3742 | S: Maintained for 2.6. | 3686 | S: Maintained for 2.6. |
| 3743 | 3687 | ||
| 3688 | SGI GRU DRIVER | ||
| 3689 | P: Jack Steiner | ||
| 3690 | M: steiner@sgi.com | ||
| 3691 | S: Maintained | ||
| 3692 | |||
| 3693 | SGI XP/XPC/XPNET DRIVER | ||
| 3694 | P: Dean Nelson | ||
| 3695 | M: dcn@sgi.com | ||
| 3696 | S: Maintained | ||
| 3697 | |||
| 3744 | SIMTEC EB110ATX (Chalice CATS) | 3698 | SIMTEC EB110ATX (Chalice CATS) |
| 3745 | P: Ben Dooks | 3699 | P: Ben Dooks |
| 3746 | P: Vincent Sanders | 3700 | P: Vincent Sanders |
| @@ -4057,7 +4011,7 @@ S: Maintained | |||
| 4057 | 4011 | ||
| 4058 | TI OMAP MMC INTERFACE DRIVER | 4012 | TI OMAP MMC INTERFACE DRIVER |
| 4059 | P: Carlos Aguiar, Anderson Briglia and Syed Khasim | 4013 | P: Carlos Aguiar, Anderson Briglia and Syed Khasim |
| 4060 | M: linux-omap-open-source@linux.omap.com (subscribers only) | 4014 | M: linux-omap@vger.kernel.org |
| 4061 | W: http://linux.omap.com | 4015 | W: http://linux.omap.com |
| 4062 | W: http://www.muru.com/linux/omap/ | 4016 | W: http://www.muru.com/linux/omap/ |
| 4063 | S: Maintained | 4017 | S: Maintained |
| @@ -4195,12 +4149,6 @@ M: oliver@neukum.name | |||
| 4195 | L: linux-usb@vger.kernel.org | 4149 | L: linux-usb@vger.kernel.org |
| 4196 | S: Maintained | 4150 | S: Maintained |
| 4197 | 4151 | ||
| 4198 | USB AUERSWALD DRIVER | ||
| 4199 | P: Wolfgang Muees | ||
| 4200 | M: wolfgang@iksw-muees.de | ||
| 4201 | L: linux-usb@vger.kernel.org | ||
| 4202 | S: Maintained | ||
| 4203 | |||
| 4204 | USB BLOCK DRIVER (UB ub) | 4152 | USB BLOCK DRIVER (UB ub) |
| 4205 | P: Pete Zaitcev | 4153 | P: Pete Zaitcev |
| 4206 | M: zaitcev@redhat.com | 4154 | M: zaitcev@redhat.com |
| @@ -1,7 +1,7 @@ | |||
| 1 | VERSION = 2 | 1 | VERSION = 2 |
| 2 | PATCHLEVEL = 6 | 2 | PATCHLEVEL = 6 |
| 3 | SUBLEVEL = 27 | 3 | SUBLEVEL = 27 |
| 4 | EXTRAVERSION = -rc2 | 4 | EXTRAVERSION = -rc5 |
| 5 | NAME = Rotary Wombat | 5 | NAME = Rotary Wombat |
| 6 | 6 | ||
| 7 | # *DOCUMENTATION* | 7 | # *DOCUMENTATION* |
| @@ -822,6 +822,9 @@ endif | |||
| 822 | ifdef CONFIG_SAMPLES | 822 | ifdef CONFIG_SAMPLES |
| 823 | $(Q)$(MAKE) $(build)=samples | 823 | $(Q)$(MAKE) $(build)=samples |
| 824 | endif | 824 | endif |
| 825 | ifdef CONFIG_BUILD_DOCSRC | ||
| 826 | $(Q)$(MAKE) $(build)=Documentation | ||
| 827 | endif | ||
| 825 | $(call vmlinux-modpost) | 828 | $(call vmlinux-modpost) |
| 826 | $(call if_changed_rule,vmlinux__) | 829 | $(call if_changed_rule,vmlinux__) |
| 827 | $(Q)rm -f .old_version | 830 | $(Q)rm -f .old_version |
| @@ -1166,7 +1169,7 @@ MRPROPER_FILES += .config .config.old include/asm .version .old_version \ | |||
| 1166 | # | 1169 | # |
| 1167 | clean: rm-dirs := $(CLEAN_DIRS) | 1170 | clean: rm-dirs := $(CLEAN_DIRS) |
| 1168 | clean: rm-files := $(CLEAN_FILES) | 1171 | clean: rm-files := $(CLEAN_FILES) |
| 1169 | clean-dirs := $(addprefix _clean_,$(srctree) $(vmlinux-alldirs)) | 1172 | clean-dirs := $(addprefix _clean_,$(srctree) $(vmlinux-alldirs) Documentation) |
| 1170 | 1173 | ||
| 1171 | PHONY += $(clean-dirs) clean archclean | 1174 | PHONY += $(clean-dirs) clean archclean |
| 1172 | $(clean-dirs): | 1175 | $(clean-dirs): |
diff --git a/include/asm-alpha/8253pit.h b/arch/alpha/include/asm/8253pit.h index fef5c1450e47..fef5c1450e47 100644 --- a/include/asm-alpha/8253pit.h +++ b/arch/alpha/include/asm/8253pit.h | |||
diff --git a/include/asm-alpha/Kbuild b/arch/alpha/include/asm/Kbuild index b7c8f188b313..b7c8f188b313 100644 --- a/include/asm-alpha/Kbuild +++ b/arch/alpha/include/asm/Kbuild | |||
diff --git a/include/asm-alpha/a.out-core.h b/arch/alpha/include/asm/a.out-core.h index 9e33e92e524c..9e33e92e524c 100644 --- a/include/asm-alpha/a.out-core.h +++ b/arch/alpha/include/asm/a.out-core.h | |||
diff --git a/include/asm-alpha/a.out.h b/arch/alpha/include/asm/a.out.h index 02ce8473870a..02ce8473870a 100644 --- a/include/asm-alpha/a.out.h +++ b/arch/alpha/include/asm/a.out.h | |||
diff --git a/include/asm-alpha/agp.h b/arch/alpha/include/asm/agp.h index 26c179135293..26c179135293 100644 --- a/include/asm-alpha/agp.h +++ b/arch/alpha/include/asm/agp.h | |||
diff --git a/include/asm-alpha/agp_backend.h b/arch/alpha/include/asm/agp_backend.h index 55dd44a2cea7..55dd44a2cea7 100644 --- a/include/asm-alpha/agp_backend.h +++ b/arch/alpha/include/asm/agp_backend.h | |||
diff --git a/include/asm-alpha/atomic.h b/arch/alpha/include/asm/atomic.h index ca88e54dec93..ca88e54dec93 100644 --- a/include/asm-alpha/atomic.h +++ b/arch/alpha/include/asm/atomic.h | |||
diff --git a/include/asm-alpha/auxvec.h b/arch/alpha/include/asm/auxvec.h index e96fe880e310..e96fe880e310 100644 --- a/include/asm-alpha/auxvec.h +++ b/arch/alpha/include/asm/auxvec.h | |||
diff --git a/include/asm-alpha/barrier.h b/arch/alpha/include/asm/barrier.h index ac78eba909bc..ac78eba909bc 100644 --- a/include/asm-alpha/barrier.h +++ b/arch/alpha/include/asm/barrier.h | |||
diff --git a/include/asm-alpha/bitops.h b/arch/alpha/include/asm/bitops.h index 15f3ae25c511..15f3ae25c511 100644 --- a/include/asm-alpha/bitops.h +++ b/arch/alpha/include/asm/bitops.h | |||
diff --git a/include/asm-alpha/bug.h b/arch/alpha/include/asm/bug.h index 695a5ee4b5d3..695a5ee4b5d3 100644 --- a/include/asm-alpha/bug.h +++ b/arch/alpha/include/asm/bug.h | |||
diff --git a/include/asm-alpha/bugs.h b/arch/alpha/include/asm/bugs.h index 78030d1c7e7e..78030d1c7e7e 100644 --- a/include/asm-alpha/bugs.h +++ b/arch/alpha/include/asm/bugs.h | |||
diff --git a/include/asm-alpha/byteorder.h b/arch/alpha/include/asm/byteorder.h index 58e958fc7f1b..58e958fc7f1b 100644 --- a/include/asm-alpha/byteorder.h +++ b/arch/alpha/include/asm/byteorder.h | |||
diff --git a/include/asm-alpha/cache.h b/arch/alpha/include/asm/cache.h index f199e69a5d0b..f199e69a5d0b 100644 --- a/include/asm-alpha/cache.h +++ b/arch/alpha/include/asm/cache.h | |||
diff --git a/include/asm-alpha/cacheflush.h b/arch/alpha/include/asm/cacheflush.h index b686cc7fc44e..b686cc7fc44e 100644 --- a/include/asm-alpha/cacheflush.h +++ b/arch/alpha/include/asm/cacheflush.h | |||
diff --git a/include/asm-alpha/checksum.h b/arch/alpha/include/asm/checksum.h index d3854bbf0a9e..d3854bbf0a9e 100644 --- a/include/asm-alpha/checksum.h +++ b/arch/alpha/include/asm/checksum.h | |||
diff --git a/include/asm-alpha/compiler.h b/arch/alpha/include/asm/compiler.h index da6bb199839c..da6bb199839c 100644 --- a/include/asm-alpha/compiler.h +++ b/arch/alpha/include/asm/compiler.h | |||
diff --git a/include/asm-alpha/console.h b/arch/alpha/include/asm/console.h index a3ce4e62249b..a3ce4e62249b 100644 --- a/include/asm-alpha/console.h +++ b/arch/alpha/include/asm/console.h | |||
diff --git a/include/asm-alpha/core_apecs.h b/arch/alpha/include/asm/core_apecs.h index 6785ff7e02bc..6785ff7e02bc 100644 --- a/include/asm-alpha/core_apecs.h +++ b/arch/alpha/include/asm/core_apecs.h | |||
diff --git a/include/asm-alpha/core_cia.h b/arch/alpha/include/asm/core_cia.h index 9e0516c0ca27..9e0516c0ca27 100644 --- a/include/asm-alpha/core_cia.h +++ b/arch/alpha/include/asm/core_cia.h | |||
diff --git a/include/asm-alpha/core_irongate.h b/arch/alpha/include/asm/core_irongate.h index 24b2db541501..24b2db541501 100644 --- a/include/asm-alpha/core_irongate.h +++ b/arch/alpha/include/asm/core_irongate.h | |||
diff --git a/include/asm-alpha/core_lca.h b/arch/alpha/include/asm/core_lca.h index f7cb4b460954..f7cb4b460954 100644 --- a/include/asm-alpha/core_lca.h +++ b/arch/alpha/include/asm/core_lca.h | |||
diff --git a/include/asm-alpha/core_marvel.h b/arch/alpha/include/asm/core_marvel.h index 30d55fe7aaf6..30d55fe7aaf6 100644 --- a/include/asm-alpha/core_marvel.h +++ b/arch/alpha/include/asm/core_marvel.h | |||
diff --git a/include/asm-alpha/core_mcpcia.h b/arch/alpha/include/asm/core_mcpcia.h index acf55b483472..acf55b483472 100644 --- a/include/asm-alpha/core_mcpcia.h +++ b/arch/alpha/include/asm/core_mcpcia.h | |||
diff --git a/include/asm-alpha/core_polaris.h b/arch/alpha/include/asm/core_polaris.h index 2f966b64659d..2f966b64659d 100644 --- a/include/asm-alpha/core_polaris.h +++ b/arch/alpha/include/asm/core_polaris.h | |||
diff --git a/include/asm-alpha/core_t2.h b/arch/alpha/include/asm/core_t2.h index 46bfff58f670..46bfff58f670 100644 --- a/include/asm-alpha/core_t2.h +++ b/arch/alpha/include/asm/core_t2.h | |||
diff --git a/include/asm-alpha/core_titan.h b/arch/alpha/include/asm/core_titan.h index a17f6f33b68e..a17f6f33b68e 100644 --- a/include/asm-alpha/core_titan.h +++ b/arch/alpha/include/asm/core_titan.h | |||
diff --git a/include/asm-alpha/core_tsunami.h b/arch/alpha/include/asm/core_tsunami.h index 58d4fe48742c..58d4fe48742c 100644 --- a/include/asm-alpha/core_tsunami.h +++ b/arch/alpha/include/asm/core_tsunami.h | |||
diff --git a/include/asm-alpha/core_wildfire.h b/arch/alpha/include/asm/core_wildfire.h index cd562f544ba2..cd562f544ba2 100644 --- a/include/asm-alpha/core_wildfire.h +++ b/arch/alpha/include/asm/core_wildfire.h | |||
diff --git a/include/asm-alpha/cputime.h b/arch/alpha/include/asm/cputime.h index 19577fd93230..19577fd93230 100644 --- a/include/asm-alpha/cputime.h +++ b/arch/alpha/include/asm/cputime.h | |||
diff --git a/include/asm-alpha/current.h b/arch/alpha/include/asm/current.h index 094d285a1b34..094d285a1b34 100644 --- a/include/asm-alpha/current.h +++ b/arch/alpha/include/asm/current.h | |||
diff --git a/include/asm-alpha/delay.h b/arch/alpha/include/asm/delay.h index 2aa3f410f7e6..2aa3f410f7e6 100644 --- a/include/asm-alpha/delay.h +++ b/arch/alpha/include/asm/delay.h | |||
diff --git a/include/asm-alpha/device.h b/arch/alpha/include/asm/device.h index d8f9872b0e2d..d8f9872b0e2d 100644 --- a/include/asm-alpha/device.h +++ b/arch/alpha/include/asm/device.h | |||
diff --git a/include/asm-alpha/div64.h b/arch/alpha/include/asm/div64.h index 6cd978cefb28..6cd978cefb28 100644 --- a/include/asm-alpha/div64.h +++ b/arch/alpha/include/asm/div64.h | |||
diff --git a/include/asm-alpha/dma-mapping.h b/arch/alpha/include/asm/dma-mapping.h index a5801ae02e4b..a5801ae02e4b 100644 --- a/include/asm-alpha/dma-mapping.h +++ b/arch/alpha/include/asm/dma-mapping.h | |||
diff --git a/include/asm-alpha/dma.h b/arch/alpha/include/asm/dma.h index 87cfdbdf08fc..87cfdbdf08fc 100644 --- a/include/asm-alpha/dma.h +++ b/arch/alpha/include/asm/dma.h | |||
diff --git a/include/asm-alpha/elf.h b/arch/alpha/include/asm/elf.h index fc1002ea1e0c..fc1002ea1e0c 100644 --- a/include/asm-alpha/elf.h +++ b/arch/alpha/include/asm/elf.h | |||
diff --git a/include/asm-alpha/emergency-restart.h b/arch/alpha/include/asm/emergency-restart.h index 108d8c48e42e..108d8c48e42e 100644 --- a/include/asm-alpha/emergency-restart.h +++ b/arch/alpha/include/asm/emergency-restart.h | |||
diff --git a/include/asm-alpha/err_common.h b/arch/alpha/include/asm/err_common.h index c25095942107..c25095942107 100644 --- a/include/asm-alpha/err_common.h +++ b/arch/alpha/include/asm/err_common.h | |||
diff --git a/include/asm-alpha/err_ev6.h b/arch/alpha/include/asm/err_ev6.h index ea637791e4a9..ea637791e4a9 100644 --- a/include/asm-alpha/err_ev6.h +++ b/arch/alpha/include/asm/err_ev6.h | |||
diff --git a/include/asm-alpha/err_ev7.h b/arch/alpha/include/asm/err_ev7.h index 87f99777c2e4..87f99777c2e4 100644 --- a/include/asm-alpha/err_ev7.h +++ b/arch/alpha/include/asm/err_ev7.h | |||
diff --git a/include/asm-alpha/errno.h b/arch/alpha/include/asm/errno.h index 69e2655249d2..69e2655249d2 100644 --- a/include/asm-alpha/errno.h +++ b/arch/alpha/include/asm/errno.h | |||
diff --git a/include/asm-alpha/fb.h b/arch/alpha/include/asm/fb.h index fa9bbb96b2b3..fa9bbb96b2b3 100644 --- a/include/asm-alpha/fb.h +++ b/arch/alpha/include/asm/fb.h | |||
diff --git a/include/asm-alpha/fcntl.h b/arch/alpha/include/asm/fcntl.h index 25da0017ec87..25da0017ec87 100644 --- a/include/asm-alpha/fcntl.h +++ b/arch/alpha/include/asm/fcntl.h | |||
diff --git a/include/asm-alpha/floppy.h b/arch/alpha/include/asm/floppy.h index 0be50413b2b5..0be50413b2b5 100644 --- a/include/asm-alpha/floppy.h +++ b/arch/alpha/include/asm/floppy.h | |||
diff --git a/include/asm-alpha/fpu.h b/arch/alpha/include/asm/fpu.h index ecb17a72acc3..ecb17a72acc3 100644 --- a/include/asm-alpha/fpu.h +++ b/arch/alpha/include/asm/fpu.h | |||
diff --git a/include/asm-alpha/futex.h b/arch/alpha/include/asm/futex.h index 6a332a9f099c..6a332a9f099c 100644 --- a/include/asm-alpha/futex.h +++ b/arch/alpha/include/asm/futex.h | |||
diff --git a/include/asm-alpha/gct.h b/arch/alpha/include/asm/gct.h index 3504c704927c..3504c704927c 100644 --- a/include/asm-alpha/gct.h +++ b/arch/alpha/include/asm/gct.h | |||
diff --git a/include/asm-alpha/gentrap.h b/arch/alpha/include/asm/gentrap.h index ae50cc3192c7..ae50cc3192c7 100644 --- a/include/asm-alpha/gentrap.h +++ b/arch/alpha/include/asm/gentrap.h | |||
diff --git a/include/asm-alpha/hardirq.h b/arch/alpha/include/asm/hardirq.h index d953e234daa8..d953e234daa8 100644 --- a/include/asm-alpha/hardirq.h +++ b/arch/alpha/include/asm/hardirq.h | |||
diff --git a/include/asm-alpha/hw_irq.h b/arch/alpha/include/asm/hw_irq.h index a37db0f95092..a37db0f95092 100644 --- a/include/asm-alpha/hw_irq.h +++ b/arch/alpha/include/asm/hw_irq.h | |||
diff --git a/include/asm-alpha/hwrpb.h b/arch/alpha/include/asm/hwrpb.h index 8e8f871af7cf..8e8f871af7cf 100644 --- a/include/asm-alpha/hwrpb.h +++ b/arch/alpha/include/asm/hwrpb.h | |||
diff --git a/include/asm-alpha/io.h b/arch/alpha/include/asm/io.h index e971ab000f95..e971ab000f95 100644 --- a/include/asm-alpha/io.h +++ b/arch/alpha/include/asm/io.h | |||
diff --git a/include/asm-alpha/io_trivial.h b/arch/alpha/include/asm/io_trivial.h index 1c77f10b4b36..1c77f10b4b36 100644 --- a/include/asm-alpha/io_trivial.h +++ b/arch/alpha/include/asm/io_trivial.h | |||
diff --git a/include/asm-alpha/ioctl.h b/arch/alpha/include/asm/ioctl.h index fc63727f4178..fc63727f4178 100644 --- a/include/asm-alpha/ioctl.h +++ b/arch/alpha/include/asm/ioctl.h | |||
diff --git a/include/asm-alpha/ioctls.h b/arch/alpha/include/asm/ioctls.h index 67bb9f6fdbe4..67bb9f6fdbe4 100644 --- a/include/asm-alpha/ioctls.h +++ b/arch/alpha/include/asm/ioctls.h | |||
diff --git a/include/asm-alpha/ipcbuf.h b/arch/alpha/include/asm/ipcbuf.h index d9c0e1a50702..d9c0e1a50702 100644 --- a/include/asm-alpha/ipcbuf.h +++ b/arch/alpha/include/asm/ipcbuf.h | |||
diff --git a/include/asm-alpha/irq.h b/arch/alpha/include/asm/irq.h index 06377400dc09..06377400dc09 100644 --- a/include/asm-alpha/irq.h +++ b/arch/alpha/include/asm/irq.h | |||
diff --git a/include/asm-alpha/irq_regs.h b/arch/alpha/include/asm/irq_regs.h index 3dd9c0b70270..3dd9c0b70270 100644 --- a/include/asm-alpha/irq_regs.h +++ b/arch/alpha/include/asm/irq_regs.h | |||
diff --git a/include/asm-alpha/jensen.h b/arch/alpha/include/asm/jensen.h index 964b06ead43b..964b06ead43b 100644 --- a/include/asm-alpha/jensen.h +++ b/arch/alpha/include/asm/jensen.h | |||
diff --git a/include/asm-alpha/kdebug.h b/arch/alpha/include/asm/kdebug.h index 6ece1b037665..6ece1b037665 100644 --- a/include/asm-alpha/kdebug.h +++ b/arch/alpha/include/asm/kdebug.h | |||
diff --git a/include/asm-alpha/kmap_types.h b/arch/alpha/include/asm/kmap_types.h index 3e6735a34c57..3e6735a34c57 100644 --- a/include/asm-alpha/kmap_types.h +++ b/arch/alpha/include/asm/kmap_types.h | |||
diff --git a/include/asm-alpha/linkage.h b/arch/alpha/include/asm/linkage.h index 291c2d01c44f..291c2d01c44f 100644 --- a/include/asm-alpha/linkage.h +++ b/arch/alpha/include/asm/linkage.h | |||
diff --git a/include/asm-alpha/local.h b/arch/alpha/include/asm/local.h index 6ad3ea696421..6ad3ea696421 100644 --- a/include/asm-alpha/local.h +++ b/arch/alpha/include/asm/local.h | |||
diff --git a/include/asm-alpha/machvec.h b/arch/alpha/include/asm/machvec.h index a86c083cdf7f..a86c083cdf7f 100644 --- a/include/asm-alpha/machvec.h +++ b/arch/alpha/include/asm/machvec.h | |||
diff --git a/include/asm-alpha/mc146818rtc.h b/arch/alpha/include/asm/mc146818rtc.h index 097703f1c8cb..097703f1c8cb 100644 --- a/include/asm-alpha/mc146818rtc.h +++ b/arch/alpha/include/asm/mc146818rtc.h | |||
diff --git a/include/asm-alpha/md.h b/arch/alpha/include/asm/md.h index 6c9b8222a4f2..6c9b8222a4f2 100644 --- a/include/asm-alpha/md.h +++ b/arch/alpha/include/asm/md.h | |||
diff --git a/include/asm-alpha/mman.h b/arch/alpha/include/asm/mman.h index 90d7c35d2867..90d7c35d2867 100644 --- a/include/asm-alpha/mman.h +++ b/arch/alpha/include/asm/mman.h | |||
diff --git a/include/asm-alpha/mmu.h b/arch/alpha/include/asm/mmu.h index 3dc127779329..3dc127779329 100644 --- a/include/asm-alpha/mmu.h +++ b/arch/alpha/include/asm/mmu.h | |||
diff --git a/include/asm-alpha/mmu_context.h b/arch/alpha/include/asm/mmu_context.h index 86c08a02d239..86c08a02d239 100644 --- a/include/asm-alpha/mmu_context.h +++ b/arch/alpha/include/asm/mmu_context.h | |||
diff --git a/include/asm-alpha/mmzone.h b/arch/alpha/include/asm/mmzone.h index 8af56ce346ad..8af56ce346ad 100644 --- a/include/asm-alpha/mmzone.h +++ b/arch/alpha/include/asm/mmzone.h | |||
diff --git a/include/asm-alpha/module.h b/arch/alpha/include/asm/module.h index 7b63743c534a..7b63743c534a 100644 --- a/include/asm-alpha/module.h +++ b/arch/alpha/include/asm/module.h | |||
diff --git a/include/asm-alpha/msgbuf.h b/arch/alpha/include/asm/msgbuf.h index 98496501a2bb..98496501a2bb 100644 --- a/include/asm-alpha/msgbuf.h +++ b/arch/alpha/include/asm/msgbuf.h | |||
diff --git a/include/asm-alpha/mutex.h b/arch/alpha/include/asm/mutex.h index 458c1f7fbc18..458c1f7fbc18 100644 --- a/include/asm-alpha/mutex.h +++ b/arch/alpha/include/asm/mutex.h | |||
diff --git a/include/asm-alpha/page.h b/arch/alpha/include/asm/page.h index 0995f9d13417..0995f9d13417 100644 --- a/include/asm-alpha/page.h +++ b/arch/alpha/include/asm/page.h | |||
diff --git a/include/asm-alpha/pal.h b/arch/alpha/include/asm/pal.h index 9b4ba0d6f00b..9b4ba0d6f00b 100644 --- a/include/asm-alpha/pal.h +++ b/arch/alpha/include/asm/pal.h | |||
diff --git a/include/asm-alpha/param.h b/arch/alpha/include/asm/param.h index e691ecfedb2c..e691ecfedb2c 100644 --- a/include/asm-alpha/param.h +++ b/arch/alpha/include/asm/param.h | |||
diff --git a/include/asm-alpha/parport.h b/arch/alpha/include/asm/parport.h index c5ee7cbb2fcd..c5ee7cbb2fcd 100644 --- a/include/asm-alpha/parport.h +++ b/arch/alpha/include/asm/parport.h | |||
diff --git a/include/asm-alpha/pci.h b/arch/alpha/include/asm/pci.h index 2a14302c17a3..2a14302c17a3 100644 --- a/include/asm-alpha/pci.h +++ b/arch/alpha/include/asm/pci.h | |||
diff --git a/include/asm-alpha/percpu.h b/arch/alpha/include/asm/percpu.h index 3495e8e00d70..3495e8e00d70 100644 --- a/include/asm-alpha/percpu.h +++ b/arch/alpha/include/asm/percpu.h | |||
diff --git a/include/asm-alpha/pgalloc.h b/arch/alpha/include/asm/pgalloc.h index fd090155dccd..fd090155dccd 100644 --- a/include/asm-alpha/pgalloc.h +++ b/arch/alpha/include/asm/pgalloc.h | |||
diff --git a/include/asm-alpha/pgtable.h b/arch/alpha/include/asm/pgtable.h index 3f0c59f6d8aa..3f0c59f6d8aa 100644 --- a/include/asm-alpha/pgtable.h +++ b/arch/alpha/include/asm/pgtable.h | |||
diff --git a/include/asm-alpha/poll.h b/arch/alpha/include/asm/poll.h index c98509d3149e..c98509d3149e 100644 --- a/include/asm-alpha/poll.h +++ b/arch/alpha/include/asm/poll.h | |||
diff --git a/include/asm-alpha/posix_types.h b/arch/alpha/include/asm/posix_types.h index db167413300b..db167413300b 100644 --- a/include/asm-alpha/posix_types.h +++ b/arch/alpha/include/asm/posix_types.h | |||
diff --git a/include/asm-alpha/processor.h b/arch/alpha/include/asm/processor.h index 94afe5859301..94afe5859301 100644 --- a/include/asm-alpha/processor.h +++ b/arch/alpha/include/asm/processor.h | |||
diff --git a/include/asm-alpha/ptrace.h b/arch/alpha/include/asm/ptrace.h index 32c7a5cddd59..32c7a5cddd59 100644 --- a/include/asm-alpha/ptrace.h +++ b/arch/alpha/include/asm/ptrace.h | |||
diff --git a/include/asm-alpha/reg.h b/arch/alpha/include/asm/reg.h index 86ff916fb069..86ff916fb069 100644 --- a/include/asm-alpha/reg.h +++ b/arch/alpha/include/asm/reg.h | |||
diff --git a/include/asm-alpha/regdef.h b/arch/alpha/include/asm/regdef.h index 142df9c4f8b8..142df9c4f8b8 100644 --- a/include/asm-alpha/regdef.h +++ b/arch/alpha/include/asm/regdef.h | |||
diff --git a/include/asm-alpha/resource.h b/arch/alpha/include/asm/resource.h index c10874ff5973..c10874ff5973 100644 --- a/include/asm-alpha/resource.h +++ b/arch/alpha/include/asm/resource.h | |||
diff --git a/include/asm-alpha/rtc.h b/arch/alpha/include/asm/rtc.h index 4e854b1333eb..4e854b1333eb 100644 --- a/include/asm-alpha/rtc.h +++ b/arch/alpha/include/asm/rtc.h | |||
diff --git a/include/asm-alpha/rwsem.h b/arch/alpha/include/asm/rwsem.h index 1570c0b54336..1570c0b54336 100644 --- a/include/asm-alpha/rwsem.h +++ b/arch/alpha/include/asm/rwsem.h | |||
diff --git a/include/asm-alpha/scatterlist.h b/arch/alpha/include/asm/scatterlist.h index 440747ca6349..440747ca6349 100644 --- a/include/asm-alpha/scatterlist.h +++ b/arch/alpha/include/asm/scatterlist.h | |||
diff --git a/include/asm-alpha/sections.h b/arch/alpha/include/asm/sections.h index 43b40edd6e44..43b40edd6e44 100644 --- a/include/asm-alpha/sections.h +++ b/arch/alpha/include/asm/sections.h | |||
diff --git a/include/asm-alpha/segment.h b/arch/alpha/include/asm/segment.h index 0453d97daae7..0453d97daae7 100644 --- a/include/asm-alpha/segment.h +++ b/arch/alpha/include/asm/segment.h | |||
diff --git a/include/asm-alpha/sembuf.h b/arch/alpha/include/asm/sembuf.h index 7b38b1534784..7b38b1534784 100644 --- a/include/asm-alpha/sembuf.h +++ b/arch/alpha/include/asm/sembuf.h | |||
diff --git a/include/asm-alpha/serial.h b/arch/alpha/include/asm/serial.h index 9d263e8d8ccc..9d263e8d8ccc 100644 --- a/include/asm-alpha/serial.h +++ b/arch/alpha/include/asm/serial.h | |||
diff --git a/include/asm-alpha/setup.h b/arch/alpha/include/asm/setup.h index 2e023a4aa317..2e023a4aa317 100644 --- a/include/asm-alpha/setup.h +++ b/arch/alpha/include/asm/setup.h | |||
diff --git a/include/asm-alpha/sfp-machine.h b/arch/alpha/include/asm/sfp-machine.h index 5fe63afbd474..5fe63afbd474 100644 --- a/include/asm-alpha/sfp-machine.h +++ b/arch/alpha/include/asm/sfp-machine.h | |||
diff --git a/include/asm-alpha/shmbuf.h b/arch/alpha/include/asm/shmbuf.h index 37ee84f05085..37ee84f05085 100644 --- a/include/asm-alpha/shmbuf.h +++ b/arch/alpha/include/asm/shmbuf.h | |||
diff --git a/include/asm-alpha/shmparam.h b/arch/alpha/include/asm/shmparam.h index cc901d58aebb..cc901d58aebb 100644 --- a/include/asm-alpha/shmparam.h +++ b/arch/alpha/include/asm/shmparam.h | |||
diff --git a/include/asm-alpha/sigcontext.h b/arch/alpha/include/asm/sigcontext.h index 323cdb026198..323cdb026198 100644 --- a/include/asm-alpha/sigcontext.h +++ b/arch/alpha/include/asm/sigcontext.h | |||
diff --git a/include/asm-alpha/siginfo.h b/arch/alpha/include/asm/siginfo.h index 9822362a8424..9822362a8424 100644 --- a/include/asm-alpha/siginfo.h +++ b/arch/alpha/include/asm/siginfo.h | |||
diff --git a/include/asm-alpha/signal.h b/arch/alpha/include/asm/signal.h index 13c2305d35ef..13c2305d35ef 100644 --- a/include/asm-alpha/signal.h +++ b/arch/alpha/include/asm/signal.h | |||
diff --git a/include/asm-alpha/smp.h b/arch/alpha/include/asm/smp.h index 544c69af8168..544c69af8168 100644 --- a/include/asm-alpha/smp.h +++ b/arch/alpha/include/asm/smp.h | |||
diff --git a/include/asm-alpha/socket.h b/arch/alpha/include/asm/socket.h index a1057c2d95e7..a1057c2d95e7 100644 --- a/include/asm-alpha/socket.h +++ b/arch/alpha/include/asm/socket.h | |||
diff --git a/include/asm-alpha/sockios.h b/arch/alpha/include/asm/sockios.h index 7932c7ab4a4d..7932c7ab4a4d 100644 --- a/include/asm-alpha/sockios.h +++ b/arch/alpha/include/asm/sockios.h | |||
diff --git a/include/asm-alpha/spinlock.h b/arch/alpha/include/asm/spinlock.h index aeeb125f6851..aeeb125f6851 100644 --- a/include/asm-alpha/spinlock.h +++ b/arch/alpha/include/asm/spinlock.h | |||
diff --git a/include/asm-alpha/spinlock_types.h b/arch/alpha/include/asm/spinlock_types.h index 8141eb5ebf0d..8141eb5ebf0d 100644 --- a/include/asm-alpha/spinlock_types.h +++ b/arch/alpha/include/asm/spinlock_types.h | |||
diff --git a/include/asm-alpha/stat.h b/arch/alpha/include/asm/stat.h index 07ad3e6b3f3e..07ad3e6b3f3e 100644 --- a/include/asm-alpha/stat.h +++ b/arch/alpha/include/asm/stat.h | |||
diff --git a/include/asm-alpha/statfs.h b/arch/alpha/include/asm/statfs.h index ad15830baefe..ad15830baefe 100644 --- a/include/asm-alpha/statfs.h +++ b/arch/alpha/include/asm/statfs.h | |||
diff --git a/include/asm-alpha/string.h b/arch/alpha/include/asm/string.h index b02b8a282940..b02b8a282940 100644 --- a/include/asm-alpha/string.h +++ b/arch/alpha/include/asm/string.h | |||
diff --git a/include/asm-alpha/suspend.h b/arch/alpha/include/asm/suspend.h index c7042d575851..c7042d575851 100644 --- a/include/asm-alpha/suspend.h +++ b/arch/alpha/include/asm/suspend.h | |||
diff --git a/include/asm-alpha/sysinfo.h b/arch/alpha/include/asm/sysinfo.h index 086aba284df2..086aba284df2 100644 --- a/include/asm-alpha/sysinfo.h +++ b/arch/alpha/include/asm/sysinfo.h | |||
diff --git a/include/asm-alpha/system.h b/arch/alpha/include/asm/system.h index afe20fa58c99..afe20fa58c99 100644 --- a/include/asm-alpha/system.h +++ b/arch/alpha/include/asm/system.h | |||
diff --git a/include/asm-alpha/termbits.h b/arch/alpha/include/asm/termbits.h index ad854a4a3af6..ad854a4a3af6 100644 --- a/include/asm-alpha/termbits.h +++ b/arch/alpha/include/asm/termbits.h | |||
diff --git a/include/asm-alpha/termios.h b/arch/alpha/include/asm/termios.h index fa13716a11c3..fa13716a11c3 100644 --- a/include/asm-alpha/termios.h +++ b/arch/alpha/include/asm/termios.h | |||
diff --git a/include/asm-alpha/thread_info.h b/arch/alpha/include/asm/thread_info.h index 15fda4344424..15fda4344424 100644 --- a/include/asm-alpha/thread_info.h +++ b/arch/alpha/include/asm/thread_info.h | |||
diff --git a/include/asm-alpha/timex.h b/arch/alpha/include/asm/timex.h index afa0c45e3e98..afa0c45e3e98 100644 --- a/include/asm-alpha/timex.h +++ b/arch/alpha/include/asm/timex.h | |||
diff --git a/include/asm-alpha/tlb.h b/arch/alpha/include/asm/tlb.h index c13636575fba..c13636575fba 100644 --- a/include/asm-alpha/tlb.h +++ b/arch/alpha/include/asm/tlb.h | |||
diff --git a/include/asm-alpha/tlbflush.h b/arch/alpha/include/asm/tlbflush.h index 9d87aaa08c0d..9d87aaa08c0d 100644 --- a/include/asm-alpha/tlbflush.h +++ b/arch/alpha/include/asm/tlbflush.h | |||
diff --git a/include/asm-alpha/topology.h b/arch/alpha/include/asm/topology.h index 149532e162c4..149532e162c4 100644 --- a/include/asm-alpha/topology.h +++ b/arch/alpha/include/asm/topology.h | |||
diff --git a/include/asm-alpha/types.h b/arch/alpha/include/asm/types.h index c1541353ccef..c1541353ccef 100644 --- a/include/asm-alpha/types.h +++ b/arch/alpha/include/asm/types.h | |||
diff --git a/include/asm-alpha/uaccess.h b/arch/alpha/include/asm/uaccess.h index 22de3b434a22..22de3b434a22 100644 --- a/include/asm-alpha/uaccess.h +++ b/arch/alpha/include/asm/uaccess.h | |||
diff --git a/include/asm-alpha/ucontext.h b/arch/alpha/include/asm/ucontext.h index 47578ab42152..47578ab42152 100644 --- a/include/asm-alpha/ucontext.h +++ b/arch/alpha/include/asm/ucontext.h | |||
diff --git a/include/asm-alpha/unaligned.h b/arch/alpha/include/asm/unaligned.h index 3787c60aed3f..3787c60aed3f 100644 --- a/include/asm-alpha/unaligned.h +++ b/arch/alpha/include/asm/unaligned.h | |||
diff --git a/include/asm-alpha/unistd.h b/arch/alpha/include/asm/unistd.h index 5b5c17485942..5b5c17485942 100644 --- a/include/asm-alpha/unistd.h +++ b/arch/alpha/include/asm/unistd.h | |||
diff --git a/include/asm-alpha/user.h b/arch/alpha/include/asm/user.h index a4eb6a4ca8d1..a4eb6a4ca8d1 100644 --- a/include/asm-alpha/user.h +++ b/arch/alpha/include/asm/user.h | |||
diff --git a/include/asm-alpha/vga.h b/arch/alpha/include/asm/vga.h index c00106bac521..c00106bac521 100644 --- a/include/asm-alpha/vga.h +++ b/arch/alpha/include/asm/vga.h | |||
diff --git a/include/asm-alpha/xor.h b/arch/alpha/include/asm/xor.h index 5ee1c2bc0499..5ee1c2bc0499 100644 --- a/include/asm-alpha/xor.h +++ b/arch/alpha/include/asm/xor.h | |||
diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c index 6e943135f0e0..8509dad31204 100644 --- a/arch/alpha/kernel/osf_sys.c +++ b/arch/alpha/kernel/osf_sys.c | |||
| @@ -121,24 +121,29 @@ osf_filldir(void *__buf, const char *name, int namlen, loff_t offset, | |||
| 121 | if (reclen > buf->count) | 121 | if (reclen > buf->count) |
| 122 | return -EINVAL; | 122 | return -EINVAL; |
| 123 | d_ino = ino; | 123 | d_ino = ino; |
| 124 | if (sizeof(d_ino) < sizeof(ino) && d_ino != ino) | 124 | if (sizeof(d_ino) < sizeof(ino) && d_ino != ino) { |
| 125 | buf->error = -EOVERFLOW; | ||
| 125 | return -EOVERFLOW; | 126 | return -EOVERFLOW; |
| 127 | } | ||
| 126 | if (buf->basep) { | 128 | if (buf->basep) { |
| 127 | if (put_user(offset, buf->basep)) | 129 | if (put_user(offset, buf->basep)) |
| 128 | return -EFAULT; | 130 | goto Efault; |
| 129 | buf->basep = NULL; | 131 | buf->basep = NULL; |
| 130 | } | 132 | } |
| 131 | dirent = buf->dirent; | 133 | dirent = buf->dirent; |
| 132 | put_user(d_ino, &dirent->d_ino); | 134 | if (put_user(d_ino, &dirent->d_ino) || |
| 133 | put_user(namlen, &dirent->d_namlen); | 135 | put_user(namlen, &dirent->d_namlen) || |
| 134 | put_user(reclen, &dirent->d_reclen); | 136 | put_user(reclen, &dirent->d_reclen) || |
| 135 | if (copy_to_user(dirent->d_name, name, namlen) || | 137 | copy_to_user(dirent->d_name, name, namlen) || |
| 136 | put_user(0, dirent->d_name + namlen)) | 138 | put_user(0, dirent->d_name + namlen)) |
| 137 | return -EFAULT; | 139 | goto Efault; |
| 138 | dirent = (void __user *)dirent + reclen; | 140 | dirent = (void __user *)dirent + reclen; |
| 139 | buf->dirent = dirent; | 141 | buf->dirent = dirent; |
| 140 | buf->count -= reclen; | 142 | buf->count -= reclen; |
| 141 | return 0; | 143 | return 0; |
| 144 | Efault: | ||
| 145 | buf->error = -EFAULT; | ||
| 146 | return -EFAULT; | ||
| 142 | } | 147 | } |
| 143 | 148 | ||
| 144 | asmlinkage int | 149 | asmlinkage int |
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 4b8acd2851f4..70dba1668907 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -810,6 +810,11 @@ config OABI_COMPAT | |||
| 810 | UNPREDICTABLE (in fact it can be predicted that it won't work | 810 | UNPREDICTABLE (in fact it can be predicted that it won't work |
| 811 | at all). If in doubt say Y. | 811 | at all). If in doubt say Y. |
| 812 | 812 | ||
| 813 | config ARCH_FLATMEM_HAS_HOLES | ||
| 814 | bool | ||
| 815 | default y | ||
| 816 | depends on FLATMEM | ||
| 817 | |||
| 813 | config ARCH_DISCONTIGMEM_ENABLE | 818 | config ARCH_DISCONTIGMEM_ENABLE |
| 814 | bool | 819 | bool |
| 815 | default (ARCH_LH7A40X && !LH7A40X_CONTIGMEM) | 820 | default (ARCH_LH7A40X && !LH7A40X_CONTIGMEM) |
diff --git a/arch/arm/boot/compressed/.gitignore b/arch/arm/boot/compressed/.gitignore index b15f927a5926..ab204db594d3 100644 --- a/arch/arm/boot/compressed/.gitignore +++ b/arch/arm/boot/compressed/.gitignore | |||
| @@ -1,2 +1,3 @@ | |||
| 1 | piggy.gz | ||
| 2 | font.c | 1 | font.c |
| 2 | piggy.gz | ||
| 3 | vmlinux.lds | ||
diff --git a/arch/arm/common/dmabounce.c b/arch/arm/common/dmabounce.c index 69130f365904..aecc6c3f908f 100644 --- a/arch/arm/common/dmabounce.c +++ b/arch/arm/common/dmabounce.c | |||
| @@ -246,9 +246,9 @@ map_single(struct device *dev, void *ptr, size_t size, | |||
| 246 | } | 246 | } |
| 247 | 247 | ||
| 248 | dev_dbg(dev, | 248 | dev_dbg(dev, |
| 249 | "%s: unsafe buffer %p (phy=%p) mapped to %p (phy=%p)\n", | 249 | "%s: unsafe buffer %p (dma=%#x) mapped to %p (dma=%#x)\n", |
| 250 | __func__, buf->ptr, (void *) virt_to_dma(dev, buf->ptr), | 250 | __func__, buf->ptr, virt_to_dma(dev, buf->ptr), |
| 251 | buf->safe, (void *) buf->safe_dma_addr); | 251 | buf->safe, buf->safe_dma_addr); |
| 252 | 252 | ||
| 253 | if ((dir == DMA_TO_DEVICE) || | 253 | if ((dir == DMA_TO_DEVICE) || |
| 254 | (dir == DMA_BIDIRECTIONAL)) { | 254 | (dir == DMA_BIDIRECTIONAL)) { |
| @@ -292,9 +292,9 @@ unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size, | |||
| 292 | BUG_ON(buf->size != size); | 292 | BUG_ON(buf->size != size); |
| 293 | 293 | ||
| 294 | dev_dbg(dev, | 294 | dev_dbg(dev, |
| 295 | "%s: unsafe buffer %p (phy=%p) mapped to %p (phy=%p)\n", | 295 | "%s: unsafe buffer %p (dma=%#x) mapped to %p (dma=%#x)\n", |
| 296 | __func__, buf->ptr, (void *) virt_to_dma(dev, buf->ptr), | 296 | __func__, buf->ptr, virt_to_dma(dev, buf->ptr), |
| 297 | buf->safe, (void *) buf->safe_dma_addr); | 297 | buf->safe, buf->safe_dma_addr); |
| 298 | 298 | ||
| 299 | DO_STATS ( device_info->bounce_count++ ); | 299 | DO_STATS ( device_info->bounce_count++ ); |
| 300 | 300 | ||
| @@ -321,9 +321,8 @@ unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size, | |||
| 321 | } | 321 | } |
| 322 | } | 322 | } |
| 323 | 323 | ||
| 324 | static inline void | 324 | static int sync_single(struct device *dev, dma_addr_t dma_addr, size_t size, |
| 325 | sync_single(struct device *dev, dma_addr_t dma_addr, size_t size, | 325 | enum dma_data_direction dir) |
| 326 | enum dma_data_direction dir) | ||
| 327 | { | 326 | { |
| 328 | struct dmabounce_device_info *device_info = dev->archdata.dmabounce; | 327 | struct dmabounce_device_info *device_info = dev->archdata.dmabounce; |
| 329 | struct safe_buffer *buf = NULL; | 328 | struct safe_buffer *buf = NULL; |
| @@ -355,9 +354,9 @@ sync_single(struct device *dev, dma_addr_t dma_addr, size_t size, | |||
| 355 | */ | 354 | */ |
| 356 | 355 | ||
| 357 | dev_dbg(dev, | 356 | dev_dbg(dev, |
| 358 | "%s: unsafe buffer %p (phy=%p) mapped to %p (phy=%p)\n", | 357 | "%s: unsafe buffer %p (dma=%#x) mapped to %p (dma=%#x)\n", |
| 359 | __func__, buf->ptr, (void *) virt_to_dma(dev, buf->ptr), | 358 | __func__, buf->ptr, virt_to_dma(dev, buf->ptr), |
| 360 | buf->safe, (void *) buf->safe_dma_addr); | 359 | buf->safe, buf->safe_dma_addr); |
| 361 | 360 | ||
| 362 | DO_STATS ( device_info->bounce_count++ ); | 361 | DO_STATS ( device_info->bounce_count++ ); |
| 363 | 362 | ||
| @@ -383,8 +382,9 @@ sync_single(struct device *dev, dma_addr_t dma_addr, size_t size, | |||
| 383 | * No need to sync the safe buffer - it was allocated | 382 | * No need to sync the safe buffer - it was allocated |
| 384 | * via the coherent allocators. | 383 | * via the coherent allocators. |
| 385 | */ | 384 | */ |
| 385 | return 0; | ||
| 386 | } else { | 386 | } else { |
| 387 | dma_cache_maint(dma_to_virt(dev, dma_addr), size, dir); | 387 | return 1; |
| 388 | } | 388 | } |
| 389 | } | 389 | } |
| 390 | 390 | ||
| @@ -474,25 +474,29 @@ dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nents, | |||
| 474 | } | 474 | } |
| 475 | } | 475 | } |
| 476 | 476 | ||
| 477 | void | 477 | void dma_sync_single_range_for_cpu(struct device *dev, dma_addr_t dma_addr, |
| 478 | dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_addr, size_t size, | 478 | unsigned long offset, size_t size, |
| 479 | enum dma_data_direction dir) | 479 | enum dma_data_direction dir) |
| 480 | { | 480 | { |
| 481 | dev_dbg(dev, "%s(ptr=%p,size=%d,dir=%x)\n", | 481 | dev_dbg(dev, "%s(dma=%#x,off=%#lx,size=%zx,dir=%x)\n", |
| 482 | __func__, (void *) dma_addr, size, dir); | 482 | __func__, dma_addr, offset, size, dir); |
| 483 | 483 | ||
| 484 | sync_single(dev, dma_addr, size, dir); | 484 | if (sync_single(dev, dma_addr, offset + size, dir)) |
| 485 | dma_cache_maint(dma_to_virt(dev, dma_addr) + offset, size, dir); | ||
| 485 | } | 486 | } |
| 487 | EXPORT_SYMBOL(dma_sync_single_range_for_cpu); | ||
| 486 | 488 | ||
| 487 | void | 489 | void dma_sync_single_range_for_device(struct device *dev, dma_addr_t dma_addr, |
| 488 | dma_sync_single_for_device(struct device *dev, dma_addr_t dma_addr, size_t size, | 490 | unsigned long offset, size_t size, |
| 489 | enum dma_data_direction dir) | 491 | enum dma_data_direction dir) |
| 490 | { | 492 | { |
| 491 | dev_dbg(dev, "%s(ptr=%p,size=%d,dir=%x)\n", | 493 | dev_dbg(dev, "%s(dma=%#x,off=%#lx,size=%zx,dir=%x)\n", |
| 492 | __func__, (void *) dma_addr, size, dir); | 494 | __func__, dma_addr, offset, size, dir); |
| 493 | 495 | ||
| 494 | sync_single(dev, dma_addr, size, dir); | 496 | if (sync_single(dev, dma_addr, offset + size, dir)) |
| 497 | dma_cache_maint(dma_to_virt(dev, dma_addr) + offset, size, dir); | ||
| 495 | } | 498 | } |
| 499 | EXPORT_SYMBOL(dma_sync_single_range_for_device); | ||
| 496 | 500 | ||
| 497 | void | 501 | void |
| 498 | dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nents, | 502 | dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nents, |
| @@ -644,8 +648,6 @@ EXPORT_SYMBOL(dma_map_single); | |||
| 644 | EXPORT_SYMBOL(dma_unmap_single); | 648 | EXPORT_SYMBOL(dma_unmap_single); |
| 645 | EXPORT_SYMBOL(dma_map_sg); | 649 | EXPORT_SYMBOL(dma_map_sg); |
| 646 | EXPORT_SYMBOL(dma_unmap_sg); | 650 | EXPORT_SYMBOL(dma_unmap_sg); |
| 647 | EXPORT_SYMBOL(dma_sync_single_for_cpu); | ||
| 648 | EXPORT_SYMBOL(dma_sync_single_for_device); | ||
| 649 | EXPORT_SYMBOL(dma_sync_sg_for_cpu); | 651 | EXPORT_SYMBOL(dma_sync_sg_for_cpu); |
| 650 | EXPORT_SYMBOL(dma_sync_sg_for_device); | 652 | EXPORT_SYMBOL(dma_sync_sg_for_device); |
| 651 | EXPORT_SYMBOL(dmabounce_register_dev); | 653 | EXPORT_SYMBOL(dmabounce_register_dev); |
diff --git a/arch/arm/configs/ams_delta_defconfig b/arch/arm/configs/ams_delta_defconfig new file mode 100644 index 000000000000..2c4aa11f0b0d --- /dev/null +++ b/arch/arm/configs/ams_delta_defconfig | |||
| @@ -0,0 +1,1314 @@ | |||
| 1 | # | ||
| 2 | # Automatically generated make config: don't edit | ||
| 3 | # Linux kernel version: 2.6.22-rc1-omap1 | ||
| 4 | # Thu Jun 7 04:28:32 2007 | ||
| 5 | # | ||
| 6 | CONFIG_ARM=y | ||
| 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | ||
| 8 | CONFIG_GENERIC_GPIO=y | ||
| 9 | CONFIG_GENERIC_TIME=y | ||
| 10 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 11 | CONFIG_MMU=y | ||
| 12 | # CONFIG_NO_IOPORT is not set | ||
| 13 | CONFIG_GENERIC_HARDIRQS=y | ||
| 14 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 15 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 16 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
| 17 | CONFIG_HARDIRQS_SW_RESEND=y | ||
| 18 | CONFIG_GENERIC_IRQ_PROBE=y | ||
| 19 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
| 20 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
| 21 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
| 22 | CONFIG_GENERIC_HWEIGHT=y | ||
| 23 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
| 24 | CONFIG_ZONE_DMA=y | ||
| 25 | CONFIG_VECTORS_BASE=0xffff0000 | ||
| 26 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
| 27 | |||
| 28 | # | ||
| 29 | # Code maturity level options | ||
| 30 | # | ||
| 31 | CONFIG_EXPERIMENTAL=y | ||
| 32 | CONFIG_BROKEN_ON_SMP=y | ||
| 33 | CONFIG_LOCK_KERNEL=y | ||
| 34 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 35 | |||
| 36 | # | ||
| 37 | # General setup | ||
| 38 | # | ||
| 39 | CONFIG_LOCALVERSION="" | ||
| 40 | CONFIG_LOCALVERSION_AUTO=y | ||
| 41 | # CONFIG_SWAP is not set | ||
| 42 | CONFIG_SYSVIPC=y | ||
| 43 | # CONFIG_IPC_NS is not set | ||
| 44 | CONFIG_SYSVIPC_SYSCTL=y | ||
| 45 | # CONFIG_POSIX_MQUEUE is not set | ||
| 46 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 47 | # CONFIG_TASKSTATS is not set | ||
| 48 | # CONFIG_UTS_NS is not set | ||
| 49 | # CONFIG_AUDIT is not set | ||
| 50 | # CONFIG_IKCONFIG is not set | ||
| 51 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 52 | CONFIG_SYSFS_DEPRECATED=y | ||
| 53 | # CONFIG_RELAY is not set | ||
| 54 | CONFIG_BLK_DEV_INITRD=y | ||
| 55 | CONFIG_INITRAMFS_SOURCE="" | ||
| 56 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
| 57 | CONFIG_SYSCTL=y | ||
| 58 | # CONFIG_EMBEDDED is not set | ||
| 59 | CONFIG_UID16=y | ||
| 60 | CONFIG_SYSCTL_SYSCALL=y | ||
| 61 | CONFIG_KALLSYMS=y | ||
| 62 | # CONFIG_KALLSYMS_ALL is not set | ||
| 63 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 64 | CONFIG_HOTPLUG=y | ||
| 65 | CONFIG_PRINTK=y | ||
| 66 | CONFIG_BUG=y | ||
| 67 | CONFIG_ELF_CORE=y | ||
| 68 | CONFIG_BASE_FULL=y | ||
| 69 | CONFIG_FUTEX=y | ||
| 70 | CONFIG_ANON_INODES=y | ||
| 71 | CONFIG_EPOLL=y | ||
| 72 | CONFIG_SIGNALFD=y | ||
| 73 | CONFIG_TIMERFD=y | ||
| 74 | CONFIG_EVENTFD=y | ||
| 75 | CONFIG_SHMEM=y | ||
| 76 | CONFIG_VM_EVENT_COUNTERS=y | ||
| 77 | CONFIG_SLAB=y | ||
| 78 | # CONFIG_SLUB is not set | ||
| 79 | # CONFIG_SLOB is not set | ||
| 80 | CONFIG_RT_MUTEXES=y | ||
| 81 | # CONFIG_TINY_SHMEM is not set | ||
| 82 | CONFIG_BASE_SMALL=0 | ||
| 83 | |||
| 84 | # | ||
| 85 | # Loadable module support | ||
| 86 | # | ||
| 87 | CONFIG_MODULES=y | ||
| 88 | CONFIG_MODULE_UNLOAD=y | ||
| 89 | CONFIG_MODULE_FORCE_UNLOAD=y | ||
| 90 | # CONFIG_MODVERSIONS is not set | ||
| 91 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 92 | CONFIG_KMOD=y | ||
| 93 | |||
| 94 | # | ||
| 95 | # Block layer | ||
| 96 | # | ||
| 97 | CONFIG_BLOCK=y | ||
| 98 | # CONFIG_LBD is not set | ||
| 99 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 100 | # CONFIG_LSF is not set | ||
| 101 | |||
| 102 | # | ||
| 103 | # IO Schedulers | ||
| 104 | # | ||
| 105 | CONFIG_IOSCHED_NOOP=y | ||
| 106 | CONFIG_IOSCHED_AS=y | ||
| 107 | CONFIG_IOSCHED_DEADLINE=y | ||
| 108 | CONFIG_IOSCHED_CFQ=y | ||
| 109 | CONFIG_DEFAULT_AS=y | ||
| 110 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 111 | # CONFIG_DEFAULT_CFQ is not set | ||
| 112 | # CONFIG_DEFAULT_NOOP is not set | ||
| 113 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 114 | |||
| 115 | # | ||
| 116 | # System Type | ||
| 117 | # | ||
| 118 | # CONFIG_ARCH_AAEC2000 is not set | ||
| 119 | # CONFIG_ARCH_INTEGRATOR is not set | ||
| 120 | # CONFIG_ARCH_REALVIEW is not set | ||
| 121 | # CONFIG_ARCH_VERSATILE is not set | ||
| 122 | # CONFIG_ARCH_AT91 is not set | ||
| 123 | # CONFIG_ARCH_CLPS7500 is not set | ||
| 124 | # CONFIG_ARCH_CLPS711X is not set | ||
| 125 | # CONFIG_ARCH_CO285 is not set | ||
| 126 | # CONFIG_ARCH_EBSA110 is not set | ||
| 127 | # CONFIG_ARCH_EP93XX is not set | ||
| 128 | # CONFIG_ARCH_FOOTBRIDGE is not set | ||
| 129 | # CONFIG_ARCH_NETX is not set | ||
| 130 | # CONFIG_ARCH_H720X is not set | ||
| 131 | # CONFIG_ARCH_IMX is not set | ||
| 132 | # CONFIG_ARCH_IOP13XX is not set | ||
| 133 | # CONFIG_ARCH_IOP32X is not set | ||
| 134 | # CONFIG_ARCH_IOP33X is not set | ||
| 135 | # CONFIG_ARCH_IXP23XX is not set | ||
| 136 | # CONFIG_ARCH_IXP2000 is not set | ||
| 137 | # CONFIG_ARCH_IXP4XX is not set | ||
| 138 | # CONFIG_ARCH_L7200 is not set | ||
| 139 | # CONFIG_ARCH_KS8695 is not set | ||
| 140 | # CONFIG_ARCH_NS9XXX is not set | ||
| 141 | # CONFIG_ARCH_PNX4008 is not set | ||
| 142 | # CONFIG_ARCH_PXA is not set | ||
| 143 | # CONFIG_ARCH_RPC is not set | ||
| 144 | # CONFIG_ARCH_SA1100 is not set | ||
| 145 | # CONFIG_ARCH_S3C2410 is not set | ||
| 146 | # CONFIG_ARCH_SHARK is not set | ||
| 147 | # CONFIG_ARCH_LH7A40X is not set | ||
| 148 | # CONFIG_ARCH_DAVINCI is not set | ||
| 149 | CONFIG_ARCH_OMAP=y | ||
| 150 | |||
| 151 | # | ||
| 152 | # TI OMAP Implementations | ||
| 153 | # | ||
| 154 | CONFIG_ARCH_OMAP1=y | ||
| 155 | # CONFIG_ARCH_OMAP2 is not set | ||
| 156 | |||
| 157 | # | ||
| 158 | # OMAP Feature Selections | ||
| 159 | # | ||
| 160 | # CONFIG_OMAP_RESET_CLOCKS is not set | ||
| 161 | # CONFIG_OMAP_BOOT_TAG is not set | ||
| 162 | # CONFIG_OMAP_GPIO_SWITCH is not set | ||
| 163 | CONFIG_OMAP_MUX=y | ||
| 164 | # CONFIG_OMAP_MUX_DEBUG is not set | ||
| 165 | CONFIG_OMAP_MUX_WARNINGS=y | ||
| 166 | CONFIG_OMAP_MCBSP=y | ||
| 167 | CONFIG_OMAP_MMU_FWK=y | ||
| 168 | CONFIG_OMAP_MBOX_FWK=m | ||
| 169 | CONFIG_OMAP_MPU_TIMER=y | ||
| 170 | # CONFIG_OMAP_32K_TIMER is not set | ||
| 171 | CONFIG_OMAP_LL_DEBUG_UART1=y | ||
| 172 | # CONFIG_OMAP_LL_DEBUG_UART2 is not set | ||
| 173 | # CONFIG_OMAP_LL_DEBUG_UART3 is not set | ||
| 174 | # CONFIG_OMAP_LL_DEBUG_LCD is not set | ||
| 175 | CONFIG_OMAP_SERIAL_WAKE=y | ||
| 176 | CONFIG_OMAP_DSP=m | ||
| 177 | # CONFIG_OMAP_DSP_MBCMD_VERBOSE is not set | ||
| 178 | # CONFIG_OMAP_DSP_TASK_MULTIOPEN is not set | ||
| 179 | # CONFIG_OMAP_DSP_FBEXPORT is not set | ||
| 180 | |||
| 181 | # | ||
| 182 | # OMAP Core Type | ||
| 183 | # | ||
| 184 | # CONFIG_ARCH_OMAP730 is not set | ||
| 185 | CONFIG_ARCH_OMAP15XX=y | ||
| 186 | # CONFIG_ARCH_OMAP16XX is not set | ||
| 187 | |||
| 188 | # | ||
| 189 | # OMAP Board Type | ||
| 190 | # | ||
| 191 | # CONFIG_MACH_OMAP_INNOVATOR is not set | ||
| 192 | # CONFIG_MACH_VOICEBLUE is not set | ||
| 193 | # CONFIG_MACH_OMAP_PALMTE is not set | ||
| 194 | # CONFIG_MACH_OMAP_PALMZ71 is not set | ||
| 195 | # CONFIG_MACH_OMAP_PALMTT is not set | ||
| 196 | # CONFIG_MACH_SX1 is not set | ||
| 197 | CONFIG_MACH_AMS_DELTA=y | ||
| 198 | # CONFIG_MACH_OMAP_GENERIC is not set | ||
| 199 | |||
| 200 | # | ||
| 201 | # OMAP CPU Speed | ||
| 202 | # | ||
| 203 | # CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER is not set | ||
| 204 | # CONFIG_OMAP_ARM_168MHZ is not set | ||
| 205 | CONFIG_OMAP_ARM_150MHZ=y | ||
| 206 | # CONFIG_OMAP_ARM_120MHZ is not set | ||
| 207 | # CONFIG_OMAP_ARM_60MHZ is not set | ||
| 208 | # CONFIG_OMAP_ARM_30MHZ is not set | ||
| 209 | |||
| 210 | # | ||
| 211 | # Processor Type | ||
| 212 | # | ||
| 213 | CONFIG_CPU_32=y | ||
| 214 | CONFIG_CPU_ARM925T=y | ||
| 215 | CONFIG_CPU_32v4T=y | ||
| 216 | CONFIG_CPU_ABRT_EV4T=y | ||
| 217 | CONFIG_CPU_CACHE_V4WT=y | ||
| 218 | CONFIG_CPU_CACHE_VIVT=y | ||
| 219 | CONFIG_CPU_COPY_V4WB=y | ||
| 220 | CONFIG_CPU_TLB_V4WBI=y | ||
| 221 | CONFIG_CPU_CP15=y | ||
| 222 | CONFIG_CPU_CP15_MMU=y | ||
| 223 | |||
| 224 | # | ||
| 225 | # Processor Features | ||
| 226 | # | ||
| 227 | # CONFIG_ARM_THUMB is not set | ||
| 228 | # CONFIG_CPU_ICACHE_DISABLE is not set | ||
| 229 | # CONFIG_CPU_DCACHE_DISABLE is not set | ||
| 230 | CONFIG_CPU_DCACHE_WRITETHROUGH=y | ||
| 231 | # CONFIG_OUTER_CACHE is not set | ||
| 232 | |||
| 233 | # | ||
| 234 | # Bus support | ||
| 235 | # | ||
| 236 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 237 | |||
| 238 | # | ||
| 239 | # PCCARD (PCMCIA/CardBus) support | ||
| 240 | # | ||
| 241 | # CONFIG_PCCARD is not set | ||
| 242 | |||
| 243 | # | ||
| 244 | # Kernel Features | ||
| 245 | # | ||
| 246 | # CONFIG_TICK_ONESHOT is not set | ||
| 247 | # CONFIG_NO_HZ is not set | ||
| 248 | # CONFIG_HIGH_RES_TIMERS is not set | ||
| 249 | CONFIG_PREEMPT=y | ||
| 250 | CONFIG_HZ=100 | ||
| 251 | # CONFIG_AEABI is not set | ||
| 252 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | ||
| 253 | CONFIG_SELECT_MEMORY_MODEL=y | ||
| 254 | CONFIG_FLATMEM_MANUAL=y | ||
| 255 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
| 256 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
| 257 | CONFIG_FLATMEM=y | ||
| 258 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
| 259 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 260 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | ||
| 261 | # CONFIG_RESOURCES_64BIT is not set | ||
| 262 | CONFIG_ZONE_DMA_FLAG=1 | ||
| 263 | # CONFIG_LEDS is not set | ||
| 264 | CONFIG_ALIGNMENT_TRAP=y | ||
| 265 | |||
| 266 | # | ||
| 267 | # Boot options | ||
| 268 | # | ||
| 269 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
| 270 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
| 271 | CONFIG_CMDLINE="mem=32M console=ttyS0,115200n8 root=/dev/ram0 initrd=0x11c00000,4M" | ||
| 272 | # CONFIG_XIP_KERNEL is not set | ||
| 273 | # CONFIG_KEXEC is not set | ||
| 274 | |||
| 275 | # | ||
| 276 | # CPU Frequency scaling | ||
| 277 | # | ||
| 278 | # CONFIG_CPU_FREQ is not set | ||
| 279 | |||
| 280 | # | ||
| 281 | # Floating point emulation | ||
| 282 | # | ||
| 283 | |||
| 284 | # | ||
| 285 | # At least one emulation must be selected | ||
| 286 | # | ||
| 287 | CONFIG_FPE_NWFPE=y | ||
| 288 | # CONFIG_FPE_NWFPE_XP is not set | ||
| 289 | # CONFIG_FPE_FASTFPE is not set | ||
| 290 | |||
| 291 | # | ||
| 292 | # Userspace binary formats | ||
| 293 | # | ||
| 294 | CONFIG_BINFMT_ELF=y | ||
| 295 | # CONFIG_BINFMT_AOUT is not set | ||
| 296 | # CONFIG_BINFMT_MISC is not set | ||
| 297 | # CONFIG_ARTHUR is not set | ||
| 298 | |||
| 299 | # | ||
| 300 | # Power management options | ||
| 301 | # | ||
| 302 | # CONFIG_PM is not set | ||
| 303 | |||
| 304 | # | ||
| 305 | # Networking | ||
| 306 | # | ||
| 307 | CONFIG_NET=y | ||
| 308 | |||
| 309 | # | ||
| 310 | # Networking options | ||
| 311 | # | ||
| 312 | CONFIG_PACKET=y | ||
| 313 | # CONFIG_PACKET_MMAP is not set | ||
| 314 | CONFIG_UNIX=y | ||
| 315 | CONFIG_XFRM=y | ||
| 316 | # CONFIG_XFRM_USER is not set | ||
| 317 | # CONFIG_XFRM_SUB_POLICY is not set | ||
| 318 | # CONFIG_XFRM_MIGRATE is not set | ||
| 319 | # CONFIG_NET_KEY is not set | ||
| 320 | CONFIG_INET=y | ||
| 321 | CONFIG_IP_MULTICAST=y | ||
| 322 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
| 323 | CONFIG_IP_FIB_HASH=y | ||
| 324 | # CONFIG_IP_PNP is not set | ||
| 325 | # CONFIG_NET_IPIP is not set | ||
| 326 | # CONFIG_NET_IPGRE is not set | ||
| 327 | # CONFIG_IP_MROUTE is not set | ||
| 328 | # CONFIG_ARPD is not set | ||
| 329 | # CONFIG_SYN_COOKIES is not set | ||
| 330 | # CONFIG_INET_AH is not set | ||
| 331 | # CONFIG_INET_ESP is not set | ||
| 332 | # CONFIG_INET_IPCOMP is not set | ||
| 333 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
| 334 | CONFIG_INET_TUNNEL=y | ||
| 335 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | ||
| 336 | CONFIG_INET_XFRM_MODE_TUNNEL=y | ||
| 337 | CONFIG_INET_XFRM_MODE_BEET=y | ||
| 338 | CONFIG_INET_DIAG=y | ||
| 339 | CONFIG_INET_TCP_DIAG=y | ||
| 340 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
| 341 | CONFIG_TCP_CONG_CUBIC=y | ||
| 342 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
| 343 | # CONFIG_TCP_MD5SIG is not set | ||
| 344 | CONFIG_IPV6=y | ||
| 345 | # CONFIG_IPV6_PRIVACY is not set | ||
| 346 | # CONFIG_IPV6_ROUTER_PREF is not set | ||
| 347 | # CONFIG_IPV6_OPTIMISTIC_DAD is not set | ||
| 348 | # CONFIG_INET6_AH is not set | ||
| 349 | # CONFIG_INET6_ESP is not set | ||
| 350 | # CONFIG_INET6_IPCOMP is not set | ||
| 351 | # CONFIG_IPV6_MIP6 is not set | ||
| 352 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 353 | # CONFIG_INET6_TUNNEL is not set | ||
| 354 | CONFIG_INET6_XFRM_MODE_TRANSPORT=y | ||
| 355 | CONFIG_INET6_XFRM_MODE_TUNNEL=y | ||
| 356 | CONFIG_INET6_XFRM_MODE_BEET=y | ||
| 357 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | ||
| 358 | CONFIG_IPV6_SIT=y | ||
| 359 | # CONFIG_IPV6_TUNNEL is not set | ||
| 360 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | ||
| 361 | # CONFIG_NETWORK_SECMARK is not set | ||
| 362 | # CONFIG_NETFILTER is not set | ||
| 363 | |||
| 364 | # | ||
| 365 | # DCCP Configuration (EXPERIMENTAL) | ||
| 366 | # | ||
| 367 | # CONFIG_IP_DCCP is not set | ||
| 368 | |||
| 369 | # | ||
| 370 | # SCTP Configuration (EXPERIMENTAL) | ||
| 371 | # | ||
| 372 | # CONFIG_IP_SCTP is not set | ||
| 373 | |||
| 374 | # | ||
| 375 | # TIPC Configuration (EXPERIMENTAL) | ||
| 376 | # | ||
| 377 | # CONFIG_TIPC is not set | ||
| 378 | # CONFIG_ATM is not set | ||
| 379 | # CONFIG_BRIDGE is not set | ||
| 380 | # CONFIG_VLAN_8021Q is not set | ||
| 381 | # CONFIG_DECNET is not set | ||
| 382 | # CONFIG_LLC2 is not set | ||
| 383 | # CONFIG_IPX is not set | ||
| 384 | # CONFIG_ATALK is not set | ||
| 385 | # CONFIG_X25 is not set | ||
| 386 | # CONFIG_LAPB is not set | ||
| 387 | # CONFIG_ECONET is not set | ||
| 388 | # CONFIG_WAN_ROUTER is not set | ||
| 389 | |||
| 390 | # | ||
| 391 | # QoS and/or fair queueing | ||
| 392 | # | ||
| 393 | # CONFIG_NET_SCHED is not set | ||
| 394 | |||
| 395 | # | ||
| 396 | # Network testing | ||
| 397 | # | ||
| 398 | # CONFIG_NET_PKTGEN is not set | ||
| 399 | # CONFIG_HAMRADIO is not set | ||
| 400 | # CONFIG_IRDA is not set | ||
| 401 | # CONFIG_BT is not set | ||
| 402 | # CONFIG_AF_RXRPC is not set | ||
| 403 | |||
| 404 | # | ||
| 405 | # Wireless | ||
| 406 | # | ||
| 407 | # CONFIG_CFG80211 is not set | ||
| 408 | # CONFIG_WIRELESS_EXT is not set | ||
| 409 | # CONFIG_MAC80211 is not set | ||
| 410 | # CONFIG_IEEE80211 is not set | ||
| 411 | # CONFIG_RFKILL is not set | ||
| 412 | |||
| 413 | # | ||
| 414 | # Device Drivers | ||
| 415 | # | ||
| 416 | |||
| 417 | # | ||
| 418 | # Generic Driver Options | ||
| 419 | # | ||
| 420 | CONFIG_STANDALONE=y | ||
| 421 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
| 422 | # CONFIG_FW_LOADER is not set | ||
| 423 | # CONFIG_DEBUG_DRIVER is not set | ||
| 424 | # CONFIG_DEBUG_DEVRES is not set | ||
| 425 | # CONFIG_SYS_HYPERVISOR is not set | ||
| 426 | |||
| 427 | # | ||
| 428 | # Connector - unified userspace <-> kernelspace linker | ||
| 429 | # | ||
| 430 | # CONFIG_CONNECTOR is not set | ||
| 431 | CONFIG_MTD=y | ||
| 432 | # CONFIG_MTD_DEBUG is not set | ||
| 433 | # CONFIG_MTD_CONCAT is not set | ||
| 434 | CONFIG_MTD_PARTITIONS=y | ||
| 435 | # CONFIG_MTD_REDBOOT_PARTS is not set | ||
| 436 | # CONFIG_MTD_CMDLINE_PARTS is not set | ||
| 437 | # CONFIG_MTD_AFS_PARTS is not set | ||
| 438 | |||
| 439 | # | ||
| 440 | # User Modules And Translation Layers | ||
| 441 | # | ||
| 442 | CONFIG_MTD_CHAR=y | ||
| 443 | CONFIG_MTD_BLKDEVS=y | ||
| 444 | CONFIG_MTD_BLOCK=y | ||
| 445 | # CONFIG_FTL is not set | ||
| 446 | # CONFIG_NFTL is not set | ||
| 447 | # CONFIG_INFTL is not set | ||
| 448 | # CONFIG_RFD_FTL is not set | ||
| 449 | # CONFIG_SSFDC is not set | ||
| 450 | |||
| 451 | # | ||
| 452 | # RAM/ROM/Flash chip drivers | ||
| 453 | # | ||
| 454 | # CONFIG_MTD_CFI is not set | ||
| 455 | # CONFIG_MTD_JEDECPROBE is not set | ||
| 456 | CONFIG_MTD_MAP_BANK_WIDTH_1=y | ||
| 457 | CONFIG_MTD_MAP_BANK_WIDTH_2=y | ||
| 458 | CONFIG_MTD_MAP_BANK_WIDTH_4=y | ||
| 459 | # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set | ||
| 460 | # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set | ||
| 461 | # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set | ||
| 462 | CONFIG_MTD_CFI_I1=y | ||
| 463 | CONFIG_MTD_CFI_I2=y | ||
| 464 | # CONFIG_MTD_CFI_I4 is not set | ||
| 465 | # CONFIG_MTD_CFI_I8 is not set | ||
| 466 | # CONFIG_MTD_RAM is not set | ||
| 467 | # CONFIG_MTD_ROM is not set | ||
| 468 | # CONFIG_MTD_ABSENT is not set | ||
| 469 | |||
| 470 | # | ||
| 471 | # Mapping drivers for chip access | ||
| 472 | # | ||
| 473 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | ||
| 474 | # CONFIG_MTD_PLATRAM is not set | ||
| 475 | |||
| 476 | # | ||
| 477 | # Self-contained MTD device drivers | ||
| 478 | # | ||
| 479 | # CONFIG_MTD_SLRAM is not set | ||
| 480 | # CONFIG_MTD_PHRAM is not set | ||
| 481 | # CONFIG_MTD_MTDRAM is not set | ||
| 482 | # CONFIG_MTD_BLOCK2MTD is not set | ||
| 483 | |||
| 484 | # | ||
| 485 | # Disk-On-Chip Device Drivers | ||
| 486 | # | ||
| 487 | # CONFIG_MTD_DOC2000 is not set | ||
| 488 | # CONFIG_MTD_DOC2001 is not set | ||
| 489 | # CONFIG_MTD_DOC2001PLUS is not set | ||
| 490 | CONFIG_MTD_NAND=y | ||
| 491 | # CONFIG_MTD_NAND_VERIFY_WRITE is not set | ||
| 492 | # CONFIG_MTD_NAND_ECC_SMC is not set | ||
| 493 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set | ||
| 494 | CONFIG_MTD_NAND_AMS_DELTA=y | ||
| 495 | CONFIG_MTD_NAND_IDS=y | ||
| 496 | # CONFIG_MTD_NAND_DISKONCHIP is not set | ||
| 497 | # CONFIG_MTD_NAND_NANDSIM is not set | ||
| 498 | # CONFIG_MTD_NAND_PLATFORM is not set | ||
| 499 | # CONFIG_MTD_ONENAND is not set | ||
| 500 | |||
| 501 | # | ||
| 502 | # UBI - Unsorted block images | ||
| 503 | # | ||
| 504 | # CONFIG_MTD_UBI is not set | ||
| 505 | |||
| 506 | # | ||
| 507 | # Parallel port support | ||
| 508 | # | ||
| 509 | # CONFIG_PARPORT is not set | ||
| 510 | |||
| 511 | # | ||
| 512 | # Plug and Play support | ||
| 513 | # | ||
| 514 | # CONFIG_PNPACPI is not set | ||
| 515 | |||
| 516 | # | ||
| 517 | # Block devices | ||
| 518 | # | ||
| 519 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
| 520 | CONFIG_BLK_DEV_LOOP=y | ||
| 521 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | ||
| 522 | # CONFIG_BLK_DEV_NBD is not set | ||
| 523 | # CONFIG_BLK_DEV_UB is not set | ||
| 524 | CONFIG_BLK_DEV_RAM=y | ||
| 525 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
| 526 | CONFIG_BLK_DEV_RAM_SIZE=8192 | ||
| 527 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | ||
| 528 | # CONFIG_CDROM_PKTCDVD is not set | ||
| 529 | # CONFIG_ATA_OVER_ETH is not set | ||
| 530 | |||
| 531 | # | ||
| 532 | # SCSI device support | ||
| 533 | # | ||
| 534 | # CONFIG_RAID_ATTRS is not set | ||
| 535 | CONFIG_SCSI=y | ||
| 536 | # CONFIG_SCSI_TGT is not set | ||
| 537 | # CONFIG_SCSI_NETLINK is not set | ||
| 538 | CONFIG_SCSI_PROC_FS=y | ||
| 539 | |||
| 540 | # | ||
| 541 | # SCSI support type (disk, tape, CD-ROM) | ||
| 542 | # | ||
| 543 | CONFIG_BLK_DEV_SD=y | ||
| 544 | # CONFIG_CHR_DEV_ST is not set | ||
| 545 | # CONFIG_CHR_DEV_OSST is not set | ||
| 546 | # CONFIG_BLK_DEV_SR is not set | ||
| 547 | # CONFIG_CHR_DEV_SG is not set | ||
| 548 | # CONFIG_CHR_DEV_SCH is not set | ||
| 549 | |||
| 550 | # | ||
| 551 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
| 552 | # | ||
| 553 | # CONFIG_SCSI_MULTI_LUN is not set | ||
| 554 | # CONFIG_SCSI_CONSTANTS is not set | ||
| 555 | # CONFIG_SCSI_LOGGING is not set | ||
| 556 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
| 557 | CONFIG_SCSI_WAIT_SCAN=m | ||
| 558 | |||
| 559 | # | ||
| 560 | # SCSI Transports | ||
| 561 | # | ||
| 562 | # CONFIG_SCSI_SPI_ATTRS is not set | ||
| 563 | # CONFIG_SCSI_FC_ATTRS is not set | ||
| 564 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
| 565 | # CONFIG_SCSI_SAS_ATTRS is not set | ||
| 566 | # CONFIG_SCSI_SAS_LIBSAS is not set | ||
| 567 | |||
| 568 | # | ||
| 569 | # SCSI low-level drivers | ||
| 570 | # | ||
| 571 | # CONFIG_ISCSI_TCP is not set | ||
| 572 | # CONFIG_SCSI_DEBUG is not set | ||
| 573 | # CONFIG_SCSI_ESP_CORE is not set | ||
| 574 | # CONFIG_ATA is not set | ||
| 575 | |||
| 576 | # | ||
| 577 | # Multi-device support (RAID and LVM) | ||
| 578 | # | ||
| 579 | # CONFIG_MD is not set | ||
| 580 | |||
| 581 | # | ||
| 582 | # Network device support | ||
| 583 | # | ||
| 584 | CONFIG_NETDEVICES=y | ||
| 585 | # CONFIG_DUMMY is not set | ||
| 586 | # CONFIG_BONDING is not set | ||
| 587 | # CONFIG_EQUALIZER is not set | ||
| 588 | # CONFIG_TUN is not set | ||
| 589 | # CONFIG_PHYLIB is not set | ||
| 590 | |||
| 591 | # | ||
| 592 | # Ethernet (10 or 100Mbit) | ||
| 593 | # | ||
| 594 | CONFIG_NET_ETHERNET=y | ||
| 595 | CONFIG_MII=y | ||
| 596 | # CONFIG_SMC91X is not set | ||
| 597 | # CONFIG_DM9000 is not set | ||
| 598 | CONFIG_NETDEV_1000=y | ||
| 599 | CONFIG_NETDEV_10000=y | ||
| 600 | |||
| 601 | # | ||
| 602 | # Token Ring devices | ||
| 603 | # | ||
| 604 | |||
| 605 | # | ||
| 606 | # Wireless LAN | ||
| 607 | # | ||
| 608 | # CONFIG_WLAN_PRE80211 is not set | ||
| 609 | # CONFIG_WLAN_80211 is not set | ||
| 610 | |||
| 611 | # | ||
| 612 | # USB Network Adapters | ||
| 613 | # | ||
| 614 | CONFIG_USB_CATC=y | ||
| 615 | CONFIG_USB_KAWETH=y | ||
| 616 | CONFIG_USB_PEGASUS=y | ||
| 617 | CONFIG_USB_RTL8150=y | ||
| 618 | CONFIG_USB_USBNET_MII=y | ||
| 619 | CONFIG_USB_USBNET=y | ||
| 620 | CONFIG_USB_NET_AX8817X=y | ||
| 621 | CONFIG_USB_NET_CDCETHER=y | ||
| 622 | # CONFIG_USB_NET_DM9601 is not set | ||
| 623 | # CONFIG_USB_NET_GL620A is not set | ||
| 624 | CONFIG_USB_NET_NET1080=y | ||
| 625 | # CONFIG_USB_NET_PLUSB is not set | ||
| 626 | # CONFIG_USB_NET_MCS7830 is not set | ||
| 627 | # CONFIG_USB_NET_RNDIS_HOST is not set | ||
| 628 | CONFIG_USB_NET_CDC_SUBSET=y | ||
| 629 | # CONFIG_USB_ALI_M5632 is not set | ||
| 630 | # CONFIG_USB_AN2720 is not set | ||
| 631 | CONFIG_USB_BELKIN=y | ||
| 632 | CONFIG_USB_ARMLINUX=y | ||
| 633 | # CONFIG_USB_EPSON2888 is not set | ||
| 634 | # CONFIG_USB_KC2190 is not set | ||
| 635 | CONFIG_USB_NET_ZAURUS=y | ||
| 636 | # CONFIG_WAN is not set | ||
| 637 | CONFIG_PPP=y | ||
| 638 | CONFIG_PPP_MULTILINK=y | ||
| 639 | # CONFIG_PPP_FILTER is not set | ||
| 640 | # CONFIG_PPP_ASYNC is not set | ||
| 641 | # CONFIG_PPP_SYNC_TTY is not set | ||
| 642 | # CONFIG_PPP_DEFLATE is not set | ||
| 643 | # CONFIG_PPP_BSDCOMP is not set | ||
| 644 | # CONFIG_PPP_MPPE is not set | ||
| 645 | # CONFIG_PPPOE is not set | ||
| 646 | # CONFIG_SLIP is not set | ||
| 647 | CONFIG_SLHC=y | ||
| 648 | # CONFIG_SHAPER is not set | ||
| 649 | # CONFIG_NETCONSOLE is not set | ||
| 650 | # CONFIG_NETPOLL is not set | ||
| 651 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
| 652 | |||
| 653 | # | ||
| 654 | # ISDN subsystem | ||
| 655 | # | ||
| 656 | # CONFIG_ISDN is not set | ||
| 657 | |||
| 658 | # | ||
| 659 | # Input device support | ||
| 660 | # | ||
| 661 | CONFIG_INPUT=y | ||
| 662 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
| 663 | |||
| 664 | # | ||
| 665 | # Userland interfaces | ||
| 666 | # | ||
| 667 | CONFIG_INPUT_MOUSEDEV=y | ||
| 668 | CONFIG_INPUT_MOUSEDEV_PSAUX=y | ||
| 669 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | ||
| 670 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | ||
| 671 | # CONFIG_INPUT_JOYDEV is not set | ||
| 672 | # CONFIG_INPUT_TSDEV is not set | ||
| 673 | # CONFIG_INPUT_EVDEV is not set | ||
| 674 | # CONFIG_INPUT_EVBUG is not set | ||
| 675 | |||
| 676 | # | ||
| 677 | # Input Device Drivers | ||
| 678 | # | ||
| 679 | CONFIG_INPUT_KEYBOARD=y | ||
| 680 | CONFIG_KEYBOARD_ATKBD=y | ||
| 681 | # CONFIG_KEYBOARD_SUNKBD is not set | ||
| 682 | # CONFIG_KEYBOARD_LKKBD is not set | ||
| 683 | # CONFIG_KEYBOARD_XTKBD is not set | ||
| 684 | # CONFIG_KEYBOARD_NEWTON is not set | ||
| 685 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
| 686 | CONFIG_KEYBOARD_OMAP=y | ||
| 687 | # CONFIG_KEYBOARD_GPIO is not set | ||
| 688 | # CONFIG_INPUT_MOUSE is not set | ||
| 689 | # CONFIG_INPUT_JOYSTICK is not set | ||
| 690 | # CONFIG_INPUT_TABLET is not set | ||
| 691 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
| 692 | # CONFIG_INPUT_MISC is not set | ||
| 693 | |||
| 694 | # | ||
| 695 | # Hardware I/O ports | ||
| 696 | # | ||
| 697 | CONFIG_SERIO=y | ||
| 698 | CONFIG_SERIO_SERPORT=y | ||
| 699 | CONFIG_SERIO_LIBPS2=y | ||
| 700 | # CONFIG_SERIO_RAW is not set | ||
| 701 | # CONFIG_GAMEPORT is not set | ||
| 702 | |||
| 703 | # | ||
| 704 | # Character devices | ||
| 705 | # | ||
| 706 | CONFIG_VT=y | ||
| 707 | CONFIG_VT_CONSOLE=y | ||
| 708 | CONFIG_HW_CONSOLE=y | ||
| 709 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
| 710 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
| 711 | |||
| 712 | # | ||
| 713 | # Serial drivers | ||
| 714 | # | ||
| 715 | CONFIG_SERIAL_8250=y | ||
| 716 | CONFIG_SERIAL_8250_CONSOLE=y | ||
| 717 | CONFIG_SERIAL_8250_NR_UARTS=4 | ||
| 718 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | ||
| 719 | # CONFIG_SERIAL_8250_EXTENDED is not set | ||
| 720 | |||
| 721 | # | ||
| 722 | # Non-8250 serial port support | ||
| 723 | # | ||
| 724 | CONFIG_SERIAL_CORE=y | ||
| 725 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
| 726 | CONFIG_UNIX98_PTYS=y | ||
| 727 | # CONFIG_LEGACY_PTYS is not set | ||
| 728 | |||
| 729 | # | ||
| 730 | # IPMI | ||
| 731 | # | ||
| 732 | # CONFIG_IPMI_HANDLER is not set | ||
| 733 | # CONFIG_WATCHDOG is not set | ||
| 734 | CONFIG_HW_RANDOM=y | ||
| 735 | # CONFIG_NVRAM is not set | ||
| 736 | # CONFIG_R3964 is not set | ||
| 737 | # CONFIG_RAW_DRIVER is not set | ||
| 738 | |||
| 739 | # | ||
| 740 | # TPM devices | ||
| 741 | # | ||
| 742 | # CONFIG_TCG_TPM is not set | ||
| 743 | CONFIG_I2C=y | ||
| 744 | CONFIG_I2C_BOARDINFO=y | ||
| 745 | CONFIG_I2C_CHARDEV=y | ||
| 746 | |||
| 747 | # | ||
| 748 | # I2C Algorithms | ||
| 749 | # | ||
| 750 | CONFIG_I2C_ALGOBIT=y | ||
| 751 | # CONFIG_I2C_ALGOPCF is not set | ||
| 752 | # CONFIG_I2C_ALGOPCA is not set | ||
| 753 | |||
| 754 | # | ||
| 755 | # I2C Hardware Bus support | ||
| 756 | # | ||
| 757 | # CONFIG_I2C_GPIO is not set | ||
| 758 | # CONFIG_I2C_OCORES is not set | ||
| 759 | CONFIG_I2C_OMAP=y | ||
| 760 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 761 | # CONFIG_I2C_SIMTEC is not set | ||
| 762 | # CONFIG_I2C_STUB is not set | ||
| 763 | # CONFIG_I2C_TINY_USB is not set | ||
| 764 | |||
| 765 | # | ||
| 766 | # Miscellaneous I2C Chip support | ||
| 767 | # | ||
| 768 | # CONFIG_SENSORS_DS1337 is not set | ||
| 769 | # CONFIG_SENSORS_DS1374 is not set | ||
| 770 | # CONFIG_SENSORS_EEPROM is not set | ||
| 771 | # CONFIG_SENSORS_PCF8574 is not set | ||
| 772 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 773 | # CONFIG_SENSORS_PCF8591 is not set | ||
| 774 | # CONFIG_TPS65010 is not set | ||
| 775 | # CONFIG_SENSORS_TLV320AIC23 is not set | ||
| 776 | # CONFIG_SENSORS_MAX6875 is not set | ||
| 777 | # CONFIG_I2C_DEBUG_CORE is not set | ||
| 778 | # CONFIG_I2C_DEBUG_ALGO is not set | ||
| 779 | # CONFIG_I2C_DEBUG_BUS is not set | ||
| 780 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 781 | |||
| 782 | # | ||
| 783 | # SPI support | ||
| 784 | # | ||
| 785 | # CONFIG_SPI is not set | ||
| 786 | # CONFIG_SPI_MASTER is not set | ||
| 787 | |||
| 788 | # | ||
| 789 | # Dallas's 1-wire bus | ||
| 790 | # | ||
| 791 | # CONFIG_W1 is not set | ||
| 792 | # CONFIG_HWMON is not set | ||
| 793 | |||
| 794 | # | ||
| 795 | # Misc devices | ||
| 796 | # | ||
| 797 | # CONFIG_BLINK is not set | ||
| 798 | |||
| 799 | # | ||
| 800 | # Multifunction device drivers | ||
| 801 | # | ||
| 802 | # CONFIG_MFD_SM501 is not set | ||
| 803 | |||
| 804 | # | ||
| 805 | # LED devices | ||
| 806 | # | ||
| 807 | CONFIG_NEW_LEDS=y | ||
| 808 | CONFIG_LEDS_CLASS=y | ||
| 809 | |||
| 810 | # | ||
| 811 | # LED drivers | ||
| 812 | # | ||
| 813 | CONFIG_LEDS_AMS_DELTA=y | ||
| 814 | # CONFIG_LEDS_OMAP_DEBUG is not set | ||
| 815 | # CONFIG_LEDS_OMAP is not set | ||
| 816 | |||
| 817 | # | ||
| 818 | # LED Triggers | ||
| 819 | # | ||
| 820 | CONFIG_LEDS_TRIGGERS=y | ||
| 821 | CONFIG_LEDS_TRIGGER_TIMER=y | ||
| 822 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y | ||
| 823 | |||
| 824 | # | ||
| 825 | # Multimedia devices | ||
| 826 | # | ||
| 827 | # CONFIG_VIDEO_DEV is not set | ||
| 828 | # CONFIG_DVB_CORE is not set | ||
| 829 | CONFIG_DAB=y | ||
| 830 | # CONFIG_USB_DABUSB is not set | ||
| 831 | |||
| 832 | # | ||
| 833 | # Graphics support | ||
| 834 | # | ||
| 835 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 836 | |||
| 837 | # | ||
| 838 | # Display device support | ||
| 839 | # | ||
| 840 | # CONFIG_DISPLAY_SUPPORT is not set | ||
| 841 | # CONFIG_VGASTATE is not set | ||
| 842 | CONFIG_FB=y | ||
| 843 | CONFIG_FIRMWARE_EDID=y | ||
| 844 | # CONFIG_FB_DDC is not set | ||
| 845 | # CONFIG_FB_CFB_FILLRECT is not set | ||
| 846 | # CONFIG_FB_CFB_COPYAREA is not set | ||
| 847 | # CONFIG_FB_CFB_IMAGEBLIT is not set | ||
| 848 | # CONFIG_FB_SYS_FILLRECT is not set | ||
| 849 | # CONFIG_FB_SYS_COPYAREA is not set | ||
| 850 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
| 851 | # CONFIG_FB_SYS_FOPS is not set | ||
| 852 | CONFIG_FB_DEFERRED_IO=y | ||
| 853 | # CONFIG_FB_SVGALIB is not set | ||
| 854 | # CONFIG_FB_MACMODES is not set | ||
| 855 | # CONFIG_FB_BACKLIGHT is not set | ||
| 856 | # CONFIG_FB_MODE_HELPERS is not set | ||
| 857 | # CONFIG_FB_TILEBLITTING is not set | ||
| 858 | |||
| 859 | # | ||
| 860 | # Frame buffer hardware drivers | ||
| 861 | # | ||
| 862 | # CONFIG_FB_S1D13XXX is not set | ||
| 863 | CONFIG_FB_OMAP=y | ||
| 864 | # CONFIG_FB_OMAP_LCDC_EXTERNAL is not set | ||
| 865 | # CONFIG_FB_OMAP_LCD_MIPID is not set | ||
| 866 | # CONFIG_FB_OMAP_BOOTLOADER_INIT is not set | ||
| 867 | CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2 | ||
| 868 | # CONFIG_FB_OMAP_DMA_TUNE is not set | ||
| 869 | # CONFIG_FB_VIRTUAL is not set | ||
| 870 | |||
| 871 | # | ||
| 872 | # Console display driver support | ||
| 873 | # | ||
| 874 | # CONFIG_VGA_CONSOLE is not set | ||
| 875 | CONFIG_DUMMY_CONSOLE=y | ||
| 876 | CONFIG_FRAMEBUFFER_CONSOLE=y | ||
| 877 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | ||
| 878 | CONFIG_FONTS=y | ||
| 879 | # CONFIG_FONT_8x8 is not set | ||
| 880 | # CONFIG_FONT_8x16 is not set | ||
| 881 | CONFIG_FONT_6x11=y | ||
| 882 | # CONFIG_FONT_7x14 is not set | ||
| 883 | # CONFIG_FONT_PEARL_8x8 is not set | ||
| 884 | # CONFIG_FONT_ACORN_8x8 is not set | ||
| 885 | # CONFIG_FONT_MINI_4x6 is not set | ||
| 886 | # CONFIG_FONT_CLEAN_4x6 is not set | ||
| 887 | # CONFIG_FONT_CLEAN_5x8 is not set | ||
| 888 | # CONFIG_FONT_SUN8x16 is not set | ||
| 889 | # CONFIG_FONT_SUN12x22 is not set | ||
| 890 | # CONFIG_FONT_10x18 is not set | ||
| 891 | CONFIG_LOGO=y | ||
| 892 | # CONFIG_LOGO_LINUX_MONO is not set | ||
| 893 | # CONFIG_LOGO_LINUX_VGA16 is not set | ||
| 894 | CONFIG_LOGO_LINUX_CLUT224=y | ||
| 895 | |||
| 896 | # | ||
| 897 | # Sound | ||
| 898 | # | ||
| 899 | # CONFIG_SOUND is not set | ||
| 900 | |||
| 901 | # | ||
| 902 | # HID Devices | ||
| 903 | # | ||
| 904 | CONFIG_HID=y | ||
| 905 | # CONFIG_HID_DEBUG is not set | ||
| 906 | |||
| 907 | # | ||
| 908 | # USB Input Devices | ||
| 909 | # | ||
| 910 | CONFIG_USB_HID=y | ||
| 911 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | ||
| 912 | # CONFIG_HID_FF is not set | ||
| 913 | # CONFIG_USB_HIDDEV is not set | ||
| 914 | |||
| 915 | # | ||
| 916 | # USB support | ||
| 917 | # | ||
| 918 | CONFIG_USB_ARCH_HAS_HCD=y | ||
| 919 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
| 920 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
| 921 | CONFIG_USB=y | ||
| 922 | # CONFIG_USB_DEBUG is not set | ||
| 923 | |||
| 924 | # | ||
| 925 | # Miscellaneous USB options | ||
| 926 | # | ||
| 927 | CONFIG_USB_DEVICEFS=y | ||
| 928 | # CONFIG_USB_DEVICE_CLASS is not set | ||
| 929 | # CONFIG_USB_DYNAMIC_MINORS is not set | ||
| 930 | # CONFIG_USB_OTG is not set | ||
| 931 | |||
| 932 | # | ||
| 933 | # USB Host Controller Drivers | ||
| 934 | # | ||
| 935 | # CONFIG_USB_ISP116X_HCD is not set | ||
| 936 | CONFIG_USB_OHCI_HCD=y | ||
| 937 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | ||
| 938 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | ||
| 939 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | ||
| 940 | # CONFIG_USB_SL811_HCD is not set | ||
| 941 | # CONFIG_USB_MUSB_HDRC is not set | ||
| 942 | |||
| 943 | # | ||
| 944 | # USB Device Class drivers | ||
| 945 | # | ||
| 946 | # CONFIG_USB_ACM is not set | ||
| 947 | # CONFIG_USB_PRINTER is not set | ||
| 948 | |||
| 949 | # | ||
| 950 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
| 951 | # | ||
| 952 | |||
| 953 | # | ||
| 954 | # may also be needed; see USB_STORAGE Help for more information | ||
| 955 | # | ||
| 956 | CONFIG_USB_STORAGE=y | ||
| 957 | # CONFIG_USB_STORAGE_DEBUG is not set | ||
| 958 | # CONFIG_USB_STORAGE_DATAFAB is not set | ||
| 959 | # CONFIG_USB_STORAGE_FREECOM is not set | ||
| 960 | # CONFIG_USB_STORAGE_DPCM is not set | ||
| 961 | # CONFIG_USB_STORAGE_USBAT is not set | ||
| 962 | # CONFIG_USB_STORAGE_SDDR09 is not set | ||
| 963 | # CONFIG_USB_STORAGE_SDDR55 is not set | ||
| 964 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | ||
| 965 | # CONFIG_USB_STORAGE_ALAUDA is not set | ||
| 966 | # CONFIG_USB_STORAGE_KARMA is not set | ||
| 967 | # CONFIG_USB_LIBUSUAL is not set | ||
| 968 | |||
| 969 | # | ||
| 970 | # USB Imaging devices | ||
| 971 | # | ||
| 972 | # CONFIG_USB_MDC800 is not set | ||
| 973 | # CONFIG_USB_MICROTEK is not set | ||
| 974 | CONFIG_USB_MON=y | ||
| 975 | |||
| 976 | # | ||
| 977 | # USB port drivers | ||
| 978 | # | ||
| 979 | |||
| 980 | # | ||
| 981 | # USB Serial Converter support | ||
| 982 | # | ||
| 983 | # CONFIG_USB_SERIAL is not set | ||
| 984 | |||
| 985 | # | ||
| 986 | # USB Miscellaneous drivers | ||
| 987 | # | ||
| 988 | # CONFIG_USB_EMI62 is not set | ||
| 989 | # CONFIG_USB_EMI26 is not set | ||
| 990 | # CONFIG_USB_ADUTUX is not set | ||
| 991 | # CONFIG_USB_AUERSWALD is not set | ||
| 992 | # CONFIG_USB_RIO500 is not set | ||
| 993 | # CONFIG_USB_LEGOTOWER is not set | ||
| 994 | # CONFIG_USB_LCD is not set | ||
| 995 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 996 | # CONFIG_USB_LED is not set | ||
| 997 | # CONFIG_USB_CYPRESS_CY7C63 is not set | ||
| 998 | # CONFIG_USB_CYTHERM is not set | ||
| 999 | # CONFIG_USB_PHIDGET is not set | ||
| 1000 | # CONFIG_USB_IDMOUSE is not set | ||
| 1001 | # CONFIG_USB_FTDI_ELAN is not set | ||
| 1002 | # CONFIG_USB_APPLEDISPLAY is not set | ||
| 1003 | # CONFIG_USB_LD is not set | ||
| 1004 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
| 1005 | # CONFIG_USB_IOWARRIOR is not set | ||
| 1006 | # CONFIG_USB_TEST is not set | ||
| 1007 | |||
| 1008 | # | ||
| 1009 | # USB DSL modem support | ||
| 1010 | # | ||
| 1011 | |||
| 1012 | # | ||
| 1013 | # USB Gadget Support | ||
| 1014 | # | ||
| 1015 | # CONFIG_USB_GADGET is not set | ||
| 1016 | # CONFIG_MMC is not set | ||
| 1017 | |||
| 1018 | # | ||
| 1019 | # Real Time Clock | ||
| 1020 | # | ||
| 1021 | CONFIG_RTC_LIB=y | ||
| 1022 | CONFIG_RTC_CLASS=y | ||
| 1023 | CONFIG_RTC_HCTOSYS=y | ||
| 1024 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
| 1025 | # CONFIG_RTC_DEBUG is not set | ||
| 1026 | |||
| 1027 | # | ||
| 1028 | # RTC interfaces | ||
| 1029 | # | ||
| 1030 | CONFIG_RTC_INTF_SYSFS=y | ||
| 1031 | CONFIG_RTC_INTF_PROC=y | ||
| 1032 | CONFIG_RTC_INTF_DEV=y | ||
| 1033 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
| 1034 | # CONFIG_RTC_DRV_TEST is not set | ||
| 1035 | |||
| 1036 | # | ||
| 1037 | # I2C RTC drivers | ||
| 1038 | # | ||
| 1039 | # CONFIG_RTC_DRV_DS1307 is not set | ||
| 1040 | # CONFIG_RTC_DRV_DS1672 is not set | ||
| 1041 | # CONFIG_RTC_DRV_MAX6900 is not set | ||
| 1042 | # CONFIG_RTC_DRV_RS5C372 is not set | ||
| 1043 | # CONFIG_RTC_DRV_ISL1208 is not set | ||
| 1044 | # CONFIG_RTC_DRV_X1205 is not set | ||
| 1045 | # CONFIG_RTC_DRV_PCF8563 is not set | ||
| 1046 | # CONFIG_RTC_DRV_PCF8583 is not set | ||
| 1047 | |||
| 1048 | # | ||
| 1049 | # SPI RTC drivers | ||
| 1050 | # | ||
| 1051 | |||
| 1052 | # | ||
| 1053 | # Platform RTC drivers | ||
| 1054 | # | ||
| 1055 | # CONFIG_RTC_DRV_CMOS is not set | ||
| 1056 | # CONFIG_RTC_DRV_DS1553 is not set | ||
| 1057 | # CONFIG_RTC_DRV_DS1742 is not set | ||
| 1058 | # CONFIG_RTC_DRV_M48T86 is not set | ||
| 1059 | # CONFIG_RTC_DRV_V3020 is not set | ||
| 1060 | |||
| 1061 | # | ||
| 1062 | # on-CPU RTC drivers | ||
| 1063 | # | ||
| 1064 | CONFIG_RTC_DRV_OMAP=y | ||
| 1065 | |||
| 1066 | # | ||
| 1067 | # CBUS support | ||
| 1068 | # | ||
| 1069 | # CONFIG_CBUS is not set | ||
| 1070 | |||
| 1071 | # | ||
| 1072 | # File systems | ||
| 1073 | # | ||
| 1074 | CONFIG_EXT2_FS=y | ||
| 1075 | # CONFIG_EXT2_FS_XATTR is not set | ||
| 1076 | # CONFIG_EXT2_FS_XIP is not set | ||
| 1077 | CONFIG_EXT3_FS=y | ||
| 1078 | CONFIG_EXT3_FS_XATTR=y | ||
| 1079 | # CONFIG_EXT3_FS_POSIX_ACL is not set | ||
| 1080 | # CONFIG_EXT3_FS_SECURITY is not set | ||
| 1081 | # CONFIG_EXT4DEV_FS is not set | ||
| 1082 | CONFIG_JBD=y | ||
| 1083 | # CONFIG_JBD_DEBUG is not set | ||
| 1084 | CONFIG_FS_MBCACHE=y | ||
| 1085 | # CONFIG_REISERFS_FS is not set | ||
| 1086 | # CONFIG_JFS_FS is not set | ||
| 1087 | # CONFIG_FS_POSIX_ACL is not set | ||
| 1088 | # CONFIG_XFS_FS is not set | ||
| 1089 | # CONFIG_GFS2_FS is not set | ||
| 1090 | # CONFIG_OCFS2_FS is not set | ||
| 1091 | # CONFIG_MINIX_FS is not set | ||
| 1092 | # CONFIG_ROMFS_FS is not set | ||
| 1093 | CONFIG_INOTIFY=y | ||
| 1094 | CONFIG_INOTIFY_USER=y | ||
| 1095 | # CONFIG_QUOTA is not set | ||
| 1096 | CONFIG_DNOTIFY=y | ||
| 1097 | CONFIG_AUTOFS_FS=y | ||
| 1098 | CONFIG_AUTOFS4_FS=y | ||
| 1099 | # CONFIG_FUSE_FS is not set | ||
| 1100 | |||
| 1101 | # | ||
| 1102 | # CD-ROM/DVD Filesystems | ||
| 1103 | # | ||
| 1104 | # CONFIG_ISO9660_FS is not set | ||
| 1105 | # CONFIG_UDF_FS is not set | ||
| 1106 | |||
| 1107 | # | ||
| 1108 | # DOS/FAT/NT Filesystems | ||
| 1109 | # | ||
| 1110 | CONFIG_FAT_FS=y | ||
| 1111 | CONFIG_MSDOS_FS=y | ||
| 1112 | CONFIG_VFAT_FS=y | ||
| 1113 | CONFIG_FAT_DEFAULT_CODEPAGE=437 | ||
| 1114 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | ||
| 1115 | # CONFIG_NTFS_FS is not set | ||
| 1116 | |||
| 1117 | # | ||
| 1118 | # Pseudo filesystems | ||
| 1119 | # | ||
| 1120 | CONFIG_PROC_FS=y | ||
| 1121 | CONFIG_PROC_SYSCTL=y | ||
| 1122 | CONFIG_SYSFS=y | ||
| 1123 | CONFIG_TMPFS=y | ||
| 1124 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
| 1125 | # CONFIG_HUGETLB_PAGE is not set | ||
| 1126 | CONFIG_RAMFS=y | ||
| 1127 | # CONFIG_CONFIGFS_FS is not set | ||
| 1128 | |||
| 1129 | # | ||
| 1130 | # Miscellaneous filesystems | ||
| 1131 | # | ||
| 1132 | # CONFIG_ADFS_FS is not set | ||
| 1133 | # CONFIG_AFFS_FS is not set | ||
| 1134 | # CONFIG_HFS_FS is not set | ||
| 1135 | # CONFIG_HFSPLUS_FS is not set | ||
| 1136 | # CONFIG_BEFS_FS is not set | ||
| 1137 | # CONFIG_BFS_FS is not set | ||
| 1138 | # CONFIG_EFS_FS is not set | ||
| 1139 | CONFIG_JFFS2_FS=y | ||
| 1140 | CONFIG_JFFS2_FS_DEBUG=0 | ||
| 1141 | CONFIG_JFFS2_FS_WRITEBUFFER=y | ||
| 1142 | CONFIG_JFFS2_SUMMARY=y | ||
| 1143 | # CONFIG_JFFS2_FS_XATTR is not set | ||
| 1144 | # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set | ||
| 1145 | CONFIG_JFFS2_ZLIB=y | ||
| 1146 | CONFIG_JFFS2_RTIME=y | ||
| 1147 | # CONFIG_JFFS2_RUBIN is not set | ||
| 1148 | # CONFIG_CRAMFS is not set | ||
| 1149 | # CONFIG_VXFS_FS is not set | ||
| 1150 | # CONFIG_HPFS_FS is not set | ||
| 1151 | # CONFIG_QNX4FS_FS is not set | ||
| 1152 | # CONFIG_SYSV_FS is not set | ||
| 1153 | # CONFIG_UFS_FS is not set | ||
| 1154 | |||
| 1155 | # | ||
| 1156 | # Network File Systems | ||
| 1157 | # | ||
| 1158 | CONFIG_NFS_FS=y | ||
| 1159 | # CONFIG_NFS_V3 is not set | ||
| 1160 | # CONFIG_NFS_V4 is not set | ||
| 1161 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1162 | # CONFIG_NFSD is not set | ||
| 1163 | CONFIG_LOCKD=y | ||
| 1164 | CONFIG_NFS_COMMON=y | ||
| 1165 | CONFIG_SUNRPC=y | ||
| 1166 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 1167 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
| 1168 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
| 1169 | # CONFIG_SMB_FS is not set | ||
| 1170 | # CONFIG_CIFS is not set | ||
| 1171 | # CONFIG_NCP_FS is not set | ||
| 1172 | # CONFIG_CODA_FS is not set | ||
| 1173 | # CONFIG_AFS_FS is not set | ||
| 1174 | # CONFIG_9P_FS is not set | ||
| 1175 | |||
| 1176 | # | ||
| 1177 | # Partition Types | ||
| 1178 | # | ||
| 1179 | CONFIG_PARTITION_ADVANCED=y | ||
| 1180 | # CONFIG_ACORN_PARTITION is not set | ||
| 1181 | # CONFIG_OSF_PARTITION is not set | ||
| 1182 | # CONFIG_AMIGA_PARTITION is not set | ||
| 1183 | # CONFIG_ATARI_PARTITION is not set | ||
| 1184 | # CONFIG_MAC_PARTITION is not set | ||
| 1185 | CONFIG_MSDOS_PARTITION=y | ||
| 1186 | # CONFIG_BSD_DISKLABEL is not set | ||
| 1187 | # CONFIG_MINIX_SUBPARTITION is not set | ||
| 1188 | # CONFIG_SOLARIS_X86_PARTITION is not set | ||
| 1189 | # CONFIG_UNIXWARE_DISKLABEL is not set | ||
| 1190 | # CONFIG_LDM_PARTITION is not set | ||
| 1191 | # CONFIG_SGI_PARTITION is not set | ||
| 1192 | # CONFIG_ULTRIX_PARTITION is not set | ||
| 1193 | # CONFIG_SUN_PARTITION is not set | ||
| 1194 | # CONFIG_KARMA_PARTITION is not set | ||
| 1195 | # CONFIG_EFI_PARTITION is not set | ||
| 1196 | # CONFIG_SYSV68_PARTITION is not set | ||
| 1197 | |||
| 1198 | # | ||
| 1199 | # Native Language Support | ||
| 1200 | # | ||
| 1201 | CONFIG_NLS=y | ||
| 1202 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
| 1203 | CONFIG_NLS_CODEPAGE_437=y | ||
| 1204 | # CONFIG_NLS_CODEPAGE_737 is not set | ||
| 1205 | # CONFIG_NLS_CODEPAGE_775 is not set | ||
| 1206 | CONFIG_NLS_CODEPAGE_850=y | ||
| 1207 | CONFIG_NLS_CODEPAGE_852=y | ||
| 1208 | # CONFIG_NLS_CODEPAGE_855 is not set | ||
| 1209 | # CONFIG_NLS_CODEPAGE_857 is not set | ||
| 1210 | # CONFIG_NLS_CODEPAGE_860 is not set | ||
| 1211 | # CONFIG_NLS_CODEPAGE_861 is not set | ||
| 1212 | # CONFIG_NLS_CODEPAGE_862 is not set | ||
| 1213 | # CONFIG_NLS_CODEPAGE_863 is not set | ||
| 1214 | # CONFIG_NLS_CODEPAGE_864 is not set | ||
| 1215 | # CONFIG_NLS_CODEPAGE_865 is not set | ||
| 1216 | # CONFIG_NLS_CODEPAGE_866 is not set | ||
| 1217 | # CONFIG_NLS_CODEPAGE_869 is not set | ||
| 1218 | # CONFIG_NLS_CODEPAGE_936 is not set | ||
| 1219 | # CONFIG_NLS_CODEPAGE_950 is not set | ||
| 1220 | # CONFIG_NLS_CODEPAGE_932 is not set | ||
| 1221 | # CONFIG_NLS_CODEPAGE_949 is not set | ||
| 1222 | # CONFIG_NLS_CODEPAGE_874 is not set | ||
| 1223 | # CONFIG_NLS_ISO8859_8 is not set | ||
| 1224 | # CONFIG_NLS_CODEPAGE_1250 is not set | ||
| 1225 | # CONFIG_NLS_CODEPAGE_1251 is not set | ||
| 1226 | # CONFIG_NLS_ASCII is not set | ||
| 1227 | CONFIG_NLS_ISO8859_1=y | ||
| 1228 | CONFIG_NLS_ISO8859_2=y | ||
| 1229 | # CONFIG_NLS_ISO8859_3 is not set | ||
| 1230 | # CONFIG_NLS_ISO8859_4 is not set | ||
| 1231 | # CONFIG_NLS_ISO8859_5 is not set | ||
| 1232 | # CONFIG_NLS_ISO8859_6 is not set | ||
| 1233 | # CONFIG_NLS_ISO8859_7 is not set | ||
| 1234 | # CONFIG_NLS_ISO8859_9 is not set | ||
| 1235 | # CONFIG_NLS_ISO8859_13 is not set | ||
| 1236 | # CONFIG_NLS_ISO8859_14 is not set | ||
| 1237 | # CONFIG_NLS_ISO8859_15 is not set | ||
| 1238 | # CONFIG_NLS_KOI8_R is not set | ||
| 1239 | # CONFIG_NLS_KOI8_U is not set | ||
| 1240 | # CONFIG_NLS_UTF8 is not set | ||
| 1241 | |||
| 1242 | # | ||
| 1243 | # Distributed Lock Manager | ||
| 1244 | # | ||
| 1245 | # CONFIG_DLM is not set | ||
| 1246 | |||
| 1247 | # | ||
| 1248 | # Profiling support | ||
| 1249 | # | ||
| 1250 | # CONFIG_PROFILING is not set | ||
| 1251 | |||
| 1252 | # | ||
| 1253 | # Kernel hacking | ||
| 1254 | # | ||
| 1255 | # CONFIG_PRINTK_TIME is not set | ||
| 1256 | CONFIG_ENABLE_MUST_CHECK=y | ||
| 1257 | CONFIG_MAGIC_SYSRQ=y | ||
| 1258 | # CONFIG_UNUSED_SYMBOLS is not set | ||
| 1259 | # CONFIG_DEBUG_FS is not set | ||
| 1260 | # CONFIG_HEADERS_CHECK is not set | ||
| 1261 | CONFIG_DEBUG_KERNEL=y | ||
| 1262 | # CONFIG_DEBUG_SHIRQ is not set | ||
| 1263 | CONFIG_DETECT_SOFTLOCKUP=y | ||
| 1264 | # CONFIG_SCHEDSTATS is not set | ||
| 1265 | # CONFIG_TIMER_STATS is not set | ||
| 1266 | # CONFIG_DEBUG_SLAB is not set | ||
| 1267 | CONFIG_DEBUG_PREEMPT=y | ||
| 1268 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
| 1269 | # CONFIG_RT_MUTEX_TESTER is not set | ||
| 1270 | # CONFIG_DEBUG_SPINLOCK is not set | ||
| 1271 | # CONFIG_DEBUG_MUTEXES is not set | ||
| 1272 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
| 1273 | # CONFIG_PROVE_LOCKING is not set | ||
| 1274 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
| 1275 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
| 1276 | # CONFIG_DEBUG_KOBJECT is not set | ||
| 1277 | CONFIG_DEBUG_BUGVERBOSE=y | ||
| 1278 | # CONFIG_DEBUG_INFO is not set | ||
| 1279 | # CONFIG_DEBUG_VM is not set | ||
| 1280 | # CONFIG_DEBUG_LIST is not set | ||
| 1281 | CONFIG_FRAME_POINTER=y | ||
| 1282 | CONFIG_FORCED_INLINING=y | ||
| 1283 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 1284 | # CONFIG_FAULT_INJECTION is not set | ||
| 1285 | # CONFIG_DEBUG_USER is not set | ||
| 1286 | # CONFIG_DEBUG_ERRORS is not set | ||
| 1287 | # CONFIG_DEBUG_LL is not set | ||
| 1288 | |||
| 1289 | # | ||
| 1290 | # Security options | ||
| 1291 | # | ||
| 1292 | # CONFIG_KEYS is not set | ||
| 1293 | # CONFIG_SECURITY is not set | ||
| 1294 | |||
| 1295 | # | ||
| 1296 | # Cryptographic options | ||
| 1297 | # | ||
| 1298 | # CONFIG_CRYPTO is not set | ||
| 1299 | |||
| 1300 | # | ||
| 1301 | # Library routines | ||
| 1302 | # | ||
| 1303 | CONFIG_BITREVERSE=y | ||
| 1304 | # CONFIG_CRC_CCITT is not set | ||
| 1305 | # CONFIG_CRC16 is not set | ||
| 1306 | # CONFIG_CRC_ITU_T is not set | ||
| 1307 | CONFIG_CRC32=y | ||
| 1308 | # CONFIG_LIBCRC32C is not set | ||
| 1309 | CONFIG_ZLIB_INFLATE=y | ||
| 1310 | CONFIG_ZLIB_DEFLATE=y | ||
| 1311 | CONFIG_PLIST=y | ||
| 1312 | CONFIG_HAS_IOMEM=y | ||
| 1313 | CONFIG_HAS_IOPORT=y | ||
| 1314 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/arm/configs/n770_defconfig b/arch/arm/configs/n770_defconfig new file mode 100644 index 000000000000..568ef1770d5f --- /dev/null +++ b/arch/arm/configs/n770_defconfig | |||
| @@ -0,0 +1,1421 @@ | |||
| 1 | # | ||
| 2 | # Automatically generated make config: don't edit | ||
| 3 | # Linux kernel version: 2.6.24-rc8-omap1 | ||
| 4 | # Fri Jan 18 10:21:06 2008 | ||
| 5 | # | ||
| 6 | CONFIG_ARM=y | ||
| 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | ||
| 8 | CONFIG_GENERIC_GPIO=y | ||
| 9 | CONFIG_GENERIC_TIME=y | ||
| 10 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 11 | CONFIG_MMU=y | ||
| 12 | # CONFIG_NO_IOPORT is not set | ||
| 13 | CONFIG_GENERIC_HARDIRQS=y | ||
| 14 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 15 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 16 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
| 17 | CONFIG_HARDIRQS_SW_RESEND=y | ||
| 18 | CONFIG_GENERIC_IRQ_PROBE=y | ||
| 19 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
| 20 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
| 21 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
| 22 | CONFIG_GENERIC_HWEIGHT=y | ||
| 23 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
| 24 | CONFIG_ZONE_DMA=y | ||
| 25 | CONFIG_VECTORS_BASE=0xffff0000 | ||
| 26 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
| 27 | |||
| 28 | # | ||
| 29 | # General setup | ||
| 30 | # | ||
| 31 | CONFIG_EXPERIMENTAL=y | ||
| 32 | CONFIG_BROKEN_ON_SMP=y | ||
| 33 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 34 | CONFIG_LOCALVERSION="" | ||
| 35 | CONFIG_LOCALVERSION_AUTO=y | ||
| 36 | CONFIG_SWAP=y | ||
| 37 | CONFIG_SYSVIPC=y | ||
| 38 | CONFIG_SYSVIPC_SYSCTL=y | ||
| 39 | CONFIG_POSIX_MQUEUE=y | ||
| 40 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 41 | # CONFIG_TASKSTATS is not set | ||
| 42 | # CONFIG_USER_NS is not set | ||
| 43 | # CONFIG_PID_NS is not set | ||
| 44 | # CONFIG_AUDIT is not set | ||
| 45 | # CONFIG_IKCONFIG is not set | ||
| 46 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 47 | # CONFIG_CGROUPS is not set | ||
| 48 | CONFIG_FAIR_GROUP_SCHED=y | ||
| 49 | CONFIG_FAIR_USER_SCHED=y | ||
| 50 | # CONFIG_FAIR_CGROUP_SCHED is not set | ||
| 51 | CONFIG_SYSFS_DEPRECATED=y | ||
| 52 | # CONFIG_RELAY is not set | ||
| 53 | # CONFIG_BLK_DEV_INITRD is not set | ||
| 54 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
| 55 | CONFIG_SYSCTL=y | ||
| 56 | # CONFIG_EMBEDDED is not set | ||
| 57 | CONFIG_UID16=y | ||
| 58 | CONFIG_SYSCTL_SYSCALL=y | ||
| 59 | CONFIG_KALLSYMS=y | ||
| 60 | # CONFIG_KALLSYMS_ALL is not set | ||
| 61 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 62 | CONFIG_HOTPLUG=y | ||
| 63 | CONFIG_PRINTK=y | ||
| 64 | CONFIG_BUG=y | ||
| 65 | CONFIG_ELF_CORE=y | ||
| 66 | CONFIG_BASE_FULL=y | ||
| 67 | CONFIG_FUTEX=y | ||
| 68 | CONFIG_ANON_INODES=y | ||
| 69 | CONFIG_EPOLL=y | ||
| 70 | CONFIG_SIGNALFD=y | ||
| 71 | CONFIG_EVENTFD=y | ||
| 72 | CONFIG_SHMEM=y | ||
| 73 | CONFIG_VM_EVENT_COUNTERS=y | ||
| 74 | CONFIG_SLAB=y | ||
| 75 | # CONFIG_SLUB is not set | ||
| 76 | # CONFIG_SLOB is not set | ||
| 77 | CONFIG_SLABINFO=y | ||
| 78 | CONFIG_RT_MUTEXES=y | ||
| 79 | # CONFIG_TINY_SHMEM is not set | ||
| 80 | CONFIG_BASE_SMALL=0 | ||
| 81 | CONFIG_MODULES=y | ||
| 82 | CONFIG_MODULE_UNLOAD=y | ||
| 83 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 84 | # CONFIG_MODVERSIONS is not set | ||
| 85 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 86 | # CONFIG_KMOD is not set | ||
| 87 | CONFIG_BLOCK=y | ||
| 88 | # CONFIG_LBD is not set | ||
| 89 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 90 | # CONFIG_LSF is not set | ||
| 91 | # CONFIG_BLK_DEV_BSG is not set | ||
| 92 | |||
| 93 | # | ||
| 94 | # IO Schedulers | ||
| 95 | # | ||
| 96 | CONFIG_IOSCHED_NOOP=y | ||
| 97 | # CONFIG_IOSCHED_AS is not set | ||
| 98 | # CONFIG_IOSCHED_DEADLINE is not set | ||
| 99 | CONFIG_IOSCHED_CFQ=y | ||
| 100 | # CONFIG_DEFAULT_AS is not set | ||
| 101 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 102 | CONFIG_DEFAULT_CFQ=y | ||
| 103 | # CONFIG_DEFAULT_NOOP is not set | ||
| 104 | CONFIG_DEFAULT_IOSCHED="cfq" | ||
| 105 | |||
| 106 | # | ||
| 107 | # System Type | ||
| 108 | # | ||
| 109 | # CONFIG_ARCH_AAEC2000 is not set | ||
| 110 | # CONFIG_ARCH_INTEGRATOR is not set | ||
| 111 | # CONFIG_ARCH_REALVIEW is not set | ||
| 112 | # CONFIG_ARCH_VERSATILE is not set | ||
| 113 | # CONFIG_ARCH_AT91 is not set | ||
| 114 | # CONFIG_ARCH_CLPS7500 is not set | ||
| 115 | # CONFIG_ARCH_CLPS711X is not set | ||
| 116 | # CONFIG_ARCH_CO285 is not set | ||
| 117 | # CONFIG_ARCH_EBSA110 is not set | ||
| 118 | # CONFIG_ARCH_EP93XX is not set | ||
| 119 | # CONFIG_ARCH_FOOTBRIDGE is not set | ||
| 120 | # CONFIG_ARCH_NETX is not set | ||
| 121 | # CONFIG_ARCH_H720X is not set | ||
| 122 | # CONFIG_ARCH_IMX is not set | ||
| 123 | # CONFIG_ARCH_IOP13XX is not set | ||
| 124 | # CONFIG_ARCH_IOP32X is not set | ||
| 125 | # CONFIG_ARCH_IOP33X is not set | ||
| 126 | # CONFIG_ARCH_IXP23XX is not set | ||
| 127 | # CONFIG_ARCH_IXP2000 is not set | ||
| 128 | # CONFIG_ARCH_IXP4XX is not set | ||
| 129 | # CONFIG_ARCH_L7200 is not set | ||
| 130 | # CONFIG_ARCH_KS8695 is not set | ||
| 131 | # CONFIG_ARCH_NS9XXX is not set | ||
| 132 | # CONFIG_ARCH_MXC is not set | ||
| 133 | # CONFIG_ARCH_PNX4008 is not set | ||
| 134 | # CONFIG_ARCH_PXA is not set | ||
| 135 | # CONFIG_ARCH_RPC is not set | ||
| 136 | # CONFIG_ARCH_SA1100 is not set | ||
| 137 | # CONFIG_ARCH_S3C2410 is not set | ||
| 138 | # CONFIG_ARCH_SHARK is not set | ||
| 139 | # CONFIG_ARCH_LH7A40X is not set | ||
| 140 | # CONFIG_ARCH_DAVINCI is not set | ||
| 141 | CONFIG_ARCH_OMAP=y | ||
| 142 | |||
| 143 | # | ||
| 144 | # TI OMAP Implementations | ||
| 145 | # | ||
| 146 | CONFIG_ARCH_OMAP_OTG=y | ||
| 147 | CONFIG_ARCH_OMAP1=y | ||
| 148 | # CONFIG_ARCH_OMAP2 is not set | ||
| 149 | # CONFIG_ARCH_OMAP3 is not set | ||
| 150 | |||
| 151 | # | ||
| 152 | # OMAP Feature Selections | ||
| 153 | # | ||
| 154 | CONFIG_OMAP_DEBUG_SRAM_PATCH=y | ||
| 155 | CONFIG_OMAP_RESET_CLOCKS=y | ||
| 156 | CONFIG_OMAP_BOOT_TAG=y | ||
| 157 | CONFIG_OMAP_BOOT_REASON=y | ||
| 158 | CONFIG_OMAP_COMPONENT_VERSION=y | ||
| 159 | CONFIG_OMAP_GPIO_SWITCH=y | ||
| 160 | # CONFIG_OMAP_MUX is not set | ||
| 161 | CONFIG_OMAP_STI=y | ||
| 162 | CONFIG_OMAP_STI_CONSOLE=y | ||
| 163 | CONFIG_OMAP_MCBSP=y | ||
| 164 | CONFIG_OMAP_MMU_FWK=y | ||
| 165 | CONFIG_OMAP_MBOX_FWK=y | ||
| 166 | # CONFIG_OMAP_MPU_TIMER is not set | ||
| 167 | CONFIG_OMAP_32K_TIMER=y | ||
| 168 | CONFIG_OMAP_32K_TIMER_HZ=128 | ||
| 169 | CONFIG_OMAP_DM_TIMER=y | ||
| 170 | CONFIG_OMAP_LL_DEBUG_UART1=y | ||
| 171 | # CONFIG_OMAP_LL_DEBUG_UART2 is not set | ||
| 172 | # CONFIG_OMAP_LL_DEBUG_UART3 is not set | ||
| 173 | |||
| 174 | # | ||
| 175 | # OMAP Core Type | ||
| 176 | # | ||
| 177 | # CONFIG_ARCH_OMAP730 is not set | ||
| 178 | # CONFIG_ARCH_OMAP15XX is not set | ||
| 179 | CONFIG_ARCH_OMAP16XX=y | ||
| 180 | |||
| 181 | # | ||
| 182 | # OMAP Board Type | ||
| 183 | # | ||
| 184 | # CONFIG_MACH_OMAP_INNOVATOR is not set | ||
| 185 | # CONFIG_MACH_OMAP_H2 is not set | ||
| 186 | # CONFIG_MACH_OMAP_H3 is not set | ||
| 187 | # CONFIG_MACH_OMAP_OSK is not set | ||
| 188 | CONFIG_MACH_NOKIA770=y | ||
| 189 | # CONFIG_MACH_OMAP_GENERIC is not set | ||
| 190 | |||
| 191 | # | ||
| 192 | # OMAP CPU Speed | ||
| 193 | # | ||
| 194 | CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER=y | ||
| 195 | CONFIG_OMAP_ARM_216MHZ=y | ||
| 196 | # CONFIG_OMAP_ARM_192MHZ is not set | ||
| 197 | # CONFIG_OMAP_ARM_168MHZ is not set | ||
| 198 | # CONFIG_OMAP_ARM_120MHZ is not set | ||
| 199 | # CONFIG_OMAP_ARM_60MHZ is not set | ||
| 200 | # CONFIG_OMAP_ARM_30MHZ is not set | ||
| 201 | |||
| 202 | # | ||
| 203 | # Boot options | ||
| 204 | # | ||
| 205 | |||
| 206 | # | ||
| 207 | # Power management | ||
| 208 | # | ||
| 209 | |||
| 210 | # | ||
| 211 | # Processor Type | ||
| 212 | # | ||
| 213 | CONFIG_CPU_32=y | ||
| 214 | CONFIG_CPU_ARM926T=y | ||
| 215 | CONFIG_CPU_32v5=y | ||
| 216 | CONFIG_CPU_ABRT_EV5TJ=y | ||
| 217 | CONFIG_CPU_PABRT_NOIFAR=y | ||
| 218 | CONFIG_CPU_CACHE_VIVT=y | ||
| 219 | CONFIG_CPU_COPY_V4WB=y | ||
| 220 | CONFIG_CPU_TLB_V4WBI=y | ||
| 221 | CONFIG_CPU_CP15=y | ||
| 222 | CONFIG_CPU_CP15_MMU=y | ||
| 223 | |||
| 224 | # | ||
| 225 | # Processor Features | ||
| 226 | # | ||
| 227 | CONFIG_ARM_THUMB=y | ||
| 228 | # CONFIG_CPU_ICACHE_DISABLE is not set | ||
| 229 | # CONFIG_CPU_DCACHE_DISABLE is not set | ||
| 230 | # CONFIG_CPU_DCACHE_WRITETHROUGH is not set | ||
| 231 | # CONFIG_CPU_CACHE_ROUND_ROBIN is not set | ||
| 232 | # CONFIG_OUTER_CACHE is not set | ||
| 233 | |||
| 234 | # | ||
| 235 | # Bus support | ||
| 236 | # | ||
| 237 | # CONFIG_PCI_SYSCALL is not set | ||
| 238 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 239 | # CONFIG_PCCARD is not set | ||
| 240 | |||
| 241 | # | ||
| 242 | # Kernel Features | ||
| 243 | # | ||
| 244 | # CONFIG_TICK_ONESHOT is not set | ||
| 245 | # CONFIG_NO_HZ is not set | ||
| 246 | # CONFIG_HIGH_RES_TIMERS is not set | ||
| 247 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 248 | # CONFIG_PREEMPT is not set | ||
| 249 | CONFIG_HZ=128 | ||
| 250 | # CONFIG_AEABI is not set | ||
| 251 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | ||
| 252 | CONFIG_SELECT_MEMORY_MODEL=y | ||
| 253 | CONFIG_FLATMEM_MANUAL=y | ||
| 254 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
| 255 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
| 256 | CONFIG_FLATMEM=y | ||
| 257 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
| 258 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 259 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 260 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | ||
| 261 | # CONFIG_RESOURCES_64BIT is not set | ||
| 262 | CONFIG_ZONE_DMA_FLAG=1 | ||
| 263 | CONFIG_BOUNCE=y | ||
| 264 | CONFIG_VIRT_TO_BUS=y | ||
| 265 | # CONFIG_LEDS is not set | ||
| 266 | CONFIG_ALIGNMENT_TRAP=y | ||
| 267 | |||
| 268 | # | ||
| 269 | # Boot options | ||
| 270 | # | ||
| 271 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
| 272 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
| 273 | CONFIG_CMDLINE="root=1f03 rootfstype=jffs2 time" | ||
| 274 | # CONFIG_XIP_KERNEL is not set | ||
| 275 | # CONFIG_KEXEC is not set | ||
| 276 | |||
| 277 | # | ||
| 278 | # CPU Frequency scaling | ||
| 279 | # | ||
| 280 | # CONFIG_CPU_FREQ is not set | ||
| 281 | |||
| 282 | # | ||
| 283 | # Floating point emulation | ||
| 284 | # | ||
| 285 | |||
| 286 | # | ||
| 287 | # At least one emulation must be selected | ||
| 288 | # | ||
| 289 | CONFIG_FPE_NWFPE=y | ||
| 290 | # CONFIG_FPE_NWFPE_XP is not set | ||
| 291 | # CONFIG_FPE_FASTFPE is not set | ||
| 292 | # CONFIG_VFP is not set | ||
| 293 | |||
| 294 | # | ||
| 295 | # Userspace binary formats | ||
| 296 | # | ||
| 297 | CONFIG_BINFMT_ELF=y | ||
| 298 | # CONFIG_BINFMT_AOUT is not set | ||
| 299 | # CONFIG_BINFMT_MISC is not set | ||
| 300 | # CONFIG_ARTHUR is not set | ||
| 301 | |||
| 302 | # | ||
| 303 | # Power management options | ||
| 304 | # | ||
| 305 | CONFIG_PM=y | ||
| 306 | # CONFIG_PM_LEGACY is not set | ||
| 307 | # CONFIG_PM_DEBUG is not set | ||
| 308 | CONFIG_PM_SLEEP=y | ||
| 309 | CONFIG_SUSPEND_UP_POSSIBLE=y | ||
| 310 | CONFIG_SUSPEND=y | ||
| 311 | # CONFIG_APM_EMULATION is not set | ||
| 312 | |||
| 313 | # | ||
| 314 | # Networking | ||
| 315 | # | ||
| 316 | CONFIG_NET=y | ||
| 317 | |||
| 318 | # | ||
| 319 | # Networking options | ||
| 320 | # | ||
| 321 | CONFIG_PACKET=y | ||
| 322 | # CONFIG_PACKET_MMAP is not set | ||
| 323 | CONFIG_UNIX=y | ||
| 324 | CONFIG_XFRM=y | ||
| 325 | # CONFIG_XFRM_USER is not set | ||
| 326 | # CONFIG_XFRM_SUB_POLICY is not set | ||
| 327 | # CONFIG_XFRM_MIGRATE is not set | ||
| 328 | # CONFIG_NET_KEY is not set | ||
| 329 | CONFIG_INET=y | ||
| 330 | CONFIG_IP_MULTICAST=y | ||
| 331 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
| 332 | CONFIG_IP_FIB_HASH=y | ||
| 333 | CONFIG_IP_PNP=y | ||
| 334 | CONFIG_IP_PNP_DHCP=y | ||
| 335 | CONFIG_IP_PNP_BOOTP=y | ||
| 336 | # CONFIG_IP_PNP_RARP is not set | ||
| 337 | # CONFIG_NET_IPIP is not set | ||
| 338 | # CONFIG_NET_IPGRE is not set | ||
| 339 | # CONFIG_IP_MROUTE is not set | ||
| 340 | # CONFIG_ARPD is not set | ||
| 341 | # CONFIG_SYN_COOKIES is not set | ||
| 342 | # CONFIG_INET_AH is not set | ||
| 343 | # CONFIG_INET_ESP is not set | ||
| 344 | # CONFIG_INET_IPCOMP is not set | ||
| 345 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
| 346 | # CONFIG_INET_TUNNEL is not set | ||
| 347 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | ||
| 348 | CONFIG_INET_XFRM_MODE_TUNNEL=y | ||
| 349 | CONFIG_INET_XFRM_MODE_BEET=y | ||
| 350 | # CONFIG_INET_LRO is not set | ||
| 351 | # CONFIG_INET_DIAG is not set | ||
| 352 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
| 353 | CONFIG_TCP_CONG_CUBIC=y | ||
| 354 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
| 355 | # CONFIG_TCP_MD5SIG is not set | ||
| 356 | # CONFIG_IP_VS is not set | ||
| 357 | # CONFIG_IPV6 is not set | ||
| 358 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 359 | # CONFIG_INET6_TUNNEL is not set | ||
| 360 | # CONFIG_NETLABEL is not set | ||
| 361 | # CONFIG_NETWORK_SECMARK is not set | ||
| 362 | CONFIG_NETFILTER=y | ||
| 363 | # CONFIG_NETFILTER_DEBUG is not set | ||
| 364 | |||
| 365 | # | ||
| 366 | # Core Netfilter Configuration | ||
| 367 | # | ||
| 368 | CONFIG_NETFILTER_NETLINK=y | ||
| 369 | # CONFIG_NETFILTER_NETLINK_QUEUE is not set | ||
| 370 | # CONFIG_NETFILTER_NETLINK_LOG is not set | ||
| 371 | # CONFIG_NF_CONNTRACK_ENABLED is not set | ||
| 372 | # CONFIG_NF_CONNTRACK is not set | ||
| 373 | # CONFIG_NETFILTER_XTABLES is not set | ||
| 374 | |||
| 375 | # | ||
| 376 | # IP: Netfilter Configuration | ||
| 377 | # | ||
| 378 | # CONFIG_IP_NF_QUEUE is not set | ||
| 379 | # CONFIG_IP_NF_IPTABLES is not set | ||
| 380 | # CONFIG_IP_NF_ARPTABLES is not set | ||
| 381 | # CONFIG_IP_DCCP is not set | ||
| 382 | # CONFIG_IP_SCTP is not set | ||
| 383 | # CONFIG_TIPC is not set | ||
| 384 | # CONFIG_ATM is not set | ||
| 385 | # CONFIG_BRIDGE is not set | ||
| 386 | # CONFIG_VLAN_8021Q is not set | ||
| 387 | # CONFIG_DECNET is not set | ||
| 388 | # CONFIG_LLC2 is not set | ||
| 389 | # CONFIG_IPX is not set | ||
| 390 | # CONFIG_ATALK is not set | ||
| 391 | # CONFIG_X25 is not set | ||
| 392 | # CONFIG_LAPB is not set | ||
| 393 | # CONFIG_ECONET is not set | ||
| 394 | # CONFIG_WAN_ROUTER is not set | ||
| 395 | # CONFIG_NET_SCHED is not set | ||
| 396 | |||
| 397 | # | ||
| 398 | # Network testing | ||
| 399 | # | ||
| 400 | # CONFIG_NET_PKTGEN is not set | ||
| 401 | # CONFIG_HAMRADIO is not set | ||
| 402 | # CONFIG_IRDA is not set | ||
| 403 | CONFIG_BT=y | ||
| 404 | CONFIG_BT_L2CAP=y | ||
| 405 | CONFIG_BT_SCO=y | ||
| 406 | CONFIG_BT_RFCOMM=y | ||
| 407 | CONFIG_BT_RFCOMM_TTY=y | ||
| 408 | CONFIG_BT_BNEP=y | ||
| 409 | # CONFIG_BT_BNEP_MC_FILTER is not set | ||
| 410 | # CONFIG_BT_BNEP_PROTO_FILTER is not set | ||
| 411 | CONFIG_BT_HIDP=y | ||
| 412 | |||
| 413 | # | ||
| 414 | # Bluetooth device drivers | ||
| 415 | # | ||
| 416 | # CONFIG_BT_HCIUSB is not set | ||
| 417 | # CONFIG_BT_HCIBTUSB is not set | ||
| 418 | # CONFIG_BT_HCIBTSDIO is not set | ||
| 419 | # CONFIG_BT_HCIUART is not set | ||
| 420 | # CONFIG_BT_HCIBCM203X is not set | ||
| 421 | # CONFIG_BT_HCIBPA10X is not set | ||
| 422 | # CONFIG_BT_HCIBFUSB is not set | ||
| 423 | CONFIG_BT_HCIBRF6150=y | ||
| 424 | # CONFIG_BT_HCIH4P is not set | ||
| 425 | # CONFIG_BT_HCIVHCI is not set | ||
| 426 | # CONFIG_AF_RXRPC is not set | ||
| 427 | |||
| 428 | # | ||
| 429 | # Wireless | ||
| 430 | # | ||
| 431 | # CONFIG_CFG80211 is not set | ||
| 432 | # CONFIG_WIRELESS_EXT is not set | ||
| 433 | # CONFIG_MAC80211 is not set | ||
| 434 | # CONFIG_IEEE80211 is not set | ||
| 435 | # CONFIG_RFKILL is not set | ||
| 436 | # CONFIG_NET_9P is not set | ||
| 437 | |||
| 438 | # | ||
| 439 | # Device Drivers | ||
| 440 | # | ||
| 441 | |||
| 442 | # | ||
| 443 | # Generic Driver Options | ||
| 444 | # | ||
| 445 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| 446 | CONFIG_STANDALONE=y | ||
| 447 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
| 448 | CONFIG_FW_LOADER=y | ||
| 449 | # CONFIG_DEBUG_DRIVER is not set | ||
| 450 | # CONFIG_DEBUG_DEVRES is not set | ||
| 451 | # CONFIG_SYS_HYPERVISOR is not set | ||
| 452 | CONFIG_CONNECTOR=y | ||
| 453 | # CONFIG_PROC_EVENTS is not set | ||
| 454 | CONFIG_MTD=y | ||
| 455 | # CONFIG_MTD_DEBUG is not set | ||
| 456 | # CONFIG_MTD_CONCAT is not set | ||
| 457 | CONFIG_MTD_PARTITIONS=y | ||
| 458 | # CONFIG_MTD_REDBOOT_PARTS is not set | ||
| 459 | CONFIG_MTD_CMDLINE_PARTS=y | ||
| 460 | # CONFIG_MTD_AFS_PARTS is not set | ||
| 461 | |||
| 462 | # | ||
| 463 | # User Modules And Translation Layers | ||
| 464 | # | ||
| 465 | CONFIG_MTD_CHAR=y | ||
| 466 | CONFIG_MTD_BLKDEVS=y | ||
| 467 | CONFIG_MTD_BLOCK=y | ||
| 468 | # CONFIG_FTL is not set | ||
| 469 | # CONFIG_NFTL is not set | ||
| 470 | # CONFIG_INFTL is not set | ||
| 471 | # CONFIG_RFD_FTL is not set | ||
| 472 | # CONFIG_SSFDC is not set | ||
| 473 | # CONFIG_MTD_OOPS is not set | ||
| 474 | |||
| 475 | # | ||
| 476 | # RAM/ROM/Flash chip drivers | ||
| 477 | # | ||
| 478 | # CONFIG_MTD_CFI is not set | ||
| 479 | # CONFIG_MTD_JEDECPROBE is not set | ||
| 480 | CONFIG_MTD_MAP_BANK_WIDTH_1=y | ||
| 481 | CONFIG_MTD_MAP_BANK_WIDTH_2=y | ||
| 482 | CONFIG_MTD_MAP_BANK_WIDTH_4=y | ||
| 483 | # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set | ||
| 484 | # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set | ||
| 485 | # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set | ||
| 486 | CONFIG_MTD_CFI_I1=y | ||
| 487 | CONFIG_MTD_CFI_I2=y | ||
| 488 | # CONFIG_MTD_CFI_I4 is not set | ||
| 489 | # CONFIG_MTD_CFI_I8 is not set | ||
| 490 | # CONFIG_MTD_RAM is not set | ||
| 491 | # CONFIG_MTD_ROM is not set | ||
| 492 | # CONFIG_MTD_ABSENT is not set | ||
| 493 | |||
| 494 | # | ||
| 495 | # Mapping drivers for chip access | ||
| 496 | # | ||
| 497 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | ||
| 498 | # CONFIG_MTD_PLATRAM is not set | ||
| 499 | |||
| 500 | # | ||
| 501 | # Self-contained MTD device drivers | ||
| 502 | # | ||
| 503 | # CONFIG_MTD_DATAFLASH is not set | ||
| 504 | # CONFIG_MTD_M25P80 is not set | ||
| 505 | # CONFIG_MTD_SLRAM is not set | ||
| 506 | # CONFIG_MTD_PHRAM is not set | ||
| 507 | # CONFIG_MTD_MTDRAM is not set | ||
| 508 | # CONFIG_MTD_BLOCK2MTD is not set | ||
| 509 | |||
| 510 | # | ||
| 511 | # Disk-On-Chip Device Drivers | ||
| 512 | # | ||
| 513 | # CONFIG_MTD_DOC2000 is not set | ||
| 514 | # CONFIG_MTD_DOC2001 is not set | ||
| 515 | # CONFIG_MTD_DOC2001PLUS is not set | ||
| 516 | CONFIG_MTD_NAND=y | ||
| 517 | # CONFIG_MTD_NAND_VERIFY_WRITE is not set | ||
| 518 | # CONFIG_MTD_NAND_ECC_SMC is not set | ||
| 519 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set | ||
| 520 | CONFIG_MTD_NAND_OMAP_HW=y | ||
| 521 | CONFIG_MTD_NAND_IDS=y | ||
| 522 | # CONFIG_MTD_NAND_DISKONCHIP is not set | ||
| 523 | # CONFIG_MTD_NAND_NANDSIM is not set | ||
| 524 | # CONFIG_MTD_NAND_PLATFORM is not set | ||
| 525 | # CONFIG_MTD_ALAUDA is not set | ||
| 526 | # CONFIG_MTD_ONENAND is not set | ||
| 527 | |||
| 528 | # | ||
| 529 | # UBI - Unsorted block images | ||
| 530 | # | ||
| 531 | # CONFIG_MTD_UBI is not set | ||
| 532 | # CONFIG_PARPORT is not set | ||
| 533 | CONFIG_BLK_DEV=y | ||
| 534 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
| 535 | CONFIG_BLK_DEV_LOOP=y | ||
| 536 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | ||
| 537 | # CONFIG_BLK_DEV_NBD is not set | ||
| 538 | # CONFIG_BLK_DEV_UB is not set | ||
| 539 | # CONFIG_BLK_DEV_RAM is not set | ||
| 540 | # CONFIG_CDROM_PKTCDVD is not set | ||
| 541 | # CONFIG_ATA_OVER_ETH is not set | ||
| 542 | CONFIG_MISC_DEVICES=y | ||
| 543 | # CONFIG_EEPROM_93CX6 is not set | ||
| 544 | |||
| 545 | # | ||
| 546 | # SCSI device support | ||
| 547 | # | ||
| 548 | # CONFIG_RAID_ATTRS is not set | ||
| 549 | CONFIG_SCSI=y | ||
| 550 | CONFIG_SCSI_DMA=y | ||
| 551 | # CONFIG_SCSI_TGT is not set | ||
| 552 | # CONFIG_SCSI_NETLINK is not set | ||
| 553 | # CONFIG_SCSI_PROC_FS is not set | ||
| 554 | |||
| 555 | # | ||
| 556 | # SCSI support type (disk, tape, CD-ROM) | ||
| 557 | # | ||
| 558 | CONFIG_BLK_DEV_SD=y | ||
| 559 | # CONFIG_CHR_DEV_ST is not set | ||
| 560 | # CONFIG_CHR_DEV_OSST is not set | ||
| 561 | # CONFIG_BLK_DEV_SR is not set | ||
| 562 | # CONFIG_CHR_DEV_SG is not set | ||
| 563 | # CONFIG_CHR_DEV_SCH is not set | ||
| 564 | |||
| 565 | # | ||
| 566 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
| 567 | # | ||
| 568 | # CONFIG_SCSI_MULTI_LUN is not set | ||
| 569 | # CONFIG_SCSI_CONSTANTS is not set | ||
| 570 | # CONFIG_SCSI_LOGGING is not set | ||
| 571 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
| 572 | CONFIG_SCSI_WAIT_SCAN=m | ||
| 573 | |||
| 574 | # | ||
| 575 | # SCSI Transports | ||
| 576 | # | ||
| 577 | # CONFIG_SCSI_SPI_ATTRS is not set | ||
| 578 | # CONFIG_SCSI_FC_ATTRS is not set | ||
| 579 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
| 580 | # CONFIG_SCSI_SAS_LIBSAS is not set | ||
| 581 | # CONFIG_SCSI_SRP_ATTRS is not set | ||
| 582 | CONFIG_SCSI_LOWLEVEL=y | ||
| 583 | # CONFIG_ISCSI_TCP is not set | ||
| 584 | # CONFIG_SCSI_DEBUG is not set | ||
| 585 | # CONFIG_ATA is not set | ||
| 586 | # CONFIG_MD is not set | ||
| 587 | CONFIG_NETDEVICES=y | ||
| 588 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 589 | # CONFIG_DUMMY is not set | ||
| 590 | # CONFIG_BONDING is not set | ||
| 591 | # CONFIG_MACVLAN is not set | ||
| 592 | # CONFIG_EQUALIZER is not set | ||
| 593 | CONFIG_TUN=y | ||
| 594 | # CONFIG_VETH is not set | ||
| 595 | # CONFIG_PHYLIB is not set | ||
| 596 | CONFIG_NET_ETHERNET=y | ||
| 597 | CONFIG_MII=y | ||
| 598 | # CONFIG_AX88796 is not set | ||
| 599 | # CONFIG_SMC91X is not set | ||
| 600 | # CONFIG_DM9000 is not set | ||
| 601 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
| 602 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
| 603 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
| 604 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
| 605 | # CONFIG_B44 is not set | ||
| 606 | CONFIG_NETDEV_1000=y | ||
| 607 | CONFIG_NETDEV_10000=y | ||
| 608 | |||
| 609 | # | ||
| 610 | # Wireless LAN | ||
| 611 | # | ||
| 612 | # CONFIG_WLAN_PRE80211 is not set | ||
| 613 | # CONFIG_WLAN_80211 is not set | ||
| 614 | |||
| 615 | # | ||
| 616 | # USB Network Adapters | ||
| 617 | # | ||
| 618 | # CONFIG_USB_CATC is not set | ||
| 619 | # CONFIG_USB_KAWETH is not set | ||
| 620 | # CONFIG_USB_PEGASUS is not set | ||
| 621 | # CONFIG_USB_RTL8150 is not set | ||
| 622 | CONFIG_USB_USBNET=y | ||
| 623 | # CONFIG_USB_NET_AX8817X is not set | ||
| 624 | CONFIG_USB_NET_CDCETHER=y | ||
| 625 | # CONFIG_USB_NET_DM9601 is not set | ||
| 626 | # CONFIG_USB_NET_GL620A is not set | ||
| 627 | CONFIG_USB_NET_NET1080=y | ||
| 628 | # CONFIG_USB_NET_PLUSB is not set | ||
| 629 | # CONFIG_USB_NET_MCS7830 is not set | ||
| 630 | # CONFIG_USB_NET_RNDIS_HOST is not set | ||
| 631 | # CONFIG_USB_NET_CDC_SUBSET is not set | ||
| 632 | CONFIG_USB_NET_ZAURUS=y | ||
| 633 | # CONFIG_WAN is not set | ||
| 634 | CONFIG_PPP=y | ||
| 635 | # CONFIG_PPP_MULTILINK is not set | ||
| 636 | CONFIG_PPP_FILTER=y | ||
| 637 | CONFIG_PPP_ASYNC=y | ||
| 638 | # CONFIG_PPP_SYNC_TTY is not set | ||
| 639 | CONFIG_PPP_DEFLATE=y | ||
| 640 | CONFIG_PPP_BSDCOMP=y | ||
| 641 | # CONFIG_PPP_MPPE is not set | ||
| 642 | # CONFIG_PPPOE is not set | ||
| 643 | # CONFIG_PPPOL2TP is not set | ||
| 644 | # CONFIG_SLIP is not set | ||
| 645 | CONFIG_SLHC=y | ||
| 646 | # CONFIG_SHAPER is not set | ||
| 647 | # CONFIG_NETCONSOLE is not set | ||
| 648 | # CONFIG_NETPOLL is not set | ||
| 649 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
| 650 | # CONFIG_ISDN is not set | ||
| 651 | |||
| 652 | # | ||
| 653 | # Input device support | ||
| 654 | # | ||
| 655 | CONFIG_INPUT=y | ||
| 656 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
| 657 | # CONFIG_INPUT_POLLDEV is not set | ||
| 658 | |||
| 659 | # | ||
| 660 | # Userland interfaces | ||
| 661 | # | ||
| 662 | CONFIG_INPUT_MOUSEDEV=y | ||
| 663 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set | ||
| 664 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | ||
| 665 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | ||
| 666 | # CONFIG_INPUT_JOYDEV is not set | ||
| 667 | CONFIG_INPUT_EVDEV=y | ||
| 668 | # CONFIG_INPUT_EVBUG is not set | ||
| 669 | |||
| 670 | # | ||
| 671 | # Input Device Drivers | ||
| 672 | # | ||
| 673 | CONFIG_INPUT_KEYBOARD=y | ||
| 674 | # CONFIG_KEYBOARD_ATKBD is not set | ||
| 675 | # CONFIG_KEYBOARD_SUNKBD is not set | ||
| 676 | # CONFIG_KEYBOARD_LKKBD is not set | ||
| 677 | # CONFIG_KEYBOARD_XTKBD is not set | ||
| 678 | # CONFIG_KEYBOARD_NEWTON is not set | ||
| 679 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
| 680 | CONFIG_KEYBOARD_OMAP=y | ||
| 681 | # CONFIG_KEYBOARD_GPIO is not set | ||
| 682 | # CONFIG_INPUT_MOUSE is not set | ||
| 683 | # CONFIG_INPUT_JOYSTICK is not set | ||
| 684 | # CONFIG_INPUT_TABLET is not set | ||
| 685 | CONFIG_INPUT_TOUCHSCREEN=y | ||
| 686 | CONFIG_TOUCHSCREEN_ADS7846=y | ||
| 687 | # CONFIG_TOUCHSCREEN_FUJITSU is not set | ||
| 688 | # CONFIG_TOUCHSCREEN_GUNZE is not set | ||
| 689 | # CONFIG_TOUCHSCREEN_ELO is not set | ||
| 690 | # CONFIG_TOUCHSCREEN_MTOUCH is not set | ||
| 691 | # CONFIG_TOUCHSCREEN_MK712 is not set | ||
| 692 | # CONFIG_TOUCHSCREEN_PENMOUNT is not set | ||
| 693 | # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set | ||
| 694 | # CONFIG_TOUCHSCREEN_TOUCHWIN is not set | ||
| 695 | # CONFIG_TOUCHSCREEN_UCB1400 is not set | ||
| 696 | # CONFIG_TOUCHSCREEN_TSC2102 is not set | ||
| 697 | # CONFIG_TOUCHSCREEN_TSC210X is not set | ||
| 698 | # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set | ||
| 699 | # CONFIG_INPUT_MISC is not set | ||
| 700 | |||
| 701 | # | ||
| 702 | # Hardware I/O ports | ||
| 703 | # | ||
| 704 | CONFIG_SERIO=y | ||
| 705 | CONFIG_SERIO_SERPORT=y | ||
| 706 | # CONFIG_SERIO_RAW is not set | ||
| 707 | # CONFIG_GAMEPORT is not set | ||
| 708 | |||
| 709 | # | ||
| 710 | # Character devices | ||
| 711 | # | ||
| 712 | CONFIG_VT=y | ||
| 713 | CONFIG_VT_CONSOLE=y | ||
| 714 | CONFIG_HW_CONSOLE=y | ||
| 715 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
| 716 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
| 717 | |||
| 718 | # | ||
| 719 | # Serial drivers | ||
| 720 | # | ||
| 721 | CONFIG_SERIAL_8250=y | ||
| 722 | CONFIG_SERIAL_8250_CONSOLE=y | ||
| 723 | CONFIG_SERIAL_8250_NR_UARTS=4 | ||
| 724 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | ||
| 725 | # CONFIG_SERIAL_8250_EXTENDED is not set | ||
| 726 | |||
| 727 | # | ||
| 728 | # Non-8250 serial port support | ||
| 729 | # | ||
| 730 | CONFIG_SERIAL_CORE=y | ||
| 731 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
| 732 | CONFIG_UNIX98_PTYS=y | ||
| 733 | # CONFIG_LEGACY_PTYS is not set | ||
| 734 | # CONFIG_IPMI_HANDLER is not set | ||
| 735 | CONFIG_HW_RANDOM=m | ||
| 736 | CONFIG_HW_RANDOM_OMAP=m | ||
| 737 | # CONFIG_NVRAM is not set | ||
| 738 | # CONFIG_R3964 is not set | ||
| 739 | # CONFIG_RAW_DRIVER is not set | ||
| 740 | # CONFIG_TCG_TPM is not set | ||
| 741 | CONFIG_I2C=y | ||
| 742 | CONFIG_I2C_BOARDINFO=y | ||
| 743 | # CONFIG_I2C_CHARDEV is not set | ||
| 744 | |||
| 745 | # | ||
| 746 | # I2C Algorithms | ||
| 747 | # | ||
| 748 | # CONFIG_I2C_ALGOBIT is not set | ||
| 749 | # CONFIG_I2C_ALGOPCF is not set | ||
| 750 | # CONFIG_I2C_ALGOPCA is not set | ||
| 751 | |||
| 752 | # | ||
| 753 | # I2C Hardware Bus support | ||
| 754 | # | ||
| 755 | # CONFIG_I2C_GPIO is not set | ||
| 756 | # CONFIG_I2C_OCORES is not set | ||
| 757 | CONFIG_I2C_OMAP=y | ||
| 758 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 759 | # CONFIG_I2C_SIMTEC is not set | ||
| 760 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 761 | # CONFIG_I2C_STUB is not set | ||
| 762 | # CONFIG_I2C_TINY_USB is not set | ||
| 763 | |||
| 764 | # | ||
| 765 | # Miscellaneous I2C Chip support | ||
| 766 | # | ||
| 767 | # CONFIG_SENSORS_DS1337 is not set | ||
| 768 | # CONFIG_SENSORS_DS1374 is not set | ||
| 769 | # CONFIG_DS1682 is not set | ||
| 770 | # CONFIG_SENSORS_EEPROM is not set | ||
| 771 | # CONFIG_SENSORS_PCF8574 is not set | ||
| 772 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 773 | # CONFIG_SENSORS_PCF8591 is not set | ||
| 774 | # CONFIG_ISP1301_OMAP is not set | ||
| 775 | # CONFIG_TPS65010 is not set | ||
| 776 | CONFIG_SENSORS_TLV320AIC23=y | ||
| 777 | # CONFIG_GPIOEXPANDER_OMAP is not set | ||
| 778 | # CONFIG_SENSORS_MAX6875 is not set | ||
| 779 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 780 | # CONFIG_I2C_DEBUG_CORE is not set | ||
| 781 | # CONFIG_I2C_DEBUG_ALGO is not set | ||
| 782 | # CONFIG_I2C_DEBUG_BUS is not set | ||
| 783 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 784 | |||
| 785 | # | ||
| 786 | # SPI support | ||
| 787 | # | ||
| 788 | CONFIG_SPI=y | ||
| 789 | # CONFIG_SPI_DEBUG is not set | ||
| 790 | CONFIG_SPI_MASTER=y | ||
| 791 | |||
| 792 | # | ||
| 793 | # SPI Master Controller Drivers | ||
| 794 | # | ||
| 795 | CONFIG_SPI_BITBANG=y | ||
| 796 | CONFIG_SPI_OMAP_UWIRE=y | ||
| 797 | |||
| 798 | # | ||
| 799 | # SPI Protocol Masters | ||
| 800 | # | ||
| 801 | # CONFIG_SPI_AT25 is not set | ||
| 802 | # CONFIG_SPI_TSC2101 is not set | ||
| 803 | # CONFIG_SPI_TSC2102 is not set | ||
| 804 | # CONFIG_SPI_TSC210X is not set | ||
| 805 | # CONFIG_SPI_TSC2301 is not set | ||
| 806 | # CONFIG_SPI_SPIDEV is not set | ||
| 807 | # CONFIG_SPI_TLE62X0 is not set | ||
| 808 | # CONFIG_W1 is not set | ||
| 809 | # CONFIG_POWER_SUPPLY is not set | ||
| 810 | # CONFIG_HWMON is not set | ||
| 811 | CONFIG_WATCHDOG=y | ||
| 812 | CONFIG_WATCHDOG_NOWAYOUT=y | ||
| 813 | |||
| 814 | # | ||
| 815 | # Watchdog Device Drivers | ||
| 816 | # | ||
| 817 | # CONFIG_SOFT_WATCHDOG is not set | ||
| 818 | CONFIG_OMAP_WATCHDOG=y | ||
| 819 | |||
| 820 | # | ||
| 821 | # USB-based Watchdog Cards | ||
| 822 | # | ||
| 823 | # CONFIG_USBPCWATCHDOG is not set | ||
| 824 | |||
| 825 | # | ||
| 826 | # Sonics Silicon Backplane | ||
| 827 | # | ||
| 828 | CONFIG_SSB_POSSIBLE=y | ||
| 829 | # CONFIG_SSB is not set | ||
| 830 | |||
| 831 | # | ||
| 832 | # Multifunction device drivers | ||
| 833 | # | ||
| 834 | # CONFIG_MFD_SM501 is not set | ||
| 835 | |||
| 836 | # | ||
| 837 | # Multimedia devices | ||
| 838 | # | ||
| 839 | # CONFIG_VIDEO_DEV is not set | ||
| 840 | # CONFIG_DVB_CORE is not set | ||
| 841 | CONFIG_DAB=y | ||
| 842 | # CONFIG_USB_DABUSB is not set | ||
| 843 | |||
| 844 | # | ||
| 845 | # Graphics support | ||
| 846 | # | ||
| 847 | # CONFIG_VGASTATE is not set | ||
| 848 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 849 | CONFIG_FB=y | ||
| 850 | # CONFIG_FIRMWARE_EDID is not set | ||
| 851 | # CONFIG_FB_DDC is not set | ||
| 852 | CONFIG_FB_CFB_FILLRECT=y | ||
| 853 | CONFIG_FB_CFB_COPYAREA=y | ||
| 854 | CONFIG_FB_CFB_IMAGEBLIT=y | ||
| 855 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | ||
| 856 | # CONFIG_FB_SYS_FILLRECT is not set | ||
| 857 | # CONFIG_FB_SYS_COPYAREA is not set | ||
| 858 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
| 859 | # CONFIG_FB_SYS_FOPS is not set | ||
| 860 | CONFIG_FB_DEFERRED_IO=y | ||
| 861 | # CONFIG_FB_SVGALIB is not set | ||
| 862 | # CONFIG_FB_MACMODES is not set | ||
| 863 | # CONFIG_FB_BACKLIGHT is not set | ||
| 864 | # CONFIG_FB_MODE_HELPERS is not set | ||
| 865 | # CONFIG_FB_TILEBLITTING is not set | ||
| 866 | |||
| 867 | # | ||
| 868 | # Frame buffer hardware drivers | ||
| 869 | # | ||
| 870 | # CONFIG_FB_UVESA is not set | ||
| 871 | # CONFIG_FB_S1D13XXX is not set | ||
| 872 | # CONFIG_FB_VIRTUAL is not set | ||
| 873 | CONFIG_FB_OMAP=y | ||
| 874 | CONFIG_FB_OMAP_LCDC_EXTERNAL=y | ||
| 875 | CONFIG_FB_OMAP_LCDC_HWA742=y | ||
| 876 | # CONFIG_FB_OMAP_LCDC_BLIZZARD is not set | ||
| 877 | CONFIG_FB_OMAP_MANUAL_UPDATE=y | ||
| 878 | # CONFIG_FB_OMAP_LCD_MIPID is not set | ||
| 879 | # CONFIG_FB_OMAP_BOOTLOADER_INIT is not set | ||
| 880 | CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2 | ||
| 881 | # CONFIG_FB_OMAP_DMA_TUNE is not set | ||
| 882 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 883 | |||
| 884 | # | ||
| 885 | # Display device support | ||
| 886 | # | ||
| 887 | # CONFIG_DISPLAY_SUPPORT is not set | ||
| 888 | |||
| 889 | # | ||
| 890 | # Console display driver support | ||
| 891 | # | ||
| 892 | # CONFIG_VGA_CONSOLE is not set | ||
| 893 | CONFIG_DUMMY_CONSOLE=y | ||
| 894 | # CONFIG_FRAMEBUFFER_CONSOLE is not set | ||
| 895 | # CONFIG_LOGO is not set | ||
| 896 | |||
| 897 | # | ||
| 898 | # Sound | ||
| 899 | # | ||
| 900 | CONFIG_SOUND=y | ||
| 901 | |||
| 902 | # | ||
| 903 | # Advanced Linux Sound Architecture | ||
| 904 | # | ||
| 905 | CONFIG_SND=y | ||
| 906 | CONFIG_SND_TIMER=y | ||
| 907 | CONFIG_SND_PCM=y | ||
| 908 | CONFIG_SND_HWDEP=y | ||
| 909 | CONFIG_SND_RAWMIDI=y | ||
| 910 | # CONFIG_SND_SEQUENCER is not set | ||
| 911 | # CONFIG_SND_MIXER_OSS is not set | ||
| 912 | # CONFIG_SND_PCM_OSS is not set | ||
| 913 | # CONFIG_SND_DYNAMIC_MINORS is not set | ||
| 914 | # CONFIG_SND_SUPPORT_OLD_API is not set | ||
| 915 | CONFIG_SND_VERBOSE_PROCFS=y | ||
| 916 | # CONFIG_SND_VERBOSE_PRINTK is not set | ||
| 917 | # CONFIG_SND_DEBUG is not set | ||
| 918 | |||
| 919 | # | ||
| 920 | # Generic devices | ||
| 921 | # | ||
| 922 | CONFIG_SND_DUMMY=y | ||
| 923 | # CONFIG_SND_MTPAV is not set | ||
| 924 | # CONFIG_SND_SERIAL_U16550 is not set | ||
| 925 | # CONFIG_SND_MPU401 is not set | ||
| 926 | |||
| 927 | # | ||
| 928 | # ALSA ARM devices | ||
| 929 | # | ||
| 930 | CONFIG_SND_OMAP_AIC23=y | ||
| 931 | # CONFIG_SND_OMAP_TSC2101 is not set | ||
| 932 | # CONFIG_SND_SX1 is not set | ||
| 933 | # CONFIG_SND_OMAP_TSC2102 is not set | ||
| 934 | # CONFIG_SND_OMAP24XX_EAC is not set | ||
| 935 | |||
| 936 | # | ||
| 937 | # SPI devices | ||
| 938 | # | ||
| 939 | |||
| 940 | # | ||
| 941 | # USB devices | ||
| 942 | # | ||
| 943 | CONFIG_SND_USB_AUDIO=y | ||
| 944 | # CONFIG_SND_USB_CAIAQ is not set | ||
| 945 | |||
| 946 | # | ||
| 947 | # System on Chip audio support | ||
| 948 | # | ||
| 949 | # CONFIG_SND_SOC is not set | ||
| 950 | |||
| 951 | # | ||
| 952 | # SoC Audio support for SuperH | ||
| 953 | # | ||
| 954 | |||
| 955 | # | ||
| 956 | # Open Sound System | ||
| 957 | # | ||
| 958 | # CONFIG_SOUND_PRIME is not set | ||
| 959 | CONFIG_HID_SUPPORT=y | ||
| 960 | CONFIG_HID=y | ||
| 961 | CONFIG_HID_DEBUG=y | ||
| 962 | # CONFIG_HIDRAW is not set | ||
| 963 | |||
| 964 | # | ||
| 965 | # USB Input Devices | ||
| 966 | # | ||
| 967 | CONFIG_USB_HID=y | ||
| 968 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | ||
| 969 | # CONFIG_HID_FF is not set | ||
| 970 | # CONFIG_USB_HIDDEV is not set | ||
| 971 | CONFIG_USB_SUPPORT=y | ||
| 972 | CONFIG_USB_ARCH_HAS_HCD=y | ||
| 973 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
| 974 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
| 975 | CONFIG_USB=y | ||
| 976 | # CONFIG_USB_DEBUG is not set | ||
| 977 | |||
| 978 | # | ||
| 979 | # Miscellaneous USB options | ||
| 980 | # | ||
| 981 | CONFIG_USB_DEVICEFS=y | ||
| 982 | CONFIG_USB_DEVICE_CLASS=y | ||
| 983 | # CONFIG_USB_DYNAMIC_MINORS is not set | ||
| 984 | CONFIG_USB_SUSPEND=y | ||
| 985 | # CONFIG_USB_PERSIST is not set | ||
| 986 | CONFIG_USB_OTG=y | ||
| 987 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 988 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 989 | |||
| 990 | # | ||
| 991 | # USB Host Controller Drivers | ||
| 992 | # | ||
| 993 | # CONFIG_USB_ISP116X_HCD is not set | ||
| 994 | CONFIG_USB_OHCI_HCD=y | ||
| 995 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | ||
| 996 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | ||
| 997 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | ||
| 998 | # CONFIG_USB_SL811_HCD is not set | ||
| 999 | # CONFIG_USB_R8A66597_HCD is not set | ||
| 1000 | # CONFIG_USB_MUSB_HDRC is not set | ||
| 1001 | # CONFIG_USB_GADGET_MUSB_HDRC is not set | ||
| 1002 | |||
| 1003 | # | ||
| 1004 | # USB Device Class drivers | ||
| 1005 | # | ||
| 1006 | # CONFIG_USB_ACM is not set | ||
| 1007 | # CONFIG_USB_PRINTER is not set | ||
| 1008 | |||
| 1009 | # | ||
| 1010 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
| 1011 | # | ||
| 1012 | |||
| 1013 | # | ||
| 1014 | # may also be needed; see USB_STORAGE Help for more information | ||
| 1015 | # | ||
| 1016 | CONFIG_USB_STORAGE=y | ||
| 1017 | # CONFIG_USB_STORAGE_DEBUG is not set | ||
| 1018 | # CONFIG_USB_STORAGE_DATAFAB is not set | ||
| 1019 | # CONFIG_USB_STORAGE_FREECOM is not set | ||
| 1020 | # CONFIG_USB_STORAGE_ISD200 is not set | ||
| 1021 | # CONFIG_USB_STORAGE_DPCM is not set | ||
| 1022 | # CONFIG_USB_STORAGE_USBAT is not set | ||
| 1023 | # CONFIG_USB_STORAGE_SDDR09 is not set | ||
| 1024 | # CONFIG_USB_STORAGE_SDDR55 is not set | ||
| 1025 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | ||
| 1026 | # CONFIG_USB_STORAGE_ALAUDA is not set | ||
| 1027 | # CONFIG_USB_STORAGE_KARMA is not set | ||
| 1028 | # CONFIG_USB_LIBUSUAL is not set | ||
| 1029 | |||
| 1030 | # | ||
| 1031 | # USB Imaging devices | ||
| 1032 | # | ||
| 1033 | # CONFIG_USB_MDC800 is not set | ||
| 1034 | # CONFIG_USB_MICROTEK is not set | ||
| 1035 | # CONFIG_USB_MON is not set | ||
| 1036 | |||
| 1037 | # | ||
| 1038 | # USB port drivers | ||
| 1039 | # | ||
| 1040 | |||
| 1041 | # | ||
| 1042 | # USB Serial Converter support | ||
| 1043 | # | ||
| 1044 | CONFIG_USB_SERIAL=y | ||
| 1045 | CONFIG_USB_SERIAL_CONSOLE=y | ||
| 1046 | # CONFIG_USB_SERIAL_GENERIC is not set | ||
| 1047 | # CONFIG_USB_SERIAL_AIRCABLE is not set | ||
| 1048 | # CONFIG_USB_SERIAL_AIRPRIME is not set | ||
| 1049 | # CONFIG_USB_SERIAL_ARK3116 is not set | ||
| 1050 | # CONFIG_USB_SERIAL_BELKIN is not set | ||
| 1051 | # CONFIG_USB_SERIAL_CH341 is not set | ||
| 1052 | # CONFIG_USB_SERIAL_WHITEHEAT is not set | ||
| 1053 | # CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set | ||
| 1054 | # CONFIG_USB_SERIAL_CP2101 is not set | ||
| 1055 | # CONFIG_USB_SERIAL_CYPRESS_M8 is not set | ||
| 1056 | # CONFIG_USB_SERIAL_EMPEG is not set | ||
| 1057 | # CONFIG_USB_SERIAL_FTDI_SIO is not set | ||
| 1058 | # CONFIG_USB_SERIAL_FUNSOFT is not set | ||
| 1059 | # CONFIG_USB_SERIAL_VISOR is not set | ||
| 1060 | # CONFIG_USB_SERIAL_IPAQ is not set | ||
| 1061 | # CONFIG_USB_SERIAL_IR is not set | ||
| 1062 | # CONFIG_USB_SERIAL_EDGEPORT is not set | ||
| 1063 | # CONFIG_USB_SERIAL_EDGEPORT_TI is not set | ||
| 1064 | # CONFIG_USB_SERIAL_GARMIN is not set | ||
| 1065 | # CONFIG_USB_SERIAL_IPW is not set | ||
| 1066 | # CONFIG_USB_SERIAL_KEYSPAN_PDA is not set | ||
| 1067 | # CONFIG_USB_SERIAL_KEYSPAN is not set | ||
| 1068 | # CONFIG_USB_SERIAL_KLSI is not set | ||
| 1069 | # CONFIG_USB_SERIAL_KOBIL_SCT is not set | ||
| 1070 | # CONFIG_USB_SERIAL_MCT_U232 is not set | ||
| 1071 | # CONFIG_USB_SERIAL_MOS7720 is not set | ||
| 1072 | # CONFIG_USB_SERIAL_MOS7840 is not set | ||
| 1073 | # CONFIG_USB_SERIAL_NAVMAN is not set | ||
| 1074 | CONFIG_USB_SERIAL_PL2303=y | ||
| 1075 | # CONFIG_USB_SERIAL_OTI6858 is not set | ||
| 1076 | # CONFIG_USB_SERIAL_HP4X is not set | ||
| 1077 | # CONFIG_USB_SERIAL_SAFE is not set | ||
| 1078 | # CONFIG_USB_SERIAL_SIERRAWIRELESS is not set | ||
| 1079 | # CONFIG_USB_SERIAL_TI is not set | ||
| 1080 | # CONFIG_USB_SERIAL_CYBERJACK is not set | ||
| 1081 | # CONFIG_USB_SERIAL_XIRCOM is not set | ||
| 1082 | # CONFIG_USB_SERIAL_OPTION is not set | ||
| 1083 | # CONFIG_USB_SERIAL_OMNINET is not set | ||
| 1084 | # CONFIG_USB_SERIAL_DEBUG is not set | ||
| 1085 | |||
| 1086 | # | ||
| 1087 | # USB Miscellaneous drivers | ||
| 1088 | # | ||
| 1089 | # CONFIG_USB_EMI62 is not set | ||
| 1090 | # CONFIG_USB_EMI26 is not set | ||
| 1091 | # CONFIG_USB_ADUTUX is not set | ||
| 1092 | # CONFIG_USB_AUERSWALD is not set | ||
| 1093 | # CONFIG_USB_RIO500 is not set | ||
| 1094 | # CONFIG_USB_LEGOTOWER is not set | ||
| 1095 | # CONFIG_USB_LCD is not set | ||
| 1096 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 1097 | # CONFIG_USB_LED is not set | ||
| 1098 | # CONFIG_USB_CYPRESS_CY7C63 is not set | ||
| 1099 | # CONFIG_USB_CYTHERM is not set | ||
| 1100 | # CONFIG_USB_PHIDGET is not set | ||
| 1101 | # CONFIG_USB_IDMOUSE is not set | ||
| 1102 | # CONFIG_USB_FTDI_ELAN is not set | ||
| 1103 | # CONFIG_USB_APPLEDISPLAY is not set | ||
| 1104 | # CONFIG_USB_LD is not set | ||
| 1105 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
| 1106 | # CONFIG_USB_IOWARRIOR is not set | ||
| 1107 | # CONFIG_USB_TEST is not set | ||
| 1108 | |||
| 1109 | # | ||
| 1110 | # USB DSL modem support | ||
| 1111 | # | ||
| 1112 | |||
| 1113 | # | ||
| 1114 | # USB Gadget Support | ||
| 1115 | # | ||
| 1116 | CONFIG_USB_GADGET=y | ||
| 1117 | # CONFIG_USB_GADGET_DEBUG is not set | ||
| 1118 | # CONFIG_USB_GADGET_DEBUG_FILES is not set | ||
| 1119 | CONFIG_USB_GADGET_SELECTED=y | ||
| 1120 | # CONFIG_USB_GADGET_AMD5536UDC is not set | ||
| 1121 | # CONFIG_USB_GADGET_ATMEL_USBA is not set | ||
| 1122 | # CONFIG_USB_GADGET_FSL_USB2 is not set | ||
| 1123 | # CONFIG_USB_GADGET_NET2280 is not set | ||
| 1124 | # CONFIG_USB_GADGET_PXA2XX is not set | ||
| 1125 | # CONFIG_USB_GADGET_M66592 is not set | ||
| 1126 | # CONFIG_USB_GADGET_GOKU is not set | ||
| 1127 | # CONFIG_USB_GADGET_LH7A40X is not set | ||
| 1128 | CONFIG_USB_GADGET_OMAP=y | ||
| 1129 | CONFIG_USB_OMAP=y | ||
| 1130 | # CONFIG_USB_GADGET_S3C2410 is not set | ||
| 1131 | # CONFIG_USB_GADGET_AT91 is not set | ||
| 1132 | # CONFIG_USB_GADGET_DUMMY_HCD is not set | ||
| 1133 | # CONFIG_USB_GADGET_DUALSPEED is not set | ||
| 1134 | # CONFIG_USB_ZERO is not set | ||
| 1135 | CONFIG_USB_ETH=m | ||
| 1136 | CONFIG_USB_ETH_RNDIS=y | ||
| 1137 | # CONFIG_USB_GADGETFS is not set | ||
| 1138 | CONFIG_USB_FILE_STORAGE=m | ||
| 1139 | CONFIG_USB_FILE_STORAGE_TEST=y | ||
| 1140 | # CONFIG_USB_G_SERIAL is not set | ||
| 1141 | # CONFIG_USB_MIDI_GADGET is not set | ||
| 1142 | CONFIG_MMC=y | ||
| 1143 | # CONFIG_MMC_DEBUG is not set | ||
| 1144 | # CONFIG_MMC_UNSAFE_RESUME is not set | ||
| 1145 | |||
| 1146 | # | ||
| 1147 | # MMC/SD Card Drivers | ||
| 1148 | # | ||
| 1149 | CONFIG_MMC_BLOCK=y | ||
| 1150 | CONFIG_MMC_BLOCK_BOUNCE=y | ||
| 1151 | # CONFIG_SDIO_UART is not set | ||
| 1152 | |||
| 1153 | # | ||
| 1154 | # MMC/SD Host Controller Drivers | ||
| 1155 | # | ||
| 1156 | CONFIG_MMC_OMAP=y | ||
| 1157 | # CONFIG_MMC_SPI is not set | ||
| 1158 | # CONFIG_NEW_LEDS is not set | ||
| 1159 | CONFIG_RTC_LIB=y | ||
| 1160 | # CONFIG_RTC_CLASS is not set | ||
| 1161 | |||
| 1162 | # | ||
| 1163 | # CBUS support | ||
| 1164 | # | ||
| 1165 | CONFIG_CBUS=y | ||
| 1166 | CONFIG_CBUS_TAHVO=y | ||
| 1167 | CONFIG_CBUS_TAHVO_USER=y | ||
| 1168 | CONFIG_CBUS_TAHVO_USB=y | ||
| 1169 | # CONFIG_CBUS_TAHVO_USB_HOST_BY_DEFAULT is not set | ||
| 1170 | CONFIG_CBUS_RETU=y | ||
| 1171 | CONFIG_CBUS_RETU_USER=y | ||
| 1172 | CONFIG_CBUS_RETU_POWERBUTTON=y | ||
| 1173 | CONFIG_CBUS_RETU_RTC=y | ||
| 1174 | CONFIG_CBUS_RETU_WDT=y | ||
| 1175 | # CONFIG_CBUS_RETU_HEADSET is not set | ||
| 1176 | CONFIG_OMAP_DSP=y | ||
| 1177 | # CONFIG_OMAP_DSP_MBCMD_VERBOSE is not set | ||
| 1178 | CONFIG_OMAP_DSP_FBEXPORT=y | ||
| 1179 | |||
| 1180 | # | ||
| 1181 | # File systems | ||
| 1182 | # | ||
| 1183 | CONFIG_EXT2_FS=y | ||
| 1184 | # CONFIG_EXT2_FS_XATTR is not set | ||
| 1185 | # CONFIG_EXT2_FS_XIP is not set | ||
| 1186 | CONFIG_EXT3_FS=y | ||
| 1187 | CONFIG_EXT3_FS_XATTR=y | ||
| 1188 | # CONFIG_EXT3_FS_POSIX_ACL is not set | ||
| 1189 | # CONFIG_EXT3_FS_SECURITY is not set | ||
| 1190 | # CONFIG_EXT4DEV_FS is not set | ||
| 1191 | CONFIG_JBD=y | ||
| 1192 | CONFIG_FS_MBCACHE=y | ||
| 1193 | # CONFIG_REISERFS_FS is not set | ||
| 1194 | # CONFIG_JFS_FS is not set | ||
| 1195 | # CONFIG_FS_POSIX_ACL is not set | ||
| 1196 | # CONFIG_XFS_FS is not set | ||
| 1197 | # CONFIG_GFS2_FS is not set | ||
| 1198 | # CONFIG_OCFS2_FS is not set | ||
| 1199 | # CONFIG_MINIX_FS is not set | ||
| 1200 | # CONFIG_ROMFS_FS is not set | ||
| 1201 | # CONFIG_INOTIFY is not set | ||
| 1202 | # CONFIG_QUOTA is not set | ||
| 1203 | CONFIG_DNOTIFY=y | ||
| 1204 | # CONFIG_AUTOFS_FS is not set | ||
| 1205 | # CONFIG_AUTOFS4_FS is not set | ||
| 1206 | # CONFIG_FUSE_FS is not set | ||
| 1207 | |||
| 1208 | # | ||
| 1209 | # CD-ROM/DVD Filesystems | ||
| 1210 | # | ||
| 1211 | # CONFIG_ISO9660_FS is not set | ||
| 1212 | # CONFIG_UDF_FS is not set | ||
| 1213 | |||
| 1214 | # | ||
| 1215 | # DOS/FAT/NT Filesystems | ||
| 1216 | # | ||
| 1217 | CONFIG_FAT_FS=y | ||
| 1218 | CONFIG_MSDOS_FS=y | ||
| 1219 | CONFIG_VFAT_FS=y | ||
| 1220 | CONFIG_FAT_DEFAULT_CODEPAGE=437 | ||
| 1221 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | ||
| 1222 | # CONFIG_NTFS_FS is not set | ||
| 1223 | |||
| 1224 | # | ||
| 1225 | # Pseudo filesystems | ||
| 1226 | # | ||
| 1227 | CONFIG_PROC_FS=y | ||
| 1228 | CONFIG_PROC_SYSCTL=y | ||
| 1229 | CONFIG_SYSFS=y | ||
| 1230 | CONFIG_TMPFS=y | ||
| 1231 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
| 1232 | # CONFIG_HUGETLB_PAGE is not set | ||
| 1233 | # CONFIG_CONFIGFS_FS is not set | ||
| 1234 | |||
| 1235 | # | ||
| 1236 | # Miscellaneous filesystems | ||
| 1237 | # | ||
| 1238 | # CONFIG_ADFS_FS is not set | ||
| 1239 | # CONFIG_AFFS_FS is not set | ||
| 1240 | # CONFIG_HFS_FS is not set | ||
| 1241 | # CONFIG_HFSPLUS_FS is not set | ||
| 1242 | # CONFIG_BEFS_FS is not set | ||
| 1243 | # CONFIG_BFS_FS is not set | ||
| 1244 | # CONFIG_EFS_FS is not set | ||
| 1245 | CONFIG_JFFS2_FS=y | ||
| 1246 | CONFIG_JFFS2_FS_DEBUG=0 | ||
| 1247 | CONFIG_JFFS2_FS_WRITEBUFFER=y | ||
| 1248 | # CONFIG_JFFS2_FS_WBUF_VERIFY is not set | ||
| 1249 | CONFIG_JFFS2_SUMMARY=y | ||
| 1250 | # CONFIG_JFFS2_FS_XATTR is not set | ||
| 1251 | CONFIG_JFFS2_COMPRESSION_OPTIONS=y | ||
| 1252 | CONFIG_JFFS2_ZLIB=y | ||
| 1253 | # CONFIG_JFFS2_LZO is not set | ||
| 1254 | CONFIG_JFFS2_RTIME=y | ||
| 1255 | # CONFIG_JFFS2_RUBIN is not set | ||
| 1256 | # CONFIG_JFFS2_CMODE_NONE is not set | ||
| 1257 | CONFIG_JFFS2_CMODE_PRIORITY=y | ||
| 1258 | # CONFIG_JFFS2_CMODE_SIZE is not set | ||
| 1259 | # CONFIG_JFFS2_CMODE_FAVOURLZO is not set | ||
| 1260 | # CONFIG_CRAMFS is not set | ||
| 1261 | # CONFIG_VXFS_FS is not set | ||
| 1262 | # CONFIG_HPFS_FS is not set | ||
| 1263 | # CONFIG_QNX4FS_FS is not set | ||
| 1264 | # CONFIG_SYSV_FS is not set | ||
| 1265 | # CONFIG_UFS_FS is not set | ||
| 1266 | CONFIG_NETWORK_FILESYSTEMS=y | ||
| 1267 | CONFIG_NFS_FS=y | ||
| 1268 | CONFIG_NFS_V3=y | ||
| 1269 | # CONFIG_NFS_V3_ACL is not set | ||
| 1270 | # CONFIG_NFS_V4 is not set | ||
| 1271 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1272 | # CONFIG_NFSD is not set | ||
| 1273 | # CONFIG_ROOT_NFS is not set | ||
| 1274 | CONFIG_LOCKD=y | ||
| 1275 | CONFIG_LOCKD_V4=y | ||
| 1276 | CONFIG_NFS_COMMON=y | ||
| 1277 | CONFIG_SUNRPC=y | ||
| 1278 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 1279 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
| 1280 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
| 1281 | # CONFIG_SMB_FS is not set | ||
| 1282 | # CONFIG_CIFS is not set | ||
| 1283 | # CONFIG_NCP_FS is not set | ||
| 1284 | # CONFIG_CODA_FS is not set | ||
| 1285 | # CONFIG_AFS_FS is not set | ||
| 1286 | |||
| 1287 | # | ||
| 1288 | # Partition Types | ||
| 1289 | # | ||
| 1290 | CONFIG_PARTITION_ADVANCED=y | ||
| 1291 | # CONFIG_ACORN_PARTITION is not set | ||
| 1292 | # CONFIG_OSF_PARTITION is not set | ||
| 1293 | # CONFIG_AMIGA_PARTITION is not set | ||
| 1294 | # CONFIG_ATARI_PARTITION is not set | ||
| 1295 | # CONFIG_MAC_PARTITION is not set | ||
| 1296 | CONFIG_MSDOS_PARTITION=y | ||
| 1297 | # CONFIG_BSD_DISKLABEL is not set | ||
| 1298 | # CONFIG_MINIX_SUBPARTITION is not set | ||
| 1299 | # CONFIG_SOLARIS_X86_PARTITION is not set | ||
| 1300 | # CONFIG_UNIXWARE_DISKLABEL is not set | ||
| 1301 | # CONFIG_LDM_PARTITION is not set | ||
| 1302 | # CONFIG_SGI_PARTITION is not set | ||
| 1303 | # CONFIG_ULTRIX_PARTITION is not set | ||
| 1304 | # CONFIG_SUN_PARTITION is not set | ||
| 1305 | # CONFIG_KARMA_PARTITION is not set | ||
| 1306 | # CONFIG_EFI_PARTITION is not set | ||
| 1307 | # CONFIG_SYSV68_PARTITION is not set | ||
| 1308 | CONFIG_NLS=y | ||
| 1309 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
| 1310 | CONFIG_NLS_CODEPAGE_437=y | ||
| 1311 | # CONFIG_NLS_CODEPAGE_737 is not set | ||
| 1312 | # CONFIG_NLS_CODEPAGE_775 is not set | ||
| 1313 | # CONFIG_NLS_CODEPAGE_850 is not set | ||
| 1314 | CONFIG_NLS_CODEPAGE_852=y | ||
| 1315 | # CONFIG_NLS_CODEPAGE_855 is not set | ||
| 1316 | # CONFIG_NLS_CODEPAGE_857 is not set | ||
| 1317 | # CONFIG_NLS_CODEPAGE_860 is not set | ||
| 1318 | # CONFIG_NLS_CODEPAGE_861 is not set | ||
| 1319 | # CONFIG_NLS_CODEPAGE_862 is not set | ||
| 1320 | # CONFIG_NLS_CODEPAGE_863 is not set | ||
| 1321 | # CONFIG_NLS_CODEPAGE_864 is not set | ||
| 1322 | # CONFIG_NLS_CODEPAGE_865 is not set | ||
| 1323 | # CONFIG_NLS_CODEPAGE_866 is not set | ||
| 1324 | # CONFIG_NLS_CODEPAGE_869 is not set | ||
| 1325 | # CONFIG_NLS_CODEPAGE_936 is not set | ||
| 1326 | # CONFIG_NLS_CODEPAGE_950 is not set | ||
| 1327 | # CONFIG_NLS_CODEPAGE_932 is not set | ||
| 1328 | # CONFIG_NLS_CODEPAGE_949 is not set | ||
| 1329 | # CONFIG_NLS_CODEPAGE_874 is not set | ||
| 1330 | # CONFIG_NLS_ISO8859_8 is not set | ||
| 1331 | # CONFIG_NLS_CODEPAGE_1250 is not set | ||
| 1332 | # CONFIG_NLS_CODEPAGE_1251 is not set | ||
| 1333 | # CONFIG_NLS_ASCII is not set | ||
| 1334 | CONFIG_NLS_ISO8859_1=y | ||
| 1335 | # CONFIG_NLS_ISO8859_2 is not set | ||
| 1336 | # CONFIG_NLS_ISO8859_3 is not set | ||
| 1337 | # CONFIG_NLS_ISO8859_4 is not set | ||
| 1338 | # CONFIG_NLS_ISO8859_5 is not set | ||
| 1339 | # CONFIG_NLS_ISO8859_6 is not set | ||
| 1340 | # CONFIG_NLS_ISO8859_7 is not set | ||
| 1341 | # CONFIG_NLS_ISO8859_9 is not set | ||
| 1342 | # CONFIG_NLS_ISO8859_13 is not set | ||
| 1343 | # CONFIG_NLS_ISO8859_14 is not set | ||
| 1344 | CONFIG_NLS_ISO8859_15=y | ||
| 1345 | # CONFIG_NLS_KOI8_R is not set | ||
| 1346 | # CONFIG_NLS_KOI8_U is not set | ||
| 1347 | CONFIG_NLS_UTF8=y | ||
| 1348 | # CONFIG_DLM is not set | ||
| 1349 | CONFIG_INSTRUMENTATION=y | ||
| 1350 | # CONFIG_PROFILING is not set | ||
| 1351 | # CONFIG_MARKERS is not set | ||
| 1352 | |||
| 1353 | # | ||
| 1354 | # Kernel hacking | ||
| 1355 | # | ||
| 1356 | # CONFIG_PRINTK_TIME is not set | ||
| 1357 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
| 1358 | CONFIG_ENABLE_MUST_CHECK=y | ||
| 1359 | CONFIG_MAGIC_SYSRQ=y | ||
| 1360 | # CONFIG_UNUSED_SYMBOLS is not set | ||
| 1361 | # CONFIG_DEBUG_FS is not set | ||
| 1362 | # CONFIG_HEADERS_CHECK is not set | ||
| 1363 | CONFIG_DEBUG_KERNEL=y | ||
| 1364 | # CONFIG_DEBUG_SHIRQ is not set | ||
| 1365 | CONFIG_DETECT_SOFTLOCKUP=y | ||
| 1366 | CONFIG_SCHED_DEBUG=y | ||
| 1367 | # CONFIG_SCHEDSTATS is not set | ||
| 1368 | # CONFIG_TIMER_STATS is not set | ||
| 1369 | # CONFIG_DEBUG_SLAB is not set | ||
| 1370 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
| 1371 | # CONFIG_RT_MUTEX_TESTER is not set | ||
| 1372 | # CONFIG_DEBUG_SPINLOCK is not set | ||
| 1373 | CONFIG_DEBUG_MUTEXES=y | ||
| 1374 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
| 1375 | # CONFIG_PROVE_LOCKING is not set | ||
| 1376 | # CONFIG_LOCK_STAT is not set | ||
| 1377 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
| 1378 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
| 1379 | # CONFIG_DEBUG_KOBJECT is not set | ||
| 1380 | CONFIG_DEBUG_BUGVERBOSE=y | ||
| 1381 | # CONFIG_DEBUG_INFO is not set | ||
| 1382 | # CONFIG_DEBUG_VM is not set | ||
| 1383 | # CONFIG_DEBUG_LIST is not set | ||
| 1384 | # CONFIG_DEBUG_SG is not set | ||
| 1385 | CONFIG_FRAME_POINTER=y | ||
| 1386 | CONFIG_FORCED_INLINING=y | ||
| 1387 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
| 1388 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 1389 | # CONFIG_FAULT_INJECTION is not set | ||
| 1390 | # CONFIG_SAMPLES is not set | ||
| 1391 | # CONFIG_DEBUG_USER is not set | ||
| 1392 | CONFIG_DEBUG_ERRORS=y | ||
| 1393 | # CONFIG_DEBUG_LL is not set | ||
| 1394 | |||
| 1395 | # | ||
| 1396 | # Security options | ||
| 1397 | # | ||
| 1398 | # CONFIG_KEYS is not set | ||
| 1399 | CONFIG_SECURITY=y | ||
| 1400 | # CONFIG_SECURITY_NETWORK is not set | ||
| 1401 | # CONFIG_SECURITY_CAPABILITIES is not set | ||
| 1402 | # CONFIG_SECURITY_ROOTPLUG is not set | ||
| 1403 | # CONFIG_SECURITY_LOWMEM is not set | ||
| 1404 | # CONFIG_CRYPTO is not set | ||
| 1405 | |||
| 1406 | # | ||
| 1407 | # Library routines | ||
| 1408 | # | ||
| 1409 | CONFIG_BITREVERSE=y | ||
| 1410 | CONFIG_CRC_CCITT=y | ||
| 1411 | # CONFIG_CRC16 is not set | ||
| 1412 | # CONFIG_CRC_ITU_T is not set | ||
| 1413 | CONFIG_CRC32=y | ||
| 1414 | # CONFIG_CRC7 is not set | ||
| 1415 | # CONFIG_LIBCRC32C is not set | ||
| 1416 | CONFIG_ZLIB_INFLATE=y | ||
| 1417 | CONFIG_ZLIB_DEFLATE=y | ||
| 1418 | CONFIG_PLIST=y | ||
| 1419 | CONFIG_HAS_IOMEM=y | ||
| 1420 | CONFIG_HAS_IOPORT=y | ||
| 1421 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/arm/configs/omap_2430sdp_defconfig b/arch/arm/configs/omap_2430sdp_defconfig new file mode 100644 index 000000000000..b0617c0da2a1 --- /dev/null +++ b/arch/arm/configs/omap_2430sdp_defconfig | |||
| @@ -0,0 +1,1304 @@ | |||
| 1 | # | ||
| 2 | # Automatically generated make config: don't edit | ||
| 3 | # Linux kernel version: 2.6.23-rc6-omap1 | ||
| 4 | # Tue Sep 18 11:47:37 2007 | ||
| 5 | # | ||
| 6 | CONFIG_ARM=y | ||
| 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | ||
| 8 | CONFIG_GENERIC_GPIO=y | ||
| 9 | CONFIG_GENERIC_TIME=y | ||
| 10 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 11 | CONFIG_MMU=y | ||
| 12 | # CONFIG_NO_IOPORT is not set | ||
| 13 | CONFIG_GENERIC_HARDIRQS=y | ||
| 14 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 15 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 16 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
| 17 | CONFIG_HARDIRQS_SW_RESEND=y | ||
| 18 | CONFIG_GENERIC_IRQ_PROBE=y | ||
| 19 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
| 20 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
| 21 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
| 22 | CONFIG_GENERIC_HWEIGHT=y | ||
| 23 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
| 24 | CONFIG_ZONE_DMA=y | ||
| 25 | CONFIG_VECTORS_BASE=0xffff0000 | ||
| 26 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
| 27 | |||
| 28 | # | ||
| 29 | # General setup | ||
| 30 | # | ||
| 31 | CONFIG_EXPERIMENTAL=y | ||
| 32 | CONFIG_BROKEN_ON_SMP=y | ||
| 33 | CONFIG_LOCK_KERNEL=y | ||
| 34 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 35 | CONFIG_LOCALVERSION="" | ||
| 36 | CONFIG_LOCALVERSION_AUTO=y | ||
| 37 | CONFIG_SWAP=y | ||
| 38 | CONFIG_SYSVIPC=y | ||
| 39 | CONFIG_SYSVIPC_SYSCTL=y | ||
| 40 | # CONFIG_POSIX_MQUEUE is not set | ||
| 41 | CONFIG_BSD_PROCESS_ACCT=y | ||
| 42 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | ||
| 43 | # CONFIG_TASKSTATS is not set | ||
| 44 | # CONFIG_USER_NS is not set | ||
| 45 | # CONFIG_AUDIT is not set | ||
| 46 | # CONFIG_IKCONFIG is not set | ||
| 47 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 48 | CONFIG_SYSFS_DEPRECATED=y | ||
| 49 | # CONFIG_RELAY is not set | ||
| 50 | CONFIG_BLK_DEV_INITRD=y | ||
| 51 | CONFIG_INITRAMFS_SOURCE="" | ||
| 52 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
| 53 | CONFIG_SYSCTL=y | ||
| 54 | CONFIG_EMBEDDED=y | ||
| 55 | CONFIG_UID16=y | ||
| 56 | # CONFIG_SYSCTL_SYSCALL is not set | ||
| 57 | CONFIG_KALLSYMS=y | ||
| 58 | # CONFIG_KALLSYMS_ALL is not set | ||
| 59 | CONFIG_KALLSYMS_EXTRA_PASS=y | ||
| 60 | CONFIG_HOTPLUG=y | ||
| 61 | CONFIG_PRINTK=y | ||
| 62 | CONFIG_BUG=y | ||
| 63 | CONFIG_ELF_CORE=y | ||
| 64 | CONFIG_BASE_FULL=y | ||
| 65 | CONFIG_FUTEX=y | ||
| 66 | CONFIG_ANON_INODES=y | ||
| 67 | CONFIG_EPOLL=y | ||
| 68 | CONFIG_SIGNALFD=y | ||
| 69 | CONFIG_TIMERFD=y | ||
| 70 | CONFIG_EVENTFD=y | ||
| 71 | CONFIG_SHMEM=y | ||
| 72 | CONFIG_VM_EVENT_COUNTERS=y | ||
| 73 | CONFIG_SLAB=y | ||
| 74 | # CONFIG_SLUB is not set | ||
| 75 | # CONFIG_SLOB is not set | ||
| 76 | CONFIG_RT_MUTEXES=y | ||
| 77 | # CONFIG_TINY_SHMEM is not set | ||
| 78 | CONFIG_BASE_SMALL=0 | ||
| 79 | CONFIG_MODULES=y | ||
| 80 | CONFIG_MODULE_UNLOAD=y | ||
| 81 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 82 | CONFIG_MODVERSIONS=y | ||
| 83 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 84 | CONFIG_KMOD=y | ||
| 85 | CONFIG_BLOCK=y | ||
| 86 | # CONFIG_LBD is not set | ||
| 87 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 88 | # CONFIG_LSF is not set | ||
| 89 | # CONFIG_BLK_DEV_BSG is not set | ||
| 90 | |||
| 91 | # | ||
| 92 | # IO Schedulers | ||
| 93 | # | ||
| 94 | CONFIG_IOSCHED_NOOP=y | ||
| 95 | CONFIG_IOSCHED_AS=y | ||
| 96 | CONFIG_IOSCHED_DEADLINE=y | ||
| 97 | CONFIG_IOSCHED_CFQ=y | ||
| 98 | CONFIG_DEFAULT_AS=y | ||
| 99 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 100 | # CONFIG_DEFAULT_CFQ is not set | ||
| 101 | # CONFIG_DEFAULT_NOOP is not set | ||
| 102 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 103 | |||
| 104 | # | ||
| 105 | # System Type | ||
| 106 | # | ||
| 107 | # CONFIG_ARCH_AAEC2000 is not set | ||
| 108 | # CONFIG_ARCH_INTEGRATOR is not set | ||
| 109 | # CONFIG_ARCH_REALVIEW is not set | ||
| 110 | # CONFIG_ARCH_VERSATILE is not set | ||
| 111 | # CONFIG_ARCH_AT91 is not set | ||
| 112 | # CONFIG_ARCH_CLPS7500 is not set | ||
| 113 | # CONFIG_ARCH_CLPS711X is not set | ||
| 114 | # CONFIG_ARCH_CO285 is not set | ||
| 115 | # CONFIG_ARCH_EBSA110 is not set | ||
| 116 | # CONFIG_ARCH_EP93XX is not set | ||
| 117 | # CONFIG_ARCH_FOOTBRIDGE is not set | ||
| 118 | # CONFIG_ARCH_NETX is not set | ||
| 119 | # CONFIG_ARCH_H720X is not set | ||
| 120 | # CONFIG_ARCH_IMX is not set | ||
| 121 | # CONFIG_ARCH_IOP13XX is not set | ||
| 122 | # CONFIG_ARCH_IOP32X is not set | ||
| 123 | # CONFIG_ARCH_IOP33X is not set | ||
| 124 | # CONFIG_ARCH_IXP23XX is not set | ||
| 125 | # CONFIG_ARCH_IXP2000 is not set | ||
| 126 | # CONFIG_ARCH_IXP4XX is not set | ||
| 127 | # CONFIG_ARCH_L7200 is not set | ||
| 128 | # CONFIG_ARCH_KS8695 is not set | ||
| 129 | # CONFIG_ARCH_NS9XXX is not set | ||
| 130 | # CONFIG_ARCH_MXC is not set | ||
| 131 | # CONFIG_ARCH_PNX4008 is not set | ||
| 132 | # CONFIG_ARCH_PXA is not set | ||
| 133 | # CONFIG_ARCH_RPC is not set | ||
| 134 | # CONFIG_ARCH_SA1100 is not set | ||
| 135 | # CONFIG_ARCH_S3C2410 is not set | ||
| 136 | # CONFIG_ARCH_SHARK is not set | ||
| 137 | # CONFIG_ARCH_LH7A40X is not set | ||
| 138 | # CONFIG_ARCH_DAVINCI is not set | ||
| 139 | CONFIG_ARCH_OMAP=y | ||
| 140 | |||
| 141 | # | ||
| 142 | # TI OMAP Implementations | ||
| 143 | # | ||
| 144 | # CONFIG_ARCH_OMAP1 is not set | ||
| 145 | CONFIG_ARCH_OMAP2=y | ||
| 146 | # CONFIG_ARCH_OMAP3 is not set | ||
| 147 | |||
| 148 | # | ||
| 149 | # OMAP Feature Selections | ||
| 150 | # | ||
| 151 | # CONFIG_OMAP_RESET_CLOCKS is not set | ||
| 152 | CONFIG_OMAP_BOOT_TAG=y | ||
| 153 | # CONFIG_OMAP_BOOT_REASON is not set | ||
| 154 | # CONFIG_OMAP_COMPONENT_VERSION is not set | ||
| 155 | # CONFIG_OMAP_GPIO_SWITCH is not set | ||
| 156 | CONFIG_OMAP_MUX=y | ||
| 157 | # CONFIG_OMAP_MUX_DEBUG is not set | ||
| 158 | # CONFIG_OMAP_MUX_WARNINGS is not set | ||
| 159 | # CONFIG_OMAP_STI is not set | ||
| 160 | CONFIG_OMAP_MCBSP=y | ||
| 161 | # CONFIG_OMAP_MMU_FWK is not set | ||
| 162 | # CONFIG_OMAP_MBOX_FWK is not set | ||
| 163 | CONFIG_OMAP_MPU_TIMER=y | ||
| 164 | # CONFIG_OMAP_32K_TIMER is not set | ||
| 165 | CONFIG_OMAP_DM_TIMER=y | ||
| 166 | CONFIG_OMAP_LL_DEBUG_UART1=y | ||
| 167 | # CONFIG_OMAP_LL_DEBUG_UART2 is not set | ||
| 168 | # CONFIG_OMAP_LL_DEBUG_UART3 is not set | ||
| 169 | CONFIG_OMAP_SERIAL_WAKE=y | ||
| 170 | # CONFIG_OMAP_DSP is not set | ||
| 171 | # CONFIG_MACH_OMAP_GENERIC is not set | ||
| 172 | |||
| 173 | # | ||
| 174 | # OMAP Core Type | ||
| 175 | # | ||
| 176 | CONFIG_ARCH_OMAP24XX=y | ||
| 177 | # CONFIG_ARCH_OMAP2420 is not set | ||
| 178 | CONFIG_ARCH_OMAP2430=y | ||
| 179 | |||
| 180 | # | ||
| 181 | # OMAP Board Type | ||
| 182 | # | ||
| 183 | # CONFIG_MACH_NOKIA_N800 is not set | ||
| 184 | # CONFIG_MACH_OMAP_H4 is not set | ||
| 185 | # CONFIG_MACH_OMAP_APOLLON is not set | ||
| 186 | # CONFIG_MACH_OMAP_APOLLON_PLUS is not set | ||
| 187 | CONFIG_MACH_OMAP_2430SDP=y | ||
| 188 | |||
| 189 | # | ||
| 190 | # Boot options | ||
| 191 | # | ||
| 192 | |||
| 193 | # | ||
| 194 | # Power management | ||
| 195 | # | ||
| 196 | |||
| 197 | # | ||
| 198 | # Processor Type | ||
| 199 | # | ||
| 200 | CONFIG_CPU_32=y | ||
| 201 | CONFIG_CPU_V6=y | ||
| 202 | # CONFIG_CPU_32v6K is not set | ||
| 203 | CONFIG_CPU_32v6=y | ||
| 204 | CONFIG_CPU_ABRT_EV6=y | ||
| 205 | CONFIG_CPU_PABRT_NOIFAR=y | ||
| 206 | CONFIG_CPU_CACHE_V6=y | ||
| 207 | CONFIG_CPU_CACHE_VIPT=y | ||
| 208 | CONFIG_CPU_COPY_V6=y | ||
| 209 | CONFIG_CPU_TLB_V6=y | ||
| 210 | CONFIG_CPU_HAS_ASID=y | ||
| 211 | CONFIG_CPU_CP15=y | ||
| 212 | CONFIG_CPU_CP15_MMU=y | ||
| 213 | |||
| 214 | # | ||
| 215 | # Processor Features | ||
| 216 | # | ||
| 217 | CONFIG_ARM_THUMB=y | ||
| 218 | # CONFIG_CPU_ICACHE_DISABLE is not set | ||
| 219 | # CONFIG_CPU_DCACHE_DISABLE is not set | ||
| 220 | # CONFIG_CPU_BPREDICT_DISABLE is not set | ||
| 221 | # CONFIG_OUTER_CACHE is not set | ||
| 222 | |||
| 223 | # | ||
| 224 | # Bus support | ||
| 225 | # | ||
| 226 | # CONFIG_PCI_SYSCALL is not set | ||
| 227 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 228 | |||
| 229 | # | ||
| 230 | # PCCARD (PCMCIA/CardBus) support | ||
| 231 | # | ||
| 232 | # CONFIG_PCCARD is not set | ||
| 233 | |||
| 234 | # | ||
| 235 | # Kernel Features | ||
| 236 | # | ||
| 237 | # CONFIG_TICK_ONESHOT is not set | ||
| 238 | # CONFIG_NO_HZ is not set | ||
| 239 | # CONFIG_HIGH_RES_TIMERS is not set | ||
| 240 | CONFIG_PREEMPT=y | ||
| 241 | CONFIG_HZ=100 | ||
| 242 | CONFIG_AEABI=y | ||
| 243 | CONFIG_OABI_COMPAT=y | ||
| 244 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | ||
| 245 | CONFIG_SELECT_MEMORY_MODEL=y | ||
| 246 | CONFIG_FLATMEM_MANUAL=y | ||
| 247 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
| 248 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
| 249 | CONFIG_FLATMEM=y | ||
| 250 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
| 251 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 252 | CONFIG_SPLIT_PTLOCK_CPUS=4 | ||
| 253 | # CONFIG_RESOURCES_64BIT is not set | ||
| 254 | CONFIG_ZONE_DMA_FLAG=1 | ||
| 255 | CONFIG_BOUNCE=y | ||
| 256 | CONFIG_VIRT_TO_BUS=y | ||
| 257 | # CONFIG_LEDS is not set | ||
| 258 | CONFIG_ALIGNMENT_TRAP=y | ||
| 259 | |||
| 260 | # | ||
| 261 | # Boot options | ||
| 262 | # | ||
| 263 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
| 264 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
| 265 | CONFIG_CMDLINE="root=/dev/ram0 rw console=ttyS0,115200n8 initrd=0x80600000,8M ramdisk_size=8192" | ||
| 266 | # CONFIG_XIP_KERNEL is not set | ||
| 267 | # CONFIG_KEXEC is not set | ||
| 268 | |||
| 269 | # | ||
| 270 | # CPU Frequency scaling | ||
| 271 | # | ||
| 272 | # CONFIG_CPU_FREQ is not set | ||
| 273 | |||
| 274 | # | ||
| 275 | # Floating point emulation | ||
| 276 | # | ||
| 277 | |||
| 278 | # | ||
| 279 | # At least one emulation must be selected | ||
| 280 | # | ||
| 281 | CONFIG_FPE_NWFPE=y | ||
| 282 | # CONFIG_FPE_NWFPE_XP is not set | ||
| 283 | # CONFIG_FPE_FASTFPE is not set | ||
| 284 | # CONFIG_VFP is not set | ||
| 285 | |||
| 286 | # | ||
| 287 | # Userspace binary formats | ||
| 288 | # | ||
| 289 | CONFIG_BINFMT_ELF=y | ||
| 290 | # CONFIG_BINFMT_AOUT is not set | ||
| 291 | CONFIG_BINFMT_MISC=y | ||
| 292 | |||
| 293 | # | ||
| 294 | # Power management options | ||
| 295 | # | ||
| 296 | CONFIG_PM=y | ||
| 297 | # CONFIG_PM_LEGACY is not set | ||
| 298 | # CONFIG_PM_DEBUG is not set | ||
| 299 | CONFIG_PM_SLEEP=y | ||
| 300 | CONFIG_SUSPEND_UP_POSSIBLE=y | ||
| 301 | CONFIG_SUSPEND=y | ||
| 302 | # CONFIG_APM_EMULATION is not set | ||
| 303 | |||
| 304 | # | ||
| 305 | # Networking | ||
| 306 | # | ||
| 307 | CONFIG_NET=y | ||
| 308 | |||
| 309 | # | ||
| 310 | # Networking options | ||
| 311 | # | ||
| 312 | CONFIG_PACKET=y | ||
| 313 | # CONFIG_PACKET_MMAP is not set | ||
| 314 | CONFIG_UNIX=y | ||
| 315 | CONFIG_XFRM=y | ||
| 316 | # CONFIG_XFRM_USER is not set | ||
| 317 | # CONFIG_XFRM_SUB_POLICY is not set | ||
| 318 | # CONFIG_XFRM_MIGRATE is not set | ||
| 319 | CONFIG_NET_KEY=y | ||
| 320 | # CONFIG_NET_KEY_MIGRATE is not set | ||
| 321 | CONFIG_INET=y | ||
| 322 | # CONFIG_IP_MULTICAST is not set | ||
| 323 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
| 324 | CONFIG_IP_FIB_HASH=y | ||
| 325 | CONFIG_IP_PNP=y | ||
| 326 | CONFIG_IP_PNP_DHCP=y | ||
| 327 | # CONFIG_IP_PNP_BOOTP is not set | ||
| 328 | # CONFIG_IP_PNP_RARP is not set | ||
| 329 | # CONFIG_NET_IPIP is not set | ||
| 330 | # CONFIG_NET_IPGRE is not set | ||
| 331 | # CONFIG_ARPD is not set | ||
| 332 | # CONFIG_SYN_COOKIES is not set | ||
| 333 | # CONFIG_INET_AH is not set | ||
| 334 | # CONFIG_INET_ESP is not set | ||
| 335 | # CONFIG_INET_IPCOMP is not set | ||
| 336 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
| 337 | # CONFIG_INET_TUNNEL is not set | ||
| 338 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | ||
| 339 | CONFIG_INET_XFRM_MODE_TUNNEL=y | ||
| 340 | CONFIG_INET_XFRM_MODE_BEET=y | ||
| 341 | CONFIG_INET_DIAG=y | ||
| 342 | CONFIG_INET_TCP_DIAG=y | ||
| 343 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
| 344 | CONFIG_TCP_CONG_CUBIC=y | ||
| 345 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
| 346 | # CONFIG_TCP_MD5SIG is not set | ||
| 347 | # CONFIG_IPV6 is not set | ||
| 348 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 349 | # CONFIG_INET6_TUNNEL is not set | ||
| 350 | # CONFIG_NETWORK_SECMARK is not set | ||
| 351 | # CONFIG_NETFILTER is not set | ||
| 352 | # CONFIG_IP_DCCP is not set | ||
| 353 | # CONFIG_IP_SCTP is not set | ||
| 354 | # CONFIG_TIPC is not set | ||
| 355 | # CONFIG_ATM is not set | ||
| 356 | # CONFIG_BRIDGE is not set | ||
| 357 | # CONFIG_VLAN_8021Q is not set | ||
| 358 | # CONFIG_DECNET is not set | ||
| 359 | # CONFIG_LLC2 is not set | ||
| 360 | # CONFIG_IPX is not set | ||
| 361 | # CONFIG_ATALK is not set | ||
| 362 | # CONFIG_X25 is not set | ||
| 363 | # CONFIG_LAPB is not set | ||
| 364 | # CONFIG_ECONET is not set | ||
| 365 | # CONFIG_WAN_ROUTER is not set | ||
| 366 | |||
| 367 | # | ||
| 368 | # QoS and/or fair queueing | ||
| 369 | # | ||
| 370 | # CONFIG_NET_SCHED is not set | ||
| 371 | |||
| 372 | # | ||
| 373 | # Network testing | ||
| 374 | # | ||
| 375 | # CONFIG_NET_PKTGEN is not set | ||
| 376 | # CONFIG_HAMRADIO is not set | ||
| 377 | # CONFIG_IRDA is not set | ||
| 378 | # CONFIG_BT is not set | ||
| 379 | # CONFIG_AF_RXRPC is not set | ||
| 380 | |||
| 381 | # | ||
| 382 | # Wireless | ||
| 383 | # | ||
| 384 | # CONFIG_CFG80211 is not set | ||
| 385 | # CONFIG_WIRELESS_EXT is not set | ||
| 386 | # CONFIG_MAC80211 is not set | ||
| 387 | # CONFIG_IEEE80211 is not set | ||
| 388 | # CONFIG_RFKILL is not set | ||
| 389 | # CONFIG_NET_9P is not set | ||
| 390 | |||
| 391 | # | ||
| 392 | # Device Drivers | ||
| 393 | # | ||
| 394 | |||
| 395 | # | ||
| 396 | # Generic Driver Options | ||
| 397 | # | ||
| 398 | CONFIG_STANDALONE=y | ||
| 399 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
| 400 | # CONFIG_FW_LOADER is not set | ||
| 401 | # CONFIG_DEBUG_DRIVER is not set | ||
| 402 | # CONFIG_DEBUG_DEVRES is not set | ||
| 403 | # CONFIG_SYS_HYPERVISOR is not set | ||
| 404 | # CONFIG_CONNECTOR is not set | ||
| 405 | CONFIG_MTD=y | ||
| 406 | # CONFIG_MTD_DEBUG is not set | ||
| 407 | CONFIG_MTD_CONCAT=y | ||
| 408 | CONFIG_MTD_PARTITIONS=y | ||
| 409 | # CONFIG_MTD_REDBOOT_PARTS is not set | ||
| 410 | CONFIG_MTD_CMDLINE_PARTS=y | ||
| 411 | # CONFIG_MTD_AFS_PARTS is not set | ||
| 412 | |||
| 413 | # | ||
| 414 | # User Modules And Translation Layers | ||
| 415 | # | ||
| 416 | CONFIG_MTD_CHAR=y | ||
| 417 | CONFIG_MTD_BLKDEVS=y | ||
| 418 | CONFIG_MTD_BLOCK=y | ||
| 419 | # CONFIG_FTL is not set | ||
| 420 | # CONFIG_NFTL is not set | ||
| 421 | # CONFIG_INFTL is not set | ||
| 422 | # CONFIG_RFD_FTL is not set | ||
| 423 | # CONFIG_SSFDC is not set | ||
| 424 | |||
| 425 | # | ||
| 426 | # RAM/ROM/Flash chip drivers | ||
| 427 | # | ||
| 428 | CONFIG_MTD_CFI=y | ||
| 429 | # CONFIG_MTD_JEDECPROBE is not set | ||
| 430 | CONFIG_MTD_GEN_PROBE=y | ||
| 431 | # CONFIG_MTD_CFI_ADV_OPTIONS is not set | ||
| 432 | CONFIG_MTD_MAP_BANK_WIDTH_1=y | ||
| 433 | CONFIG_MTD_MAP_BANK_WIDTH_2=y | ||
| 434 | CONFIG_MTD_MAP_BANK_WIDTH_4=y | ||
| 435 | # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set | ||
| 436 | # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set | ||
| 437 | # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set | ||
| 438 | CONFIG_MTD_CFI_I1=y | ||
| 439 | CONFIG_MTD_CFI_I2=y | ||
| 440 | # CONFIG_MTD_CFI_I4 is not set | ||
| 441 | # CONFIG_MTD_CFI_I8 is not set | ||
| 442 | CONFIG_MTD_CFI_INTELEXT=y | ||
| 443 | # CONFIG_MTD_CFI_AMDSTD is not set | ||
| 444 | # CONFIG_MTD_CFI_STAA is not set | ||
| 445 | CONFIG_MTD_CFI_UTIL=y | ||
| 446 | # CONFIG_MTD_RAM is not set | ||
| 447 | # CONFIG_MTD_ROM is not set | ||
| 448 | # CONFIG_MTD_ABSENT is not set | ||
| 449 | |||
| 450 | # | ||
| 451 | # Mapping drivers for chip access | ||
| 452 | # | ||
| 453 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | ||
| 454 | # CONFIG_MTD_PHYSMAP is not set | ||
| 455 | # CONFIG_MTD_ARM_INTEGRATOR is not set | ||
| 456 | CONFIG_MTD_OMAP_NOR=y | ||
| 457 | # CONFIG_MTD_PLATRAM is not set | ||
| 458 | |||
| 459 | # | ||
| 460 | # Self-contained MTD device drivers | ||
| 461 | # | ||
| 462 | # CONFIG_MTD_DATAFLASH is not set | ||
| 463 | # CONFIG_MTD_M25P80 is not set | ||
| 464 | # CONFIG_MTD_SLRAM is not set | ||
| 465 | # CONFIG_MTD_PHRAM is not set | ||
| 466 | # CONFIG_MTD_MTDRAM is not set | ||
| 467 | # CONFIG_MTD_BLOCK2MTD is not set | ||
| 468 | |||
| 469 | # | ||
| 470 | # Disk-On-Chip Device Drivers | ||
| 471 | # | ||
| 472 | # CONFIG_MTD_DOC2000 is not set | ||
| 473 | # CONFIG_MTD_DOC2001 is not set | ||
| 474 | # CONFIG_MTD_DOC2001PLUS is not set | ||
| 475 | # CONFIG_MTD_NAND is not set | ||
| 476 | CONFIG_MTD_ONENAND=y | ||
| 477 | CONFIG_MTD_ONENAND_VERIFY_WRITE=y | ||
| 478 | # CONFIG_MTD_ONENAND_GENERIC is not set | ||
| 479 | CONFIG_MTD_ONENAND_OMAP2=y | ||
| 480 | # CONFIG_MTD_ONENAND_OTP is not set | ||
| 481 | |||
| 482 | # | ||
| 483 | # UBI - Unsorted block images | ||
| 484 | # | ||
| 485 | # CONFIG_MTD_UBI is not set | ||
| 486 | # CONFIG_PARPORT is not set | ||
| 487 | CONFIG_BLK_DEV=y | ||
| 488 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
| 489 | CONFIG_BLK_DEV_LOOP=y | ||
| 490 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | ||
| 491 | # CONFIG_BLK_DEV_NBD is not set | ||
| 492 | # CONFIG_BLK_DEV_UB is not set | ||
| 493 | CONFIG_BLK_DEV_RAM=y | ||
| 494 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
| 495 | CONFIG_BLK_DEV_RAM_SIZE=16384 | ||
| 496 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | ||
| 497 | # CONFIG_CDROM_PKTCDVD is not set | ||
| 498 | # CONFIG_ATA_OVER_ETH is not set | ||
| 499 | |||
| 500 | # | ||
| 501 | # SCSI device support | ||
| 502 | # | ||
| 503 | # CONFIG_RAID_ATTRS is not set | ||
| 504 | CONFIG_SCSI=m | ||
| 505 | CONFIG_SCSI_DMA=y | ||
| 506 | # CONFIG_SCSI_TGT is not set | ||
| 507 | # CONFIG_SCSI_NETLINK is not set | ||
| 508 | CONFIG_SCSI_PROC_FS=y | ||
| 509 | |||
| 510 | # | ||
| 511 | # SCSI support type (disk, tape, CD-ROM) | ||
| 512 | # | ||
| 513 | CONFIG_BLK_DEV_SD=m | ||
| 514 | # CONFIG_CHR_DEV_ST is not set | ||
| 515 | # CONFIG_CHR_DEV_OSST is not set | ||
| 516 | # CONFIG_BLK_DEV_SR is not set | ||
| 517 | CONFIG_CHR_DEV_SG=m | ||
| 518 | # CONFIG_CHR_DEV_SCH is not set | ||
| 519 | |||
| 520 | # | ||
| 521 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
| 522 | # | ||
| 523 | # CONFIG_SCSI_MULTI_LUN is not set | ||
| 524 | # CONFIG_SCSI_CONSTANTS is not set | ||
| 525 | # CONFIG_SCSI_LOGGING is not set | ||
| 526 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
| 527 | CONFIG_SCSI_WAIT_SCAN=m | ||
| 528 | |||
| 529 | # | ||
| 530 | # SCSI Transports | ||
| 531 | # | ||
| 532 | # CONFIG_SCSI_SPI_ATTRS is not set | ||
| 533 | # CONFIG_SCSI_FC_ATTRS is not set | ||
| 534 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
| 535 | # CONFIG_SCSI_SAS_LIBSAS is not set | ||
| 536 | CONFIG_SCSI_LOWLEVEL=y | ||
| 537 | # CONFIG_ISCSI_TCP is not set | ||
| 538 | # CONFIG_SCSI_DEBUG is not set | ||
| 539 | # CONFIG_ATA is not set | ||
| 540 | # CONFIG_MD is not set | ||
| 541 | CONFIG_NETDEVICES=y | ||
| 542 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 543 | # CONFIG_DUMMY is not set | ||
| 544 | # CONFIG_BONDING is not set | ||
| 545 | # CONFIG_MACVLAN is not set | ||
| 546 | # CONFIG_EQUALIZER is not set | ||
| 547 | # CONFIG_TUN is not set | ||
| 548 | # CONFIG_PHYLIB is not set | ||
| 549 | CONFIG_NET_ETHERNET=y | ||
| 550 | CONFIG_MII=y | ||
| 551 | # CONFIG_AX88796 is not set | ||
| 552 | CONFIG_SMC91X=y | ||
| 553 | # CONFIG_DM9000 is not set | ||
| 554 | CONFIG_NETDEV_1000=y | ||
| 555 | CONFIG_NETDEV_10000=y | ||
| 556 | |||
| 557 | # | ||
| 558 | # Wireless LAN | ||
| 559 | # | ||
| 560 | # CONFIG_WLAN_PRE80211 is not set | ||
| 561 | # CONFIG_WLAN_80211 is not set | ||
| 562 | |||
| 563 | # | ||
| 564 | # USB Network Adapters | ||
| 565 | # | ||
| 566 | # CONFIG_USB_CATC is not set | ||
| 567 | # CONFIG_USB_KAWETH is not set | ||
| 568 | # CONFIG_USB_PEGASUS is not set | ||
| 569 | # CONFIG_USB_RTL8150 is not set | ||
| 570 | # CONFIG_USB_USBNET_MII is not set | ||
| 571 | # CONFIG_USB_USBNET is not set | ||
| 572 | # CONFIG_WAN is not set | ||
| 573 | # CONFIG_PPP is not set | ||
| 574 | # CONFIG_SLIP is not set | ||
| 575 | # CONFIG_SHAPER is not set | ||
| 576 | # CONFIG_NETCONSOLE is not set | ||
| 577 | # CONFIG_NETPOLL is not set | ||
| 578 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
| 579 | # CONFIG_ISDN is not set | ||
| 580 | |||
| 581 | # | ||
| 582 | # Input device support | ||
| 583 | # | ||
| 584 | CONFIG_INPUT=y | ||
| 585 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
| 586 | # CONFIG_INPUT_POLLDEV is not set | ||
| 587 | |||
| 588 | # | ||
| 589 | # Userland interfaces | ||
| 590 | # | ||
| 591 | # CONFIG_INPUT_MOUSEDEV is not set | ||
| 592 | # CONFIG_INPUT_JOYDEV is not set | ||
| 593 | # CONFIG_INPUT_TSDEV is not set | ||
| 594 | CONFIG_INPUT_EVDEV=y | ||
| 595 | # CONFIG_INPUT_EVBUG is not set | ||
| 596 | |||
| 597 | # | ||
| 598 | # Input Device Drivers | ||
| 599 | # | ||
| 600 | CONFIG_INPUT_KEYBOARD=y | ||
| 601 | # CONFIG_KEYBOARD_ATKBD is not set | ||
| 602 | # CONFIG_KEYBOARD_SUNKBD is not set | ||
| 603 | # CONFIG_KEYBOARD_LKKBD is not set | ||
| 604 | # CONFIG_KEYBOARD_XTKBD is not set | ||
| 605 | # CONFIG_KEYBOARD_NEWTON is not set | ||
| 606 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
| 607 | # CONFIG_KEYBOARD_OMAP is not set | ||
| 608 | CONFIG_KEYBOARD_TWL4030=y | ||
| 609 | # CONFIG_KEYBOARD_GPIO is not set | ||
| 610 | # CONFIG_INPUT_MOUSE is not set | ||
| 611 | # CONFIG_INPUT_JOYSTICK is not set | ||
| 612 | # CONFIG_INPUT_TABLET is not set | ||
| 613 | CONFIG_INPUT_TOUCHSCREEN=y | ||
| 614 | CONFIG_TOUCHSCREEN_ADS7846=y | ||
| 615 | # CONFIG_TOUCHSCREEN_FUJITSU is not set | ||
| 616 | # CONFIG_TOUCHSCREEN_GUNZE is not set | ||
| 617 | # CONFIG_TOUCHSCREEN_ELO is not set | ||
| 618 | # CONFIG_TOUCHSCREEN_MTOUCH is not set | ||
| 619 | # CONFIG_TOUCHSCREEN_MK712 is not set | ||
| 620 | # CONFIG_TOUCHSCREEN_PENMOUNT is not set | ||
| 621 | # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set | ||
| 622 | # CONFIG_TOUCHSCREEN_TOUCHWIN is not set | ||
| 623 | # CONFIG_TOUCHSCREEN_UCB1400 is not set | ||
| 624 | # CONFIG_TOUCHSCREEN_TSC2102 is not set | ||
| 625 | # CONFIG_TOUCHSCREEN_TSC210X is not set | ||
| 626 | # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set | ||
| 627 | # CONFIG_INPUT_MISC is not set | ||
| 628 | |||
| 629 | # | ||
| 630 | # Hardware I/O ports | ||
| 631 | # | ||
| 632 | # CONFIG_SERIO is not set | ||
| 633 | # CONFIG_GAMEPORT is not set | ||
| 634 | |||
| 635 | # | ||
| 636 | # Character devices | ||
| 637 | # | ||
| 638 | CONFIG_VT=y | ||
| 639 | CONFIG_VT_CONSOLE=y | ||
| 640 | CONFIG_HW_CONSOLE=y | ||
| 641 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
| 642 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
| 643 | |||
| 644 | # | ||
| 645 | # Serial drivers | ||
| 646 | # | ||
| 647 | CONFIG_SERIAL_8250=y | ||
| 648 | CONFIG_SERIAL_8250_CONSOLE=y | ||
| 649 | CONFIG_SERIAL_8250_NR_UARTS=32 | ||
| 650 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | ||
| 651 | CONFIG_SERIAL_8250_EXTENDED=y | ||
| 652 | CONFIG_SERIAL_8250_MANY_PORTS=y | ||
| 653 | CONFIG_SERIAL_8250_SHARE_IRQ=y | ||
| 654 | CONFIG_SERIAL_8250_DETECT_IRQ=y | ||
| 655 | CONFIG_SERIAL_8250_RSA=y | ||
| 656 | |||
| 657 | # | ||
| 658 | # Non-8250 serial port support | ||
| 659 | # | ||
| 660 | CONFIG_SERIAL_CORE=y | ||
| 661 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
| 662 | CONFIG_UNIX98_PTYS=y | ||
| 663 | # CONFIG_LEGACY_PTYS is not set | ||
| 664 | # CONFIG_IPMI_HANDLER is not set | ||
| 665 | CONFIG_WATCHDOG=y | ||
| 666 | CONFIG_WATCHDOG_NOWAYOUT=y | ||
| 667 | |||
| 668 | # | ||
| 669 | # Watchdog Device Drivers | ||
| 670 | # | ||
| 671 | # CONFIG_SOFT_WATCHDOG is not set | ||
| 672 | CONFIG_OMAP_WATCHDOG=y | ||
| 673 | |||
| 674 | # | ||
| 675 | # USB-based Watchdog Cards | ||
| 676 | # | ||
| 677 | # CONFIG_USBPCWATCHDOG is not set | ||
| 678 | CONFIG_HW_RANDOM=y | ||
| 679 | CONFIG_HW_RANDOM_OMAP=y | ||
| 680 | # CONFIG_NVRAM is not set | ||
| 681 | # CONFIG_R3964 is not set | ||
| 682 | # CONFIG_RAW_DRIVER is not set | ||
| 683 | # CONFIG_TCG_TPM is not set | ||
| 684 | CONFIG_I2C=y | ||
| 685 | CONFIG_I2C_BOARDINFO=y | ||
| 686 | CONFIG_I2C_CHARDEV=y | ||
| 687 | |||
| 688 | # | ||
| 689 | # I2C Algorithms | ||
| 690 | # | ||
| 691 | # CONFIG_I2C_ALGOBIT is not set | ||
| 692 | # CONFIG_I2C_ALGOPCF is not set | ||
| 693 | # CONFIG_I2C_ALGOPCA is not set | ||
| 694 | |||
| 695 | # | ||
| 696 | # I2C Hardware Bus support | ||
| 697 | # | ||
| 698 | # CONFIG_I2C_GPIO is not set | ||
| 699 | # CONFIG_I2C_OCORES is not set | ||
| 700 | CONFIG_I2C_OMAP=y | ||
| 701 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 702 | # CONFIG_I2C_SIMTEC is not set | ||
| 703 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 704 | # CONFIG_I2C_STUB is not set | ||
| 705 | # CONFIG_I2C_TINY_USB is not set | ||
| 706 | |||
| 707 | # | ||
| 708 | # Miscellaneous I2C Chip support | ||
| 709 | # | ||
| 710 | # CONFIG_SENSORS_DS1337 is not set | ||
| 711 | # CONFIG_SENSORS_DS1374 is not set | ||
| 712 | # CONFIG_DS1682 is not set | ||
| 713 | # CONFIG_SENSORS_EEPROM is not set | ||
| 714 | # CONFIG_SENSORS_PCF8574 is not set | ||
| 715 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 716 | # CONFIG_SENSORS_PCF8591 is not set | ||
| 717 | # CONFIG_TPS65010 is not set | ||
| 718 | # CONFIG_SENSORS_TLV320AIC23 is not set | ||
| 719 | # CONFIG_GPIOEXPANDER_OMAP is not set | ||
| 720 | CONFIG_TWL4030_CORE=y | ||
| 721 | CONFIG_TWL4030_GPIO=y | ||
| 722 | # CONFIG_SENSORS_MAX6875 is not set | ||
| 723 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 724 | # CONFIG_MENELAUS is not set | ||
| 725 | # CONFIG_I2C_DEBUG_CORE is not set | ||
| 726 | # CONFIG_I2C_DEBUG_ALGO is not set | ||
| 727 | # CONFIG_I2C_DEBUG_BUS is not set | ||
| 728 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 729 | |||
| 730 | # | ||
| 731 | # SPI support | ||
| 732 | # | ||
| 733 | CONFIG_SPI=y | ||
| 734 | # CONFIG_SPI_DEBUG is not set | ||
| 735 | CONFIG_SPI_MASTER=y | ||
| 736 | |||
| 737 | # | ||
| 738 | # SPI Master Controller Drivers | ||
| 739 | # | ||
| 740 | # CONFIG_SPI_BITBANG is not set | ||
| 741 | # CONFIG_SPI_OMAP24XX is not set | ||
| 742 | |||
| 743 | # | ||
| 744 | # SPI Protocol Masters | ||
| 745 | # | ||
| 746 | # CONFIG_SPI_AT25 is not set | ||
| 747 | # CONFIG_SPI_TSC2101 is not set | ||
| 748 | # CONFIG_SPI_TSC2102 is not set | ||
| 749 | # CONFIG_SPI_TSC210X is not set | ||
| 750 | # CONFIG_SPI_TSC2301 is not set | ||
| 751 | # CONFIG_SPI_SPIDEV is not set | ||
| 752 | # CONFIG_SPI_TLE62X0 is not set | ||
| 753 | # CONFIG_W1 is not set | ||
| 754 | # CONFIG_HWMON is not set | ||
| 755 | CONFIG_MISC_DEVICES=y | ||
| 756 | # CONFIG_EEPROM_93CX6 is not set | ||
| 757 | |||
| 758 | # | ||
| 759 | # Multifunction device drivers | ||
| 760 | # | ||
| 761 | # CONFIG_MFD_SM501 is not set | ||
| 762 | # CONFIG_NEW_LEDS is not set | ||
| 763 | |||
| 764 | # | ||
| 765 | # Multimedia devices | ||
| 766 | # | ||
| 767 | # CONFIG_VIDEO_DEV is not set | ||
| 768 | # CONFIG_DVB_CORE is not set | ||
| 769 | CONFIG_DAB=y | ||
| 770 | # CONFIG_USB_DABUSB is not set | ||
| 771 | |||
| 772 | # | ||
| 773 | # Graphics support | ||
| 774 | # | ||
| 775 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 776 | |||
| 777 | # | ||
| 778 | # Display device support | ||
| 779 | # | ||
| 780 | # CONFIG_DISPLAY_SUPPORT is not set | ||
| 781 | # CONFIG_VGASTATE is not set | ||
| 782 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
| 783 | CONFIG_FB=y | ||
| 784 | CONFIG_FIRMWARE_EDID=y | ||
| 785 | # CONFIG_FB_DDC is not set | ||
| 786 | # CONFIG_FB_CFB_FILLRECT is not set | ||
| 787 | # CONFIG_FB_CFB_COPYAREA is not set | ||
| 788 | # CONFIG_FB_CFB_IMAGEBLIT is not set | ||
| 789 | # CONFIG_FB_SYS_FILLRECT is not set | ||
| 790 | # CONFIG_FB_SYS_COPYAREA is not set | ||
| 791 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
| 792 | # CONFIG_FB_SYS_FOPS is not set | ||
| 793 | CONFIG_FB_DEFERRED_IO=y | ||
| 794 | # CONFIG_FB_SVGALIB is not set | ||
| 795 | # CONFIG_FB_MACMODES is not set | ||
| 796 | # CONFIG_FB_BACKLIGHT is not set | ||
| 797 | # CONFIG_FB_MODE_HELPERS is not set | ||
| 798 | # CONFIG_FB_TILEBLITTING is not set | ||
| 799 | |||
| 800 | # | ||
| 801 | # Frame buffer hardware drivers | ||
| 802 | # | ||
| 803 | # CONFIG_FB_S1D13XXX is not set | ||
| 804 | CONFIG_FB_OMAP=y | ||
| 805 | # CONFIG_FB_OMAP_LCDC_EXTERNAL is not set | ||
| 806 | # CONFIG_FB_OMAP_BOOTLOADER_INIT is not set | ||
| 807 | CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2 | ||
| 808 | # CONFIG_FB_VIRTUAL is not set | ||
| 809 | |||
| 810 | # | ||
| 811 | # Console display driver support | ||
| 812 | # | ||
| 813 | # CONFIG_VGA_CONSOLE is not set | ||
| 814 | CONFIG_DUMMY_CONSOLE=y | ||
| 815 | CONFIG_FRAMEBUFFER_CONSOLE=y | ||
| 816 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set | ||
| 817 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | ||
| 818 | # CONFIG_FONTS is not set | ||
| 819 | CONFIG_FONT_8x8=y | ||
| 820 | CONFIG_FONT_8x16=y | ||
| 821 | CONFIG_LOGO=y | ||
| 822 | # CONFIG_LOGO_LINUX_MONO is not set | ||
| 823 | # CONFIG_LOGO_LINUX_VGA16 is not set | ||
| 824 | CONFIG_LOGO_LINUX_CLUT224=y | ||
| 825 | |||
| 826 | # | ||
| 827 | # Sound | ||
| 828 | # | ||
| 829 | # CONFIG_SOUND is not set | ||
| 830 | CONFIG_HID_SUPPORT=y | ||
| 831 | CONFIG_HID=y | ||
| 832 | # CONFIG_HID_DEBUG is not set | ||
| 833 | |||
| 834 | # | ||
| 835 | # USB Input Devices | ||
| 836 | # | ||
| 837 | CONFIG_USB_HID=m | ||
| 838 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | ||
| 839 | # CONFIG_HID_FF is not set | ||
| 840 | # CONFIG_USB_HIDDEV is not set | ||
| 841 | |||
| 842 | # | ||
| 843 | # USB HID Boot Protocol drivers | ||
| 844 | # | ||
| 845 | # CONFIG_USB_KBD is not set | ||
| 846 | # CONFIG_USB_MOUSE is not set | ||
| 847 | CONFIG_USB_SUPPORT=y | ||
| 848 | CONFIG_USB_ARCH_HAS_HCD=y | ||
| 849 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
| 850 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
| 851 | CONFIG_USB=m | ||
| 852 | # CONFIG_USB_DEBUG is not set | ||
| 853 | |||
| 854 | # | ||
| 855 | # Miscellaneous USB options | ||
| 856 | # | ||
| 857 | # CONFIG_USB_DEVICEFS is not set | ||
| 858 | # CONFIG_USB_DEVICE_CLASS is not set | ||
| 859 | # CONFIG_USB_DYNAMIC_MINORS is not set | ||
| 860 | CONFIG_USB_SUSPEND=y | ||
| 861 | # CONFIG_USB_PERSIST is not set | ||
| 862 | CONFIG_USB_OTG=y | ||
| 863 | CONFIG_USB_OTG_WHITELIST=y | ||
| 864 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 865 | |||
| 866 | # | ||
| 867 | # USB Host Controller Drivers | ||
| 868 | # | ||
| 869 | # CONFIG_USB_ISP116X_HCD is not set | ||
| 870 | # CONFIG_USB_OHCI_HCD is not set | ||
| 871 | # CONFIG_USB_SL811_HCD is not set | ||
| 872 | # CONFIG_USB_R8A66597_HCD is not set | ||
| 873 | CONFIG_USB_MUSB_HDRC=m | ||
| 874 | CONFIG_USB_MUSB_SOC=y | ||
| 875 | |||
| 876 | # | ||
| 877 | # OMAP 243x high speed USB support | ||
| 878 | # | ||
| 879 | # CONFIG_USB_MUSB_HOST is not set | ||
| 880 | # CONFIG_USB_MUSB_PERIPHERAL is not set | ||
| 881 | CONFIG_USB_MUSB_OTG=y | ||
| 882 | CONFIG_USB_GADGET_MUSB_HDRC=y | ||
| 883 | CONFIG_USB_MUSB_HDRC_HCD=y | ||
| 884 | # CONFIG_MUSB_PIO_ONLY is not set | ||
| 885 | CONFIG_USB_INVENTRA_DMA=y | ||
| 886 | # CONFIG_USB_TI_CPPI_DMA is not set | ||
| 887 | CONFIG_USB_MUSB_LOGLEVEL=0 | ||
| 888 | |||
| 889 | # | ||
| 890 | # USB Device Class drivers | ||
| 891 | # | ||
| 892 | # CONFIG_USB_ACM is not set | ||
| 893 | # CONFIG_USB_PRINTER is not set | ||
| 894 | |||
| 895 | # | ||
| 896 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
| 897 | # | ||
| 898 | |||
| 899 | # | ||
| 900 | # may also be needed; see USB_STORAGE Help for more information | ||
| 901 | # | ||
| 902 | CONFIG_USB_STORAGE=m | ||
| 903 | # CONFIG_USB_STORAGE_DEBUG is not set | ||
| 904 | # CONFIG_USB_STORAGE_DATAFAB is not set | ||
| 905 | # CONFIG_USB_STORAGE_FREECOM is not set | ||
| 906 | # CONFIG_USB_STORAGE_DPCM is not set | ||
| 907 | # CONFIG_USB_STORAGE_USBAT is not set | ||
| 908 | # CONFIG_USB_STORAGE_SDDR09 is not set | ||
| 909 | # CONFIG_USB_STORAGE_SDDR55 is not set | ||
| 910 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | ||
| 911 | # CONFIG_USB_STORAGE_ALAUDA is not set | ||
| 912 | # CONFIG_USB_STORAGE_KARMA is not set | ||
| 913 | # CONFIG_USB_LIBUSUAL is not set | ||
| 914 | |||
| 915 | # | ||
| 916 | # USB Imaging devices | ||
| 917 | # | ||
| 918 | # CONFIG_USB_MDC800 is not set | ||
| 919 | # CONFIG_USB_MICROTEK is not set | ||
| 920 | CONFIG_USB_MON=y | ||
| 921 | |||
| 922 | # | ||
| 923 | # USB port drivers | ||
| 924 | # | ||
| 925 | |||
| 926 | # | ||
| 927 | # USB Serial Converter support | ||
| 928 | # | ||
| 929 | # CONFIG_USB_SERIAL is not set | ||
| 930 | |||
| 931 | # | ||
| 932 | # USB Miscellaneous drivers | ||
| 933 | # | ||
| 934 | # CONFIG_USB_EMI62 is not set | ||
| 935 | # CONFIG_USB_EMI26 is not set | ||
| 936 | # CONFIG_USB_ADUTUX is not set | ||
| 937 | # CONFIG_USB_AUERSWALD is not set | ||
| 938 | # CONFIG_USB_RIO500 is not set | ||
| 939 | # CONFIG_USB_LEGOTOWER is not set | ||
| 940 | # CONFIG_USB_LCD is not set | ||
| 941 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 942 | # CONFIG_USB_LED is not set | ||
| 943 | # CONFIG_USB_CYPRESS_CY7C63 is not set | ||
| 944 | # CONFIG_USB_CYTHERM is not set | ||
| 945 | # CONFIG_USB_PHIDGET is not set | ||
| 946 | # CONFIG_USB_IDMOUSE is not set | ||
| 947 | # CONFIG_USB_FTDI_ELAN is not set | ||
| 948 | # CONFIG_USB_APPLEDISPLAY is not set | ||
| 949 | # CONFIG_USB_LD is not set | ||
| 950 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
| 951 | # CONFIG_USB_IOWARRIOR is not set | ||
| 952 | |||
| 953 | # | ||
| 954 | # USB DSL modem support | ||
| 955 | # | ||
| 956 | |||
| 957 | # | ||
| 958 | # USB Gadget Support | ||
| 959 | # | ||
| 960 | CONFIG_USB_GADGET=m | ||
| 961 | # CONFIG_USB_GADGET_DEBUG is not set | ||
| 962 | CONFIG_USB_GADGET_DEBUG_FILES=y | ||
| 963 | CONFIG_USB_GADGET_SELECTED=y | ||
| 964 | # CONFIG_USB_GADGET_AMD5536UDC is not set | ||
| 965 | # CONFIG_USB_GADGET_FSL_USB2 is not set | ||
| 966 | # CONFIG_USB_GADGET_NET2280 is not set | ||
| 967 | # CONFIG_USB_GADGET_PXA2XX is not set | ||
| 968 | # CONFIG_USB_GADGET_M66592 is not set | ||
| 969 | # CONFIG_USB_GADGET_GOKU is not set | ||
| 970 | # CONFIG_USB_GADGET_LH7A40X is not set | ||
| 971 | # CONFIG_USB_GADGET_OMAP is not set | ||
| 972 | # CONFIG_USB_GADGET_S3C2410 is not set | ||
| 973 | # CONFIG_USB_GADGET_AT91 is not set | ||
| 974 | # CONFIG_USB_GADGET_DUMMY_HCD is not set | ||
| 975 | CONFIG_USB_GADGET_DUALSPEED=y | ||
| 976 | CONFIG_USB_ZERO=m | ||
| 977 | # CONFIG_USB_ZERO_HNPTEST is not set | ||
| 978 | CONFIG_USB_ETH=m | ||
| 979 | CONFIG_USB_ETH_RNDIS=y | ||
| 980 | CONFIG_USB_GADGETFS=m | ||
| 981 | CONFIG_USB_FILE_STORAGE=m | ||
| 982 | # CONFIG_USB_FILE_STORAGE_TEST is not set | ||
| 983 | CONFIG_USB_G_SERIAL=m | ||
| 984 | # CONFIG_USB_MIDI_GADGET is not set | ||
| 985 | CONFIG_MMC=y | ||
| 986 | # CONFIG_MMC_DEBUG is not set | ||
| 987 | # CONFIG_MMC_UNSAFE_RESUME is not set | ||
| 988 | |||
| 989 | # | ||
| 990 | # MMC/SD Card Drivers | ||
| 991 | # | ||
| 992 | CONFIG_MMC_BLOCK=y | ||
| 993 | CONFIG_MMC_BLOCK_BOUNCE=y | ||
| 994 | |||
| 995 | # | ||
| 996 | # MMC/SD Host Controller Drivers | ||
| 997 | # | ||
| 998 | CONFIG_MMC_OMAP_HS=y | ||
| 999 | CONFIG_RTC_LIB=y | ||
| 1000 | # CONFIG_RTC_CLASS is not set | ||
| 1001 | |||
| 1002 | # | ||
| 1003 | # DMA Engine support | ||
| 1004 | # | ||
| 1005 | # CONFIG_DMA_ENGINE is not set | ||
| 1006 | |||
| 1007 | # | ||
| 1008 | # DMA Clients | ||
| 1009 | # | ||
| 1010 | |||
| 1011 | # | ||
| 1012 | # DMA Devices | ||
| 1013 | # | ||
| 1014 | |||
| 1015 | # | ||
| 1016 | # CBUS support | ||
| 1017 | # | ||
| 1018 | # CONFIG_CBUS is not set | ||
| 1019 | |||
| 1020 | # | ||
| 1021 | # File systems | ||
| 1022 | # | ||
| 1023 | CONFIG_EXT2_FS=y | ||
| 1024 | # CONFIG_EXT2_FS_XATTR is not set | ||
| 1025 | # CONFIG_EXT2_FS_XIP is not set | ||
| 1026 | CONFIG_EXT3_FS=y | ||
| 1027 | # CONFIG_EXT3_FS_XATTR is not set | ||
| 1028 | # CONFIG_EXT4DEV_FS is not set | ||
| 1029 | CONFIG_JBD=y | ||
| 1030 | # CONFIG_JBD_DEBUG is not set | ||
| 1031 | # CONFIG_REISERFS_FS is not set | ||
| 1032 | # CONFIG_JFS_FS is not set | ||
| 1033 | # CONFIG_FS_POSIX_ACL is not set | ||
| 1034 | # CONFIG_XFS_FS is not set | ||
| 1035 | # CONFIG_GFS2_FS is not set | ||
| 1036 | # CONFIG_OCFS2_FS is not set | ||
| 1037 | # CONFIG_MINIX_FS is not set | ||
| 1038 | # CONFIG_ROMFS_FS is not set | ||
| 1039 | CONFIG_INOTIFY=y | ||
| 1040 | CONFIG_INOTIFY_USER=y | ||
| 1041 | CONFIG_QUOTA=y | ||
| 1042 | # CONFIG_QFMT_V1 is not set | ||
| 1043 | CONFIG_QFMT_V2=y | ||
| 1044 | CONFIG_QUOTACTL=y | ||
| 1045 | CONFIG_DNOTIFY=y | ||
| 1046 | # CONFIG_AUTOFS_FS is not set | ||
| 1047 | # CONFIG_AUTOFS4_FS is not set | ||
| 1048 | # CONFIG_FUSE_FS is not set | ||
| 1049 | |||
| 1050 | # | ||
| 1051 | # CD-ROM/DVD Filesystems | ||
| 1052 | # | ||
| 1053 | # CONFIG_ISO9660_FS is not set | ||
| 1054 | # CONFIG_UDF_FS is not set | ||
| 1055 | |||
| 1056 | # | ||
| 1057 | # DOS/FAT/NT Filesystems | ||
| 1058 | # | ||
| 1059 | CONFIG_FAT_FS=y | ||
| 1060 | CONFIG_MSDOS_FS=y | ||
| 1061 | CONFIG_VFAT_FS=y | ||
| 1062 | CONFIG_FAT_DEFAULT_CODEPAGE=437 | ||
| 1063 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | ||
| 1064 | # CONFIG_NTFS_FS is not set | ||
| 1065 | |||
| 1066 | # | ||
| 1067 | # Pseudo filesystems | ||
| 1068 | # | ||
| 1069 | CONFIG_PROC_FS=y | ||
| 1070 | CONFIG_PROC_SYSCTL=y | ||
| 1071 | CONFIG_SYSFS=y | ||
| 1072 | CONFIG_TMPFS=y | ||
| 1073 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
| 1074 | # CONFIG_HUGETLB_PAGE is not set | ||
| 1075 | CONFIG_RAMFS=y | ||
| 1076 | # CONFIG_CONFIGFS_FS is not set | ||
| 1077 | |||
| 1078 | # | ||
| 1079 | # Miscellaneous filesystems | ||
| 1080 | # | ||
| 1081 | # CONFIG_ADFS_FS is not set | ||
| 1082 | # CONFIG_AFFS_FS is not set | ||
| 1083 | # CONFIG_HFS_FS is not set | ||
| 1084 | # CONFIG_HFSPLUS_FS is not set | ||
| 1085 | # CONFIG_BEFS_FS is not set | ||
| 1086 | # CONFIG_BFS_FS is not set | ||
| 1087 | # CONFIG_EFS_FS is not set | ||
| 1088 | CONFIG_JFFS2_FS=y | ||
| 1089 | CONFIG_JFFS2_FS_DEBUG=0 | ||
| 1090 | CONFIG_JFFS2_FS_WRITEBUFFER=y | ||
| 1091 | # CONFIG_JFFS2_SUMMARY is not set | ||
| 1092 | # CONFIG_JFFS2_FS_XATTR is not set | ||
| 1093 | CONFIG_JFFS2_COMPRESSION_OPTIONS=y | ||
| 1094 | CONFIG_JFFS2_ZLIB=y | ||
| 1095 | CONFIG_JFFS2_RTIME=y | ||
| 1096 | # CONFIG_JFFS2_RUBIN is not set | ||
| 1097 | # CONFIG_JFFS2_CMODE_NONE is not set | ||
| 1098 | CONFIG_JFFS2_CMODE_PRIORITY=y | ||
| 1099 | # CONFIG_JFFS2_CMODE_SIZE is not set | ||
| 1100 | # CONFIG_CRAMFS is not set | ||
| 1101 | # CONFIG_VXFS_FS is not set | ||
| 1102 | # CONFIG_HPFS_FS is not set | ||
| 1103 | # CONFIG_QNX4FS_FS is not set | ||
| 1104 | # CONFIG_SYSV_FS is not set | ||
| 1105 | # CONFIG_UFS_FS is not set | ||
| 1106 | |||
| 1107 | # | ||
| 1108 | # Network File Systems | ||
| 1109 | # | ||
| 1110 | CONFIG_NFS_FS=y | ||
| 1111 | CONFIG_NFS_V3=y | ||
| 1112 | # CONFIG_NFS_V3_ACL is not set | ||
| 1113 | # CONFIG_NFS_V4 is not set | ||
| 1114 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1115 | # CONFIG_NFSD is not set | ||
| 1116 | CONFIG_ROOT_NFS=y | ||
| 1117 | CONFIG_LOCKD=y | ||
| 1118 | CONFIG_LOCKD_V4=y | ||
| 1119 | CONFIG_NFS_COMMON=y | ||
| 1120 | CONFIG_SUNRPC=y | ||
| 1121 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 1122 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
| 1123 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
| 1124 | # CONFIG_SMB_FS is not set | ||
| 1125 | # CONFIG_CIFS is not set | ||
| 1126 | # CONFIG_NCP_FS is not set | ||
| 1127 | # CONFIG_CODA_FS is not set | ||
| 1128 | # CONFIG_AFS_FS is not set | ||
| 1129 | |||
| 1130 | # | ||
| 1131 | # Partition Types | ||
| 1132 | # | ||
| 1133 | CONFIG_PARTITION_ADVANCED=y | ||
| 1134 | # CONFIG_ACORN_PARTITION is not set | ||
| 1135 | # CONFIG_OSF_PARTITION is not set | ||
| 1136 | # CONFIG_AMIGA_PARTITION is not set | ||
| 1137 | # CONFIG_ATARI_PARTITION is not set | ||
| 1138 | # CONFIG_MAC_PARTITION is not set | ||
| 1139 | CONFIG_MSDOS_PARTITION=y | ||
| 1140 | # CONFIG_BSD_DISKLABEL is not set | ||
| 1141 | # CONFIG_MINIX_SUBPARTITION is not set | ||
| 1142 | # CONFIG_SOLARIS_X86_PARTITION is not set | ||
| 1143 | # CONFIG_UNIXWARE_DISKLABEL is not set | ||
| 1144 | # CONFIG_LDM_PARTITION is not set | ||
| 1145 | # CONFIG_SGI_PARTITION is not set | ||
| 1146 | # CONFIG_ULTRIX_PARTITION is not set | ||
| 1147 | # CONFIG_SUN_PARTITION is not set | ||
| 1148 | # CONFIG_KARMA_PARTITION is not set | ||
| 1149 | # CONFIG_EFI_PARTITION is not set | ||
| 1150 | # CONFIG_SYSV68_PARTITION is not set | ||
| 1151 | |||
| 1152 | # | ||
| 1153 | # Native Language Support | ||
| 1154 | # | ||
| 1155 | CONFIG_NLS=y | ||
| 1156 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
| 1157 | CONFIG_NLS_CODEPAGE_437=y | ||
| 1158 | # CONFIG_NLS_CODEPAGE_737 is not set | ||
| 1159 | # CONFIG_NLS_CODEPAGE_775 is not set | ||
| 1160 | # CONFIG_NLS_CODEPAGE_850 is not set | ||
| 1161 | # CONFIG_NLS_CODEPAGE_852 is not set | ||
| 1162 | # CONFIG_NLS_CODEPAGE_855 is not set | ||
| 1163 | # CONFIG_NLS_CODEPAGE_857 is not set | ||
| 1164 | # CONFIG_NLS_CODEPAGE_860 is not set | ||
| 1165 | # CONFIG_NLS_CODEPAGE_861 is not set | ||
| 1166 | # CONFIG_NLS_CODEPAGE_862 is not set | ||
| 1167 | # CONFIG_NLS_CODEPAGE_863 is not set | ||
| 1168 | # CONFIG_NLS_CODEPAGE_864 is not set | ||
| 1169 | # CONFIG_NLS_CODEPAGE_865 is not set | ||
| 1170 | # CONFIG_NLS_CODEPAGE_866 is not set | ||
| 1171 | # CONFIG_NLS_CODEPAGE_869 is not set | ||
| 1172 | # CONFIG_NLS_CODEPAGE_936 is not set | ||
| 1173 | # CONFIG_NLS_CODEPAGE_950 is not set | ||
| 1174 | # CONFIG_NLS_CODEPAGE_932 is not set | ||
| 1175 | # CONFIG_NLS_CODEPAGE_949 is not set | ||
| 1176 | # CONFIG_NLS_CODEPAGE_874 is not set | ||
| 1177 | # CONFIG_NLS_ISO8859_8 is not set | ||
| 1178 | # CONFIG_NLS_CODEPAGE_1250 is not set | ||
| 1179 | # CONFIG_NLS_CODEPAGE_1251 is not set | ||
| 1180 | # CONFIG_NLS_ASCII is not set | ||
| 1181 | # CONFIG_NLS_ISO8859_1 is not set | ||
| 1182 | # CONFIG_NLS_ISO8859_2 is not set | ||
| 1183 | # CONFIG_NLS_ISO8859_3 is not set | ||
| 1184 | # CONFIG_NLS_ISO8859_4 is not set | ||
| 1185 | # CONFIG_NLS_ISO8859_5 is not set | ||
| 1186 | # CONFIG_NLS_ISO8859_6 is not set | ||
| 1187 | # CONFIG_NLS_ISO8859_7 is not set | ||
| 1188 | # CONFIG_NLS_ISO8859_9 is not set | ||
| 1189 | # CONFIG_NLS_ISO8859_13 is not set | ||
| 1190 | # CONFIG_NLS_ISO8859_14 is not set | ||
| 1191 | # CONFIG_NLS_ISO8859_15 is not set | ||
| 1192 | # CONFIG_NLS_KOI8_R is not set | ||
| 1193 | # CONFIG_NLS_KOI8_U is not set | ||
| 1194 | # CONFIG_NLS_UTF8 is not set | ||
| 1195 | |||
| 1196 | # | ||
| 1197 | # Distributed Lock Manager | ||
| 1198 | # | ||
| 1199 | # CONFIG_DLM is not set | ||
| 1200 | |||
| 1201 | # | ||
| 1202 | # Profiling support | ||
| 1203 | # | ||
| 1204 | # CONFIG_PROFILING is not set | ||
| 1205 | |||
| 1206 | # | ||
| 1207 | # Kernel hacking | ||
| 1208 | # | ||
| 1209 | # CONFIG_PRINTK_TIME is not set | ||
| 1210 | CONFIG_ENABLE_MUST_CHECK=y | ||
| 1211 | CONFIG_MAGIC_SYSRQ=y | ||
| 1212 | # CONFIG_UNUSED_SYMBOLS is not set | ||
| 1213 | # CONFIG_DEBUG_FS is not set | ||
| 1214 | # CONFIG_HEADERS_CHECK is not set | ||
| 1215 | CONFIG_DEBUG_KERNEL=y | ||
| 1216 | # CONFIG_DEBUG_SHIRQ is not set | ||
| 1217 | CONFIG_DETECT_SOFTLOCKUP=y | ||
| 1218 | CONFIG_SCHED_DEBUG=y | ||
| 1219 | # CONFIG_SCHEDSTATS is not set | ||
| 1220 | CONFIG_TIMER_STATS=y | ||
| 1221 | # CONFIG_DEBUG_SLAB is not set | ||
| 1222 | CONFIG_DEBUG_PREEMPT=y | ||
| 1223 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
| 1224 | # CONFIG_RT_MUTEX_TESTER is not set | ||
| 1225 | # CONFIG_DEBUG_SPINLOCK is not set | ||
| 1226 | CONFIG_DEBUG_MUTEXES=y | ||
| 1227 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
| 1228 | # CONFIG_PROVE_LOCKING is not set | ||
| 1229 | # CONFIG_LOCK_STAT is not set | ||
| 1230 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
| 1231 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
| 1232 | # CONFIG_DEBUG_KOBJECT is not set | ||
| 1233 | # CONFIG_DEBUG_BUGVERBOSE is not set | ||
| 1234 | # CONFIG_DEBUG_INFO is not set | ||
| 1235 | # CONFIG_DEBUG_VM is not set | ||
| 1236 | # CONFIG_DEBUG_LIST is not set | ||
| 1237 | CONFIG_FRAME_POINTER=y | ||
| 1238 | CONFIG_FORCED_INLINING=y | ||
| 1239 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 1240 | # CONFIG_FAULT_INJECTION is not set | ||
| 1241 | # CONFIG_DEBUG_USER is not set | ||
| 1242 | # CONFIG_DEBUG_ERRORS is not set | ||
| 1243 | # CONFIG_DEBUG_LL is not set | ||
| 1244 | |||
| 1245 | # | ||
| 1246 | # Security options | ||
| 1247 | # | ||
| 1248 | # CONFIG_KEYS is not set | ||
| 1249 | # CONFIG_SECURITY is not set | ||
| 1250 | CONFIG_CRYPTO=y | ||
| 1251 | CONFIG_CRYPTO_ALGAPI=y | ||
| 1252 | CONFIG_CRYPTO_BLKCIPHER=y | ||
| 1253 | CONFIG_CRYPTO_MANAGER=y | ||
| 1254 | # CONFIG_CRYPTO_HMAC is not set | ||
| 1255 | # CONFIG_CRYPTO_XCBC is not set | ||
| 1256 | # CONFIG_CRYPTO_NULL is not set | ||
| 1257 | # CONFIG_CRYPTO_MD4 is not set | ||
| 1258 | CONFIG_CRYPTO_MD5=y | ||
| 1259 | # CONFIG_CRYPTO_SHA1 is not set | ||
| 1260 | # CONFIG_CRYPTO_SHA256 is not set | ||
| 1261 | # CONFIG_CRYPTO_SHA512 is not set | ||
| 1262 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1263 | # CONFIG_CRYPTO_TGR192 is not set | ||
| 1264 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1265 | CONFIG_CRYPTO_ECB=m | ||
| 1266 | CONFIG_CRYPTO_CBC=y | ||
| 1267 | CONFIG_CRYPTO_PCBC=m | ||
| 1268 | # CONFIG_CRYPTO_LRW is not set | ||
| 1269 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1270 | CONFIG_CRYPTO_DES=y | ||
| 1271 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1272 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1273 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1274 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1275 | # CONFIG_CRYPTO_AES is not set | ||
| 1276 | # CONFIG_CRYPTO_CAST5 is not set | ||
| 1277 | # CONFIG_CRYPTO_CAST6 is not set | ||
| 1278 | # CONFIG_CRYPTO_TEA is not set | ||
| 1279 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1280 | # CONFIG_CRYPTO_KHAZAD is not set | ||
| 1281 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1282 | # CONFIG_CRYPTO_DEFLATE is not set | ||
| 1283 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1284 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1285 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1286 | # CONFIG_CRYPTO_TEST is not set | ||
| 1287 | CONFIG_CRYPTO_HW=y | ||
| 1288 | |||
| 1289 | # | ||
| 1290 | # Library routines | ||
| 1291 | # | ||
| 1292 | CONFIG_BITREVERSE=y | ||
| 1293 | CONFIG_CRC_CCITT=y | ||
| 1294 | # CONFIG_CRC16 is not set | ||
| 1295 | # CONFIG_CRC_ITU_T is not set | ||
| 1296 | CONFIG_CRC32=y | ||
| 1297 | # CONFIG_CRC7 is not set | ||
| 1298 | CONFIG_LIBCRC32C=y | ||
| 1299 | CONFIG_ZLIB_INFLATE=y | ||
| 1300 | CONFIG_ZLIB_DEFLATE=y | ||
| 1301 | CONFIG_PLIST=y | ||
| 1302 | CONFIG_HAS_IOMEM=y | ||
| 1303 | CONFIG_HAS_IOPORT=y | ||
| 1304 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/arm/configs/omap_apollon_2420_defconfig b/arch/arm/configs/omap_apollon_2420_defconfig new file mode 100644 index 000000000000..bb39dfc72d69 --- /dev/null +++ b/arch/arm/configs/omap_apollon_2420_defconfig | |||
| @@ -0,0 +1,962 @@ | |||
| 1 | # | ||
| 2 | # Automatically generated make config: don't edit | ||
| 3 | # Linux kernel version: 2.6.23-rc6-omap1 | ||
| 4 | # Tue Sep 18 12:07:29 2007 | ||
| 5 | # | ||
| 6 | CONFIG_ARM=y | ||
| 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | ||
| 8 | CONFIG_GENERIC_GPIO=y | ||
| 9 | CONFIG_GENERIC_TIME=y | ||
| 10 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 11 | CONFIG_MMU=y | ||
| 12 | # CONFIG_NO_IOPORT is not set | ||
| 13 | CONFIG_GENERIC_HARDIRQS=y | ||
| 14 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 15 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 16 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
| 17 | CONFIG_HARDIRQS_SW_RESEND=y | ||
| 18 | CONFIG_GENERIC_IRQ_PROBE=y | ||
| 19 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
| 20 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
| 21 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
| 22 | CONFIG_GENERIC_HWEIGHT=y | ||
| 23 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
| 24 | CONFIG_ZONE_DMA=y | ||
| 25 | CONFIG_VECTORS_BASE=0xffff0000 | ||
| 26 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
| 27 | |||
| 28 | # | ||
| 29 | # General setup | ||
| 30 | # | ||
| 31 | CONFIG_EXPERIMENTAL=y | ||
| 32 | CONFIG_BROKEN_ON_SMP=y | ||
| 33 | CONFIG_LOCK_KERNEL=y | ||
| 34 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 35 | CONFIG_LOCALVERSION="" | ||
| 36 | # CONFIG_LOCALVERSION_AUTO is not set | ||
| 37 | CONFIG_SWAP=y | ||
| 38 | CONFIG_SYSVIPC=y | ||
| 39 | CONFIG_SYSVIPC_SYSCTL=y | ||
| 40 | # CONFIG_POSIX_MQUEUE is not set | ||
| 41 | CONFIG_BSD_PROCESS_ACCT=y | ||
| 42 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | ||
| 43 | # CONFIG_TASKSTATS is not set | ||
| 44 | # CONFIG_USER_NS is not set | ||
| 45 | # CONFIG_AUDIT is not set | ||
| 46 | # CONFIG_IKCONFIG is not set | ||
| 47 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 48 | CONFIG_SYSFS_DEPRECATED=y | ||
| 49 | # CONFIG_RELAY is not set | ||
| 50 | # CONFIG_BLK_DEV_INITRD is not set | ||
| 51 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
| 52 | CONFIG_SYSCTL=y | ||
| 53 | # CONFIG_EMBEDDED is not set | ||
| 54 | CONFIG_UID16=y | ||
| 55 | CONFIG_SYSCTL_SYSCALL=y | ||
| 56 | CONFIG_KALLSYMS=y | ||
| 57 | # CONFIG_KALLSYMS_ALL is not set | ||
| 58 | CONFIG_KALLSYMS_EXTRA_PASS=y | ||
| 59 | CONFIG_HOTPLUG=y | ||
| 60 | CONFIG_PRINTK=y | ||
| 61 | CONFIG_BUG=y | ||
| 62 | CONFIG_ELF_CORE=y | ||
| 63 | CONFIG_BASE_FULL=y | ||
| 64 | CONFIG_FUTEX=y | ||
| 65 | CONFIG_ANON_INODES=y | ||
| 66 | CONFIG_EPOLL=y | ||
| 67 | CONFIG_SIGNALFD=y | ||
| 68 | CONFIG_TIMERFD=y | ||
| 69 | CONFIG_EVENTFD=y | ||
| 70 | CONFIG_SHMEM=y | ||
| 71 | CONFIG_VM_EVENT_COUNTERS=y | ||
| 72 | CONFIG_SLAB=y | ||
| 73 | # CONFIG_SLUB is not set | ||
| 74 | # CONFIG_SLOB is not set | ||
| 75 | CONFIG_RT_MUTEXES=y | ||
| 76 | # CONFIG_TINY_SHMEM is not set | ||
| 77 | CONFIG_BASE_SMALL=0 | ||
| 78 | CONFIG_MODULES=y | ||
| 79 | CONFIG_MODULE_UNLOAD=y | ||
| 80 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 81 | # CONFIG_MODVERSIONS is not set | ||
| 82 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 83 | CONFIG_KMOD=y | ||
| 84 | CONFIG_BLOCK=y | ||
| 85 | # CONFIG_LBD is not set | ||
| 86 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 87 | # CONFIG_LSF is not set | ||
| 88 | # CONFIG_BLK_DEV_BSG is not set | ||
| 89 | |||
| 90 | # | ||
| 91 | # IO Schedulers | ||
| 92 | # | ||
| 93 | CONFIG_IOSCHED_NOOP=y | ||
| 94 | CONFIG_IOSCHED_AS=y | ||
| 95 | CONFIG_IOSCHED_DEADLINE=y | ||
| 96 | CONFIG_IOSCHED_CFQ=y | ||
| 97 | # CONFIG_DEFAULT_AS is not set | ||
| 98 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 99 | CONFIG_DEFAULT_CFQ=y | ||
| 100 | # CONFIG_DEFAULT_NOOP is not set | ||
| 101 | CONFIG_DEFAULT_IOSCHED="cfq" | ||
| 102 | |||
| 103 | # | ||
| 104 | # System Type | ||
| 105 | # | ||
| 106 | # CONFIG_ARCH_AAEC2000 is not set | ||
| 107 | # CONFIG_ARCH_INTEGRATOR is not set | ||
| 108 | # CONFIG_ARCH_REALVIEW is not set | ||
| 109 | # CONFIG_ARCH_VERSATILE is not set | ||
| 110 | # CONFIG_ARCH_AT91 is not set | ||
| 111 | # CONFIG_ARCH_CLPS7500 is not set | ||
| 112 | # CONFIG_ARCH_CLPS711X is not set | ||
| 113 | # CONFIG_ARCH_CO285 is not set | ||
| 114 | # CONFIG_ARCH_EBSA110 is not set | ||
| 115 | # CONFIG_ARCH_EP93XX is not set | ||
| 116 | # CONFIG_ARCH_FOOTBRIDGE is not set | ||
| 117 | # CONFIG_ARCH_NETX is not set | ||
| 118 | # CONFIG_ARCH_H720X is not set | ||
| 119 | # CONFIG_ARCH_IMX is not set | ||
| 120 | # CONFIG_ARCH_IOP13XX is not set | ||
| 121 | # CONFIG_ARCH_IOP32X is not set | ||
| 122 | # CONFIG_ARCH_IOP33X is not set | ||
| 123 | # CONFIG_ARCH_IXP23XX is not set | ||
| 124 | # CONFIG_ARCH_IXP2000 is not set | ||
| 125 | # CONFIG_ARCH_IXP4XX is not set | ||
| 126 | # CONFIG_ARCH_L7200 is not set | ||
| 127 | # CONFIG_ARCH_KS8695 is not set | ||
| 128 | # CONFIG_ARCH_NS9XXX is not set | ||
| 129 | # CONFIG_ARCH_MXC is not set | ||
| 130 | # CONFIG_ARCH_PNX4008 is not set | ||
| 131 | # CONFIG_ARCH_PXA is not set | ||
| 132 | # CONFIG_ARCH_RPC is not set | ||
| 133 | # CONFIG_ARCH_SA1100 is not set | ||
| 134 | # CONFIG_ARCH_S3C2410 is not set | ||
| 135 | # CONFIG_ARCH_SHARK is not set | ||
| 136 | # CONFIG_ARCH_LH7A40X is not set | ||
| 137 | # CONFIG_ARCH_DAVINCI is not set | ||
| 138 | CONFIG_ARCH_OMAP=y | ||
| 139 | |||
| 140 | # | ||
| 141 | # TI OMAP Implementations | ||
| 142 | # | ||
| 143 | CONFIG_ARCH_OMAP_OTG=y | ||
| 144 | # CONFIG_ARCH_OMAP1 is not set | ||
| 145 | CONFIG_ARCH_OMAP2=y | ||
| 146 | # CONFIG_ARCH_OMAP3 is not set | ||
| 147 | |||
| 148 | # | ||
| 149 | # OMAP Feature Selections | ||
| 150 | # | ||
| 151 | # CONFIG_OMAP_RESET_CLOCKS is not set | ||
| 152 | # CONFIG_OMAP_BOOT_TAG is not set | ||
| 153 | # CONFIG_OMAP_GPIO_SWITCH is not set | ||
| 154 | CONFIG_OMAP_MUX=y | ||
| 155 | # CONFIG_OMAP_MUX_DEBUG is not set | ||
| 156 | CONFIG_OMAP_MUX_WARNINGS=y | ||
| 157 | # CONFIG_OMAP_STI is not set | ||
| 158 | # CONFIG_OMAP_MCBSP is not set | ||
| 159 | # CONFIG_OMAP_MMU_FWK is not set | ||
| 160 | # CONFIG_OMAP_MBOX_FWK is not set | ||
| 161 | # CONFIG_OMAP_MPU_TIMER is not set | ||
| 162 | CONFIG_OMAP_32K_TIMER=y | ||
| 163 | CONFIG_OMAP_32K_TIMER_HZ=128 | ||
| 164 | CONFIG_OMAP_DM_TIMER=y | ||
| 165 | CONFIG_OMAP_LL_DEBUG_UART1=y | ||
| 166 | # CONFIG_OMAP_LL_DEBUG_UART2 is not set | ||
| 167 | # CONFIG_OMAP_LL_DEBUG_UART3 is not set | ||
| 168 | CONFIG_OMAP_SERIAL_WAKE=y | ||
| 169 | # CONFIG_OMAP_DSP is not set | ||
| 170 | # CONFIG_MACH_OMAP_GENERIC is not set | ||
| 171 | |||
| 172 | # | ||
| 173 | # OMAP Core Type | ||
| 174 | # | ||
| 175 | CONFIG_ARCH_OMAP24XX=y | ||
| 176 | CONFIG_ARCH_OMAP2420=y | ||
| 177 | # CONFIG_ARCH_OMAP2430 is not set | ||
| 178 | |||
| 179 | # | ||
| 180 | # OMAP Board Type | ||
| 181 | # | ||
| 182 | # CONFIG_MACH_NOKIA_N800 is not set | ||
| 183 | # CONFIG_MACH_OMAP_H4 is not set | ||
| 184 | CONFIG_MACH_OMAP_APOLLON=y | ||
| 185 | # CONFIG_MACH_OMAP_APOLLON_PLUS is not set | ||
| 186 | # CONFIG_MACH_OMAP_2430SDP is not set | ||
| 187 | |||
| 188 | # | ||
| 189 | # Boot options | ||
| 190 | # | ||
| 191 | |||
| 192 | # | ||
| 193 | # Power management | ||
| 194 | # | ||
| 195 | |||
| 196 | # | ||
| 197 | # Processor Type | ||
| 198 | # | ||
| 199 | CONFIG_CPU_32=y | ||
| 200 | CONFIG_CPU_V6=y | ||
| 201 | # CONFIG_CPU_32v6K is not set | ||
| 202 | CONFIG_CPU_32v6=y | ||
| 203 | CONFIG_CPU_ABRT_EV6=y | ||
| 204 | CONFIG_CPU_PABRT_NOIFAR=y | ||
| 205 | CONFIG_CPU_CACHE_V6=y | ||
| 206 | CONFIG_CPU_CACHE_VIPT=y | ||
| 207 | CONFIG_CPU_COPY_V6=y | ||
| 208 | CONFIG_CPU_TLB_V6=y | ||
| 209 | CONFIG_CPU_HAS_ASID=y | ||
| 210 | CONFIG_CPU_CP15=y | ||
| 211 | CONFIG_CPU_CP15_MMU=y | ||
| 212 | |||
| 213 | # | ||
| 214 | # Processor Features | ||
| 215 | # | ||
| 216 | # CONFIG_ARM_THUMB is not set | ||
| 217 | # CONFIG_CPU_ICACHE_DISABLE is not set | ||
| 218 | # CONFIG_CPU_DCACHE_DISABLE is not set | ||
| 219 | # CONFIG_CPU_BPREDICT_DISABLE is not set | ||
| 220 | # CONFIG_OUTER_CACHE is not set | ||
| 221 | |||
| 222 | # | ||
| 223 | # Bus support | ||
| 224 | # | ||
| 225 | # CONFIG_PCI_SYSCALL is not set | ||
| 226 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 227 | |||
| 228 | # | ||
| 229 | # PCCARD (PCMCIA/CardBus) support | ||
| 230 | # | ||
| 231 | # CONFIG_PCCARD is not set | ||
| 232 | |||
| 233 | # | ||
| 234 | # Kernel Features | ||
| 235 | # | ||
| 236 | # CONFIG_TICK_ONESHOT is not set | ||
| 237 | # CONFIG_NO_HZ is not set | ||
| 238 | # CONFIG_HIGH_RES_TIMERS is not set | ||
| 239 | CONFIG_PREEMPT=y | ||
| 240 | CONFIG_HZ=128 | ||
| 241 | # CONFIG_AEABI is not set | ||
| 242 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | ||
| 243 | CONFIG_SELECT_MEMORY_MODEL=y | ||
| 244 | CONFIG_FLATMEM_MANUAL=y | ||
| 245 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
| 246 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
| 247 | CONFIG_FLATMEM=y | ||
| 248 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
| 249 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 250 | CONFIG_SPLIT_PTLOCK_CPUS=4 | ||
| 251 | # CONFIG_RESOURCES_64BIT is not set | ||
| 252 | CONFIG_ZONE_DMA_FLAG=1 | ||
| 253 | CONFIG_BOUNCE=y | ||
| 254 | CONFIG_VIRT_TO_BUS=y | ||
| 255 | # CONFIG_LEDS is not set | ||
| 256 | CONFIG_ALIGNMENT_TRAP=y | ||
| 257 | |||
| 258 | # | ||
| 259 | # Boot options | ||
| 260 | # | ||
| 261 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
| 262 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
| 263 | CONFIG_CMDLINE="root=/dev/ram0 rw mem=128M console=ttyS0,115200n8 initrd=0x80600000,8M ramdisk_size=8192" | ||
| 264 | # CONFIG_XIP_KERNEL is not set | ||
| 265 | # CONFIG_KEXEC is not set | ||
| 266 | |||
| 267 | # | ||
| 268 | # CPU Frequency scaling | ||
| 269 | # | ||
| 270 | # CONFIG_CPU_FREQ is not set | ||
| 271 | |||
| 272 | # | ||
| 273 | # Floating point emulation | ||
| 274 | # | ||
| 275 | |||
| 276 | # | ||
| 277 | # At least one emulation must be selected | ||
| 278 | # | ||
| 279 | # CONFIG_FPE_NWFPE is not set | ||
| 280 | # CONFIG_FPE_FASTFPE is not set | ||
| 281 | CONFIG_VFP=y | ||
| 282 | |||
| 283 | # | ||
| 284 | # Userspace binary formats | ||
| 285 | # | ||
| 286 | CONFIG_BINFMT_ELF=y | ||
| 287 | # CONFIG_BINFMT_AOUT is not set | ||
| 288 | # CONFIG_BINFMT_MISC is not set | ||
| 289 | # CONFIG_ARTHUR is not set | ||
| 290 | |||
| 291 | # | ||
| 292 | # Power management options | ||
| 293 | # | ||
| 294 | # CONFIG_PM is not set | ||
| 295 | CONFIG_SUSPEND_UP_POSSIBLE=y | ||
| 296 | |||
| 297 | # | ||
| 298 | # Networking | ||
| 299 | # | ||
| 300 | CONFIG_NET=y | ||
| 301 | |||
| 302 | # | ||
| 303 | # Networking options | ||
| 304 | # | ||
| 305 | CONFIG_PACKET=y | ||
| 306 | # CONFIG_PACKET_MMAP is not set | ||
| 307 | CONFIG_UNIX=y | ||
| 308 | CONFIG_XFRM=y | ||
| 309 | # CONFIG_XFRM_USER is not set | ||
| 310 | # CONFIG_XFRM_SUB_POLICY is not set | ||
| 311 | # CONFIG_XFRM_MIGRATE is not set | ||
| 312 | # CONFIG_NET_KEY is not set | ||
| 313 | CONFIG_INET=y | ||
| 314 | # CONFIG_IP_MULTICAST is not set | ||
| 315 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
| 316 | CONFIG_IP_FIB_HASH=y | ||
| 317 | CONFIG_IP_PNP=y | ||
| 318 | CONFIG_IP_PNP_DHCP=y | ||
| 319 | CONFIG_IP_PNP_BOOTP=y | ||
| 320 | # CONFIG_IP_PNP_RARP is not set | ||
| 321 | # CONFIG_NET_IPIP is not set | ||
| 322 | # CONFIG_NET_IPGRE is not set | ||
| 323 | # CONFIG_ARPD is not set | ||
| 324 | # CONFIG_SYN_COOKIES is not set | ||
| 325 | # CONFIG_INET_AH is not set | ||
| 326 | # CONFIG_INET_ESP is not set | ||
| 327 | # CONFIG_INET_IPCOMP is not set | ||
| 328 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
| 329 | # CONFIG_INET_TUNNEL is not set | ||
| 330 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | ||
| 331 | CONFIG_INET_XFRM_MODE_TUNNEL=y | ||
| 332 | CONFIG_INET_XFRM_MODE_BEET=y | ||
| 333 | CONFIG_INET_DIAG=y | ||
| 334 | CONFIG_INET_TCP_DIAG=y | ||
| 335 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
| 336 | CONFIG_TCP_CONG_CUBIC=y | ||
| 337 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
| 338 | # CONFIG_TCP_MD5SIG is not set | ||
| 339 | # CONFIG_IPV6 is not set | ||
| 340 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 341 | # CONFIG_INET6_TUNNEL is not set | ||
| 342 | # CONFIG_NETWORK_SECMARK is not set | ||
| 343 | # CONFIG_NETFILTER is not set | ||
| 344 | # CONFIG_IP_DCCP is not set | ||
| 345 | # CONFIG_IP_SCTP is not set | ||
| 346 | # CONFIG_TIPC is not set | ||
| 347 | # CONFIG_ATM is not set | ||
| 348 | # CONFIG_BRIDGE is not set | ||
| 349 | # CONFIG_VLAN_8021Q is not set | ||
| 350 | # CONFIG_DECNET is not set | ||
| 351 | # CONFIG_LLC2 is not set | ||
| 352 | # CONFIG_IPX is not set | ||
| 353 | # CONFIG_ATALK is not set | ||
| 354 | # CONFIG_X25 is not set | ||
| 355 | # CONFIG_LAPB is not set | ||
| 356 | # CONFIG_ECONET is not set | ||
| 357 | # CONFIG_WAN_ROUTER is not set | ||
| 358 | |||
| 359 | # | ||
| 360 | # QoS and/or fair queueing | ||
| 361 | # | ||
| 362 | # CONFIG_NET_SCHED is not set | ||
| 363 | |||
| 364 | # | ||
| 365 | # Network testing | ||
| 366 | # | ||
| 367 | # CONFIG_NET_PKTGEN is not set | ||
| 368 | # CONFIG_HAMRADIO is not set | ||
| 369 | # CONFIG_IRDA is not set | ||
| 370 | # CONFIG_BT is not set | ||
| 371 | # CONFIG_AF_RXRPC is not set | ||
| 372 | |||
| 373 | # | ||
| 374 | # Wireless | ||
| 375 | # | ||
| 376 | # CONFIG_CFG80211 is not set | ||
| 377 | # CONFIG_WIRELESS_EXT is not set | ||
| 378 | # CONFIG_MAC80211 is not set | ||
| 379 | # CONFIG_IEEE80211 is not set | ||
| 380 | # CONFIG_RFKILL is not set | ||
| 381 | # CONFIG_NET_9P is not set | ||
| 382 | |||
| 383 | # | ||
| 384 | # Device Drivers | ||
| 385 | # | ||
| 386 | |||
| 387 | # | ||
| 388 | # Generic Driver Options | ||
| 389 | # | ||
| 390 | CONFIG_STANDALONE=y | ||
| 391 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
| 392 | # CONFIG_FW_LOADER is not set | ||
| 393 | # CONFIG_DEBUG_DRIVER is not set | ||
| 394 | # CONFIG_DEBUG_DEVRES is not set | ||
| 395 | # CONFIG_SYS_HYPERVISOR is not set | ||
| 396 | # CONFIG_CONNECTOR is not set | ||
| 397 | CONFIG_MTD=y | ||
| 398 | # CONFIG_MTD_DEBUG is not set | ||
| 399 | CONFIG_MTD_CONCAT=y | ||
| 400 | CONFIG_MTD_PARTITIONS=y | ||
| 401 | # CONFIG_MTD_REDBOOT_PARTS is not set | ||
| 402 | CONFIG_MTD_CMDLINE_PARTS=y | ||
| 403 | # CONFIG_MTD_AFS_PARTS is not set | ||
| 404 | |||
| 405 | # | ||
| 406 | # User Modules And Translation Layers | ||
| 407 | # | ||
| 408 | CONFIG_MTD_CHAR=y | ||
| 409 | CONFIG_MTD_BLKDEVS=y | ||
| 410 | CONFIG_MTD_BLOCK=y | ||
| 411 | # CONFIG_FTL is not set | ||
| 412 | # CONFIG_NFTL is not set | ||
| 413 | # CONFIG_INFTL is not set | ||
| 414 | # CONFIG_RFD_FTL is not set | ||
| 415 | # CONFIG_SSFDC is not set | ||
| 416 | |||
| 417 | # | ||
| 418 | # RAM/ROM/Flash chip drivers | ||
| 419 | # | ||
| 420 | # CONFIG_MTD_CFI is not set | ||
| 421 | # CONFIG_MTD_JEDECPROBE is not set | ||
| 422 | CONFIG_MTD_MAP_BANK_WIDTH_1=y | ||
| 423 | CONFIG_MTD_MAP_BANK_WIDTH_2=y | ||
| 424 | CONFIG_MTD_MAP_BANK_WIDTH_4=y | ||
| 425 | # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set | ||
| 426 | # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set | ||
| 427 | # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set | ||
| 428 | CONFIG_MTD_CFI_I1=y | ||
| 429 | CONFIG_MTD_CFI_I2=y | ||
| 430 | # CONFIG_MTD_CFI_I4 is not set | ||
| 431 | # CONFIG_MTD_CFI_I8 is not set | ||
| 432 | # CONFIG_MTD_RAM is not set | ||
| 433 | # CONFIG_MTD_ROM is not set | ||
| 434 | # CONFIG_MTD_ABSENT is not set | ||
| 435 | |||
| 436 | # | ||
| 437 | # Mapping drivers for chip access | ||
| 438 | # | ||
| 439 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | ||
| 440 | # CONFIG_MTD_PLATRAM is not set | ||
| 441 | |||
| 442 | # | ||
| 443 | # Self-contained MTD device drivers | ||
| 444 | # | ||
| 445 | # CONFIG_MTD_DATAFLASH is not set | ||
| 446 | # CONFIG_MTD_M25P80 is not set | ||
| 447 | # CONFIG_MTD_SLRAM is not set | ||
| 448 | # CONFIG_MTD_PHRAM is not set | ||
| 449 | # CONFIG_MTD_MTDRAM is not set | ||
| 450 | # CONFIG_MTD_BLOCK2MTD is not set | ||
| 451 | |||
| 452 | # | ||
| 453 | # Disk-On-Chip Device Drivers | ||
| 454 | # | ||
| 455 | # CONFIG_MTD_DOC2000 is not set | ||
| 456 | # CONFIG_MTD_DOC2001 is not set | ||
| 457 | # CONFIG_MTD_DOC2001PLUS is not set | ||
| 458 | # CONFIG_MTD_NAND is not set | ||
| 459 | CONFIG_MTD_ONENAND=y | ||
| 460 | # CONFIG_MTD_ONENAND_VERIFY_WRITE is not set | ||
| 461 | CONFIG_MTD_ONENAND_GENERIC=y | ||
| 462 | # CONFIG_MTD_ONENAND_OMAP2 is not set | ||
| 463 | # CONFIG_MTD_ONENAND_OTP is not set | ||
| 464 | |||
| 465 | # | ||
| 466 | # UBI - Unsorted block images | ||
| 467 | # | ||
| 468 | # CONFIG_MTD_UBI is not set | ||
| 469 | # CONFIG_PARPORT is not set | ||
| 470 | CONFIG_BLK_DEV=y | ||
| 471 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
| 472 | CONFIG_BLK_DEV_LOOP=y | ||
| 473 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | ||
| 474 | # CONFIG_BLK_DEV_NBD is not set | ||
| 475 | # CONFIG_BLK_DEV_RAM is not set | ||
| 476 | # CONFIG_CDROM_PKTCDVD is not set | ||
| 477 | # CONFIG_ATA_OVER_ETH is not set | ||
| 478 | |||
| 479 | # | ||
| 480 | # SCSI device support | ||
| 481 | # | ||
| 482 | # CONFIG_RAID_ATTRS is not set | ||
| 483 | # CONFIG_SCSI is not set | ||
| 484 | # CONFIG_SCSI_DMA is not set | ||
| 485 | # CONFIG_SCSI_NETLINK is not set | ||
| 486 | # CONFIG_ATA is not set | ||
| 487 | # CONFIG_MD is not set | ||
| 488 | CONFIG_NETDEVICES=y | ||
| 489 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 490 | # CONFIG_DUMMY is not set | ||
| 491 | # CONFIG_BONDING is not set | ||
| 492 | # CONFIG_MACVLAN is not set | ||
| 493 | # CONFIG_EQUALIZER is not set | ||
| 494 | # CONFIG_TUN is not set | ||
| 495 | # CONFIG_PHYLIB is not set | ||
| 496 | CONFIG_NET_ETHERNET=y | ||
| 497 | CONFIG_MII=y | ||
| 498 | # CONFIG_AX88796 is not set | ||
| 499 | CONFIG_SMC91X=y | ||
| 500 | # CONFIG_DM9000 is not set | ||
| 501 | CONFIG_NETDEV_1000=y | ||
| 502 | CONFIG_NETDEV_10000=y | ||
| 503 | |||
| 504 | # | ||
| 505 | # Wireless LAN | ||
| 506 | # | ||
| 507 | # CONFIG_WLAN_PRE80211 is not set | ||
| 508 | # CONFIG_WLAN_80211 is not set | ||
| 509 | # CONFIG_WAN is not set | ||
| 510 | # CONFIG_PPP is not set | ||
| 511 | # CONFIG_SLIP is not set | ||
| 512 | # CONFIG_SHAPER is not set | ||
| 513 | # CONFIG_NETCONSOLE is not set | ||
| 514 | # CONFIG_NETPOLL is not set | ||
| 515 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
| 516 | # CONFIG_ISDN is not set | ||
| 517 | |||
| 518 | # | ||
| 519 | # Input device support | ||
| 520 | # | ||
| 521 | CONFIG_INPUT=y | ||
| 522 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
| 523 | # CONFIG_INPUT_POLLDEV is not set | ||
| 524 | |||
| 525 | # | ||
| 526 | # Userland interfaces | ||
| 527 | # | ||
| 528 | CONFIG_INPUT_MOUSEDEV=y | ||
| 529 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set | ||
| 530 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | ||
| 531 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | ||
| 532 | # CONFIG_INPUT_JOYDEV is not set | ||
| 533 | # CONFIG_INPUT_TSDEV is not set | ||
| 534 | # CONFIG_INPUT_EVDEV is not set | ||
| 535 | # CONFIG_INPUT_EVBUG is not set | ||
| 536 | |||
| 537 | # | ||
| 538 | # Input Device Drivers | ||
| 539 | # | ||
| 540 | # CONFIG_INPUT_KEYBOARD is not set | ||
| 541 | # CONFIG_INPUT_MOUSE is not set | ||
| 542 | # CONFIG_INPUT_JOYSTICK is not set | ||
| 543 | # CONFIG_INPUT_TABLET is not set | ||
| 544 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
| 545 | # CONFIG_INPUT_MISC is not set | ||
| 546 | |||
| 547 | # | ||
| 548 | # Hardware I/O ports | ||
| 549 | # | ||
| 550 | # CONFIG_SERIO is not set | ||
| 551 | # CONFIG_GAMEPORT is not set | ||
| 552 | |||
| 553 | # | ||
| 554 | # Character devices | ||
| 555 | # | ||
| 556 | CONFIG_VT=y | ||
| 557 | CONFIG_VT_CONSOLE=y | ||
| 558 | CONFIG_HW_CONSOLE=y | ||
| 559 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
| 560 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
| 561 | |||
| 562 | # | ||
| 563 | # Serial drivers | ||
| 564 | # | ||
| 565 | CONFIG_SERIAL_8250=y | ||
| 566 | CONFIG_SERIAL_8250_CONSOLE=y | ||
| 567 | CONFIG_SERIAL_8250_NR_UARTS=32 | ||
| 568 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | ||
| 569 | CONFIG_SERIAL_8250_EXTENDED=y | ||
| 570 | CONFIG_SERIAL_8250_MANY_PORTS=y | ||
| 571 | CONFIG_SERIAL_8250_SHARE_IRQ=y | ||
| 572 | CONFIG_SERIAL_8250_DETECT_IRQ=y | ||
| 573 | CONFIG_SERIAL_8250_RSA=y | ||
| 574 | |||
| 575 | # | ||
| 576 | # Non-8250 serial port support | ||
| 577 | # | ||
| 578 | CONFIG_SERIAL_CORE=y | ||
| 579 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
| 580 | CONFIG_UNIX98_PTYS=y | ||
| 581 | # CONFIG_LEGACY_PTYS is not set | ||
| 582 | # CONFIG_IPMI_HANDLER is not set | ||
| 583 | CONFIG_WATCHDOG=y | ||
| 584 | # CONFIG_WATCHDOG_NOWAYOUT is not set | ||
| 585 | |||
| 586 | # | ||
| 587 | # Watchdog Device Drivers | ||
| 588 | # | ||
| 589 | # CONFIG_SOFT_WATCHDOG is not set | ||
| 590 | CONFIG_OMAP_WATCHDOG=y | ||
| 591 | CONFIG_HW_RANDOM=y | ||
| 592 | CONFIG_HW_RANDOM_OMAP=y | ||
| 593 | # CONFIG_NVRAM is not set | ||
| 594 | # CONFIG_R3964 is not set | ||
| 595 | # CONFIG_RAW_DRIVER is not set | ||
| 596 | # CONFIG_TCG_TPM is not set | ||
| 597 | # CONFIG_I2C is not set | ||
| 598 | |||
| 599 | # | ||
| 600 | # SPI support | ||
| 601 | # | ||
| 602 | CONFIG_SPI=y | ||
| 603 | # CONFIG_SPI_DEBUG is not set | ||
| 604 | CONFIG_SPI_MASTER=y | ||
| 605 | |||
| 606 | # | ||
| 607 | # SPI Master Controller Drivers | ||
| 608 | # | ||
| 609 | # CONFIG_SPI_BITBANG is not set | ||
| 610 | CONFIG_SPI_OMAP24XX=y | ||
| 611 | |||
| 612 | # | ||
| 613 | # SPI Protocol Masters | ||
| 614 | # | ||
| 615 | # CONFIG_SPI_AT25 is not set | ||
| 616 | # CONFIG_SPI_TSC2101 is not set | ||
| 617 | # CONFIG_SPI_TSC2102 is not set | ||
| 618 | # CONFIG_SPI_TSC210X is not set | ||
| 619 | # CONFIG_SPI_TSC2301 is not set | ||
| 620 | # CONFIG_SPI_SPIDEV is not set | ||
| 621 | # CONFIG_SPI_TLE62X0 is not set | ||
| 622 | # CONFIG_W1 is not set | ||
| 623 | # CONFIG_HWMON is not set | ||
| 624 | CONFIG_MISC_DEVICES=y | ||
| 625 | # CONFIG_EEPROM_93CX6 is not set | ||
| 626 | |||
| 627 | # | ||
| 628 | # Multifunction device drivers | ||
| 629 | # | ||
| 630 | # CONFIG_MFD_SM501 is not set | ||
| 631 | # CONFIG_NEW_LEDS is not set | ||
| 632 | |||
| 633 | # | ||
| 634 | # Multimedia devices | ||
| 635 | # | ||
| 636 | # CONFIG_VIDEO_DEV is not set | ||
| 637 | # CONFIG_DVB_CORE is not set | ||
| 638 | CONFIG_DAB=y | ||
| 639 | |||
| 640 | # | ||
| 641 | # Graphics support | ||
| 642 | # | ||
| 643 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 644 | |||
| 645 | # | ||
| 646 | # Display device support | ||
| 647 | # | ||
| 648 | # CONFIG_DISPLAY_SUPPORT is not set | ||
| 649 | # CONFIG_VGASTATE is not set | ||
| 650 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
| 651 | CONFIG_FB=y | ||
| 652 | CONFIG_FIRMWARE_EDID=y | ||
| 653 | # CONFIG_FB_DDC is not set | ||
| 654 | # CONFIG_FB_CFB_FILLRECT is not set | ||
| 655 | # CONFIG_FB_CFB_COPYAREA is not set | ||
| 656 | # CONFIG_FB_CFB_IMAGEBLIT is not set | ||
| 657 | # CONFIG_FB_SYS_FILLRECT is not set | ||
| 658 | # CONFIG_FB_SYS_COPYAREA is not set | ||
| 659 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
| 660 | # CONFIG_FB_SYS_FOPS is not set | ||
| 661 | CONFIG_FB_DEFERRED_IO=y | ||
| 662 | # CONFIG_FB_SVGALIB is not set | ||
| 663 | # CONFIG_FB_MACMODES is not set | ||
| 664 | # CONFIG_FB_BACKLIGHT is not set | ||
| 665 | # CONFIG_FB_MODE_HELPERS is not set | ||
| 666 | # CONFIG_FB_TILEBLITTING is not set | ||
| 667 | |||
| 668 | # | ||
| 669 | # Frame buffer hardware drivers | ||
| 670 | # | ||
| 671 | # CONFIG_FB_S1D13XXX is not set | ||
| 672 | CONFIG_FB_OMAP=y | ||
| 673 | # CONFIG_FB_OMAP_LCDC_EXTERNAL is not set | ||
| 674 | # CONFIG_FB_OMAP_BOOTLOADER_INIT is not set | ||
| 675 | CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2 | ||
| 676 | # CONFIG_FB_VIRTUAL is not set | ||
| 677 | |||
| 678 | # | ||
| 679 | # Console display driver support | ||
| 680 | # | ||
| 681 | # CONFIG_VGA_CONSOLE is not set | ||
| 682 | CONFIG_DUMMY_CONSOLE=y | ||
| 683 | CONFIG_FRAMEBUFFER_CONSOLE=y | ||
| 684 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set | ||
| 685 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | ||
| 686 | CONFIG_FONTS=y | ||
| 687 | CONFIG_FONT_8x8=y | ||
| 688 | CONFIG_FONT_8x16=y | ||
| 689 | # CONFIG_FONT_6x11 is not set | ||
| 690 | # CONFIG_FONT_7x14 is not set | ||
| 691 | # CONFIG_FONT_PEARL_8x8 is not set | ||
| 692 | # CONFIG_FONT_ACORN_8x8 is not set | ||
| 693 | # CONFIG_FONT_MINI_4x6 is not set | ||
| 694 | # CONFIG_FONT_SUN8x16 is not set | ||
| 695 | # CONFIG_FONT_SUN12x22 is not set | ||
| 696 | # CONFIG_FONT_10x18 is not set | ||
| 697 | CONFIG_LOGO=y | ||
| 698 | # CONFIG_LOGO_LINUX_MONO is not set | ||
| 699 | # CONFIG_LOGO_LINUX_VGA16 is not set | ||
| 700 | CONFIG_LOGO_LINUX_CLUT224=y | ||
| 701 | |||
| 702 | # | ||
| 703 | # Sound | ||
| 704 | # | ||
| 705 | # CONFIG_SOUND is not set | ||
| 706 | CONFIG_HID_SUPPORT=y | ||
| 707 | # CONFIG_HID is not set | ||
| 708 | CONFIG_USB_SUPPORT=y | ||
| 709 | CONFIG_USB_ARCH_HAS_HCD=y | ||
| 710 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
| 711 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
| 712 | # CONFIG_USB is not set | ||
| 713 | # CONFIG_USB_MUSB_HDRC is not set | ||
| 714 | # CONFIG_USB_GADGET_MUSB_HDRC is not set | ||
| 715 | |||
| 716 | # | ||
| 717 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
| 718 | # | ||
| 719 | |||
| 720 | # | ||
| 721 | # USB Gadget Support | ||
| 722 | # | ||
| 723 | CONFIG_USB_GADGET=y | ||
| 724 | # CONFIG_USB_GADGET_DEBUG is not set | ||
| 725 | # CONFIG_USB_GADGET_DEBUG_FILES is not set | ||
| 726 | CONFIG_USB_GADGET_SELECTED=y | ||
| 727 | # CONFIG_USB_GADGET_AMD5536UDC is not set | ||
| 728 | # CONFIG_USB_GADGET_FSL_USB2 is not set | ||
| 729 | # CONFIG_USB_GADGET_NET2280 is not set | ||
| 730 | # CONFIG_USB_GADGET_PXA2XX is not set | ||
| 731 | # CONFIG_USB_GADGET_M66592 is not set | ||
| 732 | # CONFIG_USB_GADGET_GOKU is not set | ||
| 733 | # CONFIG_USB_GADGET_LH7A40X is not set | ||
| 734 | CONFIG_USB_GADGET_OMAP=y | ||
| 735 | CONFIG_USB_OMAP=y | ||
| 736 | # CONFIG_USB_GADGET_S3C2410 is not set | ||
| 737 | # CONFIG_USB_GADGET_AT91 is not set | ||
| 738 | # CONFIG_USB_GADGET_DUMMY_HCD is not set | ||
| 739 | # CONFIG_USB_GADGET_DUALSPEED is not set | ||
| 740 | # CONFIG_USB_ZERO is not set | ||
| 741 | CONFIG_USB_ETH=m | ||
| 742 | CONFIG_USB_ETH_RNDIS=y | ||
| 743 | # CONFIG_USB_GADGETFS is not set | ||
| 744 | CONFIG_USB_FILE_STORAGE=m | ||
| 745 | # CONFIG_USB_FILE_STORAGE_TEST is not set | ||
| 746 | # CONFIG_USB_G_SERIAL is not set | ||
| 747 | # CONFIG_USB_MIDI_GADGET is not set | ||
| 748 | CONFIG_MMC=y | ||
| 749 | # CONFIG_MMC_DEBUG is not set | ||
| 750 | # CONFIG_MMC_UNSAFE_RESUME is not set | ||
| 751 | |||
| 752 | # | ||
| 753 | # MMC/SD Card Drivers | ||
| 754 | # | ||
| 755 | CONFIG_MMC_BLOCK=y | ||
| 756 | CONFIG_MMC_BLOCK_BOUNCE=y | ||
| 757 | |||
| 758 | # | ||
| 759 | # MMC/SD Host Controller Drivers | ||
| 760 | # | ||
| 761 | CONFIG_MMC_OMAP=y | ||
| 762 | CONFIG_RTC_LIB=y | ||
| 763 | # CONFIG_RTC_CLASS is not set | ||
| 764 | |||
| 765 | # | ||
| 766 | # DMA Engine support | ||
| 767 | # | ||
| 768 | # CONFIG_DMA_ENGINE is not set | ||
| 769 | |||
| 770 | # | ||
| 771 | # DMA Clients | ||
| 772 | # | ||
| 773 | |||
| 774 | # | ||
| 775 | # DMA Devices | ||
| 776 | # | ||
| 777 | |||
| 778 | # | ||
| 779 | # CBUS support | ||
| 780 | # | ||
| 781 | # CONFIG_CBUS is not set | ||
| 782 | |||
| 783 | # | ||
| 784 | # File systems | ||
| 785 | # | ||
| 786 | CONFIG_EXT2_FS=y | ||
| 787 | # CONFIG_EXT2_FS_XATTR is not set | ||
| 788 | # CONFIG_EXT2_FS_XIP is not set | ||
| 789 | # CONFIG_EXT3_FS is not set | ||
| 790 | # CONFIG_EXT4DEV_FS is not set | ||
| 791 | # CONFIG_REISERFS_FS is not set | ||
| 792 | # CONFIG_JFS_FS is not set | ||
| 793 | # CONFIG_FS_POSIX_ACL is not set | ||
| 794 | # CONFIG_XFS_FS is not set | ||
| 795 | # CONFIG_GFS2_FS is not set | ||
| 796 | # CONFIG_OCFS2_FS is not set | ||
| 797 | # CONFIG_MINIX_FS is not set | ||
| 798 | # CONFIG_ROMFS_FS is not set | ||
| 799 | # CONFIG_INOTIFY is not set | ||
| 800 | # CONFIG_QUOTA is not set | ||
| 801 | CONFIG_DNOTIFY=y | ||
| 802 | # CONFIG_AUTOFS_FS is not set | ||
| 803 | CONFIG_AUTOFS4_FS=y | ||
| 804 | # CONFIG_FUSE_FS is not set | ||
| 805 | |||
| 806 | # | ||
| 807 | # CD-ROM/DVD Filesystems | ||
| 808 | # | ||
| 809 | # CONFIG_ISO9660_FS is not set | ||
| 810 | # CONFIG_UDF_FS is not set | ||
| 811 | |||
| 812 | # | ||
| 813 | # DOS/FAT/NT Filesystems | ||
| 814 | # | ||
| 815 | # CONFIG_MSDOS_FS is not set | ||
| 816 | # CONFIG_VFAT_FS is not set | ||
| 817 | # CONFIG_NTFS_FS is not set | ||
| 818 | |||
| 819 | # | ||
| 820 | # Pseudo filesystems | ||
| 821 | # | ||
| 822 | CONFIG_PROC_FS=y | ||
| 823 | CONFIG_PROC_SYSCTL=y | ||
| 824 | CONFIG_SYSFS=y | ||
| 825 | CONFIG_TMPFS=y | ||
| 826 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
| 827 | # CONFIG_HUGETLB_PAGE is not set | ||
| 828 | CONFIG_RAMFS=y | ||
| 829 | # CONFIG_CONFIGFS_FS is not set | ||
| 830 | |||
| 831 | # | ||
| 832 | # Miscellaneous filesystems | ||
| 833 | # | ||
| 834 | # CONFIG_ADFS_FS is not set | ||
| 835 | # CONFIG_AFFS_FS is not set | ||
| 836 | # CONFIG_HFS_FS is not set | ||
| 837 | # CONFIG_HFSPLUS_FS is not set | ||
| 838 | # CONFIG_BEFS_FS is not set | ||
| 839 | # CONFIG_BFS_FS is not set | ||
| 840 | # CONFIG_EFS_FS is not set | ||
| 841 | CONFIG_JFFS2_FS=y | ||
| 842 | CONFIG_JFFS2_FS_DEBUG=0 | ||
| 843 | CONFIG_JFFS2_FS_WRITEBUFFER=y | ||
| 844 | # CONFIG_JFFS2_SUMMARY is not set | ||
| 845 | # CONFIG_JFFS2_FS_XATTR is not set | ||
| 846 | # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set | ||
| 847 | CONFIG_JFFS2_ZLIB=y | ||
| 848 | CONFIG_JFFS2_RTIME=y | ||
| 849 | # CONFIG_JFFS2_RUBIN is not set | ||
| 850 | CONFIG_CRAMFS=y | ||
| 851 | # CONFIG_VXFS_FS is not set | ||
| 852 | # CONFIG_HPFS_FS is not set | ||
| 853 | # CONFIG_QNX4FS_FS is not set | ||
| 854 | # CONFIG_SYSV_FS is not set | ||
| 855 | # CONFIG_UFS_FS is not set | ||
| 856 | |||
| 857 | # | ||
| 858 | # Network File Systems | ||
| 859 | # | ||
| 860 | CONFIG_NFS_FS=y | ||
| 861 | CONFIG_NFS_V3=y | ||
| 862 | # CONFIG_NFS_V3_ACL is not set | ||
| 863 | # CONFIG_NFS_V4 is not set | ||
| 864 | # CONFIG_NFS_DIRECTIO is not set | ||
| 865 | # CONFIG_NFSD is not set | ||
| 866 | CONFIG_ROOT_NFS=y | ||
| 867 | CONFIG_LOCKD=y | ||
| 868 | CONFIG_LOCKD_V4=y | ||
| 869 | CONFIG_NFS_COMMON=y | ||
| 870 | CONFIG_SUNRPC=y | ||
| 871 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 872 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
| 873 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
| 874 | # CONFIG_SMB_FS is not set | ||
| 875 | # CONFIG_CIFS is not set | ||
| 876 | # CONFIG_NCP_FS is not set | ||
| 877 | # CONFIG_CODA_FS is not set | ||
| 878 | # CONFIG_AFS_FS is not set | ||
| 879 | |||
| 880 | # | ||
| 881 | # Partition Types | ||
| 882 | # | ||
| 883 | # CONFIG_PARTITION_ADVANCED is not set | ||
| 884 | CONFIG_MSDOS_PARTITION=y | ||
| 885 | |||
| 886 | # | ||
| 887 | # Native Language Support | ||
| 888 | # | ||
| 889 | # CONFIG_NLS is not set | ||
| 890 | |||
| 891 | # | ||
| 892 | # Distributed Lock Manager | ||
| 893 | # | ||
| 894 | # CONFIG_DLM is not set | ||
| 895 | |||
| 896 | # | ||
| 897 | # Profiling support | ||
| 898 | # | ||
| 899 | # CONFIG_PROFILING is not set | ||
| 900 | |||
| 901 | # | ||
| 902 | # Kernel hacking | ||
| 903 | # | ||
| 904 | # CONFIG_PRINTK_TIME is not set | ||
| 905 | CONFIG_ENABLE_MUST_CHECK=y | ||
| 906 | # CONFIG_MAGIC_SYSRQ is not set | ||
| 907 | # CONFIG_UNUSED_SYMBOLS is not set | ||
| 908 | # CONFIG_DEBUG_FS is not set | ||
| 909 | # CONFIG_HEADERS_CHECK is not set | ||
| 910 | CONFIG_DEBUG_KERNEL=y | ||
| 911 | # CONFIG_DEBUG_SHIRQ is not set | ||
| 912 | CONFIG_DETECT_SOFTLOCKUP=y | ||
| 913 | CONFIG_SCHED_DEBUG=y | ||
| 914 | # CONFIG_SCHEDSTATS is not set | ||
| 915 | # CONFIG_TIMER_STATS is not set | ||
| 916 | # CONFIG_DEBUG_SLAB is not set | ||
| 917 | CONFIG_DEBUG_PREEMPT=y | ||
| 918 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
| 919 | # CONFIG_RT_MUTEX_TESTER is not set | ||
| 920 | CONFIG_DEBUG_SPINLOCK=y | ||
| 921 | CONFIG_DEBUG_MUTEXES=y | ||
| 922 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
| 923 | # CONFIG_PROVE_LOCKING is not set | ||
| 924 | # CONFIG_LOCK_STAT is not set | ||
| 925 | CONFIG_DEBUG_SPINLOCK_SLEEP=y | ||
| 926 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
| 927 | # CONFIG_DEBUG_KOBJECT is not set | ||
| 928 | CONFIG_DEBUG_BUGVERBOSE=y | ||
| 929 | # CONFIG_DEBUG_INFO is not set | ||
| 930 | # CONFIG_DEBUG_VM is not set | ||
| 931 | # CONFIG_DEBUG_LIST is not set | ||
| 932 | CONFIG_FRAME_POINTER=y | ||
| 933 | CONFIG_FORCED_INLINING=y | ||
| 934 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 935 | # CONFIG_FAULT_INJECTION is not set | ||
| 936 | # CONFIG_DEBUG_USER is not set | ||
| 937 | # CONFIG_DEBUG_ERRORS is not set | ||
| 938 | # CONFIG_DEBUG_LL is not set | ||
| 939 | |||
| 940 | # | ||
| 941 | # Security options | ||
| 942 | # | ||
| 943 | # CONFIG_KEYS is not set | ||
| 944 | # CONFIG_SECURITY is not set | ||
| 945 | # CONFIG_CRYPTO is not set | ||
| 946 | |||
| 947 | # | ||
| 948 | # Library routines | ||
| 949 | # | ||
| 950 | CONFIG_BITREVERSE=y | ||
| 951 | CONFIG_CRC_CCITT=y | ||
| 952 | # CONFIG_CRC16 is not set | ||
| 953 | # CONFIG_CRC_ITU_T is not set | ||
| 954 | CONFIG_CRC32=y | ||
| 955 | # CONFIG_CRC7 is not set | ||
| 956 | CONFIG_LIBCRC32C=y | ||
| 957 | CONFIG_ZLIB_INFLATE=y | ||
| 958 | CONFIG_ZLIB_DEFLATE=y | ||
| 959 | CONFIG_PLIST=y | ||
| 960 | CONFIG_HAS_IOMEM=y | ||
| 961 | CONFIG_HAS_IOPORT=y | ||
| 962 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/arm/configs/omap_generic_1510_defconfig b/arch/arm/configs/omap_generic_1510_defconfig new file mode 100644 index 000000000000..4b1c252f2091 --- /dev/null +++ b/arch/arm/configs/omap_generic_1510_defconfig | |||
| @@ -0,0 +1,1172 @@ | |||
| 1 | # | ||
| 2 | # Automatically generated make config: don't edit | ||
| 3 | # Linux kernel version: 2.6.23-rc6-omap1 | ||
| 4 | # Tue Sep 18 12:20:19 2007 | ||
| 5 | # | ||
| 6 | CONFIG_ARM=y | ||
| 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | ||
| 8 | CONFIG_GENERIC_GPIO=y | ||
| 9 | CONFIG_GENERIC_TIME=y | ||
| 10 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 11 | CONFIG_MMU=y | ||
| 12 | # CONFIG_NO_IOPORT is not set | ||
| 13 | CONFIG_GENERIC_HARDIRQS=y | ||
| 14 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 15 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 16 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
| 17 | CONFIG_HARDIRQS_SW_RESEND=y | ||
| 18 | CONFIG_GENERIC_IRQ_PROBE=y | ||
| 19 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
| 20 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
| 21 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
| 22 | CONFIG_GENERIC_HWEIGHT=y | ||
| 23 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
| 24 | CONFIG_ZONE_DMA=y | ||
| 25 | CONFIG_VECTORS_BASE=0xffff0000 | ||
| 26 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
| 27 | |||
| 28 | # | ||
| 29 | # General setup | ||
| 30 | # | ||
| 31 | CONFIG_EXPERIMENTAL=y | ||
| 32 | CONFIG_BROKEN_ON_SMP=y | ||
| 33 | CONFIG_LOCK_KERNEL=y | ||
| 34 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 35 | CONFIG_LOCALVERSION="" | ||
| 36 | CONFIG_LOCALVERSION_AUTO=y | ||
| 37 | CONFIG_SWAP=y | ||
| 38 | CONFIG_SYSVIPC=y | ||
| 39 | CONFIG_SYSVIPC_SYSCTL=y | ||
| 40 | # CONFIG_POSIX_MQUEUE is not set | ||
| 41 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 42 | # CONFIG_TASKSTATS is not set | ||
| 43 | # CONFIG_USER_NS is not set | ||
| 44 | # CONFIG_AUDIT is not set | ||
| 45 | # CONFIG_IKCONFIG is not set | ||
| 46 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 47 | CONFIG_SYSFS_DEPRECATED=y | ||
| 48 | # CONFIG_RELAY is not set | ||
| 49 | CONFIG_BLK_DEV_INITRD=y | ||
| 50 | CONFIG_INITRAMFS_SOURCE="" | ||
| 51 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
| 52 | CONFIG_SYSCTL=y | ||
| 53 | # CONFIG_EMBEDDED is not set | ||
| 54 | CONFIG_UID16=y | ||
| 55 | CONFIG_SYSCTL_SYSCALL=y | ||
| 56 | CONFIG_KALLSYMS=y | ||
| 57 | # CONFIG_KALLSYMS_ALL is not set | ||
| 58 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 59 | CONFIG_HOTPLUG=y | ||
| 60 | CONFIG_PRINTK=y | ||
| 61 | CONFIG_BUG=y | ||
| 62 | CONFIG_ELF_CORE=y | ||
| 63 | CONFIG_BASE_FULL=y | ||
| 64 | CONFIG_FUTEX=y | ||
| 65 | CONFIG_ANON_INODES=y | ||
| 66 | CONFIG_EPOLL=y | ||
| 67 | CONFIG_SIGNALFD=y | ||
| 68 | CONFIG_TIMERFD=y | ||
| 69 | CONFIG_EVENTFD=y | ||
| 70 | CONFIG_SHMEM=y | ||
| 71 | CONFIG_VM_EVENT_COUNTERS=y | ||
| 72 | CONFIG_SLAB=y | ||
| 73 | # CONFIG_SLUB is not set | ||
| 74 | # CONFIG_SLOB is not set | ||
| 75 | CONFIG_RT_MUTEXES=y | ||
| 76 | # CONFIG_TINY_SHMEM is not set | ||
| 77 | CONFIG_BASE_SMALL=0 | ||
| 78 | CONFIG_MODULES=y | ||
| 79 | CONFIG_MODULE_UNLOAD=y | ||
| 80 | CONFIG_MODULE_FORCE_UNLOAD=y | ||
| 81 | # CONFIG_MODVERSIONS is not set | ||
| 82 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 83 | CONFIG_KMOD=y | ||
| 84 | CONFIG_BLOCK=y | ||
| 85 | # CONFIG_LBD is not set | ||
| 86 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 87 | # CONFIG_LSF is not set | ||
| 88 | # CONFIG_BLK_DEV_BSG is not set | ||
| 89 | |||
| 90 | # | ||
| 91 | # IO Schedulers | ||
| 92 | # | ||
| 93 | CONFIG_IOSCHED_NOOP=y | ||
| 94 | CONFIG_IOSCHED_AS=y | ||
| 95 | CONFIG_IOSCHED_DEADLINE=y | ||
| 96 | CONFIG_IOSCHED_CFQ=y | ||
| 97 | # CONFIG_DEFAULT_AS is not set | ||
| 98 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 99 | CONFIG_DEFAULT_CFQ=y | ||
| 100 | # CONFIG_DEFAULT_NOOP is not set | ||
| 101 | CONFIG_DEFAULT_IOSCHED="cfq" | ||
| 102 | |||
| 103 | # | ||
| 104 | # System Type | ||
| 105 | # | ||
| 106 | # CONFIG_ARCH_AAEC2000 is not set | ||
| 107 | # CONFIG_ARCH_INTEGRATOR is not set | ||
| 108 | # CONFIG_ARCH_REALVIEW is not set | ||
| 109 | # CONFIG_ARCH_VERSATILE is not set | ||
| 110 | # CONFIG_ARCH_AT91 is not set | ||
| 111 | # CONFIG_ARCH_CLPS7500 is not set | ||
| 112 | # CONFIG_ARCH_CLPS711X is not set | ||
| 113 | # CONFIG_ARCH_CO285 is not set | ||
| 114 | # CONFIG_ARCH_EBSA110 is not set | ||
| 115 | # CONFIG_ARCH_EP93XX is not set | ||
| 116 | # CONFIG_ARCH_FOOTBRIDGE is not set | ||
| 117 | # CONFIG_ARCH_NETX is not set | ||
| 118 | # CONFIG_ARCH_H720X is not set | ||
| 119 | # CONFIG_ARCH_IMX is not set | ||
| 120 | # CONFIG_ARCH_IOP13XX is not set | ||
| 121 | # CONFIG_ARCH_IOP32X is not set | ||
| 122 | # CONFIG_ARCH_IOP33X is not set | ||
| 123 | # CONFIG_ARCH_IXP23XX is not set | ||
| 124 | # CONFIG_ARCH_IXP2000 is not set | ||
| 125 | # CONFIG_ARCH_IXP4XX is not set | ||
| 126 | # CONFIG_ARCH_L7200 is not set | ||
| 127 | # CONFIG_ARCH_KS8695 is not set | ||
| 128 | # CONFIG_ARCH_NS9XXX is not set | ||
| 129 | # CONFIG_ARCH_MXC is not set | ||
| 130 | # CONFIG_ARCH_PNX4008 is not set | ||
| 131 | # CONFIG_ARCH_PXA is not set | ||
| 132 | # CONFIG_ARCH_RPC is not set | ||
| 133 | # CONFIG_ARCH_SA1100 is not set | ||
| 134 | # CONFIG_ARCH_S3C2410 is not set | ||
| 135 | # CONFIG_ARCH_SHARK is not set | ||
| 136 | # CONFIG_ARCH_LH7A40X is not set | ||
| 137 | # CONFIG_ARCH_DAVINCI is not set | ||
| 138 | CONFIG_ARCH_OMAP=y | ||
| 139 | |||
| 140 | # | ||
| 141 | # TI OMAP Implementations | ||
| 142 | # | ||
| 143 | CONFIG_ARCH_OMAP1=y | ||
| 144 | # CONFIG_ARCH_OMAP2 is not set | ||
| 145 | # CONFIG_ARCH_OMAP3 is not set | ||
| 146 | |||
| 147 | # | ||
| 148 | # OMAP Feature Selections | ||
| 149 | # | ||
| 150 | # CONFIG_OMAP_RESET_CLOCKS is not set | ||
| 151 | # CONFIG_OMAP_BOOT_TAG is not set | ||
| 152 | # CONFIG_OMAP_GPIO_SWITCH is not set | ||
| 153 | CONFIG_OMAP_MUX=y | ||
| 154 | # CONFIG_OMAP_MUX_DEBUG is not set | ||
| 155 | CONFIG_OMAP_MUX_WARNINGS=y | ||
| 156 | CONFIG_OMAP_MCBSP=y | ||
| 157 | # CONFIG_OMAP_MMU_FWK is not set | ||
| 158 | # CONFIG_OMAP_MBOX_FWK is not set | ||
| 159 | CONFIG_OMAP_MPU_TIMER=y | ||
| 160 | # CONFIG_OMAP_32K_TIMER is not set | ||
| 161 | CONFIG_OMAP_LL_DEBUG_UART1=y | ||
| 162 | # CONFIG_OMAP_LL_DEBUG_UART2 is not set | ||
| 163 | # CONFIG_OMAP_LL_DEBUG_UART3 is not set | ||
| 164 | CONFIG_OMAP_SERIAL_WAKE=y | ||
| 165 | # CONFIG_OMAP_DSP is not set | ||
| 166 | |||
| 167 | # | ||
| 168 | # OMAP Core Type | ||
| 169 | # | ||
| 170 | # CONFIG_ARCH_OMAP730 is not set | ||
| 171 | CONFIG_ARCH_OMAP15XX=y | ||
| 172 | # CONFIG_ARCH_OMAP16XX is not set | ||
| 173 | |||
| 174 | # | ||
| 175 | # OMAP Board Type | ||
| 176 | # | ||
| 177 | # CONFIG_MACH_OMAP_INNOVATOR is not set | ||
| 178 | # CONFIG_MACH_VOICEBLUE is not set | ||
| 179 | # CONFIG_MACH_OMAP_PALMTE is not set | ||
| 180 | # CONFIG_MACH_OMAP_PALMZ71 is not set | ||
| 181 | # CONFIG_MACH_OMAP_PALMTT is not set | ||
| 182 | # CONFIG_MACH_SX1 is not set | ||
| 183 | # CONFIG_MACH_AMS_DELTA is not set | ||
| 184 | CONFIG_MACH_OMAP_GENERIC=y | ||
| 185 | |||
| 186 | # | ||
| 187 | # OMAP CPU Speed | ||
| 188 | # | ||
| 189 | # CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER is not set | ||
| 190 | CONFIG_OMAP_ARM_168MHZ=y | ||
| 191 | # CONFIG_OMAP_ARM_150MHZ is not set | ||
| 192 | # CONFIG_OMAP_ARM_120MHZ is not set | ||
| 193 | # CONFIG_OMAP_ARM_60MHZ is not set | ||
| 194 | # CONFIG_OMAP_ARM_30MHZ is not set | ||
| 195 | # CONFIG_MACH_OMAP_APOLLON_PLUS is not set | ||
| 196 | |||
| 197 | # | ||
| 198 | # Boot options | ||
| 199 | # | ||
| 200 | |||
| 201 | # | ||
| 202 | # Power management | ||
| 203 | # | ||
| 204 | |||
| 205 | # | ||
| 206 | # Processor Type | ||
| 207 | # | ||
| 208 | CONFIG_CPU_32=y | ||
| 209 | CONFIG_CPU_ARM925T=y | ||
| 210 | CONFIG_CPU_32v4T=y | ||
| 211 | CONFIG_CPU_ABRT_EV4T=y | ||
| 212 | CONFIG_CPU_PABRT_NOIFAR=y | ||
| 213 | CONFIG_CPU_CACHE_V4WT=y | ||
| 214 | CONFIG_CPU_CACHE_VIVT=y | ||
| 215 | CONFIG_CPU_COPY_V4WB=y | ||
| 216 | CONFIG_CPU_TLB_V4WBI=y | ||
| 217 | CONFIG_CPU_CP15=y | ||
| 218 | CONFIG_CPU_CP15_MMU=y | ||
| 219 | |||
| 220 | # | ||
| 221 | # Processor Features | ||
| 222 | # | ||
| 223 | # CONFIG_ARM_THUMB is not set | ||
| 224 | # CONFIG_CPU_ICACHE_DISABLE is not set | ||
| 225 | # CONFIG_CPU_DCACHE_DISABLE is not set | ||
| 226 | CONFIG_CPU_DCACHE_WRITETHROUGH=y | ||
| 227 | # CONFIG_OUTER_CACHE is not set | ||
| 228 | |||
| 229 | # | ||
| 230 | # Bus support | ||
| 231 | # | ||
| 232 | # CONFIG_PCI_SYSCALL is not set | ||
| 233 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 234 | |||
| 235 | # | ||
| 236 | # PCCARD (PCMCIA/CardBus) support | ||
| 237 | # | ||
| 238 | # CONFIG_PCCARD is not set | ||
| 239 | |||
| 240 | # | ||
| 241 | # Kernel Features | ||
| 242 | # | ||
| 243 | # CONFIG_TICK_ONESHOT is not set | ||
| 244 | # CONFIG_NO_HZ is not set | ||
| 245 | # CONFIG_HIGH_RES_TIMERS is not set | ||
| 246 | CONFIG_PREEMPT=y | ||
| 247 | CONFIG_HZ=100 | ||
| 248 | # CONFIG_AEABI is not set | ||
| 249 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | ||
| 250 | CONFIG_SELECT_MEMORY_MODEL=y | ||
| 251 | CONFIG_FLATMEM_MANUAL=y | ||
| 252 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
| 253 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
| 254 | CONFIG_FLATMEM=y | ||
| 255 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
| 256 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 257 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | ||
| 258 | # CONFIG_RESOURCES_64BIT is not set | ||
| 259 | CONFIG_ZONE_DMA_FLAG=1 | ||
| 260 | CONFIG_BOUNCE=y | ||
| 261 | CONFIG_VIRT_TO_BUS=y | ||
| 262 | # CONFIG_LEDS is not set | ||
| 263 | CONFIG_ALIGNMENT_TRAP=y | ||
| 264 | |||
| 265 | # | ||
| 266 | # Boot options | ||
| 267 | # | ||
| 268 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
| 269 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
| 270 | CONFIG_CMDLINE="mem=64M console=ttyS2,115200 root=0803 ro init=/bin/sh" | ||
| 271 | # CONFIG_XIP_KERNEL is not set | ||
| 272 | # CONFIG_KEXEC is not set | ||
| 273 | |||
| 274 | # | ||
| 275 | # CPU Frequency scaling | ||
| 276 | # | ||
| 277 | # CONFIG_CPU_FREQ is not set | ||
| 278 | |||
| 279 | # | ||
| 280 | # Floating point emulation | ||
| 281 | # | ||
| 282 | |||
| 283 | # | ||
| 284 | # At least one emulation must be selected | ||
| 285 | # | ||
| 286 | CONFIG_FPE_NWFPE=y | ||
| 287 | # CONFIG_FPE_NWFPE_XP is not set | ||
| 288 | # CONFIG_FPE_FASTFPE is not set | ||
| 289 | |||
| 290 | # | ||
| 291 | # Userspace binary formats | ||
| 292 | # | ||
| 293 | CONFIG_BINFMT_ELF=y | ||
| 294 | # CONFIG_BINFMT_AOUT is not set | ||
| 295 | # CONFIG_BINFMT_MISC is not set | ||
| 296 | # CONFIG_ARTHUR is not set | ||
| 297 | |||
| 298 | # | ||
| 299 | # Power management options | ||
| 300 | # | ||
| 301 | CONFIG_PM=y | ||
| 302 | # CONFIG_PM_LEGACY is not set | ||
| 303 | # CONFIG_PM_DEBUG is not set | ||
| 304 | CONFIG_PM_SLEEP=y | ||
| 305 | CONFIG_SUSPEND_UP_POSSIBLE=y | ||
| 306 | CONFIG_SUSPEND=y | ||
| 307 | # CONFIG_APM_EMULATION is not set | ||
| 308 | |||
| 309 | # | ||
| 310 | # Networking | ||
| 311 | # | ||
| 312 | CONFIG_NET=y | ||
| 313 | |||
| 314 | # | ||
| 315 | # Networking options | ||
| 316 | # | ||
| 317 | CONFIG_PACKET=y | ||
| 318 | # CONFIG_PACKET_MMAP is not set | ||
| 319 | CONFIG_UNIX=y | ||
| 320 | CONFIG_XFRM=y | ||
| 321 | # CONFIG_XFRM_USER is not set | ||
| 322 | # CONFIG_XFRM_SUB_POLICY is not set | ||
| 323 | # CONFIG_XFRM_MIGRATE is not set | ||
| 324 | # CONFIG_NET_KEY is not set | ||
| 325 | CONFIG_INET=y | ||
| 326 | CONFIG_IP_MULTICAST=y | ||
| 327 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
| 328 | CONFIG_IP_FIB_HASH=y | ||
| 329 | CONFIG_IP_PNP=y | ||
| 330 | CONFIG_IP_PNP_DHCP=y | ||
| 331 | CONFIG_IP_PNP_BOOTP=y | ||
| 332 | # CONFIG_IP_PNP_RARP is not set | ||
| 333 | # CONFIG_NET_IPIP is not set | ||
| 334 | # CONFIG_NET_IPGRE is not set | ||
| 335 | # CONFIG_IP_MROUTE is not set | ||
| 336 | # CONFIG_ARPD is not set | ||
| 337 | # CONFIG_SYN_COOKIES is not set | ||
| 338 | # CONFIG_INET_AH is not set | ||
| 339 | # CONFIG_INET_ESP is not set | ||
| 340 | # CONFIG_INET_IPCOMP is not set | ||
| 341 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
| 342 | # CONFIG_INET_TUNNEL is not set | ||
| 343 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | ||
| 344 | CONFIG_INET_XFRM_MODE_TUNNEL=y | ||
| 345 | CONFIG_INET_XFRM_MODE_BEET=y | ||
| 346 | CONFIG_INET_DIAG=y | ||
| 347 | CONFIG_INET_TCP_DIAG=y | ||
| 348 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
| 349 | CONFIG_TCP_CONG_CUBIC=y | ||
| 350 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
| 351 | # CONFIG_TCP_MD5SIG is not set | ||
| 352 | # CONFIG_IPV6 is not set | ||
| 353 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 354 | # CONFIG_INET6_TUNNEL is not set | ||
| 355 | # CONFIG_NETWORK_SECMARK is not set | ||
| 356 | # CONFIG_NETFILTER is not set | ||
| 357 | # CONFIG_IP_DCCP is not set | ||
| 358 | # CONFIG_IP_SCTP is not set | ||
| 359 | # CONFIG_TIPC is not set | ||
| 360 | # CONFIG_ATM is not set | ||
| 361 | # CONFIG_BRIDGE is not set | ||
| 362 | # CONFIG_VLAN_8021Q is not set | ||
| 363 | # CONFIG_DECNET is not set | ||
| 364 | # CONFIG_LLC2 is not set | ||
| 365 | # CONFIG_IPX is not set | ||
| 366 | # CONFIG_ATALK is not set | ||
| 367 | # CONFIG_X25 is not set | ||
| 368 | # CONFIG_LAPB is not set | ||
| 369 | # CONFIG_ECONET is not set | ||
| 370 | # CONFIG_WAN_ROUTER is not set | ||
| 371 | |||
| 372 | # | ||
| 373 | # QoS and/or fair queueing | ||
| 374 | # | ||
| 375 | # CONFIG_NET_SCHED is not set | ||
| 376 | |||
| 377 | # | ||
| 378 | # Network testing | ||
| 379 | # | ||
| 380 | # CONFIG_NET_PKTGEN is not set | ||
| 381 | # CONFIG_HAMRADIO is not set | ||
| 382 | # CONFIG_IRDA is not set | ||
| 383 | # CONFIG_BT is not set | ||
| 384 | # CONFIG_AF_RXRPC is not set | ||
| 385 | |||
| 386 | # | ||
| 387 | # Wireless | ||
| 388 | # | ||
| 389 | # CONFIG_CFG80211 is not set | ||
| 390 | # CONFIG_WIRELESS_EXT is not set | ||
| 391 | # CONFIG_MAC80211 is not set | ||
| 392 | # CONFIG_IEEE80211 is not set | ||
| 393 | # CONFIG_RFKILL is not set | ||
| 394 | # CONFIG_NET_9P is not set | ||
| 395 | |||
| 396 | # | ||
| 397 | # Device Drivers | ||
| 398 | # | ||
| 399 | |||
| 400 | # | ||
| 401 | # Generic Driver Options | ||
| 402 | # | ||
| 403 | CONFIG_STANDALONE=y | ||
| 404 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
| 405 | # CONFIG_FW_LOADER is not set | ||
| 406 | # CONFIG_DEBUG_DRIVER is not set | ||
| 407 | # CONFIG_DEBUG_DEVRES is not set | ||
| 408 | # CONFIG_SYS_HYPERVISOR is not set | ||
| 409 | # CONFIG_CONNECTOR is not set | ||
| 410 | # CONFIG_MTD is not set | ||
| 411 | # CONFIG_PARPORT is not set | ||
| 412 | CONFIG_BLK_DEV=y | ||
| 413 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
| 414 | CONFIG_BLK_DEV_LOOP=y | ||
| 415 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | ||
| 416 | # CONFIG_BLK_DEV_NBD is not set | ||
| 417 | # CONFIG_BLK_DEV_UB is not set | ||
| 418 | CONFIG_BLK_DEV_RAM=y | ||
| 419 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
| 420 | CONFIG_BLK_DEV_RAM_SIZE=8192 | ||
| 421 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | ||
| 422 | # CONFIG_CDROM_PKTCDVD is not set | ||
| 423 | # CONFIG_ATA_OVER_ETH is not set | ||
| 424 | |||
| 425 | # | ||
| 426 | # SCSI device support | ||
| 427 | # | ||
| 428 | # CONFIG_RAID_ATTRS is not set | ||
| 429 | CONFIG_SCSI=y | ||
| 430 | CONFIG_SCSI_DMA=y | ||
| 431 | # CONFIG_SCSI_TGT is not set | ||
| 432 | # CONFIG_SCSI_NETLINK is not set | ||
| 433 | CONFIG_SCSI_PROC_FS=y | ||
| 434 | |||
| 435 | # | ||
| 436 | # SCSI support type (disk, tape, CD-ROM) | ||
| 437 | # | ||
| 438 | CONFIG_BLK_DEV_SD=y | ||
| 439 | # CONFIG_CHR_DEV_ST is not set | ||
| 440 | # CONFIG_CHR_DEV_OSST is not set | ||
| 441 | CONFIG_BLK_DEV_SR=y | ||
| 442 | # CONFIG_BLK_DEV_SR_VENDOR is not set | ||
| 443 | CONFIG_CHR_DEV_SG=y | ||
| 444 | # CONFIG_CHR_DEV_SCH is not set | ||
| 445 | |||
| 446 | # | ||
| 447 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
| 448 | # | ||
| 449 | CONFIG_SCSI_MULTI_LUN=y | ||
| 450 | # CONFIG_SCSI_CONSTANTS is not set | ||
| 451 | # CONFIG_SCSI_LOGGING is not set | ||
| 452 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
| 453 | CONFIG_SCSI_WAIT_SCAN=m | ||
| 454 | |||
| 455 | # | ||
| 456 | # SCSI Transports | ||
| 457 | # | ||
| 458 | # CONFIG_SCSI_SPI_ATTRS is not set | ||
| 459 | # CONFIG_SCSI_FC_ATTRS is not set | ||
| 460 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
| 461 | # CONFIG_SCSI_SAS_LIBSAS is not set | ||
| 462 | CONFIG_SCSI_LOWLEVEL=y | ||
| 463 | # CONFIG_ISCSI_TCP is not set | ||
| 464 | # CONFIG_SCSI_DEBUG is not set | ||
| 465 | # CONFIG_ATA is not set | ||
| 466 | # CONFIG_MD is not set | ||
| 467 | CONFIG_NETDEVICES=y | ||
| 468 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 469 | # CONFIG_DUMMY is not set | ||
| 470 | # CONFIG_BONDING is not set | ||
| 471 | # CONFIG_MACVLAN is not set | ||
| 472 | # CONFIG_EQUALIZER is not set | ||
| 473 | # CONFIG_TUN is not set | ||
| 474 | # CONFIG_PHYLIB is not set | ||
| 475 | CONFIG_NET_ETHERNET=y | ||
| 476 | CONFIG_MII=y | ||
| 477 | # CONFIG_AX88796 is not set | ||
| 478 | # CONFIG_SMC91X is not set | ||
| 479 | # CONFIG_DM9000 is not set | ||
| 480 | CONFIG_NETDEV_1000=y | ||
| 481 | CONFIG_NETDEV_10000=y | ||
| 482 | |||
| 483 | # | ||
| 484 | # Wireless LAN | ||
| 485 | # | ||
| 486 | # CONFIG_WLAN_PRE80211 is not set | ||
| 487 | # CONFIG_WLAN_80211 is not set | ||
| 488 | |||
| 489 | # | ||
| 490 | # USB Network Adapters | ||
| 491 | # | ||
| 492 | # CONFIG_USB_CATC is not set | ||
| 493 | # CONFIG_USB_KAWETH is not set | ||
| 494 | # CONFIG_USB_PEGASUS is not set | ||
| 495 | CONFIG_USB_RTL8150=y | ||
| 496 | CONFIG_USB_USBNET_MII=y | ||
| 497 | CONFIG_USB_USBNET=y | ||
| 498 | CONFIG_USB_NET_AX8817X=y | ||
| 499 | CONFIG_USB_NET_CDCETHER=y | ||
| 500 | # CONFIG_USB_NET_DM9601 is not set | ||
| 501 | # CONFIG_USB_NET_GL620A is not set | ||
| 502 | CONFIG_USB_NET_NET1080=y | ||
| 503 | # CONFIG_USB_NET_PLUSB is not set | ||
| 504 | # CONFIG_USB_NET_MCS7830 is not set | ||
| 505 | # CONFIG_USB_NET_RNDIS_HOST is not set | ||
| 506 | CONFIG_USB_NET_CDC_SUBSET=y | ||
| 507 | # CONFIG_USB_ALI_M5632 is not set | ||
| 508 | CONFIG_USB_AN2720=y | ||
| 509 | CONFIG_USB_BELKIN=y | ||
| 510 | CONFIG_USB_ARMLINUX=y | ||
| 511 | CONFIG_USB_EPSON2888=y | ||
| 512 | # CONFIG_USB_KC2190 is not set | ||
| 513 | CONFIG_USB_NET_ZAURUS=y | ||
| 514 | # CONFIG_WAN is not set | ||
| 515 | CONFIG_PPP=y | ||
| 516 | CONFIG_PPP_MULTILINK=y | ||
| 517 | # CONFIG_PPP_FILTER is not set | ||
| 518 | # CONFIG_PPP_ASYNC is not set | ||
| 519 | # CONFIG_PPP_SYNC_TTY is not set | ||
| 520 | # CONFIG_PPP_DEFLATE is not set | ||
| 521 | # CONFIG_PPP_BSDCOMP is not set | ||
| 522 | # CONFIG_PPP_MPPE is not set | ||
| 523 | # CONFIG_PPPOE is not set | ||
| 524 | # CONFIG_PPPOL2TP is not set | ||
| 525 | # CONFIG_SLIP is not set | ||
| 526 | CONFIG_SLHC=y | ||
| 527 | # CONFIG_SHAPER is not set | ||
| 528 | # CONFIG_NETCONSOLE is not set | ||
| 529 | # CONFIG_NETPOLL is not set | ||
| 530 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
| 531 | # CONFIG_ISDN is not set | ||
| 532 | |||
| 533 | # | ||
| 534 | # Input device support | ||
| 535 | # | ||
| 536 | CONFIG_INPUT=y | ||
| 537 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
| 538 | # CONFIG_INPUT_POLLDEV is not set | ||
| 539 | |||
| 540 | # | ||
| 541 | # Userland interfaces | ||
| 542 | # | ||
| 543 | CONFIG_INPUT_MOUSEDEV=y | ||
| 544 | CONFIG_INPUT_MOUSEDEV_PSAUX=y | ||
| 545 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | ||
| 546 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | ||
| 547 | # CONFIG_INPUT_JOYDEV is not set | ||
| 548 | # CONFIG_INPUT_TSDEV is not set | ||
| 549 | # CONFIG_INPUT_EVDEV is not set | ||
| 550 | # CONFIG_INPUT_EVBUG is not set | ||
| 551 | |||
| 552 | # | ||
| 553 | # Input Device Drivers | ||
| 554 | # | ||
| 555 | CONFIG_INPUT_KEYBOARD=y | ||
| 556 | CONFIG_KEYBOARD_ATKBD=y | ||
| 557 | # CONFIG_KEYBOARD_SUNKBD is not set | ||
| 558 | # CONFIG_KEYBOARD_LKKBD is not set | ||
| 559 | # CONFIG_KEYBOARD_XTKBD is not set | ||
| 560 | # CONFIG_KEYBOARD_NEWTON is not set | ||
| 561 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
| 562 | CONFIG_KEYBOARD_OMAP=y | ||
| 563 | # CONFIG_KEYBOARD_GPIO is not set | ||
| 564 | # CONFIG_INPUT_MOUSE is not set | ||
| 565 | # CONFIG_INPUT_JOYSTICK is not set | ||
| 566 | # CONFIG_INPUT_TABLET is not set | ||
| 567 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
| 568 | # CONFIG_INPUT_MISC is not set | ||
| 569 | |||
| 570 | # | ||
| 571 | # Hardware I/O ports | ||
| 572 | # | ||
| 573 | CONFIG_SERIO=y | ||
| 574 | CONFIG_SERIO_SERPORT=y | ||
| 575 | CONFIG_SERIO_LIBPS2=y | ||
| 576 | # CONFIG_SERIO_RAW is not set | ||
| 577 | # CONFIG_GAMEPORT is not set | ||
| 578 | |||
| 579 | # | ||
| 580 | # Character devices | ||
| 581 | # | ||
| 582 | CONFIG_VT=y | ||
| 583 | CONFIG_VT_CONSOLE=y | ||
| 584 | CONFIG_HW_CONSOLE=y | ||
| 585 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
| 586 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
| 587 | |||
| 588 | # | ||
| 589 | # Serial drivers | ||
| 590 | # | ||
| 591 | CONFIG_SERIAL_8250=y | ||
| 592 | CONFIG_SERIAL_8250_CONSOLE=y | ||
| 593 | CONFIG_SERIAL_8250_NR_UARTS=4 | ||
| 594 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | ||
| 595 | # CONFIG_SERIAL_8250_EXTENDED is not set | ||
| 596 | |||
| 597 | # | ||
| 598 | # Non-8250 serial port support | ||
| 599 | # | ||
| 600 | CONFIG_SERIAL_CORE=y | ||
| 601 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
| 602 | CONFIG_UNIX98_PTYS=y | ||
| 603 | # CONFIG_LEGACY_PTYS is not set | ||
| 604 | # CONFIG_IPMI_HANDLER is not set | ||
| 605 | # CONFIG_WATCHDOG is not set | ||
| 606 | CONFIG_HW_RANDOM=m | ||
| 607 | # CONFIG_NVRAM is not set | ||
| 608 | # CONFIG_R3964 is not set | ||
| 609 | # CONFIG_RAW_DRIVER is not set | ||
| 610 | # CONFIG_TCG_TPM is not set | ||
| 611 | CONFIG_I2C=y | ||
| 612 | CONFIG_I2C_BOARDINFO=y | ||
| 613 | CONFIG_I2C_CHARDEV=y | ||
| 614 | |||
| 615 | # | ||
| 616 | # I2C Algorithms | ||
| 617 | # | ||
| 618 | CONFIG_I2C_ALGOBIT=y | ||
| 619 | # CONFIG_I2C_ALGOPCF is not set | ||
| 620 | # CONFIG_I2C_ALGOPCA is not set | ||
| 621 | |||
| 622 | # | ||
| 623 | # I2C Hardware Bus support | ||
| 624 | # | ||
| 625 | # CONFIG_I2C_GPIO is not set | ||
| 626 | # CONFIG_I2C_OCORES is not set | ||
| 627 | # CONFIG_I2C_OMAP is not set | ||
| 628 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 629 | # CONFIG_I2C_SIMTEC is not set | ||
| 630 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 631 | # CONFIG_I2C_STUB is not set | ||
| 632 | # CONFIG_I2C_TINY_USB is not set | ||
| 633 | |||
| 634 | # | ||
| 635 | # Miscellaneous I2C Chip support | ||
| 636 | # | ||
| 637 | # CONFIG_SENSORS_DS1337 is not set | ||
| 638 | # CONFIG_SENSORS_DS1374 is not set | ||
| 639 | # CONFIG_DS1682 is not set | ||
| 640 | # CONFIG_SENSORS_EEPROM is not set | ||
| 641 | # CONFIG_SENSORS_PCF8574 is not set | ||
| 642 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 643 | # CONFIG_SENSORS_PCF8591 is not set | ||
| 644 | # CONFIG_TPS65010 is not set | ||
| 645 | # CONFIG_SENSORS_MAX6875 is not set | ||
| 646 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 647 | # CONFIG_I2C_DEBUG_CORE is not set | ||
| 648 | # CONFIG_I2C_DEBUG_ALGO is not set | ||
| 649 | # CONFIG_I2C_DEBUG_BUS is not set | ||
| 650 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 651 | |||
| 652 | # | ||
| 653 | # SPI support | ||
| 654 | # | ||
| 655 | # CONFIG_SPI is not set | ||
| 656 | # CONFIG_SPI_MASTER is not set | ||
| 657 | # CONFIG_W1 is not set | ||
| 658 | CONFIG_HWMON=y | ||
| 659 | # CONFIG_HWMON_VID is not set | ||
| 660 | # CONFIG_SENSORS_ABITUGURU is not set | ||
| 661 | # CONFIG_SENSORS_ABITUGURU3 is not set | ||
| 662 | # CONFIG_SENSORS_AD7418 is not set | ||
| 663 | # CONFIG_SENSORS_ADM1021 is not set | ||
| 664 | # CONFIG_SENSORS_ADM1025 is not set | ||
| 665 | # CONFIG_SENSORS_ADM1026 is not set | ||
| 666 | # CONFIG_SENSORS_ADM1029 is not set | ||
| 667 | # CONFIG_SENSORS_ADM1031 is not set | ||
| 668 | # CONFIG_SENSORS_ADM9240 is not set | ||
| 669 | # CONFIG_SENSORS_ASB100 is not set | ||
| 670 | # CONFIG_SENSORS_ATXP1 is not set | ||
| 671 | # CONFIG_SENSORS_DS1621 is not set | ||
| 672 | # CONFIG_SENSORS_F71805F is not set | ||
| 673 | # CONFIG_SENSORS_FSCHER is not set | ||
| 674 | # CONFIG_SENSORS_FSCPOS is not set | ||
| 675 | # CONFIG_SENSORS_GL518SM is not set | ||
| 676 | # CONFIG_SENSORS_GL520SM is not set | ||
| 677 | # CONFIG_SENSORS_IT87 is not set | ||
| 678 | # CONFIG_SENSORS_LM63 is not set | ||
| 679 | # CONFIG_SENSORS_LM75 is not set | ||
| 680 | # CONFIG_SENSORS_LM77 is not set | ||
| 681 | # CONFIG_SENSORS_LM78 is not set | ||
| 682 | # CONFIG_SENSORS_LM80 is not set | ||
| 683 | # CONFIG_SENSORS_LM83 is not set | ||
| 684 | # CONFIG_SENSORS_LM85 is not set | ||
| 685 | # CONFIG_SENSORS_LM87 is not set | ||
| 686 | # CONFIG_SENSORS_LM90 is not set | ||
| 687 | # CONFIG_SENSORS_LM92 is not set | ||
| 688 | # CONFIG_SENSORS_LM93 is not set | ||
| 689 | # CONFIG_SENSORS_MAX1619 is not set | ||
| 690 | # CONFIG_SENSORS_MAX6650 is not set | ||
| 691 | # CONFIG_SENSORS_PC87360 is not set | ||
| 692 | # CONFIG_SENSORS_PC87427 is not set | ||
| 693 | # CONFIG_SENSORS_DME1737 is not set | ||
| 694 | # CONFIG_SENSORS_SMSC47M1 is not set | ||
| 695 | # CONFIG_SENSORS_SMSC47M192 is not set | ||
| 696 | # CONFIG_SENSORS_SMSC47B397 is not set | ||
| 697 | # CONFIG_SENSORS_THMC50 is not set | ||
| 698 | # CONFIG_SENSORS_VT1211 is not set | ||
| 699 | # CONFIG_SENSORS_W83781D is not set | ||
| 700 | # CONFIG_SENSORS_W83791D is not set | ||
| 701 | # CONFIG_SENSORS_W83792D is not set | ||
| 702 | # CONFIG_SENSORS_W83793 is not set | ||
| 703 | # CONFIG_SENSORS_W83L785TS is not set | ||
| 704 | # CONFIG_SENSORS_W83627HF is not set | ||
| 705 | # CONFIG_SENSORS_W83627EHF is not set | ||
| 706 | # CONFIG_HWMON_DEBUG_CHIP is not set | ||
| 707 | CONFIG_MISC_DEVICES=y | ||
| 708 | # CONFIG_EEPROM_93CX6 is not set | ||
| 709 | |||
| 710 | # | ||
| 711 | # Multifunction device drivers | ||
| 712 | # | ||
| 713 | # CONFIG_MFD_SM501 is not set | ||
| 714 | # CONFIG_NEW_LEDS is not set | ||
| 715 | |||
| 716 | # | ||
| 717 | # Multimedia devices | ||
| 718 | # | ||
| 719 | # CONFIG_VIDEO_DEV is not set | ||
| 720 | # CONFIG_DVB_CORE is not set | ||
| 721 | CONFIG_DAB=y | ||
| 722 | # CONFIG_USB_DABUSB is not set | ||
| 723 | |||
| 724 | # | ||
| 725 | # Graphics support | ||
| 726 | # | ||
| 727 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 728 | |||
| 729 | # | ||
| 730 | # Display device support | ||
| 731 | # | ||
| 732 | # CONFIG_DISPLAY_SUPPORT is not set | ||
| 733 | # CONFIG_VGASTATE is not set | ||
| 734 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
| 735 | # CONFIG_FB is not set | ||
| 736 | |||
| 737 | # | ||
| 738 | # Console display driver support | ||
| 739 | # | ||
| 740 | # CONFIG_VGA_CONSOLE is not set | ||
| 741 | CONFIG_DUMMY_CONSOLE=y | ||
| 742 | |||
| 743 | # | ||
| 744 | # Sound | ||
| 745 | # | ||
| 746 | # CONFIG_SOUND is not set | ||
| 747 | CONFIG_HID_SUPPORT=y | ||
| 748 | CONFIG_HID=y | ||
| 749 | # CONFIG_HID_DEBUG is not set | ||
| 750 | |||
| 751 | # | ||
| 752 | # USB Input Devices | ||
| 753 | # | ||
| 754 | CONFIG_USB_HID=y | ||
| 755 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | ||
| 756 | # CONFIG_HID_FF is not set | ||
| 757 | # CONFIG_USB_HIDDEV is not set | ||
| 758 | CONFIG_USB_SUPPORT=y | ||
| 759 | CONFIG_USB_ARCH_HAS_HCD=y | ||
| 760 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
| 761 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
| 762 | CONFIG_USB=y | ||
| 763 | CONFIG_USB_DEBUG=y | ||
| 764 | |||
| 765 | # | ||
| 766 | # Miscellaneous USB options | ||
| 767 | # | ||
| 768 | CONFIG_USB_DEVICEFS=y | ||
| 769 | # CONFIG_USB_DEVICE_CLASS is not set | ||
| 770 | # CONFIG_USB_DYNAMIC_MINORS is not set | ||
| 771 | # CONFIG_USB_SUSPEND is not set | ||
| 772 | # CONFIG_USB_PERSIST is not set | ||
| 773 | # CONFIG_USB_OTG is not set | ||
| 774 | |||
| 775 | # | ||
| 776 | # USB Host Controller Drivers | ||
| 777 | # | ||
| 778 | # CONFIG_USB_ISP116X_HCD is not set | ||
| 779 | CONFIG_USB_OHCI_HCD=y | ||
| 780 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | ||
| 781 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | ||
| 782 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | ||
| 783 | # CONFIG_USB_SL811_HCD is not set | ||
| 784 | # CONFIG_USB_R8A66597_HCD is not set | ||
| 785 | # CONFIG_USB_MUSB_HDRC is not set | ||
| 786 | |||
| 787 | # | ||
| 788 | # USB Device Class drivers | ||
| 789 | # | ||
| 790 | # CONFIG_USB_ACM is not set | ||
| 791 | # CONFIG_USB_PRINTER is not set | ||
| 792 | |||
| 793 | # | ||
| 794 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
| 795 | # | ||
| 796 | |||
| 797 | # | ||
| 798 | # may also be needed; see USB_STORAGE Help for more information | ||
| 799 | # | ||
| 800 | CONFIG_USB_STORAGE=y | ||
| 801 | # CONFIG_USB_STORAGE_DEBUG is not set | ||
| 802 | CONFIG_USB_STORAGE_DATAFAB=y | ||
| 803 | CONFIG_USB_STORAGE_FREECOM=y | ||
| 804 | CONFIG_USB_STORAGE_DPCM=y | ||
| 805 | # CONFIG_USB_STORAGE_USBAT is not set | ||
| 806 | CONFIG_USB_STORAGE_SDDR09=y | ||
| 807 | CONFIG_USB_STORAGE_SDDR55=y | ||
| 808 | CONFIG_USB_STORAGE_JUMPSHOT=y | ||
| 809 | # CONFIG_USB_STORAGE_ALAUDA is not set | ||
| 810 | # CONFIG_USB_STORAGE_KARMA is not set | ||
| 811 | # CONFIG_USB_LIBUSUAL is not set | ||
| 812 | |||
| 813 | # | ||
| 814 | # USB Imaging devices | ||
| 815 | # | ||
| 816 | # CONFIG_USB_MDC800 is not set | ||
| 817 | # CONFIG_USB_MICROTEK is not set | ||
| 818 | CONFIG_USB_MON=y | ||
| 819 | |||
| 820 | # | ||
| 821 | # USB port drivers | ||
| 822 | # | ||
| 823 | |||
| 824 | # | ||
| 825 | # USB Serial Converter support | ||
| 826 | # | ||
| 827 | # CONFIG_USB_SERIAL is not set | ||
| 828 | |||
| 829 | # | ||
| 830 | # USB Miscellaneous drivers | ||
| 831 | # | ||
| 832 | # CONFIG_USB_EMI62 is not set | ||
| 833 | # CONFIG_USB_EMI26 is not set | ||
| 834 | # CONFIG_USB_ADUTUX is not set | ||
| 835 | # CONFIG_USB_AUERSWALD is not set | ||
| 836 | # CONFIG_USB_RIO500 is not set | ||
| 837 | # CONFIG_USB_LEGOTOWER is not set | ||
| 838 | # CONFIG_USB_LCD is not set | ||
| 839 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 840 | # CONFIG_USB_LED is not set | ||
| 841 | # CONFIG_USB_CYPRESS_CY7C63 is not set | ||
| 842 | # CONFIG_USB_CYTHERM is not set | ||
| 843 | # CONFIG_USB_PHIDGET is not set | ||
| 844 | # CONFIG_USB_IDMOUSE is not set | ||
| 845 | # CONFIG_USB_FTDI_ELAN is not set | ||
| 846 | # CONFIG_USB_APPLEDISPLAY is not set | ||
| 847 | # CONFIG_USB_LD is not set | ||
| 848 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
| 849 | # CONFIG_USB_IOWARRIOR is not set | ||
| 850 | # CONFIG_USB_TEST is not set | ||
| 851 | |||
| 852 | # | ||
| 853 | # USB DSL modem support | ||
| 854 | # | ||
| 855 | |||
| 856 | # | ||
| 857 | # USB Gadget Support | ||
| 858 | # | ||
| 859 | # CONFIG_USB_GADGET is not set | ||
| 860 | CONFIG_MMC=y | ||
| 861 | # CONFIG_MMC_DEBUG is not set | ||
| 862 | # CONFIG_MMC_UNSAFE_RESUME is not set | ||
| 863 | |||
| 864 | # | ||
| 865 | # MMC/SD Card Drivers | ||
| 866 | # | ||
| 867 | CONFIG_MMC_BLOCK=y | ||
| 868 | CONFIG_MMC_BLOCK_BOUNCE=y | ||
| 869 | |||
| 870 | # | ||
| 871 | # MMC/SD Host Controller Drivers | ||
| 872 | # | ||
| 873 | CONFIG_MMC_OMAP=y | ||
| 874 | CONFIG_RTC_LIB=y | ||
| 875 | CONFIG_RTC_CLASS=y | ||
| 876 | CONFIG_RTC_HCTOSYS=y | ||
| 877 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
| 878 | # CONFIG_RTC_DEBUG is not set | ||
| 879 | |||
| 880 | # | ||
| 881 | # RTC interfaces | ||
| 882 | # | ||
| 883 | CONFIG_RTC_INTF_SYSFS=y | ||
| 884 | CONFIG_RTC_INTF_PROC=y | ||
| 885 | CONFIG_RTC_INTF_DEV=y | ||
| 886 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
| 887 | # CONFIG_RTC_DRV_TEST is not set | ||
| 888 | |||
| 889 | # | ||
| 890 | # I2C RTC drivers | ||
| 891 | # | ||
| 892 | # CONFIG_RTC_DRV_DS1307 is not set | ||
| 893 | # CONFIG_RTC_DRV_DS1672 is not set | ||
| 894 | # CONFIG_RTC_DRV_MAX6900 is not set | ||
| 895 | # CONFIG_RTC_DRV_RS5C372 is not set | ||
| 896 | # CONFIG_RTC_DRV_ISL1208 is not set | ||
| 897 | # CONFIG_RTC_DRV_X1205 is not set | ||
| 898 | # CONFIG_RTC_DRV_PCF8563 is not set | ||
| 899 | # CONFIG_RTC_DRV_PCF8583 is not set | ||
| 900 | # CONFIG_RTC_DRV_M41T80 is not set | ||
| 901 | |||
| 902 | # | ||
| 903 | # SPI RTC drivers | ||
| 904 | # | ||
| 905 | |||
| 906 | # | ||
| 907 | # Platform RTC drivers | ||
| 908 | # | ||
| 909 | # CONFIG_RTC_DRV_CMOS is not set | ||
| 910 | # CONFIG_RTC_DRV_DS1553 is not set | ||
| 911 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 912 | # CONFIG_RTC_DRV_DS1742 is not set | ||
| 913 | # CONFIG_RTC_DRV_M48T86 is not set | ||
| 914 | # CONFIG_RTC_DRV_M48T59 is not set | ||
| 915 | # CONFIG_RTC_DRV_V3020 is not set | ||
| 916 | |||
| 917 | # | ||
| 918 | # on-CPU RTC drivers | ||
| 919 | # | ||
| 920 | CONFIG_RTC_DRV_OMAP=y | ||
| 921 | |||
| 922 | # | ||
| 923 | # DMA Engine support | ||
| 924 | # | ||
| 925 | # CONFIG_DMA_ENGINE is not set | ||
| 926 | |||
| 927 | # | ||
| 928 | # DMA Clients | ||
| 929 | # | ||
| 930 | |||
| 931 | # | ||
| 932 | # DMA Devices | ||
| 933 | # | ||
| 934 | |||
| 935 | # | ||
| 936 | # CBUS support | ||
| 937 | # | ||
| 938 | # CONFIG_CBUS is not set | ||
| 939 | |||
| 940 | # | ||
| 941 | # File systems | ||
| 942 | # | ||
| 943 | CONFIG_EXT2_FS=y | ||
| 944 | # CONFIG_EXT2_FS_XATTR is not set | ||
| 945 | # CONFIG_EXT2_FS_XIP is not set | ||
| 946 | CONFIG_EXT3_FS=y | ||
| 947 | CONFIG_EXT3_FS_XATTR=y | ||
| 948 | # CONFIG_EXT3_FS_POSIX_ACL is not set | ||
| 949 | # CONFIG_EXT3_FS_SECURITY is not set | ||
| 950 | # CONFIG_EXT4DEV_FS is not set | ||
| 951 | CONFIG_JBD=y | ||
| 952 | # CONFIG_JBD_DEBUG is not set | ||
| 953 | CONFIG_FS_MBCACHE=y | ||
| 954 | # CONFIG_REISERFS_FS is not set | ||
| 955 | # CONFIG_JFS_FS is not set | ||
| 956 | # CONFIG_FS_POSIX_ACL is not set | ||
| 957 | # CONFIG_XFS_FS is not set | ||
| 958 | # CONFIG_GFS2_FS is not set | ||
| 959 | # CONFIG_OCFS2_FS is not set | ||
| 960 | # CONFIG_MINIX_FS is not set | ||
| 961 | # CONFIG_ROMFS_FS is not set | ||
| 962 | CONFIG_INOTIFY=y | ||
| 963 | CONFIG_INOTIFY_USER=y | ||
| 964 | # CONFIG_QUOTA is not set | ||
| 965 | CONFIG_DNOTIFY=y | ||
| 966 | CONFIG_AUTOFS_FS=y | ||
| 967 | CONFIG_AUTOFS4_FS=y | ||
| 968 | # CONFIG_FUSE_FS is not set | ||
| 969 | |||
| 970 | # | ||
| 971 | # CD-ROM/DVD Filesystems | ||
| 972 | # | ||
| 973 | CONFIG_ISO9660_FS=y | ||
| 974 | CONFIG_JOLIET=y | ||
| 975 | # CONFIG_ZISOFS is not set | ||
| 976 | # CONFIG_UDF_FS is not set | ||
| 977 | |||
| 978 | # | ||
| 979 | # DOS/FAT/NT Filesystems | ||
| 980 | # | ||
| 981 | CONFIG_FAT_FS=m | ||
| 982 | CONFIG_MSDOS_FS=m | ||
| 983 | CONFIG_VFAT_FS=m | ||
| 984 | CONFIG_FAT_DEFAULT_CODEPAGE=437 | ||
| 985 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | ||
| 986 | # CONFIG_NTFS_FS is not set | ||
| 987 | |||
| 988 | # | ||
| 989 | # Pseudo filesystems | ||
| 990 | # | ||
| 991 | CONFIG_PROC_FS=y | ||
| 992 | CONFIG_PROC_SYSCTL=y | ||
| 993 | CONFIG_SYSFS=y | ||
| 994 | # CONFIG_TMPFS is not set | ||
| 995 | # CONFIG_HUGETLB_PAGE is not set | ||
| 996 | CONFIG_RAMFS=y | ||
| 997 | # CONFIG_CONFIGFS_FS is not set | ||
| 998 | |||
| 999 | # | ||
| 1000 | # Miscellaneous filesystems | ||
| 1001 | # | ||
| 1002 | # CONFIG_ADFS_FS is not set | ||
| 1003 | # CONFIG_AFFS_FS is not set | ||
| 1004 | # CONFIG_HFS_FS is not set | ||
| 1005 | # CONFIG_HFSPLUS_FS is not set | ||
| 1006 | # CONFIG_BEFS_FS is not set | ||
| 1007 | # CONFIG_BFS_FS is not set | ||
| 1008 | # CONFIG_EFS_FS is not set | ||
| 1009 | # CONFIG_CRAMFS is not set | ||
| 1010 | # CONFIG_VXFS_FS is not set | ||
| 1011 | # CONFIG_HPFS_FS is not set | ||
| 1012 | # CONFIG_QNX4FS_FS is not set | ||
| 1013 | # CONFIG_SYSV_FS is not set | ||
| 1014 | # CONFIG_UFS_FS is not set | ||
| 1015 | |||
| 1016 | # | ||
| 1017 | # Network File Systems | ||
| 1018 | # | ||
| 1019 | CONFIG_NFS_FS=y | ||
| 1020 | # CONFIG_NFS_V3 is not set | ||
| 1021 | # CONFIG_NFS_V4 is not set | ||
| 1022 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1023 | # CONFIG_NFSD is not set | ||
| 1024 | # CONFIG_ROOT_NFS is not set | ||
| 1025 | CONFIG_LOCKD=y | ||
| 1026 | CONFIG_NFS_COMMON=y | ||
| 1027 | CONFIG_SUNRPC=y | ||
| 1028 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 1029 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
| 1030 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
| 1031 | # CONFIG_SMB_FS is not set | ||
| 1032 | # CONFIG_CIFS is not set | ||
| 1033 | # CONFIG_NCP_FS is not set | ||
| 1034 | # CONFIG_CODA_FS is not set | ||
| 1035 | # CONFIG_AFS_FS is not set | ||
| 1036 | |||
| 1037 | # | ||
| 1038 | # Partition Types | ||
| 1039 | # | ||
| 1040 | CONFIG_PARTITION_ADVANCED=y | ||
| 1041 | # CONFIG_ACORN_PARTITION is not set | ||
| 1042 | # CONFIG_OSF_PARTITION is not set | ||
| 1043 | # CONFIG_AMIGA_PARTITION is not set | ||
| 1044 | # CONFIG_ATARI_PARTITION is not set | ||
| 1045 | # CONFIG_MAC_PARTITION is not set | ||
| 1046 | CONFIG_MSDOS_PARTITION=y | ||
| 1047 | # CONFIG_BSD_DISKLABEL is not set | ||
| 1048 | # CONFIG_MINIX_SUBPARTITION is not set | ||
| 1049 | # CONFIG_SOLARIS_X86_PARTITION is not set | ||
| 1050 | # CONFIG_UNIXWARE_DISKLABEL is not set | ||
| 1051 | # CONFIG_LDM_PARTITION is not set | ||
| 1052 | # CONFIG_SGI_PARTITION is not set | ||
| 1053 | # CONFIG_ULTRIX_PARTITION is not set | ||
| 1054 | # CONFIG_SUN_PARTITION is not set | ||
| 1055 | # CONFIG_KARMA_PARTITION is not set | ||
| 1056 | # CONFIG_EFI_PARTITION is not set | ||
| 1057 | # CONFIG_SYSV68_PARTITION is not set | ||
| 1058 | |||
| 1059 | # | ||
| 1060 | # Native Language Support | ||
| 1061 | # | ||
| 1062 | CONFIG_NLS=y | ||
| 1063 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
| 1064 | # CONFIG_NLS_CODEPAGE_437 is not set | ||
| 1065 | # CONFIG_NLS_CODEPAGE_737 is not set | ||
| 1066 | # CONFIG_NLS_CODEPAGE_775 is not set | ||
| 1067 | # CONFIG_NLS_CODEPAGE_850 is not set | ||
| 1068 | # CONFIG_NLS_CODEPAGE_852 is not set | ||
| 1069 | # CONFIG_NLS_CODEPAGE_855 is not set | ||
| 1070 | # CONFIG_NLS_CODEPAGE_857 is not set | ||
| 1071 | # CONFIG_NLS_CODEPAGE_860 is not set | ||
| 1072 | # CONFIG_NLS_CODEPAGE_861 is not set | ||
| 1073 | # CONFIG_NLS_CODEPAGE_862 is not set | ||
| 1074 | # CONFIG_NLS_CODEPAGE_863 is not set | ||
| 1075 | # CONFIG_NLS_CODEPAGE_864 is not set | ||
| 1076 | # CONFIG_NLS_CODEPAGE_865 is not set | ||
| 1077 | # CONFIG_NLS_CODEPAGE_866 is not set | ||
| 1078 | # CONFIG_NLS_CODEPAGE_869 is not set | ||
| 1079 | # CONFIG_NLS_CODEPAGE_936 is not set | ||
| 1080 | # CONFIG_NLS_CODEPAGE_950 is not set | ||
| 1081 | # CONFIG_NLS_CODEPAGE_932 is not set | ||
| 1082 | # CONFIG_NLS_CODEPAGE_949 is not set | ||
| 1083 | # CONFIG_NLS_CODEPAGE_874 is not set | ||
| 1084 | # CONFIG_NLS_ISO8859_8 is not set | ||
| 1085 | # CONFIG_NLS_CODEPAGE_1250 is not set | ||
| 1086 | # CONFIG_NLS_CODEPAGE_1251 is not set | ||
| 1087 | # CONFIG_NLS_ASCII is not set | ||
| 1088 | # CONFIG_NLS_ISO8859_1 is not set | ||
| 1089 | # CONFIG_NLS_ISO8859_2 is not set | ||
| 1090 | # CONFIG_NLS_ISO8859_3 is not set | ||
| 1091 | # CONFIG_NLS_ISO8859_4 is not set | ||
| 1092 | # CONFIG_NLS_ISO8859_5 is not set | ||
| 1093 | # CONFIG_NLS_ISO8859_6 is not set | ||
| 1094 | # CONFIG_NLS_ISO8859_7 is not set | ||
| 1095 | # CONFIG_NLS_ISO8859_9 is not set | ||
| 1096 | # CONFIG_NLS_ISO8859_13 is not set | ||
| 1097 | # CONFIG_NLS_ISO8859_14 is not set | ||
| 1098 | # CONFIG_NLS_ISO8859_15 is not set | ||
| 1099 | # CONFIG_NLS_KOI8_R is not set | ||
| 1100 | # CONFIG_NLS_KOI8_U is not set | ||
| 1101 | # CONFIG_NLS_UTF8 is not set | ||
| 1102 | |||
| 1103 | # | ||
| 1104 | # Distributed Lock Manager | ||
| 1105 | # | ||
| 1106 | # CONFIG_DLM is not set | ||
| 1107 | |||
| 1108 | # | ||
| 1109 | # Profiling support | ||
| 1110 | # | ||
| 1111 | # CONFIG_PROFILING is not set | ||
| 1112 | |||
| 1113 | # | ||
| 1114 | # Kernel hacking | ||
| 1115 | # | ||
| 1116 | # CONFIG_PRINTK_TIME is not set | ||
| 1117 | CONFIG_ENABLE_MUST_CHECK=y | ||
| 1118 | CONFIG_MAGIC_SYSRQ=y | ||
| 1119 | # CONFIG_UNUSED_SYMBOLS is not set | ||
| 1120 | # CONFIG_DEBUG_FS is not set | ||
| 1121 | # CONFIG_HEADERS_CHECK is not set | ||
| 1122 | CONFIG_DEBUG_KERNEL=y | ||
| 1123 | # CONFIG_DEBUG_SHIRQ is not set | ||
| 1124 | CONFIG_DETECT_SOFTLOCKUP=y | ||
| 1125 | CONFIG_SCHED_DEBUG=y | ||
| 1126 | # CONFIG_SCHEDSTATS is not set | ||
| 1127 | # CONFIG_TIMER_STATS is not set | ||
| 1128 | # CONFIG_DEBUG_SLAB is not set | ||
| 1129 | CONFIG_DEBUG_PREEMPT=y | ||
| 1130 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
| 1131 | # CONFIG_RT_MUTEX_TESTER is not set | ||
| 1132 | # CONFIG_DEBUG_SPINLOCK is not set | ||
| 1133 | # CONFIG_DEBUG_MUTEXES is not set | ||
| 1134 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
| 1135 | # CONFIG_PROVE_LOCKING is not set | ||
| 1136 | # CONFIG_LOCK_STAT is not set | ||
| 1137 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
| 1138 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
| 1139 | # CONFIG_DEBUG_KOBJECT is not set | ||
| 1140 | CONFIG_DEBUG_BUGVERBOSE=y | ||
| 1141 | # CONFIG_DEBUG_INFO is not set | ||
| 1142 | # CONFIG_DEBUG_VM is not set | ||
| 1143 | # CONFIG_DEBUG_LIST is not set | ||
| 1144 | CONFIG_FRAME_POINTER=y | ||
| 1145 | CONFIG_FORCED_INLINING=y | ||
| 1146 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 1147 | # CONFIG_FAULT_INJECTION is not set | ||
| 1148 | # CONFIG_DEBUG_USER is not set | ||
| 1149 | # CONFIG_DEBUG_ERRORS is not set | ||
| 1150 | # CONFIG_DEBUG_LL is not set | ||
| 1151 | |||
| 1152 | # | ||
| 1153 | # Security options | ||
| 1154 | # | ||
| 1155 | # CONFIG_KEYS is not set | ||
| 1156 | # CONFIG_SECURITY is not set | ||
| 1157 | # CONFIG_CRYPTO is not set | ||
| 1158 | |||
| 1159 | # | ||
| 1160 | # Library routines | ||
| 1161 | # | ||
| 1162 | CONFIG_BITREVERSE=y | ||
| 1163 | # CONFIG_CRC_CCITT is not set | ||
| 1164 | # CONFIG_CRC16 is not set | ||
| 1165 | # CONFIG_CRC_ITU_T is not set | ||
| 1166 | CONFIG_CRC32=y | ||
| 1167 | # CONFIG_CRC7 is not set | ||
| 1168 | # CONFIG_LIBCRC32C is not set | ||
| 1169 | CONFIG_PLIST=y | ||
| 1170 | CONFIG_HAS_IOMEM=y | ||
| 1171 | CONFIG_HAS_IOPORT=y | ||
| 1172 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/arm/configs/omap_generic_1610_defconfig b/arch/arm/configs/omap_generic_1610_defconfig new file mode 100644 index 000000000000..fc66f019d56c --- /dev/null +++ b/arch/arm/configs/omap_generic_1610_defconfig | |||
| @@ -0,0 +1,1178 @@ | |||
| 1 | # | ||
| 2 | # Automatically generated make config: don't edit | ||
| 3 | # Linux kernel version: 2.6.23-rc6-omap1 | ||
| 4 | # Tue Sep 18 13:01:27 2007 | ||
| 5 | # | ||
| 6 | CONFIG_ARM=y | ||
| 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | ||
| 8 | CONFIG_GENERIC_GPIO=y | ||
| 9 | CONFIG_GENERIC_TIME=y | ||
| 10 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 11 | CONFIG_MMU=y | ||
| 12 | # CONFIG_NO_IOPORT is not set | ||
| 13 | CONFIG_GENERIC_HARDIRQS=y | ||
| 14 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 15 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 16 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
| 17 | CONFIG_HARDIRQS_SW_RESEND=y | ||
| 18 | CONFIG_GENERIC_IRQ_PROBE=y | ||
| 19 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
| 20 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
| 21 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
| 22 | CONFIG_GENERIC_HWEIGHT=y | ||
| 23 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
| 24 | CONFIG_ZONE_DMA=y | ||
| 25 | CONFIG_VECTORS_BASE=0xffff0000 | ||
| 26 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
| 27 | |||
| 28 | # | ||
| 29 | # General setup | ||
| 30 | # | ||
| 31 | CONFIG_EXPERIMENTAL=y | ||
| 32 | CONFIG_BROKEN_ON_SMP=y | ||
| 33 | CONFIG_LOCK_KERNEL=y | ||
| 34 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 35 | CONFIG_LOCALVERSION="" | ||
| 36 | CONFIG_LOCALVERSION_AUTO=y | ||
| 37 | CONFIG_SWAP=y | ||
| 38 | CONFIG_SYSVIPC=y | ||
| 39 | CONFIG_SYSVIPC_SYSCTL=y | ||
| 40 | # CONFIG_POSIX_MQUEUE is not set | ||
| 41 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 42 | # CONFIG_TASKSTATS is not set | ||
| 43 | # CONFIG_USER_NS is not set | ||
| 44 | # CONFIG_AUDIT is not set | ||
| 45 | # CONFIG_IKCONFIG is not set | ||
| 46 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 47 | CONFIG_SYSFS_DEPRECATED=y | ||
| 48 | # CONFIG_RELAY is not set | ||
| 49 | CONFIG_BLK_DEV_INITRD=y | ||
| 50 | CONFIG_INITRAMFS_SOURCE="" | ||
| 51 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
| 52 | CONFIG_SYSCTL=y | ||
| 53 | # CONFIG_EMBEDDED is not set | ||
| 54 | CONFIG_UID16=y | ||
| 55 | CONFIG_SYSCTL_SYSCALL=y | ||
| 56 | CONFIG_KALLSYMS=y | ||
| 57 | # CONFIG_KALLSYMS_ALL is not set | ||
| 58 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 59 | CONFIG_HOTPLUG=y | ||
| 60 | CONFIG_PRINTK=y | ||
| 61 | CONFIG_BUG=y | ||
| 62 | CONFIG_ELF_CORE=y | ||
| 63 | CONFIG_BASE_FULL=y | ||
| 64 | CONFIG_FUTEX=y | ||
| 65 | CONFIG_ANON_INODES=y | ||
| 66 | CONFIG_EPOLL=y | ||
| 67 | CONFIG_SIGNALFD=y | ||
| 68 | CONFIG_TIMERFD=y | ||
| 69 | CONFIG_EVENTFD=y | ||
| 70 | CONFIG_SHMEM=y | ||
| 71 | CONFIG_VM_EVENT_COUNTERS=y | ||
| 72 | CONFIG_SLAB=y | ||
| 73 | # CONFIG_SLUB is not set | ||
| 74 | # CONFIG_SLOB is not set | ||
| 75 | CONFIG_RT_MUTEXES=y | ||
| 76 | # CONFIG_TINY_SHMEM is not set | ||
| 77 | CONFIG_BASE_SMALL=0 | ||
| 78 | CONFIG_MODULES=y | ||
| 79 | CONFIG_MODULE_UNLOAD=y | ||
| 80 | CONFIG_MODULE_FORCE_UNLOAD=y | ||
| 81 | # CONFIG_MODVERSIONS is not set | ||
| 82 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 83 | CONFIG_KMOD=y | ||
| 84 | CONFIG_BLOCK=y | ||
| 85 | # CONFIG_LBD is not set | ||
| 86 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 87 | # CONFIG_LSF is not set | ||
| 88 | # CONFIG_BLK_DEV_BSG is not set | ||
| 89 | |||
| 90 | # | ||
| 91 | # IO Schedulers | ||
| 92 | # | ||
| 93 | CONFIG_IOSCHED_NOOP=y | ||
| 94 | CONFIG_IOSCHED_AS=y | ||
| 95 | CONFIG_IOSCHED_DEADLINE=y | ||
| 96 | CONFIG_IOSCHED_CFQ=y | ||
| 97 | # CONFIG_DEFAULT_AS is not set | ||
| 98 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 99 | CONFIG_DEFAULT_CFQ=y | ||
| 100 | # CONFIG_DEFAULT_NOOP is not set | ||
| 101 | CONFIG_DEFAULT_IOSCHED="cfq" | ||
| 102 | |||
| 103 | # | ||
| 104 | # System Type | ||
| 105 | # | ||
| 106 | # CONFIG_ARCH_AAEC2000 is not set | ||
| 107 | # CONFIG_ARCH_INTEGRATOR is not set | ||
| 108 | # CONFIG_ARCH_REALVIEW is not set | ||
| 109 | # CONFIG_ARCH_VERSATILE is not set | ||
| 110 | # CONFIG_ARCH_AT91 is not set | ||
| 111 | # CONFIG_ARCH_CLPS7500 is not set | ||
| 112 | # CONFIG_ARCH_CLPS711X is not set | ||
| 113 | # CONFIG_ARCH_CO285 is not set | ||
| 114 | # CONFIG_ARCH_EBSA110 is not set | ||
| 115 | # CONFIG_ARCH_EP93XX is not set | ||
| 116 | # CONFIG_ARCH_FOOTBRIDGE is not set | ||
| 117 | # CONFIG_ARCH_NETX is not set | ||
| 118 | # CONFIG_ARCH_H720X is not set | ||
| 119 | # CONFIG_ARCH_IMX is not set | ||
| 120 | # CONFIG_ARCH_IOP13XX is not set | ||
| 121 | # CONFIG_ARCH_IOP32X is not set | ||
| 122 | # CONFIG_ARCH_IOP33X is not set | ||
| 123 | # CONFIG_ARCH_IXP23XX is not set | ||
| 124 | # CONFIG_ARCH_IXP2000 is not set | ||
| 125 | # CONFIG_ARCH_IXP4XX is not set | ||
| 126 | # CONFIG_ARCH_L7200 is not set | ||
| 127 | # CONFIG_ARCH_KS8695 is not set | ||
| 128 | # CONFIG_ARCH_NS9XXX is not set | ||
| 129 | # CONFIG_ARCH_MXC is not set | ||
| 130 | # CONFIG_ARCH_PNX4008 is not set | ||
| 131 | # CONFIG_ARCH_PXA is not set | ||
| 132 | # CONFIG_ARCH_RPC is not set | ||
| 133 | # CONFIG_ARCH_SA1100 is not set | ||
| 134 | # CONFIG_ARCH_S3C2410 is not set | ||
| 135 | # CONFIG_ARCH_SHARK is not set | ||
| 136 | # CONFIG_ARCH_LH7A40X is not set | ||
| 137 | # CONFIG_ARCH_DAVINCI is not set | ||
| 138 | CONFIG_ARCH_OMAP=y | ||
| 139 | |||
| 140 | # | ||
| 141 | # TI OMAP Implementations | ||
| 142 | # | ||
| 143 | CONFIG_ARCH_OMAP_OTG=y | ||
| 144 | CONFIG_ARCH_OMAP1=y | ||
| 145 | # CONFIG_ARCH_OMAP2 is not set | ||
| 146 | # CONFIG_ARCH_OMAP3 is not set | ||
| 147 | |||
| 148 | # | ||
| 149 | # OMAP Feature Selections | ||
| 150 | # | ||
| 151 | # CONFIG_OMAP_RESET_CLOCKS is not set | ||
| 152 | # CONFIG_OMAP_BOOT_TAG is not set | ||
| 153 | # CONFIG_OMAP_GPIO_SWITCH is not set | ||
| 154 | CONFIG_OMAP_MUX=y | ||
| 155 | # CONFIG_OMAP_MUX_DEBUG is not set | ||
| 156 | CONFIG_OMAP_MUX_WARNINGS=y | ||
| 157 | # CONFIG_OMAP_STI is not set | ||
| 158 | CONFIG_OMAP_MCBSP=y | ||
| 159 | # CONFIG_OMAP_MMU_FWK is not set | ||
| 160 | # CONFIG_OMAP_MBOX_FWK is not set | ||
| 161 | CONFIG_OMAP_MPU_TIMER=y | ||
| 162 | # CONFIG_OMAP_32K_TIMER is not set | ||
| 163 | # CONFIG_OMAP_DM_TIMER is not set | ||
| 164 | CONFIG_OMAP_LL_DEBUG_UART1=y | ||
| 165 | # CONFIG_OMAP_LL_DEBUG_UART2 is not set | ||
| 166 | # CONFIG_OMAP_LL_DEBUG_UART3 is not set | ||
| 167 | CONFIG_OMAP_SERIAL_WAKE=y | ||
| 168 | # CONFIG_OMAP_DSP is not set | ||
| 169 | |||
| 170 | # | ||
| 171 | # OMAP Core Type | ||
| 172 | # | ||
| 173 | # CONFIG_ARCH_OMAP730 is not set | ||
| 174 | # CONFIG_ARCH_OMAP15XX is not set | ||
| 175 | CONFIG_ARCH_OMAP16XX=y | ||
| 176 | |||
| 177 | # | ||
| 178 | # OMAP Board Type | ||
| 179 | # | ||
| 180 | # CONFIG_MACH_OMAP_INNOVATOR is not set | ||
| 181 | # CONFIG_MACH_OMAP_H2 is not set | ||
| 182 | # CONFIG_MACH_OMAP_H3 is not set | ||
| 183 | # CONFIG_MACH_OMAP_OSK is not set | ||
| 184 | # CONFIG_MACH_NOKIA770 is not set | ||
| 185 | CONFIG_MACH_OMAP_GENERIC=y | ||
| 186 | |||
| 187 | # | ||
| 188 | # OMAP CPU Speed | ||
| 189 | # | ||
| 190 | # CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER is not set | ||
| 191 | # CONFIG_OMAP_ARM_216MHZ is not set | ||
| 192 | CONFIG_OMAP_ARM_192MHZ=y | ||
| 193 | # CONFIG_OMAP_ARM_168MHZ is not set | ||
| 194 | # CONFIG_OMAP_ARM_120MHZ is not set | ||
| 195 | # CONFIG_OMAP_ARM_60MHZ is not set | ||
| 196 | # CONFIG_OMAP_ARM_30MHZ is not set | ||
| 197 | # CONFIG_MACH_OMAP_APOLLON_PLUS is not set | ||
| 198 | |||
| 199 | # | ||
| 200 | # Boot options | ||
| 201 | # | ||
| 202 | |||
| 203 | # | ||
| 204 | # Power management | ||
| 205 | # | ||
| 206 | |||
| 207 | # | ||
| 208 | # Processor Type | ||
| 209 | # | ||
| 210 | CONFIG_CPU_32=y | ||
| 211 | CONFIG_CPU_ARM926T=y | ||
| 212 | CONFIG_CPU_32v5=y | ||
| 213 | CONFIG_CPU_ABRT_EV5TJ=y | ||
| 214 | CONFIG_CPU_PABRT_NOIFAR=y | ||
| 215 | CONFIG_CPU_CACHE_VIVT=y | ||
| 216 | CONFIG_CPU_COPY_V4WB=y | ||
| 217 | CONFIG_CPU_TLB_V4WBI=y | ||
| 218 | CONFIG_CPU_CP15=y | ||
| 219 | CONFIG_CPU_CP15_MMU=y | ||
| 220 | |||
| 221 | # | ||
| 222 | # Processor Features | ||
| 223 | # | ||
| 224 | # CONFIG_ARM_THUMB is not set | ||
| 225 | # CONFIG_CPU_ICACHE_DISABLE is not set | ||
| 226 | # CONFIG_CPU_DCACHE_DISABLE is not set | ||
| 227 | # CONFIG_CPU_DCACHE_WRITETHROUGH is not set | ||
| 228 | # CONFIG_CPU_CACHE_ROUND_ROBIN is not set | ||
| 229 | # CONFIG_OUTER_CACHE is not set | ||
| 230 | |||
| 231 | # | ||
| 232 | # Bus support | ||
| 233 | # | ||
| 234 | # CONFIG_PCI_SYSCALL is not set | ||
| 235 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 236 | |||
| 237 | # | ||
| 238 | # PCCARD (PCMCIA/CardBus) support | ||
| 239 | # | ||
| 240 | # CONFIG_PCCARD is not set | ||
| 241 | |||
| 242 | # | ||
| 243 | # Kernel Features | ||
| 244 | # | ||
| 245 | # CONFIG_TICK_ONESHOT is not set | ||
| 246 | # CONFIG_NO_HZ is not set | ||
| 247 | # CONFIG_HIGH_RES_TIMERS is not set | ||
| 248 | CONFIG_PREEMPT=y | ||
| 249 | CONFIG_HZ=100 | ||
| 250 | # CONFIG_AEABI is not set | ||
| 251 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | ||
| 252 | CONFIG_SELECT_MEMORY_MODEL=y | ||
| 253 | CONFIG_FLATMEM_MANUAL=y | ||
| 254 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
| 255 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
| 256 | CONFIG_FLATMEM=y | ||
| 257 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
| 258 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 259 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | ||
| 260 | # CONFIG_RESOURCES_64BIT is not set | ||
| 261 | CONFIG_ZONE_DMA_FLAG=1 | ||
| 262 | CONFIG_BOUNCE=y | ||
| 263 | CONFIG_VIRT_TO_BUS=y | ||
| 264 | # CONFIG_LEDS is not set | ||
| 265 | CONFIG_ALIGNMENT_TRAP=y | ||
| 266 | |||
| 267 | # | ||
| 268 | # Boot options | ||
| 269 | # | ||
| 270 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
| 271 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
| 272 | CONFIG_CMDLINE="mem=64M console=ttyS2,115200 root=0803 ro init=/bin/sh" | ||
| 273 | # CONFIG_XIP_KERNEL is not set | ||
| 274 | # CONFIG_KEXEC is not set | ||
| 275 | |||
| 276 | # | ||
| 277 | # CPU Frequency scaling | ||
| 278 | # | ||
| 279 | # CONFIG_CPU_FREQ is not set | ||
| 280 | |||
| 281 | # | ||
| 282 | # Floating point emulation | ||
| 283 | # | ||
| 284 | |||
| 285 | # | ||
| 286 | # At least one emulation must be selected | ||
| 287 | # | ||
| 288 | CONFIG_FPE_NWFPE=y | ||
| 289 | # CONFIG_FPE_NWFPE_XP is not set | ||
| 290 | # CONFIG_FPE_FASTFPE is not set | ||
| 291 | # CONFIG_VFP is not set | ||
| 292 | |||
| 293 | # | ||
| 294 | # Userspace binary formats | ||
| 295 | # | ||
| 296 | CONFIG_BINFMT_ELF=y | ||
| 297 | # CONFIG_BINFMT_AOUT is not set | ||
| 298 | # CONFIG_BINFMT_MISC is not set | ||
| 299 | # CONFIG_ARTHUR is not set | ||
| 300 | |||
| 301 | # | ||
| 302 | # Power management options | ||
| 303 | # | ||
| 304 | CONFIG_PM=y | ||
| 305 | # CONFIG_PM_LEGACY is not set | ||
| 306 | # CONFIG_PM_DEBUG is not set | ||
| 307 | CONFIG_PM_SLEEP=y | ||
| 308 | CONFIG_SUSPEND_UP_POSSIBLE=y | ||
| 309 | CONFIG_SUSPEND=y | ||
| 310 | # CONFIG_APM_EMULATION is not set | ||
| 311 | |||
| 312 | # | ||
| 313 | # Networking | ||
| 314 | # | ||
| 315 | CONFIG_NET=y | ||
| 316 | |||
| 317 | # | ||
| 318 | # Networking options | ||
| 319 | # | ||
| 320 | CONFIG_PACKET=y | ||
| 321 | # CONFIG_PACKET_MMAP is not set | ||
| 322 | CONFIG_UNIX=y | ||
| 323 | CONFIG_XFRM=y | ||
| 324 | # CONFIG_XFRM_USER is not set | ||
| 325 | # CONFIG_XFRM_SUB_POLICY is not set | ||
| 326 | # CONFIG_XFRM_MIGRATE is not set | ||
| 327 | # CONFIG_NET_KEY is not set | ||
| 328 | CONFIG_INET=y | ||
| 329 | CONFIG_IP_MULTICAST=y | ||
| 330 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
| 331 | CONFIG_IP_FIB_HASH=y | ||
| 332 | CONFIG_IP_PNP=y | ||
| 333 | CONFIG_IP_PNP_DHCP=y | ||
| 334 | CONFIG_IP_PNP_BOOTP=y | ||
| 335 | # CONFIG_IP_PNP_RARP is not set | ||
| 336 | # CONFIG_NET_IPIP is not set | ||
| 337 | # CONFIG_NET_IPGRE is not set | ||
| 338 | # CONFIG_IP_MROUTE is not set | ||
| 339 | # CONFIG_ARPD is not set | ||
| 340 | # CONFIG_SYN_COOKIES is not set | ||
| 341 | # CONFIG_INET_AH is not set | ||
| 342 | # CONFIG_INET_ESP is not set | ||
| 343 | # CONFIG_INET_IPCOMP is not set | ||
| 344 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
| 345 | # CONFIG_INET_TUNNEL is not set | ||
| 346 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | ||
| 347 | CONFIG_INET_XFRM_MODE_TUNNEL=y | ||
| 348 | CONFIG_INET_XFRM_MODE_BEET=y | ||
| 349 | CONFIG_INET_DIAG=y | ||
| 350 | CONFIG_INET_TCP_DIAG=y | ||
| 351 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
| 352 | CONFIG_TCP_CONG_CUBIC=y | ||
| 353 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
| 354 | # CONFIG_TCP_MD5SIG is not set | ||
| 355 | # CONFIG_IPV6 is not set | ||
| 356 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 357 | # CONFIG_INET6_TUNNEL is not set | ||
| 358 | # CONFIG_NETWORK_SECMARK is not set | ||
| 359 | # CONFIG_NETFILTER is not set | ||
| 360 | # CONFIG_IP_DCCP is not set | ||
| 361 | # CONFIG_IP_SCTP is not set | ||
| 362 | # CONFIG_TIPC is not set | ||
| 363 | # CONFIG_ATM is not set | ||
| 364 | # CONFIG_BRIDGE is not set | ||
| 365 | # CONFIG_VLAN_8021Q is not set | ||
| 366 | # CONFIG_DECNET is not set | ||
| 367 | # CONFIG_LLC2 is not set | ||
| 368 | # CONFIG_IPX is not set | ||
| 369 | # CONFIG_ATALK is not set | ||
| 370 | # CONFIG_X25 is not set | ||
| 371 | # CONFIG_LAPB is not set | ||
| 372 | # CONFIG_ECONET is not set | ||
| 373 | # CONFIG_WAN_ROUTER is not set | ||
| 374 | |||
| 375 | # | ||
| 376 | # QoS and/or fair queueing | ||
| 377 | # | ||
| 378 | # CONFIG_NET_SCHED is not set | ||
| 379 | |||
| 380 | # | ||
| 381 | # Network testing | ||
| 382 | # | ||
| 383 | # CONFIG_NET_PKTGEN is not set | ||
| 384 | # CONFIG_HAMRADIO is not set | ||
| 385 | # CONFIG_IRDA is not set | ||
| 386 | # CONFIG_BT is not set | ||
| 387 | # CONFIG_AF_RXRPC is not set | ||
| 388 | |||
| 389 | # | ||
| 390 | # Wireless | ||
| 391 | # | ||
| 392 | # CONFIG_CFG80211 is not set | ||
| 393 | # CONFIG_WIRELESS_EXT is not set | ||
| 394 | # CONFIG_MAC80211 is not set | ||
| 395 | # CONFIG_IEEE80211 is not set | ||
| 396 | # CONFIG_RFKILL is not set | ||
| 397 | # CONFIG_NET_9P is not set | ||
| 398 | |||
| 399 | # | ||
| 400 | # Device Drivers | ||
| 401 | # | ||
| 402 | |||
| 403 | # | ||
| 404 | # Generic Driver Options | ||
| 405 | # | ||
| 406 | CONFIG_STANDALONE=y | ||
| 407 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
| 408 | # CONFIG_FW_LOADER is not set | ||
| 409 | # CONFIG_DEBUG_DRIVER is not set | ||
| 410 | # CONFIG_DEBUG_DEVRES is not set | ||
| 411 | # CONFIG_SYS_HYPERVISOR is not set | ||
| 412 | # CONFIG_CONNECTOR is not set | ||
| 413 | # CONFIG_MTD is not set | ||
| 414 | # CONFIG_PARPORT is not set | ||
| 415 | CONFIG_BLK_DEV=y | ||
| 416 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
| 417 | CONFIG_BLK_DEV_LOOP=y | ||
| 418 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | ||
| 419 | # CONFIG_BLK_DEV_NBD is not set | ||
| 420 | # CONFIG_BLK_DEV_UB is not set | ||
| 421 | CONFIG_BLK_DEV_RAM=y | ||
| 422 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
| 423 | CONFIG_BLK_DEV_RAM_SIZE=8192 | ||
| 424 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | ||
| 425 | # CONFIG_CDROM_PKTCDVD is not set | ||
| 426 | # CONFIG_ATA_OVER_ETH is not set | ||
| 427 | |||
| 428 | # | ||
| 429 | # SCSI device support | ||
| 430 | # | ||
| 431 | # CONFIG_RAID_ATTRS is not set | ||
| 432 | CONFIG_SCSI=y | ||
| 433 | CONFIG_SCSI_DMA=y | ||
| 434 | # CONFIG_SCSI_TGT is not set | ||
| 435 | # CONFIG_SCSI_NETLINK is not set | ||
| 436 | CONFIG_SCSI_PROC_FS=y | ||
| 437 | |||
| 438 | # | ||
| 439 | # SCSI support type (disk, tape, CD-ROM) | ||
| 440 | # | ||
| 441 | CONFIG_BLK_DEV_SD=y | ||
| 442 | # CONFIG_CHR_DEV_ST is not set | ||
| 443 | # CONFIG_CHR_DEV_OSST is not set | ||
| 444 | CONFIG_BLK_DEV_SR=y | ||
| 445 | # CONFIG_BLK_DEV_SR_VENDOR is not set | ||
| 446 | CONFIG_CHR_DEV_SG=y | ||
| 447 | # CONFIG_CHR_DEV_SCH is not set | ||
| 448 | |||
| 449 | # | ||
| 450 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
| 451 | # | ||
| 452 | CONFIG_SCSI_MULTI_LUN=y | ||
| 453 | # CONFIG_SCSI_CONSTANTS is not set | ||
| 454 | # CONFIG_SCSI_LOGGING is not set | ||
| 455 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
| 456 | CONFIG_SCSI_WAIT_SCAN=m | ||
| 457 | |||
| 458 | # | ||
| 459 | # SCSI Transports | ||
| 460 | # | ||
| 461 | # CONFIG_SCSI_SPI_ATTRS is not set | ||
| 462 | # CONFIG_SCSI_FC_ATTRS is not set | ||
| 463 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
| 464 | # CONFIG_SCSI_SAS_LIBSAS is not set | ||
| 465 | CONFIG_SCSI_LOWLEVEL=y | ||
| 466 | # CONFIG_ISCSI_TCP is not set | ||
| 467 | # CONFIG_SCSI_DEBUG is not set | ||
| 468 | # CONFIG_ATA is not set | ||
| 469 | # CONFIG_MD is not set | ||
| 470 | CONFIG_NETDEVICES=y | ||
| 471 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 472 | # CONFIG_DUMMY is not set | ||
| 473 | # CONFIG_BONDING is not set | ||
| 474 | # CONFIG_MACVLAN is not set | ||
| 475 | # CONFIG_EQUALIZER is not set | ||
| 476 | # CONFIG_TUN is not set | ||
| 477 | # CONFIG_PHYLIB is not set | ||
| 478 | CONFIG_NET_ETHERNET=y | ||
| 479 | CONFIG_MII=y | ||
| 480 | # CONFIG_AX88796 is not set | ||
| 481 | # CONFIG_SMC91X is not set | ||
| 482 | # CONFIG_DM9000 is not set | ||
| 483 | CONFIG_NETDEV_1000=y | ||
| 484 | CONFIG_NETDEV_10000=y | ||
| 485 | |||
| 486 | # | ||
| 487 | # Wireless LAN | ||
| 488 | # | ||
| 489 | # CONFIG_WLAN_PRE80211 is not set | ||
| 490 | # CONFIG_WLAN_80211 is not set | ||
| 491 | |||
| 492 | # | ||
| 493 | # USB Network Adapters | ||
| 494 | # | ||
| 495 | # CONFIG_USB_CATC is not set | ||
| 496 | # CONFIG_USB_KAWETH is not set | ||
| 497 | # CONFIG_USB_PEGASUS is not set | ||
| 498 | CONFIG_USB_RTL8150=y | ||
| 499 | CONFIG_USB_USBNET_MII=y | ||
| 500 | CONFIG_USB_USBNET=y | ||
| 501 | CONFIG_USB_NET_AX8817X=y | ||
| 502 | CONFIG_USB_NET_CDCETHER=y | ||
| 503 | # CONFIG_USB_NET_DM9601 is not set | ||
| 504 | # CONFIG_USB_NET_GL620A is not set | ||
| 505 | CONFIG_USB_NET_NET1080=y | ||
| 506 | # CONFIG_USB_NET_PLUSB is not set | ||
| 507 | # CONFIG_USB_NET_MCS7830 is not set | ||
| 508 | # CONFIG_USB_NET_RNDIS_HOST is not set | ||
| 509 | CONFIG_USB_NET_CDC_SUBSET=y | ||
| 510 | CONFIG_USB_ALI_M5632=y | ||
| 511 | CONFIG_USB_AN2720=y | ||
| 512 | CONFIG_USB_BELKIN=y | ||
| 513 | CONFIG_USB_ARMLINUX=y | ||
| 514 | CONFIG_USB_EPSON2888=y | ||
| 515 | # CONFIG_USB_KC2190 is not set | ||
| 516 | CONFIG_USB_NET_ZAURUS=y | ||
| 517 | # CONFIG_WAN is not set | ||
| 518 | CONFIG_PPP=y | ||
| 519 | CONFIG_PPP_MULTILINK=y | ||
| 520 | # CONFIG_PPP_FILTER is not set | ||
| 521 | # CONFIG_PPP_ASYNC is not set | ||
| 522 | # CONFIG_PPP_SYNC_TTY is not set | ||
| 523 | # CONFIG_PPP_DEFLATE is not set | ||
| 524 | # CONFIG_PPP_BSDCOMP is not set | ||
| 525 | # CONFIG_PPP_MPPE is not set | ||
| 526 | # CONFIG_PPPOE is not set | ||
| 527 | # CONFIG_PPPOL2TP is not set | ||
| 528 | # CONFIG_SLIP is not set | ||
| 529 | CONFIG_SLHC=y | ||
| 530 | # CONFIG_SHAPER is not set | ||
| 531 | # CONFIG_NETCONSOLE is not set | ||
| 532 | # CONFIG_NETPOLL is not set | ||
| 533 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
| 534 | # CONFIG_ISDN is not set | ||
| 535 | |||
| 536 | # | ||
| 537 | # Input device support | ||
| 538 | # | ||
| 539 | CONFIG_INPUT=y | ||
| 540 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
| 541 | # CONFIG_INPUT_POLLDEV is not set | ||
| 542 | |||
| 543 | # | ||
| 544 | # Userland interfaces | ||
| 545 | # | ||
| 546 | CONFIG_INPUT_MOUSEDEV=y | ||
| 547 | CONFIG_INPUT_MOUSEDEV_PSAUX=y | ||
| 548 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | ||
| 549 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | ||
| 550 | # CONFIG_INPUT_JOYDEV is not set | ||
| 551 | # CONFIG_INPUT_TSDEV is not set | ||
| 552 | # CONFIG_INPUT_EVDEV is not set | ||
| 553 | # CONFIG_INPUT_EVBUG is not set | ||
| 554 | |||
| 555 | # | ||
| 556 | # Input Device Drivers | ||
| 557 | # | ||
| 558 | CONFIG_INPUT_KEYBOARD=y | ||
| 559 | CONFIG_KEYBOARD_ATKBD=y | ||
| 560 | # CONFIG_KEYBOARD_SUNKBD is not set | ||
| 561 | # CONFIG_KEYBOARD_LKKBD is not set | ||
| 562 | # CONFIG_KEYBOARD_XTKBD is not set | ||
| 563 | # CONFIG_KEYBOARD_NEWTON is not set | ||
| 564 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
| 565 | CONFIG_KEYBOARD_OMAP=y | ||
| 566 | # CONFIG_KEYBOARD_GPIO is not set | ||
| 567 | # CONFIG_INPUT_MOUSE is not set | ||
| 568 | # CONFIG_INPUT_JOYSTICK is not set | ||
| 569 | # CONFIG_INPUT_TABLET is not set | ||
| 570 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
| 571 | # CONFIG_INPUT_MISC is not set | ||
| 572 | |||
| 573 | # | ||
| 574 | # Hardware I/O ports | ||
| 575 | # | ||
| 576 | CONFIG_SERIO=y | ||
| 577 | CONFIG_SERIO_SERPORT=y | ||
| 578 | CONFIG_SERIO_LIBPS2=y | ||
| 579 | # CONFIG_SERIO_RAW is not set | ||
| 580 | # CONFIG_GAMEPORT is not set | ||
| 581 | |||
| 582 | # | ||
| 583 | # Character devices | ||
| 584 | # | ||
| 585 | CONFIG_VT=y | ||
| 586 | CONFIG_VT_CONSOLE=y | ||
| 587 | CONFIG_HW_CONSOLE=y | ||
| 588 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
| 589 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
| 590 | |||
| 591 | # | ||
| 592 | # Serial drivers | ||
| 593 | # | ||
| 594 | CONFIG_SERIAL_8250=y | ||
| 595 | CONFIG_SERIAL_8250_CONSOLE=y | ||
| 596 | CONFIG_SERIAL_8250_NR_UARTS=4 | ||
| 597 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | ||
| 598 | # CONFIG_SERIAL_8250_EXTENDED is not set | ||
| 599 | |||
| 600 | # | ||
| 601 | # Non-8250 serial port support | ||
| 602 | # | ||
| 603 | CONFIG_SERIAL_CORE=y | ||
| 604 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
| 605 | CONFIG_UNIX98_PTYS=y | ||
| 606 | # CONFIG_LEGACY_PTYS is not set | ||
| 607 | # CONFIG_IPMI_HANDLER is not set | ||
| 608 | # CONFIG_WATCHDOG is not set | ||
| 609 | CONFIG_HW_RANDOM=m | ||
| 610 | CONFIG_HW_RANDOM_OMAP=m | ||
| 611 | # CONFIG_NVRAM is not set | ||
| 612 | # CONFIG_R3964 is not set | ||
| 613 | # CONFIG_RAW_DRIVER is not set | ||
| 614 | # CONFIG_TCG_TPM is not set | ||
| 615 | CONFIG_I2C=y | ||
| 616 | CONFIG_I2C_BOARDINFO=y | ||
| 617 | CONFIG_I2C_CHARDEV=y | ||
| 618 | |||
| 619 | # | ||
| 620 | # I2C Algorithms | ||
| 621 | # | ||
| 622 | CONFIG_I2C_ALGOBIT=y | ||
| 623 | # CONFIG_I2C_ALGOPCF is not set | ||
| 624 | # CONFIG_I2C_ALGOPCA is not set | ||
| 625 | |||
| 626 | # | ||
| 627 | # I2C Hardware Bus support | ||
| 628 | # | ||
| 629 | # CONFIG_I2C_GPIO is not set | ||
| 630 | # CONFIG_I2C_OCORES is not set | ||
| 631 | # CONFIG_I2C_OMAP is not set | ||
| 632 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 633 | # CONFIG_I2C_SIMTEC is not set | ||
| 634 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 635 | # CONFIG_I2C_STUB is not set | ||
| 636 | # CONFIG_I2C_TINY_USB is not set | ||
| 637 | |||
| 638 | # | ||
| 639 | # Miscellaneous I2C Chip support | ||
| 640 | # | ||
| 641 | # CONFIG_SENSORS_DS1337 is not set | ||
| 642 | # CONFIG_SENSORS_DS1374 is not set | ||
| 643 | # CONFIG_DS1682 is not set | ||
| 644 | # CONFIG_SENSORS_EEPROM is not set | ||
| 645 | # CONFIG_SENSORS_PCF8574 is not set | ||
| 646 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 647 | # CONFIG_SENSORS_PCF8591 is not set | ||
| 648 | # CONFIG_ISP1301_OMAP is not set | ||
| 649 | # CONFIG_TPS65010 is not set | ||
| 650 | # CONFIG_GPIOEXPANDER_OMAP is not set | ||
| 651 | # CONFIG_SENSORS_MAX6875 is not set | ||
| 652 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 653 | # CONFIG_I2C_DEBUG_CORE is not set | ||
| 654 | # CONFIG_I2C_DEBUG_ALGO is not set | ||
| 655 | # CONFIG_I2C_DEBUG_BUS is not set | ||
| 656 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 657 | |||
| 658 | # | ||
| 659 | # SPI support | ||
| 660 | # | ||
| 661 | # CONFIG_SPI is not set | ||
| 662 | # CONFIG_SPI_MASTER is not set | ||
| 663 | # CONFIG_W1 is not set | ||
| 664 | CONFIG_HWMON=y | ||
| 665 | # CONFIG_HWMON_VID is not set | ||
| 666 | # CONFIG_SENSORS_ABITUGURU is not set | ||
| 667 | # CONFIG_SENSORS_ABITUGURU3 is not set | ||
| 668 | # CONFIG_SENSORS_AD7418 is not set | ||
| 669 | # CONFIG_SENSORS_ADM1021 is not set | ||
| 670 | # CONFIG_SENSORS_ADM1025 is not set | ||
| 671 | # CONFIG_SENSORS_ADM1026 is not set | ||
| 672 | # CONFIG_SENSORS_ADM1029 is not set | ||
| 673 | # CONFIG_SENSORS_ADM1031 is not set | ||
| 674 | # CONFIG_SENSORS_ADM9240 is not set | ||
| 675 | # CONFIG_SENSORS_ASB100 is not set | ||
| 676 | # CONFIG_SENSORS_ATXP1 is not set | ||
| 677 | # CONFIG_SENSORS_DS1621 is not set | ||
| 678 | # CONFIG_SENSORS_F71805F is not set | ||
| 679 | # CONFIG_SENSORS_FSCHER is not set | ||
| 680 | # CONFIG_SENSORS_FSCPOS is not set | ||
| 681 | # CONFIG_SENSORS_GL518SM is not set | ||
| 682 | # CONFIG_SENSORS_GL520SM is not set | ||
| 683 | # CONFIG_SENSORS_IT87 is not set | ||
| 684 | # CONFIG_SENSORS_LM63 is not set | ||
| 685 | # CONFIG_SENSORS_LM75 is not set | ||
| 686 | # CONFIG_SENSORS_LM77 is not set | ||
| 687 | # CONFIG_SENSORS_LM78 is not set | ||
| 688 | # CONFIG_SENSORS_LM80 is not set | ||
| 689 | # CONFIG_SENSORS_LM83 is not set | ||
| 690 | # CONFIG_SENSORS_LM85 is not set | ||
| 691 | # CONFIG_SENSORS_LM87 is not set | ||
| 692 | # CONFIG_SENSORS_LM90 is not set | ||
| 693 | # CONFIG_SENSORS_LM92 is not set | ||
| 694 | # CONFIG_SENSORS_LM93 is not set | ||
| 695 | # CONFIG_SENSORS_MAX1619 is not set | ||
| 696 | # CONFIG_SENSORS_MAX6650 is not set | ||
| 697 | # CONFIG_SENSORS_PC87360 is not set | ||
| 698 | # CONFIG_SENSORS_PC87427 is not set | ||
| 699 | # CONFIG_SENSORS_DME1737 is not set | ||
| 700 | # CONFIG_SENSORS_SMSC47M1 is not set | ||
| 701 | # CONFIG_SENSORS_SMSC47M192 is not set | ||
| 702 | # CONFIG_SENSORS_SMSC47B397 is not set | ||
| 703 | # CONFIG_SENSORS_THMC50 is not set | ||
| 704 | # CONFIG_SENSORS_VT1211 is not set | ||
| 705 | # CONFIG_SENSORS_W83781D is not set | ||
| 706 | # CONFIG_SENSORS_W83791D is not set | ||
| 707 | # CONFIG_SENSORS_W83792D is not set | ||
| 708 | # CONFIG_SENSORS_W83793 is not set | ||
| 709 | # CONFIG_SENSORS_W83L785TS is not set | ||
| 710 | # CONFIG_SENSORS_W83627HF is not set | ||
| 711 | # CONFIG_SENSORS_W83627EHF is not set | ||
| 712 | # CONFIG_HWMON_DEBUG_CHIP is not set | ||
| 713 | CONFIG_MISC_DEVICES=y | ||
| 714 | # CONFIG_EEPROM_93CX6 is not set | ||
| 715 | |||
| 716 | # | ||
| 717 | # Multifunction device drivers | ||
| 718 | # | ||
| 719 | # CONFIG_MFD_SM501 is not set | ||
| 720 | # CONFIG_NEW_LEDS is not set | ||
| 721 | |||
| 722 | # | ||
| 723 | # Multimedia devices | ||
| 724 | # | ||
| 725 | # CONFIG_VIDEO_DEV is not set | ||
| 726 | # CONFIG_DVB_CORE is not set | ||
| 727 | CONFIG_DAB=y | ||
| 728 | # CONFIG_USB_DABUSB is not set | ||
| 729 | |||
| 730 | # | ||
| 731 | # Graphics support | ||
| 732 | # | ||
| 733 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 734 | |||
| 735 | # | ||
| 736 | # Display device support | ||
| 737 | # | ||
| 738 | # CONFIG_DISPLAY_SUPPORT is not set | ||
| 739 | # CONFIG_VGASTATE is not set | ||
| 740 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
| 741 | # CONFIG_FB is not set | ||
| 742 | |||
| 743 | # | ||
| 744 | # Console display driver support | ||
| 745 | # | ||
| 746 | # CONFIG_VGA_CONSOLE is not set | ||
| 747 | CONFIG_DUMMY_CONSOLE=y | ||
| 748 | |||
| 749 | # | ||
| 750 | # Sound | ||
| 751 | # | ||
| 752 | # CONFIG_SOUND is not set | ||
| 753 | CONFIG_HID_SUPPORT=y | ||
| 754 | CONFIG_HID=y | ||
| 755 | # CONFIG_HID_DEBUG is not set | ||
| 756 | |||
| 757 | # | ||
| 758 | # USB Input Devices | ||
| 759 | # | ||
| 760 | CONFIG_USB_HID=y | ||
| 761 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | ||
| 762 | # CONFIG_HID_FF is not set | ||
| 763 | # CONFIG_USB_HIDDEV is not set | ||
| 764 | CONFIG_USB_SUPPORT=y | ||
| 765 | CONFIG_USB_ARCH_HAS_HCD=y | ||
| 766 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
| 767 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
| 768 | CONFIG_USB=y | ||
| 769 | CONFIG_USB_DEBUG=y | ||
| 770 | |||
| 771 | # | ||
| 772 | # Miscellaneous USB options | ||
| 773 | # | ||
| 774 | CONFIG_USB_DEVICEFS=y | ||
| 775 | # CONFIG_USB_DEVICE_CLASS is not set | ||
| 776 | # CONFIG_USB_DYNAMIC_MINORS is not set | ||
| 777 | # CONFIG_USB_SUSPEND is not set | ||
| 778 | # CONFIG_USB_PERSIST is not set | ||
| 779 | # CONFIG_USB_OTG is not set | ||
| 780 | |||
| 781 | # | ||
| 782 | # USB Host Controller Drivers | ||
| 783 | # | ||
| 784 | # CONFIG_USB_ISP116X_HCD is not set | ||
| 785 | CONFIG_USB_OHCI_HCD=y | ||
| 786 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | ||
| 787 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | ||
| 788 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | ||
| 789 | # CONFIG_USB_SL811_HCD is not set | ||
| 790 | # CONFIG_USB_R8A66597_HCD is not set | ||
| 791 | # CONFIG_USB_MUSB_HDRC is not set | ||
| 792 | |||
| 793 | # | ||
| 794 | # USB Device Class drivers | ||
| 795 | # | ||
| 796 | # CONFIG_USB_ACM is not set | ||
| 797 | # CONFIG_USB_PRINTER is not set | ||
| 798 | |||
| 799 | # | ||
| 800 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
| 801 | # | ||
| 802 | |||
| 803 | # | ||
| 804 | # may also be needed; see USB_STORAGE Help for more information | ||
| 805 | # | ||
| 806 | CONFIG_USB_STORAGE=y | ||
| 807 | # CONFIG_USB_STORAGE_DEBUG is not set | ||
| 808 | CONFIG_USB_STORAGE_DATAFAB=y | ||
| 809 | CONFIG_USB_STORAGE_FREECOM=y | ||
| 810 | CONFIG_USB_STORAGE_DPCM=y | ||
| 811 | # CONFIG_USB_STORAGE_USBAT is not set | ||
| 812 | CONFIG_USB_STORAGE_SDDR09=y | ||
| 813 | CONFIG_USB_STORAGE_SDDR55=y | ||
| 814 | CONFIG_USB_STORAGE_JUMPSHOT=y | ||
| 815 | # CONFIG_USB_STORAGE_ALAUDA is not set | ||
| 816 | # CONFIG_USB_STORAGE_KARMA is not set | ||
| 817 | # CONFIG_USB_LIBUSUAL is not set | ||
| 818 | |||
| 819 | # | ||
| 820 | # USB Imaging devices | ||
| 821 | # | ||
| 822 | # CONFIG_USB_MDC800 is not set | ||
| 823 | # CONFIG_USB_MICROTEK is not set | ||
| 824 | CONFIG_USB_MON=y | ||
| 825 | |||
| 826 | # | ||
| 827 | # USB port drivers | ||
| 828 | # | ||
| 829 | |||
| 830 | # | ||
| 831 | # USB Serial Converter support | ||
| 832 | # | ||
| 833 | # CONFIG_USB_SERIAL is not set | ||
| 834 | |||
| 835 | # | ||
| 836 | # USB Miscellaneous drivers | ||
| 837 | # | ||
| 838 | # CONFIG_USB_EMI62 is not set | ||
| 839 | # CONFIG_USB_EMI26 is not set | ||
| 840 | # CONFIG_USB_ADUTUX is not set | ||
| 841 | # CONFIG_USB_AUERSWALD is not set | ||
| 842 | # CONFIG_USB_RIO500 is not set | ||
| 843 | # CONFIG_USB_LEGOTOWER is not set | ||
| 844 | # CONFIG_USB_LCD is not set | ||
| 845 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 846 | # CONFIG_USB_LED is not set | ||
| 847 | # CONFIG_USB_CYPRESS_CY7C63 is not set | ||
| 848 | # CONFIG_USB_CYTHERM is not set | ||
| 849 | # CONFIG_USB_PHIDGET is not set | ||
| 850 | # CONFIG_USB_IDMOUSE is not set | ||
| 851 | # CONFIG_USB_FTDI_ELAN is not set | ||
| 852 | # CONFIG_USB_APPLEDISPLAY is not set | ||
| 853 | # CONFIG_USB_LD is not set | ||
| 854 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
| 855 | # CONFIG_USB_IOWARRIOR is not set | ||
| 856 | # CONFIG_USB_TEST is not set | ||
| 857 | |||
| 858 | # | ||
| 859 | # USB DSL modem support | ||
| 860 | # | ||
| 861 | |||
| 862 | # | ||
| 863 | # USB Gadget Support | ||
| 864 | # | ||
| 865 | # CONFIG_USB_GADGET is not set | ||
| 866 | CONFIG_MMC=y | ||
| 867 | # CONFIG_MMC_DEBUG is not set | ||
| 868 | # CONFIG_MMC_UNSAFE_RESUME is not set | ||
| 869 | |||
| 870 | # | ||
| 871 | # MMC/SD Card Drivers | ||
| 872 | # | ||
| 873 | CONFIG_MMC_BLOCK=y | ||
| 874 | CONFIG_MMC_BLOCK_BOUNCE=y | ||
| 875 | |||
| 876 | # | ||
| 877 | # MMC/SD Host Controller Drivers | ||
| 878 | # | ||
| 879 | CONFIG_MMC_OMAP=y | ||
| 880 | CONFIG_RTC_LIB=y | ||
| 881 | CONFIG_RTC_CLASS=y | ||
| 882 | CONFIG_RTC_HCTOSYS=y | ||
| 883 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
| 884 | # CONFIG_RTC_DEBUG is not set | ||
| 885 | |||
| 886 | # | ||
| 887 | # RTC interfaces | ||
| 888 | # | ||
| 889 | CONFIG_RTC_INTF_SYSFS=y | ||
| 890 | CONFIG_RTC_INTF_PROC=y | ||
| 891 | CONFIG_RTC_INTF_DEV=y | ||
| 892 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
| 893 | # CONFIG_RTC_DRV_TEST is not set | ||
| 894 | |||
| 895 | # | ||
| 896 | # I2C RTC drivers | ||
| 897 | # | ||
| 898 | # CONFIG_RTC_DRV_DS1307 is not set | ||
| 899 | # CONFIG_RTC_DRV_DS1672 is not set | ||
| 900 | # CONFIG_RTC_DRV_MAX6900 is not set | ||
| 901 | # CONFIG_RTC_DRV_RS5C372 is not set | ||
| 902 | # CONFIG_RTC_DRV_ISL1208 is not set | ||
| 903 | # CONFIG_RTC_DRV_X1205 is not set | ||
| 904 | # CONFIG_RTC_DRV_PCF8563 is not set | ||
| 905 | # CONFIG_RTC_DRV_PCF8583 is not set | ||
| 906 | # CONFIG_RTC_DRV_M41T80 is not set | ||
| 907 | |||
| 908 | # | ||
| 909 | # SPI RTC drivers | ||
| 910 | # | ||
| 911 | |||
| 912 | # | ||
| 913 | # Platform RTC drivers | ||
| 914 | # | ||
| 915 | # CONFIG_RTC_DRV_CMOS is not set | ||
| 916 | # CONFIG_RTC_DRV_DS1553 is not set | ||
| 917 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 918 | # CONFIG_RTC_DRV_DS1742 is not set | ||
| 919 | # CONFIG_RTC_DRV_M48T86 is not set | ||
| 920 | # CONFIG_RTC_DRV_M48T59 is not set | ||
| 921 | # CONFIG_RTC_DRV_V3020 is not set | ||
| 922 | |||
| 923 | # | ||
| 924 | # on-CPU RTC drivers | ||
| 925 | # | ||
| 926 | CONFIG_RTC_DRV_OMAP=y | ||
| 927 | |||
| 928 | # | ||
| 929 | # DMA Engine support | ||
| 930 | # | ||
| 931 | # CONFIG_DMA_ENGINE is not set | ||
| 932 | |||
| 933 | # | ||
| 934 | # DMA Clients | ||
| 935 | # | ||
| 936 | |||
| 937 | # | ||
| 938 | # DMA Devices | ||
| 939 | # | ||
| 940 | |||
| 941 | # | ||
| 942 | # CBUS support | ||
| 943 | # | ||
| 944 | # CONFIG_CBUS is not set | ||
| 945 | |||
| 946 | # | ||
| 947 | # File systems | ||
| 948 | # | ||
| 949 | CONFIG_EXT2_FS=y | ||
| 950 | # CONFIG_EXT2_FS_XATTR is not set | ||
| 951 | # CONFIG_EXT2_FS_XIP is not set | ||
| 952 | CONFIG_EXT3_FS=y | ||
| 953 | CONFIG_EXT3_FS_XATTR=y | ||
| 954 | # CONFIG_EXT3_FS_POSIX_ACL is not set | ||
| 955 | # CONFIG_EXT3_FS_SECURITY is not set | ||
| 956 | # CONFIG_EXT4DEV_FS is not set | ||
| 957 | CONFIG_JBD=y | ||
| 958 | # CONFIG_JBD_DEBUG is not set | ||
| 959 | CONFIG_FS_MBCACHE=y | ||
| 960 | # CONFIG_REISERFS_FS is not set | ||
| 961 | # CONFIG_JFS_FS is not set | ||
| 962 | # CONFIG_FS_POSIX_ACL is not set | ||
| 963 | # CONFIG_XFS_FS is not set | ||
| 964 | # CONFIG_GFS2_FS is not set | ||
| 965 | # CONFIG_OCFS2_FS is not set | ||
| 966 | # CONFIG_MINIX_FS is not set | ||
| 967 | # CONFIG_ROMFS_FS is not set | ||
| 968 | CONFIG_INOTIFY=y | ||
| 969 | CONFIG_INOTIFY_USER=y | ||
| 970 | # CONFIG_QUOTA is not set | ||
| 971 | CONFIG_DNOTIFY=y | ||
| 972 | CONFIG_AUTOFS_FS=y | ||
| 973 | CONFIG_AUTOFS4_FS=y | ||
| 974 | # CONFIG_FUSE_FS is not set | ||
| 975 | |||
| 976 | # | ||
| 977 | # CD-ROM/DVD Filesystems | ||
| 978 | # | ||
| 979 | CONFIG_ISO9660_FS=y | ||
| 980 | CONFIG_JOLIET=y | ||
| 981 | # CONFIG_ZISOFS is not set | ||
| 982 | # CONFIG_UDF_FS is not set | ||
| 983 | |||
| 984 | # | ||
| 985 | # DOS/FAT/NT Filesystems | ||
| 986 | # | ||
| 987 | CONFIG_FAT_FS=m | ||
| 988 | CONFIG_MSDOS_FS=m | ||
| 989 | CONFIG_VFAT_FS=m | ||
| 990 | CONFIG_FAT_DEFAULT_CODEPAGE=437 | ||
| 991 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | ||
| 992 | # CONFIG_NTFS_FS is not set | ||
| 993 | |||
| 994 | # | ||
| 995 | # Pseudo filesystems | ||
| 996 | # | ||
| 997 | CONFIG_PROC_FS=y | ||
| 998 | CONFIG_PROC_SYSCTL=y | ||
| 999 | CONFIG_SYSFS=y | ||
| 1000 | # CONFIG_TMPFS is not set | ||
| 1001 | # CONFIG_HUGETLB_PAGE is not set | ||
| 1002 | CONFIG_RAMFS=y | ||
| 1003 | # CONFIG_CONFIGFS_FS is not set | ||
| 1004 | |||
| 1005 | # | ||
| 1006 | # Miscellaneous filesystems | ||
| 1007 | # | ||
| 1008 | # CONFIG_ADFS_FS is not set | ||
| 1009 | # CONFIG_AFFS_FS is not set | ||
| 1010 | # CONFIG_HFS_FS is not set | ||
| 1011 | # CONFIG_HFSPLUS_FS is not set | ||
| 1012 | # CONFIG_BEFS_FS is not set | ||
| 1013 | # CONFIG_BFS_FS is not set | ||
| 1014 | # CONFIG_EFS_FS is not set | ||
| 1015 | # CONFIG_CRAMFS is not set | ||
| 1016 | # CONFIG_VXFS_FS is not set | ||
| 1017 | # CONFIG_HPFS_FS is not set | ||
| 1018 | # CONFIG_QNX4FS_FS is not set | ||
| 1019 | # CONFIG_SYSV_FS is not set | ||
| 1020 | # CONFIG_UFS_FS is not set | ||
| 1021 | |||
| 1022 | # | ||
| 1023 | # Network File Systems | ||
| 1024 | # | ||
| 1025 | CONFIG_NFS_FS=y | ||
| 1026 | # CONFIG_NFS_V3 is not set | ||
| 1027 | # CONFIG_NFS_V4 is not set | ||
| 1028 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1029 | # CONFIG_NFSD is not set | ||
| 1030 | # CONFIG_ROOT_NFS is not set | ||
| 1031 | CONFIG_LOCKD=y | ||
| 1032 | CONFIG_NFS_COMMON=y | ||
| 1033 | CONFIG_SUNRPC=y | ||
| 1034 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 1035 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
| 1036 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
| 1037 | # CONFIG_SMB_FS is not set | ||
| 1038 | # CONFIG_CIFS is not set | ||
| 1039 | # CONFIG_NCP_FS is not set | ||
| 1040 | # CONFIG_CODA_FS is not set | ||
| 1041 | # CONFIG_AFS_FS is not set | ||
| 1042 | |||
| 1043 | # | ||
| 1044 | # Partition Types | ||
| 1045 | # | ||
| 1046 | CONFIG_PARTITION_ADVANCED=y | ||
| 1047 | # CONFIG_ACORN_PARTITION is not set | ||
| 1048 | # CONFIG_OSF_PARTITION is not set | ||
| 1049 | # CONFIG_AMIGA_PARTITION is not set | ||
| 1050 | # CONFIG_ATARI_PARTITION is not set | ||
| 1051 | # CONFIG_MAC_PARTITION is not set | ||
| 1052 | CONFIG_MSDOS_PARTITION=y | ||
| 1053 | # CONFIG_BSD_DISKLABEL is not set | ||
| 1054 | # CONFIG_MINIX_SUBPARTITION is not set | ||
| 1055 | # CONFIG_SOLARIS_X86_PARTITION is not set | ||
| 1056 | # CONFIG_UNIXWARE_DISKLABEL is not set | ||
| 1057 | # CONFIG_LDM_PARTITION is not set | ||
| 1058 | # CONFIG_SGI_PARTITION is not set | ||
| 1059 | # CONFIG_ULTRIX_PARTITION is not set | ||
| 1060 | # CONFIG_SUN_PARTITION is not set | ||
| 1061 | # CONFIG_KARMA_PARTITION is not set | ||
| 1062 | # CONFIG_EFI_PARTITION is not set | ||
| 1063 | # CONFIG_SYSV68_PARTITION is not set | ||
| 1064 | |||
| 1065 | # | ||
| 1066 | # Native Language Support | ||
| 1067 | # | ||
| 1068 | CONFIG_NLS=y | ||
| 1069 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
| 1070 | # CONFIG_NLS_CODEPAGE_437 is not set | ||
| 1071 | # CONFIG_NLS_CODEPAGE_737 is not set | ||
| 1072 | # CONFIG_NLS_CODEPAGE_775 is not set | ||
| 1073 | # CONFIG_NLS_CODEPAGE_850 is not set | ||
| 1074 | # CONFIG_NLS_CODEPAGE_852 is not set | ||
| 1075 | # CONFIG_NLS_CODEPAGE_855 is not set | ||
| 1076 | # CONFIG_NLS_CODEPAGE_857 is not set | ||
| 1077 | # CONFIG_NLS_CODEPAGE_860 is not set | ||
| 1078 | # CONFIG_NLS_CODEPAGE_861 is not set | ||
| 1079 | # CONFIG_NLS_CODEPAGE_862 is not set | ||
| 1080 | # CONFIG_NLS_CODEPAGE_863 is not set | ||
| 1081 | # CONFIG_NLS_CODEPAGE_864 is not set | ||
| 1082 | # CONFIG_NLS_CODEPAGE_865 is not set | ||
| 1083 | # CONFIG_NLS_CODEPAGE_866 is not set | ||
| 1084 | # CONFIG_NLS_CODEPAGE_869 is not set | ||
| 1085 | # CONFIG_NLS_CODEPAGE_936 is not set | ||
| 1086 | # CONFIG_NLS_CODEPAGE_950 is not set | ||
| 1087 | # CONFIG_NLS_CODEPAGE_932 is not set | ||
| 1088 | # CONFIG_NLS_CODEPAGE_949 is not set | ||
| 1089 | # CONFIG_NLS_CODEPAGE_874 is not set | ||
| 1090 | # CONFIG_NLS_ISO8859_8 is not set | ||
| 1091 | # CONFIG_NLS_CODEPAGE_1250 is not set | ||
| 1092 | # CONFIG_NLS_CODEPAGE_1251 is not set | ||
| 1093 | # CONFIG_NLS_ASCII is not set | ||
| 1094 | # CONFIG_NLS_ISO8859_1 is not set | ||
| 1095 | # CONFIG_NLS_ISO8859_2 is not set | ||
| 1096 | # CONFIG_NLS_ISO8859_3 is not set | ||
| 1097 | # CONFIG_NLS_ISO8859_4 is not set | ||
| 1098 | # CONFIG_NLS_ISO8859_5 is not set | ||
| 1099 | # CONFIG_NLS_ISO8859_6 is not set | ||
| 1100 | # CONFIG_NLS_ISO8859_7 is not set | ||
| 1101 | # CONFIG_NLS_ISO8859_9 is not set | ||
| 1102 | # CONFIG_NLS_ISO8859_13 is not set | ||
| 1103 | # CONFIG_NLS_ISO8859_14 is not set | ||
| 1104 | # CONFIG_NLS_ISO8859_15 is not set | ||
| 1105 | # CONFIG_NLS_KOI8_R is not set | ||
| 1106 | # CONFIG_NLS_KOI8_U is not set | ||
| 1107 | # CONFIG_NLS_UTF8 is not set | ||
| 1108 | |||
| 1109 | # | ||
| 1110 | # Distributed Lock Manager | ||
| 1111 | # | ||
| 1112 | # CONFIG_DLM is not set | ||
| 1113 | |||
| 1114 | # | ||
| 1115 | # Profiling support | ||
| 1116 | # | ||
| 1117 | # CONFIG_PROFILING is not set | ||
| 1118 | |||
| 1119 | # | ||
| 1120 | # Kernel hacking | ||
| 1121 | # | ||
| 1122 | # CONFIG_PRINTK_TIME is not set | ||
| 1123 | CONFIG_ENABLE_MUST_CHECK=y | ||
| 1124 | CONFIG_MAGIC_SYSRQ=y | ||
| 1125 | # CONFIG_UNUSED_SYMBOLS is not set | ||
| 1126 | # CONFIG_DEBUG_FS is not set | ||
| 1127 | # CONFIG_HEADERS_CHECK is not set | ||
| 1128 | CONFIG_DEBUG_KERNEL=y | ||
| 1129 | # CONFIG_DEBUG_SHIRQ is not set | ||
| 1130 | CONFIG_DETECT_SOFTLOCKUP=y | ||
| 1131 | CONFIG_SCHED_DEBUG=y | ||
| 1132 | # CONFIG_SCHEDSTATS is not set | ||
| 1133 | # CONFIG_TIMER_STATS is not set | ||
| 1134 | # CONFIG_DEBUG_SLAB is not set | ||
| 1135 | CONFIG_DEBUG_PREEMPT=y | ||
| 1136 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
| 1137 | # CONFIG_RT_MUTEX_TESTER is not set | ||
| 1138 | # CONFIG_DEBUG_SPINLOCK is not set | ||
| 1139 | # CONFIG_DEBUG_MUTEXES is not set | ||
| 1140 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
| 1141 | # CONFIG_PROVE_LOCKING is not set | ||
| 1142 | # CONFIG_LOCK_STAT is not set | ||
| 1143 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
| 1144 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
| 1145 | # CONFIG_DEBUG_KOBJECT is not set | ||
| 1146 | CONFIG_DEBUG_BUGVERBOSE=y | ||
| 1147 | # CONFIG_DEBUG_INFO is not set | ||
| 1148 | # CONFIG_DEBUG_VM is not set | ||
| 1149 | # CONFIG_DEBUG_LIST is not set | ||
| 1150 | CONFIG_FRAME_POINTER=y | ||
| 1151 | CONFIG_FORCED_INLINING=y | ||
| 1152 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 1153 | # CONFIG_FAULT_INJECTION is not set | ||
| 1154 | # CONFIG_DEBUG_USER is not set | ||
| 1155 | # CONFIG_DEBUG_ERRORS is not set | ||
| 1156 | # CONFIG_DEBUG_LL is not set | ||
| 1157 | |||
| 1158 | # | ||
| 1159 | # Security options | ||
| 1160 | # | ||
| 1161 | # CONFIG_KEYS is not set | ||
| 1162 | # CONFIG_SECURITY is not set | ||
| 1163 | # CONFIG_CRYPTO is not set | ||
| 1164 | |||
| 1165 | # | ||
| 1166 | # Library routines | ||
| 1167 | # | ||
| 1168 | CONFIG_BITREVERSE=y | ||
| 1169 | # CONFIG_CRC_CCITT is not set | ||
| 1170 | # CONFIG_CRC16 is not set | ||
| 1171 | # CONFIG_CRC_ITU_T is not set | ||
| 1172 | CONFIG_CRC32=y | ||
| 1173 | # CONFIG_CRC7 is not set | ||
| 1174 | # CONFIG_LIBCRC32C is not set | ||
| 1175 | CONFIG_PLIST=y | ||
| 1176 | CONFIG_HAS_IOMEM=y | ||
| 1177 | CONFIG_HAS_IOPORT=y | ||
| 1178 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/arm/configs/omap_generic_1710_defconfig b/arch/arm/configs/omap_generic_1710_defconfig new file mode 100644 index 000000000000..0a00a708a4fc --- /dev/null +++ b/arch/arm/configs/omap_generic_1710_defconfig | |||
| @@ -0,0 +1,1088 @@ | |||
| 1 | # | ||
| 2 | # Automatically generated make config: don't edit | ||
| 3 | # Linux kernel version: 2.6.23-rc6-omap1 | ||
| 4 | # Tue Sep 18 13:02:08 2007 | ||
| 5 | # | ||
| 6 | CONFIG_ARM=y | ||
| 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | ||
| 8 | CONFIG_GENERIC_GPIO=y | ||
| 9 | CONFIG_GENERIC_TIME=y | ||
| 10 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 11 | CONFIG_MMU=y | ||
| 12 | # CONFIG_NO_IOPORT is not set | ||
| 13 | CONFIG_GENERIC_HARDIRQS=y | ||
| 14 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 15 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 16 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
| 17 | CONFIG_HARDIRQS_SW_RESEND=y | ||
| 18 | CONFIG_GENERIC_IRQ_PROBE=y | ||
| 19 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
| 20 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
| 21 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
| 22 | CONFIG_GENERIC_HWEIGHT=y | ||
| 23 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
| 24 | CONFIG_ZONE_DMA=y | ||
| 25 | CONFIG_VECTORS_BASE=0xffff0000 | ||
| 26 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
| 27 | |||
| 28 | # | ||
| 29 | # General setup | ||
| 30 | # | ||
| 31 | CONFIG_EXPERIMENTAL=y | ||
| 32 | CONFIG_BROKEN_ON_SMP=y | ||
| 33 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 34 | CONFIG_LOCALVERSION="" | ||
| 35 | CONFIG_LOCALVERSION_AUTO=y | ||
| 36 | CONFIG_SWAP=y | ||
| 37 | CONFIG_SYSVIPC=y | ||
| 38 | CONFIG_SYSVIPC_SYSCTL=y | ||
| 39 | # CONFIG_POSIX_MQUEUE is not set | ||
| 40 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 41 | # CONFIG_TASKSTATS is not set | ||
| 42 | # CONFIG_USER_NS is not set | ||
| 43 | # CONFIG_AUDIT is not set | ||
| 44 | # CONFIG_IKCONFIG is not set | ||
| 45 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 46 | CONFIG_SYSFS_DEPRECATED=y | ||
| 47 | # CONFIG_RELAY is not set | ||
| 48 | CONFIG_BLK_DEV_INITRD=y | ||
| 49 | CONFIG_INITRAMFS_SOURCE="" | ||
| 50 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
| 51 | CONFIG_SYSCTL=y | ||
| 52 | # CONFIG_EMBEDDED is not set | ||
| 53 | CONFIG_UID16=y | ||
| 54 | CONFIG_SYSCTL_SYSCALL=y | ||
| 55 | CONFIG_KALLSYMS=y | ||
| 56 | # CONFIG_KALLSYMS_ALL is not set | ||
| 57 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 58 | CONFIG_HOTPLUG=y | ||
| 59 | CONFIG_PRINTK=y | ||
| 60 | CONFIG_BUG=y | ||
| 61 | CONFIG_ELF_CORE=y | ||
| 62 | CONFIG_BASE_FULL=y | ||
| 63 | CONFIG_FUTEX=y | ||
| 64 | CONFIG_ANON_INODES=y | ||
| 65 | CONFIG_EPOLL=y | ||
| 66 | CONFIG_SIGNALFD=y | ||
| 67 | CONFIG_TIMERFD=y | ||
| 68 | CONFIG_EVENTFD=y | ||
| 69 | CONFIG_SHMEM=y | ||
| 70 | CONFIG_VM_EVENT_COUNTERS=y | ||
| 71 | CONFIG_SLUB_DEBUG=y | ||
| 72 | # CONFIG_SLAB is not set | ||
| 73 | CONFIG_SLUB=y | ||
| 74 | # CONFIG_SLOB is not set | ||
| 75 | CONFIG_RT_MUTEXES=y | ||
| 76 | # CONFIG_TINY_SHMEM is not set | ||
| 77 | CONFIG_BASE_SMALL=0 | ||
| 78 | # CONFIG_MODULES is not set | ||
| 79 | CONFIG_BLOCK=y | ||
| 80 | # CONFIG_LBD is not set | ||
| 81 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 82 | # CONFIG_LSF is not set | ||
| 83 | # CONFIG_BLK_DEV_BSG is not set | ||
| 84 | |||
| 85 | # | ||
| 86 | # IO Schedulers | ||
| 87 | # | ||
| 88 | CONFIG_IOSCHED_NOOP=y | ||
| 89 | CONFIG_IOSCHED_AS=y | ||
| 90 | CONFIG_IOSCHED_DEADLINE=y | ||
| 91 | CONFIG_IOSCHED_CFQ=y | ||
| 92 | # CONFIG_DEFAULT_AS is not set | ||
| 93 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 94 | CONFIG_DEFAULT_CFQ=y | ||
| 95 | # CONFIG_DEFAULT_NOOP is not set | ||
| 96 | CONFIG_DEFAULT_IOSCHED="cfq" | ||
| 97 | |||
| 98 | # | ||
| 99 | # System Type | ||
| 100 | # | ||
| 101 | # CONFIG_ARCH_AAEC2000 is not set | ||
| 102 | # CONFIG_ARCH_INTEGRATOR is not set | ||
| 103 | # CONFIG_ARCH_REALVIEW is not set | ||
| 104 | # CONFIG_ARCH_VERSATILE is not set | ||
| 105 | # CONFIG_ARCH_AT91 is not set | ||
| 106 | # CONFIG_ARCH_CLPS7500 is not set | ||
| 107 | # CONFIG_ARCH_CLPS711X is not set | ||
| 108 | # CONFIG_ARCH_CO285 is not set | ||
| 109 | # CONFIG_ARCH_EBSA110 is not set | ||
| 110 | # CONFIG_ARCH_EP93XX is not set | ||
| 111 | # CONFIG_ARCH_FOOTBRIDGE is not set | ||
| 112 | # CONFIG_ARCH_NETX is not set | ||
| 113 | # CONFIG_ARCH_H720X is not set | ||
| 114 | # CONFIG_ARCH_IMX is not set | ||
| 115 | # CONFIG_ARCH_IOP13XX is not set | ||
| 116 | # CONFIG_ARCH_IOP32X is not set | ||
| 117 | # CONFIG_ARCH_IOP33X is not set | ||
| 118 | # CONFIG_ARCH_IXP23XX is not set | ||
| 119 | # CONFIG_ARCH_IXP2000 is not set | ||
| 120 | # CONFIG_ARCH_IXP4XX is not set | ||
| 121 | # CONFIG_ARCH_L7200 is not set | ||
| 122 | # CONFIG_ARCH_KS8695 is not set | ||
| 123 | # CONFIG_ARCH_NS9XXX is not set | ||
| 124 | # CONFIG_ARCH_MXC is not set | ||
| 125 | # CONFIG_ARCH_PNX4008 is not set | ||
| 126 | # CONFIG_ARCH_PXA is not set | ||
| 127 | # CONFIG_ARCH_RPC is not set | ||
| 128 | # CONFIG_ARCH_SA1100 is not set | ||
| 129 | # CONFIG_ARCH_S3C2410 is not set | ||
| 130 | # CONFIG_ARCH_SHARK is not set | ||
| 131 | # CONFIG_ARCH_LH7A40X is not set | ||
| 132 | # CONFIG_ARCH_DAVINCI is not set | ||
| 133 | CONFIG_ARCH_OMAP=y | ||
| 134 | |||
| 135 | # | ||
| 136 | # TI OMAP Implementations | ||
| 137 | # | ||
| 138 | CONFIG_ARCH_OMAP_OTG=y | ||
| 139 | CONFIG_ARCH_OMAP1=y | ||
| 140 | # CONFIG_ARCH_OMAP2 is not set | ||
| 141 | # CONFIG_ARCH_OMAP3 is not set | ||
| 142 | |||
| 143 | # | ||
| 144 | # OMAP Feature Selections | ||
| 145 | # | ||
| 146 | # CONFIG_OMAP_RESET_CLOCKS is not set | ||
| 147 | CONFIG_OMAP_BOOT_TAG=y | ||
| 148 | # CONFIG_OMAP_BOOT_REASON is not set | ||
| 149 | # CONFIG_OMAP_COMPONENT_VERSION is not set | ||
| 150 | # CONFIG_OMAP_GPIO_SWITCH is not set | ||
| 151 | # CONFIG_OMAP_MUX is not set | ||
| 152 | # CONFIG_OMAP_STI is not set | ||
| 153 | CONFIG_OMAP_MCBSP=y | ||
| 154 | # CONFIG_OMAP_MMU_FWK is not set | ||
| 155 | # CONFIG_OMAP_MBOX_FWK is not set | ||
| 156 | CONFIG_OMAP_MPU_TIMER=y | ||
| 157 | # CONFIG_OMAP_32K_TIMER is not set | ||
| 158 | # CONFIG_OMAP_DM_TIMER is not set | ||
| 159 | # CONFIG_OMAP_LL_DEBUG_UART1 is not set | ||
| 160 | # CONFIG_OMAP_LL_DEBUG_UART2 is not set | ||
| 161 | CONFIG_OMAP_LL_DEBUG_UART3=y | ||
| 162 | # CONFIG_OMAP_DSP is not set | ||
| 163 | |||
| 164 | # | ||
| 165 | # OMAP Core Type | ||
| 166 | # | ||
| 167 | # CONFIG_ARCH_OMAP730 is not set | ||
| 168 | # CONFIG_ARCH_OMAP15XX is not set | ||
| 169 | CONFIG_ARCH_OMAP16XX=y | ||
| 170 | |||
| 171 | # | ||
| 172 | # OMAP Board Type | ||
| 173 | # | ||
| 174 | # CONFIG_MACH_OMAP_INNOVATOR is not set | ||
| 175 | # CONFIG_MACH_OMAP_H2 is not set | ||
| 176 | # CONFIG_MACH_OMAP_H3 is not set | ||
| 177 | # CONFIG_MACH_OMAP_OSK is not set | ||
| 178 | # CONFIG_MACH_NOKIA770 is not set | ||
| 179 | CONFIG_MACH_OMAP_GENERIC=y | ||
| 180 | |||
| 181 | # | ||
| 182 | # OMAP CPU Speed | ||
| 183 | # | ||
| 184 | # CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER is not set | ||
| 185 | # CONFIG_OMAP_ARM_216MHZ is not set | ||
| 186 | CONFIG_OMAP_ARM_192MHZ=y | ||
| 187 | # CONFIG_OMAP_ARM_168MHZ is not set | ||
| 188 | # CONFIG_OMAP_ARM_120MHZ is not set | ||
| 189 | # CONFIG_OMAP_ARM_60MHZ is not set | ||
| 190 | # CONFIG_OMAP_ARM_30MHZ is not set | ||
| 191 | # CONFIG_MACH_OMAP_APOLLON_PLUS is not set | ||
| 192 | |||
| 193 | # | ||
| 194 | # Boot options | ||
| 195 | # | ||
| 196 | |||
| 197 | # | ||
| 198 | # Power management | ||
| 199 | # | ||
| 200 | |||
| 201 | # | ||
| 202 | # Processor Type | ||
| 203 | # | ||
| 204 | CONFIG_CPU_32=y | ||
| 205 | CONFIG_CPU_ARM926T=y | ||
| 206 | CONFIG_CPU_32v5=y | ||
| 207 | CONFIG_CPU_ABRT_EV5TJ=y | ||
| 208 | CONFIG_CPU_PABRT_NOIFAR=y | ||
| 209 | CONFIG_CPU_CACHE_VIVT=y | ||
| 210 | CONFIG_CPU_COPY_V4WB=y | ||
| 211 | CONFIG_CPU_TLB_V4WBI=y | ||
| 212 | CONFIG_CPU_CP15=y | ||
| 213 | CONFIG_CPU_CP15_MMU=y | ||
| 214 | |||
| 215 | # | ||
| 216 | # Processor Features | ||
| 217 | # | ||
| 218 | # CONFIG_ARM_THUMB is not set | ||
| 219 | # CONFIG_CPU_ICACHE_DISABLE is not set | ||
| 220 | # CONFIG_CPU_DCACHE_DISABLE is not set | ||
| 221 | # CONFIG_CPU_DCACHE_WRITETHROUGH is not set | ||
| 222 | # CONFIG_CPU_CACHE_ROUND_ROBIN is not set | ||
| 223 | # CONFIG_OUTER_CACHE is not set | ||
| 224 | |||
| 225 | # | ||
| 226 | # Bus support | ||
| 227 | # | ||
| 228 | # CONFIG_PCI_SYSCALL is not set | ||
| 229 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 230 | |||
| 231 | # | ||
| 232 | # PCCARD (PCMCIA/CardBus) support | ||
| 233 | # | ||
| 234 | # CONFIG_PCCARD is not set | ||
| 235 | |||
| 236 | # | ||
| 237 | # Kernel Features | ||
| 238 | # | ||
| 239 | # CONFIG_TICK_ONESHOT is not set | ||
| 240 | # CONFIG_NO_HZ is not set | ||
| 241 | # CONFIG_HIGH_RES_TIMERS is not set | ||
| 242 | # CONFIG_PREEMPT is not set | ||
| 243 | CONFIG_HZ=100 | ||
| 244 | # CONFIG_AEABI is not set | ||
| 245 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | ||
| 246 | CONFIG_SELECT_MEMORY_MODEL=y | ||
| 247 | CONFIG_FLATMEM_MANUAL=y | ||
| 248 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
| 249 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
| 250 | CONFIG_FLATMEM=y | ||
| 251 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
| 252 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 253 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | ||
| 254 | # CONFIG_RESOURCES_64BIT is not set | ||
| 255 | CONFIG_ZONE_DMA_FLAG=1 | ||
| 256 | CONFIG_BOUNCE=y | ||
| 257 | CONFIG_VIRT_TO_BUS=y | ||
| 258 | # CONFIG_LEDS is not set | ||
| 259 | CONFIG_ALIGNMENT_TRAP=y | ||
| 260 | |||
| 261 | # | ||
| 262 | # Boot options | ||
| 263 | # | ||
| 264 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
| 265 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
| 266 | CONFIG_CMDLINE="mem=64M console=tty0 console=ttyS2,115200 root=0801" | ||
| 267 | # CONFIG_XIP_KERNEL is not set | ||
| 268 | # CONFIG_KEXEC is not set | ||
| 269 | |||
| 270 | # | ||
| 271 | # CPU Frequency scaling | ||
| 272 | # | ||
| 273 | # CONFIG_CPU_FREQ is not set | ||
| 274 | |||
| 275 | # | ||
| 276 | # Floating point emulation | ||
| 277 | # | ||
| 278 | |||
| 279 | # | ||
| 280 | # At least one emulation must be selected | ||
| 281 | # | ||
| 282 | CONFIG_FPE_NWFPE=y | ||
| 283 | # CONFIG_FPE_NWFPE_XP is not set | ||
| 284 | # CONFIG_FPE_FASTFPE is not set | ||
| 285 | # CONFIG_VFP is not set | ||
| 286 | |||
| 287 | # | ||
| 288 | # Userspace binary formats | ||
| 289 | # | ||
| 290 | CONFIG_BINFMT_ELF=y | ||
| 291 | # CONFIG_BINFMT_AOUT is not set | ||
| 292 | # CONFIG_BINFMT_MISC is not set | ||
| 293 | CONFIG_ARTHUR=y | ||
| 294 | |||
| 295 | # | ||
| 296 | # Power management options | ||
| 297 | # | ||
| 298 | CONFIG_PM=y | ||
| 299 | # CONFIG_PM_LEGACY is not set | ||
| 300 | # CONFIG_PM_DEBUG is not set | ||
| 301 | CONFIG_PM_SLEEP=y | ||
| 302 | CONFIG_SUSPEND_UP_POSSIBLE=y | ||
| 303 | CONFIG_SUSPEND=y | ||
| 304 | # CONFIG_APM_EMULATION is not set | ||
| 305 | |||
| 306 | # | ||
| 307 | # Networking | ||
| 308 | # | ||
| 309 | CONFIG_NET=y | ||
| 310 | |||
| 311 | # | ||
| 312 | # Networking options | ||
| 313 | # | ||
| 314 | CONFIG_PACKET=y | ||
| 315 | # CONFIG_PACKET_MMAP is not set | ||
| 316 | CONFIG_UNIX=y | ||
| 317 | CONFIG_XFRM=y | ||
| 318 | # CONFIG_XFRM_USER is not set | ||
| 319 | # CONFIG_XFRM_SUB_POLICY is not set | ||
| 320 | # CONFIG_XFRM_MIGRATE is not set | ||
| 321 | # CONFIG_NET_KEY is not set | ||
| 322 | CONFIG_INET=y | ||
| 323 | CONFIG_IP_MULTICAST=y | ||
| 324 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
| 325 | CONFIG_IP_FIB_HASH=y | ||
| 326 | CONFIG_IP_PNP=y | ||
| 327 | CONFIG_IP_PNP_DHCP=y | ||
| 328 | CONFIG_IP_PNP_BOOTP=y | ||
| 329 | # CONFIG_IP_PNP_RARP is not set | ||
| 330 | # CONFIG_NET_IPIP is not set | ||
| 331 | # CONFIG_NET_IPGRE is not set | ||
| 332 | # CONFIG_IP_MROUTE is not set | ||
| 333 | # CONFIG_ARPD is not set | ||
| 334 | # CONFIG_SYN_COOKIES is not set | ||
| 335 | # CONFIG_INET_AH is not set | ||
| 336 | # CONFIG_INET_ESP is not set | ||
| 337 | # CONFIG_INET_IPCOMP is not set | ||
| 338 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
| 339 | # CONFIG_INET_TUNNEL is not set | ||
| 340 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | ||
| 341 | CONFIG_INET_XFRM_MODE_TUNNEL=y | ||
| 342 | CONFIG_INET_XFRM_MODE_BEET=y | ||
| 343 | CONFIG_INET_DIAG=y | ||
| 344 | CONFIG_INET_TCP_DIAG=y | ||
| 345 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
| 346 | CONFIG_TCP_CONG_CUBIC=y | ||
| 347 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
| 348 | # CONFIG_TCP_MD5SIG is not set | ||
| 349 | # CONFIG_IPV6 is not set | ||
| 350 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 351 | # CONFIG_INET6_TUNNEL is not set | ||
| 352 | # CONFIG_NETLABEL is not set | ||
| 353 | # CONFIG_NETWORK_SECMARK is not set | ||
| 354 | # CONFIG_NETFILTER is not set | ||
| 355 | # CONFIG_IP_DCCP is not set | ||
| 356 | # CONFIG_IP_SCTP is not set | ||
| 357 | # CONFIG_TIPC is not set | ||
| 358 | # CONFIG_ATM is not set | ||
| 359 | # CONFIG_BRIDGE is not set | ||
| 360 | # CONFIG_VLAN_8021Q is not set | ||
| 361 | # CONFIG_DECNET is not set | ||
| 362 | # CONFIG_LLC2 is not set | ||
| 363 | # CONFIG_IPX is not set | ||
| 364 | # CONFIG_ATALK is not set | ||
| 365 | # CONFIG_X25 is not set | ||
| 366 | # CONFIG_LAPB is not set | ||
| 367 | # CONFIG_ECONET is not set | ||
| 368 | # CONFIG_WAN_ROUTER is not set | ||
| 369 | |||
| 370 | # | ||
| 371 | # QoS and/or fair queueing | ||
| 372 | # | ||
| 373 | # CONFIG_NET_SCHED is not set | ||
| 374 | |||
| 375 | # | ||
| 376 | # Network testing | ||
| 377 | # | ||
| 378 | # CONFIG_NET_PKTGEN is not set | ||
| 379 | # CONFIG_HAMRADIO is not set | ||
| 380 | # CONFIG_IRDA is not set | ||
| 381 | # CONFIG_BT is not set | ||
| 382 | # CONFIG_AF_RXRPC is not set | ||
| 383 | |||
| 384 | # | ||
| 385 | # Wireless | ||
| 386 | # | ||
| 387 | # CONFIG_CFG80211 is not set | ||
| 388 | # CONFIG_WIRELESS_EXT is not set | ||
| 389 | # CONFIG_MAC80211 is not set | ||
| 390 | # CONFIG_IEEE80211 is not set | ||
| 391 | # CONFIG_RFKILL is not set | ||
| 392 | # CONFIG_NET_9P is not set | ||
| 393 | |||
| 394 | # | ||
| 395 | # Device Drivers | ||
| 396 | # | ||
| 397 | |||
| 398 | # | ||
| 399 | # Generic Driver Options | ||
| 400 | # | ||
| 401 | CONFIG_STANDALONE=y | ||
| 402 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
| 403 | # CONFIG_FW_LOADER is not set | ||
| 404 | # CONFIG_DEBUG_DRIVER is not set | ||
| 405 | # CONFIG_DEBUG_DEVRES is not set | ||
| 406 | # CONFIG_SYS_HYPERVISOR is not set | ||
| 407 | # CONFIG_CONNECTOR is not set | ||
| 408 | # CONFIG_MTD is not set | ||
| 409 | # CONFIG_PARPORT is not set | ||
| 410 | CONFIG_BLK_DEV=y | ||
| 411 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
| 412 | CONFIG_BLK_DEV_LOOP=y | ||
| 413 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | ||
| 414 | # CONFIG_BLK_DEV_NBD is not set | ||
| 415 | # CONFIG_BLK_DEV_UB is not set | ||
| 416 | CONFIG_BLK_DEV_RAM=y | ||
| 417 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
| 418 | CONFIG_BLK_DEV_RAM_SIZE=8192 | ||
| 419 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | ||
| 420 | # CONFIG_CDROM_PKTCDVD is not set | ||
| 421 | # CONFIG_ATA_OVER_ETH is not set | ||
| 422 | |||
| 423 | # | ||
| 424 | # SCSI device support | ||
| 425 | # | ||
| 426 | # CONFIG_RAID_ATTRS is not set | ||
| 427 | CONFIG_SCSI=y | ||
| 428 | CONFIG_SCSI_DMA=y | ||
| 429 | # CONFIG_SCSI_TGT is not set | ||
| 430 | # CONFIG_SCSI_NETLINK is not set | ||
| 431 | CONFIG_SCSI_PROC_FS=y | ||
| 432 | |||
| 433 | # | ||
| 434 | # SCSI support type (disk, tape, CD-ROM) | ||
| 435 | # | ||
| 436 | CONFIG_BLK_DEV_SD=y | ||
| 437 | # CONFIG_CHR_DEV_ST is not set | ||
| 438 | # CONFIG_CHR_DEV_OSST is not set | ||
| 439 | # CONFIG_BLK_DEV_SR is not set | ||
| 440 | # CONFIG_CHR_DEV_SG is not set | ||
| 441 | # CONFIG_CHR_DEV_SCH is not set | ||
| 442 | |||
| 443 | # | ||
| 444 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
| 445 | # | ||
| 446 | # CONFIG_SCSI_MULTI_LUN is not set | ||
| 447 | # CONFIG_SCSI_CONSTANTS is not set | ||
| 448 | # CONFIG_SCSI_LOGGING is not set | ||
| 449 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
| 450 | |||
| 451 | # | ||
| 452 | # SCSI Transports | ||
| 453 | # | ||
| 454 | # CONFIG_SCSI_SPI_ATTRS is not set | ||
| 455 | # CONFIG_SCSI_FC_ATTRS is not set | ||
| 456 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
| 457 | # CONFIG_SCSI_SAS_LIBSAS is not set | ||
| 458 | CONFIG_SCSI_LOWLEVEL=y | ||
| 459 | # CONFIG_ISCSI_TCP is not set | ||
| 460 | # CONFIG_SCSI_DEBUG is not set | ||
| 461 | # CONFIG_ATA is not set | ||
| 462 | # CONFIG_MD is not set | ||
| 463 | CONFIG_NETDEVICES=y | ||
| 464 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 465 | # CONFIG_DUMMY is not set | ||
| 466 | # CONFIG_BONDING is not set | ||
| 467 | # CONFIG_MACVLAN is not set | ||
| 468 | # CONFIG_EQUALIZER is not set | ||
| 469 | # CONFIG_TUN is not set | ||
| 470 | # CONFIG_PHYLIB is not set | ||
| 471 | CONFIG_NET_ETHERNET=y | ||
| 472 | CONFIG_MII=y | ||
| 473 | # CONFIG_AX88796 is not set | ||
| 474 | # CONFIG_SMC91X is not set | ||
| 475 | # CONFIG_DM9000 is not set | ||
| 476 | CONFIG_NETDEV_1000=y | ||
| 477 | CONFIG_NETDEV_10000=y | ||
| 478 | |||
| 479 | # | ||
| 480 | # Wireless LAN | ||
| 481 | # | ||
| 482 | # CONFIG_WLAN_PRE80211 is not set | ||
| 483 | # CONFIG_WLAN_80211 is not set | ||
| 484 | |||
| 485 | # | ||
| 486 | # USB Network Adapters | ||
| 487 | # | ||
| 488 | # CONFIG_USB_CATC is not set | ||
| 489 | # CONFIG_USB_KAWETH is not set | ||
| 490 | # CONFIG_USB_PEGASUS is not set | ||
| 491 | # CONFIG_USB_RTL8150 is not set | ||
| 492 | CONFIG_USB_USBNET_MII=y | ||
| 493 | CONFIG_USB_USBNET=y | ||
| 494 | CONFIG_USB_NET_AX8817X=y | ||
| 495 | CONFIG_USB_NET_CDCETHER=y | ||
| 496 | # CONFIG_USB_NET_DM9601 is not set | ||
| 497 | # CONFIG_USB_NET_GL620A is not set | ||
| 498 | CONFIG_USB_NET_NET1080=y | ||
| 499 | # CONFIG_USB_NET_PLUSB is not set | ||
| 500 | # CONFIG_USB_NET_MCS7830 is not set | ||
| 501 | # CONFIG_USB_NET_RNDIS_HOST is not set | ||
| 502 | CONFIG_USB_NET_CDC_SUBSET=y | ||
| 503 | CONFIG_USB_ALI_M5632=y | ||
| 504 | # CONFIG_USB_AN2720 is not set | ||
| 505 | # CONFIG_USB_BELKIN is not set | ||
| 506 | # CONFIG_USB_ARMLINUX is not set | ||
| 507 | # CONFIG_USB_EPSON2888 is not set | ||
| 508 | # CONFIG_USB_KC2190 is not set | ||
| 509 | CONFIG_USB_NET_ZAURUS=y | ||
| 510 | # CONFIG_WAN is not set | ||
| 511 | CONFIG_PPP=y | ||
| 512 | # CONFIG_PPP_MULTILINK is not set | ||
| 513 | # CONFIG_PPP_FILTER is not set | ||
| 514 | # CONFIG_PPP_ASYNC is not set | ||
| 515 | # CONFIG_PPP_SYNC_TTY is not set | ||
| 516 | # CONFIG_PPP_DEFLATE is not set | ||
| 517 | # CONFIG_PPP_BSDCOMP is not set | ||
| 518 | # CONFIG_PPP_MPPE is not set | ||
| 519 | # CONFIG_PPPOE is not set | ||
| 520 | # CONFIG_PPPOL2TP is not set | ||
| 521 | # CONFIG_SLIP is not set | ||
| 522 | CONFIG_SLHC=y | ||
| 523 | # CONFIG_SHAPER is not set | ||
| 524 | # CONFIG_NETCONSOLE is not set | ||
| 525 | # CONFIG_NETPOLL is not set | ||
| 526 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
| 527 | # CONFIG_ISDN is not set | ||
| 528 | |||
| 529 | # | ||
| 530 | # Input device support | ||
| 531 | # | ||
| 532 | CONFIG_INPUT=y | ||
| 533 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
| 534 | # CONFIG_INPUT_POLLDEV is not set | ||
| 535 | |||
| 536 | # | ||
| 537 | # Userland interfaces | ||
| 538 | # | ||
| 539 | CONFIG_INPUT_MOUSEDEV=y | ||
| 540 | CONFIG_INPUT_MOUSEDEV_PSAUX=y | ||
| 541 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | ||
| 542 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | ||
| 543 | # CONFIG_INPUT_JOYDEV is not set | ||
| 544 | # CONFIG_INPUT_TSDEV is not set | ||
| 545 | CONFIG_INPUT_EVDEV=y | ||
| 546 | # CONFIG_INPUT_EVBUG is not set | ||
| 547 | |||
| 548 | # | ||
| 549 | # Input Device Drivers | ||
| 550 | # | ||
| 551 | CONFIG_INPUT_KEYBOARD=y | ||
| 552 | CONFIG_KEYBOARD_ATKBD=y | ||
| 553 | # CONFIG_KEYBOARD_SUNKBD is not set | ||
| 554 | # CONFIG_KEYBOARD_LKKBD is not set | ||
| 555 | # CONFIG_KEYBOARD_XTKBD is not set | ||
| 556 | # CONFIG_KEYBOARD_NEWTON is not set | ||
| 557 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
| 558 | CONFIG_KEYBOARD_OMAP=y | ||
| 559 | # CONFIG_KEYBOARD_GPIO is not set | ||
| 560 | # CONFIG_INPUT_MOUSE is not set | ||
| 561 | # CONFIG_INPUT_JOYSTICK is not set | ||
| 562 | # CONFIG_INPUT_TABLET is not set | ||
| 563 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
| 564 | # CONFIG_INPUT_MISC is not set | ||
| 565 | |||
| 566 | # | ||
| 567 | # Hardware I/O ports | ||
| 568 | # | ||
| 569 | CONFIG_SERIO=y | ||
| 570 | CONFIG_SERIO_SERPORT=y | ||
| 571 | CONFIG_SERIO_LIBPS2=y | ||
| 572 | # CONFIG_SERIO_RAW is not set | ||
| 573 | # CONFIG_GAMEPORT is not set | ||
| 574 | |||
| 575 | # | ||
| 576 | # Character devices | ||
| 577 | # | ||
| 578 | CONFIG_VT=y | ||
| 579 | CONFIG_VT_CONSOLE=y | ||
| 580 | CONFIG_HW_CONSOLE=y | ||
| 581 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
| 582 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
| 583 | |||
| 584 | # | ||
| 585 | # Serial drivers | ||
| 586 | # | ||
| 587 | CONFIG_SERIAL_8250=y | ||
| 588 | CONFIG_SERIAL_8250_CONSOLE=y | ||
| 589 | CONFIG_SERIAL_8250_NR_UARTS=4 | ||
| 590 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | ||
| 591 | # CONFIG_SERIAL_8250_EXTENDED is not set | ||
| 592 | |||
| 593 | # | ||
| 594 | # Non-8250 serial port support | ||
| 595 | # | ||
| 596 | CONFIG_SERIAL_CORE=y | ||
| 597 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
| 598 | CONFIG_UNIX98_PTYS=y | ||
| 599 | CONFIG_LEGACY_PTYS=y | ||
| 600 | CONFIG_LEGACY_PTY_COUNT=256 | ||
| 601 | # CONFIG_IPMI_HANDLER is not set | ||
| 602 | # CONFIG_WATCHDOG is not set | ||
| 603 | CONFIG_HW_RANDOM=y | ||
| 604 | CONFIG_HW_RANDOM_OMAP=y | ||
| 605 | # CONFIG_NVRAM is not set | ||
| 606 | # CONFIG_R3964 is not set | ||
| 607 | # CONFIG_RAW_DRIVER is not set | ||
| 608 | # CONFIG_TCG_TPM is not set | ||
| 609 | # CONFIG_I2C is not set | ||
| 610 | |||
| 611 | # | ||
| 612 | # SPI support | ||
| 613 | # | ||
| 614 | # CONFIG_SPI is not set | ||
| 615 | # CONFIG_SPI_MASTER is not set | ||
| 616 | # CONFIG_W1 is not set | ||
| 617 | CONFIG_HWMON=y | ||
| 618 | # CONFIG_HWMON_VID is not set | ||
| 619 | # CONFIG_SENSORS_ABITUGURU is not set | ||
| 620 | # CONFIG_SENSORS_ABITUGURU3 is not set | ||
| 621 | # CONFIG_SENSORS_F71805F is not set | ||
| 622 | # CONFIG_SENSORS_IT87 is not set | ||
| 623 | # CONFIG_SENSORS_PC87360 is not set | ||
| 624 | # CONFIG_SENSORS_PC87427 is not set | ||
| 625 | # CONFIG_SENSORS_SMSC47M1 is not set | ||
| 626 | # CONFIG_SENSORS_SMSC47B397 is not set | ||
| 627 | # CONFIG_SENSORS_VT1211 is not set | ||
| 628 | # CONFIG_SENSORS_W83627HF is not set | ||
| 629 | # CONFIG_SENSORS_W83627EHF is not set | ||
| 630 | # CONFIG_HWMON_DEBUG_CHIP is not set | ||
| 631 | CONFIG_MISC_DEVICES=y | ||
| 632 | # CONFIG_EEPROM_93CX6 is not set | ||
| 633 | |||
| 634 | # | ||
| 635 | # Multifunction device drivers | ||
| 636 | # | ||
| 637 | # CONFIG_MFD_SM501 is not set | ||
| 638 | # CONFIG_NEW_LEDS is not set | ||
| 639 | |||
| 640 | # | ||
| 641 | # Multimedia devices | ||
| 642 | # | ||
| 643 | # CONFIG_VIDEO_DEV is not set | ||
| 644 | # CONFIG_DVB_CORE is not set | ||
| 645 | CONFIG_DAB=y | ||
| 646 | # CONFIG_USB_DABUSB is not set | ||
| 647 | |||
| 648 | # | ||
| 649 | # Graphics support | ||
| 650 | # | ||
| 651 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 652 | |||
| 653 | # | ||
| 654 | # Display device support | ||
| 655 | # | ||
| 656 | # CONFIG_DISPLAY_SUPPORT is not set | ||
| 657 | # CONFIG_VGASTATE is not set | ||
| 658 | CONFIG_VIDEO_OUTPUT_CONTROL=y | ||
| 659 | # CONFIG_FB is not set | ||
| 660 | |||
| 661 | # | ||
| 662 | # Console display driver support | ||
| 663 | # | ||
| 664 | # CONFIG_VGA_CONSOLE is not set | ||
| 665 | CONFIG_DUMMY_CONSOLE=y | ||
| 666 | |||
| 667 | # | ||
| 668 | # Sound | ||
| 669 | # | ||
| 670 | # CONFIG_SOUND is not set | ||
| 671 | CONFIG_HID_SUPPORT=y | ||
| 672 | CONFIG_HID=y | ||
| 673 | CONFIG_HID_DEBUG=y | ||
| 674 | |||
| 675 | # | ||
| 676 | # USB Input Devices | ||
| 677 | # | ||
| 678 | CONFIG_USB_HID=y | ||
| 679 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | ||
| 680 | # CONFIG_HID_FF is not set | ||
| 681 | # CONFIG_USB_HIDDEV is not set | ||
| 682 | CONFIG_USB_SUPPORT=y | ||
| 683 | CONFIG_USB_ARCH_HAS_HCD=y | ||
| 684 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
| 685 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
| 686 | CONFIG_USB=y | ||
| 687 | CONFIG_USB_DEBUG=y | ||
| 688 | |||
| 689 | # | ||
| 690 | # Miscellaneous USB options | ||
| 691 | # | ||
| 692 | CONFIG_USB_DEVICEFS=y | ||
| 693 | CONFIG_USB_DEVICE_CLASS=y | ||
| 694 | # CONFIG_USB_DYNAMIC_MINORS is not set | ||
| 695 | # CONFIG_USB_SUSPEND is not set | ||
| 696 | # CONFIG_USB_PERSIST is not set | ||
| 697 | # CONFIG_USB_OTG is not set | ||
| 698 | |||
| 699 | # | ||
| 700 | # USB Host Controller Drivers | ||
| 701 | # | ||
| 702 | # CONFIG_USB_ISP116X_HCD is not set | ||
| 703 | CONFIG_USB_OHCI_HCD=y | ||
| 704 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | ||
| 705 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | ||
| 706 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | ||
| 707 | # CONFIG_USB_SL811_HCD is not set | ||
| 708 | # CONFIG_USB_R8A66597_HCD is not set | ||
| 709 | # CONFIG_USB_MUSB_HDRC is not set | ||
| 710 | |||
| 711 | # | ||
| 712 | # USB Device Class drivers | ||
| 713 | # | ||
| 714 | # CONFIG_USB_ACM is not set | ||
| 715 | # CONFIG_USB_PRINTER is not set | ||
| 716 | |||
| 717 | # | ||
| 718 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
| 719 | # | ||
| 720 | |||
| 721 | # | ||
| 722 | # may also be needed; see USB_STORAGE Help for more information | ||
| 723 | # | ||
| 724 | CONFIG_USB_STORAGE=y | ||
| 725 | # CONFIG_USB_STORAGE_DEBUG is not set | ||
| 726 | # CONFIG_USB_STORAGE_DATAFAB is not set | ||
| 727 | # CONFIG_USB_STORAGE_FREECOM is not set | ||
| 728 | # CONFIG_USB_STORAGE_DPCM is not set | ||
| 729 | # CONFIG_USB_STORAGE_USBAT is not set | ||
| 730 | # CONFIG_USB_STORAGE_SDDR09 is not set | ||
| 731 | # CONFIG_USB_STORAGE_SDDR55 is not set | ||
| 732 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | ||
| 733 | # CONFIG_USB_STORAGE_ALAUDA is not set | ||
| 734 | # CONFIG_USB_STORAGE_KARMA is not set | ||
| 735 | # CONFIG_USB_LIBUSUAL is not set | ||
| 736 | |||
| 737 | # | ||
| 738 | # USB Imaging devices | ||
| 739 | # | ||
| 740 | # CONFIG_USB_MDC800 is not set | ||
| 741 | # CONFIG_USB_MICROTEK is not set | ||
| 742 | CONFIG_USB_MON=y | ||
| 743 | |||
| 744 | # | ||
| 745 | # USB port drivers | ||
| 746 | # | ||
| 747 | |||
| 748 | # | ||
| 749 | # USB Serial Converter support | ||
| 750 | # | ||
| 751 | # CONFIG_USB_SERIAL is not set | ||
| 752 | |||
| 753 | # | ||
| 754 | # USB Miscellaneous drivers | ||
| 755 | # | ||
| 756 | # CONFIG_USB_EMI62 is not set | ||
| 757 | # CONFIG_USB_EMI26 is not set | ||
| 758 | # CONFIG_USB_ADUTUX is not set | ||
| 759 | # CONFIG_USB_AUERSWALD is not set | ||
| 760 | # CONFIG_USB_RIO500 is not set | ||
| 761 | # CONFIG_USB_LEGOTOWER is not set | ||
| 762 | # CONFIG_USB_LCD is not set | ||
| 763 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 764 | # CONFIG_USB_LED is not set | ||
| 765 | # CONFIG_USB_CYPRESS_CY7C63 is not set | ||
| 766 | # CONFIG_USB_CYTHERM is not set | ||
| 767 | # CONFIG_USB_PHIDGET is not set | ||
| 768 | # CONFIG_USB_IDMOUSE is not set | ||
| 769 | # CONFIG_USB_FTDI_ELAN is not set | ||
| 770 | # CONFIG_USB_APPLEDISPLAY is not set | ||
| 771 | # CONFIG_USB_LD is not set | ||
| 772 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
| 773 | # CONFIG_USB_IOWARRIOR is not set | ||
| 774 | # CONFIG_USB_TEST is not set | ||
| 775 | |||
| 776 | # | ||
| 777 | # USB DSL modem support | ||
| 778 | # | ||
| 779 | |||
| 780 | # | ||
| 781 | # USB Gadget Support | ||
| 782 | # | ||
| 783 | # CONFIG_USB_GADGET is not set | ||
| 784 | CONFIG_MMC=y | ||
| 785 | # CONFIG_MMC_DEBUG is not set | ||
| 786 | # CONFIG_MMC_UNSAFE_RESUME is not set | ||
| 787 | |||
| 788 | # | ||
| 789 | # MMC/SD Card Drivers | ||
| 790 | # | ||
| 791 | CONFIG_MMC_BLOCK=y | ||
| 792 | CONFIG_MMC_BLOCK_BOUNCE=y | ||
| 793 | |||
| 794 | # | ||
| 795 | # MMC/SD Host Controller Drivers | ||
| 796 | # | ||
| 797 | CONFIG_MMC_OMAP=y | ||
| 798 | CONFIG_RTC_LIB=y | ||
| 799 | # CONFIG_RTC_CLASS is not set | ||
| 800 | |||
| 801 | # | ||
| 802 | # DMA Engine support | ||
| 803 | # | ||
| 804 | # CONFIG_DMA_ENGINE is not set | ||
| 805 | |||
| 806 | # | ||
| 807 | # DMA Clients | ||
| 808 | # | ||
| 809 | |||
| 810 | # | ||
| 811 | # DMA Devices | ||
| 812 | # | ||
| 813 | |||
| 814 | # | ||
| 815 | # CBUS support | ||
| 816 | # | ||
| 817 | # CONFIG_CBUS is not set | ||
| 818 | |||
| 819 | # | ||
| 820 | # File systems | ||
| 821 | # | ||
| 822 | CONFIG_EXT2_FS=y | ||
| 823 | # CONFIG_EXT2_FS_XATTR is not set | ||
| 824 | # CONFIG_EXT2_FS_XIP is not set | ||
| 825 | CONFIG_EXT3_FS=y | ||
| 826 | CONFIG_EXT3_FS_XATTR=y | ||
| 827 | # CONFIG_EXT3_FS_POSIX_ACL is not set | ||
| 828 | # CONFIG_EXT3_FS_SECURITY is not set | ||
| 829 | # CONFIG_EXT4DEV_FS is not set | ||
| 830 | CONFIG_JBD=y | ||
| 831 | # CONFIG_JBD_DEBUG is not set | ||
| 832 | CONFIG_FS_MBCACHE=y | ||
| 833 | # CONFIG_REISERFS_FS is not set | ||
| 834 | # CONFIG_JFS_FS is not set | ||
| 835 | # CONFIG_FS_POSIX_ACL is not set | ||
| 836 | # CONFIG_XFS_FS is not set | ||
| 837 | # CONFIG_GFS2_FS is not set | ||
| 838 | # CONFIG_OCFS2_FS is not set | ||
| 839 | # CONFIG_MINIX_FS is not set | ||
| 840 | # CONFIG_ROMFS_FS is not set | ||
| 841 | CONFIG_INOTIFY=y | ||
| 842 | CONFIG_INOTIFY_USER=y | ||
| 843 | # CONFIG_QUOTA is not set | ||
| 844 | CONFIG_DNOTIFY=y | ||
| 845 | # CONFIG_AUTOFS_FS is not set | ||
| 846 | # CONFIG_AUTOFS4_FS is not set | ||
| 847 | # CONFIG_FUSE_FS is not set | ||
| 848 | |||
| 849 | # | ||
| 850 | # CD-ROM/DVD Filesystems | ||
| 851 | # | ||
| 852 | # CONFIG_ISO9660_FS is not set | ||
| 853 | # CONFIG_UDF_FS is not set | ||
| 854 | |||
| 855 | # | ||
| 856 | # DOS/FAT/NT Filesystems | ||
| 857 | # | ||
| 858 | # CONFIG_MSDOS_FS is not set | ||
| 859 | # CONFIG_VFAT_FS is not set | ||
| 860 | # CONFIG_NTFS_FS is not set | ||
| 861 | |||
| 862 | # | ||
| 863 | # Pseudo filesystems | ||
| 864 | # | ||
| 865 | CONFIG_PROC_FS=y | ||
| 866 | CONFIG_PROC_SYSCTL=y | ||
| 867 | CONFIG_SYSFS=y | ||
| 868 | CONFIG_TMPFS=y | ||
| 869 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
| 870 | # CONFIG_HUGETLB_PAGE is not set | ||
| 871 | CONFIG_RAMFS=y | ||
| 872 | # CONFIG_CONFIGFS_FS is not set | ||
| 873 | |||
| 874 | # | ||
| 875 | # Miscellaneous filesystems | ||
| 876 | # | ||
| 877 | # CONFIG_ADFS_FS is not set | ||
| 878 | # CONFIG_AFFS_FS is not set | ||
| 879 | # CONFIG_HFS_FS is not set | ||
| 880 | # CONFIG_HFSPLUS_FS is not set | ||
| 881 | # CONFIG_BEFS_FS is not set | ||
| 882 | # CONFIG_BFS_FS is not set | ||
| 883 | # CONFIG_EFS_FS is not set | ||
| 884 | # CONFIG_CRAMFS is not set | ||
| 885 | # CONFIG_VXFS_FS is not set | ||
| 886 | # CONFIG_HPFS_FS is not set | ||
| 887 | # CONFIG_QNX4FS_FS is not set | ||
| 888 | # CONFIG_SYSV_FS is not set | ||
| 889 | # CONFIG_UFS_FS is not set | ||
| 890 | |||
| 891 | # | ||
| 892 | # Network File Systems | ||
| 893 | # | ||
| 894 | CONFIG_NFS_FS=y | ||
| 895 | CONFIG_NFS_V3=y | ||
| 896 | # CONFIG_NFS_V3_ACL is not set | ||
| 897 | CONFIG_NFS_V4=y | ||
| 898 | # CONFIG_NFS_DIRECTIO is not set | ||
| 899 | # CONFIG_NFSD is not set | ||
| 900 | # CONFIG_ROOT_NFS is not set | ||
| 901 | CONFIG_LOCKD=y | ||
| 902 | CONFIG_LOCKD_V4=y | ||
| 903 | CONFIG_NFS_COMMON=y | ||
| 904 | CONFIG_SUNRPC=y | ||
| 905 | CONFIG_SUNRPC_GSS=y | ||
| 906 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 907 | CONFIG_RPCSEC_GSS_KRB5=y | ||
| 908 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
| 909 | # CONFIG_SMB_FS is not set | ||
| 910 | # CONFIG_CIFS is not set | ||
| 911 | # CONFIG_NCP_FS is not set | ||
| 912 | # CONFIG_CODA_FS is not set | ||
| 913 | # CONFIG_AFS_FS is not set | ||
| 914 | |||
| 915 | # | ||
| 916 | # Partition Types | ||
| 917 | # | ||
| 918 | CONFIG_PARTITION_ADVANCED=y | ||
| 919 | # CONFIG_ACORN_PARTITION is not set | ||
| 920 | # CONFIG_OSF_PARTITION is not set | ||
| 921 | # CONFIG_AMIGA_PARTITION is not set | ||
| 922 | # CONFIG_ATARI_PARTITION is not set | ||
| 923 | # CONFIG_MAC_PARTITION is not set | ||
| 924 | CONFIG_MSDOS_PARTITION=y | ||
| 925 | # CONFIG_BSD_DISKLABEL is not set | ||
| 926 | # CONFIG_MINIX_SUBPARTITION is not set | ||
| 927 | # CONFIG_SOLARIS_X86_PARTITION is not set | ||
| 928 | # CONFIG_UNIXWARE_DISKLABEL is not set | ||
| 929 | # CONFIG_LDM_PARTITION is not set | ||
| 930 | # CONFIG_SGI_PARTITION is not set | ||
| 931 | # CONFIG_ULTRIX_PARTITION is not set | ||
| 932 | # CONFIG_SUN_PARTITION is not set | ||
| 933 | # CONFIG_KARMA_PARTITION is not set | ||
| 934 | # CONFIG_EFI_PARTITION is not set | ||
| 935 | # CONFIG_SYSV68_PARTITION is not set | ||
| 936 | |||
| 937 | # | ||
| 938 | # Native Language Support | ||
| 939 | # | ||
| 940 | CONFIG_NLS=y | ||
| 941 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
| 942 | CONFIG_NLS_CODEPAGE_437=y | ||
| 943 | # CONFIG_NLS_CODEPAGE_737 is not set | ||
| 944 | # CONFIG_NLS_CODEPAGE_775 is not set | ||
| 945 | # CONFIG_NLS_CODEPAGE_850 is not set | ||
| 946 | CONFIG_NLS_CODEPAGE_852=y | ||
| 947 | # CONFIG_NLS_CODEPAGE_855 is not set | ||
| 948 | # CONFIG_NLS_CODEPAGE_857 is not set | ||
| 949 | # CONFIG_NLS_CODEPAGE_860 is not set | ||
| 950 | # CONFIG_NLS_CODEPAGE_861 is not set | ||
| 951 | # CONFIG_NLS_CODEPAGE_862 is not set | ||
| 952 | # CONFIG_NLS_CODEPAGE_863 is not set | ||
| 953 | # CONFIG_NLS_CODEPAGE_864 is not set | ||
| 954 | # CONFIG_NLS_CODEPAGE_865 is not set | ||
| 955 | # CONFIG_NLS_CODEPAGE_866 is not set | ||
| 956 | # CONFIG_NLS_CODEPAGE_869 is not set | ||
| 957 | # CONFIG_NLS_CODEPAGE_936 is not set | ||
| 958 | # CONFIG_NLS_CODEPAGE_950 is not set | ||
| 959 | # CONFIG_NLS_CODEPAGE_932 is not set | ||
| 960 | # CONFIG_NLS_CODEPAGE_949 is not set | ||
| 961 | # CONFIG_NLS_CODEPAGE_874 is not set | ||
| 962 | # CONFIG_NLS_ISO8859_8 is not set | ||
| 963 | # CONFIG_NLS_CODEPAGE_1250 is not set | ||
| 964 | # CONFIG_NLS_CODEPAGE_1251 is not set | ||
| 965 | # CONFIG_NLS_ASCII is not set | ||
| 966 | CONFIG_NLS_ISO8859_1=y | ||
| 967 | # CONFIG_NLS_ISO8859_2 is not set | ||
| 968 | # CONFIG_NLS_ISO8859_3 is not set | ||
| 969 | # CONFIG_NLS_ISO8859_4 is not set | ||
| 970 | # CONFIG_NLS_ISO8859_5 is not set | ||
| 971 | # CONFIG_NLS_ISO8859_6 is not set | ||
| 972 | # CONFIG_NLS_ISO8859_7 is not set | ||
| 973 | # CONFIG_NLS_ISO8859_9 is not set | ||
| 974 | # CONFIG_NLS_ISO8859_13 is not set | ||
| 975 | # CONFIG_NLS_ISO8859_14 is not set | ||
| 976 | CONFIG_NLS_ISO8859_15=y | ||
| 977 | # CONFIG_NLS_KOI8_R is not set | ||
| 978 | # CONFIG_NLS_KOI8_U is not set | ||
| 979 | # CONFIG_NLS_UTF8 is not set | ||
| 980 | |||
| 981 | # | ||
| 982 | # Distributed Lock Manager | ||
| 983 | # | ||
| 984 | # CONFIG_DLM is not set | ||
| 985 | |||
| 986 | # | ||
| 987 | # Profiling support | ||
| 988 | # | ||
| 989 | # CONFIG_PROFILING is not set | ||
| 990 | |||
| 991 | # | ||
| 992 | # Kernel hacking | ||
| 993 | # | ||
| 994 | # CONFIG_PRINTK_TIME is not set | ||
| 995 | CONFIG_ENABLE_MUST_CHECK=y | ||
| 996 | CONFIG_MAGIC_SYSRQ=y | ||
| 997 | # CONFIG_UNUSED_SYMBOLS is not set | ||
| 998 | # CONFIG_DEBUG_FS is not set | ||
| 999 | # CONFIG_HEADERS_CHECK is not set | ||
| 1000 | CONFIG_DEBUG_KERNEL=y | ||
| 1001 | # CONFIG_DEBUG_SHIRQ is not set | ||
| 1002 | CONFIG_DETECT_SOFTLOCKUP=y | ||
| 1003 | CONFIG_SCHED_DEBUG=y | ||
| 1004 | # CONFIG_SCHEDSTATS is not set | ||
| 1005 | # CONFIG_TIMER_STATS is not set | ||
| 1006 | # CONFIG_SLUB_DEBUG_ON is not set | ||
| 1007 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
| 1008 | # CONFIG_RT_MUTEX_TESTER is not set | ||
| 1009 | CONFIG_DEBUG_SPINLOCK=y | ||
| 1010 | # CONFIG_DEBUG_MUTEXES is not set | ||
| 1011 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
| 1012 | # CONFIG_PROVE_LOCKING is not set | ||
| 1013 | # CONFIG_LOCK_STAT is not set | ||
| 1014 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
| 1015 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
| 1016 | # CONFIG_DEBUG_KOBJECT is not set | ||
| 1017 | CONFIG_DEBUG_BUGVERBOSE=y | ||
| 1018 | # CONFIG_DEBUG_INFO is not set | ||
| 1019 | # CONFIG_DEBUG_VM is not set | ||
| 1020 | # CONFIG_DEBUG_LIST is not set | ||
| 1021 | CONFIG_FRAME_POINTER=y | ||
| 1022 | CONFIG_FORCED_INLINING=y | ||
| 1023 | # CONFIG_FAULT_INJECTION is not set | ||
| 1024 | # CONFIG_DEBUG_USER is not set | ||
| 1025 | CONFIG_DEBUG_ERRORS=y | ||
| 1026 | # CONFIG_DEBUG_LL is not set | ||
| 1027 | |||
| 1028 | # | ||
| 1029 | # Security options | ||
| 1030 | # | ||
| 1031 | # CONFIG_KEYS is not set | ||
| 1032 | CONFIG_SECURITY=y | ||
| 1033 | # CONFIG_SECURITY_NETWORK is not set | ||
| 1034 | CONFIG_SECURITY_CAPABILITIES=y | ||
| 1035 | # CONFIG_SECURITY_ROOTPLUG is not set | ||
| 1036 | # CONFIG_SECURITY_LOWMEM is not set | ||
| 1037 | CONFIG_CRYPTO=y | ||
| 1038 | CONFIG_CRYPTO_ALGAPI=y | ||
| 1039 | CONFIG_CRYPTO_BLKCIPHER=y | ||
| 1040 | CONFIG_CRYPTO_MANAGER=y | ||
| 1041 | # CONFIG_CRYPTO_HMAC is not set | ||
| 1042 | # CONFIG_CRYPTO_XCBC is not set | ||
| 1043 | # CONFIG_CRYPTO_NULL is not set | ||
| 1044 | # CONFIG_CRYPTO_MD4 is not set | ||
| 1045 | CONFIG_CRYPTO_MD5=y | ||
| 1046 | # CONFIG_CRYPTO_SHA1 is not set | ||
| 1047 | # CONFIG_CRYPTO_SHA256 is not set | ||
| 1048 | # CONFIG_CRYPTO_SHA512 is not set | ||
| 1049 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1050 | # CONFIG_CRYPTO_TGR192 is not set | ||
| 1051 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1052 | CONFIG_CRYPTO_ECB=y | ||
| 1053 | CONFIG_CRYPTO_CBC=y | ||
| 1054 | CONFIG_CRYPTO_PCBC=y | ||
| 1055 | # CONFIG_CRYPTO_LRW is not set | ||
| 1056 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1057 | CONFIG_CRYPTO_DES=y | ||
| 1058 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1059 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1060 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1061 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1062 | # CONFIG_CRYPTO_AES is not set | ||
| 1063 | # CONFIG_CRYPTO_CAST5 is not set | ||
| 1064 | # CONFIG_CRYPTO_CAST6 is not set | ||
| 1065 | # CONFIG_CRYPTO_TEA is not set | ||
| 1066 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1067 | # CONFIG_CRYPTO_KHAZAD is not set | ||
| 1068 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1069 | # CONFIG_CRYPTO_DEFLATE is not set | ||
| 1070 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1071 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1072 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1073 | CONFIG_CRYPTO_HW=y | ||
| 1074 | |||
| 1075 | # | ||
| 1076 | # Library routines | ||
| 1077 | # | ||
| 1078 | CONFIG_BITREVERSE=y | ||
| 1079 | # CONFIG_CRC_CCITT is not set | ||
| 1080 | # CONFIG_CRC16 is not set | ||
| 1081 | # CONFIG_CRC_ITU_T is not set | ||
| 1082 | CONFIG_CRC32=y | ||
| 1083 | # CONFIG_CRC7 is not set | ||
| 1084 | # CONFIG_LIBCRC32C is not set | ||
| 1085 | CONFIG_PLIST=y | ||
| 1086 | CONFIG_HAS_IOMEM=y | ||
| 1087 | CONFIG_HAS_IOPORT=y | ||
| 1088 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/arm/configs/omap_generic_2420_defconfig b/arch/arm/configs/omap_generic_2420_defconfig new file mode 100644 index 000000000000..cf4073b47aaa --- /dev/null +++ b/arch/arm/configs/omap_generic_2420_defconfig | |||
| @@ -0,0 +1,655 @@ | |||
| 1 | # | ||
| 2 | # Automatically generated make config: don't edit | ||
| 3 | # Linux kernel version: 2.6.23-rc6-omap1 | ||
| 4 | # Tue Sep 18 11:44:48 2007 | ||
| 5 | # | ||
| 6 | CONFIG_ARM=y | ||
| 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | ||
| 8 | CONFIG_GENERIC_GPIO=y | ||
| 9 | CONFIG_GENERIC_TIME=y | ||
| 10 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 11 | CONFIG_MMU=y | ||
| 12 | # CONFIG_NO_IOPORT is not set | ||
| 13 | CONFIG_GENERIC_HARDIRQS=y | ||
| 14 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 15 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 16 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
| 17 | CONFIG_HARDIRQS_SW_RESEND=y | ||
| 18 | CONFIG_GENERIC_IRQ_PROBE=y | ||
| 19 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
| 20 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
| 21 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
| 22 | CONFIG_GENERIC_HWEIGHT=y | ||
| 23 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
| 24 | CONFIG_ZONE_DMA=y | ||
| 25 | CONFIG_VECTORS_BASE=0xffff0000 | ||
| 26 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
| 27 | |||
| 28 | # | ||
| 29 | # General setup | ||
| 30 | # | ||
| 31 | CONFIG_EXPERIMENTAL=y | ||
| 32 | CONFIG_BROKEN_ON_SMP=y | ||
| 33 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 34 | CONFIG_LOCALVERSION="" | ||
| 35 | CONFIG_LOCALVERSION_AUTO=y | ||
| 36 | CONFIG_SWAP=y | ||
| 37 | CONFIG_SYSVIPC=y | ||
| 38 | CONFIG_SYSVIPC_SYSCTL=y | ||
| 39 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 40 | # CONFIG_USER_NS is not set | ||
| 41 | # CONFIG_IKCONFIG is not set | ||
| 42 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 43 | CONFIG_SYSFS_DEPRECATED=y | ||
| 44 | # CONFIG_RELAY is not set | ||
| 45 | CONFIG_BLK_DEV_INITRD=y | ||
| 46 | CONFIG_INITRAMFS_SOURCE="" | ||
| 47 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
| 48 | CONFIG_SYSCTL=y | ||
| 49 | # CONFIG_EMBEDDED is not set | ||
| 50 | CONFIG_UID16=y | ||
| 51 | CONFIG_SYSCTL_SYSCALL=y | ||
| 52 | CONFIG_KALLSYMS=y | ||
| 53 | # CONFIG_KALLSYMS_ALL is not set | ||
| 54 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 55 | CONFIG_HOTPLUG=y | ||
| 56 | CONFIG_PRINTK=y | ||
| 57 | CONFIG_BUG=y | ||
| 58 | CONFIG_ELF_CORE=y | ||
| 59 | CONFIG_BASE_FULL=y | ||
| 60 | CONFIG_FUTEX=y | ||
| 61 | CONFIG_ANON_INODES=y | ||
| 62 | CONFIG_EPOLL=y | ||
| 63 | CONFIG_SIGNALFD=y | ||
| 64 | CONFIG_TIMERFD=y | ||
| 65 | CONFIG_EVENTFD=y | ||
| 66 | CONFIG_SHMEM=y | ||
| 67 | CONFIG_VM_EVENT_COUNTERS=y | ||
| 68 | CONFIG_SLUB_DEBUG=y | ||
| 69 | # CONFIG_SLAB is not set | ||
| 70 | CONFIG_SLUB=y | ||
| 71 | # CONFIG_SLOB is not set | ||
| 72 | CONFIG_RT_MUTEXES=y | ||
| 73 | # CONFIG_TINY_SHMEM is not set | ||
| 74 | CONFIG_BASE_SMALL=0 | ||
| 75 | CONFIG_MODULES=y | ||
| 76 | CONFIG_MODULE_UNLOAD=y | ||
| 77 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 78 | # CONFIG_MODVERSIONS is not set | ||
| 79 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 80 | # CONFIG_KMOD is not set | ||
| 81 | CONFIG_BLOCK=y | ||
| 82 | # CONFIG_LBD is not set | ||
| 83 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 84 | # CONFIG_LSF is not set | ||
| 85 | # CONFIG_BLK_DEV_BSG is not set | ||
| 86 | |||
| 87 | # | ||
| 88 | # IO Schedulers | ||
| 89 | # | ||
| 90 | CONFIG_IOSCHED_NOOP=y | ||
| 91 | CONFIG_IOSCHED_AS=y | ||
| 92 | CONFIG_IOSCHED_DEADLINE=y | ||
| 93 | CONFIG_IOSCHED_CFQ=y | ||
| 94 | # CONFIG_DEFAULT_AS is not set | ||
| 95 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 96 | CONFIG_DEFAULT_CFQ=y | ||
| 97 | # CONFIG_DEFAULT_NOOP is not set | ||
| 98 | CONFIG_DEFAULT_IOSCHED="cfq" | ||
| 99 | |||
| 100 | # | ||
| 101 | # System Type | ||
| 102 | # | ||
| 103 | # CONFIG_ARCH_AAEC2000 is not set | ||
| 104 | # CONFIG_ARCH_INTEGRATOR is not set | ||
| 105 | # CONFIG_ARCH_REALVIEW is not set | ||
| 106 | # CONFIG_ARCH_VERSATILE is not set | ||
| 107 | # CONFIG_ARCH_AT91 is not set | ||
| 108 | # CONFIG_ARCH_CLPS7500 is not set | ||
| 109 | # CONFIG_ARCH_CLPS711X is not set | ||
| 110 | # CONFIG_ARCH_CO285 is not set | ||
| 111 | # CONFIG_ARCH_EBSA110 is not set | ||
| 112 | # CONFIG_ARCH_EP93XX is not set | ||
| 113 | # CONFIG_ARCH_FOOTBRIDGE is not set | ||
| 114 | # CONFIG_ARCH_NETX is not set | ||
| 115 | # CONFIG_ARCH_H720X is not set | ||
| 116 | # CONFIG_ARCH_IMX is not set | ||
| 117 | # CONFIG_ARCH_IOP13XX is not set | ||
| 118 | # CONFIG_ARCH_IOP32X is not set | ||
| 119 | # CONFIG_ARCH_IOP33X is not set | ||
| 120 | # CONFIG_ARCH_IXP23XX is not set | ||
| 121 | # CONFIG_ARCH_IXP2000 is not set | ||
| 122 | # CONFIG_ARCH_IXP4XX is not set | ||
| 123 | # CONFIG_ARCH_L7200 is not set | ||
| 124 | # CONFIG_ARCH_KS8695 is not set | ||
| 125 | # CONFIG_ARCH_NS9XXX is not set | ||
| 126 | # CONFIG_ARCH_MXC is not set | ||
| 127 | # CONFIG_ARCH_PNX4008 is not set | ||
| 128 | # CONFIG_ARCH_PXA is not set | ||
| 129 | # CONFIG_ARCH_RPC is not set | ||
| 130 | # CONFIG_ARCH_SA1100 is not set | ||
| 131 | # CONFIG_ARCH_S3C2410 is not set | ||
| 132 | # CONFIG_ARCH_SHARK is not set | ||
| 133 | # CONFIG_ARCH_LH7A40X is not set | ||
| 134 | # CONFIG_ARCH_DAVINCI is not set | ||
| 135 | CONFIG_ARCH_OMAP=y | ||
| 136 | |||
| 137 | # | ||
| 138 | # TI OMAP Implementations | ||
| 139 | # | ||
| 140 | CONFIG_ARCH_OMAP_OTG=y | ||
| 141 | # CONFIG_ARCH_OMAP1 is not set | ||
| 142 | CONFIG_ARCH_OMAP2=y | ||
| 143 | # CONFIG_ARCH_OMAP3 is not set | ||
| 144 | |||
| 145 | # | ||
| 146 | # OMAP Feature Selections | ||
| 147 | # | ||
| 148 | # CONFIG_OMAP_RESET_CLOCKS is not set | ||
| 149 | CONFIG_OMAP_BOOT_TAG=y | ||
| 150 | # CONFIG_OMAP_BOOT_REASON is not set | ||
| 151 | # CONFIG_OMAP_COMPONENT_VERSION is not set | ||
| 152 | # CONFIG_OMAP_GPIO_SWITCH is not set | ||
| 153 | # CONFIG_OMAP_MUX is not set | ||
| 154 | # CONFIG_OMAP_STI is not set | ||
| 155 | CONFIG_OMAP_MCBSP=y | ||
| 156 | # CONFIG_OMAP_MMU_FWK is not set | ||
| 157 | # CONFIG_OMAP_MBOX_FWK is not set | ||
| 158 | CONFIG_OMAP_MPU_TIMER=y | ||
| 159 | # CONFIG_OMAP_32K_TIMER is not set | ||
| 160 | CONFIG_OMAP_DM_TIMER=y | ||
| 161 | # CONFIG_OMAP_LL_DEBUG_UART1 is not set | ||
| 162 | # CONFIG_OMAP_LL_DEBUG_UART2 is not set | ||
| 163 | CONFIG_OMAP_LL_DEBUG_UART3=y | ||
| 164 | # CONFIG_OMAP_DSP is not set | ||
| 165 | CONFIG_MACH_OMAP_GENERIC=y | ||
| 166 | |||
| 167 | # | ||
| 168 | # OMAP Core Type | ||
| 169 | # | ||
| 170 | CONFIG_ARCH_OMAP24XX=y | ||
| 171 | CONFIG_ARCH_OMAP2420=y | ||
| 172 | # CONFIG_ARCH_OMAP2430 is not set | ||
| 173 | |||
| 174 | # | ||
| 175 | # OMAP Board Type | ||
| 176 | # | ||
| 177 | # CONFIG_MACH_NOKIA_N800 is not set | ||
| 178 | # CONFIG_MACH_OMAP_H4 is not set | ||
| 179 | # CONFIG_MACH_OMAP_APOLLON is not set | ||
| 180 | # CONFIG_MACH_OMAP_APOLLON_PLUS is not set | ||
| 181 | # CONFIG_MACH_OMAP_2430SDP is not set | ||
| 182 | |||
| 183 | # | ||
| 184 | # Boot options | ||
| 185 | # | ||
| 186 | |||
| 187 | # | ||
| 188 | # Power management | ||
| 189 | # | ||
| 190 | |||
| 191 | # | ||
| 192 | # Processor Type | ||
| 193 | # | ||
| 194 | CONFIG_CPU_32=y | ||
| 195 | CONFIG_CPU_V6=y | ||
| 196 | # CONFIG_CPU_32v6K is not set | ||
| 197 | CONFIG_CPU_32v6=y | ||
| 198 | CONFIG_CPU_ABRT_EV6=y | ||
| 199 | CONFIG_CPU_PABRT_NOIFAR=y | ||
| 200 | CONFIG_CPU_CACHE_V6=y | ||
| 201 | CONFIG_CPU_CACHE_VIPT=y | ||
| 202 | CONFIG_CPU_COPY_V6=y | ||
| 203 | CONFIG_CPU_TLB_V6=y | ||
| 204 | CONFIG_CPU_HAS_ASID=y | ||
| 205 | CONFIG_CPU_CP15=y | ||
| 206 | CONFIG_CPU_CP15_MMU=y | ||
| 207 | |||
| 208 | # | ||
| 209 | # Processor Features | ||
| 210 | # | ||
| 211 | CONFIG_ARM_THUMB=y | ||
| 212 | # CONFIG_CPU_ICACHE_DISABLE is not set | ||
| 213 | # CONFIG_CPU_DCACHE_DISABLE is not set | ||
| 214 | # CONFIG_CPU_BPREDICT_DISABLE is not set | ||
| 215 | # CONFIG_OUTER_CACHE is not set | ||
| 216 | |||
| 217 | # | ||
| 218 | # Bus support | ||
| 219 | # | ||
| 220 | # CONFIG_PCI_SYSCALL is not set | ||
| 221 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 222 | |||
| 223 | # | ||
| 224 | # PCCARD (PCMCIA/CardBus) support | ||
| 225 | # | ||
| 226 | # CONFIG_PCCARD is not set | ||
| 227 | |||
| 228 | # | ||
| 229 | # Kernel Features | ||
| 230 | # | ||
| 231 | # CONFIG_TICK_ONESHOT is not set | ||
| 232 | # CONFIG_NO_HZ is not set | ||
| 233 | # CONFIG_HIGH_RES_TIMERS is not set | ||
| 234 | # CONFIG_PREEMPT is not set | ||
| 235 | CONFIG_HZ=100 | ||
| 236 | # CONFIG_AEABI is not set | ||
| 237 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | ||
| 238 | CONFIG_SELECT_MEMORY_MODEL=y | ||
| 239 | CONFIG_FLATMEM_MANUAL=y | ||
| 240 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
| 241 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
| 242 | CONFIG_FLATMEM=y | ||
| 243 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
| 244 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 245 | CONFIG_SPLIT_PTLOCK_CPUS=4 | ||
| 246 | # CONFIG_RESOURCES_64BIT is not set | ||
| 247 | CONFIG_ZONE_DMA_FLAG=1 | ||
| 248 | CONFIG_BOUNCE=y | ||
| 249 | CONFIG_VIRT_TO_BUS=y | ||
| 250 | CONFIG_LEDS=y | ||
| 251 | CONFIG_ALIGNMENT_TRAP=y | ||
| 252 | |||
| 253 | # | ||
| 254 | # Boot options | ||
| 255 | # | ||
| 256 | CONFIG_ZBOOT_ROM_TEXT=0x10C08000 | ||
| 257 | CONFIG_ZBOOT_ROM_BSS=0x10200000 | ||
| 258 | # CONFIG_ZBOOT_ROM is not set | ||
| 259 | CONFIG_CMDLINE="" | ||
| 260 | # CONFIG_XIP_KERNEL is not set | ||
| 261 | # CONFIG_KEXEC is not set | ||
| 262 | |||
| 263 | # | ||
| 264 | # CPU Frequency scaling | ||
| 265 | # | ||
| 266 | # CONFIG_CPU_FREQ is not set | ||
| 267 | |||
| 268 | # | ||
| 269 | # Floating point emulation | ||
| 270 | # | ||
| 271 | |||
| 272 | # | ||
| 273 | # At least one emulation must be selected | ||
| 274 | # | ||
| 275 | CONFIG_FPE_NWFPE=y | ||
| 276 | # CONFIG_FPE_NWFPE_XP is not set | ||
| 277 | # CONFIG_FPE_FASTFPE is not set | ||
| 278 | # CONFIG_VFP is not set | ||
| 279 | |||
| 280 | # | ||
| 281 | # Userspace binary formats | ||
| 282 | # | ||
| 283 | CONFIG_BINFMT_ELF=y | ||
| 284 | # CONFIG_BINFMT_AOUT is not set | ||
| 285 | # CONFIG_BINFMT_MISC is not set | ||
| 286 | # CONFIG_ARTHUR is not set | ||
| 287 | |||
| 288 | # | ||
| 289 | # Power management options | ||
| 290 | # | ||
| 291 | # CONFIG_PM is not set | ||
| 292 | CONFIG_SUSPEND_UP_POSSIBLE=y | ||
| 293 | |||
| 294 | # | ||
| 295 | # Networking | ||
| 296 | # | ||
| 297 | # CONFIG_NET is not set | ||
| 298 | |||
| 299 | # | ||
| 300 | # Device Drivers | ||
| 301 | # | ||
| 302 | |||
| 303 | # | ||
| 304 | # Generic Driver Options | ||
| 305 | # | ||
| 306 | CONFIG_STANDALONE=y | ||
| 307 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
| 308 | CONFIG_FW_LOADER=y | ||
| 309 | # CONFIG_DEBUG_DRIVER is not set | ||
| 310 | # CONFIG_DEBUG_DEVRES is not set | ||
| 311 | # CONFIG_SYS_HYPERVISOR is not set | ||
| 312 | # CONFIG_MTD is not set | ||
| 313 | # CONFIG_PARPORT is not set | ||
| 314 | CONFIG_BLK_DEV=y | ||
| 315 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
| 316 | # CONFIG_BLK_DEV_LOOP is not set | ||
| 317 | CONFIG_BLK_DEV_RAM=y | ||
| 318 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
| 319 | CONFIG_BLK_DEV_RAM_SIZE=4096 | ||
| 320 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | ||
| 321 | # CONFIG_CDROM_PKTCDVD is not set | ||
| 322 | |||
| 323 | # | ||
| 324 | # SCSI device support | ||
| 325 | # | ||
| 326 | # CONFIG_RAID_ATTRS is not set | ||
| 327 | # CONFIG_SCSI is not set | ||
| 328 | # CONFIG_SCSI_DMA is not set | ||
| 329 | # CONFIG_SCSI_NETLINK is not set | ||
| 330 | # CONFIG_ATA is not set | ||
| 331 | # CONFIG_MD is not set | ||
| 332 | |||
| 333 | # | ||
| 334 | # Input device support | ||
| 335 | # | ||
| 336 | CONFIG_INPUT=y | ||
| 337 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
| 338 | # CONFIG_INPUT_POLLDEV is not set | ||
| 339 | |||
| 340 | # | ||
| 341 | # Userland interfaces | ||
| 342 | # | ||
| 343 | CONFIG_INPUT_MOUSEDEV=y | ||
| 344 | CONFIG_INPUT_MOUSEDEV_PSAUX=y | ||
| 345 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | ||
| 346 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | ||
| 347 | # CONFIG_INPUT_JOYDEV is not set | ||
| 348 | # CONFIG_INPUT_TSDEV is not set | ||
| 349 | CONFIG_INPUT_EVDEV=y | ||
| 350 | # CONFIG_INPUT_EVBUG is not set | ||
| 351 | |||
| 352 | # | ||
| 353 | # Input Device Drivers | ||
| 354 | # | ||
| 355 | # CONFIG_INPUT_KEYBOARD is not set | ||
| 356 | # CONFIG_INPUT_MOUSE is not set | ||
| 357 | # CONFIG_INPUT_JOYSTICK is not set | ||
| 358 | # CONFIG_INPUT_TABLET is not set | ||
| 359 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
| 360 | # CONFIG_INPUT_MISC is not set | ||
| 361 | |||
| 362 | # | ||
| 363 | # Hardware I/O ports | ||
| 364 | # | ||
| 365 | CONFIG_SERIO=y | ||
| 366 | CONFIG_SERIO_SERPORT=y | ||
| 367 | # CONFIG_SERIO_RAW is not set | ||
| 368 | # CONFIG_GAMEPORT is not set | ||
| 369 | |||
| 370 | # | ||
| 371 | # Character devices | ||
| 372 | # | ||
| 373 | CONFIG_VT=y | ||
| 374 | CONFIG_VT_CONSOLE=y | ||
| 375 | CONFIG_HW_CONSOLE=y | ||
| 376 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
| 377 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
| 378 | |||
| 379 | # | ||
| 380 | # Serial drivers | ||
| 381 | # | ||
| 382 | CONFIG_SERIAL_8250=y | ||
| 383 | CONFIG_SERIAL_8250_CONSOLE=y | ||
| 384 | CONFIG_SERIAL_8250_NR_UARTS=4 | ||
| 385 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | ||
| 386 | # CONFIG_SERIAL_8250_EXTENDED is not set | ||
| 387 | |||
| 388 | # | ||
| 389 | # Non-8250 serial port support | ||
| 390 | # | ||
| 391 | CONFIG_SERIAL_CORE=y | ||
| 392 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
| 393 | CONFIG_UNIX98_PTYS=y | ||
| 394 | # CONFIG_LEGACY_PTYS is not set | ||
| 395 | # CONFIG_IPMI_HANDLER is not set | ||
| 396 | CONFIG_WATCHDOG=y | ||
| 397 | CONFIG_WATCHDOG_NOWAYOUT=y | ||
| 398 | |||
| 399 | # | ||
| 400 | # Watchdog Device Drivers | ||
| 401 | # | ||
| 402 | # CONFIG_SOFT_WATCHDOG is not set | ||
| 403 | # CONFIG_OMAP_WATCHDOG is not set | ||
| 404 | CONFIG_HW_RANDOM=m | ||
| 405 | CONFIG_HW_RANDOM_OMAP=m | ||
| 406 | # CONFIG_NVRAM is not set | ||
| 407 | # CONFIG_R3964 is not set | ||
| 408 | # CONFIG_RAW_DRIVER is not set | ||
| 409 | # CONFIG_TCG_TPM is not set | ||
| 410 | # CONFIG_I2C is not set | ||
| 411 | |||
| 412 | # | ||
| 413 | # SPI support | ||
| 414 | # | ||
| 415 | # CONFIG_SPI is not set | ||
| 416 | # CONFIG_SPI_MASTER is not set | ||
| 417 | # CONFIG_W1 is not set | ||
| 418 | CONFIG_HWMON=y | ||
| 419 | # CONFIG_HWMON_VID is not set | ||
| 420 | # CONFIG_SENSORS_ABITUGURU is not set | ||
| 421 | # CONFIG_SENSORS_ABITUGURU3 is not set | ||
| 422 | # CONFIG_SENSORS_F71805F is not set | ||
| 423 | # CONFIG_SENSORS_IT87 is not set | ||
| 424 | # CONFIG_SENSORS_PC87360 is not set | ||
| 425 | # CONFIG_SENSORS_PC87427 is not set | ||
| 426 | # CONFIG_SENSORS_SMSC47M1 is not set | ||
| 427 | # CONFIG_SENSORS_SMSC47B397 is not set | ||
| 428 | # CONFIG_SENSORS_VT1211 is not set | ||
| 429 | # CONFIG_SENSORS_W83627HF is not set | ||
| 430 | # CONFIG_SENSORS_W83627EHF is not set | ||
| 431 | # CONFIG_HWMON_DEBUG_CHIP is not set | ||
| 432 | CONFIG_MISC_DEVICES=y | ||
| 433 | # CONFIG_EEPROM_93CX6 is not set | ||
| 434 | |||
| 435 | # | ||
| 436 | # Multifunction device drivers | ||
| 437 | # | ||
| 438 | # CONFIG_MFD_SM501 is not set | ||
| 439 | # CONFIG_NEW_LEDS is not set | ||
| 440 | |||
| 441 | # | ||
| 442 | # Multimedia devices | ||
| 443 | # | ||
| 444 | # CONFIG_VIDEO_DEV is not set | ||
| 445 | CONFIG_DAB=y | ||
| 446 | |||
| 447 | # | ||
| 448 | # Graphics support | ||
| 449 | # | ||
| 450 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 451 | |||
| 452 | # | ||
| 453 | # Display device support | ||
| 454 | # | ||
| 455 | # CONFIG_DISPLAY_SUPPORT is not set | ||
| 456 | # CONFIG_VGASTATE is not set | ||
| 457 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
| 458 | # CONFIG_FB is not set | ||
| 459 | |||
| 460 | # | ||
| 461 | # Console display driver support | ||
| 462 | # | ||
| 463 | # CONFIG_VGA_CONSOLE is not set | ||
| 464 | CONFIG_DUMMY_CONSOLE=y | ||
| 465 | |||
| 466 | # | ||
| 467 | # Sound | ||
| 468 | # | ||
| 469 | # CONFIG_SOUND is not set | ||
| 470 | CONFIG_HID_SUPPORT=y | ||
| 471 | CONFIG_HID=y | ||
| 472 | CONFIG_HID_DEBUG=y | ||
| 473 | CONFIG_USB_SUPPORT=y | ||
| 474 | CONFIG_USB_ARCH_HAS_HCD=y | ||
| 475 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
| 476 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
| 477 | # CONFIG_USB is not set | ||
| 478 | |||
| 479 | # | ||
| 480 | # Enable Host or Gadget support to see Inventra options | ||
| 481 | # | ||
| 482 | |||
| 483 | # | ||
| 484 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
| 485 | # | ||
| 486 | |||
| 487 | # | ||
| 488 | # USB Gadget Support | ||
| 489 | # | ||
| 490 | # CONFIG_USB_GADGET is not set | ||
| 491 | # CONFIG_MMC is not set | ||
| 492 | CONFIG_RTC_LIB=y | ||
| 493 | # CONFIG_RTC_CLASS is not set | ||
| 494 | |||
| 495 | # | ||
| 496 | # DMA Engine support | ||
| 497 | # | ||
| 498 | # CONFIG_DMA_ENGINE is not set | ||
| 499 | |||
| 500 | # | ||
| 501 | # DMA Clients | ||
| 502 | # | ||
| 503 | |||
| 504 | # | ||
| 505 | # DMA Devices | ||
| 506 | # | ||
| 507 | |||
| 508 | # | ||
| 509 | # CBUS support | ||
| 510 | # | ||
| 511 | # CONFIG_CBUS is not set | ||
| 512 | |||
| 513 | # | ||
| 514 | # File systems | ||
| 515 | # | ||
| 516 | CONFIG_EXT2_FS=y | ||
| 517 | CONFIG_EXT2_FS_XATTR=y | ||
| 518 | # CONFIG_EXT2_FS_POSIX_ACL is not set | ||
| 519 | # CONFIG_EXT2_FS_SECURITY is not set | ||
| 520 | # CONFIG_EXT2_FS_XIP is not set | ||
| 521 | # CONFIG_EXT3_FS is not set | ||
| 522 | # CONFIG_EXT4DEV_FS is not set | ||
| 523 | CONFIG_FS_MBCACHE=y | ||
| 524 | # CONFIG_REISERFS_FS is not set | ||
| 525 | # CONFIG_JFS_FS is not set | ||
| 526 | # CONFIG_FS_POSIX_ACL is not set | ||
| 527 | # CONFIG_XFS_FS is not set | ||
| 528 | # CONFIG_GFS2_FS is not set | ||
| 529 | # CONFIG_MINIX_FS is not set | ||
| 530 | CONFIG_ROMFS_FS=y | ||
| 531 | CONFIG_INOTIFY=y | ||
| 532 | CONFIG_INOTIFY_USER=y | ||
| 533 | # CONFIG_QUOTA is not set | ||
| 534 | CONFIG_DNOTIFY=y | ||
| 535 | # CONFIG_AUTOFS_FS is not set | ||
| 536 | # CONFIG_AUTOFS4_FS is not set | ||
| 537 | # CONFIG_FUSE_FS is not set | ||
| 538 | |||
| 539 | # | ||
| 540 | # CD-ROM/DVD Filesystems | ||
| 541 | # | ||
| 542 | # CONFIG_ISO9660_FS is not set | ||
| 543 | # CONFIG_UDF_FS is not set | ||
| 544 | |||
| 545 | # | ||
| 546 | # DOS/FAT/NT Filesystems | ||
| 547 | # | ||
| 548 | # CONFIG_MSDOS_FS is not set | ||
| 549 | # CONFIG_VFAT_FS is not set | ||
| 550 | # CONFIG_NTFS_FS is not set | ||
| 551 | |||
| 552 | # | ||
| 553 | # Pseudo filesystems | ||
| 554 | # | ||
| 555 | CONFIG_PROC_FS=y | ||
| 556 | CONFIG_PROC_SYSCTL=y | ||
| 557 | CONFIG_SYSFS=y | ||
| 558 | # CONFIG_TMPFS is not set | ||
| 559 | # CONFIG_HUGETLB_PAGE is not set | ||
| 560 | CONFIG_RAMFS=y | ||
| 561 | # CONFIG_CONFIGFS_FS is not set | ||
| 562 | |||
| 563 | # | ||
| 564 | # Miscellaneous filesystems | ||
| 565 | # | ||
| 566 | # CONFIG_ADFS_FS is not set | ||
| 567 | # CONFIG_AFFS_FS is not set | ||
| 568 | # CONFIG_HFS_FS is not set | ||
| 569 | # CONFIG_HFSPLUS_FS is not set | ||
| 570 | # CONFIG_BEFS_FS is not set | ||
| 571 | # CONFIG_BFS_FS is not set | ||
| 572 | # CONFIG_EFS_FS is not set | ||
| 573 | # CONFIG_CRAMFS is not set | ||
| 574 | # CONFIG_VXFS_FS is not set | ||
| 575 | # CONFIG_HPFS_FS is not set | ||
| 576 | # CONFIG_QNX4FS_FS is not set | ||
| 577 | # CONFIG_SYSV_FS is not set | ||
| 578 | # CONFIG_UFS_FS is not set | ||
| 579 | |||
| 580 | # | ||
| 581 | # Partition Types | ||
| 582 | # | ||
| 583 | # CONFIG_PARTITION_ADVANCED is not set | ||
| 584 | CONFIG_MSDOS_PARTITION=y | ||
| 585 | |||
| 586 | # | ||
| 587 | # Native Language Support | ||
| 588 | # | ||
| 589 | # CONFIG_NLS is not set | ||
| 590 | |||
| 591 | # | ||
| 592 | # Profiling support | ||
| 593 | # | ||
| 594 | # CONFIG_PROFILING is not set | ||
| 595 | |||
| 596 | # | ||
| 597 | # Kernel hacking | ||
| 598 | # | ||
| 599 | # CONFIG_PRINTK_TIME is not set | ||
| 600 | CONFIG_ENABLE_MUST_CHECK=y | ||
| 601 | # CONFIG_MAGIC_SYSRQ is not set | ||
| 602 | # CONFIG_UNUSED_SYMBOLS is not set | ||
| 603 | # CONFIG_DEBUG_FS is not set | ||
| 604 | # CONFIG_HEADERS_CHECK is not set | ||
| 605 | CONFIG_DEBUG_KERNEL=y | ||
| 606 | # CONFIG_DEBUG_SHIRQ is not set | ||
| 607 | CONFIG_DETECT_SOFTLOCKUP=y | ||
| 608 | CONFIG_SCHED_DEBUG=y | ||
| 609 | # CONFIG_SCHEDSTATS is not set | ||
| 610 | # CONFIG_TIMER_STATS is not set | ||
| 611 | # CONFIG_SLUB_DEBUG_ON is not set | ||
| 612 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
| 613 | # CONFIG_RT_MUTEX_TESTER is not set | ||
| 614 | # CONFIG_DEBUG_SPINLOCK is not set | ||
| 615 | # CONFIG_DEBUG_MUTEXES is not set | ||
| 616 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
| 617 | # CONFIG_PROVE_LOCKING is not set | ||
| 618 | # CONFIG_LOCK_STAT is not set | ||
| 619 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
| 620 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
| 621 | # CONFIG_DEBUG_KOBJECT is not set | ||
| 622 | CONFIG_DEBUG_BUGVERBOSE=y | ||
| 623 | CONFIG_DEBUG_INFO=y | ||
| 624 | # CONFIG_DEBUG_VM is not set | ||
| 625 | # CONFIG_DEBUG_LIST is not set | ||
| 626 | CONFIG_FRAME_POINTER=y | ||
| 627 | CONFIG_FORCED_INLINING=y | ||
| 628 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 629 | # CONFIG_FAULT_INJECTION is not set | ||
| 630 | CONFIG_DEBUG_USER=y | ||
| 631 | CONFIG_DEBUG_ERRORS=y | ||
| 632 | CONFIG_DEBUG_LL=y | ||
| 633 | # CONFIG_DEBUG_ICEDCC is not set | ||
| 634 | |||
| 635 | # | ||
| 636 | # Security options | ||
| 637 | # | ||
| 638 | # CONFIG_KEYS is not set | ||
| 639 | # CONFIG_SECURITY is not set | ||
| 640 | # CONFIG_CRYPTO is not set | ||
| 641 | |||
| 642 | # | ||
| 643 | # Library routines | ||
| 644 | # | ||
| 645 | CONFIG_BITREVERSE=y | ||
| 646 | CONFIG_CRC_CCITT=y | ||
| 647 | # CONFIG_CRC16 is not set | ||
| 648 | # CONFIG_CRC_ITU_T is not set | ||
| 649 | CONFIG_CRC32=y | ||
| 650 | # CONFIG_CRC7 is not set | ||
| 651 | # CONFIG_LIBCRC32C is not set | ||
| 652 | CONFIG_PLIST=y | ||
| 653 | CONFIG_HAS_IOMEM=y | ||
| 654 | CONFIG_HAS_IOPORT=y | ||
| 655 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/arm/configs/omap_h2_1610_defconfig b/arch/arm/configs/omap_h2_1610_defconfig index 323c1deeb953..c03507202f3c 100644 --- a/arch/arm/configs/omap_h2_1610_defconfig +++ b/arch/arm/configs/omap_h2_1610_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.25-rc3 | 3 | # Linux kernel version: 2.6.25-rc2-omap1 |
| 4 | # Mon Mar 3 03:39:48 2008 | 4 | # Wed Feb 20 17:12:36 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_ARM=y | 6 | CONFIG_ARM=y |
| 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y |
| @@ -31,7 +31,6 @@ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | |||
| 31 | # | 31 | # |
| 32 | CONFIG_EXPERIMENTAL=y | 32 | CONFIG_EXPERIMENTAL=y |
| 33 | CONFIG_BROKEN_ON_SMP=y | 33 | CONFIG_BROKEN_ON_SMP=y |
| 34 | CONFIG_LOCK_KERNEL=y | ||
| 35 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 34 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 36 | CONFIG_LOCALVERSION="" | 35 | CONFIG_LOCALVERSION="" |
| 37 | CONFIG_LOCALVERSION_AUTO=y | 36 | CONFIG_LOCALVERSION_AUTO=y |
| @@ -50,7 +49,7 @@ CONFIG_FAIR_GROUP_SCHED=y | |||
| 50 | # CONFIG_RT_GROUP_SCHED is not set | 49 | # CONFIG_RT_GROUP_SCHED is not set |
| 51 | CONFIG_USER_SCHED=y | 50 | CONFIG_USER_SCHED=y |
| 52 | # CONFIG_CGROUP_SCHED is not set | 51 | # CONFIG_CGROUP_SCHED is not set |
| 53 | # CONFIG_SYSFS_DEPRECATED is not set | 52 | CONFIG_SYSFS_DEPRECATED=y |
| 54 | # CONFIG_RELAY is not set | 53 | # CONFIG_RELAY is not set |
| 55 | CONFIG_NAMESPACES=y | 54 | CONFIG_NAMESPACES=y |
| 56 | # CONFIG_UTS_NS is not set | 55 | # CONFIG_UTS_NS is not set |
| @@ -65,6 +64,7 @@ CONFIG_SYSCTL=y | |||
| 65 | CONFIG_UID16=y | 64 | CONFIG_UID16=y |
| 66 | CONFIG_SYSCTL_SYSCALL=y | 65 | CONFIG_SYSCTL_SYSCALL=y |
| 67 | CONFIG_KALLSYMS=y | 66 | CONFIG_KALLSYMS=y |
| 67 | # CONFIG_KALLSYMS_ALL is not set | ||
| 68 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 68 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 69 | CONFIG_HOTPLUG=y | 69 | CONFIG_HOTPLUG=y |
| 70 | CONFIG_PRINTK=y | 70 | CONFIG_PRINTK=y |
| @@ -165,20 +165,28 @@ CONFIG_ARCH_OMAP=y | |||
| 165 | CONFIG_ARCH_OMAP_OTG=y | 165 | CONFIG_ARCH_OMAP_OTG=y |
| 166 | CONFIG_ARCH_OMAP1=y | 166 | CONFIG_ARCH_OMAP1=y |
| 167 | # CONFIG_ARCH_OMAP2 is not set | 167 | # CONFIG_ARCH_OMAP2 is not set |
| 168 | # CONFIG_ARCH_OMAP3 is not set | ||
| 168 | 169 | ||
| 169 | # | 170 | # |
| 170 | # OMAP Feature Selections | 171 | # OMAP Feature Selections |
| 171 | # | 172 | # |
| 173 | CONFIG_OMAP_DEBUG_SRAM_PATCH=y | ||
| 172 | # CONFIG_OMAP_RESET_CLOCKS is not set | 174 | # CONFIG_OMAP_RESET_CLOCKS is not set |
| 175 | CONFIG_OMAP_BOOT_TAG=y | ||
| 176 | # CONFIG_OMAP_BOOT_REASON is not set | ||
| 177 | # CONFIG_OMAP_COMPONENT_VERSION is not set | ||
| 178 | CONFIG_OMAP_GPIO_SWITCH=y | ||
| 173 | CONFIG_OMAP_MUX=y | 179 | CONFIG_OMAP_MUX=y |
| 174 | # CONFIG_OMAP_MUX_DEBUG is not set | 180 | CONFIG_OMAP_MUX_DEBUG=y |
| 175 | CONFIG_OMAP_MUX_WARNINGS=y | 181 | CONFIG_OMAP_MUX_WARNINGS=y |
| 182 | # CONFIG_OMAP_STI is not set | ||
| 176 | CONFIG_OMAP_MCBSP=y | 183 | CONFIG_OMAP_MCBSP=y |
| 177 | # CONFIG_OMAP_MMU_FWK is not set | 184 | # CONFIG_OMAP_MMU_FWK is not set |
| 185 | # CONFIG_OMAP_MBOX_FWK is not set | ||
| 178 | # CONFIG_OMAP_MPU_TIMER is not set | 186 | # CONFIG_OMAP_MPU_TIMER is not set |
| 179 | CONFIG_OMAP_32K_TIMER=y | 187 | CONFIG_OMAP_32K_TIMER=y |
| 180 | CONFIG_OMAP_32K_TIMER_HZ=128 | 188 | CONFIG_OMAP_32K_TIMER_HZ=128 |
| 181 | # CONFIG_OMAP_DM_TIMER is not set | 189 | CONFIG_OMAP_DM_TIMER=y |
| 182 | CONFIG_OMAP_LL_DEBUG_UART1=y | 190 | CONFIG_OMAP_LL_DEBUG_UART1=y |
| 183 | # CONFIG_OMAP_LL_DEBUG_UART2 is not set | 191 | # CONFIG_OMAP_LL_DEBUG_UART2 is not set |
| 184 | # CONFIG_OMAP_LL_DEBUG_UART3 is not set | 192 | # CONFIG_OMAP_LL_DEBUG_UART3 is not set |
| @@ -206,10 +214,10 @@ CONFIG_MACH_OMAP_H2=y | |||
| 206 | # | 214 | # |
| 207 | # CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER is not set | 215 | # CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER is not set |
| 208 | # CONFIG_OMAP_ARM_216MHZ is not set | 216 | # CONFIG_OMAP_ARM_216MHZ is not set |
| 209 | CONFIG_OMAP_ARM_192MHZ=y | 217 | # CONFIG_OMAP_ARM_192MHZ is not set |
| 210 | # CONFIG_OMAP_ARM_168MHZ is not set | 218 | # CONFIG_OMAP_ARM_168MHZ is not set |
| 211 | # CONFIG_OMAP_ARM_120MHZ is not set | 219 | # CONFIG_OMAP_ARM_120MHZ is not set |
| 212 | # CONFIG_OMAP_ARM_60MHZ is not set | 220 | CONFIG_OMAP_ARM_60MHZ=y |
| 213 | # CONFIG_OMAP_ARM_30MHZ is not set | 221 | # CONFIG_OMAP_ARM_30MHZ is not set |
| 214 | 222 | ||
| 215 | # | 223 | # |
| @@ -227,6 +235,7 @@ CONFIG_CPU_32=y | |||
| 227 | CONFIG_CPU_ARM926T=y | 235 | CONFIG_CPU_ARM926T=y |
| 228 | CONFIG_CPU_32v5=y | 236 | CONFIG_CPU_32v5=y |
| 229 | CONFIG_CPU_ABRT_EV5TJ=y | 237 | CONFIG_CPU_ABRT_EV5TJ=y |
| 238 | CONFIG_CPU_PABRT_NOIFAR=y | ||
| 230 | CONFIG_CPU_CACHE_VIVT=y | 239 | CONFIG_CPU_CACHE_VIVT=y |
| 231 | CONFIG_CPU_COPY_V4WB=y | 240 | CONFIG_CPU_COPY_V4WB=y |
| 232 | CONFIG_CPU_TLB_V4WBI=y | 241 | CONFIG_CPU_TLB_V4WBI=y |
| @@ -257,10 +266,9 @@ CONFIG_TICK_ONESHOT=y | |||
| 257 | CONFIG_NO_HZ=y | 266 | CONFIG_NO_HZ=y |
| 258 | CONFIG_HIGH_RES_TIMERS=y | 267 | CONFIG_HIGH_RES_TIMERS=y |
| 259 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | 268 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y |
| 260 | CONFIG_PREEMPT=y | 269 | # CONFIG_PREEMPT is not set |
| 261 | CONFIG_HZ=128 | 270 | CONFIG_HZ=128 |
| 262 | CONFIG_AEABI=y | 271 | # CONFIG_AEABI is not set |
| 263 | CONFIG_OABI_COMPAT=y | ||
| 264 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | 272 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set |
| 265 | CONFIG_SELECT_MEMORY_MODEL=y | 273 | CONFIG_SELECT_MEMORY_MODEL=y |
| 266 | CONFIG_FLATMEM_MANUAL=y | 274 | CONFIG_FLATMEM_MANUAL=y |
| @@ -275,7 +283,8 @@ CONFIG_SPLIT_PTLOCK_CPUS=4096 | |||
| 275 | CONFIG_ZONE_DMA_FLAG=1 | 283 | CONFIG_ZONE_DMA_FLAG=1 |
| 276 | CONFIG_BOUNCE=y | 284 | CONFIG_BOUNCE=y |
| 277 | CONFIG_VIRT_TO_BUS=y | 285 | CONFIG_VIRT_TO_BUS=y |
| 278 | # CONFIG_LEDS is not set | 286 | CONFIG_LEDS=y |
| 287 | # CONFIG_LEDS_CPU is not set | ||
| 279 | CONFIG_ALIGNMENT_TRAP=y | 288 | CONFIG_ALIGNMENT_TRAP=y |
| 280 | 289 | ||
| 281 | # | 290 | # |
| @@ -283,7 +292,7 @@ CONFIG_ALIGNMENT_TRAP=y | |||
| 283 | # | 292 | # |
| 284 | CONFIG_ZBOOT_ROM_TEXT=0x0 | 293 | CONFIG_ZBOOT_ROM_TEXT=0x0 |
| 285 | CONFIG_ZBOOT_ROM_BSS=0x0 | 294 | CONFIG_ZBOOT_ROM_BSS=0x0 |
| 286 | CONFIG_CMDLINE="mem=32M console=ttyS0,115200n8 root=0801 ro init=/bin/sh" | 295 | CONFIG_CMDLINE="mem=32M console=ttyS0,115200n8 root=/dev/ram0 rw initrd=0x10600000,8M ramdisk_size=8192" |
| 287 | # CONFIG_XIP_KERNEL is not set | 296 | # CONFIG_XIP_KERNEL is not set |
| 288 | # CONFIG_KEXEC is not set | 297 | # CONFIG_KEXEC is not set |
| 289 | # CONFIG_ATAGS_PROC is not set | 298 | # CONFIG_ATAGS_PROC is not set |
| @@ -291,20 +300,7 @@ CONFIG_CMDLINE="mem=32M console=ttyS0,115200n8 root=0801 ro init=/bin/sh" | |||
| 291 | # | 300 | # |
| 292 | # CPU Frequency scaling | 301 | # CPU Frequency scaling |
| 293 | # | 302 | # |
| 294 | CONFIG_CPU_FREQ=y | 303 | # CONFIG_CPU_FREQ is not set |
| 295 | CONFIG_CPU_FREQ_TABLE=y | ||
| 296 | # CONFIG_CPU_FREQ_DEBUG is not set | ||
| 297 | CONFIG_CPU_FREQ_STAT=y | ||
| 298 | # CONFIG_CPU_FREQ_STAT_DETAILS is not set | ||
| 299 | # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set | ||
| 300 | CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y | ||
| 301 | # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set | ||
| 302 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set | ||
| 303 | # CONFIG_CPU_FREQ_GOV_PERFORMANCE is not set | ||
| 304 | # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set | ||
| 305 | CONFIG_CPU_FREQ_GOV_USERSPACE=y | ||
| 306 | # CONFIG_CPU_FREQ_GOV_ONDEMAND is not set | ||
| 307 | # CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set | ||
| 308 | 304 | ||
| 309 | # | 305 | # |
| 310 | # Floating point emulation | 306 | # Floating point emulation |
| @@ -322,8 +318,9 @@ CONFIG_FPE_NWFPE=y | |||
| 322 | # Userspace binary formats | 318 | # Userspace binary formats |
| 323 | # | 319 | # |
| 324 | CONFIG_BINFMT_ELF=y | 320 | CONFIG_BINFMT_ELF=y |
| 325 | CONFIG_BINFMT_AOUT=y | 321 | # CONFIG_BINFMT_AOUT is not set |
| 326 | # CONFIG_BINFMT_MISC is not set | 322 | # CONFIG_BINFMT_MISC is not set |
| 323 | # CONFIG_ARTHUR is not set | ||
| 327 | 324 | ||
| 328 | # | 325 | # |
| 329 | # Power management options | 326 | # Power management options |
| @@ -433,21 +430,102 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | |||
| 433 | CONFIG_STANDALONE=y | 430 | CONFIG_STANDALONE=y |
| 434 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 431 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 435 | # CONFIG_FW_LOADER is not set | 432 | # CONFIG_FW_LOADER is not set |
| 433 | CONFIG_DEBUG_DRIVER=y | ||
| 434 | # CONFIG_DEBUG_DEVRES is not set | ||
| 436 | # CONFIG_SYS_HYPERVISOR is not set | 435 | # CONFIG_SYS_HYPERVISOR is not set |
| 437 | # CONFIG_CONNECTOR is not set | 436 | # CONFIG_CONNECTOR is not set |
| 438 | # CONFIG_MTD is not set | 437 | CONFIG_MTD=y |
| 438 | CONFIG_MTD_DEBUG=y | ||
| 439 | CONFIG_MTD_DEBUG_VERBOSE=3 | ||
| 440 | # CONFIG_MTD_CONCAT is not set | ||
| 441 | CONFIG_MTD_PARTITIONS=y | ||
| 442 | # CONFIG_MTD_REDBOOT_PARTS is not set | ||
| 443 | CONFIG_MTD_CMDLINE_PARTS=y | ||
| 444 | # CONFIG_MTD_AFS_PARTS is not set | ||
| 445 | |||
| 446 | # | ||
| 447 | # User Modules And Translation Layers | ||
| 448 | # | ||
| 449 | CONFIG_MTD_CHAR=y | ||
| 450 | CONFIG_MTD_BLKDEVS=y | ||
| 451 | CONFIG_MTD_BLOCK=y | ||
| 452 | # CONFIG_FTL is not set | ||
| 453 | # CONFIG_NFTL is not set | ||
| 454 | # CONFIG_INFTL is not set | ||
| 455 | # CONFIG_RFD_FTL is not set | ||
| 456 | # CONFIG_SSFDC is not set | ||
| 457 | # CONFIG_MTD_OOPS is not set | ||
| 458 | |||
| 459 | # | ||
| 460 | # RAM/ROM/Flash chip drivers | ||
| 461 | # | ||
| 462 | CONFIG_MTD_CFI=y | ||
| 463 | # CONFIG_MTD_JEDECPROBE is not set | ||
| 464 | CONFIG_MTD_GEN_PROBE=y | ||
| 465 | # CONFIG_MTD_CFI_ADV_OPTIONS is not set | ||
| 466 | CONFIG_MTD_MAP_BANK_WIDTH_1=y | ||
| 467 | CONFIG_MTD_MAP_BANK_WIDTH_2=y | ||
| 468 | CONFIG_MTD_MAP_BANK_WIDTH_4=y | ||
| 469 | # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set | ||
| 470 | # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set | ||
| 471 | # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set | ||
| 472 | CONFIG_MTD_CFI_I1=y | ||
| 473 | CONFIG_MTD_CFI_I2=y | ||
| 474 | # CONFIG_MTD_CFI_I4 is not set | ||
| 475 | # CONFIG_MTD_CFI_I8 is not set | ||
| 476 | CONFIG_MTD_CFI_INTELEXT=y | ||
| 477 | # CONFIG_MTD_CFI_AMDSTD is not set | ||
| 478 | # CONFIG_MTD_CFI_STAA is not set | ||
| 479 | CONFIG_MTD_CFI_UTIL=y | ||
| 480 | # CONFIG_MTD_RAM is not set | ||
| 481 | # CONFIG_MTD_ROM is not set | ||
| 482 | # CONFIG_MTD_ABSENT is not set | ||
| 483 | |||
| 484 | # | ||
| 485 | # Mapping drivers for chip access | ||
| 486 | # | ||
| 487 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | ||
| 488 | # CONFIG_MTD_PHYSMAP is not set | ||
| 489 | # CONFIG_MTD_ARM_INTEGRATOR is not set | ||
| 490 | # CONFIG_MTD_OMAP_NOR is not set | ||
| 491 | # CONFIG_MTD_PLATRAM is not set | ||
| 492 | |||
| 493 | # | ||
| 494 | # Self-contained MTD device drivers | ||
| 495 | # | ||
| 496 | # CONFIG_MTD_DATAFLASH is not set | ||
| 497 | # CONFIG_MTD_M25P80 is not set | ||
| 498 | # CONFIG_MTD_SLRAM is not set | ||
| 499 | # CONFIG_MTD_PHRAM is not set | ||
| 500 | # CONFIG_MTD_MTDRAM is not set | ||
| 501 | # CONFIG_MTD_BLOCK2MTD is not set | ||
| 502 | |||
| 503 | # | ||
| 504 | # Disk-On-Chip Device Drivers | ||
| 505 | # | ||
| 506 | # CONFIG_MTD_DOC2000 is not set | ||
| 507 | # CONFIG_MTD_DOC2001 is not set | ||
| 508 | # CONFIG_MTD_DOC2001PLUS is not set | ||
| 509 | # CONFIG_MTD_NAND is not set | ||
| 510 | # CONFIG_MTD_ONENAND is not set | ||
| 511 | |||
| 512 | # | ||
| 513 | # UBI - Unsorted block images | ||
| 514 | # | ||
| 515 | # CONFIG_MTD_UBI is not set | ||
| 439 | # CONFIG_PARPORT is not set | 516 | # CONFIG_PARPORT is not set |
| 440 | CONFIG_BLK_DEV=y | 517 | CONFIG_BLK_DEV=y |
| 441 | # CONFIG_BLK_DEV_COW_COMMON is not set | 518 | # CONFIG_BLK_DEV_COW_COMMON is not set |
| 442 | CONFIG_BLK_DEV_LOOP=y | 519 | CONFIG_BLK_DEV_LOOP=y |
| 443 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 520 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set |
| 444 | # CONFIG_BLK_DEV_NBD is not set | 521 | # CONFIG_BLK_DEV_NBD is not set |
| 522 | # CONFIG_BLK_DEV_UB is not set | ||
| 445 | CONFIG_BLK_DEV_RAM=y | 523 | CONFIG_BLK_DEV_RAM=y |
| 446 | CONFIG_BLK_DEV_RAM_COUNT=16 | 524 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 447 | CONFIG_BLK_DEV_RAM_SIZE=8192 | 525 | CONFIG_BLK_DEV_RAM_SIZE=8192 |
| 448 | # CONFIG_BLK_DEV_XIP is not set | 526 | # CONFIG_BLK_DEV_XIP is not set |
| 449 | # CONFIG_CDROM_PKTCDVD is not set | 527 | # CONFIG_CDROM_PKTCDVD is not set |
| 450 | CONFIG_ATA_OVER_ETH=m | 528 | # CONFIG_ATA_OVER_ETH is not set |
| 451 | CONFIG_MISC_DEVICES=y | 529 | CONFIG_MISC_DEVICES=y |
| 452 | # CONFIG_EEPROM_93CX6 is not set | 530 | # CONFIG_EEPROM_93CX6 is not set |
| 453 | # CONFIG_ENCLOSURE_SERVICES is not set | 531 | # CONFIG_ENCLOSURE_SERVICES is not set |
| @@ -457,42 +535,9 @@ CONFIG_MISC_DEVICES=y | |||
| 457 | # SCSI device support | 535 | # SCSI device support |
| 458 | # | 536 | # |
| 459 | # CONFIG_RAID_ATTRS is not set | 537 | # CONFIG_RAID_ATTRS is not set |
| 460 | CONFIG_SCSI=y | 538 | # CONFIG_SCSI is not set |
| 461 | CONFIG_SCSI_DMA=y | 539 | # CONFIG_SCSI_DMA is not set |
| 462 | # CONFIG_SCSI_TGT is not set | ||
| 463 | # CONFIG_SCSI_NETLINK is not set | 540 | # CONFIG_SCSI_NETLINK is not set |
| 464 | CONFIG_SCSI_PROC_FS=y | ||
| 465 | |||
| 466 | # | ||
| 467 | # SCSI support type (disk, tape, CD-ROM) | ||
| 468 | # | ||
| 469 | # CONFIG_BLK_DEV_SD is not set | ||
| 470 | # CONFIG_CHR_DEV_ST is not set | ||
| 471 | # CONFIG_CHR_DEV_OSST is not set | ||
| 472 | # CONFIG_BLK_DEV_SR is not set | ||
| 473 | # CONFIG_CHR_DEV_SG is not set | ||
| 474 | # CONFIG_CHR_DEV_SCH is not set | ||
| 475 | |||
| 476 | # | ||
| 477 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
| 478 | # | ||
| 479 | # CONFIG_SCSI_MULTI_LUN is not set | ||
| 480 | # CONFIG_SCSI_CONSTANTS is not set | ||
| 481 | # CONFIG_SCSI_LOGGING is not set | ||
| 482 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
| 483 | CONFIG_SCSI_WAIT_SCAN=m | ||
| 484 | |||
| 485 | # | ||
| 486 | # SCSI Transports | ||
| 487 | # | ||
| 488 | # CONFIG_SCSI_SPI_ATTRS is not set | ||
| 489 | # CONFIG_SCSI_FC_ATTRS is not set | ||
| 490 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
| 491 | # CONFIG_SCSI_SAS_LIBSAS is not set | ||
| 492 | # CONFIG_SCSI_SRP_ATTRS is not set | ||
| 493 | CONFIG_SCSI_LOWLEVEL=y | ||
| 494 | # CONFIG_ISCSI_TCP is not set | ||
| 495 | # CONFIG_SCSI_DEBUG is not set | ||
| 496 | # CONFIG_ATA is not set | 541 | # CONFIG_ATA is not set |
| 497 | # CONFIG_MD is not set | 542 | # CONFIG_MD is not set |
| 498 | CONFIG_NETDEVICES=y | 543 | CONFIG_NETDEVICES=y |
| @@ -509,6 +554,7 @@ CONFIG_MII=y | |||
| 509 | # CONFIG_AX88796 is not set | 554 | # CONFIG_AX88796 is not set |
| 510 | CONFIG_SMC91X=y | 555 | CONFIG_SMC91X=y |
| 511 | # CONFIG_DM9000 is not set | 556 | # CONFIG_DM9000 is not set |
| 557 | # CONFIG_ENC28J60 is not set | ||
| 512 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 558 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
| 513 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 559 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 514 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 560 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| @@ -523,6 +569,15 @@ CONFIG_NETDEV_10000=y | |||
| 523 | # | 569 | # |
| 524 | # CONFIG_WLAN_PRE80211 is not set | 570 | # CONFIG_WLAN_PRE80211 is not set |
| 525 | # CONFIG_WLAN_80211 is not set | 571 | # CONFIG_WLAN_80211 is not set |
| 572 | |||
| 573 | # | ||
| 574 | # USB Network Adapters | ||
| 575 | # | ||
| 576 | # CONFIG_USB_CATC is not set | ||
| 577 | # CONFIG_USB_KAWETH is not set | ||
| 578 | # CONFIG_USB_PEGASUS is not set | ||
| 579 | # CONFIG_USB_RTL8150 is not set | ||
| 580 | # CONFIG_USB_USBNET is not set | ||
| 526 | # CONFIG_WAN is not set | 581 | # CONFIG_WAN is not set |
| 527 | CONFIG_PPP=y | 582 | CONFIG_PPP=y |
| 528 | # CONFIG_PPP_MULTILINK is not set | 583 | # CONFIG_PPP_MULTILINK is not set |
| @@ -612,7 +667,8 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
| 612 | CONFIG_UNIX98_PTYS=y | 667 | CONFIG_UNIX98_PTYS=y |
| 613 | # CONFIG_LEGACY_PTYS is not set | 668 | # CONFIG_LEGACY_PTYS is not set |
| 614 | # CONFIG_IPMI_HANDLER is not set | 669 | # CONFIG_IPMI_HANDLER is not set |
| 615 | # CONFIG_HW_RANDOM is not set | 670 | CONFIG_HW_RANDOM=m |
| 671 | CONFIG_HW_RANDOM_OMAP=m | ||
| 616 | # CONFIG_NVRAM is not set | 672 | # CONFIG_NVRAM is not set |
| 617 | # CONFIG_R3964 is not set | 673 | # CONFIG_R3964 is not set |
| 618 | # CONFIG_RAW_DRIVER is not set | 674 | # CONFIG_RAW_DRIVER is not set |
| @@ -638,6 +694,7 @@ CONFIG_I2C_OMAP=y | |||
| 638 | # CONFIG_I2C_SIMTEC is not set | 694 | # CONFIG_I2C_SIMTEC is not set |
| 639 | # CONFIG_I2C_TAOS_EVM is not set | 695 | # CONFIG_I2C_TAOS_EVM is not set |
| 640 | # CONFIG_I2C_STUB is not set | 696 | # CONFIG_I2C_STUB is not set |
| 697 | # CONFIG_I2C_TINY_USB is not set | ||
| 641 | 698 | ||
| 642 | # | 699 | # |
| 643 | # Miscellaneous I2C Chip support | 700 | # Miscellaneous I2C Chip support |
| @@ -647,8 +704,10 @@ CONFIG_I2C_OMAP=y | |||
| 647 | # CONFIG_SENSORS_PCF8574 is not set | 704 | # CONFIG_SENSORS_PCF8574 is not set |
| 648 | # CONFIG_PCF8575 is not set | 705 | # CONFIG_PCF8575 is not set |
| 649 | # CONFIG_SENSORS_PCF8591 is not set | 706 | # CONFIG_SENSORS_PCF8591 is not set |
| 650 | # CONFIG_ISP1301_OMAP is not set | 707 | CONFIG_ISP1301_OMAP=y |
| 651 | CONFIG_TPS65010=y | 708 | CONFIG_TPS65010=y |
| 709 | # CONFIG_SENSORS_TLV320AIC23 is not set | ||
| 710 | # CONFIG_GPIOEXPANDER_OMAP is not set | ||
| 652 | # CONFIG_SENSORS_MAX6875 is not set | 711 | # CONFIG_SENSORS_MAX6875 is not set |
| 653 | # CONFIG_SENSORS_TSL2550 is not set | 712 | # CONFIG_SENSORS_TSL2550 is not set |
| 654 | # CONFIG_I2C_DEBUG_CORE is not set | 713 | # CONFIG_I2C_DEBUG_CORE is not set |
| @@ -659,8 +718,26 @@ CONFIG_TPS65010=y | |||
| 659 | # | 718 | # |
| 660 | # SPI support | 719 | # SPI support |
| 661 | # | 720 | # |
| 662 | # CONFIG_SPI is not set | 721 | CONFIG_SPI=y |
| 663 | # CONFIG_SPI_MASTER is not set | 722 | # CONFIG_SPI_DEBUG is not set |
| 723 | CONFIG_SPI_MASTER=y | ||
| 724 | |||
| 725 | # | ||
| 726 | # SPI Master Controller Drivers | ||
| 727 | # | ||
| 728 | CONFIG_SPI_BITBANG=y | ||
| 729 | CONFIG_SPI_OMAP_UWIRE=y | ||
| 730 | |||
| 731 | # | ||
| 732 | # SPI Protocol Masters | ||
| 733 | # | ||
| 734 | # CONFIG_SPI_AT25 is not set | ||
| 735 | CONFIG_SPI_TSC2101=y | ||
| 736 | # CONFIG_SPI_TSC2102 is not set | ||
| 737 | # CONFIG_SPI_TSC210X is not set | ||
| 738 | # CONFIG_SPI_TSC2301 is not set | ||
| 739 | # CONFIG_SPI_SPIDEV is not set | ||
| 740 | # CONFIG_SPI_TLE62X0 is not set | ||
| 664 | # CONFIG_W1 is not set | 741 | # CONFIG_W1 is not set |
| 665 | # CONFIG_POWER_SUPPLY is not set | 742 | # CONFIG_POWER_SUPPLY is not set |
| 666 | CONFIG_HWMON=y | 743 | CONFIG_HWMON=y |
| @@ -673,7 +750,6 @@ CONFIG_HWMON=y | |||
| 673 | # CONFIG_SENSORS_ADM1031 is not set | 750 | # CONFIG_SENSORS_ADM1031 is not set |
| 674 | # CONFIG_SENSORS_ADM9240 is not set | 751 | # CONFIG_SENSORS_ADM9240 is not set |
| 675 | # CONFIG_SENSORS_ADT7470 is not set | 752 | # CONFIG_SENSORS_ADT7470 is not set |
| 676 | # CONFIG_SENSORS_ADT7473 is not set | ||
| 677 | # CONFIG_SENSORS_ATXP1 is not set | 753 | # CONFIG_SENSORS_ATXP1 is not set |
| 678 | # CONFIG_SENSORS_DS1621 is not set | 754 | # CONFIG_SENSORS_DS1621 is not set |
| 679 | # CONFIG_SENSORS_F71805F is not set | 755 | # CONFIG_SENSORS_F71805F is not set |
| @@ -683,6 +759,7 @@ CONFIG_HWMON=y | |||
| 683 | # CONFIG_SENSORS_GL520SM is not set | 759 | # CONFIG_SENSORS_GL520SM is not set |
| 684 | # CONFIG_SENSORS_IT87 is not set | 760 | # CONFIG_SENSORS_IT87 is not set |
| 685 | # CONFIG_SENSORS_LM63 is not set | 761 | # CONFIG_SENSORS_LM63 is not set |
| 762 | # CONFIG_SENSORS_LM70 is not set | ||
| 686 | # CONFIG_SENSORS_LM75 is not set | 763 | # CONFIG_SENSORS_LM75 is not set |
| 687 | # CONFIG_SENSORS_LM77 is not set | 764 | # CONFIG_SENSORS_LM77 is not set |
| 688 | # CONFIG_SENSORS_LM78 is not set | 765 | # CONFIG_SENSORS_LM78 is not set |
| @@ -712,6 +789,7 @@ CONFIG_HWMON=y | |||
| 712 | # CONFIG_SENSORS_W83L786NG is not set | 789 | # CONFIG_SENSORS_W83L786NG is not set |
| 713 | # CONFIG_SENSORS_W83627HF is not set | 790 | # CONFIG_SENSORS_W83627HF is not set |
| 714 | # CONFIG_SENSORS_W83627EHF is not set | 791 | # CONFIG_SENSORS_W83627EHF is not set |
| 792 | # CONFIG_SENSORS_TSC210X is not set | ||
| 715 | # CONFIG_HWMON_DEBUG_CHIP is not set | 793 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 716 | CONFIG_WATCHDOG=y | 794 | CONFIG_WATCHDOG=y |
| 717 | CONFIG_WATCHDOG_NOWAYOUT=y | 795 | CONFIG_WATCHDOG_NOWAYOUT=y |
| @@ -723,6 +801,11 @@ CONFIG_WATCHDOG_NOWAYOUT=y | |||
| 723 | # CONFIG_OMAP_WATCHDOG is not set | 801 | # CONFIG_OMAP_WATCHDOG is not set |
| 724 | 802 | ||
| 725 | # | 803 | # |
| 804 | # USB-based Watchdog Cards | ||
| 805 | # | ||
| 806 | # CONFIG_USBPCWATCHDOG is not set | ||
| 807 | |||
| 808 | # | ||
| 726 | # Sonics Silicon Backplane | 809 | # Sonics Silicon Backplane |
| 727 | # | 810 | # |
| 728 | CONFIG_SSB_POSSIBLE=y | 811 | CONFIG_SSB_POSSIBLE=y |
| @@ -740,6 +823,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 740 | # CONFIG_VIDEO_DEV is not set | 823 | # CONFIG_VIDEO_DEV is not set |
| 741 | # CONFIG_DVB_CORE is not set | 824 | # CONFIG_DVB_CORE is not set |
| 742 | CONFIG_DAB=y | 825 | CONFIG_DAB=y |
| 826 | # CONFIG_USB_DABUSB is not set | ||
| 743 | 827 | ||
| 744 | # | 828 | # |
| 745 | # Graphics support | 829 | # Graphics support |
| @@ -749,9 +833,9 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m | |||
| 749 | CONFIG_FB=y | 833 | CONFIG_FB=y |
| 750 | CONFIG_FIRMWARE_EDID=y | 834 | CONFIG_FIRMWARE_EDID=y |
| 751 | # CONFIG_FB_DDC is not set | 835 | # CONFIG_FB_DDC is not set |
| 752 | # CONFIG_FB_CFB_FILLRECT is not set | 836 | CONFIG_FB_CFB_FILLRECT=y |
| 753 | # CONFIG_FB_CFB_COPYAREA is not set | 837 | CONFIG_FB_CFB_COPYAREA=y |
| 754 | # CONFIG_FB_CFB_IMAGEBLIT is not set | 838 | CONFIG_FB_CFB_IMAGEBLIT=y |
| 755 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | 839 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set |
| 756 | # CONFIG_FB_SYS_FILLRECT is not set | 840 | # CONFIG_FB_SYS_FILLRECT is not set |
| 757 | # CONFIG_FB_SYS_COPYAREA is not set | 841 | # CONFIG_FB_SYS_COPYAREA is not set |
| @@ -769,7 +853,11 @@ CONFIG_FB_MODE_HELPERS=y | |||
| 769 | # | 853 | # |
| 770 | # CONFIG_FB_S1D13XXX is not set | 854 | # CONFIG_FB_S1D13XXX is not set |
| 771 | # CONFIG_FB_VIRTUAL is not set | 855 | # CONFIG_FB_VIRTUAL is not set |
| 772 | # CONFIG_FB_OMAP is not set | 856 | CONFIG_FB_OMAP=y |
| 857 | # CONFIG_FB_OMAP_LCDC_EXTERNAL is not set | ||
| 858 | # CONFIG_FB_OMAP_BOOTLOADER_INIT is not set | ||
| 859 | CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2 | ||
| 860 | # CONFIG_FB_OMAP_DMA_TUNE is not set | ||
| 773 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 861 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 774 | 862 | ||
| 775 | # | 863 | # |
| @@ -785,17 +873,9 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 785 | CONFIG_FRAMEBUFFER_CONSOLE=y | 873 | CONFIG_FRAMEBUFFER_CONSOLE=y |
| 786 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set | 874 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set |
| 787 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | 875 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set |
| 788 | CONFIG_FONTS=y | 876 | # CONFIG_FONTS is not set |
| 789 | CONFIG_FONT_8x8=y | 877 | CONFIG_FONT_8x8=y |
| 790 | CONFIG_FONT_8x16=y | 878 | CONFIG_FONT_8x16=y |
| 791 | # CONFIG_FONT_6x11 is not set | ||
| 792 | # CONFIG_FONT_7x14 is not set | ||
| 793 | # CONFIG_FONT_PEARL_8x8 is not set | ||
| 794 | # CONFIG_FONT_ACORN_8x8 is not set | ||
| 795 | # CONFIG_FONT_MINI_4x6 is not set | ||
| 796 | # CONFIG_FONT_SUN8x16 is not set | ||
| 797 | # CONFIG_FONT_SUN12x22 is not set | ||
| 798 | # CONFIG_FONT_10x18 is not set | ||
| 799 | CONFIG_LOGO=y | 879 | CONFIG_LOGO=y |
| 800 | # CONFIG_LOGO_LINUX_MONO is not set | 880 | # CONFIG_LOGO_LINUX_MONO is not set |
| 801 | # CONFIG_LOGO_LINUX_VGA16 is not set | 881 | # CONFIG_LOGO_LINUX_VGA16 is not set |
| @@ -804,37 +884,204 @@ CONFIG_LOGO_LINUX_CLUT224=y | |||
| 804 | # | 884 | # |
| 805 | # Sound | 885 | # Sound |
| 806 | # | 886 | # |
| 807 | CONFIG_SOUND=y | 887 | # CONFIG_SOUND is not set |
| 888 | CONFIG_HID_SUPPORT=y | ||
| 889 | CONFIG_HID=y | ||
| 890 | # CONFIG_HID_DEBUG is not set | ||
| 891 | # CONFIG_HIDRAW is not set | ||
| 808 | 892 | ||
| 809 | # | 893 | # |
| 810 | # Advanced Linux Sound Architecture | 894 | # USB Input Devices |
| 811 | # | 895 | # |
| 812 | # CONFIG_SND is not set | 896 | # CONFIG_USB_HID is not set |
| 813 | 897 | ||
| 814 | # | 898 | # |
| 815 | # Open Sound System | 899 | # USB HID Boot Protocol drivers |
| 816 | # | 900 | # |
| 817 | CONFIG_SOUND_PRIME=y | 901 | # CONFIG_USB_KBD is not set |
| 818 | # CONFIG_SOUND_MSNDCLAS is not set | 902 | # CONFIG_USB_MOUSE is not set |
| 819 | # CONFIG_SOUND_MSNDPIN is not set | ||
| 820 | CONFIG_HID_SUPPORT=y | ||
| 821 | CONFIG_HID=y | ||
| 822 | CONFIG_HID_DEBUG=y | ||
| 823 | # CONFIG_HIDRAW is not set | ||
| 824 | CONFIG_USB_SUPPORT=y | 903 | CONFIG_USB_SUPPORT=y |
| 825 | CONFIG_USB_ARCH_HAS_HCD=y | 904 | CONFIG_USB_ARCH_HAS_HCD=y |
| 826 | CONFIG_USB_ARCH_HAS_OHCI=y | 905 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 827 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 906 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
| 828 | # CONFIG_USB is not set | 907 | CONFIG_USB=y |
| 908 | # CONFIG_USB_DEBUG is not set | ||
| 909 | # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set | ||
| 910 | |||
| 911 | # | ||
| 912 | # Miscellaneous USB options | ||
| 913 | # | ||
| 914 | CONFIG_USB_DEVICEFS=y | ||
| 915 | # CONFIG_USB_DEVICE_CLASS is not set | ||
| 916 | # CONFIG_USB_DYNAMIC_MINORS is not set | ||
| 917 | CONFIG_USB_SUSPEND=y | ||
| 918 | # CONFIG_USB_PERSIST is not set | ||
| 919 | CONFIG_USB_OTG=y | ||
| 920 | CONFIG_USB_OTG_WHITELIST=y | ||
| 921 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 922 | |||
| 923 | # | ||
| 924 | # USB Host Controller Drivers | ||
| 925 | # | ||
| 926 | # CONFIG_USB_ISP116X_HCD is not set | ||
| 927 | CONFIG_USB_OHCI_HCD=y | ||
| 928 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | ||
| 929 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | ||
| 930 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | ||
| 931 | # CONFIG_USB_SL811_HCD is not set | ||
| 932 | # CONFIG_USB_R8A66597_HCD is not set | ||
| 933 | # CONFIG_USB_MUSB_HDRC is not set | ||
| 934 | # CONFIG_USB_GADGET_MUSB_HDRC is not set | ||
| 935 | |||
| 936 | # | ||
| 937 | # USB Device Class drivers | ||
| 938 | # | ||
| 939 | # CONFIG_USB_ACM is not set | ||
| 940 | # CONFIG_USB_PRINTER is not set | ||
| 829 | 941 | ||
| 830 | # | 942 | # |
| 831 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 943 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 832 | # | 944 | # |
| 833 | # CONFIG_USB_GADGET is not set | 945 | |
| 834 | # CONFIG_MMC is not set | 946 | # |
| 947 | # may also be needed; see USB_STORAGE Help for more information | ||
| 948 | # | ||
| 949 | # CONFIG_USB_LIBUSUAL is not set | ||
| 950 | |||
| 951 | # | ||
| 952 | # USB Imaging devices | ||
| 953 | # | ||
| 954 | # CONFIG_USB_MDC800 is not set | ||
| 955 | CONFIG_USB_MON=y | ||
| 956 | |||
| 957 | # | ||
| 958 | # USB port drivers | ||
| 959 | # | ||
| 960 | # CONFIG_USB_SERIAL is not set | ||
| 961 | |||
| 962 | # | ||
| 963 | # USB Miscellaneous drivers | ||
| 964 | # | ||
| 965 | # CONFIG_USB_EMI62 is not set | ||
| 966 | # CONFIG_USB_EMI26 is not set | ||
| 967 | # CONFIG_USB_ADUTUX is not set | ||
| 968 | # CONFIG_USB_AUERSWALD is not set | ||
| 969 | # CONFIG_USB_RIO500 is not set | ||
| 970 | # CONFIG_USB_LEGOTOWER is not set | ||
| 971 | # CONFIG_USB_LCD is not set | ||
| 972 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 973 | # CONFIG_USB_LED is not set | ||
| 974 | # CONFIG_USB_CYPRESS_CY7C63 is not set | ||
| 975 | # CONFIG_USB_CYTHERM is not set | ||
| 976 | # CONFIG_USB_PHIDGET is not set | ||
| 977 | # CONFIG_USB_IDMOUSE is not set | ||
| 978 | # CONFIG_USB_FTDI_ELAN is not set | ||
| 979 | # CONFIG_USB_APPLEDISPLAY is not set | ||
| 980 | # CONFIG_USB_LD is not set | ||
| 981 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
| 982 | # CONFIG_USB_IOWARRIOR is not set | ||
| 983 | CONFIG_USB_TEST=y | ||
| 984 | CONFIG_USB_GADGET=y | ||
| 985 | # CONFIG_USB_GADGET_DEBUG is not set | ||
| 986 | # CONFIG_USB_GADGET_DEBUG_FILES is not set | ||
| 987 | CONFIG_USB_GADGET_SELECTED=y | ||
| 988 | # CONFIG_USB_GADGET_AMD5536UDC is not set | ||
| 989 | # CONFIG_USB_GADGET_ATMEL_USBA is not set | ||
| 990 | # CONFIG_USB_GADGET_FSL_USB2 is not set | ||
| 991 | # CONFIG_USB_GADGET_NET2280 is not set | ||
| 992 | # CONFIG_USB_GADGET_PXA2XX is not set | ||
| 993 | # CONFIG_USB_GADGET_M66592 is not set | ||
| 994 | # CONFIG_USB_GADGET_GOKU is not set | ||
| 995 | # CONFIG_USB_GADGET_LH7A40X is not set | ||
| 996 | CONFIG_USB_GADGET_OMAP=y | ||
| 997 | CONFIG_USB_OMAP=y | ||
| 998 | # CONFIG_USB_GADGET_S3C2410 is not set | ||
| 999 | # CONFIG_USB_GADGET_AT91 is not set | ||
| 1000 | # CONFIG_USB_GADGET_DUMMY_HCD is not set | ||
| 1001 | # CONFIG_USB_GADGET_DUALSPEED is not set | ||
| 1002 | # CONFIG_USB_ZERO is not set | ||
| 1003 | CONFIG_USB_ETH=y | ||
| 1004 | CONFIG_USB_ETH_RNDIS=y | ||
| 1005 | # CONFIG_USB_GADGETFS is not set | ||
| 1006 | # CONFIG_USB_FILE_STORAGE is not set | ||
| 1007 | # CONFIG_USB_G_SERIAL is not set | ||
| 1008 | # CONFIG_USB_MIDI_GADGET is not set | ||
| 1009 | # CONFIG_USB_G_PRINTER is not set | ||
| 1010 | CONFIG_MMC=y | ||
| 1011 | # CONFIG_MMC_DEBUG is not set | ||
| 1012 | # CONFIG_MMC_UNSAFE_RESUME is not set | ||
| 1013 | |||
| 1014 | # | ||
| 1015 | # MMC/SD Card Drivers | ||
| 1016 | # | ||
| 1017 | CONFIG_MMC_BLOCK=y | ||
| 1018 | CONFIG_MMC_BLOCK_BOUNCE=y | ||
| 1019 | # CONFIG_SDIO_UART is not set | ||
| 1020 | |||
| 1021 | # | ||
| 1022 | # MMC/SD Host Controller Drivers | ||
| 1023 | # | ||
| 1024 | CONFIG_MMC_OMAP=y | ||
| 1025 | # CONFIG_MMC_SPI is not set | ||
| 835 | # CONFIG_NEW_LEDS is not set | 1026 | # CONFIG_NEW_LEDS is not set |
| 836 | CONFIG_RTC_LIB=y | 1027 | CONFIG_RTC_LIB=y |
| 837 | # CONFIG_RTC_CLASS is not set | 1028 | CONFIG_RTC_CLASS=y |
| 1029 | CONFIG_RTC_HCTOSYS=y | ||
| 1030 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
| 1031 | # CONFIG_RTC_DEBUG is not set | ||
| 1032 | |||
| 1033 | # | ||
| 1034 | # RTC interfaces | ||
| 1035 | # | ||
| 1036 | CONFIG_RTC_INTF_SYSFS=y | ||
| 1037 | CONFIG_RTC_INTF_PROC=y | ||
| 1038 | CONFIG_RTC_INTF_DEV=y | ||
| 1039 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
| 1040 | # CONFIG_RTC_DRV_TEST is not set | ||
| 1041 | |||
| 1042 | # | ||
| 1043 | # I2C RTC drivers | ||
| 1044 | # | ||
| 1045 | # CONFIG_RTC_DRV_DS1307 is not set | ||
| 1046 | # CONFIG_RTC_DRV_DS1374 is not set | ||
| 1047 | # CONFIG_RTC_DRV_DS1672 is not set | ||
| 1048 | # CONFIG_RTC_DRV_MAX6900 is not set | ||
| 1049 | # CONFIG_RTC_DRV_RS5C372 is not set | ||
| 1050 | # CONFIG_RTC_DRV_ISL1208 is not set | ||
| 1051 | # CONFIG_RTC_DRV_X1205 is not set | ||
| 1052 | # CONFIG_RTC_DRV_PCF8563 is not set | ||
| 1053 | # CONFIG_RTC_DRV_PCF8583 is not set | ||
| 1054 | # CONFIG_RTC_DRV_M41T80 is not set | ||
| 1055 | |||
| 1056 | # | ||
| 1057 | # SPI RTC drivers | ||
| 1058 | # | ||
| 1059 | # CONFIG_RTC_DRV_MAX6902 is not set | ||
| 1060 | # CONFIG_RTC_DRV_R9701 is not set | ||
| 1061 | # CONFIG_RTC_DRV_RS5C348 is not set | ||
| 1062 | |||
| 1063 | # | ||
| 1064 | # Platform RTC drivers | ||
| 1065 | # | ||
| 1066 | # CONFIG_RTC_DRV_CMOS is not set | ||
| 1067 | # CONFIG_RTC_DRV_DS1511 is not set | ||
| 1068 | # CONFIG_RTC_DRV_DS1553 is not set | ||
| 1069 | # CONFIG_RTC_DRV_DS1742 is not set | ||
| 1070 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 1071 | # CONFIG_RTC_DRV_M48T86 is not set | ||
| 1072 | # CONFIG_RTC_DRV_M48T59 is not set | ||
| 1073 | # CONFIG_RTC_DRV_V3020 is not set | ||
| 1074 | |||
| 1075 | # | ||
| 1076 | # on-CPU RTC drivers | ||
| 1077 | # | ||
| 1078 | CONFIG_RTC_DRV_OMAP=y | ||
| 1079 | |||
| 1080 | # | ||
| 1081 | # CBUS support | ||
| 1082 | # | ||
| 1083 | # CONFIG_CBUS is not set | ||
| 1084 | # CONFIG_OMAP_DSP is not set | ||
| 838 | 1085 | ||
| 839 | # | 1086 | # |
| 840 | # File systems | 1087 | # File systems |
| @@ -894,6 +1141,17 @@ CONFIG_SYSFS=y | |||
| 894 | # CONFIG_BEFS_FS is not set | 1141 | # CONFIG_BEFS_FS is not set |
| 895 | # CONFIG_BFS_FS is not set | 1142 | # CONFIG_BFS_FS is not set |
| 896 | # CONFIG_EFS_FS is not set | 1143 | # CONFIG_EFS_FS is not set |
| 1144 | CONFIG_JFFS2_FS=y | ||
| 1145 | CONFIG_JFFS2_FS_DEBUG=0 | ||
| 1146 | CONFIG_JFFS2_FS_WRITEBUFFER=y | ||
| 1147 | # CONFIG_JFFS2_FS_WBUF_VERIFY is not set | ||
| 1148 | # CONFIG_JFFS2_SUMMARY is not set | ||
| 1149 | # CONFIG_JFFS2_FS_XATTR is not set | ||
| 1150 | # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set | ||
| 1151 | CONFIG_JFFS2_ZLIB=y | ||
| 1152 | # CONFIG_JFFS2_LZO is not set | ||
| 1153 | CONFIG_JFFS2_RTIME=y | ||
| 1154 | # CONFIG_JFFS2_RUBIN is not set | ||
| 897 | CONFIG_CRAMFS=y | 1155 | CONFIG_CRAMFS=y |
| 898 | # CONFIG_VXFS_FS is not set | 1156 | # CONFIG_VXFS_FS is not set |
| 899 | # CONFIG_MINIX_FS is not set | 1157 | # CONFIG_MINIX_FS is not set |
| @@ -904,19 +1162,16 @@ CONFIG_ROMFS_FS=y | |||
| 904 | # CONFIG_UFS_FS is not set | 1162 | # CONFIG_UFS_FS is not set |
| 905 | CONFIG_NETWORK_FILESYSTEMS=y | 1163 | CONFIG_NETWORK_FILESYSTEMS=y |
| 906 | CONFIG_NFS_FS=y | 1164 | CONFIG_NFS_FS=y |
| 907 | CONFIG_NFS_V3=y | 1165 | # CONFIG_NFS_V3 is not set |
| 908 | # CONFIG_NFS_V3_ACL is not set | 1166 | # CONFIG_NFS_V4 is not set |
| 909 | CONFIG_NFS_V4=y | ||
| 910 | # CONFIG_NFS_DIRECTIO is not set | 1167 | # CONFIG_NFS_DIRECTIO is not set |
| 911 | # CONFIG_NFSD is not set | 1168 | # CONFIG_NFSD is not set |
| 912 | CONFIG_ROOT_NFS=y | 1169 | CONFIG_ROOT_NFS=y |
| 913 | CONFIG_LOCKD=y | 1170 | CONFIG_LOCKD=y |
| 914 | CONFIG_LOCKD_V4=y | ||
| 915 | CONFIG_NFS_COMMON=y | 1171 | CONFIG_NFS_COMMON=y |
| 916 | CONFIG_SUNRPC=y | 1172 | CONFIG_SUNRPC=y |
| 917 | CONFIG_SUNRPC_GSS=y | ||
| 918 | # CONFIG_SUNRPC_BIND34 is not set | 1173 | # CONFIG_SUNRPC_BIND34 is not set |
| 919 | CONFIG_RPCSEC_GSS_KRB5=y | 1174 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 920 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1175 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 921 | # CONFIG_SMB_FS is not set | 1176 | # CONFIG_SMB_FS is not set |
| 922 | # CONFIG_CIFS is not set | 1177 | # CONFIG_CIFS is not set |
| @@ -981,11 +1236,38 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 981 | # CONFIG_UNUSED_SYMBOLS is not set | 1236 | # CONFIG_UNUSED_SYMBOLS is not set |
| 982 | # CONFIG_DEBUG_FS is not set | 1237 | # CONFIG_DEBUG_FS is not set |
| 983 | # CONFIG_HEADERS_CHECK is not set | 1238 | # CONFIG_HEADERS_CHECK is not set |
| 984 | # CONFIG_DEBUG_KERNEL is not set | 1239 | CONFIG_DEBUG_KERNEL=y |
| 1240 | # CONFIG_DEBUG_SHIRQ is not set | ||
| 1241 | CONFIG_DETECT_SOFTLOCKUP=y | ||
| 1242 | CONFIG_SCHED_DEBUG=y | ||
| 1243 | # CONFIG_SCHEDSTATS is not set | ||
| 1244 | # CONFIG_TIMER_STATS is not set | ||
| 1245 | # CONFIG_DEBUG_SLAB is not set | ||
| 1246 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
| 1247 | # CONFIG_RT_MUTEX_TESTER is not set | ||
| 1248 | # CONFIG_DEBUG_SPINLOCK is not set | ||
| 1249 | # CONFIG_DEBUG_MUTEXES is not set | ||
| 1250 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
| 1251 | # CONFIG_PROVE_LOCKING is not set | ||
| 1252 | # CONFIG_LOCK_STAT is not set | ||
| 1253 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
| 1254 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
| 1255 | # CONFIG_DEBUG_KOBJECT is not set | ||
| 985 | CONFIG_DEBUG_BUGVERBOSE=y | 1256 | CONFIG_DEBUG_BUGVERBOSE=y |
| 1257 | CONFIG_DEBUG_INFO=y | ||
| 1258 | # CONFIG_DEBUG_VM is not set | ||
| 1259 | # CONFIG_DEBUG_LIST is not set | ||
| 1260 | # CONFIG_DEBUG_SG is not set | ||
| 986 | CONFIG_FRAME_POINTER=y | 1261 | CONFIG_FRAME_POINTER=y |
| 1262 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
| 1263 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 1264 | # CONFIG_BACKTRACE_SELF_TEST is not set | ||
| 1265 | # CONFIG_FAULT_INJECTION is not set | ||
| 987 | # CONFIG_SAMPLES is not set | 1266 | # CONFIG_SAMPLES is not set |
| 988 | # CONFIG_DEBUG_USER is not set | 1267 | CONFIG_DEBUG_USER=y |
| 1268 | CONFIG_DEBUG_ERRORS=y | ||
| 1269 | # CONFIG_DEBUG_STACK_USAGE is not set | ||
| 1270 | # CONFIG_DEBUG_LL is not set | ||
| 989 | 1271 | ||
| 990 | # | 1272 | # |
| 991 | # Security options | 1273 | # Security options |
| @@ -994,31 +1276,29 @@ CONFIG_FRAME_POINTER=y | |||
| 994 | # CONFIG_SECURITY is not set | 1276 | # CONFIG_SECURITY is not set |
| 995 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1277 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 996 | CONFIG_CRYPTO=y | 1278 | CONFIG_CRYPTO=y |
| 997 | CONFIG_CRYPTO_ALGAPI=y | ||
| 998 | CONFIG_CRYPTO_BLKCIPHER=y | ||
| 999 | # CONFIG_CRYPTO_SEQIV is not set | 1279 | # CONFIG_CRYPTO_SEQIV is not set |
| 1000 | CONFIG_CRYPTO_MANAGER=y | 1280 | # CONFIG_CRYPTO_MANAGER is not set |
| 1001 | # CONFIG_CRYPTO_HMAC is not set | 1281 | # CONFIG_CRYPTO_HMAC is not set |
| 1002 | # CONFIG_CRYPTO_XCBC is not set | 1282 | # CONFIG_CRYPTO_XCBC is not set |
| 1003 | # CONFIG_CRYPTO_NULL is not set | 1283 | # CONFIG_CRYPTO_NULL is not set |
| 1004 | # CONFIG_CRYPTO_MD4 is not set | 1284 | # CONFIG_CRYPTO_MD4 is not set |
| 1005 | CONFIG_CRYPTO_MD5=y | 1285 | # CONFIG_CRYPTO_MD5 is not set |
| 1006 | # CONFIG_CRYPTO_SHA1 is not set | 1286 | # CONFIG_CRYPTO_SHA1 is not set |
| 1007 | # CONFIG_CRYPTO_SHA256 is not set | 1287 | # CONFIG_CRYPTO_SHA256 is not set |
| 1008 | # CONFIG_CRYPTO_SHA512 is not set | 1288 | # CONFIG_CRYPTO_SHA512 is not set |
| 1009 | # CONFIG_CRYPTO_WP512 is not set | 1289 | # CONFIG_CRYPTO_WP512 is not set |
| 1010 | # CONFIG_CRYPTO_TGR192 is not set | 1290 | # CONFIG_CRYPTO_TGR192 is not set |
| 1011 | # CONFIG_CRYPTO_GF128MUL is not set | 1291 | # CONFIG_CRYPTO_GF128MUL is not set |
| 1012 | CONFIG_CRYPTO_ECB=m | 1292 | # CONFIG_CRYPTO_ECB is not set |
| 1013 | CONFIG_CRYPTO_CBC=y | 1293 | # CONFIG_CRYPTO_CBC is not set |
| 1014 | CONFIG_CRYPTO_PCBC=m | 1294 | # CONFIG_CRYPTO_PCBC is not set |
| 1015 | # CONFIG_CRYPTO_LRW is not set | 1295 | # CONFIG_CRYPTO_LRW is not set |
| 1016 | # CONFIG_CRYPTO_XTS is not set | 1296 | # CONFIG_CRYPTO_XTS is not set |
| 1017 | # CONFIG_CRYPTO_CTR is not set | 1297 | # CONFIG_CRYPTO_CTR is not set |
| 1018 | # CONFIG_CRYPTO_GCM is not set | 1298 | # CONFIG_CRYPTO_GCM is not set |
| 1019 | # CONFIG_CRYPTO_CCM is not set | 1299 | # CONFIG_CRYPTO_CCM is not set |
| 1020 | # CONFIG_CRYPTO_CRYPTD is not set | 1300 | # CONFIG_CRYPTO_CRYPTD is not set |
| 1021 | CONFIG_CRYPTO_DES=y | 1301 | # CONFIG_CRYPTO_DES is not set |
| 1022 | # CONFIG_CRYPTO_FCRYPT is not set | 1302 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1023 | # CONFIG_CRYPTO_BLOWFISH is not set | 1303 | # CONFIG_CRYPTO_BLOWFISH is not set |
| 1024 | # CONFIG_CRYPTO_TWOFISH is not set | 1304 | # CONFIG_CRYPTO_TWOFISH is not set |
| @@ -1052,6 +1332,7 @@ CONFIG_CRC32=y | |||
| 1052 | # CONFIG_CRC7 is not set | 1332 | # CONFIG_CRC7 is not set |
| 1053 | # CONFIG_LIBCRC32C is not set | 1333 | # CONFIG_LIBCRC32C is not set |
| 1054 | CONFIG_ZLIB_INFLATE=y | 1334 | CONFIG_ZLIB_INFLATE=y |
| 1335 | CONFIG_ZLIB_DEFLATE=y | ||
| 1055 | CONFIG_PLIST=y | 1336 | CONFIG_PLIST=y |
| 1056 | CONFIG_HAS_IOMEM=y | 1337 | CONFIG_HAS_IOMEM=y |
| 1057 | CONFIG_HAS_IOPORT=y | 1338 | CONFIG_HAS_IOPORT=y |
diff --git a/arch/arm/configs/omap_h4_2420_defconfig b/arch/arm/configs/omap_h4_2420_defconfig new file mode 100644 index 000000000000..5bc89185a64f --- /dev/null +++ b/arch/arm/configs/omap_h4_2420_defconfig | |||
| @@ -0,0 +1,1120 @@ | |||
| 1 | # | ||
| 2 | # Automatically generated make config: don't edit | ||
| 3 | # Linux kernel version: 2.6.23-rc6-omap1 | ||
| 4 | # Tue Sep 18 11:44:58 2007 | ||
| 5 | # | ||
| 6 | CONFIG_ARM=y | ||
| 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | ||
| 8 | CONFIG_GENERIC_GPIO=y | ||
| 9 | CONFIG_GENERIC_TIME=y | ||
| 10 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 11 | CONFIG_MMU=y | ||
| 12 | # CONFIG_NO_IOPORT is not set | ||
| 13 | CONFIG_GENERIC_HARDIRQS=y | ||
| 14 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 15 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 16 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
| 17 | CONFIG_HARDIRQS_SW_RESEND=y | ||
| 18 | CONFIG_GENERIC_IRQ_PROBE=y | ||
| 19 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
| 20 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
| 21 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
| 22 | CONFIG_GENERIC_HWEIGHT=y | ||
| 23 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
| 24 | CONFIG_ZONE_DMA=y | ||
| 25 | CONFIG_VECTORS_BASE=0xffff0000 | ||
| 26 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
| 27 | |||
| 28 | # | ||
| 29 | # General setup | ||
| 30 | # | ||
| 31 | CONFIG_EXPERIMENTAL=y | ||
| 32 | CONFIG_BROKEN_ON_SMP=y | ||
| 33 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 34 | CONFIG_LOCALVERSION="" | ||
| 35 | CONFIG_LOCALVERSION_AUTO=y | ||
| 36 | CONFIG_SWAP=y | ||
| 37 | CONFIG_SYSVIPC=y | ||
| 38 | CONFIG_SYSVIPC_SYSCTL=y | ||
| 39 | # CONFIG_POSIX_MQUEUE is not set | ||
| 40 | CONFIG_BSD_PROCESS_ACCT=y | ||
| 41 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | ||
| 42 | # CONFIG_TASKSTATS is not set | ||
| 43 | # CONFIG_USER_NS is not set | ||
| 44 | # CONFIG_AUDIT is not set | ||
| 45 | # CONFIG_IKCONFIG is not set | ||
| 46 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 47 | CONFIG_SYSFS_DEPRECATED=y | ||
| 48 | # CONFIG_RELAY is not set | ||
| 49 | CONFIG_BLK_DEV_INITRD=y | ||
| 50 | CONFIG_INITRAMFS_SOURCE="" | ||
| 51 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
| 52 | CONFIG_SYSCTL=y | ||
| 53 | CONFIG_EMBEDDED=y | ||
| 54 | CONFIG_UID16=y | ||
| 55 | CONFIG_SYSCTL_SYSCALL=y | ||
| 56 | CONFIG_KALLSYMS=y | ||
| 57 | # CONFIG_KALLSYMS_ALL is not set | ||
| 58 | CONFIG_KALLSYMS_EXTRA_PASS=y | ||
| 59 | CONFIG_HOTPLUG=y | ||
| 60 | CONFIG_PRINTK=y | ||
| 61 | CONFIG_BUG=y | ||
| 62 | CONFIG_ELF_CORE=y | ||
| 63 | CONFIG_BASE_FULL=y | ||
| 64 | CONFIG_FUTEX=y | ||
| 65 | CONFIG_ANON_INODES=y | ||
| 66 | CONFIG_EPOLL=y | ||
| 67 | CONFIG_SIGNALFD=y | ||
| 68 | CONFIG_TIMERFD=y | ||
| 69 | CONFIG_EVENTFD=y | ||
| 70 | CONFIG_SHMEM=y | ||
| 71 | CONFIG_VM_EVENT_COUNTERS=y | ||
| 72 | CONFIG_SLAB=y | ||
| 73 | # CONFIG_SLUB is not set | ||
| 74 | # CONFIG_SLOB is not set | ||
| 75 | CONFIG_RT_MUTEXES=y | ||
| 76 | # CONFIG_TINY_SHMEM is not set | ||
| 77 | CONFIG_BASE_SMALL=0 | ||
| 78 | CONFIG_MODULES=y | ||
| 79 | CONFIG_MODULE_UNLOAD=y | ||
| 80 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 81 | CONFIG_MODVERSIONS=y | ||
| 82 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 83 | CONFIG_KMOD=y | ||
| 84 | CONFIG_BLOCK=y | ||
| 85 | # CONFIG_LBD is not set | ||
| 86 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 87 | # CONFIG_LSF is not set | ||
| 88 | # CONFIG_BLK_DEV_BSG is not set | ||
| 89 | |||
| 90 | # | ||
| 91 | # IO Schedulers | ||
| 92 | # | ||
| 93 | CONFIG_IOSCHED_NOOP=y | ||
| 94 | CONFIG_IOSCHED_AS=y | ||
| 95 | CONFIG_IOSCHED_DEADLINE=y | ||
| 96 | CONFIG_IOSCHED_CFQ=y | ||
| 97 | CONFIG_DEFAULT_AS=y | ||
| 98 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 99 | # CONFIG_DEFAULT_CFQ is not set | ||
| 100 | # CONFIG_DEFAULT_NOOP is not set | ||
| 101 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 102 | |||
| 103 | # | ||
| 104 | # System Type | ||
| 105 | # | ||
| 106 | # CONFIG_ARCH_AAEC2000 is not set | ||
| 107 | # CONFIG_ARCH_INTEGRATOR is not set | ||
| 108 | # CONFIG_ARCH_REALVIEW is not set | ||
| 109 | # CONFIG_ARCH_VERSATILE is not set | ||
| 110 | # CONFIG_ARCH_AT91 is not set | ||
| 111 | # CONFIG_ARCH_CLPS7500 is not set | ||
| 112 | # CONFIG_ARCH_CLPS711X is not set | ||
| 113 | # CONFIG_ARCH_CO285 is not set | ||
| 114 | # CONFIG_ARCH_EBSA110 is not set | ||
| 115 | # CONFIG_ARCH_EP93XX is not set | ||
| 116 | # CONFIG_ARCH_FOOTBRIDGE is not set | ||
| 117 | # CONFIG_ARCH_NETX is not set | ||
| 118 | # CONFIG_ARCH_H720X is not set | ||
| 119 | # CONFIG_ARCH_IMX is not set | ||
| 120 | # CONFIG_ARCH_IOP13XX is not set | ||
| 121 | # CONFIG_ARCH_IOP32X is not set | ||
| 122 | # CONFIG_ARCH_IOP33X is not set | ||
| 123 | # CONFIG_ARCH_IXP23XX is not set | ||
| 124 | # CONFIG_ARCH_IXP2000 is not set | ||
| 125 | # CONFIG_ARCH_IXP4XX is not set | ||
| 126 | # CONFIG_ARCH_L7200 is not set | ||
| 127 | # CONFIG_ARCH_KS8695 is not set | ||
| 128 | # CONFIG_ARCH_NS9XXX is not set | ||
| 129 | # CONFIG_ARCH_MXC is not set | ||
| 130 | # CONFIG_ARCH_PNX4008 is not set | ||
| 131 | # CONFIG_ARCH_PXA is not set | ||
| 132 | # CONFIG_ARCH_RPC is not set | ||
| 133 | # CONFIG_ARCH_SA1100 is not set | ||
| 134 | # CONFIG_ARCH_S3C2410 is not set | ||
| 135 | # CONFIG_ARCH_SHARK is not set | ||
| 136 | # CONFIG_ARCH_LH7A40X is not set | ||
| 137 | # CONFIG_ARCH_DAVINCI is not set | ||
| 138 | CONFIG_ARCH_OMAP=y | ||
| 139 | |||
| 140 | # | ||
| 141 | # TI OMAP Implementations | ||
| 142 | # | ||
| 143 | CONFIG_ARCH_OMAP_OTG=y | ||
| 144 | # CONFIG_ARCH_OMAP1 is not set | ||
| 145 | CONFIG_ARCH_OMAP2=y | ||
| 146 | # CONFIG_ARCH_OMAP3 is not set | ||
| 147 | |||
| 148 | # | ||
| 149 | # OMAP Feature Selections | ||
| 150 | # | ||
| 151 | CONFIG_OMAP_DEBUG_DEVICES=y | ||
| 152 | # CONFIG_OMAP_RESET_CLOCKS is not set | ||
| 153 | CONFIG_OMAP_BOOT_TAG=y | ||
| 154 | # CONFIG_OMAP_BOOT_REASON is not set | ||
| 155 | # CONFIG_OMAP_COMPONENT_VERSION is not set | ||
| 156 | # CONFIG_OMAP_GPIO_SWITCH is not set | ||
| 157 | CONFIG_OMAP_MUX=y | ||
| 158 | CONFIG_OMAP_MUX_DEBUG=y | ||
| 159 | CONFIG_OMAP_MUX_WARNINGS=y | ||
| 160 | # CONFIG_OMAP_STI is not set | ||
| 161 | CONFIG_OMAP_MCBSP=y | ||
| 162 | # CONFIG_OMAP_MMU_FWK is not set | ||
| 163 | # CONFIG_OMAP_MBOX_FWK is not set | ||
| 164 | CONFIG_OMAP_MPU_TIMER=y | ||
| 165 | # CONFIG_OMAP_32K_TIMER is not set | ||
| 166 | CONFIG_OMAP_DM_TIMER=y | ||
| 167 | CONFIG_OMAP_LL_DEBUG_UART1=y | ||
| 168 | # CONFIG_OMAP_LL_DEBUG_UART2 is not set | ||
| 169 | # CONFIG_OMAP_LL_DEBUG_UART3 is not set | ||
| 170 | CONFIG_OMAP_SERIAL_WAKE=y | ||
| 171 | # CONFIG_OMAP_DSP is not set | ||
| 172 | # CONFIG_MACH_OMAP_GENERIC is not set | ||
| 173 | |||
| 174 | # | ||
| 175 | # OMAP Core Type | ||
| 176 | # | ||
| 177 | CONFIG_ARCH_OMAP24XX=y | ||
| 178 | CONFIG_ARCH_OMAP2420=y | ||
| 179 | # CONFIG_ARCH_OMAP2430 is not set | ||
| 180 | |||
| 181 | # | ||
| 182 | # OMAP Board Type | ||
| 183 | # | ||
| 184 | # CONFIG_MACH_NOKIA_N800 is not set | ||
| 185 | CONFIG_MACH_OMAP_H4=y | ||
| 186 | # CONFIG_MACH_OMAP_H4_TUSB is not set | ||
| 187 | # CONFIG_MACH_OMAP_H4_OTG is not set | ||
| 188 | # CONFIG_MACH_OMAP2_H4_USB1 is not set | ||
| 189 | # CONFIG_MACH_OMAP_APOLLON is not set | ||
| 190 | # CONFIG_MACH_OMAP_APOLLON_PLUS is not set | ||
| 191 | # CONFIG_MACH_OMAP_2430SDP is not set | ||
| 192 | |||
| 193 | # | ||
| 194 | # Boot options | ||
| 195 | # | ||
| 196 | |||
| 197 | # | ||
| 198 | # Power management | ||
| 199 | # | ||
| 200 | |||
| 201 | # | ||
| 202 | # Processor Type | ||
| 203 | # | ||
| 204 | CONFIG_CPU_32=y | ||
| 205 | CONFIG_CPU_V6=y | ||
| 206 | # CONFIG_CPU_32v6K is not set | ||
| 207 | CONFIG_CPU_32v6=y | ||
| 208 | CONFIG_CPU_ABRT_EV6=y | ||
| 209 | CONFIG_CPU_PABRT_NOIFAR=y | ||
| 210 | CONFIG_CPU_CACHE_V6=y | ||
| 211 | CONFIG_CPU_CACHE_VIPT=y | ||
| 212 | CONFIG_CPU_COPY_V6=y | ||
| 213 | CONFIG_CPU_TLB_V6=y | ||
| 214 | CONFIG_CPU_HAS_ASID=y | ||
| 215 | CONFIG_CPU_CP15=y | ||
| 216 | CONFIG_CPU_CP15_MMU=y | ||
| 217 | |||
| 218 | # | ||
| 219 | # Processor Features | ||
| 220 | # | ||
| 221 | CONFIG_ARM_THUMB=y | ||
| 222 | # CONFIG_CPU_ICACHE_DISABLE is not set | ||
| 223 | # CONFIG_CPU_DCACHE_DISABLE is not set | ||
| 224 | # CONFIG_CPU_BPREDICT_DISABLE is not set | ||
| 225 | # CONFIG_OUTER_CACHE is not set | ||
| 226 | |||
| 227 | # | ||
| 228 | # Bus support | ||
| 229 | # | ||
| 230 | # CONFIG_PCI_SYSCALL is not set | ||
| 231 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 232 | |||
| 233 | # | ||
| 234 | # PCCARD (PCMCIA/CardBus) support | ||
| 235 | # | ||
| 236 | # CONFIG_PCCARD is not set | ||
| 237 | |||
| 238 | # | ||
| 239 | # Kernel Features | ||
| 240 | # | ||
| 241 | # CONFIG_TICK_ONESHOT is not set | ||
| 242 | # CONFIG_NO_HZ is not set | ||
| 243 | # CONFIG_HIGH_RES_TIMERS is not set | ||
| 244 | # CONFIG_PREEMPT is not set | ||
| 245 | CONFIG_HZ=100 | ||
| 246 | CONFIG_AEABI=y | ||
| 247 | CONFIG_OABI_COMPAT=y | ||
| 248 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | ||
| 249 | CONFIG_SELECT_MEMORY_MODEL=y | ||
| 250 | CONFIG_FLATMEM_MANUAL=y | ||
| 251 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
| 252 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
| 253 | CONFIG_FLATMEM=y | ||
| 254 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
| 255 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 256 | CONFIG_SPLIT_PTLOCK_CPUS=4 | ||
| 257 | # CONFIG_RESOURCES_64BIT is not set | ||
| 258 | CONFIG_ZONE_DMA_FLAG=1 | ||
| 259 | CONFIG_BOUNCE=y | ||
| 260 | CONFIG_VIRT_TO_BUS=y | ||
| 261 | # CONFIG_LEDS is not set | ||
| 262 | CONFIG_ALIGNMENT_TRAP=y | ||
| 263 | |||
| 264 | # | ||
| 265 | # Boot options | ||
| 266 | # | ||
| 267 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
| 268 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
| 269 | CONFIG_CMDLINE="root=/dev/ram0 rw console=ttyS0,115200n8 initrd=0x80600000,8M ramdisk_size=8192" | ||
| 270 | # CONFIG_XIP_KERNEL is not set | ||
| 271 | # CONFIG_KEXEC is not set | ||
| 272 | |||
| 273 | # | ||
| 274 | # CPU Frequency scaling | ||
| 275 | # | ||
| 276 | # CONFIG_CPU_FREQ is not set | ||
| 277 | |||
| 278 | # | ||
| 279 | # Floating point emulation | ||
| 280 | # | ||
| 281 | |||
| 282 | # | ||
| 283 | # At least one emulation must be selected | ||
| 284 | # | ||
| 285 | CONFIG_FPE_NWFPE=y | ||
| 286 | # CONFIG_FPE_NWFPE_XP is not set | ||
| 287 | # CONFIG_FPE_FASTFPE is not set | ||
| 288 | # CONFIG_VFP is not set | ||
| 289 | |||
| 290 | # | ||
| 291 | # Userspace binary formats | ||
| 292 | # | ||
| 293 | CONFIG_BINFMT_ELF=y | ||
| 294 | # CONFIG_BINFMT_AOUT is not set | ||
| 295 | CONFIG_BINFMT_MISC=y | ||
| 296 | |||
| 297 | # | ||
| 298 | # Power management options | ||
| 299 | # | ||
| 300 | # CONFIG_PM is not set | ||
| 301 | CONFIG_SUSPEND_UP_POSSIBLE=y | ||
| 302 | |||
| 303 | # | ||
| 304 | # Networking | ||
| 305 | # | ||
| 306 | CONFIG_NET=y | ||
| 307 | |||
| 308 | # | ||
| 309 | # Networking options | ||
| 310 | # | ||
| 311 | CONFIG_PACKET=y | ||
| 312 | # CONFIG_PACKET_MMAP is not set | ||
| 313 | CONFIG_UNIX=y | ||
| 314 | CONFIG_XFRM=y | ||
| 315 | # CONFIG_XFRM_USER is not set | ||
| 316 | # CONFIG_XFRM_SUB_POLICY is not set | ||
| 317 | # CONFIG_XFRM_MIGRATE is not set | ||
| 318 | CONFIG_NET_KEY=y | ||
| 319 | # CONFIG_NET_KEY_MIGRATE is not set | ||
| 320 | CONFIG_INET=y | ||
| 321 | # CONFIG_IP_MULTICAST is not set | ||
| 322 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
| 323 | CONFIG_IP_FIB_HASH=y | ||
| 324 | CONFIG_IP_PNP=y | ||
| 325 | CONFIG_IP_PNP_DHCP=y | ||
| 326 | # CONFIG_IP_PNP_BOOTP is not set | ||
| 327 | # CONFIG_IP_PNP_RARP is not set | ||
| 328 | # CONFIG_NET_IPIP is not set | ||
| 329 | # CONFIG_NET_IPGRE is not set | ||
| 330 | # CONFIG_ARPD is not set | ||
| 331 | # CONFIG_SYN_COOKIES is not set | ||
| 332 | # CONFIG_INET_AH is not set | ||
| 333 | # CONFIG_INET_ESP is not set | ||
| 334 | # CONFIG_INET_IPCOMP is not set | ||
| 335 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
| 336 | # CONFIG_INET_TUNNEL is not set | ||
| 337 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | ||
| 338 | CONFIG_INET_XFRM_MODE_TUNNEL=y | ||
| 339 | CONFIG_INET_XFRM_MODE_BEET=y | ||
| 340 | CONFIG_INET_DIAG=y | ||
| 341 | CONFIG_INET_TCP_DIAG=y | ||
| 342 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
| 343 | CONFIG_TCP_CONG_CUBIC=y | ||
| 344 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
| 345 | # CONFIG_TCP_MD5SIG is not set | ||
| 346 | # CONFIG_IPV6 is not set | ||
| 347 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 348 | # CONFIG_INET6_TUNNEL is not set | ||
| 349 | # CONFIG_NETWORK_SECMARK is not set | ||
| 350 | # CONFIG_NETFILTER is not set | ||
| 351 | # CONFIG_IP_DCCP is not set | ||
| 352 | # CONFIG_IP_SCTP is not set | ||
| 353 | # CONFIG_TIPC is not set | ||
| 354 | # CONFIG_ATM is not set | ||
| 355 | # CONFIG_BRIDGE is not set | ||
| 356 | # CONFIG_VLAN_8021Q is not set | ||
| 357 | # CONFIG_DECNET is not set | ||
| 358 | # CONFIG_LLC2 is not set | ||
| 359 | # CONFIG_IPX is not set | ||
| 360 | # CONFIG_ATALK is not set | ||
| 361 | # CONFIG_X25 is not set | ||
| 362 | # CONFIG_LAPB is not set | ||
| 363 | # CONFIG_ECONET is not set | ||
| 364 | # CONFIG_WAN_ROUTER is not set | ||
| 365 | |||
| 366 | # | ||
| 367 | # QoS and/or fair queueing | ||
| 368 | # | ||
| 369 | # CONFIG_NET_SCHED is not set | ||
| 370 | |||
| 371 | # | ||
| 372 | # Network testing | ||
| 373 | # | ||
| 374 | # CONFIG_NET_PKTGEN is not set | ||
| 375 | # CONFIG_HAMRADIO is not set | ||
| 376 | CONFIG_IRDA=y | ||
| 377 | |||
| 378 | # | ||
| 379 | # IrDA protocols | ||
| 380 | # | ||
| 381 | CONFIG_IRLAN=y | ||
| 382 | CONFIG_IRCOMM=y | ||
| 383 | # CONFIG_IRDA_ULTRA is not set | ||
| 384 | |||
| 385 | # | ||
| 386 | # IrDA options | ||
| 387 | # | ||
| 388 | # CONFIG_IRDA_CACHE_LAST_LSAP is not set | ||
| 389 | # CONFIG_IRDA_FAST_RR is not set | ||
| 390 | # CONFIG_IRDA_DEBUG is not set | ||
| 391 | |||
| 392 | # | ||
| 393 | # Infrared-port device drivers | ||
| 394 | # | ||
| 395 | |||
| 396 | # | ||
| 397 | # SIR device drivers | ||
| 398 | # | ||
| 399 | # CONFIG_IRTTY_SIR is not set | ||
| 400 | |||
| 401 | # | ||
| 402 | # Dongle support | ||
| 403 | # | ||
| 404 | |||
| 405 | # | ||
| 406 | # Old SIR device drivers | ||
| 407 | # | ||
| 408 | # CONFIG_IRPORT_SIR is not set | ||
| 409 | |||
| 410 | # | ||
| 411 | # Old Serial dongle support | ||
| 412 | # | ||
| 413 | |||
| 414 | # | ||
| 415 | # FIR device drivers | ||
| 416 | # | ||
| 417 | CONFIG_OMAP_IR=y | ||
| 418 | # CONFIG_BT is not set | ||
| 419 | # CONFIG_AF_RXRPC is not set | ||
| 420 | |||
| 421 | # | ||
| 422 | # Wireless | ||
| 423 | # | ||
| 424 | # CONFIG_CFG80211 is not set | ||
| 425 | # CONFIG_WIRELESS_EXT is not set | ||
| 426 | # CONFIG_MAC80211 is not set | ||
| 427 | # CONFIG_IEEE80211 is not set | ||
| 428 | # CONFIG_RFKILL is not set | ||
| 429 | # CONFIG_NET_9P is not set | ||
| 430 | |||
| 431 | # | ||
| 432 | # Device Drivers | ||
| 433 | # | ||
| 434 | |||
| 435 | # | ||
| 436 | # Generic Driver Options | ||
| 437 | # | ||
| 438 | CONFIG_STANDALONE=y | ||
| 439 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
| 440 | # CONFIG_FW_LOADER is not set | ||
| 441 | # CONFIG_DEBUG_DRIVER is not set | ||
| 442 | # CONFIG_DEBUG_DEVRES is not set | ||
| 443 | # CONFIG_SYS_HYPERVISOR is not set | ||
| 444 | # CONFIG_CONNECTOR is not set | ||
| 445 | CONFIG_MTD=y | ||
| 446 | # CONFIG_MTD_DEBUG is not set | ||
| 447 | CONFIG_MTD_CONCAT=y | ||
| 448 | CONFIG_MTD_PARTITIONS=y | ||
| 449 | # CONFIG_MTD_REDBOOT_PARTS is not set | ||
| 450 | CONFIG_MTD_CMDLINE_PARTS=y | ||
| 451 | # CONFIG_MTD_AFS_PARTS is not set | ||
| 452 | |||
| 453 | # | ||
| 454 | # User Modules And Translation Layers | ||
| 455 | # | ||
| 456 | CONFIG_MTD_CHAR=y | ||
| 457 | CONFIG_MTD_BLKDEVS=y | ||
| 458 | CONFIG_MTD_BLOCK=y | ||
| 459 | # CONFIG_FTL is not set | ||
| 460 | # CONFIG_NFTL is not set | ||
| 461 | # CONFIG_INFTL is not set | ||
| 462 | # CONFIG_RFD_FTL is not set | ||
| 463 | # CONFIG_SSFDC is not set | ||
| 464 | |||
| 465 | # | ||
| 466 | # RAM/ROM/Flash chip drivers | ||
| 467 | # | ||
| 468 | CONFIG_MTD_CFI=y | ||
| 469 | # CONFIG_MTD_JEDECPROBE is not set | ||
| 470 | CONFIG_MTD_GEN_PROBE=y | ||
| 471 | # CONFIG_MTD_CFI_ADV_OPTIONS is not set | ||
| 472 | CONFIG_MTD_MAP_BANK_WIDTH_1=y | ||
| 473 | CONFIG_MTD_MAP_BANK_WIDTH_2=y | ||
| 474 | CONFIG_MTD_MAP_BANK_WIDTH_4=y | ||
| 475 | # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set | ||
| 476 | # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set | ||
| 477 | # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set | ||
| 478 | CONFIG_MTD_CFI_I1=y | ||
| 479 | CONFIG_MTD_CFI_I2=y | ||
| 480 | # CONFIG_MTD_CFI_I4 is not set | ||
| 481 | # CONFIG_MTD_CFI_I8 is not set | ||
| 482 | CONFIG_MTD_CFI_INTELEXT=y | ||
| 483 | # CONFIG_MTD_CFI_AMDSTD is not set | ||
| 484 | # CONFIG_MTD_CFI_STAA is not set | ||
| 485 | CONFIG_MTD_CFI_UTIL=y | ||
| 486 | # CONFIG_MTD_RAM is not set | ||
| 487 | # CONFIG_MTD_ROM is not set | ||
| 488 | # CONFIG_MTD_ABSENT is not set | ||
| 489 | |||
| 490 | # | ||
| 491 | # Mapping drivers for chip access | ||
| 492 | # | ||
| 493 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | ||
| 494 | # CONFIG_MTD_PHYSMAP is not set | ||
| 495 | # CONFIG_MTD_ARM_INTEGRATOR is not set | ||
| 496 | CONFIG_MTD_OMAP_NOR=y | ||
| 497 | # CONFIG_MTD_PLATRAM is not set | ||
| 498 | |||
| 499 | # | ||
| 500 | # Self-contained MTD device drivers | ||
| 501 | # | ||
| 502 | # CONFIG_MTD_SLRAM is not set | ||
| 503 | # CONFIG_MTD_PHRAM is not set | ||
| 504 | # CONFIG_MTD_MTDRAM is not set | ||
| 505 | # CONFIG_MTD_BLOCK2MTD is not set | ||
| 506 | |||
| 507 | # | ||
| 508 | # Disk-On-Chip Device Drivers | ||
| 509 | # | ||
| 510 | # CONFIG_MTD_DOC2000 is not set | ||
| 511 | # CONFIG_MTD_DOC2001 is not set | ||
| 512 | # CONFIG_MTD_DOC2001PLUS is not set | ||
| 513 | # CONFIG_MTD_NAND is not set | ||
| 514 | # CONFIG_MTD_ONENAND is not set | ||
| 515 | |||
| 516 | # | ||
| 517 | # UBI - Unsorted block images | ||
| 518 | # | ||
| 519 | # CONFIG_MTD_UBI is not set | ||
| 520 | # CONFIG_PARPORT is not set | ||
| 521 | CONFIG_BLK_DEV=y | ||
| 522 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
| 523 | CONFIG_BLK_DEV_LOOP=y | ||
| 524 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | ||
| 525 | # CONFIG_BLK_DEV_NBD is not set | ||
| 526 | CONFIG_BLK_DEV_RAM=y | ||
| 527 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
| 528 | CONFIG_BLK_DEV_RAM_SIZE=16384 | ||
| 529 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | ||
| 530 | # CONFIG_CDROM_PKTCDVD is not set | ||
| 531 | # CONFIG_ATA_OVER_ETH is not set | ||
| 532 | |||
| 533 | # | ||
| 534 | # SCSI device support | ||
| 535 | # | ||
| 536 | # CONFIG_RAID_ATTRS is not set | ||
| 537 | # CONFIG_SCSI is not set | ||
| 538 | # CONFIG_SCSI_DMA is not set | ||
| 539 | # CONFIG_SCSI_NETLINK is not set | ||
| 540 | # CONFIG_ATA is not set | ||
| 541 | # CONFIG_MD is not set | ||
| 542 | CONFIG_NETDEVICES=y | ||
| 543 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 544 | # CONFIG_DUMMY is not set | ||
| 545 | # CONFIG_BONDING is not set | ||
| 546 | # CONFIG_MACVLAN is not set | ||
| 547 | # CONFIG_EQUALIZER is not set | ||
| 548 | # CONFIG_TUN is not set | ||
| 549 | # CONFIG_PHYLIB is not set | ||
| 550 | CONFIG_NET_ETHERNET=y | ||
| 551 | CONFIG_MII=y | ||
| 552 | # CONFIG_AX88796 is not set | ||
| 553 | CONFIG_SMC91X=y | ||
| 554 | # CONFIG_DM9000 is not set | ||
| 555 | CONFIG_NETDEV_1000=y | ||
| 556 | CONFIG_NETDEV_10000=y | ||
| 557 | |||
| 558 | # | ||
| 559 | # Wireless LAN | ||
| 560 | # | ||
| 561 | # CONFIG_WLAN_PRE80211 is not set | ||
| 562 | # CONFIG_WLAN_80211 is not set | ||
| 563 | # CONFIG_WAN is not set | ||
| 564 | # CONFIG_PPP is not set | ||
| 565 | # CONFIG_SLIP is not set | ||
| 566 | # CONFIG_SHAPER is not set | ||
| 567 | # CONFIG_NETCONSOLE is not set | ||
| 568 | # CONFIG_NETPOLL is not set | ||
| 569 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
| 570 | # CONFIG_ISDN is not set | ||
| 571 | |||
| 572 | # | ||
| 573 | # Input device support | ||
| 574 | # | ||
| 575 | CONFIG_INPUT=y | ||
| 576 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
| 577 | # CONFIG_INPUT_POLLDEV is not set | ||
| 578 | |||
| 579 | # | ||
| 580 | # Userland interfaces | ||
| 581 | # | ||
| 582 | # CONFIG_INPUT_MOUSEDEV is not set | ||
| 583 | # CONFIG_INPUT_JOYDEV is not set | ||
| 584 | # CONFIG_INPUT_TSDEV is not set | ||
| 585 | CONFIG_INPUT_EVDEV=y | ||
| 586 | # CONFIG_INPUT_EVBUG is not set | ||
| 587 | |||
| 588 | # | ||
| 589 | # Input Device Drivers | ||
| 590 | # | ||
| 591 | CONFIG_INPUT_KEYBOARD=y | ||
| 592 | # CONFIG_KEYBOARD_ATKBD is not set | ||
| 593 | # CONFIG_KEYBOARD_SUNKBD is not set | ||
| 594 | # CONFIG_KEYBOARD_LKKBD is not set | ||
| 595 | # CONFIG_KEYBOARD_XTKBD is not set | ||
| 596 | # CONFIG_KEYBOARD_NEWTON is not set | ||
| 597 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
| 598 | CONFIG_KEYBOARD_OMAP=y | ||
| 599 | # CONFIG_KEYBOARD_GPIO is not set | ||
| 600 | # CONFIG_INPUT_MOUSE is not set | ||
| 601 | # CONFIG_INPUT_JOYSTICK is not set | ||
| 602 | # CONFIG_INPUT_TABLET is not set | ||
| 603 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
| 604 | # CONFIG_INPUT_MISC is not set | ||
| 605 | |||
| 606 | # | ||
| 607 | # Hardware I/O ports | ||
| 608 | # | ||
| 609 | # CONFIG_SERIO is not set | ||
| 610 | # CONFIG_GAMEPORT is not set | ||
| 611 | |||
| 612 | # | ||
| 613 | # Character devices | ||
| 614 | # | ||
| 615 | CONFIG_VT=y | ||
| 616 | CONFIG_VT_CONSOLE=y | ||
| 617 | CONFIG_HW_CONSOLE=y | ||
| 618 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
| 619 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
| 620 | |||
| 621 | # | ||
| 622 | # Serial drivers | ||
| 623 | # | ||
| 624 | CONFIG_SERIAL_8250=y | ||
| 625 | CONFIG_SERIAL_8250_CONSOLE=y | ||
| 626 | CONFIG_SERIAL_8250_NR_UARTS=32 | ||
| 627 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | ||
| 628 | CONFIG_SERIAL_8250_EXTENDED=y | ||
| 629 | CONFIG_SERIAL_8250_MANY_PORTS=y | ||
| 630 | CONFIG_SERIAL_8250_SHARE_IRQ=y | ||
| 631 | CONFIG_SERIAL_8250_DETECT_IRQ=y | ||
| 632 | CONFIG_SERIAL_8250_RSA=y | ||
| 633 | |||
| 634 | # | ||
| 635 | # Non-8250 serial port support | ||
| 636 | # | ||
| 637 | CONFIG_SERIAL_CORE=y | ||
| 638 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
| 639 | CONFIG_UNIX98_PTYS=y | ||
| 640 | # CONFIG_LEGACY_PTYS is not set | ||
| 641 | # CONFIG_IPMI_HANDLER is not set | ||
| 642 | CONFIG_WATCHDOG=y | ||
| 643 | CONFIG_WATCHDOG_NOWAYOUT=y | ||
| 644 | |||
| 645 | # | ||
| 646 | # Watchdog Device Drivers | ||
| 647 | # | ||
| 648 | # CONFIG_SOFT_WATCHDOG is not set | ||
| 649 | CONFIG_OMAP_WATCHDOG=y | ||
| 650 | CONFIG_HW_RANDOM=m | ||
| 651 | CONFIG_HW_RANDOM_OMAP=m | ||
| 652 | # CONFIG_NVRAM is not set | ||
| 653 | # CONFIG_R3964 is not set | ||
| 654 | # CONFIG_RAW_DRIVER is not set | ||
| 655 | # CONFIG_TCG_TPM is not set | ||
| 656 | CONFIG_I2C=y | ||
| 657 | CONFIG_I2C_BOARDINFO=y | ||
| 658 | # CONFIG_I2C_CHARDEV is not set | ||
| 659 | |||
| 660 | # | ||
| 661 | # I2C Algorithms | ||
| 662 | # | ||
| 663 | # CONFIG_I2C_ALGOBIT is not set | ||
| 664 | # CONFIG_I2C_ALGOPCF is not set | ||
| 665 | # CONFIG_I2C_ALGOPCA is not set | ||
| 666 | |||
| 667 | # | ||
| 668 | # I2C Hardware Bus support | ||
| 669 | # | ||
| 670 | # CONFIG_I2C_GPIO is not set | ||
| 671 | # CONFIG_I2C_OCORES is not set | ||
| 672 | CONFIG_I2C_OMAP=y | ||
| 673 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 674 | # CONFIG_I2C_SIMTEC is not set | ||
| 675 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 676 | # CONFIG_I2C_STUB is not set | ||
| 677 | |||
| 678 | # | ||
| 679 | # Miscellaneous I2C Chip support | ||
| 680 | # | ||
| 681 | # CONFIG_SENSORS_DS1337 is not set | ||
| 682 | # CONFIG_SENSORS_DS1374 is not set | ||
| 683 | # CONFIG_DS1682 is not set | ||
| 684 | # CONFIG_SENSORS_EEPROM is not set | ||
| 685 | # CONFIG_SENSORS_PCF8574 is not set | ||
| 686 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 687 | # CONFIG_SENSORS_PCF8591 is not set | ||
| 688 | # CONFIG_ISP1301_OMAP is not set | ||
| 689 | # CONFIG_TPS65010 is not set | ||
| 690 | # CONFIG_SENSORS_TLV320AIC23 is not set | ||
| 691 | CONFIG_GPIOEXPANDER_OMAP=y | ||
| 692 | # CONFIG_TWL4030_CORE is not set | ||
| 693 | # CONFIG_SENSORS_MAX6875 is not set | ||
| 694 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 695 | CONFIG_MENELAUS=y | ||
| 696 | # CONFIG_I2C_DEBUG_CORE is not set | ||
| 697 | # CONFIG_I2C_DEBUG_ALGO is not set | ||
| 698 | # CONFIG_I2C_DEBUG_BUS is not set | ||
| 699 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 700 | |||
| 701 | # | ||
| 702 | # SPI support | ||
| 703 | # | ||
| 704 | # CONFIG_SPI is not set | ||
| 705 | # CONFIG_SPI_MASTER is not set | ||
| 706 | # CONFIG_W1 is not set | ||
| 707 | # CONFIG_HWMON is not set | ||
| 708 | CONFIG_MISC_DEVICES=y | ||
| 709 | # CONFIG_EEPROM_93CX6 is not set | ||
| 710 | |||
| 711 | # | ||
| 712 | # Multifunction device drivers | ||
| 713 | # | ||
| 714 | # CONFIG_MFD_SM501 is not set | ||
| 715 | # CONFIG_NEW_LEDS is not set | ||
| 716 | |||
| 717 | # | ||
| 718 | # Multimedia devices | ||
| 719 | # | ||
| 720 | # CONFIG_VIDEO_DEV is not set | ||
| 721 | # CONFIG_DVB_CORE is not set | ||
| 722 | CONFIG_DAB=y | ||
| 723 | |||
| 724 | # | ||
| 725 | # Graphics support | ||
| 726 | # | ||
| 727 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 728 | |||
| 729 | # | ||
| 730 | # Display device support | ||
| 731 | # | ||
| 732 | # CONFIG_DISPLAY_SUPPORT is not set | ||
| 733 | # CONFIG_VGASTATE is not set | ||
| 734 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
| 735 | CONFIG_FB=y | ||
| 736 | CONFIG_FIRMWARE_EDID=y | ||
| 737 | # CONFIG_FB_DDC is not set | ||
| 738 | # CONFIG_FB_CFB_FILLRECT is not set | ||
| 739 | # CONFIG_FB_CFB_COPYAREA is not set | ||
| 740 | # CONFIG_FB_CFB_IMAGEBLIT is not set | ||
| 741 | # CONFIG_FB_SYS_FILLRECT is not set | ||
| 742 | # CONFIG_FB_SYS_COPYAREA is not set | ||
| 743 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
| 744 | # CONFIG_FB_SYS_FOPS is not set | ||
| 745 | CONFIG_FB_DEFERRED_IO=y | ||
| 746 | # CONFIG_FB_SVGALIB is not set | ||
| 747 | # CONFIG_FB_MACMODES is not set | ||
| 748 | # CONFIG_FB_BACKLIGHT is not set | ||
| 749 | # CONFIG_FB_MODE_HELPERS is not set | ||
| 750 | # CONFIG_FB_TILEBLITTING is not set | ||
| 751 | |||
| 752 | # | ||
| 753 | # Frame buffer hardware drivers | ||
| 754 | # | ||
| 755 | # CONFIG_FB_S1D13XXX is not set | ||
| 756 | CONFIG_FB_OMAP=y | ||
| 757 | # CONFIG_FB_OMAP_LCDC_EXTERNAL is not set | ||
| 758 | # CONFIG_FB_OMAP_BOOTLOADER_INIT is not set | ||
| 759 | CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2 | ||
| 760 | # CONFIG_FB_VIRTUAL is not set | ||
| 761 | |||
| 762 | # | ||
| 763 | # Console display driver support | ||
| 764 | # | ||
| 765 | # CONFIG_VGA_CONSOLE is not set | ||
| 766 | CONFIG_DUMMY_CONSOLE=y | ||
| 767 | CONFIG_FRAMEBUFFER_CONSOLE=y | ||
| 768 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set | ||
| 769 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | ||
| 770 | # CONFIG_FONTS is not set | ||
| 771 | CONFIG_FONT_8x8=y | ||
| 772 | CONFIG_FONT_8x16=y | ||
| 773 | CONFIG_LOGO=y | ||
| 774 | # CONFIG_LOGO_LINUX_MONO is not set | ||
| 775 | # CONFIG_LOGO_LINUX_VGA16 is not set | ||
| 776 | CONFIG_LOGO_LINUX_CLUT224=y | ||
| 777 | |||
| 778 | # | ||
| 779 | # Sound | ||
| 780 | # | ||
| 781 | # CONFIG_SOUND is not set | ||
| 782 | CONFIG_HID_SUPPORT=y | ||
| 783 | CONFIG_HID=y | ||
| 784 | # CONFIG_HID_DEBUG is not set | ||
| 785 | CONFIG_USB_SUPPORT=y | ||
| 786 | CONFIG_USB_ARCH_HAS_HCD=y | ||
| 787 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
| 788 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
| 789 | # CONFIG_USB is not set | ||
| 790 | |||
| 791 | # | ||
| 792 | # Enable Host or Gadget support to see Inventra options | ||
| 793 | # | ||
| 794 | |||
| 795 | # | ||
| 796 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
| 797 | # | ||
| 798 | |||
| 799 | # | ||
| 800 | # USB Gadget Support | ||
| 801 | # | ||
| 802 | # CONFIG_USB_GADGET is not set | ||
| 803 | CONFIG_MMC=y | ||
| 804 | # CONFIG_MMC_DEBUG is not set | ||
| 805 | # CONFIG_MMC_UNSAFE_RESUME is not set | ||
| 806 | |||
| 807 | # | ||
| 808 | # MMC/SD Card Drivers | ||
| 809 | # | ||
| 810 | CONFIG_MMC_BLOCK=y | ||
| 811 | CONFIG_MMC_BLOCK_BOUNCE=y | ||
| 812 | |||
| 813 | # | ||
| 814 | # MMC/SD Host Controller Drivers | ||
| 815 | # | ||
| 816 | CONFIG_MMC_OMAP=y | ||
| 817 | CONFIG_RTC_LIB=y | ||
| 818 | # CONFIG_RTC_CLASS is not set | ||
| 819 | |||
| 820 | # | ||
| 821 | # DMA Engine support | ||
| 822 | # | ||
| 823 | # CONFIG_DMA_ENGINE is not set | ||
| 824 | |||
| 825 | # | ||
| 826 | # DMA Clients | ||
| 827 | # | ||
| 828 | |||
| 829 | # | ||
| 830 | # DMA Devices | ||
| 831 | # | ||
| 832 | |||
| 833 | # | ||
| 834 | # CBUS support | ||
| 835 | # | ||
| 836 | # CONFIG_CBUS is not set | ||
| 837 | |||
| 838 | # | ||
| 839 | # File systems | ||
| 840 | # | ||
| 841 | CONFIG_EXT2_FS=y | ||
| 842 | # CONFIG_EXT2_FS_XATTR is not set | ||
| 843 | # CONFIG_EXT2_FS_XIP is not set | ||
| 844 | CONFIG_EXT3_FS=y | ||
| 845 | # CONFIG_EXT3_FS_XATTR is not set | ||
| 846 | # CONFIG_EXT4DEV_FS is not set | ||
| 847 | CONFIG_JBD=y | ||
| 848 | # CONFIG_JBD_DEBUG is not set | ||
| 849 | # CONFIG_REISERFS_FS is not set | ||
| 850 | # CONFIG_JFS_FS is not set | ||
| 851 | # CONFIG_FS_POSIX_ACL is not set | ||
| 852 | # CONFIG_XFS_FS is not set | ||
| 853 | # CONFIG_GFS2_FS is not set | ||
| 854 | # CONFIG_OCFS2_FS is not set | ||
| 855 | # CONFIG_MINIX_FS is not set | ||
| 856 | # CONFIG_ROMFS_FS is not set | ||
| 857 | CONFIG_INOTIFY=y | ||
| 858 | CONFIG_INOTIFY_USER=y | ||
| 859 | CONFIG_QUOTA=y | ||
| 860 | # CONFIG_QFMT_V1 is not set | ||
| 861 | CONFIG_QFMT_V2=y | ||
| 862 | CONFIG_QUOTACTL=y | ||
| 863 | CONFIG_DNOTIFY=y | ||
| 864 | # CONFIG_AUTOFS_FS is not set | ||
| 865 | # CONFIG_AUTOFS4_FS is not set | ||
| 866 | # CONFIG_FUSE_FS is not set | ||
| 867 | |||
| 868 | # | ||
| 869 | # CD-ROM/DVD Filesystems | ||
| 870 | # | ||
| 871 | # CONFIG_ISO9660_FS is not set | ||
| 872 | # CONFIG_UDF_FS is not set | ||
| 873 | |||
| 874 | # | ||
| 875 | # DOS/FAT/NT Filesystems | ||
| 876 | # | ||
| 877 | CONFIG_FAT_FS=y | ||
| 878 | CONFIG_MSDOS_FS=y | ||
| 879 | CONFIG_VFAT_FS=y | ||
| 880 | CONFIG_FAT_DEFAULT_CODEPAGE=437 | ||
| 881 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | ||
| 882 | # CONFIG_NTFS_FS is not set | ||
| 883 | |||
| 884 | # | ||
| 885 | # Pseudo filesystems | ||
| 886 | # | ||
| 887 | CONFIG_PROC_FS=y | ||
| 888 | CONFIG_PROC_SYSCTL=y | ||
| 889 | CONFIG_SYSFS=y | ||
| 890 | CONFIG_TMPFS=y | ||
| 891 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
| 892 | # CONFIG_HUGETLB_PAGE is not set | ||
| 893 | CONFIG_RAMFS=y | ||
| 894 | # CONFIG_CONFIGFS_FS is not set | ||
| 895 | |||
| 896 | # | ||
| 897 | # Miscellaneous filesystems | ||
| 898 | # | ||
| 899 | # CONFIG_ADFS_FS is not set | ||
| 900 | # CONFIG_AFFS_FS is not set | ||
| 901 | # CONFIG_HFS_FS is not set | ||
| 902 | # CONFIG_HFSPLUS_FS is not set | ||
| 903 | # CONFIG_BEFS_FS is not set | ||
| 904 | # CONFIG_BFS_FS is not set | ||
| 905 | # CONFIG_EFS_FS is not set | ||
| 906 | CONFIG_JFFS2_FS=y | ||
| 907 | CONFIG_JFFS2_FS_DEBUG=0 | ||
| 908 | CONFIG_JFFS2_FS_WRITEBUFFER=y | ||
| 909 | # CONFIG_JFFS2_SUMMARY is not set | ||
| 910 | # CONFIG_JFFS2_FS_XATTR is not set | ||
| 911 | # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set | ||
| 912 | CONFIG_JFFS2_ZLIB=y | ||
| 913 | CONFIG_JFFS2_RTIME=y | ||
| 914 | # CONFIG_JFFS2_RUBIN is not set | ||
| 915 | # CONFIG_CRAMFS is not set | ||
| 916 | # CONFIG_VXFS_FS is not set | ||
| 917 | # CONFIG_HPFS_FS is not set | ||
| 918 | # CONFIG_QNX4FS_FS is not set | ||
| 919 | # CONFIG_SYSV_FS is not set | ||
| 920 | # CONFIG_UFS_FS is not set | ||
| 921 | |||
| 922 | # | ||
| 923 | # Network File Systems | ||
| 924 | # | ||
| 925 | CONFIG_NFS_FS=y | ||
| 926 | CONFIG_NFS_V3=y | ||
| 927 | # CONFIG_NFS_V3_ACL is not set | ||
| 928 | CONFIG_NFS_V4=y | ||
| 929 | # CONFIG_NFS_DIRECTIO is not set | ||
| 930 | # CONFIG_NFSD is not set | ||
| 931 | CONFIG_ROOT_NFS=y | ||
| 932 | CONFIG_LOCKD=y | ||
| 933 | CONFIG_LOCKD_V4=y | ||
| 934 | CONFIG_NFS_COMMON=y | ||
| 935 | CONFIG_SUNRPC=y | ||
| 936 | CONFIG_SUNRPC_GSS=y | ||
| 937 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 938 | CONFIG_RPCSEC_GSS_KRB5=y | ||
| 939 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
| 940 | # CONFIG_SMB_FS is not set | ||
| 941 | # CONFIG_CIFS is not set | ||
| 942 | # CONFIG_NCP_FS is not set | ||
| 943 | # CONFIG_CODA_FS is not set | ||
| 944 | # CONFIG_AFS_FS is not set | ||
| 945 | |||
| 946 | # | ||
| 947 | # Partition Types | ||
| 948 | # | ||
| 949 | CONFIG_PARTITION_ADVANCED=y | ||
| 950 | # CONFIG_ACORN_PARTITION is not set | ||
| 951 | # CONFIG_OSF_PARTITION is not set | ||
| 952 | # CONFIG_AMIGA_PARTITION is not set | ||
| 953 | # CONFIG_ATARI_PARTITION is not set | ||
| 954 | # CONFIG_MAC_PARTITION is not set | ||
| 955 | CONFIG_MSDOS_PARTITION=y | ||
| 956 | # CONFIG_BSD_DISKLABEL is not set | ||
| 957 | # CONFIG_MINIX_SUBPARTITION is not set | ||
| 958 | # CONFIG_SOLARIS_X86_PARTITION is not set | ||
| 959 | # CONFIG_UNIXWARE_DISKLABEL is not set | ||
| 960 | # CONFIG_LDM_PARTITION is not set | ||
| 961 | # CONFIG_SGI_PARTITION is not set | ||
| 962 | # CONFIG_ULTRIX_PARTITION is not set | ||
| 963 | # CONFIG_SUN_PARTITION is not set | ||
| 964 | # CONFIG_KARMA_PARTITION is not set | ||
| 965 | # CONFIG_EFI_PARTITION is not set | ||
| 966 | # CONFIG_SYSV68_PARTITION is not set | ||
| 967 | |||
| 968 | # | ||
| 969 | # Native Language Support | ||
| 970 | # | ||
| 971 | CONFIG_NLS=y | ||
| 972 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
| 973 | CONFIG_NLS_CODEPAGE_437=y | ||
| 974 | # CONFIG_NLS_CODEPAGE_737 is not set | ||
| 975 | # CONFIG_NLS_CODEPAGE_775 is not set | ||
| 976 | # CONFIG_NLS_CODEPAGE_850 is not set | ||
| 977 | # CONFIG_NLS_CODEPAGE_852 is not set | ||
| 978 | # CONFIG_NLS_CODEPAGE_855 is not set | ||
| 979 | # CONFIG_NLS_CODEPAGE_857 is not set | ||
| 980 | # CONFIG_NLS_CODEPAGE_860 is not set | ||
| 981 | # CONFIG_NLS_CODEPAGE_861 is not set | ||
| 982 | # CONFIG_NLS_CODEPAGE_862 is not set | ||
| 983 | # CONFIG_NLS_CODEPAGE_863 is not set | ||
| 984 | # CONFIG_NLS_CODEPAGE_864 is not set | ||
| 985 | # CONFIG_NLS_CODEPAGE_865 is not set | ||
| 986 | # CONFIG_NLS_CODEPAGE_866 is not set | ||
| 987 | # CONFIG_NLS_CODEPAGE_869 is not set | ||
| 988 | # CONFIG_NLS_CODEPAGE_936 is not set | ||
| 989 | # CONFIG_NLS_CODEPAGE_950 is not set | ||
| 990 | # CONFIG_NLS_CODEPAGE_932 is not set | ||
| 991 | # CONFIG_NLS_CODEPAGE_949 is not set | ||
| 992 | # CONFIG_NLS_CODEPAGE_874 is not set | ||
| 993 | # CONFIG_NLS_ISO8859_8 is not set | ||
| 994 | # CONFIG_NLS_CODEPAGE_1250 is not set | ||
| 995 | # CONFIG_NLS_CODEPAGE_1251 is not set | ||
| 996 | # CONFIG_NLS_ASCII is not set | ||
| 997 | # CONFIG_NLS_ISO8859_1 is not set | ||
| 998 | # CONFIG_NLS_ISO8859_2 is not set | ||
| 999 | # CONFIG_NLS_ISO8859_3 is not set | ||
| 1000 | # CONFIG_NLS_ISO8859_4 is not set | ||
| 1001 | # CONFIG_NLS_ISO8859_5 is not set | ||
| 1002 | # CONFIG_NLS_ISO8859_6 is not set | ||
| 1003 | # CONFIG_NLS_ISO8859_7 is not set | ||
| 1004 | # CONFIG_NLS_ISO8859_9 is not set | ||
| 1005 | # CONFIG_NLS_ISO8859_13 is not set | ||
| 1006 | # CONFIG_NLS_ISO8859_14 is not set | ||
| 1007 | # CONFIG_NLS_ISO8859_15 is not set | ||
| 1008 | # CONFIG_NLS_KOI8_R is not set | ||
| 1009 | # CONFIG_NLS_KOI8_U is not set | ||
| 1010 | # CONFIG_NLS_UTF8 is not set | ||
| 1011 | |||
| 1012 | # | ||
| 1013 | # Distributed Lock Manager | ||
| 1014 | # | ||
| 1015 | # CONFIG_DLM is not set | ||
| 1016 | |||
| 1017 | # | ||
| 1018 | # Profiling support | ||
| 1019 | # | ||
| 1020 | # CONFIG_PROFILING is not set | ||
| 1021 | |||
| 1022 | # | ||
| 1023 | # Kernel hacking | ||
| 1024 | # | ||
| 1025 | # CONFIG_PRINTK_TIME is not set | ||
| 1026 | CONFIG_ENABLE_MUST_CHECK=y | ||
| 1027 | CONFIG_MAGIC_SYSRQ=y | ||
| 1028 | # CONFIG_UNUSED_SYMBOLS is not set | ||
| 1029 | # CONFIG_DEBUG_FS is not set | ||
| 1030 | # CONFIG_HEADERS_CHECK is not set | ||
| 1031 | CONFIG_DEBUG_KERNEL=y | ||
| 1032 | # CONFIG_DEBUG_SHIRQ is not set | ||
| 1033 | CONFIG_DETECT_SOFTLOCKUP=y | ||
| 1034 | CONFIG_SCHED_DEBUG=y | ||
| 1035 | # CONFIG_SCHEDSTATS is not set | ||
| 1036 | # CONFIG_TIMER_STATS is not set | ||
| 1037 | # CONFIG_DEBUG_SLAB is not set | ||
| 1038 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
| 1039 | # CONFIG_RT_MUTEX_TESTER is not set | ||
| 1040 | # CONFIG_DEBUG_SPINLOCK is not set | ||
| 1041 | CONFIG_DEBUG_MUTEXES=y | ||
| 1042 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
| 1043 | # CONFIG_PROVE_LOCKING is not set | ||
| 1044 | # CONFIG_LOCK_STAT is not set | ||
| 1045 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
| 1046 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
| 1047 | # CONFIG_DEBUG_KOBJECT is not set | ||
| 1048 | # CONFIG_DEBUG_BUGVERBOSE is not set | ||
| 1049 | # CONFIG_DEBUG_INFO is not set | ||
| 1050 | # CONFIG_DEBUG_VM is not set | ||
| 1051 | # CONFIG_DEBUG_LIST is not set | ||
| 1052 | CONFIG_FRAME_POINTER=y | ||
| 1053 | CONFIG_FORCED_INLINING=y | ||
| 1054 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 1055 | # CONFIG_FAULT_INJECTION is not set | ||
| 1056 | # CONFIG_DEBUG_USER is not set | ||
| 1057 | # CONFIG_DEBUG_ERRORS is not set | ||
| 1058 | CONFIG_DEBUG_LL=y | ||
| 1059 | # CONFIG_DEBUG_ICEDCC is not set | ||
| 1060 | |||
| 1061 | # | ||
| 1062 | # Security options | ||
| 1063 | # | ||
| 1064 | # CONFIG_KEYS is not set | ||
| 1065 | # CONFIG_SECURITY is not set | ||
| 1066 | CONFIG_CRYPTO=y | ||
| 1067 | CONFIG_CRYPTO_ALGAPI=y | ||
| 1068 | CONFIG_CRYPTO_BLKCIPHER=y | ||
| 1069 | CONFIG_CRYPTO_MANAGER=y | ||
| 1070 | # CONFIG_CRYPTO_HMAC is not set | ||
| 1071 | # CONFIG_CRYPTO_XCBC is not set | ||
| 1072 | # CONFIG_CRYPTO_NULL is not set | ||
| 1073 | # CONFIG_CRYPTO_MD4 is not set | ||
| 1074 | CONFIG_CRYPTO_MD5=y | ||
| 1075 | # CONFIG_CRYPTO_SHA1 is not set | ||
| 1076 | # CONFIG_CRYPTO_SHA256 is not set | ||
| 1077 | # CONFIG_CRYPTO_SHA512 is not set | ||
| 1078 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1079 | # CONFIG_CRYPTO_TGR192 is not set | ||
| 1080 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1081 | CONFIG_CRYPTO_ECB=m | ||
| 1082 | CONFIG_CRYPTO_CBC=y | ||
| 1083 | CONFIG_CRYPTO_PCBC=m | ||
| 1084 | # CONFIG_CRYPTO_LRW is not set | ||
| 1085 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1086 | CONFIG_CRYPTO_DES=y | ||
| 1087 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1088 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1089 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1090 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1091 | # CONFIG_CRYPTO_AES is not set | ||
| 1092 | # CONFIG_CRYPTO_CAST5 is not set | ||
| 1093 | # CONFIG_CRYPTO_CAST6 is not set | ||
| 1094 | # CONFIG_CRYPTO_TEA is not set | ||
| 1095 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1096 | # CONFIG_CRYPTO_KHAZAD is not set | ||
| 1097 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1098 | # CONFIG_CRYPTO_DEFLATE is not set | ||
| 1099 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1100 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1101 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1102 | # CONFIG_CRYPTO_TEST is not set | ||
| 1103 | CONFIG_CRYPTO_HW=y | ||
| 1104 | |||
| 1105 | # | ||
| 1106 | # Library routines | ||
| 1107 | # | ||
| 1108 | CONFIG_BITREVERSE=y | ||
| 1109 | CONFIG_CRC_CCITT=y | ||
| 1110 | # CONFIG_CRC16 is not set | ||
| 1111 | # CONFIG_CRC_ITU_T is not set | ||
| 1112 | CONFIG_CRC32=y | ||
| 1113 | # CONFIG_CRC7 is not set | ||
| 1114 | CONFIG_LIBCRC32C=y | ||
| 1115 | CONFIG_ZLIB_INFLATE=y | ||
| 1116 | CONFIG_ZLIB_DEFLATE=y | ||
| 1117 | CONFIG_PLIST=y | ||
| 1118 | CONFIG_HAS_IOMEM=y | ||
| 1119 | CONFIG_HAS_IOPORT=y | ||
| 1120 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/arm/configs/omap_innovator_1510_defconfig b/arch/arm/configs/omap_innovator_1510_defconfig new file mode 100644 index 000000000000..55b2611bd90a --- /dev/null +++ b/arch/arm/configs/omap_innovator_1510_defconfig | |||
| @@ -0,0 +1,1253 @@ | |||
| 1 | # | ||
| 2 | # Automatically generated make config: don't edit | ||
| 3 | # Linux kernel version: 2.6.23-rc6-omap1 | ||
| 4 | # Tue Sep 18 11:45:02 2007 | ||
| 5 | # | ||
| 6 | CONFIG_ARM=y | ||
| 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | ||
| 8 | CONFIG_GENERIC_GPIO=y | ||
| 9 | CONFIG_GENERIC_TIME=y | ||
| 10 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 11 | CONFIG_MMU=y | ||
| 12 | # CONFIG_NO_IOPORT is not set | ||
| 13 | CONFIG_GENERIC_HARDIRQS=y | ||
| 14 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 15 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 16 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
| 17 | CONFIG_HARDIRQS_SW_RESEND=y | ||
| 18 | CONFIG_GENERIC_IRQ_PROBE=y | ||
| 19 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
| 20 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
| 21 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
| 22 | CONFIG_GENERIC_HWEIGHT=y | ||
| 23 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
| 24 | CONFIG_ZONE_DMA=y | ||
| 25 | CONFIG_VECTORS_BASE=0xffff0000 | ||
| 26 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
| 27 | |||
| 28 | # | ||
| 29 | # General setup | ||
| 30 | # | ||
| 31 | CONFIG_EXPERIMENTAL=y | ||
| 32 | CONFIG_BROKEN_ON_SMP=y | ||
| 33 | CONFIG_LOCK_KERNEL=y | ||
| 34 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 35 | CONFIG_LOCALVERSION="" | ||
| 36 | CONFIG_LOCALVERSION_AUTO=y | ||
| 37 | CONFIG_SWAP=y | ||
| 38 | CONFIG_SYSVIPC=y | ||
| 39 | CONFIG_SYSVIPC_SYSCTL=y | ||
| 40 | # CONFIG_POSIX_MQUEUE is not set | ||
| 41 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 42 | # CONFIG_TASKSTATS is not set | ||
| 43 | # CONFIG_USER_NS is not set | ||
| 44 | # CONFIG_AUDIT is not set | ||
| 45 | # CONFIG_IKCONFIG is not set | ||
| 46 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 47 | CONFIG_SYSFS_DEPRECATED=y | ||
| 48 | # CONFIG_RELAY is not set | ||
| 49 | CONFIG_BLK_DEV_INITRD=y | ||
| 50 | CONFIG_INITRAMFS_SOURCE="" | ||
| 51 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
| 52 | CONFIG_SYSCTL=y | ||
| 53 | # CONFIG_EMBEDDED is not set | ||
| 54 | CONFIG_UID16=y | ||
| 55 | CONFIG_SYSCTL_SYSCALL=y | ||
| 56 | CONFIG_KALLSYMS=y | ||
| 57 | # CONFIG_KALLSYMS_ALL is not set | ||
| 58 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 59 | CONFIG_HOTPLUG=y | ||
| 60 | CONFIG_PRINTK=y | ||
| 61 | CONFIG_BUG=y | ||
| 62 | CONFIG_ELF_CORE=y | ||
| 63 | CONFIG_BASE_FULL=y | ||
| 64 | CONFIG_FUTEX=y | ||
| 65 | CONFIG_ANON_INODES=y | ||
| 66 | CONFIG_EPOLL=y | ||
| 67 | CONFIG_SIGNALFD=y | ||
| 68 | CONFIG_TIMERFD=y | ||
| 69 | CONFIG_EVENTFD=y | ||
| 70 | CONFIG_SHMEM=y | ||
| 71 | CONFIG_VM_EVENT_COUNTERS=y | ||
| 72 | CONFIG_SLAB=y | ||
| 73 | # CONFIG_SLUB is not set | ||
| 74 | # CONFIG_SLOB is not set | ||
| 75 | CONFIG_RT_MUTEXES=y | ||
| 76 | # CONFIG_TINY_SHMEM is not set | ||
| 77 | CONFIG_BASE_SMALL=0 | ||
| 78 | CONFIG_MODULES=y | ||
| 79 | CONFIG_MODULE_UNLOAD=y | ||
| 80 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 81 | # CONFIG_MODVERSIONS is not set | ||
| 82 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 83 | CONFIG_KMOD=y | ||
| 84 | CONFIG_BLOCK=y | ||
| 85 | # CONFIG_LBD is not set | ||
| 86 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 87 | # CONFIG_LSF is not set | ||
| 88 | # CONFIG_BLK_DEV_BSG is not set | ||
| 89 | |||
| 90 | # | ||
| 91 | # IO Schedulers | ||
| 92 | # | ||
| 93 | CONFIG_IOSCHED_NOOP=y | ||
| 94 | CONFIG_IOSCHED_AS=y | ||
| 95 | CONFIG_IOSCHED_DEADLINE=y | ||
| 96 | CONFIG_IOSCHED_CFQ=y | ||
| 97 | # CONFIG_DEFAULT_AS is not set | ||
| 98 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 99 | CONFIG_DEFAULT_CFQ=y | ||
| 100 | # CONFIG_DEFAULT_NOOP is not set | ||
| 101 | CONFIG_DEFAULT_IOSCHED="cfq" | ||
| 102 | |||
| 103 | # | ||
| 104 | # System Type | ||
| 105 | # | ||
| 106 | # CONFIG_ARCH_AAEC2000 is not set | ||
| 107 | # CONFIG_ARCH_INTEGRATOR is not set | ||
| 108 | # CONFIG_ARCH_REALVIEW is not set | ||
| 109 | # CONFIG_ARCH_VERSATILE is not set | ||
| 110 | # CONFIG_ARCH_AT91 is not set | ||
| 111 | # CONFIG_ARCH_CLPS7500 is not set | ||
| 112 | # CONFIG_ARCH_CLPS711X is not set | ||
| 113 | # CONFIG_ARCH_CO285 is not set | ||
| 114 | # CONFIG_ARCH_EBSA110 is not set | ||
| 115 | # CONFIG_ARCH_EP93XX is not set | ||
| 116 | # CONFIG_ARCH_FOOTBRIDGE is not set | ||
| 117 | # CONFIG_ARCH_NETX is not set | ||
| 118 | # CONFIG_ARCH_H720X is not set | ||
| 119 | # CONFIG_ARCH_IMX is not set | ||
| 120 | # CONFIG_ARCH_IOP13XX is not set | ||
| 121 | # CONFIG_ARCH_IOP32X is not set | ||
| 122 | # CONFIG_ARCH_IOP33X is not set | ||
| 123 | # CONFIG_ARCH_IXP23XX is not set | ||
| 124 | # CONFIG_ARCH_IXP2000 is not set | ||
| 125 | # CONFIG_ARCH_IXP4XX is not set | ||
| 126 | # CONFIG_ARCH_L7200 is not set | ||
| 127 | # CONFIG_ARCH_KS8695 is not set | ||
| 128 | # CONFIG_ARCH_NS9XXX is not set | ||
| 129 | # CONFIG_ARCH_MXC is not set | ||
| 130 | # CONFIG_ARCH_PNX4008 is not set | ||
| 131 | # CONFIG_ARCH_PXA is not set | ||
| 132 | # CONFIG_ARCH_RPC is not set | ||
| 133 | # CONFIG_ARCH_SA1100 is not set | ||
| 134 | # CONFIG_ARCH_S3C2410 is not set | ||
| 135 | # CONFIG_ARCH_SHARK is not set | ||
| 136 | # CONFIG_ARCH_LH7A40X is not set | ||
| 137 | # CONFIG_ARCH_DAVINCI is not set | ||
| 138 | CONFIG_ARCH_OMAP=y | ||
| 139 | |||
| 140 | # | ||
| 141 | # TI OMAP Implementations | ||
| 142 | # | ||
| 143 | CONFIG_ARCH_OMAP1=y | ||
| 144 | # CONFIG_ARCH_OMAP2 is not set | ||
| 145 | # CONFIG_ARCH_OMAP3 is not set | ||
| 146 | |||
| 147 | # | ||
| 148 | # OMAP Feature Selections | ||
| 149 | # | ||
| 150 | # CONFIG_OMAP_RESET_CLOCKS is not set | ||
| 151 | # CONFIG_OMAP_BOOT_TAG is not set | ||
| 152 | # CONFIG_OMAP_GPIO_SWITCH is not set | ||
| 153 | CONFIG_OMAP_MUX=y | ||
| 154 | # CONFIG_OMAP_MUX_DEBUG is not set | ||
| 155 | CONFIG_OMAP_MUX_WARNINGS=y | ||
| 156 | CONFIG_OMAP_MCBSP=y | ||
| 157 | # CONFIG_OMAP_MMU_FWK is not set | ||
| 158 | # CONFIG_OMAP_MBOX_FWK is not set | ||
| 159 | CONFIG_OMAP_MPU_TIMER=y | ||
| 160 | # CONFIG_OMAP_32K_TIMER is not set | ||
| 161 | CONFIG_OMAP_LL_DEBUG_UART1=y | ||
| 162 | # CONFIG_OMAP_LL_DEBUG_UART2 is not set | ||
| 163 | # CONFIG_OMAP_LL_DEBUG_UART3 is not set | ||
| 164 | CONFIG_OMAP_SERIAL_WAKE=y | ||
| 165 | # CONFIG_OMAP_DSP is not set | ||
| 166 | |||
| 167 | # | ||
| 168 | # OMAP Core Type | ||
| 169 | # | ||
| 170 | # CONFIG_ARCH_OMAP730 is not set | ||
| 171 | CONFIG_ARCH_OMAP15XX=y | ||
| 172 | # CONFIG_ARCH_OMAP16XX is not set | ||
| 173 | |||
| 174 | # | ||
| 175 | # OMAP Board Type | ||
| 176 | # | ||
| 177 | CONFIG_MACH_OMAP_INNOVATOR=y | ||
| 178 | # CONFIG_MACH_VOICEBLUE is not set | ||
| 179 | # CONFIG_MACH_OMAP_PALMTE is not set | ||
| 180 | # CONFIG_MACH_OMAP_PALMZ71 is not set | ||
| 181 | # CONFIG_MACH_OMAP_PALMTT is not set | ||
| 182 | # CONFIG_MACH_SX1 is not set | ||
| 183 | # CONFIG_MACH_AMS_DELTA is not set | ||
| 184 | # CONFIG_MACH_OMAP_GENERIC is not set | ||
| 185 | |||
| 186 | # | ||
| 187 | # OMAP CPU Speed | ||
| 188 | # | ||
| 189 | # CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER is not set | ||
| 190 | CONFIG_OMAP_ARM_168MHZ=y | ||
| 191 | # CONFIG_OMAP_ARM_150MHZ is not set | ||
| 192 | # CONFIG_OMAP_ARM_120MHZ is not set | ||
| 193 | # CONFIG_OMAP_ARM_60MHZ is not set | ||
| 194 | # CONFIG_OMAP_ARM_30MHZ is not set | ||
| 195 | # CONFIG_MACH_OMAP_APOLLON_PLUS is not set | ||
| 196 | |||
| 197 | # | ||
| 198 | # Boot options | ||
| 199 | # | ||
| 200 | |||
| 201 | # | ||
| 202 | # Power management | ||
| 203 | # | ||
| 204 | |||
| 205 | # | ||
| 206 | # Processor Type | ||
| 207 | # | ||
| 208 | CONFIG_CPU_32=y | ||
| 209 | CONFIG_CPU_ARM925T=y | ||
| 210 | CONFIG_CPU_32v4T=y | ||
| 211 | CONFIG_CPU_ABRT_EV4T=y | ||
| 212 | CONFIG_CPU_PABRT_NOIFAR=y | ||
| 213 | CONFIG_CPU_CACHE_V4WT=y | ||
| 214 | CONFIG_CPU_CACHE_VIVT=y | ||
| 215 | CONFIG_CPU_COPY_V4WB=y | ||
| 216 | CONFIG_CPU_TLB_V4WBI=y | ||
| 217 | CONFIG_CPU_CP15=y | ||
| 218 | CONFIG_CPU_CP15_MMU=y | ||
| 219 | |||
| 220 | # | ||
| 221 | # Processor Features | ||
| 222 | # | ||
| 223 | CONFIG_ARM_THUMB=y | ||
| 224 | # CONFIG_CPU_ICACHE_DISABLE is not set | ||
| 225 | # CONFIG_CPU_DCACHE_DISABLE is not set | ||
| 226 | CONFIG_CPU_DCACHE_WRITETHROUGH=y | ||
| 227 | # CONFIG_OUTER_CACHE is not set | ||
| 228 | |||
| 229 | # | ||
| 230 | # Bus support | ||
| 231 | # | ||
| 232 | # CONFIG_PCI_SYSCALL is not set | ||
| 233 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 234 | |||
| 235 | # | ||
| 236 | # PCCARD (PCMCIA/CardBus) support | ||
| 237 | # | ||
| 238 | # CONFIG_PCCARD is not set | ||
| 239 | |||
| 240 | # | ||
| 241 | # Kernel Features | ||
| 242 | # | ||
| 243 | # CONFIG_TICK_ONESHOT is not set | ||
| 244 | # CONFIG_NO_HZ is not set | ||
| 245 | # CONFIG_HIGH_RES_TIMERS is not set | ||
| 246 | CONFIG_PREEMPT=y | ||
| 247 | CONFIG_HZ=100 | ||
| 248 | # CONFIG_AEABI is not set | ||
| 249 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | ||
| 250 | CONFIG_SELECT_MEMORY_MODEL=y | ||
| 251 | CONFIG_FLATMEM_MANUAL=y | ||
| 252 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
| 253 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
| 254 | CONFIG_FLATMEM=y | ||
| 255 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
| 256 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 257 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | ||
| 258 | # CONFIG_RESOURCES_64BIT is not set | ||
| 259 | CONFIG_ZONE_DMA_FLAG=1 | ||
| 260 | CONFIG_BOUNCE=y | ||
| 261 | CONFIG_VIRT_TO_BUS=y | ||
| 262 | CONFIG_LEDS=y | ||
| 263 | CONFIG_ALIGNMENT_TRAP=y | ||
| 264 | |||
| 265 | # | ||
| 266 | # Boot options | ||
| 267 | # | ||
| 268 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
| 269 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
| 270 | CONFIG_CMDLINE="console=ttyS0,115200n8 root=/dev/nfs ip=bootp noinitrd" | ||
| 271 | # CONFIG_XIP_KERNEL is not set | ||
| 272 | # CONFIG_KEXEC is not set | ||
| 273 | |||
| 274 | # | ||
| 275 | # CPU Frequency scaling | ||
| 276 | # | ||
| 277 | # CONFIG_CPU_FREQ is not set | ||
| 278 | |||
| 279 | # | ||
| 280 | # Floating point emulation | ||
| 281 | # | ||
| 282 | |||
| 283 | # | ||
| 284 | # At least one emulation must be selected | ||
| 285 | # | ||
| 286 | CONFIG_FPE_NWFPE=y | ||
| 287 | # CONFIG_FPE_NWFPE_XP is not set | ||
| 288 | # CONFIG_FPE_FASTFPE is not set | ||
| 289 | |||
| 290 | # | ||
| 291 | # Userspace binary formats | ||
| 292 | # | ||
| 293 | CONFIG_BINFMT_ELF=y | ||
| 294 | # CONFIG_BINFMT_AOUT is not set | ||
| 295 | # CONFIG_BINFMT_MISC is not set | ||
| 296 | # CONFIG_ARTHUR is not set | ||
| 297 | |||
| 298 | # | ||
| 299 | # Power management options | ||
| 300 | # | ||
| 301 | CONFIG_PM=y | ||
| 302 | # CONFIG_PM_LEGACY is not set | ||
| 303 | # CONFIG_PM_DEBUG is not set | ||
| 304 | CONFIG_PM_SLEEP=y | ||
| 305 | CONFIG_SUSPEND_UP_POSSIBLE=y | ||
| 306 | CONFIG_SUSPEND=y | ||
| 307 | # CONFIG_APM_EMULATION is not set | ||
| 308 | |||
| 309 | # | ||
| 310 | # Networking | ||
| 311 | # | ||
| 312 | CONFIG_NET=y | ||
| 313 | |||
| 314 | # | ||
| 315 | # Networking options | ||
| 316 | # | ||
| 317 | CONFIG_PACKET=y | ||
| 318 | # CONFIG_PACKET_MMAP is not set | ||
| 319 | CONFIG_UNIX=y | ||
| 320 | CONFIG_XFRM=y | ||
| 321 | # CONFIG_XFRM_USER is not set | ||
| 322 | # CONFIG_XFRM_SUB_POLICY is not set | ||
| 323 | # CONFIG_XFRM_MIGRATE is not set | ||
| 324 | # CONFIG_NET_KEY is not set | ||
| 325 | CONFIG_INET=y | ||
| 326 | CONFIG_IP_MULTICAST=y | ||
| 327 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
| 328 | CONFIG_IP_FIB_HASH=y | ||
| 329 | CONFIG_IP_PNP=y | ||
| 330 | CONFIG_IP_PNP_DHCP=y | ||
| 331 | CONFIG_IP_PNP_BOOTP=y | ||
| 332 | # CONFIG_IP_PNP_RARP is not set | ||
| 333 | # CONFIG_NET_IPIP is not set | ||
| 334 | # CONFIG_NET_IPGRE is not set | ||
| 335 | # CONFIG_IP_MROUTE is not set | ||
| 336 | # CONFIG_ARPD is not set | ||
| 337 | # CONFIG_SYN_COOKIES is not set | ||
| 338 | # CONFIG_INET_AH is not set | ||
| 339 | # CONFIG_INET_ESP is not set | ||
| 340 | # CONFIG_INET_IPCOMP is not set | ||
| 341 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
| 342 | # CONFIG_INET_TUNNEL is not set | ||
| 343 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | ||
| 344 | CONFIG_INET_XFRM_MODE_TUNNEL=y | ||
| 345 | CONFIG_INET_XFRM_MODE_BEET=y | ||
| 346 | CONFIG_INET_DIAG=y | ||
| 347 | CONFIG_INET_TCP_DIAG=y | ||
| 348 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
| 349 | CONFIG_TCP_CONG_CUBIC=y | ||
| 350 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
| 351 | # CONFIG_TCP_MD5SIG is not set | ||
| 352 | # CONFIG_IPV6 is not set | ||
| 353 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 354 | # CONFIG_INET6_TUNNEL is not set | ||
| 355 | # CONFIG_NETWORK_SECMARK is not set | ||
| 356 | # CONFIG_NETFILTER is not set | ||
| 357 | # CONFIG_IP_DCCP is not set | ||
| 358 | # CONFIG_IP_SCTP is not set | ||
| 359 | # CONFIG_TIPC is not set | ||
| 360 | # CONFIG_ATM is not set | ||
| 361 | # CONFIG_BRIDGE is not set | ||
| 362 | # CONFIG_VLAN_8021Q is not set | ||
| 363 | # CONFIG_DECNET is not set | ||
| 364 | # CONFIG_LLC2 is not set | ||
| 365 | # CONFIG_IPX is not set | ||
| 366 | # CONFIG_ATALK is not set | ||
| 367 | # CONFIG_X25 is not set | ||
| 368 | # CONFIG_LAPB is not set | ||
| 369 | # CONFIG_ECONET is not set | ||
| 370 | # CONFIG_WAN_ROUTER is not set | ||
| 371 | |||
| 372 | # | ||
| 373 | # QoS and/or fair queueing | ||
| 374 | # | ||
| 375 | # CONFIG_NET_SCHED is not set | ||
| 376 | |||
| 377 | # | ||
| 378 | # Network testing | ||
| 379 | # | ||
| 380 | # CONFIG_NET_PKTGEN is not set | ||
| 381 | # CONFIG_HAMRADIO is not set | ||
| 382 | # CONFIG_IRDA is not set | ||
| 383 | # CONFIG_BT is not set | ||
| 384 | # CONFIG_AF_RXRPC is not set | ||
| 385 | |||
| 386 | # | ||
| 387 | # Wireless | ||
| 388 | # | ||
| 389 | # CONFIG_CFG80211 is not set | ||
| 390 | # CONFIG_WIRELESS_EXT is not set | ||
| 391 | # CONFIG_MAC80211 is not set | ||
| 392 | # CONFIG_IEEE80211 is not set | ||
| 393 | # CONFIG_RFKILL is not set | ||
| 394 | # CONFIG_NET_9P is not set | ||
| 395 | |||
| 396 | # | ||
| 397 | # Device Drivers | ||
| 398 | # | ||
| 399 | |||
| 400 | # | ||
| 401 | # Generic Driver Options | ||
| 402 | # | ||
| 403 | CONFIG_STANDALONE=y | ||
| 404 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
| 405 | # CONFIG_FW_LOADER is not set | ||
| 406 | # CONFIG_DEBUG_DRIVER is not set | ||
| 407 | # CONFIG_DEBUG_DEVRES is not set | ||
| 408 | # CONFIG_SYS_HYPERVISOR is not set | ||
| 409 | # CONFIG_CONNECTOR is not set | ||
| 410 | # CONFIG_MTD is not set | ||
| 411 | # CONFIG_PARPORT is not set | ||
| 412 | CONFIG_BLK_DEV=y | ||
| 413 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
| 414 | CONFIG_BLK_DEV_LOOP=y | ||
| 415 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | ||
| 416 | # CONFIG_BLK_DEV_NBD is not set | ||
| 417 | # CONFIG_BLK_DEV_UB is not set | ||
| 418 | CONFIG_BLK_DEV_RAM=y | ||
| 419 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
| 420 | CONFIG_BLK_DEV_RAM_SIZE=8192 | ||
| 421 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | ||
| 422 | # CONFIG_CDROM_PKTCDVD is not set | ||
| 423 | # CONFIG_ATA_OVER_ETH is not set | ||
| 424 | |||
| 425 | # | ||
| 426 | # SCSI device support | ||
| 427 | # | ||
| 428 | # CONFIG_RAID_ATTRS is not set | ||
| 429 | CONFIG_SCSI=y | ||
| 430 | CONFIG_SCSI_DMA=y | ||
| 431 | # CONFIG_SCSI_TGT is not set | ||
| 432 | # CONFIG_SCSI_NETLINK is not set | ||
| 433 | CONFIG_SCSI_PROC_FS=y | ||
| 434 | |||
| 435 | # | ||
| 436 | # SCSI support type (disk, tape, CD-ROM) | ||
| 437 | # | ||
| 438 | CONFIG_BLK_DEV_SD=y | ||
| 439 | CONFIG_CHR_DEV_ST=y | ||
| 440 | # CONFIG_CHR_DEV_OSST is not set | ||
| 441 | CONFIG_BLK_DEV_SR=y | ||
| 442 | # CONFIG_BLK_DEV_SR_VENDOR is not set | ||
| 443 | CONFIG_CHR_DEV_SG=y | ||
| 444 | # CONFIG_CHR_DEV_SCH is not set | ||
| 445 | |||
| 446 | # | ||
| 447 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
| 448 | # | ||
| 449 | CONFIG_SCSI_MULTI_LUN=y | ||
| 450 | # CONFIG_SCSI_CONSTANTS is not set | ||
| 451 | # CONFIG_SCSI_LOGGING is not set | ||
| 452 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
| 453 | CONFIG_SCSI_WAIT_SCAN=m | ||
| 454 | |||
| 455 | # | ||
| 456 | # SCSI Transports | ||
| 457 | # | ||
| 458 | # CONFIG_SCSI_SPI_ATTRS is not set | ||
| 459 | # CONFIG_SCSI_FC_ATTRS is not set | ||
| 460 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
| 461 | # CONFIG_SCSI_SAS_LIBSAS is not set | ||
| 462 | CONFIG_SCSI_LOWLEVEL=y | ||
| 463 | # CONFIG_ISCSI_TCP is not set | ||
| 464 | # CONFIG_SCSI_DEBUG is not set | ||
| 465 | # CONFIG_ATA is not set | ||
| 466 | # CONFIG_MD is not set | ||
| 467 | CONFIG_NETDEVICES=y | ||
| 468 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 469 | # CONFIG_DUMMY is not set | ||
| 470 | # CONFIG_BONDING is not set | ||
| 471 | # CONFIG_MACVLAN is not set | ||
| 472 | # CONFIG_EQUALIZER is not set | ||
| 473 | # CONFIG_TUN is not set | ||
| 474 | # CONFIG_PHYLIB is not set | ||
| 475 | CONFIG_NET_ETHERNET=y | ||
| 476 | CONFIG_MII=y | ||
| 477 | # CONFIG_AX88796 is not set | ||
| 478 | CONFIG_SMC91X=y | ||
| 479 | # CONFIG_DM9000 is not set | ||
| 480 | CONFIG_NETDEV_1000=y | ||
| 481 | CONFIG_NETDEV_10000=y | ||
| 482 | |||
| 483 | # | ||
| 484 | # Wireless LAN | ||
| 485 | # | ||
| 486 | # CONFIG_WLAN_PRE80211 is not set | ||
| 487 | # CONFIG_WLAN_80211 is not set | ||
| 488 | |||
| 489 | # | ||
| 490 | # USB Network Adapters | ||
| 491 | # | ||
| 492 | # CONFIG_USB_CATC is not set | ||
| 493 | # CONFIG_USB_KAWETH is not set | ||
| 494 | # CONFIG_USB_PEGASUS is not set | ||
| 495 | CONFIG_USB_RTL8150=y | ||
| 496 | CONFIG_USB_USBNET_MII=y | ||
| 497 | CONFIG_USB_USBNET=y | ||
| 498 | CONFIG_USB_NET_AX8817X=y | ||
| 499 | CONFIG_USB_NET_CDCETHER=y | ||
| 500 | # CONFIG_USB_NET_DM9601 is not set | ||
| 501 | # CONFIG_USB_NET_GL620A is not set | ||
| 502 | CONFIG_USB_NET_NET1080=y | ||
| 503 | # CONFIG_USB_NET_PLUSB is not set | ||
| 504 | # CONFIG_USB_NET_MCS7830 is not set | ||
| 505 | # CONFIG_USB_NET_RNDIS_HOST is not set | ||
| 506 | # CONFIG_USB_NET_CDC_SUBSET is not set | ||
| 507 | CONFIG_USB_NET_ZAURUS=y | ||
| 508 | # CONFIG_WAN is not set | ||
| 509 | CONFIG_PPP=y | ||
| 510 | CONFIG_PPP_MULTILINK=y | ||
| 511 | # CONFIG_PPP_FILTER is not set | ||
| 512 | CONFIG_PPP_ASYNC=y | ||
| 513 | # CONFIG_PPP_SYNC_TTY is not set | ||
| 514 | CONFIG_PPP_DEFLATE=y | ||
| 515 | CONFIG_PPP_BSDCOMP=y | ||
| 516 | # CONFIG_PPP_MPPE is not set | ||
| 517 | # CONFIG_PPPOE is not set | ||
| 518 | # CONFIG_PPPOL2TP is not set | ||
| 519 | # CONFIG_SLIP is not set | ||
| 520 | CONFIG_SLHC=y | ||
| 521 | # CONFIG_SHAPER is not set | ||
| 522 | # CONFIG_NETCONSOLE is not set | ||
| 523 | # CONFIG_NETPOLL is not set | ||
| 524 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
| 525 | # CONFIG_ISDN is not set | ||
| 526 | |||
| 527 | # | ||
| 528 | # Input device support | ||
| 529 | # | ||
| 530 | CONFIG_INPUT=y | ||
| 531 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
| 532 | # CONFIG_INPUT_POLLDEV is not set | ||
| 533 | |||
| 534 | # | ||
| 535 | # Userland interfaces | ||
| 536 | # | ||
| 537 | CONFIG_INPUT_MOUSEDEV=y | ||
| 538 | CONFIG_INPUT_MOUSEDEV_PSAUX=y | ||
| 539 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=240 | ||
| 540 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=320 | ||
| 541 | # CONFIG_INPUT_JOYDEV is not set | ||
| 542 | # CONFIG_INPUT_TSDEV is not set | ||
| 543 | # CONFIG_INPUT_EVDEV is not set | ||
| 544 | # CONFIG_INPUT_EVBUG is not set | ||
| 545 | |||
| 546 | # | ||
| 547 | # Input Device Drivers | ||
| 548 | # | ||
| 549 | CONFIG_INPUT_KEYBOARD=y | ||
| 550 | # CONFIG_KEYBOARD_ATKBD is not set | ||
| 551 | # CONFIG_KEYBOARD_SUNKBD is not set | ||
| 552 | # CONFIG_KEYBOARD_LKKBD is not set | ||
| 553 | # CONFIG_KEYBOARD_XTKBD is not set | ||
| 554 | # CONFIG_KEYBOARD_NEWTON is not set | ||
| 555 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
| 556 | CONFIG_KEYBOARD_OMAP=y | ||
| 557 | CONFIG_OMAP_PS2=m | ||
| 558 | # CONFIG_KEYBOARD_GPIO is not set | ||
| 559 | # CONFIG_INPUT_MOUSE is not set | ||
| 560 | # CONFIG_INPUT_JOYSTICK is not set | ||
| 561 | # CONFIG_INPUT_TABLET is not set | ||
| 562 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
| 563 | # CONFIG_INPUT_MISC is not set | ||
| 564 | |||
| 565 | # | ||
| 566 | # Hardware I/O ports | ||
| 567 | # | ||
| 568 | CONFIG_SERIO=y | ||
| 569 | CONFIG_SERIO_SERPORT=y | ||
| 570 | # CONFIG_SERIO_RAW is not set | ||
| 571 | # CONFIG_GAMEPORT is not set | ||
| 572 | |||
| 573 | # | ||
| 574 | # Character devices | ||
| 575 | # | ||
| 576 | CONFIG_VT=y | ||
| 577 | CONFIG_VT_CONSOLE=y | ||
| 578 | CONFIG_HW_CONSOLE=y | ||
| 579 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
| 580 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
| 581 | |||
| 582 | # | ||
| 583 | # Serial drivers | ||
| 584 | # | ||
| 585 | CONFIG_SERIAL_8250=y | ||
| 586 | CONFIG_SERIAL_8250_CONSOLE=y | ||
| 587 | CONFIG_SERIAL_8250_NR_UARTS=4 | ||
| 588 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | ||
| 589 | # CONFIG_SERIAL_8250_EXTENDED is not set | ||
| 590 | |||
| 591 | # | ||
| 592 | # Non-8250 serial port support | ||
| 593 | # | ||
| 594 | CONFIG_SERIAL_CORE=y | ||
| 595 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
| 596 | CONFIG_UNIX98_PTYS=y | ||
| 597 | # CONFIG_LEGACY_PTYS is not set | ||
| 598 | # CONFIG_IPMI_HANDLER is not set | ||
| 599 | # CONFIG_WATCHDOG is not set | ||
| 600 | CONFIG_HW_RANDOM=m | ||
| 601 | # CONFIG_NVRAM is not set | ||
| 602 | # CONFIG_R3964 is not set | ||
| 603 | # CONFIG_RAW_DRIVER is not set | ||
| 604 | # CONFIG_TCG_TPM is not set | ||
| 605 | CONFIG_I2C=y | ||
| 606 | CONFIG_I2C_BOARDINFO=y | ||
| 607 | # CONFIG_I2C_CHARDEV is not set | ||
| 608 | |||
| 609 | # | ||
| 610 | # I2C Algorithms | ||
| 611 | # | ||
| 612 | # CONFIG_I2C_ALGOBIT is not set | ||
| 613 | # CONFIG_I2C_ALGOPCF is not set | ||
| 614 | # CONFIG_I2C_ALGOPCA is not set | ||
| 615 | |||
| 616 | # | ||
| 617 | # I2C Hardware Bus support | ||
| 618 | # | ||
| 619 | # CONFIG_I2C_GPIO is not set | ||
| 620 | # CONFIG_I2C_OCORES is not set | ||
| 621 | # CONFIG_I2C_OMAP is not set | ||
| 622 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 623 | # CONFIG_I2C_SIMTEC is not set | ||
| 624 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 625 | # CONFIG_I2C_STUB is not set | ||
| 626 | # CONFIG_I2C_TINY_USB is not set | ||
| 627 | |||
| 628 | # | ||
| 629 | # Miscellaneous I2C Chip support | ||
| 630 | # | ||
| 631 | # CONFIG_SENSORS_DS1337 is not set | ||
| 632 | # CONFIG_SENSORS_DS1374 is not set | ||
| 633 | # CONFIG_DS1682 is not set | ||
| 634 | # CONFIG_SENSORS_EEPROM is not set | ||
| 635 | # CONFIG_SENSORS_PCF8574 is not set | ||
| 636 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 637 | # CONFIG_SENSORS_PCF8591 is not set | ||
| 638 | # CONFIG_TPS65010 is not set | ||
| 639 | # CONFIG_SENSORS_MAX6875 is not set | ||
| 640 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 641 | # CONFIG_I2C_DEBUG_CORE is not set | ||
| 642 | # CONFIG_I2C_DEBUG_ALGO is not set | ||
| 643 | # CONFIG_I2C_DEBUG_BUS is not set | ||
| 644 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 645 | |||
| 646 | # | ||
| 647 | # SPI support | ||
| 648 | # | ||
| 649 | # CONFIG_SPI is not set | ||
| 650 | # CONFIG_SPI_MASTER is not set | ||
| 651 | # CONFIG_W1 is not set | ||
| 652 | CONFIG_HWMON=y | ||
| 653 | # CONFIG_HWMON_VID is not set | ||
| 654 | # CONFIG_SENSORS_ABITUGURU is not set | ||
| 655 | # CONFIG_SENSORS_ABITUGURU3 is not set | ||
| 656 | # CONFIG_SENSORS_AD7418 is not set | ||
| 657 | # CONFIG_SENSORS_ADM1021 is not set | ||
| 658 | # CONFIG_SENSORS_ADM1025 is not set | ||
| 659 | # CONFIG_SENSORS_ADM1026 is not set | ||
| 660 | # CONFIG_SENSORS_ADM1029 is not set | ||
| 661 | # CONFIG_SENSORS_ADM1031 is not set | ||
| 662 | # CONFIG_SENSORS_ADM9240 is not set | ||
| 663 | # CONFIG_SENSORS_ASB100 is not set | ||
| 664 | # CONFIG_SENSORS_ATXP1 is not set | ||
| 665 | # CONFIG_SENSORS_DS1621 is not set | ||
| 666 | # CONFIG_SENSORS_F71805F is not set | ||
| 667 | # CONFIG_SENSORS_FSCHER is not set | ||
| 668 | # CONFIG_SENSORS_FSCPOS is not set | ||
| 669 | # CONFIG_SENSORS_GL518SM is not set | ||
| 670 | # CONFIG_SENSORS_GL520SM is not set | ||
| 671 | # CONFIG_SENSORS_IT87 is not set | ||
| 672 | # CONFIG_SENSORS_LM63 is not set | ||
| 673 | # CONFIG_SENSORS_LM75 is not set | ||
| 674 | # CONFIG_SENSORS_LM77 is not set | ||
| 675 | # CONFIG_SENSORS_LM78 is not set | ||
| 676 | # CONFIG_SENSORS_LM80 is not set | ||
| 677 | # CONFIG_SENSORS_LM83 is not set | ||
| 678 | # CONFIG_SENSORS_LM85 is not set | ||
| 679 | # CONFIG_SENSORS_LM87 is not set | ||
| 680 | # CONFIG_SENSORS_LM90 is not set | ||
| 681 | # CONFIG_SENSORS_LM92 is not set | ||
| 682 | # CONFIG_SENSORS_LM93 is not set | ||
| 683 | # CONFIG_SENSORS_MAX1619 is not set | ||
| 684 | # CONFIG_SENSORS_MAX6650 is not set | ||
| 685 | # CONFIG_SENSORS_PC87360 is not set | ||
| 686 | # CONFIG_SENSORS_PC87427 is not set | ||
| 687 | # CONFIG_SENSORS_DME1737 is not set | ||
| 688 | # CONFIG_SENSORS_SMSC47M1 is not set | ||
| 689 | # CONFIG_SENSORS_SMSC47M192 is not set | ||
| 690 | # CONFIG_SENSORS_SMSC47B397 is not set | ||
| 691 | # CONFIG_SENSORS_THMC50 is not set | ||
| 692 | # CONFIG_SENSORS_VT1211 is not set | ||
| 693 | # CONFIG_SENSORS_W83781D is not set | ||
| 694 | # CONFIG_SENSORS_W83791D is not set | ||
| 695 | # CONFIG_SENSORS_W83792D is not set | ||
| 696 | # CONFIG_SENSORS_W83793 is not set | ||
| 697 | # CONFIG_SENSORS_W83L785TS is not set | ||
| 698 | # CONFIG_SENSORS_W83627HF is not set | ||
| 699 | # CONFIG_SENSORS_W83627EHF is not set | ||
| 700 | # CONFIG_HWMON_DEBUG_CHIP is not set | ||
| 701 | CONFIG_MISC_DEVICES=y | ||
| 702 | # CONFIG_EEPROM_93CX6 is not set | ||
| 703 | |||
| 704 | # | ||
| 705 | # Multifunction device drivers | ||
| 706 | # | ||
| 707 | # CONFIG_MFD_SM501 is not set | ||
| 708 | # CONFIG_NEW_LEDS is not set | ||
| 709 | |||
| 710 | # | ||
| 711 | # Multimedia devices | ||
| 712 | # | ||
| 713 | # CONFIG_VIDEO_DEV is not set | ||
| 714 | # CONFIG_DVB_CORE is not set | ||
| 715 | CONFIG_DAB=y | ||
| 716 | # CONFIG_USB_DABUSB is not set | ||
| 717 | |||
| 718 | # | ||
| 719 | # Graphics support | ||
| 720 | # | ||
| 721 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 722 | |||
| 723 | # | ||
| 724 | # Display device support | ||
| 725 | # | ||
| 726 | # CONFIG_DISPLAY_SUPPORT is not set | ||
| 727 | # CONFIG_VGASTATE is not set | ||
| 728 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
| 729 | CONFIG_FB=y | ||
| 730 | # CONFIG_FIRMWARE_EDID is not set | ||
| 731 | # CONFIG_FB_DDC is not set | ||
| 732 | # CONFIG_FB_CFB_FILLRECT is not set | ||
| 733 | # CONFIG_FB_CFB_COPYAREA is not set | ||
| 734 | # CONFIG_FB_CFB_IMAGEBLIT is not set | ||
| 735 | # CONFIG_FB_SYS_FILLRECT is not set | ||
| 736 | # CONFIG_FB_SYS_COPYAREA is not set | ||
| 737 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
| 738 | # CONFIG_FB_SYS_FOPS is not set | ||
| 739 | CONFIG_FB_DEFERRED_IO=y | ||
| 740 | # CONFIG_FB_SVGALIB is not set | ||
| 741 | # CONFIG_FB_MACMODES is not set | ||
| 742 | # CONFIG_FB_BACKLIGHT is not set | ||
| 743 | # CONFIG_FB_MODE_HELPERS is not set | ||
| 744 | # CONFIG_FB_TILEBLITTING is not set | ||
| 745 | |||
| 746 | # | ||
| 747 | # Frame buffer hardware drivers | ||
| 748 | # | ||
| 749 | # CONFIG_FB_S1D13XXX is not set | ||
| 750 | CONFIG_FB_OMAP=y | ||
| 751 | # CONFIG_FB_OMAP_LCDC_EXTERNAL is not set | ||
| 752 | # CONFIG_FB_OMAP_BOOTLOADER_INIT is not set | ||
| 753 | CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2 | ||
| 754 | # CONFIG_FB_OMAP_DMA_TUNE is not set | ||
| 755 | # CONFIG_FB_VIRTUAL is not set | ||
| 756 | |||
| 757 | # | ||
| 758 | # Console display driver support | ||
| 759 | # | ||
| 760 | # CONFIG_VGA_CONSOLE is not set | ||
| 761 | CONFIG_DUMMY_CONSOLE=y | ||
| 762 | CONFIG_FRAMEBUFFER_CONSOLE=y | ||
| 763 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set | ||
| 764 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | ||
| 765 | CONFIG_FONTS=y | ||
| 766 | CONFIG_FONT_8x8=y | ||
| 767 | CONFIG_FONT_8x16=y | ||
| 768 | # CONFIG_FONT_6x11 is not set | ||
| 769 | # CONFIG_FONT_7x14 is not set | ||
| 770 | # CONFIG_FONT_PEARL_8x8 is not set | ||
| 771 | # CONFIG_FONT_ACORN_8x8 is not set | ||
| 772 | # CONFIG_FONT_MINI_4x6 is not set | ||
| 773 | # CONFIG_FONT_SUN8x16 is not set | ||
| 774 | # CONFIG_FONT_SUN12x22 is not set | ||
| 775 | # CONFIG_FONT_10x18 is not set | ||
| 776 | CONFIG_LOGO=y | ||
| 777 | CONFIG_LOGO_LINUX_MONO=y | ||
| 778 | CONFIG_LOGO_LINUX_VGA16=y | ||
| 779 | CONFIG_LOGO_LINUX_CLUT224=y | ||
| 780 | |||
| 781 | # | ||
| 782 | # Sound | ||
| 783 | # | ||
| 784 | # CONFIG_SOUND is not set | ||
| 785 | CONFIG_HID_SUPPORT=y | ||
| 786 | CONFIG_HID=y | ||
| 787 | # CONFIG_HID_DEBUG is not set | ||
| 788 | |||
| 789 | # | ||
| 790 | # USB Input Devices | ||
| 791 | # | ||
| 792 | CONFIG_USB_HID=y | ||
| 793 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | ||
| 794 | # CONFIG_HID_FF is not set | ||
| 795 | # CONFIG_USB_HIDDEV is not set | ||
| 796 | CONFIG_USB_SUPPORT=y | ||
| 797 | CONFIG_USB_ARCH_HAS_HCD=y | ||
| 798 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
| 799 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
| 800 | CONFIG_USB=y | ||
| 801 | CONFIG_USB_DEBUG=y | ||
| 802 | |||
| 803 | # | ||
| 804 | # Miscellaneous USB options | ||
| 805 | # | ||
| 806 | CONFIG_USB_DEVICEFS=y | ||
| 807 | # CONFIG_USB_DEVICE_CLASS is not set | ||
| 808 | # CONFIG_USB_DYNAMIC_MINORS is not set | ||
| 809 | CONFIG_USB_SUSPEND=y | ||
| 810 | # CONFIG_USB_PERSIST is not set | ||
| 811 | # CONFIG_USB_OTG is not set | ||
| 812 | |||
| 813 | # | ||
| 814 | # USB Host Controller Drivers | ||
| 815 | # | ||
| 816 | # CONFIG_USB_ISP116X_HCD is not set | ||
| 817 | CONFIG_USB_OHCI_HCD=y | ||
| 818 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | ||
| 819 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | ||
| 820 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | ||
| 821 | # CONFIG_USB_SL811_HCD is not set | ||
| 822 | # CONFIG_USB_R8A66597_HCD is not set | ||
| 823 | # CONFIG_USB_MUSB_HDRC is not set | ||
| 824 | |||
| 825 | # | ||
| 826 | # USB Device Class drivers | ||
| 827 | # | ||
| 828 | # CONFIG_USB_ACM is not set | ||
| 829 | # CONFIG_USB_PRINTER is not set | ||
| 830 | |||
| 831 | # | ||
| 832 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
| 833 | # | ||
| 834 | |||
| 835 | # | ||
| 836 | # may also be needed; see USB_STORAGE Help for more information | ||
| 837 | # | ||
| 838 | CONFIG_USB_STORAGE=y | ||
| 839 | # CONFIG_USB_STORAGE_DEBUG is not set | ||
| 840 | CONFIG_USB_STORAGE_DATAFAB=y | ||
| 841 | CONFIG_USB_STORAGE_FREECOM=y | ||
| 842 | CONFIG_USB_STORAGE_DPCM=y | ||
| 843 | # CONFIG_USB_STORAGE_USBAT is not set | ||
| 844 | CONFIG_USB_STORAGE_SDDR09=y | ||
| 845 | CONFIG_USB_STORAGE_SDDR55=y | ||
| 846 | CONFIG_USB_STORAGE_JUMPSHOT=y | ||
| 847 | # CONFIG_USB_STORAGE_ALAUDA is not set | ||
| 848 | # CONFIG_USB_STORAGE_KARMA is not set | ||
| 849 | # CONFIG_USB_LIBUSUAL is not set | ||
| 850 | |||
| 851 | # | ||
| 852 | # USB Imaging devices | ||
| 853 | # | ||
| 854 | # CONFIG_USB_MDC800 is not set | ||
| 855 | # CONFIG_USB_MICROTEK is not set | ||
| 856 | CONFIG_USB_MON=y | ||
| 857 | |||
| 858 | # | ||
| 859 | # USB port drivers | ||
| 860 | # | ||
| 861 | |||
| 862 | # | ||
| 863 | # USB Serial Converter support | ||
| 864 | # | ||
| 865 | # CONFIG_USB_SERIAL is not set | ||
| 866 | |||
| 867 | # | ||
| 868 | # USB Miscellaneous drivers | ||
| 869 | # | ||
| 870 | # CONFIG_USB_EMI62 is not set | ||
| 871 | # CONFIG_USB_EMI26 is not set | ||
| 872 | # CONFIG_USB_ADUTUX is not set | ||
| 873 | # CONFIG_USB_AUERSWALD is not set | ||
| 874 | # CONFIG_USB_RIO500 is not set | ||
| 875 | # CONFIG_USB_LEGOTOWER is not set | ||
| 876 | # CONFIG_USB_LCD is not set | ||
| 877 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 878 | # CONFIG_USB_LED is not set | ||
| 879 | # CONFIG_USB_CYPRESS_CY7C63 is not set | ||
| 880 | # CONFIG_USB_CYTHERM is not set | ||
| 881 | # CONFIG_USB_PHIDGET is not set | ||
| 882 | # CONFIG_USB_IDMOUSE is not set | ||
| 883 | # CONFIG_USB_FTDI_ELAN is not set | ||
| 884 | # CONFIG_USB_APPLEDISPLAY is not set | ||
| 885 | # CONFIG_USB_LD is not set | ||
| 886 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
| 887 | # CONFIG_USB_IOWARRIOR is not set | ||
| 888 | # CONFIG_USB_TEST is not set | ||
| 889 | |||
| 890 | # | ||
| 891 | # USB DSL modem support | ||
| 892 | # | ||
| 893 | |||
| 894 | # | ||
| 895 | # USB Gadget Support | ||
| 896 | # | ||
| 897 | # CONFIG_USB_GADGET is not set | ||
| 898 | CONFIG_MMC=y | ||
| 899 | # CONFIG_MMC_DEBUG is not set | ||
| 900 | # CONFIG_MMC_UNSAFE_RESUME is not set | ||
| 901 | |||
| 902 | # | ||
| 903 | # MMC/SD Card Drivers | ||
| 904 | # | ||
| 905 | CONFIG_MMC_BLOCK=y | ||
| 906 | CONFIG_MMC_BLOCK_BOUNCE=y | ||
| 907 | |||
| 908 | # | ||
| 909 | # MMC/SD Host Controller Drivers | ||
| 910 | # | ||
| 911 | CONFIG_MMC_OMAP=y | ||
| 912 | CONFIG_RTC_LIB=y | ||
| 913 | CONFIG_RTC_CLASS=y | ||
| 914 | CONFIG_RTC_HCTOSYS=y | ||
| 915 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
| 916 | # CONFIG_RTC_DEBUG is not set | ||
| 917 | |||
| 918 | # | ||
| 919 | # RTC interfaces | ||
| 920 | # | ||
| 921 | CONFIG_RTC_INTF_SYSFS=y | ||
| 922 | CONFIG_RTC_INTF_PROC=y | ||
| 923 | CONFIG_RTC_INTF_DEV=y | ||
| 924 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
| 925 | # CONFIG_RTC_DRV_TEST is not set | ||
| 926 | |||
| 927 | # | ||
| 928 | # I2C RTC drivers | ||
| 929 | # | ||
| 930 | # CONFIG_RTC_DRV_DS1307 is not set | ||
| 931 | # CONFIG_RTC_DRV_DS1672 is not set | ||
| 932 | # CONFIG_RTC_DRV_MAX6900 is not set | ||
| 933 | # CONFIG_RTC_DRV_RS5C372 is not set | ||
| 934 | # CONFIG_RTC_DRV_ISL1208 is not set | ||
| 935 | # CONFIG_RTC_DRV_X1205 is not set | ||
| 936 | # CONFIG_RTC_DRV_PCF8563 is not set | ||
| 937 | # CONFIG_RTC_DRV_PCF8583 is not set | ||
| 938 | # CONFIG_RTC_DRV_M41T80 is not set | ||
| 939 | |||
| 940 | # | ||
| 941 | # SPI RTC drivers | ||
| 942 | # | ||
| 943 | |||
| 944 | # | ||
| 945 | # Platform RTC drivers | ||
| 946 | # | ||
| 947 | # CONFIG_RTC_DRV_CMOS is not set | ||
| 948 | # CONFIG_RTC_DRV_DS1553 is not set | ||
| 949 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 950 | # CONFIG_RTC_DRV_DS1742 is not set | ||
| 951 | # CONFIG_RTC_DRV_M48T86 is not set | ||
| 952 | # CONFIG_RTC_DRV_M48T59 is not set | ||
| 953 | # CONFIG_RTC_DRV_V3020 is not set | ||
| 954 | |||
| 955 | # | ||
| 956 | # on-CPU RTC drivers | ||
| 957 | # | ||
| 958 | CONFIG_RTC_DRV_OMAP=y | ||
| 959 | |||
| 960 | # | ||
| 961 | # DMA Engine support | ||
| 962 | # | ||
| 963 | # CONFIG_DMA_ENGINE is not set | ||
| 964 | |||
| 965 | # | ||
| 966 | # DMA Clients | ||
| 967 | # | ||
| 968 | |||
| 969 | # | ||
| 970 | # DMA Devices | ||
| 971 | # | ||
| 972 | |||
| 973 | # | ||
| 974 | # CBUS support | ||
| 975 | # | ||
| 976 | # CONFIG_CBUS is not set | ||
| 977 | |||
| 978 | # | ||
| 979 | # File systems | ||
| 980 | # | ||
| 981 | CONFIG_EXT2_FS=y | ||
| 982 | # CONFIG_EXT2_FS_XATTR is not set | ||
| 983 | # CONFIG_EXT2_FS_XIP is not set | ||
| 984 | CONFIG_EXT3_FS=y | ||
| 985 | CONFIG_EXT3_FS_XATTR=y | ||
| 986 | # CONFIG_EXT3_FS_POSIX_ACL is not set | ||
| 987 | # CONFIG_EXT3_FS_SECURITY is not set | ||
| 988 | # CONFIG_EXT4DEV_FS is not set | ||
| 989 | CONFIG_JBD=y | ||
| 990 | # CONFIG_JBD_DEBUG is not set | ||
| 991 | CONFIG_FS_MBCACHE=y | ||
| 992 | # CONFIG_REISERFS_FS is not set | ||
| 993 | # CONFIG_JFS_FS is not set | ||
| 994 | # CONFIG_FS_POSIX_ACL is not set | ||
| 995 | # CONFIG_XFS_FS is not set | ||
| 996 | # CONFIG_GFS2_FS is not set | ||
| 997 | # CONFIG_OCFS2_FS is not set | ||
| 998 | # CONFIG_MINIX_FS is not set | ||
| 999 | # CONFIG_ROMFS_FS is not set | ||
| 1000 | CONFIG_INOTIFY=y | ||
| 1001 | CONFIG_INOTIFY_USER=y | ||
| 1002 | # CONFIG_QUOTA is not set | ||
| 1003 | CONFIG_DNOTIFY=y | ||
| 1004 | CONFIG_AUTOFS_FS=y | ||
| 1005 | CONFIG_AUTOFS4_FS=y | ||
| 1006 | # CONFIG_FUSE_FS is not set | ||
| 1007 | |||
| 1008 | # | ||
| 1009 | # CD-ROM/DVD Filesystems | ||
| 1010 | # | ||
| 1011 | CONFIG_ISO9660_FS=y | ||
| 1012 | CONFIG_JOLIET=y | ||
| 1013 | # CONFIG_ZISOFS is not set | ||
| 1014 | # CONFIG_UDF_FS is not set | ||
| 1015 | |||
| 1016 | # | ||
| 1017 | # DOS/FAT/NT Filesystems | ||
| 1018 | # | ||
| 1019 | CONFIG_FAT_FS=m | ||
| 1020 | CONFIG_MSDOS_FS=m | ||
| 1021 | CONFIG_VFAT_FS=m | ||
| 1022 | CONFIG_FAT_DEFAULT_CODEPAGE=437 | ||
| 1023 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | ||
| 1024 | # CONFIG_NTFS_FS is not set | ||
| 1025 | |||
| 1026 | # | ||
| 1027 | # Pseudo filesystems | ||
| 1028 | # | ||
| 1029 | CONFIG_PROC_FS=y | ||
| 1030 | CONFIG_PROC_SYSCTL=y | ||
| 1031 | CONFIG_SYSFS=y | ||
| 1032 | CONFIG_TMPFS=y | ||
| 1033 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
| 1034 | # CONFIG_HUGETLB_PAGE is not set | ||
| 1035 | CONFIG_RAMFS=y | ||
| 1036 | # CONFIG_CONFIGFS_FS is not set | ||
| 1037 | |||
| 1038 | # | ||
| 1039 | # Miscellaneous filesystems | ||
| 1040 | # | ||
| 1041 | # CONFIG_ADFS_FS is not set | ||
| 1042 | # CONFIG_AFFS_FS is not set | ||
| 1043 | # CONFIG_HFS_FS is not set | ||
| 1044 | # CONFIG_HFSPLUS_FS is not set | ||
| 1045 | # CONFIG_BEFS_FS is not set | ||
| 1046 | # CONFIG_BFS_FS is not set | ||
| 1047 | # CONFIG_EFS_FS is not set | ||
| 1048 | # CONFIG_CRAMFS is not set | ||
| 1049 | # CONFIG_VXFS_FS is not set | ||
| 1050 | # CONFIG_HPFS_FS is not set | ||
| 1051 | # CONFIG_QNX4FS_FS is not set | ||
| 1052 | # CONFIG_SYSV_FS is not set | ||
| 1053 | # CONFIG_UFS_FS is not set | ||
| 1054 | |||
| 1055 | # | ||
| 1056 | # Network File Systems | ||
| 1057 | # | ||
| 1058 | CONFIG_NFS_FS=y | ||
| 1059 | CONFIG_NFS_V3=y | ||
| 1060 | # CONFIG_NFS_V3_ACL is not set | ||
| 1061 | CONFIG_NFS_V4=y | ||
| 1062 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1063 | # CONFIG_NFSD is not set | ||
| 1064 | CONFIG_ROOT_NFS=y | ||
| 1065 | CONFIG_LOCKD=y | ||
| 1066 | CONFIG_LOCKD_V4=y | ||
| 1067 | CONFIG_NFS_COMMON=y | ||
| 1068 | CONFIG_SUNRPC=y | ||
| 1069 | CONFIG_SUNRPC_GSS=y | ||
| 1070 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 1071 | CONFIG_RPCSEC_GSS_KRB5=y | ||
| 1072 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
| 1073 | # CONFIG_SMB_FS is not set | ||
| 1074 | # CONFIG_CIFS is not set | ||
| 1075 | # CONFIG_NCP_FS is not set | ||
| 1076 | # CONFIG_CODA_FS is not set | ||
| 1077 | # CONFIG_AFS_FS is not set | ||
| 1078 | |||
| 1079 | # | ||
| 1080 | # Partition Types | ||
| 1081 | # | ||
| 1082 | CONFIG_PARTITION_ADVANCED=y | ||
| 1083 | # CONFIG_ACORN_PARTITION is not set | ||
| 1084 | # CONFIG_OSF_PARTITION is not set | ||
| 1085 | # CONFIG_AMIGA_PARTITION is not set | ||
| 1086 | # CONFIG_ATARI_PARTITION is not set | ||
| 1087 | # CONFIG_MAC_PARTITION is not set | ||
| 1088 | CONFIG_MSDOS_PARTITION=y | ||
| 1089 | # CONFIG_BSD_DISKLABEL is not set | ||
| 1090 | # CONFIG_MINIX_SUBPARTITION is not set | ||
| 1091 | # CONFIG_SOLARIS_X86_PARTITION is not set | ||
| 1092 | # CONFIG_UNIXWARE_DISKLABEL is not set | ||
| 1093 | # CONFIG_LDM_PARTITION is not set | ||
| 1094 | # CONFIG_SGI_PARTITION is not set | ||
| 1095 | # CONFIG_ULTRIX_PARTITION is not set | ||
| 1096 | # CONFIG_SUN_PARTITION is not set | ||
| 1097 | # CONFIG_KARMA_PARTITION is not set | ||
| 1098 | # CONFIG_EFI_PARTITION is not set | ||
| 1099 | # CONFIG_SYSV68_PARTITION is not set | ||
| 1100 | |||
| 1101 | # | ||
| 1102 | # Native Language Support | ||
| 1103 | # | ||
| 1104 | CONFIG_NLS=y | ||
| 1105 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
| 1106 | # CONFIG_NLS_CODEPAGE_437 is not set | ||
| 1107 | # CONFIG_NLS_CODEPAGE_737 is not set | ||
| 1108 | # CONFIG_NLS_CODEPAGE_775 is not set | ||
| 1109 | # CONFIG_NLS_CODEPAGE_850 is not set | ||
| 1110 | # CONFIG_NLS_CODEPAGE_852 is not set | ||
| 1111 | # CONFIG_NLS_CODEPAGE_855 is not set | ||
| 1112 | # CONFIG_NLS_CODEPAGE_857 is not set | ||
| 1113 | # CONFIG_NLS_CODEPAGE_860 is not set | ||
| 1114 | # CONFIG_NLS_CODEPAGE_861 is not set | ||
| 1115 | # CONFIG_NLS_CODEPAGE_862 is not set | ||
| 1116 | # CONFIG_NLS_CODEPAGE_863 is not set | ||
| 1117 | # CONFIG_NLS_CODEPAGE_864 is not set | ||
| 1118 | # CONFIG_NLS_CODEPAGE_865 is not set | ||
| 1119 | # CONFIG_NLS_CODEPAGE_866 is not set | ||
| 1120 | # CONFIG_NLS_CODEPAGE_869 is not set | ||
| 1121 | # CONFIG_NLS_CODEPAGE_936 is not set | ||
| 1122 | # CONFIG_NLS_CODEPAGE_950 is not set | ||
| 1123 | # CONFIG_NLS_CODEPAGE_932 is not set | ||
| 1124 | # CONFIG_NLS_CODEPAGE_949 is not set | ||
| 1125 | # CONFIG_NLS_CODEPAGE_874 is not set | ||
| 1126 | # CONFIG_NLS_ISO8859_8 is not set | ||
| 1127 | # CONFIG_NLS_CODEPAGE_1250 is not set | ||
| 1128 | # CONFIG_NLS_CODEPAGE_1251 is not set | ||
| 1129 | # CONFIG_NLS_ASCII is not set | ||
| 1130 | # CONFIG_NLS_ISO8859_1 is not set | ||
| 1131 | # CONFIG_NLS_ISO8859_2 is not set | ||
| 1132 | # CONFIG_NLS_ISO8859_3 is not set | ||
| 1133 | # CONFIG_NLS_ISO8859_4 is not set | ||
| 1134 | # CONFIG_NLS_ISO8859_5 is not set | ||
| 1135 | # CONFIG_NLS_ISO8859_6 is not set | ||
| 1136 | # CONFIG_NLS_ISO8859_7 is not set | ||
| 1137 | # CONFIG_NLS_ISO8859_9 is not set | ||
| 1138 | # CONFIG_NLS_ISO8859_13 is not set | ||
| 1139 | # CONFIG_NLS_ISO8859_14 is not set | ||
| 1140 | # CONFIG_NLS_ISO8859_15 is not set | ||
| 1141 | # CONFIG_NLS_KOI8_R is not set | ||
| 1142 | # CONFIG_NLS_KOI8_U is not set | ||
| 1143 | # CONFIG_NLS_UTF8 is not set | ||
| 1144 | |||
| 1145 | # | ||
| 1146 | # Distributed Lock Manager | ||
| 1147 | # | ||
| 1148 | # CONFIG_DLM is not set | ||
| 1149 | |||
| 1150 | # | ||
| 1151 | # Profiling support | ||
| 1152 | # | ||
| 1153 | # CONFIG_PROFILING is not set | ||
| 1154 | |||
| 1155 | # | ||
| 1156 | # Kernel hacking | ||
| 1157 | # | ||
| 1158 | # CONFIG_PRINTK_TIME is not set | ||
| 1159 | CONFIG_ENABLE_MUST_CHECK=y | ||
| 1160 | CONFIG_MAGIC_SYSRQ=y | ||
| 1161 | # CONFIG_UNUSED_SYMBOLS is not set | ||
| 1162 | # CONFIG_DEBUG_FS is not set | ||
| 1163 | # CONFIG_HEADERS_CHECK is not set | ||
| 1164 | CONFIG_DEBUG_KERNEL=y | ||
| 1165 | # CONFIG_DEBUG_SHIRQ is not set | ||
| 1166 | CONFIG_DETECT_SOFTLOCKUP=y | ||
| 1167 | CONFIG_SCHED_DEBUG=y | ||
| 1168 | # CONFIG_SCHEDSTATS is not set | ||
| 1169 | # CONFIG_TIMER_STATS is not set | ||
| 1170 | # CONFIG_DEBUG_SLAB is not set | ||
| 1171 | CONFIG_DEBUG_PREEMPT=y | ||
| 1172 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
| 1173 | # CONFIG_RT_MUTEX_TESTER is not set | ||
| 1174 | # CONFIG_DEBUG_SPINLOCK is not set | ||
| 1175 | # CONFIG_DEBUG_MUTEXES is not set | ||
| 1176 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
| 1177 | # CONFIG_PROVE_LOCKING is not set | ||
| 1178 | # CONFIG_LOCK_STAT is not set | ||
| 1179 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
| 1180 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
| 1181 | # CONFIG_DEBUG_KOBJECT is not set | ||
| 1182 | CONFIG_DEBUG_BUGVERBOSE=y | ||
| 1183 | # CONFIG_DEBUG_INFO is not set | ||
| 1184 | # CONFIG_DEBUG_VM is not set | ||
| 1185 | # CONFIG_DEBUG_LIST is not set | ||
| 1186 | CONFIG_FRAME_POINTER=y | ||
| 1187 | CONFIG_FORCED_INLINING=y | ||
| 1188 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 1189 | # CONFIG_FAULT_INJECTION is not set | ||
| 1190 | # CONFIG_DEBUG_USER is not set | ||
| 1191 | # CONFIG_DEBUG_ERRORS is not set | ||
| 1192 | # CONFIG_DEBUG_LL is not set | ||
| 1193 | |||
| 1194 | # | ||
| 1195 | # Security options | ||
| 1196 | # | ||
| 1197 | # CONFIG_KEYS is not set | ||
| 1198 | # CONFIG_SECURITY is not set | ||
| 1199 | CONFIG_CRYPTO=y | ||
| 1200 | CONFIG_CRYPTO_ALGAPI=y | ||
| 1201 | CONFIG_CRYPTO_BLKCIPHER=y | ||
| 1202 | CONFIG_CRYPTO_MANAGER=y | ||
| 1203 | # CONFIG_CRYPTO_HMAC is not set | ||
| 1204 | # CONFIG_CRYPTO_XCBC is not set | ||
| 1205 | # CONFIG_CRYPTO_NULL is not set | ||
| 1206 | # CONFIG_CRYPTO_MD4 is not set | ||
| 1207 | CONFIG_CRYPTO_MD5=y | ||
| 1208 | # CONFIG_CRYPTO_SHA1 is not set | ||
| 1209 | # CONFIG_CRYPTO_SHA256 is not set | ||
| 1210 | # CONFIG_CRYPTO_SHA512 is not set | ||
| 1211 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1212 | # CONFIG_CRYPTO_TGR192 is not set | ||
| 1213 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1214 | CONFIG_CRYPTO_ECB=m | ||
| 1215 | CONFIG_CRYPTO_CBC=y | ||
| 1216 | CONFIG_CRYPTO_PCBC=m | ||
| 1217 | # CONFIG_CRYPTO_LRW is not set | ||
| 1218 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1219 | CONFIG_CRYPTO_DES=y | ||
| 1220 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1221 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1222 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1223 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1224 | # CONFIG_CRYPTO_AES is not set | ||
| 1225 | # CONFIG_CRYPTO_CAST5 is not set | ||
| 1226 | # CONFIG_CRYPTO_CAST6 is not set | ||
| 1227 | # CONFIG_CRYPTO_TEA is not set | ||
| 1228 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1229 | # CONFIG_CRYPTO_KHAZAD is not set | ||
| 1230 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1231 | # CONFIG_CRYPTO_DEFLATE is not set | ||
| 1232 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1233 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1234 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1235 | # CONFIG_CRYPTO_TEST is not set | ||
| 1236 | CONFIG_CRYPTO_HW=y | ||
| 1237 | |||
| 1238 | # | ||
| 1239 | # Library routines | ||
| 1240 | # | ||
| 1241 | CONFIG_BITREVERSE=y | ||
| 1242 | CONFIG_CRC_CCITT=y | ||
| 1243 | # CONFIG_CRC16 is not set | ||
| 1244 | # CONFIG_CRC_ITU_T is not set | ||
| 1245 | CONFIG_CRC32=y | ||
| 1246 | # CONFIG_CRC7 is not set | ||
| 1247 | # CONFIG_LIBCRC32C is not set | ||
| 1248 | CONFIG_ZLIB_INFLATE=y | ||
| 1249 | CONFIG_ZLIB_DEFLATE=y | ||
| 1250 | CONFIG_PLIST=y | ||
| 1251 | CONFIG_HAS_IOMEM=y | ||
| 1252 | CONFIG_HAS_IOPORT=y | ||
| 1253 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/arm/configs/omap_innovator_1610_defconfig b/arch/arm/configs/omap_innovator_1610_defconfig new file mode 100644 index 000000000000..95d9f2be53e0 --- /dev/null +++ b/arch/arm/configs/omap_innovator_1610_defconfig | |||
| @@ -0,0 +1,839 @@ | |||
| 1 | # | ||
| 2 | # Automatically generated make config: don't edit | ||
| 3 | # Linux kernel version: 2.6.23-rc6-omap1 | ||
| 4 | # Tue Sep 18 11:45:05 2007 | ||
| 5 | # | ||
| 6 | CONFIG_ARM=y | ||
| 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | ||
| 8 | CONFIG_GENERIC_GPIO=y | ||
| 9 | CONFIG_GENERIC_TIME=y | ||
| 10 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 11 | CONFIG_MMU=y | ||
| 12 | # CONFIG_NO_IOPORT is not set | ||
| 13 | CONFIG_GENERIC_HARDIRQS=y | ||
| 14 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 15 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 16 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
| 17 | CONFIG_HARDIRQS_SW_RESEND=y | ||
| 18 | CONFIG_GENERIC_IRQ_PROBE=y | ||
| 19 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
| 20 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
| 21 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
| 22 | CONFIG_GENERIC_HWEIGHT=y | ||
| 23 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
| 24 | CONFIG_ZONE_DMA=y | ||
| 25 | CONFIG_VECTORS_BASE=0xffff0000 | ||
| 26 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
| 27 | |||
| 28 | # | ||
| 29 | # General setup | ||
| 30 | # | ||
| 31 | CONFIG_EXPERIMENTAL=y | ||
| 32 | CONFIG_BROKEN_ON_SMP=y | ||
| 33 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 34 | CONFIG_LOCALVERSION="" | ||
| 35 | CONFIG_LOCALVERSION_AUTO=y | ||
| 36 | CONFIG_SWAP=y | ||
| 37 | CONFIG_SYSVIPC=y | ||
| 38 | CONFIG_SYSVIPC_SYSCTL=y | ||
| 39 | # CONFIG_POSIX_MQUEUE is not set | ||
| 40 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 41 | # CONFIG_TASKSTATS is not set | ||
| 42 | # CONFIG_USER_NS is not set | ||
| 43 | # CONFIG_AUDIT is not set | ||
| 44 | # CONFIG_IKCONFIG is not set | ||
| 45 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 46 | CONFIG_SYSFS_DEPRECATED=y | ||
| 47 | # CONFIG_RELAY is not set | ||
| 48 | CONFIG_BLK_DEV_INITRD=y | ||
| 49 | CONFIG_INITRAMFS_SOURCE="" | ||
| 50 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
| 51 | CONFIG_SYSCTL=y | ||
| 52 | # CONFIG_EMBEDDED is not set | ||
| 53 | CONFIG_UID16=y | ||
| 54 | CONFIG_SYSCTL_SYSCALL=y | ||
| 55 | CONFIG_KALLSYMS=y | ||
| 56 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 57 | CONFIG_HOTPLUG=y | ||
| 58 | CONFIG_PRINTK=y | ||
| 59 | CONFIG_BUG=y | ||
| 60 | CONFIG_ELF_CORE=y | ||
| 61 | CONFIG_BASE_FULL=y | ||
| 62 | CONFIG_FUTEX=y | ||
| 63 | CONFIG_ANON_INODES=y | ||
| 64 | CONFIG_EPOLL=y | ||
| 65 | CONFIG_SIGNALFD=y | ||
| 66 | CONFIG_TIMERFD=y | ||
| 67 | CONFIG_EVENTFD=y | ||
| 68 | CONFIG_SHMEM=y | ||
| 69 | CONFIG_VM_EVENT_COUNTERS=y | ||
| 70 | CONFIG_SLUB_DEBUG=y | ||
| 71 | # CONFIG_SLAB is not set | ||
| 72 | CONFIG_SLUB=y | ||
| 73 | # CONFIG_SLOB is not set | ||
| 74 | CONFIG_RT_MUTEXES=y | ||
| 75 | # CONFIG_TINY_SHMEM is not set | ||
| 76 | CONFIG_BASE_SMALL=0 | ||
| 77 | CONFIG_MODULES=y | ||
| 78 | CONFIG_MODULE_UNLOAD=y | ||
| 79 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 80 | # CONFIG_MODVERSIONS is not set | ||
| 81 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 82 | CONFIG_KMOD=y | ||
| 83 | CONFIG_BLOCK=y | ||
| 84 | # CONFIG_LBD is not set | ||
| 85 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 86 | # CONFIG_LSF is not set | ||
| 87 | # CONFIG_BLK_DEV_BSG is not set | ||
| 88 | |||
| 89 | # | ||
| 90 | # IO Schedulers | ||
| 91 | # | ||
| 92 | CONFIG_IOSCHED_NOOP=y | ||
| 93 | CONFIG_IOSCHED_AS=y | ||
| 94 | CONFIG_IOSCHED_DEADLINE=y | ||
| 95 | CONFIG_IOSCHED_CFQ=y | ||
| 96 | # CONFIG_DEFAULT_AS is not set | ||
| 97 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 98 | CONFIG_DEFAULT_CFQ=y | ||
| 99 | # CONFIG_DEFAULT_NOOP is not set | ||
| 100 | CONFIG_DEFAULT_IOSCHED="cfq" | ||
| 101 | |||
| 102 | # | ||
| 103 | # System Type | ||
| 104 | # | ||
| 105 | # CONFIG_ARCH_AAEC2000 is not set | ||
| 106 | # CONFIG_ARCH_INTEGRATOR is not set | ||
| 107 | # CONFIG_ARCH_REALVIEW is not set | ||
| 108 | # CONFIG_ARCH_VERSATILE is not set | ||
| 109 | # CONFIG_ARCH_AT91 is not set | ||
| 110 | # CONFIG_ARCH_CLPS7500 is not set | ||
| 111 | # CONFIG_ARCH_CLPS711X is not set | ||
| 112 | # CONFIG_ARCH_CO285 is not set | ||
| 113 | # CONFIG_ARCH_EBSA110 is not set | ||
| 114 | # CONFIG_ARCH_EP93XX is not set | ||
| 115 | # CONFIG_ARCH_FOOTBRIDGE is not set | ||
| 116 | # CONFIG_ARCH_NETX is not set | ||
| 117 | # CONFIG_ARCH_H720X is not set | ||
| 118 | # CONFIG_ARCH_IMX is not set | ||
| 119 | # CONFIG_ARCH_IOP13XX is not set | ||
| 120 | # CONFIG_ARCH_IOP32X is not set | ||
| 121 | # CONFIG_ARCH_IOP33X is not set | ||
| 122 | # CONFIG_ARCH_IXP23XX is not set | ||
| 123 | # CONFIG_ARCH_IXP2000 is not set | ||
| 124 | # CONFIG_ARCH_IXP4XX is not set | ||
| 125 | # CONFIG_ARCH_L7200 is not set | ||
| 126 | # CONFIG_ARCH_KS8695 is not set | ||
| 127 | # CONFIG_ARCH_NS9XXX is not set | ||
| 128 | # CONFIG_ARCH_MXC is not set | ||
| 129 | # CONFIG_ARCH_PNX4008 is not set | ||
| 130 | # CONFIG_ARCH_PXA is not set | ||
| 131 | # CONFIG_ARCH_RPC is not set | ||
| 132 | # CONFIG_ARCH_SA1100 is not set | ||
| 133 | # CONFIG_ARCH_S3C2410 is not set | ||
| 134 | # CONFIG_ARCH_SHARK is not set | ||
| 135 | # CONFIG_ARCH_LH7A40X is not set | ||
| 136 | # CONFIG_ARCH_DAVINCI is not set | ||
| 137 | CONFIG_ARCH_OMAP=y | ||
| 138 | |||
| 139 | # | ||
| 140 | # TI OMAP Implementations | ||
| 141 | # | ||
| 142 | CONFIG_ARCH_OMAP_OTG=y | ||
| 143 | CONFIG_ARCH_OMAP1=y | ||
| 144 | # CONFIG_ARCH_OMAP2 is not set | ||
| 145 | # CONFIG_ARCH_OMAP3 is not set | ||
| 146 | |||
| 147 | # | ||
| 148 | # OMAP Feature Selections | ||
| 149 | # | ||
| 150 | # CONFIG_OMAP_RESET_CLOCKS is not set | ||
| 151 | # CONFIG_OMAP_BOOT_TAG is not set | ||
| 152 | # CONFIG_OMAP_GPIO_SWITCH is not set | ||
| 153 | CONFIG_OMAP_MUX=y | ||
| 154 | # CONFIG_OMAP_MUX_DEBUG is not set | ||
| 155 | CONFIG_OMAP_MUX_WARNINGS=y | ||
| 156 | # CONFIG_OMAP_STI is not set | ||
| 157 | CONFIG_OMAP_MCBSP=y | ||
| 158 | # CONFIG_OMAP_MMU_FWK is not set | ||
| 159 | # CONFIG_OMAP_MBOX_FWK is not set | ||
| 160 | CONFIG_OMAP_MPU_TIMER=y | ||
| 161 | # CONFIG_OMAP_32K_TIMER is not set | ||
| 162 | # CONFIG_OMAP_DM_TIMER is not set | ||
| 163 | CONFIG_OMAP_LL_DEBUG_UART1=y | ||
| 164 | # CONFIG_OMAP_LL_DEBUG_UART2 is not set | ||
| 165 | # CONFIG_OMAP_LL_DEBUG_UART3 is not set | ||
| 166 | CONFIG_OMAP_SERIAL_WAKE=y | ||
| 167 | # CONFIG_OMAP_DSP is not set | ||
| 168 | |||
| 169 | # | ||
| 170 | # OMAP Core Type | ||
| 171 | # | ||
| 172 | # CONFIG_ARCH_OMAP730 is not set | ||
| 173 | # CONFIG_ARCH_OMAP15XX is not set | ||
| 174 | CONFIG_ARCH_OMAP16XX=y | ||
| 175 | |||
| 176 | # | ||
| 177 | # OMAP Board Type | ||
| 178 | # | ||
| 179 | CONFIG_MACH_OMAP_INNOVATOR=y | ||
| 180 | # CONFIG_MACH_OMAP_H2 is not set | ||
| 181 | # CONFIG_MACH_OMAP_H3 is not set | ||
| 182 | # CONFIG_MACH_OMAP_OSK is not set | ||
| 183 | # CONFIG_MACH_NOKIA770 is not set | ||
| 184 | # CONFIG_MACH_OMAP_GENERIC is not set | ||
| 185 | |||
| 186 | # | ||
| 187 | # OMAP CPU Speed | ||
| 188 | # | ||
| 189 | # CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER is not set | ||
| 190 | # CONFIG_OMAP_ARM_216MHZ is not set | ||
| 191 | CONFIG_OMAP_ARM_192MHZ=y | ||
| 192 | # CONFIG_OMAP_ARM_168MHZ is not set | ||
| 193 | # CONFIG_OMAP_ARM_120MHZ is not set | ||
| 194 | # CONFIG_OMAP_ARM_60MHZ is not set | ||
| 195 | # CONFIG_OMAP_ARM_30MHZ is not set | ||
| 196 | # CONFIG_MACH_OMAP_APOLLON_PLUS is not set | ||
| 197 | |||
| 198 | # | ||
| 199 | # Boot options | ||
| 200 | # | ||
| 201 | |||
| 202 | # | ||
| 203 | # Power management | ||
| 204 | # | ||
| 205 | |||
| 206 | # | ||
| 207 | # Processor Type | ||
| 208 | # | ||
| 209 | CONFIG_CPU_32=y | ||
| 210 | CONFIG_CPU_ARM926T=y | ||
| 211 | CONFIG_CPU_32v5=y | ||
| 212 | CONFIG_CPU_ABRT_EV5TJ=y | ||
| 213 | CONFIG_CPU_PABRT_NOIFAR=y | ||
| 214 | CONFIG_CPU_CACHE_VIVT=y | ||
| 215 | CONFIG_CPU_COPY_V4WB=y | ||
| 216 | CONFIG_CPU_TLB_V4WBI=y | ||
| 217 | CONFIG_CPU_CP15=y | ||
| 218 | CONFIG_CPU_CP15_MMU=y | ||
| 219 | |||
| 220 | # | ||
| 221 | # Processor Features | ||
| 222 | # | ||
| 223 | # CONFIG_ARM_THUMB is not set | ||
| 224 | # CONFIG_CPU_ICACHE_DISABLE is not set | ||
| 225 | # CONFIG_CPU_DCACHE_DISABLE is not set | ||
| 226 | CONFIG_CPU_DCACHE_WRITETHROUGH=y | ||
| 227 | # CONFIG_CPU_CACHE_ROUND_ROBIN is not set | ||
| 228 | # CONFIG_OUTER_CACHE is not set | ||
| 229 | |||
| 230 | # | ||
| 231 | # Bus support | ||
| 232 | # | ||
| 233 | # CONFIG_PCI_SYSCALL is not set | ||
| 234 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 235 | |||
| 236 | # | ||
| 237 | # PCCARD (PCMCIA/CardBus) support | ||
| 238 | # | ||
| 239 | # CONFIG_PCCARD is not set | ||
| 240 | |||
| 241 | # | ||
| 242 | # Kernel Features | ||
| 243 | # | ||
| 244 | # CONFIG_TICK_ONESHOT is not set | ||
| 245 | # CONFIG_NO_HZ is not set | ||
| 246 | # CONFIG_HIGH_RES_TIMERS is not set | ||
| 247 | # CONFIG_PREEMPT is not set | ||
| 248 | CONFIG_HZ=100 | ||
| 249 | # CONFIG_AEABI is not set | ||
| 250 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | ||
| 251 | CONFIG_SELECT_MEMORY_MODEL=y | ||
| 252 | CONFIG_FLATMEM_MANUAL=y | ||
| 253 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
| 254 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
| 255 | CONFIG_FLATMEM=y | ||
| 256 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
| 257 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 258 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | ||
| 259 | # CONFIG_RESOURCES_64BIT is not set | ||
| 260 | CONFIG_ZONE_DMA_FLAG=1 | ||
| 261 | CONFIG_BOUNCE=y | ||
| 262 | CONFIG_VIRT_TO_BUS=y | ||
| 263 | # CONFIG_LEDS is not set | ||
| 264 | CONFIG_ALIGNMENT_TRAP=y | ||
| 265 | |||
| 266 | # | ||
| 267 | # Boot options | ||
| 268 | # | ||
| 269 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
| 270 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
| 271 | CONFIG_CMDLINE="mem=32M console=tty0 console=ttyS0,115200 initrd=0x10200000,8M root=/dev/ram0 rw" | ||
| 272 | # CONFIG_XIP_KERNEL is not set | ||
| 273 | # CONFIG_KEXEC is not set | ||
| 274 | |||
| 275 | # | ||
| 276 | # CPU Frequency scaling | ||
| 277 | # | ||
| 278 | # CONFIG_CPU_FREQ is not set | ||
| 279 | |||
| 280 | # | ||
| 281 | # Floating point emulation | ||
| 282 | # | ||
| 283 | |||
| 284 | # | ||
| 285 | # At least one emulation must be selected | ||
| 286 | # | ||
| 287 | CONFIG_FPE_NWFPE=y | ||
| 288 | # CONFIG_FPE_NWFPE_XP is not set | ||
| 289 | # CONFIG_FPE_FASTFPE is not set | ||
| 290 | # CONFIG_VFP is not set | ||
| 291 | |||
| 292 | # | ||
| 293 | # Userspace binary formats | ||
| 294 | # | ||
| 295 | CONFIG_BINFMT_ELF=y | ||
| 296 | # CONFIG_BINFMT_AOUT is not set | ||
| 297 | # CONFIG_BINFMT_MISC is not set | ||
| 298 | # CONFIG_ARTHUR is not set | ||
| 299 | |||
| 300 | # | ||
| 301 | # Power management options | ||
| 302 | # | ||
| 303 | # CONFIG_PM is not set | ||
| 304 | CONFIG_SUSPEND_UP_POSSIBLE=y | ||
| 305 | |||
| 306 | # | ||
| 307 | # Networking | ||
| 308 | # | ||
| 309 | CONFIG_NET=y | ||
| 310 | |||
| 311 | # | ||
| 312 | # Networking options | ||
| 313 | # | ||
| 314 | CONFIG_PACKET=m | ||
| 315 | # CONFIG_PACKET_MMAP is not set | ||
| 316 | CONFIG_UNIX=y | ||
| 317 | CONFIG_XFRM=y | ||
| 318 | # CONFIG_XFRM_USER is not set | ||
| 319 | # CONFIG_XFRM_SUB_POLICY is not set | ||
| 320 | # CONFIG_XFRM_MIGRATE is not set | ||
| 321 | # CONFIG_NET_KEY is not set | ||
| 322 | CONFIG_INET=y | ||
| 323 | CONFIG_IP_MULTICAST=y | ||
| 324 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
| 325 | CONFIG_IP_FIB_HASH=y | ||
| 326 | CONFIG_IP_PNP=y | ||
| 327 | CONFIG_IP_PNP_DHCP=y | ||
| 328 | CONFIG_IP_PNP_BOOTP=y | ||
| 329 | # CONFIG_IP_PNP_RARP is not set | ||
| 330 | # CONFIG_NET_IPIP is not set | ||
| 331 | # CONFIG_NET_IPGRE is not set | ||
| 332 | # CONFIG_IP_MROUTE is not set | ||
| 333 | # CONFIG_ARPD is not set | ||
| 334 | # CONFIG_SYN_COOKIES is not set | ||
| 335 | # CONFIG_INET_AH is not set | ||
| 336 | # CONFIG_INET_ESP is not set | ||
| 337 | # CONFIG_INET_IPCOMP is not set | ||
| 338 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
| 339 | # CONFIG_INET_TUNNEL is not set | ||
| 340 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | ||
| 341 | CONFIG_INET_XFRM_MODE_TUNNEL=y | ||
| 342 | CONFIG_INET_XFRM_MODE_BEET=y | ||
| 343 | CONFIG_INET_DIAG=y | ||
| 344 | CONFIG_INET_TCP_DIAG=y | ||
| 345 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
| 346 | CONFIG_TCP_CONG_CUBIC=y | ||
| 347 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
| 348 | # CONFIG_TCP_MD5SIG is not set | ||
| 349 | # CONFIG_IPV6 is not set | ||
| 350 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 351 | # CONFIG_INET6_TUNNEL is not set | ||
| 352 | # CONFIG_NETWORK_SECMARK is not set | ||
| 353 | # CONFIG_NETFILTER is not set | ||
| 354 | # CONFIG_IP_DCCP is not set | ||
| 355 | # CONFIG_IP_SCTP is not set | ||
| 356 | # CONFIG_TIPC is not set | ||
| 357 | # CONFIG_ATM is not set | ||
| 358 | # CONFIG_BRIDGE is not set | ||
| 359 | # CONFIG_VLAN_8021Q is not set | ||
| 360 | # CONFIG_DECNET is not set | ||
| 361 | # CONFIG_LLC2 is not set | ||
| 362 | # CONFIG_IPX is not set | ||
| 363 | # CONFIG_ATALK is not set | ||
| 364 | # CONFIG_X25 is not set | ||
| 365 | # CONFIG_LAPB is not set | ||
| 366 | # CONFIG_ECONET is not set | ||
| 367 | # CONFIG_WAN_ROUTER is not set | ||
| 368 | |||
| 369 | # | ||
| 370 | # QoS and/or fair queueing | ||
| 371 | # | ||
| 372 | # CONFIG_NET_SCHED is not set | ||
| 373 | |||
| 374 | # | ||
| 375 | # Network testing | ||
| 376 | # | ||
| 377 | # CONFIG_NET_PKTGEN is not set | ||
| 378 | # CONFIG_HAMRADIO is not set | ||
| 379 | # CONFIG_IRDA is not set | ||
| 380 | # CONFIG_BT is not set | ||
| 381 | # CONFIG_AF_RXRPC is not set | ||
| 382 | |||
| 383 | # | ||
| 384 | # Wireless | ||
| 385 | # | ||
| 386 | # CONFIG_CFG80211 is not set | ||
| 387 | # CONFIG_WIRELESS_EXT is not set | ||
| 388 | # CONFIG_MAC80211 is not set | ||
| 389 | # CONFIG_IEEE80211 is not set | ||
| 390 | # CONFIG_RFKILL is not set | ||
| 391 | # CONFIG_NET_9P is not set | ||
| 392 | |||
| 393 | # | ||
| 394 | # Device Drivers | ||
| 395 | # | ||
| 396 | |||
| 397 | # | ||
| 398 | # Generic Driver Options | ||
| 399 | # | ||
| 400 | CONFIG_STANDALONE=y | ||
| 401 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
| 402 | # CONFIG_FW_LOADER is not set | ||
| 403 | # CONFIG_SYS_HYPERVISOR is not set | ||
| 404 | # CONFIG_CONNECTOR is not set | ||
| 405 | # CONFIG_MTD is not set | ||
| 406 | # CONFIG_PARPORT is not set | ||
| 407 | CONFIG_BLK_DEV=y | ||
| 408 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
| 409 | CONFIG_BLK_DEV_LOOP=y | ||
| 410 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | ||
| 411 | # CONFIG_BLK_DEV_NBD is not set | ||
| 412 | CONFIG_BLK_DEV_RAM=y | ||
| 413 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
| 414 | CONFIG_BLK_DEV_RAM_SIZE=8192 | ||
| 415 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | ||
| 416 | # CONFIG_CDROM_PKTCDVD is not set | ||
| 417 | # CONFIG_ATA_OVER_ETH is not set | ||
| 418 | |||
| 419 | # | ||
| 420 | # SCSI device support | ||
| 421 | # | ||
| 422 | # CONFIG_RAID_ATTRS is not set | ||
| 423 | # CONFIG_SCSI is not set | ||
| 424 | # CONFIG_SCSI_DMA is not set | ||
| 425 | # CONFIG_SCSI_NETLINK is not set | ||
| 426 | # CONFIG_ATA is not set | ||
| 427 | # CONFIG_MD is not set | ||
| 428 | CONFIG_NETDEVICES=y | ||
| 429 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 430 | # CONFIG_DUMMY is not set | ||
| 431 | # CONFIG_BONDING is not set | ||
| 432 | # CONFIG_MACVLAN is not set | ||
| 433 | # CONFIG_EQUALIZER is not set | ||
| 434 | # CONFIG_TUN is not set | ||
| 435 | # CONFIG_PHYLIB is not set | ||
| 436 | CONFIG_NET_ETHERNET=y | ||
| 437 | CONFIG_MII=y | ||
| 438 | # CONFIG_AX88796 is not set | ||
| 439 | CONFIG_SMC91X=y | ||
| 440 | # CONFIG_DM9000 is not set | ||
| 441 | CONFIG_NETDEV_1000=y | ||
| 442 | CONFIG_NETDEV_10000=y | ||
| 443 | |||
| 444 | # | ||
| 445 | # Wireless LAN | ||
| 446 | # | ||
| 447 | # CONFIG_WLAN_PRE80211 is not set | ||
| 448 | # CONFIG_WLAN_80211 is not set | ||
| 449 | # CONFIG_WAN is not set | ||
| 450 | CONFIG_PPP=y | ||
| 451 | CONFIG_PPP_MULTILINK=y | ||
| 452 | # CONFIG_PPP_FILTER is not set | ||
| 453 | # CONFIG_PPP_ASYNC is not set | ||
| 454 | # CONFIG_PPP_SYNC_TTY is not set | ||
| 455 | # CONFIG_PPP_DEFLATE is not set | ||
| 456 | # CONFIG_PPP_BSDCOMP is not set | ||
| 457 | # CONFIG_PPP_MPPE is not set | ||
| 458 | # CONFIG_PPPOE is not set | ||
| 459 | # CONFIG_PPPOL2TP is not set | ||
| 460 | # CONFIG_SLIP is not set | ||
| 461 | CONFIG_SLHC=y | ||
| 462 | # CONFIG_SHAPER is not set | ||
| 463 | # CONFIG_NETCONSOLE is not set | ||
| 464 | # CONFIG_NETPOLL is not set | ||
| 465 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
| 466 | # CONFIG_ISDN is not set | ||
| 467 | |||
| 468 | # | ||
| 469 | # Input device support | ||
| 470 | # | ||
| 471 | CONFIG_INPUT=y | ||
| 472 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
| 473 | # CONFIG_INPUT_POLLDEV is not set | ||
| 474 | |||
| 475 | # | ||
| 476 | # Userland interfaces | ||
| 477 | # | ||
| 478 | CONFIG_INPUT_MOUSEDEV=y | ||
| 479 | CONFIG_INPUT_MOUSEDEV_PSAUX=y | ||
| 480 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | ||
| 481 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | ||
| 482 | # CONFIG_INPUT_JOYDEV is not set | ||
| 483 | # CONFIG_INPUT_TSDEV is not set | ||
| 484 | # CONFIG_INPUT_EVDEV is not set | ||
| 485 | # CONFIG_INPUT_EVBUG is not set | ||
| 486 | |||
| 487 | # | ||
| 488 | # Input Device Drivers | ||
| 489 | # | ||
| 490 | CONFIG_INPUT_KEYBOARD=y | ||
| 491 | # CONFIG_KEYBOARD_ATKBD is not set | ||
| 492 | # CONFIG_KEYBOARD_SUNKBD is not set | ||
| 493 | # CONFIG_KEYBOARD_LKKBD is not set | ||
| 494 | # CONFIG_KEYBOARD_XTKBD is not set | ||
| 495 | # CONFIG_KEYBOARD_NEWTON is not set | ||
| 496 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
| 497 | CONFIG_KEYBOARD_OMAP=y | ||
| 498 | # CONFIG_KEYBOARD_GPIO is not set | ||
| 499 | # CONFIG_INPUT_MOUSE is not set | ||
| 500 | # CONFIG_INPUT_JOYSTICK is not set | ||
| 501 | # CONFIG_INPUT_TABLET is not set | ||
| 502 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
| 503 | # CONFIG_INPUT_MISC is not set | ||
| 504 | |||
| 505 | # | ||
| 506 | # Hardware I/O ports | ||
| 507 | # | ||
| 508 | CONFIG_SERIO=y | ||
| 509 | CONFIG_SERIO_SERPORT=y | ||
| 510 | # CONFIG_SERIO_RAW is not set | ||
| 511 | # CONFIG_GAMEPORT is not set | ||
| 512 | |||
| 513 | # | ||
| 514 | # Character devices | ||
| 515 | # | ||
| 516 | CONFIG_VT=y | ||
| 517 | CONFIG_VT_CONSOLE=y | ||
| 518 | CONFIG_HW_CONSOLE=y | ||
| 519 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
| 520 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
| 521 | |||
| 522 | # | ||
| 523 | # Serial drivers | ||
| 524 | # | ||
| 525 | CONFIG_SERIAL_8250=y | ||
| 526 | CONFIG_SERIAL_8250_CONSOLE=y | ||
| 527 | CONFIG_SERIAL_8250_NR_UARTS=4 | ||
| 528 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | ||
| 529 | # CONFIG_SERIAL_8250_EXTENDED is not set | ||
| 530 | |||
| 531 | # | ||
| 532 | # Non-8250 serial port support | ||
| 533 | # | ||
| 534 | CONFIG_SERIAL_CORE=y | ||
| 535 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
| 536 | CONFIG_UNIX98_PTYS=y | ||
| 537 | CONFIG_LEGACY_PTYS=y | ||
| 538 | CONFIG_LEGACY_PTY_COUNT=256 | ||
| 539 | # CONFIG_IPMI_HANDLER is not set | ||
| 540 | # CONFIG_WATCHDOG is not set | ||
| 541 | CONFIG_HW_RANDOM=m | ||
| 542 | CONFIG_HW_RANDOM_OMAP=m | ||
| 543 | # CONFIG_NVRAM is not set | ||
| 544 | # CONFIG_R3964 is not set | ||
| 545 | # CONFIG_RAW_DRIVER is not set | ||
| 546 | # CONFIG_TCG_TPM is not set | ||
| 547 | # CONFIG_I2C is not set | ||
| 548 | |||
| 549 | # | ||
| 550 | # SPI support | ||
| 551 | # | ||
| 552 | # CONFIG_SPI is not set | ||
| 553 | # CONFIG_SPI_MASTER is not set | ||
| 554 | # CONFIG_W1 is not set | ||
| 555 | CONFIG_HWMON=y | ||
| 556 | # CONFIG_HWMON_VID is not set | ||
| 557 | # CONFIG_SENSORS_ABITUGURU is not set | ||
| 558 | # CONFIG_SENSORS_ABITUGURU3 is not set | ||
| 559 | # CONFIG_SENSORS_F71805F is not set | ||
| 560 | # CONFIG_SENSORS_IT87 is not set | ||
| 561 | # CONFIG_SENSORS_PC87360 is not set | ||
| 562 | # CONFIG_SENSORS_PC87427 is not set | ||
| 563 | # CONFIG_SENSORS_SMSC47M1 is not set | ||
| 564 | # CONFIG_SENSORS_SMSC47B397 is not set | ||
| 565 | # CONFIG_SENSORS_VT1211 is not set | ||
| 566 | # CONFIG_SENSORS_W83627HF is not set | ||
| 567 | # CONFIG_SENSORS_W83627EHF is not set | ||
| 568 | # CONFIG_HWMON_DEBUG_CHIP is not set | ||
| 569 | CONFIG_MISC_DEVICES=y | ||
| 570 | # CONFIG_EEPROM_93CX6 is not set | ||
| 571 | |||
| 572 | # | ||
| 573 | # Multifunction device drivers | ||
| 574 | # | ||
| 575 | # CONFIG_MFD_SM501 is not set | ||
| 576 | # CONFIG_NEW_LEDS is not set | ||
| 577 | |||
| 578 | # | ||
| 579 | # Multimedia devices | ||
| 580 | # | ||
| 581 | # CONFIG_VIDEO_DEV is not set | ||
| 582 | # CONFIG_DVB_CORE is not set | ||
| 583 | CONFIG_DAB=y | ||
| 584 | |||
| 585 | # | ||
| 586 | # Graphics support | ||
| 587 | # | ||
| 588 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 589 | |||
| 590 | # | ||
| 591 | # Display device support | ||
| 592 | # | ||
| 593 | # CONFIG_DISPLAY_SUPPORT is not set | ||
| 594 | # CONFIG_VGASTATE is not set | ||
| 595 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
| 596 | CONFIG_FB=y | ||
| 597 | # CONFIG_FIRMWARE_EDID is not set | ||
| 598 | # CONFIG_FB_DDC is not set | ||
| 599 | # CONFIG_FB_CFB_FILLRECT is not set | ||
| 600 | # CONFIG_FB_CFB_COPYAREA is not set | ||
| 601 | # CONFIG_FB_CFB_IMAGEBLIT is not set | ||
| 602 | # CONFIG_FB_SYS_FILLRECT is not set | ||
| 603 | # CONFIG_FB_SYS_COPYAREA is not set | ||
| 604 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
| 605 | # CONFIG_FB_SYS_FOPS is not set | ||
| 606 | CONFIG_FB_DEFERRED_IO=y | ||
| 607 | # CONFIG_FB_SVGALIB is not set | ||
| 608 | # CONFIG_FB_MACMODES is not set | ||
| 609 | # CONFIG_FB_BACKLIGHT is not set | ||
| 610 | CONFIG_FB_MODE_HELPERS=y | ||
| 611 | # CONFIG_FB_TILEBLITTING is not set | ||
| 612 | |||
| 613 | # | ||
| 614 | # Frame buffer hardware drivers | ||
| 615 | # | ||
| 616 | # CONFIG_FB_S1D13XXX is not set | ||
| 617 | CONFIG_FB_OMAP=y | ||
| 618 | # CONFIG_FB_OMAP_LCDC_EXTERNAL is not set | ||
| 619 | # CONFIG_FB_OMAP_BOOTLOADER_INIT is not set | ||
| 620 | CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2 | ||
| 621 | # CONFIG_FB_OMAP_DMA_TUNE is not set | ||
| 622 | # CONFIG_FB_VIRTUAL is not set | ||
| 623 | |||
| 624 | # | ||
| 625 | # Console display driver support | ||
| 626 | # | ||
| 627 | # CONFIG_VGA_CONSOLE is not set | ||
| 628 | CONFIG_DUMMY_CONSOLE=y | ||
| 629 | CONFIG_FRAMEBUFFER_CONSOLE=y | ||
| 630 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set | ||
| 631 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | ||
| 632 | CONFIG_FONTS=y | ||
| 633 | CONFIG_FONT_8x8=y | ||
| 634 | CONFIG_FONT_8x16=y | ||
| 635 | # CONFIG_FONT_6x11 is not set | ||
| 636 | # CONFIG_FONT_7x14 is not set | ||
| 637 | # CONFIG_FONT_PEARL_8x8 is not set | ||
| 638 | # CONFIG_FONT_ACORN_8x8 is not set | ||
| 639 | # CONFIG_FONT_MINI_4x6 is not set | ||
| 640 | # CONFIG_FONT_SUN8x16 is not set | ||
| 641 | # CONFIG_FONT_SUN12x22 is not set | ||
| 642 | # CONFIG_FONT_10x18 is not set | ||
| 643 | CONFIG_LOGO=y | ||
| 644 | CONFIG_LOGO_LINUX_MONO=y | ||
| 645 | CONFIG_LOGO_LINUX_VGA16=y | ||
| 646 | CONFIG_LOGO_LINUX_CLUT224=y | ||
| 647 | |||
| 648 | # | ||
| 649 | # Sound | ||
| 650 | # | ||
| 651 | # CONFIG_SOUND is not set | ||
| 652 | CONFIG_HID_SUPPORT=y | ||
| 653 | CONFIG_HID=y | ||
| 654 | CONFIG_HID_DEBUG=y | ||
| 655 | CONFIG_USB_SUPPORT=y | ||
| 656 | CONFIG_USB_ARCH_HAS_HCD=y | ||
| 657 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
| 658 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
| 659 | # CONFIG_USB is not set | ||
| 660 | |||
| 661 | # | ||
| 662 | # Enable Host or Gadget support to see Inventra options | ||
| 663 | # | ||
| 664 | |||
| 665 | # | ||
| 666 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
| 667 | # | ||
| 668 | |||
| 669 | # | ||
| 670 | # USB Gadget Support | ||
| 671 | # | ||
| 672 | # CONFIG_USB_GADGET is not set | ||
| 673 | # CONFIG_MMC is not set | ||
| 674 | CONFIG_RTC_LIB=y | ||
| 675 | # CONFIG_RTC_CLASS is not set | ||
| 676 | |||
| 677 | # | ||
| 678 | # DMA Engine support | ||
| 679 | # | ||
| 680 | # CONFIG_DMA_ENGINE is not set | ||
| 681 | |||
| 682 | # | ||
| 683 | # DMA Clients | ||
| 684 | # | ||
| 685 | |||
| 686 | # | ||
| 687 | # DMA Devices | ||
| 688 | # | ||
| 689 | |||
| 690 | # | ||
| 691 | # CBUS support | ||
| 692 | # | ||
| 693 | # CONFIG_CBUS is not set | ||
| 694 | |||
| 695 | # | ||
| 696 | # File systems | ||
| 697 | # | ||
| 698 | CONFIG_EXT2_FS=y | ||
| 699 | # CONFIG_EXT2_FS_XATTR is not set | ||
| 700 | # CONFIG_EXT2_FS_XIP is not set | ||
| 701 | # CONFIG_EXT3_FS is not set | ||
| 702 | # CONFIG_EXT4DEV_FS is not set | ||
| 703 | # CONFIG_REISERFS_FS is not set | ||
| 704 | # CONFIG_JFS_FS is not set | ||
| 705 | # CONFIG_FS_POSIX_ACL is not set | ||
| 706 | # CONFIG_XFS_FS is not set | ||
| 707 | # CONFIG_GFS2_FS is not set | ||
| 708 | # CONFIG_OCFS2_FS is not set | ||
| 709 | # CONFIG_MINIX_FS is not set | ||
| 710 | # CONFIG_ROMFS_FS is not set | ||
| 711 | CONFIG_INOTIFY=y | ||
| 712 | CONFIG_INOTIFY_USER=y | ||
| 713 | # CONFIG_QUOTA is not set | ||
| 714 | CONFIG_DNOTIFY=y | ||
| 715 | CONFIG_AUTOFS_FS=y | ||
| 716 | CONFIG_AUTOFS4_FS=y | ||
| 717 | # CONFIG_FUSE_FS is not set | ||
| 718 | |||
| 719 | # | ||
| 720 | # CD-ROM/DVD Filesystems | ||
| 721 | # | ||
| 722 | # CONFIG_ISO9660_FS is not set | ||
| 723 | # CONFIG_UDF_FS is not set | ||
| 724 | |||
| 725 | # | ||
| 726 | # DOS/FAT/NT Filesystems | ||
| 727 | # | ||
| 728 | # CONFIG_MSDOS_FS is not set | ||
| 729 | # CONFIG_VFAT_FS is not set | ||
| 730 | # CONFIG_NTFS_FS is not set | ||
| 731 | |||
| 732 | # | ||
| 733 | # Pseudo filesystems | ||
| 734 | # | ||
| 735 | CONFIG_PROC_FS=y | ||
| 736 | CONFIG_PROC_SYSCTL=y | ||
| 737 | CONFIG_SYSFS=y | ||
| 738 | # CONFIG_TMPFS is not set | ||
| 739 | # CONFIG_HUGETLB_PAGE is not set | ||
| 740 | CONFIG_RAMFS=y | ||
| 741 | # CONFIG_CONFIGFS_FS is not set | ||
| 742 | |||
| 743 | # | ||
| 744 | # Miscellaneous filesystems | ||
| 745 | # | ||
| 746 | # CONFIG_ADFS_FS is not set | ||
| 747 | # CONFIG_AFFS_FS is not set | ||
| 748 | # CONFIG_HFS_FS is not set | ||
| 749 | # CONFIG_HFSPLUS_FS is not set | ||
| 750 | # CONFIG_BEFS_FS is not set | ||
| 751 | # CONFIG_BFS_FS is not set | ||
| 752 | # CONFIG_EFS_FS is not set | ||
| 753 | # CONFIG_CRAMFS is not set | ||
| 754 | # CONFIG_VXFS_FS is not set | ||
| 755 | # CONFIG_HPFS_FS is not set | ||
| 756 | # CONFIG_QNX4FS_FS is not set | ||
| 757 | # CONFIG_SYSV_FS is not set | ||
| 758 | # CONFIG_UFS_FS is not set | ||
| 759 | |||
| 760 | # | ||
| 761 | # Network File Systems | ||
| 762 | # | ||
| 763 | CONFIG_NFS_FS=y | ||
| 764 | CONFIG_NFS_V3=y | ||
| 765 | # CONFIG_NFS_V3_ACL is not set | ||
| 766 | # CONFIG_NFS_V4 is not set | ||
| 767 | # CONFIG_NFS_DIRECTIO is not set | ||
| 768 | # CONFIG_NFSD is not set | ||
| 769 | # CONFIG_ROOT_NFS is not set | ||
| 770 | CONFIG_LOCKD=y | ||
| 771 | CONFIG_LOCKD_V4=y | ||
| 772 | CONFIG_NFS_COMMON=y | ||
| 773 | CONFIG_SUNRPC=y | ||
| 774 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 775 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
| 776 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
| 777 | # CONFIG_SMB_FS is not set | ||
| 778 | # CONFIG_CIFS is not set | ||
| 779 | # CONFIG_NCP_FS is not set | ||
| 780 | # CONFIG_CODA_FS is not set | ||
| 781 | # CONFIG_AFS_FS is not set | ||
| 782 | |||
| 783 | # | ||
| 784 | # Partition Types | ||
| 785 | # | ||
| 786 | # CONFIG_PARTITION_ADVANCED is not set | ||
| 787 | CONFIG_MSDOS_PARTITION=y | ||
| 788 | |||
| 789 | # | ||
| 790 | # Native Language Support | ||
| 791 | # | ||
| 792 | # CONFIG_NLS is not set | ||
| 793 | |||
| 794 | # | ||
| 795 | # Distributed Lock Manager | ||
| 796 | # | ||
| 797 | # CONFIG_DLM is not set | ||
| 798 | |||
| 799 | # | ||
| 800 | # Profiling support | ||
| 801 | # | ||
| 802 | # CONFIG_PROFILING is not set | ||
| 803 | |||
| 804 | # | ||
| 805 | # Kernel hacking | ||
| 806 | # | ||
| 807 | # CONFIG_PRINTK_TIME is not set | ||
| 808 | CONFIG_ENABLE_MUST_CHECK=y | ||
| 809 | # CONFIG_MAGIC_SYSRQ is not set | ||
| 810 | # CONFIG_UNUSED_SYMBOLS is not set | ||
| 811 | # CONFIG_DEBUG_FS is not set | ||
| 812 | # CONFIG_HEADERS_CHECK is not set | ||
| 813 | # CONFIG_DEBUG_KERNEL is not set | ||
| 814 | # CONFIG_SLUB_DEBUG_ON is not set | ||
| 815 | CONFIG_DEBUG_BUGVERBOSE=y | ||
| 816 | CONFIG_FRAME_POINTER=y | ||
| 817 | # CONFIG_DEBUG_USER is not set | ||
| 818 | |||
| 819 | # | ||
| 820 | # Security options | ||
| 821 | # | ||
| 822 | # CONFIG_KEYS is not set | ||
| 823 | # CONFIG_SECURITY is not set | ||
| 824 | # CONFIG_CRYPTO is not set | ||
| 825 | |||
| 826 | # | ||
| 827 | # Library routines | ||
| 828 | # | ||
| 829 | CONFIG_BITREVERSE=y | ||
| 830 | # CONFIG_CRC_CCITT is not set | ||
| 831 | # CONFIG_CRC16 is not set | ||
| 832 | # CONFIG_CRC_ITU_T is not set | ||
| 833 | CONFIG_CRC32=y | ||
| 834 | # CONFIG_CRC7 is not set | ||
| 835 | # CONFIG_LIBCRC32C is not set | ||
| 836 | CONFIG_PLIST=y | ||
| 837 | CONFIG_HAS_IOMEM=y | ||
| 838 | CONFIG_HAS_IOPORT=y | ||
| 839 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/arm/configs/omap_osk_5912_defconfig b/arch/arm/configs/omap_osk_5912_defconfig index d4ca5e6e4ffa..b68e0144cab5 100644 --- a/arch/arm/configs/omap_osk_5912_defconfig +++ b/arch/arm/configs/omap_osk_5912_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.25-rc3 | 3 | # Linux kernel version: 2.6.24-rc3-omap1 |
| 4 | # Mon Mar 3 03:35:17 2008 | 4 | # Fri Nov 23 12:24:12 2007 |
| 5 | # | 5 | # |
| 6 | CONFIG_ARM=y | 6 | CONFIG_ARM=y |
| 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y |
| @@ -21,7 +21,6 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y | |||
| 21 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 21 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
| 22 | CONFIG_GENERIC_HWEIGHT=y | 22 | CONFIG_GENERIC_HWEIGHT=y |
| 23 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 23 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 24 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
| 25 | CONFIG_ZONE_DMA=y | 24 | CONFIG_ZONE_DMA=y |
| 26 | CONFIG_VECTORS_BASE=0xffff0000 | 25 | CONFIG_VECTORS_BASE=0xffff0000 |
| 27 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 26 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| @@ -40,22 +39,17 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
| 40 | # CONFIG_POSIX_MQUEUE is not set | 39 | # CONFIG_POSIX_MQUEUE is not set |
| 41 | # CONFIG_BSD_PROCESS_ACCT is not set | 40 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 42 | # CONFIG_TASKSTATS is not set | 41 | # CONFIG_TASKSTATS is not set |
| 42 | # CONFIG_USER_NS is not set | ||
| 43 | # CONFIG_PID_NS is not set | ||
| 43 | # CONFIG_AUDIT is not set | 44 | # CONFIG_AUDIT is not set |
| 44 | # CONFIG_IKCONFIG is not set | 45 | # CONFIG_IKCONFIG is not set |
| 45 | CONFIG_LOG_BUF_SHIFT=14 | 46 | CONFIG_LOG_BUF_SHIFT=14 |
| 46 | # CONFIG_CGROUPS is not set | 47 | # CONFIG_CGROUPS is not set |
| 47 | CONFIG_GROUP_SCHED=y | ||
| 48 | CONFIG_FAIR_GROUP_SCHED=y | 48 | CONFIG_FAIR_GROUP_SCHED=y |
| 49 | # CONFIG_RT_GROUP_SCHED is not set | 49 | CONFIG_FAIR_USER_SCHED=y |
| 50 | CONFIG_USER_SCHED=y | 50 | # CONFIG_FAIR_CGROUP_SCHED is not set |
| 51 | # CONFIG_CGROUP_SCHED is not set | 51 | CONFIG_SYSFS_DEPRECATED=y |
| 52 | # CONFIG_SYSFS_DEPRECATED is not set | ||
| 53 | # CONFIG_RELAY is not set | 52 | # CONFIG_RELAY is not set |
| 54 | CONFIG_NAMESPACES=y | ||
| 55 | # CONFIG_UTS_NS is not set | ||
| 56 | # CONFIG_IPC_NS is not set | ||
| 57 | # CONFIG_USER_NS is not set | ||
| 58 | # CONFIG_PID_NS is not set | ||
| 59 | CONFIG_BLK_DEV_INITRD=y | 53 | CONFIG_BLK_DEV_INITRD=y |
| 60 | CONFIG_INITRAMFS_SOURCE="" | 54 | CONFIG_INITRAMFS_SOURCE="" |
| 61 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 55 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
| @@ -69,26 +63,18 @@ CONFIG_HOTPLUG=y | |||
| 69 | CONFIG_PRINTK=y | 63 | CONFIG_PRINTK=y |
| 70 | CONFIG_BUG=y | 64 | CONFIG_BUG=y |
| 71 | CONFIG_ELF_CORE=y | 65 | CONFIG_ELF_CORE=y |
| 72 | CONFIG_COMPAT_BRK=y | ||
| 73 | CONFIG_BASE_FULL=y | 66 | CONFIG_BASE_FULL=y |
| 74 | CONFIG_FUTEX=y | 67 | CONFIG_FUTEX=y |
| 75 | CONFIG_ANON_INODES=y | 68 | CONFIG_ANON_INODES=y |
| 76 | CONFIG_EPOLL=y | 69 | CONFIG_EPOLL=y |
| 77 | CONFIG_SIGNALFD=y | 70 | CONFIG_SIGNALFD=y |
| 78 | CONFIG_TIMERFD=y | ||
| 79 | CONFIG_EVENTFD=y | 71 | CONFIG_EVENTFD=y |
| 80 | CONFIG_SHMEM=y | 72 | CONFIG_SHMEM=y |
| 81 | CONFIG_VM_EVENT_COUNTERS=y | 73 | CONFIG_VM_EVENT_COUNTERS=y |
| 82 | CONFIG_SLAB=y | 74 | CONFIG_SLUB_DEBUG=y |
| 83 | # CONFIG_SLUB is not set | 75 | # CONFIG_SLAB is not set |
| 76 | CONFIG_SLUB=y | ||
| 84 | # CONFIG_SLOB is not set | 77 | # CONFIG_SLOB is not set |
| 85 | # CONFIG_PROFILING is not set | ||
| 86 | # CONFIG_MARKERS is not set | ||
| 87 | CONFIG_HAVE_OPROFILE=y | ||
| 88 | # CONFIG_KPROBES is not set | ||
| 89 | CONFIG_HAVE_KPROBES=y | ||
| 90 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 91 | CONFIG_SLABINFO=y | ||
| 92 | CONFIG_RT_MUTEXES=y | 78 | CONFIG_RT_MUTEXES=y |
| 93 | # CONFIG_TINY_SHMEM is not set | 79 | # CONFIG_TINY_SHMEM is not set |
| 94 | CONFIG_BASE_SMALL=0 | 80 | CONFIG_BASE_SMALL=0 |
| @@ -116,8 +102,6 @@ CONFIG_IOSCHED_CFQ=y | |||
| 116 | CONFIG_DEFAULT_CFQ=y | 102 | CONFIG_DEFAULT_CFQ=y |
| 117 | # CONFIG_DEFAULT_NOOP is not set | 103 | # CONFIG_DEFAULT_NOOP is not set |
| 118 | CONFIG_DEFAULT_IOSCHED="cfq" | 104 | CONFIG_DEFAULT_IOSCHED="cfq" |
| 119 | CONFIG_CLASSIC_RCU=y | ||
| 120 | # CONFIG_PREEMPT_RCU is not set | ||
| 121 | 105 | ||
| 122 | # | 106 | # |
| 123 | # System Type | 107 | # System Type |
| @@ -146,7 +130,6 @@ CONFIG_CLASSIC_RCU=y | |||
| 146 | # CONFIG_ARCH_KS8695 is not set | 130 | # CONFIG_ARCH_KS8695 is not set |
| 147 | # CONFIG_ARCH_NS9XXX is not set | 131 | # CONFIG_ARCH_NS9XXX is not set |
| 148 | # CONFIG_ARCH_MXC is not set | 132 | # CONFIG_ARCH_MXC is not set |
| 149 | # CONFIG_ARCH_ORION is not set | ||
| 150 | # CONFIG_ARCH_PNX4008 is not set | 133 | # CONFIG_ARCH_PNX4008 is not set |
| 151 | # CONFIG_ARCH_PXA is not set | 134 | # CONFIG_ARCH_PXA is not set |
| 152 | # CONFIG_ARCH_RPC is not set | 135 | # CONFIG_ARCH_RPC is not set |
| @@ -156,7 +139,6 @@ CONFIG_CLASSIC_RCU=y | |||
| 156 | # CONFIG_ARCH_LH7A40X is not set | 139 | # CONFIG_ARCH_LH7A40X is not set |
| 157 | # CONFIG_ARCH_DAVINCI is not set | 140 | # CONFIG_ARCH_DAVINCI is not set |
| 158 | CONFIG_ARCH_OMAP=y | 141 | CONFIG_ARCH_OMAP=y |
| 159 | # CONFIG_ARCH_MSM7X00A is not set | ||
| 160 | 142 | ||
| 161 | # | 143 | # |
| 162 | # TI OMAP Implementations | 144 | # TI OMAP Implementations |
| @@ -164,16 +146,22 @@ CONFIG_ARCH_OMAP=y | |||
| 164 | CONFIG_ARCH_OMAP_OTG=y | 146 | CONFIG_ARCH_OMAP_OTG=y |
| 165 | CONFIG_ARCH_OMAP1=y | 147 | CONFIG_ARCH_OMAP1=y |
| 166 | # CONFIG_ARCH_OMAP2 is not set | 148 | # CONFIG_ARCH_OMAP2 is not set |
| 149 | # CONFIG_ARCH_OMAP3 is not set | ||
| 167 | 150 | ||
| 168 | # | 151 | # |
| 169 | # OMAP Feature Selections | 152 | # OMAP Feature Selections |
| 170 | # | 153 | # |
| 154 | CONFIG_OMAP_DEBUG_SRAM_PATCH=y | ||
| 171 | CONFIG_OMAP_RESET_CLOCKS=y | 155 | CONFIG_OMAP_RESET_CLOCKS=y |
| 156 | # CONFIG_OMAP_BOOT_TAG is not set | ||
| 157 | # CONFIG_OMAP_GPIO_SWITCH is not set | ||
| 172 | CONFIG_OMAP_MUX=y | 158 | CONFIG_OMAP_MUX=y |
| 173 | # CONFIG_OMAP_MUX_DEBUG is not set | 159 | # CONFIG_OMAP_MUX_DEBUG is not set |
| 174 | CONFIG_OMAP_MUX_WARNINGS=y | 160 | CONFIG_OMAP_MUX_WARNINGS=y |
| 161 | # CONFIG_OMAP_STI is not set | ||
| 175 | CONFIG_OMAP_MCBSP=y | 162 | CONFIG_OMAP_MCBSP=y |
| 176 | # CONFIG_OMAP_MMU_FWK is not set | 163 | # CONFIG_OMAP_MMU_FWK is not set |
| 164 | # CONFIG_OMAP_MBOX_FWK is not set | ||
| 177 | # CONFIG_OMAP_MPU_TIMER is not set | 165 | # CONFIG_OMAP_MPU_TIMER is not set |
| 178 | CONFIG_OMAP_32K_TIMER=y | 166 | CONFIG_OMAP_32K_TIMER=y |
| 179 | CONFIG_OMAP_32K_TIMER_HZ=128 | 167 | CONFIG_OMAP_32K_TIMER_HZ=128 |
| @@ -182,6 +170,7 @@ CONFIG_OMAP_LL_DEBUG_UART1=y | |||
| 182 | # CONFIG_OMAP_LL_DEBUG_UART2 is not set | 170 | # CONFIG_OMAP_LL_DEBUG_UART2 is not set |
| 183 | # CONFIG_OMAP_LL_DEBUG_UART3 is not set | 171 | # CONFIG_OMAP_LL_DEBUG_UART3 is not set |
| 184 | CONFIG_OMAP_SERIAL_WAKE=y | 172 | CONFIG_OMAP_SERIAL_WAKE=y |
| 173 | # CONFIG_OMAP_DSP is not set | ||
| 185 | 174 | ||
| 186 | # | 175 | # |
| 187 | # OMAP Core Type | 176 | # OMAP Core Type |
| @@ -193,13 +182,13 @@ CONFIG_ARCH_OMAP16XX=y | |||
| 193 | # | 182 | # |
| 194 | # OMAP Board Type | 183 | # OMAP Board Type |
| 195 | # | 184 | # |
| 196 | CONFIG_MACH_OMAP_INNOVATOR=y | 185 | # CONFIG_MACH_OMAP_INNOVATOR is not set |
| 197 | CONFIG_MACH_OMAP_H2=y | 186 | # CONFIG_MACH_OMAP_H2 is not set |
| 198 | CONFIG_MACH_OMAP_H3=y | 187 | # CONFIG_MACH_OMAP_H3 is not set |
| 199 | CONFIG_MACH_OMAP_OSK=y | 188 | CONFIG_MACH_OMAP_OSK=y |
| 200 | # CONFIG_OMAP_OSK_MISTRAL is not set | 189 | # CONFIG_OMAP_OSK_MISTRAL is not set |
| 201 | CONFIG_MACH_NOKIA770=y | 190 | # CONFIG_MACH_NOKIA770 is not set |
| 202 | CONFIG_MACH_OMAP_GENERIC=y | 191 | # CONFIG_MACH_OMAP_GENERIC is not set |
| 203 | 192 | ||
| 204 | # | 193 | # |
| 205 | # OMAP CPU Speed | 194 | # OMAP CPU Speed |
| @@ -227,6 +216,7 @@ CONFIG_CPU_32=y | |||
| 227 | CONFIG_CPU_ARM926T=y | 216 | CONFIG_CPU_ARM926T=y |
| 228 | CONFIG_CPU_32v5=y | 217 | CONFIG_CPU_32v5=y |
| 229 | CONFIG_CPU_ABRT_EV5TJ=y | 218 | CONFIG_CPU_ABRT_EV5TJ=y |
| 219 | CONFIG_CPU_PABRT_NOIFAR=y | ||
| 230 | CONFIG_CPU_CACHE_VIVT=y | 220 | CONFIG_CPU_CACHE_VIVT=y |
| 231 | CONFIG_CPU_COPY_V4WB=y | 221 | CONFIG_CPU_COPY_V4WB=y |
| 232 | CONFIG_CPU_TLB_V4WBI=y | 222 | CONFIG_CPU_TLB_V4WBI=y |
| @@ -264,12 +254,11 @@ CONFIG_OMAP_CF=y | |||
| 264 | # | 254 | # |
| 265 | CONFIG_TICK_ONESHOT=y | 255 | CONFIG_TICK_ONESHOT=y |
| 266 | CONFIG_NO_HZ=y | 256 | CONFIG_NO_HZ=y |
| 267 | CONFIG_HIGH_RES_TIMERS=y | 257 | # CONFIG_HIGH_RES_TIMERS is not set |
| 268 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | 258 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y |
| 269 | # CONFIG_PREEMPT is not set | 259 | # CONFIG_PREEMPT is not set |
| 270 | CONFIG_HZ=128 | 260 | CONFIG_HZ=128 |
| 271 | CONFIG_AEABI=y | 261 | # CONFIG_AEABI is not set |
| 272 | CONFIG_OABI_COMPAT=y | ||
| 273 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | 262 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set |
| 274 | CONFIG_SELECT_MEMORY_MODEL=y | 263 | CONFIG_SELECT_MEMORY_MODEL=y |
| 275 | CONFIG_FLATMEM_MANUAL=y | 264 | CONFIG_FLATMEM_MANUAL=y |
| @@ -295,7 +284,6 @@ CONFIG_ZBOOT_ROM_BSS=0x0 | |||
| 295 | CONFIG_CMDLINE="mem=32M console=ttyS0,115200 initrd=0x10400000,8M root=/dev/ram0 rw" | 284 | CONFIG_CMDLINE="mem=32M console=ttyS0,115200 initrd=0x10400000,8M root=/dev/ram0 rw" |
| 296 | # CONFIG_XIP_KERNEL is not set | 285 | # CONFIG_XIP_KERNEL is not set |
| 297 | # CONFIG_KEXEC is not set | 286 | # CONFIG_KEXEC is not set |
| 298 | # CONFIG_ATAGS_PROC is not set | ||
| 299 | 287 | ||
| 300 | # | 288 | # |
| 301 | # CPU Frequency scaling | 289 | # CPU Frequency scaling |
| @@ -320,6 +308,7 @@ CONFIG_FPE_NWFPE=y | |||
| 320 | CONFIG_BINFMT_ELF=y | 308 | CONFIG_BINFMT_ELF=y |
| 321 | # CONFIG_BINFMT_AOUT is not set | 309 | # CONFIG_BINFMT_AOUT is not set |
| 322 | # CONFIG_BINFMT_MISC is not set | 310 | # CONFIG_BINFMT_MISC is not set |
| 311 | # CONFIG_ARTHUR is not set | ||
| 323 | 312 | ||
| 324 | # | 313 | # |
| 325 | # Power management options | 314 | # Power management options |
| @@ -328,10 +317,9 @@ CONFIG_PM=y | |||
| 328 | # CONFIG_PM_LEGACY is not set | 317 | # CONFIG_PM_LEGACY is not set |
| 329 | # CONFIG_PM_DEBUG is not set | 318 | # CONFIG_PM_DEBUG is not set |
| 330 | CONFIG_PM_SLEEP=y | 319 | CONFIG_PM_SLEEP=y |
| 320 | CONFIG_SUSPEND_UP_POSSIBLE=y | ||
| 331 | CONFIG_SUSPEND=y | 321 | CONFIG_SUSPEND=y |
| 332 | CONFIG_SUSPEND_FREEZER=y | ||
| 333 | # CONFIG_APM_EMULATION is not set | 322 | # CONFIG_APM_EMULATION is not set |
| 334 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
| 335 | 323 | ||
| 336 | # | 324 | # |
| 337 | # Networking | 325 | # Networking |
| @@ -348,7 +336,6 @@ CONFIG_XFRM=y | |||
| 348 | # CONFIG_XFRM_USER is not set | 336 | # CONFIG_XFRM_USER is not set |
| 349 | # CONFIG_XFRM_SUB_POLICY is not set | 337 | # CONFIG_XFRM_SUB_POLICY is not set |
| 350 | # CONFIG_XFRM_MIGRATE is not set | 338 | # CONFIG_XFRM_MIGRATE is not set |
| 351 | # CONFIG_XFRM_STATISTICS is not set | ||
| 352 | # CONFIG_NET_KEY is not set | 339 | # CONFIG_NET_KEY is not set |
| 353 | CONFIG_INET=y | 340 | CONFIG_INET=y |
| 354 | CONFIG_IP_MULTICAST=y | 341 | CONFIG_IP_MULTICAST=y |
| @@ -404,7 +391,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 404 | # | 391 | # |
| 405 | # CONFIG_NET_PKTGEN is not set | 392 | # CONFIG_NET_PKTGEN is not set |
| 406 | # CONFIG_HAMRADIO is not set | 393 | # CONFIG_HAMRADIO is not set |
| 407 | # CONFIG_CAN is not set | ||
| 408 | # CONFIG_IRDA is not set | 394 | # CONFIG_IRDA is not set |
| 409 | # CONFIG_BT is not set | 395 | # CONFIG_BT is not set |
| 410 | # CONFIG_AF_RXRPC is not set | 396 | # CONFIG_AF_RXRPC is not set |
| @@ -517,13 +503,11 @@ CONFIG_BLK_DEV_LOOP=y | |||
| 517 | CONFIG_BLK_DEV_RAM=y | 503 | CONFIG_BLK_DEV_RAM=y |
| 518 | CONFIG_BLK_DEV_RAM_COUNT=16 | 504 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 519 | CONFIG_BLK_DEV_RAM_SIZE=8192 | 505 | CONFIG_BLK_DEV_RAM_SIZE=8192 |
| 520 | # CONFIG_BLK_DEV_XIP is not set | 506 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
| 521 | # CONFIG_CDROM_PKTCDVD is not set | 507 | # CONFIG_CDROM_PKTCDVD is not set |
| 522 | # CONFIG_ATA_OVER_ETH is not set | 508 | # CONFIG_ATA_OVER_ETH is not set |
| 523 | CONFIG_MISC_DEVICES=y | 509 | CONFIG_MISC_DEVICES=y |
| 524 | # CONFIG_EEPROM_93CX6 is not set | 510 | # CONFIG_EEPROM_93CX6 is not set |
| 525 | # CONFIG_ENCLOSURE_SERVICES is not set | ||
| 526 | CONFIG_HAVE_IDE=y | ||
| 527 | CONFIG_IDE=m | 511 | CONFIG_IDE=m |
| 528 | CONFIG_BLK_DEV_IDE=m | 512 | CONFIG_BLK_DEV_IDE=m |
| 529 | 513 | ||
| @@ -545,6 +529,7 @@ CONFIG_IDE_PROC_FS=y | |||
| 545 | # | 529 | # |
| 546 | # CONFIG_IDE_GENERIC is not set | 530 | # CONFIG_IDE_GENERIC is not set |
| 547 | # CONFIG_BLK_DEV_PLATFORM is not set | 531 | # CONFIG_BLK_DEV_PLATFORM is not set |
| 532 | # CONFIG_IDE_ARM is not set | ||
| 548 | # CONFIG_BLK_DEV_IDEDMA is not set | 533 | # CONFIG_BLK_DEV_IDEDMA is not set |
| 549 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 534 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y |
| 550 | # CONFIG_BLK_DEV_HD is not set | 535 | # CONFIG_BLK_DEV_HD is not set |
| @@ -578,7 +563,6 @@ CONFIG_SMC91X=y | |||
| 578 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 563 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
| 579 | # CONFIG_B44 is not set | 564 | # CONFIG_B44 is not set |
| 580 | CONFIG_NETDEV_1000=y | 565 | CONFIG_NETDEV_1000=y |
| 581 | # CONFIG_E1000E_ENABLED is not set | ||
| 582 | CONFIG_NETDEV_10000=y | 566 | CONFIG_NETDEV_10000=y |
| 583 | 567 | ||
| 584 | # | 568 | # |
| @@ -600,6 +584,7 @@ CONFIG_PPP_MULTILINK=y | |||
| 600 | # CONFIG_PPPOL2TP is not set | 584 | # CONFIG_PPPOL2TP is not set |
| 601 | # CONFIG_SLIP is not set | 585 | # CONFIG_SLIP is not set |
| 602 | CONFIG_SLHC=y | 586 | CONFIG_SLHC=y |
| 587 | # CONFIG_SHAPER is not set | ||
| 603 | # CONFIG_NETCONSOLE is not set | 588 | # CONFIG_NETCONSOLE is not set |
| 604 | # CONFIG_NETPOLL is not set | 589 | # CONFIG_NETPOLL is not set |
| 605 | # CONFIG_NET_POLL_CONTROLLER is not set | 590 | # CONFIG_NET_POLL_CONTROLLER is not set |
| @@ -696,7 +681,6 @@ CONFIG_HW_RANDOM_OMAP=m | |||
| 696 | # CONFIG_SYNCLINK_CS is not set | 681 | # CONFIG_SYNCLINK_CS is not set |
| 697 | # CONFIG_CARDMAN_4000 is not set | 682 | # CONFIG_CARDMAN_4000 is not set |
| 698 | # CONFIG_CARDMAN_4040 is not set | 683 | # CONFIG_CARDMAN_4040 is not set |
| 699 | # CONFIG_IPWIRELESS is not set | ||
| 700 | # CONFIG_RAW_DRIVER is not set | 684 | # CONFIG_RAW_DRIVER is not set |
| 701 | # CONFIG_TCG_TPM is not set | 685 | # CONFIG_TCG_TPM is not set |
| 702 | CONFIG_I2C=y | 686 | CONFIG_I2C=y |
| @@ -724,13 +708,17 @@ CONFIG_I2C_OMAP=y | |||
| 724 | # | 708 | # |
| 725 | # Miscellaneous I2C Chip support | 709 | # Miscellaneous I2C Chip support |
| 726 | # | 710 | # |
| 711 | # CONFIG_SENSORS_DS1337 is not set | ||
| 712 | # CONFIG_SENSORS_DS1374 is not set | ||
| 727 | # CONFIG_DS1682 is not set | 713 | # CONFIG_DS1682 is not set |
| 728 | # CONFIG_SENSORS_EEPROM is not set | 714 | # CONFIG_SENSORS_EEPROM is not set |
| 729 | # CONFIG_SENSORS_PCF8574 is not set | 715 | # CONFIG_SENSORS_PCF8574 is not set |
| 730 | # CONFIG_PCF8575 is not set | 716 | # CONFIG_SENSORS_PCA9539 is not set |
| 731 | # CONFIG_SENSORS_PCF8591 is not set | 717 | # CONFIG_SENSORS_PCF8591 is not set |
| 732 | # CONFIG_ISP1301_OMAP is not set | 718 | # CONFIG_ISP1301_OMAP is not set |
| 733 | CONFIG_TPS65010=y | 719 | CONFIG_TPS65010=y |
| 720 | # CONFIG_SENSORS_TLV320AIC23 is not set | ||
| 721 | # CONFIG_GPIOEXPANDER_OMAP is not set | ||
| 734 | # CONFIG_SENSORS_MAX6875 is not set | 722 | # CONFIG_SENSORS_MAX6875 is not set |
| 735 | # CONFIG_SENSORS_TSL2550 is not set | 723 | # CONFIG_SENSORS_TSL2550 is not set |
| 736 | # CONFIG_I2C_DEBUG_CORE is not set | 724 | # CONFIG_I2C_DEBUG_CORE is not set |
| @@ -755,7 +743,6 @@ CONFIG_HWMON=y | |||
| 755 | # CONFIG_SENSORS_ADM1031 is not set | 743 | # CONFIG_SENSORS_ADM1031 is not set |
| 756 | # CONFIG_SENSORS_ADM9240 is not set | 744 | # CONFIG_SENSORS_ADM9240 is not set |
| 757 | # CONFIG_SENSORS_ADT7470 is not set | 745 | # CONFIG_SENSORS_ADT7470 is not set |
| 758 | # CONFIG_SENSORS_ADT7473 is not set | ||
| 759 | # CONFIG_SENSORS_ATXP1 is not set | 746 | # CONFIG_SENSORS_ATXP1 is not set |
| 760 | # CONFIG_SENSORS_DS1621 is not set | 747 | # CONFIG_SENSORS_DS1621 is not set |
| 761 | # CONFIG_SENSORS_F71805F is not set | 748 | # CONFIG_SENSORS_F71805F is not set |
| @@ -783,7 +770,6 @@ CONFIG_HWMON=y | |||
| 783 | # CONFIG_SENSORS_SMSC47M1 is not set | 770 | # CONFIG_SENSORS_SMSC47M1 is not set |
| 784 | # CONFIG_SENSORS_SMSC47M192 is not set | 771 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 785 | # CONFIG_SENSORS_SMSC47B397 is not set | 772 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 786 | # CONFIG_SENSORS_ADS7828 is not set | ||
| 787 | # CONFIG_SENSORS_THMC50 is not set | 773 | # CONFIG_SENSORS_THMC50 is not set |
| 788 | # CONFIG_SENSORS_VT1211 is not set | 774 | # CONFIG_SENSORS_VT1211 is not set |
| 789 | # CONFIG_SENSORS_W83781D is not set | 775 | # CONFIG_SENSORS_W83781D is not set |
| @@ -791,7 +777,6 @@ CONFIG_HWMON=y | |||
| 791 | # CONFIG_SENSORS_W83792D is not set | 777 | # CONFIG_SENSORS_W83792D is not set |
| 792 | # CONFIG_SENSORS_W83793 is not set | 778 | # CONFIG_SENSORS_W83793 is not set |
| 793 | # CONFIG_SENSORS_W83L785TS is not set | 779 | # CONFIG_SENSORS_W83L785TS is not set |
| 794 | # CONFIG_SENSORS_W83L786NG is not set | ||
| 795 | # CONFIG_SENSORS_W83627HF is not set | 780 | # CONFIG_SENSORS_W83627HF is not set |
| 796 | # CONFIG_SENSORS_W83627EHF is not set | 781 | # CONFIG_SENSORS_W83627EHF is not set |
| 797 | # CONFIG_HWMON_DEBUG_CHIP is not set | 782 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| @@ -807,7 +792,6 @@ CONFIG_SSB_POSSIBLE=y | |||
| 807 | # Multifunction device drivers | 792 | # Multifunction device drivers |
| 808 | # | 793 | # |
| 809 | # CONFIG_MFD_SM501 is not set | 794 | # CONFIG_MFD_SM501 is not set |
| 810 | # CONFIG_MFD_ASIC3 is not set | ||
| 811 | 795 | ||
| 812 | # | 796 | # |
| 813 | # Multimedia devices | 797 | # Multimedia devices |
| @@ -822,11 +806,11 @@ CONFIG_DAB=y | |||
| 822 | # CONFIG_VGASTATE is not set | 806 | # CONFIG_VGASTATE is not set |
| 823 | CONFIG_VIDEO_OUTPUT_CONTROL=m | 807 | CONFIG_VIDEO_OUTPUT_CONTROL=m |
| 824 | CONFIG_FB=y | 808 | CONFIG_FB=y |
| 825 | CONFIG_FIRMWARE_EDID=y | 809 | # CONFIG_FIRMWARE_EDID is not set |
| 826 | # CONFIG_FB_DDC is not set | 810 | # CONFIG_FB_DDC is not set |
| 827 | # CONFIG_FB_CFB_FILLRECT is not set | 811 | CONFIG_FB_CFB_FILLRECT=y |
| 828 | # CONFIG_FB_CFB_COPYAREA is not set | 812 | CONFIG_FB_CFB_COPYAREA=y |
| 829 | # CONFIG_FB_CFB_IMAGEBLIT is not set | 813 | CONFIG_FB_CFB_IMAGEBLIT=y |
| 830 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | 814 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set |
| 831 | # CONFIG_FB_SYS_FILLRECT is not set | 815 | # CONFIG_FB_SYS_FILLRECT is not set |
| 832 | # CONFIG_FB_SYS_COPYAREA is not set | 816 | # CONFIG_FB_SYS_COPYAREA is not set |
| @@ -844,7 +828,11 @@ CONFIG_FB_MODE_HELPERS=y | |||
| 844 | # | 828 | # |
| 845 | # CONFIG_FB_S1D13XXX is not set | 829 | # CONFIG_FB_S1D13XXX is not set |
| 846 | # CONFIG_FB_VIRTUAL is not set | 830 | # CONFIG_FB_VIRTUAL is not set |
| 847 | # CONFIG_FB_OMAP is not set | 831 | CONFIG_FB_OMAP=y |
| 832 | # CONFIG_FB_OMAP_LCDC_EXTERNAL is not set | ||
| 833 | # CONFIG_FB_OMAP_BOOTLOADER_INIT is not set | ||
| 834 | CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2 | ||
| 835 | # CONFIG_FB_OMAP_DMA_TUNE is not set | ||
| 848 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 836 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 849 | 837 | ||
| 850 | # | 838 | # |
| @@ -891,8 +879,16 @@ CONFIG_USB_ARCH_HAS_OHCI=y | |||
| 891 | # CONFIG_USB is not set | 879 | # CONFIG_USB is not set |
| 892 | 880 | ||
| 893 | # | 881 | # |
| 882 | # Enable Host or Gadget support to see Inventra options | ||
| 883 | # | ||
| 884 | |||
| 885 | # | ||
| 894 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 886 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 895 | # | 887 | # |
| 888 | |||
| 889 | # | ||
| 890 | # USB Gadget Support | ||
| 891 | # | ||
| 896 | # CONFIG_USB_GADGET is not set | 892 | # CONFIG_USB_GADGET is not set |
| 897 | # CONFIG_MMC is not set | 893 | # CONFIG_MMC is not set |
| 898 | # CONFIG_NEW_LEDS is not set | 894 | # CONFIG_NEW_LEDS is not set |
| @@ -900,6 +896,11 @@ CONFIG_RTC_LIB=y | |||
| 900 | # CONFIG_RTC_CLASS is not set | 896 | # CONFIG_RTC_CLASS is not set |
| 901 | 897 | ||
| 902 | # | 898 | # |
| 899 | # CBUS support | ||
| 900 | # | ||
| 901 | # CONFIG_CBUS is not set | ||
| 902 | |||
| 903 | # | ||
| 903 | # File systems | 904 | # File systems |
| 904 | # | 905 | # |
| 905 | CONFIG_EXT2_FS=y | 906 | CONFIG_EXT2_FS=y |
| @@ -913,10 +914,12 @@ CONFIG_EXT2_FS=y | |||
| 913 | # CONFIG_XFS_FS is not set | 914 | # CONFIG_XFS_FS is not set |
| 914 | # CONFIG_GFS2_FS is not set | 915 | # CONFIG_GFS2_FS is not set |
| 915 | # CONFIG_OCFS2_FS is not set | 916 | # CONFIG_OCFS2_FS is not set |
| 916 | CONFIG_DNOTIFY=y | 917 | # CONFIG_MINIX_FS is not set |
| 918 | # CONFIG_ROMFS_FS is not set | ||
| 917 | CONFIG_INOTIFY=y | 919 | CONFIG_INOTIFY=y |
| 918 | CONFIG_INOTIFY_USER=y | 920 | CONFIG_INOTIFY_USER=y |
| 919 | # CONFIG_QUOTA is not set | 921 | # CONFIG_QUOTA is not set |
| 922 | CONFIG_DNOTIFY=y | ||
| 920 | CONFIG_AUTOFS_FS=y | 923 | CONFIG_AUTOFS_FS=y |
| 921 | CONFIG_AUTOFS4_FS=y | 924 | CONFIG_AUTOFS4_FS=y |
| 922 | # CONFIG_FUSE_FS is not set | 925 | # CONFIG_FUSE_FS is not set |
| @@ -970,10 +973,8 @@ CONFIG_JFFS2_RTIME=y | |||
| 970 | # CONFIG_JFFS2_RUBIN is not set | 973 | # CONFIG_JFFS2_RUBIN is not set |
| 971 | # CONFIG_CRAMFS is not set | 974 | # CONFIG_CRAMFS is not set |
| 972 | # CONFIG_VXFS_FS is not set | 975 | # CONFIG_VXFS_FS is not set |
| 973 | # CONFIG_MINIX_FS is not set | ||
| 974 | # CONFIG_HPFS_FS is not set | 976 | # CONFIG_HPFS_FS is not set |
| 975 | # CONFIG_QNX4FS_FS is not set | 977 | # CONFIG_QNX4FS_FS is not set |
| 976 | # CONFIG_ROMFS_FS is not set | ||
| 977 | # CONFIG_SYSV_FS is not set | 978 | # CONFIG_SYSV_FS is not set |
| 978 | # CONFIG_UFS_FS is not set | 979 | # CONFIG_UFS_FS is not set |
| 979 | CONFIG_NETWORK_FILESYSTEMS=y | 980 | CONFIG_NETWORK_FILESYSTEMS=y |
| @@ -1043,6 +1044,9 @@ CONFIG_NLS_ISO8859_1=m | |||
| 1043 | # CONFIG_NLS_KOI8_U is not set | 1044 | # CONFIG_NLS_KOI8_U is not set |
| 1044 | # CONFIG_NLS_UTF8 is not set | 1045 | # CONFIG_NLS_UTF8 is not set |
| 1045 | # CONFIG_DLM is not set | 1046 | # CONFIG_DLM is not set |
| 1047 | CONFIG_INSTRUMENTATION=y | ||
| 1048 | # CONFIG_PROFILING is not set | ||
| 1049 | # CONFIG_MARKERS is not set | ||
| 1046 | 1050 | ||
| 1047 | # | 1051 | # |
| 1048 | # Kernel hacking | 1052 | # Kernel hacking |
| @@ -1055,6 +1059,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1055 | # CONFIG_DEBUG_FS is not set | 1059 | # CONFIG_DEBUG_FS is not set |
| 1056 | # CONFIG_HEADERS_CHECK is not set | 1060 | # CONFIG_HEADERS_CHECK is not set |
| 1057 | # CONFIG_DEBUG_KERNEL is not set | 1061 | # CONFIG_DEBUG_KERNEL is not set |
| 1062 | # CONFIG_SLUB_DEBUG_ON is not set | ||
| 1058 | CONFIG_DEBUG_BUGVERBOSE=y | 1063 | CONFIG_DEBUG_BUGVERBOSE=y |
| 1059 | CONFIG_FRAME_POINTER=y | 1064 | CONFIG_FRAME_POINTER=y |
| 1060 | # CONFIG_SAMPLES is not set | 1065 | # CONFIG_SAMPLES is not set |
| @@ -1066,51 +1071,7 @@ CONFIG_FRAME_POINTER=y | |||
| 1066 | # CONFIG_KEYS is not set | 1071 | # CONFIG_KEYS is not set |
| 1067 | # CONFIG_SECURITY is not set | 1072 | # CONFIG_SECURITY is not set |
| 1068 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1073 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1069 | CONFIG_CRYPTO=y | 1074 | # CONFIG_CRYPTO is not set |
| 1070 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1071 | # CONFIG_CRYPTO_MANAGER is not set | ||
| 1072 | # CONFIG_CRYPTO_HMAC is not set | ||
| 1073 | # CONFIG_CRYPTO_XCBC is not set | ||
| 1074 | # CONFIG_CRYPTO_NULL is not set | ||
| 1075 | # CONFIG_CRYPTO_MD4 is not set | ||
| 1076 | # CONFIG_CRYPTO_MD5 is not set | ||
| 1077 | # CONFIG_CRYPTO_SHA1 is not set | ||
| 1078 | # CONFIG_CRYPTO_SHA256 is not set | ||
| 1079 | # CONFIG_CRYPTO_SHA512 is not set | ||
| 1080 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1081 | # CONFIG_CRYPTO_TGR192 is not set | ||
| 1082 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1083 | # CONFIG_CRYPTO_ECB is not set | ||
| 1084 | # CONFIG_CRYPTO_CBC is not set | ||
| 1085 | # CONFIG_CRYPTO_PCBC is not set | ||
| 1086 | # CONFIG_CRYPTO_LRW is not set | ||
| 1087 | # CONFIG_CRYPTO_XTS is not set | ||
| 1088 | # CONFIG_CRYPTO_CTR is not set | ||
| 1089 | # CONFIG_CRYPTO_GCM is not set | ||
| 1090 | # CONFIG_CRYPTO_CCM is not set | ||
| 1091 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1092 | # CONFIG_CRYPTO_DES is not set | ||
| 1093 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1094 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1095 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1096 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1097 | # CONFIG_CRYPTO_AES is not set | ||
| 1098 | # CONFIG_CRYPTO_CAST5 is not set | ||
| 1099 | # CONFIG_CRYPTO_CAST6 is not set | ||
| 1100 | # CONFIG_CRYPTO_TEA is not set | ||
| 1101 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1102 | # CONFIG_CRYPTO_KHAZAD is not set | ||
| 1103 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1104 | # CONFIG_CRYPTO_SEED is not set | ||
| 1105 | # CONFIG_CRYPTO_SALSA20 is not set | ||
| 1106 | # CONFIG_CRYPTO_DEFLATE is not set | ||
| 1107 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1108 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1109 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1110 | # CONFIG_CRYPTO_TEST is not set | ||
| 1111 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1112 | # CONFIG_CRYPTO_LZO is not set | ||
| 1113 | CONFIG_CRYPTO_HW=y | ||
| 1114 | 1075 | ||
| 1115 | # | 1076 | # |
| 1116 | # Library routines | 1077 | # Library routines |
diff --git a/arch/arm/configs/omap_perseus2_730_defconfig b/arch/arm/configs/omap_perseus2_730_defconfig new file mode 100644 index 000000000000..b94800c0e000 --- /dev/null +++ b/arch/arm/configs/omap_perseus2_730_defconfig | |||
| @@ -0,0 +1,928 @@ | |||
| 1 | # | ||
| 2 | # Automatically generated make config: don't edit | ||
| 3 | # Linux kernel version: 2.6.23-rc6-omap1 | ||
| 4 | # Tue Sep 18 11:45:12 2007 | ||
| 5 | # | ||
| 6 | CONFIG_ARM=y | ||
| 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | ||
| 8 | CONFIG_GENERIC_GPIO=y | ||
| 9 | CONFIG_GENERIC_TIME=y | ||
| 10 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 11 | CONFIG_MMU=y | ||
| 12 | # CONFIG_NO_IOPORT is not set | ||
| 13 | CONFIG_GENERIC_HARDIRQS=y | ||
| 14 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 15 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 16 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
| 17 | CONFIG_HARDIRQS_SW_RESEND=y | ||
| 18 | CONFIG_GENERIC_IRQ_PROBE=y | ||
| 19 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
| 20 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
| 21 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
| 22 | CONFIG_GENERIC_HWEIGHT=y | ||
| 23 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
| 24 | CONFIG_ZONE_DMA=y | ||
| 25 | CONFIG_VECTORS_BASE=0xffff0000 | ||
| 26 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
| 27 | |||
| 28 | # | ||
| 29 | # General setup | ||
| 30 | # | ||
| 31 | CONFIG_EXPERIMENTAL=y | ||
| 32 | CONFIG_BROKEN_ON_SMP=y | ||
| 33 | CONFIG_LOCK_KERNEL=y | ||
| 34 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 35 | CONFIG_LOCALVERSION="" | ||
| 36 | CONFIG_LOCALVERSION_AUTO=y | ||
| 37 | CONFIG_SWAP=y | ||
| 38 | CONFIG_SYSVIPC=y | ||
| 39 | CONFIG_SYSVIPC_SYSCTL=y | ||
| 40 | # CONFIG_POSIX_MQUEUE is not set | ||
| 41 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 42 | # CONFIG_TASKSTATS is not set | ||
| 43 | # CONFIG_USER_NS is not set | ||
| 44 | # CONFIG_AUDIT is not set | ||
| 45 | # CONFIG_IKCONFIG is not set | ||
| 46 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 47 | CONFIG_SYSFS_DEPRECATED=y | ||
| 48 | # CONFIG_RELAY is not set | ||
| 49 | CONFIG_BLK_DEV_INITRD=y | ||
| 50 | CONFIG_INITRAMFS_SOURCE="" | ||
| 51 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
| 52 | CONFIG_SYSCTL=y | ||
| 53 | # CONFIG_EMBEDDED is not set | ||
| 54 | CONFIG_UID16=y | ||
| 55 | CONFIG_SYSCTL_SYSCALL=y | ||
| 56 | CONFIG_KALLSYMS=y | ||
| 57 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 58 | CONFIG_HOTPLUG=y | ||
| 59 | CONFIG_PRINTK=y | ||
| 60 | CONFIG_BUG=y | ||
| 61 | CONFIG_ELF_CORE=y | ||
| 62 | CONFIG_BASE_FULL=y | ||
| 63 | CONFIG_FUTEX=y | ||
| 64 | CONFIG_ANON_INODES=y | ||
| 65 | CONFIG_EPOLL=y | ||
| 66 | CONFIG_SIGNALFD=y | ||
| 67 | CONFIG_TIMERFD=y | ||
| 68 | CONFIG_EVENTFD=y | ||
| 69 | CONFIG_SHMEM=y | ||
| 70 | CONFIG_VM_EVENT_COUNTERS=y | ||
| 71 | CONFIG_SLAB=y | ||
| 72 | # CONFIG_SLUB is not set | ||
| 73 | # CONFIG_SLOB is not set | ||
| 74 | CONFIG_RT_MUTEXES=y | ||
| 75 | # CONFIG_TINY_SHMEM is not set | ||
| 76 | CONFIG_BASE_SMALL=0 | ||
| 77 | CONFIG_MODULES=y | ||
| 78 | CONFIG_MODULE_UNLOAD=y | ||
| 79 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 80 | # CONFIG_MODVERSIONS is not set | ||
| 81 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 82 | CONFIG_KMOD=y | ||
| 83 | CONFIG_BLOCK=y | ||
| 84 | # CONFIG_LBD is not set | ||
| 85 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 86 | # CONFIG_LSF is not set | ||
| 87 | # CONFIG_BLK_DEV_BSG is not set | ||
| 88 | |||
| 89 | # | ||
| 90 | # IO Schedulers | ||
| 91 | # | ||
| 92 | CONFIG_IOSCHED_NOOP=y | ||
| 93 | CONFIG_IOSCHED_AS=y | ||
| 94 | CONFIG_IOSCHED_DEADLINE=y | ||
| 95 | CONFIG_IOSCHED_CFQ=y | ||
| 96 | # CONFIG_DEFAULT_AS is not set | ||
| 97 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 98 | CONFIG_DEFAULT_CFQ=y | ||
| 99 | # CONFIG_DEFAULT_NOOP is not set | ||
| 100 | CONFIG_DEFAULT_IOSCHED="cfq" | ||
| 101 | |||
| 102 | # | ||
| 103 | # System Type | ||
| 104 | # | ||
| 105 | # CONFIG_ARCH_AAEC2000 is not set | ||
| 106 | # CONFIG_ARCH_INTEGRATOR is not set | ||
| 107 | # CONFIG_ARCH_REALVIEW is not set | ||
| 108 | # CONFIG_ARCH_VERSATILE is not set | ||
| 109 | # CONFIG_ARCH_AT91 is not set | ||
| 110 | # CONFIG_ARCH_CLPS7500 is not set | ||
| 111 | # CONFIG_ARCH_CLPS711X is not set | ||
| 112 | # CONFIG_ARCH_CO285 is not set | ||
| 113 | # CONFIG_ARCH_EBSA110 is not set | ||
| 114 | # CONFIG_ARCH_EP93XX is not set | ||
| 115 | # CONFIG_ARCH_FOOTBRIDGE is not set | ||
| 116 | # CONFIG_ARCH_NETX is not set | ||
| 117 | # CONFIG_ARCH_H720X is not set | ||
| 118 | # CONFIG_ARCH_IMX is not set | ||
| 119 | # CONFIG_ARCH_IOP13XX is not set | ||
| 120 | # CONFIG_ARCH_IOP32X is not set | ||
| 121 | # CONFIG_ARCH_IOP33X is not set | ||
| 122 | # CONFIG_ARCH_IXP23XX is not set | ||
| 123 | # CONFIG_ARCH_IXP2000 is not set | ||
| 124 | # CONFIG_ARCH_IXP4XX is not set | ||
| 125 | # CONFIG_ARCH_L7200 is not set | ||
| 126 | # CONFIG_ARCH_KS8695 is not set | ||
| 127 | # CONFIG_ARCH_NS9XXX is not set | ||
| 128 | # CONFIG_ARCH_MXC is not set | ||
| 129 | # CONFIG_ARCH_PNX4008 is not set | ||
| 130 | # CONFIG_ARCH_PXA is not set | ||
| 131 | # CONFIG_ARCH_RPC is not set | ||
| 132 | # CONFIG_ARCH_SA1100 is not set | ||
| 133 | # CONFIG_ARCH_S3C2410 is not set | ||
| 134 | # CONFIG_ARCH_SHARK is not set | ||
| 135 | # CONFIG_ARCH_LH7A40X is not set | ||
| 136 | # CONFIG_ARCH_DAVINCI is not set | ||
| 137 | CONFIG_ARCH_OMAP=y | ||
| 138 | |||
| 139 | # | ||
| 140 | # TI OMAP Implementations | ||
| 141 | # | ||
| 142 | CONFIG_ARCH_OMAP_OTG=y | ||
| 143 | CONFIG_ARCH_OMAP1=y | ||
| 144 | # CONFIG_ARCH_OMAP2 is not set | ||
| 145 | # CONFIG_ARCH_OMAP3 is not set | ||
| 146 | |||
| 147 | # | ||
| 148 | # OMAP Feature Selections | ||
| 149 | # | ||
| 150 | # CONFIG_OMAP_RESET_CLOCKS is not set | ||
| 151 | # CONFIG_OMAP_BOOT_TAG is not set | ||
| 152 | # CONFIG_OMAP_GPIO_SWITCH is not set | ||
| 153 | CONFIG_OMAP_MUX=y | ||
| 154 | # CONFIG_OMAP_MUX_DEBUG is not set | ||
| 155 | CONFIG_OMAP_MUX_WARNINGS=y | ||
| 156 | CONFIG_OMAP_MCBSP=y | ||
| 157 | # CONFIG_OMAP_MMU_FWK is not set | ||
| 158 | # CONFIG_OMAP_MBOX_FWK is not set | ||
| 159 | CONFIG_OMAP_MPU_TIMER=y | ||
| 160 | # CONFIG_OMAP_32K_TIMER is not set | ||
| 161 | CONFIG_OMAP_LL_DEBUG_UART1=y | ||
| 162 | # CONFIG_OMAP_LL_DEBUG_UART2 is not set | ||
| 163 | # CONFIG_OMAP_LL_DEBUG_UART3 is not set | ||
| 164 | CONFIG_OMAP_SERIAL_WAKE=y | ||
| 165 | |||
| 166 | # | ||
| 167 | # OMAP Core Type | ||
| 168 | # | ||
| 169 | CONFIG_ARCH_OMAP730=y | ||
| 170 | # CONFIG_ARCH_OMAP15XX is not set | ||
| 171 | # CONFIG_ARCH_OMAP16XX is not set | ||
| 172 | |||
| 173 | # | ||
| 174 | # OMAP Board Type | ||
| 175 | # | ||
| 176 | CONFIG_MACH_OMAP_PERSEUS2=y | ||
| 177 | # CONFIG_MACH_OMAP_FSAMPLE is not set | ||
| 178 | |||
| 179 | # | ||
| 180 | # OMAP CPU Speed | ||
| 181 | # | ||
| 182 | # CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER is not set | ||
| 183 | # CONFIG_OMAP_ARM_195MHZ is not set | ||
| 184 | CONFIG_OMAP_ARM_182MHZ=y | ||
| 185 | # CONFIG_OMAP_ARM_168MHZ is not set | ||
| 186 | # CONFIG_OMAP_ARM_120MHZ is not set | ||
| 187 | # CONFIG_OMAP_ARM_60MHZ is not set | ||
| 188 | # CONFIG_OMAP_ARM_30MHZ is not set | ||
| 189 | # CONFIG_MACH_OMAP_APOLLON_PLUS is not set | ||
| 190 | |||
| 191 | # | ||
| 192 | # Boot options | ||
| 193 | # | ||
| 194 | |||
| 195 | # | ||
| 196 | # Power management | ||
| 197 | # | ||
| 198 | |||
| 199 | # | ||
| 200 | # Processor Type | ||
| 201 | # | ||
| 202 | CONFIG_CPU_32=y | ||
| 203 | CONFIG_CPU_ARM926T=y | ||
| 204 | CONFIG_CPU_32v5=y | ||
| 205 | CONFIG_CPU_ABRT_EV5TJ=y | ||
| 206 | CONFIG_CPU_PABRT_NOIFAR=y | ||
| 207 | CONFIG_CPU_CACHE_VIVT=y | ||
| 208 | CONFIG_CPU_COPY_V4WB=y | ||
| 209 | CONFIG_CPU_TLB_V4WBI=y | ||
| 210 | CONFIG_CPU_CP15=y | ||
| 211 | CONFIG_CPU_CP15_MMU=y | ||
| 212 | |||
| 213 | # | ||
| 214 | # Processor Features | ||
| 215 | # | ||
| 216 | # CONFIG_ARM_THUMB is not set | ||
| 217 | # CONFIG_CPU_ICACHE_DISABLE is not set | ||
| 218 | # CONFIG_CPU_DCACHE_DISABLE is not set | ||
| 219 | # CONFIG_CPU_DCACHE_WRITETHROUGH is not set | ||
| 220 | # CONFIG_CPU_CACHE_ROUND_ROBIN is not set | ||
| 221 | # CONFIG_OUTER_CACHE is not set | ||
| 222 | |||
| 223 | # | ||
| 224 | # Bus support | ||
| 225 | # | ||
| 226 | # CONFIG_PCI_SYSCALL is not set | ||
| 227 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 228 | |||
| 229 | # | ||
| 230 | # PCCARD (PCMCIA/CardBus) support | ||
| 231 | # | ||
| 232 | # CONFIG_PCCARD is not set | ||
| 233 | |||
| 234 | # | ||
| 235 | # Kernel Features | ||
| 236 | # | ||
| 237 | # CONFIG_TICK_ONESHOT is not set | ||
| 238 | # CONFIG_NO_HZ is not set | ||
| 239 | # CONFIG_HIGH_RES_TIMERS is not set | ||
| 240 | CONFIG_PREEMPT=y | ||
| 241 | CONFIG_HZ=100 | ||
| 242 | # CONFIG_AEABI is not set | ||
| 243 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | ||
| 244 | CONFIG_SELECT_MEMORY_MODEL=y | ||
| 245 | CONFIG_FLATMEM_MANUAL=y | ||
| 246 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
| 247 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
| 248 | CONFIG_FLATMEM=y | ||
| 249 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
| 250 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 251 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | ||
| 252 | # CONFIG_RESOURCES_64BIT is not set | ||
| 253 | CONFIG_ZONE_DMA_FLAG=1 | ||
| 254 | CONFIG_BOUNCE=y | ||
| 255 | CONFIG_VIRT_TO_BUS=y | ||
| 256 | CONFIG_LEDS=y | ||
| 257 | CONFIG_LEDS_CPU=y | ||
| 258 | CONFIG_ALIGNMENT_TRAP=y | ||
| 259 | |||
| 260 | # | ||
| 261 | # Boot options | ||
| 262 | # | ||
| 263 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
| 264 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
| 265 | CONFIG_CMDLINE="mem=32M console=ttyS0,115200 ip=dhcp" | ||
| 266 | # CONFIG_XIP_KERNEL is not set | ||
| 267 | # CONFIG_KEXEC is not set | ||
| 268 | |||
| 269 | # | ||
| 270 | # CPU Frequency scaling | ||
| 271 | # | ||
| 272 | # CONFIG_CPU_FREQ is not set | ||
| 273 | |||
| 274 | # | ||
| 275 | # Floating point emulation | ||
| 276 | # | ||
| 277 | |||
| 278 | # | ||
| 279 | # At least one emulation must be selected | ||
| 280 | # | ||
| 281 | CONFIG_FPE_NWFPE=y | ||
| 282 | # CONFIG_FPE_NWFPE_XP is not set | ||
| 283 | # CONFIG_FPE_FASTFPE is not set | ||
| 284 | # CONFIG_VFP is not set | ||
| 285 | |||
| 286 | # | ||
| 287 | # Userspace binary formats | ||
| 288 | # | ||
| 289 | CONFIG_BINFMT_ELF=y | ||
| 290 | # CONFIG_BINFMT_AOUT is not set | ||
| 291 | # CONFIG_BINFMT_MISC is not set | ||
| 292 | # CONFIG_ARTHUR is not set | ||
| 293 | |||
| 294 | # | ||
| 295 | # Power management options | ||
| 296 | # | ||
| 297 | CONFIG_PM=y | ||
| 298 | # CONFIG_PM_LEGACY is not set | ||
| 299 | # CONFIG_PM_DEBUG is not set | ||
| 300 | CONFIG_PM_SLEEP=y | ||
| 301 | CONFIG_SUSPEND_UP_POSSIBLE=y | ||
| 302 | CONFIG_SUSPEND=y | ||
| 303 | # CONFIG_APM_EMULATION is not set | ||
| 304 | |||
| 305 | # | ||
| 306 | # Networking | ||
| 307 | # | ||
| 308 | CONFIG_NET=y | ||
| 309 | |||
| 310 | # | ||
| 311 | # Networking options | ||
| 312 | # | ||
| 313 | CONFIG_PACKET=y | ||
| 314 | # CONFIG_PACKET_MMAP is not set | ||
| 315 | CONFIG_UNIX=y | ||
| 316 | CONFIG_XFRM=y | ||
| 317 | # CONFIG_XFRM_USER is not set | ||
| 318 | # CONFIG_XFRM_SUB_POLICY is not set | ||
| 319 | # CONFIG_XFRM_MIGRATE is not set | ||
| 320 | # CONFIG_NET_KEY is not set | ||
| 321 | CONFIG_INET=y | ||
| 322 | CONFIG_IP_MULTICAST=y | ||
| 323 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
| 324 | CONFIG_IP_FIB_HASH=y | ||
| 325 | CONFIG_IP_PNP=y | ||
| 326 | CONFIG_IP_PNP_DHCP=y | ||
| 327 | CONFIG_IP_PNP_BOOTP=y | ||
| 328 | # CONFIG_IP_PNP_RARP is not set | ||
| 329 | # CONFIG_NET_IPIP is not set | ||
| 330 | # CONFIG_NET_IPGRE is not set | ||
| 331 | # CONFIG_IP_MROUTE is not set | ||
| 332 | # CONFIG_ARPD is not set | ||
| 333 | # CONFIG_SYN_COOKIES is not set | ||
| 334 | # CONFIG_INET_AH is not set | ||
| 335 | # CONFIG_INET_ESP is not set | ||
| 336 | # CONFIG_INET_IPCOMP is not set | ||
| 337 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
| 338 | # CONFIG_INET_TUNNEL is not set | ||
| 339 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | ||
| 340 | CONFIG_INET_XFRM_MODE_TUNNEL=y | ||
| 341 | CONFIG_INET_XFRM_MODE_BEET=y | ||
| 342 | CONFIG_INET_DIAG=y | ||
| 343 | CONFIG_INET_TCP_DIAG=y | ||
| 344 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
| 345 | CONFIG_TCP_CONG_CUBIC=y | ||
| 346 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
| 347 | # CONFIG_TCP_MD5SIG is not set | ||
| 348 | # CONFIG_IPV6 is not set | ||
| 349 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 350 | # CONFIG_INET6_TUNNEL is not set | ||
| 351 | # CONFIG_NETWORK_SECMARK is not set | ||
| 352 | # CONFIG_NETFILTER is not set | ||
| 353 | # CONFIG_IP_DCCP is not set | ||
| 354 | # CONFIG_IP_SCTP is not set | ||
| 355 | # CONFIG_TIPC is not set | ||
| 356 | # CONFIG_ATM is not set | ||
| 357 | # CONFIG_BRIDGE is not set | ||
| 358 | # CONFIG_VLAN_8021Q is not set | ||
| 359 | # CONFIG_DECNET is not set | ||
| 360 | # CONFIG_LLC2 is not set | ||
| 361 | # CONFIG_IPX is not set | ||
| 362 | # CONFIG_ATALK is not set | ||
| 363 | # CONFIG_X25 is not set | ||
| 364 | # CONFIG_LAPB is not set | ||
| 365 | # CONFIG_ECONET is not set | ||
| 366 | # CONFIG_WAN_ROUTER is not set | ||
| 367 | |||
| 368 | # | ||
| 369 | # QoS and/or fair queueing | ||
| 370 | # | ||
| 371 | # CONFIG_NET_SCHED is not set | ||
| 372 | |||
| 373 | # | ||
| 374 | # Network testing | ||
| 375 | # | ||
| 376 | # CONFIG_NET_PKTGEN is not set | ||
| 377 | # CONFIG_HAMRADIO is not set | ||
| 378 | # CONFIG_IRDA is not set | ||
| 379 | # CONFIG_BT is not set | ||
| 380 | # CONFIG_AF_RXRPC is not set | ||
| 381 | |||
| 382 | # | ||
| 383 | # Wireless | ||
| 384 | # | ||
| 385 | # CONFIG_CFG80211 is not set | ||
| 386 | # CONFIG_WIRELESS_EXT is not set | ||
| 387 | # CONFIG_MAC80211 is not set | ||
| 388 | # CONFIG_IEEE80211 is not set | ||
| 389 | # CONFIG_RFKILL is not set | ||
| 390 | # CONFIG_NET_9P is not set | ||
| 391 | |||
| 392 | # | ||
| 393 | # Device Drivers | ||
| 394 | # | ||
| 395 | |||
| 396 | # | ||
| 397 | # Generic Driver Options | ||
| 398 | # | ||
| 399 | CONFIG_STANDALONE=y | ||
| 400 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
| 401 | # CONFIG_FW_LOADER is not set | ||
| 402 | # CONFIG_SYS_HYPERVISOR is not set | ||
| 403 | # CONFIG_CONNECTOR is not set | ||
| 404 | CONFIG_MTD=y | ||
| 405 | # CONFIG_MTD_DEBUG is not set | ||
| 406 | # CONFIG_MTD_CONCAT is not set | ||
| 407 | CONFIG_MTD_PARTITIONS=y | ||
| 408 | # CONFIG_MTD_REDBOOT_PARTS is not set | ||
| 409 | CONFIG_MTD_CMDLINE_PARTS=y | ||
| 410 | # CONFIG_MTD_AFS_PARTS is not set | ||
| 411 | |||
| 412 | # | ||
| 413 | # User Modules And Translation Layers | ||
| 414 | # | ||
| 415 | CONFIG_MTD_CHAR=y | ||
| 416 | CONFIG_MTD_BLKDEVS=y | ||
| 417 | CONFIG_MTD_BLOCK=y | ||
| 418 | # CONFIG_FTL is not set | ||
| 419 | # CONFIG_NFTL is not set | ||
| 420 | # CONFIG_INFTL is not set | ||
| 421 | # CONFIG_RFD_FTL is not set | ||
| 422 | # CONFIG_SSFDC is not set | ||
| 423 | |||
| 424 | # | ||
| 425 | # RAM/ROM/Flash chip drivers | ||
| 426 | # | ||
| 427 | CONFIG_MTD_CFI=y | ||
| 428 | # CONFIG_MTD_JEDECPROBE is not set | ||
| 429 | CONFIG_MTD_GEN_PROBE=y | ||
| 430 | # CONFIG_MTD_CFI_ADV_OPTIONS is not set | ||
| 431 | CONFIG_MTD_MAP_BANK_WIDTH_1=y | ||
| 432 | CONFIG_MTD_MAP_BANK_WIDTH_2=y | ||
| 433 | CONFIG_MTD_MAP_BANK_WIDTH_4=y | ||
| 434 | # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set | ||
| 435 | # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set | ||
| 436 | # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set | ||
| 437 | CONFIG_MTD_CFI_I1=y | ||
| 438 | CONFIG_MTD_CFI_I2=y | ||
| 439 | # CONFIG_MTD_CFI_I4 is not set | ||
| 440 | # CONFIG_MTD_CFI_I8 is not set | ||
| 441 | CONFIG_MTD_CFI_INTELEXT=y | ||
| 442 | # CONFIG_MTD_CFI_AMDSTD is not set | ||
| 443 | # CONFIG_MTD_CFI_STAA is not set | ||
| 444 | CONFIG_MTD_CFI_UTIL=y | ||
| 445 | # CONFIG_MTD_RAM is not set | ||
| 446 | # CONFIG_MTD_ROM is not set | ||
| 447 | # CONFIG_MTD_ABSENT is not set | ||
| 448 | |||
| 449 | # | ||
| 450 | # Mapping drivers for chip access | ||
| 451 | # | ||
| 452 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | ||
| 453 | # CONFIG_MTD_PHYSMAP is not set | ||
| 454 | # CONFIG_MTD_ARM_INTEGRATOR is not set | ||
| 455 | CONFIG_MTD_OMAP_NOR=y | ||
| 456 | # CONFIG_MTD_PLATRAM is not set | ||
| 457 | |||
| 458 | # | ||
| 459 | # Self-contained MTD device drivers | ||
| 460 | # | ||
| 461 | # CONFIG_MTD_SLRAM is not set | ||
| 462 | # CONFIG_MTD_PHRAM is not set | ||
| 463 | # CONFIG_MTD_MTDRAM is not set | ||
| 464 | # CONFIG_MTD_BLOCK2MTD is not set | ||
| 465 | |||
| 466 | # | ||
| 467 | # Disk-On-Chip Device Drivers | ||
| 468 | # | ||
| 469 | # CONFIG_MTD_DOC2000 is not set | ||
| 470 | # CONFIG_MTD_DOC2001 is not set | ||
| 471 | # CONFIG_MTD_DOC2001PLUS is not set | ||
| 472 | CONFIG_MTD_NAND=y | ||
| 473 | # CONFIG_MTD_NAND_VERIFY_WRITE is not set | ||
| 474 | # CONFIG_MTD_NAND_ECC_SMC is not set | ||
| 475 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set | ||
| 476 | CONFIG_MTD_NAND_OMAP=y | ||
| 477 | CONFIG_MTD_NAND_IDS=y | ||
| 478 | # CONFIG_MTD_NAND_DISKONCHIP is not set | ||
| 479 | # CONFIG_MTD_NAND_NANDSIM is not set | ||
| 480 | # CONFIG_MTD_NAND_PLATFORM is not set | ||
| 481 | # CONFIG_MTD_ONENAND is not set | ||
| 482 | |||
| 483 | # | ||
| 484 | # UBI - Unsorted block images | ||
| 485 | # | ||
| 486 | # CONFIG_MTD_UBI is not set | ||
| 487 | # CONFIG_PARPORT is not set | ||
| 488 | CONFIG_BLK_DEV=y | ||
| 489 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
| 490 | CONFIG_BLK_DEV_LOOP=y | ||
| 491 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | ||
| 492 | # CONFIG_BLK_DEV_NBD is not set | ||
| 493 | CONFIG_BLK_DEV_RAM=y | ||
| 494 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
| 495 | CONFIG_BLK_DEV_RAM_SIZE=8192 | ||
| 496 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | ||
| 497 | # CONFIG_CDROM_PKTCDVD is not set | ||
| 498 | # CONFIG_ATA_OVER_ETH is not set | ||
| 499 | |||
| 500 | # | ||
| 501 | # SCSI device support | ||
| 502 | # | ||
| 503 | # CONFIG_RAID_ATTRS is not set | ||
| 504 | # CONFIG_SCSI is not set | ||
| 505 | # CONFIG_SCSI_DMA is not set | ||
| 506 | # CONFIG_SCSI_NETLINK is not set | ||
| 507 | # CONFIG_ATA is not set | ||
| 508 | # CONFIG_MD is not set | ||
| 509 | CONFIG_NETDEVICES=y | ||
| 510 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 511 | # CONFIG_DUMMY is not set | ||
| 512 | # CONFIG_BONDING is not set | ||
| 513 | # CONFIG_MACVLAN is not set | ||
| 514 | # CONFIG_EQUALIZER is not set | ||
| 515 | # CONFIG_TUN is not set | ||
| 516 | # CONFIG_PHYLIB is not set | ||
| 517 | CONFIG_NET_ETHERNET=y | ||
| 518 | CONFIG_MII=y | ||
| 519 | # CONFIG_AX88796 is not set | ||
| 520 | CONFIG_SMC91X=y | ||
| 521 | # CONFIG_DM9000 is not set | ||
| 522 | CONFIG_NETDEV_1000=y | ||
| 523 | CONFIG_NETDEV_10000=y | ||
| 524 | |||
| 525 | # | ||
| 526 | # Wireless LAN | ||
| 527 | # | ||
| 528 | # CONFIG_WLAN_PRE80211 is not set | ||
| 529 | # CONFIG_WLAN_80211 is not set | ||
| 530 | # CONFIG_WAN is not set | ||
| 531 | # CONFIG_PPP is not set | ||
| 532 | # CONFIG_SLIP is not set | ||
| 533 | # CONFIG_SHAPER is not set | ||
| 534 | # CONFIG_NETCONSOLE is not set | ||
| 535 | # CONFIG_NETPOLL is not set | ||
| 536 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
| 537 | # CONFIG_ISDN is not set | ||
| 538 | |||
| 539 | # | ||
| 540 | # Input device support | ||
| 541 | # | ||
| 542 | CONFIG_INPUT=y | ||
| 543 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
| 544 | # CONFIG_INPUT_POLLDEV is not set | ||
| 545 | |||
| 546 | # | ||
| 547 | # Userland interfaces | ||
| 548 | # | ||
| 549 | CONFIG_INPUT_MOUSEDEV=y | ||
| 550 | CONFIG_INPUT_MOUSEDEV_PSAUX=y | ||
| 551 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | ||
| 552 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | ||
| 553 | # CONFIG_INPUT_JOYDEV is not set | ||
| 554 | # CONFIG_INPUT_TSDEV is not set | ||
| 555 | # CONFIG_INPUT_EVDEV is not set | ||
| 556 | # CONFIG_INPUT_EVBUG is not set | ||
| 557 | |||
| 558 | # | ||
| 559 | # Input Device Drivers | ||
| 560 | # | ||
| 561 | CONFIG_INPUT_KEYBOARD=y | ||
| 562 | # CONFIG_KEYBOARD_ATKBD is not set | ||
| 563 | # CONFIG_KEYBOARD_SUNKBD is not set | ||
| 564 | # CONFIG_KEYBOARD_LKKBD is not set | ||
| 565 | # CONFIG_KEYBOARD_XTKBD is not set | ||
| 566 | # CONFIG_KEYBOARD_NEWTON is not set | ||
| 567 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
| 568 | CONFIG_KEYBOARD_OMAP=y | ||
| 569 | # CONFIG_KEYBOARD_GPIO is not set | ||
| 570 | # CONFIG_INPUT_MOUSE is not set | ||
| 571 | # CONFIG_INPUT_JOYSTICK is not set | ||
| 572 | # CONFIG_INPUT_TABLET is not set | ||
| 573 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
| 574 | # CONFIG_INPUT_MISC is not set | ||
| 575 | |||
| 576 | # | ||
| 577 | # Hardware I/O ports | ||
| 578 | # | ||
| 579 | CONFIG_SERIO=y | ||
| 580 | CONFIG_SERIO_SERPORT=y | ||
| 581 | # CONFIG_SERIO_RAW is not set | ||
| 582 | # CONFIG_GAMEPORT is not set | ||
| 583 | |||
| 584 | # | ||
| 585 | # Character devices | ||
| 586 | # | ||
| 587 | CONFIG_VT=y | ||
| 588 | CONFIG_VT_CONSOLE=y | ||
| 589 | CONFIG_HW_CONSOLE=y | ||
| 590 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
| 591 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
| 592 | |||
| 593 | # | ||
| 594 | # Serial drivers | ||
| 595 | # | ||
| 596 | CONFIG_SERIAL_8250=y | ||
| 597 | CONFIG_SERIAL_8250_CONSOLE=y | ||
| 598 | CONFIG_SERIAL_8250_NR_UARTS=4 | ||
| 599 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | ||
| 600 | # CONFIG_SERIAL_8250_EXTENDED is not set | ||
| 601 | |||
| 602 | # | ||
| 603 | # Non-8250 serial port support | ||
| 604 | # | ||
| 605 | CONFIG_SERIAL_CORE=y | ||
| 606 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
| 607 | CONFIG_UNIX98_PTYS=y | ||
| 608 | # CONFIG_LEGACY_PTYS is not set | ||
| 609 | # CONFIG_IPMI_HANDLER is not set | ||
| 610 | # CONFIG_WATCHDOG is not set | ||
| 611 | CONFIG_HW_RANDOM=m | ||
| 612 | # CONFIG_NVRAM is not set | ||
| 613 | # CONFIG_R3964 is not set | ||
| 614 | # CONFIG_RAW_DRIVER is not set | ||
| 615 | # CONFIG_TCG_TPM is not set | ||
| 616 | # CONFIG_I2C is not set | ||
| 617 | |||
| 618 | # | ||
| 619 | # SPI support | ||
| 620 | # | ||
| 621 | # CONFIG_SPI is not set | ||
| 622 | # CONFIG_SPI_MASTER is not set | ||
| 623 | # CONFIG_W1 is not set | ||
| 624 | CONFIG_HWMON=y | ||
| 625 | # CONFIG_HWMON_VID is not set | ||
| 626 | # CONFIG_SENSORS_ABITUGURU is not set | ||
| 627 | # CONFIG_SENSORS_ABITUGURU3 is not set | ||
| 628 | # CONFIG_SENSORS_F71805F is not set | ||
| 629 | # CONFIG_SENSORS_IT87 is not set | ||
| 630 | # CONFIG_SENSORS_PC87360 is not set | ||
| 631 | # CONFIG_SENSORS_PC87427 is not set | ||
| 632 | # CONFIG_SENSORS_SMSC47M1 is not set | ||
| 633 | # CONFIG_SENSORS_SMSC47B397 is not set | ||
| 634 | # CONFIG_SENSORS_VT1211 is not set | ||
| 635 | # CONFIG_SENSORS_W83627HF is not set | ||
| 636 | # CONFIG_SENSORS_W83627EHF is not set | ||
| 637 | # CONFIG_HWMON_DEBUG_CHIP is not set | ||
| 638 | CONFIG_MISC_DEVICES=y | ||
| 639 | # CONFIG_EEPROM_93CX6 is not set | ||
| 640 | |||
| 641 | # | ||
| 642 | # Multifunction device drivers | ||
| 643 | # | ||
| 644 | # CONFIG_MFD_SM501 is not set | ||
| 645 | # CONFIG_NEW_LEDS is not set | ||
| 646 | |||
| 647 | # | ||
| 648 | # Multimedia devices | ||
| 649 | # | ||
| 650 | # CONFIG_VIDEO_DEV is not set | ||
| 651 | # CONFIG_DVB_CORE is not set | ||
| 652 | CONFIG_DAB=y | ||
| 653 | |||
| 654 | # | ||
| 655 | # Graphics support | ||
| 656 | # | ||
| 657 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 658 | |||
| 659 | # | ||
| 660 | # Display device support | ||
| 661 | # | ||
| 662 | # CONFIG_DISPLAY_SUPPORT is not set | ||
| 663 | # CONFIG_VGASTATE is not set | ||
| 664 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
| 665 | CONFIG_FB=y | ||
| 666 | # CONFIG_FIRMWARE_EDID is not set | ||
| 667 | # CONFIG_FB_DDC is not set | ||
| 668 | # CONFIG_FB_CFB_FILLRECT is not set | ||
| 669 | # CONFIG_FB_CFB_COPYAREA is not set | ||
| 670 | # CONFIG_FB_CFB_IMAGEBLIT is not set | ||
| 671 | CONFIG_FB_SYS_FILLRECT=y | ||
| 672 | CONFIG_FB_SYS_COPYAREA=y | ||
| 673 | CONFIG_FB_SYS_IMAGEBLIT=y | ||
| 674 | CONFIG_FB_SYS_FOPS=y | ||
| 675 | CONFIG_FB_DEFERRED_IO=y | ||
| 676 | # CONFIG_FB_SVGALIB is not set | ||
| 677 | # CONFIG_FB_MACMODES is not set | ||
| 678 | # CONFIG_FB_BACKLIGHT is not set | ||
| 679 | CONFIG_FB_MODE_HELPERS=y | ||
| 680 | # CONFIG_FB_TILEBLITTING is not set | ||
| 681 | |||
| 682 | # | ||
| 683 | # Frame buffer hardware drivers | ||
| 684 | # | ||
| 685 | # CONFIG_FB_S1D13XXX is not set | ||
| 686 | # CONFIG_FB_OMAP is not set | ||
| 687 | CONFIG_FB_VIRTUAL=y | ||
| 688 | |||
| 689 | # | ||
| 690 | # Console display driver support | ||
| 691 | # | ||
| 692 | # CONFIG_VGA_CONSOLE is not set | ||
| 693 | CONFIG_DUMMY_CONSOLE=y | ||
| 694 | # CONFIG_FRAMEBUFFER_CONSOLE is not set | ||
| 695 | # CONFIG_LOGO is not set | ||
| 696 | |||
| 697 | # | ||
| 698 | # Sound | ||
| 699 | # | ||
| 700 | # CONFIG_SOUND is not set | ||
| 701 | CONFIG_HID_SUPPORT=y | ||
| 702 | CONFIG_HID=y | ||
| 703 | # CONFIG_HID_DEBUG is not set | ||
| 704 | CONFIG_USB_SUPPORT=y | ||
| 705 | CONFIG_USB_ARCH_HAS_HCD=y | ||
| 706 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
| 707 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
| 708 | # CONFIG_USB is not set | ||
| 709 | |||
| 710 | # | ||
| 711 | # Enable Host or Gadget support to see Inventra options | ||
| 712 | # | ||
| 713 | |||
| 714 | # | ||
| 715 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
| 716 | # | ||
| 717 | |||
| 718 | # | ||
| 719 | # USB Gadget Support | ||
| 720 | # | ||
| 721 | # CONFIG_USB_GADGET is not set | ||
| 722 | # CONFIG_MMC is not set | ||
| 723 | CONFIG_RTC_LIB=y | ||
| 724 | CONFIG_RTC_CLASS=y | ||
| 725 | CONFIG_RTC_HCTOSYS=y | ||
| 726 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
| 727 | # CONFIG_RTC_DEBUG is not set | ||
| 728 | |||
| 729 | # | ||
| 730 | # RTC interfaces | ||
| 731 | # | ||
| 732 | CONFIG_RTC_INTF_SYSFS=y | ||
| 733 | CONFIG_RTC_INTF_PROC=y | ||
| 734 | CONFIG_RTC_INTF_DEV=y | ||
| 735 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
| 736 | # CONFIG_RTC_DRV_TEST is not set | ||
| 737 | |||
| 738 | # | ||
| 739 | # SPI RTC drivers | ||
| 740 | # | ||
| 741 | |||
| 742 | # | ||
| 743 | # Platform RTC drivers | ||
| 744 | # | ||
| 745 | # CONFIG_RTC_DRV_CMOS is not set | ||
| 746 | # CONFIG_RTC_DRV_DS1553 is not set | ||
| 747 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 748 | # CONFIG_RTC_DRV_DS1742 is not set | ||
| 749 | # CONFIG_RTC_DRV_M48T86 is not set | ||
| 750 | # CONFIG_RTC_DRV_M48T59 is not set | ||
| 751 | # CONFIG_RTC_DRV_V3020 is not set | ||
| 752 | |||
| 753 | # | ||
| 754 | # on-CPU RTC drivers | ||
| 755 | # | ||
| 756 | CONFIG_RTC_DRV_OMAP=y | ||
| 757 | |||
| 758 | # | ||
| 759 | # DMA Engine support | ||
| 760 | # | ||
| 761 | # CONFIG_DMA_ENGINE is not set | ||
| 762 | |||
| 763 | # | ||
| 764 | # DMA Clients | ||
| 765 | # | ||
| 766 | |||
| 767 | # | ||
| 768 | # DMA Devices | ||
| 769 | # | ||
| 770 | |||
| 771 | # | ||
| 772 | # CBUS support | ||
| 773 | # | ||
| 774 | # CONFIG_CBUS is not set | ||
| 775 | |||
| 776 | # | ||
| 777 | # File systems | ||
| 778 | # | ||
| 779 | CONFIG_EXT2_FS=y | ||
| 780 | # CONFIG_EXT2_FS_XATTR is not set | ||
| 781 | # CONFIG_EXT2_FS_XIP is not set | ||
| 782 | # CONFIG_EXT3_FS is not set | ||
| 783 | # CONFIG_EXT4DEV_FS is not set | ||
| 784 | # CONFIG_REISERFS_FS is not set | ||
| 785 | # CONFIG_JFS_FS is not set | ||
| 786 | # CONFIG_FS_POSIX_ACL is not set | ||
| 787 | # CONFIG_XFS_FS is not set | ||
| 788 | # CONFIG_GFS2_FS is not set | ||
| 789 | # CONFIG_OCFS2_FS is not set | ||
| 790 | # CONFIG_MINIX_FS is not set | ||
| 791 | # CONFIG_ROMFS_FS is not set | ||
| 792 | CONFIG_INOTIFY=y | ||
| 793 | CONFIG_INOTIFY_USER=y | ||
| 794 | # CONFIG_QUOTA is not set | ||
| 795 | CONFIG_DNOTIFY=y | ||
| 796 | # CONFIG_AUTOFS_FS is not set | ||
| 797 | # CONFIG_AUTOFS4_FS is not set | ||
| 798 | # CONFIG_FUSE_FS is not set | ||
| 799 | |||
| 800 | # | ||
| 801 | # CD-ROM/DVD Filesystems | ||
| 802 | # | ||
| 803 | # CONFIG_ISO9660_FS is not set | ||
| 804 | # CONFIG_UDF_FS is not set | ||
| 805 | |||
| 806 | # | ||
| 807 | # DOS/FAT/NT Filesystems | ||
| 808 | # | ||
| 809 | # CONFIG_MSDOS_FS is not set | ||
| 810 | # CONFIG_VFAT_FS is not set | ||
| 811 | # CONFIG_NTFS_FS is not set | ||
| 812 | |||
| 813 | # | ||
| 814 | # Pseudo filesystems | ||
| 815 | # | ||
| 816 | CONFIG_PROC_FS=y | ||
| 817 | CONFIG_PROC_SYSCTL=y | ||
| 818 | CONFIG_SYSFS=y | ||
| 819 | # CONFIG_TMPFS is not set | ||
| 820 | # CONFIG_HUGETLB_PAGE is not set | ||
| 821 | CONFIG_RAMFS=y | ||
| 822 | # CONFIG_CONFIGFS_FS is not set | ||
| 823 | |||
| 824 | # | ||
| 825 | # Miscellaneous filesystems | ||
| 826 | # | ||
| 827 | # CONFIG_ADFS_FS is not set | ||
| 828 | # CONFIG_AFFS_FS is not set | ||
| 829 | # CONFIG_HFS_FS is not set | ||
| 830 | # CONFIG_HFSPLUS_FS is not set | ||
| 831 | # CONFIG_BEFS_FS is not set | ||
| 832 | # CONFIG_BFS_FS is not set | ||
| 833 | # CONFIG_EFS_FS is not set | ||
| 834 | CONFIG_JFFS2_FS=y | ||
| 835 | CONFIG_JFFS2_FS_DEBUG=0 | ||
| 836 | CONFIG_JFFS2_FS_WRITEBUFFER=y | ||
| 837 | # CONFIG_JFFS2_SUMMARY is not set | ||
| 838 | # CONFIG_JFFS2_FS_XATTR is not set | ||
| 839 | # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set | ||
| 840 | CONFIG_JFFS2_ZLIB=y | ||
| 841 | CONFIG_JFFS2_RTIME=y | ||
| 842 | # CONFIG_JFFS2_RUBIN is not set | ||
| 843 | # CONFIG_CRAMFS is not set | ||
| 844 | # CONFIG_VXFS_FS is not set | ||
| 845 | # CONFIG_HPFS_FS is not set | ||
| 846 | # CONFIG_QNX4FS_FS is not set | ||
| 847 | # CONFIG_SYSV_FS is not set | ||
| 848 | # CONFIG_UFS_FS is not set | ||
| 849 | |||
| 850 | # | ||
| 851 | # Network File Systems | ||
| 852 | # | ||
| 853 | CONFIG_NFS_FS=y | ||
| 854 | # CONFIG_NFS_V3 is not set | ||
| 855 | # CONFIG_NFS_V4 is not set | ||
| 856 | # CONFIG_NFS_DIRECTIO is not set | ||
| 857 | # CONFIG_NFSD is not set | ||
| 858 | CONFIG_ROOT_NFS=y | ||
| 859 | CONFIG_LOCKD=y | ||
| 860 | CONFIG_NFS_COMMON=y | ||
| 861 | CONFIG_SUNRPC=y | ||
| 862 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 863 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
| 864 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
| 865 | # CONFIG_SMB_FS is not set | ||
| 866 | # CONFIG_CIFS is not set | ||
| 867 | # CONFIG_NCP_FS is not set | ||
| 868 | # CONFIG_CODA_FS is not set | ||
| 869 | # CONFIG_AFS_FS is not set | ||
| 870 | |||
| 871 | # | ||
| 872 | # Partition Types | ||
| 873 | # | ||
| 874 | # CONFIG_PARTITION_ADVANCED is not set | ||
| 875 | CONFIG_MSDOS_PARTITION=y | ||
| 876 | |||
| 877 | # | ||
| 878 | # Native Language Support | ||
| 879 | # | ||
| 880 | # CONFIG_NLS is not set | ||
| 881 | |||
| 882 | # | ||
| 883 | # Distributed Lock Manager | ||
| 884 | # | ||
| 885 | # CONFIG_DLM is not set | ||
| 886 | |||
| 887 | # | ||
| 888 | # Profiling support | ||
| 889 | # | ||
| 890 | # CONFIG_PROFILING is not set | ||
| 891 | |||
| 892 | # | ||
| 893 | # Kernel hacking | ||
| 894 | # | ||
| 895 | # CONFIG_PRINTK_TIME is not set | ||
| 896 | CONFIG_ENABLE_MUST_CHECK=y | ||
| 897 | # CONFIG_MAGIC_SYSRQ is not set | ||
| 898 | # CONFIG_UNUSED_SYMBOLS is not set | ||
| 899 | # CONFIG_DEBUG_FS is not set | ||
| 900 | # CONFIG_HEADERS_CHECK is not set | ||
| 901 | # CONFIG_DEBUG_KERNEL is not set | ||
| 902 | CONFIG_DEBUG_BUGVERBOSE=y | ||
| 903 | CONFIG_FRAME_POINTER=y | ||
| 904 | # CONFIG_DEBUG_USER is not set | ||
| 905 | |||
| 906 | # | ||
| 907 | # Security options | ||
| 908 | # | ||
| 909 | # CONFIG_KEYS is not set | ||
| 910 | # CONFIG_SECURITY is not set | ||
| 911 | # CONFIG_CRYPTO is not set | ||
| 912 | |||
| 913 | # | ||
| 914 | # Library routines | ||
| 915 | # | ||
| 916 | CONFIG_BITREVERSE=y | ||
| 917 | # CONFIG_CRC_CCITT is not set | ||
| 918 | # CONFIG_CRC16 is not set | ||
| 919 | # CONFIG_CRC_ITU_T is not set | ||
| 920 | CONFIG_CRC32=y | ||
| 921 | # CONFIG_CRC7 is not set | ||
| 922 | # CONFIG_LIBCRC32C is not set | ||
| 923 | CONFIG_ZLIB_INFLATE=y | ||
| 924 | CONFIG_ZLIB_DEFLATE=y | ||
| 925 | CONFIG_PLIST=y | ||
| 926 | CONFIG_HAS_IOMEM=y | ||
| 927 | CONFIG_HAS_IOPORT=y | ||
| 928 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/arm/configs/orion5x_defconfig b/arch/arm/configs/orion5x_defconfig index 9578b5d9f9c7..4017d83c9d2d 100644 --- a/arch/arm/configs/orion5x_defconfig +++ b/arch/arm/configs/orion5x_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.26-rc4 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Mon Jun 2 23:54:48 2008 | 4 | # Fri Aug 22 12:38:51 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_ARM=y | 6 | CONFIG_ARM=y |
| 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y |
| @@ -12,6 +12,7 @@ CONFIG_MMU=y | |||
| 12 | # CONFIG_NO_IOPORT is not set | 12 | # CONFIG_NO_IOPORT is not set |
| 13 | CONFIG_GENERIC_HARDIRQS=y | 13 | CONFIG_GENERIC_HARDIRQS=y |
| 14 | CONFIG_STACKTRACE_SUPPORT=y | 14 | CONFIG_STACKTRACE_SUPPORT=y |
| 15 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 15 | CONFIG_LOCKDEP_SUPPORT=y | 16 | CONFIG_LOCKDEP_SUPPORT=y |
| 16 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 17 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
| 17 | CONFIG_HARDIRQS_SW_RESEND=y | 18 | CONFIG_HARDIRQS_SW_RESEND=y |
| @@ -23,6 +24,7 @@ CONFIG_GENERIC_HWEIGHT=y | |||
| 23 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 24 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 24 | CONFIG_ARCH_SUPPORTS_AOUT=y | 25 | CONFIG_ARCH_SUPPORTS_AOUT=y |
| 25 | CONFIG_ZONE_DMA=y | 26 | CONFIG_ZONE_DMA=y |
| 27 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
| 26 | CONFIG_VECTORS_BASE=0xffff0000 | 28 | CONFIG_VECTORS_BASE=0xffff0000 |
| 27 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 29 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 28 | 30 | ||
| @@ -56,7 +58,6 @@ CONFIG_SYSCTL=y | |||
| 56 | CONFIG_EMBEDDED=y | 58 | CONFIG_EMBEDDED=y |
| 57 | CONFIG_UID16=y | 59 | CONFIG_UID16=y |
| 58 | CONFIG_SYSCTL_SYSCALL=y | 60 | CONFIG_SYSCTL_SYSCALL=y |
| 59 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 60 | CONFIG_KALLSYMS=y | 61 | CONFIG_KALLSYMS=y |
| 61 | CONFIG_KALLSYMS_ALL=y | 62 | CONFIG_KALLSYMS_ALL=y |
| 62 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 63 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -83,11 +84,17 @@ CONFIG_PROFILING=y | |||
| 83 | CONFIG_OPROFILE=y | 84 | CONFIG_OPROFILE=y |
| 84 | CONFIG_HAVE_OPROFILE=y | 85 | CONFIG_HAVE_OPROFILE=y |
| 85 | CONFIG_KPROBES=y | 86 | CONFIG_KPROBES=y |
| 87 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
| 86 | CONFIG_KRETPROBES=y | 88 | CONFIG_KRETPROBES=y |
| 89 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
| 87 | CONFIG_HAVE_KPROBES=y | 90 | CONFIG_HAVE_KPROBES=y |
| 88 | CONFIG_HAVE_KRETPROBES=y | 91 | CONFIG_HAVE_KRETPROBES=y |
| 92 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
| 89 | # CONFIG_HAVE_DMA_ATTRS is not set | 93 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 94 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 95 | # CONFIG_HAVE_CLK is not set | ||
| 90 | CONFIG_PROC_PAGE_MONITOR=y | 96 | CONFIG_PROC_PAGE_MONITOR=y |
| 97 | CONFIG_HAVE_GENERIC_DMA_COHERENT=y | ||
| 91 | CONFIG_RT_MUTEXES=y | 98 | CONFIG_RT_MUTEXES=y |
| 92 | # CONFIG_TINY_SHMEM is not set | 99 | # CONFIG_TINY_SHMEM is not set |
| 93 | CONFIG_BASE_SMALL=0 | 100 | CONFIG_BASE_SMALL=0 |
| @@ -97,12 +104,13 @@ CONFIG_MODULE_UNLOAD=y | |||
| 97 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 104 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 98 | # CONFIG_MODVERSIONS is not set | 105 | # CONFIG_MODVERSIONS is not set |
| 99 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 106 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 100 | # CONFIG_KMOD is not set | 107 | CONFIG_KMOD=y |
| 101 | CONFIG_BLOCK=y | 108 | CONFIG_BLOCK=y |
| 102 | # CONFIG_LBD is not set | 109 | # CONFIG_LBD is not set |
| 103 | # CONFIG_BLK_DEV_IO_TRACE is not set | 110 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 104 | # CONFIG_LSF is not set | 111 | # CONFIG_LSF is not set |
| 105 | # CONFIG_BLK_DEV_BSG is not set | 112 | # CONFIG_BLK_DEV_BSG is not set |
| 113 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 106 | 114 | ||
| 107 | # | 115 | # |
| 108 | # IO Schedulers | 116 | # IO Schedulers |
| @@ -128,7 +136,6 @@ CONFIG_CLASSIC_RCU=y | |||
| 128 | # CONFIG_ARCH_AT91 is not set | 136 | # CONFIG_ARCH_AT91 is not set |
| 129 | # CONFIG_ARCH_CLPS7500 is not set | 137 | # CONFIG_ARCH_CLPS7500 is not set |
| 130 | # CONFIG_ARCH_CLPS711X is not set | 138 | # CONFIG_ARCH_CLPS711X is not set |
| 131 | # CONFIG_ARCH_CO285 is not set | ||
| 132 | # CONFIG_ARCH_EBSA110 is not set | 139 | # CONFIG_ARCH_EBSA110 is not set |
| 133 | # CONFIG_ARCH_EP93XX is not set | 140 | # CONFIG_ARCH_EP93XX is not set |
| 134 | # CONFIG_ARCH_FOOTBRIDGE is not set | 141 | # CONFIG_ARCH_FOOTBRIDGE is not set |
| @@ -142,8 +149,11 @@ CONFIG_CLASSIC_RCU=y | |||
| 142 | # CONFIG_ARCH_IXP2000 is not set | 149 | # CONFIG_ARCH_IXP2000 is not set |
| 143 | # CONFIG_ARCH_IXP4XX is not set | 150 | # CONFIG_ARCH_IXP4XX is not set |
| 144 | # CONFIG_ARCH_L7200 is not set | 151 | # CONFIG_ARCH_L7200 is not set |
| 152 | # CONFIG_ARCH_KIRKWOOD is not set | ||
| 145 | # CONFIG_ARCH_KS8695 is not set | 153 | # CONFIG_ARCH_KS8695 is not set |
| 146 | # CONFIG_ARCH_NS9XXX is not set | 154 | # CONFIG_ARCH_NS9XXX is not set |
| 155 | # CONFIG_ARCH_LOKI is not set | ||
| 156 | # CONFIG_ARCH_MV78XX0 is not set | ||
| 147 | # CONFIG_ARCH_MXC is not set | 157 | # CONFIG_ARCH_MXC is not set |
| 148 | CONFIG_ARCH_ORION5X=y | 158 | CONFIG_ARCH_ORION5X=y |
| 149 | # CONFIG_ARCH_PNX4008 is not set | 159 | # CONFIG_ARCH_PNX4008 is not set |
| @@ -195,7 +205,7 @@ CONFIG_CPU_ABRT_EV5T=y | |||
| 195 | CONFIG_CPU_PABRT_NOIFAR=y | 205 | CONFIG_CPU_PABRT_NOIFAR=y |
| 196 | CONFIG_CPU_CACHE_VIVT=y | 206 | CONFIG_CPU_CACHE_VIVT=y |
| 197 | CONFIG_CPU_COPY_FEROCEON=y | 207 | CONFIG_CPU_COPY_FEROCEON=y |
| 198 | CONFIG_CPU_TLB_V4WBI=y | 208 | CONFIG_CPU_TLB_FEROCEON=y |
| 199 | CONFIG_CPU_CP15=y | 209 | CONFIG_CPU_CP15=y |
| 200 | CONFIG_CPU_CP15_MMU=y | 210 | CONFIG_CPU_CP15_MMU=y |
| 201 | 211 | ||
| @@ -280,10 +290,6 @@ CONFIG_BINFMT_ELF=y | |||
| 280 | # | 290 | # |
| 281 | # CONFIG_PM is not set | 291 | # CONFIG_PM is not set |
| 282 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | 292 | CONFIG_ARCH_SUSPEND_POSSIBLE=y |
| 283 | |||
| 284 | # | ||
| 285 | # Networking | ||
| 286 | # | ||
| 287 | CONFIG_NET=y | 293 | CONFIG_NET=y |
| 288 | 294 | ||
| 289 | # | 295 | # |
| @@ -361,6 +367,7 @@ CONFIG_NET_PKTGEN=m | |||
| 361 | # | 367 | # |
| 362 | # CONFIG_CFG80211 is not set | 368 | # CONFIG_CFG80211 is not set |
| 363 | CONFIG_WIRELESS_EXT=y | 369 | CONFIG_WIRELESS_EXT=y |
| 370 | CONFIG_WIRELESS_EXT_SYSFS=y | ||
| 364 | # CONFIG_MAC80211 is not set | 371 | # CONFIG_MAC80211 is not set |
| 365 | # CONFIG_IEEE80211 is not set | 372 | # CONFIG_IEEE80211 is not set |
| 366 | # CONFIG_RFKILL is not set | 373 | # CONFIG_RFKILL is not set |
| @@ -377,6 +384,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | |||
| 377 | CONFIG_STANDALONE=y | 384 | CONFIG_STANDALONE=y |
| 378 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 385 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 379 | CONFIG_FW_LOADER=y | 386 | CONFIG_FW_LOADER=y |
| 387 | # CONFIG_FIRMWARE_IN_KERNEL is not set | ||
| 388 | CONFIG_EXTRA_FIRMWARE="" | ||
| 380 | # CONFIG_DEBUG_DRIVER is not set | 389 | # CONFIG_DEBUG_DRIVER is not set |
| 381 | # CONFIG_DEBUG_DEVRES is not set | 390 | # CONFIG_DEBUG_DEVRES is not set |
| 382 | # CONFIG_SYS_HYPERVISOR is not set | 391 | # CONFIG_SYS_HYPERVISOR is not set |
| @@ -499,6 +508,7 @@ CONFIG_MISC_DEVICES=y | |||
| 499 | # CONFIG_SGI_IOC4 is not set | 508 | # CONFIG_SGI_IOC4 is not set |
| 500 | # CONFIG_TIFM_CORE is not set | 509 | # CONFIG_TIFM_CORE is not set |
| 501 | # CONFIG_ENCLOSURE_SERVICES is not set | 510 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 511 | # CONFIG_HP_ILO is not set | ||
| 502 | CONFIG_HAVE_IDE=y | 512 | CONFIG_HAVE_IDE=y |
| 503 | # CONFIG_IDE is not set | 513 | # CONFIG_IDE is not set |
| 504 | 514 | ||
| @@ -575,6 +585,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 575 | # CONFIG_SCSI_NSP32 is not set | 585 | # CONFIG_SCSI_NSP32 is not set |
| 576 | # CONFIG_SCSI_DEBUG is not set | 586 | # CONFIG_SCSI_DEBUG is not set |
| 577 | # CONFIG_SCSI_SRP is not set | 587 | # CONFIG_SCSI_SRP is not set |
| 588 | # CONFIG_SCSI_DH is not set | ||
| 578 | CONFIG_ATA=y | 589 | CONFIG_ATA=y |
| 579 | # CONFIG_ATA_NONSTANDARD is not set | 590 | # CONFIG_ATA_NONSTANDARD is not set |
| 580 | CONFIG_SATA_PMP=y | 591 | CONFIG_SATA_PMP=y |
| @@ -641,11 +652,14 @@ CONFIG_SATA_MV=y | |||
| 641 | # | 652 | # |
| 642 | # IEEE 1394 (FireWire) support | 653 | # IEEE 1394 (FireWire) support |
| 643 | # | 654 | # |
| 655 | |||
| 656 | # | ||
| 657 | # Enable only one of the two stacks, unless you know what you are doing | ||
| 658 | # | ||
| 644 | # CONFIG_FIREWIRE is not set | 659 | # CONFIG_FIREWIRE is not set |
| 645 | # CONFIG_IEEE1394 is not set | 660 | # CONFIG_IEEE1394 is not set |
| 646 | # CONFIG_I2O is not set | 661 | # CONFIG_I2O is not set |
| 647 | CONFIG_NETDEVICES=y | 662 | CONFIG_NETDEVICES=y |
| 648 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 649 | # CONFIG_DUMMY is not set | 663 | # CONFIG_DUMMY is not set |
| 650 | # CONFIG_BONDING is not set | 664 | # CONFIG_BONDING is not set |
| 651 | # CONFIG_MACVLAN is not set | 665 | # CONFIG_MACVLAN is not set |
| @@ -694,7 +708,6 @@ CONFIG_NETDEV_1000=y | |||
| 694 | # CONFIG_DL2K is not set | 708 | # CONFIG_DL2K is not set |
| 695 | # CONFIG_E1000 is not set | 709 | # CONFIG_E1000 is not set |
| 696 | # CONFIG_E1000E is not set | 710 | # CONFIG_E1000E is not set |
| 697 | # CONFIG_E1000E_ENABLED is not set | ||
| 698 | # CONFIG_IP1000 is not set | 711 | # CONFIG_IP1000 is not set |
| 699 | # CONFIG_IGB is not set | 712 | # CONFIG_IGB is not set |
| 700 | # CONFIG_NS83820 is not set | 713 | # CONFIG_NS83820 is not set |
| @@ -710,6 +723,7 @@ CONFIG_NETDEV_1000=y | |||
| 710 | CONFIG_MV643XX_ETH=y | 723 | CONFIG_MV643XX_ETH=y |
| 711 | # CONFIG_QLA3XXX is not set | 724 | # CONFIG_QLA3XXX is not set |
| 712 | # CONFIG_ATL1 is not set | 725 | # CONFIG_ATL1 is not set |
| 726 | # CONFIG_ATL1E is not set | ||
| 713 | # CONFIG_NETDEV_10000 is not set | 727 | # CONFIG_NETDEV_10000 is not set |
| 714 | # CONFIG_TR is not set | 728 | # CONFIG_TR is not set |
| 715 | 729 | ||
| @@ -757,7 +771,14 @@ CONFIG_INPUT_EVDEV=y | |||
| 757 | # | 771 | # |
| 758 | # Input Device Drivers | 772 | # Input Device Drivers |
| 759 | # | 773 | # |
| 760 | # CONFIG_INPUT_KEYBOARD is not set | 774 | CONFIG_INPUT_KEYBOARD=y |
| 775 | # CONFIG_KEYBOARD_ATKBD is not set | ||
| 776 | # CONFIG_KEYBOARD_SUNKBD is not set | ||
| 777 | # CONFIG_KEYBOARD_LKKBD is not set | ||
| 778 | # CONFIG_KEYBOARD_XTKBD is not set | ||
| 779 | # CONFIG_KEYBOARD_NEWTON is not set | ||
| 780 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
| 781 | CONFIG_KEYBOARD_GPIO=y | ||
| 761 | # CONFIG_INPUT_MOUSE is not set | 782 | # CONFIG_INPUT_MOUSE is not set |
| 762 | # CONFIG_INPUT_JOYSTICK is not set | 783 | # CONFIG_INPUT_JOYSTICK is not set |
| 763 | # CONFIG_INPUT_TABLET is not set | 784 | # CONFIG_INPUT_TABLET is not set |
| @@ -808,44 +829,65 @@ CONFIG_DEVPORT=y | |||
| 808 | CONFIG_I2C=y | 829 | CONFIG_I2C=y |
| 809 | CONFIG_I2C_BOARDINFO=y | 830 | CONFIG_I2C_BOARDINFO=y |
| 810 | CONFIG_I2C_CHARDEV=y | 831 | CONFIG_I2C_CHARDEV=y |
| 832 | CONFIG_I2C_HELPER_AUTO=y | ||
| 811 | 833 | ||
| 812 | # | 834 | # |
| 813 | # I2C Hardware Bus support | 835 | # I2C Hardware Bus support |
| 814 | # | 836 | # |
| 837 | |||
| 838 | # | ||
| 839 | # PC SMBus host controller drivers | ||
| 840 | # | ||
| 815 | # CONFIG_I2C_ALI1535 is not set | 841 | # CONFIG_I2C_ALI1535 is not set |
| 816 | # CONFIG_I2C_ALI1563 is not set | 842 | # CONFIG_I2C_ALI1563 is not set |
| 817 | # CONFIG_I2C_ALI15X3 is not set | 843 | # CONFIG_I2C_ALI15X3 is not set |
| 818 | # CONFIG_I2C_AMD756 is not set | 844 | # CONFIG_I2C_AMD756 is not set |
| 819 | # CONFIG_I2C_AMD8111 is not set | 845 | # CONFIG_I2C_AMD8111 is not set |
| 820 | # CONFIG_I2C_GPIO is not set | ||
| 821 | # CONFIG_I2C_I801 is not set | 846 | # CONFIG_I2C_I801 is not set |
| 822 | # CONFIG_I2C_I810 is not set | 847 | # CONFIG_I2C_ISCH is not set |
| 823 | # CONFIG_I2C_PIIX4 is not set | 848 | # CONFIG_I2C_PIIX4 is not set |
| 824 | # CONFIG_I2C_NFORCE2 is not set | 849 | # CONFIG_I2C_NFORCE2 is not set |
| 825 | # CONFIG_I2C_OCORES is not set | ||
| 826 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 827 | # CONFIG_I2C_PROSAVAGE is not set | ||
| 828 | # CONFIG_I2C_SAVAGE4 is not set | ||
| 829 | # CONFIG_I2C_SIMTEC is not set | ||
| 830 | # CONFIG_I2C_SIS5595 is not set | 850 | # CONFIG_I2C_SIS5595 is not set |
| 831 | # CONFIG_I2C_SIS630 is not set | 851 | # CONFIG_I2C_SIS630 is not set |
| 832 | # CONFIG_I2C_SIS96X is not set | 852 | # CONFIG_I2C_SIS96X is not set |
| 833 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 834 | # CONFIG_I2C_STUB is not set | ||
| 835 | # CONFIG_I2C_TINY_USB is not set | ||
| 836 | # CONFIG_I2C_VIA is not set | 853 | # CONFIG_I2C_VIA is not set |
| 837 | # CONFIG_I2C_VIAPRO is not set | 854 | # CONFIG_I2C_VIAPRO is not set |
| 855 | |||
| 856 | # | ||
| 857 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 858 | # | ||
| 859 | # CONFIG_I2C_GPIO is not set | ||
| 860 | CONFIG_I2C_MV64XXX=y | ||
| 861 | # CONFIG_I2C_OCORES is not set | ||
| 862 | # CONFIG_I2C_SIMTEC is not set | ||
| 863 | |||
| 864 | # | ||
| 865 | # External I2C/SMBus adapter drivers | ||
| 866 | # | ||
| 867 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 868 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 869 | # CONFIG_I2C_TINY_USB is not set | ||
| 870 | |||
| 871 | # | ||
| 872 | # Graphics adapter I2C/DDC channel drivers | ||
| 873 | # | ||
| 838 | # CONFIG_I2C_VOODOO3 is not set | 874 | # CONFIG_I2C_VOODOO3 is not set |
| 875 | |||
| 876 | # | ||
| 877 | # Other I2C/SMBus bus drivers | ||
| 878 | # | ||
| 839 | # CONFIG_I2C_PCA_PLATFORM is not set | 879 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 840 | CONFIG_I2C_MV64XXX=y | 880 | # CONFIG_I2C_STUB is not set |
| 841 | 881 | ||
| 842 | # | 882 | # |
| 843 | # Miscellaneous I2C Chip support | 883 | # Miscellaneous I2C Chip support |
| 844 | # | 884 | # |
| 845 | # CONFIG_DS1682 is not set | 885 | # CONFIG_DS1682 is not set |
| 886 | # CONFIG_AT24 is not set | ||
| 846 | # CONFIG_SENSORS_EEPROM is not set | 887 | # CONFIG_SENSORS_EEPROM is not set |
| 847 | # CONFIG_SENSORS_PCF8574 is not set | 888 | # CONFIG_SENSORS_PCF8574 is not set |
| 848 | # CONFIG_PCF8575 is not set | 889 | # CONFIG_PCF8575 is not set |
| 890 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 849 | # CONFIG_SENSORS_PCF8591 is not set | 891 | # CONFIG_SENSORS_PCF8591 is not set |
| 850 | # CONFIG_SENSORS_MAX6875 is not set | 892 | # CONFIG_SENSORS_MAX6875 is not set |
| 851 | # CONFIG_SENSORS_TSL2550 is not set | 893 | # CONFIG_SENSORS_TSL2550 is not set |
| @@ -858,6 +900,7 @@ CONFIG_I2C_MV64XXX=y | |||
| 858 | # CONFIG_POWER_SUPPLY is not set | 900 | # CONFIG_POWER_SUPPLY is not set |
| 859 | CONFIG_HWMON=y | 901 | CONFIG_HWMON=y |
| 860 | # CONFIG_HWMON_VID is not set | 902 | # CONFIG_HWMON_VID is not set |
| 903 | # CONFIG_SENSORS_AD7414 is not set | ||
| 861 | # CONFIG_SENSORS_AD7418 is not set | 904 | # CONFIG_SENSORS_AD7418 is not set |
| 862 | # CONFIG_SENSORS_ADM1021 is not set | 905 | # CONFIG_SENSORS_ADM1021 is not set |
| 863 | # CONFIG_SENSORS_ADM1025 is not set | 906 | # CONFIG_SENSORS_ADM1025 is not set |
| @@ -877,7 +920,7 @@ CONFIG_HWMON=y | |||
| 877 | # CONFIG_SENSORS_GL520SM is not set | 920 | # CONFIG_SENSORS_GL520SM is not set |
| 878 | # CONFIG_SENSORS_IT87 is not set | 921 | # CONFIG_SENSORS_IT87 is not set |
| 879 | # CONFIG_SENSORS_LM63 is not set | 922 | # CONFIG_SENSORS_LM63 is not set |
| 880 | # CONFIG_SENSORS_LM75 is not set | 923 | CONFIG_SENSORS_LM75=y |
| 881 | # CONFIG_SENSORS_LM77 is not set | 924 | # CONFIG_SENSORS_LM77 is not set |
| 882 | # CONFIG_SENSORS_LM78 is not set | 925 | # CONFIG_SENSORS_LM78 is not set |
| 883 | # CONFIG_SENSORS_LM80 is not set | 926 | # CONFIG_SENSORS_LM80 is not set |
| @@ -921,9 +964,12 @@ CONFIG_SSB_POSSIBLE=y | |||
| 921 | # | 964 | # |
| 922 | # Multifunction device drivers | 965 | # Multifunction device drivers |
| 923 | # | 966 | # |
| 967 | # CONFIG_MFD_CORE is not set | ||
| 924 | # CONFIG_MFD_SM501 is not set | 968 | # CONFIG_MFD_SM501 is not set |
| 925 | # CONFIG_MFD_ASIC3 is not set | ||
| 926 | # CONFIG_HTC_PASIC3 is not set | 969 | # CONFIG_HTC_PASIC3 is not set |
| 970 | # CONFIG_MFD_TMIO is not set | ||
| 971 | # CONFIG_MFD_T7L66XB is not set | ||
| 972 | # CONFIG_MFD_TC6387XB is not set | ||
| 927 | 973 | ||
| 928 | # | 974 | # |
| 929 | # Multimedia devices | 975 | # Multimedia devices |
| @@ -954,10 +1000,6 @@ CONFIG_SSB_POSSIBLE=y | |||
| 954 | # Display device support | 1000 | # Display device support |
| 955 | # | 1001 | # |
| 956 | # CONFIG_DISPLAY_SUPPORT is not set | 1002 | # CONFIG_DISPLAY_SUPPORT is not set |
| 957 | |||
| 958 | # | ||
| 959 | # Sound | ||
| 960 | # | ||
| 961 | # CONFIG_SOUND is not set | 1003 | # CONFIG_SOUND is not set |
| 962 | CONFIG_HID_SUPPORT=y | 1004 | CONFIG_HID_SUPPORT=y |
| 963 | CONFIG_HID=y | 1005 | CONFIG_HID=y |
| @@ -988,6 +1030,7 @@ CONFIG_USB_DEVICE_CLASS=y | |||
| 988 | # CONFIG_USB_OTG is not set | 1030 | # CONFIG_USB_OTG is not set |
| 989 | # CONFIG_USB_OTG_WHITELIST is not set | 1031 | # CONFIG_USB_OTG_WHITELIST is not set |
| 990 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 1032 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
| 1033 | # CONFIG_USB_MON is not set | ||
| 991 | 1034 | ||
| 992 | # | 1035 | # |
| 993 | # USB Host Controller Drivers | 1036 | # USB Host Controller Drivers |
| @@ -1030,6 +1073,7 @@ CONFIG_USB_STORAGE_JUMPSHOT=y | |||
| 1030 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1073 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1031 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1074 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
| 1032 | # CONFIG_USB_STORAGE_KARMA is not set | 1075 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1076 | # CONFIG_USB_STORAGE_SIERRA is not set | ||
| 1033 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | 1077 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
| 1034 | # CONFIG_USB_LIBUSUAL is not set | 1078 | # CONFIG_USB_LIBUSUAL is not set |
| 1035 | 1079 | ||
| @@ -1038,7 +1082,6 @@ CONFIG_USB_STORAGE_JUMPSHOT=y | |||
| 1038 | # | 1082 | # |
| 1039 | # CONFIG_USB_MDC800 is not set | 1083 | # CONFIG_USB_MDC800 is not set |
| 1040 | # CONFIG_USB_MICROTEK is not set | 1084 | # CONFIG_USB_MICROTEK is not set |
| 1041 | # CONFIG_USB_MON is not set | ||
| 1042 | 1085 | ||
| 1043 | # | 1086 | # |
| 1044 | # USB port drivers | 1087 | # USB port drivers |
| @@ -1051,7 +1094,6 @@ CONFIG_USB_STORAGE_JUMPSHOT=y | |||
| 1051 | # CONFIG_USB_EMI62 is not set | 1094 | # CONFIG_USB_EMI62 is not set |
| 1052 | # CONFIG_USB_EMI26 is not set | 1095 | # CONFIG_USB_EMI26 is not set |
| 1053 | # CONFIG_USB_ADUTUX is not set | 1096 | # CONFIG_USB_ADUTUX is not set |
| 1054 | # CONFIG_USB_AUERSWALD is not set | ||
| 1055 | # CONFIG_USB_RIO500 is not set | 1097 | # CONFIG_USB_RIO500 is not set |
| 1056 | # CONFIG_USB_LEGOTOWER is not set | 1098 | # CONFIG_USB_LEGOTOWER is not set |
| 1057 | # CONFIG_USB_LCD is not set | 1099 | # CONFIG_USB_LCD is not set |
| @@ -1077,7 +1119,9 @@ CONFIG_LEDS_CLASS=y | |||
| 1077 | # | 1119 | # |
| 1078 | # LED drivers | 1120 | # LED drivers |
| 1079 | # | 1121 | # |
| 1122 | # CONFIG_LEDS_PCA9532 is not set | ||
| 1080 | CONFIG_LEDS_GPIO=y | 1123 | CONFIG_LEDS_GPIO=y |
| 1124 | # CONFIG_LEDS_PCA955X is not set | ||
| 1081 | 1125 | ||
| 1082 | # | 1126 | # |
| 1083 | # LED Triggers | 1127 | # LED Triggers |
| @@ -1111,11 +1155,12 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 1111 | CONFIG_RTC_DRV_RS5C372=y | 1155 | CONFIG_RTC_DRV_RS5C372=y |
| 1112 | # CONFIG_RTC_DRV_ISL1208 is not set | 1156 | # CONFIG_RTC_DRV_ISL1208 is not set |
| 1113 | # CONFIG_RTC_DRV_X1205 is not set | 1157 | # CONFIG_RTC_DRV_X1205 is not set |
| 1114 | # CONFIG_RTC_DRV_PCF8563 is not set | 1158 | CONFIG_RTC_DRV_PCF8563=y |
| 1115 | # CONFIG_RTC_DRV_PCF8583 is not set | 1159 | # CONFIG_RTC_DRV_PCF8583 is not set |
| 1116 | CONFIG_RTC_DRV_M41T80=y | 1160 | CONFIG_RTC_DRV_M41T80=y |
| 1117 | # CONFIG_RTC_DRV_M41T80_WDT is not set | 1161 | # CONFIG_RTC_DRV_M41T80_WDT is not set |
| 1118 | # CONFIG_RTC_DRV_S35390A is not set | 1162 | CONFIG_RTC_DRV_S35390A=y |
| 1163 | # CONFIG_RTC_DRV_FM3130 is not set | ||
| 1119 | 1164 | ||
| 1120 | # | 1165 | # |
| 1121 | # SPI RTC drivers | 1166 | # SPI RTC drivers |
| @@ -1136,6 +1181,27 @@ CONFIG_RTC_DRV_M41T80=y | |||
| 1136 | # | 1181 | # |
| 1137 | # on-CPU RTC drivers | 1182 | # on-CPU RTC drivers |
| 1138 | # | 1183 | # |
| 1184 | CONFIG_DMADEVICES=y | ||
| 1185 | |||
| 1186 | # | ||
| 1187 | # DMA Devices | ||
| 1188 | # | ||
| 1189 | CONFIG_MV_XOR=y | ||
| 1190 | CONFIG_DMA_ENGINE=y | ||
| 1191 | |||
| 1192 | # | ||
| 1193 | # DMA Clients | ||
| 1194 | # | ||
| 1195 | # CONFIG_NET_DMA is not set | ||
| 1196 | # CONFIG_DMATEST is not set | ||
| 1197 | |||
| 1198 | # | ||
| 1199 | # Voltage and Current regulators | ||
| 1200 | # | ||
| 1201 | # CONFIG_REGULATOR is not set | ||
| 1202 | # CONFIG_REGULATOR_FIXED_VOLTAGE is not set | ||
| 1203 | # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set | ||
| 1204 | # CONFIG_REGULATOR_BQ24022 is not set | ||
| 1139 | # CONFIG_UIO is not set | 1205 | # CONFIG_UIO is not set |
| 1140 | 1206 | ||
| 1141 | # | 1207 | # |
| @@ -1215,6 +1281,7 @@ CONFIG_JFFS2_RTIME=y | |||
| 1215 | CONFIG_CRAMFS=y | 1281 | CONFIG_CRAMFS=y |
| 1216 | # CONFIG_VXFS_FS is not set | 1282 | # CONFIG_VXFS_FS is not set |
| 1217 | # CONFIG_MINIX_FS is not set | 1283 | # CONFIG_MINIX_FS is not set |
| 1284 | # CONFIG_OMFS_FS is not set | ||
| 1218 | # CONFIG_HPFS_FS is not set | 1285 | # CONFIG_HPFS_FS is not set |
| 1219 | # CONFIG_QNX4FS_FS is not set | 1286 | # CONFIG_QNX4FS_FS is not set |
| 1220 | # CONFIG_ROMFS_FS is not set | 1287 | # CONFIG_ROMFS_FS is not set |
| @@ -1225,13 +1292,12 @@ CONFIG_NFS_FS=y | |||
| 1225 | CONFIG_NFS_V3=y | 1292 | CONFIG_NFS_V3=y |
| 1226 | # CONFIG_NFS_V3_ACL is not set | 1293 | # CONFIG_NFS_V3_ACL is not set |
| 1227 | # CONFIG_NFS_V4 is not set | 1294 | # CONFIG_NFS_V4 is not set |
| 1228 | # CONFIG_NFSD is not set | ||
| 1229 | CONFIG_ROOT_NFS=y | 1295 | CONFIG_ROOT_NFS=y |
| 1296 | # CONFIG_NFSD is not set | ||
| 1230 | CONFIG_LOCKD=y | 1297 | CONFIG_LOCKD=y |
| 1231 | CONFIG_LOCKD_V4=y | 1298 | CONFIG_LOCKD_V4=y |
| 1232 | CONFIG_NFS_COMMON=y | 1299 | CONFIG_NFS_COMMON=y |
| 1233 | CONFIG_SUNRPC=y | 1300 | CONFIG_SUNRPC=y |
| 1234 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 1235 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1301 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 1236 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1302 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1237 | # CONFIG_SMB_FS is not set | 1303 | # CONFIG_SMB_FS is not set |
| @@ -1317,6 +1383,8 @@ CONFIG_MAGIC_SYSRQ=y | |||
| 1317 | CONFIG_DEBUG_KERNEL=y | 1383 | CONFIG_DEBUG_KERNEL=y |
| 1318 | # CONFIG_DEBUG_SHIRQ is not set | 1384 | # CONFIG_DEBUG_SHIRQ is not set |
| 1319 | CONFIG_DETECT_SOFTLOCKUP=y | 1385 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1386 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 1387 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 1320 | CONFIG_SCHED_DEBUG=y | 1388 | CONFIG_SCHED_DEBUG=y |
| 1321 | CONFIG_SCHEDSTATS=y | 1389 | CONFIG_SCHEDSTATS=y |
| 1322 | # CONFIG_TIMER_STATS is not set | 1390 | # CONFIG_TIMER_STATS is not set |
| @@ -1331,11 +1399,13 @@ CONFIG_DEBUG_PREEMPT=y | |||
| 1331 | # CONFIG_LOCK_STAT is not set | 1399 | # CONFIG_LOCK_STAT is not set |
| 1332 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1400 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
| 1333 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1401 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
| 1402 | CONFIG_STACKTRACE=y | ||
| 1334 | # CONFIG_DEBUG_KOBJECT is not set | 1403 | # CONFIG_DEBUG_KOBJECT is not set |
| 1335 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1404 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1336 | CONFIG_DEBUG_INFO=y | 1405 | CONFIG_DEBUG_INFO=y |
| 1337 | # CONFIG_DEBUG_VM is not set | 1406 | # CONFIG_DEBUG_VM is not set |
| 1338 | # CONFIG_DEBUG_WRITECOUNT is not set | 1407 | # CONFIG_DEBUG_WRITECOUNT is not set |
| 1408 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 1339 | # CONFIG_DEBUG_LIST is not set | 1409 | # CONFIG_DEBUG_LIST is not set |
| 1340 | # CONFIG_DEBUG_SG is not set | 1410 | # CONFIG_DEBUG_SG is not set |
| 1341 | CONFIG_FRAME_POINTER=y | 1411 | CONFIG_FRAME_POINTER=y |
| @@ -1345,7 +1415,18 @@ CONFIG_FRAME_POINTER=y | |||
| 1345 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1415 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 1346 | # CONFIG_LKDTM is not set | 1416 | # CONFIG_LKDTM is not set |
| 1347 | # CONFIG_FAULT_INJECTION is not set | 1417 | # CONFIG_FAULT_INJECTION is not set |
| 1418 | CONFIG_LATENCYTOP=y | ||
| 1419 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1420 | CONFIG_HAVE_FTRACE=y | ||
| 1421 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1422 | # CONFIG_FTRACE is not set | ||
| 1423 | # CONFIG_IRQSOFF_TRACER is not set | ||
| 1424 | # CONFIG_PREEMPT_TRACER is not set | ||
| 1425 | # CONFIG_SCHED_TRACER is not set | ||
| 1426 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1348 | # CONFIG_SAMPLES is not set | 1427 | # CONFIG_SAMPLES is not set |
| 1428 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1429 | # CONFIG_KGDB is not set | ||
| 1349 | CONFIG_DEBUG_USER=y | 1430 | CONFIG_DEBUG_USER=y |
| 1350 | CONFIG_DEBUG_ERRORS=y | 1431 | CONFIG_DEBUG_ERRORS=y |
| 1351 | # CONFIG_DEBUG_STACK_USAGE is not set | 1432 | # CONFIG_DEBUG_STACK_USAGE is not set |
| @@ -1358,6 +1439,7 @@ CONFIG_DEBUG_LL=y | |||
| 1358 | # CONFIG_KEYS is not set | 1439 | # CONFIG_KEYS is not set |
| 1359 | # CONFIG_SECURITY is not set | 1440 | # CONFIG_SECURITY is not set |
| 1360 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1441 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1442 | CONFIG_ASYNC_CORE=y | ||
| 1361 | CONFIG_CRYPTO=y | 1443 | CONFIG_CRYPTO=y |
| 1362 | 1444 | ||
| 1363 | # | 1445 | # |
| @@ -1403,6 +1485,10 @@ CONFIG_CRYPTO_PCBC=m | |||
| 1403 | # CONFIG_CRYPTO_MD4 is not set | 1485 | # CONFIG_CRYPTO_MD4 is not set |
| 1404 | # CONFIG_CRYPTO_MD5 is not set | 1486 | # CONFIG_CRYPTO_MD5 is not set |
| 1405 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1487 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 1488 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1489 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1490 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1491 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1406 | # CONFIG_CRYPTO_SHA1 is not set | 1492 | # CONFIG_CRYPTO_SHA1 is not set |
| 1407 | # CONFIG_CRYPTO_SHA256 is not set | 1493 | # CONFIG_CRYPTO_SHA256 is not set |
| 1408 | # CONFIG_CRYPTO_SHA512 is not set | 1494 | # CONFIG_CRYPTO_SHA512 is not set |
| @@ -1444,6 +1530,7 @@ CONFIG_BITREVERSE=y | |||
| 1444 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | 1530 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set |
| 1445 | # CONFIG_CRC_CCITT is not set | 1531 | # CONFIG_CRC_CCITT is not set |
| 1446 | # CONFIG_CRC16 is not set | 1532 | # CONFIG_CRC16 is not set |
| 1533 | CONFIG_CRC_T10DIF=y | ||
| 1447 | CONFIG_CRC_ITU_T=m | 1534 | CONFIG_CRC_ITU_T=m |
| 1448 | CONFIG_CRC32=y | 1535 | CONFIG_CRC32=y |
| 1449 | # CONFIG_CRC7 is not set | 1536 | # CONFIG_CRC7 is not set |
diff --git a/arch/arm/configs/palmte_defconfig b/arch/arm/configs/palmte_defconfig new file mode 100644 index 000000000000..40fc6a778e00 --- /dev/null +++ b/arch/arm/configs/palmte_defconfig | |||
| @@ -0,0 +1,761 @@ | |||
| 1 | # | ||
| 2 | # Automatically generated make config: don't edit | ||
| 3 | # Linux kernel version: 2.6.22-rc1-omap1 | ||
| 4 | # Sat May 19 11:04:27 2007 | ||
| 5 | # | ||
| 6 | CONFIG_ARM=y | ||
| 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | ||
| 8 | CONFIG_GENERIC_GPIO=y | ||
| 9 | CONFIG_GENERIC_TIME=y | ||
| 10 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 11 | CONFIG_MMU=y | ||
| 12 | # CONFIG_NO_IOPORT is not set | ||
| 13 | CONFIG_GENERIC_HARDIRQS=y | ||
| 14 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 15 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 16 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
| 17 | CONFIG_HARDIRQS_SW_RESEND=y | ||
| 18 | CONFIG_GENERIC_IRQ_PROBE=y | ||
| 19 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
| 20 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
| 21 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
| 22 | CONFIG_GENERIC_HWEIGHT=y | ||
| 23 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
| 24 | CONFIG_ZONE_DMA=y | ||
| 25 | CONFIG_VECTORS_BASE=0xffff0000 | ||
| 26 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
| 27 | |||
| 28 | # | ||
| 29 | # Code maturity level options | ||
| 30 | # | ||
| 31 | CONFIG_EXPERIMENTAL=y | ||
| 32 | CONFIG_BROKEN_ON_SMP=y | ||
| 33 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 34 | |||
| 35 | # | ||
| 36 | # General setup | ||
| 37 | # | ||
| 38 | CONFIG_LOCALVERSION="" | ||
| 39 | CONFIG_LOCALVERSION_AUTO=y | ||
| 40 | # CONFIG_SWAP is not set | ||
| 41 | CONFIG_SYSVIPC=y | ||
| 42 | # CONFIG_IPC_NS is not set | ||
| 43 | CONFIG_SYSVIPC_SYSCTL=y | ||
| 44 | CONFIG_BSD_PROCESS_ACCT=y | ||
| 45 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | ||
| 46 | # CONFIG_UTS_NS is not set | ||
| 47 | # CONFIG_IKCONFIG is not set | ||
| 48 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 49 | CONFIG_SYSFS_DEPRECATED=y | ||
| 50 | # CONFIG_RELAY is not set | ||
| 51 | # CONFIG_BLK_DEV_INITRD is not set | ||
| 52 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
| 53 | CONFIG_SYSCTL=y | ||
| 54 | # CONFIG_EMBEDDED is not set | ||
| 55 | CONFIG_UID16=y | ||
| 56 | CONFIG_SYSCTL_SYSCALL=y | ||
| 57 | CONFIG_KALLSYMS=y | ||
| 58 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 59 | CONFIG_HOTPLUG=y | ||
| 60 | CONFIG_PRINTK=y | ||
| 61 | CONFIG_BUG=y | ||
| 62 | CONFIG_ELF_CORE=y | ||
| 63 | CONFIG_BASE_FULL=y | ||
| 64 | CONFIG_FUTEX=y | ||
| 65 | CONFIG_ANON_INODES=y | ||
| 66 | CONFIG_EPOLL=y | ||
| 67 | CONFIG_SIGNALFD=y | ||
| 68 | CONFIG_TIMERFD=y | ||
| 69 | CONFIG_EVENTFD=y | ||
| 70 | CONFIG_SHMEM=y | ||
| 71 | CONFIG_VM_EVENT_COUNTERS=y | ||
| 72 | CONFIG_SLAB=y | ||
| 73 | # CONFIG_SLUB is not set | ||
| 74 | # CONFIG_SLOB is not set | ||
| 75 | CONFIG_RT_MUTEXES=y | ||
| 76 | # CONFIG_TINY_SHMEM is not set | ||
| 77 | CONFIG_BASE_SMALL=0 | ||
| 78 | |||
| 79 | # | ||
| 80 | # Loadable module support | ||
| 81 | # | ||
| 82 | # CONFIG_MODULES is not set | ||
| 83 | |||
| 84 | # | ||
| 85 | # Block layer | ||
| 86 | # | ||
| 87 | CONFIG_BLOCK=y | ||
| 88 | # CONFIG_LBD is not set | ||
| 89 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 90 | # CONFIG_LSF is not set | ||
| 91 | |||
| 92 | # | ||
| 93 | # IO Schedulers | ||
| 94 | # | ||
| 95 | CONFIG_IOSCHED_NOOP=y | ||
| 96 | CONFIG_IOSCHED_AS=y | ||
| 97 | # CONFIG_IOSCHED_DEADLINE is not set | ||
| 98 | # CONFIG_IOSCHED_CFQ is not set | ||
| 99 | CONFIG_DEFAULT_AS=y | ||
| 100 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 101 | # CONFIG_DEFAULT_CFQ is not set | ||
| 102 | # CONFIG_DEFAULT_NOOP is not set | ||
| 103 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 104 | |||
| 105 | # | ||
| 106 | # System Type | ||
| 107 | # | ||
| 108 | # CONFIG_ARCH_AAEC2000 is not set | ||
| 109 | # CONFIG_ARCH_INTEGRATOR is not set | ||
| 110 | # CONFIG_ARCH_REALVIEW is not set | ||
| 111 | # CONFIG_ARCH_VERSATILE is not set | ||
| 112 | # CONFIG_ARCH_AT91 is not set | ||
| 113 | # CONFIG_ARCH_CLPS7500 is not set | ||
| 114 | # CONFIG_ARCH_CLPS711X is not set | ||
| 115 | # CONFIG_ARCH_CO285 is not set | ||
| 116 | # CONFIG_ARCH_EBSA110 is not set | ||
| 117 | # CONFIG_ARCH_EP93XX is not set | ||
| 118 | # CONFIG_ARCH_FOOTBRIDGE is not set | ||
| 119 | # CONFIG_ARCH_NETX is not set | ||
| 120 | # CONFIG_ARCH_H720X is not set | ||
| 121 | # CONFIG_ARCH_IMX is not set | ||
| 122 | # CONFIG_ARCH_IOP13XX is not set | ||
| 123 | # CONFIG_ARCH_IOP32X is not set | ||
| 124 | # CONFIG_ARCH_IOP33X is not set | ||
| 125 | # CONFIG_ARCH_IXP23XX is not set | ||
| 126 | # CONFIG_ARCH_IXP2000 is not set | ||
| 127 | # CONFIG_ARCH_IXP4XX is not set | ||
| 128 | # CONFIG_ARCH_L7200 is not set | ||
| 129 | # CONFIG_ARCH_KS8695 is not set | ||
| 130 | # CONFIG_ARCH_NS9XXX is not set | ||
| 131 | # CONFIG_ARCH_PNX4008 is not set | ||
| 132 | # CONFIG_ARCH_PXA is not set | ||
| 133 | # CONFIG_ARCH_RPC is not set | ||
| 134 | # CONFIG_ARCH_SA1100 is not set | ||
| 135 | # CONFIG_ARCH_S3C2410 is not set | ||
| 136 | # CONFIG_ARCH_SHARK is not set | ||
| 137 | # CONFIG_ARCH_LH7A40X is not set | ||
| 138 | # CONFIG_ARCH_DAVINCI is not set | ||
| 139 | CONFIG_ARCH_OMAP=y | ||
| 140 | |||
| 141 | # | ||
| 142 | # TI OMAP Implementations | ||
| 143 | # | ||
| 144 | CONFIG_ARCH_OMAP1=y | ||
| 145 | # CONFIG_ARCH_OMAP2 is not set | ||
| 146 | |||
| 147 | # | ||
| 148 | # OMAP Feature Selections | ||
| 149 | # | ||
| 150 | # CONFIG_OMAP_RESET_CLOCKS is not set | ||
| 151 | # CONFIG_OMAP_BOOT_TAG is not set | ||
| 152 | CONFIG_OMAP_GPIO_SWITCH=y | ||
| 153 | CONFIG_OMAP_MUX=y | ||
| 154 | # CONFIG_OMAP_MUX_DEBUG is not set | ||
| 155 | CONFIG_OMAP_MUX_WARNINGS=y | ||
| 156 | CONFIG_OMAP_MCBSP=y | ||
| 157 | # CONFIG_OMAP_MMU_FWK is not set | ||
| 158 | # CONFIG_OMAP_MBOX_FWK is not set | ||
| 159 | CONFIG_OMAP_MPU_TIMER=y | ||
| 160 | # CONFIG_OMAP_32K_TIMER is not set | ||
| 161 | CONFIG_OMAP_LL_DEBUG_UART1=y | ||
| 162 | # CONFIG_OMAP_LL_DEBUG_UART2 is not set | ||
| 163 | # CONFIG_OMAP_LL_DEBUG_UART3 is not set | ||
| 164 | CONFIG_OMAP_SERIAL_WAKE=y | ||
| 165 | # CONFIG_OMAP_DSP is not set | ||
| 166 | |||
| 167 | # | ||
| 168 | # OMAP Core Type | ||
| 169 | # | ||
| 170 | # CONFIG_ARCH_OMAP730 is not set | ||
| 171 | CONFIG_ARCH_OMAP15XX=y | ||
| 172 | # CONFIG_ARCH_OMAP16XX is not set | ||
| 173 | |||
| 174 | # | ||
| 175 | # OMAP Board Type | ||
| 176 | # | ||
| 177 | # CONFIG_MACH_OMAP_INNOVATOR is not set | ||
| 178 | # CONFIG_MACH_VOICEBLUE is not set | ||
| 179 | CONFIG_MACH_OMAP_PALMTE=y | ||
| 180 | # CONFIG_MACH_OMAP_PALMZ71 is not set | ||
| 181 | # CONFIG_MACH_OMAP_PALMTT is not set | ||
| 182 | # CONFIG_MACH_SX1 is not set | ||
| 183 | # CONFIG_MACH_AMS_DELTA is not set | ||
| 184 | # CONFIG_MACH_OMAP_GENERIC is not set | ||
| 185 | |||
| 186 | # | ||
| 187 | # OMAP CPU Speed | ||
| 188 | # | ||
| 189 | CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER=y | ||
| 190 | # CONFIG_OMAP_ARM_168MHZ is not set | ||
| 191 | # CONFIG_OMAP_ARM_150MHZ is not set | ||
| 192 | # CONFIG_OMAP_ARM_120MHZ is not set | ||
| 193 | # CONFIG_OMAP_ARM_60MHZ is not set | ||
| 194 | # CONFIG_OMAP_ARM_30MHZ is not set | ||
| 195 | |||
| 196 | # | ||
| 197 | # Processor Type | ||
| 198 | # | ||
| 199 | CONFIG_CPU_32=y | ||
| 200 | CONFIG_CPU_ARM925T=y | ||
| 201 | CONFIG_CPU_32v4T=y | ||
| 202 | CONFIG_CPU_ABRT_EV4T=y | ||
| 203 | CONFIG_CPU_CACHE_V4WT=y | ||
| 204 | CONFIG_CPU_CACHE_VIVT=y | ||
| 205 | CONFIG_CPU_COPY_V4WB=y | ||
| 206 | CONFIG_CPU_TLB_V4WBI=y | ||
| 207 | CONFIG_CPU_CP15=y | ||
| 208 | CONFIG_CPU_CP15_MMU=y | ||
| 209 | |||
| 210 | # | ||
| 211 | # Processor Features | ||
| 212 | # | ||
| 213 | # CONFIG_ARM_THUMB is not set | ||
| 214 | # CONFIG_CPU_ICACHE_DISABLE is not set | ||
| 215 | # CONFIG_CPU_DCACHE_DISABLE is not set | ||
| 216 | # CONFIG_CPU_DCACHE_WRITETHROUGH is not set | ||
| 217 | # CONFIG_OUTER_CACHE is not set | ||
| 218 | |||
| 219 | # | ||
| 220 | # Bus support | ||
| 221 | # | ||
| 222 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 223 | |||
| 224 | # | ||
| 225 | # PCCARD (PCMCIA/CardBus) support | ||
| 226 | # | ||
| 227 | # CONFIG_PCCARD is not set | ||
| 228 | |||
| 229 | # | ||
| 230 | # Kernel Features | ||
| 231 | # | ||
| 232 | # CONFIG_TICK_ONESHOT is not set | ||
| 233 | # CONFIG_NO_HZ is not set | ||
| 234 | # CONFIG_HIGH_RES_TIMERS is not set | ||
| 235 | # CONFIG_PREEMPT is not set | ||
| 236 | CONFIG_HZ=100 | ||
| 237 | # CONFIG_AEABI is not set | ||
| 238 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | ||
| 239 | CONFIG_SELECT_MEMORY_MODEL=y | ||
| 240 | CONFIG_FLATMEM_MANUAL=y | ||
| 241 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
| 242 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
| 243 | CONFIG_FLATMEM=y | ||
| 244 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
| 245 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 246 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | ||
| 247 | # CONFIG_RESOURCES_64BIT is not set | ||
| 248 | CONFIG_ZONE_DMA_FLAG=1 | ||
| 249 | # CONFIG_LEDS is not set | ||
| 250 | CONFIG_ALIGNMENT_TRAP=y | ||
| 251 | |||
| 252 | # | ||
| 253 | # Boot options | ||
| 254 | # | ||
| 255 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
| 256 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
| 257 | CONFIG_CMDLINE="" | ||
| 258 | # CONFIG_XIP_KERNEL is not set | ||
| 259 | # CONFIG_KEXEC is not set | ||
| 260 | |||
| 261 | # | ||
| 262 | # CPU Frequency scaling | ||
| 263 | # | ||
| 264 | # CONFIG_CPU_FREQ is not set | ||
| 265 | |||
| 266 | # | ||
| 267 | # Floating point emulation | ||
| 268 | # | ||
| 269 | |||
| 270 | # | ||
| 271 | # At least one emulation must be selected | ||
| 272 | # | ||
| 273 | CONFIG_FPE_NWFPE=y | ||
| 274 | # CONFIG_FPE_NWFPE_XP is not set | ||
| 275 | # CONFIG_FPE_FASTFPE is not set | ||
| 276 | |||
| 277 | # | ||
| 278 | # Userspace binary formats | ||
| 279 | # | ||
| 280 | CONFIG_BINFMT_ELF=y | ||
| 281 | # CONFIG_BINFMT_AOUT is not set | ||
| 282 | # CONFIG_BINFMT_MISC is not set | ||
| 283 | # CONFIG_ARTHUR is not set | ||
| 284 | |||
| 285 | # | ||
| 286 | # Power management options | ||
| 287 | # | ||
| 288 | # CONFIG_PM is not set | ||
| 289 | |||
| 290 | # | ||
| 291 | # Networking | ||
| 292 | # | ||
| 293 | # CONFIG_NET is not set | ||
| 294 | |||
| 295 | # | ||
| 296 | # Device Drivers | ||
| 297 | # | ||
| 298 | |||
| 299 | # | ||
| 300 | # Generic Driver Options | ||
| 301 | # | ||
| 302 | # CONFIG_STANDALONE is not set | ||
| 303 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set | ||
| 304 | # CONFIG_FW_LOADER is not set | ||
| 305 | # CONFIG_SYS_HYPERVISOR is not set | ||
| 306 | |||
| 307 | # | ||
| 308 | # Connector - unified userspace <-> kernelspace linker | ||
| 309 | # | ||
| 310 | # CONFIG_MTD is not set | ||
| 311 | |||
| 312 | # | ||
| 313 | # Parallel port support | ||
| 314 | # | ||
| 315 | # CONFIG_PARPORT is not set | ||
| 316 | |||
| 317 | # | ||
| 318 | # Plug and Play support | ||
| 319 | # | ||
| 320 | # CONFIG_PNPACPI is not set | ||
| 321 | |||
| 322 | # | ||
| 323 | # Block devices | ||
| 324 | # | ||
| 325 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
| 326 | # CONFIG_BLK_DEV_LOOP is not set | ||
| 327 | # CONFIG_BLK_DEV_RAM is not set | ||
| 328 | # CONFIG_CDROM_PKTCDVD is not set | ||
| 329 | |||
| 330 | # | ||
| 331 | # SCSI device support | ||
| 332 | # | ||
| 333 | # CONFIG_RAID_ATTRS is not set | ||
| 334 | # CONFIG_SCSI is not set | ||
| 335 | # CONFIG_SCSI_NETLINK is not set | ||
| 336 | # CONFIG_ATA is not set | ||
| 337 | |||
| 338 | # | ||
| 339 | # Multi-device support (RAID and LVM) | ||
| 340 | # | ||
| 341 | # CONFIG_MD is not set | ||
| 342 | |||
| 343 | # | ||
| 344 | # ISDN subsystem | ||
| 345 | # | ||
| 346 | |||
| 347 | # | ||
| 348 | # Input device support | ||
| 349 | # | ||
| 350 | CONFIG_INPUT=y | ||
| 351 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
| 352 | |||
| 353 | # | ||
| 354 | # Userland interfaces | ||
| 355 | # | ||
| 356 | CONFIG_INPUT_MOUSEDEV=y | ||
| 357 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set | ||
| 358 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=320 | ||
| 359 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=320 | ||
| 360 | # CONFIG_INPUT_JOYDEV is not set | ||
| 361 | # CONFIG_INPUT_TSDEV is not set | ||
| 362 | # CONFIG_INPUT_EVDEV is not set | ||
| 363 | # CONFIG_INPUT_EVBUG is not set | ||
| 364 | |||
| 365 | # | ||
| 366 | # Input Device Drivers | ||
| 367 | # | ||
| 368 | # CONFIG_INPUT_KEYBOARD is not set | ||
| 369 | # CONFIG_INPUT_MOUSE is not set | ||
| 370 | # CONFIG_INPUT_JOYSTICK is not set | ||
| 371 | # CONFIG_INPUT_TABLET is not set | ||
| 372 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
| 373 | # CONFIG_INPUT_MISC is not set | ||
| 374 | |||
| 375 | # | ||
| 376 | # Hardware I/O ports | ||
| 377 | # | ||
| 378 | # CONFIG_SERIO is not set | ||
| 379 | # CONFIG_GAMEPORT is not set | ||
| 380 | |||
| 381 | # | ||
| 382 | # Character devices | ||
| 383 | # | ||
| 384 | CONFIG_VT=y | ||
| 385 | CONFIG_VT_CONSOLE=y | ||
| 386 | CONFIG_HW_CONSOLE=y | ||
| 387 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
| 388 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
| 389 | |||
| 390 | # | ||
| 391 | # Serial drivers | ||
| 392 | # | ||
| 393 | # CONFIG_SERIAL_8250 is not set | ||
| 394 | |||
| 395 | # | ||
| 396 | # Non-8250 serial port support | ||
| 397 | # | ||
| 398 | CONFIG_UNIX98_PTYS=y | ||
| 399 | # CONFIG_LEGACY_PTYS is not set | ||
| 400 | |||
| 401 | # | ||
| 402 | # IPMI | ||
| 403 | # | ||
| 404 | # CONFIG_IPMI_HANDLER is not set | ||
| 405 | # CONFIG_WATCHDOG is not set | ||
| 406 | CONFIG_HW_RANDOM=y | ||
| 407 | # CONFIG_NVRAM is not set | ||
| 408 | CONFIG_OMAP_RTC=y | ||
| 409 | # CONFIG_R3964 is not set | ||
| 410 | # CONFIG_RAW_DRIVER is not set | ||
| 411 | |||
| 412 | # | ||
| 413 | # TPM devices | ||
| 414 | # | ||
| 415 | # CONFIG_TCG_TPM is not set | ||
| 416 | # CONFIG_I2C is not set | ||
| 417 | |||
| 418 | # | ||
| 419 | # SPI support | ||
| 420 | # | ||
| 421 | # CONFIG_SPI is not set | ||
| 422 | # CONFIG_SPI_MASTER is not set | ||
| 423 | |||
| 424 | # | ||
| 425 | # Dallas's 1-wire bus | ||
| 426 | # | ||
| 427 | # CONFIG_W1 is not set | ||
| 428 | # CONFIG_HWMON is not set | ||
| 429 | |||
| 430 | # | ||
| 431 | # Misc devices | ||
| 432 | # | ||
| 433 | # CONFIG_BLINK is not set | ||
| 434 | |||
| 435 | # | ||
| 436 | # Multifunction device drivers | ||
| 437 | # | ||
| 438 | # CONFIG_MFD_SM501 is not set | ||
| 439 | |||
| 440 | # | ||
| 441 | # LED devices | ||
| 442 | # | ||
| 443 | # CONFIG_NEW_LEDS is not set | ||
| 444 | |||
| 445 | # | ||
| 446 | # LED drivers | ||
| 447 | # | ||
| 448 | |||
| 449 | # | ||
| 450 | # LED Triggers | ||
| 451 | # | ||
| 452 | |||
| 453 | # | ||
| 454 | # Multimedia devices | ||
| 455 | # | ||
| 456 | # CONFIG_VIDEO_DEV is not set | ||
| 457 | CONFIG_DAB=y | ||
| 458 | |||
| 459 | # | ||
| 460 | # Graphics support | ||
| 461 | # | ||
| 462 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 463 | |||
| 464 | # | ||
| 465 | # Display device support | ||
| 466 | # | ||
| 467 | # CONFIG_DISPLAY_SUPPORT is not set | ||
| 468 | # CONFIG_VGASTATE is not set | ||
| 469 | CONFIG_FB=y | ||
| 470 | # CONFIG_FIRMWARE_EDID is not set | ||
| 471 | # CONFIG_FB_DDC is not set | ||
| 472 | # CONFIG_FB_CFB_FILLRECT is not set | ||
| 473 | # CONFIG_FB_CFB_COPYAREA is not set | ||
| 474 | # CONFIG_FB_CFB_IMAGEBLIT is not set | ||
| 475 | # CONFIG_FB_SYS_FILLRECT is not set | ||
| 476 | # CONFIG_FB_SYS_COPYAREA is not set | ||
| 477 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
| 478 | # CONFIG_FB_SYS_FOPS is not set | ||
| 479 | CONFIG_FB_DEFERRED_IO=y | ||
| 480 | # CONFIG_FB_SVGALIB is not set | ||
| 481 | # CONFIG_FB_MACMODES is not set | ||
| 482 | # CONFIG_FB_BACKLIGHT is not set | ||
| 483 | # CONFIG_FB_MODE_HELPERS is not set | ||
| 484 | # CONFIG_FB_TILEBLITTING is not set | ||
| 485 | |||
| 486 | # | ||
| 487 | # Frame buffer hardware drivers | ||
| 488 | # | ||
| 489 | # CONFIG_FB_S1D13XXX is not set | ||
| 490 | CONFIG_FB_OMAP=y | ||
| 491 | # CONFIG_FB_OMAP_LCDC_EXTERNAL is not set | ||
| 492 | # CONFIG_FB_OMAP_LCD_MIPID is not set | ||
| 493 | # CONFIG_FB_OMAP_BOOTLOADER_INIT is not set | ||
| 494 | CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2 | ||
| 495 | # CONFIG_FB_OMAP_DMA_TUNE is not set | ||
| 496 | # CONFIG_FB_VIRTUAL is not set | ||
| 497 | |||
| 498 | # | ||
| 499 | # Console display driver support | ||
| 500 | # | ||
| 501 | # CONFIG_VGA_CONSOLE is not set | ||
| 502 | CONFIG_DUMMY_CONSOLE=y | ||
| 503 | CONFIG_FRAMEBUFFER_CONSOLE=y | ||
| 504 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | ||
| 505 | # CONFIG_FONTS is not set | ||
| 506 | CONFIG_FONT_8x8=y | ||
| 507 | CONFIG_FONT_8x16=y | ||
| 508 | CONFIG_LOGO=y | ||
| 509 | # CONFIG_LOGO_LINUX_MONO is not set | ||
| 510 | # CONFIG_LOGO_LINUX_VGA16 is not set | ||
| 511 | CONFIG_LOGO_LINUX_CLUT224=y | ||
| 512 | |||
| 513 | # | ||
| 514 | # Sound | ||
| 515 | # | ||
| 516 | # CONFIG_SOUND is not set | ||
| 517 | |||
| 518 | # | ||
| 519 | # HID Devices | ||
| 520 | # | ||
| 521 | CONFIG_HID=y | ||
| 522 | # CONFIG_HID_DEBUG is not set | ||
| 523 | |||
| 524 | # | ||
| 525 | # USB support | ||
| 526 | # | ||
| 527 | CONFIG_USB_ARCH_HAS_HCD=y | ||
| 528 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
| 529 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
| 530 | # CONFIG_USB is not set | ||
| 531 | # CONFIG_USB_MUSB_HDRC is not set | ||
| 532 | # CONFIG_USB_GADGET_MUSB_HDRC is not set | ||
| 533 | |||
| 534 | # | ||
| 535 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
| 536 | # | ||
| 537 | |||
| 538 | # | ||
| 539 | # USB Gadget Support | ||
| 540 | # | ||
| 541 | CONFIG_USB_GADGET=y | ||
| 542 | # CONFIG_USB_GADGET_DEBUG_FILES is not set | ||
| 543 | CONFIG_USB_GADGET_SELECTED=y | ||
| 544 | # CONFIG_USB_GADGET_FSL_USB2 is not set | ||
| 545 | # CONFIG_USB_GADGET_NET2280 is not set | ||
| 546 | # CONFIG_USB_GADGET_PXA2XX is not set | ||
| 547 | # CONFIG_USB_GADGET_GOKU is not set | ||
| 548 | # CONFIG_USB_GADGET_LH7A40X is not set | ||
| 549 | CONFIG_USB_GADGET_OMAP=y | ||
| 550 | CONFIG_USB_OMAP=y | ||
| 551 | # CONFIG_USB_GADGET_AT91 is not set | ||
| 552 | # CONFIG_USB_GADGET_DUMMY_HCD is not set | ||
| 553 | # CONFIG_USB_GADGET_DUALSPEED is not set | ||
| 554 | CONFIG_USB_ZERO=y | ||
| 555 | # CONFIG_USB_ETH is not set | ||
| 556 | # CONFIG_USB_GADGETFS is not set | ||
| 557 | # CONFIG_USB_FILE_STORAGE is not set | ||
| 558 | # CONFIG_USB_G_SERIAL is not set | ||
| 559 | # CONFIG_USB_MIDI_GADGET is not set | ||
| 560 | CONFIG_MMC=y | ||
| 561 | # CONFIG_MMC_DEBUG is not set | ||
| 562 | # CONFIG_MMC_UNSAFE_RESUME is not set | ||
| 563 | |||
| 564 | # | ||
| 565 | # MMC/SD Card Drivers | ||
| 566 | # | ||
| 567 | CONFIG_MMC_BLOCK=y | ||
| 568 | |||
| 569 | # | ||
| 570 | # MMC/SD Host Controller Drivers | ||
| 571 | # | ||
| 572 | CONFIG_MMC_OMAP=y | ||
| 573 | |||
| 574 | # | ||
| 575 | # Real Time Clock | ||
| 576 | # | ||
| 577 | CONFIG_RTC_LIB=y | ||
| 578 | # CONFIG_RTC_CLASS is not set | ||
| 579 | |||
| 580 | # | ||
| 581 | # CBUS support | ||
| 582 | # | ||
| 583 | # CONFIG_CBUS is not set | ||
| 584 | |||
| 585 | # | ||
| 586 | # File systems | ||
| 587 | # | ||
| 588 | CONFIG_EXT2_FS=y | ||
| 589 | # CONFIG_EXT2_FS_XATTR is not set | ||
| 590 | # CONFIG_EXT2_FS_XIP is not set | ||
| 591 | # CONFIG_EXT3_FS is not set | ||
| 592 | # CONFIG_EXT4DEV_FS is not set | ||
| 593 | # CONFIG_REISERFS_FS is not set | ||
| 594 | # CONFIG_JFS_FS is not set | ||
| 595 | # CONFIG_FS_POSIX_ACL is not set | ||
| 596 | # CONFIG_XFS_FS is not set | ||
| 597 | # CONFIG_GFS2_FS is not set | ||
| 598 | # CONFIG_MINIX_FS is not set | ||
| 599 | # CONFIG_ROMFS_FS is not set | ||
| 600 | # CONFIG_INOTIFY is not set | ||
| 601 | # CONFIG_QUOTA is not set | ||
| 602 | CONFIG_DNOTIFY=y | ||
| 603 | # CONFIG_AUTOFS_FS is not set | ||
| 604 | # CONFIG_AUTOFS4_FS is not set | ||
| 605 | # CONFIG_FUSE_FS is not set | ||
| 606 | |||
| 607 | # | ||
| 608 | # CD-ROM/DVD Filesystems | ||
| 609 | # | ||
| 610 | # CONFIG_ISO9660_FS is not set | ||
| 611 | # CONFIG_UDF_FS is not set | ||
| 612 | |||
| 613 | # | ||
| 614 | # DOS/FAT/NT Filesystems | ||
| 615 | # | ||
| 616 | CONFIG_FAT_FS=y | ||
| 617 | CONFIG_MSDOS_FS=y | ||
| 618 | CONFIG_VFAT_FS=y | ||
| 619 | CONFIG_FAT_DEFAULT_CODEPAGE=850 | ||
| 620 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | ||
| 621 | # CONFIG_NTFS_FS is not set | ||
| 622 | |||
| 623 | # | ||
| 624 | # Pseudo filesystems | ||
| 625 | # | ||
| 626 | CONFIG_PROC_FS=y | ||
| 627 | CONFIG_PROC_SYSCTL=y | ||
| 628 | CONFIG_SYSFS=y | ||
| 629 | CONFIG_TMPFS=y | ||
| 630 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
| 631 | # CONFIG_HUGETLB_PAGE is not set | ||
| 632 | CONFIG_RAMFS=y | ||
| 633 | # CONFIG_CONFIGFS_FS is not set | ||
| 634 | |||
| 635 | # | ||
| 636 | # Miscellaneous filesystems | ||
| 637 | # | ||
| 638 | # CONFIG_ADFS_FS is not set | ||
| 639 | # CONFIG_AFFS_FS is not set | ||
| 640 | # CONFIG_HFS_FS is not set | ||
| 641 | # CONFIG_HFSPLUS_FS is not set | ||
| 642 | # CONFIG_BEFS_FS is not set | ||
| 643 | # CONFIG_BFS_FS is not set | ||
| 644 | # CONFIG_EFS_FS is not set | ||
| 645 | CONFIG_CRAMFS=y | ||
| 646 | # CONFIG_VXFS_FS is not set | ||
| 647 | # CONFIG_HPFS_FS is not set | ||
| 648 | # CONFIG_QNX4FS_FS is not set | ||
| 649 | # CONFIG_SYSV_FS is not set | ||
| 650 | # CONFIG_UFS_FS is not set | ||
| 651 | |||
| 652 | # | ||
| 653 | # Partition Types | ||
| 654 | # | ||
| 655 | CONFIG_PARTITION_ADVANCED=y | ||
| 656 | # CONFIG_ACORN_PARTITION is not set | ||
| 657 | # CONFIG_OSF_PARTITION is not set | ||
| 658 | # CONFIG_AMIGA_PARTITION is not set | ||
| 659 | # CONFIG_ATARI_PARTITION is not set | ||
| 660 | # CONFIG_MAC_PARTITION is not set | ||
| 661 | CONFIG_MSDOS_PARTITION=y | ||
| 662 | # CONFIG_BSD_DISKLABEL is not set | ||
| 663 | # CONFIG_MINIX_SUBPARTITION is not set | ||
| 664 | # CONFIG_SOLARIS_X86_PARTITION is not set | ||
| 665 | # CONFIG_UNIXWARE_DISKLABEL is not set | ||
| 666 | # CONFIG_LDM_PARTITION is not set | ||
| 667 | # CONFIG_SGI_PARTITION is not set | ||
| 668 | # CONFIG_ULTRIX_PARTITION is not set | ||
| 669 | # CONFIG_SUN_PARTITION is not set | ||
| 670 | # CONFIG_KARMA_PARTITION is not set | ||
| 671 | # CONFIG_EFI_PARTITION is not set | ||
| 672 | # CONFIG_SYSV68_PARTITION is not set | ||
| 673 | |||
| 674 | # | ||
| 675 | # Native Language Support | ||
| 676 | # | ||
| 677 | CONFIG_NLS=y | ||
| 678 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
| 679 | # CONFIG_NLS_CODEPAGE_437 is not set | ||
| 680 | # CONFIG_NLS_CODEPAGE_737 is not set | ||
| 681 | # CONFIG_NLS_CODEPAGE_775 is not set | ||
| 682 | CONFIG_NLS_CODEPAGE_850=y | ||
| 683 | # CONFIG_NLS_CODEPAGE_852 is not set | ||
| 684 | # CONFIG_NLS_CODEPAGE_855 is not set | ||
| 685 | # CONFIG_NLS_CODEPAGE_857 is not set | ||
| 686 | # CONFIG_NLS_CODEPAGE_860 is not set | ||
| 687 | # CONFIG_NLS_CODEPAGE_861 is not set | ||
| 688 | # CONFIG_NLS_CODEPAGE_862 is not set | ||
| 689 | # CONFIG_NLS_CODEPAGE_863 is not set | ||
| 690 | # CONFIG_NLS_CODEPAGE_864 is not set | ||
| 691 | # CONFIG_NLS_CODEPAGE_865 is not set | ||
| 692 | # CONFIG_NLS_CODEPAGE_866 is not set | ||
| 693 | # CONFIG_NLS_CODEPAGE_869 is not set | ||
| 694 | # CONFIG_NLS_CODEPAGE_936 is not set | ||
| 695 | # CONFIG_NLS_CODEPAGE_950 is not set | ||
| 696 | # CONFIG_NLS_CODEPAGE_932 is not set | ||
| 697 | # CONFIG_NLS_CODEPAGE_949 is not set | ||
| 698 | # CONFIG_NLS_CODEPAGE_874 is not set | ||
| 699 | # CONFIG_NLS_ISO8859_8 is not set | ||
| 700 | # CONFIG_NLS_CODEPAGE_1250 is not set | ||
| 701 | # CONFIG_NLS_CODEPAGE_1251 is not set | ||
| 702 | # CONFIG_NLS_ASCII is not set | ||
| 703 | CONFIG_NLS_ISO8859_1=y | ||
| 704 | # CONFIG_NLS_ISO8859_2 is not set | ||
| 705 | # CONFIG_NLS_ISO8859_3 is not set | ||
| 706 | # CONFIG_NLS_ISO8859_4 is not set | ||
| 707 | # CONFIG_NLS_ISO8859_5 is not set | ||
| 708 | # CONFIG_NLS_ISO8859_6 is not set | ||
| 709 | # CONFIG_NLS_ISO8859_7 is not set | ||
| 710 | # CONFIG_NLS_ISO8859_9 is not set | ||
| 711 | # CONFIG_NLS_ISO8859_13 is not set | ||
| 712 | # CONFIG_NLS_ISO8859_14 is not set | ||
| 713 | # CONFIG_NLS_ISO8859_15 is not set | ||
| 714 | # CONFIG_NLS_KOI8_R is not set | ||
| 715 | # CONFIG_NLS_KOI8_U is not set | ||
| 716 | # CONFIG_NLS_UTF8 is not set | ||
| 717 | |||
| 718 | # | ||
| 719 | # Profiling support | ||
| 720 | # | ||
| 721 | # CONFIG_PROFILING is not set | ||
| 722 | |||
| 723 | # | ||
| 724 | # Kernel hacking | ||
| 725 | # | ||
| 726 | # CONFIG_PRINTK_TIME is not set | ||
| 727 | CONFIG_ENABLE_MUST_CHECK=y | ||
| 728 | # CONFIG_MAGIC_SYSRQ is not set | ||
| 729 | # CONFIG_UNUSED_SYMBOLS is not set | ||
| 730 | # CONFIG_DEBUG_FS is not set | ||
| 731 | # CONFIG_HEADERS_CHECK is not set | ||
| 732 | # CONFIG_DEBUG_KERNEL is not set | ||
| 733 | CONFIG_DEBUG_BUGVERBOSE=y | ||
| 734 | CONFIG_FRAME_POINTER=y | ||
| 735 | # CONFIG_DEBUG_USER is not set | ||
| 736 | |||
| 737 | # | ||
| 738 | # Security options | ||
| 739 | # | ||
| 740 | # CONFIG_KEYS is not set | ||
| 741 | # CONFIG_SECURITY is not set | ||
| 742 | |||
| 743 | # | ||
| 744 | # Cryptographic options | ||
| 745 | # | ||
| 746 | # CONFIG_CRYPTO is not set | ||
| 747 | |||
| 748 | # | ||
| 749 | # Library routines | ||
| 750 | # | ||
| 751 | CONFIG_BITREVERSE=y | ||
| 752 | CONFIG_CRC_CCITT=y | ||
| 753 | # CONFIG_CRC16 is not set | ||
| 754 | # CONFIG_CRC_ITU_T is not set | ||
| 755 | CONFIG_CRC32=y | ||
| 756 | # CONFIG_LIBCRC32C is not set | ||
| 757 | CONFIG_ZLIB_INFLATE=y | ||
| 758 | CONFIG_PLIST=y | ||
| 759 | CONFIG_HAS_IOMEM=y | ||
| 760 | CONFIG_HAS_IOPORT=y | ||
| 761 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/arm/configs/palmtt_defconfig b/arch/arm/configs/palmtt_defconfig new file mode 100644 index 000000000000..e54ced41217e --- /dev/null +++ b/arch/arm/configs/palmtt_defconfig | |||
| @@ -0,0 +1,844 @@ | |||
| 1 | # | ||
| 2 | # Automatically generated make config: don't edit | ||
| 3 | # Linux kernel version: 2.6.19-rc3-omap1 | ||
| 4 | # Sun Oct 29 00:36:12 2006 | ||
| 5 | # | ||
| 6 | CONFIG_ARM=y | ||
| 7 | # CONFIG_GENERIC_TIME is not set | ||
| 8 | CONFIG_MMU=y | ||
| 9 | CONFIG_GENERIC_HARDIRQS=y | ||
| 10 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
| 11 | CONFIG_HARDIRQS_SW_RESEND=y | ||
| 12 | CONFIG_GENERIC_IRQ_PROBE=y | ||
| 13 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
| 14 | CONFIG_GENERIC_HWEIGHT=y | ||
| 15 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
| 16 | CONFIG_VECTORS_BASE=0xffff0000 | ||
| 17 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
| 18 | |||
| 19 | # | ||
| 20 | # Code maturity level options | ||
| 21 | # | ||
| 22 | CONFIG_EXPERIMENTAL=y | ||
| 23 | CONFIG_BROKEN_ON_SMP=y | ||
| 24 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 25 | |||
| 26 | # | ||
| 27 | # General setup | ||
| 28 | # | ||
| 29 | CONFIG_LOCALVERSION="" | ||
| 30 | CONFIG_LOCALVERSION_AUTO=y | ||
| 31 | CONFIG_SWAP=y | ||
| 32 | CONFIG_SYSVIPC=y | ||
| 33 | # CONFIG_IPC_NS is not set | ||
| 34 | # CONFIG_POSIX_MQUEUE is not set | ||
| 35 | CONFIG_BSD_PROCESS_ACCT=y | ||
| 36 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | ||
| 37 | # CONFIG_TASKSTATS is not set | ||
| 38 | # CONFIG_UTS_NS is not set | ||
| 39 | # CONFIG_AUDIT is not set | ||
| 40 | # CONFIG_IKCONFIG is not set | ||
| 41 | # CONFIG_RELAY is not set | ||
| 42 | CONFIG_INITRAMFS_SOURCE="" | ||
| 43 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
| 44 | CONFIG_SYSCTL=y | ||
| 45 | # CONFIG_EMBEDDED is not set | ||
| 46 | CONFIG_UID16=y | ||
| 47 | # CONFIG_SYSCTL_SYSCALL is not set | ||
| 48 | CONFIG_KALLSYMS=y | ||
| 49 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 50 | CONFIG_HOTPLUG=y | ||
| 51 | CONFIG_PRINTK=y | ||
| 52 | CONFIG_BUG=y | ||
| 53 | CONFIG_ELF_CORE=y | ||
| 54 | CONFIG_BASE_FULL=y | ||
| 55 | CONFIG_FUTEX=y | ||
| 56 | CONFIG_EPOLL=y | ||
| 57 | CONFIG_SHMEM=y | ||
| 58 | CONFIG_SLAB=y | ||
| 59 | CONFIG_VM_EVENT_COUNTERS=y | ||
| 60 | CONFIG_RT_MUTEXES=y | ||
| 61 | # CONFIG_TINY_SHMEM is not set | ||
| 62 | CONFIG_BASE_SMALL=0 | ||
| 63 | # CONFIG_SLOB is not set | ||
| 64 | |||
| 65 | # | ||
| 66 | # Loadable module support | ||
| 67 | # | ||
| 68 | # CONFIG_MODULES is not set | ||
| 69 | |||
| 70 | # | ||
| 71 | # Block layer | ||
| 72 | # | ||
| 73 | CONFIG_BLOCK=y | ||
| 74 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 75 | |||
| 76 | # | ||
| 77 | # IO Schedulers | ||
| 78 | # | ||
| 79 | CONFIG_IOSCHED_NOOP=y | ||
| 80 | # CONFIG_IOSCHED_AS is not set | ||
| 81 | # CONFIG_IOSCHED_DEADLINE is not set | ||
| 82 | # CONFIG_IOSCHED_CFQ is not set | ||
| 83 | # CONFIG_DEFAULT_AS is not set | ||
| 84 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 85 | # CONFIG_DEFAULT_CFQ is not set | ||
| 86 | CONFIG_DEFAULT_NOOP=y | ||
| 87 | CONFIG_DEFAULT_IOSCHED="noop" | ||
| 88 | |||
| 89 | # | ||
| 90 | # System Type | ||
| 91 | # | ||
| 92 | # CONFIG_ARCH_AAEC2000 is not set | ||
| 93 | # CONFIG_ARCH_INTEGRATOR is not set | ||
| 94 | # CONFIG_ARCH_REALVIEW is not set | ||
| 95 | # CONFIG_ARCH_VERSATILE is not set | ||
| 96 | # CONFIG_ARCH_AT91 is not set | ||
| 97 | # CONFIG_ARCH_CLPS7500 is not set | ||
| 98 | # CONFIG_ARCH_CLPS711X is not set | ||
| 99 | # CONFIG_ARCH_CO285 is not set | ||
| 100 | # CONFIG_ARCH_EBSA110 is not set | ||
| 101 | # CONFIG_ARCH_EP93XX is not set | ||
| 102 | # CONFIG_ARCH_FOOTBRIDGE is not set | ||
| 103 | # CONFIG_ARCH_NETX is not set | ||
| 104 | # CONFIG_ARCH_H720X is not set | ||
| 105 | # CONFIG_ARCH_IMX is not set | ||
| 106 | # CONFIG_ARCH_IOP32X is not set | ||
| 107 | # CONFIG_ARCH_IOP33X is not set | ||
| 108 | # CONFIG_ARCH_IXP4XX is not set | ||
| 109 | # CONFIG_ARCH_IXP2000 is not set | ||
| 110 | # CONFIG_ARCH_IXP23XX is not set | ||
| 111 | # CONFIG_ARCH_L7200 is not set | ||
| 112 | # CONFIG_ARCH_PNX4008 is not set | ||
| 113 | # CONFIG_ARCH_PXA is not set | ||
| 114 | # CONFIG_ARCH_RPC is not set | ||
| 115 | # CONFIG_ARCH_SA1100 is not set | ||
| 116 | # CONFIG_ARCH_S3C2410 is not set | ||
| 117 | # CONFIG_ARCH_SHARK is not set | ||
| 118 | # CONFIG_ARCH_LH7A40X is not set | ||
| 119 | CONFIG_ARCH_OMAP=y | ||
| 120 | |||
| 121 | # | ||
| 122 | # TI OMAP Implementations | ||
| 123 | # | ||
| 124 | CONFIG_ARCH_OMAP1=y | ||
| 125 | # CONFIG_ARCH_OMAP2 is not set | ||
| 126 | |||
| 127 | # | ||
| 128 | # OMAP Feature Selections | ||
| 129 | # | ||
| 130 | # CONFIG_OMAP_RESET_CLOCKS is not set | ||
| 131 | # CONFIG_OMAP_BOOT_TAG is not set | ||
| 132 | # CONFIG_OMAP_GPIO_SWITCH is not set | ||
| 133 | CONFIG_OMAP_MUX=y | ||
| 134 | # CONFIG_OMAP_MUX_DEBUG is not set | ||
| 135 | CONFIG_OMAP_MUX_WARNINGS=y | ||
| 136 | CONFIG_OMAP_MCBSP=y | ||
| 137 | CONFIG_OMAP_MPU_TIMER=y | ||
| 138 | # CONFIG_OMAP_32K_TIMER is not set | ||
| 139 | # CONFIG_OMAP_LL_DEBUG_UART1 is not set | ||
| 140 | CONFIG_OMAP_LL_DEBUG_UART2=y | ||
| 141 | # CONFIG_OMAP_LL_DEBUG_UART3 is not set | ||
| 142 | CONFIG_OMAP_SERIAL_WAKE=y | ||
| 143 | CONFIG_OMAP_DSP=y | ||
| 144 | # CONFIG_OMAP_DSP_MBCMD_VERBOSE is not set | ||
| 145 | # CONFIG_OMAP_DSP_TASK_MULTIOPEN is not set | ||
| 146 | CONFIG_OMAP_DSP_FBEXPORT=y | ||
| 147 | |||
| 148 | # | ||
| 149 | # OMAP Core Type | ||
| 150 | # | ||
| 151 | # CONFIG_ARCH_OMAP730 is not set | ||
| 152 | CONFIG_ARCH_OMAP15XX=y | ||
| 153 | # CONFIG_ARCH_OMAP16XX is not set | ||
| 154 | |||
| 155 | # | ||
| 156 | # OMAP Board Type | ||
| 157 | # | ||
| 158 | # CONFIG_MACH_OMAP_INNOVATOR is not set | ||
| 159 | # CONFIG_MACH_VOICEBLUE is not set | ||
| 160 | # CONFIG_MACH_OMAP_PALMTE is not set | ||
| 161 | # CONFIG_MACH_OMAP_PALMZ71 is not set | ||
| 162 | CONFIG_MACH_OMAP_PALMTT=y | ||
| 163 | # CONFIG_MACH_AMS_DELTA is not set | ||
| 164 | # CONFIG_MACH_OMAP_GENERIC is not set | ||
| 165 | |||
| 166 | # | ||
| 167 | # OMAP CPU Speed | ||
| 168 | # | ||
| 169 | CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER=y | ||
| 170 | # CONFIG_OMAP_ARM_168MHZ is not set | ||
| 171 | # CONFIG_OMAP_ARM_150MHZ is not set | ||
| 172 | # CONFIG_OMAP_ARM_120MHZ is not set | ||
| 173 | # CONFIG_OMAP_ARM_60MHZ is not set | ||
| 174 | # CONFIG_OMAP_ARM_30MHZ is not set | ||
| 175 | |||
| 176 | # | ||
| 177 | # Processor Type | ||
| 178 | # | ||
| 179 | CONFIG_CPU_32=y | ||
| 180 | CONFIG_CPU_ARM925T=y | ||
| 181 | CONFIG_CPU_32v4T=y | ||
| 182 | CONFIG_CPU_ABRT_EV4T=y | ||
| 183 | CONFIG_CPU_CACHE_V4WT=y | ||
| 184 | CONFIG_CPU_CACHE_VIVT=y | ||
| 185 | CONFIG_CPU_COPY_V4WB=y | ||
| 186 | CONFIG_CPU_TLB_V4WBI=y | ||
| 187 | CONFIG_CPU_CP15=y | ||
| 188 | CONFIG_CPU_CP15_MMU=y | ||
| 189 | |||
| 190 | # | ||
| 191 | # Processor Features | ||
| 192 | # | ||
| 193 | CONFIG_ARM_THUMB=y | ||
| 194 | # CONFIG_CPU_ICACHE_DISABLE is not set | ||
| 195 | # CONFIG_CPU_DCACHE_DISABLE is not set | ||
| 196 | # CONFIG_CPU_DCACHE_WRITETHROUGH is not set | ||
| 197 | |||
| 198 | # | ||
| 199 | # Bus support | ||
| 200 | # | ||
| 201 | |||
| 202 | # | ||
| 203 | # PCCARD (PCMCIA/CardBus) support | ||
| 204 | # | ||
| 205 | # CONFIG_PCCARD is not set | ||
| 206 | |||
| 207 | # | ||
| 208 | # Kernel Features | ||
| 209 | # | ||
| 210 | # CONFIG_PREEMPT is not set | ||
| 211 | # CONFIG_NO_IDLE_HZ is not set | ||
| 212 | CONFIG_HZ=100 | ||
| 213 | # CONFIG_AEABI is not set | ||
| 214 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | ||
| 215 | CONFIG_SELECT_MEMORY_MODEL=y | ||
| 216 | CONFIG_FLATMEM_MANUAL=y | ||
| 217 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
| 218 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
| 219 | CONFIG_FLATMEM=y | ||
| 220 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
| 221 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 222 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | ||
| 223 | # CONFIG_RESOURCES_64BIT is not set | ||
| 224 | # CONFIG_LEDS is not set | ||
| 225 | CONFIG_ALIGNMENT_TRAP=y | ||
| 226 | |||
| 227 | # | ||
| 228 | # Boot options | ||
| 229 | # | ||
| 230 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
| 231 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
| 232 | CONFIG_CMDLINE="root=/dev/mmcblk0p2 rw init=/init" | ||
| 233 | # CONFIG_XIP_KERNEL is not set | ||
| 234 | |||
| 235 | # | ||
| 236 | # CPU Frequency scaling | ||
| 237 | # | ||
| 238 | # CONFIG_CPU_FREQ is not set | ||
| 239 | |||
| 240 | # | ||
| 241 | # Floating point emulation | ||
| 242 | # | ||
| 243 | |||
| 244 | # | ||
| 245 | # At least one emulation must be selected | ||
| 246 | # | ||
| 247 | CONFIG_FPE_NWFPE=y | ||
| 248 | # CONFIG_FPE_NWFPE_XP is not set | ||
| 249 | # CONFIG_FPE_FASTFPE is not set | ||
| 250 | |||
| 251 | # | ||
| 252 | # Userspace binary formats | ||
| 253 | # | ||
| 254 | CONFIG_BINFMT_ELF=y | ||
| 255 | # CONFIG_BINFMT_AOUT is not set | ||
| 256 | # CONFIG_BINFMT_MISC is not set | ||
| 257 | # CONFIG_ARTHUR is not set | ||
| 258 | |||
| 259 | # | ||
| 260 | # Power management options | ||
| 261 | # | ||
| 262 | # CONFIG_PM is not set | ||
| 263 | # CONFIG_APM is not set | ||
| 264 | |||
| 265 | # | ||
| 266 | # Networking | ||
| 267 | # | ||
| 268 | CONFIG_NET=y | ||
| 269 | |||
| 270 | # | ||
| 271 | # Networking options | ||
| 272 | # | ||
| 273 | # CONFIG_NETDEBUG is not set | ||
| 274 | CONFIG_PACKET=y | ||
| 275 | # CONFIG_PACKET_MMAP is not set | ||
| 276 | CONFIG_UNIX=y | ||
| 277 | CONFIG_XFRM=y | ||
| 278 | # CONFIG_XFRM_USER is not set | ||
| 279 | # CONFIG_XFRM_SUB_POLICY is not set | ||
| 280 | CONFIG_NET_KEY=y | ||
| 281 | CONFIG_INET=y | ||
| 282 | # CONFIG_IP_MULTICAST is not set | ||
| 283 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
| 284 | CONFIG_IP_FIB_HASH=y | ||
| 285 | # CONFIG_IP_PNP is not set | ||
| 286 | # CONFIG_NET_IPIP is not set | ||
| 287 | # CONFIG_NET_IPGRE is not set | ||
| 288 | # CONFIG_ARPD is not set | ||
| 289 | # CONFIG_SYN_COOKIES is not set | ||
| 290 | # CONFIG_INET_AH is not set | ||
| 291 | # CONFIG_INET_ESP is not set | ||
| 292 | # CONFIG_INET_IPCOMP is not set | ||
| 293 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
| 294 | # CONFIG_INET_TUNNEL is not set | ||
| 295 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | ||
| 296 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | ||
| 297 | # CONFIG_INET_XFRM_MODE_BEET is not set | ||
| 298 | # CONFIG_INET_DIAG is not set | ||
| 299 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
| 300 | CONFIG_TCP_CONG_CUBIC=y | ||
| 301 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
| 302 | # CONFIG_IPV6 is not set | ||
| 303 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 304 | # CONFIG_INET6_TUNNEL is not set | ||
| 305 | # CONFIG_NETWORK_SECMARK is not set | ||
| 306 | # CONFIG_NETFILTER is not set | ||
| 307 | |||
| 308 | # | ||
| 309 | # DCCP Configuration (EXPERIMENTAL) | ||
| 310 | # | ||
| 311 | # CONFIG_IP_DCCP is not set | ||
| 312 | |||
| 313 | # | ||
| 314 | # SCTP Configuration (EXPERIMENTAL) | ||
| 315 | # | ||
| 316 | # CONFIG_IP_SCTP is not set | ||
| 317 | |||
| 318 | # | ||
| 319 | # TIPC Configuration (EXPERIMENTAL) | ||
| 320 | # | ||
| 321 | # CONFIG_TIPC is not set | ||
| 322 | # CONFIG_ATM is not set | ||
| 323 | # CONFIG_BRIDGE is not set | ||
| 324 | # CONFIG_VLAN_8021Q is not set | ||
| 325 | # CONFIG_DECNET is not set | ||
| 326 | # CONFIG_LLC2 is not set | ||
| 327 | # CONFIG_IPX is not set | ||
| 328 | # CONFIG_ATALK is not set | ||
| 329 | # CONFIG_X25 is not set | ||
| 330 | # CONFIG_LAPB is not set | ||
| 331 | # CONFIG_ECONET is not set | ||
| 332 | # CONFIG_WAN_ROUTER is not set | ||
| 333 | |||
| 334 | # | ||
| 335 | # QoS and/or fair queueing | ||
| 336 | # | ||
| 337 | # CONFIG_NET_SCHED is not set | ||
| 338 | |||
| 339 | # | ||
| 340 | # Network testing | ||
| 341 | # | ||
| 342 | # CONFIG_NET_PKTGEN is not set | ||
| 343 | # CONFIG_HAMRADIO is not set | ||
| 344 | # CONFIG_IRDA is not set | ||
| 345 | # CONFIG_BT is not set | ||
| 346 | # CONFIG_IEEE80211 is not set | ||
| 347 | |||
| 348 | # | ||
| 349 | # Device Drivers | ||
| 350 | # | ||
| 351 | |||
| 352 | # | ||
| 353 | # Generic Driver Options | ||
| 354 | # | ||
| 355 | CONFIG_STANDALONE=y | ||
| 356 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
| 357 | # CONFIG_FW_LOADER is not set | ||
| 358 | # CONFIG_SYS_HYPERVISOR is not set | ||
| 359 | |||
| 360 | # | ||
| 361 | # Connector - unified userspace <-> kernelspace linker | ||
| 362 | # | ||
| 363 | # CONFIG_CONNECTOR is not set | ||
| 364 | |||
| 365 | # | ||
| 366 | # Memory Technology Devices (MTD) | ||
| 367 | # | ||
| 368 | # CONFIG_MTD is not set | ||
| 369 | |||
| 370 | # | ||
| 371 | # Parallel port support | ||
| 372 | # | ||
| 373 | # CONFIG_PARPORT is not set | ||
| 374 | |||
| 375 | # | ||
| 376 | # Plug and Play support | ||
| 377 | # | ||
| 378 | |||
| 379 | # | ||
| 380 | # Block devices | ||
| 381 | # | ||
| 382 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
| 383 | # CONFIG_BLK_DEV_LOOP is not set | ||
| 384 | # CONFIG_BLK_DEV_NBD is not set | ||
| 385 | # CONFIG_BLK_DEV_RAM is not set | ||
| 386 | # CONFIG_BLK_DEV_INITRD is not set | ||
| 387 | # CONFIG_CDROM_PKTCDVD is not set | ||
| 388 | # CONFIG_ATA_OVER_ETH is not set | ||
| 389 | |||
| 390 | # | ||
| 391 | # SCSI device support | ||
| 392 | # | ||
| 393 | # CONFIG_RAID_ATTRS is not set | ||
| 394 | # CONFIG_SCSI is not set | ||
| 395 | # CONFIG_SCSI_NETLINK is not set | ||
| 396 | |||
| 397 | # | ||
| 398 | # Multi-device support (RAID and LVM) | ||
| 399 | # | ||
| 400 | # CONFIG_MD is not set | ||
| 401 | |||
| 402 | # | ||
| 403 | # Fusion MPT device support | ||
| 404 | # | ||
| 405 | # CONFIG_FUSION is not set | ||
| 406 | |||
| 407 | # | ||
| 408 | # IEEE 1394 (FireWire) support | ||
| 409 | # | ||
| 410 | |||
| 411 | # | ||
| 412 | # I2O device support | ||
| 413 | # | ||
| 414 | |||
| 415 | # | ||
| 416 | # Network device support | ||
| 417 | # | ||
| 418 | # CONFIG_NETDEVICES is not set | ||
| 419 | # CONFIG_NETPOLL is not set | ||
| 420 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
| 421 | |||
| 422 | # | ||
| 423 | # ISDN subsystem | ||
| 424 | # | ||
| 425 | # CONFIG_ISDN is not set | ||
| 426 | |||
| 427 | # | ||
| 428 | # Input device support | ||
| 429 | # | ||
| 430 | CONFIG_INPUT=y | ||
| 431 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
| 432 | |||
| 433 | # | ||
| 434 | # Userland interfaces | ||
| 435 | # | ||
| 436 | CONFIG_INPUT_MOUSEDEV=y | ||
| 437 | CONFIG_INPUT_MOUSEDEV_PSAUX=y | ||
| 438 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=320 | ||
| 439 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=320 | ||
| 440 | # CONFIG_INPUT_JOYDEV is not set | ||
| 441 | CONFIG_INPUT_TSDEV=y | ||
| 442 | CONFIG_INPUT_TSDEV_SCREEN_X=320 | ||
| 443 | CONFIG_INPUT_TSDEV_SCREEN_Y=320 | ||
| 444 | CONFIG_INPUT_EVDEV=y | ||
| 445 | # CONFIG_INPUT_EVBUG is not set | ||
| 446 | |||
| 447 | # | ||
| 448 | # Input Device Drivers | ||
| 449 | # | ||
| 450 | # CONFIG_INPUT_KEYBOARD is not set | ||
| 451 | # CONFIG_INPUT_MOUSE is not set | ||
| 452 | # CONFIG_INPUT_JOYSTICK is not set | ||
| 453 | CONFIG_INPUT_TOUCHSCREEN=y | ||
| 454 | CONFIG_TOUCHSCREEN_ADS7846=y | ||
| 455 | # CONFIG_TOUCHSCREEN_GUNZE is not set | ||
| 456 | # CONFIG_TOUCHSCREEN_ELO is not set | ||
| 457 | # CONFIG_TOUCHSCREEN_MTOUCH is not set | ||
| 458 | # CONFIG_TOUCHSCREEN_MK712 is not set | ||
| 459 | # CONFIG_TOUCHSCREEN_PENMOUNT is not set | ||
| 460 | # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set | ||
| 461 | # CONFIG_TOUCHSCREEN_TOUCHWIN is not set | ||
| 462 | # CONFIG_TOUCHSCREEN_TSC2102 is not set | ||
| 463 | # CONFIG_INPUT_MISC is not set | ||
| 464 | |||
| 465 | # | ||
| 466 | # Hardware I/O ports | ||
| 467 | # | ||
| 468 | # CONFIG_SERIO is not set | ||
| 469 | # CONFIG_GAMEPORT is not set | ||
| 470 | |||
| 471 | # | ||
| 472 | # Character devices | ||
| 473 | # | ||
| 474 | CONFIG_VT=y | ||
| 475 | CONFIG_VT_CONSOLE=y | ||
| 476 | CONFIG_HW_CONSOLE=y | ||
| 477 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
| 478 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
| 479 | |||
| 480 | # | ||
| 481 | # Serial drivers | ||
| 482 | # | ||
| 483 | # CONFIG_SERIAL_8250 is not set | ||
| 484 | |||
| 485 | # | ||
| 486 | # Non-8250 serial port support | ||
| 487 | # | ||
| 488 | CONFIG_UNIX98_PTYS=y | ||
| 489 | CONFIG_LEGACY_PTYS=y | ||
| 490 | CONFIG_LEGACY_PTY_COUNT=256 | ||
| 491 | |||
| 492 | # | ||
| 493 | # IPMI | ||
| 494 | # | ||
| 495 | # CONFIG_IPMI_HANDLER is not set | ||
| 496 | |||
| 497 | # | ||
| 498 | # Watchdog Cards | ||
| 499 | # | ||
| 500 | # CONFIG_WATCHDOG is not set | ||
| 501 | CONFIG_HW_RANDOM=y | ||
| 502 | # CONFIG_NVRAM is not set | ||
| 503 | # CONFIG_OMAP_RTC is not set | ||
| 504 | # CONFIG_DTLK is not set | ||
| 505 | # CONFIG_R3964 is not set | ||
| 506 | |||
| 507 | # | ||
| 508 | # Ftape, the floppy tape device driver | ||
| 509 | # | ||
| 510 | # CONFIG_RAW_DRIVER is not set | ||
| 511 | |||
| 512 | # | ||
| 513 | # TPM devices | ||
| 514 | # | ||
| 515 | # CONFIG_TCG_TPM is not set | ||
| 516 | |||
| 517 | # | ||
| 518 | # I2C support | ||
| 519 | # | ||
| 520 | # CONFIG_I2C is not set | ||
| 521 | |||
| 522 | # | ||
| 523 | # SPI support | ||
| 524 | # | ||
| 525 | CONFIG_SPI=y | ||
| 526 | CONFIG_SPI_MASTER=y | ||
| 527 | |||
| 528 | # | ||
| 529 | # SPI Master Controller Drivers | ||
| 530 | # | ||
| 531 | CONFIG_SPI_BITBANG=y | ||
| 532 | CONFIG_SPI_OMAP_UWIRE=y | ||
| 533 | |||
| 534 | # | ||
| 535 | # SPI Protocol Masters | ||
| 536 | # | ||
| 537 | # CONFIG_TSC2102 is not set | ||
| 538 | |||
| 539 | # | ||
| 540 | # Dallas's 1-wire bus | ||
| 541 | # | ||
| 542 | # CONFIG_W1 is not set | ||
| 543 | |||
| 544 | # | ||
| 545 | # Hardware Monitoring support | ||
| 546 | # | ||
| 547 | CONFIG_HWMON=y | ||
| 548 | # CONFIG_HWMON_VID is not set | ||
| 549 | # CONFIG_SENSORS_ABITUGURU is not set | ||
| 550 | # CONFIG_SENSORS_F71805F is not set | ||
| 551 | # CONFIG_SENSORS_LM70 is not set | ||
| 552 | # CONFIG_SENSORS_VT1211 is not set | ||
| 553 | # CONFIG_HWMON_DEBUG_CHIP is not set | ||
| 554 | |||
| 555 | # | ||
| 556 | # Misc devices | ||
| 557 | # | ||
| 558 | # CONFIG_SGI_IOC4 is not set | ||
| 559 | # CONFIG_TIFM_CORE is not set | ||
| 560 | |||
| 561 | # | ||
| 562 | # LED devices | ||
| 563 | # | ||
| 564 | CONFIG_NEW_LEDS=y | ||
| 565 | CONFIG_LEDS_CLASS=y | ||
| 566 | |||
| 567 | # | ||
| 568 | # LED drivers | ||
| 569 | # | ||
| 570 | CONFIG_LEDS_OMAP=y | ||
| 571 | |||
| 572 | # | ||
| 573 | # LED Triggers | ||
| 574 | # | ||
| 575 | CONFIG_LEDS_TRIGGERS=y | ||
| 576 | CONFIG_LEDS_TRIGGER_TIMER=y | ||
| 577 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y | ||
| 578 | |||
| 579 | # | ||
| 580 | # Multimedia devices | ||
| 581 | # | ||
| 582 | # CONFIG_VIDEO_DEV is not set | ||
| 583 | |||
| 584 | # | ||
| 585 | # Digital Video Broadcasting Devices | ||
| 586 | # | ||
| 587 | # CONFIG_DVB is not set | ||
| 588 | |||
| 589 | # | ||
| 590 | # Graphics support | ||
| 591 | # | ||
| 592 | CONFIG_FIRMWARE_EDID=y | ||
| 593 | CONFIG_FB=y | ||
| 594 | # CONFIG_FB_CFB_FILLRECT is not set | ||
| 595 | # CONFIG_FB_CFB_COPYAREA is not set | ||
| 596 | # CONFIG_FB_CFB_IMAGEBLIT is not set | ||
| 597 | # CONFIG_FB_MACMODES is not set | ||
| 598 | # CONFIG_FB_BACKLIGHT is not set | ||
| 599 | # CONFIG_FB_MODE_HELPERS is not set | ||
| 600 | # CONFIG_FB_TILEBLITTING is not set | ||
| 601 | # CONFIG_FB_S1D13XXX is not set | ||
| 602 | # CONFIG_FB_VIRTUAL is not set | ||
| 603 | CONFIG_FB_OMAP=y | ||
| 604 | # CONFIG_FB_OMAP_LCDC_EXTERNAL is not set | ||
| 605 | # CONFIG_FB_OMAP_LCD_MIPID is not set | ||
| 606 | # CONFIG_FB_OMAP_BOOTLOADER_INIT is not set | ||
| 607 | CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2 | ||
| 608 | # CONFIG_FB_OMAP_DMA_TUNE is not set | ||
| 609 | |||
| 610 | # | ||
| 611 | # Console display driver support | ||
| 612 | # | ||
| 613 | # CONFIG_VGA_CONSOLE is not set | ||
| 614 | CONFIG_DUMMY_CONSOLE=y | ||
| 615 | CONFIG_FRAMEBUFFER_CONSOLE=y | ||
| 616 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | ||
| 617 | # CONFIG_FONTS is not set | ||
| 618 | CONFIG_FONT_8x8=y | ||
| 619 | CONFIG_FONT_8x16=y | ||
| 620 | |||
| 621 | # | ||
| 622 | # Logo configuration | ||
| 623 | # | ||
| 624 | # CONFIG_LOGO is not set | ||
| 625 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | ||
| 626 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | ||
| 627 | CONFIG_BACKLIGHT_DEVICE=y | ||
| 628 | CONFIG_LCD_CLASS_DEVICE=y | ||
| 629 | CONFIG_LCD_DEVICE=y | ||
| 630 | CONFIG_BACKLIGHT_OMAP=y | ||
| 631 | |||
| 632 | # | ||
| 633 | # Sound | ||
| 634 | # | ||
| 635 | # CONFIG_SOUND is not set | ||
| 636 | |||
| 637 | # | ||
| 638 | # USB support | ||
| 639 | # | ||
| 640 | CONFIG_USB_ARCH_HAS_HCD=y | ||
| 641 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
| 642 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
| 643 | # CONFIG_USB is not set | ||
| 644 | |||
| 645 | # | ||
| 646 | # Enable Host or Gadget support to see Inventra options | ||
| 647 | # | ||
| 648 | |||
| 649 | # | ||
| 650 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
| 651 | # | ||
| 652 | |||
| 653 | # | ||
| 654 | # USB Gadget Support | ||
| 655 | # | ||
| 656 | # CONFIG_USB_GADGET is not set | ||
| 657 | |||
| 658 | # | ||
| 659 | # MMC/SD Card support | ||
| 660 | # | ||
| 661 | # CONFIG_MMC is not set | ||
| 662 | |||
| 663 | # | ||
| 664 | # Real Time Clock | ||
| 665 | # | ||
| 666 | CONFIG_RTC_LIB=y | ||
| 667 | CONFIG_RTC_CLASS=y | ||
| 668 | CONFIG_RTC_HCTOSYS=y | ||
| 669 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
| 670 | # CONFIG_RTC_DEBUG is not set | ||
| 671 | |||
| 672 | # | ||
| 673 | # RTC interfaces | ||
| 674 | # | ||
| 675 | CONFIG_RTC_INTF_SYSFS=y | ||
| 676 | CONFIG_RTC_INTF_PROC=y | ||
| 677 | CONFIG_RTC_INTF_DEV=y | ||
| 678 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
| 679 | |||
| 680 | # | ||
| 681 | # RTC drivers | ||
| 682 | # | ||
| 683 | # CONFIG_RTC_DRV_DS1553 is not set | ||
| 684 | # CONFIG_RTC_DRV_DS1742 is not set | ||
| 685 | CONFIG_RTC_DRV_OMAP=y | ||
| 686 | # CONFIG_RTC_DRV_RS5C348 is not set | ||
| 687 | # CONFIG_RTC_DRV_M48T86 is not set | ||
| 688 | # CONFIG_RTC_DRV_TEST is not set | ||
| 689 | # CONFIG_RTC_DRV_MAX6902 is not set | ||
| 690 | # CONFIG_RTC_DRV_V3020 is not set | ||
| 691 | |||
| 692 | # | ||
| 693 | # Synchronous Serial Interfaces (SSI) | ||
| 694 | # | ||
| 695 | # CONFIG_OMAP_UWIRE is not set | ||
| 696 | # CONFIG_OMAP_TSC2101 is not set | ||
| 697 | |||
| 698 | # | ||
| 699 | # CBUS support | ||
| 700 | # | ||
| 701 | # CONFIG_CBUS is not set | ||
| 702 | |||
| 703 | # | ||
| 704 | # File systems | ||
| 705 | # | ||
| 706 | CONFIG_EXT2_FS=y | ||
| 707 | # CONFIG_EXT2_FS_XATTR is not set | ||
| 708 | # CONFIG_EXT2_FS_XIP is not set | ||
| 709 | # CONFIG_EXT3_FS is not set | ||
| 710 | # CONFIG_EXT4DEV_FS is not set | ||
| 711 | # CONFIG_REISERFS_FS is not set | ||
| 712 | # CONFIG_JFS_FS is not set | ||
| 713 | # CONFIG_FS_POSIX_ACL is not set | ||
| 714 | # CONFIG_XFS_FS is not set | ||
| 715 | # CONFIG_GFS2_FS is not set | ||
| 716 | # CONFIG_OCFS2_FS is not set | ||
| 717 | # CONFIG_MINIX_FS is not set | ||
| 718 | # CONFIG_ROMFS_FS is not set | ||
| 719 | # CONFIG_INOTIFY is not set | ||
| 720 | # CONFIG_QUOTA is not set | ||
| 721 | CONFIG_DNOTIFY=y | ||
| 722 | # CONFIG_AUTOFS_FS is not set | ||
| 723 | # CONFIG_AUTOFS4_FS is not set | ||
| 724 | # CONFIG_FUSE_FS is not set | ||
| 725 | |||
| 726 | # | ||
| 727 | # CD-ROM/DVD Filesystems | ||
| 728 | # | ||
| 729 | # CONFIG_ISO9660_FS is not set | ||
| 730 | # CONFIG_UDF_FS is not set | ||
| 731 | |||
| 732 | # | ||
| 733 | # DOS/FAT/NT Filesystems | ||
| 734 | # | ||
| 735 | # CONFIG_MSDOS_FS is not set | ||
| 736 | # CONFIG_VFAT_FS is not set | ||
| 737 | # CONFIG_NTFS_FS is not set | ||
| 738 | |||
| 739 | # | ||
| 740 | # Pseudo filesystems | ||
| 741 | # | ||
| 742 | CONFIG_PROC_FS=y | ||
| 743 | CONFIG_PROC_SYSCTL=y | ||
| 744 | CONFIG_SYSFS=y | ||
| 745 | # CONFIG_TMPFS is not set | ||
| 746 | # CONFIG_HUGETLB_PAGE is not set | ||
| 747 | CONFIG_RAMFS=y | ||
| 748 | # CONFIG_CONFIGFS_FS is not set | ||
| 749 | |||
| 750 | # | ||
| 751 | # Miscellaneous filesystems | ||
| 752 | # | ||
| 753 | # CONFIG_ADFS_FS is not set | ||
| 754 | # CONFIG_AFFS_FS is not set | ||
| 755 | # CONFIG_HFS_FS is not set | ||
| 756 | # CONFIG_HFSPLUS_FS is not set | ||
| 757 | # CONFIG_BEFS_FS is not set | ||
| 758 | # CONFIG_BFS_FS is not set | ||
| 759 | # CONFIG_EFS_FS is not set | ||
| 760 | # CONFIG_CRAMFS is not set | ||
| 761 | # CONFIG_VXFS_FS is not set | ||
| 762 | # CONFIG_HPFS_FS is not set | ||
| 763 | # CONFIG_QNX4FS_FS is not set | ||
| 764 | # CONFIG_SYSV_FS is not set | ||
| 765 | # CONFIG_UFS_FS is not set | ||
| 766 | |||
| 767 | # | ||
| 768 | # Network File Systems | ||
| 769 | # | ||
| 770 | # CONFIG_NFS_FS is not set | ||
| 771 | # CONFIG_NFSD is not set | ||
| 772 | # CONFIG_SMB_FS is not set | ||
| 773 | # CONFIG_CIFS is not set | ||
| 774 | # CONFIG_NCP_FS is not set | ||
| 775 | # CONFIG_CODA_FS is not set | ||
| 776 | # CONFIG_AFS_FS is not set | ||
| 777 | # CONFIG_9P_FS is not set | ||
| 778 | |||
| 779 | # | ||
| 780 | # Partition Types | ||
| 781 | # | ||
| 782 | CONFIG_PARTITION_ADVANCED=y | ||
| 783 | # CONFIG_ACORN_PARTITION is not set | ||
| 784 | # CONFIG_OSF_PARTITION is not set | ||
| 785 | # CONFIG_AMIGA_PARTITION is not set | ||
| 786 | # CONFIG_ATARI_PARTITION is not set | ||
| 787 | # CONFIG_MAC_PARTITION is not set | ||
| 788 | CONFIG_MSDOS_PARTITION=y | ||
| 789 | # CONFIG_BSD_DISKLABEL is not set | ||
| 790 | # CONFIG_MINIX_SUBPARTITION is not set | ||
| 791 | # CONFIG_SOLARIS_X86_PARTITION is not set | ||
| 792 | # CONFIG_UNIXWARE_DISKLABEL is not set | ||
| 793 | # CONFIG_LDM_PARTITION is not set | ||
| 794 | # CONFIG_SGI_PARTITION is not set | ||
| 795 | # CONFIG_ULTRIX_PARTITION is not set | ||
| 796 | # CONFIG_SUN_PARTITION is not set | ||
| 797 | # CONFIG_KARMA_PARTITION is not set | ||
| 798 | # CONFIG_EFI_PARTITION is not set | ||
| 799 | |||
| 800 | # | ||
| 801 | # Native Language Support | ||
| 802 | # | ||
| 803 | # CONFIG_NLS is not set | ||
| 804 | |||
| 805 | # | ||
| 806 | # Profiling support | ||
| 807 | # | ||
| 808 | # CONFIG_PROFILING is not set | ||
| 809 | |||
| 810 | # | ||
| 811 | # Kernel hacking | ||
| 812 | # | ||
| 813 | # CONFIG_PRINTK_TIME is not set | ||
| 814 | # CONFIG_ENABLE_MUST_CHECK is not set | ||
| 815 | # CONFIG_MAGIC_SYSRQ is not set | ||
| 816 | # CONFIG_UNUSED_SYMBOLS is not set | ||
| 817 | # CONFIG_DEBUG_KERNEL is not set | ||
| 818 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 819 | CONFIG_DEBUG_BUGVERBOSE=y | ||
| 820 | # CONFIG_DEBUG_FS is not set | ||
| 821 | CONFIG_FRAME_POINTER=y | ||
| 822 | # CONFIG_UNWIND_INFO is not set | ||
| 823 | # CONFIG_HEADERS_CHECK is not set | ||
| 824 | # CONFIG_DEBUG_USER is not set | ||
| 825 | |||
| 826 | # | ||
| 827 | # Security options | ||
| 828 | # | ||
| 829 | # CONFIG_KEYS is not set | ||
| 830 | # CONFIG_SECURITY is not set | ||
| 831 | |||
| 832 | # | ||
| 833 | # Cryptographic options | ||
| 834 | # | ||
| 835 | # CONFIG_CRYPTO is not set | ||
| 836 | |||
| 837 | # | ||
| 838 | # Library routines | ||
| 839 | # | ||
| 840 | CONFIG_CRC_CCITT=y | ||
| 841 | CONFIG_CRC16=y | ||
| 842 | CONFIG_CRC32=y | ||
| 843 | CONFIG_LIBCRC32C=y | ||
| 844 | CONFIG_PLIST=y | ||
diff --git a/arch/arm/configs/palmz71_defconfig b/arch/arm/configs/palmz71_defconfig new file mode 100644 index 000000000000..6361922e71c1 --- /dev/null +++ b/arch/arm/configs/palmz71_defconfig | |||
| @@ -0,0 +1,891 @@ | |||
| 1 | # | ||
| 2 | # Automatically generated make config: don't edit | ||
| 3 | # Linux kernel version: 2.6.22-rc1-omap1 | ||
| 4 | # Thu Jun 7 05:13:00 2007 | ||
| 5 | # | ||
| 6 | CONFIG_ARM=y | ||
| 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | ||
| 8 | CONFIG_GENERIC_GPIO=y | ||
| 9 | CONFIG_GENERIC_TIME=y | ||
| 10 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 11 | CONFIG_MMU=y | ||
| 12 | # CONFIG_NO_IOPORT is not set | ||
| 13 | CONFIG_GENERIC_HARDIRQS=y | ||
| 14 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 15 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 16 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
| 17 | CONFIG_HARDIRQS_SW_RESEND=y | ||
| 18 | CONFIG_GENERIC_IRQ_PROBE=y | ||
| 19 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
| 20 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
| 21 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
| 22 | CONFIG_GENERIC_HWEIGHT=y | ||
| 23 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
| 24 | CONFIG_ZONE_DMA=y | ||
| 25 | CONFIG_VECTORS_BASE=0xffff0000 | ||
| 26 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
| 27 | |||
| 28 | # | ||
| 29 | # Code maturity level options | ||
| 30 | # | ||
| 31 | CONFIG_EXPERIMENTAL=y | ||
| 32 | CONFIG_BROKEN_ON_SMP=y | ||
| 33 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 34 | |||
| 35 | # | ||
| 36 | # General setup | ||
| 37 | # | ||
| 38 | CONFIG_LOCALVERSION="-z71" | ||
| 39 | CONFIG_LOCALVERSION_AUTO=y | ||
| 40 | CONFIG_SWAP=y | ||
| 41 | CONFIG_SYSVIPC=y | ||
| 42 | # CONFIG_IPC_NS is not set | ||
| 43 | CONFIG_SYSVIPC_SYSCTL=y | ||
| 44 | # CONFIG_POSIX_MQUEUE is not set | ||
| 45 | CONFIG_BSD_PROCESS_ACCT=y | ||
| 46 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | ||
| 47 | # CONFIG_TASKSTATS is not set | ||
| 48 | # CONFIG_UTS_NS is not set | ||
| 49 | # CONFIG_AUDIT is not set | ||
| 50 | # CONFIG_IKCONFIG is not set | ||
| 51 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 52 | CONFIG_SYSFS_DEPRECATED=y | ||
| 53 | # CONFIG_RELAY is not set | ||
| 54 | # CONFIG_BLK_DEV_INITRD is not set | ||
| 55 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
| 56 | CONFIG_SYSCTL=y | ||
| 57 | # CONFIG_EMBEDDED is not set | ||
| 58 | CONFIG_UID16=y | ||
| 59 | CONFIG_SYSCTL_SYSCALL=y | ||
| 60 | CONFIG_KALLSYMS=y | ||
| 61 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 62 | CONFIG_HOTPLUG=y | ||
| 63 | CONFIG_PRINTK=y | ||
| 64 | CONFIG_BUG=y | ||
| 65 | CONFIG_ELF_CORE=y | ||
| 66 | CONFIG_BASE_FULL=y | ||
| 67 | CONFIG_FUTEX=y | ||
| 68 | CONFIG_ANON_INODES=y | ||
| 69 | CONFIG_EPOLL=y | ||
| 70 | CONFIG_SIGNALFD=y | ||
| 71 | CONFIG_TIMERFD=y | ||
| 72 | CONFIG_EVENTFD=y | ||
| 73 | CONFIG_SHMEM=y | ||
| 74 | CONFIG_VM_EVENT_COUNTERS=y | ||
| 75 | CONFIG_SLAB=y | ||
| 76 | # CONFIG_SLUB is not set | ||
| 77 | # CONFIG_SLOB is not set | ||
| 78 | CONFIG_RT_MUTEXES=y | ||
| 79 | # CONFIG_TINY_SHMEM is not set | ||
| 80 | CONFIG_BASE_SMALL=0 | ||
| 81 | |||
| 82 | # | ||
| 83 | # Loadable module support | ||
| 84 | # | ||
| 85 | # CONFIG_MODULES is not set | ||
| 86 | |||
| 87 | # | ||
| 88 | # Block layer | ||
| 89 | # | ||
| 90 | CONFIG_BLOCK=y | ||
| 91 | # CONFIG_LBD is not set | ||
| 92 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 93 | # CONFIG_LSF is not set | ||
| 94 | |||
| 95 | # | ||
| 96 | # IO Schedulers | ||
| 97 | # | ||
| 98 | CONFIG_IOSCHED_NOOP=y | ||
| 99 | # CONFIG_IOSCHED_AS is not set | ||
| 100 | # CONFIG_IOSCHED_DEADLINE is not set | ||
| 101 | # CONFIG_IOSCHED_CFQ is not set | ||
| 102 | # CONFIG_DEFAULT_AS is not set | ||
| 103 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 104 | # CONFIG_DEFAULT_CFQ is not set | ||
| 105 | CONFIG_DEFAULT_NOOP=y | ||
| 106 | CONFIG_DEFAULT_IOSCHED="noop" | ||
| 107 | |||
| 108 | # | ||
| 109 | # System Type | ||
| 110 | # | ||
| 111 | # CONFIG_ARCH_AAEC2000 is not set | ||
| 112 | # CONFIG_ARCH_INTEGRATOR is not set | ||
| 113 | # CONFIG_ARCH_REALVIEW is not set | ||
| 114 | # CONFIG_ARCH_VERSATILE is not set | ||
| 115 | # CONFIG_ARCH_AT91 is not set | ||
| 116 | # CONFIG_ARCH_CLPS7500 is not set | ||
| 117 | # CONFIG_ARCH_CLPS711X is not set | ||
| 118 | # CONFIG_ARCH_CO285 is not set | ||
| 119 | # CONFIG_ARCH_EBSA110 is not set | ||
| 120 | # CONFIG_ARCH_EP93XX is not set | ||
| 121 | # CONFIG_ARCH_FOOTBRIDGE is not set | ||
| 122 | # CONFIG_ARCH_NETX is not set | ||
| 123 | # CONFIG_ARCH_H720X is not set | ||
| 124 | # CONFIG_ARCH_IMX is not set | ||
| 125 | # CONFIG_ARCH_IOP13XX is not set | ||
| 126 | # CONFIG_ARCH_IOP32X is not set | ||
| 127 | # CONFIG_ARCH_IOP33X is not set | ||
| 128 | # CONFIG_ARCH_IXP23XX is not set | ||
| 129 | # CONFIG_ARCH_IXP2000 is not set | ||
| 130 | # CONFIG_ARCH_IXP4XX is not set | ||
| 131 | # CONFIG_ARCH_L7200 is not set | ||
| 132 | # CONFIG_ARCH_KS8695 is not set | ||
| 133 | # CONFIG_ARCH_NS9XXX is not set | ||
| 134 | # CONFIG_ARCH_PNX4008 is not set | ||
| 135 | # CONFIG_ARCH_PXA is not set | ||
| 136 | # CONFIG_ARCH_RPC is not set | ||
| 137 | # CONFIG_ARCH_SA1100 is not set | ||
| 138 | # CONFIG_ARCH_S3C2410 is not set | ||
| 139 | # CONFIG_ARCH_SHARK is not set | ||
| 140 | # CONFIG_ARCH_LH7A40X is not set | ||
| 141 | # CONFIG_ARCH_DAVINCI is not set | ||
| 142 | CONFIG_ARCH_OMAP=y | ||
| 143 | |||
| 144 | # | ||
| 145 | # TI OMAP Implementations | ||
| 146 | # | ||
| 147 | CONFIG_ARCH_OMAP1=y | ||
| 148 | # CONFIG_ARCH_OMAP2 is not set | ||
| 149 | |||
| 150 | # | ||
| 151 | # OMAP Feature Selections | ||
| 152 | # | ||
| 153 | # CONFIG_OMAP_RESET_CLOCKS is not set | ||
| 154 | # CONFIG_OMAP_BOOT_TAG is not set | ||
| 155 | # CONFIG_OMAP_GPIO_SWITCH is not set | ||
| 156 | CONFIG_OMAP_MUX=y | ||
| 157 | # CONFIG_OMAP_MUX_DEBUG is not set | ||
| 158 | CONFIG_OMAP_MUX_WARNINGS=y | ||
| 159 | CONFIG_OMAP_MCBSP=y | ||
| 160 | # CONFIG_OMAP_MMU_FWK is not set | ||
| 161 | # CONFIG_OMAP_MBOX_FWK is not set | ||
| 162 | CONFIG_OMAP_MPU_TIMER=y | ||
| 163 | # CONFIG_OMAP_32K_TIMER is not set | ||
| 164 | CONFIG_OMAP_LL_DEBUG_UART1=y | ||
| 165 | # CONFIG_OMAP_LL_DEBUG_UART2 is not set | ||
| 166 | # CONFIG_OMAP_LL_DEBUG_UART3 is not set | ||
| 167 | # CONFIG_OMAP_LL_DEBUG_LCD is not set | ||
| 168 | CONFIG_OMAP_SERIAL_WAKE=y | ||
| 169 | # CONFIG_OMAP_DSP is not set | ||
| 170 | |||
| 171 | # | ||
| 172 | # OMAP Core Type | ||
| 173 | # | ||
| 174 | # CONFIG_ARCH_OMAP730 is not set | ||
| 175 | CONFIG_ARCH_OMAP15XX=y | ||
| 176 | # CONFIG_ARCH_OMAP16XX is not set | ||
| 177 | |||
| 178 | # | ||
| 179 | # OMAP Board Type | ||
| 180 | # | ||
| 181 | # CONFIG_MACH_OMAP_INNOVATOR is not set | ||
| 182 | # CONFIG_MACH_VOICEBLUE is not set | ||
| 183 | # CONFIG_MACH_OMAP_PALMTE is not set | ||
| 184 | CONFIG_MACH_OMAP_PALMZ71=y | ||
| 185 | # CONFIG_MACH_OMAP_PALMTT is not set | ||
| 186 | # CONFIG_MACH_SX1 is not set | ||
| 187 | # CONFIG_MACH_AMS_DELTA is not set | ||
| 188 | # CONFIG_MACH_OMAP_GENERIC is not set | ||
| 189 | |||
| 190 | # | ||
| 191 | # OMAP CPU Speed | ||
| 192 | # | ||
| 193 | CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER=y | ||
| 194 | # CONFIG_OMAP_ARM_168MHZ is not set | ||
| 195 | # CONFIG_OMAP_ARM_150MHZ is not set | ||
| 196 | # CONFIG_OMAP_ARM_120MHZ is not set | ||
| 197 | # CONFIG_OMAP_ARM_60MHZ is not set | ||
| 198 | # CONFIG_OMAP_ARM_30MHZ is not set | ||
| 199 | |||
| 200 | # | ||
| 201 | # Processor Type | ||
| 202 | # | ||
| 203 | CONFIG_CPU_32=y | ||
| 204 | CONFIG_CPU_ARM925T=y | ||
| 205 | CONFIG_CPU_32v4T=y | ||
| 206 | CONFIG_CPU_ABRT_EV4T=y | ||
| 207 | CONFIG_CPU_CACHE_V4WT=y | ||
| 208 | CONFIG_CPU_CACHE_VIVT=y | ||
| 209 | CONFIG_CPU_COPY_V4WB=y | ||
| 210 | CONFIG_CPU_TLB_V4WBI=y | ||
| 211 | CONFIG_CPU_CP15=y | ||
| 212 | CONFIG_CPU_CP15_MMU=y | ||
| 213 | |||
| 214 | # | ||
| 215 | # Processor Features | ||
| 216 | # | ||
| 217 | # CONFIG_ARM_THUMB is not set | ||
| 218 | # CONFIG_CPU_ICACHE_DISABLE is not set | ||
| 219 | # CONFIG_CPU_DCACHE_DISABLE is not set | ||
| 220 | # CONFIG_CPU_DCACHE_WRITETHROUGH is not set | ||
| 221 | # CONFIG_OUTER_CACHE is not set | ||
| 222 | |||
| 223 | # | ||
| 224 | # Bus support | ||
| 225 | # | ||
| 226 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 227 | |||
| 228 | # | ||
| 229 | # PCCARD (PCMCIA/CardBus) support | ||
| 230 | # | ||
| 231 | # CONFIG_PCCARD is not set | ||
| 232 | |||
| 233 | # | ||
| 234 | # Kernel Features | ||
| 235 | # | ||
| 236 | # CONFIG_TICK_ONESHOT is not set | ||
| 237 | # CONFIG_NO_HZ is not set | ||
| 238 | # CONFIG_HIGH_RES_TIMERS is not set | ||
| 239 | # CONFIG_PREEMPT is not set | ||
| 240 | CONFIG_HZ=100 | ||
| 241 | # CONFIG_AEABI is not set | ||
| 242 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | ||
| 243 | CONFIG_SELECT_MEMORY_MODEL=y | ||
| 244 | CONFIG_FLATMEM_MANUAL=y | ||
| 245 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
| 246 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
| 247 | CONFIG_FLATMEM=y | ||
| 248 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
| 249 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 250 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | ||
| 251 | # CONFIG_RESOURCES_64BIT is not set | ||
| 252 | CONFIG_ZONE_DMA_FLAG=1 | ||
| 253 | # CONFIG_LEDS is not set | ||
| 254 | CONFIG_ALIGNMENT_TRAP=y | ||
| 255 | |||
| 256 | # | ||
| 257 | # Boot options | ||
| 258 | # | ||
| 259 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
| 260 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
| 261 | CONFIG_CMDLINE="" | ||
| 262 | # CONFIG_XIP_KERNEL is not set | ||
| 263 | # CONFIG_KEXEC is not set | ||
| 264 | |||
| 265 | # | ||
| 266 | # CPU Frequency scaling | ||
| 267 | # | ||
| 268 | # CONFIG_CPU_FREQ is not set | ||
| 269 | |||
| 270 | # | ||
| 271 | # Floating point emulation | ||
| 272 | # | ||
| 273 | |||
| 274 | # | ||
| 275 | # At least one emulation must be selected | ||
| 276 | # | ||
| 277 | CONFIG_FPE_NWFPE=y | ||
| 278 | # CONFIG_FPE_NWFPE_XP is not set | ||
| 279 | # CONFIG_FPE_FASTFPE is not set | ||
| 280 | |||
| 281 | # | ||
| 282 | # Userspace binary formats | ||
| 283 | # | ||
| 284 | CONFIG_BINFMT_ELF=y | ||
| 285 | # CONFIG_BINFMT_AOUT is not set | ||
| 286 | # CONFIG_BINFMT_MISC is not set | ||
| 287 | # CONFIG_ARTHUR is not set | ||
| 288 | |||
| 289 | # | ||
| 290 | # Power management options | ||
| 291 | # | ||
| 292 | # CONFIG_PM is not set | ||
| 293 | |||
| 294 | # | ||
| 295 | # Networking | ||
| 296 | # | ||
| 297 | CONFIG_NET=y | ||
| 298 | |||
| 299 | # | ||
| 300 | # Networking options | ||
| 301 | # | ||
| 302 | CONFIG_PACKET=y | ||
| 303 | # CONFIG_PACKET_MMAP is not set | ||
| 304 | CONFIG_UNIX=y | ||
| 305 | CONFIG_XFRM=y | ||
| 306 | # CONFIG_XFRM_USER is not set | ||
| 307 | # CONFIG_XFRM_SUB_POLICY is not set | ||
| 308 | # CONFIG_XFRM_MIGRATE is not set | ||
| 309 | CONFIG_NET_KEY=y | ||
| 310 | # CONFIG_NET_KEY_MIGRATE is not set | ||
| 311 | CONFIG_INET=y | ||
| 312 | # CONFIG_IP_MULTICAST is not set | ||
| 313 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
| 314 | CONFIG_IP_FIB_HASH=y | ||
| 315 | # CONFIG_IP_PNP is not set | ||
| 316 | # CONFIG_NET_IPIP is not set | ||
| 317 | # CONFIG_NET_IPGRE is not set | ||
| 318 | # CONFIG_ARPD is not set | ||
| 319 | # CONFIG_SYN_COOKIES is not set | ||
| 320 | # CONFIG_INET_AH is not set | ||
| 321 | # CONFIG_INET_ESP is not set | ||
| 322 | # CONFIG_INET_IPCOMP is not set | ||
| 323 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
| 324 | # CONFIG_INET_TUNNEL is not set | ||
| 325 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | ||
| 326 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | ||
| 327 | CONFIG_INET_XFRM_MODE_BEET=y | ||
| 328 | # CONFIG_INET_DIAG is not set | ||
| 329 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
| 330 | CONFIG_TCP_CONG_CUBIC=y | ||
| 331 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
| 332 | # CONFIG_TCP_MD5SIG is not set | ||
| 333 | # CONFIG_IPV6 is not set | ||
| 334 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 335 | # CONFIG_INET6_TUNNEL is not set | ||
| 336 | # CONFIG_NETWORK_SECMARK is not set | ||
| 337 | # CONFIG_NETFILTER is not set | ||
| 338 | |||
| 339 | # | ||
| 340 | # DCCP Configuration (EXPERIMENTAL) | ||
| 341 | # | ||
| 342 | # CONFIG_IP_DCCP is not set | ||
| 343 | |||
| 344 | # | ||
| 345 | # SCTP Configuration (EXPERIMENTAL) | ||
| 346 | # | ||
| 347 | # CONFIG_IP_SCTP is not set | ||
| 348 | |||
| 349 | # | ||
| 350 | # TIPC Configuration (EXPERIMENTAL) | ||
| 351 | # | ||
| 352 | # CONFIG_TIPC is not set | ||
| 353 | # CONFIG_ATM is not set | ||
| 354 | # CONFIG_BRIDGE is not set | ||
| 355 | # CONFIG_VLAN_8021Q is not set | ||
| 356 | # CONFIG_DECNET is not set | ||
| 357 | # CONFIG_LLC2 is not set | ||
| 358 | # CONFIG_IPX is not set | ||
| 359 | # CONFIG_ATALK is not set | ||
| 360 | # CONFIG_X25 is not set | ||
| 361 | # CONFIG_LAPB is not set | ||
| 362 | # CONFIG_ECONET is not set | ||
| 363 | # CONFIG_WAN_ROUTER is not set | ||
| 364 | |||
| 365 | # | ||
| 366 | # QoS and/or fair queueing | ||
| 367 | # | ||
| 368 | # CONFIG_NET_SCHED is not set | ||
| 369 | |||
| 370 | # | ||
| 371 | # Network testing | ||
| 372 | # | ||
| 373 | # CONFIG_NET_PKTGEN is not set | ||
| 374 | # CONFIG_HAMRADIO is not set | ||
| 375 | # CONFIG_IRDA is not set | ||
| 376 | # CONFIG_BT is not set | ||
| 377 | # CONFIG_AF_RXRPC is not set | ||
| 378 | |||
| 379 | # | ||
| 380 | # Wireless | ||
| 381 | # | ||
| 382 | # CONFIG_CFG80211 is not set | ||
| 383 | # CONFIG_WIRELESS_EXT is not set | ||
| 384 | # CONFIG_MAC80211 is not set | ||
| 385 | # CONFIG_IEEE80211 is not set | ||
| 386 | # CONFIG_RFKILL is not set | ||
| 387 | |||
| 388 | # | ||
| 389 | # Device Drivers | ||
| 390 | # | ||
| 391 | |||
| 392 | # | ||
| 393 | # Generic Driver Options | ||
| 394 | # | ||
| 395 | CONFIG_STANDALONE=y | ||
| 396 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
| 397 | # CONFIG_FW_LOADER is not set | ||
| 398 | # CONFIG_SYS_HYPERVISOR is not set | ||
| 399 | |||
| 400 | # | ||
| 401 | # Connector - unified userspace <-> kernelspace linker | ||
| 402 | # | ||
| 403 | # CONFIG_CONNECTOR is not set | ||
| 404 | # CONFIG_MTD is not set | ||
| 405 | |||
| 406 | # | ||
| 407 | # Parallel port support | ||
| 408 | # | ||
| 409 | # CONFIG_PARPORT is not set | ||
| 410 | |||
| 411 | # | ||
| 412 | # Plug and Play support | ||
| 413 | # | ||
| 414 | # CONFIG_PNPACPI is not set | ||
| 415 | |||
| 416 | # | ||
| 417 | # Block devices | ||
| 418 | # | ||
| 419 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
| 420 | # CONFIG_BLK_DEV_LOOP is not set | ||
| 421 | # CONFIG_BLK_DEV_NBD is not set | ||
| 422 | # CONFIG_BLK_DEV_RAM is not set | ||
| 423 | # CONFIG_CDROM_PKTCDVD is not set | ||
| 424 | # CONFIG_ATA_OVER_ETH is not set | ||
| 425 | |||
| 426 | # | ||
| 427 | # SCSI device support | ||
| 428 | # | ||
| 429 | # CONFIG_RAID_ATTRS is not set | ||
| 430 | # CONFIG_SCSI is not set | ||
| 431 | # CONFIG_SCSI_NETLINK is not set | ||
| 432 | # CONFIG_ATA is not set | ||
| 433 | |||
| 434 | # | ||
| 435 | # Multi-device support (RAID and LVM) | ||
| 436 | # | ||
| 437 | # CONFIG_MD is not set | ||
| 438 | |||
| 439 | # | ||
| 440 | # Network device support | ||
| 441 | # | ||
| 442 | # CONFIG_NETDEVICES is not set | ||
| 443 | # CONFIG_NETPOLL is not set | ||
| 444 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
| 445 | |||
| 446 | # | ||
| 447 | # ISDN subsystem | ||
| 448 | # | ||
| 449 | # CONFIG_ISDN is not set | ||
| 450 | |||
| 451 | # | ||
| 452 | # Input device support | ||
| 453 | # | ||
| 454 | CONFIG_INPUT=y | ||
| 455 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
| 456 | |||
| 457 | # | ||
| 458 | # Userland interfaces | ||
| 459 | # | ||
| 460 | CONFIG_INPUT_MOUSEDEV=y | ||
| 461 | CONFIG_INPUT_MOUSEDEV_PSAUX=y | ||
| 462 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=320 | ||
| 463 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=320 | ||
| 464 | # CONFIG_INPUT_JOYDEV is not set | ||
| 465 | CONFIG_INPUT_TSDEV=y | ||
| 466 | CONFIG_INPUT_TSDEV_SCREEN_X=320 | ||
| 467 | CONFIG_INPUT_TSDEV_SCREEN_Y=320 | ||
| 468 | # CONFIG_INPUT_EVDEV is not set | ||
| 469 | # CONFIG_INPUT_EVBUG is not set | ||
| 470 | |||
| 471 | # | ||
| 472 | # Input Device Drivers | ||
| 473 | # | ||
| 474 | # CONFIG_INPUT_KEYBOARD is not set | ||
| 475 | # CONFIG_INPUT_MOUSE is not set | ||
| 476 | # CONFIG_INPUT_JOYSTICK is not set | ||
| 477 | # CONFIG_INPUT_TABLET is not set | ||
| 478 | CONFIG_INPUT_TOUCHSCREEN=y | ||
| 479 | CONFIG_TOUCHSCREEN_ADS7846=y | ||
| 480 | # CONFIG_TOUCHSCREEN_GUNZE is not set | ||
| 481 | # CONFIG_TOUCHSCREEN_ELO is not set | ||
| 482 | # CONFIG_TOUCHSCREEN_MTOUCH is not set | ||
| 483 | # CONFIG_TOUCHSCREEN_MK712 is not set | ||
| 484 | # CONFIG_TOUCHSCREEN_PENMOUNT is not set | ||
| 485 | # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set | ||
| 486 | # CONFIG_TOUCHSCREEN_TOUCHWIN is not set | ||
| 487 | # CONFIG_TOUCHSCREEN_UCB1400 is not set | ||
| 488 | # CONFIG_TOUCHSCREEN_TSC210X is not set | ||
| 489 | # CONFIG_TOUCHSCREEN_TSC2046 is not set | ||
| 490 | # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set | ||
| 491 | # CONFIG_INPUT_MISC is not set | ||
| 492 | |||
| 493 | # | ||
| 494 | # Hardware I/O ports | ||
| 495 | # | ||
| 496 | # CONFIG_SERIO is not set | ||
| 497 | # CONFIG_GAMEPORT is not set | ||
| 498 | |||
| 499 | # | ||
| 500 | # Character devices | ||
| 501 | # | ||
| 502 | CONFIG_VT=y | ||
| 503 | CONFIG_VT_CONSOLE=y | ||
| 504 | CONFIG_HW_CONSOLE=y | ||
| 505 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
| 506 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
| 507 | |||
| 508 | # | ||
| 509 | # Serial drivers | ||
| 510 | # | ||
| 511 | CONFIG_SERIAL_8250=y | ||
| 512 | CONFIG_SERIAL_8250_CONSOLE=y | ||
| 513 | CONFIG_SERIAL_8250_NR_UARTS=4 | ||
| 514 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | ||
| 515 | # CONFIG_SERIAL_8250_EXTENDED is not set | ||
| 516 | |||
| 517 | # | ||
| 518 | # Non-8250 serial port support | ||
| 519 | # | ||
| 520 | CONFIG_SERIAL_CORE=y | ||
| 521 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
| 522 | CONFIG_UNIX98_PTYS=y | ||
| 523 | CONFIG_LEGACY_PTYS=y | ||
| 524 | CONFIG_LEGACY_PTY_COUNT=16 | ||
| 525 | |||
| 526 | # | ||
| 527 | # IPMI | ||
| 528 | # | ||
| 529 | # CONFIG_IPMI_HANDLER is not set | ||
| 530 | # CONFIG_WATCHDOG is not set | ||
| 531 | CONFIG_HW_RANDOM=y | ||
| 532 | # CONFIG_NVRAM is not set | ||
| 533 | # CONFIG_R3964 is not set | ||
| 534 | # CONFIG_RAW_DRIVER is not set | ||
| 535 | |||
| 536 | # | ||
| 537 | # TPM devices | ||
| 538 | # | ||
| 539 | # CONFIG_TCG_TPM is not set | ||
| 540 | # CONFIG_I2C is not set | ||
| 541 | |||
| 542 | # | ||
| 543 | # SPI support | ||
| 544 | # | ||
| 545 | CONFIG_SPI=y | ||
| 546 | CONFIG_SPI_MASTER=y | ||
| 547 | |||
| 548 | # | ||
| 549 | # SPI Master Controller Drivers | ||
| 550 | # | ||
| 551 | CONFIG_SPI_BITBANG=y | ||
| 552 | CONFIG_SPI_OMAP_UWIRE=y | ||
| 553 | |||
| 554 | # | ||
| 555 | # SPI Protocol Masters | ||
| 556 | # | ||
| 557 | # CONFIG_SPI_AT25 is not set | ||
| 558 | # CONFIG_SPI_TSC2101 is not set | ||
| 559 | # CONFIG_SPI_TSC2102 is not set | ||
| 560 | # CONFIG_SPI_TSC210X is not set | ||
| 561 | # CONFIG_SPI_TSC2301 is not set | ||
| 562 | # CONFIG_SPI_SPIDEV is not set | ||
| 563 | |||
| 564 | # | ||
| 565 | # Dallas's 1-wire bus | ||
| 566 | # | ||
| 567 | # CONFIG_W1 is not set | ||
| 568 | CONFIG_HWMON=y | ||
| 569 | # CONFIG_HWMON_VID is not set | ||
| 570 | # CONFIG_SENSORS_ABITUGURU is not set | ||
| 571 | # CONFIG_SENSORS_F71805F is not set | ||
| 572 | # CONFIG_SENSORS_LM70 is not set | ||
| 573 | # CONFIG_SENSORS_PC87427 is not set | ||
| 574 | # CONFIG_SENSORS_SMSC47M1 is not set | ||
| 575 | # CONFIG_SENSORS_SMSC47B397 is not set | ||
| 576 | # CONFIG_SENSORS_VT1211 is not set | ||
| 577 | # CONFIG_SENSORS_W83627HF is not set | ||
| 578 | # CONFIG_SENSORS_TSC210X is not set | ||
| 579 | # CONFIG_HWMON_DEBUG_CHIP is not set | ||
| 580 | |||
| 581 | # | ||
| 582 | # Misc devices | ||
| 583 | # | ||
| 584 | # CONFIG_BLINK is not set | ||
| 585 | |||
| 586 | # | ||
| 587 | # Multifunction device drivers | ||
| 588 | # | ||
| 589 | # CONFIG_MFD_SM501 is not set | ||
| 590 | |||
| 591 | # | ||
| 592 | # LED devices | ||
| 593 | # | ||
| 594 | # CONFIG_NEW_LEDS is not set | ||
| 595 | |||
| 596 | # | ||
| 597 | # LED drivers | ||
| 598 | # | ||
| 599 | |||
| 600 | # | ||
| 601 | # LED Triggers | ||
| 602 | # | ||
| 603 | |||
| 604 | # | ||
| 605 | # Multimedia devices | ||
| 606 | # | ||
| 607 | # CONFIG_VIDEO_DEV is not set | ||
| 608 | # CONFIG_DVB_CORE is not set | ||
| 609 | CONFIG_DAB=y | ||
| 610 | |||
| 611 | # | ||
| 612 | # Graphics support | ||
| 613 | # | ||
| 614 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | ||
| 615 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | ||
| 616 | CONFIG_LCD_CLASS_DEVICE=y | ||
| 617 | CONFIG_BACKLIGHT_OMAP=y | ||
| 618 | |||
| 619 | # | ||
| 620 | # Display device support | ||
| 621 | # | ||
| 622 | # CONFIG_DISPLAY_SUPPORT is not set | ||
| 623 | # CONFIG_VGASTATE is not set | ||
| 624 | CONFIG_FB=y | ||
| 625 | CONFIG_FIRMWARE_EDID=y | ||
| 626 | # CONFIG_FB_DDC is not set | ||
| 627 | # CONFIG_FB_CFB_FILLRECT is not set | ||
| 628 | # CONFIG_FB_CFB_COPYAREA is not set | ||
| 629 | # CONFIG_FB_CFB_IMAGEBLIT is not set | ||
| 630 | # CONFIG_FB_SYS_FILLRECT is not set | ||
| 631 | # CONFIG_FB_SYS_COPYAREA is not set | ||
| 632 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
| 633 | # CONFIG_FB_SYS_FOPS is not set | ||
| 634 | CONFIG_FB_DEFERRED_IO=y | ||
| 635 | # CONFIG_FB_SVGALIB is not set | ||
| 636 | # CONFIG_FB_MACMODES is not set | ||
| 637 | # CONFIG_FB_BACKLIGHT is not set | ||
| 638 | # CONFIG_FB_MODE_HELPERS is not set | ||
| 639 | # CONFIG_FB_TILEBLITTING is not set | ||
| 640 | |||
| 641 | # | ||
| 642 | # Frame buffer hardware drivers | ||
| 643 | # | ||
| 644 | # CONFIG_FB_S1D13XXX is not set | ||
| 645 | CONFIG_FB_OMAP=y | ||
| 646 | # CONFIG_FB_OMAP_LCDC_EXTERNAL is not set | ||
| 647 | # CONFIG_FB_OMAP_LCD_MIPID is not set | ||
| 648 | # CONFIG_FB_OMAP_BOOTLOADER_INIT is not set | ||
| 649 | CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2 | ||
| 650 | # CONFIG_FB_OMAP_DMA_TUNE is not set | ||
| 651 | # CONFIG_FB_VIRTUAL is not set | ||
| 652 | |||
| 653 | # | ||
| 654 | # Console display driver support | ||
| 655 | # | ||
| 656 | # CONFIG_VGA_CONSOLE is not set | ||
| 657 | CONFIG_DUMMY_CONSOLE=y | ||
| 658 | CONFIG_FRAMEBUFFER_CONSOLE=y | ||
| 659 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | ||
| 660 | # CONFIG_FONTS is not set | ||
| 661 | CONFIG_FONT_8x8=y | ||
| 662 | CONFIG_FONT_8x16=y | ||
| 663 | # CONFIG_LOGO is not set | ||
| 664 | |||
| 665 | # | ||
| 666 | # Sound | ||
| 667 | # | ||
| 668 | # CONFIG_SOUND is not set | ||
| 669 | |||
| 670 | # | ||
| 671 | # HID Devices | ||
| 672 | # | ||
| 673 | CONFIG_HID=y | ||
| 674 | # CONFIG_HID_DEBUG is not set | ||
| 675 | |||
| 676 | # | ||
| 677 | # USB support | ||
| 678 | # | ||
| 679 | CONFIG_USB_ARCH_HAS_HCD=y | ||
| 680 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
| 681 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
| 682 | # CONFIG_USB is not set | ||
| 683 | |||
| 684 | # | ||
| 685 | # Enable Host or Gadget support to see Inventra options | ||
| 686 | # | ||
| 687 | |||
| 688 | # | ||
| 689 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
| 690 | # | ||
| 691 | |||
| 692 | # | ||
| 693 | # USB Gadget Support | ||
| 694 | # | ||
| 695 | # CONFIG_USB_GADGET is not set | ||
| 696 | CONFIG_MMC=y | ||
| 697 | # CONFIG_MMC_DEBUG is not set | ||
| 698 | # CONFIG_MMC_UNSAFE_RESUME is not set | ||
| 699 | |||
| 700 | # | ||
| 701 | # MMC/SD Card Drivers | ||
| 702 | # | ||
| 703 | CONFIG_MMC_BLOCK=y | ||
| 704 | |||
| 705 | # | ||
| 706 | # MMC/SD Host Controller Drivers | ||
| 707 | # | ||
| 708 | CONFIG_MMC_OMAP=y | ||
| 709 | |||
| 710 | # | ||
| 711 | # Real Time Clock | ||
| 712 | # | ||
| 713 | CONFIG_RTC_LIB=y | ||
| 714 | CONFIG_RTC_CLASS=y | ||
| 715 | CONFIG_RTC_HCTOSYS=y | ||
| 716 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
| 717 | # CONFIG_RTC_DEBUG is not set | ||
| 718 | |||
| 719 | # | ||
| 720 | # RTC interfaces | ||
| 721 | # | ||
| 722 | CONFIG_RTC_INTF_SYSFS=y | ||
| 723 | CONFIG_RTC_INTF_PROC=y | ||
| 724 | CONFIG_RTC_INTF_DEV=y | ||
| 725 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
| 726 | # CONFIG_RTC_DRV_TEST is not set | ||
| 727 | |||
| 728 | # | ||
| 729 | # I2C RTC drivers | ||
| 730 | # | ||
| 731 | |||
| 732 | # | ||
| 733 | # SPI RTC drivers | ||
| 734 | # | ||
| 735 | # CONFIG_RTC_DRV_RS5C348 is not set | ||
| 736 | # CONFIG_RTC_DRV_MAX6902 is not set | ||
| 737 | |||
| 738 | # | ||
| 739 | # Platform RTC drivers | ||
| 740 | # | ||
| 741 | # CONFIG_RTC_DRV_CMOS is not set | ||
| 742 | # CONFIG_RTC_DRV_DS1553 is not set | ||
| 743 | # CONFIG_RTC_DRV_DS1742 is not set | ||
| 744 | # CONFIG_RTC_DRV_M48T86 is not set | ||
| 745 | # CONFIG_RTC_DRV_V3020 is not set | ||
| 746 | |||
| 747 | # | ||
| 748 | # on-CPU RTC drivers | ||
| 749 | # | ||
| 750 | CONFIG_RTC_DRV_OMAP=y | ||
| 751 | |||
| 752 | # | ||
| 753 | # CBUS support | ||
| 754 | # | ||
| 755 | # CONFIG_CBUS is not set | ||
| 756 | |||
| 757 | # | ||
| 758 | # File systems | ||
| 759 | # | ||
| 760 | CONFIG_EXT2_FS=y | ||
| 761 | # CONFIG_EXT2_FS_XATTR is not set | ||
| 762 | # CONFIG_EXT2_FS_XIP is not set | ||
| 763 | # CONFIG_EXT3_FS is not set | ||
| 764 | # CONFIG_EXT4DEV_FS is not set | ||
| 765 | # CONFIG_REISERFS_FS is not set | ||
| 766 | # CONFIG_JFS_FS is not set | ||
| 767 | # CONFIG_FS_POSIX_ACL is not set | ||
| 768 | # CONFIG_XFS_FS is not set | ||
| 769 | # CONFIG_GFS2_FS is not set | ||
| 770 | # CONFIG_OCFS2_FS is not set | ||
| 771 | # CONFIG_MINIX_FS is not set | ||
| 772 | # CONFIG_ROMFS_FS is not set | ||
| 773 | # CONFIG_INOTIFY is not set | ||
| 774 | # CONFIG_QUOTA is not set | ||
| 775 | CONFIG_DNOTIFY=y | ||
| 776 | # CONFIG_AUTOFS_FS is not set | ||
| 777 | # CONFIG_AUTOFS4_FS is not set | ||
| 778 | # CONFIG_FUSE_FS is not set | ||
| 779 | |||
| 780 | # | ||
| 781 | # CD-ROM/DVD Filesystems | ||
| 782 | # | ||
| 783 | # CONFIG_ISO9660_FS is not set | ||
| 784 | # CONFIG_UDF_FS is not set | ||
| 785 | |||
| 786 | # | ||
| 787 | # DOS/FAT/NT Filesystems | ||
| 788 | # | ||
| 789 | # CONFIG_MSDOS_FS is not set | ||
| 790 | # CONFIG_VFAT_FS is not set | ||
| 791 | # CONFIG_NTFS_FS is not set | ||
| 792 | |||
| 793 | # | ||
| 794 | # Pseudo filesystems | ||
| 795 | # | ||
| 796 | CONFIG_PROC_FS=y | ||
| 797 | CONFIG_PROC_SYSCTL=y | ||
| 798 | CONFIG_SYSFS=y | ||
| 799 | # CONFIG_TMPFS is not set | ||
| 800 | # CONFIG_HUGETLB_PAGE is not set | ||
| 801 | CONFIG_RAMFS=y | ||
| 802 | # CONFIG_CONFIGFS_FS is not set | ||
| 803 | |||
| 804 | # | ||
| 805 | # Miscellaneous filesystems | ||
| 806 | # | ||
| 807 | # CONFIG_ADFS_FS is not set | ||
| 808 | # CONFIG_AFFS_FS is not set | ||
| 809 | # CONFIG_HFS_FS is not set | ||
| 810 | # CONFIG_HFSPLUS_FS is not set | ||
| 811 | # CONFIG_BEFS_FS is not set | ||
| 812 | # CONFIG_BFS_FS is not set | ||
| 813 | # CONFIG_EFS_FS is not set | ||
| 814 | # CONFIG_CRAMFS is not set | ||
| 815 | # CONFIG_VXFS_FS is not set | ||
| 816 | # CONFIG_HPFS_FS is not set | ||
| 817 | # CONFIG_QNX4FS_FS is not set | ||
| 818 | # CONFIG_SYSV_FS is not set | ||
| 819 | # CONFIG_UFS_FS is not set | ||
| 820 | |||
| 821 | # | ||
| 822 | # Network File Systems | ||
| 823 | # | ||
| 824 | # CONFIG_NFS_FS is not set | ||
| 825 | # CONFIG_NFSD is not set | ||
| 826 | # CONFIG_SMB_FS is not set | ||
| 827 | # CONFIG_CIFS is not set | ||
| 828 | # CONFIG_NCP_FS is not set | ||
| 829 | # CONFIG_CODA_FS is not set | ||
| 830 | # CONFIG_AFS_FS is not set | ||
| 831 | # CONFIG_9P_FS is not set | ||
| 832 | |||
| 833 | # | ||
| 834 | # Partition Types | ||
| 835 | # | ||
| 836 | # CONFIG_PARTITION_ADVANCED is not set | ||
| 837 | CONFIG_MSDOS_PARTITION=y | ||
| 838 | |||
| 839 | # | ||
| 840 | # Native Language Support | ||
| 841 | # | ||
| 842 | # CONFIG_NLS is not set | ||
| 843 | |||
| 844 | # | ||
| 845 | # Distributed Lock Manager | ||
| 846 | # | ||
| 847 | # CONFIG_DLM is not set | ||
| 848 | |||
| 849 | # | ||
| 850 | # Profiling support | ||
| 851 | # | ||
| 852 | # CONFIG_PROFILING is not set | ||
| 853 | |||
| 854 | # | ||
| 855 | # Kernel hacking | ||
| 856 | # | ||
| 857 | # CONFIG_PRINTK_TIME is not set | ||
| 858 | CONFIG_ENABLE_MUST_CHECK=y | ||
| 859 | # CONFIG_MAGIC_SYSRQ is not set | ||
| 860 | # CONFIG_UNUSED_SYMBOLS is not set | ||
| 861 | # CONFIG_DEBUG_FS is not set | ||
| 862 | # CONFIG_HEADERS_CHECK is not set | ||
| 863 | # CONFIG_DEBUG_KERNEL is not set | ||
| 864 | CONFIG_DEBUG_BUGVERBOSE=y | ||
| 865 | CONFIG_FRAME_POINTER=y | ||
| 866 | # CONFIG_DEBUG_USER is not set | ||
| 867 | |||
| 868 | # | ||
| 869 | # Security options | ||
| 870 | # | ||
| 871 | # CONFIG_KEYS is not set | ||
| 872 | # CONFIG_SECURITY is not set | ||
| 873 | |||
| 874 | # | ||
| 875 | # Cryptographic options | ||
| 876 | # | ||
| 877 | # CONFIG_CRYPTO is not set | ||
| 878 | |||
| 879 | # | ||
| 880 | # Library routines | ||
| 881 | # | ||
| 882 | CONFIG_BITREVERSE=y | ||
| 883 | CONFIG_CRC_CCITT=y | ||
| 884 | CONFIG_CRC16=y | ||
| 885 | # CONFIG_CRC_ITU_T is not set | ||
| 886 | CONFIG_CRC32=y | ||
| 887 | CONFIG_LIBCRC32C=y | ||
| 888 | CONFIG_PLIST=y | ||
| 889 | CONFIG_HAS_IOMEM=y | ||
| 890 | CONFIG_HAS_IOPORT=y | ||
| 891 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/arm/configs/sx1_defconfig b/arch/arm/configs/sx1_defconfig new file mode 100644 index 000000000000..853dcdd9f2e0 --- /dev/null +++ b/arch/arm/configs/sx1_defconfig | |||
| @@ -0,0 +1,1118 @@ | |||
| 1 | # | ||
| 2 | # Automatically generated make config: don't edit | ||
| 3 | # Linux kernel version: 2.6.22-rc1-omap1 | ||
| 4 | # Thu Jun 7 05:16:10 2007 | ||
| 5 | # | ||
| 6 | CONFIG_ARM=y | ||
| 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | ||
| 8 | CONFIG_GENERIC_GPIO=y | ||
| 9 | CONFIG_GENERIC_TIME=y | ||
| 10 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 11 | CONFIG_MMU=y | ||
| 12 | # CONFIG_NO_IOPORT is not set | ||
| 13 | CONFIG_GENERIC_HARDIRQS=y | ||
| 14 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 15 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 16 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
| 17 | CONFIG_HARDIRQS_SW_RESEND=y | ||
| 18 | CONFIG_GENERIC_IRQ_PROBE=y | ||
| 19 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
| 20 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
| 21 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
| 22 | CONFIG_GENERIC_HWEIGHT=y | ||
| 23 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
| 24 | CONFIG_ZONE_DMA=y | ||
| 25 | CONFIG_VECTORS_BASE=0xffff0000 | ||
| 26 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
| 27 | |||
| 28 | # | ||
| 29 | # Code maturity level options | ||
| 30 | # | ||
| 31 | CONFIG_EXPERIMENTAL=y | ||
| 32 | CONFIG_BROKEN_ON_SMP=y | ||
| 33 | CONFIG_LOCK_KERNEL=y | ||
| 34 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 35 | |||
| 36 | # | ||
| 37 | # General setup | ||
| 38 | # | ||
| 39 | CONFIG_LOCALVERSION="" | ||
| 40 | CONFIG_LOCALVERSION_AUTO=y | ||
| 41 | CONFIG_SWAP=y | ||
| 42 | CONFIG_SYSVIPC=y | ||
| 43 | # CONFIG_IPC_NS is not set | ||
| 44 | CONFIG_SYSVIPC_SYSCTL=y | ||
| 45 | CONFIG_POSIX_MQUEUE=y | ||
| 46 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 47 | # CONFIG_TASKSTATS is not set | ||
| 48 | # CONFIG_UTS_NS is not set | ||
| 49 | # CONFIG_AUDIT is not set | ||
| 50 | CONFIG_IKCONFIG=y | ||
| 51 | # CONFIG_IKCONFIG_PROC is not set | ||
| 52 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 53 | CONFIG_SYSFS_DEPRECATED=y | ||
| 54 | # CONFIG_RELAY is not set | ||
| 55 | # CONFIG_BLK_DEV_INITRD is not set | ||
| 56 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
| 57 | CONFIG_SYSCTL=y | ||
| 58 | CONFIG_EMBEDDED=y | ||
| 59 | CONFIG_UID16=y | ||
| 60 | CONFIG_SYSCTL_SYSCALL=y | ||
| 61 | # CONFIG_KALLSYMS is not set | ||
| 62 | CONFIG_HOTPLUG=y | ||
| 63 | CONFIG_PRINTK=y | ||
| 64 | CONFIG_BUG=y | ||
| 65 | # CONFIG_ELF_CORE is not set | ||
| 66 | # CONFIG_BASE_FULL is not set | ||
| 67 | CONFIG_FUTEX=y | ||
| 68 | CONFIG_ANON_INODES=y | ||
| 69 | CONFIG_EPOLL=y | ||
| 70 | CONFIG_SIGNALFD=y | ||
| 71 | CONFIG_TIMERFD=y | ||
| 72 | CONFIG_EVENTFD=y | ||
| 73 | # CONFIG_SHMEM is not set | ||
| 74 | # CONFIG_VM_EVENT_COUNTERS is not set | ||
| 75 | # CONFIG_SLAB is not set | ||
| 76 | # CONFIG_SLUB is not set | ||
| 77 | CONFIG_SLOB=y | ||
| 78 | CONFIG_RT_MUTEXES=y | ||
| 79 | CONFIG_TINY_SHMEM=y | ||
| 80 | CONFIG_BASE_SMALL=1 | ||
| 81 | |||
| 82 | # | ||
| 83 | # Loadable module support | ||
| 84 | # | ||
| 85 | CONFIG_MODULES=y | ||
| 86 | CONFIG_MODULE_UNLOAD=y | ||
| 87 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 88 | # CONFIG_MODVERSIONS is not set | ||
| 89 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 90 | CONFIG_KMOD=y | ||
| 91 | |||
| 92 | # | ||
| 93 | # Block layer | ||
| 94 | # | ||
| 95 | CONFIG_BLOCK=y | ||
| 96 | # CONFIG_LBD is not set | ||
| 97 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 98 | # CONFIG_LSF is not set | ||
| 99 | |||
| 100 | # | ||
| 101 | # IO Schedulers | ||
| 102 | # | ||
| 103 | CONFIG_IOSCHED_NOOP=y | ||
| 104 | # CONFIG_IOSCHED_AS is not set | ||
| 105 | CONFIG_IOSCHED_DEADLINE=y | ||
| 106 | # CONFIG_IOSCHED_CFQ is not set | ||
| 107 | # CONFIG_DEFAULT_AS is not set | ||
| 108 | CONFIG_DEFAULT_DEADLINE=y | ||
| 109 | # CONFIG_DEFAULT_CFQ is not set | ||
| 110 | # CONFIG_DEFAULT_NOOP is not set | ||
| 111 | CONFIG_DEFAULT_IOSCHED="deadline" | ||
| 112 | |||
| 113 | # | ||
| 114 | # System Type | ||
| 115 | # | ||
| 116 | # CONFIG_ARCH_AAEC2000 is not set | ||
| 117 | # CONFIG_ARCH_INTEGRATOR is not set | ||
| 118 | # CONFIG_ARCH_REALVIEW is not set | ||
| 119 | # CONFIG_ARCH_VERSATILE is not set | ||
| 120 | # CONFIG_ARCH_AT91 is not set | ||
| 121 | # CONFIG_ARCH_CLPS7500 is not set | ||
| 122 | # CONFIG_ARCH_CLPS711X is not set | ||
| 123 | # CONFIG_ARCH_CO285 is not set | ||
| 124 | # CONFIG_ARCH_EBSA110 is not set | ||
| 125 | # CONFIG_ARCH_EP93XX is not set | ||
| 126 | # CONFIG_ARCH_FOOTBRIDGE is not set | ||
| 127 | # CONFIG_ARCH_NETX is not set | ||
| 128 | # CONFIG_ARCH_H720X is not set | ||
| 129 | # CONFIG_ARCH_IMX is not set | ||
| 130 | # CONFIG_ARCH_IOP13XX is not set | ||
| 131 | # CONFIG_ARCH_IOP32X is not set | ||
| 132 | # CONFIG_ARCH_IOP33X is not set | ||
| 133 | # CONFIG_ARCH_IXP23XX is not set | ||
| 134 | # CONFIG_ARCH_IXP2000 is not set | ||
| 135 | # CONFIG_ARCH_IXP4XX is not set | ||
| 136 | # CONFIG_ARCH_L7200 is not set | ||
| 137 | # CONFIG_ARCH_KS8695 is not set | ||
| 138 | # CONFIG_ARCH_NS9XXX is not set | ||
| 139 | # CONFIG_ARCH_PNX4008 is not set | ||
| 140 | # CONFIG_ARCH_PXA is not set | ||
| 141 | # CONFIG_ARCH_RPC is not set | ||
| 142 | # CONFIG_ARCH_SA1100 is not set | ||
| 143 | # CONFIG_ARCH_S3C2410 is not set | ||
| 144 | # CONFIG_ARCH_SHARK is not set | ||
| 145 | # CONFIG_ARCH_LH7A40X is not set | ||
| 146 | # CONFIG_ARCH_DAVINCI is not set | ||
| 147 | CONFIG_ARCH_OMAP=y | ||
| 148 | |||
| 149 | # | ||
| 150 | # TI OMAP Implementations | ||
| 151 | # | ||
| 152 | CONFIG_ARCH_OMAP1=y | ||
| 153 | # CONFIG_ARCH_OMAP2 is not set | ||
| 154 | |||
| 155 | # | ||
| 156 | # OMAP Feature Selections | ||
| 157 | # | ||
| 158 | # CONFIG_OMAP_RESET_CLOCKS is not set | ||
| 159 | CONFIG_OMAP_BOOT_TAG=y | ||
| 160 | # CONFIG_OMAP_BOOT_REASON is not set | ||
| 161 | # CONFIG_OMAP_COMPONENT_VERSION is not set | ||
| 162 | CONFIG_OMAP_GPIO_SWITCH=y | ||
| 163 | CONFIG_OMAP_MUX=y | ||
| 164 | # CONFIG_OMAP_MUX_DEBUG is not set | ||
| 165 | CONFIG_OMAP_MUX_WARNINGS=y | ||
| 166 | CONFIG_OMAP_MCBSP=y | ||
| 167 | CONFIG_OMAP_MMU_FWK=y | ||
| 168 | CONFIG_OMAP_MBOX_FWK=y | ||
| 169 | CONFIG_OMAP_MPU_TIMER=y | ||
| 170 | # CONFIG_OMAP_32K_TIMER is not set | ||
| 171 | # CONFIG_OMAP_LL_DEBUG_UART1 is not set | ||
| 172 | # CONFIG_OMAP_LL_DEBUG_UART2 is not set | ||
| 173 | CONFIG_OMAP_LL_DEBUG_UART3=y | ||
| 174 | # CONFIG_OMAP_LL_DEBUG_LCD is not set | ||
| 175 | CONFIG_OMAP_SERIAL_WAKE=y | ||
| 176 | CONFIG_OMAP_DSP=y | ||
| 177 | # CONFIG_OMAP_DSP_MBCMD_VERBOSE is not set | ||
| 178 | # CONFIG_OMAP_DSP_TASK_MULTIOPEN is not set | ||
| 179 | # CONFIG_OMAP_DSP_FBEXPORT is not set | ||
| 180 | |||
| 181 | # | ||
| 182 | # OMAP Core Type | ||
| 183 | # | ||
| 184 | # CONFIG_ARCH_OMAP730 is not set | ||
| 185 | CONFIG_ARCH_OMAP15XX=y | ||
| 186 | # CONFIG_ARCH_OMAP16XX is not set | ||
| 187 | |||
| 188 | # | ||
| 189 | # OMAP Board Type | ||
| 190 | # | ||
| 191 | # CONFIG_MACH_OMAP_INNOVATOR is not set | ||
| 192 | # CONFIG_MACH_VOICEBLUE is not set | ||
| 193 | # CONFIG_MACH_OMAP_PALMTE is not set | ||
| 194 | # CONFIG_MACH_OMAP_PALMZ71 is not set | ||
| 195 | # CONFIG_MACH_OMAP_PALMTT is not set | ||
| 196 | CONFIG_MACH_SX1=y | ||
| 197 | # CONFIG_MACH_AMS_DELTA is not set | ||
| 198 | # CONFIG_MACH_OMAP_GENERIC is not set | ||
| 199 | |||
| 200 | # | ||
| 201 | # OMAP CPU Speed | ||
| 202 | # | ||
| 203 | # CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER is not set | ||
| 204 | CONFIG_OMAP_ARM_168MHZ=y | ||
| 205 | # CONFIG_OMAP_ARM_150MHZ is not set | ||
| 206 | # CONFIG_OMAP_ARM_120MHZ is not set | ||
| 207 | # CONFIG_OMAP_ARM_60MHZ is not set | ||
| 208 | # CONFIG_OMAP_ARM_30MHZ is not set | ||
| 209 | |||
| 210 | # | ||
| 211 | # Processor Type | ||
| 212 | # | ||
| 213 | CONFIG_CPU_32=y | ||
| 214 | CONFIG_CPU_ARM925T=y | ||
| 215 | CONFIG_CPU_32v4T=y | ||
| 216 | CONFIG_CPU_ABRT_EV4T=y | ||
| 217 | CONFIG_CPU_CACHE_V4WT=y | ||
| 218 | CONFIG_CPU_CACHE_VIVT=y | ||
| 219 | CONFIG_CPU_COPY_V4WB=y | ||
| 220 | CONFIG_CPU_TLB_V4WBI=y | ||
| 221 | CONFIG_CPU_CP15=y | ||
| 222 | CONFIG_CPU_CP15_MMU=y | ||
| 223 | |||
| 224 | # | ||
| 225 | # Processor Features | ||
| 226 | # | ||
| 227 | CONFIG_ARM_THUMB=y | ||
| 228 | # CONFIG_CPU_ICACHE_DISABLE is not set | ||
| 229 | # CONFIG_CPU_DCACHE_DISABLE is not set | ||
| 230 | # CONFIG_CPU_DCACHE_WRITETHROUGH is not set | ||
| 231 | # CONFIG_OUTER_CACHE is not set | ||
| 232 | |||
| 233 | # | ||
| 234 | # Bus support | ||
| 235 | # | ||
| 236 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 237 | |||
| 238 | # | ||
| 239 | # PCCARD (PCMCIA/CardBus) support | ||
| 240 | # | ||
| 241 | # CONFIG_PCCARD is not set | ||
| 242 | |||
| 243 | # | ||
| 244 | # Kernel Features | ||
| 245 | # | ||
| 246 | # CONFIG_TICK_ONESHOT is not set | ||
| 247 | # CONFIG_NO_HZ is not set | ||
| 248 | # CONFIG_HIGH_RES_TIMERS is not set | ||
| 249 | CONFIG_PREEMPT=y | ||
| 250 | CONFIG_HZ=100 | ||
| 251 | # CONFIG_AEABI is not set | ||
| 252 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | ||
| 253 | CONFIG_SELECT_MEMORY_MODEL=y | ||
| 254 | CONFIG_FLATMEM_MANUAL=y | ||
| 255 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
| 256 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
| 257 | CONFIG_FLATMEM=y | ||
| 258 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
| 259 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 260 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | ||
| 261 | # CONFIG_RESOURCES_64BIT is not set | ||
| 262 | CONFIG_ZONE_DMA_FLAG=1 | ||
| 263 | # CONFIG_LEDS is not set | ||
| 264 | CONFIG_ALIGNMENT_TRAP=y | ||
| 265 | |||
| 266 | # | ||
| 267 | # Boot options | ||
| 268 | # | ||
| 269 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
| 270 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
| 271 | CONFIG_CMDLINE="" | ||
| 272 | # CONFIG_XIP_KERNEL is not set | ||
| 273 | # CONFIG_KEXEC is not set | ||
| 274 | |||
| 275 | # | ||
| 276 | # CPU Frequency scaling | ||
| 277 | # | ||
| 278 | # CONFIG_CPU_FREQ is not set | ||
| 279 | |||
| 280 | # | ||
| 281 | # Floating point emulation | ||
| 282 | # | ||
| 283 | |||
| 284 | # | ||
| 285 | # At least one emulation must be selected | ||
| 286 | # | ||
| 287 | CONFIG_FPE_NWFPE=y | ||
| 288 | # CONFIG_FPE_NWFPE_XP is not set | ||
| 289 | # CONFIG_FPE_FASTFPE is not set | ||
| 290 | |||
| 291 | # | ||
| 292 | # Userspace binary formats | ||
| 293 | # | ||
| 294 | CONFIG_BINFMT_ELF=y | ||
| 295 | # CONFIG_BINFMT_AOUT is not set | ||
| 296 | CONFIG_BINFMT_MISC=y | ||
| 297 | # CONFIG_ARTHUR is not set | ||
| 298 | |||
| 299 | # | ||
| 300 | # Power management options | ||
| 301 | # | ||
| 302 | # CONFIG_PM is not set | ||
| 303 | |||
| 304 | # | ||
| 305 | # Networking | ||
| 306 | # | ||
| 307 | CONFIG_NET=y | ||
| 308 | |||
| 309 | # | ||
| 310 | # Networking options | ||
| 311 | # | ||
| 312 | CONFIG_PACKET=y | ||
| 313 | CONFIG_PACKET_MMAP=y | ||
| 314 | CONFIG_UNIX=y | ||
| 315 | # CONFIG_NET_KEY is not set | ||
| 316 | CONFIG_INET=y | ||
| 317 | # CONFIG_IP_MULTICAST is not set | ||
| 318 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
| 319 | CONFIG_IP_FIB_HASH=y | ||
| 320 | CONFIG_IP_PNP=y | ||
| 321 | # CONFIG_IP_PNP_DHCP is not set | ||
| 322 | # CONFIG_IP_PNP_BOOTP is not set | ||
| 323 | # CONFIG_IP_PNP_RARP is not set | ||
| 324 | # CONFIG_NET_IPIP is not set | ||
| 325 | # CONFIG_NET_IPGRE is not set | ||
| 326 | # CONFIG_ARPD is not set | ||
| 327 | # CONFIG_SYN_COOKIES is not set | ||
| 328 | # CONFIG_INET_AH is not set | ||
| 329 | # CONFIG_INET_ESP is not set | ||
| 330 | # CONFIG_INET_IPCOMP is not set | ||
| 331 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
| 332 | # CONFIG_INET_TUNNEL is not set | ||
| 333 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | ||
| 334 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | ||
| 335 | # CONFIG_INET_XFRM_MODE_BEET is not set | ||
| 336 | # CONFIG_INET_DIAG is not set | ||
| 337 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
| 338 | CONFIG_TCP_CONG_CUBIC=y | ||
| 339 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
| 340 | # CONFIG_TCP_MD5SIG is not set | ||
| 341 | # CONFIG_IPV6 is not set | ||
| 342 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 343 | # CONFIG_INET6_TUNNEL is not set | ||
| 344 | # CONFIG_NETWORK_SECMARK is not set | ||
| 345 | # CONFIG_NETFILTER is not set | ||
| 346 | |||
| 347 | # | ||
| 348 | # DCCP Configuration (EXPERIMENTAL) | ||
| 349 | # | ||
| 350 | # CONFIG_IP_DCCP is not set | ||
| 351 | |||
| 352 | # | ||
| 353 | # SCTP Configuration (EXPERIMENTAL) | ||
| 354 | # | ||
| 355 | # CONFIG_IP_SCTP is not set | ||
| 356 | |||
| 357 | # | ||
| 358 | # TIPC Configuration (EXPERIMENTAL) | ||
| 359 | # | ||
| 360 | # CONFIG_TIPC is not set | ||
| 361 | # CONFIG_ATM is not set | ||
| 362 | # CONFIG_BRIDGE is not set | ||
| 363 | # CONFIG_VLAN_8021Q is not set | ||
| 364 | # CONFIG_DECNET is not set | ||
| 365 | # CONFIG_LLC2 is not set | ||
| 366 | # CONFIG_IPX is not set | ||
| 367 | # CONFIG_ATALK is not set | ||
| 368 | # CONFIG_X25 is not set | ||
| 369 | # CONFIG_LAPB is not set | ||
| 370 | # CONFIG_ECONET is not set | ||
| 371 | # CONFIG_WAN_ROUTER is not set | ||
| 372 | |||
| 373 | # | ||
| 374 | # QoS and/or fair queueing | ||
| 375 | # | ||
| 376 | # CONFIG_NET_SCHED is not set | ||
| 377 | |||
| 378 | # | ||
| 379 | # Network testing | ||
| 380 | # | ||
| 381 | # CONFIG_NET_PKTGEN is not set | ||
| 382 | # CONFIG_HAMRADIO is not set | ||
| 383 | # CONFIG_IRDA is not set | ||
| 384 | # CONFIG_BT is not set | ||
| 385 | # CONFIG_AF_RXRPC is not set | ||
| 386 | |||
| 387 | # | ||
| 388 | # Wireless | ||
| 389 | # | ||
| 390 | # CONFIG_CFG80211 is not set | ||
| 391 | # CONFIG_WIRELESS_EXT is not set | ||
| 392 | # CONFIG_MAC80211 is not set | ||
| 393 | # CONFIG_IEEE80211 is not set | ||
| 394 | # CONFIG_RFKILL is not set | ||
| 395 | |||
| 396 | # | ||
| 397 | # Device Drivers | ||
| 398 | # | ||
| 399 | |||
| 400 | # | ||
| 401 | # Generic Driver Options | ||
| 402 | # | ||
| 403 | CONFIG_STANDALONE=y | ||
| 404 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
| 405 | # CONFIG_FW_LOADER is not set | ||
| 406 | # CONFIG_DEBUG_DRIVER is not set | ||
| 407 | # CONFIG_DEBUG_DEVRES is not set | ||
| 408 | # CONFIG_SYS_HYPERVISOR is not set | ||
| 409 | |||
| 410 | # | ||
| 411 | # Connector - unified userspace <-> kernelspace linker | ||
| 412 | # | ||
| 413 | CONFIG_CONNECTOR=y | ||
| 414 | # CONFIG_PROC_EVENTS is not set | ||
| 415 | # CONFIG_MTD is not set | ||
| 416 | |||
| 417 | # | ||
| 418 | # Parallel port support | ||
| 419 | # | ||
| 420 | # CONFIG_PARPORT is not set | ||
| 421 | |||
| 422 | # | ||
| 423 | # Plug and Play support | ||
| 424 | # | ||
| 425 | # CONFIG_PNPACPI is not set | ||
| 426 | |||
| 427 | # | ||
| 428 | # Block devices | ||
| 429 | # | ||
| 430 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
| 431 | CONFIG_BLK_DEV_LOOP=m | ||
| 432 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | ||
| 433 | # CONFIG_BLK_DEV_NBD is not set | ||
| 434 | CONFIG_BLK_DEV_RAM=m | ||
| 435 | CONFIG_BLK_DEV_RAM_COUNT=2 | ||
| 436 | CONFIG_BLK_DEV_RAM_SIZE=4096 | ||
| 437 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | ||
| 438 | # CONFIG_CDROM_PKTCDVD is not set | ||
| 439 | # CONFIG_ATA_OVER_ETH is not set | ||
| 440 | |||
| 441 | # | ||
| 442 | # SCSI device support | ||
| 443 | # | ||
| 444 | # CONFIG_RAID_ATTRS is not set | ||
| 445 | # CONFIG_SCSI is not set | ||
| 446 | # CONFIG_SCSI_NETLINK is not set | ||
| 447 | # CONFIG_ATA is not set | ||
| 448 | |||
| 449 | # | ||
| 450 | # Multi-device support (RAID and LVM) | ||
| 451 | # | ||
| 452 | # CONFIG_MD is not set | ||
| 453 | |||
| 454 | # | ||
| 455 | # Network device support | ||
| 456 | # | ||
| 457 | CONFIG_NETDEVICES=y | ||
| 458 | # CONFIG_DUMMY is not set | ||
| 459 | # CONFIG_BONDING is not set | ||
| 460 | # CONFIG_EQUALIZER is not set | ||
| 461 | # CONFIG_TUN is not set | ||
| 462 | CONFIG_PHYLIB=y | ||
| 463 | |||
| 464 | # | ||
| 465 | # MII PHY device drivers | ||
| 466 | # | ||
| 467 | # CONFIG_MARVELL_PHY is not set | ||
| 468 | # CONFIG_DAVICOM_PHY is not set | ||
| 469 | # CONFIG_QSEMI_PHY is not set | ||
| 470 | # CONFIG_LXT_PHY is not set | ||
| 471 | # CONFIG_CICADA_PHY is not set | ||
| 472 | # CONFIG_VITESSE_PHY is not set | ||
| 473 | # CONFIG_SMSC_PHY is not set | ||
| 474 | # CONFIG_BROADCOM_PHY is not set | ||
| 475 | # CONFIG_FIXED_PHY is not set | ||
| 476 | |||
| 477 | # | ||
| 478 | # Ethernet (10 or 100Mbit) | ||
| 479 | # | ||
| 480 | CONFIG_NET_ETHERNET=y | ||
| 481 | CONFIG_MII=y | ||
| 482 | # CONFIG_SMC91X is not set | ||
| 483 | # CONFIG_DM9000 is not set | ||
| 484 | CONFIG_NETDEV_1000=y | ||
| 485 | CONFIG_NETDEV_10000=y | ||
| 486 | |||
| 487 | # | ||
| 488 | # Token Ring devices | ||
| 489 | # | ||
| 490 | |||
| 491 | # | ||
| 492 | # Wireless LAN | ||
| 493 | # | ||
| 494 | # CONFIG_WLAN_PRE80211 is not set | ||
| 495 | # CONFIG_WLAN_80211 is not set | ||
| 496 | # CONFIG_WAN is not set | ||
| 497 | # CONFIG_PPP is not set | ||
| 498 | # CONFIG_SLIP is not set | ||
| 499 | # CONFIG_SHAPER is not set | ||
| 500 | # CONFIG_NETCONSOLE is not set | ||
| 501 | # CONFIG_NETPOLL is not set | ||
| 502 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
| 503 | |||
| 504 | # | ||
| 505 | # ISDN subsystem | ||
| 506 | # | ||
| 507 | # CONFIG_ISDN is not set | ||
| 508 | |||
| 509 | # | ||
| 510 | # Input device support | ||
| 511 | # | ||
| 512 | CONFIG_INPUT=y | ||
| 513 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
| 514 | |||
| 515 | # | ||
| 516 | # Userland interfaces | ||
| 517 | # | ||
| 518 | # CONFIG_INPUT_MOUSEDEV is not set | ||
| 519 | # CONFIG_INPUT_JOYDEV is not set | ||
| 520 | # CONFIG_INPUT_TSDEV is not set | ||
| 521 | CONFIG_INPUT_EVDEV=y | ||
| 522 | # CONFIG_INPUT_EVBUG is not set | ||
| 523 | |||
| 524 | # | ||
| 525 | # Input Device Drivers | ||
| 526 | # | ||
| 527 | CONFIG_INPUT_KEYBOARD=y | ||
| 528 | # CONFIG_KEYBOARD_ATKBD is not set | ||
| 529 | # CONFIG_KEYBOARD_SUNKBD is not set | ||
| 530 | # CONFIG_KEYBOARD_LKKBD is not set | ||
| 531 | # CONFIG_KEYBOARD_XTKBD is not set | ||
| 532 | # CONFIG_KEYBOARD_NEWTON is not set | ||
| 533 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
| 534 | CONFIG_KEYBOARD_OMAP=y | ||
| 535 | # CONFIG_KEYBOARD_GPIO is not set | ||
| 536 | # CONFIG_INPUT_MOUSE is not set | ||
| 537 | # CONFIG_INPUT_JOYSTICK is not set | ||
| 538 | # CONFIG_INPUT_TABLET is not set | ||
| 539 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
| 540 | # CONFIG_INPUT_MISC is not set | ||
| 541 | |||
| 542 | # | ||
| 543 | # Hardware I/O ports | ||
| 544 | # | ||
| 545 | # CONFIG_SERIO is not set | ||
| 546 | # CONFIG_GAMEPORT is not set | ||
| 547 | |||
| 548 | # | ||
| 549 | # Character devices | ||
| 550 | # | ||
| 551 | CONFIG_VT=y | ||
| 552 | CONFIG_VT_CONSOLE=y | ||
| 553 | CONFIG_HW_CONSOLE=y | ||
| 554 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
| 555 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
| 556 | |||
| 557 | # | ||
| 558 | # Serial drivers | ||
| 559 | # | ||
| 560 | CONFIG_SERIAL_8250=y | ||
| 561 | # CONFIG_SERIAL_8250_CONSOLE is not set | ||
| 562 | CONFIG_SERIAL_8250_NR_UARTS=3 | ||
| 563 | CONFIG_SERIAL_8250_RUNTIME_UARTS=3 | ||
| 564 | # CONFIG_SERIAL_8250_EXTENDED is not set | ||
| 565 | |||
| 566 | # | ||
| 567 | # Non-8250 serial port support | ||
| 568 | # | ||
| 569 | CONFIG_SERIAL_CORE=y | ||
| 570 | CONFIG_UNIX98_PTYS=y | ||
| 571 | # CONFIG_LEGACY_PTYS is not set | ||
| 572 | |||
| 573 | # | ||
| 574 | # IPMI | ||
| 575 | # | ||
| 576 | # CONFIG_IPMI_HANDLER is not set | ||
| 577 | # CONFIG_WATCHDOG is not set | ||
| 578 | # CONFIG_HW_RANDOM is not set | ||
| 579 | # CONFIG_NVRAM is not set | ||
| 580 | # CONFIG_R3964 is not set | ||
| 581 | # CONFIG_RAW_DRIVER is not set | ||
| 582 | |||
| 583 | # | ||
| 584 | # TPM devices | ||
| 585 | # | ||
| 586 | # CONFIG_TCG_TPM is not set | ||
| 587 | CONFIG_I2C=y | ||
| 588 | CONFIG_I2C_BOARDINFO=y | ||
| 589 | CONFIG_I2C_CHARDEV=y | ||
| 590 | |||
| 591 | # | ||
| 592 | # I2C Algorithms | ||
| 593 | # | ||
| 594 | # CONFIG_I2C_ALGOBIT is not set | ||
| 595 | # CONFIG_I2C_ALGOPCF is not set | ||
| 596 | # CONFIG_I2C_ALGOPCA is not set | ||
| 597 | |||
| 598 | # | ||
| 599 | # I2C Hardware Bus support | ||
| 600 | # | ||
| 601 | # CONFIG_I2C_GPIO is not set | ||
| 602 | # CONFIG_I2C_OCORES is not set | ||
| 603 | CONFIG_I2C_OMAP=y | ||
| 604 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 605 | # CONFIG_I2C_SIMTEC is not set | ||
| 606 | # CONFIG_I2C_STUB is not set | ||
| 607 | |||
| 608 | # | ||
| 609 | # Miscellaneous I2C Chip support | ||
| 610 | # | ||
| 611 | # CONFIG_SENSORS_DS1337 is not set | ||
| 612 | # CONFIG_SENSORS_DS1374 is not set | ||
| 613 | # CONFIG_SENSORS_EEPROM is not set | ||
| 614 | # CONFIG_SENSORS_PCF8574 is not set | ||
| 615 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 616 | # CONFIG_SENSORS_PCF8591 is not set | ||
| 617 | # CONFIG_TPS65010 is not set | ||
| 618 | # CONFIG_SENSORS_TLV320AIC23 is not set | ||
| 619 | # CONFIG_SENSORS_MAX6875 is not set | ||
| 620 | # CONFIG_I2C_DEBUG_CORE is not set | ||
| 621 | # CONFIG_I2C_DEBUG_ALGO is not set | ||
| 622 | # CONFIG_I2C_DEBUG_BUS is not set | ||
| 623 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 624 | |||
| 625 | # | ||
| 626 | # SPI support | ||
| 627 | # | ||
| 628 | # CONFIG_SPI is not set | ||
| 629 | # CONFIG_SPI_MASTER is not set | ||
| 630 | |||
| 631 | # | ||
| 632 | # Dallas's 1-wire bus | ||
| 633 | # | ||
| 634 | # CONFIG_W1 is not set | ||
| 635 | # CONFIG_HWMON is not set | ||
| 636 | |||
| 637 | # | ||
| 638 | # Misc devices | ||
| 639 | # | ||
| 640 | # CONFIG_BLINK is not set | ||
| 641 | |||
| 642 | # | ||
| 643 | # Multifunction device drivers | ||
| 644 | # | ||
| 645 | # CONFIG_MFD_SM501 is not set | ||
| 646 | |||
| 647 | # | ||
| 648 | # LED devices | ||
| 649 | # | ||
| 650 | # CONFIG_NEW_LEDS is not set | ||
| 651 | |||
| 652 | # | ||
| 653 | # LED drivers | ||
| 654 | # | ||
| 655 | |||
| 656 | # | ||
| 657 | # LED Triggers | ||
| 658 | # | ||
| 659 | |||
| 660 | # | ||
| 661 | # Multimedia devices | ||
| 662 | # | ||
| 663 | # CONFIG_VIDEO_DEV is not set | ||
| 664 | # CONFIG_DVB_CORE is not set | ||
| 665 | CONFIG_DAB=y | ||
| 666 | |||
| 667 | # | ||
| 668 | # Graphics support | ||
| 669 | # | ||
| 670 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 671 | |||
| 672 | # | ||
| 673 | # Display device support | ||
| 674 | # | ||
| 675 | # CONFIG_DISPLAY_SUPPORT is not set | ||
| 676 | # CONFIG_VGASTATE is not set | ||
| 677 | CONFIG_FB=y | ||
| 678 | # CONFIG_FIRMWARE_EDID is not set | ||
| 679 | # CONFIG_FB_DDC is not set | ||
| 680 | # CONFIG_FB_CFB_FILLRECT is not set | ||
| 681 | # CONFIG_FB_CFB_COPYAREA is not set | ||
| 682 | # CONFIG_FB_CFB_IMAGEBLIT is not set | ||
| 683 | # CONFIG_FB_SYS_FILLRECT is not set | ||
| 684 | # CONFIG_FB_SYS_COPYAREA is not set | ||
| 685 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
| 686 | # CONFIG_FB_SYS_FOPS is not set | ||
| 687 | CONFIG_FB_DEFERRED_IO=y | ||
| 688 | # CONFIG_FB_SVGALIB is not set | ||
| 689 | # CONFIG_FB_MACMODES is not set | ||
| 690 | # CONFIG_FB_BACKLIGHT is not set | ||
| 691 | # CONFIG_FB_MODE_HELPERS is not set | ||
| 692 | # CONFIG_FB_TILEBLITTING is not set | ||
| 693 | |||
| 694 | # | ||
| 695 | # Frame buffer hardware drivers | ||
| 696 | # | ||
| 697 | # CONFIG_FB_S1D13XXX is not set | ||
| 698 | CONFIG_FB_OMAP=y | ||
| 699 | # CONFIG_FB_OMAP_LCDC_EXTERNAL is not set | ||
| 700 | # CONFIG_FB_OMAP_LCD_MIPID is not set | ||
| 701 | CONFIG_FB_OMAP_BOOTLOADER_INIT=y | ||
| 702 | CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2 | ||
| 703 | # CONFIG_FB_OMAP_DMA_TUNE is not set | ||
| 704 | # CONFIG_FB_VIRTUAL is not set | ||
| 705 | |||
| 706 | # | ||
| 707 | # Console display driver support | ||
| 708 | # | ||
| 709 | # CONFIG_VGA_CONSOLE is not set | ||
| 710 | CONFIG_DUMMY_CONSOLE=y | ||
| 711 | CONFIG_FRAMEBUFFER_CONSOLE=y | ||
| 712 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | ||
| 713 | CONFIG_FONTS=y | ||
| 714 | # CONFIG_FONT_8x8 is not set | ||
| 715 | # CONFIG_FONT_8x16 is not set | ||
| 716 | # CONFIG_FONT_6x11 is not set | ||
| 717 | # CONFIG_FONT_7x14 is not set | ||
| 718 | # CONFIG_FONT_PEARL_8x8 is not set | ||
| 719 | # CONFIG_FONT_ACORN_8x8 is not set | ||
| 720 | CONFIG_FONT_MINI_4x6=y | ||
| 721 | # CONFIG_FONT_CLEAN_4x6 is not set | ||
| 722 | # CONFIG_FONT_CLEAN_5x8 is not set | ||
| 723 | # CONFIG_FONT_SUN8x16 is not set | ||
| 724 | # CONFIG_FONT_SUN12x22 is not set | ||
| 725 | # CONFIG_FONT_10x18 is not set | ||
| 726 | CONFIG_LOGO=y | ||
| 727 | # CONFIG_LOGO_LINUX_MONO is not set | ||
| 728 | # CONFIG_LOGO_LINUX_VGA16 is not set | ||
| 729 | CONFIG_LOGO_LINUX_CLUT224=y | ||
| 730 | |||
| 731 | # | ||
| 732 | # Sound | ||
| 733 | # | ||
| 734 | CONFIG_SOUND=y | ||
| 735 | |||
| 736 | # | ||
| 737 | # Advanced Linux Sound Architecture | ||
| 738 | # | ||
| 739 | CONFIG_SND=y | ||
| 740 | CONFIG_SND_TIMER=y | ||
| 741 | CONFIG_SND_PCM=y | ||
| 742 | # CONFIG_SND_SEQUENCER is not set | ||
| 743 | CONFIG_SND_OSSEMUL=y | ||
| 744 | CONFIG_SND_MIXER_OSS=y | ||
| 745 | CONFIG_SND_PCM_OSS=y | ||
| 746 | CONFIG_SND_PCM_OSS_PLUGINS=y | ||
| 747 | # CONFIG_SND_DYNAMIC_MINORS is not set | ||
| 748 | # CONFIG_SND_SUPPORT_OLD_API is not set | ||
| 749 | # CONFIG_SND_VERBOSE_PROCFS is not set | ||
| 750 | # CONFIG_SND_VERBOSE_PRINTK is not set | ||
| 751 | # CONFIG_SND_DEBUG is not set | ||
| 752 | |||
| 753 | # | ||
| 754 | # Generic devices | ||
| 755 | # | ||
| 756 | # CONFIG_SND_DUMMY is not set | ||
| 757 | # CONFIG_SND_MTPAV is not set | ||
| 758 | # CONFIG_SND_SERIAL_U16550 is not set | ||
| 759 | # CONFIG_SND_MPU401 is not set | ||
| 760 | |||
| 761 | # | ||
| 762 | # ALSA ARM devices | ||
| 763 | # | ||
| 764 | # CONFIG_SND_OMAP_AIC23 is not set | ||
| 765 | # CONFIG_SND_OMAP_TSC2101 is not set | ||
| 766 | CONFIG_SND_SX1=y | ||
| 767 | # CONFIG_SND_OMAP_TSC2102 is not set | ||
| 768 | # CONFIG_SND_OMAP24XX_EAC is not set | ||
| 769 | |||
| 770 | # | ||
| 771 | # System on Chip audio support | ||
| 772 | # | ||
| 773 | # CONFIG_SND_SOC is not set | ||
| 774 | |||
| 775 | # | ||
| 776 | # Open Sound System | ||
| 777 | # | ||
| 778 | # CONFIG_SOUND_PRIME is not set | ||
| 779 | |||
| 780 | # | ||
| 781 | # HID Devices | ||
| 782 | # | ||
| 783 | CONFIG_HID=y | ||
| 784 | # CONFIG_HID_DEBUG is not set | ||
| 785 | |||
| 786 | # | ||
| 787 | # USB support | ||
| 788 | # | ||
| 789 | CONFIG_USB_ARCH_HAS_HCD=y | ||
| 790 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
| 791 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
| 792 | # CONFIG_USB is not set | ||
| 793 | # CONFIG_USB_MUSB_HDRC is not set | ||
| 794 | # CONFIG_USB_GADGET_MUSB_HDRC is not set | ||
| 795 | |||
| 796 | # | ||
| 797 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
| 798 | # | ||
| 799 | |||
| 800 | # | ||
| 801 | # USB Gadget Support | ||
| 802 | # | ||
| 803 | CONFIG_USB_GADGET=y | ||
| 804 | # CONFIG_USB_GADGET_DEBUG_FILES is not set | ||
| 805 | CONFIG_USB_GADGET_SELECTED=y | ||
| 806 | # CONFIG_USB_GADGET_FSL_USB2 is not set | ||
| 807 | # CONFIG_USB_GADGET_NET2280 is not set | ||
| 808 | # CONFIG_USB_GADGET_PXA2XX is not set | ||
| 809 | # CONFIG_USB_GADGET_GOKU is not set | ||
| 810 | # CONFIG_USB_GADGET_LH7A40X is not set | ||
| 811 | CONFIG_USB_GADGET_OMAP=y | ||
| 812 | CONFIG_USB_OMAP=y | ||
| 813 | # CONFIG_USB_GADGET_AT91 is not set | ||
| 814 | # CONFIG_USB_GADGET_DUMMY_HCD is not set | ||
| 815 | # CONFIG_USB_GADGET_DUALSPEED is not set | ||
| 816 | # CONFIG_USB_ZERO is not set | ||
| 817 | CONFIG_USB_ETH=y | ||
| 818 | CONFIG_USB_ETH_RNDIS=y | ||
| 819 | # CONFIG_USB_GADGETFS is not set | ||
| 820 | # CONFIG_USB_FILE_STORAGE is not set | ||
| 821 | # CONFIG_USB_G_SERIAL is not set | ||
| 822 | # CONFIG_USB_MIDI_GADGET is not set | ||
| 823 | CONFIG_MMC=y | ||
| 824 | # CONFIG_MMC_DEBUG is not set | ||
| 825 | # CONFIG_MMC_UNSAFE_RESUME is not set | ||
| 826 | |||
| 827 | # | ||
| 828 | # MMC/SD Card Drivers | ||
| 829 | # | ||
| 830 | CONFIG_MMC_BLOCK=y | ||
| 831 | |||
| 832 | # | ||
| 833 | # MMC/SD Host Controller Drivers | ||
| 834 | # | ||
| 835 | CONFIG_MMC_OMAP=y | ||
| 836 | |||
| 837 | # | ||
| 838 | # Real Time Clock | ||
| 839 | # | ||
| 840 | CONFIG_RTC_LIB=y | ||
| 841 | CONFIG_RTC_CLASS=y | ||
| 842 | CONFIG_RTC_HCTOSYS=y | ||
| 843 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
| 844 | # CONFIG_RTC_DEBUG is not set | ||
| 845 | |||
| 846 | # | ||
| 847 | # RTC interfaces | ||
| 848 | # | ||
| 849 | CONFIG_RTC_INTF_SYSFS=y | ||
| 850 | CONFIG_RTC_INTF_PROC=y | ||
| 851 | CONFIG_RTC_INTF_DEV=y | ||
| 852 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
| 853 | # CONFIG_RTC_DRV_TEST is not set | ||
| 854 | |||
| 855 | # | ||
| 856 | # I2C RTC drivers | ||
| 857 | # | ||
| 858 | # CONFIG_RTC_DRV_DS1307 is not set | ||
| 859 | # CONFIG_RTC_DRV_DS1672 is not set | ||
| 860 | # CONFIG_RTC_DRV_MAX6900 is not set | ||
| 861 | # CONFIG_RTC_DRV_RS5C372 is not set | ||
| 862 | # CONFIG_RTC_DRV_ISL1208 is not set | ||
| 863 | # CONFIG_RTC_DRV_X1205 is not set | ||
| 864 | # CONFIG_RTC_DRV_PCF8563 is not set | ||
| 865 | # CONFIG_RTC_DRV_PCF8583 is not set | ||
| 866 | |||
| 867 | # | ||
| 868 | # SPI RTC drivers | ||
| 869 | # | ||
| 870 | |||
| 871 | # | ||
| 872 | # Platform RTC drivers | ||
| 873 | # | ||
| 874 | # CONFIG_RTC_DRV_CMOS is not set | ||
| 875 | # CONFIG_RTC_DRV_DS1553 is not set | ||
| 876 | # CONFIG_RTC_DRV_DS1742 is not set | ||
| 877 | # CONFIG_RTC_DRV_M48T86 is not set | ||
| 878 | # CONFIG_RTC_DRV_V3020 is not set | ||
| 879 | |||
| 880 | # | ||
| 881 | # on-CPU RTC drivers | ||
| 882 | # | ||
| 883 | CONFIG_RTC_DRV_OMAP=y | ||
| 884 | |||
| 885 | # | ||
| 886 | # CBUS support | ||
| 887 | # | ||
| 888 | # CONFIG_CBUS is not set | ||
| 889 | |||
| 890 | # | ||
| 891 | # File systems | ||
| 892 | # | ||
| 893 | CONFIG_EXT2_FS=y | ||
| 894 | # CONFIG_EXT2_FS_XATTR is not set | ||
| 895 | # CONFIG_EXT2_FS_XIP is not set | ||
| 896 | # CONFIG_EXT3_FS is not set | ||
| 897 | # CONFIG_EXT4DEV_FS is not set | ||
| 898 | # CONFIG_REISERFS_FS is not set | ||
| 899 | # CONFIG_JFS_FS is not set | ||
| 900 | # CONFIG_FS_POSIX_ACL is not set | ||
| 901 | # CONFIG_XFS_FS is not set | ||
| 902 | # CONFIG_GFS2_FS is not set | ||
| 903 | # CONFIG_OCFS2_FS is not set | ||
| 904 | # CONFIG_MINIX_FS is not set | ||
| 905 | # CONFIG_ROMFS_FS is not set | ||
| 906 | CONFIG_INOTIFY=y | ||
| 907 | CONFIG_INOTIFY_USER=y | ||
| 908 | # CONFIG_QUOTA is not set | ||
| 909 | # CONFIG_DNOTIFY is not set | ||
| 910 | # CONFIG_AUTOFS_FS is not set | ||
| 911 | # CONFIG_AUTOFS4_FS is not set | ||
| 912 | # CONFIG_FUSE_FS is not set | ||
| 913 | |||
| 914 | # | ||
| 915 | # CD-ROM/DVD Filesystems | ||
| 916 | # | ||
| 917 | # CONFIG_ISO9660_FS is not set | ||
| 918 | # CONFIG_UDF_FS is not set | ||
| 919 | |||
| 920 | # | ||
| 921 | # DOS/FAT/NT Filesystems | ||
| 922 | # | ||
| 923 | CONFIG_FAT_FS=y | ||
| 924 | CONFIG_MSDOS_FS=y | ||
| 925 | CONFIG_VFAT_FS=y | ||
| 926 | CONFIG_FAT_DEFAULT_CODEPAGE=866 | ||
| 927 | CONFIG_FAT_DEFAULT_IOCHARSET="koi8-r" | ||
| 928 | # CONFIG_NTFS_FS is not set | ||
| 929 | |||
| 930 | # | ||
| 931 | # Pseudo filesystems | ||
| 932 | # | ||
| 933 | CONFIG_PROC_FS=y | ||
| 934 | CONFIG_PROC_SYSCTL=y | ||
| 935 | CONFIG_SYSFS=y | ||
| 936 | CONFIG_TMPFS=y | ||
| 937 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
| 938 | # CONFIG_HUGETLB_PAGE is not set | ||
| 939 | CONFIG_RAMFS=y | ||
| 940 | # CONFIG_CONFIGFS_FS is not set | ||
| 941 | |||
| 942 | # | ||
| 943 | # Miscellaneous filesystems | ||
| 944 | # | ||
| 945 | # CONFIG_ADFS_FS is not set | ||
| 946 | # CONFIG_AFFS_FS is not set | ||
| 947 | # CONFIG_HFS_FS is not set | ||
| 948 | # CONFIG_HFSPLUS_FS is not set | ||
| 949 | # CONFIG_BEFS_FS is not set | ||
| 950 | # CONFIG_BFS_FS is not set | ||
| 951 | # CONFIG_EFS_FS is not set | ||
| 952 | CONFIG_CRAMFS=y | ||
| 953 | # CONFIG_VXFS_FS is not set | ||
| 954 | # CONFIG_HPFS_FS is not set | ||
| 955 | # CONFIG_QNX4FS_FS is not set | ||
| 956 | # CONFIG_SYSV_FS is not set | ||
| 957 | # CONFIG_UFS_FS is not set | ||
| 958 | |||
| 959 | # | ||
| 960 | # Network File Systems | ||
| 961 | # | ||
| 962 | CONFIG_NFS_FS=y | ||
| 963 | # CONFIG_NFS_V3 is not set | ||
| 964 | # CONFIG_NFS_V4 is not set | ||
| 965 | # CONFIG_NFS_DIRECTIO is not set | ||
| 966 | # CONFIG_NFSD is not set | ||
| 967 | CONFIG_ROOT_NFS=y | ||
| 968 | CONFIG_LOCKD=y | ||
| 969 | CONFIG_NFS_COMMON=y | ||
| 970 | CONFIG_SUNRPC=y | ||
| 971 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 972 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
| 973 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
| 974 | # CONFIG_SMB_FS is not set | ||
| 975 | # CONFIG_CIFS is not set | ||
| 976 | # CONFIG_NCP_FS is not set | ||
| 977 | # CONFIG_CODA_FS is not set | ||
| 978 | # CONFIG_AFS_FS is not set | ||
| 979 | # CONFIG_9P_FS is not set | ||
| 980 | |||
| 981 | # | ||
| 982 | # Partition Types | ||
| 983 | # | ||
| 984 | CONFIG_PARTITION_ADVANCED=y | ||
| 985 | # CONFIG_ACORN_PARTITION is not set | ||
| 986 | # CONFIG_OSF_PARTITION is not set | ||
| 987 | # CONFIG_AMIGA_PARTITION is not set | ||
| 988 | # CONFIG_ATARI_PARTITION is not set | ||
| 989 | # CONFIG_MAC_PARTITION is not set | ||
| 990 | CONFIG_MSDOS_PARTITION=y | ||
| 991 | # CONFIG_BSD_DISKLABEL is not set | ||
| 992 | # CONFIG_MINIX_SUBPARTITION is not set | ||
| 993 | # CONFIG_SOLARIS_X86_PARTITION is not set | ||
| 994 | # CONFIG_UNIXWARE_DISKLABEL is not set | ||
| 995 | # CONFIG_LDM_PARTITION is not set | ||
| 996 | # CONFIG_SGI_PARTITION is not set | ||
| 997 | # CONFIG_ULTRIX_PARTITION is not set | ||
| 998 | # CONFIG_SUN_PARTITION is not set | ||
| 999 | # CONFIG_KARMA_PARTITION is not set | ||
| 1000 | # CONFIG_EFI_PARTITION is not set | ||
| 1001 | # CONFIG_SYSV68_PARTITION is not set | ||
| 1002 | |||
| 1003 | # | ||
| 1004 | # Native Language Support | ||
| 1005 | # | ||
| 1006 | CONFIG_NLS=y | ||
| 1007 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
| 1008 | CONFIG_NLS_CODEPAGE_437=y | ||
| 1009 | # CONFIG_NLS_CODEPAGE_737 is not set | ||
| 1010 | # CONFIG_NLS_CODEPAGE_775 is not set | ||
| 1011 | # CONFIG_NLS_CODEPAGE_850 is not set | ||
| 1012 | # CONFIG_NLS_CODEPAGE_852 is not set | ||
| 1013 | # CONFIG_NLS_CODEPAGE_855 is not set | ||
| 1014 | # CONFIG_NLS_CODEPAGE_857 is not set | ||
| 1015 | # CONFIG_NLS_CODEPAGE_860 is not set | ||
| 1016 | # CONFIG_NLS_CODEPAGE_861 is not set | ||
| 1017 | # CONFIG_NLS_CODEPAGE_862 is not set | ||
| 1018 | # CONFIG_NLS_CODEPAGE_863 is not set | ||
| 1019 | # CONFIG_NLS_CODEPAGE_864 is not set | ||
| 1020 | # CONFIG_NLS_CODEPAGE_865 is not set | ||
| 1021 | CONFIG_NLS_CODEPAGE_866=y | ||
| 1022 | # CONFIG_NLS_CODEPAGE_869 is not set | ||
| 1023 | # CONFIG_NLS_CODEPAGE_936 is not set | ||
| 1024 | # CONFIG_NLS_CODEPAGE_950 is not set | ||
| 1025 | # CONFIG_NLS_CODEPAGE_932 is not set | ||
| 1026 | # CONFIG_NLS_CODEPAGE_949 is not set | ||
| 1027 | # CONFIG_NLS_CODEPAGE_874 is not set | ||
| 1028 | # CONFIG_NLS_ISO8859_8 is not set | ||
| 1029 | # CONFIG_NLS_CODEPAGE_1250 is not set | ||
| 1030 | CONFIG_NLS_CODEPAGE_1251=y | ||
| 1031 | # CONFIG_NLS_ASCII is not set | ||
| 1032 | CONFIG_NLS_ISO8859_1=y | ||
| 1033 | # CONFIG_NLS_ISO8859_2 is not set | ||
| 1034 | # CONFIG_NLS_ISO8859_3 is not set | ||
| 1035 | # CONFIG_NLS_ISO8859_4 is not set | ||
| 1036 | CONFIG_NLS_ISO8859_5=y | ||
| 1037 | # CONFIG_NLS_ISO8859_6 is not set | ||
| 1038 | # CONFIG_NLS_ISO8859_7 is not set | ||
| 1039 | # CONFIG_NLS_ISO8859_9 is not set | ||
| 1040 | # CONFIG_NLS_ISO8859_13 is not set | ||
| 1041 | # CONFIG_NLS_ISO8859_14 is not set | ||
| 1042 | # CONFIG_NLS_ISO8859_15 is not set | ||
| 1043 | CONFIG_NLS_KOI8_R=y | ||
| 1044 | # CONFIG_NLS_KOI8_U is not set | ||
| 1045 | CONFIG_NLS_UTF8=y | ||
| 1046 | |||
| 1047 | # | ||
| 1048 | # Distributed Lock Manager | ||
| 1049 | # | ||
| 1050 | # CONFIG_DLM is not set | ||
| 1051 | |||
| 1052 | # | ||
| 1053 | # Profiling support | ||
| 1054 | # | ||
| 1055 | CONFIG_PROFILING=y | ||
| 1056 | CONFIG_OPROFILE=y | ||
| 1057 | |||
| 1058 | # | ||
| 1059 | # Kernel hacking | ||
| 1060 | # | ||
| 1061 | # CONFIG_PRINTK_TIME is not set | ||
| 1062 | # CONFIG_ENABLE_MUST_CHECK is not set | ||
| 1063 | # CONFIG_MAGIC_SYSRQ is not set | ||
| 1064 | # CONFIG_UNUSED_SYMBOLS is not set | ||
| 1065 | # CONFIG_DEBUG_FS is not set | ||
| 1066 | # CONFIG_HEADERS_CHECK is not set | ||
| 1067 | CONFIG_DEBUG_KERNEL=y | ||
| 1068 | # CONFIG_DEBUG_SHIRQ is not set | ||
| 1069 | # CONFIG_DETECT_SOFTLOCKUP is not set | ||
| 1070 | # CONFIG_SCHEDSTATS is not set | ||
| 1071 | # CONFIG_TIMER_STATS is not set | ||
| 1072 | CONFIG_DEBUG_PREEMPT=y | ||
| 1073 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
| 1074 | # CONFIG_RT_MUTEX_TESTER is not set | ||
| 1075 | # CONFIG_DEBUG_SPINLOCK is not set | ||
| 1076 | # CONFIG_DEBUG_MUTEXES is not set | ||
| 1077 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
| 1078 | # CONFIG_PROVE_LOCKING is not set | ||
| 1079 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
| 1080 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
| 1081 | # CONFIG_DEBUG_KOBJECT is not set | ||
| 1082 | # CONFIG_DEBUG_BUGVERBOSE is not set | ||
| 1083 | # CONFIG_DEBUG_INFO is not set | ||
| 1084 | # CONFIG_DEBUG_VM is not set | ||
| 1085 | # CONFIG_DEBUG_LIST is not set | ||
| 1086 | CONFIG_FRAME_POINTER=y | ||
| 1087 | CONFIG_FORCED_INLINING=y | ||
| 1088 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 1089 | # CONFIG_FAULT_INJECTION is not set | ||
| 1090 | # CONFIG_DEBUG_USER is not set | ||
| 1091 | # CONFIG_DEBUG_ERRORS is not set | ||
| 1092 | # CONFIG_DEBUG_LL is not set | ||
| 1093 | |||
| 1094 | # | ||
| 1095 | # Security options | ||
| 1096 | # | ||
| 1097 | # CONFIG_KEYS is not set | ||
| 1098 | # CONFIG_SECURITY is not set | ||
| 1099 | |||
| 1100 | # | ||
| 1101 | # Cryptographic options | ||
| 1102 | # | ||
| 1103 | # CONFIG_CRYPTO is not set | ||
| 1104 | |||
| 1105 | # | ||
| 1106 | # Library routines | ||
| 1107 | # | ||
| 1108 | CONFIG_BITREVERSE=y | ||
| 1109 | CONFIG_CRC_CCITT=y | ||
| 1110 | CONFIG_CRC16=y | ||
| 1111 | # CONFIG_CRC_ITU_T is not set | ||
| 1112 | CONFIG_CRC32=y | ||
| 1113 | CONFIG_LIBCRC32C=y | ||
| 1114 | CONFIG_ZLIB_INFLATE=y | ||
| 1115 | CONFIG_PLIST=y | ||
| 1116 | CONFIG_HAS_IOMEM=y | ||
| 1117 | CONFIG_HAS_IOPORT=y | ||
| 1118 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/arm/include/asm/byteorder.h b/arch/arm/include/asm/byteorder.h index 4fbfb22f65a0..d04a7a2bc2e9 100644 --- a/arch/arm/include/asm/byteorder.h +++ b/arch/arm/include/asm/byteorder.h | |||
| @@ -18,7 +18,15 @@ | |||
| 18 | #include <linux/compiler.h> | 18 | #include <linux/compiler.h> |
| 19 | #include <asm/types.h> | 19 | #include <asm/types.h> |
| 20 | 20 | ||
| 21 | static inline __attribute_const__ __u32 ___arch__swab32(__u32 x) | 21 | #ifdef __ARMEB__ |
| 22 | # define __BIG_ENDIAN | ||
| 23 | #else | ||
| 24 | # define __LITTLE_ENDIAN | ||
| 25 | #endif | ||
| 26 | |||
| 27 | #define __SWAB_64_THRU_32__ | ||
| 28 | |||
| 29 | static inline __attribute_const__ __u32 __arch_swab32(__u32 x) | ||
| 22 | { | 30 | { |
| 23 | __u32 t; | 31 | __u32 t; |
| 24 | 32 | ||
| @@ -40,19 +48,8 @@ static inline __attribute_const__ __u32 ___arch__swab32(__u32 x) | |||
| 40 | 48 | ||
| 41 | return x; | 49 | return x; |
| 42 | } | 50 | } |
| 51 | #define __arch_swab32 __arch_swab32 | ||
| 43 | 52 | ||
| 44 | #define __arch__swab32(x) ___arch__swab32(x) | 53 | #include <linux/byteorder.h> |
| 45 | |||
| 46 | #if !defined(__STRICT_ANSI__) || defined(__KERNEL__) | ||
| 47 | # define __BYTEORDER_HAS_U64__ | ||
| 48 | # define __SWAB_64_THRU_32__ | ||
| 49 | #endif | ||
| 50 | |||
| 51 | #ifdef __ARMEB__ | ||
| 52 | #include <linux/byteorder/big_endian.h> | ||
| 53 | #else | ||
| 54 | #include <linux/byteorder/little_endian.h> | ||
| 55 | #endif | ||
| 56 | 54 | ||
| 57 | #endif | 55 | #endif |
| 58 | |||
diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h index 45329fca1b64..7b95d2058395 100644 --- a/arch/arm/include/asm/dma-mapping.h +++ b/arch/arm/include/asm/dma-mapping.h | |||
| @@ -3,11 +3,48 @@ | |||
| 3 | 3 | ||
| 4 | #ifdef __KERNEL__ | 4 | #ifdef __KERNEL__ |
| 5 | 5 | ||
| 6 | #include <linux/mm.h> /* need struct page */ | 6 | #include <linux/mm_types.h> |
| 7 | |||
| 8 | #include <linux/scatterlist.h> | 7 | #include <linux/scatterlist.h> |
| 9 | 8 | ||
| 10 | #include <asm-generic/dma-coherent.h> | 9 | #include <asm-generic/dma-coherent.h> |
| 10 | #include <asm/memory.h> | ||
| 11 | |||
| 12 | /* | ||
| 13 | * page_to_dma/dma_to_virt/virt_to_dma are architecture private functions | ||
| 14 | * used internally by the DMA-mapping API to provide DMA addresses. They | ||
| 15 | * must not be used by drivers. | ||
| 16 | */ | ||
| 17 | #ifndef __arch_page_to_dma | ||
| 18 | static inline dma_addr_t page_to_dma(struct device *dev, struct page *page) | ||
| 19 | { | ||
| 20 | return (dma_addr_t)__virt_to_bus((unsigned long)page_address(page)); | ||
| 21 | } | ||
| 22 | |||
| 23 | static inline void *dma_to_virt(struct device *dev, dma_addr_t addr) | ||
| 24 | { | ||
| 25 | return (void *)__bus_to_virt(addr); | ||
| 26 | } | ||
| 27 | |||
| 28 | static inline dma_addr_t virt_to_dma(struct device *dev, void *addr) | ||
| 29 | { | ||
| 30 | return (dma_addr_t)__virt_to_bus((unsigned long)(addr)); | ||
| 31 | } | ||
| 32 | #else | ||
| 33 | static inline dma_addr_t page_to_dma(struct device *dev, struct page *page) | ||
| 34 | { | ||
| 35 | return __arch_page_to_dma(dev, page); | ||
| 36 | } | ||
| 37 | |||
| 38 | static inline void *dma_to_virt(struct device *dev, dma_addr_t addr) | ||
| 39 | { | ||
| 40 | return __arch_dma_to_virt(dev, addr); | ||
| 41 | } | ||
| 42 | |||
| 43 | static inline dma_addr_t virt_to_dma(struct device *dev, void *addr) | ||
| 44 | { | ||
| 45 | return __arch_virt_to_dma(dev, addr); | ||
| 46 | } | ||
| 47 | #endif | ||
| 11 | 48 | ||
| 12 | /* | 49 | /* |
| 13 | * DMA-consistent mapping functions. These allocate/free a region of | 50 | * DMA-consistent mapping functions. These allocate/free a region of |
| @@ -169,7 +206,7 @@ dma_map_single(struct device *dev, void *cpu_addr, size_t size, | |||
| 169 | if (!arch_is_coherent()) | 206 | if (!arch_is_coherent()) |
| 170 | dma_cache_maint(cpu_addr, size, dir); | 207 | dma_cache_maint(cpu_addr, size, dir); |
| 171 | 208 | ||
| 172 | return virt_to_dma(dev, (unsigned long)cpu_addr); | 209 | return virt_to_dma(dev, cpu_addr); |
| 173 | } | 210 | } |
| 174 | #else | 211 | #else |
| 175 | extern dma_addr_t dma_map_single(struct device *,void *, size_t, enum dma_data_direction); | 212 | extern dma_addr_t dma_map_single(struct device *,void *, size_t, enum dma_data_direction); |
| @@ -195,7 +232,7 @@ dma_map_page(struct device *dev, struct page *page, | |||
| 195 | unsigned long offset, size_t size, | 232 | unsigned long offset, size_t size, |
| 196 | enum dma_data_direction dir) | 233 | enum dma_data_direction dir) |
| 197 | { | 234 | { |
| 198 | return dma_map_single(dev, page_address(page) + offset, size, (int)dir); | 235 | return dma_map_single(dev, page_address(page) + offset, size, dir); |
| 199 | } | 236 | } |
| 200 | 237 | ||
| 201 | /** | 238 | /** |
| @@ -241,7 +278,7 @@ static inline void | |||
| 241 | dma_unmap_page(struct device *dev, dma_addr_t handle, size_t size, | 278 | dma_unmap_page(struct device *dev, dma_addr_t handle, size_t size, |
| 242 | enum dma_data_direction dir) | 279 | enum dma_data_direction dir) |
| 243 | { | 280 | { |
| 244 | dma_unmap_single(dev, handle, size, (int)dir); | 281 | dma_unmap_single(dev, handle, size, dir); |
| 245 | } | 282 | } |
| 246 | 283 | ||
| 247 | /** | 284 | /** |
| @@ -314,11 +351,12 @@ extern void dma_unmap_sg(struct device *, struct scatterlist *, int, enum dma_da | |||
| 314 | 351 | ||
| 315 | 352 | ||
| 316 | /** | 353 | /** |
| 317 | * dma_sync_single_for_cpu | 354 | * dma_sync_single_range_for_cpu |
| 318 | * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices | 355 | * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices |
| 319 | * @handle: DMA address of buffer | 356 | * @handle: DMA address of buffer |
| 320 | * @size: size of buffer to map | 357 | * @offset: offset of region to start sync |
| 321 | * @dir: DMA transfer direction | 358 | * @size: size of region to sync |
| 359 | * @dir: DMA transfer direction (same as passed to dma_map_single) | ||
| 322 | * | 360 | * |
| 323 | * Make physical memory consistent for a single streaming mode DMA | 361 | * Make physical memory consistent for a single streaming mode DMA |
| 324 | * translation after a transfer. | 362 | * translation after a transfer. |
| @@ -332,25 +370,41 @@ extern void dma_unmap_sg(struct device *, struct scatterlist *, int, enum dma_da | |||
| 332 | */ | 370 | */ |
| 333 | #ifndef CONFIG_DMABOUNCE | 371 | #ifndef CONFIG_DMABOUNCE |
| 334 | static inline void | 372 | static inline void |
| 335 | dma_sync_single_for_cpu(struct device *dev, dma_addr_t handle, size_t size, | 373 | dma_sync_single_range_for_cpu(struct device *dev, dma_addr_t handle, |
| 336 | enum dma_data_direction dir) | 374 | unsigned long offset, size_t size, |
| 375 | enum dma_data_direction dir) | ||
| 337 | { | 376 | { |
| 338 | if (!arch_is_coherent()) | 377 | if (!arch_is_coherent()) |
| 339 | dma_cache_maint((void *)dma_to_virt(dev, handle), size, dir); | 378 | dma_cache_maint(dma_to_virt(dev, handle) + offset, size, dir); |
| 340 | } | 379 | } |
| 341 | 380 | ||
| 342 | static inline void | 381 | static inline void |
| 343 | dma_sync_single_for_device(struct device *dev, dma_addr_t handle, size_t size, | 382 | dma_sync_single_range_for_device(struct device *dev, dma_addr_t handle, |
| 344 | enum dma_data_direction dir) | 383 | unsigned long offset, size_t size, |
| 384 | enum dma_data_direction dir) | ||
| 345 | { | 385 | { |
| 346 | if (!arch_is_coherent()) | 386 | if (!arch_is_coherent()) |
| 347 | dma_cache_maint((void *)dma_to_virt(dev, handle), size, dir); | 387 | dma_cache_maint(dma_to_virt(dev, handle) + offset, size, dir); |
| 348 | } | 388 | } |
| 349 | #else | 389 | #else |
| 350 | extern void dma_sync_single_for_cpu(struct device*, dma_addr_t, size_t, enum dma_data_direction); | 390 | extern void dma_sync_single_range_for_cpu(struct device *, dma_addr_t, unsigned long, size_t, enum dma_data_direction); |
| 351 | extern void dma_sync_single_for_device(struct device*, dma_addr_t, size_t, enum dma_data_direction); | 391 | extern void dma_sync_single_range_for_device(struct device *, dma_addr_t, unsigned long, size_t, enum dma_data_direction); |
| 352 | #endif | 392 | #endif |
| 353 | 393 | ||
| 394 | static inline void | ||
| 395 | dma_sync_single_for_cpu(struct device *dev, dma_addr_t handle, size_t size, | ||
| 396 | enum dma_data_direction dir) | ||
| 397 | { | ||
| 398 | dma_sync_single_range_for_cpu(dev, handle, 0, size, dir); | ||
| 399 | } | ||
| 400 | |||
| 401 | static inline void | ||
| 402 | dma_sync_single_for_device(struct device *dev, dma_addr_t handle, size_t size, | ||
| 403 | enum dma_data_direction dir) | ||
| 404 | { | ||
| 405 | dma_sync_single_range_for_device(dev, handle, 0, size, dir); | ||
| 406 | } | ||
| 407 | |||
| 354 | 408 | ||
| 355 | /** | 409 | /** |
| 356 | * dma_sync_sg_for_cpu | 410 | * dma_sync_sg_for_cpu |
diff --git a/arch/arm/include/asm/kexec.h b/arch/arm/include/asm/kexec.h index c8986bb99ed5..df15a0dc228e 100644 --- a/arch/arm/include/asm/kexec.h +++ b/arch/arm/include/asm/kexec.h | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | /* Maximum address we can use for the control code buffer */ | 10 | /* Maximum address we can use for the control code buffer */ |
| 11 | #define KEXEC_CONTROL_MEMORY_LIMIT (-1UL) | 11 | #define KEXEC_CONTROL_MEMORY_LIMIT (-1UL) |
| 12 | 12 | ||
| 13 | #define KEXEC_CONTROL_CODE_SIZE 4096 | 13 | #define KEXEC_CONTROL_PAGE_SIZE 4096 |
| 14 | 14 | ||
| 15 | #define KEXEC_ARCH KEXEC_ARCH_ARM | 15 | #define KEXEC_ARCH KEXEC_ARCH_ARM |
| 16 | 16 | ||
diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h index 1e070a2b561a..bf7c737c9226 100644 --- a/arch/arm/include/asm/memory.h +++ b/arch/arm/include/asm/memory.h | |||
| @@ -150,6 +150,14 @@ | |||
| 150 | #endif | 150 | #endif |
| 151 | 151 | ||
| 152 | /* | 152 | /* |
| 153 | * Amount of memory reserved for the vmalloc() area, and minimum | ||
| 154 | * address for vmalloc mappings. | ||
| 155 | */ | ||
| 156 | extern unsigned long vmalloc_reserve; | ||
| 157 | |||
| 158 | #define VMALLOC_MIN (void *)(VMALLOC_END - vmalloc_reserve) | ||
| 159 | |||
| 160 | /* | ||
| 153 | * PFNs are used to describe any physical page; this means | 161 | * PFNs are used to describe any physical page; this means |
| 154 | * PFN 0 == physical address 0. | 162 | * PFN 0 == physical address 0. |
| 155 | * | 163 | * |
| @@ -306,20 +314,6 @@ static inline __deprecated void *bus_to_virt(unsigned long x) | |||
| 306 | #define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT) | 314 | #define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT) |
| 307 | 315 | ||
| 308 | /* | 316 | /* |
| 309 | * Optional device DMA address remapping. Do _not_ use directly! | ||
| 310 | * We should really eliminate virt_to_bus() here - it's deprecated. | ||
| 311 | */ | ||
| 312 | #ifndef __arch_page_to_dma | ||
| 313 | #define page_to_dma(dev, page) ((dma_addr_t)__virt_to_bus((unsigned long)page_address(page))) | ||
| 314 | #define dma_to_virt(dev, addr) ((void *)__bus_to_virt(addr)) | ||
| 315 | #define virt_to_dma(dev, addr) ((dma_addr_t)__virt_to_bus((unsigned long)(addr))) | ||
| 316 | #else | ||
| 317 | #define page_to_dma(dev, page) (__arch_page_to_dma(dev, page)) | ||
| 318 | #define dma_to_virt(dev, addr) (__arch_dma_to_virt(dev, addr)) | ||
| 319 | #define virt_to_dma(dev, addr) (__arch_virt_to_dma(dev, addr)) | ||
| 320 | #endif | ||
| 321 | |||
| 322 | /* | ||
| 323 | * Optional coherency support. Currently used only by selected | 317 | * Optional coherency support. Currently used only by selected |
| 324 | * Intel XSC3-based systems. | 318 | * Intel XSC3-based systems. |
| 325 | */ | 319 | */ |
diff --git a/arch/arm/include/asm/mtd-xip.h b/arch/arm/include/asm/mtd-xip.h index 4225372a26f3..d8fbe2d9b8b9 100644 --- a/arch/arm/include/asm/mtd-xip.h +++ b/arch/arm/include/asm/mtd-xip.h | |||
| @@ -10,8 +10,6 @@ | |||
| 10 | * This program is free software; you can redistribute it and/or modify | 10 | * This program is free software; you can redistribute it and/or modify |
| 11 | * it under the terms of the GNU General Public License version 2 as | 11 | * it under the terms of the GNU General Public License version 2 as |
| 12 | * published by the Free Software Foundation. | 12 | * published by the Free Software Foundation. |
| 13 | * | ||
| 14 | * $Id: xip.h,v 1.2 2004/12/01 15:49:10 nico Exp $ | ||
| 15 | */ | 13 | */ |
| 16 | 14 | ||
| 17 | #ifndef __ARM_MTD_XIP_H__ | 15 | #ifndef __ARM_MTD_XIP_H__ |
diff --git a/arch/arm/include/asm/processor.h b/arch/arm/include/asm/processor.h index b01d5e7e3d5a..517a4d6ffc74 100644 --- a/arch/arm/include/asm/processor.h +++ b/arch/arm/include/asm/processor.h | |||
| @@ -112,9 +112,9 @@ extern int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags); | |||
| 112 | static inline void prefetch(const void *ptr) | 112 | static inline void prefetch(const void *ptr) |
| 113 | { | 113 | { |
| 114 | __asm__ __volatile__( | 114 | __asm__ __volatile__( |
| 115 | "pld\t%0" | 115 | "pld\t%a0" |
| 116 | : | 116 | : |
| 117 | : "o" (*(char *)ptr) | 117 | : "p" (ptr) |
| 118 | : "cc"); | 118 | : "cc"); |
| 119 | } | 119 | } |
| 120 | 120 | ||
diff --git a/arch/arm/include/asm/tlbflush.h b/arch/arm/include/asm/tlbflush.h index 0d0d40f1b599..b543a054a17e 100644 --- a/arch/arm/include/asm/tlbflush.h +++ b/arch/arm/include/asm/tlbflush.h | |||
| @@ -54,6 +54,7 @@ | |||
| 54 | * v4wbi - ARMv4 with write buffer with I TLB flush entry instruction | 54 | * v4wbi - ARMv4 with write buffer with I TLB flush entry instruction |
| 55 | * fr - Feroceon (v4wbi with non-outer-cacheable page table walks) | 55 | * fr - Feroceon (v4wbi with non-outer-cacheable page table walks) |
| 56 | * v6wbi - ARMv6 with write buffer with I TLB flush entry instruction | 56 | * v6wbi - ARMv6 with write buffer with I TLB flush entry instruction |
| 57 | * v7wbi - identical to v6wbi | ||
| 57 | */ | 58 | */ |
| 58 | #undef _TLB | 59 | #undef _TLB |
| 59 | #undef MULTI_TLB | 60 | #undef MULTI_TLB |
| @@ -266,14 +267,16 @@ extern struct cpu_tlb_fns cpu_tlb; | |||
| 266 | v4wbi_possible_flags | \ | 267 | v4wbi_possible_flags | \ |
| 267 | fr_possible_flags | \ | 268 | fr_possible_flags | \ |
| 268 | v4wb_possible_flags | \ | 269 | v4wb_possible_flags | \ |
| 269 | v6wbi_possible_flags) | 270 | v6wbi_possible_flags | \ |
| 271 | v7wbi_possible_flags) | ||
| 270 | 272 | ||
| 271 | #define always_tlb_flags (v3_always_flags & \ | 273 | #define always_tlb_flags (v3_always_flags & \ |
| 272 | v4_always_flags & \ | 274 | v4_always_flags & \ |
| 273 | v4wbi_always_flags & \ | 275 | v4wbi_always_flags & \ |
| 274 | fr_always_flags & \ | 276 | fr_always_flags & \ |
| 275 | v4wb_always_flags & \ | 277 | v4wb_always_flags & \ |
| 276 | v6wbi_always_flags) | 278 | v6wbi_always_flags & \ |
| 279 | v7wbi_always_flags) | ||
| 277 | 280 | ||
| 278 | #define tlb_flag(f) ((always_tlb_flags & (f)) || (__tlb_flag & possible_tlb_flags & (f))) | 281 | #define tlb_flag(f) ((always_tlb_flags & (f)) || (__tlb_flag & possible_tlb_flags & (f))) |
| 279 | 282 | ||
diff --git a/arch/arm/include/asm/unistd.h b/arch/arm/include/asm/unistd.h index f95fbb2fcb5f..010618487cf1 100644 --- a/arch/arm/include/asm/unistd.h +++ b/arch/arm/include/asm/unistd.h | |||
| @@ -381,6 +381,12 @@ | |||
| 381 | #define __NR_fallocate (__NR_SYSCALL_BASE+352) | 381 | #define __NR_fallocate (__NR_SYSCALL_BASE+352) |
| 382 | #define __NR_timerfd_settime (__NR_SYSCALL_BASE+353) | 382 | #define __NR_timerfd_settime (__NR_SYSCALL_BASE+353) |
| 383 | #define __NR_timerfd_gettime (__NR_SYSCALL_BASE+354) | 383 | #define __NR_timerfd_gettime (__NR_SYSCALL_BASE+354) |
| 384 | #define __NR_signalfd4 (__NR_SYSCALL_BASE+355) | ||
| 385 | #define __NR_eventfd2 (__NR_SYSCALL_BASE+356) | ||
| 386 | #define __NR_epoll_create1 (__NR_SYSCALL_BASE+357) | ||
| 387 | #define __NR_dup3 (__NR_SYSCALL_BASE+358) | ||
| 388 | #define __NR_pipe2 (__NR_SYSCALL_BASE+359) | ||
| 389 | #define __NR_inotify_init1 (__NR_SYSCALL_BASE+360) | ||
| 384 | 390 | ||
| 385 | /* | 391 | /* |
| 386 | * The following SWIs are ARM private. | 392 | * The following SWIs are ARM private. |
diff --git a/arch/arm/kernel/.gitignore b/arch/arm/kernel/.gitignore new file mode 100644 index 000000000000..c5f676c3c224 --- /dev/null +++ b/arch/arm/kernel/.gitignore | |||
| @@ -0,0 +1 @@ | |||
| vmlinux.lds | |||
diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S index 30a67a5a40a8..09a061cb7838 100644 --- a/arch/arm/kernel/calls.S +++ b/arch/arm/kernel/calls.S | |||
| @@ -262,10 +262,10 @@ | |||
| 262 | /* 250 */ CALL(sys_epoll_create) | 262 | /* 250 */ CALL(sys_epoll_create) |
| 263 | CALL(ABI(sys_epoll_ctl, sys_oabi_epoll_ctl)) | 263 | CALL(ABI(sys_epoll_ctl, sys_oabi_epoll_ctl)) |
| 264 | CALL(ABI(sys_epoll_wait, sys_oabi_epoll_wait)) | 264 | CALL(ABI(sys_epoll_wait, sys_oabi_epoll_wait)) |
| 265 | CALL(sys_remap_file_pages) | 265 | CALL(sys_remap_file_pages) |
| 266 | CALL(sys_ni_syscall) /* sys_set_thread_area */ | 266 | CALL(sys_ni_syscall) /* sys_set_thread_area */ |
| 267 | /* 255 */ CALL(sys_ni_syscall) /* sys_get_thread_area */ | 267 | /* 255 */ CALL(sys_ni_syscall) /* sys_get_thread_area */ |
| 268 | CALL(sys_set_tid_address) | 268 | CALL(sys_set_tid_address) |
| 269 | CALL(sys_timer_create) | 269 | CALL(sys_timer_create) |
| 270 | CALL(sys_timer_settime) | 270 | CALL(sys_timer_settime) |
| 271 | CALL(sys_timer_gettime) | 271 | CALL(sys_timer_gettime) |
| @@ -364,6 +364,12 @@ | |||
| 364 | CALL(sys_fallocate) | 364 | CALL(sys_fallocate) |
| 365 | CALL(sys_timerfd_settime) | 365 | CALL(sys_timerfd_settime) |
| 366 | CALL(sys_timerfd_gettime) | 366 | CALL(sys_timerfd_gettime) |
| 367 | /* 355 */ CALL(sys_signalfd4) | ||
| 368 | CALL(sys_eventfd2) | ||
| 369 | CALL(sys_epoll_create1) | ||
| 370 | CALL(sys_dup3) | ||
| 371 | CALL(sys_pipe2) | ||
| 372 | /* 360 */ CALL(sys_inotify_init1) | ||
| 367 | #ifndef syscalls_counted | 373 | #ifndef syscalls_counted |
| 368 | .equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls | 374 | .equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls |
| 369 | #define syscalls_counted | 375 | #define syscalls_counted |
diff --git a/arch/arm/kernel/machine_kexec.c b/arch/arm/kernel/machine_kexec.c index db8f54a3451f..fae5beb3c3d6 100644 --- a/arch/arm/kernel/machine_kexec.c +++ b/arch/arm/kernel/machine_kexec.c | |||
| @@ -71,7 +71,7 @@ void machine_kexec(struct kimage *image) | |||
| 71 | 71 | ||
| 72 | 72 | ||
| 73 | flush_icache_range((unsigned long) reboot_code_buffer, | 73 | flush_icache_range((unsigned long) reboot_code_buffer, |
| 74 | (unsigned long) reboot_code_buffer + KEXEC_CONTROL_CODE_SIZE); | 74 | (unsigned long) reboot_code_buffer + KEXEC_CONTROL_PAGE_SIZE); |
| 75 | printk(KERN_INFO "Bye!\n"); | 75 | printk(KERN_INFO "Bye!\n"); |
| 76 | 76 | ||
| 77 | cpu_proc_fin(); | 77 | cpu_proc_fin(); |
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 38f0e7940a13..2ca7038b67a7 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c | |||
| @@ -81,6 +81,8 @@ EXPORT_SYMBOL(system_serial_high); | |||
| 81 | unsigned int elf_hwcap; | 81 | unsigned int elf_hwcap; |
| 82 | EXPORT_SYMBOL(elf_hwcap); | 82 | EXPORT_SYMBOL(elf_hwcap); |
| 83 | 83 | ||
| 84 | unsigned long __initdata vmalloc_reserve = 128 << 20; | ||
| 85 | |||
| 84 | 86 | ||
| 85 | #ifdef MULTI_CPU | 87 | #ifdef MULTI_CPU |
| 86 | struct processor processor; | 88 | struct processor processor; |
| @@ -501,6 +503,17 @@ static void __init early_mem(char **p) | |||
| 501 | __early_param("mem=", early_mem); | 503 | __early_param("mem=", early_mem); |
| 502 | 504 | ||
| 503 | /* | 505 | /* |
| 506 | * vmalloc=size forces the vmalloc area to be exactly 'size' | ||
| 507 | * bytes. This can be used to increase (or decrease) the vmalloc | ||
| 508 | * area - the default is 128m. | ||
| 509 | */ | ||
| 510 | static void __init early_vmalloc(char **arg) | ||
| 511 | { | ||
| 512 | vmalloc_reserve = memparse(*arg, arg); | ||
| 513 | } | ||
| 514 | __early_param("vmalloc=", early_vmalloc); | ||
| 515 | |||
| 516 | /* | ||
| 504 | * Initial parsing of the command line. | 517 | * Initial parsing of the command line. |
| 505 | */ | 518 | */ |
| 506 | static void __init parse_cmdline(char **cmdline_p, char *from) | 519 | static void __init parse_cmdline(char **cmdline_p, char *from) |
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c index 7277aef83098..872f1f8fbb57 100644 --- a/arch/arm/kernel/traps.c +++ b/arch/arm/kernel/traps.c | |||
| @@ -288,14 +288,28 @@ void unregister_undef_hook(struct undef_hook *hook) | |||
| 288 | spin_unlock_irqrestore(&undef_lock, flags); | 288 | spin_unlock_irqrestore(&undef_lock, flags); |
| 289 | } | 289 | } |
| 290 | 290 | ||
| 291 | static int call_undef_hook(struct pt_regs *regs, unsigned int instr) | ||
| 292 | { | ||
| 293 | struct undef_hook *hook; | ||
| 294 | unsigned long flags; | ||
| 295 | int (*fn)(struct pt_regs *regs, unsigned int instr) = NULL; | ||
| 296 | |||
| 297 | spin_lock_irqsave(&undef_lock, flags); | ||
| 298 | list_for_each_entry(hook, &undef_hook, node) | ||
| 299 | if ((instr & hook->instr_mask) == hook->instr_val && | ||
| 300 | (regs->ARM_cpsr & hook->cpsr_mask) == hook->cpsr_val) | ||
| 301 | fn = hook->fn; | ||
| 302 | spin_unlock_irqrestore(&undef_lock, flags); | ||
| 303 | |||
| 304 | return fn ? fn(regs, instr) : 1; | ||
| 305 | } | ||
| 306 | |||
| 291 | asmlinkage void __exception do_undefinstr(struct pt_regs *regs) | 307 | asmlinkage void __exception do_undefinstr(struct pt_regs *regs) |
| 292 | { | 308 | { |
| 293 | unsigned int correction = thumb_mode(regs) ? 2 : 4; | 309 | unsigned int correction = thumb_mode(regs) ? 2 : 4; |
| 294 | unsigned int instr; | 310 | unsigned int instr; |
| 295 | struct undef_hook *hook; | ||
| 296 | siginfo_t info; | 311 | siginfo_t info; |
| 297 | void __user *pc; | 312 | void __user *pc; |
| 298 | unsigned long flags; | ||
| 299 | 313 | ||
| 300 | /* | 314 | /* |
| 301 | * According to the ARM ARM, PC is 2 or 4 bytes ahead, | 315 | * According to the ARM ARM, PC is 2 or 4 bytes ahead, |
| @@ -325,17 +339,8 @@ asmlinkage void __exception do_undefinstr(struct pt_regs *regs) | |||
| 325 | } | 339 | } |
| 326 | #endif | 340 | #endif |
| 327 | 341 | ||
| 328 | spin_lock_irqsave(&undef_lock, flags); | 342 | if (call_undef_hook(regs, instr) == 0) |
| 329 | list_for_each_entry(hook, &undef_hook, node) { | 343 | return; |
| 330 | if ((instr & hook->instr_mask) == hook->instr_val && | ||
| 331 | (regs->ARM_cpsr & hook->cpsr_mask) == hook->cpsr_val) { | ||
| 332 | if (hook->fn(regs, instr) == 0) { | ||
| 333 | spin_unlock_irqrestore(&undef_lock, flags); | ||
| 334 | return; | ||
| 335 | } | ||
| 336 | } | ||
| 337 | } | ||
| 338 | spin_unlock_irqrestore(&undef_lock, flags); | ||
| 339 | 344 | ||
| 340 | #ifdef CONFIG_DEBUG_USER | 345 | #ifdef CONFIG_DEBUG_USER |
| 341 | if (user_debug & UDBG_UNDEFINED) { | 346 | if (user_debug & UDBG_UNDEFINED) { |
diff --git a/arch/arm/lib/sha1.S b/arch/arm/lib/sha1.S index ff6ece487ffc..67c2bf4774b7 100644 --- a/arch/arm/lib/sha1.S +++ b/arch/arm/lib/sha1.S | |||
| @@ -29,7 +29,7 @@ ENTRY(sha_transform) | |||
| 29 | stmfd sp!, {r4 - r8, lr} | 29 | stmfd sp!, {r4 - r8, lr} |
| 30 | 30 | ||
| 31 | @ for (i = 0; i < 16; i++) | 31 | @ for (i = 0; i < 16; i++) |
| 32 | @ W[i] = be32_to_cpu(in[i]); */ | 32 | @ W[i] = be32_to_cpu(in[i]); |
| 33 | 33 | ||
| 34 | #ifdef __ARMEB__ | 34 | #ifdef __ARMEB__ |
| 35 | mov r4, r0 | 35 | mov r4, r0 |
diff --git a/arch/arm/mach-footbridge/cats-pci.c b/arch/arm/mach-footbridge/cats-pci.c index 35eb232a649a..ae3e1c8c7583 100644 --- a/arch/arm/mach-footbridge/cats-pci.c +++ b/arch/arm/mach-footbridge/cats-pci.c | |||
| @@ -18,6 +18,9 @@ static int irqmap_cats[] __initdata = { IRQ_PCI, IRQ_IN0, IRQ_IN1, IRQ_IN3 }; | |||
| 18 | 18 | ||
| 19 | static int __init cats_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 19 | static int __init cats_map_irq(struct pci_dev *dev, u8 slot, u8 pin) |
| 20 | { | 20 | { |
| 21 | if (dev->irq >= 255) | ||
| 22 | return -1; /* not a valid interrupt. */ | ||
| 23 | |||
| 21 | if (dev->irq >= 128) | 24 | if (dev->irq >= 128) |
| 22 | return dev->irq & 0x1f; | 25 | return dev->irq & 0x1f; |
| 23 | 26 | ||
diff --git a/arch/arm/mach-footbridge/time.c b/arch/arm/mach-footbridge/time.c index fd9a7c11d62d..004819ea85c8 100644 --- a/arch/arm/mach-footbridge/time.c +++ b/arch/arm/mach-footbridge/time.c | |||
| @@ -49,12 +49,12 @@ static unsigned long __init get_isa_cmos_time(void) | |||
| 49 | } while (sec != CMOS_READ(RTC_SECONDS)); | 49 | } while (sec != CMOS_READ(RTC_SECONDS)); |
| 50 | 50 | ||
| 51 | if (!(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY) || RTC_ALWAYS_BCD) { | 51 | if (!(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY) || RTC_ALWAYS_BCD) { |
| 52 | BCD_TO_BIN(sec); | 52 | sec = bcd2bin(sec); |
| 53 | BCD_TO_BIN(min); | 53 | min = bcd2bin(min); |
| 54 | BCD_TO_BIN(hour); | 54 | hour = bcd2bin(hour); |
| 55 | BCD_TO_BIN(day); | 55 | day = bcd2bin(day); |
| 56 | BCD_TO_BIN(mon); | 56 | mon = bcd2bin(mon); |
| 57 | BCD_TO_BIN(year); | 57 | year = bcd2bin(year); |
| 58 | } | 58 | } |
| 59 | if ((year += 1900) < 1970) | 59 | if ((year += 1900) < 1970) |
| 60 | year += 100; | 60 | year += 100; |
| @@ -76,7 +76,7 @@ static int set_isa_cmos_time(void) | |||
| 76 | 76 | ||
| 77 | cmos_minutes = CMOS_READ(RTC_MINUTES); | 77 | cmos_minutes = CMOS_READ(RTC_MINUTES); |
| 78 | if (!(save_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) | 78 | if (!(save_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) |
| 79 | BCD_TO_BIN(cmos_minutes); | 79 | cmos_minutes = bcd2bin(cmos_minutes); |
| 80 | 80 | ||
| 81 | /* | 81 | /* |
| 82 | * since we're only adjusting minutes and seconds, | 82 | * since we're only adjusting minutes and seconds, |
| @@ -92,8 +92,8 @@ static int set_isa_cmos_time(void) | |||
| 92 | 92 | ||
| 93 | if (abs(real_minutes - cmos_minutes) < 30) { | 93 | if (abs(real_minutes - cmos_minutes) < 30) { |
| 94 | if (!(save_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) { | 94 | if (!(save_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) { |
| 95 | BIN_TO_BCD(real_seconds); | 95 | real_seconds = bin2bcd(real_seconds); |
| 96 | BIN_TO_BCD(real_minutes); | 96 | real_minutes = bin2bcd(real_minutes); |
| 97 | } | 97 | } |
| 98 | CMOS_WRITE(real_seconds,RTC_SECONDS); | 98 | CMOS_WRITE(real_seconds,RTC_SECONDS); |
| 99 | CMOS_WRITE(real_minutes,RTC_MINUTES); | 99 | CMOS_WRITE(real_minutes,RTC_MINUTES); |
diff --git a/arch/arm/mach-integrator/cpu.c b/arch/arm/mach-integrator/cpu.c index ce5ea7c26675..7c49d55e6b27 100644 --- a/arch/arm/mach-integrator/cpu.c +++ b/arch/arm/mach-integrator/cpu.c | |||
| @@ -3,8 +3,6 @@ | |||
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2001-2002 Deep Blue Solutions Ltd. | 4 | * Copyright (C) 2001-2002 Deep Blue Solutions Ltd. |
| 5 | * | 5 | * |
| 6 | * $Id: cpu.c,v 1.6 2002/07/18 13:58:51 rmk Exp $ | ||
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or modify | 6 | * This program is free software; you can redistribute it and/or modify |
| 9 | * it under the terms of the GNU General Public License version 2 as | 7 | * it under the terms of the GNU General Public License version 2 as |
| 10 | * published by the Free Software Foundation. | 8 | * published by the Free Software Foundation. |
diff --git a/arch/arm/mach-integrator/impd1.c b/arch/arm/mach-integrator/impd1.c index 0a7b3267c8d8..3c8383dbe9e6 100644 --- a/arch/arm/mach-integrator/impd1.c +++ b/arch/arm/mach-integrator/impd1.c | |||
| @@ -405,7 +405,7 @@ static int impd1_probe(struct lm_device *dev) | |||
| 405 | 405 | ||
| 406 | ret = amba_device_register(d, &dev->resource); | 406 | ret = amba_device_register(d, &dev->resource); |
| 407 | if (ret) { | 407 | if (ret) { |
| 408 | dev_err(&d->dev, "unable to register device: %d\n"); | 408 | dev_err(&d->dev, "unable to register device: %d\n", ret); |
| 409 | kfree(d); | 409 | kfree(d); |
| 410 | } | 410 | } |
| 411 | } | 411 | } |
diff --git a/arch/arm/mach-integrator/include/mach/platform.h b/arch/arm/mach-integrator/include/mach/platform.h index 83c4c1ceb411..028b87839c0f 100644 --- a/arch/arm/mach-integrator/include/mach/platform.h +++ b/arch/arm/mach-integrator/include/mach/platform.h | |||
| @@ -26,8 +26,6 @@ | |||
| 26 | * NOTE: This is a multi-hosted header file for use with uHAL and | 26 | * NOTE: This is a multi-hosted header file for use with uHAL and |
| 27 | * supported debuggers. | 27 | * supported debuggers. |
| 28 | * | 28 | * |
| 29 | * $Id: platform.s,v 1.32 2000/02/18 10:51:39 asims Exp $ | ||
| 30 | * | ||
| 31 | * ***********************************************************************/ | 29 | * ***********************************************************************/ |
| 32 | 30 | ||
| 33 | #ifndef __address_h | 31 | #ifndef __address_h |
diff --git a/arch/arm/mach-ixp4xx/fsg-setup.c b/arch/arm/mach-ixp4xx/fsg-setup.c index 0db3a909ae61..501dfdcc39fe 100644 --- a/arch/arm/mach-ixp4xx/fsg-setup.c +++ b/arch/arm/mach-ixp4xx/fsg-setup.c | |||
| @@ -64,7 +64,7 @@ static struct platform_device fsg_i2c_gpio = { | |||
| 64 | 64 | ||
| 65 | static struct i2c_board_info __initdata fsg_i2c_board_info [] = { | 65 | static struct i2c_board_info __initdata fsg_i2c_board_info [] = { |
| 66 | { | 66 | { |
| 67 | I2C_BOARD_INFO("rtc-isl1208", 0x6f), | 67 | I2C_BOARD_INFO("isl1208", 0x6f), |
| 68 | }, | 68 | }, |
| 69 | }; | 69 | }; |
| 70 | 70 | ||
| @@ -179,7 +179,6 @@ static void __init fsg_init(void) | |||
| 179 | { | 179 | { |
| 180 | DECLARE_MAC_BUF(mac_buf); | 180 | DECLARE_MAC_BUF(mac_buf); |
| 181 | uint8_t __iomem *f; | 181 | uint8_t __iomem *f; |
| 182 | int i; | ||
| 183 | 182 | ||
| 184 | ixp4xx_sys_init(); | 183 | ixp4xx_sys_init(); |
| 185 | 184 | ||
| @@ -228,6 +227,7 @@ static void __init fsg_init(void) | |||
| 228 | f = ioremap(IXP4XX_EXP_BUS_BASE(0), 0x400000); | 227 | f = ioremap(IXP4XX_EXP_BUS_BASE(0), 0x400000); |
| 229 | if (f) { | 228 | if (f) { |
| 230 | #ifdef __ARMEB__ | 229 | #ifdef __ARMEB__ |
| 230 | int i; | ||
| 231 | for (i = 0; i < 6; i++) { | 231 | for (i = 0; i < 6; i++) { |
| 232 | fsg_plat_eth[0].hwaddr[i] = readb(f + 0x3C0422 + i); | 232 | fsg_plat_eth[0].hwaddr[i] = readb(f + 0x3C0422 + i); |
| 233 | fsg_plat_eth[1].hwaddr[i] = readb(f + 0x3C043B + i); | 233 | fsg_plat_eth[1].hwaddr[i] = readb(f + 0x3C043B + i); |
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c index 0e509b8ad56e..189f16f3619d 100644 --- a/arch/arm/mach-kirkwood/common.c +++ b/arch/arm/mach-kirkwood/common.c | |||
| @@ -15,15 +15,17 @@ | |||
| 15 | #include <linux/mbus.h> | 15 | #include <linux/mbus.h> |
| 16 | #include <linux/mv643xx_eth.h> | 16 | #include <linux/mv643xx_eth.h> |
| 17 | #include <linux/ata_platform.h> | 17 | #include <linux/ata_platform.h> |
| 18 | #include <linux/spi/orion_spi.h> | ||
| 18 | #include <asm/page.h> | 19 | #include <asm/page.h> |
| 19 | #include <asm/timex.h> | 20 | #include <asm/timex.h> |
| 20 | #include <asm/mach/map.h> | 21 | #include <asm/mach/map.h> |
| 21 | #include <asm/mach/time.h> | 22 | #include <asm/mach/time.h> |
| 22 | #include <mach/kirkwood.h> | 23 | #include <mach/kirkwood.h> |
| 23 | #include <asm/plat-orion/cache-feroceon-l2.h> | 24 | #include <plat/cache-feroceon-l2.h> |
| 24 | #include <asm/plat-orion/ehci-orion.h> | 25 | #include <plat/ehci-orion.h> |
| 25 | #include <asm/plat-orion/orion_nand.h> | 26 | #include <plat/mv_xor.h> |
| 26 | #include <asm/plat-orion/time.h> | 27 | #include <plat/orion_nand.h> |
| 28 | #include <plat/time.h> | ||
| 27 | #include "common.h" | 29 | #include "common.h" |
| 28 | 30 | ||
| 29 | /***************************************************************************** | 31 | /***************************************************************************** |
| @@ -196,6 +198,37 @@ void __init kirkwood_sata_init(struct mv_sata_platform_data *sata_data) | |||
| 196 | 198 | ||
| 197 | 199 | ||
| 198 | /***************************************************************************** | 200 | /***************************************************************************** |
| 201 | * SPI | ||
| 202 | ****************************************************************************/ | ||
| 203 | static struct orion_spi_info kirkwood_spi_plat_data = { | ||
| 204 | .tclk = KIRKWOOD_TCLK, | ||
| 205 | }; | ||
| 206 | |||
| 207 | static struct resource kirkwood_spi_resources[] = { | ||
| 208 | { | ||
| 209 | .start = SPI_PHYS_BASE, | ||
| 210 | .end = SPI_PHYS_BASE + SZ_512 - 1, | ||
| 211 | .flags = IORESOURCE_MEM, | ||
| 212 | }, | ||
| 213 | }; | ||
| 214 | |||
| 215 | static struct platform_device kirkwood_spi = { | ||
| 216 | .name = "orion_spi", | ||
| 217 | .id = 0, | ||
| 218 | .resource = kirkwood_spi_resources, | ||
| 219 | .dev = { | ||
| 220 | .platform_data = &kirkwood_spi_plat_data, | ||
| 221 | }, | ||
| 222 | .num_resources = ARRAY_SIZE(kirkwood_spi_resources), | ||
| 223 | }; | ||
| 224 | |||
| 225 | void __init kirkwood_spi_init() | ||
| 226 | { | ||
| 227 | platform_device_register(&kirkwood_spi); | ||
| 228 | } | ||
| 229 | |||
| 230 | |||
| 231 | /***************************************************************************** | ||
| 199 | * UART0 | 232 | * UART0 |
| 200 | ****************************************************************************/ | 233 | ****************************************************************************/ |
| 201 | static struct plat_serial8250_port kirkwood_uart0_data[] = { | 234 | static struct plat_serial8250_port kirkwood_uart0_data[] = { |
| @@ -284,6 +317,212 @@ void __init kirkwood_uart1_init(void) | |||
| 284 | 317 | ||
| 285 | 318 | ||
| 286 | /***************************************************************************** | 319 | /***************************************************************************** |
| 320 | * XOR | ||
| 321 | ****************************************************************************/ | ||
| 322 | static struct mv_xor_platform_shared_data kirkwood_xor_shared_data = { | ||
| 323 | .dram = &kirkwood_mbus_dram_info, | ||
| 324 | }; | ||
| 325 | |||
| 326 | static u64 kirkwood_xor_dmamask = DMA_32BIT_MASK; | ||
| 327 | |||
| 328 | |||
| 329 | /***************************************************************************** | ||
| 330 | * XOR0 | ||
| 331 | ****************************************************************************/ | ||
| 332 | static struct resource kirkwood_xor0_shared_resources[] = { | ||
| 333 | { | ||
| 334 | .name = "xor 0 low", | ||
| 335 | .start = XOR0_PHYS_BASE, | ||
| 336 | .end = XOR0_PHYS_BASE + 0xff, | ||
| 337 | .flags = IORESOURCE_MEM, | ||
| 338 | }, { | ||
| 339 | .name = "xor 0 high", | ||
| 340 | .start = XOR0_HIGH_PHYS_BASE, | ||
| 341 | .end = XOR0_HIGH_PHYS_BASE + 0xff, | ||
| 342 | .flags = IORESOURCE_MEM, | ||
| 343 | }, | ||
| 344 | }; | ||
| 345 | |||
| 346 | static struct platform_device kirkwood_xor0_shared = { | ||
| 347 | .name = MV_XOR_SHARED_NAME, | ||
| 348 | .id = 0, | ||
| 349 | .dev = { | ||
| 350 | .platform_data = &kirkwood_xor_shared_data, | ||
| 351 | }, | ||
| 352 | .num_resources = ARRAY_SIZE(kirkwood_xor0_shared_resources), | ||
| 353 | .resource = kirkwood_xor0_shared_resources, | ||
| 354 | }; | ||
| 355 | |||
| 356 | static struct resource kirkwood_xor00_resources[] = { | ||
| 357 | [0] = { | ||
| 358 | .start = IRQ_KIRKWOOD_XOR_00, | ||
| 359 | .end = IRQ_KIRKWOOD_XOR_00, | ||
| 360 | .flags = IORESOURCE_IRQ, | ||
| 361 | }, | ||
| 362 | }; | ||
| 363 | |||
| 364 | static struct mv_xor_platform_data kirkwood_xor00_data = { | ||
| 365 | .shared = &kirkwood_xor0_shared, | ||
| 366 | .hw_id = 0, | ||
| 367 | .pool_size = PAGE_SIZE, | ||
| 368 | }; | ||
| 369 | |||
| 370 | static struct platform_device kirkwood_xor00_channel = { | ||
| 371 | .name = MV_XOR_NAME, | ||
| 372 | .id = 0, | ||
| 373 | .num_resources = ARRAY_SIZE(kirkwood_xor00_resources), | ||
| 374 | .resource = kirkwood_xor00_resources, | ||
| 375 | .dev = { | ||
| 376 | .dma_mask = &kirkwood_xor_dmamask, | ||
| 377 | .coherent_dma_mask = DMA_64BIT_MASK, | ||
| 378 | .platform_data = (void *)&kirkwood_xor00_data, | ||
| 379 | }, | ||
| 380 | }; | ||
| 381 | |||
| 382 | static struct resource kirkwood_xor01_resources[] = { | ||
| 383 | [0] = { | ||
| 384 | .start = IRQ_KIRKWOOD_XOR_01, | ||
| 385 | .end = IRQ_KIRKWOOD_XOR_01, | ||
| 386 | .flags = IORESOURCE_IRQ, | ||
| 387 | }, | ||
| 388 | }; | ||
| 389 | |||
| 390 | static struct mv_xor_platform_data kirkwood_xor01_data = { | ||
| 391 | .shared = &kirkwood_xor0_shared, | ||
| 392 | .hw_id = 1, | ||
| 393 | .pool_size = PAGE_SIZE, | ||
| 394 | }; | ||
| 395 | |||
| 396 | static struct platform_device kirkwood_xor01_channel = { | ||
| 397 | .name = MV_XOR_NAME, | ||
| 398 | .id = 1, | ||
| 399 | .num_resources = ARRAY_SIZE(kirkwood_xor01_resources), | ||
| 400 | .resource = kirkwood_xor01_resources, | ||
| 401 | .dev = { | ||
| 402 | .dma_mask = &kirkwood_xor_dmamask, | ||
| 403 | .coherent_dma_mask = DMA_64BIT_MASK, | ||
| 404 | .platform_data = (void *)&kirkwood_xor01_data, | ||
| 405 | }, | ||
| 406 | }; | ||
| 407 | |||
| 408 | void __init kirkwood_xor0_init(void) | ||
| 409 | { | ||
| 410 | platform_device_register(&kirkwood_xor0_shared); | ||
| 411 | |||
| 412 | /* | ||
| 413 | * two engines can't do memset simultaneously, this limitation | ||
| 414 | * satisfied by removing memset support from one of the engines. | ||
| 415 | */ | ||
| 416 | dma_cap_set(DMA_MEMCPY, kirkwood_xor00_data.cap_mask); | ||
| 417 | dma_cap_set(DMA_XOR, kirkwood_xor00_data.cap_mask); | ||
| 418 | platform_device_register(&kirkwood_xor00_channel); | ||
| 419 | |||
| 420 | dma_cap_set(DMA_MEMCPY, kirkwood_xor01_data.cap_mask); | ||
| 421 | dma_cap_set(DMA_MEMSET, kirkwood_xor01_data.cap_mask); | ||
| 422 | dma_cap_set(DMA_XOR, kirkwood_xor01_data.cap_mask); | ||
| 423 | platform_device_register(&kirkwood_xor01_channel); | ||
| 424 | } | ||
| 425 | |||
| 426 | |||
| 427 | /***************************************************************************** | ||
| 428 | * XOR1 | ||
| 429 | ****************************************************************************/ | ||
| 430 | static struct resource kirkwood_xor1_shared_resources[] = { | ||
| 431 | { | ||
| 432 | .name = "xor 1 low", | ||
| 433 | .start = XOR1_PHYS_BASE, | ||
| 434 | .end = XOR1_PHYS_BASE + 0xff, | ||
| 435 | .flags = IORESOURCE_MEM, | ||
| 436 | }, { | ||
| 437 | .name = "xor 1 high", | ||
| 438 | .start = XOR1_HIGH_PHYS_BASE, | ||
| 439 | .end = XOR1_HIGH_PHYS_BASE + 0xff, | ||
| 440 | .flags = IORESOURCE_MEM, | ||
| 441 | }, | ||
| 442 | }; | ||
| 443 | |||
| 444 | static struct platform_device kirkwood_xor1_shared = { | ||
| 445 | .name = MV_XOR_SHARED_NAME, | ||
| 446 | .id = 1, | ||
| 447 | .dev = { | ||
| 448 | .platform_data = &kirkwood_xor_shared_data, | ||
| 449 | }, | ||
| 450 | .num_resources = ARRAY_SIZE(kirkwood_xor1_shared_resources), | ||
| 451 | .resource = kirkwood_xor1_shared_resources, | ||
| 452 | }; | ||
| 453 | |||
| 454 | static struct resource kirkwood_xor10_resources[] = { | ||
| 455 | [0] = { | ||
| 456 | .start = IRQ_KIRKWOOD_XOR_10, | ||
| 457 | .end = IRQ_KIRKWOOD_XOR_10, | ||
| 458 | .flags = IORESOURCE_IRQ, | ||
| 459 | }, | ||
| 460 | }; | ||
| 461 | |||
| 462 | static struct mv_xor_platform_data kirkwood_xor10_data = { | ||
| 463 | .shared = &kirkwood_xor1_shared, | ||
| 464 | .hw_id = 0, | ||
| 465 | .pool_size = PAGE_SIZE, | ||
| 466 | }; | ||
| 467 | |||
| 468 | static struct platform_device kirkwood_xor10_channel = { | ||
| 469 | .name = MV_XOR_NAME, | ||
| 470 | .id = 2, | ||
| 471 | .num_resources = ARRAY_SIZE(kirkwood_xor10_resources), | ||
| 472 | .resource = kirkwood_xor10_resources, | ||
| 473 | .dev = { | ||
| 474 | .dma_mask = &kirkwood_xor_dmamask, | ||
| 475 | .coherent_dma_mask = DMA_64BIT_MASK, | ||
| 476 | .platform_data = (void *)&kirkwood_xor10_data, | ||
| 477 | }, | ||
| 478 | }; | ||
| 479 | |||
| 480 | static struct resource kirkwood_xor11_resources[] = { | ||
| 481 | [0] = { | ||
| 482 | .start = IRQ_KIRKWOOD_XOR_11, | ||
| 483 | .end = IRQ_KIRKWOOD_XOR_11, | ||
| 484 | .flags = IORESOURCE_IRQ, | ||
| 485 | }, | ||
| 486 | }; | ||
| 487 | |||
| 488 | static struct mv_xor_platform_data kirkwood_xor11_data = { | ||
| 489 | .shared = &kirkwood_xor1_shared, | ||
| 490 | .hw_id = 1, | ||
| 491 | .pool_size = PAGE_SIZE, | ||
| 492 | }; | ||
| 493 | |||
| 494 | static struct platform_device kirkwood_xor11_channel = { | ||
| 495 | .name = MV_XOR_NAME, | ||
| 496 | .id = 3, | ||
| 497 | .num_resources = ARRAY_SIZE(kirkwood_xor11_resources), | ||
| 498 | .resource = kirkwood_xor11_resources, | ||
| 499 | .dev = { | ||
| 500 | .dma_mask = &kirkwood_xor_dmamask, | ||
| 501 | .coherent_dma_mask = DMA_64BIT_MASK, | ||
| 502 | .platform_data = (void *)&kirkwood_xor11_data, | ||
| 503 | }, | ||
| 504 | }; | ||
| 505 | |||
| 506 | void __init kirkwood_xor1_init(void) | ||
| 507 | { | ||
| 508 | platform_device_register(&kirkwood_xor1_shared); | ||
| 509 | |||
| 510 | /* | ||
| 511 | * two engines can't do memset simultaneously, this limitation | ||
| 512 | * satisfied by removing memset support from one of the engines. | ||
| 513 | */ | ||
| 514 | dma_cap_set(DMA_MEMCPY, kirkwood_xor10_data.cap_mask); | ||
| 515 | dma_cap_set(DMA_XOR, kirkwood_xor10_data.cap_mask); | ||
| 516 | platform_device_register(&kirkwood_xor10_channel); | ||
| 517 | |||
| 518 | dma_cap_set(DMA_MEMCPY, kirkwood_xor11_data.cap_mask); | ||
| 519 | dma_cap_set(DMA_MEMSET, kirkwood_xor11_data.cap_mask); | ||
| 520 | dma_cap_set(DMA_XOR, kirkwood_xor11_data.cap_mask); | ||
| 521 | platform_device_register(&kirkwood_xor11_channel); | ||
| 522 | } | ||
| 523 | |||
| 524 | |||
| 525 | /***************************************************************************** | ||
| 287 | * Time handling | 526 | * Time handling |
| 288 | ****************************************************************************/ | 527 | ****************************************************************************/ |
| 289 | static void kirkwood_timer_init(void) | 528 | static void kirkwood_timer_init(void) |
diff --git a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h index 5dee2f6b40a5..69cd113af03a 100644 --- a/arch/arm/mach-kirkwood/common.h +++ b/arch/arm/mach-kirkwood/common.h | |||
| @@ -33,8 +33,11 @@ void kirkwood_ge00_init(struct mv643xx_eth_platform_data *eth_data); | |||
| 33 | void kirkwood_pcie_init(void); | 33 | void kirkwood_pcie_init(void); |
| 34 | void kirkwood_rtc_init(void); | 34 | void kirkwood_rtc_init(void); |
| 35 | void kirkwood_sata_init(struct mv_sata_platform_data *sata_data); | 35 | void kirkwood_sata_init(struct mv_sata_platform_data *sata_data); |
| 36 | void kirkwood_spi_init(void); | ||
| 36 | void kirkwood_uart0_init(void); | 37 | void kirkwood_uart0_init(void); |
| 37 | void kirkwood_uart1_init(void); | 38 | void kirkwood_uart1_init(void); |
| 39 | void kirkwood_xor0_init(void); | ||
| 40 | void kirkwood_xor1_init(void); | ||
| 38 | 41 | ||
| 39 | extern struct sys_timer kirkwood_timer; | 42 | extern struct sys_timer kirkwood_timer; |
| 40 | 43 | ||
diff --git a/arch/arm/mach-kirkwood/include/mach/kirkwood.h b/arch/arm/mach-kirkwood/include/mach/kirkwood.h index d1336b41f0fb..5c69992295e8 100644 --- a/arch/arm/mach-kirkwood/include/mach/kirkwood.h +++ b/arch/arm/mach-kirkwood/include/mach/kirkwood.h | |||
| @@ -88,6 +88,15 @@ | |||
| 88 | 88 | ||
| 89 | #define USB_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE | 0x50000) | 89 | #define USB_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE | 0x50000) |
| 90 | 90 | ||
| 91 | #define XOR0_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE | 0x60800) | ||
| 92 | #define XOR0_VIRT_BASE (KIRKWOOD_REGS_VIRT_BASE | 0x60800) | ||
| 93 | #define XOR1_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE | 0x60900) | ||
| 94 | #define XOR1_VIRT_BASE (KIRKWOOD_REGS_VIRT_BASE | 0x60900) | ||
| 95 | #define XOR0_HIGH_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE | 0x60A00) | ||
| 96 | #define XOR0_HIGH_VIRT_BASE (KIRKWOOD_REGS_VIRT_BASE | 0x60A00) | ||
| 97 | #define XOR1_HIGH_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE | 0x60B00) | ||
| 98 | #define XOR1_HIGH_VIRT_BASE (KIRKWOOD_REGS_VIRT_BASE | 0x60B00) | ||
| 99 | |||
| 91 | #define GE00_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE | 0x70000) | 100 | #define GE00_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE | 0x70000) |
| 92 | #define GE01_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE | 0x74000) | 101 | #define GE01_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE | 0x74000) |
| 93 | 102 | ||
diff --git a/arch/arm/mach-kirkwood/irq.c b/arch/arm/mach-kirkwood/irq.c index 302bb2cf6669..5790643ffe07 100644 --- a/arch/arm/mach-kirkwood/irq.c +++ b/arch/arm/mach-kirkwood/irq.c | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 13 | #include <linux/irq.h> | 13 | #include <linux/irq.h> |
| 14 | #include <linux/io.h> | 14 | #include <linux/io.h> |
| 15 | #include <asm/plat-orion/irq.h> | 15 | #include <plat/irq.h> |
| 16 | #include "common.h" | 16 | #include "common.h" |
| 17 | 17 | ||
| 18 | void __init kirkwood_init_irq(void) | 18 | void __init kirkwood_init_irq(void) |
diff --git a/arch/arm/mach-kirkwood/pcie.c b/arch/arm/mach-kirkwood/pcie.c index 8282d0ff84bf..2195fa31f6b7 100644 --- a/arch/arm/mach-kirkwood/pcie.c +++ b/arch/arm/mach-kirkwood/pcie.c | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | #include <linux/pci.h> | 12 | #include <linux/pci.h> |
| 13 | #include <linux/mbus.h> | 13 | #include <linux/mbus.h> |
| 14 | #include <asm/mach/pci.h> | 14 | #include <asm/mach/pci.h> |
| 15 | #include <asm/plat-orion/pcie.h> | 15 | #include <plat/pcie.h> |
| 16 | #include "common.h" | 16 | #include "common.h" |
| 17 | 17 | ||
| 18 | 18 | ||
diff --git a/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c b/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c index 182230a5d198..a3012d445971 100644 --- a/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c +++ b/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c | |||
| @@ -18,6 +18,9 @@ | |||
| 18 | #include <linux/timer.h> | 18 | #include <linux/timer.h> |
| 19 | #include <linux/ata_platform.h> | 19 | #include <linux/ata_platform.h> |
| 20 | #include <linux/mv643xx_eth.h> | 20 | #include <linux/mv643xx_eth.h> |
| 21 | #include <linux/spi/flash.h> | ||
| 22 | #include <linux/spi/spi.h> | ||
| 23 | #include <linux/spi/orion_spi.h> | ||
| 21 | #include <asm/mach-types.h> | 24 | #include <asm/mach-types.h> |
| 22 | #include <asm/mach/arch.h> | 25 | #include <asm/mach/arch.h> |
| 23 | #include <asm/mach/pci.h> | 26 | #include <asm/mach/pci.h> |
| @@ -34,6 +37,21 @@ static struct mv_sata_platform_data rd88f6192_sata_data = { | |||
| 34 | .n_ports = 2, | 37 | .n_ports = 2, |
| 35 | }; | 38 | }; |
| 36 | 39 | ||
| 40 | static const struct flash_platform_data rd88F6192_spi_slave_data = { | ||
| 41 | .type = "m25p128", | ||
| 42 | }; | ||
| 43 | |||
| 44 | static struct spi_board_info __initdata rd88F6192_spi_slave_info[] = { | ||
| 45 | { | ||
| 46 | .modalias = "m25p80", | ||
| 47 | .platform_data = &rd88F6192_spi_slave_data, | ||
| 48 | .irq = -1, | ||
| 49 | .max_speed_hz = 20000000, | ||
| 50 | .bus_num = 0, | ||
| 51 | .chip_select = 0, | ||
| 52 | }, | ||
| 53 | }; | ||
| 54 | |||
| 37 | static void __init rd88f6192_init(void) | 55 | static void __init rd88f6192_init(void) |
| 38 | { | 56 | { |
| 39 | /* | 57 | /* |
| @@ -45,7 +63,12 @@ static void __init rd88f6192_init(void) | |||
| 45 | kirkwood_ge00_init(&rd88f6192_ge00_data); | 63 | kirkwood_ge00_init(&rd88f6192_ge00_data); |
| 46 | kirkwood_rtc_init(); | 64 | kirkwood_rtc_init(); |
| 47 | kirkwood_sata_init(&rd88f6192_sata_data); | 65 | kirkwood_sata_init(&rd88f6192_sata_data); |
| 66 | spi_register_board_info(rd88F6192_spi_slave_info, | ||
| 67 | ARRAY_SIZE(rd88F6192_spi_slave_info)); | ||
| 68 | kirkwood_spi_init(); | ||
| 48 | kirkwood_uart0_init(); | 69 | kirkwood_uart0_init(); |
| 70 | kirkwood_xor0_init(); | ||
| 71 | kirkwood_xor1_init(); | ||
| 49 | } | 72 | } |
| 50 | 73 | ||
| 51 | static int __init rd88f6192_pci_init(void) | 74 | static int __init rd88f6192_pci_init(void) |
diff --git a/arch/arm/mach-kirkwood/rd88f6281-setup.c b/arch/arm/mach-kirkwood/rd88f6281-setup.c index d8a43018c7d3..d96487a0f18b 100644 --- a/arch/arm/mach-kirkwood/rd88f6281-setup.c +++ b/arch/arm/mach-kirkwood/rd88f6281-setup.c | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | #include <asm/mach/arch.h> | 23 | #include <asm/mach/arch.h> |
| 24 | #include <asm/mach/pci.h> | 24 | #include <asm/mach/pci.h> |
| 25 | #include <mach/kirkwood.h> | 25 | #include <mach/kirkwood.h> |
| 26 | #include <asm/plat-orion/orion_nand.h> | 26 | #include <plat/orion_nand.h> |
| 27 | #include "common.h" | 27 | #include "common.h" |
| 28 | 28 | ||
| 29 | static struct mtd_partition rd88f6281_nand_parts[] = { | 29 | static struct mtd_partition rd88f6281_nand_parts[] = { |
diff --git a/arch/arm/mach-lh7a40x/include/mach/ssp.h b/arch/arm/mach-lh7a40x/include/mach/ssp.h index 132b1c4d5ce6..509916182e34 100644 --- a/arch/arm/mach-lh7a40x/include/mach/ssp.h +++ b/arch/arm/mach-lh7a40x/include/mach/ssp.h | |||
| @@ -1,5 +1,4 @@ | |||
| 1 | /* ssp.h | 1 | /* ssp.h |
| 2 | $Id$ | ||
| 3 | 2 | ||
| 4 | written by Marc Singer | 3 | written by Marc Singer |
| 5 | 6 Dec 2004 | 4 | 6 Dec 2004 |
diff --git a/arch/arm/mach-lh7a40x/lcd-panel.h b/arch/arm/mach-lh7a40x/lcd-panel.h index df6e38ed425b..a7f5027b2f78 100644 --- a/arch/arm/mach-lh7a40x/lcd-panel.h +++ b/arch/arm/mach-lh7a40x/lcd-panel.h | |||
| @@ -1,5 +1,4 @@ | |||
| 1 | /* lcd-panel.h | 1 | /* lcd-panel.h |
| 2 | $Id$ | ||
| 3 | 2 | ||
| 4 | written by Marc Singer | 3 | written by Marc Singer |
| 5 | 18 Jul 2005 | 4 | 18 Jul 2005 |
diff --git a/arch/arm/mach-loki/common.c b/arch/arm/mach-loki/common.c index e20cdbca1ebe..c0d2d9d12e74 100644 --- a/arch/arm/mach-loki/common.c +++ b/arch/arm/mach-loki/common.c | |||
| @@ -19,8 +19,8 @@ | |||
| 19 | #include <asm/mach/map.h> | 19 | #include <asm/mach/map.h> |
| 20 | #include <asm/mach/time.h> | 20 | #include <asm/mach/time.h> |
| 21 | #include <mach/loki.h> | 21 | #include <mach/loki.h> |
| 22 | #include <asm/plat-orion/orion_nand.h> | 22 | #include <plat/orion_nand.h> |
| 23 | #include <asm/plat-orion/time.h> | 23 | #include <plat/time.h> |
| 24 | #include "common.h" | 24 | #include "common.h" |
| 25 | 25 | ||
| 26 | /***************************************************************************** | 26 | /***************************************************************************** |
diff --git a/arch/arm/mach-loki/irq.c b/arch/arm/mach-loki/irq.c index d839af91fe03..5a487930cb2f 100644 --- a/arch/arm/mach-loki/irq.c +++ b/arch/arm/mach-loki/irq.c | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 13 | #include <linux/irq.h> | 13 | #include <linux/irq.h> |
| 14 | #include <asm/io.h> | 14 | #include <asm/io.h> |
| 15 | #include <asm/plat-orion/irq.h> | 15 | #include <plat/irq.h> |
| 16 | #include "common.h" | 16 | #include "common.h" |
| 17 | 17 | ||
| 18 | void __init loki_init_irq(void) | 18 | void __init loki_init_irq(void) |
diff --git a/arch/arm/mach-mv78xx0/common.c b/arch/arm/mach-mv78xx0/common.c index e633f9cb239f..953a26c469cb 100644 --- a/arch/arm/mach-mv78xx0/common.c +++ b/arch/arm/mach-mv78xx0/common.c | |||
| @@ -18,10 +18,10 @@ | |||
| 18 | #include <asm/mach/map.h> | 18 | #include <asm/mach/map.h> |
| 19 | #include <asm/mach/time.h> | 19 | #include <asm/mach/time.h> |
| 20 | #include <mach/mv78xx0.h> | 20 | #include <mach/mv78xx0.h> |
| 21 | #include <asm/plat-orion/cache-feroceon-l2.h> | 21 | #include <plat/cache-feroceon-l2.h> |
| 22 | #include <asm/plat-orion/ehci-orion.h> | 22 | #include <plat/ehci-orion.h> |
| 23 | #include <asm/plat-orion/orion_nand.h> | 23 | #include <plat/orion_nand.h> |
| 24 | #include <asm/plat-orion/time.h> | 24 | #include <plat/time.h> |
| 25 | #include "common.h" | 25 | #include "common.h" |
| 26 | 26 | ||
| 27 | 27 | ||
diff --git a/arch/arm/mach-mv78xx0/irq.c b/arch/arm/mach-mv78xx0/irq.c index 3198abf54c90..28248d37b999 100644 --- a/arch/arm/mach-mv78xx0/irq.c +++ b/arch/arm/mach-mv78xx0/irq.c | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 13 | #include <linux/pci.h> | 13 | #include <linux/pci.h> |
| 14 | #include <mach/mv78xx0.h> | 14 | #include <mach/mv78xx0.h> |
| 15 | #include <asm/plat-orion/irq.h> | 15 | #include <plat/irq.h> |
| 16 | #include "common.h" | 16 | #include "common.h" |
| 17 | 17 | ||
| 18 | void __init mv78xx0_init_irq(void) | 18 | void __init mv78xx0_init_irq(void) |
diff --git a/arch/arm/mach-mv78xx0/pcie.c b/arch/arm/mach-mv78xx0/pcie.c index b78e1443159f..430ea84d587d 100644 --- a/arch/arm/mach-mv78xx0/pcie.c +++ b/arch/arm/mach-mv78xx0/pcie.c | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | #include <linux/pci.h> | 12 | #include <linux/pci.h> |
| 13 | #include <linux/mbus.h> | 13 | #include <linux/mbus.h> |
| 14 | #include <asm/mach/pci.h> | 14 | #include <asm/mach/pci.h> |
| 15 | #include <asm/plat-orion/pcie.h> | 15 | #include <plat/pcie.h> |
| 16 | #include "common.h" | 16 | #include "common.h" |
| 17 | 17 | ||
| 18 | struct pcie_port { | 18 | struct pcie_port { |
diff --git a/arch/arm/mach-omap2/board-2430sdp.c b/arch/arm/mach-omap2/board-2430sdp.c index d4d6385cad7c..b72ca13b3acb 100644 --- a/arch/arm/mach-omap2/board-2430sdp.c +++ b/arch/arm/mach-omap2/board-2430sdp.c | |||
| @@ -103,7 +103,7 @@ static struct resource sdp2430_smc91x_resources[] = { | |||
| 103 | [1] = { | 103 | [1] = { |
| 104 | .start = OMAP_GPIO_IRQ(OMAP24XX_ETHR_GPIO_IRQ), | 104 | .start = OMAP_GPIO_IRQ(OMAP24XX_ETHR_GPIO_IRQ), |
| 105 | .end = OMAP_GPIO_IRQ(OMAP24XX_ETHR_GPIO_IRQ), | 105 | .end = OMAP_GPIO_IRQ(OMAP24XX_ETHR_GPIO_IRQ), |
| 106 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE, | 106 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL, |
| 107 | }, | 107 | }, |
| 108 | }; | 108 | }; |
| 109 | 109 | ||
diff --git a/arch/arm/mach-omap2/usb-tusb6010.c b/arch/arm/mach-omap2/usb-tusb6010.c index 1607c941d95f..10ef464d6be7 100644 --- a/arch/arm/mach-omap2/usb-tusb6010.c +++ b/arch/arm/mach-omap2/usb-tusb6010.c | |||
| @@ -317,7 +317,6 @@ tusb6010_setup_interface(struct musb_hdrc_platform_data *data, | |||
| 317 | printk(error, 6, status); | 317 | printk(error, 6, status); |
| 318 | return -ENODEV; | 318 | return -ENODEV; |
| 319 | } | 319 | } |
| 320 | data->multipoint = 1; | ||
| 321 | tusb_device.dev.platform_data = data; | 320 | tusb_device.dev.platform_data = data; |
| 322 | 321 | ||
| 323 | /* REVISIT let the driver know what DMA channels work */ | 322 | /* REVISIT let the driver know what DMA channels work */ |
diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c index 168eeacaa4c0..7b11e552bc5a 100644 --- a/arch/arm/mach-orion5x/common.c +++ b/arch/arm/mach-orion5x/common.c | |||
| @@ -26,9 +26,10 @@ | |||
| 26 | #include <asm/mach/time.h> | 26 | #include <asm/mach/time.h> |
| 27 | #include <mach/hardware.h> | 27 | #include <mach/hardware.h> |
| 28 | #include <mach/orion5x.h> | 28 | #include <mach/orion5x.h> |
| 29 | #include <asm/plat-orion/ehci-orion.h> | 29 | #include <plat/ehci-orion.h> |
| 30 | #include <asm/plat-orion/orion_nand.h> | 30 | #include <plat/mv_xor.h> |
| 31 | #include <asm/plat-orion/time.h> | 31 | #include <plat/orion_nand.h> |
| 32 | #include <plat/time.h> | ||
| 32 | #include "common.h" | 33 | #include "common.h" |
| 33 | 34 | ||
| 34 | /***************************************************************************** | 35 | /***************************************************************************** |
| @@ -355,6 +356,103 @@ void __init orion5x_uart1_init(void) | |||
| 355 | 356 | ||
| 356 | 357 | ||
| 357 | /***************************************************************************** | 358 | /***************************************************************************** |
| 359 | * XOR engine | ||
| 360 | ****************************************************************************/ | ||
| 361 | static struct resource orion5x_xor_shared_resources[] = { | ||
| 362 | { | ||
| 363 | .name = "xor low", | ||
| 364 | .start = ORION5X_XOR_PHYS_BASE, | ||
| 365 | .end = ORION5X_XOR_PHYS_BASE + 0xff, | ||
| 366 | .flags = IORESOURCE_MEM, | ||
| 367 | }, { | ||
| 368 | .name = "xor high", | ||
| 369 | .start = ORION5X_XOR_PHYS_BASE + 0x200, | ||
| 370 | .end = ORION5X_XOR_PHYS_BASE + 0x2ff, | ||
| 371 | .flags = IORESOURCE_MEM, | ||
| 372 | }, | ||
| 373 | }; | ||
| 374 | |||
| 375 | static struct platform_device orion5x_xor_shared = { | ||
| 376 | .name = MV_XOR_SHARED_NAME, | ||
| 377 | .id = 0, | ||
| 378 | .num_resources = ARRAY_SIZE(orion5x_xor_shared_resources), | ||
| 379 | .resource = orion5x_xor_shared_resources, | ||
| 380 | }; | ||
| 381 | |||
| 382 | static u64 orion5x_xor_dmamask = DMA_32BIT_MASK; | ||
| 383 | |||
| 384 | static struct resource orion5x_xor0_resources[] = { | ||
| 385 | [0] = { | ||
| 386 | .start = IRQ_ORION5X_XOR0, | ||
| 387 | .end = IRQ_ORION5X_XOR0, | ||
| 388 | .flags = IORESOURCE_IRQ, | ||
| 389 | }, | ||
| 390 | }; | ||
| 391 | |||
| 392 | static struct mv_xor_platform_data orion5x_xor0_data = { | ||
| 393 | .shared = &orion5x_xor_shared, | ||
| 394 | .hw_id = 0, | ||
| 395 | .pool_size = PAGE_SIZE, | ||
| 396 | }; | ||
| 397 | |||
| 398 | static struct platform_device orion5x_xor0_channel = { | ||
| 399 | .name = MV_XOR_NAME, | ||
| 400 | .id = 0, | ||
| 401 | .num_resources = ARRAY_SIZE(orion5x_xor0_resources), | ||
| 402 | .resource = orion5x_xor0_resources, | ||
| 403 | .dev = { | ||
| 404 | .dma_mask = &orion5x_xor_dmamask, | ||
| 405 | .coherent_dma_mask = DMA_64BIT_MASK, | ||
| 406 | .platform_data = (void *)&orion5x_xor0_data, | ||
| 407 | }, | ||
| 408 | }; | ||
| 409 | |||
| 410 | static struct resource orion5x_xor1_resources[] = { | ||
| 411 | [0] = { | ||
| 412 | .start = IRQ_ORION5X_XOR1, | ||
| 413 | .end = IRQ_ORION5X_XOR1, | ||
| 414 | .flags = IORESOURCE_IRQ, | ||
| 415 | }, | ||
| 416 | }; | ||
| 417 | |||
| 418 | static struct mv_xor_platform_data orion5x_xor1_data = { | ||
| 419 | .shared = &orion5x_xor_shared, | ||
| 420 | .hw_id = 1, | ||
| 421 | .pool_size = PAGE_SIZE, | ||
| 422 | }; | ||
| 423 | |||
| 424 | static struct platform_device orion5x_xor1_channel = { | ||
| 425 | .name = MV_XOR_NAME, | ||
| 426 | .id = 1, | ||
| 427 | .num_resources = ARRAY_SIZE(orion5x_xor1_resources), | ||
| 428 | .resource = orion5x_xor1_resources, | ||
| 429 | .dev = { | ||
| 430 | .dma_mask = &orion5x_xor_dmamask, | ||
| 431 | .coherent_dma_mask = DMA_64BIT_MASK, | ||
| 432 | .platform_data = (void *)&orion5x_xor1_data, | ||
| 433 | }, | ||
| 434 | }; | ||
| 435 | |||
| 436 | void __init orion5x_xor_init(void) | ||
| 437 | { | ||
| 438 | platform_device_register(&orion5x_xor_shared); | ||
| 439 | |||
| 440 | /* | ||
| 441 | * two engines can't do memset simultaneously, this limitation | ||
| 442 | * satisfied by removing memset support from one of the engines. | ||
| 443 | */ | ||
| 444 | dma_cap_set(DMA_MEMCPY, orion5x_xor0_data.cap_mask); | ||
| 445 | dma_cap_set(DMA_XOR, orion5x_xor0_data.cap_mask); | ||
| 446 | platform_device_register(&orion5x_xor0_channel); | ||
| 447 | |||
| 448 | dma_cap_set(DMA_MEMCPY, orion5x_xor1_data.cap_mask); | ||
| 449 | dma_cap_set(DMA_MEMSET, orion5x_xor1_data.cap_mask); | ||
| 450 | dma_cap_set(DMA_XOR, orion5x_xor1_data.cap_mask); | ||
| 451 | platform_device_register(&orion5x_xor1_channel); | ||
| 452 | } | ||
| 453 | |||
| 454 | |||
| 455 | /***************************************************************************** | ||
| 358 | * Time handling | 456 | * Time handling |
| 359 | ****************************************************************************/ | 457 | ****************************************************************************/ |
| 360 | static void orion5x_timer_init(void) | 458 | static void orion5x_timer_init(void) |
| @@ -382,6 +480,8 @@ static void __init orion5x_id(u32 *dev, u32 *rev, char **dev_name) | |||
| 382 | *dev_name = "MV88F5281-D2"; | 480 | *dev_name = "MV88F5281-D2"; |
| 383 | } else if (*rev == MV88F5281_REV_D1) { | 481 | } else if (*rev == MV88F5281_REV_D1) { |
| 384 | *dev_name = "MV88F5281-D1"; | 482 | *dev_name = "MV88F5281-D1"; |
| 483 | } else if (*rev == MV88F5281_REV_D0) { | ||
| 484 | *dev_name = "MV88F5281-D0"; | ||
| 385 | } else { | 485 | } else { |
| 386 | *dev_name = "MV88F5281-Rev-Unsupported"; | 486 | *dev_name = "MV88F5281-Rev-Unsupported"; |
| 387 | } | 487 | } |
| @@ -416,6 +516,15 @@ void __init orion5x_init(void) | |||
| 416 | * Setup Orion address map | 516 | * Setup Orion address map |
| 417 | */ | 517 | */ |
| 418 | orion5x_setup_cpu_mbus_bridge(); | 518 | orion5x_setup_cpu_mbus_bridge(); |
| 519 | |||
| 520 | /* | ||
| 521 | * Don't issue "Wait for Interrupt" instruction if we are | ||
| 522 | * running on D0 5281 silicon. | ||
| 523 | */ | ||
| 524 | if (dev == MV88F5281_DEV_ID && rev == MV88F5281_REV_D0) { | ||
| 525 | printk(KERN_INFO "Orion: Applying 5281 D0 WFI workaround.\n"); | ||
| 526 | disable_hlt(); | ||
| 527 | } | ||
| 419 | } | 528 | } |
| 420 | 529 | ||
| 421 | /* | 530 | /* |
diff --git a/arch/arm/mach-orion5x/common.h b/arch/arm/mach-orion5x/common.h index f72cf0e77544..0bd195551a27 100644 --- a/arch/arm/mach-orion5x/common.h +++ b/arch/arm/mach-orion5x/common.h | |||
| @@ -32,6 +32,7 @@ void orion5x_i2c_init(void); | |||
| 32 | void orion5x_sata_init(struct mv_sata_platform_data *sata_data); | 32 | void orion5x_sata_init(struct mv_sata_platform_data *sata_data); |
| 33 | void orion5x_uart0_init(void); | 33 | void orion5x_uart0_init(void); |
| 34 | void orion5x_uart1_init(void); | 34 | void orion5x_uart1_init(void); |
| 35 | void orion5x_xor_init(void); | ||
| 35 | 36 | ||
| 36 | /* | 37 | /* |
| 37 | * PCIe/PCI functions. | 38 | * PCIe/PCI functions. |
| @@ -40,6 +41,7 @@ struct pci_bus; | |||
| 40 | struct pci_sys_data; | 41 | struct pci_sys_data; |
| 41 | 42 | ||
| 42 | void orion5x_pcie_id(u32 *dev, u32 *rev); | 43 | void orion5x_pcie_id(u32 *dev, u32 *rev); |
| 44 | void orion5x_pci_disable(void); | ||
| 43 | void orion5x_pci_set_cardbus_mode(void); | 45 | void orion5x_pci_set_cardbus_mode(void); |
| 44 | int orion5x_pci_sys_setup(int nr, struct pci_sys_data *sys); | 46 | int orion5x_pci_sys_setup(int nr, struct pci_sys_data *sys); |
| 45 | struct pci_bus *orion5x_pci_sys_scan_bus(int nr, struct pci_sys_data *sys); | 47 | struct pci_bus *orion5x_pci_sys_scan_bus(int nr, struct pci_sys_data *sys); |
diff --git a/arch/arm/mach-orion5x/db88f5281-setup.c b/arch/arm/mach-orion5x/db88f5281-setup.c index 48ce6d0e0020..ff13e9060b18 100644 --- a/arch/arm/mach-orion5x/db88f5281-setup.c +++ b/arch/arm/mach-orion5x/db88f5281-setup.c | |||
| @@ -25,7 +25,7 @@ | |||
| 25 | #include <asm/mach/arch.h> | 25 | #include <asm/mach/arch.h> |
| 26 | #include <asm/mach/pci.h> | 26 | #include <asm/mach/pci.h> |
| 27 | #include <mach/orion5x.h> | 27 | #include <mach/orion5x.h> |
| 28 | #include <asm/plat-orion/orion_nand.h> | 28 | #include <plat/orion_nand.h> |
| 29 | #include "common.h" | 29 | #include "common.h" |
| 30 | #include "mpp.h" | 30 | #include "mpp.h" |
| 31 | 31 | ||
diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c index 1a1d84b80a65..b38c65ccfb15 100644 --- a/arch/arm/mach-orion5x/dns323-setup.c +++ b/arch/arm/mach-orion5x/dns323-setup.c | |||
| @@ -245,12 +245,8 @@ static struct orion5x_mpp_mode dns323_mpp_modes[] __initdata = { | |||
| 245 | static struct i2c_board_info __initdata dns323_i2c_devices[] = { | 245 | static struct i2c_board_info __initdata dns323_i2c_devices[] = { |
| 246 | { | 246 | { |
| 247 | I2C_BOARD_INFO("g760a", 0x3e), | 247 | I2C_BOARD_INFO("g760a", 0x3e), |
| 248 | #if 0 | ||
| 249 | /* this entry requires the new-style driver model lm75 driver, | ||
| 250 | * for the meantime "insmod lm75.ko force_lm75=0,0x48" is needed */ | ||
| 251 | }, { | 248 | }, { |
| 252 | I2C_BOARD_INFO("g751", 0x48), | 249 | I2C_BOARD_INFO("lm75", 0x48), |
| 253 | #endif | ||
| 254 | }, { | 250 | }, { |
| 255 | I2C_BOARD_INFO("m41t80", 0x68), | 251 | I2C_BOARD_INFO("m41t80", 0x68), |
| 256 | }, | 252 | }, |
diff --git a/arch/arm/mach-orion5x/include/mach/orion5x.h b/arch/arm/mach-orion5x/include/mach/orion5x.h index f52a7d65bec2..61eb74a88862 100644 --- a/arch/arm/mach-orion5x/include/mach/orion5x.h +++ b/arch/arm/mach-orion5x/include/mach/orion5x.h | |||
| @@ -73,6 +73,7 @@ | |||
| 73 | #define MV88F5182_REV_A2 2 | 73 | #define MV88F5182_REV_A2 2 |
| 74 | /* Orion-2 (88F5281) */ | 74 | /* Orion-2 (88F5281) */ |
| 75 | #define MV88F5281_DEV_ID 0x5281 | 75 | #define MV88F5281_DEV_ID 0x5281 |
| 76 | #define MV88F5281_REV_D0 4 | ||
| 76 | #define MV88F5281_REV_D1 5 | 77 | #define MV88F5281_REV_D1 5 |
| 77 | #define MV88F5281_REV_D2 6 | 78 | #define MV88F5281_REV_D2 6 |
| 78 | 79 | ||
| @@ -105,6 +106,10 @@ | |||
| 105 | #define ORION5X_USB0_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0x50000) | 106 | #define ORION5X_USB0_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0x50000) |
| 106 | #define ORION5X_USB0_REG(x) (ORION5X_USB0_VIRT_BASE | (x)) | 107 | #define ORION5X_USB0_REG(x) (ORION5X_USB0_VIRT_BASE | (x)) |
| 107 | 108 | ||
| 109 | #define ORION5X_XOR_PHYS_BASE (ORION5X_REGS_PHYS_BASE | 0x60900) | ||
| 110 | #define ORION5X_XOR_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0x60900) | ||
| 111 | #define ORION5X_XOR_REG(x) (ORION5X_XOR_VIRT_BASE | (x)) | ||
| 112 | |||
| 108 | #define ORION5X_ETH_PHYS_BASE (ORION5X_REGS_PHYS_BASE | 0x70000) | 113 | #define ORION5X_ETH_PHYS_BASE (ORION5X_REGS_PHYS_BASE | 0x70000) |
| 109 | #define ORION5X_ETH_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0x70000) | 114 | #define ORION5X_ETH_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0x70000) |
| 110 | #define ORION5X_ETH_REG(x) (ORION5X_ETH_VIRT_BASE | (x)) | 115 | #define ORION5X_ETH_REG(x) (ORION5X_ETH_VIRT_BASE | (x)) |
diff --git a/arch/arm/mach-orion5x/irq.c b/arch/arm/mach-orion5x/irq.c index cc2a017fd2a9..2545ff9e5830 100644 --- a/arch/arm/mach-orion5x/irq.c +++ b/arch/arm/mach-orion5x/irq.c | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | #include <asm/gpio.h> | 16 | #include <asm/gpio.h> |
| 17 | #include <asm/io.h> | 17 | #include <asm/io.h> |
| 18 | #include <mach/orion5x.h> | 18 | #include <mach/orion5x.h> |
| 19 | #include <asm/plat-orion/irq.h> | 19 | #include <plat/irq.h> |
| 20 | #include "common.h" | 20 | #include "common.h" |
| 21 | 21 | ||
| 22 | /***************************************************************************** | 22 | /***************************************************************************** |
diff --git a/arch/arm/mach-orion5x/kurobox_pro-setup.c b/arch/arm/mach-orion5x/kurobox_pro-setup.c index 0caaaac74bc1..e321ec331839 100644 --- a/arch/arm/mach-orion5x/kurobox_pro-setup.c +++ b/arch/arm/mach-orion5x/kurobox_pro-setup.c | |||
| @@ -25,7 +25,7 @@ | |||
| 25 | #include <asm/mach/arch.h> | 25 | #include <asm/mach/arch.h> |
| 26 | #include <asm/mach/pci.h> | 26 | #include <asm/mach/pci.h> |
| 27 | #include <mach/orion5x.h> | 27 | #include <mach/orion5x.h> |
| 28 | #include <asm/plat-orion/orion_nand.h> | 28 | #include <plat/orion_nand.h> |
| 29 | #include "common.h" | 29 | #include "common.h" |
| 30 | #include "mpp.h" | 30 | #include "mpp.h" |
| 31 | 31 | ||
| @@ -146,8 +146,10 @@ static struct hw_pci kurobox_pro_pci __initdata = { | |||
| 146 | 146 | ||
| 147 | static int __init kurobox_pro_pci_init(void) | 147 | static int __init kurobox_pro_pci_init(void) |
| 148 | { | 148 | { |
| 149 | if (machine_is_kurobox_pro()) | 149 | if (machine_is_kurobox_pro()) { |
| 150 | orion5x_pci_disable(); | ||
| 150 | pci_common_init(&kurobox_pro_pci); | 151 | pci_common_init(&kurobox_pro_pci); |
| 152 | } | ||
| 151 | 153 | ||
| 152 | return 0; | 154 | return 0; |
| 153 | } | 155 | } |
| @@ -356,6 +358,7 @@ static void __init kurobox_pro_init(void) | |||
| 356 | orion5x_sata_init(&kurobox_pro_sata_data); | 358 | orion5x_sata_init(&kurobox_pro_sata_data); |
| 357 | orion5x_uart0_init(); | 359 | orion5x_uart0_init(); |
| 358 | orion5x_uart1_init(); | 360 | orion5x_uart1_init(); |
| 361 | orion5x_xor_init(); | ||
| 359 | 362 | ||
| 360 | orion5x_setup_dev_boot_win(KUROBOX_PRO_NOR_BOOT_BASE, | 363 | orion5x_setup_dev_boot_win(KUROBOX_PRO_NOR_BOOT_BASE, |
| 361 | KUROBOX_PRO_NOR_BOOT_SIZE); | 364 | KUROBOX_PRO_NOR_BOOT_SIZE); |
diff --git a/arch/arm/mach-orion5x/mss2-setup.c b/arch/arm/mach-orion5x/mss2-setup.c index 4403cc963d66..53ff1893b883 100644 --- a/arch/arm/mach-orion5x/mss2-setup.c +++ b/arch/arm/mach-orion5x/mss2-setup.c | |||
| @@ -239,6 +239,7 @@ static void __init mss2_init(void) | |||
| 239 | orion5x_i2c_init(); | 239 | orion5x_i2c_init(); |
| 240 | orion5x_sata_init(&mss2_sata_data); | 240 | orion5x_sata_init(&mss2_sata_data); |
| 241 | orion5x_uart0_init(); | 241 | orion5x_uart0_init(); |
| 242 | orion5x_xor_init(); | ||
| 242 | 243 | ||
| 243 | orion5x_setup_dev_boot_win(MSS2_NOR_BOOT_BASE, MSS2_NOR_BOOT_SIZE); | 244 | orion5x_setup_dev_boot_win(MSS2_NOR_BOOT_BASE, MSS2_NOR_BOOT_SIZE); |
| 244 | platform_device_register(&mss2_nor_flash); | 245 | platform_device_register(&mss2_nor_flash); |
diff --git a/arch/arm/mach-orion5x/mv2120-setup.c b/arch/arm/mach-orion5x/mv2120-setup.c index 67b2c0df615f..978d4d599396 100644 --- a/arch/arm/mach-orion5x/mv2120-setup.c +++ b/arch/arm/mach-orion5x/mv2120-setup.c | |||
| @@ -203,6 +203,7 @@ static void __init mv2120_init(void) | |||
| 203 | orion5x_i2c_init(); | 203 | orion5x_i2c_init(); |
| 204 | orion5x_sata_init(&mv2120_sata_data); | 204 | orion5x_sata_init(&mv2120_sata_data); |
| 205 | orion5x_uart0_init(); | 205 | orion5x_uart0_init(); |
| 206 | orion5x_xor_init(); | ||
| 206 | 207 | ||
| 207 | orion5x_setup_dev_boot_win(MV2120_NOR_BOOT_BASE, MV2120_NOR_BOOT_SIZE); | 208 | orion5x_setup_dev_boot_win(MV2120_NOR_BOOT_BASE, MV2120_NOR_BOOT_SIZE); |
| 208 | platform_device_register(&mv2120_nor_flash); | 209 | platform_device_register(&mv2120_nor_flash); |
diff --git a/arch/arm/mach-orion5x/pci.c b/arch/arm/mach-orion5x/pci.c index 256a4f680935..a7b7d77b1b09 100644 --- a/arch/arm/mach-orion5x/pci.c +++ b/arch/arm/mach-orion5x/pci.c | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | #include <linux/pci.h> | 14 | #include <linux/pci.h> |
| 15 | #include <linux/mbus.h> | 15 | #include <linux/mbus.h> |
| 16 | #include <asm/mach/pci.h> | 16 | #include <asm/mach/pci.h> |
| 17 | #include <asm/plat-orion/pcie.h> | 17 | #include <plat/pcie.h> |
| 18 | #include "common.h" | 18 | #include "common.h" |
| 19 | 19 | ||
| 20 | /***************************************************************************** | 20 | /***************************************************************************** |
| @@ -541,6 +541,13 @@ static void __devinit rc_pci_fixup(struct pci_dev *dev) | |||
| 541 | } | 541 | } |
| 542 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL, PCI_ANY_ID, rc_pci_fixup); | 542 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL, PCI_ANY_ID, rc_pci_fixup); |
| 543 | 543 | ||
| 544 | static int orion5x_pci_disabled __initdata; | ||
| 545 | |||
| 546 | void __init orion5x_pci_disable(void) | ||
| 547 | { | ||
| 548 | orion5x_pci_disabled = 1; | ||
| 549 | } | ||
| 550 | |||
| 544 | void __init orion5x_pci_set_cardbus_mode(void) | 551 | void __init orion5x_pci_set_cardbus_mode(void) |
| 545 | { | 552 | { |
| 546 | orion5x_pci_cardbus_mode = 1; | 553 | orion5x_pci_cardbus_mode = 1; |
| @@ -553,7 +560,7 @@ int __init orion5x_pci_sys_setup(int nr, struct pci_sys_data *sys) | |||
| 553 | if (nr == 0) { | 560 | if (nr == 0) { |
| 554 | orion_pcie_set_local_bus_nr(PCIE_BASE, sys->busnr); | 561 | orion_pcie_set_local_bus_nr(PCIE_BASE, sys->busnr); |
| 555 | ret = pcie_setup(sys); | 562 | ret = pcie_setup(sys); |
| 556 | } else if (nr == 1) { | 563 | } else if (nr == 1 && !orion5x_pci_disabled) { |
| 557 | orion5x_pci_set_bus_nr(sys->busnr); | 564 | orion5x_pci_set_bus_nr(sys->busnr); |
| 558 | ret = pci_setup(sys); | 565 | ret = pci_setup(sys); |
| 559 | } | 566 | } |
| @@ -567,7 +574,7 @@ struct pci_bus __init *orion5x_pci_sys_scan_bus(int nr, struct pci_sys_data *sys | |||
| 567 | 574 | ||
| 568 | if (nr == 0) { | 575 | if (nr == 0) { |
| 569 | bus = pci_scan_bus(sys->busnr, &pcie_ops, sys); | 576 | bus = pci_scan_bus(sys->busnr, &pcie_ops, sys); |
| 570 | } else if (nr == 1) { | 577 | } else if (nr == 1 && !orion5x_pci_disabled) { |
| 571 | bus = pci_scan_bus(sys->busnr, &pci_ops, sys); | 578 | bus = pci_scan_bus(sys->busnr, &pci_ops, sys); |
| 572 | } else { | 579 | } else { |
| 573 | bus = NULL; | 580 | bus = NULL; |
| @@ -584,7 +591,7 @@ int __init orion5x_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | |||
| 584 | /* | 591 | /* |
| 585 | * PCIe endpoint? | 592 | * PCIe endpoint? |
| 586 | */ | 593 | */ |
| 587 | if (bus < orion5x_pci_local_bus_nr()) | 594 | if (orion5x_pci_disabled || bus < orion5x_pci_local_bus_nr()) |
| 588 | return IRQ_ORION5X_PCIE0_INT; | 595 | return IRQ_ORION5X_PCIE0_INT; |
| 589 | 596 | ||
| 590 | return -1; | 597 | return -1; |
diff --git a/arch/arm/mach-orion5x/rd88f5182-setup.c b/arch/arm/mach-orion5x/rd88f5182-setup.c index 8771cb76f0dc..4c3bcd76ac85 100644 --- a/arch/arm/mach-orion5x/rd88f5182-setup.c +++ b/arch/arm/mach-orion5x/rd88f5182-setup.c | |||
| @@ -292,6 +292,7 @@ static void __init rd88f5182_init(void) | |||
| 292 | orion5x_i2c_init(); | 292 | orion5x_i2c_init(); |
| 293 | orion5x_sata_init(&rd88f5182_sata_data); | 293 | orion5x_sata_init(&rd88f5182_sata_data); |
| 294 | orion5x_uart0_init(); | 294 | orion5x_uart0_init(); |
| 295 | orion5x_xor_init(); | ||
| 295 | 296 | ||
| 296 | orion5x_setup_dev_boot_win(RD88F5182_NOR_BOOT_BASE, | 297 | orion5x_setup_dev_boot_win(RD88F5182_NOR_BOOT_BASE, |
| 297 | RD88F5182_NOR_BOOT_SIZE); | 298 | RD88F5182_NOR_BOOT_SIZE); |
diff --git a/arch/arm/mach-orion5x/ts209-setup.c b/arch/arm/mach-orion5x/ts209-setup.c index 809132de31d2..9d6890514199 100644 --- a/arch/arm/mach-orion5x/ts209-setup.c +++ b/arch/arm/mach-orion5x/ts209-setup.c | |||
| @@ -207,12 +207,12 @@ static struct i2c_board_info __initdata qnap_ts209_i2c_rtc = { | |||
| 207 | 207 | ||
| 208 | static struct gpio_keys_button qnap_ts209_buttons[] = { | 208 | static struct gpio_keys_button qnap_ts209_buttons[] = { |
| 209 | { | 209 | { |
| 210 | .code = KEY_RESTART, | 210 | .code = KEY_COPY, |
| 211 | .gpio = QNAP_TS209_GPIO_KEY_MEDIA, | 211 | .gpio = QNAP_TS209_GPIO_KEY_MEDIA, |
| 212 | .desc = "USB Copy Button", | 212 | .desc = "USB Copy Button", |
| 213 | .active_low = 1, | 213 | .active_low = 1, |
| 214 | }, { | 214 | }, { |
| 215 | .code = KEY_POWER, | 215 | .code = KEY_RESTART, |
| 216 | .gpio = QNAP_TS209_GPIO_KEY_RESET, | 216 | .gpio = QNAP_TS209_GPIO_KEY_RESET, |
| 217 | .desc = "Reset Button", | 217 | .desc = "Reset Button", |
| 218 | .active_low = 1, | 218 | .active_low = 1, |
| @@ -287,6 +287,10 @@ static void __init qnap_ts209_init(void) | |||
| 287 | /* | 287 | /* |
| 288 | * Configure peripherals. | 288 | * Configure peripherals. |
| 289 | */ | 289 | */ |
| 290 | orion5x_setup_dev_boot_win(QNAP_TS209_NOR_BOOT_BASE, | ||
| 291 | QNAP_TS209_NOR_BOOT_SIZE); | ||
| 292 | platform_device_register(&qnap_ts209_nor_flash); | ||
| 293 | |||
| 290 | orion5x_ehci0_init(); | 294 | orion5x_ehci0_init(); |
| 291 | orion5x_ehci1_init(); | 295 | orion5x_ehci1_init(); |
| 292 | qnap_tsx09_find_mac_addr(QNAP_TS209_NOR_BOOT_BASE + | 296 | qnap_tsx09_find_mac_addr(QNAP_TS209_NOR_BOOT_BASE + |
| @@ -296,10 +300,8 @@ static void __init qnap_ts209_init(void) | |||
| 296 | orion5x_i2c_init(); | 300 | orion5x_i2c_init(); |
| 297 | orion5x_sata_init(&qnap_ts209_sata_data); | 301 | orion5x_sata_init(&qnap_ts209_sata_data); |
| 298 | orion5x_uart0_init(); | 302 | orion5x_uart0_init(); |
| 299 | 303 | orion5x_uart1_init(); | |
| 300 | orion5x_setup_dev_boot_win(QNAP_TS209_NOR_BOOT_BASE, | 304 | orion5x_xor_init(); |
| 301 | QNAP_TS209_NOR_BOOT_SIZE); | ||
| 302 | platform_device_register(&qnap_ts209_nor_flash); | ||
| 303 | 305 | ||
| 304 | platform_device_register(&qnap_ts209_button_device); | 306 | platform_device_register(&qnap_ts209_button_device); |
| 305 | 307 | ||
diff --git a/arch/arm/mach-orion5x/ts409-setup.c b/arch/arm/mach-orion5x/ts409-setup.c index 6053e76ac967..d85588ac7ef8 100644 --- a/arch/arm/mach-orion5x/ts409-setup.c +++ b/arch/arm/mach-orion5x/ts409-setup.c | |||
| @@ -3,6 +3,9 @@ | |||
| 3 | * | 3 | * |
| 4 | * Maintainer: Sylver Bruneau <sylver.bruneau@gmail.com> | 4 | * Maintainer: Sylver Bruneau <sylver.bruneau@gmail.com> |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2008 Sylver Bruneau <sylver.bruneau@gmail.com> | ||
| 7 | * Copyright (C) 2008 Martin Michlmayr <tbm@cyrius.com> | ||
| 8 | * | ||
| 6 | * This program is free software; you can redistribute it and/or | 9 | * This program is free software; you can redistribute it and/or |
| 7 | * modify it under the terms of the GNU General Public License | 10 | * modify it under the terms of the GNU General Public License |
| 8 | * as published by the Free Software Foundation; either version | 11 | * as published by the Free Software Foundation; either version |
| @@ -16,6 +19,7 @@ | |||
| 16 | #include <linux/irq.h> | 19 | #include <linux/irq.h> |
| 17 | #include <linux/mtd/physmap.h> | 20 | #include <linux/mtd/physmap.h> |
| 18 | #include <linux/mv643xx_eth.h> | 21 | #include <linux/mv643xx_eth.h> |
| 22 | #include <linux/leds.h> | ||
| 19 | #include <linux/gpio_keys.h> | 23 | #include <linux/gpio_keys.h> |
| 20 | #include <linux/input.h> | 24 | #include <linux/input.h> |
| 21 | #include <linux/i2c.h> | 25 | #include <linux/i2c.h> |
| @@ -162,16 +166,59 @@ static struct i2c_board_info __initdata qnap_ts409_i2c_rtc = { | |||
| 162 | I2C_BOARD_INFO("s35390a", 0x30), | 166 | I2C_BOARD_INFO("s35390a", 0x30), |
| 163 | }; | 167 | }; |
| 164 | 168 | ||
| 169 | /***************************************************************************** | ||
| 170 | * LEDs attached to GPIO | ||
| 171 | ****************************************************************************/ | ||
| 172 | |||
| 173 | static struct gpio_led ts409_led_pins[] = { | ||
| 174 | { | ||
| 175 | .name = "ts409:red:sata1", | ||
| 176 | .gpio = 4, | ||
| 177 | .active_low = 1, | ||
| 178 | }, { | ||
| 179 | .name = "ts409:red:sata2", | ||
| 180 | .gpio = 5, | ||
| 181 | .active_low = 1, | ||
| 182 | }, { | ||
| 183 | .name = "ts409:red:sata3", | ||
| 184 | .gpio = 6, | ||
| 185 | .active_low = 1, | ||
| 186 | }, { | ||
| 187 | .name = "ts409:red:sata4", | ||
| 188 | .gpio = 7, | ||
| 189 | .active_low = 1, | ||
| 190 | }, | ||
| 191 | }; | ||
| 192 | |||
| 193 | static struct gpio_led_platform_data ts409_led_data = { | ||
| 194 | .leds = ts409_led_pins, | ||
| 195 | .num_leds = ARRAY_SIZE(ts409_led_pins), | ||
| 196 | }; | ||
| 197 | |||
| 198 | static struct platform_device ts409_leds = { | ||
| 199 | .name = "leds-gpio", | ||
| 200 | .id = -1, | ||
| 201 | .dev = { | ||
| 202 | .platform_data = &ts409_led_data, | ||
| 203 | }, | ||
| 204 | }; | ||
| 205 | |||
| 165 | /**************************************************************************** | 206 | /**************************************************************************** |
| 166 | * GPIO Attached Keys | 207 | * GPIO Attached Keys |
| 167 | * Power button is attached to the PIC microcontroller | 208 | * Power button is attached to the PIC microcontroller |
| 168 | ****************************************************************************/ | 209 | ****************************************************************************/ |
| 169 | 210 | ||
| 211 | #define QNAP_TS409_GPIO_KEY_RESET 14 | ||
| 170 | #define QNAP_TS409_GPIO_KEY_MEDIA 15 | 212 | #define QNAP_TS409_GPIO_KEY_MEDIA 15 |
| 171 | 213 | ||
| 172 | static struct gpio_keys_button qnap_ts409_buttons[] = { | 214 | static struct gpio_keys_button qnap_ts409_buttons[] = { |
| 173 | { | 215 | { |
| 174 | .code = KEY_RESTART, | 216 | .code = KEY_RESTART, |
| 217 | .gpio = QNAP_TS409_GPIO_KEY_RESET, | ||
| 218 | .desc = "Reset Button", | ||
| 219 | .active_low = 1, | ||
| 220 | }, { | ||
| 221 | .code = KEY_COPY, | ||
| 175 | .gpio = QNAP_TS409_GPIO_KEY_MEDIA, | 222 | .gpio = QNAP_TS409_GPIO_KEY_MEDIA, |
| 176 | .desc = "USB Copy Button", | 223 | .desc = "USB Copy Button", |
| 177 | .active_low = 1, | 224 | .active_low = 1, |
| @@ -231,6 +278,10 @@ static void __init qnap_ts409_init(void) | |||
| 231 | /* | 278 | /* |
| 232 | * Configure peripherals. | 279 | * Configure peripherals. |
| 233 | */ | 280 | */ |
| 281 | orion5x_setup_dev_boot_win(QNAP_TS409_NOR_BOOT_BASE, | ||
| 282 | QNAP_TS409_NOR_BOOT_SIZE); | ||
| 283 | platform_device_register(&qnap_ts409_nor_flash); | ||
| 284 | |||
| 234 | orion5x_ehci0_init(); | 285 | orion5x_ehci0_init(); |
| 235 | qnap_tsx09_find_mac_addr(QNAP_TS409_NOR_BOOT_BASE + | 286 | qnap_tsx09_find_mac_addr(QNAP_TS409_NOR_BOOT_BASE + |
| 236 | qnap_ts409_partitions[5].offset, | 287 | qnap_ts409_partitions[5].offset, |
| @@ -238,10 +289,7 @@ static void __init qnap_ts409_init(void) | |||
| 238 | orion5x_eth_init(&qnap_tsx09_eth_data); | 289 | orion5x_eth_init(&qnap_tsx09_eth_data); |
| 239 | orion5x_i2c_init(); | 290 | orion5x_i2c_init(); |
| 240 | orion5x_uart0_init(); | 291 | orion5x_uart0_init(); |
| 241 | 292 | orion5x_uart1_init(); | |
| 242 | orion5x_setup_dev_boot_win(QNAP_TS409_NOR_BOOT_BASE, | ||
| 243 | QNAP_TS409_NOR_BOOT_SIZE); | ||
| 244 | platform_device_register(&qnap_ts409_nor_flash); | ||
| 245 | 293 | ||
| 246 | platform_device_register(&qnap_ts409_button_device); | 294 | platform_device_register(&qnap_ts409_button_device); |
| 247 | 295 | ||
| @@ -255,6 +303,7 @@ static void __init qnap_ts409_init(void) | |||
| 255 | if (qnap_ts409_i2c_rtc.irq == 0) | 303 | if (qnap_ts409_i2c_rtc.irq == 0) |
| 256 | pr_warning("qnap_ts409_init: failed to get RTC IRQ\n"); | 304 | pr_warning("qnap_ts409_init: failed to get RTC IRQ\n"); |
| 257 | i2c_register_board_info(0, &qnap_ts409_i2c_rtc, 1); | 305 | i2c_register_board_info(0, &qnap_ts409_i2c_rtc, 1); |
| 306 | platform_device_register(&ts409_leds); | ||
| 258 | 307 | ||
| 259 | /* register tsx09 specific power-off method */ | 308 | /* register tsx09 specific power-off method */ |
| 260 | pm_power_off = qnap_tsx09_power_off; | 309 | pm_power_off = qnap_tsx09_power_off; |
diff --git a/arch/arm/mach-orion5x/ts78xx-setup.c b/arch/arm/mach-orion5x/ts78xx-setup.c index 014916a28fdc..ae0a5dccd2a1 100644 --- a/arch/arm/mach-orion5x/ts78xx-setup.c +++ b/arch/arm/mach-orion5x/ts78xx-setup.c | |||
| @@ -256,6 +256,7 @@ static void __init ts78xx_init(void) | |||
| 256 | orion5x_sata_init(&ts78xx_sata_data); | 256 | orion5x_sata_init(&ts78xx_sata_data); |
| 257 | orion5x_uart0_init(); | 257 | orion5x_uart0_init(); |
| 258 | orion5x_uart1_init(); | 258 | orion5x_uart1_init(); |
| 259 | orion5x_xor_init(); | ||
| 259 | 260 | ||
| 260 | orion5x_setup_dev_boot_win(TS78XX_NOR_BOOT_BASE, | 261 | orion5x_setup_dev_boot_win(TS78XX_NOR_BOOT_BASE, |
| 261 | TS78XX_NOR_BOOT_SIZE); | 262 | TS78XX_NOR_BOOT_SIZE); |
diff --git a/arch/arm/mach-pxa/clock.c b/arch/arm/mach-pxa/clock.c index c01eea88f787..ca8e20538157 100644 --- a/arch/arm/mach-pxa/clock.c +++ b/arch/arm/mach-pxa/clock.c | |||
| @@ -125,3 +125,28 @@ void clks_register(struct clk *clks, size_t num) | |||
| 125 | list_add(&clks[i].node, &clocks); | 125 | list_add(&clks[i].node, &clocks); |
| 126 | mutex_unlock(&clocks_mutex); | 126 | mutex_unlock(&clocks_mutex); |
| 127 | } | 127 | } |
| 128 | |||
| 129 | int clk_add_alias(char *alias, struct device *alias_dev, char *id, | ||
| 130 | struct device *dev) | ||
| 131 | { | ||
| 132 | struct clk *r = clk_lookup(dev, id); | ||
| 133 | struct clk *new; | ||
| 134 | |||
| 135 | if (!r) | ||
| 136 | return -ENODEV; | ||
| 137 | |||
| 138 | new = kzalloc(sizeof(struct clk), GFP_KERNEL); | ||
| 139 | |||
| 140 | if (!new) | ||
| 141 | return -ENOMEM; | ||
| 142 | |||
| 143 | new->name = alias; | ||
| 144 | new->dev = alias_dev; | ||
| 145 | new->other = r; | ||
| 146 | |||
| 147 | mutex_lock(&clocks_mutex); | ||
| 148 | list_add(&new->node, &clocks); | ||
| 149 | mutex_unlock(&clocks_mutex); | ||
| 150 | |||
| 151 | return 0; | ||
| 152 | } | ||
diff --git a/arch/arm/mach-pxa/clock.h b/arch/arm/mach-pxa/clock.h index 1ec8f9178aaf..73be795fe3bf 100644 --- a/arch/arm/mach-pxa/clock.h +++ b/arch/arm/mach-pxa/clock.h | |||
| @@ -1,3 +1,5 @@ | |||
| 1 | #include <linux/list.h> | ||
| 2 | |||
| 1 | struct clk; | 3 | struct clk; |
| 2 | 4 | ||
| 3 | struct clkops { | 5 | struct clkops { |
| @@ -86,3 +88,6 @@ extern void clk_pxa3xx_cken_disable(struct clk *); | |||
| 86 | #endif | 88 | #endif |
| 87 | 89 | ||
| 88 | void clks_register(struct clk *clks, size_t num); | 90 | void clks_register(struct clk *clks, size_t num); |
| 91 | int clk_add_alias(char *alias, struct device *alias_dev, char *id, | ||
| 92 | struct device *dev); | ||
| 93 | |||
diff --git a/arch/arm/mach-pxa/corgi.c b/arch/arm/mach-pxa/corgi.c index 123a950db466..e703a8d209e2 100644 --- a/arch/arm/mach-pxa/corgi.c +++ b/arch/arm/mach-pxa/corgi.c | |||
| @@ -38,6 +38,7 @@ | |||
| 38 | #include <mach/pxa-regs.h> | 38 | #include <mach/pxa-regs.h> |
| 39 | #include <mach/pxa2xx-regs.h> | 39 | #include <mach/pxa2xx-regs.h> |
| 40 | #include <mach/pxa2xx-gpio.h> | 40 | #include <mach/pxa2xx-gpio.h> |
| 41 | #include <mach/i2c.h> | ||
| 41 | #include <mach/irda.h> | 42 | #include <mach/irda.h> |
| 42 | #include <mach/mmc.h> | 43 | #include <mach/mmc.h> |
| 43 | #include <mach/udc.h> | 44 | #include <mach/udc.h> |
| @@ -532,6 +533,7 @@ static void __init corgi_init(void) | |||
| 532 | pxa_set_udc_info(&udc_info); | 533 | pxa_set_udc_info(&udc_info); |
| 533 | pxa_set_mci_info(&corgi_mci_platform_data); | 534 | pxa_set_mci_info(&corgi_mci_platform_data); |
| 534 | pxa_set_ficp_info(&corgi_ficp_platform_data); | 535 | pxa_set_ficp_info(&corgi_ficp_platform_data); |
| 536 | pxa_set_i2c_info(NULL); | ||
| 535 | 537 | ||
| 536 | platform_scoop_config = &corgi_pcmcia_config; | 538 | platform_scoop_config = &corgi_pcmcia_config; |
| 537 | 539 | ||
diff --git a/arch/arm/mach-pxa/eseries.c b/arch/arm/mach-pxa/eseries.c index 03942450885b..001a252bd514 100644 --- a/arch/arm/mach-pxa/eseries.c +++ b/arch/arm/mach-pxa/eseries.c | |||
| @@ -10,18 +10,78 @@ | |||
| 10 | * | 10 | * |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/kernel.h> | ||
| 13 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 14 | 15 | ||
| 15 | #include <asm/setup.h> | 16 | #include <asm/setup.h> |
| 16 | #include <asm/mach/arch.h> | 17 | #include <asm/mach/arch.h> |
| 17 | #include <mach/hardware.h> | ||
| 18 | #include <asm/mach-types.h> | 18 | #include <asm/mach-types.h> |
| 19 | 19 | ||
| 20 | #include <mach/mfp-pxa25x.h> | ||
| 21 | #include <mach/hardware.h> | ||
| 22 | |||
| 20 | #include "generic.h" | 23 | #include "generic.h" |
| 21 | 24 | ||
| 25 | static unsigned long e740_pin_config[] __initdata = { | ||
| 26 | /* Chip selects */ | ||
| 27 | GPIO15_nCS_1, /* CS1 - Flash */ | ||
| 28 | GPIO79_nCS_3, /* CS3 - IMAGEON */ | ||
| 29 | GPIO80_nCS_4, /* CS4 - TMIO */ | ||
| 30 | |||
| 31 | /* Clocks */ | ||
| 32 | GPIO12_32KHz, | ||
| 33 | |||
| 34 | /* BTUART */ | ||
| 35 | GPIO42_BTUART_RXD, | ||
| 36 | GPIO43_BTUART_TXD, | ||
| 37 | GPIO44_BTUART_CTS, | ||
| 38 | GPIO45_GPIO, /* Used by TMIO for #SUSPEND */ | ||
| 39 | |||
| 40 | /* PC Card */ | ||
| 41 | GPIO8_GPIO, /* CD0 */ | ||
| 42 | GPIO44_GPIO, /* CD1 */ | ||
| 43 | GPIO11_GPIO, /* IRQ0 */ | ||
| 44 | GPIO6_GPIO, /* IRQ1 */ | ||
| 45 | GPIO27_GPIO, /* RST0 */ | ||
| 46 | GPIO24_GPIO, /* RST1 */ | ||
| 47 | GPIO20_GPIO, /* PWR0 */ | ||
| 48 | GPIO23_GPIO, /* PWR1 */ | ||
| 49 | GPIO48_nPOE, | ||
| 50 | GPIO49_nPWE, | ||
| 51 | GPIO50_nPIOR, | ||
| 52 | GPIO51_nPIOW, | ||
| 53 | GPIO52_nPCE_1, | ||
| 54 | GPIO53_nPCE_2, | ||
| 55 | GPIO54_nPSKTSEL, | ||
| 56 | GPIO55_nPREG, | ||
| 57 | GPIO56_nPWAIT, | ||
| 58 | GPIO57_nIOIS16, | ||
| 59 | |||
| 60 | /* wakeup */ | ||
| 61 | GPIO0_GPIO | WAKEUP_ON_EDGE_RISE, | ||
| 62 | }; | ||
| 63 | |||
| 64 | static unsigned long e400_pin_config[] __initdata = { | ||
| 65 | /* Chip selects */ | ||
| 66 | GPIO15_nCS_1, /* CS1 - Flash */ | ||
| 67 | GPIO80_nCS_4, /* CS4 - TMIO */ | ||
| 68 | |||
| 69 | /* Clocks */ | ||
| 70 | GPIO12_32KHz, | ||
| 71 | |||
| 72 | /* BTUART */ | ||
| 73 | GPIO42_BTUART_RXD, | ||
| 74 | GPIO43_BTUART_TXD, | ||
| 75 | GPIO44_BTUART_CTS, | ||
| 76 | GPIO45_GPIO, /* Used by TMIO for #SUSPEND */ | ||
| 77 | |||
| 78 | /* wakeup */ | ||
| 79 | GPIO0_GPIO | WAKEUP_ON_EDGE_RISE, | ||
| 80 | }; | ||
| 81 | |||
| 22 | /* Only e800 has 128MB RAM */ | 82 | /* Only e800 has 128MB RAM */ |
| 23 | static void __init eseries_fixup(struct machine_desc *desc, | 83 | static void __init eseries_fixup(struct machine_desc *desc, |
| 24 | struct tag *tags, char **cmdline, struct meminfo *mi) | 84 | struct tag *tags, char **cmdline, struct meminfo *mi) |
| 25 | { | 85 | { |
| 26 | mi->nr_banks=1; | 86 | mi->nr_banks=1; |
| 27 | mi->bank[0].start = 0xa0000000; | 87 | mi->bank[0].start = 0xa0000000; |
| @@ -32,83 +92,95 @@ static void __init eseries_fixup(struct machine_desc *desc, | |||
| 32 | mi->bank[0].size = (64*1024*1024); | 92 | mi->bank[0].size = (64*1024*1024); |
| 33 | } | 93 | } |
| 34 | 94 | ||
| 95 | static void __init e740_init(void) | ||
| 96 | { | ||
| 97 | pxa2xx_mfp_config(ARRAY_AND_SIZE(e740_pin_config)); | ||
| 98 | } | ||
| 99 | |||
| 100 | static void __init e400_init(void) | ||
| 101 | { | ||
| 102 | pxa2xx_mfp_config(ARRAY_AND_SIZE(e400_pin_config)); | ||
| 103 | } | ||
| 104 | |||
| 35 | /* e-series machine definitions */ | 105 | /* e-series machine definitions */ |
| 36 | 106 | ||
| 37 | #ifdef CONFIG_MACH_E330 | 107 | #ifdef CONFIG_MACH_E330 |
| 38 | MACHINE_START(E330, "Toshiba e330") | 108 | MACHINE_START(E330, "Toshiba e330") |
| 39 | /* Maintainer: Ian Molton (spyro@f2s.com) */ | 109 | /* Maintainer: Ian Molton (spyro@f2s.com) */ |
| 40 | .phys_io = 0x40000000, | 110 | .phys_io = 0x40000000, |
| 41 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | 111 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, |
| 42 | .boot_params = 0xa0000100, | 112 | .boot_params = 0xa0000100, |
| 43 | .map_io = pxa_map_io, | 113 | .map_io = pxa_map_io, |
| 44 | .init_irq = pxa25x_init_irq, | 114 | .init_irq = pxa25x_init_irq, |
| 45 | .fixup = eseries_fixup, | 115 | .fixup = eseries_fixup, |
| 46 | .timer = &pxa_timer, | 116 | .timer = &pxa_timer, |
| 47 | MACHINE_END | 117 | MACHINE_END |
| 48 | #endif | 118 | #endif |
| 49 | 119 | ||
| 50 | #ifdef CONFIG_MACH_E350 | 120 | #ifdef CONFIG_MACH_E350 |
| 51 | MACHINE_START(E350, "Toshiba e350") | 121 | MACHINE_START(E350, "Toshiba e350") |
| 52 | /* Maintainer: Ian Molton (spyro@f2s.com) */ | 122 | /* Maintainer: Ian Molton (spyro@f2s.com) */ |
| 53 | .phys_io = 0x40000000, | 123 | .phys_io = 0x40000000, |
| 54 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | 124 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, |
| 55 | .boot_params = 0xa0000100, | 125 | .boot_params = 0xa0000100, |
| 56 | .map_io = pxa_map_io, | 126 | .map_io = pxa_map_io, |
| 57 | .init_irq = pxa25x_init_irq, | 127 | .init_irq = pxa25x_init_irq, |
| 58 | .fixup = eseries_fixup, | 128 | .fixup = eseries_fixup, |
| 59 | .timer = &pxa_timer, | 129 | .timer = &pxa_timer, |
| 60 | MACHINE_END | 130 | MACHINE_END |
| 61 | #endif | 131 | #endif |
| 62 | 132 | ||
| 63 | #ifdef CONFIG_MACH_E740 | 133 | #ifdef CONFIG_MACH_E740 |
| 64 | MACHINE_START(E740, "Toshiba e740") | 134 | MACHINE_START(E740, "Toshiba e740") |
| 65 | /* Maintainer: Ian Molton (spyro@f2s.com) */ | 135 | /* Maintainer: Ian Molton (spyro@f2s.com) */ |
| 66 | .phys_io = 0x40000000, | 136 | .phys_io = 0x40000000, |
| 67 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | 137 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, |
| 68 | .boot_params = 0xa0000100, | 138 | .boot_params = 0xa0000100, |
| 69 | .map_io = pxa_map_io, | 139 | .map_io = pxa_map_io, |
| 70 | .init_irq = pxa25x_init_irq, | 140 | .init_irq = pxa25x_init_irq, |
| 71 | .fixup = eseries_fixup, | 141 | .fixup = eseries_fixup, |
| 72 | .timer = &pxa_timer, | 142 | .init_machine = e740_init, |
| 143 | .timer = &pxa_timer, | ||
| 73 | MACHINE_END | 144 | MACHINE_END |
| 74 | #endif | 145 | #endif |
| 75 | 146 | ||
| 76 | #ifdef CONFIG_MACH_E750 | 147 | #ifdef CONFIG_MACH_E750 |
| 77 | MACHINE_START(E750, "Toshiba e750") | 148 | MACHINE_START(E750, "Toshiba e750") |
| 78 | /* Maintainer: Ian Molton (spyro@f2s.com) */ | 149 | /* Maintainer: Ian Molton (spyro@f2s.com) */ |
| 79 | .phys_io = 0x40000000, | 150 | .phys_io = 0x40000000, |
| 80 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | 151 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, |
| 81 | .boot_params = 0xa0000100, | 152 | .boot_params = 0xa0000100, |
| 82 | .map_io = pxa_map_io, | 153 | .map_io = pxa_map_io, |
| 83 | .init_irq = pxa25x_init_irq, | 154 | .init_irq = pxa25x_init_irq, |
| 84 | .fixup = eseries_fixup, | 155 | .fixup = eseries_fixup, |
| 85 | .timer = &pxa_timer, | 156 | .timer = &pxa_timer, |
| 86 | MACHINE_END | 157 | MACHINE_END |
| 87 | #endif | 158 | #endif |
| 88 | 159 | ||
| 89 | #ifdef CONFIG_MACH_E400 | 160 | #ifdef CONFIG_MACH_E400 |
| 90 | MACHINE_START(E400, "Toshiba e400") | 161 | MACHINE_START(E400, "Toshiba e400") |
| 91 | /* Maintainer: Ian Molton (spyro@f2s.com) */ | 162 | /* Maintainer: Ian Molton (spyro@f2s.com) */ |
| 92 | .phys_io = 0x40000000, | 163 | .phys_io = 0x40000000, |
| 93 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | 164 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, |
| 94 | .boot_params = 0xa0000100, | 165 | .boot_params = 0xa0000100, |
| 95 | .map_io = pxa_map_io, | 166 | .map_io = pxa_map_io, |
| 96 | .init_irq = pxa25x_init_irq, | 167 | .init_irq = pxa25x_init_irq, |
| 97 | .fixup = eseries_fixup, | 168 | .fixup = eseries_fixup, |
| 98 | .timer = &pxa_timer, | 169 | .init_machine = e400_init, |
| 170 | .timer = &pxa_timer, | ||
| 99 | MACHINE_END | 171 | MACHINE_END |
| 100 | #endif | 172 | #endif |
| 101 | 173 | ||
| 102 | #ifdef CONFIG_MACH_E800 | 174 | #ifdef CONFIG_MACH_E800 |
| 103 | MACHINE_START(E800, "Toshiba e800") | 175 | MACHINE_START(E800, "Toshiba e800") |
| 104 | /* Maintainer: Ian Molton (spyro@f2s.com) */ | 176 | /* Maintainer: Ian Molton (spyro@f2s.com) */ |
| 105 | .phys_io = 0x40000000, | 177 | .phys_io = 0x40000000, |
| 106 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | 178 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, |
| 107 | .boot_params = 0xa0000100, | 179 | .boot_params = 0xa0000100, |
| 108 | .map_io = pxa_map_io, | 180 | .map_io = pxa_map_io, |
| 109 | .init_irq = pxa25x_init_irq, | 181 | .init_irq = pxa25x_init_irq, |
| 110 | .fixup = eseries_fixup, | 182 | .fixup = eseries_fixup, |
| 111 | .timer = &pxa_timer, | 183 | .timer = &pxa_timer, |
| 112 | MACHINE_END | 184 | MACHINE_END |
| 113 | #endif | 185 | #endif |
| 114 | 186 | ||
diff --git a/arch/arm/mach-pxa/include/mach/irqs.h b/arch/arm/mach-pxa/include/mach/irqs.h index 32772bc6925c..108b5db9b2af 100644 --- a/arch/arm/mach-pxa/include/mach/irqs.h +++ b/arch/arm/mach-pxa/include/mach/irqs.h | |||
| @@ -183,6 +183,7 @@ | |||
| 183 | defined(CONFIG_MACH_TOSA) || \ | 183 | defined(CONFIG_MACH_TOSA) || \ |
| 184 | defined(CONFIG_MACH_MAINSTONE) || \ | 184 | defined(CONFIG_MACH_MAINSTONE) || \ |
| 185 | defined(CONFIG_MACH_PCM027) || \ | 185 | defined(CONFIG_MACH_PCM027) || \ |
| 186 | defined(CONFIG_ARCH_PXA_ESERIES) || \ | ||
| 186 | defined(CONFIG_MACH_MAGICIAN) | 187 | defined(CONFIG_MACH_MAGICIAN) |
| 187 | #define NR_IRQS (IRQ_BOARD_END) | 188 | #define NR_IRQS (IRQ_BOARD_END) |
| 188 | #elif defined(CONFIG_MACH_ZYLONITE) | 189 | #elif defined(CONFIG_MACH_ZYLONITE) |
diff --git a/arch/arm/mach-pxa/include/mach/mtd-xip.h b/arch/arm/mach-pxa/include/mach/mtd-xip.h index 351f32f13ce4..4d452fcb1508 100644 --- a/arch/arm/mach-pxa/include/mach/mtd-xip.h +++ b/arch/arm/mach-pxa/include/mach/mtd-xip.h | |||
| @@ -10,8 +10,6 @@ | |||
| 10 | * This program is free software; you can redistribute it and/or modify | 10 | * This program is free software; you can redistribute it and/or modify |
| 11 | * it under the terms of the GNU General Public License version 2 as | 11 | * it under the terms of the GNU General Public License version 2 as |
| 12 | * published by the Free Software Foundation. | 12 | * published by the Free Software Foundation. |
| 13 | * | ||
| 14 | * $Id: xip.h,v 1.2 2004/12/01 15:49:10 nico Exp $ | ||
| 15 | */ | 13 | */ |
| 16 | 14 | ||
| 17 | #ifndef __ARCH_PXA_MTD_XIP_H__ | 15 | #ifndef __ARCH_PXA_MTD_XIP_H__ |
diff --git a/arch/arm/mach-pxa/include/mach/poodle.h b/arch/arm/mach-pxa/include/mach/poodle.h index 8956afe8195e..67debc47e8c6 100644 --- a/arch/arm/mach-pxa/include/mach/poodle.h +++ b/arch/arm/mach-pxa/include/mach/poodle.h | |||
| @@ -70,6 +70,12 @@ | |||
| 70 | #define POODLE_SCOOP_IO_DIR ( POODLE_SCOOP_VPEN | POODLE_SCOOP_HS_OUT ) | 70 | #define POODLE_SCOOP_IO_DIR ( POODLE_SCOOP_VPEN | POODLE_SCOOP_HS_OUT ) |
| 71 | #define POODLE_SCOOP_IO_OUT ( 0 ) | 71 | #define POODLE_SCOOP_IO_OUT ( 0 ) |
| 72 | 72 | ||
| 73 | #define POODLE_LOCOMO_GPIO_AMP_ON LOCOMO_GPIO(8) | ||
| 74 | #define POODLE_LOCOMO_GPIO_MUTE_L LOCOMO_GPIO(10) | ||
| 75 | #define POODLE_LOCOMO_GPIO_MUTE_R LOCOMO_GPIO(11) | ||
| 76 | #define POODLE_LOCOMO_GPIO_232VCC_ON LOCOMO_GPIO(12) | ||
| 77 | #define POODLE_LOCOMO_GPIO_JK_B LOCOMO_GPIO(13) | ||
| 78 | |||
| 73 | extern struct platform_device poodle_locomo_device; | 79 | extern struct platform_device poodle_locomo_device; |
| 74 | 80 | ||
| 75 | #endif /* __ASM_ARCH_POODLE_H */ | 81 | #endif /* __ASM_ARCH_POODLE_H */ |
diff --git a/arch/arm/mach-pxa/include/mach/pxafb.h b/arch/arm/mach-pxa/include/mach/pxafb.h index 65447549616f..8e591118371e 100644 --- a/arch/arm/mach-pxa/include/mach/pxafb.h +++ b/arch/arm/mach-pxa/include/mach/pxafb.h | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | * bits 10-17 : for AC Bias Pin Frequency | 28 | * bits 10-17 : for AC Bias Pin Frequency |
| 29 | * bit 18 : for output enable polarity | 29 | * bit 18 : for output enable polarity |
| 30 | * bit 19 : for pixel clock edge | 30 | * bit 19 : for pixel clock edge |
| 31 | * bit 20 : for output pixel format when base is RGBT16 | ||
| 31 | */ | 32 | */ |
| 32 | #define LCD_CONN_TYPE(_x) ((_x) & 0x0f) | 33 | #define LCD_CONN_TYPE(_x) ((_x) & 0x0f) |
| 33 | #define LCD_CONN_WIDTH(_x) (((_x) >> 4) & 0x1f) | 34 | #define LCD_CONN_WIDTH(_x) (((_x) >> 4) & 0x1f) |
| @@ -53,10 +54,11 @@ | |||
| 53 | #define LCD_SMART_PANEL_18BPP ((18 << 4) | LCD_TYPE_SMART_PANEL) | 54 | #define LCD_SMART_PANEL_18BPP ((18 << 4) | LCD_TYPE_SMART_PANEL) |
| 54 | 55 | ||
| 55 | #define LCD_AC_BIAS_FREQ(x) (((x) & 0xff) << 10) | 56 | #define LCD_AC_BIAS_FREQ(x) (((x) & 0xff) << 10) |
| 56 | #define LCD_BIAS_ACTIVE_HIGH (0 << 17) | 57 | #define LCD_BIAS_ACTIVE_HIGH (0 << 18) |
| 57 | #define LCD_BIAS_ACTIVE_LOW (1 << 17) | 58 | #define LCD_BIAS_ACTIVE_LOW (1 << 18) |
| 58 | #define LCD_PCLK_EDGE_RISE (0 << 18) | 59 | #define LCD_PCLK_EDGE_RISE (0 << 19) |
| 59 | #define LCD_PCLK_EDGE_FALL (1 << 18) | 60 | #define LCD_PCLK_EDGE_FALL (1 << 19) |
| 61 | #define LCD_ALTERNATE_MAPPING (1 << 20) | ||
| 60 | 62 | ||
| 61 | /* | 63 | /* |
| 62 | * This structure describes the machine which we are running on. | 64 | * This structure describes the machine which we are running on. |
diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c index bb9e09208b9f..4ffdff2d9ff1 100644 --- a/arch/arm/mach-pxa/lubbock.c +++ b/arch/arm/mach-pxa/lubbock.c | |||
| @@ -52,6 +52,7 @@ | |||
| 52 | #include <mach/mmc.h> | 52 | #include <mach/mmc.h> |
| 53 | 53 | ||
| 54 | #include "generic.h" | 54 | #include "generic.h" |
| 55 | #include "clock.h" | ||
| 55 | #include "devices.h" | 56 | #include "devices.h" |
| 56 | 57 | ||
| 57 | static unsigned long lubbock_pin_config[] __initdata = { | 58 | static unsigned long lubbock_pin_config[] __initdata = { |
| @@ -485,6 +486,7 @@ static void __init lubbock_init(void) | |||
| 485 | 486 | ||
| 486 | pxa2xx_mfp_config(ARRAY_AND_SIZE(lubbock_pin_config)); | 487 | pxa2xx_mfp_config(ARRAY_AND_SIZE(lubbock_pin_config)); |
| 487 | 488 | ||
| 489 | clk_add_alias("SA1111_CLK", NULL, "GPIO11_CLK", NULL); | ||
| 488 | pxa_set_udc_info(&udc_info); | 490 | pxa_set_udc_info(&udc_info); |
| 489 | set_pxa_fb_info(&sharp_lm8v31); | 491 | set_pxa_fb_info(&sharp_lm8v31); |
| 490 | pxa_set_mci_info(&lubbock_mci_platform_data); | 492 | pxa_set_mci_info(&lubbock_mci_platform_data); |
diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c index 055ec63d768c..3f5f484549b3 100644 --- a/arch/arm/mach-pxa/poodle.c +++ b/arch/arm/mach-pxa/poodle.c | |||
| @@ -36,6 +36,7 @@ | |||
| 36 | #include <mach/pxa2xx-gpio.h> | 36 | #include <mach/pxa2xx-gpio.h> |
| 37 | #include <mach/mmc.h> | 37 | #include <mach/mmc.h> |
| 38 | #include <mach/udc.h> | 38 | #include <mach/udc.h> |
| 39 | #include <mach/i2c.h> | ||
| 39 | #include <mach/irda.h> | 40 | #include <mach/irda.h> |
| 40 | #include <mach/poodle.h> | 41 | #include <mach/poodle.h> |
| 41 | #include <mach/pxafb.h> | 42 | #include <mach/pxafb.h> |
| @@ -387,6 +388,7 @@ static void __init poodle_init(void) | |||
| 387 | pxa_set_udc_info(&udc_info); | 388 | pxa_set_udc_info(&udc_info); |
| 388 | pxa_set_mci_info(&poodle_mci_platform_data); | 389 | pxa_set_mci_info(&poodle_mci_platform_data); |
| 389 | pxa_set_ficp_info(&poodle_ficp_platform_data); | 390 | pxa_set_ficp_info(&poodle_ficp_platform_data); |
| 391 | pxa_set_i2c_info(NULL); | ||
| 390 | 392 | ||
| 391 | platform_scoop_config = &poodle_pcmcia_config; | 393 | platform_scoop_config = &poodle_pcmcia_config; |
| 392 | 394 | ||
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c index 9e5d8a8c6424..305452b56e91 100644 --- a/arch/arm/mach-pxa/pxa25x.c +++ b/arch/arm/mach-pxa/pxa25x.c | |||
| @@ -166,8 +166,7 @@ static struct clk pxa25x_hwuart_clk = | |||
| 166 | ; | 166 | ; |
| 167 | 167 | ||
| 168 | /* | 168 | /* |
| 169 | * PXA 2xx clock declarations. Order is important (see aliases below) | 169 | * PXA 2xx clock declarations. |
| 170 | * Please be careful not to disrupt the ordering. | ||
| 171 | */ | 170 | */ |
| 172 | static struct clk pxa25x_clks[] = { | 171 | static struct clk pxa25x_clks[] = { |
| 173 | INIT_CK("LCDCLK", LCD, &clk_pxa25x_lcd_ops, &pxa_device_fb.dev), | 172 | INIT_CK("LCDCLK", LCD, &clk_pxa25x_lcd_ops, &pxa_device_fb.dev), |
| @@ -194,11 +193,6 @@ static struct clk pxa25x_clks[] = { | |||
| 194 | INIT_CKEN("FICPCLK", FICP, 47923000, 0, NULL), | 193 | INIT_CKEN("FICPCLK", FICP, 47923000, 0, NULL), |
| 195 | }; | 194 | }; |
| 196 | 195 | ||
| 197 | static struct clk pxa2xx_clk_aliases[] = { | ||
| 198 | INIT_CKOTHER("GPIO7_CLK", &pxa25x_clks[4], NULL), | ||
| 199 | INIT_CKOTHER("SA1111_CLK", &pxa25x_clks[5], NULL), | ||
| 200 | }; | ||
| 201 | |||
| 202 | #ifdef CONFIG_PM | 196 | #ifdef CONFIG_PM |
| 203 | 197 | ||
| 204 | #define SAVE(x) sleep_save[SLEEP_SAVE_##x] = x | 198 | #define SAVE(x) sleep_save[SLEEP_SAVE_##x] = x |
| @@ -375,8 +369,6 @@ static int __init pxa25x_init(void) | |||
| 375 | if (cpu_is_pxa255()) | 369 | if (cpu_is_pxa255()) |
| 376 | ret = platform_device_register(&pxa_device_hwuart); | 370 | ret = platform_device_register(&pxa_device_hwuart); |
| 377 | 371 | ||
| 378 | clks_register(pxa2xx_clk_aliases, ARRAY_SIZE(pxa2xx_clk_aliases)); | ||
| 379 | |||
| 380 | return ret; | 372 | return ret; |
| 381 | } | 373 | } |
| 382 | 374 | ||
diff --git a/arch/arm/mach-pxa/pxa300.c b/arch/arm/mach-pxa/pxa300.c index 494fc1f032db..9adc7fc4618a 100644 --- a/arch/arm/mach-pxa/pxa300.c +++ b/arch/arm/mach-pxa/pxa300.c | |||
| @@ -90,7 +90,9 @@ static struct clk common_clks[] = { | |||
| 90 | }; | 90 | }; |
| 91 | 91 | ||
| 92 | static struct clk pxa310_clks[] = { | 92 | static struct clk pxa310_clks[] = { |
| 93 | #ifdef CONFIG_CPU_PXA310 | ||
| 93 | PXA3xx_CKEN("MMCCLK", MMC3, 19500000, 0, &pxa3xx_device_mci3.dev), | 94 | PXA3xx_CKEN("MMCCLK", MMC3, 19500000, 0, &pxa3xx_device_mci3.dev), |
| 95 | #endif | ||
| 94 | }; | 96 | }; |
| 95 | 97 | ||
| 96 | static int __init pxa300_init(void) | 98 | static int __init pxa300_init(void) |
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c index cd39005c98ff..b569f3b4cf3a 100644 --- a/arch/arm/mach-pxa/spitz.c +++ b/arch/arm/mach-pxa/spitz.c | |||
| @@ -40,6 +40,7 @@ | |||
| 40 | #include <mach/pxa2xx-gpio.h> | 40 | #include <mach/pxa2xx-gpio.h> |
| 41 | #include <mach/pxa27x-udc.h> | 41 | #include <mach/pxa27x-udc.h> |
| 42 | #include <mach/reset.h> | 42 | #include <mach/reset.h> |
| 43 | #include <mach/i2c.h> | ||
| 43 | #include <mach/irda.h> | 44 | #include <mach/irda.h> |
| 44 | #include <mach/mmc.h> | 45 | #include <mach/mmc.h> |
| 45 | #include <mach/ohci.h> | 46 | #include <mach/ohci.h> |
| @@ -574,6 +575,7 @@ static void __init common_init(void) | |||
| 574 | pxa_set_ficp_info(&spitz_ficp_platform_data); | 575 | pxa_set_ficp_info(&spitz_ficp_platform_data); |
| 575 | set_pxa_fb_parent(&spitzssp_device.dev); | 576 | set_pxa_fb_parent(&spitzssp_device.dev); |
| 576 | set_pxa_fb_info(&spitz_pxafb_info); | 577 | set_pxa_fb_info(&spitz_pxafb_info); |
| 578 | pxa_set_i2c_info(NULL); | ||
| 577 | } | 579 | } |
| 578 | 580 | ||
| 579 | #if defined(CONFIG_MACH_SPITZ) || defined(CONFIG_MACH_BORZOI) | 581 | #if defined(CONFIG_MACH_SPITZ) || defined(CONFIG_MACH_BORZOI) |
diff --git a/arch/arm/mach-s3c2410/include/mach/regs-clock.h b/arch/arm/mach-s3c2410/include/mach/regs-clock.h index d583688458a4..b3f90aa78076 100644 --- a/arch/arm/mach-s3c2410/include/mach/regs-clock.h +++ b/arch/arm/mach-s3c2410/include/mach/regs-clock.h | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #ifndef __ASM_ARM_REGS_CLOCK | 13 | #ifndef __ASM_ARM_REGS_CLOCK |
| 14 | #define __ASM_ARM_REGS_CLOCK "$Id: clock.h,v 1.4 2003/04/30 14:50:51 ben Exp $" | 14 | #define __ASM_ARM_REGS_CLOCK |
| 15 | 15 | ||
| 16 | #define S3C2410_CLKREG(x) ((x) + S3C24XX_VA_CLKPWR) | 16 | #define S3C2410_CLKREG(x) ((x) + S3C24XX_VA_CLKPWR) |
| 17 | 17 | ||
diff --git a/arch/arm/mach-s3c2410/include/mach/regs-gpio.h b/arch/arm/mach-s3c2410/include/mach/regs-gpio.h index 30bec027f5fa..528080ceac44 100644 --- a/arch/arm/mach-s3c2410/include/mach/regs-gpio.h +++ b/arch/arm/mach-s3c2410/include/mach/regs-gpio.h | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | 12 | ||
| 13 | 13 | ||
| 14 | #ifndef __ASM_ARCH_REGS_GPIO_H | 14 | #ifndef __ASM_ARCH_REGS_GPIO_H |
| 15 | #define __ASM_ARCH_REGS_GPIO_H "$Id: gpio.h,v 1.5 2003/05/19 12:51:08 ben Exp $" | 15 | #define __ASM_ARCH_REGS_GPIO_H |
| 16 | 16 | ||
| 17 | #define S3C2410_GPIONO(bank,offset) ((bank) + (offset)) | 17 | #define S3C2410_GPIONO(bank,offset) ((bank) + (offset)) |
| 18 | 18 | ||
diff --git a/arch/arm/mach-s3c2410/include/mach/regs-irq.h b/arch/arm/mach-s3c2410/include/mach/regs-irq.h index b057c06d167a..de86ee8812bd 100644 --- a/arch/arm/mach-s3c2410/include/mach/regs-irq.h +++ b/arch/arm/mach-s3c2410/include/mach/regs-irq.h | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | 10 | ||
| 11 | 11 | ||
| 12 | #ifndef ___ASM_ARCH_REGS_IRQ_H | 12 | #ifndef ___ASM_ARCH_REGS_IRQ_H |
| 13 | #define ___ASM_ARCH_REGS_IRQ_H "$Id: irq.h,v 1.3 2003/03/25 21:29:06 ben Exp $" | 13 | #define ___ASM_ARCH_REGS_IRQ_H |
| 14 | 14 | ||
| 15 | /* interrupt controller */ | 15 | /* interrupt controller */ |
| 16 | 16 | ||
diff --git a/arch/arm/mach-s3c2410/include/mach/regs-lcd.h b/arch/arm/mach-s3c2410/include/mach/regs-lcd.h index 893b8742f954..ee8f040aff5f 100644 --- a/arch/arm/mach-s3c2410/include/mach/regs-lcd.h +++ b/arch/arm/mach-s3c2410/include/mach/regs-lcd.h | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | 10 | ||
| 11 | 11 | ||
| 12 | #ifndef ___ASM_ARCH_REGS_LCD_H | 12 | #ifndef ___ASM_ARCH_REGS_LCD_H |
| 13 | #define ___ASM_ARCH_REGS_LCD_H "$Id: lcd.h,v 1.3 2003/06/26 13:25:06 ben Exp $" | 13 | #define ___ASM_ARCH_REGS_LCD_H |
| 14 | 14 | ||
| 15 | #define S3C2410_LCDREG(x) (x) | 15 | #define S3C2410_LCDREG(x) (x) |
| 16 | 16 | ||
diff --git a/arch/arm/mach-s3c2410/include/mach/regs-mem.h b/arch/arm/mach-s3c2410/include/mach/regs-mem.h index f9926abd5cde..57759804e2fa 100644 --- a/arch/arm/mach-s3c2410/include/mach/regs-mem.h +++ b/arch/arm/mach-s3c2410/include/mach/regs-mem.h | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #ifndef __ASM_ARM_MEMREGS_H | 13 | #ifndef __ASM_ARM_MEMREGS_H |
| 14 | #define __ASM_ARM_MEMREGS_H "$Id: regs.h,v 1.8 2003/05/01 15:55:41 ben Exp $" | 14 | #define __ASM_ARM_MEMREGS_H |
| 15 | 15 | ||
| 16 | #ifndef S3C2410_MEMREG | 16 | #ifndef S3C2410_MEMREG |
| 17 | #define S3C2410_MEMREG(x) (S3C24XX_VA_MEMCTRL + (x)) | 17 | #define S3C2410_MEMREG(x) (S3C24XX_VA_MEMCTRL + (x)) |
diff --git a/arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h b/arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h index 7dd458363a51..6026d091a2fe 100644 --- a/arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h +++ b/arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h | |||
| @@ -48,11 +48,11 @@ | |||
| 48 | #define S3C2443_CLKSRC_I2S_EPLLREF3 (3<<14) | 48 | #define S3C2443_CLKSRC_I2S_EPLLREF3 (3<<14) |
| 49 | #define S3C2443_CLKSRC_I2S_MASK (3<<14) | 49 | #define S3C2443_CLKSRC_I2S_MASK (3<<14) |
| 50 | 50 | ||
| 51 | #define S3C2443_CLKSRC_EPLLREF_XTAL (2<<8) | 51 | #define S3C2443_CLKSRC_EPLLREF_XTAL (2<<7) |
| 52 | #define S3C2443_CLKSRC_EPLLREF_EXTCLK (3<<8) | 52 | #define S3C2443_CLKSRC_EPLLREF_EXTCLK (3<<7) |
| 53 | #define S3C2443_CLKSRC_EPLLREF_MPLLREF (0<<8) | 53 | #define S3C2443_CLKSRC_EPLLREF_MPLLREF (0<<7) |
| 54 | #define S3C2443_CLKSRC_EPLLREF_MPLLREF2 (1<<8) | 54 | #define S3C2443_CLKSRC_EPLLREF_MPLLREF2 (1<<7) |
| 55 | #define S3C2443_CLKSRC_EPLLREF_MASK (3<<8) | 55 | #define S3C2443_CLKSRC_EPLLREF_MASK (3<<7) |
| 56 | 56 | ||
| 57 | #define S3C2443_CLKSRC_ESYSCLK_EPLL (1<<6) | 57 | #define S3C2443_CLKSRC_ESYSCLK_EPLL (1<<6) |
| 58 | #define S3C2443_CLKSRC_MSYSCLK_MPLL (1<<4) | 58 | #define S3C2443_CLKSRC_MSYSCLK_MPLL (1<<4) |
diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c index fb1e78e28e50..24c6334fac89 100644 --- a/arch/arm/mach-s3c2410/mach-bast.c +++ b/arch/arm/mach-s3c2410/mach-bast.c | |||
| @@ -562,7 +562,7 @@ static struct platform_device *bast_devices[] __initdata = { | |||
| 562 | &bast_sio, | 562 | &bast_sio, |
| 563 | }; | 563 | }; |
| 564 | 564 | ||
| 565 | static struct clk *bast_clocks[] = { | 565 | static struct clk *bast_clocks[] __initdata = { |
| 566 | &s3c24xx_dclk0, | 566 | &s3c24xx_dclk0, |
| 567 | &s3c24xx_dclk1, | 567 | &s3c24xx_dclk1, |
| 568 | &s3c24xx_clkout0, | 568 | &s3c24xx_clkout0, |
diff --git a/arch/arm/mach-s3c2410/mach-smdk2410.c b/arch/arm/mach-s3c2410/mach-smdk2410.c index c9040080727e..b88939d72282 100644 --- a/arch/arm/mach-s3c2410/mach-smdk2410.c +++ b/arch/arm/mach-s3c2410/mach-smdk2410.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * Copyright (C) 2004 by FS Forth-Systeme GmbH | 5 | * Copyright (C) 2004 by FS Forth-Systeme GmbH |
| 6 | * All rights reserved. | 6 | * All rights reserved. |
| 7 | * | 7 | * |
| 8 | * $Id: mach-smdk2410.c,v 1.1 2004/05/11 14:15:38 mpietrek Exp $ | ||
| 9 | * @Author: Jonas Dietsche | 8 | * @Author: Jonas Dietsche |
| 10 | * | 9 | * |
| 11 | * This program is free software; you can redistribute it and/or | 10 | * This program is free software; you can redistribute it and/or |
diff --git a/arch/arm/mach-s3c2410/mach-vr1000.c b/arch/arm/mach-s3c2410/mach-vr1000.c index 12cbca68f57d..fbc0213d5485 100644 --- a/arch/arm/mach-s3c2410/mach-vr1000.c +++ b/arch/arm/mach-s3c2410/mach-vr1000.c | |||
| @@ -344,7 +344,7 @@ static struct platform_device *vr1000_devices[] __initdata = { | |||
| 344 | &vr1000_led3, | 344 | &vr1000_led3, |
| 345 | }; | 345 | }; |
| 346 | 346 | ||
| 347 | static struct clk *vr1000_clocks[] = { | 347 | static struct clk *vr1000_clocks[] __initdata = { |
| 348 | &s3c24xx_dclk0, | 348 | &s3c24xx_dclk0, |
| 349 | &s3c24xx_dclk1, | 349 | &s3c24xx_dclk1, |
| 350 | &s3c24xx_clkout0, | 350 | &s3c24xx_clkout0, |
diff --git a/arch/arm/mach-s3c2410/nor-simtec.c b/arch/arm/mach-s3c2410/nor-simtec.c index b2ae237042a5..598d130633dc 100644 --- a/arch/arm/mach-s3c2410/nor-simtec.c +++ b/arch/arm/mach-s3c2410/nor-simtec.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <mach/bast-map.h> | 30 | #include <mach/bast-map.h> |
| 31 | #include <mach/bast-cpld.h> | 31 | #include <mach/bast-cpld.h> |
| 32 | 32 | ||
| 33 | #include "nor-simtec.h" | ||
| 33 | 34 | ||
| 34 | static void simtec_nor_vpp(struct map_info *map, int vpp) | 35 | static void simtec_nor_vpp(struct map_info *map, int vpp) |
| 35 | { | 36 | { |
| @@ -50,7 +51,7 @@ static void simtec_nor_vpp(struct map_info *map, int vpp) | |||
| 50 | local_irq_restore(flags); | 51 | local_irq_restore(flags); |
| 51 | } | 52 | } |
| 52 | 53 | ||
| 53 | struct physmap_flash_data simtec_nor_pdata = { | 54 | static struct physmap_flash_data simtec_nor_pdata = { |
| 54 | .width = 2, | 55 | .width = 2, |
| 55 | .set_vpp = simtec_nor_vpp, | 56 | .set_vpp = simtec_nor_vpp, |
| 56 | .nr_parts = 0, | 57 | .nr_parts = 0, |
diff --git a/arch/arm/mach-s3c2412/mach-jive.c b/arch/arm/mach-s3c2412/mach-jive.c index 30f613a79bfe..ad980a1690c2 100644 --- a/arch/arm/mach-s3c2412/mach-jive.c +++ b/arch/arm/mach-s3c2412/mach-jive.c | |||
| @@ -26,9 +26,6 @@ | |||
| 26 | 26 | ||
| 27 | #include <linux/spi/spi.h> | 27 | #include <linux/spi/spi.h> |
| 28 | 28 | ||
| 29 | #include <linux/mtd/mtd.h> | ||
| 30 | #include <linux/mtd/partitions.h> | ||
| 31 | |||
| 32 | #include <asm/mach/arch.h> | 29 | #include <asm/mach/arch.h> |
| 33 | #include <asm/mach/map.h> | 30 | #include <asm/mach/map.h> |
| 34 | #include <asm/mach/irq.h> | 31 | #include <asm/mach/irq.h> |
| @@ -398,7 +395,7 @@ static void jive_lcd_spi_chipselect(struct s3c2410_spigpio_info *spi, int cs) | |||
| 398 | } | 395 | } |
| 399 | 396 | ||
| 400 | static struct s3c2410_spigpio_info jive_lcd_spi = { | 397 | static struct s3c2410_spigpio_info jive_lcd_spi = { |
| 401 | .bus_num = 0, | 398 | .bus_num = 1, |
| 402 | .pin_clk = S3C2410_GPG8, | 399 | .pin_clk = S3C2410_GPG8, |
| 403 | .pin_mosi = S3C2410_GPB8, | 400 | .pin_mosi = S3C2410_GPB8, |
| 404 | .chip_select = jive_lcd_spi_chipselect, | 401 | .chip_select = jive_lcd_spi_chipselect, |
diff --git a/arch/arm/mach-s3c2440/mach-anubis.c b/arch/arm/mach-s3c2440/mach-anubis.c index 265c77dec9d7..441f4bc09472 100644 --- a/arch/arm/mach-s3c2440/mach-anubis.c +++ b/arch/arm/mach-s3c2440/mach-anubis.c | |||
| @@ -414,7 +414,7 @@ static struct platform_device *anubis_devices[] __initdata = { | |||
| 414 | &anubis_device_sm501, | 414 | &anubis_device_sm501, |
| 415 | }; | 415 | }; |
| 416 | 416 | ||
| 417 | static struct clk *anubis_clocks[] = { | 417 | static struct clk *anubis_clocks[] __initdata = { |
| 418 | &s3c24xx_dclk0, | 418 | &s3c24xx_dclk0, |
| 419 | &s3c24xx_dclk1, | 419 | &s3c24xx_dclk1, |
| 420 | &s3c24xx_clkout0, | 420 | &s3c24xx_clkout0, |
diff --git a/arch/arm/mach-s3c2440/mach-osiris.c b/arch/arm/mach-s3c2440/mach-osiris.c index d2ee0cd148c6..8b83f93b6102 100644 --- a/arch/arm/mach-s3c2440/mach-osiris.c +++ b/arch/arm/mach-s3c2440/mach-osiris.c | |||
| @@ -341,7 +341,7 @@ static struct platform_device *osiris_devices[] __initdata = { | |||
| 341 | &osiris_pcmcia, | 341 | &osiris_pcmcia, |
| 342 | }; | 342 | }; |
| 343 | 343 | ||
| 344 | static struct clk *osiris_clocks[] = { | 344 | static struct clk *osiris_clocks[] __initdata = { |
| 345 | &s3c24xx_dclk0, | 345 | &s3c24xx_dclk0, |
| 346 | &s3c24xx_dclk1, | 346 | &s3c24xx_dclk1, |
| 347 | &s3c24xx_clkout0, | 347 | &s3c24xx_clkout0, |
diff --git a/arch/arm/mach-sa1100/cpu-sa1110.c b/arch/arm/mach-sa1100/cpu-sa1110.c index 39d38c801736..029dbfbbafcf 100644 --- a/arch/arm/mach-sa1100/cpu-sa1110.c +++ b/arch/arm/mach-sa1100/cpu-sa1110.c | |||
| @@ -3,8 +3,6 @@ | |||
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2001 Russell King | 4 | * Copyright (C) 2001 Russell King |
| 5 | * | 5 | * |
| 6 | * $Id: cpu-sa1110.c,v 1.9 2002/07/06 16:53:18 rmk Exp $ | ||
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or modify | 6 | * This program is free software; you can redistribute it and/or modify |
| 9 | * it under the terms of the GNU General Public License version 2 as | 7 | * it under the terms of the GNU General Public License version 2 as |
| 10 | * published by the Free Software Foundation. | 8 | * published by the Free Software Foundation. |
diff --git a/arch/arm/mach-sa1100/include/mach/mtd-xip.h b/arch/arm/mach-sa1100/include/mach/mtd-xip.h index 80cfdac2b944..eaa09e86ad16 100644 --- a/arch/arm/mach-sa1100/include/mach/mtd-xip.h +++ b/arch/arm/mach-sa1100/include/mach/mtd-xip.h | |||
| @@ -10,8 +10,6 @@ | |||
| 10 | * This program is free software; you can redistribute it and/or modify | 10 | * This program is free software; you can redistribute it and/or modify |
| 11 | * it under the terms of the GNU General Public License version 2 as | 11 | * it under the terms of the GNU General Public License version 2 as |
| 12 | * published by the Free Software Foundation. | 12 | * published by the Free Software Foundation. |
| 13 | * | ||
| 14 | * $Id: xip.h,v 1.2 2004/12/01 15:49:10 nico Exp $ | ||
| 15 | */ | 13 | */ |
| 16 | 14 | ||
| 17 | #ifndef __ARCH_SA1100_MTD_XIP_H__ | 15 | #ifndef __ARCH_SA1100_MTD_XIP_H__ |
diff --git a/arch/arm/mm/cache-feroceon-l2.c b/arch/arm/mm/cache-feroceon-l2.c index 20eec4ba173f..7b5a25d81576 100644 --- a/arch/arm/mm/cache-feroceon-l2.c +++ b/arch/arm/mm/cache-feroceon-l2.c | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | 14 | ||
| 15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 16 | #include <asm/cacheflush.h> | 16 | #include <asm/cacheflush.h> |
| 17 | #include <asm/plat-orion/cache-feroceon-l2.h> | 17 | #include <plat/cache-feroceon-l2.h> |
| 18 | 18 | ||
| 19 | 19 | ||
| 20 | /* | 20 | /* |
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index 2d6d682c206a..25d9a11eb617 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c | |||
| @@ -568,6 +568,55 @@ void __init iotable_init(struct map_desc *io_desc, int nr) | |||
| 568 | create_mapping(io_desc + i); | 568 | create_mapping(io_desc + i); |
| 569 | } | 569 | } |
| 570 | 570 | ||
| 571 | static int __init check_membank_valid(struct membank *mb) | ||
| 572 | { | ||
| 573 | /* | ||
| 574 | * Check whether this memory region has non-zero size. | ||
| 575 | */ | ||
| 576 | if (mb->size == 0) | ||
| 577 | return 0; | ||
| 578 | |||
| 579 | /* | ||
| 580 | * Check whether this memory region would entirely overlap | ||
| 581 | * the vmalloc area. | ||
| 582 | */ | ||
| 583 | if (phys_to_virt(mb->start) >= VMALLOC_MIN) { | ||
| 584 | printk(KERN_NOTICE "Ignoring RAM at %.8lx-%.8lx " | ||
| 585 | "(vmalloc region overlap).\n", | ||
| 586 | mb->start, mb->start + mb->size - 1); | ||
| 587 | return 0; | ||
| 588 | } | ||
| 589 | |||
| 590 | /* | ||
| 591 | * Check whether this memory region would partially overlap | ||
| 592 | * the vmalloc area. | ||
| 593 | */ | ||
| 594 | if (phys_to_virt(mb->start + mb->size) < phys_to_virt(mb->start) || | ||
| 595 | phys_to_virt(mb->start + mb->size) > VMALLOC_MIN) { | ||
| 596 | unsigned long newsize = VMALLOC_MIN - phys_to_virt(mb->start); | ||
| 597 | |||
| 598 | printk(KERN_NOTICE "Truncating RAM at %.8lx-%.8lx " | ||
| 599 | "to -%.8lx (vmalloc region overlap).\n", | ||
| 600 | mb->start, mb->start + mb->size - 1, | ||
| 601 | mb->start + newsize - 1); | ||
| 602 | mb->size = newsize; | ||
| 603 | } | ||
| 604 | |||
| 605 | return 1; | ||
| 606 | } | ||
| 607 | |||
| 608 | static void __init sanity_check_meminfo(struct meminfo *mi) | ||
| 609 | { | ||
| 610 | int i; | ||
| 611 | int j; | ||
| 612 | |||
| 613 | for (i = 0, j = 0; i < mi->nr_banks; i++) { | ||
| 614 | if (check_membank_valid(&mi->bank[i])) | ||
| 615 | mi->bank[j++] = mi->bank[i]; | ||
| 616 | } | ||
| 617 | mi->nr_banks = j; | ||
| 618 | } | ||
| 619 | |||
| 571 | static inline void prepare_page_table(struct meminfo *mi) | 620 | static inline void prepare_page_table(struct meminfo *mi) |
| 572 | { | 621 | { |
| 573 | unsigned long addr; | 622 | unsigned long addr; |
| @@ -753,6 +802,7 @@ void __init paging_init(struct meminfo *mi, struct machine_desc *mdesc) | |||
| 753 | void *zero_page; | 802 | void *zero_page; |
| 754 | 803 | ||
| 755 | build_mem_type_table(); | 804 | build_mem_type_table(); |
| 805 | sanity_check_meminfo(mi); | ||
| 756 | prepare_page_table(mi); | 806 | prepare_page_table(mi); |
| 757 | bootmem_init(mi); | 807 | bootmem_init(mi); |
| 758 | devicemaps_init(mdesc); | 808 | devicemaps_init(mdesc); |
diff --git a/arch/arm/mm/proc-arm940.S b/arch/arm/mm/proc-arm940.S index 1a3d63df8e90..551244d5ca19 100644 --- a/arch/arm/mm/proc-arm940.S +++ b/arch/arm/mm/proc-arm940.S | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <asm/pgtable-hwdef.h> | 15 | #include <asm/pgtable-hwdef.h> |
| 16 | #include <asm/pgtable.h> | 16 | #include <asm/pgtable.h> |
| 17 | #include <asm/ptrace.h> | 17 | #include <asm/ptrace.h> |
| 18 | #include "proc-macros.S" | ||
| 18 | 19 | ||
| 19 | /* ARM940T has a 4KB DCache comprising 256 lines of 4 words */ | 20 | /* ARM940T has a 4KB DCache comprising 256 lines of 4 words */ |
| 20 | #define CACHE_DLINESIZE 16 | 21 | #define CACHE_DLINESIZE 16 |
diff --git a/arch/arm/mm/proc-arm946.S b/arch/arm/mm/proc-arm946.S index 82d579ac9b98..6168c6160dee 100644 --- a/arch/arm/mm/proc-arm946.S +++ b/arch/arm/mm/proc-arm946.S | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <asm/pgtable-hwdef.h> | 17 | #include <asm/pgtable-hwdef.h> |
| 18 | #include <asm/pgtable.h> | 18 | #include <asm/pgtable.h> |
| 19 | #include <asm/ptrace.h> | 19 | #include <asm/ptrace.h> |
| 20 | #include "proc-macros.S" | ||
| 20 | 21 | ||
| 21 | /* | 22 | /* |
| 22 | * ARM946E-S is synthesizable to have 0KB to 1MB sized D-Cache, | 23 | * ARM946E-S is synthesizable to have 0KB to 1MB sized D-Cache, |
diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c index 23a070599993..197974defbe4 100644 --- a/arch/arm/plat-omap/clock.c +++ b/arch/arm/plat-omap/clock.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * it under the terms of the GNU General Public License version 2 as | 10 | * it under the terms of the GNU General Public License version 2 as |
| 11 | * published by the Free Software Foundation. | 11 | * published by the Free Software Foundation. |
| 12 | */ | 12 | */ |
| 13 | #include <linux/version.h> | ||
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
diff --git a/arch/arm/plat-omap/include/mach/memory.h b/arch/arm/plat-omap/include/mach/memory.h index 037486c5f4a4..a325caf80d04 100644 --- a/arch/arm/plat-omap/include/mach/memory.h +++ b/arch/arm/plat-omap/include/mach/memory.h | |||
| @@ -76,13 +76,14 @@ | |||
| 76 | (dma_addr_t)virt_to_lbus(page_address(page)) : \ | 76 | (dma_addr_t)virt_to_lbus(page_address(page)) : \ |
| 77 | (dma_addr_t)__virt_to_bus(page_address(page));}) | 77 | (dma_addr_t)__virt_to_bus(page_address(page));}) |
| 78 | 78 | ||
| 79 | #define __arch_dma_to_virt(dev, addr) ({is_lbus_device(dev) ? \ | 79 | #define __arch_dma_to_virt(dev, addr) ({ (void *) (is_lbus_device(dev) ? \ |
| 80 | lbus_to_virt(addr) : \ | 80 | lbus_to_virt(addr) : \ |
| 81 | __bus_to_virt(addr);}) | 81 | __bus_to_virt(addr)); }) |
| 82 | 82 | ||
| 83 | #define __arch_virt_to_dma(dev, addr) ({is_lbus_device(dev) ? \ | 83 | #define __arch_virt_to_dma(dev, addr) ({ unsigned long __addr = (unsigned long)(addr); \ |
| 84 | virt_to_lbus(addr) : \ | 84 | (dma_addr_t) (is_lbus_device(dev) ? \ |
| 85 | __virt_to_bus(addr);}) | 85 | virt_to_lbus(__addr) : \ |
| 86 | __virt_to_bus(__addr)); }) | ||
| 86 | 87 | ||
| 87 | #endif /* CONFIG_ARCH_OMAP15XX */ | 88 | #endif /* CONFIG_ARCH_OMAP15XX */ |
| 88 | 89 | ||
diff --git a/include/asm-arm/plat-orion/cache-feroceon-l2.h b/arch/arm/plat-orion/include/plat/cache-feroceon-l2.h index ba4e016d3ec0..06f982d55697 100644 --- a/include/asm-arm/plat-orion/cache-feroceon-l2.h +++ b/arch/arm/plat-orion/include/plat/cache-feroceon-l2.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * include/asm-arm/plat-orion/cache-feroceon-l2.h | 2 | * arch/arm/plat-orion/include/plat/cache-feroceon-l2.h |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2008 Marvell Semiconductor | 4 | * Copyright (C) 2008 Marvell Semiconductor |
| 5 | * | 5 | * |
diff --git a/include/asm-arm/plat-orion/ehci-orion.h b/arch/arm/plat-orion/include/plat/ehci-orion.h index 785705651e24..64343051095a 100644 --- a/include/asm-arm/plat-orion/ehci-orion.h +++ b/arch/arm/plat-orion/include/plat/ehci-orion.h | |||
| @@ -1,13 +1,13 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * include/asm-arm/plat-orion/ehci-orion.h | 2 | * arch/arm/plat-orion/include/plat/ehci-orion.h |
| 3 | * | 3 | * |
| 4 | * This file is licensed under the terms of the GNU General Public | 4 | * This file is licensed under the terms of the GNU General Public |
| 5 | * License version 2. This program is licensed "as is" without any | 5 | * License version 2. This program is licensed "as is" without any |
| 6 | * warranty of any kind, whether express or implied. | 6 | * warranty of any kind, whether express or implied. |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #ifndef __ASM_PLAT_ORION_EHCI_ORION_H | 9 | #ifndef __PLAT_EHCI_ORION_H |
| 10 | #define __ASM_PLAT_ORION_EHCI_ORION_H | 10 | #define __PLAT_EHCI_ORION_H |
| 11 | 11 | ||
| 12 | #include <linux/mbus.h> | 12 | #include <linux/mbus.h> |
| 13 | 13 | ||
diff --git a/include/asm-arm/plat-orion/irq.h b/arch/arm/plat-orion/include/plat/irq.h index 94aeed919d5b..f05eeab94968 100644 --- a/include/asm-arm/plat-orion/irq.h +++ b/arch/arm/plat-orion/include/plat/irq.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * include/asm-arm/plat-orion/irq.h | 2 | * arch/arm/plat-orion/include/plat/irq.h |
| 3 | * | 3 | * |
| 4 | * Marvell Orion SoC IRQ handling. | 4 | * Marvell Orion SoC IRQ handling. |
| 5 | * | 5 | * |
| @@ -8,8 +8,8 @@ | |||
| 8 | * warranty of any kind, whether express or implied. | 8 | * warranty of any kind, whether express or implied. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #ifndef __ASM_PLAT_ORION_IRQ_H | 11 | #ifndef __PLAT_IRQ_H |
| 12 | #define __ASM_PLAT_ORION_IRQ_H | 12 | #define __PLAT_IRQ_H |
| 13 | 13 | ||
| 14 | void orion_irq_init(unsigned int irq_start, void __iomem *maskaddr); | 14 | void orion_irq_init(unsigned int irq_start, void __iomem *maskaddr); |
| 15 | 15 | ||
diff --git a/include/asm-arm/plat-orion/mv_xor.h b/arch/arm/plat-orion/include/plat/mv_xor.h index c349e8ff5cc0..bd5f3bdb4ae3 100644 --- a/include/asm-arm/plat-orion/mv_xor.h +++ b/arch/arm/plat-orion/include/plat/mv_xor.h | |||
| @@ -1,9 +1,11 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * arch/arm/plat-orion/include/plat/mv_xor.h | ||
| 3 | * | ||
| 2 | * Marvell XOR platform device data definition file. | 4 | * Marvell XOR platform device data definition file. |
| 3 | */ | 5 | */ |
| 4 | 6 | ||
| 5 | #ifndef __ASM_PLAT_ORION_MV_XOR_H | 7 | #ifndef __PLAT_MV_XOR_H |
| 6 | #define __ASM_PLAT_ORION_MV_XOR_H | 8 | #define __PLAT_MV_XOR_H |
| 7 | 9 | ||
| 8 | #include <linux/dmaengine.h> | 10 | #include <linux/dmaengine.h> |
| 9 | #include <linux/mbus.h> | 11 | #include <linux/mbus.h> |
diff --git a/include/asm-arm/plat-orion/orion_nand.h b/arch/arm/plat-orion/include/plat/orion_nand.h index ad4ce94c1998..d6a4cfa37785 100644 --- a/include/asm-arm/plat-orion/orion_nand.h +++ b/arch/arm/plat-orion/include/plat/orion_nand.h | |||
| @@ -1,13 +1,13 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * include/asm-arm/plat-orion/orion_nand.h | 2 | * arch/arm/plat-orion/include/plat/orion_nand.h |
| 3 | * | 3 | * |
| 4 | * This file is licensed under the terms of the GNU General Public | 4 | * This file is licensed under the terms of the GNU General Public |
| 5 | * License version 2. This program is licensed "as is" without any | 5 | * License version 2. This program is licensed "as is" without any |
| 6 | * warranty of any kind, whether express or implied. | 6 | * warranty of any kind, whether express or implied. |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #ifndef __ASM_PLAT_ORION_ORION_NAND_H | 9 | #ifndef __PLAT_ORION_NAND_H |
| 10 | #define __ASM_PLAT_ORION_ORION_NAND_H | 10 | #define __PLAT_ORION_NAND_H |
| 11 | 11 | ||
| 12 | /* | 12 | /* |
| 13 | * Device bus NAND private data | 13 | * Device bus NAND private data |
diff --git a/include/asm-arm/plat-orion/pcie.h b/arch/arm/plat-orion/include/plat/pcie.h index e61b7bd97af5..3ebfef72b4e7 100644 --- a/include/asm-arm/plat-orion/pcie.h +++ b/arch/arm/plat-orion/include/plat/pcie.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * include/asm-arm/plat-orion/pcie.h | 2 | * arch/arm/plat-orion/include/plat/pcie.h |
| 3 | * | 3 | * |
| 4 | * Marvell Orion SoC PCIe handling. | 4 | * Marvell Orion SoC PCIe handling. |
| 5 | * | 5 | * |
| @@ -8,8 +8,8 @@ | |||
| 8 | * warranty of any kind, whether express or implied. | 8 | * warranty of any kind, whether express or implied. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #ifndef __ASM_PLAT_ORION_PCIE_H | 11 | #ifndef __PLAT_PCIE_H |
| 12 | #define __ASM_PLAT_ORION_PCIE_H | 12 | #define __PLAT_PCIE_H |
| 13 | 13 | ||
| 14 | u32 orion_pcie_dev_id(void __iomem *base); | 14 | u32 orion_pcie_dev_id(void __iomem *base); |
| 15 | u32 orion_pcie_rev(void __iomem *base); | 15 | u32 orion_pcie_rev(void __iomem *base); |
diff --git a/include/asm-arm/plat-orion/time.h b/arch/arm/plat-orion/include/plat/time.h index 0e85cc8f44d9..c06ca35f3613 100644 --- a/include/asm-arm/plat-orion/time.h +++ b/arch/arm/plat-orion/include/plat/time.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * include/asm-arm/plat-orion/time.h | 2 | * arch/arm/plat-orion/include/plat/time.h |
| 3 | * | 3 | * |
| 4 | * Marvell Orion SoC time handling. | 4 | * Marvell Orion SoC time handling. |
| 5 | * | 5 | * |
| @@ -8,8 +8,8 @@ | |||
| 8 | * warranty of any kind, whether express or implied. | 8 | * warranty of any kind, whether express or implied. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #ifndef __ASM_PLAT_ORION_TIME_H | 11 | #ifndef __PLAT_TIME_H |
| 12 | #define __ASM_PLAT_ORION_TIME_H | 12 | #define __PLAT_TIME_H |
| 13 | 13 | ||
| 14 | void orion_time_init(unsigned int irq, unsigned int tclk); | 14 | void orion_time_init(unsigned int irq, unsigned int tclk); |
| 15 | 15 | ||
diff --git a/arch/arm/plat-orion/irq.c b/arch/arm/plat-orion/irq.c index fe66a1835169..3f9d34fc738c 100644 --- a/arch/arm/plat-orion/irq.c +++ b/arch/arm/plat-orion/irq.c | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 13 | #include <linux/irq.h> | 13 | #include <linux/irq.h> |
| 14 | #include <linux/io.h> | 14 | #include <linux/io.h> |
| 15 | #include <asm/plat-orion/irq.h> | 15 | #include <plat/irq.h> |
| 16 | 16 | ||
| 17 | static void orion_irq_mask(u32 irq) | 17 | static void orion_irq_mask(u32 irq) |
| 18 | { | 18 | { |
diff --git a/arch/arm/plat-orion/pcie.c b/arch/arm/plat-orion/pcie.c index ca32c60e14d7..883902fead89 100644 --- a/arch/arm/plat-orion/pcie.c +++ b/arch/arm/plat-orion/pcie.c | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | #include <linux/pci.h> | 12 | #include <linux/pci.h> |
| 13 | #include <linux/mbus.h> | 13 | #include <linux/mbus.h> |
| 14 | #include <asm/mach/pci.h> | 14 | #include <asm/mach/pci.h> |
| 15 | #include <asm/plat-orion/pcie.h> | 15 | #include <plat/pcie.h> |
| 16 | 16 | ||
| 17 | /* | 17 | /* |
| 18 | * PCIe unit register offsets. | 18 | * PCIe unit register offsets. |
diff --git a/arch/arm/plat-s3c24xx/cpu.c b/arch/arm/plat-s3c24xx/cpu.c index 6d60f0476bb8..89ce60eabd5b 100644 --- a/arch/arm/plat-s3c24xx/cpu.c +++ b/arch/arm/plat-s3c24xx/cpu.c | |||
| @@ -169,9 +169,7 @@ static struct map_desc s3c_iodesc[] __initdata = { | |||
| 169 | IODESC_ENT(UART) | 169 | IODESC_ENT(UART) |
| 170 | }; | 170 | }; |
| 171 | 171 | ||
| 172 | 172 | static struct cpu_table * __init s3c_lookup_cpu(unsigned long idcode) | |
| 173 | static struct cpu_table * | ||
| 174 | s3c_lookup_cpu(unsigned long idcode) | ||
| 175 | { | 173 | { |
| 176 | struct cpu_table *tab; | 174 | struct cpu_table *tab; |
| 177 | int count; | 175 | int count; |
diff --git a/arch/arm/plat-s3c24xx/gpiolib.c b/arch/arm/plat-s3c24xx/gpiolib.c index 849f8469714a..3caec6bad3eb 100644 --- a/arch/arm/plat-s3c24xx/gpiolib.c +++ b/arch/arm/plat-s3c24xx/gpiolib.c | |||
| @@ -39,7 +39,7 @@ static inline struct s3c24xx_gpio_chip *to_s3c_chip(struct gpio_chip *gpc) | |||
| 39 | * drivers themsevles. | 39 | * drivers themsevles. |
| 40 | */ | 40 | */ |
| 41 | 41 | ||
| 42 | int s3c24xx_gpiolib_input(struct gpio_chip *chip, unsigned offset) | 42 | static int s3c24xx_gpiolib_input(struct gpio_chip *chip, unsigned offset) |
| 43 | { | 43 | { |
| 44 | struct s3c24xx_gpio_chip *ourchip = to_s3c_chip(chip); | 44 | struct s3c24xx_gpio_chip *ourchip = to_s3c_chip(chip); |
| 45 | void __iomem *base = ourchip->base; | 45 | void __iomem *base = ourchip->base; |
| @@ -58,7 +58,7 @@ int s3c24xx_gpiolib_input(struct gpio_chip *chip, unsigned offset) | |||
| 58 | return 0; | 58 | return 0; |
| 59 | } | 59 | } |
| 60 | 60 | ||
| 61 | int s3c24xx_gpiolib_output(struct gpio_chip *chip, | 61 | static int s3c24xx_gpiolib_output(struct gpio_chip *chip, |
| 62 | unsigned offset, int value) | 62 | unsigned offset, int value) |
| 63 | { | 63 | { |
| 64 | struct s3c24xx_gpio_chip *ourchip = to_s3c_chip(chip); | 64 | struct s3c24xx_gpio_chip *ourchip = to_s3c_chip(chip); |
| @@ -86,7 +86,8 @@ int s3c24xx_gpiolib_output(struct gpio_chip *chip, | |||
| 86 | return 0; | 86 | return 0; |
| 87 | } | 87 | } |
| 88 | 88 | ||
| 89 | void s3c24xx_gpiolib_set(struct gpio_chip *chip, unsigned offset, int value) | 89 | static void s3c24xx_gpiolib_set(struct gpio_chip *chip, |
| 90 | unsigned offset, int value) | ||
| 90 | { | 91 | { |
| 91 | struct s3c24xx_gpio_chip *ourchip = to_s3c_chip(chip); | 92 | struct s3c24xx_gpio_chip *ourchip = to_s3c_chip(chip); |
| 92 | void __iomem *base = ourchip->base; | 93 | void __iomem *base = ourchip->base; |
| @@ -104,7 +105,7 @@ void s3c24xx_gpiolib_set(struct gpio_chip *chip, unsigned offset, int value) | |||
| 104 | local_irq_restore(flags); | 105 | local_irq_restore(flags); |
| 105 | } | 106 | } |
| 106 | 107 | ||
| 107 | int s3c24xx_gpiolib_get(struct gpio_chip *chip, unsigned offset) | 108 | static int s3c24xx_gpiolib_get(struct gpio_chip *chip, unsigned offset) |
| 108 | { | 109 | { |
| 109 | struct s3c24xx_gpio_chip *ourchip = to_s3c_chip(chip); | 110 | struct s3c24xx_gpio_chip *ourchip = to_s3c_chip(chip); |
| 110 | unsigned long val; | 111 | unsigned long val; |
| @@ -150,8 +151,7 @@ static int s3c24xx_gpiolib_banka_output(struct gpio_chip *chip, | |||
| 150 | return 0; | 151 | return 0; |
| 151 | } | 152 | } |
| 152 | 153 | ||
| 153 | 154 | static struct s3c24xx_gpio_chip gpios[] = { | |
| 154 | struct s3c24xx_gpio_chip gpios[] = { | ||
| 155 | [0] = { | 155 | [0] = { |
| 156 | .base = S3C24XX_GPIO_BASE(S3C2410_GPA0), | 156 | .base = S3C24XX_GPIO_BASE(S3C2410_GPA0), |
| 157 | .chip = { | 157 | .chip = { |
diff --git a/arch/arm/plat-s3c24xx/pwm-clock.c b/arch/arm/plat-s3c24xx/pwm-clock.c index ccfdc9d7ae4b..306cc9c6f9ef 100644 --- a/arch/arm/plat-s3c24xx/pwm-clock.c +++ b/arch/arm/plat-s3c24xx/pwm-clock.c | |||
| @@ -89,7 +89,7 @@ static unsigned long clk_pwm_scaler_getrate(struct clk *clk) | |||
| 89 | 89 | ||
| 90 | /* TODO - add set rate calls. */ | 90 | /* TODO - add set rate calls. */ |
| 91 | 91 | ||
| 92 | struct clk clk_timer_scaler[] = { | 92 | static struct clk clk_timer_scaler[] = { |
| 93 | [0] = { | 93 | [0] = { |
| 94 | .name = "pwm-scaler0", | 94 | .name = "pwm-scaler0", |
| 95 | .id = -1, | 95 | .id = -1, |
| @@ -102,7 +102,7 @@ struct clk clk_timer_scaler[] = { | |||
| 102 | }, | 102 | }, |
| 103 | }; | 103 | }; |
| 104 | 104 | ||
| 105 | struct clk clk_timer_tclk[] = { | 105 | static struct clk clk_timer_tclk[] = { |
| 106 | [0] = { | 106 | [0] = { |
| 107 | .name = "pwm-tclk0", | 107 | .name = "pwm-tclk0", |
| 108 | .id = -1, | 108 | .id = -1, |
| @@ -232,7 +232,7 @@ static int clk_pwm_tdiv_set_rate(struct clk *clk, unsigned long rate) | |||
| 232 | return 0; | 232 | return 0; |
| 233 | } | 233 | } |
| 234 | 234 | ||
| 235 | struct pwm_tdiv_clk clk_timer_tdiv[] = { | 235 | static struct pwm_tdiv_clk clk_timer_tdiv[] = { |
| 236 | [0] = { | 236 | [0] = { |
| 237 | .clk = { | 237 | .clk = { |
| 238 | .name = "pwm-tdiv", | 238 | .name = "pwm-tdiv", |
diff --git a/arch/arm/plat-s3c24xx/pwm.c b/arch/arm/plat-s3c24xx/pwm.c index 18c4bdc49a05..7a92c938542a 100644 --- a/arch/arm/plat-s3c24xx/pwm.c +++ b/arch/arm/plat-s3c24xx/pwm.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/io.h> | 19 | #include <linux/io.h> |
| 20 | #include <linux/pwm.h> | 20 | #include <linux/pwm.h> |
| 21 | 21 | ||
| 22 | #include <asm/plat-s3c24xx/devs.h> | ||
| 22 | #include <asm/plat-s3c/regs-timer.h> | 23 | #include <asm/plat-s3c/regs-timer.h> |
| 23 | 24 | ||
| 24 | struct pwm_device { | 25 | struct pwm_device { |
| @@ -38,7 +39,7 @@ struct pwm_device { | |||
| 38 | unsigned char pwm_id; | 39 | unsigned char pwm_id; |
| 39 | }; | 40 | }; |
| 40 | 41 | ||
| 41 | #define pwm_dbg(_pwm, msg...) dev_info(&(_pwm)->pdev->dev, msg) | 42 | #define pwm_dbg(_pwm, msg...) dev_dbg(&(_pwm)->pdev->dev, msg) |
| 42 | 43 | ||
| 43 | static struct clk *clk_scaler[2]; | 44 | static struct clk *clk_scaler[2]; |
| 44 | 45 | ||
| @@ -168,7 +169,7 @@ void pwm_disable(struct pwm_device *pwm) | |||
| 168 | 169 | ||
| 169 | EXPORT_SYMBOL(pwm_disable); | 170 | EXPORT_SYMBOL(pwm_disable); |
| 170 | 171 | ||
| 171 | unsigned long pwm_calc_tin(struct pwm_device *pwm, unsigned long freq) | 172 | static unsigned long pwm_calc_tin(struct pwm_device *pwm, unsigned long freq) |
| 172 | { | 173 | { |
| 173 | unsigned long tin_parent_rate; | 174 | unsigned long tin_parent_rate; |
| 174 | unsigned int div; | 175 | unsigned int div; |
diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types index 8b8f564c3aa2..56281c030a7b 100644 --- a/arch/arm/tools/mach-types +++ b/arch/arm/tools/mach-types | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | # | 12 | # |
| 13 | # http://www.arm.linux.org.uk/developer/machines/?action=new | 13 | # http://www.arm.linux.org.uk/developer/machines/?action=new |
| 14 | # | 14 | # |
| 15 | # Last update: Sun Jul 13 12:04:05 2008 | 15 | # Last update: Wed Aug 13 21:56:02 2008 |
| 16 | # | 16 | # |
| 17 | # machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number | 17 | # machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number |
| 18 | # | 18 | # |
| @@ -843,7 +843,7 @@ borzoi MACH_BORZOI BORZOI 831 | |||
| 843 | gecko MACH_GECKO GECKO 832 | 843 | gecko MACH_GECKO GECKO 832 |
| 844 | ds101 MACH_DS101 DS101 833 | 844 | ds101 MACH_DS101 DS101 833 |
| 845 | omap_palmtt2 MACH_OMAP_PALMTT2 OMAP_PALMTT2 834 | 845 | omap_palmtt2 MACH_OMAP_PALMTT2 OMAP_PALMTT2 834 |
| 846 | xscale_palmld MACH_XSCALE_PALMLD XSCALE_PALMLD 835 | 846 | palmld MACH_PALMLD PALMLD 835 |
| 847 | cc9c MACH_CC9C CC9C 836 | 847 | cc9c MACH_CC9C CC9C 836 |
| 848 | sbc1670 MACH_SBC1670 SBC1670 837 | 848 | sbc1670 MACH_SBC1670 SBC1670 837 |
| 849 | ixdp28x5 MACH_IXDP28X5 IXDP28X5 838 | 849 | ixdp28x5 MACH_IXDP28X5 IXDP28X5 838 |
| @@ -852,7 +852,7 @@ ml696k MACH_ML696K ML696K 840 | |||
| 852 | arcom_zeus MACH_ARCOM_ZEUS ARCOM_ZEUS 841 | 852 | arcom_zeus MACH_ARCOM_ZEUS ARCOM_ZEUS 841 |
| 853 | osiris MACH_OSIRIS OSIRIS 842 | 853 | osiris MACH_OSIRIS OSIRIS 842 |
| 854 | maestro MACH_MAESTRO MAESTRO 843 | 854 | maestro MACH_MAESTRO MAESTRO 843 |
| 855 | tunge2 MACH_TUNGE2 TUNGE2 844 | 855 | palmte2 MACH_PALMTE2 PALMTE2 844 |
| 856 | ixbbm MACH_IXBBM IXBBM 845 | 856 | ixbbm MACH_IXBBM IXBBM 845 |
| 857 | mx27ads MACH_MX27ADS MX27ADS 846 | 857 | mx27ads MACH_MX27ADS MX27ADS 846 |
| 858 | ax8004 MACH_AX8004 AX8004 847 | 858 | ax8004 MACH_AX8004 AX8004 847 |
| @@ -916,7 +916,7 @@ nxdb500 MACH_NXDB500 NXDB500 905 | |||
| 916 | apf9328 MACH_APF9328 APF9328 906 | 916 | apf9328 MACH_APF9328 APF9328 906 |
| 917 | omap_wipoq MACH_OMAP_WIPOQ OMAP_WIPOQ 907 | 917 | omap_wipoq MACH_OMAP_WIPOQ OMAP_WIPOQ 907 |
| 918 | omap_twip MACH_OMAP_TWIP OMAP_TWIP 908 | 918 | omap_twip MACH_OMAP_TWIP OMAP_TWIP 908 |
| 919 | palmtreo650 MACH_PALMTREO650 PALMTREO650 909 | 919 | palmt650 MACH_PALMT650 PALMT650 909 |
| 920 | acumen MACH_ACUMEN ACUMEN 910 | 920 | acumen MACH_ACUMEN ACUMEN 910 |
| 921 | xp100 MACH_XP100 XP100 911 | 921 | xp100 MACH_XP100 XP100 911 |
| 922 | fs2410 MACH_FS2410 FS2410 912 | 922 | fs2410 MACH_FS2410 FS2410 912 |
| @@ -1096,7 +1096,7 @@ atc6 MACH_ATC6 ATC6 1086 | |||
| 1096 | multmdw MACH_MULTMDW MULTMDW 1087 | 1096 | multmdw MACH_MULTMDW MULTMDW 1087 |
| 1097 | mba2440 MACH_MBA2440 MBA2440 1088 | 1097 | mba2440 MACH_MBA2440 MBA2440 1088 |
| 1098 | ecsd MACH_ECSD ECSD 1089 | 1098 | ecsd MACH_ECSD ECSD 1089 |
| 1099 | zire31 MACH_ZIRE31 ZIRE31 1090 | 1099 | palmz31 MACH_PALMZ31 PALMZ31 1090 |
| 1100 | fsg MACH_FSG FSG 1091 | 1100 | fsg MACH_FSG FSG 1091 |
| 1101 | razor101 MACH_RAZOR101 RAZOR101 1092 | 1101 | razor101 MACH_RAZOR101 RAZOR101 1092 |
| 1102 | opera_tdm MACH_OPERA_TDM OPERA_TDM 1093 | 1102 | opera_tdm MACH_OPERA_TDM OPERA_TDM 1093 |
| @@ -1810,7 +1810,7 @@ kriss_sensor MACH_KRISS_SENSOR KRISS_SENSOR 1819 | |||
| 1810 | pilz_pmi5 MACH_PILZ_PMI5 PILZ_PMI5 1820 | 1810 | pilz_pmi5 MACH_PILZ_PMI5 PILZ_PMI5 1820 |
| 1811 | jade MACH_JADE JADE 1821 | 1811 | jade MACH_JADE JADE 1821 |
| 1812 | ks8695_softplc MACH_KS8695_SOFTPLC KS8695_SOFTPLC 1822 | 1812 | ks8695_softplc MACH_KS8695_SOFTPLC KS8695_SOFTPLC 1822 |
| 1813 | gprisc4 MACH_GPRISC4 GPRISC4 1823 | 1813 | gprisc3 MACH_GPRISC4 GPRISC4 1823 |
| 1814 | stamp9260 MACH_STAMP9260 STAMP9260 1824 | 1814 | stamp9260 MACH_STAMP9260 STAMP9260 1824 |
| 1815 | smdk6430 MACH_SMDK6430 SMDK6430 1825 | 1815 | smdk6430 MACH_SMDK6430 SMDK6430 1825 |
| 1816 | smdkc100 MACH_SMDKC100 SMDKC100 1826 | 1816 | smdkc100 MACH_SMDKC100 SMDKC100 1826 |
| @@ -1820,3 +1820,44 @@ deister_eyecam MACH_DEISTER_EYECAM DEISTER_EYECAM 1829 | |||
| 1820 | at91sam9m10ek MACH_AT91SAM9M10EK AT91SAM9M10EK 1830 | 1820 | at91sam9m10ek MACH_AT91SAM9M10EK AT91SAM9M10EK 1830 |
| 1821 | linkstation_produo MACH_LINKSTATION_PRODUO LINKSTATION_PRODUO 1831 | 1821 | linkstation_produo MACH_LINKSTATION_PRODUO LINKSTATION_PRODUO 1831 |
| 1822 | hit_b0 MACH_HIT_B0 HIT_B0 1832 | 1822 | hit_b0 MACH_HIT_B0 HIT_B0 1832 |
| 1823 | adx_rmu MACH_ADX_RMU ADX_RMU 1833 | ||
| 1824 | xg_cpe_main MACH_XG_CPE_MAIN XG_CPE_MAIN 1834 | ||
| 1825 | edb9407a MACH_EDB9407A EDB9407A 1835 | ||
| 1826 | dtb9608 MACH_DTB9608 DTB9608 1836 | ||
| 1827 | em104v1 MACH_EM104V1 EM104V1 1837 | ||
| 1828 | demo MACH_DEMO DEMO 1838 | ||
| 1829 | logi9260 MACH_LOGI9260 LOGI9260 1839 | ||
| 1830 | mx31_exm32 MACH_MX31_EXM32 MX31_EXM32 1840 | ||
| 1831 | usb_a9g20 MACH_USB_A9G20 USB_A9G20 1841 | ||
| 1832 | picproje2008 MACH_PICPROJE2008 PICPROJE2008 1842 | ||
| 1833 | cs_e9315 MACH_CS_E9315 CS_E9315 1843 | ||
| 1834 | qil_a9g20 MACH_QIL_A9G20 QIL_A9G20 1844 | ||
| 1835 | sha_pon020 MACH_SHA_PON020 SHA_PON020 1845 | ||
| 1836 | nad MACH_NAD NAD 1846 | ||
| 1837 | sbc35_a9260 MACH_SBC35_A9260 SBC35_A9260 1847 | ||
| 1838 | sbc35_a9g20 MACH_SBC35_A9G20 SBC35_A9G20 1848 | ||
| 1839 | davinci_beginning MACH_DAVINCI_BEGINNING DAVINCI_BEGINNING 1849 | ||
| 1840 | uwc MACH_UWC UWC 1850 | ||
| 1841 | mxlads MACH_MXLADS MXLADS 1851 | ||
| 1842 | htcnike MACH_HTCNIKE HTCNIKE 1852 | ||
| 1843 | deister_pxa270 MACH_DEISTER_PXA270 DEISTER_PXA270 1853 | ||
| 1844 | cme9210js MACH_CME9210JS CME9210JS 1854 | ||
| 1845 | cc9p9360 MACH_CC9P9360 CC9P9360 1855 | ||
| 1846 | mocha MACH_MOCHA MOCHA 1856 | ||
| 1847 | wapd170ag MACH_WAPD170AG WAPD170AG 1857 | ||
| 1848 | linkstation_mini MACH_LINKSTATION_MINI LINKSTATION_MINI 1858 | ||
| 1849 | afeb9260 MACH_AFEB9260 AFEB9260 1859 | ||
| 1850 | w90x900 MACH_W90X900 W90X900 1860 | ||
| 1851 | w90x700 MACH_W90X700 W90X700 1861 | ||
| 1852 | kt300ip MACH_KT300IP KT300IP 1862 | ||
| 1853 | kt300ip_g20 MACH_KT300IP_G20 KT300IP_G20 1863 | ||
| 1854 | srcm MACH_SRCM SRCM 1864 | ||
| 1855 | wlnx_9260 MACH_WLNX_9260 WLNX_9260 1865 | ||
| 1856 | openmoko_gta03 MACH_OPENMOKO_GTA03 OPENMOKO_GTA03 1866 | ||
| 1857 | osprey2 MACH_OSPREY2 OSPREY2 1867 | ||
| 1858 | kbio9260 MACH_KBIO9260 KBIO9260 1868 | ||
| 1859 | ginza MACH_GINZA GINZA 1869 | ||
| 1860 | a636n MACH_A636N A636N 1870 | ||
| 1861 | imx27ipcam MACH_IMX27IPCAM IMX27IPCAM 1871 | ||
| 1862 | nenoc MACH_NEMOC NEMOC 1872 | ||
| 1863 | geneva MACH_GENEVA GENEVA 1873 | ||
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index 5a097c46bc46..4154ff1101fa 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig | |||
| @@ -249,7 +249,7 @@ config MEM_MT48LC8M32B2B5_7 | |||
| 249 | 249 | ||
| 250 | config MEM_MT48LC32M16A2TG_75 | 250 | config MEM_MT48LC32M16A2TG_75 |
| 251 | bool | 251 | bool |
| 252 | depends on (BFIN527_EZKIT || BFIN532_IP0X) | 252 | depends on (BFIN527_EZKIT || BFIN532_IP0X || BLACKSTAMP) |
| 253 | default y | 253 | default y |
| 254 | 254 | ||
| 255 | source "arch/blackfin/mach-bf527/Kconfig" | 255 | source "arch/blackfin/mach-bf527/Kconfig" |
| @@ -292,7 +292,7 @@ config CLKIN_HZ | |||
| 292 | int "Frequency of the crystal on the board in Hz" | 292 | int "Frequency of the crystal on the board in Hz" |
| 293 | default "11059200" if BFIN533_STAMP | 293 | default "11059200" if BFIN533_STAMP |
| 294 | default "27000000" if BFIN533_EZKIT | 294 | default "27000000" if BFIN533_EZKIT |
| 295 | default "25000000" if (BFIN537_STAMP || BFIN527_EZKIT || H8606_HVSISTEMAS) | 295 | default "25000000" if (BFIN537_STAMP || BFIN527_EZKIT || H8606_HVSISTEMAS || BLACKSTAMP) |
| 296 | default "30000000" if BFIN561_EZKIT | 296 | default "30000000" if BFIN561_EZKIT |
| 297 | default "24576000" if PNAV10 | 297 | default "24576000" if PNAV10 |
| 298 | default "10000000" if BFIN532_IP0X | 298 | default "10000000" if BFIN532_IP0X |
| @@ -332,7 +332,7 @@ config VCO_MULT | |||
| 332 | default "22" if BFIN533_BLUETECHNIX_CM | 332 | default "22" if BFIN533_BLUETECHNIX_CM |
| 333 | default "20" if (BFIN537_BLUETECHNIX_CM || BFIN527_BLUETECHNIX_CM || BFIN561_BLUETECHNIX_CM) | 333 | default "20" if (BFIN537_BLUETECHNIX_CM || BFIN527_BLUETECHNIX_CM || BFIN561_BLUETECHNIX_CM) |
| 334 | default "20" if BFIN561_EZKIT | 334 | default "20" if BFIN561_EZKIT |
| 335 | default "16" if H8606_HVSISTEMAS | 335 | default "16" if (H8606_HVSISTEMAS || BLACKSTAMP) |
| 336 | help | 336 | help |
| 337 | This controls the frequency of the on-chip PLL. This can be between 1 and 64. | 337 | This controls the frequency of the on-chip PLL. This can be between 1 and 64. |
| 338 | PLL Frequency = (Crystal Frequency) * (this setting) | 338 | PLL Frequency = (Crystal Frequency) * (this setting) |
| @@ -622,6 +622,33 @@ config CPLB_SWITCH_TAB_L1 | |||
| 622 | If enabled, the CPLB Switch Tables are linked | 622 | If enabled, the CPLB Switch Tables are linked |
| 623 | into L1 data memory. (less latency) | 623 | into L1 data memory. (less latency) |
| 624 | 624 | ||
| 625 | comment "Speed Optimizations" | ||
| 626 | config BFIN_INS_LOWOVERHEAD | ||
| 627 | bool "ins[bwl] low overhead, higher interrupt latency" | ||
| 628 | default y | ||
| 629 | help | ||
| 630 | Reads on the Blackfin are speculative. In Blackfin terms, this means | ||
| 631 | they can be interrupted at any time (even after they have been issued | ||
| 632 | on to the external bus), and re-issued after the interrupt occurs. | ||
| 633 | For memory - this is not a big deal, since memory does not change if | ||
| 634 | it sees a read. | ||
| 635 | |||
| 636 | If a FIFO is sitting on the end of the read, it will see two reads, | ||
| 637 | when the core only sees one since the FIFO receives both the read | ||
| 638 | which is cancelled (and not delivered to the core) and the one which | ||
| 639 | is re-issued (which is delivered to the core). | ||
| 640 | |||
| 641 | To solve this, interrupts are turned off before reads occur to | ||
| 642 | I/O space. This option controls which the overhead/latency of | ||
| 643 | controlling interrupts during this time | ||
| 644 | "n" turns interrupts off every read | ||
| 645 | (higher overhead, but lower interrupt latency) | ||
| 646 | "y" turns interrupts off every loop | ||
| 647 | (low overhead, but longer interrupt latency) | ||
| 648 | |||
| 649 | default behavior is to leave this set to on (type "Y"). If you are experiencing | ||
| 650 | interrupt latency issues, it is safe and OK to turn this off. | ||
| 651 | |||
| 625 | endmenu | 652 | endmenu |
| 626 | 653 | ||
| 627 | 654 | ||
| @@ -828,6 +855,7 @@ menu "Bus options (PCI, PCMCIA, EISA, MCA, ISA)" | |||
| 828 | 855 | ||
| 829 | config PCI | 856 | config PCI |
| 830 | bool "PCI support" | 857 | bool "PCI support" |
| 858 | depends on BROKEN | ||
| 831 | help | 859 | help |
| 832 | Support for PCI bus. | 860 | Support for PCI bus. |
| 833 | 861 | ||
| @@ -933,13 +961,6 @@ endchoice | |||
| 933 | comment "Possible Suspend Mem / Hibernate Wake-Up Sources" | 961 | comment "Possible Suspend Mem / Hibernate Wake-Up Sources" |
| 934 | depends on PM | 962 | depends on PM |
| 935 | 963 | ||
| 936 | config PM_BFIN_WAKE_RTC | ||
| 937 | bool "Allow Wake-Up from RESET and on-chip RTC" | ||
| 938 | depends on PM | ||
| 939 | default n | ||
| 940 | help | ||
| 941 | Enable RTC Wake-Up (Voltage Regulator Power-Up) | ||
| 942 | |||
| 943 | config PM_BFIN_WAKE_PH6 | 964 | config PM_BFIN_WAKE_PH6 |
| 944 | bool "Allow Wake-Up from on-chip PHY or PH6 GP" | 965 | bool "Allow Wake-Up from on-chip PHY or PH6 GP" |
| 945 | depends on PM && (BF52x || BF534 || BF536 || BF537) | 966 | depends on PM && (BF52x || BF534 || BF536 || BF537) |
| @@ -947,41 +968,12 @@ config PM_BFIN_WAKE_PH6 | |||
| 947 | help | 968 | help |
| 948 | Enable PHY and PH6 GP Wake-Up (Voltage Regulator Power-Up) | 969 | Enable PHY and PH6 GP Wake-Up (Voltage Regulator Power-Up) |
| 949 | 970 | ||
| 950 | config PM_BFIN_WAKE_CAN | ||
| 951 | bool "Allow Wake-Up from on-chip CAN0/1" | ||
| 952 | depends on PM && (BF54x || BF534 || BF536 || BF537) | ||
| 953 | default n | ||
| 954 | help | ||
| 955 | Enable CAN0/1 Wake-Up (Voltage Regulator Power-Up) | ||
| 956 | |||
| 957 | config PM_BFIN_WAKE_GP | 971 | config PM_BFIN_WAKE_GP |
| 958 | bool "Allow Wake-Up from GPIOs" | 972 | bool "Allow Wake-Up from GPIOs" |
| 959 | depends on PM && BF54x | 973 | depends on PM && BF54x |
| 960 | default n | 974 | default n |
| 961 | help | 975 | help |
| 962 | Enable General-Purpose Wake-Up (Voltage Regulator Power-Up) | 976 | Enable General-Purpose Wake-Up (Voltage Regulator Power-Up) |
| 963 | |||
| 964 | config PM_BFIN_WAKE_USB | ||
| 965 | bool "Allow Wake-Up from on-chip USB" | ||
| 966 | depends on PM && (BF54x || BF52x) | ||
| 967 | default n | ||
| 968 | help | ||
| 969 | Enable USB Wake-Up (Voltage Regulator Power-Up) | ||
| 970 | |||
| 971 | config PM_BFIN_WAKE_KEYPAD | ||
| 972 | bool "Allow Wake-Up from on-chip Keypad" | ||
| 973 | depends on PM && BF54x | ||
| 974 | default n | ||
| 975 | help | ||
| 976 | Enable Keypad Wake-Up (Voltage Regulator Power-Up) | ||
| 977 | |||
| 978 | config PM_BFIN_WAKE_ROTARY | ||
| 979 | bool "Allow Wake-Up from on-chip Rotary" | ||
| 980 | depends on PM && BF54x | ||
| 981 | default n | ||
| 982 | help | ||
| 983 | Enable Rotary Wake-Up (Voltage Regulator Power-Up) | ||
| 984 | |||
| 985 | endmenu | 977 | endmenu |
| 986 | 978 | ||
| 987 | menu "CPU Frequency scaling" | 979 | menu "CPU Frequency scaling" |
diff --git a/arch/blackfin/Makefile b/arch/blackfin/Makefile index 9564731ad3a8..eac0533d6e4f 100644 --- a/arch/blackfin/Makefile +++ b/arch/blackfin/Makefile | |||
| @@ -98,36 +98,20 @@ libs-y += arch/$(ARCH)/lib/ | |||
| 98 | 98 | ||
| 99 | drivers-$(CONFIG_OPROFILE) += arch/$(ARCH)/oprofile/ | 99 | drivers-$(CONFIG_OPROFILE) += arch/$(ARCH)/oprofile/ |
| 100 | 100 | ||
| 101 | machdirs := $(patsubst %,arch/blackfin/mach-%/, $(machine-y)) | ||
| 101 | 102 | ||
| 103 | KBUILD_CFLAGS += -Iarch/$(ARCH)/include/ | ||
| 104 | KBUILD_CFLAGS += -Iarch/$(ARCH)/mach-$(MACHINE)/include | ||
| 102 | 105 | ||
| 103 | # Update machine arch symlinks if something which affects | 106 | KBUILD_CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs)) |
| 104 | # them changed. We use .mach to indicate when they were updated | ||
| 105 | # last, otherwise make uses the target directory mtime. | ||
| 106 | |||
| 107 | show_mach_symlink = : | ||
| 108 | quiet_show_mach_symlink = echo ' SYMLINK include/asm-$(ARCH)/mach-$(MACHINE) -> include/asm-$(ARCH)/mach' | ||
| 109 | silent_show_mach_symlink = : | ||
| 110 | include/asm-blackfin/.mach: $(wildcard include/config/arch/*.h) include/config/auto.conf | ||
| 111 | @$($(quiet)show_mach_symlink) | ||
| 112 | ifneq ($(KBUILD_SRC),) | ||
| 113 | $(Q)mkdir -p include/asm-$(ARCH) | ||
| 114 | $(Q)ln -fsn $(srctree)/include/asm-$(ARCH)/mach-$(MACHINE) include/asm-$(ARCH)/mach | ||
| 115 | else | ||
| 116 | $(Q)ln -fsn mach-$(MACHINE) include/asm-$(ARCH)/mach | ||
| 117 | endif | ||
| 118 | @touch $@ | ||
| 119 | 107 | ||
| 120 | CLEAN_FILES += \ | 108 | CLEAN_FILES += \ |
| 121 | include/asm-$(ARCH)/asm-offsets.h \ | 109 | arch/$(ARCH)/include/asm/asm-offsets.h \ |
| 122 | arch/$(ARCH)/kernel/asm-offsets.s \ | 110 | arch/$(ARCH)/kernel/asm-offsets.s \ |
| 123 | include/asm-$(ARCH)/mach \ | ||
| 124 | include/asm-$(ARCH)/.mach | ||
| 125 | 111 | ||
| 126 | archprepare: include/asm-blackfin/.mach | ||
| 127 | archclean: | 112 | archclean: |
| 128 | $(Q)$(MAKE) $(clean)=$(boot) | 113 | $(Q)$(MAKE) $(clean)=$(boot) |
| 129 | 114 | ||
| 130 | |||
| 131 | INSTALL_PATH ?= /tftpboot | 115 | INSTALL_PATH ?= /tftpboot |
| 132 | boot := arch/$(ARCH)/boot | 116 | boot := arch/$(ARCH)/boot |
| 133 | BOOT_TARGETS = vmImage | 117 | BOOT_TARGETS = vmImage |
diff --git a/arch/blackfin/configs/BlackStamp_defconfig b/arch/blackfin/configs/BlackStamp_defconfig new file mode 100644 index 000000000000..2921f9952d5f --- /dev/null +++ b/arch/blackfin/configs/BlackStamp_defconfig | |||
| @@ -0,0 +1,1195 @@ | |||
| 1 | # | ||
| 2 | # Automatically generated make config: don't edit | ||
| 3 | # Linux kernel version: 2.6.26.2 | ||
| 4 | # | ||
| 5 | # CONFIG_MMU is not set | ||
| 6 | # CONFIG_FPU is not set | ||
| 7 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
| 8 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set | ||
| 9 | CONFIG_BLACKFIN=y | ||
| 10 | CONFIG_ZONE_DMA=y | ||
| 11 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 12 | CONFIG_GENERIC_HWEIGHT=y | ||
| 13 | CONFIG_GENERIC_HARDIRQS=y | ||
| 14 | CONFIG_GENERIC_IRQ_PROBE=y | ||
| 15 | CONFIG_GENERIC_GPIO=y | ||
| 16 | CONFIG_FORCE_MAX_ZONEORDER=14 | ||
| 17 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
| 18 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
| 19 | |||
| 20 | # | ||
| 21 | # General setup | ||
| 22 | # | ||
| 23 | CONFIG_EXPERIMENTAL=y | ||
| 24 | CONFIG_BROKEN_ON_SMP=y | ||
| 25 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 26 | CONFIG_LOCALVERSION="" | ||
| 27 | CONFIG_LOCALVERSION_AUTO=y | ||
| 28 | CONFIG_SYSVIPC=y | ||
| 29 | CONFIG_SYSVIPC_SYSCTL=y | ||
| 30 | # CONFIG_POSIX_MQUEUE is not set | ||
| 31 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 32 | # CONFIG_TASKSTATS is not set | ||
| 33 | # CONFIG_AUDIT is not set | ||
| 34 | CONFIG_IKCONFIG=y | ||
| 35 | CONFIG_IKCONFIG_PROC=y | ||
| 36 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 37 | # CONFIG_CGROUPS is not set | ||
| 38 | # CONFIG_GROUP_SCHED is not set | ||
| 39 | CONFIG_SYSFS_DEPRECATED=y | ||
| 40 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 41 | # CONFIG_RELAY is not set | ||
| 42 | # CONFIG_NAMESPACES is not set | ||
| 43 | CONFIG_BLK_DEV_INITRD=y | ||
| 44 | CONFIG_INITRAMFS_SOURCE="" | ||
| 45 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 46 | CONFIG_SYSCTL=y | ||
| 47 | CONFIG_EMBEDDED=y | ||
| 48 | CONFIG_UID16=y | ||
| 49 | CONFIG_SYSCTL_SYSCALL=y | ||
| 50 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 51 | CONFIG_KALLSYMS=y | ||
| 52 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 53 | CONFIG_HOTPLUG=y | ||
| 54 | CONFIG_PRINTK=y | ||
| 55 | CONFIG_BUG=y | ||
| 56 | CONFIG_ELF_CORE=y | ||
| 57 | CONFIG_COMPAT_BRK=y | ||
| 58 | CONFIG_BASE_FULL=y | ||
| 59 | CONFIG_FUTEX=y | ||
| 60 | CONFIG_ANON_INODES=y | ||
| 61 | CONFIG_EPOLL=y | ||
| 62 | CONFIG_SIGNALFD=y | ||
| 63 | CONFIG_TIMERFD=y | ||
| 64 | CONFIG_EVENTFD=y | ||
| 65 | CONFIG_VM_EVENT_COUNTERS=y | ||
| 66 | CONFIG_SLAB=y | ||
| 67 | # CONFIG_SLUB is not set | ||
| 68 | # CONFIG_SLOB is not set | ||
| 69 | # CONFIG_PROFILING is not set | ||
| 70 | # CONFIG_MARKERS is not set | ||
| 71 | CONFIG_HAVE_OPROFILE=y | ||
| 72 | # CONFIG_HAVE_KPROBES is not set | ||
| 73 | # CONFIG_HAVE_KRETPROBES is not set | ||
| 74 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 75 | CONFIG_SLABINFO=y | ||
| 76 | CONFIG_RT_MUTEXES=y | ||
| 77 | CONFIG_TINY_SHMEM=y | ||
| 78 | CONFIG_BASE_SMALL=0 | ||
| 79 | CONFIG_MODULES=y | ||
| 80 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 81 | CONFIG_MODULE_UNLOAD=y | ||
| 82 | CONFIG_MODULE_FORCE_UNLOAD=y | ||
| 83 | # CONFIG_MODVERSIONS is not set | ||
| 84 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 85 | CONFIG_KMOD=y | ||
| 86 | CONFIG_BLOCK=y | ||
| 87 | # CONFIG_LBD is not set | ||
| 88 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 89 | # CONFIG_LSF is not set | ||
| 90 | # CONFIG_BLK_DEV_BSG is not set | ||
| 91 | |||
| 92 | # | ||
| 93 | # IO Schedulers | ||
| 94 | # | ||
| 95 | CONFIG_IOSCHED_NOOP=y | ||
| 96 | CONFIG_IOSCHED_AS=y | ||
| 97 | # CONFIG_IOSCHED_DEADLINE is not set | ||
| 98 | CONFIG_IOSCHED_CFQ=y | ||
| 99 | CONFIG_DEFAULT_AS=y | ||
| 100 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 101 | # CONFIG_DEFAULT_CFQ is not set | ||
| 102 | # CONFIG_DEFAULT_NOOP is not set | ||
| 103 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 104 | CONFIG_CLASSIC_RCU=y | ||
| 105 | # CONFIG_PREEMPT_NONE is not set | ||
| 106 | CONFIG_PREEMPT_VOLUNTARY=y | ||
| 107 | # CONFIG_PREEMPT is not set | ||
| 108 | |||
| 109 | # | ||
| 110 | # Blackfin Processor Options | ||
| 111 | # | ||
| 112 | |||
| 113 | # | ||
| 114 | # Processor and Board Settings | ||
| 115 | # | ||
| 116 | # CONFIG_BF522 is not set | ||
| 117 | # CONFIG_BF523 is not set | ||
| 118 | # CONFIG_BF524 is not set | ||
| 119 | # CONFIG_BF525 is not set | ||
| 120 | # CONFIG_BF526 is not set | ||
| 121 | # CONFIG_BF527 is not set | ||
| 122 | # CONFIG_BF531 is not set | ||
| 123 | CONFIG_BF532=y | ||
| 124 | # CONFIG_BF533 is not set | ||
| 125 | # CONFIG_BF534 is not set | ||
| 126 | # CONFIG_BF536 is not set | ||
| 127 | # CONFIG_BF537 is not set | ||
| 128 | # CONFIG_BF542 is not set | ||
| 129 | # CONFIG_BF544 is not set | ||
| 130 | # CONFIG_BF547 is not set | ||
| 131 | # CONFIG_BF548 is not set | ||
| 132 | # CONFIG_BF549 is not set | ||
| 133 | # CONFIG_BF561 is not set | ||
| 134 | # CONFIG_BF_REV_0_0 is not set | ||
| 135 | # CONFIG_BF_REV_0_1 is not set | ||
| 136 | # CONFIG_BF_REV_0_2 is not set | ||
| 137 | # CONFIG_BF_REV_0_3 is not set | ||
| 138 | # CONFIG_BF_REV_0_4 is not set | ||
| 139 | CONFIG_BF_REV_0_5=y | ||
| 140 | # CONFIG_BF_REV_ANY is not set | ||
| 141 | # CONFIG_BF_REV_NONE is not set | ||
| 142 | CONFIG_BF53x=y | ||
| 143 | CONFIG_MEM_MT48LC32M16A2TG_75=y | ||
| 144 | # CONFIG_BFIN533_EZKIT is not set | ||
| 145 | # CONFIG_BFIN533_STAMP is not set | ||
| 146 | # CONFIG_BFIN533_BLUETECHNIX_CM is not set | ||
| 147 | # CONFIG_H8606_HVSISTEMAS is not set | ||
| 148 | # CONFIG_BFIN532_IP0X is not set | ||
| 149 | CONFIG_BLACKSTAMP=y | ||
| 150 | # CONFIG_GENERIC_BF533_BOARD is not set | ||
| 151 | |||
| 152 | # | ||
| 153 | # BF533/2/1 Specific Configuration | ||
| 154 | # | ||
| 155 | |||
| 156 | # | ||
| 157 | # Interrupt Priority Assignment | ||
| 158 | # | ||
| 159 | |||
| 160 | # | ||
| 161 | # Priority | ||
| 162 | # | ||
| 163 | CONFIG_UART_ERROR=7 | ||
| 164 | CONFIG_SPORT0_ERROR=7 | ||
| 165 | CONFIG_SPI_ERROR=7 | ||
| 166 | CONFIG_SPORT1_ERROR=7 | ||
| 167 | CONFIG_PPI_ERROR=7 | ||
| 168 | CONFIG_DMA_ERROR=7 | ||
| 169 | CONFIG_PLLWAKE_ERROR=7 | ||
| 170 | CONFIG_RTC_ERROR=8 | ||
| 171 | CONFIG_DMA0_PPI=8 | ||
| 172 | CONFIG_DMA1_SPORT0RX=9 | ||
| 173 | CONFIG_DMA2_SPORT0TX=9 | ||
| 174 | CONFIG_DMA3_SPORT1RX=9 | ||
| 175 | CONFIG_DMA4_SPORT1TX=9 | ||
| 176 | CONFIG_DMA5_SPI=10 | ||
| 177 | CONFIG_DMA6_UARTRX=10 | ||
| 178 | CONFIG_DMA7_UARTTX=10 | ||
| 179 | CONFIG_TIMER0=11 | ||
| 180 | CONFIG_TIMER1=11 | ||
| 181 | CONFIG_TIMER2=11 | ||
| 182 | CONFIG_PFA=12 | ||
| 183 | CONFIG_PFB=12 | ||
| 184 | CONFIG_MEMDMA0=13 | ||
| 185 | CONFIG_MEMDMA1=13 | ||
| 186 | CONFIG_WDTIMER=13 | ||
| 187 | |||
| 188 | # | ||
| 189 | # Board customizations | ||
| 190 | # | ||
| 191 | # CONFIG_CMDLINE_BOOL is not set | ||
| 192 | CONFIG_BOOT_LOAD=0x1000 | ||
| 193 | |||
| 194 | # | ||
| 195 | # Clock/PLL Setup | ||
| 196 | # | ||
| 197 | CONFIG_CLKIN_HZ=25000000 | ||
| 198 | # CONFIG_BFIN_KERNEL_CLOCK is not set | ||
| 199 | # CONFIG_PLL_BYPASS is not set | ||
| 200 | # CONFIG_CLKIN_HALF is not set | ||
| 201 | CONFIG_VCO_MULT=16 | ||
| 202 | CONFIG_CCLK_DIV_1=y | ||
| 203 | # CONFIG_CCLK_DIV_2 is not set | ||
| 204 | # CONFIG_CCLK_DIV_4 is not set | ||
| 205 | # CONFIG_CCLK_DIV_8 is not set | ||
| 206 | CONFIG_SCLK_DIV=3 | ||
| 207 | CONFIG_MAX_MEM_SIZE=64 | ||
| 208 | CONFIG_MAX_VCO_HZ=400000000 | ||
| 209 | CONFIG_MIN_VCO_HZ=50000000 | ||
| 210 | CONFIG_MAX_SCLK_HZ=133333333 | ||
| 211 | CONFIG_MIN_SCLK_HZ=27000000 | ||
| 212 | |||
| 213 | # | ||
| 214 | # Kernel Timer/Scheduler | ||
| 215 | # | ||
| 216 | # CONFIG_HZ_100 is not set | ||
| 217 | CONFIG_HZ_250=y | ||
| 218 | # CONFIG_HZ_300 is not set | ||
| 219 | # CONFIG_HZ_1000 is not set | ||
| 220 | CONFIG_HZ=250 | ||
| 221 | # CONFIG_SCHED_HRTICK is not set | ||
| 222 | CONFIG_GENERIC_TIME=y | ||
| 223 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 224 | # CONFIG_CYCLES_CLOCKSOURCE is not set | ||
| 225 | CONFIG_TICK_ONESHOT=y | ||
| 226 | # CONFIG_NO_HZ is not set | ||
| 227 | CONFIG_HIGH_RES_TIMERS=y | ||
| 228 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 229 | |||
| 230 | # | ||
| 231 | # Memory Setup | ||
| 232 | # | ||
| 233 | |||
| 234 | # | ||
| 235 | # Misc | ||
| 236 | # | ||
| 237 | CONFIG_BFIN_SCRATCH_REG_RETN=y | ||
| 238 | # CONFIG_BFIN_SCRATCH_REG_RETE is not set | ||
| 239 | # CONFIG_BFIN_SCRATCH_REG_CYCLES is not set | ||
| 240 | |||
| 241 | # | ||
| 242 | # Blackfin Kernel Optimizations | ||
| 243 | # | ||
| 244 | |||
| 245 | # | ||
| 246 | # Memory Optimizations | ||
| 247 | # | ||
| 248 | CONFIG_I_ENTRY_L1=y | ||
| 249 | CONFIG_EXCPT_IRQ_SYSC_L1=y | ||
| 250 | CONFIG_DO_IRQ_L1=y | ||
| 251 | CONFIG_CORE_TIMER_IRQ_L1=y | ||
| 252 | CONFIG_IDLE_L1=y | ||
| 253 | CONFIG_SCHEDULE_L1=y | ||
| 254 | CONFIG_ARITHMETIC_OPS_L1=y | ||
| 255 | CONFIG_ACCESS_OK_L1=y | ||
| 256 | CONFIG_MEMSET_L1=y | ||
| 257 | CONFIG_MEMCPY_L1=y | ||
| 258 | CONFIG_SYS_BFIN_SPINLOCK_L1=y | ||
| 259 | # CONFIG_IP_CHECKSUM_L1 is not set | ||
| 260 | CONFIG_CACHELINE_ALIGNED_L1=y | ||
| 261 | # CONFIG_SYSCALL_TAB_L1 is not set | ||
| 262 | # CONFIG_CPLB_SWITCH_TAB_L1 is not set | ||
| 263 | # CONFIG_RAMKERNEL is not set | ||
| 264 | CONFIG_ROMKERNEL=y | ||
| 265 | CONFIG_SELECT_MEMORY_MODEL=y | ||
| 266 | CONFIG_FLATMEM_MANUAL=y | ||
| 267 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
| 268 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
| 269 | CONFIG_FLATMEM=y | ||
| 270 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
| 271 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 272 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 273 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 274 | CONFIG_SPLIT_PTLOCK_CPUS=4 | ||
| 275 | # CONFIG_RESOURCES_64BIT is not set | ||
| 276 | CONFIG_ZONE_DMA_FLAG=1 | ||
| 277 | CONFIG_VIRT_TO_BUS=y | ||
| 278 | CONFIG_BFIN_GPTIMERS=y | ||
| 279 | CONFIG_BFIN_DMA_5XX=y | ||
| 280 | # CONFIG_DMA_UNCACHED_4M is not set | ||
| 281 | # CONFIG_DMA_UNCACHED_2M is not set | ||
| 282 | CONFIG_DMA_UNCACHED_1M=y | ||
| 283 | # CONFIG_DMA_UNCACHED_NONE is not set | ||
| 284 | |||
| 285 | # | ||
| 286 | # Cache Support | ||
| 287 | # | ||
| 288 | CONFIG_BFIN_ICACHE=y | ||
| 289 | CONFIG_BFIN_DCACHE=y | ||
| 290 | # CONFIG_BFIN_DCACHE_BANKA is not set | ||
| 291 | # CONFIG_BFIN_ICACHE_LOCK is not set | ||
| 292 | # CONFIG_BFIN_WB is not set | ||
| 293 | CONFIG_BFIN_WT=y | ||
| 294 | # CONFIG_MPU is not set | ||
| 295 | |||
| 296 | # | ||
| 297 | # Asynchonous Memory Configuration | ||
| 298 | # | ||
| 299 | |||
| 300 | # | ||
| 301 | # EBIU_AMGCTL Global Control | ||
| 302 | # | ||
| 303 | CONFIG_C_AMCKEN=y | ||
| 304 | CONFIG_C_CDPRIO=y | ||
| 305 | # CONFIG_C_AMBEN is not set | ||
| 306 | # CONFIG_C_AMBEN_B0 is not set | ||
| 307 | # CONFIG_C_AMBEN_B0_B1 is not set | ||
| 308 | # CONFIG_C_AMBEN_B0_B1_B2 is not set | ||
| 309 | CONFIG_C_AMBEN_ALL=y | ||
| 310 | |||
| 311 | # | ||
| 312 | # EBIU_AMBCTL Control | ||
| 313 | # | ||
| 314 | CONFIG_BANK_0=0x7BB0 | ||
| 315 | CONFIG_BANK_1=0x7BB0 | ||
| 316 | CONFIG_BANK_2=0x7BB0 | ||
| 317 | CONFIG_BANK_3=0xAAC2 | ||
| 318 | |||
| 319 | # | ||
| 320 | # Bus options (PCI, PCMCIA, EISA, MCA, ISA) | ||
| 321 | # | ||
| 322 | # CONFIG_PCI is not set | ||
| 323 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 324 | # CONFIG_PCCARD is not set | ||
| 325 | |||
| 326 | # | ||
| 327 | # Executable file formats | ||
| 328 | # | ||
| 329 | CONFIG_BINFMT_ELF_FDPIC=y | ||
| 330 | CONFIG_BINFMT_FLAT=y | ||
| 331 | CONFIG_BINFMT_ZFLAT=y | ||
| 332 | CONFIG_BINFMT_SHARED_FLAT=y | ||
| 333 | # CONFIG_BINFMT_MISC is not set | ||
| 334 | |||
| 335 | # | ||
| 336 | # Power management options | ||
| 337 | # | ||
| 338 | CONFIG_PM=y | ||
| 339 | # CONFIG_PM_DEBUG is not set | ||
| 340 | CONFIG_PM_SLEEP=y | ||
| 341 | CONFIG_SUSPEND=y | ||
| 342 | CONFIG_SUSPEND_FREEZER=y | ||
| 343 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
| 344 | CONFIG_PM_BFIN_SLEEP_DEEPER=y | ||
| 345 | # CONFIG_PM_BFIN_SLEEP is not set | ||
| 346 | # CONFIG_PM_WAKEUP_BY_GPIO is not set | ||
| 347 | |||
| 348 | # | ||
| 349 | # Possible Suspend Mem / Hibernate Wake-Up Sources | ||
| 350 | # | ||
| 351 | |||
| 352 | # | ||
| 353 | # CPU Frequency scaling | ||
| 354 | # | ||
| 355 | # CONFIG_CPU_FREQ is not set | ||
| 356 | |||
| 357 | # | ||
| 358 | # Networking | ||
| 359 | # | ||
| 360 | CONFIG_NET=y | ||
| 361 | |||
| 362 | # | ||
| 363 | # Networking options | ||
| 364 | # | ||
| 365 | CONFIG_PACKET=y | ||
| 366 | # CONFIG_PACKET_MMAP is not set | ||
| 367 | CONFIG_UNIX=y | ||
| 368 | CONFIG_XFRM=y | ||
| 369 | # CONFIG_XFRM_USER is not set | ||
| 370 | # CONFIG_XFRM_SUB_POLICY is not set | ||
| 371 | # CONFIG_XFRM_MIGRATE is not set | ||
| 372 | # CONFIG_XFRM_STATISTICS is not set | ||
| 373 | # CONFIG_NET_KEY is not set | ||
| 374 | CONFIG_INET=y | ||
| 375 | # CONFIG_IP_MULTICAST is not set | ||
| 376 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
| 377 | CONFIG_IP_FIB_HASH=y | ||
| 378 | CONFIG_IP_PNP=y | ||
| 379 | # CONFIG_IP_PNP_DHCP is not set | ||
| 380 | # CONFIG_IP_PNP_BOOTP is not set | ||
| 381 | # CONFIG_IP_PNP_RARP is not set | ||
| 382 | # CONFIG_NET_IPIP is not set | ||
| 383 | # CONFIG_NET_IPGRE is not set | ||
| 384 | # CONFIG_ARPD is not set | ||
| 385 | CONFIG_SYN_COOKIES=y | ||
| 386 | # CONFIG_INET_AH is not set | ||
| 387 | # CONFIG_INET_ESP is not set | ||
| 388 | # CONFIG_INET_IPCOMP is not set | ||
| 389 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
| 390 | # CONFIG_INET_TUNNEL is not set | ||
| 391 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | ||
| 392 | CONFIG_INET_XFRM_MODE_TUNNEL=y | ||
| 393 | CONFIG_INET_XFRM_MODE_BEET=y | ||
| 394 | # CONFIG_INET_LRO is not set | ||
| 395 | CONFIG_INET_DIAG=y | ||
| 396 | CONFIG_INET_TCP_DIAG=y | ||
| 397 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
| 398 | CONFIG_TCP_CONG_CUBIC=y | ||
| 399 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
| 400 | # CONFIG_TCP_MD5SIG is not set | ||
| 401 | # CONFIG_IPV6 is not set | ||
| 402 | # CONFIG_NETLABEL is not set | ||
| 403 | # CONFIG_NETWORK_SECMARK is not set | ||
| 404 | # CONFIG_NETFILTER is not set | ||
| 405 | # CONFIG_IP_DCCP is not set | ||
| 406 | # CONFIG_IP_SCTP is not set | ||
| 407 | # CONFIG_TIPC is not set | ||
| 408 | # CONFIG_ATM is not set | ||
| 409 | # CONFIG_BRIDGE is not set | ||
| 410 | # CONFIG_VLAN_8021Q is not set | ||
| 411 | # CONFIG_DECNET is not set | ||
| 412 | # CONFIG_LLC2 is not set | ||
| 413 | # CONFIG_IPX is not set | ||
| 414 | # CONFIG_ATALK is not set | ||
| 415 | # CONFIG_X25 is not set | ||
| 416 | # CONFIG_LAPB is not set | ||
| 417 | # CONFIG_ECONET is not set | ||
| 418 | # CONFIG_WAN_ROUTER is not set | ||
| 419 | # CONFIG_NET_SCHED is not set | ||
| 420 | |||
| 421 | # | ||
| 422 | # Network testing | ||
| 423 | # | ||
| 424 | # CONFIG_NET_PKTGEN is not set | ||
| 425 | # CONFIG_HAMRADIO is not set | ||
| 426 | # CONFIG_CAN is not set | ||
| 427 | # CONFIG_IRDA is not set | ||
| 428 | # CONFIG_BT is not set | ||
| 429 | # CONFIG_AF_RXRPC is not set | ||
| 430 | |||
| 431 | # | ||
| 432 | # Wireless | ||
| 433 | # | ||
| 434 | # CONFIG_CFG80211 is not set | ||
| 435 | # CONFIG_WIRELESS_EXT is not set | ||
| 436 | # CONFIG_MAC80211 is not set | ||
| 437 | # CONFIG_IEEE80211 is not set | ||
| 438 | # CONFIG_RFKILL is not set | ||
| 439 | # CONFIG_NET_9P is not set | ||
| 440 | |||
| 441 | # | ||
| 442 | # Device Drivers | ||
| 443 | # | ||
| 444 | |||
| 445 | # | ||
| 446 | # Generic Driver Options | ||
| 447 | # | ||
| 448 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| 449 | CONFIG_STANDALONE=y | ||
| 450 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
| 451 | # CONFIG_FW_LOADER is not set | ||
| 452 | # CONFIG_SYS_HYPERVISOR is not set | ||
| 453 | # CONFIG_CONNECTOR is not set | ||
| 454 | CONFIG_MTD=y | ||
| 455 | # CONFIG_MTD_DEBUG is not set | ||
| 456 | # CONFIG_MTD_CONCAT is not set | ||
| 457 | CONFIG_MTD_PARTITIONS=y | ||
| 458 | # CONFIG_MTD_REDBOOT_PARTS is not set | ||
| 459 | CONFIG_MTD_CMDLINE_PARTS=y | ||
| 460 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 461 | |||
| 462 | # | ||
| 463 | # User Modules And Translation Layers | ||
| 464 | # | ||
| 465 | CONFIG_MTD_CHAR=m | ||
| 466 | CONFIG_MTD_BLKDEVS=y | ||
| 467 | CONFIG_MTD_BLOCK=y | ||
| 468 | # CONFIG_FTL is not set | ||
| 469 | # CONFIG_NFTL is not set | ||
| 470 | # CONFIG_INFTL is not set | ||
| 471 | # CONFIG_RFD_FTL is not set | ||
| 472 | # CONFIG_SSFDC is not set | ||
| 473 | # CONFIG_MTD_OOPS is not set | ||
| 474 | |||
| 475 | # | ||
| 476 | # RAM/ROM/Flash chip drivers | ||
| 477 | # | ||
| 478 | CONFIG_MTD_CFI=m | ||
| 479 | # CONFIG_MTD_JEDECPROBE is not set | ||
| 480 | CONFIG_MTD_GEN_PROBE=m | ||
| 481 | # CONFIG_MTD_CFI_ADV_OPTIONS is not set | ||
| 482 | CONFIG_MTD_MAP_BANK_WIDTH_1=y | ||
| 483 | CONFIG_MTD_MAP_BANK_WIDTH_2=y | ||
| 484 | CONFIG_MTD_MAP_BANK_WIDTH_4=y | ||
| 485 | # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set | ||
| 486 | # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set | ||
| 487 | # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set | ||
| 488 | CONFIG_MTD_CFI_I1=y | ||
| 489 | CONFIG_MTD_CFI_I2=y | ||
| 490 | # CONFIG_MTD_CFI_I4 is not set | ||
| 491 | # CONFIG_MTD_CFI_I8 is not set | ||
| 492 | # CONFIG_MTD_CFI_INTELEXT is not set | ||
| 493 | CONFIG_MTD_CFI_AMDSTD=m | ||
| 494 | # CONFIG_MTD_CFI_STAA is not set | ||
| 495 | CONFIG_MTD_CFI_UTIL=m | ||
| 496 | CONFIG_MTD_RAM=y | ||
| 497 | CONFIG_MTD_ROM=m | ||
| 498 | # CONFIG_MTD_ABSENT is not set | ||
| 499 | |||
| 500 | # | ||
| 501 | # Mapping drivers for chip access | ||
| 502 | # | ||
| 503 | CONFIG_MTD_COMPLEX_MAPPINGS=y | ||
| 504 | # CONFIG_MTD_PHYSMAP is not set | ||
| 505 | # CONFIG_MTD_GPIO_ADDR is not set | ||
| 506 | # CONFIG_MTD_UCLINUX is not set | ||
| 507 | # CONFIG_MTD_PLATRAM is not set | ||
| 508 | |||
| 509 | # | ||
| 510 | # Self-contained MTD device drivers | ||
| 511 | # | ||
| 512 | # CONFIG_MTD_DATAFLASH is not set | ||
| 513 | CONFIG_MTD_M25P80=y | ||
| 514 | # CONFIG_M25PXX_USE_FAST_READ is not set | ||
| 515 | # CONFIG_MTD_SLRAM is not set | ||
| 516 | # CONFIG_MTD_PHRAM is not set | ||
| 517 | # CONFIG_MTD_MTDRAM is not set | ||
| 518 | # CONFIG_MTD_BLOCK2MTD is not set | ||
| 519 | |||
| 520 | # | ||
| 521 | # Disk-On-Chip Device Drivers | ||
| 522 | # | ||
| 523 | # CONFIG_MTD_DOC2000 is not set | ||
| 524 | # CONFIG_MTD_DOC2001 is not set | ||
| 525 | # CONFIG_MTD_DOC2001PLUS is not set | ||
| 526 | # CONFIG_MTD_NAND is not set | ||
| 527 | # CONFIG_MTD_ONENAND is not set | ||
| 528 | |||
| 529 | # | ||
| 530 | # UBI - Unsorted block images | ||
| 531 | # | ||
| 532 | # CONFIG_MTD_UBI is not set | ||
| 533 | # CONFIG_PARPORT is not set | ||
| 534 | CONFIG_BLK_DEV=y | ||
| 535 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
| 536 | CONFIG_BLK_DEV_LOOP=y | ||
| 537 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | ||
| 538 | CONFIG_BLK_DEV_NBD=y | ||
| 539 | CONFIG_BLK_DEV_RAM=y | ||
| 540 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
| 541 | CONFIG_BLK_DEV_RAM_SIZE=4096 | ||
| 542 | # CONFIG_BLK_DEV_XIP is not set | ||
| 543 | # CONFIG_CDROM_PKTCDVD is not set | ||
| 544 | # CONFIG_ATA_OVER_ETH is not set | ||
| 545 | CONFIG_MISC_DEVICES=y | ||
| 546 | # CONFIG_EEPROM_93CX6 is not set | ||
| 547 | # CONFIG_ENCLOSURE_SERVICES is not set | ||
| 548 | CONFIG_HAVE_IDE=y | ||
| 549 | # CONFIG_IDE is not set | ||
| 550 | |||
| 551 | # | ||
| 552 | # SCSI device support | ||
| 553 | # | ||
| 554 | # CONFIG_RAID_ATTRS is not set | ||
| 555 | # CONFIG_SCSI is not set | ||
| 556 | # CONFIG_SCSI_DMA is not set | ||
| 557 | # CONFIG_SCSI_NETLINK is not set | ||
| 558 | # CONFIG_ATA is not set | ||
| 559 | # CONFIG_MD is not set | ||
| 560 | CONFIG_NETDEVICES=y | ||
| 561 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 562 | # CONFIG_DUMMY is not set | ||
| 563 | # CONFIG_BONDING is not set | ||
| 564 | # CONFIG_MACVLAN is not set | ||
| 565 | # CONFIG_EQUALIZER is not set | ||
| 566 | # CONFIG_TUN is not set | ||
| 567 | # CONFIG_VETH is not set | ||
| 568 | # CONFIG_PHYLIB is not set | ||
| 569 | CONFIG_NET_ETHERNET=y | ||
| 570 | CONFIG_MII=y | ||
| 571 | CONFIG_SMC91X=y | ||
| 572 | # CONFIG_SMSC911X is not set | ||
| 573 | # CONFIG_DM9000 is not set | ||
| 574 | # CONFIG_ENC28J60 is not set | ||
| 575 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
| 576 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
| 577 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
| 578 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
| 579 | # CONFIG_B44 is not set | ||
| 580 | # CONFIG_NETDEV_1000 is not set | ||
| 581 | # CONFIG_NETDEV_10000 is not set | ||
| 582 | |||
| 583 | # | ||
| 584 | # Wireless LAN | ||
| 585 | # | ||
| 586 | # CONFIG_WLAN_PRE80211 is not set | ||
| 587 | # CONFIG_WLAN_80211 is not set | ||
| 588 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 589 | # CONFIG_WAN is not set | ||
| 590 | # CONFIG_PPP is not set | ||
| 591 | # CONFIG_SLIP is not set | ||
| 592 | # CONFIG_NETCONSOLE is not set | ||
| 593 | # CONFIG_NETPOLL is not set | ||
| 594 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
| 595 | # CONFIG_ISDN is not set | ||
| 596 | # CONFIG_PHONE is not set | ||
| 597 | |||
| 598 | # | ||
| 599 | # Input device support | ||
| 600 | # | ||
| 601 | CONFIG_INPUT=y | ||
| 602 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
| 603 | # CONFIG_INPUT_POLLDEV is not set | ||
| 604 | |||
| 605 | # | ||
| 606 | # Userland interfaces | ||
| 607 | # | ||
| 608 | # CONFIG_INPUT_MOUSEDEV is not set | ||
| 609 | # CONFIG_INPUT_JOYDEV is not set | ||
| 610 | CONFIG_INPUT_EVDEV=m | ||
| 611 | # CONFIG_INPUT_EVBUG is not set | ||
| 612 | |||
| 613 | # | ||
| 614 | # Input Device Drivers | ||
| 615 | # | ||
| 616 | # CONFIG_INPUT_KEYBOARD is not set | ||
| 617 | # CONFIG_INPUT_MOUSE is not set | ||
| 618 | # CONFIG_INPUT_JOYSTICK is not set | ||
| 619 | # CONFIG_INPUT_TABLET is not set | ||
| 620 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
| 621 | # CONFIG_INPUT_MISC is not set | ||
| 622 | |||
| 623 | # | ||
| 624 | # Hardware I/O ports | ||
| 625 | # | ||
| 626 | # CONFIG_SERIO is not set | ||
| 627 | # CONFIG_GAMEPORT is not set | ||
| 628 | |||
| 629 | # | ||
| 630 | # Character devices | ||
| 631 | # | ||
| 632 | # CONFIG_AD9960 is not set | ||
| 633 | # CONFIG_SPI_ADC_BF533 is not set | ||
| 634 | # CONFIG_BF5xx_PPIFCD is not set | ||
| 635 | # CONFIG_BFIN_SIMPLE_TIMER is not set | ||
| 636 | CONFIG_BF5xx_PPI=y | ||
| 637 | CONFIG_BFIN_SPORT=y | ||
| 638 | # CONFIG_BFIN_TIMER_LATENCY is not set | ||
| 639 | # CONFIG_TWI_LCD is not set | ||
| 640 | CONFIG_SIMPLE_GPIO=m | ||
| 641 | # CONFIG_VT is not set | ||
| 642 | CONFIG_DEVKMEM=y | ||
| 643 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
| 644 | |||
| 645 | # | ||
| 646 | # Serial drivers | ||
| 647 | # | ||
| 648 | # CONFIG_SERIAL_8250 is not set | ||
| 649 | |||
| 650 | # | ||
| 651 | # Non-8250 serial port support | ||
| 652 | # | ||
| 653 | CONFIG_SERIAL_BFIN=y | ||
| 654 | CONFIG_SERIAL_BFIN_CONSOLE=y | ||
| 655 | CONFIG_SERIAL_BFIN_DMA=y | ||
| 656 | # CONFIG_SERIAL_BFIN_PIO is not set | ||
| 657 | CONFIG_SERIAL_BFIN_UART0=y | ||
| 658 | # CONFIG_BFIN_UART0_CTSRTS is not set | ||
| 659 | CONFIG_SERIAL_CORE=y | ||
| 660 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
| 661 | # CONFIG_SERIAL_BFIN_SPORT is not set | ||
| 662 | CONFIG_UNIX98_PTYS=y | ||
| 663 | # CONFIG_LEGACY_PTYS is not set | ||
| 664 | |||
| 665 | # | ||
| 666 | # CAN, the car bus and industrial fieldbus | ||
| 667 | # | ||
| 668 | # CONFIG_CAN4LINUX is not set | ||
| 669 | # CONFIG_IPMI_HANDLER is not set | ||
| 670 | CONFIG_HW_RANDOM=y | ||
| 671 | # CONFIG_R3964 is not set | ||
| 672 | # CONFIG_RAW_DRIVER is not set | ||
| 673 | # CONFIG_TCG_TPM is not set | ||
| 674 | CONFIG_I2C=m | ||
| 675 | CONFIG_I2C_BOARDINFO=y | ||
| 676 | CONFIG_I2C_CHARDEV=m | ||
| 677 | CONFIG_I2C_ALGOBIT=m | ||
| 678 | |||
| 679 | # | ||
| 680 | # I2C Hardware Bus support | ||
| 681 | # | ||
| 682 | CONFIG_I2C_GPIO=m | ||
| 683 | # CONFIG_I2C_OCORES is not set | ||
| 684 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 685 | # CONFIG_I2C_SIMTEC is not set | ||
| 686 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 687 | # CONFIG_I2C_STUB is not set | ||
| 688 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 689 | |||
| 690 | # | ||
| 691 | # Miscellaneous I2C Chip support | ||
| 692 | # | ||
| 693 | # CONFIG_DS1682 is not set | ||
| 694 | # CONFIG_SENSORS_AD5252 is not set | ||
| 695 | # CONFIG_SENSORS_EEPROM is not set | ||
| 696 | # CONFIG_SENSORS_PCF8574 is not set | ||
| 697 | # CONFIG_PCF8575 is not set | ||
| 698 | # CONFIG_SENSORS_PCF8591 is not set | ||
| 699 | # CONFIG_SENSORS_MAX6875 is not set | ||
| 700 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 701 | # CONFIG_I2C_DEBUG_CORE is not set | ||
| 702 | # CONFIG_I2C_DEBUG_ALGO is not set | ||
| 703 | # CONFIG_I2C_DEBUG_BUS is not set | ||
| 704 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 705 | CONFIG_SPI=y | ||
| 706 | CONFIG_SPI_MASTER=y | ||
| 707 | |||
| 708 | # | ||
| 709 | # SPI Master Controller Drivers | ||
| 710 | # | ||
| 711 | CONFIG_SPI_BFIN=y | ||
| 712 | # CONFIG_SPI_BITBANG is not set | ||
| 713 | |||
| 714 | # | ||
| 715 | # SPI Protocol Masters | ||
| 716 | # | ||
| 717 | CONFIG_SPI_AT25=y | ||
| 718 | CONFIG_SPI_SPIDEV=m | ||
| 719 | # CONFIG_SPI_TLE62X0 is not set | ||
| 720 | # CONFIG_W1 is not set | ||
| 721 | # CONFIG_POWER_SUPPLY is not set | ||
| 722 | # CONFIG_HWMON is not set | ||
| 723 | # CONFIG_HWMON_VID is not set | ||
| 724 | # CONFIG_SENSORS_AD7418 is not set | ||
| 725 | # CONFIG_SENSORS_ADM1021 is not set | ||
| 726 | # CONFIG_SENSORS_ADM1025 is not set | ||
| 727 | # CONFIG_SENSORS_ADM1026 is not set | ||
| 728 | # CONFIG_SENSORS_ADM1029 is not set | ||
| 729 | # CONFIG_SENSORS_ADM1031 is not set | ||
| 730 | # CONFIG_SENSORS_ADM9240 is not set | ||
| 731 | # CONFIG_SENSORS_ADT7470 is not set | ||
| 732 | # CONFIG_SENSORS_ADT7473 is not set | ||
| 733 | # CONFIG_SENSORS_ATXP1 is not set | ||
| 734 | # CONFIG_SENSORS_DS1621 is not set | ||
| 735 | # CONFIG_SENSORS_F71805F is not set | ||
| 736 | # CONFIG_SENSORS_F71882FG is not set | ||
| 737 | # CONFIG_SENSORS_F75375S is not set | ||
| 738 | # CONFIG_SENSORS_GL518SM is not set | ||
| 739 | # CONFIG_SENSORS_GL520SM is not set | ||
| 740 | # CONFIG_SENSORS_IT87 is not set | ||
| 741 | # CONFIG_SENSORS_LM63 is not set | ||
| 742 | # CONFIG_SENSORS_LM70 is not set | ||
| 743 | # CONFIG_SENSORS_LM75 is not set | ||
| 744 | # CONFIG_SENSORS_LM77 is not set | ||
| 745 | # CONFIG_SENSORS_LM78 is not set | ||
| 746 | # CONFIG_SENSORS_LM80 is not set | ||
| 747 | # CONFIG_SENSORS_LM83 is not set | ||
| 748 | # CONFIG_SENSORS_LM85 is not set | ||
| 749 | # CONFIG_SENSORS_LM87 is not set | ||
| 750 | # CONFIG_SENSORS_LM90 is not set | ||
| 751 | # CONFIG_SENSORS_LM92 is not set | ||
| 752 | # CONFIG_SENSORS_LM93 is not set | ||
| 753 | # CONFIG_SENSORS_MAX1619 is not set | ||
| 754 | # CONFIG_SENSORS_MAX6650 is not set | ||
| 755 | # CONFIG_SENSORS_PC87360 is not set | ||
| 756 | # CONFIG_SENSORS_PC87427 is not set | ||
| 757 | # CONFIG_SENSORS_DME1737 is not set | ||
| 758 | # CONFIG_SENSORS_SMSC47M1 is not set | ||
| 759 | # CONFIG_SENSORS_SMSC47M192 is not set | ||
| 760 | # CONFIG_SENSORS_SMSC47B397 is not set | ||
| 761 | # CONFIG_SENSORS_ADS7828 is not set | ||
| 762 | # CONFIG_SENSORS_THMC50 is not set | ||
| 763 | # CONFIG_SENSORS_VT1211 is not set | ||
| 764 | # CONFIG_SENSORS_W83781D is not set | ||
| 765 | # CONFIG_SENSORS_W83791D is not set | ||
| 766 | # CONFIG_SENSORS_W83792D is not set | ||
| 767 | # CONFIG_SENSORS_W83793 is not set | ||
| 768 | # CONFIG_SENSORS_W83L785TS is not set | ||
| 769 | # CONFIG_SENSORS_W83L786NG is not set | ||
| 770 | # CONFIG_SENSORS_W83627HF is not set | ||
| 771 | # CONFIG_SENSORS_W83627EHF is not set | ||
| 772 | # CONFIG_HWMON_DEBUG_CHIP is not set | ||
| 773 | # CONFIG_THERMAL is not set | ||
| 774 | # CONFIG_THERMAL_HWMON is not set | ||
| 775 | CONFIG_WATCHDOG=y | ||
| 776 | # CONFIG_WATCHDOG_NOWAYOUT is not set | ||
| 777 | |||
| 778 | # | ||
| 779 | # Watchdog Device Drivers | ||
| 780 | # | ||
| 781 | # CONFIG_SOFT_WATCHDOG is not set | ||
| 782 | CONFIG_BFIN_WDT=y | ||
| 783 | |||
| 784 | # | ||
| 785 | # Sonics Silicon Backplane | ||
| 786 | # | ||
| 787 | CONFIG_SSB_POSSIBLE=y | ||
| 788 | # CONFIG_SSB is not set | ||
| 789 | |||
| 790 | # | ||
| 791 | # Multifunction device drivers | ||
| 792 | # | ||
| 793 | # CONFIG_MFD_SM501 is not set | ||
| 794 | # CONFIG_HTC_PASIC3 is not set | ||
| 795 | |||
| 796 | # | ||
| 797 | # Multimedia devices | ||
| 798 | # | ||
| 799 | |||
| 800 | # | ||
| 801 | # Multimedia core support | ||
| 802 | # | ||
| 803 | # CONFIG_VIDEO_DEV is not set | ||
| 804 | # CONFIG_DVB_CORE is not set | ||
| 805 | # CONFIG_VIDEO_MEDIA is not set | ||
| 806 | |||
| 807 | # | ||
| 808 | # Multimedia drivers | ||
| 809 | # | ||
| 810 | # CONFIG_DAB is not set | ||
| 811 | |||
| 812 | # | ||
| 813 | # Graphics support | ||
| 814 | # | ||
| 815 | # CONFIG_VGASTATE is not set | ||
| 816 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 817 | # CONFIG_FB is not set | ||
| 818 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 819 | |||
| 820 | # | ||
| 821 | # Display device support | ||
| 822 | # | ||
| 823 | # CONFIG_DISPLAY_SUPPORT is not set | ||
| 824 | |||
| 825 | # | ||
| 826 | # Sound | ||
| 827 | # | ||
| 828 | # CONFIG_SOUND is not set | ||
| 829 | CONFIG_HID_SUPPORT=y | ||
| 830 | CONFIG_HID=y | ||
| 831 | # CONFIG_HID_DEBUG is not set | ||
| 832 | # CONFIG_HIDRAW is not set | ||
| 833 | # CONFIG_USB_SUPPORT is not set | ||
| 834 | CONFIG_MMC=y | ||
| 835 | # CONFIG_MMC_DEBUG is not set | ||
| 836 | # CONFIG_MMC_UNSAFE_RESUME is not set | ||
| 837 | |||
| 838 | # | ||
| 839 | # MMC/SD Card Drivers | ||
| 840 | # | ||
| 841 | CONFIG_MMC_BLOCK=y | ||
| 842 | CONFIG_MMC_BLOCK_BOUNCE=y | ||
| 843 | # CONFIG_SDIO_UART is not set | ||
| 844 | # CONFIG_MMC_TEST is not set | ||
| 845 | |||
| 846 | # | ||
| 847 | # MMC/SD Host Controller Drivers | ||
| 848 | # | ||
| 849 | CONFIG_MMC_SPI=y | ||
| 850 | # CONFIG_SPI_MMC is not set | ||
| 851 | # CONFIG_MEMSTICK is not set | ||
| 852 | # CONFIG_NEW_LEDS is not set | ||
| 853 | # CONFIG_ACCESSIBILITY is not set | ||
| 854 | CONFIG_RTC_LIB=y | ||
| 855 | CONFIG_RTC_CLASS=y | ||
| 856 | CONFIG_RTC_HCTOSYS=y | ||
| 857 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
| 858 | # CONFIG_RTC_DEBUG is not set | ||
| 859 | |||
| 860 | # | ||
| 861 | # RTC interfaces | ||
| 862 | # | ||
| 863 | CONFIG_RTC_INTF_SYSFS=y | ||
| 864 | CONFIG_RTC_INTF_PROC=y | ||
| 865 | CONFIG_RTC_INTF_DEV=y | ||
| 866 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
| 867 | # CONFIG_RTC_DRV_TEST is not set | ||
| 868 | |||
| 869 | # | ||
| 870 | # I2C RTC drivers | ||
| 871 | # | ||
| 872 | # CONFIG_RTC_DRV_DS1307 is not set | ||
| 873 | # CONFIG_RTC_DRV_DS1374 is not set | ||
| 874 | # CONFIG_RTC_DRV_DS1672 is not set | ||
| 875 | # CONFIG_RTC_DRV_MAX6900 is not set | ||
| 876 | # CONFIG_RTC_DRV_RS5C372 is not set | ||
| 877 | # CONFIG_RTC_DRV_ISL1208 is not set | ||
| 878 | # CONFIG_RTC_DRV_X1205 is not set | ||
| 879 | # CONFIG_RTC_DRV_PCF8563 is not set | ||
| 880 | # CONFIG_RTC_DRV_PCF8583 is not set | ||
| 881 | # CONFIG_RTC_DRV_M41T80 is not set | ||
| 882 | # CONFIG_RTC_DRV_S35390A is not set | ||
| 883 | # CONFIG_RTC_DRV_FM3130 is not set | ||
| 884 | |||
| 885 | # | ||
| 886 | # SPI RTC drivers | ||
| 887 | # | ||
| 888 | # CONFIG_RTC_DRV_MAX6902 is not set | ||
| 889 | # CONFIG_RTC_DRV_R9701 is not set | ||
| 890 | # CONFIG_RTC_DRV_RS5C348 is not set | ||
| 891 | |||
| 892 | # | ||
| 893 | # Platform RTC drivers | ||
| 894 | # | ||
| 895 | # CONFIG_RTC_DRV_DS1511 is not set | ||
| 896 | # CONFIG_RTC_DRV_DS1553 is not set | ||
| 897 | # CONFIG_RTC_DRV_DS1742 is not set | ||
| 898 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 899 | # CONFIG_RTC_DRV_M48T86 is not set | ||
| 900 | # CONFIG_RTC_DRV_M48T59 is not set | ||
| 901 | # CONFIG_RTC_DRV_V3020 is not set | ||
| 902 | |||
| 903 | # | ||
| 904 | # on-CPU RTC drivers | ||
| 905 | # | ||
| 906 | CONFIG_RTC_DRV_BFIN=y | ||
| 907 | # CONFIG_UIO is not set | ||
| 908 | |||
| 909 | # | ||
| 910 | # File systems | ||
| 911 | # | ||
| 912 | # CONFIG_EXT2_FS is not set | ||
| 913 | # CONFIG_EXT3_FS is not set | ||
| 914 | # CONFIG_EXT4DEV_FS is not set | ||
| 915 | # CONFIG_REISERFS_FS is not set | ||
| 916 | # CONFIG_JFS_FS is not set | ||
| 917 | # CONFIG_FS_POSIX_ACL is not set | ||
| 918 | # CONFIG_XFS_FS is not set | ||
| 919 | # CONFIG_OCFS2_FS is not set | ||
| 920 | # CONFIG_DNOTIFY is not set | ||
| 921 | CONFIG_INOTIFY=y | ||
| 922 | CONFIG_INOTIFY_USER=y | ||
| 923 | # CONFIG_QUOTA is not set | ||
| 924 | # CONFIG_AUTOFS_FS is not set | ||
| 925 | # CONFIG_AUTOFS4_FS is not set | ||
| 926 | # CONFIG_FUSE_FS is not set | ||
| 927 | |||
| 928 | # | ||
| 929 | # CD-ROM/DVD Filesystems | ||
| 930 | # | ||
| 931 | # CONFIG_ISO9660_FS is not set | ||
| 932 | # CONFIG_UDF_FS is not set | ||
| 933 | |||
| 934 | # | ||
| 935 | # DOS/FAT/NT Filesystems | ||
| 936 | # | ||
| 937 | CONFIG_FAT_FS=y | ||
| 938 | CONFIG_MSDOS_FS=y | ||
| 939 | CONFIG_VFAT_FS=y | ||
| 940 | CONFIG_FAT_DEFAULT_CODEPAGE=437 | ||
| 941 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | ||
| 942 | # CONFIG_NTFS_FS is not set | ||
| 943 | |||
| 944 | # | ||
| 945 | # Pseudo filesystems | ||
| 946 | # | ||
| 947 | CONFIG_PROC_FS=y | ||
| 948 | CONFIG_PROC_SYSCTL=y | ||
| 949 | CONFIG_SYSFS=y | ||
| 950 | # CONFIG_TMPFS is not set | ||
| 951 | # CONFIG_HUGETLB_PAGE is not set | ||
| 952 | # CONFIG_CONFIGFS_FS is not set | ||
| 953 | |||
| 954 | # | ||
| 955 | # Miscellaneous filesystems | ||
| 956 | # | ||
| 957 | # CONFIG_ADFS_FS is not set | ||
| 958 | # CONFIG_AFFS_FS is not set | ||
| 959 | # CONFIG_HFS_FS is not set | ||
| 960 | # CONFIG_HFSPLUS_FS is not set | ||
| 961 | # CONFIG_BEFS_FS is not set | ||
| 962 | # CONFIG_BFS_FS is not set | ||
| 963 | # CONFIG_EFS_FS is not set | ||
| 964 | CONFIG_YAFFS_FS=m | ||
| 965 | CONFIG_YAFFS_YAFFS1=y | ||
| 966 | # CONFIG_YAFFS_9BYTE_TAGS is not set | ||
| 967 | # CONFIG_YAFFS_DOES_ECC is not set | ||
| 968 | CONFIG_YAFFS_YAFFS2=y | ||
| 969 | CONFIG_YAFFS_AUTO_YAFFS2=y | ||
| 970 | # CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set | ||
| 971 | # CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set | ||
| 972 | # CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set | ||
| 973 | CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y | ||
| 974 | CONFIG_JFFS2_FS=y | ||
| 975 | CONFIG_JFFS2_FS_DEBUG=0 | ||
| 976 | CONFIG_JFFS2_FS_WRITEBUFFER=y | ||
| 977 | # CONFIG_JFFS2_FS_WBUF_VERIFY is not set | ||
| 978 | # CONFIG_JFFS2_SUMMARY is not set | ||
| 979 | # CONFIG_JFFS2_FS_XATTR is not set | ||
| 980 | # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set | ||
| 981 | CONFIG_JFFS2_ZLIB=y | ||
| 982 | # CONFIG_JFFS2_LZO is not set | ||
| 983 | CONFIG_JFFS2_RTIME=y | ||
| 984 | # CONFIG_JFFS2_RUBIN is not set | ||
| 985 | # CONFIG_CRAMFS is not set | ||
| 986 | # CONFIG_VXFS_FS is not set | ||
| 987 | # CONFIG_MINIX_FS is not set | ||
| 988 | # CONFIG_HPFS_FS is not set | ||
| 989 | # CONFIG_QNX4FS_FS is not set | ||
| 990 | # CONFIG_ROMFS_FS is not set | ||
| 991 | # CONFIG_SYSV_FS is not set | ||
| 992 | # CONFIG_UFS_FS is not set | ||
| 993 | CONFIG_NETWORK_FILESYSTEMS=y | ||
| 994 | CONFIG_NFS_FS=y | ||
| 995 | CONFIG_NFS_V3=y | ||
| 996 | # CONFIG_NFS_V3_ACL is not set | ||
| 997 | CONFIG_NFS_V4=y | ||
| 998 | # CONFIG_NFSD is not set | ||
| 999 | # CONFIG_ROOT_NFS is not set | ||
| 1000 | CONFIG_LOCKD=y | ||
| 1001 | CONFIG_LOCKD_V4=y | ||
| 1002 | CONFIG_NFS_COMMON=y | ||
| 1003 | CONFIG_SUNRPC=y | ||
| 1004 | CONFIG_SUNRPC_GSS=y | ||
| 1005 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 1006 | CONFIG_RPCSEC_GSS_KRB5=y | ||
| 1007 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
| 1008 | CONFIG_SMB_FS=y | ||
| 1009 | # CONFIG_SMB_NLS_DEFAULT is not set | ||
| 1010 | CONFIG_CIFS=y | ||
| 1011 | # CONFIG_CIFS_STATS is not set | ||
| 1012 | # CONFIG_CIFS_WEAK_PW_HASH is not set | ||
| 1013 | # CONFIG_CIFS_XATTR is not set | ||
| 1014 | # CONFIG_CIFS_DEBUG2 is not set | ||
| 1015 | # CONFIG_CIFS_EXPERIMENTAL is not set | ||
| 1016 | # CONFIG_NCP_FS is not set | ||
| 1017 | # CONFIG_CODA_FS is not set | ||
| 1018 | # CONFIG_AFS_FS is not set | ||
| 1019 | |||
| 1020 | # | ||
| 1021 | # Partition Types | ||
| 1022 | # | ||
| 1023 | # CONFIG_PARTITION_ADVANCED is not set | ||
| 1024 | CONFIG_MSDOS_PARTITION=y | ||
| 1025 | CONFIG_NLS=y | ||
| 1026 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
| 1027 | CONFIG_NLS_CODEPAGE_437=y | ||
| 1028 | # CONFIG_NLS_CODEPAGE_737 is not set | ||
| 1029 | # CONFIG_NLS_CODEPAGE_775 is not set | ||
| 1030 | # CONFIG_NLS_CODEPAGE_850 is not set | ||
| 1031 | # CONFIG_NLS_CODEPAGE_852 is not set | ||
| 1032 | # CONFIG_NLS_CODEPAGE_855 is not set | ||
| 1033 | # CONFIG_NLS_CODEPAGE_857 is not set | ||
| 1034 | # CONFIG_NLS_CODEPAGE_860 is not set | ||
| 1035 | # CONFIG_NLS_CODEPAGE_861 is not set | ||
| 1036 | # CONFIG_NLS_CODEPAGE_862 is not set | ||
| 1037 | # CONFIG_NLS_CODEPAGE_863 is not set | ||
| 1038 | # CONFIG_NLS_CODEPAGE_864 is not set | ||
| 1039 | # CONFIG_NLS_CODEPAGE_865 is not set | ||
| 1040 | # CONFIG_NLS_CODEPAGE_866 is not set | ||
| 1041 | # CONFIG_NLS_CODEPAGE_869 is not set | ||
| 1042 | # CONFIG_NLS_CODEPAGE_936 is not set | ||
| 1043 | # CONFIG_NLS_CODEPAGE_950 is not set | ||
| 1044 | # CONFIG_NLS_CODEPAGE_932 is not set | ||
| 1045 | # CONFIG_NLS_CODEPAGE_949 is not set | ||
| 1046 | # CONFIG_NLS_CODEPAGE_874 is not set | ||
| 1047 | # CONFIG_NLS_ISO8859_8 is not set | ||
| 1048 | # CONFIG_NLS_CODEPAGE_1250 is not set | ||
| 1049 | # CONFIG_NLS_CODEPAGE_1251 is not set | ||
| 1050 | CONFIG_NLS_ASCII=y | ||
| 1051 | # CONFIG_NLS_ISO8859_1 is not set | ||
| 1052 | # CONFIG_NLS_ISO8859_2 is not set | ||
| 1053 | # CONFIG_NLS_ISO8859_3 is not set | ||
| 1054 | # CONFIG_NLS_ISO8859_4 is not set | ||
| 1055 | # CONFIG_NLS_ISO8859_5 is not set | ||
| 1056 | # CONFIG_NLS_ISO8859_6 is not set | ||
| 1057 | # CONFIG_NLS_ISO8859_7 is not set | ||
| 1058 | # CONFIG_NLS_ISO8859_9 is not set | ||
| 1059 | # CONFIG_NLS_ISO8859_13 is not set | ||
| 1060 | # CONFIG_NLS_ISO8859_14 is not set | ||
| 1061 | # CONFIG_NLS_ISO8859_15 is not set | ||
| 1062 | # CONFIG_NLS_KOI8_R is not set | ||
| 1063 | # CONFIG_NLS_KOI8_U is not set | ||
| 1064 | CONFIG_NLS_UTF8=y | ||
| 1065 | # CONFIG_DLM is not set | ||
| 1066 | |||
| 1067 | # | ||
| 1068 | # Kernel hacking | ||
| 1069 | # | ||
| 1070 | # CONFIG_PRINTK_TIME is not set | ||
| 1071 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
| 1072 | CONFIG_ENABLE_MUST_CHECK=y | ||
| 1073 | CONFIG_FRAME_WARN=1024 | ||
| 1074 | # CONFIG_MAGIC_SYSRQ is not set | ||
| 1075 | # CONFIG_UNUSED_SYMBOLS is not set | ||
| 1076 | CONFIG_DEBUG_FS=y | ||
| 1077 | # CONFIG_HEADERS_CHECK is not set | ||
| 1078 | # CONFIG_DEBUG_KERNEL is not set | ||
| 1079 | # CONFIG_DEBUG_BUGVERBOSE is not set | ||
| 1080 | # CONFIG_SAMPLES is not set | ||
| 1081 | CONFIG_DEBUG_MMRS=y | ||
| 1082 | CONFIG_DEBUG_HUNT_FOR_ZERO=y | ||
| 1083 | CONFIG_DEBUG_BFIN_HWTRACE_ON=y | ||
| 1084 | CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_OFF=y | ||
| 1085 | # CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE is not set | ||
| 1086 | # CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_TWO is not set | ||
| 1087 | CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION=0 | ||
| 1088 | # CONFIG_DEBUG_BFIN_HWTRACE_EXPAND is not set | ||
| 1089 | # CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set | ||
| 1090 | CONFIG_EARLY_PRINTK=y | ||
| 1091 | CONFIG_CPLB_INFO=y | ||
| 1092 | CONFIG_ACCESS_CHECK=y | ||
| 1093 | |||
| 1094 | # | ||
| 1095 | # Security options | ||
| 1096 | # | ||
| 1097 | # CONFIG_KEYS is not set | ||
| 1098 | CONFIG_SECURITY=y | ||
| 1099 | # CONFIG_SECURITY_NETWORK is not set | ||
| 1100 | # CONFIG_SECURITY_CAPABILITIES is not set | ||
| 1101 | CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0 | ||
| 1102 | CONFIG_CRYPTO=y | ||
| 1103 | |||
| 1104 | # | ||
| 1105 | # Crypto core or helper | ||
| 1106 | # | ||
| 1107 | CONFIG_CRYPTO_ALGAPI=y | ||
| 1108 | CONFIG_CRYPTO_BLKCIPHER=y | ||
| 1109 | CONFIG_CRYPTO_MANAGER=y | ||
| 1110 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1111 | # CONFIG_CRYPTO_NULL is not set | ||
| 1112 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1113 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1114 | # CONFIG_CRYPTO_TEST is not set | ||
| 1115 | |||
| 1116 | # | ||
| 1117 | # Authenticated Encryption with Associated Data | ||
| 1118 | # | ||
| 1119 | # CONFIG_CRYPTO_CCM is not set | ||
| 1120 | # CONFIG_CRYPTO_GCM is not set | ||
| 1121 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1122 | |||
| 1123 | # | ||
| 1124 | # Block modes | ||
| 1125 | # | ||
| 1126 | CONFIG_CRYPTO_CBC=y | ||
| 1127 | # CONFIG_CRYPTO_CTR is not set | ||
| 1128 | # CONFIG_CRYPTO_CTS is not set | ||
| 1129 | # CONFIG_CRYPTO_ECB is not set | ||
| 1130 | # CONFIG_CRYPTO_LRW is not set | ||
| 1131 | # CONFIG_CRYPTO_PCBC is not set | ||
| 1132 | # CONFIG_CRYPTO_XTS is not set | ||
| 1133 | |||
| 1134 | # | ||
| 1135 | # Hash modes | ||
| 1136 | # | ||
| 1137 | # CONFIG_CRYPTO_HMAC is not set | ||
| 1138 | # CONFIG_CRYPTO_XCBC is not set | ||
| 1139 | |||
| 1140 | # | ||
| 1141 | # Digest | ||
| 1142 | # | ||
| 1143 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1144 | # CONFIG_CRYPTO_MD4 is not set | ||
| 1145 | CONFIG_CRYPTO_MD5=y | ||
| 1146 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1147 | # CONFIG_CRYPTO_SHA1 is not set | ||
| 1148 | # CONFIG_CRYPTO_SHA256 is not set | ||
| 1149 | # CONFIG_CRYPTO_SHA512 is not set | ||
| 1150 | # CONFIG_CRYPTO_TGR192 is not set | ||
| 1151 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1152 | |||
| 1153 | # | ||
| 1154 | # Ciphers | ||
| 1155 | # | ||
| 1156 | # CONFIG_CRYPTO_AES is not set | ||
| 1157 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1158 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1159 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1160 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1161 | # CONFIG_CRYPTO_CAST5 is not set | ||
| 1162 | # CONFIG_CRYPTO_CAST6 is not set | ||
| 1163 | CONFIG_CRYPTO_DES=y | ||
| 1164 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1165 | # CONFIG_CRYPTO_KHAZAD is not set | ||
| 1166 | # CONFIG_CRYPTO_SALSA20 is not set | ||
| 1167 | # CONFIG_CRYPTO_SEED is not set | ||
| 1168 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1169 | # CONFIG_CRYPTO_TEA is not set | ||
| 1170 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1171 | |||
| 1172 | # | ||
| 1173 | # Compression | ||
| 1174 | # | ||
| 1175 | # CONFIG_CRYPTO_DEFLATE is not set | ||
| 1176 | # CONFIG_CRYPTO_LZO is not set | ||
| 1177 | CONFIG_CRYPTO_HW=y | ||
| 1178 | |||
| 1179 | # | ||
| 1180 | # Library routines | ||
| 1181 | # | ||
| 1182 | CONFIG_BITREVERSE=y | ||
| 1183 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1184 | CONFIG_CRC_CCITT=m | ||
| 1185 | # CONFIG_CRC16 is not set | ||
| 1186 | CONFIG_CRC_ITU_T=y | ||
| 1187 | CONFIG_CRC32=y | ||
| 1188 | CONFIG_CRC7=y | ||
| 1189 | # CONFIG_LIBCRC32C is not set | ||
| 1190 | CONFIG_ZLIB_INFLATE=y | ||
| 1191 | CONFIG_ZLIB_DEFLATE=y | ||
| 1192 | CONFIG_PLIST=y | ||
| 1193 | CONFIG_HAS_IOMEM=y | ||
| 1194 | CONFIG_HAS_IOPORT=y | ||
| 1195 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/blackfin/configs/TCM-BF537_defconfig b/arch/blackfin/configs/TCM-BF537_defconfig new file mode 100644 index 000000000000..c482ee171f9e --- /dev/null +++ b/arch/blackfin/configs/TCM-BF537_defconfig | |||
| @@ -0,0 +1,693 @@ | |||
| 1 | # | ||
| 2 | # Automatically generated make config: don't edit | ||
| 3 | # Linux kernel version: 2.6.24.7 | ||
| 4 | # Thu Jul 31 00:53:15 2008 | ||
| 5 | # | ||
| 6 | # CONFIG_MMU is not set | ||
| 7 | # CONFIG_FPU is not set | ||
| 8 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
| 9 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set | ||
| 10 | CONFIG_BLACKFIN=y | ||
| 11 | CONFIG_ZONE_DMA=y | ||
| 12 | CONFIG_SEMAPHORE_SLEEPERS=y | ||
| 13 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 14 | CONFIG_GENERIC_HWEIGHT=y | ||
| 15 | CONFIG_GENERIC_HARDIRQS=y | ||
| 16 | CONFIG_GENERIC_IRQ_PROBE=y | ||
| 17 | CONFIG_GENERIC_GPIO=y | ||
| 18 | CONFIG_FORCE_MAX_ZONEORDER=14 | ||
| 19 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
| 20 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
| 21 | |||
| 22 | # | ||
| 23 | # General setup | ||
| 24 | # | ||
| 25 | CONFIG_EXPERIMENTAL=y | ||
| 26 | CONFIG_BROKEN_ON_SMP=y | ||
| 27 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 28 | CONFIG_LOCALVERSION="" | ||
| 29 | CONFIG_LOCALVERSION_AUTO=y | ||
| 30 | CONFIG_SYSVIPC=y | ||
| 31 | CONFIG_SYSVIPC_SYSCTL=y | ||
| 32 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 33 | # CONFIG_USER_NS is not set | ||
| 34 | # CONFIG_PID_NS is not set | ||
| 35 | CONFIG_IKCONFIG=y | ||
| 36 | CONFIG_IKCONFIG_PROC=y | ||
| 37 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 38 | # CONFIG_CGROUPS is not set | ||
| 39 | CONFIG_FAIR_GROUP_SCHED=y | ||
| 40 | CONFIG_FAIR_USER_SCHED=y | ||
| 41 | # CONFIG_FAIR_CGROUP_SCHED is not set | ||
| 42 | CONFIG_SYSFS_DEPRECATED=y | ||
| 43 | # CONFIG_RELAY is not set | ||
| 44 | # CONFIG_BLK_DEV_INITRD is not set | ||
| 45 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 46 | CONFIG_SYSCTL=y | ||
| 47 | CONFIG_EMBEDDED=y | ||
| 48 | # CONFIG_UID16 is not set | ||
| 49 | CONFIG_SYSCTL_SYSCALL=y | ||
| 50 | CONFIG_KALLSYMS=y | ||
| 51 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 52 | # CONFIG_HOTPLUG is not set | ||
| 53 | CONFIG_PRINTK=y | ||
| 54 | CONFIG_BUG=y | ||
| 55 | CONFIG_ELF_CORE=y | ||
| 56 | CONFIG_BASE_FULL=y | ||
| 57 | CONFIG_FUTEX=y | ||
| 58 | CONFIG_ANON_INODES=y | ||
| 59 | CONFIG_EPOLL=y | ||
| 60 | CONFIG_SIGNALFD=y | ||
| 61 | CONFIG_EVENTFD=y | ||
| 62 | CONFIG_VM_EVENT_COUNTERS=y | ||
| 63 | CONFIG_SLAB=y | ||
| 64 | # CONFIG_SLUB is not set | ||
| 65 | # CONFIG_SLOB is not set | ||
| 66 | CONFIG_SLABINFO=y | ||
| 67 | CONFIG_RT_MUTEXES=y | ||
| 68 | CONFIG_TINY_SHMEM=y | ||
| 69 | CONFIG_BASE_SMALL=0 | ||
| 70 | CONFIG_MODULES=y | ||
| 71 | CONFIG_MODULE_UNLOAD=y | ||
| 72 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 73 | # CONFIG_MODVERSIONS is not set | ||
| 74 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 75 | CONFIG_KMOD=y | ||
| 76 | CONFIG_BLOCK=y | ||
| 77 | # CONFIG_LBD is not set | ||
| 78 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 79 | # CONFIG_LSF is not set | ||
| 80 | # CONFIG_BLK_DEV_BSG is not set | ||
| 81 | |||
| 82 | # | ||
| 83 | # IO Schedulers | ||
| 84 | # | ||
| 85 | CONFIG_IOSCHED_NOOP=y | ||
| 86 | # CONFIG_IOSCHED_AS is not set | ||
| 87 | # CONFIG_IOSCHED_DEADLINE is not set | ||
| 88 | CONFIG_IOSCHED_CFQ=y | ||
| 89 | # CONFIG_DEFAULT_AS is not set | ||
| 90 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 91 | # CONFIG_DEFAULT_CFQ is not set | ||
| 92 | CONFIG_DEFAULT_NOOP=y | ||
| 93 | CONFIG_DEFAULT_IOSCHED="noop" | ||
| 94 | CONFIG_PREEMPT_NONE=y | ||
| 95 | # CONFIG_PREEMPT_VOLUNTARY is not set | ||
| 96 | # CONFIG_PREEMPT is not set | ||
| 97 | |||
| 98 | # | ||
| 99 | # Blackfin Processor Options | ||
| 100 | # | ||
| 101 | |||
| 102 | # | ||
| 103 | # Processor and Board Settings | ||
| 104 | # | ||
| 105 | # CONFIG_BF522 is not set | ||
| 106 | # CONFIG_BF523 is not set | ||
| 107 | # CONFIG_BF524 is not set | ||
| 108 | # CONFIG_BF525 is not set | ||
| 109 | # CONFIG_BF526 is not set | ||
| 110 | # CONFIG_BF527 is not set | ||
| 111 | # CONFIG_BF531 is not set | ||
| 112 | # CONFIG_BF532 is not set | ||
| 113 | # CONFIG_BF533 is not set | ||
| 114 | # CONFIG_BF534 is not set | ||
| 115 | # CONFIG_BF536 is not set | ||
| 116 | CONFIG_BF537=y | ||
| 117 | # CONFIG_BF542 is not set | ||
| 118 | # CONFIG_BF544 is not set | ||
| 119 | # CONFIG_BF547 is not set | ||
| 120 | # CONFIG_BF548 is not set | ||
| 121 | # CONFIG_BF549 is not set | ||
| 122 | # CONFIG_BF561 is not set | ||
| 123 | # CONFIG_BF_REV_0_0 is not set | ||
| 124 | # CONFIG_BF_REV_0_1 is not set | ||
| 125 | CONFIG_BF_REV_0_2=y | ||
| 126 | # CONFIG_BF_REV_0_3 is not set | ||
| 127 | # CONFIG_BF_REV_0_4 is not set | ||
| 128 | # CONFIG_BF_REV_0_5 is not set | ||
| 129 | # CONFIG_BF_REV_ANY is not set | ||
| 130 | # CONFIG_BF_REV_NONE is not set | ||
| 131 | CONFIG_BF53x=y | ||
| 132 | CONFIG_IRQ_PLL_WAKEUP=7 | ||
| 133 | CONFIG_IRQ_RTC=8 | ||
| 134 | CONFIG_IRQ_PPI=8 | ||
| 135 | CONFIG_IRQ_SPORT0_RX=9 | ||
| 136 | CONFIG_IRQ_SPORT0_TX=9 | ||
| 137 | CONFIG_IRQ_SPORT1_RX=9 | ||
| 138 | CONFIG_IRQ_SPORT1_TX=9 | ||
| 139 | CONFIG_IRQ_TWI=10 | ||
| 140 | CONFIG_IRQ_SPI=10 | ||
| 141 | CONFIG_IRQ_UART0_RX=10 | ||
| 142 | CONFIG_IRQ_UART0_TX=10 | ||
| 143 | CONFIG_IRQ_UART1_RX=10 | ||
| 144 | CONFIG_IRQ_UART1_TX=10 | ||
| 145 | CONFIG_IRQ_MAC_RX=11 | ||
| 146 | CONFIG_IRQ_MAC_TX=11 | ||
| 147 | CONFIG_IRQ_TMR0=12 | ||
| 148 | CONFIG_IRQ_TMR1=12 | ||
| 149 | CONFIG_IRQ_TMR2=12 | ||
| 150 | CONFIG_IRQ_TMR3=12 | ||
| 151 | CONFIG_IRQ_TMR4=12 | ||
| 152 | CONFIG_IRQ_TMR5=12 | ||
| 153 | CONFIG_IRQ_TMR6=12 | ||
| 154 | CONFIG_IRQ_TMR7=12 | ||
| 155 | CONFIG_IRQ_PORTG_INTB=12 | ||
| 156 | CONFIG_IRQ_MEM_DMA0=13 | ||
| 157 | CONFIG_IRQ_MEM_DMA1=13 | ||
| 158 | CONFIG_IRQ_WATCH=13 | ||
| 159 | # CONFIG_BFIN537_STAMP is not set | ||
| 160 | # CONFIG_BFIN537_BLUETECHNIX_CM is not set | ||
| 161 | CONFIG_BFIN537_BLUETECHNIX_TCM=y | ||
| 162 | # CONFIG_PNAV10 is not set | ||
| 163 | # CONFIG_CAMSIG_MINOTAUR is not set | ||
| 164 | # CONFIG_GENERIC_BF537_BOARD is not set | ||
| 165 | |||
| 166 | # | ||
| 167 | # BF537 Specific Configuration | ||
| 168 | # | ||
| 169 | |||
| 170 | # | ||
| 171 | # Interrupt Priority Assignment | ||
| 172 | # | ||
| 173 | |||
| 174 | # | ||
| 175 | # Priority | ||
| 176 | # | ||
| 177 | CONFIG_IRQ_DMA_ERROR=7 | ||
| 178 | CONFIG_IRQ_ERROR=7 | ||
| 179 | CONFIG_IRQ_CAN_RX=11 | ||
| 180 | CONFIG_IRQ_CAN_TX=11 | ||
| 181 | CONFIG_IRQ_PROG_INTA=12 | ||
| 182 | |||
| 183 | # | ||
| 184 | # Board customizations | ||
| 185 | # | ||
| 186 | # CONFIG_CMDLINE_BOOL is not set | ||
| 187 | CONFIG_BOOT_LOAD=0x1000 | ||
| 188 | |||
| 189 | # | ||
| 190 | # Clock/PLL Setup | ||
| 191 | # | ||
| 192 | CONFIG_CLKIN_HZ=25000000 | ||
| 193 | # CONFIG_BFIN_KERNEL_CLOCK is not set | ||
| 194 | CONFIG_MAX_MEM_SIZE=32 | ||
| 195 | CONFIG_MAX_VCO_HZ=600000000 | ||
| 196 | CONFIG_MIN_VCO_HZ=50000000 | ||
| 197 | CONFIG_MAX_SCLK_HZ=133333333 | ||
| 198 | CONFIG_MIN_SCLK_HZ=27000000 | ||
| 199 | |||
| 200 | # | ||
| 201 | # Kernel Timer/Scheduler | ||
| 202 | # | ||
| 203 | # CONFIG_HZ_100 is not set | ||
| 204 | CONFIG_HZ_250=y | ||
| 205 | # CONFIG_HZ_300 is not set | ||
| 206 | # CONFIG_HZ_1000 is not set | ||
| 207 | CONFIG_HZ=250 | ||
| 208 | CONFIG_GENERIC_TIME=y | ||
| 209 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 210 | # CONFIG_CYCLES_CLOCKSOURCE is not set | ||
| 211 | # CONFIG_TICK_ONESHOT is not set | ||
| 212 | # CONFIG_NO_HZ is not set | ||
| 213 | # CONFIG_HIGH_RES_TIMERS is not set | ||
| 214 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 215 | |||
| 216 | # | ||
| 217 | # Misc | ||
| 218 | # | ||
| 219 | CONFIG_BFIN_SCRATCH_REG_RETN=y | ||
| 220 | # CONFIG_BFIN_SCRATCH_REG_RETE is not set | ||
| 221 | # CONFIG_BFIN_SCRATCH_REG_CYCLES is not set | ||
| 222 | |||
| 223 | # | ||
| 224 | # Blackfin Kernel Optimizations | ||
| 225 | # | ||
| 226 | |||
| 227 | # | ||
| 228 | # Memory Optimizations | ||
| 229 | # | ||
| 230 | CONFIG_I_ENTRY_L1=y | ||
| 231 | CONFIG_EXCPT_IRQ_SYSC_L1=y | ||
| 232 | CONFIG_DO_IRQ_L1=y | ||
| 233 | CONFIG_CORE_TIMER_IRQ_L1=y | ||
| 234 | CONFIG_IDLE_L1=y | ||
| 235 | CONFIG_SCHEDULE_L1=y | ||
| 236 | CONFIG_ARITHMETIC_OPS_L1=y | ||
| 237 | CONFIG_ACCESS_OK_L1=y | ||
| 238 | CONFIG_MEMSET_L1=y | ||
| 239 | CONFIG_MEMCPY_L1=y | ||
| 240 | CONFIG_SYS_BFIN_SPINLOCK_L1=y | ||
| 241 | CONFIG_IP_CHECKSUM_L1=y | ||
| 242 | CONFIG_CACHELINE_ALIGNED_L1=y | ||
| 243 | CONFIG_SYSCALL_TAB_L1=y | ||
| 244 | CONFIG_CPLB_SWITCH_TAB_L1=y | ||
| 245 | CONFIG_RAMKERNEL=y | ||
| 246 | # CONFIG_ROMKERNEL is not set | ||
| 247 | CONFIG_SELECT_MEMORY_MODEL=y | ||
| 248 | CONFIG_FLATMEM_MANUAL=y | ||
| 249 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
| 250 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
| 251 | CONFIG_FLATMEM=y | ||
| 252 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
| 253 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 254 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 255 | CONFIG_SPLIT_PTLOCK_CPUS=4 | ||
| 256 | # CONFIG_RESOURCES_64BIT is not set | ||
| 257 | CONFIG_ZONE_DMA_FLAG=1 | ||
| 258 | CONFIG_VIRT_TO_BUS=y | ||
| 259 | # CONFIG_BFIN_GPTIMERS is not set | ||
| 260 | CONFIG_BFIN_DMA_5XX=y | ||
| 261 | # CONFIG_DMA_UNCACHED_4M is not set | ||
| 262 | # CONFIG_DMA_UNCACHED_2M is not set | ||
| 263 | CONFIG_DMA_UNCACHED_1M=y | ||
| 264 | # CONFIG_DMA_UNCACHED_NONE is not set | ||
| 265 | |||
| 266 | # | ||
| 267 | # Cache Support | ||
| 268 | # | ||
| 269 | CONFIG_BFIN_ICACHE=y | ||
| 270 | CONFIG_BFIN_DCACHE=y | ||
| 271 | # CONFIG_BFIN_DCACHE_BANKA is not set | ||
| 272 | # CONFIG_BFIN_ICACHE_LOCK is not set | ||
| 273 | CONFIG_BFIN_WB=y | ||
| 274 | # CONFIG_BFIN_WT is not set | ||
| 275 | # CONFIG_MPU is not set | ||
| 276 | |||
| 277 | # | ||
| 278 | # Asynchonous Memory Configuration | ||
| 279 | # | ||
| 280 | |||
| 281 | # | ||
| 282 | # EBIU_AMGCTL Global Control | ||
| 283 | # | ||
| 284 | CONFIG_C_AMCKEN=y | ||
| 285 | CONFIG_C_CDPRIO=y | ||
| 286 | # CONFIG_C_AMBEN is not set | ||
| 287 | # CONFIG_C_AMBEN_B0 is not set | ||
| 288 | # CONFIG_C_AMBEN_B0_B1 is not set | ||
| 289 | # CONFIG_C_AMBEN_B0_B1_B2 is not set | ||
| 290 | CONFIG_C_AMBEN_ALL=y | ||
| 291 | |||
| 292 | # | ||
| 293 | # EBIU_AMBCTL Control | ||
| 294 | # | ||
| 295 | CONFIG_BANK_0=0x7BB0 | ||
| 296 | CONFIG_BANK_1=0x7BB0 | ||
| 297 | CONFIG_BANK_2=0x7BB0 | ||
| 298 | CONFIG_BANK_3=0xFFC2 | ||
| 299 | |||
| 300 | # | ||
| 301 | # Bus options (PCI, PCMCIA, EISA, MCA, ISA) | ||
| 302 | # | ||
| 303 | # CONFIG_PCI is not set | ||
| 304 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 305 | |||
| 306 | # | ||
| 307 | # Executable file formats | ||
| 308 | # | ||
| 309 | CONFIG_BINFMT_ELF_FDPIC=y | ||
| 310 | CONFIG_BINFMT_FLAT=y | ||
| 311 | CONFIG_BINFMT_ZFLAT=y | ||
| 312 | CONFIG_BINFMT_SHARED_FLAT=y | ||
| 313 | # CONFIG_BINFMT_MISC is not set | ||
| 314 | |||
| 315 | # | ||
| 316 | # Power management options | ||
| 317 | # | ||
| 318 | # CONFIG_PM is not set | ||
| 319 | CONFIG_SUSPEND_UP_POSSIBLE=y | ||
| 320 | # CONFIG_PM_WAKEUP_BY_GPIO is not set | ||
| 321 | |||
| 322 | # | ||
| 323 | # CPU Frequency scaling | ||
| 324 | # | ||
| 325 | # CONFIG_CPU_FREQ is not set | ||
| 326 | |||
| 327 | # | ||
| 328 | # Networking | ||
| 329 | # | ||
| 330 | # CONFIG_NET is not set | ||
| 331 | |||
| 332 | # | ||
| 333 | # Device Drivers | ||
| 334 | # | ||
| 335 | |||
| 336 | # | ||
| 337 | # Generic Driver Options | ||
| 338 | # | ||
| 339 | CONFIG_STANDALONE=y | ||
| 340 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
| 341 | # CONFIG_SYS_HYPERVISOR is not set | ||
| 342 | CONFIG_MTD=y | ||
| 343 | # CONFIG_MTD_DEBUG is not set | ||
| 344 | # CONFIG_MTD_CONCAT is not set | ||
| 345 | CONFIG_MTD_PARTITIONS=y | ||
| 346 | # CONFIG_MTD_REDBOOT_PARTS is not set | ||
| 347 | # CONFIG_MTD_CMDLINE_PARTS is not set | ||
| 348 | |||
| 349 | # | ||
| 350 | # User Modules And Translation Layers | ||
| 351 | # | ||
| 352 | CONFIG_MTD_CHAR=y | ||
| 353 | CONFIG_MTD_BLKDEVS=y | ||
| 354 | CONFIG_MTD_BLOCK=y | ||
| 355 | # CONFIG_FTL is not set | ||
| 356 | # CONFIG_NFTL is not set | ||
| 357 | # CONFIG_INFTL is not set | ||
| 358 | # CONFIG_RFD_FTL is not set | ||
| 359 | # CONFIG_SSFDC is not set | ||
| 360 | # CONFIG_MTD_OOPS is not set | ||
| 361 | |||
| 362 | # | ||
| 363 | # RAM/ROM/Flash chip drivers | ||
| 364 | # | ||
| 365 | # CONFIG_MTD_CFI is not set | ||
| 366 | # CONFIG_MTD_JEDECPROBE is not set | ||
| 367 | CONFIG_MTD_MAP_BANK_WIDTH_1=y | ||
| 368 | CONFIG_MTD_MAP_BANK_WIDTH_2=y | ||
| 369 | CONFIG_MTD_MAP_BANK_WIDTH_4=y | ||
| 370 | # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set | ||
| 371 | # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set | ||
| 372 | # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set | ||
| 373 | CONFIG_MTD_CFI_I1=y | ||
| 374 | CONFIG_MTD_CFI_I2=y | ||
| 375 | # CONFIG_MTD_CFI_I4 is not set | ||
| 376 | # CONFIG_MTD_CFI_I8 is not set | ||
| 377 | CONFIG_MTD_RAM=y | ||
| 378 | # CONFIG_MTD_ROM is not set | ||
| 379 | # CONFIG_MTD_ABSENT is not set | ||
| 380 | |||
| 381 | # | ||
| 382 | # Mapping drivers for chip access | ||
| 383 | # | ||
| 384 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | ||
| 385 | # CONFIG_MTD_GPIO_ADDR is not set | ||
| 386 | CONFIG_MTD_UCLINUX=y | ||
| 387 | # CONFIG_MTD_PLATRAM is not set | ||
| 388 | |||
| 389 | # | ||
| 390 | # Self-contained MTD device drivers | ||
| 391 | # | ||
| 392 | # CONFIG_MTD_DATAFLASH is not set | ||
| 393 | # CONFIG_MTD_M25P80 is not set | ||
| 394 | # CONFIG_MTD_SLRAM is not set | ||
| 395 | # CONFIG_MTD_PHRAM is not set | ||
| 396 | # CONFIG_MTD_MTDRAM is not set | ||
| 397 | # CONFIG_MTD_BLOCK2MTD is not set | ||
| 398 | |||
| 399 | # | ||
| 400 | # Disk-On-Chip Device Drivers | ||
| 401 | # | ||
| 402 | # CONFIG_MTD_DOC2000 is not set | ||
| 403 | # CONFIG_MTD_DOC2001 is not set | ||
| 404 | # CONFIG_MTD_DOC2001PLUS is not set | ||
| 405 | # CONFIG_MTD_NAND is not set | ||
| 406 | # CONFIG_MTD_ONENAND is not set | ||
| 407 | |||
| 408 | # | ||
| 409 | # UBI - Unsorted block images | ||
| 410 | # | ||
| 411 | # CONFIG_MTD_UBI is not set | ||
| 412 | # CONFIG_PARPORT is not set | ||
| 413 | CONFIG_BLK_DEV=y | ||
| 414 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
| 415 | # CONFIG_BLK_DEV_LOOP is not set | ||
| 416 | CONFIG_BLK_DEV_RAM=y | ||
| 417 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
| 418 | CONFIG_BLK_DEV_RAM_SIZE=4096 | ||
| 419 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | ||
| 420 | # CONFIG_CDROM_PKTCDVD is not set | ||
| 421 | CONFIG_MISC_DEVICES=y | ||
| 422 | # CONFIG_EEPROM_93CX6 is not set | ||
| 423 | # CONFIG_IDE is not set | ||
| 424 | |||
| 425 | # | ||
| 426 | # SCSI device support | ||
| 427 | # | ||
| 428 | # CONFIG_RAID_ATTRS is not set | ||
| 429 | # CONFIG_SCSI is not set | ||
| 430 | # CONFIG_SCSI_DMA is not set | ||
| 431 | # CONFIG_SCSI_NETLINK is not set | ||
| 432 | # CONFIG_ATA is not set | ||
| 433 | # CONFIG_MD is not set | ||
| 434 | # CONFIG_PHONE is not set | ||
| 435 | |||
| 436 | # | ||
| 437 | # Input device support | ||
| 438 | # | ||
| 439 | # CONFIG_INPUT is not set | ||
| 440 | |||
| 441 | # | ||
| 442 | # Hardware I/O ports | ||
| 443 | # | ||
| 444 | # CONFIG_SERIO is not set | ||
| 445 | # CONFIG_GAMEPORT is not set | ||
| 446 | |||
| 447 | # | ||
| 448 | # Character devices | ||
| 449 | # | ||
| 450 | # CONFIG_AD9960 is not set | ||
| 451 | # CONFIG_SPI_ADC_BF533 is not set | ||
| 452 | # CONFIG_BF5xx_PPIFCD is not set | ||
| 453 | # CONFIG_BFIN_SIMPLE_TIMER is not set | ||
| 454 | # CONFIG_BF5xx_PPI is not set | ||
| 455 | CONFIG_BFIN_SPORT=y | ||
| 456 | # CONFIG_BFIN_TIMER_LATENCY is not set | ||
| 457 | # CONFIG_SIMPLE_GPIO is not set | ||
| 458 | # CONFIG_VT is not set | ||
| 459 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
| 460 | |||
| 461 | # | ||
| 462 | # Serial drivers | ||
| 463 | # | ||
| 464 | # CONFIG_SERIAL_8250 is not set | ||
| 465 | |||
| 466 | # | ||
| 467 | # Non-8250 serial port support | ||
| 468 | # | ||
| 469 | CONFIG_SERIAL_BFIN=y | ||
| 470 | CONFIG_SERIAL_BFIN_CONSOLE=y | ||
| 471 | CONFIG_SERIAL_BFIN_DMA=y | ||
| 472 | # CONFIG_SERIAL_BFIN_PIO is not set | ||
| 473 | CONFIG_SERIAL_BFIN_UART0=y | ||
| 474 | # CONFIG_BFIN_UART0_CTSRTS is not set | ||
| 475 | CONFIG_SERIAL_BFIN_UART1=y | ||
| 476 | # CONFIG_BFIN_UART1_CTSRTS is not set | ||
| 477 | CONFIG_SERIAL_CORE=y | ||
| 478 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
| 479 | # CONFIG_SERIAL_BFIN_SPORT is not set | ||
| 480 | CONFIG_UNIX98_PTYS=y | ||
| 481 | # CONFIG_LEGACY_PTYS is not set | ||
| 482 | |||
| 483 | # | ||
| 484 | # CAN, the car bus and industrial fieldbus | ||
| 485 | # | ||
| 486 | # CONFIG_CAN4LINUX is not set | ||
| 487 | # CONFIG_IPMI_HANDLER is not set | ||
| 488 | # CONFIG_HW_RANDOM is not set | ||
| 489 | # CONFIG_GEN_RTC is not set | ||
| 490 | # CONFIG_R3964 is not set | ||
| 491 | # CONFIG_RAW_DRIVER is not set | ||
| 492 | # CONFIG_TCG_TPM is not set | ||
| 493 | # CONFIG_I2C is not set | ||
| 494 | |||
| 495 | # | ||
| 496 | # SPI support | ||
| 497 | # | ||
| 498 | CONFIG_SPI=y | ||
| 499 | CONFIG_SPI_MASTER=y | ||
| 500 | |||
| 501 | # | ||
| 502 | # SPI Master Controller Drivers | ||
| 503 | # | ||
| 504 | CONFIG_SPI_BFIN=y | ||
| 505 | # CONFIG_SPI_BITBANG is not set | ||
| 506 | |||
| 507 | # | ||
| 508 | # SPI Protocol Masters | ||
| 509 | # | ||
| 510 | # CONFIG_SPI_AT25 is not set | ||
| 511 | # CONFIG_SPI_SPIDEV is not set | ||
| 512 | # CONFIG_SPI_TLE62X0 is not set | ||
| 513 | # CONFIG_W1 is not set | ||
| 514 | # CONFIG_POWER_SUPPLY is not set | ||
| 515 | # CONFIG_HWMON is not set | ||
| 516 | CONFIG_WATCHDOG=y | ||
| 517 | # CONFIG_WATCHDOG_NOWAYOUT is not set | ||
| 518 | |||
| 519 | # | ||
| 520 | # Watchdog Device Drivers | ||
| 521 | # | ||
| 522 | # CONFIG_SOFT_WATCHDOG is not set | ||
| 523 | CONFIG_BFIN_WDT=y | ||
| 524 | |||
| 525 | # | ||
| 526 | # Sonics Silicon Backplane | ||
| 527 | # | ||
| 528 | CONFIG_SSB_POSSIBLE=y | ||
| 529 | # CONFIG_SSB is not set | ||
| 530 | |||
| 531 | # | ||
| 532 | # Multifunction device drivers | ||
| 533 | # | ||
| 534 | # CONFIG_MFD_SM501 is not set | ||
| 535 | |||
| 536 | # | ||
| 537 | # Multimedia devices | ||
| 538 | # | ||
| 539 | # CONFIG_VIDEO_DEV is not set | ||
| 540 | # CONFIG_DAB is not set | ||
| 541 | |||
| 542 | # | ||
| 543 | # Graphics support | ||
| 544 | # | ||
| 545 | # CONFIG_VGASTATE is not set | ||
| 546 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 547 | # CONFIG_FB is not set | ||
| 548 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 549 | |||
| 550 | # | ||
| 551 | # Display device support | ||
| 552 | # | ||
| 553 | # CONFIG_DISPLAY_SUPPORT is not set | ||
| 554 | |||
| 555 | # | ||
| 556 | # Sound | ||
| 557 | # | ||
| 558 | # CONFIG_SOUND is not set | ||
| 559 | # CONFIG_USB_SUPPORT is not set | ||
| 560 | # CONFIG_MMC is not set | ||
| 561 | # CONFIG_NEW_LEDS is not set | ||
| 562 | # CONFIG_RTC_CLASS is not set | ||
| 563 | |||
| 564 | # | ||
| 565 | # Userspace I/O | ||
| 566 | # | ||
| 567 | # CONFIG_UIO is not set | ||
| 568 | |||
| 569 | # | ||
| 570 | # File systems | ||
| 571 | # | ||
| 572 | CONFIG_EXT2_FS=y | ||
| 573 | CONFIG_EXT2_FS_XATTR=y | ||
| 574 | # CONFIG_EXT2_FS_POSIX_ACL is not set | ||
| 575 | # CONFIG_EXT2_FS_SECURITY is not set | ||
| 576 | # CONFIG_EXT3_FS is not set | ||
| 577 | # CONFIG_EXT4DEV_FS is not set | ||
| 578 | CONFIG_FS_MBCACHE=y | ||
| 579 | # CONFIG_REISERFS_FS is not set | ||
| 580 | # CONFIG_JFS_FS is not set | ||
| 581 | # CONFIG_FS_POSIX_ACL is not set | ||
| 582 | # CONFIG_XFS_FS is not set | ||
| 583 | # CONFIG_GFS2_FS is not set | ||
| 584 | # CONFIG_MINIX_FS is not set | ||
| 585 | # CONFIG_ROMFS_FS is not set | ||
| 586 | CONFIG_INOTIFY=y | ||
| 587 | CONFIG_INOTIFY_USER=y | ||
| 588 | # CONFIG_QUOTA is not set | ||
| 589 | # CONFIG_DNOTIFY is not set | ||
| 590 | # CONFIG_AUTOFS_FS is not set | ||
| 591 | # CONFIG_AUTOFS4_FS is not set | ||
| 592 | # CONFIG_FUSE_FS is not set | ||
| 593 | |||
| 594 | # | ||
| 595 | # CD-ROM/DVD Filesystems | ||
| 596 | # | ||
| 597 | # CONFIG_ISO9660_FS is not set | ||
| 598 | # CONFIG_UDF_FS is not set | ||
| 599 | |||
| 600 | # | ||
| 601 | # DOS/FAT/NT Filesystems | ||
| 602 | # | ||
| 603 | # CONFIG_MSDOS_FS is not set | ||
| 604 | # CONFIG_VFAT_FS is not set | ||
| 605 | # CONFIG_NTFS_FS is not set | ||
| 606 | |||
| 607 | # | ||
| 608 | # Pseudo filesystems | ||
| 609 | # | ||
| 610 | CONFIG_PROC_FS=y | ||
| 611 | CONFIG_PROC_SYSCTL=y | ||
| 612 | CONFIG_SYSFS=y | ||
| 613 | # CONFIG_TMPFS is not set | ||
| 614 | # CONFIG_HUGETLB_PAGE is not set | ||
| 615 | # CONFIG_CONFIGFS_FS is not set | ||
| 616 | |||
| 617 | # | ||
| 618 | # Miscellaneous filesystems | ||
| 619 | # | ||
| 620 | # CONFIG_ADFS_FS is not set | ||
| 621 | # CONFIG_AFFS_FS is not set | ||
| 622 | # CONFIG_HFS_FS is not set | ||
| 623 | # CONFIG_HFSPLUS_FS is not set | ||
| 624 | # CONFIG_BEFS_FS is not set | ||
| 625 | # CONFIG_BFS_FS is not set | ||
| 626 | # CONFIG_EFS_FS is not set | ||
| 627 | # CONFIG_YAFFS_FS is not set | ||
| 628 | # CONFIG_JFFS2_FS is not set | ||
| 629 | # CONFIG_CRAMFS is not set | ||
| 630 | # CONFIG_VXFS_FS is not set | ||
| 631 | # CONFIG_HPFS_FS is not set | ||
| 632 | # CONFIG_QNX4FS_FS is not set | ||
| 633 | # CONFIG_SYSV_FS is not set | ||
| 634 | # CONFIG_UFS_FS is not set | ||
| 635 | |||
| 636 | # | ||
| 637 | # Partition Types | ||
| 638 | # | ||
| 639 | # CONFIG_PARTITION_ADVANCED is not set | ||
| 640 | CONFIG_MSDOS_PARTITION=y | ||
| 641 | # CONFIG_NLS is not set | ||
| 642 | # CONFIG_INSTRUMENTATION is not set | ||
| 643 | |||
| 644 | # | ||
| 645 | # Kernel hacking | ||
| 646 | # | ||
| 647 | # CONFIG_PRINTK_TIME is not set | ||
| 648 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
| 649 | CONFIG_ENABLE_MUST_CHECK=y | ||
| 650 | # CONFIG_MAGIC_SYSRQ is not set | ||
| 651 | # CONFIG_UNUSED_SYMBOLS is not set | ||
| 652 | CONFIG_DEBUG_FS=y | ||
| 653 | # CONFIG_HEADERS_CHECK is not set | ||
| 654 | # CONFIG_DEBUG_KERNEL is not set | ||
| 655 | # CONFIG_DEBUG_BUGVERBOSE is not set | ||
| 656 | # CONFIG_SAMPLES is not set | ||
| 657 | CONFIG_DEBUG_MMRS=y | ||
| 658 | CONFIG_DEBUG_HUNT_FOR_ZERO=y | ||
| 659 | CONFIG_DEBUG_BFIN_HWTRACE_ON=y | ||
| 660 | CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_OFF=y | ||
| 661 | # CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE is not set | ||
| 662 | # CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_TWO is not set | ||
| 663 | CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION=0 | ||
| 664 | # CONFIG_DEBUG_BFIN_HWTRACE_EXPAND is not set | ||
| 665 | # CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set | ||
| 666 | # CONFIG_EARLY_PRINTK is not set | ||
| 667 | CONFIG_CPLB_INFO=y | ||
| 668 | CONFIG_ACCESS_CHECK=y | ||
| 669 | |||
| 670 | # | ||
| 671 | # Security options | ||
| 672 | # | ||
| 673 | # CONFIG_KEYS is not set | ||
| 674 | CONFIG_SECURITY=y | ||
| 675 | # CONFIG_SECURITY_NETWORK is not set | ||
| 676 | CONFIG_SECURITY_CAPABILITIES=y | ||
| 677 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
| 678 | # CONFIG_CRYPTO is not set | ||
| 679 | |||
| 680 | # | ||
| 681 | # Library routines | ||
| 682 | # | ||
| 683 | # CONFIG_CRC_CCITT is not set | ||
| 684 | # CONFIG_CRC16 is not set | ||
| 685 | # CONFIG_CRC_ITU_T is not set | ||
| 686 | # CONFIG_CRC32 is not set | ||
| 687 | # CONFIG_CRC7 is not set | ||
| 688 | # CONFIG_LIBCRC32C is not set | ||
| 689 | CONFIG_ZLIB_INFLATE=y | ||
| 690 | CONFIG_PLIST=y | ||
| 691 | CONFIG_HAS_IOMEM=y | ||
| 692 | CONFIG_HAS_IOPORT=y | ||
| 693 | CONFIG_HAS_DMA=y | ||
diff --git a/include/asm-blackfin/.gitignore b/arch/blackfin/include/asm/.gitignore index 7858564a4466..7858564a4466 100644 --- a/include/asm-blackfin/.gitignore +++ b/arch/blackfin/include/asm/.gitignore | |||
diff --git a/include/asm-blackfin/Kbuild b/arch/blackfin/include/asm/Kbuild index 71f8fe783258..606ecfdcc962 100644 --- a/include/asm-blackfin/Kbuild +++ b/arch/blackfin/include/asm/Kbuild | |||
| @@ -1,3 +1,3 @@ | |||
| 1 | include include/asm-generic/Kbuild.asm | 1 | include include/asm-generic/Kbuild.asm |
| 2 | 2 | ||
| 3 | header-y += fixed_code.h | 3 | unifdef-y += fixed_code.h |
diff --git a/include/asm-blackfin/a.out.h b/arch/blackfin/include/asm/a.out.h index 6c3d652ebd33..6c3d652ebd33 100644 --- a/include/asm-blackfin/a.out.h +++ b/arch/blackfin/include/asm/a.out.h | |||
diff --git a/include/asm-blackfin/atomic.h b/arch/blackfin/include/asm/atomic.h index 7cf508718605..7cf508718605 100644 --- a/include/asm-blackfin/atomic.h +++ b/arch/blackfin/include/asm/atomic.h | |||
diff --git a/include/asm-blackfin/auxvec.h b/arch/blackfin/include/asm/auxvec.h index 215506cd87b7..215506cd87b7 100644 --- a/include/asm-blackfin/auxvec.h +++ b/arch/blackfin/include/asm/auxvec.h | |||
diff --git a/include/asm-blackfin/bfin-global.h b/arch/blackfin/include/asm/bfin-global.h index 320aa5e167e9..7ba70de66f2b 100644 --- a/include/asm-blackfin/bfin-global.h +++ b/arch/blackfin/include/asm/bfin-global.h | |||
| @@ -56,37 +56,20 @@ extern void dump_bfin_process(struct pt_regs *regs); | |||
| 56 | extern void dump_bfin_mem(struct pt_regs *regs); | 56 | extern void dump_bfin_mem(struct pt_regs *regs); |
| 57 | extern void dump_bfin_trace_buffer(void); | 57 | extern void dump_bfin_trace_buffer(void); |
| 58 | 58 | ||
| 59 | /* init functions only */ | ||
| 59 | extern int init_arch_irq(void); | 60 | extern int init_arch_irq(void); |
| 60 | extern void bfin_reset(void); | ||
| 61 | extern void _cplb_hdr(void); | ||
| 62 | /* Blackfin cache functions */ | ||
| 63 | extern void bfin_icache_init(void); | 61 | extern void bfin_icache_init(void); |
| 64 | extern void bfin_dcache_init(void); | 62 | extern void bfin_dcache_init(void); |
| 65 | extern int read_iloc(void); | ||
| 66 | extern int bfin_console_init(void); | ||
| 67 | extern asmlinkage void lower_to_irq14(void); | ||
| 68 | extern asmlinkage void bfin_return_from_exception(void); | ||
| 69 | extern void init_exception_vectors(void); | 63 | extern void init_exception_vectors(void); |
| 70 | extern void init_dma(void); | ||
| 71 | extern void program_IAR(void); | 64 | extern void program_IAR(void); |
| 72 | extern void evt14_softirq(void); | 65 | |
| 66 | extern void bfin_reset(void); | ||
| 67 | extern asmlinkage void lower_to_irq14(void); | ||
| 68 | extern asmlinkage void bfin_return_from_exception(void); | ||
| 69 | extern asmlinkage void evt14_softirq(void); | ||
| 73 | extern asmlinkage void asm_do_IRQ(unsigned int irq, struct pt_regs *regs); | 70 | extern asmlinkage void asm_do_IRQ(unsigned int irq, struct pt_regs *regs); |
| 74 | extern void bfin_gpio_interrupt_setup(int irq, int irq_pfx, int type); | ||
| 75 | extern int bfin_internal_set_wake(unsigned int irq, unsigned int state); | 71 | extern int bfin_internal_set_wake(unsigned int irq, unsigned int state); |
| 76 | 72 | ||
| 77 | extern asmlinkage void finish_atomic_sections (struct pt_regs *regs); | ||
| 78 | extern char fixed_code_start; | ||
| 79 | extern char fixed_code_end; | ||
| 80 | extern int atomic_xchg32(void); | ||
| 81 | extern int atomic_cas32(void); | ||
| 82 | extern int atomic_add32(void); | ||
| 83 | extern int atomic_sub32(void); | ||
| 84 | extern int atomic_ior32(void); | ||
| 85 | extern int atomic_and32(void); | ||
| 86 | extern int atomic_xor32(void); | ||
| 87 | extern void safe_user_instruction(void); | ||
| 88 | extern void sigreturn_stub(void); | ||
| 89 | |||
| 90 | extern void *l1_data_A_sram_alloc(size_t); | 73 | extern void *l1_data_A_sram_alloc(size_t); |
| 91 | extern void *l1_data_B_sram_alloc(size_t); | 74 | extern void *l1_data_B_sram_alloc(size_t); |
| 92 | extern void *l1_inst_sram_alloc(size_t); | 75 | extern void *l1_inst_sram_alloc(size_t); |
| @@ -110,11 +93,10 @@ extern void *sram_alloc_with_lsl(size_t, unsigned long); | |||
| 110 | extern int sram_free_with_lsl(const void*); | 93 | extern int sram_free_with_lsl(const void*); |
| 111 | 94 | ||
| 112 | extern const char bfin_board_name[]; | 95 | extern const char bfin_board_name[]; |
| 113 | extern unsigned long wall_jiffies; | ||
| 114 | 96 | ||
| 115 | extern unsigned long bfin_sic_iwr[]; | 97 | extern unsigned long bfin_sic_iwr[]; |
| 98 | extern unsigned vr_wakeup; | ||
| 116 | extern u16 _bfin_swrst; /* shadow for Software Reset Register (SWRST) */ | 99 | extern u16 _bfin_swrst; /* shadow for Software Reset Register (SWRST) */ |
| 117 | extern struct file_operations dpmc_fops; | ||
| 118 | extern unsigned long _ramstart, _ramend, _rambase; | 100 | extern unsigned long _ramstart, _ramend, _rambase; |
| 119 | extern unsigned long memory_start, memory_end, physical_mem_end; | 101 | extern unsigned long memory_start, memory_end, physical_mem_end; |
| 120 | extern char _stext_l1[], _etext_l1[], _sdata_l1[], _edata_l1[], _sbss_l1[], | 102 | extern char _stext_l1[], _etext_l1[], _sdata_l1[], _edata_l1[], _sbss_l1[], |
| @@ -122,8 +104,12 @@ extern char _stext_l1[], _etext_l1[], _sdata_l1[], _edata_l1[], _sbss_l1[], | |||
| 122 | _stext_l2[], _etext_l2[], _sdata_l2[], _edata_l2[], _sbss_l2[], | 104 | _stext_l2[], _etext_l2[], _sdata_l2[], _edata_l2[], _sbss_l2[], |
| 123 | _ebss_l2[], _l2_lma_start[]; | 105 | _ebss_l2[], _l2_lma_start[]; |
| 124 | 106 | ||
| 125 | #ifdef CONFIG_MTD_UCLINUX | 107 | /* only used when CONFIG_MTD_UCLINUX */ |
| 126 | extern unsigned long memory_mtd_start, memory_mtd_end, mtd_size; | 108 | extern unsigned long memory_mtd_start, memory_mtd_end, mtd_size; |
| 109 | |||
| 110 | #ifdef CONFIG_BFIN_ICACHE_LOCK | ||
| 111 | extern void cache_grab_lock(int way); | ||
| 112 | extern void cache_lock(int way); | ||
| 127 | #endif | 113 | #endif |
| 128 | 114 | ||
| 129 | #endif | 115 | #endif |
diff --git a/include/asm-blackfin/bfin5xx_spi.h b/arch/blackfin/include/asm/bfin5xx_spi.h index 9fa19158e38d..9fa19158e38d 100644 --- a/include/asm-blackfin/bfin5xx_spi.h +++ b/arch/blackfin/include/asm/bfin5xx_spi.h | |||
diff --git a/include/asm-blackfin/bfin_simple_timer.h b/arch/blackfin/include/asm/bfin_simple_timer.h index fccbb595464a..fccbb595464a 100644 --- a/include/asm-blackfin/bfin_simple_timer.h +++ b/arch/blackfin/include/asm/bfin_simple_timer.h | |||
diff --git a/include/asm-blackfin/bfin_sport.h b/arch/blackfin/include/asm/bfin_sport.h index c76ed8def302..c76ed8def302 100644 --- a/include/asm-blackfin/bfin_sport.h +++ b/arch/blackfin/include/asm/bfin_sport.h | |||
diff --git a/include/asm-blackfin/bitops.h b/arch/blackfin/include/asm/bitops.h index b39a175c79c1..b39a175c79c1 100644 --- a/include/asm-blackfin/bitops.h +++ b/arch/blackfin/include/asm/bitops.h | |||
diff --git a/include/asm-blackfin/blackfin.h b/arch/blackfin/include/asm/blackfin.h index 984b74f0a2ec..8749b0e321ab 100644 --- a/include/asm-blackfin/blackfin.h +++ b/arch/blackfin/include/asm/blackfin.h | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | #define HI(con32) (((con32) >> 16) & 0xFFFF) | 11 | #define HI(con32) (((con32) >> 16) & 0xFFFF) |
| 12 | #define hi(con32) (((con32) >> 16) & 0xFFFF) | 12 | #define hi(con32) (((con32) >> 16) & 0xFFFF) |
| 13 | 13 | ||
| 14 | #include <asm/mach/anomaly.h> | 14 | #include <mach/anomaly.h> |
| 15 | 15 | ||
| 16 | #ifndef __ASSEMBLY__ | 16 | #ifndef __ASSEMBLY__ |
| 17 | 17 | ||
| @@ -86,7 +86,7 @@ static inline void CSYNC(void) | |||
| 86 | 86 | ||
| 87 | #endif /* __ASSEMBLY__ */ | 87 | #endif /* __ASSEMBLY__ */ |
| 88 | 88 | ||
| 89 | #include <asm/mach/blackfin.h> | 89 | #include <mach/blackfin.h> |
| 90 | #include <asm/bfin-global.h> | 90 | #include <asm/bfin-global.h> |
| 91 | 91 | ||
| 92 | #endif /* _BLACKFIN_H_ */ | 92 | #endif /* _BLACKFIN_H_ */ |
diff --git a/include/asm-blackfin/bug.h b/arch/blackfin/include/asm/bug.h index 6d3e11b1fc57..6d3e11b1fc57 100644 --- a/include/asm-blackfin/bug.h +++ b/arch/blackfin/include/asm/bug.h | |||
diff --git a/include/asm-blackfin/bugs.h b/arch/blackfin/include/asm/bugs.h index 9093c9c1fb81..9093c9c1fb81 100644 --- a/include/asm-blackfin/bugs.h +++ b/arch/blackfin/include/asm/bugs.h | |||
diff --git a/include/asm-blackfin/byteorder.h b/arch/blackfin/include/asm/byteorder.h index 6a673d42da18..6a673d42da18 100644 --- a/include/asm-blackfin/byteorder.h +++ b/arch/blackfin/include/asm/byteorder.h | |||
diff --git a/include/asm-blackfin/cache.h b/arch/blackfin/include/asm/cache.h index 023d72133b5a..023d72133b5a 100644 --- a/include/asm-blackfin/cache.h +++ b/arch/blackfin/include/asm/cache.h | |||
diff --git a/include/asm-blackfin/cacheflush.h b/arch/blackfin/include/asm/cacheflush.h index d81a77545a04..d81a77545a04 100644 --- a/include/asm-blackfin/cacheflush.h +++ b/arch/blackfin/include/asm/cacheflush.h | |||
diff --git a/include/asm-blackfin/mach-common/cdef_LPBlackfin.h b/arch/blackfin/include/asm/cdef_LPBlackfin.h index ede210eca4ec..35f841bce57d 100644 --- a/include/asm-blackfin/mach-common/cdef_LPBlackfin.h +++ b/arch/blackfin/include/asm/cdef_LPBlackfin.h | |||
| @@ -33,17 +33,13 @@ | |||
| 33 | #warning cdef_LPBlackfin.h should only be included for 532 compatible chips. | 33 | #warning cdef_LPBlackfin.h should only be included for 532 compatible chips. |
| 34 | #endif | 34 | #endif |
| 35 | */ | 35 | */ |
| 36 | #include <asm/mach-common/def_LPBlackfin.h> | 36 | #include <asm/def_LPBlackfin.h> |
| 37 | 37 | ||
| 38 | /*Cache & SRAM Memory*/ | 38 | /*Cache & SRAM Memory*/ |
| 39 | #define bfin_read_SRAM_BASE_ADDRESS() bfin_read32(SRAM_BASE_ADDRESS) | 39 | #define bfin_read_SRAM_BASE_ADDRESS() bfin_read32(SRAM_BASE_ADDRESS) |
| 40 | #define bfin_write_SRAM_BASE_ADDRESS(val) bfin_write32(SRAM_BASE_ADDRESS,val) | 40 | #define bfin_write_SRAM_BASE_ADDRESS(val) bfin_write32(SRAM_BASE_ADDRESS,val) |
| 41 | #define bfin_read_DMEM_CONTROL() bfin_read32(DMEM_CONTROL) | 41 | #define bfin_read_DMEM_CONTROL() bfin_read32(DMEM_CONTROL) |
| 42 | #if ANOMALY_05000125 | ||
| 43 | extern void bfin_write_DMEM_CONTROL(unsigned int val); | ||
| 44 | #else | ||
| 45 | #define bfin_write_DMEM_CONTROL(val) bfin_write32(DMEM_CONTROL,val) | 42 | #define bfin_write_DMEM_CONTROL(val) bfin_write32(DMEM_CONTROL,val) |
| 46 | #endif | ||
| 47 | #define bfin_read_DCPLB_STATUS() bfin_read32(DCPLB_STATUS) | 43 | #define bfin_read_DCPLB_STATUS() bfin_read32(DCPLB_STATUS) |
| 48 | #define bfin_write_DCPLB_STATUS(val) bfin_write32(DCPLB_STATUS,val) | 44 | #define bfin_write_DCPLB_STATUS(val) bfin_write32(DCPLB_STATUS,val) |
| 49 | #define bfin_read_DCPLB_FAULT_ADDR() bfin_read32(DCPLB_FAULT_ADDR) | 45 | #define bfin_read_DCPLB_FAULT_ADDR() bfin_read32(DCPLB_FAULT_ADDR) |
| @@ -129,11 +125,7 @@ extern void bfin_write_DMEM_CONTROL(unsigned int val); | |||
| 129 | #define DTEST_DATA3 0xFFE0040C | 125 | #define DTEST_DATA3 0xFFE0040C |
| 130 | */ | 126 | */ |
| 131 | #define bfin_read_IMEM_CONTROL() bfin_read32(IMEM_CONTROL) | 127 | #define bfin_read_IMEM_CONTROL() bfin_read32(IMEM_CONTROL) |
| 132 | #if ANOMALY_05000125 | ||
| 133 | extern void bfin_write_IMEM_CONTROL(unsigned int val); | ||
| 134 | #else | ||
| 135 | #define bfin_write_IMEM_CONTROL(val) bfin_write32(IMEM_CONTROL,val) | 128 | #define bfin_write_IMEM_CONTROL(val) bfin_write32(IMEM_CONTROL,val) |
| 136 | #endif | ||
| 137 | #define bfin_read_ICPLB_STATUS() bfin_read32(ICPLB_STATUS) | 129 | #define bfin_read_ICPLB_STATUS() bfin_read32(ICPLB_STATUS) |
| 138 | #define bfin_write_ICPLB_STATUS(val) bfin_write32(ICPLB_STATUS,val) | 130 | #define bfin_write_ICPLB_STATUS(val) bfin_write32(ICPLB_STATUS,val) |
| 139 | #define bfin_read_ICPLB_FAULT_ADDR() bfin_read32(ICPLB_FAULT_ADDR) | 131 | #define bfin_read_ICPLB_FAULT_ADDR() bfin_read32(ICPLB_FAULT_ADDR) |
diff --git a/include/asm-blackfin/checksum.h b/arch/blackfin/include/asm/checksum.h index 6f6af2b8e9e0..6f6af2b8e9e0 100644 --- a/include/asm-blackfin/checksum.h +++ b/arch/blackfin/include/asm/checksum.h | |||
diff --git a/include/asm-blackfin/mach-common/clocks.h b/arch/blackfin/include/asm/clocks.h index 033bba92d61c..033bba92d61c 100644 --- a/include/asm-blackfin/mach-common/clocks.h +++ b/arch/blackfin/include/asm/clocks.h | |||
diff --git a/include/asm-blackfin/mach-common/context.S b/arch/blackfin/include/asm/context.S index c0e630edfb9a..c0e630edfb9a 100644 --- a/include/asm-blackfin/mach-common/context.S +++ b/arch/blackfin/include/asm/context.S | |||
diff --git a/include/asm-blackfin/cplb-mpu.h b/arch/blackfin/include/asm/cplb-mpu.h index 75c67b99d607..75c67b99d607 100644 --- a/include/asm-blackfin/cplb-mpu.h +++ b/arch/blackfin/include/asm/cplb-mpu.h | |||
diff --git a/include/asm-blackfin/cplb.h b/arch/blackfin/include/asm/cplb.h index 5b0da9a69b67..05d6f05fb748 100644 --- a/include/asm-blackfin/cplb.h +++ b/arch/blackfin/include/asm/cplb.h | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | #define _CPLB_H | 31 | #define _CPLB_H |
| 32 | 32 | ||
| 33 | #include <asm/blackfin.h> | 33 | #include <asm/blackfin.h> |
| 34 | #include <asm/mach/anomaly.h> | 34 | #include <mach/anomaly.h> |
| 35 | 35 | ||
| 36 | #define SDRAM_IGENERIC (CPLB_L1_CHBL | CPLB_USER_RD | CPLB_VALID | CPLB_PORTPRIO) | 36 | #define SDRAM_IGENERIC (CPLB_L1_CHBL | CPLB_USER_RD | CPLB_VALID | CPLB_PORTPRIO) |
| 37 | #define SDRAM_IKERNEL (SDRAM_IGENERIC | CPLB_LOCK) | 37 | #define SDRAM_IKERNEL (SDRAM_IGENERIC | CPLB_LOCK) |
diff --git a/include/asm-blackfin/cplbinit.h b/arch/blackfin/include/asm/cplbinit.h index 0eb1c1b685a7..0eb1c1b685a7 100644 --- a/include/asm-blackfin/cplbinit.h +++ b/arch/blackfin/include/asm/cplbinit.h | |||
diff --git a/include/asm-blackfin/cpumask.h b/arch/blackfin/include/asm/cpumask.h index b20a8e9012cb..b20a8e9012cb 100644 --- a/include/asm-blackfin/cpumask.h +++ b/arch/blackfin/include/asm/cpumask.h | |||
diff --git a/include/asm-blackfin/cputime.h b/arch/blackfin/include/asm/cputime.h index 2b19705f9885..2b19705f9885 100644 --- a/include/asm-blackfin/cputime.h +++ b/arch/blackfin/include/asm/cputime.h | |||
diff --git a/include/asm-blackfin/current.h b/arch/blackfin/include/asm/current.h index 31918d29122c..31918d29122c 100644 --- a/include/asm-blackfin/current.h +++ b/arch/blackfin/include/asm/current.h | |||
diff --git a/include/asm-blackfin/mach-common/def_LPBlackfin.h b/arch/blackfin/include/asm/def_LPBlackfin.h index e8967f6124f7..6341eebff3dc 100644 --- a/include/asm-blackfin/mach-common/def_LPBlackfin.h +++ b/arch/blackfin/include/asm/def_LPBlackfin.h | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | #ifndef _DEF_LPBLACKFIN_H | 31 | #ifndef _DEF_LPBLACKFIN_H |
| 32 | #define _DEF_LPBLACKFIN_H | 32 | #define _DEF_LPBLACKFIN_H |
| 33 | 33 | ||
| 34 | #include <asm/mach/anomaly.h> | 34 | #include <mach/anomaly.h> |
| 35 | 35 | ||
| 36 | #define MK_BMSK_(x) (1<<x) | 36 | #define MK_BMSK_(x) (1<<x) |
| 37 | 37 | ||
diff --git a/include/asm-blackfin/delay.h b/arch/blackfin/include/asm/delay.h index 473a8113277f..0889c3abb593 100644 --- a/include/asm-blackfin/delay.h +++ b/arch/blackfin/include/asm/delay.h | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | #ifndef __ASM_DELAY_H__ | 9 | #ifndef __ASM_DELAY_H__ |
| 10 | #define __ASM_DELAY_H__ | 10 | #define __ASM_DELAY_H__ |
| 11 | 11 | ||
| 12 | #include <asm/mach/anomaly.h> | 12 | #include <mach/anomaly.h> |
| 13 | 13 | ||
| 14 | static inline void __delay(unsigned long loops) | 14 | static inline void __delay(unsigned long loops) |
| 15 | { | 15 | { |
diff --git a/include/asm-blackfin/device.h b/arch/blackfin/include/asm/device.h index d8f9872b0e2d..d8f9872b0e2d 100644 --- a/include/asm-blackfin/device.h +++ b/arch/blackfin/include/asm/device.h | |||
diff --git a/include/asm-blackfin/div64.h b/arch/blackfin/include/asm/div64.h index 6cd978cefb28..6cd978cefb28 100644 --- a/include/asm-blackfin/div64.h +++ b/arch/blackfin/include/asm/div64.h | |||
diff --git a/include/asm-blackfin/dma-mapping.h b/arch/blackfin/include/asm/dma-mapping.h index 1a13c2fc3667..1a13c2fc3667 100644 --- a/include/asm-blackfin/dma-mapping.h +++ b/arch/blackfin/include/asm/dma-mapping.h | |||
diff --git a/include/asm-blackfin/dma.h b/arch/blackfin/include/asm/dma.h index 3cd4b522aa3f..6509733bb0f6 100644 --- a/include/asm-blackfin/dma.h +++ b/arch/blackfin/include/asm/dma.h | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | #include <asm/signal.h> | 35 | #include <asm/signal.h> |
| 36 | 36 | ||
| 37 | #include <linux/kernel.h> | 37 | #include <linux/kernel.h> |
| 38 | #include <asm/mach/dma.h> | 38 | #include <mach/dma.h> |
| 39 | #include <linux/mm.h> | 39 | #include <linux/mm.h> |
| 40 | #include <linux/interrupt.h> | 40 | #include <linux/interrupt.h> |
| 41 | #include <asm/blackfin.h> | 41 | #include <asm/blackfin.h> |
diff --git a/include/asm-blackfin/dpmc.h b/arch/blackfin/include/asm/dpmc.h index de28e6e018b3..96e8208f929a 100644 --- a/include/asm-blackfin/dpmc.h +++ b/arch/blackfin/include/asm/dpmc.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #ifndef __ASSEMBLY__ | 11 | #ifndef __ASSEMBLY__ |
| 12 | 12 | ||
| 13 | void sleep_mode(u32 sic_iwr0, u32 sic_iwr1, u32 sic_iwr2); | 13 | void sleep_mode(u32 sic_iwr0, u32 sic_iwr1, u32 sic_iwr2); |
| 14 | void deep_sleep(u32 sic_iwr0, u32 sic_iwr1, u32 sic_iwr2); | ||
| 15 | void hibernate_mode(u32 sic_iwr0, u32 sic_iwr1, u32 sic_iwr2); | 14 | void hibernate_mode(u32 sic_iwr0, u32 sic_iwr1, u32 sic_iwr2); |
| 16 | void sleep_deeper(u32 sic_iwr0, u32 sic_iwr1, u32 sic_iwr2); | 15 | void sleep_deeper(u32 sic_iwr0, u32 sic_iwr1, u32 sic_iwr2); |
| 17 | void do_hibernate(int wakeup); | 16 | void do_hibernate(int wakeup); |
diff --git a/include/asm-blackfin/early_printk.h b/arch/blackfin/include/asm/early_printk.h index 110f1c1f845c..110f1c1f845c 100644 --- a/include/asm-blackfin/early_printk.h +++ b/arch/blackfin/include/asm/early_printk.h | |||
diff --git a/include/asm-blackfin/elf.h b/arch/blackfin/include/asm/elf.h index 67a03a8a353e..67a03a8a353e 100644 --- a/include/asm-blackfin/elf.h +++ b/arch/blackfin/include/asm/elf.h | |||
diff --git a/include/asm-blackfin/emergency-restart.h b/arch/blackfin/include/asm/emergency-restart.h index 27f6c785d103..27f6c785d103 100644 --- a/include/asm-blackfin/emergency-restart.h +++ b/arch/blackfin/include/asm/emergency-restart.h | |||
diff --git a/include/asm-blackfin/entry.h b/arch/blackfin/include/asm/entry.h index c4f721e0d00d..c4f721e0d00d 100644 --- a/include/asm-blackfin/entry.h +++ b/arch/blackfin/include/asm/entry.h | |||
diff --git a/include/asm-blackfin/errno.h b/arch/blackfin/include/asm/errno.h index 164e4f39bb57..164e4f39bb57 100644 --- a/include/asm-blackfin/errno.h +++ b/arch/blackfin/include/asm/errno.h | |||
diff --git a/include/asm-blackfin/fb.h b/arch/blackfin/include/asm/fb.h index c7df38030992..c7df38030992 100644 --- a/include/asm-blackfin/fb.h +++ b/arch/blackfin/include/asm/fb.h | |||
diff --git a/include/asm-blackfin/fcntl.h b/arch/blackfin/include/asm/fcntl.h index 9c4037127857..9c4037127857 100644 --- a/include/asm-blackfin/fcntl.h +++ b/arch/blackfin/include/asm/fcntl.h | |||
diff --git a/arch/blackfin/include/asm/fixed_code.h b/arch/blackfin/include/asm/fixed_code.h new file mode 100644 index 000000000000..32c4d495d847 --- /dev/null +++ b/arch/blackfin/include/asm/fixed_code.h | |||
| @@ -0,0 +1,46 @@ | |||
| 1 | /* This file defines the fixed addresses where userspace programs can find | ||
| 2 | atomic code sequences. */ | ||
| 3 | |||
| 4 | #ifndef __BFIN_ASM_FIXED_CODE_H__ | ||
| 5 | #define __BFIN_ASM_FIXED_CODE_H__ | ||
| 6 | |||
| 7 | #ifdef __KERNEL__ | ||
| 8 | #ifndef __ASSEMBLY__ | ||
| 9 | #include <linux/linkage.h> | ||
| 10 | #include <linux/ptrace.h> | ||
| 11 | extern asmlinkage void finish_atomic_sections(struct pt_regs *regs); | ||
| 12 | extern char fixed_code_start; | ||
| 13 | extern char fixed_code_end; | ||
| 14 | extern int atomic_xchg32(void); | ||
| 15 | extern int atomic_cas32(void); | ||
| 16 | extern int atomic_add32(void); | ||
| 17 | extern int atomic_sub32(void); | ||
| 18 | extern int atomic_ior32(void); | ||
| 19 | extern int atomic_and32(void); | ||
| 20 | extern int atomic_xor32(void); | ||
| 21 | extern void safe_user_instruction(void); | ||
| 22 | extern void sigreturn_stub(void); | ||
| 23 | #endif | ||
| 24 | #endif | ||
| 25 | |||
| 26 | #define FIXED_CODE_START 0x400 | ||
| 27 | |||
| 28 | #define SIGRETURN_STUB 0x400 | ||
| 29 | |||
| 30 | #define ATOMIC_SEQS_START 0x410 | ||
| 31 | |||
| 32 | #define ATOMIC_XCHG32 0x410 | ||
| 33 | #define ATOMIC_CAS32 0x420 | ||
| 34 | #define ATOMIC_ADD32 0x430 | ||
| 35 | #define ATOMIC_SUB32 0x440 | ||
| 36 | #define ATOMIC_IOR32 0x450 | ||
| 37 | #define ATOMIC_AND32 0x460 | ||
| 38 | #define ATOMIC_XOR32 0x470 | ||
| 39 | |||
| 40 | #define ATOMIC_SEQS_END 0x480 | ||
| 41 | |||
| 42 | #define SAFE_USER_INSTRUCTION 0x480 | ||
| 43 | |||
| 44 | #define FIXED_CODE_END 0x490 | ||
| 45 | |||
| 46 | #endif | ||
diff --git a/include/asm-blackfin/flat.h b/arch/blackfin/include/asm/flat.h index e70074e05f4e..e70074e05f4e 100644 --- a/include/asm-blackfin/flat.h +++ b/arch/blackfin/include/asm/flat.h | |||
diff --git a/include/asm-blackfin/futex.h b/arch/blackfin/include/asm/futex.h index 6a332a9f099c..6a332a9f099c 100644 --- a/include/asm-blackfin/futex.h +++ b/arch/blackfin/include/asm/futex.h | |||
diff --git a/include/asm-blackfin/gpio.h b/arch/blackfin/include/asm/gpio.h index 168f1251eb4d..ad33ac271fd9 100644 --- a/include/asm-blackfin/gpio.h +++ b/arch/blackfin/include/asm/gpio.h | |||
| @@ -224,7 +224,7 @@ | |||
| 224 | #endif | 224 | #endif |
| 225 | 225 | ||
| 226 | #ifdef BF548_FAMILY | 226 | #ifdef BF548_FAMILY |
| 227 | #include <asm-blackfin/mach-bf548/gpio.h> | 227 | #include <mach/gpio.h> |
| 228 | #endif | 228 | #endif |
| 229 | 229 | ||
| 230 | #ifdef BF561_FAMILY | 230 | #ifdef BF561_FAMILY |
diff --git a/include/asm-blackfin/gptimers.h b/arch/blackfin/include/asm/gptimers.h index 0520d2aac8f3..0520d2aac8f3 100644 --- a/include/asm-blackfin/gptimers.h +++ b/arch/blackfin/include/asm/gptimers.h | |||
diff --git a/include/asm-blackfin/hardirq.h b/arch/blackfin/include/asm/hardirq.h index b6b19f1b9dab..b6b19f1b9dab 100644 --- a/include/asm-blackfin/hardirq.h +++ b/arch/blackfin/include/asm/hardirq.h | |||
diff --git a/include/asm-blackfin/hw_irq.h b/arch/blackfin/include/asm/hw_irq.h index 5b51eaec012c..5b51eaec012c 100644 --- a/include/asm-blackfin/hw_irq.h +++ b/arch/blackfin/include/asm/hw_irq.h | |||
diff --git a/include/asm-blackfin/io.h b/arch/blackfin/include/asm/io.h index cbbf7ffdbbff..cbbf7ffdbbff 100644 --- a/include/asm-blackfin/io.h +++ b/arch/blackfin/include/asm/io.h | |||
diff --git a/include/asm-blackfin/ioctl.h b/arch/blackfin/include/asm/ioctl.h index b279fe06dfe5..b279fe06dfe5 100644 --- a/include/asm-blackfin/ioctl.h +++ b/arch/blackfin/include/asm/ioctl.h | |||
diff --git a/include/asm-blackfin/ioctls.h b/arch/blackfin/include/asm/ioctls.h index 895e3173165d..895e3173165d 100644 --- a/include/asm-blackfin/ioctls.h +++ b/arch/blackfin/include/asm/ioctls.h | |||
diff --git a/include/asm-blackfin/ipcbuf.h b/arch/blackfin/include/asm/ipcbuf.h index 8f0899cdf4d2..8f0899cdf4d2 100644 --- a/include/asm-blackfin/ipcbuf.h +++ b/arch/blackfin/include/asm/ipcbuf.h | |||
diff --git a/include/asm-blackfin/irq.h b/arch/blackfin/include/asm/irq.h index 86b67834354d..89f59e18af93 100644 --- a/include/asm-blackfin/irq.h +++ b/arch/blackfin/include/asm/irq.h | |||
| @@ -17,7 +17,7 @@ | |||
| 17 | #ifndef _BFIN_IRQ_H_ | 17 | #ifndef _BFIN_IRQ_H_ |
| 18 | #define _BFIN_IRQ_H_ | 18 | #define _BFIN_IRQ_H_ |
| 19 | 19 | ||
| 20 | #include <asm/mach/irq.h> | 20 | #include <mach/irq.h> |
| 21 | #include <asm/ptrace.h> | 21 | #include <asm/ptrace.h> |
| 22 | 22 | ||
| 23 | /******************************************************************************* | 23 | /******************************************************************************* |
| @@ -34,7 +34,7 @@ | |||
| 34 | * interrupts apart (just the TX/RX for the various devices) | 34 | * interrupts apart (just the TX/RX for the various devices) |
| 35 | *******************************************************************************/ | 35 | *******************************************************************************/ |
| 36 | 36 | ||
| 37 | /* SYS_IRQS and NR_IRQS are defined in <asm/mach-bf5xx/irq.h>*/ | 37 | /* SYS_IRQS and NR_IRQS are defined in <mach-bf5xx/irq.h>*/ |
| 38 | 38 | ||
| 39 | /* | 39 | /* |
| 40 | * Machine specific interrupt sources. | 40 | * Machine specific interrupt sources. |
diff --git a/include/asm-blackfin/irq_handler.h b/arch/blackfin/include/asm/irq_handler.h index 139b5208f9d8..139b5208f9d8 100644 --- a/include/asm-blackfin/irq_handler.h +++ b/arch/blackfin/include/asm/irq_handler.h | |||
diff --git a/include/asm-blackfin/irq_regs.h b/arch/blackfin/include/asm/irq_regs.h index 3dd9c0b70270..3dd9c0b70270 100644 --- a/include/asm-blackfin/irq_regs.h +++ b/arch/blackfin/include/asm/irq_regs.h | |||
diff --git a/include/asm-blackfin/kdebug.h b/arch/blackfin/include/asm/kdebug.h index 6ece1b037665..6ece1b037665 100644 --- a/include/asm-blackfin/kdebug.h +++ b/arch/blackfin/include/asm/kdebug.h | |||
diff --git a/include/asm-blackfin/kgdb.h b/arch/blackfin/include/asm/kgdb.h index 0f73847fd6bc..0f73847fd6bc 100644 --- a/include/asm-blackfin/kgdb.h +++ b/arch/blackfin/include/asm/kgdb.h | |||
diff --git a/include/asm-blackfin/kmap_types.h b/arch/blackfin/include/asm/kmap_types.h index e215f7104974..e215f7104974 100644 --- a/include/asm-blackfin/kmap_types.h +++ b/arch/blackfin/include/asm/kmap_types.h | |||
diff --git a/include/asm-blackfin/l1layout.h b/arch/blackfin/include/asm/l1layout.h index c13ded777828..c13ded777828 100644 --- a/include/asm-blackfin/l1layout.h +++ b/arch/blackfin/include/asm/l1layout.h | |||
diff --git a/include/asm-blackfin/linkage.h b/arch/blackfin/include/asm/linkage.h index 5a822bb790f7..5a822bb790f7 100644 --- a/include/asm-blackfin/linkage.h +++ b/arch/blackfin/include/asm/linkage.h | |||
diff --git a/include/asm-blackfin/local.h b/arch/blackfin/include/asm/local.h index 75afffbc6421..75afffbc6421 100644 --- a/include/asm-blackfin/local.h +++ b/arch/blackfin/include/asm/local.h | |||
diff --git a/include/asm-blackfin/mem_map.h b/arch/blackfin/include/asm/mem_map.h index 42d1f37f6d9c..88d04a707708 100644 --- a/include/asm-blackfin/mem_map.h +++ b/arch/blackfin/include/asm/mem_map.h | |||
| @@ -7,6 +7,6 @@ | |||
| 7 | #ifndef _MEM_MAP_H_ | 7 | #ifndef _MEM_MAP_H_ |
| 8 | #define _MEM_MAP_H_ | 8 | #define _MEM_MAP_H_ |
| 9 | 9 | ||
| 10 | #include <asm/mach/mem_map.h> | 10 | #include <mach/mem_map.h> |
| 11 | 11 | ||
| 12 | #endif /* _MEM_MAP_H_ */ | 12 | #endif /* _MEM_MAP_H_ */ |
diff --git a/include/asm-blackfin/mman.h b/arch/blackfin/include/asm/mman.h index b58f5ad3f024..b58f5ad3f024 100644 --- a/include/asm-blackfin/mman.h +++ b/arch/blackfin/include/asm/mman.h | |||
diff --git a/include/asm-blackfin/mmu.h b/arch/blackfin/include/asm/mmu.h index 757e43906ed4..757e43906ed4 100644 --- a/include/asm-blackfin/mmu.h +++ b/arch/blackfin/include/asm/mmu.h | |||
diff --git a/include/asm-blackfin/mmu_context.h b/arch/blackfin/include/asm/mmu_context.h index f55ec3c23a92..8529552a981f 100644 --- a/include/asm-blackfin/mmu_context.h +++ b/arch/blackfin/include/asm/mmu_context.h | |||
| @@ -173,8 +173,10 @@ static inline void protect_page(struct mm_struct *mm, unsigned long addr, | |||
| 173 | 173 | ||
| 174 | static inline void update_protections(struct mm_struct *mm) | 174 | static inline void update_protections(struct mm_struct *mm) |
| 175 | { | 175 | { |
| 176 | flush_switched_cplbs(); | 176 | if (mm->context.page_rwx_mask == current_rwx_mask) { |
| 177 | set_mask_dcplbs(mm->context.page_rwx_mask); | 177 | flush_switched_cplbs(); |
| 178 | set_mask_dcplbs(mm->context.page_rwx_mask); | ||
| 179 | } | ||
| 178 | } | 180 | } |
| 179 | #endif | 181 | #endif |
| 180 | 182 | ||
diff --git a/include/asm-blackfin/module.h b/arch/blackfin/include/asm/module.h index e3128df139d6..e3128df139d6 100644 --- a/include/asm-blackfin/module.h +++ b/arch/blackfin/include/asm/module.h | |||
diff --git a/include/asm-blackfin/msgbuf.h b/arch/blackfin/include/asm/msgbuf.h index 6fcbe8cd801d..6fcbe8cd801d 100644 --- a/include/asm-blackfin/msgbuf.h +++ b/arch/blackfin/include/asm/msgbuf.h | |||
diff --git a/include/asm-blackfin/mutex.h b/arch/blackfin/include/asm/mutex.h index 458c1f7fbc18..458c1f7fbc18 100644 --- a/include/asm-blackfin/mutex.h +++ b/arch/blackfin/include/asm/mutex.h | |||
diff --git a/include/asm-blackfin/nand.h b/arch/blackfin/include/asm/nand.h index afbaafa793f1..afbaafa793f1 100644 --- a/include/asm-blackfin/nand.h +++ b/arch/blackfin/include/asm/nand.h | |||
diff --git a/include/asm-blackfin/page.h b/arch/blackfin/include/asm/page.h index 344f6a8c1f22..344f6a8c1f22 100644 --- a/include/asm-blackfin/page.h +++ b/arch/blackfin/include/asm/page.h | |||
diff --git a/include/asm-blackfin/page_offset.h b/arch/blackfin/include/asm/page_offset.h index cbaff24b4b25..cbaff24b4b25 100644 --- a/include/asm-blackfin/page_offset.h +++ b/arch/blackfin/include/asm/page_offset.h | |||
diff --git a/include/asm-blackfin/param.h b/arch/blackfin/include/asm/param.h index 41564a6347f8..41564a6347f8 100644 --- a/include/asm-blackfin/param.h +++ b/arch/blackfin/include/asm/param.h | |||
diff --git a/include/asm-blackfin/pci.h b/arch/blackfin/include/asm/pci.h index 61277358c865..61277358c865 100644 --- a/include/asm-blackfin/pci.h +++ b/arch/blackfin/include/asm/pci.h | |||
diff --git a/include/asm-blackfin/percpu.h b/arch/blackfin/include/asm/percpu.h index 78dd61f6b39f..78dd61f6b39f 100644 --- a/include/asm-blackfin/percpu.h +++ b/arch/blackfin/include/asm/percpu.h | |||
diff --git a/include/asm-blackfin/pgalloc.h b/arch/blackfin/include/asm/pgalloc.h index c686e0542fd0..c686e0542fd0 100644 --- a/include/asm-blackfin/pgalloc.h +++ b/arch/blackfin/include/asm/pgalloc.h | |||
diff --git a/include/asm-blackfin/pgtable.h b/arch/blackfin/include/asm/pgtable.h index b11b114689c0..f11684e4ade7 100644 --- a/include/asm-blackfin/pgtable.h +++ b/arch/blackfin/include/asm/pgtable.h | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | #include <asm-generic/4level-fixup.h> | 4 | #include <asm-generic/4level-fixup.h> |
| 5 | 5 | ||
| 6 | #include <asm/page.h> | 6 | #include <asm/page.h> |
| 7 | #include <asm/mach-common/def_LPBlackfin.h> | 7 | #include <asm/def_LPBlackfin.h> |
| 8 | 8 | ||
| 9 | typedef pte_t *pte_addr_t; | 9 | typedef pte_t *pte_addr_t; |
| 10 | /* | 10 | /* |
diff --git a/include/asm-blackfin/poll.h b/arch/blackfin/include/asm/poll.h index 94cc2636e0e2..94cc2636e0e2 100644 --- a/include/asm-blackfin/poll.h +++ b/arch/blackfin/include/asm/poll.h | |||
diff --git a/include/asm-blackfin/portmux.h b/arch/blackfin/include/asm/portmux.h index 0807b286cd9e..88eb5c07cc24 100644 --- a/include/asm-blackfin/portmux.h +++ b/arch/blackfin/include/asm/portmux.h | |||
| @@ -21,7 +21,7 @@ int peripheral_request_list(const unsigned short per[], const char *label); | |||
| 21 | void peripheral_free_list(const unsigned short per[]); | 21 | void peripheral_free_list(const unsigned short per[]); |
| 22 | 22 | ||
| 23 | #include <asm/gpio.h> | 23 | #include <asm/gpio.h> |
| 24 | #include <asm/mach/portmux.h> | 24 | #include <mach/portmux.h> |
| 25 | 25 | ||
| 26 | #ifndef P_SPORT2_TFS | 26 | #ifndef P_SPORT2_TFS |
| 27 | #define P_SPORT2_TFS P_UNDEF | 27 | #define P_SPORT2_TFS P_UNDEF |
diff --git a/include/asm-blackfin/posix_types.h b/arch/blackfin/include/asm/posix_types.h index 23aa1f8c1bd1..23aa1f8c1bd1 100644 --- a/include/asm-blackfin/posix_types.h +++ b/arch/blackfin/include/asm/posix_types.h | |||
diff --git a/include/asm-blackfin/processor.h b/arch/blackfin/include/asm/processor.h index 6f3995b119d8..6f3995b119d8 100644 --- a/include/asm-blackfin/processor.h +++ b/arch/blackfin/include/asm/processor.h | |||
diff --git a/include/asm-blackfin/ptrace.h b/arch/blackfin/include/asm/ptrace.h index a45a80e54adc..a45a80e54adc 100644 --- a/include/asm-blackfin/ptrace.h +++ b/arch/blackfin/include/asm/ptrace.h | |||
diff --git a/include/asm-blackfin/reboot.h b/arch/blackfin/include/asm/reboot.h index 6d448b5f5985..6d448b5f5985 100644 --- a/include/asm-blackfin/reboot.h +++ b/arch/blackfin/include/asm/reboot.h | |||
diff --git a/include/asm-blackfin/resource.h b/arch/blackfin/include/asm/resource.h index 091355ab3495..091355ab3495 100644 --- a/include/asm-blackfin/resource.h +++ b/arch/blackfin/include/asm/resource.h | |||
diff --git a/include/asm-blackfin/scatterlist.h b/arch/blackfin/include/asm/scatterlist.h index 04f448711cd0..04f448711cd0 100644 --- a/include/asm-blackfin/scatterlist.h +++ b/arch/blackfin/include/asm/scatterlist.h | |||
diff --git a/include/asm-blackfin/sections.h b/arch/blackfin/include/asm/sections.h index 1443c3353a8c..1443c3353a8c 100644 --- a/include/asm-blackfin/sections.h +++ b/arch/blackfin/include/asm/sections.h | |||
diff --git a/include/asm-blackfin/segment.h b/arch/blackfin/include/asm/segment.h index 02cfd09b5a99..02cfd09b5a99 100644 --- a/include/asm-blackfin/segment.h +++ b/arch/blackfin/include/asm/segment.h | |||
diff --git a/include/asm-blackfin/sembuf.h b/arch/blackfin/include/asm/sembuf.h index 18deb5c7fa5d..18deb5c7fa5d 100644 --- a/include/asm-blackfin/sembuf.h +++ b/arch/blackfin/include/asm/sembuf.h | |||
diff --git a/include/asm-blackfin/serial.h b/arch/blackfin/include/asm/serial.h index 994dd869558c..994dd869558c 100644 --- a/include/asm-blackfin/serial.h +++ b/arch/blackfin/include/asm/serial.h | |||
diff --git a/include/asm-blackfin/setup.h b/arch/blackfin/include/asm/setup.h index 01c8c6cbe6fc..01c8c6cbe6fc 100644 --- a/include/asm-blackfin/setup.h +++ b/arch/blackfin/include/asm/setup.h | |||
diff --git a/include/asm-blackfin/shmbuf.h b/arch/blackfin/include/asm/shmbuf.h index 612436303e89..612436303e89 100644 --- a/include/asm-blackfin/shmbuf.h +++ b/arch/blackfin/include/asm/shmbuf.h | |||
diff --git a/include/asm-blackfin/shmparam.h b/arch/blackfin/include/asm/shmparam.h index 3c03906b7664..3c03906b7664 100644 --- a/include/asm-blackfin/shmparam.h +++ b/arch/blackfin/include/asm/shmparam.h | |||
diff --git a/include/asm-blackfin/sigcontext.h b/arch/blackfin/include/asm/sigcontext.h index ce00b03c2775..ce00b03c2775 100644 --- a/include/asm-blackfin/sigcontext.h +++ b/arch/blackfin/include/asm/sigcontext.h | |||
diff --git a/include/asm-blackfin/siginfo.h b/arch/blackfin/include/asm/siginfo.h index eca4565cea37..eca4565cea37 100644 --- a/include/asm-blackfin/siginfo.h +++ b/arch/blackfin/include/asm/siginfo.h | |||
diff --git a/include/asm-blackfin/signal.h b/arch/blackfin/include/asm/signal.h index 87951d251458..87951d251458 100644 --- a/include/asm-blackfin/signal.h +++ b/arch/blackfin/include/asm/signal.h | |||
diff --git a/include/asm-blackfin/socket.h b/arch/blackfin/include/asm/socket.h index 2ca702e44d47..2ca702e44d47 100644 --- a/include/asm-blackfin/socket.h +++ b/arch/blackfin/include/asm/socket.h | |||
diff --git a/include/asm-blackfin/sockios.h b/arch/blackfin/include/asm/sockios.h index 426b89bfaa8b..426b89bfaa8b 100644 --- a/include/asm-blackfin/sockios.h +++ b/arch/blackfin/include/asm/sockios.h | |||
diff --git a/include/asm-blackfin/spinlock.h b/arch/blackfin/include/asm/spinlock.h index 64e908a50646..64e908a50646 100644 --- a/include/asm-blackfin/spinlock.h +++ b/arch/blackfin/include/asm/spinlock.h | |||
diff --git a/include/asm-blackfin/stat.h b/arch/blackfin/include/asm/stat.h index d2b6f11ec231..d2b6f11ec231 100644 --- a/include/asm-blackfin/stat.h +++ b/arch/blackfin/include/asm/stat.h | |||
diff --git a/include/asm-blackfin/statfs.h b/arch/blackfin/include/asm/statfs.h index 350672091ba3..350672091ba3 100644 --- a/include/asm-blackfin/statfs.h +++ b/arch/blackfin/include/asm/statfs.h | |||
diff --git a/include/asm-blackfin/string.h b/arch/blackfin/include/asm/string.h index 321f4d96e4ae..321f4d96e4ae 100644 --- a/include/asm-blackfin/string.h +++ b/arch/blackfin/include/asm/string.h | |||
diff --git a/include/asm-blackfin/system.h b/arch/blackfin/include/asm/system.h index 51494ef5bb41..8f1627d8bf09 100644 --- a/include/asm-blackfin/system.h +++ b/arch/blackfin/include/asm/system.h | |||
| @@ -36,7 +36,7 @@ | |||
| 36 | 36 | ||
| 37 | #include <linux/linkage.h> | 37 | #include <linux/linkage.h> |
| 38 | #include <linux/compiler.h> | 38 | #include <linux/compiler.h> |
| 39 | #include <asm/mach/anomaly.h> | 39 | #include <mach/anomaly.h> |
| 40 | 40 | ||
| 41 | /* | 41 | /* |
| 42 | * Interrupt configuring macros. | 42 | * Interrupt configuring macros. |
diff --git a/include/asm-blackfin/termbits.h b/arch/blackfin/include/asm/termbits.h index f37feb7cf895..f37feb7cf895 100644 --- a/include/asm-blackfin/termbits.h +++ b/arch/blackfin/include/asm/termbits.h | |||
diff --git a/include/asm-blackfin/termios.h b/arch/blackfin/include/asm/termios.h index d50d063c605a..d50d063c605a 100644 --- a/include/asm-blackfin/termios.h +++ b/arch/blackfin/include/asm/termios.h | |||
diff --git a/include/asm-blackfin/thread_info.h b/arch/blackfin/include/asm/thread_info.h index 642769329d12..642769329d12 100644 --- a/include/asm-blackfin/thread_info.h +++ b/arch/blackfin/include/asm/thread_info.h | |||
diff --git a/include/asm-blackfin/time.h b/arch/blackfin/include/asm/time.h index ddc43ce38533..ddc43ce38533 100644 --- a/include/asm-blackfin/time.h +++ b/arch/blackfin/include/asm/time.h | |||
diff --git a/include/asm-blackfin/timex.h b/arch/blackfin/include/asm/timex.h index 22b0806161bb..22b0806161bb 100644 --- a/include/asm-blackfin/timex.h +++ b/arch/blackfin/include/asm/timex.h | |||
diff --git a/include/asm-blackfin/tlb.h b/arch/blackfin/include/asm/tlb.h index 89a12ee916d8..89a12ee916d8 100644 --- a/include/asm-blackfin/tlb.h +++ b/arch/blackfin/include/asm/tlb.h | |||
diff --git a/include/asm-blackfin/tlbflush.h b/arch/blackfin/include/asm/tlbflush.h index 277b400924b8..277b400924b8 100644 --- a/include/asm-blackfin/tlbflush.h +++ b/arch/blackfin/include/asm/tlbflush.h | |||
diff --git a/include/asm-blackfin/topology.h b/arch/blackfin/include/asm/topology.h index acee23987897..acee23987897 100644 --- a/include/asm-blackfin/topology.h +++ b/arch/blackfin/include/asm/topology.h | |||
diff --git a/include/asm-blackfin/trace.h b/arch/blackfin/include/asm/trace.h index 312b596b9731..312b596b9731 100644 --- a/include/asm-blackfin/trace.h +++ b/arch/blackfin/include/asm/trace.h | |||
diff --git a/include/asm-blackfin/traps.h b/arch/blackfin/include/asm/traps.h index f0e5f940d9ca..f0e5f940d9ca 100644 --- a/include/asm-blackfin/traps.h +++ b/arch/blackfin/include/asm/traps.h | |||
diff --git a/include/asm-blackfin/types.h b/arch/blackfin/include/asm/types.h index 8441cbc2bf9e..8441cbc2bf9e 100644 --- a/include/asm-blackfin/types.h +++ b/arch/blackfin/include/asm/types.h | |||
diff --git a/include/asm-blackfin/uaccess.h b/arch/blackfin/include/asm/uaccess.h index d928b8099056..d928b8099056 100644 --- a/include/asm-blackfin/uaccess.h +++ b/arch/blackfin/include/asm/uaccess.h | |||
diff --git a/include/asm-blackfin/ucontext.h b/arch/blackfin/include/asm/ucontext.h index 4a4e3856beba..4a4e3856beba 100644 --- a/include/asm-blackfin/ucontext.h +++ b/arch/blackfin/include/asm/ucontext.h | |||
diff --git a/include/asm-blackfin/unaligned.h b/arch/blackfin/include/asm/unaligned.h index fd8a1d634945..fd8a1d634945 100644 --- a/include/asm-blackfin/unaligned.h +++ b/arch/blackfin/include/asm/unaligned.h | |||
diff --git a/include/asm-blackfin/unistd.h b/arch/blackfin/include/asm/unistd.h index 42955d0c439b..1e57b636e0bc 100644 --- a/include/asm-blackfin/unistd.h +++ b/arch/blackfin/include/asm/unistd.h | |||
| @@ -372,8 +372,14 @@ | |||
| 372 | #define __NR_semtimedop 357 | 372 | #define __NR_semtimedop 357 |
| 373 | #define __NR_timerfd_settime 358 | 373 | #define __NR_timerfd_settime 358 |
| 374 | #define __NR_timerfd_gettime 359 | 374 | #define __NR_timerfd_gettime 359 |
| 375 | #define __NR_signalfd4 360 | ||
| 376 | #define __NR_eventfd2 361 | ||
| 377 | #define __NR_epoll_create1 362 | ||
| 378 | #define __NR_dup3 363 | ||
| 379 | #define __NR_pipe2 364 | ||
| 380 | #define __NR_inotify_init1 365 | ||
| 375 | 381 | ||
| 376 | #define __NR_syscall 360 | 382 | #define __NR_syscall 366 |
| 377 | #define NR_syscalls __NR_syscall | 383 | #define NR_syscalls __NR_syscall |
| 378 | 384 | ||
| 379 | /* Old optional stuff no one actually uses */ | 385 | /* Old optional stuff no one actually uses */ |
diff --git a/include/asm-blackfin/user.h b/arch/blackfin/include/asm/user.h index afe6a0e1f7ce..afe6a0e1f7ce 100644 --- a/include/asm-blackfin/user.h +++ b/arch/blackfin/include/asm/user.h | |||
diff --git a/arch/blackfin/kernel/cplb-mpu/cacheinit.c b/arch/blackfin/kernel/cplb-mpu/cacheinit.c index 9eecfa403187..a8b712a24c59 100644 --- a/arch/blackfin/kernel/cplb-mpu/cacheinit.c +++ b/arch/blackfin/kernel/cplb-mpu/cacheinit.c | |||
| @@ -25,7 +25,7 @@ | |||
| 25 | #include <asm/cplbinit.h> | 25 | #include <asm/cplbinit.h> |
| 26 | 26 | ||
| 27 | #if defined(CONFIG_BFIN_ICACHE) | 27 | #if defined(CONFIG_BFIN_ICACHE) |
| 28 | void bfin_icache_init(void) | 28 | void __init bfin_icache_init(void) |
| 29 | { | 29 | { |
| 30 | unsigned long ctrl; | 30 | unsigned long ctrl; |
| 31 | int i; | 31 | int i; |
| @@ -43,7 +43,7 @@ void bfin_icache_init(void) | |||
| 43 | #endif | 43 | #endif |
| 44 | 44 | ||
| 45 | #if defined(CONFIG_BFIN_DCACHE) | 45 | #if defined(CONFIG_BFIN_DCACHE) |
| 46 | void bfin_dcache_init(void) | 46 | void __init bfin_dcache_init(void) |
| 47 | { | 47 | { |
| 48 | unsigned long ctrl; | 48 | unsigned long ctrl; |
| 49 | int i; | 49 | int i; |
diff --git a/arch/blackfin/kernel/cplb-nompu/cacheinit.c b/arch/blackfin/kernel/cplb-nompu/cacheinit.c index 8a18399f6072..bd0831592c2c 100644 --- a/arch/blackfin/kernel/cplb-nompu/cacheinit.c +++ b/arch/blackfin/kernel/cplb-nompu/cacheinit.c | |||
| @@ -25,7 +25,7 @@ | |||
| 25 | #include <asm/cplbinit.h> | 25 | #include <asm/cplbinit.h> |
| 26 | 26 | ||
| 27 | #if defined(CONFIG_BFIN_ICACHE) | 27 | #if defined(CONFIG_BFIN_ICACHE) |
| 28 | void bfin_icache_init(void) | 28 | void __init bfin_icache_init(void) |
| 29 | { | 29 | { |
| 30 | unsigned long *table = icplb_table; | 30 | unsigned long *table = icplb_table; |
| 31 | unsigned long ctrl; | 31 | unsigned long ctrl; |
| @@ -47,7 +47,7 @@ void bfin_icache_init(void) | |||
| 47 | #endif | 47 | #endif |
| 48 | 48 | ||
| 49 | #if defined(CONFIG_BFIN_DCACHE) | 49 | #if defined(CONFIG_BFIN_DCACHE) |
| 50 | void bfin_dcache_init(void) | 50 | void __init bfin_dcache_init(void) |
| 51 | { | 51 | { |
| 52 | unsigned long *table = dcplb_table; | 52 | unsigned long *table = dcplb_table; |
| 53 | unsigned long ctrl; | 53 | unsigned long ctrl; |
diff --git a/arch/blackfin/kernel/cplb-nompu/cplbinit.c b/arch/blackfin/kernel/cplb-nompu/cplbinit.c index 224e7cc30bc5..728f708d3981 100644 --- a/arch/blackfin/kernel/cplb-nompu/cplbinit.c +++ b/arch/blackfin/kernel/cplb-nompu/cplbinit.c | |||
| @@ -164,17 +164,13 @@ static struct cplb_desc cplb_data[] = { | |||
| 164 | .name = "Asynchronous Memory Banks", | 164 | .name = "Asynchronous Memory Banks", |
| 165 | }, | 165 | }, |
| 166 | { | 166 | { |
| 167 | #ifdef L2_START | ||
| 168 | .start = L2_START, | 167 | .start = L2_START, |
| 169 | .end = L2_START + L2_LENGTH, | 168 | .end = L2_START + L2_LENGTH, |
| 170 | .psize = SIZE_1M, | 169 | .psize = SIZE_1M, |
| 171 | .attr = SWITCH_T | I_CPLB | D_CPLB, | 170 | .attr = SWITCH_T | I_CPLB | D_CPLB, |
| 172 | .i_conf = L2_MEMORY, | 171 | .i_conf = L2_MEMORY, |
| 173 | .d_conf = L2_MEMORY, | 172 | .d_conf = L2_MEMORY, |
| 174 | .valid = 1, | 173 | .valid = (L2_LENGTH > 0), |
| 175 | #else | ||
| 176 | .valid = 0, | ||
| 177 | #endif | ||
| 178 | .name = "L2 Memory", | 174 | .name = "L2 Memory", |
| 179 | }, | 175 | }, |
| 180 | { | 176 | { |
diff --git a/arch/blackfin/kernel/entry.S b/arch/blackfin/kernel/entry.S index 31bd9bf3efae..faea88ebb2ef 100644 --- a/arch/blackfin/kernel/entry.S +++ b/arch/blackfin/kernel/entry.S | |||
| @@ -32,7 +32,7 @@ | |||
| 32 | #include <asm/errno.h> | 32 | #include <asm/errno.h> |
| 33 | #include <asm/asm-offsets.h> | 33 | #include <asm/asm-offsets.h> |
| 34 | 34 | ||
| 35 | #include <asm/mach-common/context.S> | 35 | #include <asm/context.S> |
| 36 | 36 | ||
| 37 | #ifdef CONFIG_EXCPT_IRQ_SYSC_L1 | 37 | #ifdef CONFIG_EXCPT_IRQ_SYSC_L1 |
| 38 | .section .l1.text | 38 | .section .l1.text |
diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c index 23e637eb78da..7a82d10b4ebf 100644 --- a/arch/blackfin/kernel/setup.c +++ b/arch/blackfin/kernel/setup.c | |||
| @@ -52,6 +52,7 @@ EXPORT_SYMBOL(mtd_size); | |||
| 52 | #endif | 52 | #endif |
| 53 | 53 | ||
| 54 | char __initdata command_line[COMMAND_LINE_SIZE]; | 54 | char __initdata command_line[COMMAND_LINE_SIZE]; |
| 55 | unsigned int __initdata *__retx; | ||
| 55 | 56 | ||
| 56 | /* boot memmap, for parsing "memmap=" */ | 57 | /* boot memmap, for parsing "memmap=" */ |
| 57 | #define BFIN_MEMMAP_MAX 128 /* number of entries in bfin_memmap */ | 58 | #define BFIN_MEMMAP_MAX 128 /* number of entries in bfin_memmap */ |
| @@ -131,14 +132,14 @@ void __init bf53x_relocate_l1_mem(void) | |||
| 131 | dma_memcpy(_sdata_b_l1, _l1_lma_start + l1_code_length + | 132 | dma_memcpy(_sdata_b_l1, _l1_lma_start + l1_code_length + |
| 132 | l1_data_a_length, l1_data_b_length); | 133 | l1_data_a_length, l1_data_b_length); |
| 133 | 134 | ||
| 134 | #ifdef L2_LENGTH | 135 | if (L2_LENGTH != 0) { |
| 135 | l2_length = _ebss_l2 - _stext_l2; | 136 | l2_length = _ebss_l2 - _stext_l2; |
| 136 | if (l2_length > L2_LENGTH) | 137 | if (l2_length > L2_LENGTH) |
| 137 | panic("L2 SRAM Overflow\n"); | 138 | panic("L2 SRAM Overflow\n"); |
| 138 | 139 | ||
| 139 | /* Copy _stext_l2 to _edata_l2 to L2 SRAM */ | 140 | /* Copy _stext_l2 to _edata_l2 to L2 SRAM */ |
| 140 | dma_memcpy(_stext_l2, _l2_lma_start, l2_length); | 141 | dma_memcpy(_stext_l2, _l2_lma_start, l2_length); |
| 141 | #endif | 142 | } |
| 142 | } | 143 | } |
| 143 | 144 | ||
| 144 | /* add_memory_region to memmap */ | 145 | /* add_memory_region to memmap */ |
| @@ -738,6 +739,16 @@ void __init setup_arch(char **cmdline_p) | |||
| 738 | 739 | ||
| 739 | memory_setup(); | 740 | memory_setup(); |
| 740 | 741 | ||
| 742 | /* Initialize Async memory banks */ | ||
| 743 | bfin_write_EBIU_AMBCTL0(AMBCTL0VAL); | ||
| 744 | bfin_write_EBIU_AMBCTL1(AMBCTL1VAL); | ||
| 745 | bfin_write_EBIU_AMGCTL(AMGCTLVAL); | ||
| 746 | #ifdef CONFIG_EBIU_MBSCTLVAL | ||
| 747 | bfin_write_EBIU_MBSCTL(CONFIG_EBIU_MBSCTLVAL); | ||
| 748 | bfin_write_EBIU_MODE(CONFIG_EBIU_MODEVAL); | ||
| 749 | bfin_write_EBIU_FCTL(CONFIG_EBIU_FCTLVAL); | ||
| 750 | #endif | ||
| 751 | |||
| 741 | cclk = get_cclk(); | 752 | cclk = get_cclk(); |
| 742 | sclk = get_sclk(); | 753 | sclk = get_sclk(); |
| 743 | 754 | ||
| @@ -775,7 +786,11 @@ void __init setup_arch(char **cmdline_p) | |||
| 775 | bfin_write_SWRST(DOUBLE_FAULT); | 786 | bfin_write_SWRST(DOUBLE_FAULT); |
| 776 | 787 | ||
| 777 | if (_bfin_swrst & RESET_DOUBLE) | 788 | if (_bfin_swrst & RESET_DOUBLE) |
| 778 | printk(KERN_INFO "Recovering from Double Fault event\n"); | 789 | /* |
| 790 | * don't decode the address, since you don't know if this | ||
| 791 | * kernel's symbol map is the same as the crashing kernel | ||
| 792 | */ | ||
| 793 | printk(KERN_INFO "Recovering from Double Fault event at %pF\n", __retx); | ||
| 779 | else if (_bfin_swrst & RESET_WDOG) | 794 | else if (_bfin_swrst & RESET_WDOG) |
| 780 | printk(KERN_INFO "Recovering from Watchdog event\n"); | 795 | printk(KERN_INFO "Recovering from Watchdog event\n"); |
| 781 | else if (_bfin_swrst & RESET_SOFTWARE) | 796 | else if (_bfin_swrst & RESET_SOFTWARE) |
| @@ -1049,7 +1064,7 @@ static int show_cpuinfo(struct seq_file *m, void *v) | |||
| 1049 | dsup_banks, BFIN_DSUBBANKS, BFIN_DWAYS, | 1064 | dsup_banks, BFIN_DSUBBANKS, BFIN_DWAYS, |
| 1050 | BFIN_DLINES); | 1065 | BFIN_DLINES); |
| 1051 | #ifdef CONFIG_BFIN_ICACHE_LOCK | 1066 | #ifdef CONFIG_BFIN_ICACHE_LOCK |
| 1052 | switch (read_iloc()) { | 1067 | switch ((bfin_read_IMEM_CONTROL() >> 3) & WAYALL_L) { |
| 1053 | case WAY0_L: | 1068 | case WAY0_L: |
| 1054 | seq_printf(m, "Way0 Locked-Down\n"); | 1069 | seq_printf(m, "Way0 Locked-Down\n"); |
| 1055 | break; | 1070 | break; |
diff --git a/arch/blackfin/kernel/traps.c b/arch/blackfin/kernel/traps.c index ad922ab91543..9a9d5083acfd 100644 --- a/arch/blackfin/kernel/traps.c +++ b/arch/blackfin/kernel/traps.c | |||
| @@ -567,7 +567,7 @@ bool get_instruction(unsigned short *val, unsigned short *address) | |||
| 567 | * we don't read something in the async space that can hang forever | 567 | * we don't read something in the async space that can hang forever |
| 568 | */ | 568 | */ |
| 569 | if ((addr >= FIXED_CODE_START && (addr + 2) <= physical_mem_end) || | 569 | if ((addr >= FIXED_CODE_START && (addr + 2) <= physical_mem_end) || |
| 570 | #ifdef L2_START | 570 | #if L2_LENGTH != 0 |
| 571 | (addr >= L2_START && (addr + 2) <= (L2_START + L2_LENGTH)) || | 571 | (addr >= L2_START && (addr + 2) <= (L2_START + L2_LENGTH)) || |
| 572 | #endif | 572 | #endif |
| 573 | (addr >= BOOT_ROM_START && (addr + 2) <= (BOOT_ROM_START + BOOT_ROM_LENGTH)) || | 573 | (addr >= BOOT_ROM_START && (addr + 2) <= (BOOT_ROM_START + BOOT_ROM_LENGTH)) || |
| @@ -601,12 +601,55 @@ bool get_instruction(unsigned short *val, unsigned short *address) | |||
| 601 | return false; | 601 | return false; |
| 602 | } | 602 | } |
| 603 | 603 | ||
| 604 | /* | ||
| 605 | * decode the instruction if we are printing out the trace, as it | ||
| 606 | * makes things easier to follow, without running it through objdump | ||
| 607 | * These are the normal instructions which cause change of flow, which | ||
| 608 | * would be at the source of the trace buffer | ||
| 609 | */ | ||
| 610 | void decode_instruction(unsigned short *address) | ||
| 611 | { | ||
| 612 | unsigned short opcode; | ||
| 613 | |||
| 614 | if (get_instruction(&opcode, address)) { | ||
| 615 | if (opcode == 0x0010) | ||
| 616 | printk("RTS"); | ||
| 617 | else if (opcode == 0x0011) | ||
| 618 | printk("RTI"); | ||
| 619 | else if (opcode == 0x0012) | ||
| 620 | printk("RTX"); | ||
| 621 | else if (opcode >= 0x0050 && opcode <= 0x0057) | ||
| 622 | printk("JUMP (P%i)", opcode & 7); | ||
| 623 | else if (opcode >= 0x0060 && opcode <= 0x0067) | ||
| 624 | printk("CALL (P%i)", opcode & 7); | ||
| 625 | else if (opcode >= 0x0070 && opcode <= 0x0077) | ||
| 626 | printk("CALL (PC+P%i)", opcode & 7); | ||
| 627 | else if (opcode >= 0x0080 && opcode <= 0x0087) | ||
| 628 | printk("JUMP (PC+P%i)", opcode & 7); | ||
| 629 | else if ((opcode >= 0x1000 && opcode <= 0x13FF) || (opcode >= 0x1800 && opcode <= 0x1BFF)) | ||
| 630 | printk("IF !CC JUMP"); | ||
| 631 | else if ((opcode >= 0x1400 && opcode <= 0x17ff) || (opcode >= 0x1c00 && opcode <= 0x1fff)) | ||
| 632 | printk("IF CC JUMP"); | ||
| 633 | else if (opcode >= 0x2000 && opcode <= 0x2fff) | ||
| 634 | printk("JUMP.S"); | ||
| 635 | else if (opcode >= 0xe080 && opcode <= 0xe0ff) | ||
| 636 | printk("LSETUP"); | ||
| 637 | else if (opcode >= 0xe200 && opcode <= 0xe2ff) | ||
| 638 | printk("JUMP.L"); | ||
| 639 | else if (opcode >= 0xe300 && opcode <= 0xe3ff) | ||
| 640 | printk("CALL pcrel"); | ||
| 641 | else | ||
| 642 | printk("0x%04x", opcode); | ||
| 643 | } | ||
| 644 | |||
| 645 | } | ||
| 646 | |||
| 604 | void dump_bfin_trace_buffer(void) | 647 | void dump_bfin_trace_buffer(void) |
| 605 | { | 648 | { |
| 606 | #ifdef CONFIG_DEBUG_BFIN_HWTRACE_ON | 649 | #ifdef CONFIG_DEBUG_BFIN_HWTRACE_ON |
| 607 | int tflags, i = 0; | 650 | int tflags, i = 0; |
| 608 | char buf[150]; | 651 | char buf[150]; |
| 609 | unsigned short val = 0, *addr; | 652 | unsigned short *addr; |
| 610 | #ifdef CONFIG_DEBUG_BFIN_HWTRACE_EXPAND | 653 | #ifdef CONFIG_DEBUG_BFIN_HWTRACE_EXPAND |
| 611 | int j, index; | 654 | int j, index; |
| 612 | #endif | 655 | #endif |
| @@ -615,6 +658,10 @@ void dump_bfin_trace_buffer(void) | |||
| 615 | 658 | ||
| 616 | printk(KERN_NOTICE "Hardware Trace:\n"); | 659 | printk(KERN_NOTICE "Hardware Trace:\n"); |
| 617 | 660 | ||
| 661 | #ifdef CONFIG_DEBUG_BFIN_HWTRACE_EXPAND | ||
| 662 | printk(KERN_NOTICE "WARNING: Expanded trace turned on - can not trace exceptions\n"); | ||
| 663 | #endif | ||
| 664 | |||
| 618 | if (likely(bfin_read_TBUFSTAT() & TBUFCNT)) { | 665 | if (likely(bfin_read_TBUFSTAT() & TBUFCNT)) { |
| 619 | for (; bfin_read_TBUFSTAT() & TBUFCNT; i++) { | 666 | for (; bfin_read_TBUFSTAT() & TBUFCNT; i++) { |
| 620 | decode_address(buf, (unsigned long)bfin_read_TBUF()); | 667 | decode_address(buf, (unsigned long)bfin_read_TBUF()); |
| @@ -622,45 +669,14 @@ void dump_bfin_trace_buffer(void) | |||
| 622 | addr = (unsigned short *)bfin_read_TBUF(); | 669 | addr = (unsigned short *)bfin_read_TBUF(); |
| 623 | decode_address(buf, (unsigned long)addr); | 670 | decode_address(buf, (unsigned long)addr); |
| 624 | printk(KERN_NOTICE " Source : %s ", buf); | 671 | printk(KERN_NOTICE " Source : %s ", buf); |
| 625 | if (get_instruction(&val, addr)) { | 672 | decode_instruction(addr); |
| 626 | if (val == 0x0010) | ||
| 627 | printk("RTS"); | ||
| 628 | else if (val == 0x0011) | ||
| 629 | printk("RTI"); | ||
| 630 | else if (val == 0x0012) | ||
| 631 | printk("RTX"); | ||
| 632 | else if (val >= 0x0050 && val <= 0x0057) | ||
| 633 | printk("JUMP (P%i)", val & 7); | ||
| 634 | else if (val >= 0x0060 && val <= 0x0067) | ||
| 635 | printk("CALL (P%i)", val & 7); | ||
| 636 | else if (val >= 0x0070 && val <= 0x0077) | ||
| 637 | printk("CALL (PC+P%i)", val & 7); | ||
| 638 | else if (val >= 0x0080 && val <= 0x0087) | ||
| 639 | printk("JUMP (PC+P%i)", val & 7); | ||
| 640 | else if ((val >= 0x1000 && val <= 0x13FF) || | ||
| 641 | (val >= 0x1800 && val <= 0x1BFF)) | ||
| 642 | printk("IF !CC JUMP"); | ||
| 643 | else if ((val >= 0x1400 && val <= 0x17ff) || | ||
| 644 | (val >= 0x1c00 && val <= 0x1fff)) | ||
| 645 | printk("IF CC JUMP"); | ||
| 646 | else if (val >= 0x2000 && val <= 0x2fff) | ||
| 647 | printk("JUMP.S"); | ||
| 648 | else if (val >= 0xe080 && val <= 0xe0ff) | ||
| 649 | printk("LSETUP"); | ||
| 650 | else if (val >= 0xe200 && val <= 0xe2ff) | ||
| 651 | printk("JUMP.L"); | ||
| 652 | else if (val >= 0xe300 && val <= 0xe3ff) | ||
| 653 | printk("CALL pcrel"); | ||
| 654 | else | ||
| 655 | printk("0x%04x", val); | ||
| 656 | } | ||
| 657 | printk("\n"); | 673 | printk("\n"); |
| 658 | } | 674 | } |
| 659 | } | 675 | } |
| 660 | 676 | ||
| 661 | #ifdef CONFIG_DEBUG_BFIN_HWTRACE_EXPAND | 677 | #ifdef CONFIG_DEBUG_BFIN_HWTRACE_EXPAND |
| 662 | if (trace_buff_offset) | 678 | if (trace_buff_offset) |
| 663 | index = trace_buff_offset/4 - 1; | 679 | index = trace_buff_offset / 4; |
| 664 | else | 680 | else |
| 665 | index = EXPAND_LEN; | 681 | index = EXPAND_LEN; |
| 666 | 682 | ||
| @@ -672,7 +688,9 @@ void dump_bfin_trace_buffer(void) | |||
| 672 | if (index < 0 ) | 688 | if (index < 0 ) |
| 673 | index = EXPAND_LEN; | 689 | index = EXPAND_LEN; |
| 674 | decode_address(buf, software_trace_buff[index]); | 690 | decode_address(buf, software_trace_buff[index]); |
| 675 | printk(KERN_NOTICE " Source : %s\n", buf); | 691 | printk(KERN_NOTICE " Source : %s ", buf); |
| 692 | decode_instruction((unsigned short *)software_trace_buff[index]); | ||
| 693 | printk("\n"); | ||
| 676 | index -= 1; | 694 | index -= 1; |
| 677 | if (index < 0) | 695 | if (index < 0) |
| 678 | index = EXPAND_LEN; | 696 | index = EXPAND_LEN; |
diff --git a/arch/blackfin/kernel/vmlinux.lds.S b/arch/blackfin/kernel/vmlinux.lds.S index 0896e38d6108..7d12c6692a65 100644 --- a/arch/blackfin/kernel/vmlinux.lds.S +++ b/arch/blackfin/kernel/vmlinux.lds.S | |||
| @@ -83,6 +83,7 @@ SECTIONS | |||
| 83 | #if !L1_DATA_B_LENGTH | 83 | #if !L1_DATA_B_LENGTH |
| 84 | *(.l1.bss.B) | 84 | *(.l1.bss.B) |
| 85 | #endif | 85 | #endif |
| 86 | . = ALIGN(4); | ||
| 86 | ___bss_stop = .; | 87 | ___bss_stop = .; |
| 87 | } | 88 | } |
| 88 | 89 | ||
| @@ -101,7 +102,7 @@ SECTIONS | |||
| 101 | #if !L1_DATA_B_LENGTH | 102 | #if !L1_DATA_B_LENGTH |
| 102 | *(.l1.data.B) | 103 | *(.l1.data.B) |
| 103 | #endif | 104 | #endif |
| 104 | #ifndef L2_LENGTH | 105 | #if !L2_LENGTH |
| 105 | . = ALIGN(32); | 106 | . = ALIGN(32); |
| 106 | *(.data_l2.cacheline_aligned) | 107 | *(.data_l2.cacheline_aligned) |
| 107 | *(.l2.data) | 108 | *(.l2.data) |
| @@ -211,20 +212,19 @@ SECTIONS | |||
| 211 | __ebss_b_l1 = .; | 212 | __ebss_b_l1 = .; |
| 212 | } | 213 | } |
| 213 | 214 | ||
| 214 | #ifdef L2_LENGTH | ||
| 215 | __l2_lma_start = .; | 215 | __l2_lma_start = .; |
| 216 | 216 | ||
| 217 | .text_data_l2 L2_START : AT(LOADADDR(.data_b_l1) + SIZEOF(.data_b_l1)) | 217 | .text_data_l2 L2_START : AT(LOADADDR(.data_b_l1) + SIZEOF(.data_b_l1)) |
| 218 | { | 218 | { |
| 219 | . = ALIGN(4); | 219 | . = ALIGN(4); |
| 220 | __stext_l2 = .; | 220 | __stext_l2 = .; |
| 221 | *(.l1.text) | 221 | *(.l2.text) |
| 222 | . = ALIGN(4); | 222 | . = ALIGN(4); |
| 223 | __etext_l2 = .; | 223 | __etext_l2 = .; |
| 224 | 224 | ||
| 225 | . = ALIGN(4); | 225 | . = ALIGN(4); |
| 226 | __sdata_l2 = .; | 226 | __sdata_l2 = .; |
| 227 | *(.l1.data) | 227 | *(.l2.data) |
| 228 | __edata_l2 = .; | 228 | __edata_l2 = .; |
| 229 | 229 | ||
| 230 | . = ALIGN(32); | 230 | . = ALIGN(32); |
| @@ -232,11 +232,10 @@ SECTIONS | |||
| 232 | 232 | ||
| 233 | . = ALIGN(4); | 233 | . = ALIGN(4); |
| 234 | __sbss_l2 = .; | 234 | __sbss_l2 = .; |
| 235 | *(.l1.bss) | 235 | *(.l2.bss) |
| 236 | . = ALIGN(4); | 236 | . = ALIGN(4); |
| 237 | __ebss_l2 = .; | 237 | __ebss_l2 = .; |
| 238 | } | 238 | } |
| 239 | #endif | ||
| 240 | 239 | ||
| 241 | /* Force trailing alignment of our init section so that when we | 240 | /* Force trailing alignment of our init section so that when we |
| 242 | * free our init memory, we don't leave behind a partial page. | 241 | * free our init memory, we don't leave behind a partial page. |
diff --git a/arch/blackfin/lib/ins.S b/arch/blackfin/lib/ins.S index eba2343b1b59..d60554dce87b 100644 --- a/arch/blackfin/lib/ins.S +++ b/arch/blackfin/lib/ins.S | |||
| @@ -33,7 +33,28 @@ | |||
| 33 | 33 | ||
| 34 | .align 2 | 34 | .align 2 |
| 35 | 35 | ||
| 36 | /* | ||
| 37 | * Reads on the Blackfin are speculative. In Blackfin terms, this means they | ||
| 38 | * can be interrupted at any time (even after they have been issued on to the | ||
| 39 | * external bus), and re-issued after the interrupt occurs. | ||
| 40 | * | ||
| 41 | * If a FIFO is sitting on the end of the read, it will see two reads, | ||
| 42 | * when the core only sees one. The FIFO receives the read which is cancelled, | ||
| 43 | * and not delivered to the core. | ||
| 44 | * | ||
| 45 | * To solve this, interrupts are turned off before reads occur to I/O space. | ||
| 46 | * There are 3 versions of all these functions | ||
| 47 | * - turns interrupts off every read (higher overhead, but lower latency) | ||
| 48 | * - turns interrupts off every loop (low overhead, but longer latency) | ||
| 49 | * - DMA version, which do not suffer from this issue. DMA versions have | ||
| 50 | * different name (prefixed by dma_ ), and are located in | ||
| 51 | * ../kernel/bfin_dma_5xx.c | ||
| 52 | * Using the dma related functions are recommended for transfering large | ||
| 53 | * buffers in/out of FIFOs. | ||
| 54 | */ | ||
| 55 | |||
| 36 | ENTRY(_insl) | 56 | ENTRY(_insl) |
| 57 | #ifdef CONFIG_BFIN_INS_LOWOVERHEAD | ||
| 37 | P0 = R0; /* P0 = port */ | 58 | P0 = R0; /* P0 = port */ |
| 38 | cli R3; | 59 | cli R3; |
| 39 | P1 = R1; /* P1 = address */ | 60 | P1 = R1; /* P1 = address */ |
| @@ -46,9 +67,26 @@ ENTRY(_insl) | |||
| 46 | .Llong_loop_e: NOP; | 67 | .Llong_loop_e: NOP; |
| 47 | sti R3; | 68 | sti R3; |
| 48 | RTS; | 69 | RTS; |
| 70 | #else | ||
| 71 | P0 = R0; /* P0 = port */ | ||
| 72 | P1 = R1; /* P1 = address */ | ||
| 73 | P2 = R2; /* P2 = count */ | ||
| 74 | SSYNC; | ||
| 75 | LSETUP( .Llong_loop_s, .Llong_loop_e) LC0 = P2; | ||
| 76 | .Llong_loop_s: | ||
| 77 | CLI R3; | ||
| 78 | NOP; NOP; NOP; | ||
| 79 | R0 = [P0]; | ||
| 80 | [P1++] = R0; | ||
| 81 | .Llong_loop_e: | ||
| 82 | STI R3; | ||
| 83 | |||
| 84 | RTS; | ||
| 85 | #endif | ||
| 49 | ENDPROC(_insl) | 86 | ENDPROC(_insl) |
| 50 | 87 | ||
| 51 | ENTRY(_insw) | 88 | ENTRY(_insw) |
| 89 | #ifdef CONFIG_BFIN_INS_LOWOVERHEAD | ||
| 52 | P0 = R0; /* P0 = port */ | 90 | P0 = R0; /* P0 = port */ |
| 53 | cli R3; | 91 | cli R3; |
| 54 | P1 = R1; /* P1 = address */ | 92 | P1 = R1; /* P1 = address */ |
| @@ -61,9 +99,26 @@ ENTRY(_insw) | |||
| 61 | .Lword_loop_e: NOP; | 99 | .Lword_loop_e: NOP; |
| 62 | sti R3; | 100 | sti R3; |
| 63 | RTS; | 101 | RTS; |
| 102 | #else | ||
| 103 | P0 = R0; /* P0 = port */ | ||
| 104 | P1 = R1; /* P1 = address */ | ||
| 105 | P2 = R2; /* P2 = count */ | ||
| 106 | SSYNC; | ||
| 107 | LSETUP( .Lword_loop_s, .Lword_loop_e) LC0 = P2; | ||
| 108 | .Lword_loop_s: | ||
| 109 | CLI R3; | ||
| 110 | NOP; NOP; NOP; | ||
| 111 | R0 = W[P0]; | ||
| 112 | W[P1++] = R0; | ||
| 113 | .Lword_loop_e: | ||
| 114 | STI R3; | ||
| 115 | RTS; | ||
| 116 | |||
| 117 | #endif | ||
| 64 | ENDPROC(_insw) | 118 | ENDPROC(_insw) |
| 65 | 119 | ||
| 66 | ENTRY(_insw_8) | 120 | ENTRY(_insw_8) |
| 121 | #ifdef CONFIG_BFIN_INS_LOWOVERHEAD | ||
| 67 | P0 = R0; /* P0 = port */ | 122 | P0 = R0; /* P0 = port */ |
| 68 | cli R3; | 123 | cli R3; |
| 69 | P1 = R1; /* P1 = address */ | 124 | P1 = R1; /* P1 = address */ |
| @@ -78,9 +133,29 @@ ENTRY(_insw_8) | |||
| 78 | .Lword8_loop_e: NOP; | 133 | .Lword8_loop_e: NOP; |
| 79 | sti R3; | 134 | sti R3; |
| 80 | RTS; | 135 | RTS; |
| 136 | #else | ||
| 137 | P0 = R0; /* P0 = port */ | ||
| 138 | P1 = R1; /* P1 = address */ | ||
| 139 | P2 = R2; /* P2 = count */ | ||
| 140 | SSYNC; | ||
| 141 | LSETUP( .Lword8_loop_s, .Lword8_loop_e) LC0 = P2; | ||
| 142 | .Lword8_loop_s: | ||
| 143 | CLI R3; | ||
| 144 | NOP; NOP; NOP; | ||
| 145 | R0 = W[P0]; | ||
| 146 | B[P1++] = R0; | ||
| 147 | R0 = R0 >> 8; | ||
| 148 | B[P1++] = R0; | ||
| 149 | NOP; | ||
| 150 | .Lword8_loop_e: | ||
| 151 | STI R3; | ||
| 152 | |||
| 153 | RTS; | ||
| 154 | #endif | ||
| 81 | ENDPROC(_insw_8) | 155 | ENDPROC(_insw_8) |
| 82 | 156 | ||
| 83 | ENTRY(_insb) | 157 | ENTRY(_insb) |
| 158 | #ifdef CONFIG_BFIN_INS_LOWOVERHEAD | ||
| 84 | P0 = R0; /* P0 = port */ | 159 | P0 = R0; /* P0 = port */ |
| 85 | cli R3; | 160 | cli R3; |
| 86 | P1 = R1; /* P1 = address */ | 161 | P1 = R1; /* P1 = address */ |
| @@ -93,9 +168,26 @@ ENTRY(_insb) | |||
| 93 | .Lbyte_loop_e: NOP; | 168 | .Lbyte_loop_e: NOP; |
| 94 | sti R3; | 169 | sti R3; |
| 95 | RTS; | 170 | RTS; |
| 171 | #else | ||
| 172 | P0 = R0; /* P0 = port */ | ||
| 173 | P1 = R1; /* P1 = address */ | ||
| 174 | P2 = R2; /* P2 = count */ | ||
| 175 | SSYNC; | ||
| 176 | LSETUP( .Lbyte_loop_s, .Lbyte_loop_e) LC0 = P2; | ||
| 177 | .Lbyte_loop_s: | ||
| 178 | CLI R3; | ||
| 179 | NOP; NOP; NOP; | ||
| 180 | R0 = B[P0]; | ||
| 181 | B[P1++] = R0; | ||
| 182 | .Lbyte_loop_e: | ||
| 183 | STI R3; | ||
| 184 | |||
| 185 | RTS; | ||
| 186 | #endif | ||
| 96 | ENDPROC(_insb) | 187 | ENDPROC(_insb) |
| 97 | 188 | ||
| 98 | ENTRY(_insl_16) | 189 | ENTRY(_insl_16) |
| 190 | #ifdef CONFIG_BFIN_INS_LOWOVERHEAD | ||
| 99 | P0 = R0; /* P0 = port */ | 191 | P0 = R0; /* P0 = port */ |
| 100 | cli R3; | 192 | cli R3; |
| 101 | P1 = R1; /* P1 = address */ | 193 | P1 = R1; /* P1 = address */ |
| @@ -110,4 +202,21 @@ ENTRY(_insl_16) | |||
| 110 | .Llong16_loop_e: NOP; | 202 | .Llong16_loop_e: NOP; |
| 111 | sti R3; | 203 | sti R3; |
| 112 | RTS; | 204 | RTS; |
| 205 | #else | ||
| 206 | P0 = R0; /* P0 = port */ | ||
| 207 | P1 = R1; /* P1 = address */ | ||
| 208 | P2 = R2; /* P2 = count */ | ||
| 209 | SSYNC; | ||
| 210 | LSETUP( .Llong16_loop_s, .Llong16_loop_e) LC0 = P2; | ||
| 211 | .Llong16_loop_s: | ||
| 212 | CLI R3; | ||
| 213 | NOP; NOP; NOP; | ||
| 214 | R0 = [P0]; | ||
| 215 | W[P1++] = R0; | ||
| 216 | R0 = R0 >> 16; | ||
| 217 | W[P1++] = R0; | ||
| 218 | .Llong16_loop_e: | ||
| 219 | STI R3; | ||
| 220 | RTS; | ||
| 221 | #endif | ||
| 113 | ENDPROC(_insl_16) | 222 | ENDPROC(_insl_16) |
diff --git a/arch/blackfin/mach-bf527/boards/cm_bf527.c b/arch/blackfin/mach-bf527/boards/cm_bf527.c index 0b26ae2de5ee..d22bc7773717 100644 --- a/arch/blackfin/mach-bf527/boards/cm_bf527.c +++ b/arch/blackfin/mach-bf527/boards/cm_bf527.c | |||
| @@ -39,7 +39,6 @@ | |||
| 39 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) | 39 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) |
| 40 | #include <linux/usb/isp1362.h> | 40 | #include <linux/usb/isp1362.h> |
| 41 | #endif | 41 | #endif |
| 42 | #include <linux/pata_platform.h> | ||
| 43 | #include <linux/i2c.h> | 42 | #include <linux/i2c.h> |
| 44 | #include <linux/irq.h> | 43 | #include <linux/irq.h> |
| 45 | #include <linux/interrupt.h> | 44 | #include <linux/interrupt.h> |
| @@ -160,15 +159,15 @@ static struct platform_device musb_device = { | |||
| 160 | #if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE) | 159 | #if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE) |
| 161 | static struct mtd_partition ezkit_partitions[] = { | 160 | static struct mtd_partition ezkit_partitions[] = { |
| 162 | { | 161 | { |
| 163 | .name = "Bootloader", | 162 | .name = "bootloader(nor)", |
| 164 | .size = 0x40000, | 163 | .size = 0x40000, |
| 165 | .offset = 0, | 164 | .offset = 0, |
| 166 | }, { | 165 | }, { |
| 167 | .name = "Kernel", | 166 | .name = "linux kernel(nor)", |
| 168 | .size = 0x1C0000, | 167 | .size = 0x1C0000, |
| 169 | .offset = MTDPART_OFS_APPEND, | 168 | .offset = MTDPART_OFS_APPEND, |
| 170 | }, { | 169 | }, { |
| 171 | .name = "RootFS", | 170 | .name = "file system(nor)", |
| 172 | .size = MTDPART_SIZ_FULL, | 171 | .size = MTDPART_SIZ_FULL, |
| 173 | .offset = MTDPART_OFS_APPEND, | 172 | .offset = MTDPART_OFS_APPEND, |
| 174 | } | 173 | } |
| @@ -200,12 +199,12 @@ static struct platform_device ezkit_flash_device = { | |||
| 200 | #if defined(CONFIG_MTD_NAND_BF5XX) || defined(CONFIG_MTD_NAND_BF5XX_MODULE) | 199 | #if defined(CONFIG_MTD_NAND_BF5XX) || defined(CONFIG_MTD_NAND_BF5XX_MODULE) |
| 201 | static struct mtd_partition partition_info[] = { | 200 | static struct mtd_partition partition_info[] = { |
| 202 | { | 201 | { |
| 203 | .name = "Linux Kernel", | 202 | .name = "linux kernel(nand)", |
| 204 | .offset = 0, | 203 | .offset = 0, |
| 205 | .size = 4 * SIZE_1M, | 204 | .size = 4 * SIZE_1M, |
| 206 | }, | 205 | }, |
| 207 | { | 206 | { |
| 208 | .name = "File System", | 207 | .name = "file system(nand)", |
| 209 | .offset = MTDPART_OFS_APPEND, | 208 | .offset = MTDPART_OFS_APPEND, |
| 210 | .size = MTDPART_SIZ_FULL, | 209 | .size = MTDPART_SIZ_FULL, |
| 211 | }, | 210 | }, |
| @@ -438,12 +437,12 @@ static struct platform_device net2272_bfin_device = { | |||
| 438 | || defined(CONFIG_MTD_M25P80_MODULE) | 437 | || defined(CONFIG_MTD_M25P80_MODULE) |
| 439 | static struct mtd_partition bfin_spi_flash_partitions[] = { | 438 | static struct mtd_partition bfin_spi_flash_partitions[] = { |
| 440 | { | 439 | { |
| 441 | .name = "bootloader", | 440 | .name = "bootloader(spi)", |
| 442 | .size = 0x00040000, | 441 | .size = 0x00040000, |
| 443 | .offset = 0, | 442 | .offset = 0, |
| 444 | .mask_flags = MTD_CAP_ROM | 443 | .mask_flags = MTD_CAP_ROM |
| 445 | }, { | 444 | }, { |
| 446 | .name = "linux kernel", | 445 | .name = "linux kernel(spi)", |
| 447 | .size = MTDPART_SIZ_FULL, | 446 | .size = MTDPART_SIZ_FULL, |
| 448 | .offset = MTDPART_OFS_APPEND, | 447 | .offset = MTDPART_OFS_APPEND, |
| 449 | } | 448 | } |
| @@ -799,43 +798,6 @@ static struct platform_device bfin_sport1_uart_device = { | |||
| 799 | }; | 798 | }; |
| 800 | #endif | 799 | #endif |
| 801 | 800 | ||
| 802 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
| 803 | #define PATA_INT 55 | ||
| 804 | |||
| 805 | static struct pata_platform_info bfin_pata_platform_data = { | ||
| 806 | .ioport_shift = 1, | ||
| 807 | .irq_type = IRQF_TRIGGER_HIGH | IRQF_DISABLED, | ||
| 808 | }; | ||
| 809 | |||
| 810 | static struct resource bfin_pata_resources[] = { | ||
| 811 | { | ||
| 812 | .start = 0x20314020, | ||
| 813 | .end = 0x2031403F, | ||
| 814 | .flags = IORESOURCE_MEM, | ||
| 815 | }, | ||
| 816 | { | ||
| 817 | .start = 0x2031401C, | ||
| 818 | .end = 0x2031401F, | ||
| 819 | .flags = IORESOURCE_MEM, | ||
| 820 | }, | ||
| 821 | { | ||
| 822 | .start = PATA_INT, | ||
| 823 | .end = PATA_INT, | ||
| 824 | .flags = IORESOURCE_IRQ, | ||
| 825 | }, | ||
| 826 | }; | ||
| 827 | |||
| 828 | static struct platform_device bfin_pata_device = { | ||
| 829 | .name = "pata_platform", | ||
| 830 | .id = -1, | ||
| 831 | .num_resources = ARRAY_SIZE(bfin_pata_resources), | ||
| 832 | .resource = bfin_pata_resources, | ||
| 833 | .dev = { | ||
| 834 | .platform_data = &bfin_pata_platform_data, | ||
| 835 | } | ||
| 836 | }; | ||
| 837 | #endif | ||
| 838 | |||
| 839 | #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) | 801 | #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) |
| 840 | #include <linux/input.h> | 802 | #include <linux/input.h> |
| 841 | #include <linux/gpio_keys.h> | 803 | #include <linux/gpio_keys.h> |
| @@ -961,10 +923,6 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
| 961 | &bfin_sport1_uart_device, | 923 | &bfin_sport1_uart_device, |
| 962 | #endif | 924 | #endif |
| 963 | 925 | ||
| 964 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
| 965 | &bfin_pata_device, | ||
| 966 | #endif | ||
| 967 | |||
| 968 | #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) | 926 | #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) |
| 969 | &bfin_device_gpiokeys, | 927 | &bfin_device_gpiokeys, |
| 970 | #endif | 928 | #endif |
| @@ -987,10 +945,6 @@ static int __init stamp_init(void) | |||
| 987 | 945 | ||
| 988 | platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices)); | 946 | platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices)); |
| 989 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); | 947 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); |
| 990 | |||
| 991 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
| 992 | irq_desc[PATA_INT].status |= IRQ_NOAUTOEN; | ||
| 993 | #endif | ||
| 994 | return 0; | 948 | return 0; |
| 995 | } | 949 | } |
| 996 | 950 | ||
diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c index 689b69c98ee4..762f754c06cc 100644 --- a/arch/blackfin/mach-bf527/boards/ezkit.c +++ b/arch/blackfin/mach-bf527/boards/ezkit.c | |||
| @@ -38,7 +38,6 @@ | |||
| 38 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) | 38 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) |
| 39 | #include <linux/usb/isp1362.h> | 39 | #include <linux/usb/isp1362.h> |
| 40 | #endif | 40 | #endif |
| 41 | #include <linux/ata_platform.h> | ||
| 42 | #include <linux/i2c.h> | 41 | #include <linux/i2c.h> |
| 43 | #include <linux/irq.h> | 42 | #include <linux/irq.h> |
| 44 | #include <linux/interrupt.h> | 43 | #include <linux/interrupt.h> |
| @@ -177,15 +176,15 @@ static struct platform_device bf52x_t350mcqb_device = { | |||
| 177 | #if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE) | 176 | #if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE) |
| 178 | static struct mtd_partition ezkit_partitions[] = { | 177 | static struct mtd_partition ezkit_partitions[] = { |
| 179 | { | 178 | { |
| 180 | .name = "Bootloader", | 179 | .name = "bootloader(nor)", |
| 181 | .size = 0x40000, | 180 | .size = 0x40000, |
| 182 | .offset = 0, | 181 | .offset = 0, |
| 183 | }, { | 182 | }, { |
| 184 | .name = "Kernel", | 183 | .name = "linux kernel(nor)", |
| 185 | .size = 0x1C0000, | 184 | .size = 0x1C0000, |
| 186 | .offset = MTDPART_OFS_APPEND, | 185 | .offset = MTDPART_OFS_APPEND, |
| 187 | }, { | 186 | }, { |
| 188 | .name = "RootFS", | 187 | .name = "file system(nor)", |
| 189 | .size = MTDPART_SIZ_FULL, | 188 | .size = MTDPART_SIZ_FULL, |
| 190 | .offset = MTDPART_OFS_APPEND, | 189 | .offset = MTDPART_OFS_APPEND, |
| 191 | } | 190 | } |
| @@ -217,12 +216,12 @@ static struct platform_device ezkit_flash_device = { | |||
| 217 | #if defined(CONFIG_MTD_NAND_BF5XX) || defined(CONFIG_MTD_NAND_BF5XX_MODULE) | 216 | #if defined(CONFIG_MTD_NAND_BF5XX) || defined(CONFIG_MTD_NAND_BF5XX_MODULE) |
| 218 | static struct mtd_partition partition_info[] = { | 217 | static struct mtd_partition partition_info[] = { |
| 219 | { | 218 | { |
| 220 | .name = "Linux Kernel", | 219 | .name = "linux kernel(nand)", |
| 221 | .offset = 0, | 220 | .offset = 0, |
| 222 | .size = 4 * SIZE_1M, | 221 | .size = 4 * SIZE_1M, |
| 223 | }, | 222 | }, |
| 224 | { | 223 | { |
| 225 | .name = "File System", | 224 | .name = "file system(nand)", |
| 226 | .offset = MTDPART_OFS_APPEND, | 225 | .offset = MTDPART_OFS_APPEND, |
| 227 | .size = MTDPART_SIZ_FULL, | 226 | .size = MTDPART_SIZ_FULL, |
| 228 | }, | 227 | }, |
| @@ -460,12 +459,12 @@ static struct platform_device net2272_bfin_device = { | |||
| 460 | || defined(CONFIG_MTD_M25P80_MODULE) | 459 | || defined(CONFIG_MTD_M25P80_MODULE) |
| 461 | static struct mtd_partition bfin_spi_flash_partitions[] = { | 460 | static struct mtd_partition bfin_spi_flash_partitions[] = { |
| 462 | { | 461 | { |
| 463 | .name = "bootloader", | 462 | .name = "bootloader(spi)", |
| 464 | .size = 0x00040000, | 463 | .size = 0x00040000, |
| 465 | .offset = 0, | 464 | .offset = 0, |
| 466 | .mask_flags = MTD_CAP_ROM | 465 | .mask_flags = MTD_CAP_ROM |
| 467 | }, { | 466 | }, { |
| 468 | .name = "linux kernel", | 467 | .name = "linux kernel(spi)", |
| 469 | .size = MTDPART_SIZ_FULL, | 468 | .size = MTDPART_SIZ_FULL, |
| 470 | .offset = MTDPART_OFS_APPEND, | 469 | .offset = MTDPART_OFS_APPEND, |
| 471 | } | 470 | } |
| @@ -825,43 +824,6 @@ static struct platform_device bfin_sport1_uart_device = { | |||
| 825 | }; | 824 | }; |
| 826 | #endif | 825 | #endif |
| 827 | 826 | ||
| 828 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
| 829 | #define PATA_INT 55 | ||
| 830 | |||
| 831 | static struct pata_platform_info bfin_pata_platform_data = { | ||
| 832 | .ioport_shift = 1, | ||
| 833 | .irq_type = IRQF_TRIGGER_HIGH | IRQF_DISABLED, | ||
| 834 | }; | ||
| 835 | |||
| 836 | static struct resource bfin_pata_resources[] = { | ||
| 837 | { | ||
| 838 | .start = 0x20314020, | ||
| 839 | .end = 0x2031403F, | ||
| 840 | .flags = IORESOURCE_MEM, | ||
| 841 | }, | ||
| 842 | { | ||
| 843 | .start = 0x2031401C, | ||
| 844 | .end = 0x2031401F, | ||
| 845 | .flags = IORESOURCE_MEM, | ||
| 846 | }, | ||
| 847 | { | ||
| 848 | .start = PATA_INT, | ||
| 849 | .end = PATA_INT, | ||
| 850 | .flags = IORESOURCE_IRQ, | ||
| 851 | }, | ||
| 852 | }; | ||
| 853 | |||
| 854 | static struct platform_device bfin_pata_device = { | ||
| 855 | .name = "pata_platform", | ||
| 856 | .id = -1, | ||
| 857 | .num_resources = ARRAY_SIZE(bfin_pata_resources), | ||
| 858 | .resource = bfin_pata_resources, | ||
| 859 | .dev = { | ||
| 860 | .platform_data = &bfin_pata_platform_data, | ||
| 861 | } | ||
| 862 | }; | ||
| 863 | #endif | ||
| 864 | |||
| 865 | #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) | 827 | #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) |
| 866 | #include <linux/input.h> | 828 | #include <linux/input.h> |
| 867 | #include <linux/gpio_keys.h> | 829 | #include <linux/gpio_keys.h> |
| @@ -996,10 +958,6 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
| 996 | &bfin_sport1_uart_device, | 958 | &bfin_sport1_uart_device, |
| 997 | #endif | 959 | #endif |
| 998 | 960 | ||
| 999 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
| 1000 | &bfin_pata_device, | ||
| 1001 | #endif | ||
| 1002 | |||
| 1003 | #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) | 961 | #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) |
| 1004 | &bfin_device_gpiokeys, | 962 | &bfin_device_gpiokeys, |
| 1005 | #endif | 963 | #endif |
| @@ -1022,10 +980,6 @@ static int __init stamp_init(void) | |||
| 1022 | 980 | ||
| 1023 | platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices)); | 981 | platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices)); |
| 1024 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); | 982 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); |
| 1025 | |||
| 1026 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
| 1027 | irq_desc[PATA_INT].status |= IRQ_NOAUTOEN; | ||
| 1028 | #endif | ||
| 1029 | return 0; | 983 | return 0; |
| 1030 | } | 984 | } |
| 1031 | 985 | ||
diff --git a/arch/blackfin/mach-bf527/head.S b/arch/blackfin/mach-bf527/head.S index fe05cc1ef174..28c486191209 100644 --- a/arch/blackfin/mach-bf527/head.S +++ b/arch/blackfin/mach-bf527/head.S | |||
| @@ -30,292 +30,10 @@ | |||
| 30 | #include <linux/linkage.h> | 30 | #include <linux/linkage.h> |
| 31 | #include <linux/init.h> | 31 | #include <linux/init.h> |
| 32 | #include <asm/blackfin.h> | 32 | #include <asm/blackfin.h> |
| 33 | #include <asm/trace.h> | ||
| 34 | |||
| 35 | #ifdef CONFIG_BFIN_KERNEL_CLOCK | ||
| 36 | #include <asm/mach-common/clocks.h> | ||
| 37 | #include <asm/mach/mem_init.h> | ||
| 38 | #endif | ||
| 39 | |||
| 40 | .extern ___bss_stop | ||
| 41 | .extern ___bss_start | ||
| 42 | .extern _bf53x_relocate_l1_mem | ||
| 43 | |||
| 44 | #define INITIAL_STACK 0xFFB01000 | ||
| 45 | |||
| 46 | __INIT | ||
| 47 | |||
| 48 | ENTRY(__start) | ||
| 49 | /* R0: argument of command line string, passed from uboot, save it */ | ||
| 50 | R7 = R0; | ||
| 51 | /* Enable Cycle Counter and Nesting Of Interrupts */ | ||
| 52 | #ifdef CONFIG_BFIN_SCRATCH_REG_CYCLES | ||
| 53 | R0 = SYSCFG_SNEN; | ||
| 54 | #else | ||
| 55 | R0 = SYSCFG_SNEN | SYSCFG_CCEN; | ||
| 56 | #endif | ||
| 57 | SYSCFG = R0; | ||
| 58 | R0 = 0; | ||
| 59 | |||
| 60 | /* Clear Out All the data and pointer Registers */ | ||
| 61 | R1 = R0; | ||
| 62 | R2 = R0; | ||
| 63 | R3 = R0; | ||
| 64 | R4 = R0; | ||
| 65 | R5 = R0; | ||
| 66 | R6 = R0; | ||
| 67 | |||
| 68 | P0 = R0; | ||
| 69 | P1 = R0; | ||
| 70 | P2 = R0; | ||
| 71 | P3 = R0; | ||
| 72 | P4 = R0; | ||
| 73 | P5 = R0; | ||
| 74 | |||
| 75 | LC0 = r0; | ||
| 76 | LC1 = r0; | ||
| 77 | L0 = r0; | ||
| 78 | L1 = r0; | ||
| 79 | L2 = r0; | ||
| 80 | L3 = r0; | ||
| 81 | |||
| 82 | /* Clear Out All the DAG Registers */ | ||
| 83 | B0 = r0; | ||
| 84 | B1 = r0; | ||
| 85 | B2 = r0; | ||
| 86 | B3 = r0; | ||
| 87 | |||
| 88 | I0 = r0; | ||
| 89 | I1 = r0; | ||
| 90 | I2 = r0; | ||
| 91 | I3 = r0; | ||
| 92 | |||
| 93 | M0 = r0; | ||
| 94 | M1 = r0; | ||
| 95 | M2 = r0; | ||
| 96 | M3 = r0; | ||
| 97 | |||
| 98 | trace_buffer_init(p0,r0); | ||
| 99 | P0 = R1; | ||
| 100 | R0 = R1; | ||
| 101 | |||
| 102 | /* Turn off the icache */ | ||
| 103 | p0.l = LO(IMEM_CONTROL); | ||
| 104 | p0.h = HI(IMEM_CONTROL); | ||
| 105 | R1 = [p0]; | ||
| 106 | R0 = ~ENICPLB; | ||
| 107 | R0 = R0 & R1; | ||
| 108 | |||
| 109 | /* Anomaly 05000125 */ | ||
| 110 | #if ANOMALY_05000125 | ||
| 111 | CLI R2; | ||
| 112 | SSYNC; | ||
| 113 | #endif | ||
| 114 | [p0] = R0; | ||
| 115 | SSYNC; | ||
| 116 | #if ANOMALY_05000125 | ||
| 117 | STI R2; | ||
| 118 | #endif | ||
| 119 | |||
| 120 | /* Turn off the dcache */ | ||
| 121 | p0.l = LO(DMEM_CONTROL); | ||
| 122 | p0.h = HI(DMEM_CONTROL); | ||
| 123 | R1 = [p0]; | ||
| 124 | R0 = ~ENDCPLB; | ||
| 125 | R0 = R0 & R1; | ||
| 126 | |||
| 127 | /* Anomaly 05000125 */ | ||
| 128 | #if ANOMALY_05000125 | ||
| 129 | CLI R2; | ||
| 130 | SSYNC; | ||
| 131 | #endif | ||
| 132 | [p0] = R0; | ||
| 133 | SSYNC; | ||
| 134 | #if ANOMALY_05000125 | ||
| 135 | STI R2; | ||
| 136 | #endif | ||
| 137 | |||
| 138 | |||
| 139 | #if defined(CONFIG_BF527) | ||
| 140 | p0.h = hi(EMAC_SYSTAT); | ||
| 141 | p0.l = lo(EMAC_SYSTAT); | ||
| 142 | R0.h = 0xFFFF; /* Clear EMAC Interrupt Status bits */ | ||
| 143 | R0.l = 0xFFFF; | ||
| 144 | [P0] = R0; | ||
| 145 | SSYNC; | ||
| 146 | #endif | ||
| 147 | |||
| 148 | /* Initialise UART - when booting from u-boot, the UART is not disabled | ||
| 149 | * so if we dont initalize here, our serial console gets hosed */ | ||
| 150 | p0.h = hi(UART1_LCR); | ||
| 151 | p0.l = lo(UART1_LCR); | ||
| 152 | r0 = 0x0(Z); | ||
| 153 | w[p0] = r0.L; /* To enable DLL writes */ | ||
| 154 | ssync; | ||
| 155 | |||
| 156 | p0.h = hi(UART1_DLL); | ||
| 157 | p0.l = lo(UART1_DLL); | ||
| 158 | r0 = 0x0(Z); | ||
| 159 | w[p0] = r0.L; | ||
| 160 | ssync; | ||
| 161 | |||
| 162 | p0.h = hi(UART1_DLH); | ||
| 163 | p0.l = lo(UART1_DLH); | ||
| 164 | r0 = 0x00(Z); | ||
| 165 | w[p0] = r0.L; | ||
| 166 | ssync; | ||
| 167 | |||
| 168 | p0.h = hi(UART1_GCTL); | ||
| 169 | p0.l = lo(UART1_GCTL); | ||
| 170 | r0 = 0x0(Z); | ||
| 171 | w[p0] = r0.L; /* To enable UART clock */ | ||
| 172 | ssync; | ||
| 173 | |||
| 174 | /* Initialize stack pointer */ | ||
| 175 | sp.l = lo(INITIAL_STACK); | ||
| 176 | sp.h = hi(INITIAL_STACK); | ||
| 177 | fp = sp; | ||
| 178 | usp = sp; | ||
| 179 | |||
| 180 | #ifdef CONFIG_EARLY_PRINTK | ||
| 181 | SP += -12; | ||
| 182 | call _init_early_exception_vectors; | ||
| 183 | SP += 12; | ||
| 184 | #endif | ||
| 185 | |||
| 186 | /* Put The Code for PLL Programming and SDRAM Programming in L1 ISRAM */ | ||
| 187 | call _bf53x_relocate_l1_mem; | ||
| 188 | #ifdef CONFIG_BFIN_KERNEL_CLOCK | 33 | #ifdef CONFIG_BFIN_KERNEL_CLOCK |
| 189 | call _start_dma_code; | 34 | #include <asm/clocks.h> |
| 190 | #endif | 35 | #include <mach/mem_init.h> |
| 191 | |||
| 192 | /* Code for initializing Async memory banks */ | ||
| 193 | |||
| 194 | p2.h = hi(EBIU_AMBCTL1); | ||
| 195 | p2.l = lo(EBIU_AMBCTL1); | ||
| 196 | r0.h = hi(AMBCTL1VAL); | ||
| 197 | r0.l = lo(AMBCTL1VAL); | ||
| 198 | [p2] = r0; | ||
| 199 | ssync; | ||
| 200 | |||
| 201 | p2.h = hi(EBIU_AMBCTL0); | ||
| 202 | p2.l = lo(EBIU_AMBCTL0); | ||
| 203 | r0.h = hi(AMBCTL0VAL); | ||
| 204 | r0.l = lo(AMBCTL0VAL); | ||
| 205 | [p2] = r0; | ||
| 206 | ssync; | ||
| 207 | |||
| 208 | p2.h = hi(EBIU_AMGCTL); | ||
| 209 | p2.l = lo(EBIU_AMGCTL); | ||
| 210 | r0 = AMGCTLVAL; | ||
| 211 | w[p2] = r0; | ||
| 212 | ssync; | ||
| 213 | |||
| 214 | /* This section keeps the processor in supervisor mode | ||
| 215 | * during kernel boot. Switches to user mode at end of boot. | ||
| 216 | * See page 3-9 of Hardware Reference manual for documentation. | ||
| 217 | */ | ||
| 218 | |||
| 219 | /* EVT15 = _real_start */ | ||
| 220 | |||
| 221 | p0.l = lo(EVT15); | ||
| 222 | p0.h = hi(EVT15); | ||
| 223 | p1.l = _real_start; | ||
| 224 | p1.h = _real_start; | ||
| 225 | [p0] = p1; | ||
| 226 | csync; | ||
| 227 | |||
| 228 | p0.l = lo(IMASK); | ||
| 229 | p0.h = hi(IMASK); | ||
| 230 | p1.l = IMASK_IVG15; | ||
| 231 | p1.h = 0x0; | ||
| 232 | [p0] = p1; | ||
| 233 | csync; | ||
| 234 | |||
| 235 | raise 15; | ||
| 236 | p0.l = .LWAIT_HERE; | ||
| 237 | p0.h = .LWAIT_HERE; | ||
| 238 | reti = p0; | ||
| 239 | #if ANOMALY_05000281 | ||
| 240 | nop; nop; nop; | ||
| 241 | #endif | 36 | #endif |
| 242 | rti; | ||
| 243 | |||
| 244 | .LWAIT_HERE: | ||
| 245 | jump .LWAIT_HERE; | ||
| 246 | ENDPROC(__start) | ||
| 247 | |||
| 248 | ENTRY(_real_start) | ||
| 249 | [ -- sp ] = reti; | ||
| 250 | p0.l = lo(WDOG_CTL); | ||
| 251 | p0.h = hi(WDOG_CTL); | ||
| 252 | r0 = 0xAD6(z); | ||
| 253 | w[p0] = r0; /* watchdog off for now */ | ||
| 254 | ssync; | ||
| 255 | |||
| 256 | /* Code update for BSS size == 0 | ||
| 257 | * Zero out the bss region. | ||
| 258 | */ | ||
| 259 | |||
| 260 | p1.l = ___bss_start; | ||
| 261 | p1.h = ___bss_start; | ||
| 262 | p2.l = ___bss_stop; | ||
| 263 | p2.h = ___bss_stop; | ||
| 264 | r0 = 0; | ||
| 265 | p2 -= p1; | ||
| 266 | lsetup (.L_clear_bss, .L_clear_bss) lc0 = p2; | ||
| 267 | .L_clear_bss: | ||
| 268 | B[p1++] = r0; | ||
| 269 | |||
| 270 | /* In case there is a NULL pointer reference | ||
| 271 | * Zero out region before stext | ||
| 272 | */ | ||
| 273 | |||
| 274 | p1.l = 0x0; | ||
| 275 | p1.h = 0x0; | ||
| 276 | r0.l = __stext; | ||
| 277 | r0.h = __stext; | ||
| 278 | r0 = r0 >> 1; | ||
| 279 | p2 = r0; | ||
| 280 | r0 = 0; | ||
| 281 | lsetup (.L_clear_zero, .L_clear_zero) lc0 = p2; | ||
| 282 | .L_clear_zero: | ||
| 283 | W[p1++] = r0; | ||
| 284 | |||
| 285 | /* pass the uboot arguments to the global value command line */ | ||
| 286 | R0 = R7; | ||
| 287 | call _cmdline_init; | ||
| 288 | |||
| 289 | p1.l = __rambase; | ||
| 290 | p1.h = __rambase; | ||
| 291 | r0.l = __sdata; | ||
| 292 | r0.h = __sdata; | ||
| 293 | [p1] = r0; | ||
| 294 | |||
| 295 | p1.l = __ramstart; | ||
| 296 | p1.h = __ramstart; | ||
| 297 | p3.l = ___bss_stop; | ||
| 298 | p3.h = ___bss_stop; | ||
| 299 | |||
| 300 | r1 = p3; | ||
| 301 | [p1] = r1; | ||
| 302 | |||
| 303 | /* | ||
| 304 | * load the current thread pointer and stack | ||
| 305 | */ | ||
| 306 | r1.l = _init_thread_union; | ||
| 307 | r1.h = _init_thread_union; | ||
| 308 | |||
| 309 | r2.l = 0x2000; | ||
| 310 | r2.h = 0x0000; | ||
| 311 | r1 = r1 + r2; | ||
| 312 | sp = r1; | ||
| 313 | usp = sp; | ||
| 314 | fp = sp; | ||
| 315 | jump.l _start_kernel; | ||
| 316 | ENDPROC(_real_start) | ||
| 317 | |||
| 318 | __FINIT | ||
| 319 | 37 | ||
| 320 | .section .l1.text | 38 | .section .l1.text |
| 321 | #ifdef CONFIG_BFIN_KERNEL_CLOCK | 39 | #ifdef CONFIG_BFIN_KERNEL_CLOCK |
| @@ -420,13 +138,6 @@ ENTRY(_start_dma_code) | |||
| 420 | [P2] = R1; | 138 | [P2] = R1; |
| 421 | SSYNC; | 139 | SSYNC; |
| 422 | 140 | ||
| 423 | p0.h = hi(SIC_IWR0); | ||
| 424 | p0.l = lo(SIC_IWR0); | ||
| 425 | r0.l = lo(IWR_ENABLE_ALL); | ||
| 426 | r0.h = hi(IWR_ENABLE_ALL); | ||
| 427 | [p0] = r0; | ||
| 428 | SSYNC; | ||
| 429 | |||
| 430 | RTS; | 141 | RTS; |
| 431 | ENDPROC(_start_dma_code) | 142 | ENDPROC(_start_dma_code) |
| 432 | #endif /* CONFIG_BFIN_KERNEL_CLOCK */ | 143 | #endif /* CONFIG_BFIN_KERNEL_CLOCK */ |
diff --git a/include/asm-blackfin/mach-bf527/anomaly.h b/arch/blackfin/mach-bf527/include/mach/anomaly.h index b7b166f4f064..b7b166f4f064 100644 --- a/include/asm-blackfin/mach-bf527/anomaly.h +++ b/arch/blackfin/mach-bf527/include/mach/anomaly.h | |||
diff --git a/include/asm-blackfin/mach-bf527/bf527.h b/arch/blackfin/mach-bf527/include/mach/bf527.h index 056eb4b9cd25..056eb4b9cd25 100644 --- a/include/asm-blackfin/mach-bf527/bf527.h +++ b/arch/blackfin/mach-bf527/include/mach/bf527.h | |||
diff --git a/include/asm-blackfin/mach-bf527/bfin_serial_5xx.h b/arch/blackfin/mach-bf527/include/mach/bfin_serial_5xx.h index 2526b6ed6faa..2526b6ed6faa 100644 --- a/include/asm-blackfin/mach-bf527/bfin_serial_5xx.h +++ b/arch/blackfin/mach-bf527/include/mach/bfin_serial_5xx.h | |||
diff --git a/include/asm-blackfin/mach-bf527/bfin_sir.h b/arch/blackfin/mach-bf527/include/mach/bfin_sir.h index cfd8ad4f1f2c..cfd8ad4f1f2c 100644 --- a/include/asm-blackfin/mach-bf527/bfin_sir.h +++ b/arch/blackfin/mach-bf527/include/mach/bfin_sir.h | |||
diff --git a/include/asm-blackfin/mach-bf527/blackfin.h b/arch/blackfin/mach-bf527/include/mach/blackfin.h index 297821e2d79a..297821e2d79a 100644 --- a/include/asm-blackfin/mach-bf527/blackfin.h +++ b/arch/blackfin/mach-bf527/include/mach/blackfin.h | |||
diff --git a/include/asm-blackfin/mach-bf527/cdefBF522.h b/arch/blackfin/mach-bf527/include/mach/cdefBF522.h index 52c06494b886..663c2bbdfd91 100644 --- a/include/asm-blackfin/mach-bf527/cdefBF522.h +++ b/arch/blackfin/mach-bf527/include/mach/cdefBF522.h | |||
| @@ -36,7 +36,7 @@ | |||
| 36 | #include "defBF522.h" | 36 | #include "defBF522.h" |
| 37 | 37 | ||
| 38 | /* include core specific register pointer definitions */ | 38 | /* include core specific register pointer definitions */ |
| 39 | #include <asm/mach-common/cdef_LPBlackfin.h> | 39 | #include <asm/cdef_LPBlackfin.h> |
| 40 | 40 | ||
| 41 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF522 */ | 41 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF522 */ |
| 42 | 42 | ||
diff --git a/include/asm-blackfin/mach-bf527/cdefBF525.h b/arch/blackfin/mach-bf527/include/mach/cdefBF525.h index 2cc67e4b4d86..00377eb59b75 100644 --- a/include/asm-blackfin/mach-bf527/cdefBF525.h +++ b/arch/blackfin/mach-bf527/include/mach/cdefBF525.h | |||
| @@ -36,7 +36,7 @@ | |||
| 36 | #include "defBF525.h" | 36 | #include "defBF525.h" |
| 37 | 37 | ||
| 38 | /* include core specific register pointer definitions */ | 38 | /* include core specific register pointer definitions */ |
| 39 | #include <asm/mach-common/cdef_LPBlackfin.h> | 39 | #include <asm/cdef_LPBlackfin.h> |
| 40 | 40 | ||
| 41 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF525 */ | 41 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF525 */ |
| 42 | 42 | ||
diff --git a/include/asm-blackfin/mach-bf527/cdefBF527.h b/arch/blackfin/mach-bf527/include/mach/cdefBF527.h index 5bd1a8601743..fca8db708119 100644 --- a/include/asm-blackfin/mach-bf527/cdefBF527.h +++ b/arch/blackfin/mach-bf527/include/mach/cdefBF527.h | |||
| @@ -36,7 +36,7 @@ | |||
| 36 | #include "defBF527.h" | 36 | #include "defBF527.h" |
| 37 | 37 | ||
| 38 | /* include core specific register pointer definitions */ | 38 | /* include core specific register pointer definitions */ |
| 39 | #include <asm/mach-common/cdef_LPBlackfin.h> | 39 | #include <asm/cdef_LPBlackfin.h> |
| 40 | 40 | ||
| 41 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF527 */ | 41 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF527 */ |
| 42 | 42 | ||
diff --git a/include/asm-blackfin/mach-bf527/cdefBF52x_base.h b/arch/blackfin/mach-bf527/include/mach/cdefBF52x_base.h index 9dbdbec8ea1b..9a814b9a12b9 100644 --- a/include/asm-blackfin/mach-bf527/cdefBF52x_base.h +++ b/arch/blackfin/mach-bf527/include/mach/cdefBF52x_base.h | |||
| @@ -37,7 +37,7 @@ | |||
| 37 | #include "defBF52x_base.h" | 37 | #include "defBF52x_base.h" |
| 38 | 38 | ||
| 39 | /* Include core specific register pointer definitions */ | 39 | /* Include core specific register pointer definitions */ |
| 40 | #include <asm/mach-common/cdef_LPBlackfin.h> | 40 | #include <asm/cdef_LPBlackfin.h> |
| 41 | 41 | ||
| 42 | /* ==== begin from cdefBF534.h ==== */ | 42 | /* ==== begin from cdefBF534.h ==== */ |
| 43 | 43 | ||
diff --git a/include/asm-blackfin/mach-bf527/defBF522.h b/arch/blackfin/mach-bf527/include/mach/defBF522.h index 9671d8f2c5ef..0a8cdcdf0b49 100644 --- a/include/asm-blackfin/mach-bf527/defBF522.h +++ b/arch/blackfin/mach-bf527/include/mach/defBF522.h | |||
| @@ -32,7 +32,7 @@ | |||
| 32 | #define _DEF_BF522_H | 32 | #define _DEF_BF522_H |
| 33 | 33 | ||
| 34 | /* Include all Core registers and bit definitions */ | 34 | /* Include all Core registers and bit definitions */ |
| 35 | #include <asm/mach-common/def_LPBlackfin.h> | 35 | #include <asm/def_LPBlackfin.h> |
| 36 | 36 | ||
| 37 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF522 */ | 37 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF522 */ |
| 38 | 38 | ||
diff --git a/include/asm-blackfin/mach-bf527/defBF525.h b/arch/blackfin/mach-bf527/include/mach/defBF525.h index 6a375a084acc..5cd7576fef76 100644 --- a/include/asm-blackfin/mach-bf527/defBF525.h +++ b/arch/blackfin/mach-bf527/include/mach/defBF525.h | |||
| @@ -32,7 +32,7 @@ | |||
| 32 | #define _DEF_BF525_H | 32 | #define _DEF_BF525_H |
| 33 | 33 | ||
| 34 | /* Include all Core registers and bit definitions */ | 34 | /* Include all Core registers and bit definitions */ |
| 35 | #include <asm/mach-common/def_LPBlackfin.h> | 35 | #include <asm/def_LPBlackfin.h> |
| 36 | 36 | ||
| 37 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF525 */ | 37 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF525 */ |
| 38 | 38 | ||
diff --git a/include/asm-blackfin/mach-bf527/defBF527.h b/arch/blackfin/mach-bf527/include/mach/defBF527.h index f1a70db70cb8..f040f364afa3 100644 --- a/include/asm-blackfin/mach-bf527/defBF527.h +++ b/arch/blackfin/mach-bf527/include/mach/defBF527.h | |||
| @@ -32,7 +32,7 @@ | |||
| 32 | #define _DEF_BF527_H | 32 | #define _DEF_BF527_H |
| 33 | 33 | ||
| 34 | /* Include all Core registers and bit definitions */ | 34 | /* Include all Core registers and bit definitions */ |
| 35 | #include <asm/mach-common/def_LPBlackfin.h> | 35 | #include <asm/def_LPBlackfin.h> |
| 36 | 36 | ||
| 37 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF527 */ | 37 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF527 */ |
| 38 | 38 | ||
diff --git a/include/asm-blackfin/mach-bf527/defBF52x_base.h b/arch/blackfin/mach-bf527/include/mach/defBF52x_base.h index fc69cf93f149..6ac2ed7026eb 100644 --- a/include/asm-blackfin/mach-bf527/defBF52x_base.h +++ b/arch/blackfin/mach-bf527/include/mach/defBF52x_base.h | |||
| @@ -151,7 +151,7 @@ | |||
| 151 | #define TIMER7_CONFIG 0xFFC00670 /* Timer 7 Configuration Register */ | 151 | #define TIMER7_CONFIG 0xFFC00670 /* Timer 7 Configuration Register */ |
| 152 | #define TIMER7_COUNTER 0xFFC00674 /* Timer 7 Counter Register */ | 152 | #define TIMER7_COUNTER 0xFFC00674 /* Timer 7 Counter Register */ |
| 153 | #define TIMER7_PERIOD 0xFFC00678 /* Timer 7 Period Register */ | 153 | #define TIMER7_PERIOD 0xFFC00678 /* Timer 7 Period Register */ |
| 154 | #define TIMER7_WIDTH 0xFFC0067C /* Timer 7 Width Register */ | 154 | #define TIMER7_WIDTH 0xFFC0067C /* Timer 7 Width Register */ |
| 155 | 155 | ||
| 156 | #define TIMER_ENABLE 0xFFC00680 /* Timer Enable Register */ | 156 | #define TIMER_ENABLE 0xFFC00680 /* Timer Enable Register */ |
| 157 | #define TIMER_DISABLE 0xFFC00684 /* Timer Disable Register */ | 157 | #define TIMER_DISABLE 0xFFC00684 /* Timer Disable Register */ |
| @@ -634,18 +634,9 @@ | |||
| 634 | /* PLL_DIV Macros */ | 634 | /* PLL_DIV Macros */ |
| 635 | #define SET_SSEL(x) ((x)&0xF) /* Set SSEL = 0-15 --> SCLK = VCO/SSEL */ | 635 | #define SET_SSEL(x) ((x)&0xF) /* Set SSEL = 0-15 --> SCLK = VCO/SSEL */ |
| 636 | 636 | ||
| 637 | /* VR_CTL Masks */ | 637 | /* VR_CTL Masks */ |
| 638 | #define FREQ 0x0003 /* Switching Oscillator Frequency For Regulator */ | 638 | #define FREQ 0x3000 /* Switching Oscillator Frequency For Regulator */ |
| 639 | #define HIBERNATE 0x0000 /* Powerdown/Bypass On-Board Regulation */ | 639 | #define HIBERNATE 0x0000 /* Powerdown/Bypass On-Board Regulation */ |
| 640 | #define FREQ_333 0x0001 /* Switching Frequency Is 333 kHz */ | ||
| 641 | #define FREQ_667 0x0002 /* Switching Frequency Is 667 kHz */ | ||
| 642 | #define FREQ_1000 0x0003 /* Switching Frequency Is 1 MHz */ | ||
| 643 | |||
| 644 | #define GAIN 0x000C /* Voltage Level Gain */ | ||
| 645 | #define GAIN_5 0x0000 /* GAIN = 5 */ | ||
| 646 | #define GAIN_10 0x0004 /* GAIN = 10 */ | ||
| 647 | #define GAIN_20 0x0008 /* GAIN = 20 */ | ||
| 648 | #define GAIN_50 0x000C /* GAIN = 50 */ | ||
| 649 | 640 | ||
| 650 | #define VLEV 0x00F0 /* Internal Voltage Level */ | 641 | #define VLEV 0x00F0 /* Internal Voltage Level */ |
| 651 | #define VLEV_085 0x0060 /* VLEV = 0.85 V (-5% - +10% Accuracy) */ | 642 | #define VLEV_085 0x0060 /* VLEV = 0.85 V (-5% - +10% Accuracy) */ |
| @@ -660,7 +651,7 @@ | |||
| 660 | #define VLEV_130 0x00F0 /* VLEV = 1.30 V (-5% - +10% Accuracy) */ | 651 | #define VLEV_130 0x00F0 /* VLEV = 1.30 V (-5% - +10% Accuracy) */ |
| 661 | 652 | ||
| 662 | #define WAKE 0x0100 /* Enable RTC/Reset Wakeup From Hibernate */ | 653 | #define WAKE 0x0100 /* Enable RTC/Reset Wakeup From Hibernate */ |
| 663 | #define CANWE 0x0200 /* Enable CAN Wakeup From Hibernate */ | 654 | #define USBWE 0x0200 /* Enable USB Wakeup From Hibernate */ |
| 664 | #define PHYWE 0x0400 /* Enable PHY Wakeup From Hibernate */ | 655 | #define PHYWE 0x0400 /* Enable PHY Wakeup From Hibernate */ |
| 665 | #define CLKBUFOE 0x4000 /* CLKIN Buffer Output Enable */ | 656 | #define CLKBUFOE 0x4000 /* CLKIN Buffer Output Enable */ |
| 666 | #define PHYCLKOE CLKBUFOE /* Alternative legacy name for the above */ | 657 | #define PHYCLKOE CLKBUFOE /* Alternative legacy name for the above */ |
| @@ -697,16 +688,16 @@ | |||
| 697 | 688 | ||
| 698 | #define IRQ_ERROR1 0x00000002 /* Error Interrupt (DMA, DMARx Block, DMARx Overflow) */ | 689 | #define IRQ_ERROR1 0x00000002 /* Error Interrupt (DMA, DMARx Block, DMARx Overflow) */ |
| 699 | #define IRQ_ERROR2 0x00000004 /* Error Interrupt (CAN, Ethernet, SPORTx, PPI, SPI, UARTx) */ | 690 | #define IRQ_ERROR2 0x00000004 /* Error Interrupt (CAN, Ethernet, SPORTx, PPI, SPI, UARTx) */ |
| 700 | #define IRQ_RTC 0x00000008 /* Real Time Clock Interrupt */ | 691 | #define IRQ_RTC 0x00000008 /* Real Time Clock Interrupt */ |
| 701 | #define IRQ_DMA0 0x00000010 /* DMA Channel 0 (PPI) Interrupt */ | 692 | #define IRQ_DMA0 0x00000010 /* DMA Channel 0 (PPI) Interrupt */ |
| 702 | #define IRQ_DMA3 0x00000020 /* DMA Channel 3 (SPORT0 RX) Interrupt */ | 693 | #define IRQ_DMA3 0x00000020 /* DMA Channel 3 (SPORT0 RX) Interrupt */ |
| 703 | #define IRQ_DMA4 0x00000040 /* DMA Channel 4 (SPORT0 TX) Interrupt */ | 694 | #define IRQ_DMA4 0x00000040 /* DMA Channel 4 (SPORT0 TX) Interrupt */ |
| 704 | #define IRQ_DMA5 0x00000080 /* DMA Channel 5 (SPORT1 RX) Interrupt */ | 695 | #define IRQ_DMA5 0x00000080 /* DMA Channel 5 (SPORT1 RX) Interrupt */ |
| 705 | 696 | ||
| 706 | #define IRQ_DMA6 0x00000100 /* DMA Channel 6 (SPORT1 TX) Interrupt */ | 697 | #define IRQ_DMA6 0x00000100 /* DMA Channel 6 (SPORT1 TX) Interrupt */ |
| 707 | #define IRQ_TWI 0x00000200 /* TWI Interrupt */ | 698 | #define IRQ_TWI 0x00000200 /* TWI Interrupt */ |
| 708 | #define IRQ_DMA7 0x00000400 /* DMA Channel 7 (SPI) Interrupt */ | 699 | #define IRQ_DMA7 0x00000400 /* DMA Channel 7 (SPI) Interrupt */ |
| 709 | #define IRQ_DMA8 0x00000800 /* DMA Channel 8 (UART0 RX) Interrupt */ | 700 | #define IRQ_DMA8 0x00000800 /* DMA Channel 8 (UART0 RX) Interrupt */ |
| 710 | #define IRQ_DMA9 0x00001000 /* DMA Channel 9 (UART0 TX) Interrupt */ | 701 | #define IRQ_DMA9 0x00001000 /* DMA Channel 9 (UART0 TX) Interrupt */ |
| 711 | #define IRQ_DMA10 0x00002000 /* DMA Channel 10 (UART1 RX) Interrupt */ | 702 | #define IRQ_DMA10 0x00002000 /* DMA Channel 10 (UART1 RX) Interrupt */ |
| 712 | #define IRQ_DMA11 0x00004000 /* DMA Channel 11 (UART1 TX) Interrupt */ | 703 | #define IRQ_DMA11 0x00004000 /* DMA Channel 11 (UART1 TX) Interrupt */ |
| @@ -801,7 +792,7 @@ | |||
| 801 | #define WDEV_NONE 0x0006 /* no event on roll over */ | 792 | #define WDEV_NONE 0x0006 /* no event on roll over */ |
| 802 | #define WDEN 0x0FF0 /* enable watchdog */ | 793 | #define WDEN 0x0FF0 /* enable watchdog */ |
| 803 | #define WDDIS 0x0AD0 /* disable watchdog */ | 794 | #define WDDIS 0x0AD0 /* disable watchdog */ |
| 804 | #define WDRO 0x8000 /* watchdog rolled over latch */ | 795 | #define WDRO 0x8000 /* watchdog rolled over latch */ |
| 805 | 796 | ||
| 806 | /* depreciated WDOG_CTL Register Masks for legacy code */ | 797 | /* depreciated WDOG_CTL Register Masks for legacy code */ |
| 807 | 798 | ||
| @@ -882,7 +873,7 @@ | |||
| 882 | #define NINT 0x01 /* Pending Interrupt */ | 873 | #define NINT 0x01 /* Pending Interrupt */ |
| 883 | #define IIR_TX_READY 0x02 /* UART_THR empty */ | 874 | #define IIR_TX_READY 0x02 /* UART_THR empty */ |
| 884 | #define IIR_RX_READY 0x04 /* Receive data ready */ | 875 | #define IIR_RX_READY 0x04 /* Receive data ready */ |
| 885 | #define IIR_LINE_CHANGE 0x06 /* Receive line status */ | 876 | #define IIR_LINE_CHANGE 0x06 /* Receive line status */ |
| 886 | #define IIR_STATUS 0x06 /* Highest Priority Pending Interrupt */ | 877 | #define IIR_STATUS 0x06 /* Highest Priority Pending Interrupt */ |
| 887 | 878 | ||
| 888 | /* UARTx_GCTL Masks */ | 879 | /* UARTx_GCTL Masks */ |
| @@ -1638,12 +1629,12 @@ | |||
| 1638 | 1629 | ||
| 1639 | /* entry addresses of the user-callable Boot ROM functions */ | 1630 | /* entry addresses of the user-callable Boot ROM functions */ |
| 1640 | 1631 | ||
| 1641 | #define _BOOTROM_RESET 0xEF000000 | 1632 | #define _BOOTROM_RESET 0xEF000000 |
| 1642 | #define _BOOTROM_FINAL_INIT 0xEF000002 | 1633 | #define _BOOTROM_FINAL_INIT 0xEF000002 |
| 1643 | #define _BOOTROM_DO_MEMORY_DMA 0xEF000006 | 1634 | #define _BOOTROM_DO_MEMORY_DMA 0xEF000006 |
| 1644 | #define _BOOTROM_BOOT_DXE_FLASH 0xEF000008 | 1635 | #define _BOOTROM_BOOT_DXE_FLASH 0xEF000008 |
| 1645 | #define _BOOTROM_BOOT_DXE_SPI 0xEF00000A | 1636 | #define _BOOTROM_BOOT_DXE_SPI 0xEF00000A |
| 1646 | #define _BOOTROM_BOOT_DXE_TWI 0xEF00000C | 1637 | #define _BOOTROM_BOOT_DXE_TWI 0xEF00000C |
| 1647 | #define _BOOTROM_GET_DXE_ADDRESS_FLASH 0xEF000010 | 1638 | #define _BOOTROM_GET_DXE_ADDRESS_FLASH 0xEF000010 |
| 1648 | #define _BOOTROM_GET_DXE_ADDRESS_SPI 0xEF000012 | 1639 | #define _BOOTROM_GET_DXE_ADDRESS_SPI 0xEF000012 |
| 1649 | #define _BOOTROM_GET_DXE_ADDRESS_TWI 0xEF000014 | 1640 | #define _BOOTROM_GET_DXE_ADDRESS_TWI 0xEF000014 |
| @@ -1771,71 +1762,71 @@ | |||
| 1771 | /* Bit masks for CNT_CONFIG */ | 1762 | /* Bit masks for CNT_CONFIG */ |
| 1772 | 1763 | ||
| 1773 | #define CNTE 0x1 /* Counter Enable */ | 1764 | #define CNTE 0x1 /* Counter Enable */ |
| 1774 | #define nCNTE 0x0 | 1765 | #define nCNTE 0x0 |
| 1775 | #define DEBE 0x2 /* Debounce Enable */ | 1766 | #define DEBE 0x2 /* Debounce Enable */ |
| 1776 | #define nDEBE 0x0 | 1767 | #define nDEBE 0x0 |
| 1777 | #define CDGINV 0x10 /* CDG Pin Polarity Invert */ | 1768 | #define CDGINV 0x10 /* CDG Pin Polarity Invert */ |
| 1778 | #define nCDGINV 0x0 | 1769 | #define nCDGINV 0x0 |
| 1779 | #define CUDINV 0x20 /* CUD Pin Polarity Invert */ | 1770 | #define CUDINV 0x20 /* CUD Pin Polarity Invert */ |
| 1780 | #define nCUDINV 0x0 | 1771 | #define nCUDINV 0x0 |
| 1781 | #define CZMINV 0x40 /* CZM Pin Polarity Invert */ | 1772 | #define CZMINV 0x40 /* CZM Pin Polarity Invert */ |
| 1782 | #define nCZMINV 0x0 | 1773 | #define nCZMINV 0x0 |
| 1783 | #define CNTMODE 0x700 /* Counter Operating Mode */ | 1774 | #define CNTMODE 0x700 /* Counter Operating Mode */ |
| 1784 | #define ZMZC 0x800 /* CZM Zeroes Counter Enable */ | 1775 | #define ZMZC 0x800 /* CZM Zeroes Counter Enable */ |
| 1785 | #define nZMZC 0x0 | 1776 | #define nZMZC 0x0 |
| 1786 | #define BNDMODE 0x3000 /* Boundary register Mode */ | 1777 | #define BNDMODE 0x3000 /* Boundary register Mode */ |
| 1787 | #define INPDIS 0x8000 /* CUG and CDG Input Disable */ | 1778 | #define INPDIS 0x8000 /* CUG and CDG Input Disable */ |
| 1788 | #define nINPDIS 0x0 | 1779 | #define nINPDIS 0x0 |
| 1789 | 1780 | ||
| 1790 | /* Bit masks for CNT_IMASK */ | 1781 | /* Bit masks for CNT_IMASK */ |
| 1791 | 1782 | ||
| 1792 | #define ICIE 0x1 /* Illegal Gray/Binary Code Interrupt Enable */ | 1783 | #define ICIE 0x1 /* Illegal Gray/Binary Code Interrupt Enable */ |
| 1793 | #define nICIE 0x0 | 1784 | #define nICIE 0x0 |
| 1794 | #define UCIE 0x2 /* Up count Interrupt Enable */ | 1785 | #define UCIE 0x2 /* Up count Interrupt Enable */ |
| 1795 | #define nUCIE 0x0 | 1786 | #define nUCIE 0x0 |
| 1796 | #define DCIE 0x4 /* Down count Interrupt Enable */ | 1787 | #define DCIE 0x4 /* Down count Interrupt Enable */ |
| 1797 | #define nDCIE 0x0 | 1788 | #define nDCIE 0x0 |
| 1798 | #define MINCIE 0x8 /* Min Count Interrupt Enable */ | 1789 | #define MINCIE 0x8 /* Min Count Interrupt Enable */ |
| 1799 | #define nMINCIE 0x0 | 1790 | #define nMINCIE 0x0 |
| 1800 | #define MAXCIE 0x10 /* Max Count Interrupt Enable */ | 1791 | #define MAXCIE 0x10 /* Max Count Interrupt Enable */ |
| 1801 | #define nMAXCIE 0x0 | 1792 | #define nMAXCIE 0x0 |
| 1802 | #define COV31IE 0x20 /* Bit 31 Overflow Interrupt Enable */ | 1793 | #define COV31IE 0x20 /* Bit 31 Overflow Interrupt Enable */ |
| 1803 | #define nCOV31IE 0x0 | 1794 | #define nCOV31IE 0x0 |
| 1804 | #define COV15IE 0x40 /* Bit 15 Overflow Interrupt Enable */ | 1795 | #define COV15IE 0x40 /* Bit 15 Overflow Interrupt Enable */ |
| 1805 | #define nCOV15IE 0x0 | 1796 | #define nCOV15IE 0x0 |
| 1806 | #define CZEROIE 0x80 /* Count to Zero Interrupt Enable */ | 1797 | #define CZEROIE 0x80 /* Count to Zero Interrupt Enable */ |
| 1807 | #define nCZEROIE 0x0 | 1798 | #define nCZEROIE 0x0 |
| 1808 | #define CZMIE 0x100 /* CZM Pin Interrupt Enable */ | 1799 | #define CZMIE 0x100 /* CZM Pin Interrupt Enable */ |
| 1809 | #define nCZMIE 0x0 | 1800 | #define nCZMIE 0x0 |
| 1810 | #define CZMEIE 0x200 /* CZM Error Interrupt Enable */ | 1801 | #define CZMEIE 0x200 /* CZM Error Interrupt Enable */ |
| 1811 | #define nCZMEIE 0x0 | 1802 | #define nCZMEIE 0x0 |
| 1812 | #define CZMZIE 0x400 /* CZM Zeroes Counter Interrupt Enable */ | 1803 | #define CZMZIE 0x400 /* CZM Zeroes Counter Interrupt Enable */ |
| 1813 | #define nCZMZIE 0x0 | 1804 | #define nCZMZIE 0x0 |
| 1814 | 1805 | ||
| 1815 | /* Bit masks for CNT_STATUS */ | 1806 | /* Bit masks for CNT_STATUS */ |
| 1816 | 1807 | ||
| 1817 | #define ICII 0x1 /* Illegal Gray/Binary Code Interrupt Identifier */ | 1808 | #define ICII 0x1 /* Illegal Gray/Binary Code Interrupt Identifier */ |
| 1818 | #define nICII 0x0 | 1809 | #define nICII 0x0 |
| 1819 | #define UCII 0x2 /* Up count Interrupt Identifier */ | 1810 | #define UCII 0x2 /* Up count Interrupt Identifier */ |
| 1820 | #define nUCII 0x0 | 1811 | #define nUCII 0x0 |
| 1821 | #define DCII 0x4 /* Down count Interrupt Identifier */ | 1812 | #define DCII 0x4 /* Down count Interrupt Identifier */ |
| 1822 | #define nDCII 0x0 | 1813 | #define nDCII 0x0 |
| 1823 | #define MINCII 0x8 /* Min Count Interrupt Identifier */ | 1814 | #define MINCII 0x8 /* Min Count Interrupt Identifier */ |
| 1824 | #define nMINCII 0x0 | 1815 | #define nMINCII 0x0 |
| 1825 | #define MAXCII 0x10 /* Max Count Interrupt Identifier */ | 1816 | #define MAXCII 0x10 /* Max Count Interrupt Identifier */ |
| 1826 | #define nMAXCII 0x0 | 1817 | #define nMAXCII 0x0 |
| 1827 | #define COV31II 0x20 /* Bit 31 Overflow Interrupt Identifier */ | 1818 | #define COV31II 0x20 /* Bit 31 Overflow Interrupt Identifier */ |
| 1828 | #define nCOV31II 0x0 | 1819 | #define nCOV31II 0x0 |
| 1829 | #define COV15II 0x40 /* Bit 15 Overflow Interrupt Identifier */ | 1820 | #define COV15II 0x40 /* Bit 15 Overflow Interrupt Identifier */ |
| 1830 | #define nCOV15II 0x0 | 1821 | #define nCOV15II 0x0 |
| 1831 | #define CZEROII 0x80 /* Count to Zero Interrupt Identifier */ | 1822 | #define CZEROII 0x80 /* Count to Zero Interrupt Identifier */ |
| 1832 | #define nCZEROII 0x0 | 1823 | #define nCZEROII 0x0 |
| 1833 | #define CZMII 0x100 /* CZM Pin Interrupt Identifier */ | 1824 | #define CZMII 0x100 /* CZM Pin Interrupt Identifier */ |
| 1834 | #define nCZMII 0x0 | 1825 | #define nCZMII 0x0 |
| 1835 | #define CZMEII 0x200 /* CZM Error Interrupt Identifier */ | 1826 | #define CZMEII 0x200 /* CZM Error Interrupt Identifier */ |
| 1836 | #define nCZMEII 0x0 | 1827 | #define nCZMEII 0x0 |
| 1837 | #define CZMZII 0x400 /* CZM Zeroes Counter Interrupt Identifier */ | 1828 | #define CZMZII 0x400 /* CZM Zeroes Counter Interrupt Identifier */ |
| 1838 | #define nCZMZII 0x0 | 1829 | #define nCZMZII 0x0 |
| 1839 | 1830 | ||
| 1840 | /* Bit masks for CNT_COMMAND */ | 1831 | /* Bit masks for CNT_COMMAND */ |
| 1841 | 1832 | ||
| @@ -1843,7 +1834,7 @@ | |||
| 1843 | #define W1LMIN 0xf0 /* Load Min Register */ | 1834 | #define W1LMIN 0xf0 /* Load Min Register */ |
| 1844 | #define W1LMAX 0xf00 /* Load Max Register */ | 1835 | #define W1LMAX 0xf00 /* Load Max Register */ |
| 1845 | #define W1ZMONCE 0x1000 /* Enable CZM Clear Counter Once */ | 1836 | #define W1ZMONCE 0x1000 /* Enable CZM Clear Counter Once */ |
| 1846 | #define nW1ZMONCE 0x0 | 1837 | #define nW1ZMONCE 0x0 |
| 1847 | 1838 | ||
| 1848 | /* Bit masks for CNT_DEBOUNCE */ | 1839 | /* Bit masks for CNT_DEBOUNCE */ |
| 1849 | 1840 | ||
| @@ -1853,15 +1844,15 @@ | |||
| 1853 | 1844 | ||
| 1854 | #define FUSE_FADDR 0x1ff /* OTP/Fuse Address */ | 1845 | #define FUSE_FADDR 0x1ff /* OTP/Fuse Address */ |
| 1855 | #define FIEN 0x800 /* OTP/Fuse Interrupt Enable */ | 1846 | #define FIEN 0x800 /* OTP/Fuse Interrupt Enable */ |
| 1856 | #define nFIEN 0x0 | 1847 | #define nFIEN 0x0 |
| 1857 | #define FTESTDEC 0x1000 /* OTP/Fuse Test Decoder */ | 1848 | #define FTESTDEC 0x1000 /* OTP/Fuse Test Decoder */ |
| 1858 | #define nFTESTDEC 0x0 | 1849 | #define nFTESTDEC 0x0 |
| 1859 | #define FWRTEST 0x2000 /* OTP/Fuse Write Test */ | 1850 | #define FWRTEST 0x2000 /* OTP/Fuse Write Test */ |
| 1860 | #define nFWRTEST 0x0 | 1851 | #define nFWRTEST 0x0 |
| 1861 | #define FRDEN 0x4000 /* OTP/Fuse Read Enable */ | 1852 | #define FRDEN 0x4000 /* OTP/Fuse Read Enable */ |
| 1862 | #define nFRDEN 0x0 | 1853 | #define nFRDEN 0x0 |
| 1863 | #define FWREN 0x8000 /* OTP/Fuse Write Enable */ | 1854 | #define FWREN 0x8000 /* OTP/Fuse Write Enable */ |
| 1864 | #define nFWREN 0x0 | 1855 | #define nFWREN 0x0 |
| 1865 | 1856 | ||
| 1866 | /* Bit masks for OTP_BEN */ | 1857 | /* Bit masks for OTP_BEN */ |
| 1867 | 1858 | ||
| @@ -1870,15 +1861,15 @@ | |||
| 1870 | /* Bit masks for OTP_STATUS */ | 1861 | /* Bit masks for OTP_STATUS */ |
| 1871 | 1862 | ||
| 1872 | #define FCOMP 0x1 /* OTP/Fuse Access Complete */ | 1863 | #define FCOMP 0x1 /* OTP/Fuse Access Complete */ |
| 1873 | #define nFCOMP 0x0 | 1864 | #define nFCOMP 0x0 |
| 1874 | #define FERROR 0x2 /* OTP/Fuse Access Error */ | 1865 | #define FERROR 0x2 /* OTP/Fuse Access Error */ |
| 1875 | #define nFERROR 0x0 | 1866 | #define nFERROR 0x0 |
| 1876 | #define MMRGLOAD 0x10 /* Memory Mapped Register Gasket Load */ | 1867 | #define MMRGLOAD 0x10 /* Memory Mapped Register Gasket Load */ |
| 1877 | #define nMMRGLOAD 0x0 | 1868 | #define nMMRGLOAD 0x0 |
| 1878 | #define MMRGLOCK 0x20 /* Memory Mapped Register Gasket Lock */ | 1869 | #define MMRGLOCK 0x20 /* Memory Mapped Register Gasket Lock */ |
| 1879 | #define nMMRGLOCK 0x0 | 1870 | #define nMMRGLOCK 0x0 |
| 1880 | #define FPGMEN 0x40 /* OTP/Fuse Program Enable */ | 1871 | #define FPGMEN 0x40 /* OTP/Fuse Program Enable */ |
| 1881 | #define nFPGMEN 0x0 | 1872 | #define nFPGMEN 0x0 |
| 1882 | 1873 | ||
| 1883 | /* Bit masks for OTP_TIMING */ | 1874 | /* Bit masks for OTP_TIMING */ |
| 1884 | 1875 | ||
| @@ -1892,42 +1883,42 @@ | |||
| 1892 | /* Bit masks for SECURE_SYSSWT */ | 1883 | /* Bit masks for SECURE_SYSSWT */ |
| 1893 | 1884 | ||
| 1894 | #define EMUDABL 0x1 /* Emulation Disable. */ | 1885 | #define EMUDABL 0x1 /* Emulation Disable. */ |
| 1895 | #define nEMUDABL 0x0 | 1886 | #define nEMUDABL 0x0 |
| 1896 | #define RSTDABL 0x2 /* Reset Disable */ | 1887 | #define RSTDABL 0x2 /* Reset Disable */ |
| 1897 | #define nRSTDABL 0x0 | 1888 | #define nRSTDABL 0x0 |
| 1898 | #define L1IDABL 0x1c /* L1 Instruction Memory Disable. */ | 1889 | #define L1IDABL 0x1c /* L1 Instruction Memory Disable. */ |
| 1899 | #define L1DADABL 0xe0 /* L1 Data Bank A Memory Disable. */ | 1890 | #define L1DADABL 0xe0 /* L1 Data Bank A Memory Disable. */ |
| 1900 | #define L1DBDABL 0x700 /* L1 Data Bank B Memory Disable. */ | 1891 | #define L1DBDABL 0x700 /* L1 Data Bank B Memory Disable. */ |
| 1901 | #define DMA0OVR 0x800 /* DMA0 Memory Access Override */ | 1892 | #define DMA0OVR 0x800 /* DMA0 Memory Access Override */ |
| 1902 | #define nDMA0OVR 0x0 | 1893 | #define nDMA0OVR 0x0 |
| 1903 | #define DMA1OVR 0x1000 /* DMA1 Memory Access Override */ | 1894 | #define DMA1OVR 0x1000 /* DMA1 Memory Access Override */ |
| 1904 | #define nDMA1OVR 0x0 | 1895 | #define nDMA1OVR 0x0 |
| 1905 | #define EMUOVR 0x4000 /* Emulation Override */ | 1896 | #define EMUOVR 0x4000 /* Emulation Override */ |
| 1906 | #define nEMUOVR 0x0 | 1897 | #define nEMUOVR 0x0 |
| 1907 | #define OTPSEN 0x8000 /* OTP Secrets Enable. */ | 1898 | #define OTPSEN 0x8000 /* OTP Secrets Enable. */ |
| 1908 | #define nOTPSEN 0x0 | 1899 | #define nOTPSEN 0x0 |
| 1909 | #define L2DABL 0x70000 /* L2 Memory Disable. */ | 1900 | #define L2DABL 0x70000 /* L2 Memory Disable. */ |
| 1910 | 1901 | ||
| 1911 | /* Bit masks for SECURE_CONTROL */ | 1902 | /* Bit masks for SECURE_CONTROL */ |
| 1912 | 1903 | ||
| 1913 | #define SECURE0 0x1 /* SECURE 0 */ | 1904 | #define SECURE0 0x1 /* SECURE 0 */ |
| 1914 | #define nSECURE0 0x0 | 1905 | #define nSECURE0 0x0 |
| 1915 | #define SECURE1 0x2 /* SECURE 1 */ | 1906 | #define SECURE1 0x2 /* SECURE 1 */ |
| 1916 | #define nSECURE1 0x0 | 1907 | #define nSECURE1 0x0 |
| 1917 | #define SECURE2 0x4 /* SECURE 2 */ | 1908 | #define SECURE2 0x4 /* SECURE 2 */ |
| 1918 | #define nSECURE2 0x0 | 1909 | #define nSECURE2 0x0 |
| 1919 | #define SECURE3 0x8 /* SECURE 3 */ | 1910 | #define SECURE3 0x8 /* SECURE 3 */ |
| 1920 | #define nSECURE3 0x0 | 1911 | #define nSECURE3 0x0 |
| 1921 | 1912 | ||
| 1922 | /* Bit masks for SECURE_STATUS */ | 1913 | /* Bit masks for SECURE_STATUS */ |
| 1923 | 1914 | ||
| 1924 | #define SECMODE 0x3 /* Secured Mode Control State */ | 1915 | #define SECMODE 0x3 /* Secured Mode Control State */ |
| 1925 | #define NMI 0x4 /* Non Maskable Interrupt */ | 1916 | #define NMI 0x4 /* Non Maskable Interrupt */ |
| 1926 | #define nNMI 0x0 | 1917 | #define nNMI 0x0 |
| 1927 | #define AFVALID 0x8 /* Authentication Firmware Valid */ | 1918 | #define AFVALID 0x8 /* Authentication Firmware Valid */ |
| 1928 | #define nAFVALID 0x0 | 1919 | #define nAFVALID 0x0 |
| 1929 | #define AFEXIT 0x10 /* Authentication Firmware Exit */ | 1920 | #define AFEXIT 0x10 /* Authentication Firmware Exit */ |
| 1930 | #define nAFEXIT 0x0 | 1921 | #define nAFEXIT 0x0 |
| 1931 | #define SECSTAT 0xe0 /* Secure Status */ | 1922 | #define SECSTAT 0xe0 /* Secure Status */ |
| 1932 | 1923 | ||
| 1933 | /* Bit masks for NFC_CTL */ | 1924 | /* Bit masks for NFC_CTL */ |
| @@ -1935,60 +1926,60 @@ | |||
| 1935 | #define WR_DLY 0xf /* Write Strobe Delay */ | 1926 | #define WR_DLY 0xf /* Write Strobe Delay */ |
| 1936 | #define RD_DLY 0xf0 /* Read Strobe Delay */ | 1927 | #define RD_DLY 0xf0 /* Read Strobe Delay */ |
| 1937 | #define NWIDTH 0x100 /* NAND Data Width */ | 1928 | #define NWIDTH 0x100 /* NAND Data Width */ |
| 1938 | #define nNWIDTH 0x0 | 1929 | #define nNWIDTH 0x0 |
| 1939 | #define PG_SIZE 0x200 /* Page Size */ | 1930 | #define PG_SIZE 0x200 /* Page Size */ |
| 1940 | #define nPG_SIZE 0x0 | 1931 | #define nPG_SIZE 0x0 |
| 1941 | 1932 | ||
| 1942 | /* Bit masks for NFC_STAT */ | 1933 | /* Bit masks for NFC_STAT */ |
| 1943 | 1934 | ||
| 1944 | #define NBUSY 0x1 /* Not Busy */ | 1935 | #define NBUSY 0x1 /* Not Busy */ |
| 1945 | #define nNBUSY 0x0 | 1936 | #define nNBUSY 0x0 |
| 1946 | #define WB_FULL 0x2 /* Write Buffer Full */ | 1937 | #define WB_FULL 0x2 /* Write Buffer Full */ |
| 1947 | #define nWB_FULL 0x0 | 1938 | #define nWB_FULL 0x0 |
| 1948 | #define PG_WR_STAT 0x4 /* Page Write Pending */ | 1939 | #define PG_WR_STAT 0x4 /* Page Write Pending */ |
| 1949 | #define nPG_WR_STAT 0x0 | 1940 | #define nPG_WR_STAT 0x0 |
| 1950 | #define PG_RD_STAT 0x8 /* Page Read Pending */ | 1941 | #define PG_RD_STAT 0x8 /* Page Read Pending */ |
| 1951 | #define nPG_RD_STAT 0x0 | 1942 | #define nPG_RD_STAT 0x0 |
| 1952 | #define WB_EMPTY 0x10 /* Write Buffer Empty */ | 1943 | #define WB_EMPTY 0x10 /* Write Buffer Empty */ |
| 1953 | #define nWB_EMPTY 0x0 | 1944 | #define nWB_EMPTY 0x0 |
| 1954 | 1945 | ||
| 1955 | /* Bit masks for NFC_IRQSTAT */ | 1946 | /* Bit masks for NFC_IRQSTAT */ |
| 1956 | 1947 | ||
| 1957 | #define NBUSYIRQ 0x1 /* Not Busy IRQ */ | 1948 | #define NBUSYIRQ 0x1 /* Not Busy IRQ */ |
| 1958 | #define nNBUSYIRQ 0x0 | 1949 | #define nNBUSYIRQ 0x0 |
| 1959 | #define WB_OVF 0x2 /* Write Buffer Overflow */ | 1950 | #define WB_OVF 0x2 /* Write Buffer Overflow */ |
| 1960 | #define nWB_OVF 0x0 | 1951 | #define nWB_OVF 0x0 |
| 1961 | #define WB_EDGE 0x4 /* Write Buffer Edge Detect */ | 1952 | #define WB_EDGE 0x4 /* Write Buffer Edge Detect */ |
| 1962 | #define nWB_EDGE 0x0 | 1953 | #define nWB_EDGE 0x0 |
| 1963 | #define RD_RDY 0x8 /* Read Data Ready */ | 1954 | #define RD_RDY 0x8 /* Read Data Ready */ |
| 1964 | #define nRD_RDY 0x0 | 1955 | #define nRD_RDY 0x0 |
| 1965 | #define WR_DONE 0x10 /* Page Write Done */ | 1956 | #define WR_DONE 0x10 /* Page Write Done */ |
| 1966 | #define nWR_DONE 0x0 | 1957 | #define nWR_DONE 0x0 |
| 1967 | 1958 | ||
| 1968 | /* Bit masks for NFC_IRQMASK */ | 1959 | /* Bit masks for NFC_IRQMASK */ |
| 1969 | 1960 | ||
| 1970 | #define MASK_BUSYIRQ 0x1 /* Mask Not Busy IRQ */ | 1961 | #define MASK_BUSYIRQ 0x1 /* Mask Not Busy IRQ */ |
| 1971 | #define nMASK_BUSYIRQ 0x0 | 1962 | #define nMASK_BUSYIRQ 0x0 |
| 1972 | #define MASK_WBOVF 0x2 /* Mask Write Buffer Overflow */ | 1963 | #define MASK_WBOVF 0x2 /* Mask Write Buffer Overflow */ |
| 1973 | #define nMASK_WBOVF 0x0 | 1964 | #define nMASK_WBOVF 0x0 |
| 1974 | #define MASK_WBEMPTY 0x4 /* Mask Write Buffer Empty */ | 1965 | #define MASK_WBEMPTY 0x4 /* Mask Write Buffer Empty */ |
| 1975 | #define nMASK_WBEMPTY 0x0 | 1966 | #define nMASK_WBEMPTY 0x0 |
| 1976 | #define MASK_RDRDY 0x8 /* Mask Read Data Ready */ | 1967 | #define MASK_RDRDY 0x8 /* Mask Read Data Ready */ |
| 1977 | #define nMASK_RDRDY 0x0 | 1968 | #define nMASK_RDRDY 0x0 |
| 1978 | #define MASK_WRDONE 0x10 /* Mask Write Done */ | 1969 | #define MASK_WRDONE 0x10 /* Mask Write Done */ |
| 1979 | #define nMASK_WRDONE 0x0 | 1970 | #define nMASK_WRDONE 0x0 |
| 1980 | 1971 | ||
| 1981 | /* Bit masks for NFC_RST */ | 1972 | /* Bit masks for NFC_RST */ |
| 1982 | 1973 | ||
| 1983 | #define ECC_RST 0x1 /* ECC (and NFC counters) Reset */ | 1974 | #define ECC_RST 0x1 /* ECC (and NFC counters) Reset */ |
| 1984 | #define nECC_RST 0x0 | 1975 | #define nECC_RST 0x0 |
| 1985 | 1976 | ||
| 1986 | /* Bit masks for NFC_PGCTL */ | 1977 | /* Bit masks for NFC_PGCTL */ |
| 1987 | 1978 | ||
| 1988 | #define PG_RD_START 0x1 /* Page Read Start */ | 1979 | #define PG_RD_START 0x1 /* Page Read Start */ |
| 1989 | #define nPG_RD_START 0x0 | 1980 | #define nPG_RD_START 0x0 |
| 1990 | #define PG_WR_START 0x2 /* Page Write Start */ | 1981 | #define PG_WR_START 0x2 /* Page Write Start */ |
| 1991 | #define nPG_WR_START 0x0 | 1982 | #define nPG_WR_START 0x0 |
| 1992 | 1983 | ||
| 1993 | /* Bit masks for NFC_ECC0 */ | 1984 | /* Bit masks for NFC_ECC0 */ |
| 1994 | 1985 | ||
diff --git a/include/asm-blackfin/mach-bf527/dma.h b/arch/blackfin/mach-bf527/include/mach/dma.h index 49dd693223e8..49dd693223e8 100644 --- a/include/asm-blackfin/mach-bf527/dma.h +++ b/arch/blackfin/mach-bf527/include/mach/dma.h | |||
diff --git a/include/asm-blackfin/mach-bf527/irq.h b/arch/blackfin/mach-bf527/include/mach/irq.h index 4e2b3f2020e5..4e2b3f2020e5 100644 --- a/include/asm-blackfin/mach-bf527/irq.h +++ b/arch/blackfin/mach-bf527/include/mach/irq.h | |||
diff --git a/include/asm-blackfin/mach-bf527/mem_init.h b/arch/blackfin/mach-bf527/include/mach/mem_init.h index cbe03f4a5698..cbe03f4a5698 100644 --- a/include/asm-blackfin/mach-bf527/mem_init.h +++ b/arch/blackfin/mach-bf527/include/mach/mem_init.h | |||
diff --git a/include/asm-blackfin/mach-bf527/mem_map.h b/arch/blackfin/mach-bf527/include/mach/mem_map.h index 193082deaa4e..ef46dc991cd4 100644 --- a/include/asm-blackfin/mach-bf527/mem_map.h +++ b/arch/blackfin/mach-bf527/include/mach/mem_map.h | |||
| @@ -89,6 +89,11 @@ | |||
| 89 | #define BFIN_DSUPBANKS 0 | 89 | #define BFIN_DSUPBANKS 0 |
| 90 | #endif /*CONFIG_BFIN_DCACHE */ | 90 | #endif /*CONFIG_BFIN_DCACHE */ |
| 91 | 91 | ||
| 92 | /* Level 2 Memory - none */ | ||
| 93 | |||
| 94 | #define L2_START 0 | ||
| 95 | #define L2_LENGTH 0 | ||
| 96 | |||
| 92 | /* Scratch Pad Memory */ | 97 | /* Scratch Pad Memory */ |
| 93 | 98 | ||
| 94 | #define L1_SCRATCH_START 0xFFB00000 | 99 | #define L1_SCRATCH_START 0xFFB00000 |
diff --git a/include/asm-blackfin/mach-bf527/portmux.h b/arch/blackfin/mach-bf527/include/mach/portmux.h index ae4d205bfcf5..ae4d205bfcf5 100644 --- a/include/asm-blackfin/mach-bf527/portmux.h +++ b/arch/blackfin/mach-bf527/include/mach/portmux.h | |||
diff --git a/arch/blackfin/mach-bf527/ints-priority.c b/arch/blackfin/mach-bf527/ints-priority.c index 1fa389793968..8a2367403d2b 100644 --- a/arch/blackfin/mach-bf527/ints-priority.c +++ b/arch/blackfin/mach-bf527/ints-priority.c | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | #include <linux/irq.h> | 31 | #include <linux/irq.h> |
| 32 | #include <asm/blackfin.h> | 32 | #include <asm/blackfin.h> |
| 33 | 33 | ||
| 34 | void program_IAR(void) | 34 | void __init program_IAR(void) |
| 35 | { | 35 | { |
| 36 | /* Program the IAR0 Register with the configured priority */ | 36 | /* Program the IAR0 Register with the configured priority */ |
| 37 | bfin_write_SIC_IAR0(((CONFIG_IRQ_PLL_WAKEUP - 7) << IRQ_PLL_WAKEUP_POS) | | 37 | bfin_write_SIC_IAR0(((CONFIG_IRQ_PLL_WAKEUP - 7) << IRQ_PLL_WAKEUP_POS) | |
diff --git a/arch/blackfin/mach-bf533/boards/H8606.c b/arch/blackfin/mach-bf533/boards/H8606.c index 4103a97c1a70..c66a68f30239 100644 --- a/arch/blackfin/mach-bf533/boards/H8606.c +++ b/arch/blackfin/mach-bf533/boards/H8606.c | |||
| @@ -38,7 +38,6 @@ | |||
| 38 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) | 38 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) |
| 39 | #include <linux/usb/isp1362.h> | 39 | #include <linux/usb/isp1362.h> |
| 40 | #endif | 40 | #endif |
| 41 | #include <linux/ata_platform.h> | ||
| 42 | #include <linux/irq.h> | 41 | #include <linux/irq.h> |
| 43 | 42 | ||
| 44 | #include <asm/dma.h> | 43 | #include <asm/dma.h> |
| @@ -141,16 +140,16 @@ static struct platform_device net2272_bfin_device = { | |||
| 141 | #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) | 140 | #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) |
| 142 | static struct mtd_partition bfin_spi_flash_partitions[] = { | 141 | static struct mtd_partition bfin_spi_flash_partitions[] = { |
| 143 | { | 142 | { |
| 144 | .name = "bootloader", | 143 | .name = "bootloader(spi)", |
| 145 | .size = 0x00060000, | 144 | .size = 0x00060000, |
| 146 | .offset = 0, | 145 | .offset = 0, |
| 147 | .mask_flags = MTD_CAP_ROM | 146 | .mask_flags = MTD_CAP_ROM |
| 148 | }, { | 147 | }, { |
| 149 | .name = "kernel", | 148 | .name = "linux kernel(spi)", |
| 150 | .size = 0x100000, | 149 | .size = 0x100000, |
| 151 | .offset = 0x60000 | 150 | .offset = 0x60000 |
| 152 | }, { | 151 | }, { |
| 153 | .name = "file system", | 152 | .name = "file system(spi)", |
| 154 | .size = 0x6a0000, | 153 | .size = 0x6a0000, |
| 155 | .offset = 0x00160000, | 154 | .offset = 0x00160000, |
| 156 | } | 155 | } |
diff --git a/arch/blackfin/mach-bf533/boards/Kconfig b/arch/blackfin/mach-bf533/boards/Kconfig index 840059241fbe..308c98dc5aba 100644 --- a/arch/blackfin/mach-bf533/boards/Kconfig +++ b/arch/blackfin/mach-bf533/boards/Kconfig | |||
| @@ -14,6 +14,12 @@ config BFIN533_STAMP | |||
| 14 | help | 14 | help |
| 15 | BF533-STAMP board support. | 15 | BF533-STAMP board support. |
| 16 | 16 | ||
| 17 | config BLACKSTAMP | ||
| 18 | bool "BlackStamp" | ||
| 19 | help | ||
| 20 | Support for the BlackStamp board. Hardware info available at | ||
| 21 | http://blackfin.uclinux.org/gf/project/blackstamp/ | ||
| 22 | |||
| 17 | config BFIN533_BLUETECHNIX_CM | 23 | config BFIN533_BLUETECHNIX_CM |
| 18 | bool "Bluetechnix CM-BF533" | 24 | bool "Bluetechnix CM-BF533" |
| 19 | depends on (BF533) | 25 | depends on (BF533) |
diff --git a/arch/blackfin/mach-bf533/boards/Makefile b/arch/blackfin/mach-bf533/boards/Makefile index b7a1a1d79bda..9afbe72b484f 100644 --- a/arch/blackfin/mach-bf533/boards/Makefile +++ b/arch/blackfin/mach-bf533/boards/Makefile | |||
| @@ -7,4 +7,5 @@ obj-$(CONFIG_BFIN533_STAMP) += stamp.o | |||
| 7 | obj-$(CONFIG_BFIN532_IP0X) += ip0x.o | 7 | obj-$(CONFIG_BFIN532_IP0X) += ip0x.o |
| 8 | obj-$(CONFIG_BFIN533_EZKIT) += ezkit.o | 8 | obj-$(CONFIG_BFIN533_EZKIT) += ezkit.o |
| 9 | obj-$(CONFIG_BFIN533_BLUETECHNIX_CM) += cm_bf533.o | 9 | obj-$(CONFIG_BFIN533_BLUETECHNIX_CM) += cm_bf533.o |
| 10 | obj-$(CONFIG_BLACKSTAMP) += blackstamp.o | ||
| 10 | obj-$(CONFIG_H8606_HVSISTEMAS) += H8606.o | 11 | obj-$(CONFIG_H8606_HVSISTEMAS) += H8606.o |
diff --git a/arch/blackfin/mach-bf533/boards/blackstamp.c b/arch/blackfin/mach-bf533/boards/blackstamp.c new file mode 100644 index 000000000000..d064ded87719 --- /dev/null +++ b/arch/blackfin/mach-bf533/boards/blackstamp.c | |||
| @@ -0,0 +1,401 @@ | |||
| 1 | /* | ||
| 2 | * File: arch/blackfin/mach-bf533/blackstamp.c | ||
| 3 | * Based on: arch/blackfin/mach-bf533/stamp.c | ||
| 4 | * Author: Benjamin Matthews <bmat@lle.rochester.edu> | ||
| 5 | * Aidan Williams <aidan@nicta.com.au> | ||
| 6 | * | ||
| 7 | * Created: 2008 | ||
| 8 | * Description: Board Info File for the BlackStamp | ||
| 9 | * | ||
| 10 | * Copyright 2005 National ICT Australia (NICTA) | ||
| 11 | * Copyright 2004-2008 Analog Devices Inc. | ||
| 12 | * | ||
| 13 | * Enter bugs at http://blackfin.uclinux.org/ | ||
| 14 | * | ||
| 15 | * More info about the BlackStamp at: | ||
| 16 | * http://blackfin.uclinux.org/gf/project/blackstamp/ | ||
| 17 | * | ||
| 18 | * Licensed under the GPL-2 or later. | ||
| 19 | */ | ||
| 20 | |||
| 21 | #include <linux/device.h> | ||
| 22 | #include <linux/platform_device.h> | ||
| 23 | #include <linux/mtd/mtd.h> | ||
| 24 | #include <linux/mtd/partitions.h> | ||
| 25 | #include <linux/mtd/physmap.h> | ||
| 26 | #include <linux/spi/spi.h> | ||
| 27 | #include <linux/spi/flash.h> | ||
| 28 | #include <linux/irq.h> | ||
| 29 | #include <linux/i2c.h> | ||
| 30 | #include <asm/dma.h> | ||
| 31 | #include <asm/bfin5xx_spi.h> | ||
| 32 | #include <asm/portmux.h> | ||
| 33 | #include <asm/dpmc.h> | ||
| 34 | |||
| 35 | /* | ||
| 36 | * Name the Board for the /proc/cpuinfo | ||
| 37 | */ | ||
| 38 | const char bfin_board_name[] = "BlackStamp"; | ||
| 39 | |||
| 40 | #if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE) | ||
| 41 | static struct platform_device rtc_device = { | ||
| 42 | .name = "rtc-bfin", | ||
| 43 | .id = -1, | ||
| 44 | }; | ||
| 45 | #endif | ||
| 46 | |||
| 47 | /* | ||
| 48 | * Driver needs to know address, irq and flag pin. | ||
| 49 | */ | ||
| 50 | #if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE) | ||
| 51 | static struct resource smc91x_resources[] = { | ||
| 52 | { | ||
| 53 | .name = "smc91x-regs", | ||
| 54 | .start = 0x20300300, | ||
| 55 | .end = 0x20300300 + 16, | ||
| 56 | .flags = IORESOURCE_MEM, | ||
| 57 | }, { | ||
| 58 | .start = IRQ_PF3, | ||
| 59 | .end = IRQ_PF3, | ||
| 60 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, | ||
| 61 | }, | ||
| 62 | }; | ||
| 63 | |||
| 64 | static struct platform_device smc91x_device = { | ||
| 65 | .name = "smc91x", | ||
| 66 | .id = 0, | ||
| 67 | .num_resources = ARRAY_SIZE(smc91x_resources), | ||
| 68 | .resource = smc91x_resources, | ||
| 69 | }; | ||
| 70 | #endif | ||
| 71 | |||
| 72 | #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) | ||
| 73 | static struct mtd_partition bfin_spi_flash_partitions[] = { | ||
| 74 | { | ||
| 75 | .name = "bootloader(spi)", | ||
| 76 | .size = 0x00040000, | ||
| 77 | .offset = 0, | ||
| 78 | .mask_flags = MTD_CAP_ROM | ||
| 79 | }, { | ||
| 80 | .name = "linux kernel(spi)", | ||
| 81 | .size = 0x180000, | ||
| 82 | .offset = MTDPART_OFS_APPEND, | ||
| 83 | }, { | ||
| 84 | .name = "file system(spi)", | ||
| 85 | .size = MTDPART_SIZ_FULL, | ||
| 86 | .offset = MTDPART_OFS_APPEND, | ||
| 87 | } | ||
| 88 | }; | ||
| 89 | |||
| 90 | static struct flash_platform_data bfin_spi_flash_data = { | ||
| 91 | .name = "m25p80", | ||
| 92 | .parts = bfin_spi_flash_partitions, | ||
| 93 | .nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions), | ||
| 94 | .type = "m25p64", | ||
| 95 | }; | ||
| 96 | |||
| 97 | /* SPI flash chip (m25p64) */ | ||
| 98 | static struct bfin5xx_spi_chip spi_flash_chip_info = { | ||
| 99 | .enable_dma = 0, /* use dma transfer with this chip*/ | ||
| 100 | .bits_per_word = 8, | ||
| 101 | }; | ||
| 102 | #endif | ||
| 103 | |||
| 104 | #if defined(CONFIG_SPI_MMC) || defined(CONFIG_SPI_MMC_MODULE) | ||
| 105 | static struct bfin5xx_spi_chip spi_mmc_chip_info = { | ||
| 106 | .enable_dma = 1, | ||
| 107 | .bits_per_word = 8, | ||
| 108 | }; | ||
| 109 | #endif | ||
| 110 | |||
| 111 | #if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE) | ||
| 112 | static struct bfin5xx_spi_chip spidev_chip_info = { | ||
| 113 | .enable_dma = 0, | ||
| 114 | .bits_per_word = 8, | ||
| 115 | }; | ||
| 116 | #endif | ||
| 117 | |||
| 118 | static struct spi_board_info bfin_spi_board_info[] __initdata = { | ||
| 119 | #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) | ||
| 120 | { | ||
| 121 | /* the modalias must be the same as spi device driver name */ | ||
| 122 | .modalias = "m25p80", /* Name of spi_driver for this device */ | ||
| 123 | .max_speed_hz = 20000000, /* max spi clock (SCK) speed in HZ */ | ||
| 124 | .bus_num = 0, /* Framework bus number */ | ||
| 125 | .chip_select = 2, /* Framework chip select. */ | ||
| 126 | .platform_data = &bfin_spi_flash_data, | ||
| 127 | .controller_data = &spi_flash_chip_info, | ||
| 128 | .mode = SPI_MODE_3, | ||
| 129 | }, | ||
| 130 | #endif | ||
| 131 | |||
| 132 | #if defined(CONFIG_SPI_MMC) || defined(CONFIG_SPI_MMC_MODULE) | ||
| 133 | { | ||
| 134 | .modalias = "spi_mmc_dummy", | ||
| 135 | .max_speed_hz = 20000000, /* max spi clock (SCK) speed in HZ */ | ||
| 136 | .bus_num = 0, | ||
| 137 | .chip_select = 0, | ||
| 138 | .platform_data = NULL, | ||
| 139 | .controller_data = &spi_mmc_chip_info, | ||
| 140 | .mode = SPI_MODE_3, | ||
| 141 | }, | ||
| 142 | { | ||
| 143 | .modalias = "spi_mmc", | ||
| 144 | .max_speed_hz = 20000000, /* max spi clock (SCK) speed in HZ */ | ||
| 145 | .bus_num = 0, | ||
| 146 | .chip_select = CONFIG_SPI_MMC_CS_CHAN, | ||
| 147 | .platform_data = NULL, | ||
| 148 | .controller_data = &spi_mmc_chip_info, | ||
| 149 | .mode = SPI_MODE_3, | ||
| 150 | }, | ||
| 151 | #endif | ||
| 152 | |||
| 153 | #if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE) | ||
| 154 | { | ||
| 155 | .modalias = "spidev", | ||
| 156 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ | ||
| 157 | .bus_num = 0, | ||
| 158 | .chip_select = 7, | ||
| 159 | .controller_data = &spidev_chip_info, | ||
| 160 | }, | ||
| 161 | #endif | ||
| 162 | }; | ||
| 163 | |||
| 164 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | ||
| 165 | /* SPI (0) */ | ||
| 166 | static struct resource bfin_spi0_resource[] = { | ||
| 167 | [0] = { | ||
| 168 | .start = SPI0_REGBASE, | ||
| 169 | .end = SPI0_REGBASE + 0xFF, | ||
| 170 | .flags = IORESOURCE_MEM, | ||
| 171 | }, | ||
| 172 | [1] = { | ||
| 173 | .start = CH_SPI, | ||
| 174 | .end = CH_SPI, | ||
| 175 | .flags = IORESOURCE_IRQ, | ||
| 176 | } | ||
| 177 | }; | ||
| 178 | |||
| 179 | /* SPI controller data */ | ||
| 180 | static struct bfin5xx_spi_master bfin_spi0_info = { | ||
| 181 | .num_chipselect = 8, | ||
| 182 | .enable_dma = 1, /* master has the ability to do dma transfer */ | ||
| 183 | .pin_req = {P_SPI0_SCK, P_SPI0_MISO, P_SPI0_MOSI, 0}, | ||
| 184 | }; | ||
| 185 | |||
| 186 | static struct platform_device bfin_spi0_device = { | ||
| 187 | .name = "bfin-spi", | ||
| 188 | .id = 0, /* Bus number */ | ||
| 189 | .num_resources = ARRAY_SIZE(bfin_spi0_resource), | ||
| 190 | .resource = bfin_spi0_resource, | ||
| 191 | .dev = { | ||
| 192 | .platform_data = &bfin_spi0_info, /* Passed to driver */ | ||
| 193 | }, | ||
| 194 | }; | ||
| 195 | #endif /* spi master and devices */ | ||
| 196 | |||
| 197 | #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) | ||
| 198 | static struct resource bfin_uart_resources[] = { | ||
| 199 | { | ||
| 200 | .start = 0xFFC00400, | ||
| 201 | .end = 0xFFC004FF, | ||
| 202 | .flags = IORESOURCE_MEM, | ||
| 203 | }, | ||
| 204 | }; | ||
| 205 | |||
| 206 | static struct platform_device bfin_uart_device = { | ||
| 207 | .name = "bfin-uart", | ||
| 208 | .id = 1, | ||
| 209 | .num_resources = ARRAY_SIZE(bfin_uart_resources), | ||
| 210 | .resource = bfin_uart_resources, | ||
| 211 | }; | ||
| 212 | #endif | ||
| 213 | |||
| 214 | #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) | ||
| 215 | static struct resource bfin_sir_resources[] = { | ||
| 216 | #ifdef CONFIG_BFIN_SIR0 | ||
| 217 | { | ||
| 218 | .start = 0xFFC00400, | ||
| 219 | .end = 0xFFC004FF, | ||
| 220 | .flags = IORESOURCE_MEM, | ||
| 221 | }, | ||
| 222 | #endif | ||
| 223 | }; | ||
| 224 | |||
| 225 | static struct platform_device bfin_sir_device = { | ||
| 226 | .name = "bfin_sir", | ||
| 227 | .id = 0, | ||
| 228 | .num_resources = ARRAY_SIZE(bfin_sir_resources), | ||
| 229 | .resource = bfin_sir_resources, | ||
| 230 | }; | ||
| 231 | #endif | ||
| 232 | |||
| 233 | #if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE) | ||
| 234 | static struct platform_device bfin_sport0_uart_device = { | ||
| 235 | .name = "bfin-sport-uart", | ||
| 236 | .id = 0, | ||
| 237 | }; | ||
| 238 | |||
| 239 | static struct platform_device bfin_sport1_uart_device = { | ||
| 240 | .name = "bfin-sport-uart", | ||
| 241 | .id = 1, | ||
| 242 | }; | ||
| 243 | #endif | ||
| 244 | |||
| 245 | #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) | ||
| 246 | #include <linux/input.h> | ||
| 247 | #include <linux/gpio_keys.h> | ||
| 248 | |||
| 249 | static struct gpio_keys_button bfin_gpio_keys_table[] = { | ||
| 250 | {BTN_0, GPIO_PF4, 0, "gpio-keys: BTN0"}, | ||
| 251 | {BTN_1, GPIO_PF5, 0, "gpio-keys: BTN1"}, | ||
| 252 | {BTN_2, GPIO_PF6, 0, "gpio-keys: BTN2"}, | ||
| 253 | }; /* Mapped to the first three PF Test Points */ | ||
| 254 | |||
| 255 | static struct gpio_keys_platform_data bfin_gpio_keys_data = { | ||
| 256 | .buttons = bfin_gpio_keys_table, | ||
| 257 | .nbuttons = ARRAY_SIZE(bfin_gpio_keys_table), | ||
| 258 | }; | ||
| 259 | |||
| 260 | static struct platform_device bfin_device_gpiokeys = { | ||
| 261 | .name = "gpio-keys", | ||
| 262 | .dev = { | ||
| 263 | .platform_data = &bfin_gpio_keys_data, | ||
| 264 | }, | ||
| 265 | }; | ||
| 266 | #endif | ||
| 267 | |||
| 268 | static struct resource bfin_gpios_resources = { | ||
| 269 | .start = 0, | ||
| 270 | .end = MAX_BLACKFIN_GPIOS - 1, | ||
| 271 | .flags = IORESOURCE_IRQ, | ||
| 272 | }; | ||
| 273 | |||
| 274 | static struct platform_device bfin_gpios_device = { | ||
| 275 | .name = "simple-gpio", | ||
| 276 | .id = -1, | ||
| 277 | .num_resources = 1, | ||
| 278 | .resource = &bfin_gpios_resources, | ||
| 279 | }; | ||
| 280 | |||
| 281 | #if defined(CONFIG_I2C_GPIO) || defined(CONFIG_I2C_GPIO_MODULE) | ||
| 282 | #include <linux/i2c-gpio.h> | ||
| 283 | |||
| 284 | static struct i2c_gpio_platform_data i2c_gpio_data = { | ||
| 285 | .sda_pin = 8, | ||
| 286 | .scl_pin = 9, | ||
| 287 | .sda_is_open_drain = 0, | ||
| 288 | .scl_is_open_drain = 0, | ||
| 289 | .udelay = 40, | ||
| 290 | }; /* This hasn't actually been used these pins | ||
| 291 | * are (currently) free pins on the expansion connector */ | ||
| 292 | |||
| 293 | static struct platform_device i2c_gpio_device = { | ||
| 294 | .name = "i2c-gpio", | ||
| 295 | .id = 0, | ||
| 296 | .dev = { | ||
| 297 | .platform_data = &i2c_gpio_data, | ||
| 298 | }, | ||
| 299 | }; | ||
| 300 | #endif | ||
| 301 | |||
| 302 | #ifdef CONFIG_I2C_BOARDINFO | ||
| 303 | static struct i2c_board_info __initdata bfin_i2c_board_info[] = { | ||
| 304 | }; | ||
| 305 | #endif | ||
| 306 | |||
| 307 | static const unsigned int cclk_vlev_datasheet[] = | ||
| 308 | { | ||
| 309 | VRPAIR(VLEV_085, 250000000), | ||
| 310 | VRPAIR(VLEV_090, 376000000), | ||
| 311 | VRPAIR(VLEV_095, 426000000), | ||
| 312 | VRPAIR(VLEV_100, 426000000), | ||
| 313 | VRPAIR(VLEV_105, 476000000), | ||
| 314 | VRPAIR(VLEV_110, 476000000), | ||
| 315 | VRPAIR(VLEV_115, 476000000), | ||
| 316 | VRPAIR(VLEV_120, 600000000), | ||
| 317 | VRPAIR(VLEV_125, 600000000), | ||
| 318 | VRPAIR(VLEV_130, 600000000), | ||
| 319 | }; | ||
| 320 | |||
| 321 | static struct bfin_dpmc_platform_data bfin_dmpc_vreg_data = { | ||
| 322 | .tuple_tab = cclk_vlev_datasheet, | ||
| 323 | .tabsize = ARRAY_SIZE(cclk_vlev_datasheet), | ||
| 324 | .vr_settling_time = 25 /* us */, | ||
| 325 | }; | ||
| 326 | |||
| 327 | static struct platform_device bfin_dpmc = { | ||
| 328 | .name = "bfin dpmc", | ||
| 329 | .dev = { | ||
| 330 | .platform_data = &bfin_dmpc_vreg_data, | ||
| 331 | }, | ||
| 332 | }; | ||
| 333 | |||
| 334 | static struct platform_device *stamp_devices[] __initdata = { | ||
| 335 | |||
| 336 | &bfin_dpmc, | ||
| 337 | |||
| 338 | #if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE) | ||
| 339 | &rtc_device, | ||
| 340 | #endif | ||
| 341 | |||
| 342 | #if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE) | ||
| 343 | &smc91x_device, | ||
| 344 | #endif | ||
| 345 | |||
| 346 | |||
| 347 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | ||
| 348 | &bfin_spi0_device, | ||
| 349 | #endif | ||
| 350 | |||
| 351 | #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) | ||
| 352 | &bfin_uart_device, | ||
| 353 | #endif | ||
| 354 | |||
| 355 | #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) | ||
| 356 | &bfin_sir_device, | ||
| 357 | #endif | ||
| 358 | |||
| 359 | #if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE) | ||
| 360 | &bfin_sport0_uart_device, | ||
| 361 | &bfin_sport1_uart_device, | ||
| 362 | #endif | ||
| 363 | |||
| 364 | #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) | ||
| 365 | &bfin_device_gpiokeys, | ||
| 366 | #endif | ||
| 367 | |||
| 368 | #if defined(CONFIG_I2C_GPIO) || defined(CONFIG_I2C_GPIO_MODULE) | ||
| 369 | &i2c_gpio_device, | ||
| 370 | #endif | ||
| 371 | |||
| 372 | &bfin_gpios_device, | ||
| 373 | }; | ||
| 374 | |||
| 375 | static int __init blackstamp_init(void) | ||
| 376 | { | ||
| 377 | int ret; | ||
| 378 | |||
| 379 | printk(KERN_INFO "%s(): registering device resources\n", __func__); | ||
| 380 | |||
| 381 | #ifdef CONFIG_I2C_BOARDINFO | ||
| 382 | i2c_register_board_info(0, bfin_i2c_board_info, | ||
| 383 | ARRAY_SIZE(bfin_i2c_board_info)); | ||
| 384 | #endif | ||
| 385 | |||
| 386 | ret = platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices)); | ||
| 387 | if (ret < 0) | ||
| 388 | return ret; | ||
| 389 | |||
| 390 | #if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE) | ||
| 391 | /* setup BF533_STAMP CPLD to route AMS3 to Ethernet MAC */ | ||
| 392 | bfin_write_FIO_DIR(bfin_read_FIO_DIR() | PF0); | ||
| 393 | bfin_write_FIO_FLAG_S(PF0); | ||
| 394 | SSYNC(); | ||
| 395 | #endif | ||
| 396 | |||
| 397 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); | ||
| 398 | return 0; | ||
| 399 | } | ||
| 400 | |||
| 401 | arch_initcall(blackstamp_init); | ||
diff --git a/arch/blackfin/mach-bf533/boards/cm_bf533.c b/arch/blackfin/mach-bf533/boards/cm_bf533.c index ed2b0b8f5dc9..575843f6d9ef 100644 --- a/arch/blackfin/mach-bf533/boards/cm_bf533.c +++ b/arch/blackfin/mach-bf533/boards/cm_bf533.c | |||
| @@ -36,7 +36,6 @@ | |||
| 36 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) | 36 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) |
| 37 | #include <linux/usb/isp1362.h> | 37 | #include <linux/usb/isp1362.h> |
| 38 | #endif | 38 | #endif |
| 39 | #include <linux/ata_platform.h> | ||
| 40 | #include <linux/irq.h> | 39 | #include <linux/irq.h> |
| 41 | #include <asm/dma.h> | 40 | #include <asm/dma.h> |
| 42 | #include <asm/bfin5xx_spi.h> | 41 | #include <asm/bfin5xx_spi.h> |
| @@ -53,16 +52,16 @@ const char bfin_board_name[] = "Bluetechnix CM BF533"; | |||
| 53 | #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) | 52 | #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) |
| 54 | static struct mtd_partition bfin_spi_flash_partitions[] = { | 53 | static struct mtd_partition bfin_spi_flash_partitions[] = { |
| 55 | { | 54 | { |
| 56 | .name = "bootloader", | 55 | .name = "bootloader(spi)", |
| 57 | .size = 0x00020000, | 56 | .size = 0x00020000, |
| 58 | .offset = 0, | 57 | .offset = 0, |
| 59 | .mask_flags = MTD_CAP_ROM | 58 | .mask_flags = MTD_CAP_ROM |
| 60 | }, { | 59 | }, { |
| 61 | .name = "kernel", | 60 | .name = "linux kernel(spi)", |
| 62 | .size = 0xe0000, | 61 | .size = 0xe0000, |
| 63 | .offset = 0x20000 | 62 | .offset = 0x20000 |
| 64 | }, { | 63 | }, { |
| 65 | .name = "file system", | 64 | .name = "file system(spi)", |
| 66 | .size = 0x700000, | 65 | .size = 0x700000, |
| 67 | .offset = 0x00100000, | 66 | .offset = 0x00100000, |
| 68 | } | 67 | } |
| @@ -307,43 +306,6 @@ static struct platform_device isp1362_hcd_device = { | |||
| 307 | }; | 306 | }; |
| 308 | #endif | 307 | #endif |
| 309 | 308 | ||
| 310 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
| 311 | #define PATA_INT 38 | ||
| 312 | |||
| 313 | static struct pata_platform_info bfin_pata_platform_data = { | ||
| 314 | .ioport_shift = 2, | ||
| 315 | .irq_type = IRQF_TRIGGER_HIGH | IRQF_DISABLED, | ||
| 316 | }; | ||
| 317 | |||
| 318 | static struct resource bfin_pata_resources[] = { | ||
| 319 | { | ||
| 320 | .start = 0x2030C000, | ||
| 321 | .end = 0x2030C01F, | ||
| 322 | .flags = IORESOURCE_MEM, | ||
| 323 | }, | ||
| 324 | { | ||
| 325 | .start = 0x2030D018, | ||
| 326 | .end = 0x2030D01B, | ||
| 327 | .flags = IORESOURCE_MEM, | ||
| 328 | }, | ||
| 329 | { | ||
| 330 | .start = PATA_INT, | ||
| 331 | .end = PATA_INT, | ||
| 332 | .flags = IORESOURCE_IRQ, | ||
| 333 | }, | ||
| 334 | }; | ||
| 335 | |||
| 336 | static struct platform_device bfin_pata_device = { | ||
| 337 | .name = "pata_platform", | ||
| 338 | .id = -1, | ||
| 339 | .num_resources = ARRAY_SIZE(bfin_pata_resources), | ||
| 340 | .resource = bfin_pata_resources, | ||
| 341 | .dev = { | ||
| 342 | .platform_data = &bfin_pata_platform_data, | ||
| 343 | } | ||
| 344 | }; | ||
| 345 | #endif | ||
| 346 | |||
| 347 | static const unsigned int cclk_vlev_datasheet[] = | 309 | static const unsigned int cclk_vlev_datasheet[] = |
| 348 | { | 310 | { |
| 349 | VRPAIR(VLEV_085, 250000000), | 311 | VRPAIR(VLEV_085, 250000000), |
| @@ -403,10 +365,6 @@ static struct platform_device *cm_bf533_devices[] __initdata = { | |||
| 403 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 365 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) |
| 404 | &bfin_spi0_device, | 366 | &bfin_spi0_device, |
| 405 | #endif | 367 | #endif |
| 406 | |||
| 407 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
| 408 | &bfin_pata_device, | ||
| 409 | #endif | ||
| 410 | }; | 368 | }; |
| 411 | 369 | ||
| 412 | static int __init cm_bf533_init(void) | 370 | static int __init cm_bf533_init(void) |
| @@ -416,10 +374,6 @@ static int __init cm_bf533_init(void) | |||
| 416 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 374 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) |
| 417 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); | 375 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); |
| 418 | #endif | 376 | #endif |
| 419 | |||
| 420 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
| 421 | irq_desc[PATA_INT].status |= IRQ_NOAUTOEN; | ||
| 422 | #endif | ||
| 423 | return 0; | 377 | return 0; |
| 424 | } | 378 | } |
| 425 | 379 | ||
diff --git a/arch/blackfin/mach-bf533/boards/ezkit.c b/arch/blackfin/mach-bf533/boards/ezkit.c index 079389cbd859..cc2e7eeb1d5a 100644 --- a/arch/blackfin/mach-bf533/boards/ezkit.c +++ b/arch/blackfin/mach-bf533/boards/ezkit.c | |||
| @@ -37,7 +37,6 @@ | |||
| 37 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) | 37 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) |
| 38 | #include <linux/usb/isp1362.h> | 38 | #include <linux/usb/isp1362.h> |
| 39 | #endif | 39 | #endif |
| 40 | #include <linux/ata_platform.h> | ||
| 41 | #include <linux/irq.h> | 40 | #include <linux/irq.h> |
| 42 | #include <asm/dma.h> | 41 | #include <asm/dma.h> |
| 43 | #include <asm/bfin5xx_spi.h> | 42 | #include <asm/bfin5xx_spi.h> |
| @@ -90,16 +89,16 @@ static struct platform_device smc91x_device = { | |||
| 90 | #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) | 89 | #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) |
| 91 | static struct mtd_partition bfin_spi_flash_partitions[] = { | 90 | static struct mtd_partition bfin_spi_flash_partitions[] = { |
| 92 | { | 91 | { |
| 93 | .name = "bootloader", | 92 | .name = "bootloader(spi)", |
| 94 | .size = 0x00020000, | 93 | .size = 0x00020000, |
| 95 | .offset = 0, | 94 | .offset = 0, |
| 96 | .mask_flags = MTD_CAP_ROM | 95 | .mask_flags = MTD_CAP_ROM |
| 97 | }, { | 96 | }, { |
| 98 | .name = "kernel", | 97 | .name = "linux kernel(spi)", |
| 99 | .size = 0xe0000, | 98 | .size = 0xe0000, |
| 100 | .offset = MTDPART_OFS_APPEND, | 99 | .offset = MTDPART_OFS_APPEND, |
| 101 | }, { | 100 | }, { |
| 102 | .name = "file system", | 101 | .name = "file system(spi)", |
| 103 | .size = MTDPART_SIZ_FULL, | 102 | .size = MTDPART_SIZ_FULL, |
| 104 | .offset = MTDPART_OFS_APPEND, | 103 | .offset = MTDPART_OFS_APPEND, |
| 105 | } | 104 | } |
| @@ -255,43 +254,6 @@ static struct platform_device bfin_sir_device = { | |||
| 255 | }; | 254 | }; |
| 256 | #endif | 255 | #endif |
| 257 | 256 | ||
| 258 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
| 259 | #define PATA_INT 55 | ||
| 260 | |||
| 261 | static struct pata_platform_info bfin_pata_platform_data = { | ||
| 262 | .ioport_shift = 1, | ||
| 263 | .irq_type = IRQF_TRIGGER_HIGH | IRQF_DISABLED, | ||
| 264 | }; | ||
| 265 | |||
| 266 | static struct resource bfin_pata_resources[] = { | ||
| 267 | { | ||
| 268 | .start = 0x20314020, | ||
| 269 | .end = 0x2031403F, | ||
| 270 | .flags = IORESOURCE_MEM, | ||
| 271 | }, | ||
| 272 | { | ||
| 273 | .start = 0x2031401C, | ||
| 274 | .end = 0x2031401F, | ||
| 275 | .flags = IORESOURCE_MEM, | ||
| 276 | }, | ||
| 277 | { | ||
| 278 | .start = PATA_INT, | ||
| 279 | .end = PATA_INT, | ||
| 280 | .flags = IORESOURCE_IRQ, | ||
| 281 | }, | ||
| 282 | }; | ||
| 283 | |||
| 284 | static struct platform_device bfin_pata_device = { | ||
| 285 | .name = "pata_platform", | ||
| 286 | .id = -1, | ||
| 287 | .num_resources = ARRAY_SIZE(bfin_pata_resources), | ||
| 288 | .resource = bfin_pata_resources, | ||
| 289 | .dev = { | ||
| 290 | .platform_data = &bfin_pata_platform_data, | ||
| 291 | } | ||
| 292 | }; | ||
| 293 | #endif | ||
| 294 | |||
| 295 | #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) | 257 | #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) |
| 296 | #include <linux/input.h> | 258 | #include <linux/input.h> |
| 297 | #include <linux/gpio_keys.h> | 259 | #include <linux/gpio_keys.h> |
| @@ -404,10 +366,6 @@ static struct platform_device *ezkit_devices[] __initdata = { | |||
| 404 | &bfin_sir_device, | 366 | &bfin_sir_device, |
| 405 | #endif | 367 | #endif |
| 406 | 368 | ||
| 407 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
| 408 | &bfin_pata_device, | ||
| 409 | #endif | ||
| 410 | |||
| 411 | #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) | 369 | #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) |
| 412 | &bfin_device_gpiokeys, | 370 | &bfin_device_gpiokeys, |
| 413 | #endif | 371 | #endif |
| @@ -424,10 +382,6 @@ static int __init ezkit_init(void) | |||
| 424 | printk(KERN_INFO "%s(): registering device resources\n", __func__); | 382 | printk(KERN_INFO "%s(): registering device resources\n", __func__); |
| 425 | platform_add_devices(ezkit_devices, ARRAY_SIZE(ezkit_devices)); | 383 | platform_add_devices(ezkit_devices, ARRAY_SIZE(ezkit_devices)); |
| 426 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); | 384 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); |
| 427 | |||
| 428 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
| 429 | irq_desc[PATA_INT].status |= IRQ_NOAUTOEN; | ||
| 430 | #endif | ||
| 431 | return 0; | 385 | return 0; |
| 432 | } | 386 | } |
| 433 | 387 | ||
diff --git a/arch/blackfin/mach-bf533/boards/stamp.c b/arch/blackfin/mach-bf533/boards/stamp.c index 13ae49515f73..050ffca53530 100644 --- a/arch/blackfin/mach-bf533/boards/stamp.c +++ b/arch/blackfin/mach-bf533/boards/stamp.c | |||
| @@ -38,7 +38,6 @@ | |||
| 38 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) | 38 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) |
| 39 | #include <linux/usb/isp1362.h> | 39 | #include <linux/usb/isp1362.h> |
| 40 | #endif | 40 | #endif |
| 41 | #include <linux/ata_platform.h> | ||
| 42 | #include <linux/irq.h> | 41 | #include <linux/irq.h> |
| 43 | #include <linux/i2c.h> | 42 | #include <linux/i2c.h> |
| 44 | #include <asm/dma.h> | 43 | #include <asm/dma.h> |
| @@ -114,15 +113,15 @@ static struct platform_device net2272_bfin_device = { | |||
| 114 | #if defined(CONFIG_MTD_BFIN_ASYNC) || defined(CONFIG_MTD_BFIN_ASYNC_MODULE) | 113 | #if defined(CONFIG_MTD_BFIN_ASYNC) || defined(CONFIG_MTD_BFIN_ASYNC_MODULE) |
| 115 | static struct mtd_partition stamp_partitions[] = { | 114 | static struct mtd_partition stamp_partitions[] = { |
| 116 | { | 115 | { |
| 117 | .name = "Bootloader", | 116 | .name = "bootloader(nor)", |
| 118 | .size = 0x40000, | 117 | .size = 0x40000, |
| 119 | .offset = 0, | 118 | .offset = 0, |
| 120 | }, { | 119 | }, { |
| 121 | .name = "Kernel", | 120 | .name = "linux kernel(nor)", |
| 122 | .size = 0xE0000, | 121 | .size = 0xE0000, |
| 123 | .offset = MTDPART_OFS_APPEND, | 122 | .offset = MTDPART_OFS_APPEND, |
| 124 | }, { | 123 | }, { |
| 125 | .name = "RootFS", | 124 | .name = "file system(nor)", |
| 126 | .size = MTDPART_SIZ_FULL, | 125 | .size = MTDPART_SIZ_FULL, |
| 127 | .offset = MTDPART_OFS_APPEND, | 126 | .offset = MTDPART_OFS_APPEND, |
| 128 | } | 127 | } |
| @@ -164,16 +163,16 @@ static struct platform_device stamp_flash_device = { | |||
| 164 | #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) | 163 | #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) |
| 165 | static struct mtd_partition bfin_spi_flash_partitions[] = { | 164 | static struct mtd_partition bfin_spi_flash_partitions[] = { |
| 166 | { | 165 | { |
| 167 | .name = "bootloader", | 166 | .name = "bootloader(spi)", |
| 168 | .size = 0x00040000, | 167 | .size = 0x00040000, |
| 169 | .offset = 0, | 168 | .offset = 0, |
| 170 | .mask_flags = MTD_CAP_ROM | 169 | .mask_flags = MTD_CAP_ROM |
| 171 | }, { | 170 | }, { |
| 172 | .name = "kernel", | 171 | .name = "linux kernel(spi)", |
| 173 | .size = 0xe0000, | 172 | .size = 0xe0000, |
| 174 | .offset = MTDPART_OFS_APPEND, | 173 | .offset = MTDPART_OFS_APPEND, |
| 175 | }, { | 174 | }, { |
| 176 | .name = "file system", | 175 | .name = "file system(spi)", |
| 177 | .size = MTDPART_SIZ_FULL, | 176 | .size = MTDPART_SIZ_FULL, |
| 178 | .offset = MTDPART_OFS_APPEND, | 177 | .offset = MTDPART_OFS_APPEND, |
| 179 | } | 178 | } |
| @@ -404,43 +403,6 @@ static struct platform_device bfin_sport1_uart_device = { | |||
| 404 | }; | 403 | }; |
| 405 | #endif | 404 | #endif |
| 406 | 405 | ||
| 407 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
| 408 | #define PATA_INT 55 | ||
| 409 | |||
| 410 | static struct pata_platform_info bfin_pata_platform_data = { | ||
| 411 | .ioport_shift = 1, | ||
| 412 | .irq_type = IRQF_TRIGGER_HIGH | IRQF_DISABLED, | ||
| 413 | }; | ||
| 414 | |||
| 415 | static struct resource bfin_pata_resources[] = { | ||
| 416 | { | ||
| 417 | .start = 0x20314020, | ||
| 418 | .end = 0x2031403F, | ||
| 419 | .flags = IORESOURCE_MEM, | ||
| 420 | }, | ||
| 421 | { | ||
| 422 | .start = 0x2031401C, | ||
| 423 | .end = 0x2031401F, | ||
| 424 | .flags = IORESOURCE_MEM, | ||
| 425 | }, | ||
| 426 | { | ||
| 427 | .start = PATA_INT, | ||
| 428 | .end = PATA_INT, | ||
| 429 | .flags = IORESOURCE_IRQ, | ||
| 430 | }, | ||
| 431 | }; | ||
| 432 | |||
| 433 | static struct platform_device bfin_pata_device = { | ||
| 434 | .name = "pata_platform", | ||
| 435 | .id = -1, | ||
| 436 | .num_resources = ARRAY_SIZE(bfin_pata_resources), | ||
| 437 | .resource = bfin_pata_resources, | ||
| 438 | .dev = { | ||
| 439 | .platform_data = &bfin_pata_platform_data, | ||
| 440 | } | ||
| 441 | }; | ||
| 442 | #endif | ||
| 443 | |||
| 444 | #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) | 406 | #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) |
| 445 | #include <linux/input.h> | 407 | #include <linux/input.h> |
| 446 | #include <linux/gpio_keys.h> | 408 | #include <linux/gpio_keys.h> |
| @@ -583,10 +545,6 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
| 583 | &bfin_sport1_uart_device, | 545 | &bfin_sport1_uart_device, |
| 584 | #endif | 546 | #endif |
| 585 | 547 | ||
| 586 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
| 587 | &bfin_pata_device, | ||
| 588 | #endif | ||
| 589 | |||
| 590 | #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) | 548 | #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) |
| 591 | &bfin_device_gpiokeys, | 549 | &bfin_device_gpiokeys, |
| 592 | #endif | 550 | #endif |
| @@ -625,10 +583,6 @@ static int __init stamp_init(void) | |||
| 625 | #endif | 583 | #endif |
| 626 | 584 | ||
| 627 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); | 585 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); |
| 628 | |||
| 629 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
| 630 | irq_desc[PATA_INT].status |= IRQ_NOAUTOEN; | ||
| 631 | #endif | ||
| 632 | return 0; | 586 | return 0; |
| 633 | } | 587 | } |
| 634 | 588 | ||
diff --git a/arch/blackfin/mach-bf533/head.S b/arch/blackfin/mach-bf533/head.S index c671e8549b17..01b2b7ead5ab 100644 --- a/arch/blackfin/mach-bf533/head.S +++ b/arch/blackfin/mach-bf533/head.S | |||
| @@ -30,294 +30,11 @@ | |||
| 30 | #include <linux/linkage.h> | 30 | #include <linux/linkage.h> |
| 31 | #include <linux/init.h> | 31 | #include <linux/init.h> |
| 32 | #include <asm/blackfin.h> | 32 | #include <asm/blackfin.h> |
| 33 | #include <asm/trace.h> | ||
| 34 | #ifdef CONFIG_BFIN_KERNEL_CLOCK | 33 | #ifdef CONFIG_BFIN_KERNEL_CLOCK |
| 35 | #include <asm/mach-common/clocks.h> | 34 | #include <asm/clocks.h> |
| 36 | #include <asm/mach/mem_init.h> | 35 | #include <mach/mem_init.h> |
| 37 | #endif | 36 | #endif |
| 38 | 37 | ||
| 39 | .extern ___bss_stop | ||
| 40 | .extern ___bss_start | ||
| 41 | .extern _bf53x_relocate_l1_mem | ||
| 42 | |||
| 43 | #define INITIAL_STACK 0xFFB01000 | ||
| 44 | |||
| 45 | __INIT | ||
| 46 | |||
| 47 | ENTRY(__start) | ||
| 48 | /* R0: argument of command line string, passed from uboot, save it */ | ||
| 49 | R7 = R0; | ||
| 50 | /* Enable Cycle Counter and Nesting Of Interrupts */ | ||
| 51 | #ifdef CONFIG_BFIN_SCRATCH_REG_CYCLES | ||
| 52 | R0 = SYSCFG_SNEN; | ||
| 53 | #else | ||
| 54 | R0 = SYSCFG_SNEN | SYSCFG_CCEN; | ||
| 55 | #endif | ||
| 56 | SYSCFG = R0; | ||
| 57 | R0 = 0; | ||
| 58 | |||
| 59 | /* Clear Out All the data and pointer Registers */ | ||
| 60 | R1 = R0; | ||
| 61 | R2 = R0; | ||
| 62 | R3 = R0; | ||
| 63 | R4 = R0; | ||
| 64 | R5 = R0; | ||
| 65 | R6 = R0; | ||
| 66 | |||
| 67 | P0 = R0; | ||
| 68 | P1 = R0; | ||
| 69 | P2 = R0; | ||
| 70 | P3 = R0; | ||
| 71 | P4 = R0; | ||
| 72 | P5 = R0; | ||
| 73 | |||
| 74 | LC0 = r0; | ||
| 75 | LC1 = r0; | ||
| 76 | L0 = r0; | ||
| 77 | L1 = r0; | ||
| 78 | L2 = r0; | ||
| 79 | L3 = r0; | ||
| 80 | |||
| 81 | /* Clear Out All the DAG Registers */ | ||
| 82 | B0 = r0; | ||
| 83 | B1 = r0; | ||
| 84 | B2 = r0; | ||
| 85 | B3 = r0; | ||
| 86 | |||
| 87 | I0 = r0; | ||
| 88 | I1 = r0; | ||
| 89 | I2 = r0; | ||
| 90 | I3 = r0; | ||
| 91 | |||
| 92 | M0 = r0; | ||
| 93 | M1 = r0; | ||
| 94 | M2 = r0; | ||
| 95 | M3 = r0; | ||
| 96 | |||
| 97 | trace_buffer_init(p0,r0); | ||
| 98 | P0 = R1; | ||
| 99 | R0 = R1; | ||
| 100 | |||
| 101 | p0.h = hi(FIO_MASKA_C); | ||
| 102 | p0.l = lo(FIO_MASKA_C); | ||
| 103 | r0 = 0xFFFF(Z); | ||
| 104 | w[p0] = r0.L; /* Disable all interrupts */ | ||
| 105 | ssync; | ||
| 106 | |||
| 107 | p0.h = hi(FIO_MASKB_C); | ||
| 108 | p0.l = lo(FIO_MASKB_C); | ||
| 109 | r0 = 0xFFFF(Z); | ||
| 110 | w[p0] = r0.L; /* Disable all interrupts */ | ||
| 111 | ssync; | ||
| 112 | |||
| 113 | /* Turn off the icache */ | ||
| 114 | p0.l = LO(IMEM_CONTROL); | ||
| 115 | p0.h = HI(IMEM_CONTROL); | ||
| 116 | R1 = [p0]; | ||
| 117 | R0 = ~ENICPLB; | ||
| 118 | R0 = R0 & R1; | ||
| 119 | |||
| 120 | /* Anomaly 05000125 */ | ||
| 121 | #if ANOMALY_05000125 | ||
| 122 | CLI R2; | ||
| 123 | SSYNC; | ||
| 124 | #endif | ||
| 125 | [p0] = R0; | ||
| 126 | SSYNC; | ||
| 127 | #if ANOMALY_05000125 | ||
| 128 | STI R2; | ||
| 129 | #endif | ||
| 130 | |||
| 131 | /* Turn off the dcache */ | ||
| 132 | p0.l = LO(DMEM_CONTROL); | ||
| 133 | p0.h = HI(DMEM_CONTROL); | ||
| 134 | R1 = [p0]; | ||
| 135 | R0 = ~ENDCPLB; | ||
| 136 | R0 = R0 & R1; | ||
| 137 | |||
| 138 | /* Anomaly 05000125 */ | ||
| 139 | #if ANOMALY_05000125 | ||
| 140 | CLI R2; | ||
| 141 | SSYNC; | ||
| 142 | #endif | ||
| 143 | [p0] = R0; | ||
| 144 | SSYNC; | ||
| 145 | #if ANOMALY_05000125 | ||
| 146 | STI R2; | ||
| 147 | #endif | ||
| 148 | |||
| 149 | /* Initialise UART - when booting from u-boot, the UART is not disabled | ||
| 150 | * so if we dont initalize here, our serial console gets hosed */ | ||
| 151 | p0.h = hi(BFIN_UART_LCR); | ||
| 152 | p0.l = lo(BFIN_UART_LCR); | ||
| 153 | r0 = 0x0(Z); | ||
| 154 | w[p0] = r0.L; /* To enable DLL writes */ | ||
| 155 | ssync; | ||
| 156 | |||
| 157 | p0.h = hi(BFIN_UART_DLL); | ||
| 158 | p0.l = lo(BFIN_UART_DLL); | ||
| 159 | r0 = 0x0(Z); | ||
| 160 | w[p0] = r0.L; | ||
| 161 | ssync; | ||
| 162 | |||
| 163 | p0.h = hi(BFIN_UART_DLH); | ||
| 164 | p0.l = lo(BFIN_UART_DLH); | ||
| 165 | r0 = 0x00(Z); | ||
| 166 | w[p0] = r0.L; | ||
| 167 | ssync; | ||
| 168 | |||
| 169 | p0.h = hi(BFIN_UART_GCTL); | ||
| 170 | p0.l = lo(BFIN_UART_GCTL); | ||
| 171 | r0 = 0x0(Z); | ||
| 172 | w[p0] = r0.L; /* To enable UART clock */ | ||
| 173 | ssync; | ||
| 174 | |||
| 175 | /* Initialize stack pointer */ | ||
| 176 | sp.l = lo(INITIAL_STACK); | ||
| 177 | sp.h = hi(INITIAL_STACK); | ||
| 178 | fp = sp; | ||
| 179 | usp = sp; | ||
| 180 | |||
| 181 | #ifdef CONFIG_EARLY_PRINTK | ||
| 182 | SP += -12; | ||
| 183 | call _init_early_exception_vectors; | ||
| 184 | SP += 12; | ||
| 185 | #endif | ||
| 186 | |||
| 187 | /* Put The Code for PLL Programming and SDRAM Programming in L1 ISRAM */ | ||
| 188 | call _bf53x_relocate_l1_mem; | ||
| 189 | #ifdef CONFIG_BFIN_KERNEL_CLOCK | ||
| 190 | call _start_dma_code; | ||
| 191 | #endif | ||
| 192 | |||
| 193 | /* Code for initializing Async memory banks */ | ||
| 194 | |||
| 195 | p2.h = hi(EBIU_AMBCTL1); | ||
| 196 | p2.l = lo(EBIU_AMBCTL1); | ||
| 197 | r0.h = hi(AMBCTL1VAL); | ||
| 198 | r0.l = lo(AMBCTL1VAL); | ||
| 199 | [p2] = r0; | ||
| 200 | ssync; | ||
| 201 | |||
| 202 | p2.h = hi(EBIU_AMBCTL0); | ||
| 203 | p2.l = lo(EBIU_AMBCTL0); | ||
| 204 | r0.h = hi(AMBCTL0VAL); | ||
| 205 | r0.l = lo(AMBCTL0VAL); | ||
| 206 | [p2] = r0; | ||
| 207 | ssync; | ||
| 208 | |||
| 209 | p2.h = hi(EBIU_AMGCTL); | ||
| 210 | p2.l = lo(EBIU_AMGCTL); | ||
| 211 | r0 = AMGCTLVAL; | ||
| 212 | w[p2] = r0; | ||
| 213 | ssync; | ||
| 214 | |||
| 215 | /* This section keeps the processor in supervisor mode | ||
| 216 | * during kernel boot. Switches to user mode at end of boot. | ||
| 217 | * See page 3-9 of Hardware Reference manual for documentation. | ||
| 218 | */ | ||
| 219 | |||
| 220 | /* EVT15 = _real_start */ | ||
| 221 | |||
| 222 | p0.l = lo(EVT15); | ||
| 223 | p0.h = hi(EVT15); | ||
| 224 | p1.l = _real_start; | ||
| 225 | p1.h = _real_start; | ||
| 226 | [p0] = p1; | ||
| 227 | csync; | ||
| 228 | |||
| 229 | p0.l = lo(IMASK); | ||
| 230 | p0.h = hi(IMASK); | ||
| 231 | p1.l = IMASK_IVG15; | ||
| 232 | p1.h = 0x0; | ||
| 233 | [p0] = p1; | ||
| 234 | csync; | ||
| 235 | |||
| 236 | raise 15; | ||
| 237 | p0.l = .LWAIT_HERE; | ||
| 238 | p0.h = .LWAIT_HERE; | ||
| 239 | reti = p0; | ||
| 240 | #if ANOMALY_05000281 | ||
| 241 | nop; nop; nop; | ||
| 242 | #endif | ||
| 243 | rti; | ||
| 244 | |||
| 245 | .LWAIT_HERE: | ||
| 246 | jump .LWAIT_HERE; | ||
| 247 | ENDPROC(__start) | ||
| 248 | |||
| 249 | ENTRY(_real_start) | ||
| 250 | [ -- sp ] = reti; | ||
| 251 | p0.l = lo(WDOG_CTL); | ||
| 252 | p0.h = hi(WDOG_CTL); | ||
| 253 | r0 = 0xAD6(z); | ||
| 254 | w[p0] = r0; /* watchdog off for now */ | ||
| 255 | ssync; | ||
| 256 | |||
| 257 | /* Code update for BSS size == 0 | ||
| 258 | * Zero out the bss region. | ||
| 259 | */ | ||
| 260 | |||
| 261 | p1.l = ___bss_start; | ||
| 262 | p1.h = ___bss_start; | ||
| 263 | p2.l = ___bss_stop; | ||
| 264 | p2.h = ___bss_stop; | ||
| 265 | r0 = 0; | ||
| 266 | p2 -= p1; | ||
| 267 | lsetup (.L_clear_bss, .L_clear_bss) lc0 = p2; | ||
| 268 | .L_clear_bss: | ||
| 269 | B[p1++] = r0; | ||
| 270 | |||
| 271 | /* In case there is a NULL pointer reference | ||
| 272 | * Zero out region before stext | ||
| 273 | */ | ||
| 274 | |||
| 275 | p1.l = 0x0; | ||
| 276 | p1.h = 0x0; | ||
| 277 | r0.l = __stext; | ||
| 278 | r0.h = __stext; | ||
| 279 | r0 = r0 >> 1; | ||
| 280 | p2 = r0; | ||
| 281 | r0 = 0; | ||
| 282 | lsetup (.L_clear_zero, .L_clear_zero) lc0 = p2; | ||
| 283 | .L_clear_zero: | ||
| 284 | W[p1++] = r0; | ||
| 285 | |||
| 286 | /* pass the uboot arguments to the global value command line */ | ||
| 287 | R0 = R7; | ||
| 288 | call _cmdline_init; | ||
| 289 | |||
| 290 | p1.l = __rambase; | ||
| 291 | p1.h = __rambase; | ||
| 292 | r0.l = __sdata; | ||
| 293 | r0.h = __sdata; | ||
| 294 | [p1] = r0; | ||
| 295 | |||
| 296 | p1.l = __ramstart; | ||
| 297 | p1.h = __ramstart; | ||
| 298 | p3.l = ___bss_stop; | ||
| 299 | p3.h = ___bss_stop; | ||
| 300 | |||
| 301 | r1 = p3; | ||
| 302 | [p1] = r1; | ||
| 303 | |||
| 304 | /* | ||
| 305 | * load the current thread pointer and stack | ||
| 306 | */ | ||
| 307 | r1.l = _init_thread_union; | ||
| 308 | r1.h = _init_thread_union; | ||
| 309 | |||
| 310 | r2.l = 0x2000; | ||
| 311 | r2.h = 0x0000; | ||
| 312 | r1 = r1 + r2; | ||
| 313 | sp = r1; | ||
| 314 | usp = sp; | ||
| 315 | fp = sp; | ||
| 316 | jump.l _start_kernel; | ||
| 317 | ENDPROC(_real_start) | ||
| 318 | |||
| 319 | __FINIT | ||
| 320 | |||
| 321 | .section .l1.text | 38 | .section .l1.text |
| 322 | #ifdef CONFIG_BFIN_KERNEL_CLOCK | 39 | #ifdef CONFIG_BFIN_KERNEL_CLOCK |
| 323 | ENTRY(_start_dma_code) | 40 | ENTRY(_start_dma_code) |
| @@ -412,13 +129,6 @@ ENTRY(_start_dma_code) | |||
| 412 | [P2] = R1; | 129 | [P2] = R1; |
| 413 | SSYNC; | 130 | SSYNC; |
| 414 | 131 | ||
| 415 | p0.h = hi(SIC_IWR); | ||
| 416 | p0.l = lo(SIC_IWR); | ||
| 417 | r0.l = lo(IWR_ENABLE_ALL); | ||
| 418 | r0.h = hi(IWR_ENABLE_ALL); | ||
| 419 | [p0] = r0; | ||
| 420 | SSYNC; | ||
| 421 | |||
| 422 | RTS; | 132 | RTS; |
| 423 | ENDPROC(_start_dma_code) | 133 | ENDPROC(_start_dma_code) |
| 424 | #endif /* CONFIG_BFIN_KERNEL_CLOCK */ | 134 | #endif /* CONFIG_BFIN_KERNEL_CLOCK */ |
diff --git a/include/asm-blackfin/mach-bf533/anomaly.h b/arch/blackfin/mach-bf533/include/mach/anomaly.h index 8f7ea112fd3a..8f7ea112fd3a 100644 --- a/include/asm-blackfin/mach-bf533/anomaly.h +++ b/arch/blackfin/mach-bf533/include/mach/anomaly.h | |||
diff --git a/include/asm-blackfin/mach-bf533/bf533.h b/arch/blackfin/mach-bf533/include/mach/bf533.h index 12a416931991..12a416931991 100644 --- a/include/asm-blackfin/mach-bf533/bf533.h +++ b/arch/blackfin/mach-bf533/include/mach/bf533.h | |||
diff --git a/include/asm-blackfin/mach-bf533/bfin_serial_5xx.h b/arch/blackfin/mach-bf533/include/mach/bfin_serial_5xx.h index ebf592b59aab..ebf592b59aab 100644 --- a/include/asm-blackfin/mach-bf533/bfin_serial_5xx.h +++ b/arch/blackfin/mach-bf533/include/mach/bfin_serial_5xx.h | |||
diff --git a/include/asm-blackfin/mach-bf533/bfin_sir.h b/arch/blackfin/mach-bf533/include/mach/bfin_sir.h index 9bb87e9e2e9b..9bb87e9e2e9b 100644 --- a/include/asm-blackfin/mach-bf533/bfin_sir.h +++ b/arch/blackfin/mach-bf533/include/mach/bfin_sir.h | |||
diff --git a/include/asm-blackfin/mach-bf533/blackfin.h b/arch/blackfin/mach-bf533/include/mach/blackfin.h index d80971b4e3aa..d80971b4e3aa 100644 --- a/include/asm-blackfin/mach-bf533/blackfin.h +++ b/arch/blackfin/mach-bf533/include/mach/blackfin.h | |||
diff --git a/include/asm-blackfin/mach-bf533/cdefBF532.h b/arch/blackfin/mach-bf533/include/mach/cdefBF532.h index 154655452d4c..3d8978a52c17 100644 --- a/include/asm-blackfin/mach-bf533/cdefBF532.h +++ b/arch/blackfin/mach-bf533/include/mach/cdefBF532.h | |||
| @@ -37,7 +37,7 @@ | |||
| 37 | #include "defBF532.h" | 37 | #include "defBF532.h" |
| 38 | 38 | ||
| 39 | /*include core specific register pointer definitions*/ | 39 | /*include core specific register pointer definitions*/ |
| 40 | #include <asm/mach-common/cdef_LPBlackfin.h> | 40 | #include <asm/cdef_LPBlackfin.h> |
| 41 | 41 | ||
| 42 | #include <asm/system.h> | 42 | #include <asm/system.h> |
| 43 | 43 | ||
diff --git a/include/asm-blackfin/mach-bf533/defBF532.h b/arch/blackfin/mach-bf533/include/mach/defBF532.h index 0ab4dd7494cf..7f4633223e6d 100644 --- a/include/asm-blackfin/mach-bf533/defBF532.h +++ b/arch/blackfin/mach-bf533/include/mach/defBF532.h | |||
| @@ -48,7 +48,7 @@ | |||
| 48 | #define _DEF_BF532_H | 48 | #define _DEF_BF532_H |
| 49 | 49 | ||
| 50 | /* include all Core registers and bit definitions */ | 50 | /* include all Core registers and bit definitions */ |
| 51 | #include <asm/mach-common/def_LPBlackfin.h> | 51 | #include <asm/def_LPBlackfin.h> |
| 52 | 52 | ||
| 53 | /*********************************************************************************** */ | 53 | /*********************************************************************************** */ |
| 54 | /* System MMR Register Map */ | 54 | /* System MMR Register Map */ |
diff --git a/include/asm-blackfin/mach-bf533/dma.h b/arch/blackfin/mach-bf533/include/mach/dma.h index bd9d5e94307d..bd9d5e94307d 100644 --- a/include/asm-blackfin/mach-bf533/dma.h +++ b/arch/blackfin/mach-bf533/include/mach/dma.h | |||
diff --git a/include/asm-blackfin/mach-bf533/irq.h b/arch/blackfin/mach-bf533/include/mach/irq.h index 5aa38e5da6b7..5aa38e5da6b7 100644 --- a/include/asm-blackfin/mach-bf533/irq.h +++ b/arch/blackfin/mach-bf533/include/mach/irq.h | |||
diff --git a/include/asm-blackfin/mach-bf533/mem_init.h b/arch/blackfin/mach-bf533/include/mach/mem_init.h index 995c06b2b1ef..ed2034bf10ec 100644 --- a/include/asm-blackfin/mach-bf533/mem_init.h +++ b/arch/blackfin/mach-bf533/include/mach/mem_init.h | |||
| @@ -47,7 +47,7 @@ | |||
| 47 | #define SDRAM_tRCD TRCD_2 | 47 | #define SDRAM_tRCD TRCD_2 |
| 48 | #define SDRAM_tWR TWR_2 | 48 | #define SDRAM_tWR TWR_2 |
| 49 | #endif | 49 | #endif |
| 50 | #if (CONFIG_SCLK_HZ > 8955223) && (CONFIG_SCLK_HZ <= 104477612) | 50 | #if (CONFIG_SCLK_HZ > 89552239) && (CONFIG_SCLK_HZ <= 104477612) |
| 51 | #define SDRAM_tRP TRP_2 | 51 | #define SDRAM_tRP TRP_2 |
| 52 | #define SDRAM_tRP_num 2 | 52 | #define SDRAM_tRP_num 2 |
| 53 | #define SDRAM_tRAS TRAS_5 | 53 | #define SDRAM_tRAS TRAS_5 |
diff --git a/include/asm-blackfin/mach-bf533/mem_map.h b/arch/blackfin/mach-bf533/include/mach/mem_map.h index bd30b6f3be00..581fc6eea789 100644 --- a/include/asm-blackfin/mach-bf533/mem_map.h +++ b/arch/blackfin/mach-bf533/include/mach/mem_map.h | |||
| @@ -158,6 +158,11 @@ | |||
| 158 | 158 | ||
| 159 | #endif | 159 | #endif |
| 160 | 160 | ||
| 161 | /* Level 2 Memory - none */ | ||
| 162 | |||
| 163 | #define L2_START 0 | ||
| 164 | #define L2_LENGTH 0 | ||
| 165 | |||
| 161 | /* Scratch Pad Memory */ | 166 | /* Scratch Pad Memory */ |
| 162 | 167 | ||
| 163 | #define L1_SCRATCH_START 0xFFB00000 | 168 | #define L1_SCRATCH_START 0xFFB00000 |
diff --git a/include/asm-blackfin/mach-bf533/portmux.h b/arch/blackfin/mach-bf533/include/mach/portmux.h index 685a2651dcda..685a2651dcda 100644 --- a/include/asm-blackfin/mach-bf533/portmux.h +++ b/arch/blackfin/mach-bf533/include/mach/portmux.h | |||
diff --git a/arch/blackfin/mach-bf533/ints-priority.c b/arch/blackfin/mach-bf533/ints-priority.c index 7d79e0f9503d..f51994b7a2b9 100644 --- a/arch/blackfin/mach-bf533/ints-priority.c +++ b/arch/blackfin/mach-bf533/ints-priority.c | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | #include <linux/irq.h> | 31 | #include <linux/irq.h> |
| 32 | #include <asm/blackfin.h> | 32 | #include <asm/blackfin.h> |
| 33 | 33 | ||
| 34 | void program_IAR(void) | 34 | void __init program_IAR(void) |
| 35 | { | 35 | { |
| 36 | /* Program the IAR0 Register with the configured priority */ | 36 | /* Program the IAR0 Register with the configured priority */ |
| 37 | bfin_write_SIC_IAR0(((CONFIG_PLLWAKE_ERROR - 7) << PLLWAKE_ERROR_POS) | | 37 | bfin_write_SIC_IAR0(((CONFIG_PLLWAKE_ERROR - 7) << PLLWAKE_ERROR_POS) | |
diff --git a/arch/blackfin/mach-bf537/boards/Kconfig b/arch/blackfin/mach-bf537/boards/Kconfig index 7e789dbef036..42a57b0acb29 100644 --- a/arch/blackfin/mach-bf537/boards/Kconfig +++ b/arch/blackfin/mach-bf537/boards/Kconfig | |||
| @@ -15,6 +15,12 @@ config BFIN537_BLUETECHNIX_CM | |||
| 15 | help | 15 | help |
| 16 | CM-BF537 support for EVAL- and DEV-Board. | 16 | CM-BF537 support for EVAL- and DEV-Board. |
| 17 | 17 | ||
| 18 | config BFIN537_BLUETECHNIX_TCM | ||
| 19 | bool "Bluetechnix TCM-BF537" | ||
| 20 | depends on (BF537) | ||
| 21 | help | ||
| 22 | TCM-BF537 support for EVAL- and DEV-Board. | ||
| 23 | |||
| 18 | config PNAV10 | 24 | config PNAV10 |
| 19 | bool "PNAV board" | 25 | bool "PNAV board" |
| 20 | depends on (BF537) | 26 | depends on (BF537) |
diff --git a/arch/blackfin/mach-bf537/boards/Makefile b/arch/blackfin/mach-bf537/boards/Makefile index c94f7a5b8211..7168cc14afd8 100644 --- a/arch/blackfin/mach-bf537/boards/Makefile +++ b/arch/blackfin/mach-bf537/boards/Makefile | |||
| @@ -5,5 +5,6 @@ | |||
| 5 | obj-$(CONFIG_GENERIC_BF537_BOARD) += generic_board.o | 5 | obj-$(CONFIG_GENERIC_BF537_BOARD) += generic_board.o |
| 6 | obj-$(CONFIG_BFIN537_STAMP) += stamp.o | 6 | obj-$(CONFIG_BFIN537_STAMP) += stamp.o |
| 7 | obj-$(CONFIG_BFIN537_BLUETECHNIX_CM) += cm_bf537.o | 7 | obj-$(CONFIG_BFIN537_BLUETECHNIX_CM) += cm_bf537.o |
| 8 | obj-$(CONFIG_BFIN537_BLUETECHNIX_TCM) += tcm_bf537.o | ||
| 8 | obj-$(CONFIG_PNAV10) += pnav10.o | 9 | obj-$(CONFIG_PNAV10) += pnav10.o |
| 9 | obj-$(CONFIG_CAMSIG_MINOTAUR) += minotaur.o | 10 | obj-$(CONFIG_CAMSIG_MINOTAUR) += minotaur.o |
diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537.c b/arch/blackfin/mach-bf537/boards/cm_bf537.c index 73f2142875e2..dde14720b0ea 100644 --- a/arch/blackfin/mach-bf537/boards/cm_bf537.c +++ b/arch/blackfin/mach-bf537/boards/cm_bf537.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | #include <linux/platform_device.h> | 33 | #include <linux/platform_device.h> |
| 34 | #include <linux/mtd/mtd.h> | 34 | #include <linux/mtd/mtd.h> |
| 35 | #include <linux/mtd/partitions.h> | 35 | #include <linux/mtd/partitions.h> |
| 36 | #include <linux/mtd/physmap.h> | ||
| 36 | #include <linux/spi/spi.h> | 37 | #include <linux/spi/spi.h> |
| 37 | #include <linux/spi/flash.h> | 38 | #include <linux/spi/flash.h> |
| 38 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) | 39 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) |
| @@ -56,16 +57,16 @@ const char bfin_board_name[] = "Bluetechnix CM BF537"; | |||
| 56 | #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) | 57 | #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) |
| 57 | static struct mtd_partition bfin_spi_flash_partitions[] = { | 58 | static struct mtd_partition bfin_spi_flash_partitions[] = { |
| 58 | { | 59 | { |
| 59 | .name = "bootloader", | 60 | .name = "bootloader(spi)", |
| 60 | .size = 0x00020000, | 61 | .size = 0x00020000, |
| 61 | .offset = 0, | 62 | .offset = 0, |
| 62 | .mask_flags = MTD_CAP_ROM | 63 | .mask_flags = MTD_CAP_ROM |
| 63 | }, { | 64 | }, { |
| 64 | .name = "kernel", | 65 | .name = "linux kernel(spi)", |
| 65 | .size = 0xe0000, | 66 | .size = 0xe0000, |
| 66 | .offset = 0x20000 | 67 | .offset = 0x20000 |
| 67 | }, { | 68 | }, { |
| 68 | .name = "file system", | 69 | .name = "file system(spi)", |
| 69 | .size = 0x700000, | 70 | .size = 0x700000, |
| 70 | .offset = 0x00100000, | 71 | .offset = 0x00100000, |
| 71 | } | 72 | } |
| @@ -307,6 +308,55 @@ static struct platform_device net2272_bfin_device = { | |||
| 307 | }; | 308 | }; |
| 308 | #endif | 309 | #endif |
| 309 | 310 | ||
| 311 | #if defined(CONFIG_MTD_GPIO_ADDR) || defined(CONFIG_MTD_GPIO_ADDR_MODULE) | ||
| 312 | static struct mtd_partition cm_partitions[] = { | ||
| 313 | { | ||
| 314 | .name = "bootloader(nor)", | ||
| 315 | .size = 0x40000, | ||
| 316 | .offset = 0, | ||
| 317 | }, { | ||
| 318 | .name = "linux kernel(nor)", | ||
| 319 | .size = 0xE0000, | ||
| 320 | .offset = MTDPART_OFS_APPEND, | ||
| 321 | }, { | ||
| 322 | .name = "file system(nor)", | ||
| 323 | .size = MTDPART_SIZ_FULL, | ||
| 324 | .offset = MTDPART_OFS_APPEND, | ||
| 325 | } | ||
| 326 | }; | ||
| 327 | |||
| 328 | static struct physmap_flash_data cm_flash_data = { | ||
| 329 | .width = 2, | ||
| 330 | .parts = cm_partitions, | ||
| 331 | .nr_parts = ARRAY_SIZE(cm_partitions), | ||
| 332 | }; | ||
| 333 | |||
| 334 | static unsigned cm_flash_gpios[] = { GPIO_PF4 }; | ||
| 335 | |||
| 336 | static struct resource cm_flash_resource[] = { | ||
| 337 | { | ||
| 338 | .name = "cfi_probe", | ||
| 339 | .start = 0x20000000, | ||
| 340 | .end = 0x201fffff, | ||
| 341 | .flags = IORESOURCE_MEM, | ||
| 342 | }, { | ||
| 343 | .start = (unsigned long)cm_flash_gpios, | ||
| 344 | .end = ARRAY_SIZE(cm_flash_gpios), | ||
| 345 | .flags = IORESOURCE_IRQ, | ||
| 346 | } | ||
| 347 | }; | ||
| 348 | |||
| 349 | static struct platform_device cm_flash_device = { | ||
| 350 | .name = "gpio-addr-flash", | ||
| 351 | .id = 0, | ||
| 352 | .dev = { | ||
| 353 | .platform_data = &cm_flash_data, | ||
| 354 | }, | ||
| 355 | .num_resources = ARRAY_SIZE(cm_flash_resource), | ||
| 356 | .resource = cm_flash_resource, | ||
| 357 | }; | ||
| 358 | #endif | ||
| 359 | |||
| 310 | #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) | 360 | #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) |
| 311 | static struct resource bfin_uart_resources[] = { | 361 | static struct resource bfin_uart_resources[] = { |
| 312 | { | 362 | { |
| @@ -395,7 +445,7 @@ static struct platform_device bfin_mac_device = { | |||
| 395 | #endif | 445 | #endif |
| 396 | 446 | ||
| 397 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | 447 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) |
| 398 | #define PATA_INT 64 | 448 | #define PATA_INT IRQ_PF14 |
| 399 | 449 | ||
| 400 | static struct pata_platform_info bfin_pata_platform_data = { | 450 | static struct pata_platform_info bfin_pata_platform_data = { |
| 401 | .ioport_shift = 2, | 451 | .ioport_shift = 2, |
| @@ -510,6 +560,10 @@ static struct platform_device *cm_bf537_devices[] __initdata = { | |||
| 510 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | 560 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) |
| 511 | &bfin_pata_device, | 561 | &bfin_pata_device, |
| 512 | #endif | 562 | #endif |
| 563 | |||
| 564 | #if defined(CONFIG_MTD_GPIO_ADDR) || defined(CONFIG_MTD_GPIO_ADDR_MODULE) | ||
| 565 | &cm_flash_device, | ||
| 566 | #endif | ||
| 513 | }; | 567 | }; |
| 514 | 568 | ||
| 515 | static int __init cm_bf537_init(void) | 569 | static int __init cm_bf537_init(void) |
diff --git a/arch/blackfin/mach-bf537/boards/generic_board.c b/arch/blackfin/mach-bf537/boards/generic_board.c index 01b63e2ec18f..78a13d5bfd55 100644 --- a/arch/blackfin/mach-bf537/boards/generic_board.c +++ b/arch/blackfin/mach-bf537/boards/generic_board.c | |||
| @@ -38,7 +38,6 @@ | |||
| 38 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) | 38 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) |
| 39 | #include <linux/usb/isp1362.h> | 39 | #include <linux/usb/isp1362.h> |
| 40 | #endif | 40 | #endif |
| 41 | #include <linux/ata_platform.h> | ||
| 42 | #include <linux/irq.h> | 41 | #include <linux/irq.h> |
| 43 | #include <linux/interrupt.h> | 42 | #include <linux/interrupt.h> |
| 44 | #include <linux/usb/sl811.h> | 43 | #include <linux/usb/sl811.h> |
| @@ -307,16 +306,16 @@ static struct platform_device net2272_bfin_device = { | |||
| 307 | || defined(CONFIG_MTD_M25P80_MODULE) | 306 | || defined(CONFIG_MTD_M25P80_MODULE) |
| 308 | static struct mtd_partition bfin_spi_flash_partitions[] = { | 307 | static struct mtd_partition bfin_spi_flash_partitions[] = { |
| 309 | { | 308 | { |
| 310 | .name = "bootloader", | 309 | .name = "bootloader(spi)", |
| 311 | .size = 0x00020000, | 310 | .size = 0x00020000, |
| 312 | .offset = 0, | 311 | .offset = 0, |
| 313 | .mask_flags = MTD_CAP_ROM | 312 | .mask_flags = MTD_CAP_ROM |
| 314 | }, { | 313 | }, { |
| 315 | .name = "kernel", | 314 | .name = "linux kernel(spi)", |
| 316 | .size = 0xe0000, | 315 | .size = 0xe0000, |
| 317 | .offset = 0x20000 | 316 | .offset = 0x20000 |
| 318 | }, { | 317 | }, { |
| 319 | .name = "file system", | 318 | .name = "file system(spi)", |
| 320 | .size = 0x700000, | 319 | .size = 0x700000, |
| 321 | .offset = 0x00100000, | 320 | .offset = 0x00100000, |
| 322 | } | 321 | } |
| @@ -619,43 +618,6 @@ static struct platform_device bfin_sport1_uart_device = { | |||
| 619 | }; | 618 | }; |
| 620 | #endif | 619 | #endif |
| 621 | 620 | ||
| 622 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
| 623 | #define PATA_INT 55 | ||
| 624 | |||
| 625 | static struct pata_platform_info bfin_pata_platform_data = { | ||
| 626 | .ioport_shift = 1, | ||
| 627 | .irq_type = IRQF_TRIGGER_HIGH | IRQF_DISABLED, | ||
| 628 | }; | ||
| 629 | |||
| 630 | static struct resource bfin_pata_resources[] = { | ||
| 631 | { | ||
| 632 | .start = 0x20314020, | ||
| 633 | .end = 0x2031403F, | ||
| 634 | .flags = IORESOURCE_MEM, | ||
| 635 | }, | ||
| 636 | { | ||
| 637 | .start = 0x2031401C, | ||
| 638 | .end = 0x2031401F, | ||
| 639 | .flags = IORESOURCE_MEM, | ||
| 640 | }, | ||
| 641 | { | ||
| 642 | .start = PATA_INT, | ||
| 643 | .end = PATA_INT, | ||
| 644 | .flags = IORESOURCE_IRQ, | ||
| 645 | }, | ||
| 646 | }; | ||
| 647 | |||
| 648 | static struct platform_device bfin_pata_device = { | ||
| 649 | .name = "pata_platform", | ||
| 650 | .id = -1, | ||
| 651 | .num_resources = ARRAY_SIZE(bfin_pata_resources), | ||
| 652 | .resource = bfin_pata_resources, | ||
| 653 | .dev = { | ||
| 654 | .platform_data = &bfin_pata_platform_data, | ||
| 655 | } | ||
| 656 | }; | ||
| 657 | #endif | ||
| 658 | |||
| 659 | static struct platform_device *stamp_devices[] __initdata = { | 621 | static struct platform_device *stamp_devices[] __initdata = { |
| 660 | #if defined(CONFIG_BFIN_CFPCMCIA) || defined(CONFIG_BFIN_CFPCMCIA_MODULE) | 622 | #if defined(CONFIG_BFIN_CFPCMCIA) || defined(CONFIG_BFIN_CFPCMCIA_MODULE) |
| 661 | &bfin_pcmcia_cf_device, | 623 | &bfin_pcmcia_cf_device, |
| @@ -717,10 +679,6 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
| 717 | &bfin_sport0_uart_device, | 679 | &bfin_sport0_uart_device, |
| 718 | &bfin_sport1_uart_device, | 680 | &bfin_sport1_uart_device, |
| 719 | #endif | 681 | #endif |
| 720 | |||
| 721 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
| 722 | &bfin_pata_device, | ||
| 723 | #endif | ||
| 724 | }; | 682 | }; |
| 725 | 683 | ||
| 726 | static int __init stamp_init(void) | 684 | static int __init stamp_init(void) |
| @@ -732,9 +690,6 @@ static int __init stamp_init(void) | |||
| 732 | ARRAY_SIZE(bfin_spi_board_info)); | 690 | ARRAY_SIZE(bfin_spi_board_info)); |
| 733 | #endif | 691 | #endif |
| 734 | 692 | ||
| 735 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
| 736 | irq_desc[PATA_INT].status |= IRQ_NOAUTOEN; | ||
| 737 | #endif | ||
| 738 | return 0; | 693 | return 0; |
| 739 | } | 694 | } |
| 740 | 695 | ||
diff --git a/arch/blackfin/mach-bf537/boards/minotaur.c b/arch/blackfin/mach-bf537/boards/minotaur.c index 18ddf7a52005..48c4cd2d1be6 100644 --- a/arch/blackfin/mach-bf537/boards/minotaur.c +++ b/arch/blackfin/mach-bf537/boards/minotaur.c | |||
| @@ -100,16 +100,16 @@ static struct platform_device net2272_bfin_device = { | |||
| 100 | 100 | ||
| 101 | static struct mtd_partition bfin_spi_flash_partitions[] = { | 101 | static struct mtd_partition bfin_spi_flash_partitions[] = { |
| 102 | { | 102 | { |
| 103 | .name = "uboot", | 103 | .name = "bootloader(spi)", |
| 104 | .size = PSIZE_UBOOT, | 104 | .size = PSIZE_UBOOT, |
| 105 | .offset = 0x000000, | 105 | .offset = 0x000000, |
| 106 | .mask_flags = MTD_CAP_ROM | 106 | .mask_flags = MTD_CAP_ROM |
| 107 | }, { | 107 | }, { |
| 108 | .name = "initramfs", | 108 | .name = "initramfs(spi)", |
| 109 | .size = PSIZE_INITRAMFS, | 109 | .size = PSIZE_INITRAMFS, |
| 110 | .offset = PSIZE_UBOOT | 110 | .offset = PSIZE_UBOOT |
| 111 | }, { | 111 | }, { |
| 112 | .name = "opt", | 112 | .name = "opt(spi)", |
| 113 | .size = FLASH_SIZE - (PSIZE_UBOOT + PSIZE_INITRAMFS), | 113 | .size = FLASH_SIZE - (PSIZE_UBOOT + PSIZE_INITRAMFS), |
| 114 | .offset = PSIZE_UBOOT + PSIZE_INITRAMFS, | 114 | .offset = PSIZE_UBOOT + PSIZE_INITRAMFS, |
| 115 | } | 115 | } |
diff --git a/arch/blackfin/mach-bf537/boards/pnav10.c b/arch/blackfin/mach-bf537/boards/pnav10.c index 51c3bab14a69..f9174c11cbd4 100644 --- a/arch/blackfin/mach-bf537/boards/pnav10.c +++ b/arch/blackfin/mach-bf537/boards/pnav10.c | |||
| @@ -231,16 +231,16 @@ static struct platform_device net2272_bfin_device = { | |||
| 231 | || defined(CONFIG_MTD_M25P80_MODULE) | 231 | || defined(CONFIG_MTD_M25P80_MODULE) |
| 232 | static struct mtd_partition bfin_spi_flash_partitions[] = { | 232 | static struct mtd_partition bfin_spi_flash_partitions[] = { |
| 233 | { | 233 | { |
| 234 | .name = "bootloader", | 234 | .name = "bootloader(spi)", |
| 235 | .size = 0x00020000, | 235 | .size = 0x00020000, |
| 236 | .offset = 0, | 236 | .offset = 0, |
| 237 | .mask_flags = MTD_CAP_ROM | 237 | .mask_flags = MTD_CAP_ROM |
| 238 | }, { | 238 | }, { |
| 239 | .name = "kernel", | 239 | .name = "linux kernel(spi)", |
| 240 | .size = 0xe0000, | 240 | .size = 0xe0000, |
| 241 | .offset = 0x20000 | 241 | .offset = 0x20000 |
| 242 | }, { | 242 | }, { |
| 243 | .name = "file system", | 243 | .name = "file system(spi)", |
| 244 | .size = 0x700000, | 244 | .size = 0x700000, |
| 245 | .offset = 0x00100000, | 245 | .offset = 0x00100000, |
| 246 | } | 246 | } |
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c index 6dbc76fb080b..8482d22321f3 100644 --- a/arch/blackfin/mach-bf537/boards/stamp.c +++ b/arch/blackfin/mach-bf537/boards/stamp.c | |||
| @@ -364,11 +364,11 @@ const char *part_probes[] = { "cmdlinepart", "RedBoot", NULL }; | |||
| 364 | 364 | ||
| 365 | static struct mtd_partition bfin_plat_nand_partitions[] = { | 365 | static struct mtd_partition bfin_plat_nand_partitions[] = { |
| 366 | { | 366 | { |
| 367 | .name = "linux kernel", | 367 | .name = "linux kernel(nand)", |
| 368 | .size = 0x400000, | 368 | .size = 0x400000, |
| 369 | .offset = 0, | 369 | .offset = 0, |
| 370 | }, { | 370 | }, { |
| 371 | .name = "file system", | 371 | .name = "file system(nand)", |
| 372 | .size = MTDPART_SIZ_FULL, | 372 | .size = MTDPART_SIZ_FULL, |
| 373 | .offset = MTDPART_OFS_APPEND, | 373 | .offset = MTDPART_OFS_APPEND, |
| 374 | }, | 374 | }, |
| @@ -439,19 +439,19 @@ static void bfin_plat_nand_init(void) {} | |||
| 439 | #if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE) | 439 | #if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE) |
| 440 | static struct mtd_partition stamp_partitions[] = { | 440 | static struct mtd_partition stamp_partitions[] = { |
| 441 | { | 441 | { |
| 442 | .name = "Bootloader", | 442 | .name = "bootloader(nor)", |
| 443 | .size = 0x40000, | 443 | .size = 0x40000, |
| 444 | .offset = 0, | 444 | .offset = 0, |
| 445 | }, { | 445 | }, { |
| 446 | .name = "Kernel", | 446 | .name = "linux kernel(nor)", |
| 447 | .size = 0xE0000, | 447 | .size = 0xE0000, |
| 448 | .offset = MTDPART_OFS_APPEND, | 448 | .offset = MTDPART_OFS_APPEND, |
| 449 | }, { | 449 | }, { |
| 450 | .name = "RootFS", | 450 | .name = "file system(nor)", |
| 451 | .size = 0x400000 - 0x40000 - 0xE0000 - 0x10000, | 451 | .size = 0x400000 - 0x40000 - 0xE0000 - 0x10000, |
| 452 | .offset = MTDPART_OFS_APPEND, | 452 | .offset = MTDPART_OFS_APPEND, |
| 453 | }, { | 453 | }, { |
| 454 | .name = "MAC Address", | 454 | .name = "MAC Address(nor)", |
| 455 | .size = MTDPART_SIZ_FULL, | 455 | .size = MTDPART_SIZ_FULL, |
| 456 | .offset = 0x3F0000, | 456 | .offset = 0x3F0000, |
| 457 | .mask_flags = MTD_WRITEABLE, | 457 | .mask_flags = MTD_WRITEABLE, |
| @@ -485,16 +485,16 @@ static struct platform_device stamp_flash_device = { | |||
| 485 | || defined(CONFIG_MTD_M25P80_MODULE) | 485 | || defined(CONFIG_MTD_M25P80_MODULE) |
| 486 | static struct mtd_partition bfin_spi_flash_partitions[] = { | 486 | static struct mtd_partition bfin_spi_flash_partitions[] = { |
| 487 | { | 487 | { |
| 488 | .name = "bootloader", | 488 | .name = "bootloader(spi)", |
| 489 | .size = 0x00040000, | 489 | .size = 0x00040000, |
| 490 | .offset = 0, | 490 | .offset = 0, |
| 491 | .mask_flags = MTD_CAP_ROM | 491 | .mask_flags = MTD_CAP_ROM |
| 492 | }, { | 492 | }, { |
| 493 | .name = "kernel", | 493 | .name = "linux kernel(spi)", |
| 494 | .size = 0xe0000, | 494 | .size = 0xe0000, |
| 495 | .offset = MTDPART_OFS_APPEND, | 495 | .offset = MTDPART_OFS_APPEND, |
| 496 | }, { | 496 | }, { |
| 497 | .name = "file system", | 497 | .name = "file system(spi)", |
| 498 | .size = MTDPART_SIZ_FULL, | 498 | .size = MTDPART_SIZ_FULL, |
| 499 | .offset = MTDPART_OFS_APPEND, | 499 | .offset = MTDPART_OFS_APPEND, |
| 500 | } | 500 | } |
| @@ -584,6 +584,30 @@ static struct bfin5xx_spi_chip spidev_chip_info = { | |||
| 584 | 584 | ||
| 585 | #if defined(CONFIG_MTD_DATAFLASH) \ | 585 | #if defined(CONFIG_MTD_DATAFLASH) \ |
| 586 | || defined(CONFIG_MTD_DATAFLASH_MODULE) | 586 | || defined(CONFIG_MTD_DATAFLASH_MODULE) |
| 587 | |||
| 588 | static struct mtd_partition bfin_spi_dataflash_partitions[] = { | ||
| 589 | { | ||
| 590 | .name = "bootloader(spi)", | ||
| 591 | .size = 0x00040000, | ||
| 592 | .offset = 0, | ||
| 593 | .mask_flags = MTD_CAP_ROM | ||
| 594 | }, { | ||
| 595 | .name = "linux kernel(spi)", | ||
| 596 | .size = 0xe0000, | ||
| 597 | .offset = MTDPART_OFS_APPEND, | ||
| 598 | }, { | ||
| 599 | .name = "file system(spi)", | ||
| 600 | .size = MTDPART_SIZ_FULL, | ||
| 601 | .offset = MTDPART_OFS_APPEND, | ||
| 602 | } | ||
| 603 | }; | ||
| 604 | |||
| 605 | static struct flash_platform_data bfin_spi_dataflash_data = { | ||
| 606 | .name = "SPI Dataflash", | ||
| 607 | .parts = bfin_spi_dataflash_partitions, | ||
| 608 | .nr_parts = ARRAY_SIZE(bfin_spi_dataflash_partitions), | ||
| 609 | }; | ||
| 610 | |||
| 587 | /* DataFlash chip */ | 611 | /* DataFlash chip */ |
| 588 | static struct bfin5xx_spi_chip data_flash_chip_info = { | 612 | static struct bfin5xx_spi_chip data_flash_chip_info = { |
| 589 | .enable_dma = 0, /* use dma transfer with this chip*/ | 613 | .enable_dma = 0, /* use dma transfer with this chip*/ |
| @@ -609,9 +633,10 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
| 609 | || defined(CONFIG_MTD_DATAFLASH_MODULE) | 633 | || defined(CONFIG_MTD_DATAFLASH_MODULE) |
| 610 | { /* DataFlash chip */ | 634 | { /* DataFlash chip */ |
| 611 | .modalias = "mtd_dataflash", | 635 | .modalias = "mtd_dataflash", |
| 612 | .max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */ | 636 | .max_speed_hz = 33250000, /* max spi clock (SCK) speed in HZ */ |
| 613 | .bus_num = 0, /* Framework bus number */ | 637 | .bus_num = 0, /* Framework bus number */ |
| 614 | .chip_select = 1, /* Framework chip select. On STAMP537 it is SPISSEL1*/ | 638 | .chip_select = 1, /* Framework chip select. On STAMP537 it is SPISSEL1*/ |
| 639 | .platform_data = &bfin_spi_dataflash_data, | ||
| 615 | .controller_data = &data_flash_chip_info, | 640 | .controller_data = &data_flash_chip_info, |
| 616 | .mode = SPI_MODE_3, | 641 | .mode = SPI_MODE_3, |
| 617 | }, | 642 | }, |
diff --git a/arch/blackfin/mach-bf537/boards/tcm_bf537.c b/arch/blackfin/mach-bf537/boards/tcm_bf537.c new file mode 100644 index 000000000000..d5ff705a5129 --- /dev/null +++ b/arch/blackfin/mach-bf537/boards/tcm_bf537.c | |||
| @@ -0,0 +1,590 @@ | |||
| 1 | /* | ||
| 2 | * File: arch/blackfin/mach-bf537/boards/tcm_bf537.c | ||
| 3 | * Based on: arch/blackfin/mach-bf533/boards/cm_bf537.c | ||
| 4 | * Author: Aidan Williams <aidan@nicta.com.au> | ||
| 5 | * | ||
| 6 | * Created: 2005 | ||
| 7 | * Description: Board description file | ||
| 8 | * | ||
| 9 | * Modified: | ||
| 10 | * Copyright 2005 National ICT Australia (NICTA) | ||
| 11 | * Copyright 2004-2006 Analog Devices Inc. | ||
| 12 | * | ||
| 13 | * Bugs: Enter bugs at http://blackfin.uclinux.org/ | ||
| 14 | * | ||
| 15 | * This program is free software; you can redistribute it and/or modify | ||
| 16 | * it under the terms of the GNU General Public License as published by | ||
| 17 | * the Free Software Foundation; either version 2 of the License, or | ||
| 18 | * (at your option) any later version. | ||
| 19 | * | ||
| 20 | * This program is distributed in the hope that it will be useful, | ||
| 21 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 22 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 23 | * GNU General Public License for more details. | ||
| 24 | * | ||
| 25 | * You should have received a copy of the GNU General Public License | ||
| 26 | * along with this program; if not, see the file COPYING, or write | ||
| 27 | * to the Free Software Foundation, Inc., | ||
| 28 | * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | ||
| 29 | */ | ||
| 30 | |||
| 31 | #include <linux/device.h> | ||
| 32 | #include <linux/etherdevice.h> | ||
| 33 | #include <linux/platform_device.h> | ||
| 34 | #include <linux/mtd/mtd.h> | ||
| 35 | #include <linux/mtd/partitions.h> | ||
| 36 | #include <linux/mtd/physmap.h> | ||
| 37 | #include <linux/spi/spi.h> | ||
| 38 | #include <linux/spi/flash.h> | ||
| 39 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) | ||
| 40 | #include <linux/usb/isp1362.h> | ||
| 41 | #endif | ||
| 42 | #include <linux/ata_platform.h> | ||
| 43 | #include <linux/irq.h> | ||
| 44 | #include <asm/dma.h> | ||
| 45 | #include <asm/bfin5xx_spi.h> | ||
| 46 | #include <asm/portmux.h> | ||
| 47 | #include <asm/dpmc.h> | ||
| 48 | |||
| 49 | /* | ||
| 50 | * Name the Board for the /proc/cpuinfo | ||
| 51 | */ | ||
| 52 | const char bfin_board_name[] = "Bluetechnix TCM BF537"; | ||
| 53 | |||
| 54 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | ||
| 55 | /* all SPI peripherals info goes here */ | ||
| 56 | |||
| 57 | #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) | ||
| 58 | static struct mtd_partition bfin_spi_flash_partitions[] = { | ||
| 59 | { | ||
| 60 | .name = "bootloader(spi)", | ||
| 61 | .size = 0x00020000, | ||
| 62 | .offset = 0, | ||
| 63 | .mask_flags = MTD_CAP_ROM | ||
| 64 | }, { | ||
| 65 | .name = "linux kernel(spi)", | ||
| 66 | .size = 0xe0000, | ||
| 67 | .offset = 0x20000 | ||
| 68 | }, { | ||
| 69 | .name = "file system(spi)", | ||
| 70 | .size = 0x700000, | ||
| 71 | .offset = 0x00100000, | ||
| 72 | } | ||
| 73 | }; | ||
| 74 | |||
| 75 | static struct flash_platform_data bfin_spi_flash_data = { | ||
| 76 | .name = "m25p80", | ||
| 77 | .parts = bfin_spi_flash_partitions, | ||
| 78 | .nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions), | ||
| 79 | .type = "m25p64", | ||
| 80 | }; | ||
| 81 | |||
| 82 | /* SPI flash chip (m25p64) */ | ||
| 83 | static struct bfin5xx_spi_chip spi_flash_chip_info = { | ||
| 84 | .enable_dma = 0, /* use dma transfer with this chip*/ | ||
| 85 | .bits_per_word = 8, | ||
| 86 | }; | ||
| 87 | #endif | ||
| 88 | |||
| 89 | #if defined(CONFIG_SPI_ADC_BF533) || defined(CONFIG_SPI_ADC_BF533_MODULE) | ||
| 90 | /* SPI ADC chip */ | ||
| 91 | static struct bfin5xx_spi_chip spi_adc_chip_info = { | ||
| 92 | .enable_dma = 1, /* use dma transfer with this chip*/ | ||
| 93 | .bits_per_word = 16, | ||
| 94 | }; | ||
| 95 | #endif | ||
| 96 | |||
| 97 | #if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) | ||
| 98 | static struct bfin5xx_spi_chip ad1836_spi_chip_info = { | ||
| 99 | .enable_dma = 0, | ||
| 100 | .bits_per_word = 16, | ||
| 101 | }; | ||
| 102 | #endif | ||
| 103 | |||
| 104 | #if defined(CONFIG_AD9960) || defined(CONFIG_AD9960_MODULE) | ||
| 105 | static struct bfin5xx_spi_chip ad9960_spi_chip_info = { | ||
| 106 | .enable_dma = 0, | ||
| 107 | .bits_per_word = 16, | ||
| 108 | }; | ||
| 109 | #endif | ||
| 110 | |||
| 111 | #if defined(CONFIG_SPI_MMC) || defined(CONFIG_SPI_MMC_MODULE) | ||
| 112 | static struct bfin5xx_spi_chip spi_mmc_chip_info = { | ||
| 113 | .enable_dma = 1, | ||
| 114 | .bits_per_word = 8, | ||
| 115 | }; | ||
| 116 | #endif | ||
| 117 | |||
| 118 | static struct spi_board_info bfin_spi_board_info[] __initdata = { | ||
| 119 | #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) | ||
| 120 | { | ||
| 121 | /* the modalias must be the same as spi device driver name */ | ||
| 122 | .modalias = "m25p80", /* Name of spi_driver for this device */ | ||
| 123 | .max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */ | ||
| 124 | .bus_num = 0, /* Framework bus number */ | ||
| 125 | .chip_select = 1, /* Framework chip select. On STAMP537 it is SPISSEL1*/ | ||
| 126 | .platform_data = &bfin_spi_flash_data, | ||
| 127 | .controller_data = &spi_flash_chip_info, | ||
| 128 | .mode = SPI_MODE_3, | ||
| 129 | }, | ||
| 130 | #endif | ||
| 131 | |||
| 132 | #if defined(CONFIG_SPI_ADC_BF533) || defined(CONFIG_SPI_ADC_BF533_MODULE) | ||
| 133 | { | ||
| 134 | .modalias = "bfin_spi_adc", /* Name of spi_driver for this device */ | ||
| 135 | .max_speed_hz = 6250000, /* max spi clock (SCK) speed in HZ */ | ||
| 136 | .bus_num = 0, /* Framework bus number */ | ||
| 137 | .chip_select = 1, /* Framework chip select. */ | ||
| 138 | .platform_data = NULL, /* No spi_driver specific config */ | ||
| 139 | .controller_data = &spi_adc_chip_info, | ||
| 140 | }, | ||
| 141 | #endif | ||
| 142 | |||
| 143 | #if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) | ||
| 144 | { | ||
| 145 | .modalias = "ad1836-spi", | ||
| 146 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ | ||
| 147 | .bus_num = 0, | ||
| 148 | .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, | ||
| 149 | .controller_data = &ad1836_spi_chip_info, | ||
| 150 | }, | ||
| 151 | #endif | ||
| 152 | |||
| 153 | #if defined(CONFIG_AD9960) || defined(CONFIG_AD9960_MODULE) | ||
| 154 | { | ||
| 155 | .modalias = "ad9960-spi", | ||
| 156 | .max_speed_hz = 10000000, /* max spi clock (SCK) speed in HZ */ | ||
| 157 | .bus_num = 0, | ||
| 158 | .chip_select = 1, | ||
| 159 | .controller_data = &ad9960_spi_chip_info, | ||
| 160 | }, | ||
| 161 | #endif | ||
| 162 | |||
| 163 | #if defined(CONFIG_SPI_MMC) || defined(CONFIG_SPI_MMC_MODULE) | ||
| 164 | { | ||
| 165 | .modalias = "spi_mmc_dummy", | ||
| 166 | .max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */ | ||
| 167 | .bus_num = 0, | ||
| 168 | .chip_select = 7, | ||
| 169 | .platform_data = NULL, | ||
| 170 | .controller_data = &spi_mmc_chip_info, | ||
| 171 | .mode = SPI_MODE_3, | ||
| 172 | }, | ||
| 173 | { | ||
| 174 | .modalias = "spi_mmc", | ||
| 175 | .max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */ | ||
| 176 | .bus_num = 0, | ||
| 177 | .chip_select = CONFIG_SPI_MMC_CS_CHAN, | ||
| 178 | .platform_data = NULL, | ||
| 179 | .controller_data = &spi_mmc_chip_info, | ||
| 180 | .mode = SPI_MODE_3, | ||
| 181 | }, | ||
| 182 | #endif | ||
| 183 | }; | ||
| 184 | |||
| 185 | /* SPI (0) */ | ||
| 186 | static struct resource bfin_spi0_resource[] = { | ||
| 187 | [0] = { | ||
| 188 | .start = SPI0_REGBASE, | ||
| 189 | .end = SPI0_REGBASE + 0xFF, | ||
| 190 | .flags = IORESOURCE_MEM, | ||
| 191 | }, | ||
| 192 | [1] = { | ||
| 193 | .start = CH_SPI, | ||
| 194 | .end = CH_SPI, | ||
| 195 | .flags = IORESOURCE_IRQ, | ||
| 196 | } | ||
| 197 | }; | ||
| 198 | |||
| 199 | /* SPI controller data */ | ||
| 200 | static struct bfin5xx_spi_master bfin_spi0_info = { | ||
| 201 | .num_chipselect = 8, | ||
| 202 | .enable_dma = 1, /* master has the ability to do dma transfer */ | ||
| 203 | .pin_req = {P_SPI0_SCK, P_SPI0_MISO, P_SPI0_MOSI, 0}, | ||
| 204 | }; | ||
| 205 | |||
| 206 | static struct platform_device bfin_spi0_device = { | ||
| 207 | .name = "bfin-spi", | ||
| 208 | .id = 0, /* Bus number */ | ||
| 209 | .num_resources = ARRAY_SIZE(bfin_spi0_resource), | ||
| 210 | .resource = bfin_spi0_resource, | ||
| 211 | .dev = { | ||
| 212 | .platform_data = &bfin_spi0_info, /* Passed to driver */ | ||
| 213 | }, | ||
| 214 | }; | ||
| 215 | #endif /* spi master and devices */ | ||
| 216 | |||
| 217 | #if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE) | ||
| 218 | static struct platform_device rtc_device = { | ||
| 219 | .name = "rtc-bfin", | ||
| 220 | .id = -1, | ||
| 221 | }; | ||
| 222 | #endif | ||
| 223 | |||
| 224 | #if defined(CONFIG_FB_HITACHI_TX09) || defined(CONFIG_FB_HITACHI_TX09_MODULE) | ||
| 225 | static struct platform_device hitachi_fb_device = { | ||
| 226 | .name = "hitachi-tx09", | ||
| 227 | }; | ||
| 228 | #endif | ||
| 229 | |||
| 230 | #if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE) | ||
| 231 | static struct resource smc91x_resources[] = { | ||
| 232 | { | ||
| 233 | .start = 0x20200300, | ||
| 234 | .end = 0x20200300 + 16, | ||
| 235 | .flags = IORESOURCE_MEM, | ||
| 236 | }, { | ||
| 237 | .start = IRQ_PF14, | ||
| 238 | .end = IRQ_PF14, | ||
| 239 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, | ||
| 240 | }, | ||
| 241 | }; | ||
| 242 | |||
| 243 | static struct platform_device smc91x_device = { | ||
| 244 | .name = "smc91x", | ||
| 245 | .id = 0, | ||
| 246 | .num_resources = ARRAY_SIZE(smc91x_resources), | ||
| 247 | .resource = smc91x_resources, | ||
| 248 | }; | ||
| 249 | #endif | ||
| 250 | |||
| 251 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) | ||
| 252 | static struct resource isp1362_hcd_resources[] = { | ||
| 253 | { | ||
| 254 | .start = 0x20308000, | ||
| 255 | .end = 0x20308000, | ||
| 256 | .flags = IORESOURCE_MEM, | ||
| 257 | }, { | ||
| 258 | .start = 0x20308004, | ||
| 259 | .end = 0x20308004, | ||
| 260 | .flags = IORESOURCE_MEM, | ||
| 261 | }, { | ||
| 262 | .start = IRQ_PG15, | ||
| 263 | .end = IRQ_PG15, | ||
| 264 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, | ||
| 265 | }, | ||
| 266 | }; | ||
| 267 | |||
| 268 | static struct isp1362_platform_data isp1362_priv = { | ||
| 269 | .sel15Kres = 1, | ||
| 270 | .clknotstop = 0, | ||
| 271 | .oc_enable = 0, | ||
| 272 | .int_act_high = 0, | ||
| 273 | .int_edge_triggered = 0, | ||
| 274 | .remote_wakeup_connected = 0, | ||
| 275 | .no_power_switching = 1, | ||
| 276 | .power_switching_mode = 0, | ||
| 277 | }; | ||
| 278 | |||
| 279 | static struct platform_device isp1362_hcd_device = { | ||
| 280 | .name = "isp1362-hcd", | ||
| 281 | .id = 0, | ||
| 282 | .dev = { | ||
| 283 | .platform_data = &isp1362_priv, | ||
| 284 | }, | ||
| 285 | .num_resources = ARRAY_SIZE(isp1362_hcd_resources), | ||
| 286 | .resource = isp1362_hcd_resources, | ||
| 287 | }; | ||
| 288 | #endif | ||
| 289 | |||
| 290 | #if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE) | ||
| 291 | static struct resource net2272_bfin_resources[] = { | ||
| 292 | { | ||
| 293 | .start = 0x20200000, | ||
| 294 | .end = 0x20200000 + 0x100, | ||
| 295 | .flags = IORESOURCE_MEM, | ||
| 296 | }, { | ||
| 297 | .start = IRQ_PH14, | ||
| 298 | .end = IRQ_PH14, | ||
| 299 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, | ||
| 300 | }, | ||
| 301 | }; | ||
| 302 | |||
| 303 | static struct platform_device net2272_bfin_device = { | ||
| 304 | .name = "net2272", | ||
| 305 | .id = -1, | ||
| 306 | .num_resources = ARRAY_SIZE(net2272_bfin_resources), | ||
| 307 | .resource = net2272_bfin_resources, | ||
| 308 | }; | ||
| 309 | #endif | ||
| 310 | |||
| 311 | #if defined(CONFIG_MTD_GPIO_ADDR) || defined(CONFIG_MTD_GPIO_ADDR_MODULE) | ||
| 312 | static struct mtd_partition cm_partitions[] = { | ||
| 313 | { | ||
| 314 | .name = "bootloader(nor)", | ||
| 315 | .size = 0x40000, | ||
| 316 | .offset = 0, | ||
| 317 | }, { | ||
| 318 | .name = "linux kernel(nor)", | ||
| 319 | .size = 0xE0000, | ||
| 320 | .offset = MTDPART_OFS_APPEND, | ||
| 321 | }, { | ||
| 322 | .name = "file system(nor)", | ||
| 323 | .size = MTDPART_SIZ_FULL, | ||
| 324 | .offset = MTDPART_OFS_APPEND, | ||
| 325 | } | ||
| 326 | }; | ||
| 327 | |||
| 328 | static struct physmap_flash_data cm_flash_data = { | ||
| 329 | .width = 2, | ||
| 330 | .parts = cm_partitions, | ||
| 331 | .nr_parts = ARRAY_SIZE(cm_partitions), | ||
| 332 | }; | ||
| 333 | |||
| 334 | static unsigned cm_flash_gpios[] = { GPIO_PF4, GPIO_PF5 }; | ||
| 335 | |||
| 336 | static struct resource cm_flash_resource[] = { | ||
| 337 | { | ||
| 338 | .name = "cfi_probe", | ||
| 339 | .start = 0x20000000, | ||
| 340 | .end = 0x201fffff, | ||
| 341 | .flags = IORESOURCE_MEM, | ||
| 342 | }, { | ||
| 343 | .start = (unsigned long)cm_flash_gpios, | ||
| 344 | .end = ARRAY_SIZE(cm_flash_gpios), | ||
| 345 | .flags = IORESOURCE_IRQ, | ||
| 346 | } | ||
| 347 | }; | ||
| 348 | |||
| 349 | static struct platform_device cm_flash_device = { | ||
| 350 | .name = "gpio-addr-flash", | ||
| 351 | .id = 0, | ||
| 352 | .dev = { | ||
| 353 | .platform_data = &cm_flash_data, | ||
| 354 | }, | ||
| 355 | .num_resources = ARRAY_SIZE(cm_flash_resource), | ||
| 356 | .resource = cm_flash_resource, | ||
| 357 | }; | ||
| 358 | #endif | ||
| 359 | |||
| 360 | #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) | ||
| 361 | static struct resource bfin_uart_resources[] = { | ||
| 362 | { | ||
| 363 | .start = 0xFFC00400, | ||
| 364 | .end = 0xFFC004FF, | ||
| 365 | .flags = IORESOURCE_MEM, | ||
| 366 | }, { | ||
| 367 | .start = 0xFFC02000, | ||
| 368 | .end = 0xFFC020FF, | ||
| 369 | .flags = IORESOURCE_MEM, | ||
| 370 | }, | ||
| 371 | }; | ||
| 372 | |||
| 373 | static struct platform_device bfin_uart_device = { | ||
| 374 | .name = "bfin-uart", | ||
| 375 | .id = 1, | ||
| 376 | .num_resources = ARRAY_SIZE(bfin_uart_resources), | ||
| 377 | .resource = bfin_uart_resources, | ||
| 378 | }; | ||
| 379 | #endif | ||
| 380 | |||
| 381 | #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) | ||
| 382 | static struct resource bfin_sir_resources[] = { | ||
| 383 | #ifdef CONFIG_BFIN_SIR0 | ||
| 384 | { | ||
| 385 | .start = 0xFFC00400, | ||
| 386 | .end = 0xFFC004FF, | ||
| 387 | .flags = IORESOURCE_MEM, | ||
| 388 | }, | ||
| 389 | #endif | ||
| 390 | #ifdef CONFIG_BFIN_SIR1 | ||
| 391 | { | ||
| 392 | .start = 0xFFC02000, | ||
| 393 | .end = 0xFFC020FF, | ||
| 394 | .flags = IORESOURCE_MEM, | ||
| 395 | }, | ||
| 396 | #endif | ||
| 397 | }; | ||
| 398 | |||
| 399 | static struct platform_device bfin_sir_device = { | ||
| 400 | .name = "bfin_sir", | ||
| 401 | .id = 0, | ||
| 402 | .num_resources = ARRAY_SIZE(bfin_sir_resources), | ||
| 403 | .resource = bfin_sir_resources, | ||
| 404 | }; | ||
| 405 | #endif | ||
| 406 | |||
| 407 | #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) | ||
| 408 | static struct resource bfin_twi0_resource[] = { | ||
| 409 | [0] = { | ||
| 410 | .start = TWI0_REGBASE, | ||
| 411 | .end = TWI0_REGBASE, | ||
| 412 | .flags = IORESOURCE_MEM, | ||
| 413 | }, | ||
| 414 | [1] = { | ||
| 415 | .start = IRQ_TWI, | ||
| 416 | .end = IRQ_TWI, | ||
| 417 | .flags = IORESOURCE_IRQ, | ||
| 418 | }, | ||
| 419 | }; | ||
| 420 | |||
| 421 | static struct platform_device i2c_bfin_twi_device = { | ||
| 422 | .name = "i2c-bfin-twi", | ||
| 423 | .id = 0, | ||
| 424 | .num_resources = ARRAY_SIZE(bfin_twi0_resource), | ||
| 425 | .resource = bfin_twi0_resource, | ||
| 426 | }; | ||
| 427 | #endif | ||
| 428 | |||
| 429 | #if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE) | ||
| 430 | static struct platform_device bfin_sport0_uart_device = { | ||
| 431 | .name = "bfin-sport-uart", | ||
| 432 | .id = 0, | ||
| 433 | }; | ||
| 434 | |||
| 435 | static struct platform_device bfin_sport1_uart_device = { | ||
| 436 | .name = "bfin-sport-uart", | ||
| 437 | .id = 1, | ||
| 438 | }; | ||
| 439 | #endif | ||
| 440 | |||
| 441 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) | ||
| 442 | static struct platform_device bfin_mac_device = { | ||
| 443 | .name = "bfin_mac", | ||
| 444 | }; | ||
| 445 | #endif | ||
| 446 | |||
| 447 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
| 448 | #define PATA_INT IRQ_PF14 | ||
| 449 | |||
| 450 | static struct pata_platform_info bfin_pata_platform_data = { | ||
| 451 | .ioport_shift = 2, | ||
| 452 | .irq_type = IRQF_TRIGGER_HIGH | IRQF_DISABLED, | ||
| 453 | }; | ||
| 454 | |||
| 455 | static struct resource bfin_pata_resources[] = { | ||
| 456 | { | ||
| 457 | .start = 0x2030C000, | ||
| 458 | .end = 0x2030C01F, | ||
| 459 | .flags = IORESOURCE_MEM, | ||
| 460 | }, | ||
| 461 | { | ||
| 462 | .start = 0x2030D018, | ||
| 463 | .end = 0x2030D01B, | ||
| 464 | .flags = IORESOURCE_MEM, | ||
| 465 | }, | ||
| 466 | { | ||
| 467 | .start = PATA_INT, | ||
| 468 | .end = PATA_INT, | ||
| 469 | .flags = IORESOURCE_IRQ, | ||
| 470 | }, | ||
| 471 | }; | ||
| 472 | |||
| 473 | static struct platform_device bfin_pata_device = { | ||
| 474 | .name = "pata_platform", | ||
| 475 | .id = -1, | ||
| 476 | .num_resources = ARRAY_SIZE(bfin_pata_resources), | ||
| 477 | .resource = bfin_pata_resources, | ||
| 478 | .dev = { | ||
| 479 | .platform_data = &bfin_pata_platform_data, | ||
| 480 | } | ||
| 481 | }; | ||
| 482 | #endif | ||
| 483 | |||
| 484 | static const unsigned int cclk_vlev_datasheet[] = | ||
| 485 | { | ||
| 486 | VRPAIR(VLEV_085, 250000000), | ||
| 487 | VRPAIR(VLEV_090, 376000000), | ||
| 488 | VRPAIR(VLEV_095, 426000000), | ||
| 489 | VRPAIR(VLEV_100, 426000000), | ||
| 490 | VRPAIR(VLEV_105, 476000000), | ||
| 491 | VRPAIR(VLEV_110, 476000000), | ||
| 492 | VRPAIR(VLEV_115, 476000000), | ||
| 493 | VRPAIR(VLEV_120, 500000000), | ||
| 494 | VRPAIR(VLEV_125, 533000000), | ||
| 495 | VRPAIR(VLEV_130, 600000000), | ||
| 496 | }; | ||
| 497 | |||
| 498 | static struct bfin_dpmc_platform_data bfin_dmpc_vreg_data = { | ||
| 499 | .tuple_tab = cclk_vlev_datasheet, | ||
| 500 | .tabsize = ARRAY_SIZE(cclk_vlev_datasheet), | ||
| 501 | .vr_settling_time = 25 /* us */, | ||
| 502 | }; | ||
| 503 | |||
| 504 | static struct platform_device bfin_dpmc = { | ||
| 505 | .name = "bfin dpmc", | ||
| 506 | .dev = { | ||
| 507 | .platform_data = &bfin_dmpc_vreg_data, | ||
| 508 | }, | ||
| 509 | }; | ||
| 510 | |||
| 511 | static struct platform_device *cm_bf537_devices[] __initdata = { | ||
| 512 | |||
| 513 | &bfin_dpmc, | ||
| 514 | |||
| 515 | #if defined(CONFIG_FB_HITACHI_TX09) || defined(CONFIG_FB_HITACHI_TX09_MODULE) | ||
| 516 | &hitachi_fb_device, | ||
| 517 | #endif | ||
| 518 | |||
| 519 | #if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE) | ||
| 520 | &rtc_device, | ||
| 521 | #endif | ||
| 522 | |||
| 523 | #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) | ||
| 524 | &bfin_uart_device, | ||
| 525 | #endif | ||
| 526 | |||
| 527 | #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) | ||
| 528 | &bfin_sir_device, | ||
| 529 | #endif | ||
| 530 | |||
| 531 | #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) | ||
| 532 | &i2c_bfin_twi_device, | ||
| 533 | #endif | ||
| 534 | |||
| 535 | #if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE) | ||
| 536 | &bfin_sport0_uart_device, | ||
| 537 | &bfin_sport1_uart_device, | ||
| 538 | #endif | ||
| 539 | |||
| 540 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) | ||
| 541 | &isp1362_hcd_device, | ||
| 542 | #endif | ||
| 543 | |||
| 544 | #if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE) | ||
| 545 | &smc91x_device, | ||
| 546 | #endif | ||
| 547 | |||
| 548 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) | ||
| 549 | &bfin_mac_device, | ||
| 550 | #endif | ||
| 551 | |||
| 552 | #if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE) | ||
| 553 | &net2272_bfin_device, | ||
| 554 | #endif | ||
| 555 | |||
| 556 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | ||
| 557 | &bfin_spi0_device, | ||
| 558 | #endif | ||
| 559 | |||
| 560 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
| 561 | &bfin_pata_device, | ||
| 562 | #endif | ||
| 563 | |||
| 564 | #if defined(CONFIG_MTD_GPIO_ADDR) || defined(CONFIG_MTD_GPIO_ADDR_MODULE) | ||
| 565 | &cm_flash_device, | ||
| 566 | #endif | ||
| 567 | }; | ||
| 568 | |||
| 569 | static int __init cm_bf537_init(void) | ||
| 570 | { | ||
| 571 | printk(KERN_INFO "%s(): registering device resources\n", __func__); | ||
| 572 | platform_add_devices(cm_bf537_devices, ARRAY_SIZE(cm_bf537_devices)); | ||
| 573 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | ||
| 574 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); | ||
| 575 | #endif | ||
| 576 | |||
| 577 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
| 578 | irq_desc[PATA_INT].status |= IRQ_NOAUTOEN; | ||
| 579 | #endif | ||
| 580 | return 0; | ||
| 581 | } | ||
| 582 | |||
| 583 | arch_initcall(cm_bf537_init); | ||
| 584 | |||
| 585 | void bfin_get_ether_addr(char *addr) | ||
| 586 | { | ||
| 587 | random_ether_addr(addr); | ||
| 588 | printk(KERN_WARNING "%s:%s: Setting Ethernet MAC to a random one\n", __FILE__, __func__); | ||
| 589 | } | ||
| 590 | EXPORT_SYMBOL(bfin_get_ether_addr); | ||
diff --git a/arch/blackfin/mach-bf537/head.S b/arch/blackfin/mach-bf537/head.S index 6b019eaee0b6..12eb5cc571d0 100644 --- a/arch/blackfin/mach-bf537/head.S +++ b/arch/blackfin/mach-bf537/head.S | |||
| @@ -30,324 +30,10 @@ | |||
| 30 | #include <linux/linkage.h> | 30 | #include <linux/linkage.h> |
| 31 | #include <linux/init.h> | 31 | #include <linux/init.h> |
| 32 | #include <asm/blackfin.h> | 32 | #include <asm/blackfin.h> |
| 33 | #include <asm/trace.h> | ||
| 34 | |||
| 35 | #ifdef CONFIG_BFIN_KERNEL_CLOCK | ||
| 36 | #include <asm/mach-common/clocks.h> | ||
| 37 | #include <asm/mach/mem_init.h> | ||
| 38 | #endif | ||
| 39 | |||
| 40 | .extern ___bss_stop | ||
| 41 | .extern ___bss_start | ||
| 42 | .extern _bf53x_relocate_l1_mem | ||
| 43 | |||
| 44 | #define INITIAL_STACK 0xFFB01000 | ||
| 45 | |||
| 46 | __INIT | ||
| 47 | |||
| 48 | ENTRY(__start) | ||
| 49 | /* R0: argument of command line string, passed from uboot, save it */ | ||
| 50 | R7 = R0; | ||
| 51 | /* Enable Cycle Counter and Nesting Of Interrupts */ | ||
| 52 | #ifdef CONFIG_BFIN_SCRATCH_REG_CYCLES | ||
| 53 | R0 = SYSCFG_SNEN; | ||
| 54 | #else | ||
| 55 | R0 = SYSCFG_SNEN | SYSCFG_CCEN; | ||
| 56 | #endif | ||
| 57 | SYSCFG = R0; | ||
| 58 | R0 = 0; | ||
| 59 | |||
| 60 | /* Clear Out All the data and pointer Registers */ | ||
| 61 | R1 = R0; | ||
| 62 | R2 = R0; | ||
| 63 | R3 = R0; | ||
| 64 | R4 = R0; | ||
| 65 | R5 = R0; | ||
| 66 | R6 = R0; | ||
| 67 | |||
| 68 | P0 = R0; | ||
| 69 | P1 = R0; | ||
| 70 | P2 = R0; | ||
| 71 | P3 = R0; | ||
| 72 | P4 = R0; | ||
| 73 | P5 = R0; | ||
| 74 | |||
| 75 | LC0 = r0; | ||
| 76 | LC1 = r0; | ||
| 77 | L0 = r0; | ||
| 78 | L1 = r0; | ||
| 79 | L2 = r0; | ||
| 80 | L3 = r0; | ||
| 81 | |||
| 82 | /* Clear Out All the DAG Registers */ | ||
| 83 | B0 = r0; | ||
| 84 | B1 = r0; | ||
| 85 | B2 = r0; | ||
| 86 | B3 = r0; | ||
| 87 | |||
| 88 | I0 = r0; | ||
| 89 | I1 = r0; | ||
| 90 | I2 = r0; | ||
| 91 | I3 = r0; | ||
| 92 | |||
| 93 | M0 = r0; | ||
| 94 | M1 = r0; | ||
| 95 | M2 = r0; | ||
| 96 | M3 = r0; | ||
| 97 | |||
| 98 | trace_buffer_init(p0,r0); | ||
| 99 | P0 = R1; | ||
| 100 | R0 = R1; | ||
| 101 | |||
| 102 | /* Turn off the icache */ | ||
| 103 | p0.l = LO(IMEM_CONTROL); | ||
| 104 | p0.h = HI(IMEM_CONTROL); | ||
| 105 | R1 = [p0]; | ||
| 106 | R0 = ~ENICPLB; | ||
| 107 | R0 = R0 & R1; | ||
| 108 | |||
| 109 | /* Anomaly 05000125 */ | ||
| 110 | #if ANOMALY_05000125 | ||
| 111 | CLI R2; | ||
| 112 | SSYNC; | ||
| 113 | #endif | ||
| 114 | [p0] = R0; | ||
| 115 | SSYNC; | ||
| 116 | #if ANOMALY_05000125 | ||
| 117 | STI R2; | ||
| 118 | #endif | ||
| 119 | |||
| 120 | /* Turn off the dcache */ | ||
| 121 | p0.l = LO(DMEM_CONTROL); | ||
| 122 | p0.h = HI(DMEM_CONTROL); | ||
| 123 | R1 = [p0]; | ||
| 124 | R0 = ~ENDCPLB; | ||
| 125 | R0 = R0 & R1; | ||
| 126 | |||
| 127 | /* Anomaly 05000125 */ | ||
| 128 | #if ANOMALY_05000125 | ||
| 129 | CLI R2; | ||
| 130 | SSYNC; | ||
| 131 | #endif | ||
| 132 | [p0] = R0; | ||
| 133 | SSYNC; | ||
| 134 | #if ANOMALY_05000125 | ||
| 135 | STI R2; | ||
| 136 | #endif | ||
| 137 | |||
| 138 | /* Initialise General-Purpose I/O Modules on BF537 */ | ||
| 139 | /* Rev 0.0 Anomaly 05000212 - PORTx_FER, | ||
| 140 | * PORT_MUX Registers Do Not accept "writes" correctly: | ||
| 141 | */ | ||
| 142 | p0.h = hi(BFIN_PORT_MUX); | ||
| 143 | p0.l = lo(BFIN_PORT_MUX); | ||
| 144 | #if ANOMALY_05000212 | ||
| 145 | R0.L = W[P0]; /* Read */ | ||
| 146 | SSYNC; | ||
| 147 | #endif | ||
| 148 | R0 = (PGDE_UART | PFTE_UART)(Z); | ||
| 149 | #if ANOMALY_05000212 | ||
| 150 | W[P0] = R0.L; /* Write */ | ||
| 151 | SSYNC; | ||
| 152 | #endif | ||
| 153 | W[P0] = R0.L; /* Enable both UARTS */ | ||
| 154 | SSYNC; | ||
| 155 | |||
| 156 | p0.h = hi(PORTF_FER); | ||
| 157 | p0.l = lo(PORTF_FER); | ||
| 158 | #if ANOMALY_05000212 | ||
| 159 | R0.L = W[P0]; /* Read */ | ||
| 160 | SSYNC; | ||
| 161 | #endif | ||
| 162 | R0 = 0x000F(Z); | ||
| 163 | #if ANOMALY_05000212 | ||
| 164 | W[P0] = R0.L; /* Write */ | ||
| 165 | SSYNC; | ||
| 166 | #endif | ||
| 167 | /* Enable peripheral function of PORTF for UART0 and UART1 */ | ||
| 168 | W[P0] = R0.L; | ||
| 169 | SSYNC; | ||
| 170 | |||
| 171 | #if !defined(CONFIG_BF534) | ||
| 172 | p0.h = hi(EMAC_SYSTAT); | ||
| 173 | p0.l = lo(EMAC_SYSTAT); | ||
| 174 | R0.h = 0xFFFF; /* Clear EMAC Interrupt Status bits */ | ||
| 175 | R0.l = 0xFFFF; | ||
| 176 | [P0] = R0; | ||
| 177 | SSYNC; | ||
| 178 | #endif | ||
| 179 | |||
| 180 | /* Initialise UART - when booting from u-boot, the UART is not disabled | ||
| 181 | * so if we dont initalize here, our serial console gets hosed */ | ||
| 182 | p0.h = hi(BFIN_UART_LCR); | ||
| 183 | p0.l = lo(BFIN_UART_LCR); | ||
| 184 | r0 = 0x0(Z); | ||
| 185 | w[p0] = r0.L; /* To enable DLL writes */ | ||
| 186 | ssync; | ||
| 187 | |||
| 188 | p0.h = hi(BFIN_UART_DLL); | ||
| 189 | p0.l = lo(BFIN_UART_DLL); | ||
| 190 | r0 = 0x0(Z); | ||
| 191 | w[p0] = r0.L; | ||
| 192 | ssync; | ||
| 193 | |||
| 194 | p0.h = hi(BFIN_UART_DLH); | ||
| 195 | p0.l = lo(BFIN_UART_DLH); | ||
| 196 | r0 = 0x00(Z); | ||
| 197 | w[p0] = r0.L; | ||
| 198 | ssync; | ||
| 199 | |||
| 200 | p0.h = hi(BFIN_UART_GCTL); | ||
| 201 | p0.l = lo(BFIN_UART_GCTL); | ||
| 202 | r0 = 0x0(Z); | ||
| 203 | w[p0] = r0.L; /* To enable UART clock */ | ||
| 204 | ssync; | ||
| 205 | |||
| 206 | /* Initialize stack pointer */ | ||
| 207 | sp.l = lo(INITIAL_STACK); | ||
| 208 | sp.h = hi(INITIAL_STACK); | ||
| 209 | fp = sp; | ||
| 210 | usp = sp; | ||
| 211 | |||
| 212 | #ifdef CONFIG_EARLY_PRINTK | ||
| 213 | SP += -12; | ||
| 214 | call _init_early_exception_vectors; | ||
| 215 | SP += 12; | ||
| 216 | #endif | ||
| 217 | |||
| 218 | /* Put The Code for PLL Programming and SDRAM Programming in L1 ISRAM */ | ||
| 219 | call _bf53x_relocate_l1_mem; | ||
| 220 | #ifdef CONFIG_BFIN_KERNEL_CLOCK | 33 | #ifdef CONFIG_BFIN_KERNEL_CLOCK |
| 221 | call _start_dma_code; | 34 | #include <asm/clocks.h> |
| 222 | #endif | 35 | #include <mach/mem_init.h> |
| 223 | |||
| 224 | /* Code for initializing Async memory banks */ | ||
| 225 | |||
| 226 | p2.h = hi(EBIU_AMBCTL1); | ||
| 227 | p2.l = lo(EBIU_AMBCTL1); | ||
| 228 | r0.h = hi(AMBCTL1VAL); | ||
| 229 | r0.l = lo(AMBCTL1VAL); | ||
| 230 | [p2] = r0; | ||
| 231 | ssync; | ||
| 232 | |||
| 233 | p2.h = hi(EBIU_AMBCTL0); | ||
| 234 | p2.l = lo(EBIU_AMBCTL0); | ||
| 235 | r0.h = hi(AMBCTL0VAL); | ||
| 236 | r0.l = lo(AMBCTL0VAL); | ||
| 237 | [p2] = r0; | ||
| 238 | ssync; | ||
| 239 | |||
| 240 | p2.h = hi(EBIU_AMGCTL); | ||
| 241 | p2.l = lo(EBIU_AMGCTL); | ||
| 242 | r0 = AMGCTLVAL; | ||
| 243 | w[p2] = r0; | ||
| 244 | ssync; | ||
| 245 | |||
| 246 | /* This section keeps the processor in supervisor mode | ||
| 247 | * during kernel boot. Switches to user mode at end of boot. | ||
| 248 | * See page 3-9 of Hardware Reference manual for documentation. | ||
| 249 | */ | ||
| 250 | |||
| 251 | /* EVT15 = _real_start */ | ||
| 252 | |||
| 253 | p0.l = lo(EVT15); | ||
| 254 | p0.h = hi(EVT15); | ||
| 255 | p1.l = _real_start; | ||
| 256 | p1.h = _real_start; | ||
| 257 | [p0] = p1; | ||
| 258 | csync; | ||
| 259 | |||
| 260 | p0.l = lo(IMASK); | ||
| 261 | p0.h = hi(IMASK); | ||
| 262 | p1.l = IMASK_IVG15; | ||
| 263 | p1.h = 0x0; | ||
| 264 | [p0] = p1; | ||
| 265 | csync; | ||
| 266 | |||
| 267 | raise 15; | ||
| 268 | p0.l = .LWAIT_HERE; | ||
| 269 | p0.h = .LWAIT_HERE; | ||
| 270 | reti = p0; | ||
| 271 | #if ANOMALY_05000281 | ||
| 272 | nop; nop; nop; | ||
| 273 | #endif | 36 | #endif |
| 274 | rti; | ||
| 275 | |||
| 276 | .LWAIT_HERE: | ||
| 277 | jump .LWAIT_HERE; | ||
| 278 | ENDPROC(__start) | ||
| 279 | |||
| 280 | ENTRY(_real_start) | ||
| 281 | [ -- sp ] = reti; | ||
| 282 | p0.l = lo(WDOG_CTL); | ||
| 283 | p0.h = hi(WDOG_CTL); | ||
| 284 | r0 = 0xAD6(z); | ||
| 285 | w[p0] = r0; /* watchdog off for now */ | ||
| 286 | ssync; | ||
| 287 | |||
| 288 | /* Code update for BSS size == 0 | ||
| 289 | * Zero out the bss region. | ||
| 290 | */ | ||
| 291 | |||
| 292 | p1.l = ___bss_start; | ||
| 293 | p1.h = ___bss_start; | ||
| 294 | p2.l = ___bss_stop; | ||
| 295 | p2.h = ___bss_stop; | ||
| 296 | r0 = 0; | ||
| 297 | p2 -= p1; | ||
| 298 | lsetup (.L_clear_bss, .L_clear_bss) lc0 = p2; | ||
| 299 | .L_clear_bss: | ||
| 300 | B[p1++] = r0; | ||
| 301 | |||
| 302 | /* In case there is a NULL pointer reference | ||
| 303 | * Zero out region before stext | ||
| 304 | */ | ||
| 305 | |||
| 306 | p1.l = 0x0; | ||
| 307 | p1.h = 0x0; | ||
| 308 | r0.l = __stext; | ||
| 309 | r0.h = __stext; | ||
| 310 | r0 = r0 >> 1; | ||
| 311 | p2 = r0; | ||
| 312 | r0 = 0; | ||
| 313 | lsetup (.L_clear_zero, .L_clear_zero) lc0 = p2; | ||
| 314 | .L_clear_zero: | ||
| 315 | W[p1++] = r0; | ||
| 316 | |||
| 317 | /* pass the uboot arguments to the global value command line */ | ||
| 318 | R0 = R7; | ||
| 319 | call _cmdline_init; | ||
| 320 | |||
| 321 | p1.l = __rambase; | ||
| 322 | p1.h = __rambase; | ||
| 323 | r0.l = __sdata; | ||
| 324 | r0.h = __sdata; | ||
| 325 | [p1] = r0; | ||
| 326 | |||
| 327 | p1.l = __ramstart; | ||
| 328 | p1.h = __ramstart; | ||
| 329 | p3.l = ___bss_stop; | ||
| 330 | p3.h = ___bss_stop; | ||
| 331 | |||
| 332 | r1 = p3; | ||
| 333 | [p1] = r1; | ||
| 334 | |||
| 335 | /* | ||
| 336 | * load the current thread pointer and stack | ||
| 337 | */ | ||
| 338 | r1.l = _init_thread_union; | ||
| 339 | r1.h = _init_thread_union; | ||
| 340 | |||
| 341 | r2.l = 0x2000; | ||
| 342 | r2.h = 0x0000; | ||
| 343 | r1 = r1 + r2; | ||
| 344 | sp = r1; | ||
| 345 | usp = sp; | ||
| 346 | fp = sp; | ||
| 347 | jump.l _start_kernel; | ||
| 348 | ENDPROC(_real_start) | ||
| 349 | |||
| 350 | __FINIT | ||
| 351 | 37 | ||
| 352 | .section .l1.text | 38 | .section .l1.text |
| 353 | #ifdef CONFIG_BFIN_KERNEL_CLOCK | 39 | #ifdef CONFIG_BFIN_KERNEL_CLOCK |
| @@ -452,13 +138,6 @@ ENTRY(_start_dma_code) | |||
| 452 | [P2] = R1; | 138 | [P2] = R1; |
| 453 | SSYNC; | 139 | SSYNC; |
| 454 | 140 | ||
| 455 | p0.h = hi(SIC_IWR); | ||
| 456 | p0.l = lo(SIC_IWR); | ||
| 457 | r0.l = lo(IWR_ENABLE_ALL); | ||
| 458 | r0.h = hi(IWR_ENABLE_ALL); | ||
| 459 | [p0] = r0; | ||
| 460 | SSYNC; | ||
| 461 | |||
| 462 | RTS; | 141 | RTS; |
| 463 | ENDPROC(_start_dma_code) | 142 | ENDPROC(_start_dma_code) |
| 464 | #endif /* CONFIG_BFIN_KERNEL_CLOCK */ | 143 | #endif /* CONFIG_BFIN_KERNEL_CLOCK */ |
diff --git a/include/asm-blackfin/mach-bf537/anomaly.h b/arch/blackfin/mach-bf537/include/mach/anomaly.h index 8460ab9c324f..8460ab9c324f 100644 --- a/include/asm-blackfin/mach-bf537/anomaly.h +++ b/arch/blackfin/mach-bf537/include/mach/anomaly.h | |||
diff --git a/include/asm-blackfin/mach-bf537/bf537.h b/arch/blackfin/mach-bf537/include/mach/bf537.h index cfe2a221112e..cfe2a221112e 100644 --- a/include/asm-blackfin/mach-bf537/bf537.h +++ b/arch/blackfin/mach-bf537/include/mach/bf537.h | |||
diff --git a/include/asm-blackfin/mach-bf537/bfin_serial_5xx.h b/arch/blackfin/mach-bf537/include/mach/bfin_serial_5xx.h index 1bf56ffa22f9..1bf56ffa22f9 100644 --- a/include/asm-blackfin/mach-bf537/bfin_serial_5xx.h +++ b/arch/blackfin/mach-bf537/include/mach/bfin_serial_5xx.h | |||
diff --git a/include/asm-blackfin/mach-bf537/bfin_sir.h b/arch/blackfin/mach-bf537/include/mach/bfin_sir.h index cfd8ad4f1f2c..cfd8ad4f1f2c 100644 --- a/include/asm-blackfin/mach-bf537/bfin_sir.h +++ b/arch/blackfin/mach-bf537/include/mach/bfin_sir.h | |||
diff --git a/include/asm-blackfin/mach-bf537/blackfin.h b/arch/blackfin/mach-bf537/include/mach/blackfin.h index cffc786b2a2b..cffc786b2a2b 100644 --- a/include/asm-blackfin/mach-bf537/blackfin.h +++ b/arch/blackfin/mach-bf537/include/mach/blackfin.h | |||
diff --git a/include/asm-blackfin/mach-bf537/cdefBF534.h b/arch/blackfin/mach-bf537/include/mach/cdefBF534.h index 82de526f8097..88d491cd9f36 100644 --- a/include/asm-blackfin/mach-bf537/cdefBF534.h +++ b/arch/blackfin/mach-bf537/include/mach/cdefBF534.h | |||
| @@ -38,7 +38,7 @@ | |||
| 38 | #include "defBF534.h" | 38 | #include "defBF534.h" |
| 39 | 39 | ||
| 40 | /* Include core specific register pointer definitions */ | 40 | /* Include core specific register pointer definitions */ |
| 41 | #include <asm/mach-common/cdef_LPBlackfin.h> | 41 | #include <asm/cdef_LPBlackfin.h> |
| 42 | 42 | ||
| 43 | #include <asm/system.h> | 43 | #include <asm/system.h> |
| 44 | 44 | ||
diff --git a/include/asm-blackfin/mach-bf537/cdefBF537.h b/arch/blackfin/mach-bf537/include/mach/cdefBF537.h index b8fc949a991f..b8fc949a991f 100644 --- a/include/asm-blackfin/mach-bf537/cdefBF537.h +++ b/arch/blackfin/mach-bf537/include/mach/cdefBF537.h | |||
diff --git a/include/asm-blackfin/mach-bf537/defBF534.h b/arch/blackfin/mach-bf537/include/mach/defBF534.h index d0d80d3152ba..a3227f9003ff 100644 --- a/include/asm-blackfin/mach-bf537/defBF534.h +++ b/arch/blackfin/mach-bf537/include/mach/defBF534.h | |||
| @@ -32,7 +32,7 @@ | |||
| 32 | #define _DEF_BF534_H | 32 | #define _DEF_BF534_H |
| 33 | 33 | ||
| 34 | /* Include all Core registers and bit definitions */ | 34 | /* Include all Core registers and bit definitions */ |
| 35 | #include <asm/mach-common/def_LPBlackfin.h> | 35 | #include <asm/def_LPBlackfin.h> |
| 36 | 36 | ||
| 37 | /************************************************************************************ | 37 | /************************************************************************************ |
| 38 | ** System MMR Register Map | 38 | ** System MMR Register Map |
diff --git a/include/asm-blackfin/mach-bf537/defBF537.h b/arch/blackfin/mach-bf537/include/mach/defBF537.h index abde24c6d3b1..3d6c83e31b1e 100644 --- a/include/asm-blackfin/mach-bf537/defBF537.h +++ b/arch/blackfin/mach-bf537/include/mach/defBF537.h | |||
| @@ -33,7 +33,7 @@ | |||
| 33 | #define _DEF_BF537_H | 33 | #define _DEF_BF537_H |
| 34 | 34 | ||
| 35 | /* Include all Core registers and bit definitions*/ | 35 | /* Include all Core registers and bit definitions*/ |
| 36 | #include <asm/mach-common/cdef_LPBlackfin.h> | 36 | #include <asm/cdef_LPBlackfin.h> |
| 37 | 37 | ||
| 38 | /* Include all MMR and bit defines common to BF534 */ | 38 | /* Include all MMR and bit defines common to BF534 */ |
| 39 | #include "defBF534.h" | 39 | #include "defBF534.h" |
diff --git a/include/asm-blackfin/mach-bf537/dma.h b/arch/blackfin/mach-bf537/include/mach/dma.h index 7a964040870a..7a964040870a 100644 --- a/include/asm-blackfin/mach-bf537/dma.h +++ b/arch/blackfin/mach-bf537/include/mach/dma.h | |||
diff --git a/include/asm-blackfin/mach-bf537/irq.h b/arch/blackfin/mach-bf537/include/mach/irq.h index 2e68a8a1e730..2e68a8a1e730 100644 --- a/include/asm-blackfin/mach-bf537/irq.h +++ b/arch/blackfin/mach-bf537/include/mach/irq.h | |||
diff --git a/include/asm-blackfin/mach-bf537/mem_init.h b/arch/blackfin/mach-bf537/include/mach/mem_init.h index f67698f670ca..f67698f670ca 100644 --- a/include/asm-blackfin/mach-bf537/mem_init.h +++ b/arch/blackfin/mach-bf537/include/mach/mem_init.h | |||
diff --git a/include/asm-blackfin/mach-bf537/mem_map.h b/arch/blackfin/mach-bf537/include/mach/mem_map.h index 5c6726d6f3b1..5078b669431f 100644 --- a/include/asm-blackfin/mach-bf537/mem_map.h +++ b/arch/blackfin/mach-bf537/include/mach/mem_map.h | |||
| @@ -166,6 +166,11 @@ | |||
| 166 | 166 | ||
| 167 | #endif | 167 | #endif |
| 168 | 168 | ||
| 169 | /* Level 2 Memory - none */ | ||
| 170 | |||
| 171 | #define L2_START 0 | ||
| 172 | #define L2_LENGTH 0 | ||
| 173 | |||
| 169 | /* Scratch Pad Memory */ | 174 | /* Scratch Pad Memory */ |
| 170 | 175 | ||
| 171 | #define L1_SCRATCH_START 0xFFB00000 | 176 | #define L1_SCRATCH_START 0xFFB00000 |
diff --git a/include/asm-blackfin/mach-bf537/portmux.h b/arch/blackfin/mach-bf537/include/mach/portmux.h index 78fee6e0f237..78fee6e0f237 100644 --- a/include/asm-blackfin/mach-bf537/portmux.h +++ b/arch/blackfin/mach-bf537/include/mach/portmux.h | |||
diff --git a/arch/blackfin/mach-bf537/ints-priority.c b/arch/blackfin/mach-bf537/ints-priority.c index a8b915f202ec..b1300b3f1812 100644 --- a/arch/blackfin/mach-bf537/ints-priority.c +++ b/arch/blackfin/mach-bf537/ints-priority.c | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | #include <linux/irq.h> | 31 | #include <linux/irq.h> |
| 32 | #include <asm/blackfin.h> | 32 | #include <asm/blackfin.h> |
| 33 | 33 | ||
| 34 | void program_IAR(void) | 34 | void __init program_IAR(void) |
| 35 | { | 35 | { |
| 36 | /* Program the IAR0 Register with the configured priority */ | 36 | /* Program the IAR0 Register with the configured priority */ |
| 37 | bfin_write_SIC_IAR0(((CONFIG_IRQ_PLL_WAKEUP - 7) << IRQ_PLL_WAKEUP_POS) | | 37 | bfin_write_SIC_IAR0(((CONFIG_IRQ_PLL_WAKEUP - 7) << IRQ_PLL_WAKEUP_POS) | |
diff --git a/arch/blackfin/mach-bf548/boards/cm_bf548.c b/arch/blackfin/mach-bf548/boards/cm_bf548.c index 4f4ae8787edf..ce934ee174e0 100644 --- a/arch/blackfin/mach-bf548/boards/cm_bf548.c +++ b/arch/blackfin/mach-bf548/boards/cm_bf548.c | |||
| @@ -45,7 +45,7 @@ | |||
| 45 | #include <asm/gpio.h> | 45 | #include <asm/gpio.h> |
| 46 | #include <asm/nand.h> | 46 | #include <asm/nand.h> |
| 47 | #include <asm/portmux.h> | 47 | #include <asm/portmux.h> |
| 48 | #include <asm/mach/bf54x_keys.h> | 48 | #include <mach/bf54x_keys.h> |
| 49 | #include <asm/dpmc.h> | 49 | #include <asm/dpmc.h> |
| 50 | #include <linux/input.h> | 50 | #include <linux/input.h> |
| 51 | #include <linux/spi/ad7877.h> | 51 | #include <linux/spi/ad7877.h> |
| @@ -61,7 +61,7 @@ const char bfin_board_name[] = "Bluetechnix CM-BF548"; | |||
| 61 | 61 | ||
| 62 | #if defined(CONFIG_FB_BF54X_LQ043) || defined(CONFIG_FB_BF54X_LQ043_MODULE) | 62 | #if defined(CONFIG_FB_BF54X_LQ043) || defined(CONFIG_FB_BF54X_LQ043_MODULE) |
| 63 | 63 | ||
| 64 | #include <asm/mach/bf54x-lq043.h> | 64 | #include <mach/bf54x-lq043.h> |
| 65 | 65 | ||
| 66 | static struct bfin_bf54xfb_mach_info bf54x_lq043_data = { | 66 | static struct bfin_bf54xfb_mach_info bf54x_lq043_data = { |
| 67 | .width = 480, | 67 | .width = 480, |
| @@ -319,12 +319,12 @@ static struct platform_device bfin_atapi_device = { | |||
| 319 | #if defined(CONFIG_MTD_NAND_BF5XX) || defined(CONFIG_MTD_NAND_BF5XX_MODULE) | 319 | #if defined(CONFIG_MTD_NAND_BF5XX) || defined(CONFIG_MTD_NAND_BF5XX_MODULE) |
| 320 | static struct mtd_partition partition_info[] = { | 320 | static struct mtd_partition partition_info[] = { |
| 321 | { | 321 | { |
| 322 | .name = "Linux Kernel", | 322 | .name = "linux kernel(nand)", |
| 323 | .offset = 0, | 323 | .offset = 0, |
| 324 | .size = 4 * SIZE_1M, | 324 | .size = 4 * SIZE_1M, |
| 325 | }, | 325 | }, |
| 326 | { | 326 | { |
| 327 | .name = "File System", | 327 | .name = "file system(nand)", |
| 328 | .offset = 4 * SIZE_1M, | 328 | .offset = 4 * SIZE_1M, |
| 329 | .size = (256 - 4) * SIZE_1M, | 329 | .size = (256 - 4) * SIZE_1M, |
| 330 | }, | 330 | }, |
| @@ -377,12 +377,12 @@ static struct platform_device bf54x_sdh_device = { | |||
| 377 | /* SPI flash chip (m25p16) */ | 377 | /* SPI flash chip (m25p16) */ |
| 378 | static struct mtd_partition bfin_spi_flash_partitions[] = { | 378 | static struct mtd_partition bfin_spi_flash_partitions[] = { |
| 379 | { | 379 | { |
| 380 | .name = "bootloader", | 380 | .name = "bootloader(spi)", |
| 381 | .size = 0x00040000, | 381 | .size = 0x00040000, |
| 382 | .offset = 0, | 382 | .offset = 0, |
| 383 | .mask_flags = MTD_CAP_ROM | 383 | .mask_flags = MTD_CAP_ROM |
| 384 | }, { | 384 | }, { |
| 385 | .name = "linux kernel", | 385 | .name = "linux kernel(spi)", |
| 386 | .size = 0x1c0000, | 386 | .size = 0x1c0000, |
| 387 | .offset = 0x40000 | 387 | .offset = 0x40000 |
| 388 | } | 388 | } |
diff --git a/arch/blackfin/mach-bf548/boards/ezkit.c b/arch/blackfin/mach-bf548/boards/ezkit.c index 166fa2201ee7..39357693046d 100644 --- a/arch/blackfin/mach-bf548/boards/ezkit.c +++ b/arch/blackfin/mach-bf548/boards/ezkit.c | |||
| @@ -48,7 +48,7 @@ | |||
| 48 | #include <asm/nand.h> | 48 | #include <asm/nand.h> |
| 49 | #include <asm/dpmc.h> | 49 | #include <asm/dpmc.h> |
| 50 | #include <asm/portmux.h> | 50 | #include <asm/portmux.h> |
| 51 | #include <asm/mach/bf54x_keys.h> | 51 | #include <mach/bf54x_keys.h> |
| 52 | #include <linux/input.h> | 52 | #include <linux/input.h> |
| 53 | #include <linux/spi/ad7877.h> | 53 | #include <linux/spi/ad7877.h> |
| 54 | 54 | ||
| @@ -106,7 +106,7 @@ arch_initcall(bfin_isp1761_init); | |||
| 106 | 106 | ||
| 107 | #if defined(CONFIG_FB_BF54X_LQ043) || defined(CONFIG_FB_BF54X_LQ043_MODULE) | 107 | #if defined(CONFIG_FB_BF54X_LQ043) || defined(CONFIG_FB_BF54X_LQ043_MODULE) |
| 108 | 108 | ||
| 109 | #include <asm/mach/bf54x-lq043.h> | 109 | #include <mach/bf54x-lq043.h> |
| 110 | 110 | ||
| 111 | static struct bfin_bf54xfb_mach_info bf54x_lq043_data = { | 111 | static struct bfin_bf54xfb_mach_info bf54x_lq043_data = { |
| 112 | .width = 480, | 112 | .width = 480, |
| @@ -365,12 +365,12 @@ static struct platform_device bfin_atapi_device = { | |||
| 365 | #if defined(CONFIG_MTD_NAND_BF5XX) || defined(CONFIG_MTD_NAND_BF5XX_MODULE) | 365 | #if defined(CONFIG_MTD_NAND_BF5XX) || defined(CONFIG_MTD_NAND_BF5XX_MODULE) |
| 366 | static struct mtd_partition partition_info[] = { | 366 | static struct mtd_partition partition_info[] = { |
| 367 | { | 367 | { |
| 368 | .name = "Linux Kernel", | 368 | .name = "linux kernel(nand)", |
| 369 | .offset = 0, | 369 | .offset = 0, |
| 370 | .size = 4 * SIZE_1M, | 370 | .size = 4 * SIZE_1M, |
| 371 | }, | 371 | }, |
| 372 | { | 372 | { |
| 373 | .name = "File System", | 373 | .name = "file system(nand)", |
| 374 | .offset = MTDPART_OFS_APPEND, | 374 | .offset = MTDPART_OFS_APPEND, |
| 375 | .size = MTDPART_SIZ_FULL, | 375 | .size = MTDPART_SIZ_FULL, |
| 376 | }, | 376 | }, |
| @@ -419,15 +419,15 @@ static struct platform_device bf54x_sdh_device = { | |||
| 419 | #if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE) | 419 | #if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE) |
| 420 | static struct mtd_partition ezkit_partitions[] = { | 420 | static struct mtd_partition ezkit_partitions[] = { |
| 421 | { | 421 | { |
| 422 | .name = "Bootloader", | 422 | .name = "bootloader(nor)", |
| 423 | .size = 0x40000, | 423 | .size = 0x40000, |
| 424 | .offset = 0, | 424 | .offset = 0, |
| 425 | }, { | 425 | }, { |
| 426 | .name = "Kernel", | 426 | .name = "linux kernel(nor)", |
| 427 | .size = 0x1C0000, | 427 | .size = 0x1C0000, |
| 428 | .offset = MTDPART_OFS_APPEND, | 428 | .offset = MTDPART_OFS_APPEND, |
| 429 | }, { | 429 | }, { |
| 430 | .name = "RootFS", | 430 | .name = "file system(nor)", |
| 431 | .size = MTDPART_SIZ_FULL, | 431 | .size = MTDPART_SIZ_FULL, |
| 432 | .offset = MTDPART_OFS_APPEND, | 432 | .offset = MTDPART_OFS_APPEND, |
| 433 | } | 433 | } |
| @@ -461,12 +461,12 @@ static struct platform_device ezkit_flash_device = { | |||
| 461 | /* SPI flash chip (m25p16) */ | 461 | /* SPI flash chip (m25p16) */ |
| 462 | static struct mtd_partition bfin_spi_flash_partitions[] = { | 462 | static struct mtd_partition bfin_spi_flash_partitions[] = { |
| 463 | { | 463 | { |
| 464 | .name = "bootloader", | 464 | .name = "bootloader(spi)", |
| 465 | .size = 0x00040000, | 465 | .size = 0x00040000, |
| 466 | .offset = 0, | 466 | .offset = 0, |
| 467 | .mask_flags = MTD_CAP_ROM | 467 | .mask_flags = MTD_CAP_ROM |
| 468 | }, { | 468 | }, { |
| 469 | .name = "linux kernel", | 469 | .name = "linux kernel(spi)", |
| 470 | .size = MTDPART_SIZ_FULL, | 470 | .size = MTDPART_SIZ_FULL, |
| 471 | .offset = MTDPART_OFS_APPEND, | 471 | .offset = MTDPART_OFS_APPEND, |
| 472 | } | 472 | } |
diff --git a/arch/blackfin/mach-bf548/head.S b/arch/blackfin/mach-bf548/head.S index 06b9178cfcfe..4d5cfeacb123 100644 --- a/arch/blackfin/mach-bf548/head.S +++ b/arch/blackfin/mach-bf548/head.S | |||
| @@ -30,263 +30,11 @@ | |||
| 30 | #include <linux/linkage.h> | 30 | #include <linux/linkage.h> |
| 31 | #include <linux/init.h> | 31 | #include <linux/init.h> |
| 32 | #include <asm/blackfin.h> | 32 | #include <asm/blackfin.h> |
| 33 | #include <asm/trace.h> | ||
| 34 | #ifdef CONFIG_BFIN_KERNEL_CLOCK | 33 | #ifdef CONFIG_BFIN_KERNEL_CLOCK |
| 35 | #include <asm/mach-common/clocks.h> | 34 | #include <asm/clocks.h> |
| 36 | #include <asm/mach/mem_init.h> | 35 | #include <mach/mem_init.h> |
| 37 | #endif | 36 | #endif |
| 38 | 37 | ||
| 39 | .extern ___bss_stop | ||
| 40 | .extern ___bss_start | ||
| 41 | .extern _bf53x_relocate_l1_mem | ||
| 42 | |||
| 43 | #define INITIAL_STACK 0xFFB01000 | ||
| 44 | |||
| 45 | __INIT | ||
| 46 | |||
| 47 | ENTRY(__start) | ||
| 48 | /* R0: argument of command line string, passed from uboot, save it */ | ||
| 49 | R7 = R0; | ||
| 50 | /* Enable Cycle Counter and Nesting Of Interrupts */ | ||
| 51 | #ifdef CONFIG_BFIN_SCRATCH_REG_CYCLES | ||
| 52 | R0 = SYSCFG_SNEN; | ||
| 53 | #else | ||
| 54 | R0 = SYSCFG_SNEN | SYSCFG_CCEN; | ||
| 55 | #endif | ||
| 56 | SYSCFG = R0; | ||
| 57 | R0 = 0; | ||
| 58 | |||
| 59 | /* Clear Out All the data and pointer Registers*/ | ||
| 60 | R1 = R0; | ||
| 61 | R2 = R0; | ||
| 62 | R3 = R0; | ||
| 63 | R4 = R0; | ||
| 64 | R5 = R0; | ||
| 65 | R6 = R0; | ||
| 66 | |||
| 67 | P0 = R0; | ||
| 68 | P1 = R0; | ||
| 69 | P2 = R0; | ||
| 70 | P3 = R0; | ||
| 71 | P4 = R0; | ||
| 72 | P5 = R0; | ||
| 73 | |||
| 74 | LC0 = r0; | ||
| 75 | LC1 = r0; | ||
| 76 | L0 = r0; | ||
| 77 | L1 = r0; | ||
| 78 | L2 = r0; | ||
| 79 | L3 = r0; | ||
| 80 | |||
| 81 | /* Clear Out All the DAG Registers*/ | ||
| 82 | B0 = r0; | ||
| 83 | B1 = r0; | ||
| 84 | B2 = r0; | ||
| 85 | B3 = r0; | ||
| 86 | |||
| 87 | I0 = r0; | ||
| 88 | I1 = r0; | ||
| 89 | I2 = r0; | ||
| 90 | I3 = r0; | ||
| 91 | |||
| 92 | M0 = r0; | ||
| 93 | M1 = r0; | ||
| 94 | M2 = r0; | ||
| 95 | M3 = r0; | ||
| 96 | |||
| 97 | trace_buffer_init(p0,r0); | ||
| 98 | P0 = R1; | ||
| 99 | R0 = R1; | ||
| 100 | |||
| 101 | /* Turn off the icache */ | ||
| 102 | p0.l = LO(IMEM_CONTROL); | ||
| 103 | p0.h = HI(IMEM_CONTROL); | ||
| 104 | R1 = [p0]; | ||
| 105 | R0 = ~ENICPLB; | ||
| 106 | R0 = R0 & R1; | ||
| 107 | [p0] = R0; | ||
| 108 | SSYNC; | ||
| 109 | |||
| 110 | /* Turn off the dcache */ | ||
| 111 | p0.l = LO(DMEM_CONTROL); | ||
| 112 | p0.h = HI(DMEM_CONTROL); | ||
| 113 | R1 = [p0]; | ||
| 114 | R0 = ~ENDCPLB; | ||
| 115 | R0 = R0 & R1; | ||
| 116 | [p0] = R0; | ||
| 117 | SSYNC; | ||
| 118 | |||
| 119 | /* Initialize stack pointer */ | ||
| 120 | SP.L = LO(INITIAL_STACK); | ||
| 121 | SP.H = HI(INITIAL_STACK); | ||
| 122 | FP = SP; | ||
| 123 | USP = SP; | ||
| 124 | |||
| 125 | #ifdef CONFIG_EARLY_PRINTK | ||
| 126 | SP += -12; | ||
| 127 | call _init_early_exception_vectors; | ||
| 128 | SP += 12; | ||
| 129 | #endif | ||
| 130 | |||
| 131 | /* Put The Code for PLL Programming and SDRAM Programming in L1 ISRAM */ | ||
| 132 | call _bf53x_relocate_l1_mem; | ||
| 133 | #ifdef CONFIG_BFIN_KERNEL_CLOCK | ||
| 134 | call _start_dma_code; | ||
| 135 | #endif | ||
| 136 | /* Code for initializing Async memory banks */ | ||
| 137 | |||
| 138 | p2.h = hi(EBIU_AMBCTL1); | ||
| 139 | p2.l = lo(EBIU_AMBCTL1); | ||
| 140 | r0.h = hi(AMBCTL1VAL); | ||
| 141 | r0.l = lo(AMBCTL1VAL); | ||
| 142 | [p2] = r0; | ||
| 143 | ssync; | ||
| 144 | |||
| 145 | p2.h = hi(EBIU_AMBCTL0); | ||
| 146 | p2.l = lo(EBIU_AMBCTL0); | ||
| 147 | r0.h = hi(AMBCTL0VAL); | ||
| 148 | r0.l = lo(AMBCTL0VAL); | ||
| 149 | [p2] = r0; | ||
| 150 | ssync; | ||
| 151 | |||
| 152 | p2.h = hi(EBIU_AMGCTL); | ||
| 153 | p2.l = lo(EBIU_AMGCTL); | ||
| 154 | r0 = AMGCTLVAL; | ||
| 155 | w[p2] = r0; | ||
| 156 | ssync; | ||
| 157 | |||
| 158 | p2.h = hi(EBIU_MBSCTL); | ||
| 159 | p2.l = lo(EBIU_MBSCTL); | ||
| 160 | r0.h = hi(CONFIG_EBIU_MBSCTLVAL); | ||
| 161 | r0.l = lo(CONFIG_EBIU_MBSCTLVAL); | ||
| 162 | [p2] = r0; | ||
| 163 | ssync; | ||
| 164 | |||
| 165 | p2.h = hi(EBIU_MODE); | ||
| 166 | p2.l = lo(EBIU_MODE); | ||
| 167 | r0.h = hi(CONFIG_EBIU_MODEVAL); | ||
| 168 | r0.l = lo(CONFIG_EBIU_MODEVAL); | ||
| 169 | [p2] = r0; | ||
| 170 | ssync; | ||
| 171 | |||
| 172 | p2.h = hi(EBIU_FCTL); | ||
| 173 | p2.l = lo(EBIU_FCTL); | ||
| 174 | r0.h = hi(CONFIG_EBIU_FCTLVAL); | ||
| 175 | r0.l = lo(CONFIG_EBIU_FCTLVAL); | ||
| 176 | [p2] = r0; | ||
| 177 | ssync; | ||
| 178 | |||
| 179 | /* This section keeps the processor in supervisor mode | ||
| 180 | * during kernel boot. Switches to user mode at end of boot. | ||
| 181 | * See page 3-9 of Hardware Reference manual for documentation. | ||
| 182 | */ | ||
| 183 | |||
| 184 | /* EVT15 = _real_start */ | ||
| 185 | |||
| 186 | p0.l = lo(EVT15); | ||
| 187 | p0.h = hi(EVT15); | ||
| 188 | p1.l = _real_start; | ||
| 189 | p1.h = _real_start; | ||
| 190 | [p0] = p1; | ||
| 191 | csync; | ||
| 192 | |||
| 193 | p0.l = lo(IMASK); | ||
| 194 | p0.h = hi(IMASK); | ||
| 195 | p1.l = IMASK_IVG15; | ||
| 196 | p1.h = 0x0; | ||
| 197 | [p0] = p1; | ||
| 198 | csync; | ||
| 199 | |||
| 200 | raise 15; | ||
| 201 | p0.l = .LWAIT_HERE; | ||
| 202 | p0.h = .LWAIT_HERE; | ||
| 203 | reti = p0; | ||
| 204 | #if ANOMALY_05000281 | ||
| 205 | nop; | ||
| 206 | nop; | ||
| 207 | nop; | ||
| 208 | #endif | ||
| 209 | rti; | ||
| 210 | |||
| 211 | .LWAIT_HERE: | ||
| 212 | jump .LWAIT_HERE; | ||
| 213 | ENDPROC(__start) | ||
| 214 | |||
| 215 | ENTRY(_real_start) | ||
| 216 | [ -- sp ] = reti; | ||
| 217 | p0.l = lo(WDOG_CTL); | ||
| 218 | p0.h = hi(WDOG_CTL); | ||
| 219 | r0 = 0xAD6(z); | ||
| 220 | w[p0] = r0; /* watchdog off for now */ | ||
| 221 | ssync; | ||
| 222 | |||
| 223 | /* Code update for BSS size == 0 | ||
| 224 | * Zero out the bss region. | ||
| 225 | */ | ||
| 226 | |||
| 227 | p1.l = ___bss_start; | ||
| 228 | p1.h = ___bss_start; | ||
| 229 | p2.l = ___bss_stop; | ||
| 230 | p2.h = ___bss_stop; | ||
| 231 | r0 = 0; | ||
| 232 | p2 -= p1; | ||
| 233 | lsetup (.L_clear_bss, .L_clear_bss ) lc0 = p2; | ||
| 234 | .L_clear_bss: | ||
| 235 | B[p1++] = r0; | ||
| 236 | |||
| 237 | /* In case there is a NULL pointer reference | ||
| 238 | * Zero out region before stext | ||
| 239 | */ | ||
| 240 | |||
| 241 | p1.l = 0x0; | ||
| 242 | p1.h = 0x0; | ||
| 243 | r0.l = __stext; | ||
| 244 | r0.h = __stext; | ||
| 245 | r0 = r0 >> 1; | ||
| 246 | p2 = r0; | ||
| 247 | r0 = 0; | ||
| 248 | lsetup (.L_clear_zero, .L_clear_zero ) lc0 = p2; | ||
| 249 | .L_clear_zero: | ||
| 250 | W[p1++] = r0; | ||
| 251 | |||
| 252 | /* pass the uboot arguments to the global value command line */ | ||
| 253 | R0 = R7; | ||
| 254 | call _cmdline_init; | ||
| 255 | |||
| 256 | p1.l = __rambase; | ||
| 257 | p1.h = __rambase; | ||
| 258 | r0.l = __sdata; | ||
| 259 | r0.h = __sdata; | ||
| 260 | [p1] = r0; | ||
| 261 | |||
| 262 | p1.l = __ramstart; | ||
| 263 | p1.h = __ramstart; | ||
| 264 | p3.l = ___bss_stop; | ||
| 265 | p3.h = ___bss_stop; | ||
| 266 | |||
| 267 | r1 = p3; | ||
| 268 | [p1] = r1; | ||
| 269 | |||
| 270 | |||
| 271 | /* | ||
| 272 | * load the current thread pointer and stack | ||
| 273 | */ | ||
| 274 | r1.l = _init_thread_union; | ||
| 275 | r1.h = _init_thread_union; | ||
| 276 | |||
| 277 | r2.l = 0x2000; | ||
| 278 | r2.h = 0x0000; | ||
| 279 | r1 = r1 + r2; | ||
| 280 | sp = r1; | ||
| 281 | usp = sp; | ||
| 282 | fp = sp; | ||
| 283 | call _start_kernel; | ||
| 284 | .L_exit: | ||
| 285 | jump.s .L_exit; | ||
| 286 | ENDPROC(_real_start) | ||
| 287 | |||
| 288 | __FINIT | ||
| 289 | |||
| 290 | .section .l1.text | 38 | .section .l1.text |
| 291 | #ifdef CONFIG_BFIN_KERNEL_CLOCK | 39 | #ifdef CONFIG_BFIN_KERNEL_CLOCK |
| 292 | ENTRY(_start_dma_code) | 40 | ENTRY(_start_dma_code) |
| @@ -443,13 +191,6 @@ ENTRY(_start_dma_code) | |||
| 443 | SSYNC; | 191 | SSYNC; |
| 444 | #endif | 192 | #endif |
| 445 | 193 | ||
| 446 | p0.h = hi(SIC_IWR0); | ||
| 447 | p0.l = lo(SIC_IWR0); | ||
| 448 | r0.l = lo(IWR_ENABLE_ALL); | ||
| 449 | r0.h = hi(IWR_ENABLE_ALL); | ||
| 450 | [p0] = r0; | ||
| 451 | SSYNC; | ||
| 452 | |||
| 453 | RTS; | 194 | RTS; |
| 454 | ENDPROC(_start_dma_code) | 195 | ENDPROC(_start_dma_code) |
| 455 | #endif /* CONFIG_BFIN_KERNEL_CLOCK */ | 196 | #endif /* CONFIG_BFIN_KERNEL_CLOCK */ |
diff --git a/include/asm-blackfin/mach-bf548/anomaly.h b/arch/blackfin/mach-bf548/include/mach/anomaly.h index 3ad59655881a..3ad59655881a 100644 --- a/include/asm-blackfin/mach-bf548/anomaly.h +++ b/arch/blackfin/mach-bf548/include/mach/anomaly.h | |||
diff --git a/include/asm-blackfin/mach-bf548/bf548.h b/arch/blackfin/mach-bf548/include/mach/bf548.h index e748588e8930..e748588e8930 100644 --- a/include/asm-blackfin/mach-bf548/bf548.h +++ b/arch/blackfin/mach-bf548/include/mach/bf548.h | |||
diff --git a/include/asm-blackfin/mach-bf548/bf54x-lq043.h b/arch/blackfin/mach-bf548/include/mach/bf54x-lq043.h index 9c7ca62a45eb..9c7ca62a45eb 100644 --- a/include/asm-blackfin/mach-bf548/bf54x-lq043.h +++ b/arch/blackfin/mach-bf548/include/mach/bf54x-lq043.h | |||
diff --git a/include/asm-blackfin/mach-bf548/bf54x_keys.h b/arch/blackfin/mach-bf548/include/mach/bf54x_keys.h index 1fb4ec77cc25..1fb4ec77cc25 100644 --- a/include/asm-blackfin/mach-bf548/bf54x_keys.h +++ b/arch/blackfin/mach-bf548/include/mach/bf54x_keys.h | |||
diff --git a/include/asm-blackfin/mach-bf548/bfin_serial_5xx.h b/arch/blackfin/mach-bf548/include/mach/bfin_serial_5xx.h index 5e29446a8e03..5e29446a8e03 100644 --- a/include/asm-blackfin/mach-bf548/bfin_serial_5xx.h +++ b/arch/blackfin/mach-bf548/include/mach/bfin_serial_5xx.h | |||
diff --git a/include/asm-blackfin/mach-bf548/bfin_sir.h b/arch/blackfin/mach-bf548/include/mach/bfin_sir.h index c41f9cf00268..c41f9cf00268 100644 --- a/include/asm-blackfin/mach-bf548/bfin_sir.h +++ b/arch/blackfin/mach-bf548/include/mach/bfin_sir.h | |||
diff --git a/include/asm-blackfin/mach-bf548/blackfin.h b/arch/blackfin/mach-bf548/include/mach/blackfin.h index d6ee74ac0460..d6ee74ac0460 100644 --- a/include/asm-blackfin/mach-bf548/blackfin.h +++ b/arch/blackfin/mach-bf548/include/mach/blackfin.h | |||
diff --git a/include/asm-blackfin/mach-bf548/cdefBF542.h b/arch/blackfin/mach-bf548/include/mach/cdefBF542.h index 60b9f77576f1..07aefb9ed79b 100644 --- a/include/asm-blackfin/mach-bf548/cdefBF542.h +++ b/arch/blackfin/mach-bf548/include/mach/cdefBF542.h | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | #include "defBF542.h" | 35 | #include "defBF542.h" |
| 36 | 36 | ||
| 37 | /* include core sbfin_read_()ecific register pointer definitions */ | 37 | /* include core sbfin_read_()ecific register pointer definitions */ |
| 38 | #include <asm/mach-common/cdef_LPBlackfin.h> | 38 | #include <asm/cdef_LPBlackfin.h> |
| 39 | 39 | ||
| 40 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF542 */ | 40 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF542 */ |
| 41 | 41 | ||
diff --git a/include/asm-blackfin/mach-bf548/cdefBF544.h b/arch/blackfin/mach-bf548/include/mach/cdefBF544.h index ea9b4ab496f3..431a69278991 100644 --- a/include/asm-blackfin/mach-bf548/cdefBF544.h +++ b/arch/blackfin/mach-bf548/include/mach/cdefBF544.h | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | #include "defBF544.h" | 35 | #include "defBF544.h" |
| 36 | 36 | ||
| 37 | /* include core sbfin_read_()ecific register pointer definitions */ | 37 | /* include core sbfin_read_()ecific register pointer definitions */ |
| 38 | #include <asm/mach-common/cdef_LPBlackfin.h> | 38 | #include <asm/cdef_LPBlackfin.h> |
| 39 | 39 | ||
| 40 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF544 */ | 40 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF544 */ |
| 41 | 41 | ||
diff --git a/include/asm-blackfin/mach-bf548/cdefBF547.h b/arch/blackfin/mach-bf548/include/mach/cdefBF547.h index ba716277c00d..93376e90dfc5 100644 --- a/include/asm-blackfin/mach-bf548/cdefBF547.h +++ b/arch/blackfin/mach-bf548/include/mach/cdefBF547.h | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | #include "defBF548.h" | 35 | #include "defBF548.h" |
| 36 | 36 | ||
| 37 | /* include core sbfin_read_()ecific register pointer definitions */ | 37 | /* include core sbfin_read_()ecific register pointer definitions */ |
| 38 | #include <asm/mach-common/cdef_LPBlackfin.h> | 38 | #include <asm/cdef_LPBlackfin.h> |
| 39 | 39 | ||
| 40 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF548 */ | 40 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF548 */ |
| 41 | 41 | ||
diff --git a/include/asm-blackfin/mach-bf548/cdefBF548.h b/arch/blackfin/mach-bf548/include/mach/cdefBF548.h index ae971ebff6a0..9cd74384136f 100644 --- a/include/asm-blackfin/mach-bf548/cdefBF548.h +++ b/arch/blackfin/mach-bf548/include/mach/cdefBF548.h | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | #include "defBF548.h" | 35 | #include "defBF548.h" |
| 36 | 36 | ||
| 37 | /* include core sbfin_read_()ecific register pointer definitions */ | 37 | /* include core sbfin_read_()ecific register pointer definitions */ |
| 38 | #include <asm/mach-common/cdef_LPBlackfin.h> | 38 | #include <asm/cdef_LPBlackfin.h> |
| 39 | 39 | ||
| 40 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF548 */ | 40 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF548 */ |
| 41 | 41 | ||
diff --git a/include/asm-blackfin/mach-bf548/cdefBF549.h b/arch/blackfin/mach-bf548/include/mach/cdefBF549.h index 92d07d961999..ead360b69dea 100644 --- a/include/asm-blackfin/mach-bf548/cdefBF549.h +++ b/arch/blackfin/mach-bf548/include/mach/cdefBF549.h | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | #include "defBF549.h" | 35 | #include "defBF549.h" |
| 36 | 36 | ||
| 37 | /* include core sbfin_read_()ecific register pointer definitions */ | 37 | /* include core sbfin_read_()ecific register pointer definitions */ |
| 38 | #include <asm/mach-common/cdef_LPBlackfin.h> | 38 | #include <asm/cdef_LPBlackfin.h> |
| 39 | 39 | ||
| 40 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF549 */ | 40 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF549 */ |
| 41 | 41 | ||
diff --git a/include/asm-blackfin/mach-bf548/cdefBF54x_base.h b/arch/blackfin/mach-bf548/include/mach/cdefBF54x_base.h index 57ac8cb9b1f6..57ac8cb9b1f6 100644 --- a/include/asm-blackfin/mach-bf548/cdefBF54x_base.h +++ b/arch/blackfin/mach-bf548/include/mach/cdefBF54x_base.h | |||
diff --git a/include/asm-blackfin/mach-bf548/defBF542.h b/arch/blackfin/mach-bf548/include/mach/defBF542.h index a7c809f29ede..b1316541b8d6 100644 --- a/include/asm-blackfin/mach-bf548/defBF542.h +++ b/arch/blackfin/mach-bf548/include/mach/defBF542.h | |||
| @@ -32,7 +32,7 @@ | |||
| 32 | #define _DEF_BF542_H | 32 | #define _DEF_BF542_H |
| 33 | 33 | ||
| 34 | /* Include all Core registers and bit definitions */ | 34 | /* Include all Core registers and bit definitions */ |
| 35 | #include <asm/mach-common/def_LPBlackfin.h> | 35 | #include <asm/def_LPBlackfin.h> |
| 36 | 36 | ||
| 37 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF542 */ | 37 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF542 */ |
| 38 | 38 | ||
diff --git a/include/asm-blackfin/mach-bf548/defBF544.h b/arch/blackfin/mach-bf548/include/mach/defBF544.h index b8b9870e2697..c2c785bdc5fc 100644 --- a/include/asm-blackfin/mach-bf548/defBF544.h +++ b/arch/blackfin/mach-bf548/include/mach/defBF544.h | |||
| @@ -32,7 +32,7 @@ | |||
| 32 | #define _DEF_BF544_H | 32 | #define _DEF_BF544_H |
| 33 | 33 | ||
| 34 | /* Include all Core registers and bit definitions */ | 34 | /* Include all Core registers and bit definitions */ |
| 35 | #include <asm/mach-common/def_LPBlackfin.h> | 35 | #include <asm/def_LPBlackfin.h> |
| 36 | 36 | ||
| 37 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF544 */ | 37 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF544 */ |
| 38 | 38 | ||
diff --git a/include/asm-blackfin/mach-bf548/defBF547.h b/arch/blackfin/mach-bf548/include/mach/defBF547.h index 3a3a18ebb10e..661f0d877bd1 100644 --- a/include/asm-blackfin/mach-bf548/defBF547.h +++ b/arch/blackfin/mach-bf548/include/mach/defBF547.h | |||
| @@ -32,7 +32,7 @@ | |||
| 32 | #define _DEF_BF548_H | 32 | #define _DEF_BF548_H |
| 33 | 33 | ||
| 34 | /* Include all Core registers and bit definitions */ | 34 | /* Include all Core registers and bit definitions */ |
| 35 | #include <asm/mach-common/def_LPBlackfin.h> | 35 | #include <asm/def_LPBlackfin.h> |
| 36 | 36 | ||
| 37 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF548 */ | 37 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF548 */ |
| 38 | 38 | ||
diff --git a/include/asm-blackfin/mach-bf548/defBF548.h b/arch/blackfin/mach-bf548/include/mach/defBF548.h index 1d7c96edb038..85d4bade911d 100644 --- a/include/asm-blackfin/mach-bf548/defBF548.h +++ b/arch/blackfin/mach-bf548/include/mach/defBF548.h | |||
| @@ -32,7 +32,7 @@ | |||
| 32 | #define _DEF_BF548_H | 32 | #define _DEF_BF548_H |
| 33 | 33 | ||
| 34 | /* Include all Core registers and bit definitions */ | 34 | /* Include all Core registers and bit definitions */ |
| 35 | #include <asm/mach-common/def_LPBlackfin.h> | 35 | #include <asm/def_LPBlackfin.h> |
| 36 | 36 | ||
| 37 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF548 */ | 37 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF548 */ |
| 38 | 38 | ||
diff --git a/include/asm-blackfin/mach-bf548/defBF549.h b/arch/blackfin/mach-bf548/include/mach/defBF549.h index fcb72b41e007..096734541644 100644 --- a/include/asm-blackfin/mach-bf548/defBF549.h +++ b/arch/blackfin/mach-bf548/include/mach/defBF549.h | |||
| @@ -32,7 +32,7 @@ | |||
| 32 | #define _DEF_BF549_H | 32 | #define _DEF_BF549_H |
| 33 | 33 | ||
| 34 | /* Include all Core registers and bit definitions */ | 34 | /* Include all Core registers and bit definitions */ |
| 35 | #include <asm/mach-common/def_LPBlackfin.h> | 35 | #include <asm/def_LPBlackfin.h> |
| 36 | 36 | ||
| 37 | 37 | ||
| 38 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF549 */ | 38 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF549 */ |
diff --git a/include/asm-blackfin/mach-bf548/defBF54x_base.h b/arch/blackfin/mach-bf548/include/mach/defBF54x_base.h index e022e896cb18..e022e896cb18 100644 --- a/include/asm-blackfin/mach-bf548/defBF54x_base.h +++ b/arch/blackfin/mach-bf548/include/mach/defBF54x_base.h | |||
diff --git a/include/asm-blackfin/mach-bf548/dma.h b/arch/blackfin/mach-bf548/include/mach/dma.h index 36a2ef7e7849..36a2ef7e7849 100644 --- a/include/asm-blackfin/mach-bf548/dma.h +++ b/arch/blackfin/mach-bf548/include/mach/dma.h | |||
diff --git a/include/asm-blackfin/mach-bf548/gpio.h b/arch/blackfin/mach-bf548/include/mach/gpio.h index bba82dc75f16..bba82dc75f16 100644 --- a/include/asm-blackfin/mach-bf548/gpio.h +++ b/arch/blackfin/mach-bf548/include/mach/gpio.h | |||
diff --git a/include/asm-blackfin/mach-bf548/irq.h b/arch/blackfin/mach-bf548/include/mach/irq.h index ad380d1f5872..ad380d1f5872 100644 --- a/include/asm-blackfin/mach-bf548/irq.h +++ b/arch/blackfin/mach-bf548/include/mach/irq.h | |||
diff --git a/include/asm-blackfin/mach-bf548/mem_init.h b/arch/blackfin/mach-bf548/include/mach/mem_init.h index ab0b863eee66..ab0b863eee66 100644 --- a/include/asm-blackfin/mach-bf548/mem_init.h +++ b/arch/blackfin/mach-bf548/include/mach/mem_init.h | |||
diff --git a/include/asm-blackfin/mach-bf548/mem_map.h b/arch/blackfin/mach-bf548/include/mach/mem_map.h index f99f47bc3a07..f99f47bc3a07 100644 --- a/include/asm-blackfin/mach-bf548/mem_map.h +++ b/arch/blackfin/mach-bf548/include/mach/mem_map.h | |||
diff --git a/include/asm-blackfin/mach-bf548/portmux.h b/arch/blackfin/mach-bf548/include/mach/portmux.h index 8177a567dcdb..8177a567dcdb 100644 --- a/include/asm-blackfin/mach-bf548/portmux.h +++ b/arch/blackfin/mach-bf548/include/mach/portmux.h | |||
diff --git a/arch/blackfin/mach-bf548/ints-priority.c b/arch/blackfin/mach-bf548/ints-priority.c index 2665653cee37..9dd0fa3ac4de 100644 --- a/arch/blackfin/mach-bf548/ints-priority.c +++ b/arch/blackfin/mach-bf548/ints-priority.c | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | #include <linux/irq.h> | 31 | #include <linux/irq.h> |
| 32 | #include <asm/blackfin.h> | 32 | #include <asm/blackfin.h> |
| 33 | 33 | ||
| 34 | void program_IAR(void) | 34 | void __init program_IAR(void) |
| 35 | { | 35 | { |
| 36 | /* Program the IAR0 Register with the configured priority */ | 36 | /* Program the IAR0 Register with the configured priority */ |
| 37 | bfin_write_SIC_IAR0(((CONFIG_IRQ_PLL_WAKEUP - 7) << IRQ_PLL_WAKEUP_POS) | | 37 | bfin_write_SIC_IAR0(((CONFIG_IRQ_PLL_WAKEUP - 7) << IRQ_PLL_WAKEUP_POS) | |
diff --git a/arch/blackfin/mach-bf561/boards/cm_bf561.c b/arch/blackfin/mach-bf561/boards/cm_bf561.c index 466ef5929a25..8f40990eea2f 100644 --- a/arch/blackfin/mach-bf561/boards/cm_bf561.c +++ b/arch/blackfin/mach-bf561/boards/cm_bf561.c | |||
| @@ -54,16 +54,16 @@ const char bfin_board_name[] = "Bluetechnix CM BF561"; | |||
| 54 | #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) | 54 | #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) |
| 55 | static struct mtd_partition bfin_spi_flash_partitions[] = { | 55 | static struct mtd_partition bfin_spi_flash_partitions[] = { |
| 56 | { | 56 | { |
| 57 | .name = "bootloader", | 57 | .name = "bootloader(spi)", |
| 58 | .size = 0x00020000, | 58 | .size = 0x00020000, |
| 59 | .offset = 0, | 59 | .offset = 0, |
| 60 | .mask_flags = MTD_CAP_ROM | 60 | .mask_flags = MTD_CAP_ROM |
| 61 | }, { | 61 | }, { |
| 62 | .name = "kernel", | 62 | .name = "linux kernel(spi)", |
| 63 | .size = 0xe0000, | 63 | .size = 0xe0000, |
| 64 | .offset = 0x20000 | 64 | .offset = 0x20000 |
| 65 | }, { | 65 | }, { |
| 66 | .name = "file system", | 66 | .name = "file system(spi)", |
| 67 | .size = 0x700000, | 67 | .size = 0x700000, |
| 68 | .offset = 0x00100000, | 68 | .offset = 0x00100000, |
| 69 | } | 69 | } |
| @@ -306,7 +306,7 @@ static struct platform_device bfin_sir_device = { | |||
| 306 | #endif | 306 | #endif |
| 307 | 307 | ||
| 308 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | 308 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) |
| 309 | #define PATA_INT 119 | 309 | #define PATA_INT IRQ_PF46 |
| 310 | 310 | ||
| 311 | static struct pata_platform_info bfin_pata_platform_data = { | 311 | static struct pata_platform_info bfin_pata_platform_data = { |
| 312 | .ioport_shift = 2, | 312 | .ioport_shift = 2, |
diff --git a/arch/blackfin/mach-bf561/boards/ezkit.c b/arch/blackfin/mach-bf561/boards/ezkit.c index bc6feded8569..50b4cdceccfe 100644 --- a/arch/blackfin/mach-bf561/boards/ezkit.c +++ b/arch/blackfin/mach-bf561/boards/ezkit.c | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | #include <linux/spi/spi.h> | 35 | #include <linux/spi/spi.h> |
| 36 | #include <linux/irq.h> | 36 | #include <linux/irq.h> |
| 37 | #include <linux/interrupt.h> | 37 | #include <linux/interrupt.h> |
| 38 | #include <linux/ata_platform.h> | ||
| 39 | #include <asm/dma.h> | 38 | #include <asm/dma.h> |
| 40 | #include <asm/bfin5xx_spi.h> | 39 | #include <asm/bfin5xx_spi.h> |
| 41 | #include <asm/portmux.h> | 40 | #include <asm/portmux.h> |
| @@ -243,15 +242,15 @@ static struct platform_device bfin_sir_device = { | |||
| 243 | #if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE) | 242 | #if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE) |
| 244 | static struct mtd_partition ezkit_partitions[] = { | 243 | static struct mtd_partition ezkit_partitions[] = { |
| 245 | { | 244 | { |
| 246 | .name = "Bootloader", | 245 | .name = "bootloader(nor)", |
| 247 | .size = 0x40000, | 246 | .size = 0x40000, |
| 248 | .offset = 0, | 247 | .offset = 0, |
| 249 | }, { | 248 | }, { |
| 250 | .name = "Kernel", | 249 | .name = "linux kernel(nor)", |
| 251 | .size = 0x1C0000, | 250 | .size = 0x1C0000, |
| 252 | .offset = MTDPART_OFS_APPEND, | 251 | .offset = MTDPART_OFS_APPEND, |
| 253 | }, { | 252 | }, { |
| 254 | .name = "RootFS", | 253 | .name = "file system(nor)", |
| 255 | .size = MTDPART_SIZ_FULL, | 254 | .size = MTDPART_SIZ_FULL, |
| 256 | .offset = MTDPART_OFS_APPEND, | 255 | .offset = MTDPART_OFS_APPEND, |
| 257 | } | 256 | } |
| @@ -350,43 +349,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
| 350 | #endif | 349 | #endif |
| 351 | }; | 350 | }; |
| 352 | 351 | ||
| 353 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
| 354 | #define PATA_INT 55 | ||
| 355 | |||
| 356 | static struct pata_platform_info bfin_pata_platform_data = { | ||
| 357 | .ioport_shift = 1, | ||
| 358 | .irq_type = IRQF_TRIGGER_HIGH | IRQF_DISABLED, | ||
| 359 | }; | ||
| 360 | |||
| 361 | static struct resource bfin_pata_resources[] = { | ||
| 362 | { | ||
| 363 | .start = 0x20314020, | ||
| 364 | .end = 0x2031403F, | ||
| 365 | .flags = IORESOURCE_MEM, | ||
| 366 | }, | ||
| 367 | { | ||
| 368 | .start = 0x2031401C, | ||
| 369 | .end = 0x2031401F, | ||
| 370 | .flags = IORESOURCE_MEM, | ||
| 371 | }, | ||
| 372 | { | ||
| 373 | .start = PATA_INT, | ||
| 374 | .end = PATA_INT, | ||
| 375 | .flags = IORESOURCE_IRQ, | ||
| 376 | }, | ||
| 377 | }; | ||
| 378 | |||
| 379 | static struct platform_device bfin_pata_device = { | ||
| 380 | .name = "pata_platform", | ||
| 381 | .id = -1, | ||
| 382 | .num_resources = ARRAY_SIZE(bfin_pata_resources), | ||
| 383 | .resource = bfin_pata_resources, | ||
| 384 | .dev = { | ||
| 385 | .platform_data = &bfin_pata_platform_data, | ||
| 386 | } | ||
| 387 | }; | ||
| 388 | #endif | ||
| 389 | |||
| 390 | #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) | 352 | #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) |
| 391 | #include <linux/input.h> | 353 | #include <linux/input.h> |
| 392 | #include <linux/gpio_keys.h> | 354 | #include <linux/gpio_keys.h> |
| @@ -499,10 +461,6 @@ static struct platform_device *ezkit_devices[] __initdata = { | |||
| 499 | &bfin_sir_device, | 461 | &bfin_sir_device, |
| 500 | #endif | 462 | #endif |
| 501 | 463 | ||
| 502 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
| 503 | &bfin_pata_device, | ||
| 504 | #endif | ||
| 505 | |||
| 506 | #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) | 464 | #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) |
| 507 | &bfin_device_gpiokeys, | 465 | &bfin_device_gpiokeys, |
| 508 | #endif | 466 | #endif |
| @@ -538,10 +496,6 @@ static int __init ezkit_init(void) | |||
| 538 | #endif | 496 | #endif |
| 539 | 497 | ||
| 540 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); | 498 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); |
| 541 | |||
| 542 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
| 543 | irq_desc[PATA_INT].status |= IRQ_NOAUTOEN; | ||
| 544 | #endif | ||
| 545 | return 0; | 499 | return 0; |
| 546 | } | 500 | } |
| 547 | 501 | ||
diff --git a/arch/blackfin/mach-bf561/head.S b/arch/blackfin/mach-bf561/head.S index cf1a2dff01e7..75ea6a905829 100644 --- a/arch/blackfin/mach-bf561/head.S +++ b/arch/blackfin/mach-bf561/head.S | |||
| @@ -30,284 +30,13 @@ | |||
| 30 | #include <linux/linkage.h> | 30 | #include <linux/linkage.h> |
| 31 | #include <linux/init.h> | 31 | #include <linux/init.h> |
| 32 | #include <asm/blackfin.h> | 32 | #include <asm/blackfin.h> |
| 33 | #include <asm/trace.h> | 33 | #ifdef CONFIG_BFIN_KERNEL_CLOCK |
| 34 | 34 | #include <asm/clocks.h> | |
| 35 | #if CONFIG_BFIN_KERNEL_CLOCK | 35 | #include <mach/mem_init.h> |
| 36 | #include <asm/mach-common/clocks.h> | ||
| 37 | #include <asm/mach/mem_init.h> | ||
| 38 | #endif | ||
| 39 | |||
| 40 | .extern ___bss_stop | ||
| 41 | .extern ___bss_start | ||
| 42 | .extern _bf53x_relocate_l1_mem | ||
| 43 | |||
| 44 | #define INITIAL_STACK 0xFFB01000 | ||
| 45 | |||
| 46 | __INIT | ||
| 47 | |||
| 48 | ENTRY(__start) | ||
| 49 | /* R0: argument of command line string, passed from uboot, save it */ | ||
| 50 | R7 = R0; | ||
| 51 | /* Enable Cycle Counter and Nesting Of Interrupts */ | ||
| 52 | #ifdef CONFIG_BFIN_SCRATCH_REG_CYCLES | ||
| 53 | R0 = SYSCFG_SNEN; | ||
| 54 | #else | ||
| 55 | R0 = SYSCFG_SNEN | SYSCFG_CCEN; | ||
| 56 | #endif | ||
| 57 | SYSCFG = R0; | ||
| 58 | R0 = 0; | ||
| 59 | |||
| 60 | /* Clear Out All the data and pointer Registers */ | ||
| 61 | R1 = R0; | ||
| 62 | R2 = R0; | ||
| 63 | R3 = R0; | ||
| 64 | R4 = R0; | ||
| 65 | R5 = R0; | ||
| 66 | R6 = R0; | ||
| 67 | |||
| 68 | P0 = R0; | ||
| 69 | P1 = R0; | ||
| 70 | P2 = R0; | ||
| 71 | P3 = R0; | ||
| 72 | P4 = R0; | ||
| 73 | P5 = R0; | ||
| 74 | |||
| 75 | LC0 = r0; | ||
| 76 | LC1 = r0; | ||
| 77 | L0 = r0; | ||
| 78 | L1 = r0; | ||
| 79 | L2 = r0; | ||
| 80 | L3 = r0; | ||
| 81 | |||
| 82 | /* Clear Out All the DAG Registers */ | ||
| 83 | B0 = r0; | ||
| 84 | B1 = r0; | ||
| 85 | B2 = r0; | ||
| 86 | B3 = r0; | ||
| 87 | |||
| 88 | I0 = r0; | ||
| 89 | I1 = r0; | ||
| 90 | I2 = r0; | ||
| 91 | I3 = r0; | ||
| 92 | |||
| 93 | M0 = r0; | ||
| 94 | M1 = r0; | ||
| 95 | M2 = r0; | ||
| 96 | M3 = r0; | ||
| 97 | |||
| 98 | trace_buffer_init(p0,r0); | ||
| 99 | P0 = R1; | ||
| 100 | R0 = R1; | ||
| 101 | |||
| 102 | /* Turn off the icache */ | ||
| 103 | p0.l = LO(IMEM_CONTROL); | ||
| 104 | p0.h = HI(IMEM_CONTROL); | ||
| 105 | R1 = [p0]; | ||
| 106 | R0 = ~ENICPLB; | ||
| 107 | R0 = R0 & R1; | ||
| 108 | |||
| 109 | #if ANOMALY_05000125 | ||
| 110 | CLI R2; | ||
| 111 | SSYNC; | ||
| 112 | #endif | ||
| 113 | [p0] = R0; | ||
| 114 | SSYNC; | ||
| 115 | #if ANOMALY_05000125 | ||
| 116 | STI R2; | ||
| 117 | #endif | ||
| 118 | |||
| 119 | /* Turn off the dcache */ | ||
| 120 | p0.l = LO(DMEM_CONTROL); | ||
| 121 | p0.h = HI(DMEM_CONTROL); | ||
| 122 | R1 = [p0]; | ||
| 123 | R0 = ~ENDCPLB; | ||
| 124 | R0 = R0 & R1; | ||
| 125 | |||
| 126 | /* Anomaly 05000125 */ | ||
| 127 | #if ANOMALY_05000125 | ||
| 128 | CLI R2; | ||
| 129 | SSYNC; | ||
| 130 | #endif | ||
| 131 | [p0] = R0; | ||
| 132 | SSYNC; | ||
| 133 | #if ANOMALY_05000125 | ||
| 134 | STI R2; | ||
| 135 | #endif | ||
| 136 | |||
| 137 | /* Initialise UART - when booting from u-boot, the UART is not disabled | ||
| 138 | * so if we dont initalize here, our serial console gets hosed */ | ||
| 139 | p0.h = hi(BFIN_UART_LCR); | ||
| 140 | p0.l = lo(BFIN_UART_LCR); | ||
| 141 | r0 = 0x0(Z); | ||
| 142 | w[p0] = r0.L; /* To enable DLL writes */ | ||
| 143 | ssync; | ||
| 144 | |||
| 145 | p0.h = hi(BFIN_UART_DLL); | ||
| 146 | p0.l = lo(BFIN_UART_DLL); | ||
| 147 | r0 = 0x0(Z); | ||
| 148 | w[p0] = r0.L; | ||
| 149 | ssync; | ||
| 150 | |||
| 151 | p0.h = hi(BFIN_UART_DLH); | ||
| 152 | p0.l = lo(BFIN_UART_DLH); | ||
| 153 | r0 = 0x00(Z); | ||
| 154 | w[p0] = r0.L; | ||
| 155 | ssync; | ||
| 156 | |||
| 157 | p0.h = hi(BFIN_UART_GCTL); | ||
| 158 | p0.l = lo(BFIN_UART_GCTL); | ||
| 159 | r0 = 0x0(Z); | ||
| 160 | w[p0] = r0.L; /* To enable UART clock */ | ||
| 161 | ssync; | ||
| 162 | |||
| 163 | /* Initialize stack pointer */ | ||
| 164 | sp.l = lo(INITIAL_STACK); | ||
| 165 | sp.h = hi(INITIAL_STACK); | ||
| 166 | fp = sp; | ||
| 167 | usp = sp; | ||
| 168 | |||
| 169 | #ifdef CONFIG_EARLY_PRINTK | ||
| 170 | SP += -12; | ||
| 171 | call _init_early_exception_vectors; | ||
| 172 | SP += 12; | ||
| 173 | #endif | ||
| 174 | |||
| 175 | /* Put The Code for PLL Programming and SDRAM Programming in L1 ISRAM */ | ||
| 176 | call _bf53x_relocate_l1_mem; | ||
| 177 | #if CONFIG_BFIN_KERNEL_CLOCK | ||
| 178 | call _start_dma_code; | ||
| 179 | #endif | ||
| 180 | |||
| 181 | /* Code for initializing Async memory banks */ | ||
| 182 | |||
| 183 | p2.h = hi(EBIU_AMBCTL1); | ||
| 184 | p2.l = lo(EBIU_AMBCTL1); | ||
| 185 | r0.h = hi(AMBCTL1VAL); | ||
| 186 | r0.l = lo(AMBCTL1VAL); | ||
| 187 | [p2] = r0; | ||
| 188 | ssync; | ||
| 189 | |||
| 190 | p2.h = hi(EBIU_AMBCTL0); | ||
| 191 | p2.l = lo(EBIU_AMBCTL0); | ||
| 192 | r0.h = hi(AMBCTL0VAL); | ||
| 193 | r0.l = lo(AMBCTL0VAL); | ||
| 194 | [p2] = r0; | ||
| 195 | ssync; | ||
| 196 | |||
| 197 | p2.h = hi(EBIU_AMGCTL); | ||
| 198 | p2.l = lo(EBIU_AMGCTL); | ||
| 199 | r0 = AMGCTLVAL; | ||
| 200 | w[p2] = r0; | ||
| 201 | ssync; | ||
| 202 | |||
| 203 | /* This section keeps the processor in supervisor mode | ||
| 204 | * during kernel boot. Switches to user mode at end of boot. | ||
| 205 | * See page 3-9 of Hardware Reference manual for documentation. | ||
| 206 | */ | ||
| 207 | |||
| 208 | /* EVT15 = _real_start */ | ||
| 209 | |||
| 210 | p0.l = lo(EVT15); | ||
| 211 | p0.h = hi(EVT15); | ||
| 212 | p1.l = _real_start; | ||
| 213 | p1.h = _real_start; | ||
| 214 | [p0] = p1; | ||
| 215 | csync; | ||
| 216 | |||
| 217 | p0.l = lo(IMASK); | ||
| 218 | p0.h = hi(IMASK); | ||
| 219 | p1.l = IMASK_IVG15; | ||
| 220 | p1.h = 0x0; | ||
| 221 | [p0] = p1; | ||
| 222 | csync; | ||
| 223 | |||
| 224 | raise 15; | ||
| 225 | p0.l = .LWAIT_HERE; | ||
| 226 | p0.h = .LWAIT_HERE; | ||
| 227 | reti = p0; | ||
| 228 | #if ANOMALY_05000281 | ||
| 229 | nop; nop; nop; | ||
| 230 | #endif | 36 | #endif |
| 231 | rti; | ||
| 232 | |||
| 233 | .LWAIT_HERE: | ||
| 234 | jump .LWAIT_HERE; | ||
| 235 | ENDPROC(__start) | ||
| 236 | |||
| 237 | ENTRY(_real_start) | ||
| 238 | [ -- sp ] = reti; | ||
| 239 | p0.l = lo(WDOGA_CTL); | ||
| 240 | p0.h = hi(WDOGA_CTL); | ||
| 241 | r0 = 0xAD6(z); | ||
| 242 | w[p0] = r0; /* watchdog off for now */ | ||
| 243 | ssync; | ||
| 244 | |||
| 245 | /* Code update for BSS size == 0 | ||
| 246 | * Zero out the bss region. | ||
| 247 | */ | ||
| 248 | |||
| 249 | p1.l = ___bss_start; | ||
| 250 | p1.h = ___bss_start; | ||
| 251 | p2.l = ___bss_stop; | ||
| 252 | p2.h = ___bss_stop; | ||
| 253 | r0 = 0; | ||
| 254 | p2 -= p1; | ||
| 255 | lsetup (.L_clear_bss, .L_clear_bss) lc0 = p2; | ||
| 256 | .L_clear_bss: | ||
| 257 | B[p1++] = r0; | ||
| 258 | |||
| 259 | /* In case there is a NULL pointer reference | ||
| 260 | * Zero out region before stext | ||
| 261 | */ | ||
| 262 | |||
| 263 | p1.l = 0x0; | ||
| 264 | p1.h = 0x0; | ||
| 265 | r0.l = __stext; | ||
| 266 | r0.h = __stext; | ||
| 267 | r0 = r0 >> 1; | ||
| 268 | p2 = r0; | ||
| 269 | r0 = 0; | ||
| 270 | lsetup (.L_clear_zero, .L_clear_zero) lc0 = p2; | ||
| 271 | .L_clear_zero: | ||
| 272 | W[p1++] = r0; | ||
| 273 | |||
| 274 | /* pass the uboot arguments to the global value command line */ | ||
| 275 | R0 = R7; | ||
| 276 | call _cmdline_init; | ||
| 277 | |||
| 278 | p1.l = __rambase; | ||
| 279 | p1.h = __rambase; | ||
| 280 | r0.l = __sdata; | ||
| 281 | r0.h = __sdata; | ||
| 282 | [p1] = r0; | ||
| 283 | |||
| 284 | p1.l = __ramstart; | ||
| 285 | p1.h = __ramstart; | ||
| 286 | p3.l = ___bss_stop; | ||
| 287 | p3.h = ___bss_stop; | ||
| 288 | |||
| 289 | r1 = p3; | ||
| 290 | [p1] = r1; | ||
| 291 | |||
| 292 | /* | ||
| 293 | * load the current thread pointer and stack | ||
| 294 | */ | ||
| 295 | r1.l = _init_thread_union; | ||
| 296 | r1.h = _init_thread_union; | ||
| 297 | |||
| 298 | r2.l = 0x2000; | ||
| 299 | r2.h = 0x0000; | ||
| 300 | r1 = r1 + r2; | ||
| 301 | sp = r1; | ||
| 302 | usp = sp; | ||
| 303 | fp = sp; | ||
| 304 | jump.l _start_kernel; | ||
| 305 | ENDPROC(_real_start) | ||
| 306 | |||
| 307 | __FINIT | ||
| 308 | 37 | ||
| 309 | .section .l1.text | 38 | .section .l1.text |
| 310 | #if CONFIG_BFIN_KERNEL_CLOCK | 39 | #ifdef CONFIG_BFIN_KERNEL_CLOCK |
| 311 | ENTRY(_start_dma_code) | 40 | ENTRY(_start_dma_code) |
| 312 | p0.h = hi(SICA_IWR0); | 41 | p0.h = hi(SICA_IWR0); |
| 313 | p0.l = lo(SICA_IWR0); | 42 | p0.l = lo(SICA_IWR0); |
diff --git a/include/asm-blackfin/mach-bf561/anomaly.h b/arch/blackfin/mach-bf561/include/mach/anomaly.h index 5c5d7d7d695f..5c5d7d7d695f 100644 --- a/include/asm-blackfin/mach-bf561/anomaly.h +++ b/arch/blackfin/mach-bf561/include/mach/anomaly.h | |||
diff --git a/include/asm-blackfin/mach-bf561/bf561.h b/arch/blackfin/mach-bf561/include/mach/bf561.h index 3ef9e5f36136..3ef9e5f36136 100644 --- a/include/asm-blackfin/mach-bf561/bf561.h +++ b/arch/blackfin/mach-bf561/include/mach/bf561.h | |||
diff --git a/include/asm-blackfin/mach-bf561/bfin_serial_5xx.h b/arch/blackfin/mach-bf561/include/mach/bfin_serial_5xx.h index 8aa02780e642..8aa02780e642 100644 --- a/include/asm-blackfin/mach-bf561/bfin_serial_5xx.h +++ b/arch/blackfin/mach-bf561/include/mach/bfin_serial_5xx.h | |||
diff --git a/include/asm-blackfin/mach-bf561/bfin_sir.h b/arch/blackfin/mach-bf561/include/mach/bfin_sir.h index 9bb87e9e2e9b..9bb87e9e2e9b 100644 --- a/include/asm-blackfin/mach-bf561/bfin_sir.h +++ b/arch/blackfin/mach-bf561/include/mach/bfin_sir.h | |||
diff --git a/include/asm-blackfin/mach-bf561/blackfin.h b/arch/blackfin/mach-bf561/include/mach/blackfin.h index 0ea8666e6764..0ea8666e6764 100644 --- a/include/asm-blackfin/mach-bf561/blackfin.h +++ b/arch/blackfin/mach-bf561/include/mach/blackfin.h | |||
diff --git a/include/asm-blackfin/mach-bf561/cdefBF561.h b/arch/blackfin/mach-bf561/include/mach/cdefBF561.h index b07ffccd66dd..c14d63402e70 100644 --- a/include/asm-blackfin/mach-bf561/cdefBF561.h +++ b/arch/blackfin/mach-bf561/include/mach/cdefBF561.h | |||
| @@ -37,7 +37,7 @@ | |||
| 37 | #include "defBF561.h" | 37 | #include "defBF561.h" |
| 38 | 38 | ||
| 39 | /*include core specific register pointer definitions*/ | 39 | /*include core specific register pointer definitions*/ |
| 40 | #include <asm/mach-common/cdef_LPBlackfin.h> | 40 | #include <asm/cdef_LPBlackfin.h> |
| 41 | 41 | ||
| 42 | #include <asm/system.h> | 42 | #include <asm/system.h> |
| 43 | 43 | ||
diff --git a/include/asm-blackfin/mach-bf561/defBF561.h b/arch/blackfin/mach-bf561/include/mach/defBF561.h index 1ab50e906fe7..4eca2026bb92 100644 --- a/include/asm-blackfin/mach-bf561/defBF561.h +++ b/arch/blackfin/mach-bf561/include/mach/defBF561.h | |||
| @@ -37,7 +37,7 @@ | |||
| 37 | #endif | 37 | #endif |
| 38 | */ | 38 | */ |
| 39 | /* include all Core registers and bit definitions */ | 39 | /* include all Core registers and bit definitions */ |
| 40 | #include <asm/mach-common/def_LPBlackfin.h> | 40 | #include <asm/def_LPBlackfin.h> |
| 41 | 41 | ||
| 42 | /*********************************************************************************** */ | 42 | /*********************************************************************************** */ |
| 43 | /* System MMR Register Map */ | 43 | /* System MMR Register Map */ |
diff --git a/include/asm-blackfin/mach-bf561/dma.h b/arch/blackfin/mach-bf561/include/mach/dma.h index 8bc46cd89a02..8bc46cd89a02 100644 --- a/include/asm-blackfin/mach-bf561/dma.h +++ b/arch/blackfin/mach-bf561/include/mach/dma.h | |||
diff --git a/include/asm-blackfin/mach-bf561/irq.h b/arch/blackfin/mach-bf561/include/mach/irq.h index 6698389c5564..6698389c5564 100644 --- a/include/asm-blackfin/mach-bf561/irq.h +++ b/arch/blackfin/mach-bf561/include/mach/irq.h | |||
diff --git a/include/asm-blackfin/mach-bf561/mem_init.h b/arch/blackfin/mach-bf561/include/mach/mem_init.h index e163260bca18..e163260bca18 100644 --- a/include/asm-blackfin/mach-bf561/mem_init.h +++ b/arch/blackfin/mach-bf561/include/mach/mem_init.h | |||
diff --git a/include/asm-blackfin/mach-bf561/mem_map.h b/arch/blackfin/mach-bf561/include/mach/mem_map.h index c26d8486cc4b..c26d8486cc4b 100644 --- a/include/asm-blackfin/mach-bf561/mem_map.h +++ b/arch/blackfin/mach-bf561/include/mach/mem_map.h | |||
diff --git a/include/asm-blackfin/mach-bf561/portmux.h b/arch/blackfin/mach-bf561/include/mach/portmux.h index a6ee8206efb6..a6ee8206efb6 100644 --- a/include/asm-blackfin/mach-bf561/portmux.h +++ b/arch/blackfin/mach-bf561/include/mach/portmux.h | |||
diff --git a/arch/blackfin/mach-bf561/ints-priority.c b/arch/blackfin/mach-bf561/ints-priority.c index 09b541b0f7c2..9d2f23344720 100644 --- a/arch/blackfin/mach-bf561/ints-priority.c +++ b/arch/blackfin/mach-bf561/ints-priority.c | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | #include <linux/irq.h> | 31 | #include <linux/irq.h> |
| 32 | #include <asm/blackfin.h> | 32 | #include <asm/blackfin.h> |
| 33 | 33 | ||
| 34 | void program_IAR(void) | 34 | void __init program_IAR(void) |
| 35 | { | 35 | { |
| 36 | /* Program the IAR0 Register with the configured priority */ | 36 | /* Program the IAR0 Register with the configured priority */ |
| 37 | bfin_write_SICA_IAR0(((CONFIG_IRQ_PLL_WAKEUP - 7) << IRQ_PLL_WAKEUP_POS) | | 37 | bfin_write_SICA_IAR0(((CONFIG_IRQ_PLL_WAKEUP - 7) << IRQ_PLL_WAKEUP_POS) | |
diff --git a/arch/blackfin/mach-common/Makefile b/arch/blackfin/mach-common/Makefile index 422bfee34adc..e6ed57c56d4b 100644 --- a/arch/blackfin/mach-common/Makefile +++ b/arch/blackfin/mach-common/Makefile | |||
| @@ -3,9 +3,10 @@ | |||
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | obj-y := \ | 5 | obj-y := \ |
| 6 | cache.o cacheinit.o entry.o \ | 6 | cache.o entry.o head.o \ |
| 7 | interrupt.o lock.o irqpanic.o arch_checks.o ints-priority.o | 7 | interrupt.o irqpanic.o arch_checks.o ints-priority.o |
| 8 | 8 | ||
| 9 | obj-$(CONFIG_BFIN_ICACHE_LOCK) += lock.o | ||
| 9 | obj-$(CONFIG_PM) += pm.o dpmc_modes.o | 10 | obj-$(CONFIG_PM) += pm.o dpmc_modes.o |
| 10 | obj-$(CONFIG_CPU_FREQ) += cpufreq.o | 11 | obj-$(CONFIG_CPU_FREQ) += cpufreq.o |
| 11 | obj-$(CONFIG_CPU_VOLTAGE) += dpmc.o | 12 | obj-$(CONFIG_CPU_VOLTAGE) += dpmc.o |
diff --git a/arch/blackfin/mach-common/arch_checks.c b/arch/blackfin/mach-common/arch_checks.c index f9160d83b91f..98133b968f7b 100644 --- a/arch/blackfin/mach-common/arch_checks.c +++ b/arch/blackfin/mach-common/arch_checks.c | |||
| @@ -27,8 +27,9 @@ | |||
| 27 | * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | 27 | * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
| 28 | */ | 28 | */ |
| 29 | 29 | ||
| 30 | #include <asm/mach/anomaly.h> | 30 | #include <asm/fixed_code.h> |
| 31 | #include <asm/mach-common/clocks.h> | 31 | #include <mach/anomaly.h> |
| 32 | #include <asm/clocks.h> | ||
| 32 | 33 | ||
| 33 | #ifdef CONFIG_BFIN_KERNEL_CLOCK | 34 | #ifdef CONFIG_BFIN_KERNEL_CLOCK |
| 34 | 35 | ||
| @@ -53,3 +54,11 @@ | |||
| 53 | # endif | 54 | # endif |
| 54 | 55 | ||
| 55 | #endif /* CONFIG_BFIN_KERNEL_CLOCK */ | 56 | #endif /* CONFIG_BFIN_KERNEL_CLOCK */ |
| 57 | |||
| 58 | #if CONFIG_BOOT_LOAD < FIXED_CODE_END | ||
| 59 | # error "The kernel load address must be after the fixed code section" | ||
| 60 | #endif | ||
| 61 | |||
| 62 | #if (CONFIG_BOOT_LOAD & 0x3) | ||
| 63 | # error "The kernel load address must be 4 byte aligned" | ||
| 64 | #endif | ||
diff --git a/arch/blackfin/mach-common/cache.S b/arch/blackfin/mach-common/cache.S index 0521b1588204..85f8c79b3c37 100644 --- a/arch/blackfin/mach-common/cache.S +++ b/arch/blackfin/mach-common/cache.S | |||
| @@ -34,81 +34,6 @@ | |||
| 34 | #include <asm/cache.h> | 34 | #include <asm/cache.h> |
| 35 | 35 | ||
| 36 | .text | 36 | .text |
| 37 | .align 2 | ||
| 38 | ENTRY(_cache_invalidate) | ||
| 39 | |||
| 40 | /* | ||
| 41 | * Icache or DcacheA or DcacheB Invalidation | ||
| 42 | * or any combination thereof | ||
| 43 | * R0 has bits | ||
| 44 | * CPLB_ENABLE_ICACHE_P,CPLB_ENABLE_DCACHE_P,CPLB_ENABLE_DCACHE2_P | ||
| 45 | * set as required | ||
| 46 | */ | ||
| 47 | [--SP] = R7; | ||
| 48 | |||
| 49 | R7 = R0; | ||
| 50 | CC = BITTST(R7,CPLB_ENABLE_ICACHE_P); | ||
| 51 | IF !CC JUMP .Lno_icache; | ||
| 52 | [--SP] = RETS; | ||
| 53 | CALL _icache_invalidate; | ||
| 54 | RETS = [SP++]; | ||
| 55 | .Lno_icache: | ||
| 56 | CC = BITTST(R7,CPLB_ENABLE_DCACHE_P); | ||
| 57 | IF !CC JUMP .Lno_dcache_a; | ||
| 58 | R0 = 0; /* specifies bank A */ | ||
| 59 | [--SP] = RETS; | ||
| 60 | CALL _dcache_invalidate; | ||
| 61 | RETS = [SP++]; | ||
| 62 | .Lno_dcache_a: | ||
| 63 | CC = BITTST(R7,CPLB_ENABLE_DCACHE2_P); | ||
| 64 | IF !CC JUMP .Lno_dcache_b; | ||
| 65 | R0 = 0; | ||
| 66 | BITSET(R0, 23); /* specifies bank B */ | ||
| 67 | [--SP] = RETS; | ||
| 68 | CALL _dcache_invalidate; | ||
| 69 | RETS = [SP++]; | ||
| 70 | .Lno_dcache_b: | ||
| 71 | R7 = [SP++]; | ||
| 72 | RTS; | ||
| 73 | ENDPROC(_cache_invalidate) | ||
| 74 | |||
| 75 | /* Invalidate the Entire Instruction cache by | ||
| 76 | * disabling IMC bit | ||
| 77 | */ | ||
| 78 | ENTRY(_icache_invalidate) | ||
| 79 | ENTRY(_invalidate_entire_icache) | ||
| 80 | [--SP] = ( R7:5); | ||
| 81 | |||
| 82 | P0.L = LO(IMEM_CONTROL); | ||
| 83 | P0.H = HI(IMEM_CONTROL); | ||
| 84 | R7 = [P0]; | ||
| 85 | |||
| 86 | /* Clear the IMC bit , All valid bits in the instruction | ||
| 87 | * cache are set to the invalid state | ||
| 88 | */ | ||
| 89 | BITCLR(R7,IMC_P); | ||
| 90 | CLI R6; | ||
| 91 | SSYNC; /* SSYNC required before invalidating cache. */ | ||
| 92 | .align 8; | ||
| 93 | [P0] = R7; | ||
| 94 | SSYNC; | ||
| 95 | STI R6; | ||
| 96 | |||
| 97 | /* Configures the instruction cache agian */ | ||
| 98 | R6 = (IMC | ENICPLB); | ||
| 99 | R7 = R7 | R6; | ||
| 100 | |||
| 101 | CLI R6; | ||
| 102 | SSYNC; /* SSYNC required before writing to IMEM_CONTROL. */ | ||
| 103 | .align 8; | ||
| 104 | [P0] = R7; | ||
| 105 | SSYNC; | ||
| 106 | STI R6; | ||
| 107 | |||
| 108 | ( R7:5) = [SP++]; | ||
| 109 | RTS; | ||
| 110 | ENDPROC(_invalidate_entire_icache) | ||
| 111 | ENDPROC(_icache_invalidate) | ||
| 112 | 37 | ||
| 113 | /* | 38 | /* |
| 114 | * blackfin_cache_flush_range(start, end) | 39 | * blackfin_cache_flush_range(start, end) |
| @@ -190,46 +115,6 @@ ENTRY(_blackfin_dcache_invalidate_range) | |||
| 190 | RTS; | 115 | RTS; |
| 191 | ENDPROC(_blackfin_dcache_invalidate_range) | 116 | ENDPROC(_blackfin_dcache_invalidate_range) |
| 192 | 117 | ||
| 193 | /* Invalidate the Entire Data cache by | ||
| 194 | * clearing DMC[1:0] bits | ||
| 195 | */ | ||
| 196 | ENTRY(_invalidate_entire_dcache) | ||
| 197 | ENTRY(_dcache_invalidate) | ||
| 198 | [--SP] = ( R7:6); | ||
| 199 | |||
| 200 | P0.L = LO(DMEM_CONTROL); | ||
| 201 | P0.H = HI(DMEM_CONTROL); | ||
| 202 | R7 = [P0]; | ||
| 203 | |||
| 204 | /* Clear the DMC[1:0] bits, All valid bits in the data | ||
| 205 | * cache are set to the invalid state | ||
| 206 | */ | ||
| 207 | BITCLR(R7,DMC0_P); | ||
| 208 | BITCLR(R7,DMC1_P); | ||
| 209 | CLI R6; | ||
| 210 | SSYNC; /* SSYNC required before writing to DMEM_CONTROL. */ | ||
| 211 | .align 8; | ||
| 212 | [P0] = R7; | ||
| 213 | SSYNC; | ||
| 214 | STI R6; | ||
| 215 | |||
| 216 | /* Configures the data cache again */ | ||
| 217 | |||
| 218 | R6 = DMEM_CNTR; | ||
| 219 | R7 = R7 | R6; | ||
| 220 | |||
| 221 | CLI R6; | ||
| 222 | SSYNC; /* SSYNC required before writing to DMEM_CONTROL. */ | ||
| 223 | .align 8; | ||
| 224 | [P0] = R7; | ||
| 225 | SSYNC; | ||
| 226 | STI R6; | ||
| 227 | |||
| 228 | ( R7:6) = [SP++]; | ||
| 229 | RTS; | ||
| 230 | ENDPROC(_dcache_invalidate) | ||
| 231 | ENDPROC(_invalidate_entire_dcache) | ||
| 232 | |||
| 233 | ENTRY(_blackfin_dcache_flush_range) | 118 | ENTRY(_blackfin_dcache_flush_range) |
| 234 | R2 = -L1_CACHE_BYTES; | 119 | R2 = -L1_CACHE_BYTES; |
| 235 | R2 = R0 & R2; | 120 | R2 = R0 & R2; |
diff --git a/arch/blackfin/mach-common/cacheinit.S b/arch/blackfin/mach-common/cacheinit.S deleted file mode 100644 index 22fada0c1cb3..000000000000 --- a/arch/blackfin/mach-common/cacheinit.S +++ /dev/null | |||
| @@ -1,77 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * File: arch/blackfin/mach-common/cacheinit.S | ||
| 3 | * Based on: | ||
| 4 | * Author: LG Soft India | ||
| 5 | * | ||
| 6 | * Created: ? | ||
| 7 | * Description: cache initialization | ||
| 8 | * | ||
| 9 | * Modified: | ||
| 10 | * Copyright 2004-2006 Analog Devices Inc. | ||
| 11 | * | ||
| 12 | * Bugs: Enter bugs at http://blackfin.uclinux.org/ | ||
| 13 | * | ||
| 14 | * This program is free software; you can redistribute it and/or modify | ||
| 15 | * it under the terms of the GNU General Public License as published by | ||
| 16 | * the Free Software Foundation; either version 2 of the License, or | ||
| 17 | * (at your option) any later version. | ||
| 18 | * | ||
| 19 | * This program is distributed in the hope that it will be useful, | ||
| 20 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 21 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 22 | * GNU General Public License for more details. | ||
| 23 | * | ||
| 24 | * You should have received a copy of the GNU General Public License | ||
| 25 | * along with this program; if not, see the file COPYING, or write | ||
| 26 | * to the Free Software Foundation, Inc., | ||
| 27 | * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | ||
| 28 | */ | ||
| 29 | |||
| 30 | /* This function sets up the data and instruction cache. The | ||
| 31 | * tables like icplb table, dcplb table and Page Descriptor table | ||
| 32 | * are defined in cplbtab.h. You can configure those tables for | ||
| 33 | * your suitable requirements | ||
| 34 | */ | ||
| 35 | |||
| 36 | #include <linux/linkage.h> | ||
| 37 | #include <asm/blackfin.h> | ||
| 38 | |||
| 39 | .text | ||
| 40 | |||
| 41 | #if ANOMALY_05000125 | ||
| 42 | #if defined(CONFIG_BFIN_ICACHE) | ||
| 43 | ENTRY(_bfin_write_IMEM_CONTROL) | ||
| 44 | |||
| 45 | /* Enable Instruction Cache */ | ||
| 46 | P0.l = LO(IMEM_CONTROL); | ||
| 47 | P0.h = HI(IMEM_CONTROL); | ||
| 48 | |||
| 49 | /* Anomaly 05000125 */ | ||
| 50 | CLI R1; | ||
| 51 | SSYNC; /* SSYNC required before writing to IMEM_CONTROL. */ | ||
| 52 | .align 8; | ||
| 53 | [P0] = R0; | ||
| 54 | SSYNC; | ||
| 55 | STI R1; | ||
| 56 | RTS; | ||
| 57 | |||
| 58 | ENDPROC(_bfin_write_IMEM_CONTROL) | ||
| 59 | #endif | ||
| 60 | |||
| 61 | #if defined(CONFIG_BFIN_DCACHE) | ||
| 62 | ENTRY(_bfin_write_DMEM_CONTROL) | ||
| 63 | P0.l = LO(DMEM_CONTROL); | ||
| 64 | P0.h = HI(DMEM_CONTROL); | ||
| 65 | |||
| 66 | CLI R1; | ||
| 67 | SSYNC; /* SSYNC required before writing to DMEM_CONTROL. */ | ||
| 68 | .align 8; | ||
| 69 | [P0] = R0; | ||
| 70 | SSYNC; | ||
| 71 | STI R1; | ||
| 72 | RTS; | ||
| 73 | |||
| 74 | ENDPROC(_bfin_write_DMEM_CONTROL) | ||
| 75 | #endif | ||
| 76 | |||
| 77 | #endif | ||
diff --git a/arch/blackfin/mach-common/dpmc_modes.S b/arch/blackfin/mach-common/dpmc_modes.S index 5e3f1d8a4fb8..ad5431e2cd05 100644 --- a/arch/blackfin/mach-common/dpmc_modes.S +++ b/arch/blackfin/mach-common/dpmc_modes.S | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | 6 | ||
| 7 | #include <linux/linkage.h> | 7 | #include <linux/linkage.h> |
| 8 | #include <asm/blackfin.h> | 8 | #include <asm/blackfin.h> |
| 9 | #include <asm/mach/irq.h> | 9 | #include <mach/irq.h> |
| 10 | #include <asm/dpmc.h> | 10 | #include <asm/dpmc.h> |
| 11 | 11 | ||
| 12 | .section .l1.text | 12 | .section .l1.text |
| @@ -78,62 +78,6 @@ ENTRY(_hibernate_mode) | |||
| 78 | jump .Lforever; | 78 | jump .Lforever; |
| 79 | ENDPROC(_hibernate_mode) | 79 | ENDPROC(_hibernate_mode) |
| 80 | 80 | ||
| 81 | ENTRY(_deep_sleep) | ||
| 82 | [--SP] = ( R7:0, P5:0 ); | ||
| 83 | [--SP] = RETS; | ||
| 84 | |||
| 85 | CLI R4; | ||
| 86 | |||
| 87 | R0 = IWR_ENABLE(0); | ||
| 88 | R1 = IWR_DISABLE_ALL; | ||
| 89 | R2 = IWR_DISABLE_ALL; | ||
| 90 | |||
| 91 | call _set_sic_iwr; | ||
| 92 | |||
| 93 | call _set_dram_srfs; | ||
| 94 | |||
| 95 | /* Clear all the interrupts,bits sticky */ | ||
| 96 | R0 = 0xFFFF (Z); | ||
| 97 | call _set_rtc_istat | ||
| 98 | |||
| 99 | P0.H = hi(PLL_CTL); | ||
| 100 | P0.L = lo(PLL_CTL); | ||
| 101 | R0 = W[P0](z); | ||
| 102 | BITSET (R0, 5); | ||
| 103 | W[P0] = R0.L; | ||
| 104 | |||
| 105 | call _test_pll_locked; | ||
| 106 | |||
| 107 | SSYNC; | ||
| 108 | IDLE; | ||
| 109 | |||
| 110 | call _unset_dram_srfs; | ||
| 111 | |||
| 112 | call _test_pll_locked; | ||
| 113 | |||
| 114 | R0 = IWR_ENABLE(0); | ||
| 115 | R1 = IWR_DISABLE_ALL; | ||
| 116 | R2 = IWR_DISABLE_ALL; | ||
| 117 | |||
| 118 | call _set_sic_iwr; | ||
| 119 | |||
| 120 | P0.H = hi(PLL_CTL); | ||
| 121 | P0.L = lo(PLL_CTL); | ||
| 122 | R0 = w[p0](z); | ||
| 123 | BITCLR (R0, 3); | ||
| 124 | BITCLR (R0, 5); | ||
| 125 | BITCLR (R0, 8); | ||
| 126 | w[p0] = R0; | ||
| 127 | IDLE; | ||
| 128 | call _test_pll_locked; | ||
| 129 | |||
| 130 | STI R4; | ||
| 131 | |||
| 132 | RETS = [SP++]; | ||
| 133 | ( R7:0, P5:0 ) = [SP++]; | ||
| 134 | RTS; | ||
| 135 | ENDPROC(_deep_sleep) | ||
| 136 | |||
| 137 | ENTRY(_sleep_deeper) | 81 | ENTRY(_sleep_deeper) |
| 138 | [--SP] = ( R7:0, P5:0 ); | 82 | [--SP] = ( R7:0, P5:0 ); |
| 139 | [--SP] = RETS; | 83 | [--SP] = RETS; |
diff --git a/arch/blackfin/mach-common/entry.S b/arch/blackfin/mach-common/entry.S index eceb484d90f9..847c172a99eb 100644 --- a/arch/blackfin/mach-common/entry.S +++ b/arch/blackfin/mach-common/entry.S | |||
| @@ -43,7 +43,7 @@ | |||
| 43 | #include <asm/asm-offsets.h> | 43 | #include <asm/asm-offsets.h> |
| 44 | #include <asm/trace.h> | 44 | #include <asm/trace.h> |
| 45 | 45 | ||
| 46 | #include <asm/mach-common/context.S> | 46 | #include <asm/context.S> |
| 47 | 47 | ||
| 48 | #if defined(CONFIG_BFIN_SCRATCH_REG_RETN) | 48 | #if defined(CONFIG_BFIN_SCRATCH_REG_RETN) |
| 49 | # define EX_SCRATCH_REG RETN | 49 | # define EX_SCRATCH_REG RETN |
| @@ -158,14 +158,16 @@ ENTRY(_ex_single_step) | |||
| 158 | cc = r7 == r6; | 158 | cc = r7 == r6; |
| 159 | if cc jump _bfin_return_from_exception; | 159 | if cc jump _bfin_return_from_exception; |
| 160 | 160 | ||
| 161 | #ifdef CONFIG_KGDB | ||
| 161 | /* Don't do single step in hardware exception handler */ | 162 | /* Don't do single step in hardware exception handler */ |
| 162 | p5.l = lo(IPEND); | 163 | p5.l = lo(IPEND); |
| 163 | p5.h = hi(IPEND); | 164 | p5.h = hi(IPEND); |
| 164 | r6 = [p5]; | 165 | r6 = [p5]; |
| 166 | cc = bittst(r6, 4); | ||
| 167 | if cc jump _bfin_return_from_exception; | ||
| 165 | cc = bittst(r6, 5); | 168 | cc = bittst(r6, 5); |
| 166 | if cc jump _bfin_return_from_exception; | 169 | if cc jump _bfin_return_from_exception; |
| 167 | 170 | ||
| 168 | #ifdef CONFIG_KGDB | ||
| 169 | /* skip single step if current interrupt priority is higher than | 171 | /* skip single step if current interrupt priority is higher than |
| 170 | * that of the first instruction, from which gdb starts single step */ | 172 | * that of the first instruction, from which gdb starts single step */ |
| 171 | r6 >>= 6; | 173 | r6 >>= 6; |
| @@ -186,17 +188,27 @@ ENTRY(_ex_single_step) | |||
| 186 | if cc jump .Ldo_single_step; | 188 | if cc jump .Ldo_single_step; |
| 187 | r6 += -1; | 189 | r6 += -1; |
| 188 | cc = r6 < r7; | 190 | cc = r6 < r7; |
| 189 | if cc jump _bfin_return_from_exception; | 191 | if cc jump 1f; |
| 190 | .Ldo_single_step: | 192 | .Ldo_single_step: |
| 191 | #endif | 193 | #else |
| 192 | |||
| 193 | /* If we were in user mode, do the single step normally. */ | 194 | /* If we were in user mode, do the single step normally. */ |
| 195 | p5.l = lo(IPEND); | ||
| 196 | p5.h = hi(IPEND); | ||
| 194 | r6 = [p5]; | 197 | r6 = [p5]; |
| 195 | r7 = 0xffe0 (z); | 198 | r7 = 0xffe0 (z); |
| 196 | r7 = r7 & r6; | 199 | r7 = r7 & r6; |
| 197 | cc = r7 == 0; | 200 | cc = r7 == 0; |
| 198 | if cc jump 1f; | 201 | if !cc jump 1f; |
| 202 | #endif | ||
| 199 | 203 | ||
| 204 | /* Single stepping only a single instruction, so clear the trace | ||
| 205 | * bit here. */ | ||
| 206 | r7 = syscfg; | ||
| 207 | bitclr (r7, 0); | ||
| 208 | syscfg = R7; | ||
| 209 | jump _ex_trap_c; | ||
| 210 | |||
| 211 | 1: | ||
| 200 | /* | 212 | /* |
| 201 | * We were in an interrupt handler. By convention, all of them save | 213 | * We were in an interrupt handler. By convention, all of them save |
| 202 | * SYSCFG with their first instruction, so by checking whether our | 214 | * SYSCFG with their first instruction, so by checking whether our |
| @@ -224,15 +236,11 @@ ENTRY(_ex_single_step) | |||
| 224 | cc = R7 == R6; | 236 | cc = R7 == R6; |
| 225 | if !cc jump _bfin_return_from_exception; | 237 | if !cc jump _bfin_return_from_exception; |
| 226 | 238 | ||
| 227 | 1: | ||
| 228 | /* Single stepping only a single instruction, so clear the trace | ||
| 229 | * bit here. */ | ||
| 230 | r7 = syscfg; | 239 | r7 = syscfg; |
| 231 | bitclr (r7, 0); | 240 | bitclr (r7, 0); |
| 232 | syscfg = R7; | 241 | syscfg = R7; |
| 233 | 242 | ||
| 234 | jump _ex_trap_c; | 243 | /* Fall through to _bfin_return_from_exception. */ |
| 235 | |||
| 236 | ENDPROC(_ex_single_step) | 244 | ENDPROC(_ex_single_step) |
| 237 | 245 | ||
| 238 | ENTRY(_bfin_return_from_exception) | 246 | ENTRY(_bfin_return_from_exception) |
| @@ -1414,6 +1422,12 @@ ENTRY(_sys_call_table) | |||
| 1414 | .long _sys_semtimedop | 1422 | .long _sys_semtimedop |
| 1415 | .long _sys_timerfd_settime | 1423 | .long _sys_timerfd_settime |
| 1416 | .long _sys_timerfd_gettime | 1424 | .long _sys_timerfd_gettime |
| 1425 | .long _sys_signalfd4 /* 360 */ | ||
| 1426 | .long _sys_eventfd2 | ||
| 1427 | .long _sys_epoll_create1 | ||
| 1428 | .long _sys_dup3 | ||
| 1429 | .long _sys_pipe2 | ||
| 1430 | .long _sys_inotify_init1 /* 365 */ | ||
| 1417 | 1431 | ||
| 1418 | .rept NR_syscalls-(.-_sys_call_table)/4 | 1432 | .rept NR_syscalls-(.-_sys_call_table)/4 |
| 1419 | .long _sys_ni_syscall | 1433 | .long _sys_ni_syscall |
diff --git a/arch/blackfin/mach-common/head.S b/arch/blackfin/mach-common/head.S new file mode 100644 index 000000000000..191b4e974c4b --- /dev/null +++ b/arch/blackfin/mach-common/head.S | |||
| @@ -0,0 +1,207 @@ | |||
| 1 | /* | ||
| 2 | * Common Blackfin startup code | ||
| 3 | * | ||
| 4 | * Copyright 2004-2008 Analog Devices Inc. | ||
| 5 | * | ||
| 6 | * Enter bugs at http://blackfin.uclinux.org/ | ||
| 7 | * | ||
| 8 | * Licensed under the GPL-2 or later. | ||
| 9 | */ | ||
| 10 | |||
| 11 | #include <linux/linkage.h> | ||
| 12 | #include <linux/init.h> | ||
| 13 | #include <asm/blackfin.h> | ||
| 14 | #include <asm/thread_info.h> | ||
| 15 | #include <asm/trace.h> | ||
| 16 | |||
| 17 | __INIT | ||
| 18 | |||
| 19 | #define INITIAL_STACK (L1_SCRATCH_START + L1_SCRATCH_LENGTH - 12) | ||
| 20 | |||
| 21 | ENTRY(__start) | ||
| 22 | /* R0: argument of command line string, passed from uboot, save it */ | ||
| 23 | R7 = R0; | ||
| 24 | /* Enable Cycle Counter and Nesting Of Interrupts */ | ||
| 25 | #ifdef CONFIG_BFIN_SCRATCH_REG_CYCLES | ||
| 26 | R0 = SYSCFG_SNEN; | ||
| 27 | #else | ||
| 28 | R0 = SYSCFG_SNEN | SYSCFG_CCEN; | ||
| 29 | #endif | ||
| 30 | SYSCFG = R0; | ||
| 31 | R0 = 0; | ||
| 32 | |||
| 33 | /* Clear Out All the data and pointer Registers */ | ||
| 34 | R1 = R0; | ||
| 35 | R2 = R0; | ||
| 36 | R3 = R0; | ||
| 37 | R4 = R0; | ||
| 38 | R5 = R0; | ||
| 39 | R6 = R0; | ||
| 40 | |||
| 41 | P0 = R0; | ||
| 42 | P1 = R0; | ||
| 43 | P2 = R0; | ||
| 44 | P3 = R0; | ||
| 45 | P4 = R0; | ||
| 46 | P5 = R0; | ||
| 47 | |||
| 48 | LC0 = r0; | ||
| 49 | LC1 = r0; | ||
| 50 | L0 = r0; | ||
| 51 | L1 = r0; | ||
| 52 | L2 = r0; | ||
| 53 | L3 = r0; | ||
| 54 | |||
| 55 | /* Clear Out All the DAG Registers */ | ||
| 56 | B0 = r0; | ||
| 57 | B1 = r0; | ||
| 58 | B2 = r0; | ||
| 59 | B3 = r0; | ||
| 60 | |||
| 61 | I0 = r0; | ||
| 62 | I1 = r0; | ||
| 63 | I2 = r0; | ||
| 64 | I3 = r0; | ||
| 65 | |||
| 66 | M0 = r0; | ||
| 67 | M1 = r0; | ||
| 68 | M2 = r0; | ||
| 69 | M3 = r0; | ||
| 70 | |||
| 71 | trace_buffer_init(p0,r0); | ||
| 72 | P0 = R1; | ||
| 73 | R0 = R1; | ||
| 74 | |||
| 75 | /* Turn off the icache */ | ||
| 76 | p0.l = LO(IMEM_CONTROL); | ||
| 77 | p0.h = HI(IMEM_CONTROL); | ||
| 78 | R1 = [p0]; | ||
| 79 | R0 = ~ENICPLB; | ||
| 80 | R0 = R0 & R1; | ||
| 81 | [p0] = R0; | ||
| 82 | SSYNC; | ||
| 83 | |||
| 84 | /* Turn off the dcache */ | ||
| 85 | p0.l = LO(DMEM_CONTROL); | ||
| 86 | p0.h = HI(DMEM_CONTROL); | ||
| 87 | R1 = [p0]; | ||
| 88 | R0 = ~ENDCPLB; | ||
| 89 | R0 = R0 & R1; | ||
| 90 | [p0] = R0; | ||
| 91 | SSYNC; | ||
| 92 | |||
| 93 | /* Save RETX, in case of doublefault */ | ||
| 94 | p0.l = ___retx; | ||
| 95 | p0.h = ___retx; | ||
| 96 | R0 = RETX; | ||
| 97 | [P0] = R0; | ||
| 98 | |||
| 99 | /* Initialize stack pointer */ | ||
| 100 | sp.l = lo(INITIAL_STACK); | ||
| 101 | sp.h = hi(INITIAL_STACK); | ||
| 102 | fp = sp; | ||
| 103 | usp = sp; | ||
| 104 | |||
| 105 | #ifdef CONFIG_EARLY_PRINTK | ||
| 106 | call _init_early_exception_vectors; | ||
| 107 | #endif | ||
| 108 | |||
| 109 | /* Put The Code for PLL Programming and SDRAM Programming in L1 ISRAM */ | ||
| 110 | call _bf53x_relocate_l1_mem; | ||
| 111 | #ifdef CONFIG_BFIN_KERNEL_CLOCK | ||
| 112 | call _start_dma_code; | ||
| 113 | #endif | ||
| 114 | |||
| 115 | /* This section keeps the processor in supervisor mode | ||
| 116 | * during kernel boot. Switches to user mode at end of boot. | ||
| 117 | * See page 3-9 of Hardware Reference manual for documentation. | ||
| 118 | */ | ||
| 119 | |||
| 120 | /* EVT15 = _real_start */ | ||
| 121 | |||
| 122 | p0.l = lo(EVT15); | ||
| 123 | p0.h = hi(EVT15); | ||
| 124 | p1.l = _real_start; | ||
| 125 | p1.h = _real_start; | ||
| 126 | [p0] = p1; | ||
| 127 | csync; | ||
| 128 | |||
| 129 | p0.l = lo(IMASK); | ||
| 130 | p0.h = hi(IMASK); | ||
| 131 | p1.l = IMASK_IVG15; | ||
| 132 | p1.h = 0x0; | ||
| 133 | [p0] = p1; | ||
| 134 | csync; | ||
| 135 | |||
| 136 | raise 15; | ||
| 137 | p0.l = .LWAIT_HERE; | ||
| 138 | p0.h = .LWAIT_HERE; | ||
| 139 | reti = p0; | ||
| 140 | #if ANOMALY_05000281 | ||
| 141 | nop; nop; nop; | ||
| 142 | #endif | ||
| 143 | rti; | ||
| 144 | |||
| 145 | .LWAIT_HERE: | ||
| 146 | jump .LWAIT_HERE; | ||
| 147 | ENDPROC(__start) | ||
| 148 | |||
| 149 | /* A little BF561 glue ... */ | ||
| 150 | #ifndef WDOG_CTL | ||
| 151 | # define WDOG_CTL WDOGA_CTL | ||
| 152 | #endif | ||
| 153 | |||
| 154 | ENTRY(_real_start) | ||
| 155 | /* Enable nested interrupts */ | ||
| 156 | [--sp] = reti; | ||
| 157 | |||
| 158 | /* watchdog off for now */ | ||
| 159 | p0.l = lo(WDOG_CTL); | ||
| 160 | p0.h = hi(WDOG_CTL); | ||
| 161 | r0 = 0xAD6(z); | ||
| 162 | w[p0] = r0; | ||
| 163 | ssync; | ||
| 164 | |||
| 165 | /* Zero out the bss region | ||
| 166 | * Note: this will fail if bss is 0 bytes ... | ||
| 167 | */ | ||
| 168 | r0 = 0 (z); | ||
| 169 | r1.l = ___bss_start; | ||
| 170 | r1.h = ___bss_start; | ||
| 171 | r2.l = ___bss_stop; | ||
| 172 | r2.h = ___bss_stop; | ||
| 173 | r2 = r2 - r1; | ||
| 174 | r2 >>= 2; | ||
| 175 | p1 = r1; | ||
| 176 | p2 = r2; | ||
| 177 | lsetup (.L_clear_bss, .L_clear_bss) lc0 = p2; | ||
| 178 | .L_clear_bss: | ||
| 179 | [p1++] = r0; | ||
| 180 | |||
| 181 | /* In case there is a NULL pointer reference, | ||
| 182 | * zero out region before stext | ||
| 183 | */ | ||
| 184 | p1 = r0; | ||
| 185 | r2.l = __stext; | ||
| 186 | r2.h = __stext; | ||
| 187 | r2 >>= 2; | ||
| 188 | p2 = r2; | ||
| 189 | lsetup (.L_clear_zero, .L_clear_zero) lc0 = p2; | ||
| 190 | .L_clear_zero: | ||
| 191 | [p1++] = r0; | ||
| 192 | |||
| 193 | /* Pass the u-boot arguments to the global value command line */ | ||
| 194 | R0 = R7; | ||
| 195 | call _cmdline_init; | ||
| 196 | |||
| 197 | /* Load the current thread pointer and stack */ | ||
| 198 | sp.l = _init_thread_union; | ||
| 199 | sp.h = _init_thread_union; | ||
| 200 | p1 = THREAD_SIZE (z); | ||
| 201 | sp = sp + p1; | ||
| 202 | usp = sp; | ||
| 203 | fp = sp; | ||
| 204 | jump.l _start_kernel; | ||
| 205 | ENDPROC(_real_start) | ||
| 206 | |||
| 207 | __FINIT | ||
diff --git a/arch/blackfin/mach-common/interrupt.S b/arch/blackfin/mach-common/interrupt.S index 7f752c87fe46..b27e59d32401 100644 --- a/arch/blackfin/mach-common/interrupt.S +++ b/arch/blackfin/mach-common/interrupt.S | |||
| @@ -29,7 +29,7 @@ | |||
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include <asm/blackfin.h> | 31 | #include <asm/blackfin.h> |
| 32 | #include <asm/mach/irq.h> | 32 | #include <mach/irq.h> |
| 33 | #include <linux/linkage.h> | 33 | #include <linux/linkage.h> |
| 34 | #include <asm/entry.h> | 34 | #include <asm/entry.h> |
| 35 | #include <asm/asm-offsets.h> | 35 | #include <asm/asm-offsets.h> |
| @@ -37,7 +37,7 @@ | |||
| 37 | #include <asm/traps.h> | 37 | #include <asm/traps.h> |
| 38 | #include <asm/thread_info.h> | 38 | #include <asm/thread_info.h> |
| 39 | 39 | ||
| 40 | #include <asm/mach-common/context.S> | 40 | #include <asm/context.S> |
| 41 | 41 | ||
| 42 | .extern _ret_from_exception | 42 | .extern _ret_from_exception |
| 43 | 43 | ||
diff --git a/arch/blackfin/mach-common/ints-priority.c b/arch/blackfin/mach-common/ints-priority.c index 64d746114e4b..5fa536727c61 100644 --- a/arch/blackfin/mach-common/ints-priority.c +++ b/arch/blackfin/mach-common/ints-priority.c | |||
| @@ -71,6 +71,7 @@ atomic_t num_spurious; | |||
| 71 | 71 | ||
| 72 | #ifdef CONFIG_PM | 72 | #ifdef CONFIG_PM |
| 73 | unsigned long bfin_sic_iwr[3]; /* Up to 3 SIC_IWRx registers */ | 73 | unsigned long bfin_sic_iwr[3]; /* Up to 3 SIC_IWRx registers */ |
| 74 | unsigned vr_wakeup; | ||
| 74 | #endif | 75 | #endif |
| 75 | 76 | ||
| 76 | struct ivgx { | 77 | struct ivgx { |
| @@ -184,17 +185,56 @@ static void bfin_internal_unmask_irq(unsigned int irq) | |||
| 184 | #ifdef CONFIG_PM | 185 | #ifdef CONFIG_PM |
| 185 | int bfin_internal_set_wake(unsigned int irq, unsigned int state) | 186 | int bfin_internal_set_wake(unsigned int irq, unsigned int state) |
| 186 | { | 187 | { |
| 187 | unsigned bank, bit; | 188 | unsigned bank, bit, wakeup = 0; |
| 188 | unsigned long flags; | 189 | unsigned long flags; |
| 189 | bank = SIC_SYSIRQ(irq) / 32; | 190 | bank = SIC_SYSIRQ(irq) / 32; |
| 190 | bit = SIC_SYSIRQ(irq) % 32; | 191 | bit = SIC_SYSIRQ(irq) % 32; |
| 191 | 192 | ||
| 193 | switch (irq) { | ||
| 194 | #ifdef IRQ_RTC | ||
| 195 | case IRQ_RTC: | ||
| 196 | wakeup |= WAKE; | ||
| 197 | break; | ||
| 198 | #endif | ||
| 199 | #ifdef IRQ_CAN0_RX | ||
| 200 | case IRQ_CAN0_RX: | ||
| 201 | wakeup |= CANWE; | ||
| 202 | break; | ||
| 203 | #endif | ||
| 204 | #ifdef IRQ_CAN1_RX | ||
| 205 | case IRQ_CAN1_RX: | ||
| 206 | wakeup |= CANWE; | ||
| 207 | break; | ||
| 208 | #endif | ||
| 209 | #ifdef IRQ_USB_INT0 | ||
| 210 | case IRQ_USB_INT0: | ||
| 211 | wakeup |= USBWE; | ||
| 212 | break; | ||
| 213 | #endif | ||
| 214 | #ifdef IRQ_KEY | ||
| 215 | case IRQ_KEY: | ||
| 216 | wakeup |= KPADWE; | ||
| 217 | break; | ||
| 218 | #endif | ||
| 219 | #ifdef CONFIG_BF54x | ||
| 220 | case IRQ_CNT: | ||
| 221 | wakeup |= ROTWE; | ||
| 222 | break; | ||
| 223 | #endif | ||
| 224 | default: | ||
| 225 | break; | ||
| 226 | } | ||
| 227 | |||
| 192 | local_irq_save(flags); | 228 | local_irq_save(flags); |
| 193 | 229 | ||
| 194 | if (state) | 230 | if (state) { |
| 195 | bfin_sic_iwr[bank] |= (1 << bit); | 231 | bfin_sic_iwr[bank] |= (1 << bit); |
| 196 | else | 232 | vr_wakeup |= wakeup; |
| 233 | |||
| 234 | } else { | ||
| 197 | bfin_sic_iwr[bank] &= ~(1 << bit); | 235 | bfin_sic_iwr[bank] &= ~(1 << bit); |
| 236 | vr_wakeup &= ~wakeup; | ||
| 237 | } | ||
| 198 | 238 | ||
| 199 | local_irq_restore(flags); | 239 | local_irq_restore(flags); |
| 200 | 240 | ||
| @@ -943,6 +983,11 @@ int __init init_arch_irq(void) | |||
| 943 | 983 | ||
| 944 | local_irq_disable(); | 984 | local_irq_disable(); |
| 945 | 985 | ||
| 986 | #if (defined(CONFIG_BF537) || defined(CONFIG_BF536)) | ||
| 987 | /* Clear EMAC Interrupt Status bits so we can demux it later */ | ||
| 988 | bfin_write_EMAC_SYSTAT(-1); | ||
| 989 | #endif | ||
| 990 | |||
| 946 | #ifdef CONFIG_BF54x | 991 | #ifdef CONFIG_BF54x |
| 947 | # ifdef CONFIG_PINTx_REASSIGN | 992 | # ifdef CONFIG_PINTx_REASSIGN |
| 948 | pint[0]->assign = CONFIG_PINT0_ASSIGN; | 993 | pint[0]->assign = CONFIG_PINT0_ASSIGN; |
| @@ -1028,13 +1073,22 @@ int __init init_arch_irq(void) | |||
| 1028 | IMASK_IVG10 | IMASK_IVG9 | IMASK_IVG8 | IMASK_IVG7 | IMASK_IVGHW; | 1073 | IMASK_IVG10 | IMASK_IVG9 | IMASK_IVG8 | IMASK_IVG7 | IMASK_IVGHW; |
| 1029 | 1074 | ||
| 1030 | #if defined(CONFIG_BF54x) || defined(CONFIG_BF52x) || defined(CONFIG_BF561) | 1075 | #if defined(CONFIG_BF54x) || defined(CONFIG_BF52x) || defined(CONFIG_BF561) |
| 1031 | bfin_write_SIC_IWR0(IWR_ENABLE_ALL); | 1076 | bfin_write_SIC_IWR0(IWR_DISABLE_ALL); |
| 1032 | bfin_write_SIC_IWR1(IWR_ENABLE_ALL); | 1077 | #if defined(CONFIG_BF52x) |
| 1078 | /* BF52x system reset does not properly reset SIC_IWR1 which | ||
| 1079 | * will screw up the bootrom as it relies on MDMA0/1 waking it | ||
| 1080 | * up from IDLE instructions. See this report for more info: | ||
| 1081 | * http://blackfin.uclinux.org/gf/tracker/4323 | ||
| 1082 | */ | ||
| 1083 | bfin_write_SIC_IWR1(IWR_ENABLE(10) | IWR_ENABLE(11)); | ||
| 1084 | #else | ||
| 1085 | bfin_write_SIC_IWR1(IWR_DISABLE_ALL); | ||
| 1086 | #endif | ||
| 1033 | # ifdef CONFIG_BF54x | 1087 | # ifdef CONFIG_BF54x |
| 1034 | bfin_write_SIC_IWR2(IWR_ENABLE_ALL); | 1088 | bfin_write_SIC_IWR2(IWR_DISABLE_ALL); |
| 1035 | # endif | 1089 | # endif |
| 1036 | #else | 1090 | #else |
| 1037 | bfin_write_SIC_IWR(IWR_ENABLE_ALL); | 1091 | bfin_write_SIC_IWR(IWR_DISABLE_ALL); |
| 1038 | #endif | 1092 | #endif |
| 1039 | 1093 | ||
| 1040 | return 0; | 1094 | return 0; |
diff --git a/arch/blackfin/mach-common/lock.S b/arch/blackfin/mach-common/lock.S index 30b887e67dd6..9daf01201e9f 100644 --- a/arch/blackfin/mach-common/lock.S +++ b/arch/blackfin/mach-common/lock.S | |||
| @@ -28,13 +28,10 @@ | |||
| 28 | */ | 28 | */ |
| 29 | 29 | ||
| 30 | #include <linux/linkage.h> | 30 | #include <linux/linkage.h> |
| 31 | #include <asm/cplb.h> | ||
| 32 | #include <asm/blackfin.h> | 31 | #include <asm/blackfin.h> |
| 33 | 32 | ||
| 34 | .text | 33 | .text |
| 35 | 34 | ||
| 36 | #ifdef CONFIG_BFIN_ICACHE_LOCK | ||
| 37 | |||
| 38 | /* When you come here, it is assumed that | 35 | /* When you come here, it is assumed that |
| 39 | * R0 - Which way to be locked | 36 | * R0 - Which way to be locked |
| 40 | */ | 37 | */ |
| @@ -189,18 +186,38 @@ ENTRY(_cache_lock) | |||
| 189 | RTS; | 186 | RTS; |
| 190 | ENDPROC(_cache_lock) | 187 | ENDPROC(_cache_lock) |
| 191 | 188 | ||
| 192 | #endif /* BFIN_ICACHE_LOCK */ | 189 | /* Invalidate the Entire Instruction cache by |
| 193 | 190 | * disabling IMC bit | |
| 194 | /* Return the ILOC bits of IMEM_CONTROL | ||
| 195 | */ | 191 | */ |
| 192 | ENTRY(_invalidate_entire_icache) | ||
| 193 | [--SP] = ( R7:5); | ||
| 196 | 194 | ||
| 197 | ENTRY(_read_iloc) | 195 | P0.L = LO(IMEM_CONTROL); |
| 198 | P1.H = HI(IMEM_CONTROL); | 196 | P0.H = HI(IMEM_CONTROL); |
| 199 | P1.L = LO(IMEM_CONTROL); | 197 | R7 = [P0]; |
| 200 | R1 = 0xF; | 198 | |
| 201 | R0 = [P1]; | 199 | /* Clear the IMC bit , All valid bits in the instruction |
| 202 | R0 = R0 >> 3; | 200 | * cache are set to the invalid state |
| 203 | R0 = R0 & R1; | 201 | */ |
| 202 | BITCLR(R7,IMC_P); | ||
| 203 | CLI R6; | ||
| 204 | SSYNC; /* SSYNC required before invalidating cache. */ | ||
| 205 | .align 8; | ||
| 206 | [P0] = R7; | ||
| 207 | SSYNC; | ||
| 208 | STI R6; | ||
| 209 | |||
| 210 | /* Configures the instruction cache agian */ | ||
| 211 | R6 = (IMC | ENICPLB); | ||
| 212 | R7 = R7 | R6; | ||
| 213 | |||
| 214 | CLI R6; | ||
| 215 | SSYNC; /* SSYNC required before writing to IMEM_CONTROL. */ | ||
| 216 | .align 8; | ||
| 217 | [P0] = R7; | ||
| 218 | SSYNC; | ||
| 219 | STI R6; | ||
| 204 | 220 | ||
| 221 | ( R7:5) = [SP++]; | ||
| 205 | RTS; | 222 | RTS; |
| 206 | ENDPROC(_read_iloc) | 223 | ENDPROC(_invalidate_entire_icache) |
diff --git a/arch/blackfin/mach-common/pm.c b/arch/blackfin/mach-common/pm.c index 4fe6a2366b13..e28c6af1f415 100644 --- a/arch/blackfin/mach-common/pm.c +++ b/arch/blackfin/mach-common/pm.c | |||
| @@ -83,13 +83,22 @@ void bfin_pm_suspend_standby_enter(void) | |||
| 83 | bfin_pm_standby_restore(); | 83 | bfin_pm_standby_restore(); |
| 84 | 84 | ||
| 85 | #if defined(CONFIG_BF54x) || defined(CONFIG_BF52x) || defined(CONFIG_BF561) | 85 | #if defined(CONFIG_BF54x) || defined(CONFIG_BF52x) || defined(CONFIG_BF561) |
| 86 | bfin_write_SIC_IWR0(IWR_ENABLE_ALL); | 86 | bfin_write_SIC_IWR0(IWR_DISABLE_ALL); |
| 87 | bfin_write_SIC_IWR1(IWR_ENABLE_ALL); | 87 | #if defined(CONFIG_BF52x) |
| 88 | /* BF52x system reset does not properly reset SIC_IWR1 which | ||
| 89 | * will screw up the bootrom as it relies on MDMA0/1 waking it | ||
| 90 | * up from IDLE instructions. See this report for more info: | ||
| 91 | * http://blackfin.uclinux.org/gf/tracker/4323 | ||
| 92 | */ | ||
| 93 | bfin_write_SIC_IWR1(IWR_ENABLE(10) | IWR_ENABLE(11)); | ||
| 94 | #else | ||
| 95 | bfin_write_SIC_IWR1(IWR_DISABLE_ALL); | ||
| 96 | #endif | ||
| 88 | # ifdef CONFIG_BF54x | 97 | # ifdef CONFIG_BF54x |
| 89 | bfin_write_SIC_IWR2(IWR_ENABLE_ALL); | 98 | bfin_write_SIC_IWR2(IWR_DISABLE_ALL); |
| 90 | # endif | 99 | # endif |
| 91 | #else | 100 | #else |
| 92 | bfin_write_SIC_IWR(IWR_ENABLE_ALL); | 101 | bfin_write_SIC_IWR(IWR_DISABLE_ALL); |
| 93 | #endif | 102 | #endif |
| 94 | 103 | ||
| 95 | local_irq_restore(flags); | 104 | local_irq_restore(flags); |
| @@ -229,28 +238,12 @@ int bfin_pm_suspend_mem_enter(void) | |||
| 229 | wakeup = bfin_read_VR_CTL() & ~FREQ; | 238 | wakeup = bfin_read_VR_CTL() & ~FREQ; |
| 230 | wakeup |= SCKELOW; | 239 | wakeup |= SCKELOW; |
| 231 | 240 | ||
| 232 | /* FIXME: merge this somehow with set_irq_wake */ | ||
| 233 | #ifdef CONFIG_PM_BFIN_WAKE_RTC | ||
| 234 | wakeup |= WAKE; | ||
| 235 | #endif | ||
| 236 | #ifdef CONFIG_PM_BFIN_WAKE_PH6 | 241 | #ifdef CONFIG_PM_BFIN_WAKE_PH6 |
| 237 | wakeup |= PHYWE; | 242 | wakeup |= PHYWE; |
| 238 | #endif | 243 | #endif |
| 239 | #ifdef CONFIG_PM_BFIN_WAKE_CAN | ||
| 240 | wakeup |= CANWE; | ||
| 241 | #endif | ||
| 242 | #ifdef CONFIG_PM_BFIN_WAKE_GP | 244 | #ifdef CONFIG_PM_BFIN_WAKE_GP |
| 243 | wakeup |= GPWE; | 245 | wakeup |= GPWE; |
| 244 | #endif | 246 | #endif |
| 245 | #ifdef CONFIG_PM_BFIN_WAKE_USB | ||
| 246 | wakeup |= USBWE; | ||
| 247 | #endif | ||
| 248 | #ifdef CONFIG_PM_BFIN_WAKE_KEYPAD | ||
| 249 | wakeup |= KPADWE; | ||
| 250 | #endif | ||
| 251 | #ifdef CONFIG_PM_BFIN_WAKE_ROTARY | ||
| 252 | wakeup |= ROTWE; | ||
| 253 | #endif | ||
| 254 | 247 | ||
| 255 | local_irq_save(flags); | 248 | local_irq_save(flags); |
| 256 | 249 | ||
| @@ -268,7 +261,7 @@ int bfin_pm_suspend_mem_enter(void) | |||
| 268 | icache_disable(); | 261 | icache_disable(); |
| 269 | bf53x_suspend_l1_mem(memptr); | 262 | bf53x_suspend_l1_mem(memptr); |
| 270 | 263 | ||
| 271 | do_hibernate(wakeup); /* Goodbye */ | 264 | do_hibernate(wakeup | vr_wakeup); /* Goodbye */ |
| 272 | 265 | ||
| 273 | bf53x_resume_l1_mem(memptr); | 266 | bf53x_resume_l1_mem(memptr); |
| 274 | 267 | ||
diff --git a/arch/blackfin/mm/blackfin_sram.c b/arch/blackfin/mm/blackfin_sram.c index 5af3c31c9365..4f5e887a0d96 100644 --- a/arch/blackfin/mm/blackfin_sram.c +++ b/arch/blackfin/mm/blackfin_sram.c | |||
| @@ -66,7 +66,7 @@ static struct sram_piece free_l1_data_B_sram_head, used_l1_data_B_sram_head; | |||
| 66 | static struct sram_piece free_l1_inst_sram_head, used_l1_inst_sram_head; | 66 | static struct sram_piece free_l1_inst_sram_head, used_l1_inst_sram_head; |
| 67 | #endif | 67 | #endif |
| 68 | 68 | ||
| 69 | #ifdef L2_LENGTH | 69 | #if L2_LENGTH != 0 |
| 70 | static struct sram_piece free_l2_sram_head, used_l2_sram_head; | 70 | static struct sram_piece free_l2_sram_head, used_l2_sram_head; |
| 71 | #endif | 71 | #endif |
| 72 | 72 | ||
| @@ -175,7 +175,7 @@ static void __init l1_inst_sram_init(void) | |||
| 175 | 175 | ||
| 176 | static void __init l2_sram_init(void) | 176 | static void __init l2_sram_init(void) |
| 177 | { | 177 | { |
| 178 | #ifdef L2_LENGTH | 178 | #if L2_LENGTH != 0 |
| 179 | free_l2_sram_head.next = | 179 | free_l2_sram_head.next = |
| 180 | kmem_cache_alloc(sram_piece_cache, GFP_KERNEL); | 180 | kmem_cache_alloc(sram_piece_cache, GFP_KERNEL); |
| 181 | if (!free_l2_sram_head.next) { | 181 | if (!free_l2_sram_head.next) { |
| @@ -335,7 +335,7 @@ static int _sram_free(const void *addr, | |||
| 335 | plast->size += pavail->size; | 335 | plast->size += pavail->size; |
| 336 | kmem_cache_free(sram_piece_cache, pavail); | 336 | kmem_cache_free(sram_piece_cache, pavail); |
| 337 | } else { | 337 | } else { |
| 338 | pavail->next = plast; | 338 | pavail->next = plast->next; |
| 339 | plast->next = pavail; | 339 | plast->next = pavail; |
| 340 | plast = pavail; | 340 | plast = pavail; |
| 341 | } | 341 | } |
| @@ -367,7 +367,7 @@ int sram_free(const void *addr) | |||
| 367 | && addr < (void *)(L1_DATA_B_START + L1_DATA_B_LENGTH)) | 367 | && addr < (void *)(L1_DATA_B_START + L1_DATA_B_LENGTH)) |
| 368 | return l1_data_B_sram_free(addr); | 368 | return l1_data_B_sram_free(addr); |
| 369 | #endif | 369 | #endif |
| 370 | #ifdef L2_LENGTH | 370 | #if L2_LENGTH != 0 |
| 371 | else if (addr >= (void *)L2_START | 371 | else if (addr >= (void *)L2_START |
| 372 | && addr < (void *)(L2_START + L2_LENGTH)) | 372 | && addr < (void *)(L2_START + L2_LENGTH)) |
| 373 | return l2_sram_free(addr); | 373 | return l2_sram_free(addr); |
| @@ -379,7 +379,7 @@ EXPORT_SYMBOL(sram_free); | |||
| 379 | 379 | ||
| 380 | void *l1_data_A_sram_alloc(size_t size) | 380 | void *l1_data_A_sram_alloc(size_t size) |
| 381 | { | 381 | { |
| 382 | unsigned flags; | 382 | unsigned long flags; |
| 383 | void *addr = NULL; | 383 | void *addr = NULL; |
| 384 | 384 | ||
| 385 | /* add mutex operation */ | 385 | /* add mutex operation */ |
| @@ -402,7 +402,7 @@ EXPORT_SYMBOL(l1_data_A_sram_alloc); | |||
| 402 | 402 | ||
| 403 | int l1_data_A_sram_free(const void *addr) | 403 | int l1_data_A_sram_free(const void *addr) |
| 404 | { | 404 | { |
| 405 | unsigned flags; | 405 | unsigned long flags; |
| 406 | int ret; | 406 | int ret; |
| 407 | 407 | ||
| 408 | /* add mutex operation */ | 408 | /* add mutex operation */ |
| @@ -425,7 +425,7 @@ EXPORT_SYMBOL(l1_data_A_sram_free); | |||
| 425 | void *l1_data_B_sram_alloc(size_t size) | 425 | void *l1_data_B_sram_alloc(size_t size) |
| 426 | { | 426 | { |
| 427 | #if L1_DATA_B_LENGTH != 0 | 427 | #if L1_DATA_B_LENGTH != 0 |
| 428 | unsigned flags; | 428 | unsigned long flags; |
| 429 | void *addr; | 429 | void *addr; |
| 430 | 430 | ||
| 431 | /* add mutex operation */ | 431 | /* add mutex operation */ |
| @@ -450,7 +450,7 @@ EXPORT_SYMBOL(l1_data_B_sram_alloc); | |||
| 450 | int l1_data_B_sram_free(const void *addr) | 450 | int l1_data_B_sram_free(const void *addr) |
| 451 | { | 451 | { |
| 452 | #if L1_DATA_B_LENGTH != 0 | 452 | #if L1_DATA_B_LENGTH != 0 |
| 453 | unsigned flags; | 453 | unsigned long flags; |
| 454 | int ret; | 454 | int ret; |
| 455 | 455 | ||
| 456 | /* add mutex operation */ | 456 | /* add mutex operation */ |
| @@ -504,7 +504,7 @@ EXPORT_SYMBOL(l1_data_sram_free); | |||
| 504 | void *l1_inst_sram_alloc(size_t size) | 504 | void *l1_inst_sram_alloc(size_t size) |
| 505 | { | 505 | { |
| 506 | #if L1_CODE_LENGTH != 0 | 506 | #if L1_CODE_LENGTH != 0 |
| 507 | unsigned flags; | 507 | unsigned long flags; |
| 508 | void *addr; | 508 | void *addr; |
| 509 | 509 | ||
| 510 | /* add mutex operation */ | 510 | /* add mutex operation */ |
| @@ -529,7 +529,7 @@ EXPORT_SYMBOL(l1_inst_sram_alloc); | |||
| 529 | int l1_inst_sram_free(const void *addr) | 529 | int l1_inst_sram_free(const void *addr) |
| 530 | { | 530 | { |
| 531 | #if L1_CODE_LENGTH != 0 | 531 | #if L1_CODE_LENGTH != 0 |
| 532 | unsigned flags; | 532 | unsigned long flags; |
| 533 | int ret; | 533 | int ret; |
| 534 | 534 | ||
| 535 | /* add mutex operation */ | 535 | /* add mutex operation */ |
| @@ -551,7 +551,7 @@ EXPORT_SYMBOL(l1_inst_sram_free); | |||
| 551 | /* L1 Scratchpad memory allocate function */ | 551 | /* L1 Scratchpad memory allocate function */ |
| 552 | void *l1sram_alloc(size_t size) | 552 | void *l1sram_alloc(size_t size) |
| 553 | { | 553 | { |
| 554 | unsigned flags; | 554 | unsigned long flags; |
| 555 | void *addr; | 555 | void *addr; |
| 556 | 556 | ||
| 557 | /* add mutex operation */ | 557 | /* add mutex operation */ |
| @@ -569,7 +569,7 @@ void *l1sram_alloc(size_t size) | |||
| 569 | /* L1 Scratchpad memory allocate function */ | 569 | /* L1 Scratchpad memory allocate function */ |
| 570 | void *l1sram_alloc_max(size_t *psize) | 570 | void *l1sram_alloc_max(size_t *psize) |
| 571 | { | 571 | { |
| 572 | unsigned flags; | 572 | unsigned long flags; |
| 573 | void *addr; | 573 | void *addr; |
| 574 | 574 | ||
| 575 | /* add mutex operation */ | 575 | /* add mutex operation */ |
| @@ -587,7 +587,7 @@ void *l1sram_alloc_max(size_t *psize) | |||
| 587 | /* L1 Scratchpad memory free function */ | 587 | /* L1 Scratchpad memory free function */ |
| 588 | int l1sram_free(const void *addr) | 588 | int l1sram_free(const void *addr) |
| 589 | { | 589 | { |
| 590 | unsigned flags; | 590 | unsigned long flags; |
| 591 | int ret; | 591 | int ret; |
| 592 | 592 | ||
| 593 | /* add mutex operation */ | 593 | /* add mutex operation */ |
| @@ -604,8 +604,8 @@ int l1sram_free(const void *addr) | |||
| 604 | 604 | ||
| 605 | void *l2_sram_alloc(size_t size) | 605 | void *l2_sram_alloc(size_t size) |
| 606 | { | 606 | { |
| 607 | #ifdef L2_LENGTH | 607 | #if L2_LENGTH != 0 |
| 608 | unsigned flags; | 608 | unsigned long flags; |
| 609 | void *addr; | 609 | void *addr; |
| 610 | 610 | ||
| 611 | /* add mutex operation */ | 611 | /* add mutex operation */ |
| @@ -640,8 +640,8 @@ EXPORT_SYMBOL(l2_sram_zalloc); | |||
| 640 | 640 | ||
| 641 | int l2_sram_free(const void *addr) | 641 | int l2_sram_free(const void *addr) |
| 642 | { | 642 | { |
| 643 | #ifdef L2_LENGTH | 643 | #if L2_LENGTH != 0 |
| 644 | unsigned flags; | 644 | unsigned long flags; |
| 645 | int ret; | 645 | int ret; |
| 646 | 646 | ||
| 647 | /* add mutex operation */ | 647 | /* add mutex operation */ |
| @@ -779,7 +779,7 @@ static int sram_proc_read(char *buf, char **start, off_t offset, int count, | |||
| 779 | &free_l1_inst_sram_head, &used_l1_inst_sram_head)) | 779 | &free_l1_inst_sram_head, &used_l1_inst_sram_head)) |
| 780 | goto not_done; | 780 | goto not_done; |
| 781 | #endif | 781 | #endif |
| 782 | #ifdef L2_LENGTH | 782 | #if L2_LENGTH != 0 |
| 783 | if (_sram_proc_read(buf, &len, count, "L2", | 783 | if (_sram_proc_read(buf, &len, count, "L2", |
| 784 | &free_l2_sram_head, &used_l2_sram_head)) | 784 | &free_l2_sram_head, &used_l2_sram_head)) |
| 785 | goto not_done; | 785 | goto not_done; |
diff --git a/arch/cris/arch-v32/kernel/fasttimer.c b/arch/cris/arch-v32/kernel/fasttimer.c index 2de9d5849ef0..111caa1a2efb 100644 --- a/arch/cris/arch-v32/kernel/fasttimer.c +++ b/arch/cris/arch-v32/kernel/fasttimer.c | |||
| @@ -19,8 +19,6 @@ | |||
| 19 | #include <asm/irq.h> | 19 | #include <asm/irq.h> |
| 20 | #include <asm/system.h> | 20 | #include <asm/system.h> |
| 21 | 21 | ||
| 22 | #include <linux/version.h> | ||
| 23 | |||
| 24 | #include <hwregs/reg_map.h> | 22 | #include <hwregs/reg_map.h> |
| 25 | #include <hwregs/reg_rdwr.h> | 23 | #include <hwregs/reg_rdwr.h> |
| 26 | #include <hwregs/timer_defs.h> | 24 | #include <hwregs/timer_defs.h> |
diff --git a/include/asm-h8300/Kbuild b/arch/h8300/include/asm/Kbuild index c68e1680da01..c68e1680da01 100644 --- a/include/asm-h8300/Kbuild +++ b/arch/h8300/include/asm/Kbuild | |||
diff --git a/include/asm-h8300/a.out.h b/arch/h8300/include/asm/a.out.h index ded780f0a492..ded780f0a492 100644 --- a/include/asm-h8300/a.out.h +++ b/arch/h8300/include/asm/a.out.h | |||
diff --git a/include/asm-h8300/atomic.h b/arch/h8300/include/asm/atomic.h index b4cf0ea97ede..b4cf0ea97ede 100644 --- a/include/asm-h8300/atomic.h +++ b/arch/h8300/include/asm/atomic.h | |||
diff --git a/include/asm-h8300/auxvec.h b/arch/h8300/include/asm/auxvec.h index 1d36fe38b088..1d36fe38b088 100644 --- a/include/asm-h8300/auxvec.h +++ b/arch/h8300/include/asm/auxvec.h | |||
diff --git a/include/asm-h8300/bitops.h b/arch/h8300/include/asm/bitops.h index cb18e3b0aa94..cb18e3b0aa94 100644 --- a/include/asm-h8300/bitops.h +++ b/arch/h8300/include/asm/bitops.h | |||
diff --git a/include/asm-h8300/bootinfo.h b/arch/h8300/include/asm/bootinfo.h index 5bed7e7aac0a..5bed7e7aac0a 100644 --- a/include/asm-h8300/bootinfo.h +++ b/arch/h8300/include/asm/bootinfo.h | |||
diff --git a/include/asm-h8300/bug.h b/arch/h8300/include/asm/bug.h index edddf5b086e5..edddf5b086e5 100644 --- a/include/asm-h8300/bug.h +++ b/arch/h8300/include/asm/bug.h | |||
diff --git a/include/asm-h8300/bugs.h b/arch/h8300/include/asm/bugs.h index 1cb4afba6eb1..1cb4afba6eb1 100644 --- a/include/asm-h8300/bugs.h +++ b/arch/h8300/include/asm/bugs.h | |||
diff --git a/include/asm-h8300/byteorder.h b/arch/h8300/include/asm/byteorder.h index 36e597d61619..36e597d61619 100644 --- a/include/asm-h8300/byteorder.h +++ b/arch/h8300/include/asm/byteorder.h | |||
diff --git a/include/asm-h8300/cache.h b/arch/h8300/include/asm/cache.h index c6350283649d..c6350283649d 100644 --- a/include/asm-h8300/cache.h +++ b/arch/h8300/include/asm/cache.h | |||
diff --git a/include/asm-h8300/cachectl.h b/arch/h8300/include/asm/cachectl.h index c464022d8e26..c464022d8e26 100644 --- a/include/asm-h8300/cachectl.h +++ b/arch/h8300/include/asm/cachectl.h | |||
diff --git a/include/asm-h8300/cacheflush.h b/arch/h8300/include/asm/cacheflush.h index 5ffdca217b95..5ffdca217b95 100644 --- a/include/asm-h8300/cacheflush.h +++ b/arch/h8300/include/asm/cacheflush.h | |||
diff --git a/include/asm-h8300/checksum.h b/arch/h8300/include/asm/checksum.h index 98724e12508c..98724e12508c 100644 --- a/include/asm-h8300/checksum.h +++ b/arch/h8300/include/asm/checksum.h | |||
diff --git a/include/asm-h8300/cputime.h b/arch/h8300/include/asm/cputime.h index 092e187c7b08..092e187c7b08 100644 --- a/include/asm-h8300/cputime.h +++ b/arch/h8300/include/asm/cputime.h | |||
diff --git a/include/asm-h8300/current.h b/arch/h8300/include/asm/current.h index 57d74ee55a14..57d74ee55a14 100644 --- a/include/asm-h8300/current.h +++ b/arch/h8300/include/asm/current.h | |||
diff --git a/include/asm-h8300/dbg.h b/arch/h8300/include/asm/dbg.h index 2c6d1cbcf736..2c6d1cbcf736 100644 --- a/include/asm-h8300/dbg.h +++ b/arch/h8300/include/asm/dbg.h | |||
diff --git a/include/asm-h8300/delay.h b/arch/h8300/include/asm/delay.h index 743beba70f82..743beba70f82 100644 --- a/include/asm-h8300/delay.h +++ b/arch/h8300/include/asm/delay.h | |||
diff --git a/include/asm-h8300/device.h b/arch/h8300/include/asm/device.h index d8f9872b0e2d..d8f9872b0e2d 100644 --- a/include/asm-h8300/device.h +++ b/arch/h8300/include/asm/device.h | |||
diff --git a/include/asm-h8300/div64.h b/arch/h8300/include/asm/div64.h index 6cd978cefb28..6cd978cefb28 100644 --- a/include/asm-h8300/div64.h +++ b/arch/h8300/include/asm/div64.h | |||
diff --git a/include/asm-h8300/dma.h b/arch/h8300/include/asm/dma.h index 3edbaaaedf5b..3edbaaaedf5b 100644 --- a/include/asm-h8300/dma.h +++ b/arch/h8300/include/asm/dma.h | |||
diff --git a/include/asm-h8300/elf.h b/arch/h8300/include/asm/elf.h index a8b57d1f4128..a8b57d1f4128 100644 --- a/include/asm-h8300/elf.h +++ b/arch/h8300/include/asm/elf.h | |||
diff --git a/include/asm-h8300/emergency-restart.h b/arch/h8300/include/asm/emergency-restart.h index 108d8c48e42e..108d8c48e42e 100644 --- a/include/asm-h8300/emergency-restart.h +++ b/arch/h8300/include/asm/emergency-restart.h | |||
diff --git a/include/asm-h8300/errno.h b/arch/h8300/include/asm/errno.h index 0c2f5641fdcc..0c2f5641fdcc 100644 --- a/include/asm-h8300/errno.h +++ b/arch/h8300/include/asm/errno.h | |||
diff --git a/include/asm-h8300/fb.h b/arch/h8300/include/asm/fb.h index c7df38030992..c7df38030992 100644 --- a/include/asm-h8300/fb.h +++ b/arch/h8300/include/asm/fb.h | |||
diff --git a/include/asm-h8300/fcntl.h b/arch/h8300/include/asm/fcntl.h index 1952cb2e3b06..1952cb2e3b06 100644 --- a/include/asm-h8300/fcntl.h +++ b/arch/h8300/include/asm/fcntl.h | |||
diff --git a/include/asm-h8300/flat.h b/arch/h8300/include/asm/flat.h index 2a873508a9a1..2a873508a9a1 100644 --- a/include/asm-h8300/flat.h +++ b/arch/h8300/include/asm/flat.h | |||
diff --git a/include/asm-h8300/fpu.h b/arch/h8300/include/asm/fpu.h index 4fc416e80bef..4fc416e80bef 100644 --- a/include/asm-h8300/fpu.h +++ b/arch/h8300/include/asm/fpu.h | |||
diff --git a/include/asm-h8300/futex.h b/arch/h8300/include/asm/futex.h index 6a332a9f099c..6a332a9f099c 100644 --- a/include/asm-h8300/futex.h +++ b/arch/h8300/include/asm/futex.h | |||
diff --git a/include/asm-h8300/gpio.h b/arch/h8300/include/asm/gpio.h index a714f0c0efbc..a714f0c0efbc 100644 --- a/include/asm-h8300/gpio.h +++ b/arch/h8300/include/asm/gpio.h | |||
diff --git a/include/asm-h8300/hardirq.h b/arch/h8300/include/asm/hardirq.h index 9d7f7a7462b2..9d7f7a7462b2 100644 --- a/include/asm-h8300/hardirq.h +++ b/arch/h8300/include/asm/hardirq.h | |||
diff --git a/include/asm-h8300/hw_irq.h b/arch/h8300/include/asm/hw_irq.h index d75a5a1119e8..d75a5a1119e8 100644 --- a/include/asm-h8300/hw_irq.h +++ b/arch/h8300/include/asm/hw_irq.h | |||
diff --git a/include/asm-h8300/io.h b/arch/h8300/include/asm/io.h index 26dc6ccd9441..26dc6ccd9441 100644 --- a/include/asm-h8300/io.h +++ b/arch/h8300/include/asm/io.h | |||
diff --git a/include/asm-h8300/ioctl.h b/arch/h8300/include/asm/ioctl.h index b279fe06dfe5..b279fe06dfe5 100644 --- a/include/asm-h8300/ioctl.h +++ b/arch/h8300/include/asm/ioctl.h | |||
diff --git a/include/asm-h8300/ioctls.h b/arch/h8300/include/asm/ioctls.h index 98a53d067269..98a53d067269 100644 --- a/include/asm-h8300/ioctls.h +++ b/arch/h8300/include/asm/ioctls.h | |||
diff --git a/include/asm-h8300/ipcbuf.h b/arch/h8300/include/asm/ipcbuf.h index 2cd1ebcc109d..2cd1ebcc109d 100644 --- a/include/asm-h8300/ipcbuf.h +++ b/arch/h8300/include/asm/ipcbuf.h | |||
diff --git a/include/asm-h8300/irq.h b/arch/h8300/include/asm/irq.h index 13d7c601cd0a..13d7c601cd0a 100644 --- a/include/asm-h8300/irq.h +++ b/arch/h8300/include/asm/irq.h | |||
diff --git a/include/asm-h8300/irq_regs.h b/arch/h8300/include/asm/irq_regs.h index 3dd9c0b70270..3dd9c0b70270 100644 --- a/include/asm-h8300/irq_regs.h +++ b/arch/h8300/include/asm/irq_regs.h | |||
diff --git a/include/asm-h8300/kdebug.h b/arch/h8300/include/asm/kdebug.h index 6ece1b037665..6ece1b037665 100644 --- a/include/asm-h8300/kdebug.h +++ b/arch/h8300/include/asm/kdebug.h | |||
diff --git a/include/asm-h8300/kmap_types.h b/arch/h8300/include/asm/kmap_types.h index 1ec8a3427120..1ec8a3427120 100644 --- a/include/asm-h8300/kmap_types.h +++ b/arch/h8300/include/asm/kmap_types.h | |||
diff --git a/include/asm-h8300/linkage.h b/arch/h8300/include/asm/linkage.h index 6f4df7d46180..6f4df7d46180 100644 --- a/include/asm-h8300/linkage.h +++ b/arch/h8300/include/asm/linkage.h | |||
diff --git a/include/asm-h8300/local.h b/arch/h8300/include/asm/local.h index fdd4efe437cd..fdd4efe437cd 100644 --- a/include/asm-h8300/local.h +++ b/arch/h8300/include/asm/local.h | |||
diff --git a/include/asm-h8300/mc146818rtc.h b/arch/h8300/include/asm/mc146818rtc.h index ab9d9646d241..ab9d9646d241 100644 --- a/include/asm-h8300/mc146818rtc.h +++ b/arch/h8300/include/asm/mc146818rtc.h | |||
diff --git a/include/asm-h8300/md.h b/arch/h8300/include/asm/md.h index 1a47dc6691fb..1a47dc6691fb 100644 --- a/include/asm-h8300/md.h +++ b/arch/h8300/include/asm/md.h | |||
diff --git a/include/asm-h8300/mman.h b/arch/h8300/include/asm/mman.h index b9f104f22a36..b9f104f22a36 100644 --- a/include/asm-h8300/mman.h +++ b/arch/h8300/include/asm/mman.h | |||
diff --git a/include/asm-h8300/mmu.h b/arch/h8300/include/asm/mmu.h index 2ce06ea46104..2ce06ea46104 100644 --- a/include/asm-h8300/mmu.h +++ b/arch/h8300/include/asm/mmu.h | |||
diff --git a/include/asm-h8300/mmu_context.h b/arch/h8300/include/asm/mmu_context.h index f44b730da54d..f44b730da54d 100644 --- a/include/asm-h8300/mmu_context.h +++ b/arch/h8300/include/asm/mmu_context.h | |||
diff --git a/include/asm-h8300/module.h b/arch/h8300/include/asm/module.h index de23231f3196..de23231f3196 100644 --- a/include/asm-h8300/module.h +++ b/arch/h8300/include/asm/module.h | |||
diff --git a/include/asm-h8300/msgbuf.h b/arch/h8300/include/asm/msgbuf.h index 6b148cd09aa5..6b148cd09aa5 100644 --- a/include/asm-h8300/msgbuf.h +++ b/arch/h8300/include/asm/msgbuf.h | |||
diff --git a/include/asm-h8300/mutex.h b/arch/h8300/include/asm/mutex.h index 458c1f7fbc18..458c1f7fbc18 100644 --- a/include/asm-h8300/mutex.h +++ b/arch/h8300/include/asm/mutex.h | |||
diff --git a/include/asm-h8300/page.h b/arch/h8300/include/asm/page.h index 0b6acf0b03aa..0b6acf0b03aa 100644 --- a/include/asm-h8300/page.h +++ b/arch/h8300/include/asm/page.h | |||
diff --git a/include/asm-h8300/page_offset.h b/arch/h8300/include/asm/page_offset.h index f8706463008c..f8706463008c 100644 --- a/include/asm-h8300/page_offset.h +++ b/arch/h8300/include/asm/page_offset.h | |||
diff --git a/include/asm-h8300/param.h b/arch/h8300/include/asm/param.h index 1c72fb8080ff..1c72fb8080ff 100644 --- a/include/asm-h8300/param.h +++ b/arch/h8300/include/asm/param.h | |||
diff --git a/include/asm-h8300/pci.h b/arch/h8300/include/asm/pci.h index 97389b35aa35..97389b35aa35 100644 --- a/include/asm-h8300/pci.h +++ b/arch/h8300/include/asm/pci.h | |||
diff --git a/include/asm-h8300/percpu.h b/arch/h8300/include/asm/percpu.h index 72c03e3666d8..72c03e3666d8 100644 --- a/include/asm-h8300/percpu.h +++ b/arch/h8300/include/asm/percpu.h | |||
diff --git a/include/asm-h8300/pgalloc.h b/arch/h8300/include/asm/pgalloc.h index c2e89a286d23..c2e89a286d23 100644 --- a/include/asm-h8300/pgalloc.h +++ b/arch/h8300/include/asm/pgalloc.h | |||
diff --git a/include/asm-h8300/pgtable.h b/arch/h8300/include/asm/pgtable.h index a09230a08e02..a09230a08e02 100644 --- a/include/asm-h8300/pgtable.h +++ b/arch/h8300/include/asm/pgtable.h | |||
diff --git a/include/asm-h8300/poll.h b/arch/h8300/include/asm/poll.h index f61540c22d94..f61540c22d94 100644 --- a/include/asm-h8300/poll.h +++ b/arch/h8300/include/asm/poll.h | |||
diff --git a/include/asm-h8300/posix_types.h b/arch/h8300/include/asm/posix_types.h index 5c553927fc53..5c553927fc53 100644 --- a/include/asm-h8300/posix_types.h +++ b/arch/h8300/include/asm/posix_types.h | |||
diff --git a/include/asm-h8300/processor.h b/arch/h8300/include/asm/processor.h index 69e8a34eb6d5..69e8a34eb6d5 100644 --- a/include/asm-h8300/processor.h +++ b/arch/h8300/include/asm/processor.h | |||
diff --git a/include/asm-h8300/ptrace.h b/arch/h8300/include/asm/ptrace.h index c2e05e4b512e..c2e05e4b512e 100644 --- a/include/asm-h8300/ptrace.h +++ b/arch/h8300/include/asm/ptrace.h | |||
diff --git a/include/asm-h8300/regs267x.h b/arch/h8300/include/asm/regs267x.h index 1bff731a9f77..1bff731a9f77 100644 --- a/include/asm-h8300/regs267x.h +++ b/arch/h8300/include/asm/regs267x.h | |||
diff --git a/include/asm-h8300/regs306x.h b/arch/h8300/include/asm/regs306x.h index 027dd633fa25..027dd633fa25 100644 --- a/include/asm-h8300/regs306x.h +++ b/arch/h8300/include/asm/regs306x.h | |||
diff --git a/include/asm-h8300/resource.h b/arch/h8300/include/asm/resource.h index 46c5f4391607..46c5f4391607 100644 --- a/include/asm-h8300/resource.h +++ b/arch/h8300/include/asm/resource.h | |||
diff --git a/include/asm-h8300/scatterlist.h b/arch/h8300/include/asm/scatterlist.h index d3ecdd87ac90..d3ecdd87ac90 100644 --- a/include/asm-h8300/scatterlist.h +++ b/arch/h8300/include/asm/scatterlist.h | |||
diff --git a/include/asm-h8300/sections.h b/arch/h8300/include/asm/sections.h index a81743e8b743..a81743e8b743 100644 --- a/include/asm-h8300/sections.h +++ b/arch/h8300/include/asm/sections.h | |||
diff --git a/include/asm-h8300/segment.h b/arch/h8300/include/asm/segment.h index b79a82d0f99d..b79a82d0f99d 100644 --- a/include/asm-h8300/segment.h +++ b/arch/h8300/include/asm/segment.h | |||
diff --git a/include/asm-h8300/sembuf.h b/arch/h8300/include/asm/sembuf.h index e04a3ec0cb92..e04a3ec0cb92 100644 --- a/include/asm-h8300/sembuf.h +++ b/arch/h8300/include/asm/sembuf.h | |||
diff --git a/include/asm-h8300/setup.h b/arch/h8300/include/asm/setup.h index e2c600e96733..e2c600e96733 100644 --- a/include/asm-h8300/setup.h +++ b/arch/h8300/include/asm/setup.h | |||
diff --git a/include/asm-h8300/sh_bios.h b/arch/h8300/include/asm/sh_bios.h index b6bb6e58295c..b6bb6e58295c 100644 --- a/include/asm-h8300/sh_bios.h +++ b/arch/h8300/include/asm/sh_bios.h | |||
diff --git a/include/asm-h8300/shm.h b/arch/h8300/include/asm/shm.h index ed6623c0545d..ed6623c0545d 100644 --- a/include/asm-h8300/shm.h +++ b/arch/h8300/include/asm/shm.h | |||
diff --git a/include/asm-h8300/shmbuf.h b/arch/h8300/include/asm/shmbuf.h index 64e77993a7a9..64e77993a7a9 100644 --- a/include/asm-h8300/shmbuf.h +++ b/arch/h8300/include/asm/shmbuf.h | |||
diff --git a/include/asm-h8300/shmparam.h b/arch/h8300/include/asm/shmparam.h index d1863953ec64..d1863953ec64 100644 --- a/include/asm-h8300/shmparam.h +++ b/arch/h8300/include/asm/shmparam.h | |||
diff --git a/include/asm-h8300/sigcontext.h b/arch/h8300/include/asm/sigcontext.h index e4b81505f8f8..e4b81505f8f8 100644 --- a/include/asm-h8300/sigcontext.h +++ b/arch/h8300/include/asm/sigcontext.h | |||
diff --git a/include/asm-h8300/siginfo.h b/arch/h8300/include/asm/siginfo.h index bc8fbea931a5..bc8fbea931a5 100644 --- a/include/asm-h8300/siginfo.h +++ b/arch/h8300/include/asm/siginfo.h | |||
diff --git a/include/asm-h8300/signal.h b/arch/h8300/include/asm/signal.h index 7bc15048a64f..7bc15048a64f 100644 --- a/include/asm-h8300/signal.h +++ b/arch/h8300/include/asm/signal.h | |||
diff --git a/include/asm-h8300/smp.h b/arch/h8300/include/asm/smp.h index 9e9bd7e58922..9e9bd7e58922 100644 --- a/include/asm-h8300/smp.h +++ b/arch/h8300/include/asm/smp.h | |||
diff --git a/include/asm-h8300/socket.h b/arch/h8300/include/asm/socket.h index da2520dbf254..da2520dbf254 100644 --- a/include/asm-h8300/socket.h +++ b/arch/h8300/include/asm/socket.h | |||
diff --git a/include/asm-h8300/sockios.h b/arch/h8300/include/asm/sockios.h index e9c7ec810c23..e9c7ec810c23 100644 --- a/include/asm-h8300/sockios.h +++ b/arch/h8300/include/asm/sockios.h | |||
diff --git a/include/asm-h8300/spinlock.h b/arch/h8300/include/asm/spinlock.h index d5407fa173e4..d5407fa173e4 100644 --- a/include/asm-h8300/spinlock.h +++ b/arch/h8300/include/asm/spinlock.h | |||
diff --git a/include/asm-h8300/stat.h b/arch/h8300/include/asm/stat.h index 62c3cc24dfe6..62c3cc24dfe6 100644 --- a/include/asm-h8300/stat.h +++ b/arch/h8300/include/asm/stat.h | |||
diff --git a/include/asm-h8300/statfs.h b/arch/h8300/include/asm/statfs.h index b96efa712aac..b96efa712aac 100644 --- a/include/asm-h8300/statfs.h +++ b/arch/h8300/include/asm/statfs.h | |||
diff --git a/include/asm-h8300/string.h b/arch/h8300/include/asm/string.h index ca5034897d87..ca5034897d87 100644 --- a/include/asm-h8300/string.h +++ b/arch/h8300/include/asm/string.h | |||
diff --git a/include/asm-h8300/system.h b/arch/h8300/include/asm/system.h index 4b8e475908ae..4b8e475908ae 100644 --- a/include/asm-h8300/system.h +++ b/arch/h8300/include/asm/system.h | |||
diff --git a/include/asm-h8300/target_time.h b/arch/h8300/include/asm/target_time.h index 9f2a9aa1fe6f..9f2a9aa1fe6f 100644 --- a/include/asm-h8300/target_time.h +++ b/arch/h8300/include/asm/target_time.h | |||
diff --git a/include/asm-h8300/termbits.h b/arch/h8300/include/asm/termbits.h index 31eca81db3f7..31eca81db3f7 100644 --- a/include/asm-h8300/termbits.h +++ b/arch/h8300/include/asm/termbits.h | |||
diff --git a/include/asm-h8300/termios.h b/arch/h8300/include/asm/termios.h index 70eea64b4213..70eea64b4213 100644 --- a/include/asm-h8300/termios.h +++ b/arch/h8300/include/asm/termios.h | |||
diff --git a/include/asm-h8300/thread_info.h b/arch/h8300/include/asm/thread_info.h index aafd4d322ec3..aafd4d322ec3 100644 --- a/include/asm-h8300/thread_info.h +++ b/arch/h8300/include/asm/thread_info.h | |||
diff --git a/include/asm-h8300/timex.h b/arch/h8300/include/asm/timex.h index 23e67013439f..23e67013439f 100644 --- a/include/asm-h8300/timex.h +++ b/arch/h8300/include/asm/timex.h | |||
diff --git a/include/asm-h8300/tlb.h b/arch/h8300/include/asm/tlb.h index 3dea80ad9e6f..3dea80ad9e6f 100644 --- a/include/asm-h8300/tlb.h +++ b/arch/h8300/include/asm/tlb.h | |||
diff --git a/include/asm-h8300/tlbflush.h b/arch/h8300/include/asm/tlbflush.h index 41c148a9208e..41c148a9208e 100644 --- a/include/asm-h8300/tlbflush.h +++ b/arch/h8300/include/asm/tlbflush.h | |||
diff --git a/include/asm-h8300/topology.h b/arch/h8300/include/asm/topology.h index fdc121924d4c..fdc121924d4c 100644 --- a/include/asm-h8300/topology.h +++ b/arch/h8300/include/asm/topology.h | |||
diff --git a/include/asm-h8300/traps.h b/arch/h8300/include/asm/traps.h index 41cf6be02f68..41cf6be02f68 100644 --- a/include/asm-h8300/traps.h +++ b/arch/h8300/include/asm/traps.h | |||
diff --git a/include/asm-h8300/types.h b/arch/h8300/include/asm/types.h index 12875190b156..12875190b156 100644 --- a/include/asm-h8300/types.h +++ b/arch/h8300/include/asm/types.h | |||
diff --git a/include/asm-h8300/uaccess.h b/arch/h8300/include/asm/uaccess.h index 356068cd0879..356068cd0879 100644 --- a/include/asm-h8300/uaccess.h +++ b/arch/h8300/include/asm/uaccess.h | |||
diff --git a/include/asm-h8300/ucontext.h b/arch/h8300/include/asm/ucontext.h index 0bcf8f85fab9..0bcf8f85fab9 100644 --- a/include/asm-h8300/ucontext.h +++ b/arch/h8300/include/asm/ucontext.h | |||
diff --git a/include/asm-h8300/unaligned.h b/arch/h8300/include/asm/unaligned.h index b8d06c70c2da..b8d06c70c2da 100644 --- a/include/asm-h8300/unaligned.h +++ b/arch/h8300/include/asm/unaligned.h | |||
diff --git a/include/asm-h8300/unistd.h b/arch/h8300/include/asm/unistd.h index 99f3c3561ecb..99f3c3561ecb 100644 --- a/include/asm-h8300/unistd.h +++ b/arch/h8300/include/asm/unistd.h | |||
diff --git a/include/asm-h8300/user.h b/arch/h8300/include/asm/user.h index 14a9e18950f1..14a9e18950f1 100644 --- a/include/asm-h8300/user.h +++ b/arch/h8300/include/asm/user.h | |||
diff --git a/include/asm-h8300/virtconvert.h b/arch/h8300/include/asm/virtconvert.h index 19cfd62b11c3..19cfd62b11c3 100644 --- a/include/asm-h8300/virtconvert.h +++ b/arch/h8300/include/asm/virtconvert.h | |||
diff --git a/arch/h8300/mm/init.c b/arch/h8300/mm/init.c index a1d228f5e4e6..9942f24aff9e 100644 --- a/arch/h8300/mm/init.c +++ b/arch/h8300/mm/init.c | |||
| @@ -40,9 +40,6 @@ | |||
| 40 | 40 | ||
| 41 | #undef DEBUG | 41 | #undef DEBUG |
| 42 | 42 | ||
| 43 | extern void die_if_kernel(char *,struct pt_regs *,long); | ||
| 44 | extern void free_initmem(void); | ||
| 45 | |||
| 46 | /* | 43 | /* |
| 47 | * BAD_PAGE is the page that is used for page faults when linux | 44 | * BAD_PAGE is the page that is used for page faults when linux |
| 48 | * is out-of-memory. Older versions of linux just did a | 45 | * is out-of-memory. Older versions of linux just did a |
| @@ -73,7 +70,7 @@ extern unsigned long memory_end; | |||
| 73 | * The parameters are pointers to where to stick the starting and ending | 70 | * The parameters are pointers to where to stick the starting and ending |
| 74 | * addresses of available kernel virtual memory. | 71 | * addresses of available kernel virtual memory. |
| 75 | */ | 72 | */ |
| 76 | void paging_init(void) | 73 | void __init paging_init(void) |
| 77 | { | 74 | { |
| 78 | /* | 75 | /* |
| 79 | * Make sure start_mem is page aligned, otherwise bootmem and | 76 | * Make sure start_mem is page aligned, otherwise bootmem and |
| @@ -122,7 +119,7 @@ void paging_init(void) | |||
| 122 | } | 119 | } |
| 123 | } | 120 | } |
| 124 | 121 | ||
| 125 | void mem_init(void) | 122 | void __init mem_init(void) |
| 126 | { | 123 | { |
| 127 | int codek = 0, datak = 0, initk = 0; | 124 | int codek = 0, datak = 0, initk = 0; |
| 128 | /* DAVIDM look at setup memory map generically with reserved area */ | 125 | /* DAVIDM look at setup memory map generically with reserved area */ |
| @@ -178,7 +175,7 @@ void free_initrd_mem(unsigned long start, unsigned long end) | |||
| 178 | #endif | 175 | #endif |
| 179 | 176 | ||
| 180 | void | 177 | void |
| 181 | free_initmem() | 178 | free_initmem(void) |
| 182 | { | 179 | { |
| 183 | #ifdef CONFIG_RAMKERNEL | 180 | #ifdef CONFIG_RAMKERNEL |
| 184 | unsigned long addr; | 181 | unsigned long addr; |
diff --git a/arch/ia64/configs/sn2_defconfig b/arch/ia64/configs/sn2_defconfig deleted file mode 100644 index 7f6b2377d13f..000000000000 --- a/arch/ia64/configs/sn2_defconfig +++ /dev/null | |||
| @@ -1,1285 +0,0 @@ | |||
| 1 | # | ||
| 2 | # Automatically generated make config: don't edit | ||
| 3 | # Linux kernel version: 2.6.23 | ||
| 4 | # Thu Oct 18 16:03:40 2007 | ||
| 5 | # | ||
| 6 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
| 7 | |||
| 8 | # | ||
| 9 | # General setup | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_LOCK_KERNEL=y | ||
| 13 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 14 | CONFIG_LOCALVERSION="" | ||
| 15 | # CONFIG_LOCALVERSION_AUTO is not set | ||
| 16 | CONFIG_SWAP=y | ||
| 17 | CONFIG_SYSVIPC=y | ||
| 18 | CONFIG_SYSVIPC_SYSCTL=y | ||
| 19 | CONFIG_POSIX_MQUEUE=y | ||
| 20 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 21 | CONFIG_TASKSTATS=y | ||
| 22 | # CONFIG_TASK_DELAY_ACCT is not set | ||
| 23 | CONFIG_TASK_XACCT=y | ||
| 24 | CONFIG_TASK_IO_ACCOUNTING=y | ||
| 25 | # CONFIG_USER_NS is not set | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | # CONFIG_IKCONFIG is not set | ||
| 28 | CONFIG_LOG_BUF_SHIFT=20 | ||
| 29 | CONFIG_CGROUPS=y | ||
| 30 | CONFIG_CPUSETS=y | ||
| 31 | CONFIG_FAIR_GROUP_SCHED=y | ||
| 32 | CONFIG_FAIR_USER_SCHED=y | ||
| 33 | CONFIG_SYSFS_DEPRECATED=y | ||
| 34 | CONFIG_RELAY=y | ||
| 35 | CONFIG_BLK_DEV_INITRD=y | ||
| 36 | CONFIG_INITRAMFS_SOURCE="" | ||
| 37 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
| 38 | CONFIG_SYSCTL=y | ||
| 39 | # CONFIG_EMBEDDED is not set | ||
| 40 | CONFIG_SYSCTL_SYSCALL=y | ||
| 41 | CONFIG_KALLSYMS=y | ||
| 42 | CONFIG_KALLSYMS_ALL=y | ||
| 43 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 44 | CONFIG_HOTPLUG=y | ||
| 45 | CONFIG_PRINTK=y | ||
| 46 | CONFIG_BUG=y | ||
| 47 | CONFIG_ELF_CORE=y | ||
| 48 | CONFIG_BASE_FULL=y | ||
| 49 | CONFIG_FUTEX=y | ||
| 50 | CONFIG_ANON_INODES=y | ||
| 51 | CONFIG_EPOLL=y | ||
| 52 | CONFIG_SIGNALFD=y | ||
| 53 | CONFIG_EVENTFD=y | ||
| 54 | CONFIG_SHMEM=y | ||
| 55 | CONFIG_VM_EVENT_COUNTERS=y | ||
| 56 | CONFIG_SLUB_DEBUG=y | ||
| 57 | # CONFIG_SLAB is not set | ||
| 58 | CONFIG_SLUB=y | ||
| 59 | # CONFIG_SLOB is not set | ||
| 60 | CONFIG_RT_MUTEXES=y | ||
| 61 | # CONFIG_TINY_SHMEM is not set | ||
| 62 | CONFIG_BASE_SMALL=0 | ||
| 63 | CONFIG_MODULES=y | ||
| 64 | CONFIG_MODULE_UNLOAD=y | ||
| 65 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 66 | # CONFIG_MODVERSIONS is not set | ||
| 67 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 68 | CONFIG_KMOD=y | ||
| 69 | CONFIG_STOP_MACHINE=y | ||
| 70 | CONFIG_BLOCK=y | ||
| 71 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 72 | CONFIG_BLK_DEV_BSG=y | ||
| 73 | CONFIG_BLOCK_COMPAT=y | ||
| 74 | |||
| 75 | # | ||
| 76 | # IO Schedulers | ||
| 77 | # | ||
| 78 | CONFIG_IOSCHED_NOOP=y | ||
| 79 | CONFIG_IOSCHED_AS=y | ||
| 80 | CONFIG_IOSCHED_DEADLINE=y | ||
| 81 | CONFIG_IOSCHED_CFQ=y | ||
| 82 | CONFIG_DEFAULT_AS=y | ||
| 83 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 84 | # CONFIG_DEFAULT_CFQ is not set | ||
| 85 | # CONFIG_DEFAULT_NOOP is not set | ||
| 86 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 87 | |||
| 88 | # | ||
| 89 | # Processor type and features | ||
| 90 | # | ||
| 91 | CONFIG_IA64=y | ||
| 92 | CONFIG_64BIT=y | ||
| 93 | CONFIG_QUICKLIST=y | ||
| 94 | CONFIG_MMU=y | ||
| 95 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | ||
| 96 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
| 97 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
| 98 | CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y | ||
| 99 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 100 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
| 101 | CONFIG_GENERIC_TIME=y | ||
| 102 | CONFIG_GENERIC_TIME_VSYSCALL=y | ||
| 103 | CONFIG_DMI=y | ||
| 104 | CONFIG_EFI=y | ||
| 105 | CONFIG_GENERIC_IOMAP=y | ||
| 106 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | ||
| 107 | CONFIG_IA64_UNCACHED_ALLOCATOR=y | ||
| 108 | CONFIG_AUDIT_ARCH=y | ||
| 109 | # CONFIG_IA64_GENERIC is not set | ||
| 110 | # CONFIG_IA64_DIG is not set | ||
| 111 | # CONFIG_IA64_HP_ZX1 is not set | ||
| 112 | # CONFIG_IA64_HP_ZX1_SWIOTLB is not set | ||
| 113 | CONFIG_IA64_SGI_SN2=y | ||
| 114 | # CONFIG_IA64_HP_SIM is not set | ||
| 115 | # CONFIG_ITANIUM is not set | ||
| 116 | CONFIG_MCKINLEY=y | ||
| 117 | # CONFIG_IA64_PAGE_SIZE_4KB is not set | ||
| 118 | # CONFIG_IA64_PAGE_SIZE_8KB is not set | ||
| 119 | # CONFIG_IA64_PAGE_SIZE_16KB is not set | ||
| 120 | CONFIG_IA64_PAGE_SIZE_64KB=y | ||
| 121 | CONFIG_PGTABLE_3=y | ||
| 122 | # CONFIG_PGTABLE_4 is not set | ||
| 123 | # CONFIG_HZ_100 is not set | ||
| 124 | CONFIG_HZ_250=y | ||
| 125 | # CONFIG_HZ_300 is not set | ||
| 126 | # CONFIG_HZ_1000 is not set | ||
| 127 | CONFIG_HZ=250 | ||
| 128 | CONFIG_IA64_L1_CACHE_SHIFT=7 | ||
| 129 | # CONFIG_IA64_CYCLONE is not set | ||
| 130 | CONFIG_IOSAPIC=y | ||
| 131 | CONFIG_IA64_SGI_SN_XP=m | ||
| 132 | CONFIG_FORCE_MAX_ZONEORDER=17 | ||
| 133 | CONFIG_SMP=y | ||
| 134 | CONFIG_NR_CPUS=1024 | ||
| 135 | # CONFIG_HOTPLUG_CPU is not set | ||
| 136 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | ||
| 137 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | ||
| 138 | CONFIG_SCHED_SMT=y | ||
| 139 | CONFIG_PREEMPT_NONE=y | ||
| 140 | # CONFIG_PREEMPT_VOLUNTARY is not set | ||
| 141 | # CONFIG_PREEMPT is not set | ||
| 142 | CONFIG_PREEMPT_BKL=y | ||
| 143 | CONFIG_SELECT_MEMORY_MODEL=y | ||
| 144 | # CONFIG_FLATMEM_MANUAL is not set | ||
| 145 | CONFIG_DISCONTIGMEM_MANUAL=y | ||
| 146 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
| 147 | CONFIG_DISCONTIGMEM=y | ||
| 148 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
| 149 | CONFIG_NEED_MULTIPLE_NODES=y | ||
| 150 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 151 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y | ||
| 152 | CONFIG_SPLIT_PTLOCK_CPUS=4 | ||
| 153 | CONFIG_MIGRATION=y | ||
| 154 | CONFIG_RESOURCES_64BIT=y | ||
| 155 | CONFIG_ZONE_DMA_FLAG=0 | ||
| 156 | CONFIG_NR_QUICK=1 | ||
| 157 | CONFIG_VIRT_TO_BUS=y | ||
| 158 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y | ||
| 159 | CONFIG_ARCH_DISCONTIGMEM_ENABLE=y | ||
| 160 | CONFIG_ARCH_FLATMEM_ENABLE=y | ||
| 161 | CONFIG_ARCH_SPARSEMEM_ENABLE=y | ||
| 162 | CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y | ||
| 163 | CONFIG_NUMA=y | ||
| 164 | CONFIG_NODES_SHIFT=10 | ||
| 165 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
| 166 | CONFIG_VIRTUAL_MEM_MAP=y | ||
| 167 | CONFIG_HOLES_IN_ZONE=y | ||
| 168 | CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y | ||
| 169 | CONFIG_HAVE_ARCH_NODEDATA_EXTENSION=y | ||
| 170 | CONFIG_IA32_SUPPORT=y | ||
| 171 | CONFIG_COMPAT=y | ||
| 172 | CONFIG_COMPAT_FOR_U64_ALIGNMENT=y | ||
| 173 | CONFIG_IA64_MCA_RECOVERY=y | ||
| 174 | CONFIG_PERFMON=y | ||
| 175 | CONFIG_IA64_PALINFO=y | ||
| 176 | CONFIG_IA64_MC_ERR_INJECT=y | ||
| 177 | CONFIG_SGI_SN=y | ||
| 178 | # CONFIG_IA64_ESI is not set | ||
| 179 | # CONFIG_IA64_HP_AML_NFW is not set | ||
| 180 | |||
| 181 | # | ||
| 182 | # SN Devices | ||
| 183 | # | ||
| 184 | CONFIG_SGI_IOC3=y | ||
| 185 | |||
| 186 | # | ||
| 187 | # Firmware Drivers | ||
| 188 | # | ||
| 189 | CONFIG_EFI_VARS=y | ||
| 190 | CONFIG_EFI_PCDP=y | ||
| 191 | CONFIG_DMIID=y | ||
| 192 | CONFIG_BINFMT_ELF=y | ||
| 193 | # CONFIG_BINFMT_MISC is not set | ||
| 194 | |||
| 195 | # | ||
| 196 | # Power management and ACPI | ||
| 197 | # | ||
| 198 | CONFIG_PM=y | ||
| 199 | # CONFIG_PM_LEGACY is not set | ||
| 200 | # CONFIG_PM_DEBUG is not set | ||
| 201 | CONFIG_ACPI=y | ||
| 202 | # CONFIG_ACPI_PROCFS is not set | ||
| 203 | CONFIG_ACPI_PROC_EVENT=y | ||
| 204 | # CONFIG_ACPI_BUTTON is not set | ||
| 205 | # CONFIG_ACPI_FAN is not set | ||
| 206 | # CONFIG_ACPI_DOCK is not set | ||
| 207 | # CONFIG_ACPI_PROCESSOR is not set | ||
| 208 | CONFIG_ACPI_NUMA=y | ||
| 209 | CONFIG_ACPI_BLACKLIST_YEAR=0 | ||
| 210 | # CONFIG_ACPI_DEBUG is not set | ||
| 211 | CONFIG_ACPI_EC=y | ||
| 212 | CONFIG_ACPI_POWER=y | ||
| 213 | CONFIG_ACPI_SYSTEM=y | ||
| 214 | # CONFIG_ACPI_CONTAINER is not set | ||
| 215 | |||
| 216 | # | ||
| 217 | # CPU Frequency scaling | ||
| 218 | # | ||
| 219 | # CONFIG_CPU_FREQ is not set | ||
| 220 | |||
| 221 | # | ||
| 222 | # Bus options (PCI, PCMCIA) | ||
| 223 | # | ||
| 224 | CONFIG_PCI=y | ||
| 225 | CONFIG_PCI_DOMAINS=y | ||
| 226 | CONFIG_PCI_SYSCALL=y | ||
| 227 | CONFIG_PCIEPORTBUS=y | ||
| 228 | CONFIG_HOTPLUG_PCI_PCIE=y | ||
| 229 | CONFIG_PCIEAER=y | ||
| 230 | CONFIG_ARCH_SUPPORTS_MSI=y | ||
| 231 | # CONFIG_PCI_MSI is not set | ||
| 232 | # CONFIG_PCI_DEBUG is not set | ||
| 233 | CONFIG_HOTPLUG_PCI=y | ||
| 234 | # CONFIG_HOTPLUG_PCI_FAKE is not set | ||
| 235 | # CONFIG_HOTPLUG_PCI_ACPI is not set | ||
| 236 | # CONFIG_HOTPLUG_PCI_CPCI is not set | ||
| 237 | # CONFIG_HOTPLUG_PCI_SHPC is not set | ||
| 238 | CONFIG_HOTPLUG_PCI_SGI=y | ||
| 239 | # CONFIG_PCCARD is not set | ||
| 240 | |||
| 241 | # | ||
| 242 | # Networking | ||
| 243 | # | ||
| 244 | CONFIG_NET=y | ||
| 245 | |||
| 246 | # | ||
| 247 | # Networking options | ||
| 248 | # | ||
| 249 | CONFIG_PACKET=y | ||
| 250 | CONFIG_PACKET_MMAP=y | ||
| 251 | CONFIG_UNIX=y | ||
| 252 | CONFIG_XFRM=y | ||
| 253 | # CONFIG_XFRM_USER is not set | ||
| 254 | # CONFIG_XFRM_SUB_POLICY is not set | ||
| 255 | # CONFIG_XFRM_MIGRATE is not set | ||
| 256 | # CONFIG_NET_KEY is not set | ||
| 257 | CONFIG_INET=y | ||
| 258 | CONFIG_IP_MULTICAST=y | ||
| 259 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
| 260 | CONFIG_IP_FIB_HASH=y | ||
| 261 | # CONFIG_IP_PNP is not set | ||
| 262 | # CONFIG_NET_IPIP is not set | ||
| 263 | # CONFIG_NET_IPGRE is not set | ||
| 264 | # CONFIG_IP_MROUTE is not set | ||
| 265 | # CONFIG_ARPD is not set | ||
| 266 | CONFIG_SYN_COOKIES=y | ||
| 267 | # CONFIG_INET_AH is not set | ||
| 268 | # CONFIG_INET_ESP is not set | ||
| 269 | # CONFIG_INET_IPCOMP is not set | ||
| 270 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
| 271 | CONFIG_INET_TUNNEL=m | ||
| 272 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | ||
| 273 | CONFIG_INET_XFRM_MODE_TUNNEL=y | ||
| 274 | CONFIG_INET_XFRM_MODE_BEET=y | ||
| 275 | CONFIG_INET_LRO=y | ||
| 276 | CONFIG_INET_DIAG=m | ||
| 277 | CONFIG_INET_TCP_DIAG=m | ||
| 278 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
| 279 | CONFIG_TCP_CONG_CUBIC=y | ||
| 280 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
| 281 | # CONFIG_TCP_MD5SIG is not set | ||
| 282 | CONFIG_IPV6=m | ||
| 283 | # CONFIG_IPV6_PRIVACY is not set | ||
| 284 | # CONFIG_IPV6_ROUTER_PREF is not set | ||
| 285 | # CONFIG_IPV6_OPTIMISTIC_DAD is not set | ||
| 286 | # CONFIG_INET6_AH is not set | ||
| 287 | # CONFIG_INET6_ESP is not set | ||
| 288 | # CONFIG_INET6_IPCOMP is not set | ||
| 289 | # CONFIG_IPV6_MIP6 is not set | ||
| 290 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 291 | # CONFIG_INET6_TUNNEL is not set | ||
| 292 | CONFIG_INET6_XFRM_MODE_TRANSPORT=m | ||
| 293 | CONFIG_INET6_XFRM_MODE_TUNNEL=m | ||
| 294 | CONFIG_INET6_XFRM_MODE_BEET=m | ||
| 295 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | ||
| 296 | CONFIG_IPV6_SIT=m | ||
| 297 | # CONFIG_IPV6_TUNNEL is not set | ||
| 298 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | ||
| 299 | # CONFIG_NETWORK_SECMARK is not set | ||
| 300 | # CONFIG_NETFILTER is not set | ||
| 301 | # CONFIG_IP_DCCP is not set | ||
| 302 | # CONFIG_IP_SCTP is not set | ||
| 303 | # CONFIG_TIPC is not set | ||
| 304 | # CONFIG_ATM is not set | ||
| 305 | # CONFIG_BRIDGE is not set | ||
| 306 | # CONFIG_VLAN_8021Q is not set | ||
| 307 | # CONFIG_DECNET is not set | ||
| 308 | # CONFIG_LLC2 is not set | ||
| 309 | # CONFIG_IPX is not set | ||
| 310 | # CONFIG_ATALK is not set | ||
| 311 | # CONFIG_X25 is not set | ||
| 312 | # CONFIG_LAPB is not set | ||
| 313 | # CONFIG_ECONET is not set | ||
| 314 | # CONFIG_WAN_ROUTER is not set | ||
| 315 | |||
| 316 | # | ||
| 317 | # QoS and/or fair queueing | ||
| 318 | # | ||
| 319 | # CONFIG_NET_SCHED is not set | ||
| 320 | |||
| 321 | # | ||
| 322 | # Network testing | ||
| 323 | # | ||
| 324 | # CONFIG_NET_PKTGEN is not set | ||
| 325 | # CONFIG_HAMRADIO is not set | ||
| 326 | # CONFIG_IRDA is not set | ||
| 327 | # CONFIG_BT is not set | ||
| 328 | # CONFIG_AF_RXRPC is not set | ||
| 329 | |||
| 330 | # | ||
| 331 | # Wireless | ||
| 332 | # | ||
| 333 | # CONFIG_CFG80211 is not set | ||
| 334 | # CONFIG_WIRELESS_EXT is not set | ||
| 335 | # CONFIG_MAC80211 is not set | ||
| 336 | # CONFIG_IEEE80211 is not set | ||
| 337 | # CONFIG_RFKILL is not set | ||
| 338 | # CONFIG_NET_9P is not set | ||
| 339 | |||
| 340 | # | ||
| 341 | # Device Drivers | ||
| 342 | # | ||
| 343 | |||
| 344 | # | ||
| 345 | # Generic Driver Options | ||
| 346 | # | ||
| 347 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| 348 | CONFIG_STANDALONE=y | ||
| 349 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
| 350 | CONFIG_FW_LOADER=y | ||
| 351 | # CONFIG_DEBUG_DRIVER is not set | ||
| 352 | # CONFIG_DEBUG_DEVRES is not set | ||
| 353 | # CONFIG_SYS_HYPERVISOR is not set | ||
| 354 | # CONFIG_CONNECTOR is not set | ||
| 355 | # CONFIG_MTD is not set | ||
| 356 | # CONFIG_PARPORT is not set | ||
| 357 | CONFIG_PNP=y | ||
| 358 | # CONFIG_PNP_DEBUG is not set | ||
| 359 | |||
| 360 | # | ||
| 361 | # Protocols | ||
| 362 | # | ||
| 363 | CONFIG_PNPACPI=y | ||
| 364 | CONFIG_BLK_DEV=y | ||
| 365 | # CONFIG_BLK_CPQ_DA is not set | ||
| 366 | # CONFIG_BLK_CPQ_CISS_DA is not set | ||
| 367 | # CONFIG_BLK_DEV_DAC960 is not set | ||
| 368 | # CONFIG_BLK_DEV_UMEM is not set | ||
| 369 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
| 370 | CONFIG_BLK_DEV_LOOP=y | ||
| 371 | CONFIG_BLK_DEV_CRYPTOLOOP=m | ||
| 372 | CONFIG_BLK_DEV_NBD=m | ||
| 373 | # CONFIG_BLK_DEV_SX8 is not set | ||
| 374 | # CONFIG_BLK_DEV_UB is not set | ||
| 375 | CONFIG_BLK_DEV_RAM=y | ||
| 376 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
| 377 | CONFIG_BLK_DEV_RAM_SIZE=4096 | ||
| 378 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | ||
| 379 | # CONFIG_CDROM_PKTCDVD is not set | ||
| 380 | CONFIG_ATA_OVER_ETH=m | ||
| 381 | CONFIG_MISC_DEVICES=y | ||
| 382 | # CONFIG_PHANTOM is not set | ||
| 383 | # CONFIG_EEPROM_93CX6 is not set | ||
| 384 | CONFIG_SGI_IOC4=y | ||
| 385 | # CONFIG_TIFM_CORE is not set | ||
| 386 | CONFIG_IDE=y | ||
| 387 | CONFIG_IDE_MAX_HWIFS=4 | ||
| 388 | CONFIG_BLK_DEV_IDE=y | ||
| 389 | |||
| 390 | # | ||
| 391 | # Please see Documentation/ide.txt for help/info on IDE drives | ||
| 392 | # | ||
| 393 | # CONFIG_BLK_DEV_IDE_SATA is not set | ||
| 394 | CONFIG_BLK_DEV_IDEDISK=y | ||
| 395 | # CONFIG_IDEDISK_MULTI_MODE is not set | ||
| 396 | CONFIG_BLK_DEV_IDECD=y | ||
| 397 | # CONFIG_BLK_DEV_IDETAPE is not set | ||
| 398 | # CONFIG_BLK_DEV_IDEFLOPPY is not set | ||
| 399 | # CONFIG_BLK_DEV_IDESCSI is not set | ||
| 400 | # CONFIG_BLK_DEV_IDEACPI is not set | ||
| 401 | # CONFIG_IDE_TASK_IOCTL is not set | ||
| 402 | CONFIG_IDE_PROC_FS=y | ||
| 403 | |||
| 404 | # | ||
| 405 | # IDE chipset support/bugfixes | ||
| 406 | # | ||
| 407 | CONFIG_IDE_GENERIC=y | ||
| 408 | # CONFIG_BLK_DEV_PLATFORM is not set | ||
| 409 | # CONFIG_BLK_DEV_IDEPNP is not set | ||
| 410 | |||
| 411 | # | ||
| 412 | # PCI IDE chipsets support | ||
| 413 | # | ||
| 414 | CONFIG_BLK_DEV_IDEPCI=y | ||
| 415 | CONFIG_IDEPCI_SHARE_IRQ=y | ||
| 416 | CONFIG_IDEPCI_PCIBUS_ORDER=y | ||
| 417 | # CONFIG_BLK_DEV_OFFBOARD is not set | ||
| 418 | # CONFIG_BLK_DEV_GENERIC is not set | ||
| 419 | # CONFIG_BLK_DEV_OPTI621 is not set | ||
| 420 | CONFIG_BLK_DEV_IDEDMA_PCI=y | ||
| 421 | # CONFIG_BLK_DEV_AEC62XX is not set | ||
| 422 | # CONFIG_BLK_DEV_ALI15X3 is not set | ||
| 423 | # CONFIG_BLK_DEV_AMD74XX is not set | ||
| 424 | # CONFIG_BLK_DEV_CMD64X is not set | ||
| 425 | # CONFIG_BLK_DEV_TRIFLEX is not set | ||
| 426 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
| 427 | # CONFIG_BLK_DEV_CS5520 is not set | ||
| 428 | # CONFIG_BLK_DEV_CS5530 is not set | ||
| 429 | # CONFIG_BLK_DEV_HPT34X is not set | ||
| 430 | # CONFIG_BLK_DEV_HPT366 is not set | ||
| 431 | # CONFIG_BLK_DEV_JMICRON is not set | ||
| 432 | # CONFIG_BLK_DEV_SC1200 is not set | ||
| 433 | # CONFIG_BLK_DEV_PIIX is not set | ||
| 434 | # CONFIG_BLK_DEV_IT8213 is not set | ||
| 435 | # CONFIG_BLK_DEV_IT821X is not set | ||
| 436 | # CONFIG_BLK_DEV_NS87415 is not set | ||
| 437 | # CONFIG_BLK_DEV_PDC202XX_OLD is not set | ||
| 438 | # CONFIG_BLK_DEV_PDC202XX_NEW is not set | ||
| 439 | # CONFIG_BLK_DEV_SVWKS is not set | ||
| 440 | CONFIG_BLK_DEV_SGIIOC4=y | ||
| 441 | # CONFIG_BLK_DEV_SIIMAGE is not set | ||
| 442 | # CONFIG_BLK_DEV_SLC90E66 is not set | ||
| 443 | # CONFIG_BLK_DEV_TRM290 is not set | ||
| 444 | # CONFIG_BLK_DEV_VIA82CXXX is not set | ||
| 445 | # CONFIG_BLK_DEV_TC86C001 is not set | ||
| 446 | # CONFIG_IDE_ARM is not set | ||
| 447 | CONFIG_BLK_DEV_IDEDMA=y | ||
| 448 | # CONFIG_BLK_DEV_HD is not set | ||
| 449 | |||
| 450 | # | ||
| 451 | # SCSI device support | ||
| 452 | # | ||
| 453 | # CONFIG_RAID_ATTRS is not set | ||
| 454 | CONFIG_SCSI=y | ||
| 455 | CONFIG_SCSI_DMA=y | ||
| 456 | # CONFIG_SCSI_TGT is not set | ||
| 457 | CONFIG_SCSI_NETLINK=y | ||
| 458 | CONFIG_SCSI_PROC_FS=y | ||
| 459 | |||
| 460 | # | ||
| 461 | # SCSI support type (disk, tape, CD-ROM) | ||
| 462 | # | ||
| 463 | CONFIG_BLK_DEV_SD=y | ||
| 464 | CONFIG_CHR_DEV_ST=m | ||
| 465 | # CONFIG_CHR_DEV_OSST is not set | ||
| 466 | CONFIG_BLK_DEV_SR=m | ||
| 467 | # CONFIG_BLK_DEV_SR_VENDOR is not set | ||
| 468 | CONFIG_CHR_DEV_SG=m | ||
| 469 | CONFIG_CHR_DEV_SCH=m | ||
| 470 | |||
| 471 | # | ||
| 472 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
| 473 | # | ||
| 474 | # CONFIG_SCSI_MULTI_LUN is not set | ||
| 475 | CONFIG_SCSI_CONSTANTS=y | ||
| 476 | # CONFIG_SCSI_LOGGING is not set | ||
| 477 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
| 478 | CONFIG_SCSI_WAIT_SCAN=m | ||
| 479 | |||
| 480 | # | ||
| 481 | # SCSI Transports | ||
| 482 | # | ||
| 483 | CONFIG_SCSI_SPI_ATTRS=y | ||
| 484 | CONFIG_SCSI_FC_ATTRS=y | ||
| 485 | CONFIG_SCSI_ISCSI_ATTRS=m | ||
| 486 | CONFIG_SCSI_SAS_ATTRS=y | ||
| 487 | CONFIG_SCSI_SAS_LIBSAS=y | ||
| 488 | # CONFIG_SCSI_SAS_ATA is not set | ||
| 489 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set | ||
| 490 | CONFIG_SCSI_SRP_ATTRS=y | ||
| 491 | CONFIG_SCSI_LOWLEVEL=y | ||
| 492 | CONFIG_ISCSI_TCP=m | ||
| 493 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | ||
| 494 | # CONFIG_SCSI_3W_9XXX is not set | ||
| 495 | # CONFIG_SCSI_ACARD is not set | ||
| 496 | # CONFIG_SCSI_AACRAID is not set | ||
| 497 | # CONFIG_SCSI_AIC7XXX is not set | ||
| 498 | # CONFIG_SCSI_AIC7XXX_OLD is not set | ||
| 499 | # CONFIG_SCSI_AIC79XX is not set | ||
| 500 | # CONFIG_SCSI_AIC94XX is not set | ||
| 501 | # CONFIG_SCSI_ADVANSYS is not set | ||
| 502 | # CONFIG_SCSI_ARCMSR is not set | ||
| 503 | # CONFIG_MEGARAID_NEWGEN is not set | ||
| 504 | # CONFIG_MEGARAID_LEGACY is not set | ||
| 505 | # CONFIG_MEGARAID_SAS is not set | ||
| 506 | # CONFIG_SCSI_HPTIOP is not set | ||
| 507 | # CONFIG_SCSI_DMX3191D is not set | ||
| 508 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | ||
| 509 | # CONFIG_SCSI_IPS is not set | ||
| 510 | # CONFIG_SCSI_INITIO is not set | ||
| 511 | # CONFIG_SCSI_INIA100 is not set | ||
| 512 | # CONFIG_SCSI_STEX is not set | ||
| 513 | # CONFIG_SCSI_SYM53C8XX_2 is not set | ||
| 514 | # CONFIG_SCSI_IPR is not set | ||
| 515 | CONFIG_SCSI_QLOGIC_1280=y | ||
| 516 | CONFIG_SCSI_QLA_FC=y | ||
| 517 | # CONFIG_SCSI_QLA_ISCSI is not set | ||
| 518 | # CONFIG_SCSI_LPFC is not set | ||
| 519 | # CONFIG_SCSI_DC395x is not set | ||
| 520 | # CONFIG_SCSI_DC390T is not set | ||
| 521 | # CONFIG_SCSI_DEBUG is not set | ||
| 522 | # CONFIG_SCSI_SRP is not set | ||
| 523 | CONFIG_ATA=y | ||
| 524 | CONFIG_ATA_NONSTANDARD=y | ||
| 525 | CONFIG_ATA_ACPI=y | ||
| 526 | # CONFIG_SATA_AHCI is not set | ||
| 527 | # CONFIG_SATA_SVW is not set | ||
| 528 | # CONFIG_ATA_PIIX is not set | ||
| 529 | # CONFIG_SATA_MV is not set | ||
| 530 | # CONFIG_SATA_NV is not set | ||
| 531 | # CONFIG_PDC_ADMA is not set | ||
| 532 | # CONFIG_SATA_QSTOR is not set | ||
| 533 | # CONFIG_SATA_PROMISE is not set | ||
| 534 | # CONFIG_SATA_SX4 is not set | ||
| 535 | # CONFIG_SATA_SIL is not set | ||
| 536 | # CONFIG_SATA_SIL24 is not set | ||
| 537 | # CONFIG_SATA_SIS is not set | ||
| 538 | # CONFIG_SATA_ULI is not set | ||
| 539 | # CONFIG_SATA_VIA is not set | ||
| 540 | CONFIG_SATA_VITESSE=y | ||
| 541 | # CONFIG_SATA_INIC162X is not set | ||
| 542 | # CONFIG_PATA_ACPI is not set | ||
| 543 | # CONFIG_PATA_ALI is not set | ||
| 544 | # CONFIG_PATA_AMD is not set | ||
| 545 | # CONFIG_PATA_ARTOP is not set | ||
| 546 | # CONFIG_PATA_ATIIXP is not set | ||
| 547 | # CONFIG_PATA_CMD640_PCI is not set | ||
| 548 | # CONFIG_PATA_CMD64X is not set | ||
| 549 | # CONFIG_PATA_CS5520 is not set | ||
| 550 | # CONFIG_PATA_CS5530 is not set | ||
| 551 | # CONFIG_PATA_CYPRESS is not set | ||
| 552 | # CONFIG_PATA_EFAR is not set | ||
| 553 | # CONFIG_ATA_GENERIC is not set | ||
| 554 | # CONFIG_PATA_HPT366 is not set | ||
| 555 | # CONFIG_PATA_HPT37X is not set | ||
| 556 | # CONFIG_PATA_HPT3X2N is not set | ||
| 557 | # CONFIG_PATA_HPT3X3 is not set | ||
| 558 | # CONFIG_PATA_IT821X is not set | ||
| 559 | # CONFIG_PATA_IT8213 is not set | ||
| 560 | # CONFIG_PATA_JMICRON is not set | ||
| 561 | # CONFIG_PATA_TRIFLEX is not set | ||
| 562 | # CONFIG_PATA_MARVELL is not set | ||
| 563 | # CONFIG_PATA_MPIIX is not set | ||
| 564 | # CONFIG_PATA_OLDPIIX is not set | ||
| 565 | # CONFIG_PATA_NETCELL is not set | ||
| 566 | # CONFIG_PATA_NS87410 is not set | ||
| 567 | # CONFIG_PATA_NS87415 is not set | ||
| 568 | # CONFIG_PATA_OPTI is not set | ||
| 569 | # CONFIG_PATA_OPTIDMA is not set | ||
| 570 | # CONFIG_PATA_PDC_OLD is not set | ||
| 571 | # CONFIG_PATA_RADISYS is not set | ||
| 572 | # CONFIG_PATA_RZ1000 is not set | ||
| 573 | # CONFIG_PATA_SC1200 is not set | ||
| 574 | # CONFIG_PATA_SERVERWORKS is not set | ||
| 575 | # CONFIG_PATA_PDC2027X is not set | ||
| 576 | # CONFIG_PATA_SIL680 is not set | ||
| 577 | # CONFIG_PATA_SIS is not set | ||
| 578 | # CONFIG_PATA_VIA is not set | ||
| 579 | # CONFIG_PATA_WINBOND is not set | ||
| 580 | CONFIG_MD=y | ||
| 581 | CONFIG_BLK_DEV_MD=y | ||
| 582 | CONFIG_MD_LINEAR=y | ||
| 583 | CONFIG_MD_RAID0=y | ||
| 584 | CONFIG_MD_RAID1=y | ||
| 585 | # CONFIG_MD_RAID10 is not set | ||
| 586 | CONFIG_MD_RAID456=y | ||
| 587 | # CONFIG_MD_RAID5_RESHAPE is not set | ||
| 588 | CONFIG_MD_MULTIPATH=y | ||
| 589 | # CONFIG_MD_FAULTY is not set | ||
| 590 | CONFIG_BLK_DEV_DM=y | ||
| 591 | # CONFIG_DM_DEBUG is not set | ||
| 592 | CONFIG_DM_CRYPT=m | ||
| 593 | CONFIG_DM_SNAPSHOT=m | ||
| 594 | CONFIG_DM_MIRROR=m | ||
| 595 | CONFIG_DM_ZERO=m | ||
| 596 | CONFIG_DM_MULTIPATH=m | ||
| 597 | CONFIG_DM_MULTIPATH_EMC=m | ||
| 598 | # CONFIG_DM_MULTIPATH_RDAC is not set | ||
| 599 | # CONFIG_DM_DELAY is not set | ||
| 600 | CONFIG_FUSION=y | ||
| 601 | CONFIG_FUSION_SPI=y | ||
| 602 | CONFIG_FUSION_FC=y | ||
| 603 | CONFIG_FUSION_SAS=y | ||
| 604 | CONFIG_FUSION_MAX_SGE=128 | ||
| 605 | CONFIG_FUSION_CTL=m | ||
| 606 | CONFIG_FUSION_LOGGING=y | ||
| 607 | |||
| 608 | # | ||
| 609 | # IEEE 1394 (FireWire) support | ||
| 610 | # | ||
| 611 | # CONFIG_FIREWIRE is not set | ||
| 612 | # CONFIG_IEEE1394 is not set | ||
| 613 | # CONFIG_I2O is not set | ||
| 614 | CONFIG_NETDEVICES=y | ||
| 615 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 616 | # CONFIG_DUMMY is not set | ||
| 617 | # CONFIG_BONDING is not set | ||
| 618 | # CONFIG_MACVLAN is not set | ||
| 619 | # CONFIG_EQUALIZER is not set | ||
| 620 | # CONFIG_TUN is not set | ||
| 621 | # CONFIG_VETH is not set | ||
| 622 | # CONFIG_NET_SB1000 is not set | ||
| 623 | # CONFIG_IP1000 is not set | ||
| 624 | # CONFIG_ARCNET is not set | ||
| 625 | # CONFIG_NET_ETHERNET is not set | ||
| 626 | CONFIG_NETDEV_1000=y | ||
| 627 | # CONFIG_ACENIC is not set | ||
| 628 | # CONFIG_DL2K is not set | ||
| 629 | # CONFIG_E1000 is not set | ||
| 630 | # CONFIG_E1000E is not set | ||
| 631 | # CONFIG_NS83820 is not set | ||
| 632 | # CONFIG_HAMACHI is not set | ||
| 633 | # CONFIG_YELLOWFIN is not set | ||
| 634 | # CONFIG_R8169 is not set | ||
| 635 | # CONFIG_SIS190 is not set | ||
| 636 | # CONFIG_SKGE is not set | ||
| 637 | # CONFIG_SKY2 is not set | ||
| 638 | # CONFIG_SK98LIN is not set | ||
| 639 | # CONFIG_VIA_VELOCITY is not set | ||
| 640 | CONFIG_TIGON3=y | ||
| 641 | # CONFIG_BNX2 is not set | ||
| 642 | # CONFIG_QLA3XXX is not set | ||
| 643 | # CONFIG_ATL1 is not set | ||
| 644 | CONFIG_NETDEV_10000=y | ||
| 645 | CONFIG_CHELSIO_T1=m | ||
| 646 | CONFIG_CHELSIO_T1_1G=y | ||
| 647 | # CONFIG_CHELSIO_T1_NAPI is not set | ||
| 648 | CONFIG_CHELSIO_T3=m | ||
| 649 | CONFIG_IXGBE=m | ||
| 650 | # CONFIG_IXGB is not set | ||
| 651 | CONFIG_S2IO=m | ||
| 652 | # CONFIG_S2IO_NAPI is not set | ||
| 653 | # CONFIG_MYRI10GE is not set | ||
| 654 | # CONFIG_NETXEN_NIC is not set | ||
| 655 | # CONFIG_NIU is not set | ||
| 656 | # CONFIG_MLX4_CORE is not set | ||
| 657 | # CONFIG_TEHUTI is not set | ||
| 658 | # CONFIG_TR is not set | ||
| 659 | |||
| 660 | # | ||
| 661 | # Wireless LAN | ||
| 662 | # | ||
| 663 | # CONFIG_WLAN_PRE80211 is not set | ||
| 664 | # CONFIG_WLAN_80211 is not set | ||
| 665 | |||
| 666 | # | ||
| 667 | # USB Network Adapters | ||
| 668 | # | ||
| 669 | # CONFIG_USB_CATC is not set | ||
| 670 | # CONFIG_USB_KAWETH is not set | ||
| 671 | # CONFIG_USB_PEGASUS is not set | ||
| 672 | # CONFIG_USB_RTL8150 is not set | ||
| 673 | # CONFIG_USB_USBNET_MII is not set | ||
| 674 | # CONFIG_USB_USBNET is not set | ||
| 675 | # CONFIG_WAN is not set | ||
| 676 | # CONFIG_FDDI is not set | ||
| 677 | # CONFIG_HIPPI is not set | ||
| 678 | # CONFIG_PPP is not set | ||
| 679 | # CONFIG_SLIP is not set | ||
| 680 | # CONFIG_NET_FC is not set | ||
| 681 | # CONFIG_SHAPER is not set | ||
| 682 | CONFIG_NETCONSOLE=y | ||
| 683 | # CONFIG_NETCONSOLE_DYNAMIC is not set | ||
| 684 | CONFIG_NETPOLL=y | ||
| 685 | # CONFIG_NETPOLL_TRAP is not set | ||
| 686 | CONFIG_NET_POLL_CONTROLLER=y | ||
| 687 | # CONFIG_ISDN is not set | ||
| 688 | # CONFIG_PHONE is not set | ||
| 689 | |||
| 690 | # | ||
| 691 | # Input device support | ||
| 692 | # | ||
| 693 | CONFIG_INPUT=y | ||
| 694 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
| 695 | # CONFIG_INPUT_POLLDEV is not set | ||
| 696 | |||
| 697 | # | ||
| 698 | # Userland interfaces | ||
| 699 | # | ||
| 700 | CONFIG_INPUT_MOUSEDEV=y | ||
| 701 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set | ||
| 702 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | ||
| 703 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | ||
| 704 | # CONFIG_INPUT_JOYDEV is not set | ||
| 705 | # CONFIG_INPUT_EVDEV is not set | ||
| 706 | # CONFIG_INPUT_EVBUG is not set | ||
| 707 | |||
| 708 | # | ||
| 709 | # Input Device Drivers | ||
| 710 | # | ||
| 711 | # CONFIG_INPUT_KEYBOARD is not set | ||
| 712 | # CONFIG_INPUT_MOUSE is not set | ||
| 713 | # CONFIG_INPUT_JOYSTICK is not set | ||
| 714 | # CONFIG_INPUT_TABLET is not set | ||
| 715 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
| 716 | # CONFIG_INPUT_MISC is not set | ||
| 717 | |||
| 718 | # | ||
| 719 | # Hardware I/O ports | ||
| 720 | # | ||
| 721 | # CONFIG_SERIO is not set | ||
| 722 | # CONFIG_GAMEPORT is not set | ||
| 723 | |||
| 724 | # | ||
| 725 | # Character devices | ||
| 726 | # | ||
| 727 | CONFIG_VT=y | ||
| 728 | # CONFIG_VT_UNICODE is not set | ||
| 729 | CONFIG_VT_CONSOLE=y | ||
| 730 | CONFIG_HW_CONSOLE=y | ||
| 731 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
| 732 | CONFIG_SERIAL_NONSTANDARD=y | ||
| 733 | # CONFIG_COMPUTONE is not set | ||
| 734 | # CONFIG_ROCKETPORT is not set | ||
| 735 | # CONFIG_CYCLADES is not set | ||
| 736 | # CONFIG_DIGIEPCA is not set | ||
| 737 | # CONFIG_MOXA_INTELLIO is not set | ||
| 738 | # CONFIG_MOXA_SMARTIO is not set | ||
| 739 | # CONFIG_MOXA_SMARTIO_NEW is not set | ||
| 740 | # CONFIG_ISI is not set | ||
| 741 | # CONFIG_SYNCLINKMP is not set | ||
| 742 | # CONFIG_SYNCLINK_GT is not set | ||
| 743 | # CONFIG_N_HDLC is not set | ||
| 744 | # CONFIG_SPECIALIX is not set | ||
| 745 | # CONFIG_SX is not set | ||
| 746 | # CONFIG_RIO is not set | ||
| 747 | # CONFIG_STALDRV is not set | ||
| 748 | CONFIG_SGI_SNSC=y | ||
| 749 | CONFIG_SGI_TIOCX=y | ||
| 750 | CONFIG_SGI_MBCS=m | ||
| 751 | |||
| 752 | # | ||
| 753 | # Serial drivers | ||
| 754 | # | ||
| 755 | # CONFIG_SERIAL_8250 is not set | ||
| 756 | |||
| 757 | # | ||
| 758 | # Non-8250 serial port support | ||
| 759 | # | ||
| 760 | CONFIG_SERIAL_CORE=y | ||
| 761 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
| 762 | CONFIG_SERIAL_SGI_L1_CONSOLE=y | ||
| 763 | # CONFIG_SERIAL_JSM is not set | ||
| 764 | CONFIG_SERIAL_SGI_IOC4=y | ||
| 765 | CONFIG_SERIAL_SGI_IOC3=y | ||
| 766 | CONFIG_UNIX98_PTYS=y | ||
| 767 | CONFIG_LEGACY_PTYS=y | ||
| 768 | CONFIG_LEGACY_PTY_COUNT=256 | ||
| 769 | # CONFIG_IPMI_HANDLER is not set | ||
| 770 | # CONFIG_WATCHDOG is not set | ||
| 771 | # CONFIG_HW_RANDOM is not set | ||
| 772 | CONFIG_EFI_RTC=y | ||
| 773 | # CONFIG_R3964 is not set | ||
| 774 | # CONFIG_APPLICOM is not set | ||
| 775 | CONFIG_RAW_DRIVER=m | ||
| 776 | CONFIG_MAX_RAW_DEVS=256 | ||
| 777 | # CONFIG_HPET is not set | ||
| 778 | # CONFIG_HANGCHECK_TIMER is not set | ||
| 779 | CONFIG_MMTIMER=y | ||
| 780 | # CONFIG_TCG_TPM is not set | ||
| 781 | CONFIG_DEVPORT=y | ||
| 782 | # CONFIG_I2C is not set | ||
| 783 | |||
| 784 | # | ||
| 785 | # SPI support | ||
| 786 | # | ||
| 787 | # CONFIG_SPI is not set | ||
| 788 | # CONFIG_SPI_MASTER is not set | ||
| 789 | # CONFIG_W1 is not set | ||
| 790 | # CONFIG_POWER_SUPPLY is not set | ||
| 791 | # CONFIG_HWMON is not set | ||
| 792 | |||
| 793 | # | ||
| 794 | # Sonics Silicon Backplane | ||
| 795 | # | ||
| 796 | CONFIG_SSB_POSSIBLE=y | ||
| 797 | # CONFIG_SSB is not set | ||
| 798 | |||
| 799 | # | ||
| 800 | # Multifunction device drivers | ||
| 801 | # | ||
| 802 | # CONFIG_MFD_SM501 is not set | ||
| 803 | |||
| 804 | # | ||
| 805 | # Multimedia devices | ||
| 806 | # | ||
| 807 | # CONFIG_VIDEO_DEV is not set | ||
| 808 | # CONFIG_DVB_CORE is not set | ||
| 809 | # CONFIG_DAB is not set | ||
| 810 | |||
| 811 | # | ||
| 812 | # Graphics support | ||
| 813 | # | ||
| 814 | CONFIG_AGP=y | ||
| 815 | CONFIG_AGP_SGI_TIOCA=y | ||
| 816 | # CONFIG_DRM is not set | ||
| 817 | # CONFIG_VGASTATE is not set | ||
| 818 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
| 819 | # CONFIG_FB is not set | ||
| 820 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 821 | |||
| 822 | # | ||
| 823 | # Display device support | ||
| 824 | # | ||
| 825 | # CONFIG_DISPLAY_SUPPORT is not set | ||
| 826 | |||
| 827 | # | ||
| 828 | # Console display driver support | ||
| 829 | # | ||
| 830 | CONFIG_VGA_CONSOLE=y | ||
| 831 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set | ||
| 832 | CONFIG_DUMMY_CONSOLE=y | ||
| 833 | |||
| 834 | # | ||
| 835 | # Sound | ||
| 836 | # | ||
| 837 | # CONFIG_SOUND is not set | ||
| 838 | CONFIG_HID_SUPPORT=y | ||
| 839 | CONFIG_HID=y | ||
| 840 | CONFIG_HID_DEBUG=y | ||
| 841 | # CONFIG_HIDRAW is not set | ||
| 842 | |||
| 843 | # | ||
| 844 | # USB Input Devices | ||
| 845 | # | ||
| 846 | CONFIG_USB_HID=m | ||
| 847 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | ||
| 848 | # CONFIG_HID_FF is not set | ||
| 849 | # CONFIG_USB_HIDDEV is not set | ||
| 850 | |||
| 851 | # | ||
| 852 | # USB HID Boot Protocol drivers | ||
| 853 | # | ||
| 854 | # CONFIG_USB_KBD is not set | ||
| 855 | # CONFIG_USB_MOUSE is not set | ||
| 856 | CONFIG_USB_SUPPORT=y | ||
| 857 | CONFIG_USB_ARCH_HAS_HCD=y | ||
| 858 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
| 859 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
| 860 | CONFIG_USB=m | ||
| 861 | # CONFIG_USB_DEBUG is not set | ||
| 862 | |||
| 863 | # | ||
| 864 | # Miscellaneous USB options | ||
| 865 | # | ||
| 866 | # CONFIG_USB_DEVICEFS is not set | ||
| 867 | CONFIG_USB_DEVICE_CLASS=y | ||
| 868 | # CONFIG_USB_DYNAMIC_MINORS is not set | ||
| 869 | # CONFIG_USB_SUSPEND is not set | ||
| 870 | # CONFIG_USB_PERSIST is not set | ||
| 871 | # CONFIG_USB_OTG is not set | ||
| 872 | |||
| 873 | # | ||
| 874 | # USB Host Controller Drivers | ||
| 875 | # | ||
| 876 | CONFIG_USB_EHCI_HCD=m | ||
| 877 | # CONFIG_USB_EHCI_SPLIT_ISO is not set | ||
| 878 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | ||
| 879 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | ||
| 880 | # CONFIG_USB_ISP116X_HCD is not set | ||
| 881 | CONFIG_USB_OHCI_HCD=m | ||
| 882 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | ||
| 883 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | ||
| 884 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | ||
| 885 | CONFIG_USB_UHCI_HCD=m | ||
| 886 | # CONFIG_USB_SL811_HCD is not set | ||
| 887 | # CONFIG_USB_R8A66597_HCD is not set | ||
| 888 | |||
| 889 | # | ||
| 890 | # USB Device Class drivers | ||
| 891 | # | ||
| 892 | # CONFIG_USB_ACM is not set | ||
| 893 | # CONFIG_USB_PRINTER is not set | ||
| 894 | |||
| 895 | # | ||
| 896 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
| 897 | # | ||
| 898 | |||
| 899 | # | ||
| 900 | # may also be needed; see USB_STORAGE Help for more information | ||
| 901 | # | ||
| 902 | # CONFIG_USB_STORAGE is not set | ||
| 903 | # CONFIG_USB_LIBUSUAL is not set | ||
| 904 | |||
| 905 | # | ||
| 906 | # USB Imaging devices | ||
| 907 | # | ||
| 908 | # CONFIG_USB_MDC800 is not set | ||
| 909 | # CONFIG_USB_MICROTEK is not set | ||
| 910 | CONFIG_USB_MON=y | ||
| 911 | |||
| 912 | # | ||
| 913 | # USB port drivers | ||
| 914 | # | ||
| 915 | |||
| 916 | # | ||
| 917 | # USB Serial Converter support | ||
| 918 | # | ||
| 919 | # CONFIG_USB_SERIAL is not set | ||
| 920 | |||
| 921 | # | ||
| 922 | # USB Miscellaneous drivers | ||
| 923 | # | ||
| 924 | # CONFIG_USB_EMI62 is not set | ||
| 925 | # CONFIG_USB_EMI26 is not set | ||
| 926 | # CONFIG_USB_ADUTUX is not set | ||
| 927 | # CONFIG_USB_AUERSWALD is not set | ||
| 928 | # CONFIG_USB_RIO500 is not set | ||
| 929 | # CONFIG_USB_LEGOTOWER is not set | ||
| 930 | # CONFIG_USB_LCD is not set | ||
| 931 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 932 | # CONFIG_USB_LED is not set | ||
| 933 | # CONFIG_USB_CYPRESS_CY7C63 is not set | ||
| 934 | # CONFIG_USB_CYTHERM is not set | ||
| 935 | # CONFIG_USB_PHIDGET is not set | ||
| 936 | # CONFIG_USB_IDMOUSE is not set | ||
| 937 | # CONFIG_USB_FTDI_ELAN is not set | ||
| 938 | # CONFIG_USB_APPLEDISPLAY is not set | ||
| 939 | # CONFIG_USB_SISUSBVGA is not set | ||
| 940 | # CONFIG_USB_LD is not set | ||
| 941 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
| 942 | # CONFIG_USB_IOWARRIOR is not set | ||
| 943 | |||
| 944 | # | ||
| 945 | # USB DSL modem support | ||
| 946 | # | ||
| 947 | |||
| 948 | # | ||
| 949 | # USB Gadget Support | ||
| 950 | # | ||
| 951 | # CONFIG_USB_GADGET is not set | ||
| 952 | # CONFIG_MMC is not set | ||
| 953 | # CONFIG_NEW_LEDS is not set | ||
| 954 | CONFIG_INFINIBAND=m | ||
| 955 | # CONFIG_INFINIBAND_USER_MAD is not set | ||
| 956 | CONFIG_INFINIBAND_USER_ACCESS=m | ||
| 957 | CONFIG_INFINIBAND_USER_MEM=y | ||
| 958 | CONFIG_INFINIBAND_ADDR_TRANS=y | ||
| 959 | CONFIG_INFINIBAND_MTHCA=m | ||
| 960 | CONFIG_INFINIBAND_MTHCA_DEBUG=y | ||
| 961 | # CONFIG_INFINIBAND_AMSO1100 is not set | ||
| 962 | # CONFIG_INFINIBAND_CXGB3 is not set | ||
| 963 | # CONFIG_MLX4_INFINIBAND is not set | ||
| 964 | CONFIG_INFINIBAND_IPOIB=m | ||
| 965 | # CONFIG_INFINIBAND_IPOIB_CM is not set | ||
| 966 | CONFIG_INFINIBAND_IPOIB_DEBUG=y | ||
| 967 | # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set | ||
| 968 | CONFIG_INFINIBAND_SRP=m | ||
| 969 | # CONFIG_INFINIBAND_ISER is not set | ||
| 970 | # CONFIG_RTC_CLASS is not set | ||
| 971 | |||
| 972 | # | ||
| 973 | # Userspace I/O | ||
| 974 | # | ||
| 975 | # CONFIG_UIO is not set | ||
| 976 | CONFIG_MSPEC=y | ||
| 977 | |||
| 978 | # | ||
| 979 | # File systems | ||
| 980 | # | ||
| 981 | CONFIG_EXT2_FS=y | ||
| 982 | CONFIG_EXT2_FS_XATTR=y | ||
| 983 | CONFIG_EXT2_FS_POSIX_ACL=y | ||
| 984 | CONFIG_EXT2_FS_SECURITY=y | ||
| 985 | # CONFIG_EXT2_FS_XIP is not set | ||
| 986 | CONFIG_EXT3_FS=y | ||
| 987 | CONFIG_EXT3_FS_XATTR=y | ||
| 988 | CONFIG_EXT3_FS_POSIX_ACL=y | ||
| 989 | CONFIG_EXT3_FS_SECURITY=y | ||
| 990 | # CONFIG_EXT4DEV_FS is not set | ||
| 991 | CONFIG_JBD=y | ||
| 992 | # CONFIG_JBD_DEBUG is not set | ||
| 993 | CONFIG_FS_MBCACHE=y | ||
| 994 | CONFIG_REISERFS_FS=y | ||
| 995 | # CONFIG_REISERFS_CHECK is not set | ||
| 996 | # CONFIG_REISERFS_PROC_INFO is not set | ||
| 997 | CONFIG_REISERFS_FS_XATTR=y | ||
| 998 | CONFIG_REISERFS_FS_POSIX_ACL=y | ||
| 999 | CONFIG_REISERFS_FS_SECURITY=y | ||
| 1000 | # CONFIG_JFS_FS is not set | ||
| 1001 | CONFIG_FS_POSIX_ACL=y | ||
| 1002 | CONFIG_XFS_FS=y | ||
| 1003 | CONFIG_XFS_QUOTA=y | ||
| 1004 | # CONFIG_XFS_SECURITY is not set | ||
| 1005 | CONFIG_XFS_POSIX_ACL=y | ||
| 1006 | CONFIG_XFS_RT=y | ||
| 1007 | # CONFIG_GFS2_FS is not set | ||
| 1008 | # CONFIG_OCFS2_FS is not set | ||
| 1009 | # CONFIG_MINIX_FS is not set | ||
| 1010 | # CONFIG_ROMFS_FS is not set | ||
| 1011 | CONFIG_INOTIFY=y | ||
| 1012 | CONFIG_INOTIFY_USER=y | ||
| 1013 | CONFIG_QUOTA=y | ||
| 1014 | CONFIG_QUOTA_NETLINK_INTERFACE=y | ||
| 1015 | CONFIG_PRINT_QUOTA_WARNING=y | ||
| 1016 | # CONFIG_QFMT_V1 is not set | ||
| 1017 | # CONFIG_QFMT_V2 is not set | ||
| 1018 | CONFIG_QUOTACTL=y | ||
| 1019 | CONFIG_DNOTIFY=y | ||
| 1020 | CONFIG_AUTOFS_FS=m | ||
| 1021 | CONFIG_AUTOFS4_FS=m | ||
| 1022 | CONFIG_FUSE_FS=m | ||
| 1023 | |||
| 1024 | # | ||
| 1025 | # CD-ROM/DVD Filesystems | ||
| 1026 | # | ||
| 1027 | CONFIG_ISO9660_FS=y | ||
| 1028 | CONFIG_JOLIET=y | ||
| 1029 | # CONFIG_ZISOFS is not set | ||
| 1030 | CONFIG_UDF_FS=m | ||
| 1031 | CONFIG_UDF_NLS=y | ||
| 1032 | |||
| 1033 | # | ||
| 1034 | # DOS/FAT/NT Filesystems | ||
| 1035 | # | ||
| 1036 | CONFIG_FAT_FS=y | ||
| 1037 | # CONFIG_MSDOS_FS is not set | ||
| 1038 | CONFIG_VFAT_FS=y | ||
| 1039 | CONFIG_FAT_DEFAULT_CODEPAGE=437 | ||
| 1040 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | ||
| 1041 | # CONFIG_NTFS_FS is not set | ||
| 1042 | |||
| 1043 | # | ||
| 1044 | # Pseudo filesystems | ||
| 1045 | # | ||
| 1046 | CONFIG_PROC_FS=y | ||
| 1047 | CONFIG_PROC_KCORE=y | ||
| 1048 | CONFIG_PROC_SYSCTL=y | ||
| 1049 | CONFIG_SYSFS=y | ||
| 1050 | CONFIG_TMPFS=y | ||
| 1051 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
| 1052 | CONFIG_HUGETLBFS=y | ||
| 1053 | CONFIG_HUGETLB_PAGE=y | ||
| 1054 | # CONFIG_CONFIGFS_FS is not set | ||
| 1055 | |||
| 1056 | # | ||
| 1057 | # Miscellaneous filesystems | ||
| 1058 | # | ||
| 1059 | # CONFIG_ADFS_FS is not set | ||
| 1060 | # CONFIG_AFFS_FS is not set | ||
| 1061 | # CONFIG_HFS_FS is not set | ||
| 1062 | # CONFIG_HFSPLUS_FS is not set | ||
| 1063 | # CONFIG_BEFS_FS is not set | ||
| 1064 | # CONFIG_BFS_FS is not set | ||
| 1065 | # CONFIG_EFS_FS is not set | ||
| 1066 | # CONFIG_CRAMFS is not set | ||
| 1067 | # CONFIG_VXFS_FS is not set | ||
| 1068 | # CONFIG_HPFS_FS is not set | ||
| 1069 | # CONFIG_QNX4FS_FS is not set | ||
| 1070 | # CONFIG_SYSV_FS is not set | ||
| 1071 | # CONFIG_UFS_FS is not set | ||
| 1072 | CONFIG_NETWORK_FILESYSTEMS=y | ||
| 1073 | CONFIG_NFS_FS=m | ||
| 1074 | CONFIG_NFS_V3=y | ||
| 1075 | # CONFIG_NFS_V3_ACL is not set | ||
| 1076 | CONFIG_NFS_V4=y | ||
| 1077 | CONFIG_NFS_DIRECTIO=y | ||
| 1078 | CONFIG_NFSD=m | ||
| 1079 | CONFIG_NFSD_V3=y | ||
| 1080 | # CONFIG_NFSD_V3_ACL is not set | ||
| 1081 | CONFIG_NFSD_V4=y | ||
| 1082 | CONFIG_NFSD_TCP=y | ||
| 1083 | CONFIG_LOCKD=m | ||
| 1084 | CONFIG_LOCKD_V4=y | ||
| 1085 | CONFIG_EXPORTFS=m | ||
| 1086 | CONFIG_NFS_COMMON=y | ||
| 1087 | CONFIG_SUNRPC=m | ||
| 1088 | CONFIG_SUNRPC_GSS=m | ||
| 1089 | CONFIG_SUNRPC_XPRT_RDMA=m | ||
| 1090 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 1091 | CONFIG_RPCSEC_GSS_KRB5=m | ||
| 1092 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
| 1093 | CONFIG_SMB_FS=m | ||
| 1094 | # CONFIG_SMB_NLS_DEFAULT is not set | ||
| 1095 | CONFIG_CIFS=m | ||
| 1096 | # CONFIG_CIFS_STATS is not set | ||
| 1097 | # CONFIG_CIFS_WEAK_PW_HASH is not set | ||
| 1098 | # CONFIG_CIFS_XATTR is not set | ||
| 1099 | # CONFIG_CIFS_DEBUG2 is not set | ||
| 1100 | # CONFIG_CIFS_EXPERIMENTAL is not set | ||
| 1101 | # CONFIG_NCP_FS is not set | ||
| 1102 | # CONFIG_CODA_FS is not set | ||
| 1103 | # CONFIG_AFS_FS is not set | ||
| 1104 | |||
| 1105 | # | ||
| 1106 | # Partition Types | ||
| 1107 | # | ||
| 1108 | CONFIG_PARTITION_ADVANCED=y | ||
| 1109 | # CONFIG_ACORN_PARTITION is not set | ||
| 1110 | # CONFIG_OSF_PARTITION is not set | ||
| 1111 | # CONFIG_AMIGA_PARTITION is not set | ||
| 1112 | # CONFIG_ATARI_PARTITION is not set | ||
| 1113 | # CONFIG_MAC_PARTITION is not set | ||
| 1114 | CONFIG_MSDOS_PARTITION=y | ||
| 1115 | # CONFIG_BSD_DISKLABEL is not set | ||
| 1116 | # CONFIG_MINIX_SUBPARTITION is not set | ||
| 1117 | # CONFIG_SOLARIS_X86_PARTITION is not set | ||
| 1118 | # CONFIG_UNIXWARE_DISKLABEL is not set | ||
| 1119 | # CONFIG_LDM_PARTITION is not set | ||
| 1120 | CONFIG_SGI_PARTITION=y | ||
| 1121 | # CONFIG_ULTRIX_PARTITION is not set | ||
| 1122 | # CONFIG_SUN_PARTITION is not set | ||
| 1123 | # CONFIG_KARMA_PARTITION is not set | ||
| 1124 | CONFIG_EFI_PARTITION=y | ||
| 1125 | # CONFIG_SYSV68_PARTITION is not set | ||
| 1126 | CONFIG_NLS=y | ||
| 1127 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
| 1128 | CONFIG_NLS_CODEPAGE_437=y | ||
| 1129 | # CONFIG_NLS_CODEPAGE_737 is not set | ||
| 1130 | # CONFIG_NLS_CODEPAGE_775 is not set | ||
| 1131 | # CONFIG_NLS_CODEPAGE_850 is not set | ||
| 1132 | # CONFIG_NLS_CODEPAGE_852 is not set | ||
| 1133 | # CONFIG_NLS_CODEPAGE_855 is not set | ||
| 1134 | # CONFIG_NLS_CODEPAGE_857 is not set | ||
| 1135 | # CONFIG_NLS_CODEPAGE_860 is not set | ||
| 1136 | # CONFIG_NLS_CODEPAGE_861 is not set | ||
| 1137 | # CONFIG_NLS_CODEPAGE_862 is not set | ||
| 1138 | # CONFIG_NLS_CODEPAGE_863 is not set | ||
| 1139 | # CONFIG_NLS_CODEPAGE_864 is not set | ||
| 1140 | # CONFIG_NLS_CODEPAGE_865 is not set | ||
| 1141 | # CONFIG_NLS_CODEPAGE_866 is not set | ||
| 1142 | # CONFIG_NLS_CODEPAGE_869 is not set | ||
| 1143 | # CONFIG_NLS_CODEPAGE_936 is not set | ||
| 1144 | # CONFIG_NLS_CODEPAGE_950 is not set | ||
| 1145 | # CONFIG_NLS_CODEPAGE_932 is not set | ||
| 1146 | # CONFIG_NLS_CODEPAGE_949 is not set | ||
| 1147 | # CONFIG_NLS_CODEPAGE_874 is not set | ||
| 1148 | # CONFIG_NLS_ISO8859_8 is not set | ||
| 1149 | # CONFIG_NLS_CODEPAGE_1250 is not set | ||
| 1150 | # CONFIG_NLS_CODEPAGE_1251 is not set | ||
| 1151 | # CONFIG_NLS_ASCII is not set | ||
| 1152 | CONFIG_NLS_ISO8859_1=y | ||
| 1153 | # CONFIG_NLS_ISO8859_2 is not set | ||
| 1154 | # CONFIG_NLS_ISO8859_3 is not set | ||
| 1155 | # CONFIG_NLS_ISO8859_4 is not set | ||
| 1156 | # CONFIG_NLS_ISO8859_5 is not set | ||
| 1157 | # CONFIG_NLS_ISO8859_6 is not set | ||
| 1158 | # CONFIG_NLS_ISO8859_7 is not set | ||
| 1159 | # CONFIG_NLS_ISO8859_9 is not set | ||
| 1160 | # CONFIG_NLS_ISO8859_13 is not set | ||
| 1161 | # CONFIG_NLS_ISO8859_14 is not set | ||
| 1162 | # CONFIG_NLS_ISO8859_15 is not set | ||
| 1163 | # CONFIG_NLS_KOI8_R is not set | ||
| 1164 | # CONFIG_NLS_KOI8_U is not set | ||
| 1165 | CONFIG_NLS_UTF8=y | ||
| 1166 | # CONFIG_DLM is not set | ||
| 1167 | |||
| 1168 | # | ||
| 1169 | # Library routines | ||
| 1170 | # | ||
| 1171 | CONFIG_BITREVERSE=y | ||
| 1172 | # CONFIG_CRC_CCITT is not set | ||
| 1173 | CONFIG_CRC16=m | ||
| 1174 | # CONFIG_CRC_ITU_T is not set | ||
| 1175 | CONFIG_CRC32=y | ||
| 1176 | # CONFIG_CRC7 is not set | ||
| 1177 | CONFIG_LIBCRC32C=m | ||
| 1178 | CONFIG_ZLIB_INFLATE=m | ||
| 1179 | CONFIG_ZLIB_DEFLATE=m | ||
| 1180 | CONFIG_GENERIC_ALLOCATOR=y | ||
| 1181 | CONFIG_PLIST=y | ||
| 1182 | CONFIG_HAS_IOMEM=y | ||
| 1183 | CONFIG_HAS_IOPORT=y | ||
| 1184 | CONFIG_HAS_DMA=y | ||
| 1185 | CONFIG_GENERIC_HARDIRQS=y | ||
| 1186 | CONFIG_GENERIC_IRQ_PROBE=y | ||
| 1187 | CONFIG_GENERIC_PENDING_IRQ=y | ||
| 1188 | CONFIG_IRQ_PER_CPU=y | ||
| 1189 | |||
| 1190 | # | ||
| 1191 | # Instrumentation Support | ||
| 1192 | # | ||
| 1193 | # CONFIG_PROFILING is not set | ||
| 1194 | # CONFIG_KPROBES is not set | ||
| 1195 | |||
| 1196 | # | ||
| 1197 | # Kernel hacking | ||
| 1198 | # | ||
| 1199 | # CONFIG_PRINTK_TIME is not set | ||
| 1200 | CONFIG_ENABLE_MUST_CHECK=y | ||
| 1201 | CONFIG_MAGIC_SYSRQ=y | ||
| 1202 | # CONFIG_UNUSED_SYMBOLS is not set | ||
| 1203 | # CONFIG_DEBUG_FS is not set | ||
| 1204 | # CONFIG_HEADERS_CHECK is not set | ||
| 1205 | CONFIG_DEBUG_KERNEL=y | ||
| 1206 | # CONFIG_DEBUG_SHIRQ is not set | ||
| 1207 | CONFIG_DETECT_SOFTLOCKUP=y | ||
| 1208 | CONFIG_SCHED_DEBUG=y | ||
| 1209 | # CONFIG_SCHEDSTATS is not set | ||
| 1210 | # CONFIG_TIMER_STATS is not set | ||
| 1211 | # CONFIG_SLUB_DEBUG_ON is not set | ||
| 1212 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
| 1213 | # CONFIG_RT_MUTEX_TESTER is not set | ||
| 1214 | # CONFIG_DEBUG_SPINLOCK is not set | ||
| 1215 | # CONFIG_DEBUG_MUTEXES is not set | ||
| 1216 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
| 1217 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
| 1218 | # CONFIG_DEBUG_KOBJECT is not set | ||
| 1219 | CONFIG_DEBUG_INFO=y | ||
| 1220 | # CONFIG_DEBUG_VM is not set | ||
| 1221 | # CONFIG_DEBUG_LIST is not set | ||
| 1222 | CONFIG_FORCED_INLINING=y | ||
| 1223 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
| 1224 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 1225 | # CONFIG_FAULT_INJECTION is not set | ||
| 1226 | CONFIG_IA64_GRANULE_16MB=y | ||
| 1227 | # CONFIG_IA64_GRANULE_64MB is not set | ||
| 1228 | # CONFIG_IA64_PRINT_HAZARDS is not set | ||
| 1229 | # CONFIG_DISABLE_VHPT is not set | ||
| 1230 | # CONFIG_IA64_DEBUG_CMPXCHG is not set | ||
| 1231 | # CONFIG_IA64_DEBUG_IRQ is not set | ||
| 1232 | CONFIG_SYSVIPC_COMPAT=y | ||
| 1233 | |||
| 1234 | # | ||
| 1235 | # Security options | ||
| 1236 | # | ||
| 1237 | # CONFIG_KEYS is not set | ||
| 1238 | # CONFIG_SECURITY is not set | ||
| 1239 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
| 1240 | CONFIG_XOR_BLOCKS=y | ||
| 1241 | CONFIG_ASYNC_CORE=y | ||
| 1242 | CONFIG_ASYNC_MEMCPY=y | ||
| 1243 | CONFIG_ASYNC_XOR=y | ||
| 1244 | CONFIG_CRYPTO=y | ||
| 1245 | CONFIG_CRYPTO_ALGAPI=y | ||
| 1246 | CONFIG_CRYPTO_BLKCIPHER=m | ||
| 1247 | CONFIG_CRYPTO_HASH=y | ||
| 1248 | CONFIG_CRYPTO_MANAGER=y | ||
| 1249 | CONFIG_CRYPTO_HMAC=y | ||
| 1250 | # CONFIG_CRYPTO_XCBC is not set | ||
| 1251 | # CONFIG_CRYPTO_NULL is not set | ||
| 1252 | # CONFIG_CRYPTO_MD4 is not set | ||
| 1253 | CONFIG_CRYPTO_MD5=y | ||
| 1254 | CONFIG_CRYPTO_SHA1=m | ||
| 1255 | # CONFIG_CRYPTO_SHA256 is not set | ||
| 1256 | # CONFIG_CRYPTO_SHA512 is not set | ||
| 1257 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1258 | # CONFIG_CRYPTO_TGR192 is not set | ||
| 1259 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1260 | CONFIG_CRYPTO_ECB=m | ||
| 1261 | CONFIG_CRYPTO_CBC=m | ||
| 1262 | CONFIG_CRYPTO_PCBC=m | ||
| 1263 | # CONFIG_CRYPTO_LRW is not set | ||
| 1264 | # CONFIG_CRYPTO_XTS is not set | ||
| 1265 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1266 | CONFIG_CRYPTO_DES=m | ||
| 1267 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1268 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1269 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1270 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1271 | # CONFIG_CRYPTO_AES is not set | ||
| 1272 | # CONFIG_CRYPTO_CAST5 is not set | ||
| 1273 | # CONFIG_CRYPTO_CAST6 is not set | ||
| 1274 | # CONFIG_CRYPTO_TEA is not set | ||
| 1275 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1276 | # CONFIG_CRYPTO_KHAZAD is not set | ||
| 1277 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1278 | # CONFIG_CRYPTO_SEED is not set | ||
| 1279 | CONFIG_CRYPTO_DEFLATE=m | ||
| 1280 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1281 | CONFIG_CRYPTO_CRC32C=m | ||
| 1282 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1283 | # CONFIG_CRYPTO_TEST is not set | ||
| 1284 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1285 | # CONFIG_CRYPTO_HW is not set | ||
diff --git a/arch/ia64/ia32/ia32_entry.S b/arch/ia64/ia32/ia32_entry.S index 06efd1f9b800..ff88c48c5d19 100644 --- a/arch/ia64/ia32/ia32_entry.S +++ b/arch/ia64/ia32/ia32_entry.S | |||
| @@ -262,7 +262,7 @@ ia32_syscall_table: | |||
| 262 | data8 sys_uselib | 262 | data8 sys_uselib |
| 263 | data8 sys_swapon | 263 | data8 sys_swapon |
| 264 | data8 sys_reboot | 264 | data8 sys_reboot |
| 265 | data8 sys32_readdir | 265 | data8 compat_sys_old_readdir |
| 266 | data8 sys32_mmap /* 90 */ | 266 | data8 sys32_mmap /* 90 */ |
| 267 | data8 sys32_munmap | 267 | data8 sys32_munmap |
| 268 | data8 sys_truncate | 268 | data8 sys_truncate |
diff --git a/arch/ia64/ia32/ia32priv.h b/arch/ia64/ia32/ia32priv.h index c5c872b250da..dd0c53687a96 100644 --- a/arch/ia64/ia32/ia32priv.h +++ b/arch/ia64/ia32/ia32priv.h | |||
| @@ -276,13 +276,6 @@ typedef struct compat_siginfo { | |||
| 276 | } _sifields; | 276 | } _sifields; |
| 277 | } compat_siginfo_t; | 277 | } compat_siginfo_t; |
| 278 | 278 | ||
| 279 | struct old_linux32_dirent { | ||
| 280 | u32 d_ino; | ||
| 281 | u32 d_offset; | ||
| 282 | u16 d_namlen; | ||
| 283 | char d_name[1]; | ||
| 284 | }; | ||
| 285 | |||
| 286 | /* | 279 | /* |
| 287 | * IA-32 ELF specific definitions for IA-64. | 280 | * IA-32 ELF specific definitions for IA-64. |
| 288 | */ | 281 | */ |
diff --git a/arch/ia64/ia32/sys_ia32.c b/arch/ia64/ia32/sys_ia32.c index 465116aecb85..bf196cbb3796 100644 --- a/arch/ia64/ia32/sys_ia32.c +++ b/arch/ia64/ia32/sys_ia32.c | |||
| @@ -1210,138 +1210,6 @@ sys32_settimeofday (struct compat_timeval __user *tv, struct timezone __user *tz | |||
| 1210 | return do_sys_settimeofday(tv ? &kts : NULL, tz ? &ktz : NULL); | 1210 | return do_sys_settimeofday(tv ? &kts : NULL, tz ? &ktz : NULL); |
| 1211 | } | 1211 | } |
| 1212 | 1212 | ||
| 1213 | struct getdents32_callback { | ||
| 1214 | struct compat_dirent __user *current_dir; | ||
| 1215 | struct compat_dirent __user *previous; | ||
| 1216 | int count; | ||
| 1217 | int error; | ||
| 1218 | }; | ||
| 1219 | |||
| 1220 | struct readdir32_callback { | ||
| 1221 | struct old_linux32_dirent __user * dirent; | ||
| 1222 | int count; | ||
| 1223 | }; | ||
| 1224 | |||
| 1225 | static int | ||
| 1226 | filldir32 (void *__buf, const char *name, int namlen, loff_t offset, u64 ino, | ||
| 1227 | unsigned int d_type) | ||
| 1228 | { | ||
| 1229 | struct compat_dirent __user * dirent; | ||
| 1230 | struct getdents32_callback * buf = (struct getdents32_callback *) __buf; | ||
| 1231 | int reclen = ROUND_UP(offsetof(struct compat_dirent, d_name) + namlen + 1, 4); | ||
| 1232 | u32 d_ino; | ||
| 1233 | |||
| 1234 | buf->error = -EINVAL; /* only used if we fail.. */ | ||
| 1235 | if (reclen > buf->count) | ||
| 1236 | return -EINVAL; | ||
| 1237 | d_ino = ino; | ||
| 1238 | if (sizeof(d_ino) < sizeof(ino) && d_ino != ino) | ||
| 1239 | return -EOVERFLOW; | ||
| 1240 | buf->error = -EFAULT; /* only used if we fail.. */ | ||
| 1241 | dirent = buf->previous; | ||
| 1242 | if (dirent) | ||
| 1243 | if (put_user(offset, &dirent->d_off)) | ||
| 1244 | return -EFAULT; | ||
| 1245 | dirent = buf->current_dir; | ||
| 1246 | buf->previous = dirent; | ||
| 1247 | if (put_user(d_ino, &dirent->d_ino) | ||
| 1248 | || put_user(reclen, &dirent->d_reclen) | ||
| 1249 | || copy_to_user(dirent->d_name, name, namlen) | ||
| 1250 | || put_user(0, dirent->d_name + namlen)) | ||
| 1251 | return -EFAULT; | ||
| 1252 | dirent = (struct compat_dirent __user *) ((char __user *) dirent + reclen); | ||
| 1253 | buf->current_dir = dirent; | ||
| 1254 | buf->count -= reclen; | ||
| 1255 | return 0; | ||
| 1256 | } | ||
| 1257 | |||
| 1258 | asmlinkage long | ||
| 1259 | sys32_getdents (unsigned int fd, struct compat_dirent __user *dirent, unsigned int count) | ||
| 1260 | { | ||
| 1261 | struct file * file; | ||
| 1262 | struct compat_dirent __user * lastdirent; | ||
| 1263 | struct getdents32_callback buf; | ||
| 1264 | int error; | ||
| 1265 | |||
| 1266 | error = -EFAULT; | ||
| 1267 | if (!access_ok(VERIFY_WRITE, dirent, count)) | ||
| 1268 | goto out; | ||
| 1269 | |||
| 1270 | error = -EBADF; | ||
| 1271 | file = fget(fd); | ||
| 1272 | if (!file) | ||
| 1273 | goto out; | ||
| 1274 | |||
| 1275 | buf.current_dir = dirent; | ||
| 1276 | buf.previous = NULL; | ||
| 1277 | buf.count = count; | ||
| 1278 | buf.error = 0; | ||
| 1279 | |||
| 1280 | error = vfs_readdir(file, filldir32, &buf); | ||
| 1281 | if (error < 0) | ||
| 1282 | goto out_putf; | ||
| 1283 | error = buf.error; | ||
| 1284 | lastdirent = buf.previous; | ||
| 1285 | if (lastdirent) { | ||
| 1286 | if (put_user(file->f_pos, &lastdirent->d_off)) | ||
| 1287 | error = -EFAULT; | ||
| 1288 | else | ||
| 1289 | error = count - buf.count; | ||
| 1290 | } | ||
| 1291 | |||
| 1292 | out_putf: | ||
| 1293 | fput(file); | ||
| 1294 | out: | ||
| 1295 | return error; | ||
| 1296 | } | ||
| 1297 | |||
| 1298 | static int | ||
| 1299 | fillonedir32 (void * __buf, const char * name, int namlen, loff_t offset, u64 ino, | ||
| 1300 | unsigned int d_type) | ||
| 1301 | { | ||
| 1302 | struct readdir32_callback * buf = (struct readdir32_callback *) __buf; | ||
| 1303 | struct old_linux32_dirent __user * dirent; | ||
| 1304 | u32 d_ino; | ||
| 1305 | |||
| 1306 | if (buf->count) | ||
| 1307 | return -EINVAL; | ||
| 1308 | d_ino = ino; | ||
| 1309 | if (sizeof(d_ino) < sizeof(ino) && d_ino != ino) | ||
| 1310 | return -EOVERFLOW; | ||
| 1311 | buf->count++; | ||
| 1312 | dirent = buf->dirent; | ||
| 1313 | if (put_user(d_ino, &dirent->d_ino) | ||
| 1314 | || put_user(offset, &dirent->d_offset) | ||
| 1315 | || put_user(namlen, &dirent->d_namlen) | ||
| 1316 | || copy_to_user(dirent->d_name, name, namlen) | ||
| 1317 | || put_user(0, dirent->d_name + namlen)) | ||
| 1318 | return -EFAULT; | ||
| 1319 | return 0; | ||
| 1320 | } | ||
| 1321 | |||
| 1322 | asmlinkage long | ||
| 1323 | sys32_readdir (unsigned int fd, void __user *dirent, unsigned int count) | ||
| 1324 | { | ||
| 1325 | int error; | ||
| 1326 | struct file * file; | ||
| 1327 | struct readdir32_callback buf; | ||
| 1328 | |||
| 1329 | error = -EBADF; | ||
| 1330 | file = fget(fd); | ||
| 1331 | if (!file) | ||
| 1332 | goto out; | ||
| 1333 | |||
| 1334 | buf.count = 0; | ||
| 1335 | buf.dirent = dirent; | ||
| 1336 | |||
| 1337 | error = vfs_readdir(file, fillonedir32, &buf); | ||
| 1338 | if (error >= 0) | ||
| 1339 | error = buf.count; | ||
| 1340 | fput(file); | ||
| 1341 | out: | ||
| 1342 | return error; | ||
| 1343 | } | ||
| 1344 | |||
| 1345 | struct sel_arg_struct { | 1213 | struct sel_arg_struct { |
| 1346 | unsigned int n; | 1214 | unsigned int n; |
| 1347 | unsigned int inp; | 1215 | unsigned int inp; |
diff --git a/arch/ia64/include/asm/io.h b/arch/ia64/include/asm/io.h index 260a85ac9d6a..7f257507cd86 100644 --- a/arch/ia64/include/asm/io.h +++ b/arch/ia64/include/asm/io.h | |||
| @@ -19,6 +19,8 @@ | |||
| 19 | * Copyright (C) 1999 Don Dugger <don.dugger@intel.com> | 19 | * Copyright (C) 1999 Don Dugger <don.dugger@intel.com> |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <asm/unaligned.h> | ||
| 23 | |||
| 22 | /* We don't use IO slowdowns on the ia64, but.. */ | 24 | /* We don't use IO slowdowns on the ia64, but.. */ |
| 23 | #define __SLOW_DOWN_IO do { } while (0) | 25 | #define __SLOW_DOWN_IO do { } while (0) |
| 24 | #define SLOW_DOWN_IO do { } while (0) | 26 | #define SLOW_DOWN_IO do { } while (0) |
| @@ -241,7 +243,7 @@ __insw (unsigned long port, void *dst, unsigned long count) | |||
| 241 | unsigned short *dp = dst; | 243 | unsigned short *dp = dst; |
| 242 | 244 | ||
| 243 | while (count--) | 245 | while (count--) |
| 244 | *dp++ = platform_inw(port); | 246 | put_unaligned(platform_inw(port), dp++); |
| 245 | } | 247 | } |
| 246 | 248 | ||
| 247 | static inline void | 249 | static inline void |
| @@ -250,7 +252,7 @@ __insl (unsigned long port, void *dst, unsigned long count) | |||
| 250 | unsigned int *dp = dst; | 252 | unsigned int *dp = dst; |
| 251 | 253 | ||
| 252 | while (count--) | 254 | while (count--) |
| 253 | *dp++ = platform_inl(port); | 255 | put_unaligned(platform_inl(port), dp++); |
| 254 | } | 256 | } |
| 255 | 257 | ||
| 256 | static inline void | 258 | static inline void |
| @@ -268,7 +270,7 @@ __outsw (unsigned long port, const void *src, unsigned long count) | |||
| 268 | const unsigned short *sp = src; | 270 | const unsigned short *sp = src; |
| 269 | 271 | ||
| 270 | while (count--) | 272 | while (count--) |
| 271 | platform_outw(*sp++, port); | 273 | platform_outw(get_unaligned(sp++), port); |
| 272 | } | 274 | } |
| 273 | 275 | ||
| 274 | static inline void | 276 | static inline void |
| @@ -277,7 +279,7 @@ __outsl (unsigned long port, const void *src, unsigned long count) | |||
| 277 | const unsigned int *sp = src; | 279 | const unsigned int *sp = src; |
| 278 | 280 | ||
| 279 | while (count--) | 281 | while (count--) |
| 280 | platform_outl(*sp++, port); | 282 | platform_outl(get_unaligned(sp++), port); |
| 281 | } | 283 | } |
| 282 | 284 | ||
| 283 | /* | 285 | /* |
diff --git a/arch/ia64/include/asm/kexec.h b/arch/ia64/include/asm/kexec.h index 541be835fc5a..e1d58f819d78 100644 --- a/arch/ia64/include/asm/kexec.h +++ b/arch/ia64/include/asm/kexec.h | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | /* Maximum address we can use for the control code buffer */ | 9 | /* Maximum address we can use for the control code buffer */ |
| 10 | #define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE | 10 | #define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE |
| 11 | 11 | ||
| 12 | #define KEXEC_CONTROL_CODE_SIZE (8192 + 8192 + 4096) | 12 | #define KEXEC_CONTROL_PAGE_SIZE (8192 + 8192 + 4096) |
| 13 | 13 | ||
| 14 | /* The native architecture */ | 14 | /* The native architecture */ |
| 15 | #define KEXEC_ARCH KEXEC_ARCH_IA_64 | 15 | #define KEXEC_ARCH KEXEC_ARCH_IA_64 |
diff --git a/arch/ia64/include/asm/sal.h b/arch/ia64/include/asm/sal.h index 89594b442f83..ea310c0812aa 100644 --- a/arch/ia64/include/asm/sal.h +++ b/arch/ia64/include/asm/sal.h | |||
| @@ -236,7 +236,7 @@ extern struct ia64_sal_desc_ptc *ia64_ptc_domain_info; | |||
| 236 | 236 | ||
| 237 | extern unsigned short sal_revision; /* supported SAL spec revision */ | 237 | extern unsigned short sal_revision; /* supported SAL spec revision */ |
| 238 | extern unsigned short sal_version; /* SAL version; OEM dependent */ | 238 | extern unsigned short sal_version; /* SAL version; OEM dependent */ |
| 239 | #define SAL_VERSION_CODE(major, minor) ((BIN2BCD(major) << 8) | BIN2BCD(minor)) | 239 | #define SAL_VERSION_CODE(major, minor) ((bin2bcd(major) << 8) | bin2bcd(minor)) |
| 240 | 240 | ||
| 241 | extern const char *ia64_sal_strerror (long status); | 241 | extern const char *ia64_sal_strerror (long status); |
| 242 | extern void ia64_sal_init (struct ia64_sal_systab *sal_systab); | 242 | extern void ia64_sal_init (struct ia64_sal_systab *sal_systab); |
diff --git a/arch/ia64/kernel/head.S b/arch/ia64/kernel/head.S index 41c712917ff7..8bdea8eb62e3 100644 --- a/arch/ia64/kernel/head.S +++ b/arch/ia64/kernel/head.S | |||
| @@ -359,7 +359,31 @@ start_ap: | |||
| 359 | mov ar.rsc=0 // place RSE in enforced lazy mode | 359 | mov ar.rsc=0 // place RSE in enforced lazy mode |
| 360 | ;; | 360 | ;; |
| 361 | loadrs // clear the dirty partition | 361 | loadrs // clear the dirty partition |
| 362 | mov IA64_KR(PER_CPU_DATA)=r0 // clear physical per-CPU base | 362 | movl r19=__phys_per_cpu_start |
| 363 | mov r18=PERCPU_PAGE_SIZE | ||
| 364 | ;; | ||
| 365 | #ifndef CONFIG_SMP | ||
| 366 | add r19=r19,r18 | ||
| 367 | ;; | ||
| 368 | #else | ||
| 369 | (isAP) br.few 2f | ||
| 370 | mov r20=r19 | ||
| 371 | sub r19=r19,r18 | ||
| 372 | ;; | ||
| 373 | shr.u r18=r18,3 | ||
| 374 | 1: | ||
| 375 | ld8 r21=[r20],8;; | ||
| 376 | st8[r19]=r21,8 | ||
| 377 | adds r18=-1,r18;; | ||
| 378 | cmp4.lt p7,p6=0,r18 | ||
| 379 | (p7) br.cond.dptk.few 1b | ||
| 380 | 2: | ||
| 381 | #endif | ||
| 382 | tpa r19=r19 | ||
| 383 | ;; | ||
| 384 | .pred.rel.mutex isBP,isAP | ||
| 385 | (isBP) mov IA64_KR(PER_CPU_DATA)=r19 // per-CPU base for cpu0 | ||
| 386 | (isAP) mov IA64_KR(PER_CPU_DATA)=r0 // clear physical per-CPU base | ||
| 363 | ;; | 387 | ;; |
| 364 | mov ar.bspstore=r2 // establish the new RSE stack | 388 | mov ar.bspstore=r2 // establish the new RSE stack |
| 365 | ;; | 389 | ;; |
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c index 593279f33e96..c27d5b2c182b 100644 --- a/arch/ia64/kernel/setup.c +++ b/arch/ia64/kernel/setup.c | |||
| @@ -927,17 +927,19 @@ cpu_init (void) | |||
| 927 | if (smp_processor_id() == 0) { | 927 | if (smp_processor_id() == 0) { |
| 928 | cpu_set(0, per_cpu(cpu_sibling_map, 0)); | 928 | cpu_set(0, per_cpu(cpu_sibling_map, 0)); |
| 929 | cpu_set(0, cpu_core_map[0]); | 929 | cpu_set(0, cpu_core_map[0]); |
| 930 | } else { | ||
| 931 | /* | ||
| 932 | * Set ar.k3 so that assembly code in MCA handler can compute | ||
| 933 | * physical addresses of per cpu variables with a simple: | ||
| 934 | * phys = ar.k3 + &per_cpu_var | ||
| 935 | * and the alt-dtlb-miss handler can set per-cpu mapping into | ||
| 936 | * the TLB when needed. head.S already did this for cpu0. | ||
| 937 | */ | ||
| 938 | ia64_set_kr(IA64_KR_PER_CPU_DATA, | ||
| 939 | ia64_tpa(cpu_data) - (long) __per_cpu_start); | ||
| 930 | } | 940 | } |
| 931 | #endif | 941 | #endif |
| 932 | 942 | ||
| 933 | /* | ||
| 934 | * We set ar.k3 so that assembly code in MCA handler can compute | ||
| 935 | * physical addresses of per cpu variables with a simple: | ||
| 936 | * phys = ar.k3 + &per_cpu_var | ||
| 937 | */ | ||
| 938 | ia64_set_kr(IA64_KR_PER_CPU_DATA, | ||
| 939 | ia64_tpa(cpu_data) - (long) __per_cpu_start); | ||
| 940 | |||
| 941 | get_max_cacheline_size(); | 943 | get_max_cacheline_size(); |
| 942 | 944 | ||
| 943 | /* | 945 | /* |
diff --git a/arch/ia64/kernel/smp.c b/arch/ia64/kernel/smp.c index 3676468612b6..da8f020d82c1 100644 --- a/arch/ia64/kernel/smp.c +++ b/arch/ia64/kernel/smp.c | |||
| @@ -58,7 +58,7 @@ static struct local_tlb_flush_counts { | |||
| 58 | unsigned int count; | 58 | unsigned int count; |
| 59 | } __attribute__((__aligned__(32))) local_tlb_flush_counts[NR_CPUS]; | 59 | } __attribute__((__aligned__(32))) local_tlb_flush_counts[NR_CPUS]; |
| 60 | 60 | ||
| 61 | static DEFINE_PER_CPU(unsigned int, shadow_flush_counts[NR_CPUS]) ____cacheline_aligned; | 61 | static DEFINE_PER_CPU(unsigned short, shadow_flush_counts[NR_CPUS]) ____cacheline_aligned; |
| 62 | 62 | ||
| 63 | #define IPI_CALL_FUNC 0 | 63 | #define IPI_CALL_FUNC 0 |
| 64 | #define IPI_CPU_STOP 1 | 64 | #define IPI_CPU_STOP 1 |
| @@ -254,7 +254,7 @@ smp_local_flush_tlb(void) | |||
| 254 | void | 254 | void |
| 255 | smp_flush_tlb_cpumask(cpumask_t xcpumask) | 255 | smp_flush_tlb_cpumask(cpumask_t xcpumask) |
| 256 | { | 256 | { |
| 257 | unsigned int *counts = __ia64_per_cpu_var(shadow_flush_counts); | 257 | unsigned short *counts = __ia64_per_cpu_var(shadow_flush_counts); |
| 258 | cpumask_t cpumask = xcpumask; | 258 | cpumask_t cpumask = xcpumask; |
| 259 | int mycpu, cpu, flush_mycpu = 0; | 259 | int mycpu, cpu, flush_mycpu = 0; |
| 260 | 260 | ||
| @@ -262,7 +262,7 @@ smp_flush_tlb_cpumask(cpumask_t xcpumask) | |||
| 262 | mycpu = smp_processor_id(); | 262 | mycpu = smp_processor_id(); |
| 263 | 263 | ||
| 264 | for_each_cpu_mask(cpu, cpumask) | 264 | for_each_cpu_mask(cpu, cpumask) |
| 265 | counts[cpu] = local_tlb_flush_counts[cpu].count; | 265 | counts[cpu] = local_tlb_flush_counts[cpu].count & 0xffff; |
| 266 | 266 | ||
| 267 | mb(); | 267 | mb(); |
| 268 | for_each_cpu_mask(cpu, cpumask) { | 268 | for_each_cpu_mask(cpu, cpumask) { |
| @@ -276,7 +276,7 @@ smp_flush_tlb_cpumask(cpumask_t xcpumask) | |||
| 276 | smp_local_flush_tlb(); | 276 | smp_local_flush_tlb(); |
| 277 | 277 | ||
| 278 | for_each_cpu_mask(cpu, cpumask) | 278 | for_each_cpu_mask(cpu, cpumask) |
| 279 | while(counts[cpu] == local_tlb_flush_counts[cpu].count) | 279 | while(counts[cpu] == (local_tlb_flush_counts[cpu].count & 0xffff)) |
| 280 | udelay(FLUSH_DELAY); | 280 | udelay(FLUSH_DELAY); |
| 281 | 281 | ||
| 282 | preempt_enable(); | 282 | preempt_enable(); |
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c index 03f1a9908afc..bcea81e432fd 100644 --- a/arch/ia64/kernel/smpboot.c +++ b/arch/ia64/kernel/smpboot.c | |||
| @@ -138,6 +138,7 @@ cpumask_t cpu_possible_map = CPU_MASK_NONE; | |||
| 138 | EXPORT_SYMBOL(cpu_possible_map); | 138 | EXPORT_SYMBOL(cpu_possible_map); |
| 139 | 139 | ||
| 140 | cpumask_t cpu_core_map[NR_CPUS] __cacheline_aligned; | 140 | cpumask_t cpu_core_map[NR_CPUS] __cacheline_aligned; |
| 141 | EXPORT_SYMBOL(cpu_core_map); | ||
| 141 | DEFINE_PER_CPU_SHARED_ALIGNED(cpumask_t, cpu_sibling_map); | 142 | DEFINE_PER_CPU_SHARED_ALIGNED(cpumask_t, cpu_sibling_map); |
| 142 | EXPORT_PER_CPU_SYMBOL(cpu_sibling_map); | 143 | EXPORT_PER_CPU_SYMBOL(cpu_sibling_map); |
| 143 | 144 | ||
| @@ -467,7 +468,9 @@ start_secondary (void *unused) | |||
| 467 | { | 468 | { |
| 468 | /* Early console may use I/O ports */ | 469 | /* Early console may use I/O ports */ |
| 469 | ia64_set_kr(IA64_KR_IO_BASE, __pa(ia64_iobase)); | 470 | ia64_set_kr(IA64_KR_IO_BASE, __pa(ia64_iobase)); |
| 471 | #ifndef CONFIG_PRINTK_TIME | ||
| 470 | Dprintk("start_secondary: starting CPU 0x%x\n", hard_smp_processor_id()); | 472 | Dprintk("start_secondary: starting CPU 0x%x\n", hard_smp_processor_id()); |
| 473 | #endif | ||
| 471 | efi_map_pal_code(); | 474 | efi_map_pal_code(); |
| 472 | cpu_init(); | 475 | cpu_init(); |
| 473 | preempt_disable(); | 476 | preempt_disable(); |
diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S index 5a77206c2492..de71da811cd6 100644 --- a/arch/ia64/kernel/vmlinux.lds.S +++ b/arch/ia64/kernel/vmlinux.lds.S | |||
| @@ -215,6 +215,9 @@ SECTIONS | |||
| 215 | /* Per-cpu data: */ | 215 | /* Per-cpu data: */ |
| 216 | percpu : { } :percpu | 216 | percpu : { } :percpu |
| 217 | . = ALIGN(PERCPU_PAGE_SIZE); | 217 | . = ALIGN(PERCPU_PAGE_SIZE); |
| 218 | #ifdef CONFIG_SMP | ||
| 219 | . = . + PERCPU_PAGE_SIZE; /* cpu0 per-cpu space */ | ||
| 220 | #endif | ||
| 218 | __phys_per_cpu_start = .; | 221 | __phys_per_cpu_start = .; |
| 219 | .data.percpu PERCPU_ADDR : AT(__phys_per_cpu_start - LOAD_OFFSET) | 222 | .data.percpu PERCPU_ADDR : AT(__phys_per_cpu_start - LOAD_OFFSET) |
| 220 | { | 223 | { |
diff --git a/arch/ia64/mm/contig.c b/arch/ia64/mm/contig.c index 798bf9835a51..e566ff43884a 100644 --- a/arch/ia64/mm/contig.c +++ b/arch/ia64/mm/contig.c | |||
| @@ -163,8 +163,14 @@ per_cpu_init (void) | |||
| 163 | * get_zeroed_page(). | 163 | * get_zeroed_page(). |
| 164 | */ | 164 | */ |
| 165 | if (first_time) { | 165 | if (first_time) { |
| 166 | void *cpu0_data = __phys_per_cpu_start - PERCPU_PAGE_SIZE; | ||
| 167 | |||
| 166 | first_time=0; | 168 | first_time=0; |
| 167 | for (cpu = 0; cpu < NR_CPUS; cpu++) { | 169 | |
| 170 | __per_cpu_offset[0] = (char *) cpu0_data - __per_cpu_start; | ||
| 171 | per_cpu(local_per_cpu_offset, 0) = __per_cpu_offset[0]; | ||
| 172 | |||
| 173 | for (cpu = 1; cpu < NR_CPUS; cpu++) { | ||
| 168 | memcpy(cpu_data, __phys_per_cpu_start, __per_cpu_end - __per_cpu_start); | 174 | memcpy(cpu_data, __phys_per_cpu_start, __per_cpu_end - __per_cpu_start); |
| 169 | __per_cpu_offset[cpu] = (char *) cpu_data - __per_cpu_start; | 175 | __per_cpu_offset[cpu] = (char *) cpu_data - __per_cpu_start; |
| 170 | cpu_data += PERCPU_PAGE_SIZE; | 176 | cpu_data += PERCPU_PAGE_SIZE; |
| @@ -177,7 +183,7 @@ per_cpu_init (void) | |||
| 177 | static inline void | 183 | static inline void |
| 178 | alloc_per_cpu_data(void) | 184 | alloc_per_cpu_data(void) |
| 179 | { | 185 | { |
| 180 | cpu_data = __alloc_bootmem(PERCPU_PAGE_SIZE * NR_CPUS, | 186 | cpu_data = __alloc_bootmem(PERCPU_PAGE_SIZE * NR_CPUS-1, |
| 181 | PERCPU_PAGE_SIZE, __pa(MAX_DMA_ADDRESS)); | 187 | PERCPU_PAGE_SIZE, __pa(MAX_DMA_ADDRESS)); |
| 182 | } | 188 | } |
| 183 | #else | 189 | #else |
diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c index d83125e1ed27..78026aabaa7f 100644 --- a/arch/ia64/mm/discontig.c +++ b/arch/ia64/mm/discontig.c | |||
| @@ -143,7 +143,11 @@ static void *per_cpu_node_setup(void *cpu_data, int node) | |||
| 143 | int cpu; | 143 | int cpu; |
| 144 | 144 | ||
| 145 | for_each_possible_early_cpu(cpu) { | 145 | for_each_possible_early_cpu(cpu) { |
| 146 | if (node == node_cpuid[cpu].nid) { | 146 | if (cpu == 0) { |
| 147 | void *cpu0_data = __phys_per_cpu_start - PERCPU_PAGE_SIZE; | ||
| 148 | __per_cpu_offset[cpu] = (char*)cpu0_data - | ||
| 149 | __per_cpu_start; | ||
| 150 | } else if (node == node_cpuid[cpu].nid) { | ||
| 147 | memcpy(__va(cpu_data), __phys_per_cpu_start, | 151 | memcpy(__va(cpu_data), __phys_per_cpu_start, |
| 148 | __per_cpu_end - __per_cpu_start); | 152 | __per_cpu_end - __per_cpu_start); |
| 149 | __per_cpu_offset[cpu] = (char*)__va(cpu_data) - | 153 | __per_cpu_offset[cpu] = (char*)__va(cpu_data) - |
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c index 77b15f80f101..7545037a8625 100644 --- a/arch/ia64/pci/pci.c +++ b/arch/ia64/pci/pci.c | |||
| @@ -324,7 +324,6 @@ pcibios_setup_root_windows(struct pci_bus *bus, struct pci_controller *ctrl) | |||
| 324 | struct pci_bus * __devinit | 324 | struct pci_bus * __devinit |
| 325 | pci_acpi_scan_root(struct acpi_device *device, int domain, int bus) | 325 | pci_acpi_scan_root(struct acpi_device *device, int domain, int bus) |
| 326 | { | 326 | { |
| 327 | struct pci_root_info info; | ||
| 328 | struct pci_controller *controller; | 327 | struct pci_controller *controller; |
| 329 | unsigned int windows = 0; | 328 | unsigned int windows = 0; |
| 330 | struct pci_bus *pbus; | 329 | struct pci_bus *pbus; |
| @@ -346,22 +345,24 @@ pci_acpi_scan_root(struct acpi_device *device, int domain, int bus) | |||
| 346 | acpi_walk_resources(device->handle, METHOD_NAME__CRS, count_window, | 345 | acpi_walk_resources(device->handle, METHOD_NAME__CRS, count_window, |
| 347 | &windows); | 346 | &windows); |
| 348 | if (windows) { | 347 | if (windows) { |
| 348 | struct pci_root_info info; | ||
| 349 | |||
| 349 | controller->window = | 350 | controller->window = |
| 350 | kmalloc_node(sizeof(*controller->window) * windows, | 351 | kmalloc_node(sizeof(*controller->window) * windows, |
| 351 | GFP_KERNEL, controller->node); | 352 | GFP_KERNEL, controller->node); |
| 352 | if (!controller->window) | 353 | if (!controller->window) |
| 353 | goto out2; | 354 | goto out2; |
| 354 | } | ||
| 355 | 355 | ||
| 356 | name = kmalloc(16, GFP_KERNEL); | 356 | name = kmalloc(16, GFP_KERNEL); |
| 357 | if (!name) | 357 | if (!name) |
| 358 | goto out3; | 358 | goto out3; |
| 359 | 359 | ||
| 360 | sprintf(name, "PCI Bus %04x:%02x", domain, bus); | 360 | sprintf(name, "PCI Bus %04x:%02x", domain, bus); |
| 361 | info.controller = controller; | 361 | info.controller = controller; |
| 362 | info.name = name; | 362 | info.name = name; |
| 363 | acpi_walk_resources(device->handle, METHOD_NAME__CRS, add_window, | 363 | acpi_walk_resources(device->handle, METHOD_NAME__CRS, |
| 364 | &info); | 364 | add_window, &info); |
| 365 | } | ||
| 365 | /* | 366 | /* |
| 366 | * See arch/x86/pci/acpi.c. | 367 | * See arch/x86/pci/acpi.c. |
| 367 | * The desired pci bus might already be scanned in a quirk. We | 368 | * The desired pci bus might already be scanned in a quirk. We |
diff --git a/arch/m68k/atari/atakeyb.c b/arch/m68k/atari/atakeyb.c index 8a2a53b33616..bb959fbab2dc 100644 --- a/arch/m68k/atari/atakeyb.c +++ b/arch/m68k/atari/atakeyb.c | |||
| @@ -580,13 +580,15 @@ int atari_keyb_init(void) | |||
| 580 | do { | 580 | do { |
| 581 | /* reset IKBD ACIA */ | 581 | /* reset IKBD ACIA */ |
| 582 | acia.key_ctrl = ACIA_RESET | | 582 | acia.key_ctrl = ACIA_RESET | |
| 583 | (atari_switches & ATARI_SWITCH_IKBD) ? ACIA_RHTID : 0; | 583 | ((atari_switches & ATARI_SWITCH_IKBD) ? |
| 584 | ACIA_RHTID : 0); | ||
| 584 | (void)acia.key_ctrl; | 585 | (void)acia.key_ctrl; |
| 585 | (void)acia.key_data; | 586 | (void)acia.key_data; |
| 586 | 587 | ||
| 587 | /* reset MIDI ACIA */ | 588 | /* reset MIDI ACIA */ |
| 588 | acia.mid_ctrl = ACIA_RESET | | 589 | acia.mid_ctrl = ACIA_RESET | |
| 589 | (atari_switches & ATARI_SWITCH_MIDI) ? ACIA_RHTID : 0; | 590 | ((atari_switches & ATARI_SWITCH_MIDI) ? |
| 591 | ACIA_RHTID : 0); | ||
| 590 | (void)acia.mid_ctrl; | 592 | (void)acia.mid_ctrl; |
| 591 | (void)acia.mid_data; | 593 | (void)acia.mid_data; |
| 592 | 594 | ||
| @@ -599,7 +601,8 @@ int atari_keyb_init(void) | |||
| 599 | ACIA_RHTID : ACIA_RLTID); | 601 | ACIA_RHTID : ACIA_RLTID); |
| 600 | 602 | ||
| 601 | acia.mid_ctrl = ACIA_DIV16 | ACIA_D8N1S | | 603 | acia.mid_ctrl = ACIA_DIV16 | ACIA_D8N1S | |
| 602 | (atari_switches & ATARI_SWITCH_MIDI) ? ACIA_RHTID : 0; | 604 | ((atari_switches & ATARI_SWITCH_MIDI) ? |
| 605 | ACIA_RHTID : 0); | ||
| 603 | 606 | ||
| 604 | /* make sure the interrupt line is up */ | 607 | /* make sure the interrupt line is up */ |
| 605 | } while ((mfp.par_dt_reg & 0x10) == 0); | 608 | } while ((mfp.par_dt_reg & 0x10) == 0); |
diff --git a/arch/mips/emma2rh/markeins/setup.c b/arch/mips/emma2rh/markeins/setup.c index 822a20e21fa4..b6a23ad539f8 100644 --- a/arch/mips/emma2rh/markeins/setup.c +++ b/arch/mips/emma2rh/markeins/setup.c | |||
| @@ -25,23 +25,9 @@ | |||
| 25 | #include <linux/init.h> | 25 | #include <linux/init.h> |
| 26 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
| 27 | #include <linux/types.h> | 27 | #include <linux/types.h> |
| 28 | #include <linux/initrd.h> | 28 | |
| 29 | #include <linux/irq.h> | ||
| 30 | #include <linux/ioport.h> | ||
| 31 | #include <linux/param.h> /* for HZ */ | ||
| 32 | #include <linux/root_dev.h> | ||
| 33 | #include <linux/serial.h> | ||
| 34 | #include <linux/serial_core.h> | ||
| 35 | |||
| 36 | #include <asm/cpu.h> | ||
| 37 | #include <asm/bootinfo.h> | ||
| 38 | #include <asm/addrspace.h> | ||
| 39 | #include <asm/time.h> | 29 | #include <asm/time.h> |
| 40 | #include <asm/bcache.h> | ||
| 41 | #include <asm/irq.h> | ||
| 42 | #include <asm/reboot.h> | 30 | #include <asm/reboot.h> |
| 43 | #include <asm/traps.h> | ||
| 44 | #include <asm/debug.h> | ||
| 45 | 31 | ||
| 46 | #include <asm/emma2rh/emma2rh.h> | 32 | #include <asm/emma2rh/emma2rh.h> |
| 47 | 33 | ||
diff --git a/arch/mips/jazz/setup.c b/arch/mips/jazz/setup.c index b59ba6b93cdd..7043f6b9ff3c 100644 --- a/arch/mips/jazz/setup.c +++ b/arch/mips/jazz/setup.c | |||
| @@ -5,33 +5,22 @@ | |||
| 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) 1996, 1997, 1998, 2001, 07 by Ralf Baechle | 8 | * Copyright (C) 1996, 1997, 1998, 2001, 07, 08 by Ralf Baechle |
| 9 | * Copyright (C) 2001 MIPS Technologies, Inc. | 9 | * Copyright (C) 2001 MIPS Technologies, Inc. |
| 10 | * Copyright (C) 2007 by Thomas Bogendoerfer | 10 | * Copyright (C) 2007 by Thomas Bogendoerfer |
| 11 | */ | 11 | */ |
| 12 | #include <linux/eisa.h> | 12 | #include <linux/eisa.h> |
| 13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 14 | #include <linux/ioport.h> | 14 | #include <linux/ioport.h> |
| 15 | #include <linux/sched.h> | ||
| 16 | #include <linux/interrupt.h> | ||
| 17 | #include <linux/mm.h> | ||
| 18 | #include <linux/console.h> | 15 | #include <linux/console.h> |
| 19 | #include <linux/fb.h> | ||
| 20 | #include <linux/pm.h> | ||
| 21 | #include <linux/screen_info.h> | 16 | #include <linux/screen_info.h> |
| 22 | #include <linux/platform_device.h> | 17 | #include <linux/platform_device.h> |
| 23 | #include <linux/serial_8250.h> | 18 | #include <linux/serial_8250.h> |
| 24 | 19 | ||
| 25 | #include <asm/bootinfo.h> | ||
| 26 | #include <asm/irq.h> | ||
| 27 | #include <asm/jazz.h> | 20 | #include <asm/jazz.h> |
| 28 | #include <asm/jazzdma.h> | 21 | #include <asm/jazzdma.h> |
| 29 | #include <asm/reboot.h> | 22 | #include <asm/reboot.h> |
| 30 | #include <asm/io.h> | ||
| 31 | #include <asm/pgtable.h> | 23 | #include <asm/pgtable.h> |
| 32 | #include <asm/time.h> | ||
| 33 | #include <asm/traps.h> | ||
| 34 | #include <asm/mc146818-time.h> | ||
| 35 | 24 | ||
| 36 | extern asmlinkage void jazz_handle_int(void); | 25 | extern asmlinkage void jazz_handle_int(void); |
| 37 | 26 | ||
diff --git a/arch/mips/kernel/.gitignore b/arch/mips/kernel/.gitignore new file mode 100644 index 000000000000..c5f676c3c224 --- /dev/null +++ b/arch/mips/kernel/.gitignore | |||
| @@ -0,0 +1 @@ | |||
| vmlinux.lds | |||
diff --git a/arch/mips/kernel/kgdb.c b/arch/mips/kernel/kgdb.c index c5a8b2d21ca4..8f6d58ede33c 100644 --- a/arch/mips/kernel/kgdb.c +++ b/arch/mips/kernel/kgdb.c | |||
| @@ -62,13 +62,13 @@ void arch_kgdb_breakpoint(void) | |||
| 62 | 62 | ||
| 63 | static void kgdb_call_nmi_hook(void *ignored) | 63 | static void kgdb_call_nmi_hook(void *ignored) |
| 64 | { | 64 | { |
| 65 | kgdb_nmicallback(raw_smp_processor_id(), (void *)0); | 65 | kgdb_nmicallback(raw_smp_processor_id(), NULL); |
| 66 | } | 66 | } |
| 67 | 67 | ||
| 68 | void kgdb_roundup_cpus(unsigned long flags) | 68 | void kgdb_roundup_cpus(unsigned long flags) |
| 69 | { | 69 | { |
| 70 | local_irq_enable(); | 70 | local_irq_enable(); |
| 71 | smp_call_function(kgdb_call_nmi_hook, NULL, NULL); | 71 | smp_call_function(kgdb_call_nmi_hook, NULL, 0); |
| 72 | local_irq_disable(); | 72 | local_irq_disable(); |
| 73 | } | 73 | } |
| 74 | 74 | ||
| @@ -190,9 +190,6 @@ static int kgdb_mips_notify(struct notifier_block *self, unsigned long cmd, | |||
| 190 | struct pt_regs *regs = args->regs; | 190 | struct pt_regs *regs = args->regs; |
| 191 | int trap = (regs->cp0_cause & 0x7c) >> 2; | 191 | int trap = (regs->cp0_cause & 0x7c) >> 2; |
| 192 | 192 | ||
| 193 | if (fixup_exception(regs)) | ||
| 194 | return NOTIFY_DONE; | ||
| 195 | |||
| 196 | /* Userpace events, ignore. */ | 193 | /* Userpace events, ignore. */ |
| 197 | if (user_mode(regs)) | 194 | if (user_mode(regs)) |
| 198 | return NOTIFY_DONE; | 195 | return NOTIFY_DONE; |
diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S index fc4fd4d705e2..5e75a316f6b1 100644 --- a/arch/mips/kernel/scall32-o32.S +++ b/arch/mips/kernel/scall32-o32.S | |||
| @@ -647,6 +647,12 @@ einval: li v0, -EINVAL | |||
| 647 | sys sys_timerfd_create 2 | 647 | sys sys_timerfd_create 2 |
| 648 | sys sys_timerfd_gettime 2 | 648 | sys sys_timerfd_gettime 2 |
| 649 | sys sys_timerfd_settime 4 | 649 | sys sys_timerfd_settime 4 |
| 650 | sys sys_signalfd4 4 | ||
| 651 | sys sys_eventfd2 2 /* 4325 */ | ||
| 652 | sys sys_epoll_create1 1 | ||
| 653 | sys sys_dup3 3 | ||
| 654 | sys sys_pipe2 2 | ||
| 655 | sys sys_inotify_init1 1 | ||
| 650 | .endm | 656 | .endm |
| 651 | 657 | ||
| 652 | /* We pre-compute the number of _instruction_ bytes needed to | 658 | /* We pre-compute the number of _instruction_ bytes needed to |
diff --git a/arch/mips/kernel/scall64-64.S b/arch/mips/kernel/scall64-64.S index 2b73fd1e4528..3d58204c9d44 100644 --- a/arch/mips/kernel/scall64-64.S +++ b/arch/mips/kernel/scall64-64.S | |||
| @@ -481,4 +481,10 @@ sys_call_table: | |||
| 481 | PTR sys_timerfd_create /* 5280 */ | 481 | PTR sys_timerfd_create /* 5280 */ |
| 482 | PTR sys_timerfd_gettime | 482 | PTR sys_timerfd_gettime |
| 483 | PTR sys_timerfd_settime | 483 | PTR sys_timerfd_settime |
| 484 | PTR sys_signalfd4 | ||
| 485 | PTR sys_eventfd2 | ||
| 486 | PTR sys_epoll_create1 /* 5285 */ | ||
| 487 | PTR sys_dup3 | ||
| 488 | PTR sys_pipe2 | ||
| 489 | PTR sys_inotify_init1 | ||
| 484 | .size sys_call_table,.-sys_call_table | 490 | .size sys_call_table,.-sys_call_table |
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S index 2654e75d2fef..da7f1b6ea0fb 100644 --- a/arch/mips/kernel/scall64-n32.S +++ b/arch/mips/kernel/scall64-n32.S | |||
| @@ -407,4 +407,10 @@ EXPORT(sysn32_call_table) | |||
| 407 | PTR sys_timerfd_create | 407 | PTR sys_timerfd_create |
| 408 | PTR sys_timerfd_gettime /* 5285 */ | 408 | PTR sys_timerfd_gettime /* 5285 */ |
| 409 | PTR sys_timerfd_settime | 409 | PTR sys_timerfd_settime |
| 410 | PTR sys_signalfd4 | ||
| 411 | PTR sys_eventfd2 | ||
| 412 | PTR sys_epoll_create1 | ||
| 413 | PTR sys_dup3 /* 5290 */ | ||
| 414 | PTR sys_pipe2 | ||
| 415 | PTR sys_inotify_init1 | ||
| 410 | .size sysn32_call_table,.-sysn32_call_table | 416 | .size sysn32_call_table,.-sysn32_call_table |
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S index 76167bea5a70..d7cd1aac9ada 100644 --- a/arch/mips/kernel/scall64-o32.S +++ b/arch/mips/kernel/scall64-o32.S | |||
| @@ -529,4 +529,10 @@ sys_call_table: | |||
| 529 | PTR sys_timerfd_create | 529 | PTR sys_timerfd_create |
| 530 | PTR sys_timerfd_gettime | 530 | PTR sys_timerfd_gettime |
| 531 | PTR sys_timerfd_settime | 531 | PTR sys_timerfd_settime |
| 532 | PTR compat_sys_signalfd4 | ||
| 533 | PTR sys_eventfd2 /* 4325 */ | ||
| 534 | PTR sys_epoll_create1 | ||
| 535 | PTR sys_dup3 | ||
| 536 | PTR sys_pipe2 | ||
| 537 | PTR sys_inotify_init1 | ||
| 532 | .size sys_call_table,.-sys_call_table | 538 | .size sys_call_table,.-sys_call_table |
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index 8af84867e74d..2aae76bce293 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c | |||
| @@ -78,7 +78,7 @@ void __init add_memory_region(phys_t start, phys_t size, long type) | |||
| 78 | 78 | ||
| 79 | /* Sanity check */ | 79 | /* Sanity check */ |
| 80 | if (start + size < start) { | 80 | if (start + size < start) { |
| 81 | printk("Trying to add an invalid memory region, skipped\n"); | 81 | pr_warning("Trying to add an invalid memory region, skipped\n"); |
| 82 | return; | 82 | return; |
| 83 | } | 83 | } |
| 84 | 84 | ||
| @@ -92,7 +92,7 @@ void __init add_memory_region(phys_t start, phys_t size, long type) | |||
| 92 | } | 92 | } |
| 93 | 93 | ||
| 94 | if (x == BOOT_MEM_MAP_MAX) { | 94 | if (x == BOOT_MEM_MAP_MAX) { |
| 95 | printk("Ooops! Too many entries in the memory map!\n"); | 95 | pr_err("Ooops! Too many entries in the memory map!\n"); |
| 96 | return; | 96 | return; |
| 97 | } | 97 | } |
| 98 | 98 | ||
| @@ -108,22 +108,22 @@ static void __init print_memory_map(void) | |||
| 108 | const int field = 2 * sizeof(unsigned long); | 108 | const int field = 2 * sizeof(unsigned long); |
| 109 | 109 | ||
| 110 | for (i = 0; i < boot_mem_map.nr_map; i++) { | 110 | for (i = 0; i < boot_mem_map.nr_map; i++) { |
| 111 | printk(" memory: %0*Lx @ %0*Lx ", | 111 | printk(KERN_INFO " memory: %0*Lx @ %0*Lx ", |
| 112 | field, (unsigned long long) boot_mem_map.map[i].size, | 112 | field, (unsigned long long) boot_mem_map.map[i].size, |
| 113 | field, (unsigned long long) boot_mem_map.map[i].addr); | 113 | field, (unsigned long long) boot_mem_map.map[i].addr); |
| 114 | 114 | ||
| 115 | switch (boot_mem_map.map[i].type) { | 115 | switch (boot_mem_map.map[i].type) { |
| 116 | case BOOT_MEM_RAM: | 116 | case BOOT_MEM_RAM: |
| 117 | printk("(usable)\n"); | 117 | printk(KERN_CONT "(usable)\n"); |
| 118 | break; | 118 | break; |
| 119 | case BOOT_MEM_ROM_DATA: | 119 | case BOOT_MEM_ROM_DATA: |
| 120 | printk("(ROM data)\n"); | 120 | printk(KERN_CONT "(ROM data)\n"); |
| 121 | break; | 121 | break; |
| 122 | case BOOT_MEM_RESERVED: | 122 | case BOOT_MEM_RESERVED: |
| 123 | printk("(reserved)\n"); | 123 | printk(KERN_CONT "(reserved)\n"); |
| 124 | break; | 124 | break; |
| 125 | default: | 125 | default: |
| 126 | printk("type %lu\n", boot_mem_map.map[i].type); | 126 | printk(KERN_CONT "type %lu\n", boot_mem_map.map[i].type); |
| 127 | break; | 127 | break; |
| 128 | } | 128 | } |
| 129 | } | 129 | } |
| @@ -185,11 +185,11 @@ static unsigned long __init init_initrd(void) | |||
| 185 | 185 | ||
| 186 | sanitize: | 186 | sanitize: |
| 187 | if (initrd_start & ~PAGE_MASK) { | 187 | if (initrd_start & ~PAGE_MASK) { |
| 188 | printk(KERN_ERR "initrd start must be page aligned\n"); | 188 | pr_err("initrd start must be page aligned\n"); |
| 189 | goto disable; | 189 | goto disable; |
| 190 | } | 190 | } |
| 191 | if (initrd_start < PAGE_OFFSET) { | 191 | if (initrd_start < PAGE_OFFSET) { |
| 192 | printk(KERN_ERR "initrd start < PAGE_OFFSET\n"); | 192 | pr_err("initrd start < PAGE_OFFSET\n"); |
| 193 | goto disable; | 193 | goto disable; |
| 194 | } | 194 | } |
| 195 | 195 | ||
| @@ -221,18 +221,18 @@ static void __init finalize_initrd(void) | |||
| 221 | goto disable; | 221 | goto disable; |
| 222 | } | 222 | } |
| 223 | if (__pa(initrd_end) > PFN_PHYS(max_low_pfn)) { | 223 | if (__pa(initrd_end) > PFN_PHYS(max_low_pfn)) { |
| 224 | printk("Initrd extends beyond end of memory"); | 224 | printk(KERN_ERR "Initrd extends beyond end of memory"); |
| 225 | goto disable; | 225 | goto disable; |
| 226 | } | 226 | } |
| 227 | 227 | ||
| 228 | reserve_bootmem(__pa(initrd_start), size, BOOTMEM_DEFAULT); | 228 | reserve_bootmem(__pa(initrd_start), size, BOOTMEM_DEFAULT); |
| 229 | initrd_below_start_ok = 1; | 229 | initrd_below_start_ok = 1; |
| 230 | 230 | ||
| 231 | printk(KERN_INFO "Initial ramdisk at: 0x%lx (%lu bytes)\n", | 231 | pr_info("Initial ramdisk at: 0x%lx (%lu bytes)\n", |
| 232 | initrd_start, size); | 232 | initrd_start, size); |
| 233 | return; | 233 | return; |
| 234 | disable: | 234 | disable: |
| 235 | printk(" - disabling initrd\n"); | 235 | printk(KERN_CONT " - disabling initrd\n"); |
| 236 | initrd_start = 0; | 236 | initrd_start = 0; |
| 237 | initrd_end = 0; | 237 | initrd_end = 0; |
| 238 | } | 238 | } |
| @@ -310,14 +310,12 @@ static void __init bootmem_init(void) | |||
| 310 | if (min_low_pfn >= max_low_pfn) | 310 | if (min_low_pfn >= max_low_pfn) |
| 311 | panic("Incorrect memory mapping !!!"); | 311 | panic("Incorrect memory mapping !!!"); |
| 312 | if (min_low_pfn > ARCH_PFN_OFFSET) { | 312 | if (min_low_pfn > ARCH_PFN_OFFSET) { |
| 313 | printk(KERN_INFO | 313 | pr_info("Wasting %lu bytes for tracking %lu unused pages\n", |
| 314 | "Wasting %lu bytes for tracking %lu unused pages\n", | 314 | (min_low_pfn - ARCH_PFN_OFFSET) * sizeof(struct page), |
| 315 | (min_low_pfn - ARCH_PFN_OFFSET) * sizeof(struct page), | 315 | min_low_pfn - ARCH_PFN_OFFSET); |
| 316 | min_low_pfn - ARCH_PFN_OFFSET); | ||
| 317 | } else if (min_low_pfn < ARCH_PFN_OFFSET) { | 316 | } else if (min_low_pfn < ARCH_PFN_OFFSET) { |
| 318 | printk(KERN_INFO | 317 | pr_info("%lu free pages won't be used\n", |
| 319 | "%lu free pages won't be used\n", | 318 | ARCH_PFN_OFFSET - min_low_pfn); |
| 320 | ARCH_PFN_OFFSET - min_low_pfn); | ||
| 321 | } | 319 | } |
| 322 | min_low_pfn = ARCH_PFN_OFFSET; | 320 | min_low_pfn = ARCH_PFN_OFFSET; |
| 323 | 321 | ||
| @@ -471,7 +469,7 @@ static void __init arch_mem_init(char **cmdline_p) | |||
| 471 | /* call board setup routine */ | 469 | /* call board setup routine */ |
| 472 | plat_mem_setup(); | 470 | plat_mem_setup(); |
| 473 | 471 | ||
| 474 | printk("Determined physical RAM map:\n"); | 472 | pr_info("Determined physical RAM map:\n"); |
| 475 | print_memory_map(); | 473 | print_memory_map(); |
| 476 | 474 | ||
| 477 | strlcpy(command_line, arcs_cmdline, sizeof(command_line)); | 475 | strlcpy(command_line, arcs_cmdline, sizeof(command_line)); |
| @@ -482,7 +480,7 @@ static void __init arch_mem_init(char **cmdline_p) | |||
| 482 | parse_early_param(); | 480 | parse_early_param(); |
| 483 | 481 | ||
| 484 | if (usermem) { | 482 | if (usermem) { |
| 485 | printk("User-defined physical RAM map:\n"); | 483 | pr_info("User-defined physical RAM map:\n"); |
| 486 | print_memory_map(); | 484 | print_memory_map(); |
| 487 | } | 485 | } |
| 488 | 486 | ||
diff --git a/arch/mips/pci/pci-ip27.c b/arch/mips/pci/pci-ip27.c index ce92f82b16d2..bd78368c82bf 100644 --- a/arch/mips/pci/pci-ip27.c +++ b/arch/mips/pci/pci-ip27.c | |||
| @@ -205,6 +205,7 @@ int pcibus_to_node(struct pci_bus *bus) | |||
| 205 | 205 | ||
| 206 | return bc->nasid; | 206 | return bc->nasid; |
| 207 | } | 207 | } |
| 208 | EXPORT_SYMBOL(pcibus_to_node); | ||
| 208 | 209 | ||
| 209 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SGI, PCI_DEVICE_ID_SGI_IOC3, | 210 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SGI, PCI_DEVICE_ID_SGI_IOC3, |
| 210 | pci_fixup_ioc3); | 211 | pci_fixup_ioc3); |
diff --git a/arch/mips/rb532/devices.c b/arch/mips/rb532/devices.c index 44fb0a62877f..82ab395efa33 100644 --- a/arch/mips/rb532/devices.c +++ b/arch/mips/rb532/devices.c | |||
| @@ -49,8 +49,6 @@ | |||
| 49 | #define GPIO_ALE (1 << 0x0a) | 49 | #define GPIO_ALE (1 << 0x0a) |
| 50 | #define GPIO_CLE (1 << 0x0b) | 50 | #define GPIO_CLE (1 << 0x0b) |
| 51 | 51 | ||
| 52 | extern char *board_type; | ||
| 53 | |||
| 54 | static struct resource korina_dev0_res[] = { | 52 | static struct resource korina_dev0_res[] = { |
| 55 | { | 53 | { |
| 56 | .name = "korina_regs", | 54 | .name = "korina_regs", |
| @@ -265,14 +263,6 @@ static void __init parse_mac_addr(char *macstr) | |||
| 265 | } | 263 | } |
| 266 | 264 | ||
| 267 | 265 | ||
| 268 | /* DEVICE CONTROLLER 1 */ | ||
| 269 | #define CFG_DC_DEV1 ((void *)0xb8010010) | ||
| 270 | #define CFG_DC_DEV2 ((void *)0xb8010020) | ||
| 271 | #define CFG_DC_DEVBASE 0x0 | ||
| 272 | #define CFG_DC_DEVMASK 0x4 | ||
| 273 | #define CFG_DC_DEVC 0x8 | ||
| 274 | #define CFG_DC_DEVTC 0xC | ||
| 275 | |||
| 276 | /* NAND definitions */ | 266 | /* NAND definitions */ |
| 277 | #define NAND_CHIP_DELAY 25 | 267 | #define NAND_CHIP_DELAY 25 |
| 278 | 268 | ||
| @@ -301,16 +291,16 @@ static void __init rb532_nand_setup(void) | |||
| 301 | static int __init plat_setup_devices(void) | 291 | static int __init plat_setup_devices(void) |
| 302 | { | 292 | { |
| 303 | /* Look for the CF card reader */ | 293 | /* Look for the CF card reader */ |
| 304 | if (!readl(CFG_DC_DEV1 + CFG_DC_DEVMASK)) | 294 | if (!readl(IDT434_REG_BASE + DEV1MASK)) |
| 305 | rb532_devs[1] = NULL; | 295 | rb532_devs[1] = NULL; |
| 306 | else { | 296 | else { |
| 307 | cf_slot0_res[0].start = | 297 | cf_slot0_res[0].start = |
| 308 | readl(CFG_DC_DEV1 + CFG_DC_DEVBASE); | 298 | readl(IDT434_REG_BASE + DEV1BASE); |
| 309 | cf_slot0_res[0].end = cf_slot0_res[0].start + 0x1000; | 299 | cf_slot0_res[0].end = cf_slot0_res[0].start + 0x1000; |
| 310 | } | 300 | } |
| 311 | 301 | ||
| 312 | /* Read the NAND resources from the device controller */ | 302 | /* Read the NAND resources from the device controller */ |
| 313 | nand_slot0_res[0].start = readl(CFG_DC_DEV2 + CFG_DC_DEVBASE); | 303 | nand_slot0_res[0].start = readl(IDT434_REG_BASE + DEV2BASE); |
| 314 | nand_slot0_res[0].end = nand_slot0_res[0].start + 0x1000; | 304 | nand_slot0_res[0].end = nand_slot0_res[0].start + 0x1000; |
| 315 | 305 | ||
| 316 | /* Initialise the NAND device */ | 306 | /* Initialise the NAND device */ |
diff --git a/arch/mips/txx9/generic/setup.c b/arch/mips/txx9/generic/setup.c index 1bc57d0f4c5c..0afe94c48fb6 100644 --- a/arch/mips/txx9/generic/setup.c +++ b/arch/mips/txx9/generic/setup.c | |||
| @@ -328,6 +328,9 @@ void __init arch_init_irq(void) | |||
| 328 | 328 | ||
| 329 | void __init plat_time_init(void) | 329 | void __init plat_time_init(void) |
| 330 | { | 330 | { |
| 331 | #ifdef CONFIG_CPU_TX49XX | ||
| 332 | mips_hpt_frequency = txx9_cpu_clock / 2; | ||
| 333 | #endif | ||
| 331 | txx9_board_vec->time_init(); | 334 | txx9_board_vec->time_init(); |
| 332 | } | 335 | } |
| 333 | 336 | ||
diff --git a/arch/mn10300/kernel/mn10300-serial.c b/arch/mn10300/kernel/mn10300-serial.c index 8b054e7a8ae8..aa07d0cd1905 100644 --- a/arch/mn10300/kernel/mn10300-serial.c +++ b/arch/mn10300/kernel/mn10300-serial.c | |||
| @@ -17,7 +17,6 @@ static const char serial_revdate[] = "2007-11-06"; | |||
| 17 | #define SUPPORT_SYSRQ | 17 | #define SUPPORT_SYSRQ |
| 18 | #endif | 18 | #endif |
| 19 | 19 | ||
| 20 | #include <linux/version.h> | ||
| 21 | #include <linux/module.h> | 20 | #include <linux/module.h> |
| 22 | #include <linux/serial.h> | 21 | #include <linux/serial.h> |
| 23 | #include <linux/circ_buf.h> | 22 | #include <linux/circ_buf.h> |
diff --git a/arch/parisc/hpux/fs.c b/arch/parisc/hpux/fs.c index 1263f00dc35d..12c04c5e558b 100644 --- a/arch/parisc/hpux/fs.c +++ b/arch/parisc/hpux/fs.c | |||
| @@ -84,22 +84,28 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset, | |||
| 84 | if (reclen > buf->count) | 84 | if (reclen > buf->count) |
| 85 | return -EINVAL; | 85 | return -EINVAL; |
| 86 | d_ino = ino; | 86 | d_ino = ino; |
| 87 | if (sizeof(d_ino) < sizeof(ino) && d_ino != ino) | 87 | if (sizeof(d_ino) < sizeof(ino) && d_ino != ino) { |
| 88 | buf->error = -EOVERFLOW; | ||
| 88 | return -EOVERFLOW; | 89 | return -EOVERFLOW; |
| 90 | } | ||
| 89 | dirent = buf->previous; | 91 | dirent = buf->previous; |
| 90 | if (dirent) | 92 | if (dirent) |
| 91 | put_user(offset, &dirent->d_off); | 93 | if (put_user(offset, &dirent->d_off)) |
| 94 | goto Efault; | ||
| 92 | dirent = buf->current_dir; | 95 | dirent = buf->current_dir; |
| 96 | if (put_user(d_ino, &dirent->d_ino) || | ||
| 97 | put_user(reclen, &dirent->d_reclen) || | ||
| 98 | put_user(namlen, &dirent->d_namlen) || | ||
| 99 | copy_to_user(dirent->d_name, name, namlen) || | ||
| 100 | put_user(0, dirent->d_name + namlen)) | ||
| 101 | goto Efault; | ||
| 93 | buf->previous = dirent; | 102 | buf->previous = dirent; |
| 94 | put_user(d_ino, &dirent->d_ino); | 103 | buf->current_dir = (void __user *)dirent + reclen; |
| 95 | put_user(reclen, &dirent->d_reclen); | ||
| 96 | put_user(namlen, &dirent->d_namlen); | ||
| 97 | copy_to_user(dirent->d_name, name, namlen); | ||
| 98 | put_user(0, dirent->d_name + namlen); | ||
| 99 | dirent = (void __user *)dirent + reclen; | ||
| 100 | buf->current_dir = dirent; | ||
| 101 | buf->count -= reclen; | 104 | buf->count -= reclen; |
| 102 | return 0; | 105 | return 0; |
| 106 | Efault: | ||
| 107 | buf->error = -EFAULT; | ||
| 108 | return -EFAULT; | ||
| 103 | } | 109 | } |
| 104 | 110 | ||
| 105 | #undef NAME_OFFSET | 111 | #undef NAME_OFFSET |
| @@ -126,8 +132,10 @@ int hpux_getdents(unsigned int fd, struct hpux_dirent __user *dirent, unsigned i | |||
| 126 | error = buf.error; | 132 | error = buf.error; |
| 127 | lastdirent = buf.previous; | 133 | lastdirent = buf.previous; |
| 128 | if (lastdirent) { | 134 | if (lastdirent) { |
| 129 | put_user(file->f_pos, &lastdirent->d_off); | 135 | if (put_user(file->f_pos, &lastdirent->d_off)) |
| 130 | error = count - buf.count; | 136 | error = -EFAULT; |
| 137 | else | ||
| 138 | error = count - buf.count; | ||
| 131 | } | 139 | } |
| 132 | 140 | ||
| 133 | out_putf: | 141 | out_putf: |
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 63c9cafda9c4..587da5e0990f 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
| @@ -42,9 +42,6 @@ config GENERIC_HARDIRQS | |||
| 42 | bool | 42 | bool |
| 43 | default y | 43 | default y |
| 44 | 44 | ||
| 45 | config HAVE_GET_USER_PAGES_FAST | ||
| 46 | def_bool PPC64 | ||
| 47 | |||
| 48 | config HAVE_SETUP_PER_CPU_AREA | 45 | config HAVE_SETUP_PER_CPU_AREA |
| 49 | def_bool PPC64 | 46 | def_bool PPC64 |
| 50 | 47 | ||
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile index 9155c9312c1e..c6be19e9ceae 100644 --- a/arch/powerpc/Makefile +++ b/arch/powerpc/Makefile | |||
| @@ -116,6 +116,11 @@ ifeq ($(CONFIG_6xx),y) | |||
| 116 | KBUILD_CFLAGS += -mcpu=powerpc | 116 | KBUILD_CFLAGS += -mcpu=powerpc |
| 117 | endif | 117 | endif |
| 118 | 118 | ||
| 119 | # Work around a gcc code-gen bug with -fno-omit-frame-pointer. | ||
| 120 | ifeq ($(CONFIG_FTRACE),y) | ||
| 121 | KBUILD_CFLAGS += -mno-sched-epilog | ||
| 122 | endif | ||
| 123 | |||
| 119 | cpu-as-$(CONFIG_4xx) += -Wa,-m405 | 124 | cpu-as-$(CONFIG_4xx) += -Wa,-m405 |
| 120 | cpu-as-$(CONFIG_6xx) += -Wa,-maltivec | 125 | cpu-as-$(CONFIG_6xx) += -Wa,-maltivec |
| 121 | cpu-as-$(CONFIG_POWER4) += -Wa,-maltivec | 126 | cpu-as-$(CONFIG_POWER4) += -Wa,-maltivec |
diff --git a/arch/powerpc/boot/dts/mpc8641_hpcn.dts b/arch/powerpc/boot/dts/mpc8641_hpcn.dts index ae08761ffff1..d665e767822a 100644 --- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts +++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts | |||
| @@ -411,7 +411,7 @@ | |||
| 411 | 0xe000 0 0 1 &i8259 12 2 | 411 | 0xe000 0 0 1 &i8259 12 2 |
| 412 | 0xe100 0 0 2 &i8259 9 2 | 412 | 0xe100 0 0 2 &i8259 9 2 |
| 413 | 0xe200 0 0 3 &i8259 10 2 | 413 | 0xe200 0 0 3 &i8259 10 2 |
| 414 | 0xe300 0 0 4 &i8259 112 | 414 | 0xe300 0 0 4 &i8259 11 2 |
| 415 | 415 | ||
| 416 | // IDSEL 0x1d Audio | 416 | // IDSEL 0x1d Audio |
| 417 | 0xe800 0 0 1 &i8259 6 2 | 417 | 0xe800 0 0 1 &i8259 6 2 |
diff --git a/arch/powerpc/boot/dts/tqm8548-bigflash.dts b/arch/powerpc/boot/dts/tqm8548-bigflash.dts index 64d2d5bbcdf1..4199e89b4e50 100644 --- a/arch/powerpc/boot/dts/tqm8548-bigflash.dts +++ b/arch/powerpc/boot/dts/tqm8548-bigflash.dts | |||
| @@ -50,13 +50,14 @@ | |||
| 50 | reg = <0x00000000 0x00000000>; // Filled in by U-Boot | 50 | reg = <0x00000000 0x00000000>; // Filled in by U-Boot |
| 51 | }; | 51 | }; |
| 52 | 52 | ||
| 53 | soc8548@a0000000 { | 53 | soc@a0000000 { |
| 54 | #address-cells = <1>; | 54 | #address-cells = <1>; |
| 55 | #size-cells = <1>; | 55 | #size-cells = <1>; |
| 56 | device_type = "soc"; | 56 | device_type = "soc"; |
| 57 | ranges = <0x0 0xa0000000 0x100000>; | 57 | ranges = <0x0 0xa0000000 0x100000>; |
| 58 | reg = <0xa0000000 0x1000>; // CCSRBAR | 58 | reg = <0xa0000000 0x1000>; // CCSRBAR |
| 59 | bus-frequency = <0>; | 59 | bus-frequency = <0>; |
| 60 | compatible = "fsl,mpc8548-immr", "simple-bus"; | ||
| 60 | 61 | ||
| 61 | memory-controller@2000 { | 62 | memory-controller@2000 { |
| 62 | compatible = "fsl,mpc8548-memory-controller"; | 63 | compatible = "fsl,mpc8548-memory-controller"; |
| @@ -83,6 +84,11 @@ | |||
| 83 | interrupts = <43 2>; | 84 | interrupts = <43 2>; |
| 84 | interrupt-parent = <&mpic>; | 85 | interrupt-parent = <&mpic>; |
| 85 | dfsrr; | 86 | dfsrr; |
| 87 | |||
| 88 | rtc@68 { | ||
| 89 | compatible = "dallas,ds1337"; | ||
| 90 | reg = <0x68>; | ||
| 91 | }; | ||
| 86 | }; | 92 | }; |
| 87 | 93 | ||
| 88 | i2c@3100 { | 94 | i2c@3100 { |
diff --git a/arch/powerpc/boot/dts/tqm8548.dts b/arch/powerpc/boot/dts/tqm8548.dts index 2563112cabd3..58ee4185454b 100644 --- a/arch/powerpc/boot/dts/tqm8548.dts +++ b/arch/powerpc/boot/dts/tqm8548.dts | |||
| @@ -50,13 +50,14 @@ | |||
| 50 | reg = <0x00000000 0x00000000>; // Filled in by U-Boot | 50 | reg = <0x00000000 0x00000000>; // Filled in by U-Boot |
| 51 | }; | 51 | }; |
| 52 | 52 | ||
| 53 | soc8548@e0000000 { | 53 | soc@e0000000 { |
| 54 | #address-cells = <1>; | 54 | #address-cells = <1>; |
| 55 | #size-cells = <1>; | 55 | #size-cells = <1>; |
| 56 | device_type = "soc"; | 56 | device_type = "soc"; |
| 57 | ranges = <0x0 0xe0000000 0x100000>; | 57 | ranges = <0x0 0xe0000000 0x100000>; |
| 58 | reg = <0xe0000000 0x1000>; // CCSRBAR | 58 | reg = <0xe0000000 0x1000>; // CCSRBAR |
| 59 | bus-frequency = <0>; | 59 | bus-frequency = <0>; |
| 60 | compatible = "fsl,mpc8548-immr", "simple-bus"; | ||
| 60 | 61 | ||
| 61 | memory-controller@2000 { | 62 | memory-controller@2000 { |
| 62 | compatible = "fsl,mpc8548-memory-controller"; | 63 | compatible = "fsl,mpc8548-memory-controller"; |
diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper index 644bf9d4ea00..965c237c122d 100755 --- a/arch/powerpc/boot/wrapper +++ b/arch/powerpc/boot/wrapper | |||
| @@ -165,7 +165,7 @@ cuboot*) | |||
| 165 | binary=y | 165 | binary=y |
| 166 | gzip= | 166 | gzip= |
| 167 | case "$platform" in | 167 | case "$platform" in |
| 168 | *-mpc885ads|*-adder875*|*-ep88xc) | 168 | *-mpc866ads|*-mpc885ads|*-adder875*|*-ep88xc) |
| 169 | platformo=$object/cuboot-8xx.o | 169 | platformo=$object/cuboot-8xx.o |
| 170 | ;; | 170 | ;; |
| 171 | *5200*|*-motionpro) | 171 | *5200*|*-motionpro) |
diff --git a/arch/powerpc/configs/asp8347_defconfig b/arch/powerpc/configs/83xx/asp8347_defconfig index 60bb4d106c87..5e6780a088ce 100644 --- a/arch/powerpc/configs/asp8347_defconfig +++ b/arch/powerpc/configs/83xx/asp8347_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.25-rc6 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Tue May 6 02:21:00 2008 | 4 | # Thu Aug 21 00:52:01 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -16,6 +16,7 @@ CONFIG_6xx=y | |||
| 16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
| 17 | CONFIG_PPC_FPU=y | 17 | CONFIG_PPC_FPU=y |
| 18 | CONFIG_FSL_EMB_PERFMON=y | 18 | CONFIG_FSL_EMB_PERFMON=y |
| 19 | # CONFIG_ALTIVEC is not set | ||
| 19 | CONFIG_PPC_STD_MMU=y | 20 | CONFIG_PPC_STD_MMU=y |
| 20 | CONFIG_PPC_STD_MMU_32=y | 21 | CONFIG_PPC_STD_MMU_32=y |
| 21 | # CONFIG_PPC_MM_SLICES is not set | 22 | # CONFIG_PPC_MM_SLICES is not set |
| @@ -31,6 +32,9 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 31 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 36 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 37 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 39 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 36 | CONFIG_GENERIC_HWEIGHT=y | 40 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -50,6 +54,9 @@ CONFIG_AUDIT_ARCH=y | |||
| 50 | CONFIG_GENERIC_BUG=y | 54 | CONFIG_GENERIC_BUG=y |
| 51 | # CONFIG_DEFAULT_UIMAGE is not set | 55 | # CONFIG_DEFAULT_UIMAGE is not set |
| 52 | CONFIG_REDBOOT=y | 56 | CONFIG_REDBOOT=y |
| 57 | CONFIG_HIBERNATE_32=y | ||
| 58 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
| 59 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
| 53 | # CONFIG_PPC_DCR_NATIVE is not set | 60 | # CONFIG_PPC_DCR_NATIVE is not set |
| 54 | # CONFIG_PPC_DCR_MMIO is not set | 61 | # CONFIG_PPC_DCR_MMIO is not set |
| 55 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 62 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| @@ -92,6 +99,7 @@ CONFIG_HOTPLUG=y | |||
| 92 | CONFIG_PRINTK=y | 99 | CONFIG_PRINTK=y |
| 93 | CONFIG_BUG=y | 100 | CONFIG_BUG=y |
| 94 | CONFIG_ELF_CORE=y | 101 | CONFIG_ELF_CORE=y |
| 102 | CONFIG_PCSPKR_PLATFORM=y | ||
| 95 | CONFIG_COMPAT_BRK=y | 103 | CONFIG_COMPAT_BRK=y |
| 96 | CONFIG_BASE_FULL=y | 104 | CONFIG_BASE_FULL=y |
| 97 | CONFIG_FUTEX=y | 105 | CONFIG_FUTEX=y |
| @@ -109,24 +117,33 @@ CONFIG_SLUB=y | |||
| 109 | # CONFIG_PROFILING is not set | 117 | # CONFIG_PROFILING is not set |
| 110 | # CONFIG_MARKERS is not set | 118 | # CONFIG_MARKERS is not set |
| 111 | CONFIG_HAVE_OPROFILE=y | 119 | CONFIG_HAVE_OPROFILE=y |
| 120 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 121 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 112 | CONFIG_HAVE_KPROBES=y | 122 | CONFIG_HAVE_KPROBES=y |
| 113 | CONFIG_HAVE_KRETPROBES=y | 123 | CONFIG_HAVE_KRETPROBES=y |
| 124 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 125 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 126 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 127 | # CONFIG_HAVE_CLK is not set | ||
| 114 | CONFIG_PROC_PAGE_MONITOR=y | 128 | CONFIG_PROC_PAGE_MONITOR=y |
| 129 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 115 | CONFIG_SLABINFO=y | 130 | CONFIG_SLABINFO=y |
| 116 | CONFIG_RT_MUTEXES=y | 131 | CONFIG_RT_MUTEXES=y |
| 117 | # CONFIG_TINY_SHMEM is not set | 132 | # CONFIG_TINY_SHMEM is not set |
| 118 | CONFIG_BASE_SMALL=0 | 133 | CONFIG_BASE_SMALL=0 |
| 119 | CONFIG_MODULES=y | 134 | CONFIG_MODULES=y |
| 135 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 120 | CONFIG_MODULE_UNLOAD=y | 136 | CONFIG_MODULE_UNLOAD=y |
| 121 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 137 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 122 | # CONFIG_MODVERSIONS is not set | 138 | # CONFIG_MODVERSIONS is not set |
| 123 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 139 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 124 | # CONFIG_KMOD is not set | 140 | CONFIG_KMOD=y |
| 125 | CONFIG_BLOCK=y | 141 | CONFIG_BLOCK=y |
| 126 | # CONFIG_LBD is not set | 142 | # CONFIG_LBD is not set |
| 127 | # CONFIG_BLK_DEV_IO_TRACE is not set | 143 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 128 | # CONFIG_LSF is not set | 144 | # CONFIG_LSF is not set |
| 129 | # CONFIG_BLK_DEV_BSG is not set | 145 | # CONFIG_BLK_DEV_BSG is not set |
| 146 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 130 | 147 | ||
| 131 | # | 148 | # |
| 132 | # IO Schedulers | 149 | # IO Schedulers |
| @@ -145,38 +162,49 @@ CONFIG_CLASSIC_RCU=y | |||
| 145 | # | 162 | # |
| 146 | # Platform support | 163 | # Platform support |
| 147 | # | 164 | # |
| 148 | # CONFIG_PPC_MULTIPLATFORM is not set | 165 | CONFIG_PPC_MULTIPLATFORM=y |
| 149 | # CONFIG_PPC_82xx is not set | 166 | CONFIG_CLASSIC32=y |
| 150 | CONFIG_PPC_83xx=y | 167 | CONFIG_PPC_CHRP=y |
| 151 | # CONFIG_PPC_86xx is not set | 168 | # CONFIG_MPC5121_ADS is not set |
| 152 | # CONFIG_PPC_MPC512x is not set | 169 | # CONFIG_MPC5121_GENERIC is not set |
| 153 | # CONFIG_PPC_MPC5121 is not set | 170 | # CONFIG_PPC_MPC52xx is not set |
| 171 | CONFIG_PPC_PMAC=y | ||
| 154 | # CONFIG_PPC_CELL is not set | 172 | # CONFIG_PPC_CELL is not set |
| 155 | # CONFIG_PPC_CELL_NATIVE is not set | 173 | # CONFIG_PPC_CELL_NATIVE is not set |
| 174 | # CONFIG_PPC_82xx is not set | ||
| 156 | # CONFIG_PQ2ADS is not set | 175 | # CONFIG_PQ2ADS is not set |
| 157 | CONFIG_MPC83xx=y | 176 | CONFIG_PPC_83xx=y |
| 158 | # CONFIG_MPC831x_RDB is not set | 177 | # CONFIG_MPC831x_RDB is not set |
| 159 | # CONFIG_MPC832x_MDS is not set | 178 | # CONFIG_MPC832x_MDS is not set |
| 160 | # CONFIG_MPC832x_RDB is not set | 179 | # CONFIG_MPC832x_RDB is not set |
| 161 | # CONFIG_MPC834x_MDS is not set | 180 | # CONFIG_MPC834x_MDS is not set |
| 162 | # CONFIG_MPC834x_ITX is not set | 181 | # CONFIG_MPC834x_ITX is not set |
| 163 | # CONFIG_MPC836x_MDS is not set | 182 | # CONFIG_MPC836x_MDS is not set |
| 183 | # CONFIG_MPC836x_RDK is not set | ||
| 164 | # CONFIG_MPC837x_MDS is not set | 184 | # CONFIG_MPC837x_MDS is not set |
| 165 | # CONFIG_MPC837x_RDB is not set | 185 | # CONFIG_MPC837x_RDB is not set |
| 166 | # CONFIG_SBC834x is not set | 186 | # CONFIG_SBC834x is not set |
| 167 | CONFIG_ASP834x=y | 187 | CONFIG_ASP834x=y |
| 168 | CONFIG_PPC_MPC834x=y | 188 | CONFIG_PPC_MPC834x=y |
| 189 | # CONFIG_PPC_86xx is not set | ||
| 190 | # CONFIG_EMBEDDED6xx is not set | ||
| 191 | CONFIG_PPC_NATIVE=y | ||
| 192 | # CONFIG_UDBG_RTAS_CONSOLE is not set | ||
| 169 | CONFIG_IPIC=y | 193 | CONFIG_IPIC=y |
| 170 | # CONFIG_MPIC is not set | 194 | CONFIG_MPIC=y |
| 171 | # CONFIG_MPIC_WEIRD is not set | 195 | # CONFIG_MPIC_WEIRD is not set |
| 172 | # CONFIG_PPC_I8259 is not set | 196 | CONFIG_PPC_I8259=y |
| 173 | # CONFIG_PPC_RTAS is not set | 197 | CONFIG_PPC_RTAS=y |
| 198 | # CONFIG_RTAS_ERROR_LOGGING is not set | ||
| 199 | CONFIG_RTAS_PROC=y | ||
| 174 | # CONFIG_MMIO_NVRAM is not set | 200 | # CONFIG_MMIO_NVRAM is not set |
| 175 | # CONFIG_PPC_MPC106 is not set | 201 | CONFIG_PPC_MPC106=y |
| 176 | # CONFIG_PPC_970_NAP is not set | 202 | # CONFIG_PPC_970_NAP is not set |
| 177 | # CONFIG_PPC_INDIRECT_IO is not set | 203 | # CONFIG_PPC_INDIRECT_IO is not set |
| 178 | # CONFIG_GENERIC_IOMAP is not set | 204 | # CONFIG_GENERIC_IOMAP is not set |
| 179 | # CONFIG_CPU_FREQ is not set | 205 | # CONFIG_CPU_FREQ is not set |
| 206 | # CONFIG_PPC601_SYNC_FIX is not set | ||
| 207 | # CONFIG_TAU is not set | ||
| 180 | # CONFIG_FSL_ULI1575 is not set | 208 | # CONFIG_FSL_ULI1575 is not set |
| 181 | 209 | ||
| 182 | # | 210 | # |
| @@ -192,7 +220,7 @@ CONFIG_HZ_250=y | |||
| 192 | # CONFIG_HZ_300 is not set | 220 | # CONFIG_HZ_300 is not set |
| 193 | # CONFIG_HZ_1000 is not set | 221 | # CONFIG_HZ_1000 is not set |
| 194 | CONFIG_HZ=250 | 222 | CONFIG_HZ=250 |
| 195 | # CONFIG_SCHED_HRTICK is not set | 223 | CONFIG_SCHED_HRTICK=y |
| 196 | CONFIG_PREEMPT_NONE=y | 224 | CONFIG_PREEMPT_NONE=y |
| 197 | # CONFIG_PREEMPT_VOLUNTARY is not set | 225 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 198 | # CONFIG_PREEMPT is not set | 226 | # CONFIG_PREEMPT is not set |
| @@ -202,6 +230,7 @@ CONFIG_BINFMT_ELF=y | |||
| 202 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 230 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| 203 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 231 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
| 204 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 232 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
| 233 | # CONFIG_KEXEC is not set | ||
| 205 | CONFIG_ARCH_FLATMEM_ENABLE=y | 234 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 206 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 235 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
| 207 | CONFIG_SELECT_MEMORY_MODEL=y | 236 | CONFIG_SELECT_MEMORY_MODEL=y |
| @@ -212,13 +241,17 @@ CONFIG_FLATMEM=y | |||
| 212 | CONFIG_FLAT_NODE_MEM_MAP=y | 241 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 213 | # CONFIG_SPARSEMEM_STATIC is not set | 242 | # CONFIG_SPARSEMEM_STATIC is not set |
| 214 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 243 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 244 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 215 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 245 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 246 | CONFIG_MIGRATION=y | ||
| 216 | # CONFIG_RESOURCES_64BIT is not set | 247 | # CONFIG_RESOURCES_64BIT is not set |
| 217 | CONFIG_ZONE_DMA_FLAG=1 | 248 | CONFIG_ZONE_DMA_FLAG=1 |
| 218 | CONFIG_BOUNCE=y | 249 | CONFIG_BOUNCE=y |
| 219 | CONFIG_VIRT_TO_BUS=y | 250 | CONFIG_VIRT_TO_BUS=y |
| 251 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 220 | CONFIG_PROC_DEVICETREE=y | 252 | CONFIG_PROC_DEVICETREE=y |
| 221 | # CONFIG_CMDLINE_BOOL is not set | 253 | # CONFIG_CMDLINE_BOOL is not set |
| 254 | CONFIG_EXTRA_TARGETS="" | ||
| 222 | # CONFIG_PM is not set | 255 | # CONFIG_PM is not set |
| 223 | CONFIG_SECCOMP=y | 256 | CONFIG_SECCOMP=y |
| 224 | CONFIG_ISA_DMA_API=y | 257 | CONFIG_ISA_DMA_API=y |
| @@ -226,10 +259,13 @@ CONFIG_ISA_DMA_API=y | |||
| 226 | # | 259 | # |
| 227 | # Bus options | 260 | # Bus options |
| 228 | # | 261 | # |
| 262 | # CONFIG_ISA is not set | ||
| 229 | CONFIG_ZONE_DMA=y | 263 | CONFIG_ZONE_DMA=y |
| 230 | CONFIG_GENERIC_ISA_DMA=y | 264 | CONFIG_GENERIC_ISA_DMA=y |
| 231 | CONFIG_PPC_INDIRECT_PCI=y | 265 | CONFIG_PPC_INDIRECT_PCI=y |
| 232 | CONFIG_FSL_SOC=y | 266 | CONFIG_FSL_SOC=y |
| 267 | CONFIG_FSL_PCI=y | ||
| 268 | CONFIG_PPC_PCI_CHOICE=y | ||
| 233 | CONFIG_PCI=y | 269 | CONFIG_PCI=y |
| 234 | CONFIG_PCI_DOMAINS=y | 270 | CONFIG_PCI_DOMAINS=y |
| 235 | CONFIG_PCI_SYSCALL=y | 271 | CONFIG_PCI_SYSCALL=y |
| @@ -239,6 +275,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
| 239 | CONFIG_PCI_LEGACY=y | 275 | CONFIG_PCI_LEGACY=y |
| 240 | # CONFIG_PCCARD is not set | 276 | # CONFIG_PCCARD is not set |
| 241 | # CONFIG_HOTPLUG_PCI is not set | 277 | # CONFIG_HOTPLUG_PCI is not set |
| 278 | # CONFIG_HAS_RAPIDIO is not set | ||
| 242 | 279 | ||
| 243 | # | 280 | # |
| 244 | # Advanced setup | 281 | # Advanced setup |
| @@ -248,15 +285,11 @@ CONFIG_PCI_LEGACY=y | |||
| 248 | # | 285 | # |
| 249 | # Default settings for advanced configuration options are used | 286 | # Default settings for advanced configuration options are used |
| 250 | # | 287 | # |
| 251 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 252 | CONFIG_LOWMEM_SIZE=0x30000000 | 288 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 289 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 253 | CONFIG_KERNEL_START=0xc0000000 | 290 | CONFIG_KERNEL_START=0xc0000000 |
| 291 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 254 | CONFIG_TASK_SIZE=0xc0000000 | 292 | CONFIG_TASK_SIZE=0xc0000000 |
| 255 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 256 | |||
| 257 | # | ||
| 258 | # Networking | ||
| 259 | # | ||
| 260 | CONFIG_NET=y | 293 | CONFIG_NET=y |
| 261 | 294 | ||
| 262 | # | 295 | # |
| @@ -300,8 +333,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 300 | CONFIG_DEFAULT_TCP_CONG="cubic" | 333 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 301 | # CONFIG_TCP_MD5SIG is not set | 334 | # CONFIG_TCP_MD5SIG is not set |
| 302 | # CONFIG_IPV6 is not set | 335 | # CONFIG_IPV6 is not set |
| 303 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 304 | # CONFIG_INET6_TUNNEL is not set | ||
| 305 | # CONFIG_NETWORK_SECMARK is not set | 336 | # CONFIG_NETWORK_SECMARK is not set |
| 306 | # CONFIG_NETFILTER is not set | 337 | # CONFIG_NETFILTER is not set |
| 307 | # CONFIG_IP_DCCP is not set | 338 | # CONFIG_IP_DCCP is not set |
| @@ -363,6 +394,7 @@ CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y | |||
| 363 | # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set | 394 | # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set |
| 364 | # CONFIG_MTD_CMDLINE_PARTS is not set | 395 | # CONFIG_MTD_CMDLINE_PARTS is not set |
| 365 | CONFIG_MTD_OF_PARTS=y | 396 | CONFIG_MTD_OF_PARTS=y |
| 397 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 366 | 398 | ||
| 367 | # | 399 | # |
| 368 | # User Modules And Translation Layers | 400 | # User Modules And Translation Layers |
| @@ -434,9 +466,11 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
| 434 | # | 466 | # |
| 435 | # CONFIG_MTD_UBI is not set | 467 | # CONFIG_MTD_UBI is not set |
| 436 | CONFIG_OF_DEVICE=y | 468 | CONFIG_OF_DEVICE=y |
| 469 | CONFIG_OF_I2C=y | ||
| 437 | # CONFIG_PARPORT is not set | 470 | # CONFIG_PARPORT is not set |
| 438 | CONFIG_BLK_DEV=y | 471 | CONFIG_BLK_DEV=y |
| 439 | # CONFIG_BLK_DEV_FD is not set | 472 | # CONFIG_BLK_DEV_FD is not set |
| 473 | # CONFIG_MAC_FLOPPY is not set | ||
| 440 | # CONFIG_BLK_CPQ_DA is not set | 474 | # CONFIG_BLK_CPQ_DA is not set |
| 441 | # CONFIG_BLK_CPQ_CISS_DA is not set | 475 | # CONFIG_BLK_CPQ_CISS_DA is not set |
| 442 | # CONFIG_BLK_DEV_DAC960 is not set | 476 | # CONFIG_BLK_DEV_DAC960 is not set |
| @@ -453,12 +487,14 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
| 453 | # CONFIG_BLK_DEV_XIP is not set | 487 | # CONFIG_BLK_DEV_XIP is not set |
| 454 | # CONFIG_CDROM_PKTCDVD is not set | 488 | # CONFIG_CDROM_PKTCDVD is not set |
| 455 | # CONFIG_ATA_OVER_ETH is not set | 489 | # CONFIG_ATA_OVER_ETH is not set |
| 490 | # CONFIG_BLK_DEV_HD is not set | ||
| 456 | CONFIG_MISC_DEVICES=y | 491 | CONFIG_MISC_DEVICES=y |
| 457 | # CONFIG_PHANTOM is not set | 492 | # CONFIG_PHANTOM is not set |
| 458 | # CONFIG_EEPROM_93CX6 is not set | 493 | # CONFIG_EEPROM_93CX6 is not set |
| 459 | # CONFIG_SGI_IOC4 is not set | 494 | # CONFIG_SGI_IOC4 is not set |
| 460 | # CONFIG_TIFM_CORE is not set | 495 | # CONFIG_TIFM_CORE is not set |
| 461 | # CONFIG_ENCLOSURE_SERVICES is not set | 496 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 497 | # CONFIG_HP_ILO is not set | ||
| 462 | CONFIG_HAVE_IDE=y | 498 | CONFIG_HAVE_IDE=y |
| 463 | # CONFIG_IDE is not set | 499 | # CONFIG_IDE is not set |
| 464 | 500 | ||
| @@ -476,12 +512,15 @@ CONFIG_HAVE_IDE=y | |||
| 476 | # | 512 | # |
| 477 | # IEEE 1394 (FireWire) support | 513 | # IEEE 1394 (FireWire) support |
| 478 | # | 514 | # |
| 515 | |||
| 516 | # | ||
| 517 | # Enable only one of the two stacks, unless you know what you are doing | ||
| 518 | # | ||
| 479 | # CONFIG_FIREWIRE is not set | 519 | # CONFIG_FIREWIRE is not set |
| 480 | # CONFIG_IEEE1394 is not set | 520 | # CONFIG_IEEE1394 is not set |
| 481 | # CONFIG_I2O is not set | 521 | # CONFIG_I2O is not set |
| 482 | # CONFIG_MACINTOSH_DRIVERS is not set | 522 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 483 | CONFIG_NETDEVICES=y | 523 | CONFIG_NETDEVICES=y |
| 484 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 485 | # CONFIG_DUMMY is not set | 524 | # CONFIG_DUMMY is not set |
| 486 | # CONFIG_BONDING is not set | 525 | # CONFIG_BONDING is not set |
| 487 | # CONFIG_MACVLAN is not set | 526 | # CONFIG_MACVLAN is not set |
| @@ -508,6 +547,8 @@ CONFIG_PHYLIB=y | |||
| 508 | # CONFIG_MDIO_BITBANG is not set | 547 | # CONFIG_MDIO_BITBANG is not set |
| 509 | CONFIG_NET_ETHERNET=y | 548 | CONFIG_NET_ETHERNET=y |
| 510 | CONFIG_MII=y | 549 | CONFIG_MII=y |
| 550 | # CONFIG_MACE is not set | ||
| 551 | # CONFIG_BMAC is not set | ||
| 511 | # CONFIG_HAPPYMEAL is not set | 552 | # CONFIG_HAPPYMEAL is not set |
| 512 | # CONFIG_SUNGEM is not set | 553 | # CONFIG_SUNGEM is not set |
| 513 | # CONFIG_CASSINI is not set | 554 | # CONFIG_CASSINI is not set |
| @@ -525,7 +566,6 @@ CONFIG_NETDEV_1000=y | |||
| 525 | # CONFIG_DL2K is not set | 566 | # CONFIG_DL2K is not set |
| 526 | # CONFIG_E1000 is not set | 567 | # CONFIG_E1000 is not set |
| 527 | # CONFIG_E1000E is not set | 568 | # CONFIG_E1000E is not set |
| 528 | # CONFIG_E1000E_ENABLED is not set | ||
| 529 | # CONFIG_IP1000 is not set | 569 | # CONFIG_IP1000 is not set |
| 530 | # CONFIG_IGB is not set | 570 | # CONFIG_IGB is not set |
| 531 | # CONFIG_NS83820 is not set | 571 | # CONFIG_NS83820 is not set |
| @@ -535,14 +575,14 @@ CONFIG_NETDEV_1000=y | |||
| 535 | # CONFIG_SIS190 is not set | 575 | # CONFIG_SIS190 is not set |
| 536 | # CONFIG_SKGE is not set | 576 | # CONFIG_SKGE is not set |
| 537 | # CONFIG_SKY2 is not set | 577 | # CONFIG_SKY2 is not set |
| 538 | # CONFIG_SK98LIN is not set | ||
| 539 | # CONFIG_VIA_VELOCITY is not set | 578 | # CONFIG_VIA_VELOCITY is not set |
| 540 | # CONFIG_TIGON3 is not set | 579 | # CONFIG_TIGON3 is not set |
| 541 | # CONFIG_BNX2 is not set | 580 | # CONFIG_BNX2 is not set |
| 542 | CONFIG_GIANFAR=y | 581 | CONFIG_GIANFAR=y |
| 543 | # CONFIG_GFAR_NAPI is not set | 582 | # CONFIG_MV643XX_ETH is not set |
| 544 | # CONFIG_QLA3XXX is not set | 583 | # CONFIG_QLA3XXX is not set |
| 545 | # CONFIG_ATL1 is not set | 584 | # CONFIG_ATL1 is not set |
| 585 | # CONFIG_ATL1E is not set | ||
| 546 | # CONFIG_NETDEV_10000 is not set | 586 | # CONFIG_NETDEV_10000 is not set |
| 547 | # CONFIG_TR is not set | 587 | # CONFIG_TR is not set |
| 548 | 588 | ||
| @@ -551,6 +591,7 @@ CONFIG_GIANFAR=y | |||
| 551 | # | 591 | # |
| 552 | # CONFIG_WLAN_PRE80211 is not set | 592 | # CONFIG_WLAN_PRE80211 is not set |
| 553 | # CONFIG_WLAN_80211 is not set | 593 | # CONFIG_WLAN_80211 is not set |
| 594 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 554 | 595 | ||
| 555 | # | 596 | # |
| 556 | # USB Network Adapters | 597 | # USB Network Adapters |
| @@ -606,6 +647,7 @@ CONFIG_INPUT=y | |||
| 606 | # Character devices | 647 | # Character devices |
| 607 | # | 648 | # |
| 608 | # CONFIG_VT is not set | 649 | # CONFIG_VT is not set |
| 650 | CONFIG_DEVKMEM=y | ||
| 609 | # CONFIG_SERIAL_NONSTANDARD is not set | 651 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 610 | # CONFIG_NOZOMI is not set | 652 | # CONFIG_NOZOMI is not set |
| 611 | 653 | ||
| @@ -625,16 +667,17 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
| 625 | # CONFIG_SERIAL_UARTLITE is not set | 667 | # CONFIG_SERIAL_UARTLITE is not set |
| 626 | CONFIG_SERIAL_CORE=y | 668 | CONFIG_SERIAL_CORE=y |
| 627 | CONFIG_SERIAL_CORE_CONSOLE=y | 669 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 670 | # CONFIG_SERIAL_PMACZILOG is not set | ||
| 628 | # CONFIG_SERIAL_JSM is not set | 671 | # CONFIG_SERIAL_JSM is not set |
| 629 | # CONFIG_SERIAL_OF_PLATFORM is not set | 672 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 630 | CONFIG_UNIX98_PTYS=y | 673 | CONFIG_UNIX98_PTYS=y |
| 631 | CONFIG_LEGACY_PTYS=y | 674 | CONFIG_LEGACY_PTYS=y |
| 632 | CONFIG_LEGACY_PTY_COUNT=256 | 675 | CONFIG_LEGACY_PTY_COUNT=256 |
| 676 | # CONFIG_BRIQ_PANEL is not set | ||
| 677 | # CONFIG_HVC_RTAS is not set | ||
| 633 | # CONFIG_IPMI_HANDLER is not set | 678 | # CONFIG_IPMI_HANDLER is not set |
| 634 | # CONFIG_HW_RANDOM is not set | 679 | # CONFIG_HW_RANDOM is not set |
| 635 | # CONFIG_NVRAM is not set | 680 | # CONFIG_NVRAM is not set |
| 636 | CONFIG_GEN_RTC=y | ||
| 637 | # CONFIG_GEN_RTC_X is not set | ||
| 638 | # CONFIG_R3964 is not set | 681 | # CONFIG_R3964 is not set |
| 639 | # CONFIG_APPLICOM is not set | 682 | # CONFIG_APPLICOM is not set |
| 640 | # CONFIG_RAW_DRIVER is not set | 683 | # CONFIG_RAW_DRIVER is not set |
| @@ -643,16 +686,14 @@ CONFIG_DEVPORT=y | |||
| 643 | CONFIG_I2C=y | 686 | CONFIG_I2C=y |
| 644 | CONFIG_I2C_BOARDINFO=y | 687 | CONFIG_I2C_BOARDINFO=y |
| 645 | CONFIG_I2C_CHARDEV=y | 688 | CONFIG_I2C_CHARDEV=y |
| 689 | CONFIG_I2C_HELPER_AUTO=y | ||
| 646 | 690 | ||
| 647 | # | 691 | # |
| 648 | # I2C Algorithms | 692 | # I2C Hardware Bus support |
| 649 | # | 693 | # |
| 650 | # CONFIG_I2C_ALGOBIT is not set | ||
| 651 | # CONFIG_I2C_ALGOPCF is not set | ||
| 652 | # CONFIG_I2C_ALGOPCA is not set | ||
| 653 | 694 | ||
| 654 | # | 695 | # |
| 655 | # I2C Hardware Bus support | 696 | # PC SMBus host controller drivers |
| 656 | # | 697 | # |
| 657 | # CONFIG_I2C_ALI1535 is not set | 698 | # CONFIG_I2C_ALI1535 is not set |
| 658 | # CONFIG_I2C_ALI1563 is not set | 699 | # CONFIG_I2C_ALI1563 is not set |
| @@ -660,50 +701,70 @@ CONFIG_I2C_CHARDEV=y | |||
| 660 | # CONFIG_I2C_AMD756 is not set | 701 | # CONFIG_I2C_AMD756 is not set |
| 661 | # CONFIG_I2C_AMD8111 is not set | 702 | # CONFIG_I2C_AMD8111 is not set |
| 662 | # CONFIG_I2C_I801 is not set | 703 | # CONFIG_I2C_I801 is not set |
| 663 | # CONFIG_I2C_I810 is not set | 704 | # CONFIG_I2C_ISCH is not set |
| 664 | # CONFIG_I2C_PIIX4 is not set | 705 | # CONFIG_I2C_PIIX4 is not set |
| 665 | CONFIG_I2C_MPC=y | ||
| 666 | # CONFIG_I2C_NFORCE2 is not set | 706 | # CONFIG_I2C_NFORCE2 is not set |
| 667 | # CONFIG_I2C_OCORES is not set | ||
| 668 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 669 | # CONFIG_I2C_PROSAVAGE is not set | ||
| 670 | # CONFIG_I2C_SAVAGE4 is not set | ||
| 671 | # CONFIG_I2C_SIMTEC is not set | ||
| 672 | # CONFIG_I2C_SIS5595 is not set | 707 | # CONFIG_I2C_SIS5595 is not set |
| 673 | # CONFIG_I2C_SIS630 is not set | 708 | # CONFIG_I2C_SIS630 is not set |
| 674 | # CONFIG_I2C_SIS96X is not set | 709 | # CONFIG_I2C_SIS96X is not set |
| 675 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 676 | # CONFIG_I2C_STUB is not set | ||
| 677 | # CONFIG_I2C_TINY_USB is not set | ||
| 678 | # CONFIG_I2C_VIA is not set | 710 | # CONFIG_I2C_VIA is not set |
| 679 | # CONFIG_I2C_VIAPRO is not set | 711 | # CONFIG_I2C_VIAPRO is not set |
| 712 | |||
| 713 | # | ||
| 714 | # Mac SMBus host controller drivers | ||
| 715 | # | ||
| 716 | # CONFIG_I2C_HYDRA is not set | ||
| 717 | CONFIG_I2C_POWERMAC=y | ||
| 718 | |||
| 719 | # | ||
| 720 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 721 | # | ||
| 722 | CONFIG_I2C_MPC=y | ||
| 723 | # CONFIG_I2C_OCORES is not set | ||
| 724 | # CONFIG_I2C_SIMTEC is not set | ||
| 725 | |||
| 726 | # | ||
| 727 | # External I2C/SMBus adapter drivers | ||
| 728 | # | ||
| 729 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 730 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 731 | # CONFIG_I2C_TINY_USB is not set | ||
| 732 | |||
| 733 | # | ||
| 734 | # Graphics adapter I2C/DDC channel drivers | ||
| 735 | # | ||
| 680 | # CONFIG_I2C_VOODOO3 is not set | 736 | # CONFIG_I2C_VOODOO3 is not set |
| 681 | 737 | ||
| 682 | # | 738 | # |
| 739 | # Other I2C/SMBus bus drivers | ||
| 740 | # | ||
| 741 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 742 | # CONFIG_I2C_STUB is not set | ||
| 743 | |||
| 744 | # | ||
| 683 | # Miscellaneous I2C Chip support | 745 | # Miscellaneous I2C Chip support |
| 684 | # | 746 | # |
| 685 | # CONFIG_DS1682 is not set | 747 | # CONFIG_DS1682 is not set |
| 748 | # CONFIG_AT24 is not set | ||
| 686 | # CONFIG_SENSORS_EEPROM is not set | 749 | # CONFIG_SENSORS_EEPROM is not set |
| 687 | # CONFIG_SENSORS_PCF8574 is not set | 750 | # CONFIG_SENSORS_PCF8574 is not set |
| 688 | # CONFIG_PCF8575 is not set | 751 | # CONFIG_PCF8575 is not set |
| 752 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 689 | # CONFIG_SENSORS_PCF8591 is not set | 753 | # CONFIG_SENSORS_PCF8591 is not set |
| 690 | # CONFIG_TPS65010 is not set | ||
| 691 | # CONFIG_SENSORS_MAX6875 is not set | 754 | # CONFIG_SENSORS_MAX6875 is not set |
| 692 | # CONFIG_SENSORS_TSL2550 is not set | 755 | # CONFIG_SENSORS_TSL2550 is not set |
| 693 | # CONFIG_I2C_DEBUG_CORE is not set | 756 | # CONFIG_I2C_DEBUG_CORE is not set |
| 694 | # CONFIG_I2C_DEBUG_ALGO is not set | 757 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 695 | # CONFIG_I2C_DEBUG_BUS is not set | 758 | # CONFIG_I2C_DEBUG_BUS is not set |
| 696 | # CONFIG_I2C_DEBUG_CHIP is not set | 759 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 697 | |||
| 698 | # | ||
| 699 | # SPI support | ||
| 700 | # | ||
| 701 | # CONFIG_SPI is not set | 760 | # CONFIG_SPI is not set |
| 702 | # CONFIG_SPI_MASTER is not set | 761 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
| 762 | # CONFIG_GPIOLIB is not set | ||
| 703 | # CONFIG_W1 is not set | 763 | # CONFIG_W1 is not set |
| 704 | # CONFIG_POWER_SUPPLY is not set | 764 | # CONFIG_POWER_SUPPLY is not set |
| 705 | CONFIG_HWMON=y | 765 | CONFIG_HWMON=y |
| 706 | # CONFIG_HWMON_VID is not set | 766 | # CONFIG_HWMON_VID is not set |
| 767 | # CONFIG_SENSORS_AD7414 is not set | ||
| 707 | # CONFIG_SENSORS_AD7418 is not set | 768 | # CONFIG_SENSORS_AD7418 is not set |
| 708 | # CONFIG_SENSORS_ADM1021 is not set | 769 | # CONFIG_SENSORS_ADM1021 is not set |
| 709 | # CONFIG_SENSORS_ADM1025 is not set | 770 | # CONFIG_SENSORS_ADM1025 is not set |
| @@ -713,6 +774,7 @@ CONFIG_HWMON=y | |||
| 713 | # CONFIG_SENSORS_ADM9240 is not set | 774 | # CONFIG_SENSORS_ADM9240 is not set |
| 714 | # CONFIG_SENSORS_ADT7470 is not set | 775 | # CONFIG_SENSORS_ADT7470 is not set |
| 715 | # CONFIG_SENSORS_ADT7473 is not set | 776 | # CONFIG_SENSORS_ADT7473 is not set |
| 777 | # CONFIG_SENSORS_AMS is not set | ||
| 716 | # CONFIG_SENSORS_ATXP1 is not set | 778 | # CONFIG_SENSORS_ATXP1 is not set |
| 717 | # CONFIG_SENSORS_DS1621 is not set | 779 | # CONFIG_SENSORS_DS1621 is not set |
| 718 | # CONFIG_SENSORS_I5K_AMB is not set | 780 | # CONFIG_SENSORS_I5K_AMB is not set |
| @@ -757,6 +819,7 @@ CONFIG_HWMON=y | |||
| 757 | # CONFIG_SENSORS_W83627EHF is not set | 819 | # CONFIG_SENSORS_W83627EHF is not set |
| 758 | # CONFIG_HWMON_DEBUG_CHIP is not set | 820 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 759 | CONFIG_THERMAL=y | 821 | CONFIG_THERMAL=y |
| 822 | # CONFIG_THERMAL_HWMON is not set | ||
| 760 | CONFIG_WATCHDOG=y | 823 | CONFIG_WATCHDOG=y |
| 761 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 824 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
| 762 | 825 | ||
| @@ -764,7 +827,9 @@ CONFIG_WATCHDOG=y | |||
| 764 | # Watchdog Device Drivers | 827 | # Watchdog Device Drivers |
| 765 | # | 828 | # |
| 766 | # CONFIG_SOFT_WATCHDOG is not set | 829 | # CONFIG_SOFT_WATCHDOG is not set |
| 767 | CONFIG_83xx_WDT=y | 830 | # CONFIG_ALIM7101_WDT is not set |
| 831 | # CONFIG_8xxx_WDT is not set | ||
| 832 | # CONFIG_WATCHDOG_RTAS is not set | ||
| 768 | 833 | ||
| 769 | # | 834 | # |
| 770 | # PCI-based Watchdog Cards | 835 | # PCI-based Watchdog Cards |
| @@ -786,13 +851,25 @@ CONFIG_SSB_POSSIBLE=y | |||
| 786 | # | 851 | # |
| 787 | # Multifunction device drivers | 852 | # Multifunction device drivers |
| 788 | # | 853 | # |
| 854 | # CONFIG_MFD_CORE is not set | ||
| 789 | # CONFIG_MFD_SM501 is not set | 855 | # CONFIG_MFD_SM501 is not set |
| 856 | # CONFIG_HTC_PASIC3 is not set | ||
| 857 | # CONFIG_MFD_TMIO is not set | ||
| 790 | 858 | ||
| 791 | # | 859 | # |
| 792 | # Multimedia devices | 860 | # Multimedia devices |
| 793 | # | 861 | # |
| 862 | |||
| 863 | # | ||
| 864 | # Multimedia core support | ||
| 865 | # | ||
| 794 | # CONFIG_VIDEO_DEV is not set | 866 | # CONFIG_VIDEO_DEV is not set |
| 795 | # CONFIG_DVB_CORE is not set | 867 | # CONFIG_DVB_CORE is not set |
| 868 | # CONFIG_VIDEO_MEDIA is not set | ||
| 869 | |||
| 870 | # | ||
| 871 | # Multimedia drivers | ||
| 872 | # | ||
| 796 | CONFIG_DAB=y | 873 | CONFIG_DAB=y |
| 797 | # CONFIG_USB_DABUSB is not set | 874 | # CONFIG_USB_DABUSB is not set |
| 798 | 875 | ||
| @@ -810,10 +887,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m | |||
| 810 | # Display device support | 887 | # Display device support |
| 811 | # | 888 | # |
| 812 | # CONFIG_DISPLAY_SUPPORT is not set | 889 | # CONFIG_DISPLAY_SUPPORT is not set |
| 813 | |||
| 814 | # | ||
| 815 | # Sound | ||
| 816 | # | ||
| 817 | # CONFIG_SOUND is not set | 890 | # CONFIG_SOUND is not set |
| 818 | # CONFIG_HID_SUPPORT is not set | 891 | # CONFIG_HID_SUPPORT is not set |
| 819 | CONFIG_USB_SUPPORT=y | 892 | CONFIG_USB_SUPPORT=y |
| @@ -831,16 +904,21 @@ CONFIG_USB=y | |||
| 831 | CONFIG_USB_DEVICE_CLASS=y | 904 | CONFIG_USB_DEVICE_CLASS=y |
| 832 | # CONFIG_USB_DYNAMIC_MINORS is not set | 905 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 833 | # CONFIG_USB_OTG is not set | 906 | # CONFIG_USB_OTG is not set |
| 907 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 908 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 909 | CONFIG_USB_MON=y | ||
| 834 | 910 | ||
| 835 | # | 911 | # |
| 836 | # USB Host Controller Drivers | 912 | # USB Host Controller Drivers |
| 837 | # | 913 | # |
| 914 | # CONFIG_USB_C67X00_HCD is not set | ||
| 838 | CONFIG_USB_EHCI_HCD=y | 915 | CONFIG_USB_EHCI_HCD=y |
| 839 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 916 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
| 840 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 917 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 841 | CONFIG_USB_EHCI_FSL=y | 918 | CONFIG_USB_EHCI_FSL=y |
| 842 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 919 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
| 843 | # CONFIG_USB_ISP116X_HCD is not set | 920 | # CONFIG_USB_ISP116X_HCD is not set |
| 921 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 844 | # CONFIG_USB_OHCI_HCD is not set | 922 | # CONFIG_USB_OHCI_HCD is not set |
| 845 | # CONFIG_USB_UHCI_HCD is not set | 923 | # CONFIG_USB_UHCI_HCD is not set |
| 846 | # CONFIG_USB_SL811_HCD is not set | 924 | # CONFIG_USB_SL811_HCD is not set |
| @@ -851,6 +929,7 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y | |||
| 851 | # | 929 | # |
| 852 | # CONFIG_USB_ACM is not set | 930 | # CONFIG_USB_ACM is not set |
| 853 | # CONFIG_USB_PRINTER is not set | 931 | # CONFIG_USB_PRINTER is not set |
| 932 | # CONFIG_USB_WDM is not set | ||
| 854 | 933 | ||
| 855 | # | 934 | # |
| 856 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 935 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -865,7 +944,6 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y | |||
| 865 | # USB Imaging devices | 944 | # USB Imaging devices |
| 866 | # | 945 | # |
| 867 | # CONFIG_USB_MDC800 is not set | 946 | # CONFIG_USB_MDC800 is not set |
| 868 | CONFIG_USB_MON=y | ||
| 869 | 947 | ||
| 870 | # | 948 | # |
| 871 | # USB port drivers | 949 | # USB port drivers |
| @@ -878,7 +956,6 @@ CONFIG_USB_MON=y | |||
| 878 | # CONFIG_USB_EMI62 is not set | 956 | # CONFIG_USB_EMI62 is not set |
| 879 | # CONFIG_USB_EMI26 is not set | 957 | # CONFIG_USB_EMI26 is not set |
| 880 | # CONFIG_USB_ADUTUX is not set | 958 | # CONFIG_USB_ADUTUX is not set |
| 881 | # CONFIG_USB_AUERSWALD is not set | ||
| 882 | # CONFIG_USB_RIO500 is not set | 959 | # CONFIG_USB_RIO500 is not set |
| 883 | # CONFIG_USB_LEGOTOWER is not set | 960 | # CONFIG_USB_LEGOTOWER is not set |
| 884 | # CONFIG_USB_LCD is not set | 961 | # CONFIG_USB_LCD is not set |
| @@ -894,18 +971,16 @@ CONFIG_USB_MON=y | |||
| 894 | # CONFIG_USB_LD is not set | 971 | # CONFIG_USB_LD is not set |
| 895 | # CONFIG_USB_TRANCEVIBRATOR is not set | 972 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 896 | # CONFIG_USB_IOWARRIOR is not set | 973 | # CONFIG_USB_IOWARRIOR is not set |
| 974 | # CONFIG_USB_ISIGHTFW is not set | ||
| 897 | # CONFIG_USB_GADGET is not set | 975 | # CONFIG_USB_GADGET is not set |
| 898 | # CONFIG_MMC is not set | 976 | # CONFIG_MMC is not set |
| 899 | # CONFIG_MEMSTICK is not set | 977 | # CONFIG_MEMSTICK is not set |
| 900 | # CONFIG_NEW_LEDS is not set | 978 | # CONFIG_NEW_LEDS is not set |
| 979 | # CONFIG_ACCESSIBILITY is not set | ||
| 901 | # CONFIG_INFINIBAND is not set | 980 | # CONFIG_INFINIBAND is not set |
| 902 | # CONFIG_EDAC is not set | 981 | # CONFIG_EDAC is not set |
| 903 | CONFIG_RTC_LIB=y | 982 | CONFIG_RTC_LIB=y |
| 904 | CONFIG_RTC_CLASS=y | 983 | CONFIG_RTC_CLASS=y |
| 905 | |||
| 906 | # | ||
| 907 | # Conflicting RTC option has been selected, check GEN_RTC and RTC | ||
| 908 | # | ||
| 909 | CONFIG_RTC_HCTOSYS=y | 984 | CONFIG_RTC_HCTOSYS=y |
| 910 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | 985 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" |
| 911 | # CONFIG_RTC_DEBUG is not set | 986 | # CONFIG_RTC_DEBUG is not set |
| @@ -933,6 +1008,7 @@ CONFIG_RTC_DRV_DS1374=y | |||
| 933 | # CONFIG_RTC_DRV_PCF8583 is not set | 1008 | # CONFIG_RTC_DRV_PCF8583 is not set |
| 934 | # CONFIG_RTC_DRV_M41T80 is not set | 1009 | # CONFIG_RTC_DRV_M41T80 is not set |
| 935 | # CONFIG_RTC_DRV_S35390A is not set | 1010 | # CONFIG_RTC_DRV_S35390A is not set |
| 1011 | # CONFIG_RTC_DRV_FM3130 is not set | ||
| 936 | 1012 | ||
| 937 | # | 1013 | # |
| 938 | # SPI RTC drivers | 1014 | # SPI RTC drivers |
| @@ -953,11 +1029,8 @@ CONFIG_RTC_DRV_DS1374=y | |||
| 953 | # | 1029 | # |
| 954 | # on-CPU RTC drivers | 1030 | # on-CPU RTC drivers |
| 955 | # | 1031 | # |
| 1032 | # CONFIG_RTC_DRV_PPC is not set | ||
| 956 | # CONFIG_DMADEVICES is not set | 1033 | # CONFIG_DMADEVICES is not set |
| 957 | |||
| 958 | # | ||
| 959 | # Userspace I/O | ||
| 960 | # | ||
| 961 | # CONFIG_UIO is not set | 1034 | # CONFIG_UIO is not set |
| 962 | 1035 | ||
| 963 | # | 1036 | # |
| @@ -977,7 +1050,6 @@ CONFIG_FS_MBCACHE=y | |||
| 977 | # CONFIG_JFS_FS is not set | 1050 | # CONFIG_JFS_FS is not set |
| 978 | # CONFIG_FS_POSIX_ACL is not set | 1051 | # CONFIG_FS_POSIX_ACL is not set |
| 979 | # CONFIG_XFS_FS is not set | 1052 | # CONFIG_XFS_FS is not set |
| 980 | # CONFIG_GFS2_FS is not set | ||
| 981 | # CONFIG_OCFS2_FS is not set | 1053 | # CONFIG_OCFS2_FS is not set |
| 982 | CONFIG_DNOTIFY=y | 1054 | CONFIG_DNOTIFY=y |
| 983 | CONFIG_INOTIFY=y | 1055 | CONFIG_INOTIFY=y |
| @@ -1036,6 +1108,7 @@ CONFIG_JFFS2_RTIME=y | |||
| 1036 | # CONFIG_CRAMFS is not set | 1108 | # CONFIG_CRAMFS is not set |
| 1037 | # CONFIG_VXFS_FS is not set | 1109 | # CONFIG_VXFS_FS is not set |
| 1038 | # CONFIG_MINIX_FS is not set | 1110 | # CONFIG_MINIX_FS is not set |
| 1111 | # CONFIG_OMFS_FS is not set | ||
| 1039 | # CONFIG_HPFS_FS is not set | 1112 | # CONFIG_HPFS_FS is not set |
| 1040 | # CONFIG_QNX4FS_FS is not set | 1113 | # CONFIG_QNX4FS_FS is not set |
| 1041 | # CONFIG_ROMFS_FS is not set | 1114 | # CONFIG_ROMFS_FS is not set |
| @@ -1046,15 +1119,13 @@ CONFIG_NFS_FS=y | |||
| 1046 | CONFIG_NFS_V3=y | 1119 | CONFIG_NFS_V3=y |
| 1047 | # CONFIG_NFS_V3_ACL is not set | 1120 | # CONFIG_NFS_V3_ACL is not set |
| 1048 | CONFIG_NFS_V4=y | 1121 | CONFIG_NFS_V4=y |
| 1049 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1050 | # CONFIG_NFSD is not set | ||
| 1051 | CONFIG_ROOT_NFS=y | 1122 | CONFIG_ROOT_NFS=y |
| 1123 | # CONFIG_NFSD is not set | ||
| 1052 | CONFIG_LOCKD=y | 1124 | CONFIG_LOCKD=y |
| 1053 | CONFIG_LOCKD_V4=y | 1125 | CONFIG_LOCKD_V4=y |
| 1054 | CONFIG_NFS_COMMON=y | 1126 | CONFIG_NFS_COMMON=y |
| 1055 | CONFIG_SUNRPC=y | 1127 | CONFIG_SUNRPC=y |
| 1056 | CONFIG_SUNRPC_GSS=y | 1128 | CONFIG_SUNRPC_GSS=y |
| 1057 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 1058 | CONFIG_RPCSEC_GSS_KRB5=y | 1129 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1059 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1130 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1060 | # CONFIG_SMB_FS is not set | 1131 | # CONFIG_SMB_FS is not set |
| @@ -1126,8 +1197,10 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
| 1126 | # Library routines | 1197 | # Library routines |
| 1127 | # | 1198 | # |
| 1128 | CONFIG_BITREVERSE=y | 1199 | CONFIG_BITREVERSE=y |
| 1200 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1129 | # CONFIG_CRC_CCITT is not set | 1201 | # CONFIG_CRC_CCITT is not set |
| 1130 | # CONFIG_CRC16 is not set | 1202 | # CONFIG_CRC16 is not set |
| 1203 | # CONFIG_CRC_T10DIF is not set | ||
| 1131 | # CONFIG_CRC_ITU_T is not set | 1204 | # CONFIG_CRC_ITU_T is not set |
| 1132 | CONFIG_CRC32=y | 1205 | CONFIG_CRC32=y |
| 1133 | # CONFIG_CRC7 is not set | 1206 | # CONFIG_CRC7 is not set |
| @@ -1146,6 +1219,7 @@ CONFIG_HAVE_LMB=y | |||
| 1146 | # CONFIG_PRINTK_TIME is not set | 1219 | # CONFIG_PRINTK_TIME is not set |
| 1147 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1220 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1148 | CONFIG_ENABLE_MUST_CHECK=y | 1221 | CONFIG_ENABLE_MUST_CHECK=y |
| 1222 | CONFIG_FRAME_WARN=1024 | ||
| 1149 | # CONFIG_MAGIC_SYSRQ is not set | 1223 | # CONFIG_MAGIC_SYSRQ is not set |
| 1150 | # CONFIG_UNUSED_SYMBOLS is not set | 1224 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1151 | # CONFIG_DEBUG_FS is not set | 1225 | # CONFIG_DEBUG_FS is not set |
| @@ -1154,7 +1228,18 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1154 | # CONFIG_SLUB_DEBUG_ON is not set | 1228 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1155 | # CONFIG_SLUB_STATS is not set | 1229 | # CONFIG_SLUB_STATS is not set |
| 1156 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1230 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1231 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 1232 | # CONFIG_LATENCYTOP is not set | ||
| 1233 | # CONFIG_SYSCTL_SYSCALL_CHECK is not set | ||
| 1234 | CONFIG_HAVE_FTRACE=y | ||
| 1235 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1236 | # CONFIG_FTRACE is not set | ||
| 1237 | # CONFIG_SCHED_TRACER is not set | ||
| 1238 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1157 | # CONFIG_SAMPLES is not set | 1239 | # CONFIG_SAMPLES is not set |
| 1240 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1241 | # CONFIG_IRQSTACKS is not set | ||
| 1242 | # CONFIG_BOOTX_TEXT is not set | ||
| 1158 | # CONFIG_PPC_EARLY_DEBUG is not set | 1243 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1159 | 1244 | ||
| 1160 | # | 1245 | # |
| @@ -1164,51 +1249,86 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1164 | # CONFIG_SECURITY is not set | 1249 | # CONFIG_SECURITY is not set |
| 1165 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1250 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1166 | CONFIG_CRYPTO=y | 1251 | CONFIG_CRYPTO=y |
| 1252 | |||
| 1253 | # | ||
| 1254 | # Crypto core or helper | ||
| 1255 | # | ||
| 1167 | CONFIG_CRYPTO_ALGAPI=y | 1256 | CONFIG_CRYPTO_ALGAPI=y |
| 1168 | CONFIG_CRYPTO_BLKCIPHER=y | 1257 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1169 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1170 | CONFIG_CRYPTO_MANAGER=y | 1258 | CONFIG_CRYPTO_MANAGER=y |
| 1259 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1260 | # CONFIG_CRYPTO_NULL is not set | ||
| 1261 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1262 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1263 | # CONFIG_CRYPTO_TEST is not set | ||
| 1264 | |||
| 1265 | # | ||
| 1266 | # Authenticated Encryption with Associated Data | ||
| 1267 | # | ||
| 1268 | # CONFIG_CRYPTO_CCM is not set | ||
| 1269 | # CONFIG_CRYPTO_GCM is not set | ||
| 1270 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1271 | |||
| 1272 | # | ||
| 1273 | # Block modes | ||
| 1274 | # | ||
| 1275 | CONFIG_CRYPTO_CBC=y | ||
| 1276 | # CONFIG_CRYPTO_CTR is not set | ||
| 1277 | # CONFIG_CRYPTO_CTS is not set | ||
| 1278 | CONFIG_CRYPTO_ECB=m | ||
| 1279 | # CONFIG_CRYPTO_LRW is not set | ||
| 1280 | CONFIG_CRYPTO_PCBC=m | ||
| 1281 | # CONFIG_CRYPTO_XTS is not set | ||
| 1282 | |||
| 1283 | # | ||
| 1284 | # Hash modes | ||
| 1285 | # | ||
| 1171 | # CONFIG_CRYPTO_HMAC is not set | 1286 | # CONFIG_CRYPTO_HMAC is not set |
| 1172 | # CONFIG_CRYPTO_XCBC is not set | 1287 | # CONFIG_CRYPTO_XCBC is not set |
| 1173 | # CONFIG_CRYPTO_NULL is not set | 1288 | |
| 1289 | # | ||
| 1290 | # Digest | ||
| 1291 | # | ||
| 1292 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1174 | # CONFIG_CRYPTO_MD4 is not set | 1293 | # CONFIG_CRYPTO_MD4 is not set |
| 1175 | CONFIG_CRYPTO_MD5=y | 1294 | CONFIG_CRYPTO_MD5=y |
| 1295 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1296 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1297 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1298 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1299 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1176 | # CONFIG_CRYPTO_SHA1 is not set | 1300 | # CONFIG_CRYPTO_SHA1 is not set |
| 1177 | # CONFIG_CRYPTO_SHA256 is not set | 1301 | # CONFIG_CRYPTO_SHA256 is not set |
| 1178 | # CONFIG_CRYPTO_SHA512 is not set | 1302 | # CONFIG_CRYPTO_SHA512 is not set |
| 1179 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1180 | # CONFIG_CRYPTO_TGR192 is not set | 1303 | # CONFIG_CRYPTO_TGR192 is not set |
| 1181 | # CONFIG_CRYPTO_GF128MUL is not set | 1304 | # CONFIG_CRYPTO_WP512 is not set |
| 1182 | CONFIG_CRYPTO_ECB=m | 1305 | |
| 1183 | CONFIG_CRYPTO_CBC=y | 1306 | # |
| 1184 | CONFIG_CRYPTO_PCBC=m | 1307 | # Ciphers |
| 1185 | # CONFIG_CRYPTO_LRW is not set | 1308 | # |
| 1186 | # CONFIG_CRYPTO_XTS is not set | ||
| 1187 | # CONFIG_CRYPTO_CTR is not set | ||
| 1188 | # CONFIG_CRYPTO_GCM is not set | ||
| 1189 | # CONFIG_CRYPTO_CCM is not set | ||
| 1190 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1191 | CONFIG_CRYPTO_DES=y | ||
| 1192 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1193 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1194 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1195 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1196 | # CONFIG_CRYPTO_AES is not set | 1309 | # CONFIG_CRYPTO_AES is not set |
| 1310 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1311 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1312 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1313 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1197 | # CONFIG_CRYPTO_CAST5 is not set | 1314 | # CONFIG_CRYPTO_CAST5 is not set |
| 1198 | # CONFIG_CRYPTO_CAST6 is not set | 1315 | # CONFIG_CRYPTO_CAST6 is not set |
| 1199 | # CONFIG_CRYPTO_TEA is not set | 1316 | CONFIG_CRYPTO_DES=y |
| 1200 | # CONFIG_CRYPTO_ARC4 is not set | 1317 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1201 | # CONFIG_CRYPTO_KHAZAD is not set | 1318 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1202 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1203 | # CONFIG_CRYPTO_SEED is not set | ||
| 1204 | # CONFIG_CRYPTO_SALSA20 is not set | 1319 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1320 | # CONFIG_CRYPTO_SEED is not set | ||
| 1321 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1322 | # CONFIG_CRYPTO_TEA is not set | ||
| 1323 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1324 | |||
| 1325 | # | ||
| 1326 | # Compression | ||
| 1327 | # | ||
| 1205 | # CONFIG_CRYPTO_DEFLATE is not set | 1328 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1206 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1207 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1208 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1209 | # CONFIG_CRYPTO_TEST is not set | ||
| 1210 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1211 | # CONFIG_CRYPTO_LZO is not set | 1329 | # CONFIG_CRYPTO_LZO is not set |
| 1212 | CONFIG_CRYPTO_HW=y | 1330 | CONFIG_CRYPTO_HW=y |
| 1213 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1331 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1332 | # CONFIG_CRYPTO_DEV_TALITOS is not set | ||
| 1214 | # CONFIG_PPC_CLOCK is not set | 1333 | # CONFIG_PPC_CLOCK is not set |
| 1334 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig index 5428f9f5ed85..2028337868b4 100644 --- a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig +++ b/arch/powerpc/configs/83xx/mpc8313_rdb_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.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Mon Jun 9 08:52:21 2008 | 4 | # Thu Aug 21 00:52:17 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -16,6 +16,7 @@ CONFIG_6xx=y | |||
| 16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
| 17 | CONFIG_PPC_FPU=y | 17 | CONFIG_PPC_FPU=y |
| 18 | # CONFIG_FSL_EMB_PERFMON is not set | 18 | # CONFIG_FSL_EMB_PERFMON is not set |
| 19 | # CONFIG_ALTIVEC is not set | ||
| 19 | CONFIG_PPC_STD_MMU=y | 20 | CONFIG_PPC_STD_MMU=y |
| 20 | CONFIG_PPC_STD_MMU_32=y | 21 | CONFIG_PPC_STD_MMU_32=y |
| 21 | # CONFIG_PPC_MM_SLICES is not set | 22 | # CONFIG_PPC_MM_SLICES is not set |
| @@ -32,6 +33,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | 35 | CONFIG_STACKTRACE_SUPPORT=y |
| 36 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | 37 | CONFIG_LOCKDEP_SUPPORT=y |
| 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 39 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| @@ -51,6 +53,9 @@ CONFIG_PPC_UDBG_16550=y | |||
| 51 | CONFIG_AUDIT_ARCH=y | 53 | CONFIG_AUDIT_ARCH=y |
| 52 | CONFIG_GENERIC_BUG=y | 54 | CONFIG_GENERIC_BUG=y |
| 53 | CONFIG_DEFAULT_UIMAGE=y | 55 | CONFIG_DEFAULT_UIMAGE=y |
| 56 | CONFIG_HIBERNATE_32=y | ||
| 57 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
| 58 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
| 54 | # CONFIG_PPC_DCR_NATIVE is not set | 59 | # CONFIG_PPC_DCR_NATIVE is not set |
| 55 | # CONFIG_PPC_DCR_MMIO is not set | 60 | # CONFIG_PPC_DCR_MMIO is not set |
| 56 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 61 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| @@ -88,12 +93,12 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 88 | CONFIG_SYSCTL=y | 93 | CONFIG_SYSCTL=y |
| 89 | CONFIG_EMBEDDED=y | 94 | CONFIG_EMBEDDED=y |
| 90 | CONFIG_SYSCTL_SYSCALL=y | 95 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 92 | # CONFIG_KALLSYMS is not set | 96 | # CONFIG_KALLSYMS is not set |
| 93 | CONFIG_HOTPLUG=y | 97 | CONFIG_HOTPLUG=y |
| 94 | CONFIG_PRINTK=y | 98 | CONFIG_PRINTK=y |
| 95 | CONFIG_BUG=y | 99 | CONFIG_BUG=y |
| 96 | CONFIG_ELF_CORE=y | 100 | CONFIG_ELF_CORE=y |
| 101 | CONFIG_PCSPKR_PLATFORM=y | ||
| 97 | CONFIG_COMPAT_BRK=y | 102 | CONFIG_COMPAT_BRK=y |
| 98 | CONFIG_BASE_FULL=y | 103 | CONFIG_BASE_FULL=y |
| 99 | CONFIG_FUTEX=y | 104 | CONFIG_FUTEX=y |
| @@ -111,10 +116,16 @@ CONFIG_SLUB=y | |||
| 111 | # CONFIG_PROFILING is not set | 116 | # CONFIG_PROFILING is not set |
| 112 | # CONFIG_MARKERS is not set | 117 | # CONFIG_MARKERS is not set |
| 113 | CONFIG_HAVE_OPROFILE=y | 118 | CONFIG_HAVE_OPROFILE=y |
| 119 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 120 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 114 | CONFIG_HAVE_KPROBES=y | 121 | CONFIG_HAVE_KPROBES=y |
| 115 | CONFIG_HAVE_KRETPROBES=y | 122 | CONFIG_HAVE_KRETPROBES=y |
| 123 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 116 | # CONFIG_HAVE_DMA_ATTRS is not set | 124 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 125 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 126 | # CONFIG_HAVE_CLK is not set | ||
| 117 | CONFIG_PROC_PAGE_MONITOR=y | 127 | CONFIG_PROC_PAGE_MONITOR=y |
| 128 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 118 | CONFIG_SLABINFO=y | 129 | CONFIG_SLABINFO=y |
| 119 | CONFIG_RT_MUTEXES=y | 130 | CONFIG_RT_MUTEXES=y |
| 120 | # CONFIG_TINY_SHMEM is not set | 131 | # CONFIG_TINY_SHMEM is not set |
| @@ -125,12 +136,13 @@ CONFIG_MODULE_UNLOAD=y | |||
| 125 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 136 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 126 | # CONFIG_MODVERSIONS is not set | 137 | # CONFIG_MODVERSIONS is not set |
| 127 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 138 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 128 | # CONFIG_KMOD is not set | 139 | CONFIG_KMOD=y |
| 129 | CONFIG_BLOCK=y | 140 | CONFIG_BLOCK=y |
| 130 | # CONFIG_LBD is not set | 141 | # CONFIG_LBD is not set |
| 131 | # CONFIG_BLK_DEV_IO_TRACE is not set | 142 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 132 | # CONFIG_LSF is not set | 143 | # CONFIG_LSF is not set |
| 133 | # CONFIG_BLK_DEV_BSG is not set | 144 | # CONFIG_BLK_DEV_BSG is not set |
| 145 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 134 | 146 | ||
| 135 | # | 147 | # |
| 136 | # IO Schedulers | 148 | # IO Schedulers |
| @@ -149,37 +161,49 @@ CONFIG_CLASSIC_RCU=y | |||
| 149 | # | 161 | # |
| 150 | # Platform support | 162 | # Platform support |
| 151 | # | 163 | # |
| 152 | # CONFIG_PPC_MULTIPLATFORM is not set | 164 | CONFIG_PPC_MULTIPLATFORM=y |
| 153 | # CONFIG_PPC_82xx is not set | 165 | CONFIG_CLASSIC32=y |
| 154 | CONFIG_PPC_83xx=y | 166 | CONFIG_PPC_CHRP=y |
| 155 | # CONFIG_PPC_86xx is not set | 167 | # CONFIG_MPC5121_ADS is not set |
| 156 | # CONFIG_PPC_MPC512x is not set | 168 | # CONFIG_MPC5121_GENERIC is not set |
| 157 | # CONFIG_PPC_MPC5121 is not set | 169 | # CONFIG_PPC_MPC52xx is not set |
| 170 | CONFIG_PPC_PMAC=y | ||
| 158 | # CONFIG_PPC_CELL is not set | 171 | # CONFIG_PPC_CELL is not set |
| 159 | # CONFIG_PPC_CELL_NATIVE is not set | 172 | # CONFIG_PPC_CELL_NATIVE is not set |
| 173 | # CONFIG_PPC_82xx is not set | ||
| 160 | # CONFIG_PQ2ADS is not set | 174 | # CONFIG_PQ2ADS is not set |
| 161 | CONFIG_MPC83xx=y | 175 | CONFIG_PPC_83xx=y |
| 162 | CONFIG_MPC831x_RDB=y | 176 | CONFIG_MPC831x_RDB=y |
| 163 | # CONFIG_MPC832x_MDS is not set | 177 | # CONFIG_MPC832x_MDS is not set |
| 164 | # CONFIG_MPC832x_RDB is not set | 178 | # CONFIG_MPC832x_RDB is not set |
| 165 | # CONFIG_MPC834x_MDS is not set | 179 | # CONFIG_MPC834x_MDS is not set |
| 166 | # CONFIG_MPC834x_ITX is not set | 180 | # CONFIG_MPC834x_ITX is not set |
| 167 | # CONFIG_MPC836x_MDS is not set | 181 | # CONFIG_MPC836x_MDS is not set |
| 182 | # CONFIG_MPC836x_RDK is not set | ||
| 168 | # CONFIG_MPC837x_MDS is not set | 183 | # CONFIG_MPC837x_MDS is not set |
| 169 | # CONFIG_MPC837x_RDB is not set | 184 | # CONFIG_MPC837x_RDB is not set |
| 170 | # CONFIG_SBC834x is not set | 185 | # CONFIG_SBC834x is not set |
| 186 | # CONFIG_ASP834x is not set | ||
| 171 | CONFIG_PPC_MPC831x=y | 187 | CONFIG_PPC_MPC831x=y |
| 188 | # CONFIG_PPC_86xx is not set | ||
| 189 | # CONFIG_EMBEDDED6xx is not set | ||
| 190 | CONFIG_PPC_NATIVE=y | ||
| 191 | # CONFIG_UDBG_RTAS_CONSOLE is not set | ||
| 172 | CONFIG_IPIC=y | 192 | CONFIG_IPIC=y |
| 173 | # CONFIG_MPIC is not set | 193 | CONFIG_MPIC=y |
| 174 | # CONFIG_MPIC_WEIRD is not set | 194 | # CONFIG_MPIC_WEIRD is not set |
| 175 | # CONFIG_PPC_I8259 is not set | 195 | CONFIG_PPC_I8259=y |
| 176 | # CONFIG_PPC_RTAS is not set | 196 | CONFIG_PPC_RTAS=y |
| 197 | # CONFIG_RTAS_ERROR_LOGGING is not set | ||
| 198 | CONFIG_RTAS_PROC=y | ||
| 177 | # CONFIG_MMIO_NVRAM is not set | 199 | # CONFIG_MMIO_NVRAM is not set |
| 178 | # CONFIG_PPC_MPC106 is not set | 200 | CONFIG_PPC_MPC106=y |
| 179 | # CONFIG_PPC_970_NAP is not set | 201 | # CONFIG_PPC_970_NAP is not set |
| 180 | # CONFIG_PPC_INDIRECT_IO is not set | 202 | # CONFIG_PPC_INDIRECT_IO is not set |
| 181 | # CONFIG_GENERIC_IOMAP is not set | 203 | # CONFIG_GENERIC_IOMAP is not set |
| 182 | # CONFIG_CPU_FREQ is not set | 204 | # CONFIG_CPU_FREQ is not set |
| 205 | # CONFIG_PPC601_SYNC_FIX is not set | ||
| 206 | # CONFIG_TAU is not set | ||
| 183 | # CONFIG_FSL_ULI1575 is not set | 207 | # CONFIG_FSL_ULI1575 is not set |
| 184 | 208 | ||
| 185 | # | 209 | # |
| @@ -195,7 +219,7 @@ CONFIG_HZ_250=y | |||
| 195 | # CONFIG_HZ_300 is not set | 219 | # CONFIG_HZ_300 is not set |
| 196 | # CONFIG_HZ_1000 is not set | 220 | # CONFIG_HZ_1000 is not set |
| 197 | CONFIG_HZ=250 | 221 | CONFIG_HZ=250 |
| 198 | # CONFIG_SCHED_HRTICK is not set | 222 | CONFIG_SCHED_HRTICK=y |
| 199 | CONFIG_PREEMPT_NONE=y | 223 | CONFIG_PREEMPT_NONE=y |
| 200 | # CONFIG_PREEMPT_VOLUNTARY is not set | 224 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 201 | # CONFIG_PREEMPT is not set | 225 | # CONFIG_PREEMPT is not set |
| @@ -205,6 +229,7 @@ CONFIG_BINFMT_ELF=y | |||
| 205 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 229 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| 206 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 230 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
| 207 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 231 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
| 232 | # CONFIG_KEXEC is not set | ||
| 208 | CONFIG_ARCH_FLATMEM_ENABLE=y | 233 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 209 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 234 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
| 210 | CONFIG_SELECT_MEMORY_MODEL=y | 235 | CONFIG_SELECT_MEMORY_MODEL=y |
| @@ -217,6 +242,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 242 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 218 | CONFIG_PAGEFLAGS_EXTENDED=y | 243 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 219 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 244 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 245 | CONFIG_MIGRATION=y | ||
| 220 | # CONFIG_RESOURCES_64BIT is not set | 246 | # CONFIG_RESOURCES_64BIT is not set |
| 221 | CONFIG_ZONE_DMA_FLAG=1 | 247 | CONFIG_ZONE_DMA_FLAG=1 |
| 222 | CONFIG_BOUNCE=y | 248 | CONFIG_BOUNCE=y |
| @@ -224,6 +250,7 @@ CONFIG_VIRT_TO_BUS=y | |||
| 224 | CONFIG_FORCE_MAX_ZONEORDER=11 | 250 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 225 | CONFIG_PROC_DEVICETREE=y | 251 | CONFIG_PROC_DEVICETREE=y |
| 226 | # CONFIG_CMDLINE_BOOL is not set | 252 | # CONFIG_CMDLINE_BOOL is not set |
| 253 | CONFIG_EXTRA_TARGETS="" | ||
| 227 | # CONFIG_PM is not set | 254 | # CONFIG_PM is not set |
| 228 | CONFIG_SECCOMP=y | 255 | CONFIG_SECCOMP=y |
| 229 | CONFIG_ISA_DMA_API=y | 256 | CONFIG_ISA_DMA_API=y |
| @@ -231,10 +258,13 @@ CONFIG_ISA_DMA_API=y | |||
| 231 | # | 258 | # |
| 232 | # Bus options | 259 | # Bus options |
| 233 | # | 260 | # |
| 261 | # CONFIG_ISA is not set | ||
| 234 | CONFIG_ZONE_DMA=y | 262 | CONFIG_ZONE_DMA=y |
| 235 | CONFIG_GENERIC_ISA_DMA=y | 263 | CONFIG_GENERIC_ISA_DMA=y |
| 236 | CONFIG_PPC_INDIRECT_PCI=y | 264 | CONFIG_PPC_INDIRECT_PCI=y |
| 237 | CONFIG_FSL_SOC=y | 265 | CONFIG_FSL_SOC=y |
| 266 | CONFIG_FSL_PCI=y | ||
| 267 | CONFIG_PPC_PCI_CHOICE=y | ||
| 238 | CONFIG_PCI=y | 268 | CONFIG_PCI=y |
| 239 | CONFIG_PCI_DOMAINS=y | 269 | CONFIG_PCI_DOMAINS=y |
| 240 | CONFIG_PCI_SYSCALL=y | 270 | CONFIG_PCI_SYSCALL=y |
| @@ -260,10 +290,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
| 260 | CONFIG_KERNEL_START=0xc0000000 | 290 | CONFIG_KERNEL_START=0xc0000000 |
| 261 | CONFIG_PHYSICAL_START=0x00000000 | 291 | CONFIG_PHYSICAL_START=0x00000000 |
| 262 | CONFIG_TASK_SIZE=0xc0000000 | 292 | CONFIG_TASK_SIZE=0xc0000000 |
| 263 | |||
| 264 | # | ||
| 265 | # Networking | ||
| 266 | # | ||
| 267 | CONFIG_NET=y | 293 | CONFIG_NET=y |
| 268 | 294 | ||
| 269 | # | 295 | # |
| @@ -452,9 +478,11 @@ CONFIG_MTD_NAND_FSL_ELBC=y | |||
| 452 | # CONFIG_MTD_UBI is not set | 478 | # CONFIG_MTD_UBI is not set |
| 453 | CONFIG_OF_DEVICE=y | 479 | CONFIG_OF_DEVICE=y |
| 454 | CONFIG_OF_I2C=y | 480 | CONFIG_OF_I2C=y |
| 481 | CONFIG_OF_SPI=y | ||
| 455 | # CONFIG_PARPORT is not set | 482 | # CONFIG_PARPORT is not set |
| 456 | CONFIG_BLK_DEV=y | 483 | CONFIG_BLK_DEV=y |
| 457 | # CONFIG_BLK_DEV_FD is not set | 484 | # CONFIG_BLK_DEV_FD is not set |
| 485 | # CONFIG_MAC_FLOPPY is not set | ||
| 458 | # CONFIG_BLK_CPQ_DA is not set | 486 | # CONFIG_BLK_CPQ_DA is not set |
| 459 | # CONFIG_BLK_CPQ_CISS_DA is not set | 487 | # CONFIG_BLK_CPQ_CISS_DA is not set |
| 460 | # CONFIG_BLK_DEV_DAC960 is not set | 488 | # CONFIG_BLK_DEV_DAC960 is not set |
| @@ -471,12 +499,14 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
| 471 | # CONFIG_BLK_DEV_XIP is not set | 499 | # CONFIG_BLK_DEV_XIP is not set |
| 472 | # CONFIG_CDROM_PKTCDVD is not set | 500 | # CONFIG_CDROM_PKTCDVD is not set |
| 473 | # CONFIG_ATA_OVER_ETH is not set | 501 | # CONFIG_ATA_OVER_ETH is not set |
| 502 | # CONFIG_BLK_DEV_HD is not set | ||
| 474 | CONFIG_MISC_DEVICES=y | 503 | CONFIG_MISC_DEVICES=y |
| 475 | # CONFIG_PHANTOM is not set | 504 | # CONFIG_PHANTOM is not set |
| 476 | # CONFIG_EEPROM_93CX6 is not set | 505 | # CONFIG_EEPROM_93CX6 is not set |
| 477 | # CONFIG_SGI_IOC4 is not set | 506 | # CONFIG_SGI_IOC4 is not set |
| 478 | # CONFIG_TIFM_CORE is not set | 507 | # CONFIG_TIFM_CORE is not set |
| 479 | # CONFIG_ENCLOSURE_SERVICES is not set | 508 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 509 | # CONFIG_HP_ILO is not set | ||
| 480 | CONFIG_HAVE_IDE=y | 510 | CONFIG_HAVE_IDE=y |
| 481 | # CONFIG_IDE is not set | 511 | # CONFIG_IDE is not set |
| 482 | 512 | ||
| @@ -553,7 +583,10 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 553 | # CONFIG_SCSI_DC390T is not set | 583 | # CONFIG_SCSI_DC390T is not set |
| 554 | # CONFIG_SCSI_NSP32 is not set | 584 | # CONFIG_SCSI_NSP32 is not set |
| 555 | # CONFIG_SCSI_DEBUG is not set | 585 | # CONFIG_SCSI_DEBUG is not set |
| 586 | # CONFIG_SCSI_MESH is not set | ||
| 587 | # CONFIG_SCSI_MAC53C94 is not set | ||
| 556 | # CONFIG_SCSI_SRP is not set | 588 | # CONFIG_SCSI_SRP is not set |
| 589 | # CONFIG_SCSI_DH is not set | ||
| 557 | # CONFIG_ATA is not set | 590 | # CONFIG_ATA is not set |
| 558 | CONFIG_MD=y | 591 | CONFIG_MD=y |
| 559 | CONFIG_BLK_DEV_MD=y | 592 | CONFIG_BLK_DEV_MD=y |
| @@ -570,12 +603,15 @@ CONFIG_MD_RAID1=y | |||
| 570 | # | 603 | # |
| 571 | # IEEE 1394 (FireWire) support | 604 | # IEEE 1394 (FireWire) support |
| 572 | # | 605 | # |
| 606 | |||
| 607 | # | ||
| 608 | # Enable only one of the two stacks, unless you know what you are doing | ||
| 609 | # | ||
| 573 | # CONFIG_FIREWIRE is not set | 610 | # CONFIG_FIREWIRE is not set |
| 574 | # CONFIG_IEEE1394 is not set | 611 | # CONFIG_IEEE1394 is not set |
| 575 | # CONFIG_I2O is not set | 612 | # CONFIG_I2O is not set |
| 576 | # CONFIG_MACINTOSH_DRIVERS is not set | 613 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 577 | CONFIG_NETDEVICES=y | 614 | CONFIG_NETDEVICES=y |
| 578 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 579 | # CONFIG_DUMMY is not set | 615 | # CONFIG_DUMMY is not set |
| 580 | # CONFIG_BONDING is not set | 616 | # CONFIG_BONDING is not set |
| 581 | # CONFIG_MACVLAN is not set | 617 | # CONFIG_MACVLAN is not set |
| @@ -602,6 +638,8 @@ CONFIG_CICADA_PHY=y | |||
| 602 | # CONFIG_MDIO_BITBANG is not set | 638 | # CONFIG_MDIO_BITBANG is not set |
| 603 | CONFIG_NET_ETHERNET=y | 639 | CONFIG_NET_ETHERNET=y |
| 604 | CONFIG_MII=y | 640 | CONFIG_MII=y |
| 641 | # CONFIG_MACE is not set | ||
| 642 | # CONFIG_BMAC is not set | ||
| 605 | # CONFIG_HAPPYMEAL is not set | 643 | # CONFIG_HAPPYMEAL is not set |
| 606 | # CONFIG_SUNGEM is not set | 644 | # CONFIG_SUNGEM is not set |
| 607 | # CONFIG_CASSINI is not set | 645 | # CONFIG_CASSINI is not set |
| @@ -638,7 +676,6 @@ CONFIG_NETDEV_1000=y | |||
| 638 | # CONFIG_DL2K is not set | 676 | # CONFIG_DL2K is not set |
| 639 | # CONFIG_E1000 is not set | 677 | # CONFIG_E1000 is not set |
| 640 | # CONFIG_E1000E is not set | 678 | # CONFIG_E1000E is not set |
| 641 | # CONFIG_E1000E_ENABLED is not set | ||
| 642 | # CONFIG_IP1000 is not set | 679 | # CONFIG_IP1000 is not set |
| 643 | # CONFIG_IGB is not set | 680 | # CONFIG_IGB is not set |
| 644 | # CONFIG_NS83820 is not set | 681 | # CONFIG_NS83820 is not set |
| @@ -652,9 +689,10 @@ CONFIG_NETDEV_1000=y | |||
| 652 | # CONFIG_TIGON3 is not set | 689 | # CONFIG_TIGON3 is not set |
| 653 | # CONFIG_BNX2 is not set | 690 | # CONFIG_BNX2 is not set |
| 654 | CONFIG_GIANFAR=y | 691 | CONFIG_GIANFAR=y |
| 655 | CONFIG_GFAR_NAPI=y | 692 | # CONFIG_MV643XX_ETH is not set |
| 656 | # CONFIG_QLA3XXX is not set | 693 | # CONFIG_QLA3XXX is not set |
| 657 | # CONFIG_ATL1 is not set | 694 | # CONFIG_ATL1 is not set |
| 695 | # CONFIG_ATL1E is not set | ||
| 658 | CONFIG_NETDEV_10000=y | 696 | CONFIG_NETDEV_10000=y |
| 659 | # CONFIG_CHELSIO_T1 is not set | 697 | # CONFIG_CHELSIO_T1 is not set |
| 660 | # CONFIG_CHELSIO_T3 is not set | 698 | # CONFIG_CHELSIO_T3 is not set |
| @@ -752,11 +790,14 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
| 752 | # CONFIG_SERIAL_UARTLITE is not set | 790 | # CONFIG_SERIAL_UARTLITE is not set |
| 753 | CONFIG_SERIAL_CORE=y | 791 | CONFIG_SERIAL_CORE=y |
| 754 | CONFIG_SERIAL_CORE_CONSOLE=y | 792 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 793 | # CONFIG_SERIAL_PMACZILOG is not set | ||
| 755 | # CONFIG_SERIAL_JSM is not set | 794 | # CONFIG_SERIAL_JSM is not set |
| 756 | # CONFIG_SERIAL_OF_PLATFORM is not set | 795 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 757 | CONFIG_UNIX98_PTYS=y | 796 | CONFIG_UNIX98_PTYS=y |
| 758 | CONFIG_LEGACY_PTYS=y | 797 | CONFIG_LEGACY_PTYS=y |
| 759 | CONFIG_LEGACY_PTY_COUNT=256 | 798 | CONFIG_LEGACY_PTY_COUNT=256 |
| 799 | # CONFIG_BRIQ_PANEL is not set | ||
| 800 | # CONFIG_HVC_RTAS is not set | ||
| 760 | # CONFIG_IPMI_HANDLER is not set | 801 | # CONFIG_IPMI_HANDLER is not set |
| 761 | CONFIG_HW_RANDOM=y | 802 | CONFIG_HW_RANDOM=y |
| 762 | # CONFIG_NVRAM is not set | 803 | # CONFIG_NVRAM is not set |
| @@ -768,43 +809,70 @@ CONFIG_DEVPORT=y | |||
| 768 | CONFIG_I2C=y | 809 | CONFIG_I2C=y |
| 769 | CONFIG_I2C_BOARDINFO=y | 810 | CONFIG_I2C_BOARDINFO=y |
| 770 | CONFIG_I2C_CHARDEV=y | 811 | CONFIG_I2C_CHARDEV=y |
| 812 | CONFIG_I2C_HELPER_AUTO=y | ||
| 771 | 813 | ||
| 772 | # | 814 | # |
| 773 | # I2C Hardware Bus support | 815 | # I2C Hardware Bus support |
| 774 | # | 816 | # |
| 817 | |||
| 818 | # | ||
| 819 | # PC SMBus host controller drivers | ||
| 820 | # | ||
| 775 | # CONFIG_I2C_ALI1535 is not set | 821 | # CONFIG_I2C_ALI1535 is not set |
| 776 | # CONFIG_I2C_ALI1563 is not set | 822 | # CONFIG_I2C_ALI1563 is not set |
| 777 | # CONFIG_I2C_ALI15X3 is not set | 823 | # CONFIG_I2C_ALI15X3 is not set |
| 778 | # CONFIG_I2C_AMD756 is not set | 824 | # CONFIG_I2C_AMD756 is not set |
| 779 | # CONFIG_I2C_AMD8111 is not set | 825 | # CONFIG_I2C_AMD8111 is not set |
| 780 | # CONFIG_I2C_I801 is not set | 826 | # CONFIG_I2C_I801 is not set |
| 781 | # CONFIG_I2C_I810 is not set | 827 | # CONFIG_I2C_ISCH is not set |
| 782 | # CONFIG_I2C_PIIX4 is not set | 828 | # CONFIG_I2C_PIIX4 is not set |
| 783 | CONFIG_I2C_MPC=y | ||
| 784 | # CONFIG_I2C_NFORCE2 is not set | 829 | # CONFIG_I2C_NFORCE2 is not set |
| 785 | # CONFIG_I2C_OCORES is not set | ||
| 786 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 787 | # CONFIG_I2C_PROSAVAGE is not set | ||
| 788 | # CONFIG_I2C_SAVAGE4 is not set | ||
| 789 | # CONFIG_I2C_SIMTEC is not set | ||
| 790 | # CONFIG_I2C_SIS5595 is not set | 830 | # CONFIG_I2C_SIS5595 is not set |
| 791 | # CONFIG_I2C_SIS630 is not set | 831 | # CONFIG_I2C_SIS630 is not set |
| 792 | # CONFIG_I2C_SIS96X is not set | 832 | # CONFIG_I2C_SIS96X is not set |
| 793 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 794 | # CONFIG_I2C_STUB is not set | ||
| 795 | # CONFIG_I2C_TINY_USB is not set | ||
| 796 | # CONFIG_I2C_VIA is not set | 833 | # CONFIG_I2C_VIA is not set |
| 797 | # CONFIG_I2C_VIAPRO is not set | 834 | # CONFIG_I2C_VIAPRO is not set |
| 835 | |||
| 836 | # | ||
| 837 | # Mac SMBus host controller drivers | ||
| 838 | # | ||
| 839 | # CONFIG_I2C_HYDRA is not set | ||
| 840 | CONFIG_I2C_POWERMAC=y | ||
| 841 | |||
| 842 | # | ||
| 843 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 844 | # | ||
| 845 | CONFIG_I2C_MPC=y | ||
| 846 | # CONFIG_I2C_OCORES is not set | ||
| 847 | # CONFIG_I2C_SIMTEC is not set | ||
| 848 | |||
| 849 | # | ||
| 850 | # External I2C/SMBus adapter drivers | ||
| 851 | # | ||
| 852 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 853 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 854 | # CONFIG_I2C_TINY_USB is not set | ||
| 855 | |||
| 856 | # | ||
| 857 | # Graphics adapter I2C/DDC channel drivers | ||
| 858 | # | ||
| 798 | # CONFIG_I2C_VOODOO3 is not set | 859 | # CONFIG_I2C_VOODOO3 is not set |
| 860 | |||
| 861 | # | ||
| 862 | # Other I2C/SMBus bus drivers | ||
| 863 | # | ||
| 799 | # CONFIG_I2C_PCA_PLATFORM is not set | 864 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 865 | # CONFIG_I2C_STUB is not set | ||
| 800 | 866 | ||
| 801 | # | 867 | # |
| 802 | # Miscellaneous I2C Chip support | 868 | # Miscellaneous I2C Chip support |
| 803 | # | 869 | # |
| 804 | # CONFIG_DS1682 is not set | 870 | # CONFIG_DS1682 is not set |
| 871 | # CONFIG_AT24 is not set | ||
| 805 | # CONFIG_SENSORS_EEPROM is not set | 872 | # CONFIG_SENSORS_EEPROM is not set |
| 806 | # CONFIG_SENSORS_PCF8574 is not set | 873 | # CONFIG_SENSORS_PCF8574 is not set |
| 807 | # CONFIG_PCF8575 is not set | 874 | # CONFIG_PCF8575 is not set |
| 875 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 808 | # CONFIG_SENSORS_PCF8591 is not set | 876 | # CONFIG_SENSORS_PCF8591 is not set |
| 809 | # CONFIG_SENSORS_MAX6875 is not set | 877 | # CONFIG_SENSORS_MAX6875 is not set |
| 810 | # CONFIG_SENSORS_TSL2550 is not set | 878 | # CONFIG_SENSORS_TSL2550 is not set |
| @@ -828,11 +896,15 @@ CONFIG_SPI_MPC83xx=y | |||
| 828 | # CONFIG_SPI_AT25 is not set | 896 | # CONFIG_SPI_AT25 is not set |
| 829 | # CONFIG_SPI_SPIDEV is not set | 897 | # CONFIG_SPI_SPIDEV is not set |
| 830 | # CONFIG_SPI_TLE62X0 is not set | 898 | # CONFIG_SPI_TLE62X0 is not set |
| 899 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 900 | # CONFIG_GPIOLIB is not set | ||
| 831 | # CONFIG_W1 is not set | 901 | # CONFIG_W1 is not set |
| 832 | # CONFIG_POWER_SUPPLY is not set | 902 | # CONFIG_POWER_SUPPLY is not set |
| 833 | CONFIG_HWMON=y | 903 | CONFIG_HWMON=y |
| 834 | # CONFIG_HWMON_VID is not set | 904 | # CONFIG_HWMON_VID is not set |
| 905 | # CONFIG_SENSORS_AD7414 is not set | ||
| 835 | # CONFIG_SENSORS_AD7418 is not set | 906 | # CONFIG_SENSORS_AD7418 is not set |
| 907 | # CONFIG_SENSORS_ADCXX is not set | ||
| 836 | # CONFIG_SENSORS_ADM1021 is not set | 908 | # CONFIG_SENSORS_ADM1021 is not set |
| 837 | # CONFIG_SENSORS_ADM1025 is not set | 909 | # CONFIG_SENSORS_ADM1025 is not set |
| 838 | # CONFIG_SENSORS_ADM1026 is not set | 910 | # CONFIG_SENSORS_ADM1026 is not set |
| @@ -841,6 +913,7 @@ CONFIG_HWMON=y | |||
| 841 | # CONFIG_SENSORS_ADM9240 is not set | 913 | # CONFIG_SENSORS_ADM9240 is not set |
| 842 | # CONFIG_SENSORS_ADT7470 is not set | 914 | # CONFIG_SENSORS_ADT7470 is not set |
| 843 | # CONFIG_SENSORS_ADT7473 is not set | 915 | # CONFIG_SENSORS_ADT7473 is not set |
| 916 | # CONFIG_SENSORS_AMS is not set | ||
| 844 | # CONFIG_SENSORS_ATXP1 is not set | 917 | # CONFIG_SENSORS_ATXP1 is not set |
| 845 | # CONFIG_SENSORS_DS1621 is not set | 918 | # CONFIG_SENSORS_DS1621 is not set |
| 846 | # CONFIG_SENSORS_I5K_AMB is not set | 919 | # CONFIG_SENSORS_I5K_AMB is not set |
| @@ -886,6 +959,7 @@ CONFIG_HWMON=y | |||
| 886 | # CONFIG_SENSORS_W83627EHF is not set | 959 | # CONFIG_SENSORS_W83627EHF is not set |
| 887 | # CONFIG_HWMON_DEBUG_CHIP is not set | 960 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 888 | # CONFIG_THERMAL is not set | 961 | # CONFIG_THERMAL is not set |
| 962 | # CONFIG_THERMAL_HWMON is not set | ||
| 889 | CONFIG_WATCHDOG=y | 963 | CONFIG_WATCHDOG=y |
| 890 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 964 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
| 891 | 965 | ||
| @@ -893,7 +967,9 @@ CONFIG_WATCHDOG=y | |||
| 893 | # Watchdog Device Drivers | 967 | # Watchdog Device Drivers |
| 894 | # | 968 | # |
| 895 | # CONFIG_SOFT_WATCHDOG is not set | 969 | # CONFIG_SOFT_WATCHDOG is not set |
| 896 | CONFIG_83xx_WDT=y | 970 | # CONFIG_ALIM7101_WDT is not set |
| 971 | # CONFIG_8xxx_WDT is not set | ||
| 972 | # CONFIG_WATCHDOG_RTAS is not set | ||
| 897 | 973 | ||
| 898 | # | 974 | # |
| 899 | # PCI-based Watchdog Cards | 975 | # PCI-based Watchdog Cards |
| @@ -915,8 +991,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 915 | # | 991 | # |
| 916 | # Multifunction device drivers | 992 | # Multifunction device drivers |
| 917 | # | 993 | # |
| 994 | # CONFIG_MFD_CORE is not set | ||
| 918 | # CONFIG_MFD_SM501 is not set | 995 | # CONFIG_MFD_SM501 is not set |
| 919 | # CONFIG_HTC_PASIC3 is not set | 996 | # CONFIG_HTC_PASIC3 is not set |
| 997 | # CONFIG_MFD_TMIO is not set | ||
| 920 | 998 | ||
| 921 | # | 999 | # |
| 922 | # Multimedia devices | 1000 | # Multimedia devices |
| @@ -949,10 +1027,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m | |||
| 949 | # Display device support | 1027 | # Display device support |
| 950 | # | 1028 | # |
| 951 | # CONFIG_DISPLAY_SUPPORT is not set | 1029 | # CONFIG_DISPLAY_SUPPORT is not set |
| 952 | |||
| 953 | # | ||
| 954 | # Sound | ||
| 955 | # | ||
| 956 | # CONFIG_SOUND is not set | 1030 | # CONFIG_SOUND is not set |
| 957 | CONFIG_HID_SUPPORT=y | 1031 | CONFIG_HID_SUPPORT=y |
| 958 | CONFIG_HID=y | 1032 | CONFIG_HID=y |
| @@ -986,6 +1060,7 @@ CONFIG_USB_DEVICE_CLASS=y | |||
| 986 | # CONFIG_USB_OTG is not set | 1060 | # CONFIG_USB_OTG is not set |
| 987 | # CONFIG_USB_OTG_WHITELIST is not set | 1061 | # CONFIG_USB_OTG_WHITELIST is not set |
| 988 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 1062 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
| 1063 | CONFIG_USB_MON=y | ||
| 989 | 1064 | ||
| 990 | # | 1065 | # |
| 991 | # USB Host Controller Drivers | 1066 | # USB Host Controller Drivers |
| @@ -1009,6 +1084,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 1009 | CONFIG_USB_UHCI_HCD=y | 1084 | CONFIG_USB_UHCI_HCD=y |
| 1010 | # CONFIG_USB_SL811_HCD is not set | 1085 | # CONFIG_USB_SL811_HCD is not set |
| 1011 | # CONFIG_USB_R8A66597_HCD is not set | 1086 | # CONFIG_USB_R8A66597_HCD is not set |
| 1087 | # CONFIG_USB_GADGET_MUSB_HDRC is not set | ||
| 1012 | 1088 | ||
| 1013 | # | 1089 | # |
| 1014 | # USB Device Class drivers | 1090 | # USB Device Class drivers |
| @@ -1037,6 +1113,7 @@ CONFIG_USB_STORAGE=y | |||
| 1037 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1113 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1038 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1114 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
| 1039 | # CONFIG_USB_STORAGE_KARMA is not set | 1115 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1116 | # CONFIG_USB_STORAGE_SIERRA is not set | ||
| 1040 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | 1117 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
| 1041 | # CONFIG_USB_LIBUSUAL is not set | 1118 | # CONFIG_USB_LIBUSUAL is not set |
| 1042 | 1119 | ||
| @@ -1045,7 +1122,6 @@ CONFIG_USB_STORAGE=y | |||
| 1045 | # | 1122 | # |
| 1046 | # CONFIG_USB_MDC800 is not set | 1123 | # CONFIG_USB_MDC800 is not set |
| 1047 | # CONFIG_USB_MICROTEK is not set | 1124 | # CONFIG_USB_MICROTEK is not set |
| 1048 | CONFIG_USB_MON=y | ||
| 1049 | 1125 | ||
| 1050 | # | 1126 | # |
| 1051 | # USB port drivers | 1127 | # USB port drivers |
| @@ -1058,7 +1134,6 @@ CONFIG_USB_MON=y | |||
| 1058 | # CONFIG_USB_EMI62 is not set | 1134 | # CONFIG_USB_EMI62 is not set |
| 1059 | # CONFIG_USB_EMI26 is not set | 1135 | # CONFIG_USB_EMI26 is not set |
| 1060 | # CONFIG_USB_ADUTUX is not set | 1136 | # CONFIG_USB_ADUTUX is not set |
| 1061 | # CONFIG_USB_AUERSWALD is not set | ||
| 1062 | # CONFIG_USB_RIO500 is not set | 1137 | # CONFIG_USB_RIO500 is not set |
| 1063 | # CONFIG_USB_LEGOTOWER is not set | 1138 | # CONFIG_USB_LEGOTOWER is not set |
| 1064 | # CONFIG_USB_LCD is not set | 1139 | # CONFIG_USB_LCD is not set |
| @@ -1085,7 +1160,7 @@ CONFIG_USB_GADGET_SELECTED=y | |||
| 1085 | # CONFIG_USB_GADGET_FSL_USB2 is not set | 1160 | # CONFIG_USB_GADGET_FSL_USB2 is not set |
| 1086 | CONFIG_USB_GADGET_NET2280=y | 1161 | CONFIG_USB_GADGET_NET2280=y |
| 1087 | CONFIG_USB_NET2280=y | 1162 | CONFIG_USB_NET2280=y |
| 1088 | # CONFIG_USB_GADGET_PXA2XX is not set | 1163 | # CONFIG_USB_GADGET_PXA25X is not set |
| 1089 | # CONFIG_USB_GADGET_M66592 is not set | 1164 | # CONFIG_USB_GADGET_M66592 is not set |
| 1090 | # CONFIG_USB_GADGET_PXA27X is not set | 1165 | # CONFIG_USB_GADGET_PXA27X is not set |
| 1091 | # CONFIG_USB_GADGET_GOKU is not set | 1166 | # CONFIG_USB_GADGET_GOKU is not set |
| @@ -1103,6 +1178,7 @@ CONFIG_USB_ETH_RNDIS=y | |||
| 1103 | # CONFIG_USB_G_SERIAL is not set | 1178 | # CONFIG_USB_G_SERIAL is not set |
| 1104 | # CONFIG_USB_MIDI_GADGET is not set | 1179 | # CONFIG_USB_MIDI_GADGET is not set |
| 1105 | # CONFIG_USB_G_PRINTER is not set | 1180 | # CONFIG_USB_G_PRINTER is not set |
| 1181 | # CONFIG_USB_CDC_COMPOSITE is not set | ||
| 1106 | # CONFIG_MMC is not set | 1182 | # CONFIG_MMC is not set |
| 1107 | # CONFIG_MEMSTICK is not set | 1183 | # CONFIG_MEMSTICK is not set |
| 1108 | # CONFIG_NEW_LEDS is not set | 1184 | # CONFIG_NEW_LEDS is not set |
| @@ -1138,10 +1214,13 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 1138 | # CONFIG_RTC_DRV_PCF8583 is not set | 1214 | # CONFIG_RTC_DRV_PCF8583 is not set |
| 1139 | # CONFIG_RTC_DRV_M41T80 is not set | 1215 | # CONFIG_RTC_DRV_M41T80 is not set |
| 1140 | # CONFIG_RTC_DRV_S35390A is not set | 1216 | # CONFIG_RTC_DRV_S35390A is not set |
| 1217 | # CONFIG_RTC_DRV_FM3130 is not set | ||
| 1141 | 1218 | ||
| 1142 | # | 1219 | # |
| 1143 | # SPI RTC drivers | 1220 | # SPI RTC drivers |
| 1144 | # | 1221 | # |
| 1222 | # CONFIG_RTC_DRV_M41T94 is not set | ||
| 1223 | # CONFIG_RTC_DRV_DS1305 is not set | ||
| 1145 | # CONFIG_RTC_DRV_MAX6902 is not set | 1224 | # CONFIG_RTC_DRV_MAX6902 is not set |
| 1146 | # CONFIG_RTC_DRV_R9701 is not set | 1225 | # CONFIG_RTC_DRV_R9701 is not set |
| 1147 | # CONFIG_RTC_DRV_RS5C348 is not set | 1226 | # CONFIG_RTC_DRV_RS5C348 is not set |
| @@ -1240,6 +1319,7 @@ CONFIG_JFFS2_RTIME=y | |||
| 1240 | # CONFIG_CRAMFS is not set | 1319 | # CONFIG_CRAMFS is not set |
| 1241 | # CONFIG_VXFS_FS is not set | 1320 | # CONFIG_VXFS_FS is not set |
| 1242 | # CONFIG_MINIX_FS is not set | 1321 | # CONFIG_MINIX_FS is not set |
| 1322 | # CONFIG_OMFS_FS is not set | ||
| 1243 | # CONFIG_HPFS_FS is not set | 1323 | # CONFIG_HPFS_FS is not set |
| 1244 | # CONFIG_QNX4FS_FS is not set | 1324 | # CONFIG_QNX4FS_FS is not set |
| 1245 | # CONFIG_ROMFS_FS is not set | 1325 | # CONFIG_ROMFS_FS is not set |
| @@ -1250,14 +1330,13 @@ CONFIG_NFS_FS=y | |||
| 1250 | CONFIG_NFS_V3=y | 1330 | CONFIG_NFS_V3=y |
| 1251 | # CONFIG_NFS_V3_ACL is not set | 1331 | # CONFIG_NFS_V3_ACL is not set |
| 1252 | CONFIG_NFS_V4=y | 1332 | CONFIG_NFS_V4=y |
| 1253 | # CONFIG_NFSD is not set | ||
| 1254 | CONFIG_ROOT_NFS=y | 1333 | CONFIG_ROOT_NFS=y |
| 1334 | # CONFIG_NFSD is not set | ||
| 1255 | CONFIG_LOCKD=y | 1335 | CONFIG_LOCKD=y |
| 1256 | CONFIG_LOCKD_V4=y | 1336 | CONFIG_LOCKD_V4=y |
| 1257 | CONFIG_NFS_COMMON=y | 1337 | CONFIG_NFS_COMMON=y |
| 1258 | CONFIG_SUNRPC=y | 1338 | CONFIG_SUNRPC=y |
| 1259 | CONFIG_SUNRPC_GSS=y | 1339 | CONFIG_SUNRPC_GSS=y |
| 1260 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 1261 | CONFIG_RPCSEC_GSS_KRB5=y | 1340 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1262 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1341 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1263 | # CONFIG_SMB_FS is not set | 1342 | # CONFIG_SMB_FS is not set |
| @@ -1297,6 +1376,7 @@ CONFIG_BITREVERSE=y | |||
| 1297 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1376 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 1298 | # CONFIG_CRC_CCITT is not set | 1377 | # CONFIG_CRC_CCITT is not set |
| 1299 | # CONFIG_CRC16 is not set | 1378 | # CONFIG_CRC16 is not set |
| 1379 | # CONFIG_CRC_T10DIF is not set | ||
| 1300 | # CONFIG_CRC_ITU_T is not set | 1380 | # CONFIG_CRC_ITU_T is not set |
| 1301 | CONFIG_CRC32=y | 1381 | CONFIG_CRC32=y |
| 1302 | # CONFIG_CRC7 is not set | 1382 | # CONFIG_CRC7 is not set |
| @@ -1323,6 +1403,8 @@ CONFIG_FRAME_WARN=1024 | |||
| 1323 | CONFIG_DEBUG_KERNEL=y | 1403 | CONFIG_DEBUG_KERNEL=y |
| 1324 | # CONFIG_DEBUG_SHIRQ is not set | 1404 | # CONFIG_DEBUG_SHIRQ is not set |
| 1325 | CONFIG_DETECT_SOFTLOCKUP=y | 1405 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1406 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 1407 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 1326 | CONFIG_SCHED_DEBUG=y | 1408 | CONFIG_SCHED_DEBUG=y |
| 1327 | # CONFIG_SCHEDSTATS is not set | 1409 | # CONFIG_SCHEDSTATS is not set |
| 1328 | # CONFIG_TIMER_STATS is not set | 1410 | # CONFIG_TIMER_STATS is not set |
| @@ -1340,19 +1422,32 @@ CONFIG_SCHED_DEBUG=y | |||
| 1340 | # CONFIG_DEBUG_INFO is not set | 1422 | # CONFIG_DEBUG_INFO is not set |
| 1341 | # CONFIG_DEBUG_VM is not set | 1423 | # CONFIG_DEBUG_VM is not set |
| 1342 | # CONFIG_DEBUG_WRITECOUNT is not set | 1424 | # CONFIG_DEBUG_WRITECOUNT is not set |
| 1425 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 1343 | # CONFIG_DEBUG_LIST is not set | 1426 | # CONFIG_DEBUG_LIST is not set |
| 1344 | # CONFIG_DEBUG_SG is not set | 1427 | # CONFIG_DEBUG_SG is not set |
| 1345 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1428 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 1346 | # CONFIG_RCU_TORTURE_TEST is not set | 1429 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1347 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1430 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 1348 | # CONFIG_FAULT_INJECTION is not set | 1431 | # CONFIG_FAULT_INJECTION is not set |
| 1432 | # CONFIG_LATENCYTOP is not set | ||
| 1433 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1434 | CONFIG_HAVE_FTRACE=y | ||
| 1435 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1436 | # CONFIG_FTRACE is not set | ||
| 1437 | # CONFIG_SCHED_TRACER is not set | ||
| 1438 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1349 | # CONFIG_SAMPLES is not set | 1439 | # CONFIG_SAMPLES is not set |
| 1440 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1441 | # CONFIG_KGDB is not set | ||
| 1350 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1442 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
| 1351 | # CONFIG_DEBUG_STACK_USAGE is not set | 1443 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1352 | # CONFIG_DEBUG_PAGEALLOC is not set | 1444 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1353 | # CONFIG_DEBUGGER is not set | 1445 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
| 1446 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
| 1447 | # CONFIG_XMON is not set | ||
| 1354 | # CONFIG_IRQSTACKS is not set | 1448 | # CONFIG_IRQSTACKS is not set |
| 1355 | # CONFIG_BDI_SWITCH is not set | 1449 | # CONFIG_BDI_SWITCH is not set |
| 1450 | # CONFIG_BOOTX_TEXT is not set | ||
| 1356 | # CONFIG_PPC_EARLY_DEBUG is not set | 1451 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1357 | 1452 | ||
| 1358 | # | 1453 | # |
| @@ -1406,6 +1501,10 @@ CONFIG_CRYPTO_PCBC=m | |||
| 1406 | # CONFIG_CRYPTO_MD4 is not set | 1501 | # CONFIG_CRYPTO_MD4 is not set |
| 1407 | CONFIG_CRYPTO_MD5=y | 1502 | CONFIG_CRYPTO_MD5=y |
| 1408 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1503 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 1504 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1505 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1506 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1507 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1409 | # CONFIG_CRYPTO_SHA1 is not set | 1508 | # CONFIG_CRYPTO_SHA1 is not set |
| 1410 | # CONFIG_CRYPTO_SHA256 is not set | 1509 | # CONFIG_CRYPTO_SHA256 is not set |
| 1411 | # CONFIG_CRYPTO_SHA512 is not set | 1510 | # CONFIG_CRYPTO_SHA512 is not set |
| @@ -1438,5 +1537,6 @@ CONFIG_CRYPTO_DES=y | |||
| 1438 | # CONFIG_CRYPTO_LZO is not set | 1537 | # CONFIG_CRYPTO_LZO is not set |
| 1439 | CONFIG_CRYPTO_HW=y | 1538 | CONFIG_CRYPTO_HW=y |
| 1440 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1539 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1540 | # CONFIG_CRYPTO_DEV_TALITOS is not set | ||
| 1441 | # CONFIG_PPC_CLOCK is not set | 1541 | # CONFIG_PPC_CLOCK is not set |
| 1442 | # CONFIG_VIRTUALIZATION is not set | 1542 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig index 9bc3a03ae264..dd80eb0a87a1 100644 --- a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig +++ b/arch/powerpc/configs/83xx/mpc8315_rdb_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.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Mon Jun 9 08:52:21 2008 | 4 | # Thu Aug 21 00:52:18 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -16,6 +16,7 @@ CONFIG_6xx=y | |||
| 16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
| 17 | CONFIG_PPC_FPU=y | 17 | CONFIG_PPC_FPU=y |
| 18 | # CONFIG_FSL_EMB_PERFMON is not set | 18 | # CONFIG_FSL_EMB_PERFMON is not set |
| 19 | # CONFIG_ALTIVEC is not set | ||
| 19 | CONFIG_PPC_STD_MMU=y | 20 | CONFIG_PPC_STD_MMU=y |
| 20 | CONFIG_PPC_STD_MMU_32=y | 21 | CONFIG_PPC_STD_MMU_32=y |
| 21 | # CONFIG_PPC_MM_SLICES is not set | 22 | # CONFIG_PPC_MM_SLICES is not set |
| @@ -32,6 +33,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | 35 | CONFIG_STACKTRACE_SUPPORT=y |
| 36 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | 37 | CONFIG_LOCKDEP_SUPPORT=y |
| 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 39 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| @@ -51,6 +53,9 @@ CONFIG_PPC_UDBG_16550=y | |||
| 51 | CONFIG_AUDIT_ARCH=y | 53 | CONFIG_AUDIT_ARCH=y |
| 52 | CONFIG_GENERIC_BUG=y | 54 | CONFIG_GENERIC_BUG=y |
| 53 | CONFIG_DEFAULT_UIMAGE=y | 55 | CONFIG_DEFAULT_UIMAGE=y |
| 56 | CONFIG_HIBERNATE_32=y | ||
| 57 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
| 58 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
| 54 | # CONFIG_PPC_DCR_NATIVE is not set | 59 | # CONFIG_PPC_DCR_NATIVE is not set |
| 55 | # CONFIG_PPC_DCR_MMIO is not set | 60 | # CONFIG_PPC_DCR_MMIO is not set |
| 56 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 61 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| @@ -88,12 +93,12 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 88 | CONFIG_SYSCTL=y | 93 | CONFIG_SYSCTL=y |
| 89 | CONFIG_EMBEDDED=y | 94 | CONFIG_EMBEDDED=y |
| 90 | CONFIG_SYSCTL_SYSCALL=y | 95 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 92 | # CONFIG_KALLSYMS is not set | 96 | # CONFIG_KALLSYMS is not set |
| 93 | CONFIG_HOTPLUG=y | 97 | CONFIG_HOTPLUG=y |
| 94 | CONFIG_PRINTK=y | 98 | CONFIG_PRINTK=y |
| 95 | CONFIG_BUG=y | 99 | CONFIG_BUG=y |
| 96 | CONFIG_ELF_CORE=y | 100 | CONFIG_ELF_CORE=y |
| 101 | CONFIG_PCSPKR_PLATFORM=y | ||
| 97 | CONFIG_COMPAT_BRK=y | 102 | CONFIG_COMPAT_BRK=y |
| 98 | CONFIG_BASE_FULL=y | 103 | CONFIG_BASE_FULL=y |
| 99 | CONFIG_FUTEX=y | 104 | CONFIG_FUTEX=y |
| @@ -111,10 +116,16 @@ CONFIG_SLUB=y | |||
| 111 | # CONFIG_PROFILING is not set | 116 | # CONFIG_PROFILING is not set |
| 112 | # CONFIG_MARKERS is not set | 117 | # CONFIG_MARKERS is not set |
| 113 | CONFIG_HAVE_OPROFILE=y | 118 | CONFIG_HAVE_OPROFILE=y |
| 119 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 120 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 114 | CONFIG_HAVE_KPROBES=y | 121 | CONFIG_HAVE_KPROBES=y |
| 115 | CONFIG_HAVE_KRETPROBES=y | 122 | CONFIG_HAVE_KRETPROBES=y |
| 123 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 116 | # CONFIG_HAVE_DMA_ATTRS is not set | 124 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 125 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 126 | # CONFIG_HAVE_CLK is not set | ||
| 117 | CONFIG_PROC_PAGE_MONITOR=y | 127 | CONFIG_PROC_PAGE_MONITOR=y |
| 128 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 118 | CONFIG_SLABINFO=y | 129 | CONFIG_SLABINFO=y |
| 119 | CONFIG_RT_MUTEXES=y | 130 | CONFIG_RT_MUTEXES=y |
| 120 | # CONFIG_TINY_SHMEM is not set | 131 | # CONFIG_TINY_SHMEM is not set |
| @@ -125,12 +136,13 @@ CONFIG_MODULE_UNLOAD=y | |||
| 125 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 136 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 126 | # CONFIG_MODVERSIONS is not set | 137 | # CONFIG_MODVERSIONS is not set |
| 127 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 138 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 128 | # CONFIG_KMOD is not set | 139 | CONFIG_KMOD=y |
| 129 | CONFIG_BLOCK=y | 140 | CONFIG_BLOCK=y |
| 130 | # CONFIG_LBD is not set | 141 | # CONFIG_LBD is not set |
| 131 | # CONFIG_BLK_DEV_IO_TRACE is not set | 142 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 132 | # CONFIG_LSF is not set | 143 | # CONFIG_LSF is not set |
| 133 | # CONFIG_BLK_DEV_BSG is not set | 144 | # CONFIG_BLK_DEV_BSG is not set |
| 145 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 134 | 146 | ||
| 135 | # | 147 | # |
| 136 | # IO Schedulers | 148 | # IO Schedulers |
| @@ -149,37 +161,49 @@ CONFIG_CLASSIC_RCU=y | |||
| 149 | # | 161 | # |
| 150 | # Platform support | 162 | # Platform support |
| 151 | # | 163 | # |
| 152 | # CONFIG_PPC_MULTIPLATFORM is not set | 164 | CONFIG_PPC_MULTIPLATFORM=y |
| 153 | # CONFIG_PPC_82xx is not set | 165 | CONFIG_CLASSIC32=y |
| 154 | CONFIG_PPC_83xx=y | 166 | CONFIG_PPC_CHRP=y |
| 155 | # CONFIG_PPC_86xx is not set | 167 | # CONFIG_MPC5121_ADS is not set |
| 156 | # CONFIG_PPC_MPC512x is not set | 168 | # CONFIG_MPC5121_GENERIC is not set |
| 157 | # CONFIG_PPC_MPC5121 is not set | 169 | # CONFIG_PPC_MPC52xx is not set |
| 170 | CONFIG_PPC_PMAC=y | ||
| 158 | # CONFIG_PPC_CELL is not set | 171 | # CONFIG_PPC_CELL is not set |
| 159 | # CONFIG_PPC_CELL_NATIVE is not set | 172 | # CONFIG_PPC_CELL_NATIVE is not set |
| 173 | # CONFIG_PPC_82xx is not set | ||
| 160 | # CONFIG_PQ2ADS is not set | 174 | # CONFIG_PQ2ADS is not set |
| 161 | CONFIG_MPC83xx=y | 175 | CONFIG_PPC_83xx=y |
| 162 | CONFIG_MPC831x_RDB=y | 176 | CONFIG_MPC831x_RDB=y |
| 163 | # CONFIG_MPC832x_MDS is not set | 177 | # CONFIG_MPC832x_MDS is not set |
| 164 | # CONFIG_MPC832x_RDB is not set | 178 | # CONFIG_MPC832x_RDB is not set |
| 165 | # CONFIG_MPC834x_MDS is not set | 179 | # CONFIG_MPC834x_MDS is not set |
| 166 | # CONFIG_MPC834x_ITX is not set | 180 | # CONFIG_MPC834x_ITX is not set |
| 167 | # CONFIG_MPC836x_MDS is not set | 181 | # CONFIG_MPC836x_MDS is not set |
| 182 | # CONFIG_MPC836x_RDK is not set | ||
| 168 | # CONFIG_MPC837x_MDS is not set | 183 | # CONFIG_MPC837x_MDS is not set |
| 169 | # CONFIG_MPC837x_RDB is not set | 184 | # CONFIG_MPC837x_RDB is not set |
| 170 | # CONFIG_SBC834x is not set | 185 | # CONFIG_SBC834x is not set |
| 186 | # CONFIG_ASP834x is not set | ||
| 171 | CONFIG_PPC_MPC831x=y | 187 | CONFIG_PPC_MPC831x=y |
| 188 | # CONFIG_PPC_86xx is not set | ||
| 189 | # CONFIG_EMBEDDED6xx is not set | ||
| 190 | CONFIG_PPC_NATIVE=y | ||
| 191 | # CONFIG_UDBG_RTAS_CONSOLE is not set | ||
| 172 | CONFIG_IPIC=y | 192 | CONFIG_IPIC=y |
| 173 | # CONFIG_MPIC is not set | 193 | CONFIG_MPIC=y |
| 174 | # CONFIG_MPIC_WEIRD is not set | 194 | # CONFIG_MPIC_WEIRD is not set |
| 175 | # CONFIG_PPC_I8259 is not set | 195 | CONFIG_PPC_I8259=y |
| 176 | # CONFIG_PPC_RTAS is not set | 196 | CONFIG_PPC_RTAS=y |
| 197 | # CONFIG_RTAS_ERROR_LOGGING is not set | ||
| 198 | CONFIG_RTAS_PROC=y | ||
| 177 | # CONFIG_MMIO_NVRAM is not set | 199 | # CONFIG_MMIO_NVRAM is not set |
| 178 | # CONFIG_PPC_MPC106 is not set | 200 | CONFIG_PPC_MPC106=y |
| 179 | # CONFIG_PPC_970_NAP is not set | 201 | # CONFIG_PPC_970_NAP is not set |
| 180 | # CONFIG_PPC_INDIRECT_IO is not set | 202 | # CONFIG_PPC_INDIRECT_IO is not set |
| 181 | # CONFIG_GENERIC_IOMAP is not set | 203 | # CONFIG_GENERIC_IOMAP is not set |
| 182 | # CONFIG_CPU_FREQ is not set | 204 | # CONFIG_CPU_FREQ is not set |
| 205 | # CONFIG_PPC601_SYNC_FIX is not set | ||
| 206 | # CONFIG_TAU is not set | ||
| 183 | # CONFIG_FSL_ULI1575 is not set | 207 | # CONFIG_FSL_ULI1575 is not set |
| 184 | 208 | ||
| 185 | # | 209 | # |
| @@ -195,7 +219,7 @@ CONFIG_HZ_250=y | |||
| 195 | # CONFIG_HZ_300 is not set | 219 | # CONFIG_HZ_300 is not set |
| 196 | # CONFIG_HZ_1000 is not set | 220 | # CONFIG_HZ_1000 is not set |
| 197 | CONFIG_HZ=250 | 221 | CONFIG_HZ=250 |
| 198 | # CONFIG_SCHED_HRTICK is not set | 222 | CONFIG_SCHED_HRTICK=y |
| 199 | CONFIG_PREEMPT_NONE=y | 223 | CONFIG_PREEMPT_NONE=y |
| 200 | # CONFIG_PREEMPT_VOLUNTARY is not set | 224 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 201 | # CONFIG_PREEMPT is not set | 225 | # CONFIG_PREEMPT is not set |
| @@ -205,6 +229,7 @@ CONFIG_BINFMT_ELF=y | |||
| 205 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 229 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| 206 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 230 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
| 207 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 231 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
| 232 | # CONFIG_KEXEC is not set | ||
| 208 | CONFIG_ARCH_FLATMEM_ENABLE=y | 233 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 209 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 234 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
| 210 | CONFIG_SELECT_MEMORY_MODEL=y | 235 | CONFIG_SELECT_MEMORY_MODEL=y |
| @@ -217,6 +242,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 242 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 218 | CONFIG_PAGEFLAGS_EXTENDED=y | 243 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 219 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 244 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 245 | CONFIG_MIGRATION=y | ||
| 220 | # CONFIG_RESOURCES_64BIT is not set | 246 | # CONFIG_RESOURCES_64BIT is not set |
| 221 | CONFIG_ZONE_DMA_FLAG=1 | 247 | CONFIG_ZONE_DMA_FLAG=1 |
| 222 | CONFIG_BOUNCE=y | 248 | CONFIG_BOUNCE=y |
| @@ -224,6 +250,7 @@ CONFIG_VIRT_TO_BUS=y | |||
| 224 | CONFIG_FORCE_MAX_ZONEORDER=11 | 250 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 225 | CONFIG_PROC_DEVICETREE=y | 251 | CONFIG_PROC_DEVICETREE=y |
| 226 | # CONFIG_CMDLINE_BOOL is not set | 252 | # CONFIG_CMDLINE_BOOL is not set |
| 253 | CONFIG_EXTRA_TARGETS="" | ||
| 227 | # CONFIG_PM is not set | 254 | # CONFIG_PM is not set |
| 228 | CONFIG_SECCOMP=y | 255 | CONFIG_SECCOMP=y |
| 229 | CONFIG_ISA_DMA_API=y | 256 | CONFIG_ISA_DMA_API=y |
| @@ -231,10 +258,13 @@ CONFIG_ISA_DMA_API=y | |||
| 231 | # | 258 | # |
| 232 | # Bus options | 259 | # Bus options |
| 233 | # | 260 | # |
| 261 | # CONFIG_ISA is not set | ||
| 234 | CONFIG_ZONE_DMA=y | 262 | CONFIG_ZONE_DMA=y |
| 235 | CONFIG_GENERIC_ISA_DMA=y | 263 | CONFIG_GENERIC_ISA_DMA=y |
| 236 | CONFIG_PPC_INDIRECT_PCI=y | 264 | CONFIG_PPC_INDIRECT_PCI=y |
| 237 | CONFIG_FSL_SOC=y | 265 | CONFIG_FSL_SOC=y |
| 266 | CONFIG_FSL_PCI=y | ||
| 267 | CONFIG_PPC_PCI_CHOICE=y | ||
| 238 | CONFIG_PCI=y | 268 | CONFIG_PCI=y |
| 239 | CONFIG_PCI_DOMAINS=y | 269 | CONFIG_PCI_DOMAINS=y |
| 240 | CONFIG_PCI_SYSCALL=y | 270 | CONFIG_PCI_SYSCALL=y |
| @@ -260,10 +290,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
| 260 | CONFIG_KERNEL_START=0xc0000000 | 290 | CONFIG_KERNEL_START=0xc0000000 |
| 261 | CONFIG_PHYSICAL_START=0x00000000 | 291 | CONFIG_PHYSICAL_START=0x00000000 |
| 262 | CONFIG_TASK_SIZE=0xc0000000 | 292 | CONFIG_TASK_SIZE=0xc0000000 |
| 263 | |||
| 264 | # | ||
| 265 | # Networking | ||
| 266 | # | ||
| 267 | CONFIG_NET=y | 293 | CONFIG_NET=y |
| 268 | 294 | ||
| 269 | # | 295 | # |
| @@ -452,9 +478,11 @@ CONFIG_MTD_NAND_IDS=y | |||
| 452 | # CONFIG_MTD_UBI is not set | 478 | # CONFIG_MTD_UBI is not set |
| 453 | CONFIG_OF_DEVICE=y | 479 | CONFIG_OF_DEVICE=y |
| 454 | CONFIG_OF_I2C=y | 480 | CONFIG_OF_I2C=y |
| 481 | CONFIG_OF_SPI=y | ||
| 455 | # CONFIG_PARPORT is not set | 482 | # CONFIG_PARPORT is not set |
| 456 | CONFIG_BLK_DEV=y | 483 | CONFIG_BLK_DEV=y |
| 457 | # CONFIG_BLK_DEV_FD is not set | 484 | # CONFIG_BLK_DEV_FD is not set |
| 485 | # CONFIG_MAC_FLOPPY is not set | ||
| 458 | # CONFIG_BLK_CPQ_DA is not set | 486 | # CONFIG_BLK_CPQ_DA is not set |
| 459 | # CONFIG_BLK_CPQ_CISS_DA is not set | 487 | # CONFIG_BLK_CPQ_CISS_DA is not set |
| 460 | # CONFIG_BLK_DEV_DAC960 is not set | 488 | # CONFIG_BLK_DEV_DAC960 is not set |
| @@ -471,12 +499,14 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
| 471 | # CONFIG_BLK_DEV_XIP is not set | 499 | # CONFIG_BLK_DEV_XIP is not set |
| 472 | # CONFIG_CDROM_PKTCDVD is not set | 500 | # CONFIG_CDROM_PKTCDVD is not set |
| 473 | # CONFIG_ATA_OVER_ETH is not set | 501 | # CONFIG_ATA_OVER_ETH is not set |
| 502 | # CONFIG_BLK_DEV_HD is not set | ||
| 474 | CONFIG_MISC_DEVICES=y | 503 | CONFIG_MISC_DEVICES=y |
| 475 | # CONFIG_PHANTOM is not set | 504 | # CONFIG_PHANTOM is not set |
| 476 | # CONFIG_EEPROM_93CX6 is not set | 505 | # CONFIG_EEPROM_93CX6 is not set |
| 477 | # CONFIG_SGI_IOC4 is not set | 506 | # CONFIG_SGI_IOC4 is not set |
| 478 | # CONFIG_TIFM_CORE is not set | 507 | # CONFIG_TIFM_CORE is not set |
| 479 | # CONFIG_ENCLOSURE_SERVICES is not set | 508 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 509 | # CONFIG_HP_ILO is not set | ||
| 480 | CONFIG_HAVE_IDE=y | 510 | CONFIG_HAVE_IDE=y |
| 481 | # CONFIG_IDE is not set | 511 | # CONFIG_IDE is not set |
| 482 | 512 | ||
| @@ -554,7 +584,10 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 554 | # CONFIG_SCSI_DC390T is not set | 584 | # CONFIG_SCSI_DC390T is not set |
| 555 | # CONFIG_SCSI_NSP32 is not set | 585 | # CONFIG_SCSI_NSP32 is not set |
| 556 | # CONFIG_SCSI_DEBUG is not set | 586 | # CONFIG_SCSI_DEBUG is not set |
| 587 | # CONFIG_SCSI_MESH is not set | ||
| 588 | # CONFIG_SCSI_MAC53C94 is not set | ||
| 557 | # CONFIG_SCSI_SRP is not set | 589 | # CONFIG_SCSI_SRP is not set |
| 590 | # CONFIG_SCSI_DH is not set | ||
| 558 | CONFIG_ATA=y | 591 | CONFIG_ATA=y |
| 559 | # CONFIG_ATA_NONSTANDARD is not set | 592 | # CONFIG_ATA_NONSTANDARD is not set |
| 560 | CONFIG_SATA_PMP=y | 593 | CONFIG_SATA_PMP=y |
| @@ -631,12 +664,15 @@ CONFIG_MD_RAID1=y | |||
| 631 | # | 664 | # |
| 632 | # IEEE 1394 (FireWire) support | 665 | # IEEE 1394 (FireWire) support |
| 633 | # | 666 | # |
| 667 | |||
| 668 | # | ||
| 669 | # Enable only one of the two stacks, unless you know what you are doing | ||
| 670 | # | ||
| 634 | # CONFIG_FIREWIRE is not set | 671 | # CONFIG_FIREWIRE is not set |
| 635 | # CONFIG_IEEE1394 is not set | 672 | # CONFIG_IEEE1394 is not set |
| 636 | # CONFIG_I2O is not set | 673 | # CONFIG_I2O is not set |
| 637 | # CONFIG_MACINTOSH_DRIVERS is not set | 674 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 638 | CONFIG_NETDEVICES=y | 675 | CONFIG_NETDEVICES=y |
| 639 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 640 | # CONFIG_DUMMY is not set | 676 | # CONFIG_DUMMY is not set |
| 641 | # CONFIG_BONDING is not set | 677 | # CONFIG_BONDING is not set |
| 642 | # CONFIG_MACVLAN is not set | 678 | # CONFIG_MACVLAN is not set |
| @@ -663,6 +699,8 @@ CONFIG_PHYLIB=y | |||
| 663 | # CONFIG_MDIO_BITBANG is not set | 699 | # CONFIG_MDIO_BITBANG is not set |
| 664 | CONFIG_NET_ETHERNET=y | 700 | CONFIG_NET_ETHERNET=y |
| 665 | CONFIG_MII=y | 701 | CONFIG_MII=y |
| 702 | # CONFIG_MACE is not set | ||
| 703 | # CONFIG_BMAC is not set | ||
| 666 | # CONFIG_HAPPYMEAL is not set | 704 | # CONFIG_HAPPYMEAL is not set |
| 667 | # CONFIG_SUNGEM is not set | 705 | # CONFIG_SUNGEM is not set |
| 668 | # CONFIG_CASSINI is not set | 706 | # CONFIG_CASSINI is not set |
| @@ -699,7 +737,6 @@ CONFIG_NETDEV_1000=y | |||
| 699 | # CONFIG_DL2K is not set | 737 | # CONFIG_DL2K is not set |
| 700 | # CONFIG_E1000 is not set | 738 | # CONFIG_E1000 is not set |
| 701 | # CONFIG_E1000E is not set | 739 | # CONFIG_E1000E is not set |
| 702 | # CONFIG_E1000E_ENABLED is not set | ||
| 703 | # CONFIG_IP1000 is not set | 740 | # CONFIG_IP1000 is not set |
| 704 | # CONFIG_IGB is not set | 741 | # CONFIG_IGB is not set |
| 705 | # CONFIG_NS83820 is not set | 742 | # CONFIG_NS83820 is not set |
| @@ -713,9 +750,10 @@ CONFIG_NETDEV_1000=y | |||
| 713 | # CONFIG_TIGON3 is not set | 750 | # CONFIG_TIGON3 is not set |
| 714 | # CONFIG_BNX2 is not set | 751 | # CONFIG_BNX2 is not set |
| 715 | CONFIG_GIANFAR=y | 752 | CONFIG_GIANFAR=y |
| 716 | CONFIG_GFAR_NAPI=y | 753 | # CONFIG_MV643XX_ETH is not set |
| 717 | # CONFIG_QLA3XXX is not set | 754 | # CONFIG_QLA3XXX is not set |
| 718 | # CONFIG_ATL1 is not set | 755 | # CONFIG_ATL1 is not set |
| 756 | # CONFIG_ATL1E is not set | ||
| 719 | CONFIG_NETDEV_10000=y | 757 | CONFIG_NETDEV_10000=y |
| 720 | # CONFIG_CHELSIO_T1 is not set | 758 | # CONFIG_CHELSIO_T1 is not set |
| 721 | # CONFIG_CHELSIO_T3 is not set | 759 | # CONFIG_CHELSIO_T3 is not set |
| @@ -813,11 +851,14 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
| 813 | # CONFIG_SERIAL_UARTLITE is not set | 851 | # CONFIG_SERIAL_UARTLITE is not set |
| 814 | CONFIG_SERIAL_CORE=y | 852 | CONFIG_SERIAL_CORE=y |
| 815 | CONFIG_SERIAL_CORE_CONSOLE=y | 853 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 854 | # CONFIG_SERIAL_PMACZILOG is not set | ||
| 816 | # CONFIG_SERIAL_JSM is not set | 855 | # CONFIG_SERIAL_JSM is not set |
| 817 | # CONFIG_SERIAL_OF_PLATFORM is not set | 856 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 818 | CONFIG_UNIX98_PTYS=y | 857 | CONFIG_UNIX98_PTYS=y |
| 819 | CONFIG_LEGACY_PTYS=y | 858 | CONFIG_LEGACY_PTYS=y |
| 820 | CONFIG_LEGACY_PTY_COUNT=256 | 859 | CONFIG_LEGACY_PTY_COUNT=256 |
| 860 | # CONFIG_BRIQ_PANEL is not set | ||
| 861 | # CONFIG_HVC_RTAS is not set | ||
| 821 | # CONFIG_IPMI_HANDLER is not set | 862 | # CONFIG_IPMI_HANDLER is not set |
| 822 | CONFIG_HW_RANDOM=y | 863 | CONFIG_HW_RANDOM=y |
| 823 | # CONFIG_NVRAM is not set | 864 | # CONFIG_NVRAM is not set |
| @@ -829,43 +870,70 @@ CONFIG_DEVPORT=y | |||
| 829 | CONFIG_I2C=y | 870 | CONFIG_I2C=y |
| 830 | CONFIG_I2C_BOARDINFO=y | 871 | CONFIG_I2C_BOARDINFO=y |
| 831 | CONFIG_I2C_CHARDEV=y | 872 | CONFIG_I2C_CHARDEV=y |
| 873 | CONFIG_I2C_HELPER_AUTO=y | ||
| 832 | 874 | ||
| 833 | # | 875 | # |
| 834 | # I2C Hardware Bus support | 876 | # I2C Hardware Bus support |
| 835 | # | 877 | # |
| 878 | |||
| 879 | # | ||
| 880 | # PC SMBus host controller drivers | ||
| 881 | # | ||
| 836 | # CONFIG_I2C_ALI1535 is not set | 882 | # CONFIG_I2C_ALI1535 is not set |
| 837 | # CONFIG_I2C_ALI1563 is not set | 883 | # CONFIG_I2C_ALI1563 is not set |
| 838 | # CONFIG_I2C_ALI15X3 is not set | 884 | # CONFIG_I2C_ALI15X3 is not set |
| 839 | # CONFIG_I2C_AMD756 is not set | 885 | # CONFIG_I2C_AMD756 is not set |
| 840 | # CONFIG_I2C_AMD8111 is not set | 886 | # CONFIG_I2C_AMD8111 is not set |
| 841 | # CONFIG_I2C_I801 is not set | 887 | # CONFIG_I2C_I801 is not set |
| 842 | # CONFIG_I2C_I810 is not set | 888 | # CONFIG_I2C_ISCH is not set |
| 843 | # CONFIG_I2C_PIIX4 is not set | 889 | # CONFIG_I2C_PIIX4 is not set |
| 844 | CONFIG_I2C_MPC=y | ||
| 845 | # CONFIG_I2C_NFORCE2 is not set | 890 | # CONFIG_I2C_NFORCE2 is not set |
| 846 | # CONFIG_I2C_OCORES is not set | ||
| 847 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 848 | # CONFIG_I2C_PROSAVAGE is not set | ||
| 849 | # CONFIG_I2C_SAVAGE4 is not set | ||
| 850 | # CONFIG_I2C_SIMTEC is not set | ||
| 851 | # CONFIG_I2C_SIS5595 is not set | 891 | # CONFIG_I2C_SIS5595 is not set |
| 852 | # CONFIG_I2C_SIS630 is not set | 892 | # CONFIG_I2C_SIS630 is not set |
| 853 | # CONFIG_I2C_SIS96X is not set | 893 | # CONFIG_I2C_SIS96X is not set |
| 854 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 855 | # CONFIG_I2C_STUB is not set | ||
| 856 | # CONFIG_I2C_TINY_USB is not set | ||
| 857 | # CONFIG_I2C_VIA is not set | 894 | # CONFIG_I2C_VIA is not set |
| 858 | # CONFIG_I2C_VIAPRO is not set | 895 | # CONFIG_I2C_VIAPRO is not set |
| 896 | |||
| 897 | # | ||
| 898 | # Mac SMBus host controller drivers | ||
| 899 | # | ||
| 900 | # CONFIG_I2C_HYDRA is not set | ||
| 901 | CONFIG_I2C_POWERMAC=y | ||
| 902 | |||
| 903 | # | ||
| 904 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 905 | # | ||
| 906 | CONFIG_I2C_MPC=y | ||
| 907 | # CONFIG_I2C_OCORES is not set | ||
| 908 | # CONFIG_I2C_SIMTEC is not set | ||
| 909 | |||
| 910 | # | ||
| 911 | # External I2C/SMBus adapter drivers | ||
| 912 | # | ||
| 913 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 914 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 915 | # CONFIG_I2C_TINY_USB is not set | ||
| 916 | |||
| 917 | # | ||
| 918 | # Graphics adapter I2C/DDC channel drivers | ||
| 919 | # | ||
| 859 | # CONFIG_I2C_VOODOO3 is not set | 920 | # CONFIG_I2C_VOODOO3 is not set |
| 921 | |||
| 922 | # | ||
| 923 | # Other I2C/SMBus bus drivers | ||
| 924 | # | ||
| 860 | # CONFIG_I2C_PCA_PLATFORM is not set | 925 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 926 | # CONFIG_I2C_STUB is not set | ||
| 861 | 927 | ||
| 862 | # | 928 | # |
| 863 | # Miscellaneous I2C Chip support | 929 | # Miscellaneous I2C Chip support |
| 864 | # | 930 | # |
| 865 | # CONFIG_DS1682 is not set | 931 | # CONFIG_DS1682 is not set |
| 932 | # CONFIG_AT24 is not set | ||
| 866 | # CONFIG_SENSORS_EEPROM is not set | 933 | # CONFIG_SENSORS_EEPROM is not set |
| 867 | # CONFIG_SENSORS_PCF8574 is not set | 934 | # CONFIG_SENSORS_PCF8574 is not set |
| 868 | # CONFIG_PCF8575 is not set | 935 | # CONFIG_PCF8575 is not set |
| 936 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 869 | # CONFIG_SENSORS_PCF8591 is not set | 937 | # CONFIG_SENSORS_PCF8591 is not set |
| 870 | # CONFIG_SENSORS_MAX6875 is not set | 938 | # CONFIG_SENSORS_MAX6875 is not set |
| 871 | # CONFIG_SENSORS_TSL2550 is not set | 939 | # CONFIG_SENSORS_TSL2550 is not set |
| @@ -889,11 +957,15 @@ CONFIG_SPI_MPC83xx=y | |||
| 889 | # CONFIG_SPI_AT25 is not set | 957 | # CONFIG_SPI_AT25 is not set |
| 890 | # CONFIG_SPI_SPIDEV is not set | 958 | # CONFIG_SPI_SPIDEV is not set |
| 891 | # CONFIG_SPI_TLE62X0 is not set | 959 | # CONFIG_SPI_TLE62X0 is not set |
| 960 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 961 | # CONFIG_GPIOLIB is not set | ||
| 892 | # CONFIG_W1 is not set | 962 | # CONFIG_W1 is not set |
| 893 | # CONFIG_POWER_SUPPLY is not set | 963 | # CONFIG_POWER_SUPPLY is not set |
| 894 | CONFIG_HWMON=y | 964 | CONFIG_HWMON=y |
| 895 | # CONFIG_HWMON_VID is not set | 965 | # CONFIG_HWMON_VID is not set |
| 966 | # CONFIG_SENSORS_AD7414 is not set | ||
| 896 | # CONFIG_SENSORS_AD7418 is not set | 967 | # CONFIG_SENSORS_AD7418 is not set |
| 968 | # CONFIG_SENSORS_ADCXX is not set | ||
| 897 | # CONFIG_SENSORS_ADM1021 is not set | 969 | # CONFIG_SENSORS_ADM1021 is not set |
| 898 | # CONFIG_SENSORS_ADM1025 is not set | 970 | # CONFIG_SENSORS_ADM1025 is not set |
| 899 | # CONFIG_SENSORS_ADM1026 is not set | 971 | # CONFIG_SENSORS_ADM1026 is not set |
| @@ -902,6 +974,7 @@ CONFIG_HWMON=y | |||
| 902 | # CONFIG_SENSORS_ADM9240 is not set | 974 | # CONFIG_SENSORS_ADM9240 is not set |
| 903 | # CONFIG_SENSORS_ADT7470 is not set | 975 | # CONFIG_SENSORS_ADT7470 is not set |
| 904 | # CONFIG_SENSORS_ADT7473 is not set | 976 | # CONFIG_SENSORS_ADT7473 is not set |
| 977 | # CONFIG_SENSORS_AMS is not set | ||
| 905 | # CONFIG_SENSORS_ATXP1 is not set | 978 | # CONFIG_SENSORS_ATXP1 is not set |
| 906 | # CONFIG_SENSORS_DS1621 is not set | 979 | # CONFIG_SENSORS_DS1621 is not set |
| 907 | # CONFIG_SENSORS_I5K_AMB is not set | 980 | # CONFIG_SENSORS_I5K_AMB is not set |
| @@ -947,6 +1020,7 @@ CONFIG_HWMON=y | |||
| 947 | # CONFIG_SENSORS_W83627EHF is not set | 1020 | # CONFIG_SENSORS_W83627EHF is not set |
| 948 | # CONFIG_HWMON_DEBUG_CHIP is not set | 1021 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 949 | # CONFIG_THERMAL is not set | 1022 | # CONFIG_THERMAL is not set |
| 1023 | # CONFIG_THERMAL_HWMON is not set | ||
| 950 | CONFIG_WATCHDOG=y | 1024 | CONFIG_WATCHDOG=y |
| 951 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 1025 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
| 952 | 1026 | ||
| @@ -954,7 +1028,9 @@ CONFIG_WATCHDOG=y | |||
| 954 | # Watchdog Device Drivers | 1028 | # Watchdog Device Drivers |
| 955 | # | 1029 | # |
| 956 | # CONFIG_SOFT_WATCHDOG is not set | 1030 | # CONFIG_SOFT_WATCHDOG is not set |
| 957 | CONFIG_83xx_WDT=y | 1031 | # CONFIG_ALIM7101_WDT is not set |
| 1032 | # CONFIG_8xxx_WDT is not set | ||
| 1033 | # CONFIG_WATCHDOG_RTAS is not set | ||
| 958 | 1034 | ||
| 959 | # | 1035 | # |
| 960 | # PCI-based Watchdog Cards | 1036 | # PCI-based Watchdog Cards |
| @@ -976,8 +1052,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 976 | # | 1052 | # |
| 977 | # Multifunction device drivers | 1053 | # Multifunction device drivers |
| 978 | # | 1054 | # |
| 1055 | # CONFIG_MFD_CORE is not set | ||
| 979 | # CONFIG_MFD_SM501 is not set | 1056 | # CONFIG_MFD_SM501 is not set |
| 980 | # CONFIG_HTC_PASIC3 is not set | 1057 | # CONFIG_HTC_PASIC3 is not set |
| 1058 | # CONFIG_MFD_TMIO is not set | ||
| 981 | 1059 | ||
| 982 | # | 1060 | # |
| 983 | # Multimedia devices | 1061 | # Multimedia devices |
| @@ -1010,10 +1088,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m | |||
| 1010 | # Display device support | 1088 | # Display device support |
| 1011 | # | 1089 | # |
| 1012 | # CONFIG_DISPLAY_SUPPORT is not set | 1090 | # CONFIG_DISPLAY_SUPPORT is not set |
| 1013 | |||
| 1014 | # | ||
| 1015 | # Sound | ||
| 1016 | # | ||
| 1017 | # CONFIG_SOUND is not set | 1091 | # CONFIG_SOUND is not set |
| 1018 | CONFIG_HID_SUPPORT=y | 1092 | CONFIG_HID_SUPPORT=y |
| 1019 | CONFIG_HID=y | 1093 | CONFIG_HID=y |
| @@ -1047,6 +1121,7 @@ CONFIG_USB_DEVICE_CLASS=y | |||
| 1047 | # CONFIG_USB_OTG is not set | 1121 | # CONFIG_USB_OTG is not set |
| 1048 | # CONFIG_USB_OTG_WHITELIST is not set | 1122 | # CONFIG_USB_OTG_WHITELIST is not set |
| 1049 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 1123 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
| 1124 | CONFIG_USB_MON=y | ||
| 1050 | 1125 | ||
| 1051 | # | 1126 | # |
| 1052 | # USB Host Controller Drivers | 1127 | # USB Host Controller Drivers |
| @@ -1070,6 +1145,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 1070 | CONFIG_USB_UHCI_HCD=y | 1145 | CONFIG_USB_UHCI_HCD=y |
| 1071 | # CONFIG_USB_SL811_HCD is not set | 1146 | # CONFIG_USB_SL811_HCD is not set |
| 1072 | # CONFIG_USB_R8A66597_HCD is not set | 1147 | # CONFIG_USB_R8A66597_HCD is not set |
| 1148 | # CONFIG_USB_GADGET_MUSB_HDRC is not set | ||
| 1073 | 1149 | ||
| 1074 | # | 1150 | # |
| 1075 | # USB Device Class drivers | 1151 | # USB Device Class drivers |
| @@ -1098,6 +1174,7 @@ CONFIG_USB_STORAGE=y | |||
| 1098 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1174 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1099 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1175 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
| 1100 | # CONFIG_USB_STORAGE_KARMA is not set | 1176 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1177 | # CONFIG_USB_STORAGE_SIERRA is not set | ||
| 1101 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | 1178 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
| 1102 | # CONFIG_USB_LIBUSUAL is not set | 1179 | # CONFIG_USB_LIBUSUAL is not set |
| 1103 | 1180 | ||
| @@ -1106,7 +1183,6 @@ CONFIG_USB_STORAGE=y | |||
| 1106 | # | 1183 | # |
| 1107 | # CONFIG_USB_MDC800 is not set | 1184 | # CONFIG_USB_MDC800 is not set |
| 1108 | # CONFIG_USB_MICROTEK is not set | 1185 | # CONFIG_USB_MICROTEK is not set |
| 1109 | CONFIG_USB_MON=y | ||
| 1110 | 1186 | ||
| 1111 | # | 1187 | # |
| 1112 | # USB port drivers | 1188 | # USB port drivers |
| @@ -1119,7 +1195,6 @@ CONFIG_USB_MON=y | |||
| 1119 | # CONFIG_USB_EMI62 is not set | 1195 | # CONFIG_USB_EMI62 is not set |
| 1120 | # CONFIG_USB_EMI26 is not set | 1196 | # CONFIG_USB_EMI26 is not set |
| 1121 | # CONFIG_USB_ADUTUX is not set | 1197 | # CONFIG_USB_ADUTUX is not set |
| 1122 | # CONFIG_USB_AUERSWALD is not set | ||
| 1123 | # CONFIG_USB_RIO500 is not set | 1198 | # CONFIG_USB_RIO500 is not set |
| 1124 | # CONFIG_USB_LEGOTOWER is not set | 1199 | # CONFIG_USB_LEGOTOWER is not set |
| 1125 | # CONFIG_USB_LCD is not set | 1200 | # CONFIG_USB_LCD is not set |
| @@ -1146,7 +1221,7 @@ CONFIG_USB_GADGET_SELECTED=y | |||
| 1146 | # CONFIG_USB_GADGET_FSL_USB2 is not set | 1221 | # CONFIG_USB_GADGET_FSL_USB2 is not set |
| 1147 | CONFIG_USB_GADGET_NET2280=y | 1222 | CONFIG_USB_GADGET_NET2280=y |
| 1148 | CONFIG_USB_NET2280=y | 1223 | CONFIG_USB_NET2280=y |
| 1149 | # CONFIG_USB_GADGET_PXA2XX is not set | 1224 | # CONFIG_USB_GADGET_PXA25X is not set |
| 1150 | # CONFIG_USB_GADGET_M66592 is not set | 1225 | # CONFIG_USB_GADGET_M66592 is not set |
| 1151 | # CONFIG_USB_GADGET_PXA27X is not set | 1226 | # CONFIG_USB_GADGET_PXA27X is not set |
| 1152 | # CONFIG_USB_GADGET_GOKU is not set | 1227 | # CONFIG_USB_GADGET_GOKU is not set |
| @@ -1164,6 +1239,7 @@ CONFIG_USB_ETH_RNDIS=y | |||
| 1164 | # CONFIG_USB_G_SERIAL is not set | 1239 | # CONFIG_USB_G_SERIAL is not set |
| 1165 | # CONFIG_USB_MIDI_GADGET is not set | 1240 | # CONFIG_USB_MIDI_GADGET is not set |
| 1166 | # CONFIG_USB_G_PRINTER is not set | 1241 | # CONFIG_USB_G_PRINTER is not set |
| 1242 | # CONFIG_USB_CDC_COMPOSITE is not set | ||
| 1167 | # CONFIG_MMC is not set | 1243 | # CONFIG_MMC is not set |
| 1168 | # CONFIG_MEMSTICK is not set | 1244 | # CONFIG_MEMSTICK is not set |
| 1169 | # CONFIG_NEW_LEDS is not set | 1245 | # CONFIG_NEW_LEDS is not set |
| @@ -1199,10 +1275,13 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 1199 | # CONFIG_RTC_DRV_PCF8583 is not set | 1275 | # CONFIG_RTC_DRV_PCF8583 is not set |
| 1200 | # CONFIG_RTC_DRV_M41T80 is not set | 1276 | # CONFIG_RTC_DRV_M41T80 is not set |
| 1201 | # CONFIG_RTC_DRV_S35390A is not set | 1277 | # CONFIG_RTC_DRV_S35390A is not set |
| 1278 | # CONFIG_RTC_DRV_FM3130 is not set | ||
| 1202 | 1279 | ||
| 1203 | # | 1280 | # |
| 1204 | # SPI RTC drivers | 1281 | # SPI RTC drivers |
| 1205 | # | 1282 | # |
| 1283 | # CONFIG_RTC_DRV_M41T94 is not set | ||
| 1284 | # CONFIG_RTC_DRV_DS1305 is not set | ||
| 1206 | # CONFIG_RTC_DRV_MAX6902 is not set | 1285 | # CONFIG_RTC_DRV_MAX6902 is not set |
| 1207 | # CONFIG_RTC_DRV_R9701 is not set | 1286 | # CONFIG_RTC_DRV_R9701 is not set |
| 1208 | # CONFIG_RTC_DRV_RS5C348 is not set | 1287 | # CONFIG_RTC_DRV_RS5C348 is not set |
| @@ -1301,6 +1380,7 @@ CONFIG_JFFS2_RTIME=y | |||
| 1301 | # CONFIG_CRAMFS is not set | 1380 | # CONFIG_CRAMFS is not set |
| 1302 | # CONFIG_VXFS_FS is not set | 1381 | # CONFIG_VXFS_FS is not set |
| 1303 | # CONFIG_MINIX_FS is not set | 1382 | # CONFIG_MINIX_FS is not set |
| 1383 | # CONFIG_OMFS_FS is not set | ||
| 1304 | # CONFIG_HPFS_FS is not set | 1384 | # CONFIG_HPFS_FS is not set |
| 1305 | # CONFIG_QNX4FS_FS is not set | 1385 | # CONFIG_QNX4FS_FS is not set |
| 1306 | # CONFIG_ROMFS_FS is not set | 1386 | # CONFIG_ROMFS_FS is not set |
| @@ -1311,14 +1391,13 @@ CONFIG_NFS_FS=y | |||
| 1311 | CONFIG_NFS_V3=y | 1391 | CONFIG_NFS_V3=y |
| 1312 | # CONFIG_NFS_V3_ACL is not set | 1392 | # CONFIG_NFS_V3_ACL is not set |
| 1313 | CONFIG_NFS_V4=y | 1393 | CONFIG_NFS_V4=y |
| 1314 | # CONFIG_NFSD is not set | ||
| 1315 | CONFIG_ROOT_NFS=y | 1394 | CONFIG_ROOT_NFS=y |
| 1395 | # CONFIG_NFSD is not set | ||
| 1316 | CONFIG_LOCKD=y | 1396 | CONFIG_LOCKD=y |
| 1317 | CONFIG_LOCKD_V4=y | 1397 | CONFIG_LOCKD_V4=y |
| 1318 | CONFIG_NFS_COMMON=y | 1398 | CONFIG_NFS_COMMON=y |
| 1319 | CONFIG_SUNRPC=y | 1399 | CONFIG_SUNRPC=y |
| 1320 | CONFIG_SUNRPC_GSS=y | 1400 | CONFIG_SUNRPC_GSS=y |
| 1321 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 1322 | CONFIG_RPCSEC_GSS_KRB5=y | 1401 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1323 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1402 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1324 | # CONFIG_SMB_FS is not set | 1403 | # CONFIG_SMB_FS is not set |
| @@ -1358,6 +1437,7 @@ CONFIG_BITREVERSE=y | |||
| 1358 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1437 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 1359 | # CONFIG_CRC_CCITT is not set | 1438 | # CONFIG_CRC_CCITT is not set |
| 1360 | # CONFIG_CRC16 is not set | 1439 | # CONFIG_CRC16 is not set |
| 1440 | # CONFIG_CRC_T10DIF is not set | ||
| 1361 | # CONFIG_CRC_ITU_T is not set | 1441 | # CONFIG_CRC_ITU_T is not set |
| 1362 | CONFIG_CRC32=y | 1442 | CONFIG_CRC32=y |
| 1363 | # CONFIG_CRC7 is not set | 1443 | # CONFIG_CRC7 is not set |
| @@ -1384,6 +1464,8 @@ CONFIG_FRAME_WARN=1024 | |||
| 1384 | CONFIG_DEBUG_KERNEL=y | 1464 | CONFIG_DEBUG_KERNEL=y |
| 1385 | # CONFIG_DEBUG_SHIRQ is not set | 1465 | # CONFIG_DEBUG_SHIRQ is not set |
| 1386 | CONFIG_DETECT_SOFTLOCKUP=y | 1466 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1467 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 1468 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 1387 | CONFIG_SCHED_DEBUG=y | 1469 | CONFIG_SCHED_DEBUG=y |
| 1388 | # CONFIG_SCHEDSTATS is not set | 1470 | # CONFIG_SCHEDSTATS is not set |
| 1389 | # CONFIG_TIMER_STATS is not set | 1471 | # CONFIG_TIMER_STATS is not set |
| @@ -1401,19 +1483,32 @@ CONFIG_SCHED_DEBUG=y | |||
| 1401 | # CONFIG_DEBUG_INFO is not set | 1483 | # CONFIG_DEBUG_INFO is not set |
| 1402 | # CONFIG_DEBUG_VM is not set | 1484 | # CONFIG_DEBUG_VM is not set |
| 1403 | # CONFIG_DEBUG_WRITECOUNT is not set | 1485 | # CONFIG_DEBUG_WRITECOUNT is not set |
| 1486 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 1404 | # CONFIG_DEBUG_LIST is not set | 1487 | # CONFIG_DEBUG_LIST is not set |
| 1405 | # CONFIG_DEBUG_SG is not set | 1488 | # CONFIG_DEBUG_SG is not set |
| 1406 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1489 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 1407 | # CONFIG_RCU_TORTURE_TEST is not set | 1490 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1408 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1491 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 1409 | # CONFIG_FAULT_INJECTION is not set | 1492 | # CONFIG_FAULT_INJECTION is not set |
| 1493 | # CONFIG_LATENCYTOP is not set | ||
| 1494 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1495 | CONFIG_HAVE_FTRACE=y | ||
| 1496 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1497 | # CONFIG_FTRACE is not set | ||
| 1498 | # CONFIG_SCHED_TRACER is not set | ||
| 1499 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1410 | # CONFIG_SAMPLES is not set | 1500 | # CONFIG_SAMPLES is not set |
| 1501 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1502 | # CONFIG_KGDB is not set | ||
| 1411 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1503 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
| 1412 | # CONFIG_DEBUG_STACK_USAGE is not set | 1504 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1413 | # CONFIG_DEBUG_PAGEALLOC is not set | 1505 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1414 | # CONFIG_DEBUGGER is not set | 1506 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
| 1507 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
| 1508 | # CONFIG_XMON is not set | ||
| 1415 | # CONFIG_IRQSTACKS is not set | 1509 | # CONFIG_IRQSTACKS is not set |
| 1416 | # CONFIG_BDI_SWITCH is not set | 1510 | # CONFIG_BDI_SWITCH is not set |
| 1511 | # CONFIG_BOOTX_TEXT is not set | ||
| 1417 | # CONFIG_PPC_EARLY_DEBUG is not set | 1512 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1418 | 1513 | ||
| 1419 | # | 1514 | # |
| @@ -1467,6 +1562,10 @@ CONFIG_CRYPTO_PCBC=m | |||
| 1467 | # CONFIG_CRYPTO_MD4 is not set | 1562 | # CONFIG_CRYPTO_MD4 is not set |
| 1468 | CONFIG_CRYPTO_MD5=y | 1563 | CONFIG_CRYPTO_MD5=y |
| 1469 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1564 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 1565 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1566 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1567 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1568 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1470 | # CONFIG_CRYPTO_SHA1 is not set | 1569 | # CONFIG_CRYPTO_SHA1 is not set |
| 1471 | # CONFIG_CRYPTO_SHA256 is not set | 1570 | # CONFIG_CRYPTO_SHA256 is not set |
| 1472 | # CONFIG_CRYPTO_SHA512 is not set | 1571 | # CONFIG_CRYPTO_SHA512 is not set |
| @@ -1499,5 +1598,6 @@ CONFIG_CRYPTO_DES=y | |||
| 1499 | # CONFIG_CRYPTO_LZO is not set | 1598 | # CONFIG_CRYPTO_LZO is not set |
| 1500 | CONFIG_CRYPTO_HW=y | 1599 | CONFIG_CRYPTO_HW=y |
| 1501 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1600 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1601 | # CONFIG_CRYPTO_DEV_TALITOS is not set | ||
| 1502 | # CONFIG_PPC_CLOCK is not set | 1602 | # CONFIG_PPC_CLOCK is not set |
| 1503 | # CONFIG_VIRTUALIZATION is not set | 1603 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/83xx/mpc832x_mds_defconfig b/arch/powerpc/configs/83xx/mpc832x_mds_defconfig index 1eca26f3659a..bdf50c8a17e6 100644 --- a/arch/powerpc/configs/83xx/mpc832x_mds_defconfig +++ b/arch/powerpc/configs/83xx/mpc832x_mds_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.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Mon Jun 9 08:52:22 2008 | 4 | # Thu Aug 21 00:52:18 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -16,6 +16,7 @@ CONFIG_6xx=y | |||
| 16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
| 17 | CONFIG_PPC_FPU=y | 17 | CONFIG_PPC_FPU=y |
| 18 | # CONFIG_FSL_EMB_PERFMON is not set | 18 | # CONFIG_FSL_EMB_PERFMON is not set |
| 19 | # CONFIG_ALTIVEC is not set | ||
| 19 | CONFIG_PPC_STD_MMU=y | 20 | CONFIG_PPC_STD_MMU=y |
| 20 | CONFIG_PPC_STD_MMU_32=y | 21 | CONFIG_PPC_STD_MMU_32=y |
| 21 | # CONFIG_PPC_MM_SLICES is not set | 22 | # CONFIG_PPC_MM_SLICES is not set |
| @@ -32,6 +33,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | 35 | CONFIG_STACKTRACE_SUPPORT=y |
| 36 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | 37 | CONFIG_LOCKDEP_SUPPORT=y |
| 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 39 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| @@ -51,6 +53,9 @@ CONFIG_PPC_UDBG_16550=y | |||
| 51 | CONFIG_AUDIT_ARCH=y | 53 | CONFIG_AUDIT_ARCH=y |
| 52 | CONFIG_GENERIC_BUG=y | 54 | CONFIG_GENERIC_BUG=y |
| 53 | CONFIG_DEFAULT_UIMAGE=y | 55 | CONFIG_DEFAULT_UIMAGE=y |
| 56 | CONFIG_HIBERNATE_32=y | ||
| 57 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
| 58 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
| 54 | # CONFIG_PPC_DCR_NATIVE is not set | 59 | # CONFIG_PPC_DCR_NATIVE is not set |
| 55 | # CONFIG_PPC_DCR_MMIO is not set | 60 | # CONFIG_PPC_DCR_MMIO is not set |
| 56 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 61 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| @@ -88,12 +93,12 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 88 | CONFIG_SYSCTL=y | 93 | CONFIG_SYSCTL=y |
| 89 | CONFIG_EMBEDDED=y | 94 | CONFIG_EMBEDDED=y |
| 90 | CONFIG_SYSCTL_SYSCALL=y | 95 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 92 | # CONFIG_KALLSYMS is not set | 96 | # CONFIG_KALLSYMS is not set |
| 93 | CONFIG_HOTPLUG=y | 97 | CONFIG_HOTPLUG=y |
| 94 | CONFIG_PRINTK=y | 98 | CONFIG_PRINTK=y |
| 95 | CONFIG_BUG=y | 99 | CONFIG_BUG=y |
| 96 | CONFIG_ELF_CORE=y | 100 | CONFIG_ELF_CORE=y |
| 101 | CONFIG_PCSPKR_PLATFORM=y | ||
| 97 | CONFIG_COMPAT_BRK=y | 102 | CONFIG_COMPAT_BRK=y |
| 98 | CONFIG_BASE_FULL=y | 103 | CONFIG_BASE_FULL=y |
| 99 | CONFIG_FUTEX=y | 104 | CONFIG_FUTEX=y |
| @@ -111,10 +116,16 @@ CONFIG_SLUB=y | |||
| 111 | # CONFIG_PROFILING is not set | 116 | # CONFIG_PROFILING is not set |
| 112 | # CONFIG_MARKERS is not set | 117 | # CONFIG_MARKERS is not set |
| 113 | CONFIG_HAVE_OPROFILE=y | 118 | CONFIG_HAVE_OPROFILE=y |
| 119 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 120 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 114 | CONFIG_HAVE_KPROBES=y | 121 | CONFIG_HAVE_KPROBES=y |
| 115 | CONFIG_HAVE_KRETPROBES=y | 122 | CONFIG_HAVE_KRETPROBES=y |
| 123 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 116 | # CONFIG_HAVE_DMA_ATTRS is not set | 124 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 125 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 126 | # CONFIG_HAVE_CLK is not set | ||
| 117 | CONFIG_PROC_PAGE_MONITOR=y | 127 | CONFIG_PROC_PAGE_MONITOR=y |
| 128 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 118 | CONFIG_SLABINFO=y | 129 | CONFIG_SLABINFO=y |
| 119 | CONFIG_RT_MUTEXES=y | 130 | CONFIG_RT_MUTEXES=y |
| 120 | # CONFIG_TINY_SHMEM is not set | 131 | # CONFIG_TINY_SHMEM is not set |
| @@ -125,12 +136,13 @@ CONFIG_MODULE_UNLOAD=y | |||
| 125 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 136 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 126 | # CONFIG_MODVERSIONS is not set | 137 | # CONFIG_MODVERSIONS is not set |
| 127 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 138 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 128 | # CONFIG_KMOD is not set | 139 | CONFIG_KMOD=y |
| 129 | CONFIG_BLOCK=y | 140 | CONFIG_BLOCK=y |
| 130 | # CONFIG_LBD is not set | 141 | # CONFIG_LBD is not set |
| 131 | # CONFIG_BLK_DEV_IO_TRACE is not set | 142 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 132 | # CONFIG_LSF is not set | 143 | # CONFIG_LSF is not set |
| 133 | # CONFIG_BLK_DEV_BSG is not set | 144 | # CONFIG_BLK_DEV_BSG is not set |
| 145 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 134 | 146 | ||
| 135 | # | 147 | # |
| 136 | # IO Schedulers | 148 | # IO Schedulers |
| @@ -149,37 +161,49 @@ CONFIG_CLASSIC_RCU=y | |||
| 149 | # | 161 | # |
| 150 | # Platform support | 162 | # Platform support |
| 151 | # | 163 | # |
| 152 | # CONFIG_PPC_MULTIPLATFORM is not set | 164 | CONFIG_PPC_MULTIPLATFORM=y |
| 153 | # CONFIG_PPC_82xx is not set | 165 | CONFIG_CLASSIC32=y |
| 154 | CONFIG_PPC_83xx=y | 166 | CONFIG_PPC_CHRP=y |
| 155 | # CONFIG_PPC_86xx is not set | 167 | # CONFIG_MPC5121_ADS is not set |
| 156 | # CONFIG_PPC_MPC512x is not set | 168 | # CONFIG_MPC5121_GENERIC is not set |
| 157 | # CONFIG_PPC_MPC5121 is not set | 169 | # CONFIG_PPC_MPC52xx is not set |
| 170 | CONFIG_PPC_PMAC=y | ||
| 158 | # CONFIG_PPC_CELL is not set | 171 | # CONFIG_PPC_CELL is not set |
| 159 | # CONFIG_PPC_CELL_NATIVE is not set | 172 | # CONFIG_PPC_CELL_NATIVE is not set |
| 173 | # CONFIG_PPC_82xx is not set | ||
| 160 | # CONFIG_PQ2ADS is not set | 174 | # CONFIG_PQ2ADS is not set |
| 161 | CONFIG_MPC83xx=y | 175 | CONFIG_PPC_83xx=y |
| 162 | # CONFIG_MPC831x_RDB is not set | 176 | # CONFIG_MPC831x_RDB is not set |
| 163 | CONFIG_MPC832x_MDS=y | 177 | CONFIG_MPC832x_MDS=y |
| 164 | # CONFIG_MPC832x_RDB is not set | 178 | # CONFIG_MPC832x_RDB is not set |
| 165 | # CONFIG_MPC834x_MDS is not set | 179 | # CONFIG_MPC834x_MDS is not set |
| 166 | # CONFIG_MPC834x_ITX is not set | 180 | # CONFIG_MPC834x_ITX is not set |
| 167 | # CONFIG_MPC836x_MDS is not set | 181 | # CONFIG_MPC836x_MDS is not set |
| 182 | # CONFIG_MPC836x_RDK is not set | ||
| 168 | # CONFIG_MPC837x_MDS is not set | 183 | # CONFIG_MPC837x_MDS is not set |
| 169 | # CONFIG_MPC837x_RDB is not set | 184 | # CONFIG_MPC837x_RDB is not set |
| 170 | # CONFIG_SBC834x is not set | 185 | # CONFIG_SBC834x is not set |
| 186 | # CONFIG_ASP834x is not set | ||
| 171 | CONFIG_PPC_MPC832x=y | 187 | CONFIG_PPC_MPC832x=y |
| 188 | # CONFIG_PPC_86xx is not set | ||
| 189 | # CONFIG_EMBEDDED6xx is not set | ||
| 190 | CONFIG_PPC_NATIVE=y | ||
| 191 | # CONFIG_UDBG_RTAS_CONSOLE is not set | ||
| 172 | CONFIG_IPIC=y | 192 | CONFIG_IPIC=y |
| 173 | # CONFIG_MPIC is not set | 193 | CONFIG_MPIC=y |
| 174 | # CONFIG_MPIC_WEIRD is not set | 194 | # CONFIG_MPIC_WEIRD is not set |
| 175 | # CONFIG_PPC_I8259 is not set | 195 | CONFIG_PPC_I8259=y |
| 176 | # CONFIG_PPC_RTAS is not set | 196 | CONFIG_PPC_RTAS=y |
| 197 | # CONFIG_RTAS_ERROR_LOGGING is not set | ||
| 198 | CONFIG_RTAS_PROC=y | ||
| 177 | # CONFIG_MMIO_NVRAM is not set | 199 | # CONFIG_MMIO_NVRAM is not set |
| 178 | # CONFIG_PPC_MPC106 is not set | 200 | CONFIG_PPC_MPC106=y |
| 179 | # CONFIG_PPC_970_NAP is not set | 201 | # CONFIG_PPC_970_NAP is not set |
| 180 | # CONFIG_PPC_INDIRECT_IO is not set | 202 | # CONFIG_PPC_INDIRECT_IO is not set |
| 181 | # CONFIG_GENERIC_IOMAP is not set | 203 | # CONFIG_GENERIC_IOMAP is not set |
| 182 | # CONFIG_CPU_FREQ is not set | 204 | # CONFIG_CPU_FREQ is not set |
| 205 | # CONFIG_PPC601_SYNC_FIX is not set | ||
| 206 | # CONFIG_TAU is not set | ||
| 183 | CONFIG_QUICC_ENGINE=y | 207 | CONFIG_QUICC_ENGINE=y |
| 184 | # CONFIG_FSL_ULI1575 is not set | 208 | # CONFIG_FSL_ULI1575 is not set |
| 185 | 209 | ||
| @@ -196,7 +220,7 @@ CONFIG_HZ_250=y | |||
| 196 | # CONFIG_HZ_300 is not set | 220 | # CONFIG_HZ_300 is not set |
| 197 | # CONFIG_HZ_1000 is not set | 221 | # CONFIG_HZ_1000 is not set |
| 198 | CONFIG_HZ=250 | 222 | CONFIG_HZ=250 |
| 199 | # CONFIG_SCHED_HRTICK is not set | 223 | CONFIG_SCHED_HRTICK=y |
| 200 | CONFIG_PREEMPT_NONE=y | 224 | CONFIG_PREEMPT_NONE=y |
| 201 | # CONFIG_PREEMPT_VOLUNTARY is not set | 225 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 202 | # CONFIG_PREEMPT is not set | 226 | # CONFIG_PREEMPT is not set |
| @@ -207,6 +231,7 @@ CONFIG_MATH_EMULATION=y | |||
| 207 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 231 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| 208 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 232 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
| 209 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 233 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
| 234 | # CONFIG_KEXEC is not set | ||
| 210 | CONFIG_ARCH_FLATMEM_ENABLE=y | 235 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 211 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 236 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
| 212 | CONFIG_SELECT_MEMORY_MODEL=y | 237 | CONFIG_SELECT_MEMORY_MODEL=y |
| @@ -219,6 +244,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 219 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 244 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 220 | CONFIG_PAGEFLAGS_EXTENDED=y | 245 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 221 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 246 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 247 | CONFIG_MIGRATION=y | ||
| 222 | # CONFIG_RESOURCES_64BIT is not set | 248 | # CONFIG_RESOURCES_64BIT is not set |
| 223 | CONFIG_ZONE_DMA_FLAG=1 | 249 | CONFIG_ZONE_DMA_FLAG=1 |
| 224 | CONFIG_BOUNCE=y | 250 | CONFIG_BOUNCE=y |
| @@ -226,6 +252,7 @@ CONFIG_VIRT_TO_BUS=y | |||
| 226 | CONFIG_FORCE_MAX_ZONEORDER=11 | 252 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 227 | CONFIG_PROC_DEVICETREE=y | 253 | CONFIG_PROC_DEVICETREE=y |
| 228 | # CONFIG_CMDLINE_BOOL is not set | 254 | # CONFIG_CMDLINE_BOOL is not set |
| 255 | CONFIG_EXTRA_TARGETS="" | ||
| 229 | # CONFIG_PM is not set | 256 | # CONFIG_PM is not set |
| 230 | CONFIG_SECCOMP=y | 257 | CONFIG_SECCOMP=y |
| 231 | CONFIG_ISA_DMA_API=y | 258 | CONFIG_ISA_DMA_API=y |
| @@ -233,10 +260,13 @@ CONFIG_ISA_DMA_API=y | |||
| 233 | # | 260 | # |
| 234 | # Bus options | 261 | # Bus options |
| 235 | # | 262 | # |
| 263 | # CONFIG_ISA is not set | ||
| 236 | CONFIG_ZONE_DMA=y | 264 | CONFIG_ZONE_DMA=y |
| 237 | CONFIG_GENERIC_ISA_DMA=y | 265 | CONFIG_GENERIC_ISA_DMA=y |
| 238 | CONFIG_PPC_INDIRECT_PCI=y | 266 | CONFIG_PPC_INDIRECT_PCI=y |
| 239 | CONFIG_FSL_SOC=y | 267 | CONFIG_FSL_SOC=y |
| 268 | CONFIG_FSL_PCI=y | ||
| 269 | CONFIG_PPC_PCI_CHOICE=y | ||
| 240 | CONFIG_PCI=y | 270 | CONFIG_PCI=y |
| 241 | CONFIG_PCI_DOMAINS=y | 271 | CONFIG_PCI_DOMAINS=y |
| 242 | CONFIG_PCI_SYSCALL=y | 272 | CONFIG_PCI_SYSCALL=y |
| @@ -261,10 +291,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
| 261 | CONFIG_KERNEL_START=0xc0000000 | 291 | CONFIG_KERNEL_START=0xc0000000 |
| 262 | CONFIG_PHYSICAL_START=0x00000000 | 292 | CONFIG_PHYSICAL_START=0x00000000 |
| 263 | CONFIG_TASK_SIZE=0xc0000000 | 293 | CONFIG_TASK_SIZE=0xc0000000 |
| 264 | |||
| 265 | # | ||
| 266 | # Networking | ||
| 267 | # | ||
| 268 | CONFIG_NET=y | 294 | CONFIG_NET=y |
| 269 | 295 | ||
| 270 | # | 296 | # |
| @@ -365,6 +391,7 @@ CONFIG_OF_I2C=y | |||
| 365 | # CONFIG_PARPORT is not set | 391 | # CONFIG_PARPORT is not set |
| 366 | CONFIG_BLK_DEV=y | 392 | CONFIG_BLK_DEV=y |
| 367 | # CONFIG_BLK_DEV_FD is not set | 393 | # CONFIG_BLK_DEV_FD is not set |
| 394 | # CONFIG_MAC_FLOPPY is not set | ||
| 368 | # CONFIG_BLK_CPQ_DA is not set | 395 | # CONFIG_BLK_CPQ_DA is not set |
| 369 | # CONFIG_BLK_CPQ_CISS_DA is not set | 396 | # CONFIG_BLK_CPQ_CISS_DA is not set |
| 370 | # CONFIG_BLK_DEV_DAC960 is not set | 397 | # CONFIG_BLK_DEV_DAC960 is not set |
| @@ -380,12 +407,14 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
| 380 | # CONFIG_BLK_DEV_XIP is not set | 407 | # CONFIG_BLK_DEV_XIP is not set |
| 381 | # CONFIG_CDROM_PKTCDVD is not set | 408 | # CONFIG_CDROM_PKTCDVD is not set |
| 382 | # CONFIG_ATA_OVER_ETH is not set | 409 | # CONFIG_ATA_OVER_ETH is not set |
| 410 | # CONFIG_BLK_DEV_HD is not set | ||
| 383 | CONFIG_MISC_DEVICES=y | 411 | CONFIG_MISC_DEVICES=y |
| 384 | # CONFIG_PHANTOM is not set | 412 | # CONFIG_PHANTOM is not set |
| 385 | # CONFIG_EEPROM_93CX6 is not set | 413 | # CONFIG_EEPROM_93CX6 is not set |
| 386 | # CONFIG_SGI_IOC4 is not set | 414 | # CONFIG_SGI_IOC4 is not set |
| 387 | # CONFIG_TIFM_CORE is not set | 415 | # CONFIG_TIFM_CORE is not set |
| 388 | # CONFIG_ENCLOSURE_SERVICES is not set | 416 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 417 | # CONFIG_HP_ILO is not set | ||
| 389 | CONFIG_HAVE_IDE=y | 418 | CONFIG_HAVE_IDE=y |
| 390 | # CONFIG_IDE is not set | 419 | # CONFIG_IDE is not set |
| 391 | 420 | ||
| @@ -462,7 +491,10 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 462 | # CONFIG_SCSI_DC390T is not set | 491 | # CONFIG_SCSI_DC390T is not set |
| 463 | # CONFIG_SCSI_NSP32 is not set | 492 | # CONFIG_SCSI_NSP32 is not set |
| 464 | # CONFIG_SCSI_DEBUG is not set | 493 | # CONFIG_SCSI_DEBUG is not set |
| 494 | # CONFIG_SCSI_MESH is not set | ||
| 495 | # CONFIG_SCSI_MAC53C94 is not set | ||
| 465 | # CONFIG_SCSI_SRP is not set | 496 | # CONFIG_SCSI_SRP is not set |
| 497 | # CONFIG_SCSI_DH is not set | ||
| 466 | # CONFIG_ATA is not set | 498 | # CONFIG_ATA is not set |
| 467 | # CONFIG_MD is not set | 499 | # CONFIG_MD is not set |
| 468 | # CONFIG_FUSION is not set | 500 | # CONFIG_FUSION is not set |
| @@ -470,12 +502,15 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 470 | # | 502 | # |
| 471 | # IEEE 1394 (FireWire) support | 503 | # IEEE 1394 (FireWire) support |
| 472 | # | 504 | # |
| 505 | |||
| 506 | # | ||
| 507 | # Enable only one of the two stacks, unless you know what you are doing | ||
| 508 | # | ||
| 473 | # CONFIG_FIREWIRE is not set | 509 | # CONFIG_FIREWIRE is not set |
| 474 | # CONFIG_IEEE1394 is not set | 510 | # CONFIG_IEEE1394 is not set |
| 475 | # CONFIG_I2O is not set | 511 | # CONFIG_I2O is not set |
| 476 | # CONFIG_MACINTOSH_DRIVERS is not set | 512 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 477 | CONFIG_NETDEVICES=y | 513 | CONFIG_NETDEVICES=y |
| 478 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 479 | # CONFIG_DUMMY is not set | 514 | # CONFIG_DUMMY is not set |
| 480 | # CONFIG_BONDING is not set | 515 | # CONFIG_BONDING is not set |
| 481 | # CONFIG_MACVLAN is not set | 516 | # CONFIG_MACVLAN is not set |
| @@ -502,6 +537,8 @@ CONFIG_DAVICOM_PHY=y | |||
| 502 | # CONFIG_MDIO_BITBANG is not set | 537 | # CONFIG_MDIO_BITBANG is not set |
| 503 | CONFIG_NET_ETHERNET=y | 538 | CONFIG_NET_ETHERNET=y |
| 504 | CONFIG_MII=y | 539 | CONFIG_MII=y |
| 540 | # CONFIG_MACE is not set | ||
| 541 | # CONFIG_BMAC is not set | ||
| 505 | # CONFIG_HAPPYMEAL is not set | 542 | # CONFIG_HAPPYMEAL is not set |
| 506 | # CONFIG_SUNGEM is not set | 543 | # CONFIG_SUNGEM is not set |
| 507 | # CONFIG_CASSINI is not set | 544 | # CONFIG_CASSINI is not set |
| @@ -519,7 +556,6 @@ CONFIG_NETDEV_1000=y | |||
| 519 | # CONFIG_DL2K is not set | 556 | # CONFIG_DL2K is not set |
| 520 | # CONFIG_E1000 is not set | 557 | # CONFIG_E1000 is not set |
| 521 | # CONFIG_E1000E is not set | 558 | # CONFIG_E1000E is not set |
| 522 | # CONFIG_E1000E_ENABLED is not set | ||
| 523 | # CONFIG_IP1000 is not set | 559 | # CONFIG_IP1000 is not set |
| 524 | # CONFIG_IGB is not set | 560 | # CONFIG_IGB is not set |
| 525 | # CONFIG_NS83820 is not set | 561 | # CONFIG_NS83820 is not set |
| @@ -534,12 +570,13 @@ CONFIG_NETDEV_1000=y | |||
| 534 | # CONFIG_BNX2 is not set | 570 | # CONFIG_BNX2 is not set |
| 535 | # CONFIG_GIANFAR is not set | 571 | # CONFIG_GIANFAR is not set |
| 536 | CONFIG_UCC_GETH=y | 572 | CONFIG_UCC_GETH=y |
| 537 | # CONFIG_UGETH_NAPI is not set | ||
| 538 | # CONFIG_UGETH_MAGIC_PACKET is not set | 573 | # CONFIG_UGETH_MAGIC_PACKET is not set |
| 539 | # CONFIG_UGETH_FILTERING is not set | 574 | # CONFIG_UGETH_FILTERING is not set |
| 540 | # CONFIG_UGETH_TX_ON_DEMAND is not set | 575 | # CONFIG_UGETH_TX_ON_DEMAND is not set |
| 576 | # CONFIG_MV643XX_ETH is not set | ||
| 541 | # CONFIG_QLA3XXX is not set | 577 | # CONFIG_QLA3XXX is not set |
| 542 | # CONFIG_ATL1 is not set | 578 | # CONFIG_ATL1 is not set |
| 579 | # CONFIG_ATL1E is not set | ||
| 543 | CONFIG_NETDEV_10000=y | 580 | CONFIG_NETDEV_10000=y |
| 544 | # CONFIG_CHELSIO_T1 is not set | 581 | # CONFIG_CHELSIO_T1 is not set |
| 545 | # CONFIG_CHELSIO_T3 is not set | 582 | # CONFIG_CHELSIO_T3 is not set |
| @@ -628,12 +665,15 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
| 628 | # CONFIG_SERIAL_UARTLITE is not set | 665 | # CONFIG_SERIAL_UARTLITE is not set |
| 629 | CONFIG_SERIAL_CORE=y | 666 | CONFIG_SERIAL_CORE=y |
| 630 | CONFIG_SERIAL_CORE_CONSOLE=y | 667 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 668 | # CONFIG_SERIAL_PMACZILOG is not set | ||
| 631 | # CONFIG_SERIAL_JSM is not set | 669 | # CONFIG_SERIAL_JSM is not set |
| 632 | # CONFIG_SERIAL_OF_PLATFORM is not set | 670 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 633 | # CONFIG_SERIAL_QE is not set | 671 | # CONFIG_SERIAL_QE is not set |
| 634 | CONFIG_UNIX98_PTYS=y | 672 | CONFIG_UNIX98_PTYS=y |
| 635 | CONFIG_LEGACY_PTYS=y | 673 | CONFIG_LEGACY_PTYS=y |
| 636 | CONFIG_LEGACY_PTY_COUNT=256 | 674 | CONFIG_LEGACY_PTY_COUNT=256 |
| 675 | # CONFIG_BRIQ_PANEL is not set | ||
| 676 | # CONFIG_HVC_RTAS is not set | ||
| 637 | # CONFIG_IPMI_HANDLER is not set | 677 | # CONFIG_IPMI_HANDLER is not set |
| 638 | CONFIG_HW_RANDOM=y | 678 | CONFIG_HW_RANDOM=y |
| 639 | # CONFIG_NVRAM is not set | 679 | # CONFIG_NVRAM is not set |
| @@ -645,42 +685,69 @@ CONFIG_DEVPORT=y | |||
| 645 | CONFIG_I2C=y | 685 | CONFIG_I2C=y |
| 646 | CONFIG_I2C_BOARDINFO=y | 686 | CONFIG_I2C_BOARDINFO=y |
| 647 | CONFIG_I2C_CHARDEV=y | 687 | CONFIG_I2C_CHARDEV=y |
| 688 | CONFIG_I2C_HELPER_AUTO=y | ||
| 648 | 689 | ||
| 649 | # | 690 | # |
| 650 | # I2C Hardware Bus support | 691 | # I2C Hardware Bus support |
| 651 | # | 692 | # |
| 693 | |||
| 694 | # | ||
| 695 | # PC SMBus host controller drivers | ||
| 696 | # | ||
| 652 | # CONFIG_I2C_ALI1535 is not set | 697 | # CONFIG_I2C_ALI1535 is not set |
| 653 | # CONFIG_I2C_ALI1563 is not set | 698 | # CONFIG_I2C_ALI1563 is not set |
| 654 | # CONFIG_I2C_ALI15X3 is not set | 699 | # CONFIG_I2C_ALI15X3 is not set |
| 655 | # CONFIG_I2C_AMD756 is not set | 700 | # CONFIG_I2C_AMD756 is not set |
| 656 | # CONFIG_I2C_AMD8111 is not set | 701 | # CONFIG_I2C_AMD8111 is not set |
| 657 | # CONFIG_I2C_I801 is not set | 702 | # CONFIG_I2C_I801 is not set |
| 658 | # CONFIG_I2C_I810 is not set | 703 | # CONFIG_I2C_ISCH is not set |
| 659 | # CONFIG_I2C_PIIX4 is not set | 704 | # CONFIG_I2C_PIIX4 is not set |
| 660 | CONFIG_I2C_MPC=y | ||
| 661 | # CONFIG_I2C_NFORCE2 is not set | 705 | # CONFIG_I2C_NFORCE2 is not set |
| 662 | # CONFIG_I2C_OCORES is not set | ||
| 663 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 664 | # CONFIG_I2C_PROSAVAGE is not set | ||
| 665 | # CONFIG_I2C_SAVAGE4 is not set | ||
| 666 | # CONFIG_I2C_SIMTEC is not set | ||
| 667 | # CONFIG_I2C_SIS5595 is not set | 706 | # CONFIG_I2C_SIS5595 is not set |
| 668 | # CONFIG_I2C_SIS630 is not set | 707 | # CONFIG_I2C_SIS630 is not set |
| 669 | # CONFIG_I2C_SIS96X is not set | 708 | # CONFIG_I2C_SIS96X is not set |
| 670 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 671 | # CONFIG_I2C_STUB is not set | ||
| 672 | # CONFIG_I2C_VIA is not set | 709 | # CONFIG_I2C_VIA is not set |
| 673 | # CONFIG_I2C_VIAPRO is not set | 710 | # CONFIG_I2C_VIAPRO is not set |
| 711 | |||
| 712 | # | ||
| 713 | # Mac SMBus host controller drivers | ||
| 714 | # | ||
| 715 | # CONFIG_I2C_HYDRA is not set | ||
| 716 | CONFIG_I2C_POWERMAC=y | ||
| 717 | |||
| 718 | # | ||
| 719 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 720 | # | ||
| 721 | CONFIG_I2C_MPC=y | ||
| 722 | # CONFIG_I2C_OCORES is not set | ||
| 723 | # CONFIG_I2C_SIMTEC is not set | ||
| 724 | |||
| 725 | # | ||
| 726 | # External I2C/SMBus adapter drivers | ||
| 727 | # | ||
| 728 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 729 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 730 | |||
| 731 | # | ||
| 732 | # Graphics adapter I2C/DDC channel drivers | ||
| 733 | # | ||
| 674 | # CONFIG_I2C_VOODOO3 is not set | 734 | # CONFIG_I2C_VOODOO3 is not set |
| 735 | |||
| 736 | # | ||
| 737 | # Other I2C/SMBus bus drivers | ||
| 738 | # | ||
| 675 | # CONFIG_I2C_PCA_PLATFORM is not set | 739 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 740 | # CONFIG_I2C_STUB is not set | ||
| 676 | 741 | ||
| 677 | # | 742 | # |
| 678 | # Miscellaneous I2C Chip support | 743 | # Miscellaneous I2C Chip support |
| 679 | # | 744 | # |
| 680 | # CONFIG_DS1682 is not set | 745 | # CONFIG_DS1682 is not set |
| 746 | # CONFIG_AT24 is not set | ||
| 681 | # CONFIG_SENSORS_EEPROM is not set | 747 | # CONFIG_SENSORS_EEPROM is not set |
| 682 | # CONFIG_SENSORS_PCF8574 is not set | 748 | # CONFIG_SENSORS_PCF8574 is not set |
| 683 | # CONFIG_PCF8575 is not set | 749 | # CONFIG_PCF8575 is not set |
| 750 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 684 | # CONFIG_SENSORS_PCF8591 is not set | 751 | # CONFIG_SENSORS_PCF8591 is not set |
| 685 | # CONFIG_SENSORS_MAX6875 is not set | 752 | # CONFIG_SENSORS_MAX6875 is not set |
| 686 | # CONFIG_SENSORS_TSL2550 is not set | 753 | # CONFIG_SENSORS_TSL2550 is not set |
| @@ -689,10 +756,13 @@ CONFIG_I2C_MPC=y | |||
| 689 | # CONFIG_I2C_DEBUG_BUS is not set | 756 | # CONFIG_I2C_DEBUG_BUS is not set |
| 690 | # CONFIG_I2C_DEBUG_CHIP is not set | 757 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 691 | # CONFIG_SPI is not set | 758 | # CONFIG_SPI is not set |
| 759 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 760 | # CONFIG_GPIOLIB is not set | ||
| 692 | # CONFIG_W1 is not set | 761 | # CONFIG_W1 is not set |
| 693 | # CONFIG_POWER_SUPPLY is not set | 762 | # CONFIG_POWER_SUPPLY is not set |
| 694 | CONFIG_HWMON=y | 763 | CONFIG_HWMON=y |
| 695 | # CONFIG_HWMON_VID is not set | 764 | # CONFIG_HWMON_VID is not set |
| 765 | # CONFIG_SENSORS_AD7414 is not set | ||
| 696 | # CONFIG_SENSORS_AD7418 is not set | 766 | # CONFIG_SENSORS_AD7418 is not set |
| 697 | # CONFIG_SENSORS_ADM1021 is not set | 767 | # CONFIG_SENSORS_ADM1021 is not set |
| 698 | # CONFIG_SENSORS_ADM1025 is not set | 768 | # CONFIG_SENSORS_ADM1025 is not set |
| @@ -702,6 +772,7 @@ CONFIG_HWMON=y | |||
| 702 | # CONFIG_SENSORS_ADM9240 is not set | 772 | # CONFIG_SENSORS_ADM9240 is not set |
| 703 | # CONFIG_SENSORS_ADT7470 is not set | 773 | # CONFIG_SENSORS_ADT7470 is not set |
| 704 | # CONFIG_SENSORS_ADT7473 is not set | 774 | # CONFIG_SENSORS_ADT7473 is not set |
| 775 | # CONFIG_SENSORS_AMS is not set | ||
| 705 | # CONFIG_SENSORS_ATXP1 is not set | 776 | # CONFIG_SENSORS_ATXP1 is not set |
| 706 | # CONFIG_SENSORS_DS1621 is not set | 777 | # CONFIG_SENSORS_DS1621 is not set |
| 707 | # CONFIG_SENSORS_I5K_AMB is not set | 778 | # CONFIG_SENSORS_I5K_AMB is not set |
| @@ -746,6 +817,7 @@ CONFIG_HWMON=y | |||
| 746 | # CONFIG_SENSORS_W83627EHF is not set | 817 | # CONFIG_SENSORS_W83627EHF is not set |
| 747 | # CONFIG_HWMON_DEBUG_CHIP is not set | 818 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 748 | # CONFIG_THERMAL is not set | 819 | # CONFIG_THERMAL is not set |
| 820 | # CONFIG_THERMAL_HWMON is not set | ||
| 749 | CONFIG_WATCHDOG=y | 821 | CONFIG_WATCHDOG=y |
| 750 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 822 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
| 751 | 823 | ||
| @@ -753,7 +825,9 @@ CONFIG_WATCHDOG=y | |||
| 753 | # Watchdog Device Drivers | 825 | # Watchdog Device Drivers |
| 754 | # | 826 | # |
| 755 | # CONFIG_SOFT_WATCHDOG is not set | 827 | # CONFIG_SOFT_WATCHDOG is not set |
| 756 | CONFIG_83xx_WDT=y | 828 | # CONFIG_ALIM7101_WDT is not set |
| 829 | # CONFIG_8xxx_WDT is not set | ||
| 830 | # CONFIG_WATCHDOG_RTAS is not set | ||
| 757 | 831 | ||
| 758 | # | 832 | # |
| 759 | # PCI-based Watchdog Cards | 833 | # PCI-based Watchdog Cards |
| @@ -770,8 +844,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 770 | # | 844 | # |
| 771 | # Multifunction device drivers | 845 | # Multifunction device drivers |
| 772 | # | 846 | # |
| 847 | # CONFIG_MFD_CORE is not set | ||
| 773 | # CONFIG_MFD_SM501 is not set | 848 | # CONFIG_MFD_SM501 is not set |
| 774 | # CONFIG_HTC_PASIC3 is not set | 849 | # CONFIG_HTC_PASIC3 is not set |
| 850 | # CONFIG_MFD_TMIO is not set | ||
| 775 | 851 | ||
| 776 | # | 852 | # |
| 777 | # Multimedia devices | 853 | # Multimedia devices |
| @@ -803,10 +879,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m | |||
| 803 | # Display device support | 879 | # Display device support |
| 804 | # | 880 | # |
| 805 | # CONFIG_DISPLAY_SUPPORT is not set | 881 | # CONFIG_DISPLAY_SUPPORT is not set |
| 806 | |||
| 807 | # | ||
| 808 | # Sound | ||
| 809 | # | ||
| 810 | # CONFIG_SOUND is not set | 882 | # CONFIG_SOUND is not set |
| 811 | CONFIG_HID_SUPPORT=y | 883 | CONFIG_HID_SUPPORT=y |
| 812 | CONFIG_HID=y | 884 | CONFIG_HID=y |
| @@ -821,6 +893,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 821 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 893 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
| 822 | 894 | ||
| 823 | # | 895 | # |
| 896 | # Enable Host or Gadget support to see Inventra options | ||
| 897 | # | ||
| 898 | |||
| 899 | # | ||
| 824 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 900 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 825 | # | 901 | # |
| 826 | # CONFIG_USB_GADGET is not set | 902 | # CONFIG_USB_GADGET is not set |
| @@ -859,6 +935,7 @@ CONFIG_RTC_DRV_DS1374=y | |||
| 859 | # CONFIG_RTC_DRV_PCF8583 is not set | 935 | # CONFIG_RTC_DRV_PCF8583 is not set |
| 860 | # CONFIG_RTC_DRV_M41T80 is not set | 936 | # CONFIG_RTC_DRV_M41T80 is not set |
| 861 | # CONFIG_RTC_DRV_S35390A is not set | 937 | # CONFIG_RTC_DRV_S35390A is not set |
| 938 | # CONFIG_RTC_DRV_FM3130 is not set | ||
| 862 | 939 | ||
| 863 | # | 940 | # |
| 864 | # SPI RTC drivers | 941 | # SPI RTC drivers |
| @@ -947,6 +1024,7 @@ CONFIG_TMPFS=y | |||
| 947 | # CONFIG_CRAMFS is not set | 1024 | # CONFIG_CRAMFS is not set |
| 948 | # CONFIG_VXFS_FS is not set | 1025 | # CONFIG_VXFS_FS is not set |
| 949 | # CONFIG_MINIX_FS is not set | 1026 | # CONFIG_MINIX_FS is not set |
| 1027 | # CONFIG_OMFS_FS is not set | ||
| 950 | # CONFIG_HPFS_FS is not set | 1028 | # CONFIG_HPFS_FS is not set |
| 951 | # CONFIG_QNX4FS_FS is not set | 1029 | # CONFIG_QNX4FS_FS is not set |
| 952 | # CONFIG_ROMFS_FS is not set | 1030 | # CONFIG_ROMFS_FS is not set |
| @@ -957,14 +1035,13 @@ CONFIG_NFS_FS=y | |||
| 957 | CONFIG_NFS_V3=y | 1035 | CONFIG_NFS_V3=y |
| 958 | # CONFIG_NFS_V3_ACL is not set | 1036 | # CONFIG_NFS_V3_ACL is not set |
| 959 | CONFIG_NFS_V4=y | 1037 | CONFIG_NFS_V4=y |
| 960 | # CONFIG_NFSD is not set | ||
| 961 | CONFIG_ROOT_NFS=y | 1038 | CONFIG_ROOT_NFS=y |
| 1039 | # CONFIG_NFSD is not set | ||
| 962 | CONFIG_LOCKD=y | 1040 | CONFIG_LOCKD=y |
| 963 | CONFIG_LOCKD_V4=y | 1041 | CONFIG_LOCKD_V4=y |
| 964 | CONFIG_NFS_COMMON=y | 1042 | CONFIG_NFS_COMMON=y |
| 965 | CONFIG_SUNRPC=y | 1043 | CONFIG_SUNRPC=y |
| 966 | CONFIG_SUNRPC_GSS=y | 1044 | CONFIG_SUNRPC_GSS=y |
| 967 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 968 | CONFIG_RPCSEC_GSS_KRB5=y | 1045 | CONFIG_RPCSEC_GSS_KRB5=y |
| 969 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1046 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 970 | # CONFIG_SMB_FS is not set | 1047 | # CONFIG_SMB_FS is not set |
| @@ -994,6 +1071,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
| 994 | # CONFIG_DLM is not set | 1071 | # CONFIG_DLM is not set |
| 995 | CONFIG_UCC_FAST=y | 1072 | CONFIG_UCC_FAST=y |
| 996 | CONFIG_UCC=y | 1073 | CONFIG_UCC=y |
| 1074 | # CONFIG_QE_GPIO is not set | ||
| 997 | 1075 | ||
| 998 | # | 1076 | # |
| 999 | # Library routines | 1077 | # Library routines |
| @@ -1002,6 +1080,7 @@ CONFIG_BITREVERSE=y | |||
| 1002 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1080 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 1003 | # CONFIG_CRC_CCITT is not set | 1081 | # CONFIG_CRC_CCITT is not set |
| 1004 | # CONFIG_CRC16 is not set | 1082 | # CONFIG_CRC16 is not set |
| 1083 | # CONFIG_CRC_T10DIF is not set | ||
| 1005 | # CONFIG_CRC_ITU_T is not set | 1084 | # CONFIG_CRC_ITU_T is not set |
| 1006 | CONFIG_CRC32=y | 1085 | CONFIG_CRC32=y |
| 1007 | # CONFIG_CRC7 is not set | 1086 | # CONFIG_CRC7 is not set |
| @@ -1027,8 +1106,18 @@ CONFIG_FRAME_WARN=1024 | |||
| 1027 | # CONFIG_SLUB_DEBUG_ON is not set | 1106 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1028 | # CONFIG_SLUB_STATS is not set | 1107 | # CONFIG_SLUB_STATS is not set |
| 1029 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1108 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1109 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 1110 | # CONFIG_LATENCYTOP is not set | ||
| 1111 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1112 | CONFIG_HAVE_FTRACE=y | ||
| 1113 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1114 | # CONFIG_FTRACE is not set | ||
| 1115 | # CONFIG_SCHED_TRACER is not set | ||
| 1116 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1030 | # CONFIG_SAMPLES is not set | 1117 | # CONFIG_SAMPLES is not set |
| 1118 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1031 | # CONFIG_IRQSTACKS is not set | 1119 | # CONFIG_IRQSTACKS is not set |
| 1120 | # CONFIG_BOOTX_TEXT is not set | ||
| 1032 | # CONFIG_PPC_EARLY_DEBUG is not set | 1121 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1033 | 1122 | ||
| 1034 | # | 1123 | # |
| @@ -1082,6 +1171,10 @@ CONFIG_CRYPTO_PCBC=m | |||
| 1082 | # CONFIG_CRYPTO_MD4 is not set | 1171 | # CONFIG_CRYPTO_MD4 is not set |
| 1083 | CONFIG_CRYPTO_MD5=y | 1172 | CONFIG_CRYPTO_MD5=y |
| 1084 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1173 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 1174 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1175 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1176 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1177 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1085 | # CONFIG_CRYPTO_SHA1 is not set | 1178 | # CONFIG_CRYPTO_SHA1 is not set |
| 1086 | # CONFIG_CRYPTO_SHA256 is not set | 1179 | # CONFIG_CRYPTO_SHA256 is not set |
| 1087 | # CONFIG_CRYPTO_SHA512 is not set | 1180 | # CONFIG_CRYPTO_SHA512 is not set |
| @@ -1114,6 +1207,7 @@ CONFIG_CRYPTO_DES=y | |||
| 1114 | # CONFIG_CRYPTO_LZO is not set | 1207 | # CONFIG_CRYPTO_LZO is not set |
| 1115 | CONFIG_CRYPTO_HW=y | 1208 | CONFIG_CRYPTO_HW=y |
| 1116 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1209 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1210 | # CONFIG_CRYPTO_DEV_TALITOS is not set | ||
| 1117 | # CONFIG_PPC_CLOCK is not set | 1211 | # CONFIG_PPC_CLOCK is not set |
| 1118 | CONFIG_PPC_LIB_RHEAP=y | 1212 | CONFIG_PPC_LIB_RHEAP=y |
| 1119 | # CONFIG_VIRTUALIZATION is not set | 1213 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig b/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig index de95d327463c..4eef8c95480e 100644 --- a/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig +++ b/arch/powerpc/configs/83xx/mpc832x_rdb_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.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Mon Jun 9 08:52:24 2008 | 4 | # Thu Aug 21 00:52:19 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -16,6 +16,7 @@ CONFIG_6xx=y | |||
| 16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
| 17 | CONFIG_PPC_FPU=y | 17 | CONFIG_PPC_FPU=y |
| 18 | # CONFIG_FSL_EMB_PERFMON is not set | 18 | # CONFIG_FSL_EMB_PERFMON is not set |
| 19 | # CONFIG_ALTIVEC is not set | ||
| 19 | CONFIG_PPC_STD_MMU=y | 20 | CONFIG_PPC_STD_MMU=y |
| 20 | CONFIG_PPC_STD_MMU_32=y | 21 | CONFIG_PPC_STD_MMU_32=y |
| 21 | # CONFIG_PPC_MM_SLICES is not set | 22 | # CONFIG_PPC_MM_SLICES is not set |
| @@ -32,6 +33,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | 35 | CONFIG_STACKTRACE_SUPPORT=y |
| 36 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | 37 | CONFIG_LOCKDEP_SUPPORT=y |
| 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 39 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| @@ -51,6 +53,9 @@ CONFIG_PPC_UDBG_16550=y | |||
| 51 | CONFIG_AUDIT_ARCH=y | 53 | CONFIG_AUDIT_ARCH=y |
| 52 | CONFIG_GENERIC_BUG=y | 54 | CONFIG_GENERIC_BUG=y |
| 53 | CONFIG_DEFAULT_UIMAGE=y | 55 | CONFIG_DEFAULT_UIMAGE=y |
| 56 | CONFIG_HIBERNATE_32=y | ||
| 57 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
| 58 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
| 54 | # CONFIG_PPC_DCR_NATIVE is not set | 59 | # CONFIG_PPC_DCR_NATIVE is not set |
| 55 | # CONFIG_PPC_DCR_MMIO is not set | 60 | # CONFIG_PPC_DCR_MMIO is not set |
| 56 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 61 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| @@ -88,12 +93,12 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 88 | CONFIG_SYSCTL=y | 93 | CONFIG_SYSCTL=y |
| 89 | CONFIG_EMBEDDED=y | 94 | CONFIG_EMBEDDED=y |
| 90 | CONFIG_SYSCTL_SYSCALL=y | 95 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 92 | # CONFIG_KALLSYMS is not set | 96 | # CONFIG_KALLSYMS is not set |
| 93 | CONFIG_HOTPLUG=y | 97 | CONFIG_HOTPLUG=y |
| 94 | CONFIG_PRINTK=y | 98 | CONFIG_PRINTK=y |
| 95 | CONFIG_BUG=y | 99 | CONFIG_BUG=y |
| 96 | CONFIG_ELF_CORE=y | 100 | CONFIG_ELF_CORE=y |
| 101 | CONFIG_PCSPKR_PLATFORM=y | ||
| 97 | CONFIG_COMPAT_BRK=y | 102 | CONFIG_COMPAT_BRK=y |
| 98 | CONFIG_BASE_FULL=y | 103 | CONFIG_BASE_FULL=y |
| 99 | CONFIG_FUTEX=y | 104 | CONFIG_FUTEX=y |
| @@ -111,10 +116,16 @@ CONFIG_SLUB=y | |||
| 111 | # CONFIG_PROFILING is not set | 116 | # CONFIG_PROFILING is not set |
| 112 | # CONFIG_MARKERS is not set | 117 | # CONFIG_MARKERS is not set |
| 113 | CONFIG_HAVE_OPROFILE=y | 118 | CONFIG_HAVE_OPROFILE=y |
| 119 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 120 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 114 | CONFIG_HAVE_KPROBES=y | 121 | CONFIG_HAVE_KPROBES=y |
| 115 | CONFIG_HAVE_KRETPROBES=y | 122 | CONFIG_HAVE_KRETPROBES=y |
| 123 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 116 | # CONFIG_HAVE_DMA_ATTRS is not set | 124 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 125 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 126 | # CONFIG_HAVE_CLK is not set | ||
| 117 | CONFIG_PROC_PAGE_MONITOR=y | 127 | CONFIG_PROC_PAGE_MONITOR=y |
| 128 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 118 | CONFIG_SLABINFO=y | 129 | CONFIG_SLABINFO=y |
| 119 | CONFIG_RT_MUTEXES=y | 130 | CONFIG_RT_MUTEXES=y |
| 120 | # CONFIG_TINY_SHMEM is not set | 131 | # CONFIG_TINY_SHMEM is not set |
| @@ -125,12 +136,13 @@ CONFIG_MODULE_UNLOAD=y | |||
| 125 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 136 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 126 | # CONFIG_MODVERSIONS is not set | 137 | # CONFIG_MODVERSIONS is not set |
| 127 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 138 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 128 | # CONFIG_KMOD is not set | 139 | CONFIG_KMOD=y |
| 129 | CONFIG_BLOCK=y | 140 | CONFIG_BLOCK=y |
| 130 | # CONFIG_LBD is not set | 141 | # CONFIG_LBD is not set |
| 131 | # CONFIG_BLK_DEV_IO_TRACE is not set | 142 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 132 | # CONFIG_LSF is not set | 143 | # CONFIG_LSF is not set |
| 133 | # CONFIG_BLK_DEV_BSG is not set | 144 | # CONFIG_BLK_DEV_BSG is not set |
| 145 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 134 | 146 | ||
| 135 | # | 147 | # |
| 136 | # IO Schedulers | 148 | # IO Schedulers |
| @@ -149,37 +161,49 @@ CONFIG_CLASSIC_RCU=y | |||
| 149 | # | 161 | # |
| 150 | # Platform support | 162 | # Platform support |
| 151 | # | 163 | # |
| 152 | # CONFIG_PPC_MULTIPLATFORM is not set | 164 | CONFIG_PPC_MULTIPLATFORM=y |
| 153 | # CONFIG_PPC_82xx is not set | 165 | CONFIG_CLASSIC32=y |
| 154 | CONFIG_PPC_83xx=y | 166 | CONFIG_PPC_CHRP=y |
| 155 | # CONFIG_PPC_86xx is not set | 167 | # CONFIG_MPC5121_ADS is not set |
| 156 | # CONFIG_PPC_MPC512x is not set | 168 | # CONFIG_MPC5121_GENERIC is not set |
| 157 | # CONFIG_PPC_MPC5121 is not set | 169 | # CONFIG_PPC_MPC52xx is not set |
| 170 | CONFIG_PPC_PMAC=y | ||
| 158 | # CONFIG_PPC_CELL is not set | 171 | # CONFIG_PPC_CELL is not set |
| 159 | # CONFIG_PPC_CELL_NATIVE is not set | 172 | # CONFIG_PPC_CELL_NATIVE is not set |
| 173 | # CONFIG_PPC_82xx is not set | ||
| 160 | # CONFIG_PQ2ADS is not set | 174 | # CONFIG_PQ2ADS is not set |
| 161 | CONFIG_MPC83xx=y | 175 | CONFIG_PPC_83xx=y |
| 162 | # CONFIG_MPC831x_RDB is not set | 176 | # CONFIG_MPC831x_RDB is not set |
| 163 | # CONFIG_MPC832x_MDS is not set | 177 | # CONFIG_MPC832x_MDS is not set |
| 164 | CONFIG_MPC832x_RDB=y | 178 | CONFIG_MPC832x_RDB=y |
| 165 | # CONFIG_MPC834x_MDS is not set | 179 | # CONFIG_MPC834x_MDS is not set |
| 166 | # CONFIG_MPC834x_ITX is not set | 180 | # CONFIG_MPC834x_ITX is not set |
| 167 | # CONFIG_MPC836x_MDS is not set | 181 | # CONFIG_MPC836x_MDS is not set |
| 182 | # CONFIG_MPC836x_RDK is not set | ||
| 168 | # CONFIG_MPC837x_MDS is not set | 183 | # CONFIG_MPC837x_MDS is not set |
| 169 | # CONFIG_MPC837x_RDB is not set | 184 | # CONFIG_MPC837x_RDB is not set |
| 170 | # CONFIG_SBC834x is not set | 185 | # CONFIG_SBC834x is not set |
| 186 | # CONFIG_ASP834x is not set | ||
| 171 | CONFIG_PPC_MPC832x=y | 187 | CONFIG_PPC_MPC832x=y |
| 188 | # CONFIG_PPC_86xx is not set | ||
| 189 | # CONFIG_EMBEDDED6xx is not set | ||
| 190 | CONFIG_PPC_NATIVE=y | ||
| 191 | # CONFIG_UDBG_RTAS_CONSOLE is not set | ||
| 172 | CONFIG_IPIC=y | 192 | CONFIG_IPIC=y |
| 173 | # CONFIG_MPIC is not set | 193 | CONFIG_MPIC=y |
| 174 | # CONFIG_MPIC_WEIRD is not set | 194 | # CONFIG_MPIC_WEIRD is not set |
| 175 | # CONFIG_PPC_I8259 is not set | 195 | CONFIG_PPC_I8259=y |
| 176 | # CONFIG_PPC_RTAS is not set | 196 | CONFIG_PPC_RTAS=y |
| 197 | # CONFIG_RTAS_ERROR_LOGGING is not set | ||
| 198 | CONFIG_RTAS_PROC=y | ||
| 177 | # CONFIG_MMIO_NVRAM is not set | 199 | # CONFIG_MMIO_NVRAM is not set |
| 178 | # CONFIG_PPC_MPC106 is not set | 200 | CONFIG_PPC_MPC106=y |
| 179 | # CONFIG_PPC_970_NAP is not set | 201 | # CONFIG_PPC_970_NAP is not set |
| 180 | # CONFIG_PPC_INDIRECT_IO is not set | 202 | # CONFIG_PPC_INDIRECT_IO is not set |
| 181 | # CONFIG_GENERIC_IOMAP is not set | 203 | # CONFIG_GENERIC_IOMAP is not set |
| 182 | # CONFIG_CPU_FREQ is not set | 204 | # CONFIG_CPU_FREQ is not set |
| 205 | # CONFIG_PPC601_SYNC_FIX is not set | ||
| 206 | # CONFIG_TAU is not set | ||
| 183 | CONFIG_QUICC_ENGINE=y | 207 | CONFIG_QUICC_ENGINE=y |
| 184 | # CONFIG_FSL_ULI1575 is not set | 208 | # CONFIG_FSL_ULI1575 is not set |
| 185 | 209 | ||
| @@ -196,7 +220,7 @@ CONFIG_HZ_250=y | |||
| 196 | # CONFIG_HZ_300 is not set | 220 | # CONFIG_HZ_300 is not set |
| 197 | # CONFIG_HZ_1000 is not set | 221 | # CONFIG_HZ_1000 is not set |
| 198 | CONFIG_HZ=250 | 222 | CONFIG_HZ=250 |
| 199 | # CONFIG_SCHED_HRTICK is not set | 223 | CONFIG_SCHED_HRTICK=y |
| 200 | CONFIG_PREEMPT_NONE=y | 224 | CONFIG_PREEMPT_NONE=y |
| 201 | # CONFIG_PREEMPT_VOLUNTARY is not set | 225 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 202 | # CONFIG_PREEMPT is not set | 226 | # CONFIG_PREEMPT is not set |
| @@ -207,6 +231,7 @@ CONFIG_MATH_EMULATION=y | |||
| 207 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 231 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| 208 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 232 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
| 209 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 233 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
| 234 | # CONFIG_KEXEC is not set | ||
| 210 | CONFIG_ARCH_FLATMEM_ENABLE=y | 235 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 211 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 236 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
| 212 | CONFIG_SELECT_MEMORY_MODEL=y | 237 | CONFIG_SELECT_MEMORY_MODEL=y |
| @@ -219,6 +244,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 219 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 244 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 220 | CONFIG_PAGEFLAGS_EXTENDED=y | 245 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 221 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 246 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 247 | CONFIG_MIGRATION=y | ||
| 222 | # CONFIG_RESOURCES_64BIT is not set | 248 | # CONFIG_RESOURCES_64BIT is not set |
| 223 | CONFIG_ZONE_DMA_FLAG=1 | 249 | CONFIG_ZONE_DMA_FLAG=1 |
| 224 | CONFIG_BOUNCE=y | 250 | CONFIG_BOUNCE=y |
| @@ -226,6 +252,7 @@ CONFIG_VIRT_TO_BUS=y | |||
| 226 | CONFIG_FORCE_MAX_ZONEORDER=11 | 252 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 227 | CONFIG_PROC_DEVICETREE=y | 253 | CONFIG_PROC_DEVICETREE=y |
| 228 | # CONFIG_CMDLINE_BOOL is not set | 254 | # CONFIG_CMDLINE_BOOL is not set |
| 255 | CONFIG_EXTRA_TARGETS="" | ||
| 229 | # CONFIG_PM is not set | 256 | # CONFIG_PM is not set |
| 230 | CONFIG_SECCOMP=y | 257 | CONFIG_SECCOMP=y |
| 231 | CONFIG_ISA_DMA_API=y | 258 | CONFIG_ISA_DMA_API=y |
| @@ -233,10 +260,13 @@ CONFIG_ISA_DMA_API=y | |||
| 233 | # | 260 | # |
| 234 | # Bus options | 261 | # Bus options |
| 235 | # | 262 | # |
| 263 | # CONFIG_ISA is not set | ||
| 236 | CONFIG_ZONE_DMA=y | 264 | CONFIG_ZONE_DMA=y |
| 237 | CONFIG_GENERIC_ISA_DMA=y | 265 | CONFIG_GENERIC_ISA_DMA=y |
| 238 | CONFIG_PPC_INDIRECT_PCI=y | 266 | CONFIG_PPC_INDIRECT_PCI=y |
| 239 | CONFIG_FSL_SOC=y | 267 | CONFIG_FSL_SOC=y |
| 268 | CONFIG_FSL_PCI=y | ||
| 269 | CONFIG_PPC_PCI_CHOICE=y | ||
| 240 | CONFIG_PCI=y | 270 | CONFIG_PCI=y |
| 241 | CONFIG_PCI_DOMAINS=y | 271 | CONFIG_PCI_DOMAINS=y |
| 242 | CONFIG_PCI_SYSCALL=y | 272 | CONFIG_PCI_SYSCALL=y |
| @@ -261,10 +291,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
| 261 | CONFIG_KERNEL_START=0xc0000000 | 291 | CONFIG_KERNEL_START=0xc0000000 |
| 262 | CONFIG_PHYSICAL_START=0x00000000 | 292 | CONFIG_PHYSICAL_START=0x00000000 |
| 263 | CONFIG_TASK_SIZE=0xc0000000 | 293 | CONFIG_TASK_SIZE=0xc0000000 |
| 264 | |||
| 265 | # | ||
| 266 | # Networking | ||
| 267 | # | ||
| 268 | CONFIG_NET=y | 294 | CONFIG_NET=y |
| 269 | 295 | ||
| 270 | # | 296 | # |
| @@ -362,9 +388,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 362 | # CONFIG_MTD is not set | 388 | # CONFIG_MTD is not set |
| 363 | CONFIG_OF_DEVICE=y | 389 | CONFIG_OF_DEVICE=y |
| 364 | CONFIG_OF_I2C=y | 390 | CONFIG_OF_I2C=y |
| 391 | CONFIG_OF_SPI=y | ||
| 365 | # CONFIG_PARPORT is not set | 392 | # CONFIG_PARPORT is not set |
| 366 | CONFIG_BLK_DEV=y | 393 | CONFIG_BLK_DEV=y |
| 367 | # CONFIG_BLK_DEV_FD is not set | 394 | # CONFIG_BLK_DEV_FD is not set |
| 395 | # CONFIG_MAC_FLOPPY is not set | ||
| 368 | # CONFIG_BLK_CPQ_DA is not set | 396 | # CONFIG_BLK_CPQ_DA is not set |
| 369 | # CONFIG_BLK_CPQ_CISS_DA is not set | 397 | # CONFIG_BLK_CPQ_CISS_DA is not set |
| 370 | # CONFIG_BLK_DEV_DAC960 is not set | 398 | # CONFIG_BLK_DEV_DAC960 is not set |
| @@ -381,12 +409,14 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
| 381 | # CONFIG_BLK_DEV_XIP is not set | 409 | # CONFIG_BLK_DEV_XIP is not set |
| 382 | # CONFIG_CDROM_PKTCDVD is not set | 410 | # CONFIG_CDROM_PKTCDVD is not set |
| 383 | # CONFIG_ATA_OVER_ETH is not set | 411 | # CONFIG_ATA_OVER_ETH is not set |
| 412 | # CONFIG_BLK_DEV_HD is not set | ||
| 384 | CONFIG_MISC_DEVICES=y | 413 | CONFIG_MISC_DEVICES=y |
| 385 | # CONFIG_PHANTOM is not set | 414 | # CONFIG_PHANTOM is not set |
| 386 | # CONFIG_EEPROM_93CX6 is not set | 415 | # CONFIG_EEPROM_93CX6 is not set |
| 387 | # CONFIG_SGI_IOC4 is not set | 416 | # CONFIG_SGI_IOC4 is not set |
| 388 | # CONFIG_TIFM_CORE is not set | 417 | # CONFIG_TIFM_CORE is not set |
| 389 | # CONFIG_ENCLOSURE_SERVICES is not set | 418 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 419 | # CONFIG_HP_ILO is not set | ||
| 390 | CONFIG_HAVE_IDE=y | 420 | CONFIG_HAVE_IDE=y |
| 391 | # CONFIG_IDE is not set | 421 | # CONFIG_IDE is not set |
| 392 | 422 | ||
| @@ -463,7 +493,10 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 463 | # CONFIG_SCSI_DC390T is not set | 493 | # CONFIG_SCSI_DC390T is not set |
| 464 | # CONFIG_SCSI_NSP32 is not set | 494 | # CONFIG_SCSI_NSP32 is not set |
| 465 | # CONFIG_SCSI_DEBUG is not set | 495 | # CONFIG_SCSI_DEBUG is not set |
| 496 | # CONFIG_SCSI_MESH is not set | ||
| 497 | # CONFIG_SCSI_MAC53C94 is not set | ||
| 466 | # CONFIG_SCSI_SRP is not set | 498 | # CONFIG_SCSI_SRP is not set |
| 499 | # CONFIG_SCSI_DH is not set | ||
| 467 | # CONFIG_ATA is not set | 500 | # CONFIG_ATA is not set |
| 468 | # CONFIG_MD is not set | 501 | # CONFIG_MD is not set |
| 469 | # CONFIG_FUSION is not set | 502 | # CONFIG_FUSION is not set |
| @@ -471,12 +504,15 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 471 | # | 504 | # |
| 472 | # IEEE 1394 (FireWire) support | 505 | # IEEE 1394 (FireWire) support |
| 473 | # | 506 | # |
| 507 | |||
| 508 | # | ||
| 509 | # Enable only one of the two stacks, unless you know what you are doing | ||
| 510 | # | ||
| 474 | # CONFIG_FIREWIRE is not set | 511 | # CONFIG_FIREWIRE is not set |
| 475 | # CONFIG_IEEE1394 is not set | 512 | # CONFIG_IEEE1394 is not set |
| 476 | # CONFIG_I2O is not set | 513 | # CONFIG_I2O is not set |
| 477 | # CONFIG_MACINTOSH_DRIVERS is not set | 514 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 478 | CONFIG_NETDEVICES=y | 515 | CONFIG_NETDEVICES=y |
| 479 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 480 | # CONFIG_DUMMY is not set | 516 | # CONFIG_DUMMY is not set |
| 481 | # CONFIG_BONDING is not set | 517 | # CONFIG_BONDING is not set |
| 482 | # CONFIG_MACVLAN is not set | 518 | # CONFIG_MACVLAN is not set |
| @@ -503,6 +539,8 @@ CONFIG_ICPLUS_PHY=y | |||
| 503 | # CONFIG_MDIO_BITBANG is not set | 539 | # CONFIG_MDIO_BITBANG is not set |
| 504 | CONFIG_NET_ETHERNET=y | 540 | CONFIG_NET_ETHERNET=y |
| 505 | CONFIG_MII=y | 541 | CONFIG_MII=y |
| 542 | # CONFIG_MACE is not set | ||
| 543 | # CONFIG_BMAC is not set | ||
| 506 | # CONFIG_HAPPYMEAL is not set | 544 | # CONFIG_HAPPYMEAL is not set |
| 507 | # CONFIG_SUNGEM is not set | 545 | # CONFIG_SUNGEM is not set |
| 508 | # CONFIG_CASSINI is not set | 546 | # CONFIG_CASSINI is not set |
| @@ -520,10 +558,8 @@ CONFIG_NETDEV_1000=y | |||
| 520 | # CONFIG_ACENIC is not set | 558 | # CONFIG_ACENIC is not set |
| 521 | # CONFIG_DL2K is not set | 559 | # CONFIG_DL2K is not set |
| 522 | CONFIG_E1000=y | 560 | CONFIG_E1000=y |
| 523 | # CONFIG_E1000_NAPI is not set | ||
| 524 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | 561 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set |
| 525 | # CONFIG_E1000E is not set | 562 | # CONFIG_E1000E is not set |
| 526 | # CONFIG_E1000E_ENABLED is not set | ||
| 527 | # CONFIG_IP1000 is not set | 563 | # CONFIG_IP1000 is not set |
| 528 | # CONFIG_IGB is not set | 564 | # CONFIG_IGB is not set |
| 529 | # CONFIG_NS83820 is not set | 565 | # CONFIG_NS83820 is not set |
| @@ -538,12 +574,13 @@ CONFIG_E1000=y | |||
| 538 | # CONFIG_BNX2 is not set | 574 | # CONFIG_BNX2 is not set |
| 539 | # CONFIG_GIANFAR is not set | 575 | # CONFIG_GIANFAR is not set |
| 540 | CONFIG_UCC_GETH=y | 576 | CONFIG_UCC_GETH=y |
| 541 | CONFIG_UGETH_NAPI=y | ||
| 542 | # CONFIG_UGETH_MAGIC_PACKET is not set | 577 | # CONFIG_UGETH_MAGIC_PACKET is not set |
| 543 | # CONFIG_UGETH_FILTERING is not set | 578 | # CONFIG_UGETH_FILTERING is not set |
| 544 | # CONFIG_UGETH_TX_ON_DEMAND is not set | 579 | # CONFIG_UGETH_TX_ON_DEMAND is not set |
| 580 | # CONFIG_MV643XX_ETH is not set | ||
| 545 | # CONFIG_QLA3XXX is not set | 581 | # CONFIG_QLA3XXX is not set |
| 546 | # CONFIG_ATL1 is not set | 582 | # CONFIG_ATL1 is not set |
| 583 | # CONFIG_ATL1E is not set | ||
| 547 | CONFIG_NETDEV_10000=y | 584 | CONFIG_NETDEV_10000=y |
| 548 | # CONFIG_CHELSIO_T1 is not set | 585 | # CONFIG_CHELSIO_T1 is not set |
| 549 | # CONFIG_CHELSIO_T3 is not set | 586 | # CONFIG_CHELSIO_T3 is not set |
| @@ -641,12 +678,15 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
| 641 | # CONFIG_SERIAL_UARTLITE is not set | 678 | # CONFIG_SERIAL_UARTLITE is not set |
| 642 | CONFIG_SERIAL_CORE=y | 679 | CONFIG_SERIAL_CORE=y |
| 643 | CONFIG_SERIAL_CORE_CONSOLE=y | 680 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 681 | # CONFIG_SERIAL_PMACZILOG is not set | ||
| 644 | # CONFIG_SERIAL_JSM is not set | 682 | # CONFIG_SERIAL_JSM is not set |
| 645 | # CONFIG_SERIAL_OF_PLATFORM is not set | 683 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 646 | # CONFIG_SERIAL_QE is not set | 684 | # CONFIG_SERIAL_QE is not set |
| 647 | CONFIG_UNIX98_PTYS=y | 685 | CONFIG_UNIX98_PTYS=y |
| 648 | CONFIG_LEGACY_PTYS=y | 686 | CONFIG_LEGACY_PTYS=y |
| 649 | CONFIG_LEGACY_PTY_COUNT=256 | 687 | CONFIG_LEGACY_PTY_COUNT=256 |
| 688 | # CONFIG_BRIQ_PANEL is not set | ||
| 689 | # CONFIG_HVC_RTAS is not set | ||
| 650 | # CONFIG_IPMI_HANDLER is not set | 690 | # CONFIG_IPMI_HANDLER is not set |
| 651 | CONFIG_HW_RANDOM=y | 691 | CONFIG_HW_RANDOM=y |
| 652 | # CONFIG_NVRAM is not set | 692 | # CONFIG_NVRAM is not set |
| @@ -660,43 +700,70 @@ CONFIG_DEVPORT=y | |||
| 660 | CONFIG_I2C=y | 700 | CONFIG_I2C=y |
| 661 | CONFIG_I2C_BOARDINFO=y | 701 | CONFIG_I2C_BOARDINFO=y |
| 662 | CONFIG_I2C_CHARDEV=y | 702 | CONFIG_I2C_CHARDEV=y |
| 703 | CONFIG_I2C_HELPER_AUTO=y | ||
| 663 | 704 | ||
| 664 | # | 705 | # |
| 665 | # I2C Hardware Bus support | 706 | # I2C Hardware Bus support |
| 666 | # | 707 | # |
| 708 | |||
| 709 | # | ||
| 710 | # PC SMBus host controller drivers | ||
| 711 | # | ||
| 667 | # CONFIG_I2C_ALI1535 is not set | 712 | # CONFIG_I2C_ALI1535 is not set |
| 668 | # CONFIG_I2C_ALI1563 is not set | 713 | # CONFIG_I2C_ALI1563 is not set |
| 669 | # CONFIG_I2C_ALI15X3 is not set | 714 | # CONFIG_I2C_ALI15X3 is not set |
| 670 | # CONFIG_I2C_AMD756 is not set | 715 | # CONFIG_I2C_AMD756 is not set |
| 671 | # CONFIG_I2C_AMD8111 is not set | 716 | # CONFIG_I2C_AMD8111 is not set |
| 672 | # CONFIG_I2C_I801 is not set | 717 | # CONFIG_I2C_I801 is not set |
| 673 | # CONFIG_I2C_I810 is not set | 718 | # CONFIG_I2C_ISCH is not set |
| 674 | # CONFIG_I2C_PIIX4 is not set | 719 | # CONFIG_I2C_PIIX4 is not set |
| 675 | CONFIG_I2C_MPC=y | ||
| 676 | # CONFIG_I2C_NFORCE2 is not set | 720 | # CONFIG_I2C_NFORCE2 is not set |
| 677 | # CONFIG_I2C_OCORES is not set | ||
| 678 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 679 | # CONFIG_I2C_PROSAVAGE is not set | ||
| 680 | # CONFIG_I2C_SAVAGE4 is not set | ||
| 681 | # CONFIG_I2C_SIMTEC is not set | ||
| 682 | # CONFIG_I2C_SIS5595 is not set | 721 | # CONFIG_I2C_SIS5595 is not set |
| 683 | # CONFIG_I2C_SIS630 is not set | 722 | # CONFIG_I2C_SIS630 is not set |
| 684 | # CONFIG_I2C_SIS96X is not set | 723 | # CONFIG_I2C_SIS96X is not set |
| 685 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 686 | # CONFIG_I2C_STUB is not set | ||
| 687 | # CONFIG_I2C_TINY_USB is not set | ||
| 688 | # CONFIG_I2C_VIA is not set | 724 | # CONFIG_I2C_VIA is not set |
| 689 | # CONFIG_I2C_VIAPRO is not set | 725 | # CONFIG_I2C_VIAPRO is not set |
| 726 | |||
| 727 | # | ||
| 728 | # Mac SMBus host controller drivers | ||
| 729 | # | ||
| 730 | # CONFIG_I2C_HYDRA is not set | ||
| 731 | CONFIG_I2C_POWERMAC=y | ||
| 732 | |||
| 733 | # | ||
| 734 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 735 | # | ||
| 736 | CONFIG_I2C_MPC=y | ||
| 737 | # CONFIG_I2C_OCORES is not set | ||
| 738 | # CONFIG_I2C_SIMTEC is not set | ||
| 739 | |||
| 740 | # | ||
| 741 | # External I2C/SMBus adapter drivers | ||
| 742 | # | ||
| 743 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 744 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 745 | # CONFIG_I2C_TINY_USB is not set | ||
| 746 | |||
| 747 | # | ||
| 748 | # Graphics adapter I2C/DDC channel drivers | ||
| 749 | # | ||
| 690 | # CONFIG_I2C_VOODOO3 is not set | 750 | # CONFIG_I2C_VOODOO3 is not set |
| 751 | |||
| 752 | # | ||
| 753 | # Other I2C/SMBus bus drivers | ||
| 754 | # | ||
| 691 | # CONFIG_I2C_PCA_PLATFORM is not set | 755 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 756 | # CONFIG_I2C_STUB is not set | ||
| 692 | 757 | ||
| 693 | # | 758 | # |
| 694 | # Miscellaneous I2C Chip support | 759 | # Miscellaneous I2C Chip support |
| 695 | # | 760 | # |
| 696 | # CONFIG_DS1682 is not set | 761 | # CONFIG_DS1682 is not set |
| 762 | # CONFIG_AT24 is not set | ||
| 697 | # CONFIG_SENSORS_EEPROM is not set | 763 | # CONFIG_SENSORS_EEPROM is not set |
| 698 | # CONFIG_SENSORS_PCF8574 is not set | 764 | # CONFIG_SENSORS_PCF8574 is not set |
| 699 | # CONFIG_PCF8575 is not set | 765 | # CONFIG_PCF8575 is not set |
| 766 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 700 | # CONFIG_SENSORS_PCF8591 is not set | 767 | # CONFIG_SENSORS_PCF8591 is not set |
| 701 | # CONFIG_SENSORS_MAX6875 is not set | 768 | # CONFIG_SENSORS_MAX6875 is not set |
| 702 | # CONFIG_SENSORS_TSL2550 is not set | 769 | # CONFIG_SENSORS_TSL2550 is not set |
| @@ -719,11 +786,15 @@ CONFIG_SPI_MPC83xx=y | |||
| 719 | # CONFIG_SPI_AT25 is not set | 786 | # CONFIG_SPI_AT25 is not set |
| 720 | # CONFIG_SPI_SPIDEV is not set | 787 | # CONFIG_SPI_SPIDEV is not set |
| 721 | # CONFIG_SPI_TLE62X0 is not set | 788 | # CONFIG_SPI_TLE62X0 is not set |
| 789 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 790 | # CONFIG_GPIOLIB is not set | ||
| 722 | # CONFIG_W1 is not set | 791 | # CONFIG_W1 is not set |
| 723 | # CONFIG_POWER_SUPPLY is not set | 792 | # CONFIG_POWER_SUPPLY is not set |
| 724 | CONFIG_HWMON=y | 793 | CONFIG_HWMON=y |
| 725 | # CONFIG_HWMON_VID is not set | 794 | # CONFIG_HWMON_VID is not set |
| 795 | # CONFIG_SENSORS_AD7414 is not set | ||
| 726 | # CONFIG_SENSORS_AD7418 is not set | 796 | # CONFIG_SENSORS_AD7418 is not set |
| 797 | # CONFIG_SENSORS_ADCXX is not set | ||
| 727 | # CONFIG_SENSORS_ADM1021 is not set | 798 | # CONFIG_SENSORS_ADM1021 is not set |
| 728 | # CONFIG_SENSORS_ADM1025 is not set | 799 | # CONFIG_SENSORS_ADM1025 is not set |
| 729 | # CONFIG_SENSORS_ADM1026 is not set | 800 | # CONFIG_SENSORS_ADM1026 is not set |
| @@ -732,6 +803,7 @@ CONFIG_HWMON=y | |||
| 732 | # CONFIG_SENSORS_ADM9240 is not set | 803 | # CONFIG_SENSORS_ADM9240 is not set |
| 733 | # CONFIG_SENSORS_ADT7470 is not set | 804 | # CONFIG_SENSORS_ADT7470 is not set |
| 734 | # CONFIG_SENSORS_ADT7473 is not set | 805 | # CONFIG_SENSORS_ADT7473 is not set |
| 806 | # CONFIG_SENSORS_AMS is not set | ||
| 735 | # CONFIG_SENSORS_ATXP1 is not set | 807 | # CONFIG_SENSORS_ATXP1 is not set |
| 736 | # CONFIG_SENSORS_DS1621 is not set | 808 | # CONFIG_SENSORS_DS1621 is not set |
| 737 | # CONFIG_SENSORS_I5K_AMB is not set | 809 | # CONFIG_SENSORS_I5K_AMB is not set |
| @@ -777,6 +849,7 @@ CONFIG_HWMON=y | |||
| 777 | # CONFIG_SENSORS_W83627EHF is not set | 849 | # CONFIG_SENSORS_W83627EHF is not set |
| 778 | # CONFIG_HWMON_DEBUG_CHIP is not set | 850 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 779 | # CONFIG_THERMAL is not set | 851 | # CONFIG_THERMAL is not set |
| 852 | # CONFIG_THERMAL_HWMON is not set | ||
| 780 | CONFIG_WATCHDOG=y | 853 | CONFIG_WATCHDOG=y |
| 781 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 854 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
| 782 | 855 | ||
| @@ -784,7 +857,9 @@ CONFIG_WATCHDOG=y | |||
| 784 | # Watchdog Device Drivers | 857 | # Watchdog Device Drivers |
| 785 | # | 858 | # |
| 786 | # CONFIG_SOFT_WATCHDOG is not set | 859 | # CONFIG_SOFT_WATCHDOG is not set |
| 787 | CONFIG_83xx_WDT=y | 860 | # CONFIG_ALIM7101_WDT is not set |
| 861 | # CONFIG_8xxx_WDT is not set | ||
| 862 | # CONFIG_WATCHDOG_RTAS is not set | ||
| 788 | 863 | ||
| 789 | # | 864 | # |
| 790 | # PCI-based Watchdog Cards | 865 | # PCI-based Watchdog Cards |
| @@ -806,8 +881,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 806 | # | 881 | # |
| 807 | # Multifunction device drivers | 882 | # Multifunction device drivers |
| 808 | # | 883 | # |
| 884 | # CONFIG_MFD_CORE is not set | ||
| 809 | # CONFIG_MFD_SM501 is not set | 885 | # CONFIG_MFD_SM501 is not set |
| 810 | # CONFIG_HTC_PASIC3 is not set | 886 | # CONFIG_HTC_PASIC3 is not set |
| 887 | # CONFIG_MFD_TMIO is not set | ||
| 811 | 888 | ||
| 812 | # | 889 | # |
| 813 | # Multimedia devices | 890 | # Multimedia devices |
| @@ -840,10 +917,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m | |||
| 840 | # Display device support | 917 | # Display device support |
| 841 | # | 918 | # |
| 842 | # CONFIG_DISPLAY_SUPPORT is not set | 919 | # CONFIG_DISPLAY_SUPPORT is not set |
| 843 | |||
| 844 | # | ||
| 845 | # Sound | ||
| 846 | # | ||
| 847 | # CONFIG_SOUND is not set | 920 | # CONFIG_SOUND is not set |
| 848 | CONFIG_HID_SUPPORT=y | 921 | CONFIG_HID_SUPPORT=y |
| 849 | CONFIG_HID=y | 922 | CONFIG_HID=y |
| @@ -877,6 +950,7 @@ CONFIG_USB_DEVICE_CLASS=y | |||
| 877 | # CONFIG_USB_OTG is not set | 950 | # CONFIG_USB_OTG is not set |
| 878 | # CONFIG_USB_OTG_WHITELIST is not set | 951 | # CONFIG_USB_OTG_WHITELIST is not set |
| 879 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 952 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
| 953 | CONFIG_USB_MON=y | ||
| 880 | 954 | ||
| 881 | # | 955 | # |
| 882 | # USB Host Controller Drivers | 956 | # USB Host Controller Drivers |
| @@ -928,6 +1002,7 @@ CONFIG_USB_STORAGE=y | |||
| 928 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1002 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 929 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1003 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
| 930 | # CONFIG_USB_STORAGE_KARMA is not set | 1004 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1005 | # CONFIG_USB_STORAGE_SIERRA is not set | ||
| 931 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | 1006 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
| 932 | # CONFIG_USB_LIBUSUAL is not set | 1007 | # CONFIG_USB_LIBUSUAL is not set |
| 933 | 1008 | ||
| @@ -936,7 +1011,6 @@ CONFIG_USB_STORAGE=y | |||
| 936 | # | 1011 | # |
| 937 | # CONFIG_USB_MDC800 is not set | 1012 | # CONFIG_USB_MDC800 is not set |
| 938 | # CONFIG_USB_MICROTEK is not set | 1013 | # CONFIG_USB_MICROTEK is not set |
| 939 | CONFIG_USB_MON=y | ||
| 940 | 1014 | ||
| 941 | # | 1015 | # |
| 942 | # USB port drivers | 1016 | # USB port drivers |
| @@ -949,7 +1023,6 @@ CONFIG_USB_MON=y | |||
| 949 | # CONFIG_USB_EMI62 is not set | 1023 | # CONFIG_USB_EMI62 is not set |
| 950 | # CONFIG_USB_EMI26 is not set | 1024 | # CONFIG_USB_EMI26 is not set |
| 951 | # CONFIG_USB_ADUTUX is not set | 1025 | # CONFIG_USB_ADUTUX is not set |
| 952 | # CONFIG_USB_AUERSWALD is not set | ||
| 953 | # CONFIG_USB_RIO500 is not set | 1026 | # CONFIG_USB_RIO500 is not set |
| 954 | # CONFIG_USB_LEGOTOWER is not set | 1027 | # CONFIG_USB_LEGOTOWER is not set |
| 955 | # CONFIG_USB_LCD is not set | 1028 | # CONFIG_USB_LCD is not set |
| @@ -1063,6 +1136,7 @@ CONFIG_TMPFS=y | |||
| 1063 | # CONFIG_CRAMFS is not set | 1136 | # CONFIG_CRAMFS is not set |
| 1064 | # CONFIG_VXFS_FS is not set | 1137 | # CONFIG_VXFS_FS is not set |
| 1065 | # CONFIG_MINIX_FS is not set | 1138 | # CONFIG_MINIX_FS is not set |
| 1139 | # CONFIG_OMFS_FS is not set | ||
| 1066 | # CONFIG_HPFS_FS is not set | 1140 | # CONFIG_HPFS_FS is not set |
| 1067 | # CONFIG_QNX4FS_FS is not set | 1141 | # CONFIG_QNX4FS_FS is not set |
| 1068 | # CONFIG_ROMFS_FS is not set | 1142 | # CONFIG_ROMFS_FS is not set |
| @@ -1073,14 +1147,13 @@ CONFIG_NFS_FS=y | |||
| 1073 | CONFIG_NFS_V3=y | 1147 | CONFIG_NFS_V3=y |
| 1074 | # CONFIG_NFS_V3_ACL is not set | 1148 | # CONFIG_NFS_V3_ACL is not set |
| 1075 | CONFIG_NFS_V4=y | 1149 | CONFIG_NFS_V4=y |
| 1076 | # CONFIG_NFSD is not set | ||
| 1077 | CONFIG_ROOT_NFS=y | 1150 | CONFIG_ROOT_NFS=y |
| 1151 | # CONFIG_NFSD is not set | ||
| 1078 | CONFIG_LOCKD=y | 1152 | CONFIG_LOCKD=y |
| 1079 | CONFIG_LOCKD_V4=y | 1153 | CONFIG_LOCKD_V4=y |
| 1080 | CONFIG_NFS_COMMON=y | 1154 | CONFIG_NFS_COMMON=y |
| 1081 | CONFIG_SUNRPC=y | 1155 | CONFIG_SUNRPC=y |
| 1082 | CONFIG_SUNRPC_GSS=y | 1156 | CONFIG_SUNRPC_GSS=y |
| 1083 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 1084 | CONFIG_RPCSEC_GSS_KRB5=y | 1157 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1085 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1158 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1086 | # CONFIG_SMB_FS is not set | 1159 | # CONFIG_SMB_FS is not set |
| @@ -1154,6 +1227,7 @@ CONFIG_NLS_ISO8859_1=y | |||
| 1154 | # CONFIG_DLM is not set | 1227 | # CONFIG_DLM is not set |
| 1155 | CONFIG_UCC_FAST=y | 1228 | CONFIG_UCC_FAST=y |
| 1156 | CONFIG_UCC=y | 1229 | CONFIG_UCC=y |
| 1230 | # CONFIG_QE_GPIO is not set | ||
| 1157 | 1231 | ||
| 1158 | # | 1232 | # |
| 1159 | # Library routines | 1233 | # Library routines |
| @@ -1162,6 +1236,7 @@ CONFIG_BITREVERSE=y | |||
| 1162 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1236 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 1163 | # CONFIG_CRC_CCITT is not set | 1237 | # CONFIG_CRC_CCITT is not set |
| 1164 | # CONFIG_CRC16 is not set | 1238 | # CONFIG_CRC16 is not set |
| 1239 | CONFIG_CRC_T10DIF=y | ||
| 1165 | CONFIG_CRC_ITU_T=y | 1240 | CONFIG_CRC_ITU_T=y |
| 1166 | CONFIG_CRC32=y | 1241 | CONFIG_CRC32=y |
| 1167 | CONFIG_CRC7=y | 1242 | CONFIG_CRC7=y |
| @@ -1187,8 +1262,18 @@ CONFIG_FRAME_WARN=1024 | |||
| 1187 | # CONFIG_SLUB_DEBUG_ON is not set | 1262 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1188 | # CONFIG_SLUB_STATS is not set | 1263 | # CONFIG_SLUB_STATS is not set |
| 1189 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1264 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1265 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 1266 | # CONFIG_LATENCYTOP is not set | ||
| 1267 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1268 | CONFIG_HAVE_FTRACE=y | ||
| 1269 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1270 | # CONFIG_FTRACE is not set | ||
| 1271 | # CONFIG_SCHED_TRACER is not set | ||
| 1272 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1190 | # CONFIG_SAMPLES is not set | 1273 | # CONFIG_SAMPLES is not set |
| 1274 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1191 | # CONFIG_IRQSTACKS is not set | 1275 | # CONFIG_IRQSTACKS is not set |
| 1276 | # CONFIG_BOOTX_TEXT is not set | ||
| 1192 | # CONFIG_PPC_EARLY_DEBUG is not set | 1277 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1193 | 1278 | ||
| 1194 | # | 1279 | # |
| @@ -1242,6 +1327,10 @@ CONFIG_CRYPTO_PCBC=m | |||
| 1242 | # CONFIG_CRYPTO_MD4 is not set | 1327 | # CONFIG_CRYPTO_MD4 is not set |
| 1243 | CONFIG_CRYPTO_MD5=y | 1328 | CONFIG_CRYPTO_MD5=y |
| 1244 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1329 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 1330 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1331 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1332 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1333 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1245 | # CONFIG_CRYPTO_SHA1 is not set | 1334 | # CONFIG_CRYPTO_SHA1 is not set |
| 1246 | # CONFIG_CRYPTO_SHA256 is not set | 1335 | # CONFIG_CRYPTO_SHA256 is not set |
| 1247 | # CONFIG_CRYPTO_SHA512 is not set | 1336 | # CONFIG_CRYPTO_SHA512 is not set |
| @@ -1274,6 +1363,7 @@ CONFIG_CRYPTO_DES=y | |||
| 1274 | # CONFIG_CRYPTO_LZO is not set | 1363 | # CONFIG_CRYPTO_LZO is not set |
| 1275 | CONFIG_CRYPTO_HW=y | 1364 | CONFIG_CRYPTO_HW=y |
| 1276 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1365 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1366 | # CONFIG_CRYPTO_DEV_TALITOS is not set | ||
| 1277 | # CONFIG_PPC_CLOCK is not set | 1367 | # CONFIG_PPC_CLOCK is not set |
| 1278 | CONFIG_PPC_LIB_RHEAP=y | 1368 | CONFIG_PPC_LIB_RHEAP=y |
| 1279 | # CONFIG_VIRTUALIZATION is not set | 1369 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig index b47fc9185708..8d6513931850 100644 --- a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig +++ b/arch/powerpc/configs/83xx/mpc834x_itx_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.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Mon Jun 9 08:52:25 2008 | 4 | # Thu Aug 21 00:52:20 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -16,6 +16,7 @@ CONFIG_6xx=y | |||
| 16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
| 17 | CONFIG_PPC_FPU=y | 17 | CONFIG_PPC_FPU=y |
| 18 | # CONFIG_FSL_EMB_PERFMON is not set | 18 | # CONFIG_FSL_EMB_PERFMON is not set |
| 19 | # CONFIG_ALTIVEC is not set | ||
| 19 | CONFIG_PPC_STD_MMU=y | 20 | CONFIG_PPC_STD_MMU=y |
| 20 | CONFIG_PPC_STD_MMU_32=y | 21 | CONFIG_PPC_STD_MMU_32=y |
| 21 | # CONFIG_PPC_MM_SLICES is not set | 22 | # CONFIG_PPC_MM_SLICES is not set |
| @@ -32,6 +33,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | 35 | CONFIG_STACKTRACE_SUPPORT=y |
| 36 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | 37 | CONFIG_LOCKDEP_SUPPORT=y |
| 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 39 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| @@ -51,6 +53,9 @@ CONFIG_PPC_UDBG_16550=y | |||
| 51 | CONFIG_AUDIT_ARCH=y | 53 | CONFIG_AUDIT_ARCH=y |
| 52 | CONFIG_GENERIC_BUG=y | 54 | CONFIG_GENERIC_BUG=y |
| 53 | CONFIG_DEFAULT_UIMAGE=y | 55 | CONFIG_DEFAULT_UIMAGE=y |
| 56 | CONFIG_HIBERNATE_32=y | ||
| 57 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
| 58 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
| 54 | # CONFIG_PPC_DCR_NATIVE is not set | 59 | # CONFIG_PPC_DCR_NATIVE is not set |
| 55 | # CONFIG_PPC_DCR_MMIO is not set | 60 | # CONFIG_PPC_DCR_MMIO is not set |
| 56 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 61 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| @@ -88,12 +93,12 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 88 | CONFIG_SYSCTL=y | 93 | CONFIG_SYSCTL=y |
| 89 | CONFIG_EMBEDDED=y | 94 | CONFIG_EMBEDDED=y |
| 90 | CONFIG_SYSCTL_SYSCALL=y | 95 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 92 | # CONFIG_KALLSYMS is not set | 96 | # CONFIG_KALLSYMS is not set |
| 93 | CONFIG_HOTPLUG=y | 97 | CONFIG_HOTPLUG=y |
| 94 | CONFIG_PRINTK=y | 98 | CONFIG_PRINTK=y |
| 95 | CONFIG_BUG=y | 99 | CONFIG_BUG=y |
| 96 | CONFIG_ELF_CORE=y | 100 | CONFIG_ELF_CORE=y |
| 101 | CONFIG_PCSPKR_PLATFORM=y | ||
| 97 | CONFIG_COMPAT_BRK=y | 102 | CONFIG_COMPAT_BRK=y |
| 98 | CONFIG_BASE_FULL=y | 103 | CONFIG_BASE_FULL=y |
| 99 | CONFIG_FUTEX=y | 104 | CONFIG_FUTEX=y |
| @@ -111,10 +116,16 @@ CONFIG_SLUB=y | |||
| 111 | # CONFIG_PROFILING is not set | 116 | # CONFIG_PROFILING is not set |
| 112 | # CONFIG_MARKERS is not set | 117 | # CONFIG_MARKERS is not set |
| 113 | CONFIG_HAVE_OPROFILE=y | 118 | CONFIG_HAVE_OPROFILE=y |
| 119 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 120 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 114 | CONFIG_HAVE_KPROBES=y | 121 | CONFIG_HAVE_KPROBES=y |
| 115 | CONFIG_HAVE_KRETPROBES=y | 122 | CONFIG_HAVE_KRETPROBES=y |
| 123 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 116 | # CONFIG_HAVE_DMA_ATTRS is not set | 124 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 125 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 126 | # CONFIG_HAVE_CLK is not set | ||
| 117 | CONFIG_PROC_PAGE_MONITOR=y | 127 | CONFIG_PROC_PAGE_MONITOR=y |
| 128 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 118 | CONFIG_SLABINFO=y | 129 | CONFIG_SLABINFO=y |
| 119 | CONFIG_RT_MUTEXES=y | 130 | CONFIG_RT_MUTEXES=y |
| 120 | # CONFIG_TINY_SHMEM is not set | 131 | # CONFIG_TINY_SHMEM is not set |
| @@ -125,12 +136,13 @@ CONFIG_MODULE_UNLOAD=y | |||
| 125 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 136 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 126 | # CONFIG_MODVERSIONS is not set | 137 | # CONFIG_MODVERSIONS is not set |
| 127 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 138 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 128 | # CONFIG_KMOD is not set | 139 | CONFIG_KMOD=y |
| 129 | CONFIG_BLOCK=y | 140 | CONFIG_BLOCK=y |
| 130 | # CONFIG_LBD is not set | 141 | # CONFIG_LBD is not set |
| 131 | # CONFIG_BLK_DEV_IO_TRACE is not set | 142 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 132 | # CONFIG_LSF is not set | 143 | # CONFIG_LSF is not set |
| 133 | # CONFIG_BLK_DEV_BSG is not set | 144 | # CONFIG_BLK_DEV_BSG is not set |
| 145 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 134 | 146 | ||
| 135 | # | 147 | # |
| 136 | # IO Schedulers | 148 | # IO Schedulers |
| @@ -149,37 +161,49 @@ CONFIG_CLASSIC_RCU=y | |||
| 149 | # | 161 | # |
| 150 | # Platform support | 162 | # Platform support |
| 151 | # | 163 | # |
| 152 | # CONFIG_PPC_MULTIPLATFORM is not set | 164 | CONFIG_PPC_MULTIPLATFORM=y |
| 153 | # CONFIG_PPC_82xx is not set | 165 | CONFIG_CLASSIC32=y |
| 154 | CONFIG_PPC_83xx=y | 166 | CONFIG_PPC_CHRP=y |
| 155 | # CONFIG_PPC_86xx is not set | 167 | # CONFIG_MPC5121_ADS is not set |
| 156 | # CONFIG_PPC_MPC512x is not set | 168 | # CONFIG_MPC5121_GENERIC is not set |
| 157 | # CONFIG_PPC_MPC5121 is not set | 169 | # CONFIG_PPC_MPC52xx is not set |
| 170 | CONFIG_PPC_PMAC=y | ||
| 158 | # CONFIG_PPC_CELL is not set | 171 | # CONFIG_PPC_CELL is not set |
| 159 | # CONFIG_PPC_CELL_NATIVE is not set | 172 | # CONFIG_PPC_CELL_NATIVE is not set |
| 173 | # CONFIG_PPC_82xx is not set | ||
| 160 | # CONFIG_PQ2ADS is not set | 174 | # CONFIG_PQ2ADS is not set |
| 161 | CONFIG_MPC83xx=y | 175 | CONFIG_PPC_83xx=y |
| 162 | # CONFIG_MPC831x_RDB is not set | 176 | # CONFIG_MPC831x_RDB is not set |
| 163 | # CONFIG_MPC832x_MDS is not set | 177 | # CONFIG_MPC832x_MDS is not set |
| 164 | # CONFIG_MPC832x_RDB is not set | 178 | # CONFIG_MPC832x_RDB is not set |
| 165 | # CONFIG_MPC834x_MDS is not set | 179 | # CONFIG_MPC834x_MDS is not set |
| 166 | CONFIG_MPC834x_ITX=y | 180 | CONFIG_MPC834x_ITX=y |
| 167 | # CONFIG_MPC836x_MDS is not set | 181 | # CONFIG_MPC836x_MDS is not set |
| 182 | # CONFIG_MPC836x_RDK is not set | ||
| 168 | # CONFIG_MPC837x_MDS is not set | 183 | # CONFIG_MPC837x_MDS is not set |
| 169 | # CONFIG_MPC837x_RDB is not set | 184 | # CONFIG_MPC837x_RDB is not set |
| 170 | # CONFIG_SBC834x is not set | 185 | # CONFIG_SBC834x is not set |
| 186 | # CONFIG_ASP834x is not set | ||
| 171 | CONFIG_PPC_MPC834x=y | 187 | CONFIG_PPC_MPC834x=y |
| 188 | # CONFIG_PPC_86xx is not set | ||
| 189 | # CONFIG_EMBEDDED6xx is not set | ||
| 190 | CONFIG_PPC_NATIVE=y | ||
| 191 | # CONFIG_UDBG_RTAS_CONSOLE is not set | ||
| 172 | CONFIG_IPIC=y | 192 | CONFIG_IPIC=y |
| 173 | # CONFIG_MPIC is not set | 193 | CONFIG_MPIC=y |
| 174 | # CONFIG_MPIC_WEIRD is not set | 194 | # CONFIG_MPIC_WEIRD is not set |
| 175 | # CONFIG_PPC_I8259 is not set | 195 | CONFIG_PPC_I8259=y |
| 176 | # CONFIG_PPC_RTAS is not set | 196 | CONFIG_PPC_RTAS=y |
| 197 | # CONFIG_RTAS_ERROR_LOGGING is not set | ||
| 198 | CONFIG_RTAS_PROC=y | ||
| 177 | # CONFIG_MMIO_NVRAM is not set | 199 | # CONFIG_MMIO_NVRAM is not set |
| 178 | # CONFIG_PPC_MPC106 is not set | 200 | CONFIG_PPC_MPC106=y |
| 179 | # CONFIG_PPC_970_NAP is not set | 201 | # CONFIG_PPC_970_NAP is not set |
| 180 | # CONFIG_PPC_INDIRECT_IO is not set | 202 | # CONFIG_PPC_INDIRECT_IO is not set |
| 181 | # CONFIG_GENERIC_IOMAP is not set | 203 | # CONFIG_GENERIC_IOMAP is not set |
| 182 | # CONFIG_CPU_FREQ is not set | 204 | # CONFIG_CPU_FREQ is not set |
| 205 | # CONFIG_PPC601_SYNC_FIX is not set | ||
| 206 | # CONFIG_TAU is not set | ||
| 183 | # CONFIG_FSL_ULI1575 is not set | 207 | # CONFIG_FSL_ULI1575 is not set |
| 184 | 208 | ||
| 185 | # | 209 | # |
| @@ -195,7 +219,7 @@ CONFIG_HZ_250=y | |||
| 195 | # CONFIG_HZ_300 is not set | 219 | # CONFIG_HZ_300 is not set |
| 196 | # CONFIG_HZ_1000 is not set | 220 | # CONFIG_HZ_1000 is not set |
| 197 | CONFIG_HZ=250 | 221 | CONFIG_HZ=250 |
| 198 | # CONFIG_SCHED_HRTICK is not set | 222 | CONFIG_SCHED_HRTICK=y |
| 199 | CONFIG_PREEMPT_NONE=y | 223 | CONFIG_PREEMPT_NONE=y |
| 200 | # CONFIG_PREEMPT_VOLUNTARY is not set | 224 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 201 | # CONFIG_PREEMPT is not set | 225 | # CONFIG_PREEMPT is not set |
| @@ -205,6 +229,7 @@ CONFIG_BINFMT_ELF=y | |||
| 205 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 229 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| 206 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 230 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
| 207 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 231 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
| 232 | # CONFIG_KEXEC is not set | ||
| 208 | CONFIG_ARCH_FLATMEM_ENABLE=y | 233 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 209 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 234 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
| 210 | CONFIG_SELECT_MEMORY_MODEL=y | 235 | CONFIG_SELECT_MEMORY_MODEL=y |
| @@ -217,6 +242,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 242 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 218 | CONFIG_PAGEFLAGS_EXTENDED=y | 243 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 219 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 244 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 245 | CONFIG_MIGRATION=y | ||
| 220 | # CONFIG_RESOURCES_64BIT is not set | 246 | # CONFIG_RESOURCES_64BIT is not set |
| 221 | CONFIG_ZONE_DMA_FLAG=1 | 247 | CONFIG_ZONE_DMA_FLAG=1 |
| 222 | CONFIG_BOUNCE=y | 248 | CONFIG_BOUNCE=y |
| @@ -224,6 +250,7 @@ CONFIG_VIRT_TO_BUS=y | |||
| 224 | CONFIG_FORCE_MAX_ZONEORDER=11 | 250 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 225 | CONFIG_PROC_DEVICETREE=y | 251 | CONFIG_PROC_DEVICETREE=y |
| 226 | # CONFIG_CMDLINE_BOOL is not set | 252 | # CONFIG_CMDLINE_BOOL is not set |
| 253 | CONFIG_EXTRA_TARGETS="" | ||
| 227 | # CONFIG_PM is not set | 254 | # CONFIG_PM is not set |
| 228 | CONFIG_SECCOMP=y | 255 | CONFIG_SECCOMP=y |
| 229 | CONFIG_ISA_DMA_API=y | 256 | CONFIG_ISA_DMA_API=y |
| @@ -231,10 +258,13 @@ CONFIG_ISA_DMA_API=y | |||
| 231 | # | 258 | # |
| 232 | # Bus options | 259 | # Bus options |
| 233 | # | 260 | # |
| 261 | # CONFIG_ISA is not set | ||
| 234 | CONFIG_ZONE_DMA=y | 262 | CONFIG_ZONE_DMA=y |
| 235 | CONFIG_GENERIC_ISA_DMA=y | 263 | CONFIG_GENERIC_ISA_DMA=y |
| 236 | CONFIG_PPC_INDIRECT_PCI=y | 264 | CONFIG_PPC_INDIRECT_PCI=y |
| 237 | CONFIG_FSL_SOC=y | 265 | CONFIG_FSL_SOC=y |
| 266 | CONFIG_FSL_PCI=y | ||
| 267 | CONFIG_PPC_PCI_CHOICE=y | ||
| 238 | CONFIG_PCI=y | 268 | CONFIG_PCI=y |
| 239 | CONFIG_PCI_DOMAINS=y | 269 | CONFIG_PCI_DOMAINS=y |
| 240 | CONFIG_PCI_SYSCALL=y | 270 | CONFIG_PCI_SYSCALL=y |
| @@ -259,10 +289,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
| 259 | CONFIG_KERNEL_START=0xc0000000 | 289 | CONFIG_KERNEL_START=0xc0000000 |
| 260 | CONFIG_PHYSICAL_START=0x00000000 | 290 | CONFIG_PHYSICAL_START=0x00000000 |
| 261 | CONFIG_TASK_SIZE=0xc0000000 | 291 | CONFIG_TASK_SIZE=0xc0000000 |
| 262 | |||
| 263 | # | ||
| 264 | # Networking | ||
| 265 | # | ||
| 266 | CONFIG_NET=y | 292 | CONFIG_NET=y |
| 267 | 293 | ||
| 268 | # | 294 | # |
| @@ -439,9 +465,11 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 | |||
| 439 | # CONFIG_MTD_UBI is not set | 465 | # CONFIG_MTD_UBI is not set |
| 440 | CONFIG_OF_DEVICE=y | 466 | CONFIG_OF_DEVICE=y |
| 441 | CONFIG_OF_I2C=y | 467 | CONFIG_OF_I2C=y |
| 468 | CONFIG_OF_SPI=y | ||
| 442 | # CONFIG_PARPORT is not set | 469 | # CONFIG_PARPORT is not set |
| 443 | CONFIG_BLK_DEV=y | 470 | CONFIG_BLK_DEV=y |
| 444 | # CONFIG_BLK_DEV_FD is not set | 471 | # CONFIG_BLK_DEV_FD is not set |
| 472 | # CONFIG_MAC_FLOPPY is not set | ||
| 445 | # CONFIG_BLK_CPQ_DA is not set | 473 | # CONFIG_BLK_CPQ_DA is not set |
| 446 | # CONFIG_BLK_CPQ_CISS_DA is not set | 474 | # CONFIG_BLK_CPQ_CISS_DA is not set |
| 447 | # CONFIG_BLK_DEV_DAC960 is not set | 475 | # CONFIG_BLK_DEV_DAC960 is not set |
| @@ -458,18 +486,17 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
| 458 | # CONFIG_BLK_DEV_XIP is not set | 486 | # CONFIG_BLK_DEV_XIP is not set |
| 459 | # CONFIG_CDROM_PKTCDVD is not set | 487 | # CONFIG_CDROM_PKTCDVD is not set |
| 460 | # CONFIG_ATA_OVER_ETH is not set | 488 | # CONFIG_ATA_OVER_ETH is not set |
| 489 | # CONFIG_BLK_DEV_HD is not set | ||
| 461 | CONFIG_MISC_DEVICES=y | 490 | CONFIG_MISC_DEVICES=y |
| 462 | # CONFIG_PHANTOM is not set | 491 | # CONFIG_PHANTOM is not set |
| 463 | # CONFIG_EEPROM_93CX6 is not set | 492 | # CONFIG_EEPROM_93CX6 is not set |
| 464 | # CONFIG_SGI_IOC4 is not set | 493 | # CONFIG_SGI_IOC4 is not set |
| 465 | # CONFIG_TIFM_CORE is not set | 494 | # CONFIG_TIFM_CORE is not set |
| 466 | # CONFIG_ENCLOSURE_SERVICES is not set | 495 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 496 | # CONFIG_HP_ILO is not set | ||
| 467 | CONFIG_HAVE_IDE=y | 497 | CONFIG_HAVE_IDE=y |
| 468 | CONFIG_IDE=y | 498 | CONFIG_IDE=y |
| 469 | CONFIG_IDE_MAX_HWIFS=4 | ||
| 470 | # CONFIG_BLK_DEV_IDE is not set | 499 | # CONFIG_BLK_DEV_IDE is not set |
| 471 | # CONFIG_BLK_DEV_HD_ONLY is not set | ||
| 472 | # CONFIG_BLK_DEV_HD is not set | ||
| 473 | 500 | ||
| 474 | # | 501 | # |
| 475 | # SCSI device support | 502 | # SCSI device support |
| @@ -545,7 +572,10 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 545 | # CONFIG_SCSI_DC390T is not set | 572 | # CONFIG_SCSI_DC390T is not set |
| 546 | # CONFIG_SCSI_NSP32 is not set | 573 | # CONFIG_SCSI_NSP32 is not set |
| 547 | # CONFIG_SCSI_DEBUG is not set | 574 | # CONFIG_SCSI_DEBUG is not set |
| 575 | # CONFIG_SCSI_MESH is not set | ||
| 576 | # CONFIG_SCSI_MAC53C94 is not set | ||
| 548 | # CONFIG_SCSI_SRP is not set | 577 | # CONFIG_SCSI_SRP is not set |
| 578 | # CONFIG_SCSI_DH is not set | ||
| 549 | CONFIG_ATA=y | 579 | CONFIG_ATA=y |
| 550 | # CONFIG_ATA_NONSTANDARD is not set | 580 | # CONFIG_ATA_NONSTANDARD is not set |
| 551 | CONFIG_SATA_PMP=y | 581 | CONFIG_SATA_PMP=y |
| @@ -623,12 +653,15 @@ CONFIG_MD_RAID1=y | |||
| 623 | # | 653 | # |
| 624 | # IEEE 1394 (FireWire) support | 654 | # IEEE 1394 (FireWire) support |
| 625 | # | 655 | # |
| 656 | |||
| 657 | # | ||
| 658 | # Enable only one of the two stacks, unless you know what you are doing | ||
| 659 | # | ||
| 626 | # CONFIG_FIREWIRE is not set | 660 | # CONFIG_FIREWIRE is not set |
| 627 | # CONFIG_IEEE1394 is not set | 661 | # CONFIG_IEEE1394 is not set |
| 628 | # CONFIG_I2O is not set | 662 | # CONFIG_I2O is not set |
| 629 | # CONFIG_MACINTOSH_DRIVERS is not set | 663 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 630 | CONFIG_NETDEVICES=y | 664 | CONFIG_NETDEVICES=y |
| 631 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 632 | # CONFIG_DUMMY is not set | 665 | # CONFIG_DUMMY is not set |
| 633 | # CONFIG_BONDING is not set | 666 | # CONFIG_BONDING is not set |
| 634 | # CONFIG_MACVLAN is not set | 667 | # CONFIG_MACVLAN is not set |
| @@ -659,7 +692,6 @@ CONFIG_NETDEV_1000=y | |||
| 659 | # CONFIG_DL2K is not set | 692 | # CONFIG_DL2K is not set |
| 660 | # CONFIG_E1000 is not set | 693 | # CONFIG_E1000 is not set |
| 661 | # CONFIG_E1000E is not set | 694 | # CONFIG_E1000E is not set |
| 662 | # CONFIG_E1000E_ENABLED is not set | ||
| 663 | # CONFIG_IP1000 is not set | 695 | # CONFIG_IP1000 is not set |
| 664 | # CONFIG_IGB is not set | 696 | # CONFIG_IGB is not set |
| 665 | # CONFIG_NS83820 is not set | 697 | # CONFIG_NS83820 is not set |
| @@ -673,9 +705,10 @@ CONFIG_NETDEV_1000=y | |||
| 673 | # CONFIG_TIGON3 is not set | 705 | # CONFIG_TIGON3 is not set |
| 674 | # CONFIG_BNX2 is not set | 706 | # CONFIG_BNX2 is not set |
| 675 | CONFIG_GIANFAR=y | 707 | CONFIG_GIANFAR=y |
| 676 | CONFIG_GFAR_NAPI=y | 708 | # CONFIG_MV643XX_ETH is not set |
| 677 | # CONFIG_QLA3XXX is not set | 709 | # CONFIG_QLA3XXX is not set |
| 678 | # CONFIG_ATL1 is not set | 710 | # CONFIG_ATL1 is not set |
| 711 | # CONFIG_ATL1E is not set | ||
| 679 | CONFIG_NETDEV_10000=y | 712 | CONFIG_NETDEV_10000=y |
| 680 | # CONFIG_CHELSIO_T1 is not set | 713 | # CONFIG_CHELSIO_T1 is not set |
| 681 | # CONFIG_CHELSIO_T3 is not set | 714 | # CONFIG_CHELSIO_T3 is not set |
| @@ -753,11 +786,14 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
| 753 | # CONFIG_SERIAL_UARTLITE is not set | 786 | # CONFIG_SERIAL_UARTLITE is not set |
| 754 | CONFIG_SERIAL_CORE=y | 787 | CONFIG_SERIAL_CORE=y |
| 755 | CONFIG_SERIAL_CORE_CONSOLE=y | 788 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 789 | # CONFIG_SERIAL_PMACZILOG is not set | ||
| 756 | # CONFIG_SERIAL_JSM is not set | 790 | # CONFIG_SERIAL_JSM is not set |
| 757 | # CONFIG_SERIAL_OF_PLATFORM is not set | 791 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 758 | CONFIG_UNIX98_PTYS=y | 792 | CONFIG_UNIX98_PTYS=y |
| 759 | CONFIG_LEGACY_PTYS=y | 793 | CONFIG_LEGACY_PTYS=y |
| 760 | CONFIG_LEGACY_PTY_COUNT=256 | 794 | CONFIG_LEGACY_PTY_COUNT=256 |
| 795 | # CONFIG_BRIQ_PANEL is not set | ||
| 796 | # CONFIG_HVC_RTAS is not set | ||
| 761 | # CONFIG_IPMI_HANDLER is not set | 797 | # CONFIG_IPMI_HANDLER is not set |
| 762 | CONFIG_HW_RANDOM=y | 798 | CONFIG_HW_RANDOM=y |
| 763 | # CONFIG_NVRAM is not set | 799 | # CONFIG_NVRAM is not set |
| @@ -769,43 +805,70 @@ CONFIG_DEVPORT=y | |||
| 769 | CONFIG_I2C=y | 805 | CONFIG_I2C=y |
| 770 | CONFIG_I2C_BOARDINFO=y | 806 | CONFIG_I2C_BOARDINFO=y |
| 771 | CONFIG_I2C_CHARDEV=y | 807 | CONFIG_I2C_CHARDEV=y |
| 808 | CONFIG_I2C_HELPER_AUTO=y | ||
| 772 | 809 | ||
| 773 | # | 810 | # |
| 774 | # I2C Hardware Bus support | 811 | # I2C Hardware Bus support |
| 775 | # | 812 | # |
| 813 | |||
| 814 | # | ||
| 815 | # PC SMBus host controller drivers | ||
| 816 | # | ||
| 776 | # CONFIG_I2C_ALI1535 is not set | 817 | # CONFIG_I2C_ALI1535 is not set |
| 777 | # CONFIG_I2C_ALI1563 is not set | 818 | # CONFIG_I2C_ALI1563 is not set |
| 778 | # CONFIG_I2C_ALI15X3 is not set | 819 | # CONFIG_I2C_ALI15X3 is not set |
| 779 | # CONFIG_I2C_AMD756 is not set | 820 | # CONFIG_I2C_AMD756 is not set |
| 780 | # CONFIG_I2C_AMD8111 is not set | 821 | # CONFIG_I2C_AMD8111 is not set |
| 781 | # CONFIG_I2C_I801 is not set | 822 | # CONFIG_I2C_I801 is not set |
| 782 | # CONFIG_I2C_I810 is not set | 823 | # CONFIG_I2C_ISCH is not set |
| 783 | # CONFIG_I2C_PIIX4 is not set | 824 | # CONFIG_I2C_PIIX4 is not set |
| 784 | CONFIG_I2C_MPC=y | ||
| 785 | # CONFIG_I2C_NFORCE2 is not set | 825 | # CONFIG_I2C_NFORCE2 is not set |
| 786 | # CONFIG_I2C_OCORES is not set | ||
| 787 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 788 | # CONFIG_I2C_PROSAVAGE is not set | ||
| 789 | # CONFIG_I2C_SAVAGE4 is not set | ||
| 790 | # CONFIG_I2C_SIMTEC is not set | ||
| 791 | # CONFIG_I2C_SIS5595 is not set | 826 | # CONFIG_I2C_SIS5595 is not set |
| 792 | # CONFIG_I2C_SIS630 is not set | 827 | # CONFIG_I2C_SIS630 is not set |
| 793 | # CONFIG_I2C_SIS96X is not set | 828 | # CONFIG_I2C_SIS96X is not set |
| 794 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 795 | # CONFIG_I2C_STUB is not set | ||
| 796 | # CONFIG_I2C_TINY_USB is not set | ||
| 797 | # CONFIG_I2C_VIA is not set | 829 | # CONFIG_I2C_VIA is not set |
| 798 | # CONFIG_I2C_VIAPRO is not set | 830 | # CONFIG_I2C_VIAPRO is not set |
| 831 | |||
| 832 | # | ||
| 833 | # Mac SMBus host controller drivers | ||
| 834 | # | ||
| 835 | # CONFIG_I2C_HYDRA is not set | ||
| 836 | CONFIG_I2C_POWERMAC=y | ||
| 837 | |||
| 838 | # | ||
| 839 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 840 | # | ||
| 841 | CONFIG_I2C_MPC=y | ||
| 842 | # CONFIG_I2C_OCORES is not set | ||
| 843 | # CONFIG_I2C_SIMTEC is not set | ||
| 844 | |||
| 845 | # | ||
| 846 | # External I2C/SMBus adapter drivers | ||
| 847 | # | ||
| 848 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 849 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 850 | # CONFIG_I2C_TINY_USB is not set | ||
| 851 | |||
| 852 | # | ||
| 853 | # Graphics adapter I2C/DDC channel drivers | ||
| 854 | # | ||
| 799 | # CONFIG_I2C_VOODOO3 is not set | 855 | # CONFIG_I2C_VOODOO3 is not set |
| 856 | |||
| 857 | # | ||
| 858 | # Other I2C/SMBus bus drivers | ||
| 859 | # | ||
| 800 | # CONFIG_I2C_PCA_PLATFORM is not set | 860 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 861 | # CONFIG_I2C_STUB is not set | ||
| 801 | 862 | ||
| 802 | # | 863 | # |
| 803 | # Miscellaneous I2C Chip support | 864 | # Miscellaneous I2C Chip support |
| 804 | # | 865 | # |
| 805 | # CONFIG_DS1682 is not set | 866 | # CONFIG_DS1682 is not set |
| 867 | # CONFIG_AT24 is not set | ||
| 806 | # CONFIG_SENSORS_EEPROM is not set | 868 | # CONFIG_SENSORS_EEPROM is not set |
| 807 | CONFIG_SENSORS_PCF8574=y | 869 | CONFIG_SENSORS_PCF8574=y |
| 808 | # CONFIG_PCF8575 is not set | 870 | # CONFIG_PCF8575 is not set |
| 871 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 809 | # CONFIG_SENSORS_PCF8591 is not set | 872 | # CONFIG_SENSORS_PCF8591 is not set |
| 810 | # CONFIG_SENSORS_MAX6875 is not set | 873 | # CONFIG_SENSORS_MAX6875 is not set |
| 811 | # CONFIG_SENSORS_TSL2550 is not set | 874 | # CONFIG_SENSORS_TSL2550 is not set |
| @@ -828,10 +891,13 @@ CONFIG_SPI_MPC83xx=y | |||
| 828 | # CONFIG_SPI_AT25 is not set | 891 | # CONFIG_SPI_AT25 is not set |
| 829 | # CONFIG_SPI_SPIDEV is not set | 892 | # CONFIG_SPI_SPIDEV is not set |
| 830 | # CONFIG_SPI_TLE62X0 is not set | 893 | # CONFIG_SPI_TLE62X0 is not set |
| 894 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 895 | # CONFIG_GPIOLIB is not set | ||
| 831 | # CONFIG_W1 is not set | 896 | # CONFIG_W1 is not set |
| 832 | # CONFIG_POWER_SUPPLY is not set | 897 | # CONFIG_POWER_SUPPLY is not set |
| 833 | # CONFIG_HWMON is not set | 898 | # CONFIG_HWMON is not set |
| 834 | # CONFIG_THERMAL is not set | 899 | # CONFIG_THERMAL is not set |
| 900 | # CONFIG_THERMAL_HWMON is not set | ||
| 835 | CONFIG_WATCHDOG=y | 901 | CONFIG_WATCHDOG=y |
| 836 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 902 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
| 837 | 903 | ||
| @@ -839,7 +905,9 @@ CONFIG_WATCHDOG=y | |||
| 839 | # Watchdog Device Drivers | 905 | # Watchdog Device Drivers |
| 840 | # | 906 | # |
| 841 | # CONFIG_SOFT_WATCHDOG is not set | 907 | # CONFIG_SOFT_WATCHDOG is not set |
| 842 | CONFIG_83xx_WDT=y | 908 | # CONFIG_ALIM7101_WDT is not set |
| 909 | # CONFIG_8xxx_WDT is not set | ||
| 910 | # CONFIG_WATCHDOG_RTAS is not set | ||
| 843 | 911 | ||
| 844 | # | 912 | # |
| 845 | # PCI-based Watchdog Cards | 913 | # PCI-based Watchdog Cards |
| @@ -861,8 +929,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 861 | # | 929 | # |
| 862 | # Multifunction device drivers | 930 | # Multifunction device drivers |
| 863 | # | 931 | # |
| 932 | # CONFIG_MFD_CORE is not set | ||
| 864 | # CONFIG_MFD_SM501 is not set | 933 | # CONFIG_MFD_SM501 is not set |
| 865 | # CONFIG_HTC_PASIC3 is not set | 934 | # CONFIG_HTC_PASIC3 is not set |
| 935 | # CONFIG_MFD_TMIO is not set | ||
| 866 | 936 | ||
| 867 | # | 937 | # |
| 868 | # Multimedia devices | 938 | # Multimedia devices |
| @@ -895,10 +965,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m | |||
| 895 | # Display device support | 965 | # Display device support |
| 896 | # | 966 | # |
| 897 | # CONFIG_DISPLAY_SUPPORT is not set | 967 | # CONFIG_DISPLAY_SUPPORT is not set |
| 898 | |||
| 899 | # | ||
| 900 | # Sound | ||
| 901 | # | ||
| 902 | # CONFIG_SOUND is not set | 968 | # CONFIG_SOUND is not set |
| 903 | CONFIG_USB_SUPPORT=y | 969 | CONFIG_USB_SUPPORT=y |
| 904 | CONFIG_USB_ARCH_HAS_HCD=y | 970 | CONFIG_USB_ARCH_HAS_HCD=y |
| @@ -917,6 +983,7 @@ CONFIG_USB_DEVICE_CLASS=y | |||
| 917 | # CONFIG_USB_OTG is not set | 983 | # CONFIG_USB_OTG is not set |
| 918 | # CONFIG_USB_OTG_WHITELIST is not set | 984 | # CONFIG_USB_OTG_WHITELIST is not set |
| 919 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 985 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
| 986 | CONFIG_USB_MON=y | ||
| 920 | 987 | ||
| 921 | # | 988 | # |
| 922 | # USB Host Controller Drivers | 989 | # USB Host Controller Drivers |
| @@ -960,6 +1027,7 @@ CONFIG_USB_STORAGE=y | |||
| 960 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1027 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 961 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1028 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 962 | # CONFIG_USB_STORAGE_KARMA is not set | 1029 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1030 | # CONFIG_USB_STORAGE_SIERRA is not set | ||
| 963 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | 1031 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
| 964 | # CONFIG_USB_LIBUSUAL is not set | 1032 | # CONFIG_USB_LIBUSUAL is not set |
| 965 | 1033 | ||
| @@ -968,7 +1036,6 @@ CONFIG_USB_STORAGE=y | |||
| 968 | # | 1036 | # |
| 969 | # CONFIG_USB_MDC800 is not set | 1037 | # CONFIG_USB_MDC800 is not set |
| 970 | # CONFIG_USB_MICROTEK is not set | 1038 | # CONFIG_USB_MICROTEK is not set |
| 971 | CONFIG_USB_MON=y | ||
| 972 | 1039 | ||
| 973 | # | 1040 | # |
| 974 | # USB port drivers | 1041 | # USB port drivers |
| @@ -981,7 +1048,6 @@ CONFIG_USB_MON=y | |||
| 981 | # CONFIG_USB_EMI62 is not set | 1048 | # CONFIG_USB_EMI62 is not set |
| 982 | # CONFIG_USB_EMI26 is not set | 1049 | # CONFIG_USB_EMI26 is not set |
| 983 | # CONFIG_USB_ADUTUX is not set | 1050 | # CONFIG_USB_ADUTUX is not set |
| 984 | # CONFIG_USB_AUERSWALD is not set | ||
| 985 | # CONFIG_USB_RIO500 is not set | 1051 | # CONFIG_USB_RIO500 is not set |
| 986 | # CONFIG_USB_LEGOTOWER is not set | 1052 | # CONFIG_USB_LEGOTOWER is not set |
| 987 | # CONFIG_USB_LCD is not set | 1053 | # CONFIG_USB_LCD is not set |
| @@ -1035,10 +1101,13 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 1035 | # CONFIG_RTC_DRV_PCF8583 is not set | 1101 | # CONFIG_RTC_DRV_PCF8583 is not set |
| 1036 | # CONFIG_RTC_DRV_M41T80 is not set | 1102 | # CONFIG_RTC_DRV_M41T80 is not set |
| 1037 | # CONFIG_RTC_DRV_S35390A is not set | 1103 | # CONFIG_RTC_DRV_S35390A is not set |
| 1104 | # CONFIG_RTC_DRV_FM3130 is not set | ||
| 1038 | 1105 | ||
| 1039 | # | 1106 | # |
| 1040 | # SPI RTC drivers | 1107 | # SPI RTC drivers |
| 1041 | # | 1108 | # |
| 1109 | # CONFIG_RTC_DRV_M41T94 is not set | ||
| 1110 | # CONFIG_RTC_DRV_DS1305 is not set | ||
| 1042 | # CONFIG_RTC_DRV_MAX6902 is not set | 1111 | # CONFIG_RTC_DRV_MAX6902 is not set |
| 1043 | # CONFIG_RTC_DRV_R9701 is not set | 1112 | # CONFIG_RTC_DRV_R9701 is not set |
| 1044 | # CONFIG_RTC_DRV_RS5C348 is not set | 1113 | # CONFIG_RTC_DRV_RS5C348 is not set |
| @@ -1130,6 +1199,7 @@ CONFIG_TMPFS=y | |||
| 1130 | # CONFIG_CRAMFS is not set | 1199 | # CONFIG_CRAMFS is not set |
| 1131 | # CONFIG_VXFS_FS is not set | 1200 | # CONFIG_VXFS_FS is not set |
| 1132 | # CONFIG_MINIX_FS is not set | 1201 | # CONFIG_MINIX_FS is not set |
| 1202 | # CONFIG_OMFS_FS is not set | ||
| 1133 | # CONFIG_HPFS_FS is not set | 1203 | # CONFIG_HPFS_FS is not set |
| 1134 | # CONFIG_QNX4FS_FS is not set | 1204 | # CONFIG_QNX4FS_FS is not set |
| 1135 | # CONFIG_ROMFS_FS is not set | 1205 | # CONFIG_ROMFS_FS is not set |
| @@ -1140,14 +1210,13 @@ CONFIG_NFS_FS=y | |||
| 1140 | CONFIG_NFS_V3=y | 1210 | CONFIG_NFS_V3=y |
| 1141 | # CONFIG_NFS_V3_ACL is not set | 1211 | # CONFIG_NFS_V3_ACL is not set |
| 1142 | CONFIG_NFS_V4=y | 1212 | CONFIG_NFS_V4=y |
| 1143 | # CONFIG_NFSD is not set | ||
| 1144 | CONFIG_ROOT_NFS=y | 1213 | CONFIG_ROOT_NFS=y |
| 1214 | # CONFIG_NFSD is not set | ||
| 1145 | CONFIG_LOCKD=y | 1215 | CONFIG_LOCKD=y |
| 1146 | CONFIG_LOCKD_V4=y | 1216 | CONFIG_LOCKD_V4=y |
| 1147 | CONFIG_NFS_COMMON=y | 1217 | CONFIG_NFS_COMMON=y |
| 1148 | CONFIG_SUNRPC=y | 1218 | CONFIG_SUNRPC=y |
| 1149 | CONFIG_SUNRPC_GSS=y | 1219 | CONFIG_SUNRPC_GSS=y |
| 1150 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 1151 | CONFIG_RPCSEC_GSS_KRB5=y | 1220 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1152 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1221 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1153 | # CONFIG_SMB_FS is not set | 1222 | # CONFIG_SMB_FS is not set |
| @@ -1226,6 +1295,7 @@ CONFIG_BITREVERSE=y | |||
| 1226 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1295 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 1227 | # CONFIG_CRC_CCITT is not set | 1296 | # CONFIG_CRC_CCITT is not set |
| 1228 | # CONFIG_CRC16 is not set | 1297 | # CONFIG_CRC16 is not set |
| 1298 | CONFIG_CRC_T10DIF=y | ||
| 1229 | # CONFIG_CRC_ITU_T is not set | 1299 | # CONFIG_CRC_ITU_T is not set |
| 1230 | CONFIG_CRC32=y | 1300 | CONFIG_CRC32=y |
| 1231 | # CONFIG_CRC7 is not set | 1301 | # CONFIG_CRC7 is not set |
| @@ -1251,8 +1321,18 @@ CONFIG_FRAME_WARN=1024 | |||
| 1251 | # CONFIG_SLUB_DEBUG_ON is not set | 1321 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1252 | # CONFIG_SLUB_STATS is not set | 1322 | # CONFIG_SLUB_STATS is not set |
| 1253 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1323 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1324 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 1325 | # CONFIG_LATENCYTOP is not set | ||
| 1326 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1327 | CONFIG_HAVE_FTRACE=y | ||
| 1328 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1329 | # CONFIG_FTRACE is not set | ||
| 1330 | # CONFIG_SCHED_TRACER is not set | ||
| 1331 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1254 | # CONFIG_SAMPLES is not set | 1332 | # CONFIG_SAMPLES is not set |
| 1333 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1255 | # CONFIG_IRQSTACKS is not set | 1334 | # CONFIG_IRQSTACKS is not set |
| 1335 | # CONFIG_BOOTX_TEXT is not set | ||
| 1256 | # CONFIG_PPC_EARLY_DEBUG is not set | 1336 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1257 | 1337 | ||
| 1258 | # | 1338 | # |
| @@ -1306,6 +1386,10 @@ CONFIG_CRYPTO_PCBC=m | |||
| 1306 | # CONFIG_CRYPTO_MD4 is not set | 1386 | # CONFIG_CRYPTO_MD4 is not set |
| 1307 | CONFIG_CRYPTO_MD5=y | 1387 | CONFIG_CRYPTO_MD5=y |
| 1308 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1388 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 1389 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1390 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1391 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1392 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1309 | # CONFIG_CRYPTO_SHA1 is not set | 1393 | # CONFIG_CRYPTO_SHA1 is not set |
| 1310 | # CONFIG_CRYPTO_SHA256 is not set | 1394 | # CONFIG_CRYPTO_SHA256 is not set |
| 1311 | # CONFIG_CRYPTO_SHA512 is not set | 1395 | # CONFIG_CRYPTO_SHA512 is not set |
| @@ -1338,5 +1422,6 @@ CONFIG_CRYPTO_DES=y | |||
| 1338 | # CONFIG_CRYPTO_LZO is not set | 1422 | # CONFIG_CRYPTO_LZO is not set |
| 1339 | CONFIG_CRYPTO_HW=y | 1423 | CONFIG_CRYPTO_HW=y |
| 1340 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1424 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1425 | # CONFIG_CRYPTO_DEV_TALITOS is not set | ||
| 1341 | # CONFIG_PPC_CLOCK is not set | 1426 | # CONFIG_PPC_CLOCK is not set |
| 1342 | # CONFIG_VIRTUALIZATION is not set | 1427 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig b/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig index fdac4845bad9..a8afa39d6f76 100644 --- a/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig +++ b/arch/powerpc/configs/83xx/mpc834x_itxgp_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.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Mon Jun 9 08:52:26 2008 | 4 | # Thu Aug 21 00:52:21 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -16,6 +16,7 @@ CONFIG_6xx=y | |||
| 16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
| 17 | CONFIG_PPC_FPU=y | 17 | CONFIG_PPC_FPU=y |
| 18 | # CONFIG_FSL_EMB_PERFMON is not set | 18 | # CONFIG_FSL_EMB_PERFMON is not set |
| 19 | # CONFIG_ALTIVEC is not set | ||
| 19 | CONFIG_PPC_STD_MMU=y | 20 | CONFIG_PPC_STD_MMU=y |
| 20 | CONFIG_PPC_STD_MMU_32=y | 21 | CONFIG_PPC_STD_MMU_32=y |
| 21 | # CONFIG_PPC_MM_SLICES is not set | 22 | # CONFIG_PPC_MM_SLICES is not set |
| @@ -32,6 +33,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | 35 | CONFIG_STACKTRACE_SUPPORT=y |
| 36 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | 37 | CONFIG_LOCKDEP_SUPPORT=y |
| 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 39 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| @@ -51,6 +53,9 @@ CONFIG_PPC_UDBG_16550=y | |||
| 51 | CONFIG_AUDIT_ARCH=y | 53 | CONFIG_AUDIT_ARCH=y |
| 52 | CONFIG_GENERIC_BUG=y | 54 | CONFIG_GENERIC_BUG=y |
| 53 | CONFIG_DEFAULT_UIMAGE=y | 55 | CONFIG_DEFAULT_UIMAGE=y |
| 56 | CONFIG_HIBERNATE_32=y | ||
| 57 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
| 58 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
| 54 | # CONFIG_PPC_DCR_NATIVE is not set | 59 | # CONFIG_PPC_DCR_NATIVE is not set |
| 55 | # CONFIG_PPC_DCR_MMIO is not set | 60 | # CONFIG_PPC_DCR_MMIO is not set |
| 56 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 61 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| @@ -88,12 +93,12 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 88 | CONFIG_SYSCTL=y | 93 | CONFIG_SYSCTL=y |
| 89 | CONFIG_EMBEDDED=y | 94 | CONFIG_EMBEDDED=y |
| 90 | CONFIG_SYSCTL_SYSCALL=y | 95 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 92 | # CONFIG_KALLSYMS is not set | 96 | # CONFIG_KALLSYMS is not set |
| 93 | CONFIG_HOTPLUG=y | 97 | CONFIG_HOTPLUG=y |
| 94 | CONFIG_PRINTK=y | 98 | CONFIG_PRINTK=y |
| 95 | CONFIG_BUG=y | 99 | CONFIG_BUG=y |
| 96 | CONFIG_ELF_CORE=y | 100 | CONFIG_ELF_CORE=y |
| 101 | CONFIG_PCSPKR_PLATFORM=y | ||
| 97 | CONFIG_COMPAT_BRK=y | 102 | CONFIG_COMPAT_BRK=y |
| 98 | CONFIG_BASE_FULL=y | 103 | CONFIG_BASE_FULL=y |
| 99 | CONFIG_FUTEX=y | 104 | CONFIG_FUTEX=y |
| @@ -111,10 +116,16 @@ CONFIG_SLUB=y | |||
| 111 | # CONFIG_PROFILING is not set | 116 | # CONFIG_PROFILING is not set |
| 112 | # CONFIG_MARKERS is not set | 117 | # CONFIG_MARKERS is not set |
| 113 | CONFIG_HAVE_OPROFILE=y | 118 | CONFIG_HAVE_OPROFILE=y |
| 119 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 120 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 114 | CONFIG_HAVE_KPROBES=y | 121 | CONFIG_HAVE_KPROBES=y |
| 115 | CONFIG_HAVE_KRETPROBES=y | 122 | CONFIG_HAVE_KRETPROBES=y |
| 123 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 116 | # CONFIG_HAVE_DMA_ATTRS is not set | 124 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 125 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 126 | # CONFIG_HAVE_CLK is not set | ||
| 117 | CONFIG_PROC_PAGE_MONITOR=y | 127 | CONFIG_PROC_PAGE_MONITOR=y |
| 128 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 118 | CONFIG_SLABINFO=y | 129 | CONFIG_SLABINFO=y |
| 119 | CONFIG_RT_MUTEXES=y | 130 | CONFIG_RT_MUTEXES=y |
| 120 | # CONFIG_TINY_SHMEM is not set | 131 | # CONFIG_TINY_SHMEM is not set |
| @@ -125,12 +136,13 @@ CONFIG_MODULE_UNLOAD=y | |||
| 125 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 136 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 126 | # CONFIG_MODVERSIONS is not set | 137 | # CONFIG_MODVERSIONS is not set |
| 127 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 138 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 128 | # CONFIG_KMOD is not set | 139 | CONFIG_KMOD=y |
| 129 | CONFIG_BLOCK=y | 140 | CONFIG_BLOCK=y |
| 130 | # CONFIG_LBD is not set | 141 | # CONFIG_LBD is not set |
| 131 | # CONFIG_BLK_DEV_IO_TRACE is not set | 142 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 132 | # CONFIG_LSF is not set | 143 | # CONFIG_LSF is not set |
| 133 | # CONFIG_BLK_DEV_BSG is not set | 144 | # CONFIG_BLK_DEV_BSG is not set |
| 145 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 134 | 146 | ||
| 135 | # | 147 | # |
| 136 | # IO Schedulers | 148 | # IO Schedulers |
| @@ -149,37 +161,49 @@ CONFIG_CLASSIC_RCU=y | |||
| 149 | # | 161 | # |
| 150 | # Platform support | 162 | # Platform support |
| 151 | # | 163 | # |
| 152 | # CONFIG_PPC_MULTIPLATFORM is not set | 164 | CONFIG_PPC_MULTIPLATFORM=y |
| 153 | # CONFIG_PPC_82xx is not set | 165 | CONFIG_CLASSIC32=y |
| 154 | CONFIG_PPC_83xx=y | 166 | CONFIG_PPC_CHRP=y |
| 155 | # CONFIG_PPC_86xx is not set | 167 | # CONFIG_MPC5121_ADS is not set |
| 156 | # CONFIG_PPC_MPC512x is not set | 168 | # CONFIG_MPC5121_GENERIC is not set |
| 157 | # CONFIG_PPC_MPC5121 is not set | 169 | # CONFIG_PPC_MPC52xx is not set |
| 170 | CONFIG_PPC_PMAC=y | ||
| 158 | # CONFIG_PPC_CELL is not set | 171 | # CONFIG_PPC_CELL is not set |
| 159 | # CONFIG_PPC_CELL_NATIVE is not set | 172 | # CONFIG_PPC_CELL_NATIVE is not set |
| 173 | # CONFIG_PPC_82xx is not set | ||
| 160 | # CONFIG_PQ2ADS is not set | 174 | # CONFIG_PQ2ADS is not set |
| 161 | CONFIG_MPC83xx=y | 175 | CONFIG_PPC_83xx=y |
| 162 | # CONFIG_MPC831x_RDB is not set | 176 | # CONFIG_MPC831x_RDB is not set |
| 163 | # CONFIG_MPC832x_MDS is not set | 177 | # CONFIG_MPC832x_MDS is not set |
| 164 | # CONFIG_MPC832x_RDB is not set | 178 | # CONFIG_MPC832x_RDB is not set |
| 165 | # CONFIG_MPC834x_MDS is not set | 179 | # CONFIG_MPC834x_MDS is not set |
| 166 | CONFIG_MPC834x_ITX=y | 180 | CONFIG_MPC834x_ITX=y |
| 167 | # CONFIG_MPC836x_MDS is not set | 181 | # CONFIG_MPC836x_MDS is not set |
| 182 | # CONFIG_MPC836x_RDK is not set | ||
| 168 | # CONFIG_MPC837x_MDS is not set | 183 | # CONFIG_MPC837x_MDS is not set |
| 169 | # CONFIG_MPC837x_RDB is not set | 184 | # CONFIG_MPC837x_RDB is not set |
| 170 | # CONFIG_SBC834x is not set | 185 | # CONFIG_SBC834x is not set |
| 186 | # CONFIG_ASP834x is not set | ||
| 171 | CONFIG_PPC_MPC834x=y | 187 | CONFIG_PPC_MPC834x=y |
| 188 | # CONFIG_PPC_86xx is not set | ||
| 189 | # CONFIG_EMBEDDED6xx is not set | ||
| 190 | CONFIG_PPC_NATIVE=y | ||
| 191 | # CONFIG_UDBG_RTAS_CONSOLE is not set | ||
| 172 | CONFIG_IPIC=y | 192 | CONFIG_IPIC=y |
| 173 | # CONFIG_MPIC is not set | 193 | CONFIG_MPIC=y |
| 174 | # CONFIG_MPIC_WEIRD is not set | 194 | # CONFIG_MPIC_WEIRD is not set |
| 175 | # CONFIG_PPC_I8259 is not set | 195 | CONFIG_PPC_I8259=y |
| 176 | # CONFIG_PPC_RTAS is not set | 196 | CONFIG_PPC_RTAS=y |
| 197 | # CONFIG_RTAS_ERROR_LOGGING is not set | ||
| 198 | CONFIG_RTAS_PROC=y | ||
| 177 | # CONFIG_MMIO_NVRAM is not set | 199 | # CONFIG_MMIO_NVRAM is not set |
| 178 | # CONFIG_PPC_MPC106 is not set | 200 | CONFIG_PPC_MPC106=y |
| 179 | # CONFIG_PPC_970_NAP is not set | 201 | # CONFIG_PPC_970_NAP is not set |
| 180 | # CONFIG_PPC_INDIRECT_IO is not set | 202 | # CONFIG_PPC_INDIRECT_IO is not set |
| 181 | # CONFIG_GENERIC_IOMAP is not set | 203 | # CONFIG_GENERIC_IOMAP is not set |
| 182 | # CONFIG_CPU_FREQ is not set | 204 | # CONFIG_CPU_FREQ is not set |
| 205 | # CONFIG_PPC601_SYNC_FIX is not set | ||
| 206 | # CONFIG_TAU is not set | ||
| 183 | # CONFIG_FSL_ULI1575 is not set | 207 | # CONFIG_FSL_ULI1575 is not set |
| 184 | 208 | ||
| 185 | # | 209 | # |
| @@ -195,7 +219,7 @@ CONFIG_HZ_250=y | |||
| 195 | # CONFIG_HZ_300 is not set | 219 | # CONFIG_HZ_300 is not set |
| 196 | # CONFIG_HZ_1000 is not set | 220 | # CONFIG_HZ_1000 is not set |
| 197 | CONFIG_HZ=250 | 221 | CONFIG_HZ=250 |
| 198 | # CONFIG_SCHED_HRTICK is not set | 222 | CONFIG_SCHED_HRTICK=y |
| 199 | CONFIG_PREEMPT_NONE=y | 223 | CONFIG_PREEMPT_NONE=y |
| 200 | # CONFIG_PREEMPT_VOLUNTARY is not set | 224 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 201 | # CONFIG_PREEMPT is not set | 225 | # CONFIG_PREEMPT is not set |
| @@ -205,6 +229,7 @@ CONFIG_BINFMT_ELF=y | |||
| 205 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 229 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| 206 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 230 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
| 207 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 231 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
| 232 | # CONFIG_KEXEC is not set | ||
| 208 | CONFIG_ARCH_FLATMEM_ENABLE=y | 233 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 209 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 234 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
| 210 | CONFIG_SELECT_MEMORY_MODEL=y | 235 | CONFIG_SELECT_MEMORY_MODEL=y |
| @@ -217,6 +242,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 242 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 218 | CONFIG_PAGEFLAGS_EXTENDED=y | 243 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 219 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 244 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 245 | CONFIG_MIGRATION=y | ||
| 220 | # CONFIG_RESOURCES_64BIT is not set | 246 | # CONFIG_RESOURCES_64BIT is not set |
| 221 | CONFIG_ZONE_DMA_FLAG=1 | 247 | CONFIG_ZONE_DMA_FLAG=1 |
| 222 | CONFIG_BOUNCE=y | 248 | CONFIG_BOUNCE=y |
| @@ -224,6 +250,7 @@ CONFIG_VIRT_TO_BUS=y | |||
| 224 | CONFIG_FORCE_MAX_ZONEORDER=11 | 250 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 225 | CONFIG_PROC_DEVICETREE=y | 251 | CONFIG_PROC_DEVICETREE=y |
| 226 | # CONFIG_CMDLINE_BOOL is not set | 252 | # CONFIG_CMDLINE_BOOL is not set |
| 253 | CONFIG_EXTRA_TARGETS="" | ||
| 227 | # CONFIG_PM is not set | 254 | # CONFIG_PM is not set |
| 228 | CONFIG_SECCOMP=y | 255 | CONFIG_SECCOMP=y |
| 229 | CONFIG_ISA_DMA_API=y | 256 | CONFIG_ISA_DMA_API=y |
| @@ -231,10 +258,13 @@ CONFIG_ISA_DMA_API=y | |||
| 231 | # | 258 | # |
| 232 | # Bus options | 259 | # Bus options |
| 233 | # | 260 | # |
| 261 | # CONFIG_ISA is not set | ||
| 234 | CONFIG_ZONE_DMA=y | 262 | CONFIG_ZONE_DMA=y |
| 235 | CONFIG_GENERIC_ISA_DMA=y | 263 | CONFIG_GENERIC_ISA_DMA=y |
| 236 | CONFIG_PPC_INDIRECT_PCI=y | 264 | CONFIG_PPC_INDIRECT_PCI=y |
| 237 | CONFIG_FSL_SOC=y | 265 | CONFIG_FSL_SOC=y |
| 266 | CONFIG_FSL_PCI=y | ||
| 267 | CONFIG_PPC_PCI_CHOICE=y | ||
| 238 | CONFIG_PCI=y | 268 | CONFIG_PCI=y |
| 239 | CONFIG_PCI_DOMAINS=y | 269 | CONFIG_PCI_DOMAINS=y |
| 240 | CONFIG_PCI_SYSCALL=y | 270 | CONFIG_PCI_SYSCALL=y |
| @@ -259,10 +289,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
| 259 | CONFIG_KERNEL_START=0xc0000000 | 289 | CONFIG_KERNEL_START=0xc0000000 |
| 260 | CONFIG_PHYSICAL_START=0x00000000 | 290 | CONFIG_PHYSICAL_START=0x00000000 |
| 261 | CONFIG_TASK_SIZE=0xc0000000 | 291 | CONFIG_TASK_SIZE=0xc0000000 |
| 262 | |||
| 263 | # | ||
| 264 | # Networking | ||
| 265 | # | ||
| 266 | CONFIG_NET=y | 292 | CONFIG_NET=y |
| 267 | 293 | ||
| 268 | # | 294 | # |
| @@ -439,9 +465,11 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 | |||
| 439 | # CONFIG_MTD_UBI is not set | 465 | # CONFIG_MTD_UBI is not set |
| 440 | CONFIG_OF_DEVICE=y | 466 | CONFIG_OF_DEVICE=y |
| 441 | CONFIG_OF_I2C=y | 467 | CONFIG_OF_I2C=y |
| 468 | CONFIG_OF_SPI=y | ||
| 442 | # CONFIG_PARPORT is not set | 469 | # CONFIG_PARPORT is not set |
| 443 | CONFIG_BLK_DEV=y | 470 | CONFIG_BLK_DEV=y |
| 444 | # CONFIG_BLK_DEV_FD is not set | 471 | # CONFIG_BLK_DEV_FD is not set |
| 472 | # CONFIG_MAC_FLOPPY is not set | ||
| 445 | # CONFIG_BLK_CPQ_DA is not set | 473 | # CONFIG_BLK_CPQ_DA is not set |
| 446 | # CONFIG_BLK_CPQ_CISS_DA is not set | 474 | # CONFIG_BLK_CPQ_CISS_DA is not set |
| 447 | # CONFIG_BLK_DEV_DAC960 is not set | 475 | # CONFIG_BLK_DEV_DAC960 is not set |
| @@ -458,12 +486,14 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
| 458 | # CONFIG_BLK_DEV_XIP is not set | 486 | # CONFIG_BLK_DEV_XIP is not set |
| 459 | # CONFIG_CDROM_PKTCDVD is not set | 487 | # CONFIG_CDROM_PKTCDVD is not set |
| 460 | # CONFIG_ATA_OVER_ETH is not set | 488 | # CONFIG_ATA_OVER_ETH is not set |
| 489 | # CONFIG_BLK_DEV_HD is not set | ||
| 461 | CONFIG_MISC_DEVICES=y | 490 | CONFIG_MISC_DEVICES=y |
| 462 | # CONFIG_PHANTOM is not set | 491 | # CONFIG_PHANTOM is not set |
| 463 | # CONFIG_EEPROM_93CX6 is not set | 492 | # CONFIG_EEPROM_93CX6 is not set |
| 464 | # CONFIG_SGI_IOC4 is not set | 493 | # CONFIG_SGI_IOC4 is not set |
| 465 | # CONFIG_TIFM_CORE is not set | 494 | # CONFIG_TIFM_CORE is not set |
| 466 | # CONFIG_ENCLOSURE_SERVICES is not set | 495 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 496 | # CONFIG_HP_ILO is not set | ||
| 467 | CONFIG_HAVE_IDE=y | 497 | CONFIG_HAVE_IDE=y |
| 468 | # CONFIG_IDE is not set | 498 | # CONFIG_IDE is not set |
| 469 | 499 | ||
| @@ -540,7 +570,10 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 540 | # CONFIG_SCSI_DC390T is not set | 570 | # CONFIG_SCSI_DC390T is not set |
| 541 | # CONFIG_SCSI_NSP32 is not set | 571 | # CONFIG_SCSI_NSP32 is not set |
| 542 | # CONFIG_SCSI_DEBUG is not set | 572 | # CONFIG_SCSI_DEBUG is not set |
| 573 | # CONFIG_SCSI_MESH is not set | ||
| 574 | # CONFIG_SCSI_MAC53C94 is not set | ||
| 543 | # CONFIG_SCSI_SRP is not set | 575 | # CONFIG_SCSI_SRP is not set |
| 576 | # CONFIG_SCSI_DH is not set | ||
| 544 | # CONFIG_ATA is not set | 577 | # CONFIG_ATA is not set |
| 545 | # CONFIG_MD is not set | 578 | # CONFIG_MD is not set |
| 546 | # CONFIG_FUSION is not set | 579 | # CONFIG_FUSION is not set |
| @@ -548,12 +581,15 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 548 | # | 581 | # |
| 549 | # IEEE 1394 (FireWire) support | 582 | # IEEE 1394 (FireWire) support |
| 550 | # | 583 | # |
| 584 | |||
| 585 | # | ||
| 586 | # Enable only one of the two stacks, unless you know what you are doing | ||
| 587 | # | ||
| 551 | # CONFIG_FIREWIRE is not set | 588 | # CONFIG_FIREWIRE is not set |
| 552 | # CONFIG_IEEE1394 is not set | 589 | # CONFIG_IEEE1394 is not set |
| 553 | # CONFIG_I2O is not set | 590 | # CONFIG_I2O is not set |
| 554 | # CONFIG_MACINTOSH_DRIVERS is not set | 591 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 555 | CONFIG_NETDEVICES=y | 592 | CONFIG_NETDEVICES=y |
| 556 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 557 | # CONFIG_DUMMY is not set | 593 | # CONFIG_DUMMY is not set |
| 558 | # CONFIG_BONDING is not set | 594 | # CONFIG_BONDING is not set |
| 559 | # CONFIG_MACVLAN is not set | 595 | # CONFIG_MACVLAN is not set |
| @@ -584,7 +620,6 @@ CONFIG_NETDEV_1000=y | |||
| 584 | # CONFIG_DL2K is not set | 620 | # CONFIG_DL2K is not set |
| 585 | # CONFIG_E1000 is not set | 621 | # CONFIG_E1000 is not set |
| 586 | # CONFIG_E1000E is not set | 622 | # CONFIG_E1000E is not set |
| 587 | # CONFIG_E1000E_ENABLED is not set | ||
| 588 | # CONFIG_IP1000 is not set | 623 | # CONFIG_IP1000 is not set |
| 589 | # CONFIG_IGB is not set | 624 | # CONFIG_IGB is not set |
| 590 | # CONFIG_NS83820 is not set | 625 | # CONFIG_NS83820 is not set |
| @@ -598,9 +633,10 @@ CONFIG_NETDEV_1000=y | |||
| 598 | # CONFIG_TIGON3 is not set | 633 | # CONFIG_TIGON3 is not set |
| 599 | # CONFIG_BNX2 is not set | 634 | # CONFIG_BNX2 is not set |
| 600 | CONFIG_GIANFAR=y | 635 | CONFIG_GIANFAR=y |
| 601 | CONFIG_GFAR_NAPI=y | 636 | # CONFIG_MV643XX_ETH is not set |
| 602 | # CONFIG_QLA3XXX is not set | 637 | # CONFIG_QLA3XXX is not set |
| 603 | # CONFIG_ATL1 is not set | 638 | # CONFIG_ATL1 is not set |
| 639 | # CONFIG_ATL1E is not set | ||
| 604 | CONFIG_NETDEV_10000=y | 640 | CONFIG_NETDEV_10000=y |
| 605 | # CONFIG_CHELSIO_T1 is not set | 641 | # CONFIG_CHELSIO_T1 is not set |
| 606 | # CONFIG_CHELSIO_T3 is not set | 642 | # CONFIG_CHELSIO_T3 is not set |
| @@ -678,11 +714,14 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
| 678 | # CONFIG_SERIAL_UARTLITE is not set | 714 | # CONFIG_SERIAL_UARTLITE is not set |
| 679 | CONFIG_SERIAL_CORE=y | 715 | CONFIG_SERIAL_CORE=y |
| 680 | CONFIG_SERIAL_CORE_CONSOLE=y | 716 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 717 | # CONFIG_SERIAL_PMACZILOG is not set | ||
| 681 | # CONFIG_SERIAL_JSM is not set | 718 | # CONFIG_SERIAL_JSM is not set |
| 682 | # CONFIG_SERIAL_OF_PLATFORM is not set | 719 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 683 | CONFIG_UNIX98_PTYS=y | 720 | CONFIG_UNIX98_PTYS=y |
| 684 | CONFIG_LEGACY_PTYS=y | 721 | CONFIG_LEGACY_PTYS=y |
| 685 | CONFIG_LEGACY_PTY_COUNT=256 | 722 | CONFIG_LEGACY_PTY_COUNT=256 |
| 723 | # CONFIG_BRIQ_PANEL is not set | ||
| 724 | # CONFIG_HVC_RTAS is not set | ||
| 686 | # CONFIG_IPMI_HANDLER is not set | 725 | # CONFIG_IPMI_HANDLER is not set |
| 687 | CONFIG_HW_RANDOM=y | 726 | CONFIG_HW_RANDOM=y |
| 688 | # CONFIG_NVRAM is not set | 727 | # CONFIG_NVRAM is not set |
| @@ -694,43 +733,70 @@ CONFIG_DEVPORT=y | |||
| 694 | CONFIG_I2C=y | 733 | CONFIG_I2C=y |
| 695 | CONFIG_I2C_BOARDINFO=y | 734 | CONFIG_I2C_BOARDINFO=y |
| 696 | CONFIG_I2C_CHARDEV=y | 735 | CONFIG_I2C_CHARDEV=y |
| 736 | CONFIG_I2C_HELPER_AUTO=y | ||
| 697 | 737 | ||
| 698 | # | 738 | # |
| 699 | # I2C Hardware Bus support | 739 | # I2C Hardware Bus support |
| 700 | # | 740 | # |
| 741 | |||
| 742 | # | ||
| 743 | # PC SMBus host controller drivers | ||
| 744 | # | ||
| 701 | # CONFIG_I2C_ALI1535 is not set | 745 | # CONFIG_I2C_ALI1535 is not set |
| 702 | # CONFIG_I2C_ALI1563 is not set | 746 | # CONFIG_I2C_ALI1563 is not set |
| 703 | # CONFIG_I2C_ALI15X3 is not set | 747 | # CONFIG_I2C_ALI15X3 is not set |
| 704 | # CONFIG_I2C_AMD756 is not set | 748 | # CONFIG_I2C_AMD756 is not set |
| 705 | # CONFIG_I2C_AMD8111 is not set | 749 | # CONFIG_I2C_AMD8111 is not set |
| 706 | # CONFIG_I2C_I801 is not set | 750 | # CONFIG_I2C_I801 is not set |
| 707 | # CONFIG_I2C_I810 is not set | 751 | # CONFIG_I2C_ISCH is not set |
| 708 | # CONFIG_I2C_PIIX4 is not set | 752 | # CONFIG_I2C_PIIX4 is not set |
| 709 | CONFIG_I2C_MPC=y | ||
| 710 | # CONFIG_I2C_NFORCE2 is not set | 753 | # CONFIG_I2C_NFORCE2 is not set |
| 711 | # CONFIG_I2C_OCORES is not set | ||
| 712 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 713 | # CONFIG_I2C_PROSAVAGE is not set | ||
| 714 | # CONFIG_I2C_SAVAGE4 is not set | ||
| 715 | # CONFIG_I2C_SIMTEC is not set | ||
| 716 | # CONFIG_I2C_SIS5595 is not set | 754 | # CONFIG_I2C_SIS5595 is not set |
| 717 | # CONFIG_I2C_SIS630 is not set | 755 | # CONFIG_I2C_SIS630 is not set |
| 718 | # CONFIG_I2C_SIS96X is not set | 756 | # CONFIG_I2C_SIS96X is not set |
| 719 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 720 | # CONFIG_I2C_STUB is not set | ||
| 721 | # CONFIG_I2C_TINY_USB is not set | ||
| 722 | # CONFIG_I2C_VIA is not set | 757 | # CONFIG_I2C_VIA is not set |
| 723 | # CONFIG_I2C_VIAPRO is not set | 758 | # CONFIG_I2C_VIAPRO is not set |
| 759 | |||
| 760 | # | ||
| 761 | # Mac SMBus host controller drivers | ||
| 762 | # | ||
| 763 | # CONFIG_I2C_HYDRA is not set | ||
| 764 | CONFIG_I2C_POWERMAC=y | ||
| 765 | |||
| 766 | # | ||
| 767 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 768 | # | ||
| 769 | CONFIG_I2C_MPC=y | ||
| 770 | # CONFIG_I2C_OCORES is not set | ||
| 771 | # CONFIG_I2C_SIMTEC is not set | ||
| 772 | |||
| 773 | # | ||
| 774 | # External I2C/SMBus adapter drivers | ||
| 775 | # | ||
| 776 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 777 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 778 | # CONFIG_I2C_TINY_USB is not set | ||
| 779 | |||
| 780 | # | ||
| 781 | # Graphics adapter I2C/DDC channel drivers | ||
| 782 | # | ||
| 724 | # CONFIG_I2C_VOODOO3 is not set | 783 | # CONFIG_I2C_VOODOO3 is not set |
| 784 | |||
| 785 | # | ||
| 786 | # Other I2C/SMBus bus drivers | ||
| 787 | # | ||
| 725 | # CONFIG_I2C_PCA_PLATFORM is not set | 788 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 789 | # CONFIG_I2C_STUB is not set | ||
| 726 | 790 | ||
| 727 | # | 791 | # |
| 728 | # Miscellaneous I2C Chip support | 792 | # Miscellaneous I2C Chip support |
| 729 | # | 793 | # |
| 730 | # CONFIG_DS1682 is not set | 794 | # CONFIG_DS1682 is not set |
| 795 | # CONFIG_AT24 is not set | ||
| 731 | # CONFIG_SENSORS_EEPROM is not set | 796 | # CONFIG_SENSORS_EEPROM is not set |
| 732 | CONFIG_SENSORS_PCF8574=y | 797 | CONFIG_SENSORS_PCF8574=y |
| 733 | # CONFIG_PCF8575 is not set | 798 | # CONFIG_PCF8575 is not set |
| 799 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 734 | # CONFIG_SENSORS_PCF8591 is not set | 800 | # CONFIG_SENSORS_PCF8591 is not set |
| 735 | # CONFIG_SENSORS_MAX6875 is not set | 801 | # CONFIG_SENSORS_MAX6875 is not set |
| 736 | # CONFIG_SENSORS_TSL2550 is not set | 802 | # CONFIG_SENSORS_TSL2550 is not set |
| @@ -753,10 +819,13 @@ CONFIG_SPI_MPC83xx=y | |||
| 753 | # CONFIG_SPI_AT25 is not set | 819 | # CONFIG_SPI_AT25 is not set |
| 754 | # CONFIG_SPI_SPIDEV is not set | 820 | # CONFIG_SPI_SPIDEV is not set |
| 755 | # CONFIG_SPI_TLE62X0 is not set | 821 | # CONFIG_SPI_TLE62X0 is not set |
| 822 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 823 | # CONFIG_GPIOLIB is not set | ||
| 756 | # CONFIG_W1 is not set | 824 | # CONFIG_W1 is not set |
| 757 | # CONFIG_POWER_SUPPLY is not set | 825 | # CONFIG_POWER_SUPPLY is not set |
| 758 | # CONFIG_HWMON is not set | 826 | # CONFIG_HWMON is not set |
| 759 | # CONFIG_THERMAL is not set | 827 | # CONFIG_THERMAL is not set |
| 828 | # CONFIG_THERMAL_HWMON is not set | ||
| 760 | CONFIG_WATCHDOG=y | 829 | CONFIG_WATCHDOG=y |
| 761 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 830 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
| 762 | 831 | ||
| @@ -764,7 +833,9 @@ CONFIG_WATCHDOG=y | |||
| 764 | # Watchdog Device Drivers | 833 | # Watchdog Device Drivers |
| 765 | # | 834 | # |
| 766 | # CONFIG_SOFT_WATCHDOG is not set | 835 | # CONFIG_SOFT_WATCHDOG is not set |
| 767 | CONFIG_83xx_WDT=y | 836 | # CONFIG_ALIM7101_WDT is not set |
| 837 | # CONFIG_8xxx_WDT is not set | ||
| 838 | # CONFIG_WATCHDOG_RTAS is not set | ||
| 768 | 839 | ||
| 769 | # | 840 | # |
| 770 | # PCI-based Watchdog Cards | 841 | # PCI-based Watchdog Cards |
| @@ -786,8 +857,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 786 | # | 857 | # |
| 787 | # Multifunction device drivers | 858 | # Multifunction device drivers |
| 788 | # | 859 | # |
| 860 | # CONFIG_MFD_CORE is not set | ||
| 789 | # CONFIG_MFD_SM501 is not set | 861 | # CONFIG_MFD_SM501 is not set |
| 790 | # CONFIG_HTC_PASIC3 is not set | 862 | # CONFIG_HTC_PASIC3 is not set |
| 863 | # CONFIG_MFD_TMIO is not set | ||
| 791 | 864 | ||
| 792 | # | 865 | # |
| 793 | # Multimedia devices | 866 | # Multimedia devices |
| @@ -820,10 +893,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m | |||
| 820 | # Display device support | 893 | # Display device support |
| 821 | # | 894 | # |
| 822 | # CONFIG_DISPLAY_SUPPORT is not set | 895 | # CONFIG_DISPLAY_SUPPORT is not set |
| 823 | |||
| 824 | # | ||
| 825 | # Sound | ||
| 826 | # | ||
| 827 | # CONFIG_SOUND is not set | 896 | # CONFIG_SOUND is not set |
| 828 | CONFIG_USB_SUPPORT=y | 897 | CONFIG_USB_SUPPORT=y |
| 829 | CONFIG_USB_ARCH_HAS_HCD=y | 898 | CONFIG_USB_ARCH_HAS_HCD=y |
| @@ -842,6 +911,7 @@ CONFIG_USB_DEVICE_CLASS=y | |||
| 842 | # CONFIG_USB_OTG is not set | 911 | # CONFIG_USB_OTG is not set |
| 843 | # CONFIG_USB_OTG_WHITELIST is not set | 912 | # CONFIG_USB_OTG_WHITELIST is not set |
| 844 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 913 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
| 914 | CONFIG_USB_MON=y | ||
| 845 | 915 | ||
| 846 | # | 916 | # |
| 847 | # USB Host Controller Drivers | 917 | # USB Host Controller Drivers |
| @@ -885,6 +955,7 @@ CONFIG_USB_STORAGE=y | |||
| 885 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 955 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 886 | # CONFIG_USB_STORAGE_ALAUDA is not set | 956 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 887 | # CONFIG_USB_STORAGE_KARMA is not set | 957 | # CONFIG_USB_STORAGE_KARMA is not set |
| 958 | # CONFIG_USB_STORAGE_SIERRA is not set | ||
| 888 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | 959 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
| 889 | # CONFIG_USB_LIBUSUAL is not set | 960 | # CONFIG_USB_LIBUSUAL is not set |
| 890 | 961 | ||
| @@ -893,7 +964,6 @@ CONFIG_USB_STORAGE=y | |||
| 893 | # | 964 | # |
| 894 | # CONFIG_USB_MDC800 is not set | 965 | # CONFIG_USB_MDC800 is not set |
| 895 | # CONFIG_USB_MICROTEK is not set | 966 | # CONFIG_USB_MICROTEK is not set |
| 896 | CONFIG_USB_MON=y | ||
| 897 | 967 | ||
| 898 | # | 968 | # |
| 899 | # USB port drivers | 969 | # USB port drivers |
| @@ -906,7 +976,6 @@ CONFIG_USB_MON=y | |||
| 906 | # CONFIG_USB_EMI62 is not set | 976 | # CONFIG_USB_EMI62 is not set |
| 907 | # CONFIG_USB_EMI26 is not set | 977 | # CONFIG_USB_EMI26 is not set |
| 908 | # CONFIG_USB_ADUTUX is not set | 978 | # CONFIG_USB_ADUTUX is not set |
| 909 | # CONFIG_USB_AUERSWALD is not set | ||
| 910 | # CONFIG_USB_RIO500 is not set | 979 | # CONFIG_USB_RIO500 is not set |
| 911 | # CONFIG_USB_LEGOTOWER is not set | 980 | # CONFIG_USB_LEGOTOWER is not set |
| 912 | # CONFIG_USB_LCD is not set | 981 | # CONFIG_USB_LCD is not set |
| @@ -959,10 +1028,13 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 959 | # CONFIG_RTC_DRV_PCF8583 is not set | 1028 | # CONFIG_RTC_DRV_PCF8583 is not set |
| 960 | # CONFIG_RTC_DRV_M41T80 is not set | 1029 | # CONFIG_RTC_DRV_M41T80 is not set |
| 961 | # CONFIG_RTC_DRV_S35390A is not set | 1030 | # CONFIG_RTC_DRV_S35390A is not set |
| 1031 | # CONFIG_RTC_DRV_FM3130 is not set | ||
| 962 | 1032 | ||
| 963 | # | 1033 | # |
| 964 | # SPI RTC drivers | 1034 | # SPI RTC drivers |
| 965 | # | 1035 | # |
| 1036 | # CONFIG_RTC_DRV_M41T94 is not set | ||
| 1037 | # CONFIG_RTC_DRV_DS1305 is not set | ||
| 966 | # CONFIG_RTC_DRV_MAX6902 is not set | 1038 | # CONFIG_RTC_DRV_MAX6902 is not set |
| 967 | # CONFIG_RTC_DRV_R9701 is not set | 1039 | # CONFIG_RTC_DRV_R9701 is not set |
| 968 | # CONFIG_RTC_DRV_RS5C348 is not set | 1040 | # CONFIG_RTC_DRV_RS5C348 is not set |
| @@ -1054,6 +1126,7 @@ CONFIG_TMPFS=y | |||
| 1054 | # CONFIG_CRAMFS is not set | 1126 | # CONFIG_CRAMFS is not set |
| 1055 | # CONFIG_VXFS_FS is not set | 1127 | # CONFIG_VXFS_FS is not set |
| 1056 | # CONFIG_MINIX_FS is not set | 1128 | # CONFIG_MINIX_FS is not set |
| 1129 | # CONFIG_OMFS_FS is not set | ||
| 1057 | # CONFIG_HPFS_FS is not set | 1130 | # CONFIG_HPFS_FS is not set |
| 1058 | # CONFIG_QNX4FS_FS is not set | 1131 | # CONFIG_QNX4FS_FS is not set |
| 1059 | # CONFIG_ROMFS_FS is not set | 1132 | # CONFIG_ROMFS_FS is not set |
| @@ -1064,14 +1137,13 @@ CONFIG_NFS_FS=y | |||
| 1064 | CONFIG_NFS_V3=y | 1137 | CONFIG_NFS_V3=y |
| 1065 | # CONFIG_NFS_V3_ACL is not set | 1138 | # CONFIG_NFS_V3_ACL is not set |
| 1066 | CONFIG_NFS_V4=y | 1139 | CONFIG_NFS_V4=y |
| 1067 | # CONFIG_NFSD is not set | ||
| 1068 | CONFIG_ROOT_NFS=y | 1140 | CONFIG_ROOT_NFS=y |
| 1141 | # CONFIG_NFSD is not set | ||
| 1069 | CONFIG_LOCKD=y | 1142 | CONFIG_LOCKD=y |
| 1070 | CONFIG_LOCKD_V4=y | 1143 | CONFIG_LOCKD_V4=y |
| 1071 | CONFIG_NFS_COMMON=y | 1144 | CONFIG_NFS_COMMON=y |
| 1072 | CONFIG_SUNRPC=y | 1145 | CONFIG_SUNRPC=y |
| 1073 | CONFIG_SUNRPC_GSS=y | 1146 | CONFIG_SUNRPC_GSS=y |
| 1074 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 1075 | CONFIG_RPCSEC_GSS_KRB5=y | 1147 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1076 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1148 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1077 | # CONFIG_SMB_FS is not set | 1149 | # CONFIG_SMB_FS is not set |
| @@ -1150,6 +1222,7 @@ CONFIG_BITREVERSE=y | |||
| 1150 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1222 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 1151 | # CONFIG_CRC_CCITT is not set | 1223 | # CONFIG_CRC_CCITT is not set |
| 1152 | # CONFIG_CRC16 is not set | 1224 | # CONFIG_CRC16 is not set |
| 1225 | CONFIG_CRC_T10DIF=y | ||
| 1153 | # CONFIG_CRC_ITU_T is not set | 1226 | # CONFIG_CRC_ITU_T is not set |
| 1154 | CONFIG_CRC32=y | 1227 | CONFIG_CRC32=y |
| 1155 | # CONFIG_CRC7 is not set | 1228 | # CONFIG_CRC7 is not set |
| @@ -1175,8 +1248,18 @@ CONFIG_FRAME_WARN=1024 | |||
| 1175 | # CONFIG_SLUB_DEBUG_ON is not set | 1248 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1176 | # CONFIG_SLUB_STATS is not set | 1249 | # CONFIG_SLUB_STATS is not set |
| 1177 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1250 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1251 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 1252 | # CONFIG_LATENCYTOP is not set | ||
| 1253 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1254 | CONFIG_HAVE_FTRACE=y | ||
| 1255 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1256 | # CONFIG_FTRACE is not set | ||
| 1257 | # CONFIG_SCHED_TRACER is not set | ||
| 1258 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1178 | # CONFIG_SAMPLES is not set | 1259 | # CONFIG_SAMPLES is not set |
| 1260 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1179 | # CONFIG_IRQSTACKS is not set | 1261 | # CONFIG_IRQSTACKS is not set |
| 1262 | # CONFIG_BOOTX_TEXT is not set | ||
| 1180 | # CONFIG_PPC_EARLY_DEBUG is not set | 1263 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1181 | 1264 | ||
| 1182 | # | 1265 | # |
| @@ -1230,6 +1313,10 @@ CONFIG_CRYPTO_PCBC=m | |||
| 1230 | # CONFIG_CRYPTO_MD4 is not set | 1313 | # CONFIG_CRYPTO_MD4 is not set |
| 1231 | CONFIG_CRYPTO_MD5=y | 1314 | CONFIG_CRYPTO_MD5=y |
| 1232 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1315 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 1316 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1317 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1318 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1319 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1233 | # CONFIG_CRYPTO_SHA1 is not set | 1320 | # CONFIG_CRYPTO_SHA1 is not set |
| 1234 | # CONFIG_CRYPTO_SHA256 is not set | 1321 | # CONFIG_CRYPTO_SHA256 is not set |
| 1235 | # CONFIG_CRYPTO_SHA512 is not set | 1322 | # CONFIG_CRYPTO_SHA512 is not set |
| @@ -1262,5 +1349,6 @@ CONFIG_CRYPTO_DES=y | |||
| 1262 | # CONFIG_CRYPTO_LZO is not set | 1349 | # CONFIG_CRYPTO_LZO is not set |
| 1263 | CONFIG_CRYPTO_HW=y | 1350 | CONFIG_CRYPTO_HW=y |
| 1264 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1351 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1352 | # CONFIG_CRYPTO_DEV_TALITOS is not set | ||
| 1265 | # CONFIG_PPC_CLOCK is not set | 1353 | # CONFIG_PPC_CLOCK is not set |
| 1266 | # CONFIG_VIRTUALIZATION is not set | 1354 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/83xx/mpc834x_mds_defconfig b/arch/powerpc/configs/83xx/mpc834x_mds_defconfig index c82e96e984fc..24c320a36670 100644 --- a/arch/powerpc/configs/83xx/mpc834x_mds_defconfig +++ b/arch/powerpc/configs/83xx/mpc834x_mds_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.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Mon Jun 9 08:52:26 2008 | 4 | # Thu Aug 21 00:52:21 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -16,6 +16,7 @@ CONFIG_6xx=y | |||
| 16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
| 17 | CONFIG_PPC_FPU=y | 17 | CONFIG_PPC_FPU=y |
| 18 | # CONFIG_FSL_EMB_PERFMON is not set | 18 | # CONFIG_FSL_EMB_PERFMON is not set |
| 19 | # CONFIG_ALTIVEC is not set | ||
| 19 | CONFIG_PPC_STD_MMU=y | 20 | CONFIG_PPC_STD_MMU=y |
| 20 | CONFIG_PPC_STD_MMU_32=y | 21 | CONFIG_PPC_STD_MMU_32=y |
| 21 | # CONFIG_PPC_MM_SLICES is not set | 22 | # CONFIG_PPC_MM_SLICES is not set |
| @@ -32,6 +33,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | 35 | CONFIG_STACKTRACE_SUPPORT=y |
| 36 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | 37 | CONFIG_LOCKDEP_SUPPORT=y |
| 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 39 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| @@ -51,6 +53,9 @@ CONFIG_PPC_UDBG_16550=y | |||
| 51 | CONFIG_AUDIT_ARCH=y | 53 | CONFIG_AUDIT_ARCH=y |
| 52 | CONFIG_GENERIC_BUG=y | 54 | CONFIG_GENERIC_BUG=y |
| 53 | CONFIG_DEFAULT_UIMAGE=y | 55 | CONFIG_DEFAULT_UIMAGE=y |
| 56 | CONFIG_HIBERNATE_32=y | ||
| 57 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
| 58 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
| 54 | # CONFIG_PPC_DCR_NATIVE is not set | 59 | # CONFIG_PPC_DCR_NATIVE is not set |
| 55 | # CONFIG_PPC_DCR_MMIO is not set | 60 | # CONFIG_PPC_DCR_MMIO is not set |
| 56 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 61 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| @@ -88,12 +93,12 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 88 | CONFIG_SYSCTL=y | 93 | CONFIG_SYSCTL=y |
| 89 | CONFIG_EMBEDDED=y | 94 | CONFIG_EMBEDDED=y |
| 90 | CONFIG_SYSCTL_SYSCALL=y | 95 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 92 | # CONFIG_KALLSYMS is not set | 96 | # CONFIG_KALLSYMS is not set |
| 93 | CONFIG_HOTPLUG=y | 97 | CONFIG_HOTPLUG=y |
| 94 | CONFIG_PRINTK=y | 98 | CONFIG_PRINTK=y |
| 95 | CONFIG_BUG=y | 99 | CONFIG_BUG=y |
| 96 | CONFIG_ELF_CORE=y | 100 | CONFIG_ELF_CORE=y |
| 101 | CONFIG_PCSPKR_PLATFORM=y | ||
| 97 | CONFIG_COMPAT_BRK=y | 102 | CONFIG_COMPAT_BRK=y |
| 98 | CONFIG_BASE_FULL=y | 103 | CONFIG_BASE_FULL=y |
| 99 | CONFIG_FUTEX=y | 104 | CONFIG_FUTEX=y |
| @@ -111,10 +116,16 @@ CONFIG_SLUB=y | |||
| 111 | # CONFIG_PROFILING is not set | 116 | # CONFIG_PROFILING is not set |
| 112 | # CONFIG_MARKERS is not set | 117 | # CONFIG_MARKERS is not set |
| 113 | CONFIG_HAVE_OPROFILE=y | 118 | CONFIG_HAVE_OPROFILE=y |
| 119 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 120 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 114 | CONFIG_HAVE_KPROBES=y | 121 | CONFIG_HAVE_KPROBES=y |
| 115 | CONFIG_HAVE_KRETPROBES=y | 122 | CONFIG_HAVE_KRETPROBES=y |
| 123 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 116 | # CONFIG_HAVE_DMA_ATTRS is not set | 124 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 125 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 126 | # CONFIG_HAVE_CLK is not set | ||
| 117 | CONFIG_PROC_PAGE_MONITOR=y | 127 | CONFIG_PROC_PAGE_MONITOR=y |
| 128 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 118 | CONFIG_SLABINFO=y | 129 | CONFIG_SLABINFO=y |
| 119 | CONFIG_RT_MUTEXES=y | 130 | CONFIG_RT_MUTEXES=y |
| 120 | # CONFIG_TINY_SHMEM is not set | 131 | # CONFIG_TINY_SHMEM is not set |
| @@ -125,12 +136,13 @@ CONFIG_MODULE_UNLOAD=y | |||
| 125 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 136 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 126 | # CONFIG_MODVERSIONS is not set | 137 | # CONFIG_MODVERSIONS is not set |
| 127 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 138 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 128 | # CONFIG_KMOD is not set | 139 | CONFIG_KMOD=y |
| 129 | CONFIG_BLOCK=y | 140 | CONFIG_BLOCK=y |
| 130 | # CONFIG_LBD is not set | 141 | # CONFIG_LBD is not set |
| 131 | # CONFIG_BLK_DEV_IO_TRACE is not set | 142 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 132 | # CONFIG_LSF is not set | 143 | # CONFIG_LSF is not set |
| 133 | # CONFIG_BLK_DEV_BSG is not set | 144 | # CONFIG_BLK_DEV_BSG is not set |
| 145 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 134 | 146 | ||
| 135 | # | 147 | # |
| 136 | # IO Schedulers | 148 | # IO Schedulers |
| @@ -149,37 +161,49 @@ CONFIG_CLASSIC_RCU=y | |||
| 149 | # | 161 | # |
| 150 | # Platform support | 162 | # Platform support |
| 151 | # | 163 | # |
| 152 | # CONFIG_PPC_MULTIPLATFORM is not set | 164 | CONFIG_PPC_MULTIPLATFORM=y |
| 153 | # CONFIG_PPC_82xx is not set | 165 | CONFIG_CLASSIC32=y |
| 154 | CONFIG_PPC_83xx=y | 166 | CONFIG_PPC_CHRP=y |
| 155 | # CONFIG_PPC_86xx is not set | 167 | # CONFIG_MPC5121_ADS is not set |
| 156 | # CONFIG_PPC_MPC512x is not set | 168 | # CONFIG_MPC5121_GENERIC is not set |
| 157 | # CONFIG_PPC_MPC5121 is not set | 169 | # CONFIG_PPC_MPC52xx is not set |
| 170 | CONFIG_PPC_PMAC=y | ||
| 158 | # CONFIG_PPC_CELL is not set | 171 | # CONFIG_PPC_CELL is not set |
| 159 | # CONFIG_PPC_CELL_NATIVE is not set | 172 | # CONFIG_PPC_CELL_NATIVE is not set |
| 173 | # CONFIG_PPC_82xx is not set | ||
| 160 | # CONFIG_PQ2ADS is not set | 174 | # CONFIG_PQ2ADS is not set |
| 161 | CONFIG_MPC83xx=y | 175 | CONFIG_PPC_83xx=y |
| 162 | # CONFIG_MPC831x_RDB is not set | 176 | # CONFIG_MPC831x_RDB is not set |
| 163 | # CONFIG_MPC832x_MDS is not set | 177 | # CONFIG_MPC832x_MDS is not set |
| 164 | # CONFIG_MPC832x_RDB is not set | 178 | # CONFIG_MPC832x_RDB is not set |
| 165 | CONFIG_MPC834x_MDS=y | 179 | CONFIG_MPC834x_MDS=y |
| 166 | # CONFIG_MPC834x_ITX is not set | 180 | # CONFIG_MPC834x_ITX is not set |
| 167 | # CONFIG_MPC836x_MDS is not set | 181 | # CONFIG_MPC836x_MDS is not set |
| 182 | # CONFIG_MPC836x_RDK is not set | ||
| 168 | # CONFIG_MPC837x_MDS is not set | 183 | # CONFIG_MPC837x_MDS is not set |
| 169 | # CONFIG_MPC837x_RDB is not set | 184 | # CONFIG_MPC837x_RDB is not set |
| 170 | # CONFIG_SBC834x is not set | 185 | # CONFIG_SBC834x is not set |
| 186 | # CONFIG_ASP834x is not set | ||
| 171 | CONFIG_PPC_MPC834x=y | 187 | CONFIG_PPC_MPC834x=y |
| 188 | # CONFIG_PPC_86xx is not set | ||
| 189 | # CONFIG_EMBEDDED6xx is not set | ||
| 190 | CONFIG_PPC_NATIVE=y | ||
| 191 | # CONFIG_UDBG_RTAS_CONSOLE is not set | ||
| 172 | CONFIG_IPIC=y | 192 | CONFIG_IPIC=y |
| 173 | # CONFIG_MPIC is not set | 193 | CONFIG_MPIC=y |
| 174 | # CONFIG_MPIC_WEIRD is not set | 194 | # CONFIG_MPIC_WEIRD is not set |
| 175 | # CONFIG_PPC_I8259 is not set | 195 | CONFIG_PPC_I8259=y |
| 176 | # CONFIG_PPC_RTAS is not set | 196 | CONFIG_PPC_RTAS=y |
| 197 | # CONFIG_RTAS_ERROR_LOGGING is not set | ||
| 198 | CONFIG_RTAS_PROC=y | ||
| 177 | # CONFIG_MMIO_NVRAM is not set | 199 | # CONFIG_MMIO_NVRAM is not set |
| 178 | # CONFIG_PPC_MPC106 is not set | 200 | CONFIG_PPC_MPC106=y |
| 179 | # CONFIG_PPC_970_NAP is not set | 201 | # CONFIG_PPC_970_NAP is not set |
| 180 | # CONFIG_PPC_INDIRECT_IO is not set | 202 | # CONFIG_PPC_INDIRECT_IO is not set |
| 181 | # CONFIG_GENERIC_IOMAP is not set | 203 | # CONFIG_GENERIC_IOMAP is not set |
| 182 | # CONFIG_CPU_FREQ is not set | 204 | # CONFIG_CPU_FREQ is not set |
| 205 | # CONFIG_PPC601_SYNC_FIX is not set | ||
| 206 | # CONFIG_TAU is not set | ||
| 183 | # CONFIG_FSL_ULI1575 is not set | 207 | # CONFIG_FSL_ULI1575 is not set |
| 184 | 208 | ||
| 185 | # | 209 | # |
| @@ -195,7 +219,7 @@ CONFIG_HZ_250=y | |||
| 195 | # CONFIG_HZ_300 is not set | 219 | # CONFIG_HZ_300 is not set |
| 196 | # CONFIG_HZ_1000 is not set | 220 | # CONFIG_HZ_1000 is not set |
| 197 | CONFIG_HZ=250 | 221 | CONFIG_HZ=250 |
| 198 | # CONFIG_SCHED_HRTICK is not set | 222 | CONFIG_SCHED_HRTICK=y |
| 199 | CONFIG_PREEMPT_NONE=y | 223 | CONFIG_PREEMPT_NONE=y |
| 200 | # CONFIG_PREEMPT_VOLUNTARY is not set | 224 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 201 | # CONFIG_PREEMPT is not set | 225 | # CONFIG_PREEMPT is not set |
| @@ -205,6 +229,7 @@ CONFIG_BINFMT_ELF=y | |||
| 205 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 229 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| 206 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 230 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
| 207 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 231 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
| 232 | # CONFIG_KEXEC is not set | ||
| 208 | CONFIG_ARCH_FLATMEM_ENABLE=y | 233 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 209 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 234 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
| 210 | CONFIG_SELECT_MEMORY_MODEL=y | 235 | CONFIG_SELECT_MEMORY_MODEL=y |
| @@ -217,6 +242,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 242 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 218 | CONFIG_PAGEFLAGS_EXTENDED=y | 243 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 219 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 244 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 245 | CONFIG_MIGRATION=y | ||
| 220 | # CONFIG_RESOURCES_64BIT is not set | 246 | # CONFIG_RESOURCES_64BIT is not set |
| 221 | CONFIG_ZONE_DMA_FLAG=1 | 247 | CONFIG_ZONE_DMA_FLAG=1 |
| 222 | CONFIG_BOUNCE=y | 248 | CONFIG_BOUNCE=y |
| @@ -224,6 +250,7 @@ CONFIG_VIRT_TO_BUS=y | |||
| 224 | CONFIG_FORCE_MAX_ZONEORDER=11 | 250 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 225 | CONFIG_PROC_DEVICETREE=y | 251 | CONFIG_PROC_DEVICETREE=y |
| 226 | # CONFIG_CMDLINE_BOOL is not set | 252 | # CONFIG_CMDLINE_BOOL is not set |
| 253 | CONFIG_EXTRA_TARGETS="" | ||
| 227 | # CONFIG_PM is not set | 254 | # CONFIG_PM is not set |
| 228 | CONFIG_SECCOMP=y | 255 | CONFIG_SECCOMP=y |
| 229 | CONFIG_ISA_DMA_API=y | 256 | CONFIG_ISA_DMA_API=y |
| @@ -231,10 +258,13 @@ CONFIG_ISA_DMA_API=y | |||
| 231 | # | 258 | # |
| 232 | # Bus options | 259 | # Bus options |
| 233 | # | 260 | # |
| 261 | # CONFIG_ISA is not set | ||
| 234 | CONFIG_ZONE_DMA=y | 262 | CONFIG_ZONE_DMA=y |
| 235 | CONFIG_GENERIC_ISA_DMA=y | 263 | CONFIG_GENERIC_ISA_DMA=y |
| 236 | CONFIG_PPC_INDIRECT_PCI=y | 264 | CONFIG_PPC_INDIRECT_PCI=y |
| 237 | CONFIG_FSL_SOC=y | 265 | CONFIG_FSL_SOC=y |
| 266 | CONFIG_FSL_PCI=y | ||
| 267 | CONFIG_PPC_PCI_CHOICE=y | ||
| 238 | CONFIG_PCI=y | 268 | CONFIG_PCI=y |
| 239 | CONFIG_PCI_DOMAINS=y | 269 | CONFIG_PCI_DOMAINS=y |
| 240 | CONFIG_PCI_SYSCALL=y | 270 | CONFIG_PCI_SYSCALL=y |
| @@ -259,10 +289,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
| 259 | CONFIG_KERNEL_START=0xc0000000 | 289 | CONFIG_KERNEL_START=0xc0000000 |
| 260 | CONFIG_PHYSICAL_START=0x00000000 | 290 | CONFIG_PHYSICAL_START=0x00000000 |
| 261 | CONFIG_TASK_SIZE=0xc0000000 | 291 | CONFIG_TASK_SIZE=0xc0000000 |
| 262 | |||
| 263 | # | ||
| 264 | # Networking | ||
| 265 | # | ||
| 266 | CONFIG_NET=y | 292 | CONFIG_NET=y |
| 267 | 293 | ||
| 268 | # | 294 | # |
| @@ -363,6 +389,7 @@ CONFIG_OF_I2C=y | |||
| 363 | # CONFIG_PARPORT is not set | 389 | # CONFIG_PARPORT is not set |
| 364 | CONFIG_BLK_DEV=y | 390 | CONFIG_BLK_DEV=y |
| 365 | # CONFIG_BLK_DEV_FD is not set | 391 | # CONFIG_BLK_DEV_FD is not set |
| 392 | # CONFIG_MAC_FLOPPY is not set | ||
| 366 | # CONFIG_BLK_CPQ_DA is not set | 393 | # CONFIG_BLK_CPQ_DA is not set |
| 367 | # CONFIG_BLK_CPQ_CISS_DA is not set | 394 | # CONFIG_BLK_CPQ_CISS_DA is not set |
| 368 | # CONFIG_BLK_DEV_DAC960 is not set | 395 | # CONFIG_BLK_DEV_DAC960 is not set |
| @@ -378,12 +405,14 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
| 378 | # CONFIG_BLK_DEV_XIP is not set | 405 | # CONFIG_BLK_DEV_XIP is not set |
| 379 | # CONFIG_CDROM_PKTCDVD is not set | 406 | # CONFIG_CDROM_PKTCDVD is not set |
| 380 | # CONFIG_ATA_OVER_ETH is not set | 407 | # CONFIG_ATA_OVER_ETH is not set |
| 408 | # CONFIG_BLK_DEV_HD is not set | ||
| 381 | CONFIG_MISC_DEVICES=y | 409 | CONFIG_MISC_DEVICES=y |
| 382 | # CONFIG_PHANTOM is not set | 410 | # CONFIG_PHANTOM is not set |
| 383 | # CONFIG_EEPROM_93CX6 is not set | 411 | # CONFIG_EEPROM_93CX6 is not set |
| 384 | # CONFIG_SGI_IOC4 is not set | 412 | # CONFIG_SGI_IOC4 is not set |
| 385 | # CONFIG_TIFM_CORE is not set | 413 | # CONFIG_TIFM_CORE is not set |
| 386 | # CONFIG_ENCLOSURE_SERVICES is not set | 414 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 415 | # CONFIG_HP_ILO is not set | ||
| 387 | CONFIG_HAVE_IDE=y | 416 | CONFIG_HAVE_IDE=y |
| 388 | # CONFIG_IDE is not set | 417 | # CONFIG_IDE is not set |
| 389 | 418 | ||
| @@ -401,12 +430,15 @@ CONFIG_HAVE_IDE=y | |||
| 401 | # | 430 | # |
| 402 | # IEEE 1394 (FireWire) support | 431 | # IEEE 1394 (FireWire) support |
| 403 | # | 432 | # |
| 433 | |||
| 434 | # | ||
| 435 | # Enable only one of the two stacks, unless you know what you are doing | ||
| 436 | # | ||
| 404 | # CONFIG_FIREWIRE is not set | 437 | # CONFIG_FIREWIRE is not set |
| 405 | # CONFIG_IEEE1394 is not set | 438 | # CONFIG_IEEE1394 is not set |
| 406 | # CONFIG_I2O is not set | 439 | # CONFIG_I2O is not set |
| 407 | # CONFIG_MACINTOSH_DRIVERS is not set | 440 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 408 | CONFIG_NETDEVICES=y | 441 | CONFIG_NETDEVICES=y |
| 409 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 410 | # CONFIG_DUMMY is not set | 442 | # CONFIG_DUMMY is not set |
| 411 | # CONFIG_BONDING is not set | 443 | # CONFIG_BONDING is not set |
| 412 | # CONFIG_MACVLAN is not set | 444 | # CONFIG_MACVLAN is not set |
| @@ -433,6 +465,8 @@ CONFIG_MARVELL_PHY=y | |||
| 433 | # CONFIG_MDIO_BITBANG is not set | 465 | # CONFIG_MDIO_BITBANG is not set |
| 434 | CONFIG_NET_ETHERNET=y | 466 | CONFIG_NET_ETHERNET=y |
| 435 | CONFIG_MII=y | 467 | CONFIG_MII=y |
| 468 | # CONFIG_MACE is not set | ||
| 469 | # CONFIG_BMAC is not set | ||
| 436 | # CONFIG_HAPPYMEAL is not set | 470 | # CONFIG_HAPPYMEAL is not set |
| 437 | # CONFIG_SUNGEM is not set | 471 | # CONFIG_SUNGEM is not set |
| 438 | # CONFIG_CASSINI is not set | 472 | # CONFIG_CASSINI is not set |
| @@ -468,7 +502,6 @@ CONFIG_NETDEV_1000=y | |||
| 468 | # CONFIG_DL2K is not set | 502 | # CONFIG_DL2K is not set |
| 469 | # CONFIG_E1000 is not set | 503 | # CONFIG_E1000 is not set |
| 470 | # CONFIG_E1000E is not set | 504 | # CONFIG_E1000E is not set |
| 471 | # CONFIG_E1000E_ENABLED is not set | ||
| 472 | # CONFIG_IP1000 is not set | 505 | # CONFIG_IP1000 is not set |
| 473 | # CONFIG_IGB is not set | 506 | # CONFIG_IGB is not set |
| 474 | # CONFIG_NS83820 is not set | 507 | # CONFIG_NS83820 is not set |
| @@ -482,9 +515,10 @@ CONFIG_NETDEV_1000=y | |||
| 482 | # CONFIG_TIGON3 is not set | 515 | # CONFIG_TIGON3 is not set |
| 483 | # CONFIG_BNX2 is not set | 516 | # CONFIG_BNX2 is not set |
| 484 | CONFIG_GIANFAR=y | 517 | CONFIG_GIANFAR=y |
| 485 | # CONFIG_GFAR_NAPI is not set | 518 | # CONFIG_MV643XX_ETH is not set |
| 486 | # CONFIG_QLA3XXX is not set | 519 | # CONFIG_QLA3XXX is not set |
| 487 | # CONFIG_ATL1 is not set | 520 | # CONFIG_ATL1 is not set |
| 521 | # CONFIG_ATL1E is not set | ||
| 488 | CONFIG_NETDEV_10000=y | 522 | CONFIG_NETDEV_10000=y |
| 489 | # CONFIG_CHELSIO_T1 is not set | 523 | # CONFIG_CHELSIO_T1 is not set |
| 490 | # CONFIG_CHELSIO_T3 is not set | 524 | # CONFIG_CHELSIO_T3 is not set |
| @@ -572,11 +606,14 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
| 572 | # CONFIG_SERIAL_UARTLITE is not set | 606 | # CONFIG_SERIAL_UARTLITE is not set |
| 573 | CONFIG_SERIAL_CORE=y | 607 | CONFIG_SERIAL_CORE=y |
| 574 | CONFIG_SERIAL_CORE_CONSOLE=y | 608 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 609 | # CONFIG_SERIAL_PMACZILOG is not set | ||
| 575 | # CONFIG_SERIAL_JSM is not set | 610 | # CONFIG_SERIAL_JSM is not set |
| 576 | # CONFIG_SERIAL_OF_PLATFORM is not set | 611 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 577 | CONFIG_UNIX98_PTYS=y | 612 | CONFIG_UNIX98_PTYS=y |
| 578 | CONFIG_LEGACY_PTYS=y | 613 | CONFIG_LEGACY_PTYS=y |
| 579 | CONFIG_LEGACY_PTY_COUNT=256 | 614 | CONFIG_LEGACY_PTY_COUNT=256 |
| 615 | # CONFIG_BRIQ_PANEL is not set | ||
| 616 | # CONFIG_HVC_RTAS is not set | ||
| 580 | # CONFIG_IPMI_HANDLER is not set | 617 | # CONFIG_IPMI_HANDLER is not set |
| 581 | # CONFIG_HW_RANDOM is not set | 618 | # CONFIG_HW_RANDOM is not set |
| 582 | # CONFIG_NVRAM is not set | 619 | # CONFIG_NVRAM is not set |
| @@ -588,42 +625,69 @@ CONFIG_DEVPORT=y | |||
| 588 | CONFIG_I2C=y | 625 | CONFIG_I2C=y |
| 589 | CONFIG_I2C_BOARDINFO=y | 626 | CONFIG_I2C_BOARDINFO=y |
| 590 | CONFIG_I2C_CHARDEV=y | 627 | CONFIG_I2C_CHARDEV=y |
| 628 | CONFIG_I2C_HELPER_AUTO=y | ||
| 591 | 629 | ||
| 592 | # | 630 | # |
| 593 | # I2C Hardware Bus support | 631 | # I2C Hardware Bus support |
| 594 | # | 632 | # |
| 633 | |||
| 634 | # | ||
| 635 | # PC SMBus host controller drivers | ||
| 636 | # | ||
| 595 | # CONFIG_I2C_ALI1535 is not set | 637 | # CONFIG_I2C_ALI1535 is not set |
| 596 | # CONFIG_I2C_ALI1563 is not set | 638 | # CONFIG_I2C_ALI1563 is not set |
| 597 | # CONFIG_I2C_ALI15X3 is not set | 639 | # CONFIG_I2C_ALI15X3 is not set |
| 598 | # CONFIG_I2C_AMD756 is not set | 640 | # CONFIG_I2C_AMD756 is not set |
| 599 | # CONFIG_I2C_AMD8111 is not set | 641 | # CONFIG_I2C_AMD8111 is not set |
| 600 | # CONFIG_I2C_I801 is not set | 642 | # CONFIG_I2C_I801 is not set |
| 601 | # CONFIG_I2C_I810 is not set | 643 | # CONFIG_I2C_ISCH is not set |
| 602 | # CONFIG_I2C_PIIX4 is not set | 644 | # CONFIG_I2C_PIIX4 is not set |
| 603 | CONFIG_I2C_MPC=y | ||
| 604 | # CONFIG_I2C_NFORCE2 is not set | 645 | # CONFIG_I2C_NFORCE2 is not set |
| 605 | # CONFIG_I2C_OCORES is not set | ||
| 606 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 607 | # CONFIG_I2C_PROSAVAGE is not set | ||
| 608 | # CONFIG_I2C_SAVAGE4 is not set | ||
| 609 | # CONFIG_I2C_SIMTEC is not set | ||
| 610 | # CONFIG_I2C_SIS5595 is not set | 646 | # CONFIG_I2C_SIS5595 is not set |
| 611 | # CONFIG_I2C_SIS630 is not set | 647 | # CONFIG_I2C_SIS630 is not set |
| 612 | # CONFIG_I2C_SIS96X is not set | 648 | # CONFIG_I2C_SIS96X is not set |
| 613 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 614 | # CONFIG_I2C_STUB is not set | ||
| 615 | # CONFIG_I2C_VIA is not set | 649 | # CONFIG_I2C_VIA is not set |
| 616 | # CONFIG_I2C_VIAPRO is not set | 650 | # CONFIG_I2C_VIAPRO is not set |
| 651 | |||
| 652 | # | ||
| 653 | # Mac SMBus host controller drivers | ||
| 654 | # | ||
| 655 | # CONFIG_I2C_HYDRA is not set | ||
| 656 | CONFIG_I2C_POWERMAC=y | ||
| 657 | |||
| 658 | # | ||
| 659 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 660 | # | ||
| 661 | CONFIG_I2C_MPC=y | ||
| 662 | # CONFIG_I2C_OCORES is not set | ||
| 663 | # CONFIG_I2C_SIMTEC is not set | ||
| 664 | |||
| 665 | # | ||
| 666 | # External I2C/SMBus adapter drivers | ||
| 667 | # | ||
| 668 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 669 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 670 | |||
| 671 | # | ||
| 672 | # Graphics adapter I2C/DDC channel drivers | ||
| 673 | # | ||
| 617 | # CONFIG_I2C_VOODOO3 is not set | 674 | # CONFIG_I2C_VOODOO3 is not set |
| 675 | |||
| 676 | # | ||
| 677 | # Other I2C/SMBus bus drivers | ||
| 678 | # | ||
| 618 | # CONFIG_I2C_PCA_PLATFORM is not set | 679 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 680 | # CONFIG_I2C_STUB is not set | ||
| 619 | 681 | ||
| 620 | # | 682 | # |
| 621 | # Miscellaneous I2C Chip support | 683 | # Miscellaneous I2C Chip support |
| 622 | # | 684 | # |
| 623 | # CONFIG_DS1682 is not set | 685 | # CONFIG_DS1682 is not set |
| 686 | # CONFIG_AT24 is not set | ||
| 624 | # CONFIG_SENSORS_EEPROM is not set | 687 | # CONFIG_SENSORS_EEPROM is not set |
| 625 | # CONFIG_SENSORS_PCF8574 is not set | 688 | # CONFIG_SENSORS_PCF8574 is not set |
| 626 | # CONFIG_PCF8575 is not set | 689 | # CONFIG_PCF8575 is not set |
| 690 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 627 | # CONFIG_SENSORS_PCF8591 is not set | 691 | # CONFIG_SENSORS_PCF8591 is not set |
| 628 | # CONFIG_SENSORS_MAX6875 is not set | 692 | # CONFIG_SENSORS_MAX6875 is not set |
| 629 | # CONFIG_SENSORS_TSL2550 is not set | 693 | # CONFIG_SENSORS_TSL2550 is not set |
| @@ -632,10 +696,13 @@ CONFIG_I2C_MPC=y | |||
| 632 | # CONFIG_I2C_DEBUG_BUS is not set | 696 | # CONFIG_I2C_DEBUG_BUS is not set |
| 633 | # CONFIG_I2C_DEBUG_CHIP is not set | 697 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 634 | # CONFIG_SPI is not set | 698 | # CONFIG_SPI is not set |
| 699 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 700 | # CONFIG_GPIOLIB is not set | ||
| 635 | # CONFIG_W1 is not set | 701 | # CONFIG_W1 is not set |
| 636 | # CONFIG_POWER_SUPPLY is not set | 702 | # CONFIG_POWER_SUPPLY is not set |
| 637 | CONFIG_HWMON=y | 703 | CONFIG_HWMON=y |
| 638 | # CONFIG_HWMON_VID is not set | 704 | # CONFIG_HWMON_VID is not set |
| 705 | # CONFIG_SENSORS_AD7414 is not set | ||
| 639 | # CONFIG_SENSORS_AD7418 is not set | 706 | # CONFIG_SENSORS_AD7418 is not set |
| 640 | # CONFIG_SENSORS_ADM1021 is not set | 707 | # CONFIG_SENSORS_ADM1021 is not set |
| 641 | # CONFIG_SENSORS_ADM1025 is not set | 708 | # CONFIG_SENSORS_ADM1025 is not set |
| @@ -645,6 +712,7 @@ CONFIG_HWMON=y | |||
| 645 | # CONFIG_SENSORS_ADM9240 is not set | 712 | # CONFIG_SENSORS_ADM9240 is not set |
| 646 | # CONFIG_SENSORS_ADT7470 is not set | 713 | # CONFIG_SENSORS_ADT7470 is not set |
| 647 | # CONFIG_SENSORS_ADT7473 is not set | 714 | # CONFIG_SENSORS_ADT7473 is not set |
| 715 | # CONFIG_SENSORS_AMS is not set | ||
| 648 | # CONFIG_SENSORS_ATXP1 is not set | 716 | # CONFIG_SENSORS_ATXP1 is not set |
| 649 | # CONFIG_SENSORS_DS1621 is not set | 717 | # CONFIG_SENSORS_DS1621 is not set |
| 650 | # CONFIG_SENSORS_I5K_AMB is not set | 718 | # CONFIG_SENSORS_I5K_AMB is not set |
| @@ -689,6 +757,7 @@ CONFIG_HWMON=y | |||
| 689 | # CONFIG_SENSORS_W83627EHF is not set | 757 | # CONFIG_SENSORS_W83627EHF is not set |
| 690 | # CONFIG_HWMON_DEBUG_CHIP is not set | 758 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 691 | # CONFIG_THERMAL is not set | 759 | # CONFIG_THERMAL is not set |
| 760 | # CONFIG_THERMAL_HWMON is not set | ||
| 692 | CONFIG_WATCHDOG=y | 761 | CONFIG_WATCHDOG=y |
| 693 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 762 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
| 694 | 763 | ||
| @@ -696,7 +765,9 @@ CONFIG_WATCHDOG=y | |||
| 696 | # Watchdog Device Drivers | 765 | # Watchdog Device Drivers |
| 697 | # | 766 | # |
| 698 | # CONFIG_SOFT_WATCHDOG is not set | 767 | # CONFIG_SOFT_WATCHDOG is not set |
| 699 | CONFIG_83xx_WDT=y | 768 | # CONFIG_ALIM7101_WDT is not set |
| 769 | # CONFIG_8xxx_WDT is not set | ||
| 770 | # CONFIG_WATCHDOG_RTAS is not set | ||
| 700 | 771 | ||
| 701 | # | 772 | # |
| 702 | # PCI-based Watchdog Cards | 773 | # PCI-based Watchdog Cards |
| @@ -713,8 +784,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 713 | # | 784 | # |
| 714 | # Multifunction device drivers | 785 | # Multifunction device drivers |
| 715 | # | 786 | # |
| 787 | # CONFIG_MFD_CORE is not set | ||
| 716 | # CONFIG_MFD_SM501 is not set | 788 | # CONFIG_MFD_SM501 is not set |
| 717 | # CONFIG_HTC_PASIC3 is not set | 789 | # CONFIG_HTC_PASIC3 is not set |
| 790 | # CONFIG_MFD_TMIO is not set | ||
| 718 | 791 | ||
| 719 | # | 792 | # |
| 720 | # Multimedia devices | 793 | # Multimedia devices |
| @@ -746,10 +819,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m | |||
| 746 | # Display device support | 819 | # Display device support |
| 747 | # | 820 | # |
| 748 | # CONFIG_DISPLAY_SUPPORT is not set | 821 | # CONFIG_DISPLAY_SUPPORT is not set |
| 749 | |||
| 750 | # | ||
| 751 | # Sound | ||
| 752 | # | ||
| 753 | # CONFIG_SOUND is not set | 822 | # CONFIG_SOUND is not set |
| 754 | CONFIG_HID_SUPPORT=y | 823 | CONFIG_HID_SUPPORT=y |
| 755 | CONFIG_HID=y | 824 | CONFIG_HID=y |
| @@ -764,6 +833,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 764 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 833 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
| 765 | 834 | ||
| 766 | # | 835 | # |
| 836 | # Enable Host or Gadget support to see Inventra options | ||
| 837 | # | ||
| 838 | |||
| 839 | # | ||
| 767 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 840 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 768 | # | 841 | # |
| 769 | # CONFIG_USB_GADGET is not set | 842 | # CONFIG_USB_GADGET is not set |
| @@ -802,6 +875,7 @@ CONFIG_RTC_DRV_DS1374=y | |||
| 802 | # CONFIG_RTC_DRV_PCF8583 is not set | 875 | # CONFIG_RTC_DRV_PCF8583 is not set |
| 803 | # CONFIG_RTC_DRV_M41T80 is not set | 876 | # CONFIG_RTC_DRV_M41T80 is not set |
| 804 | # CONFIG_RTC_DRV_S35390A is not set | 877 | # CONFIG_RTC_DRV_S35390A is not set |
| 878 | # CONFIG_RTC_DRV_FM3130 is not set | ||
| 805 | 879 | ||
| 806 | # | 880 | # |
| 807 | # SPI RTC drivers | 881 | # SPI RTC drivers |
| @@ -890,6 +964,7 @@ CONFIG_TMPFS=y | |||
| 890 | # CONFIG_CRAMFS is not set | 964 | # CONFIG_CRAMFS is not set |
| 891 | # CONFIG_VXFS_FS is not set | 965 | # CONFIG_VXFS_FS is not set |
| 892 | # CONFIG_MINIX_FS is not set | 966 | # CONFIG_MINIX_FS is not set |
| 967 | # CONFIG_OMFS_FS is not set | ||
| 893 | # CONFIG_HPFS_FS is not set | 968 | # CONFIG_HPFS_FS is not set |
| 894 | # CONFIG_QNX4FS_FS is not set | 969 | # CONFIG_QNX4FS_FS is not set |
| 895 | # CONFIG_ROMFS_FS is not set | 970 | # CONFIG_ROMFS_FS is not set |
| @@ -900,14 +975,13 @@ CONFIG_NFS_FS=y | |||
| 900 | CONFIG_NFS_V3=y | 975 | CONFIG_NFS_V3=y |
| 901 | # CONFIG_NFS_V3_ACL is not set | 976 | # CONFIG_NFS_V3_ACL is not set |
| 902 | CONFIG_NFS_V4=y | 977 | CONFIG_NFS_V4=y |
| 903 | # CONFIG_NFSD is not set | ||
| 904 | CONFIG_ROOT_NFS=y | 978 | CONFIG_ROOT_NFS=y |
| 979 | # CONFIG_NFSD is not set | ||
| 905 | CONFIG_LOCKD=y | 980 | CONFIG_LOCKD=y |
| 906 | CONFIG_LOCKD_V4=y | 981 | CONFIG_LOCKD_V4=y |
| 907 | CONFIG_NFS_COMMON=y | 982 | CONFIG_NFS_COMMON=y |
| 908 | CONFIG_SUNRPC=y | 983 | CONFIG_SUNRPC=y |
| 909 | CONFIG_SUNRPC_GSS=y | 984 | CONFIG_SUNRPC_GSS=y |
| 910 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 911 | CONFIG_RPCSEC_GSS_KRB5=y | 985 | CONFIG_RPCSEC_GSS_KRB5=y |
| 912 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 986 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 913 | # CONFIG_SMB_FS is not set | 987 | # CONFIG_SMB_FS is not set |
| @@ -943,6 +1017,7 @@ CONFIG_BITREVERSE=y | |||
| 943 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1017 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 944 | # CONFIG_CRC_CCITT is not set | 1018 | # CONFIG_CRC_CCITT is not set |
| 945 | # CONFIG_CRC16 is not set | 1019 | # CONFIG_CRC16 is not set |
| 1020 | # CONFIG_CRC_T10DIF is not set | ||
| 946 | # CONFIG_CRC_ITU_T is not set | 1021 | # CONFIG_CRC_ITU_T is not set |
| 947 | CONFIG_CRC32=y | 1022 | CONFIG_CRC32=y |
| 948 | # CONFIG_CRC7 is not set | 1023 | # CONFIG_CRC7 is not set |
| @@ -968,8 +1043,18 @@ CONFIG_FRAME_WARN=1024 | |||
| 968 | # CONFIG_SLUB_DEBUG_ON is not set | 1043 | # CONFIG_SLUB_DEBUG_ON is not set |
| 969 | # CONFIG_SLUB_STATS is not set | 1044 | # CONFIG_SLUB_STATS is not set |
| 970 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1045 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1046 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 1047 | # CONFIG_LATENCYTOP is not set | ||
| 1048 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1049 | CONFIG_HAVE_FTRACE=y | ||
| 1050 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1051 | # CONFIG_FTRACE is not set | ||
| 1052 | # CONFIG_SCHED_TRACER is not set | ||
| 1053 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 971 | # CONFIG_SAMPLES is not set | 1054 | # CONFIG_SAMPLES is not set |
| 1055 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 972 | # CONFIG_IRQSTACKS is not set | 1056 | # CONFIG_IRQSTACKS is not set |
| 1057 | # CONFIG_BOOTX_TEXT is not set | ||
| 973 | # CONFIG_PPC_EARLY_DEBUG is not set | 1058 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 974 | 1059 | ||
| 975 | # | 1060 | # |
| @@ -1023,6 +1108,10 @@ CONFIG_CRYPTO_PCBC=m | |||
| 1023 | # CONFIG_CRYPTO_MD4 is not set | 1108 | # CONFIG_CRYPTO_MD4 is not set |
| 1024 | CONFIG_CRYPTO_MD5=y | 1109 | CONFIG_CRYPTO_MD5=y |
| 1025 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1110 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 1111 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1112 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1113 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1114 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1026 | # CONFIG_CRYPTO_SHA1 is not set | 1115 | # CONFIG_CRYPTO_SHA1 is not set |
| 1027 | # CONFIG_CRYPTO_SHA256 is not set | 1116 | # CONFIG_CRYPTO_SHA256 is not set |
| 1028 | # CONFIG_CRYPTO_SHA512 is not set | 1117 | # CONFIG_CRYPTO_SHA512 is not set |
| @@ -1055,5 +1144,6 @@ CONFIG_CRYPTO_DES=y | |||
| 1055 | # CONFIG_CRYPTO_LZO is not set | 1144 | # CONFIG_CRYPTO_LZO is not set |
| 1056 | CONFIG_CRYPTO_HW=y | 1145 | CONFIG_CRYPTO_HW=y |
| 1057 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1146 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1147 | # CONFIG_CRYPTO_DEV_TALITOS is not set | ||
| 1058 | # CONFIG_PPC_CLOCK is not set | 1148 | # CONFIG_PPC_CLOCK is not set |
| 1059 | # CONFIG_VIRTUALIZATION is not set | 1149 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/83xx/mpc836x_mds_defconfig b/arch/powerpc/configs/83xx/mpc836x_mds_defconfig index 20fd9f58cf42..e029e9e14622 100644 --- a/arch/powerpc/configs/83xx/mpc836x_mds_defconfig +++ b/arch/powerpc/configs/83xx/mpc836x_mds_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.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Mon Jun 9 08:52:27 2008 | 4 | # Thu Aug 21 00:52:22 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -16,6 +16,7 @@ CONFIG_6xx=y | |||
| 16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
| 17 | CONFIG_PPC_FPU=y | 17 | CONFIG_PPC_FPU=y |
| 18 | # CONFIG_FSL_EMB_PERFMON is not set | 18 | # CONFIG_FSL_EMB_PERFMON is not set |
| 19 | # CONFIG_ALTIVEC is not set | ||
| 19 | CONFIG_PPC_STD_MMU=y | 20 | CONFIG_PPC_STD_MMU=y |
| 20 | CONFIG_PPC_STD_MMU_32=y | 21 | CONFIG_PPC_STD_MMU_32=y |
| 21 | # CONFIG_PPC_MM_SLICES is not set | 22 | # CONFIG_PPC_MM_SLICES is not set |
| @@ -32,6 +33,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | 35 | CONFIG_STACKTRACE_SUPPORT=y |
| 36 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | 37 | CONFIG_LOCKDEP_SUPPORT=y |
| 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 39 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| @@ -51,6 +53,9 @@ CONFIG_PPC_UDBG_16550=y | |||
| 51 | CONFIG_AUDIT_ARCH=y | 53 | CONFIG_AUDIT_ARCH=y |
| 52 | CONFIG_GENERIC_BUG=y | 54 | CONFIG_GENERIC_BUG=y |
| 53 | CONFIG_DEFAULT_UIMAGE=y | 55 | CONFIG_DEFAULT_UIMAGE=y |
| 56 | CONFIG_HIBERNATE_32=y | ||
| 57 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
| 58 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
| 54 | # CONFIG_PPC_DCR_NATIVE is not set | 59 | # CONFIG_PPC_DCR_NATIVE is not set |
| 55 | # CONFIG_PPC_DCR_MMIO is not set | 60 | # CONFIG_PPC_DCR_MMIO is not set |
| 56 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 61 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| @@ -88,12 +93,12 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 88 | CONFIG_SYSCTL=y | 93 | CONFIG_SYSCTL=y |
| 89 | CONFIG_EMBEDDED=y | 94 | CONFIG_EMBEDDED=y |
| 90 | CONFIG_SYSCTL_SYSCALL=y | 95 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 92 | # CONFIG_KALLSYMS is not set | 96 | # CONFIG_KALLSYMS is not set |
| 93 | CONFIG_HOTPLUG=y | 97 | CONFIG_HOTPLUG=y |
| 94 | CONFIG_PRINTK=y | 98 | CONFIG_PRINTK=y |
| 95 | CONFIG_BUG=y | 99 | CONFIG_BUG=y |
| 96 | CONFIG_ELF_CORE=y | 100 | CONFIG_ELF_CORE=y |
| 101 | CONFIG_PCSPKR_PLATFORM=y | ||
| 97 | CONFIG_COMPAT_BRK=y | 102 | CONFIG_COMPAT_BRK=y |
| 98 | CONFIG_BASE_FULL=y | 103 | CONFIG_BASE_FULL=y |
| 99 | CONFIG_FUTEX=y | 104 | CONFIG_FUTEX=y |
| @@ -111,10 +116,16 @@ CONFIG_SLUB=y | |||
| 111 | # CONFIG_PROFILING is not set | 116 | # CONFIG_PROFILING is not set |
| 112 | # CONFIG_MARKERS is not set | 117 | # CONFIG_MARKERS is not set |
| 113 | CONFIG_HAVE_OPROFILE=y | 118 | CONFIG_HAVE_OPROFILE=y |
| 119 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 120 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 114 | CONFIG_HAVE_KPROBES=y | 121 | CONFIG_HAVE_KPROBES=y |
| 115 | CONFIG_HAVE_KRETPROBES=y | 122 | CONFIG_HAVE_KRETPROBES=y |
| 123 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 116 | # CONFIG_HAVE_DMA_ATTRS is not set | 124 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 125 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 126 | # CONFIG_HAVE_CLK is not set | ||
| 117 | CONFIG_PROC_PAGE_MONITOR=y | 127 | CONFIG_PROC_PAGE_MONITOR=y |
| 128 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 118 | CONFIG_SLABINFO=y | 129 | CONFIG_SLABINFO=y |
| 119 | CONFIG_RT_MUTEXES=y | 130 | CONFIG_RT_MUTEXES=y |
| 120 | # CONFIG_TINY_SHMEM is not set | 131 | # CONFIG_TINY_SHMEM is not set |
| @@ -125,12 +136,13 @@ CONFIG_MODULE_UNLOAD=y | |||
| 125 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 136 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 126 | # CONFIG_MODVERSIONS is not set | 137 | # CONFIG_MODVERSIONS is not set |
| 127 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 138 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 128 | # CONFIG_KMOD is not set | 139 | CONFIG_KMOD=y |
| 129 | CONFIG_BLOCK=y | 140 | CONFIG_BLOCK=y |
| 130 | # CONFIG_LBD is not set | 141 | # CONFIG_LBD is not set |
| 131 | # CONFIG_BLK_DEV_IO_TRACE is not set | 142 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 132 | # CONFIG_LSF is not set | 143 | # CONFIG_LSF is not set |
| 133 | # CONFIG_BLK_DEV_BSG is not set | 144 | # CONFIG_BLK_DEV_BSG is not set |
| 145 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 134 | 146 | ||
| 135 | # | 147 | # |
| 136 | # IO Schedulers | 148 | # IO Schedulers |
| @@ -149,36 +161,48 @@ CONFIG_CLASSIC_RCU=y | |||
| 149 | # | 161 | # |
| 150 | # Platform support | 162 | # Platform support |
| 151 | # | 163 | # |
| 152 | # CONFIG_PPC_MULTIPLATFORM is not set | 164 | CONFIG_PPC_MULTIPLATFORM=y |
| 153 | # CONFIG_PPC_82xx is not set | 165 | CONFIG_CLASSIC32=y |
| 154 | CONFIG_PPC_83xx=y | 166 | CONFIG_PPC_CHRP=y |
| 155 | # CONFIG_PPC_86xx is not set | 167 | # CONFIG_MPC5121_ADS is not set |
| 156 | # CONFIG_PPC_MPC512x is not set | 168 | # CONFIG_MPC5121_GENERIC is not set |
| 157 | # CONFIG_PPC_MPC5121 is not set | 169 | # CONFIG_PPC_MPC52xx is not set |
| 170 | CONFIG_PPC_PMAC=y | ||
| 158 | # CONFIG_PPC_CELL is not set | 171 | # CONFIG_PPC_CELL is not set |
| 159 | # CONFIG_PPC_CELL_NATIVE is not set | 172 | # CONFIG_PPC_CELL_NATIVE is not set |
| 173 | # CONFIG_PPC_82xx is not set | ||
| 160 | # CONFIG_PQ2ADS is not set | 174 | # CONFIG_PQ2ADS is not set |
| 161 | CONFIG_MPC83xx=y | 175 | CONFIG_PPC_83xx=y |
| 162 | # CONFIG_MPC831x_RDB is not set | 176 | # CONFIG_MPC831x_RDB is not set |
| 163 | # CONFIG_MPC832x_MDS is not set | 177 | # CONFIG_MPC832x_MDS is not set |
| 164 | # CONFIG_MPC832x_RDB is not set | 178 | # CONFIG_MPC832x_RDB is not set |
| 165 | # CONFIG_MPC834x_MDS is not set | 179 | # CONFIG_MPC834x_MDS is not set |
| 166 | # CONFIG_MPC834x_ITX is not set | 180 | # CONFIG_MPC834x_ITX is not set |
| 167 | CONFIG_MPC836x_MDS=y | 181 | CONFIG_MPC836x_MDS=y |
| 182 | # CONFIG_MPC836x_RDK is not set | ||
| 168 | # CONFIG_MPC837x_MDS is not set | 183 | # CONFIG_MPC837x_MDS is not set |
| 169 | # CONFIG_MPC837x_RDB is not set | 184 | # CONFIG_MPC837x_RDB is not set |
| 170 | # CONFIG_SBC834x is not set | 185 | # CONFIG_SBC834x is not set |
| 186 | # CONFIG_ASP834x is not set | ||
| 187 | # CONFIG_PPC_86xx is not set | ||
| 188 | # CONFIG_EMBEDDED6xx is not set | ||
| 189 | CONFIG_PPC_NATIVE=y | ||
| 190 | # CONFIG_UDBG_RTAS_CONSOLE is not set | ||
| 171 | CONFIG_IPIC=y | 191 | CONFIG_IPIC=y |
| 172 | # CONFIG_MPIC is not set | 192 | CONFIG_MPIC=y |
| 173 | # CONFIG_MPIC_WEIRD is not set | 193 | # CONFIG_MPIC_WEIRD is not set |
| 174 | # CONFIG_PPC_I8259 is not set | 194 | CONFIG_PPC_I8259=y |
| 175 | # CONFIG_PPC_RTAS is not set | 195 | CONFIG_PPC_RTAS=y |
| 196 | # CONFIG_RTAS_ERROR_LOGGING is not set | ||
| 197 | CONFIG_RTAS_PROC=y | ||
| 176 | # CONFIG_MMIO_NVRAM is not set | 198 | # CONFIG_MMIO_NVRAM is not set |
| 177 | # CONFIG_PPC_MPC106 is not set | 199 | CONFIG_PPC_MPC106=y |
| 178 | # CONFIG_PPC_970_NAP is not set | 200 | # CONFIG_PPC_970_NAP is not set |
| 179 | # CONFIG_PPC_INDIRECT_IO is not set | 201 | # CONFIG_PPC_INDIRECT_IO is not set |
| 180 | # CONFIG_GENERIC_IOMAP is not set | 202 | # CONFIG_GENERIC_IOMAP is not set |
| 181 | # CONFIG_CPU_FREQ is not set | 203 | # CONFIG_CPU_FREQ is not set |
| 204 | # CONFIG_PPC601_SYNC_FIX is not set | ||
| 205 | # CONFIG_TAU is not set | ||
| 182 | CONFIG_QUICC_ENGINE=y | 206 | CONFIG_QUICC_ENGINE=y |
| 183 | # CONFIG_FSL_ULI1575 is not set | 207 | # CONFIG_FSL_ULI1575 is not set |
| 184 | 208 | ||
| @@ -195,7 +219,7 @@ CONFIG_HZ_250=y | |||
| 195 | # CONFIG_HZ_300 is not set | 219 | # CONFIG_HZ_300 is not set |
| 196 | # CONFIG_HZ_1000 is not set | 220 | # CONFIG_HZ_1000 is not set |
| 197 | CONFIG_HZ=250 | 221 | CONFIG_HZ=250 |
| 198 | # CONFIG_SCHED_HRTICK is not set | 222 | CONFIG_SCHED_HRTICK=y |
| 199 | CONFIG_PREEMPT_NONE=y | 223 | CONFIG_PREEMPT_NONE=y |
| 200 | # CONFIG_PREEMPT_VOLUNTARY is not set | 224 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 201 | # CONFIG_PREEMPT is not set | 225 | # CONFIG_PREEMPT is not set |
| @@ -205,6 +229,7 @@ CONFIG_BINFMT_ELF=y | |||
| 205 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 229 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| 206 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 230 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
| 207 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 231 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
| 232 | # CONFIG_KEXEC is not set | ||
| 208 | CONFIG_ARCH_FLATMEM_ENABLE=y | 233 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 209 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 234 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
| 210 | CONFIG_SELECT_MEMORY_MODEL=y | 235 | CONFIG_SELECT_MEMORY_MODEL=y |
| @@ -217,6 +242,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 242 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 218 | CONFIG_PAGEFLAGS_EXTENDED=y | 243 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 219 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 244 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 245 | CONFIG_MIGRATION=y | ||
| 220 | # CONFIG_RESOURCES_64BIT is not set | 246 | # CONFIG_RESOURCES_64BIT is not set |
| 221 | CONFIG_ZONE_DMA_FLAG=1 | 247 | CONFIG_ZONE_DMA_FLAG=1 |
| 222 | CONFIG_BOUNCE=y | 248 | CONFIG_BOUNCE=y |
| @@ -224,6 +250,7 @@ CONFIG_VIRT_TO_BUS=y | |||
| 224 | CONFIG_FORCE_MAX_ZONEORDER=11 | 250 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 225 | CONFIG_PROC_DEVICETREE=y | 251 | CONFIG_PROC_DEVICETREE=y |
| 226 | # CONFIG_CMDLINE_BOOL is not set | 252 | # CONFIG_CMDLINE_BOOL is not set |
| 253 | CONFIG_EXTRA_TARGETS="" | ||
| 227 | # CONFIG_PM is not set | 254 | # CONFIG_PM is not set |
| 228 | CONFIG_SECCOMP=y | 255 | CONFIG_SECCOMP=y |
| 229 | CONFIG_ISA_DMA_API=y | 256 | CONFIG_ISA_DMA_API=y |
| @@ -231,10 +258,13 @@ CONFIG_ISA_DMA_API=y | |||
| 231 | # | 258 | # |
| 232 | # Bus options | 259 | # Bus options |
| 233 | # | 260 | # |
| 261 | # CONFIG_ISA is not set | ||
| 234 | CONFIG_ZONE_DMA=y | 262 | CONFIG_ZONE_DMA=y |
| 235 | CONFIG_GENERIC_ISA_DMA=y | 263 | CONFIG_GENERIC_ISA_DMA=y |
| 236 | CONFIG_PPC_INDIRECT_PCI=y | 264 | CONFIG_PPC_INDIRECT_PCI=y |
| 237 | CONFIG_FSL_SOC=y | 265 | CONFIG_FSL_SOC=y |
| 266 | CONFIG_FSL_PCI=y | ||
| 267 | CONFIG_PPC_PCI_CHOICE=y | ||
| 238 | CONFIG_PCI=y | 268 | CONFIG_PCI=y |
| 239 | CONFIG_PCI_DOMAINS=y | 269 | CONFIG_PCI_DOMAINS=y |
| 240 | CONFIG_PCI_SYSCALL=y | 270 | CONFIG_PCI_SYSCALL=y |
| @@ -259,10 +289,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
| 259 | CONFIG_KERNEL_START=0xc0000000 | 289 | CONFIG_KERNEL_START=0xc0000000 |
| 260 | CONFIG_PHYSICAL_START=0x00000000 | 290 | CONFIG_PHYSICAL_START=0x00000000 |
| 261 | CONFIG_TASK_SIZE=0xc0000000 | 291 | CONFIG_TASK_SIZE=0xc0000000 |
| 262 | |||
| 263 | # | ||
| 264 | # Networking | ||
| 265 | # | ||
| 266 | CONFIG_NET=y | 292 | CONFIG_NET=y |
| 267 | 293 | ||
| 268 | # | 294 | # |
| @@ -363,6 +389,7 @@ CONFIG_OF_I2C=y | |||
| 363 | # CONFIG_PARPORT is not set | 389 | # CONFIG_PARPORT is not set |
| 364 | CONFIG_BLK_DEV=y | 390 | CONFIG_BLK_DEV=y |
| 365 | # CONFIG_BLK_DEV_FD is not set | 391 | # CONFIG_BLK_DEV_FD is not set |
| 392 | # CONFIG_MAC_FLOPPY is not set | ||
| 366 | # CONFIG_BLK_CPQ_DA is not set | 393 | # CONFIG_BLK_CPQ_DA is not set |
| 367 | # CONFIG_BLK_CPQ_CISS_DA is not set | 394 | # CONFIG_BLK_CPQ_CISS_DA is not set |
| 368 | # CONFIG_BLK_DEV_DAC960 is not set | 395 | # CONFIG_BLK_DEV_DAC960 is not set |
| @@ -378,12 +405,14 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
| 378 | # CONFIG_BLK_DEV_XIP is not set | 405 | # CONFIG_BLK_DEV_XIP is not set |
| 379 | # CONFIG_CDROM_PKTCDVD is not set | 406 | # CONFIG_CDROM_PKTCDVD is not set |
| 380 | # CONFIG_ATA_OVER_ETH is not set | 407 | # CONFIG_ATA_OVER_ETH is not set |
| 408 | # CONFIG_BLK_DEV_HD is not set | ||
| 381 | CONFIG_MISC_DEVICES=y | 409 | CONFIG_MISC_DEVICES=y |
| 382 | # CONFIG_PHANTOM is not set | 410 | # CONFIG_PHANTOM is not set |
| 383 | # CONFIG_EEPROM_93CX6 is not set | 411 | # CONFIG_EEPROM_93CX6 is not set |
| 384 | # CONFIG_SGI_IOC4 is not set | 412 | # CONFIG_SGI_IOC4 is not set |
| 385 | # CONFIG_TIFM_CORE is not set | 413 | # CONFIG_TIFM_CORE is not set |
| 386 | # CONFIG_ENCLOSURE_SERVICES is not set | 414 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 415 | # CONFIG_HP_ILO is not set | ||
| 387 | CONFIG_HAVE_IDE=y | 416 | CONFIG_HAVE_IDE=y |
| 388 | # CONFIG_IDE is not set | 417 | # CONFIG_IDE is not set |
| 389 | 418 | ||
| @@ -460,7 +489,10 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 460 | # CONFIG_SCSI_DC390T is not set | 489 | # CONFIG_SCSI_DC390T is not set |
| 461 | # CONFIG_SCSI_NSP32 is not set | 490 | # CONFIG_SCSI_NSP32 is not set |
| 462 | # CONFIG_SCSI_DEBUG is not set | 491 | # CONFIG_SCSI_DEBUG is not set |
| 492 | # CONFIG_SCSI_MESH is not set | ||
| 493 | # CONFIG_SCSI_MAC53C94 is not set | ||
| 463 | # CONFIG_SCSI_SRP is not set | 494 | # CONFIG_SCSI_SRP is not set |
| 495 | # CONFIG_SCSI_DH is not set | ||
| 464 | # CONFIG_ATA is not set | 496 | # CONFIG_ATA is not set |
| 465 | # CONFIG_MD is not set | 497 | # CONFIG_MD is not set |
| 466 | # CONFIG_FUSION is not set | 498 | # CONFIG_FUSION is not set |
| @@ -468,12 +500,15 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 468 | # | 500 | # |
| 469 | # IEEE 1394 (FireWire) support | 501 | # IEEE 1394 (FireWire) support |
| 470 | # | 502 | # |
| 503 | |||
| 504 | # | ||
| 505 | # Enable only one of the two stacks, unless you know what you are doing | ||
| 506 | # | ||
| 471 | # CONFIG_FIREWIRE is not set | 507 | # CONFIG_FIREWIRE is not set |
| 472 | # CONFIG_IEEE1394 is not set | 508 | # CONFIG_IEEE1394 is not set |
| 473 | # CONFIG_I2O is not set | 509 | # CONFIG_I2O is not set |
| 474 | # CONFIG_MACINTOSH_DRIVERS is not set | 510 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 475 | CONFIG_NETDEVICES=y | 511 | CONFIG_NETDEVICES=y |
| 476 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 477 | # CONFIG_DUMMY is not set | 512 | # CONFIG_DUMMY is not set |
| 478 | # CONFIG_BONDING is not set | 513 | # CONFIG_BONDING is not set |
| 479 | # CONFIG_MACVLAN is not set | 514 | # CONFIG_MACVLAN is not set |
| @@ -500,6 +535,8 @@ CONFIG_MARVELL_PHY=y | |||
| 500 | # CONFIG_MDIO_BITBANG is not set | 535 | # CONFIG_MDIO_BITBANG is not set |
| 501 | CONFIG_NET_ETHERNET=y | 536 | CONFIG_NET_ETHERNET=y |
| 502 | CONFIG_MII=y | 537 | CONFIG_MII=y |
| 538 | # CONFIG_MACE is not set | ||
| 539 | # CONFIG_BMAC is not set | ||
| 503 | # CONFIG_HAPPYMEAL is not set | 540 | # CONFIG_HAPPYMEAL is not set |
| 504 | # CONFIG_SUNGEM is not set | 541 | # CONFIG_SUNGEM is not set |
| 505 | # CONFIG_CASSINI is not set | 542 | # CONFIG_CASSINI is not set |
| @@ -517,7 +554,6 @@ CONFIG_NETDEV_1000=y | |||
| 517 | # CONFIG_DL2K is not set | 554 | # CONFIG_DL2K is not set |
| 518 | # CONFIG_E1000 is not set | 555 | # CONFIG_E1000 is not set |
| 519 | # CONFIG_E1000E is not set | 556 | # CONFIG_E1000E is not set |
| 520 | # CONFIG_E1000E_ENABLED is not set | ||
| 521 | # CONFIG_IP1000 is not set | 557 | # CONFIG_IP1000 is not set |
| 522 | # CONFIG_IGB is not set | 558 | # CONFIG_IGB is not set |
| 523 | # CONFIG_NS83820 is not set | 559 | # CONFIG_NS83820 is not set |
| @@ -532,12 +568,13 @@ CONFIG_NETDEV_1000=y | |||
| 532 | # CONFIG_BNX2 is not set | 568 | # CONFIG_BNX2 is not set |
| 533 | # CONFIG_GIANFAR is not set | 569 | # CONFIG_GIANFAR is not set |
| 534 | CONFIG_UCC_GETH=y | 570 | CONFIG_UCC_GETH=y |
| 535 | # CONFIG_UGETH_NAPI is not set | ||
| 536 | # CONFIG_UGETH_MAGIC_PACKET is not set | 571 | # CONFIG_UGETH_MAGIC_PACKET is not set |
| 537 | # CONFIG_UGETH_FILTERING is not set | 572 | # CONFIG_UGETH_FILTERING is not set |
| 538 | # CONFIG_UGETH_TX_ON_DEMAND is not set | 573 | # CONFIG_UGETH_TX_ON_DEMAND is not set |
| 574 | # CONFIG_MV643XX_ETH is not set | ||
| 539 | # CONFIG_QLA3XXX is not set | 575 | # CONFIG_QLA3XXX is not set |
| 540 | # CONFIG_ATL1 is not set | 576 | # CONFIG_ATL1 is not set |
| 577 | # CONFIG_ATL1E is not set | ||
| 541 | CONFIG_NETDEV_10000=y | 578 | CONFIG_NETDEV_10000=y |
| 542 | # CONFIG_CHELSIO_T1 is not set | 579 | # CONFIG_CHELSIO_T1 is not set |
| 543 | # CONFIG_CHELSIO_T3 is not set | 580 | # CONFIG_CHELSIO_T3 is not set |
| @@ -626,12 +663,15 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
| 626 | # CONFIG_SERIAL_UARTLITE is not set | 663 | # CONFIG_SERIAL_UARTLITE is not set |
| 627 | CONFIG_SERIAL_CORE=y | 664 | CONFIG_SERIAL_CORE=y |
| 628 | CONFIG_SERIAL_CORE_CONSOLE=y | 665 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 666 | # CONFIG_SERIAL_PMACZILOG is not set | ||
| 629 | # CONFIG_SERIAL_JSM is not set | 667 | # CONFIG_SERIAL_JSM is not set |
| 630 | # CONFIG_SERIAL_OF_PLATFORM is not set | 668 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 631 | # CONFIG_SERIAL_QE is not set | 669 | # CONFIG_SERIAL_QE is not set |
| 632 | CONFIG_UNIX98_PTYS=y | 670 | CONFIG_UNIX98_PTYS=y |
| 633 | CONFIG_LEGACY_PTYS=y | 671 | CONFIG_LEGACY_PTYS=y |
| 634 | CONFIG_LEGACY_PTY_COUNT=256 | 672 | CONFIG_LEGACY_PTY_COUNT=256 |
| 673 | # CONFIG_BRIQ_PANEL is not set | ||
| 674 | # CONFIG_HVC_RTAS is not set | ||
| 635 | # CONFIG_IPMI_HANDLER is not set | 675 | # CONFIG_IPMI_HANDLER is not set |
| 636 | CONFIG_HW_RANDOM=y | 676 | CONFIG_HW_RANDOM=y |
| 637 | # CONFIG_NVRAM is not set | 677 | # CONFIG_NVRAM is not set |
| @@ -643,42 +683,69 @@ CONFIG_DEVPORT=y | |||
| 643 | CONFIG_I2C=y | 683 | CONFIG_I2C=y |
| 644 | CONFIG_I2C_BOARDINFO=y | 684 | CONFIG_I2C_BOARDINFO=y |
| 645 | CONFIG_I2C_CHARDEV=y | 685 | CONFIG_I2C_CHARDEV=y |
| 686 | CONFIG_I2C_HELPER_AUTO=y | ||
| 646 | 687 | ||
| 647 | # | 688 | # |
| 648 | # I2C Hardware Bus support | 689 | # I2C Hardware Bus support |
| 649 | # | 690 | # |
| 691 | |||
| 692 | # | ||
| 693 | # PC SMBus host controller drivers | ||
| 694 | # | ||
| 650 | # CONFIG_I2C_ALI1535 is not set | 695 | # CONFIG_I2C_ALI1535 is not set |
| 651 | # CONFIG_I2C_ALI1563 is not set | 696 | # CONFIG_I2C_ALI1563 is not set |
| 652 | # CONFIG_I2C_ALI15X3 is not set | 697 | # CONFIG_I2C_ALI15X3 is not set |
| 653 | # CONFIG_I2C_AMD756 is not set | 698 | # CONFIG_I2C_AMD756 is not set |
| 654 | # CONFIG_I2C_AMD8111 is not set | 699 | # CONFIG_I2C_AMD8111 is not set |
| 655 | # CONFIG_I2C_I801 is not set | 700 | # CONFIG_I2C_I801 is not set |
| 656 | # CONFIG_I2C_I810 is not set | 701 | # CONFIG_I2C_ISCH is not set |
| 657 | # CONFIG_I2C_PIIX4 is not set | 702 | # CONFIG_I2C_PIIX4 is not set |
| 658 | CONFIG_I2C_MPC=y | ||
| 659 | # CONFIG_I2C_NFORCE2 is not set | 703 | # CONFIG_I2C_NFORCE2 is not set |
| 660 | # CONFIG_I2C_OCORES is not set | ||
| 661 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 662 | # CONFIG_I2C_PROSAVAGE is not set | ||
| 663 | # CONFIG_I2C_SAVAGE4 is not set | ||
| 664 | # CONFIG_I2C_SIMTEC is not set | ||
| 665 | # CONFIG_I2C_SIS5595 is not set | 704 | # CONFIG_I2C_SIS5595 is not set |
| 666 | # CONFIG_I2C_SIS630 is not set | 705 | # CONFIG_I2C_SIS630 is not set |
| 667 | # CONFIG_I2C_SIS96X is not set | 706 | # CONFIG_I2C_SIS96X is not set |
| 668 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 669 | # CONFIG_I2C_STUB is not set | ||
| 670 | # CONFIG_I2C_VIA is not set | 707 | # CONFIG_I2C_VIA is not set |
| 671 | # CONFIG_I2C_VIAPRO is not set | 708 | # CONFIG_I2C_VIAPRO is not set |
| 709 | |||
| 710 | # | ||
| 711 | # Mac SMBus host controller drivers | ||
| 712 | # | ||
| 713 | # CONFIG_I2C_HYDRA is not set | ||
| 714 | CONFIG_I2C_POWERMAC=y | ||
| 715 | |||
| 716 | # | ||
| 717 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 718 | # | ||
| 719 | CONFIG_I2C_MPC=y | ||
| 720 | # CONFIG_I2C_OCORES is not set | ||
| 721 | # CONFIG_I2C_SIMTEC is not set | ||
| 722 | |||
| 723 | # | ||
| 724 | # External I2C/SMBus adapter drivers | ||
| 725 | # | ||
| 726 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 727 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 728 | |||
| 729 | # | ||
| 730 | # Graphics adapter I2C/DDC channel drivers | ||
| 731 | # | ||
| 672 | # CONFIG_I2C_VOODOO3 is not set | 732 | # CONFIG_I2C_VOODOO3 is not set |
| 733 | |||
| 734 | # | ||
| 735 | # Other I2C/SMBus bus drivers | ||
| 736 | # | ||
| 673 | # CONFIG_I2C_PCA_PLATFORM is not set | 737 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 738 | # CONFIG_I2C_STUB is not set | ||
| 674 | 739 | ||
| 675 | # | 740 | # |
| 676 | # Miscellaneous I2C Chip support | 741 | # Miscellaneous I2C Chip support |
| 677 | # | 742 | # |
| 678 | # CONFIG_DS1682 is not set | 743 | # CONFIG_DS1682 is not set |
| 744 | # CONFIG_AT24 is not set | ||
| 679 | # CONFIG_SENSORS_EEPROM is not set | 745 | # CONFIG_SENSORS_EEPROM is not set |
| 680 | # CONFIG_SENSORS_PCF8574 is not set | 746 | # CONFIG_SENSORS_PCF8574 is not set |
| 681 | # CONFIG_PCF8575 is not set | 747 | # CONFIG_PCF8575 is not set |
| 748 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 682 | # CONFIG_SENSORS_PCF8591 is not set | 749 | # CONFIG_SENSORS_PCF8591 is not set |
| 683 | # CONFIG_SENSORS_MAX6875 is not set | 750 | # CONFIG_SENSORS_MAX6875 is not set |
| 684 | # CONFIG_SENSORS_TSL2550 is not set | 751 | # CONFIG_SENSORS_TSL2550 is not set |
| @@ -687,10 +754,13 @@ CONFIG_I2C_MPC=y | |||
| 687 | # CONFIG_I2C_DEBUG_BUS is not set | 754 | # CONFIG_I2C_DEBUG_BUS is not set |
| 688 | # CONFIG_I2C_DEBUG_CHIP is not set | 755 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 689 | # CONFIG_SPI is not set | 756 | # CONFIG_SPI is not set |
| 757 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 758 | # CONFIG_GPIOLIB is not set | ||
| 690 | # CONFIG_W1 is not set | 759 | # CONFIG_W1 is not set |
| 691 | # CONFIG_POWER_SUPPLY is not set | 760 | # CONFIG_POWER_SUPPLY is not set |
| 692 | CONFIG_HWMON=y | 761 | CONFIG_HWMON=y |
| 693 | # CONFIG_HWMON_VID is not set | 762 | # CONFIG_HWMON_VID is not set |
| 763 | # CONFIG_SENSORS_AD7414 is not set | ||
| 694 | # CONFIG_SENSORS_AD7418 is not set | 764 | # CONFIG_SENSORS_AD7418 is not set |
| 695 | # CONFIG_SENSORS_ADM1021 is not set | 765 | # CONFIG_SENSORS_ADM1021 is not set |
| 696 | # CONFIG_SENSORS_ADM1025 is not set | 766 | # CONFIG_SENSORS_ADM1025 is not set |
| @@ -700,6 +770,7 @@ CONFIG_HWMON=y | |||
| 700 | # CONFIG_SENSORS_ADM9240 is not set | 770 | # CONFIG_SENSORS_ADM9240 is not set |
| 701 | # CONFIG_SENSORS_ADT7470 is not set | 771 | # CONFIG_SENSORS_ADT7470 is not set |
| 702 | # CONFIG_SENSORS_ADT7473 is not set | 772 | # CONFIG_SENSORS_ADT7473 is not set |
| 773 | # CONFIG_SENSORS_AMS is not set | ||
| 703 | # CONFIG_SENSORS_ATXP1 is not set | 774 | # CONFIG_SENSORS_ATXP1 is not set |
| 704 | # CONFIG_SENSORS_DS1621 is not set | 775 | # CONFIG_SENSORS_DS1621 is not set |
| 705 | # CONFIG_SENSORS_I5K_AMB is not set | 776 | # CONFIG_SENSORS_I5K_AMB is not set |
| @@ -744,6 +815,7 @@ CONFIG_HWMON=y | |||
| 744 | # CONFIG_SENSORS_W83627EHF is not set | 815 | # CONFIG_SENSORS_W83627EHF is not set |
| 745 | # CONFIG_HWMON_DEBUG_CHIP is not set | 816 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 746 | # CONFIG_THERMAL is not set | 817 | # CONFIG_THERMAL is not set |
| 818 | # CONFIG_THERMAL_HWMON is not set | ||
| 747 | CONFIG_WATCHDOG=y | 819 | CONFIG_WATCHDOG=y |
| 748 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 820 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
| 749 | 821 | ||
| @@ -751,7 +823,9 @@ CONFIG_WATCHDOG=y | |||
| 751 | # Watchdog Device Drivers | 823 | # Watchdog Device Drivers |
| 752 | # | 824 | # |
| 753 | # CONFIG_SOFT_WATCHDOG is not set | 825 | # CONFIG_SOFT_WATCHDOG is not set |
| 754 | CONFIG_83xx_WDT=y | 826 | # CONFIG_ALIM7101_WDT is not set |
| 827 | # CONFIG_8xxx_WDT is not set | ||
| 828 | # CONFIG_WATCHDOG_RTAS is not set | ||
| 755 | 829 | ||
| 756 | # | 830 | # |
| 757 | # PCI-based Watchdog Cards | 831 | # PCI-based Watchdog Cards |
| @@ -768,8 +842,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 768 | # | 842 | # |
| 769 | # Multifunction device drivers | 843 | # Multifunction device drivers |
| 770 | # | 844 | # |
| 845 | # CONFIG_MFD_CORE is not set | ||
| 771 | # CONFIG_MFD_SM501 is not set | 846 | # CONFIG_MFD_SM501 is not set |
| 772 | # CONFIG_HTC_PASIC3 is not set | 847 | # CONFIG_HTC_PASIC3 is not set |
| 848 | # CONFIG_MFD_TMIO is not set | ||
| 773 | 849 | ||
| 774 | # | 850 | # |
| 775 | # Multimedia devices | 851 | # Multimedia devices |
| @@ -801,10 +877,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m | |||
| 801 | # Display device support | 877 | # Display device support |
| 802 | # | 878 | # |
| 803 | # CONFIG_DISPLAY_SUPPORT is not set | 879 | # CONFIG_DISPLAY_SUPPORT is not set |
| 804 | |||
| 805 | # | ||
| 806 | # Sound | ||
| 807 | # | ||
| 808 | # CONFIG_SOUND is not set | 880 | # CONFIG_SOUND is not set |
| 809 | CONFIG_HID_SUPPORT=y | 881 | CONFIG_HID_SUPPORT=y |
| 810 | CONFIG_HID=y | 882 | CONFIG_HID=y |
| @@ -819,6 +891,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 819 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 891 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
| 820 | 892 | ||
| 821 | # | 893 | # |
| 894 | # Enable Host or Gadget support to see Inventra options | ||
| 895 | # | ||
| 896 | |||
| 897 | # | ||
| 822 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 898 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 823 | # | 899 | # |
| 824 | # CONFIG_USB_GADGET is not set | 900 | # CONFIG_USB_GADGET is not set |
| @@ -857,6 +933,7 @@ CONFIG_RTC_DRV_DS1374=y | |||
| 857 | # CONFIG_RTC_DRV_PCF8583 is not set | 933 | # CONFIG_RTC_DRV_PCF8583 is not set |
| 858 | # CONFIG_RTC_DRV_M41T80 is not set | 934 | # CONFIG_RTC_DRV_M41T80 is not set |
| 859 | # CONFIG_RTC_DRV_S35390A is not set | 935 | # CONFIG_RTC_DRV_S35390A is not set |
| 936 | # CONFIG_RTC_DRV_FM3130 is not set | ||
| 860 | 937 | ||
| 861 | # | 938 | # |
| 862 | # SPI RTC drivers | 939 | # SPI RTC drivers |
| @@ -945,6 +1022,7 @@ CONFIG_TMPFS=y | |||
| 945 | # CONFIG_CRAMFS is not set | 1022 | # CONFIG_CRAMFS is not set |
| 946 | # CONFIG_VXFS_FS is not set | 1023 | # CONFIG_VXFS_FS is not set |
| 947 | # CONFIG_MINIX_FS is not set | 1024 | # CONFIG_MINIX_FS is not set |
| 1025 | # CONFIG_OMFS_FS is not set | ||
| 948 | # CONFIG_HPFS_FS is not set | 1026 | # CONFIG_HPFS_FS is not set |
| 949 | # CONFIG_QNX4FS_FS is not set | 1027 | # CONFIG_QNX4FS_FS is not set |
| 950 | # CONFIG_ROMFS_FS is not set | 1028 | # CONFIG_ROMFS_FS is not set |
| @@ -955,14 +1033,13 @@ CONFIG_NFS_FS=y | |||
| 955 | CONFIG_NFS_V3=y | 1033 | CONFIG_NFS_V3=y |
| 956 | # CONFIG_NFS_V3_ACL is not set | 1034 | # CONFIG_NFS_V3_ACL is not set |
| 957 | CONFIG_NFS_V4=y | 1035 | CONFIG_NFS_V4=y |
| 958 | # CONFIG_NFSD is not set | ||
| 959 | CONFIG_ROOT_NFS=y | 1036 | CONFIG_ROOT_NFS=y |
| 1037 | # CONFIG_NFSD is not set | ||
| 960 | CONFIG_LOCKD=y | 1038 | CONFIG_LOCKD=y |
| 961 | CONFIG_LOCKD_V4=y | 1039 | CONFIG_LOCKD_V4=y |
| 962 | CONFIG_NFS_COMMON=y | 1040 | CONFIG_NFS_COMMON=y |
| 963 | CONFIG_SUNRPC=y | 1041 | CONFIG_SUNRPC=y |
| 964 | CONFIG_SUNRPC_GSS=y | 1042 | CONFIG_SUNRPC_GSS=y |
| 965 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 966 | CONFIG_RPCSEC_GSS_KRB5=y | 1043 | CONFIG_RPCSEC_GSS_KRB5=y |
| 967 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1044 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 968 | # CONFIG_SMB_FS is not set | 1045 | # CONFIG_SMB_FS is not set |
| @@ -992,6 +1069,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
| 992 | # CONFIG_DLM is not set | 1069 | # CONFIG_DLM is not set |
| 993 | CONFIG_UCC_FAST=y | 1070 | CONFIG_UCC_FAST=y |
| 994 | CONFIG_UCC=y | 1071 | CONFIG_UCC=y |
| 1072 | # CONFIG_QE_GPIO is not set | ||
| 995 | 1073 | ||
| 996 | # | 1074 | # |
| 997 | # Library routines | 1075 | # Library routines |
| @@ -1000,6 +1078,7 @@ CONFIG_BITREVERSE=y | |||
| 1000 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1078 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 1001 | # CONFIG_CRC_CCITT is not set | 1079 | # CONFIG_CRC_CCITT is not set |
| 1002 | # CONFIG_CRC16 is not set | 1080 | # CONFIG_CRC16 is not set |
| 1081 | # CONFIG_CRC_T10DIF is not set | ||
| 1003 | # CONFIG_CRC_ITU_T is not set | 1082 | # CONFIG_CRC_ITU_T is not set |
| 1004 | CONFIG_CRC32=y | 1083 | CONFIG_CRC32=y |
| 1005 | # CONFIG_CRC7 is not set | 1084 | # CONFIG_CRC7 is not set |
| @@ -1025,8 +1104,18 @@ CONFIG_FRAME_WARN=1024 | |||
| 1025 | # CONFIG_SLUB_DEBUG_ON is not set | 1104 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1026 | # CONFIG_SLUB_STATS is not set | 1105 | # CONFIG_SLUB_STATS is not set |
| 1027 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1106 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1107 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 1108 | # CONFIG_LATENCYTOP is not set | ||
| 1109 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1110 | CONFIG_HAVE_FTRACE=y | ||
| 1111 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1112 | # CONFIG_FTRACE is not set | ||
| 1113 | # CONFIG_SCHED_TRACER is not set | ||
| 1114 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1028 | # CONFIG_SAMPLES is not set | 1115 | # CONFIG_SAMPLES is not set |
| 1116 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1029 | # CONFIG_IRQSTACKS is not set | 1117 | # CONFIG_IRQSTACKS is not set |
| 1118 | # CONFIG_BOOTX_TEXT is not set | ||
| 1030 | # CONFIG_PPC_EARLY_DEBUG is not set | 1119 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1031 | 1120 | ||
| 1032 | # | 1121 | # |
| @@ -1080,6 +1169,10 @@ CONFIG_CRYPTO_PCBC=m | |||
| 1080 | # CONFIG_CRYPTO_MD4 is not set | 1169 | # CONFIG_CRYPTO_MD4 is not set |
| 1081 | CONFIG_CRYPTO_MD5=y | 1170 | CONFIG_CRYPTO_MD5=y |
| 1082 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1171 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 1172 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1173 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1174 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1175 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1083 | # CONFIG_CRYPTO_SHA1 is not set | 1176 | # CONFIG_CRYPTO_SHA1 is not set |
| 1084 | # CONFIG_CRYPTO_SHA256 is not set | 1177 | # CONFIG_CRYPTO_SHA256 is not set |
| 1085 | # CONFIG_CRYPTO_SHA512 is not set | 1178 | # CONFIG_CRYPTO_SHA512 is not set |
| @@ -1112,6 +1205,7 @@ CONFIG_CRYPTO_DES=y | |||
| 1112 | # CONFIG_CRYPTO_LZO is not set | 1205 | # CONFIG_CRYPTO_LZO is not set |
| 1113 | CONFIG_CRYPTO_HW=y | 1206 | CONFIG_CRYPTO_HW=y |
| 1114 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1207 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1208 | # CONFIG_CRYPTO_DEV_TALITOS is not set | ||
| 1115 | # CONFIG_PPC_CLOCK is not set | 1209 | # CONFIG_PPC_CLOCK is not set |
| 1116 | CONFIG_PPC_LIB_RHEAP=y | 1210 | CONFIG_PPC_LIB_RHEAP=y |
| 1117 | # CONFIG_VIRTUALIZATION is not set | 1211 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig b/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig index d2c435f0da42..7d674be702fe 100644 --- a/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig +++ b/arch/powerpc/configs/83xx/mpc836x_rdk_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.26-rc2 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Mon May 19 21:12:32 2008 | 4 | # Thu Aug 21 00:52:24 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -16,6 +16,7 @@ CONFIG_6xx=y | |||
| 16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
| 17 | CONFIG_PPC_FPU=y | 17 | CONFIG_PPC_FPU=y |
| 18 | # CONFIG_FSL_EMB_PERFMON is not set | 18 | # CONFIG_FSL_EMB_PERFMON is not set |
| 19 | # CONFIG_ALTIVEC is not set | ||
| 19 | CONFIG_PPC_STD_MMU=y | 20 | CONFIG_PPC_STD_MMU=y |
| 20 | CONFIG_PPC_STD_MMU_32=y | 21 | CONFIG_PPC_STD_MMU_32=y |
| 21 | # CONFIG_PPC_MM_SLICES is not set | 22 | # CONFIG_PPC_MM_SLICES is not set |
| @@ -32,6 +33,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | 35 | CONFIG_STACKTRACE_SUPPORT=y |
| 36 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | 37 | CONFIG_LOCKDEP_SUPPORT=y |
| 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 39 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| @@ -52,6 +54,9 @@ CONFIG_PPC_UDBG_16550=y | |||
| 52 | CONFIG_AUDIT_ARCH=y | 54 | CONFIG_AUDIT_ARCH=y |
| 53 | CONFIG_GENERIC_BUG=y | 55 | CONFIG_GENERIC_BUG=y |
| 54 | CONFIG_DEFAULT_UIMAGE=y | 56 | CONFIG_DEFAULT_UIMAGE=y |
| 57 | CONFIG_HIBERNATE_32=y | ||
| 58 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
| 59 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
| 55 | # CONFIG_PPC_DCR_NATIVE is not set | 60 | # CONFIG_PPC_DCR_NATIVE is not set |
| 56 | # CONFIG_PPC_DCR_MMIO is not set | 61 | # CONFIG_PPC_DCR_MMIO is not set |
| 57 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 62 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| @@ -89,12 +94,12 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 89 | CONFIG_SYSCTL=y | 94 | CONFIG_SYSCTL=y |
| 90 | CONFIG_EMBEDDED=y | 95 | CONFIG_EMBEDDED=y |
| 91 | CONFIG_SYSCTL_SYSCALL=y | 96 | CONFIG_SYSCTL_SYSCALL=y |
| 92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 93 | # CONFIG_KALLSYMS is not set | 97 | # CONFIG_KALLSYMS is not set |
| 94 | CONFIG_HOTPLUG=y | 98 | CONFIG_HOTPLUG=y |
| 95 | CONFIG_PRINTK=y | 99 | CONFIG_PRINTK=y |
| 96 | CONFIG_BUG=y | 100 | CONFIG_BUG=y |
| 97 | CONFIG_ELF_CORE=y | 101 | CONFIG_ELF_CORE=y |
| 102 | CONFIG_PCSPKR_PLATFORM=y | ||
| 98 | CONFIG_COMPAT_BRK=y | 103 | CONFIG_COMPAT_BRK=y |
| 99 | CONFIG_BASE_FULL=y | 104 | CONFIG_BASE_FULL=y |
| 100 | CONFIG_FUTEX=y | 105 | CONFIG_FUTEX=y |
| @@ -112,10 +117,16 @@ CONFIG_SLUB=y | |||
| 112 | # CONFIG_PROFILING is not set | 117 | # CONFIG_PROFILING is not set |
| 113 | # CONFIG_MARKERS is not set | 118 | # CONFIG_MARKERS is not set |
| 114 | CONFIG_HAVE_OPROFILE=y | 119 | CONFIG_HAVE_OPROFILE=y |
| 120 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 121 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 115 | CONFIG_HAVE_KPROBES=y | 122 | CONFIG_HAVE_KPROBES=y |
| 116 | CONFIG_HAVE_KRETPROBES=y | 123 | CONFIG_HAVE_KRETPROBES=y |
| 124 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 117 | # CONFIG_HAVE_DMA_ATTRS is not set | 125 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 126 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 127 | # CONFIG_HAVE_CLK is not set | ||
| 118 | CONFIG_PROC_PAGE_MONITOR=y | 128 | CONFIG_PROC_PAGE_MONITOR=y |
| 129 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 119 | CONFIG_SLABINFO=y | 130 | CONFIG_SLABINFO=y |
| 120 | CONFIG_RT_MUTEXES=y | 131 | CONFIG_RT_MUTEXES=y |
| 121 | # CONFIG_TINY_SHMEM is not set | 132 | # CONFIG_TINY_SHMEM is not set |
| @@ -126,12 +137,13 @@ CONFIG_MODULE_UNLOAD=y | |||
| 126 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 137 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 127 | # CONFIG_MODVERSIONS is not set | 138 | # CONFIG_MODVERSIONS is not set |
| 128 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 139 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 129 | # CONFIG_KMOD is not set | 140 | CONFIG_KMOD=y |
| 130 | CONFIG_BLOCK=y | 141 | CONFIG_BLOCK=y |
| 131 | # CONFIG_LBD is not set | 142 | # CONFIG_LBD is not set |
| 132 | # CONFIG_BLK_DEV_IO_TRACE is not set | 143 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 133 | # CONFIG_LSF is not set | 144 | # CONFIG_LSF is not set |
| 134 | # CONFIG_BLK_DEV_BSG is not set | 145 | # CONFIG_BLK_DEV_BSG is not set |
| 146 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 135 | 147 | ||
| 136 | # | 148 | # |
| 137 | # IO Schedulers | 149 | # IO Schedulers |
| @@ -150,16 +162,18 @@ CONFIG_CLASSIC_RCU=y | |||
| 150 | # | 162 | # |
| 151 | # Platform support | 163 | # Platform support |
| 152 | # | 164 | # |
| 153 | # CONFIG_PPC_MULTIPLATFORM is not set | 165 | CONFIG_PPC_MULTIPLATFORM=y |
| 154 | # CONFIG_PPC_82xx is not set | 166 | CONFIG_CLASSIC32=y |
| 155 | CONFIG_PPC_83xx=y | 167 | CONFIG_PPC_CHRP=y |
| 156 | # CONFIG_PPC_86xx is not set | 168 | # CONFIG_MPC5121_ADS is not set |
| 157 | # CONFIG_PPC_MPC512x is not set | 169 | # CONFIG_MPC5121_GENERIC is not set |
| 158 | # CONFIG_PPC_MPC5121 is not set | 170 | # CONFIG_PPC_MPC52xx is not set |
| 171 | CONFIG_PPC_PMAC=y | ||
| 159 | # CONFIG_PPC_CELL is not set | 172 | # CONFIG_PPC_CELL is not set |
| 160 | # CONFIG_PPC_CELL_NATIVE is not set | 173 | # CONFIG_PPC_CELL_NATIVE is not set |
| 174 | # CONFIG_PPC_82xx is not set | ||
| 161 | # CONFIG_PQ2ADS is not set | 175 | # CONFIG_PQ2ADS is not set |
| 162 | CONFIG_MPC83xx=y | 176 | CONFIG_PPC_83xx=y |
| 163 | # CONFIG_MPC831x_RDB is not set | 177 | # CONFIG_MPC831x_RDB is not set |
| 164 | # CONFIG_MPC832x_MDS is not set | 178 | # CONFIG_MPC832x_MDS is not set |
| 165 | # CONFIG_MPC832x_RDB is not set | 179 | # CONFIG_MPC832x_RDB is not set |
| @@ -170,17 +184,26 @@ CONFIG_MPC836x_RDK=y | |||
| 170 | # CONFIG_MPC837x_MDS is not set | 184 | # CONFIG_MPC837x_MDS is not set |
| 171 | # CONFIG_MPC837x_RDB is not set | 185 | # CONFIG_MPC837x_RDB is not set |
| 172 | # CONFIG_SBC834x is not set | 186 | # CONFIG_SBC834x is not set |
| 187 | # CONFIG_ASP834x is not set | ||
| 188 | # CONFIG_PPC_86xx is not set | ||
| 189 | # CONFIG_EMBEDDED6xx is not set | ||
| 190 | CONFIG_PPC_NATIVE=y | ||
| 191 | # CONFIG_UDBG_RTAS_CONSOLE is not set | ||
| 173 | CONFIG_IPIC=y | 192 | CONFIG_IPIC=y |
| 174 | # CONFIG_MPIC is not set | 193 | CONFIG_MPIC=y |
| 175 | # CONFIG_MPIC_WEIRD is not set | 194 | # CONFIG_MPIC_WEIRD is not set |
| 176 | # CONFIG_PPC_I8259 is not set | 195 | CONFIG_PPC_I8259=y |
| 177 | # CONFIG_PPC_RTAS is not set | 196 | CONFIG_PPC_RTAS=y |
| 197 | # CONFIG_RTAS_ERROR_LOGGING is not set | ||
| 198 | CONFIG_RTAS_PROC=y | ||
| 178 | # CONFIG_MMIO_NVRAM is not set | 199 | # CONFIG_MMIO_NVRAM is not set |
| 179 | # CONFIG_PPC_MPC106 is not set | 200 | CONFIG_PPC_MPC106=y |
| 180 | # CONFIG_PPC_970_NAP is not set | 201 | # CONFIG_PPC_970_NAP is not set |
| 181 | # CONFIG_PPC_INDIRECT_IO is not set | 202 | # CONFIG_PPC_INDIRECT_IO is not set |
| 182 | # CONFIG_GENERIC_IOMAP is not set | 203 | # CONFIG_GENERIC_IOMAP is not set |
| 183 | # CONFIG_CPU_FREQ is not set | 204 | # CONFIG_CPU_FREQ is not set |
| 205 | # CONFIG_PPC601_SYNC_FIX is not set | ||
| 206 | # CONFIG_TAU is not set | ||
| 184 | CONFIG_QUICC_ENGINE=y | 207 | CONFIG_QUICC_ENGINE=y |
| 185 | # CONFIG_FSL_ULI1575 is not set | 208 | # CONFIG_FSL_ULI1575 is not set |
| 186 | 209 | ||
| @@ -207,6 +230,7 @@ CONFIG_BINFMT_ELF=y | |||
| 207 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 230 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| 208 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 231 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
| 209 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 232 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
| 233 | # CONFIG_KEXEC is not set | ||
| 210 | CONFIG_ARCH_FLATMEM_ENABLE=y | 234 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 211 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 235 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
| 212 | CONFIG_SELECT_MEMORY_MODEL=y | 236 | CONFIG_SELECT_MEMORY_MODEL=y |
| @@ -219,6 +243,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 219 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 243 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 220 | CONFIG_PAGEFLAGS_EXTENDED=y | 244 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 221 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 245 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 246 | CONFIG_MIGRATION=y | ||
| 222 | # CONFIG_RESOURCES_64BIT is not set | 247 | # CONFIG_RESOURCES_64BIT is not set |
| 223 | CONFIG_ZONE_DMA_FLAG=1 | 248 | CONFIG_ZONE_DMA_FLAG=1 |
| 224 | CONFIG_BOUNCE=y | 249 | CONFIG_BOUNCE=y |
| @@ -226,6 +251,7 @@ CONFIG_VIRT_TO_BUS=y | |||
| 226 | CONFIG_FORCE_MAX_ZONEORDER=11 | 251 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 227 | CONFIG_PROC_DEVICETREE=y | 252 | CONFIG_PROC_DEVICETREE=y |
| 228 | # CONFIG_CMDLINE_BOOL is not set | 253 | # CONFIG_CMDLINE_BOOL is not set |
| 254 | CONFIG_EXTRA_TARGETS="" | ||
| 229 | # CONFIG_PM is not set | 255 | # CONFIG_PM is not set |
| 230 | CONFIG_SECCOMP=y | 256 | CONFIG_SECCOMP=y |
| 231 | CONFIG_ISA_DMA_API=y | 257 | CONFIG_ISA_DMA_API=y |
| @@ -233,12 +259,15 @@ CONFIG_ISA_DMA_API=y | |||
| 233 | # | 259 | # |
| 234 | # Bus options | 260 | # Bus options |
| 235 | # | 261 | # |
| 262 | # CONFIG_ISA is not set | ||
| 236 | CONFIG_ZONE_DMA=y | 263 | CONFIG_ZONE_DMA=y |
| 237 | CONFIG_GENERIC_ISA_DMA=y | 264 | CONFIG_GENERIC_ISA_DMA=y |
| 238 | CONFIG_PPC_INDIRECT_PCI=y | 265 | CONFIG_PPC_INDIRECT_PCI=y |
| 239 | CONFIG_FSL_SOC=y | 266 | CONFIG_FSL_SOC=y |
| 267 | CONFIG_FSL_PCI=y | ||
| 240 | CONFIG_FSL_LBC=y | 268 | CONFIG_FSL_LBC=y |
| 241 | CONFIG_FSL_GTM=y | 269 | CONFIG_FSL_GTM=y |
| 270 | CONFIG_PPC_PCI_CHOICE=y | ||
| 242 | CONFIG_PCI=y | 271 | CONFIG_PCI=y |
| 243 | CONFIG_PCI_DOMAINS=y | 272 | CONFIG_PCI_DOMAINS=y |
| 244 | CONFIG_PCI_SYSCALL=y | 273 | CONFIG_PCI_SYSCALL=y |
| @@ -263,10 +292,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
| 263 | CONFIG_KERNEL_START=0xc0000000 | 292 | CONFIG_KERNEL_START=0xc0000000 |
| 264 | CONFIG_PHYSICAL_START=0x00000000 | 293 | CONFIG_PHYSICAL_START=0x00000000 |
| 265 | CONFIG_TASK_SIZE=0xc0000000 | 294 | CONFIG_TASK_SIZE=0xc0000000 |
| 266 | |||
| 267 | # | ||
| 268 | # Networking | ||
| 269 | # | ||
| 270 | CONFIG_NET=y | 295 | CONFIG_NET=y |
| 271 | 296 | ||
| 272 | # | 297 | # |
| @@ -359,6 +384,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | |||
| 359 | CONFIG_STANDALONE=y | 384 | CONFIG_STANDALONE=y |
| 360 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 385 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 361 | CONFIG_FW_LOADER=y | 386 | CONFIG_FW_LOADER=y |
| 387 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
| 388 | CONFIG_EXTRA_FIRMWARE="" | ||
| 362 | # CONFIG_SYS_HYPERVISOR is not set | 389 | # CONFIG_SYS_HYPERVISOR is not set |
| 363 | # CONFIG_CONNECTOR is not set | 390 | # CONFIG_CONNECTOR is not set |
| 364 | CONFIG_MTD=y | 391 | CONFIG_MTD=y |
| @@ -449,9 +476,11 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
| 449 | CONFIG_OF_DEVICE=y | 476 | CONFIG_OF_DEVICE=y |
| 450 | CONFIG_OF_GPIO=y | 477 | CONFIG_OF_GPIO=y |
| 451 | CONFIG_OF_I2C=y | 478 | CONFIG_OF_I2C=y |
| 479 | CONFIG_OF_SPI=y | ||
| 452 | # CONFIG_PARPORT is not set | 480 | # CONFIG_PARPORT is not set |
| 453 | CONFIG_BLK_DEV=y | 481 | CONFIG_BLK_DEV=y |
| 454 | # CONFIG_BLK_DEV_FD is not set | 482 | # CONFIG_BLK_DEV_FD is not set |
| 483 | # CONFIG_MAC_FLOPPY is not set | ||
| 455 | # CONFIG_BLK_CPQ_DA is not set | 484 | # CONFIG_BLK_CPQ_DA is not set |
| 456 | # CONFIG_BLK_CPQ_CISS_DA is not set | 485 | # CONFIG_BLK_CPQ_CISS_DA is not set |
| 457 | # CONFIG_BLK_DEV_DAC960 is not set | 486 | # CONFIG_BLK_DEV_DAC960 is not set |
| @@ -467,12 +496,14 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
| 467 | # CONFIG_BLK_DEV_XIP is not set | 496 | # CONFIG_BLK_DEV_XIP is not set |
| 468 | # CONFIG_CDROM_PKTCDVD is not set | 497 | # CONFIG_CDROM_PKTCDVD is not set |
| 469 | # CONFIG_ATA_OVER_ETH is not set | 498 | # CONFIG_ATA_OVER_ETH is not set |
| 499 | # CONFIG_BLK_DEV_HD is not set | ||
| 470 | CONFIG_MISC_DEVICES=y | 500 | CONFIG_MISC_DEVICES=y |
| 471 | # CONFIG_PHANTOM is not set | 501 | # CONFIG_PHANTOM is not set |
| 472 | # CONFIG_EEPROM_93CX6 is not set | 502 | # CONFIG_EEPROM_93CX6 is not set |
| 473 | # CONFIG_SGI_IOC4 is not set | 503 | # CONFIG_SGI_IOC4 is not set |
| 474 | # CONFIG_TIFM_CORE is not set | 504 | # CONFIG_TIFM_CORE is not set |
| 475 | # CONFIG_ENCLOSURE_SERVICES is not set | 505 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 506 | # CONFIG_HP_ILO is not set | ||
| 476 | CONFIG_HAVE_IDE=y | 507 | CONFIG_HAVE_IDE=y |
| 477 | # CONFIG_IDE is not set | 508 | # CONFIG_IDE is not set |
| 478 | 509 | ||
| @@ -490,12 +521,15 @@ CONFIG_HAVE_IDE=y | |||
| 490 | # | 521 | # |
| 491 | # IEEE 1394 (FireWire) support | 522 | # IEEE 1394 (FireWire) support |
| 492 | # | 523 | # |
| 524 | |||
| 525 | # | ||
| 526 | # Enable only one of the two stacks, unless you know what you are doing | ||
| 527 | # | ||
| 493 | # CONFIG_FIREWIRE is not set | 528 | # CONFIG_FIREWIRE is not set |
| 494 | # CONFIG_IEEE1394 is not set | 529 | # CONFIG_IEEE1394 is not set |
| 495 | # CONFIG_I2O is not set | 530 | # CONFIG_I2O is not set |
| 496 | # CONFIG_MACINTOSH_DRIVERS is not set | 531 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 497 | CONFIG_NETDEVICES=y | 532 | CONFIG_NETDEVICES=y |
| 498 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 499 | # CONFIG_DUMMY is not set | 533 | # CONFIG_DUMMY is not set |
| 500 | # CONFIG_BONDING is not set | 534 | # CONFIG_BONDING is not set |
| 501 | # CONFIG_MACVLAN is not set | 535 | # CONFIG_MACVLAN is not set |
| @@ -526,7 +560,6 @@ CONFIG_NETDEV_1000=y | |||
| 526 | # CONFIG_DL2K is not set | 560 | # CONFIG_DL2K is not set |
| 527 | # CONFIG_E1000 is not set | 561 | # CONFIG_E1000 is not set |
| 528 | # CONFIG_E1000E is not set | 562 | # CONFIG_E1000E is not set |
| 529 | # CONFIG_E1000E_ENABLED is not set | ||
| 530 | # CONFIG_IP1000 is not set | 563 | # CONFIG_IP1000 is not set |
| 531 | # CONFIG_IGB is not set | 564 | # CONFIG_IGB is not set |
| 532 | # CONFIG_NS83820 is not set | 565 | # CONFIG_NS83820 is not set |
| @@ -541,12 +574,13 @@ CONFIG_NETDEV_1000=y | |||
| 541 | # CONFIG_BNX2 is not set | 574 | # CONFIG_BNX2 is not set |
| 542 | # CONFIG_GIANFAR is not set | 575 | # CONFIG_GIANFAR is not set |
| 543 | CONFIG_UCC_GETH=y | 576 | CONFIG_UCC_GETH=y |
| 544 | CONFIG_UGETH_NAPI=y | ||
| 545 | # CONFIG_UGETH_MAGIC_PACKET is not set | 577 | # CONFIG_UGETH_MAGIC_PACKET is not set |
| 546 | # CONFIG_UGETH_FILTERING is not set | 578 | # CONFIG_UGETH_FILTERING is not set |
| 547 | # CONFIG_UGETH_TX_ON_DEMAND is not set | 579 | # CONFIG_UGETH_TX_ON_DEMAND is not set |
| 580 | # CONFIG_MV643XX_ETH is not set | ||
| 548 | # CONFIG_QLA3XXX is not set | 581 | # CONFIG_QLA3XXX is not set |
| 549 | # CONFIG_ATL1 is not set | 582 | # CONFIG_ATL1 is not set |
| 583 | # CONFIG_ATL1E is not set | ||
| 550 | # CONFIG_NETDEV_10000 is not set | 584 | # CONFIG_NETDEV_10000 is not set |
| 551 | # CONFIG_TR is not set | 585 | # CONFIG_TR is not set |
| 552 | 586 | ||
| @@ -602,6 +636,7 @@ CONFIG_INPUT=y | |||
| 602 | # Character devices | 636 | # Character devices |
| 603 | # | 637 | # |
| 604 | CONFIG_VT=y | 638 | CONFIG_VT=y |
| 639 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 605 | CONFIG_VT_CONSOLE=y | 640 | CONFIG_VT_CONSOLE=y |
| 606 | CONFIG_HW_CONSOLE=y | 641 | CONFIG_HW_CONSOLE=y |
| 607 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 642 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| @@ -625,12 +660,15 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
| 625 | # CONFIG_SERIAL_UARTLITE is not set | 660 | # CONFIG_SERIAL_UARTLITE is not set |
| 626 | CONFIG_SERIAL_CORE=y | 661 | CONFIG_SERIAL_CORE=y |
| 627 | CONFIG_SERIAL_CORE_CONSOLE=y | 662 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 663 | # CONFIG_SERIAL_PMACZILOG is not set | ||
| 628 | # CONFIG_SERIAL_JSM is not set | 664 | # CONFIG_SERIAL_JSM is not set |
| 629 | # CONFIG_SERIAL_OF_PLATFORM is not set | 665 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 630 | CONFIG_SERIAL_QE=y | 666 | CONFIG_SERIAL_QE=y |
| 631 | CONFIG_UNIX98_PTYS=y | 667 | CONFIG_UNIX98_PTYS=y |
| 632 | CONFIG_LEGACY_PTYS=y | 668 | CONFIG_LEGACY_PTYS=y |
| 633 | CONFIG_LEGACY_PTY_COUNT=256 | 669 | CONFIG_LEGACY_PTY_COUNT=256 |
| 670 | # CONFIG_BRIQ_PANEL is not set | ||
| 671 | # CONFIG_HVC_RTAS is not set | ||
| 634 | # CONFIG_IPMI_HANDLER is not set | 672 | # CONFIG_IPMI_HANDLER is not set |
| 635 | CONFIG_HW_RANDOM=y | 673 | CONFIG_HW_RANDOM=y |
| 636 | # CONFIG_NVRAM is not set | 674 | # CONFIG_NVRAM is not set |
| @@ -643,43 +681,70 @@ CONFIG_DEVPORT=y | |||
| 643 | CONFIG_I2C=y | 681 | CONFIG_I2C=y |
| 644 | CONFIG_I2C_BOARDINFO=y | 682 | CONFIG_I2C_BOARDINFO=y |
| 645 | CONFIG_I2C_CHARDEV=y | 683 | CONFIG_I2C_CHARDEV=y |
| 684 | CONFIG_I2C_HELPER_AUTO=y | ||
| 646 | 685 | ||
| 647 | # | 686 | # |
| 648 | # I2C Hardware Bus support | 687 | # I2C Hardware Bus support |
| 649 | # | 688 | # |
| 689 | |||
| 690 | # | ||
| 691 | # PC SMBus host controller drivers | ||
| 692 | # | ||
| 650 | # CONFIG_I2C_ALI1535 is not set | 693 | # CONFIG_I2C_ALI1535 is not set |
| 651 | # CONFIG_I2C_ALI1563 is not set | 694 | # CONFIG_I2C_ALI1563 is not set |
| 652 | # CONFIG_I2C_ALI15X3 is not set | 695 | # CONFIG_I2C_ALI15X3 is not set |
| 653 | # CONFIG_I2C_AMD756 is not set | 696 | # CONFIG_I2C_AMD756 is not set |
| 654 | # CONFIG_I2C_AMD8111 is not set | 697 | # CONFIG_I2C_AMD8111 is not set |
| 655 | # CONFIG_I2C_GPIO is not set | ||
| 656 | # CONFIG_I2C_I801 is not set | 698 | # CONFIG_I2C_I801 is not set |
| 657 | # CONFIG_I2C_I810 is not set | 699 | # CONFIG_I2C_ISCH is not set |
| 658 | # CONFIG_I2C_PIIX4 is not set | 700 | # CONFIG_I2C_PIIX4 is not set |
| 659 | CONFIG_I2C_MPC=y | ||
| 660 | # CONFIG_I2C_NFORCE2 is not set | 701 | # CONFIG_I2C_NFORCE2 is not set |
| 661 | # CONFIG_I2C_OCORES is not set | ||
| 662 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 663 | # CONFIG_I2C_PROSAVAGE is not set | ||
| 664 | # CONFIG_I2C_SAVAGE4 is not set | ||
| 665 | # CONFIG_I2C_SIMTEC is not set | ||
| 666 | # CONFIG_I2C_SIS5595 is not set | 702 | # CONFIG_I2C_SIS5595 is not set |
| 667 | # CONFIG_I2C_SIS630 is not set | 703 | # CONFIG_I2C_SIS630 is not set |
| 668 | # CONFIG_I2C_SIS96X is not set | 704 | # CONFIG_I2C_SIS96X is not set |
| 669 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 670 | # CONFIG_I2C_STUB is not set | ||
| 671 | # CONFIG_I2C_VIA is not set | 705 | # CONFIG_I2C_VIA is not set |
| 672 | # CONFIG_I2C_VIAPRO is not set | 706 | # CONFIG_I2C_VIAPRO is not set |
| 707 | |||
| 708 | # | ||
| 709 | # Mac SMBus host controller drivers | ||
| 710 | # | ||
| 711 | # CONFIG_I2C_HYDRA is not set | ||
| 712 | CONFIG_I2C_POWERMAC=y | ||
| 713 | |||
| 714 | # | ||
| 715 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 716 | # | ||
| 717 | # CONFIG_I2C_GPIO is not set | ||
| 718 | CONFIG_I2C_MPC=y | ||
| 719 | # CONFIG_I2C_OCORES is not set | ||
| 720 | # CONFIG_I2C_SIMTEC is not set | ||
| 721 | |||
| 722 | # | ||
| 723 | # External I2C/SMBus adapter drivers | ||
| 724 | # | ||
| 725 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 726 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 727 | |||
| 728 | # | ||
| 729 | # Graphics adapter I2C/DDC channel drivers | ||
| 730 | # | ||
| 673 | # CONFIG_I2C_VOODOO3 is not set | 731 | # CONFIG_I2C_VOODOO3 is not set |
| 732 | |||
| 733 | # | ||
| 734 | # Other I2C/SMBus bus drivers | ||
| 735 | # | ||
| 674 | # CONFIG_I2C_PCA_PLATFORM is not set | 736 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 737 | # CONFIG_I2C_STUB is not set | ||
| 675 | 738 | ||
| 676 | # | 739 | # |
| 677 | # Miscellaneous I2C Chip support | 740 | # Miscellaneous I2C Chip support |
| 678 | # | 741 | # |
| 679 | # CONFIG_DS1682 is not set | 742 | # CONFIG_DS1682 is not set |
| 743 | # CONFIG_AT24 is not set | ||
| 680 | # CONFIG_SENSORS_EEPROM is not set | 744 | # CONFIG_SENSORS_EEPROM is not set |
| 681 | # CONFIG_SENSORS_PCF8574 is not set | 745 | # CONFIG_SENSORS_PCF8574 is not set |
| 682 | # CONFIG_PCF8575 is not set | 746 | # CONFIG_PCF8575 is not set |
| 747 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 683 | # CONFIG_SENSORS_PCF8591 is not set | 748 | # CONFIG_SENSORS_PCF8591 is not set |
| 684 | # CONFIG_TPS65010 is not set | 749 | # CONFIG_TPS65010 is not set |
| 685 | # CONFIG_SENSORS_MAX6875 is not set | 750 | # CONFIG_SENSORS_MAX6875 is not set |
| @@ -703,26 +768,33 @@ CONFIG_SPI_MPC83xx=y | |||
| 703 | # CONFIG_SPI_AT25 is not set | 768 | # CONFIG_SPI_AT25 is not set |
| 704 | CONFIG_SPI_SPIDEV=y | 769 | CONFIG_SPI_SPIDEV=y |
| 705 | # CONFIG_SPI_TLE62X0 is not set | 770 | # CONFIG_SPI_TLE62X0 is not set |
| 706 | CONFIG_HAVE_GPIO_LIB=y | 771 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
| 707 | 772 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | |
| 708 | # | 773 | CONFIG_GPIOLIB=y |
| 709 | # GPIO Support | 774 | # CONFIG_GPIO_SYSFS is not set |
| 710 | # | ||
| 711 | 775 | ||
| 712 | # | 776 | # |
| 713 | # I2C GPIO expanders: | 777 | # I2C GPIO expanders: |
| 714 | # | 778 | # |
| 779 | # CONFIG_GPIO_MAX732X is not set | ||
| 715 | # CONFIG_GPIO_PCA953X is not set | 780 | # CONFIG_GPIO_PCA953X is not set |
| 716 | # CONFIG_GPIO_PCF857X is not set | 781 | # CONFIG_GPIO_PCF857X is not set |
| 717 | 782 | ||
| 718 | # | 783 | # |
| 784 | # PCI GPIO expanders: | ||
| 785 | # | ||
| 786 | # CONFIG_GPIO_BT8XX is not set | ||
| 787 | |||
| 788 | # | ||
| 719 | # SPI GPIO expanders: | 789 | # SPI GPIO expanders: |
| 720 | # | 790 | # |
| 791 | # CONFIG_GPIO_MAX7301 is not set | ||
| 721 | # CONFIG_GPIO_MCP23S08 is not set | 792 | # CONFIG_GPIO_MCP23S08 is not set |
| 722 | # CONFIG_W1 is not set | 793 | # CONFIG_W1 is not set |
| 723 | # CONFIG_POWER_SUPPLY is not set | 794 | # CONFIG_POWER_SUPPLY is not set |
| 724 | # CONFIG_HWMON is not set | 795 | # CONFIG_HWMON is not set |
| 725 | # CONFIG_THERMAL is not set | 796 | # CONFIG_THERMAL is not set |
| 797 | # CONFIG_THERMAL_HWMON is not set | ||
| 726 | CONFIG_WATCHDOG=y | 798 | CONFIG_WATCHDOG=y |
| 727 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 799 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
| 728 | 800 | ||
| @@ -730,7 +802,9 @@ CONFIG_WATCHDOG=y | |||
| 730 | # Watchdog Device Drivers | 802 | # Watchdog Device Drivers |
| 731 | # | 803 | # |
| 732 | # CONFIG_SOFT_WATCHDOG is not set | 804 | # CONFIG_SOFT_WATCHDOG is not set |
| 733 | CONFIG_83xx_WDT=y | 805 | # CONFIG_ALIM7101_WDT is not set |
| 806 | # CONFIG_8xxx_WDT is not set | ||
| 807 | # CONFIG_WATCHDOG_RTAS is not set | ||
| 734 | 808 | ||
| 735 | # | 809 | # |
| 736 | # PCI-based Watchdog Cards | 810 | # PCI-based Watchdog Cards |
| @@ -747,9 +821,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 747 | # | 821 | # |
| 748 | # Multifunction device drivers | 822 | # Multifunction device drivers |
| 749 | # | 823 | # |
| 824 | # CONFIG_MFD_CORE is not set | ||
| 750 | # CONFIG_MFD_SM501 is not set | 825 | # CONFIG_MFD_SM501 is not set |
| 751 | # CONFIG_HTC_EGPIO is not set | ||
| 752 | # CONFIG_HTC_PASIC3 is not set | 826 | # CONFIG_HTC_PASIC3 is not set |
| 827 | # CONFIG_MFD_TMIO is not set | ||
| 753 | 828 | ||
| 754 | # | 829 | # |
| 755 | # Multimedia devices | 830 | # Multimedia devices |
| @@ -799,6 +874,9 @@ CONFIG_FB_MACMODES=y | |||
| 799 | # CONFIG_FB_PM2 is not set | 874 | # CONFIG_FB_PM2 is not set |
| 800 | # CONFIG_FB_CYBER2000 is not set | 875 | # CONFIG_FB_CYBER2000 is not set |
| 801 | CONFIG_FB_OF=y | 876 | CONFIG_FB_OF=y |
| 877 | # CONFIG_FB_CONTROL is not set | ||
| 878 | # CONFIG_FB_PLATINUM is not set | ||
| 879 | # CONFIG_FB_VALKYRIE is not set | ||
| 802 | # CONFIG_FB_CT65550 is not set | 880 | # CONFIG_FB_CT65550 is not set |
| 803 | # CONFIG_FB_ASILIANT is not set | 881 | # CONFIG_FB_ASILIANT is not set |
| 804 | # CONFIG_FB_IMSTT is not set | 882 | # CONFIG_FB_IMSTT is not set |
| @@ -821,6 +899,7 @@ CONFIG_FB_OF=y | |||
| 821 | # CONFIG_FB_TRIDENT is not set | 899 | # CONFIG_FB_TRIDENT is not set |
| 822 | # CONFIG_FB_ARK is not set | 900 | # CONFIG_FB_ARK is not set |
| 823 | # CONFIG_FB_PM3 is not set | 901 | # CONFIG_FB_PM3 is not set |
| 902 | # CONFIG_FB_CARMINE is not set | ||
| 824 | # CONFIG_FB_FSL_DIU is not set | 903 | # CONFIG_FB_FSL_DIU is not set |
| 825 | # CONFIG_FB_IBM_GXT4500 is not set | 904 | # CONFIG_FB_IBM_GXT4500 is not set |
| 826 | # CONFIG_FB_VIRTUAL is not set | 905 | # CONFIG_FB_VIRTUAL is not set |
| @@ -846,10 +925,6 @@ CONFIG_LOGO=y | |||
| 846 | # CONFIG_LOGO_LINUX_MONO is not set | 925 | # CONFIG_LOGO_LINUX_MONO is not set |
| 847 | CONFIG_LOGO_LINUX_VGA16=y | 926 | CONFIG_LOGO_LINUX_VGA16=y |
| 848 | CONFIG_LOGO_LINUX_CLUT224=y | 927 | CONFIG_LOGO_LINUX_CLUT224=y |
| 849 | |||
| 850 | # | ||
| 851 | # Sound | ||
| 852 | # | ||
| 853 | # CONFIG_SOUND is not set | 928 | # CONFIG_SOUND is not set |
| 854 | CONFIG_HID_SUPPORT=y | 929 | CONFIG_HID_SUPPORT=y |
| 855 | CONFIG_HID=y | 930 | CONFIG_HID=y |
| @@ -941,6 +1016,7 @@ CONFIG_JFFS2_RTIME=y | |||
| 941 | # CONFIG_CRAMFS is not set | 1016 | # CONFIG_CRAMFS is not set |
| 942 | # CONFIG_VXFS_FS is not set | 1017 | # CONFIG_VXFS_FS is not set |
| 943 | # CONFIG_MINIX_FS is not set | 1018 | # CONFIG_MINIX_FS is not set |
| 1019 | # CONFIG_OMFS_FS is not set | ||
| 944 | # CONFIG_HPFS_FS is not set | 1020 | # CONFIG_HPFS_FS is not set |
| 945 | # CONFIG_QNX4FS_FS is not set | 1021 | # CONFIG_QNX4FS_FS is not set |
| 946 | # CONFIG_ROMFS_FS is not set | 1022 | # CONFIG_ROMFS_FS is not set |
| @@ -951,14 +1027,13 @@ CONFIG_NFS_FS=y | |||
| 951 | CONFIG_NFS_V3=y | 1027 | CONFIG_NFS_V3=y |
| 952 | # CONFIG_NFS_V3_ACL is not set | 1028 | # CONFIG_NFS_V3_ACL is not set |
| 953 | CONFIG_NFS_V4=y | 1029 | CONFIG_NFS_V4=y |
| 954 | # CONFIG_NFSD is not set | ||
| 955 | CONFIG_ROOT_NFS=y | 1030 | CONFIG_ROOT_NFS=y |
| 1031 | # CONFIG_NFSD is not set | ||
| 956 | CONFIG_LOCKD=y | 1032 | CONFIG_LOCKD=y |
| 957 | CONFIG_LOCKD_V4=y | 1033 | CONFIG_LOCKD_V4=y |
| 958 | CONFIG_NFS_COMMON=y | 1034 | CONFIG_NFS_COMMON=y |
| 959 | CONFIG_SUNRPC=y | 1035 | CONFIG_SUNRPC=y |
| 960 | CONFIG_SUNRPC_GSS=y | 1036 | CONFIG_SUNRPC_GSS=y |
| 961 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 962 | CONFIG_RPCSEC_GSS_KRB5=y | 1037 | CONFIG_RPCSEC_GSS_KRB5=y |
| 963 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1038 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 964 | # CONFIG_SMB_FS is not set | 1039 | # CONFIG_SMB_FS is not set |
| @@ -998,6 +1073,7 @@ CONFIG_BITREVERSE=y | |||
| 998 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1073 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 999 | # CONFIG_CRC_CCITT is not set | 1074 | # CONFIG_CRC_CCITT is not set |
| 1000 | # CONFIG_CRC16 is not set | 1075 | # CONFIG_CRC16 is not set |
| 1076 | # CONFIG_CRC_T10DIF is not set | ||
| 1001 | # CONFIG_CRC_ITU_T is not set | 1077 | # CONFIG_CRC_ITU_T is not set |
| 1002 | CONFIG_CRC32=y | 1078 | CONFIG_CRC32=y |
| 1003 | # CONFIG_CRC7 is not set | 1079 | # CONFIG_CRC7 is not set |
| @@ -1025,12 +1101,22 @@ CONFIG_FRAME_WARN=1024 | |||
| 1025 | # CONFIG_SLUB_DEBUG_ON is not set | 1101 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1026 | # CONFIG_SLUB_STATS is not set | 1102 | # CONFIG_SLUB_STATS is not set |
| 1027 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1103 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1104 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 1105 | # CONFIG_LATENCYTOP is not set | ||
| 1106 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1107 | CONFIG_HAVE_FTRACE=y | ||
| 1108 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1109 | # CONFIG_FTRACE is not set | ||
| 1110 | # CONFIG_SCHED_TRACER is not set | ||
| 1111 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1028 | # CONFIG_SAMPLES is not set | 1112 | # CONFIG_SAMPLES is not set |
| 1113 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1029 | # CONFIG_IRQSTACKS is not set | 1114 | # CONFIG_IRQSTACKS is not set |
| 1115 | # CONFIG_BOOTX_TEXT is not set | ||
| 1030 | CONFIG_PPC_EARLY_DEBUG=y | 1116 | CONFIG_PPC_EARLY_DEBUG=y |
| 1031 | # CONFIG_PPC_EARLY_DEBUG_LPAR is not set | 1117 | # CONFIG_PPC_EARLY_DEBUG_LPAR is not set |
| 1032 | # CONFIG_PPC_EARLY_DEBUG_G5 is not set | 1118 | # CONFIG_PPC_EARLY_DEBUG_G5 is not set |
| 1033 | # CONFIG_PPC_EARLY_DEBUG_RTAS_PANEL is not set | 1119 | CONFIG_PPC_EARLY_DEBUG_RTAS_PANEL=y |
| 1034 | # CONFIG_PPC_EARLY_DEBUG_RTAS_CONSOLE is not set | 1120 | # CONFIG_PPC_EARLY_DEBUG_RTAS_CONSOLE is not set |
| 1035 | # CONFIG_PPC_EARLY_DEBUG_MAPLE is not set | 1121 | # CONFIG_PPC_EARLY_DEBUG_MAPLE is not set |
| 1036 | # CONFIG_PPC_EARLY_DEBUG_ISERIES is not set | 1122 | # CONFIG_PPC_EARLY_DEBUG_ISERIES is not set |
| @@ -1091,6 +1177,10 @@ CONFIG_CRYPTO_CBC=y | |||
| 1091 | # CONFIG_CRYPTO_MD4 is not set | 1177 | # CONFIG_CRYPTO_MD4 is not set |
| 1092 | CONFIG_CRYPTO_MD5=y | 1178 | CONFIG_CRYPTO_MD5=y |
| 1093 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1179 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 1180 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1181 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1182 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1183 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1094 | # CONFIG_CRYPTO_SHA1 is not set | 1184 | # CONFIG_CRYPTO_SHA1 is not set |
| 1095 | # CONFIG_CRYPTO_SHA256 is not set | 1185 | # CONFIG_CRYPTO_SHA256 is not set |
| 1096 | # CONFIG_CRYPTO_SHA512 is not set | 1186 | # CONFIG_CRYPTO_SHA512 is not set |
| @@ -1123,6 +1213,7 @@ CONFIG_CRYPTO_DES=y | |||
| 1123 | # CONFIG_CRYPTO_LZO is not set | 1213 | # CONFIG_CRYPTO_LZO is not set |
| 1124 | CONFIG_CRYPTO_HW=y | 1214 | CONFIG_CRYPTO_HW=y |
| 1125 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1215 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1216 | # CONFIG_CRYPTO_DEV_TALITOS is not set | ||
| 1126 | # CONFIG_PPC_CLOCK is not set | 1217 | # CONFIG_PPC_CLOCK is not set |
| 1127 | CONFIG_PPC_LIB_RHEAP=y | 1218 | CONFIG_PPC_LIB_RHEAP=y |
| 1128 | # CONFIG_VIRTUALIZATION is not set | 1219 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/83xx/mpc837x_mds_defconfig b/arch/powerpc/configs/83xx/mpc837x_mds_defconfig index 0f94d9f56beb..de472022aa81 100644 --- a/arch/powerpc/configs/83xx/mpc837x_mds_defconfig +++ b/arch/powerpc/configs/83xx/mpc837x_mds_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.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Mon Jun 9 08:52:28 2008 | 4 | # Thu Aug 21 00:52:23 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -16,6 +16,7 @@ CONFIG_6xx=y | |||
| 16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
| 17 | CONFIG_PPC_FPU=y | 17 | CONFIG_PPC_FPU=y |
| 18 | # CONFIG_FSL_EMB_PERFMON is not set | 18 | # CONFIG_FSL_EMB_PERFMON is not set |
| 19 | # CONFIG_ALTIVEC is not set | ||
| 19 | CONFIG_PPC_STD_MMU=y | 20 | CONFIG_PPC_STD_MMU=y |
| 20 | CONFIG_PPC_STD_MMU_32=y | 21 | CONFIG_PPC_STD_MMU_32=y |
| 21 | # CONFIG_PPC_MM_SLICES is not set | 22 | # CONFIG_PPC_MM_SLICES is not set |
| @@ -32,6 +33,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | 35 | CONFIG_STACKTRACE_SUPPORT=y |
| 36 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | 37 | CONFIG_LOCKDEP_SUPPORT=y |
| 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 39 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| @@ -51,6 +53,9 @@ CONFIG_PPC_UDBG_16550=y | |||
| 51 | CONFIG_AUDIT_ARCH=y | 53 | CONFIG_AUDIT_ARCH=y |
| 52 | CONFIG_GENERIC_BUG=y | 54 | CONFIG_GENERIC_BUG=y |
| 53 | CONFIG_DEFAULT_UIMAGE=y | 55 | CONFIG_DEFAULT_UIMAGE=y |
| 56 | CONFIG_HIBERNATE_32=y | ||
| 57 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
| 58 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
| 54 | # CONFIG_PPC_DCR_NATIVE is not set | 59 | # CONFIG_PPC_DCR_NATIVE is not set |
| 55 | # CONFIG_PPC_DCR_MMIO is not set | 60 | # CONFIG_PPC_DCR_MMIO is not set |
| 56 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 61 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| @@ -88,13 +93,13 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 88 | CONFIG_SYSCTL=y | 93 | CONFIG_SYSCTL=y |
| 89 | CONFIG_EMBEDDED=y | 94 | CONFIG_EMBEDDED=y |
| 90 | CONFIG_SYSCTL_SYSCALL=y | 95 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 92 | CONFIG_KALLSYMS=y | 96 | CONFIG_KALLSYMS=y |
| 93 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 97 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 94 | CONFIG_HOTPLUG=y | 98 | CONFIG_HOTPLUG=y |
| 95 | CONFIG_PRINTK=y | 99 | CONFIG_PRINTK=y |
| 96 | CONFIG_BUG=y | 100 | CONFIG_BUG=y |
| 97 | CONFIG_ELF_CORE=y | 101 | CONFIG_ELF_CORE=y |
| 102 | CONFIG_PCSPKR_PLATFORM=y | ||
| 98 | CONFIG_COMPAT_BRK=y | 103 | CONFIG_COMPAT_BRK=y |
| 99 | CONFIG_BASE_FULL=y | 104 | CONFIG_BASE_FULL=y |
| 100 | CONFIG_FUTEX=y | 105 | CONFIG_FUTEX=y |
| @@ -112,10 +117,16 @@ CONFIG_SLAB=y | |||
| 112 | # CONFIG_MARKERS is not set | 117 | # CONFIG_MARKERS is not set |
| 113 | CONFIG_HAVE_OPROFILE=y | 118 | CONFIG_HAVE_OPROFILE=y |
| 114 | # CONFIG_KPROBES is not set | 119 | # CONFIG_KPROBES is not set |
| 120 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 121 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 115 | CONFIG_HAVE_KPROBES=y | 122 | CONFIG_HAVE_KPROBES=y |
| 116 | CONFIG_HAVE_KRETPROBES=y | 123 | CONFIG_HAVE_KRETPROBES=y |
| 124 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 117 | # CONFIG_HAVE_DMA_ATTRS is not set | 125 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 126 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 127 | # CONFIG_HAVE_CLK is not set | ||
| 118 | CONFIG_PROC_PAGE_MONITOR=y | 128 | CONFIG_PROC_PAGE_MONITOR=y |
| 129 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 119 | CONFIG_SLABINFO=y | 130 | CONFIG_SLABINFO=y |
| 120 | CONFIG_RT_MUTEXES=y | 131 | CONFIG_RT_MUTEXES=y |
| 121 | # CONFIG_TINY_SHMEM is not set | 132 | # CONFIG_TINY_SHMEM is not set |
| @@ -126,12 +137,13 @@ CONFIG_MODULE_UNLOAD=y | |||
| 126 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 137 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 127 | # CONFIG_MODVERSIONS is not set | 138 | # CONFIG_MODVERSIONS is not set |
| 128 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 139 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 129 | # CONFIG_KMOD is not set | 140 | CONFIG_KMOD=y |
| 130 | CONFIG_BLOCK=y | 141 | CONFIG_BLOCK=y |
| 131 | # CONFIG_LBD is not set | 142 | # CONFIG_LBD is not set |
| 132 | # CONFIG_BLK_DEV_IO_TRACE is not set | 143 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 133 | # CONFIG_LSF is not set | 144 | # CONFIG_LSF is not set |
| 134 | # CONFIG_BLK_DEV_BSG is not set | 145 | # CONFIG_BLK_DEV_BSG is not set |
| 146 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 135 | 147 | ||
| 136 | # | 148 | # |
| 137 | # IO Schedulers | 149 | # IO Schedulers |
| @@ -150,37 +162,49 @@ CONFIG_CLASSIC_RCU=y | |||
| 150 | # | 162 | # |
| 151 | # Platform support | 163 | # Platform support |
| 152 | # | 164 | # |
| 153 | # CONFIG_PPC_MULTIPLATFORM is not set | 165 | CONFIG_PPC_MULTIPLATFORM=y |
| 154 | # CONFIG_PPC_82xx is not set | 166 | CONFIG_CLASSIC32=y |
| 155 | CONFIG_PPC_83xx=y | 167 | CONFIG_PPC_CHRP=y |
| 156 | # CONFIG_PPC_86xx is not set | 168 | # CONFIG_MPC5121_ADS is not set |
| 157 | # CONFIG_PPC_MPC512x is not set | 169 | # CONFIG_MPC5121_GENERIC is not set |
| 158 | # CONFIG_PPC_MPC5121 is not set | 170 | # CONFIG_PPC_MPC52xx is not set |
| 171 | CONFIG_PPC_PMAC=y | ||
| 159 | # CONFIG_PPC_CELL is not set | 172 | # CONFIG_PPC_CELL is not set |
| 160 | # CONFIG_PPC_CELL_NATIVE is not set | 173 | # CONFIG_PPC_CELL_NATIVE is not set |
| 174 | # CONFIG_PPC_82xx is not set | ||
| 161 | # CONFIG_PQ2ADS is not set | 175 | # CONFIG_PQ2ADS is not set |
| 162 | CONFIG_MPC83xx=y | 176 | CONFIG_PPC_83xx=y |
| 163 | # CONFIG_MPC831x_RDB is not set | 177 | # CONFIG_MPC831x_RDB is not set |
| 164 | # CONFIG_MPC832x_MDS is not set | 178 | # CONFIG_MPC832x_MDS is not set |
| 165 | # CONFIG_MPC832x_RDB is not set | 179 | # CONFIG_MPC832x_RDB is not set |
| 166 | # CONFIG_MPC834x_MDS is not set | 180 | # CONFIG_MPC834x_MDS is not set |
| 167 | # CONFIG_MPC834x_ITX is not set | 181 | # CONFIG_MPC834x_ITX is not set |
| 168 | # CONFIG_MPC836x_MDS is not set | 182 | # CONFIG_MPC836x_MDS is not set |
| 183 | # CONFIG_MPC836x_RDK is not set | ||
| 169 | CONFIG_MPC837x_MDS=y | 184 | CONFIG_MPC837x_MDS=y |
| 170 | # CONFIG_MPC837x_RDB is not set | 185 | # CONFIG_MPC837x_RDB is not set |
| 171 | # CONFIG_SBC834x is not set | 186 | # CONFIG_SBC834x is not set |
| 187 | # CONFIG_ASP834x is not set | ||
| 172 | CONFIG_PPC_MPC837x=y | 188 | CONFIG_PPC_MPC837x=y |
| 189 | # CONFIG_PPC_86xx is not set | ||
| 190 | # CONFIG_EMBEDDED6xx is not set | ||
| 191 | CONFIG_PPC_NATIVE=y | ||
| 192 | # CONFIG_UDBG_RTAS_CONSOLE is not set | ||
| 173 | CONFIG_IPIC=y | 193 | CONFIG_IPIC=y |
| 174 | # CONFIG_MPIC is not set | 194 | CONFIG_MPIC=y |
| 175 | # CONFIG_MPIC_WEIRD is not set | 195 | # CONFIG_MPIC_WEIRD is not set |
| 176 | # CONFIG_PPC_I8259 is not set | 196 | CONFIG_PPC_I8259=y |
| 177 | # CONFIG_PPC_RTAS is not set | 197 | CONFIG_PPC_RTAS=y |
| 198 | # CONFIG_RTAS_ERROR_LOGGING is not set | ||
| 199 | CONFIG_RTAS_PROC=y | ||
| 178 | # CONFIG_MMIO_NVRAM is not set | 200 | # CONFIG_MMIO_NVRAM is not set |
| 179 | # CONFIG_PPC_MPC106 is not set | 201 | CONFIG_PPC_MPC106=y |
| 180 | # CONFIG_PPC_970_NAP is not set | 202 | # CONFIG_PPC_970_NAP is not set |
| 181 | # CONFIG_PPC_INDIRECT_IO is not set | 203 | # CONFIG_PPC_INDIRECT_IO is not set |
| 182 | # CONFIG_GENERIC_IOMAP is not set | 204 | # CONFIG_GENERIC_IOMAP is not set |
| 183 | # CONFIG_CPU_FREQ is not set | 205 | # CONFIG_CPU_FREQ is not set |
| 206 | # CONFIG_PPC601_SYNC_FIX is not set | ||
| 207 | # CONFIG_TAU is not set | ||
| 184 | # CONFIG_FSL_ULI1575 is not set | 208 | # CONFIG_FSL_ULI1575 is not set |
| 185 | 209 | ||
| 186 | # | 210 | # |
| @@ -206,6 +230,7 @@ CONFIG_BINFMT_ELF=y | |||
| 206 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 230 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| 207 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 231 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
| 208 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 232 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
| 233 | # CONFIG_KEXEC is not set | ||
| 209 | CONFIG_ARCH_FLATMEM_ENABLE=y | 234 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 210 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 235 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
| 211 | CONFIG_SELECT_MEMORY_MODEL=y | 236 | CONFIG_SELECT_MEMORY_MODEL=y |
| @@ -218,6 +243,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 218 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 243 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 219 | CONFIG_PAGEFLAGS_EXTENDED=y | 244 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 220 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 245 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 246 | CONFIG_MIGRATION=y | ||
| 221 | # CONFIG_RESOURCES_64BIT is not set | 247 | # CONFIG_RESOURCES_64BIT is not set |
| 222 | CONFIG_ZONE_DMA_FLAG=1 | 248 | CONFIG_ZONE_DMA_FLAG=1 |
| 223 | CONFIG_BOUNCE=y | 249 | CONFIG_BOUNCE=y |
| @@ -225,6 +251,7 @@ CONFIG_VIRT_TO_BUS=y | |||
| 225 | CONFIG_FORCE_MAX_ZONEORDER=11 | 251 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 226 | CONFIG_PROC_DEVICETREE=y | 252 | CONFIG_PROC_DEVICETREE=y |
| 227 | # CONFIG_CMDLINE_BOOL is not set | 253 | # CONFIG_CMDLINE_BOOL is not set |
| 254 | CONFIG_EXTRA_TARGETS="" | ||
| 228 | # CONFIG_PM is not set | 255 | # CONFIG_PM is not set |
| 229 | CONFIG_SECCOMP=y | 256 | CONFIG_SECCOMP=y |
| 230 | CONFIG_ISA_DMA_API=y | 257 | CONFIG_ISA_DMA_API=y |
| @@ -232,15 +259,22 @@ CONFIG_ISA_DMA_API=y | |||
| 232 | # | 259 | # |
| 233 | # Bus options | 260 | # Bus options |
| 234 | # | 261 | # |
| 262 | # CONFIG_ISA is not set | ||
| 235 | CONFIG_ZONE_DMA=y | 263 | CONFIG_ZONE_DMA=y |
| 236 | CONFIG_GENERIC_ISA_DMA=y | 264 | CONFIG_GENERIC_ISA_DMA=y |
| 237 | CONFIG_PPC_INDIRECT_PCI=y | 265 | CONFIG_PPC_INDIRECT_PCI=y |
| 238 | CONFIG_FSL_SOC=y | 266 | CONFIG_FSL_SOC=y |
| 239 | # CONFIG_PCI is not set | 267 | CONFIG_FSL_PCI=y |
| 240 | # CONFIG_PCI_DOMAINS is not set | 268 | CONFIG_PPC_PCI_CHOICE=y |
| 241 | # CONFIG_PCI_SYSCALL is not set | 269 | CONFIG_PCI=y |
| 242 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 270 | CONFIG_PCI_DOMAINS=y |
| 271 | CONFIG_PCI_SYSCALL=y | ||
| 272 | # CONFIG_PCIEPORTBUS is not set | ||
| 273 | CONFIG_ARCH_SUPPORTS_MSI=y | ||
| 274 | # CONFIG_PCI_MSI is not set | ||
| 275 | CONFIG_PCI_LEGACY=y | ||
| 243 | # CONFIG_PCCARD is not set | 276 | # CONFIG_PCCARD is not set |
| 277 | # CONFIG_HOTPLUG_PCI is not set | ||
| 244 | # CONFIG_HAS_RAPIDIO is not set | 278 | # CONFIG_HAS_RAPIDIO is not set |
| 245 | 279 | ||
| 246 | # | 280 | # |
| @@ -256,10 +290,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
| 256 | CONFIG_KERNEL_START=0xc0000000 | 290 | CONFIG_KERNEL_START=0xc0000000 |
| 257 | CONFIG_PHYSICAL_START=0x00000000 | 291 | CONFIG_PHYSICAL_START=0x00000000 |
| 258 | CONFIG_TASK_SIZE=0xc0000000 | 292 | CONFIG_TASK_SIZE=0xc0000000 |
| 259 | |||
| 260 | # | ||
| 261 | # Networking | ||
| 262 | # | ||
| 263 | CONFIG_NET=y | 293 | CONFIG_NET=y |
| 264 | 294 | ||
| 265 | # | 295 | # |
| @@ -360,19 +390,30 @@ CONFIG_OF_I2C=y | |||
| 360 | # CONFIG_PARPORT is not set | 390 | # CONFIG_PARPORT is not set |
| 361 | CONFIG_BLK_DEV=y | 391 | CONFIG_BLK_DEV=y |
| 362 | # CONFIG_BLK_DEV_FD is not set | 392 | # CONFIG_BLK_DEV_FD is not set |
| 393 | # CONFIG_MAC_FLOPPY is not set | ||
| 394 | # CONFIG_BLK_CPQ_DA is not set | ||
| 395 | # CONFIG_BLK_CPQ_CISS_DA is not set | ||
| 396 | # CONFIG_BLK_DEV_DAC960 is not set | ||
| 397 | # CONFIG_BLK_DEV_UMEM is not set | ||
| 363 | # CONFIG_BLK_DEV_COW_COMMON is not set | 398 | # CONFIG_BLK_DEV_COW_COMMON is not set |
| 364 | CONFIG_BLK_DEV_LOOP=y | 399 | CONFIG_BLK_DEV_LOOP=y |
| 365 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 400 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set |
| 366 | # CONFIG_BLK_DEV_NBD is not set | 401 | # CONFIG_BLK_DEV_NBD is not set |
| 402 | # CONFIG_BLK_DEV_SX8 is not set | ||
| 367 | CONFIG_BLK_DEV_RAM=y | 403 | CONFIG_BLK_DEV_RAM=y |
| 368 | CONFIG_BLK_DEV_RAM_COUNT=16 | 404 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 369 | CONFIG_BLK_DEV_RAM_SIZE=32768 | 405 | CONFIG_BLK_DEV_RAM_SIZE=32768 |
| 370 | # CONFIG_BLK_DEV_XIP is not set | 406 | # CONFIG_BLK_DEV_XIP is not set |
| 371 | # CONFIG_CDROM_PKTCDVD is not set | 407 | # CONFIG_CDROM_PKTCDVD is not set |
| 372 | # CONFIG_ATA_OVER_ETH is not set | 408 | # CONFIG_ATA_OVER_ETH is not set |
| 409 | # CONFIG_BLK_DEV_HD is not set | ||
| 373 | CONFIG_MISC_DEVICES=y | 410 | CONFIG_MISC_DEVICES=y |
| 411 | # CONFIG_PHANTOM is not set | ||
| 374 | # CONFIG_EEPROM_93CX6 is not set | 412 | # CONFIG_EEPROM_93CX6 is not set |
| 413 | # CONFIG_SGI_IOC4 is not set | ||
| 414 | # CONFIG_TIFM_CORE is not set | ||
| 375 | # CONFIG_ENCLOSURE_SERVICES is not set | 415 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 416 | # CONFIG_HP_ILO is not set | ||
| 376 | CONFIG_HAVE_IDE=y | 417 | CONFIG_HAVE_IDE=y |
| 377 | # CONFIG_IDE is not set | 418 | # CONFIG_IDE is not set |
| 378 | 419 | ||
| @@ -415,24 +456,128 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 415 | # CONFIG_SCSI_SRP_ATTRS is not set | 456 | # CONFIG_SCSI_SRP_ATTRS is not set |
| 416 | CONFIG_SCSI_LOWLEVEL=y | 457 | CONFIG_SCSI_LOWLEVEL=y |
| 417 | # CONFIG_ISCSI_TCP is not set | 458 | # CONFIG_ISCSI_TCP is not set |
| 459 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | ||
| 460 | # CONFIG_SCSI_3W_9XXX is not set | ||
| 461 | # CONFIG_SCSI_ACARD is not set | ||
| 462 | # CONFIG_SCSI_AACRAID is not set | ||
| 463 | # CONFIG_SCSI_AIC7XXX is not set | ||
| 464 | # CONFIG_SCSI_AIC7XXX_OLD is not set | ||
| 465 | # CONFIG_SCSI_AIC79XX is not set | ||
| 466 | # CONFIG_SCSI_AIC94XX is not set | ||
| 467 | # CONFIG_SCSI_DPT_I2O is not set | ||
| 468 | # CONFIG_SCSI_ADVANSYS is not set | ||
| 469 | # CONFIG_SCSI_ARCMSR is not set | ||
| 470 | # CONFIG_MEGARAID_NEWGEN is not set | ||
| 471 | # CONFIG_MEGARAID_LEGACY is not set | ||
| 472 | # CONFIG_MEGARAID_SAS is not set | ||
| 473 | # CONFIG_SCSI_HPTIOP is not set | ||
| 474 | # CONFIG_SCSI_BUSLOGIC is not set | ||
| 475 | # CONFIG_SCSI_DMX3191D is not set | ||
| 476 | # CONFIG_SCSI_EATA is not set | ||
| 477 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | ||
| 478 | # CONFIG_SCSI_GDTH is not set | ||
| 479 | # CONFIG_SCSI_IPS is not set | ||
| 480 | # CONFIG_SCSI_INITIO is not set | ||
| 481 | # CONFIG_SCSI_INIA100 is not set | ||
| 482 | # CONFIG_SCSI_MVSAS is not set | ||
| 483 | # CONFIG_SCSI_STEX is not set | ||
| 484 | # CONFIG_SCSI_SYM53C8XX_2 is not set | ||
| 485 | # CONFIG_SCSI_IPR is not set | ||
| 486 | # CONFIG_SCSI_QLOGIC_1280 is not set | ||
| 487 | # CONFIG_SCSI_QLA_FC is not set | ||
| 488 | # CONFIG_SCSI_QLA_ISCSI is not set | ||
| 489 | # CONFIG_SCSI_LPFC is not set | ||
| 490 | # CONFIG_SCSI_DC395x is not set | ||
| 491 | # CONFIG_SCSI_DC390T is not set | ||
| 492 | # CONFIG_SCSI_NSP32 is not set | ||
| 418 | # CONFIG_SCSI_DEBUG is not set | 493 | # CONFIG_SCSI_DEBUG is not set |
| 494 | # CONFIG_SCSI_MESH is not set | ||
| 495 | # CONFIG_SCSI_MAC53C94 is not set | ||
| 496 | # CONFIG_SCSI_SRP is not set | ||
| 497 | # CONFIG_SCSI_DH is not set | ||
| 419 | CONFIG_ATA=y | 498 | CONFIG_ATA=y |
| 420 | # CONFIG_ATA_NONSTANDARD is not set | 499 | # CONFIG_ATA_NONSTANDARD is not set |
| 421 | CONFIG_SATA_PMP=y | 500 | CONFIG_SATA_PMP=y |
| 501 | # CONFIG_SATA_AHCI is not set | ||
| 502 | # CONFIG_SATA_SIL24 is not set | ||
| 422 | CONFIG_SATA_FSL=y | 503 | CONFIG_SATA_FSL=y |
| 423 | CONFIG_ATA_SFF=y | 504 | CONFIG_ATA_SFF=y |
| 505 | # CONFIG_SATA_SVW is not set | ||
| 506 | # CONFIG_ATA_PIIX is not set | ||
| 424 | # CONFIG_SATA_MV is not set | 507 | # CONFIG_SATA_MV is not set |
| 508 | # CONFIG_SATA_NV is not set | ||
| 509 | # CONFIG_PDC_ADMA is not set | ||
| 510 | # CONFIG_SATA_QSTOR is not set | ||
| 511 | # CONFIG_SATA_PROMISE is not set | ||
| 512 | # CONFIG_SATA_SX4 is not set | ||
| 513 | # CONFIG_SATA_SIL is not set | ||
| 514 | # CONFIG_SATA_SIS is not set | ||
| 515 | # CONFIG_SATA_ULI is not set | ||
| 516 | # CONFIG_SATA_VIA is not set | ||
| 517 | # CONFIG_SATA_VITESSE is not set | ||
| 518 | # CONFIG_SATA_INIC162X is not set | ||
| 519 | # CONFIG_PATA_ALI is not set | ||
| 520 | # CONFIG_PATA_AMD is not set | ||
| 521 | # CONFIG_PATA_ARTOP is not set | ||
| 522 | # CONFIG_PATA_ATIIXP is not set | ||
| 523 | # CONFIG_PATA_CMD640_PCI is not set | ||
| 524 | # CONFIG_PATA_CMD64X is not set | ||
| 525 | # CONFIG_PATA_CS5520 is not set | ||
| 526 | # CONFIG_PATA_CS5530 is not set | ||
| 527 | # CONFIG_PATA_CYPRESS is not set | ||
| 528 | # CONFIG_PATA_EFAR is not set | ||
| 529 | # CONFIG_ATA_GENERIC is not set | ||
| 530 | # CONFIG_PATA_HPT366 is not set | ||
| 531 | # CONFIG_PATA_HPT37X is not set | ||
| 532 | # CONFIG_PATA_HPT3X2N is not set | ||
| 533 | # CONFIG_PATA_HPT3X3 is not set | ||
| 534 | # CONFIG_PATA_IT821X is not set | ||
| 535 | # CONFIG_PATA_IT8213 is not set | ||
| 536 | # CONFIG_PATA_JMICRON is not set | ||
| 537 | # CONFIG_PATA_TRIFLEX is not set | ||
| 538 | # CONFIG_PATA_MARVELL is not set | ||
| 539 | # CONFIG_PATA_MPIIX is not set | ||
| 540 | # CONFIG_PATA_OLDPIIX is not set | ||
| 541 | # CONFIG_PATA_NETCELL is not set | ||
| 542 | # CONFIG_PATA_NINJA32 is not set | ||
| 543 | # CONFIG_PATA_NS87410 is not set | ||
| 544 | # CONFIG_PATA_NS87415 is not set | ||
| 545 | # CONFIG_PATA_OPTI is not set | ||
| 546 | # CONFIG_PATA_OPTIDMA is not set | ||
| 547 | # CONFIG_PATA_PDC_OLD is not set | ||
| 548 | # CONFIG_PATA_RADISYS is not set | ||
| 549 | # CONFIG_PATA_RZ1000 is not set | ||
| 550 | # CONFIG_PATA_SC1200 is not set | ||
| 551 | # CONFIG_PATA_SERVERWORKS is not set | ||
| 552 | # CONFIG_PATA_PDC2027X is not set | ||
| 553 | # CONFIG_PATA_SIL680 is not set | ||
| 554 | # CONFIG_PATA_SIS is not set | ||
| 555 | # CONFIG_PATA_VIA is not set | ||
| 556 | # CONFIG_PATA_WINBOND is not set | ||
| 425 | # CONFIG_PATA_PLATFORM is not set | 557 | # CONFIG_PATA_PLATFORM is not set |
| 558 | # CONFIG_PATA_SCH is not set | ||
| 426 | # CONFIG_MD is not set | 559 | # CONFIG_MD is not set |
| 560 | # CONFIG_FUSION is not set | ||
| 561 | |||
| 562 | # | ||
| 563 | # IEEE 1394 (FireWire) support | ||
| 564 | # | ||
| 565 | |||
| 566 | # | ||
| 567 | # Enable only one of the two stacks, unless you know what you are doing | ||
| 568 | # | ||
| 569 | # CONFIG_FIREWIRE is not set | ||
| 570 | # CONFIG_IEEE1394 is not set | ||
| 571 | # CONFIG_I2O is not set | ||
| 427 | # CONFIG_MACINTOSH_DRIVERS is not set | 572 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 428 | CONFIG_NETDEVICES=y | 573 | CONFIG_NETDEVICES=y |
| 429 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 430 | # CONFIG_DUMMY is not set | 574 | # CONFIG_DUMMY is not set |
| 431 | # CONFIG_BONDING is not set | 575 | # CONFIG_BONDING is not set |
| 432 | # CONFIG_MACVLAN is not set | 576 | # CONFIG_MACVLAN is not set |
| 433 | # CONFIG_EQUALIZER is not set | 577 | # CONFIG_EQUALIZER is not set |
| 434 | # CONFIG_TUN is not set | 578 | # CONFIG_TUN is not set |
| 435 | # CONFIG_VETH is not set | 579 | # CONFIG_VETH is not set |
| 580 | # CONFIG_ARCNET is not set | ||
| 436 | CONFIG_PHYLIB=y | 581 | CONFIG_PHYLIB=y |
| 437 | 582 | ||
| 438 | # | 583 | # |
| @@ -452,16 +597,56 @@ CONFIG_MARVELL_PHY=y | |||
| 452 | # CONFIG_MDIO_BITBANG is not set | 597 | # CONFIG_MDIO_BITBANG is not set |
| 453 | CONFIG_NET_ETHERNET=y | 598 | CONFIG_NET_ETHERNET=y |
| 454 | CONFIG_MII=y | 599 | CONFIG_MII=y |
| 600 | # CONFIG_MACE is not set | ||
| 601 | # CONFIG_BMAC is not set | ||
| 602 | # CONFIG_HAPPYMEAL is not set | ||
| 603 | # CONFIG_SUNGEM is not set | ||
| 604 | # CONFIG_CASSINI is not set | ||
| 605 | # CONFIG_NET_VENDOR_3COM is not set | ||
| 606 | # CONFIG_NET_TULIP is not set | ||
| 607 | # CONFIG_HP100 is not set | ||
| 455 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 608 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
| 456 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 609 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 457 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 610 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| 458 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 611 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
| 612 | # CONFIG_NET_PCI is not set | ||
| 459 | # CONFIG_B44 is not set | 613 | # CONFIG_B44 is not set |
| 460 | CONFIG_NETDEV_1000=y | 614 | CONFIG_NETDEV_1000=y |
| 461 | # CONFIG_E1000E_ENABLED is not set | 615 | # CONFIG_ACENIC is not set |
| 616 | # CONFIG_DL2K is not set | ||
| 617 | # CONFIG_E1000 is not set | ||
| 618 | # CONFIG_E1000E is not set | ||
| 619 | # CONFIG_IP1000 is not set | ||
| 620 | # CONFIG_IGB is not set | ||
| 621 | # CONFIG_NS83820 is not set | ||
| 622 | # CONFIG_HAMACHI is not set | ||
| 623 | # CONFIG_YELLOWFIN is not set | ||
| 624 | # CONFIG_R8169 is not set | ||
| 625 | # CONFIG_SIS190 is not set | ||
| 626 | # CONFIG_SKGE is not set | ||
| 627 | # CONFIG_SKY2 is not set | ||
| 628 | # CONFIG_VIA_VELOCITY is not set | ||
| 629 | # CONFIG_TIGON3 is not set | ||
| 630 | # CONFIG_BNX2 is not set | ||
| 462 | CONFIG_GIANFAR=y | 631 | CONFIG_GIANFAR=y |
| 463 | # CONFIG_GFAR_NAPI is not set | 632 | # CONFIG_MV643XX_ETH is not set |
| 633 | # CONFIG_QLA3XXX is not set | ||
| 634 | # CONFIG_ATL1 is not set | ||
| 635 | # CONFIG_ATL1E is not set | ||
| 464 | CONFIG_NETDEV_10000=y | 636 | CONFIG_NETDEV_10000=y |
| 637 | # CONFIG_CHELSIO_T1 is not set | ||
| 638 | # CONFIG_CHELSIO_T3 is not set | ||
| 639 | # CONFIG_IXGBE is not set | ||
| 640 | # CONFIG_IXGB is not set | ||
| 641 | # CONFIG_S2IO is not set | ||
| 642 | # CONFIG_MYRI10GE is not set | ||
| 643 | # CONFIG_NETXEN_NIC is not set | ||
| 644 | # CONFIG_NIU is not set | ||
| 645 | # CONFIG_MLX4_CORE is not set | ||
| 646 | # CONFIG_TEHUTI is not set | ||
| 647 | # CONFIG_BNX2X is not set | ||
| 648 | # CONFIG_SFC is not set | ||
| 649 | # CONFIG_TR is not set | ||
| 465 | 650 | ||
| 466 | # | 651 | # |
| 467 | # Wireless LAN | 652 | # Wireless LAN |
| @@ -470,8 +655,11 @@ CONFIG_NETDEV_10000=y | |||
| 470 | # CONFIG_WLAN_80211 is not set | 655 | # CONFIG_WLAN_80211 is not set |
| 471 | # CONFIG_IWLWIFI_LEDS is not set | 656 | # CONFIG_IWLWIFI_LEDS is not set |
| 472 | # CONFIG_WAN is not set | 657 | # CONFIG_WAN is not set |
| 658 | # CONFIG_FDDI is not set | ||
| 659 | # CONFIG_HIPPI is not set | ||
| 473 | # CONFIG_PPP is not set | 660 | # CONFIG_PPP is not set |
| 474 | # CONFIG_SLIP is not set | 661 | # CONFIG_SLIP is not set |
| 662 | # CONFIG_NET_FC is not set | ||
| 475 | # CONFIG_NETCONSOLE is not set | 663 | # CONFIG_NETCONSOLE is not set |
| 476 | # CONFIG_NETPOLL is not set | 664 | # CONFIG_NETPOLL is not set |
| 477 | # CONFIG_NET_POLL_CONTROLLER is not set | 665 | # CONFIG_NET_POLL_CONTROLLER is not set |
| @@ -515,12 +703,14 @@ CONFIG_INPUT=y | |||
| 515 | # CONFIG_VT is not set | 703 | # CONFIG_VT is not set |
| 516 | CONFIG_DEVKMEM=y | 704 | CONFIG_DEVKMEM=y |
| 517 | # CONFIG_SERIAL_NONSTANDARD is not set | 705 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 706 | # CONFIG_NOZOMI is not set | ||
| 518 | 707 | ||
| 519 | # | 708 | # |
| 520 | # Serial drivers | 709 | # Serial drivers |
| 521 | # | 710 | # |
| 522 | CONFIG_SERIAL_8250=y | 711 | CONFIG_SERIAL_8250=y |
| 523 | CONFIG_SERIAL_8250_CONSOLE=y | 712 | CONFIG_SERIAL_8250_CONSOLE=y |
| 713 | CONFIG_SERIAL_8250_PCI=y | ||
| 524 | CONFIG_SERIAL_8250_NR_UARTS=4 | 714 | CONFIG_SERIAL_8250_NR_UARTS=4 |
| 525 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | 715 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 |
| 526 | # CONFIG_SERIAL_8250_EXTENDED is not set | 716 | # CONFIG_SERIAL_8250_EXTENDED is not set |
| @@ -531,40 +721,90 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
| 531 | # CONFIG_SERIAL_UARTLITE is not set | 721 | # CONFIG_SERIAL_UARTLITE is not set |
| 532 | CONFIG_SERIAL_CORE=y | 722 | CONFIG_SERIAL_CORE=y |
| 533 | CONFIG_SERIAL_CORE_CONSOLE=y | 723 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 724 | # CONFIG_SERIAL_PMACZILOG is not set | ||
| 725 | # CONFIG_SERIAL_JSM is not set | ||
| 534 | # CONFIG_SERIAL_OF_PLATFORM is not set | 726 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 535 | CONFIG_UNIX98_PTYS=y | 727 | CONFIG_UNIX98_PTYS=y |
| 536 | CONFIG_LEGACY_PTYS=y | 728 | CONFIG_LEGACY_PTYS=y |
| 537 | CONFIG_LEGACY_PTY_COUNT=256 | 729 | CONFIG_LEGACY_PTY_COUNT=256 |
| 730 | # CONFIG_BRIQ_PANEL is not set | ||
| 731 | # CONFIG_HVC_RTAS is not set | ||
| 538 | # CONFIG_IPMI_HANDLER is not set | 732 | # CONFIG_IPMI_HANDLER is not set |
| 539 | # CONFIG_HW_RANDOM is not set | 733 | # CONFIG_HW_RANDOM is not set |
| 540 | # CONFIG_NVRAM is not set | 734 | # CONFIG_NVRAM is not set |
| 541 | CONFIG_GEN_RTC=y | 735 | CONFIG_GEN_RTC=y |
| 542 | # CONFIG_GEN_RTC_X is not set | 736 | # CONFIG_GEN_RTC_X is not set |
| 543 | # CONFIG_R3964 is not set | 737 | # CONFIG_R3964 is not set |
| 738 | # CONFIG_APPLICOM is not set | ||
| 544 | # CONFIG_RAW_DRIVER is not set | 739 | # CONFIG_RAW_DRIVER is not set |
| 545 | # CONFIG_TCG_TPM is not set | 740 | # CONFIG_TCG_TPM is not set |
| 741 | CONFIG_DEVPORT=y | ||
| 546 | CONFIG_I2C=y | 742 | CONFIG_I2C=y |
| 547 | CONFIG_I2C_BOARDINFO=y | 743 | CONFIG_I2C_BOARDINFO=y |
| 548 | CONFIG_I2C_CHARDEV=y | 744 | CONFIG_I2C_CHARDEV=y |
| 745 | CONFIG_I2C_HELPER_AUTO=y | ||
| 549 | 746 | ||
| 550 | # | 747 | # |
| 551 | # I2C Hardware Bus support | 748 | # I2C Hardware Bus support |
| 552 | # | 749 | # |
| 750 | |||
| 751 | # | ||
| 752 | # PC SMBus host controller drivers | ||
| 753 | # | ||
| 754 | # CONFIG_I2C_ALI1535 is not set | ||
| 755 | # CONFIG_I2C_ALI1563 is not set | ||
| 756 | # CONFIG_I2C_ALI15X3 is not set | ||
| 757 | # CONFIG_I2C_AMD756 is not set | ||
| 758 | # CONFIG_I2C_AMD8111 is not set | ||
| 759 | # CONFIG_I2C_I801 is not set | ||
| 760 | # CONFIG_I2C_ISCH is not set | ||
| 761 | # CONFIG_I2C_PIIX4 is not set | ||
| 762 | # CONFIG_I2C_NFORCE2 is not set | ||
| 763 | # CONFIG_I2C_SIS5595 is not set | ||
| 764 | # CONFIG_I2C_SIS630 is not set | ||
| 765 | # CONFIG_I2C_SIS96X is not set | ||
| 766 | # CONFIG_I2C_VIA is not set | ||
| 767 | # CONFIG_I2C_VIAPRO is not set | ||
| 768 | |||
| 769 | # | ||
| 770 | # Mac SMBus host controller drivers | ||
| 771 | # | ||
| 772 | # CONFIG_I2C_HYDRA is not set | ||
| 773 | CONFIG_I2C_POWERMAC=y | ||
| 774 | |||
| 775 | # | ||
| 776 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 777 | # | ||
| 553 | CONFIG_I2C_MPC=y | 778 | CONFIG_I2C_MPC=y |
| 554 | # CONFIG_I2C_OCORES is not set | 779 | # CONFIG_I2C_OCORES is not set |
| 555 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 556 | # CONFIG_I2C_SIMTEC is not set | 780 | # CONFIG_I2C_SIMTEC is not set |
| 781 | |||
| 782 | # | ||
| 783 | # External I2C/SMBus adapter drivers | ||
| 784 | # | ||
| 785 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 557 | # CONFIG_I2C_TAOS_EVM is not set | 786 | # CONFIG_I2C_TAOS_EVM is not set |
| 558 | # CONFIG_I2C_STUB is not set | 787 | |
| 788 | # | ||
| 789 | # Graphics adapter I2C/DDC channel drivers | ||
| 790 | # | ||
| 791 | # CONFIG_I2C_VOODOO3 is not set | ||
| 792 | |||
| 793 | # | ||
| 794 | # Other I2C/SMBus bus drivers | ||
| 795 | # | ||
| 559 | # CONFIG_I2C_PCA_PLATFORM is not set | 796 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 797 | # CONFIG_I2C_STUB is not set | ||
| 560 | 798 | ||
| 561 | # | 799 | # |
| 562 | # Miscellaneous I2C Chip support | 800 | # Miscellaneous I2C Chip support |
| 563 | # | 801 | # |
| 564 | # CONFIG_DS1682 is not set | 802 | # CONFIG_DS1682 is not set |
| 803 | # CONFIG_AT24 is not set | ||
| 565 | # CONFIG_SENSORS_EEPROM is not set | 804 | # CONFIG_SENSORS_EEPROM is not set |
| 566 | # CONFIG_SENSORS_PCF8574 is not set | 805 | # CONFIG_SENSORS_PCF8574 is not set |
| 567 | # CONFIG_PCF8575 is not set | 806 | # CONFIG_PCF8575 is not set |
| 807 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 568 | # CONFIG_SENSORS_PCF8591 is not set | 808 | # CONFIG_SENSORS_PCF8591 is not set |
| 569 | # CONFIG_SENSORS_MAX6875 is not set | 809 | # CONFIG_SENSORS_MAX6875 is not set |
| 570 | # CONFIG_SENSORS_TSL2550 is not set | 810 | # CONFIG_SENSORS_TSL2550 is not set |
| @@ -573,10 +813,13 @@ CONFIG_I2C_MPC=y | |||
| 573 | # CONFIG_I2C_DEBUG_BUS is not set | 813 | # CONFIG_I2C_DEBUG_BUS is not set |
| 574 | # CONFIG_I2C_DEBUG_CHIP is not set | 814 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 575 | # CONFIG_SPI is not set | 815 | # CONFIG_SPI is not set |
| 816 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 817 | # CONFIG_GPIOLIB is not set | ||
| 576 | # CONFIG_W1 is not set | 818 | # CONFIG_W1 is not set |
| 577 | # CONFIG_POWER_SUPPLY is not set | 819 | # CONFIG_POWER_SUPPLY is not set |
| 578 | CONFIG_HWMON=y | 820 | CONFIG_HWMON=y |
| 579 | # CONFIG_HWMON_VID is not set | 821 | # CONFIG_HWMON_VID is not set |
| 822 | # CONFIG_SENSORS_AD7414 is not set | ||
| 580 | # CONFIG_SENSORS_AD7418 is not set | 823 | # CONFIG_SENSORS_AD7418 is not set |
| 581 | # CONFIG_SENSORS_ADM1021 is not set | 824 | # CONFIG_SENSORS_ADM1021 is not set |
| 582 | # CONFIG_SENSORS_ADM1025 is not set | 825 | # CONFIG_SENSORS_ADM1025 is not set |
| @@ -586,8 +829,10 @@ CONFIG_HWMON=y | |||
| 586 | # CONFIG_SENSORS_ADM9240 is not set | 829 | # CONFIG_SENSORS_ADM9240 is not set |
| 587 | # CONFIG_SENSORS_ADT7470 is not set | 830 | # CONFIG_SENSORS_ADT7470 is not set |
| 588 | # CONFIG_SENSORS_ADT7473 is not set | 831 | # CONFIG_SENSORS_ADT7473 is not set |
| 832 | # CONFIG_SENSORS_AMS is not set | ||
| 589 | # CONFIG_SENSORS_ATXP1 is not set | 833 | # CONFIG_SENSORS_ATXP1 is not set |
| 590 | # CONFIG_SENSORS_DS1621 is not set | 834 | # CONFIG_SENSORS_DS1621 is not set |
| 835 | # CONFIG_SENSORS_I5K_AMB is not set | ||
| 591 | # CONFIG_SENSORS_F71805F is not set | 836 | # CONFIG_SENSORS_F71805F is not set |
| 592 | # CONFIG_SENSORS_F71882FG is not set | 837 | # CONFIG_SENSORS_F71882FG is not set |
| 593 | # CONFIG_SENSORS_F75375S is not set | 838 | # CONFIG_SENSORS_F75375S is not set |
| @@ -609,13 +854,16 @@ CONFIG_HWMON=y | |||
| 609 | # CONFIG_SENSORS_MAX6650 is not set | 854 | # CONFIG_SENSORS_MAX6650 is not set |
| 610 | # CONFIG_SENSORS_PC87360 is not set | 855 | # CONFIG_SENSORS_PC87360 is not set |
| 611 | # CONFIG_SENSORS_PC87427 is not set | 856 | # CONFIG_SENSORS_PC87427 is not set |
| 857 | # CONFIG_SENSORS_SIS5595 is not set | ||
| 612 | # CONFIG_SENSORS_DME1737 is not set | 858 | # CONFIG_SENSORS_DME1737 is not set |
| 613 | # CONFIG_SENSORS_SMSC47M1 is not set | 859 | # CONFIG_SENSORS_SMSC47M1 is not set |
| 614 | # CONFIG_SENSORS_SMSC47M192 is not set | 860 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 615 | # CONFIG_SENSORS_SMSC47B397 is not set | 861 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 616 | # CONFIG_SENSORS_ADS7828 is not set | 862 | # CONFIG_SENSORS_ADS7828 is not set |
| 617 | # CONFIG_SENSORS_THMC50 is not set | 863 | # CONFIG_SENSORS_THMC50 is not set |
| 864 | # CONFIG_SENSORS_VIA686A is not set | ||
| 618 | # CONFIG_SENSORS_VT1211 is not set | 865 | # CONFIG_SENSORS_VT1211 is not set |
| 866 | # CONFIG_SENSORS_VT8231 is not set | ||
| 619 | # CONFIG_SENSORS_W83781D is not set | 867 | # CONFIG_SENSORS_W83781D is not set |
| 620 | # CONFIG_SENSORS_W83791D is not set | 868 | # CONFIG_SENSORS_W83791D is not set |
| 621 | # CONFIG_SENSORS_W83792D is not set | 869 | # CONFIG_SENSORS_W83792D is not set |
| @@ -626,6 +874,7 @@ CONFIG_HWMON=y | |||
| 626 | # CONFIG_SENSORS_W83627EHF is not set | 874 | # CONFIG_SENSORS_W83627EHF is not set |
| 627 | # CONFIG_HWMON_DEBUG_CHIP is not set | 875 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 628 | # CONFIG_THERMAL is not set | 876 | # CONFIG_THERMAL is not set |
| 877 | # CONFIG_THERMAL_HWMON is not set | ||
| 629 | CONFIG_WATCHDOG=y | 878 | CONFIG_WATCHDOG=y |
| 630 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 879 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
| 631 | 880 | ||
| @@ -633,7 +882,15 @@ CONFIG_WATCHDOG=y | |||
| 633 | # Watchdog Device Drivers | 882 | # Watchdog Device Drivers |
| 634 | # | 883 | # |
| 635 | # CONFIG_SOFT_WATCHDOG is not set | 884 | # CONFIG_SOFT_WATCHDOG is not set |
| 636 | CONFIG_83xx_WDT=y | 885 | # CONFIG_ALIM7101_WDT is not set |
| 886 | # CONFIG_8xxx_WDT is not set | ||
| 887 | # CONFIG_WATCHDOG_RTAS is not set | ||
| 888 | |||
| 889 | # | ||
| 890 | # PCI-based Watchdog Cards | ||
| 891 | # | ||
| 892 | # CONFIG_PCIPCWATCHDOG is not set | ||
| 893 | # CONFIG_WDTPCI is not set | ||
| 637 | 894 | ||
| 638 | # | 895 | # |
| 639 | # Sonics Silicon Backplane | 896 | # Sonics Silicon Backplane |
| @@ -644,8 +901,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 644 | # | 901 | # |
| 645 | # Multifunction device drivers | 902 | # Multifunction device drivers |
| 646 | # | 903 | # |
| 904 | # CONFIG_MFD_CORE is not set | ||
| 647 | # CONFIG_MFD_SM501 is not set | 905 | # CONFIG_MFD_SM501 is not set |
| 648 | # CONFIG_HTC_PASIC3 is not set | 906 | # CONFIG_HTC_PASIC3 is not set |
| 907 | # CONFIG_MFD_TMIO is not set | ||
| 649 | 908 | ||
| 650 | # | 909 | # |
| 651 | # Multimedia devices | 910 | # Multimedia devices |
| @@ -666,6 +925,8 @@ CONFIG_DAB=y | |||
| 666 | # | 925 | # |
| 667 | # Graphics support | 926 | # Graphics support |
| 668 | # | 927 | # |
| 928 | # CONFIG_AGP is not set | ||
| 929 | # CONFIG_DRM is not set | ||
| 669 | # CONFIG_VGASTATE is not set | 930 | # CONFIG_VGASTATE is not set |
| 670 | CONFIG_VIDEO_OUTPUT_CONTROL=m | 931 | CONFIG_VIDEO_OUTPUT_CONTROL=m |
| 671 | # CONFIG_FB is not set | 932 | # CONFIG_FB is not set |
| @@ -675,10 +936,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m | |||
| 675 | # Display device support | 936 | # Display device support |
| 676 | # | 937 | # |
| 677 | # CONFIG_DISPLAY_SUPPORT is not set | 938 | # CONFIG_DISPLAY_SUPPORT is not set |
| 678 | |||
| 679 | # | ||
| 680 | # Sound | ||
| 681 | # | ||
| 682 | # CONFIG_SOUND is not set | 939 | # CONFIG_SOUND is not set |
| 683 | CONFIG_HID_SUPPORT=y | 940 | CONFIG_HID_SUPPORT=y |
| 684 | CONFIG_HID=y | 941 | CONFIG_HID=y |
| @@ -686,13 +943,17 @@ CONFIG_HID=y | |||
| 686 | # CONFIG_HIDRAW is not set | 943 | # CONFIG_HIDRAW is not set |
| 687 | CONFIG_USB_SUPPORT=y | 944 | CONFIG_USB_SUPPORT=y |
| 688 | CONFIG_USB_ARCH_HAS_HCD=y | 945 | CONFIG_USB_ARCH_HAS_HCD=y |
| 689 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 946 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 690 | CONFIG_USB_ARCH_HAS_EHCI=y | 947 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 691 | # CONFIG_USB is not set | 948 | # CONFIG_USB is not set |
| 692 | # CONFIG_USB_OTG_WHITELIST is not set | 949 | # CONFIG_USB_OTG_WHITELIST is not set |
| 693 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 950 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
| 694 | 951 | ||
| 695 | # | 952 | # |
| 953 | # Enable Host or Gadget support to see Inventra options | ||
| 954 | # | ||
| 955 | |||
| 956 | # | ||
| 696 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 957 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 697 | # | 958 | # |
| 698 | # CONFIG_USB_GADGET is not set | 959 | # CONFIG_USB_GADGET is not set |
| @@ -700,6 +961,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 700 | # CONFIG_MEMSTICK is not set | 961 | # CONFIG_MEMSTICK is not set |
| 701 | # CONFIG_NEW_LEDS is not set | 962 | # CONFIG_NEW_LEDS is not set |
| 702 | # CONFIG_ACCESSIBILITY is not set | 963 | # CONFIG_ACCESSIBILITY is not set |
| 964 | # CONFIG_INFINIBAND is not set | ||
| 703 | # CONFIG_EDAC is not set | 965 | # CONFIG_EDAC is not set |
| 704 | # CONFIG_RTC_CLASS is not set | 966 | # CONFIG_RTC_CLASS is not set |
| 705 | # CONFIG_DMADEVICES is not set | 967 | # CONFIG_DMADEVICES is not set |
| @@ -769,6 +1031,7 @@ CONFIG_TMPFS=y | |||
| 769 | # CONFIG_CRAMFS is not set | 1031 | # CONFIG_CRAMFS is not set |
| 770 | # CONFIG_VXFS_FS is not set | 1032 | # CONFIG_VXFS_FS is not set |
| 771 | # CONFIG_MINIX_FS is not set | 1033 | # CONFIG_MINIX_FS is not set |
| 1034 | # CONFIG_OMFS_FS is not set | ||
| 772 | # CONFIG_HPFS_FS is not set | 1035 | # CONFIG_HPFS_FS is not set |
| 773 | # CONFIG_QNX4FS_FS is not set | 1036 | # CONFIG_QNX4FS_FS is not set |
| 774 | # CONFIG_ROMFS_FS is not set | 1037 | # CONFIG_ROMFS_FS is not set |
| @@ -779,14 +1042,13 @@ CONFIG_NFS_FS=y | |||
| 779 | CONFIG_NFS_V3=y | 1042 | CONFIG_NFS_V3=y |
| 780 | # CONFIG_NFS_V3_ACL is not set | 1043 | # CONFIG_NFS_V3_ACL is not set |
| 781 | CONFIG_NFS_V4=y | 1044 | CONFIG_NFS_V4=y |
| 782 | # CONFIG_NFSD is not set | ||
| 783 | CONFIG_ROOT_NFS=y | 1045 | CONFIG_ROOT_NFS=y |
| 1046 | # CONFIG_NFSD is not set | ||
| 784 | CONFIG_LOCKD=y | 1047 | CONFIG_LOCKD=y |
| 785 | CONFIG_LOCKD_V4=y | 1048 | CONFIG_LOCKD_V4=y |
| 786 | CONFIG_NFS_COMMON=y | 1049 | CONFIG_NFS_COMMON=y |
| 787 | CONFIG_SUNRPC=y | 1050 | CONFIG_SUNRPC=y |
| 788 | CONFIG_SUNRPC_GSS=y | 1051 | CONFIG_SUNRPC_GSS=y |
| 789 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 790 | CONFIG_RPCSEC_GSS_KRB5=y | 1052 | CONFIG_RPCSEC_GSS_KRB5=y |
| 791 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1053 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 792 | # CONFIG_SMB_FS is not set | 1054 | # CONFIG_SMB_FS is not set |
| @@ -826,6 +1088,7 @@ CONFIG_BITREVERSE=y | |||
| 826 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1088 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 827 | # CONFIG_CRC_CCITT is not set | 1089 | # CONFIG_CRC_CCITT is not set |
| 828 | # CONFIG_CRC16 is not set | 1090 | # CONFIG_CRC16 is not set |
| 1091 | CONFIG_CRC_T10DIF=y | ||
| 829 | # CONFIG_CRC_ITU_T is not set | 1092 | # CONFIG_CRC_ITU_T is not set |
| 830 | CONFIG_CRC32=y | 1093 | CONFIG_CRC32=y |
| 831 | # CONFIG_CRC7 is not set | 1094 | # CONFIG_CRC7 is not set |
| @@ -849,8 +1112,18 @@ CONFIG_FRAME_WARN=1024 | |||
| 849 | # CONFIG_HEADERS_CHECK is not set | 1112 | # CONFIG_HEADERS_CHECK is not set |
| 850 | # CONFIG_DEBUG_KERNEL is not set | 1113 | # CONFIG_DEBUG_KERNEL is not set |
| 851 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1114 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1115 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 1116 | # CONFIG_LATENCYTOP is not set | ||
| 1117 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1118 | CONFIG_HAVE_FTRACE=y | ||
| 1119 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1120 | # CONFIG_FTRACE is not set | ||
| 1121 | # CONFIG_SCHED_TRACER is not set | ||
| 1122 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 852 | # CONFIG_SAMPLES is not set | 1123 | # CONFIG_SAMPLES is not set |
| 1124 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 853 | # CONFIG_IRQSTACKS is not set | 1125 | # CONFIG_IRQSTACKS is not set |
| 1126 | # CONFIG_BOOTX_TEXT is not set | ||
| 854 | # CONFIG_PPC_EARLY_DEBUG is not set | 1127 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 855 | 1128 | ||
| 856 | # | 1129 | # |
| @@ -904,6 +1177,10 @@ CONFIG_CRYPTO_PCBC=m | |||
| 904 | # CONFIG_CRYPTO_MD4 is not set | 1177 | # CONFIG_CRYPTO_MD4 is not set |
| 905 | CONFIG_CRYPTO_MD5=y | 1178 | CONFIG_CRYPTO_MD5=y |
| 906 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1179 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 1180 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1181 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1182 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1183 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 907 | # CONFIG_CRYPTO_SHA1 is not set | 1184 | # CONFIG_CRYPTO_SHA1 is not set |
| 908 | # CONFIG_CRYPTO_SHA256 is not set | 1185 | # CONFIG_CRYPTO_SHA256 is not set |
| 909 | # CONFIG_CRYPTO_SHA512 is not set | 1186 | # CONFIG_CRYPTO_SHA512 is not set |
| @@ -935,5 +1212,7 @@ CONFIG_CRYPTO_DES=y | |||
| 935 | # CONFIG_CRYPTO_DEFLATE is not set | 1212 | # CONFIG_CRYPTO_DEFLATE is not set |
| 936 | # CONFIG_CRYPTO_LZO is not set | 1213 | # CONFIG_CRYPTO_LZO is not set |
| 937 | CONFIG_CRYPTO_HW=y | 1214 | CONFIG_CRYPTO_HW=y |
| 1215 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | ||
| 1216 | # CONFIG_CRYPTO_DEV_TALITOS is not set | ||
| 938 | # CONFIG_PPC_CLOCK is not set | 1217 | # CONFIG_PPC_CLOCK is not set |
| 939 | # CONFIG_VIRTUALIZATION is not set | 1218 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig b/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig index 0d448556f53a..e8d2d691d26c 100644 --- a/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig +++ b/arch/powerpc/configs/83xx/mpc837x_rdb_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.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Tue Jun 10 09:17:12 2008 | 4 | # Thu Aug 21 00:52:25 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -16,6 +16,7 @@ CONFIG_6xx=y | |||
| 16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
| 17 | CONFIG_PPC_FPU=y | 17 | CONFIG_PPC_FPU=y |
| 18 | # CONFIG_FSL_EMB_PERFMON is not set | 18 | # CONFIG_FSL_EMB_PERFMON is not set |
| 19 | # CONFIG_ALTIVEC is not set | ||
| 19 | CONFIG_PPC_STD_MMU=y | 20 | CONFIG_PPC_STD_MMU=y |
| 20 | CONFIG_PPC_STD_MMU_32=y | 21 | CONFIG_PPC_STD_MMU_32=y |
| 21 | # CONFIG_PPC_MM_SLICES is not set | 22 | # CONFIG_PPC_MM_SLICES is not set |
| @@ -32,6 +33,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | 35 | CONFIG_STACKTRACE_SUPPORT=y |
| 36 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | 37 | CONFIG_LOCKDEP_SUPPORT=y |
| 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 39 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| @@ -51,6 +53,9 @@ CONFIG_PPC_UDBG_16550=y | |||
| 51 | CONFIG_AUDIT_ARCH=y | 53 | CONFIG_AUDIT_ARCH=y |
| 52 | CONFIG_GENERIC_BUG=y | 54 | CONFIG_GENERIC_BUG=y |
| 53 | CONFIG_DEFAULT_UIMAGE=y | 55 | CONFIG_DEFAULT_UIMAGE=y |
| 56 | CONFIG_HIBERNATE_32=y | ||
| 57 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
| 58 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
| 54 | # CONFIG_PPC_DCR_NATIVE is not set | 59 | # CONFIG_PPC_DCR_NATIVE is not set |
| 55 | # CONFIG_PPC_DCR_MMIO is not set | 60 | # CONFIG_PPC_DCR_MMIO is not set |
| 56 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 61 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| @@ -88,13 +93,13 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 88 | CONFIG_SYSCTL=y | 93 | CONFIG_SYSCTL=y |
| 89 | CONFIG_EMBEDDED=y | 94 | CONFIG_EMBEDDED=y |
| 90 | CONFIG_SYSCTL_SYSCALL=y | 95 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 92 | CONFIG_KALLSYMS=y | 96 | CONFIG_KALLSYMS=y |
| 93 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 97 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 94 | CONFIG_HOTPLUG=y | 98 | CONFIG_HOTPLUG=y |
| 95 | CONFIG_PRINTK=y | 99 | CONFIG_PRINTK=y |
| 96 | CONFIG_BUG=y | 100 | CONFIG_BUG=y |
| 97 | CONFIG_ELF_CORE=y | 101 | CONFIG_ELF_CORE=y |
| 102 | CONFIG_PCSPKR_PLATFORM=y | ||
| 98 | CONFIG_COMPAT_BRK=y | 103 | CONFIG_COMPAT_BRK=y |
| 99 | CONFIG_BASE_FULL=y | 104 | CONFIG_BASE_FULL=y |
| 100 | CONFIG_FUTEX=y | 105 | CONFIG_FUTEX=y |
| @@ -112,10 +117,16 @@ CONFIG_SLAB=y | |||
| 112 | # CONFIG_MARKERS is not set | 117 | # CONFIG_MARKERS is not set |
| 113 | CONFIG_HAVE_OPROFILE=y | 118 | CONFIG_HAVE_OPROFILE=y |
| 114 | # CONFIG_KPROBES is not set | 119 | # CONFIG_KPROBES is not set |
| 120 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 121 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 115 | CONFIG_HAVE_KPROBES=y | 122 | CONFIG_HAVE_KPROBES=y |
| 116 | CONFIG_HAVE_KRETPROBES=y | 123 | CONFIG_HAVE_KRETPROBES=y |
| 124 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 117 | # CONFIG_HAVE_DMA_ATTRS is not set | 125 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 126 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 127 | # CONFIG_HAVE_CLK is not set | ||
| 118 | CONFIG_PROC_PAGE_MONITOR=y | 128 | CONFIG_PROC_PAGE_MONITOR=y |
| 129 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 119 | CONFIG_SLABINFO=y | 130 | CONFIG_SLABINFO=y |
| 120 | CONFIG_RT_MUTEXES=y | 131 | CONFIG_RT_MUTEXES=y |
| 121 | # CONFIG_TINY_SHMEM is not set | 132 | # CONFIG_TINY_SHMEM is not set |
| @@ -126,12 +137,13 @@ CONFIG_MODULE_UNLOAD=y | |||
| 126 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 137 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 127 | # CONFIG_MODVERSIONS is not set | 138 | # CONFIG_MODVERSIONS is not set |
| 128 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 139 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 129 | # CONFIG_KMOD is not set | 140 | CONFIG_KMOD=y |
| 130 | CONFIG_BLOCK=y | 141 | CONFIG_BLOCK=y |
| 131 | # CONFIG_LBD is not set | 142 | # CONFIG_LBD is not set |
| 132 | # CONFIG_BLK_DEV_IO_TRACE is not set | 143 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 133 | # CONFIG_LSF is not set | 144 | # CONFIG_LSF is not set |
| 134 | # CONFIG_BLK_DEV_BSG is not set | 145 | # CONFIG_BLK_DEV_BSG is not set |
| 146 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 135 | 147 | ||
| 136 | # | 148 | # |
| 137 | # IO Schedulers | 149 | # IO Schedulers |
| @@ -150,37 +162,49 @@ CONFIG_CLASSIC_RCU=y | |||
| 150 | # | 162 | # |
| 151 | # Platform support | 163 | # Platform support |
| 152 | # | 164 | # |
| 153 | # CONFIG_PPC_MULTIPLATFORM is not set | 165 | CONFIG_PPC_MULTIPLATFORM=y |
| 154 | # CONFIG_PPC_82xx is not set | 166 | CONFIG_CLASSIC32=y |
| 155 | CONFIG_PPC_83xx=y | 167 | CONFIG_PPC_CHRP=y |
| 156 | # CONFIG_PPC_86xx is not set | 168 | # CONFIG_MPC5121_ADS is not set |
| 157 | # CONFIG_PPC_MPC512x is not set | 169 | # CONFIG_MPC5121_GENERIC is not set |
| 158 | # CONFIG_PPC_MPC5121 is not set | 170 | # CONFIG_PPC_MPC52xx is not set |
| 171 | CONFIG_PPC_PMAC=y | ||
| 159 | # CONFIG_PPC_CELL is not set | 172 | # CONFIG_PPC_CELL is not set |
| 160 | # CONFIG_PPC_CELL_NATIVE is not set | 173 | # CONFIG_PPC_CELL_NATIVE is not set |
| 174 | # CONFIG_PPC_82xx is not set | ||
| 161 | # CONFIG_PQ2ADS is not set | 175 | # CONFIG_PQ2ADS is not set |
| 162 | CONFIG_MPC83xx=y | 176 | CONFIG_PPC_83xx=y |
| 163 | # CONFIG_MPC831x_RDB is not set | 177 | # CONFIG_MPC831x_RDB is not set |
| 164 | # CONFIG_MPC832x_MDS is not set | 178 | # CONFIG_MPC832x_MDS is not set |
| 165 | # CONFIG_MPC832x_RDB is not set | 179 | # CONFIG_MPC832x_RDB is not set |
| 166 | # CONFIG_MPC834x_MDS is not set | 180 | # CONFIG_MPC834x_MDS is not set |
| 167 | # CONFIG_MPC834x_ITX is not set | 181 | # CONFIG_MPC834x_ITX is not set |
| 168 | # CONFIG_MPC836x_MDS is not set | 182 | # CONFIG_MPC836x_MDS is not set |
| 183 | # CONFIG_MPC836x_RDK is not set | ||
| 169 | # CONFIG_MPC837x_MDS is not set | 184 | # CONFIG_MPC837x_MDS is not set |
| 170 | CONFIG_MPC837x_RDB=y | 185 | CONFIG_MPC837x_RDB=y |
| 171 | # CONFIG_SBC834x is not set | 186 | # CONFIG_SBC834x is not set |
| 187 | # CONFIG_ASP834x is not set | ||
| 172 | CONFIG_PPC_MPC837x=y | 188 | CONFIG_PPC_MPC837x=y |
| 189 | # CONFIG_PPC_86xx is not set | ||
| 190 | # CONFIG_EMBEDDED6xx is not set | ||
| 191 | CONFIG_PPC_NATIVE=y | ||
| 192 | # CONFIG_UDBG_RTAS_CONSOLE is not set | ||
| 173 | CONFIG_IPIC=y | 193 | CONFIG_IPIC=y |
| 174 | # CONFIG_MPIC is not set | 194 | CONFIG_MPIC=y |
| 175 | # CONFIG_MPIC_WEIRD is not set | 195 | # CONFIG_MPIC_WEIRD is not set |
| 176 | # CONFIG_PPC_I8259 is not set | 196 | CONFIG_PPC_I8259=y |
| 177 | # CONFIG_PPC_RTAS is not set | 197 | CONFIG_PPC_RTAS=y |
| 198 | # CONFIG_RTAS_ERROR_LOGGING is not set | ||
| 199 | CONFIG_RTAS_PROC=y | ||
| 178 | # CONFIG_MMIO_NVRAM is not set | 200 | # CONFIG_MMIO_NVRAM is not set |
| 179 | # CONFIG_PPC_MPC106 is not set | 201 | CONFIG_PPC_MPC106=y |
| 180 | # CONFIG_PPC_970_NAP is not set | 202 | # CONFIG_PPC_970_NAP is not set |
| 181 | # CONFIG_PPC_INDIRECT_IO is not set | 203 | # CONFIG_PPC_INDIRECT_IO is not set |
| 182 | # CONFIG_GENERIC_IOMAP is not set | 204 | # CONFIG_GENERIC_IOMAP is not set |
| 183 | # CONFIG_CPU_FREQ is not set | 205 | # CONFIG_CPU_FREQ is not set |
| 206 | # CONFIG_PPC601_SYNC_FIX is not set | ||
| 207 | # CONFIG_TAU is not set | ||
| 184 | # CONFIG_FSL_ULI1575 is not set | 208 | # CONFIG_FSL_ULI1575 is not set |
| 185 | 209 | ||
| 186 | # | 210 | # |
| @@ -206,6 +230,7 @@ CONFIG_BINFMT_ELF=y | |||
| 206 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 230 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| 207 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 231 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
| 208 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 232 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
| 233 | # CONFIG_KEXEC is not set | ||
| 209 | CONFIG_ARCH_FLATMEM_ENABLE=y | 234 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 210 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 235 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
| 211 | CONFIG_SELECT_MEMORY_MODEL=y | 236 | CONFIG_SELECT_MEMORY_MODEL=y |
| @@ -218,6 +243,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 218 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 243 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 219 | CONFIG_PAGEFLAGS_EXTENDED=y | 244 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 220 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 245 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 246 | CONFIG_MIGRATION=y | ||
| 221 | # CONFIG_RESOURCES_64BIT is not set | 247 | # CONFIG_RESOURCES_64BIT is not set |
| 222 | CONFIG_ZONE_DMA_FLAG=1 | 248 | CONFIG_ZONE_DMA_FLAG=1 |
| 223 | CONFIG_BOUNCE=y | 249 | CONFIG_BOUNCE=y |
| @@ -225,6 +251,7 @@ CONFIG_VIRT_TO_BUS=y | |||
| 225 | CONFIG_FORCE_MAX_ZONEORDER=11 | 251 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 226 | CONFIG_PROC_DEVICETREE=y | 252 | CONFIG_PROC_DEVICETREE=y |
| 227 | # CONFIG_CMDLINE_BOOL is not set | 253 | # CONFIG_CMDLINE_BOOL is not set |
| 254 | CONFIG_EXTRA_TARGETS="" | ||
| 228 | # CONFIG_PM is not set | 255 | # CONFIG_PM is not set |
| 229 | CONFIG_SECCOMP=y | 256 | CONFIG_SECCOMP=y |
| 230 | CONFIG_ISA_DMA_API=y | 257 | CONFIG_ISA_DMA_API=y |
| @@ -232,15 +259,22 @@ CONFIG_ISA_DMA_API=y | |||
| 232 | # | 259 | # |
| 233 | # Bus options | 260 | # Bus options |
| 234 | # | 261 | # |
| 262 | # CONFIG_ISA is not set | ||
| 235 | CONFIG_ZONE_DMA=y | 263 | CONFIG_ZONE_DMA=y |
| 236 | CONFIG_GENERIC_ISA_DMA=y | 264 | CONFIG_GENERIC_ISA_DMA=y |
| 237 | CONFIG_PPC_INDIRECT_PCI=y | 265 | CONFIG_PPC_INDIRECT_PCI=y |
| 238 | CONFIG_FSL_SOC=y | 266 | CONFIG_FSL_SOC=y |
| 239 | # CONFIG_PCI is not set | 267 | CONFIG_FSL_PCI=y |
| 240 | # CONFIG_PCI_DOMAINS is not set | 268 | CONFIG_PPC_PCI_CHOICE=y |
| 241 | # CONFIG_PCI_SYSCALL is not set | 269 | CONFIG_PCI=y |
| 242 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 270 | CONFIG_PCI_DOMAINS=y |
| 271 | CONFIG_PCI_SYSCALL=y | ||
| 272 | # CONFIG_PCIEPORTBUS is not set | ||
| 273 | CONFIG_ARCH_SUPPORTS_MSI=y | ||
| 274 | # CONFIG_PCI_MSI is not set | ||
| 275 | CONFIG_PCI_LEGACY=y | ||
| 243 | # CONFIG_PCCARD is not set | 276 | # CONFIG_PCCARD is not set |
| 277 | # CONFIG_HOTPLUG_PCI is not set | ||
| 244 | # CONFIG_HAS_RAPIDIO is not set | 278 | # CONFIG_HAS_RAPIDIO is not set |
| 245 | 279 | ||
| 246 | # | 280 | # |
| @@ -256,10 +290,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
| 256 | CONFIG_KERNEL_START=0xc0000000 | 290 | CONFIG_KERNEL_START=0xc0000000 |
| 257 | CONFIG_PHYSICAL_START=0x00000000 | 291 | CONFIG_PHYSICAL_START=0x00000000 |
| 258 | CONFIG_TASK_SIZE=0xc0000000 | 292 | CONFIG_TASK_SIZE=0xc0000000 |
| 259 | |||
| 260 | # | ||
| 261 | # Networking | ||
| 262 | # | ||
| 263 | CONFIG_NET=y | 293 | CONFIG_NET=y |
| 264 | 294 | ||
| 265 | # | 295 | # |
| @@ -355,10 +385,16 @@ CONFIG_OF_I2C=y | |||
| 355 | # CONFIG_PARPORT is not set | 385 | # CONFIG_PARPORT is not set |
| 356 | CONFIG_BLK_DEV=y | 386 | CONFIG_BLK_DEV=y |
| 357 | # CONFIG_BLK_DEV_FD is not set | 387 | # CONFIG_BLK_DEV_FD is not set |
| 388 | # CONFIG_MAC_FLOPPY is not set | ||
| 389 | # CONFIG_BLK_CPQ_DA is not set | ||
| 390 | # CONFIG_BLK_CPQ_CISS_DA is not set | ||
| 391 | # CONFIG_BLK_DEV_DAC960 is not set | ||
| 392 | # CONFIG_BLK_DEV_UMEM is not set | ||
| 358 | # CONFIG_BLK_DEV_COW_COMMON is not set | 393 | # CONFIG_BLK_DEV_COW_COMMON is not set |
| 359 | CONFIG_BLK_DEV_LOOP=y | 394 | CONFIG_BLK_DEV_LOOP=y |
| 360 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 395 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set |
| 361 | # CONFIG_BLK_DEV_NBD is not set | 396 | # CONFIG_BLK_DEV_NBD is not set |
| 397 | # CONFIG_BLK_DEV_SX8 is not set | ||
| 362 | # CONFIG_BLK_DEV_UB is not set | 398 | # CONFIG_BLK_DEV_UB is not set |
| 363 | CONFIG_BLK_DEV_RAM=y | 399 | CONFIG_BLK_DEV_RAM=y |
| 364 | CONFIG_BLK_DEV_RAM_COUNT=16 | 400 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| @@ -366,9 +402,14 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
| 366 | # CONFIG_BLK_DEV_XIP is not set | 402 | # CONFIG_BLK_DEV_XIP is not set |
| 367 | # CONFIG_CDROM_PKTCDVD is not set | 403 | # CONFIG_CDROM_PKTCDVD is not set |
| 368 | # CONFIG_ATA_OVER_ETH is not set | 404 | # CONFIG_ATA_OVER_ETH is not set |
| 405 | # CONFIG_BLK_DEV_HD is not set | ||
| 369 | CONFIG_MISC_DEVICES=y | 406 | CONFIG_MISC_DEVICES=y |
| 407 | # CONFIG_PHANTOM is not set | ||
| 370 | # CONFIG_EEPROM_93CX6 is not set | 408 | # CONFIG_EEPROM_93CX6 is not set |
| 409 | # CONFIG_SGI_IOC4 is not set | ||
| 410 | # CONFIG_TIFM_CORE is not set | ||
| 371 | # CONFIG_ENCLOSURE_SERVICES is not set | 411 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 412 | # CONFIG_HP_ILO is not set | ||
| 372 | CONFIG_HAVE_IDE=y | 413 | CONFIG_HAVE_IDE=y |
| 373 | # CONFIG_IDE is not set | 414 | # CONFIG_IDE is not set |
| 374 | 415 | ||
| @@ -411,14 +452,106 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 411 | # CONFIG_SCSI_SRP_ATTRS is not set | 452 | # CONFIG_SCSI_SRP_ATTRS is not set |
| 412 | CONFIG_SCSI_LOWLEVEL=y | 453 | CONFIG_SCSI_LOWLEVEL=y |
| 413 | # CONFIG_ISCSI_TCP is not set | 454 | # CONFIG_ISCSI_TCP is not set |
| 455 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | ||
| 456 | # CONFIG_SCSI_3W_9XXX is not set | ||
| 457 | # CONFIG_SCSI_ACARD is not set | ||
| 458 | # CONFIG_SCSI_AACRAID is not set | ||
| 459 | # CONFIG_SCSI_AIC7XXX is not set | ||
| 460 | # CONFIG_SCSI_AIC7XXX_OLD is not set | ||
| 461 | # CONFIG_SCSI_AIC79XX is not set | ||
| 462 | # CONFIG_SCSI_AIC94XX is not set | ||
| 463 | # CONFIG_SCSI_DPT_I2O is not set | ||
| 464 | # CONFIG_SCSI_ADVANSYS is not set | ||
| 465 | # CONFIG_SCSI_ARCMSR is not set | ||
| 466 | # CONFIG_MEGARAID_NEWGEN is not set | ||
| 467 | # CONFIG_MEGARAID_LEGACY is not set | ||
| 468 | # CONFIG_MEGARAID_SAS is not set | ||
| 469 | # CONFIG_SCSI_HPTIOP is not set | ||
| 470 | # CONFIG_SCSI_BUSLOGIC is not set | ||
| 471 | # CONFIG_SCSI_DMX3191D is not set | ||
| 472 | # CONFIG_SCSI_EATA is not set | ||
| 473 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | ||
| 474 | # CONFIG_SCSI_GDTH is not set | ||
| 475 | # CONFIG_SCSI_IPS is not set | ||
| 476 | # CONFIG_SCSI_INITIO is not set | ||
| 477 | # CONFIG_SCSI_INIA100 is not set | ||
| 478 | # CONFIG_SCSI_MVSAS is not set | ||
| 479 | # CONFIG_SCSI_STEX is not set | ||
| 480 | # CONFIG_SCSI_SYM53C8XX_2 is not set | ||
| 481 | # CONFIG_SCSI_IPR is not set | ||
| 482 | # CONFIG_SCSI_QLOGIC_1280 is not set | ||
| 483 | # CONFIG_SCSI_QLA_FC is not set | ||
| 484 | # CONFIG_SCSI_QLA_ISCSI is not set | ||
| 485 | # CONFIG_SCSI_LPFC is not set | ||
| 486 | # CONFIG_SCSI_DC395x is not set | ||
| 487 | # CONFIG_SCSI_DC390T is not set | ||
| 488 | # CONFIG_SCSI_NSP32 is not set | ||
| 414 | # CONFIG_SCSI_DEBUG is not set | 489 | # CONFIG_SCSI_DEBUG is not set |
| 490 | # CONFIG_SCSI_MESH is not set | ||
| 491 | # CONFIG_SCSI_MAC53C94 is not set | ||
| 492 | # CONFIG_SCSI_SRP is not set | ||
| 493 | # CONFIG_SCSI_DH is not set | ||
| 415 | CONFIG_ATA=y | 494 | CONFIG_ATA=y |
| 416 | # CONFIG_ATA_NONSTANDARD is not set | 495 | # CONFIG_ATA_NONSTANDARD is not set |
| 417 | CONFIG_SATA_PMP=y | 496 | CONFIG_SATA_PMP=y |
| 497 | # CONFIG_SATA_AHCI is not set | ||
| 498 | # CONFIG_SATA_SIL24 is not set | ||
| 418 | CONFIG_SATA_FSL=y | 499 | CONFIG_SATA_FSL=y |
| 419 | CONFIG_ATA_SFF=y | 500 | CONFIG_ATA_SFF=y |
| 501 | # CONFIG_SATA_SVW is not set | ||
| 502 | # CONFIG_ATA_PIIX is not set | ||
| 420 | # CONFIG_SATA_MV is not set | 503 | # CONFIG_SATA_MV is not set |
| 504 | # CONFIG_SATA_NV is not set | ||
| 505 | # CONFIG_PDC_ADMA is not set | ||
| 506 | # CONFIG_SATA_QSTOR is not set | ||
| 507 | # CONFIG_SATA_PROMISE is not set | ||
| 508 | # CONFIG_SATA_SX4 is not set | ||
| 509 | # CONFIG_SATA_SIL is not set | ||
| 510 | # CONFIG_SATA_SIS is not set | ||
| 511 | # CONFIG_SATA_ULI is not set | ||
| 512 | # CONFIG_SATA_VIA is not set | ||
| 513 | # CONFIG_SATA_VITESSE is not set | ||
| 514 | # CONFIG_SATA_INIC162X is not set | ||
| 515 | # CONFIG_PATA_ALI is not set | ||
| 516 | # CONFIG_PATA_AMD is not set | ||
| 517 | # CONFIG_PATA_ARTOP is not set | ||
| 518 | # CONFIG_PATA_ATIIXP is not set | ||
| 519 | # CONFIG_PATA_CMD640_PCI is not set | ||
| 520 | # CONFIG_PATA_CMD64X is not set | ||
| 521 | # CONFIG_PATA_CS5520 is not set | ||
| 522 | # CONFIG_PATA_CS5530 is not set | ||
| 523 | # CONFIG_PATA_CYPRESS is not set | ||
| 524 | # CONFIG_PATA_EFAR is not set | ||
| 525 | # CONFIG_ATA_GENERIC is not set | ||
| 526 | # CONFIG_PATA_HPT366 is not set | ||
| 527 | # CONFIG_PATA_HPT37X is not set | ||
| 528 | # CONFIG_PATA_HPT3X2N is not set | ||
| 529 | # CONFIG_PATA_HPT3X3 is not set | ||
| 530 | # CONFIG_PATA_IT821X is not set | ||
| 531 | # CONFIG_PATA_IT8213 is not set | ||
| 532 | # CONFIG_PATA_JMICRON is not set | ||
| 533 | # CONFIG_PATA_TRIFLEX is not set | ||
| 534 | # CONFIG_PATA_MARVELL is not set | ||
| 535 | # CONFIG_PATA_MPIIX is not set | ||
| 536 | # CONFIG_PATA_OLDPIIX is not set | ||
| 537 | # CONFIG_PATA_NETCELL is not set | ||
| 538 | # CONFIG_PATA_NINJA32 is not set | ||
| 539 | # CONFIG_PATA_NS87410 is not set | ||
| 540 | # CONFIG_PATA_NS87415 is not set | ||
| 541 | # CONFIG_PATA_OPTI is not set | ||
| 542 | # CONFIG_PATA_OPTIDMA is not set | ||
| 543 | # CONFIG_PATA_PDC_OLD is not set | ||
| 544 | # CONFIG_PATA_RADISYS is not set | ||
| 545 | # CONFIG_PATA_RZ1000 is not set | ||
| 546 | # CONFIG_PATA_SC1200 is not set | ||
| 547 | # CONFIG_PATA_SERVERWORKS is not set | ||
| 548 | # CONFIG_PATA_PDC2027X is not set | ||
| 549 | # CONFIG_PATA_SIL680 is not set | ||
| 550 | # CONFIG_PATA_SIS is not set | ||
| 551 | # CONFIG_PATA_VIA is not set | ||
| 552 | # CONFIG_PATA_WINBOND is not set | ||
| 421 | # CONFIG_PATA_PLATFORM is not set | 553 | # CONFIG_PATA_PLATFORM is not set |
| 554 | # CONFIG_PATA_SCH is not set | ||
| 422 | CONFIG_MD=y | 555 | CONFIG_MD=y |
| 423 | CONFIG_BLK_DEV_MD=y | 556 | CONFIG_BLK_DEV_MD=y |
| 424 | # CONFIG_MD_LINEAR is not set | 557 | # CONFIG_MD_LINEAR is not set |
| @@ -430,15 +563,27 @@ CONFIG_MD_RAID5_RESHAPE=y | |||
| 430 | # CONFIG_MD_MULTIPATH is not set | 563 | # CONFIG_MD_MULTIPATH is not set |
| 431 | # CONFIG_MD_FAULTY is not set | 564 | # CONFIG_MD_FAULTY is not set |
| 432 | # CONFIG_BLK_DEV_DM is not set | 565 | # CONFIG_BLK_DEV_DM is not set |
| 566 | # CONFIG_FUSION is not set | ||
| 567 | |||
| 568 | # | ||
| 569 | # IEEE 1394 (FireWire) support | ||
| 570 | # | ||
| 571 | |||
| 572 | # | ||
| 573 | # Enable only one of the two stacks, unless you know what you are doing | ||
| 574 | # | ||
| 575 | # CONFIG_FIREWIRE is not set | ||
| 576 | # CONFIG_IEEE1394 is not set | ||
| 577 | # CONFIG_I2O is not set | ||
| 433 | # CONFIG_MACINTOSH_DRIVERS is not set | 578 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 434 | CONFIG_NETDEVICES=y | 579 | CONFIG_NETDEVICES=y |
| 435 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 436 | # CONFIG_DUMMY is not set | 580 | # CONFIG_DUMMY is not set |
| 437 | # CONFIG_BONDING is not set | 581 | # CONFIG_BONDING is not set |
| 438 | # CONFIG_MACVLAN is not set | 582 | # CONFIG_MACVLAN is not set |
| 439 | # CONFIG_EQUALIZER is not set | 583 | # CONFIG_EQUALIZER is not set |
| 440 | # CONFIG_TUN is not set | 584 | # CONFIG_TUN is not set |
| 441 | # CONFIG_VETH is not set | 585 | # CONFIG_VETH is not set |
| 586 | # CONFIG_ARCNET is not set | ||
| 442 | CONFIG_PHYLIB=y | 587 | CONFIG_PHYLIB=y |
| 443 | 588 | ||
| 444 | # | 589 | # |
| @@ -458,16 +603,44 @@ CONFIG_FIXED_PHY=y | |||
| 458 | # CONFIG_MDIO_BITBANG is not set | 603 | # CONFIG_MDIO_BITBANG is not set |
| 459 | CONFIG_NET_ETHERNET=y | 604 | CONFIG_NET_ETHERNET=y |
| 460 | CONFIG_MII=y | 605 | CONFIG_MII=y |
| 606 | # CONFIG_MACE is not set | ||
| 607 | # CONFIG_BMAC is not set | ||
| 608 | # CONFIG_HAPPYMEAL is not set | ||
| 609 | # CONFIG_SUNGEM is not set | ||
| 610 | # CONFIG_CASSINI is not set | ||
| 611 | # CONFIG_NET_VENDOR_3COM is not set | ||
| 612 | # CONFIG_NET_TULIP is not set | ||
| 613 | # CONFIG_HP100 is not set | ||
| 461 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 614 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
| 462 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 615 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 463 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 616 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| 464 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 617 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
| 618 | # CONFIG_NET_PCI is not set | ||
| 465 | # CONFIG_B44 is not set | 619 | # CONFIG_B44 is not set |
| 466 | CONFIG_NETDEV_1000=y | 620 | CONFIG_NETDEV_1000=y |
| 467 | # CONFIG_E1000E_ENABLED is not set | 621 | # CONFIG_ACENIC is not set |
| 622 | # CONFIG_DL2K is not set | ||
| 623 | # CONFIG_E1000 is not set | ||
| 624 | # CONFIG_E1000E is not set | ||
| 625 | # CONFIG_IP1000 is not set | ||
| 626 | # CONFIG_IGB is not set | ||
| 627 | # CONFIG_NS83820 is not set | ||
| 628 | # CONFIG_HAMACHI is not set | ||
| 629 | # CONFIG_YELLOWFIN is not set | ||
| 630 | # CONFIG_R8169 is not set | ||
| 631 | # CONFIG_SIS190 is not set | ||
| 632 | # CONFIG_SKGE is not set | ||
| 633 | # CONFIG_SKY2 is not set | ||
| 634 | # CONFIG_VIA_VELOCITY is not set | ||
| 635 | # CONFIG_TIGON3 is not set | ||
| 636 | # CONFIG_BNX2 is not set | ||
| 468 | CONFIG_GIANFAR=y | 637 | CONFIG_GIANFAR=y |
| 469 | CONFIG_GFAR_NAPI=y | 638 | # CONFIG_MV643XX_ETH is not set |
| 639 | # CONFIG_QLA3XXX is not set | ||
| 640 | # CONFIG_ATL1 is not set | ||
| 641 | # CONFIG_ATL1E is not set | ||
| 470 | # CONFIG_NETDEV_10000 is not set | 642 | # CONFIG_NETDEV_10000 is not set |
| 643 | # CONFIG_TR is not set | ||
| 471 | 644 | ||
| 472 | # | 645 | # |
| 473 | # Wireless LAN | 646 | # Wireless LAN |
| @@ -485,8 +658,11 @@ CONFIG_GFAR_NAPI=y | |||
| 485 | # CONFIG_USB_RTL8150 is not set | 658 | # CONFIG_USB_RTL8150 is not set |
| 486 | # CONFIG_USB_USBNET is not set | 659 | # CONFIG_USB_USBNET is not set |
| 487 | # CONFIG_WAN is not set | 660 | # CONFIG_WAN is not set |
| 661 | # CONFIG_FDDI is not set | ||
| 662 | # CONFIG_HIPPI is not set | ||
| 488 | # CONFIG_PPP is not set | 663 | # CONFIG_PPP is not set |
| 489 | # CONFIG_SLIP is not set | 664 | # CONFIG_SLIP is not set |
| 665 | # CONFIG_NET_FC is not set | ||
| 490 | # CONFIG_NETCONSOLE is not set | 666 | # CONFIG_NETCONSOLE is not set |
| 491 | # CONFIG_NETPOLL is not set | 667 | # CONFIG_NETPOLL is not set |
| 492 | # CONFIG_NET_POLL_CONTROLLER is not set | 668 | # CONFIG_NET_POLL_CONTROLLER is not set |
| @@ -530,12 +706,14 @@ CONFIG_INPUT=y | |||
| 530 | # CONFIG_VT is not set | 706 | # CONFIG_VT is not set |
| 531 | CONFIG_DEVKMEM=y | 707 | CONFIG_DEVKMEM=y |
| 532 | # CONFIG_SERIAL_NONSTANDARD is not set | 708 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 709 | # CONFIG_NOZOMI is not set | ||
| 533 | 710 | ||
| 534 | # | 711 | # |
| 535 | # Serial drivers | 712 | # Serial drivers |
| 536 | # | 713 | # |
| 537 | CONFIG_SERIAL_8250=y | 714 | CONFIG_SERIAL_8250=y |
| 538 | CONFIG_SERIAL_8250_CONSOLE=y | 715 | CONFIG_SERIAL_8250_CONSOLE=y |
| 716 | CONFIG_SERIAL_8250_PCI=y | ||
| 539 | CONFIG_SERIAL_8250_NR_UARTS=4 | 717 | CONFIG_SERIAL_8250_NR_UARTS=4 |
| 540 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | 718 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 |
| 541 | # CONFIG_SERIAL_8250_EXTENDED is not set | 719 | # CONFIG_SERIAL_8250_EXTENDED is not set |
| @@ -546,41 +724,91 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
| 546 | # CONFIG_SERIAL_UARTLITE is not set | 724 | # CONFIG_SERIAL_UARTLITE is not set |
| 547 | CONFIG_SERIAL_CORE=y | 725 | CONFIG_SERIAL_CORE=y |
| 548 | CONFIG_SERIAL_CORE_CONSOLE=y | 726 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 727 | # CONFIG_SERIAL_PMACZILOG is not set | ||
| 728 | # CONFIG_SERIAL_JSM is not set | ||
| 549 | # CONFIG_SERIAL_OF_PLATFORM is not set | 729 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 550 | CONFIG_UNIX98_PTYS=y | 730 | CONFIG_UNIX98_PTYS=y |
| 551 | CONFIG_LEGACY_PTYS=y | 731 | CONFIG_LEGACY_PTYS=y |
| 552 | CONFIG_LEGACY_PTY_COUNT=256 | 732 | CONFIG_LEGACY_PTY_COUNT=256 |
| 733 | # CONFIG_BRIQ_PANEL is not set | ||
| 734 | # CONFIG_HVC_RTAS is not set | ||
| 553 | # CONFIG_IPMI_HANDLER is not set | 735 | # CONFIG_IPMI_HANDLER is not set |
| 554 | # CONFIG_HW_RANDOM is not set | 736 | # CONFIG_HW_RANDOM is not set |
| 555 | # CONFIG_NVRAM is not set | 737 | # CONFIG_NVRAM is not set |
| 556 | CONFIG_GEN_RTC=y | 738 | CONFIG_GEN_RTC=y |
| 557 | # CONFIG_GEN_RTC_X is not set | 739 | # CONFIG_GEN_RTC_X is not set |
| 558 | # CONFIG_R3964 is not set | 740 | # CONFIG_R3964 is not set |
| 741 | # CONFIG_APPLICOM is not set | ||
| 559 | # CONFIG_RAW_DRIVER is not set | 742 | # CONFIG_RAW_DRIVER is not set |
| 560 | # CONFIG_TCG_TPM is not set | 743 | # CONFIG_TCG_TPM is not set |
| 744 | CONFIG_DEVPORT=y | ||
| 561 | CONFIG_I2C=y | 745 | CONFIG_I2C=y |
| 562 | CONFIG_I2C_BOARDINFO=y | 746 | CONFIG_I2C_BOARDINFO=y |
| 563 | CONFIG_I2C_CHARDEV=y | 747 | CONFIG_I2C_CHARDEV=y |
| 748 | CONFIG_I2C_HELPER_AUTO=y | ||
| 564 | 749 | ||
| 565 | # | 750 | # |
| 566 | # I2C Hardware Bus support | 751 | # I2C Hardware Bus support |
| 567 | # | 752 | # |
| 753 | |||
| 754 | # | ||
| 755 | # PC SMBus host controller drivers | ||
| 756 | # | ||
| 757 | # CONFIG_I2C_ALI1535 is not set | ||
| 758 | # CONFIG_I2C_ALI1563 is not set | ||
| 759 | # CONFIG_I2C_ALI15X3 is not set | ||
| 760 | # CONFIG_I2C_AMD756 is not set | ||
| 761 | # CONFIG_I2C_AMD8111 is not set | ||
| 762 | # CONFIG_I2C_I801 is not set | ||
| 763 | # CONFIG_I2C_ISCH is not set | ||
| 764 | # CONFIG_I2C_PIIX4 is not set | ||
| 765 | # CONFIG_I2C_NFORCE2 is not set | ||
| 766 | # CONFIG_I2C_SIS5595 is not set | ||
| 767 | # CONFIG_I2C_SIS630 is not set | ||
| 768 | # CONFIG_I2C_SIS96X is not set | ||
| 769 | # CONFIG_I2C_VIA is not set | ||
| 770 | # CONFIG_I2C_VIAPRO is not set | ||
| 771 | |||
| 772 | # | ||
| 773 | # Mac SMBus host controller drivers | ||
| 774 | # | ||
| 775 | # CONFIG_I2C_HYDRA is not set | ||
| 776 | CONFIG_I2C_POWERMAC=y | ||
| 777 | |||
| 778 | # | ||
| 779 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 780 | # | ||
| 568 | CONFIG_I2C_MPC=y | 781 | CONFIG_I2C_MPC=y |
| 569 | # CONFIG_I2C_OCORES is not set | 782 | # CONFIG_I2C_OCORES is not set |
| 570 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 571 | # CONFIG_I2C_SIMTEC is not set | 783 | # CONFIG_I2C_SIMTEC is not set |
| 784 | |||
| 785 | # | ||
| 786 | # External I2C/SMBus adapter drivers | ||
| 787 | # | ||
| 788 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 572 | # CONFIG_I2C_TAOS_EVM is not set | 789 | # CONFIG_I2C_TAOS_EVM is not set |
| 573 | # CONFIG_I2C_STUB is not set | ||
| 574 | # CONFIG_I2C_TINY_USB is not set | 790 | # CONFIG_I2C_TINY_USB is not set |
| 791 | |||
| 792 | # | ||
| 793 | # Graphics adapter I2C/DDC channel drivers | ||
| 794 | # | ||
| 795 | # CONFIG_I2C_VOODOO3 is not set | ||
| 796 | |||
| 797 | # | ||
| 798 | # Other I2C/SMBus bus drivers | ||
| 799 | # | ||
| 575 | # CONFIG_I2C_PCA_PLATFORM is not set | 800 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 801 | # CONFIG_I2C_STUB is not set | ||
| 576 | 802 | ||
| 577 | # | 803 | # |
| 578 | # Miscellaneous I2C Chip support | 804 | # Miscellaneous I2C Chip support |
| 579 | # | 805 | # |
| 580 | # CONFIG_DS1682 is not set | 806 | # CONFIG_DS1682 is not set |
| 807 | # CONFIG_AT24 is not set | ||
| 581 | # CONFIG_SENSORS_EEPROM is not set | 808 | # CONFIG_SENSORS_EEPROM is not set |
| 582 | # CONFIG_SENSORS_PCF8574 is not set | 809 | # CONFIG_SENSORS_PCF8574 is not set |
| 583 | # CONFIG_PCF8575 is not set | 810 | # CONFIG_PCF8575 is not set |
| 811 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 584 | # CONFIG_SENSORS_PCF8591 is not set | 812 | # CONFIG_SENSORS_PCF8591 is not set |
| 585 | # CONFIG_SENSORS_MAX6875 is not set | 813 | # CONFIG_SENSORS_MAX6875 is not set |
| 586 | # CONFIG_SENSORS_TSL2550 is not set | 814 | # CONFIG_SENSORS_TSL2550 is not set |
| @@ -589,10 +817,13 @@ CONFIG_I2C_MPC=y | |||
| 589 | # CONFIG_I2C_DEBUG_BUS is not set | 817 | # CONFIG_I2C_DEBUG_BUS is not set |
| 590 | # CONFIG_I2C_DEBUG_CHIP is not set | 818 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 591 | # CONFIG_SPI is not set | 819 | # CONFIG_SPI is not set |
| 820 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 821 | # CONFIG_GPIOLIB is not set | ||
| 592 | # CONFIG_W1 is not set | 822 | # CONFIG_W1 is not set |
| 593 | # CONFIG_POWER_SUPPLY is not set | 823 | # CONFIG_POWER_SUPPLY is not set |
| 594 | CONFIG_HWMON=y | 824 | CONFIG_HWMON=y |
| 595 | # CONFIG_HWMON_VID is not set | 825 | # CONFIG_HWMON_VID is not set |
| 826 | # CONFIG_SENSORS_AD7414 is not set | ||
| 596 | # CONFIG_SENSORS_AD7418 is not set | 827 | # CONFIG_SENSORS_AD7418 is not set |
| 597 | # CONFIG_SENSORS_ADM1021 is not set | 828 | # CONFIG_SENSORS_ADM1021 is not set |
| 598 | # CONFIG_SENSORS_ADM1025 is not set | 829 | # CONFIG_SENSORS_ADM1025 is not set |
| @@ -602,8 +833,10 @@ CONFIG_HWMON=y | |||
| 602 | # CONFIG_SENSORS_ADM9240 is not set | 833 | # CONFIG_SENSORS_ADM9240 is not set |
| 603 | # CONFIG_SENSORS_ADT7470 is not set | 834 | # CONFIG_SENSORS_ADT7470 is not set |
| 604 | # CONFIG_SENSORS_ADT7473 is not set | 835 | # CONFIG_SENSORS_ADT7473 is not set |
| 836 | # CONFIG_SENSORS_AMS is not set | ||
| 605 | # CONFIG_SENSORS_ATXP1 is not set | 837 | # CONFIG_SENSORS_ATXP1 is not set |
| 606 | # CONFIG_SENSORS_DS1621 is not set | 838 | # CONFIG_SENSORS_DS1621 is not set |
| 839 | # CONFIG_SENSORS_I5K_AMB is not set | ||
| 607 | # CONFIG_SENSORS_F71805F is not set | 840 | # CONFIG_SENSORS_F71805F is not set |
| 608 | # CONFIG_SENSORS_F71882FG is not set | 841 | # CONFIG_SENSORS_F71882FG is not set |
| 609 | # CONFIG_SENSORS_F75375S is not set | 842 | # CONFIG_SENSORS_F75375S is not set |
| @@ -625,13 +858,16 @@ CONFIG_HWMON=y | |||
| 625 | # CONFIG_SENSORS_MAX6650 is not set | 858 | # CONFIG_SENSORS_MAX6650 is not set |
| 626 | # CONFIG_SENSORS_PC87360 is not set | 859 | # CONFIG_SENSORS_PC87360 is not set |
| 627 | # CONFIG_SENSORS_PC87427 is not set | 860 | # CONFIG_SENSORS_PC87427 is not set |
| 861 | # CONFIG_SENSORS_SIS5595 is not set | ||
| 628 | # CONFIG_SENSORS_DME1737 is not set | 862 | # CONFIG_SENSORS_DME1737 is not set |
| 629 | # CONFIG_SENSORS_SMSC47M1 is not set | 863 | # CONFIG_SENSORS_SMSC47M1 is not set |
| 630 | # CONFIG_SENSORS_SMSC47M192 is not set | 864 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 631 | # CONFIG_SENSORS_SMSC47B397 is not set | 865 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 632 | # CONFIG_SENSORS_ADS7828 is not set | 866 | # CONFIG_SENSORS_ADS7828 is not set |
| 633 | # CONFIG_SENSORS_THMC50 is not set | 867 | # CONFIG_SENSORS_THMC50 is not set |
| 868 | # CONFIG_SENSORS_VIA686A is not set | ||
| 634 | # CONFIG_SENSORS_VT1211 is not set | 869 | # CONFIG_SENSORS_VT1211 is not set |
| 870 | # CONFIG_SENSORS_VT8231 is not set | ||
| 635 | # CONFIG_SENSORS_W83781D is not set | 871 | # CONFIG_SENSORS_W83781D is not set |
| 636 | # CONFIG_SENSORS_W83791D is not set | 872 | # CONFIG_SENSORS_W83791D is not set |
| 637 | # CONFIG_SENSORS_W83792D is not set | 873 | # CONFIG_SENSORS_W83792D is not set |
| @@ -642,6 +878,7 @@ CONFIG_HWMON=y | |||
| 642 | # CONFIG_SENSORS_W83627EHF is not set | 878 | # CONFIG_SENSORS_W83627EHF is not set |
| 643 | # CONFIG_HWMON_DEBUG_CHIP is not set | 879 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 644 | # CONFIG_THERMAL is not set | 880 | # CONFIG_THERMAL is not set |
| 881 | # CONFIG_THERMAL_HWMON is not set | ||
| 645 | CONFIG_WATCHDOG=y | 882 | CONFIG_WATCHDOG=y |
| 646 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 883 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
| 647 | 884 | ||
| @@ -649,7 +886,15 @@ CONFIG_WATCHDOG=y | |||
| 649 | # Watchdog Device Drivers | 886 | # Watchdog Device Drivers |
| 650 | # | 887 | # |
| 651 | # CONFIG_SOFT_WATCHDOG is not set | 888 | # CONFIG_SOFT_WATCHDOG is not set |
| 652 | CONFIG_83xx_WDT=y | 889 | # CONFIG_ALIM7101_WDT is not set |
| 890 | # CONFIG_8xxx_WDT is not set | ||
| 891 | # CONFIG_WATCHDOG_RTAS is not set | ||
| 892 | |||
| 893 | # | ||
| 894 | # PCI-based Watchdog Cards | ||
| 895 | # | ||
| 896 | # CONFIG_PCIPCWATCHDOG is not set | ||
| 897 | # CONFIG_WDTPCI is not set | ||
| 653 | 898 | ||
| 654 | # | 899 | # |
| 655 | # USB-based Watchdog Cards | 900 | # USB-based Watchdog Cards |
| @@ -665,8 +910,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 665 | # | 910 | # |
| 666 | # Multifunction device drivers | 911 | # Multifunction device drivers |
| 667 | # | 912 | # |
| 913 | # CONFIG_MFD_CORE is not set | ||
| 668 | # CONFIG_MFD_SM501 is not set | 914 | # CONFIG_MFD_SM501 is not set |
| 669 | # CONFIG_HTC_PASIC3 is not set | 915 | # CONFIG_HTC_PASIC3 is not set |
| 916 | # CONFIG_MFD_TMIO is not set | ||
| 670 | 917 | ||
| 671 | # | 918 | # |
| 672 | # Multimedia devices | 919 | # Multimedia devices |
| @@ -688,6 +935,8 @@ CONFIG_DAB=y | |||
| 688 | # | 935 | # |
| 689 | # Graphics support | 936 | # Graphics support |
| 690 | # | 937 | # |
| 938 | # CONFIG_AGP is not set | ||
| 939 | # CONFIG_DRM is not set | ||
| 691 | # CONFIG_VGASTATE is not set | 940 | # CONFIG_VGASTATE is not set |
| 692 | CONFIG_VIDEO_OUTPUT_CONTROL=m | 941 | CONFIG_VIDEO_OUTPUT_CONTROL=m |
| 693 | # CONFIG_FB is not set | 942 | # CONFIG_FB is not set |
| @@ -697,10 +946,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m | |||
| 697 | # Display device support | 946 | # Display device support |
| 698 | # | 947 | # |
| 699 | # CONFIG_DISPLAY_SUPPORT is not set | 948 | # CONFIG_DISPLAY_SUPPORT is not set |
| 700 | |||
| 701 | # | ||
| 702 | # Sound | ||
| 703 | # | ||
| 704 | # CONFIG_SOUND is not set | 949 | # CONFIG_SOUND is not set |
| 705 | CONFIG_HID_SUPPORT=y | 950 | CONFIG_HID_SUPPORT=y |
| 706 | CONFIG_HID=y | 951 | CONFIG_HID=y |
| @@ -716,7 +961,7 @@ CONFIG_USB_HID=y | |||
| 716 | # CONFIG_USB_HIDDEV is not set | 961 | # CONFIG_USB_HIDDEV is not set |
| 717 | CONFIG_USB_SUPPORT=y | 962 | CONFIG_USB_SUPPORT=y |
| 718 | CONFIG_USB_ARCH_HAS_HCD=y | 963 | CONFIG_USB_ARCH_HAS_HCD=y |
| 719 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 964 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 720 | CONFIG_USB_ARCH_HAS_EHCI=y | 965 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 721 | CONFIG_USB=y | 966 | CONFIG_USB=y |
| 722 | # CONFIG_USB_DEBUG is not set | 967 | # CONFIG_USB_DEBUG is not set |
| @@ -731,6 +976,7 @@ CONFIG_USB_DEVICE_CLASS=y | |||
| 731 | # CONFIG_USB_OTG is not set | 976 | # CONFIG_USB_OTG is not set |
| 732 | # CONFIG_USB_OTG_WHITELIST is not set | 977 | # CONFIG_USB_OTG_WHITELIST is not set |
| 733 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 978 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
| 979 | CONFIG_USB_MON=y | ||
| 734 | 980 | ||
| 735 | # | 981 | # |
| 736 | # USB Host Controller Drivers | 982 | # USB Host Controller Drivers |
| @@ -743,6 +989,8 @@ CONFIG_USB_EHCI_FSL=y | |||
| 743 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 989 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
| 744 | # CONFIG_USB_ISP116X_HCD is not set | 990 | # CONFIG_USB_ISP116X_HCD is not set |
| 745 | # CONFIG_USB_ISP1760_HCD is not set | 991 | # CONFIG_USB_ISP1760_HCD is not set |
| 992 | # CONFIG_USB_OHCI_HCD is not set | ||
| 993 | # CONFIG_USB_UHCI_HCD is not set | ||
| 746 | # CONFIG_USB_SL811_HCD is not set | 994 | # CONFIG_USB_SL811_HCD is not set |
| 747 | # CONFIG_USB_R8A66597_HCD is not set | 995 | # CONFIG_USB_R8A66597_HCD is not set |
| 748 | 996 | ||
| @@ -768,7 +1016,6 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y | |||
| 768 | # | 1016 | # |
| 769 | # CONFIG_USB_MDC800 is not set | 1017 | # CONFIG_USB_MDC800 is not set |
| 770 | # CONFIG_USB_MICROTEK is not set | 1018 | # CONFIG_USB_MICROTEK is not set |
| 771 | CONFIG_USB_MON=y | ||
| 772 | 1019 | ||
| 773 | # | 1020 | # |
| 774 | # USB port drivers | 1021 | # USB port drivers |
| @@ -781,7 +1028,6 @@ CONFIG_USB_MON=y | |||
| 781 | # CONFIG_USB_EMI62 is not set | 1028 | # CONFIG_USB_EMI62 is not set |
| 782 | # CONFIG_USB_EMI26 is not set | 1029 | # CONFIG_USB_EMI26 is not set |
| 783 | # CONFIG_USB_ADUTUX is not set | 1030 | # CONFIG_USB_ADUTUX is not set |
| 784 | # CONFIG_USB_AUERSWALD is not set | ||
| 785 | # CONFIG_USB_RIO500 is not set | 1031 | # CONFIG_USB_RIO500 is not set |
| 786 | # CONFIG_USB_LEGOTOWER is not set | 1032 | # CONFIG_USB_LEGOTOWER is not set |
| 787 | # CONFIG_USB_LCD is not set | 1033 | # CONFIG_USB_LCD is not set |
| @@ -803,6 +1049,7 @@ CONFIG_USB_MON=y | |||
| 803 | # CONFIG_MEMSTICK is not set | 1049 | # CONFIG_MEMSTICK is not set |
| 804 | # CONFIG_NEW_LEDS is not set | 1050 | # CONFIG_NEW_LEDS is not set |
| 805 | # CONFIG_ACCESSIBILITY is not set | 1051 | # CONFIG_ACCESSIBILITY is not set |
| 1052 | # CONFIG_INFINIBAND is not set | ||
| 806 | # CONFIG_EDAC is not set | 1053 | # CONFIG_EDAC is not set |
| 807 | # CONFIG_RTC_CLASS is not set | 1054 | # CONFIG_RTC_CLASS is not set |
| 808 | # CONFIG_DMADEVICES is not set | 1055 | # CONFIG_DMADEVICES is not set |
| @@ -872,6 +1119,7 @@ CONFIG_TMPFS=y | |||
| 872 | # CONFIG_CRAMFS is not set | 1119 | # CONFIG_CRAMFS is not set |
| 873 | # CONFIG_VXFS_FS is not set | 1120 | # CONFIG_VXFS_FS is not set |
| 874 | # CONFIG_MINIX_FS is not set | 1121 | # CONFIG_MINIX_FS is not set |
| 1122 | # CONFIG_OMFS_FS is not set | ||
| 875 | # CONFIG_HPFS_FS is not set | 1123 | # CONFIG_HPFS_FS is not set |
| 876 | # CONFIG_QNX4FS_FS is not set | 1124 | # CONFIG_QNX4FS_FS is not set |
| 877 | # CONFIG_ROMFS_FS is not set | 1125 | # CONFIG_ROMFS_FS is not set |
| @@ -882,14 +1130,13 @@ CONFIG_NFS_FS=y | |||
| 882 | CONFIG_NFS_V3=y | 1130 | CONFIG_NFS_V3=y |
| 883 | # CONFIG_NFS_V3_ACL is not set | 1131 | # CONFIG_NFS_V3_ACL is not set |
| 884 | CONFIG_NFS_V4=y | 1132 | CONFIG_NFS_V4=y |
| 885 | # CONFIG_NFSD is not set | ||
| 886 | CONFIG_ROOT_NFS=y | 1133 | CONFIG_ROOT_NFS=y |
| 1134 | # CONFIG_NFSD is not set | ||
| 887 | CONFIG_LOCKD=y | 1135 | CONFIG_LOCKD=y |
| 888 | CONFIG_LOCKD_V4=y | 1136 | CONFIG_LOCKD_V4=y |
| 889 | CONFIG_NFS_COMMON=y | 1137 | CONFIG_NFS_COMMON=y |
| 890 | CONFIG_SUNRPC=y | 1138 | CONFIG_SUNRPC=y |
| 891 | CONFIG_SUNRPC_GSS=y | 1139 | CONFIG_SUNRPC_GSS=y |
| 892 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 893 | CONFIG_RPCSEC_GSS_KRB5=y | 1140 | CONFIG_RPCSEC_GSS_KRB5=y |
| 894 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1141 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 895 | # CONFIG_SMB_FS is not set | 1142 | # CONFIG_SMB_FS is not set |
| @@ -929,6 +1176,7 @@ CONFIG_BITREVERSE=y | |||
| 929 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1176 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 930 | # CONFIG_CRC_CCITT is not set | 1177 | # CONFIG_CRC_CCITT is not set |
| 931 | # CONFIG_CRC16 is not set | 1178 | # CONFIG_CRC16 is not set |
| 1179 | CONFIG_CRC_T10DIF=y | ||
| 932 | # CONFIG_CRC_ITU_T is not set | 1180 | # CONFIG_CRC_ITU_T is not set |
| 933 | CONFIG_CRC32=y | 1181 | CONFIG_CRC32=y |
| 934 | # CONFIG_CRC7 is not set | 1182 | # CONFIG_CRC7 is not set |
| @@ -952,8 +1200,18 @@ CONFIG_FRAME_WARN=1024 | |||
| 952 | # CONFIG_HEADERS_CHECK is not set | 1200 | # CONFIG_HEADERS_CHECK is not set |
| 953 | # CONFIG_DEBUG_KERNEL is not set | 1201 | # CONFIG_DEBUG_KERNEL is not set |
| 954 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1202 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1203 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 1204 | # CONFIG_LATENCYTOP is not set | ||
| 1205 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1206 | CONFIG_HAVE_FTRACE=y | ||
| 1207 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1208 | # CONFIG_FTRACE is not set | ||
| 1209 | # CONFIG_SCHED_TRACER is not set | ||
| 1210 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 955 | # CONFIG_SAMPLES is not set | 1211 | # CONFIG_SAMPLES is not set |
| 1212 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 956 | # CONFIG_IRQSTACKS is not set | 1213 | # CONFIG_IRQSTACKS is not set |
| 1214 | # CONFIG_BOOTX_TEXT is not set | ||
| 957 | # CONFIG_PPC_EARLY_DEBUG is not set | 1215 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 958 | 1216 | ||
| 959 | # | 1217 | # |
| @@ -1011,6 +1269,10 @@ CONFIG_CRYPTO_PCBC=m | |||
| 1011 | # CONFIG_CRYPTO_MD4 is not set | 1269 | # CONFIG_CRYPTO_MD4 is not set |
| 1012 | CONFIG_CRYPTO_MD5=y | 1270 | CONFIG_CRYPTO_MD5=y |
| 1013 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1271 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 1272 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1273 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1274 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1275 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1014 | # CONFIG_CRYPTO_SHA1 is not set | 1276 | # CONFIG_CRYPTO_SHA1 is not set |
| 1015 | # CONFIG_CRYPTO_SHA256 is not set | 1277 | # CONFIG_CRYPTO_SHA256 is not set |
| 1016 | # CONFIG_CRYPTO_SHA512 is not set | 1278 | # CONFIG_CRYPTO_SHA512 is not set |
| @@ -1042,5 +1304,7 @@ CONFIG_CRYPTO_DES=y | |||
| 1042 | # CONFIG_CRYPTO_DEFLATE is not set | 1304 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1043 | # CONFIG_CRYPTO_LZO is not set | 1305 | # CONFIG_CRYPTO_LZO is not set |
| 1044 | CONFIG_CRYPTO_HW=y | 1306 | CONFIG_CRYPTO_HW=y |
| 1307 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | ||
| 1308 | # CONFIG_CRYPTO_DEV_TALITOS is not set | ||
| 1045 | # CONFIG_PPC_CLOCK is not set | 1309 | # CONFIG_PPC_CLOCK is not set |
| 1046 | # CONFIG_VIRTUALIZATION is not set | 1310 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/83xx/sbc834x_defconfig b/arch/powerpc/configs/83xx/sbc834x_defconfig index 1752918be2c1..9245a67da200 100644 --- a/arch/powerpc/configs/83xx/sbc834x_defconfig +++ b/arch/powerpc/configs/83xx/sbc834x_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.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Mon Jun 9 08:52:30 2008 | 4 | # Thu Aug 21 00:52:27 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -16,6 +16,7 @@ CONFIG_6xx=y | |||
| 16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
| 17 | CONFIG_PPC_FPU=y | 17 | CONFIG_PPC_FPU=y |
| 18 | # CONFIG_FSL_EMB_PERFMON is not set | 18 | # CONFIG_FSL_EMB_PERFMON is not set |
| 19 | # CONFIG_ALTIVEC is not set | ||
| 19 | CONFIG_PPC_STD_MMU=y | 20 | CONFIG_PPC_STD_MMU=y |
| 20 | CONFIG_PPC_STD_MMU_32=y | 21 | CONFIG_PPC_STD_MMU_32=y |
| 21 | # CONFIG_PPC_MM_SLICES is not set | 22 | # CONFIG_PPC_MM_SLICES is not set |
| @@ -32,6 +33,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | 35 | CONFIG_STACKTRACE_SUPPORT=y |
| 36 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | 37 | CONFIG_LOCKDEP_SUPPORT=y |
| 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 39 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| @@ -51,6 +53,9 @@ CONFIG_PPC_UDBG_16550=y | |||
| 51 | CONFIG_AUDIT_ARCH=y | 53 | CONFIG_AUDIT_ARCH=y |
| 52 | CONFIG_GENERIC_BUG=y | 54 | CONFIG_GENERIC_BUG=y |
| 53 | CONFIG_DEFAULT_UIMAGE=y | 55 | CONFIG_DEFAULT_UIMAGE=y |
| 56 | CONFIG_HIBERNATE_32=y | ||
| 57 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
| 58 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
| 54 | # CONFIG_PPC_DCR_NATIVE is not set | 59 | # CONFIG_PPC_DCR_NATIVE is not set |
| 55 | # CONFIG_PPC_DCR_MMIO is not set | 60 | # CONFIG_PPC_DCR_MMIO is not set |
| 56 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 61 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| @@ -88,12 +93,12 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 88 | CONFIG_SYSCTL=y | 93 | CONFIG_SYSCTL=y |
| 89 | CONFIG_EMBEDDED=y | 94 | CONFIG_EMBEDDED=y |
| 90 | CONFIG_SYSCTL_SYSCALL=y | 95 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 92 | # CONFIG_KALLSYMS is not set | 96 | # CONFIG_KALLSYMS is not set |
| 93 | CONFIG_HOTPLUG=y | 97 | CONFIG_HOTPLUG=y |
| 94 | CONFIG_PRINTK=y | 98 | CONFIG_PRINTK=y |
| 95 | CONFIG_BUG=y | 99 | CONFIG_BUG=y |
| 96 | CONFIG_ELF_CORE=y | 100 | CONFIG_ELF_CORE=y |
| 101 | CONFIG_PCSPKR_PLATFORM=y | ||
| 97 | CONFIG_COMPAT_BRK=y | 102 | CONFIG_COMPAT_BRK=y |
| 98 | CONFIG_BASE_FULL=y | 103 | CONFIG_BASE_FULL=y |
| 99 | CONFIG_FUTEX=y | 104 | CONFIG_FUTEX=y |
| @@ -110,10 +115,16 @@ CONFIG_SLAB=y | |||
| 110 | # CONFIG_PROFILING is not set | 115 | # CONFIG_PROFILING is not set |
| 111 | # CONFIG_MARKERS is not set | 116 | # CONFIG_MARKERS is not set |
| 112 | CONFIG_HAVE_OPROFILE=y | 117 | CONFIG_HAVE_OPROFILE=y |
| 118 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 119 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 113 | CONFIG_HAVE_KPROBES=y | 120 | CONFIG_HAVE_KPROBES=y |
| 114 | CONFIG_HAVE_KRETPROBES=y | 121 | CONFIG_HAVE_KRETPROBES=y |
| 122 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 115 | # CONFIG_HAVE_DMA_ATTRS is not set | 123 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 124 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 125 | # CONFIG_HAVE_CLK is not set | ||
| 116 | CONFIG_PROC_PAGE_MONITOR=y | 126 | CONFIG_PROC_PAGE_MONITOR=y |
| 127 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 117 | CONFIG_SLABINFO=y | 128 | CONFIG_SLABINFO=y |
| 118 | CONFIG_RT_MUTEXES=y | 129 | CONFIG_RT_MUTEXES=y |
| 119 | # CONFIG_TINY_SHMEM is not set | 130 | # CONFIG_TINY_SHMEM is not set |
| @@ -124,12 +135,13 @@ CONFIG_MODULE_UNLOAD=y | |||
| 124 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 135 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 125 | # CONFIG_MODVERSIONS is not set | 136 | # CONFIG_MODVERSIONS is not set |
| 126 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 137 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 127 | # CONFIG_KMOD is not set | 138 | CONFIG_KMOD=y |
| 128 | CONFIG_BLOCK=y | 139 | CONFIG_BLOCK=y |
| 129 | # CONFIG_LBD is not set | 140 | # CONFIG_LBD is not set |
| 130 | # CONFIG_BLK_DEV_IO_TRACE is not set | 141 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 131 | # CONFIG_LSF is not set | 142 | # CONFIG_LSF is not set |
| 132 | # CONFIG_BLK_DEV_BSG is not set | 143 | # CONFIG_BLK_DEV_BSG is not set |
| 144 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 133 | 145 | ||
| 134 | # | 146 | # |
| 135 | # IO Schedulers | 147 | # IO Schedulers |
| @@ -148,37 +160,49 @@ CONFIG_CLASSIC_RCU=y | |||
| 148 | # | 160 | # |
| 149 | # Platform support | 161 | # Platform support |
| 150 | # | 162 | # |
| 151 | # CONFIG_PPC_MULTIPLATFORM is not set | 163 | CONFIG_PPC_MULTIPLATFORM=y |
| 152 | # CONFIG_PPC_82xx is not set | 164 | CONFIG_CLASSIC32=y |
| 153 | CONFIG_PPC_83xx=y | 165 | CONFIG_PPC_CHRP=y |
| 154 | # CONFIG_PPC_86xx is not set | 166 | # CONFIG_MPC5121_ADS is not set |
| 155 | # CONFIG_PPC_MPC512x is not set | 167 | # CONFIG_MPC5121_GENERIC is not set |
| 156 | # CONFIG_PPC_MPC5121 is not set | 168 | # CONFIG_PPC_MPC52xx is not set |
| 169 | CONFIG_PPC_PMAC=y | ||
| 157 | # CONFIG_PPC_CELL is not set | 170 | # CONFIG_PPC_CELL is not set |
| 158 | # CONFIG_PPC_CELL_NATIVE is not set | 171 | # CONFIG_PPC_CELL_NATIVE is not set |
| 172 | # CONFIG_PPC_82xx is not set | ||
| 159 | # CONFIG_PQ2ADS is not set | 173 | # CONFIG_PQ2ADS is not set |
| 160 | CONFIG_MPC83xx=y | 174 | CONFIG_PPC_83xx=y |
| 161 | # CONFIG_MPC831x_RDB is not set | 175 | # CONFIG_MPC831x_RDB is not set |
| 162 | # CONFIG_MPC832x_MDS is not set | 176 | # CONFIG_MPC832x_MDS is not set |
| 163 | # CONFIG_MPC832x_RDB is not set | 177 | # CONFIG_MPC832x_RDB is not set |
| 164 | # CONFIG_MPC834x_MDS is not set | 178 | # CONFIG_MPC834x_MDS is not set |
| 165 | # CONFIG_MPC834x_ITX is not set | 179 | # CONFIG_MPC834x_ITX is not set |
| 166 | # CONFIG_MPC836x_MDS is not set | 180 | # CONFIG_MPC836x_MDS is not set |
| 181 | # CONFIG_MPC836x_RDK is not set | ||
| 167 | # CONFIG_MPC837x_MDS is not set | 182 | # CONFIG_MPC837x_MDS is not set |
| 168 | # CONFIG_MPC837x_RDB is not set | 183 | # CONFIG_MPC837x_RDB is not set |
| 169 | CONFIG_SBC834x=y | 184 | CONFIG_SBC834x=y |
| 185 | # CONFIG_ASP834x is not set | ||
| 170 | CONFIG_PPC_MPC834x=y | 186 | CONFIG_PPC_MPC834x=y |
| 187 | # CONFIG_PPC_86xx is not set | ||
| 188 | # CONFIG_EMBEDDED6xx is not set | ||
| 189 | CONFIG_PPC_NATIVE=y | ||
| 190 | # CONFIG_UDBG_RTAS_CONSOLE is not set | ||
| 171 | CONFIG_IPIC=y | 191 | CONFIG_IPIC=y |
| 172 | # CONFIG_MPIC is not set | 192 | CONFIG_MPIC=y |
| 173 | # CONFIG_MPIC_WEIRD is not set | 193 | # CONFIG_MPIC_WEIRD is not set |
| 174 | # CONFIG_PPC_I8259 is not set | 194 | CONFIG_PPC_I8259=y |
| 175 | # CONFIG_PPC_RTAS is not set | 195 | CONFIG_PPC_RTAS=y |
| 196 | # CONFIG_RTAS_ERROR_LOGGING is not set | ||
| 197 | CONFIG_RTAS_PROC=y | ||
| 176 | # CONFIG_MMIO_NVRAM is not set | 198 | # CONFIG_MMIO_NVRAM is not set |
| 177 | # CONFIG_PPC_MPC106 is not set | 199 | CONFIG_PPC_MPC106=y |
| 178 | # CONFIG_PPC_970_NAP is not set | 200 | # CONFIG_PPC_970_NAP is not set |
| 179 | # CONFIG_PPC_INDIRECT_IO is not set | 201 | # CONFIG_PPC_INDIRECT_IO is not set |
| 180 | # CONFIG_GENERIC_IOMAP is not set | 202 | # CONFIG_GENERIC_IOMAP is not set |
| 181 | # CONFIG_CPU_FREQ is not set | 203 | # CONFIG_CPU_FREQ is not set |
| 204 | # CONFIG_PPC601_SYNC_FIX is not set | ||
| 205 | # CONFIG_TAU is not set | ||
| 182 | # CONFIG_FSL_ULI1575 is not set | 206 | # CONFIG_FSL_ULI1575 is not set |
| 183 | 207 | ||
| 184 | # | 208 | # |
| @@ -204,6 +228,7 @@ CONFIG_BINFMT_ELF=y | |||
| 204 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 228 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| 205 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 229 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
| 206 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 230 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
| 231 | # CONFIG_KEXEC is not set | ||
| 207 | CONFIG_ARCH_FLATMEM_ENABLE=y | 232 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 208 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 233 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
| 209 | CONFIG_SELECT_MEMORY_MODEL=y | 234 | CONFIG_SELECT_MEMORY_MODEL=y |
| @@ -216,6 +241,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 216 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 241 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 217 | CONFIG_PAGEFLAGS_EXTENDED=y | 242 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 218 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 243 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 244 | CONFIG_MIGRATION=y | ||
| 219 | # CONFIG_RESOURCES_64BIT is not set | 245 | # CONFIG_RESOURCES_64BIT is not set |
| 220 | CONFIG_ZONE_DMA_FLAG=1 | 246 | CONFIG_ZONE_DMA_FLAG=1 |
| 221 | CONFIG_BOUNCE=y | 247 | CONFIG_BOUNCE=y |
| @@ -223,6 +249,7 @@ CONFIG_VIRT_TO_BUS=y | |||
| 223 | CONFIG_FORCE_MAX_ZONEORDER=11 | 249 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 224 | CONFIG_PROC_DEVICETREE=y | 250 | CONFIG_PROC_DEVICETREE=y |
| 225 | # CONFIG_CMDLINE_BOOL is not set | 251 | # CONFIG_CMDLINE_BOOL is not set |
| 252 | CONFIG_EXTRA_TARGETS="" | ||
| 226 | # CONFIG_PM is not set | 253 | # CONFIG_PM is not set |
| 227 | CONFIG_SECCOMP=y | 254 | CONFIG_SECCOMP=y |
| 228 | CONFIG_ISA_DMA_API=y | 255 | CONFIG_ISA_DMA_API=y |
| @@ -230,15 +257,22 @@ CONFIG_ISA_DMA_API=y | |||
| 230 | # | 257 | # |
| 231 | # Bus options | 258 | # Bus options |
| 232 | # | 259 | # |
| 260 | # CONFIG_ISA is not set | ||
| 233 | CONFIG_ZONE_DMA=y | 261 | CONFIG_ZONE_DMA=y |
| 234 | CONFIG_GENERIC_ISA_DMA=y | 262 | CONFIG_GENERIC_ISA_DMA=y |
| 235 | CONFIG_PPC_INDIRECT_PCI=y | 263 | CONFIG_PPC_INDIRECT_PCI=y |
| 236 | CONFIG_FSL_SOC=y | 264 | CONFIG_FSL_SOC=y |
| 237 | # CONFIG_PCI is not set | 265 | CONFIG_FSL_PCI=y |
| 238 | # CONFIG_PCI_DOMAINS is not set | 266 | CONFIG_PPC_PCI_CHOICE=y |
| 239 | # CONFIG_PCI_SYSCALL is not set | 267 | CONFIG_PCI=y |
| 240 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 268 | CONFIG_PCI_DOMAINS=y |
| 269 | CONFIG_PCI_SYSCALL=y | ||
| 270 | # CONFIG_PCIEPORTBUS is not set | ||
| 271 | CONFIG_ARCH_SUPPORTS_MSI=y | ||
| 272 | # CONFIG_PCI_MSI is not set | ||
| 273 | CONFIG_PCI_LEGACY=y | ||
| 241 | # CONFIG_PCCARD is not set | 274 | # CONFIG_PCCARD is not set |
| 275 | # CONFIG_HOTPLUG_PCI is not set | ||
| 242 | # CONFIG_HAS_RAPIDIO is not set | 276 | # CONFIG_HAS_RAPIDIO is not set |
| 243 | 277 | ||
| 244 | # | 278 | # |
| @@ -254,10 +288,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
| 254 | CONFIG_KERNEL_START=0xc0000000 | 288 | CONFIG_KERNEL_START=0xc0000000 |
| 255 | CONFIG_PHYSICAL_START=0x00000000 | 289 | CONFIG_PHYSICAL_START=0x00000000 |
| 256 | CONFIG_TASK_SIZE=0xc0000000 | 290 | CONFIG_TASK_SIZE=0xc0000000 |
| 257 | |||
| 258 | # | ||
| 259 | # Networking | ||
| 260 | # | ||
| 261 | CONFIG_NET=y | 291 | CONFIG_NET=y |
| 262 | 292 | ||
| 263 | # | 293 | # |
| @@ -358,19 +388,30 @@ CONFIG_OF_I2C=y | |||
| 358 | # CONFIG_PARPORT is not set | 388 | # CONFIG_PARPORT is not set |
| 359 | CONFIG_BLK_DEV=y | 389 | CONFIG_BLK_DEV=y |
| 360 | # CONFIG_BLK_DEV_FD is not set | 390 | # CONFIG_BLK_DEV_FD is not set |
| 391 | # CONFIG_MAC_FLOPPY is not set | ||
| 392 | # CONFIG_BLK_CPQ_DA is not set | ||
| 393 | # CONFIG_BLK_CPQ_CISS_DA is not set | ||
| 394 | # CONFIG_BLK_DEV_DAC960 is not set | ||
| 395 | # CONFIG_BLK_DEV_UMEM is not set | ||
| 361 | # CONFIG_BLK_DEV_COW_COMMON is not set | 396 | # CONFIG_BLK_DEV_COW_COMMON is not set |
| 362 | CONFIG_BLK_DEV_LOOP=y | 397 | CONFIG_BLK_DEV_LOOP=y |
| 363 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 398 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set |
| 364 | # CONFIG_BLK_DEV_NBD is not set | 399 | # CONFIG_BLK_DEV_NBD is not set |
| 400 | # CONFIG_BLK_DEV_SX8 is not set | ||
| 365 | CONFIG_BLK_DEV_RAM=y | 401 | CONFIG_BLK_DEV_RAM=y |
| 366 | CONFIG_BLK_DEV_RAM_COUNT=16 | 402 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 367 | CONFIG_BLK_DEV_RAM_SIZE=32768 | 403 | CONFIG_BLK_DEV_RAM_SIZE=32768 |
| 368 | # CONFIG_BLK_DEV_XIP is not set | 404 | # CONFIG_BLK_DEV_XIP is not set |
| 369 | # CONFIG_CDROM_PKTCDVD is not set | 405 | # CONFIG_CDROM_PKTCDVD is not set |
| 370 | # CONFIG_ATA_OVER_ETH is not set | 406 | # CONFIG_ATA_OVER_ETH is not set |
| 407 | # CONFIG_BLK_DEV_HD is not set | ||
| 371 | CONFIG_MISC_DEVICES=y | 408 | CONFIG_MISC_DEVICES=y |
| 409 | # CONFIG_PHANTOM is not set | ||
| 372 | # CONFIG_EEPROM_93CX6 is not set | 410 | # CONFIG_EEPROM_93CX6 is not set |
| 411 | # CONFIG_SGI_IOC4 is not set | ||
| 412 | # CONFIG_TIFM_CORE is not set | ||
| 373 | # CONFIG_ENCLOSURE_SERVICES is not set | 413 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 414 | # CONFIG_HP_ILO is not set | ||
| 374 | CONFIG_HAVE_IDE=y | 415 | CONFIG_HAVE_IDE=y |
| 375 | # CONFIG_IDE is not set | 416 | # CONFIG_IDE is not set |
| 376 | 417 | ||
| @@ -383,15 +424,27 @@ CONFIG_HAVE_IDE=y | |||
| 383 | # CONFIG_SCSI_NETLINK is not set | 424 | # CONFIG_SCSI_NETLINK is not set |
| 384 | # CONFIG_ATA is not set | 425 | # CONFIG_ATA is not set |
| 385 | # CONFIG_MD is not set | 426 | # CONFIG_MD is not set |
| 427 | # CONFIG_FUSION is not set | ||
| 428 | |||
| 429 | # | ||
| 430 | # IEEE 1394 (FireWire) support | ||
| 431 | # | ||
| 432 | |||
| 433 | # | ||
| 434 | # Enable only one of the two stacks, unless you know what you are doing | ||
| 435 | # | ||
| 436 | # CONFIG_FIREWIRE is not set | ||
| 437 | # CONFIG_IEEE1394 is not set | ||
| 438 | # CONFIG_I2O is not set | ||
| 386 | # CONFIG_MACINTOSH_DRIVERS is not set | 439 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 387 | CONFIG_NETDEVICES=y | 440 | CONFIG_NETDEVICES=y |
| 388 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 389 | # CONFIG_DUMMY is not set | 441 | # CONFIG_DUMMY is not set |
| 390 | # CONFIG_BONDING is not set | 442 | # CONFIG_BONDING is not set |
| 391 | # CONFIG_MACVLAN is not set | 443 | # CONFIG_MACVLAN is not set |
| 392 | # CONFIG_EQUALIZER is not set | 444 | # CONFIG_EQUALIZER is not set |
| 393 | # CONFIG_TUN is not set | 445 | # CONFIG_TUN is not set |
| 394 | # CONFIG_VETH is not set | 446 | # CONFIG_VETH is not set |
| 447 | # CONFIG_ARCNET is not set | ||
| 395 | CONFIG_PHYLIB=y | 448 | CONFIG_PHYLIB=y |
| 396 | 449 | ||
| 397 | # | 450 | # |
| @@ -411,16 +464,44 @@ CONFIG_BROADCOM_PHY=y | |||
| 411 | # CONFIG_MDIO_BITBANG is not set | 464 | # CONFIG_MDIO_BITBANG is not set |
| 412 | CONFIG_NET_ETHERNET=y | 465 | CONFIG_NET_ETHERNET=y |
| 413 | CONFIG_MII=y | 466 | CONFIG_MII=y |
| 467 | # CONFIG_MACE is not set | ||
| 468 | # CONFIG_BMAC is not set | ||
| 469 | # CONFIG_HAPPYMEAL is not set | ||
| 470 | # CONFIG_SUNGEM is not set | ||
| 471 | # CONFIG_CASSINI is not set | ||
| 472 | # CONFIG_NET_VENDOR_3COM is not set | ||
| 473 | # CONFIG_NET_TULIP is not set | ||
| 474 | # CONFIG_HP100 is not set | ||
| 414 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 475 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
| 415 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 476 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 416 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 477 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| 417 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 478 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
| 479 | # CONFIG_NET_PCI is not set | ||
| 418 | # CONFIG_B44 is not set | 480 | # CONFIG_B44 is not set |
| 419 | CONFIG_NETDEV_1000=y | 481 | CONFIG_NETDEV_1000=y |
| 420 | # CONFIG_E1000E_ENABLED is not set | 482 | # CONFIG_ACENIC is not set |
| 483 | # CONFIG_DL2K is not set | ||
| 484 | # CONFIG_E1000 is not set | ||
| 485 | # CONFIG_E1000E is not set | ||
| 486 | # CONFIG_IP1000 is not set | ||
| 487 | # CONFIG_IGB is not set | ||
| 488 | # CONFIG_NS83820 is not set | ||
| 489 | # CONFIG_HAMACHI is not set | ||
| 490 | # CONFIG_YELLOWFIN is not set | ||
| 491 | # CONFIG_R8169 is not set | ||
| 492 | # CONFIG_SIS190 is not set | ||
| 493 | # CONFIG_SKGE is not set | ||
| 494 | # CONFIG_SKY2 is not set | ||
| 495 | # CONFIG_VIA_VELOCITY is not set | ||
| 496 | # CONFIG_TIGON3 is not set | ||
| 497 | # CONFIG_BNX2 is not set | ||
| 421 | CONFIG_GIANFAR=y | 498 | CONFIG_GIANFAR=y |
| 422 | # CONFIG_GFAR_NAPI is not set | 499 | # CONFIG_MV643XX_ETH is not set |
| 500 | # CONFIG_QLA3XXX is not set | ||
| 501 | # CONFIG_ATL1 is not set | ||
| 502 | # CONFIG_ATL1E is not set | ||
| 423 | # CONFIG_NETDEV_10000 is not set | 503 | # CONFIG_NETDEV_10000 is not set |
| 504 | # CONFIG_TR is not set | ||
| 424 | 505 | ||
| 425 | # | 506 | # |
| 426 | # Wireless LAN | 507 | # Wireless LAN |
| @@ -429,6 +510,8 @@ CONFIG_GIANFAR=y | |||
| 429 | # CONFIG_WLAN_80211 is not set | 510 | # CONFIG_WLAN_80211 is not set |
| 430 | # CONFIG_IWLWIFI_LEDS is not set | 511 | # CONFIG_IWLWIFI_LEDS is not set |
| 431 | # CONFIG_WAN is not set | 512 | # CONFIG_WAN is not set |
| 513 | # CONFIG_FDDI is not set | ||
| 514 | # CONFIG_HIPPI is not set | ||
| 432 | # CONFIG_PPP is not set | 515 | # CONFIG_PPP is not set |
| 433 | # CONFIG_SLIP is not set | 516 | # CONFIG_SLIP is not set |
| 434 | # CONFIG_NETCONSOLE is not set | 517 | # CONFIG_NETCONSOLE is not set |
| @@ -474,12 +557,14 @@ CONFIG_INPUT=y | |||
| 474 | # CONFIG_VT is not set | 557 | # CONFIG_VT is not set |
| 475 | CONFIG_DEVKMEM=y | 558 | CONFIG_DEVKMEM=y |
| 476 | # CONFIG_SERIAL_NONSTANDARD is not set | 559 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 560 | # CONFIG_NOZOMI is not set | ||
| 477 | 561 | ||
| 478 | # | 562 | # |
| 479 | # Serial drivers | 563 | # Serial drivers |
| 480 | # | 564 | # |
| 481 | CONFIG_SERIAL_8250=y | 565 | CONFIG_SERIAL_8250=y |
| 482 | CONFIG_SERIAL_8250_CONSOLE=y | 566 | CONFIG_SERIAL_8250_CONSOLE=y |
| 567 | CONFIG_SERIAL_8250_PCI=y | ||
| 483 | CONFIG_SERIAL_8250_NR_UARTS=4 | 568 | CONFIG_SERIAL_8250_NR_UARTS=4 |
| 484 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | 569 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 |
| 485 | # CONFIG_SERIAL_8250_EXTENDED is not set | 570 | # CONFIG_SERIAL_8250_EXTENDED is not set |
| @@ -490,40 +575,90 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
| 490 | # CONFIG_SERIAL_UARTLITE is not set | 575 | # CONFIG_SERIAL_UARTLITE is not set |
| 491 | CONFIG_SERIAL_CORE=y | 576 | CONFIG_SERIAL_CORE=y |
| 492 | CONFIG_SERIAL_CORE_CONSOLE=y | 577 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 578 | # CONFIG_SERIAL_PMACZILOG is not set | ||
| 579 | # CONFIG_SERIAL_JSM is not set | ||
| 493 | # CONFIG_SERIAL_OF_PLATFORM is not set | 580 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 494 | CONFIG_UNIX98_PTYS=y | 581 | CONFIG_UNIX98_PTYS=y |
| 495 | CONFIG_LEGACY_PTYS=y | 582 | CONFIG_LEGACY_PTYS=y |
| 496 | CONFIG_LEGACY_PTY_COUNT=256 | 583 | CONFIG_LEGACY_PTY_COUNT=256 |
| 584 | # CONFIG_BRIQ_PANEL is not set | ||
| 585 | # CONFIG_HVC_RTAS is not set | ||
| 497 | # CONFIG_IPMI_HANDLER is not set | 586 | # CONFIG_IPMI_HANDLER is not set |
| 498 | # CONFIG_HW_RANDOM is not set | 587 | # CONFIG_HW_RANDOM is not set |
| 499 | # CONFIG_NVRAM is not set | 588 | # CONFIG_NVRAM is not set |
| 500 | CONFIG_GEN_RTC=y | 589 | CONFIG_GEN_RTC=y |
| 501 | # CONFIG_GEN_RTC_X is not set | 590 | # CONFIG_GEN_RTC_X is not set |
| 502 | # CONFIG_R3964 is not set | 591 | # CONFIG_R3964 is not set |
| 592 | # CONFIG_APPLICOM is not set | ||
| 503 | # CONFIG_RAW_DRIVER is not set | 593 | # CONFIG_RAW_DRIVER is not set |
| 504 | # CONFIG_TCG_TPM is not set | 594 | # CONFIG_TCG_TPM is not set |
| 595 | CONFIG_DEVPORT=y | ||
| 505 | CONFIG_I2C=y | 596 | CONFIG_I2C=y |
| 506 | CONFIG_I2C_BOARDINFO=y | 597 | CONFIG_I2C_BOARDINFO=y |
| 507 | CONFIG_I2C_CHARDEV=y | 598 | CONFIG_I2C_CHARDEV=y |
| 599 | CONFIG_I2C_HELPER_AUTO=y | ||
| 508 | 600 | ||
| 509 | # | 601 | # |
| 510 | # I2C Hardware Bus support | 602 | # I2C Hardware Bus support |
| 511 | # | 603 | # |
| 604 | |||
| 605 | # | ||
| 606 | # PC SMBus host controller drivers | ||
| 607 | # | ||
| 608 | # CONFIG_I2C_ALI1535 is not set | ||
| 609 | # CONFIG_I2C_ALI1563 is not set | ||
| 610 | # CONFIG_I2C_ALI15X3 is not set | ||
| 611 | # CONFIG_I2C_AMD756 is not set | ||
| 612 | # CONFIG_I2C_AMD8111 is not set | ||
| 613 | # CONFIG_I2C_I801 is not set | ||
| 614 | # CONFIG_I2C_ISCH is not set | ||
| 615 | # CONFIG_I2C_PIIX4 is not set | ||
| 616 | # CONFIG_I2C_NFORCE2 is not set | ||
| 617 | # CONFIG_I2C_SIS5595 is not set | ||
| 618 | # CONFIG_I2C_SIS630 is not set | ||
| 619 | # CONFIG_I2C_SIS96X is not set | ||
| 620 | # CONFIG_I2C_VIA is not set | ||
| 621 | # CONFIG_I2C_VIAPRO is not set | ||
| 622 | |||
| 623 | # | ||
| 624 | # Mac SMBus host controller drivers | ||
| 625 | # | ||
| 626 | # CONFIG_I2C_HYDRA is not set | ||
| 627 | CONFIG_I2C_POWERMAC=y | ||
| 628 | |||
| 629 | # | ||
| 630 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 631 | # | ||
| 512 | CONFIG_I2C_MPC=y | 632 | CONFIG_I2C_MPC=y |
| 513 | # CONFIG_I2C_OCORES is not set | 633 | # CONFIG_I2C_OCORES is not set |
| 514 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 515 | # CONFIG_I2C_SIMTEC is not set | 634 | # CONFIG_I2C_SIMTEC is not set |
| 635 | |||
| 636 | # | ||
| 637 | # External I2C/SMBus adapter drivers | ||
| 638 | # | ||
| 639 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 516 | # CONFIG_I2C_TAOS_EVM is not set | 640 | # CONFIG_I2C_TAOS_EVM is not set |
| 517 | # CONFIG_I2C_STUB is not set | 641 | |
| 642 | # | ||
| 643 | # Graphics adapter I2C/DDC channel drivers | ||
| 644 | # | ||
| 645 | # CONFIG_I2C_VOODOO3 is not set | ||
| 646 | |||
| 647 | # | ||
| 648 | # Other I2C/SMBus bus drivers | ||
| 649 | # | ||
| 518 | # CONFIG_I2C_PCA_PLATFORM is not set | 650 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 651 | # CONFIG_I2C_STUB is not set | ||
| 519 | 652 | ||
| 520 | # | 653 | # |
| 521 | # Miscellaneous I2C Chip support | 654 | # Miscellaneous I2C Chip support |
| 522 | # | 655 | # |
| 523 | # CONFIG_DS1682 is not set | 656 | # CONFIG_DS1682 is not set |
| 657 | # CONFIG_AT24 is not set | ||
| 524 | # CONFIG_SENSORS_EEPROM is not set | 658 | # CONFIG_SENSORS_EEPROM is not set |
| 525 | # CONFIG_SENSORS_PCF8574 is not set | 659 | # CONFIG_SENSORS_PCF8574 is not set |
| 526 | # CONFIG_PCF8575 is not set | 660 | # CONFIG_PCF8575 is not set |
| 661 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 527 | # CONFIG_SENSORS_PCF8591 is not set | 662 | # CONFIG_SENSORS_PCF8591 is not set |
| 528 | # CONFIG_SENSORS_MAX6875 is not set | 663 | # CONFIG_SENSORS_MAX6875 is not set |
| 529 | # CONFIG_SENSORS_TSL2550 is not set | 664 | # CONFIG_SENSORS_TSL2550 is not set |
| @@ -532,10 +667,13 @@ CONFIG_I2C_MPC=y | |||
| 532 | # CONFIG_I2C_DEBUG_BUS is not set | 667 | # CONFIG_I2C_DEBUG_BUS is not set |
| 533 | # CONFIG_I2C_DEBUG_CHIP is not set | 668 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 534 | # CONFIG_SPI is not set | 669 | # CONFIG_SPI is not set |
| 670 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 671 | # CONFIG_GPIOLIB is not set | ||
| 535 | # CONFIG_W1 is not set | 672 | # CONFIG_W1 is not set |
| 536 | # CONFIG_POWER_SUPPLY is not set | 673 | # CONFIG_POWER_SUPPLY is not set |
| 537 | CONFIG_HWMON=y | 674 | CONFIG_HWMON=y |
| 538 | # CONFIG_HWMON_VID is not set | 675 | # CONFIG_HWMON_VID is not set |
| 676 | # CONFIG_SENSORS_AD7414 is not set | ||
| 539 | # CONFIG_SENSORS_AD7418 is not set | 677 | # CONFIG_SENSORS_AD7418 is not set |
| 540 | # CONFIG_SENSORS_ADM1021 is not set | 678 | # CONFIG_SENSORS_ADM1021 is not set |
| 541 | # CONFIG_SENSORS_ADM1025 is not set | 679 | # CONFIG_SENSORS_ADM1025 is not set |
| @@ -545,8 +683,10 @@ CONFIG_HWMON=y | |||
| 545 | # CONFIG_SENSORS_ADM9240 is not set | 683 | # CONFIG_SENSORS_ADM9240 is not set |
| 546 | # CONFIG_SENSORS_ADT7470 is not set | 684 | # CONFIG_SENSORS_ADT7470 is not set |
| 547 | # CONFIG_SENSORS_ADT7473 is not set | 685 | # CONFIG_SENSORS_ADT7473 is not set |
| 686 | # CONFIG_SENSORS_AMS is not set | ||
| 548 | # CONFIG_SENSORS_ATXP1 is not set | 687 | # CONFIG_SENSORS_ATXP1 is not set |
| 549 | # CONFIG_SENSORS_DS1621 is not set | 688 | # CONFIG_SENSORS_DS1621 is not set |
| 689 | # CONFIG_SENSORS_I5K_AMB is not set | ||
| 550 | # CONFIG_SENSORS_F71805F is not set | 690 | # CONFIG_SENSORS_F71805F is not set |
| 551 | # CONFIG_SENSORS_F71882FG is not set | 691 | # CONFIG_SENSORS_F71882FG is not set |
| 552 | # CONFIG_SENSORS_F75375S is not set | 692 | # CONFIG_SENSORS_F75375S is not set |
| @@ -568,13 +708,16 @@ CONFIG_HWMON=y | |||
| 568 | # CONFIG_SENSORS_MAX6650 is not set | 708 | # CONFIG_SENSORS_MAX6650 is not set |
| 569 | # CONFIG_SENSORS_PC87360 is not set | 709 | # CONFIG_SENSORS_PC87360 is not set |
| 570 | # CONFIG_SENSORS_PC87427 is not set | 710 | # CONFIG_SENSORS_PC87427 is not set |
| 711 | # CONFIG_SENSORS_SIS5595 is not set | ||
| 571 | # CONFIG_SENSORS_DME1737 is not set | 712 | # CONFIG_SENSORS_DME1737 is not set |
| 572 | # CONFIG_SENSORS_SMSC47M1 is not set | 713 | # CONFIG_SENSORS_SMSC47M1 is not set |
| 573 | # CONFIG_SENSORS_SMSC47M192 is not set | 714 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 574 | # CONFIG_SENSORS_SMSC47B397 is not set | 715 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 575 | # CONFIG_SENSORS_ADS7828 is not set | 716 | # CONFIG_SENSORS_ADS7828 is not set |
| 576 | # CONFIG_SENSORS_THMC50 is not set | 717 | # CONFIG_SENSORS_THMC50 is not set |
| 718 | # CONFIG_SENSORS_VIA686A is not set | ||
| 577 | # CONFIG_SENSORS_VT1211 is not set | 719 | # CONFIG_SENSORS_VT1211 is not set |
| 720 | # CONFIG_SENSORS_VT8231 is not set | ||
| 578 | # CONFIG_SENSORS_W83781D is not set | 721 | # CONFIG_SENSORS_W83781D is not set |
| 579 | # CONFIG_SENSORS_W83791D is not set | 722 | # CONFIG_SENSORS_W83791D is not set |
| 580 | # CONFIG_SENSORS_W83792D is not set | 723 | # CONFIG_SENSORS_W83792D is not set |
| @@ -585,6 +728,7 @@ CONFIG_HWMON=y | |||
| 585 | # CONFIG_SENSORS_W83627EHF is not set | 728 | # CONFIG_SENSORS_W83627EHF is not set |
| 586 | # CONFIG_HWMON_DEBUG_CHIP is not set | 729 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 587 | # CONFIG_THERMAL is not set | 730 | # CONFIG_THERMAL is not set |
| 731 | # CONFIG_THERMAL_HWMON is not set | ||
| 588 | CONFIG_WATCHDOG=y | 732 | CONFIG_WATCHDOG=y |
| 589 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 733 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
| 590 | 734 | ||
| @@ -592,7 +736,15 @@ CONFIG_WATCHDOG=y | |||
| 592 | # Watchdog Device Drivers | 736 | # Watchdog Device Drivers |
| 593 | # | 737 | # |
| 594 | # CONFIG_SOFT_WATCHDOG is not set | 738 | # CONFIG_SOFT_WATCHDOG is not set |
| 595 | CONFIG_83xx_WDT=y | 739 | # CONFIG_ALIM7101_WDT is not set |
| 740 | # CONFIG_8xxx_WDT is not set | ||
| 741 | # CONFIG_WATCHDOG_RTAS is not set | ||
| 742 | |||
| 743 | # | ||
| 744 | # PCI-based Watchdog Cards | ||
| 745 | # | ||
| 746 | # CONFIG_PCIPCWATCHDOG is not set | ||
| 747 | # CONFIG_WDTPCI is not set | ||
| 596 | 748 | ||
| 597 | # | 749 | # |
| 598 | # Sonics Silicon Backplane | 750 | # Sonics Silicon Backplane |
| @@ -603,8 +755,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 603 | # | 755 | # |
| 604 | # Multifunction device drivers | 756 | # Multifunction device drivers |
| 605 | # | 757 | # |
| 758 | # CONFIG_MFD_CORE is not set | ||
| 606 | # CONFIG_MFD_SM501 is not set | 759 | # CONFIG_MFD_SM501 is not set |
| 607 | # CONFIG_HTC_PASIC3 is not set | 760 | # CONFIG_HTC_PASIC3 is not set |
| 761 | # CONFIG_MFD_TMIO is not set | ||
| 608 | 762 | ||
| 609 | # | 763 | # |
| 610 | # Multimedia devices | 764 | # Multimedia devices |
| @@ -625,6 +779,8 @@ CONFIG_SSB_POSSIBLE=y | |||
| 625 | # | 779 | # |
| 626 | # Graphics support | 780 | # Graphics support |
| 627 | # | 781 | # |
| 782 | # CONFIG_AGP is not set | ||
| 783 | # CONFIG_DRM is not set | ||
| 628 | # CONFIG_VGASTATE is not set | 784 | # CONFIG_VGASTATE is not set |
| 629 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | 785 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set |
| 630 | # CONFIG_FB is not set | 786 | # CONFIG_FB is not set |
| @@ -634,10 +790,6 @@ CONFIG_SSB_POSSIBLE=y | |||
| 634 | # Display device support | 790 | # Display device support |
| 635 | # | 791 | # |
| 636 | # CONFIG_DISPLAY_SUPPORT is not set | 792 | # CONFIG_DISPLAY_SUPPORT is not set |
| 637 | |||
| 638 | # | ||
| 639 | # Sound | ||
| 640 | # | ||
| 641 | # CONFIG_SOUND is not set | 793 | # CONFIG_SOUND is not set |
| 642 | CONFIG_HID_SUPPORT=y | 794 | CONFIG_HID_SUPPORT=y |
| 643 | CONFIG_HID=y | 795 | CONFIG_HID=y |
| @@ -648,6 +800,7 @@ CONFIG_HID=y | |||
| 648 | # CONFIG_MEMSTICK is not set | 800 | # CONFIG_MEMSTICK is not set |
| 649 | # CONFIG_NEW_LEDS is not set | 801 | # CONFIG_NEW_LEDS is not set |
| 650 | # CONFIG_ACCESSIBILITY is not set | 802 | # CONFIG_ACCESSIBILITY is not set |
| 803 | # CONFIG_INFINIBAND is not set | ||
| 651 | # CONFIG_EDAC is not set | 804 | # CONFIG_EDAC is not set |
| 652 | # CONFIG_RTC_CLASS is not set | 805 | # CONFIG_RTC_CLASS is not set |
| 653 | # CONFIG_DMADEVICES is not set | 806 | # CONFIG_DMADEVICES is not set |
| @@ -710,6 +863,7 @@ CONFIG_TMPFS=y | |||
| 710 | # CONFIG_CRAMFS is not set | 863 | # CONFIG_CRAMFS is not set |
| 711 | # CONFIG_VXFS_FS is not set | 864 | # CONFIG_VXFS_FS is not set |
| 712 | # CONFIG_MINIX_FS is not set | 865 | # CONFIG_MINIX_FS is not set |
| 866 | # CONFIG_OMFS_FS is not set | ||
| 713 | # CONFIG_HPFS_FS is not set | 867 | # CONFIG_HPFS_FS is not set |
| 714 | # CONFIG_QNX4FS_FS is not set | 868 | # CONFIG_QNX4FS_FS is not set |
| 715 | # CONFIG_ROMFS_FS is not set | 869 | # CONFIG_ROMFS_FS is not set |
| @@ -720,14 +874,13 @@ CONFIG_NFS_FS=y | |||
| 720 | CONFIG_NFS_V3=y | 874 | CONFIG_NFS_V3=y |
| 721 | # CONFIG_NFS_V3_ACL is not set | 875 | # CONFIG_NFS_V3_ACL is not set |
| 722 | CONFIG_NFS_V4=y | 876 | CONFIG_NFS_V4=y |
| 723 | # CONFIG_NFSD is not set | ||
| 724 | CONFIG_ROOT_NFS=y | 877 | CONFIG_ROOT_NFS=y |
| 878 | # CONFIG_NFSD is not set | ||
| 725 | CONFIG_LOCKD=y | 879 | CONFIG_LOCKD=y |
| 726 | CONFIG_LOCKD_V4=y | 880 | CONFIG_LOCKD_V4=y |
| 727 | CONFIG_NFS_COMMON=y | 881 | CONFIG_NFS_COMMON=y |
| 728 | CONFIG_SUNRPC=y | 882 | CONFIG_SUNRPC=y |
| 729 | CONFIG_SUNRPC_GSS=y | 883 | CONFIG_SUNRPC_GSS=y |
| 730 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 731 | CONFIG_RPCSEC_GSS_KRB5=y | 884 | CONFIG_RPCSEC_GSS_KRB5=y |
| 732 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 885 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 733 | # CONFIG_SMB_FS is not set | 886 | # CONFIG_SMB_FS is not set |
| @@ -740,6 +893,7 @@ CONFIG_RPCSEC_GSS_KRB5=y | |||
| 740 | # Partition Types | 893 | # Partition Types |
| 741 | # | 894 | # |
| 742 | # CONFIG_PARTITION_ADVANCED is not set | 895 | # CONFIG_PARTITION_ADVANCED is not set |
| 896 | CONFIG_MAC_PARTITION=y | ||
| 743 | CONFIG_MSDOS_PARTITION=y | 897 | CONFIG_MSDOS_PARTITION=y |
| 744 | # CONFIG_NLS is not set | 898 | # CONFIG_NLS is not set |
| 745 | # CONFIG_DLM is not set | 899 | # CONFIG_DLM is not set |
| @@ -751,6 +905,7 @@ CONFIG_BITREVERSE=y | |||
| 751 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 905 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 752 | # CONFIG_CRC_CCITT is not set | 906 | # CONFIG_CRC_CCITT is not set |
| 753 | # CONFIG_CRC16 is not set | 907 | # CONFIG_CRC16 is not set |
| 908 | # CONFIG_CRC_T10DIF is not set | ||
| 754 | # CONFIG_CRC_ITU_T is not set | 909 | # CONFIG_CRC_ITU_T is not set |
| 755 | CONFIG_CRC32=y | 910 | CONFIG_CRC32=y |
| 756 | # CONFIG_CRC7 is not set | 911 | # CONFIG_CRC7 is not set |
| @@ -774,8 +929,18 @@ CONFIG_FRAME_WARN=1024 | |||
| 774 | # CONFIG_HEADERS_CHECK is not set | 929 | # CONFIG_HEADERS_CHECK is not set |
| 775 | # CONFIG_DEBUG_KERNEL is not set | 930 | # CONFIG_DEBUG_KERNEL is not set |
| 776 | # CONFIG_DEBUG_BUGVERBOSE is not set | 931 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 932 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 933 | # CONFIG_LATENCYTOP is not set | ||
| 934 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 935 | CONFIG_HAVE_FTRACE=y | ||
| 936 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 937 | # CONFIG_FTRACE is not set | ||
| 938 | # CONFIG_SCHED_TRACER is not set | ||
| 939 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 777 | # CONFIG_SAMPLES is not set | 940 | # CONFIG_SAMPLES is not set |
| 941 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 778 | # CONFIG_IRQSTACKS is not set | 942 | # CONFIG_IRQSTACKS is not set |
| 943 | # CONFIG_BOOTX_TEXT is not set | ||
| 779 | # CONFIG_PPC_EARLY_DEBUG is not set | 944 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 780 | 945 | ||
| 781 | # | 946 | # |
| @@ -829,6 +994,10 @@ CONFIG_CRYPTO_PCBC=m | |||
| 829 | # CONFIG_CRYPTO_MD4 is not set | 994 | # CONFIG_CRYPTO_MD4 is not set |
| 830 | CONFIG_CRYPTO_MD5=y | 995 | CONFIG_CRYPTO_MD5=y |
| 831 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 996 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 997 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 998 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 999 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1000 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 832 | # CONFIG_CRYPTO_SHA1 is not set | 1001 | # CONFIG_CRYPTO_SHA1 is not set |
| 833 | # CONFIG_CRYPTO_SHA256 is not set | 1002 | # CONFIG_CRYPTO_SHA256 is not set |
| 834 | # CONFIG_CRYPTO_SHA512 is not set | 1003 | # CONFIG_CRYPTO_SHA512 is not set |
diff --git a/arch/powerpc/configs/85xx/ksi8560_defconfig b/arch/powerpc/configs/85xx/ksi8560_defconfig index b82bb042308a..8bb89f26a20d 100644 --- a/arch/powerpc/configs/85xx/ksi8560_defconfig +++ b/arch/powerpc/configs/85xx/ksi8560_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.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Mon Jun 9 08:52:30 2008 | 4 | # Thu Aug 21 00:52:28 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -15,6 +15,7 @@ CONFIG_PPC_85xx=y | |||
| 15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
| 16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
| 17 | CONFIG_E500=y | 17 | CONFIG_E500=y |
| 18 | # CONFIG_PPC_E500MC is not set | ||
| 18 | CONFIG_BOOKE=y | 19 | CONFIG_BOOKE=y |
| 19 | CONFIG_FSL_BOOKE=y | 20 | CONFIG_FSL_BOOKE=y |
| 20 | CONFIG_FSL_EMB_PERFMON=y | 21 | CONFIG_FSL_EMB_PERFMON=y |
| @@ -33,12 +34,14 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 35 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | 36 | CONFIG_STACKTRACE_SUPPORT=y |
| 37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | 38 | CONFIG_LOCKDEP_SUPPORT=y |
| 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 38 | CONFIG_ARCH_HAS_ILOG2_U32=y | 40 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 39 | CONFIG_GENERIC_HWEIGHT=y | 41 | CONFIG_GENERIC_HWEIGHT=y |
| 40 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 42 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 41 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 43 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 44 | CONFIG_GENERIC_GPIO=y | ||
| 42 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 45 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
| 43 | CONFIG_PPC=y | 46 | CONFIG_PPC=y |
| 44 | CONFIG_EARLY_PRINTK=y | 47 | CONFIG_EARLY_PRINTK=y |
| @@ -85,7 +88,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 85 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
| 86 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
| 87 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
| 88 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 89 | CONFIG_KALLSYMS=y | 91 | CONFIG_KALLSYMS=y |
| 90 | # CONFIG_KALLSYMS_ALL is not set | 92 | # CONFIG_KALLSYMS_ALL is not set |
| 91 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 93 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -110,10 +112,16 @@ CONFIG_SLUB=y | |||
| 110 | # CONFIG_PROFILING is not set | 112 | # CONFIG_PROFILING is not set |
| 111 | # CONFIG_MARKERS is not set | 113 | # CONFIG_MARKERS is not set |
| 112 | CONFIG_HAVE_OPROFILE=y | 114 | CONFIG_HAVE_OPROFILE=y |
| 115 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 116 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 113 | CONFIG_HAVE_KPROBES=y | 117 | CONFIG_HAVE_KPROBES=y |
| 114 | CONFIG_HAVE_KRETPROBES=y | 118 | CONFIG_HAVE_KRETPROBES=y |
| 119 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 115 | # CONFIG_HAVE_DMA_ATTRS is not set | 120 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 121 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 122 | CONFIG_HAVE_CLK=y | ||
| 116 | CONFIG_PROC_PAGE_MONITOR=y | 123 | CONFIG_PROC_PAGE_MONITOR=y |
| 124 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 117 | CONFIG_SLABINFO=y | 125 | CONFIG_SLABINFO=y |
| 118 | CONFIG_RT_MUTEXES=y | 126 | CONFIG_RT_MUTEXES=y |
| 119 | # CONFIG_TINY_SHMEM is not set | 127 | # CONFIG_TINY_SHMEM is not set |
| @@ -124,6 +132,7 @@ CONFIG_BLOCK=y | |||
| 124 | # CONFIG_BLK_DEV_IO_TRACE is not set | 132 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 125 | # CONFIG_LSF is not set | 133 | # CONFIG_LSF is not set |
| 126 | # CONFIG_BLK_DEV_BSG is not set | 134 | # CONFIG_BLK_DEV_BSG is not set |
| 135 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 127 | 136 | ||
| 128 | # | 137 | # |
| 129 | # IO Schedulers | 138 | # IO Schedulers |
| @@ -142,8 +151,6 @@ CONFIG_CLASSIC_RCU=y | |||
| 142 | # | 151 | # |
| 143 | # Platform support | 152 | # Platform support |
| 144 | # | 153 | # |
| 145 | # CONFIG_PPC_MPC512x is not set | ||
| 146 | # CONFIG_PPC_MPC5121 is not set | ||
| 147 | # CONFIG_PPC_CELL is not set | 154 | # CONFIG_PPC_CELL is not set |
| 148 | # CONFIG_PPC_CELL_NATIVE is not set | 155 | # CONFIG_PPC_CELL_NATIVE is not set |
| 149 | # CONFIG_PQ2ADS is not set | 156 | # CONFIG_PQ2ADS is not set |
| @@ -152,11 +159,13 @@ CONFIG_MPC85xx=y | |||
| 152 | # CONFIG_MPC8560_ADS is not set | 159 | # CONFIG_MPC8560_ADS is not set |
| 153 | # CONFIG_MPC85xx_CDS is not set | 160 | # CONFIG_MPC85xx_CDS is not set |
| 154 | # CONFIG_MPC85xx_MDS is not set | 161 | # CONFIG_MPC85xx_MDS is not set |
| 162 | # CONFIG_MPC8536_DS is not set | ||
| 155 | # CONFIG_MPC85xx_DS is not set | 163 | # CONFIG_MPC85xx_DS is not set |
| 156 | CONFIG_KSI8560=y | 164 | CONFIG_KSI8560=y |
| 157 | # CONFIG_STX_GP3 is not set | 165 | # CONFIG_STX_GP3 is not set |
| 158 | # CONFIG_TQM8540 is not set | 166 | # CONFIG_TQM8540 is not set |
| 159 | # CONFIG_TQM8541 is not set | 167 | # CONFIG_TQM8541 is not set |
| 168 | # CONFIG_TQM8548 is not set | ||
| 160 | # CONFIG_TQM8555 is not set | 169 | # CONFIG_TQM8555 is not set |
| 161 | # CONFIG_TQM8560 is not set | 170 | # CONFIG_TQM8560 is not set |
| 162 | # CONFIG_SBC8548 is not set | 171 | # CONFIG_SBC8548 is not set |
| @@ -173,7 +182,6 @@ CONFIG_MPIC=y | |||
| 173 | # CONFIG_GENERIC_IOMAP is not set | 182 | # CONFIG_GENERIC_IOMAP is not set |
| 174 | # CONFIG_CPU_FREQ is not set | 183 | # CONFIG_CPU_FREQ is not set |
| 175 | CONFIG_CPM2=y | 184 | CONFIG_CPM2=y |
| 176 | CONFIG_PPC_CPM_NEW_BINDING=y | ||
| 177 | # CONFIG_FSL_ULI1575 is not set | 185 | # CONFIG_FSL_ULI1575 is not set |
| 178 | CONFIG_CPM=y | 186 | CONFIG_CPM=y |
| 179 | 187 | ||
| @@ -213,6 +221,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 213 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 221 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 214 | CONFIG_PAGEFLAGS_EXTENDED=y | 222 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 215 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 223 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 224 | CONFIG_MIGRATION=y | ||
| 216 | # CONFIG_RESOURCES_64BIT is not set | 225 | # CONFIG_RESOURCES_64BIT is not set |
| 217 | CONFIG_ZONE_DMA_FLAG=1 | 226 | CONFIG_ZONE_DMA_FLAG=1 |
| 218 | CONFIG_BOUNCE=y | 227 | CONFIG_BOUNCE=y |
| @@ -220,6 +229,7 @@ CONFIG_VIRT_TO_BUS=y | |||
| 220 | CONFIG_FORCE_MAX_ZONEORDER=11 | 229 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 221 | # CONFIG_PROC_DEVICETREE is not set | 230 | # CONFIG_PROC_DEVICETREE is not set |
| 222 | # CONFIG_CMDLINE_BOOL is not set | 231 | # CONFIG_CMDLINE_BOOL is not set |
| 232 | CONFIG_EXTRA_TARGETS="" | ||
| 223 | # CONFIG_PM is not set | 233 | # CONFIG_PM is not set |
| 224 | # CONFIG_SECCOMP is not set | 234 | # CONFIG_SECCOMP is not set |
| 225 | CONFIG_ISA_DMA_API=y | 235 | CONFIG_ISA_DMA_API=y |
| @@ -229,6 +239,7 @@ CONFIG_ISA_DMA_API=y | |||
| 229 | # | 239 | # |
| 230 | CONFIG_ZONE_DMA=y | 240 | CONFIG_ZONE_DMA=y |
| 231 | CONFIG_FSL_SOC=y | 241 | CONFIG_FSL_SOC=y |
| 242 | CONFIG_PPC_PCI_CHOICE=y | ||
| 232 | # CONFIG_PCI is not set | 243 | # CONFIG_PCI is not set |
| 233 | # CONFIG_PCI_DOMAINS is not set | 244 | # CONFIG_PCI_DOMAINS is not set |
| 234 | # CONFIG_PCI_SYSCALL is not set | 245 | # CONFIG_PCI_SYSCALL is not set |
| @@ -250,10 +261,6 @@ CONFIG_KERNEL_START=0xc0000000 | |||
| 250 | CONFIG_PHYSICAL_START=0x00000000 | 261 | CONFIG_PHYSICAL_START=0x00000000 |
| 251 | CONFIG_PHYSICAL_ALIGN=0x10000000 | 262 | CONFIG_PHYSICAL_ALIGN=0x10000000 |
| 252 | CONFIG_TASK_SIZE=0xc0000000 | 263 | CONFIG_TASK_SIZE=0xc0000000 |
| 253 | |||
| 254 | # | ||
| 255 | # Networking | ||
| 256 | # | ||
| 257 | CONFIG_NET=y | 264 | CONFIG_NET=y |
| 258 | 265 | ||
| 259 | # | 266 | # |
| @@ -427,6 +434,7 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
| 427 | # | 434 | # |
| 428 | # CONFIG_MTD_UBI is not set | 435 | # CONFIG_MTD_UBI is not set |
| 429 | CONFIG_OF_DEVICE=y | 436 | CONFIG_OF_DEVICE=y |
| 437 | CONFIG_OF_GPIO=y | ||
| 430 | # CONFIG_PARPORT is not set | 438 | # CONFIG_PARPORT is not set |
| 431 | CONFIG_BLK_DEV=y | 439 | CONFIG_BLK_DEV=y |
| 432 | # CONFIG_BLK_DEV_FD is not set | 440 | # CONFIG_BLK_DEV_FD is not set |
| @@ -440,12 +448,12 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
| 440 | # CONFIG_BLK_DEV_XIP is not set | 448 | # CONFIG_BLK_DEV_XIP is not set |
| 441 | # CONFIG_CDROM_PKTCDVD is not set | 449 | # CONFIG_CDROM_PKTCDVD is not set |
| 442 | # CONFIG_ATA_OVER_ETH is not set | 450 | # CONFIG_ATA_OVER_ETH is not set |
| 451 | # CONFIG_BLK_DEV_HD is not set | ||
| 443 | CONFIG_MISC_DEVICES=y | 452 | CONFIG_MISC_DEVICES=y |
| 444 | # CONFIG_EEPROM_93CX6 is not set | 453 | # CONFIG_EEPROM_93CX6 is not set |
| 445 | # CONFIG_ENCLOSURE_SERVICES is not set | 454 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 446 | CONFIG_HAVE_IDE=y | 455 | CONFIG_HAVE_IDE=y |
| 447 | CONFIG_IDE=y | 456 | CONFIG_IDE=y |
| 448 | CONFIG_IDE_MAX_HWIFS=4 | ||
| 449 | CONFIG_BLK_DEV_IDE=y | 457 | CONFIG_BLK_DEV_IDE=y |
| 450 | 458 | ||
| 451 | # | 459 | # |
| @@ -463,11 +471,8 @@ CONFIG_IDE_PROC_FS=y | |||
| 463 | # | 471 | # |
| 464 | # IDE chipset support/bugfixes | 472 | # IDE chipset support/bugfixes |
| 465 | # | 473 | # |
| 466 | CONFIG_IDE_GENERIC=y | ||
| 467 | # CONFIG_BLK_DEV_PLATFORM is not set | 474 | # CONFIG_BLK_DEV_PLATFORM is not set |
| 468 | # CONFIG_BLK_DEV_IDEDMA is not set | 475 | # CONFIG_BLK_DEV_IDEDMA is not set |
| 469 | # CONFIG_BLK_DEV_HD_ONLY is not set | ||
| 470 | # CONFIG_BLK_DEV_HD is not set | ||
| 471 | 476 | ||
| 472 | # | 477 | # |
| 473 | # SCSI device support | 478 | # SCSI device support |
| @@ -480,7 +485,6 @@ CONFIG_IDE_GENERIC=y | |||
| 480 | # CONFIG_MD is not set | 485 | # CONFIG_MD is not set |
| 481 | # CONFIG_MACINTOSH_DRIVERS is not set | 486 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 482 | CONFIG_NETDEVICES=y | 487 | CONFIG_NETDEVICES=y |
| 483 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 484 | # CONFIG_DUMMY is not set | 488 | # CONFIG_DUMMY is not set |
| 485 | # CONFIG_BONDING is not set | 489 | # CONFIG_BONDING is not set |
| 486 | # CONFIG_MACVLAN is not set | 490 | # CONFIG_MACVLAN is not set |
| @@ -504,6 +508,7 @@ CONFIG_MARVELL_PHY=y | |||
| 504 | # CONFIG_REALTEK_PHY is not set | 508 | # CONFIG_REALTEK_PHY is not set |
| 505 | # CONFIG_FIXED_PHY is not set | 509 | # CONFIG_FIXED_PHY is not set |
| 506 | CONFIG_MDIO_BITBANG=y | 510 | CONFIG_MDIO_BITBANG=y |
| 511 | # CONFIG_MDIO_OF_GPIO is not set | ||
| 507 | CONFIG_NET_ETHERNET=y | 512 | CONFIG_NET_ETHERNET=y |
| 508 | CONFIG_MII=y | 513 | CONFIG_MII=y |
| 509 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 514 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
| @@ -516,9 +521,7 @@ CONFIG_FS_ENET=y | |||
| 516 | CONFIG_FS_ENET_HAS_FCC=y | 521 | CONFIG_FS_ENET_HAS_FCC=y |
| 517 | CONFIG_FS_ENET_MDIO_FCC=y | 522 | CONFIG_FS_ENET_MDIO_FCC=y |
| 518 | CONFIG_NETDEV_1000=y | 523 | CONFIG_NETDEV_1000=y |
| 519 | # CONFIG_E1000E_ENABLED is not set | ||
| 520 | CONFIG_GIANFAR=y | 524 | CONFIG_GIANFAR=y |
| 521 | CONFIG_GFAR_NAPI=y | ||
| 522 | CONFIG_NETDEV_10000=y | 525 | CONFIG_NETDEV_10000=y |
| 523 | 526 | ||
| 524 | # | 527 | # |
| @@ -606,6 +609,23 @@ CONFIG_GEN_RTC=y | |||
| 606 | # CONFIG_TCG_TPM is not set | 609 | # CONFIG_TCG_TPM is not set |
| 607 | # CONFIG_I2C is not set | 610 | # CONFIG_I2C is not set |
| 608 | # CONFIG_SPI is not set | 611 | # CONFIG_SPI is not set |
| 612 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 613 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | ||
| 614 | CONFIG_GPIOLIB=y | ||
| 615 | # CONFIG_DEBUG_GPIO is not set | ||
| 616 | # CONFIG_GPIO_SYSFS is not set | ||
| 617 | |||
| 618 | # | ||
| 619 | # I2C GPIO expanders: | ||
| 620 | # | ||
| 621 | |||
| 622 | # | ||
| 623 | # PCI GPIO expanders: | ||
| 624 | # | ||
| 625 | |||
| 626 | # | ||
| 627 | # SPI GPIO expanders: | ||
| 628 | # | ||
| 609 | # CONFIG_W1 is not set | 629 | # CONFIG_W1 is not set |
| 610 | # CONFIG_POWER_SUPPLY is not set | 630 | # CONFIG_POWER_SUPPLY is not set |
| 611 | CONFIG_HWMON=y | 631 | CONFIG_HWMON=y |
| @@ -622,6 +642,7 @@ CONFIG_HWMON=y | |||
| 622 | # CONFIG_SENSORS_W83627EHF is not set | 642 | # CONFIG_SENSORS_W83627EHF is not set |
| 623 | # CONFIG_HWMON_DEBUG_CHIP is not set | 643 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 624 | # CONFIG_THERMAL is not set | 644 | # CONFIG_THERMAL is not set |
| 645 | # CONFIG_THERMAL_HWMON is not set | ||
| 625 | # CONFIG_WATCHDOG is not set | 646 | # CONFIG_WATCHDOG is not set |
| 626 | 647 | ||
| 627 | # | 648 | # |
| @@ -633,8 +654,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 633 | # | 654 | # |
| 634 | # Multifunction device drivers | 655 | # Multifunction device drivers |
| 635 | # | 656 | # |
| 657 | # CONFIG_MFD_CORE is not set | ||
| 636 | # CONFIG_MFD_SM501 is not set | 658 | # CONFIG_MFD_SM501 is not set |
| 637 | # CONFIG_HTC_PASIC3 is not set | 659 | # CONFIG_HTC_PASIC3 is not set |
| 660 | # CONFIG_MFD_TMIO is not set | ||
| 638 | 661 | ||
| 639 | # | 662 | # |
| 640 | # Multimedia devices | 663 | # Multimedia devices |
| @@ -664,10 +687,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
| 664 | # Display device support | 687 | # Display device support |
| 665 | # | 688 | # |
| 666 | # CONFIG_DISPLAY_SUPPORT is not set | 689 | # CONFIG_DISPLAY_SUPPORT is not set |
| 667 | |||
| 668 | # | ||
| 669 | # Sound | ||
| 670 | # | ||
| 671 | # CONFIG_SOUND is not set | 690 | # CONFIG_SOUND is not set |
| 672 | CONFIG_HID_SUPPORT=y | 691 | CONFIG_HID_SUPPORT=y |
| 673 | CONFIG_HID=y | 692 | CONFIG_HID=y |
| @@ -681,6 +700,10 @@ CONFIG_USB_SUPPORT=y | |||
| 681 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 700 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
| 682 | 701 | ||
| 683 | # | 702 | # |
| 703 | # Enable Host or Gadget support to see Inventra options | ||
| 704 | # | ||
| 705 | |||
| 706 | # | ||
| 684 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 707 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 685 | # | 708 | # |
| 686 | # CONFIG_USB_GADGET is not set | 709 | # CONFIG_USB_GADGET is not set |
| @@ -759,6 +782,7 @@ CONFIG_TMPFS=y | |||
| 759 | # CONFIG_CRAMFS is not set | 782 | # CONFIG_CRAMFS is not set |
| 760 | # CONFIG_VXFS_FS is not set | 783 | # CONFIG_VXFS_FS is not set |
| 761 | # CONFIG_MINIX_FS is not set | 784 | # CONFIG_MINIX_FS is not set |
| 785 | # CONFIG_OMFS_FS is not set | ||
| 762 | # CONFIG_HPFS_FS is not set | 786 | # CONFIG_HPFS_FS is not set |
| 763 | # CONFIG_QNX4FS_FS is not set | 787 | # CONFIG_QNX4FS_FS is not set |
| 764 | # CONFIG_ROMFS_FS is not set | 788 | # CONFIG_ROMFS_FS is not set |
| @@ -768,12 +792,11 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 768 | CONFIG_NFS_FS=y | 792 | CONFIG_NFS_FS=y |
| 769 | # CONFIG_NFS_V3 is not set | 793 | # CONFIG_NFS_V3 is not set |
| 770 | # CONFIG_NFS_V4 is not set | 794 | # CONFIG_NFS_V4 is not set |
| 771 | # CONFIG_NFSD is not set | ||
| 772 | CONFIG_ROOT_NFS=y | 795 | CONFIG_ROOT_NFS=y |
| 796 | # CONFIG_NFSD is not set | ||
| 773 | CONFIG_LOCKD=y | 797 | CONFIG_LOCKD=y |
| 774 | CONFIG_NFS_COMMON=y | 798 | CONFIG_NFS_COMMON=y |
| 775 | CONFIG_SUNRPC=y | 799 | CONFIG_SUNRPC=y |
| 776 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 777 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 800 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 778 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 801 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 779 | # CONFIG_SMB_FS is not set | 802 | # CONFIG_SMB_FS is not set |
| @@ -809,6 +832,7 @@ CONFIG_BITREVERSE=y | |||
| 809 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 832 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 810 | # CONFIG_CRC_CCITT is not set | 833 | # CONFIG_CRC_CCITT is not set |
| 811 | # CONFIG_CRC16 is not set | 834 | # CONFIG_CRC16 is not set |
| 835 | # CONFIG_CRC_T10DIF is not set | ||
| 812 | # CONFIG_CRC_ITU_T is not set | 836 | # CONFIG_CRC_ITU_T is not set |
| 813 | CONFIG_CRC32=y | 837 | CONFIG_CRC32=y |
| 814 | # CONFIG_CRC7 is not set | 838 | # CONFIG_CRC7 is not set |
| @@ -833,6 +857,8 @@ CONFIG_DEBUG_FS=y | |||
| 833 | CONFIG_DEBUG_KERNEL=y | 857 | CONFIG_DEBUG_KERNEL=y |
| 834 | # CONFIG_DEBUG_SHIRQ is not set | 858 | # CONFIG_DEBUG_SHIRQ is not set |
| 835 | CONFIG_DETECT_SOFTLOCKUP=y | 859 | CONFIG_DETECT_SOFTLOCKUP=y |
| 860 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 861 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 836 | CONFIG_SCHED_DEBUG=y | 862 | CONFIG_SCHED_DEBUG=y |
| 837 | # CONFIG_SCHEDSTATS is not set | 863 | # CONFIG_SCHEDSTATS is not set |
| 838 | # CONFIG_TIMER_STATS is not set | 864 | # CONFIG_TIMER_STATS is not set |
| @@ -851,17 +877,29 @@ CONFIG_DEBUG_MUTEXES=y | |||
| 851 | # CONFIG_DEBUG_INFO is not set | 877 | # CONFIG_DEBUG_INFO is not set |
| 852 | # CONFIG_DEBUG_VM is not set | 878 | # CONFIG_DEBUG_VM is not set |
| 853 | # CONFIG_DEBUG_WRITECOUNT is not set | 879 | # CONFIG_DEBUG_WRITECOUNT is not set |
| 880 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 854 | # CONFIG_DEBUG_LIST is not set | 881 | # CONFIG_DEBUG_LIST is not set |
| 855 | # CONFIG_DEBUG_SG is not set | 882 | # CONFIG_DEBUG_SG is not set |
| 856 | # CONFIG_BOOT_PRINTK_DELAY is not set | 883 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 884 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 857 | # CONFIG_BACKTRACE_SELF_TEST is not set | 885 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 858 | # CONFIG_FAULT_INJECTION is not set | 886 | # CONFIG_FAULT_INJECTION is not set |
| 887 | # CONFIG_LATENCYTOP is not set | ||
| 888 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 889 | CONFIG_HAVE_FTRACE=y | ||
| 890 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 891 | # CONFIG_FTRACE is not set | ||
| 892 | # CONFIG_SCHED_TRACER is not set | ||
| 893 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 859 | # CONFIG_SAMPLES is not set | 894 | # CONFIG_SAMPLES is not set |
| 895 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 896 | # CONFIG_KGDB is not set | ||
| 860 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 897 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
| 861 | # CONFIG_DEBUG_STACK_USAGE is not set | 898 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 862 | # CONFIG_DEBUG_PAGEALLOC is not set | 899 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 863 | # CONFIG_DEBUGGER is not set | 900 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
| 864 | # CONFIG_KGDB_CONSOLE is not set | 901 | # CONFIG_FTR_FIXUP_SELFTEST is not set |
| 902 | # CONFIG_XMON is not set | ||
| 865 | # CONFIG_IRQSTACKS is not set | 903 | # CONFIG_IRQSTACKS is not set |
| 866 | # CONFIG_VIRQ_DEBUG is not set | 904 | # CONFIG_VIRQ_DEBUG is not set |
| 867 | # CONFIG_BDI_SWITCH is not set | 905 | # CONFIG_BDI_SWITCH is not set |
| @@ -915,6 +953,10 @@ CONFIG_CRYPTO=y | |||
| 915 | # CONFIG_CRYPTO_MD4 is not set | 953 | # CONFIG_CRYPTO_MD4 is not set |
| 916 | # CONFIG_CRYPTO_MD5 is not set | 954 | # CONFIG_CRYPTO_MD5 is not set |
| 917 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 955 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 956 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 957 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 958 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 959 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 918 | # CONFIG_CRYPTO_SHA1 is not set | 960 | # CONFIG_CRYPTO_SHA1 is not set |
| 919 | # CONFIG_CRYPTO_SHA256 is not set | 961 | # CONFIG_CRYPTO_SHA256 is not set |
| 920 | # CONFIG_CRYPTO_SHA512 is not set | 962 | # CONFIG_CRYPTO_SHA512 is not set |
| @@ -946,6 +988,7 @@ CONFIG_CRYPTO=y | |||
| 946 | # CONFIG_CRYPTO_DEFLATE is not set | 988 | # CONFIG_CRYPTO_DEFLATE is not set |
| 947 | # CONFIG_CRYPTO_LZO is not set | 989 | # CONFIG_CRYPTO_LZO is not set |
| 948 | CONFIG_CRYPTO_HW=y | 990 | CONFIG_CRYPTO_HW=y |
| 949 | # CONFIG_PPC_CLOCK is not set | 991 | # CONFIG_CRYPTO_DEV_TALITOS is not set |
| 992 | CONFIG_PPC_CLOCK=y | ||
| 950 | CONFIG_PPC_LIB_RHEAP=y | 993 | CONFIG_PPC_LIB_RHEAP=y |
| 951 | # CONFIG_VIRTUALIZATION is not set | 994 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/mpc8536_ds_defconfig b/arch/powerpc/configs/85xx/mpc8536_ds_defconfig index f1e2931de5da..6b516bea6e75 100644 --- a/arch/powerpc/configs/mpc8536_ds_defconfig +++ b/arch/powerpc/configs/85xx/mpc8536_ds_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.26-rc8 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Wed Jul 2 01:34:26 2008 | 4 | # Thu Aug 21 07:18:18 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -34,6 +34,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 35 | CONFIG_IRQ_PER_CPU=y | 35 | CONFIG_IRQ_PER_CPU=y |
| 36 | CONFIG_STACKTRACE_SUPPORT=y | 36 | CONFIG_STACKTRACE_SUPPORT=y |
| 37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 37 | CONFIG_LOCKDEP_SUPPORT=y | 38 | CONFIG_LOCKDEP_SUPPORT=y |
| 38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 39 | CONFIG_ARCH_HAS_ILOG2_U32=y | 40 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| @@ -93,7 +94,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 93 | CONFIG_SYSCTL=y | 94 | CONFIG_SYSCTL=y |
| 94 | CONFIG_EMBEDDED=y | 95 | CONFIG_EMBEDDED=y |
| 95 | CONFIG_SYSCTL_SYSCALL=y | 96 | CONFIG_SYSCTL_SYSCALL=y |
| 96 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 97 | CONFIG_KALLSYMS=y | 97 | CONFIG_KALLSYMS=y |
| 98 | CONFIG_KALLSYMS_ALL=y | 98 | CONFIG_KALLSYMS_ALL=y |
| 99 | CONFIG_KALLSYMS_EXTRA_PASS=y | 99 | CONFIG_KALLSYMS_EXTRA_PASS=y |
| @@ -119,10 +119,16 @@ CONFIG_SLUB=y | |||
| 119 | # CONFIG_MARKERS is not set | 119 | # CONFIG_MARKERS is not set |
| 120 | CONFIG_HAVE_OPROFILE=y | 120 | CONFIG_HAVE_OPROFILE=y |
| 121 | # CONFIG_KPROBES is not set | 121 | # CONFIG_KPROBES is not set |
| 122 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 123 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 122 | CONFIG_HAVE_KPROBES=y | 124 | CONFIG_HAVE_KPROBES=y |
| 123 | CONFIG_HAVE_KRETPROBES=y | 125 | CONFIG_HAVE_KRETPROBES=y |
| 126 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 124 | # CONFIG_HAVE_DMA_ATTRS is not set | 127 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 128 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 129 | # CONFIG_HAVE_CLK is not set | ||
| 125 | CONFIG_PROC_PAGE_MONITOR=y | 130 | CONFIG_PROC_PAGE_MONITOR=y |
| 131 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 126 | CONFIG_SLABINFO=y | 132 | CONFIG_SLABINFO=y |
| 127 | CONFIG_RT_MUTEXES=y | 133 | CONFIG_RT_MUTEXES=y |
| 128 | # CONFIG_TINY_SHMEM is not set | 134 | # CONFIG_TINY_SHMEM is not set |
| @@ -139,6 +145,7 @@ CONFIG_LBD=y | |||
| 139 | # CONFIG_BLK_DEV_IO_TRACE is not set | 145 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 140 | # CONFIG_LSF is not set | 146 | # CONFIG_LSF is not set |
| 141 | # CONFIG_BLK_DEV_BSG is not set | 147 | # CONFIG_BLK_DEV_BSG is not set |
| 148 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 142 | 149 | ||
| 143 | # | 150 | # |
| 144 | # IO Schedulers | 151 | # IO Schedulers |
| @@ -157,8 +164,6 @@ CONFIG_CLASSIC_RCU=y | |||
| 157 | # | 164 | # |
| 158 | # Platform support | 165 | # Platform support |
| 159 | # | 166 | # |
| 160 | # CONFIG_PPC_MPC512x is not set | ||
| 161 | # CONFIG_PPC_MPC5121 is not set | ||
| 162 | # CONFIG_PPC_CELL is not set | 167 | # CONFIG_PPC_CELL is not set |
| 163 | # CONFIG_PPC_CELL_NATIVE is not set | 168 | # CONFIG_PPC_CELL_NATIVE is not set |
| 164 | # CONFIG_PQ2ADS is not set | 169 | # CONFIG_PQ2ADS is not set |
| @@ -205,7 +210,7 @@ CONFIG_HZ_250=y | |||
| 205 | # CONFIG_HZ_300 is not set | 210 | # CONFIG_HZ_300 is not set |
| 206 | # CONFIG_HZ_1000 is not set | 211 | # CONFIG_HZ_1000 is not set |
| 207 | CONFIG_HZ=250 | 212 | CONFIG_HZ=250 |
| 208 | # CONFIG_SCHED_HRTICK is not set | 213 | CONFIG_SCHED_HRTICK=y |
| 209 | CONFIG_PREEMPT_NONE=y | 214 | CONFIG_PREEMPT_NONE=y |
| 210 | # CONFIG_PREEMPT_VOLUNTARY is not set | 215 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 211 | # CONFIG_PREEMPT is not set | 216 | # CONFIG_PREEMPT is not set |
| @@ -228,6 +233,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 228 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 233 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 229 | CONFIG_PAGEFLAGS_EXTENDED=y | 234 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 230 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 235 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 236 | CONFIG_MIGRATION=y | ||
| 231 | # CONFIG_RESOURCES_64BIT is not set | 237 | # CONFIG_RESOURCES_64BIT is not set |
| 232 | CONFIG_ZONE_DMA_FLAG=1 | 238 | CONFIG_ZONE_DMA_FLAG=1 |
| 233 | CONFIG_BOUNCE=y | 239 | CONFIG_BOUNCE=y |
| @@ -235,6 +241,7 @@ CONFIG_VIRT_TO_BUS=y | |||
| 235 | CONFIG_FORCE_MAX_ZONEORDER=11 | 241 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 236 | CONFIG_PROC_DEVICETREE=y | 242 | CONFIG_PROC_DEVICETREE=y |
| 237 | # CONFIG_CMDLINE_BOOL is not set | 243 | # CONFIG_CMDLINE_BOOL is not set |
| 244 | CONFIG_EXTRA_TARGETS="" | ||
| 238 | # CONFIG_PM is not set | 245 | # CONFIG_PM is not set |
| 239 | CONFIG_SECCOMP=y | 246 | CONFIG_SECCOMP=y |
| 240 | CONFIG_ISA_DMA_API=y | 247 | CONFIG_ISA_DMA_API=y |
| @@ -246,6 +253,7 @@ CONFIG_ZONE_DMA=y | |||
| 246 | CONFIG_PPC_INDIRECT_PCI=y | 253 | CONFIG_PPC_INDIRECT_PCI=y |
| 247 | CONFIG_FSL_SOC=y | 254 | CONFIG_FSL_SOC=y |
| 248 | CONFIG_FSL_PCI=y | 255 | CONFIG_FSL_PCI=y |
| 256 | CONFIG_PPC_PCI_CHOICE=y | ||
| 249 | CONFIG_PCI=y | 257 | CONFIG_PCI=y |
| 250 | CONFIG_PCI_DOMAINS=y | 258 | CONFIG_PCI_DOMAINS=y |
| 251 | CONFIG_PCI_SYSCALL=y | 259 | CONFIG_PCI_SYSCALL=y |
| @@ -272,10 +280,6 @@ CONFIG_KERNEL_START=0xc0000000 | |||
| 272 | CONFIG_PHYSICAL_START=0x00000000 | 280 | CONFIG_PHYSICAL_START=0x00000000 |
| 273 | CONFIG_PHYSICAL_ALIGN=0x10000000 | 281 | CONFIG_PHYSICAL_ALIGN=0x10000000 |
| 274 | CONFIG_TASK_SIZE=0xc0000000 | 282 | CONFIG_TASK_SIZE=0xc0000000 |
| 275 | |||
| 276 | # | ||
| 277 | # Networking | ||
| 278 | # | ||
| 279 | CONFIG_NET=y | 283 | CONFIG_NET=y |
| 280 | 284 | ||
| 281 | # | 285 | # |
| @@ -401,6 +405,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | |||
| 401 | CONFIG_STANDALONE=y | 405 | CONFIG_STANDALONE=y |
| 402 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 406 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 403 | CONFIG_FW_LOADER=y | 407 | CONFIG_FW_LOADER=y |
| 408 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
| 409 | CONFIG_EXTRA_FIRMWARE="" | ||
| 404 | # CONFIG_DEBUG_DRIVER is not set | 410 | # CONFIG_DEBUG_DRIVER is not set |
| 405 | # CONFIG_DEBUG_DEVRES is not set | 411 | # CONFIG_DEBUG_DEVRES is not set |
| 406 | # CONFIG_SYS_HYPERVISOR is not set | 412 | # CONFIG_SYS_HYPERVISOR is not set |
| @@ -427,12 +433,14 @@ CONFIG_BLK_DEV_RAM_SIZE=524288 | |||
| 427 | # CONFIG_BLK_DEV_XIP is not set | 433 | # CONFIG_BLK_DEV_XIP is not set |
| 428 | # CONFIG_CDROM_PKTCDVD is not set | 434 | # CONFIG_CDROM_PKTCDVD is not set |
| 429 | # CONFIG_ATA_OVER_ETH is not set | 435 | # CONFIG_ATA_OVER_ETH is not set |
| 436 | # CONFIG_BLK_DEV_HD is not set | ||
| 430 | CONFIG_MISC_DEVICES=y | 437 | CONFIG_MISC_DEVICES=y |
| 431 | # CONFIG_PHANTOM is not set | 438 | # CONFIG_PHANTOM is not set |
| 432 | # CONFIG_EEPROM_93CX6 is not set | 439 | # CONFIG_EEPROM_93CX6 is not set |
| 433 | # CONFIG_SGI_IOC4 is not set | 440 | # CONFIG_SGI_IOC4 is not set |
| 434 | # CONFIG_TIFM_CORE is not set | 441 | # CONFIG_TIFM_CORE is not set |
| 435 | # CONFIG_ENCLOSURE_SERVICES is not set | 442 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 443 | # CONFIG_HP_ILO is not set | ||
| 436 | CONFIG_HAVE_IDE=y | 444 | CONFIG_HAVE_IDE=y |
| 437 | # CONFIG_IDE is not set | 445 | # CONFIG_IDE is not set |
| 438 | 446 | ||
| @@ -512,6 +520,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 512 | # CONFIG_SCSI_NSP32 is not set | 520 | # CONFIG_SCSI_NSP32 is not set |
| 513 | # CONFIG_SCSI_DEBUG is not set | 521 | # CONFIG_SCSI_DEBUG is not set |
| 514 | # CONFIG_SCSI_SRP is not set | 522 | # CONFIG_SCSI_SRP is not set |
| 523 | # CONFIG_SCSI_DH is not set | ||
| 515 | CONFIG_ATA=y | 524 | CONFIG_ATA=y |
| 516 | # CONFIG_ATA_NONSTANDARD is not set | 525 | # CONFIG_ATA_NONSTANDARD is not set |
| 517 | CONFIG_SATA_PMP=y | 526 | CONFIG_SATA_PMP=y |
| @@ -588,7 +597,6 @@ CONFIG_SATA_SIL=y | |||
| 588 | # CONFIG_I2O is not set | 597 | # CONFIG_I2O is not set |
| 589 | # CONFIG_MACINTOSH_DRIVERS is not set | 598 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 590 | CONFIG_NETDEVICES=y | 599 | CONFIG_NETDEVICES=y |
| 591 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 592 | CONFIG_DUMMY=y | 600 | CONFIG_DUMMY=y |
| 593 | # CONFIG_BONDING is not set | 601 | # CONFIG_BONDING is not set |
| 594 | # CONFIG_MACVLAN is not set | 602 | # CONFIG_MACVLAN is not set |
| @@ -632,7 +640,6 @@ CONFIG_NETDEV_1000=y | |||
| 632 | # CONFIG_DL2K is not set | 640 | # CONFIG_DL2K is not set |
| 633 | # CONFIG_E1000 is not set | 641 | # CONFIG_E1000 is not set |
| 634 | # CONFIG_E1000E is not set | 642 | # CONFIG_E1000E is not set |
| 635 | # CONFIG_E1000E_ENABLED is not set | ||
| 636 | # CONFIG_IP1000 is not set | 643 | # CONFIG_IP1000 is not set |
| 637 | # CONFIG_IGB is not set | 644 | # CONFIG_IGB is not set |
| 638 | # CONFIG_NS83820 is not set | 645 | # CONFIG_NS83820 is not set |
| @@ -648,9 +655,9 @@ CONFIG_SKY2=y | |||
| 648 | # CONFIG_TIGON3 is not set | 655 | # CONFIG_TIGON3 is not set |
| 649 | # CONFIG_BNX2 is not set | 656 | # CONFIG_BNX2 is not set |
| 650 | CONFIG_GIANFAR=y | 657 | CONFIG_GIANFAR=y |
| 651 | CONFIG_GFAR_NAPI=y | ||
| 652 | # CONFIG_QLA3XXX is not set | 658 | # CONFIG_QLA3XXX is not set |
| 653 | # CONFIG_ATL1 is not set | 659 | # CONFIG_ATL1 is not set |
| 660 | # CONFIG_ATL1E is not set | ||
| 654 | CONFIG_NETDEV_10000=y | 661 | CONFIG_NETDEV_10000=y |
| 655 | # CONFIG_CHELSIO_T1 is not set | 662 | # CONFIG_CHELSIO_T1 is not set |
| 656 | # CONFIG_CHELSIO_T3 is not set | 663 | # CONFIG_CHELSIO_T3 is not set |
| @@ -727,12 +734,14 @@ CONFIG_SERIO_SERPORT=y | |||
| 727 | # CONFIG_SERIO_PCIPS2 is not set | 734 | # CONFIG_SERIO_PCIPS2 is not set |
| 728 | CONFIG_SERIO_LIBPS2=y | 735 | CONFIG_SERIO_LIBPS2=y |
| 729 | # CONFIG_SERIO_RAW is not set | 736 | # CONFIG_SERIO_RAW is not set |
| 737 | # CONFIG_SERIO_XILINX_XPS_PS2 is not set | ||
| 730 | # CONFIG_GAMEPORT is not set | 738 | # CONFIG_GAMEPORT is not set |
| 731 | 739 | ||
| 732 | # | 740 | # |
| 733 | # Character devices | 741 | # Character devices |
| 734 | # | 742 | # |
| 735 | CONFIG_VT=y | 743 | CONFIG_VT=y |
| 744 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 736 | CONFIG_VT_CONSOLE=y | 745 | CONFIG_VT_CONSOLE=y |
| 737 | CONFIG_HW_CONSOLE=y | 746 | CONFIG_HW_CONSOLE=y |
| 738 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 747 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| @@ -766,7 +775,7 @@ CONFIG_UNIX98_PTYS=y | |||
| 766 | CONFIG_LEGACY_PTYS=y | 775 | CONFIG_LEGACY_PTYS=y |
| 767 | CONFIG_LEGACY_PTY_COUNT=256 | 776 | CONFIG_LEGACY_PTY_COUNT=256 |
| 768 | # CONFIG_IPMI_HANDLER is not set | 777 | # CONFIG_IPMI_HANDLER is not set |
| 769 | # CONFIG_HW_RANDOM is not set | 778 | CONFIG_HW_RANDOM=y |
| 770 | # CONFIG_NVRAM is not set | 779 | # CONFIG_NVRAM is not set |
| 771 | # CONFIG_R3964 is not set | 780 | # CONFIG_R3964 is not set |
| 772 | # CONFIG_APPLICOM is not set | 781 | # CONFIG_APPLICOM is not set |
| @@ -776,43 +785,64 @@ CONFIG_DEVPORT=y | |||
| 776 | CONFIG_I2C=y | 785 | CONFIG_I2C=y |
| 777 | CONFIG_I2C_BOARDINFO=y | 786 | CONFIG_I2C_BOARDINFO=y |
| 778 | # CONFIG_I2C_CHARDEV is not set | 787 | # CONFIG_I2C_CHARDEV is not set |
| 788 | CONFIG_I2C_HELPER_AUTO=y | ||
| 779 | 789 | ||
| 780 | # | 790 | # |
| 781 | # I2C Hardware Bus support | 791 | # I2C Hardware Bus support |
| 782 | # | 792 | # |
| 793 | |||
| 794 | # | ||
| 795 | # PC SMBus host controller drivers | ||
| 796 | # | ||
| 783 | # CONFIG_I2C_ALI1535 is not set | 797 | # CONFIG_I2C_ALI1535 is not set |
| 784 | # CONFIG_I2C_ALI1563 is not set | 798 | # CONFIG_I2C_ALI1563 is not set |
| 785 | # CONFIG_I2C_ALI15X3 is not set | 799 | # CONFIG_I2C_ALI15X3 is not set |
| 786 | # CONFIG_I2C_AMD756 is not set | 800 | # CONFIG_I2C_AMD756 is not set |
| 787 | # CONFIG_I2C_AMD8111 is not set | 801 | # CONFIG_I2C_AMD8111 is not set |
| 788 | # CONFIG_I2C_I801 is not set | 802 | # CONFIG_I2C_I801 is not set |
| 789 | # CONFIG_I2C_I810 is not set | 803 | # CONFIG_I2C_ISCH is not set |
| 790 | # CONFIG_I2C_PIIX4 is not set | 804 | # CONFIG_I2C_PIIX4 is not set |
| 791 | CONFIG_I2C_MPC=y | ||
| 792 | # CONFIG_I2C_NFORCE2 is not set | 805 | # CONFIG_I2C_NFORCE2 is not set |
| 793 | # CONFIG_I2C_OCORES is not set | ||
| 794 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 795 | # CONFIG_I2C_PROSAVAGE is not set | ||
| 796 | # CONFIG_I2C_SAVAGE4 is not set | ||
| 797 | # CONFIG_I2C_SIMTEC is not set | ||
| 798 | # CONFIG_I2C_SIS5595 is not set | 806 | # CONFIG_I2C_SIS5595 is not set |
| 799 | # CONFIG_I2C_SIS630 is not set | 807 | # CONFIG_I2C_SIS630 is not set |
| 800 | # CONFIG_I2C_SIS96X is not set | 808 | # CONFIG_I2C_SIS96X is not set |
| 801 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 802 | # CONFIG_I2C_STUB is not set | ||
| 803 | # CONFIG_I2C_TINY_USB is not set | ||
| 804 | # CONFIG_I2C_VIA is not set | 809 | # CONFIG_I2C_VIA is not set |
| 805 | # CONFIG_I2C_VIAPRO is not set | 810 | # CONFIG_I2C_VIAPRO is not set |
| 811 | |||
| 812 | # | ||
| 813 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 814 | # | ||
| 815 | CONFIG_I2C_MPC=y | ||
| 816 | # CONFIG_I2C_OCORES is not set | ||
| 817 | # CONFIG_I2C_SIMTEC is not set | ||
| 818 | |||
| 819 | # | ||
| 820 | # External I2C/SMBus adapter drivers | ||
| 821 | # | ||
| 822 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 823 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 824 | # CONFIG_I2C_TINY_USB is not set | ||
| 825 | |||
| 826 | # | ||
| 827 | # Graphics adapter I2C/DDC channel drivers | ||
| 828 | # | ||
| 806 | # CONFIG_I2C_VOODOO3 is not set | 829 | # CONFIG_I2C_VOODOO3 is not set |
| 830 | |||
| 831 | # | ||
| 832 | # Other I2C/SMBus bus drivers | ||
| 833 | # | ||
| 807 | # CONFIG_I2C_PCA_PLATFORM is not set | 834 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 835 | # CONFIG_I2C_STUB is not set | ||
| 808 | 836 | ||
| 809 | # | 837 | # |
| 810 | # Miscellaneous I2C Chip support | 838 | # Miscellaneous I2C Chip support |
| 811 | # | 839 | # |
| 812 | # CONFIG_DS1682 is not set | 840 | # CONFIG_DS1682 is not set |
| 841 | # CONFIG_AT24 is not set | ||
| 813 | CONFIG_SENSORS_EEPROM=y | 842 | CONFIG_SENSORS_EEPROM=y |
| 814 | # CONFIG_SENSORS_PCF8574 is not set | 843 | # CONFIG_SENSORS_PCF8574 is not set |
| 815 | # CONFIG_PCF8575 is not set | 844 | # CONFIG_PCF8575 is not set |
| 845 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 816 | # CONFIG_SENSORS_PCF8591 is not set | 846 | # CONFIG_SENSORS_PCF8591 is not set |
| 817 | # CONFIG_SENSORS_MAX6875 is not set | 847 | # CONFIG_SENSORS_MAX6875 is not set |
| 818 | # CONFIG_SENSORS_TSL2550 is not set | 848 | # CONFIG_SENSORS_TSL2550 is not set |
| @@ -821,6 +851,8 @@ CONFIG_SENSORS_EEPROM=y | |||
| 821 | # CONFIG_I2C_DEBUG_BUS is not set | 851 | # CONFIG_I2C_DEBUG_BUS is not set |
| 822 | # CONFIG_I2C_DEBUG_CHIP is not set | 852 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 823 | # CONFIG_SPI is not set | 853 | # CONFIG_SPI is not set |
| 854 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 855 | # CONFIG_GPIOLIB is not set | ||
| 824 | # CONFIG_W1 is not set | 856 | # CONFIG_W1 is not set |
| 825 | # CONFIG_POWER_SUPPLY is not set | 857 | # CONFIG_POWER_SUPPLY is not set |
| 826 | # CONFIG_HWMON is not set | 858 | # CONFIG_HWMON is not set |
| @@ -836,8 +868,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 836 | # | 868 | # |
| 837 | # Multifunction device drivers | 869 | # Multifunction device drivers |
| 838 | # | 870 | # |
| 871 | # CONFIG_MFD_CORE is not set | ||
| 839 | # CONFIG_MFD_SM501 is not set | 872 | # CONFIG_MFD_SM501 is not set |
| 840 | # CONFIG_HTC_PASIC3 is not set | 873 | # CONFIG_HTC_PASIC3 is not set |
| 874 | # CONFIG_MFD_TMIO is not set | ||
| 841 | 875 | ||
| 842 | # | 876 | # |
| 843 | # Multimedia devices | 877 | # Multimedia devices |
| @@ -879,6 +913,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
| 879 | # CONFIG_DVB_TTUSB_BUDGET is not set | 913 | # CONFIG_DVB_TTUSB_BUDGET is not set |
| 880 | # CONFIG_DVB_TTUSB_DEC is not set | 914 | # CONFIG_DVB_TTUSB_DEC is not set |
| 881 | # CONFIG_DVB_CINERGYT2 is not set | 915 | # CONFIG_DVB_CINERGYT2 is not set |
| 916 | # CONFIG_DVB_SIANO_SMS1XXX is not set | ||
| 882 | 917 | ||
| 883 | # | 918 | # |
| 884 | # Supported FlexCopII (B2C2) Adapters | 919 | # Supported FlexCopII (B2C2) Adapters |
| @@ -925,6 +960,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
| 925 | # CONFIG_DVB_SP887X is not set | 960 | # CONFIG_DVB_SP887X is not set |
| 926 | # CONFIG_DVB_CX22700 is not set | 961 | # CONFIG_DVB_CX22700 is not set |
| 927 | # CONFIG_DVB_CX22702 is not set | 962 | # CONFIG_DVB_CX22702 is not set |
| 963 | # CONFIG_DVB_DRX397XD is not set | ||
| 928 | # CONFIG_DVB_L64781 is not set | 964 | # CONFIG_DVB_L64781 is not set |
| 929 | # CONFIG_DVB_TDA1004X is not set | 965 | # CONFIG_DVB_TDA1004X is not set |
| 930 | # CONFIG_DVB_NXT6000 is not set | 966 | # CONFIG_DVB_NXT6000 is not set |
| @@ -992,15 +1028,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
| 992 | CONFIG_VGA_CONSOLE=y | 1028 | CONFIG_VGA_CONSOLE=y |
| 993 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set | 1029 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set |
| 994 | CONFIG_DUMMY_CONSOLE=y | 1030 | CONFIG_DUMMY_CONSOLE=y |
| 995 | |||
| 996 | # | ||
| 997 | # Sound | ||
| 998 | # | ||
| 999 | CONFIG_SOUND=y | 1031 | CONFIG_SOUND=y |
| 1000 | |||
| 1001 | # | ||
| 1002 | # Advanced Linux Sound Architecture | ||
| 1003 | # | ||
| 1004 | CONFIG_SND=y | 1032 | CONFIG_SND=y |
| 1005 | CONFIG_SND_TIMER=y | 1033 | CONFIG_SND_TIMER=y |
| 1006 | CONFIG_SND_PCM=y | 1034 | CONFIG_SND_PCM=y |
| @@ -1012,19 +1040,15 @@ CONFIG_SND_SUPPORT_OLD_API=y | |||
| 1012 | CONFIG_SND_VERBOSE_PROCFS=y | 1040 | CONFIG_SND_VERBOSE_PROCFS=y |
| 1013 | # CONFIG_SND_VERBOSE_PRINTK is not set | 1041 | # CONFIG_SND_VERBOSE_PRINTK is not set |
| 1014 | # CONFIG_SND_DEBUG is not set | 1042 | # CONFIG_SND_DEBUG is not set |
| 1015 | 1043 | CONFIG_SND_VMASTER=y | |
| 1016 | # | ||
| 1017 | # Generic devices | ||
| 1018 | # | ||
| 1019 | CONFIG_SND_AC97_CODEC=y | 1044 | CONFIG_SND_AC97_CODEC=y |
| 1045 | CONFIG_SND_DRIVERS=y | ||
| 1020 | # CONFIG_SND_DUMMY is not set | 1046 | # CONFIG_SND_DUMMY is not set |
| 1021 | # CONFIG_SND_MTPAV is not set | 1047 | # CONFIG_SND_MTPAV is not set |
| 1022 | # CONFIG_SND_SERIAL_U16550 is not set | 1048 | # CONFIG_SND_SERIAL_U16550 is not set |
| 1023 | # CONFIG_SND_MPU401 is not set | 1049 | # CONFIG_SND_MPU401 is not set |
| 1024 | 1050 | # CONFIG_SND_AC97_POWER_SAVE is not set | |
| 1025 | # | 1051 | CONFIG_SND_PCI=y |
| 1026 | # PCI devices | ||
| 1027 | # | ||
| 1028 | # CONFIG_SND_AD1889 is not set | 1052 | # CONFIG_SND_AD1889 is not set |
| 1029 | # CONFIG_SND_ALS300 is not set | 1053 | # CONFIG_SND_ALS300 is not set |
| 1030 | # CONFIG_SND_ALS4000 is not set | 1054 | # CONFIG_SND_ALS4000 is not set |
| @@ -1086,39 +1110,12 @@ CONFIG_SND_INTEL8X0=y | |||
| 1086 | # CONFIG_SND_VIRTUOSO is not set | 1110 | # CONFIG_SND_VIRTUOSO is not set |
| 1087 | # CONFIG_SND_VX222 is not set | 1111 | # CONFIG_SND_VX222 is not set |
| 1088 | # CONFIG_SND_YMFPCI is not set | 1112 | # CONFIG_SND_YMFPCI is not set |
| 1089 | # CONFIG_SND_AC97_POWER_SAVE is not set | 1113 | CONFIG_SND_PPC=y |
| 1090 | 1114 | CONFIG_SND_USB=y | |
| 1091 | # | ||
| 1092 | # ALSA PowerMac devices | ||
| 1093 | # | ||
| 1094 | |||
| 1095 | # | ||
| 1096 | # ALSA PowerPC devices | ||
| 1097 | # | ||
| 1098 | |||
| 1099 | # | ||
| 1100 | # USB devices | ||
| 1101 | # | ||
| 1102 | # CONFIG_SND_USB_AUDIO is not set | 1115 | # CONFIG_SND_USB_AUDIO is not set |
| 1103 | # CONFIG_SND_USB_USX2Y is not set | 1116 | # CONFIG_SND_USB_USX2Y is not set |
| 1104 | # CONFIG_SND_USB_CAIAQ is not set | 1117 | # CONFIG_SND_USB_CAIAQ is not set |
| 1105 | |||
| 1106 | # | ||
| 1107 | # System on Chip audio support | ||
| 1108 | # | ||
| 1109 | # CONFIG_SND_SOC is not set | 1118 | # CONFIG_SND_SOC is not set |
| 1110 | |||
| 1111 | # | ||
| 1112 | # ALSA SoC audio for Freescale SOCs | ||
| 1113 | # | ||
| 1114 | |||
| 1115 | # | ||
| 1116 | # SoC Audio for the Texas Instruments OMAP | ||
| 1117 | # | ||
| 1118 | |||
| 1119 | # | ||
| 1120 | # Open Sound System | ||
| 1121 | # | ||
| 1122 | # CONFIG_SOUND_PRIME is not set | 1119 | # CONFIG_SOUND_PRIME is not set |
| 1123 | CONFIG_AC97_BUS=y | 1120 | CONFIG_AC97_BUS=y |
| 1124 | CONFIG_HID_SUPPORT=y | 1121 | CONFIG_HID_SUPPORT=y |
| @@ -1150,6 +1147,7 @@ CONFIG_USB_DEVICE_CLASS=y | |||
| 1150 | # CONFIG_USB_OTG is not set | 1147 | # CONFIG_USB_OTG is not set |
| 1151 | # CONFIG_USB_OTG_WHITELIST is not set | 1148 | # CONFIG_USB_OTG_WHITELIST is not set |
| 1152 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 1149 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
| 1150 | CONFIG_USB_MON=y | ||
| 1153 | 1151 | ||
| 1154 | # | 1152 | # |
| 1155 | # USB Host Controller Drivers | 1153 | # USB Host Controller Drivers |
| @@ -1201,6 +1199,7 @@ CONFIG_USB_STORAGE=y | |||
| 1201 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1199 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1202 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1200 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
| 1203 | # CONFIG_USB_STORAGE_KARMA is not set | 1201 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1202 | # CONFIG_USB_STORAGE_SIERRA is not set | ||
| 1204 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | 1203 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
| 1205 | # CONFIG_USB_LIBUSUAL is not set | 1204 | # CONFIG_USB_LIBUSUAL is not set |
| 1206 | 1205 | ||
| @@ -1209,7 +1208,6 @@ CONFIG_USB_STORAGE=y | |||
| 1209 | # | 1208 | # |
| 1210 | # CONFIG_USB_MDC800 is not set | 1209 | # CONFIG_USB_MDC800 is not set |
| 1211 | # CONFIG_USB_MICROTEK is not set | 1210 | # CONFIG_USB_MICROTEK is not set |
| 1212 | CONFIG_USB_MON=y | ||
| 1213 | 1211 | ||
| 1214 | # | 1212 | # |
| 1215 | # USB port drivers | 1213 | # USB port drivers |
| @@ -1222,7 +1220,6 @@ CONFIG_USB_MON=y | |||
| 1222 | # CONFIG_USB_EMI62 is not set | 1220 | # CONFIG_USB_EMI62 is not set |
| 1223 | # CONFIG_USB_EMI26 is not set | 1221 | # CONFIG_USB_EMI26 is not set |
| 1224 | # CONFIG_USB_ADUTUX is not set | 1222 | # CONFIG_USB_ADUTUX is not set |
| 1225 | # CONFIG_USB_AUERSWALD is not set | ||
| 1226 | # CONFIG_USB_RIO500 is not set | 1223 | # CONFIG_USB_RIO500 is not set |
| 1227 | # CONFIG_USB_LEGOTOWER is not set | 1224 | # CONFIG_USB_LEGOTOWER is not set |
| 1228 | # CONFIG_USB_LCD is not set | 1225 | # CONFIG_USB_LCD is not set |
| @@ -1310,6 +1307,7 @@ CONFIG_DMA_ENGINE=y | |||
| 1310 | # DMA Clients | 1307 | # DMA Clients |
| 1311 | # | 1308 | # |
| 1312 | # CONFIG_NET_DMA is not set | 1309 | # CONFIG_NET_DMA is not set |
| 1310 | # CONFIG_DMATEST is not set | ||
| 1313 | # CONFIG_UIO is not set | 1311 | # CONFIG_UIO is not set |
| 1314 | 1312 | ||
| 1315 | # | 1313 | # |
| @@ -1387,6 +1385,7 @@ CONFIG_EFS_FS=m | |||
| 1387 | CONFIG_CRAMFS=y | 1385 | CONFIG_CRAMFS=y |
| 1388 | CONFIG_VXFS_FS=m | 1386 | CONFIG_VXFS_FS=m |
| 1389 | # CONFIG_MINIX_FS is not set | 1387 | # CONFIG_MINIX_FS is not set |
| 1388 | # CONFIG_OMFS_FS is not set | ||
| 1390 | CONFIG_HPFS_FS=m | 1389 | CONFIG_HPFS_FS=m |
| 1391 | CONFIG_QNX4FS_FS=m | 1390 | CONFIG_QNX4FS_FS=m |
| 1392 | # CONFIG_ROMFS_FS is not set | 1391 | # CONFIG_ROMFS_FS is not set |
| @@ -1399,17 +1398,16 @@ CONFIG_NFS_FS=y | |||
| 1399 | CONFIG_NFS_V3=y | 1398 | CONFIG_NFS_V3=y |
| 1400 | # CONFIG_NFS_V3_ACL is not set | 1399 | # CONFIG_NFS_V3_ACL is not set |
| 1401 | CONFIG_NFS_V4=y | 1400 | CONFIG_NFS_V4=y |
| 1401 | CONFIG_ROOT_NFS=y | ||
| 1402 | CONFIG_NFSD=y | 1402 | CONFIG_NFSD=y |
| 1403 | # CONFIG_NFSD_V3 is not set | 1403 | # CONFIG_NFSD_V3 is not set |
| 1404 | # CONFIG_NFSD_V4 is not set | 1404 | # CONFIG_NFSD_V4 is not set |
| 1405 | CONFIG_ROOT_NFS=y | ||
| 1406 | CONFIG_LOCKD=y | 1405 | CONFIG_LOCKD=y |
| 1407 | CONFIG_LOCKD_V4=y | 1406 | CONFIG_LOCKD_V4=y |
| 1408 | CONFIG_EXPORTFS=y | 1407 | CONFIG_EXPORTFS=y |
| 1409 | CONFIG_NFS_COMMON=y | 1408 | CONFIG_NFS_COMMON=y |
| 1410 | CONFIG_SUNRPC=y | 1409 | CONFIG_SUNRPC=y |
| 1411 | CONFIG_SUNRPC_GSS=y | 1410 | CONFIG_SUNRPC_GSS=y |
| 1412 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 1413 | CONFIG_RPCSEC_GSS_KRB5=y | 1411 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1414 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1412 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1415 | # CONFIG_SMB_FS is not set | 1413 | # CONFIG_SMB_FS is not set |
| @@ -1488,6 +1486,7 @@ CONFIG_BITREVERSE=y | |||
| 1488 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1486 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 1489 | # CONFIG_CRC_CCITT is not set | 1487 | # CONFIG_CRC_CCITT is not set |
| 1490 | # CONFIG_CRC16 is not set | 1488 | # CONFIG_CRC16 is not set |
| 1489 | CONFIG_CRC_T10DIF=y | ||
| 1491 | CONFIG_CRC_ITU_T=m | 1490 | CONFIG_CRC_ITU_T=m |
| 1492 | CONFIG_CRC32=y | 1491 | CONFIG_CRC32=y |
| 1493 | # CONFIG_CRC7 is not set | 1492 | # CONFIG_CRC7 is not set |
| @@ -1513,6 +1512,8 @@ CONFIG_DEBUG_FS=y | |||
| 1513 | CONFIG_DEBUG_KERNEL=y | 1512 | CONFIG_DEBUG_KERNEL=y |
| 1514 | # CONFIG_DEBUG_SHIRQ is not set | 1513 | # CONFIG_DEBUG_SHIRQ is not set |
| 1515 | CONFIG_DETECT_SOFTLOCKUP=y | 1514 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1515 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 1516 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 1516 | CONFIG_SCHED_DEBUG=y | 1517 | CONFIG_SCHED_DEBUG=y |
| 1517 | # CONFIG_SCHEDSTATS is not set | 1518 | # CONFIG_SCHEDSTATS is not set |
| 1518 | # CONFIG_TIMER_STATS is not set | 1519 | # CONFIG_TIMER_STATS is not set |
| @@ -1531,19 +1532,29 @@ CONFIG_SCHED_DEBUG=y | |||
| 1531 | CONFIG_DEBUG_INFO=y | 1532 | CONFIG_DEBUG_INFO=y |
| 1532 | # CONFIG_DEBUG_VM is not set | 1533 | # CONFIG_DEBUG_VM is not set |
| 1533 | # CONFIG_DEBUG_WRITECOUNT is not set | 1534 | # CONFIG_DEBUG_WRITECOUNT is not set |
| 1535 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 1534 | # CONFIG_DEBUG_LIST is not set | 1536 | # CONFIG_DEBUG_LIST is not set |
| 1535 | # CONFIG_DEBUG_SG is not set | 1537 | # CONFIG_DEBUG_SG is not set |
| 1536 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1538 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 1537 | # CONFIG_RCU_TORTURE_TEST is not set | 1539 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1538 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1540 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 1539 | # CONFIG_FAULT_INJECTION is not set | 1541 | # CONFIG_FAULT_INJECTION is not set |
| 1542 | # CONFIG_LATENCYTOP is not set | ||
| 1543 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1544 | CONFIG_HAVE_FTRACE=y | ||
| 1545 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1546 | # CONFIG_FTRACE is not set | ||
| 1547 | # CONFIG_SCHED_TRACER is not set | ||
| 1548 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1540 | # CONFIG_SAMPLES is not set | 1549 | # CONFIG_SAMPLES is not set |
| 1550 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1551 | # CONFIG_KGDB is not set | ||
| 1541 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1552 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
| 1542 | # CONFIG_DEBUG_STACK_USAGE is not set | 1553 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1543 | # CONFIG_DEBUG_PAGEALLOC is not set | 1554 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1544 | # CONFIG_DEBUGGER is not set | ||
| 1545 | # CONFIG_CODE_PATCHING_SELFTEST is not set | 1555 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
| 1546 | # CONFIG_FTR_FIXUP_SELFTEST is not set | 1556 | # CONFIG_FTR_FIXUP_SELFTEST is not set |
| 1557 | # CONFIG_XMON is not set | ||
| 1547 | # CONFIG_IRQSTACKS is not set | 1558 | # CONFIG_IRQSTACKS is not set |
| 1548 | # CONFIG_VIRQ_DEBUG is not set | 1559 | # CONFIG_VIRQ_DEBUG is not set |
| 1549 | # CONFIG_BDI_SWITCH is not set | 1560 | # CONFIG_BDI_SWITCH is not set |
| @@ -1561,13 +1572,14 @@ CONFIG_CRYPTO=y | |||
| 1561 | # Crypto core or helper | 1572 | # Crypto core or helper |
| 1562 | # | 1573 | # |
| 1563 | CONFIG_CRYPTO_ALGAPI=y | 1574 | CONFIG_CRYPTO_ALGAPI=y |
| 1575 | CONFIG_CRYPTO_AEAD=y | ||
| 1564 | CONFIG_CRYPTO_BLKCIPHER=y | 1576 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1565 | CONFIG_CRYPTO_HASH=y | 1577 | CONFIG_CRYPTO_HASH=y |
| 1566 | CONFIG_CRYPTO_MANAGER=y | 1578 | CONFIG_CRYPTO_MANAGER=y |
| 1567 | # CONFIG_CRYPTO_GF128MUL is not set | 1579 | # CONFIG_CRYPTO_GF128MUL is not set |
| 1568 | # CONFIG_CRYPTO_NULL is not set | 1580 | # CONFIG_CRYPTO_NULL is not set |
| 1569 | # CONFIG_CRYPTO_CRYPTD is not set | 1581 | # CONFIG_CRYPTO_CRYPTD is not set |
| 1570 | # CONFIG_CRYPTO_AUTHENC is not set | 1582 | CONFIG_CRYPTO_AUTHENC=y |
| 1571 | # CONFIG_CRYPTO_TEST is not set | 1583 | # CONFIG_CRYPTO_TEST is not set |
| 1572 | 1584 | ||
| 1573 | # | 1585 | # |
| @@ -1601,6 +1613,10 @@ CONFIG_CRYPTO_HMAC=y | |||
| 1601 | # CONFIG_CRYPTO_MD4 is not set | 1613 | # CONFIG_CRYPTO_MD4 is not set |
| 1602 | CONFIG_CRYPTO_MD5=y | 1614 | CONFIG_CRYPTO_MD5=y |
| 1603 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1615 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 1616 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1617 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1618 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1619 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1604 | CONFIG_CRYPTO_SHA1=m | 1620 | CONFIG_CRYPTO_SHA1=m |
| 1605 | # CONFIG_CRYPTO_SHA256 is not set | 1621 | # CONFIG_CRYPTO_SHA256 is not set |
| 1606 | # CONFIG_CRYPTO_SHA512 is not set | 1622 | # CONFIG_CRYPTO_SHA512 is not set |
| @@ -1633,5 +1649,6 @@ CONFIG_CRYPTO_DES=y | |||
| 1633 | # CONFIG_CRYPTO_LZO is not set | 1649 | # CONFIG_CRYPTO_LZO is not set |
| 1634 | CONFIG_CRYPTO_HW=y | 1650 | CONFIG_CRYPTO_HW=y |
| 1635 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1651 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1652 | CONFIG_CRYPTO_DEV_TALITOS=y | ||
| 1636 | # CONFIG_PPC_CLOCK is not set | 1653 | # CONFIG_PPC_CLOCK is not set |
| 1637 | # CONFIG_VIRTUALIZATION is not set | 1654 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/85xx/mpc8540_ads_defconfig b/arch/powerpc/configs/85xx/mpc8540_ads_defconfig index f33fd516fd54..1ea181f826f1 100644 --- a/arch/powerpc/configs/85xx/mpc8540_ads_defconfig +++ b/arch/powerpc/configs/85xx/mpc8540_ads_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.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Mon Jun 9 08:52:31 2008 | 4 | # Thu Aug 21 00:52:30 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -15,6 +15,7 @@ CONFIG_PPC_85xx=y | |||
| 15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
| 16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
| 17 | CONFIG_E500=y | 17 | CONFIG_E500=y |
| 18 | # CONFIG_PPC_E500MC is not set | ||
| 18 | CONFIG_BOOKE=y | 19 | CONFIG_BOOKE=y |
| 19 | CONFIG_FSL_BOOKE=y | 20 | CONFIG_FSL_BOOKE=y |
| 20 | CONFIG_FSL_EMB_PERFMON=y | 21 | CONFIG_FSL_EMB_PERFMON=y |
| @@ -33,6 +34,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 35 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | 36 | CONFIG_STACKTRACE_SUPPORT=y |
| 37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | 38 | CONFIG_LOCKDEP_SUPPORT=y |
| 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 38 | CONFIG_ARCH_HAS_ILOG2_U32=y | 40 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| @@ -89,7 +91,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 89 | CONFIG_SYSCTL=y | 91 | CONFIG_SYSCTL=y |
| 90 | CONFIG_EMBEDDED=y | 92 | CONFIG_EMBEDDED=y |
| 91 | CONFIG_SYSCTL_SYSCALL=y | 93 | CONFIG_SYSCTL_SYSCALL=y |
| 92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 93 | CONFIG_KALLSYMS=y | 94 | CONFIG_KALLSYMS=y |
| 94 | # CONFIG_KALLSYMS_ALL is not set | 95 | # CONFIG_KALLSYMS_ALL is not set |
| 95 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 96 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -114,10 +115,16 @@ CONFIG_SLUB=y | |||
| 114 | # CONFIG_PROFILING is not set | 115 | # CONFIG_PROFILING is not set |
| 115 | # CONFIG_MARKERS is not set | 116 | # CONFIG_MARKERS is not set |
| 116 | CONFIG_HAVE_OPROFILE=y | 117 | CONFIG_HAVE_OPROFILE=y |
| 118 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 119 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 117 | CONFIG_HAVE_KPROBES=y | 120 | CONFIG_HAVE_KPROBES=y |
| 118 | CONFIG_HAVE_KRETPROBES=y | 121 | CONFIG_HAVE_KRETPROBES=y |
| 122 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 119 | # CONFIG_HAVE_DMA_ATTRS is not set | 123 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 124 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 125 | # CONFIG_HAVE_CLK is not set | ||
| 120 | CONFIG_PROC_PAGE_MONITOR=y | 126 | CONFIG_PROC_PAGE_MONITOR=y |
| 127 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 121 | CONFIG_SLABINFO=y | 128 | CONFIG_SLABINFO=y |
| 122 | CONFIG_RT_MUTEXES=y | 129 | CONFIG_RT_MUTEXES=y |
| 123 | # CONFIG_TINY_SHMEM is not set | 130 | # CONFIG_TINY_SHMEM is not set |
| @@ -128,6 +135,7 @@ CONFIG_BLOCK=y | |||
| 128 | # CONFIG_BLK_DEV_IO_TRACE is not set | 135 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 129 | # CONFIG_LSF is not set | 136 | # CONFIG_LSF is not set |
| 130 | # CONFIG_BLK_DEV_BSG is not set | 137 | # CONFIG_BLK_DEV_BSG is not set |
| 138 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 131 | 139 | ||
| 132 | # | 140 | # |
| 133 | # IO Schedulers | 141 | # IO Schedulers |
| @@ -146,8 +154,6 @@ CONFIG_CLASSIC_RCU=y | |||
| 146 | # | 154 | # |
| 147 | # Platform support | 155 | # Platform support |
| 148 | # | 156 | # |
| 149 | # CONFIG_PPC_MPC512x is not set | ||
| 150 | # CONFIG_PPC_MPC5121 is not set | ||
| 151 | # CONFIG_PPC_CELL is not set | 157 | # CONFIG_PPC_CELL is not set |
| 152 | # CONFIG_PPC_CELL_NATIVE is not set | 158 | # CONFIG_PPC_CELL_NATIVE is not set |
| 153 | # CONFIG_PQ2ADS is not set | 159 | # CONFIG_PQ2ADS is not set |
| @@ -156,11 +162,13 @@ CONFIG_MPC8540_ADS=y | |||
| 156 | # CONFIG_MPC8560_ADS is not set | 162 | # CONFIG_MPC8560_ADS is not set |
| 157 | # CONFIG_MPC85xx_CDS is not set | 163 | # CONFIG_MPC85xx_CDS is not set |
| 158 | # CONFIG_MPC85xx_MDS is not set | 164 | # CONFIG_MPC85xx_MDS is not set |
| 165 | # CONFIG_MPC8536_DS is not set | ||
| 159 | # CONFIG_MPC85xx_DS is not set | 166 | # CONFIG_MPC85xx_DS is not set |
| 160 | # CONFIG_KSI8560 is not set | 167 | # CONFIG_KSI8560 is not set |
| 161 | # CONFIG_STX_GP3 is not set | 168 | # CONFIG_STX_GP3 is not set |
| 162 | # CONFIG_TQM8540 is not set | 169 | # CONFIG_TQM8540 is not set |
| 163 | # CONFIG_TQM8541 is not set | 170 | # CONFIG_TQM8541 is not set |
| 171 | # CONFIG_TQM8548 is not set | ||
| 164 | # CONFIG_TQM8555 is not set | 172 | # CONFIG_TQM8555 is not set |
| 165 | # CONFIG_TQM8560 is not set | 173 | # CONFIG_TQM8560 is not set |
| 166 | # CONFIG_SBC8548 is not set | 174 | # CONFIG_SBC8548 is not set |
| @@ -192,7 +200,7 @@ CONFIG_HZ_250=y | |||
| 192 | # CONFIG_HZ_300 is not set | 200 | # CONFIG_HZ_300 is not set |
| 193 | # CONFIG_HZ_1000 is not set | 201 | # CONFIG_HZ_1000 is not set |
| 194 | CONFIG_HZ=250 | 202 | CONFIG_HZ=250 |
| 195 | # CONFIG_SCHED_HRTICK is not set | 203 | CONFIG_SCHED_HRTICK=y |
| 196 | CONFIG_PREEMPT_NONE=y | 204 | CONFIG_PREEMPT_NONE=y |
| 197 | # CONFIG_PREEMPT_VOLUNTARY is not set | 205 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 198 | # CONFIG_PREEMPT is not set | 206 | # CONFIG_PREEMPT is not set |
| @@ -215,6 +223,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 215 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 223 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 216 | CONFIG_PAGEFLAGS_EXTENDED=y | 224 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 217 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 225 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 226 | CONFIG_MIGRATION=y | ||
| 218 | # CONFIG_RESOURCES_64BIT is not set | 227 | # CONFIG_RESOURCES_64BIT is not set |
| 219 | CONFIG_ZONE_DMA_FLAG=1 | 228 | CONFIG_ZONE_DMA_FLAG=1 |
| 220 | CONFIG_BOUNCE=y | 229 | CONFIG_BOUNCE=y |
| @@ -222,6 +231,7 @@ CONFIG_VIRT_TO_BUS=y | |||
| 222 | CONFIG_FORCE_MAX_ZONEORDER=11 | 231 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 223 | CONFIG_PROC_DEVICETREE=y | 232 | CONFIG_PROC_DEVICETREE=y |
| 224 | # CONFIG_CMDLINE_BOOL is not set | 233 | # CONFIG_CMDLINE_BOOL is not set |
| 234 | CONFIG_EXTRA_TARGETS="" | ||
| 225 | # CONFIG_PM is not set | 235 | # CONFIG_PM is not set |
| 226 | # CONFIG_SECCOMP is not set | 236 | # CONFIG_SECCOMP is not set |
| 227 | CONFIG_ISA_DMA_API=y | 237 | CONFIG_ISA_DMA_API=y |
| @@ -231,6 +241,7 @@ CONFIG_ISA_DMA_API=y | |||
| 231 | # | 241 | # |
| 232 | CONFIG_ZONE_DMA=y | 242 | CONFIG_ZONE_DMA=y |
| 233 | CONFIG_FSL_SOC=y | 243 | CONFIG_FSL_SOC=y |
| 244 | CONFIG_PPC_PCI_CHOICE=y | ||
| 234 | # CONFIG_PCI is not set | 245 | # CONFIG_PCI is not set |
| 235 | # CONFIG_PCI_DOMAINS is not set | 246 | # CONFIG_PCI_DOMAINS is not set |
| 236 | # CONFIG_PCI_SYSCALL is not set | 247 | # CONFIG_PCI_SYSCALL is not set |
| @@ -252,10 +263,6 @@ CONFIG_KERNEL_START=0xc0000000 | |||
| 252 | CONFIG_PHYSICAL_START=0x00000000 | 263 | CONFIG_PHYSICAL_START=0x00000000 |
| 253 | CONFIG_PHYSICAL_ALIGN=0x10000000 | 264 | CONFIG_PHYSICAL_ALIGN=0x10000000 |
| 254 | CONFIG_TASK_SIZE=0xc0000000 | 265 | CONFIG_TASK_SIZE=0xc0000000 |
| 255 | |||
| 256 | # | ||
| 257 | # Networking | ||
| 258 | # | ||
| 259 | CONFIG_NET=y | 266 | CONFIG_NET=y |
| 260 | 267 | ||
| 261 | # | 268 | # |
| @@ -367,6 +374,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
| 367 | # CONFIG_BLK_DEV_XIP is not set | 374 | # CONFIG_BLK_DEV_XIP is not set |
| 368 | # CONFIG_CDROM_PKTCDVD is not set | 375 | # CONFIG_CDROM_PKTCDVD is not set |
| 369 | # CONFIG_ATA_OVER_ETH is not set | 376 | # CONFIG_ATA_OVER_ETH is not set |
| 377 | # CONFIG_BLK_DEV_HD is not set | ||
| 370 | CONFIG_MISC_DEVICES=y | 378 | CONFIG_MISC_DEVICES=y |
| 371 | # CONFIG_EEPROM_93CX6 is not set | 379 | # CONFIG_EEPROM_93CX6 is not set |
| 372 | # CONFIG_ENCLOSURE_SERVICES is not set | 380 | # CONFIG_ENCLOSURE_SERVICES is not set |
| @@ -384,7 +392,6 @@ CONFIG_HAVE_IDE=y | |||
| 384 | # CONFIG_MD is not set | 392 | # CONFIG_MD is not set |
| 385 | # CONFIG_MACINTOSH_DRIVERS is not set | 393 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 386 | CONFIG_NETDEVICES=y | 394 | CONFIG_NETDEVICES=y |
| 387 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 388 | # CONFIG_DUMMY is not set | 395 | # CONFIG_DUMMY is not set |
| 389 | # CONFIG_BONDING is not set | 396 | # CONFIG_BONDING is not set |
| 390 | # CONFIG_MACVLAN is not set | 397 | # CONFIG_MACVLAN is not set |
| @@ -416,9 +423,7 @@ CONFIG_MII=y | |||
| 416 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 423 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
| 417 | # CONFIG_B44 is not set | 424 | # CONFIG_B44 is not set |
| 418 | CONFIG_NETDEV_1000=y | 425 | CONFIG_NETDEV_1000=y |
| 419 | # CONFIG_E1000E_ENABLED is not set | ||
| 420 | CONFIG_GIANFAR=y | 426 | CONFIG_GIANFAR=y |
| 421 | CONFIG_GFAR_NAPI=y | ||
| 422 | CONFIG_NETDEV_10000=y | 427 | CONFIG_NETDEV_10000=y |
| 423 | 428 | ||
| 424 | # | 429 | # |
| @@ -504,6 +509,8 @@ CONFIG_GEN_RTC=y | |||
| 504 | # CONFIG_TCG_TPM is not set | 509 | # CONFIG_TCG_TPM is not set |
| 505 | # CONFIG_I2C is not set | 510 | # CONFIG_I2C is not set |
| 506 | # CONFIG_SPI is not set | 511 | # CONFIG_SPI is not set |
| 512 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 513 | # CONFIG_GPIOLIB is not set | ||
| 507 | # CONFIG_W1 is not set | 514 | # CONFIG_W1 is not set |
| 508 | # CONFIG_POWER_SUPPLY is not set | 515 | # CONFIG_POWER_SUPPLY is not set |
| 509 | CONFIG_HWMON=y | 516 | CONFIG_HWMON=y |
| @@ -520,6 +527,7 @@ CONFIG_HWMON=y | |||
| 520 | # CONFIG_SENSORS_W83627EHF is not set | 527 | # CONFIG_SENSORS_W83627EHF is not set |
| 521 | # CONFIG_HWMON_DEBUG_CHIP is not set | 528 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 522 | # CONFIG_THERMAL is not set | 529 | # CONFIG_THERMAL is not set |
| 530 | # CONFIG_THERMAL_HWMON is not set | ||
| 523 | # CONFIG_WATCHDOG is not set | 531 | # CONFIG_WATCHDOG is not set |
| 524 | 532 | ||
| 525 | # | 533 | # |
| @@ -531,8 +539,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 531 | # | 539 | # |
| 532 | # Multifunction device drivers | 540 | # Multifunction device drivers |
| 533 | # | 541 | # |
| 542 | # CONFIG_MFD_CORE is not set | ||
| 534 | # CONFIG_MFD_SM501 is not set | 543 | # CONFIG_MFD_SM501 is not set |
| 535 | # CONFIG_HTC_PASIC3 is not set | 544 | # CONFIG_HTC_PASIC3 is not set |
| 545 | # CONFIG_MFD_TMIO is not set | ||
| 536 | 546 | ||
| 537 | # | 547 | # |
| 538 | # Multimedia devices | 548 | # Multimedia devices |
| @@ -562,10 +572,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
| 562 | # Display device support | 572 | # Display device support |
| 563 | # | 573 | # |
| 564 | # CONFIG_DISPLAY_SUPPORT is not set | 574 | # CONFIG_DISPLAY_SUPPORT is not set |
| 565 | |||
| 566 | # | ||
| 567 | # Sound | ||
| 568 | # | ||
| 569 | # CONFIG_SOUND is not set | 575 | # CONFIG_SOUND is not set |
| 570 | CONFIG_HID_SUPPORT=y | 576 | CONFIG_HID_SUPPORT=y |
| 571 | CONFIG_HID=y | 577 | CONFIG_HID=y |
| @@ -579,6 +585,10 @@ CONFIG_USB_SUPPORT=y | |||
| 579 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 585 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
| 580 | 586 | ||
| 581 | # | 587 | # |
| 588 | # Enable Host or Gadget support to see Inventra options | ||
| 589 | # | ||
| 590 | |||
| 591 | # | ||
| 582 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 592 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 583 | # | 593 | # |
| 584 | # CONFIG_USB_GADGET is not set | 594 | # CONFIG_USB_GADGET is not set |
| @@ -655,6 +665,7 @@ CONFIG_TMPFS=y | |||
| 655 | # CONFIG_CRAMFS is not set | 665 | # CONFIG_CRAMFS is not set |
| 656 | # CONFIG_VXFS_FS is not set | 666 | # CONFIG_VXFS_FS is not set |
| 657 | # CONFIG_MINIX_FS is not set | 667 | # CONFIG_MINIX_FS is not set |
| 668 | # CONFIG_OMFS_FS is not set | ||
| 658 | # CONFIG_HPFS_FS is not set | 669 | # CONFIG_HPFS_FS is not set |
| 659 | # CONFIG_QNX4FS_FS is not set | 670 | # CONFIG_QNX4FS_FS is not set |
| 660 | # CONFIG_ROMFS_FS is not set | 671 | # CONFIG_ROMFS_FS is not set |
| @@ -664,12 +675,11 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 664 | CONFIG_NFS_FS=y | 675 | CONFIG_NFS_FS=y |
| 665 | # CONFIG_NFS_V3 is not set | 676 | # CONFIG_NFS_V3 is not set |
| 666 | # CONFIG_NFS_V4 is not set | 677 | # CONFIG_NFS_V4 is not set |
| 667 | # CONFIG_NFSD is not set | ||
| 668 | CONFIG_ROOT_NFS=y | 678 | CONFIG_ROOT_NFS=y |
| 679 | # CONFIG_NFSD is not set | ||
| 669 | CONFIG_LOCKD=y | 680 | CONFIG_LOCKD=y |
| 670 | CONFIG_NFS_COMMON=y | 681 | CONFIG_NFS_COMMON=y |
| 671 | CONFIG_SUNRPC=y | 682 | CONFIG_SUNRPC=y |
| 672 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 673 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 683 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 674 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 684 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 675 | # CONFIG_SMB_FS is not set | 685 | # CONFIG_SMB_FS is not set |
| @@ -705,6 +715,7 @@ CONFIG_BITREVERSE=y | |||
| 705 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 715 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 706 | # CONFIG_CRC_CCITT is not set | 716 | # CONFIG_CRC_CCITT is not set |
| 707 | # CONFIG_CRC16 is not set | 717 | # CONFIG_CRC16 is not set |
| 718 | # CONFIG_CRC_T10DIF is not set | ||
| 708 | # CONFIG_CRC_ITU_T is not set | 719 | # CONFIG_CRC_ITU_T is not set |
| 709 | CONFIG_CRC32=y | 720 | CONFIG_CRC32=y |
| 710 | # CONFIG_CRC7 is not set | 721 | # CONFIG_CRC7 is not set |
| @@ -729,6 +740,8 @@ CONFIG_FRAME_WARN=1024 | |||
| 729 | CONFIG_DEBUG_KERNEL=y | 740 | CONFIG_DEBUG_KERNEL=y |
| 730 | # CONFIG_DEBUG_SHIRQ is not set | 741 | # CONFIG_DEBUG_SHIRQ is not set |
| 731 | CONFIG_DETECT_SOFTLOCKUP=y | 742 | CONFIG_DETECT_SOFTLOCKUP=y |
| 743 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 744 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 732 | CONFIG_SCHED_DEBUG=y | 745 | CONFIG_SCHED_DEBUG=y |
| 733 | # CONFIG_SCHEDSTATS is not set | 746 | # CONFIG_SCHEDSTATS is not set |
| 734 | # CONFIG_TIMER_STATS is not set | 747 | # CONFIG_TIMER_STATS is not set |
| @@ -746,16 +759,29 @@ CONFIG_DEBUG_MUTEXES=y | |||
| 746 | # CONFIG_DEBUG_INFO is not set | 759 | # CONFIG_DEBUG_INFO is not set |
| 747 | # CONFIG_DEBUG_VM is not set | 760 | # CONFIG_DEBUG_VM is not set |
| 748 | # CONFIG_DEBUG_WRITECOUNT is not set | 761 | # CONFIG_DEBUG_WRITECOUNT is not set |
| 762 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 749 | # CONFIG_DEBUG_LIST is not set | 763 | # CONFIG_DEBUG_LIST is not set |
| 750 | # CONFIG_DEBUG_SG is not set | 764 | # CONFIG_DEBUG_SG is not set |
| 751 | # CONFIG_BOOT_PRINTK_DELAY is not set | 765 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 766 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 752 | # CONFIG_BACKTRACE_SELF_TEST is not set | 767 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 753 | # CONFIG_FAULT_INJECTION is not set | 768 | # CONFIG_FAULT_INJECTION is not set |
| 769 | # CONFIG_LATENCYTOP is not set | ||
| 770 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 771 | CONFIG_HAVE_FTRACE=y | ||
| 772 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 773 | # CONFIG_FTRACE is not set | ||
| 774 | # CONFIG_SCHED_TRACER is not set | ||
| 775 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 754 | # CONFIG_SAMPLES is not set | 776 | # CONFIG_SAMPLES is not set |
| 777 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 778 | # CONFIG_KGDB is not set | ||
| 755 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 779 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
| 756 | # CONFIG_DEBUG_STACK_USAGE is not set | 780 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 757 | # CONFIG_DEBUG_PAGEALLOC is not set | 781 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 758 | # CONFIG_DEBUGGER is not set | 782 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
| 783 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
| 784 | # CONFIG_XMON is not set | ||
| 759 | # CONFIG_IRQSTACKS is not set | 785 | # CONFIG_IRQSTACKS is not set |
| 760 | # CONFIG_BDI_SWITCH is not set | 786 | # CONFIG_BDI_SWITCH is not set |
| 761 | # CONFIG_PPC_EARLY_DEBUG is not set | 787 | # CONFIG_PPC_EARLY_DEBUG is not set |
| @@ -808,6 +834,10 @@ CONFIG_CRYPTO=y | |||
| 808 | # CONFIG_CRYPTO_MD4 is not set | 834 | # CONFIG_CRYPTO_MD4 is not set |
| 809 | # CONFIG_CRYPTO_MD5 is not set | 835 | # CONFIG_CRYPTO_MD5 is not set |
| 810 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 836 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 837 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 838 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 839 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 840 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 811 | # CONFIG_CRYPTO_SHA1 is not set | 841 | # CONFIG_CRYPTO_SHA1 is not set |
| 812 | # CONFIG_CRYPTO_SHA256 is not set | 842 | # CONFIG_CRYPTO_SHA256 is not set |
| 813 | # CONFIG_CRYPTO_SHA512 is not set | 843 | # CONFIG_CRYPTO_SHA512 is not set |
| @@ -839,5 +869,6 @@ CONFIG_CRYPTO=y | |||
| 839 | # CONFIG_CRYPTO_DEFLATE is not set | 869 | # CONFIG_CRYPTO_DEFLATE is not set |
| 840 | # CONFIG_CRYPTO_LZO is not set | 870 | # CONFIG_CRYPTO_LZO is not set |
| 841 | CONFIG_CRYPTO_HW=y | 871 | CONFIG_CRYPTO_HW=y |
| 872 | # CONFIG_CRYPTO_DEV_TALITOS is not set | ||
| 842 | # CONFIG_PPC_CLOCK is not set | 873 | # CONFIG_PPC_CLOCK is not set |
| 843 | # CONFIG_VIRTUALIZATION is not set | 874 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/85xx/mpc8544_ds_defconfig b/arch/powerpc/configs/85xx/mpc8544_ds_defconfig index a0583e5119f5..1aecdeab9841 100644 --- a/arch/powerpc/configs/85xx/mpc8544_ds_defconfig +++ b/arch/powerpc/configs/85xx/mpc8544_ds_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.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Mon Jun 9 08:52:32 2008 | 4 | # Thu Aug 21 07:20:43 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -15,6 +15,7 @@ CONFIG_PPC_85xx=y | |||
| 15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
| 16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
| 17 | CONFIG_E500=y | 17 | CONFIG_E500=y |
| 18 | # CONFIG_PPC_E500MC is not set | ||
| 18 | CONFIG_BOOKE=y | 19 | CONFIG_BOOKE=y |
| 19 | CONFIG_FSL_BOOKE=y | 20 | CONFIG_FSL_BOOKE=y |
| 20 | CONFIG_FSL_EMB_PERFMON=y | 21 | CONFIG_FSL_EMB_PERFMON=y |
| @@ -33,6 +34,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 35 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | 36 | CONFIG_STACKTRACE_SUPPORT=y |
| 37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | 38 | CONFIG_LOCKDEP_SUPPORT=y |
| 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 38 | CONFIG_ARCH_HAS_ILOG2_U32=y | 40 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| @@ -92,7 +94,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 92 | CONFIG_SYSCTL=y | 94 | CONFIG_SYSCTL=y |
| 93 | CONFIG_EMBEDDED=y | 95 | CONFIG_EMBEDDED=y |
| 94 | CONFIG_SYSCTL_SYSCALL=y | 96 | CONFIG_SYSCTL_SYSCALL=y |
| 95 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 96 | CONFIG_KALLSYMS=y | 97 | CONFIG_KALLSYMS=y |
| 97 | CONFIG_KALLSYMS_ALL=y | 98 | CONFIG_KALLSYMS_ALL=y |
| 98 | CONFIG_KALLSYMS_EXTRA_PASS=y | 99 | CONFIG_KALLSYMS_EXTRA_PASS=y |
| @@ -118,10 +119,16 @@ CONFIG_SLUB=y | |||
| 118 | # CONFIG_MARKERS is not set | 119 | # CONFIG_MARKERS is not set |
| 119 | CONFIG_HAVE_OPROFILE=y | 120 | CONFIG_HAVE_OPROFILE=y |
| 120 | # CONFIG_KPROBES is not set | 121 | # CONFIG_KPROBES is not set |
| 122 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 123 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 121 | CONFIG_HAVE_KPROBES=y | 124 | CONFIG_HAVE_KPROBES=y |
| 122 | CONFIG_HAVE_KRETPROBES=y | 125 | CONFIG_HAVE_KRETPROBES=y |
| 126 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 123 | # CONFIG_HAVE_DMA_ATTRS is not set | 127 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 128 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 129 | # CONFIG_HAVE_CLK is not set | ||
| 124 | CONFIG_PROC_PAGE_MONITOR=y | 130 | CONFIG_PROC_PAGE_MONITOR=y |
| 131 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 125 | CONFIG_SLABINFO=y | 132 | CONFIG_SLABINFO=y |
| 126 | CONFIG_RT_MUTEXES=y | 133 | CONFIG_RT_MUTEXES=y |
| 127 | # CONFIG_TINY_SHMEM is not set | 134 | # CONFIG_TINY_SHMEM is not set |
| @@ -138,6 +145,7 @@ CONFIG_LBD=y | |||
| 138 | # CONFIG_BLK_DEV_IO_TRACE is not set | 145 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 139 | # CONFIG_LSF is not set | 146 | # CONFIG_LSF is not set |
| 140 | # CONFIG_BLK_DEV_BSG is not set | 147 | # CONFIG_BLK_DEV_BSG is not set |
| 148 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 141 | 149 | ||
| 142 | # | 150 | # |
| 143 | # IO Schedulers | 151 | # IO Schedulers |
| @@ -156,8 +164,6 @@ CONFIG_CLASSIC_RCU=y | |||
| 156 | # | 164 | # |
| 157 | # Platform support | 165 | # Platform support |
| 158 | # | 166 | # |
| 159 | # CONFIG_PPC_MPC512x is not set | ||
| 160 | # CONFIG_PPC_MPC5121 is not set | ||
| 161 | # CONFIG_PPC_CELL is not set | 167 | # CONFIG_PPC_CELL is not set |
| 162 | # CONFIG_PPC_CELL_NATIVE is not set | 168 | # CONFIG_PPC_CELL_NATIVE is not set |
| 163 | # CONFIG_PQ2ADS is not set | 169 | # CONFIG_PQ2ADS is not set |
| @@ -166,11 +172,13 @@ CONFIG_MPC85xx=y | |||
| 166 | # CONFIG_MPC8560_ADS is not set | 172 | # CONFIG_MPC8560_ADS is not set |
| 167 | # CONFIG_MPC85xx_CDS is not set | 173 | # CONFIG_MPC85xx_CDS is not set |
| 168 | # CONFIG_MPC85xx_MDS is not set | 174 | # CONFIG_MPC85xx_MDS is not set |
| 175 | # CONFIG_MPC8536_DS is not set | ||
| 169 | CONFIG_MPC85xx_DS=y | 176 | CONFIG_MPC85xx_DS=y |
| 170 | # CONFIG_KSI8560 is not set | 177 | # CONFIG_KSI8560 is not set |
| 171 | # CONFIG_STX_GP3 is not set | 178 | # CONFIG_STX_GP3 is not set |
| 172 | # CONFIG_TQM8540 is not set | 179 | # CONFIG_TQM8540 is not set |
| 173 | # CONFIG_TQM8541 is not set | 180 | # CONFIG_TQM8541 is not set |
| 181 | # CONFIG_TQM8548 is not set | ||
| 174 | # CONFIG_TQM8555 is not set | 182 | # CONFIG_TQM8555 is not set |
| 175 | # CONFIG_TQM8560 is not set | 183 | # CONFIG_TQM8560 is not set |
| 176 | # CONFIG_SBC8548 is not set | 184 | # CONFIG_SBC8548 is not set |
| @@ -202,7 +210,7 @@ CONFIG_HZ_250=y | |||
| 202 | # CONFIG_HZ_300 is not set | 210 | # CONFIG_HZ_300 is not set |
| 203 | # CONFIG_HZ_1000 is not set | 211 | # CONFIG_HZ_1000 is not set |
| 204 | CONFIG_HZ=250 | 212 | CONFIG_HZ=250 |
| 205 | # CONFIG_SCHED_HRTICK is not set | 213 | CONFIG_SCHED_HRTICK=y |
| 206 | CONFIG_PREEMPT_NONE=y | 214 | CONFIG_PREEMPT_NONE=y |
| 207 | # CONFIG_PREEMPT_VOLUNTARY is not set | 215 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 208 | # CONFIG_PREEMPT is not set | 216 | # CONFIG_PREEMPT is not set |
| @@ -225,6 +233,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 225 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 233 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 226 | CONFIG_PAGEFLAGS_EXTENDED=y | 234 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 227 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 235 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 236 | CONFIG_MIGRATION=y | ||
| 228 | # CONFIG_RESOURCES_64BIT is not set | 237 | # CONFIG_RESOURCES_64BIT is not set |
| 229 | CONFIG_ZONE_DMA_FLAG=1 | 238 | CONFIG_ZONE_DMA_FLAG=1 |
| 230 | CONFIG_BOUNCE=y | 239 | CONFIG_BOUNCE=y |
| @@ -232,6 +241,7 @@ CONFIG_VIRT_TO_BUS=y | |||
| 232 | CONFIG_FORCE_MAX_ZONEORDER=11 | 241 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 233 | CONFIG_PROC_DEVICETREE=y | 242 | CONFIG_PROC_DEVICETREE=y |
| 234 | # CONFIG_CMDLINE_BOOL is not set | 243 | # CONFIG_CMDLINE_BOOL is not set |
| 244 | CONFIG_EXTRA_TARGETS="" | ||
| 235 | # CONFIG_PM is not set | 245 | # CONFIG_PM is not set |
| 236 | CONFIG_SECCOMP=y | 246 | CONFIG_SECCOMP=y |
| 237 | CONFIG_ISA_DMA_API=y | 247 | CONFIG_ISA_DMA_API=y |
| @@ -244,6 +254,7 @@ CONFIG_GENERIC_ISA_DMA=y | |||
| 244 | CONFIG_PPC_INDIRECT_PCI=y | 254 | CONFIG_PPC_INDIRECT_PCI=y |
| 245 | CONFIG_FSL_SOC=y | 255 | CONFIG_FSL_SOC=y |
| 246 | CONFIG_FSL_PCI=y | 256 | CONFIG_FSL_PCI=y |
| 257 | CONFIG_PPC_PCI_CHOICE=y | ||
| 247 | CONFIG_PCI=y | 258 | CONFIG_PCI=y |
| 248 | CONFIG_PCI_DOMAINS=y | 259 | CONFIG_PCI_DOMAINS=y |
| 249 | CONFIG_PCI_SYSCALL=y | 260 | CONFIG_PCI_SYSCALL=y |
| @@ -270,10 +281,6 @@ CONFIG_KERNEL_START=0xc0000000 | |||
| 270 | CONFIG_PHYSICAL_START=0x00000000 | 281 | CONFIG_PHYSICAL_START=0x00000000 |
| 271 | CONFIG_PHYSICAL_ALIGN=0x10000000 | 282 | CONFIG_PHYSICAL_ALIGN=0x10000000 |
| 272 | CONFIG_TASK_SIZE=0xc0000000 | 283 | CONFIG_TASK_SIZE=0xc0000000 |
| 273 | |||
| 274 | # | ||
| 275 | # Networking | ||
| 276 | # | ||
| 277 | CONFIG_NET=y | 284 | CONFIG_NET=y |
| 278 | 285 | ||
| 279 | # | 286 | # |
| @@ -399,6 +406,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | |||
| 399 | CONFIG_STANDALONE=y | 406 | CONFIG_STANDALONE=y |
| 400 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 407 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 401 | CONFIG_FW_LOADER=y | 408 | CONFIG_FW_LOADER=y |
| 409 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
| 410 | CONFIG_EXTRA_FIRMWARE="" | ||
| 402 | # CONFIG_DEBUG_DRIVER is not set | 411 | # CONFIG_DEBUG_DRIVER is not set |
| 403 | # CONFIG_DEBUG_DEVRES is not set | 412 | # CONFIG_DEBUG_DEVRES is not set |
| 404 | # CONFIG_SYS_HYPERVISOR is not set | 413 | # CONFIG_SYS_HYPERVISOR is not set |
| @@ -425,12 +434,14 @@ CONFIG_BLK_DEV_RAM_SIZE=131072 | |||
| 425 | # CONFIG_BLK_DEV_XIP is not set | 434 | # CONFIG_BLK_DEV_XIP is not set |
| 426 | # CONFIG_CDROM_PKTCDVD is not set | 435 | # CONFIG_CDROM_PKTCDVD is not set |
| 427 | # CONFIG_ATA_OVER_ETH is not set | 436 | # CONFIG_ATA_OVER_ETH is not set |
| 437 | # CONFIG_BLK_DEV_HD is not set | ||
| 428 | CONFIG_MISC_DEVICES=y | 438 | CONFIG_MISC_DEVICES=y |
| 429 | # CONFIG_PHANTOM is not set | 439 | # CONFIG_PHANTOM is not set |
| 430 | # CONFIG_EEPROM_93CX6 is not set | 440 | # CONFIG_EEPROM_93CX6 is not set |
| 431 | # CONFIG_SGI_IOC4 is not set | 441 | # CONFIG_SGI_IOC4 is not set |
| 432 | # CONFIG_TIFM_CORE is not set | 442 | # CONFIG_TIFM_CORE is not set |
| 433 | # CONFIG_ENCLOSURE_SERVICES is not set | 443 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 444 | # CONFIG_HP_ILO is not set | ||
| 434 | CONFIG_HAVE_IDE=y | 445 | CONFIG_HAVE_IDE=y |
| 435 | # CONFIG_IDE is not set | 446 | # CONFIG_IDE is not set |
| 436 | 447 | ||
| @@ -510,6 +521,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 510 | # CONFIG_SCSI_NSP32 is not set | 521 | # CONFIG_SCSI_NSP32 is not set |
| 511 | # CONFIG_SCSI_DEBUG is not set | 522 | # CONFIG_SCSI_DEBUG is not set |
| 512 | # CONFIG_SCSI_SRP is not set | 523 | # CONFIG_SCSI_SRP is not set |
| 524 | # CONFIG_SCSI_DH is not set | ||
| 513 | CONFIG_ATA=y | 525 | CONFIG_ATA=y |
| 514 | # CONFIG_ATA_NONSTANDARD is not set | 526 | # CONFIG_ATA_NONSTANDARD is not set |
| 515 | CONFIG_SATA_PMP=y | 527 | CONFIG_SATA_PMP=y |
| @@ -577,12 +589,15 @@ CONFIG_PATA_ALI=y | |||
| 577 | # | 589 | # |
| 578 | # IEEE 1394 (FireWire) support | 590 | # IEEE 1394 (FireWire) support |
| 579 | # | 591 | # |
| 592 | |||
| 593 | # | ||
| 594 | # Enable only one of the two stacks, unless you know what you are doing | ||
| 595 | # | ||
| 580 | # CONFIG_FIREWIRE is not set | 596 | # CONFIG_FIREWIRE is not set |
| 581 | # CONFIG_IEEE1394 is not set | 597 | # CONFIG_IEEE1394 is not set |
| 582 | # CONFIG_I2O is not set | 598 | # CONFIG_I2O is not set |
| 583 | # CONFIG_MACINTOSH_DRIVERS is not set | 599 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 584 | CONFIG_NETDEVICES=y | 600 | CONFIG_NETDEVICES=y |
| 585 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 586 | CONFIG_DUMMY=y | 601 | CONFIG_DUMMY=y |
| 587 | # CONFIG_BONDING is not set | 602 | # CONFIG_BONDING is not set |
| 588 | # CONFIG_MACVLAN is not set | 603 | # CONFIG_MACVLAN is not set |
| @@ -626,7 +641,6 @@ CONFIG_NETDEV_1000=y | |||
| 626 | # CONFIG_DL2K is not set | 641 | # CONFIG_DL2K is not set |
| 627 | # CONFIG_E1000 is not set | 642 | # CONFIG_E1000 is not set |
| 628 | # CONFIG_E1000E is not set | 643 | # CONFIG_E1000E is not set |
| 629 | # CONFIG_E1000E_ENABLED is not set | ||
| 630 | # CONFIG_IP1000 is not set | 644 | # CONFIG_IP1000 is not set |
| 631 | # CONFIG_IGB is not set | 645 | # CONFIG_IGB is not set |
| 632 | # CONFIG_NS83820 is not set | 646 | # CONFIG_NS83820 is not set |
| @@ -640,9 +654,9 @@ CONFIG_NETDEV_1000=y | |||
| 640 | # CONFIG_TIGON3 is not set | 654 | # CONFIG_TIGON3 is not set |
| 641 | # CONFIG_BNX2 is not set | 655 | # CONFIG_BNX2 is not set |
| 642 | CONFIG_GIANFAR=y | 656 | CONFIG_GIANFAR=y |
| 643 | CONFIG_GFAR_NAPI=y | ||
| 644 | # CONFIG_QLA3XXX is not set | 657 | # CONFIG_QLA3XXX is not set |
| 645 | # CONFIG_ATL1 is not set | 658 | # CONFIG_ATL1 is not set |
| 659 | # CONFIG_ATL1E is not set | ||
| 646 | CONFIG_NETDEV_10000=y | 660 | CONFIG_NETDEV_10000=y |
| 647 | # CONFIG_CHELSIO_T1 is not set | 661 | # CONFIG_CHELSIO_T1 is not set |
| 648 | # CONFIG_CHELSIO_T3 is not set | 662 | # CONFIG_CHELSIO_T3 is not set |
| @@ -719,12 +733,14 @@ CONFIG_SERIO_SERPORT=y | |||
| 719 | # CONFIG_SERIO_PCIPS2 is not set | 733 | # CONFIG_SERIO_PCIPS2 is not set |
| 720 | CONFIG_SERIO_LIBPS2=y | 734 | CONFIG_SERIO_LIBPS2=y |
| 721 | # CONFIG_SERIO_RAW is not set | 735 | # CONFIG_SERIO_RAW is not set |
| 736 | # CONFIG_SERIO_XILINX_XPS_PS2 is not set | ||
| 722 | # CONFIG_GAMEPORT is not set | 737 | # CONFIG_GAMEPORT is not set |
| 723 | 738 | ||
| 724 | # | 739 | # |
| 725 | # Character devices | 740 | # Character devices |
| 726 | # | 741 | # |
| 727 | CONFIG_VT=y | 742 | CONFIG_VT=y |
| 743 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 728 | CONFIG_VT_CONSOLE=y | 744 | CONFIG_VT_CONSOLE=y |
| 729 | CONFIG_HW_CONSOLE=y | 745 | CONFIG_HW_CONSOLE=y |
| 730 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 746 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| @@ -758,7 +774,7 @@ CONFIG_UNIX98_PTYS=y | |||
| 758 | CONFIG_LEGACY_PTYS=y | 774 | CONFIG_LEGACY_PTYS=y |
| 759 | CONFIG_LEGACY_PTY_COUNT=256 | 775 | CONFIG_LEGACY_PTY_COUNT=256 |
| 760 | # CONFIG_IPMI_HANDLER is not set | 776 | # CONFIG_IPMI_HANDLER is not set |
| 761 | # CONFIG_HW_RANDOM is not set | 777 | CONFIG_HW_RANDOM=y |
| 762 | CONFIG_NVRAM=y | 778 | CONFIG_NVRAM=y |
| 763 | # CONFIG_R3964 is not set | 779 | # CONFIG_R3964 is not set |
| 764 | # CONFIG_APPLICOM is not set | 780 | # CONFIG_APPLICOM is not set |
| @@ -768,43 +784,64 @@ CONFIG_DEVPORT=y | |||
| 768 | CONFIG_I2C=y | 784 | CONFIG_I2C=y |
| 769 | CONFIG_I2C_BOARDINFO=y | 785 | CONFIG_I2C_BOARDINFO=y |
| 770 | # CONFIG_I2C_CHARDEV is not set | 786 | # CONFIG_I2C_CHARDEV is not set |
| 787 | CONFIG_I2C_HELPER_AUTO=y | ||
| 771 | 788 | ||
| 772 | # | 789 | # |
| 773 | # I2C Hardware Bus support | 790 | # I2C Hardware Bus support |
| 774 | # | 791 | # |
| 792 | |||
| 793 | # | ||
| 794 | # PC SMBus host controller drivers | ||
| 795 | # | ||
| 775 | # CONFIG_I2C_ALI1535 is not set | 796 | # CONFIG_I2C_ALI1535 is not set |
| 776 | # CONFIG_I2C_ALI1563 is not set | 797 | # CONFIG_I2C_ALI1563 is not set |
| 777 | # CONFIG_I2C_ALI15X3 is not set | 798 | # CONFIG_I2C_ALI15X3 is not set |
| 778 | # CONFIG_I2C_AMD756 is not set | 799 | # CONFIG_I2C_AMD756 is not set |
| 779 | # CONFIG_I2C_AMD8111 is not set | 800 | # CONFIG_I2C_AMD8111 is not set |
| 780 | # CONFIG_I2C_I801 is not set | 801 | # CONFIG_I2C_I801 is not set |
| 781 | # CONFIG_I2C_I810 is not set | 802 | # CONFIG_I2C_ISCH is not set |
| 782 | # CONFIG_I2C_PIIX4 is not set | 803 | # CONFIG_I2C_PIIX4 is not set |
| 783 | CONFIG_I2C_MPC=y | ||
| 784 | # CONFIG_I2C_NFORCE2 is not set | 804 | # CONFIG_I2C_NFORCE2 is not set |
| 785 | # CONFIG_I2C_OCORES is not set | ||
| 786 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 787 | # CONFIG_I2C_PROSAVAGE is not set | ||
| 788 | # CONFIG_I2C_SAVAGE4 is not set | ||
| 789 | # CONFIG_I2C_SIMTEC is not set | ||
| 790 | # CONFIG_I2C_SIS5595 is not set | 805 | # CONFIG_I2C_SIS5595 is not set |
| 791 | # CONFIG_I2C_SIS630 is not set | 806 | # CONFIG_I2C_SIS630 is not set |
| 792 | # CONFIG_I2C_SIS96X is not set | 807 | # CONFIG_I2C_SIS96X is not set |
| 793 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 794 | # CONFIG_I2C_STUB is not set | ||
| 795 | # CONFIG_I2C_TINY_USB is not set | ||
| 796 | # CONFIG_I2C_VIA is not set | 808 | # CONFIG_I2C_VIA is not set |
| 797 | # CONFIG_I2C_VIAPRO is not set | 809 | # CONFIG_I2C_VIAPRO is not set |
| 810 | |||
| 811 | # | ||
| 812 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 813 | # | ||
| 814 | CONFIG_I2C_MPC=y | ||
| 815 | # CONFIG_I2C_OCORES is not set | ||
| 816 | # CONFIG_I2C_SIMTEC is not set | ||
| 817 | |||
| 818 | # | ||
| 819 | # External I2C/SMBus adapter drivers | ||
| 820 | # | ||
| 821 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 822 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 823 | # CONFIG_I2C_TINY_USB is not set | ||
| 824 | |||
| 825 | # | ||
| 826 | # Graphics adapter I2C/DDC channel drivers | ||
| 827 | # | ||
| 798 | # CONFIG_I2C_VOODOO3 is not set | 828 | # CONFIG_I2C_VOODOO3 is not set |
| 829 | |||
| 830 | # | ||
| 831 | # Other I2C/SMBus bus drivers | ||
| 832 | # | ||
| 799 | # CONFIG_I2C_PCA_PLATFORM is not set | 833 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 834 | # CONFIG_I2C_STUB is not set | ||
| 800 | 835 | ||
| 801 | # | 836 | # |
| 802 | # Miscellaneous I2C Chip support | 837 | # Miscellaneous I2C Chip support |
| 803 | # | 838 | # |
| 804 | # CONFIG_DS1682 is not set | 839 | # CONFIG_DS1682 is not set |
| 840 | # CONFIG_AT24 is not set | ||
| 805 | CONFIG_SENSORS_EEPROM=y | 841 | CONFIG_SENSORS_EEPROM=y |
| 806 | # CONFIG_SENSORS_PCF8574 is not set | 842 | # CONFIG_SENSORS_PCF8574 is not set |
| 807 | # CONFIG_PCF8575 is not set | 843 | # CONFIG_PCF8575 is not set |
| 844 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 808 | # CONFIG_SENSORS_PCF8591 is not set | 845 | # CONFIG_SENSORS_PCF8591 is not set |
| 809 | # CONFIG_SENSORS_MAX6875 is not set | 846 | # CONFIG_SENSORS_MAX6875 is not set |
| 810 | # CONFIG_SENSORS_TSL2550 is not set | 847 | # CONFIG_SENSORS_TSL2550 is not set |
| @@ -813,10 +850,13 @@ CONFIG_SENSORS_EEPROM=y | |||
| 813 | # CONFIG_I2C_DEBUG_BUS is not set | 850 | # CONFIG_I2C_DEBUG_BUS is not set |
| 814 | # CONFIG_I2C_DEBUG_CHIP is not set | 851 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 815 | # CONFIG_SPI is not set | 852 | # CONFIG_SPI is not set |
| 853 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 854 | # CONFIG_GPIOLIB is not set | ||
| 816 | # CONFIG_W1 is not set | 855 | # CONFIG_W1 is not set |
| 817 | # CONFIG_POWER_SUPPLY is not set | 856 | # CONFIG_POWER_SUPPLY is not set |
| 818 | # CONFIG_HWMON is not set | 857 | # CONFIG_HWMON is not set |
| 819 | # CONFIG_THERMAL is not set | 858 | # CONFIG_THERMAL is not set |
| 859 | # CONFIG_THERMAL_HWMON is not set | ||
| 820 | # CONFIG_WATCHDOG is not set | 860 | # CONFIG_WATCHDOG is not set |
| 821 | 861 | ||
| 822 | # | 862 | # |
| @@ -828,8 +868,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 828 | # | 868 | # |
| 829 | # Multifunction device drivers | 869 | # Multifunction device drivers |
| 830 | # | 870 | # |
| 871 | # CONFIG_MFD_CORE is not set | ||
| 831 | # CONFIG_MFD_SM501 is not set | 872 | # CONFIG_MFD_SM501 is not set |
| 832 | # CONFIG_HTC_PASIC3 is not set | 873 | # CONFIG_HTC_PASIC3 is not set |
| 874 | # CONFIG_MFD_TMIO is not set | ||
| 833 | 875 | ||
| 834 | # | 876 | # |
| 835 | # Multimedia devices | 877 | # Multimedia devices |
| @@ -871,6 +913,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
| 871 | # CONFIG_DVB_TTUSB_BUDGET is not set | 913 | # CONFIG_DVB_TTUSB_BUDGET is not set |
| 872 | # CONFIG_DVB_TTUSB_DEC is not set | 914 | # CONFIG_DVB_TTUSB_DEC is not set |
| 873 | # CONFIG_DVB_CINERGYT2 is not set | 915 | # CONFIG_DVB_CINERGYT2 is not set |
| 916 | # CONFIG_DVB_SIANO_SMS1XXX is not set | ||
| 874 | 917 | ||
| 875 | # | 918 | # |
| 876 | # Supported FlexCopII (B2C2) Adapters | 919 | # Supported FlexCopII (B2C2) Adapters |
| @@ -917,6 +960,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
| 917 | # CONFIG_DVB_SP887X is not set | 960 | # CONFIG_DVB_SP887X is not set |
| 918 | # CONFIG_DVB_CX22700 is not set | 961 | # CONFIG_DVB_CX22700 is not set |
| 919 | # CONFIG_DVB_CX22702 is not set | 962 | # CONFIG_DVB_CX22702 is not set |
| 963 | # CONFIG_DVB_DRX397XD is not set | ||
| 920 | # CONFIG_DVB_L64781 is not set | 964 | # CONFIG_DVB_L64781 is not set |
| 921 | # CONFIG_DVB_TDA1004X is not set | 965 | # CONFIG_DVB_TDA1004X is not set |
| 922 | # CONFIG_DVB_NXT6000 is not set | 966 | # CONFIG_DVB_NXT6000 is not set |
| @@ -984,15 +1028,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
| 984 | CONFIG_VGA_CONSOLE=y | 1028 | CONFIG_VGA_CONSOLE=y |
| 985 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set | 1029 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set |
| 986 | CONFIG_DUMMY_CONSOLE=y | 1030 | CONFIG_DUMMY_CONSOLE=y |
| 987 | |||
| 988 | # | ||
| 989 | # Sound | ||
| 990 | # | ||
| 991 | CONFIG_SOUND=y | 1031 | CONFIG_SOUND=y |
| 992 | |||
| 993 | # | ||
| 994 | # Advanced Linux Sound Architecture | ||
| 995 | # | ||
| 996 | CONFIG_SND=y | 1032 | CONFIG_SND=y |
| 997 | CONFIG_SND_TIMER=y | 1033 | CONFIG_SND_TIMER=y |
| 998 | CONFIG_SND_PCM=y | 1034 | CONFIG_SND_PCM=y |
| @@ -1006,19 +1042,15 @@ CONFIG_SND_PCM_OSS_PLUGINS=y | |||
| 1006 | CONFIG_SND_VERBOSE_PROCFS=y | 1042 | CONFIG_SND_VERBOSE_PROCFS=y |
| 1007 | # CONFIG_SND_VERBOSE_PRINTK is not set | 1043 | # CONFIG_SND_VERBOSE_PRINTK is not set |
| 1008 | # CONFIG_SND_DEBUG is not set | 1044 | # CONFIG_SND_DEBUG is not set |
| 1009 | 1045 | CONFIG_SND_VMASTER=y | |
| 1010 | # | ||
| 1011 | # Generic devices | ||
| 1012 | # | ||
| 1013 | CONFIG_SND_AC97_CODEC=y | 1046 | CONFIG_SND_AC97_CODEC=y |
| 1047 | CONFIG_SND_DRIVERS=y | ||
| 1014 | # CONFIG_SND_DUMMY is not set | 1048 | # CONFIG_SND_DUMMY is not set |
| 1015 | # CONFIG_SND_MTPAV is not set | 1049 | # CONFIG_SND_MTPAV is not set |
| 1016 | # CONFIG_SND_SERIAL_U16550 is not set | 1050 | # CONFIG_SND_SERIAL_U16550 is not set |
| 1017 | # CONFIG_SND_MPU401 is not set | 1051 | # CONFIG_SND_MPU401 is not set |
| 1018 | 1052 | # CONFIG_SND_AC97_POWER_SAVE is not set | |
| 1019 | # | 1053 | CONFIG_SND_PCI=y |
| 1020 | # PCI devices | ||
| 1021 | # | ||
| 1022 | # CONFIG_SND_AD1889 is not set | 1054 | # CONFIG_SND_AD1889 is not set |
| 1023 | # CONFIG_SND_ALS300 is not set | 1055 | # CONFIG_SND_ALS300 is not set |
| 1024 | # CONFIG_SND_ALS4000 is not set | 1056 | # CONFIG_SND_ALS4000 is not set |
| @@ -1080,39 +1112,12 @@ CONFIG_SND_INTEL8X0=y | |||
| 1080 | # CONFIG_SND_VIRTUOSO is not set | 1112 | # CONFIG_SND_VIRTUOSO is not set |
| 1081 | # CONFIG_SND_VX222 is not set | 1113 | # CONFIG_SND_VX222 is not set |
| 1082 | # CONFIG_SND_YMFPCI is not set | 1114 | # CONFIG_SND_YMFPCI is not set |
| 1083 | # CONFIG_SND_AC97_POWER_SAVE is not set | 1115 | CONFIG_SND_PPC=y |
| 1084 | 1116 | CONFIG_SND_USB=y | |
| 1085 | # | ||
| 1086 | # ALSA PowerMac devices | ||
| 1087 | # | ||
| 1088 | |||
| 1089 | # | ||
| 1090 | # ALSA PowerPC devices | ||
| 1091 | # | ||
| 1092 | |||
| 1093 | # | ||
| 1094 | # USB devices | ||
| 1095 | # | ||
| 1096 | # CONFIG_SND_USB_AUDIO is not set | 1117 | # CONFIG_SND_USB_AUDIO is not set |
| 1097 | # CONFIG_SND_USB_USX2Y is not set | 1118 | # CONFIG_SND_USB_USX2Y is not set |
| 1098 | # CONFIG_SND_USB_CAIAQ is not set | 1119 | # CONFIG_SND_USB_CAIAQ is not set |
| 1099 | |||
| 1100 | # | ||
| 1101 | # System on Chip audio support | ||
| 1102 | # | ||
| 1103 | # CONFIG_SND_SOC is not set | 1120 | # CONFIG_SND_SOC is not set |
| 1104 | |||
| 1105 | # | ||
| 1106 | # ALSA SoC audio for Freescale SOCs | ||
| 1107 | # | ||
| 1108 | |||
| 1109 | # | ||
| 1110 | # SoC Audio for the Texas Instruments OMAP | ||
| 1111 | # | ||
| 1112 | |||
| 1113 | # | ||
| 1114 | # Open Sound System | ||
| 1115 | # | ||
| 1116 | # CONFIG_SOUND_PRIME is not set | 1121 | # CONFIG_SOUND_PRIME is not set |
| 1117 | CONFIG_AC97_BUS=y | 1122 | CONFIG_AC97_BUS=y |
| 1118 | CONFIG_HID_SUPPORT=y | 1123 | CONFIG_HID_SUPPORT=y |
| @@ -1144,6 +1149,7 @@ CONFIG_USB_DEVICE_CLASS=y | |||
| 1144 | # CONFIG_USB_OTG is not set | 1149 | # CONFIG_USB_OTG is not set |
| 1145 | # CONFIG_USB_OTG_WHITELIST is not set | 1150 | # CONFIG_USB_OTG_WHITELIST is not set |
| 1146 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 1151 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
| 1152 | CONFIG_USB_MON=y | ||
| 1147 | 1153 | ||
| 1148 | # | 1154 | # |
| 1149 | # USB Host Controller Drivers | 1155 | # USB Host Controller Drivers |
| @@ -1195,6 +1201,7 @@ CONFIG_USB_STORAGE=y | |||
| 1195 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1201 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1196 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1202 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
| 1197 | # CONFIG_USB_STORAGE_KARMA is not set | 1203 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1204 | # CONFIG_USB_STORAGE_SIERRA is not set | ||
| 1198 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | 1205 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
| 1199 | # CONFIG_USB_LIBUSUAL is not set | 1206 | # CONFIG_USB_LIBUSUAL is not set |
| 1200 | 1207 | ||
| @@ -1203,7 +1210,6 @@ CONFIG_USB_STORAGE=y | |||
| 1203 | # | 1210 | # |
| 1204 | # CONFIG_USB_MDC800 is not set | 1211 | # CONFIG_USB_MDC800 is not set |
| 1205 | # CONFIG_USB_MICROTEK is not set | 1212 | # CONFIG_USB_MICROTEK is not set |
| 1206 | CONFIG_USB_MON=y | ||
| 1207 | 1213 | ||
| 1208 | # | 1214 | # |
| 1209 | # USB port drivers | 1215 | # USB port drivers |
| @@ -1216,7 +1222,6 @@ CONFIG_USB_MON=y | |||
| 1216 | # CONFIG_USB_EMI62 is not set | 1222 | # CONFIG_USB_EMI62 is not set |
| 1217 | # CONFIG_USB_EMI26 is not set | 1223 | # CONFIG_USB_EMI26 is not set |
| 1218 | # CONFIG_USB_ADUTUX is not set | 1224 | # CONFIG_USB_ADUTUX is not set |
| 1219 | # CONFIG_USB_AUERSWALD is not set | ||
| 1220 | # CONFIG_USB_RIO500 is not set | 1225 | # CONFIG_USB_RIO500 is not set |
| 1221 | # CONFIG_USB_LEGOTOWER is not set | 1226 | # CONFIG_USB_LEGOTOWER is not set |
| 1222 | # CONFIG_USB_LCD is not set | 1227 | # CONFIG_USB_LCD is not set |
| @@ -1270,6 +1275,7 @@ CONFIG_RTC_INTF_DEV=y | |||
| 1270 | # CONFIG_RTC_DRV_PCF8583 is not set | 1275 | # CONFIG_RTC_DRV_PCF8583 is not set |
| 1271 | # CONFIG_RTC_DRV_M41T80 is not set | 1276 | # CONFIG_RTC_DRV_M41T80 is not set |
| 1272 | # CONFIG_RTC_DRV_S35390A is not set | 1277 | # CONFIG_RTC_DRV_S35390A is not set |
| 1278 | # CONFIG_RTC_DRV_FM3130 is not set | ||
| 1273 | 1279 | ||
| 1274 | # | 1280 | # |
| 1275 | # SPI RTC drivers | 1281 | # SPI RTC drivers |
| @@ -1303,6 +1309,7 @@ CONFIG_DMA_ENGINE=y | |||
| 1303 | # DMA Clients | 1309 | # DMA Clients |
| 1304 | # | 1310 | # |
| 1305 | # CONFIG_NET_DMA is not set | 1311 | # CONFIG_NET_DMA is not set |
| 1312 | # CONFIG_DMATEST is not set | ||
| 1306 | # CONFIG_UIO is not set | 1313 | # CONFIG_UIO is not set |
| 1307 | 1314 | ||
| 1308 | # | 1315 | # |
| @@ -1379,6 +1386,7 @@ CONFIG_EFS_FS=m | |||
| 1379 | CONFIG_CRAMFS=y | 1386 | CONFIG_CRAMFS=y |
| 1380 | CONFIG_VXFS_FS=m | 1387 | CONFIG_VXFS_FS=m |
| 1381 | # CONFIG_MINIX_FS is not set | 1388 | # CONFIG_MINIX_FS is not set |
| 1389 | # CONFIG_OMFS_FS is not set | ||
| 1382 | CONFIG_HPFS_FS=m | 1390 | CONFIG_HPFS_FS=m |
| 1383 | CONFIG_QNX4FS_FS=m | 1391 | CONFIG_QNX4FS_FS=m |
| 1384 | # CONFIG_ROMFS_FS is not set | 1392 | # CONFIG_ROMFS_FS is not set |
| @@ -1391,17 +1399,16 @@ CONFIG_NFS_FS=y | |||
| 1391 | CONFIG_NFS_V3=y | 1399 | CONFIG_NFS_V3=y |
| 1392 | # CONFIG_NFS_V3_ACL is not set | 1400 | # CONFIG_NFS_V3_ACL is not set |
| 1393 | CONFIG_NFS_V4=y | 1401 | CONFIG_NFS_V4=y |
| 1402 | CONFIG_ROOT_NFS=y | ||
| 1394 | CONFIG_NFSD=y | 1403 | CONFIG_NFSD=y |
| 1395 | # CONFIG_NFSD_V3 is not set | 1404 | # CONFIG_NFSD_V3 is not set |
| 1396 | # CONFIG_NFSD_V4 is not set | 1405 | # CONFIG_NFSD_V4 is not set |
| 1397 | CONFIG_ROOT_NFS=y | ||
| 1398 | CONFIG_LOCKD=y | 1406 | CONFIG_LOCKD=y |
| 1399 | CONFIG_LOCKD_V4=y | 1407 | CONFIG_LOCKD_V4=y |
| 1400 | CONFIG_EXPORTFS=y | 1408 | CONFIG_EXPORTFS=y |
| 1401 | CONFIG_NFS_COMMON=y | 1409 | CONFIG_NFS_COMMON=y |
| 1402 | CONFIG_SUNRPC=y | 1410 | CONFIG_SUNRPC=y |
| 1403 | CONFIG_SUNRPC_GSS=y | 1411 | CONFIG_SUNRPC_GSS=y |
| 1404 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 1405 | CONFIG_RPCSEC_GSS_KRB5=y | 1412 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1406 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1413 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1407 | # CONFIG_SMB_FS is not set | 1414 | # CONFIG_SMB_FS is not set |
| @@ -1480,6 +1487,7 @@ CONFIG_BITREVERSE=y | |||
| 1480 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1487 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 1481 | # CONFIG_CRC_CCITT is not set | 1488 | # CONFIG_CRC_CCITT is not set |
| 1482 | # CONFIG_CRC16 is not set | 1489 | # CONFIG_CRC16 is not set |
| 1490 | CONFIG_CRC_T10DIF=y | ||
| 1483 | CONFIG_CRC_ITU_T=m | 1491 | CONFIG_CRC_ITU_T=m |
| 1484 | CONFIG_CRC32=y | 1492 | CONFIG_CRC32=y |
| 1485 | # CONFIG_CRC7 is not set | 1493 | # CONFIG_CRC7 is not set |
| @@ -1505,6 +1513,8 @@ CONFIG_FRAME_WARN=1024 | |||
| 1505 | CONFIG_DEBUG_KERNEL=y | 1513 | CONFIG_DEBUG_KERNEL=y |
| 1506 | # CONFIG_DEBUG_SHIRQ is not set | 1514 | # CONFIG_DEBUG_SHIRQ is not set |
| 1507 | CONFIG_DETECT_SOFTLOCKUP=y | 1515 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1516 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 1517 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 1508 | CONFIG_SCHED_DEBUG=y | 1518 | CONFIG_SCHED_DEBUG=y |
| 1509 | # CONFIG_SCHEDSTATS is not set | 1519 | # CONFIG_SCHEDSTATS is not set |
| 1510 | # CONFIG_TIMER_STATS is not set | 1520 | # CONFIG_TIMER_STATS is not set |
| @@ -1523,17 +1533,29 @@ CONFIG_SCHED_DEBUG=y | |||
| 1523 | CONFIG_DEBUG_INFO=y | 1533 | CONFIG_DEBUG_INFO=y |
| 1524 | # CONFIG_DEBUG_VM is not set | 1534 | # CONFIG_DEBUG_VM is not set |
| 1525 | # CONFIG_DEBUG_WRITECOUNT is not set | 1535 | # CONFIG_DEBUG_WRITECOUNT is not set |
| 1536 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 1526 | # CONFIG_DEBUG_LIST is not set | 1537 | # CONFIG_DEBUG_LIST is not set |
| 1527 | # CONFIG_DEBUG_SG is not set | 1538 | # CONFIG_DEBUG_SG is not set |
| 1528 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1539 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 1529 | # CONFIG_RCU_TORTURE_TEST is not set | 1540 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1530 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1541 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 1531 | # CONFIG_FAULT_INJECTION is not set | 1542 | # CONFIG_FAULT_INJECTION is not set |
| 1543 | # CONFIG_LATENCYTOP is not set | ||
| 1544 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1545 | CONFIG_HAVE_FTRACE=y | ||
| 1546 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1547 | # CONFIG_FTRACE is not set | ||
| 1548 | # CONFIG_SCHED_TRACER is not set | ||
| 1549 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1532 | # CONFIG_SAMPLES is not set | 1550 | # CONFIG_SAMPLES is not set |
| 1551 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1552 | # CONFIG_KGDB is not set | ||
| 1533 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1553 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
| 1534 | # CONFIG_DEBUG_STACK_USAGE is not set | 1554 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1535 | # CONFIG_DEBUG_PAGEALLOC is not set | 1555 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1536 | # CONFIG_DEBUGGER is not set | 1556 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
| 1557 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
| 1558 | # CONFIG_XMON is not set | ||
| 1537 | # CONFIG_IRQSTACKS is not set | 1559 | # CONFIG_IRQSTACKS is not set |
| 1538 | # CONFIG_BDI_SWITCH is not set | 1560 | # CONFIG_BDI_SWITCH is not set |
| 1539 | # CONFIG_PPC_EARLY_DEBUG is not set | 1561 | # CONFIG_PPC_EARLY_DEBUG is not set |
| @@ -1550,13 +1572,14 @@ CONFIG_CRYPTO=y | |||
| 1550 | # Crypto core or helper | 1572 | # Crypto core or helper |
| 1551 | # | 1573 | # |
| 1552 | CONFIG_CRYPTO_ALGAPI=y | 1574 | CONFIG_CRYPTO_ALGAPI=y |
| 1575 | CONFIG_CRYPTO_AEAD=y | ||
| 1553 | CONFIG_CRYPTO_BLKCIPHER=y | 1576 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1554 | CONFIG_CRYPTO_HASH=y | 1577 | CONFIG_CRYPTO_HASH=y |
| 1555 | CONFIG_CRYPTO_MANAGER=y | 1578 | CONFIG_CRYPTO_MANAGER=y |
| 1556 | # CONFIG_CRYPTO_GF128MUL is not set | 1579 | # CONFIG_CRYPTO_GF128MUL is not set |
| 1557 | # CONFIG_CRYPTO_NULL is not set | 1580 | # CONFIG_CRYPTO_NULL is not set |
| 1558 | # CONFIG_CRYPTO_CRYPTD is not set | 1581 | # CONFIG_CRYPTO_CRYPTD is not set |
| 1559 | # CONFIG_CRYPTO_AUTHENC is not set | 1582 | CONFIG_CRYPTO_AUTHENC=y |
| 1560 | # CONFIG_CRYPTO_TEST is not set | 1583 | # CONFIG_CRYPTO_TEST is not set |
| 1561 | 1584 | ||
| 1562 | # | 1585 | # |
| @@ -1590,6 +1613,10 @@ CONFIG_CRYPTO_HMAC=y | |||
| 1590 | # CONFIG_CRYPTO_MD4 is not set | 1613 | # CONFIG_CRYPTO_MD4 is not set |
| 1591 | CONFIG_CRYPTO_MD5=y | 1614 | CONFIG_CRYPTO_MD5=y |
| 1592 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1615 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 1616 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1617 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1618 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1619 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1593 | CONFIG_CRYPTO_SHA1=m | 1620 | CONFIG_CRYPTO_SHA1=m |
| 1594 | # CONFIG_CRYPTO_SHA256 is not set | 1621 | # CONFIG_CRYPTO_SHA256 is not set |
| 1595 | # CONFIG_CRYPTO_SHA512 is not set | 1622 | # CONFIG_CRYPTO_SHA512 is not set |
| @@ -1622,5 +1649,6 @@ CONFIG_CRYPTO_DES=y | |||
| 1622 | # CONFIG_CRYPTO_LZO is not set | 1649 | # CONFIG_CRYPTO_LZO is not set |
| 1623 | CONFIG_CRYPTO_HW=y | 1650 | CONFIG_CRYPTO_HW=y |
| 1624 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1651 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1652 | CONFIG_CRYPTO_DEV_TALITOS=y | ||
| 1625 | # CONFIG_PPC_CLOCK is not set | 1653 | # CONFIG_PPC_CLOCK is not set |
| 1626 | # CONFIG_VIRTUALIZATION is not set | 1654 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/85xx/mpc8560_ads_defconfig b/arch/powerpc/configs/85xx/mpc8560_ads_defconfig index e19592b42043..06e26d906f65 100644 --- a/arch/powerpc/configs/85xx/mpc8560_ads_defconfig +++ b/arch/powerpc/configs/85xx/mpc8560_ads_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.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Mon Jun 9 08:52:33 2008 | 4 | # Thu Aug 21 00:52:32 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -15,6 +15,7 @@ CONFIG_PPC_85xx=y | |||
| 15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
| 16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
| 17 | CONFIG_E500=y | 17 | CONFIG_E500=y |
| 18 | # CONFIG_PPC_E500MC is not set | ||
| 18 | CONFIG_BOOKE=y | 19 | CONFIG_BOOKE=y |
| 19 | CONFIG_FSL_BOOKE=y | 20 | CONFIG_FSL_BOOKE=y |
| 20 | CONFIG_FSL_EMB_PERFMON=y | 21 | CONFIG_FSL_EMB_PERFMON=y |
| @@ -33,12 +34,14 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 35 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | 36 | CONFIG_STACKTRACE_SUPPORT=y |
| 37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | 38 | CONFIG_LOCKDEP_SUPPORT=y |
| 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 38 | CONFIG_ARCH_HAS_ILOG2_U32=y | 40 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 39 | CONFIG_GENERIC_HWEIGHT=y | 41 | CONFIG_GENERIC_HWEIGHT=y |
| 40 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 42 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 41 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 43 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 44 | CONFIG_GENERIC_GPIO=y | ||
| 42 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 45 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
| 43 | CONFIG_PPC=y | 46 | CONFIG_PPC=y |
| 44 | CONFIG_EARLY_PRINTK=y | 47 | CONFIG_EARLY_PRINTK=y |
| @@ -89,7 +92,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 89 | CONFIG_SYSCTL=y | 92 | CONFIG_SYSCTL=y |
| 90 | CONFIG_EMBEDDED=y | 93 | CONFIG_EMBEDDED=y |
| 91 | CONFIG_SYSCTL_SYSCALL=y | 94 | CONFIG_SYSCTL_SYSCALL=y |
| 92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 93 | CONFIG_KALLSYMS=y | 95 | CONFIG_KALLSYMS=y |
| 94 | # CONFIG_KALLSYMS_ALL is not set | 96 | # CONFIG_KALLSYMS_ALL is not set |
| 95 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 97 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -114,10 +116,16 @@ CONFIG_SLUB=y | |||
| 114 | # CONFIG_PROFILING is not set | 116 | # CONFIG_PROFILING is not set |
| 115 | # CONFIG_MARKERS is not set | 117 | # CONFIG_MARKERS is not set |
| 116 | CONFIG_HAVE_OPROFILE=y | 118 | CONFIG_HAVE_OPROFILE=y |
| 119 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 120 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 117 | CONFIG_HAVE_KPROBES=y | 121 | CONFIG_HAVE_KPROBES=y |
| 118 | CONFIG_HAVE_KRETPROBES=y | 122 | CONFIG_HAVE_KRETPROBES=y |
| 123 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 119 | # CONFIG_HAVE_DMA_ATTRS is not set | 124 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 125 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 126 | CONFIG_HAVE_CLK=y | ||
| 120 | CONFIG_PROC_PAGE_MONITOR=y | 127 | CONFIG_PROC_PAGE_MONITOR=y |
| 128 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 121 | CONFIG_SLABINFO=y | 129 | CONFIG_SLABINFO=y |
| 122 | CONFIG_RT_MUTEXES=y | 130 | CONFIG_RT_MUTEXES=y |
| 123 | # CONFIG_TINY_SHMEM is not set | 131 | # CONFIG_TINY_SHMEM is not set |
| @@ -128,6 +136,7 @@ CONFIG_BLOCK=y | |||
| 128 | # CONFIG_BLK_DEV_IO_TRACE is not set | 136 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 129 | # CONFIG_LSF is not set | 137 | # CONFIG_LSF is not set |
| 130 | # CONFIG_BLK_DEV_BSG is not set | 138 | # CONFIG_BLK_DEV_BSG is not set |
| 139 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 131 | 140 | ||
| 132 | # | 141 | # |
| 133 | # IO Schedulers | 142 | # IO Schedulers |
| @@ -146,8 +155,6 @@ CONFIG_CLASSIC_RCU=y | |||
| 146 | # | 155 | # |
| 147 | # Platform support | 156 | # Platform support |
| 148 | # | 157 | # |
| 149 | # CONFIG_PPC_MPC512x is not set | ||
| 150 | # CONFIG_PPC_MPC5121 is not set | ||
| 151 | # CONFIG_PPC_CELL is not set | 158 | # CONFIG_PPC_CELL is not set |
| 152 | # CONFIG_PPC_CELL_NATIVE is not set | 159 | # CONFIG_PPC_CELL_NATIVE is not set |
| 153 | # CONFIG_PQ2ADS is not set | 160 | # CONFIG_PQ2ADS is not set |
| @@ -156,11 +163,13 @@ CONFIG_MPC85xx=y | |||
| 156 | CONFIG_MPC8560_ADS=y | 163 | CONFIG_MPC8560_ADS=y |
| 157 | # CONFIG_MPC85xx_CDS is not set | 164 | # CONFIG_MPC85xx_CDS is not set |
| 158 | # CONFIG_MPC85xx_MDS is not set | 165 | # CONFIG_MPC85xx_MDS is not set |
| 166 | # CONFIG_MPC8536_DS is not set | ||
| 159 | # CONFIG_MPC85xx_DS is not set | 167 | # CONFIG_MPC85xx_DS is not set |
| 160 | # CONFIG_KSI8560 is not set | 168 | # CONFIG_KSI8560 is not set |
| 161 | # CONFIG_STX_GP3 is not set | 169 | # CONFIG_STX_GP3 is not set |
| 162 | # CONFIG_TQM8540 is not set | 170 | # CONFIG_TQM8540 is not set |
| 163 | # CONFIG_TQM8541 is not set | 171 | # CONFIG_TQM8541 is not set |
| 172 | # CONFIG_TQM8548 is not set | ||
| 164 | # CONFIG_TQM8555 is not set | 173 | # CONFIG_TQM8555 is not set |
| 165 | # CONFIG_TQM8560 is not set | 174 | # CONFIG_TQM8560 is not set |
| 166 | # CONFIG_SBC8548 is not set | 175 | # CONFIG_SBC8548 is not set |
| @@ -177,7 +186,6 @@ CONFIG_MPIC=y | |||
| 177 | # CONFIG_GENERIC_IOMAP is not set | 186 | # CONFIG_GENERIC_IOMAP is not set |
| 178 | # CONFIG_CPU_FREQ is not set | 187 | # CONFIG_CPU_FREQ is not set |
| 179 | CONFIG_CPM2=y | 188 | CONFIG_CPM2=y |
| 180 | CONFIG_PPC_CPM_NEW_BINDING=y | ||
| 181 | # CONFIG_FSL_ULI1575 is not set | 189 | # CONFIG_FSL_ULI1575 is not set |
| 182 | CONFIG_CPM=y | 190 | CONFIG_CPM=y |
| 183 | 191 | ||
| @@ -217,6 +225,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 225 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 218 | CONFIG_PAGEFLAGS_EXTENDED=y | 226 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 219 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 227 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 228 | CONFIG_MIGRATION=y | ||
| 220 | # CONFIG_RESOURCES_64BIT is not set | 229 | # CONFIG_RESOURCES_64BIT is not set |
| 221 | CONFIG_ZONE_DMA_FLAG=1 | 230 | CONFIG_ZONE_DMA_FLAG=1 |
| 222 | CONFIG_BOUNCE=y | 231 | CONFIG_BOUNCE=y |
| @@ -224,6 +233,7 @@ CONFIG_VIRT_TO_BUS=y | |||
| 224 | CONFIG_FORCE_MAX_ZONEORDER=11 | 233 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 225 | # CONFIG_PROC_DEVICETREE is not set | 234 | # CONFIG_PROC_DEVICETREE is not set |
| 226 | # CONFIG_CMDLINE_BOOL is not set | 235 | # CONFIG_CMDLINE_BOOL is not set |
| 236 | CONFIG_EXTRA_TARGETS="" | ||
| 227 | # CONFIG_PM is not set | 237 | # CONFIG_PM is not set |
| 228 | # CONFIG_SECCOMP is not set | 238 | # CONFIG_SECCOMP is not set |
| 229 | CONFIG_ISA_DMA_API=y | 239 | CONFIG_ISA_DMA_API=y |
| @@ -235,6 +245,7 @@ CONFIG_ZONE_DMA=y | |||
| 235 | CONFIG_PPC_INDIRECT_PCI=y | 245 | CONFIG_PPC_INDIRECT_PCI=y |
| 236 | CONFIG_FSL_SOC=y | 246 | CONFIG_FSL_SOC=y |
| 237 | CONFIG_FSL_PCI=y | 247 | CONFIG_FSL_PCI=y |
| 248 | CONFIG_PPC_PCI_CHOICE=y | ||
| 238 | CONFIG_PCI=y | 249 | CONFIG_PCI=y |
| 239 | CONFIG_PCI_DOMAINS=y | 250 | CONFIG_PCI_DOMAINS=y |
| 240 | CONFIG_PCI_SYSCALL=y | 251 | CONFIG_PCI_SYSCALL=y |
| @@ -261,10 +272,6 @@ CONFIG_KERNEL_START=0xc0000000 | |||
| 261 | CONFIG_PHYSICAL_START=0x00000000 | 272 | CONFIG_PHYSICAL_START=0x00000000 |
| 262 | CONFIG_PHYSICAL_ALIGN=0x10000000 | 273 | CONFIG_PHYSICAL_ALIGN=0x10000000 |
| 263 | CONFIG_TASK_SIZE=0xc0000000 | 274 | CONFIG_TASK_SIZE=0xc0000000 |
| 264 | |||
| 265 | # | ||
| 266 | # Networking | ||
| 267 | # | ||
| 268 | CONFIG_NET=y | 275 | CONFIG_NET=y |
| 269 | 276 | ||
| 270 | # | 277 | # |
| @@ -363,6 +370,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 363 | # CONFIG_CONNECTOR is not set | 370 | # CONFIG_CONNECTOR is not set |
| 364 | # CONFIG_MTD is not set | 371 | # CONFIG_MTD is not set |
| 365 | CONFIG_OF_DEVICE=y | 372 | CONFIG_OF_DEVICE=y |
| 373 | CONFIG_OF_GPIO=y | ||
| 366 | # CONFIG_PARPORT is not set | 374 | # CONFIG_PARPORT is not set |
| 367 | CONFIG_BLK_DEV=y | 375 | CONFIG_BLK_DEV=y |
| 368 | # CONFIG_BLK_DEV_FD is not set | 376 | # CONFIG_BLK_DEV_FD is not set |
| @@ -381,12 +389,14 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
| 381 | # CONFIG_BLK_DEV_XIP is not set | 389 | # CONFIG_BLK_DEV_XIP is not set |
| 382 | # CONFIG_CDROM_PKTCDVD is not set | 390 | # CONFIG_CDROM_PKTCDVD is not set |
| 383 | # CONFIG_ATA_OVER_ETH is not set | 391 | # CONFIG_ATA_OVER_ETH is not set |
| 392 | # CONFIG_BLK_DEV_HD is not set | ||
| 384 | CONFIG_MISC_DEVICES=y | 393 | CONFIG_MISC_DEVICES=y |
| 385 | # CONFIG_PHANTOM is not set | 394 | # CONFIG_PHANTOM is not set |
| 386 | # CONFIG_EEPROM_93CX6 is not set | 395 | # CONFIG_EEPROM_93CX6 is not set |
| 387 | # CONFIG_SGI_IOC4 is not set | 396 | # CONFIG_SGI_IOC4 is not set |
| 388 | # CONFIG_TIFM_CORE is not set | 397 | # CONFIG_TIFM_CORE is not set |
| 389 | # CONFIG_ENCLOSURE_SERVICES is not set | 398 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 399 | # CONFIG_HP_ILO is not set | ||
| 390 | CONFIG_HAVE_IDE=y | 400 | CONFIG_HAVE_IDE=y |
| 391 | # CONFIG_IDE is not set | 401 | # CONFIG_IDE is not set |
| 392 | 402 | ||
| @@ -404,12 +414,15 @@ CONFIG_HAVE_IDE=y | |||
| 404 | # | 414 | # |
| 405 | # IEEE 1394 (FireWire) support | 415 | # IEEE 1394 (FireWire) support |
| 406 | # | 416 | # |
| 417 | |||
| 418 | # | ||
| 419 | # Enable only one of the two stacks, unless you know what you are doing | ||
| 420 | # | ||
| 407 | # CONFIG_FIREWIRE is not set | 421 | # CONFIG_FIREWIRE is not set |
| 408 | # CONFIG_IEEE1394 is not set | 422 | # CONFIG_IEEE1394 is not set |
| 409 | # CONFIG_I2O is not set | 423 | # CONFIG_I2O is not set |
| 410 | # CONFIG_MACINTOSH_DRIVERS is not set | 424 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 411 | CONFIG_NETDEVICES=y | 425 | CONFIG_NETDEVICES=y |
| 412 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 413 | # CONFIG_DUMMY is not set | 426 | # CONFIG_DUMMY is not set |
| 414 | # CONFIG_BONDING is not set | 427 | # CONFIG_BONDING is not set |
| 415 | # CONFIG_MACVLAN is not set | 428 | # CONFIG_MACVLAN is not set |
| @@ -456,10 +469,8 @@ CONFIG_NETDEV_1000=y | |||
| 456 | # CONFIG_ACENIC is not set | 469 | # CONFIG_ACENIC is not set |
| 457 | # CONFIG_DL2K is not set | 470 | # CONFIG_DL2K is not set |
| 458 | CONFIG_E1000=y | 471 | CONFIG_E1000=y |
| 459 | CONFIG_E1000_NAPI=y | ||
| 460 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | 472 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set |
| 461 | # CONFIG_E1000E is not set | 473 | # CONFIG_E1000E is not set |
| 462 | # CONFIG_E1000E_ENABLED is not set | ||
| 463 | # CONFIG_IP1000 is not set | 474 | # CONFIG_IP1000 is not set |
| 464 | # CONFIG_IGB is not set | 475 | # CONFIG_IGB is not set |
| 465 | # CONFIG_NS83820 is not set | 476 | # CONFIG_NS83820 is not set |
| @@ -473,9 +484,9 @@ CONFIG_E1000_NAPI=y | |||
| 473 | # CONFIG_TIGON3 is not set | 484 | # CONFIG_TIGON3 is not set |
| 474 | # CONFIG_BNX2 is not set | 485 | # CONFIG_BNX2 is not set |
| 475 | CONFIG_GIANFAR=y | 486 | CONFIG_GIANFAR=y |
| 476 | CONFIG_GFAR_NAPI=y | ||
| 477 | # CONFIG_QLA3XXX is not set | 487 | # CONFIG_QLA3XXX is not set |
| 478 | # CONFIG_ATL1 is not set | 488 | # CONFIG_ATL1 is not set |
| 489 | # CONFIG_ATL1E is not set | ||
| 479 | CONFIG_NETDEV_10000=y | 490 | CONFIG_NETDEV_10000=y |
| 480 | # CONFIG_CHELSIO_T1 is not set | 491 | # CONFIG_CHELSIO_T1 is not set |
| 481 | # CONFIG_CHELSIO_T3 is not set | 492 | # CONFIG_CHELSIO_T3 is not set |
| @@ -582,6 +593,24 @@ CONFIG_GEN_RTC=y | |||
| 582 | CONFIG_DEVPORT=y | 593 | CONFIG_DEVPORT=y |
| 583 | # CONFIG_I2C is not set | 594 | # CONFIG_I2C is not set |
| 584 | # CONFIG_SPI is not set | 595 | # CONFIG_SPI is not set |
| 596 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 597 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | ||
| 598 | CONFIG_GPIOLIB=y | ||
| 599 | # CONFIG_DEBUG_GPIO is not set | ||
| 600 | # CONFIG_GPIO_SYSFS is not set | ||
| 601 | |||
| 602 | # | ||
| 603 | # I2C GPIO expanders: | ||
| 604 | # | ||
| 605 | |||
| 606 | # | ||
| 607 | # PCI GPIO expanders: | ||
| 608 | # | ||
| 609 | # CONFIG_GPIO_BT8XX is not set | ||
| 610 | |||
| 611 | # | ||
| 612 | # SPI GPIO expanders: | ||
| 613 | # | ||
| 585 | # CONFIG_W1 is not set | 614 | # CONFIG_W1 is not set |
| 586 | # CONFIG_POWER_SUPPLY is not set | 615 | # CONFIG_POWER_SUPPLY is not set |
| 587 | CONFIG_HWMON=y | 616 | CONFIG_HWMON=y |
| @@ -602,6 +631,7 @@ CONFIG_HWMON=y | |||
| 602 | # CONFIG_SENSORS_W83627EHF is not set | 631 | # CONFIG_SENSORS_W83627EHF is not set |
| 603 | # CONFIG_HWMON_DEBUG_CHIP is not set | 632 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 604 | # CONFIG_THERMAL is not set | 633 | # CONFIG_THERMAL is not set |
| 634 | # CONFIG_THERMAL_HWMON is not set | ||
| 605 | # CONFIG_WATCHDOG is not set | 635 | # CONFIG_WATCHDOG is not set |
| 606 | 636 | ||
| 607 | # | 637 | # |
| @@ -613,8 +643,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 613 | # | 643 | # |
| 614 | # Multifunction device drivers | 644 | # Multifunction device drivers |
| 615 | # | 645 | # |
| 646 | # CONFIG_MFD_CORE is not set | ||
| 616 | # CONFIG_MFD_SM501 is not set | 647 | # CONFIG_MFD_SM501 is not set |
| 617 | # CONFIG_HTC_PASIC3 is not set | 648 | # CONFIG_HTC_PASIC3 is not set |
| 649 | # CONFIG_MFD_TMIO is not set | ||
| 618 | 650 | ||
| 619 | # | 651 | # |
| 620 | # Multimedia devices | 652 | # Multimedia devices |
| @@ -646,10 +678,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
| 646 | # Display device support | 678 | # Display device support |
| 647 | # | 679 | # |
| 648 | # CONFIG_DISPLAY_SUPPORT is not set | 680 | # CONFIG_DISPLAY_SUPPORT is not set |
| 649 | |||
| 650 | # | ||
| 651 | # Sound | ||
| 652 | # | ||
| 653 | # CONFIG_SOUND is not set | 681 | # CONFIG_SOUND is not set |
| 654 | CONFIG_HID_SUPPORT=y | 682 | CONFIG_HID_SUPPORT=y |
| 655 | CONFIG_HID=y | 683 | CONFIG_HID=y |
| @@ -664,6 +692,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 664 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 692 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
| 665 | 693 | ||
| 666 | # | 694 | # |
| 695 | # Enable Host or Gadget support to see Inventra options | ||
| 696 | # | ||
| 697 | |||
| 698 | # | ||
| 667 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 699 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 668 | # | 700 | # |
| 669 | # CONFIG_USB_GADGET is not set | 701 | # CONFIG_USB_GADGET is not set |
| @@ -741,6 +773,7 @@ CONFIG_TMPFS=y | |||
| 741 | # CONFIG_CRAMFS is not set | 773 | # CONFIG_CRAMFS is not set |
| 742 | # CONFIG_VXFS_FS is not set | 774 | # CONFIG_VXFS_FS is not set |
| 743 | # CONFIG_MINIX_FS is not set | 775 | # CONFIG_MINIX_FS is not set |
| 776 | # CONFIG_OMFS_FS is not set | ||
| 744 | # CONFIG_HPFS_FS is not set | 777 | # CONFIG_HPFS_FS is not set |
| 745 | # CONFIG_QNX4FS_FS is not set | 778 | # CONFIG_QNX4FS_FS is not set |
| 746 | # CONFIG_ROMFS_FS is not set | 779 | # CONFIG_ROMFS_FS is not set |
| @@ -750,12 +783,11 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 750 | CONFIG_NFS_FS=y | 783 | CONFIG_NFS_FS=y |
| 751 | # CONFIG_NFS_V3 is not set | 784 | # CONFIG_NFS_V3 is not set |
| 752 | # CONFIG_NFS_V4 is not set | 785 | # CONFIG_NFS_V4 is not set |
| 753 | # CONFIG_NFSD is not set | ||
| 754 | CONFIG_ROOT_NFS=y | 786 | CONFIG_ROOT_NFS=y |
| 787 | # CONFIG_NFSD is not set | ||
| 755 | CONFIG_LOCKD=y | 788 | CONFIG_LOCKD=y |
| 756 | CONFIG_NFS_COMMON=y | 789 | CONFIG_NFS_COMMON=y |
| 757 | CONFIG_SUNRPC=y | 790 | CONFIG_SUNRPC=y |
| 758 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 759 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 791 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 760 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 792 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 761 | # CONFIG_SMB_FS is not set | 793 | # CONFIG_SMB_FS is not set |
| @@ -791,6 +823,7 @@ CONFIG_BITREVERSE=y | |||
| 791 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 823 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 792 | # CONFIG_CRC_CCITT is not set | 824 | # CONFIG_CRC_CCITT is not set |
| 793 | # CONFIG_CRC16 is not set | 825 | # CONFIG_CRC16 is not set |
| 826 | # CONFIG_CRC_T10DIF is not set | ||
| 794 | # CONFIG_CRC_ITU_T is not set | 827 | # CONFIG_CRC_ITU_T is not set |
| 795 | CONFIG_CRC32=y | 828 | CONFIG_CRC32=y |
| 796 | # CONFIG_CRC7 is not set | 829 | # CONFIG_CRC7 is not set |
| @@ -815,6 +848,8 @@ CONFIG_FRAME_WARN=1024 | |||
| 815 | CONFIG_DEBUG_KERNEL=y | 848 | CONFIG_DEBUG_KERNEL=y |
| 816 | # CONFIG_DEBUG_SHIRQ is not set | 849 | # CONFIG_DEBUG_SHIRQ is not set |
| 817 | CONFIG_DETECT_SOFTLOCKUP=y | 850 | CONFIG_DETECT_SOFTLOCKUP=y |
| 851 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 852 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 818 | CONFIG_SCHED_DEBUG=y | 853 | CONFIG_SCHED_DEBUG=y |
| 819 | # CONFIG_SCHEDSTATS is not set | 854 | # CONFIG_SCHEDSTATS is not set |
| 820 | # CONFIG_TIMER_STATS is not set | 855 | # CONFIG_TIMER_STATS is not set |
| @@ -832,17 +867,29 @@ CONFIG_DEBUG_MUTEXES=y | |||
| 832 | # CONFIG_DEBUG_INFO is not set | 867 | # CONFIG_DEBUG_INFO is not set |
| 833 | # CONFIG_DEBUG_VM is not set | 868 | # CONFIG_DEBUG_VM is not set |
| 834 | # CONFIG_DEBUG_WRITECOUNT is not set | 869 | # CONFIG_DEBUG_WRITECOUNT is not set |
| 870 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 835 | # CONFIG_DEBUG_LIST is not set | 871 | # CONFIG_DEBUG_LIST is not set |
| 836 | # CONFIG_DEBUG_SG is not set | 872 | # CONFIG_DEBUG_SG is not set |
| 837 | # CONFIG_BOOT_PRINTK_DELAY is not set | 873 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 874 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 838 | # CONFIG_BACKTRACE_SELF_TEST is not set | 875 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 839 | # CONFIG_FAULT_INJECTION is not set | 876 | # CONFIG_FAULT_INJECTION is not set |
| 877 | # CONFIG_LATENCYTOP is not set | ||
| 878 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 879 | CONFIG_HAVE_FTRACE=y | ||
| 880 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 881 | # CONFIG_FTRACE is not set | ||
| 882 | # CONFIG_SCHED_TRACER is not set | ||
| 883 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 840 | # CONFIG_SAMPLES is not set | 884 | # CONFIG_SAMPLES is not set |
| 885 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 886 | # CONFIG_KGDB is not set | ||
| 841 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 887 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
| 842 | # CONFIG_DEBUG_STACK_USAGE is not set | 888 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 843 | # CONFIG_DEBUG_PAGEALLOC is not set | 889 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 844 | # CONFIG_DEBUGGER is not set | 890 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
| 845 | # CONFIG_KGDB_CONSOLE is not set | 891 | # CONFIG_FTR_FIXUP_SELFTEST is not set |
| 892 | # CONFIG_XMON is not set | ||
| 846 | # CONFIG_IRQSTACKS is not set | 893 | # CONFIG_IRQSTACKS is not set |
| 847 | # CONFIG_BDI_SWITCH is not set | 894 | # CONFIG_BDI_SWITCH is not set |
| 848 | # CONFIG_PPC_EARLY_DEBUG is not set | 895 | # CONFIG_PPC_EARLY_DEBUG is not set |
| @@ -895,6 +942,10 @@ CONFIG_CRYPTO=y | |||
| 895 | # CONFIG_CRYPTO_MD4 is not set | 942 | # CONFIG_CRYPTO_MD4 is not set |
| 896 | # CONFIG_CRYPTO_MD5 is not set | 943 | # CONFIG_CRYPTO_MD5 is not set |
| 897 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 944 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 945 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 946 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 947 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 948 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 898 | # CONFIG_CRYPTO_SHA1 is not set | 949 | # CONFIG_CRYPTO_SHA1 is not set |
| 899 | # CONFIG_CRYPTO_SHA256 is not set | 950 | # CONFIG_CRYPTO_SHA256 is not set |
| 900 | # CONFIG_CRYPTO_SHA512 is not set | 951 | # CONFIG_CRYPTO_SHA512 is not set |
| @@ -927,6 +978,7 @@ CONFIG_CRYPTO=y | |||
| 927 | # CONFIG_CRYPTO_LZO is not set | 978 | # CONFIG_CRYPTO_LZO is not set |
| 928 | CONFIG_CRYPTO_HW=y | 979 | CONFIG_CRYPTO_HW=y |
| 929 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 980 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 930 | # CONFIG_PPC_CLOCK is not set | 981 | # CONFIG_CRYPTO_DEV_TALITOS is not set |
| 982 | CONFIG_PPC_CLOCK=y | ||
| 931 | CONFIG_PPC_LIB_RHEAP=y | 983 | CONFIG_PPC_LIB_RHEAP=y |
| 932 | # CONFIG_VIRTUALIZATION is not set | 984 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/85xx/mpc8568mds_defconfig b/arch/powerpc/configs/85xx/mpc8568mds_defconfig index 28004e93aeee..dc27c74955fa 100644 --- a/arch/powerpc/configs/85xx/mpc8568mds_defconfig +++ b/arch/powerpc/configs/85xx/mpc8568mds_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.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Mon Jun 9 08:52:34 2008 | 4 | # Thu Aug 21 00:52:33 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -15,6 +15,7 @@ CONFIG_PPC_85xx=y | |||
| 15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
| 16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
| 17 | CONFIG_E500=y | 17 | CONFIG_E500=y |
| 18 | # CONFIG_PPC_E500MC is not set | ||
| 18 | CONFIG_BOOKE=y | 19 | CONFIG_BOOKE=y |
| 19 | CONFIG_FSL_BOOKE=y | 20 | CONFIG_FSL_BOOKE=y |
| 20 | CONFIG_FSL_EMB_PERFMON=y | 21 | CONFIG_FSL_EMB_PERFMON=y |
| @@ -33,6 +34,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 35 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | 36 | CONFIG_STACKTRACE_SUPPORT=y |
| 37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | 38 | CONFIG_LOCKDEP_SUPPORT=y |
| 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 38 | CONFIG_ARCH_HAS_ILOG2_U32=y | 40 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| @@ -89,7 +91,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 89 | CONFIG_SYSCTL=y | 91 | CONFIG_SYSCTL=y |
| 90 | CONFIG_EMBEDDED=y | 92 | CONFIG_EMBEDDED=y |
| 91 | CONFIG_SYSCTL_SYSCALL=y | 93 | CONFIG_SYSCTL_SYSCALL=y |
| 92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 93 | # CONFIG_KALLSYMS is not set | 94 | # CONFIG_KALLSYMS is not set |
| 94 | CONFIG_HOTPLUG=y | 95 | CONFIG_HOTPLUG=y |
| 95 | CONFIG_PRINTK=y | 96 | CONFIG_PRINTK=y |
| @@ -112,10 +113,16 @@ CONFIG_SLUB=y | |||
| 112 | # CONFIG_PROFILING is not set | 113 | # CONFIG_PROFILING is not set |
| 113 | # CONFIG_MARKERS is not set | 114 | # CONFIG_MARKERS is not set |
| 114 | CONFIG_HAVE_OPROFILE=y | 115 | CONFIG_HAVE_OPROFILE=y |
| 116 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 117 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 115 | CONFIG_HAVE_KPROBES=y | 118 | CONFIG_HAVE_KPROBES=y |
| 116 | CONFIG_HAVE_KRETPROBES=y | 119 | CONFIG_HAVE_KRETPROBES=y |
| 120 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 117 | # CONFIG_HAVE_DMA_ATTRS is not set | 121 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 122 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 123 | # CONFIG_HAVE_CLK is not set | ||
| 118 | CONFIG_PROC_PAGE_MONITOR=y | 124 | CONFIG_PROC_PAGE_MONITOR=y |
| 125 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 119 | CONFIG_SLABINFO=y | 126 | CONFIG_SLABINFO=y |
| 120 | CONFIG_RT_MUTEXES=y | 127 | CONFIG_RT_MUTEXES=y |
| 121 | # CONFIG_TINY_SHMEM is not set | 128 | # CONFIG_TINY_SHMEM is not set |
| @@ -126,12 +133,13 @@ CONFIG_MODULE_UNLOAD=y | |||
| 126 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 133 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 127 | # CONFIG_MODVERSIONS is not set | 134 | # CONFIG_MODVERSIONS is not set |
| 128 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 135 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 129 | # CONFIG_KMOD is not set | 136 | CONFIG_KMOD=y |
| 130 | CONFIG_BLOCK=y | 137 | CONFIG_BLOCK=y |
| 131 | # CONFIG_LBD is not set | 138 | # CONFIG_LBD is not set |
| 132 | # CONFIG_BLK_DEV_IO_TRACE is not set | 139 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 133 | # CONFIG_LSF is not set | 140 | # CONFIG_LSF is not set |
| 134 | # CONFIG_BLK_DEV_BSG is not set | 141 | # CONFIG_BLK_DEV_BSG is not set |
| 142 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 135 | 143 | ||
| 136 | # | 144 | # |
| 137 | # IO Schedulers | 145 | # IO Schedulers |
| @@ -150,8 +158,6 @@ CONFIG_CLASSIC_RCU=y | |||
| 150 | # | 158 | # |
| 151 | # Platform support | 159 | # Platform support |
| 152 | # | 160 | # |
| 153 | # CONFIG_PPC_MPC512x is not set | ||
| 154 | # CONFIG_PPC_MPC5121 is not set | ||
| 155 | # CONFIG_PPC_CELL is not set | 161 | # CONFIG_PPC_CELL is not set |
| 156 | # CONFIG_PPC_CELL_NATIVE is not set | 162 | # CONFIG_PPC_CELL_NATIVE is not set |
| 157 | # CONFIG_PQ2ADS is not set | 163 | # CONFIG_PQ2ADS is not set |
| @@ -160,11 +166,13 @@ CONFIG_MPC85xx=y | |||
| 160 | # CONFIG_MPC8560_ADS is not set | 166 | # CONFIG_MPC8560_ADS is not set |
| 161 | # CONFIG_MPC85xx_CDS is not set | 167 | # CONFIG_MPC85xx_CDS is not set |
| 162 | CONFIG_MPC85xx_MDS=y | 168 | CONFIG_MPC85xx_MDS=y |
| 169 | # CONFIG_MPC8536_DS is not set | ||
| 163 | # CONFIG_MPC85xx_DS is not set | 170 | # CONFIG_MPC85xx_DS is not set |
| 164 | # CONFIG_KSI8560 is not set | 171 | # CONFIG_KSI8560 is not set |
| 165 | # CONFIG_STX_GP3 is not set | 172 | # CONFIG_STX_GP3 is not set |
| 166 | # CONFIG_TQM8540 is not set | 173 | # CONFIG_TQM8540 is not set |
| 167 | # CONFIG_TQM8541 is not set | 174 | # CONFIG_TQM8541 is not set |
| 175 | # CONFIG_TQM8548 is not set | ||
| 168 | # CONFIG_TQM8555 is not set | 176 | # CONFIG_TQM8555 is not set |
| 169 | # CONFIG_TQM8560 is not set | 177 | # CONFIG_TQM8560 is not set |
| 170 | # CONFIG_SBC8548 is not set | 178 | # CONFIG_SBC8548 is not set |
| @@ -197,7 +205,7 @@ CONFIG_HZ_250=y | |||
| 197 | # CONFIG_HZ_300 is not set | 205 | # CONFIG_HZ_300 is not set |
| 198 | # CONFIG_HZ_1000 is not set | 206 | # CONFIG_HZ_1000 is not set |
| 199 | CONFIG_HZ=250 | 207 | CONFIG_HZ=250 |
| 200 | # CONFIG_SCHED_HRTICK is not set | 208 | CONFIG_SCHED_HRTICK=y |
| 201 | CONFIG_PREEMPT_NONE=y | 209 | CONFIG_PREEMPT_NONE=y |
| 202 | # CONFIG_PREEMPT_VOLUNTARY is not set | 210 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 203 | # CONFIG_PREEMPT is not set | 211 | # CONFIG_PREEMPT is not set |
| @@ -220,6 +228,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 220 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 228 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 221 | CONFIG_PAGEFLAGS_EXTENDED=y | 229 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 222 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 230 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 231 | CONFIG_MIGRATION=y | ||
| 223 | # CONFIG_RESOURCES_64BIT is not set | 232 | # CONFIG_RESOURCES_64BIT is not set |
| 224 | CONFIG_ZONE_DMA_FLAG=1 | 233 | CONFIG_ZONE_DMA_FLAG=1 |
| 225 | CONFIG_BOUNCE=y | 234 | CONFIG_BOUNCE=y |
| @@ -227,6 +236,7 @@ CONFIG_VIRT_TO_BUS=y | |||
| 227 | CONFIG_FORCE_MAX_ZONEORDER=11 | 236 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 228 | CONFIG_PROC_DEVICETREE=y | 237 | CONFIG_PROC_DEVICETREE=y |
| 229 | # CONFIG_CMDLINE_BOOL is not set | 238 | # CONFIG_CMDLINE_BOOL is not set |
| 239 | CONFIG_EXTRA_TARGETS="" | ||
| 230 | # CONFIG_PM is not set | 240 | # CONFIG_PM is not set |
| 231 | CONFIG_SECCOMP=y | 241 | CONFIG_SECCOMP=y |
| 232 | CONFIG_ISA_DMA_API=y | 242 | CONFIG_ISA_DMA_API=y |
| @@ -238,6 +248,7 @@ CONFIG_ZONE_DMA=y | |||
| 238 | CONFIG_PPC_INDIRECT_PCI=y | 248 | CONFIG_PPC_INDIRECT_PCI=y |
| 239 | CONFIG_FSL_SOC=y | 249 | CONFIG_FSL_SOC=y |
| 240 | CONFIG_FSL_PCI=y | 250 | CONFIG_FSL_PCI=y |
| 251 | CONFIG_PPC_PCI_CHOICE=y | ||
| 241 | CONFIG_PCI=y | 252 | CONFIG_PCI=y |
| 242 | CONFIG_PCI_DOMAINS=y | 253 | CONFIG_PCI_DOMAINS=y |
| 243 | CONFIG_PCI_SYSCALL=y | 254 | CONFIG_PCI_SYSCALL=y |
| @@ -264,10 +275,6 @@ CONFIG_KERNEL_START=0xc0000000 | |||
| 264 | CONFIG_PHYSICAL_START=0x00000000 | 275 | CONFIG_PHYSICAL_START=0x00000000 |
| 265 | CONFIG_PHYSICAL_ALIGN=0x10000000 | 276 | CONFIG_PHYSICAL_ALIGN=0x10000000 |
| 266 | CONFIG_TASK_SIZE=0xc0000000 | 277 | CONFIG_TASK_SIZE=0xc0000000 |
| 267 | |||
| 268 | # | ||
| 269 | # Networking | ||
| 270 | # | ||
| 271 | CONFIG_NET=y | 278 | CONFIG_NET=y |
| 272 | 279 | ||
| 273 | # | 280 | # |
| @@ -385,12 +392,14 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
| 385 | # CONFIG_BLK_DEV_XIP is not set | 392 | # CONFIG_BLK_DEV_XIP is not set |
| 386 | # CONFIG_CDROM_PKTCDVD is not set | 393 | # CONFIG_CDROM_PKTCDVD is not set |
| 387 | # CONFIG_ATA_OVER_ETH is not set | 394 | # CONFIG_ATA_OVER_ETH is not set |
| 395 | # CONFIG_BLK_DEV_HD is not set | ||
| 388 | CONFIG_MISC_DEVICES=y | 396 | CONFIG_MISC_DEVICES=y |
| 389 | # CONFIG_PHANTOM is not set | 397 | # CONFIG_PHANTOM is not set |
| 390 | # CONFIG_EEPROM_93CX6 is not set | 398 | # CONFIG_EEPROM_93CX6 is not set |
| 391 | # CONFIG_SGI_IOC4 is not set | 399 | # CONFIG_SGI_IOC4 is not set |
| 392 | # CONFIG_TIFM_CORE is not set | 400 | # CONFIG_TIFM_CORE is not set |
| 393 | # CONFIG_ENCLOSURE_SERVICES is not set | 401 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 402 | # CONFIG_HP_ILO is not set | ||
| 394 | CONFIG_HAVE_IDE=y | 403 | CONFIG_HAVE_IDE=y |
| 395 | # CONFIG_IDE is not set | 404 | # CONFIG_IDE is not set |
| 396 | 405 | ||
| @@ -468,6 +477,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 468 | # CONFIG_SCSI_NSP32 is not set | 477 | # CONFIG_SCSI_NSP32 is not set |
| 469 | # CONFIG_SCSI_DEBUG is not set | 478 | # CONFIG_SCSI_DEBUG is not set |
| 470 | # CONFIG_SCSI_SRP is not set | 479 | # CONFIG_SCSI_SRP is not set |
| 480 | # CONFIG_SCSI_DH is not set | ||
| 471 | # CONFIG_ATA is not set | 481 | # CONFIG_ATA is not set |
| 472 | # CONFIG_MD is not set | 482 | # CONFIG_MD is not set |
| 473 | # CONFIG_FUSION is not set | 483 | # CONFIG_FUSION is not set |
| @@ -475,12 +485,15 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 475 | # | 485 | # |
| 476 | # IEEE 1394 (FireWire) support | 486 | # IEEE 1394 (FireWire) support |
| 477 | # | 487 | # |
| 488 | |||
| 489 | # | ||
| 490 | # Enable only one of the two stacks, unless you know what you are doing | ||
| 491 | # | ||
| 478 | # CONFIG_FIREWIRE is not set | 492 | # CONFIG_FIREWIRE is not set |
| 479 | # CONFIG_IEEE1394 is not set | 493 | # CONFIG_IEEE1394 is not set |
| 480 | # CONFIG_I2O is not set | 494 | # CONFIG_I2O is not set |
| 481 | # CONFIG_MACINTOSH_DRIVERS is not set | 495 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 482 | CONFIG_NETDEVICES=y | 496 | CONFIG_NETDEVICES=y |
| 483 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 484 | # CONFIG_DUMMY is not set | 497 | # CONFIG_DUMMY is not set |
| 485 | # CONFIG_BONDING is not set | 498 | # CONFIG_BONDING is not set |
| 486 | # CONFIG_MACVLAN is not set | 499 | # CONFIG_MACVLAN is not set |
| @@ -524,7 +537,6 @@ CONFIG_NETDEV_1000=y | |||
| 524 | # CONFIG_DL2K is not set | 537 | # CONFIG_DL2K is not set |
| 525 | # CONFIG_E1000 is not set | 538 | # CONFIG_E1000 is not set |
| 526 | # CONFIG_E1000E is not set | 539 | # CONFIG_E1000E is not set |
| 527 | # CONFIG_E1000E_ENABLED is not set | ||
| 528 | # CONFIG_IP1000 is not set | 540 | # CONFIG_IP1000 is not set |
| 529 | # CONFIG_IGB is not set | 541 | # CONFIG_IGB is not set |
| 530 | # CONFIG_NS83820 is not set | 542 | # CONFIG_NS83820 is not set |
| @@ -538,10 +550,10 @@ CONFIG_NETDEV_1000=y | |||
| 538 | # CONFIG_TIGON3 is not set | 550 | # CONFIG_TIGON3 is not set |
| 539 | # CONFIG_BNX2 is not set | 551 | # CONFIG_BNX2 is not set |
| 540 | CONFIG_GIANFAR=y | 552 | CONFIG_GIANFAR=y |
| 541 | CONFIG_GFAR_NAPI=y | ||
| 542 | # CONFIG_UCC_GETH is not set | 553 | # CONFIG_UCC_GETH is not set |
| 543 | # CONFIG_QLA3XXX is not set | 554 | # CONFIG_QLA3XXX is not set |
| 544 | # CONFIG_ATL1 is not set | 555 | # CONFIG_ATL1 is not set |
| 556 | # CONFIG_ATL1E is not set | ||
| 545 | CONFIG_NETDEV_10000=y | 557 | CONFIG_NETDEV_10000=y |
| 546 | # CONFIG_CHELSIO_T1 is not set | 558 | # CONFIG_CHELSIO_T1 is not set |
| 547 | # CONFIG_CHELSIO_T3 is not set | 559 | # CONFIG_CHELSIO_T3 is not set |
| @@ -648,42 +660,63 @@ CONFIG_DEVPORT=y | |||
| 648 | CONFIG_I2C=y | 660 | CONFIG_I2C=y |
| 649 | CONFIG_I2C_BOARDINFO=y | 661 | CONFIG_I2C_BOARDINFO=y |
| 650 | CONFIG_I2C_CHARDEV=y | 662 | CONFIG_I2C_CHARDEV=y |
| 663 | CONFIG_I2C_HELPER_AUTO=y | ||
| 651 | 664 | ||
| 652 | # | 665 | # |
| 653 | # I2C Hardware Bus support | 666 | # I2C Hardware Bus support |
| 654 | # | 667 | # |
| 668 | |||
| 669 | # | ||
| 670 | # PC SMBus host controller drivers | ||
| 671 | # | ||
| 655 | # CONFIG_I2C_ALI1535 is not set | 672 | # CONFIG_I2C_ALI1535 is not set |
| 656 | # CONFIG_I2C_ALI1563 is not set | 673 | # CONFIG_I2C_ALI1563 is not set |
| 657 | # CONFIG_I2C_ALI15X3 is not set | 674 | # CONFIG_I2C_ALI15X3 is not set |
| 658 | # CONFIG_I2C_AMD756 is not set | 675 | # CONFIG_I2C_AMD756 is not set |
| 659 | # CONFIG_I2C_AMD8111 is not set | 676 | # CONFIG_I2C_AMD8111 is not set |
| 660 | # CONFIG_I2C_I801 is not set | 677 | # CONFIG_I2C_I801 is not set |
| 661 | # CONFIG_I2C_I810 is not set | 678 | # CONFIG_I2C_ISCH is not set |
| 662 | # CONFIG_I2C_PIIX4 is not set | 679 | # CONFIG_I2C_PIIX4 is not set |
| 663 | CONFIG_I2C_MPC=y | ||
| 664 | # CONFIG_I2C_NFORCE2 is not set | 680 | # CONFIG_I2C_NFORCE2 is not set |
| 665 | # CONFIG_I2C_OCORES is not set | ||
| 666 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 667 | # CONFIG_I2C_PROSAVAGE is not set | ||
| 668 | # CONFIG_I2C_SAVAGE4 is not set | ||
| 669 | # CONFIG_I2C_SIMTEC is not set | ||
| 670 | # CONFIG_I2C_SIS5595 is not set | 681 | # CONFIG_I2C_SIS5595 is not set |
| 671 | # CONFIG_I2C_SIS630 is not set | 682 | # CONFIG_I2C_SIS630 is not set |
| 672 | # CONFIG_I2C_SIS96X is not set | 683 | # CONFIG_I2C_SIS96X is not set |
| 673 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 674 | # CONFIG_I2C_STUB is not set | ||
| 675 | # CONFIG_I2C_VIA is not set | 684 | # CONFIG_I2C_VIA is not set |
| 676 | # CONFIG_I2C_VIAPRO is not set | 685 | # CONFIG_I2C_VIAPRO is not set |
| 686 | |||
| 687 | # | ||
| 688 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 689 | # | ||
| 690 | CONFIG_I2C_MPC=y | ||
| 691 | # CONFIG_I2C_OCORES is not set | ||
| 692 | # CONFIG_I2C_SIMTEC is not set | ||
| 693 | |||
| 694 | # | ||
| 695 | # External I2C/SMBus adapter drivers | ||
| 696 | # | ||
| 697 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 698 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 699 | |||
| 700 | # | ||
| 701 | # Graphics adapter I2C/DDC channel drivers | ||
| 702 | # | ||
| 677 | # CONFIG_I2C_VOODOO3 is not set | 703 | # CONFIG_I2C_VOODOO3 is not set |
| 704 | |||
| 705 | # | ||
| 706 | # Other I2C/SMBus bus drivers | ||
| 707 | # | ||
| 678 | # CONFIG_I2C_PCA_PLATFORM is not set | 708 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 709 | # CONFIG_I2C_STUB is not set | ||
| 679 | 710 | ||
| 680 | # | 711 | # |
| 681 | # Miscellaneous I2C Chip support | 712 | # Miscellaneous I2C Chip support |
| 682 | # | 713 | # |
| 683 | # CONFIG_DS1682 is not set | 714 | # CONFIG_DS1682 is not set |
| 715 | # CONFIG_AT24 is not set | ||
| 684 | # CONFIG_SENSORS_EEPROM is not set | 716 | # CONFIG_SENSORS_EEPROM is not set |
| 685 | # CONFIG_SENSORS_PCF8574 is not set | 717 | # CONFIG_SENSORS_PCF8574 is not set |
| 686 | # CONFIG_PCF8575 is not set | 718 | # CONFIG_PCF8575 is not set |
| 719 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 687 | # CONFIG_SENSORS_PCF8591 is not set | 720 | # CONFIG_SENSORS_PCF8591 is not set |
| 688 | # CONFIG_SENSORS_MAX6875 is not set | 721 | # CONFIG_SENSORS_MAX6875 is not set |
| 689 | # CONFIG_SENSORS_TSL2550 is not set | 722 | # CONFIG_SENSORS_TSL2550 is not set |
| @@ -692,10 +725,13 @@ CONFIG_I2C_MPC=y | |||
| 692 | # CONFIG_I2C_DEBUG_BUS is not set | 725 | # CONFIG_I2C_DEBUG_BUS is not set |
| 693 | # CONFIG_I2C_DEBUG_CHIP is not set | 726 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 694 | # CONFIG_SPI is not set | 727 | # CONFIG_SPI is not set |
| 728 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 729 | # CONFIG_GPIOLIB is not set | ||
| 695 | # CONFIG_W1 is not set | 730 | # CONFIG_W1 is not set |
| 696 | # CONFIG_POWER_SUPPLY is not set | 731 | # CONFIG_POWER_SUPPLY is not set |
| 697 | CONFIG_HWMON=y | 732 | CONFIG_HWMON=y |
| 698 | # CONFIG_HWMON_VID is not set | 733 | # CONFIG_HWMON_VID is not set |
| 734 | # CONFIG_SENSORS_AD7414 is not set | ||
| 699 | # CONFIG_SENSORS_AD7418 is not set | 735 | # CONFIG_SENSORS_AD7418 is not set |
| 700 | # CONFIG_SENSORS_ADM1021 is not set | 736 | # CONFIG_SENSORS_ADM1021 is not set |
| 701 | # CONFIG_SENSORS_ADM1025 is not set | 737 | # CONFIG_SENSORS_ADM1025 is not set |
| @@ -749,6 +785,7 @@ CONFIG_HWMON=y | |||
| 749 | # CONFIG_SENSORS_W83627EHF is not set | 785 | # CONFIG_SENSORS_W83627EHF is not set |
| 750 | # CONFIG_HWMON_DEBUG_CHIP is not set | 786 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 751 | # CONFIG_THERMAL is not set | 787 | # CONFIG_THERMAL is not set |
| 788 | # CONFIG_THERMAL_HWMON is not set | ||
| 752 | CONFIG_WATCHDOG=y | 789 | CONFIG_WATCHDOG=y |
| 753 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 790 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
| 754 | 791 | ||
| @@ -756,6 +793,7 @@ CONFIG_WATCHDOG=y | |||
| 756 | # Watchdog Device Drivers | 793 | # Watchdog Device Drivers |
| 757 | # | 794 | # |
| 758 | # CONFIG_SOFT_WATCHDOG is not set | 795 | # CONFIG_SOFT_WATCHDOG is not set |
| 796 | # CONFIG_ALIM7101_WDT is not set | ||
| 759 | # CONFIG_BOOKE_WDT is not set | 797 | # CONFIG_BOOKE_WDT is not set |
| 760 | 798 | ||
| 761 | # | 799 | # |
| @@ -773,8 +811,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 773 | # | 811 | # |
| 774 | # Multifunction device drivers | 812 | # Multifunction device drivers |
| 775 | # | 813 | # |
| 814 | # CONFIG_MFD_CORE is not set | ||
| 776 | # CONFIG_MFD_SM501 is not set | 815 | # CONFIG_MFD_SM501 is not set |
| 777 | # CONFIG_HTC_PASIC3 is not set | 816 | # CONFIG_HTC_PASIC3 is not set |
| 817 | # CONFIG_MFD_TMIO is not set | ||
| 778 | 818 | ||
| 779 | # | 819 | # |
| 780 | # Multimedia devices | 820 | # Multimedia devices |
| @@ -806,10 +846,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m | |||
| 806 | # Display device support | 846 | # Display device support |
| 807 | # | 847 | # |
| 808 | # CONFIG_DISPLAY_SUPPORT is not set | 848 | # CONFIG_DISPLAY_SUPPORT is not set |
| 809 | |||
| 810 | # | ||
| 811 | # Sound | ||
| 812 | # | ||
| 813 | # CONFIG_SOUND is not set | 849 | # CONFIG_SOUND is not set |
| 814 | CONFIG_HID_SUPPORT=y | 850 | CONFIG_HID_SUPPORT=y |
| 815 | CONFIG_HID=y | 851 | CONFIG_HID=y |
| @@ -824,6 +860,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 824 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 860 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
| 825 | 861 | ||
| 826 | # | 862 | # |
| 863 | # Enable Host or Gadget support to see Inventra options | ||
| 864 | # | ||
| 865 | |||
| 866 | # | ||
| 827 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 867 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 828 | # | 868 | # |
| 829 | # CONFIG_USB_GADGET is not set | 869 | # CONFIG_USB_GADGET is not set |
| @@ -862,6 +902,7 @@ CONFIG_RTC_DRV_DS1374=y | |||
| 862 | # CONFIG_RTC_DRV_PCF8583 is not set | 902 | # CONFIG_RTC_DRV_PCF8583 is not set |
| 863 | # CONFIG_RTC_DRV_M41T80 is not set | 903 | # CONFIG_RTC_DRV_M41T80 is not set |
| 864 | # CONFIG_RTC_DRV_S35390A is not set | 904 | # CONFIG_RTC_DRV_S35390A is not set |
| 905 | # CONFIG_RTC_DRV_FM3130 is not set | ||
| 865 | 906 | ||
| 866 | # | 907 | # |
| 867 | # SPI RTC drivers | 908 | # SPI RTC drivers |
| @@ -950,6 +991,7 @@ CONFIG_TMPFS=y | |||
| 950 | # CONFIG_CRAMFS is not set | 991 | # CONFIG_CRAMFS is not set |
| 951 | # CONFIG_VXFS_FS is not set | 992 | # CONFIG_VXFS_FS is not set |
| 952 | # CONFIG_MINIX_FS is not set | 993 | # CONFIG_MINIX_FS is not set |
| 994 | # CONFIG_OMFS_FS is not set | ||
| 953 | # CONFIG_HPFS_FS is not set | 995 | # CONFIG_HPFS_FS is not set |
| 954 | # CONFIG_QNX4FS_FS is not set | 996 | # CONFIG_QNX4FS_FS is not set |
| 955 | # CONFIG_ROMFS_FS is not set | 997 | # CONFIG_ROMFS_FS is not set |
| @@ -960,14 +1002,13 @@ CONFIG_NFS_FS=y | |||
| 960 | CONFIG_NFS_V3=y | 1002 | CONFIG_NFS_V3=y |
| 961 | # CONFIG_NFS_V3_ACL is not set | 1003 | # CONFIG_NFS_V3_ACL is not set |
| 962 | CONFIG_NFS_V4=y | 1004 | CONFIG_NFS_V4=y |
| 963 | # CONFIG_NFSD is not set | ||
| 964 | CONFIG_ROOT_NFS=y | 1005 | CONFIG_ROOT_NFS=y |
| 1006 | # CONFIG_NFSD is not set | ||
| 965 | CONFIG_LOCKD=y | 1007 | CONFIG_LOCKD=y |
| 966 | CONFIG_LOCKD_V4=y | 1008 | CONFIG_LOCKD_V4=y |
| 967 | CONFIG_NFS_COMMON=y | 1009 | CONFIG_NFS_COMMON=y |
| 968 | CONFIG_SUNRPC=y | 1010 | CONFIG_SUNRPC=y |
| 969 | CONFIG_SUNRPC_GSS=y | 1011 | CONFIG_SUNRPC_GSS=y |
| 970 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 971 | CONFIG_RPCSEC_GSS_KRB5=y | 1012 | CONFIG_RPCSEC_GSS_KRB5=y |
| 972 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1013 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 973 | # CONFIG_SMB_FS is not set | 1014 | # CONFIG_SMB_FS is not set |
| @@ -995,6 +1036,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
| 995 | # CONFIG_SYSV68_PARTITION is not set | 1036 | # CONFIG_SYSV68_PARTITION is not set |
| 996 | # CONFIG_NLS is not set | 1037 | # CONFIG_NLS is not set |
| 997 | # CONFIG_DLM is not set | 1038 | # CONFIG_DLM is not set |
| 1039 | # CONFIG_QE_GPIO is not set | ||
| 998 | 1040 | ||
| 999 | # | 1041 | # |
| 1000 | # Library routines | 1042 | # Library routines |
| @@ -1003,6 +1045,7 @@ CONFIG_BITREVERSE=y | |||
| 1003 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1045 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 1004 | # CONFIG_CRC_CCITT is not set | 1046 | # CONFIG_CRC_CCITT is not set |
| 1005 | # CONFIG_CRC16 is not set | 1047 | # CONFIG_CRC16 is not set |
| 1048 | # CONFIG_CRC_T10DIF is not set | ||
| 1006 | # CONFIG_CRC_ITU_T is not set | 1049 | # CONFIG_CRC_ITU_T is not set |
| 1007 | CONFIG_CRC32=y | 1050 | CONFIG_CRC32=y |
| 1008 | # CONFIG_CRC7 is not set | 1051 | # CONFIG_CRC7 is not set |
| @@ -1027,6 +1070,8 @@ CONFIG_FRAME_WARN=1024 | |||
| 1027 | CONFIG_DEBUG_KERNEL=y | 1070 | CONFIG_DEBUG_KERNEL=y |
| 1028 | # CONFIG_DEBUG_SHIRQ is not set | 1071 | # CONFIG_DEBUG_SHIRQ is not set |
| 1029 | CONFIG_DETECT_SOFTLOCKUP=y | 1072 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1073 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 1074 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 1030 | CONFIG_SCHED_DEBUG=y | 1075 | CONFIG_SCHED_DEBUG=y |
| 1031 | # CONFIG_SCHEDSTATS is not set | 1076 | # CONFIG_SCHEDSTATS is not set |
| 1032 | # CONFIG_TIMER_STATS is not set | 1077 | # CONFIG_TIMER_STATS is not set |
| @@ -1044,17 +1089,28 @@ CONFIG_SCHED_DEBUG=y | |||
| 1044 | # CONFIG_DEBUG_INFO is not set | 1089 | # CONFIG_DEBUG_INFO is not set |
| 1045 | # CONFIG_DEBUG_VM is not set | 1090 | # CONFIG_DEBUG_VM is not set |
| 1046 | # CONFIG_DEBUG_WRITECOUNT is not set | 1091 | # CONFIG_DEBUG_WRITECOUNT is not set |
| 1092 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 1047 | # CONFIG_DEBUG_LIST is not set | 1093 | # CONFIG_DEBUG_LIST is not set |
| 1048 | # CONFIG_DEBUG_SG is not set | 1094 | # CONFIG_DEBUG_SG is not set |
| 1049 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1095 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 1050 | # CONFIG_RCU_TORTURE_TEST is not set | 1096 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1051 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1097 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 1052 | # CONFIG_FAULT_INJECTION is not set | 1098 | # CONFIG_FAULT_INJECTION is not set |
| 1099 | # CONFIG_LATENCYTOP is not set | ||
| 1100 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1101 | CONFIG_HAVE_FTRACE=y | ||
| 1102 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1103 | # CONFIG_FTRACE is not set | ||
| 1104 | # CONFIG_SCHED_TRACER is not set | ||
| 1105 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1053 | # CONFIG_SAMPLES is not set | 1106 | # CONFIG_SAMPLES is not set |
| 1107 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1108 | # CONFIG_KGDB is not set | ||
| 1054 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1109 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
| 1055 | # CONFIG_DEBUG_STACK_USAGE is not set | 1110 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1056 | # CONFIG_DEBUG_PAGEALLOC is not set | 1111 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1057 | CONFIG_DEBUGGER=y | 1112 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
| 1113 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
| 1058 | # CONFIG_XMON is not set | 1114 | # CONFIG_XMON is not set |
| 1059 | # CONFIG_IRQSTACKS is not set | 1115 | # CONFIG_IRQSTACKS is not set |
| 1060 | # CONFIG_BDI_SWITCH is not set | 1116 | # CONFIG_BDI_SWITCH is not set |
| @@ -1122,6 +1178,10 @@ CONFIG_CRYPTO_PCBC=m | |||
| 1122 | # CONFIG_CRYPTO_MD4 is not set | 1178 | # CONFIG_CRYPTO_MD4 is not set |
| 1123 | CONFIG_CRYPTO_MD5=y | 1179 | CONFIG_CRYPTO_MD5=y |
| 1124 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1180 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 1181 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1182 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1183 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1184 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1125 | # CONFIG_CRYPTO_SHA1 is not set | 1185 | # CONFIG_CRYPTO_SHA1 is not set |
| 1126 | # CONFIG_CRYPTO_SHA256 is not set | 1186 | # CONFIG_CRYPTO_SHA256 is not set |
| 1127 | # CONFIG_CRYPTO_SHA512 is not set | 1187 | # CONFIG_CRYPTO_SHA512 is not set |
| @@ -1154,6 +1214,7 @@ CONFIG_CRYPTO_DES=y | |||
| 1154 | # CONFIG_CRYPTO_LZO is not set | 1214 | # CONFIG_CRYPTO_LZO is not set |
| 1155 | CONFIG_CRYPTO_HW=y | 1215 | CONFIG_CRYPTO_HW=y |
| 1156 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1216 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1217 | # CONFIG_CRYPTO_DEV_TALITOS is not set | ||
| 1157 | # CONFIG_PPC_CLOCK is not set | 1218 | # CONFIG_PPC_CLOCK is not set |
| 1158 | CONFIG_PPC_LIB_RHEAP=y | 1219 | CONFIG_PPC_LIB_RHEAP=y |
| 1159 | # CONFIG_VIRTUALIZATION is not set | 1220 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/85xx/mpc8572_ds_defconfig b/arch/powerpc/configs/85xx/mpc8572_ds_defconfig index 164fd9606ee6..eda45bb8a13f 100644 --- a/arch/powerpc/configs/85xx/mpc8572_ds_defconfig +++ b/arch/powerpc/configs/85xx/mpc8572_ds_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.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Mon Jun 9 08:52:35 2008 | 4 | # Thu Aug 21 07:21:42 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -15,6 +15,7 @@ CONFIG_PPC_85xx=y | |||
| 15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
| 16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
| 17 | CONFIG_E500=y | 17 | CONFIG_E500=y |
| 18 | # CONFIG_PPC_E500MC is not set | ||
| 18 | CONFIG_BOOKE=y | 19 | CONFIG_BOOKE=y |
| 19 | CONFIG_FSL_BOOKE=y | 20 | CONFIG_FSL_BOOKE=y |
| 20 | CONFIG_FSL_EMB_PERFMON=y | 21 | CONFIG_FSL_EMB_PERFMON=y |
| @@ -33,6 +34,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 35 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | 36 | CONFIG_STACKTRACE_SUPPORT=y |
| 37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | 38 | CONFIG_LOCKDEP_SUPPORT=y |
| 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 38 | CONFIG_ARCH_HAS_ILOG2_U32=y | 40 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| @@ -92,7 +94,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 92 | CONFIG_SYSCTL=y | 94 | CONFIG_SYSCTL=y |
| 93 | CONFIG_EMBEDDED=y | 95 | CONFIG_EMBEDDED=y |
| 94 | CONFIG_SYSCTL_SYSCALL=y | 96 | CONFIG_SYSCTL_SYSCALL=y |
| 95 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 96 | CONFIG_KALLSYMS=y | 97 | CONFIG_KALLSYMS=y |
| 97 | CONFIG_KALLSYMS_ALL=y | 98 | CONFIG_KALLSYMS_ALL=y |
| 98 | CONFIG_KALLSYMS_EXTRA_PASS=y | 99 | CONFIG_KALLSYMS_EXTRA_PASS=y |
| @@ -118,10 +119,16 @@ CONFIG_SLUB=y | |||
| 118 | # CONFIG_MARKERS is not set | 119 | # CONFIG_MARKERS is not set |
| 119 | CONFIG_HAVE_OPROFILE=y | 120 | CONFIG_HAVE_OPROFILE=y |
| 120 | # CONFIG_KPROBES is not set | 121 | # CONFIG_KPROBES is not set |
| 122 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 123 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 121 | CONFIG_HAVE_KPROBES=y | 124 | CONFIG_HAVE_KPROBES=y |
| 122 | CONFIG_HAVE_KRETPROBES=y | 125 | CONFIG_HAVE_KRETPROBES=y |
| 126 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 123 | # CONFIG_HAVE_DMA_ATTRS is not set | 127 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 128 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 129 | # CONFIG_HAVE_CLK is not set | ||
| 124 | CONFIG_PROC_PAGE_MONITOR=y | 130 | CONFIG_PROC_PAGE_MONITOR=y |
| 131 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 125 | CONFIG_SLABINFO=y | 132 | CONFIG_SLABINFO=y |
| 126 | CONFIG_RT_MUTEXES=y | 133 | CONFIG_RT_MUTEXES=y |
| 127 | # CONFIG_TINY_SHMEM is not set | 134 | # CONFIG_TINY_SHMEM is not set |
| @@ -138,6 +145,7 @@ CONFIG_LBD=y | |||
| 138 | # CONFIG_BLK_DEV_IO_TRACE is not set | 145 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 139 | # CONFIG_LSF is not set | 146 | # CONFIG_LSF is not set |
| 140 | # CONFIG_BLK_DEV_BSG is not set | 147 | # CONFIG_BLK_DEV_BSG is not set |
| 148 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 141 | 149 | ||
| 142 | # | 150 | # |
| 143 | # IO Schedulers | 151 | # IO Schedulers |
| @@ -156,8 +164,6 @@ CONFIG_CLASSIC_RCU=y | |||
| 156 | # | 164 | # |
| 157 | # Platform support | 165 | # Platform support |
| 158 | # | 166 | # |
| 159 | # CONFIG_PPC_MPC512x is not set | ||
| 160 | # CONFIG_PPC_MPC5121 is not set | ||
| 161 | # CONFIG_PPC_CELL is not set | 167 | # CONFIG_PPC_CELL is not set |
| 162 | # CONFIG_PPC_CELL_NATIVE is not set | 168 | # CONFIG_PPC_CELL_NATIVE is not set |
| 163 | # CONFIG_PQ2ADS is not set | 169 | # CONFIG_PQ2ADS is not set |
| @@ -166,11 +172,13 @@ CONFIG_MPC85xx=y | |||
| 166 | # CONFIG_MPC8560_ADS is not set | 172 | # CONFIG_MPC8560_ADS is not set |
| 167 | # CONFIG_MPC85xx_CDS is not set | 173 | # CONFIG_MPC85xx_CDS is not set |
| 168 | # CONFIG_MPC85xx_MDS is not set | 174 | # CONFIG_MPC85xx_MDS is not set |
| 175 | # CONFIG_MPC8536_DS is not set | ||
| 169 | CONFIG_MPC85xx_DS=y | 176 | CONFIG_MPC85xx_DS=y |
| 170 | # CONFIG_KSI8560 is not set | 177 | # CONFIG_KSI8560 is not set |
| 171 | # CONFIG_STX_GP3 is not set | 178 | # CONFIG_STX_GP3 is not set |
| 172 | # CONFIG_TQM8540 is not set | 179 | # CONFIG_TQM8540 is not set |
| 173 | # CONFIG_TQM8541 is not set | 180 | # CONFIG_TQM8541 is not set |
| 181 | # CONFIG_TQM8548 is not set | ||
| 174 | # CONFIG_TQM8555 is not set | 182 | # CONFIG_TQM8555 is not set |
| 175 | # CONFIG_TQM8560 is not set | 183 | # CONFIG_TQM8560 is not set |
| 176 | # CONFIG_SBC8548 is not set | 184 | # CONFIG_SBC8548 is not set |
| @@ -202,7 +210,7 @@ CONFIG_HZ_250=y | |||
| 202 | # CONFIG_HZ_300 is not set | 210 | # CONFIG_HZ_300 is not set |
| 203 | # CONFIG_HZ_1000 is not set | 211 | # CONFIG_HZ_1000 is not set |
| 204 | CONFIG_HZ=250 | 212 | CONFIG_HZ=250 |
| 205 | # CONFIG_SCHED_HRTICK is not set | 213 | CONFIG_SCHED_HRTICK=y |
| 206 | CONFIG_PREEMPT_NONE=y | 214 | CONFIG_PREEMPT_NONE=y |
| 207 | # CONFIG_PREEMPT_VOLUNTARY is not set | 215 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 208 | # CONFIG_PREEMPT is not set | 216 | # CONFIG_PREEMPT is not set |
| @@ -225,6 +233,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 225 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 233 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 226 | CONFIG_PAGEFLAGS_EXTENDED=y | 234 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 227 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 235 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 236 | CONFIG_MIGRATION=y | ||
| 228 | # CONFIG_RESOURCES_64BIT is not set | 237 | # CONFIG_RESOURCES_64BIT is not set |
| 229 | CONFIG_ZONE_DMA_FLAG=1 | 238 | CONFIG_ZONE_DMA_FLAG=1 |
| 230 | CONFIG_BOUNCE=y | 239 | CONFIG_BOUNCE=y |
| @@ -232,6 +241,7 @@ CONFIG_VIRT_TO_BUS=y | |||
| 232 | CONFIG_FORCE_MAX_ZONEORDER=11 | 241 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 233 | CONFIG_PROC_DEVICETREE=y | 242 | CONFIG_PROC_DEVICETREE=y |
| 234 | # CONFIG_CMDLINE_BOOL is not set | 243 | # CONFIG_CMDLINE_BOOL is not set |
| 244 | CONFIG_EXTRA_TARGETS="" | ||
| 235 | # CONFIG_PM is not set | 245 | # CONFIG_PM is not set |
| 236 | CONFIG_SECCOMP=y | 246 | CONFIG_SECCOMP=y |
| 237 | CONFIG_ISA_DMA_API=y | 247 | CONFIG_ISA_DMA_API=y |
| @@ -244,6 +254,7 @@ CONFIG_GENERIC_ISA_DMA=y | |||
| 244 | CONFIG_PPC_INDIRECT_PCI=y | 254 | CONFIG_PPC_INDIRECT_PCI=y |
| 245 | CONFIG_FSL_SOC=y | 255 | CONFIG_FSL_SOC=y |
| 246 | CONFIG_FSL_PCI=y | 256 | CONFIG_FSL_PCI=y |
| 257 | CONFIG_PPC_PCI_CHOICE=y | ||
| 247 | CONFIG_PCI=y | 258 | CONFIG_PCI=y |
| 248 | CONFIG_PCI_DOMAINS=y | 259 | CONFIG_PCI_DOMAINS=y |
| 249 | CONFIG_PCI_SYSCALL=y | 260 | CONFIG_PCI_SYSCALL=y |
| @@ -270,10 +281,6 @@ CONFIG_KERNEL_START=0xc0000000 | |||
| 270 | CONFIG_PHYSICAL_START=0x00000000 | 281 | CONFIG_PHYSICAL_START=0x00000000 |
| 271 | CONFIG_PHYSICAL_ALIGN=0x10000000 | 282 | CONFIG_PHYSICAL_ALIGN=0x10000000 |
| 272 | CONFIG_TASK_SIZE=0xc0000000 | 283 | CONFIG_TASK_SIZE=0xc0000000 |
| 273 | |||
| 274 | # | ||
| 275 | # Networking | ||
| 276 | # | ||
| 277 | CONFIG_NET=y | 284 | CONFIG_NET=y |
| 278 | 285 | ||
| 279 | # | 286 | # |
| @@ -399,6 +406,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | |||
| 399 | CONFIG_STANDALONE=y | 406 | CONFIG_STANDALONE=y |
| 400 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 407 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 401 | CONFIG_FW_LOADER=y | 408 | CONFIG_FW_LOADER=y |
| 409 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
| 410 | CONFIG_EXTRA_FIRMWARE="" | ||
| 402 | # CONFIG_DEBUG_DRIVER is not set | 411 | # CONFIG_DEBUG_DRIVER is not set |
| 403 | # CONFIG_DEBUG_DEVRES is not set | 412 | # CONFIG_DEBUG_DEVRES is not set |
| 404 | # CONFIG_SYS_HYPERVISOR is not set | 413 | # CONFIG_SYS_HYPERVISOR is not set |
| @@ -425,12 +434,14 @@ CONFIG_BLK_DEV_RAM_SIZE=131072 | |||
| 425 | # CONFIG_BLK_DEV_XIP is not set | 434 | # CONFIG_BLK_DEV_XIP is not set |
| 426 | # CONFIG_CDROM_PKTCDVD is not set | 435 | # CONFIG_CDROM_PKTCDVD is not set |
| 427 | # CONFIG_ATA_OVER_ETH is not set | 436 | # CONFIG_ATA_OVER_ETH is not set |
| 437 | # CONFIG_BLK_DEV_HD is not set | ||
| 428 | CONFIG_MISC_DEVICES=y | 438 | CONFIG_MISC_DEVICES=y |
| 429 | # CONFIG_PHANTOM is not set | 439 | # CONFIG_PHANTOM is not set |
| 430 | # CONFIG_EEPROM_93CX6 is not set | 440 | # CONFIG_EEPROM_93CX6 is not set |
| 431 | # CONFIG_SGI_IOC4 is not set | 441 | # CONFIG_SGI_IOC4 is not set |
| 432 | # CONFIG_TIFM_CORE is not set | 442 | # CONFIG_TIFM_CORE is not set |
| 433 | # CONFIG_ENCLOSURE_SERVICES is not set | 443 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 444 | # CONFIG_HP_ILO is not set | ||
| 434 | CONFIG_HAVE_IDE=y | 445 | CONFIG_HAVE_IDE=y |
| 435 | # CONFIG_IDE is not set | 446 | # CONFIG_IDE is not set |
| 436 | 447 | ||
| @@ -510,6 +521,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 510 | # CONFIG_SCSI_NSP32 is not set | 521 | # CONFIG_SCSI_NSP32 is not set |
| 511 | # CONFIG_SCSI_DEBUG is not set | 522 | # CONFIG_SCSI_DEBUG is not set |
| 512 | # CONFIG_SCSI_SRP is not set | 523 | # CONFIG_SCSI_SRP is not set |
| 524 | # CONFIG_SCSI_DH is not set | ||
| 513 | CONFIG_ATA=y | 525 | CONFIG_ATA=y |
| 514 | # CONFIG_ATA_NONSTANDARD is not set | 526 | # CONFIG_ATA_NONSTANDARD is not set |
| 515 | CONFIG_SATA_PMP=y | 527 | CONFIG_SATA_PMP=y |
| @@ -577,12 +589,15 @@ CONFIG_PATA_ALI=y | |||
| 577 | # | 589 | # |
| 578 | # IEEE 1394 (FireWire) support | 590 | # IEEE 1394 (FireWire) support |
| 579 | # | 591 | # |
| 592 | |||
| 593 | # | ||
| 594 | # Enable only one of the two stacks, unless you know what you are doing | ||
| 595 | # | ||
| 580 | # CONFIG_FIREWIRE is not set | 596 | # CONFIG_FIREWIRE is not set |
| 581 | # CONFIG_IEEE1394 is not set | 597 | # CONFIG_IEEE1394 is not set |
| 582 | # CONFIG_I2O is not set | 598 | # CONFIG_I2O is not set |
| 583 | # CONFIG_MACINTOSH_DRIVERS is not set | 599 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 584 | CONFIG_NETDEVICES=y | 600 | CONFIG_NETDEVICES=y |
| 585 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 586 | CONFIG_DUMMY=y | 601 | CONFIG_DUMMY=y |
| 587 | # CONFIG_BONDING is not set | 602 | # CONFIG_BONDING is not set |
| 588 | # CONFIG_MACVLAN is not set | 603 | # CONFIG_MACVLAN is not set |
| @@ -626,7 +641,6 @@ CONFIG_NETDEV_1000=y | |||
| 626 | # CONFIG_DL2K is not set | 641 | # CONFIG_DL2K is not set |
| 627 | # CONFIG_E1000 is not set | 642 | # CONFIG_E1000 is not set |
| 628 | # CONFIG_E1000E is not set | 643 | # CONFIG_E1000E is not set |
| 629 | # CONFIG_E1000E_ENABLED is not set | ||
| 630 | # CONFIG_IP1000 is not set | 644 | # CONFIG_IP1000 is not set |
| 631 | # CONFIG_IGB is not set | 645 | # CONFIG_IGB is not set |
| 632 | # CONFIG_NS83820 is not set | 646 | # CONFIG_NS83820 is not set |
| @@ -640,9 +654,9 @@ CONFIG_NETDEV_1000=y | |||
| 640 | # CONFIG_TIGON3 is not set | 654 | # CONFIG_TIGON3 is not set |
| 641 | # CONFIG_BNX2 is not set | 655 | # CONFIG_BNX2 is not set |
| 642 | CONFIG_GIANFAR=y | 656 | CONFIG_GIANFAR=y |
| 643 | CONFIG_GFAR_NAPI=y | ||
| 644 | # CONFIG_QLA3XXX is not set | 657 | # CONFIG_QLA3XXX is not set |
| 645 | # CONFIG_ATL1 is not set | 658 | # CONFIG_ATL1 is not set |
| 659 | # CONFIG_ATL1E is not set | ||
| 646 | CONFIG_NETDEV_10000=y | 660 | CONFIG_NETDEV_10000=y |
| 647 | # CONFIG_CHELSIO_T1 is not set | 661 | # CONFIG_CHELSIO_T1 is not set |
| 648 | # CONFIG_CHELSIO_T3 is not set | 662 | # CONFIG_CHELSIO_T3 is not set |
| @@ -719,12 +733,14 @@ CONFIG_SERIO_SERPORT=y | |||
| 719 | # CONFIG_SERIO_PCIPS2 is not set | 733 | # CONFIG_SERIO_PCIPS2 is not set |
| 720 | CONFIG_SERIO_LIBPS2=y | 734 | CONFIG_SERIO_LIBPS2=y |
| 721 | # CONFIG_SERIO_RAW is not set | 735 | # CONFIG_SERIO_RAW is not set |
| 736 | # CONFIG_SERIO_XILINX_XPS_PS2 is not set | ||
| 722 | # CONFIG_GAMEPORT is not set | 737 | # CONFIG_GAMEPORT is not set |
| 723 | 738 | ||
| 724 | # | 739 | # |
| 725 | # Character devices | 740 | # Character devices |
| 726 | # | 741 | # |
| 727 | CONFIG_VT=y | 742 | CONFIG_VT=y |
| 743 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 728 | CONFIG_VT_CONSOLE=y | 744 | CONFIG_VT_CONSOLE=y |
| 729 | CONFIG_HW_CONSOLE=y | 745 | CONFIG_HW_CONSOLE=y |
| 730 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 746 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| @@ -758,7 +774,7 @@ CONFIG_UNIX98_PTYS=y | |||
| 758 | CONFIG_LEGACY_PTYS=y | 774 | CONFIG_LEGACY_PTYS=y |
| 759 | CONFIG_LEGACY_PTY_COUNT=256 | 775 | CONFIG_LEGACY_PTY_COUNT=256 |
| 760 | # CONFIG_IPMI_HANDLER is not set | 776 | # CONFIG_IPMI_HANDLER is not set |
| 761 | # CONFIG_HW_RANDOM is not set | 777 | CONFIG_HW_RANDOM=y |
| 762 | CONFIG_NVRAM=y | 778 | CONFIG_NVRAM=y |
| 763 | # CONFIG_R3964 is not set | 779 | # CONFIG_R3964 is not set |
| 764 | # CONFIG_APPLICOM is not set | 780 | # CONFIG_APPLICOM is not set |
| @@ -768,43 +784,64 @@ CONFIG_DEVPORT=y | |||
| 768 | CONFIG_I2C=y | 784 | CONFIG_I2C=y |
| 769 | CONFIG_I2C_BOARDINFO=y | 785 | CONFIG_I2C_BOARDINFO=y |
| 770 | # CONFIG_I2C_CHARDEV is not set | 786 | # CONFIG_I2C_CHARDEV is not set |
| 787 | CONFIG_I2C_HELPER_AUTO=y | ||
| 771 | 788 | ||
| 772 | # | 789 | # |
| 773 | # I2C Hardware Bus support | 790 | # I2C Hardware Bus support |
| 774 | # | 791 | # |
| 792 | |||
| 793 | # | ||
| 794 | # PC SMBus host controller drivers | ||
| 795 | # | ||
| 775 | # CONFIG_I2C_ALI1535 is not set | 796 | # CONFIG_I2C_ALI1535 is not set |
| 776 | # CONFIG_I2C_ALI1563 is not set | 797 | # CONFIG_I2C_ALI1563 is not set |
| 777 | # CONFIG_I2C_ALI15X3 is not set | 798 | # CONFIG_I2C_ALI15X3 is not set |
| 778 | # CONFIG_I2C_AMD756 is not set | 799 | # CONFIG_I2C_AMD756 is not set |
| 779 | # CONFIG_I2C_AMD8111 is not set | 800 | # CONFIG_I2C_AMD8111 is not set |
| 780 | # CONFIG_I2C_I801 is not set | 801 | # CONFIG_I2C_I801 is not set |
| 781 | # CONFIG_I2C_I810 is not set | 802 | # CONFIG_I2C_ISCH is not set |
| 782 | # CONFIG_I2C_PIIX4 is not set | 803 | # CONFIG_I2C_PIIX4 is not set |
| 783 | CONFIG_I2C_MPC=y | ||
| 784 | # CONFIG_I2C_NFORCE2 is not set | 804 | # CONFIG_I2C_NFORCE2 is not set |
| 785 | # CONFIG_I2C_OCORES is not set | ||
| 786 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 787 | # CONFIG_I2C_PROSAVAGE is not set | ||
| 788 | # CONFIG_I2C_SAVAGE4 is not set | ||
| 789 | # CONFIG_I2C_SIMTEC is not set | ||
| 790 | # CONFIG_I2C_SIS5595 is not set | 805 | # CONFIG_I2C_SIS5595 is not set |
| 791 | # CONFIG_I2C_SIS630 is not set | 806 | # CONFIG_I2C_SIS630 is not set |
| 792 | # CONFIG_I2C_SIS96X is not set | 807 | # CONFIG_I2C_SIS96X is not set |
| 793 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 794 | # CONFIG_I2C_STUB is not set | ||
| 795 | # CONFIG_I2C_TINY_USB is not set | ||
| 796 | # CONFIG_I2C_VIA is not set | 808 | # CONFIG_I2C_VIA is not set |
| 797 | # CONFIG_I2C_VIAPRO is not set | 809 | # CONFIG_I2C_VIAPRO is not set |
| 810 | |||
| 811 | # | ||
| 812 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 813 | # | ||
| 814 | CONFIG_I2C_MPC=y | ||
| 815 | # CONFIG_I2C_OCORES is not set | ||
| 816 | # CONFIG_I2C_SIMTEC is not set | ||
| 817 | |||
| 818 | # | ||
| 819 | # External I2C/SMBus adapter drivers | ||
| 820 | # | ||
| 821 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 822 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 823 | # CONFIG_I2C_TINY_USB is not set | ||
| 824 | |||
| 825 | # | ||
| 826 | # Graphics adapter I2C/DDC channel drivers | ||
| 827 | # | ||
| 798 | # CONFIG_I2C_VOODOO3 is not set | 828 | # CONFIG_I2C_VOODOO3 is not set |
| 829 | |||
| 830 | # | ||
| 831 | # Other I2C/SMBus bus drivers | ||
| 832 | # | ||
| 799 | # CONFIG_I2C_PCA_PLATFORM is not set | 833 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 834 | # CONFIG_I2C_STUB is not set | ||
| 800 | 835 | ||
| 801 | # | 836 | # |
| 802 | # Miscellaneous I2C Chip support | 837 | # Miscellaneous I2C Chip support |
| 803 | # | 838 | # |
| 804 | # CONFIG_DS1682 is not set | 839 | # CONFIG_DS1682 is not set |
| 840 | # CONFIG_AT24 is not set | ||
| 805 | CONFIG_SENSORS_EEPROM=y | 841 | CONFIG_SENSORS_EEPROM=y |
| 806 | # CONFIG_SENSORS_PCF8574 is not set | 842 | # CONFIG_SENSORS_PCF8574 is not set |
| 807 | # CONFIG_PCF8575 is not set | 843 | # CONFIG_PCF8575 is not set |
| 844 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 808 | # CONFIG_SENSORS_PCF8591 is not set | 845 | # CONFIG_SENSORS_PCF8591 is not set |
| 809 | # CONFIG_SENSORS_MAX6875 is not set | 846 | # CONFIG_SENSORS_MAX6875 is not set |
| 810 | # CONFIG_SENSORS_TSL2550 is not set | 847 | # CONFIG_SENSORS_TSL2550 is not set |
| @@ -813,10 +850,13 @@ CONFIG_SENSORS_EEPROM=y | |||
| 813 | # CONFIG_I2C_DEBUG_BUS is not set | 850 | # CONFIG_I2C_DEBUG_BUS is not set |
| 814 | # CONFIG_I2C_DEBUG_CHIP is not set | 851 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 815 | # CONFIG_SPI is not set | 852 | # CONFIG_SPI is not set |
| 853 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 854 | # CONFIG_GPIOLIB is not set | ||
| 816 | # CONFIG_W1 is not set | 855 | # CONFIG_W1 is not set |
| 817 | # CONFIG_POWER_SUPPLY is not set | 856 | # CONFIG_POWER_SUPPLY is not set |
| 818 | # CONFIG_HWMON is not set | 857 | # CONFIG_HWMON is not set |
| 819 | # CONFIG_THERMAL is not set | 858 | # CONFIG_THERMAL is not set |
| 859 | # CONFIG_THERMAL_HWMON is not set | ||
| 820 | # CONFIG_WATCHDOG is not set | 860 | # CONFIG_WATCHDOG is not set |
| 821 | 861 | ||
| 822 | # | 862 | # |
| @@ -828,8 +868,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 828 | # | 868 | # |
| 829 | # Multifunction device drivers | 869 | # Multifunction device drivers |
| 830 | # | 870 | # |
| 871 | # CONFIG_MFD_CORE is not set | ||
| 831 | # CONFIG_MFD_SM501 is not set | 872 | # CONFIG_MFD_SM501 is not set |
| 832 | # CONFIG_HTC_PASIC3 is not set | 873 | # CONFIG_HTC_PASIC3 is not set |
| 874 | # CONFIG_MFD_TMIO is not set | ||
| 833 | 875 | ||
| 834 | # | 876 | # |
| 835 | # Multimedia devices | 877 | # Multimedia devices |
| @@ -871,6 +913,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
| 871 | # CONFIG_DVB_TTUSB_BUDGET is not set | 913 | # CONFIG_DVB_TTUSB_BUDGET is not set |
| 872 | # CONFIG_DVB_TTUSB_DEC is not set | 914 | # CONFIG_DVB_TTUSB_DEC is not set |
| 873 | # CONFIG_DVB_CINERGYT2 is not set | 915 | # CONFIG_DVB_CINERGYT2 is not set |
| 916 | # CONFIG_DVB_SIANO_SMS1XXX is not set | ||
| 874 | 917 | ||
| 875 | # | 918 | # |
| 876 | # Supported FlexCopII (B2C2) Adapters | 919 | # Supported FlexCopII (B2C2) Adapters |
| @@ -917,6 +960,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
| 917 | # CONFIG_DVB_SP887X is not set | 960 | # CONFIG_DVB_SP887X is not set |
| 918 | # CONFIG_DVB_CX22700 is not set | 961 | # CONFIG_DVB_CX22700 is not set |
| 919 | # CONFIG_DVB_CX22702 is not set | 962 | # CONFIG_DVB_CX22702 is not set |
| 963 | # CONFIG_DVB_DRX397XD is not set | ||
| 920 | # CONFIG_DVB_L64781 is not set | 964 | # CONFIG_DVB_L64781 is not set |
| 921 | # CONFIG_DVB_TDA1004X is not set | 965 | # CONFIG_DVB_TDA1004X is not set |
| 922 | # CONFIG_DVB_NXT6000 is not set | 966 | # CONFIG_DVB_NXT6000 is not set |
| @@ -984,15 +1028,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
| 984 | CONFIG_VGA_CONSOLE=y | 1028 | CONFIG_VGA_CONSOLE=y |
| 985 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set | 1029 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set |
| 986 | CONFIG_DUMMY_CONSOLE=y | 1030 | CONFIG_DUMMY_CONSOLE=y |
| 987 | |||
| 988 | # | ||
| 989 | # Sound | ||
| 990 | # | ||
| 991 | CONFIG_SOUND=y | 1031 | CONFIG_SOUND=y |
| 992 | |||
| 993 | # | ||
| 994 | # Advanced Linux Sound Architecture | ||
| 995 | # | ||
| 996 | CONFIG_SND=y | 1032 | CONFIG_SND=y |
| 997 | CONFIG_SND_TIMER=y | 1033 | CONFIG_SND_TIMER=y |
| 998 | CONFIG_SND_PCM=y | 1034 | CONFIG_SND_PCM=y |
| @@ -1006,19 +1042,15 @@ CONFIG_SND_PCM_OSS_PLUGINS=y | |||
| 1006 | CONFIG_SND_VERBOSE_PROCFS=y | 1042 | CONFIG_SND_VERBOSE_PROCFS=y |
| 1007 | # CONFIG_SND_VERBOSE_PRINTK is not set | 1043 | # CONFIG_SND_VERBOSE_PRINTK is not set |
| 1008 | # CONFIG_SND_DEBUG is not set | 1044 | # CONFIG_SND_DEBUG is not set |
| 1009 | 1045 | CONFIG_SND_VMASTER=y | |
| 1010 | # | ||
| 1011 | # Generic devices | ||
| 1012 | # | ||
| 1013 | CONFIG_SND_AC97_CODEC=y | 1046 | CONFIG_SND_AC97_CODEC=y |
| 1047 | CONFIG_SND_DRIVERS=y | ||
| 1014 | # CONFIG_SND_DUMMY is not set | 1048 | # CONFIG_SND_DUMMY is not set |
| 1015 | # CONFIG_SND_MTPAV is not set | 1049 | # CONFIG_SND_MTPAV is not set |
| 1016 | # CONFIG_SND_SERIAL_U16550 is not set | 1050 | # CONFIG_SND_SERIAL_U16550 is not set |
| 1017 | # CONFIG_SND_MPU401 is not set | 1051 | # CONFIG_SND_MPU401 is not set |
| 1018 | 1052 | # CONFIG_SND_AC97_POWER_SAVE is not set | |
| 1019 | # | 1053 | CONFIG_SND_PCI=y |
| 1020 | # PCI devices | ||
| 1021 | # | ||
| 1022 | # CONFIG_SND_AD1889 is not set | 1054 | # CONFIG_SND_AD1889 is not set |
| 1023 | # CONFIG_SND_ALS300 is not set | 1055 | # CONFIG_SND_ALS300 is not set |
| 1024 | # CONFIG_SND_ALS4000 is not set | 1056 | # CONFIG_SND_ALS4000 is not set |
| @@ -1080,39 +1112,12 @@ CONFIG_SND_INTEL8X0=y | |||
| 1080 | # CONFIG_SND_VIRTUOSO is not set | 1112 | # CONFIG_SND_VIRTUOSO is not set |
| 1081 | # CONFIG_SND_VX222 is not set | 1113 | # CONFIG_SND_VX222 is not set |
| 1082 | # CONFIG_SND_YMFPCI is not set | 1114 | # CONFIG_SND_YMFPCI is not set |
| 1083 | # CONFIG_SND_AC97_POWER_SAVE is not set | 1115 | CONFIG_SND_PPC=y |
| 1084 | 1116 | CONFIG_SND_USB=y | |
| 1085 | # | ||
| 1086 | # ALSA PowerMac devices | ||
| 1087 | # | ||
| 1088 | |||
| 1089 | # | ||
| 1090 | # ALSA PowerPC devices | ||
| 1091 | # | ||
| 1092 | |||
| 1093 | # | ||
| 1094 | # USB devices | ||
| 1095 | # | ||
| 1096 | # CONFIG_SND_USB_AUDIO is not set | 1117 | # CONFIG_SND_USB_AUDIO is not set |
| 1097 | # CONFIG_SND_USB_USX2Y is not set | 1118 | # CONFIG_SND_USB_USX2Y is not set |
| 1098 | # CONFIG_SND_USB_CAIAQ is not set | 1119 | # CONFIG_SND_USB_CAIAQ is not set |
| 1099 | |||
| 1100 | # | ||
| 1101 | # System on Chip audio support | ||
| 1102 | # | ||
| 1103 | # CONFIG_SND_SOC is not set | 1120 | # CONFIG_SND_SOC is not set |
| 1104 | |||
| 1105 | # | ||
| 1106 | # ALSA SoC audio for Freescale SOCs | ||
| 1107 | # | ||
| 1108 | |||
| 1109 | # | ||
| 1110 | # SoC Audio for the Texas Instruments OMAP | ||
| 1111 | # | ||
| 1112 | |||
| 1113 | # | ||
| 1114 | # Open Sound System | ||
| 1115 | # | ||
| 1116 | # CONFIG_SOUND_PRIME is not set | 1121 | # CONFIG_SOUND_PRIME is not set |
| 1117 | CONFIG_AC97_BUS=y | 1122 | CONFIG_AC97_BUS=y |
| 1118 | CONFIG_HID_SUPPORT=y | 1123 | CONFIG_HID_SUPPORT=y |
| @@ -1144,6 +1149,7 @@ CONFIG_USB_DEVICE_CLASS=y | |||
| 1144 | # CONFIG_USB_OTG is not set | 1149 | # CONFIG_USB_OTG is not set |
| 1145 | # CONFIG_USB_OTG_WHITELIST is not set | 1150 | # CONFIG_USB_OTG_WHITELIST is not set |
| 1146 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 1151 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
| 1152 | CONFIG_USB_MON=y | ||
| 1147 | 1153 | ||
| 1148 | # | 1154 | # |
| 1149 | # USB Host Controller Drivers | 1155 | # USB Host Controller Drivers |
| @@ -1195,6 +1201,7 @@ CONFIG_USB_STORAGE=y | |||
| 1195 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1201 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1196 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1202 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
| 1197 | # CONFIG_USB_STORAGE_KARMA is not set | 1203 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1204 | # CONFIG_USB_STORAGE_SIERRA is not set | ||
| 1198 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | 1205 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
| 1199 | # CONFIG_USB_LIBUSUAL is not set | 1206 | # CONFIG_USB_LIBUSUAL is not set |
| 1200 | 1207 | ||
| @@ -1203,7 +1210,6 @@ CONFIG_USB_STORAGE=y | |||
| 1203 | # | 1210 | # |
| 1204 | # CONFIG_USB_MDC800 is not set | 1211 | # CONFIG_USB_MDC800 is not set |
| 1205 | # CONFIG_USB_MICROTEK is not set | 1212 | # CONFIG_USB_MICROTEK is not set |
| 1206 | CONFIG_USB_MON=y | ||
| 1207 | 1213 | ||
| 1208 | # | 1214 | # |
| 1209 | # USB port drivers | 1215 | # USB port drivers |
| @@ -1216,7 +1222,6 @@ CONFIG_USB_MON=y | |||
| 1216 | # CONFIG_USB_EMI62 is not set | 1222 | # CONFIG_USB_EMI62 is not set |
| 1217 | # CONFIG_USB_EMI26 is not set | 1223 | # CONFIG_USB_EMI26 is not set |
| 1218 | # CONFIG_USB_ADUTUX is not set | 1224 | # CONFIG_USB_ADUTUX is not set |
| 1219 | # CONFIG_USB_AUERSWALD is not set | ||
| 1220 | # CONFIG_USB_RIO500 is not set | 1225 | # CONFIG_USB_RIO500 is not set |
| 1221 | # CONFIG_USB_LEGOTOWER is not set | 1226 | # CONFIG_USB_LEGOTOWER is not set |
| 1222 | # CONFIG_USB_LCD is not set | 1227 | # CONFIG_USB_LCD is not set |
| @@ -1270,6 +1275,7 @@ CONFIG_RTC_INTF_DEV=y | |||
| 1270 | # CONFIG_RTC_DRV_PCF8583 is not set | 1275 | # CONFIG_RTC_DRV_PCF8583 is not set |
| 1271 | # CONFIG_RTC_DRV_M41T80 is not set | 1276 | # CONFIG_RTC_DRV_M41T80 is not set |
| 1272 | # CONFIG_RTC_DRV_S35390A is not set | 1277 | # CONFIG_RTC_DRV_S35390A is not set |
| 1278 | # CONFIG_RTC_DRV_FM3130 is not set | ||
| 1273 | 1279 | ||
| 1274 | # | 1280 | # |
| 1275 | # SPI RTC drivers | 1281 | # SPI RTC drivers |
| @@ -1368,6 +1374,7 @@ CONFIG_EFS_FS=m | |||
| 1368 | CONFIG_CRAMFS=y | 1374 | CONFIG_CRAMFS=y |
| 1369 | CONFIG_VXFS_FS=m | 1375 | CONFIG_VXFS_FS=m |
| 1370 | # CONFIG_MINIX_FS is not set | 1376 | # CONFIG_MINIX_FS is not set |
| 1377 | # CONFIG_OMFS_FS is not set | ||
| 1371 | CONFIG_HPFS_FS=m | 1378 | CONFIG_HPFS_FS=m |
| 1372 | CONFIG_QNX4FS_FS=m | 1379 | CONFIG_QNX4FS_FS=m |
| 1373 | # CONFIG_ROMFS_FS is not set | 1380 | # CONFIG_ROMFS_FS is not set |
| @@ -1380,17 +1387,16 @@ CONFIG_NFS_FS=y | |||
| 1380 | CONFIG_NFS_V3=y | 1387 | CONFIG_NFS_V3=y |
| 1381 | # CONFIG_NFS_V3_ACL is not set | 1388 | # CONFIG_NFS_V3_ACL is not set |
| 1382 | CONFIG_NFS_V4=y | 1389 | CONFIG_NFS_V4=y |
| 1390 | CONFIG_ROOT_NFS=y | ||
| 1383 | CONFIG_NFSD=y | 1391 | CONFIG_NFSD=y |
| 1384 | # CONFIG_NFSD_V3 is not set | 1392 | # CONFIG_NFSD_V3 is not set |
| 1385 | # CONFIG_NFSD_V4 is not set | 1393 | # CONFIG_NFSD_V4 is not set |
| 1386 | CONFIG_ROOT_NFS=y | ||
| 1387 | CONFIG_LOCKD=y | 1394 | CONFIG_LOCKD=y |
| 1388 | CONFIG_LOCKD_V4=y | 1395 | CONFIG_LOCKD_V4=y |
| 1389 | CONFIG_EXPORTFS=y | 1396 | CONFIG_EXPORTFS=y |
| 1390 | CONFIG_NFS_COMMON=y | 1397 | CONFIG_NFS_COMMON=y |
| 1391 | CONFIG_SUNRPC=y | 1398 | CONFIG_SUNRPC=y |
| 1392 | CONFIG_SUNRPC_GSS=y | 1399 | CONFIG_SUNRPC_GSS=y |
| 1393 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 1394 | CONFIG_RPCSEC_GSS_KRB5=y | 1400 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1395 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1401 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1396 | # CONFIG_SMB_FS is not set | 1402 | # CONFIG_SMB_FS is not set |
| @@ -1469,6 +1475,7 @@ CONFIG_BITREVERSE=y | |||
| 1469 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1475 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 1470 | # CONFIG_CRC_CCITT is not set | 1476 | # CONFIG_CRC_CCITT is not set |
| 1471 | # CONFIG_CRC16 is not set | 1477 | # CONFIG_CRC16 is not set |
| 1478 | CONFIG_CRC_T10DIF=y | ||
| 1472 | CONFIG_CRC_ITU_T=m | 1479 | CONFIG_CRC_ITU_T=m |
| 1473 | CONFIG_CRC32=y | 1480 | CONFIG_CRC32=y |
| 1474 | # CONFIG_CRC7 is not set | 1481 | # CONFIG_CRC7 is not set |
| @@ -1494,6 +1501,8 @@ CONFIG_FRAME_WARN=1024 | |||
| 1494 | CONFIG_DEBUG_KERNEL=y | 1501 | CONFIG_DEBUG_KERNEL=y |
| 1495 | # CONFIG_DEBUG_SHIRQ is not set | 1502 | # CONFIG_DEBUG_SHIRQ is not set |
| 1496 | CONFIG_DETECT_SOFTLOCKUP=y | 1503 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1504 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 1505 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 1497 | CONFIG_SCHED_DEBUG=y | 1506 | CONFIG_SCHED_DEBUG=y |
| 1498 | # CONFIG_SCHEDSTATS is not set | 1507 | # CONFIG_SCHEDSTATS is not set |
| 1499 | # CONFIG_TIMER_STATS is not set | 1508 | # CONFIG_TIMER_STATS is not set |
| @@ -1512,17 +1521,29 @@ CONFIG_SCHED_DEBUG=y | |||
| 1512 | CONFIG_DEBUG_INFO=y | 1521 | CONFIG_DEBUG_INFO=y |
| 1513 | # CONFIG_DEBUG_VM is not set | 1522 | # CONFIG_DEBUG_VM is not set |
| 1514 | # CONFIG_DEBUG_WRITECOUNT is not set | 1523 | # CONFIG_DEBUG_WRITECOUNT is not set |
| 1524 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 1515 | # CONFIG_DEBUG_LIST is not set | 1525 | # CONFIG_DEBUG_LIST is not set |
| 1516 | # CONFIG_DEBUG_SG is not set | 1526 | # CONFIG_DEBUG_SG is not set |
| 1517 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1527 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 1518 | # CONFIG_RCU_TORTURE_TEST is not set | 1528 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1519 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1529 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 1520 | # CONFIG_FAULT_INJECTION is not set | 1530 | # CONFIG_FAULT_INJECTION is not set |
| 1531 | # CONFIG_LATENCYTOP is not set | ||
| 1532 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1533 | CONFIG_HAVE_FTRACE=y | ||
| 1534 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1535 | # CONFIG_FTRACE is not set | ||
| 1536 | # CONFIG_SCHED_TRACER is not set | ||
| 1537 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1521 | # CONFIG_SAMPLES is not set | 1538 | # CONFIG_SAMPLES is not set |
| 1539 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1540 | # CONFIG_KGDB is not set | ||
| 1522 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1541 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
| 1523 | # CONFIG_DEBUG_STACK_USAGE is not set | 1542 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1524 | # CONFIG_DEBUG_PAGEALLOC is not set | 1543 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1525 | # CONFIG_DEBUGGER is not set | 1544 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
| 1545 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
| 1546 | # CONFIG_XMON is not set | ||
| 1526 | # CONFIG_IRQSTACKS is not set | 1547 | # CONFIG_IRQSTACKS is not set |
| 1527 | # CONFIG_BDI_SWITCH is not set | 1548 | # CONFIG_BDI_SWITCH is not set |
| 1528 | # CONFIG_PPC_EARLY_DEBUG is not set | 1549 | # CONFIG_PPC_EARLY_DEBUG is not set |
| @@ -1539,13 +1560,14 @@ CONFIG_CRYPTO=y | |||
| 1539 | # Crypto core or helper | 1560 | # Crypto core or helper |
| 1540 | # | 1561 | # |
| 1541 | CONFIG_CRYPTO_ALGAPI=y | 1562 | CONFIG_CRYPTO_ALGAPI=y |
| 1563 | CONFIG_CRYPTO_AEAD=y | ||
| 1542 | CONFIG_CRYPTO_BLKCIPHER=y | 1564 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1543 | CONFIG_CRYPTO_HASH=y | 1565 | CONFIG_CRYPTO_HASH=y |
| 1544 | CONFIG_CRYPTO_MANAGER=y | 1566 | CONFIG_CRYPTO_MANAGER=y |
| 1545 | # CONFIG_CRYPTO_GF128MUL is not set | 1567 | # CONFIG_CRYPTO_GF128MUL is not set |
| 1546 | # CONFIG_CRYPTO_NULL is not set | 1568 | # CONFIG_CRYPTO_NULL is not set |
| 1547 | # CONFIG_CRYPTO_CRYPTD is not set | 1569 | # CONFIG_CRYPTO_CRYPTD is not set |
| 1548 | # CONFIG_CRYPTO_AUTHENC is not set | 1570 | CONFIG_CRYPTO_AUTHENC=y |
| 1549 | # CONFIG_CRYPTO_TEST is not set | 1571 | # CONFIG_CRYPTO_TEST is not set |
| 1550 | 1572 | ||
| 1551 | # | 1573 | # |
| @@ -1579,6 +1601,10 @@ CONFIG_CRYPTO_HMAC=y | |||
| 1579 | # CONFIG_CRYPTO_MD4 is not set | 1601 | # CONFIG_CRYPTO_MD4 is not set |
| 1580 | CONFIG_CRYPTO_MD5=y | 1602 | CONFIG_CRYPTO_MD5=y |
| 1581 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1603 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 1604 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1605 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1606 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1607 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1582 | CONFIG_CRYPTO_SHA1=m | 1608 | CONFIG_CRYPTO_SHA1=m |
| 1583 | # CONFIG_CRYPTO_SHA256 is not set | 1609 | # CONFIG_CRYPTO_SHA256 is not set |
| 1584 | # CONFIG_CRYPTO_SHA512 is not set | 1610 | # CONFIG_CRYPTO_SHA512 is not set |
| @@ -1611,5 +1637,6 @@ CONFIG_CRYPTO_DES=y | |||
| 1611 | # CONFIG_CRYPTO_LZO is not set | 1637 | # CONFIG_CRYPTO_LZO is not set |
| 1612 | CONFIG_CRYPTO_HW=y | 1638 | CONFIG_CRYPTO_HW=y |
| 1613 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1639 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1640 | CONFIG_CRYPTO_DEV_TALITOS=y | ||
| 1614 | # CONFIG_PPC_CLOCK is not set | 1641 | # CONFIG_PPC_CLOCK is not set |
| 1615 | # CONFIG_VIRTUALIZATION is not set | 1642 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig b/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig index b09f0032a10b..97f3c4fe440b 100644 --- a/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig +++ b/arch/powerpc/configs/85xx/mpc85xx_cds_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.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Mon Jun 9 08:52:36 2008 | 4 | # Thu Aug 21 00:52:34 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -15,6 +15,7 @@ CONFIG_PPC_85xx=y | |||
| 15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
| 16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
| 17 | CONFIG_E500=y | 17 | CONFIG_E500=y |
| 18 | # CONFIG_PPC_E500MC is not set | ||
| 18 | CONFIG_BOOKE=y | 19 | CONFIG_BOOKE=y |
| 19 | CONFIG_FSL_BOOKE=y | 20 | CONFIG_FSL_BOOKE=y |
| 20 | CONFIG_FSL_EMB_PERFMON=y | 21 | CONFIG_FSL_EMB_PERFMON=y |
| @@ -33,6 +34,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 35 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | 36 | CONFIG_STACKTRACE_SUPPORT=y |
| 37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | 38 | CONFIG_LOCKDEP_SUPPORT=y |
| 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 38 | CONFIG_ARCH_HAS_ILOG2_U32=y | 40 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| @@ -89,7 +91,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 89 | CONFIG_SYSCTL=y | 91 | CONFIG_SYSCTL=y |
| 90 | CONFIG_EMBEDDED=y | 92 | CONFIG_EMBEDDED=y |
| 91 | CONFIG_SYSCTL_SYSCALL=y | 93 | CONFIG_SYSCTL_SYSCALL=y |
| 92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 93 | CONFIG_KALLSYMS=y | 94 | CONFIG_KALLSYMS=y |
| 94 | # CONFIG_KALLSYMS_ALL is not set | 95 | # CONFIG_KALLSYMS_ALL is not set |
| 95 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 96 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -114,10 +115,16 @@ CONFIG_SLUB=y | |||
| 114 | # CONFIG_PROFILING is not set | 115 | # CONFIG_PROFILING is not set |
| 115 | # CONFIG_MARKERS is not set | 116 | # CONFIG_MARKERS is not set |
| 116 | CONFIG_HAVE_OPROFILE=y | 117 | CONFIG_HAVE_OPROFILE=y |
| 118 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 119 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 117 | CONFIG_HAVE_KPROBES=y | 120 | CONFIG_HAVE_KPROBES=y |
| 118 | CONFIG_HAVE_KRETPROBES=y | 121 | CONFIG_HAVE_KRETPROBES=y |
| 122 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 119 | # CONFIG_HAVE_DMA_ATTRS is not set | 123 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 124 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 125 | # CONFIG_HAVE_CLK is not set | ||
| 120 | CONFIG_PROC_PAGE_MONITOR=y | 126 | CONFIG_PROC_PAGE_MONITOR=y |
| 127 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 121 | CONFIG_SLABINFO=y | 128 | CONFIG_SLABINFO=y |
| 122 | CONFIG_RT_MUTEXES=y | 129 | CONFIG_RT_MUTEXES=y |
| 123 | # CONFIG_TINY_SHMEM is not set | 130 | # CONFIG_TINY_SHMEM is not set |
| @@ -128,6 +135,7 @@ CONFIG_BLOCK=y | |||
| 128 | # CONFIG_BLK_DEV_IO_TRACE is not set | 135 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 129 | # CONFIG_LSF is not set | 136 | # CONFIG_LSF is not set |
| 130 | # CONFIG_BLK_DEV_BSG is not set | 137 | # CONFIG_BLK_DEV_BSG is not set |
| 138 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 131 | 139 | ||
| 132 | # | 140 | # |
| 133 | # IO Schedulers | 141 | # IO Schedulers |
| @@ -146,8 +154,6 @@ CONFIG_CLASSIC_RCU=y | |||
| 146 | # | 154 | # |
| 147 | # Platform support | 155 | # Platform support |
| 148 | # | 156 | # |
| 149 | # CONFIG_PPC_MPC512x is not set | ||
| 150 | # CONFIG_PPC_MPC5121 is not set | ||
| 151 | # CONFIG_PPC_CELL is not set | 157 | # CONFIG_PPC_CELL is not set |
| 152 | # CONFIG_PPC_CELL_NATIVE is not set | 158 | # CONFIG_PPC_CELL_NATIVE is not set |
| 153 | # CONFIG_PQ2ADS is not set | 159 | # CONFIG_PQ2ADS is not set |
| @@ -156,11 +162,13 @@ CONFIG_MPC85xx=y | |||
| 156 | # CONFIG_MPC8560_ADS is not set | 162 | # CONFIG_MPC8560_ADS is not set |
| 157 | CONFIG_MPC85xx_CDS=y | 163 | CONFIG_MPC85xx_CDS=y |
| 158 | # CONFIG_MPC85xx_MDS is not set | 164 | # CONFIG_MPC85xx_MDS is not set |
| 165 | # CONFIG_MPC8536_DS is not set | ||
| 159 | # CONFIG_MPC85xx_DS is not set | 166 | # CONFIG_MPC85xx_DS is not set |
| 160 | # CONFIG_KSI8560 is not set | 167 | # CONFIG_KSI8560 is not set |
| 161 | # CONFIG_STX_GP3 is not set | 168 | # CONFIG_STX_GP3 is not set |
| 162 | # CONFIG_TQM8540 is not set | 169 | # CONFIG_TQM8540 is not set |
| 163 | # CONFIG_TQM8541 is not set | 170 | # CONFIG_TQM8541 is not set |
| 171 | # CONFIG_TQM8548 is not set | ||
| 164 | # CONFIG_TQM8555 is not set | 172 | # CONFIG_TQM8555 is not set |
| 165 | # CONFIG_TQM8560 is not set | 173 | # CONFIG_TQM8560 is not set |
| 166 | # CONFIG_SBC8548 is not set | 174 | # CONFIG_SBC8548 is not set |
| @@ -192,7 +200,7 @@ CONFIG_HZ_250=y | |||
| 192 | # CONFIG_HZ_300 is not set | 200 | # CONFIG_HZ_300 is not set |
| 193 | # CONFIG_HZ_1000 is not set | 201 | # CONFIG_HZ_1000 is not set |
| 194 | CONFIG_HZ=250 | 202 | CONFIG_HZ=250 |
| 195 | # CONFIG_SCHED_HRTICK is not set | 203 | CONFIG_SCHED_HRTICK=y |
| 196 | CONFIG_PREEMPT_NONE=y | 204 | CONFIG_PREEMPT_NONE=y |
| 197 | # CONFIG_PREEMPT_VOLUNTARY is not set | 205 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 198 | # CONFIG_PREEMPT is not set | 206 | # CONFIG_PREEMPT is not set |
| @@ -215,6 +223,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 215 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 223 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 216 | CONFIG_PAGEFLAGS_EXTENDED=y | 224 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 217 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 225 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 226 | CONFIG_MIGRATION=y | ||
| 218 | # CONFIG_RESOURCES_64BIT is not set | 227 | # CONFIG_RESOURCES_64BIT is not set |
| 219 | CONFIG_ZONE_DMA_FLAG=1 | 228 | CONFIG_ZONE_DMA_FLAG=1 |
| 220 | CONFIG_BOUNCE=y | 229 | CONFIG_BOUNCE=y |
| @@ -222,6 +231,7 @@ CONFIG_VIRT_TO_BUS=y | |||
| 222 | CONFIG_FORCE_MAX_ZONEORDER=11 | 231 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 223 | CONFIG_PROC_DEVICETREE=y | 232 | CONFIG_PROC_DEVICETREE=y |
| 224 | # CONFIG_CMDLINE_BOOL is not set | 233 | # CONFIG_CMDLINE_BOOL is not set |
| 234 | CONFIG_EXTRA_TARGETS="" | ||
| 225 | # CONFIG_PM is not set | 235 | # CONFIG_PM is not set |
| 226 | # CONFIG_SECCOMP is not set | 236 | # CONFIG_SECCOMP is not set |
| 227 | CONFIG_ISA_DMA_API=y | 237 | CONFIG_ISA_DMA_API=y |
| @@ -233,6 +243,7 @@ CONFIG_ZONE_DMA=y | |||
| 233 | CONFIG_PPC_INDIRECT_PCI=y | 243 | CONFIG_PPC_INDIRECT_PCI=y |
| 234 | CONFIG_FSL_SOC=y | 244 | CONFIG_FSL_SOC=y |
| 235 | CONFIG_FSL_PCI=y | 245 | CONFIG_FSL_PCI=y |
| 246 | CONFIG_PPC_PCI_CHOICE=y | ||
| 236 | CONFIG_PCI=y | 247 | CONFIG_PCI=y |
| 237 | CONFIG_PCI_DOMAINS=y | 248 | CONFIG_PCI_DOMAINS=y |
| 238 | CONFIG_PCI_SYSCALL=y | 249 | CONFIG_PCI_SYSCALL=y |
| @@ -259,10 +270,6 @@ CONFIG_KERNEL_START=0xc0000000 | |||
| 259 | CONFIG_PHYSICAL_START=0x00000000 | 270 | CONFIG_PHYSICAL_START=0x00000000 |
| 260 | CONFIG_PHYSICAL_ALIGN=0x10000000 | 271 | CONFIG_PHYSICAL_ALIGN=0x10000000 |
| 261 | CONFIG_TASK_SIZE=0xc0000000 | 272 | CONFIG_TASK_SIZE=0xc0000000 |
| 262 | |||
| 263 | # | ||
| 264 | # Networking | ||
| 265 | # | ||
| 266 | CONFIG_NET=y | 273 | CONFIG_NET=y |
| 267 | 274 | ||
| 268 | # | 275 | # |
| @@ -379,20 +386,22 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
| 379 | # CONFIG_BLK_DEV_XIP is not set | 386 | # CONFIG_BLK_DEV_XIP is not set |
| 380 | # CONFIG_CDROM_PKTCDVD is not set | 387 | # CONFIG_CDROM_PKTCDVD is not set |
| 381 | # CONFIG_ATA_OVER_ETH is not set | 388 | # CONFIG_ATA_OVER_ETH is not set |
| 389 | # CONFIG_BLK_DEV_HD is not set | ||
| 382 | CONFIG_MISC_DEVICES=y | 390 | CONFIG_MISC_DEVICES=y |
| 383 | # CONFIG_PHANTOM is not set | 391 | # CONFIG_PHANTOM is not set |
| 384 | # CONFIG_EEPROM_93CX6 is not set | 392 | # CONFIG_EEPROM_93CX6 is not set |
| 385 | # CONFIG_SGI_IOC4 is not set | 393 | # CONFIG_SGI_IOC4 is not set |
| 386 | # CONFIG_TIFM_CORE is not set | 394 | # CONFIG_TIFM_CORE is not set |
| 387 | # CONFIG_ENCLOSURE_SERVICES is not set | 395 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 396 | # CONFIG_HP_ILO is not set | ||
| 388 | CONFIG_HAVE_IDE=y | 397 | CONFIG_HAVE_IDE=y |
| 389 | CONFIG_IDE=y | 398 | CONFIG_IDE=y |
| 390 | CONFIG_IDE_MAX_HWIFS=4 | ||
| 391 | CONFIG_BLK_DEV_IDE=y | 399 | CONFIG_BLK_DEV_IDE=y |
| 392 | 400 | ||
| 393 | # | 401 | # |
| 394 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | 402 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
| 395 | # | 403 | # |
| 404 | CONFIG_IDE_TIMINGS=y | ||
| 396 | # CONFIG_BLK_DEV_IDE_SATA is not set | 405 | # CONFIG_BLK_DEV_IDE_SATA is not set |
| 397 | # CONFIG_BLK_DEV_IDEDISK is not set | 406 | # CONFIG_BLK_DEV_IDEDISK is not set |
| 398 | # CONFIG_IDEDISK_MULTI_MODE is not set | 407 | # CONFIG_IDEDISK_MULTI_MODE is not set |
| @@ -405,7 +414,6 @@ CONFIG_IDE_PROC_FS=y | |||
| 405 | # | 414 | # |
| 406 | # IDE chipset support/bugfixes | 415 | # IDE chipset support/bugfixes |
| 407 | # | 416 | # |
| 408 | CONFIG_IDE_GENERIC=y | ||
| 409 | # CONFIG_BLK_DEV_PLATFORM is not set | 417 | # CONFIG_BLK_DEV_PLATFORM is not set |
| 410 | CONFIG_BLK_DEV_IDEDMA_SFF=y | 418 | CONFIG_BLK_DEV_IDEDMA_SFF=y |
| 411 | 419 | ||
| @@ -423,10 +431,8 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
| 423 | # CONFIG_BLK_DEV_AMD74XX is not set | 431 | # CONFIG_BLK_DEV_AMD74XX is not set |
| 424 | # CONFIG_BLK_DEV_CMD64X is not set | 432 | # CONFIG_BLK_DEV_CMD64X is not set |
| 425 | # CONFIG_BLK_DEV_TRIFLEX is not set | 433 | # CONFIG_BLK_DEV_TRIFLEX is not set |
| 426 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
| 427 | # CONFIG_BLK_DEV_CS5520 is not set | 434 | # CONFIG_BLK_DEV_CS5520 is not set |
| 428 | # CONFIG_BLK_DEV_CS5530 is not set | 435 | # CONFIG_BLK_DEV_CS5530 is not set |
| 429 | # CONFIG_BLK_DEV_HPT34X is not set | ||
| 430 | # CONFIG_BLK_DEV_HPT366 is not set | 436 | # CONFIG_BLK_DEV_HPT366 is not set |
| 431 | # CONFIG_BLK_DEV_JMICRON is not set | 437 | # CONFIG_BLK_DEV_JMICRON is not set |
| 432 | # CONFIG_BLK_DEV_SC1200 is not set | 438 | # CONFIG_BLK_DEV_SC1200 is not set |
| @@ -444,8 +450,6 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
| 444 | CONFIG_BLK_DEV_VIA82CXXX=y | 450 | CONFIG_BLK_DEV_VIA82CXXX=y |
| 445 | # CONFIG_BLK_DEV_TC86C001 is not set | 451 | # CONFIG_BLK_DEV_TC86C001 is not set |
| 446 | CONFIG_BLK_DEV_IDEDMA=y | 452 | CONFIG_BLK_DEV_IDEDMA=y |
| 447 | # CONFIG_BLK_DEV_HD_ONLY is not set | ||
| 448 | # CONFIG_BLK_DEV_HD is not set | ||
| 449 | 453 | ||
| 450 | # | 454 | # |
| 451 | # SCSI device support | 455 | # SCSI device support |
| @@ -461,12 +465,15 @@ CONFIG_BLK_DEV_IDEDMA=y | |||
| 461 | # | 465 | # |
| 462 | # IEEE 1394 (FireWire) support | 466 | # IEEE 1394 (FireWire) support |
| 463 | # | 467 | # |
| 468 | |||
| 469 | # | ||
| 470 | # Enable only one of the two stacks, unless you know what you are doing | ||
| 471 | # | ||
| 464 | # CONFIG_FIREWIRE is not set | 472 | # CONFIG_FIREWIRE is not set |
| 465 | # CONFIG_IEEE1394 is not set | 473 | # CONFIG_IEEE1394 is not set |
| 466 | # CONFIG_I2O is not set | 474 | # CONFIG_I2O is not set |
| 467 | # CONFIG_MACINTOSH_DRIVERS is not set | 475 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 468 | CONFIG_NETDEVICES=y | 476 | CONFIG_NETDEVICES=y |
| 469 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 470 | # CONFIG_DUMMY is not set | 477 | # CONFIG_DUMMY is not set |
| 471 | # CONFIG_BONDING is not set | 478 | # CONFIG_BONDING is not set |
| 472 | # CONFIG_MACVLAN is not set | 479 | # CONFIG_MACVLAN is not set |
| @@ -509,10 +516,8 @@ CONFIG_NETDEV_1000=y | |||
| 509 | # CONFIG_ACENIC is not set | 516 | # CONFIG_ACENIC is not set |
| 510 | # CONFIG_DL2K is not set | 517 | # CONFIG_DL2K is not set |
| 511 | CONFIG_E1000=y | 518 | CONFIG_E1000=y |
| 512 | CONFIG_E1000_NAPI=y | ||
| 513 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | 519 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set |
| 514 | # CONFIG_E1000E is not set | 520 | # CONFIG_E1000E is not set |
| 515 | # CONFIG_E1000E_ENABLED is not set | ||
| 516 | # CONFIG_IP1000 is not set | 521 | # CONFIG_IP1000 is not set |
| 517 | # CONFIG_IGB is not set | 522 | # CONFIG_IGB is not set |
| 518 | # CONFIG_NS83820 is not set | 523 | # CONFIG_NS83820 is not set |
| @@ -526,9 +531,9 @@ CONFIG_E1000_NAPI=y | |||
| 526 | # CONFIG_TIGON3 is not set | 531 | # CONFIG_TIGON3 is not set |
| 527 | # CONFIG_BNX2 is not set | 532 | # CONFIG_BNX2 is not set |
| 528 | CONFIG_GIANFAR=y | 533 | CONFIG_GIANFAR=y |
| 529 | CONFIG_GFAR_NAPI=y | ||
| 530 | # CONFIG_QLA3XXX is not set | 534 | # CONFIG_QLA3XXX is not set |
| 531 | # CONFIG_ATL1 is not set | 535 | # CONFIG_ATL1 is not set |
| 536 | # CONFIG_ATL1E is not set | ||
| 532 | CONFIG_NETDEV_10000=y | 537 | CONFIG_NETDEV_10000=y |
| 533 | # CONFIG_CHELSIO_T1 is not set | 538 | # CONFIG_CHELSIO_T1 is not set |
| 534 | # CONFIG_CHELSIO_T3 is not set | 539 | # CONFIG_CHELSIO_T3 is not set |
| @@ -634,6 +639,8 @@ CONFIG_GEN_RTC=y | |||
| 634 | CONFIG_DEVPORT=y | 639 | CONFIG_DEVPORT=y |
| 635 | # CONFIG_I2C is not set | 640 | # CONFIG_I2C is not set |
| 636 | # CONFIG_SPI is not set | 641 | # CONFIG_SPI is not set |
| 642 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 643 | # CONFIG_GPIOLIB is not set | ||
| 637 | # CONFIG_W1 is not set | 644 | # CONFIG_W1 is not set |
| 638 | # CONFIG_POWER_SUPPLY is not set | 645 | # CONFIG_POWER_SUPPLY is not set |
| 639 | CONFIG_HWMON=y | 646 | CONFIG_HWMON=y |
| @@ -654,6 +661,7 @@ CONFIG_HWMON=y | |||
| 654 | # CONFIG_SENSORS_W83627EHF is not set | 661 | # CONFIG_SENSORS_W83627EHF is not set |
| 655 | # CONFIG_HWMON_DEBUG_CHIP is not set | 662 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 656 | # CONFIG_THERMAL is not set | 663 | # CONFIG_THERMAL is not set |
| 664 | # CONFIG_THERMAL_HWMON is not set | ||
| 657 | # CONFIG_WATCHDOG is not set | 665 | # CONFIG_WATCHDOG is not set |
| 658 | 666 | ||
| 659 | # | 667 | # |
| @@ -665,8 +673,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 665 | # | 673 | # |
| 666 | # Multifunction device drivers | 674 | # Multifunction device drivers |
| 667 | # | 675 | # |
| 676 | # CONFIG_MFD_CORE is not set | ||
| 668 | # CONFIG_MFD_SM501 is not set | 677 | # CONFIG_MFD_SM501 is not set |
| 669 | # CONFIG_HTC_PASIC3 is not set | 678 | # CONFIG_HTC_PASIC3 is not set |
| 679 | # CONFIG_MFD_TMIO is not set | ||
| 670 | 680 | ||
| 671 | # | 681 | # |
| 672 | # Multimedia devices | 682 | # Multimedia devices |
| @@ -698,10 +708,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
| 698 | # Display device support | 708 | # Display device support |
| 699 | # | 709 | # |
| 700 | # CONFIG_DISPLAY_SUPPORT is not set | 710 | # CONFIG_DISPLAY_SUPPORT is not set |
| 701 | |||
| 702 | # | ||
| 703 | # Sound | ||
| 704 | # | ||
| 705 | # CONFIG_SOUND is not set | 711 | # CONFIG_SOUND is not set |
| 706 | CONFIG_HID_SUPPORT=y | 712 | CONFIG_HID_SUPPORT=y |
| 707 | CONFIG_HID=y | 713 | CONFIG_HID=y |
| @@ -716,6 +722,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 716 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 722 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
| 717 | 723 | ||
| 718 | # | 724 | # |
| 725 | # Enable Host or Gadget support to see Inventra options | ||
| 726 | # | ||
| 727 | |||
| 728 | # | ||
| 719 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 729 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 720 | # | 730 | # |
| 721 | # CONFIG_USB_GADGET is not set | 731 | # CONFIG_USB_GADGET is not set |
| @@ -793,6 +803,7 @@ CONFIG_TMPFS=y | |||
| 793 | # CONFIG_CRAMFS is not set | 803 | # CONFIG_CRAMFS is not set |
| 794 | # CONFIG_VXFS_FS is not set | 804 | # CONFIG_VXFS_FS is not set |
| 795 | # CONFIG_MINIX_FS is not set | 805 | # CONFIG_MINIX_FS is not set |
| 806 | # CONFIG_OMFS_FS is not set | ||
| 796 | # CONFIG_HPFS_FS is not set | 807 | # CONFIG_HPFS_FS is not set |
| 797 | # CONFIG_QNX4FS_FS is not set | 808 | # CONFIG_QNX4FS_FS is not set |
| 798 | # CONFIG_ROMFS_FS is not set | 809 | # CONFIG_ROMFS_FS is not set |
| @@ -802,12 +813,11 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 802 | CONFIG_NFS_FS=y | 813 | CONFIG_NFS_FS=y |
| 803 | # CONFIG_NFS_V3 is not set | 814 | # CONFIG_NFS_V3 is not set |
| 804 | # CONFIG_NFS_V4 is not set | 815 | # CONFIG_NFS_V4 is not set |
| 805 | # CONFIG_NFSD is not set | ||
| 806 | CONFIG_ROOT_NFS=y | 816 | CONFIG_ROOT_NFS=y |
| 817 | # CONFIG_NFSD is not set | ||
| 807 | CONFIG_LOCKD=y | 818 | CONFIG_LOCKD=y |
| 808 | CONFIG_NFS_COMMON=y | 819 | CONFIG_NFS_COMMON=y |
| 809 | CONFIG_SUNRPC=y | 820 | CONFIG_SUNRPC=y |
| 810 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 811 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 821 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 812 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 822 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 813 | # CONFIG_SMB_FS is not set | 823 | # CONFIG_SMB_FS is not set |
| @@ -843,6 +853,7 @@ CONFIG_BITREVERSE=y | |||
| 843 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 853 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 844 | # CONFIG_CRC_CCITT is not set | 854 | # CONFIG_CRC_CCITT is not set |
| 845 | # CONFIG_CRC16 is not set | 855 | # CONFIG_CRC16 is not set |
| 856 | # CONFIG_CRC_T10DIF is not set | ||
| 846 | # CONFIG_CRC_ITU_T is not set | 857 | # CONFIG_CRC_ITU_T is not set |
| 847 | CONFIG_CRC32=y | 858 | CONFIG_CRC32=y |
| 848 | # CONFIG_CRC7 is not set | 859 | # CONFIG_CRC7 is not set |
| @@ -867,6 +878,8 @@ CONFIG_FRAME_WARN=1024 | |||
| 867 | CONFIG_DEBUG_KERNEL=y | 878 | CONFIG_DEBUG_KERNEL=y |
| 868 | # CONFIG_DEBUG_SHIRQ is not set | 879 | # CONFIG_DEBUG_SHIRQ is not set |
| 869 | CONFIG_DETECT_SOFTLOCKUP=y | 880 | CONFIG_DETECT_SOFTLOCKUP=y |
| 881 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 882 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 870 | CONFIG_SCHED_DEBUG=y | 883 | CONFIG_SCHED_DEBUG=y |
| 871 | # CONFIG_SCHEDSTATS is not set | 884 | # CONFIG_SCHEDSTATS is not set |
| 872 | # CONFIG_TIMER_STATS is not set | 885 | # CONFIG_TIMER_STATS is not set |
| @@ -884,16 +897,29 @@ CONFIG_DEBUG_MUTEXES=y | |||
| 884 | # CONFIG_DEBUG_INFO is not set | 897 | # CONFIG_DEBUG_INFO is not set |
| 885 | # CONFIG_DEBUG_VM is not set | 898 | # CONFIG_DEBUG_VM is not set |
| 886 | # CONFIG_DEBUG_WRITECOUNT is not set | 899 | # CONFIG_DEBUG_WRITECOUNT is not set |
| 900 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 887 | # CONFIG_DEBUG_LIST is not set | 901 | # CONFIG_DEBUG_LIST is not set |
| 888 | # CONFIG_DEBUG_SG is not set | 902 | # CONFIG_DEBUG_SG is not set |
| 889 | # CONFIG_BOOT_PRINTK_DELAY is not set | 903 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 904 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 890 | # CONFIG_BACKTRACE_SELF_TEST is not set | 905 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 891 | # CONFIG_FAULT_INJECTION is not set | 906 | # CONFIG_FAULT_INJECTION is not set |
| 907 | # CONFIG_LATENCYTOP is not set | ||
| 908 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 909 | CONFIG_HAVE_FTRACE=y | ||
| 910 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 911 | # CONFIG_FTRACE is not set | ||
| 912 | # CONFIG_SCHED_TRACER is not set | ||
| 913 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 892 | # CONFIG_SAMPLES is not set | 914 | # CONFIG_SAMPLES is not set |
| 915 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 916 | # CONFIG_KGDB is not set | ||
| 893 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 917 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
| 894 | # CONFIG_DEBUG_STACK_USAGE is not set | 918 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 895 | # CONFIG_DEBUG_PAGEALLOC is not set | 919 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 896 | # CONFIG_DEBUGGER is not set | 920 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
| 921 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
| 922 | # CONFIG_XMON is not set | ||
| 897 | # CONFIG_IRQSTACKS is not set | 923 | # CONFIG_IRQSTACKS is not set |
| 898 | # CONFIG_BDI_SWITCH is not set | 924 | # CONFIG_BDI_SWITCH is not set |
| 899 | # CONFIG_PPC_EARLY_DEBUG is not set | 925 | # CONFIG_PPC_EARLY_DEBUG is not set |
| @@ -946,6 +972,10 @@ CONFIG_CRYPTO=y | |||
| 946 | # CONFIG_CRYPTO_MD4 is not set | 972 | # CONFIG_CRYPTO_MD4 is not set |
| 947 | # CONFIG_CRYPTO_MD5 is not set | 973 | # CONFIG_CRYPTO_MD5 is not set |
| 948 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 974 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 975 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 976 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 977 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 978 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 949 | # CONFIG_CRYPTO_SHA1 is not set | 979 | # CONFIG_CRYPTO_SHA1 is not set |
| 950 | # CONFIG_CRYPTO_SHA256 is not set | 980 | # CONFIG_CRYPTO_SHA256 is not set |
| 951 | # CONFIG_CRYPTO_SHA512 is not set | 981 | # CONFIG_CRYPTO_SHA512 is not set |
| @@ -978,5 +1008,6 @@ CONFIG_CRYPTO=y | |||
| 978 | # CONFIG_CRYPTO_LZO is not set | 1008 | # CONFIG_CRYPTO_LZO is not set |
| 979 | CONFIG_CRYPTO_HW=y | 1009 | CONFIG_CRYPTO_HW=y |
| 980 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1010 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1011 | # CONFIG_CRYPTO_DEV_TALITOS is not set | ||
| 981 | # CONFIG_PPC_CLOCK is not set | 1012 | # CONFIG_PPC_CLOCK is not set |
| 982 | # CONFIG_VIRTUALIZATION is not set | 1013 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/85xx/sbc8548_defconfig b/arch/powerpc/configs/85xx/sbc8548_defconfig index 24f7f44b4821..41cedc4b63f6 100644 --- a/arch/powerpc/configs/85xx/sbc8548_defconfig +++ b/arch/powerpc/configs/85xx/sbc8548_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.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Mon Jun 9 08:52:37 2008 | 4 | # Thu Aug 21 00:52:35 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -15,6 +15,7 @@ CONFIG_PPC_85xx=y | |||
| 15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
| 16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
| 17 | CONFIG_E500=y | 17 | CONFIG_E500=y |
| 18 | # CONFIG_PPC_E500MC is not set | ||
| 18 | CONFIG_BOOKE=y | 19 | CONFIG_BOOKE=y |
| 19 | CONFIG_FSL_BOOKE=y | 20 | CONFIG_FSL_BOOKE=y |
| 20 | CONFIG_FSL_EMB_PERFMON=y | 21 | CONFIG_FSL_EMB_PERFMON=y |
| @@ -33,6 +34,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 35 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | 36 | CONFIG_STACKTRACE_SUPPORT=y |
| 37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | 38 | CONFIG_LOCKDEP_SUPPORT=y |
| 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 38 | CONFIG_ARCH_HAS_ILOG2_U32=y | 40 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| @@ -89,7 +91,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 89 | CONFIG_SYSCTL=y | 91 | CONFIG_SYSCTL=y |
| 90 | CONFIG_EMBEDDED=y | 92 | CONFIG_EMBEDDED=y |
| 91 | CONFIG_SYSCTL_SYSCALL=y | 93 | CONFIG_SYSCTL_SYSCALL=y |
| 92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 93 | CONFIG_KALLSYMS=y | 94 | CONFIG_KALLSYMS=y |
| 94 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 95 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 95 | CONFIG_HOTPLUG=y | 96 | CONFIG_HOTPLUG=y |
| @@ -112,10 +113,16 @@ CONFIG_SLAB=y | |||
| 112 | # CONFIG_PROFILING is not set | 113 | # CONFIG_PROFILING is not set |
| 113 | # CONFIG_MARKERS is not set | 114 | # CONFIG_MARKERS is not set |
| 114 | CONFIG_HAVE_OPROFILE=y | 115 | CONFIG_HAVE_OPROFILE=y |
| 116 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 117 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 115 | CONFIG_HAVE_KPROBES=y | 118 | CONFIG_HAVE_KPROBES=y |
| 116 | CONFIG_HAVE_KRETPROBES=y | 119 | CONFIG_HAVE_KRETPROBES=y |
| 120 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 117 | # CONFIG_HAVE_DMA_ATTRS is not set | 121 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 122 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 123 | # CONFIG_HAVE_CLK is not set | ||
| 118 | CONFIG_PROC_PAGE_MONITOR=y | 124 | CONFIG_PROC_PAGE_MONITOR=y |
| 125 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 119 | CONFIG_SLABINFO=y | 126 | CONFIG_SLABINFO=y |
| 120 | CONFIG_RT_MUTEXES=y | 127 | CONFIG_RT_MUTEXES=y |
| 121 | # CONFIG_TINY_SHMEM is not set | 128 | # CONFIG_TINY_SHMEM is not set |
| @@ -126,6 +133,7 @@ CONFIG_BLOCK=y | |||
| 126 | # CONFIG_BLK_DEV_IO_TRACE is not set | 133 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 127 | # CONFIG_LSF is not set | 134 | # CONFIG_LSF is not set |
| 128 | # CONFIG_BLK_DEV_BSG is not set | 135 | # CONFIG_BLK_DEV_BSG is not set |
| 136 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 129 | 137 | ||
| 130 | # | 138 | # |
| 131 | # IO Schedulers | 139 | # IO Schedulers |
| @@ -144,8 +152,6 @@ CONFIG_CLASSIC_RCU=y | |||
| 144 | # | 152 | # |
| 145 | # Platform support | 153 | # Platform support |
| 146 | # | 154 | # |
| 147 | # CONFIG_PPC_MPC512x is not set | ||
| 148 | # CONFIG_PPC_MPC5121 is not set | ||
| 149 | # CONFIG_PPC_CELL is not set | 155 | # CONFIG_PPC_CELL is not set |
| 150 | # CONFIG_PPC_CELL_NATIVE is not set | 156 | # CONFIG_PPC_CELL_NATIVE is not set |
| 151 | # CONFIG_PQ2ADS is not set | 157 | # CONFIG_PQ2ADS is not set |
| @@ -154,11 +160,13 @@ CONFIG_MPC85xx=y | |||
| 154 | # CONFIG_MPC8560_ADS is not set | 160 | # CONFIG_MPC8560_ADS is not set |
| 155 | # CONFIG_MPC85xx_CDS is not set | 161 | # CONFIG_MPC85xx_CDS is not set |
| 156 | # CONFIG_MPC85xx_MDS is not set | 162 | # CONFIG_MPC85xx_MDS is not set |
| 163 | # CONFIG_MPC8536_DS is not set | ||
| 157 | # CONFIG_MPC85xx_DS is not set | 164 | # CONFIG_MPC85xx_DS is not set |
| 158 | # CONFIG_KSI8560 is not set | 165 | # CONFIG_KSI8560 is not set |
| 159 | # CONFIG_STX_GP3 is not set | 166 | # CONFIG_STX_GP3 is not set |
| 160 | # CONFIG_TQM8540 is not set | 167 | # CONFIG_TQM8540 is not set |
| 161 | # CONFIG_TQM8541 is not set | 168 | # CONFIG_TQM8541 is not set |
| 169 | # CONFIG_TQM8548 is not set | ||
| 162 | # CONFIG_TQM8555 is not set | 170 | # CONFIG_TQM8555 is not set |
| 163 | # CONFIG_TQM8560 is not set | 171 | # CONFIG_TQM8560 is not set |
| 164 | CONFIG_SBC8548=y | 172 | CONFIG_SBC8548=y |
| @@ -213,6 +221,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 213 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 221 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 214 | CONFIG_PAGEFLAGS_EXTENDED=y | 222 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 215 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 223 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 224 | CONFIG_MIGRATION=y | ||
| 216 | # CONFIG_RESOURCES_64BIT is not set | 225 | # CONFIG_RESOURCES_64BIT is not set |
| 217 | CONFIG_ZONE_DMA_FLAG=1 | 226 | CONFIG_ZONE_DMA_FLAG=1 |
| 218 | CONFIG_BOUNCE=y | 227 | CONFIG_BOUNCE=y |
| @@ -220,6 +229,7 @@ CONFIG_VIRT_TO_BUS=y | |||
| 220 | CONFIG_FORCE_MAX_ZONEORDER=11 | 229 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 221 | CONFIG_PROC_DEVICETREE=y | 230 | CONFIG_PROC_DEVICETREE=y |
| 222 | # CONFIG_CMDLINE_BOOL is not set | 231 | # CONFIG_CMDLINE_BOOL is not set |
| 232 | CONFIG_EXTRA_TARGETS="" | ||
| 223 | # CONFIG_PM is not set | 233 | # CONFIG_PM is not set |
| 224 | # CONFIG_SECCOMP is not set | 234 | # CONFIG_SECCOMP is not set |
| 225 | CONFIG_ISA_DMA_API=y | 235 | CONFIG_ISA_DMA_API=y |
| @@ -231,6 +241,7 @@ CONFIG_ZONE_DMA=y | |||
| 231 | CONFIG_PPC_INDIRECT_PCI=y | 241 | CONFIG_PPC_INDIRECT_PCI=y |
| 232 | CONFIG_FSL_SOC=y | 242 | CONFIG_FSL_SOC=y |
| 233 | CONFIG_FSL_PCI=y | 243 | CONFIG_FSL_PCI=y |
| 244 | CONFIG_PPC_PCI_CHOICE=y | ||
| 234 | CONFIG_PCI=y | 245 | CONFIG_PCI=y |
| 235 | CONFIG_PCI_DOMAINS=y | 246 | CONFIG_PCI_DOMAINS=y |
| 236 | CONFIG_PCI_SYSCALL=y | 247 | CONFIG_PCI_SYSCALL=y |
| @@ -256,10 +267,6 @@ CONFIG_KERNEL_START=0xc0000000 | |||
| 256 | CONFIG_PHYSICAL_START=0x00000000 | 267 | CONFIG_PHYSICAL_START=0x00000000 |
| 257 | CONFIG_PHYSICAL_ALIGN=0x10000000 | 268 | CONFIG_PHYSICAL_ALIGN=0x10000000 |
| 258 | CONFIG_TASK_SIZE=0xc0000000 | 269 | CONFIG_TASK_SIZE=0xc0000000 |
| 259 | |||
| 260 | # | ||
| 261 | # Networking | ||
| 262 | # | ||
| 263 | CONFIG_NET=y | 270 | CONFIG_NET=y |
| 264 | 271 | ||
| 265 | # | 272 | # |
| @@ -374,12 +381,14 @@ CONFIG_BLK_DEV_RAM_SIZE=4096 | |||
| 374 | # CONFIG_BLK_DEV_XIP is not set | 381 | # CONFIG_BLK_DEV_XIP is not set |
| 375 | # CONFIG_CDROM_PKTCDVD is not set | 382 | # CONFIG_CDROM_PKTCDVD is not set |
| 376 | # CONFIG_ATA_OVER_ETH is not set | 383 | # CONFIG_ATA_OVER_ETH is not set |
| 384 | # CONFIG_BLK_DEV_HD is not set | ||
| 377 | CONFIG_MISC_DEVICES=y | 385 | CONFIG_MISC_DEVICES=y |
| 378 | # CONFIG_PHANTOM is not set | 386 | # CONFIG_PHANTOM is not set |
| 379 | # CONFIG_EEPROM_93CX6 is not set | 387 | # CONFIG_EEPROM_93CX6 is not set |
| 380 | # CONFIG_SGI_IOC4 is not set | 388 | # CONFIG_SGI_IOC4 is not set |
| 381 | # CONFIG_TIFM_CORE is not set | 389 | # CONFIG_TIFM_CORE is not set |
| 382 | # CONFIG_ENCLOSURE_SERVICES is not set | 390 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 391 | # CONFIG_HP_ILO is not set | ||
| 383 | CONFIG_HAVE_IDE=y | 392 | CONFIG_HAVE_IDE=y |
| 384 | # CONFIG_IDE is not set | 393 | # CONFIG_IDE is not set |
| 385 | 394 | ||
| @@ -397,12 +406,15 @@ CONFIG_HAVE_IDE=y | |||
| 397 | # | 406 | # |
| 398 | # IEEE 1394 (FireWire) support | 407 | # IEEE 1394 (FireWire) support |
| 399 | # | 408 | # |
| 409 | |||
| 410 | # | ||
| 411 | # Enable only one of the two stacks, unless you know what you are doing | ||
| 412 | # | ||
| 400 | # CONFIG_FIREWIRE is not set | 413 | # CONFIG_FIREWIRE is not set |
| 401 | # CONFIG_IEEE1394 is not set | 414 | # CONFIG_IEEE1394 is not set |
| 402 | # CONFIG_I2O is not set | 415 | # CONFIG_I2O is not set |
| 403 | # CONFIG_MACINTOSH_DRIVERS is not set | 416 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 404 | CONFIG_NETDEVICES=y | 417 | CONFIG_NETDEVICES=y |
| 405 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 406 | # CONFIG_DUMMY is not set | 418 | # CONFIG_DUMMY is not set |
| 407 | # CONFIG_BONDING is not set | 419 | # CONFIG_BONDING is not set |
| 408 | # CONFIG_MACVLAN is not set | 420 | # CONFIG_MACVLAN is not set |
| @@ -446,7 +458,6 @@ CONFIG_NETDEV_1000=y | |||
| 446 | # CONFIG_DL2K is not set | 458 | # CONFIG_DL2K is not set |
| 447 | # CONFIG_E1000 is not set | 459 | # CONFIG_E1000 is not set |
| 448 | # CONFIG_E1000E is not set | 460 | # CONFIG_E1000E is not set |
| 449 | # CONFIG_E1000E_ENABLED is not set | ||
| 450 | # CONFIG_IP1000 is not set | 461 | # CONFIG_IP1000 is not set |
| 451 | # CONFIG_IGB is not set | 462 | # CONFIG_IGB is not set |
| 452 | # CONFIG_NS83820 is not set | 463 | # CONFIG_NS83820 is not set |
| @@ -460,9 +471,9 @@ CONFIG_NETDEV_1000=y | |||
| 460 | # CONFIG_TIGON3 is not set | 471 | # CONFIG_TIGON3 is not set |
| 461 | # CONFIG_BNX2 is not set | 472 | # CONFIG_BNX2 is not set |
| 462 | CONFIG_GIANFAR=y | 473 | CONFIG_GIANFAR=y |
| 463 | CONFIG_GFAR_NAPI=y | ||
| 464 | # CONFIG_QLA3XXX is not set | 474 | # CONFIG_QLA3XXX is not set |
| 465 | # CONFIG_ATL1 is not set | 475 | # CONFIG_ATL1 is not set |
| 476 | # CONFIG_ATL1E is not set | ||
| 466 | CONFIG_NETDEV_10000=y | 477 | CONFIG_NETDEV_10000=y |
| 467 | # CONFIG_CHELSIO_T1 is not set | 478 | # CONFIG_CHELSIO_T1 is not set |
| 468 | # CONFIG_CHELSIO_T3 is not set | 479 | # CONFIG_CHELSIO_T3 is not set |
| @@ -568,6 +579,8 @@ CONFIG_GEN_RTC=y | |||
| 568 | CONFIG_DEVPORT=y | 579 | CONFIG_DEVPORT=y |
| 569 | # CONFIG_I2C is not set | 580 | # CONFIG_I2C is not set |
| 570 | # CONFIG_SPI is not set | 581 | # CONFIG_SPI is not set |
| 582 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 583 | # CONFIG_GPIOLIB is not set | ||
| 571 | # CONFIG_W1 is not set | 584 | # CONFIG_W1 is not set |
| 572 | # CONFIG_POWER_SUPPLY is not set | 585 | # CONFIG_POWER_SUPPLY is not set |
| 573 | CONFIG_HWMON=y | 586 | CONFIG_HWMON=y |
| @@ -588,6 +601,7 @@ CONFIG_HWMON=y | |||
| 588 | # CONFIG_SENSORS_W83627EHF is not set | 601 | # CONFIG_SENSORS_W83627EHF is not set |
| 589 | # CONFIG_HWMON_DEBUG_CHIP is not set | 602 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 590 | # CONFIG_THERMAL is not set | 603 | # CONFIG_THERMAL is not set |
| 604 | # CONFIG_THERMAL_HWMON is not set | ||
| 591 | # CONFIG_WATCHDOG is not set | 605 | # CONFIG_WATCHDOG is not set |
| 592 | 606 | ||
| 593 | # | 607 | # |
| @@ -599,8 +613,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 599 | # | 613 | # |
| 600 | # Multifunction device drivers | 614 | # Multifunction device drivers |
| 601 | # | 615 | # |
| 616 | # CONFIG_MFD_CORE is not set | ||
| 602 | # CONFIG_MFD_SM501 is not set | 617 | # CONFIG_MFD_SM501 is not set |
| 603 | # CONFIG_HTC_PASIC3 is not set | 618 | # CONFIG_HTC_PASIC3 is not set |
| 619 | # CONFIG_MFD_TMIO is not set | ||
| 604 | 620 | ||
| 605 | # | 621 | # |
| 606 | # Multimedia devices | 622 | # Multimedia devices |
| @@ -632,10 +648,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
| 632 | # Display device support | 648 | # Display device support |
| 633 | # | 649 | # |
| 634 | # CONFIG_DISPLAY_SUPPORT is not set | 650 | # CONFIG_DISPLAY_SUPPORT is not set |
| 635 | |||
| 636 | # | ||
| 637 | # Sound | ||
| 638 | # | ||
| 639 | # CONFIG_SOUND is not set | 651 | # CONFIG_SOUND is not set |
| 640 | # CONFIG_HID_SUPPORT is not set | 652 | # CONFIG_HID_SUPPORT is not set |
| 641 | # CONFIG_USB_SUPPORT is not set | 653 | # CONFIG_USB_SUPPORT is not set |
| @@ -706,6 +718,7 @@ CONFIG_TMPFS=y | |||
| 706 | # CONFIG_CRAMFS is not set | 718 | # CONFIG_CRAMFS is not set |
| 707 | # CONFIG_VXFS_FS is not set | 719 | # CONFIG_VXFS_FS is not set |
| 708 | # CONFIG_MINIX_FS is not set | 720 | # CONFIG_MINIX_FS is not set |
| 721 | # CONFIG_OMFS_FS is not set | ||
| 709 | # CONFIG_HPFS_FS is not set | 722 | # CONFIG_HPFS_FS is not set |
| 710 | # CONFIG_QNX4FS_FS is not set | 723 | # CONFIG_QNX4FS_FS is not set |
| 711 | # CONFIG_ROMFS_FS is not set | 724 | # CONFIG_ROMFS_FS is not set |
| @@ -715,12 +728,11 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 715 | CONFIG_NFS_FS=y | 728 | CONFIG_NFS_FS=y |
| 716 | # CONFIG_NFS_V3 is not set | 729 | # CONFIG_NFS_V3 is not set |
| 717 | # CONFIG_NFS_V4 is not set | 730 | # CONFIG_NFS_V4 is not set |
| 718 | # CONFIG_NFSD is not set | ||
| 719 | CONFIG_ROOT_NFS=y | 731 | CONFIG_ROOT_NFS=y |
| 732 | # CONFIG_NFSD is not set | ||
| 720 | CONFIG_LOCKD=y | 733 | CONFIG_LOCKD=y |
| 721 | CONFIG_NFS_COMMON=y | 734 | CONFIG_NFS_COMMON=y |
| 722 | CONFIG_SUNRPC=y | 735 | CONFIG_SUNRPC=y |
| 723 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 724 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 736 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 725 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 737 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 726 | # CONFIG_SMB_FS is not set | 738 | # CONFIG_SMB_FS is not set |
| @@ -744,6 +756,7 @@ CONFIG_BITREVERSE=y | |||
| 744 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 756 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 745 | # CONFIG_CRC_CCITT is not set | 757 | # CONFIG_CRC_CCITT is not set |
| 746 | # CONFIG_CRC16 is not set | 758 | # CONFIG_CRC16 is not set |
| 759 | # CONFIG_CRC_T10DIF is not set | ||
| 747 | # CONFIG_CRC_ITU_T is not set | 760 | # CONFIG_CRC_ITU_T is not set |
| 748 | CONFIG_CRC32=y | 761 | CONFIG_CRC32=y |
| 749 | # CONFIG_CRC7 is not set | 762 | # CONFIG_CRC7 is not set |
| @@ -767,7 +780,16 @@ CONFIG_FRAME_WARN=1024 | |||
| 767 | # CONFIG_HEADERS_CHECK is not set | 780 | # CONFIG_HEADERS_CHECK is not set |
| 768 | # CONFIG_DEBUG_KERNEL is not set | 781 | # CONFIG_DEBUG_KERNEL is not set |
| 769 | # CONFIG_DEBUG_BUGVERBOSE is not set | 782 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 783 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 784 | # CONFIG_LATENCYTOP is not set | ||
| 785 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 786 | CONFIG_HAVE_FTRACE=y | ||
| 787 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 788 | # CONFIG_FTRACE is not set | ||
| 789 | # CONFIG_SCHED_TRACER is not set | ||
| 790 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 770 | # CONFIG_SAMPLES is not set | 791 | # CONFIG_SAMPLES is not set |
| 792 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 771 | # CONFIG_IRQSTACKS is not set | 793 | # CONFIG_IRQSTACKS is not set |
| 772 | # CONFIG_PPC_EARLY_DEBUG is not set | 794 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 773 | 795 | ||
| @@ -819,6 +841,10 @@ CONFIG_CRYPTO=y | |||
| 819 | # CONFIG_CRYPTO_MD4 is not set | 841 | # CONFIG_CRYPTO_MD4 is not set |
| 820 | # CONFIG_CRYPTO_MD5 is not set | 842 | # CONFIG_CRYPTO_MD5 is not set |
| 821 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 843 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 844 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 845 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 846 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 847 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 822 | # CONFIG_CRYPTO_SHA1 is not set | 848 | # CONFIG_CRYPTO_SHA1 is not set |
| 823 | # CONFIG_CRYPTO_SHA256 is not set | 849 | # CONFIG_CRYPTO_SHA256 is not set |
| 824 | # CONFIG_CRYPTO_SHA512 is not set | 850 | # CONFIG_CRYPTO_SHA512 is not set |
| @@ -851,5 +877,6 @@ CONFIG_CRYPTO=y | |||
| 851 | # CONFIG_CRYPTO_LZO is not set | 877 | # CONFIG_CRYPTO_LZO is not set |
| 852 | CONFIG_CRYPTO_HW=y | 878 | CONFIG_CRYPTO_HW=y |
| 853 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 879 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 880 | # CONFIG_CRYPTO_DEV_TALITOS is not set | ||
| 854 | # CONFIG_PPC_CLOCK is not set | 881 | # CONFIG_PPC_CLOCK is not set |
| 855 | # CONFIG_VIRTUALIZATION is not set | 882 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/85xx/sbc8560_defconfig b/arch/powerpc/configs/85xx/sbc8560_defconfig index 655518dcd73f..daef36f41b42 100644 --- a/arch/powerpc/configs/85xx/sbc8560_defconfig +++ b/arch/powerpc/configs/85xx/sbc8560_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.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Mon Jun 9 08:52:38 2008 | 4 | # Thu Aug 21 00:52:36 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -15,6 +15,7 @@ CONFIG_PPC_85xx=y | |||
| 15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
| 16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
| 17 | CONFIG_E500=y | 17 | CONFIG_E500=y |
| 18 | # CONFIG_PPC_E500MC is not set | ||
| 18 | CONFIG_BOOKE=y | 19 | CONFIG_BOOKE=y |
| 19 | CONFIG_FSL_BOOKE=y | 20 | CONFIG_FSL_BOOKE=y |
| 20 | CONFIG_FSL_EMB_PERFMON=y | 21 | CONFIG_FSL_EMB_PERFMON=y |
| @@ -33,6 +34,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 35 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | 36 | CONFIG_STACKTRACE_SUPPORT=y |
| 37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | 38 | CONFIG_LOCKDEP_SUPPORT=y |
| 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 38 | CONFIG_ARCH_HAS_ILOG2_U32=y | 40 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| @@ -89,7 +91,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 89 | CONFIG_SYSCTL=y | 91 | CONFIG_SYSCTL=y |
| 90 | CONFIG_EMBEDDED=y | 92 | CONFIG_EMBEDDED=y |
| 91 | CONFIG_SYSCTL_SYSCALL=y | 93 | CONFIG_SYSCTL_SYSCALL=y |
| 92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 93 | CONFIG_KALLSYMS=y | 94 | CONFIG_KALLSYMS=y |
| 94 | # CONFIG_KALLSYMS_ALL is not set | 95 | # CONFIG_KALLSYMS_ALL is not set |
| 95 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 96 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -113,10 +114,16 @@ CONFIG_SLAB=y | |||
| 113 | # CONFIG_PROFILING is not set | 114 | # CONFIG_PROFILING is not set |
| 114 | # CONFIG_MARKERS is not set | 115 | # CONFIG_MARKERS is not set |
| 115 | CONFIG_HAVE_OPROFILE=y | 116 | CONFIG_HAVE_OPROFILE=y |
| 117 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 118 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 116 | CONFIG_HAVE_KPROBES=y | 119 | CONFIG_HAVE_KPROBES=y |
| 117 | CONFIG_HAVE_KRETPROBES=y | 120 | CONFIG_HAVE_KRETPROBES=y |
| 121 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 118 | # CONFIG_HAVE_DMA_ATTRS is not set | 122 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 123 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 124 | # CONFIG_HAVE_CLK is not set | ||
| 119 | CONFIG_PROC_PAGE_MONITOR=y | 125 | CONFIG_PROC_PAGE_MONITOR=y |
| 126 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 120 | CONFIG_SLABINFO=y | 127 | CONFIG_SLABINFO=y |
| 121 | CONFIG_RT_MUTEXES=y | 128 | CONFIG_RT_MUTEXES=y |
| 122 | # CONFIG_TINY_SHMEM is not set | 129 | # CONFIG_TINY_SHMEM is not set |
| @@ -127,6 +134,7 @@ CONFIG_BLOCK=y | |||
| 127 | # CONFIG_BLK_DEV_IO_TRACE is not set | 134 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 128 | # CONFIG_LSF is not set | 135 | # CONFIG_LSF is not set |
| 129 | # CONFIG_BLK_DEV_BSG is not set | 136 | # CONFIG_BLK_DEV_BSG is not set |
| 137 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 130 | 138 | ||
| 131 | # | 139 | # |
| 132 | # IO Schedulers | 140 | # IO Schedulers |
| @@ -145,8 +153,6 @@ CONFIG_CLASSIC_RCU=y | |||
| 145 | # | 153 | # |
| 146 | # Platform support | 154 | # Platform support |
| 147 | # | 155 | # |
| 148 | # CONFIG_PPC_MPC512x is not set | ||
| 149 | # CONFIG_PPC_MPC5121 is not set | ||
| 150 | # CONFIG_PPC_CELL is not set | 156 | # CONFIG_PPC_CELL is not set |
| 151 | # CONFIG_PPC_CELL_NATIVE is not set | 157 | # CONFIG_PPC_CELL_NATIVE is not set |
| 152 | # CONFIG_PQ2ADS is not set | 158 | # CONFIG_PQ2ADS is not set |
| @@ -155,11 +161,13 @@ CONFIG_MPC85xx=y | |||
| 155 | # CONFIG_MPC8560_ADS is not set | 161 | # CONFIG_MPC8560_ADS is not set |
| 156 | # CONFIG_MPC85xx_CDS is not set | 162 | # CONFIG_MPC85xx_CDS is not set |
| 157 | # CONFIG_MPC85xx_MDS is not set | 163 | # CONFIG_MPC85xx_MDS is not set |
| 164 | # CONFIG_MPC8536_DS is not set | ||
| 158 | # CONFIG_MPC85xx_DS is not set | 165 | # CONFIG_MPC85xx_DS is not set |
| 159 | # CONFIG_KSI8560 is not set | 166 | # CONFIG_KSI8560 is not set |
| 160 | # CONFIG_STX_GP3 is not set | 167 | # CONFIG_STX_GP3 is not set |
| 161 | # CONFIG_TQM8540 is not set | 168 | # CONFIG_TQM8540 is not set |
| 162 | # CONFIG_TQM8541 is not set | 169 | # CONFIG_TQM8541 is not set |
| 170 | # CONFIG_TQM8548 is not set | ||
| 163 | # CONFIG_TQM8555 is not set | 171 | # CONFIG_TQM8555 is not set |
| 164 | # CONFIG_TQM8560 is not set | 172 | # CONFIG_TQM8560 is not set |
| 165 | # CONFIG_SBC8548 is not set | 173 | # CONFIG_SBC8548 is not set |
| @@ -214,6 +222,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 214 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 222 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 215 | CONFIG_PAGEFLAGS_EXTENDED=y | 223 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 216 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 224 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 225 | CONFIG_MIGRATION=y | ||
| 217 | # CONFIG_RESOURCES_64BIT is not set | 226 | # CONFIG_RESOURCES_64BIT is not set |
| 218 | CONFIG_ZONE_DMA_FLAG=1 | 227 | CONFIG_ZONE_DMA_FLAG=1 |
| 219 | CONFIG_BOUNCE=y | 228 | CONFIG_BOUNCE=y |
| @@ -221,6 +230,7 @@ CONFIG_VIRT_TO_BUS=y | |||
| 221 | CONFIG_FORCE_MAX_ZONEORDER=11 | 230 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 222 | CONFIG_PROC_DEVICETREE=y | 231 | CONFIG_PROC_DEVICETREE=y |
| 223 | # CONFIG_CMDLINE_BOOL is not set | 232 | # CONFIG_CMDLINE_BOOL is not set |
| 233 | CONFIG_EXTRA_TARGETS="" | ||
| 224 | # CONFIG_PM is not set | 234 | # CONFIG_PM is not set |
| 225 | # CONFIG_SECCOMP is not set | 235 | # CONFIG_SECCOMP is not set |
| 226 | CONFIG_ISA_DMA_API=y | 236 | CONFIG_ISA_DMA_API=y |
| @@ -230,6 +240,7 @@ CONFIG_ISA_DMA_API=y | |||
| 230 | # | 240 | # |
| 231 | CONFIG_ZONE_DMA=y | 241 | CONFIG_ZONE_DMA=y |
| 232 | CONFIG_FSL_SOC=y | 242 | CONFIG_FSL_SOC=y |
| 243 | CONFIG_PPC_PCI_CHOICE=y | ||
| 233 | # CONFIG_PCI is not set | 244 | # CONFIG_PCI is not set |
| 234 | # CONFIG_PCI_DOMAINS is not set | 245 | # CONFIG_PCI_DOMAINS is not set |
| 235 | # CONFIG_PCI_SYSCALL is not set | 246 | # CONFIG_PCI_SYSCALL is not set |
| @@ -251,10 +262,6 @@ CONFIG_KERNEL_START=0xc0000000 | |||
| 251 | CONFIG_PHYSICAL_START=0x00000000 | 262 | CONFIG_PHYSICAL_START=0x00000000 |
| 252 | CONFIG_PHYSICAL_ALIGN=0x10000000 | 263 | CONFIG_PHYSICAL_ALIGN=0x10000000 |
| 253 | CONFIG_TASK_SIZE=0xc0000000 | 264 | CONFIG_TASK_SIZE=0xc0000000 |
| 254 | |||
| 255 | # | ||
| 256 | # Networking | ||
| 257 | # | ||
| 258 | CONFIG_NET=y | 265 | CONFIG_NET=y |
| 259 | 266 | ||
| 260 | # | 267 | # |
| @@ -366,6 +373,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
| 366 | # CONFIG_BLK_DEV_XIP is not set | 373 | # CONFIG_BLK_DEV_XIP is not set |
| 367 | # CONFIG_CDROM_PKTCDVD is not set | 374 | # CONFIG_CDROM_PKTCDVD is not set |
| 368 | # CONFIG_ATA_OVER_ETH is not set | 375 | # CONFIG_ATA_OVER_ETH is not set |
| 376 | # CONFIG_BLK_DEV_HD is not set | ||
| 369 | CONFIG_MISC_DEVICES=y | 377 | CONFIG_MISC_DEVICES=y |
| 370 | # CONFIG_EEPROM_93CX6 is not set | 378 | # CONFIG_EEPROM_93CX6 is not set |
| 371 | # CONFIG_ENCLOSURE_SERVICES is not set | 379 | # CONFIG_ENCLOSURE_SERVICES is not set |
| @@ -383,7 +391,6 @@ CONFIG_HAVE_IDE=y | |||
| 383 | # CONFIG_MD is not set | 391 | # CONFIG_MD is not set |
| 384 | # CONFIG_MACINTOSH_DRIVERS is not set | 392 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 385 | CONFIG_NETDEVICES=y | 393 | CONFIG_NETDEVICES=y |
| 386 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 387 | # CONFIG_DUMMY is not set | 394 | # CONFIG_DUMMY is not set |
| 388 | # CONFIG_BONDING is not set | 395 | # CONFIG_BONDING is not set |
| 389 | # CONFIG_MACVLAN is not set | 396 | # CONFIG_MACVLAN is not set |
| @@ -415,9 +422,7 @@ CONFIG_MII=y | |||
| 415 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 422 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
| 416 | # CONFIG_B44 is not set | 423 | # CONFIG_B44 is not set |
| 417 | CONFIG_NETDEV_1000=y | 424 | CONFIG_NETDEV_1000=y |
| 418 | # CONFIG_E1000E_ENABLED is not set | ||
| 419 | CONFIG_GIANFAR=y | 425 | CONFIG_GIANFAR=y |
| 420 | CONFIG_GFAR_NAPI=y | ||
| 421 | CONFIG_NETDEV_10000=y | 426 | CONFIG_NETDEV_10000=y |
| 422 | 427 | ||
| 423 | # | 428 | # |
| @@ -501,6 +506,8 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 501 | # CONFIG_TCG_TPM is not set | 506 | # CONFIG_TCG_TPM is not set |
| 502 | # CONFIG_I2C is not set | 507 | # CONFIG_I2C is not set |
| 503 | # CONFIG_SPI is not set | 508 | # CONFIG_SPI is not set |
| 509 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 510 | # CONFIG_GPIOLIB is not set | ||
| 504 | # CONFIG_W1 is not set | 511 | # CONFIG_W1 is not set |
| 505 | # CONFIG_POWER_SUPPLY is not set | 512 | # CONFIG_POWER_SUPPLY is not set |
| 506 | CONFIG_HWMON=y | 513 | CONFIG_HWMON=y |
| @@ -517,6 +524,7 @@ CONFIG_HWMON=y | |||
| 517 | # CONFIG_SENSORS_W83627EHF is not set | 524 | # CONFIG_SENSORS_W83627EHF is not set |
| 518 | # CONFIG_HWMON_DEBUG_CHIP is not set | 525 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 519 | # CONFIG_THERMAL is not set | 526 | # CONFIG_THERMAL is not set |
| 527 | # CONFIG_THERMAL_HWMON is not set | ||
| 520 | # CONFIG_WATCHDOG is not set | 528 | # CONFIG_WATCHDOG is not set |
| 521 | 529 | ||
| 522 | # | 530 | # |
| @@ -528,8 +536,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 528 | # | 536 | # |
| 529 | # Multifunction device drivers | 537 | # Multifunction device drivers |
| 530 | # | 538 | # |
| 539 | # CONFIG_MFD_CORE is not set | ||
| 531 | # CONFIG_MFD_SM501 is not set | 540 | # CONFIG_MFD_SM501 is not set |
| 532 | # CONFIG_HTC_PASIC3 is not set | 541 | # CONFIG_HTC_PASIC3 is not set |
| 542 | # CONFIG_MFD_TMIO is not set | ||
| 533 | 543 | ||
| 534 | # | 544 | # |
| 535 | # Multimedia devices | 545 | # Multimedia devices |
| @@ -559,10 +569,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
| 559 | # Display device support | 569 | # Display device support |
| 560 | # | 570 | # |
| 561 | # CONFIG_DISPLAY_SUPPORT is not set | 571 | # CONFIG_DISPLAY_SUPPORT is not set |
| 562 | |||
| 563 | # | ||
| 564 | # Sound | ||
| 565 | # | ||
| 566 | # CONFIG_SOUND is not set | 572 | # CONFIG_SOUND is not set |
| 567 | CONFIG_HID_SUPPORT=y | 573 | CONFIG_HID_SUPPORT=y |
| 568 | CONFIG_HID=y | 574 | CONFIG_HID=y |
| @@ -576,6 +582,10 @@ CONFIG_USB_SUPPORT=y | |||
| 576 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 582 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
| 577 | 583 | ||
| 578 | # | 584 | # |
| 585 | # Enable Host or Gadget support to see Inventra options | ||
| 586 | # | ||
| 587 | |||
| 588 | # | ||
| 579 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 589 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 580 | # | 590 | # |
| 581 | # CONFIG_USB_GADGET is not set | 591 | # CONFIG_USB_GADGET is not set |
| @@ -679,6 +689,7 @@ CONFIG_TMPFS=y | |||
| 679 | # CONFIG_CRAMFS is not set | 689 | # CONFIG_CRAMFS is not set |
| 680 | # CONFIG_VXFS_FS is not set | 690 | # CONFIG_VXFS_FS is not set |
| 681 | # CONFIG_MINIX_FS is not set | 691 | # CONFIG_MINIX_FS is not set |
| 692 | # CONFIG_OMFS_FS is not set | ||
| 682 | # CONFIG_HPFS_FS is not set | 693 | # CONFIG_HPFS_FS is not set |
| 683 | # CONFIG_QNX4FS_FS is not set | 694 | # CONFIG_QNX4FS_FS is not set |
| 684 | # CONFIG_ROMFS_FS is not set | 695 | # CONFIG_ROMFS_FS is not set |
| @@ -688,12 +699,11 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 688 | CONFIG_NFS_FS=y | 699 | CONFIG_NFS_FS=y |
| 689 | # CONFIG_NFS_V3 is not set | 700 | # CONFIG_NFS_V3 is not set |
| 690 | # CONFIG_NFS_V4 is not set | 701 | # CONFIG_NFS_V4 is not set |
| 691 | # CONFIG_NFSD is not set | ||
| 692 | CONFIG_ROOT_NFS=y | 702 | CONFIG_ROOT_NFS=y |
| 703 | # CONFIG_NFSD is not set | ||
| 693 | CONFIG_LOCKD=y | 704 | CONFIG_LOCKD=y |
| 694 | CONFIG_NFS_COMMON=y | 705 | CONFIG_NFS_COMMON=y |
| 695 | CONFIG_SUNRPC=y | 706 | CONFIG_SUNRPC=y |
| 696 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 697 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 707 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 698 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 708 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 699 | # CONFIG_SMB_FS is not set | 709 | # CONFIG_SMB_FS is not set |
| @@ -729,6 +739,7 @@ CONFIG_BITREVERSE=y | |||
| 729 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 739 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 730 | # CONFIG_CRC_CCITT is not set | 740 | # CONFIG_CRC_CCITT is not set |
| 731 | # CONFIG_CRC16 is not set | 741 | # CONFIG_CRC16 is not set |
| 742 | # CONFIG_CRC_T10DIF is not set | ||
| 732 | # CONFIG_CRC_ITU_T is not set | 743 | # CONFIG_CRC_ITU_T is not set |
| 733 | CONFIG_CRC32=y | 744 | CONFIG_CRC32=y |
| 734 | # CONFIG_CRC7 is not set | 745 | # CONFIG_CRC7 is not set |
| @@ -753,6 +764,8 @@ CONFIG_MAGIC_SYSRQ=y | |||
| 753 | CONFIG_DEBUG_KERNEL=y | 764 | CONFIG_DEBUG_KERNEL=y |
| 754 | # CONFIG_DEBUG_SHIRQ is not set | 765 | # CONFIG_DEBUG_SHIRQ is not set |
| 755 | CONFIG_DETECT_SOFTLOCKUP=y | 766 | CONFIG_DETECT_SOFTLOCKUP=y |
| 767 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 768 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 756 | CONFIG_SCHED_DEBUG=y | 769 | CONFIG_SCHED_DEBUG=y |
| 757 | # CONFIG_SCHEDSTATS is not set | 770 | # CONFIG_SCHEDSTATS is not set |
| 758 | # CONFIG_TIMER_STATS is not set | 771 | # CONFIG_TIMER_STATS is not set |
| @@ -769,16 +782,29 @@ CONFIG_DEBUG_MUTEXES=y | |||
| 769 | # CONFIG_DEBUG_INFO is not set | 782 | # CONFIG_DEBUG_INFO is not set |
| 770 | # CONFIG_DEBUG_VM is not set | 783 | # CONFIG_DEBUG_VM is not set |
| 771 | # CONFIG_DEBUG_WRITECOUNT is not set | 784 | # CONFIG_DEBUG_WRITECOUNT is not set |
| 785 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 772 | # CONFIG_DEBUG_LIST is not set | 786 | # CONFIG_DEBUG_LIST is not set |
| 773 | # CONFIG_DEBUG_SG is not set | 787 | # CONFIG_DEBUG_SG is not set |
| 774 | # CONFIG_BOOT_PRINTK_DELAY is not set | 788 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 789 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 775 | # CONFIG_BACKTRACE_SELF_TEST is not set | 790 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 776 | # CONFIG_FAULT_INJECTION is not set | 791 | # CONFIG_FAULT_INJECTION is not set |
| 792 | # CONFIG_LATENCYTOP is not set | ||
| 793 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 794 | CONFIG_HAVE_FTRACE=y | ||
| 795 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 796 | # CONFIG_FTRACE is not set | ||
| 797 | # CONFIG_SCHED_TRACER is not set | ||
| 798 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 777 | # CONFIG_SAMPLES is not set | 799 | # CONFIG_SAMPLES is not set |
| 800 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 801 | # CONFIG_KGDB is not set | ||
| 778 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 802 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
| 779 | # CONFIG_DEBUG_STACK_USAGE is not set | 803 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 780 | # CONFIG_DEBUG_PAGEALLOC is not set | 804 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 781 | # CONFIG_DEBUGGER is not set | 805 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
| 806 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
| 807 | # CONFIG_XMON is not set | ||
| 782 | # CONFIG_IRQSTACKS is not set | 808 | # CONFIG_IRQSTACKS is not set |
| 783 | # CONFIG_BDI_SWITCH is not set | 809 | # CONFIG_BDI_SWITCH is not set |
| 784 | CONFIG_PPC_EARLY_DEBUG=y | 810 | CONFIG_PPC_EARLY_DEBUG=y |
| @@ -842,6 +868,10 @@ CONFIG_CRYPTO=y | |||
| 842 | # CONFIG_CRYPTO_MD4 is not set | 868 | # CONFIG_CRYPTO_MD4 is not set |
| 843 | # CONFIG_CRYPTO_MD5 is not set | 869 | # CONFIG_CRYPTO_MD5 is not set |
| 844 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 870 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 871 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 872 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 873 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 874 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 845 | # CONFIG_CRYPTO_SHA1 is not set | 875 | # CONFIG_CRYPTO_SHA1 is not set |
| 846 | # CONFIG_CRYPTO_SHA256 is not set | 876 | # CONFIG_CRYPTO_SHA256 is not set |
| 847 | # CONFIG_CRYPTO_SHA512 is not set | 877 | # CONFIG_CRYPTO_SHA512 is not set |
| @@ -873,5 +903,6 @@ CONFIG_CRYPTO=y | |||
| 873 | # CONFIG_CRYPTO_DEFLATE is not set | 903 | # CONFIG_CRYPTO_DEFLATE is not set |
| 874 | # CONFIG_CRYPTO_LZO is not set | 904 | # CONFIG_CRYPTO_LZO is not set |
| 875 | CONFIG_CRYPTO_HW=y | 905 | CONFIG_CRYPTO_HW=y |
| 906 | # CONFIG_CRYPTO_DEV_TALITOS is not set | ||
| 876 | # CONFIG_PPC_CLOCK is not set | 907 | # CONFIG_PPC_CLOCK is not set |
| 877 | # CONFIG_VIRTUALIZATION is not set | 908 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/85xx/stx_gp3_defconfig b/arch/powerpc/configs/85xx/stx_gp3_defconfig index 7804ca1ecc94..2b05d43f8f7e 100644 --- a/arch/powerpc/configs/85xx/stx_gp3_defconfig +++ b/arch/powerpc/configs/85xx/stx_gp3_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.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Mon Jun 9 08:52:38 2008 | 4 | # Thu Aug 21 00:52:37 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -15,6 +15,7 @@ CONFIG_PPC_85xx=y | |||
| 15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
| 16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
| 17 | CONFIG_E500=y | 17 | CONFIG_E500=y |
| 18 | # CONFIG_PPC_E500MC is not set | ||
| 18 | CONFIG_BOOKE=y | 19 | CONFIG_BOOKE=y |
| 19 | CONFIG_FSL_BOOKE=y | 20 | CONFIG_FSL_BOOKE=y |
| 20 | CONFIG_FSL_EMB_PERFMON=y | 21 | CONFIG_FSL_EMB_PERFMON=y |
| @@ -33,12 +34,14 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 35 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | 36 | CONFIG_STACKTRACE_SUPPORT=y |
| 37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | 38 | CONFIG_LOCKDEP_SUPPORT=y |
| 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 38 | CONFIG_ARCH_HAS_ILOG2_U32=y | 40 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 39 | CONFIG_GENERIC_HWEIGHT=y | 41 | CONFIG_GENERIC_HWEIGHT=y |
| 40 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 42 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 41 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 43 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 44 | CONFIG_GENERIC_GPIO=y | ||
| 42 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 45 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
| 43 | CONFIG_PPC=y | 46 | CONFIG_PPC=y |
| 44 | CONFIG_EARLY_PRINTK=y | 47 | CONFIG_EARLY_PRINTK=y |
| @@ -89,7 +92,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 89 | CONFIG_SYSCTL=y | 92 | CONFIG_SYSCTL=y |
| 90 | CONFIG_EMBEDDED=y | 93 | CONFIG_EMBEDDED=y |
| 91 | CONFIG_SYSCTL_SYSCALL=y | 94 | CONFIG_SYSCTL_SYSCALL=y |
| 92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 93 | CONFIG_KALLSYMS=y | 95 | CONFIG_KALLSYMS=y |
| 94 | # CONFIG_KALLSYMS_ALL is not set | 96 | # CONFIG_KALLSYMS_ALL is not set |
| 95 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 97 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -115,10 +117,16 @@ CONFIG_SLUB=y | |||
| 115 | # CONFIG_MARKERS is not set | 117 | # CONFIG_MARKERS is not set |
| 116 | CONFIG_HAVE_OPROFILE=y | 118 | CONFIG_HAVE_OPROFILE=y |
| 117 | # CONFIG_KPROBES is not set | 119 | # CONFIG_KPROBES is not set |
| 120 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 121 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 118 | CONFIG_HAVE_KPROBES=y | 122 | CONFIG_HAVE_KPROBES=y |
| 119 | CONFIG_HAVE_KRETPROBES=y | 123 | CONFIG_HAVE_KRETPROBES=y |
| 124 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 120 | # CONFIG_HAVE_DMA_ATTRS is not set | 125 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 126 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 127 | CONFIG_HAVE_CLK=y | ||
| 121 | CONFIG_PROC_PAGE_MONITOR=y | 128 | CONFIG_PROC_PAGE_MONITOR=y |
| 129 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 122 | CONFIG_SLABINFO=y | 130 | CONFIG_SLABINFO=y |
| 123 | CONFIG_RT_MUTEXES=y | 131 | CONFIG_RT_MUTEXES=y |
| 124 | # CONFIG_TINY_SHMEM is not set | 132 | # CONFIG_TINY_SHMEM is not set |
| @@ -134,6 +142,7 @@ CONFIG_BLOCK=y | |||
| 134 | # CONFIG_BLK_DEV_IO_TRACE is not set | 142 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 135 | # CONFIG_LSF is not set | 143 | # CONFIG_LSF is not set |
| 136 | # CONFIG_BLK_DEV_BSG is not set | 144 | # CONFIG_BLK_DEV_BSG is not set |
| 145 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 137 | 146 | ||
| 138 | # | 147 | # |
| 139 | # IO Schedulers | 148 | # IO Schedulers |
| @@ -152,8 +161,6 @@ CONFIG_CLASSIC_RCU=y | |||
| 152 | # | 161 | # |
| 153 | # Platform support | 162 | # Platform support |
| 154 | # | 163 | # |
| 155 | # CONFIG_PPC_MPC512x is not set | ||
| 156 | # CONFIG_PPC_MPC5121 is not set | ||
| 157 | # CONFIG_PPC_CELL is not set | 164 | # CONFIG_PPC_CELL is not set |
| 158 | # CONFIG_PPC_CELL_NATIVE is not set | 165 | # CONFIG_PPC_CELL_NATIVE is not set |
| 159 | # CONFIG_PQ2ADS is not set | 166 | # CONFIG_PQ2ADS is not set |
| @@ -162,11 +169,13 @@ CONFIG_MPC85xx=y | |||
| 162 | # CONFIG_MPC8560_ADS is not set | 169 | # CONFIG_MPC8560_ADS is not set |
| 163 | # CONFIG_MPC85xx_CDS is not set | 170 | # CONFIG_MPC85xx_CDS is not set |
| 164 | # CONFIG_MPC85xx_MDS is not set | 171 | # CONFIG_MPC85xx_MDS is not set |
| 172 | # CONFIG_MPC8536_DS is not set | ||
| 165 | # CONFIG_MPC85xx_DS is not set | 173 | # CONFIG_MPC85xx_DS is not set |
| 166 | # CONFIG_KSI8560 is not set | 174 | # CONFIG_KSI8560 is not set |
| 167 | CONFIG_STX_GP3=y | 175 | CONFIG_STX_GP3=y |
| 168 | # CONFIG_TQM8540 is not set | 176 | # CONFIG_TQM8540 is not set |
| 169 | # CONFIG_TQM8541 is not set | 177 | # CONFIG_TQM8541 is not set |
| 178 | # CONFIG_TQM8548 is not set | ||
| 170 | # CONFIG_TQM8555 is not set | 179 | # CONFIG_TQM8555 is not set |
| 171 | # CONFIG_TQM8560 is not set | 180 | # CONFIG_TQM8560 is not set |
| 172 | # CONFIG_SBC8548 is not set | 181 | # CONFIG_SBC8548 is not set |
| @@ -183,7 +192,6 @@ CONFIG_MPIC=y | |||
| 183 | # CONFIG_GENERIC_IOMAP is not set | 192 | # CONFIG_GENERIC_IOMAP is not set |
| 184 | # CONFIG_CPU_FREQ is not set | 193 | # CONFIG_CPU_FREQ is not set |
| 185 | CONFIG_CPM2=y | 194 | CONFIG_CPM2=y |
| 186 | CONFIG_PPC_CPM_NEW_BINDING=y | ||
| 187 | # CONFIG_FSL_ULI1575 is not set | 195 | # CONFIG_FSL_ULI1575 is not set |
| 188 | CONFIG_CPM=y | 196 | CONFIG_CPM=y |
| 189 | 197 | ||
| @@ -223,6 +231,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 223 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 231 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 224 | CONFIG_PAGEFLAGS_EXTENDED=y | 232 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 225 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 233 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 234 | CONFIG_MIGRATION=y | ||
| 226 | # CONFIG_RESOURCES_64BIT is not set | 235 | # CONFIG_RESOURCES_64BIT is not set |
| 227 | CONFIG_ZONE_DMA_FLAG=1 | 236 | CONFIG_ZONE_DMA_FLAG=1 |
| 228 | CONFIG_BOUNCE=y | 237 | CONFIG_BOUNCE=y |
| @@ -230,6 +239,7 @@ CONFIG_VIRT_TO_BUS=y | |||
| 230 | CONFIG_FORCE_MAX_ZONEORDER=11 | 239 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 231 | CONFIG_PROC_DEVICETREE=y | 240 | CONFIG_PROC_DEVICETREE=y |
| 232 | # CONFIG_CMDLINE_BOOL is not set | 241 | # CONFIG_CMDLINE_BOOL is not set |
| 242 | CONFIG_EXTRA_TARGETS="" | ||
| 233 | # CONFIG_PM is not set | 243 | # CONFIG_PM is not set |
| 234 | CONFIG_SECCOMP=y | 244 | CONFIG_SECCOMP=y |
| 235 | CONFIG_ISA_DMA_API=y | 245 | CONFIG_ISA_DMA_API=y |
| @@ -241,6 +251,7 @@ CONFIG_ZONE_DMA=y | |||
| 241 | CONFIG_PPC_INDIRECT_PCI=y | 251 | CONFIG_PPC_INDIRECT_PCI=y |
| 242 | CONFIG_FSL_SOC=y | 252 | CONFIG_FSL_SOC=y |
| 243 | CONFIG_FSL_PCI=y | 253 | CONFIG_FSL_PCI=y |
| 254 | CONFIG_PPC_PCI_CHOICE=y | ||
| 244 | CONFIG_PCI=y | 255 | CONFIG_PCI=y |
| 245 | CONFIG_PCI_DOMAINS=y | 256 | CONFIG_PCI_DOMAINS=y |
| 246 | CONFIG_PCI_SYSCALL=y | 257 | CONFIG_PCI_SYSCALL=y |
| @@ -267,10 +278,6 @@ CONFIG_KERNEL_START=0xc0000000 | |||
| 267 | CONFIG_PHYSICAL_START=0x00000000 | 278 | CONFIG_PHYSICAL_START=0x00000000 |
| 268 | CONFIG_PHYSICAL_ALIGN=0x10000000 | 279 | CONFIG_PHYSICAL_ALIGN=0x10000000 |
| 269 | CONFIG_TASK_SIZE=0xc0000000 | 280 | CONFIG_TASK_SIZE=0xc0000000 |
| 270 | |||
| 271 | # | ||
| 272 | # Networking | ||
| 273 | # | ||
| 274 | CONFIG_NET=y | 281 | CONFIG_NET=y |
| 275 | 282 | ||
| 276 | # | 283 | # |
| @@ -426,6 +433,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 426 | # CONFIG_CONNECTOR is not set | 433 | # CONFIG_CONNECTOR is not set |
| 427 | # CONFIG_MTD is not set | 434 | # CONFIG_MTD is not set |
| 428 | CONFIG_OF_DEVICE=y | 435 | CONFIG_OF_DEVICE=y |
| 436 | CONFIG_OF_GPIO=y | ||
| 429 | CONFIG_OF_I2C=m | 437 | CONFIG_OF_I2C=m |
| 430 | CONFIG_PARPORT=m | 438 | CONFIG_PARPORT=m |
| 431 | CONFIG_PARPORT_PC=m | 439 | CONFIG_PARPORT_PC=m |
| @@ -452,15 +460,16 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
| 452 | # CONFIG_BLK_DEV_XIP is not set | 460 | # CONFIG_BLK_DEV_XIP is not set |
| 453 | # CONFIG_CDROM_PKTCDVD is not set | 461 | # CONFIG_CDROM_PKTCDVD is not set |
| 454 | # CONFIG_ATA_OVER_ETH is not set | 462 | # CONFIG_ATA_OVER_ETH is not set |
| 463 | # CONFIG_BLK_DEV_HD is not set | ||
| 455 | CONFIG_MISC_DEVICES=y | 464 | CONFIG_MISC_DEVICES=y |
| 456 | # CONFIG_PHANTOM is not set | 465 | # CONFIG_PHANTOM is not set |
| 457 | # CONFIG_EEPROM_93CX6 is not set | 466 | # CONFIG_EEPROM_93CX6 is not set |
| 458 | # CONFIG_SGI_IOC4 is not set | 467 | # CONFIG_SGI_IOC4 is not set |
| 459 | # CONFIG_TIFM_CORE is not set | 468 | # CONFIG_TIFM_CORE is not set |
| 460 | # CONFIG_ENCLOSURE_SERVICES is not set | 469 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 470 | # CONFIG_HP_ILO is not set | ||
| 461 | CONFIG_HAVE_IDE=y | 471 | CONFIG_HAVE_IDE=y |
| 462 | CONFIG_IDE=y | 472 | CONFIG_IDE=y |
| 463 | CONFIG_IDE_MAX_HWIFS=4 | ||
| 464 | CONFIG_BLK_DEV_IDE=y | 473 | CONFIG_BLK_DEV_IDE=y |
| 465 | 474 | ||
| 466 | # | 475 | # |
| @@ -480,7 +489,6 @@ CONFIG_IDE_PROC_FS=y | |||
| 480 | # | 489 | # |
| 481 | # IDE chipset support/bugfixes | 490 | # IDE chipset support/bugfixes |
| 482 | # | 491 | # |
| 483 | CONFIG_IDE_GENERIC=y | ||
| 484 | # CONFIG_BLK_DEV_PLATFORM is not set | 492 | # CONFIG_BLK_DEV_PLATFORM is not set |
| 485 | 493 | ||
| 486 | # | 494 | # |
| @@ -493,10 +501,8 @@ CONFIG_IDE_GENERIC=y | |||
| 493 | # CONFIG_BLK_DEV_AMD74XX is not set | 501 | # CONFIG_BLK_DEV_AMD74XX is not set |
| 494 | # CONFIG_BLK_DEV_CMD64X is not set | 502 | # CONFIG_BLK_DEV_CMD64X is not set |
| 495 | # CONFIG_BLK_DEV_TRIFLEX is not set | 503 | # CONFIG_BLK_DEV_TRIFLEX is not set |
| 496 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
| 497 | # CONFIG_BLK_DEV_CS5520 is not set | 504 | # CONFIG_BLK_DEV_CS5520 is not set |
| 498 | # CONFIG_BLK_DEV_CS5530 is not set | 505 | # CONFIG_BLK_DEV_CS5530 is not set |
| 499 | # CONFIG_BLK_DEV_HPT34X is not set | ||
| 500 | # CONFIG_BLK_DEV_HPT366 is not set | 506 | # CONFIG_BLK_DEV_HPT366 is not set |
| 501 | # CONFIG_BLK_DEV_JMICRON is not set | 507 | # CONFIG_BLK_DEV_JMICRON is not set |
| 502 | # CONFIG_BLK_DEV_SC1200 is not set | 508 | # CONFIG_BLK_DEV_SC1200 is not set |
| @@ -514,8 +520,6 @@ CONFIG_IDE_GENERIC=y | |||
| 514 | # CONFIG_BLK_DEV_VIA82CXXX is not set | 520 | # CONFIG_BLK_DEV_VIA82CXXX is not set |
| 515 | # CONFIG_BLK_DEV_TC86C001 is not set | 521 | # CONFIG_BLK_DEV_TC86C001 is not set |
| 516 | # CONFIG_BLK_DEV_IDEDMA is not set | 522 | # CONFIG_BLK_DEV_IDEDMA is not set |
| 517 | # CONFIG_BLK_DEV_HD_ONLY is not set | ||
| 518 | # CONFIG_BLK_DEV_HD is not set | ||
| 519 | 523 | ||
| 520 | # | 524 | # |
| 521 | # SCSI device support | 525 | # SCSI device support |
| @@ -594,6 +598,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 594 | # CONFIG_SCSI_NSP32 is not set | 598 | # CONFIG_SCSI_NSP32 is not set |
| 595 | # CONFIG_SCSI_DEBUG is not set | 599 | # CONFIG_SCSI_DEBUG is not set |
| 596 | # CONFIG_SCSI_SRP is not set | 600 | # CONFIG_SCSI_SRP is not set |
| 601 | # CONFIG_SCSI_DH is not set | ||
| 597 | # CONFIG_ATA is not set | 602 | # CONFIG_ATA is not set |
| 598 | # CONFIG_MD is not set | 603 | # CONFIG_MD is not set |
| 599 | # CONFIG_FUSION is not set | 604 | # CONFIG_FUSION is not set |
| @@ -601,12 +606,15 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 601 | # | 606 | # |
| 602 | # IEEE 1394 (FireWire) support | 607 | # IEEE 1394 (FireWire) support |
| 603 | # | 608 | # |
| 609 | |||
| 610 | # | ||
| 611 | # Enable only one of the two stacks, unless you know what you are doing | ||
| 612 | # | ||
| 604 | # CONFIG_FIREWIRE is not set | 613 | # CONFIG_FIREWIRE is not set |
| 605 | # CONFIG_IEEE1394 is not set | 614 | # CONFIG_IEEE1394 is not set |
| 606 | # CONFIG_I2O is not set | 615 | # CONFIG_I2O is not set |
| 607 | # CONFIG_MACINTOSH_DRIVERS is not set | 616 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 608 | CONFIG_NETDEVICES=y | 617 | CONFIG_NETDEVICES=y |
| 609 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 610 | # CONFIG_DUMMY is not set | 618 | # CONFIG_DUMMY is not set |
| 611 | # CONFIG_BONDING is not set | 619 | # CONFIG_BONDING is not set |
| 612 | # CONFIG_MACVLAN is not set | 620 | # CONFIG_MACVLAN is not set |
| @@ -652,7 +660,6 @@ CONFIG_NETDEV_1000=y | |||
| 652 | # CONFIG_DL2K is not set | 660 | # CONFIG_DL2K is not set |
| 653 | # CONFIG_E1000 is not set | 661 | # CONFIG_E1000 is not set |
| 654 | # CONFIG_E1000E is not set | 662 | # CONFIG_E1000E is not set |
| 655 | # CONFIG_E1000E_ENABLED is not set | ||
| 656 | # CONFIG_IP1000 is not set | 663 | # CONFIG_IP1000 is not set |
| 657 | # CONFIG_IGB is not set | 664 | # CONFIG_IGB is not set |
| 658 | # CONFIG_NS83820 is not set | 665 | # CONFIG_NS83820 is not set |
| @@ -666,9 +673,9 @@ CONFIG_NETDEV_1000=y | |||
| 666 | # CONFIG_TIGON3 is not set | 673 | # CONFIG_TIGON3 is not set |
| 667 | # CONFIG_BNX2 is not set | 674 | # CONFIG_BNX2 is not set |
| 668 | CONFIG_GIANFAR=y | 675 | CONFIG_GIANFAR=y |
| 669 | CONFIG_GFAR_NAPI=y | ||
| 670 | # CONFIG_QLA3XXX is not set | 676 | # CONFIG_QLA3XXX is not set |
| 671 | # CONFIG_ATL1 is not set | 677 | # CONFIG_ATL1 is not set |
| 678 | # CONFIG_ATL1E is not set | ||
| 672 | CONFIG_NETDEV_10000=y | 679 | CONFIG_NETDEV_10000=y |
| 673 | # CONFIG_CHELSIO_T1 is not set | 680 | # CONFIG_CHELSIO_T1 is not set |
| 674 | # CONFIG_CHELSIO_T3 is not set | 681 | # CONFIG_CHELSIO_T3 is not set |
| @@ -731,6 +738,7 @@ CONFIG_KEYBOARD_ATKBD=y | |||
| 731 | # CONFIG_KEYBOARD_XTKBD is not set | 738 | # CONFIG_KEYBOARD_XTKBD is not set |
| 732 | # CONFIG_KEYBOARD_NEWTON is not set | 739 | # CONFIG_KEYBOARD_NEWTON is not set |
| 733 | # CONFIG_KEYBOARD_STOWAWAY is not set | 740 | # CONFIG_KEYBOARD_STOWAWAY is not set |
| 741 | # CONFIG_KEYBOARD_GPIO is not set | ||
| 734 | CONFIG_INPUT_MOUSE=y | 742 | CONFIG_INPUT_MOUSE=y |
| 735 | CONFIG_MOUSE_PS2=y | 743 | CONFIG_MOUSE_PS2=y |
| 736 | CONFIG_MOUSE_PS2_ALPS=y | 744 | CONFIG_MOUSE_PS2_ALPS=y |
| @@ -741,7 +749,9 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y | |||
| 741 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 749 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
| 742 | # CONFIG_MOUSE_SERIAL is not set | 750 | # CONFIG_MOUSE_SERIAL is not set |
| 743 | # CONFIG_MOUSE_APPLETOUCH is not set | 751 | # CONFIG_MOUSE_APPLETOUCH is not set |
| 752 | # CONFIG_MOUSE_BCM5974 is not set | ||
| 744 | # CONFIG_MOUSE_VSXXXAA is not set | 753 | # CONFIG_MOUSE_VSXXXAA is not set |
| 754 | # CONFIG_MOUSE_GPIO is not set | ||
| 745 | # CONFIG_INPUT_JOYSTICK is not set | 755 | # CONFIG_INPUT_JOYSTICK is not set |
| 746 | # CONFIG_INPUT_TABLET is not set | 756 | # CONFIG_INPUT_TABLET is not set |
| 747 | # CONFIG_INPUT_TOUCHSCREEN is not set | 757 | # CONFIG_INPUT_TOUCHSCREEN is not set |
| @@ -757,6 +767,7 @@ CONFIG_SERIO_SERPORT=y | |||
| 757 | # CONFIG_SERIO_PCIPS2 is not set | 767 | # CONFIG_SERIO_PCIPS2 is not set |
| 758 | CONFIG_SERIO_LIBPS2=y | 768 | CONFIG_SERIO_LIBPS2=y |
| 759 | # CONFIG_SERIO_RAW is not set | 769 | # CONFIG_SERIO_RAW is not set |
| 770 | # CONFIG_SERIO_XILINX_XPS_PS2 is not set | ||
| 760 | # CONFIG_GAMEPORT is not set | 771 | # CONFIG_GAMEPORT is not set |
| 761 | 772 | ||
| 762 | # | 773 | # |
| @@ -805,44 +816,68 @@ CONFIG_DEVPORT=y | |||
| 805 | CONFIG_I2C=m | 816 | CONFIG_I2C=m |
| 806 | CONFIG_I2C_BOARDINFO=y | 817 | CONFIG_I2C_BOARDINFO=y |
| 807 | CONFIG_I2C_CHARDEV=m | 818 | CONFIG_I2C_CHARDEV=m |
| 819 | CONFIG_I2C_HELPER_AUTO=y | ||
| 808 | 820 | ||
| 809 | # | 821 | # |
| 810 | # I2C Hardware Bus support | 822 | # I2C Hardware Bus support |
| 811 | # | 823 | # |
| 824 | |||
| 825 | # | ||
| 826 | # PC SMBus host controller drivers | ||
| 827 | # | ||
| 812 | # CONFIG_I2C_ALI1535 is not set | 828 | # CONFIG_I2C_ALI1535 is not set |
| 813 | # CONFIG_I2C_ALI1563 is not set | 829 | # CONFIG_I2C_ALI1563 is not set |
| 814 | # CONFIG_I2C_ALI15X3 is not set | 830 | # CONFIG_I2C_ALI15X3 is not set |
| 815 | # CONFIG_I2C_AMD756 is not set | 831 | # CONFIG_I2C_AMD756 is not set |
| 816 | # CONFIG_I2C_AMD8111 is not set | 832 | # CONFIG_I2C_AMD8111 is not set |
| 817 | # CONFIG_I2C_I801 is not set | 833 | # CONFIG_I2C_I801 is not set |
| 818 | # CONFIG_I2C_I810 is not set | 834 | # CONFIG_I2C_ISCH is not set |
| 819 | # CONFIG_I2C_PIIX4 is not set | 835 | # CONFIG_I2C_PIIX4 is not set |
| 820 | # CONFIG_I2C_MPC is not set | ||
| 821 | # CONFIG_I2C_NFORCE2 is not set | 836 | # CONFIG_I2C_NFORCE2 is not set |
| 822 | # CONFIG_I2C_OCORES is not set | ||
| 823 | # CONFIG_I2C_PARPORT is not set | ||
| 824 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 825 | # CONFIG_I2C_PROSAVAGE is not set | ||
| 826 | # CONFIG_I2C_SAVAGE4 is not set | ||
| 827 | # CONFIG_I2C_SIMTEC is not set | ||
| 828 | # CONFIG_I2C_SIS5595 is not set | 837 | # CONFIG_I2C_SIS5595 is not set |
| 829 | # CONFIG_I2C_SIS630 is not set | 838 | # CONFIG_I2C_SIS630 is not set |
| 830 | # CONFIG_I2C_SIS96X is not set | 839 | # CONFIG_I2C_SIS96X is not set |
| 831 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 832 | # CONFIG_I2C_STUB is not set | ||
| 833 | # CONFIG_I2C_VIA is not set | 840 | # CONFIG_I2C_VIA is not set |
| 834 | # CONFIG_I2C_VIAPRO is not set | 841 | # CONFIG_I2C_VIAPRO is not set |
| 842 | |||
| 843 | # | ||
| 844 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 845 | # | ||
| 846 | # CONFIG_I2C_CPM is not set | ||
| 847 | # CONFIG_I2C_GPIO is not set | ||
| 848 | # CONFIG_I2C_MPC is not set | ||
| 849 | # CONFIG_I2C_OCORES is not set | ||
| 850 | # CONFIG_I2C_SIMTEC is not set | ||
| 851 | |||
| 852 | # | ||
| 853 | # External I2C/SMBus adapter drivers | ||
| 854 | # | ||
| 855 | # CONFIG_I2C_PARPORT is not set | ||
| 856 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 857 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 858 | |||
| 859 | # | ||
| 860 | # Graphics adapter I2C/DDC channel drivers | ||
| 861 | # | ||
| 835 | # CONFIG_I2C_VOODOO3 is not set | 862 | # CONFIG_I2C_VOODOO3 is not set |
| 863 | |||
| 864 | # | ||
| 865 | # Other I2C/SMBus bus drivers | ||
| 866 | # | ||
| 836 | # CONFIG_I2C_PCA_PLATFORM is not set | 867 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 868 | # CONFIG_I2C_STUB is not set | ||
| 837 | 869 | ||
| 838 | # | 870 | # |
| 839 | # Miscellaneous I2C Chip support | 871 | # Miscellaneous I2C Chip support |
| 840 | # | 872 | # |
| 841 | # CONFIG_DS1682 is not set | 873 | # CONFIG_DS1682 is not set |
| 874 | # CONFIG_AT24 is not set | ||
| 842 | # CONFIG_SENSORS_EEPROM is not set | 875 | # CONFIG_SENSORS_EEPROM is not set |
| 843 | # CONFIG_SENSORS_PCF8574 is not set | 876 | # CONFIG_SENSORS_PCF8574 is not set |
| 844 | # CONFIG_PCF8575 is not set | 877 | # CONFIG_PCF8575 is not set |
| 878 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 845 | # CONFIG_SENSORS_PCF8591 is not set | 879 | # CONFIG_SENSORS_PCF8591 is not set |
| 880 | # CONFIG_TPS65010 is not set | ||
| 846 | # CONFIG_SENSORS_MAX6875 is not set | 881 | # CONFIG_SENSORS_MAX6875 is not set |
| 847 | # CONFIG_SENSORS_TSL2550 is not set | 882 | # CONFIG_SENSORS_TSL2550 is not set |
| 848 | # CONFIG_I2C_DEBUG_CORE is not set | 883 | # CONFIG_I2C_DEBUG_CORE is not set |
| @@ -850,10 +885,32 @@ CONFIG_I2C_CHARDEV=m | |||
| 850 | # CONFIG_I2C_DEBUG_BUS is not set | 885 | # CONFIG_I2C_DEBUG_BUS is not set |
| 851 | # CONFIG_I2C_DEBUG_CHIP is not set | 886 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 852 | # CONFIG_SPI is not set | 887 | # CONFIG_SPI is not set |
| 888 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 889 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | ||
| 890 | CONFIG_GPIOLIB=y | ||
| 891 | # CONFIG_DEBUG_GPIO is not set | ||
| 892 | # CONFIG_GPIO_SYSFS is not set | ||
| 893 | |||
| 894 | # | ||
| 895 | # I2C GPIO expanders: | ||
| 896 | # | ||
| 897 | # CONFIG_GPIO_MAX732X is not set | ||
| 898 | # CONFIG_GPIO_PCA953X is not set | ||
| 899 | # CONFIG_GPIO_PCF857X is not set | ||
| 900 | |||
| 901 | # | ||
| 902 | # PCI GPIO expanders: | ||
| 903 | # | ||
| 904 | # CONFIG_GPIO_BT8XX is not set | ||
| 905 | |||
| 906 | # | ||
| 907 | # SPI GPIO expanders: | ||
| 908 | # | ||
| 853 | # CONFIG_W1 is not set | 909 | # CONFIG_W1 is not set |
| 854 | # CONFIG_POWER_SUPPLY is not set | 910 | # CONFIG_POWER_SUPPLY is not set |
| 855 | CONFIG_HWMON=y | 911 | CONFIG_HWMON=y |
| 856 | # CONFIG_HWMON_VID is not set | 912 | # CONFIG_HWMON_VID is not set |
| 913 | # CONFIG_SENSORS_AD7414 is not set | ||
| 857 | # CONFIG_SENSORS_AD7418 is not set | 914 | # CONFIG_SENSORS_AD7418 is not set |
| 858 | # CONFIG_SENSORS_ADM1021 is not set | 915 | # CONFIG_SENSORS_ADM1021 is not set |
| 859 | # CONFIG_SENSORS_ADM1025 is not set | 916 | # CONFIG_SENSORS_ADM1025 is not set |
| @@ -907,6 +964,7 @@ CONFIG_HWMON=y | |||
| 907 | # CONFIG_SENSORS_W83627EHF is not set | 964 | # CONFIG_SENSORS_W83627EHF is not set |
| 908 | # CONFIG_HWMON_DEBUG_CHIP is not set | 965 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 909 | # CONFIG_THERMAL is not set | 966 | # CONFIG_THERMAL is not set |
| 967 | # CONFIG_THERMAL_HWMON is not set | ||
| 910 | # CONFIG_WATCHDOG is not set | 968 | # CONFIG_WATCHDOG is not set |
| 911 | 969 | ||
| 912 | # | 970 | # |
| @@ -918,8 +976,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 918 | # | 976 | # |
| 919 | # Multifunction device drivers | 977 | # Multifunction device drivers |
| 920 | # | 978 | # |
| 979 | # CONFIG_MFD_CORE is not set | ||
| 921 | # CONFIG_MFD_SM501 is not set | 980 | # CONFIG_MFD_SM501 is not set |
| 922 | # CONFIG_HTC_PASIC3 is not set | 981 | # CONFIG_HTC_PASIC3 is not set |
| 982 | # CONFIG_MFD_TMIO is not set | ||
| 923 | 983 | ||
| 924 | # | 984 | # |
| 925 | # Multimedia devices | 985 | # Multimedia devices |
| @@ -958,20 +1018,8 @@ CONFIG_DRM=m | |||
| 958 | # Display device support | 1018 | # Display device support |
| 959 | # | 1019 | # |
| 960 | # CONFIG_DISPLAY_SUPPORT is not set | 1020 | # CONFIG_DISPLAY_SUPPORT is not set |
| 961 | |||
| 962 | # | ||
| 963 | # Sound | ||
| 964 | # | ||
| 965 | CONFIG_SOUND=m | 1021 | CONFIG_SOUND=m |
| 966 | |||
| 967 | # | ||
| 968 | # Advanced Linux Sound Architecture | ||
| 969 | # | ||
| 970 | # CONFIG_SND is not set | 1022 | # CONFIG_SND is not set |
| 971 | |||
| 972 | # | ||
| 973 | # Open Sound System | ||
| 974 | # | ||
| 975 | # CONFIG_SOUND_PRIME is not set | 1023 | # CONFIG_SOUND_PRIME is not set |
| 976 | CONFIG_HID_SUPPORT=y | 1024 | CONFIG_HID_SUPPORT=y |
| 977 | CONFIG_HID=y | 1025 | CONFIG_HID=y |
| @@ -986,6 +1034,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 986 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 1034 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
| 987 | 1035 | ||
| 988 | # | 1036 | # |
| 1037 | # Enable Host or Gadget support to see Inventra options | ||
| 1038 | # | ||
| 1039 | |||
| 1040 | # | ||
| 989 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1041 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 990 | # | 1042 | # |
| 991 | # CONFIG_USB_GADGET is not set | 1043 | # CONFIG_USB_GADGET is not set |
| @@ -1070,6 +1122,7 @@ CONFIG_TMPFS=y | |||
| 1070 | CONFIG_CRAMFS=m | 1122 | CONFIG_CRAMFS=m |
| 1071 | # CONFIG_VXFS_FS is not set | 1123 | # CONFIG_VXFS_FS is not set |
| 1072 | # CONFIG_MINIX_FS is not set | 1124 | # CONFIG_MINIX_FS is not set |
| 1125 | # CONFIG_OMFS_FS is not set | ||
| 1073 | # CONFIG_HPFS_FS is not set | 1126 | # CONFIG_HPFS_FS is not set |
| 1074 | # CONFIG_QNX4FS_FS is not set | 1127 | # CONFIG_QNX4FS_FS is not set |
| 1075 | # CONFIG_ROMFS_FS is not set | 1128 | # CONFIG_ROMFS_FS is not set |
| @@ -1080,13 +1133,12 @@ CONFIG_NFS_FS=y | |||
| 1080 | CONFIG_NFS_V3=y | 1133 | CONFIG_NFS_V3=y |
| 1081 | # CONFIG_NFS_V3_ACL is not set | 1134 | # CONFIG_NFS_V3_ACL is not set |
| 1082 | # CONFIG_NFS_V4 is not set | 1135 | # CONFIG_NFS_V4 is not set |
| 1083 | # CONFIG_NFSD is not set | ||
| 1084 | CONFIG_ROOT_NFS=y | 1136 | CONFIG_ROOT_NFS=y |
| 1137 | # CONFIG_NFSD is not set | ||
| 1085 | CONFIG_LOCKD=y | 1138 | CONFIG_LOCKD=y |
| 1086 | CONFIG_LOCKD_V4=y | 1139 | CONFIG_LOCKD_V4=y |
| 1087 | CONFIG_NFS_COMMON=y | 1140 | CONFIG_NFS_COMMON=y |
| 1088 | CONFIG_SUNRPC=y | 1141 | CONFIG_SUNRPC=y |
| 1089 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 1090 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1142 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 1091 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1143 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1092 | CONFIG_SMB_FS=m | 1144 | CONFIG_SMB_FS=m |
| @@ -1150,6 +1202,7 @@ CONFIG_BITREVERSE=y | |||
| 1150 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1202 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 1151 | CONFIG_CRC_CCITT=y | 1203 | CONFIG_CRC_CCITT=y |
| 1152 | # CONFIG_CRC16 is not set | 1204 | # CONFIG_CRC16 is not set |
| 1205 | CONFIG_CRC_T10DIF=m | ||
| 1153 | CONFIG_CRC_ITU_T=m | 1206 | CONFIG_CRC_ITU_T=m |
| 1154 | CONFIG_CRC32=y | 1207 | CONFIG_CRC32=y |
| 1155 | # CONFIG_CRC7 is not set | 1208 | # CONFIG_CRC7 is not set |
| @@ -1175,6 +1228,8 @@ CONFIG_FRAME_WARN=1024 | |||
| 1175 | CONFIG_DEBUG_KERNEL=y | 1228 | CONFIG_DEBUG_KERNEL=y |
| 1176 | # CONFIG_DEBUG_SHIRQ is not set | 1229 | # CONFIG_DEBUG_SHIRQ is not set |
| 1177 | CONFIG_DETECT_SOFTLOCKUP=y | 1230 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1231 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 1232 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 1178 | CONFIG_SCHED_DEBUG=y | 1233 | CONFIG_SCHED_DEBUG=y |
| 1179 | # CONFIG_SCHEDSTATS is not set | 1234 | # CONFIG_SCHEDSTATS is not set |
| 1180 | # CONFIG_TIMER_STATS is not set | 1235 | # CONFIG_TIMER_STATS is not set |
| @@ -1193,18 +1248,29 @@ CONFIG_SCHED_DEBUG=y | |||
| 1193 | # CONFIG_DEBUG_INFO is not set | 1248 | # CONFIG_DEBUG_INFO is not set |
| 1194 | # CONFIG_DEBUG_VM is not set | 1249 | # CONFIG_DEBUG_VM is not set |
| 1195 | # CONFIG_DEBUG_WRITECOUNT is not set | 1250 | # CONFIG_DEBUG_WRITECOUNT is not set |
| 1251 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 1196 | # CONFIG_DEBUG_LIST is not set | 1252 | # CONFIG_DEBUG_LIST is not set |
| 1197 | # CONFIG_DEBUG_SG is not set | 1253 | # CONFIG_DEBUG_SG is not set |
| 1198 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1254 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 1199 | # CONFIG_RCU_TORTURE_TEST is not set | 1255 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1200 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1256 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 1201 | # CONFIG_FAULT_INJECTION is not set | 1257 | # CONFIG_FAULT_INJECTION is not set |
| 1258 | # CONFIG_LATENCYTOP is not set | ||
| 1259 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1260 | CONFIG_HAVE_FTRACE=y | ||
| 1261 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1262 | # CONFIG_FTRACE is not set | ||
| 1263 | # CONFIG_SCHED_TRACER is not set | ||
| 1264 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1202 | # CONFIG_SAMPLES is not set | 1265 | # CONFIG_SAMPLES is not set |
| 1266 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1267 | # CONFIG_KGDB is not set | ||
| 1203 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1268 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
| 1204 | # CONFIG_DEBUG_STACK_USAGE is not set | 1269 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1205 | # CONFIG_DEBUG_PAGEALLOC is not set | 1270 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1206 | # CONFIG_DEBUGGER is not set | 1271 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
| 1207 | # CONFIG_KGDB_CONSOLE is not set | 1272 | # CONFIG_FTR_FIXUP_SELFTEST is not set |
| 1273 | # CONFIG_XMON is not set | ||
| 1208 | # CONFIG_IRQSTACKS is not set | 1274 | # CONFIG_IRQSTACKS is not set |
| 1209 | CONFIG_BDI_SWITCH=y | 1275 | CONFIG_BDI_SWITCH=y |
| 1210 | # CONFIG_PPC_EARLY_DEBUG is not set | 1276 | # CONFIG_PPC_EARLY_DEBUG is not set |
| @@ -1258,6 +1324,10 @@ CONFIG_CRYPTO=y | |||
| 1258 | # CONFIG_CRYPTO_MD4 is not set | 1324 | # CONFIG_CRYPTO_MD4 is not set |
| 1259 | # CONFIG_CRYPTO_MD5 is not set | 1325 | # CONFIG_CRYPTO_MD5 is not set |
| 1260 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1326 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 1327 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1328 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1329 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1330 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1261 | # CONFIG_CRYPTO_SHA1 is not set | 1331 | # CONFIG_CRYPTO_SHA1 is not set |
| 1262 | # CONFIG_CRYPTO_SHA256 is not set | 1332 | # CONFIG_CRYPTO_SHA256 is not set |
| 1263 | # CONFIG_CRYPTO_SHA512 is not set | 1333 | # CONFIG_CRYPTO_SHA512 is not set |
| @@ -1290,6 +1360,7 @@ CONFIG_CRYPTO=y | |||
| 1290 | # CONFIG_CRYPTO_LZO is not set | 1360 | # CONFIG_CRYPTO_LZO is not set |
| 1291 | CONFIG_CRYPTO_HW=y | 1361 | CONFIG_CRYPTO_HW=y |
| 1292 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1362 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1293 | # CONFIG_PPC_CLOCK is not set | 1363 | # CONFIG_CRYPTO_DEV_TALITOS is not set |
| 1364 | CONFIG_PPC_CLOCK=y | ||
| 1294 | CONFIG_PPC_LIB_RHEAP=y | 1365 | CONFIG_PPC_LIB_RHEAP=y |
| 1295 | # CONFIG_VIRTUALIZATION is not set | 1366 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/85xx/tqm8540_defconfig b/arch/powerpc/configs/85xx/tqm8540_defconfig index e0b5559e84aa..1b2d5d577915 100644 --- a/arch/powerpc/configs/85xx/tqm8540_defconfig +++ b/arch/powerpc/configs/85xx/tqm8540_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.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Mon Jun 9 08:52:39 2008 | 4 | # Thu Aug 21 00:52:37 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -15,6 +15,7 @@ CONFIG_PPC_85xx=y | |||
| 15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
| 16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
| 17 | CONFIG_E500=y | 17 | CONFIG_E500=y |
| 18 | # CONFIG_PPC_E500MC is not set | ||
| 18 | CONFIG_BOOKE=y | 19 | CONFIG_BOOKE=y |
| 19 | CONFIG_FSL_BOOKE=y | 20 | CONFIG_FSL_BOOKE=y |
| 20 | CONFIG_FSL_EMB_PERFMON=y | 21 | CONFIG_FSL_EMB_PERFMON=y |
| @@ -33,6 +34,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 35 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | 36 | CONFIG_STACKTRACE_SUPPORT=y |
| 37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | 38 | CONFIG_LOCKDEP_SUPPORT=y |
| 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 38 | CONFIG_ARCH_HAS_ILOG2_U32=y | 40 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| @@ -89,7 +91,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 89 | CONFIG_SYSCTL=y | 91 | CONFIG_SYSCTL=y |
| 90 | CONFIG_EMBEDDED=y | 92 | CONFIG_EMBEDDED=y |
| 91 | CONFIG_SYSCTL_SYSCALL=y | 93 | CONFIG_SYSCTL_SYSCALL=y |
| 92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 93 | # CONFIG_KALLSYMS is not set | 94 | # CONFIG_KALLSYMS is not set |
| 94 | # CONFIG_HOTPLUG is not set | 95 | # CONFIG_HOTPLUG is not set |
| 95 | CONFIG_PRINTK=y | 96 | CONFIG_PRINTK=y |
| @@ -112,10 +113,16 @@ CONFIG_SLUB=y | |||
| 112 | # CONFIG_PROFILING is not set | 113 | # CONFIG_PROFILING is not set |
| 113 | # CONFIG_MARKERS is not set | 114 | # CONFIG_MARKERS is not set |
| 114 | CONFIG_HAVE_OPROFILE=y | 115 | CONFIG_HAVE_OPROFILE=y |
| 116 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 117 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 115 | CONFIG_HAVE_KPROBES=y | 118 | CONFIG_HAVE_KPROBES=y |
| 116 | CONFIG_HAVE_KRETPROBES=y | 119 | CONFIG_HAVE_KRETPROBES=y |
| 120 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 117 | # CONFIG_HAVE_DMA_ATTRS is not set | 121 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 122 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 123 | # CONFIG_HAVE_CLK is not set | ||
| 118 | CONFIG_PROC_PAGE_MONITOR=y | 124 | CONFIG_PROC_PAGE_MONITOR=y |
| 125 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 119 | CONFIG_SLABINFO=y | 126 | CONFIG_SLABINFO=y |
| 120 | CONFIG_RT_MUTEXES=y | 127 | CONFIG_RT_MUTEXES=y |
| 121 | # CONFIG_TINY_SHMEM is not set | 128 | # CONFIG_TINY_SHMEM is not set |
| @@ -126,6 +133,7 @@ CONFIG_BLOCK=y | |||
| 126 | # CONFIG_BLK_DEV_IO_TRACE is not set | 133 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 127 | # CONFIG_LSF is not set | 134 | # CONFIG_LSF is not set |
| 128 | # CONFIG_BLK_DEV_BSG is not set | 135 | # CONFIG_BLK_DEV_BSG is not set |
| 136 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 129 | 137 | ||
| 130 | # | 138 | # |
| 131 | # IO Schedulers | 139 | # IO Schedulers |
| @@ -144,8 +152,6 @@ CONFIG_CLASSIC_RCU=y | |||
| 144 | # | 152 | # |
| 145 | # Platform support | 153 | # Platform support |
| 146 | # | 154 | # |
| 147 | # CONFIG_PPC_MPC512x is not set | ||
| 148 | # CONFIG_PPC_MPC5121 is not set | ||
| 149 | # CONFIG_PPC_CELL is not set | 155 | # CONFIG_PPC_CELL is not set |
| 150 | # CONFIG_PPC_CELL_NATIVE is not set | 156 | # CONFIG_PPC_CELL_NATIVE is not set |
| 151 | # CONFIG_PQ2ADS is not set | 157 | # CONFIG_PQ2ADS is not set |
| @@ -154,11 +160,13 @@ CONFIG_MPC85xx=y | |||
| 154 | # CONFIG_MPC8560_ADS is not set | 160 | # CONFIG_MPC8560_ADS is not set |
| 155 | # CONFIG_MPC85xx_CDS is not set | 161 | # CONFIG_MPC85xx_CDS is not set |
| 156 | # CONFIG_MPC85xx_MDS is not set | 162 | # CONFIG_MPC85xx_MDS is not set |
| 163 | # CONFIG_MPC8536_DS is not set | ||
| 157 | # CONFIG_MPC85xx_DS is not set | 164 | # CONFIG_MPC85xx_DS is not set |
| 158 | # CONFIG_KSI8560 is not set | 165 | # CONFIG_KSI8560 is not set |
| 159 | # CONFIG_STX_GP3 is not set | 166 | # CONFIG_STX_GP3 is not set |
| 160 | CONFIG_TQM8540=y | 167 | CONFIG_TQM8540=y |
| 161 | # CONFIG_TQM8541 is not set | 168 | # CONFIG_TQM8541 is not set |
| 169 | # CONFIG_TQM8548 is not set | ||
| 162 | # CONFIG_TQM8555 is not set | 170 | # CONFIG_TQM8555 is not set |
| 163 | # CONFIG_TQM8560 is not set | 171 | # CONFIG_TQM8560 is not set |
| 164 | # CONFIG_SBC8548 is not set | 172 | # CONFIG_SBC8548 is not set |
| @@ -214,6 +222,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 214 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 222 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 215 | CONFIG_PAGEFLAGS_EXTENDED=y | 223 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 216 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 224 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 225 | CONFIG_MIGRATION=y | ||
| 217 | # CONFIG_RESOURCES_64BIT is not set | 226 | # CONFIG_RESOURCES_64BIT is not set |
| 218 | CONFIG_ZONE_DMA_FLAG=1 | 227 | CONFIG_ZONE_DMA_FLAG=1 |
| 219 | CONFIG_BOUNCE=y | 228 | CONFIG_BOUNCE=y |
| @@ -221,6 +230,7 @@ CONFIG_VIRT_TO_BUS=y | |||
| 221 | CONFIG_FORCE_MAX_ZONEORDER=11 | 230 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 222 | # CONFIG_PROC_DEVICETREE is not set | 231 | # CONFIG_PROC_DEVICETREE is not set |
| 223 | # CONFIG_CMDLINE_BOOL is not set | 232 | # CONFIG_CMDLINE_BOOL is not set |
| 233 | CONFIG_EXTRA_TARGETS="" | ||
| 224 | # CONFIG_PM is not set | 234 | # CONFIG_PM is not set |
| 225 | CONFIG_SECCOMP=y | 235 | CONFIG_SECCOMP=y |
| 226 | CONFIG_ISA_DMA_API=y | 236 | CONFIG_ISA_DMA_API=y |
| @@ -232,6 +242,7 @@ CONFIG_ZONE_DMA=y | |||
| 232 | CONFIG_PPC_INDIRECT_PCI=y | 242 | CONFIG_PPC_INDIRECT_PCI=y |
| 233 | CONFIG_FSL_SOC=y | 243 | CONFIG_FSL_SOC=y |
| 234 | CONFIG_FSL_PCI=y | 244 | CONFIG_FSL_PCI=y |
| 245 | CONFIG_PPC_PCI_CHOICE=y | ||
| 235 | CONFIG_PCI=y | 246 | CONFIG_PCI=y |
| 236 | CONFIG_PCI_DOMAINS=y | 247 | CONFIG_PCI_DOMAINS=y |
| 237 | CONFIG_PCI_SYSCALL=y | 248 | CONFIG_PCI_SYSCALL=y |
| @@ -255,10 +266,6 @@ CONFIG_KERNEL_START=0xc0000000 | |||
| 255 | CONFIG_PHYSICAL_START=0x00000000 | 266 | CONFIG_PHYSICAL_START=0x00000000 |
| 256 | CONFIG_PHYSICAL_ALIGN=0x10000000 | 267 | CONFIG_PHYSICAL_ALIGN=0x10000000 |
| 257 | CONFIG_TASK_SIZE=0xc0000000 | 268 | CONFIG_TASK_SIZE=0xc0000000 |
| 258 | |||
| 259 | # | ||
| 260 | # Networking | ||
| 261 | # | ||
| 262 | CONFIG_NET=y | 269 | CONFIG_NET=y |
| 263 | 270 | ||
| 264 | # | 271 | # |
| @@ -449,20 +456,22 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
| 449 | # CONFIG_BLK_DEV_XIP is not set | 456 | # CONFIG_BLK_DEV_XIP is not set |
| 450 | # CONFIG_CDROM_PKTCDVD is not set | 457 | # CONFIG_CDROM_PKTCDVD is not set |
| 451 | # CONFIG_ATA_OVER_ETH is not set | 458 | # CONFIG_ATA_OVER_ETH is not set |
| 459 | # CONFIG_BLK_DEV_HD is not set | ||
| 452 | CONFIG_MISC_DEVICES=y | 460 | CONFIG_MISC_DEVICES=y |
| 453 | # CONFIG_PHANTOM is not set | 461 | # CONFIG_PHANTOM is not set |
| 454 | # CONFIG_EEPROM_93CX6 is not set | 462 | # CONFIG_EEPROM_93CX6 is not set |
| 455 | # CONFIG_SGI_IOC4 is not set | 463 | # CONFIG_SGI_IOC4 is not set |
| 456 | # CONFIG_TIFM_CORE is not set | 464 | # CONFIG_TIFM_CORE is not set |
| 457 | # CONFIG_ENCLOSURE_SERVICES is not set | 465 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 466 | # CONFIG_HP_ILO is not set | ||
| 458 | CONFIG_HAVE_IDE=y | 467 | CONFIG_HAVE_IDE=y |
| 459 | CONFIG_IDE=y | 468 | CONFIG_IDE=y |
| 460 | CONFIG_IDE_MAX_HWIFS=4 | ||
| 461 | CONFIG_BLK_DEV_IDE=y | 469 | CONFIG_BLK_DEV_IDE=y |
| 462 | 470 | ||
| 463 | # | 471 | # |
| 464 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | 472 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
| 465 | # | 473 | # |
| 474 | CONFIG_IDE_TIMINGS=y | ||
| 466 | # CONFIG_BLK_DEV_IDE_SATA is not set | 475 | # CONFIG_BLK_DEV_IDE_SATA is not set |
| 467 | CONFIG_BLK_DEV_IDEDISK=y | 476 | CONFIG_BLK_DEV_IDEDISK=y |
| 468 | # CONFIG_IDEDISK_MULTI_MODE is not set | 477 | # CONFIG_IDEDISK_MULTI_MODE is not set |
| @@ -475,7 +484,6 @@ CONFIG_IDE_PROC_FS=y | |||
| 475 | # | 484 | # |
| 476 | # IDE chipset support/bugfixes | 485 | # IDE chipset support/bugfixes |
| 477 | # | 486 | # |
| 478 | CONFIG_IDE_GENERIC=y | ||
| 479 | # CONFIG_BLK_DEV_PLATFORM is not set | 487 | # CONFIG_BLK_DEV_PLATFORM is not set |
| 480 | CONFIG_BLK_DEV_IDEDMA_SFF=y | 488 | CONFIG_BLK_DEV_IDEDMA_SFF=y |
| 481 | 489 | ||
| @@ -493,10 +501,8 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
| 493 | # CONFIG_BLK_DEV_AMD74XX is not set | 501 | # CONFIG_BLK_DEV_AMD74XX is not set |
| 494 | # CONFIG_BLK_DEV_CMD64X is not set | 502 | # CONFIG_BLK_DEV_CMD64X is not set |
| 495 | # CONFIG_BLK_DEV_TRIFLEX is not set | 503 | # CONFIG_BLK_DEV_TRIFLEX is not set |
| 496 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
| 497 | # CONFIG_BLK_DEV_CS5520 is not set | 504 | # CONFIG_BLK_DEV_CS5520 is not set |
| 498 | # CONFIG_BLK_DEV_CS5530 is not set | 505 | # CONFIG_BLK_DEV_CS5530 is not set |
| 499 | # CONFIG_BLK_DEV_HPT34X is not set | ||
| 500 | # CONFIG_BLK_DEV_HPT366 is not set | 506 | # CONFIG_BLK_DEV_HPT366 is not set |
| 501 | # CONFIG_BLK_DEV_JMICRON is not set | 507 | # CONFIG_BLK_DEV_JMICRON is not set |
| 502 | # CONFIG_BLK_DEV_SC1200 is not set | 508 | # CONFIG_BLK_DEV_SC1200 is not set |
| @@ -514,8 +520,6 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
| 514 | CONFIG_BLK_DEV_VIA82CXXX=y | 520 | CONFIG_BLK_DEV_VIA82CXXX=y |
| 515 | # CONFIG_BLK_DEV_TC86C001 is not set | 521 | # CONFIG_BLK_DEV_TC86C001 is not set |
| 516 | CONFIG_BLK_DEV_IDEDMA=y | 522 | CONFIG_BLK_DEV_IDEDMA=y |
| 517 | # CONFIG_BLK_DEV_HD_ONLY is not set | ||
| 518 | # CONFIG_BLK_DEV_HD is not set | ||
| 519 | 523 | ||
| 520 | # | 524 | # |
| 521 | # SCSI device support | 525 | # SCSI device support |
| @@ -531,12 +535,15 @@ CONFIG_BLK_DEV_IDEDMA=y | |||
| 531 | # | 535 | # |
| 532 | # IEEE 1394 (FireWire) support | 536 | # IEEE 1394 (FireWire) support |
| 533 | # | 537 | # |
| 538 | |||
| 539 | # | ||
| 540 | # Enable only one of the two stacks, unless you know what you are doing | ||
| 541 | # | ||
| 534 | # CONFIG_FIREWIRE is not set | 542 | # CONFIG_FIREWIRE is not set |
| 535 | # CONFIG_IEEE1394 is not set | 543 | # CONFIG_IEEE1394 is not set |
| 536 | # CONFIG_I2O is not set | 544 | # CONFIG_I2O is not set |
| 537 | # CONFIG_MACINTOSH_DRIVERS is not set | 545 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 538 | CONFIG_NETDEVICES=y | 546 | CONFIG_NETDEVICES=y |
| 539 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 540 | # CONFIG_DUMMY is not set | 547 | # CONFIG_DUMMY is not set |
| 541 | # CONFIG_BONDING is not set | 548 | # CONFIG_BONDING is not set |
| 542 | # CONFIG_MACVLAN is not set | 549 | # CONFIG_MACVLAN is not set |
| @@ -598,7 +605,6 @@ CONFIG_NETDEV_1000=y | |||
| 598 | # CONFIG_DL2K is not set | 605 | # CONFIG_DL2K is not set |
| 599 | # CONFIG_E1000 is not set | 606 | # CONFIG_E1000 is not set |
| 600 | # CONFIG_E1000E is not set | 607 | # CONFIG_E1000E is not set |
| 601 | # CONFIG_E1000E_ENABLED is not set | ||
| 602 | # CONFIG_IP1000 is not set | 608 | # CONFIG_IP1000 is not set |
| 603 | # CONFIG_IGB is not set | 609 | # CONFIG_IGB is not set |
| 604 | # CONFIG_NS83820 is not set | 610 | # CONFIG_NS83820 is not set |
| @@ -612,9 +618,9 @@ CONFIG_NETDEV_1000=y | |||
| 612 | # CONFIG_TIGON3 is not set | 618 | # CONFIG_TIGON3 is not set |
| 613 | # CONFIG_BNX2 is not set | 619 | # CONFIG_BNX2 is not set |
| 614 | CONFIG_GIANFAR=y | 620 | CONFIG_GIANFAR=y |
| 615 | CONFIG_GFAR_NAPI=y | ||
| 616 | # CONFIG_QLA3XXX is not set | 621 | # CONFIG_QLA3XXX is not set |
| 617 | # CONFIG_ATL1 is not set | 622 | # CONFIG_ATL1 is not set |
| 623 | # CONFIG_ATL1E is not set | ||
| 618 | CONFIG_NETDEV_10000=y | 624 | CONFIG_NETDEV_10000=y |
| 619 | # CONFIG_CHELSIO_T1 is not set | 625 | # CONFIG_CHELSIO_T1 is not set |
| 620 | # CONFIG_CHELSIO_T3 is not set | 626 | # CONFIG_CHELSIO_T3 is not set |
| @@ -721,41 +727,62 @@ CONFIG_DEVPORT=y | |||
| 721 | CONFIG_I2C=y | 727 | CONFIG_I2C=y |
| 722 | CONFIG_I2C_BOARDINFO=y | 728 | CONFIG_I2C_BOARDINFO=y |
| 723 | CONFIG_I2C_CHARDEV=y | 729 | CONFIG_I2C_CHARDEV=y |
| 730 | CONFIG_I2C_HELPER_AUTO=y | ||
| 724 | 731 | ||
| 725 | # | 732 | # |
| 726 | # I2C Hardware Bus support | 733 | # I2C Hardware Bus support |
| 727 | # | 734 | # |
| 735 | |||
| 736 | # | ||
| 737 | # PC SMBus host controller drivers | ||
| 738 | # | ||
| 728 | # CONFIG_I2C_ALI1535 is not set | 739 | # CONFIG_I2C_ALI1535 is not set |
| 729 | # CONFIG_I2C_ALI1563 is not set | 740 | # CONFIG_I2C_ALI1563 is not set |
| 730 | # CONFIG_I2C_ALI15X3 is not set | 741 | # CONFIG_I2C_ALI15X3 is not set |
| 731 | # CONFIG_I2C_AMD756 is not set | 742 | # CONFIG_I2C_AMD756 is not set |
| 732 | # CONFIG_I2C_AMD8111 is not set | 743 | # CONFIG_I2C_AMD8111 is not set |
| 733 | # CONFIG_I2C_I801 is not set | 744 | # CONFIG_I2C_I801 is not set |
| 734 | # CONFIG_I2C_I810 is not set | 745 | # CONFIG_I2C_ISCH is not set |
| 735 | # CONFIG_I2C_PIIX4 is not set | 746 | # CONFIG_I2C_PIIX4 is not set |
| 736 | CONFIG_I2C_MPC=y | ||
| 737 | # CONFIG_I2C_NFORCE2 is not set | 747 | # CONFIG_I2C_NFORCE2 is not set |
| 738 | # CONFIG_I2C_OCORES is not set | ||
| 739 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 740 | # CONFIG_I2C_PROSAVAGE is not set | ||
| 741 | # CONFIG_I2C_SAVAGE4 is not set | ||
| 742 | # CONFIG_I2C_SIMTEC is not set | ||
| 743 | # CONFIG_I2C_SIS5595 is not set | 748 | # CONFIG_I2C_SIS5595 is not set |
| 744 | # CONFIG_I2C_SIS630 is not set | 749 | # CONFIG_I2C_SIS630 is not set |
| 745 | # CONFIG_I2C_SIS96X is not set | 750 | # CONFIG_I2C_SIS96X is not set |
| 746 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 747 | # CONFIG_I2C_VIA is not set | 751 | # CONFIG_I2C_VIA is not set |
| 748 | # CONFIG_I2C_VIAPRO is not set | 752 | # CONFIG_I2C_VIAPRO is not set |
| 753 | |||
| 754 | # | ||
| 755 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 756 | # | ||
| 757 | CONFIG_I2C_MPC=y | ||
| 758 | # CONFIG_I2C_OCORES is not set | ||
| 759 | # CONFIG_I2C_SIMTEC is not set | ||
| 760 | |||
| 761 | # | ||
| 762 | # External I2C/SMBus adapter drivers | ||
| 763 | # | ||
| 764 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 765 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 766 | |||
| 767 | # | ||
| 768 | # Graphics adapter I2C/DDC channel drivers | ||
| 769 | # | ||
| 749 | # CONFIG_I2C_VOODOO3 is not set | 770 | # CONFIG_I2C_VOODOO3 is not set |
| 771 | |||
| 772 | # | ||
| 773 | # Other I2C/SMBus bus drivers | ||
| 774 | # | ||
| 750 | # CONFIG_I2C_PCA_PLATFORM is not set | 775 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 751 | 776 | ||
| 752 | # | 777 | # |
| 753 | # Miscellaneous I2C Chip support | 778 | # Miscellaneous I2C Chip support |
| 754 | # | 779 | # |
| 755 | # CONFIG_DS1682 is not set | 780 | # CONFIG_DS1682 is not set |
| 781 | # CONFIG_AT24 is not set | ||
| 756 | # CONFIG_SENSORS_EEPROM is not set | 782 | # CONFIG_SENSORS_EEPROM is not set |
| 757 | # CONFIG_SENSORS_PCF8574 is not set | 783 | # CONFIG_SENSORS_PCF8574 is not set |
| 758 | # CONFIG_PCF8575 is not set | 784 | # CONFIG_PCF8575 is not set |
| 785 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 759 | # CONFIG_SENSORS_PCF8591 is not set | 786 | # CONFIG_SENSORS_PCF8591 is not set |
| 760 | # CONFIG_SENSORS_MAX6875 is not set | 787 | # CONFIG_SENSORS_MAX6875 is not set |
| 761 | # CONFIG_SENSORS_TSL2550 is not set | 788 | # CONFIG_SENSORS_TSL2550 is not set |
| @@ -764,10 +791,13 @@ CONFIG_I2C_MPC=y | |||
| 764 | # CONFIG_I2C_DEBUG_BUS is not set | 791 | # CONFIG_I2C_DEBUG_BUS is not set |
| 765 | # CONFIG_I2C_DEBUG_CHIP is not set | 792 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 766 | # CONFIG_SPI is not set | 793 | # CONFIG_SPI is not set |
| 794 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 795 | # CONFIG_GPIOLIB is not set | ||
| 767 | # CONFIG_W1 is not set | 796 | # CONFIG_W1 is not set |
| 768 | # CONFIG_POWER_SUPPLY is not set | 797 | # CONFIG_POWER_SUPPLY is not set |
| 769 | CONFIG_HWMON=y | 798 | CONFIG_HWMON=y |
| 770 | # CONFIG_HWMON_VID is not set | 799 | # CONFIG_HWMON_VID is not set |
| 800 | # CONFIG_SENSORS_AD7414 is not set | ||
| 771 | # CONFIG_SENSORS_AD7418 is not set | 801 | # CONFIG_SENSORS_AD7418 is not set |
| 772 | # CONFIG_SENSORS_ADM1021 is not set | 802 | # CONFIG_SENSORS_ADM1021 is not set |
| 773 | # CONFIG_SENSORS_ADM1025 is not set | 803 | # CONFIG_SENSORS_ADM1025 is not set |
| @@ -821,6 +851,7 @@ CONFIG_SENSORS_LM75=y | |||
| 821 | # CONFIG_SENSORS_W83627EHF is not set | 851 | # CONFIG_SENSORS_W83627EHF is not set |
| 822 | CONFIG_HWMON_DEBUG_CHIP=y | 852 | CONFIG_HWMON_DEBUG_CHIP=y |
| 823 | # CONFIG_THERMAL is not set | 853 | # CONFIG_THERMAL is not set |
| 854 | # CONFIG_THERMAL_HWMON is not set | ||
| 824 | # CONFIG_WATCHDOG is not set | 855 | # CONFIG_WATCHDOG is not set |
| 825 | 856 | ||
| 826 | # | 857 | # |
| @@ -832,8 +863,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 832 | # | 863 | # |
| 833 | # Multifunction device drivers | 864 | # Multifunction device drivers |
| 834 | # | 865 | # |
| 866 | # CONFIG_MFD_CORE is not set | ||
| 835 | # CONFIG_MFD_SM501 is not set | 867 | # CONFIG_MFD_SM501 is not set |
| 836 | # CONFIG_HTC_PASIC3 is not set | 868 | # CONFIG_HTC_PASIC3 is not set |
| 869 | # CONFIG_MFD_TMIO is not set | ||
| 837 | 870 | ||
| 838 | # | 871 | # |
| 839 | # Multimedia devices | 872 | # Multimedia devices |
| @@ -865,10 +898,6 @@ CONFIG_DAB=y | |||
| 865 | # Display device support | 898 | # Display device support |
| 866 | # | 899 | # |
| 867 | # CONFIG_DISPLAY_SUPPORT is not set | 900 | # CONFIG_DISPLAY_SUPPORT is not set |
| 868 | |||
| 869 | # | ||
| 870 | # Sound | ||
| 871 | # | ||
| 872 | # CONFIG_SOUND is not set | 901 | # CONFIG_SOUND is not set |
| 873 | CONFIG_HID_SUPPORT=y | 902 | CONFIG_HID_SUPPORT=y |
| 874 | CONFIG_HID=y | 903 | CONFIG_HID=y |
| @@ -883,6 +912,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 883 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 912 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
| 884 | 913 | ||
| 885 | # | 914 | # |
| 915 | # Enable Host or Gadget support to see Inventra options | ||
| 916 | # | ||
| 917 | |||
| 918 | # | ||
| 886 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 919 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 887 | # | 920 | # |
| 888 | # CONFIG_USB_GADGET is not set | 921 | # CONFIG_USB_GADGET is not set |
| @@ -971,6 +1004,7 @@ CONFIG_JFFS2_RTIME=y | |||
| 971 | CONFIG_CRAMFS=y | 1004 | CONFIG_CRAMFS=y |
| 972 | # CONFIG_VXFS_FS is not set | 1005 | # CONFIG_VXFS_FS is not set |
| 973 | # CONFIG_MINIX_FS is not set | 1006 | # CONFIG_MINIX_FS is not set |
| 1007 | # CONFIG_OMFS_FS is not set | ||
| 974 | # CONFIG_HPFS_FS is not set | 1008 | # CONFIG_HPFS_FS is not set |
| 975 | # CONFIG_QNX4FS_FS is not set | 1009 | # CONFIG_QNX4FS_FS is not set |
| 976 | # CONFIG_ROMFS_FS is not set | 1010 | # CONFIG_ROMFS_FS is not set |
| @@ -980,12 +1014,11 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 980 | CONFIG_NFS_FS=y | 1014 | CONFIG_NFS_FS=y |
| 981 | # CONFIG_NFS_V3 is not set | 1015 | # CONFIG_NFS_V3 is not set |
| 982 | # CONFIG_NFS_V4 is not set | 1016 | # CONFIG_NFS_V4 is not set |
| 983 | # CONFIG_NFSD is not set | ||
| 984 | CONFIG_ROOT_NFS=y | 1017 | CONFIG_ROOT_NFS=y |
| 1018 | # CONFIG_NFSD is not set | ||
| 985 | CONFIG_LOCKD=y | 1019 | CONFIG_LOCKD=y |
| 986 | CONFIG_NFS_COMMON=y | 1020 | CONFIG_NFS_COMMON=y |
| 987 | CONFIG_SUNRPC=y | 1021 | CONFIG_SUNRPC=y |
| 988 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 989 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1022 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 990 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1023 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 991 | # CONFIG_SMB_FS is not set | 1024 | # CONFIG_SMB_FS is not set |
| @@ -1021,6 +1054,7 @@ CONFIG_BITREVERSE=y | |||
| 1021 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1054 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 1022 | # CONFIG_CRC_CCITT is not set | 1055 | # CONFIG_CRC_CCITT is not set |
| 1023 | # CONFIG_CRC16 is not set | 1056 | # CONFIG_CRC16 is not set |
| 1057 | # CONFIG_CRC_T10DIF is not set | ||
| 1024 | # CONFIG_CRC_ITU_T is not set | 1058 | # CONFIG_CRC_ITU_T is not set |
| 1025 | CONFIG_CRC32=y | 1059 | CONFIG_CRC32=y |
| 1026 | # CONFIG_CRC7 is not set | 1060 | # CONFIG_CRC7 is not set |
| @@ -1048,7 +1082,16 @@ CONFIG_FRAME_WARN=1024 | |||
| 1048 | # CONFIG_SLUB_DEBUG_ON is not set | 1082 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1049 | # CONFIG_SLUB_STATS is not set | 1083 | # CONFIG_SLUB_STATS is not set |
| 1050 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1084 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1085 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 1086 | # CONFIG_LATENCYTOP is not set | ||
| 1087 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1088 | CONFIG_HAVE_FTRACE=y | ||
| 1089 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1090 | # CONFIG_FTRACE is not set | ||
| 1091 | # CONFIG_SCHED_TRACER is not set | ||
| 1092 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1051 | # CONFIG_SAMPLES is not set | 1093 | # CONFIG_SAMPLES is not set |
| 1094 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1052 | # CONFIG_IRQSTACKS is not set | 1095 | # CONFIG_IRQSTACKS is not set |
| 1053 | # CONFIG_PPC_EARLY_DEBUG is not set | 1096 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1054 | 1097 | ||
| @@ -1100,6 +1143,10 @@ CONFIG_CRYPTO=y | |||
| 1100 | # CONFIG_CRYPTO_MD4 is not set | 1143 | # CONFIG_CRYPTO_MD4 is not set |
| 1101 | # CONFIG_CRYPTO_MD5 is not set | 1144 | # CONFIG_CRYPTO_MD5 is not set |
| 1102 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1145 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 1146 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1147 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1148 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1149 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1103 | # CONFIG_CRYPTO_SHA1 is not set | 1150 | # CONFIG_CRYPTO_SHA1 is not set |
| 1104 | # CONFIG_CRYPTO_SHA256 is not set | 1151 | # CONFIG_CRYPTO_SHA256 is not set |
| 1105 | # CONFIG_CRYPTO_SHA512 is not set | 1152 | # CONFIG_CRYPTO_SHA512 is not set |
| @@ -1132,5 +1179,6 @@ CONFIG_CRYPTO=y | |||
| 1132 | # CONFIG_CRYPTO_LZO is not set | 1179 | # CONFIG_CRYPTO_LZO is not set |
| 1133 | CONFIG_CRYPTO_HW=y | 1180 | CONFIG_CRYPTO_HW=y |
| 1134 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1181 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1182 | # CONFIG_CRYPTO_DEV_TALITOS is not set | ||
| 1135 | # CONFIG_PPC_CLOCK is not set | 1183 | # CONFIG_PPC_CLOCK is not set |
| 1136 | # CONFIG_VIRTUALIZATION is not set | 1184 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/85xx/tqm8541_defconfig b/arch/powerpc/configs/85xx/tqm8541_defconfig index 6f9067b49e07..da841a09755c 100644 --- a/arch/powerpc/configs/85xx/tqm8541_defconfig +++ b/arch/powerpc/configs/85xx/tqm8541_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.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Mon Jun 9 08:52:40 2008 | 4 | # Thu Aug 21 00:52:39 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -15,6 +15,7 @@ CONFIG_PPC_85xx=y | |||
| 15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
| 16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
| 17 | CONFIG_E500=y | 17 | CONFIG_E500=y |
| 18 | # CONFIG_PPC_E500MC is not set | ||
| 18 | CONFIG_BOOKE=y | 19 | CONFIG_BOOKE=y |
| 19 | CONFIG_FSL_BOOKE=y | 20 | CONFIG_FSL_BOOKE=y |
| 20 | CONFIG_FSL_EMB_PERFMON=y | 21 | CONFIG_FSL_EMB_PERFMON=y |
| @@ -33,12 +34,14 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 35 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | 36 | CONFIG_STACKTRACE_SUPPORT=y |
| 37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | 38 | CONFIG_LOCKDEP_SUPPORT=y |
| 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 38 | CONFIG_ARCH_HAS_ILOG2_U32=y | 40 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 39 | CONFIG_GENERIC_HWEIGHT=y | 41 | CONFIG_GENERIC_HWEIGHT=y |
| 40 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 42 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 41 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 43 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 44 | CONFIG_GENERIC_GPIO=y | ||
| 42 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 45 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
| 43 | CONFIG_PPC=y | 46 | CONFIG_PPC=y |
| 44 | CONFIG_EARLY_PRINTK=y | 47 | CONFIG_EARLY_PRINTK=y |
| @@ -89,7 +92,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 89 | CONFIG_SYSCTL=y | 92 | CONFIG_SYSCTL=y |
| 90 | CONFIG_EMBEDDED=y | 93 | CONFIG_EMBEDDED=y |
| 91 | CONFIG_SYSCTL_SYSCALL=y | 94 | CONFIG_SYSCTL_SYSCALL=y |
| 92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 93 | # CONFIG_KALLSYMS is not set | 95 | # CONFIG_KALLSYMS is not set |
| 94 | # CONFIG_HOTPLUG is not set | 96 | # CONFIG_HOTPLUG is not set |
| 95 | CONFIG_PRINTK=y | 97 | CONFIG_PRINTK=y |
| @@ -112,10 +114,16 @@ CONFIG_SLUB=y | |||
| 112 | # CONFIG_PROFILING is not set | 114 | # CONFIG_PROFILING is not set |
| 113 | # CONFIG_MARKERS is not set | 115 | # CONFIG_MARKERS is not set |
| 114 | CONFIG_HAVE_OPROFILE=y | 116 | CONFIG_HAVE_OPROFILE=y |
| 117 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 118 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 115 | CONFIG_HAVE_KPROBES=y | 119 | CONFIG_HAVE_KPROBES=y |
| 116 | CONFIG_HAVE_KRETPROBES=y | 120 | CONFIG_HAVE_KRETPROBES=y |
| 121 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 117 | # CONFIG_HAVE_DMA_ATTRS is not set | 122 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 123 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 124 | CONFIG_HAVE_CLK=y | ||
| 118 | CONFIG_PROC_PAGE_MONITOR=y | 125 | CONFIG_PROC_PAGE_MONITOR=y |
| 126 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 119 | CONFIG_SLABINFO=y | 127 | CONFIG_SLABINFO=y |
| 120 | CONFIG_RT_MUTEXES=y | 128 | CONFIG_RT_MUTEXES=y |
| 121 | # CONFIG_TINY_SHMEM is not set | 129 | # CONFIG_TINY_SHMEM is not set |
| @@ -126,6 +134,7 @@ CONFIG_BLOCK=y | |||
| 126 | # CONFIG_BLK_DEV_IO_TRACE is not set | 134 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 127 | # CONFIG_LSF is not set | 135 | # CONFIG_LSF is not set |
| 128 | # CONFIG_BLK_DEV_BSG is not set | 136 | # CONFIG_BLK_DEV_BSG is not set |
| 137 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 129 | 138 | ||
| 130 | # | 139 | # |
| 131 | # IO Schedulers | 140 | # IO Schedulers |
| @@ -144,8 +153,6 @@ CONFIG_CLASSIC_RCU=y | |||
| 144 | # | 153 | # |
| 145 | # Platform support | 154 | # Platform support |
| 146 | # | 155 | # |
| 147 | # CONFIG_PPC_MPC512x is not set | ||
| 148 | # CONFIG_PPC_MPC5121 is not set | ||
| 149 | # CONFIG_PPC_CELL is not set | 156 | # CONFIG_PPC_CELL is not set |
| 150 | # CONFIG_PPC_CELL_NATIVE is not set | 157 | # CONFIG_PPC_CELL_NATIVE is not set |
| 151 | # CONFIG_PQ2ADS is not set | 158 | # CONFIG_PQ2ADS is not set |
| @@ -154,11 +161,13 @@ CONFIG_MPC85xx=y | |||
| 154 | # CONFIG_MPC8560_ADS is not set | 161 | # CONFIG_MPC8560_ADS is not set |
| 155 | # CONFIG_MPC85xx_CDS is not set | 162 | # CONFIG_MPC85xx_CDS is not set |
| 156 | # CONFIG_MPC85xx_MDS is not set | 163 | # CONFIG_MPC85xx_MDS is not set |
| 164 | # CONFIG_MPC8536_DS is not set | ||
| 157 | # CONFIG_MPC85xx_DS is not set | 165 | # CONFIG_MPC85xx_DS is not set |
| 158 | # CONFIG_KSI8560 is not set | 166 | # CONFIG_KSI8560 is not set |
| 159 | # CONFIG_STX_GP3 is not set | 167 | # CONFIG_STX_GP3 is not set |
| 160 | # CONFIG_TQM8540 is not set | 168 | # CONFIG_TQM8540 is not set |
| 161 | CONFIG_TQM8541=y | 169 | CONFIG_TQM8541=y |
| 170 | # CONFIG_TQM8548 is not set | ||
| 162 | # CONFIG_TQM8555 is not set | 171 | # CONFIG_TQM8555 is not set |
| 163 | # CONFIG_TQM8560 is not set | 172 | # CONFIG_TQM8560 is not set |
| 164 | # CONFIG_SBC8548 is not set | 173 | # CONFIG_SBC8548 is not set |
| @@ -176,7 +185,6 @@ CONFIG_MPIC=y | |||
| 176 | # CONFIG_GENERIC_IOMAP is not set | 185 | # CONFIG_GENERIC_IOMAP is not set |
| 177 | # CONFIG_CPU_FREQ is not set | 186 | # CONFIG_CPU_FREQ is not set |
| 178 | CONFIG_CPM2=y | 187 | CONFIG_CPM2=y |
| 179 | CONFIG_PPC_CPM_NEW_BINDING=y | ||
| 180 | # CONFIG_FSL_ULI1575 is not set | 188 | # CONFIG_FSL_ULI1575 is not set |
| 181 | CONFIG_CPM=y | 189 | CONFIG_CPM=y |
| 182 | 190 | ||
| @@ -216,6 +224,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 216 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 224 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 217 | CONFIG_PAGEFLAGS_EXTENDED=y | 225 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 218 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 226 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 227 | CONFIG_MIGRATION=y | ||
| 219 | # CONFIG_RESOURCES_64BIT is not set | 228 | # CONFIG_RESOURCES_64BIT is not set |
| 220 | CONFIG_ZONE_DMA_FLAG=1 | 229 | CONFIG_ZONE_DMA_FLAG=1 |
| 221 | CONFIG_BOUNCE=y | 230 | CONFIG_BOUNCE=y |
| @@ -223,6 +232,7 @@ CONFIG_VIRT_TO_BUS=y | |||
| 223 | CONFIG_FORCE_MAX_ZONEORDER=11 | 232 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 224 | # CONFIG_PROC_DEVICETREE is not set | 233 | # CONFIG_PROC_DEVICETREE is not set |
| 225 | # CONFIG_CMDLINE_BOOL is not set | 234 | # CONFIG_CMDLINE_BOOL is not set |
| 235 | CONFIG_EXTRA_TARGETS="" | ||
| 226 | # CONFIG_PM is not set | 236 | # CONFIG_PM is not set |
| 227 | CONFIG_SECCOMP=y | 237 | CONFIG_SECCOMP=y |
| 228 | CONFIG_ISA_DMA_API=y | 238 | CONFIG_ISA_DMA_API=y |
| @@ -234,6 +244,7 @@ CONFIG_ZONE_DMA=y | |||
| 234 | CONFIG_PPC_INDIRECT_PCI=y | 244 | CONFIG_PPC_INDIRECT_PCI=y |
| 235 | CONFIG_FSL_SOC=y | 245 | CONFIG_FSL_SOC=y |
| 236 | CONFIG_FSL_PCI=y | 246 | CONFIG_FSL_PCI=y |
| 247 | CONFIG_PPC_PCI_CHOICE=y | ||
| 237 | CONFIG_PCI=y | 248 | CONFIG_PCI=y |
| 238 | CONFIG_PCI_DOMAINS=y | 249 | CONFIG_PCI_DOMAINS=y |
| 239 | CONFIG_PCI_SYSCALL=y | 250 | CONFIG_PCI_SYSCALL=y |
| @@ -257,10 +268,6 @@ CONFIG_KERNEL_START=0xc0000000 | |||
| 257 | CONFIG_PHYSICAL_START=0x00000000 | 268 | CONFIG_PHYSICAL_START=0x00000000 |
| 258 | CONFIG_PHYSICAL_ALIGN=0x10000000 | 269 | CONFIG_PHYSICAL_ALIGN=0x10000000 |
| 259 | CONFIG_TASK_SIZE=0xc0000000 | 270 | CONFIG_TASK_SIZE=0xc0000000 |
| 260 | |||
| 261 | # | ||
| 262 | # Networking | ||
| 263 | # | ||
| 264 | CONFIG_NET=y | 271 | CONFIG_NET=y |
| 265 | 272 | ||
| 266 | # | 273 | # |
| @@ -432,6 +439,7 @@ CONFIG_MTD_CFI_UTIL=y | |||
| 432 | # | 439 | # |
| 433 | # CONFIG_MTD_UBI is not set | 440 | # CONFIG_MTD_UBI is not set |
| 434 | CONFIG_OF_DEVICE=y | 441 | CONFIG_OF_DEVICE=y |
| 442 | CONFIG_OF_GPIO=y | ||
| 435 | CONFIG_OF_I2C=y | 443 | CONFIG_OF_I2C=y |
| 436 | # CONFIG_PARPORT is not set | 444 | # CONFIG_PARPORT is not set |
| 437 | CONFIG_BLK_DEV=y | 445 | CONFIG_BLK_DEV=y |
| @@ -451,20 +459,22 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
| 451 | # CONFIG_BLK_DEV_XIP is not set | 459 | # CONFIG_BLK_DEV_XIP is not set |
| 452 | # CONFIG_CDROM_PKTCDVD is not set | 460 | # CONFIG_CDROM_PKTCDVD is not set |
| 453 | # CONFIG_ATA_OVER_ETH is not set | 461 | # CONFIG_ATA_OVER_ETH is not set |
| 462 | # CONFIG_BLK_DEV_HD is not set | ||
| 454 | CONFIG_MISC_DEVICES=y | 463 | CONFIG_MISC_DEVICES=y |
| 455 | # CONFIG_PHANTOM is not set | 464 | # CONFIG_PHANTOM is not set |
| 456 | # CONFIG_EEPROM_93CX6 is not set | 465 | # CONFIG_EEPROM_93CX6 is not set |
| 457 | # CONFIG_SGI_IOC4 is not set | 466 | # CONFIG_SGI_IOC4 is not set |
| 458 | # CONFIG_TIFM_CORE is not set | 467 | # CONFIG_TIFM_CORE is not set |
| 459 | # CONFIG_ENCLOSURE_SERVICES is not set | 468 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 469 | # CONFIG_HP_ILO is not set | ||
| 460 | CONFIG_HAVE_IDE=y | 470 | CONFIG_HAVE_IDE=y |
| 461 | CONFIG_IDE=y | 471 | CONFIG_IDE=y |
| 462 | CONFIG_IDE_MAX_HWIFS=4 | ||
| 463 | CONFIG_BLK_DEV_IDE=y | 472 | CONFIG_BLK_DEV_IDE=y |
| 464 | 473 | ||
| 465 | # | 474 | # |
| 466 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | 475 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
| 467 | # | 476 | # |
| 477 | CONFIG_IDE_TIMINGS=y | ||
| 468 | # CONFIG_BLK_DEV_IDE_SATA is not set | 478 | # CONFIG_BLK_DEV_IDE_SATA is not set |
| 469 | CONFIG_BLK_DEV_IDEDISK=y | 479 | CONFIG_BLK_DEV_IDEDISK=y |
| 470 | # CONFIG_IDEDISK_MULTI_MODE is not set | 480 | # CONFIG_IDEDISK_MULTI_MODE is not set |
| @@ -477,7 +487,6 @@ CONFIG_IDE_PROC_FS=y | |||
| 477 | # | 487 | # |
| 478 | # IDE chipset support/bugfixes | 488 | # IDE chipset support/bugfixes |
| 479 | # | 489 | # |
| 480 | CONFIG_IDE_GENERIC=y | ||
| 481 | # CONFIG_BLK_DEV_PLATFORM is not set | 490 | # CONFIG_BLK_DEV_PLATFORM is not set |
| 482 | CONFIG_BLK_DEV_IDEDMA_SFF=y | 491 | CONFIG_BLK_DEV_IDEDMA_SFF=y |
| 483 | 492 | ||
| @@ -495,10 +504,8 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
| 495 | # CONFIG_BLK_DEV_AMD74XX is not set | 504 | # CONFIG_BLK_DEV_AMD74XX is not set |
| 496 | # CONFIG_BLK_DEV_CMD64X is not set | 505 | # CONFIG_BLK_DEV_CMD64X is not set |
| 497 | # CONFIG_BLK_DEV_TRIFLEX is not set | 506 | # CONFIG_BLK_DEV_TRIFLEX is not set |
| 498 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
| 499 | # CONFIG_BLK_DEV_CS5520 is not set | 507 | # CONFIG_BLK_DEV_CS5520 is not set |
| 500 | # CONFIG_BLK_DEV_CS5530 is not set | 508 | # CONFIG_BLK_DEV_CS5530 is not set |
| 501 | # CONFIG_BLK_DEV_HPT34X is not set | ||
| 502 | # CONFIG_BLK_DEV_HPT366 is not set | 509 | # CONFIG_BLK_DEV_HPT366 is not set |
| 503 | # CONFIG_BLK_DEV_JMICRON is not set | 510 | # CONFIG_BLK_DEV_JMICRON is not set |
| 504 | # CONFIG_BLK_DEV_SC1200 is not set | 511 | # CONFIG_BLK_DEV_SC1200 is not set |
| @@ -516,8 +523,6 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
| 516 | CONFIG_BLK_DEV_VIA82CXXX=y | 523 | CONFIG_BLK_DEV_VIA82CXXX=y |
| 517 | # CONFIG_BLK_DEV_TC86C001 is not set | 524 | # CONFIG_BLK_DEV_TC86C001 is not set |
| 518 | CONFIG_BLK_DEV_IDEDMA=y | 525 | CONFIG_BLK_DEV_IDEDMA=y |
| 519 | # CONFIG_BLK_DEV_HD_ONLY is not set | ||
| 520 | # CONFIG_BLK_DEV_HD is not set | ||
| 521 | 526 | ||
| 522 | # | 527 | # |
| 523 | # SCSI device support | 528 | # SCSI device support |
| @@ -533,12 +538,15 @@ CONFIG_BLK_DEV_IDEDMA=y | |||
| 533 | # | 538 | # |
| 534 | # IEEE 1394 (FireWire) support | 539 | # IEEE 1394 (FireWire) support |
| 535 | # | 540 | # |
| 541 | |||
| 542 | # | ||
| 543 | # Enable only one of the two stacks, unless you know what you are doing | ||
| 544 | # | ||
| 536 | # CONFIG_FIREWIRE is not set | 545 | # CONFIG_FIREWIRE is not set |
| 537 | # CONFIG_IEEE1394 is not set | 546 | # CONFIG_IEEE1394 is not set |
| 538 | # CONFIG_I2O is not set | 547 | # CONFIG_I2O is not set |
| 539 | # CONFIG_MACINTOSH_DRIVERS is not set | 548 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 540 | CONFIG_NETDEVICES=y | 549 | CONFIG_NETDEVICES=y |
| 541 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 542 | # CONFIG_DUMMY is not set | 550 | # CONFIG_DUMMY is not set |
| 543 | # CONFIG_BONDING is not set | 551 | # CONFIG_BONDING is not set |
| 544 | # CONFIG_MACVLAN is not set | 552 | # CONFIG_MACVLAN is not set |
| @@ -601,7 +609,6 @@ CONFIG_NETDEV_1000=y | |||
| 601 | # CONFIG_DL2K is not set | 609 | # CONFIG_DL2K is not set |
| 602 | # CONFIG_E1000 is not set | 610 | # CONFIG_E1000 is not set |
| 603 | # CONFIG_E1000E is not set | 611 | # CONFIG_E1000E is not set |
| 604 | # CONFIG_E1000E_ENABLED is not set | ||
| 605 | # CONFIG_IP1000 is not set | 612 | # CONFIG_IP1000 is not set |
| 606 | # CONFIG_IGB is not set | 613 | # CONFIG_IGB is not set |
| 607 | # CONFIG_NS83820 is not set | 614 | # CONFIG_NS83820 is not set |
| @@ -615,9 +622,9 @@ CONFIG_NETDEV_1000=y | |||
| 615 | # CONFIG_TIGON3 is not set | 622 | # CONFIG_TIGON3 is not set |
| 616 | # CONFIG_BNX2 is not set | 623 | # CONFIG_BNX2 is not set |
| 617 | CONFIG_GIANFAR=y | 624 | CONFIG_GIANFAR=y |
| 618 | CONFIG_GFAR_NAPI=y | ||
| 619 | # CONFIG_QLA3XXX is not set | 625 | # CONFIG_QLA3XXX is not set |
| 620 | # CONFIG_ATL1 is not set | 626 | # CONFIG_ATL1 is not set |
| 627 | # CONFIG_ATL1E is not set | ||
| 621 | CONFIG_NETDEV_10000=y | 628 | CONFIG_NETDEV_10000=y |
| 622 | # CONFIG_CHELSIO_T1 is not set | 629 | # CONFIG_CHELSIO_T1 is not set |
| 623 | # CONFIG_CHELSIO_T3 is not set | 630 | # CONFIG_CHELSIO_T3 is not set |
| @@ -732,42 +739,66 @@ CONFIG_DEVPORT=y | |||
| 732 | CONFIG_I2C=y | 739 | CONFIG_I2C=y |
| 733 | CONFIG_I2C_BOARDINFO=y | 740 | CONFIG_I2C_BOARDINFO=y |
| 734 | CONFIG_I2C_CHARDEV=y | 741 | CONFIG_I2C_CHARDEV=y |
| 742 | CONFIG_I2C_HELPER_AUTO=y | ||
| 735 | 743 | ||
| 736 | # | 744 | # |
| 737 | # I2C Hardware Bus support | 745 | # I2C Hardware Bus support |
| 738 | # | 746 | # |
| 747 | |||
| 748 | # | ||
| 749 | # PC SMBus host controller drivers | ||
| 750 | # | ||
| 739 | # CONFIG_I2C_ALI1535 is not set | 751 | # CONFIG_I2C_ALI1535 is not set |
| 740 | # CONFIG_I2C_ALI1563 is not set | 752 | # CONFIG_I2C_ALI1563 is not set |
| 741 | # CONFIG_I2C_ALI15X3 is not set | 753 | # CONFIG_I2C_ALI15X3 is not set |
| 742 | # CONFIG_I2C_AMD756 is not set | 754 | # CONFIG_I2C_AMD756 is not set |
| 743 | # CONFIG_I2C_AMD8111 is not set | 755 | # CONFIG_I2C_AMD8111 is not set |
| 744 | # CONFIG_I2C_I801 is not set | 756 | # CONFIG_I2C_I801 is not set |
| 745 | # CONFIG_I2C_I810 is not set | 757 | # CONFIG_I2C_ISCH is not set |
| 746 | # CONFIG_I2C_PIIX4 is not set | 758 | # CONFIG_I2C_PIIX4 is not set |
| 747 | CONFIG_I2C_MPC=y | ||
| 748 | # CONFIG_I2C_NFORCE2 is not set | 759 | # CONFIG_I2C_NFORCE2 is not set |
| 749 | # CONFIG_I2C_OCORES is not set | ||
| 750 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 751 | # CONFIG_I2C_PROSAVAGE is not set | ||
| 752 | # CONFIG_I2C_SAVAGE4 is not set | ||
| 753 | # CONFIG_I2C_SIMTEC is not set | ||
| 754 | # CONFIG_I2C_SIS5595 is not set | 760 | # CONFIG_I2C_SIS5595 is not set |
| 755 | # CONFIG_I2C_SIS630 is not set | 761 | # CONFIG_I2C_SIS630 is not set |
| 756 | # CONFIG_I2C_SIS96X is not set | 762 | # CONFIG_I2C_SIS96X is not set |
| 757 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 758 | # CONFIG_I2C_VIA is not set | 763 | # CONFIG_I2C_VIA is not set |
| 759 | # CONFIG_I2C_VIAPRO is not set | 764 | # CONFIG_I2C_VIAPRO is not set |
| 765 | |||
| 766 | # | ||
| 767 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 768 | # | ||
| 769 | # CONFIG_I2C_CPM is not set | ||
| 770 | # CONFIG_I2C_GPIO is not set | ||
| 771 | CONFIG_I2C_MPC=y | ||
| 772 | # CONFIG_I2C_OCORES is not set | ||
| 773 | # CONFIG_I2C_SIMTEC is not set | ||
| 774 | |||
| 775 | # | ||
| 776 | # External I2C/SMBus adapter drivers | ||
| 777 | # | ||
| 778 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 779 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 780 | |||
| 781 | # | ||
| 782 | # Graphics adapter I2C/DDC channel drivers | ||
| 783 | # | ||
| 760 | # CONFIG_I2C_VOODOO3 is not set | 784 | # CONFIG_I2C_VOODOO3 is not set |
| 785 | |||
| 786 | # | ||
| 787 | # Other I2C/SMBus bus drivers | ||
| 788 | # | ||
| 761 | # CONFIG_I2C_PCA_PLATFORM is not set | 789 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 762 | 790 | ||
| 763 | # | 791 | # |
| 764 | # Miscellaneous I2C Chip support | 792 | # Miscellaneous I2C Chip support |
| 765 | # | 793 | # |
| 766 | # CONFIG_DS1682 is not set | 794 | # CONFIG_DS1682 is not set |
| 795 | # CONFIG_AT24 is not set | ||
| 767 | # CONFIG_SENSORS_EEPROM is not set | 796 | # CONFIG_SENSORS_EEPROM is not set |
| 768 | # CONFIG_SENSORS_PCF8574 is not set | 797 | # CONFIG_SENSORS_PCF8574 is not set |
| 769 | # CONFIG_PCF8575 is not set | 798 | # CONFIG_PCF8575 is not set |
| 799 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 770 | # CONFIG_SENSORS_PCF8591 is not set | 800 | # CONFIG_SENSORS_PCF8591 is not set |
| 801 | # CONFIG_TPS65010 is not set | ||
| 771 | # CONFIG_SENSORS_MAX6875 is not set | 802 | # CONFIG_SENSORS_MAX6875 is not set |
| 772 | # CONFIG_SENSORS_TSL2550 is not set | 803 | # CONFIG_SENSORS_TSL2550 is not set |
| 773 | # CONFIG_I2C_DEBUG_CORE is not set | 804 | # CONFIG_I2C_DEBUG_CORE is not set |
| @@ -775,10 +806,31 @@ CONFIG_I2C_MPC=y | |||
| 775 | # CONFIG_I2C_DEBUG_BUS is not set | 806 | # CONFIG_I2C_DEBUG_BUS is not set |
| 776 | # CONFIG_I2C_DEBUG_CHIP is not set | 807 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 777 | # CONFIG_SPI is not set | 808 | # CONFIG_SPI is not set |
| 809 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 810 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | ||
| 811 | CONFIG_GPIOLIB=y | ||
| 812 | # CONFIG_GPIO_SYSFS is not set | ||
| 813 | |||
| 814 | # | ||
| 815 | # I2C GPIO expanders: | ||
| 816 | # | ||
| 817 | # CONFIG_GPIO_MAX732X is not set | ||
| 818 | # CONFIG_GPIO_PCA953X is not set | ||
| 819 | # CONFIG_GPIO_PCF857X is not set | ||
| 820 | |||
| 821 | # | ||
| 822 | # PCI GPIO expanders: | ||
| 823 | # | ||
| 824 | # CONFIG_GPIO_BT8XX is not set | ||
| 825 | |||
| 826 | # | ||
| 827 | # SPI GPIO expanders: | ||
| 828 | # | ||
| 778 | # CONFIG_W1 is not set | 829 | # CONFIG_W1 is not set |
| 779 | # CONFIG_POWER_SUPPLY is not set | 830 | # CONFIG_POWER_SUPPLY is not set |
| 780 | CONFIG_HWMON=y | 831 | CONFIG_HWMON=y |
| 781 | # CONFIG_HWMON_VID is not set | 832 | # CONFIG_HWMON_VID is not set |
| 833 | # CONFIG_SENSORS_AD7414 is not set | ||
| 782 | # CONFIG_SENSORS_AD7418 is not set | 834 | # CONFIG_SENSORS_AD7418 is not set |
| 783 | # CONFIG_SENSORS_ADM1021 is not set | 835 | # CONFIG_SENSORS_ADM1021 is not set |
| 784 | # CONFIG_SENSORS_ADM1025 is not set | 836 | # CONFIG_SENSORS_ADM1025 is not set |
| @@ -832,6 +884,7 @@ CONFIG_SENSORS_LM75=y | |||
| 832 | # CONFIG_SENSORS_W83627EHF is not set | 884 | # CONFIG_SENSORS_W83627EHF is not set |
| 833 | CONFIG_HWMON_DEBUG_CHIP=y | 885 | CONFIG_HWMON_DEBUG_CHIP=y |
| 834 | # CONFIG_THERMAL is not set | 886 | # CONFIG_THERMAL is not set |
| 887 | # CONFIG_THERMAL_HWMON is not set | ||
| 835 | # CONFIG_WATCHDOG is not set | 888 | # CONFIG_WATCHDOG is not set |
| 836 | 889 | ||
| 837 | # | 890 | # |
| @@ -843,8 +896,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 843 | # | 896 | # |
| 844 | # Multifunction device drivers | 897 | # Multifunction device drivers |
| 845 | # | 898 | # |
| 899 | # CONFIG_MFD_CORE is not set | ||
| 846 | # CONFIG_MFD_SM501 is not set | 900 | # CONFIG_MFD_SM501 is not set |
| 847 | # CONFIG_HTC_PASIC3 is not set | 901 | # CONFIG_HTC_PASIC3 is not set |
| 902 | # CONFIG_MFD_TMIO is not set | ||
| 848 | 903 | ||
| 849 | # | 904 | # |
| 850 | # Multimedia devices | 905 | # Multimedia devices |
| @@ -876,10 +931,6 @@ CONFIG_DAB=y | |||
| 876 | # Display device support | 931 | # Display device support |
| 877 | # | 932 | # |
| 878 | # CONFIG_DISPLAY_SUPPORT is not set | 933 | # CONFIG_DISPLAY_SUPPORT is not set |
| 879 | |||
| 880 | # | ||
| 881 | # Sound | ||
| 882 | # | ||
| 883 | # CONFIG_SOUND is not set | 934 | # CONFIG_SOUND is not set |
| 884 | CONFIG_HID_SUPPORT=y | 935 | CONFIG_HID_SUPPORT=y |
| 885 | CONFIG_HID=y | 936 | CONFIG_HID=y |
| @@ -894,6 +945,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 894 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 945 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
| 895 | 946 | ||
| 896 | # | 947 | # |
| 948 | # Enable Host or Gadget support to see Inventra options | ||
| 949 | # | ||
| 950 | |||
| 951 | # | ||
| 897 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 952 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 898 | # | 953 | # |
| 899 | # CONFIG_USB_GADGET is not set | 954 | # CONFIG_USB_GADGET is not set |
| @@ -982,6 +1037,7 @@ CONFIG_JFFS2_RTIME=y | |||
| 982 | CONFIG_CRAMFS=y | 1037 | CONFIG_CRAMFS=y |
| 983 | # CONFIG_VXFS_FS is not set | 1038 | # CONFIG_VXFS_FS is not set |
| 984 | # CONFIG_MINIX_FS is not set | 1039 | # CONFIG_MINIX_FS is not set |
| 1040 | # CONFIG_OMFS_FS is not set | ||
| 985 | # CONFIG_HPFS_FS is not set | 1041 | # CONFIG_HPFS_FS is not set |
| 986 | # CONFIG_QNX4FS_FS is not set | 1042 | # CONFIG_QNX4FS_FS is not set |
| 987 | # CONFIG_ROMFS_FS is not set | 1043 | # CONFIG_ROMFS_FS is not set |
| @@ -991,12 +1047,11 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 991 | CONFIG_NFS_FS=y | 1047 | CONFIG_NFS_FS=y |
| 992 | # CONFIG_NFS_V3 is not set | 1048 | # CONFIG_NFS_V3 is not set |
| 993 | # CONFIG_NFS_V4 is not set | 1049 | # CONFIG_NFS_V4 is not set |
| 994 | # CONFIG_NFSD is not set | ||
| 995 | CONFIG_ROOT_NFS=y | 1050 | CONFIG_ROOT_NFS=y |
| 1051 | # CONFIG_NFSD is not set | ||
| 996 | CONFIG_LOCKD=y | 1052 | CONFIG_LOCKD=y |
| 997 | CONFIG_NFS_COMMON=y | 1053 | CONFIG_NFS_COMMON=y |
| 998 | CONFIG_SUNRPC=y | 1054 | CONFIG_SUNRPC=y |
| 999 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 1000 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1055 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 1001 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1056 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1002 | # CONFIG_SMB_FS is not set | 1057 | # CONFIG_SMB_FS is not set |
| @@ -1032,6 +1087,7 @@ CONFIG_BITREVERSE=y | |||
| 1032 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1087 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 1033 | # CONFIG_CRC_CCITT is not set | 1088 | # CONFIG_CRC_CCITT is not set |
| 1034 | # CONFIG_CRC16 is not set | 1089 | # CONFIG_CRC16 is not set |
| 1090 | # CONFIG_CRC_T10DIF is not set | ||
| 1035 | # CONFIG_CRC_ITU_T is not set | 1091 | # CONFIG_CRC_ITU_T is not set |
| 1036 | CONFIG_CRC32=y | 1092 | CONFIG_CRC32=y |
| 1037 | # CONFIG_CRC7 is not set | 1093 | # CONFIG_CRC7 is not set |
| @@ -1059,8 +1115,16 @@ CONFIG_FRAME_WARN=1024 | |||
| 1059 | # CONFIG_SLUB_DEBUG_ON is not set | 1115 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1060 | # CONFIG_SLUB_STATS is not set | 1116 | # CONFIG_SLUB_STATS is not set |
| 1061 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1117 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1118 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 1119 | # CONFIG_LATENCYTOP is not set | ||
| 1120 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1121 | CONFIG_HAVE_FTRACE=y | ||
| 1122 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1123 | # CONFIG_FTRACE is not set | ||
| 1124 | # CONFIG_SCHED_TRACER is not set | ||
| 1125 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1062 | # CONFIG_SAMPLES is not set | 1126 | # CONFIG_SAMPLES is not set |
| 1063 | # CONFIG_KGDB_CONSOLE is not set | 1127 | CONFIG_HAVE_ARCH_KGDB=y |
| 1064 | # CONFIG_IRQSTACKS is not set | 1128 | # CONFIG_IRQSTACKS is not set |
| 1065 | # CONFIG_PPC_EARLY_DEBUG is not set | 1129 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1066 | 1130 | ||
| @@ -1112,6 +1176,10 @@ CONFIG_CRYPTO=y | |||
| 1112 | # CONFIG_CRYPTO_MD4 is not set | 1176 | # CONFIG_CRYPTO_MD4 is not set |
| 1113 | # CONFIG_CRYPTO_MD5 is not set | 1177 | # CONFIG_CRYPTO_MD5 is not set |
| 1114 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1178 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 1179 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1180 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1181 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1182 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1115 | # CONFIG_CRYPTO_SHA1 is not set | 1183 | # CONFIG_CRYPTO_SHA1 is not set |
| 1116 | # CONFIG_CRYPTO_SHA256 is not set | 1184 | # CONFIG_CRYPTO_SHA256 is not set |
| 1117 | # CONFIG_CRYPTO_SHA512 is not set | 1185 | # CONFIG_CRYPTO_SHA512 is not set |
| @@ -1144,6 +1212,7 @@ CONFIG_CRYPTO=y | |||
| 1144 | # CONFIG_CRYPTO_LZO is not set | 1212 | # CONFIG_CRYPTO_LZO is not set |
| 1145 | CONFIG_CRYPTO_HW=y | 1213 | CONFIG_CRYPTO_HW=y |
| 1146 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1214 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1147 | # CONFIG_PPC_CLOCK is not set | 1215 | # CONFIG_CRYPTO_DEV_TALITOS is not set |
| 1216 | CONFIG_PPC_CLOCK=y | ||
| 1148 | CONFIG_PPC_LIB_RHEAP=y | 1217 | CONFIG_PPC_LIB_RHEAP=y |
| 1149 | # CONFIG_VIRTUALIZATION is not set | 1218 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/85xx/tqm8548_defconfig b/arch/powerpc/configs/85xx/tqm8548_defconfig index b3b770be3cc9..ca1234d26855 100644 --- a/arch/powerpc/configs/85xx/tqm8548_defconfig +++ b/arch/powerpc/configs/85xx/tqm8548_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.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Thu Jun 26 14:40:02 2008 | 4 | # Thu Aug 21 00:52:40 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -34,6 +34,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 35 | CONFIG_IRQ_PER_CPU=y | 35 | CONFIG_IRQ_PER_CPU=y |
| 36 | CONFIG_STACKTRACE_SUPPORT=y | 36 | CONFIG_STACKTRACE_SUPPORT=y |
| 37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 37 | CONFIG_LOCKDEP_SUPPORT=y | 38 | CONFIG_LOCKDEP_SUPPORT=y |
| 38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 39 | CONFIG_ARCH_HAS_ILOG2_U32=y | 40 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| @@ -90,7 +91,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 90 | CONFIG_SYSCTL=y | 91 | CONFIG_SYSCTL=y |
| 91 | CONFIG_EMBEDDED=y | 92 | CONFIG_EMBEDDED=y |
| 92 | CONFIG_SYSCTL_SYSCALL=y | 93 | CONFIG_SYSCTL_SYSCALL=y |
| 93 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 94 | CONFIG_KALLSYMS=y | 94 | CONFIG_KALLSYMS=y |
| 95 | # CONFIG_KALLSYMS_ALL is not set | 95 | # CONFIG_KALLSYMS_ALL is not set |
| 96 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 96 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -116,10 +116,16 @@ CONFIG_SLUB=y | |||
| 116 | # CONFIG_MARKERS is not set | 116 | # CONFIG_MARKERS is not set |
| 117 | CONFIG_HAVE_OPROFILE=y | 117 | CONFIG_HAVE_OPROFILE=y |
| 118 | # CONFIG_KPROBES is not set | 118 | # CONFIG_KPROBES is not set |
| 119 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 120 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 119 | CONFIG_HAVE_KPROBES=y | 121 | CONFIG_HAVE_KPROBES=y |
| 120 | CONFIG_HAVE_KRETPROBES=y | 122 | CONFIG_HAVE_KRETPROBES=y |
| 123 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 121 | # CONFIG_HAVE_DMA_ATTRS is not set | 124 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 125 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 126 | # CONFIG_HAVE_CLK is not set | ||
| 122 | CONFIG_PROC_PAGE_MONITOR=y | 127 | CONFIG_PROC_PAGE_MONITOR=y |
| 128 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 123 | CONFIG_SLABINFO=y | 129 | CONFIG_SLABINFO=y |
| 124 | CONFIG_RT_MUTEXES=y | 130 | CONFIG_RT_MUTEXES=y |
| 125 | # CONFIG_TINY_SHMEM is not set | 131 | # CONFIG_TINY_SHMEM is not set |
| @@ -130,12 +136,13 @@ CONFIG_MODULE_UNLOAD=y | |||
| 130 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 136 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 131 | # CONFIG_MODVERSIONS is not set | 137 | # CONFIG_MODVERSIONS is not set |
| 132 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 138 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 133 | # CONFIG_KMOD is not set | 139 | CONFIG_KMOD=y |
| 134 | CONFIG_BLOCK=y | 140 | CONFIG_BLOCK=y |
| 135 | # CONFIG_LBD is not set | 141 | # CONFIG_LBD is not set |
| 136 | # CONFIG_BLK_DEV_IO_TRACE is not set | 142 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 137 | # CONFIG_LSF is not set | 143 | # CONFIG_LSF is not set |
| 138 | # CONFIG_BLK_DEV_BSG is not set | 144 | # CONFIG_BLK_DEV_BSG is not set |
| 145 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 139 | 146 | ||
| 140 | # | 147 | # |
| 141 | # IO Schedulers | 148 | # IO Schedulers |
| @@ -154,8 +161,6 @@ CONFIG_CLASSIC_RCU=y | |||
| 154 | # | 161 | # |
| 155 | # Platform support | 162 | # Platform support |
| 156 | # | 163 | # |
| 157 | # CONFIG_PPC_MPC512x is not set | ||
| 158 | # CONFIG_PPC_MPC5121 is not set | ||
| 159 | # CONFIG_PPC_CELL is not set | 164 | # CONFIG_PPC_CELL is not set |
| 160 | # CONFIG_PPC_CELL_NATIVE is not set | 165 | # CONFIG_PPC_CELL_NATIVE is not set |
| 161 | # CONFIG_PQ2ADS is not set | 166 | # CONFIG_PQ2ADS is not set |
| @@ -164,6 +169,7 @@ CONFIG_MPC85xx=y | |||
| 164 | # CONFIG_MPC8560_ADS is not set | 169 | # CONFIG_MPC8560_ADS is not set |
| 165 | # CONFIG_MPC85xx_CDS is not set | 170 | # CONFIG_MPC85xx_CDS is not set |
| 166 | # CONFIG_MPC85xx_MDS is not set | 171 | # CONFIG_MPC85xx_MDS is not set |
| 172 | # CONFIG_MPC8536_DS is not set | ||
| 167 | # CONFIG_MPC85xx_DS is not set | 173 | # CONFIG_MPC85xx_DS is not set |
| 168 | # CONFIG_KSI8560 is not set | 174 | # CONFIG_KSI8560 is not set |
| 169 | # CONFIG_STX_GP3 is not set | 175 | # CONFIG_STX_GP3 is not set |
| @@ -187,7 +193,6 @@ CONFIG_MPIC=y | |||
| 187 | # CONFIG_GENERIC_IOMAP is not set | 193 | # CONFIG_GENERIC_IOMAP is not set |
| 188 | # CONFIG_CPU_FREQ is not set | 194 | # CONFIG_CPU_FREQ is not set |
| 189 | # CONFIG_CPM2 is not set | 195 | # CONFIG_CPM2 is not set |
| 190 | CONFIG_PPC_CPM_NEW_BINDING=y | ||
| 191 | # CONFIG_FSL_ULI1575 is not set | 196 | # CONFIG_FSL_ULI1575 is not set |
| 192 | 197 | ||
| 193 | # | 198 | # |
| @@ -203,7 +208,7 @@ CONFIG_HZ_250=y | |||
| 203 | # CONFIG_HZ_300 is not set | 208 | # CONFIG_HZ_300 is not set |
| 204 | # CONFIG_HZ_1000 is not set | 209 | # CONFIG_HZ_1000 is not set |
| 205 | CONFIG_HZ=250 | 210 | CONFIG_HZ=250 |
| 206 | # CONFIG_SCHED_HRTICK is not set | 211 | CONFIG_SCHED_HRTICK=y |
| 207 | CONFIG_PREEMPT_NONE=y | 212 | CONFIG_PREEMPT_NONE=y |
| 208 | # CONFIG_PREEMPT_VOLUNTARY is not set | 213 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 209 | # CONFIG_PREEMPT is not set | 214 | # CONFIG_PREEMPT is not set |
| @@ -226,6 +231,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 226 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 231 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 227 | CONFIG_PAGEFLAGS_EXTENDED=y | 232 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 228 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 233 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 234 | CONFIG_MIGRATION=y | ||
| 229 | # CONFIG_RESOURCES_64BIT is not set | 235 | # CONFIG_RESOURCES_64BIT is not set |
| 230 | CONFIG_ZONE_DMA_FLAG=1 | 236 | CONFIG_ZONE_DMA_FLAG=1 |
| 231 | CONFIG_BOUNCE=y | 237 | CONFIG_BOUNCE=y |
| @@ -233,6 +239,7 @@ CONFIG_VIRT_TO_BUS=y | |||
| 233 | CONFIG_FORCE_MAX_ZONEORDER=11 | 239 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 234 | CONFIG_PROC_DEVICETREE=y | 240 | CONFIG_PROC_DEVICETREE=y |
| 235 | # CONFIG_CMDLINE_BOOL is not set | 241 | # CONFIG_CMDLINE_BOOL is not set |
| 242 | CONFIG_EXTRA_TARGETS="" | ||
| 236 | # CONFIG_PM is not set | 243 | # CONFIG_PM is not set |
| 237 | # CONFIG_SECCOMP is not set | 244 | # CONFIG_SECCOMP is not set |
| 238 | CONFIG_ISA_DMA_API=y | 245 | CONFIG_ISA_DMA_API=y |
| @@ -244,7 +251,7 @@ CONFIG_ZONE_DMA=y | |||
| 244 | CONFIG_PPC_INDIRECT_PCI=y | 251 | CONFIG_PPC_INDIRECT_PCI=y |
| 245 | CONFIG_FSL_SOC=y | 252 | CONFIG_FSL_SOC=y |
| 246 | CONFIG_FSL_PCI=y | 253 | CONFIG_FSL_PCI=y |
| 247 | CONFIG_FSL_LBC=y | 254 | CONFIG_PPC_PCI_CHOICE=y |
| 248 | CONFIG_PCI=y | 255 | CONFIG_PCI=y |
| 249 | CONFIG_PCI_DOMAINS=y | 256 | CONFIG_PCI_DOMAINS=y |
| 250 | CONFIG_PCI_SYSCALL=y | 257 | CONFIG_PCI_SYSCALL=y |
| @@ -273,10 +280,6 @@ CONFIG_KERNEL_START=0xc0000000 | |||
| 273 | CONFIG_PHYSICAL_START=0x00000000 | 280 | CONFIG_PHYSICAL_START=0x00000000 |
| 274 | CONFIG_PHYSICAL_ALIGN=0x10000000 | 281 | CONFIG_PHYSICAL_ALIGN=0x10000000 |
| 275 | CONFIG_TASK_SIZE=0xc0000000 | 282 | CONFIG_TASK_SIZE=0xc0000000 |
| 276 | |||
| 277 | # | ||
| 278 | # Networking | ||
| 279 | # | ||
| 280 | CONFIG_NET=y | 283 | CONFIG_NET=y |
| 281 | 284 | ||
| 282 | # | 285 | # |
| @@ -455,7 +458,6 @@ CONFIG_MTD_NAND_IDS=y | |||
| 455 | # CONFIG_MTD_NAND_NANDSIM is not set | 458 | # CONFIG_MTD_NAND_NANDSIM is not set |
| 456 | # CONFIG_MTD_NAND_PLATFORM is not set | 459 | # CONFIG_MTD_NAND_PLATFORM is not set |
| 457 | # CONFIG_MTD_NAND_FSL_ELBC is not set | 460 | # CONFIG_MTD_NAND_FSL_ELBC is not set |
| 458 | CONFIG_MTD_NAND_FSL_UPM=y | ||
| 459 | # CONFIG_MTD_ONENAND is not set | 461 | # CONFIG_MTD_ONENAND is not set |
| 460 | 462 | ||
| 461 | # | 463 | # |
| @@ -490,20 +492,22 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
| 490 | # CONFIG_BLK_DEV_XIP is not set | 492 | # CONFIG_BLK_DEV_XIP is not set |
| 491 | # CONFIG_CDROM_PKTCDVD is not set | 493 | # CONFIG_CDROM_PKTCDVD is not set |
| 492 | # CONFIG_ATA_OVER_ETH is not set | 494 | # CONFIG_ATA_OVER_ETH is not set |
| 495 | # CONFIG_BLK_DEV_HD is not set | ||
| 493 | CONFIG_MISC_DEVICES=y | 496 | CONFIG_MISC_DEVICES=y |
| 494 | # CONFIG_PHANTOM is not set | 497 | # CONFIG_PHANTOM is not set |
| 495 | # CONFIG_EEPROM_93CX6 is not set | 498 | # CONFIG_EEPROM_93CX6 is not set |
| 496 | # CONFIG_SGI_IOC4 is not set | 499 | # CONFIG_SGI_IOC4 is not set |
| 497 | # CONFIG_TIFM_CORE is not set | 500 | # CONFIG_TIFM_CORE is not set |
| 498 | # CONFIG_ENCLOSURE_SERVICES is not set | 501 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 502 | # CONFIG_HP_ILO is not set | ||
| 499 | CONFIG_HAVE_IDE=y | 503 | CONFIG_HAVE_IDE=y |
| 500 | CONFIG_IDE=y | 504 | CONFIG_IDE=y |
| 501 | CONFIG_IDE_MAX_HWIFS=4 | ||
| 502 | CONFIG_BLK_DEV_IDE=y | 505 | CONFIG_BLK_DEV_IDE=y |
| 503 | 506 | ||
| 504 | # | 507 | # |
| 505 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | 508 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
| 506 | # | 509 | # |
| 510 | CONFIG_IDE_TIMINGS=y | ||
| 507 | # CONFIG_BLK_DEV_IDE_SATA is not set | 511 | # CONFIG_BLK_DEV_IDE_SATA is not set |
| 508 | # CONFIG_BLK_DEV_IDEDISK is not set | 512 | # CONFIG_BLK_DEV_IDEDISK is not set |
| 509 | # CONFIG_IDEDISK_MULTI_MODE is not set | 513 | # CONFIG_IDEDISK_MULTI_MODE is not set |
| @@ -516,7 +520,6 @@ CONFIG_IDE_PROC_FS=y | |||
| 516 | # | 520 | # |
| 517 | # IDE chipset support/bugfixes | 521 | # IDE chipset support/bugfixes |
| 518 | # | 522 | # |
| 519 | CONFIG_IDE_GENERIC=y | ||
| 520 | # CONFIG_BLK_DEV_PLATFORM is not set | 523 | # CONFIG_BLK_DEV_PLATFORM is not set |
| 521 | CONFIG_BLK_DEV_IDEDMA_SFF=y | 524 | CONFIG_BLK_DEV_IDEDMA_SFF=y |
| 522 | 525 | ||
| @@ -534,10 +537,8 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
| 534 | # CONFIG_BLK_DEV_AMD74XX is not set | 537 | # CONFIG_BLK_DEV_AMD74XX is not set |
| 535 | # CONFIG_BLK_DEV_CMD64X is not set | 538 | # CONFIG_BLK_DEV_CMD64X is not set |
| 536 | # CONFIG_BLK_DEV_TRIFLEX is not set | 539 | # CONFIG_BLK_DEV_TRIFLEX is not set |
| 537 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
| 538 | # CONFIG_BLK_DEV_CS5520 is not set | 540 | # CONFIG_BLK_DEV_CS5520 is not set |
| 539 | # CONFIG_BLK_DEV_CS5530 is not set | 541 | # CONFIG_BLK_DEV_CS5530 is not set |
| 540 | # CONFIG_BLK_DEV_HPT34X is not set | ||
| 541 | # CONFIG_BLK_DEV_HPT366 is not set | 542 | # CONFIG_BLK_DEV_HPT366 is not set |
| 542 | # CONFIG_BLK_DEV_JMICRON is not set | 543 | # CONFIG_BLK_DEV_JMICRON is not set |
| 543 | # CONFIG_BLK_DEV_SC1200 is not set | 544 | # CONFIG_BLK_DEV_SC1200 is not set |
| @@ -555,8 +556,6 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
| 555 | CONFIG_BLK_DEV_VIA82CXXX=y | 556 | CONFIG_BLK_DEV_VIA82CXXX=y |
| 556 | # CONFIG_BLK_DEV_TC86C001 is not set | 557 | # CONFIG_BLK_DEV_TC86C001 is not set |
| 557 | CONFIG_BLK_DEV_IDEDMA=y | 558 | CONFIG_BLK_DEV_IDEDMA=y |
| 558 | # CONFIG_BLK_DEV_HD_ONLY is not set | ||
| 559 | # CONFIG_BLK_DEV_HD is not set | ||
| 560 | 559 | ||
| 561 | # | 560 | # |
| 562 | # SCSI device support | 561 | # SCSI device support |
| @@ -572,12 +571,15 @@ CONFIG_BLK_DEV_IDEDMA=y | |||
| 572 | # | 571 | # |
| 573 | # IEEE 1394 (FireWire) support | 572 | # IEEE 1394 (FireWire) support |
| 574 | # | 573 | # |
| 574 | |||
| 575 | # | ||
| 576 | # Enable only one of the two stacks, unless you know what you are doing | ||
| 577 | # | ||
| 575 | # CONFIG_FIREWIRE is not set | 578 | # CONFIG_FIREWIRE is not set |
| 576 | # CONFIG_IEEE1394 is not set | 579 | # CONFIG_IEEE1394 is not set |
| 577 | # CONFIG_I2O is not set | 580 | # CONFIG_I2O is not set |
| 578 | # CONFIG_MACINTOSH_DRIVERS is not set | 581 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 579 | CONFIG_NETDEVICES=y | 582 | CONFIG_NETDEVICES=y |
| 580 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 581 | # CONFIG_DUMMY is not set | 583 | # CONFIG_DUMMY is not set |
| 582 | # CONFIG_BONDING is not set | 584 | # CONFIG_BONDING is not set |
| 583 | # CONFIG_MACVLAN is not set | 585 | # CONFIG_MACVLAN is not set |
| @@ -620,10 +622,8 @@ CONFIG_NETDEV_1000=y | |||
| 620 | # CONFIG_ACENIC is not set | 622 | # CONFIG_ACENIC is not set |
| 621 | # CONFIG_DL2K is not set | 623 | # CONFIG_DL2K is not set |
| 622 | CONFIG_E1000=y | 624 | CONFIG_E1000=y |
| 623 | CONFIG_E1000_NAPI=y | ||
| 624 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | 625 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set |
| 625 | # CONFIG_E1000E is not set | 626 | # CONFIG_E1000E is not set |
| 626 | # CONFIG_E1000E_ENABLED is not set | ||
| 627 | # CONFIG_IP1000 is not set | 627 | # CONFIG_IP1000 is not set |
| 628 | # CONFIG_IGB is not set | 628 | # CONFIG_IGB is not set |
| 629 | # CONFIG_NS83820 is not set | 629 | # CONFIG_NS83820 is not set |
| @@ -637,9 +637,9 @@ CONFIG_E1000_NAPI=y | |||
| 637 | # CONFIG_TIGON3 is not set | 637 | # CONFIG_TIGON3 is not set |
| 638 | # CONFIG_BNX2 is not set | 638 | # CONFIG_BNX2 is not set |
| 639 | CONFIG_GIANFAR=y | 639 | CONFIG_GIANFAR=y |
| 640 | CONFIG_GFAR_NAPI=y | ||
| 641 | # CONFIG_QLA3XXX is not set | 640 | # CONFIG_QLA3XXX is not set |
| 642 | # CONFIG_ATL1 is not set | 641 | # CONFIG_ATL1 is not set |
| 642 | # CONFIG_ATL1E is not set | ||
| 643 | CONFIG_NETDEV_10000=y | 643 | CONFIG_NETDEV_10000=y |
| 644 | # CONFIG_CHELSIO_T1 is not set | 644 | # CONFIG_CHELSIO_T1 is not set |
| 645 | # CONFIG_CHELSIO_T3 is not set | 645 | # CONFIG_CHELSIO_T3 is not set |
| @@ -744,42 +744,63 @@ CONFIG_DEVPORT=y | |||
| 744 | CONFIG_I2C=y | 744 | CONFIG_I2C=y |
| 745 | CONFIG_I2C_BOARDINFO=y | 745 | CONFIG_I2C_BOARDINFO=y |
| 746 | CONFIG_I2C_CHARDEV=y | 746 | CONFIG_I2C_CHARDEV=y |
| 747 | CONFIG_I2C_HELPER_AUTO=y | ||
| 747 | 748 | ||
| 748 | # | 749 | # |
| 749 | # I2C Hardware Bus support | 750 | # I2C Hardware Bus support |
| 750 | # | 751 | # |
| 752 | |||
| 753 | # | ||
| 754 | # PC SMBus host controller drivers | ||
| 755 | # | ||
| 751 | # CONFIG_I2C_ALI1535 is not set | 756 | # CONFIG_I2C_ALI1535 is not set |
| 752 | # CONFIG_I2C_ALI1563 is not set | 757 | # CONFIG_I2C_ALI1563 is not set |
| 753 | # CONFIG_I2C_ALI15X3 is not set | 758 | # CONFIG_I2C_ALI15X3 is not set |
| 754 | # CONFIG_I2C_AMD756 is not set | 759 | # CONFIG_I2C_AMD756 is not set |
| 755 | # CONFIG_I2C_AMD8111 is not set | 760 | # CONFIG_I2C_AMD8111 is not set |
| 756 | # CONFIG_I2C_I801 is not set | 761 | # CONFIG_I2C_I801 is not set |
| 757 | # CONFIG_I2C_I810 is not set | 762 | # CONFIG_I2C_ISCH is not set |
| 758 | # CONFIG_I2C_PIIX4 is not set | 763 | # CONFIG_I2C_PIIX4 is not set |
| 759 | CONFIG_I2C_MPC=y | ||
| 760 | # CONFIG_I2C_NFORCE2 is not set | 764 | # CONFIG_I2C_NFORCE2 is not set |
| 761 | # CONFIG_I2C_OCORES is not set | ||
| 762 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 763 | # CONFIG_I2C_PROSAVAGE is not set | ||
| 764 | # CONFIG_I2C_SAVAGE4 is not set | ||
| 765 | # CONFIG_I2C_SIMTEC is not set | ||
| 766 | # CONFIG_I2C_SIS5595 is not set | 765 | # CONFIG_I2C_SIS5595 is not set |
| 767 | # CONFIG_I2C_SIS630 is not set | 766 | # CONFIG_I2C_SIS630 is not set |
| 768 | # CONFIG_I2C_SIS96X is not set | 767 | # CONFIG_I2C_SIS96X is not set |
| 769 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 770 | # CONFIG_I2C_STUB is not set | ||
| 771 | # CONFIG_I2C_VIA is not set | 768 | # CONFIG_I2C_VIA is not set |
| 772 | # CONFIG_I2C_VIAPRO is not set | 769 | # CONFIG_I2C_VIAPRO is not set |
| 770 | |||
| 771 | # | ||
| 772 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 773 | # | ||
| 774 | CONFIG_I2C_MPC=y | ||
| 775 | # CONFIG_I2C_OCORES is not set | ||
| 776 | # CONFIG_I2C_SIMTEC is not set | ||
| 777 | |||
| 778 | # | ||
| 779 | # External I2C/SMBus adapter drivers | ||
| 780 | # | ||
| 781 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 782 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 783 | |||
| 784 | # | ||
| 785 | # Graphics adapter I2C/DDC channel drivers | ||
| 786 | # | ||
| 773 | # CONFIG_I2C_VOODOO3 is not set | 787 | # CONFIG_I2C_VOODOO3 is not set |
| 788 | |||
| 789 | # | ||
| 790 | # Other I2C/SMBus bus drivers | ||
| 791 | # | ||
| 774 | # CONFIG_I2C_PCA_PLATFORM is not set | 792 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 793 | # CONFIG_I2C_STUB is not set | ||
| 775 | 794 | ||
| 776 | # | 795 | # |
| 777 | # Miscellaneous I2C Chip support | 796 | # Miscellaneous I2C Chip support |
| 778 | # | 797 | # |
| 779 | # CONFIG_DS1682 is not set | 798 | # CONFIG_DS1682 is not set |
| 799 | # CONFIG_AT24 is not set | ||
| 780 | # CONFIG_SENSORS_EEPROM is not set | 800 | # CONFIG_SENSORS_EEPROM is not set |
| 781 | # CONFIG_SENSORS_PCF8574 is not set | 801 | # CONFIG_SENSORS_PCF8574 is not set |
| 782 | # CONFIG_PCF8575 is not set | 802 | # CONFIG_PCF8575 is not set |
| 803 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 783 | # CONFIG_SENSORS_PCF8591 is not set | 804 | # CONFIG_SENSORS_PCF8591 is not set |
| 784 | # CONFIG_SENSORS_MAX6875 is not set | 805 | # CONFIG_SENSORS_MAX6875 is not set |
| 785 | # CONFIG_SENSORS_TSL2550 is not set | 806 | # CONFIG_SENSORS_TSL2550 is not set |
| @@ -788,10 +809,13 @@ CONFIG_I2C_MPC=y | |||
| 788 | # CONFIG_I2C_DEBUG_BUS is not set | 809 | # CONFIG_I2C_DEBUG_BUS is not set |
| 789 | # CONFIG_I2C_DEBUG_CHIP is not set | 810 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 790 | # CONFIG_SPI is not set | 811 | # CONFIG_SPI is not set |
| 812 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 813 | # CONFIG_GPIOLIB is not set | ||
| 791 | # CONFIG_W1 is not set | 814 | # CONFIG_W1 is not set |
| 792 | # CONFIG_POWER_SUPPLY is not set | 815 | # CONFIG_POWER_SUPPLY is not set |
| 793 | CONFIG_HWMON=y | 816 | CONFIG_HWMON=y |
| 794 | # CONFIG_HWMON_VID is not set | 817 | # CONFIG_HWMON_VID is not set |
| 818 | # CONFIG_SENSORS_AD7414 is not set | ||
| 795 | # CONFIG_SENSORS_AD7418 is not set | 819 | # CONFIG_SENSORS_AD7418 is not set |
| 796 | # CONFIG_SENSORS_ADM1021 is not set | 820 | # CONFIG_SENSORS_ADM1021 is not set |
| 797 | # CONFIG_SENSORS_ADM1025 is not set | 821 | # CONFIG_SENSORS_ADM1025 is not set |
| @@ -845,6 +869,7 @@ CONFIG_SENSORS_LM75=y | |||
| 845 | # CONFIG_SENSORS_W83627EHF is not set | 869 | # CONFIG_SENSORS_W83627EHF is not set |
| 846 | # CONFIG_HWMON_DEBUG_CHIP is not set | 870 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 847 | # CONFIG_THERMAL is not set | 871 | # CONFIG_THERMAL is not set |
| 872 | # CONFIG_THERMAL_HWMON is not set | ||
| 848 | # CONFIG_WATCHDOG is not set | 873 | # CONFIG_WATCHDOG is not set |
| 849 | 874 | ||
| 850 | # | 875 | # |
| @@ -856,8 +881,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 856 | # | 881 | # |
| 857 | # Multifunction device drivers | 882 | # Multifunction device drivers |
| 858 | # | 883 | # |
| 884 | # CONFIG_MFD_CORE is not set | ||
| 859 | # CONFIG_MFD_SM501 is not set | 885 | # CONFIG_MFD_SM501 is not set |
| 860 | # CONFIG_HTC_PASIC3 is not set | 886 | # CONFIG_HTC_PASIC3 is not set |
| 887 | # CONFIG_MFD_TMIO is not set | ||
| 861 | 888 | ||
| 862 | # | 889 | # |
| 863 | # Multimedia devices | 890 | # Multimedia devices |
| @@ -889,10 +916,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
| 889 | # Display device support | 916 | # Display device support |
| 890 | # | 917 | # |
| 891 | # CONFIG_DISPLAY_SUPPORT is not set | 918 | # CONFIG_DISPLAY_SUPPORT is not set |
| 892 | |||
| 893 | # | ||
| 894 | # Sound | ||
| 895 | # | ||
| 896 | # CONFIG_SOUND is not set | 919 | # CONFIG_SOUND is not set |
| 897 | CONFIG_HID_SUPPORT=y | 920 | CONFIG_HID_SUPPORT=y |
| 898 | CONFIG_HID=y | 921 | CONFIG_HID=y |
| @@ -907,6 +930,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 907 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 930 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
| 908 | 931 | ||
| 909 | # | 932 | # |
| 933 | # Enable Host or Gadget support to see Inventra options | ||
| 934 | # | ||
| 935 | |||
| 936 | # | ||
| 910 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 937 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 911 | # | 938 | # |
| 912 | # CONFIG_USB_GADGET is not set | 939 | # CONFIG_USB_GADGET is not set |
| @@ -945,6 +972,7 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 945 | # CONFIG_RTC_DRV_PCF8583 is not set | 972 | # CONFIG_RTC_DRV_PCF8583 is not set |
| 946 | # CONFIG_RTC_DRV_M41T80 is not set | 973 | # CONFIG_RTC_DRV_M41T80 is not set |
| 947 | # CONFIG_RTC_DRV_S35390A is not set | 974 | # CONFIG_RTC_DRV_S35390A is not set |
| 975 | # CONFIG_RTC_DRV_FM3130 is not set | ||
| 948 | 976 | ||
| 949 | # | 977 | # |
| 950 | # SPI RTC drivers | 978 | # SPI RTC drivers |
| @@ -1031,9 +1059,11 @@ CONFIG_TMPFS=y | |||
| 1031 | # CONFIG_BFS_FS is not set | 1059 | # CONFIG_BFS_FS is not set |
| 1032 | # CONFIG_EFS_FS is not set | 1060 | # CONFIG_EFS_FS is not set |
| 1033 | # CONFIG_JFFS2_FS is not set | 1061 | # CONFIG_JFFS2_FS is not set |
| 1062 | # CONFIG_UBIFS_FS is not set | ||
| 1034 | # CONFIG_CRAMFS is not set | 1063 | # CONFIG_CRAMFS is not set |
| 1035 | # CONFIG_VXFS_FS is not set | 1064 | # CONFIG_VXFS_FS is not set |
| 1036 | # CONFIG_MINIX_FS is not set | 1065 | # CONFIG_MINIX_FS is not set |
| 1066 | # CONFIG_OMFS_FS is not set | ||
| 1037 | # CONFIG_HPFS_FS is not set | 1067 | # CONFIG_HPFS_FS is not set |
| 1038 | # CONFIG_QNX4FS_FS is not set | 1068 | # CONFIG_QNX4FS_FS is not set |
| 1039 | # CONFIG_ROMFS_FS is not set | 1069 | # CONFIG_ROMFS_FS is not set |
| @@ -1043,12 +1073,11 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 1043 | CONFIG_NFS_FS=y | 1073 | CONFIG_NFS_FS=y |
| 1044 | # CONFIG_NFS_V3 is not set | 1074 | # CONFIG_NFS_V3 is not set |
| 1045 | # CONFIG_NFS_V4 is not set | 1075 | # CONFIG_NFS_V4 is not set |
| 1046 | # CONFIG_NFSD is not set | ||
| 1047 | CONFIG_ROOT_NFS=y | 1076 | CONFIG_ROOT_NFS=y |
| 1077 | # CONFIG_NFSD is not set | ||
| 1048 | CONFIG_LOCKD=y | 1078 | CONFIG_LOCKD=y |
| 1049 | CONFIG_NFS_COMMON=y | 1079 | CONFIG_NFS_COMMON=y |
| 1050 | CONFIG_SUNRPC=y | 1080 | CONFIG_SUNRPC=y |
| 1051 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 1052 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1081 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 1053 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1082 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1054 | # CONFIG_SMB_FS is not set | 1083 | # CONFIG_SMB_FS is not set |
| @@ -1084,6 +1113,7 @@ CONFIG_BITREVERSE=y | |||
| 1084 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1113 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 1085 | # CONFIG_CRC_CCITT is not set | 1114 | # CONFIG_CRC_CCITT is not set |
| 1086 | # CONFIG_CRC16 is not set | 1115 | # CONFIG_CRC16 is not set |
| 1116 | # CONFIG_CRC_T10DIF is not set | ||
| 1087 | # CONFIG_CRC_ITU_T is not set | 1117 | # CONFIG_CRC_ITU_T is not set |
| 1088 | CONFIG_CRC32=y | 1118 | CONFIG_CRC32=y |
| 1089 | # CONFIG_CRC7 is not set | 1119 | # CONFIG_CRC7 is not set |
| @@ -1108,6 +1138,8 @@ CONFIG_FRAME_WARN=1024 | |||
| 1108 | CONFIG_DEBUG_KERNEL=y | 1138 | CONFIG_DEBUG_KERNEL=y |
| 1109 | # CONFIG_DEBUG_SHIRQ is not set | 1139 | # CONFIG_DEBUG_SHIRQ is not set |
| 1110 | CONFIG_DETECT_SOFTLOCKUP=y | 1140 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1141 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 1142 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 1111 | CONFIG_SCHED_DEBUG=y | 1143 | CONFIG_SCHED_DEBUG=y |
| 1112 | # CONFIG_SCHEDSTATS is not set | 1144 | # CONFIG_SCHEDSTATS is not set |
| 1113 | # CONFIG_TIMER_STATS is not set | 1145 | # CONFIG_TIMER_STATS is not set |
| @@ -1125,17 +1157,29 @@ CONFIG_DEBUG_MUTEXES=y | |||
| 1125 | # CONFIG_DEBUG_INFO is not set | 1157 | # CONFIG_DEBUG_INFO is not set |
| 1126 | # CONFIG_DEBUG_VM is not set | 1158 | # CONFIG_DEBUG_VM is not set |
| 1127 | # CONFIG_DEBUG_WRITECOUNT is not set | 1159 | # CONFIG_DEBUG_WRITECOUNT is not set |
| 1160 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 1128 | # CONFIG_DEBUG_LIST is not set | 1161 | # CONFIG_DEBUG_LIST is not set |
| 1129 | # CONFIG_DEBUG_SG is not set | 1162 | # CONFIG_DEBUG_SG is not set |
| 1130 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1163 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 1131 | # CONFIG_RCU_TORTURE_TEST is not set | 1164 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1132 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1165 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 1133 | # CONFIG_FAULT_INJECTION is not set | 1166 | # CONFIG_FAULT_INJECTION is not set |
| 1167 | # CONFIG_LATENCYTOP is not set | ||
| 1168 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1169 | CONFIG_HAVE_FTRACE=y | ||
| 1170 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1171 | # CONFIG_FTRACE is not set | ||
| 1172 | # CONFIG_SCHED_TRACER is not set | ||
| 1173 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1134 | # CONFIG_SAMPLES is not set | 1174 | # CONFIG_SAMPLES is not set |
| 1175 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1176 | # CONFIG_KGDB is not set | ||
| 1135 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1177 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
| 1136 | # CONFIG_DEBUG_STACK_USAGE is not set | 1178 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1137 | # CONFIG_DEBUG_PAGEALLOC is not set | 1179 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1138 | # CONFIG_DEBUGGER is not set | 1180 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
| 1181 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
| 1182 | # CONFIG_XMON is not set | ||
| 1139 | # CONFIG_IRQSTACKS is not set | 1183 | # CONFIG_IRQSTACKS is not set |
| 1140 | # CONFIG_BDI_SWITCH is not set | 1184 | # CONFIG_BDI_SWITCH is not set |
| 1141 | # CONFIG_PPC_EARLY_DEBUG is not set | 1185 | # CONFIG_PPC_EARLY_DEBUG is not set |
| @@ -1189,6 +1233,10 @@ CONFIG_CRYPTO=y | |||
| 1189 | # CONFIG_CRYPTO_MD4 is not set | 1233 | # CONFIG_CRYPTO_MD4 is not set |
| 1190 | # CONFIG_CRYPTO_MD5 is not set | 1234 | # CONFIG_CRYPTO_MD5 is not set |
| 1191 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1235 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 1236 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1237 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1238 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1239 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1192 | # CONFIG_CRYPTO_SHA1 is not set | 1240 | # CONFIG_CRYPTO_SHA1 is not set |
| 1193 | # CONFIG_CRYPTO_SHA256 is not set | 1241 | # CONFIG_CRYPTO_SHA256 is not set |
| 1194 | # CONFIG_CRYPTO_SHA512 is not set | 1242 | # CONFIG_CRYPTO_SHA512 is not set |
| @@ -1221,5 +1269,6 @@ CONFIG_CRYPTO=y | |||
| 1221 | # CONFIG_CRYPTO_LZO is not set | 1269 | # CONFIG_CRYPTO_LZO is not set |
| 1222 | CONFIG_CRYPTO_HW=y | 1270 | CONFIG_CRYPTO_HW=y |
| 1223 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1271 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1272 | # CONFIG_CRYPTO_DEV_TALITOS is not set | ||
| 1224 | # CONFIG_PPC_CLOCK is not set | 1273 | # CONFIG_PPC_CLOCK is not set |
| 1225 | # CONFIG_VIRTUALIZATION is not set | 1274 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/85xx/tqm8555_defconfig b/arch/powerpc/configs/85xx/tqm8555_defconfig index 03120b5b52fa..dcf9cfe28b55 100644 --- a/arch/powerpc/configs/85xx/tqm8555_defconfig +++ b/arch/powerpc/configs/85xx/tqm8555_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.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Mon Jun 9 08:52:41 2008 | 4 | # Thu Aug 21 00:52:42 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -15,6 +15,7 @@ CONFIG_PPC_85xx=y | |||
| 15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
| 16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
| 17 | CONFIG_E500=y | 17 | CONFIG_E500=y |
| 18 | # CONFIG_PPC_E500MC is not set | ||
| 18 | CONFIG_BOOKE=y | 19 | CONFIG_BOOKE=y |
| 19 | CONFIG_FSL_BOOKE=y | 20 | CONFIG_FSL_BOOKE=y |
| 20 | CONFIG_FSL_EMB_PERFMON=y | 21 | CONFIG_FSL_EMB_PERFMON=y |
| @@ -33,12 +34,14 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 35 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | 36 | CONFIG_STACKTRACE_SUPPORT=y |
| 37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | 38 | CONFIG_LOCKDEP_SUPPORT=y |
| 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 38 | CONFIG_ARCH_HAS_ILOG2_U32=y | 40 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 39 | CONFIG_GENERIC_HWEIGHT=y | 41 | CONFIG_GENERIC_HWEIGHT=y |
| 40 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 42 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 41 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 43 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 44 | CONFIG_GENERIC_GPIO=y | ||
| 42 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 45 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
| 43 | CONFIG_PPC=y | 46 | CONFIG_PPC=y |
| 44 | CONFIG_EARLY_PRINTK=y | 47 | CONFIG_EARLY_PRINTK=y |
| @@ -89,7 +92,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 89 | CONFIG_SYSCTL=y | 92 | CONFIG_SYSCTL=y |
| 90 | CONFIG_EMBEDDED=y | 93 | CONFIG_EMBEDDED=y |
| 91 | CONFIG_SYSCTL_SYSCALL=y | 94 | CONFIG_SYSCTL_SYSCALL=y |
| 92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 93 | # CONFIG_KALLSYMS is not set | 95 | # CONFIG_KALLSYMS is not set |
| 94 | # CONFIG_HOTPLUG is not set | 96 | # CONFIG_HOTPLUG is not set |
| 95 | CONFIG_PRINTK=y | 97 | CONFIG_PRINTK=y |
| @@ -112,10 +114,16 @@ CONFIG_SLUB=y | |||
| 112 | # CONFIG_PROFILING is not set | 114 | # CONFIG_PROFILING is not set |
| 113 | # CONFIG_MARKERS is not set | 115 | # CONFIG_MARKERS is not set |
| 114 | CONFIG_HAVE_OPROFILE=y | 116 | CONFIG_HAVE_OPROFILE=y |
| 117 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 118 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 115 | CONFIG_HAVE_KPROBES=y | 119 | CONFIG_HAVE_KPROBES=y |
| 116 | CONFIG_HAVE_KRETPROBES=y | 120 | CONFIG_HAVE_KRETPROBES=y |
| 121 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 117 | # CONFIG_HAVE_DMA_ATTRS is not set | 122 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 123 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 124 | CONFIG_HAVE_CLK=y | ||
| 118 | CONFIG_PROC_PAGE_MONITOR=y | 125 | CONFIG_PROC_PAGE_MONITOR=y |
| 126 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 119 | CONFIG_SLABINFO=y | 127 | CONFIG_SLABINFO=y |
| 120 | CONFIG_RT_MUTEXES=y | 128 | CONFIG_RT_MUTEXES=y |
| 121 | # CONFIG_TINY_SHMEM is not set | 129 | # CONFIG_TINY_SHMEM is not set |
| @@ -126,6 +134,7 @@ CONFIG_BLOCK=y | |||
| 126 | # CONFIG_BLK_DEV_IO_TRACE is not set | 134 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 127 | # CONFIG_LSF is not set | 135 | # CONFIG_LSF is not set |
| 128 | # CONFIG_BLK_DEV_BSG is not set | 136 | # CONFIG_BLK_DEV_BSG is not set |
| 137 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 129 | 138 | ||
| 130 | # | 139 | # |
| 131 | # IO Schedulers | 140 | # IO Schedulers |
| @@ -144,8 +153,6 @@ CONFIG_CLASSIC_RCU=y | |||
| 144 | # | 153 | # |
| 145 | # Platform support | 154 | # Platform support |
| 146 | # | 155 | # |
| 147 | # CONFIG_PPC_MPC512x is not set | ||
| 148 | # CONFIG_PPC_MPC5121 is not set | ||
| 149 | # CONFIG_PPC_CELL is not set | 156 | # CONFIG_PPC_CELL is not set |
| 150 | # CONFIG_PPC_CELL_NATIVE is not set | 157 | # CONFIG_PPC_CELL_NATIVE is not set |
| 151 | # CONFIG_PQ2ADS is not set | 158 | # CONFIG_PQ2ADS is not set |
| @@ -154,11 +161,13 @@ CONFIG_MPC85xx=y | |||
| 154 | # CONFIG_MPC8560_ADS is not set | 161 | # CONFIG_MPC8560_ADS is not set |
| 155 | # CONFIG_MPC85xx_CDS is not set | 162 | # CONFIG_MPC85xx_CDS is not set |
| 156 | # CONFIG_MPC85xx_MDS is not set | 163 | # CONFIG_MPC85xx_MDS is not set |
| 164 | # CONFIG_MPC8536_DS is not set | ||
| 157 | # CONFIG_MPC85xx_DS is not set | 165 | # CONFIG_MPC85xx_DS is not set |
| 158 | # CONFIG_KSI8560 is not set | 166 | # CONFIG_KSI8560 is not set |
| 159 | # CONFIG_STX_GP3 is not set | 167 | # CONFIG_STX_GP3 is not set |
| 160 | # CONFIG_TQM8540 is not set | 168 | # CONFIG_TQM8540 is not set |
| 161 | # CONFIG_TQM8541 is not set | 169 | # CONFIG_TQM8541 is not set |
| 170 | # CONFIG_TQM8548 is not set | ||
| 162 | CONFIG_TQM8555=y | 171 | CONFIG_TQM8555=y |
| 163 | # CONFIG_TQM8560 is not set | 172 | # CONFIG_TQM8560 is not set |
| 164 | # CONFIG_SBC8548 is not set | 173 | # CONFIG_SBC8548 is not set |
| @@ -176,7 +185,6 @@ CONFIG_MPIC=y | |||
| 176 | # CONFIG_GENERIC_IOMAP is not set | 185 | # CONFIG_GENERIC_IOMAP is not set |
| 177 | # CONFIG_CPU_FREQ is not set | 186 | # CONFIG_CPU_FREQ is not set |
| 178 | CONFIG_CPM2=y | 187 | CONFIG_CPM2=y |
| 179 | CONFIG_PPC_CPM_NEW_BINDING=y | ||
| 180 | # CONFIG_FSL_ULI1575 is not set | 188 | # CONFIG_FSL_ULI1575 is not set |
| 181 | CONFIG_CPM=y | 189 | CONFIG_CPM=y |
| 182 | 190 | ||
| @@ -216,6 +224,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 216 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 224 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 217 | CONFIG_PAGEFLAGS_EXTENDED=y | 225 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 218 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 226 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 227 | CONFIG_MIGRATION=y | ||
| 219 | # CONFIG_RESOURCES_64BIT is not set | 228 | # CONFIG_RESOURCES_64BIT is not set |
| 220 | CONFIG_ZONE_DMA_FLAG=1 | 229 | CONFIG_ZONE_DMA_FLAG=1 |
| 221 | CONFIG_BOUNCE=y | 230 | CONFIG_BOUNCE=y |
| @@ -223,6 +232,7 @@ CONFIG_VIRT_TO_BUS=y | |||
| 223 | CONFIG_FORCE_MAX_ZONEORDER=11 | 232 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 224 | # CONFIG_PROC_DEVICETREE is not set | 233 | # CONFIG_PROC_DEVICETREE is not set |
| 225 | # CONFIG_CMDLINE_BOOL is not set | 234 | # CONFIG_CMDLINE_BOOL is not set |
| 235 | CONFIG_EXTRA_TARGETS="" | ||
| 226 | # CONFIG_PM is not set | 236 | # CONFIG_PM is not set |
| 227 | CONFIG_SECCOMP=y | 237 | CONFIG_SECCOMP=y |
| 228 | CONFIG_ISA_DMA_API=y | 238 | CONFIG_ISA_DMA_API=y |
| @@ -234,6 +244,7 @@ CONFIG_ZONE_DMA=y | |||
| 234 | CONFIG_PPC_INDIRECT_PCI=y | 244 | CONFIG_PPC_INDIRECT_PCI=y |
| 235 | CONFIG_FSL_SOC=y | 245 | CONFIG_FSL_SOC=y |
| 236 | CONFIG_FSL_PCI=y | 246 | CONFIG_FSL_PCI=y |
| 247 | CONFIG_PPC_PCI_CHOICE=y | ||
| 237 | CONFIG_PCI=y | 248 | CONFIG_PCI=y |
| 238 | CONFIG_PCI_DOMAINS=y | 249 | CONFIG_PCI_DOMAINS=y |
| 239 | CONFIG_PCI_SYSCALL=y | 250 | CONFIG_PCI_SYSCALL=y |
| @@ -257,10 +268,6 @@ CONFIG_KERNEL_START=0xc0000000 | |||
| 257 | CONFIG_PHYSICAL_START=0x00000000 | 268 | CONFIG_PHYSICAL_START=0x00000000 |
| 258 | CONFIG_PHYSICAL_ALIGN=0x10000000 | 269 | CONFIG_PHYSICAL_ALIGN=0x10000000 |
| 259 | CONFIG_TASK_SIZE=0xc0000000 | 270 | CONFIG_TASK_SIZE=0xc0000000 |
| 260 | |||
| 261 | # | ||
| 262 | # Networking | ||
| 263 | # | ||
| 264 | CONFIG_NET=y | 271 | CONFIG_NET=y |
| 265 | 272 | ||
| 266 | # | 273 | # |
| @@ -432,6 +439,7 @@ CONFIG_MTD_CFI_UTIL=y | |||
| 432 | # | 439 | # |
| 433 | # CONFIG_MTD_UBI is not set | 440 | # CONFIG_MTD_UBI is not set |
| 434 | CONFIG_OF_DEVICE=y | 441 | CONFIG_OF_DEVICE=y |
| 442 | CONFIG_OF_GPIO=y | ||
| 435 | CONFIG_OF_I2C=y | 443 | CONFIG_OF_I2C=y |
| 436 | # CONFIG_PARPORT is not set | 444 | # CONFIG_PARPORT is not set |
| 437 | CONFIG_BLK_DEV=y | 445 | CONFIG_BLK_DEV=y |
| @@ -451,20 +459,22 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
| 451 | # CONFIG_BLK_DEV_XIP is not set | 459 | # CONFIG_BLK_DEV_XIP is not set |
| 452 | # CONFIG_CDROM_PKTCDVD is not set | 460 | # CONFIG_CDROM_PKTCDVD is not set |
| 453 | # CONFIG_ATA_OVER_ETH is not set | 461 | # CONFIG_ATA_OVER_ETH is not set |
| 462 | # CONFIG_BLK_DEV_HD is not set | ||
| 454 | CONFIG_MISC_DEVICES=y | 463 | CONFIG_MISC_DEVICES=y |
| 455 | # CONFIG_PHANTOM is not set | 464 | # CONFIG_PHANTOM is not set |
| 456 | # CONFIG_EEPROM_93CX6 is not set | 465 | # CONFIG_EEPROM_93CX6 is not set |
| 457 | # CONFIG_SGI_IOC4 is not set | 466 | # CONFIG_SGI_IOC4 is not set |
| 458 | # CONFIG_TIFM_CORE is not set | 467 | # CONFIG_TIFM_CORE is not set |
| 459 | # CONFIG_ENCLOSURE_SERVICES is not set | 468 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 469 | # CONFIG_HP_ILO is not set | ||
| 460 | CONFIG_HAVE_IDE=y | 470 | CONFIG_HAVE_IDE=y |
| 461 | CONFIG_IDE=y | 471 | CONFIG_IDE=y |
| 462 | CONFIG_IDE_MAX_HWIFS=4 | ||
| 463 | CONFIG_BLK_DEV_IDE=y | 472 | CONFIG_BLK_DEV_IDE=y |
| 464 | 473 | ||
| 465 | # | 474 | # |
| 466 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | 475 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
| 467 | # | 476 | # |
| 477 | CONFIG_IDE_TIMINGS=y | ||
| 468 | # CONFIG_BLK_DEV_IDE_SATA is not set | 478 | # CONFIG_BLK_DEV_IDE_SATA is not set |
| 469 | CONFIG_BLK_DEV_IDEDISK=y | 479 | CONFIG_BLK_DEV_IDEDISK=y |
| 470 | # CONFIG_IDEDISK_MULTI_MODE is not set | 480 | # CONFIG_IDEDISK_MULTI_MODE is not set |
| @@ -477,7 +487,6 @@ CONFIG_IDE_PROC_FS=y | |||
| 477 | # | 487 | # |
| 478 | # IDE chipset support/bugfixes | 488 | # IDE chipset support/bugfixes |
| 479 | # | 489 | # |
| 480 | CONFIG_IDE_GENERIC=y | ||
| 481 | # CONFIG_BLK_DEV_PLATFORM is not set | 490 | # CONFIG_BLK_DEV_PLATFORM is not set |
| 482 | CONFIG_BLK_DEV_IDEDMA_SFF=y | 491 | CONFIG_BLK_DEV_IDEDMA_SFF=y |
| 483 | 492 | ||
| @@ -495,10 +504,8 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
| 495 | # CONFIG_BLK_DEV_AMD74XX is not set | 504 | # CONFIG_BLK_DEV_AMD74XX is not set |
| 496 | # CONFIG_BLK_DEV_CMD64X is not set | 505 | # CONFIG_BLK_DEV_CMD64X is not set |
| 497 | # CONFIG_BLK_DEV_TRIFLEX is not set | 506 | # CONFIG_BLK_DEV_TRIFLEX is not set |
| 498 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
| 499 | # CONFIG_BLK_DEV_CS5520 is not set | 507 | # CONFIG_BLK_DEV_CS5520 is not set |
| 500 | # CONFIG_BLK_DEV_CS5530 is not set | 508 | # CONFIG_BLK_DEV_CS5530 is not set |
| 501 | # CONFIG_BLK_DEV_HPT34X is not set | ||
| 502 | # CONFIG_BLK_DEV_HPT366 is not set | 509 | # CONFIG_BLK_DEV_HPT366 is not set |
| 503 | # CONFIG_BLK_DEV_JMICRON is not set | 510 | # CONFIG_BLK_DEV_JMICRON is not set |
| 504 | # CONFIG_BLK_DEV_SC1200 is not set | 511 | # CONFIG_BLK_DEV_SC1200 is not set |
| @@ -516,8 +523,6 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
| 516 | CONFIG_BLK_DEV_VIA82CXXX=y | 523 | CONFIG_BLK_DEV_VIA82CXXX=y |
| 517 | # CONFIG_BLK_DEV_TC86C001 is not set | 524 | # CONFIG_BLK_DEV_TC86C001 is not set |
| 518 | CONFIG_BLK_DEV_IDEDMA=y | 525 | CONFIG_BLK_DEV_IDEDMA=y |
| 519 | # CONFIG_BLK_DEV_HD_ONLY is not set | ||
| 520 | # CONFIG_BLK_DEV_HD is not set | ||
| 521 | 526 | ||
| 522 | # | 527 | # |
| 523 | # SCSI device support | 528 | # SCSI device support |
| @@ -533,12 +538,15 @@ CONFIG_BLK_DEV_IDEDMA=y | |||
| 533 | # | 538 | # |
| 534 | # IEEE 1394 (FireWire) support | 539 | # IEEE 1394 (FireWire) support |
| 535 | # | 540 | # |
| 541 | |||
| 542 | # | ||
| 543 | # Enable only one of the two stacks, unless you know what you are doing | ||
| 544 | # | ||
| 536 | # CONFIG_FIREWIRE is not set | 545 | # CONFIG_FIREWIRE is not set |
| 537 | # CONFIG_IEEE1394 is not set | 546 | # CONFIG_IEEE1394 is not set |
| 538 | # CONFIG_I2O is not set | 547 | # CONFIG_I2O is not set |
| 539 | # CONFIG_MACINTOSH_DRIVERS is not set | 548 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 540 | CONFIG_NETDEVICES=y | 549 | CONFIG_NETDEVICES=y |
| 541 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 542 | # CONFIG_DUMMY is not set | 550 | # CONFIG_DUMMY is not set |
| 543 | # CONFIG_BONDING is not set | 551 | # CONFIG_BONDING is not set |
| 544 | # CONFIG_MACVLAN is not set | 552 | # CONFIG_MACVLAN is not set |
| @@ -601,7 +609,6 @@ CONFIG_NETDEV_1000=y | |||
| 601 | # CONFIG_DL2K is not set | 609 | # CONFIG_DL2K is not set |
| 602 | # CONFIG_E1000 is not set | 610 | # CONFIG_E1000 is not set |
| 603 | # CONFIG_E1000E is not set | 611 | # CONFIG_E1000E is not set |
| 604 | # CONFIG_E1000E_ENABLED is not set | ||
| 605 | # CONFIG_IP1000 is not set | 612 | # CONFIG_IP1000 is not set |
| 606 | # CONFIG_IGB is not set | 613 | # CONFIG_IGB is not set |
| 607 | # CONFIG_NS83820 is not set | 614 | # CONFIG_NS83820 is not set |
| @@ -615,9 +622,9 @@ CONFIG_NETDEV_1000=y | |||
| 615 | # CONFIG_TIGON3 is not set | 622 | # CONFIG_TIGON3 is not set |
| 616 | # CONFIG_BNX2 is not set | 623 | # CONFIG_BNX2 is not set |
| 617 | CONFIG_GIANFAR=y | 624 | CONFIG_GIANFAR=y |
| 618 | CONFIG_GFAR_NAPI=y | ||
| 619 | # CONFIG_QLA3XXX is not set | 625 | # CONFIG_QLA3XXX is not set |
| 620 | # CONFIG_ATL1 is not set | 626 | # CONFIG_ATL1 is not set |
| 627 | # CONFIG_ATL1E is not set | ||
| 621 | CONFIG_NETDEV_10000=y | 628 | CONFIG_NETDEV_10000=y |
| 622 | # CONFIG_CHELSIO_T1 is not set | 629 | # CONFIG_CHELSIO_T1 is not set |
| 623 | # CONFIG_CHELSIO_T3 is not set | 630 | # CONFIG_CHELSIO_T3 is not set |
| @@ -732,42 +739,66 @@ CONFIG_DEVPORT=y | |||
| 732 | CONFIG_I2C=y | 739 | CONFIG_I2C=y |
| 733 | CONFIG_I2C_BOARDINFO=y | 740 | CONFIG_I2C_BOARDINFO=y |
| 734 | CONFIG_I2C_CHARDEV=y | 741 | CONFIG_I2C_CHARDEV=y |
| 742 | CONFIG_I2C_HELPER_AUTO=y | ||
| 735 | 743 | ||
| 736 | # | 744 | # |
| 737 | # I2C Hardware Bus support | 745 | # I2C Hardware Bus support |
| 738 | # | 746 | # |
| 747 | |||
| 748 | # | ||
| 749 | # PC SMBus host controller drivers | ||
| 750 | # | ||
| 739 | # CONFIG_I2C_ALI1535 is not set | 751 | # CONFIG_I2C_ALI1535 is not set |
| 740 | # CONFIG_I2C_ALI1563 is not set | 752 | # CONFIG_I2C_ALI1563 is not set |
| 741 | # CONFIG_I2C_ALI15X3 is not set | 753 | # CONFIG_I2C_ALI15X3 is not set |
| 742 | # CONFIG_I2C_AMD756 is not set | 754 | # CONFIG_I2C_AMD756 is not set |
| 743 | # CONFIG_I2C_AMD8111 is not set | 755 | # CONFIG_I2C_AMD8111 is not set |
| 744 | # CONFIG_I2C_I801 is not set | 756 | # CONFIG_I2C_I801 is not set |
| 745 | # CONFIG_I2C_I810 is not set | 757 | # CONFIG_I2C_ISCH is not set |
| 746 | # CONFIG_I2C_PIIX4 is not set | 758 | # CONFIG_I2C_PIIX4 is not set |
| 747 | CONFIG_I2C_MPC=y | ||
| 748 | # CONFIG_I2C_NFORCE2 is not set | 759 | # CONFIG_I2C_NFORCE2 is not set |
| 749 | # CONFIG_I2C_OCORES is not set | ||
| 750 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 751 | # CONFIG_I2C_PROSAVAGE is not set | ||
| 752 | # CONFIG_I2C_SAVAGE4 is not set | ||
| 753 | # CONFIG_I2C_SIMTEC is not set | ||
| 754 | # CONFIG_I2C_SIS5595 is not set | 760 | # CONFIG_I2C_SIS5595 is not set |
| 755 | # CONFIG_I2C_SIS630 is not set | 761 | # CONFIG_I2C_SIS630 is not set |
| 756 | # CONFIG_I2C_SIS96X is not set | 762 | # CONFIG_I2C_SIS96X is not set |
| 757 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 758 | # CONFIG_I2C_VIA is not set | 763 | # CONFIG_I2C_VIA is not set |
| 759 | # CONFIG_I2C_VIAPRO is not set | 764 | # CONFIG_I2C_VIAPRO is not set |
| 765 | |||
| 766 | # | ||
| 767 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 768 | # | ||
| 769 | # CONFIG_I2C_CPM is not set | ||
| 770 | # CONFIG_I2C_GPIO is not set | ||
| 771 | CONFIG_I2C_MPC=y | ||
| 772 | # CONFIG_I2C_OCORES is not set | ||
| 773 | # CONFIG_I2C_SIMTEC is not set | ||
| 774 | |||
| 775 | # | ||
| 776 | # External I2C/SMBus adapter drivers | ||
| 777 | # | ||
| 778 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 779 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 780 | |||
| 781 | # | ||
| 782 | # Graphics adapter I2C/DDC channel drivers | ||
| 783 | # | ||
| 760 | # CONFIG_I2C_VOODOO3 is not set | 784 | # CONFIG_I2C_VOODOO3 is not set |
| 785 | |||
| 786 | # | ||
| 787 | # Other I2C/SMBus bus drivers | ||
| 788 | # | ||
| 761 | # CONFIG_I2C_PCA_PLATFORM is not set | 789 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 762 | 790 | ||
| 763 | # | 791 | # |
| 764 | # Miscellaneous I2C Chip support | 792 | # Miscellaneous I2C Chip support |
| 765 | # | 793 | # |
| 766 | # CONFIG_DS1682 is not set | 794 | # CONFIG_DS1682 is not set |
| 795 | # CONFIG_AT24 is not set | ||
| 767 | # CONFIG_SENSORS_EEPROM is not set | 796 | # CONFIG_SENSORS_EEPROM is not set |
| 768 | # CONFIG_SENSORS_PCF8574 is not set | 797 | # CONFIG_SENSORS_PCF8574 is not set |
| 769 | # CONFIG_PCF8575 is not set | 798 | # CONFIG_PCF8575 is not set |
| 799 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 770 | # CONFIG_SENSORS_PCF8591 is not set | 800 | # CONFIG_SENSORS_PCF8591 is not set |
| 801 | # CONFIG_TPS65010 is not set | ||
| 771 | # CONFIG_SENSORS_MAX6875 is not set | 802 | # CONFIG_SENSORS_MAX6875 is not set |
| 772 | # CONFIG_SENSORS_TSL2550 is not set | 803 | # CONFIG_SENSORS_TSL2550 is not set |
| 773 | # CONFIG_I2C_DEBUG_CORE is not set | 804 | # CONFIG_I2C_DEBUG_CORE is not set |
| @@ -775,10 +806,31 @@ CONFIG_I2C_MPC=y | |||
| 775 | # CONFIG_I2C_DEBUG_BUS is not set | 806 | # CONFIG_I2C_DEBUG_BUS is not set |
| 776 | # CONFIG_I2C_DEBUG_CHIP is not set | 807 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 777 | # CONFIG_SPI is not set | 808 | # CONFIG_SPI is not set |
| 809 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 810 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | ||
| 811 | CONFIG_GPIOLIB=y | ||
| 812 | # CONFIG_GPIO_SYSFS is not set | ||
| 813 | |||
| 814 | # | ||
| 815 | # I2C GPIO expanders: | ||
| 816 | # | ||
| 817 | # CONFIG_GPIO_MAX732X is not set | ||
| 818 | # CONFIG_GPIO_PCA953X is not set | ||
| 819 | # CONFIG_GPIO_PCF857X is not set | ||
| 820 | |||
| 821 | # | ||
| 822 | # PCI GPIO expanders: | ||
| 823 | # | ||
| 824 | # CONFIG_GPIO_BT8XX is not set | ||
| 825 | |||
| 826 | # | ||
| 827 | # SPI GPIO expanders: | ||
| 828 | # | ||
| 778 | # CONFIG_W1 is not set | 829 | # CONFIG_W1 is not set |
| 779 | # CONFIG_POWER_SUPPLY is not set | 830 | # CONFIG_POWER_SUPPLY is not set |
| 780 | CONFIG_HWMON=y | 831 | CONFIG_HWMON=y |
| 781 | # CONFIG_HWMON_VID is not set | 832 | # CONFIG_HWMON_VID is not set |
| 833 | # CONFIG_SENSORS_AD7414 is not set | ||
| 782 | # CONFIG_SENSORS_AD7418 is not set | 834 | # CONFIG_SENSORS_AD7418 is not set |
| 783 | # CONFIG_SENSORS_ADM1021 is not set | 835 | # CONFIG_SENSORS_ADM1021 is not set |
| 784 | # CONFIG_SENSORS_ADM1025 is not set | 836 | # CONFIG_SENSORS_ADM1025 is not set |
| @@ -832,6 +884,7 @@ CONFIG_SENSORS_LM75=y | |||
| 832 | # CONFIG_SENSORS_W83627EHF is not set | 884 | # CONFIG_SENSORS_W83627EHF is not set |
| 833 | CONFIG_HWMON_DEBUG_CHIP=y | 885 | CONFIG_HWMON_DEBUG_CHIP=y |
| 834 | # CONFIG_THERMAL is not set | 886 | # CONFIG_THERMAL is not set |
| 887 | # CONFIG_THERMAL_HWMON is not set | ||
| 835 | # CONFIG_WATCHDOG is not set | 888 | # CONFIG_WATCHDOG is not set |
| 836 | 889 | ||
| 837 | # | 890 | # |
| @@ -843,8 +896,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 843 | # | 896 | # |
| 844 | # Multifunction device drivers | 897 | # Multifunction device drivers |
| 845 | # | 898 | # |
| 899 | # CONFIG_MFD_CORE is not set | ||
| 846 | # CONFIG_MFD_SM501 is not set | 900 | # CONFIG_MFD_SM501 is not set |
| 847 | # CONFIG_HTC_PASIC3 is not set | 901 | # CONFIG_HTC_PASIC3 is not set |
| 902 | # CONFIG_MFD_TMIO is not set | ||
| 848 | 903 | ||
| 849 | # | 904 | # |
| 850 | # Multimedia devices | 905 | # Multimedia devices |
| @@ -876,10 +931,6 @@ CONFIG_DAB=y | |||
| 876 | # Display device support | 931 | # Display device support |
| 877 | # | 932 | # |
| 878 | # CONFIG_DISPLAY_SUPPORT is not set | 933 | # CONFIG_DISPLAY_SUPPORT is not set |
| 879 | |||
| 880 | # | ||
| 881 | # Sound | ||
| 882 | # | ||
| 883 | # CONFIG_SOUND is not set | 934 | # CONFIG_SOUND is not set |
| 884 | CONFIG_HID_SUPPORT=y | 935 | CONFIG_HID_SUPPORT=y |
| 885 | CONFIG_HID=y | 936 | CONFIG_HID=y |
| @@ -894,6 +945,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 894 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 945 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
| 895 | 946 | ||
| 896 | # | 947 | # |
| 948 | # Enable Host or Gadget support to see Inventra options | ||
| 949 | # | ||
| 950 | |||
| 951 | # | ||
| 897 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 952 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 898 | # | 953 | # |
| 899 | # CONFIG_USB_GADGET is not set | 954 | # CONFIG_USB_GADGET is not set |
| @@ -982,6 +1037,7 @@ CONFIG_JFFS2_RTIME=y | |||
| 982 | CONFIG_CRAMFS=y | 1037 | CONFIG_CRAMFS=y |
| 983 | # CONFIG_VXFS_FS is not set | 1038 | # CONFIG_VXFS_FS is not set |
| 984 | # CONFIG_MINIX_FS is not set | 1039 | # CONFIG_MINIX_FS is not set |
| 1040 | # CONFIG_OMFS_FS is not set | ||
| 985 | # CONFIG_HPFS_FS is not set | 1041 | # CONFIG_HPFS_FS is not set |
| 986 | # CONFIG_QNX4FS_FS is not set | 1042 | # CONFIG_QNX4FS_FS is not set |
| 987 | # CONFIG_ROMFS_FS is not set | 1043 | # CONFIG_ROMFS_FS is not set |
| @@ -991,12 +1047,11 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 991 | CONFIG_NFS_FS=y | 1047 | CONFIG_NFS_FS=y |
| 992 | # CONFIG_NFS_V3 is not set | 1048 | # CONFIG_NFS_V3 is not set |
| 993 | # CONFIG_NFS_V4 is not set | 1049 | # CONFIG_NFS_V4 is not set |
| 994 | # CONFIG_NFSD is not set | ||
| 995 | CONFIG_ROOT_NFS=y | 1050 | CONFIG_ROOT_NFS=y |
| 1051 | # CONFIG_NFSD is not set | ||
| 996 | CONFIG_LOCKD=y | 1052 | CONFIG_LOCKD=y |
| 997 | CONFIG_NFS_COMMON=y | 1053 | CONFIG_NFS_COMMON=y |
| 998 | CONFIG_SUNRPC=y | 1054 | CONFIG_SUNRPC=y |
| 999 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 1000 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1055 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 1001 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1056 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1002 | # CONFIG_SMB_FS is not set | 1057 | # CONFIG_SMB_FS is not set |
| @@ -1032,6 +1087,7 @@ CONFIG_BITREVERSE=y | |||
| 1032 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1087 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 1033 | # CONFIG_CRC_CCITT is not set | 1088 | # CONFIG_CRC_CCITT is not set |
| 1034 | # CONFIG_CRC16 is not set | 1089 | # CONFIG_CRC16 is not set |
| 1090 | # CONFIG_CRC_T10DIF is not set | ||
| 1035 | # CONFIG_CRC_ITU_T is not set | 1091 | # CONFIG_CRC_ITU_T is not set |
| 1036 | CONFIG_CRC32=y | 1092 | CONFIG_CRC32=y |
| 1037 | # CONFIG_CRC7 is not set | 1093 | # CONFIG_CRC7 is not set |
| @@ -1059,8 +1115,16 @@ CONFIG_FRAME_WARN=1024 | |||
| 1059 | # CONFIG_SLUB_DEBUG_ON is not set | 1115 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1060 | # CONFIG_SLUB_STATS is not set | 1116 | # CONFIG_SLUB_STATS is not set |
| 1061 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1117 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1118 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 1119 | # CONFIG_LATENCYTOP is not set | ||
| 1120 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1121 | CONFIG_HAVE_FTRACE=y | ||
| 1122 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1123 | # CONFIG_FTRACE is not set | ||
| 1124 | # CONFIG_SCHED_TRACER is not set | ||
| 1125 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1062 | # CONFIG_SAMPLES is not set | 1126 | # CONFIG_SAMPLES is not set |
| 1063 | # CONFIG_KGDB_CONSOLE is not set | 1127 | CONFIG_HAVE_ARCH_KGDB=y |
| 1064 | # CONFIG_IRQSTACKS is not set | 1128 | # CONFIG_IRQSTACKS is not set |
| 1065 | # CONFIG_PPC_EARLY_DEBUG is not set | 1129 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1066 | 1130 | ||
| @@ -1112,6 +1176,10 @@ CONFIG_CRYPTO=y | |||
| 1112 | # CONFIG_CRYPTO_MD4 is not set | 1176 | # CONFIG_CRYPTO_MD4 is not set |
| 1113 | # CONFIG_CRYPTO_MD5 is not set | 1177 | # CONFIG_CRYPTO_MD5 is not set |
| 1114 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1178 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 1179 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1180 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1181 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1182 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1115 | # CONFIG_CRYPTO_SHA1 is not set | 1183 | # CONFIG_CRYPTO_SHA1 is not set |
| 1116 | # CONFIG_CRYPTO_SHA256 is not set | 1184 | # CONFIG_CRYPTO_SHA256 is not set |
| 1117 | # CONFIG_CRYPTO_SHA512 is not set | 1185 | # CONFIG_CRYPTO_SHA512 is not set |
| @@ -1144,6 +1212,7 @@ CONFIG_CRYPTO=y | |||
| 1144 | # CONFIG_CRYPTO_LZO is not set | 1212 | # CONFIG_CRYPTO_LZO is not set |
| 1145 | CONFIG_CRYPTO_HW=y | 1213 | CONFIG_CRYPTO_HW=y |
| 1146 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1214 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1147 | # CONFIG_PPC_CLOCK is not set | 1215 | # CONFIG_CRYPTO_DEV_TALITOS is not set |
| 1216 | CONFIG_PPC_CLOCK=y | ||
| 1148 | CONFIG_PPC_LIB_RHEAP=y | 1217 | CONFIG_PPC_LIB_RHEAP=y |
| 1149 | # CONFIG_VIRTUALIZATION is not set | 1218 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/85xx/tqm8560_defconfig b/arch/powerpc/configs/85xx/tqm8560_defconfig index 3113257edf5a..8d676629cdb1 100644 --- a/arch/powerpc/configs/85xx/tqm8560_defconfig +++ b/arch/powerpc/configs/85xx/tqm8560_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.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Mon Jun 9 08:52:42 2008 | 4 | # Thu Aug 21 00:52:43 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -15,6 +15,7 @@ CONFIG_PPC_85xx=y | |||
| 15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
| 16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
| 17 | CONFIG_E500=y | 17 | CONFIG_E500=y |
| 18 | # CONFIG_PPC_E500MC is not set | ||
| 18 | CONFIG_BOOKE=y | 19 | CONFIG_BOOKE=y |
| 19 | CONFIG_FSL_BOOKE=y | 20 | CONFIG_FSL_BOOKE=y |
| 20 | CONFIG_FSL_EMB_PERFMON=y | 21 | CONFIG_FSL_EMB_PERFMON=y |
| @@ -33,12 +34,14 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 35 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | 36 | CONFIG_STACKTRACE_SUPPORT=y |
| 37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | 38 | CONFIG_LOCKDEP_SUPPORT=y |
| 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 38 | CONFIG_ARCH_HAS_ILOG2_U32=y | 40 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 39 | CONFIG_GENERIC_HWEIGHT=y | 41 | CONFIG_GENERIC_HWEIGHT=y |
| 40 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 42 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 41 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 43 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 44 | CONFIG_GENERIC_GPIO=y | ||
| 42 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 45 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
| 43 | CONFIG_PPC=y | 46 | CONFIG_PPC=y |
| 44 | CONFIG_EARLY_PRINTK=y | 47 | CONFIG_EARLY_PRINTK=y |
| @@ -89,7 +92,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 89 | CONFIG_SYSCTL=y | 92 | CONFIG_SYSCTL=y |
| 90 | CONFIG_EMBEDDED=y | 93 | CONFIG_EMBEDDED=y |
| 91 | CONFIG_SYSCTL_SYSCALL=y | 94 | CONFIG_SYSCTL_SYSCALL=y |
| 92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 93 | # CONFIG_KALLSYMS is not set | 95 | # CONFIG_KALLSYMS is not set |
| 94 | # CONFIG_HOTPLUG is not set | 96 | # CONFIG_HOTPLUG is not set |
| 95 | CONFIG_PRINTK=y | 97 | CONFIG_PRINTK=y |
| @@ -112,10 +114,16 @@ CONFIG_SLUB=y | |||
| 112 | # CONFIG_PROFILING is not set | 114 | # CONFIG_PROFILING is not set |
| 113 | # CONFIG_MARKERS is not set | 115 | # CONFIG_MARKERS is not set |
| 114 | CONFIG_HAVE_OPROFILE=y | 116 | CONFIG_HAVE_OPROFILE=y |
| 117 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 118 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 115 | CONFIG_HAVE_KPROBES=y | 119 | CONFIG_HAVE_KPROBES=y |
| 116 | CONFIG_HAVE_KRETPROBES=y | 120 | CONFIG_HAVE_KRETPROBES=y |
| 121 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 117 | # CONFIG_HAVE_DMA_ATTRS is not set | 122 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 123 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 124 | CONFIG_HAVE_CLK=y | ||
| 118 | CONFIG_PROC_PAGE_MONITOR=y | 125 | CONFIG_PROC_PAGE_MONITOR=y |
| 126 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 119 | CONFIG_SLABINFO=y | 127 | CONFIG_SLABINFO=y |
| 120 | CONFIG_RT_MUTEXES=y | 128 | CONFIG_RT_MUTEXES=y |
| 121 | # CONFIG_TINY_SHMEM is not set | 129 | # CONFIG_TINY_SHMEM is not set |
| @@ -126,6 +134,7 @@ CONFIG_BLOCK=y | |||
| 126 | # CONFIG_BLK_DEV_IO_TRACE is not set | 134 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 127 | # CONFIG_LSF is not set | 135 | # CONFIG_LSF is not set |
| 128 | # CONFIG_BLK_DEV_BSG is not set | 136 | # CONFIG_BLK_DEV_BSG is not set |
| 137 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 129 | 138 | ||
| 130 | # | 139 | # |
| 131 | # IO Schedulers | 140 | # IO Schedulers |
| @@ -144,8 +153,6 @@ CONFIG_CLASSIC_RCU=y | |||
| 144 | # | 153 | # |
| 145 | # Platform support | 154 | # Platform support |
| 146 | # | 155 | # |
| 147 | # CONFIG_PPC_MPC512x is not set | ||
| 148 | # CONFIG_PPC_MPC5121 is not set | ||
| 149 | # CONFIG_PPC_CELL is not set | 156 | # CONFIG_PPC_CELL is not set |
| 150 | # CONFIG_PPC_CELL_NATIVE is not set | 157 | # CONFIG_PPC_CELL_NATIVE is not set |
| 151 | # CONFIG_PQ2ADS is not set | 158 | # CONFIG_PQ2ADS is not set |
| @@ -154,11 +161,13 @@ CONFIG_MPC85xx=y | |||
| 154 | # CONFIG_MPC8560_ADS is not set | 161 | # CONFIG_MPC8560_ADS is not set |
| 155 | # CONFIG_MPC85xx_CDS is not set | 162 | # CONFIG_MPC85xx_CDS is not set |
| 156 | # CONFIG_MPC85xx_MDS is not set | 163 | # CONFIG_MPC85xx_MDS is not set |
| 164 | # CONFIG_MPC8536_DS is not set | ||
| 157 | # CONFIG_MPC85xx_DS is not set | 165 | # CONFIG_MPC85xx_DS is not set |
| 158 | # CONFIG_KSI8560 is not set | 166 | # CONFIG_KSI8560 is not set |
| 159 | # CONFIG_STX_GP3 is not set | 167 | # CONFIG_STX_GP3 is not set |
| 160 | # CONFIG_TQM8540 is not set | 168 | # CONFIG_TQM8540 is not set |
| 161 | # CONFIG_TQM8541 is not set | 169 | # CONFIG_TQM8541 is not set |
| 170 | # CONFIG_TQM8548 is not set | ||
| 162 | # CONFIG_TQM8555 is not set | 171 | # CONFIG_TQM8555 is not set |
| 163 | CONFIG_TQM8560=y | 172 | CONFIG_TQM8560=y |
| 164 | # CONFIG_SBC8548 is not set | 173 | # CONFIG_SBC8548 is not set |
| @@ -176,7 +185,6 @@ CONFIG_MPIC=y | |||
| 176 | # CONFIG_GENERIC_IOMAP is not set | 185 | # CONFIG_GENERIC_IOMAP is not set |
| 177 | # CONFIG_CPU_FREQ is not set | 186 | # CONFIG_CPU_FREQ is not set |
| 178 | CONFIG_CPM2=y | 187 | CONFIG_CPM2=y |
| 179 | CONFIG_PPC_CPM_NEW_BINDING=y | ||
| 180 | # CONFIG_FSL_ULI1575 is not set | 188 | # CONFIG_FSL_ULI1575 is not set |
| 181 | CONFIG_CPM=y | 189 | CONFIG_CPM=y |
| 182 | 190 | ||
| @@ -216,6 +224,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 216 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 224 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 217 | CONFIG_PAGEFLAGS_EXTENDED=y | 225 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 218 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 226 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 227 | CONFIG_MIGRATION=y | ||
| 219 | # CONFIG_RESOURCES_64BIT is not set | 228 | # CONFIG_RESOURCES_64BIT is not set |
| 220 | CONFIG_ZONE_DMA_FLAG=1 | 229 | CONFIG_ZONE_DMA_FLAG=1 |
| 221 | CONFIG_BOUNCE=y | 230 | CONFIG_BOUNCE=y |
| @@ -223,6 +232,7 @@ CONFIG_VIRT_TO_BUS=y | |||
| 223 | CONFIG_FORCE_MAX_ZONEORDER=11 | 232 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 224 | # CONFIG_PROC_DEVICETREE is not set | 233 | # CONFIG_PROC_DEVICETREE is not set |
| 225 | # CONFIG_CMDLINE_BOOL is not set | 234 | # CONFIG_CMDLINE_BOOL is not set |
| 235 | CONFIG_EXTRA_TARGETS="" | ||
| 226 | # CONFIG_PM is not set | 236 | # CONFIG_PM is not set |
| 227 | CONFIG_SECCOMP=y | 237 | CONFIG_SECCOMP=y |
| 228 | CONFIG_ISA_DMA_API=y | 238 | CONFIG_ISA_DMA_API=y |
| @@ -234,6 +244,7 @@ CONFIG_ZONE_DMA=y | |||
| 234 | CONFIG_PPC_INDIRECT_PCI=y | 244 | CONFIG_PPC_INDIRECT_PCI=y |
| 235 | CONFIG_FSL_SOC=y | 245 | CONFIG_FSL_SOC=y |
| 236 | CONFIG_FSL_PCI=y | 246 | CONFIG_FSL_PCI=y |
| 247 | CONFIG_PPC_PCI_CHOICE=y | ||
| 237 | CONFIG_PCI=y | 248 | CONFIG_PCI=y |
| 238 | CONFIG_PCI_DOMAINS=y | 249 | CONFIG_PCI_DOMAINS=y |
| 239 | CONFIG_PCI_SYSCALL=y | 250 | CONFIG_PCI_SYSCALL=y |
| @@ -257,10 +268,6 @@ CONFIG_KERNEL_START=0xc0000000 | |||
| 257 | CONFIG_PHYSICAL_START=0x00000000 | 268 | CONFIG_PHYSICAL_START=0x00000000 |
| 258 | CONFIG_PHYSICAL_ALIGN=0x10000000 | 269 | CONFIG_PHYSICAL_ALIGN=0x10000000 |
| 259 | CONFIG_TASK_SIZE=0xc0000000 | 270 | CONFIG_TASK_SIZE=0xc0000000 |
| 260 | |||
| 261 | # | ||
| 262 | # Networking | ||
| 263 | # | ||
| 264 | CONFIG_NET=y | 271 | CONFIG_NET=y |
| 265 | 272 | ||
| 266 | # | 273 | # |
| @@ -432,6 +439,7 @@ CONFIG_MTD_CFI_UTIL=y | |||
| 432 | # | 439 | # |
| 433 | # CONFIG_MTD_UBI is not set | 440 | # CONFIG_MTD_UBI is not set |
| 434 | CONFIG_OF_DEVICE=y | 441 | CONFIG_OF_DEVICE=y |
| 442 | CONFIG_OF_GPIO=y | ||
| 435 | CONFIG_OF_I2C=y | 443 | CONFIG_OF_I2C=y |
| 436 | # CONFIG_PARPORT is not set | 444 | # CONFIG_PARPORT is not set |
| 437 | CONFIG_BLK_DEV=y | 445 | CONFIG_BLK_DEV=y |
| @@ -451,20 +459,22 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
| 451 | # CONFIG_BLK_DEV_XIP is not set | 459 | # CONFIG_BLK_DEV_XIP is not set |
| 452 | # CONFIG_CDROM_PKTCDVD is not set | 460 | # CONFIG_CDROM_PKTCDVD is not set |
| 453 | # CONFIG_ATA_OVER_ETH is not set | 461 | # CONFIG_ATA_OVER_ETH is not set |
| 462 | # CONFIG_BLK_DEV_HD is not set | ||
| 454 | CONFIG_MISC_DEVICES=y | 463 | CONFIG_MISC_DEVICES=y |
| 455 | # CONFIG_PHANTOM is not set | 464 | # CONFIG_PHANTOM is not set |
| 456 | # CONFIG_EEPROM_93CX6 is not set | 465 | # CONFIG_EEPROM_93CX6 is not set |
| 457 | # CONFIG_SGI_IOC4 is not set | 466 | # CONFIG_SGI_IOC4 is not set |
| 458 | # CONFIG_TIFM_CORE is not set | 467 | # CONFIG_TIFM_CORE is not set |
| 459 | # CONFIG_ENCLOSURE_SERVICES is not set | 468 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 469 | # CONFIG_HP_ILO is not set | ||
| 460 | CONFIG_HAVE_IDE=y | 470 | CONFIG_HAVE_IDE=y |
| 461 | CONFIG_IDE=y | 471 | CONFIG_IDE=y |
| 462 | CONFIG_IDE_MAX_HWIFS=4 | ||
| 463 | CONFIG_BLK_DEV_IDE=y | 472 | CONFIG_BLK_DEV_IDE=y |
| 464 | 473 | ||
| 465 | # | 474 | # |
| 466 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | 475 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
| 467 | # | 476 | # |
| 477 | CONFIG_IDE_TIMINGS=y | ||
| 468 | # CONFIG_BLK_DEV_IDE_SATA is not set | 478 | # CONFIG_BLK_DEV_IDE_SATA is not set |
| 469 | CONFIG_BLK_DEV_IDEDISK=y | 479 | CONFIG_BLK_DEV_IDEDISK=y |
| 470 | # CONFIG_IDEDISK_MULTI_MODE is not set | 480 | # CONFIG_IDEDISK_MULTI_MODE is not set |
| @@ -477,7 +487,6 @@ CONFIG_IDE_PROC_FS=y | |||
| 477 | # | 487 | # |
| 478 | # IDE chipset support/bugfixes | 488 | # IDE chipset support/bugfixes |
| 479 | # | 489 | # |
| 480 | CONFIG_IDE_GENERIC=y | ||
| 481 | # CONFIG_BLK_DEV_PLATFORM is not set | 490 | # CONFIG_BLK_DEV_PLATFORM is not set |
| 482 | CONFIG_BLK_DEV_IDEDMA_SFF=y | 491 | CONFIG_BLK_DEV_IDEDMA_SFF=y |
| 483 | 492 | ||
| @@ -495,10 +504,8 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
| 495 | # CONFIG_BLK_DEV_AMD74XX is not set | 504 | # CONFIG_BLK_DEV_AMD74XX is not set |
| 496 | # CONFIG_BLK_DEV_CMD64X is not set | 505 | # CONFIG_BLK_DEV_CMD64X is not set |
| 497 | # CONFIG_BLK_DEV_TRIFLEX is not set | 506 | # CONFIG_BLK_DEV_TRIFLEX is not set |
| 498 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
| 499 | # CONFIG_BLK_DEV_CS5520 is not set | 507 | # CONFIG_BLK_DEV_CS5520 is not set |
| 500 | # CONFIG_BLK_DEV_CS5530 is not set | 508 | # CONFIG_BLK_DEV_CS5530 is not set |
| 501 | # CONFIG_BLK_DEV_HPT34X is not set | ||
| 502 | # CONFIG_BLK_DEV_HPT366 is not set | 509 | # CONFIG_BLK_DEV_HPT366 is not set |
| 503 | # CONFIG_BLK_DEV_JMICRON is not set | 510 | # CONFIG_BLK_DEV_JMICRON is not set |
| 504 | # CONFIG_BLK_DEV_SC1200 is not set | 511 | # CONFIG_BLK_DEV_SC1200 is not set |
| @@ -516,8 +523,6 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
| 516 | CONFIG_BLK_DEV_VIA82CXXX=y | 523 | CONFIG_BLK_DEV_VIA82CXXX=y |
| 517 | # CONFIG_BLK_DEV_TC86C001 is not set | 524 | # CONFIG_BLK_DEV_TC86C001 is not set |
| 518 | CONFIG_BLK_DEV_IDEDMA=y | 525 | CONFIG_BLK_DEV_IDEDMA=y |
| 519 | # CONFIG_BLK_DEV_HD_ONLY is not set | ||
| 520 | # CONFIG_BLK_DEV_HD is not set | ||
| 521 | 526 | ||
| 522 | # | 527 | # |
| 523 | # SCSI device support | 528 | # SCSI device support |
| @@ -533,12 +538,15 @@ CONFIG_BLK_DEV_IDEDMA=y | |||
| 533 | # | 538 | # |
| 534 | # IEEE 1394 (FireWire) support | 539 | # IEEE 1394 (FireWire) support |
| 535 | # | 540 | # |
| 541 | |||
| 542 | # | ||
| 543 | # Enable only one of the two stacks, unless you know what you are doing | ||
| 544 | # | ||
| 536 | # CONFIG_FIREWIRE is not set | 545 | # CONFIG_FIREWIRE is not set |
| 537 | # CONFIG_IEEE1394 is not set | 546 | # CONFIG_IEEE1394 is not set |
| 538 | # CONFIG_I2O is not set | 547 | # CONFIG_I2O is not set |
| 539 | # CONFIG_MACINTOSH_DRIVERS is not set | 548 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 540 | CONFIG_NETDEVICES=y | 549 | CONFIG_NETDEVICES=y |
| 541 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 542 | # CONFIG_DUMMY is not set | 550 | # CONFIG_DUMMY is not set |
| 543 | # CONFIG_BONDING is not set | 551 | # CONFIG_BONDING is not set |
| 544 | # CONFIG_MACVLAN is not set | 552 | # CONFIG_MACVLAN is not set |
| @@ -601,7 +609,6 @@ CONFIG_NETDEV_1000=y | |||
| 601 | # CONFIG_DL2K is not set | 609 | # CONFIG_DL2K is not set |
| 602 | # CONFIG_E1000 is not set | 610 | # CONFIG_E1000 is not set |
| 603 | # CONFIG_E1000E is not set | 611 | # CONFIG_E1000E is not set |
| 604 | # CONFIG_E1000E_ENABLED is not set | ||
| 605 | # CONFIG_IP1000 is not set | 612 | # CONFIG_IP1000 is not set |
| 606 | # CONFIG_IGB is not set | 613 | # CONFIG_IGB is not set |
| 607 | # CONFIG_NS83820 is not set | 614 | # CONFIG_NS83820 is not set |
| @@ -615,9 +622,9 @@ CONFIG_NETDEV_1000=y | |||
| 615 | # CONFIG_TIGON3 is not set | 622 | # CONFIG_TIGON3 is not set |
| 616 | # CONFIG_BNX2 is not set | 623 | # CONFIG_BNX2 is not set |
| 617 | CONFIG_GIANFAR=y | 624 | CONFIG_GIANFAR=y |
| 618 | CONFIG_GFAR_NAPI=y | ||
| 619 | # CONFIG_QLA3XXX is not set | 625 | # CONFIG_QLA3XXX is not set |
| 620 | # CONFIG_ATL1 is not set | 626 | # CONFIG_ATL1 is not set |
| 627 | # CONFIG_ATL1E is not set | ||
| 621 | CONFIG_NETDEV_10000=y | 628 | CONFIG_NETDEV_10000=y |
| 622 | # CONFIG_CHELSIO_T1 is not set | 629 | # CONFIG_CHELSIO_T1 is not set |
| 623 | # CONFIG_CHELSIO_T3 is not set | 630 | # CONFIG_CHELSIO_T3 is not set |
| @@ -732,42 +739,66 @@ CONFIG_DEVPORT=y | |||
| 732 | CONFIG_I2C=y | 739 | CONFIG_I2C=y |
| 733 | CONFIG_I2C_BOARDINFO=y | 740 | CONFIG_I2C_BOARDINFO=y |
| 734 | CONFIG_I2C_CHARDEV=y | 741 | CONFIG_I2C_CHARDEV=y |
| 742 | CONFIG_I2C_HELPER_AUTO=y | ||
| 735 | 743 | ||
| 736 | # | 744 | # |
| 737 | # I2C Hardware Bus support | 745 | # I2C Hardware Bus support |
| 738 | # | 746 | # |
| 747 | |||
| 748 | # | ||
| 749 | # PC SMBus host controller drivers | ||
| 750 | # | ||
| 739 | # CONFIG_I2C_ALI1535 is not set | 751 | # CONFIG_I2C_ALI1535 is not set |
| 740 | # CONFIG_I2C_ALI1563 is not set | 752 | # CONFIG_I2C_ALI1563 is not set |
| 741 | # CONFIG_I2C_ALI15X3 is not set | 753 | # CONFIG_I2C_ALI15X3 is not set |
| 742 | # CONFIG_I2C_AMD756 is not set | 754 | # CONFIG_I2C_AMD756 is not set |
| 743 | # CONFIG_I2C_AMD8111 is not set | 755 | # CONFIG_I2C_AMD8111 is not set |
| 744 | # CONFIG_I2C_I801 is not set | 756 | # CONFIG_I2C_I801 is not set |
| 745 | # CONFIG_I2C_I810 is not set | 757 | # CONFIG_I2C_ISCH is not set |
| 746 | # CONFIG_I2C_PIIX4 is not set | 758 | # CONFIG_I2C_PIIX4 is not set |
| 747 | CONFIG_I2C_MPC=y | ||
| 748 | # CONFIG_I2C_NFORCE2 is not set | 759 | # CONFIG_I2C_NFORCE2 is not set |
| 749 | # CONFIG_I2C_OCORES is not set | ||
| 750 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 751 | # CONFIG_I2C_PROSAVAGE is not set | ||
| 752 | # CONFIG_I2C_SAVAGE4 is not set | ||
| 753 | # CONFIG_I2C_SIMTEC is not set | ||
| 754 | # CONFIG_I2C_SIS5595 is not set | 760 | # CONFIG_I2C_SIS5595 is not set |
| 755 | # CONFIG_I2C_SIS630 is not set | 761 | # CONFIG_I2C_SIS630 is not set |
| 756 | # CONFIG_I2C_SIS96X is not set | 762 | # CONFIG_I2C_SIS96X is not set |
| 757 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 758 | # CONFIG_I2C_VIA is not set | 763 | # CONFIG_I2C_VIA is not set |
| 759 | # CONFIG_I2C_VIAPRO is not set | 764 | # CONFIG_I2C_VIAPRO is not set |
| 765 | |||
| 766 | # | ||
| 767 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 768 | # | ||
| 769 | # CONFIG_I2C_CPM is not set | ||
| 770 | # CONFIG_I2C_GPIO is not set | ||
| 771 | CONFIG_I2C_MPC=y | ||
| 772 | # CONFIG_I2C_OCORES is not set | ||
| 773 | # CONFIG_I2C_SIMTEC is not set | ||
| 774 | |||
| 775 | # | ||
| 776 | # External I2C/SMBus adapter drivers | ||
| 777 | # | ||
| 778 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 779 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 780 | |||
| 781 | # | ||
| 782 | # Graphics adapter I2C/DDC channel drivers | ||
| 783 | # | ||
| 760 | # CONFIG_I2C_VOODOO3 is not set | 784 | # CONFIG_I2C_VOODOO3 is not set |
| 785 | |||
| 786 | # | ||
| 787 | # Other I2C/SMBus bus drivers | ||
| 788 | # | ||
| 761 | # CONFIG_I2C_PCA_PLATFORM is not set | 789 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 762 | 790 | ||
| 763 | # | 791 | # |
| 764 | # Miscellaneous I2C Chip support | 792 | # Miscellaneous I2C Chip support |
| 765 | # | 793 | # |
| 766 | # CONFIG_DS1682 is not set | 794 | # CONFIG_DS1682 is not set |
| 795 | # CONFIG_AT24 is not set | ||
| 767 | # CONFIG_SENSORS_EEPROM is not set | 796 | # CONFIG_SENSORS_EEPROM is not set |
| 768 | # CONFIG_SENSORS_PCF8574 is not set | 797 | # CONFIG_SENSORS_PCF8574 is not set |
| 769 | # CONFIG_PCF8575 is not set | 798 | # CONFIG_PCF8575 is not set |
| 799 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 770 | # CONFIG_SENSORS_PCF8591 is not set | 800 | # CONFIG_SENSORS_PCF8591 is not set |
| 801 | # CONFIG_TPS65010 is not set | ||
| 771 | # CONFIG_SENSORS_MAX6875 is not set | 802 | # CONFIG_SENSORS_MAX6875 is not set |
| 772 | # CONFIG_SENSORS_TSL2550 is not set | 803 | # CONFIG_SENSORS_TSL2550 is not set |
| 773 | # CONFIG_I2C_DEBUG_CORE is not set | 804 | # CONFIG_I2C_DEBUG_CORE is not set |
| @@ -775,10 +806,31 @@ CONFIG_I2C_MPC=y | |||
| 775 | # CONFIG_I2C_DEBUG_BUS is not set | 806 | # CONFIG_I2C_DEBUG_BUS is not set |
| 776 | # CONFIG_I2C_DEBUG_CHIP is not set | 807 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 777 | # CONFIG_SPI is not set | 808 | # CONFIG_SPI is not set |
| 809 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 810 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | ||
| 811 | CONFIG_GPIOLIB=y | ||
| 812 | # CONFIG_GPIO_SYSFS is not set | ||
| 813 | |||
| 814 | # | ||
| 815 | # I2C GPIO expanders: | ||
| 816 | # | ||
| 817 | # CONFIG_GPIO_MAX732X is not set | ||
| 818 | # CONFIG_GPIO_PCA953X is not set | ||
| 819 | # CONFIG_GPIO_PCF857X is not set | ||
| 820 | |||
| 821 | # | ||
| 822 | # PCI GPIO expanders: | ||
| 823 | # | ||
| 824 | # CONFIG_GPIO_BT8XX is not set | ||
| 825 | |||
| 826 | # | ||
| 827 | # SPI GPIO expanders: | ||
| 828 | # | ||
| 778 | # CONFIG_W1 is not set | 829 | # CONFIG_W1 is not set |
| 779 | # CONFIG_POWER_SUPPLY is not set | 830 | # CONFIG_POWER_SUPPLY is not set |
| 780 | CONFIG_HWMON=y | 831 | CONFIG_HWMON=y |
| 781 | # CONFIG_HWMON_VID is not set | 832 | # CONFIG_HWMON_VID is not set |
| 833 | # CONFIG_SENSORS_AD7414 is not set | ||
| 782 | # CONFIG_SENSORS_AD7418 is not set | 834 | # CONFIG_SENSORS_AD7418 is not set |
| 783 | # CONFIG_SENSORS_ADM1021 is not set | 835 | # CONFIG_SENSORS_ADM1021 is not set |
| 784 | # CONFIG_SENSORS_ADM1025 is not set | 836 | # CONFIG_SENSORS_ADM1025 is not set |
| @@ -832,6 +884,7 @@ CONFIG_SENSORS_LM75=y | |||
| 832 | # CONFIG_SENSORS_W83627EHF is not set | 884 | # CONFIG_SENSORS_W83627EHF is not set |
| 833 | CONFIG_HWMON_DEBUG_CHIP=y | 885 | CONFIG_HWMON_DEBUG_CHIP=y |
| 834 | # CONFIG_THERMAL is not set | 886 | # CONFIG_THERMAL is not set |
| 887 | # CONFIG_THERMAL_HWMON is not set | ||
| 835 | # CONFIG_WATCHDOG is not set | 888 | # CONFIG_WATCHDOG is not set |
| 836 | 889 | ||
| 837 | # | 890 | # |
| @@ -843,8 +896,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 843 | # | 896 | # |
| 844 | # Multifunction device drivers | 897 | # Multifunction device drivers |
| 845 | # | 898 | # |
| 899 | # CONFIG_MFD_CORE is not set | ||
| 846 | # CONFIG_MFD_SM501 is not set | 900 | # CONFIG_MFD_SM501 is not set |
| 847 | # CONFIG_HTC_PASIC3 is not set | 901 | # CONFIG_HTC_PASIC3 is not set |
| 902 | # CONFIG_MFD_TMIO is not set | ||
| 848 | 903 | ||
| 849 | # | 904 | # |
| 850 | # Multimedia devices | 905 | # Multimedia devices |
| @@ -876,10 +931,6 @@ CONFIG_DAB=y | |||
| 876 | # Display device support | 931 | # Display device support |
| 877 | # | 932 | # |
| 878 | # CONFIG_DISPLAY_SUPPORT is not set | 933 | # CONFIG_DISPLAY_SUPPORT is not set |
| 879 | |||
| 880 | # | ||
| 881 | # Sound | ||
| 882 | # | ||
| 883 | # CONFIG_SOUND is not set | 934 | # CONFIG_SOUND is not set |
| 884 | CONFIG_HID_SUPPORT=y | 935 | CONFIG_HID_SUPPORT=y |
| 885 | CONFIG_HID=y | 936 | CONFIG_HID=y |
| @@ -894,6 +945,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 894 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 945 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
| 895 | 946 | ||
| 896 | # | 947 | # |
| 948 | # Enable Host or Gadget support to see Inventra options | ||
| 949 | # | ||
| 950 | |||
| 951 | # | ||
| 897 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 952 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 898 | # | 953 | # |
| 899 | # CONFIG_USB_GADGET is not set | 954 | # CONFIG_USB_GADGET is not set |
| @@ -982,6 +1037,7 @@ CONFIG_JFFS2_RTIME=y | |||
| 982 | CONFIG_CRAMFS=y | 1037 | CONFIG_CRAMFS=y |
| 983 | # CONFIG_VXFS_FS is not set | 1038 | # CONFIG_VXFS_FS is not set |
| 984 | # CONFIG_MINIX_FS is not set | 1039 | # CONFIG_MINIX_FS is not set |
| 1040 | # CONFIG_OMFS_FS is not set | ||
| 985 | # CONFIG_HPFS_FS is not set | 1041 | # CONFIG_HPFS_FS is not set |
| 986 | # CONFIG_QNX4FS_FS is not set | 1042 | # CONFIG_QNX4FS_FS is not set |
| 987 | # CONFIG_ROMFS_FS is not set | 1043 | # CONFIG_ROMFS_FS is not set |
| @@ -991,12 +1047,11 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 991 | CONFIG_NFS_FS=y | 1047 | CONFIG_NFS_FS=y |
| 992 | # CONFIG_NFS_V3 is not set | 1048 | # CONFIG_NFS_V3 is not set |
| 993 | # CONFIG_NFS_V4 is not set | 1049 | # CONFIG_NFS_V4 is not set |
| 994 | # CONFIG_NFSD is not set | ||
| 995 | CONFIG_ROOT_NFS=y | 1050 | CONFIG_ROOT_NFS=y |
| 1051 | # CONFIG_NFSD is not set | ||
| 996 | CONFIG_LOCKD=y | 1052 | CONFIG_LOCKD=y |
| 997 | CONFIG_NFS_COMMON=y | 1053 | CONFIG_NFS_COMMON=y |
| 998 | CONFIG_SUNRPC=y | 1054 | CONFIG_SUNRPC=y |
| 999 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 1000 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1055 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 1001 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1056 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1002 | # CONFIG_SMB_FS is not set | 1057 | # CONFIG_SMB_FS is not set |
| @@ -1032,6 +1087,7 @@ CONFIG_BITREVERSE=y | |||
| 1032 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1087 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 1033 | # CONFIG_CRC_CCITT is not set | 1088 | # CONFIG_CRC_CCITT is not set |
| 1034 | # CONFIG_CRC16 is not set | 1089 | # CONFIG_CRC16 is not set |
| 1090 | # CONFIG_CRC_T10DIF is not set | ||
| 1035 | # CONFIG_CRC_ITU_T is not set | 1091 | # CONFIG_CRC_ITU_T is not set |
| 1036 | CONFIG_CRC32=y | 1092 | CONFIG_CRC32=y |
| 1037 | # CONFIG_CRC7 is not set | 1093 | # CONFIG_CRC7 is not set |
| @@ -1059,8 +1115,16 @@ CONFIG_FRAME_WARN=1024 | |||
| 1059 | # CONFIG_SLUB_DEBUG_ON is not set | 1115 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1060 | # CONFIG_SLUB_STATS is not set | 1116 | # CONFIG_SLUB_STATS is not set |
| 1061 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1117 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1118 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 1119 | # CONFIG_LATENCYTOP is not set | ||
| 1120 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1121 | CONFIG_HAVE_FTRACE=y | ||
| 1122 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1123 | # CONFIG_FTRACE is not set | ||
| 1124 | # CONFIG_SCHED_TRACER is not set | ||
| 1125 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1062 | # CONFIG_SAMPLES is not set | 1126 | # CONFIG_SAMPLES is not set |
| 1063 | # CONFIG_KGDB_CONSOLE is not set | 1127 | CONFIG_HAVE_ARCH_KGDB=y |
| 1064 | # CONFIG_IRQSTACKS is not set | 1128 | # CONFIG_IRQSTACKS is not set |
| 1065 | # CONFIG_PPC_EARLY_DEBUG is not set | 1129 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1066 | 1130 | ||
| @@ -1112,6 +1176,10 @@ CONFIG_CRYPTO=y | |||
| 1112 | # CONFIG_CRYPTO_MD4 is not set | 1176 | # CONFIG_CRYPTO_MD4 is not set |
| 1113 | # CONFIG_CRYPTO_MD5 is not set | 1177 | # CONFIG_CRYPTO_MD5 is not set |
| 1114 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1178 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 1179 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1180 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1181 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1182 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1115 | # CONFIG_CRYPTO_SHA1 is not set | 1183 | # CONFIG_CRYPTO_SHA1 is not set |
| 1116 | # CONFIG_CRYPTO_SHA256 is not set | 1184 | # CONFIG_CRYPTO_SHA256 is not set |
| 1117 | # CONFIG_CRYPTO_SHA512 is not set | 1185 | # CONFIG_CRYPTO_SHA512 is not set |
| @@ -1144,6 +1212,7 @@ CONFIG_CRYPTO=y | |||
| 1144 | # CONFIG_CRYPTO_LZO is not set | 1212 | # CONFIG_CRYPTO_LZO is not set |
| 1145 | CONFIG_CRYPTO_HW=y | 1213 | CONFIG_CRYPTO_HW=y |
| 1146 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1214 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1147 | # CONFIG_PPC_CLOCK is not set | 1215 | # CONFIG_CRYPTO_DEV_TALITOS is not set |
| 1216 | CONFIG_PPC_CLOCK=y | ||
| 1148 | CONFIG_PPC_LIB_RHEAP=y | 1217 | CONFIG_PPC_LIB_RHEAP=y |
| 1149 | # CONFIG_VIRTUALIZATION is not set | 1218 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/adder875_defconfig b/arch/powerpc/configs/adder875_defconfig index 6740f2a3aa3d..63cd51fbb4b9 100644 --- a/arch/powerpc/configs/adder875_defconfig +++ b/arch/powerpc/configs/adder875_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.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Mon Jun 9 08:52:08 2008 | 4 | # Thu Aug 21 00:52:00 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -29,6 +29,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 29 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 29 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 30 | CONFIG_IRQ_PER_CPU=y | 30 | CONFIG_IRQ_PER_CPU=y |
| 31 | CONFIG_STACKTRACE_SUPPORT=y | 31 | CONFIG_STACKTRACE_SUPPORT=y |
| 32 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 32 | CONFIG_LOCKDEP_SUPPORT=y | 33 | CONFIG_LOCKDEP_SUPPORT=y |
| 33 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 34 | CONFIG_ARCH_HAS_ILOG2_U32=y | 35 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| @@ -109,10 +110,16 @@ CONFIG_SLUB=y | |||
| 109 | # CONFIG_PROFILING is not set | 110 | # CONFIG_PROFILING is not set |
| 110 | # CONFIG_MARKERS is not set | 111 | # CONFIG_MARKERS is not set |
| 111 | CONFIG_HAVE_OPROFILE=y | 112 | CONFIG_HAVE_OPROFILE=y |
| 113 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 114 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 112 | CONFIG_HAVE_KPROBES=y | 115 | CONFIG_HAVE_KPROBES=y |
| 113 | CONFIG_HAVE_KRETPROBES=y | 116 | CONFIG_HAVE_KRETPROBES=y |
| 117 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 114 | # CONFIG_HAVE_DMA_ATTRS is not set | 118 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 119 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 120 | CONFIG_HAVE_CLK=y | ||
| 115 | CONFIG_PROC_PAGE_MONITOR=y | 121 | CONFIG_PROC_PAGE_MONITOR=y |
| 122 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 116 | CONFIG_SLABINFO=y | 123 | CONFIG_SLABINFO=y |
| 117 | # CONFIG_TINY_SHMEM is not set | 124 | # CONFIG_TINY_SHMEM is not set |
| 118 | CONFIG_BASE_SMALL=1 | 125 | CONFIG_BASE_SMALL=1 |
| @@ -122,6 +129,7 @@ CONFIG_BLOCK=y | |||
| 122 | # CONFIG_BLK_DEV_IO_TRACE is not set | 129 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 123 | # CONFIG_LSF is not set | 130 | # CONFIG_LSF is not set |
| 124 | # CONFIG_BLK_DEV_BSG is not set | 131 | # CONFIG_BLK_DEV_BSG is not set |
| 132 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 125 | 133 | ||
| 126 | # | 134 | # |
| 127 | # IO Schedulers | 135 | # IO Schedulers |
| @@ -140,8 +148,6 @@ CONFIG_CLASSIC_RCU=y | |||
| 140 | # | 148 | # |
| 141 | # Platform support | 149 | # Platform support |
| 142 | # | 150 | # |
| 143 | # CONFIG_PPC_MPC512x is not set | ||
| 144 | # CONFIG_PPC_MPC5121 is not set | ||
| 145 | # CONFIG_PPC_CELL is not set | 151 | # CONFIG_PPC_CELL is not set |
| 146 | # CONFIG_PPC_CELL_NATIVE is not set | 152 | # CONFIG_PPC_CELL_NATIVE is not set |
| 147 | CONFIG_CPM1=y | 153 | CONFIG_CPM1=y |
| @@ -159,6 +165,7 @@ CONFIG_PPC_ADDER875=y | |||
| 159 | # Generic MPC8xx Options | 165 | # Generic MPC8xx Options |
| 160 | # | 166 | # |
| 161 | CONFIG_8xx_COPYBACK=y | 167 | CONFIG_8xx_COPYBACK=y |
| 168 | # CONFIG_8xx_GPIO is not set | ||
| 162 | # CONFIG_8xx_CPU6 is not set | 169 | # CONFIG_8xx_CPU6 is not set |
| 163 | CONFIG_8xx_CPU15=y | 170 | CONFIG_8xx_CPU15=y |
| 164 | CONFIG_NO_UCODE_PATCH=y | 171 | CONFIG_NO_UCODE_PATCH=y |
| @@ -177,7 +184,6 @@ CONFIG_NO_UCODE_PATCH=y | |||
| 177 | # CONFIG_PPC_INDIRECT_IO is not set | 184 | # CONFIG_PPC_INDIRECT_IO is not set |
| 178 | # CONFIG_GENERIC_IOMAP is not set | 185 | # CONFIG_GENERIC_IOMAP is not set |
| 179 | # CONFIG_CPU_FREQ is not set | 186 | # CONFIG_CPU_FREQ is not set |
| 180 | CONFIG_PPC_CPM_NEW_BINDING=y | ||
| 181 | # CONFIG_FSL_ULI1575 is not set | 187 | # CONFIG_FSL_ULI1575 is not set |
| 182 | CONFIG_CPM=y | 188 | CONFIG_CPM=y |
| 183 | 189 | ||
| @@ -218,6 +224,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 218 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 224 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 219 | CONFIG_PAGEFLAGS_EXTENDED=y | 225 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 220 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 226 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 227 | CONFIG_MIGRATION=y | ||
| 221 | # CONFIG_RESOURCES_64BIT is not set | 228 | # CONFIG_RESOURCES_64BIT is not set |
| 222 | CONFIG_ZONE_DMA_FLAG=1 | 229 | CONFIG_ZONE_DMA_FLAG=1 |
| 223 | CONFIG_BOUNCE=y | 230 | CONFIG_BOUNCE=y |
| @@ -225,6 +232,7 @@ CONFIG_VIRT_TO_BUS=y | |||
| 225 | CONFIG_FORCE_MAX_ZONEORDER=11 | 232 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 226 | # CONFIG_PROC_DEVICETREE is not set | 233 | # CONFIG_PROC_DEVICETREE is not set |
| 227 | # CONFIG_CMDLINE_BOOL is not set | 234 | # CONFIG_CMDLINE_BOOL is not set |
| 235 | CONFIG_EXTRA_TARGETS="" | ||
| 228 | # CONFIG_PM is not set | 236 | # CONFIG_PM is not set |
| 229 | # CONFIG_SECCOMP is not set | 237 | # CONFIG_SECCOMP is not set |
| 230 | CONFIG_ISA_DMA_API=y | 238 | CONFIG_ISA_DMA_API=y |
| @@ -257,10 +265,6 @@ CONFIG_PHYSICAL_START=0x00000000 | |||
| 257 | CONFIG_TASK_SIZE=0x80000000 | 265 | CONFIG_TASK_SIZE=0x80000000 |
| 258 | CONFIG_CONSISTENT_START=0xfd000000 | 266 | CONFIG_CONSISTENT_START=0xfd000000 |
| 259 | CONFIG_CONSISTENT_SIZE=0x00200000 | 267 | CONFIG_CONSISTENT_SIZE=0x00200000 |
| 260 | |||
| 261 | # | ||
| 262 | # Networking | ||
| 263 | # | ||
| 264 | CONFIG_NET=y | 268 | CONFIG_NET=y |
| 265 | 269 | ||
| 266 | # | 270 | # |
| @@ -443,7 +447,6 @@ CONFIG_HAVE_IDE=y | |||
| 443 | # CONFIG_MD is not set | 447 | # CONFIG_MD is not set |
| 444 | # CONFIG_MACINTOSH_DRIVERS is not set | 448 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 445 | CONFIG_NETDEVICES=y | 449 | CONFIG_NETDEVICES=y |
| 446 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 447 | # CONFIG_DUMMY is not set | 450 | # CONFIG_DUMMY is not set |
| 448 | # CONFIG_BONDING is not set | 451 | # CONFIG_BONDING is not set |
| 449 | # CONFIG_MACVLAN is not set | 452 | # CONFIG_MACVLAN is not set |
| @@ -547,6 +550,7 @@ CONFIG_SERIO_I8042=y | |||
| 547 | CONFIG_SERIO_SERPORT=y | 550 | CONFIG_SERIO_SERPORT=y |
| 548 | CONFIG_SERIO_LIBPS2=y | 551 | CONFIG_SERIO_LIBPS2=y |
| 549 | # CONFIG_SERIO_RAW is not set | 552 | # CONFIG_SERIO_RAW is not set |
| 553 | # CONFIG_SERIO_XILINX_XPS_PS2 is not set | ||
| 550 | # CONFIG_GAMEPORT is not set | 554 | # CONFIG_GAMEPORT is not set |
| 551 | 555 | ||
| 552 | # | 556 | # |
| @@ -587,6 +591,8 @@ CONFIG_GEN_RTC=y | |||
| 587 | # CONFIG_TCG_TPM is not set | 591 | # CONFIG_TCG_TPM is not set |
| 588 | # CONFIG_I2C is not set | 592 | # CONFIG_I2C is not set |
| 589 | # CONFIG_SPI is not set | 593 | # CONFIG_SPI is not set |
| 594 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 595 | # CONFIG_GPIOLIB is not set | ||
| 590 | # CONFIG_W1 is not set | 596 | # CONFIG_W1 is not set |
| 591 | # CONFIG_POWER_SUPPLY is not set | 597 | # CONFIG_POWER_SUPPLY is not set |
| 592 | # CONFIG_HWMON is not set | 598 | # CONFIG_HWMON is not set |
| @@ -602,8 +608,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 602 | # | 608 | # |
| 603 | # Multifunction device drivers | 609 | # Multifunction device drivers |
| 604 | # | 610 | # |
| 611 | # CONFIG_MFD_CORE is not set | ||
| 605 | # CONFIG_MFD_SM501 is not set | 612 | # CONFIG_MFD_SM501 is not set |
| 606 | # CONFIG_HTC_PASIC3 is not set | 613 | # CONFIG_HTC_PASIC3 is not set |
| 614 | # CONFIG_MFD_TMIO is not set | ||
| 607 | 615 | ||
| 608 | # | 616 | # |
| 609 | # Multimedia devices | 617 | # Multimedia devices |
| @@ -633,10 +641,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
| 633 | # Display device support | 641 | # Display device support |
| 634 | # | 642 | # |
| 635 | # CONFIG_DISPLAY_SUPPORT is not set | 643 | # CONFIG_DISPLAY_SUPPORT is not set |
| 636 | |||
| 637 | # | ||
| 638 | # Sound | ||
| 639 | # | ||
| 640 | # CONFIG_SOUND is not set | 644 | # CONFIG_SOUND is not set |
| 641 | # CONFIG_HID_SUPPORT is not set | 645 | # CONFIG_HID_SUPPORT is not set |
| 642 | # CONFIG_USB_SUPPORT is not set | 646 | # CONFIG_USB_SUPPORT is not set |
| @@ -706,6 +710,7 @@ CONFIG_TMPFS=y | |||
| 706 | CONFIG_CRAMFS=y | 710 | CONFIG_CRAMFS=y |
| 707 | # CONFIG_VXFS_FS is not set | 711 | # CONFIG_VXFS_FS is not set |
| 708 | # CONFIG_MINIX_FS is not set | 712 | # CONFIG_MINIX_FS is not set |
| 713 | # CONFIG_OMFS_FS is not set | ||
| 709 | # CONFIG_HPFS_FS is not set | 714 | # CONFIG_HPFS_FS is not set |
| 710 | # CONFIG_QNX4FS_FS is not set | 715 | # CONFIG_QNX4FS_FS is not set |
| 711 | # CONFIG_ROMFS_FS is not set | 716 | # CONFIG_ROMFS_FS is not set |
| @@ -716,13 +721,12 @@ CONFIG_NFS_FS=y | |||
| 716 | CONFIG_NFS_V3=y | 721 | CONFIG_NFS_V3=y |
| 717 | # CONFIG_NFS_V3_ACL is not set | 722 | # CONFIG_NFS_V3_ACL is not set |
| 718 | # CONFIG_NFS_V4 is not set | 723 | # CONFIG_NFS_V4 is not set |
| 719 | # CONFIG_NFSD is not set | ||
| 720 | CONFIG_ROOT_NFS=y | 724 | CONFIG_ROOT_NFS=y |
| 725 | # CONFIG_NFSD is not set | ||
| 721 | CONFIG_LOCKD=y | 726 | CONFIG_LOCKD=y |
| 722 | CONFIG_LOCKD_V4=y | 727 | CONFIG_LOCKD_V4=y |
| 723 | CONFIG_NFS_COMMON=y | 728 | CONFIG_NFS_COMMON=y |
| 724 | CONFIG_SUNRPC=y | 729 | CONFIG_SUNRPC=y |
| 725 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 726 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 730 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 727 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 731 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 728 | # CONFIG_SMB_FS is not set | 732 | # CONFIG_SMB_FS is not set |
| @@ -761,6 +765,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 761 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 765 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 762 | # CONFIG_CRC_CCITT is not set | 766 | # CONFIG_CRC_CCITT is not set |
| 763 | # CONFIG_CRC16 is not set | 767 | # CONFIG_CRC16 is not set |
| 768 | # CONFIG_CRC_T10DIF is not set | ||
| 764 | # CONFIG_CRC_ITU_T is not set | 769 | # CONFIG_CRC_ITU_T is not set |
| 765 | # CONFIG_CRC32 is not set | 770 | # CONFIG_CRC32 is not set |
| 766 | # CONFIG_CRC7 is not set | 771 | # CONFIG_CRC7 is not set |
| @@ -785,6 +790,8 @@ CONFIG_DEBUG_FS=y | |||
| 785 | CONFIG_DEBUG_KERNEL=y | 790 | CONFIG_DEBUG_KERNEL=y |
| 786 | # CONFIG_DEBUG_SHIRQ is not set | 791 | # CONFIG_DEBUG_SHIRQ is not set |
| 787 | CONFIG_DETECT_SOFTLOCKUP=y | 792 | CONFIG_DETECT_SOFTLOCKUP=y |
| 793 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 794 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 788 | CONFIG_SCHED_DEBUG=y | 795 | CONFIG_SCHED_DEBUG=y |
| 789 | # CONFIG_SCHEDSTATS is not set | 796 | # CONFIG_SCHEDSTATS is not set |
| 790 | # CONFIG_TIMER_STATS is not set | 797 | # CONFIG_TIMER_STATS is not set |
| @@ -800,16 +807,28 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
| 800 | CONFIG_DEBUG_INFO=y | 807 | CONFIG_DEBUG_INFO=y |
| 801 | # CONFIG_DEBUG_VM is not set | 808 | # CONFIG_DEBUG_VM is not set |
| 802 | # CONFIG_DEBUG_WRITECOUNT is not set | 809 | # CONFIG_DEBUG_WRITECOUNT is not set |
| 810 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 803 | # CONFIG_DEBUG_LIST is not set | 811 | # CONFIG_DEBUG_LIST is not set |
| 804 | # CONFIG_DEBUG_SG is not set | 812 | # CONFIG_DEBUG_SG is not set |
| 805 | # CONFIG_BOOT_PRINTK_DELAY is not set | 813 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 814 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 806 | # CONFIG_BACKTRACE_SELF_TEST is not set | 815 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 807 | # CONFIG_FAULT_INJECTION is not set | 816 | # CONFIG_FAULT_INJECTION is not set |
| 817 | # CONFIG_LATENCYTOP is not set | ||
| 818 | CONFIG_HAVE_FTRACE=y | ||
| 819 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 820 | # CONFIG_FTRACE is not set | ||
| 821 | # CONFIG_SCHED_TRACER is not set | ||
| 822 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 808 | # CONFIG_SAMPLES is not set | 823 | # CONFIG_SAMPLES is not set |
| 824 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 825 | # CONFIG_KGDB is not set | ||
| 809 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 826 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
| 810 | # CONFIG_DEBUG_STACK_USAGE is not set | 827 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 811 | # CONFIG_DEBUG_PAGEALLOC is not set | 828 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 812 | # CONFIG_DEBUGGER is not set | 829 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
| 830 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
| 831 | # CONFIG_XMON is not set | ||
| 813 | # CONFIG_IRQSTACKS is not set | 832 | # CONFIG_IRQSTACKS is not set |
| 814 | # CONFIG_VIRQ_DEBUG is not set | 833 | # CONFIG_VIRQ_DEBUG is not set |
| 815 | # CONFIG_BDI_SWITCH is not set | 834 | # CONFIG_BDI_SWITCH is not set |
| @@ -822,6 +841,6 @@ CONFIG_DEBUG_INFO=y | |||
| 822 | # CONFIG_SECURITY is not set | 841 | # CONFIG_SECURITY is not set |
| 823 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 842 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 824 | # CONFIG_CRYPTO is not set | 843 | # CONFIG_CRYPTO is not set |
| 825 | # CONFIG_PPC_CLOCK is not set | 844 | CONFIG_PPC_CLOCK=y |
| 826 | CONFIG_PPC_LIB_RHEAP=y | 845 | CONFIG_PPC_LIB_RHEAP=y |
| 827 | # CONFIG_VIRTUALIZATION is not set | 846 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/c2k_defconfig b/arch/powerpc/configs/c2k_defconfig index dc599c7e97d5..c16521ffb477 100644 --- a/arch/powerpc/configs/c2k_defconfig +++ b/arch/powerpc/configs/c2k_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.26-rc2 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Thu May 15 11:00:14 2008 | 4 | # Thu Aug 21 00:52:02 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -34,6 +34,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 35 | CONFIG_IRQ_PER_CPU=y | 35 | CONFIG_IRQ_PER_CPU=y |
| 36 | CONFIG_STACKTRACE_SUPPORT=y | 36 | CONFIG_STACKTRACE_SUPPORT=y |
| 37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 37 | CONFIG_LOCKDEP_SUPPORT=y | 38 | CONFIG_LOCKDEP_SUPPORT=y |
| 38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 39 | CONFIG_ARCH_HAS_ILOG2_U32=y | 40 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| @@ -97,7 +98,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y | |||
| 97 | CONFIG_SYSCTL=y | 98 | CONFIG_SYSCTL=y |
| 98 | # CONFIG_EMBEDDED is not set | 99 | # CONFIG_EMBEDDED is not set |
| 99 | CONFIG_SYSCTL_SYSCALL=y | 100 | CONFIG_SYSCTL_SYSCALL=y |
| 100 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 101 | CONFIG_KALLSYMS=y | 101 | CONFIG_KALLSYMS=y |
| 102 | # CONFIG_KALLSYMS_ALL is not set | 102 | # CONFIG_KALLSYMS_ALL is not set |
| 103 | CONFIG_KALLSYMS_EXTRA_PASS=y | 103 | CONFIG_KALLSYMS_EXTRA_PASS=y |
| @@ -124,11 +124,17 @@ CONFIG_PROFILING=y | |||
| 124 | CONFIG_OPROFILE=m | 124 | CONFIG_OPROFILE=m |
| 125 | CONFIG_HAVE_OPROFILE=y | 125 | CONFIG_HAVE_OPROFILE=y |
| 126 | CONFIG_KPROBES=y | 126 | CONFIG_KPROBES=y |
| 127 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 127 | CONFIG_KRETPROBES=y | 128 | CONFIG_KRETPROBES=y |
| 129 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 128 | CONFIG_HAVE_KPROBES=y | 130 | CONFIG_HAVE_KPROBES=y |
| 129 | CONFIG_HAVE_KRETPROBES=y | 131 | CONFIG_HAVE_KRETPROBES=y |
| 132 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 130 | # CONFIG_HAVE_DMA_ATTRS is not set | 133 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 134 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 135 | # CONFIG_HAVE_CLK is not set | ||
| 131 | CONFIG_PROC_PAGE_MONITOR=y | 136 | CONFIG_PROC_PAGE_MONITOR=y |
| 137 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 132 | CONFIG_SLABINFO=y | 138 | CONFIG_SLABINFO=y |
| 133 | CONFIG_RT_MUTEXES=y | 139 | CONFIG_RT_MUTEXES=y |
| 134 | # CONFIG_TINY_SHMEM is not set | 140 | # CONFIG_TINY_SHMEM is not set |
| @@ -145,6 +151,7 @@ CONFIG_LBD=y | |||
| 145 | # CONFIG_BLK_DEV_IO_TRACE is not set | 151 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 146 | # CONFIG_LSF is not set | 152 | # CONFIG_LSF is not set |
| 147 | # CONFIG_BLK_DEV_BSG is not set | 153 | # CONFIG_BLK_DEV_BSG is not set |
| 154 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 148 | 155 | ||
| 149 | # | 156 | # |
| 150 | # IO Schedulers | 157 | # IO Schedulers |
| @@ -164,19 +171,18 @@ CONFIG_CLASSIC_RCU=y | |||
| 164 | # Platform support | 171 | # Platform support |
| 165 | # | 172 | # |
| 166 | CONFIG_PPC_MULTIPLATFORM=y | 173 | CONFIG_PPC_MULTIPLATFORM=y |
| 167 | # CONFIG_PPC_82xx is not set | ||
| 168 | # CONFIG_PPC_83xx is not set | ||
| 169 | # CONFIG_PPC_86xx is not set | ||
| 170 | CONFIG_CLASSIC32=y | 174 | CONFIG_CLASSIC32=y |
| 171 | # CONFIG_PPC_CHRP is not set | 175 | # CONFIG_PPC_CHRP is not set |
| 172 | # CONFIG_PPC_MPC512x is not set | ||
| 173 | # CONFIG_PPC_MPC5121 is not set | ||
| 174 | # CONFIG_MPC5121_ADS is not set | 176 | # CONFIG_MPC5121_ADS is not set |
| 177 | # CONFIG_MPC5121_GENERIC is not set | ||
| 175 | # CONFIG_PPC_MPC52xx is not set | 178 | # CONFIG_PPC_MPC52xx is not set |
| 176 | # CONFIG_PPC_PMAC is not set | 179 | # CONFIG_PPC_PMAC is not set |
| 177 | # CONFIG_PPC_CELL is not set | 180 | # CONFIG_PPC_CELL is not set |
| 178 | # CONFIG_PPC_CELL_NATIVE is not set | 181 | # CONFIG_PPC_CELL_NATIVE is not set |
| 182 | # CONFIG_PPC_82xx is not set | ||
| 179 | # CONFIG_PQ2ADS is not set | 183 | # CONFIG_PQ2ADS is not set |
| 184 | # CONFIG_PPC_83xx is not set | ||
| 185 | # CONFIG_PPC_86xx is not set | ||
| 180 | CONFIG_EMBEDDED6xx=y | 186 | CONFIG_EMBEDDED6xx=y |
| 181 | # CONFIG_LINKSTATION is not set | 187 | # CONFIG_LINKSTATION is not set |
| 182 | # CONFIG_STORCENTER is not set | 188 | # CONFIG_STORCENTER is not set |
| @@ -253,6 +259,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 253 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 259 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 254 | CONFIG_PAGEFLAGS_EXTENDED=y | 260 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 255 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 261 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 262 | CONFIG_MIGRATION=y | ||
| 256 | # CONFIG_RESOURCES_64BIT is not set | 263 | # CONFIG_RESOURCES_64BIT is not set |
| 257 | CONFIG_ZONE_DMA_FLAG=1 | 264 | CONFIG_ZONE_DMA_FLAG=1 |
| 258 | CONFIG_BOUNCE=y | 265 | CONFIG_BOUNCE=y |
| @@ -260,6 +267,7 @@ CONFIG_VIRT_TO_BUS=y | |||
| 260 | CONFIG_FORCE_MAX_ZONEORDER=11 | 267 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 261 | # CONFIG_PROC_DEVICETREE is not set | 268 | # CONFIG_PROC_DEVICETREE is not set |
| 262 | # CONFIG_CMDLINE_BOOL is not set | 269 | # CONFIG_CMDLINE_BOOL is not set |
| 270 | CONFIG_EXTRA_TARGETS="" | ||
| 263 | CONFIG_PM=y | 271 | CONFIG_PM=y |
| 264 | # CONFIG_PM_DEBUG is not set | 272 | # CONFIG_PM_DEBUG is not set |
| 265 | CONFIG_SECCOMP=y | 273 | CONFIG_SECCOMP=y |
| @@ -301,10 +309,6 @@ CONFIG_PHYSICAL_START=0x00000000 | |||
| 301 | CONFIG_TASK_SIZE=0xc0000000 | 309 | CONFIG_TASK_SIZE=0xc0000000 |
| 302 | CONFIG_CONSISTENT_START=0xff100000 | 310 | CONFIG_CONSISTENT_START=0xff100000 |
| 303 | CONFIG_CONSISTENT_SIZE=0x00200000 | 311 | CONFIG_CONSISTENT_SIZE=0x00200000 |
| 304 | |||
| 305 | # | ||
| 306 | # Networking | ||
| 307 | # | ||
| 308 | CONFIG_NET=y | 312 | CONFIG_NET=y |
| 309 | 313 | ||
| 310 | # | 314 | # |
| @@ -318,6 +322,7 @@ CONFIG_XFRM_USER=y | |||
| 318 | # CONFIG_XFRM_SUB_POLICY is not set | 322 | # CONFIG_XFRM_SUB_POLICY is not set |
| 319 | # CONFIG_XFRM_MIGRATE is not set | 323 | # CONFIG_XFRM_MIGRATE is not set |
| 320 | # CONFIG_XFRM_STATISTICS is not set | 324 | # CONFIG_XFRM_STATISTICS is not set |
| 325 | CONFIG_XFRM_IPCOMP=m | ||
| 321 | CONFIG_NET_KEY=m | 326 | CONFIG_NET_KEY=m |
| 322 | # CONFIG_NET_KEY_MIGRATE is not set | 327 | # CONFIG_NET_KEY_MIGRATE is not set |
| 323 | CONFIG_INET=y | 328 | CONFIG_INET=y |
| @@ -349,7 +354,7 @@ CONFIG_INET_TUNNEL=m | |||
| 349 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | 354 | CONFIG_INET_XFRM_MODE_TRANSPORT=y |
| 350 | CONFIG_INET_XFRM_MODE_TUNNEL=y | 355 | CONFIG_INET_XFRM_MODE_TUNNEL=y |
| 351 | CONFIG_INET_XFRM_MODE_BEET=y | 356 | CONFIG_INET_XFRM_MODE_BEET=y |
| 352 | # CONFIG_INET_LRO is not set | 357 | CONFIG_INET_LRO=m |
| 353 | CONFIG_INET_DIAG=y | 358 | CONFIG_INET_DIAG=y |
| 354 | CONFIG_INET_TCP_DIAG=y | 359 | CONFIG_INET_TCP_DIAG=y |
| 355 | # CONFIG_TCP_CONG_ADVANCED is not set | 360 | # CONFIG_TCP_CONG_ADVANCED is not set |
| @@ -472,6 +477,7 @@ CONFIG_IP_NF_MANGLE=m | |||
| 472 | CONFIG_IP_NF_TARGET_ECN=m | 477 | CONFIG_IP_NF_TARGET_ECN=m |
| 473 | # CONFIG_IP_NF_TARGET_TTL is not set | 478 | # CONFIG_IP_NF_TARGET_TTL is not set |
| 474 | CONFIG_IP_NF_RAW=m | 479 | CONFIG_IP_NF_RAW=m |
| 480 | # CONFIG_IP_NF_SECURITY is not set | ||
| 475 | CONFIG_IP_NF_ARPTABLES=m | 481 | CONFIG_IP_NF_ARPTABLES=m |
| 476 | CONFIG_IP_NF_ARPFILTER=m | 482 | CONFIG_IP_NF_ARPFILTER=m |
| 477 | CONFIG_IP_NF_ARP_MANGLE=m | 483 | CONFIG_IP_NF_ARP_MANGLE=m |
| @@ -495,6 +501,7 @@ CONFIG_IP6_NF_TARGET_LOG=m | |||
| 495 | CONFIG_IP6_NF_MANGLE=m | 501 | CONFIG_IP6_NF_MANGLE=m |
| 496 | # CONFIG_IP6_NF_TARGET_HL is not set | 502 | # CONFIG_IP6_NF_TARGET_HL is not set |
| 497 | CONFIG_IP6_NF_RAW=m | 503 | CONFIG_IP6_NF_RAW=m |
| 504 | # CONFIG_IP6_NF_SECURITY is not set | ||
| 498 | 505 | ||
| 499 | # | 506 | # |
| 500 | # Bridge: Netfilter Configuration | 507 | # Bridge: Netfilter Configuration |
| @@ -507,6 +514,7 @@ CONFIG_BRIDGE_EBT_802_3=m | |||
| 507 | CONFIG_BRIDGE_EBT_AMONG=m | 514 | CONFIG_BRIDGE_EBT_AMONG=m |
| 508 | CONFIG_BRIDGE_EBT_ARP=m | 515 | CONFIG_BRIDGE_EBT_ARP=m |
| 509 | CONFIG_BRIDGE_EBT_IP=m | 516 | CONFIG_BRIDGE_EBT_IP=m |
| 517 | # CONFIG_BRIDGE_EBT_IP6 is not set | ||
| 510 | CONFIG_BRIDGE_EBT_LIMIT=m | 518 | CONFIG_BRIDGE_EBT_LIMIT=m |
| 511 | CONFIG_BRIDGE_EBT_MARK=m | 519 | CONFIG_BRIDGE_EBT_MARK=m |
| 512 | CONFIG_BRIDGE_EBT_PKTTYPE=m | 520 | CONFIG_BRIDGE_EBT_PKTTYPE=m |
| @@ -535,8 +543,10 @@ CONFIG_ATM_LANE=m | |||
| 535 | # CONFIG_ATM_MPOA is not set | 543 | # CONFIG_ATM_MPOA is not set |
| 536 | CONFIG_ATM_BR2684=m | 544 | CONFIG_ATM_BR2684=m |
| 537 | # CONFIG_ATM_BR2684_IPFILTER is not set | 545 | # CONFIG_ATM_BR2684_IPFILTER is not set |
| 546 | CONFIG_STP=m | ||
| 538 | CONFIG_BRIDGE=m | 547 | CONFIG_BRIDGE=m |
| 539 | CONFIG_VLAN_8021Q=m | 548 | CONFIG_VLAN_8021Q=m |
| 549 | # CONFIG_VLAN_8021Q_GVRP is not set | ||
| 540 | # CONFIG_DECNET is not set | 550 | # CONFIG_DECNET is not set |
| 541 | CONFIG_LLC=m | 551 | CONFIG_LLC=m |
| 542 | # CONFIG_LLC2 is not set | 552 | # CONFIG_LLC2 is not set |
| @@ -556,7 +566,6 @@ CONFIG_NET_SCH_HTB=m | |||
| 556 | CONFIG_NET_SCH_HFSC=m | 566 | CONFIG_NET_SCH_HFSC=m |
| 557 | CONFIG_NET_SCH_ATM=m | 567 | CONFIG_NET_SCH_ATM=m |
| 558 | CONFIG_NET_SCH_PRIO=m | 568 | CONFIG_NET_SCH_PRIO=m |
| 559 | # CONFIG_NET_SCH_RR is not set | ||
| 560 | CONFIG_NET_SCH_RED=m | 569 | CONFIG_NET_SCH_RED=m |
| 561 | CONFIG_NET_SCH_SFQ=m | 570 | CONFIG_NET_SCH_SFQ=m |
| 562 | CONFIG_NET_SCH_TEQL=m | 571 | CONFIG_NET_SCH_TEQL=m |
| @@ -601,7 +610,6 @@ CONFIG_BT_RFCOMM_TTY=y | |||
| 601 | CONFIG_BT_BNEP=m | 610 | CONFIG_BT_BNEP=m |
| 602 | CONFIG_BT_BNEP_MC_FILTER=y | 611 | CONFIG_BT_BNEP_MC_FILTER=y |
| 603 | CONFIG_BT_BNEP_PROTO_FILTER=y | 612 | CONFIG_BT_BNEP_PROTO_FILTER=y |
| 604 | CONFIG_BT_CMTP=m | ||
| 605 | CONFIG_BT_HIDP=m | 613 | CONFIG_BT_HIDP=m |
| 606 | 614 | ||
| 607 | # | 615 | # |
| @@ -609,6 +617,7 @@ CONFIG_BT_HIDP=m | |||
| 609 | # | 617 | # |
| 610 | CONFIG_BT_HCIUSB=m | 618 | CONFIG_BT_HCIUSB=m |
| 611 | CONFIG_BT_HCIUSB_SCO=y | 619 | CONFIG_BT_HCIUSB_SCO=y |
| 620 | # CONFIG_BT_HCIBTUSB is not set | ||
| 612 | CONFIG_BT_HCIUART=m | 621 | CONFIG_BT_HCIUART=m |
| 613 | CONFIG_BT_HCIUART_H4=y | 622 | CONFIG_BT_HCIUART_H4=y |
| 614 | CONFIG_BT_HCIUART_BCSP=y | 623 | CONFIG_BT_HCIUART_BCSP=y |
| @@ -625,6 +634,7 @@ CONFIG_FIB_RULES=y | |||
| 625 | # | 634 | # |
| 626 | # CONFIG_CFG80211 is not set | 635 | # CONFIG_CFG80211 is not set |
| 627 | CONFIG_WIRELESS_EXT=y | 636 | CONFIG_WIRELESS_EXT=y |
| 637 | CONFIG_WIRELESS_EXT_SYSFS=y | ||
| 628 | # CONFIG_MAC80211 is not set | 638 | # CONFIG_MAC80211 is not set |
| 629 | CONFIG_IEEE80211=m | 639 | CONFIG_IEEE80211=m |
| 630 | # CONFIG_IEEE80211_DEBUG is not set | 640 | # CONFIG_IEEE80211_DEBUG is not set |
| @@ -645,6 +655,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | |||
| 645 | CONFIG_STANDALONE=y | 655 | CONFIG_STANDALONE=y |
| 646 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 656 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 647 | CONFIG_FW_LOADER=y | 657 | CONFIG_FW_LOADER=y |
| 658 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
| 659 | CONFIG_EXTRA_FIRMWARE="" | ||
| 648 | # CONFIG_DEBUG_DRIVER is not set | 660 | # CONFIG_DEBUG_DRIVER is not set |
| 649 | # CONFIG_DEBUG_DEVRES is not set | 661 | # CONFIG_DEBUG_DEVRES is not set |
| 650 | # CONFIG_SYS_HYPERVISOR is not set | 662 | # CONFIG_SYS_HYPERVISOR is not set |
| @@ -749,6 +761,7 @@ CONFIG_BLK_DEV_RAM_SIZE=16384 | |||
| 749 | # CONFIG_BLK_DEV_XIP is not set | 761 | # CONFIG_BLK_DEV_XIP is not set |
| 750 | # CONFIG_CDROM_PKTCDVD is not set | 762 | # CONFIG_CDROM_PKTCDVD is not set |
| 751 | # CONFIG_ATA_OVER_ETH is not set | 763 | # CONFIG_ATA_OVER_ETH is not set |
| 764 | # CONFIG_BLK_DEV_HD is not set | ||
| 752 | # CONFIG_MISC_DEVICES is not set | 765 | # CONFIG_MISC_DEVICES is not set |
| 753 | CONFIG_HAVE_IDE=y | 766 | CONFIG_HAVE_IDE=y |
| 754 | # CONFIG_IDE is not set | 767 | # CONFIG_IDE is not set |
| @@ -844,6 +857,7 @@ CONFIG_SCSI_LPFC=m | |||
| 844 | # CONFIG_SCSI_NSP32 is not set | 857 | # CONFIG_SCSI_NSP32 is not set |
| 845 | # CONFIG_SCSI_DEBUG is not set | 858 | # CONFIG_SCSI_DEBUG is not set |
| 846 | # CONFIG_SCSI_SRP is not set | 859 | # CONFIG_SCSI_SRP is not set |
| 860 | # CONFIG_SCSI_DH is not set | ||
| 847 | # CONFIG_ATA is not set | 861 | # CONFIG_ATA is not set |
| 848 | # CONFIG_MD is not set | 862 | # CONFIG_MD is not set |
| 849 | # CONFIG_FUSION is not set | 863 | # CONFIG_FUSION is not set |
| @@ -851,12 +865,15 @@ CONFIG_SCSI_LPFC=m | |||
| 851 | # | 865 | # |
| 852 | # IEEE 1394 (FireWire) support | 866 | # IEEE 1394 (FireWire) support |
| 853 | # | 867 | # |
| 868 | |||
| 869 | # | ||
| 870 | # Enable only one of the two stacks, unless you know what you are doing | ||
| 871 | # | ||
| 854 | # CONFIG_FIREWIRE is not set | 872 | # CONFIG_FIREWIRE is not set |
| 855 | # CONFIG_IEEE1394 is not set | 873 | # CONFIG_IEEE1394 is not set |
| 856 | # CONFIG_I2O is not set | 874 | # CONFIG_I2O is not set |
| 857 | # CONFIG_MACINTOSH_DRIVERS is not set | 875 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 858 | CONFIG_NETDEVICES=y | 876 | CONFIG_NETDEVICES=y |
| 859 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 860 | CONFIG_DUMMY=m | 877 | CONFIG_DUMMY=m |
| 861 | CONFIG_BONDING=m | 878 | CONFIG_BONDING=m |
| 862 | # CONFIG_MACVLAN is not set | 879 | # CONFIG_MACVLAN is not set |
| @@ -900,7 +917,6 @@ CONFIG_NETDEV_1000=y | |||
| 900 | # CONFIG_DL2K is not set | 917 | # CONFIG_DL2K is not set |
| 901 | # CONFIG_E1000 is not set | 918 | # CONFIG_E1000 is not set |
| 902 | # CONFIG_E1000E is not set | 919 | # CONFIG_E1000E is not set |
| 903 | # CONFIG_E1000E_ENABLED is not set | ||
| 904 | # CONFIG_IP1000 is not set | 920 | # CONFIG_IP1000 is not set |
| 905 | # CONFIG_IGB is not set | 921 | # CONFIG_IGB is not set |
| 906 | # CONFIG_NS83820 is not set | 922 | # CONFIG_NS83820 is not set |
| @@ -916,6 +932,7 @@ CONFIG_NETDEV_1000=y | |||
| 916 | CONFIG_MV643XX_ETH=y | 932 | CONFIG_MV643XX_ETH=y |
| 917 | # CONFIG_QLA3XXX is not set | 933 | # CONFIG_QLA3XXX is not set |
| 918 | # CONFIG_ATL1 is not set | 934 | # CONFIG_ATL1 is not set |
| 935 | # CONFIG_ATL1E is not set | ||
| 919 | # CONFIG_NETDEV_10000 is not set | 936 | # CONFIG_NETDEV_10000 is not set |
| 920 | # CONFIG_TR is not set | 937 | # CONFIG_TR is not set |
| 921 | 938 | ||
| @@ -940,112 +957,13 @@ CONFIG_MV643XX_ETH=y | |||
| 940 | # CONFIG_HIPPI is not set | 957 | # CONFIG_HIPPI is not set |
| 941 | # CONFIG_PPP is not set | 958 | # CONFIG_PPP is not set |
| 942 | # CONFIG_SLIP is not set | 959 | # CONFIG_SLIP is not set |
| 943 | CONFIG_SLHC=m | ||
| 944 | # CONFIG_NET_FC is not set | 960 | # CONFIG_NET_FC is not set |
| 945 | CONFIG_NETCONSOLE=m | 961 | CONFIG_NETCONSOLE=m |
| 946 | # CONFIG_NETCONSOLE_DYNAMIC is not set | 962 | # CONFIG_NETCONSOLE_DYNAMIC is not set |
| 947 | CONFIG_NETPOLL=y | 963 | CONFIG_NETPOLL=y |
| 948 | CONFIG_NETPOLL_TRAP=y | 964 | CONFIG_NETPOLL_TRAP=y |
| 949 | CONFIG_NET_POLL_CONTROLLER=y | 965 | CONFIG_NET_POLL_CONTROLLER=y |
| 950 | CONFIG_ISDN=m | 966 | # CONFIG_ISDN is not set |
| 951 | CONFIG_ISDN_I4L=m | ||
| 952 | CONFIG_ISDN_PPP=y | ||
| 953 | CONFIG_ISDN_PPP_VJ=y | ||
| 954 | CONFIG_ISDN_MPP=y | ||
| 955 | CONFIG_IPPP_FILTER=y | ||
| 956 | # CONFIG_ISDN_PPP_BSDCOMP is not set | ||
| 957 | CONFIG_ISDN_AUDIO=y | ||
| 958 | CONFIG_ISDN_TTY_FAX=y | ||
| 959 | |||
| 960 | # | ||
| 961 | # ISDN feature submodules | ||
| 962 | # | ||
| 963 | CONFIG_ISDN_DRV_LOOP=m | ||
| 964 | # CONFIG_ISDN_DIVERSION is not set | ||
| 965 | |||
| 966 | # | ||
| 967 | # ISDN4Linux hardware drivers | ||
| 968 | # | ||
| 969 | |||
| 970 | # | ||
| 971 | # Passive cards | ||
| 972 | # | ||
| 973 | CONFIG_ISDN_DRV_HISAX=m | ||
| 974 | |||
| 975 | # | ||
| 976 | # D-channel protocol features | ||
| 977 | # | ||
| 978 | CONFIG_HISAX_EURO=y | ||
| 979 | CONFIG_DE_AOC=y | ||
| 980 | CONFIG_HISAX_NO_SENDCOMPLETE=y | ||
| 981 | CONFIG_HISAX_NO_LLC=y | ||
| 982 | CONFIG_HISAX_NO_KEYPAD=y | ||
| 983 | CONFIG_HISAX_1TR6=y | ||
| 984 | CONFIG_HISAX_NI1=y | ||
| 985 | CONFIG_HISAX_MAX_CARDS=8 | ||
| 986 | |||
| 987 | # | ||
| 988 | # HiSax supported cards | ||
| 989 | # | ||
| 990 | CONFIG_HISAX_16_3=y | ||
| 991 | CONFIG_HISAX_S0BOX=y | ||
| 992 | CONFIG_HISAX_FRITZPCI=y | ||
| 993 | CONFIG_HISAX_AVM_A1_PCMCIA=y | ||
| 994 | CONFIG_HISAX_ELSA=y | ||
| 995 | CONFIG_HISAX_DIEHLDIVA=y | ||
| 996 | CONFIG_HISAX_SEDLBAUER=y | ||
| 997 | CONFIG_HISAX_NICCY=y | ||
| 998 | CONFIG_HISAX_BKM_A4T=y | ||
| 999 | CONFIG_HISAX_SCT_QUADRO=y | ||
| 1000 | CONFIG_HISAX_GAZEL=y | ||
| 1001 | CONFIG_HISAX_W6692=y | ||
| 1002 | CONFIG_HISAX_HFC_SX=y | ||
| 1003 | # CONFIG_HISAX_DEBUG is not set | ||
| 1004 | |||
| 1005 | # | ||
| 1006 | # HiSax PCMCIA card service modules | ||
| 1007 | # | ||
| 1008 | |||
| 1009 | # | ||
| 1010 | # HiSax sub driver modules | ||
| 1011 | # | ||
| 1012 | CONFIG_HISAX_ST5481=m | ||
| 1013 | CONFIG_HISAX_HFCUSB=m | ||
| 1014 | # CONFIG_HISAX_HFC4S8S is not set | ||
| 1015 | CONFIG_HISAX_FRITZ_PCIPNP=m | ||
| 1016 | CONFIG_HISAX_HDLC=y | ||
| 1017 | |||
| 1018 | # | ||
| 1019 | # Active cards | ||
| 1020 | # | ||
| 1021 | CONFIG_HYSDN=m | ||
| 1022 | CONFIG_HYSDN_CAPI=y | ||
| 1023 | # CONFIG_ISDN_DRV_GIGASET is not set | ||
| 1024 | CONFIG_ISDN_CAPI=m | ||
| 1025 | CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y | ||
| 1026 | CONFIG_CAPI_TRACE=y | ||
| 1027 | CONFIG_ISDN_CAPI_MIDDLEWARE=y | ||
| 1028 | CONFIG_ISDN_CAPI_CAPI20=m | ||
| 1029 | CONFIG_ISDN_CAPI_CAPIFS_BOOL=y | ||
| 1030 | CONFIG_ISDN_CAPI_CAPIFS=m | ||
| 1031 | CONFIG_ISDN_CAPI_CAPIDRV=m | ||
| 1032 | |||
| 1033 | # | ||
| 1034 | # CAPI hardware drivers | ||
| 1035 | # | ||
| 1036 | CONFIG_CAPI_AVM=y | ||
| 1037 | CONFIG_ISDN_DRV_AVMB1_B1PCI=m | ||
| 1038 | CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y | ||
| 1039 | CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m | ||
| 1040 | CONFIG_ISDN_DRV_AVMB1_T1PCI=m | ||
| 1041 | CONFIG_ISDN_DRV_AVMB1_C4=m | ||
| 1042 | CONFIG_CAPI_EICON=y | ||
| 1043 | CONFIG_ISDN_DIVAS=m | ||
| 1044 | CONFIG_ISDN_DIVAS_BRIPCI=y | ||
| 1045 | CONFIG_ISDN_DIVAS_PRIPCI=y | ||
| 1046 | CONFIG_ISDN_DIVAS_DIVACAPI=m | ||
| 1047 | CONFIG_ISDN_DIVAS_USERIDI=m | ||
| 1048 | CONFIG_ISDN_DIVAS_MAINT=m | ||
| 1049 | # CONFIG_PHONE is not set | 967 | # CONFIG_PHONE is not set |
| 1050 | 968 | ||
| 1051 | # | 969 | # |
| @@ -1092,6 +1010,7 @@ CONFIG_INPUT_UINPUT=m | |||
| 1092 | # Character devices | 1010 | # Character devices |
| 1093 | # | 1011 | # |
| 1094 | CONFIG_VT=y | 1012 | CONFIG_VT=y |
| 1013 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 1095 | CONFIG_VT_CONSOLE=y | 1014 | CONFIG_VT_CONSOLE=y |
| 1096 | CONFIG_HW_CONSOLE=y | 1015 | CONFIG_HW_CONSOLE=y |
| 1097 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 1016 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| @@ -1145,44 +1064,65 @@ CONFIG_DEVPORT=y | |||
| 1145 | CONFIG_I2C=m | 1064 | CONFIG_I2C=m |
| 1146 | CONFIG_I2C_BOARDINFO=y | 1065 | CONFIG_I2C_BOARDINFO=y |
| 1147 | CONFIG_I2C_CHARDEV=m | 1066 | CONFIG_I2C_CHARDEV=m |
| 1067 | CONFIG_I2C_HELPER_AUTO=y | ||
| 1148 | 1068 | ||
| 1149 | # | 1069 | # |
| 1150 | # I2C Hardware Bus support | 1070 | # I2C Hardware Bus support |
| 1151 | # | 1071 | # |
| 1072 | |||
| 1073 | # | ||
| 1074 | # PC SMBus host controller drivers | ||
| 1075 | # | ||
| 1152 | # CONFIG_I2C_ALI1535 is not set | 1076 | # CONFIG_I2C_ALI1535 is not set |
| 1153 | # CONFIG_I2C_ALI1563 is not set | 1077 | # CONFIG_I2C_ALI1563 is not set |
| 1154 | # CONFIG_I2C_ALI15X3 is not set | 1078 | # CONFIG_I2C_ALI15X3 is not set |
| 1155 | # CONFIG_I2C_AMD756 is not set | 1079 | # CONFIG_I2C_AMD756 is not set |
| 1156 | # CONFIG_I2C_AMD8111 is not set | 1080 | # CONFIG_I2C_AMD8111 is not set |
| 1157 | # CONFIG_I2C_I801 is not set | 1081 | # CONFIG_I2C_I801 is not set |
| 1158 | # CONFIG_I2C_I810 is not set | 1082 | # CONFIG_I2C_ISCH is not set |
| 1159 | # CONFIG_I2C_PIIX4 is not set | 1083 | # CONFIG_I2C_PIIX4 is not set |
| 1160 | # CONFIG_I2C_MPC is not set | ||
| 1161 | # CONFIG_I2C_NFORCE2 is not set | 1084 | # CONFIG_I2C_NFORCE2 is not set |
| 1162 | # CONFIG_I2C_OCORES is not set | ||
| 1163 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 1164 | # CONFIG_I2C_PROSAVAGE is not set | ||
| 1165 | # CONFIG_I2C_SAVAGE4 is not set | ||
| 1166 | # CONFIG_I2C_SIMTEC is not set | ||
| 1167 | # CONFIG_I2C_SIS5595 is not set | 1085 | # CONFIG_I2C_SIS5595 is not set |
| 1168 | # CONFIG_I2C_SIS630 is not set | 1086 | # CONFIG_I2C_SIS630 is not set |
| 1169 | # CONFIG_I2C_SIS96X is not set | 1087 | # CONFIG_I2C_SIS96X is not set |
| 1170 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 1171 | # CONFIG_I2C_STUB is not set | ||
| 1172 | # CONFIG_I2C_TINY_USB is not set | ||
| 1173 | # CONFIG_I2C_VIA is not set | 1088 | # CONFIG_I2C_VIA is not set |
| 1174 | # CONFIG_I2C_VIAPRO is not set | 1089 | # CONFIG_I2C_VIAPRO is not set |
| 1090 | |||
| 1091 | # | ||
| 1092 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 1093 | # | ||
| 1094 | # CONFIG_I2C_MPC is not set | ||
| 1095 | CONFIG_I2C_MV64XXX=m | ||
| 1096 | # CONFIG_I2C_OCORES is not set | ||
| 1097 | # CONFIG_I2C_SIMTEC is not set | ||
| 1098 | |||
| 1099 | # | ||
| 1100 | # External I2C/SMBus adapter drivers | ||
| 1101 | # | ||
| 1102 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 1103 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 1104 | # CONFIG_I2C_TINY_USB is not set | ||
| 1105 | |||
| 1106 | # | ||
| 1107 | # Graphics adapter I2C/DDC channel drivers | ||
| 1108 | # | ||
| 1175 | # CONFIG_I2C_VOODOO3 is not set | 1109 | # CONFIG_I2C_VOODOO3 is not set |
| 1110 | |||
| 1111 | # | ||
| 1112 | # Other I2C/SMBus bus drivers | ||
| 1113 | # | ||
| 1176 | # CONFIG_I2C_PCA_PLATFORM is not set | 1114 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 1177 | CONFIG_I2C_MV64XXX=m | 1115 | # CONFIG_I2C_STUB is not set |
| 1178 | 1116 | ||
| 1179 | # | 1117 | # |
| 1180 | # Miscellaneous I2C Chip support | 1118 | # Miscellaneous I2C Chip support |
| 1181 | # | 1119 | # |
| 1182 | # CONFIG_DS1682 is not set | 1120 | # CONFIG_DS1682 is not set |
| 1121 | # CONFIG_AT24 is not set | ||
| 1183 | CONFIG_SENSORS_EEPROM=m | 1122 | CONFIG_SENSORS_EEPROM=m |
| 1184 | CONFIG_SENSORS_PCF8574=m | 1123 | CONFIG_SENSORS_PCF8574=m |
| 1185 | # CONFIG_PCF8575 is not set | 1124 | # CONFIG_PCF8575 is not set |
| 1125 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 1186 | CONFIG_SENSORS_PCF8591=m | 1126 | CONFIG_SENSORS_PCF8591=m |
| 1187 | # CONFIG_SENSORS_MAX6875 is not set | 1127 | # CONFIG_SENSORS_MAX6875 is not set |
| 1188 | # CONFIG_SENSORS_TSL2550 is not set | 1128 | # CONFIG_SENSORS_TSL2550 is not set |
| @@ -1191,10 +1131,13 @@ CONFIG_SENSORS_PCF8591=m | |||
| 1191 | # CONFIG_I2C_DEBUG_BUS is not set | 1131 | # CONFIG_I2C_DEBUG_BUS is not set |
| 1192 | # CONFIG_I2C_DEBUG_CHIP is not set | 1132 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 1193 | # CONFIG_SPI is not set | 1133 | # CONFIG_SPI is not set |
| 1134 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 1135 | # CONFIG_GPIOLIB is not set | ||
| 1194 | # CONFIG_W1 is not set | 1136 | # CONFIG_W1 is not set |
| 1195 | # CONFIG_POWER_SUPPLY is not set | 1137 | # CONFIG_POWER_SUPPLY is not set |
| 1196 | CONFIG_HWMON=m | 1138 | CONFIG_HWMON=m |
| 1197 | CONFIG_HWMON_VID=m | 1139 | CONFIG_HWMON_VID=m |
| 1140 | # CONFIG_SENSORS_AD7414 is not set | ||
| 1198 | # CONFIG_SENSORS_AD7418 is not set | 1141 | # CONFIG_SENSORS_AD7418 is not set |
| 1199 | CONFIG_SENSORS_ADM1021=m | 1142 | CONFIG_SENSORS_ADM1021=m |
| 1200 | CONFIG_SENSORS_ADM1025=m | 1143 | CONFIG_SENSORS_ADM1025=m |
| @@ -1255,6 +1198,7 @@ CONFIG_WATCHDOG=y | |||
| 1255 | # Watchdog Device Drivers | 1198 | # Watchdog Device Drivers |
| 1256 | # | 1199 | # |
| 1257 | CONFIG_SOFT_WATCHDOG=m | 1200 | CONFIG_SOFT_WATCHDOG=m |
| 1201 | # CONFIG_ALIM7101_WDT is not set | ||
| 1258 | # CONFIG_MV64X60_WDT is not set | 1202 | # CONFIG_MV64X60_WDT is not set |
| 1259 | 1203 | ||
| 1260 | # | 1204 | # |
| @@ -1278,8 +1222,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1278 | # | 1222 | # |
| 1279 | # Multifunction device drivers | 1223 | # Multifunction device drivers |
| 1280 | # | 1224 | # |
| 1225 | # CONFIG_MFD_CORE is not set | ||
| 1281 | # CONFIG_MFD_SM501 is not set | 1226 | # CONFIG_MFD_SM501 is not set |
| 1282 | # CONFIG_HTC_PASIC3 is not set | 1227 | # CONFIG_HTC_PASIC3 is not set |
| 1228 | # CONFIG_MFD_TMIO is not set | ||
| 1283 | 1229 | ||
| 1284 | # | 1230 | # |
| 1285 | # Multimedia devices | 1231 | # Multimedia devices |
| @@ -1290,6 +1236,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1290 | # | 1236 | # |
| 1291 | # CONFIG_VIDEO_DEV is not set | 1237 | # CONFIG_VIDEO_DEV is not set |
| 1292 | # CONFIG_DVB_CORE is not set | 1238 | # CONFIG_DVB_CORE is not set |
| 1239 | # CONFIG_VIDEO_MEDIA is not set | ||
| 1293 | 1240 | ||
| 1294 | # | 1241 | # |
| 1295 | # Multimedia drivers | 1242 | # Multimedia drivers |
| @@ -1316,10 +1263,6 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1316 | # | 1263 | # |
| 1317 | # CONFIG_VGA_CONSOLE is not set | 1264 | # CONFIG_VGA_CONSOLE is not set |
| 1318 | CONFIG_DUMMY_CONSOLE=y | 1265 | CONFIG_DUMMY_CONSOLE=y |
| 1319 | |||
| 1320 | # | ||
| 1321 | # Sound | ||
| 1322 | # | ||
| 1323 | # CONFIG_SOUND is not set | 1266 | # CONFIG_SOUND is not set |
| 1324 | # CONFIG_HID_SUPPORT is not set | 1267 | # CONFIG_HID_SUPPORT is not set |
| 1325 | CONFIG_HID=m | 1268 | CONFIG_HID=m |
| @@ -1339,6 +1282,7 @@ CONFIG_USB_DEVICEFS=y | |||
| 1339 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1282 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 1340 | CONFIG_USB_SUSPEND=y | 1283 | CONFIG_USB_SUSPEND=y |
| 1341 | # CONFIG_USB_OTG is not set | 1284 | # CONFIG_USB_OTG is not set |
| 1285 | CONFIG_USB_MON=y | ||
| 1342 | 1286 | ||
| 1343 | # | 1287 | # |
| 1344 | # USB Host Controller Drivers | 1288 | # USB Host Controller Drivers |
| @@ -1363,10 +1307,15 @@ CONFIG_USB_UHCI_HCD=m | |||
| 1363 | # CONFIG_USB_R8A66597_HCD is not set | 1307 | # CONFIG_USB_R8A66597_HCD is not set |
| 1364 | 1308 | ||
| 1365 | # | 1309 | # |
| 1310 | # Enable Host or Gadget support to see Inventra options | ||
| 1311 | # | ||
| 1312 | |||
| 1313 | # | ||
| 1366 | # USB Device Class drivers | 1314 | # USB Device Class drivers |
| 1367 | # | 1315 | # |
| 1368 | CONFIG_USB_ACM=m | 1316 | CONFIG_USB_ACM=m |
| 1369 | CONFIG_USB_PRINTER=m | 1317 | CONFIG_USB_PRINTER=m |
| 1318 | # CONFIG_USB_WDM is not set | ||
| 1370 | 1319 | ||
| 1371 | # | 1320 | # |
| 1372 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1321 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -1388,6 +1337,7 @@ CONFIG_USB_STORAGE_JUMPSHOT=y | |||
| 1388 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1337 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1389 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1338 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
| 1390 | # CONFIG_USB_STORAGE_KARMA is not set | 1339 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1340 | # CONFIG_USB_STORAGE_SIERRA is not set | ||
| 1391 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | 1341 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
| 1392 | # CONFIG_USB_LIBUSUAL is not set | 1342 | # CONFIG_USB_LIBUSUAL is not set |
| 1393 | 1343 | ||
| @@ -1396,7 +1346,6 @@ CONFIG_USB_STORAGE_JUMPSHOT=y | |||
| 1396 | # | 1346 | # |
| 1397 | CONFIG_USB_MDC800=m | 1347 | CONFIG_USB_MDC800=m |
| 1398 | CONFIG_USB_MICROTEK=m | 1348 | CONFIG_USB_MICROTEK=m |
| 1399 | CONFIG_USB_MON=y | ||
| 1400 | 1349 | ||
| 1401 | # | 1350 | # |
| 1402 | # USB port drivers | 1351 | # USB port drivers |
| @@ -1405,7 +1354,6 @@ CONFIG_USB_SERIAL=m | |||
| 1405 | CONFIG_USB_EZUSB=y | 1354 | CONFIG_USB_EZUSB=y |
| 1406 | CONFIG_USB_SERIAL_GENERIC=y | 1355 | CONFIG_USB_SERIAL_GENERIC=y |
| 1407 | # CONFIG_USB_SERIAL_AIRCABLE is not set | 1356 | # CONFIG_USB_SERIAL_AIRCABLE is not set |
| 1408 | # CONFIG_USB_SERIAL_AIRPRIME is not set | ||
| 1409 | # CONFIG_USB_SERIAL_ARK3116 is not set | 1357 | # CONFIG_USB_SERIAL_ARK3116 is not set |
| 1410 | CONFIG_USB_SERIAL_BELKIN=m | 1358 | CONFIG_USB_SERIAL_BELKIN=m |
| 1411 | # CONFIG_USB_SERIAL_CH341 is not set | 1359 | # CONFIG_USB_SERIAL_CH341 is not set |
| @@ -1443,6 +1391,7 @@ CONFIG_USB_SERIAL_KOBIL_SCT=m | |||
| 1443 | CONFIG_USB_SERIAL_MCT_U232=m | 1391 | CONFIG_USB_SERIAL_MCT_U232=m |
| 1444 | # CONFIG_USB_SERIAL_MOS7720 is not set | 1392 | # CONFIG_USB_SERIAL_MOS7720 is not set |
| 1445 | # CONFIG_USB_SERIAL_MOS7840 is not set | 1393 | # CONFIG_USB_SERIAL_MOS7840 is not set |
| 1394 | # CONFIG_USB_SERIAL_MOTOROLA is not set | ||
| 1446 | # CONFIG_USB_SERIAL_NAVMAN is not set | 1395 | # CONFIG_USB_SERIAL_NAVMAN is not set |
| 1447 | CONFIG_USB_SERIAL_PL2303=m | 1396 | CONFIG_USB_SERIAL_PL2303=m |
| 1448 | # CONFIG_USB_SERIAL_OTI6858 is not set | 1397 | # CONFIG_USB_SERIAL_OTI6858 is not set |
| @@ -1464,7 +1413,6 @@ CONFIG_USB_SERIAL_OMNINET=m | |||
| 1464 | CONFIG_USB_EMI62=m | 1413 | CONFIG_USB_EMI62=m |
| 1465 | # CONFIG_USB_EMI26 is not set | 1414 | # CONFIG_USB_EMI26 is not set |
| 1466 | # CONFIG_USB_ADUTUX is not set | 1415 | # CONFIG_USB_ADUTUX is not set |
| 1467 | CONFIG_USB_AUERSWALD=m | ||
| 1468 | CONFIG_USB_RIO500=m | 1416 | CONFIG_USB_RIO500=m |
| 1469 | CONFIG_USB_LEGOTOWER=m | 1417 | CONFIG_USB_LEGOTOWER=m |
| 1470 | CONFIG_USB_LCD=m | 1418 | CONFIG_USB_LCD=m |
| @@ -1481,6 +1429,7 @@ CONFIG_USB_LED=m | |||
| 1481 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1429 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 1482 | # CONFIG_USB_IOWARRIOR is not set | 1430 | # CONFIG_USB_IOWARRIOR is not set |
| 1483 | CONFIG_USB_TEST=m | 1431 | CONFIG_USB_TEST=m |
| 1432 | # CONFIG_USB_ISIGHTFW is not set | ||
| 1484 | CONFIG_USB_ATM=m | 1433 | CONFIG_USB_ATM=m |
| 1485 | CONFIG_USB_SPEEDTOUCH=m | 1434 | CONFIG_USB_SPEEDTOUCH=m |
| 1486 | # CONFIG_USB_CXACRU is not set | 1435 | # CONFIG_USB_CXACRU is not set |
| @@ -1601,6 +1550,7 @@ CONFIG_JFFS2_RTIME=y | |||
| 1601 | CONFIG_CRAMFS=m | 1550 | CONFIG_CRAMFS=m |
| 1602 | CONFIG_VXFS_FS=m | 1551 | CONFIG_VXFS_FS=m |
| 1603 | # CONFIG_MINIX_FS is not set | 1552 | # CONFIG_MINIX_FS is not set |
| 1553 | # CONFIG_OMFS_FS is not set | ||
| 1604 | # CONFIG_HPFS_FS is not set | 1554 | # CONFIG_HPFS_FS is not set |
| 1605 | # CONFIG_QNX4FS_FS is not set | 1555 | # CONFIG_QNX4FS_FS is not set |
| 1606 | # CONFIG_ROMFS_FS is not set | 1556 | # CONFIG_ROMFS_FS is not set |
| @@ -1611,8 +1561,8 @@ CONFIG_NFS_FS=y | |||
| 1611 | CONFIG_NFS_V3=y | 1561 | CONFIG_NFS_V3=y |
| 1612 | CONFIG_NFS_V3_ACL=y | 1562 | CONFIG_NFS_V3_ACL=y |
| 1613 | CONFIG_NFS_V4=y | 1563 | CONFIG_NFS_V4=y |
| 1614 | # CONFIG_NFSD is not set | ||
| 1615 | CONFIG_ROOT_NFS=y | 1564 | CONFIG_ROOT_NFS=y |
| 1565 | # CONFIG_NFSD is not set | ||
| 1616 | CONFIG_LOCKD=y | 1566 | CONFIG_LOCKD=y |
| 1617 | CONFIG_LOCKD_V4=y | 1567 | CONFIG_LOCKD_V4=y |
| 1618 | CONFIG_NFS_ACL_SUPPORT=y | 1568 | CONFIG_NFS_ACL_SUPPORT=y |
| @@ -1620,7 +1570,6 @@ CONFIG_NFS_COMMON=y | |||
| 1620 | CONFIG_SUNRPC=y | 1570 | CONFIG_SUNRPC=y |
| 1621 | CONFIG_SUNRPC_GSS=y | 1571 | CONFIG_SUNRPC_GSS=y |
| 1622 | CONFIG_SUNRPC_XPRT_RDMA=m | 1572 | CONFIG_SUNRPC_XPRT_RDMA=m |
| 1623 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 1624 | CONFIG_RPCSEC_GSS_KRB5=y | 1573 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1625 | CONFIG_RPCSEC_GSS_SPKM3=m | 1574 | CONFIG_RPCSEC_GSS_SPKM3=m |
| 1626 | # CONFIG_SMB_FS is not set | 1575 | # CONFIG_SMB_FS is not set |
| @@ -1705,6 +1654,7 @@ CONFIG_BITREVERSE=y | |||
| 1705 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1654 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 1706 | CONFIG_CRC_CCITT=m | 1655 | CONFIG_CRC_CCITT=m |
| 1707 | # CONFIG_CRC16 is not set | 1656 | # CONFIG_CRC16 is not set |
| 1657 | CONFIG_CRC_T10DIF=m | ||
| 1708 | CONFIG_CRC_ITU_T=m | 1658 | CONFIG_CRC_ITU_T=m |
| 1709 | CONFIG_CRC32=y | 1659 | CONFIG_CRC32=y |
| 1710 | # CONFIG_CRC7 is not set | 1660 | # CONFIG_CRC7 is not set |
| @@ -1732,6 +1682,8 @@ CONFIG_MAGIC_SYSRQ=y | |||
| 1732 | CONFIG_DEBUG_KERNEL=y | 1682 | CONFIG_DEBUG_KERNEL=y |
| 1733 | # CONFIG_DEBUG_SHIRQ is not set | 1683 | # CONFIG_DEBUG_SHIRQ is not set |
| 1734 | CONFIG_DETECT_SOFTLOCKUP=y | 1684 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1685 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 1686 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 1735 | CONFIG_SCHED_DEBUG=y | 1687 | CONFIG_SCHED_DEBUG=y |
| 1736 | # CONFIG_SCHEDSTATS is not set | 1688 | # CONFIG_SCHEDSTATS is not set |
| 1737 | # CONFIG_TIMER_STATS is not set | 1689 | # CONFIG_TIMER_STATS is not set |
| @@ -1750,6 +1702,7 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
| 1750 | CONFIG_DEBUG_INFO=y | 1702 | CONFIG_DEBUG_INFO=y |
| 1751 | # CONFIG_DEBUG_VM is not set | 1703 | # CONFIG_DEBUG_VM is not set |
| 1752 | # CONFIG_DEBUG_WRITECOUNT is not set | 1704 | # CONFIG_DEBUG_WRITECOUNT is not set |
| 1705 | CONFIG_DEBUG_MEMORY_INIT=y | ||
| 1753 | # CONFIG_DEBUG_LIST is not set | 1706 | # CONFIG_DEBUG_LIST is not set |
| 1754 | # CONFIG_DEBUG_SG is not set | 1707 | # CONFIG_DEBUG_SG is not set |
| 1755 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1708 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -1758,11 +1711,22 @@ CONFIG_DEBUG_INFO=y | |||
| 1758 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1711 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 1759 | # CONFIG_LKDTM is not set | 1712 | # CONFIG_LKDTM is not set |
| 1760 | # CONFIG_FAULT_INJECTION is not set | 1713 | # CONFIG_FAULT_INJECTION is not set |
| 1714 | # CONFIG_LATENCYTOP is not set | ||
| 1715 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1716 | CONFIG_HAVE_FTRACE=y | ||
| 1717 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1718 | # CONFIG_FTRACE is not set | ||
| 1719 | # CONFIG_SCHED_TRACER is not set | ||
| 1720 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1761 | # CONFIG_SAMPLES is not set | 1721 | # CONFIG_SAMPLES is not set |
| 1722 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1723 | # CONFIG_KGDB is not set | ||
| 1762 | CONFIG_DEBUG_STACKOVERFLOW=y | 1724 | CONFIG_DEBUG_STACKOVERFLOW=y |
| 1763 | CONFIG_DEBUG_STACK_USAGE=y | 1725 | CONFIG_DEBUG_STACK_USAGE=y |
| 1764 | # CONFIG_DEBUG_PAGEALLOC is not set | 1726 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1765 | # CONFIG_DEBUGGER is not set | 1727 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
| 1728 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
| 1729 | # CONFIG_XMON is not set | ||
| 1766 | # CONFIG_IRQSTACKS is not set | 1730 | # CONFIG_IRQSTACKS is not set |
| 1767 | # CONFIG_BDI_SWITCH is not set | 1731 | # CONFIG_BDI_SWITCH is not set |
| 1768 | CONFIG_BOOTX_TEXT=y | 1732 | CONFIG_BOOTX_TEXT=y |
| @@ -1776,7 +1740,6 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y | |||
| 1776 | CONFIG_SECURITY=y | 1740 | CONFIG_SECURITY=y |
| 1777 | CONFIG_SECURITY_NETWORK=y | 1741 | CONFIG_SECURITY_NETWORK=y |
| 1778 | # CONFIG_SECURITY_NETWORK_XFRM is not set | 1742 | # CONFIG_SECURITY_NETWORK_XFRM is not set |
| 1779 | CONFIG_SECURITY_CAPABILITIES=y | ||
| 1780 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1743 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1781 | CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0 | 1744 | CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0 |
| 1782 | CONFIG_SECURITY_SELINUX=y | 1745 | CONFIG_SECURITY_SELINUX=y |
| @@ -1835,6 +1798,10 @@ CONFIG_CRYPTO_CRC32C=m | |||
| 1835 | CONFIG_CRYPTO_MD4=m | 1798 | CONFIG_CRYPTO_MD4=m |
| 1836 | CONFIG_CRYPTO_MD5=y | 1799 | CONFIG_CRYPTO_MD5=y |
| 1837 | CONFIG_CRYPTO_MICHAEL_MIC=m | 1800 | CONFIG_CRYPTO_MICHAEL_MIC=m |
| 1801 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1802 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1803 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1804 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1838 | CONFIG_CRYPTO_SHA1=y | 1805 | CONFIG_CRYPTO_SHA1=y |
| 1839 | CONFIG_CRYPTO_SHA256=m | 1806 | CONFIG_CRYPTO_SHA256=m |
| 1840 | CONFIG_CRYPTO_SHA512=m | 1807 | CONFIG_CRYPTO_SHA512=m |
diff --git a/arch/powerpc/configs/chrp32_defconfig b/arch/powerpc/configs/chrp32_defconfig index 05360d4ef1b1..2e0ef8c18227 100644 --- a/arch/powerpc/configs/chrp32_defconfig +++ b/arch/powerpc/configs/chrp32_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.26-rc3 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Tue May 20 20:00:44 2008 | 4 | # Tue Aug 26 13:12:40 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -33,6 +33,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | 35 | CONFIG_STACKTRACE_SUPPORT=y |
| 36 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | 37 | CONFIG_LOCKDEP_SUPPORT=y |
| 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 38 | CONFIG_ARCH_HAS_ILOG2_U32=y | 39 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| @@ -90,7 +91,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 90 | CONFIG_SYSCTL=y | 91 | CONFIG_SYSCTL=y |
| 91 | # CONFIG_EMBEDDED is not set | 92 | # CONFIG_EMBEDDED is not set |
| 92 | CONFIG_SYSCTL_SYSCALL=y | 93 | CONFIG_SYSCTL_SYSCALL=y |
| 93 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 94 | CONFIG_KALLSYMS=y | 94 | CONFIG_KALLSYMS=y |
| 95 | # CONFIG_KALLSYMS_ALL is not set | 95 | # CONFIG_KALLSYMS_ALL is not set |
| 96 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 96 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -117,10 +117,16 @@ CONFIG_SLUB=y | |||
| 117 | # CONFIG_MARKERS is not set | 117 | # CONFIG_MARKERS is not set |
| 118 | CONFIG_HAVE_OPROFILE=y | 118 | CONFIG_HAVE_OPROFILE=y |
| 119 | # CONFIG_KPROBES is not set | 119 | # CONFIG_KPROBES is not set |
| 120 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 121 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 120 | CONFIG_HAVE_KPROBES=y | 122 | CONFIG_HAVE_KPROBES=y |
| 121 | CONFIG_HAVE_KRETPROBES=y | 123 | CONFIG_HAVE_KRETPROBES=y |
| 124 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 122 | # CONFIG_HAVE_DMA_ATTRS is not set | 125 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 126 | CONFIG_USE_GENERIC_SMP_HELPERS=y | ||
| 127 | # CONFIG_HAVE_CLK is not set | ||
| 123 | CONFIG_PROC_PAGE_MONITOR=y | 128 | CONFIG_PROC_PAGE_MONITOR=y |
| 129 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 124 | CONFIG_SLABINFO=y | 130 | CONFIG_SLABINFO=y |
| 125 | CONFIG_RT_MUTEXES=y | 131 | CONFIG_RT_MUTEXES=y |
| 126 | # CONFIG_TINY_SHMEM is not set | 132 | # CONFIG_TINY_SHMEM is not set |
| @@ -138,6 +144,7 @@ CONFIG_LBD=y | |||
| 138 | # CONFIG_BLK_DEV_IO_TRACE is not set | 144 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 139 | # CONFIG_LSF is not set | 145 | # CONFIG_LSF is not set |
| 140 | # CONFIG_BLK_DEV_BSG is not set | 146 | # CONFIG_BLK_DEV_BSG is not set |
| 147 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 141 | 148 | ||
| 142 | # | 149 | # |
| 143 | # IO Schedulers | 150 | # IO Schedulers |
| @@ -157,19 +164,18 @@ CONFIG_CLASSIC_RCU=y | |||
| 157 | # Platform support | 164 | # Platform support |
| 158 | # | 165 | # |
| 159 | CONFIG_PPC_MULTIPLATFORM=y | 166 | CONFIG_PPC_MULTIPLATFORM=y |
| 160 | # CONFIG_PPC_82xx is not set | ||
| 161 | # CONFIG_PPC_83xx is not set | ||
| 162 | # CONFIG_PPC_86xx is not set | ||
| 163 | CONFIG_CLASSIC32=y | 167 | CONFIG_CLASSIC32=y |
| 164 | CONFIG_PPC_CHRP=y | 168 | CONFIG_PPC_CHRP=y |
| 165 | # CONFIG_PPC_MPC512x is not set | ||
| 166 | # CONFIG_PPC_MPC5121 is not set | ||
| 167 | # CONFIG_MPC5121_ADS is not set | 169 | # CONFIG_MPC5121_ADS is not set |
| 170 | # CONFIG_MPC5121_GENERIC is not set | ||
| 168 | # CONFIG_PPC_MPC52xx is not set | 171 | # CONFIG_PPC_MPC52xx is not set |
| 169 | # CONFIG_PPC_PMAC is not set | 172 | # CONFIG_PPC_PMAC is not set |
| 170 | # CONFIG_PPC_CELL is not set | 173 | # CONFIG_PPC_CELL is not set |
| 171 | # CONFIG_PPC_CELL_NATIVE is not set | 174 | # CONFIG_PPC_CELL_NATIVE is not set |
| 175 | # CONFIG_PPC_82xx is not set | ||
| 172 | # CONFIG_PQ2ADS is not set | 176 | # CONFIG_PQ2ADS is not set |
| 177 | # CONFIG_PPC_83xx is not set | ||
| 178 | # CONFIG_PPC_86xx is not set | ||
| 173 | CONFIG_PPC_NATIVE=y | 179 | CONFIG_PPC_NATIVE=y |
| 174 | # CONFIG_UDBG_RTAS_CONSOLE is not set | 180 | # CONFIG_UDBG_RTAS_CONSOLE is not set |
| 175 | # CONFIG_IPIC is not set | 181 | # CONFIG_IPIC is not set |
| @@ -201,7 +207,7 @@ CONFIG_HZ_250=y | |||
| 201 | # CONFIG_HZ_300 is not set | 207 | # CONFIG_HZ_300 is not set |
| 202 | # CONFIG_HZ_1000 is not set | 208 | # CONFIG_HZ_1000 is not set |
| 203 | CONFIG_HZ=250 | 209 | CONFIG_HZ=250 |
| 204 | # CONFIG_SCHED_HRTICK is not set | 210 | CONFIG_SCHED_HRTICK=y |
| 205 | CONFIG_PREEMPT_NONE=y | 211 | CONFIG_PREEMPT_NONE=y |
| 206 | # CONFIG_PREEMPT_VOLUNTARY is not set | 212 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 207 | # CONFIG_PREEMPT is not set | 213 | # CONFIG_PREEMPT is not set |
| @@ -225,6 +231,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 225 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 231 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 226 | CONFIG_PAGEFLAGS_EXTENDED=y | 232 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 227 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 233 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 234 | # CONFIG_MIGRATION is not set | ||
| 228 | # CONFIG_RESOURCES_64BIT is not set | 235 | # CONFIG_RESOURCES_64BIT is not set |
| 229 | CONFIG_ZONE_DMA_FLAG=1 | 236 | CONFIG_ZONE_DMA_FLAG=1 |
| 230 | CONFIG_BOUNCE=y | 237 | CONFIG_BOUNCE=y |
| @@ -232,6 +239,7 @@ CONFIG_VIRT_TO_BUS=y | |||
| 232 | CONFIG_FORCE_MAX_ZONEORDER=11 | 239 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 233 | CONFIG_PROC_DEVICETREE=y | 240 | CONFIG_PROC_DEVICETREE=y |
| 234 | # CONFIG_CMDLINE_BOOL is not set | 241 | # CONFIG_CMDLINE_BOOL is not set |
| 242 | CONFIG_EXTRA_TARGETS="" | ||
| 235 | # CONFIG_PM is not set | 243 | # CONFIG_PM is not set |
| 236 | CONFIG_SECCOMP=y | 244 | CONFIG_SECCOMP=y |
| 237 | CONFIG_ISA_DMA_API=y | 245 | CONFIG_ISA_DMA_API=y |
| @@ -268,10 +276,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
| 268 | CONFIG_KERNEL_START=0xc0000000 | 276 | CONFIG_KERNEL_START=0xc0000000 |
| 269 | CONFIG_PHYSICAL_START=0x00000000 | 277 | CONFIG_PHYSICAL_START=0x00000000 |
| 270 | CONFIG_TASK_SIZE=0xc0000000 | 278 | CONFIG_TASK_SIZE=0xc0000000 |
| 271 | |||
| 272 | # | ||
| 273 | # Networking | ||
| 274 | # | ||
| 275 | CONFIG_NET=y | 279 | CONFIG_NET=y |
| 276 | 280 | ||
| 277 | # | 281 | # |
| @@ -398,7 +402,9 @@ CONFIG_NF_NAT_SIP=m | |||
| 398 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 402 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
| 399 | # CONFIG_STANDALONE is not set | 403 | # CONFIG_STANDALONE is not set |
| 400 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 404 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 401 | # CONFIG_FW_LOADER is not set | 405 | CONFIG_FW_LOADER=y |
| 406 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
| 407 | CONFIG_EXTRA_FIRMWARE="" | ||
| 402 | # CONFIG_DEBUG_DRIVER is not set | 408 | # CONFIG_DEBUG_DRIVER is not set |
| 403 | # CONFIG_DEBUG_DEVRES is not set | 409 | # CONFIG_DEBUG_DEVRES is not set |
| 404 | # CONFIG_SYS_HYPERVISOR is not set | 410 | # CONFIG_SYS_HYPERVISOR is not set |
| @@ -427,12 +433,14 @@ CONFIG_BLK_DEV_RAM_SIZE=4096 | |||
| 427 | # CONFIG_BLK_DEV_XIP is not set | 433 | # CONFIG_BLK_DEV_XIP is not set |
| 428 | # CONFIG_CDROM_PKTCDVD is not set | 434 | # CONFIG_CDROM_PKTCDVD is not set |
| 429 | # CONFIG_ATA_OVER_ETH is not set | 435 | # CONFIG_ATA_OVER_ETH is not set |
| 436 | # CONFIG_BLK_DEV_HD is not set | ||
| 430 | CONFIG_MISC_DEVICES=y | 437 | CONFIG_MISC_DEVICES=y |
| 431 | # CONFIG_PHANTOM is not set | 438 | # CONFIG_PHANTOM is not set |
| 432 | # CONFIG_EEPROM_93CX6 is not set | 439 | # CONFIG_EEPROM_93CX6 is not set |
| 433 | # CONFIG_SGI_IOC4 is not set | 440 | # CONFIG_SGI_IOC4 is not set |
| 434 | # CONFIG_TIFM_CORE is not set | 441 | # CONFIG_TIFM_CORE is not set |
| 435 | # CONFIG_ENCLOSURE_SERVICES is not set | 442 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 443 | # CONFIG_HP_ILO is not set | ||
| 436 | CONFIG_HAVE_IDE=y | 444 | CONFIG_HAVE_IDE=y |
| 437 | CONFIG_IDE=y | 445 | CONFIG_IDE=y |
| 438 | CONFIG_BLK_DEV_IDE=y | 446 | CONFIG_BLK_DEV_IDE=y |
| @@ -440,6 +448,7 @@ CONFIG_BLK_DEV_IDE=y | |||
| 440 | # | 448 | # |
| 441 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | 449 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
| 442 | # | 450 | # |
| 451 | CONFIG_IDE_TIMINGS=y | ||
| 443 | # CONFIG_BLK_DEV_IDE_SATA is not set | 452 | # CONFIG_BLK_DEV_IDE_SATA is not set |
| 444 | CONFIG_BLK_DEV_IDEDISK=y | 453 | CONFIG_BLK_DEV_IDEDISK=y |
| 445 | CONFIG_IDEDISK_MULTI_MODE=y | 454 | CONFIG_IDEDISK_MULTI_MODE=y |
| @@ -454,7 +463,6 @@ CONFIG_IDE_PROC_FS=y | |||
| 454 | # | 463 | # |
| 455 | # IDE chipset support/bugfixes | 464 | # IDE chipset support/bugfixes |
| 456 | # | 465 | # |
| 457 | CONFIG_IDE_GENERIC=y | ||
| 458 | # CONFIG_BLK_DEV_PLATFORM is not set | 466 | # CONFIG_BLK_DEV_PLATFORM is not set |
| 459 | CONFIG_BLK_DEV_IDEDMA_SFF=y | 467 | CONFIG_BLK_DEV_IDEDMA_SFF=y |
| 460 | 468 | ||
| @@ -472,10 +480,8 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
| 472 | # CONFIG_BLK_DEV_AMD74XX is not set | 480 | # CONFIG_BLK_DEV_AMD74XX is not set |
| 473 | # CONFIG_BLK_DEV_CMD64X is not set | 481 | # CONFIG_BLK_DEV_CMD64X is not set |
| 474 | # CONFIG_BLK_DEV_TRIFLEX is not set | 482 | # CONFIG_BLK_DEV_TRIFLEX is not set |
| 475 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
| 476 | # CONFIG_BLK_DEV_CS5520 is not set | 483 | # CONFIG_BLK_DEV_CS5520 is not set |
| 477 | # CONFIG_BLK_DEV_CS5530 is not set | 484 | # CONFIG_BLK_DEV_CS5530 is not set |
| 478 | # CONFIG_BLK_DEV_HPT34X is not set | ||
| 479 | # CONFIG_BLK_DEV_HPT366 is not set | 485 | # CONFIG_BLK_DEV_HPT366 is not set |
| 480 | # CONFIG_BLK_DEV_JMICRON is not set | 486 | # CONFIG_BLK_DEV_JMICRON is not set |
| 481 | # CONFIG_BLK_DEV_SC1200 is not set | 487 | # CONFIG_BLK_DEV_SC1200 is not set |
| @@ -493,8 +499,6 @@ CONFIG_BLK_DEV_SL82C105=y | |||
| 493 | CONFIG_BLK_DEV_VIA82CXXX=y | 499 | CONFIG_BLK_DEV_VIA82CXXX=y |
| 494 | # CONFIG_BLK_DEV_TC86C001 is not set | 500 | # CONFIG_BLK_DEV_TC86C001 is not set |
| 495 | CONFIG_BLK_DEV_IDEDMA=y | 501 | CONFIG_BLK_DEV_IDEDMA=y |
| 496 | # CONFIG_BLK_DEV_HD_ONLY is not set | ||
| 497 | # CONFIG_BLK_DEV_HD is not set | ||
| 498 | 502 | ||
| 499 | # | 503 | # |
| 500 | # SCSI device support | 504 | # SCSI device support |
| @@ -588,6 +592,7 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y | |||
| 588 | # CONFIG_SCSI_NSP32 is not set | 592 | # CONFIG_SCSI_NSP32 is not set |
| 589 | # CONFIG_SCSI_DEBUG is not set | 593 | # CONFIG_SCSI_DEBUG is not set |
| 590 | # CONFIG_SCSI_SRP is not set | 594 | # CONFIG_SCSI_SRP is not set |
| 595 | # CONFIG_SCSI_DH is not set | ||
| 591 | # CONFIG_ATA is not set | 596 | # CONFIG_ATA is not set |
| 592 | # CONFIG_MD is not set | 597 | # CONFIG_MD is not set |
| 593 | # CONFIG_FUSION is not set | 598 | # CONFIG_FUSION is not set |
| @@ -595,12 +600,15 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y | |||
| 595 | # | 600 | # |
| 596 | # IEEE 1394 (FireWire) support | 601 | # IEEE 1394 (FireWire) support |
| 597 | # | 602 | # |
| 603 | |||
| 604 | # | ||
| 605 | # Enable only one of the two stacks, unless you know what you are doing | ||
| 606 | # | ||
| 598 | # CONFIG_FIREWIRE is not set | 607 | # CONFIG_FIREWIRE is not set |
| 599 | # CONFIG_IEEE1394 is not set | 608 | # CONFIG_IEEE1394 is not set |
| 600 | # CONFIG_I2O is not set | 609 | # CONFIG_I2O is not set |
| 601 | # CONFIG_MACINTOSH_DRIVERS is not set | 610 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 602 | CONFIG_NETDEVICES=y | 611 | CONFIG_NETDEVICES=y |
| 603 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 604 | # CONFIG_DUMMY is not set | 612 | # CONFIG_DUMMY is not set |
| 605 | # CONFIG_BONDING is not set | 613 | # CONFIG_BONDING is not set |
| 606 | # CONFIG_MACVLAN is not set | 614 | # CONFIG_MACVLAN is not set |
| @@ -660,14 +668,12 @@ CONFIG_8139TOO=y | |||
| 660 | # CONFIG_TLAN is not set | 668 | # CONFIG_TLAN is not set |
| 661 | CONFIG_VIA_RHINE=y | 669 | CONFIG_VIA_RHINE=y |
| 662 | # CONFIG_VIA_RHINE_MMIO is not set | 670 | # CONFIG_VIA_RHINE_MMIO is not set |
| 663 | # CONFIG_VIA_RHINE_NAPI is not set | ||
| 664 | # CONFIG_SC92031 is not set | 671 | # CONFIG_SC92031 is not set |
| 665 | CONFIG_NETDEV_1000=y | 672 | CONFIG_NETDEV_1000=y |
| 666 | # CONFIG_ACENIC is not set | 673 | # CONFIG_ACENIC is not set |
| 667 | # CONFIG_DL2K is not set | 674 | # CONFIG_DL2K is not set |
| 668 | # CONFIG_E1000 is not set | 675 | # CONFIG_E1000 is not set |
| 669 | # CONFIG_E1000E is not set | 676 | # CONFIG_E1000E is not set |
| 670 | # CONFIG_E1000E_ENABLED is not set | ||
| 671 | # CONFIG_IP1000 is not set | 677 | # CONFIG_IP1000 is not set |
| 672 | # CONFIG_IGB is not set | 678 | # CONFIG_IGB is not set |
| 673 | # CONFIG_NS83820 is not set | 679 | # CONFIG_NS83820 is not set |
| @@ -683,6 +689,7 @@ CONFIG_NETDEV_1000=y | |||
| 683 | CONFIG_MV643XX_ETH=y | 689 | CONFIG_MV643XX_ETH=y |
| 684 | # CONFIG_QLA3XXX is not set | 690 | # CONFIG_QLA3XXX is not set |
| 685 | # CONFIG_ATL1 is not set | 691 | # CONFIG_ATL1 is not set |
| 692 | # CONFIG_ATL1E is not set | ||
| 686 | CONFIG_NETDEV_10000=y | 693 | CONFIG_NETDEV_10000=y |
| 687 | # CONFIG_CHELSIO_T1 is not set | 694 | # CONFIG_CHELSIO_T1 is not set |
| 688 | # CONFIG_CHELSIO_T3 is not set | 695 | # CONFIG_CHELSIO_T3 is not set |
| @@ -773,6 +780,7 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y | |||
| 773 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 780 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
| 774 | # CONFIG_MOUSE_SERIAL is not set | 781 | # CONFIG_MOUSE_SERIAL is not set |
| 775 | # CONFIG_MOUSE_APPLETOUCH is not set | 782 | # CONFIG_MOUSE_APPLETOUCH is not set |
| 783 | # CONFIG_MOUSE_BCM5974 is not set | ||
| 776 | # CONFIG_MOUSE_INPORT is not set | 784 | # CONFIG_MOUSE_INPORT is not set |
| 777 | # CONFIG_MOUSE_LOGIBM is not set | 785 | # CONFIG_MOUSE_LOGIBM is not set |
| 778 | # CONFIG_MOUSE_PC110PAD is not set | 786 | # CONFIG_MOUSE_PC110PAD is not set |
| @@ -798,12 +806,14 @@ CONFIG_SERIO_SERPORT=y | |||
| 798 | # CONFIG_SERIO_PCIPS2 is not set | 806 | # CONFIG_SERIO_PCIPS2 is not set |
| 799 | CONFIG_SERIO_LIBPS2=y | 807 | CONFIG_SERIO_LIBPS2=y |
| 800 | # CONFIG_SERIO_RAW is not set | 808 | # CONFIG_SERIO_RAW is not set |
| 809 | # CONFIG_SERIO_XILINX_XPS_PS2 is not set | ||
| 801 | # CONFIG_GAMEPORT is not set | 810 | # CONFIG_GAMEPORT is not set |
| 802 | 811 | ||
| 803 | # | 812 | # |
| 804 | # Character devices | 813 | # Character devices |
| 805 | # | 814 | # |
| 806 | CONFIG_VT=y | 815 | CONFIG_VT=y |
| 816 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 807 | CONFIG_VT_CONSOLE=y | 817 | CONFIG_VT_CONSOLE=y |
| 808 | CONFIG_HW_CONSOLE=y | 818 | CONFIG_HW_CONSOLE=y |
| 809 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 819 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| @@ -848,46 +858,71 @@ CONFIG_DEVPORT=y | |||
| 848 | CONFIG_I2C=y | 858 | CONFIG_I2C=y |
| 849 | CONFIG_I2C_BOARDINFO=y | 859 | CONFIG_I2C_BOARDINFO=y |
| 850 | # CONFIG_I2C_CHARDEV is not set | 860 | # CONFIG_I2C_CHARDEV is not set |
| 861 | CONFIG_I2C_HELPER_AUTO=y | ||
| 851 | CONFIG_I2C_ALGOBIT=y | 862 | CONFIG_I2C_ALGOBIT=y |
| 852 | 863 | ||
| 853 | # | 864 | # |
| 854 | # I2C Hardware Bus support | 865 | # I2C Hardware Bus support |
| 855 | # | 866 | # |
| 867 | |||
| 868 | # | ||
| 869 | # PC SMBus host controller drivers | ||
| 870 | # | ||
| 856 | # CONFIG_I2C_ALI1535 is not set | 871 | # CONFIG_I2C_ALI1535 is not set |
| 857 | # CONFIG_I2C_ALI1563 is not set | 872 | # CONFIG_I2C_ALI1563 is not set |
| 858 | # CONFIG_I2C_ALI15X3 is not set | 873 | # CONFIG_I2C_ALI15X3 is not set |
| 859 | # CONFIG_I2C_AMD756 is not set | 874 | # CONFIG_I2C_AMD756 is not set |
| 860 | # CONFIG_I2C_AMD8111 is not set | 875 | # CONFIG_I2C_AMD8111 is not set |
| 861 | # CONFIG_I2C_HYDRA is not set | ||
| 862 | # CONFIG_I2C_I801 is not set | 876 | # CONFIG_I2C_I801 is not set |
| 863 | # CONFIG_I2C_I810 is not set | 877 | # CONFIG_I2C_ISCH is not set |
| 864 | # CONFIG_I2C_PIIX4 is not set | 878 | # CONFIG_I2C_PIIX4 is not set |
| 865 | # CONFIG_I2C_MPC is not set | ||
| 866 | # CONFIG_I2C_NFORCE2 is not set | 879 | # CONFIG_I2C_NFORCE2 is not set |
| 867 | # CONFIG_I2C_OCORES is not set | ||
| 868 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 869 | # CONFIG_I2C_PROSAVAGE is not set | ||
| 870 | # CONFIG_I2C_SAVAGE4 is not set | ||
| 871 | # CONFIG_I2C_SIMTEC is not set | ||
| 872 | # CONFIG_I2C_SIS5595 is not set | 880 | # CONFIG_I2C_SIS5595 is not set |
| 873 | # CONFIG_I2C_SIS630 is not set | 881 | # CONFIG_I2C_SIS630 is not set |
| 874 | # CONFIG_I2C_SIS96X is not set | 882 | # CONFIG_I2C_SIS96X is not set |
| 875 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 876 | # CONFIG_I2C_STUB is not set | ||
| 877 | # CONFIG_I2C_TINY_USB is not set | ||
| 878 | # CONFIG_I2C_VIA is not set | 883 | # CONFIG_I2C_VIA is not set |
| 879 | # CONFIG_I2C_VIAPRO is not set | 884 | # CONFIG_I2C_VIAPRO is not set |
| 885 | |||
| 886 | # | ||
| 887 | # Mac SMBus host controller drivers | ||
| 888 | # | ||
| 889 | # CONFIG_I2C_HYDRA is not set | ||
| 890 | |||
| 891 | # | ||
| 892 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 893 | # | ||
| 894 | # CONFIG_I2C_MPC is not set | ||
| 895 | # CONFIG_I2C_OCORES is not set | ||
| 896 | # CONFIG_I2C_SIMTEC is not set | ||
| 897 | |||
| 898 | # | ||
| 899 | # External I2C/SMBus adapter drivers | ||
| 900 | # | ||
| 901 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 902 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 903 | # CONFIG_I2C_TINY_USB is not set | ||
| 904 | |||
| 905 | # | ||
| 906 | # Graphics adapter I2C/DDC channel drivers | ||
| 907 | # | ||
| 880 | # CONFIG_I2C_VOODOO3 is not set | 908 | # CONFIG_I2C_VOODOO3 is not set |
| 909 | |||
| 910 | # | ||
| 911 | # Other I2C/SMBus bus drivers | ||
| 912 | # | ||
| 881 | # CONFIG_I2C_PCA_ISA is not set | 913 | # CONFIG_I2C_PCA_ISA is not set |
| 882 | # CONFIG_I2C_PCA_PLATFORM is not set | 914 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 915 | # CONFIG_I2C_STUB is not set | ||
| 883 | 916 | ||
| 884 | # | 917 | # |
| 885 | # Miscellaneous I2C Chip support | 918 | # Miscellaneous I2C Chip support |
| 886 | # | 919 | # |
| 887 | # CONFIG_DS1682 is not set | 920 | # CONFIG_DS1682 is not set |
| 921 | # CONFIG_AT24 is not set | ||
| 888 | # CONFIG_SENSORS_EEPROM is not set | 922 | # CONFIG_SENSORS_EEPROM is not set |
| 889 | # CONFIG_SENSORS_PCF8574 is not set | 923 | # CONFIG_SENSORS_PCF8574 is not set |
| 890 | # CONFIG_PCF8575 is not set | 924 | # CONFIG_PCF8575 is not set |
| 925 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 891 | # CONFIG_SENSORS_PCF8591 is not set | 926 | # CONFIG_SENSORS_PCF8591 is not set |
| 892 | # CONFIG_SENSORS_MAX6875 is not set | 927 | # CONFIG_SENSORS_MAX6875 is not set |
| 893 | # CONFIG_SENSORS_TSL2550 is not set | 928 | # CONFIG_SENSORS_TSL2550 is not set |
| @@ -896,10 +931,13 @@ CONFIG_I2C_ALGOBIT=y | |||
| 896 | # CONFIG_I2C_DEBUG_BUS is not set | 931 | # CONFIG_I2C_DEBUG_BUS is not set |
| 897 | # CONFIG_I2C_DEBUG_CHIP is not set | 932 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 898 | # CONFIG_SPI is not set | 933 | # CONFIG_SPI is not set |
| 934 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 935 | # CONFIG_GPIOLIB is not set | ||
| 899 | # CONFIG_W1 is not set | 936 | # CONFIG_W1 is not set |
| 900 | # CONFIG_POWER_SUPPLY is not set | 937 | # CONFIG_POWER_SUPPLY is not set |
| 901 | # CONFIG_HWMON is not set | 938 | # CONFIG_HWMON is not set |
| 902 | # CONFIG_THERMAL is not set | 939 | # CONFIG_THERMAL is not set |
| 940 | # CONFIG_THERMAL_HWMON is not set | ||
| 903 | # CONFIG_WATCHDOG is not set | 941 | # CONFIG_WATCHDOG is not set |
| 904 | 942 | ||
| 905 | # | 943 | # |
| @@ -911,8 +949,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 911 | # | 949 | # |
| 912 | # Multifunction device drivers | 950 | # Multifunction device drivers |
| 913 | # | 951 | # |
| 952 | # CONFIG_MFD_CORE is not set | ||
| 914 | # CONFIG_MFD_SM501 is not set | 953 | # CONFIG_MFD_SM501 is not set |
| 915 | # CONFIG_HTC_PASIC3 is not set | 954 | # CONFIG_HTC_PASIC3 is not set |
| 955 | # CONFIG_MFD_TMIO is not set | ||
| 916 | 956 | ||
| 917 | # | 957 | # |
| 918 | # Multimedia devices | 958 | # Multimedia devices |
| @@ -997,10 +1037,13 @@ CONFIG_FB_3DFX=y | |||
| 997 | # CONFIG_FB_TRIDENT is not set | 1037 | # CONFIG_FB_TRIDENT is not set |
| 998 | # CONFIG_FB_ARK is not set | 1038 | # CONFIG_FB_ARK is not set |
| 999 | # CONFIG_FB_PM3 is not set | 1039 | # CONFIG_FB_PM3 is not set |
| 1040 | # CONFIG_FB_CARMINE is not set | ||
| 1000 | # CONFIG_FB_IBM_GXT4500 is not set | 1041 | # CONFIG_FB_IBM_GXT4500 is not set |
| 1001 | # CONFIG_FB_VIRTUAL is not set | 1042 | # CONFIG_FB_VIRTUAL is not set |
| 1002 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | 1043 | CONFIG_BACKLIGHT_LCD_SUPPORT=y |
| 1003 | CONFIG_LCD_CLASS_DEVICE=m | 1044 | CONFIG_LCD_CLASS_DEVICE=m |
| 1045 | # CONFIG_LCD_ILI9320 is not set | ||
| 1046 | # CONFIG_LCD_PLATFORM is not set | ||
| 1004 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | 1047 | CONFIG_BACKLIGHT_CLASS_DEVICE=y |
| 1005 | # CONFIG_BACKLIGHT_CORGI is not set | 1048 | # CONFIG_BACKLIGHT_CORGI is not set |
| 1006 | 1049 | ||
| @@ -1030,10 +1073,6 @@ CONFIG_LOGO=y | |||
| 1030 | CONFIG_LOGO_LINUX_MONO=y | 1073 | CONFIG_LOGO_LINUX_MONO=y |
| 1031 | CONFIG_LOGO_LINUX_VGA16=y | 1074 | CONFIG_LOGO_LINUX_VGA16=y |
| 1032 | CONFIG_LOGO_LINUX_CLUT224=y | 1075 | CONFIG_LOGO_LINUX_CLUT224=y |
| 1033 | |||
| 1034 | # | ||
| 1035 | # Sound | ||
| 1036 | # | ||
| 1037 | # CONFIG_SOUND is not set | 1076 | # CONFIG_SOUND is not set |
| 1038 | CONFIG_HID_SUPPORT=y | 1077 | CONFIG_HID_SUPPORT=y |
| 1039 | CONFIG_HID=y | 1078 | CONFIG_HID=y |
| @@ -1062,6 +1101,7 @@ CONFIG_USB_DEVICEFS=y | |||
| 1062 | CONFIG_USB_DEVICE_CLASS=y | 1101 | CONFIG_USB_DEVICE_CLASS=y |
| 1063 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1102 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 1064 | # CONFIG_USB_OTG is not set | 1103 | # CONFIG_USB_OTG is not set |
| 1104 | CONFIG_USB_MON=y | ||
| 1065 | 1105 | ||
| 1066 | # | 1106 | # |
| 1067 | # USB Host Controller Drivers | 1107 | # USB Host Controller Drivers |
| @@ -1087,6 +1127,7 @@ CONFIG_USB_UHCI_HCD=y | |||
| 1087 | # | 1127 | # |
| 1088 | # CONFIG_USB_ACM is not set | 1128 | # CONFIG_USB_ACM is not set |
| 1089 | # CONFIG_USB_PRINTER is not set | 1129 | # CONFIG_USB_PRINTER is not set |
| 1130 | # CONFIG_USB_WDM is not set | ||
| 1090 | 1131 | ||
| 1091 | # | 1132 | # |
| 1092 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1133 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -1108,6 +1149,7 @@ CONFIG_USB_STORAGE=m | |||
| 1108 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1149 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1109 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1150 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
| 1110 | # CONFIG_USB_STORAGE_KARMA is not set | 1151 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1152 | # CONFIG_USB_STORAGE_SIERRA is not set | ||
| 1111 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | 1153 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
| 1112 | # CONFIG_USB_LIBUSUAL is not set | 1154 | # CONFIG_USB_LIBUSUAL is not set |
| 1113 | 1155 | ||
| @@ -1116,7 +1158,6 @@ CONFIG_USB_STORAGE=m | |||
| 1116 | # | 1158 | # |
| 1117 | # CONFIG_USB_MDC800 is not set | 1159 | # CONFIG_USB_MDC800 is not set |
| 1118 | # CONFIG_USB_MICROTEK is not set | 1160 | # CONFIG_USB_MICROTEK is not set |
| 1119 | CONFIG_USB_MON=y | ||
| 1120 | 1161 | ||
| 1121 | # | 1162 | # |
| 1122 | # USB port drivers | 1163 | # USB port drivers |
| @@ -1129,7 +1170,6 @@ CONFIG_USB_MON=y | |||
| 1129 | # CONFIG_USB_EMI62 is not set | 1170 | # CONFIG_USB_EMI62 is not set |
| 1130 | # CONFIG_USB_EMI26 is not set | 1171 | # CONFIG_USB_EMI26 is not set |
| 1131 | # CONFIG_USB_ADUTUX is not set | 1172 | # CONFIG_USB_ADUTUX is not set |
| 1132 | # CONFIG_USB_AUERSWALD is not set | ||
| 1133 | # CONFIG_USB_RIO500 is not set | 1173 | # CONFIG_USB_RIO500 is not set |
| 1134 | # CONFIG_USB_LEGOTOWER is not set | 1174 | # CONFIG_USB_LEGOTOWER is not set |
| 1135 | # CONFIG_USB_LCD is not set | 1175 | # CONFIG_USB_LCD is not set |
| @@ -1146,6 +1186,7 @@ CONFIG_USB_MON=y | |||
| 1146 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1186 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 1147 | # CONFIG_USB_IOWARRIOR is not set | 1187 | # CONFIG_USB_IOWARRIOR is not set |
| 1148 | # CONFIG_USB_TEST is not set | 1188 | # CONFIG_USB_TEST is not set |
| 1189 | # CONFIG_USB_ISIGHTFW is not set | ||
| 1149 | # CONFIG_USB_GADGET is not set | 1190 | # CONFIG_USB_GADGET is not set |
| 1150 | # CONFIG_MMC is not set | 1191 | # CONFIG_MMC is not set |
| 1151 | # CONFIG_MEMSTICK is not set | 1192 | # CONFIG_MEMSTICK is not set |
| @@ -1226,6 +1267,7 @@ CONFIG_TMPFS=y | |||
| 1226 | # CONFIG_CRAMFS is not set | 1267 | # CONFIG_CRAMFS is not set |
| 1227 | # CONFIG_VXFS_FS is not set | 1268 | # CONFIG_VXFS_FS is not set |
| 1228 | # CONFIG_MINIX_FS is not set | 1269 | # CONFIG_MINIX_FS is not set |
| 1270 | # CONFIG_OMFS_FS is not set | ||
| 1229 | # CONFIG_HPFS_FS is not set | 1271 | # CONFIG_HPFS_FS is not set |
| 1230 | # CONFIG_QNX4FS_FS is not set | 1272 | # CONFIG_QNX4FS_FS is not set |
| 1231 | # CONFIG_ROMFS_FS is not set | 1273 | # CONFIG_ROMFS_FS is not set |
| @@ -1310,6 +1352,7 @@ CONFIG_BITREVERSE=y | |||
| 1310 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1352 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 1311 | CONFIG_CRC_CCITT=m | 1353 | CONFIG_CRC_CCITT=m |
| 1312 | # CONFIG_CRC16 is not set | 1354 | # CONFIG_CRC16 is not set |
| 1355 | CONFIG_CRC_T10DIF=y | ||
| 1313 | # CONFIG_CRC_ITU_T is not set | 1356 | # CONFIG_CRC_ITU_T is not set |
| 1314 | CONFIG_CRC32=y | 1357 | CONFIG_CRC32=y |
| 1315 | # CONFIG_CRC7 is not set | 1358 | # CONFIG_CRC7 is not set |
| @@ -1336,6 +1379,8 @@ CONFIG_MAGIC_SYSRQ=y | |||
| 1336 | CONFIG_DEBUG_KERNEL=y | 1379 | CONFIG_DEBUG_KERNEL=y |
| 1337 | # CONFIG_DEBUG_SHIRQ is not set | 1380 | # CONFIG_DEBUG_SHIRQ is not set |
| 1338 | CONFIG_DETECT_SOFTLOCKUP=y | 1381 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1382 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 1383 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 1339 | CONFIG_SCHED_DEBUG=y | 1384 | CONFIG_SCHED_DEBUG=y |
| 1340 | # CONFIG_SCHEDSTATS is not set | 1385 | # CONFIG_SCHEDSTATS is not set |
| 1341 | # CONFIG_TIMER_STATS is not set | 1386 | # CONFIG_TIMER_STATS is not set |
| @@ -1354,20 +1399,32 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
| 1354 | # CONFIG_DEBUG_INFO is not set | 1399 | # CONFIG_DEBUG_INFO is not set |
| 1355 | # CONFIG_DEBUG_VM is not set | 1400 | # CONFIG_DEBUG_VM is not set |
| 1356 | # CONFIG_DEBUG_WRITECOUNT is not set | 1401 | # CONFIG_DEBUG_WRITECOUNT is not set |
| 1402 | CONFIG_DEBUG_MEMORY_INIT=y | ||
| 1357 | # CONFIG_DEBUG_LIST is not set | 1403 | # CONFIG_DEBUG_LIST is not set |
| 1358 | # CONFIG_DEBUG_SG is not set | 1404 | # CONFIG_DEBUG_SG is not set |
| 1359 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1405 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 1360 | # CONFIG_RCU_TORTURE_TEST is not set | 1406 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1361 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1407 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 1362 | # CONFIG_FAULT_INJECTION is not set | 1408 | # CONFIG_FAULT_INJECTION is not set |
| 1409 | # CONFIG_LATENCYTOP is not set | ||
| 1410 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1411 | CONFIG_HAVE_FTRACE=y | ||
| 1412 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1413 | # CONFIG_FTRACE is not set | ||
| 1414 | # CONFIG_SCHED_TRACER is not set | ||
| 1415 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1363 | # CONFIG_SAMPLES is not set | 1416 | # CONFIG_SAMPLES is not set |
| 1417 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1418 | # CONFIG_KGDB is not set | ||
| 1364 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1419 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
| 1365 | # CONFIG_DEBUG_STACK_USAGE is not set | 1420 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1366 | # CONFIG_DEBUG_PAGEALLOC is not set | 1421 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1367 | CONFIG_DEBUGGER=y | 1422 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
| 1423 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
| 1368 | CONFIG_XMON=y | 1424 | CONFIG_XMON=y |
| 1369 | CONFIG_XMON_DEFAULT=y | 1425 | CONFIG_XMON_DEFAULT=y |
| 1370 | CONFIG_XMON_DISASSEMBLY=y | 1426 | CONFIG_XMON_DISASSEMBLY=y |
| 1427 | CONFIG_DEBUGGER=y | ||
| 1371 | CONFIG_IRQSTACKS=y | 1428 | CONFIG_IRQSTACKS=y |
| 1372 | # CONFIG_BDI_SWITCH is not set | 1429 | # CONFIG_BDI_SWITCH is not set |
| 1373 | # CONFIG_BOOTX_TEXT is not set | 1430 | # CONFIG_BOOTX_TEXT is not set |
| @@ -1424,6 +1481,10 @@ CONFIG_CRYPTO_PCBC=m | |||
| 1424 | # CONFIG_CRYPTO_MD4 is not set | 1481 | # CONFIG_CRYPTO_MD4 is not set |
| 1425 | # CONFIG_CRYPTO_MD5 is not set | 1482 | # CONFIG_CRYPTO_MD5 is not set |
| 1426 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1483 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 1484 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1485 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1486 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1487 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1427 | CONFIG_CRYPTO_SHA1=m | 1488 | CONFIG_CRYPTO_SHA1=m |
| 1428 | # CONFIG_CRYPTO_SHA256 is not set | 1489 | # CONFIG_CRYPTO_SHA256 is not set |
| 1429 | # CONFIG_CRYPTO_SHA512 is not set | 1490 | # CONFIG_CRYPTO_SHA512 is not set |
diff --git a/arch/powerpc/configs/ep8248e_defconfig b/arch/powerpc/configs/ep8248e_defconfig index ba2a463b9305..ef0c6e800508 100644 --- a/arch/powerpc/configs/ep8248e_defconfig +++ b/arch/powerpc/configs/ep8248e_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.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Mon Jun 9 08:52:09 2008 | 4 | # Thu Aug 21 00:52:03 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -15,6 +15,7 @@ CONFIG_6xx=y | |||
| 15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
| 16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
| 17 | CONFIG_PPC_FPU=y | 17 | CONFIG_PPC_FPU=y |
| 18 | # CONFIG_ALTIVEC is not set | ||
| 18 | CONFIG_PPC_STD_MMU=y | 19 | CONFIG_PPC_STD_MMU=y |
| 19 | CONFIG_PPC_STD_MMU_32=y | 20 | CONFIG_PPC_STD_MMU_32=y |
| 20 | # CONFIG_PPC_MM_SLICES is not set | 21 | # CONFIG_PPC_MM_SLICES is not set |
| @@ -31,12 +32,14 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 31 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 32 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 33 | CONFIG_STACKTRACE_SUPPORT=y | 34 | CONFIG_STACKTRACE_SUPPORT=y |
| 35 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 34 | CONFIG_LOCKDEP_SUPPORT=y | 36 | CONFIG_LOCKDEP_SUPPORT=y |
| 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
| 38 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 40 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 39 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 41 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 42 | CONFIG_GENERIC_GPIO=y | ||
| 40 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 43 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
| 41 | CONFIG_PPC=y | 44 | CONFIG_PPC=y |
| 42 | CONFIG_EARLY_PRINTK=y | 45 | CONFIG_EARLY_PRINTK=y |
| @@ -45,11 +48,13 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | |||
| 45 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 48 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
| 46 | CONFIG_PPC_OF=y | 49 | CONFIG_PPC_OF=y |
| 47 | CONFIG_OF=y | 50 | CONFIG_OF=y |
| 48 | # CONFIG_PPC_UDBG_16550 is not set | 51 | CONFIG_PPC_UDBG_16550=y |
| 49 | # CONFIG_GENERIC_TBSYNC is not set | 52 | # CONFIG_GENERIC_TBSYNC is not set |
| 50 | CONFIG_AUDIT_ARCH=y | 53 | CONFIG_AUDIT_ARCH=y |
| 51 | CONFIG_GENERIC_BUG=y | 54 | CONFIG_GENERIC_BUG=y |
| 52 | # CONFIG_DEFAULT_UIMAGE is not set | 55 | # CONFIG_DEFAULT_UIMAGE is not set |
| 56 | CONFIG_HIBERNATE_32=y | ||
| 57 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
| 53 | # CONFIG_PPC_DCR_NATIVE is not set | 58 | # CONFIG_PPC_DCR_NATIVE is not set |
| 54 | # CONFIG_PPC_DCR_MMIO is not set | 59 | # CONFIG_PPC_DCR_MMIO is not set |
| 55 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 60 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| @@ -81,7 +86,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y | |||
| 81 | CONFIG_SYSCTL=y | 86 | CONFIG_SYSCTL=y |
| 82 | CONFIG_EMBEDDED=y | 87 | CONFIG_EMBEDDED=y |
| 83 | CONFIG_SYSCTL_SYSCALL=y | 88 | CONFIG_SYSCTL_SYSCALL=y |
| 84 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 85 | CONFIG_KALLSYMS=y | 89 | CONFIG_KALLSYMS=y |
| 86 | CONFIG_KALLSYMS_ALL=y | 90 | CONFIG_KALLSYMS_ALL=y |
| 87 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 91 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -89,6 +93,7 @@ CONFIG_HOTPLUG=y | |||
| 89 | CONFIG_PRINTK=y | 93 | CONFIG_PRINTK=y |
| 90 | CONFIG_BUG=y | 94 | CONFIG_BUG=y |
| 91 | CONFIG_ELF_CORE=y | 95 | CONFIG_ELF_CORE=y |
| 96 | CONFIG_PCSPKR_PLATFORM=y | ||
| 92 | CONFIG_COMPAT_BRK=y | 97 | CONFIG_COMPAT_BRK=y |
| 93 | CONFIG_BASE_FULL=y | 98 | CONFIG_BASE_FULL=y |
| 94 | CONFIG_FUTEX=y | 99 | CONFIG_FUTEX=y |
| @@ -105,10 +110,16 @@ CONFIG_SLAB=y | |||
| 105 | # CONFIG_PROFILING is not set | 110 | # CONFIG_PROFILING is not set |
| 106 | # CONFIG_MARKERS is not set | 111 | # CONFIG_MARKERS is not set |
| 107 | CONFIG_HAVE_OPROFILE=y | 112 | CONFIG_HAVE_OPROFILE=y |
| 113 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 114 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 108 | CONFIG_HAVE_KPROBES=y | 115 | CONFIG_HAVE_KPROBES=y |
| 109 | CONFIG_HAVE_KRETPROBES=y | 116 | CONFIG_HAVE_KRETPROBES=y |
| 117 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 110 | # CONFIG_HAVE_DMA_ATTRS is not set | 118 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 119 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 120 | CONFIG_HAVE_CLK=y | ||
| 111 | CONFIG_PROC_PAGE_MONITOR=y | 121 | CONFIG_PROC_PAGE_MONITOR=y |
| 122 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 112 | CONFIG_SLABINFO=y | 123 | CONFIG_SLABINFO=y |
| 113 | CONFIG_RT_MUTEXES=y | 124 | CONFIG_RT_MUTEXES=y |
| 114 | # CONFIG_TINY_SHMEM is not set | 125 | # CONFIG_TINY_SHMEM is not set |
| @@ -118,6 +129,7 @@ CONFIG_BLOCK=y | |||
| 118 | # CONFIG_LBD is not set | 129 | # CONFIG_LBD is not set |
| 119 | # CONFIG_BLK_DEV_IO_TRACE is not set | 130 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 120 | # CONFIG_LSF is not set | 131 | # CONFIG_LSF is not set |
| 132 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 121 | 133 | ||
| 122 | # | 134 | # |
| 123 | # IO Schedulers | 135 | # IO Schedulers |
| @@ -136,33 +148,43 @@ CONFIG_CLASSIC_RCU=y | |||
| 136 | # | 148 | # |
| 137 | # Platform support | 149 | # Platform support |
| 138 | # | 150 | # |
| 139 | # CONFIG_PPC_MULTIPLATFORM is not set | 151 | CONFIG_PPC_MULTIPLATFORM=y |
| 140 | CONFIG_PPC_82xx=y | 152 | CONFIG_CLASSIC32=y |
| 141 | # CONFIG_PPC_83xx is not set | 153 | CONFIG_PPC_CHRP=y |
| 142 | # CONFIG_PPC_86xx is not set | 154 | # CONFIG_MPC5121_ADS is not set |
| 143 | # CONFIG_PPC_MPC512x is not set | 155 | # CONFIG_MPC5121_GENERIC is not set |
| 144 | # CONFIG_PPC_MPC5121 is not set | 156 | # CONFIG_PPC_MPC52xx is not set |
| 157 | CONFIG_PPC_PMAC=y | ||
| 145 | # CONFIG_PPC_CELL is not set | 158 | # CONFIG_PPC_CELL is not set |
| 146 | # CONFIG_PPC_CELL_NATIVE is not set | 159 | # CONFIG_PPC_CELL_NATIVE is not set |
| 160 | CONFIG_PPC_82xx=y | ||
| 147 | # CONFIG_MPC8272_ADS is not set | 161 | # CONFIG_MPC8272_ADS is not set |
| 148 | # CONFIG_PQ2FADS is not set | 162 | # CONFIG_PQ2FADS is not set |
| 149 | CONFIG_EP8248E=y | 163 | CONFIG_EP8248E=y |
| 150 | # CONFIG_PQ2ADS is not set | 164 | # CONFIG_PQ2ADS is not set |
| 151 | CONFIG_8260=y | 165 | CONFIG_8260=y |
| 152 | CONFIG_8272=y | 166 | CONFIG_8272=y |
| 167 | # CONFIG_PPC_83xx is not set | ||
| 168 | # CONFIG_PPC_86xx is not set | ||
| 169 | # CONFIG_EMBEDDED6xx is not set | ||
| 170 | CONFIG_PPC_NATIVE=y | ||
| 171 | # CONFIG_UDBG_RTAS_CONSOLE is not set | ||
| 153 | # CONFIG_IPIC is not set | 172 | # CONFIG_IPIC is not set |
| 154 | # CONFIG_MPIC is not set | 173 | CONFIG_MPIC=y |
| 155 | # CONFIG_MPIC_WEIRD is not set | 174 | # CONFIG_MPIC_WEIRD is not set |
| 156 | # CONFIG_PPC_I8259 is not set | 175 | CONFIG_PPC_I8259=y |
| 157 | # CONFIG_PPC_RTAS is not set | 176 | CONFIG_PPC_RTAS=y |
| 177 | # CONFIG_RTAS_ERROR_LOGGING is not set | ||
| 178 | CONFIG_RTAS_PROC=y | ||
| 158 | # CONFIG_MMIO_NVRAM is not set | 179 | # CONFIG_MMIO_NVRAM is not set |
| 159 | # CONFIG_PPC_MPC106 is not set | 180 | CONFIG_PPC_MPC106=y |
| 160 | # CONFIG_PPC_970_NAP is not set | 181 | # CONFIG_PPC_970_NAP is not set |
| 161 | # CONFIG_PPC_INDIRECT_IO is not set | 182 | # CONFIG_PPC_INDIRECT_IO is not set |
| 162 | # CONFIG_GENERIC_IOMAP is not set | 183 | # CONFIG_GENERIC_IOMAP is not set |
| 163 | # CONFIG_CPU_FREQ is not set | 184 | # CONFIG_CPU_FREQ is not set |
| 185 | # CONFIG_PPC601_SYNC_FIX is not set | ||
| 186 | # CONFIG_TAU is not set | ||
| 164 | CONFIG_CPM2=y | 187 | CONFIG_CPM2=y |
| 165 | CONFIG_PPC_CPM_NEW_BINDING=y | ||
| 166 | # CONFIG_FSL_ULI1575 is not set | 188 | # CONFIG_FSL_ULI1575 is not set |
| 167 | CONFIG_CPM=y | 189 | CONFIG_CPM=y |
| 168 | 190 | ||
| @@ -197,6 +219,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 197 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 219 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 198 | CONFIG_PAGEFLAGS_EXTENDED=y | 220 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 199 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 221 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 222 | CONFIG_MIGRATION=y | ||
| 200 | # CONFIG_RESOURCES_64BIT is not set | 223 | # CONFIG_RESOURCES_64BIT is not set |
| 201 | CONFIG_ZONE_DMA_FLAG=1 | 224 | CONFIG_ZONE_DMA_FLAG=1 |
| 202 | CONFIG_BOUNCE=y | 225 | CONFIG_BOUNCE=y |
| @@ -204,6 +227,7 @@ CONFIG_VIRT_TO_BUS=y | |||
| 204 | CONFIG_FORCE_MAX_ZONEORDER=11 | 227 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 205 | CONFIG_PROC_DEVICETREE=y | 228 | CONFIG_PROC_DEVICETREE=y |
| 206 | # CONFIG_CMDLINE_BOOL is not set | 229 | # CONFIG_CMDLINE_BOOL is not set |
| 230 | CONFIG_EXTRA_TARGETS="" | ||
| 207 | # CONFIG_PM is not set | 231 | # CONFIG_PM is not set |
| 208 | # CONFIG_SECCOMP is not set | 232 | # CONFIG_SECCOMP is not set |
| 209 | CONFIG_ISA_DMA_API=y | 233 | CONFIG_ISA_DMA_API=y |
| @@ -211,13 +235,22 @@ CONFIG_ISA_DMA_API=y | |||
| 211 | # | 235 | # |
| 212 | # Bus options | 236 | # Bus options |
| 213 | # | 237 | # |
| 238 | # CONFIG_ISA is not set | ||
| 214 | CONFIG_ZONE_DMA=y | 239 | CONFIG_ZONE_DMA=y |
| 240 | CONFIG_PPC_INDIRECT_PCI=y | ||
| 215 | CONFIG_FSL_SOC=y | 241 | CONFIG_FSL_SOC=y |
| 216 | # CONFIG_PCI is not set | 242 | CONFIG_PPC_PCI_CHOICE=y |
| 217 | # CONFIG_PCI_DOMAINS is not set | 243 | CONFIG_PCI=y |
| 218 | # CONFIG_PCI_SYSCALL is not set | 244 | CONFIG_PCI_DOMAINS=y |
| 219 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 245 | CONFIG_PCI_SYSCALL=y |
| 246 | CONFIG_PCI_8260=y | ||
| 247 | # CONFIG_PCIEPORTBUS is not set | ||
| 248 | CONFIG_ARCH_SUPPORTS_MSI=y | ||
| 249 | # CONFIG_PCI_MSI is not set | ||
| 250 | CONFIG_PCI_LEGACY=y | ||
| 251 | # CONFIG_PCI_DEBUG is not set | ||
| 220 | # CONFIG_PCCARD is not set | 252 | # CONFIG_PCCARD is not set |
| 253 | # CONFIG_HOTPLUG_PCI is not set | ||
| 221 | # CONFIG_HAS_RAPIDIO is not set | 254 | # CONFIG_HAS_RAPIDIO is not set |
| 222 | 255 | ||
| 223 | # | 256 | # |
| @@ -233,10 +266,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
| 233 | CONFIG_KERNEL_START=0xc0000000 | 266 | CONFIG_KERNEL_START=0xc0000000 |
| 234 | CONFIG_PHYSICAL_START=0x00000000 | 267 | CONFIG_PHYSICAL_START=0x00000000 |
| 235 | CONFIG_TASK_SIZE=0xc0000000 | 268 | CONFIG_TASK_SIZE=0xc0000000 |
| 236 | |||
| 237 | # | ||
| 238 | # Networking | ||
| 239 | # | ||
| 240 | CONFIG_NET=y | 269 | CONFIG_NET=y |
| 241 | 270 | ||
| 242 | # | 271 | # |
| @@ -410,11 +439,13 @@ CONFIG_MTD_CFI_UTIL=y | |||
| 410 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | 439 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set |
| 411 | # CONFIG_MTD_PHYSMAP is not set | 440 | # CONFIG_MTD_PHYSMAP is not set |
| 412 | CONFIG_MTD_PHYSMAP_OF=y | 441 | CONFIG_MTD_PHYSMAP_OF=y |
| 442 | # CONFIG_MTD_INTEL_VR_NOR is not set | ||
| 413 | # CONFIG_MTD_PLATRAM is not set | 443 | # CONFIG_MTD_PLATRAM is not set |
| 414 | 444 | ||
| 415 | # | 445 | # |
| 416 | # Self-contained MTD device drivers | 446 | # Self-contained MTD device drivers |
| 417 | # | 447 | # |
| 448 | # CONFIG_MTD_PMC551 is not set | ||
| 418 | # CONFIG_MTD_SLRAM is not set | 449 | # CONFIG_MTD_SLRAM is not set |
| 419 | # CONFIG_MTD_PHRAM is not set | 450 | # CONFIG_MTD_PHRAM is not set |
| 420 | # CONFIG_MTD_MTDRAM is not set | 451 | # CONFIG_MTD_MTDRAM is not set |
| @@ -434,16 +465,23 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
| 434 | # | 465 | # |
| 435 | # CONFIG_MTD_UBI is not set | 466 | # CONFIG_MTD_UBI is not set |
| 436 | CONFIG_OF_DEVICE=y | 467 | CONFIG_OF_DEVICE=y |
| 468 | CONFIG_OF_GPIO=y | ||
| 437 | # CONFIG_PARPORT is not set | 469 | # CONFIG_PARPORT is not set |
| 438 | CONFIG_BLK_DEV=y | 470 | CONFIG_BLK_DEV=y |
| 439 | # CONFIG_BLK_DEV_FD is not set | 471 | # CONFIG_BLK_DEV_FD is not set |
| 472 | # CONFIG_MAC_FLOPPY is not set | ||
| 473 | # CONFIG_BLK_CPQ_DA is not set | ||
| 474 | # CONFIG_BLK_CPQ_CISS_DA is not set | ||
| 475 | # CONFIG_BLK_DEV_DAC960 is not set | ||
| 440 | # CONFIG_BLK_DEV_COW_COMMON is not set | 476 | # CONFIG_BLK_DEV_COW_COMMON is not set |
| 441 | CONFIG_BLK_DEV_LOOP=y | 477 | CONFIG_BLK_DEV_LOOP=y |
| 442 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 478 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set |
| 443 | # CONFIG_BLK_DEV_NBD is not set | 479 | # CONFIG_BLK_DEV_NBD is not set |
| 480 | # CONFIG_BLK_DEV_SX8 is not set | ||
| 444 | # CONFIG_BLK_DEV_RAM is not set | 481 | # CONFIG_BLK_DEV_RAM is not set |
| 445 | # CONFIG_CDROM_PKTCDVD is not set | 482 | # CONFIG_CDROM_PKTCDVD is not set |
| 446 | # CONFIG_ATA_OVER_ETH is not set | 483 | # CONFIG_ATA_OVER_ETH is not set |
| 484 | # CONFIG_BLK_DEV_HD is not set | ||
| 447 | # CONFIG_MISC_DEVICES is not set | 485 | # CONFIG_MISC_DEVICES is not set |
| 448 | CONFIG_HAVE_IDE=y | 486 | CONFIG_HAVE_IDE=y |
| 449 | # CONFIG_IDE is not set | 487 | # CONFIG_IDE is not set |
| @@ -457,14 +495,25 @@ CONFIG_HAVE_IDE=y | |||
| 457 | # CONFIG_SCSI_NETLINK is not set | 495 | # CONFIG_SCSI_NETLINK is not set |
| 458 | # CONFIG_ATA is not set | 496 | # CONFIG_ATA is not set |
| 459 | # CONFIG_MD is not set | 497 | # CONFIG_MD is not set |
| 498 | # CONFIG_FUSION is not set | ||
| 499 | |||
| 500 | # | ||
| 501 | # IEEE 1394 (FireWire) support | ||
| 502 | # | ||
| 503 | |||
| 504 | # | ||
| 505 | # A new alternative FireWire stack is available with EXPERIMENTAL=y | ||
| 506 | # | ||
| 507 | # CONFIG_IEEE1394 is not set | ||
| 508 | # CONFIG_I2O is not set | ||
| 460 | # CONFIG_MACINTOSH_DRIVERS is not set | 509 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 461 | CONFIG_NETDEVICES=y | 510 | CONFIG_NETDEVICES=y |
| 462 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 463 | # CONFIG_DUMMY is not set | 511 | # CONFIG_DUMMY is not set |
| 464 | # CONFIG_BONDING is not set | 512 | # CONFIG_BONDING is not set |
| 465 | # CONFIG_EQUALIZER is not set | 513 | # CONFIG_EQUALIZER is not set |
| 466 | # CONFIG_TUN is not set | 514 | # CONFIG_TUN is not set |
| 467 | # CONFIG_VETH is not set | 515 | # CONFIG_VETH is not set |
| 516 | # CONFIG_ARCNET is not set | ||
| 468 | CONFIG_PHYLIB=y | 517 | CONFIG_PHYLIB=y |
| 469 | 518 | ||
| 470 | # | 519 | # |
| @@ -482,21 +531,59 @@ CONFIG_DAVICOM_PHY=y | |||
| 482 | # CONFIG_REALTEK_PHY is not set | 531 | # CONFIG_REALTEK_PHY is not set |
| 483 | # CONFIG_FIXED_PHY is not set | 532 | # CONFIG_FIXED_PHY is not set |
| 484 | CONFIG_MDIO_BITBANG=y | 533 | CONFIG_MDIO_BITBANG=y |
| 534 | # CONFIG_MDIO_OF_GPIO is not set | ||
| 485 | CONFIG_NET_ETHERNET=y | 535 | CONFIG_NET_ETHERNET=y |
| 486 | CONFIG_MII=y | 536 | CONFIG_MII=y |
| 537 | # CONFIG_MACE is not set | ||
| 538 | # CONFIG_BMAC is not set | ||
| 539 | # CONFIG_HAPPYMEAL is not set | ||
| 540 | # CONFIG_SUNGEM is not set | ||
| 541 | # CONFIG_CASSINI is not set | ||
| 542 | # CONFIG_NET_VENDOR_3COM is not set | ||
| 543 | # CONFIG_NET_TULIP is not set | ||
| 544 | # CONFIG_HP100 is not set | ||
| 487 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 545 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
| 488 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 546 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 489 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 547 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| 490 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 548 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
| 549 | # CONFIG_NET_PCI is not set | ||
| 491 | # CONFIG_B44 is not set | 550 | # CONFIG_B44 is not set |
| 492 | CONFIG_FS_ENET=y | 551 | CONFIG_FS_ENET=y |
| 493 | # CONFIG_FS_ENET_HAS_SCC is not set | 552 | # CONFIG_FS_ENET_HAS_SCC is not set |
| 494 | CONFIG_FS_ENET_HAS_FCC=y | 553 | CONFIG_FS_ENET_HAS_FCC=y |
| 495 | # CONFIG_FS_ENET_MDIO_FCC is not set | 554 | # CONFIG_FS_ENET_MDIO_FCC is not set |
| 496 | CONFIG_NETDEV_1000=y | 555 | CONFIG_NETDEV_1000=y |
| 497 | # CONFIG_E1000E_ENABLED is not set | 556 | # CONFIG_ACENIC is not set |
| 557 | # CONFIG_DL2K is not set | ||
| 558 | # CONFIG_E1000 is not set | ||
| 559 | # CONFIG_E1000E is not set | ||
| 560 | # CONFIG_IGB is not set | ||
| 561 | # CONFIG_NS83820 is not set | ||
| 562 | # CONFIG_HAMACHI is not set | ||
| 563 | # CONFIG_R8169 is not set | ||
| 564 | # CONFIG_SIS190 is not set | ||
| 565 | # CONFIG_SKGE is not set | ||
| 566 | # CONFIG_SKY2 is not set | ||
| 567 | # CONFIG_VIA_VELOCITY is not set | ||
| 568 | # CONFIG_TIGON3 is not set | ||
| 569 | # CONFIG_BNX2 is not set | ||
| 498 | # CONFIG_GIANFAR is not set | 570 | # CONFIG_GIANFAR is not set |
| 571 | # CONFIG_MV643XX_ETH is not set | ||
| 572 | # CONFIG_QLA3XXX is not set | ||
| 499 | CONFIG_NETDEV_10000=y | 573 | CONFIG_NETDEV_10000=y |
| 574 | # CONFIG_CHELSIO_T1 is not set | ||
| 575 | # CONFIG_CHELSIO_T3 is not set | ||
| 576 | # CONFIG_IXGBE is not set | ||
| 577 | # CONFIG_IXGB is not set | ||
| 578 | # CONFIG_S2IO is not set | ||
| 579 | # CONFIG_MYRI10GE is not set | ||
| 580 | # CONFIG_NETXEN_NIC is not set | ||
| 581 | # CONFIG_NIU is not set | ||
| 582 | # CONFIG_MLX4_CORE is not set | ||
| 583 | # CONFIG_TEHUTI is not set | ||
| 584 | # CONFIG_BNX2X is not set | ||
| 585 | # CONFIG_SFC is not set | ||
| 586 | # CONFIG_TR is not set | ||
| 500 | 587 | ||
| 501 | # | 588 | # |
| 502 | # Wireless LAN | 589 | # Wireless LAN |
| @@ -505,6 +592,7 @@ CONFIG_NETDEV_10000=y | |||
| 505 | # CONFIG_WLAN_80211 is not set | 592 | # CONFIG_WLAN_80211 is not set |
| 506 | # CONFIG_IWLWIFI_LEDS is not set | 593 | # CONFIG_IWLWIFI_LEDS is not set |
| 507 | # CONFIG_WAN is not set | 594 | # CONFIG_WAN is not set |
| 595 | # CONFIG_FDDI is not set | ||
| 508 | # CONFIG_PPP is not set | 596 | # CONFIG_PPP is not set |
| 509 | # CONFIG_SLIP is not set | 597 | # CONFIG_SLIP is not set |
| 510 | # CONFIG_NETPOLL is not set | 598 | # CONFIG_NETPOLL is not set |
| @@ -541,6 +629,7 @@ CONFIG_DEVKMEM=y | |||
| 541 | # CONFIG_SERIAL_UARTLITE is not set | 629 | # CONFIG_SERIAL_UARTLITE is not set |
| 542 | CONFIG_SERIAL_CORE=y | 630 | CONFIG_SERIAL_CORE=y |
| 543 | CONFIG_SERIAL_CORE_CONSOLE=y | 631 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 632 | # CONFIG_SERIAL_PMACZILOG is not set | ||
| 544 | CONFIG_SERIAL_CPM=y | 633 | CONFIG_SERIAL_CPM=y |
| 545 | CONFIG_SERIAL_CPM_CONSOLE=y | 634 | CONFIG_SERIAL_CPM_CONSOLE=y |
| 546 | CONFIG_SERIAL_CPM_SCC1=y | 635 | CONFIG_SERIAL_CPM_SCC1=y |
| @@ -549,21 +638,44 @@ CONFIG_SERIAL_CPM_SCC1=y | |||
| 549 | CONFIG_SERIAL_CPM_SCC4=y | 638 | CONFIG_SERIAL_CPM_SCC4=y |
| 550 | # CONFIG_SERIAL_CPM_SMC1 is not set | 639 | # CONFIG_SERIAL_CPM_SMC1 is not set |
| 551 | # CONFIG_SERIAL_CPM_SMC2 is not set | 640 | # CONFIG_SERIAL_CPM_SMC2 is not set |
| 641 | # CONFIG_SERIAL_JSM is not set | ||
| 552 | CONFIG_UNIX98_PTYS=y | 642 | CONFIG_UNIX98_PTYS=y |
| 553 | CONFIG_LEGACY_PTYS=y | 643 | CONFIG_LEGACY_PTYS=y |
| 554 | CONFIG_LEGACY_PTY_COUNT=256 | 644 | CONFIG_LEGACY_PTY_COUNT=256 |
| 645 | # CONFIG_BRIQ_PANEL is not set | ||
| 646 | # CONFIG_HVC_RTAS is not set | ||
| 555 | # CONFIG_IPMI_HANDLER is not set | 647 | # CONFIG_IPMI_HANDLER is not set |
| 556 | CONFIG_HW_RANDOM=y | 648 | CONFIG_HW_RANDOM=y |
| 557 | # CONFIG_NVRAM is not set | 649 | # CONFIG_NVRAM is not set |
| 558 | # CONFIG_GEN_RTC is not set | 650 | # CONFIG_GEN_RTC is not set |
| 559 | # CONFIG_R3964 is not set | 651 | # CONFIG_R3964 is not set |
| 652 | # CONFIG_APPLICOM is not set | ||
| 560 | # CONFIG_RAW_DRIVER is not set | 653 | # CONFIG_RAW_DRIVER is not set |
| 654 | CONFIG_DEVPORT=y | ||
| 561 | # CONFIG_I2C is not set | 655 | # CONFIG_I2C is not set |
| 562 | # CONFIG_SPI is not set | 656 | # CONFIG_SPI is not set |
| 657 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 658 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | ||
| 659 | CONFIG_GPIOLIB=y | ||
| 660 | # CONFIG_DEBUG_GPIO is not set | ||
| 661 | |||
| 662 | # | ||
| 663 | # I2C GPIO expanders: | ||
| 664 | # | ||
| 665 | |||
| 666 | # | ||
| 667 | # PCI GPIO expanders: | ||
| 668 | # | ||
| 669 | # CONFIG_GPIO_BT8XX is not set | ||
| 670 | |||
| 671 | # | ||
| 672 | # SPI GPIO expanders: | ||
| 673 | # | ||
| 563 | # CONFIG_W1 is not set | 674 | # CONFIG_W1 is not set |
| 564 | # CONFIG_POWER_SUPPLY is not set | 675 | # CONFIG_POWER_SUPPLY is not set |
| 565 | # CONFIG_HWMON is not set | 676 | # CONFIG_HWMON is not set |
| 566 | # CONFIG_THERMAL is not set | 677 | # CONFIG_THERMAL is not set |
| 678 | # CONFIG_THERMAL_HWMON is not set | ||
| 567 | # CONFIG_WATCHDOG is not set | 679 | # CONFIG_WATCHDOG is not set |
| 568 | 680 | ||
| 569 | # | 681 | # |
| @@ -575,8 +687,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 575 | # | 687 | # |
| 576 | # Multifunction device drivers | 688 | # Multifunction device drivers |
| 577 | # | 689 | # |
| 690 | # CONFIG_MFD_CORE is not set | ||
| 578 | # CONFIG_MFD_SM501 is not set | 691 | # CONFIG_MFD_SM501 is not set |
| 579 | # CONFIG_HTC_PASIC3 is not set | 692 | # CONFIG_HTC_PASIC3 is not set |
| 693 | # CONFIG_MFD_TMIO is not set | ||
| 580 | 694 | ||
| 581 | # | 695 | # |
| 582 | # Multimedia devices | 696 | # Multimedia devices |
| @@ -597,6 +711,8 @@ CONFIG_DAB=y | |||
| 597 | # | 711 | # |
| 598 | # Graphics support | 712 | # Graphics support |
| 599 | # | 713 | # |
| 714 | # CONFIG_AGP is not set | ||
| 715 | # CONFIG_DRM is not set | ||
| 600 | # CONFIG_VGASTATE is not set | 716 | # CONFIG_VGASTATE is not set |
| 601 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | 717 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set |
| 602 | # CONFIG_FB is not set | 718 | # CONFIG_FB is not set |
| @@ -606,16 +722,13 @@ CONFIG_DAB=y | |||
| 606 | # Display device support | 722 | # Display device support |
| 607 | # | 723 | # |
| 608 | # CONFIG_DISPLAY_SUPPORT is not set | 724 | # CONFIG_DISPLAY_SUPPORT is not set |
| 609 | |||
| 610 | # | ||
| 611 | # Sound | ||
| 612 | # | ||
| 613 | # CONFIG_SOUND is not set | 725 | # CONFIG_SOUND is not set |
| 614 | # CONFIG_USB_SUPPORT is not set | 726 | # CONFIG_USB_SUPPORT is not set |
| 615 | # CONFIG_MMC is not set | 727 | # CONFIG_MMC is not set |
| 616 | # CONFIG_MEMSTICK is not set | 728 | # CONFIG_MEMSTICK is not set |
| 617 | # CONFIG_NEW_LEDS is not set | 729 | # CONFIG_NEW_LEDS is not set |
| 618 | # CONFIG_ACCESSIBILITY is not set | 730 | # CONFIG_ACCESSIBILITY is not set |
| 731 | # CONFIG_INFINIBAND is not set | ||
| 619 | # CONFIG_RTC_CLASS is not set | 732 | # CONFIG_RTC_CLASS is not set |
| 620 | # CONFIG_DMADEVICES is not set | 733 | # CONFIG_DMADEVICES is not set |
| 621 | # CONFIG_UIO is not set | 734 | # CONFIG_UIO is not set |
| @@ -675,6 +788,7 @@ CONFIG_TMPFS=y | |||
| 675 | CONFIG_CRAMFS=y | 788 | CONFIG_CRAMFS=y |
| 676 | # CONFIG_VXFS_FS is not set | 789 | # CONFIG_VXFS_FS is not set |
| 677 | # CONFIG_MINIX_FS is not set | 790 | # CONFIG_MINIX_FS is not set |
| 791 | # CONFIG_OMFS_FS is not set | ||
| 678 | # CONFIG_HPFS_FS is not set | 792 | # CONFIG_HPFS_FS is not set |
| 679 | # CONFIG_QNX4FS_FS is not set | 793 | # CONFIG_QNX4FS_FS is not set |
| 680 | # CONFIG_ROMFS_FS is not set | 794 | # CONFIG_ROMFS_FS is not set |
| @@ -684,8 +798,8 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 684 | CONFIG_NFS_FS=y | 798 | CONFIG_NFS_FS=y |
| 685 | CONFIG_NFS_V3=y | 799 | CONFIG_NFS_V3=y |
| 686 | # CONFIG_NFS_V3_ACL is not set | 800 | # CONFIG_NFS_V3_ACL is not set |
| 687 | # CONFIG_NFSD is not set | ||
| 688 | CONFIG_ROOT_NFS=y | 801 | CONFIG_ROOT_NFS=y |
| 802 | # CONFIG_NFSD is not set | ||
| 689 | CONFIG_LOCKD=y | 803 | CONFIG_LOCKD=y |
| 690 | CONFIG_LOCKD_V4=y | 804 | CONFIG_LOCKD_V4=y |
| 691 | CONFIG_NFS_COMMON=y | 805 | CONFIG_NFS_COMMON=y |
| @@ -763,6 +877,7 @@ CONFIG_NLS_UTF8=y | |||
| 763 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 877 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 764 | # CONFIG_CRC_CCITT is not set | 878 | # CONFIG_CRC_CCITT is not set |
| 765 | # CONFIG_CRC16 is not set | 879 | # CONFIG_CRC16 is not set |
| 880 | # CONFIG_CRC_T10DIF is not set | ||
| 766 | # CONFIG_CRC_ITU_T is not set | 881 | # CONFIG_CRC_ITU_T is not set |
| 767 | # CONFIG_CRC32 is not set | 882 | # CONFIG_CRC32 is not set |
| 768 | # CONFIG_CRC7 is not set | 883 | # CONFIG_CRC7 is not set |
| @@ -804,19 +919,31 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
| 804 | CONFIG_DEBUG_INFO=y | 919 | CONFIG_DEBUG_INFO=y |
| 805 | # CONFIG_DEBUG_VM is not set | 920 | # CONFIG_DEBUG_VM is not set |
| 806 | # CONFIG_DEBUG_WRITECOUNT is not set | 921 | # CONFIG_DEBUG_WRITECOUNT is not set |
| 922 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 807 | # CONFIG_DEBUG_LIST is not set | 923 | # CONFIG_DEBUG_LIST is not set |
| 808 | # CONFIG_DEBUG_SG is not set | 924 | # CONFIG_DEBUG_SG is not set |
| 809 | # CONFIG_BOOT_PRINTK_DELAY is not set | 925 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 926 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 810 | # CONFIG_BACKTRACE_SELF_TEST is not set | 927 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 811 | # CONFIG_FAULT_INJECTION is not set | 928 | # CONFIG_FAULT_INJECTION is not set |
| 929 | # CONFIG_LATENCYTOP is not set | ||
| 930 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 931 | CONFIG_HAVE_FTRACE=y | ||
| 932 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 933 | # CONFIG_FTRACE is not set | ||
| 934 | # CONFIG_SCHED_TRACER is not set | ||
| 935 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 812 | # CONFIG_SAMPLES is not set | 936 | # CONFIG_SAMPLES is not set |
| 937 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 813 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 938 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
| 814 | # CONFIG_DEBUG_STACK_USAGE is not set | 939 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 815 | # CONFIG_DEBUG_PAGEALLOC is not set | 940 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 816 | # CONFIG_DEBUGGER is not set | 941 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
| 817 | # CONFIG_KGDB_CONSOLE is not set | 942 | # CONFIG_FTR_FIXUP_SELFTEST is not set |
| 943 | # CONFIG_XMON is not set | ||
| 818 | # CONFIG_IRQSTACKS is not set | 944 | # CONFIG_IRQSTACKS is not set |
| 819 | CONFIG_BDI_SWITCH=y | 945 | CONFIG_BDI_SWITCH=y |
| 946 | # CONFIG_BOOTX_TEXT is not set | ||
| 820 | # CONFIG_PPC_EARLY_DEBUG is not set | 947 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 821 | 948 | ||
| 822 | # | 949 | # |
| @@ -824,6 +951,7 @@ CONFIG_BDI_SWITCH=y | |||
| 824 | # | 951 | # |
| 825 | # CONFIG_KEYS is not set | 952 | # CONFIG_KEYS is not set |
| 826 | # CONFIG_SECURITY is not set | 953 | # CONFIG_SECURITY is not set |
| 954 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
| 827 | CONFIG_CRYPTO=y | 955 | CONFIG_CRYPTO=y |
| 828 | 956 | ||
| 829 | # | 957 | # |
| @@ -864,6 +992,10 @@ CONFIG_CRYPTO_PCBC=y | |||
| 864 | # CONFIG_CRYPTO_MD4 is not set | 992 | # CONFIG_CRYPTO_MD4 is not set |
| 865 | CONFIG_CRYPTO_MD5=y | 993 | CONFIG_CRYPTO_MD5=y |
| 866 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 994 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 995 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 996 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 997 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 998 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 867 | # CONFIG_CRYPTO_SHA1 is not set | 999 | # CONFIG_CRYPTO_SHA1 is not set |
| 868 | # CONFIG_CRYPTO_SHA256 is not set | 1000 | # CONFIG_CRYPTO_SHA256 is not set |
| 869 | # CONFIG_CRYPTO_SHA512 is not set | 1001 | # CONFIG_CRYPTO_SHA512 is not set |
| @@ -894,6 +1026,6 @@ CONFIG_CRYPTO_DES=y | |||
| 894 | # CONFIG_CRYPTO_DEFLATE is not set | 1026 | # CONFIG_CRYPTO_DEFLATE is not set |
| 895 | # CONFIG_CRYPTO_LZO is not set | 1027 | # CONFIG_CRYPTO_LZO is not set |
| 896 | # CONFIG_CRYPTO_HW is not set | 1028 | # CONFIG_CRYPTO_HW is not set |
| 897 | # CONFIG_PPC_CLOCK is not set | 1029 | CONFIG_PPC_CLOCK=y |
| 898 | CONFIG_PPC_LIB_RHEAP=y | 1030 | CONFIG_PPC_LIB_RHEAP=y |
| 899 | # CONFIG_VIRTUALIZATION is not set | 1031 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/ep88xc_defconfig b/arch/powerpc/configs/ep88xc_defconfig index ac72b48542dc..480225be2f39 100644 --- a/arch/powerpc/configs/ep88xc_defconfig +++ b/arch/powerpc/configs/ep88xc_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.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Mon Jun 9 08:52:09 2008 | 4 | # Thu Aug 21 00:52:04 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -29,6 +29,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 29 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 29 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 30 | CONFIG_IRQ_PER_CPU=y | 30 | CONFIG_IRQ_PER_CPU=y |
| 31 | CONFIG_STACKTRACE_SUPPORT=y | 31 | CONFIG_STACKTRACE_SUPPORT=y |
| 32 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 32 | CONFIG_LOCKDEP_SUPPORT=y | 33 | CONFIG_LOCKDEP_SUPPORT=y |
| 33 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 34 | CONFIG_ARCH_HAS_ILOG2_U32=y | 35 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| @@ -108,10 +109,16 @@ CONFIG_SLUB=y | |||
| 108 | # CONFIG_PROFILING is not set | 109 | # CONFIG_PROFILING is not set |
| 109 | # CONFIG_MARKERS is not set | 110 | # CONFIG_MARKERS is not set |
| 110 | CONFIG_HAVE_OPROFILE=y | 111 | CONFIG_HAVE_OPROFILE=y |
| 112 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 113 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 111 | CONFIG_HAVE_KPROBES=y | 114 | CONFIG_HAVE_KPROBES=y |
| 112 | CONFIG_HAVE_KRETPROBES=y | 115 | CONFIG_HAVE_KRETPROBES=y |
| 116 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 113 | # CONFIG_HAVE_DMA_ATTRS is not set | 117 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 118 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 119 | CONFIG_HAVE_CLK=y | ||
| 114 | CONFIG_PROC_PAGE_MONITOR=y | 120 | CONFIG_PROC_PAGE_MONITOR=y |
| 121 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 115 | CONFIG_SLABINFO=y | 122 | CONFIG_SLABINFO=y |
| 116 | # CONFIG_TINY_SHMEM is not set | 123 | # CONFIG_TINY_SHMEM is not set |
| 117 | CONFIG_BASE_SMALL=1 | 124 | CONFIG_BASE_SMALL=1 |
| @@ -121,6 +128,7 @@ CONFIG_BLOCK=y | |||
| 121 | # CONFIG_BLK_DEV_IO_TRACE is not set | 128 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 122 | # CONFIG_LSF is not set | 129 | # CONFIG_LSF is not set |
| 123 | # CONFIG_BLK_DEV_BSG is not set | 130 | # CONFIG_BLK_DEV_BSG is not set |
| 131 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 124 | 132 | ||
| 125 | # | 133 | # |
| 126 | # IO Schedulers | 134 | # IO Schedulers |
| @@ -139,8 +147,6 @@ CONFIG_CLASSIC_RCU=y | |||
| 139 | # | 147 | # |
| 140 | # Platform support | 148 | # Platform support |
| 141 | # | 149 | # |
| 142 | # CONFIG_PPC_MPC512x is not set | ||
| 143 | # CONFIG_PPC_MPC5121 is not set | ||
| 144 | # CONFIG_PPC_CELL is not set | 150 | # CONFIG_PPC_CELL is not set |
| 145 | # CONFIG_PPC_CELL_NATIVE is not set | 151 | # CONFIG_PPC_CELL_NATIVE is not set |
| 146 | CONFIG_CPM1=y | 152 | CONFIG_CPM1=y |
| @@ -158,6 +164,7 @@ CONFIG_PPC_EP88XC=y | |||
| 158 | # Generic MPC8xx Options | 164 | # Generic MPC8xx Options |
| 159 | # | 165 | # |
| 160 | CONFIG_8xx_COPYBACK=y | 166 | CONFIG_8xx_COPYBACK=y |
| 167 | # CONFIG_8xx_GPIO is not set | ||
| 161 | # CONFIG_8xx_CPU6 is not set | 168 | # CONFIG_8xx_CPU6 is not set |
| 162 | CONFIG_8xx_CPU15=y | 169 | CONFIG_8xx_CPU15=y |
| 163 | CONFIG_NO_UCODE_PATCH=y | 170 | CONFIG_NO_UCODE_PATCH=y |
| @@ -176,7 +183,6 @@ CONFIG_NO_UCODE_PATCH=y | |||
| 176 | # CONFIG_PPC_INDIRECT_IO is not set | 183 | # CONFIG_PPC_INDIRECT_IO is not set |
| 177 | # CONFIG_GENERIC_IOMAP is not set | 184 | # CONFIG_GENERIC_IOMAP is not set |
| 178 | # CONFIG_CPU_FREQ is not set | 185 | # CONFIG_CPU_FREQ is not set |
| 179 | CONFIG_PPC_CPM_NEW_BINDING=y | ||
| 180 | # CONFIG_FSL_ULI1575 is not set | 186 | # CONFIG_FSL_ULI1575 is not set |
| 181 | CONFIG_CPM=y | 187 | CONFIG_CPM=y |
| 182 | 188 | ||
| @@ -193,7 +199,7 @@ CONFIG_HZ_100=y | |||
| 193 | # CONFIG_HZ_300 is not set | 199 | # CONFIG_HZ_300 is not set |
| 194 | # CONFIG_HZ_1000 is not set | 200 | # CONFIG_HZ_1000 is not set |
| 195 | CONFIG_HZ=100 | 201 | CONFIG_HZ=100 |
| 196 | # CONFIG_SCHED_HRTICK is not set | 202 | CONFIG_SCHED_HRTICK=y |
| 197 | CONFIG_PREEMPT_NONE=y | 203 | CONFIG_PREEMPT_NONE=y |
| 198 | # CONFIG_PREEMPT_VOLUNTARY is not set | 204 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 199 | # CONFIG_PREEMPT is not set | 205 | # CONFIG_PREEMPT is not set |
| @@ -217,6 +223,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 223 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 218 | CONFIG_PAGEFLAGS_EXTENDED=y | 224 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 219 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 225 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 226 | CONFIG_MIGRATION=y | ||
| 220 | # CONFIG_RESOURCES_64BIT is not set | 227 | # CONFIG_RESOURCES_64BIT is not set |
| 221 | CONFIG_ZONE_DMA_FLAG=1 | 228 | CONFIG_ZONE_DMA_FLAG=1 |
| 222 | CONFIG_BOUNCE=y | 229 | CONFIG_BOUNCE=y |
| @@ -224,6 +231,7 @@ CONFIG_VIRT_TO_BUS=y | |||
| 224 | CONFIG_FORCE_MAX_ZONEORDER=11 | 231 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 225 | CONFIG_PROC_DEVICETREE=y | 232 | CONFIG_PROC_DEVICETREE=y |
| 226 | # CONFIG_CMDLINE_BOOL is not set | 233 | # CONFIG_CMDLINE_BOOL is not set |
| 234 | CONFIG_EXTRA_TARGETS="" | ||
| 227 | # CONFIG_PM is not set | 235 | # CONFIG_PM is not set |
| 228 | # CONFIG_SECCOMP is not set | 236 | # CONFIG_SECCOMP is not set |
| 229 | CONFIG_ISA_DMA_API=y | 237 | CONFIG_ISA_DMA_API=y |
| @@ -256,10 +264,6 @@ CONFIG_PHYSICAL_START=0x00000000 | |||
| 256 | CONFIG_TASK_SIZE=0x80000000 | 264 | CONFIG_TASK_SIZE=0x80000000 |
| 257 | CONFIG_CONSISTENT_START=0xfd000000 | 265 | CONFIG_CONSISTENT_START=0xfd000000 |
| 258 | CONFIG_CONSISTENT_SIZE=0x00200000 | 266 | CONFIG_CONSISTENT_SIZE=0x00200000 |
| 259 | |||
| 260 | # | ||
| 261 | # Networking | ||
| 262 | # | ||
| 263 | CONFIG_NET=y | 267 | CONFIG_NET=y |
| 264 | 268 | ||
| 265 | # | 269 | # |
| @@ -442,7 +446,6 @@ CONFIG_HAVE_IDE=y | |||
| 442 | # CONFIG_MD is not set | 446 | # CONFIG_MD is not set |
| 443 | # CONFIG_MACINTOSH_DRIVERS is not set | 447 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 444 | CONFIG_NETDEVICES=y | 448 | CONFIG_NETDEVICES=y |
| 445 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 446 | # CONFIG_DUMMY is not set | 449 | # CONFIG_DUMMY is not set |
| 447 | # CONFIG_BONDING is not set | 450 | # CONFIG_BONDING is not set |
| 448 | # CONFIG_MACVLAN is not set | 451 | # CONFIG_MACVLAN is not set |
| @@ -544,10 +547,13 @@ CONFIG_GEN_RTC=y | |||
| 544 | # CONFIG_TCG_TPM is not set | 547 | # CONFIG_TCG_TPM is not set |
| 545 | # CONFIG_I2C is not set | 548 | # CONFIG_I2C is not set |
| 546 | # CONFIG_SPI is not set | 549 | # CONFIG_SPI is not set |
| 550 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 551 | # CONFIG_GPIOLIB is not set | ||
| 547 | # CONFIG_W1 is not set | 552 | # CONFIG_W1 is not set |
| 548 | # CONFIG_POWER_SUPPLY is not set | 553 | # CONFIG_POWER_SUPPLY is not set |
| 549 | # CONFIG_HWMON is not set | 554 | # CONFIG_HWMON is not set |
| 550 | # CONFIG_THERMAL is not set | 555 | # CONFIG_THERMAL is not set |
| 556 | # CONFIG_THERMAL_HWMON is not set | ||
| 551 | # CONFIG_WATCHDOG is not set | 557 | # CONFIG_WATCHDOG is not set |
| 552 | 558 | ||
| 553 | # | 559 | # |
| @@ -559,8 +565,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 559 | # | 565 | # |
| 560 | # Multifunction device drivers | 566 | # Multifunction device drivers |
| 561 | # | 567 | # |
| 568 | # CONFIG_MFD_CORE is not set | ||
| 562 | # CONFIG_MFD_SM501 is not set | 569 | # CONFIG_MFD_SM501 is not set |
| 563 | # CONFIG_HTC_PASIC3 is not set | 570 | # CONFIG_HTC_PASIC3 is not set |
| 571 | # CONFIG_MFD_TMIO is not set | ||
| 564 | 572 | ||
| 565 | # | 573 | # |
| 566 | # Multimedia devices | 574 | # Multimedia devices |
| @@ -590,10 +598,6 @@ CONFIG_DAB=y | |||
| 590 | # Display device support | 598 | # Display device support |
| 591 | # | 599 | # |
| 592 | # CONFIG_DISPLAY_SUPPORT is not set | 600 | # CONFIG_DISPLAY_SUPPORT is not set |
| 593 | |||
| 594 | # | ||
| 595 | # Sound | ||
| 596 | # | ||
| 597 | # CONFIG_SOUND is not set | 601 | # CONFIG_SOUND is not set |
| 598 | # CONFIG_USB_SUPPORT is not set | 602 | # CONFIG_USB_SUPPORT is not set |
| 599 | # CONFIG_MMC is not set | 603 | # CONFIG_MMC is not set |
| @@ -662,6 +666,7 @@ CONFIG_TMPFS=y | |||
| 662 | CONFIG_CRAMFS=y | 666 | CONFIG_CRAMFS=y |
| 663 | # CONFIG_VXFS_FS is not set | 667 | # CONFIG_VXFS_FS is not set |
| 664 | # CONFIG_MINIX_FS is not set | 668 | # CONFIG_MINIX_FS is not set |
| 669 | # CONFIG_OMFS_FS is not set | ||
| 665 | # CONFIG_HPFS_FS is not set | 670 | # CONFIG_HPFS_FS is not set |
| 666 | # CONFIG_QNX4FS_FS is not set | 671 | # CONFIG_QNX4FS_FS is not set |
| 667 | # CONFIG_ROMFS_FS is not set | 672 | # CONFIG_ROMFS_FS is not set |
| @@ -672,13 +677,12 @@ CONFIG_NFS_FS=y | |||
| 672 | CONFIG_NFS_V3=y | 677 | CONFIG_NFS_V3=y |
| 673 | # CONFIG_NFS_V3_ACL is not set | 678 | # CONFIG_NFS_V3_ACL is not set |
| 674 | # CONFIG_NFS_V4 is not set | 679 | # CONFIG_NFS_V4 is not set |
| 675 | # CONFIG_NFSD is not set | ||
| 676 | CONFIG_ROOT_NFS=y | 680 | CONFIG_ROOT_NFS=y |
| 681 | # CONFIG_NFSD is not set | ||
| 677 | CONFIG_LOCKD=y | 682 | CONFIG_LOCKD=y |
| 678 | CONFIG_LOCKD_V4=y | 683 | CONFIG_LOCKD_V4=y |
| 679 | CONFIG_NFS_COMMON=y | 684 | CONFIG_NFS_COMMON=y |
| 680 | CONFIG_SUNRPC=y | 685 | CONFIG_SUNRPC=y |
| 681 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 682 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 686 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 683 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 687 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 684 | # CONFIG_SMB_FS is not set | 688 | # CONFIG_SMB_FS is not set |
| @@ -717,6 +721,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 717 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 721 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 718 | # CONFIG_CRC_CCITT is not set | 722 | # CONFIG_CRC_CCITT is not set |
| 719 | # CONFIG_CRC16 is not set | 723 | # CONFIG_CRC16 is not set |
| 724 | # CONFIG_CRC_T10DIF is not set | ||
| 720 | # CONFIG_CRC_ITU_T is not set | 725 | # CONFIG_CRC_ITU_T is not set |
| 721 | # CONFIG_CRC32 is not set | 726 | # CONFIG_CRC32 is not set |
| 722 | # CONFIG_CRC7 is not set | 727 | # CONFIG_CRC7 is not set |
| @@ -741,6 +746,8 @@ CONFIG_MAGIC_SYSRQ=y | |||
| 741 | CONFIG_DEBUG_KERNEL=y | 746 | CONFIG_DEBUG_KERNEL=y |
| 742 | # CONFIG_DEBUG_SHIRQ is not set | 747 | # CONFIG_DEBUG_SHIRQ is not set |
| 743 | CONFIG_DETECT_SOFTLOCKUP=y | 748 | CONFIG_DETECT_SOFTLOCKUP=y |
| 749 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 750 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 744 | CONFIG_SCHED_DEBUG=y | 751 | CONFIG_SCHED_DEBUG=y |
| 745 | # CONFIG_SCHEDSTATS is not set | 752 | # CONFIG_SCHEDSTATS is not set |
| 746 | # CONFIG_TIMER_STATS is not set | 753 | # CONFIG_TIMER_STATS is not set |
| @@ -756,16 +763,28 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
| 756 | CONFIG_DEBUG_INFO=y | 763 | CONFIG_DEBUG_INFO=y |
| 757 | # CONFIG_DEBUG_VM is not set | 764 | # CONFIG_DEBUG_VM is not set |
| 758 | # CONFIG_DEBUG_WRITECOUNT is not set | 765 | # CONFIG_DEBUG_WRITECOUNT is not set |
| 766 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 759 | # CONFIG_DEBUG_LIST is not set | 767 | # CONFIG_DEBUG_LIST is not set |
| 760 | # CONFIG_DEBUG_SG is not set | 768 | # CONFIG_DEBUG_SG is not set |
| 761 | # CONFIG_BOOT_PRINTK_DELAY is not set | 769 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 770 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 762 | # CONFIG_BACKTRACE_SELF_TEST is not set | 771 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 763 | # CONFIG_FAULT_INJECTION is not set | 772 | # CONFIG_FAULT_INJECTION is not set |
| 773 | # CONFIG_LATENCYTOP is not set | ||
| 774 | CONFIG_HAVE_FTRACE=y | ||
| 775 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 776 | # CONFIG_FTRACE is not set | ||
| 777 | # CONFIG_SCHED_TRACER is not set | ||
| 778 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 764 | # CONFIG_SAMPLES is not set | 779 | # CONFIG_SAMPLES is not set |
| 780 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 781 | # CONFIG_KGDB is not set | ||
| 765 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 782 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
| 766 | # CONFIG_DEBUG_STACK_USAGE is not set | 783 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 767 | # CONFIG_DEBUG_PAGEALLOC is not set | 784 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 768 | # CONFIG_DEBUGGER is not set | 785 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
| 786 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
| 787 | # CONFIG_XMON is not set | ||
| 769 | # CONFIG_IRQSTACKS is not set | 788 | # CONFIG_IRQSTACKS is not set |
| 770 | # CONFIG_BDI_SWITCH is not set | 789 | # CONFIG_BDI_SWITCH is not set |
| 771 | # CONFIG_PPC_EARLY_DEBUG is not set | 790 | # CONFIG_PPC_EARLY_DEBUG is not set |
| @@ -777,6 +796,6 @@ CONFIG_DEBUG_INFO=y | |||
| 777 | # CONFIG_SECURITY is not set | 796 | # CONFIG_SECURITY is not set |
| 778 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 797 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 779 | # CONFIG_CRYPTO is not set | 798 | # CONFIG_CRYPTO is not set |
| 780 | # CONFIG_PPC_CLOCK is not set | 799 | CONFIG_PPC_CLOCK=y |
| 781 | CONFIG_PPC_LIB_RHEAP=y | 800 | CONFIG_PPC_LIB_RHEAP=y |
| 782 | # CONFIG_VIRTUALIZATION is not set | 801 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/g5_defconfig b/arch/powerpc/configs/g5_defconfig index 0ccc6e493dcb..cfa5d053ee5e 100644 --- a/arch/powerpc/configs/g5_defconfig +++ b/arch/powerpc/configs/g5_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.26-rc6 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Mon Jun 16 21:08:31 2008 | 4 | # Tue Aug 26 13:15:06 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
| 7 | 7 | ||
| @@ -13,6 +13,7 @@ CONFIG_POWER4=y | |||
| 13 | # CONFIG_TUNE_CELL is not set | 13 | # CONFIG_TUNE_CELL is not set |
| 14 | CONFIG_PPC_FPU=y | 14 | CONFIG_PPC_FPU=y |
| 15 | CONFIG_ALTIVEC=y | 15 | CONFIG_ALTIVEC=y |
| 16 | # CONFIG_VSX is not set | ||
| 16 | CONFIG_PPC_STD_MMU=y | 17 | CONFIG_PPC_STD_MMU=y |
| 17 | CONFIG_PPC_MM_SLICES=y | 18 | CONFIG_PPC_MM_SLICES=y |
| 18 | CONFIG_VIRT_CPU_ACCOUNTING=y | 19 | CONFIG_VIRT_CPU_ACCOUNTING=y |
| @@ -30,6 +31,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 30 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y | 31 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y |
| 31 | CONFIG_IRQ_PER_CPU=y | 32 | CONFIG_IRQ_PER_CPU=y |
| 32 | CONFIG_STACKTRACE_SUPPORT=y | 33 | CONFIG_STACKTRACE_SUPPORT=y |
| 34 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 33 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 35 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
| 34 | CONFIG_LOCKDEP_SUPPORT=y | 36 | CONFIG_LOCKDEP_SUPPORT=y |
| 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| @@ -94,9 +96,8 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y | |||
| 94 | CONFIG_SYSCTL=y | 96 | CONFIG_SYSCTL=y |
| 95 | # CONFIG_EMBEDDED is not set | 97 | # CONFIG_EMBEDDED is not set |
| 96 | CONFIG_SYSCTL_SYSCALL=y | 98 | CONFIG_SYSCTL_SYSCALL=y |
| 97 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 98 | CONFIG_KALLSYMS=y | 99 | CONFIG_KALLSYMS=y |
| 99 | # CONFIG_KALLSYMS_ALL is not set | 100 | CONFIG_KALLSYMS_ALL=y |
| 100 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 101 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 101 | CONFIG_HOTPLUG=y | 102 | CONFIG_HOTPLUG=y |
| 102 | CONFIG_PRINTK=y | 103 | CONFIG_PRINTK=y |
| @@ -121,10 +122,16 @@ CONFIG_PROFILING=y | |||
| 121 | CONFIG_OPROFILE=y | 122 | CONFIG_OPROFILE=y |
| 122 | CONFIG_HAVE_OPROFILE=y | 123 | CONFIG_HAVE_OPROFILE=y |
| 123 | # CONFIG_KPROBES is not set | 124 | # CONFIG_KPROBES is not set |
| 125 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 126 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 124 | CONFIG_HAVE_KPROBES=y | 127 | CONFIG_HAVE_KPROBES=y |
| 125 | CONFIG_HAVE_KRETPROBES=y | 128 | CONFIG_HAVE_KRETPROBES=y |
| 126 | # CONFIG_HAVE_DMA_ATTRS is not set | 129 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
| 130 | CONFIG_HAVE_DMA_ATTRS=y | ||
| 131 | CONFIG_USE_GENERIC_SMP_HELPERS=y | ||
| 132 | # CONFIG_HAVE_CLK is not set | ||
| 127 | CONFIG_PROC_PAGE_MONITOR=y | 133 | CONFIG_PROC_PAGE_MONITOR=y |
| 134 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 128 | CONFIG_SLABINFO=y | 135 | CONFIG_SLABINFO=y |
| 129 | CONFIG_RT_MUTEXES=y | 136 | CONFIG_RT_MUTEXES=y |
| 130 | # CONFIG_TINY_SHMEM is not set | 137 | # CONFIG_TINY_SHMEM is not set |
| @@ -140,6 +147,7 @@ CONFIG_STOP_MACHINE=y | |||
| 140 | CONFIG_BLOCK=y | 147 | CONFIG_BLOCK=y |
| 141 | # CONFIG_BLK_DEV_IO_TRACE is not set | 148 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 142 | CONFIG_BLK_DEV_BSG=y | 149 | CONFIG_BLK_DEV_BSG=y |
| 150 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 143 | CONFIG_BLOCK_COMPAT=y | 151 | CONFIG_BLOCK_COMPAT=y |
| 144 | 152 | ||
| 145 | # | 153 | # |
| @@ -160,13 +168,8 @@ CONFIG_CLASSIC_RCU=y | |||
| 160 | # Platform support | 168 | # Platform support |
| 161 | # | 169 | # |
| 162 | CONFIG_PPC_MULTIPLATFORM=y | 170 | CONFIG_PPC_MULTIPLATFORM=y |
| 163 | # CONFIG_PPC_82xx is not set | ||
| 164 | # CONFIG_PPC_83xx is not set | ||
| 165 | # CONFIG_PPC_86xx is not set | ||
| 166 | # CONFIG_PPC_PSERIES is not set | 171 | # CONFIG_PPC_PSERIES is not set |
| 167 | # CONFIG_PPC_ISERIES is not set | 172 | # CONFIG_PPC_ISERIES is not set |
| 168 | # CONFIG_PPC_MPC512x is not set | ||
| 169 | # CONFIG_PPC_MPC5121 is not set | ||
| 170 | CONFIG_PPC_PMAC=y | 173 | CONFIG_PPC_PMAC=y |
| 171 | CONFIG_PPC_PMAC64=y | 174 | CONFIG_PPC_PMAC64=y |
| 172 | # CONFIG_PPC_MAPLE is not set | 175 | # CONFIG_PPC_MAPLE is not set |
| @@ -224,7 +227,7 @@ CONFIG_HZ_250=y | |||
| 224 | # CONFIG_HZ_300 is not set | 227 | # CONFIG_HZ_300 is not set |
| 225 | # CONFIG_HZ_1000 is not set | 228 | # CONFIG_HZ_1000 is not set |
| 226 | CONFIG_HZ=250 | 229 | CONFIG_HZ=250 |
| 227 | # CONFIG_SCHED_HRTICK is not set | 230 | CONFIG_SCHED_HRTICK=y |
| 228 | CONFIG_PREEMPT_NONE=y | 231 | CONFIG_PREEMPT_NONE=y |
| 229 | # CONFIG_PREEMPT_VOLUNTARY is not set | 232 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 230 | # CONFIG_PREEMPT is not set | 233 | # CONFIG_PREEMPT is not set |
| @@ -256,6 +259,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 256 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y | 259 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y |
| 257 | CONFIG_PAGEFLAGS_EXTENDED=y | 260 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 258 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 261 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 262 | # CONFIG_MIGRATION is not set | ||
| 259 | CONFIG_RESOURCES_64BIT=y | 263 | CONFIG_RESOURCES_64BIT=y |
| 260 | CONFIG_ZONE_DMA_FLAG=1 | 264 | CONFIG_ZONE_DMA_FLAG=1 |
| 261 | CONFIG_BOUNCE=y | 265 | CONFIG_BOUNCE=y |
| @@ -265,6 +269,7 @@ CONFIG_FORCE_MAX_ZONEORDER=13 | |||
| 265 | # CONFIG_SCHED_SMT is not set | 269 | # CONFIG_SCHED_SMT is not set |
| 266 | CONFIG_PROC_DEVICETREE=y | 270 | CONFIG_PROC_DEVICETREE=y |
| 267 | # CONFIG_CMDLINE_BOOL is not set | 271 | # CONFIG_CMDLINE_BOOL is not set |
| 272 | CONFIG_EXTRA_TARGETS="" | ||
| 268 | CONFIG_ARCH_WANTS_FREEZER_CONTROL=y | 273 | CONFIG_ARCH_WANTS_FREEZER_CONTROL=y |
| 269 | # CONFIG_PM is not set | 274 | # CONFIG_PM is not set |
| 270 | CONFIG_SECCOMP=y | 275 | CONFIG_SECCOMP=y |
| @@ -290,10 +295,6 @@ CONFIG_PCI_MSI=y | |||
| 290 | CONFIG_PAGE_OFFSET=0xc000000000000000 | 295 | CONFIG_PAGE_OFFSET=0xc000000000000000 |
| 291 | CONFIG_KERNEL_START=0xc000000000000000 | 296 | CONFIG_KERNEL_START=0xc000000000000000 |
| 292 | CONFIG_PHYSICAL_START=0x00000000 | 297 | CONFIG_PHYSICAL_START=0x00000000 |
| 293 | |||
| 294 | # | ||
| 295 | # Networking | ||
| 296 | # | ||
| 297 | CONFIG_NET=y | 298 | CONFIG_NET=y |
| 298 | 299 | ||
| 299 | # | 300 | # |
| @@ -307,6 +308,7 @@ CONFIG_XFRM_USER=m | |||
| 307 | # CONFIG_XFRM_SUB_POLICY is not set | 308 | # CONFIG_XFRM_SUB_POLICY is not set |
| 308 | # CONFIG_XFRM_MIGRATE is not set | 309 | # CONFIG_XFRM_MIGRATE is not set |
| 309 | # CONFIG_XFRM_STATISTICS is not set | 310 | # CONFIG_XFRM_STATISTICS is not set |
| 311 | CONFIG_XFRM_IPCOMP=m | ||
| 310 | CONFIG_NET_KEY=m | 312 | CONFIG_NET_KEY=m |
| 311 | # CONFIG_NET_KEY_MIGRATE is not set | 313 | # CONFIG_NET_KEY_MIGRATE is not set |
| 312 | CONFIG_INET=y | 314 | CONFIG_INET=y |
| @@ -422,6 +424,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | |||
| 422 | CONFIG_STANDALONE=y | 424 | CONFIG_STANDALONE=y |
| 423 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 425 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 424 | CONFIG_FW_LOADER=y | 426 | CONFIG_FW_LOADER=y |
| 427 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
| 428 | CONFIG_EXTRA_FIRMWARE="" | ||
| 425 | # CONFIG_DEBUG_DRIVER is not set | 429 | # CONFIG_DEBUG_DRIVER is not set |
| 426 | # CONFIG_DEBUG_DEVRES is not set | 430 | # CONFIG_DEBUG_DEVRES is not set |
| 427 | # CONFIG_SYS_HYPERVISOR is not set | 431 | # CONFIG_SYS_HYPERVISOR is not set |
| @@ -449,12 +453,14 @@ CONFIG_CDROM_PKTCDVD=m | |||
| 449 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 453 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
| 450 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 454 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
| 451 | # CONFIG_ATA_OVER_ETH is not set | 455 | # CONFIG_ATA_OVER_ETH is not set |
| 456 | # CONFIG_BLK_DEV_HD is not set | ||
| 452 | CONFIG_MISC_DEVICES=y | 457 | CONFIG_MISC_DEVICES=y |
| 453 | # CONFIG_PHANTOM is not set | 458 | # CONFIG_PHANTOM is not set |
| 454 | # CONFIG_EEPROM_93CX6 is not set | 459 | # CONFIG_EEPROM_93CX6 is not set |
| 455 | # CONFIG_SGI_IOC4 is not set | 460 | # CONFIG_SGI_IOC4 is not set |
| 456 | # CONFIG_TIFM_CORE is not set | 461 | # CONFIG_TIFM_CORE is not set |
| 457 | # CONFIG_ENCLOSURE_SERVICES is not set | 462 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 463 | # CONFIG_HP_ILO is not set | ||
| 458 | CONFIG_HAVE_IDE=y | 464 | CONFIG_HAVE_IDE=y |
| 459 | CONFIG_IDE=y | 465 | CONFIG_IDE=y |
| 460 | CONFIG_BLK_DEV_IDE=y | 466 | CONFIG_BLK_DEV_IDE=y |
| @@ -462,6 +468,7 @@ CONFIG_BLK_DEV_IDE=y | |||
| 462 | # | 468 | # |
| 463 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | 469 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
| 464 | # | 470 | # |
| 471 | CONFIG_IDE_TIMINGS=y | ||
| 465 | # CONFIG_BLK_DEV_IDE_SATA is not set | 472 | # CONFIG_BLK_DEV_IDE_SATA is not set |
| 466 | CONFIG_BLK_DEV_IDEDISK=y | 473 | CONFIG_BLK_DEV_IDEDISK=y |
| 467 | # CONFIG_IDEDISK_MULTI_MODE is not set | 474 | # CONFIG_IDEDISK_MULTI_MODE is not set |
| @@ -492,10 +499,8 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
| 492 | # CONFIG_BLK_DEV_AMD74XX is not set | 499 | # CONFIG_BLK_DEV_AMD74XX is not set |
| 493 | # CONFIG_BLK_DEV_CMD64X is not set | 500 | # CONFIG_BLK_DEV_CMD64X is not set |
| 494 | # CONFIG_BLK_DEV_TRIFLEX is not set | 501 | # CONFIG_BLK_DEV_TRIFLEX is not set |
| 495 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
| 496 | # CONFIG_BLK_DEV_CS5520 is not set | 502 | # CONFIG_BLK_DEV_CS5520 is not set |
| 497 | # CONFIG_BLK_DEV_CS5530 is not set | 503 | # CONFIG_BLK_DEV_CS5530 is not set |
| 498 | # CONFIG_BLK_DEV_HPT34X is not set | ||
| 499 | # CONFIG_BLK_DEV_HPT366 is not set | 504 | # CONFIG_BLK_DEV_HPT366 is not set |
| 500 | # CONFIG_BLK_DEV_JMICRON is not set | 505 | # CONFIG_BLK_DEV_JMICRON is not set |
| 501 | # CONFIG_BLK_DEV_SC1200 is not set | 506 | # CONFIG_BLK_DEV_SC1200 is not set |
| @@ -516,8 +521,6 @@ CONFIG_BLK_DEV_IDE_PMAC=y | |||
| 516 | CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y | 521 | CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y |
| 517 | CONFIG_BLK_DEV_IDEDMA_PMAC=y | 522 | CONFIG_BLK_DEV_IDEDMA_PMAC=y |
| 518 | CONFIG_BLK_DEV_IDEDMA=y | 523 | CONFIG_BLK_DEV_IDEDMA=y |
| 519 | # CONFIG_BLK_DEV_HD_ONLY is not set | ||
| 520 | # CONFIG_BLK_DEV_HD is not set | ||
| 521 | 524 | ||
| 522 | # | 525 | # |
| 523 | # SCSI device support | 526 | # SCSI device support |
| @@ -592,6 +595,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 592 | # CONFIG_SCSI_DC390T is not set | 595 | # CONFIG_SCSI_DC390T is not set |
| 593 | # CONFIG_SCSI_DEBUG is not set | 596 | # CONFIG_SCSI_DEBUG is not set |
| 594 | # CONFIG_SCSI_SRP is not set | 597 | # CONFIG_SCSI_SRP is not set |
| 598 | # CONFIG_SCSI_DH is not set | ||
| 595 | CONFIG_ATA=y | 599 | CONFIG_ATA=y |
| 596 | # CONFIG_ATA_NONSTANDARD is not set | 600 | # CONFIG_ATA_NONSTANDARD is not set |
| 597 | CONFIG_SATA_PMP=y | 601 | CONFIG_SATA_PMP=y |
| @@ -675,29 +679,21 @@ CONFIG_DM_ZERO=m | |||
| 675 | # | 679 | # |
| 676 | # IEEE 1394 (FireWire) support | 680 | # IEEE 1394 (FireWire) support |
| 677 | # | 681 | # |
| 678 | # CONFIG_FIREWIRE is not set | ||
| 679 | CONFIG_IEEE1394=y | ||
| 680 | |||
| 681 | # | ||
| 682 | # Subsystem Options | ||
| 683 | # | ||
| 684 | # CONFIG_IEEE1394_VERBOSEDEBUG is not set | ||
| 685 | 682 | ||
| 686 | # | 683 | # |
| 687 | # Controllers | 684 | # Enable only one of the two stacks, unless you know what you are doing |
| 688 | # | 685 | # |
| 689 | # CONFIG_IEEE1394_PCILYNX is not set | 686 | # CONFIG_FIREWIRE is not set |
| 687 | CONFIG_IEEE1394=y | ||
| 690 | CONFIG_IEEE1394_OHCI1394=y | 688 | CONFIG_IEEE1394_OHCI1394=y |
| 691 | 689 | # CONFIG_IEEE1394_PCILYNX is not set | |
| 692 | # | ||
| 693 | # Protocols | ||
| 694 | # | ||
| 695 | CONFIG_IEEE1394_VIDEO1394=m | ||
| 696 | CONFIG_IEEE1394_SBP2=m | 690 | CONFIG_IEEE1394_SBP2=m |
| 697 | CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y | 691 | CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y |
| 698 | CONFIG_IEEE1394_ETH1394=m | 692 | CONFIG_IEEE1394_ETH1394=m |
| 699 | CONFIG_IEEE1394_DV1394=m | ||
| 700 | CONFIG_IEEE1394_RAWIO=y | 693 | CONFIG_IEEE1394_RAWIO=y |
| 694 | CONFIG_IEEE1394_VIDEO1394=m | ||
| 695 | CONFIG_IEEE1394_DV1394=m | ||
| 696 | # CONFIG_IEEE1394_VERBOSEDEBUG is not set | ||
| 701 | # CONFIG_I2O is not set | 697 | # CONFIG_I2O is not set |
| 702 | CONFIG_MACINTOSH_DRIVERS=y | 698 | CONFIG_MACINTOSH_DRIVERS=y |
| 703 | CONFIG_ADB_PMU=y | 699 | CONFIG_ADB_PMU=y |
| @@ -712,7 +708,6 @@ CONFIG_WINDFARM_PM112=y | |||
| 712 | CONFIG_WINDFARM_PM121=y | 708 | CONFIG_WINDFARM_PM121=y |
| 713 | # CONFIG_PMAC_RACKMETER is not set | 709 | # CONFIG_PMAC_RACKMETER is not set |
| 714 | CONFIG_NETDEVICES=y | 710 | CONFIG_NETDEVICES=y |
| 715 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 716 | CONFIG_DUMMY=m | 711 | CONFIG_DUMMY=m |
| 717 | CONFIG_BONDING=m | 712 | CONFIG_BONDING=m |
| 718 | # CONFIG_MACVLAN is not set | 713 | # CONFIG_MACVLAN is not set |
| @@ -720,7 +715,23 @@ CONFIG_BONDING=m | |||
| 720 | CONFIG_TUN=m | 715 | CONFIG_TUN=m |
| 721 | # CONFIG_VETH is not set | 716 | # CONFIG_VETH is not set |
| 722 | # CONFIG_ARCNET is not set | 717 | # CONFIG_ARCNET is not set |
| 723 | # CONFIG_PHYLIB is not set | 718 | CONFIG_PHYLIB=y |
| 719 | |||
| 720 | # | ||
| 721 | # MII PHY device drivers | ||
| 722 | # | ||
| 723 | # CONFIG_MARVELL_PHY is not set | ||
| 724 | # CONFIG_DAVICOM_PHY is not set | ||
| 725 | # CONFIG_QSEMI_PHY is not set | ||
| 726 | # CONFIG_LXT_PHY is not set | ||
| 727 | # CONFIG_CICADA_PHY is not set | ||
| 728 | # CONFIG_VITESSE_PHY is not set | ||
| 729 | # CONFIG_SMSC_PHY is not set | ||
| 730 | # CONFIG_BROADCOM_PHY is not set | ||
| 731 | # CONFIG_ICPLUS_PHY is not set | ||
| 732 | # CONFIG_REALTEK_PHY is not set | ||
| 733 | # CONFIG_FIXED_PHY is not set | ||
| 734 | # CONFIG_MDIO_BITBANG is not set | ||
| 724 | CONFIG_NET_ETHERNET=y | 735 | CONFIG_NET_ETHERNET=y |
| 725 | CONFIG_MII=y | 736 | CONFIG_MII=y |
| 726 | # CONFIG_HAPPYMEAL is not set | 737 | # CONFIG_HAPPYMEAL is not set |
| @@ -740,10 +751,8 @@ CONFIG_ACENIC=y | |||
| 740 | CONFIG_ACENIC_OMIT_TIGON_I=y | 751 | CONFIG_ACENIC_OMIT_TIGON_I=y |
| 741 | # CONFIG_DL2K is not set | 752 | # CONFIG_DL2K is not set |
| 742 | CONFIG_E1000=y | 753 | CONFIG_E1000=y |
| 743 | # CONFIG_E1000_NAPI is not set | ||
| 744 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | 754 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set |
| 745 | # CONFIG_E1000E is not set | 755 | # CONFIG_E1000E is not set |
| 746 | # CONFIG_E1000E_ENABLED is not set | ||
| 747 | # CONFIG_IP1000 is not set | 756 | # CONFIG_IP1000 is not set |
| 748 | # CONFIG_IGB is not set | 757 | # CONFIG_IGB is not set |
| 749 | # CONFIG_NS83820 is not set | 758 | # CONFIG_NS83820 is not set |
| @@ -758,6 +767,7 @@ CONFIG_TIGON3=y | |||
| 758 | # CONFIG_BNX2 is not set | 767 | # CONFIG_BNX2 is not set |
| 759 | # CONFIG_QLA3XXX is not set | 768 | # CONFIG_QLA3XXX is not set |
| 760 | # CONFIG_ATL1 is not set | 769 | # CONFIG_ATL1 is not set |
| 770 | # CONFIG_ATL1E is not set | ||
| 761 | CONFIG_NETDEV_10000=y | 771 | CONFIG_NETDEV_10000=y |
| 762 | # CONFIG_CHELSIO_T1 is not set | 772 | # CONFIG_CHELSIO_T1 is not set |
| 763 | # CONFIG_CHELSIO_T3 is not set | 773 | # CONFIG_CHELSIO_T3 is not set |
| @@ -855,6 +865,7 @@ CONFIG_INPUT_MOUSE=y | |||
| 855 | # CONFIG_MOUSE_PS2 is not set | 865 | # CONFIG_MOUSE_PS2 is not set |
| 856 | # CONFIG_MOUSE_SERIAL is not set | 866 | # CONFIG_MOUSE_SERIAL is not set |
| 857 | # CONFIG_MOUSE_APPLETOUCH is not set | 867 | # CONFIG_MOUSE_APPLETOUCH is not set |
| 868 | # CONFIG_MOUSE_BCM5974 is not set | ||
| 858 | # CONFIG_MOUSE_VSXXXAA is not set | 869 | # CONFIG_MOUSE_VSXXXAA is not set |
| 859 | # CONFIG_INPUT_JOYSTICK is not set | 870 | # CONFIG_INPUT_JOYSTICK is not set |
| 860 | # CONFIG_INPUT_TABLET is not set | 871 | # CONFIG_INPUT_TABLET is not set |
| @@ -869,12 +880,14 @@ CONFIG_SERIO=y | |||
| 869 | # CONFIG_SERIO_SERPORT is not set | 880 | # CONFIG_SERIO_SERPORT is not set |
| 870 | # CONFIG_SERIO_PCIPS2 is not set | 881 | # CONFIG_SERIO_PCIPS2 is not set |
| 871 | # CONFIG_SERIO_RAW is not set | 882 | # CONFIG_SERIO_RAW is not set |
| 883 | # CONFIG_SERIO_XILINX_XPS_PS2 is not set | ||
| 872 | # CONFIG_GAMEPORT is not set | 884 | # CONFIG_GAMEPORT is not set |
| 873 | 885 | ||
| 874 | # | 886 | # |
| 875 | # Character devices | 887 | # Character devices |
| 876 | # | 888 | # |
| 877 | CONFIG_VT=y | 889 | CONFIG_VT=y |
| 890 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 878 | CONFIG_VT_CONSOLE=y | 891 | CONFIG_VT_CONSOLE=y |
| 879 | CONFIG_HW_CONSOLE=y | 892 | CONFIG_HW_CONSOLE=y |
| 880 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 893 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| @@ -909,44 +922,69 @@ CONFIG_DEVPORT=y | |||
| 909 | CONFIG_I2C=y | 922 | CONFIG_I2C=y |
| 910 | CONFIG_I2C_BOARDINFO=y | 923 | CONFIG_I2C_BOARDINFO=y |
| 911 | CONFIG_I2C_CHARDEV=y | 924 | CONFIG_I2C_CHARDEV=y |
| 925 | CONFIG_I2C_HELPER_AUTO=y | ||
| 912 | CONFIG_I2C_ALGOBIT=y | 926 | CONFIG_I2C_ALGOBIT=y |
| 913 | 927 | ||
| 914 | # | 928 | # |
| 915 | # I2C Hardware Bus support | 929 | # I2C Hardware Bus support |
| 916 | # | 930 | # |
| 931 | |||
| 932 | # | ||
| 933 | # PC SMBus host controller drivers | ||
| 934 | # | ||
| 917 | # CONFIG_I2C_ALI1535 is not set | 935 | # CONFIG_I2C_ALI1535 is not set |
| 918 | # CONFIG_I2C_ALI1563 is not set | 936 | # CONFIG_I2C_ALI1563 is not set |
| 919 | # CONFIG_I2C_ALI15X3 is not set | 937 | # CONFIG_I2C_ALI15X3 is not set |
| 920 | # CONFIG_I2C_AMD756 is not set | 938 | # CONFIG_I2C_AMD756 is not set |
| 921 | # CONFIG_I2C_AMD8111 is not set | 939 | # CONFIG_I2C_AMD8111 is not set |
| 922 | # CONFIG_I2C_I801 is not set | 940 | # CONFIG_I2C_I801 is not set |
| 923 | # CONFIG_I2C_I810 is not set | 941 | # CONFIG_I2C_ISCH is not set |
| 924 | # CONFIG_I2C_PIIX4 is not set | 942 | # CONFIG_I2C_PIIX4 is not set |
| 925 | CONFIG_I2C_POWERMAC=y | ||
| 926 | # CONFIG_I2C_NFORCE2 is not set | 943 | # CONFIG_I2C_NFORCE2 is not set |
| 927 | # CONFIG_I2C_OCORES is not set | ||
| 928 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 929 | # CONFIG_I2C_PROSAVAGE is not set | ||
| 930 | # CONFIG_I2C_SAVAGE4 is not set | ||
| 931 | # CONFIG_I2C_SIMTEC is not set | ||
| 932 | # CONFIG_I2C_SIS5595 is not set | 944 | # CONFIG_I2C_SIS5595 is not set |
| 933 | # CONFIG_I2C_SIS630 is not set | 945 | # CONFIG_I2C_SIS630 is not set |
| 934 | # CONFIG_I2C_SIS96X is not set | 946 | # CONFIG_I2C_SIS96X is not set |
| 935 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 936 | # CONFIG_I2C_STUB is not set | ||
| 937 | # CONFIG_I2C_TINY_USB is not set | ||
| 938 | # CONFIG_I2C_VIA is not set | 947 | # CONFIG_I2C_VIA is not set |
| 939 | # CONFIG_I2C_VIAPRO is not set | 948 | # CONFIG_I2C_VIAPRO is not set |
| 949 | |||
| 950 | # | ||
| 951 | # Mac SMBus host controller drivers | ||
| 952 | # | ||
| 953 | CONFIG_I2C_POWERMAC=y | ||
| 954 | |||
| 955 | # | ||
| 956 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 957 | # | ||
| 958 | # CONFIG_I2C_OCORES is not set | ||
| 959 | # CONFIG_I2C_SIMTEC is not set | ||
| 960 | |||
| 961 | # | ||
| 962 | # External I2C/SMBus adapter drivers | ||
| 963 | # | ||
| 964 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 965 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 966 | # CONFIG_I2C_TINY_USB is not set | ||
| 967 | |||
| 968 | # | ||
| 969 | # Graphics adapter I2C/DDC channel drivers | ||
| 970 | # | ||
| 940 | # CONFIG_I2C_VOODOO3 is not set | 971 | # CONFIG_I2C_VOODOO3 is not set |
| 972 | |||
| 973 | # | ||
| 974 | # Other I2C/SMBus bus drivers | ||
| 975 | # | ||
| 941 | # CONFIG_I2C_PCA_PLATFORM is not set | 976 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 977 | # CONFIG_I2C_STUB is not set | ||
| 942 | 978 | ||
| 943 | # | 979 | # |
| 944 | # Miscellaneous I2C Chip support | 980 | # Miscellaneous I2C Chip support |
| 945 | # | 981 | # |
| 946 | # CONFIG_DS1682 is not set | 982 | # CONFIG_DS1682 is not set |
| 983 | # CONFIG_AT24 is not set | ||
| 947 | # CONFIG_SENSORS_EEPROM is not set | 984 | # CONFIG_SENSORS_EEPROM is not set |
| 948 | # CONFIG_SENSORS_PCF8574 is not set | 985 | # CONFIG_SENSORS_PCF8574 is not set |
| 949 | # CONFIG_PCF8575 is not set | 986 | # CONFIG_PCF8575 is not set |
| 987 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 950 | # CONFIG_SENSORS_PCF8591 is not set | 988 | # CONFIG_SENSORS_PCF8591 is not set |
| 951 | # CONFIG_SENSORS_MAX6875 is not set | 989 | # CONFIG_SENSORS_MAX6875 is not set |
| 952 | # CONFIG_SENSORS_TSL2550 is not set | 990 | # CONFIG_SENSORS_TSL2550 is not set |
| @@ -955,10 +993,13 @@ CONFIG_I2C_POWERMAC=y | |||
| 955 | # CONFIG_I2C_DEBUG_BUS is not set | 993 | # CONFIG_I2C_DEBUG_BUS is not set |
| 956 | # CONFIG_I2C_DEBUG_CHIP is not set | 994 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 957 | # CONFIG_SPI is not set | 995 | # CONFIG_SPI is not set |
| 996 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 997 | # CONFIG_GPIOLIB is not set | ||
| 958 | # CONFIG_W1 is not set | 998 | # CONFIG_W1 is not set |
| 959 | # CONFIG_POWER_SUPPLY is not set | 999 | # CONFIG_POWER_SUPPLY is not set |
| 960 | # CONFIG_HWMON is not set | 1000 | # CONFIG_HWMON is not set |
| 961 | # CONFIG_THERMAL is not set | 1001 | # CONFIG_THERMAL is not set |
| 1002 | # CONFIG_THERMAL_HWMON is not set | ||
| 962 | # CONFIG_WATCHDOG is not set | 1003 | # CONFIG_WATCHDOG is not set |
| 963 | 1004 | ||
| 964 | # | 1005 | # |
| @@ -970,8 +1011,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 970 | # | 1011 | # |
| 971 | # Multifunction device drivers | 1012 | # Multifunction device drivers |
| 972 | # | 1013 | # |
| 1014 | # CONFIG_MFD_CORE is not set | ||
| 973 | # CONFIG_MFD_SM501 is not set | 1015 | # CONFIG_MFD_SM501 is not set |
| 974 | # CONFIG_HTC_PASIC3 is not set | 1016 | # CONFIG_HTC_PASIC3 is not set |
| 1017 | # CONFIG_MFD_TMIO is not set | ||
| 975 | 1018 | ||
| 976 | # | 1019 | # |
| 977 | # Multimedia devices | 1020 | # Multimedia devices |
| @@ -1050,10 +1093,13 @@ CONFIG_FB_RADEON_BACKLIGHT=y | |||
| 1050 | # CONFIG_FB_TRIDENT is not set | 1093 | # CONFIG_FB_TRIDENT is not set |
| 1051 | # CONFIG_FB_ARK is not set | 1094 | # CONFIG_FB_ARK is not set |
| 1052 | # CONFIG_FB_PM3 is not set | 1095 | # CONFIG_FB_PM3 is not set |
| 1096 | # CONFIG_FB_CARMINE is not set | ||
| 1053 | # CONFIG_FB_IBM_GXT4500 is not set | 1097 | # CONFIG_FB_IBM_GXT4500 is not set |
| 1054 | # CONFIG_FB_VIRTUAL is not set | 1098 | # CONFIG_FB_VIRTUAL is not set |
| 1055 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | 1099 | CONFIG_BACKLIGHT_LCD_SUPPORT=y |
| 1056 | CONFIG_LCD_CLASS_DEVICE=m | 1100 | CONFIG_LCD_CLASS_DEVICE=m |
| 1101 | # CONFIG_LCD_ILI9320 is not set | ||
| 1102 | # CONFIG_LCD_PLATFORM is not set | ||
| 1057 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | 1103 | CONFIG_BACKLIGHT_CLASS_DEVICE=y |
| 1058 | # CONFIG_BACKLIGHT_CORGI is not set | 1104 | # CONFIG_BACKLIGHT_CORGI is not set |
| 1059 | 1105 | ||
| @@ -1077,15 +1123,7 @@ CONFIG_LOGO=y | |||
| 1077 | CONFIG_LOGO_LINUX_MONO=y | 1123 | CONFIG_LOGO_LINUX_MONO=y |
| 1078 | CONFIG_LOGO_LINUX_VGA16=y | 1124 | CONFIG_LOGO_LINUX_VGA16=y |
| 1079 | CONFIG_LOGO_LINUX_CLUT224=y | 1125 | CONFIG_LOGO_LINUX_CLUT224=y |
| 1080 | |||
| 1081 | # | ||
| 1082 | # Sound | ||
| 1083 | # | ||
| 1084 | CONFIG_SOUND=m | 1126 | CONFIG_SOUND=m |
| 1085 | |||
| 1086 | # | ||
| 1087 | # Advanced Linux Sound Architecture | ||
| 1088 | # | ||
| 1089 | CONFIG_SND=m | 1127 | CONFIG_SND=m |
| 1090 | CONFIG_SND_TIMER=m | 1128 | CONFIG_SND_TIMER=m |
| 1091 | CONFIG_SND_PCM=m | 1129 | CONFIG_SND_PCM=m |
| @@ -1103,19 +1141,13 @@ CONFIG_SND_SUPPORT_OLD_API=y | |||
| 1103 | CONFIG_SND_VERBOSE_PROCFS=y | 1141 | CONFIG_SND_VERBOSE_PROCFS=y |
| 1104 | # CONFIG_SND_VERBOSE_PRINTK is not set | 1142 | # CONFIG_SND_VERBOSE_PRINTK is not set |
| 1105 | # CONFIG_SND_DEBUG is not set | 1143 | # CONFIG_SND_DEBUG is not set |
| 1106 | 1144 | CONFIG_SND_DRIVERS=y | |
| 1107 | # | ||
| 1108 | # Generic devices | ||
| 1109 | # | ||
| 1110 | # CONFIG_SND_DUMMY is not set | 1145 | # CONFIG_SND_DUMMY is not set |
| 1111 | # CONFIG_SND_VIRMIDI is not set | 1146 | # CONFIG_SND_VIRMIDI is not set |
| 1112 | # CONFIG_SND_MTPAV is not set | 1147 | # CONFIG_SND_MTPAV is not set |
| 1113 | # CONFIG_SND_SERIAL_U16550 is not set | 1148 | # CONFIG_SND_SERIAL_U16550 is not set |
| 1114 | # CONFIG_SND_MPU401 is not set | 1149 | # CONFIG_SND_MPU401 is not set |
| 1115 | 1150 | CONFIG_SND_PCI=y | |
| 1116 | # | ||
| 1117 | # PCI devices | ||
| 1118 | # | ||
| 1119 | # CONFIG_SND_AD1889 is not set | 1151 | # CONFIG_SND_AD1889 is not set |
| 1120 | # CONFIG_SND_ALS300 is not set | 1152 | # CONFIG_SND_ALS300 is not set |
| 1121 | # CONFIG_SND_ALS4000 is not set | 1153 | # CONFIG_SND_ALS4000 is not set |
| @@ -1177,20 +1209,9 @@ CONFIG_SND_VERBOSE_PROCFS=y | |||
| 1177 | # CONFIG_SND_VIRTUOSO is not set | 1209 | # CONFIG_SND_VIRTUOSO is not set |
| 1178 | # CONFIG_SND_VX222 is not set | 1210 | # CONFIG_SND_VX222 is not set |
| 1179 | # CONFIG_SND_YMFPCI is not set | 1211 | # CONFIG_SND_YMFPCI is not set |
| 1180 | 1212 | CONFIG_SND_PPC=y | |
| 1181 | # | ||
| 1182 | # ALSA PowerMac devices | ||
| 1183 | # | ||
| 1184 | CONFIG_SND_POWERMAC=m | 1213 | CONFIG_SND_POWERMAC=m |
| 1185 | CONFIG_SND_POWERMAC_AUTO_DRC=y | 1214 | CONFIG_SND_POWERMAC_AUTO_DRC=y |
| 1186 | |||
| 1187 | # | ||
| 1188 | # ALSA PowerPC devices | ||
| 1189 | # | ||
| 1190 | |||
| 1191 | # | ||
| 1192 | # Apple Onboard Audio driver | ||
| 1193 | # | ||
| 1194 | CONFIG_SND_AOA=m | 1215 | CONFIG_SND_AOA=m |
| 1195 | CONFIG_SND_AOA_FABRIC_LAYOUT=m | 1216 | CONFIG_SND_AOA_FABRIC_LAYOUT=m |
| 1196 | CONFIG_SND_AOA_ONYX=m | 1217 | CONFIG_SND_AOA_ONYX=m |
| @@ -1198,30 +1219,11 @@ CONFIG_SND_AOA_TAS=m | |||
| 1198 | CONFIG_SND_AOA_TOONIE=m | 1219 | CONFIG_SND_AOA_TOONIE=m |
| 1199 | CONFIG_SND_AOA_SOUNDBUS=m | 1220 | CONFIG_SND_AOA_SOUNDBUS=m |
| 1200 | CONFIG_SND_AOA_SOUNDBUS_I2S=m | 1221 | CONFIG_SND_AOA_SOUNDBUS_I2S=m |
| 1201 | 1222 | CONFIG_SND_USB=y | |
| 1202 | # | ||
| 1203 | # USB devices | ||
| 1204 | # | ||
| 1205 | CONFIG_SND_USB_AUDIO=m | 1223 | CONFIG_SND_USB_AUDIO=m |
| 1206 | # CONFIG_SND_USB_USX2Y is not set | 1224 | # CONFIG_SND_USB_USX2Y is not set |
| 1207 | # CONFIG_SND_USB_CAIAQ is not set | 1225 | # CONFIG_SND_USB_CAIAQ is not set |
| 1208 | |||
| 1209 | # | ||
| 1210 | # System on Chip audio support | ||
| 1211 | # | ||
| 1212 | # CONFIG_SND_SOC is not set | 1226 | # CONFIG_SND_SOC is not set |
| 1213 | |||
| 1214 | # | ||
| 1215 | # ALSA SoC audio for Freescale SOCs | ||
| 1216 | # | ||
| 1217 | |||
| 1218 | # | ||
| 1219 | # SoC Audio for the Texas Instruments OMAP | ||
| 1220 | # | ||
| 1221 | |||
| 1222 | # | ||
| 1223 | # Open Sound System | ||
| 1224 | # | ||
| 1225 | # CONFIG_SOUND_PRIME is not set | 1227 | # CONFIG_SOUND_PRIME is not set |
| 1226 | CONFIG_HID_SUPPORT=y | 1228 | CONFIG_HID_SUPPORT=y |
| 1227 | CONFIG_HID=y | 1229 | CONFIG_HID=y |
| @@ -1256,6 +1258,7 @@ CONFIG_USB_DEVICEFS=y | |||
| 1256 | CONFIG_USB_DEVICE_CLASS=y | 1258 | CONFIG_USB_DEVICE_CLASS=y |
| 1257 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1259 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 1258 | # CONFIG_USB_OTG is not set | 1260 | # CONFIG_USB_OTG is not set |
| 1261 | CONFIG_USB_MON=y | ||
| 1259 | 1262 | ||
| 1260 | # | 1263 | # |
| 1261 | # USB Host Controller Drivers | 1264 | # USB Host Controller Drivers |
| @@ -1306,6 +1309,7 @@ CONFIG_USB_STORAGE_JUMPSHOT=y | |||
| 1306 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1309 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1307 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1310 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
| 1308 | # CONFIG_USB_STORAGE_KARMA is not set | 1311 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1312 | # CONFIG_USB_STORAGE_SIERRA is not set | ||
| 1309 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | 1313 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
| 1310 | # CONFIG_USB_LIBUSUAL is not set | 1314 | # CONFIG_USB_LIBUSUAL is not set |
| 1311 | 1315 | ||
| @@ -1314,7 +1318,6 @@ CONFIG_USB_STORAGE_JUMPSHOT=y | |||
| 1314 | # | 1318 | # |
| 1315 | # CONFIG_USB_MDC800 is not set | 1319 | # CONFIG_USB_MDC800 is not set |
| 1316 | # CONFIG_USB_MICROTEK is not set | 1320 | # CONFIG_USB_MICROTEK is not set |
| 1317 | CONFIG_USB_MON=y | ||
| 1318 | 1321 | ||
| 1319 | # | 1322 | # |
| 1320 | # USB port drivers | 1323 | # USB port drivers |
| @@ -1323,7 +1326,6 @@ CONFIG_USB_SERIAL=m | |||
| 1323 | CONFIG_USB_EZUSB=y | 1326 | CONFIG_USB_EZUSB=y |
| 1324 | CONFIG_USB_SERIAL_GENERIC=y | 1327 | CONFIG_USB_SERIAL_GENERIC=y |
| 1325 | # CONFIG_USB_SERIAL_AIRCABLE is not set | 1328 | # CONFIG_USB_SERIAL_AIRCABLE is not set |
| 1326 | # CONFIG_USB_SERIAL_AIRPRIME is not set | ||
| 1327 | # CONFIG_USB_SERIAL_ARK3116 is not set | 1329 | # CONFIG_USB_SERIAL_ARK3116 is not set |
| 1328 | CONFIG_USB_SERIAL_BELKIN=m | 1330 | CONFIG_USB_SERIAL_BELKIN=m |
| 1329 | # CONFIG_USB_SERIAL_CH341 is not set | 1331 | # CONFIG_USB_SERIAL_CH341 is not set |
| @@ -1383,7 +1385,6 @@ CONFIG_USB_SERIAL_OMNINET=m | |||
| 1383 | # CONFIG_USB_EMI62 is not set | 1385 | # CONFIG_USB_EMI62 is not set |
| 1384 | # CONFIG_USB_EMI26 is not set | 1386 | # CONFIG_USB_EMI26 is not set |
| 1385 | # CONFIG_USB_ADUTUX is not set | 1387 | # CONFIG_USB_ADUTUX is not set |
| 1386 | # CONFIG_USB_AUERSWALD is not set | ||
| 1387 | # CONFIG_USB_RIO500 is not set | 1388 | # CONFIG_USB_RIO500 is not set |
| 1388 | # CONFIG_USB_LEGOTOWER is not set | 1389 | # CONFIG_USB_LEGOTOWER is not set |
| 1389 | # CONFIG_USB_LCD is not set | 1390 | # CONFIG_USB_LCD is not set |
| @@ -1497,6 +1498,7 @@ CONFIG_HFSPLUS_FS=m | |||
| 1497 | CONFIG_CRAMFS=y | 1498 | CONFIG_CRAMFS=y |
| 1498 | # CONFIG_VXFS_FS is not set | 1499 | # CONFIG_VXFS_FS is not set |
| 1499 | # CONFIG_MINIX_FS is not set | 1500 | # CONFIG_MINIX_FS is not set |
| 1501 | # CONFIG_OMFS_FS is not set | ||
| 1500 | # CONFIG_HPFS_FS is not set | 1502 | # CONFIG_HPFS_FS is not set |
| 1501 | # CONFIG_QNX4FS_FS is not set | 1503 | # CONFIG_QNX4FS_FS is not set |
| 1502 | # CONFIG_ROMFS_FS is not set | 1504 | # CONFIG_ROMFS_FS is not set |
| @@ -1519,7 +1521,6 @@ CONFIG_NFS_ACL_SUPPORT=y | |||
| 1519 | CONFIG_NFS_COMMON=y | 1521 | CONFIG_NFS_COMMON=y |
| 1520 | CONFIG_SUNRPC=y | 1522 | CONFIG_SUNRPC=y |
| 1521 | CONFIG_SUNRPC_GSS=y | 1523 | CONFIG_SUNRPC_GSS=y |
| 1522 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 1523 | CONFIG_RPCSEC_GSS_KRB5=y | 1524 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1524 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1525 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1525 | # CONFIG_SMB_FS is not set | 1526 | # CONFIG_SMB_FS is not set |
| @@ -1603,6 +1604,7 @@ CONFIG_BITREVERSE=y | |||
| 1603 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1604 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 1604 | CONFIG_CRC_CCITT=m | 1605 | CONFIG_CRC_CCITT=m |
| 1605 | # CONFIG_CRC16 is not set | 1606 | # CONFIG_CRC16 is not set |
| 1607 | CONFIG_CRC_T10DIF=y | ||
| 1606 | CONFIG_CRC_ITU_T=m | 1608 | CONFIG_CRC_ITU_T=m |
| 1607 | CONFIG_CRC32=y | 1609 | CONFIG_CRC32=y |
| 1608 | # CONFIG_CRC7 is not set | 1610 | # CONFIG_CRC7 is not set |
| @@ -1629,8 +1631,10 @@ CONFIG_DEBUG_FS=y | |||
| 1629 | CONFIG_DEBUG_KERNEL=y | 1631 | CONFIG_DEBUG_KERNEL=y |
| 1630 | # CONFIG_DEBUG_SHIRQ is not set | 1632 | # CONFIG_DEBUG_SHIRQ is not set |
| 1631 | CONFIG_DETECT_SOFTLOCKUP=y | 1633 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1634 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 1635 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 1632 | CONFIG_SCHED_DEBUG=y | 1636 | CONFIG_SCHED_DEBUG=y |
| 1633 | # CONFIG_SCHEDSTATS is not set | 1637 | CONFIG_SCHEDSTATS=y |
| 1634 | # CONFIG_TIMER_STATS is not set | 1638 | # CONFIG_TIMER_STATS is not set |
| 1635 | # CONFIG_DEBUG_OBJECTS is not set | 1639 | # CONFIG_DEBUG_OBJECTS is not set |
| 1636 | # CONFIG_SLUB_DEBUG_ON is not set | 1640 | # CONFIG_SLUB_DEBUG_ON is not set |
| @@ -1644,22 +1648,37 @@ CONFIG_DEBUG_MUTEXES=y | |||
| 1644 | # CONFIG_LOCK_STAT is not set | 1648 | # CONFIG_LOCK_STAT is not set |
| 1645 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1649 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
| 1646 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1650 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
| 1651 | CONFIG_STACKTRACE=y | ||
| 1647 | # CONFIG_DEBUG_KOBJECT is not set | 1652 | # CONFIG_DEBUG_KOBJECT is not set |
| 1648 | CONFIG_DEBUG_BUGVERBOSE=y | 1653 | CONFIG_DEBUG_BUGVERBOSE=y |
| 1649 | # CONFIG_DEBUG_INFO is not set | 1654 | # CONFIG_DEBUG_INFO is not set |
| 1650 | # CONFIG_DEBUG_VM is not set | 1655 | # CONFIG_DEBUG_VM is not set |
| 1651 | # CONFIG_DEBUG_WRITECOUNT is not set | 1656 | # CONFIG_DEBUG_WRITECOUNT is not set |
| 1657 | CONFIG_DEBUG_MEMORY_INIT=y | ||
| 1652 | # CONFIG_DEBUG_LIST is not set | 1658 | # CONFIG_DEBUG_LIST is not set |
| 1653 | # CONFIG_DEBUG_SG is not set | 1659 | # CONFIG_DEBUG_SG is not set |
| 1660 | CONFIG_FRAME_POINTER=y | ||
| 1654 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1661 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 1655 | # CONFIG_RCU_TORTURE_TEST is not set | 1662 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1656 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1663 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 1657 | # CONFIG_FAULT_INJECTION is not set | 1664 | # CONFIG_FAULT_INJECTION is not set |
| 1665 | CONFIG_LATENCYTOP=y | ||
| 1666 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1667 | CONFIG_HAVE_FTRACE=y | ||
| 1668 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1669 | # CONFIG_FTRACE is not set | ||
| 1670 | # CONFIG_IRQSOFF_TRACER is not set | ||
| 1671 | # CONFIG_SCHED_TRACER is not set | ||
| 1672 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1658 | # CONFIG_SAMPLES is not set | 1673 | # CONFIG_SAMPLES is not set |
| 1674 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1675 | # CONFIG_KGDB is not set | ||
| 1659 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1676 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
| 1660 | # CONFIG_DEBUG_STACK_USAGE is not set | 1677 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1661 | # CONFIG_DEBUG_PAGEALLOC is not set | 1678 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1662 | # CONFIG_DEBUGGER is not set | 1679 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
| 1680 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
| 1681 | # CONFIG_XMON is not set | ||
| 1663 | CONFIG_IRQSTACKS=y | 1682 | CONFIG_IRQSTACKS=y |
| 1664 | # CONFIG_VIRQ_DEBUG is not set | 1683 | # CONFIG_VIRQ_DEBUG is not set |
| 1665 | CONFIG_BOOTX_TEXT=y | 1684 | CONFIG_BOOTX_TEXT=y |
| @@ -1718,6 +1737,10 @@ CONFIG_CRYPTO_CRC32C=m | |||
| 1718 | CONFIG_CRYPTO_MD4=m | 1737 | CONFIG_CRYPTO_MD4=m |
| 1719 | CONFIG_CRYPTO_MD5=y | 1738 | CONFIG_CRYPTO_MD5=y |
| 1720 | CONFIG_CRYPTO_MICHAEL_MIC=m | 1739 | CONFIG_CRYPTO_MICHAEL_MIC=m |
| 1740 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1741 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1742 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1743 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1721 | CONFIG_CRYPTO_SHA1=m | 1744 | CONFIG_CRYPTO_SHA1=m |
| 1722 | CONFIG_CRYPTO_SHA256=m | 1745 | CONFIG_CRYPTO_SHA256=m |
| 1723 | CONFIG_CRYPTO_SHA512=m | 1746 | CONFIG_CRYPTO_SHA512=m |
diff --git a/arch/powerpc/configs/iseries_defconfig b/arch/powerpc/configs/iseries_defconfig index 63f0bdb6340d..2c3f13577f4b 100644 --- a/arch/powerpc/configs/iseries_defconfig +++ b/arch/powerpc/configs/iseries_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.26-rc3 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Tue May 20 20:01:36 2008 | 4 | # Tue Aug 26 13:15:49 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
| 7 | 7 | ||
| @@ -31,6 +31,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 31 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y | 31 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y |
| 32 | CONFIG_IRQ_PER_CPU=y | 32 | CONFIG_IRQ_PER_CPU=y |
| 33 | CONFIG_STACKTRACE_SUPPORT=y | 33 | CONFIG_STACKTRACE_SUPPORT=y |
| 34 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 34 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 35 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
| 35 | CONFIG_LOCKDEP_SUPPORT=y | 36 | CONFIG_LOCKDEP_SUPPORT=y |
| 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| @@ -94,9 +95,8 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y | |||
| 94 | CONFIG_SYSCTL=y | 95 | CONFIG_SYSCTL=y |
| 95 | # CONFIG_EMBEDDED is not set | 96 | # CONFIG_EMBEDDED is not set |
| 96 | CONFIG_SYSCTL_SYSCALL=y | 97 | CONFIG_SYSCTL_SYSCALL=y |
| 97 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 98 | CONFIG_KALLSYMS=y | 98 | CONFIG_KALLSYMS=y |
| 99 | # CONFIG_KALLSYMS_ALL is not set | 99 | CONFIG_KALLSYMS_ALL=y |
| 100 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 100 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 101 | CONFIG_HOTPLUG=y | 101 | CONFIG_HOTPLUG=y |
| 102 | CONFIG_PRINTK=y | 102 | CONFIG_PRINTK=y |
| @@ -120,10 +120,16 @@ CONFIG_SLUB=y | |||
| 120 | # CONFIG_MARKERS is not set | 120 | # CONFIG_MARKERS is not set |
| 121 | CONFIG_HAVE_OPROFILE=y | 121 | CONFIG_HAVE_OPROFILE=y |
| 122 | # CONFIG_KPROBES is not set | 122 | # CONFIG_KPROBES is not set |
| 123 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 124 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 123 | CONFIG_HAVE_KPROBES=y | 125 | CONFIG_HAVE_KPROBES=y |
| 124 | CONFIG_HAVE_KRETPROBES=y | 126 | CONFIG_HAVE_KRETPROBES=y |
| 125 | # CONFIG_HAVE_DMA_ATTRS is not set | 127 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
| 128 | CONFIG_HAVE_DMA_ATTRS=y | ||
| 129 | CONFIG_USE_GENERIC_SMP_HELPERS=y | ||
| 130 | # CONFIG_HAVE_CLK is not set | ||
| 126 | CONFIG_PROC_PAGE_MONITOR=y | 131 | CONFIG_PROC_PAGE_MONITOR=y |
| 132 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 127 | CONFIG_SLABINFO=y | 133 | CONFIG_SLABINFO=y |
| 128 | CONFIG_RT_MUTEXES=y | 134 | CONFIG_RT_MUTEXES=y |
| 129 | # CONFIG_TINY_SHMEM is not set | 135 | # CONFIG_TINY_SHMEM is not set |
| @@ -139,6 +145,7 @@ CONFIG_STOP_MACHINE=y | |||
| 139 | CONFIG_BLOCK=y | 145 | CONFIG_BLOCK=y |
| 140 | # CONFIG_BLK_DEV_IO_TRACE is not set | 146 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 141 | CONFIG_BLK_DEV_BSG=y | 147 | CONFIG_BLK_DEV_BSG=y |
| 148 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 142 | CONFIG_BLOCK_COMPAT=y | 149 | CONFIG_BLOCK_COMPAT=y |
| 143 | 150 | ||
| 144 | # | 151 | # |
| @@ -159,9 +166,6 @@ CONFIG_CLASSIC_RCU=y | |||
| 159 | # Platform support | 166 | # Platform support |
| 160 | # | 167 | # |
| 161 | CONFIG_PPC_MULTIPLATFORM=y | 168 | CONFIG_PPC_MULTIPLATFORM=y |
| 162 | # CONFIG_PPC_82xx is not set | ||
| 163 | # CONFIG_PPC_83xx is not set | ||
| 164 | # CONFIG_PPC_86xx is not set | ||
| 165 | # CONFIG_PPC_PSERIES is not set | 169 | # CONFIG_PPC_PSERIES is not set |
| 166 | CONFIG_LPARCFG=y | 170 | CONFIG_LPARCFG=y |
| 167 | CONFIG_PPC_ISERIES=y | 171 | CONFIG_PPC_ISERIES=y |
| @@ -173,8 +177,6 @@ CONFIG_VIODASD=y | |||
| 173 | CONFIG_VIOCD=m | 177 | CONFIG_VIOCD=m |
| 174 | CONFIG_VIOTAPE=m | 178 | CONFIG_VIOTAPE=m |
| 175 | CONFIG_VIOPATH=y | 179 | CONFIG_VIOPATH=y |
| 176 | # CONFIG_PPC_MPC512x is not set | ||
| 177 | # CONFIG_PPC_MPC5121 is not set | ||
| 178 | # CONFIG_PPC_PMAC is not set | 180 | # CONFIG_PPC_PMAC is not set |
| 179 | # CONFIG_PPC_MAPLE is not set | 181 | # CONFIG_PPC_MAPLE is not set |
| 180 | # CONFIG_PPC_PASEMI is not set | 182 | # CONFIG_PPC_PASEMI is not set |
| @@ -211,7 +213,7 @@ CONFIG_HZ_250=y | |||
| 211 | # CONFIG_HZ_300 is not set | 213 | # CONFIG_HZ_300 is not set |
| 212 | # CONFIG_HZ_1000 is not set | 214 | # CONFIG_HZ_1000 is not set |
| 213 | CONFIG_HZ=250 | 215 | CONFIG_HZ=250 |
| 214 | # CONFIG_SCHED_HRTICK is not set | 216 | CONFIG_SCHED_HRTICK=y |
| 215 | CONFIG_PREEMPT_NONE=y | 217 | CONFIG_PREEMPT_NONE=y |
| 216 | # CONFIG_PREEMPT_VOLUNTARY is not set | 218 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 217 | # CONFIG_PREEMPT is not set | 219 | # CONFIG_PREEMPT is not set |
| @@ -241,6 +243,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 241 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y | 243 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y |
| 242 | CONFIG_PAGEFLAGS_EXTENDED=y | 244 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 243 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 245 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 246 | # CONFIG_MIGRATION is not set | ||
| 244 | CONFIG_RESOURCES_64BIT=y | 247 | CONFIG_RESOURCES_64BIT=y |
| 245 | CONFIG_ZONE_DMA_FLAG=1 | 248 | CONFIG_ZONE_DMA_FLAG=1 |
| 246 | CONFIG_BOUNCE=y | 249 | CONFIG_BOUNCE=y |
| @@ -250,6 +253,7 @@ CONFIG_FORCE_MAX_ZONEORDER=13 | |||
| 250 | # CONFIG_SCHED_SMT is not set | 253 | # CONFIG_SCHED_SMT is not set |
| 251 | CONFIG_PROC_DEVICETREE=y | 254 | CONFIG_PROC_DEVICETREE=y |
| 252 | # CONFIG_CMDLINE_BOOL is not set | 255 | # CONFIG_CMDLINE_BOOL is not set |
| 256 | CONFIG_EXTRA_TARGETS="" | ||
| 253 | # CONFIG_PM is not set | 257 | # CONFIG_PM is not set |
| 254 | CONFIG_SECCOMP=y | 258 | CONFIG_SECCOMP=y |
| 255 | CONFIG_ISA_DMA_API=y | 259 | CONFIG_ISA_DMA_API=y |
| @@ -274,10 +278,6 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
| 274 | CONFIG_PAGE_OFFSET=0xc000000000000000 | 278 | CONFIG_PAGE_OFFSET=0xc000000000000000 |
| 275 | CONFIG_KERNEL_START=0xc000000000000000 | 279 | CONFIG_KERNEL_START=0xc000000000000000 |
| 276 | CONFIG_PHYSICAL_START=0x00000000 | 280 | CONFIG_PHYSICAL_START=0x00000000 |
| 277 | |||
| 278 | # | ||
| 279 | # Networking | ||
| 280 | # | ||
| 281 | CONFIG_NET=y | 281 | CONFIG_NET=y |
| 282 | 282 | ||
| 283 | # | 283 | # |
| @@ -291,6 +291,7 @@ CONFIG_XFRM_USER=m | |||
| 291 | CONFIG_XFRM_SUB_POLICY=y | 291 | CONFIG_XFRM_SUB_POLICY=y |
| 292 | # CONFIG_XFRM_MIGRATE is not set | 292 | # CONFIG_XFRM_MIGRATE is not set |
| 293 | # CONFIG_XFRM_STATISTICS is not set | 293 | # CONFIG_XFRM_STATISTICS is not set |
| 294 | CONFIG_XFRM_IPCOMP=m | ||
| 294 | CONFIG_NET_KEY=m | 295 | CONFIG_NET_KEY=m |
| 295 | # CONFIG_NET_KEY_MIGRATE is not set | 296 | # CONFIG_NET_KEY_MIGRATE is not set |
| 296 | CONFIG_INET=y | 297 | CONFIG_INET=y |
| @@ -480,7 +481,9 @@ CONFIG_NET_CLS_ROUTE=y | |||
| 480 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 481 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
| 481 | CONFIG_STANDALONE=y | 482 | CONFIG_STANDALONE=y |
| 482 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 483 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 483 | CONFIG_FW_LOADER=m | 484 | CONFIG_FW_LOADER=y |
| 485 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
| 486 | CONFIG_EXTRA_FIRMWARE="" | ||
| 484 | # CONFIG_DEBUG_DRIVER is not set | 487 | # CONFIG_DEBUG_DRIVER is not set |
| 485 | # CONFIG_DEBUG_DEVRES is not set | 488 | # CONFIG_DEBUG_DEVRES is not set |
| 486 | # CONFIG_SYS_HYPERVISOR is not set | 489 | # CONFIG_SYS_HYPERVISOR is not set |
| @@ -504,12 +507,14 @@ CONFIG_BLK_DEV_RAM_SIZE=65536 | |||
| 504 | # CONFIG_BLK_DEV_XIP is not set | 507 | # CONFIG_BLK_DEV_XIP is not set |
| 505 | # CONFIG_CDROM_PKTCDVD is not set | 508 | # CONFIG_CDROM_PKTCDVD is not set |
| 506 | # CONFIG_ATA_OVER_ETH is not set | 509 | # CONFIG_ATA_OVER_ETH is not set |
| 510 | # CONFIG_BLK_DEV_HD is not set | ||
| 507 | CONFIG_MISC_DEVICES=y | 511 | CONFIG_MISC_DEVICES=y |
| 508 | # CONFIG_PHANTOM is not set | 512 | # CONFIG_PHANTOM is not set |
| 509 | # CONFIG_EEPROM_93CX6 is not set | 513 | # CONFIG_EEPROM_93CX6 is not set |
| 510 | # CONFIG_SGI_IOC4 is not set | 514 | # CONFIG_SGI_IOC4 is not set |
| 511 | # CONFIG_TIFM_CORE is not set | 515 | # CONFIG_TIFM_CORE is not set |
| 512 | # CONFIG_ENCLOSURE_SERVICES is not set | 516 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 517 | # CONFIG_HP_ILO is not set | ||
| 513 | CONFIG_HAVE_IDE=y | 518 | CONFIG_HAVE_IDE=y |
| 514 | # CONFIG_IDE is not set | 519 | # CONFIG_IDE is not set |
| 515 | 520 | ||
| @@ -588,6 +593,7 @@ CONFIG_SCSI_IBMVSCSI=m | |||
| 588 | # CONFIG_SCSI_DC390T is not set | 593 | # CONFIG_SCSI_DC390T is not set |
| 589 | # CONFIG_SCSI_DEBUG is not set | 594 | # CONFIG_SCSI_DEBUG is not set |
| 590 | # CONFIG_SCSI_SRP is not set | 595 | # CONFIG_SCSI_SRP is not set |
| 596 | # CONFIG_SCSI_DH is not set | ||
| 591 | # CONFIG_ATA is not set | 597 | # CONFIG_ATA is not set |
| 592 | CONFIG_MD=y | 598 | CONFIG_MD=y |
| 593 | CONFIG_BLK_DEV_MD=y | 599 | CONFIG_BLK_DEV_MD=y |
| @@ -612,12 +618,15 @@ CONFIG_DM_ZERO=m | |||
| 612 | # | 618 | # |
| 613 | # IEEE 1394 (FireWire) support | 619 | # IEEE 1394 (FireWire) support |
| 614 | # | 620 | # |
| 621 | |||
| 622 | # | ||
| 623 | # Enable only one of the two stacks, unless you know what you are doing | ||
| 624 | # | ||
| 615 | # CONFIG_FIREWIRE is not set | 625 | # CONFIG_FIREWIRE is not set |
| 616 | # CONFIG_IEEE1394 is not set | 626 | # CONFIG_IEEE1394 is not set |
| 617 | # CONFIG_I2O is not set | 627 | # CONFIG_I2O is not set |
| 618 | # CONFIG_MACINTOSH_DRIVERS is not set | 628 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 619 | CONFIG_NETDEVICES=y | 629 | CONFIG_NETDEVICES=y |
| 620 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 621 | CONFIG_DUMMY=m | 630 | CONFIG_DUMMY=m |
| 622 | CONFIG_BONDING=m | 631 | CONFIG_BONDING=m |
| 623 | # CONFIG_MACVLAN is not set | 632 | # CONFIG_MACVLAN is not set |
| @@ -655,6 +664,7 @@ CONFIG_E100=y | |||
| 655 | # CONFIG_SIS900 is not set | 664 | # CONFIG_SIS900 is not set |
| 656 | # CONFIG_EPIC100 is not set | 665 | # CONFIG_EPIC100 is not set |
| 657 | # CONFIG_SUNDANCE is not set | 666 | # CONFIG_SUNDANCE is not set |
| 667 | # CONFIG_TLAN is not set | ||
| 658 | # CONFIG_VIA_RHINE is not set | 668 | # CONFIG_VIA_RHINE is not set |
| 659 | # CONFIG_SC92031 is not set | 669 | # CONFIG_SC92031 is not set |
| 660 | CONFIG_NETDEV_1000=y | 670 | CONFIG_NETDEV_1000=y |
| @@ -662,10 +672,8 @@ CONFIG_ACENIC=m | |||
| 662 | # CONFIG_ACENIC_OMIT_TIGON_I is not set | 672 | # CONFIG_ACENIC_OMIT_TIGON_I is not set |
| 663 | # CONFIG_DL2K is not set | 673 | # CONFIG_DL2K is not set |
| 664 | CONFIG_E1000=m | 674 | CONFIG_E1000=m |
| 665 | # CONFIG_E1000_NAPI is not set | ||
| 666 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | 675 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set |
| 667 | # CONFIG_E1000E is not set | 676 | # CONFIG_E1000E is not set |
| 668 | # CONFIG_E1000E_ENABLED is not set | ||
| 669 | # CONFIG_IP1000 is not set | 677 | # CONFIG_IP1000 is not set |
| 670 | # CONFIG_IGB is not set | 678 | # CONFIG_IGB is not set |
| 671 | # CONFIG_NS83820 is not set | 679 | # CONFIG_NS83820 is not set |
| @@ -680,6 +688,7 @@ CONFIG_E1000=m | |||
| 680 | # CONFIG_BNX2 is not set | 688 | # CONFIG_BNX2 is not set |
| 681 | # CONFIG_QLA3XXX is not set | 689 | # CONFIG_QLA3XXX is not set |
| 682 | # CONFIG_ATL1 is not set | 690 | # CONFIG_ATL1 is not set |
| 691 | # CONFIG_ATL1E is not set | ||
| 683 | CONFIG_NETDEV_10000=y | 692 | CONFIG_NETDEV_10000=y |
| 684 | # CONFIG_CHELSIO_T1 is not set | 693 | # CONFIG_CHELSIO_T1 is not set |
| 685 | # CONFIG_CHELSIO_T3 is not set | 694 | # CONFIG_CHELSIO_T3 is not set |
| @@ -767,6 +776,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | |||
| 767 | # Character devices | 776 | # Character devices |
| 768 | # | 777 | # |
| 769 | CONFIG_VT=y | 778 | CONFIG_VT=y |
| 779 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 770 | CONFIG_VT_CONSOLE=y | 780 | CONFIG_VT_CONSOLE=y |
| 771 | CONFIG_HW_CONSOLE=y | 781 | CONFIG_HW_CONSOLE=y |
| 772 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 782 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| @@ -789,6 +799,7 @@ CONFIG_UNIX98_PTYS=y | |||
| 789 | CONFIG_LEGACY_PTYS=y | 799 | CONFIG_LEGACY_PTYS=y |
| 790 | CONFIG_LEGACY_PTY_COUNT=256 | 800 | CONFIG_LEGACY_PTY_COUNT=256 |
| 791 | CONFIG_HVC_DRIVER=y | 801 | CONFIG_HVC_DRIVER=y |
| 802 | CONFIG_HVC_IRQ=y | ||
| 792 | CONFIG_HVC_ISERIES=y | 803 | CONFIG_HVC_ISERIES=y |
| 793 | # CONFIG_IPMI_HANDLER is not set | 804 | # CONFIG_IPMI_HANDLER is not set |
| 794 | # CONFIG_HW_RANDOM is not set | 805 | # CONFIG_HW_RANDOM is not set |
| @@ -803,10 +814,13 @@ CONFIG_MAX_RAW_DEVS=256 | |||
| 803 | CONFIG_DEVPORT=y | 814 | CONFIG_DEVPORT=y |
| 804 | # CONFIG_I2C is not set | 815 | # CONFIG_I2C is not set |
| 805 | # CONFIG_SPI is not set | 816 | # CONFIG_SPI is not set |
| 817 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 818 | # CONFIG_GPIOLIB is not set | ||
| 806 | # CONFIG_W1 is not set | 819 | # CONFIG_W1 is not set |
| 807 | # CONFIG_POWER_SUPPLY is not set | 820 | # CONFIG_POWER_SUPPLY is not set |
| 808 | # CONFIG_HWMON is not set | 821 | # CONFIG_HWMON is not set |
| 809 | # CONFIG_THERMAL is not set | 822 | # CONFIG_THERMAL is not set |
| 823 | # CONFIG_THERMAL_HWMON is not set | ||
| 810 | # CONFIG_WATCHDOG is not set | 824 | # CONFIG_WATCHDOG is not set |
| 811 | 825 | ||
| 812 | # | 826 | # |
| @@ -818,8 +832,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 818 | # | 832 | # |
| 819 | # Multifunction device drivers | 833 | # Multifunction device drivers |
| 820 | # | 834 | # |
| 835 | # CONFIG_MFD_CORE is not set | ||
| 821 | # CONFIG_MFD_SM501 is not set | 836 | # CONFIG_MFD_SM501 is not set |
| 822 | # CONFIG_HTC_PASIC3 is not set | 837 | # CONFIG_HTC_PASIC3 is not set |
| 838 | # CONFIG_MFD_TMIO is not set | ||
| 823 | 839 | ||
| 824 | # | 840 | # |
| 825 | # Multimedia devices | 841 | # Multimedia devices |
| @@ -858,10 +874,6 @@ CONFIG_SSB_POSSIBLE=y | |||
| 858 | CONFIG_VGA_CONSOLE=y | 874 | CONFIG_VGA_CONSOLE=y |
| 859 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set | 875 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set |
| 860 | CONFIG_DUMMY_CONSOLE=y | 876 | CONFIG_DUMMY_CONSOLE=y |
| 861 | |||
| 862 | # | ||
| 863 | # Sound | ||
| 864 | # | ||
| 865 | # CONFIG_SOUND is not set | 877 | # CONFIG_SOUND is not set |
| 866 | # CONFIG_HID_SUPPORT is not set | 878 | # CONFIG_HID_SUPPORT is not set |
| 867 | # CONFIG_USB_SUPPORT is not set | 879 | # CONFIG_USB_SUPPORT is not set |
| @@ -910,7 +922,6 @@ CONFIG_XFS_POSIX_ACL=y | |||
| 910 | # CONFIG_XFS_RT is not set | 922 | # CONFIG_XFS_RT is not set |
| 911 | # CONFIG_XFS_DEBUG is not set | 923 | # CONFIG_XFS_DEBUG is not set |
| 912 | CONFIG_GFS2_FS=m | 924 | CONFIG_GFS2_FS=m |
| 913 | CONFIG_GFS2_FS_LOCKING_NOLOCK=m | ||
| 914 | CONFIG_GFS2_FS_LOCKING_DLM=m | 925 | CONFIG_GFS2_FS_LOCKING_DLM=m |
| 915 | # CONFIG_OCFS2_FS is not set | 926 | # CONFIG_OCFS2_FS is not set |
| 916 | CONFIG_DNOTIFY=y | 927 | CONFIG_DNOTIFY=y |
| @@ -967,6 +978,7 @@ CONFIG_CONFIGFS_FS=m | |||
| 967 | CONFIG_CRAMFS=y | 978 | CONFIG_CRAMFS=y |
| 968 | # CONFIG_VXFS_FS is not set | 979 | # CONFIG_VXFS_FS is not set |
| 969 | # CONFIG_MINIX_FS is not set | 980 | # CONFIG_MINIX_FS is not set |
| 981 | # CONFIG_OMFS_FS is not set | ||
| 970 | # CONFIG_HPFS_FS is not set | 982 | # CONFIG_HPFS_FS is not set |
| 971 | # CONFIG_QNX4FS_FS is not set | 983 | # CONFIG_QNX4FS_FS is not set |
| 972 | # CONFIG_ROMFS_FS is not set | 984 | # CONFIG_ROMFS_FS is not set |
| @@ -989,7 +1001,6 @@ CONFIG_NFS_ACL_SUPPORT=y | |||
| 989 | CONFIG_NFS_COMMON=y | 1001 | CONFIG_NFS_COMMON=y |
| 990 | CONFIG_SUNRPC=y | 1002 | CONFIG_SUNRPC=y |
| 991 | CONFIG_SUNRPC_GSS=y | 1003 | CONFIG_SUNRPC_GSS=y |
| 992 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 993 | CONFIG_RPCSEC_GSS_KRB5=y | 1004 | CONFIG_RPCSEC_GSS_KRB5=y |
| 994 | CONFIG_RPCSEC_GSS_SPKM3=m | 1005 | CONFIG_RPCSEC_GSS_SPKM3=m |
| 995 | # CONFIG_SMB_FS is not set | 1006 | # CONFIG_SMB_FS is not set |
| @@ -1059,6 +1070,7 @@ CONFIG_BITREVERSE=y | |||
| 1059 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1070 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 1060 | CONFIG_CRC_CCITT=m | 1071 | CONFIG_CRC_CCITT=m |
| 1061 | # CONFIG_CRC16 is not set | 1072 | # CONFIG_CRC16 is not set |
| 1073 | CONFIG_CRC_T10DIF=y | ||
| 1062 | CONFIG_CRC_ITU_T=m | 1074 | CONFIG_CRC_ITU_T=m |
| 1063 | CONFIG_CRC32=y | 1075 | CONFIG_CRC32=y |
| 1064 | # CONFIG_CRC7 is not set | 1076 | # CONFIG_CRC7 is not set |
| @@ -1089,8 +1101,10 @@ CONFIG_DEBUG_FS=y | |||
| 1089 | CONFIG_DEBUG_KERNEL=y | 1101 | CONFIG_DEBUG_KERNEL=y |
| 1090 | # CONFIG_DEBUG_SHIRQ is not set | 1102 | # CONFIG_DEBUG_SHIRQ is not set |
| 1091 | CONFIG_DETECT_SOFTLOCKUP=y | 1103 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1104 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 1105 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 1092 | CONFIG_SCHED_DEBUG=y | 1106 | CONFIG_SCHED_DEBUG=y |
| 1093 | # CONFIG_SCHEDSTATS is not set | 1107 | CONFIG_SCHEDSTATS=y |
| 1094 | # CONFIG_TIMER_STATS is not set | 1108 | # CONFIG_TIMER_STATS is not set |
| 1095 | # CONFIG_DEBUG_OBJECTS is not set | 1109 | # CONFIG_DEBUG_OBJECTS is not set |
| 1096 | # CONFIG_SLUB_DEBUG_ON is not set | 1110 | # CONFIG_SLUB_DEBUG_ON is not set |
| @@ -1104,22 +1118,37 @@ CONFIG_SCHED_DEBUG=y | |||
| 1104 | # CONFIG_LOCK_STAT is not set | 1118 | # CONFIG_LOCK_STAT is not set |
| 1105 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1119 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
| 1106 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1120 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
| 1121 | CONFIG_STACKTRACE=y | ||
| 1107 | # CONFIG_DEBUG_KOBJECT is not set | 1122 | # CONFIG_DEBUG_KOBJECT is not set |
| 1108 | CONFIG_DEBUG_BUGVERBOSE=y | 1123 | CONFIG_DEBUG_BUGVERBOSE=y |
| 1109 | # CONFIG_DEBUG_INFO is not set | 1124 | # CONFIG_DEBUG_INFO is not set |
| 1110 | # CONFIG_DEBUG_VM is not set | 1125 | # CONFIG_DEBUG_VM is not set |
| 1111 | # CONFIG_DEBUG_WRITECOUNT is not set | 1126 | # CONFIG_DEBUG_WRITECOUNT is not set |
| 1127 | CONFIG_DEBUG_MEMORY_INIT=y | ||
| 1112 | # CONFIG_DEBUG_LIST is not set | 1128 | # CONFIG_DEBUG_LIST is not set |
| 1113 | # CONFIG_DEBUG_SG is not set | 1129 | # CONFIG_DEBUG_SG is not set |
| 1130 | CONFIG_FRAME_POINTER=y | ||
| 1114 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1131 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 1115 | # CONFIG_RCU_TORTURE_TEST is not set | 1132 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1116 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1133 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 1117 | # CONFIG_FAULT_INJECTION is not set | 1134 | # CONFIG_FAULT_INJECTION is not set |
| 1135 | CONFIG_LATENCYTOP=y | ||
| 1136 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1137 | CONFIG_HAVE_FTRACE=y | ||
| 1138 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1139 | # CONFIG_FTRACE is not set | ||
| 1140 | # CONFIG_IRQSOFF_TRACER is not set | ||
| 1141 | # CONFIG_SCHED_TRACER is not set | ||
| 1142 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1118 | # CONFIG_SAMPLES is not set | 1143 | # CONFIG_SAMPLES is not set |
| 1144 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1145 | # CONFIG_KGDB is not set | ||
| 1119 | CONFIG_DEBUG_STACKOVERFLOW=y | 1146 | CONFIG_DEBUG_STACKOVERFLOW=y |
| 1120 | CONFIG_DEBUG_STACK_USAGE=y | 1147 | CONFIG_DEBUG_STACK_USAGE=y |
| 1121 | # CONFIG_DEBUG_PAGEALLOC is not set | 1148 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1122 | # CONFIG_DEBUGGER is not set | 1149 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
| 1150 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
| 1151 | # CONFIG_XMON is not set | ||
| 1123 | CONFIG_IRQSTACKS=y | 1152 | CONFIG_IRQSTACKS=y |
| 1124 | # CONFIG_VIRQ_DEBUG is not set | 1153 | # CONFIG_VIRQ_DEBUG is not set |
| 1125 | # CONFIG_BOOTX_TEXT is not set | 1154 | # CONFIG_BOOTX_TEXT is not set |
| @@ -1178,6 +1207,10 @@ CONFIG_CRYPTO_CRC32C=m | |||
| 1178 | CONFIG_CRYPTO_MD4=m | 1207 | CONFIG_CRYPTO_MD4=m |
| 1179 | CONFIG_CRYPTO_MD5=y | 1208 | CONFIG_CRYPTO_MD5=y |
| 1180 | CONFIG_CRYPTO_MICHAEL_MIC=m | 1209 | CONFIG_CRYPTO_MICHAEL_MIC=m |
| 1210 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1211 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1212 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1213 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1181 | CONFIG_CRYPTO_SHA1=m | 1214 | CONFIG_CRYPTO_SHA1=m |
| 1182 | CONFIG_CRYPTO_SHA256=m | 1215 | CONFIG_CRYPTO_SHA256=m |
| 1183 | CONFIG_CRYPTO_SHA512=m | 1216 | CONFIG_CRYPTO_SHA512=m |
diff --git a/arch/powerpc/configs/linkstation_defconfig b/arch/powerpc/configs/linkstation_defconfig index 48434c2c7628..6fc4c2127757 100644 --- a/arch/powerpc/configs/linkstation_defconfig +++ b/arch/powerpc/configs/linkstation_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.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Mon Jun 9 08:52:10 2008 | 4 | # Thu Aug 21 00:52:05 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | 34 | CONFIG_STACKTRACE_SUPPORT=y |
| 35 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | 36 | CONFIG_LOCKDEP_SUPPORT=y |
| 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| @@ -93,7 +94,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 93 | CONFIG_SYSCTL=y | 94 | CONFIG_SYSCTL=y |
| 94 | # CONFIG_EMBEDDED is not set | 95 | # CONFIG_EMBEDDED is not set |
| 95 | CONFIG_SYSCTL_SYSCALL=y | 96 | CONFIG_SYSCTL_SYSCALL=y |
| 96 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 97 | CONFIG_KALLSYMS=y | 97 | CONFIG_KALLSYMS=y |
| 98 | # CONFIG_KALLSYMS_ALL is not set | 98 | # CONFIG_KALLSYMS_ALL is not set |
| 99 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 99 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -119,10 +119,16 @@ CONFIG_SLUB=y | |||
| 119 | # CONFIG_MARKERS is not set | 119 | # CONFIG_MARKERS is not set |
| 120 | CONFIG_HAVE_OPROFILE=y | 120 | CONFIG_HAVE_OPROFILE=y |
| 121 | # CONFIG_KPROBES is not set | 121 | # CONFIG_KPROBES is not set |
| 122 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 123 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 122 | CONFIG_HAVE_KPROBES=y | 124 | CONFIG_HAVE_KPROBES=y |
| 123 | CONFIG_HAVE_KRETPROBES=y | 125 | CONFIG_HAVE_KRETPROBES=y |
| 126 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 124 | # CONFIG_HAVE_DMA_ATTRS is not set | 127 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 128 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 129 | # CONFIG_HAVE_CLK is not set | ||
| 125 | CONFIG_PROC_PAGE_MONITOR=y | 130 | CONFIG_PROC_PAGE_MONITOR=y |
| 131 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 126 | CONFIG_SLABINFO=y | 132 | CONFIG_SLABINFO=y |
| 127 | CONFIG_RT_MUTEXES=y | 133 | CONFIG_RT_MUTEXES=y |
| 128 | # CONFIG_TINY_SHMEM is not set | 134 | # CONFIG_TINY_SHMEM is not set |
| @@ -139,6 +145,7 @@ CONFIG_BLOCK=y | |||
| 139 | # CONFIG_BLK_DEV_IO_TRACE is not set | 145 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 140 | # CONFIG_LSF is not set | 146 | # CONFIG_LSF is not set |
| 141 | # CONFIG_BLK_DEV_BSG is not set | 147 | # CONFIG_BLK_DEV_BSG is not set |
| 148 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 142 | 149 | ||
| 143 | # | 150 | # |
| 144 | # IO Schedulers | 151 | # IO Schedulers |
| @@ -158,25 +165,25 @@ CONFIG_CLASSIC_RCU=y | |||
| 158 | # Platform support | 165 | # Platform support |
| 159 | # | 166 | # |
| 160 | CONFIG_PPC_MULTIPLATFORM=y | 167 | CONFIG_PPC_MULTIPLATFORM=y |
| 161 | # CONFIG_PPC_82xx is not set | ||
| 162 | # CONFIG_PPC_83xx is not set | ||
| 163 | # CONFIG_PPC_86xx is not set | ||
| 164 | CONFIG_CLASSIC32=y | 168 | CONFIG_CLASSIC32=y |
| 165 | # CONFIG_PPC_CHRP is not set | 169 | # CONFIG_PPC_CHRP is not set |
| 166 | # CONFIG_PPC_MPC512x is not set | ||
| 167 | # CONFIG_PPC_MPC5121 is not set | ||
| 168 | # CONFIG_MPC5121_ADS is not set | 170 | # CONFIG_MPC5121_ADS is not set |
| 171 | # CONFIG_MPC5121_GENERIC is not set | ||
| 169 | # CONFIG_PPC_MPC52xx is not set | 172 | # CONFIG_PPC_MPC52xx is not set |
| 170 | # CONFIG_PPC_PMAC is not set | 173 | # CONFIG_PPC_PMAC is not set |
| 171 | # CONFIG_PPC_CELL is not set | 174 | # CONFIG_PPC_CELL is not set |
| 172 | # CONFIG_PPC_CELL_NATIVE is not set | 175 | # CONFIG_PPC_CELL_NATIVE is not set |
| 176 | # CONFIG_PPC_82xx is not set | ||
| 173 | # CONFIG_PQ2ADS is not set | 177 | # CONFIG_PQ2ADS is not set |
| 178 | # CONFIG_PPC_83xx is not set | ||
| 179 | # CONFIG_PPC_86xx is not set | ||
| 174 | CONFIG_EMBEDDED6xx=y | 180 | CONFIG_EMBEDDED6xx=y |
| 175 | CONFIG_LINKSTATION=y | 181 | CONFIG_LINKSTATION=y |
| 176 | # CONFIG_STORCENTER is not set | 182 | # CONFIG_STORCENTER is not set |
| 177 | # CONFIG_MPC7448HPC2 is not set | 183 | # CONFIG_MPC7448HPC2 is not set |
| 178 | # CONFIG_PPC_HOLLY is not set | 184 | # CONFIG_PPC_HOLLY is not set |
| 179 | # CONFIG_PPC_PRPMC2800 is not set | 185 | # CONFIG_PPC_PRPMC2800 is not set |
| 186 | # CONFIG_PPC_C2K is not set | ||
| 180 | CONFIG_MPC10X_BRIDGE=y | 187 | CONFIG_MPC10X_BRIDGE=y |
| 181 | CONFIG_MPC10X_OPENPIC=y | 188 | CONFIG_MPC10X_OPENPIC=y |
| 182 | # CONFIG_MPC10X_STORE_GATHERING is not set | 189 | # CONFIG_MPC10X_STORE_GATHERING is not set |
| @@ -207,7 +214,7 @@ CONFIG_HZ_100=y | |||
| 207 | # CONFIG_HZ_300 is not set | 214 | # CONFIG_HZ_300 is not set |
| 208 | # CONFIG_HZ_1000 is not set | 215 | # CONFIG_HZ_1000 is not set |
| 209 | CONFIG_HZ=100 | 216 | CONFIG_HZ=100 |
| 210 | # CONFIG_SCHED_HRTICK is not set | 217 | CONFIG_SCHED_HRTICK=y |
| 211 | CONFIG_PREEMPT_NONE=y | 218 | CONFIG_PREEMPT_NONE=y |
| 212 | # CONFIG_PREEMPT_VOLUNTARY is not set | 219 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 213 | # CONFIG_PREEMPT is not set | 220 | # CONFIG_PREEMPT is not set |
| @@ -230,6 +237,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 230 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 237 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 231 | CONFIG_PAGEFLAGS_EXTENDED=y | 238 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 232 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 239 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 240 | CONFIG_MIGRATION=y | ||
| 233 | # CONFIG_RESOURCES_64BIT is not set | 241 | # CONFIG_RESOURCES_64BIT is not set |
| 234 | CONFIG_ZONE_DMA_FLAG=1 | 242 | CONFIG_ZONE_DMA_FLAG=1 |
| 235 | CONFIG_BOUNCE=y | 243 | CONFIG_BOUNCE=y |
| @@ -237,6 +245,7 @@ CONFIG_VIRT_TO_BUS=y | |||
| 237 | CONFIG_FORCE_MAX_ZONEORDER=11 | 245 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 238 | CONFIG_PROC_DEVICETREE=y | 246 | CONFIG_PROC_DEVICETREE=y |
| 239 | # CONFIG_CMDLINE_BOOL is not set | 247 | # CONFIG_CMDLINE_BOOL is not set |
| 248 | CONFIG_EXTRA_TARGETS="" | ||
| 240 | # CONFIG_PM is not set | 249 | # CONFIG_PM is not set |
| 241 | CONFIG_SECCOMP=y | 250 | CONFIG_SECCOMP=y |
| 242 | CONFIG_ISA_DMA_API=y | 251 | CONFIG_ISA_DMA_API=y |
| @@ -273,10 +282,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
| 273 | CONFIG_KERNEL_START=0xc0000000 | 282 | CONFIG_KERNEL_START=0xc0000000 |
| 274 | CONFIG_PHYSICAL_START=0x00000000 | 283 | CONFIG_PHYSICAL_START=0x00000000 |
| 275 | CONFIG_TASK_SIZE=0xc0000000 | 284 | CONFIG_TASK_SIZE=0xc0000000 |
| 276 | |||
| 277 | # | ||
| 278 | # Networking | ||
| 279 | # | ||
| 280 | CONFIG_NET=y | 285 | CONFIG_NET=y |
| 281 | 286 | ||
| 282 | # | 287 | # |
| @@ -461,6 +466,7 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
| 461 | # | 466 | # |
| 462 | # CONFIG_CFG80211 is not set | 467 | # CONFIG_CFG80211 is not set |
| 463 | CONFIG_WIRELESS_EXT=y | 468 | CONFIG_WIRELESS_EXT=y |
| 469 | CONFIG_WIRELESS_EXT_SYSFS=y | ||
| 464 | # CONFIG_MAC80211 is not set | 470 | # CONFIG_MAC80211 is not set |
| 465 | CONFIG_IEEE80211=m | 471 | CONFIG_IEEE80211=m |
| 466 | CONFIG_IEEE80211_DEBUG=y | 472 | CONFIG_IEEE80211_DEBUG=y |
| @@ -480,7 +486,9 @@ CONFIG_IEEE80211_CRYPT_TKIP=m | |||
| 480 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 486 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
| 481 | CONFIG_STANDALONE=y | 487 | CONFIG_STANDALONE=y |
| 482 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 488 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 483 | CONFIG_FW_LOADER=m | 489 | CONFIG_FW_LOADER=y |
| 490 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
| 491 | CONFIG_EXTRA_FIRMWARE="" | ||
| 484 | # CONFIG_DEBUG_DRIVER is not set | 492 | # CONFIG_DEBUG_DRIVER is not set |
| 485 | # CONFIG_DEBUG_DEVRES is not set | 493 | # CONFIG_DEBUG_DEVRES is not set |
| 486 | # CONFIG_SYS_HYPERVISOR is not set | 494 | # CONFIG_SYS_HYPERVISOR is not set |
| @@ -592,12 +600,14 @@ CONFIG_BLK_DEV_RAM_SIZE=8192 | |||
| 592 | # CONFIG_BLK_DEV_XIP is not set | 600 | # CONFIG_BLK_DEV_XIP is not set |
| 593 | # CONFIG_CDROM_PKTCDVD is not set | 601 | # CONFIG_CDROM_PKTCDVD is not set |
| 594 | # CONFIG_ATA_OVER_ETH is not set | 602 | # CONFIG_ATA_OVER_ETH is not set |
| 603 | # CONFIG_BLK_DEV_HD is not set | ||
| 595 | CONFIG_MISC_DEVICES=y | 604 | CONFIG_MISC_DEVICES=y |
| 596 | # CONFIG_PHANTOM is not set | 605 | # CONFIG_PHANTOM is not set |
| 597 | # CONFIG_EEPROM_93CX6 is not set | 606 | # CONFIG_EEPROM_93CX6 is not set |
| 598 | # CONFIG_SGI_IOC4 is not set | 607 | # CONFIG_SGI_IOC4 is not set |
| 599 | # CONFIG_TIFM_CORE is not set | 608 | # CONFIG_TIFM_CORE is not set |
| 600 | # CONFIG_ENCLOSURE_SERVICES is not set | 609 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 610 | # CONFIG_HP_ILO is not set | ||
| 601 | CONFIG_HAVE_IDE=y | 611 | CONFIG_HAVE_IDE=y |
| 602 | # CONFIG_IDE is not set | 612 | # CONFIG_IDE is not set |
| 603 | 613 | ||
| @@ -676,6 +686,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 676 | # CONFIG_SCSI_NSP32 is not set | 686 | # CONFIG_SCSI_NSP32 is not set |
| 677 | # CONFIG_SCSI_DEBUG is not set | 687 | # CONFIG_SCSI_DEBUG is not set |
| 678 | # CONFIG_SCSI_SRP is not set | 688 | # CONFIG_SCSI_SRP is not set |
| 689 | # CONFIG_SCSI_DH is not set | ||
| 679 | CONFIG_ATA=y | 690 | CONFIG_ATA=y |
| 680 | # CONFIG_ATA_NONSTANDARD is not set | 691 | # CONFIG_ATA_NONSTANDARD is not set |
| 681 | CONFIG_SATA_PMP=y | 692 | CONFIG_SATA_PMP=y |
| @@ -743,12 +754,15 @@ CONFIG_PATA_SIL680=y | |||
| 743 | # | 754 | # |
| 744 | # IEEE 1394 (FireWire) support | 755 | # IEEE 1394 (FireWire) support |
| 745 | # | 756 | # |
| 757 | |||
| 758 | # | ||
| 759 | # Enable only one of the two stacks, unless you know what you are doing | ||
| 760 | # | ||
| 746 | # CONFIG_FIREWIRE is not set | 761 | # CONFIG_FIREWIRE is not set |
| 747 | # CONFIG_IEEE1394 is not set | 762 | # CONFIG_IEEE1394 is not set |
| 748 | # CONFIG_I2O is not set | 763 | # CONFIG_I2O is not set |
| 749 | # CONFIG_MACINTOSH_DRIVERS is not set | 764 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 750 | CONFIG_NETDEVICES=y | 765 | CONFIG_NETDEVICES=y |
| 751 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 752 | # CONFIG_DUMMY is not set | 766 | # CONFIG_DUMMY is not set |
| 753 | # CONFIG_BONDING is not set | 767 | # CONFIG_BONDING is not set |
| 754 | # CONFIG_MACVLAN is not set | 768 | # CONFIG_MACVLAN is not set |
| @@ -785,14 +799,12 @@ CONFIG_NETDEV_1000=y | |||
| 785 | # CONFIG_DL2K is not set | 799 | # CONFIG_DL2K is not set |
| 786 | # CONFIG_E1000 is not set | 800 | # CONFIG_E1000 is not set |
| 787 | # CONFIG_E1000E is not set | 801 | # CONFIG_E1000E is not set |
| 788 | # CONFIG_E1000E_ENABLED is not set | ||
| 789 | # CONFIG_IP1000 is not set | 802 | # CONFIG_IP1000 is not set |
| 790 | # CONFIG_IGB is not set | 803 | # CONFIG_IGB is not set |
| 791 | # CONFIG_NS83820 is not set | 804 | # CONFIG_NS83820 is not set |
| 792 | # CONFIG_HAMACHI is not set | 805 | # CONFIG_HAMACHI is not set |
| 793 | # CONFIG_YELLOWFIN is not set | 806 | # CONFIG_YELLOWFIN is not set |
| 794 | CONFIG_R8169=y | 807 | CONFIG_R8169=y |
| 795 | # CONFIG_R8169_NAPI is not set | ||
| 796 | # CONFIG_SIS190 is not set | 808 | # CONFIG_SIS190 is not set |
| 797 | # CONFIG_SKGE is not set | 809 | # CONFIG_SKGE is not set |
| 798 | # CONFIG_SKY2 is not set | 810 | # CONFIG_SKY2 is not set |
| @@ -803,6 +815,7 @@ CONFIG_R8169=y | |||
| 803 | # CONFIG_MV643XX_ETH is not set | 815 | # CONFIG_MV643XX_ETH is not set |
| 804 | # CONFIG_QLA3XXX is not set | 816 | # CONFIG_QLA3XXX is not set |
| 805 | # CONFIG_ATL1 is not set | 817 | # CONFIG_ATL1 is not set |
| 818 | # CONFIG_ATL1E is not set | ||
| 806 | CONFIG_NETDEV_10000=y | 819 | CONFIG_NETDEV_10000=y |
| 807 | # CONFIG_CHELSIO_T1 is not set | 820 | # CONFIG_CHELSIO_T1 is not set |
| 808 | # CONFIG_CHELSIO_T3 is not set | 821 | # CONFIG_CHELSIO_T3 is not set |
| @@ -889,12 +902,14 @@ CONFIG_SERIO=y | |||
| 889 | CONFIG_SERIO_SERPORT=y | 902 | CONFIG_SERIO_SERPORT=y |
| 890 | # CONFIG_SERIO_PCIPS2 is not set | 903 | # CONFIG_SERIO_PCIPS2 is not set |
| 891 | # CONFIG_SERIO_RAW is not set | 904 | # CONFIG_SERIO_RAW is not set |
| 905 | # CONFIG_SERIO_XILINX_XPS_PS2 is not set | ||
| 892 | # CONFIG_GAMEPORT is not set | 906 | # CONFIG_GAMEPORT is not set |
| 893 | 907 | ||
| 894 | # | 908 | # |
| 895 | # Character devices | 909 | # Character devices |
| 896 | # | 910 | # |
| 897 | CONFIG_VT=y | 911 | CONFIG_VT=y |
| 912 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 898 | CONFIG_VT_CONSOLE=y | 913 | CONFIG_VT_CONSOLE=y |
| 899 | CONFIG_HW_CONSOLE=y | 914 | CONFIG_HW_CONSOLE=y |
| 900 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 915 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| @@ -934,43 +949,64 @@ CONFIG_DEVPORT=y | |||
| 934 | CONFIG_I2C=y | 949 | CONFIG_I2C=y |
| 935 | CONFIG_I2C_BOARDINFO=y | 950 | CONFIG_I2C_BOARDINFO=y |
| 936 | CONFIG_I2C_CHARDEV=y | 951 | CONFIG_I2C_CHARDEV=y |
| 952 | CONFIG_I2C_HELPER_AUTO=y | ||
| 937 | 953 | ||
| 938 | # | 954 | # |
| 939 | # I2C Hardware Bus support | 955 | # I2C Hardware Bus support |
| 940 | # | 956 | # |
| 957 | |||
| 958 | # | ||
| 959 | # PC SMBus host controller drivers | ||
| 960 | # | ||
| 941 | # CONFIG_I2C_ALI1535 is not set | 961 | # CONFIG_I2C_ALI1535 is not set |
| 942 | # CONFIG_I2C_ALI1563 is not set | 962 | # CONFIG_I2C_ALI1563 is not set |
| 943 | # CONFIG_I2C_ALI15X3 is not set | 963 | # CONFIG_I2C_ALI15X3 is not set |
| 944 | # CONFIG_I2C_AMD756 is not set | 964 | # CONFIG_I2C_AMD756 is not set |
| 945 | # CONFIG_I2C_AMD8111 is not set | 965 | # CONFIG_I2C_AMD8111 is not set |
| 946 | # CONFIG_I2C_I801 is not set | 966 | # CONFIG_I2C_I801 is not set |
| 947 | # CONFIG_I2C_I810 is not set | 967 | # CONFIG_I2C_ISCH is not set |
| 948 | # CONFIG_I2C_PIIX4 is not set | 968 | # CONFIG_I2C_PIIX4 is not set |
| 949 | CONFIG_I2C_MPC=y | ||
| 950 | # CONFIG_I2C_NFORCE2 is not set | 969 | # CONFIG_I2C_NFORCE2 is not set |
| 951 | # CONFIG_I2C_OCORES is not set | ||
| 952 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 953 | # CONFIG_I2C_PROSAVAGE is not set | ||
| 954 | # CONFIG_I2C_SAVAGE4 is not set | ||
| 955 | # CONFIG_I2C_SIMTEC is not set | ||
| 956 | # CONFIG_I2C_SIS5595 is not set | 970 | # CONFIG_I2C_SIS5595 is not set |
| 957 | # CONFIG_I2C_SIS630 is not set | 971 | # CONFIG_I2C_SIS630 is not set |
| 958 | # CONFIG_I2C_SIS96X is not set | 972 | # CONFIG_I2C_SIS96X is not set |
| 959 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 960 | # CONFIG_I2C_STUB is not set | ||
| 961 | # CONFIG_I2C_TINY_USB is not set | ||
| 962 | # CONFIG_I2C_VIA is not set | 973 | # CONFIG_I2C_VIA is not set |
| 963 | # CONFIG_I2C_VIAPRO is not set | 974 | # CONFIG_I2C_VIAPRO is not set |
| 975 | |||
| 976 | # | ||
| 977 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 978 | # | ||
| 979 | CONFIG_I2C_MPC=y | ||
| 980 | # CONFIG_I2C_OCORES is not set | ||
| 981 | # CONFIG_I2C_SIMTEC is not set | ||
| 982 | |||
| 983 | # | ||
| 984 | # External I2C/SMBus adapter drivers | ||
| 985 | # | ||
| 986 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 987 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 988 | # CONFIG_I2C_TINY_USB is not set | ||
| 989 | |||
| 990 | # | ||
| 991 | # Graphics adapter I2C/DDC channel drivers | ||
| 992 | # | ||
| 964 | # CONFIG_I2C_VOODOO3 is not set | 993 | # CONFIG_I2C_VOODOO3 is not set |
| 994 | |||
| 995 | # | ||
| 996 | # Other I2C/SMBus bus drivers | ||
| 997 | # | ||
| 965 | # CONFIG_I2C_PCA_PLATFORM is not set | 998 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 999 | # CONFIG_I2C_STUB is not set | ||
| 966 | 1000 | ||
| 967 | # | 1001 | # |
| 968 | # Miscellaneous I2C Chip support | 1002 | # Miscellaneous I2C Chip support |
| 969 | # | 1003 | # |
| 970 | # CONFIG_DS1682 is not set | 1004 | # CONFIG_DS1682 is not set |
| 1005 | # CONFIG_AT24 is not set | ||
| 971 | CONFIG_SENSORS_EEPROM=m | 1006 | CONFIG_SENSORS_EEPROM=m |
| 972 | # CONFIG_SENSORS_PCF8574 is not set | 1007 | # CONFIG_SENSORS_PCF8574 is not set |
| 973 | # CONFIG_PCF8575 is not set | 1008 | # CONFIG_PCF8575 is not set |
| 1009 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 974 | # CONFIG_SENSORS_PCF8591 is not set | 1010 | # CONFIG_SENSORS_PCF8591 is not set |
| 975 | # CONFIG_SENSORS_MAX6875 is not set | 1011 | # CONFIG_SENSORS_MAX6875 is not set |
| 976 | # CONFIG_SENSORS_TSL2550 is not set | 1012 | # CONFIG_SENSORS_TSL2550 is not set |
| @@ -979,10 +1015,13 @@ CONFIG_SENSORS_EEPROM=m | |||
| 979 | # CONFIG_I2C_DEBUG_BUS is not set | 1015 | # CONFIG_I2C_DEBUG_BUS is not set |
| 980 | # CONFIG_I2C_DEBUG_CHIP is not set | 1016 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 981 | # CONFIG_SPI is not set | 1017 | # CONFIG_SPI is not set |
| 1018 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 1019 | # CONFIG_GPIOLIB is not set | ||
| 982 | # CONFIG_W1 is not set | 1020 | # CONFIG_W1 is not set |
| 983 | # CONFIG_POWER_SUPPLY is not set | 1021 | # CONFIG_POWER_SUPPLY is not set |
| 984 | CONFIG_HWMON=y | 1022 | CONFIG_HWMON=y |
| 985 | # CONFIG_HWMON_VID is not set | 1023 | # CONFIG_HWMON_VID is not set |
| 1024 | # CONFIG_SENSORS_AD7414 is not set | ||
| 986 | # CONFIG_SENSORS_AD7418 is not set | 1025 | # CONFIG_SENSORS_AD7418 is not set |
| 987 | # CONFIG_SENSORS_ADM1021 is not set | 1026 | # CONFIG_SENSORS_ADM1021 is not set |
| 988 | # CONFIG_SENSORS_ADM1025 is not set | 1027 | # CONFIG_SENSORS_ADM1025 is not set |
| @@ -1036,6 +1075,7 @@ CONFIG_HWMON=y | |||
| 1036 | # CONFIG_SENSORS_W83627EHF is not set | 1075 | # CONFIG_SENSORS_W83627EHF is not set |
| 1037 | # CONFIG_HWMON_DEBUG_CHIP is not set | 1076 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 1038 | # CONFIG_THERMAL is not set | 1077 | # CONFIG_THERMAL is not set |
| 1078 | # CONFIG_THERMAL_HWMON is not set | ||
| 1039 | # CONFIG_WATCHDOG is not set | 1079 | # CONFIG_WATCHDOG is not set |
| 1040 | 1080 | ||
| 1041 | # | 1081 | # |
| @@ -1047,8 +1087,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1047 | # | 1087 | # |
| 1048 | # Multifunction device drivers | 1088 | # Multifunction device drivers |
| 1049 | # | 1089 | # |
| 1090 | # CONFIG_MFD_CORE is not set | ||
| 1050 | # CONFIG_MFD_SM501 is not set | 1091 | # CONFIG_MFD_SM501 is not set |
| 1051 | # CONFIG_HTC_PASIC3 is not set | 1092 | # CONFIG_HTC_PASIC3 is not set |
| 1093 | # CONFIG_MFD_TMIO is not set | ||
| 1052 | 1094 | ||
| 1053 | # | 1095 | # |
| 1054 | # Multimedia devices | 1096 | # Multimedia devices |
| @@ -1086,10 +1128,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m | |||
| 1086 | # | 1128 | # |
| 1087 | # CONFIG_VGA_CONSOLE is not set | 1129 | # CONFIG_VGA_CONSOLE is not set |
| 1088 | CONFIG_DUMMY_CONSOLE=y | 1130 | CONFIG_DUMMY_CONSOLE=y |
| 1089 | |||
| 1090 | # | ||
| 1091 | # Sound | ||
| 1092 | # | ||
| 1093 | # CONFIG_SOUND is not set | 1131 | # CONFIG_SOUND is not set |
| 1094 | CONFIG_HID_SUPPORT=y | 1132 | CONFIG_HID_SUPPORT=y |
| 1095 | CONFIG_HID=m | 1133 | CONFIG_HID=m |
| @@ -1121,6 +1159,7 @@ CONFIG_USB_DEVICEFS=y | |||
| 1121 | CONFIG_USB_DEVICE_CLASS=y | 1159 | CONFIG_USB_DEVICE_CLASS=y |
| 1122 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1160 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 1123 | # CONFIG_USB_OTG is not set | 1161 | # CONFIG_USB_OTG is not set |
| 1162 | CONFIG_USB_MON=y | ||
| 1124 | 1163 | ||
| 1125 | # | 1164 | # |
| 1126 | # USB Host Controller Drivers | 1165 | # USB Host Controller Drivers |
| @@ -1172,6 +1211,7 @@ CONFIG_USB_STORAGE=m | |||
| 1172 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1211 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1173 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1212 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
| 1174 | # CONFIG_USB_STORAGE_KARMA is not set | 1213 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1214 | # CONFIG_USB_STORAGE_SIERRA is not set | ||
| 1175 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | 1215 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
| 1176 | # CONFIG_USB_LIBUSUAL is not set | 1216 | # CONFIG_USB_LIBUSUAL is not set |
| 1177 | 1217 | ||
| @@ -1180,7 +1220,6 @@ CONFIG_USB_STORAGE=m | |||
| 1180 | # | 1220 | # |
| 1181 | # CONFIG_USB_MDC800 is not set | 1221 | # CONFIG_USB_MDC800 is not set |
| 1182 | # CONFIG_USB_MICROTEK is not set | 1222 | # CONFIG_USB_MICROTEK is not set |
| 1183 | CONFIG_USB_MON=y | ||
| 1184 | 1223 | ||
| 1185 | # | 1224 | # |
| 1186 | # USB port drivers | 1225 | # USB port drivers |
| @@ -1190,7 +1229,6 @@ CONFIG_USB_SERIAL_CONSOLE=y | |||
| 1190 | # CONFIG_USB_EZUSB is not set | 1229 | # CONFIG_USB_EZUSB is not set |
| 1191 | # CONFIG_USB_SERIAL_GENERIC is not set | 1230 | # CONFIG_USB_SERIAL_GENERIC is not set |
| 1192 | # CONFIG_USB_SERIAL_AIRCABLE is not set | 1231 | # CONFIG_USB_SERIAL_AIRCABLE is not set |
| 1193 | # CONFIG_USB_SERIAL_AIRPRIME is not set | ||
| 1194 | # CONFIG_USB_SERIAL_ARK3116 is not set | 1232 | # CONFIG_USB_SERIAL_ARK3116 is not set |
| 1195 | # CONFIG_USB_SERIAL_BELKIN is not set | 1233 | # CONFIG_USB_SERIAL_BELKIN is not set |
| 1196 | # CONFIG_USB_SERIAL_CH341 is not set | 1234 | # CONFIG_USB_SERIAL_CH341 is not set |
| @@ -1237,7 +1275,6 @@ CONFIG_USB_SERIAL_FTDI_SIO=y | |||
| 1237 | # CONFIG_USB_EMI62 is not set | 1275 | # CONFIG_USB_EMI62 is not set |
| 1238 | # CONFIG_USB_EMI26 is not set | 1276 | # CONFIG_USB_EMI26 is not set |
| 1239 | # CONFIG_USB_ADUTUX is not set | 1277 | # CONFIG_USB_ADUTUX is not set |
| 1240 | # CONFIG_USB_AUERSWALD is not set | ||
| 1241 | # CONFIG_USB_RIO500 is not set | 1278 | # CONFIG_USB_RIO500 is not set |
| 1242 | # CONFIG_USB_LEGOTOWER is not set | 1279 | # CONFIG_USB_LEGOTOWER is not set |
| 1243 | # CONFIG_USB_LCD is not set | 1280 | # CONFIG_USB_LCD is not set |
| @@ -1291,6 +1328,7 @@ CONFIG_RTC_DRV_RS5C372=y | |||
| 1291 | # CONFIG_RTC_DRV_PCF8583 is not set | 1328 | # CONFIG_RTC_DRV_PCF8583 is not set |
| 1292 | # CONFIG_RTC_DRV_M41T80 is not set | 1329 | # CONFIG_RTC_DRV_M41T80 is not set |
| 1293 | # CONFIG_RTC_DRV_S35390A is not set | 1330 | # CONFIG_RTC_DRV_S35390A is not set |
| 1331 | # CONFIG_RTC_DRV_FM3130 is not set | ||
| 1294 | 1332 | ||
| 1295 | # | 1333 | # |
| 1296 | # SPI RTC drivers | 1334 | # SPI RTC drivers |
| @@ -1392,6 +1430,7 @@ CONFIG_TMPFS=y | |||
| 1392 | # CONFIG_CRAMFS is not set | 1430 | # CONFIG_CRAMFS is not set |
| 1393 | # CONFIG_VXFS_FS is not set | 1431 | # CONFIG_VXFS_FS is not set |
| 1394 | # CONFIG_MINIX_FS is not set | 1432 | # CONFIG_MINIX_FS is not set |
| 1433 | # CONFIG_OMFS_FS is not set | ||
| 1395 | # CONFIG_HPFS_FS is not set | 1434 | # CONFIG_HPFS_FS is not set |
| 1396 | # CONFIG_QNX4FS_FS is not set | 1435 | # CONFIG_QNX4FS_FS is not set |
| 1397 | # CONFIG_ROMFS_FS is not set | 1436 | # CONFIG_ROMFS_FS is not set |
| @@ -1402,11 +1441,11 @@ CONFIG_NFS_FS=y | |||
| 1402 | CONFIG_NFS_V3=y | 1441 | CONFIG_NFS_V3=y |
| 1403 | CONFIG_NFS_V3_ACL=y | 1442 | CONFIG_NFS_V3_ACL=y |
| 1404 | CONFIG_NFS_V4=y | 1443 | CONFIG_NFS_V4=y |
| 1444 | CONFIG_ROOT_NFS=y | ||
| 1405 | CONFIG_NFSD=m | 1445 | CONFIG_NFSD=m |
| 1406 | CONFIG_NFSD_V3=y | 1446 | CONFIG_NFSD_V3=y |
| 1407 | # CONFIG_NFSD_V3_ACL is not set | 1447 | # CONFIG_NFSD_V3_ACL is not set |
| 1408 | # CONFIG_NFSD_V4 is not set | 1448 | # CONFIG_NFSD_V4 is not set |
| 1409 | CONFIG_ROOT_NFS=y | ||
| 1410 | CONFIG_LOCKD=y | 1449 | CONFIG_LOCKD=y |
| 1411 | CONFIG_LOCKD_V4=y | 1450 | CONFIG_LOCKD_V4=y |
| 1412 | CONFIG_EXPORTFS=m | 1451 | CONFIG_EXPORTFS=m |
| @@ -1414,7 +1453,6 @@ CONFIG_NFS_ACL_SUPPORT=y | |||
| 1414 | CONFIG_NFS_COMMON=y | 1453 | CONFIG_NFS_COMMON=y |
| 1415 | CONFIG_SUNRPC=y | 1454 | CONFIG_SUNRPC=y |
| 1416 | CONFIG_SUNRPC_GSS=y | 1455 | CONFIG_SUNRPC_GSS=y |
| 1417 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 1418 | CONFIG_RPCSEC_GSS_KRB5=y | 1456 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1419 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1457 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1420 | # CONFIG_SMB_FS is not set | 1458 | # CONFIG_SMB_FS is not set |
| @@ -1482,6 +1520,7 @@ CONFIG_BITREVERSE=y | |||
| 1482 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1520 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 1483 | CONFIG_CRC_CCITT=m | 1521 | CONFIG_CRC_CCITT=m |
| 1484 | # CONFIG_CRC16 is not set | 1522 | # CONFIG_CRC16 is not set |
| 1523 | CONFIG_CRC_T10DIF=y | ||
| 1485 | CONFIG_CRC_ITU_T=m | 1524 | CONFIG_CRC_ITU_T=m |
| 1486 | CONFIG_CRC32=y | 1525 | CONFIG_CRC32=y |
| 1487 | # CONFIG_CRC7 is not set | 1526 | # CONFIG_CRC7 is not set |
| @@ -1510,6 +1549,8 @@ CONFIG_MAGIC_SYSRQ=y | |||
| 1510 | CONFIG_DEBUG_KERNEL=y | 1549 | CONFIG_DEBUG_KERNEL=y |
| 1511 | # CONFIG_DEBUG_SHIRQ is not set | 1550 | # CONFIG_DEBUG_SHIRQ is not set |
| 1512 | CONFIG_DETECT_SOFTLOCKUP=y | 1551 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1552 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 1553 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 1513 | CONFIG_SCHED_DEBUG=y | 1554 | CONFIG_SCHED_DEBUG=y |
| 1514 | # CONFIG_SCHEDSTATS is not set | 1555 | # CONFIG_SCHEDSTATS is not set |
| 1515 | # CONFIG_TIMER_STATS is not set | 1556 | # CONFIG_TIMER_STATS is not set |
| @@ -1527,17 +1568,29 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
| 1527 | # CONFIG_DEBUG_INFO is not set | 1568 | # CONFIG_DEBUG_INFO is not set |
| 1528 | # CONFIG_DEBUG_VM is not set | 1569 | # CONFIG_DEBUG_VM is not set |
| 1529 | # CONFIG_DEBUG_WRITECOUNT is not set | 1570 | # CONFIG_DEBUG_WRITECOUNT is not set |
| 1571 | CONFIG_DEBUG_MEMORY_INIT=y | ||
| 1530 | # CONFIG_DEBUG_LIST is not set | 1572 | # CONFIG_DEBUG_LIST is not set |
| 1531 | # CONFIG_DEBUG_SG is not set | 1573 | # CONFIG_DEBUG_SG is not set |
| 1532 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1574 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 1533 | # CONFIG_RCU_TORTURE_TEST is not set | 1575 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1534 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1576 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 1535 | # CONFIG_FAULT_INJECTION is not set | 1577 | # CONFIG_FAULT_INJECTION is not set |
| 1578 | # CONFIG_LATENCYTOP is not set | ||
| 1579 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1580 | CONFIG_HAVE_FTRACE=y | ||
| 1581 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1582 | # CONFIG_FTRACE is not set | ||
| 1583 | # CONFIG_SCHED_TRACER is not set | ||
| 1584 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1536 | # CONFIG_SAMPLES is not set | 1585 | # CONFIG_SAMPLES is not set |
| 1586 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1587 | # CONFIG_KGDB is not set | ||
| 1537 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1588 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
| 1538 | # CONFIG_DEBUG_STACK_USAGE is not set | 1589 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1539 | # CONFIG_DEBUG_PAGEALLOC is not set | 1590 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1540 | # CONFIG_DEBUGGER is not set | 1591 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
| 1592 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
| 1593 | # CONFIG_XMON is not set | ||
| 1541 | # CONFIG_IRQSTACKS is not set | 1594 | # CONFIG_IRQSTACKS is not set |
| 1542 | # CONFIG_BDI_SWITCH is not set | 1595 | # CONFIG_BDI_SWITCH is not set |
| 1543 | # CONFIG_BOOTX_TEXT is not set | 1596 | # CONFIG_BOOTX_TEXT is not set |
| @@ -1556,6 +1609,7 @@ CONFIG_CRYPTO=y | |||
| 1556 | # | 1609 | # |
| 1557 | CONFIG_CRYPTO_ALGAPI=y | 1610 | CONFIG_CRYPTO_ALGAPI=y |
| 1558 | CONFIG_CRYPTO_BLKCIPHER=y | 1611 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1612 | CONFIG_CRYPTO_HASH=m | ||
| 1559 | CONFIG_CRYPTO_MANAGER=y | 1613 | CONFIG_CRYPTO_MANAGER=y |
| 1560 | # CONFIG_CRYPTO_GF128MUL is not set | 1614 | # CONFIG_CRYPTO_GF128MUL is not set |
| 1561 | # CONFIG_CRYPTO_NULL is not set | 1615 | # CONFIG_CRYPTO_NULL is not set |
| @@ -1594,6 +1648,10 @@ CONFIG_CRYPTO_CRC32C=m | |||
| 1594 | CONFIG_CRYPTO_MD4=m | 1648 | CONFIG_CRYPTO_MD4=m |
| 1595 | CONFIG_CRYPTO_MD5=y | 1649 | CONFIG_CRYPTO_MD5=y |
| 1596 | CONFIG_CRYPTO_MICHAEL_MIC=m | 1650 | CONFIG_CRYPTO_MICHAEL_MIC=m |
| 1651 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1652 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1653 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1654 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1597 | CONFIG_CRYPTO_SHA1=m | 1655 | CONFIG_CRYPTO_SHA1=m |
| 1598 | # CONFIG_CRYPTO_SHA256 is not set | 1656 | # CONFIG_CRYPTO_SHA256 is not set |
| 1599 | # CONFIG_CRYPTO_SHA512 is not set | 1657 | # CONFIG_CRYPTO_SHA512 is not set |
| @@ -1627,5 +1685,6 @@ CONFIG_CRYPTO_DEFLATE=m | |||
| 1627 | # CONFIG_CRYPTO_LZO is not set | 1685 | # CONFIG_CRYPTO_LZO is not set |
| 1628 | CONFIG_CRYPTO_HW=y | 1686 | CONFIG_CRYPTO_HW=y |
| 1629 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1687 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1688 | # CONFIG_CRYPTO_DEV_TALITOS is not set | ||
| 1630 | # CONFIG_PPC_CLOCK is not set | 1689 | # CONFIG_PPC_CLOCK is not set |
| 1631 | # CONFIG_VIRTUALIZATION is not set | 1690 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/maple_defconfig b/arch/powerpc/configs/maple_defconfig index 7a166a39d92d..1a3b6423222b 100644 --- a/arch/powerpc/configs/maple_defconfig +++ b/arch/powerpc/configs/maple_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.24-rc4 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Thu Dec 6 16:48:26 2007 | 4 | # Tue Aug 26 13:18:58 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
| 7 | 7 | ||
| @@ -27,7 +27,12 @@ CONFIG_GENERIC_TIME=y | |||
| 27 | CONFIG_GENERIC_TIME_VSYSCALL=y | 27 | CONFIG_GENERIC_TIME_VSYSCALL=y |
| 28 | CONFIG_GENERIC_CLOCKEVENTS=y | 28 | CONFIG_GENERIC_CLOCKEVENTS=y |
| 29 | CONFIG_GENERIC_HARDIRQS=y | 29 | CONFIG_GENERIC_HARDIRQS=y |
| 30 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y | ||
| 30 | CONFIG_IRQ_PER_CPU=y | 31 | CONFIG_IRQ_PER_CPU=y |
| 32 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 33 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 34 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 31 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 32 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 33 | CONFIG_ARCH_HAS_ILOG2_U64=y | 38 | CONFIG_ARCH_HAS_ILOG2_U64=y |
| @@ -67,16 +72,20 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
| 67 | CONFIG_POSIX_MQUEUE=y | 72 | CONFIG_POSIX_MQUEUE=y |
| 68 | # CONFIG_BSD_PROCESS_ACCT is not set | 73 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 69 | # CONFIG_TASKSTATS is not set | 74 | # CONFIG_TASKSTATS is not set |
| 70 | # CONFIG_USER_NS is not set | ||
| 71 | # CONFIG_PID_NS is not set | ||
| 72 | # CONFIG_AUDIT is not set | 75 | # CONFIG_AUDIT is not set |
| 73 | CONFIG_IKCONFIG=y | 76 | CONFIG_IKCONFIG=y |
| 74 | CONFIG_IKCONFIG_PROC=y | 77 | CONFIG_IKCONFIG_PROC=y |
| 75 | CONFIG_LOG_BUF_SHIFT=17 | 78 | CONFIG_LOG_BUF_SHIFT=17 |
| 76 | # CONFIG_CGROUPS is not set | 79 | # CONFIG_CGROUPS is not set |
| 77 | # CONFIG_FAIR_GROUP_SCHED is not set | 80 | # CONFIG_GROUP_SCHED is not set |
| 78 | CONFIG_SYSFS_DEPRECATED=y | 81 | CONFIG_SYSFS_DEPRECATED=y |
| 82 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 79 | # CONFIG_RELAY is not set | 83 | # CONFIG_RELAY is not set |
| 84 | CONFIG_NAMESPACES=y | ||
| 85 | # CONFIG_UTS_NS is not set | ||
| 86 | # CONFIG_IPC_NS is not set | ||
| 87 | # CONFIG_USER_NS is not set | ||
| 88 | # CONFIG_PID_NS is not set | ||
| 80 | # CONFIG_BLK_DEV_INITRD is not set | 89 | # CONFIG_BLK_DEV_INITRD is not set |
| 81 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 90 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
| 82 | CONFIG_SYSCTL=y | 91 | CONFIG_SYSCTL=y |
| @@ -89,11 +98,13 @@ CONFIG_HOTPLUG=y | |||
| 89 | CONFIG_PRINTK=y | 98 | CONFIG_PRINTK=y |
| 90 | CONFIG_BUG=y | 99 | CONFIG_BUG=y |
| 91 | CONFIG_ELF_CORE=y | 100 | CONFIG_ELF_CORE=y |
| 101 | # CONFIG_COMPAT_BRK is not set | ||
| 92 | CONFIG_BASE_FULL=y | 102 | CONFIG_BASE_FULL=y |
| 93 | CONFIG_FUTEX=y | 103 | CONFIG_FUTEX=y |
| 94 | CONFIG_ANON_INODES=y | 104 | CONFIG_ANON_INODES=y |
| 95 | CONFIG_EPOLL=y | 105 | CONFIG_EPOLL=y |
| 96 | CONFIG_SIGNALFD=y | 106 | CONFIG_SIGNALFD=y |
| 107 | CONFIG_TIMERFD=y | ||
| 97 | CONFIG_EVENTFD=y | 108 | CONFIG_EVENTFD=y |
| 98 | CONFIG_SHMEM=y | 109 | CONFIG_SHMEM=y |
| 99 | CONFIG_VM_EVENT_COUNTERS=y | 110 | CONFIG_VM_EVENT_COUNTERS=y |
| @@ -101,10 +112,28 @@ CONFIG_SLUB_DEBUG=y | |||
| 101 | # CONFIG_SLAB is not set | 112 | # CONFIG_SLAB is not set |
| 102 | CONFIG_SLUB=y | 113 | CONFIG_SLUB=y |
| 103 | # CONFIG_SLOB is not set | 114 | # CONFIG_SLOB is not set |
| 115 | CONFIG_PROFILING=y | ||
| 116 | # CONFIG_MARKERS is not set | ||
| 117 | CONFIG_OPROFILE=m | ||
| 118 | CONFIG_HAVE_OPROFILE=y | ||
| 119 | CONFIG_KPROBES=y | ||
| 120 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 121 | CONFIG_KRETPROBES=y | ||
| 122 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 123 | CONFIG_HAVE_KPROBES=y | ||
| 124 | CONFIG_HAVE_KRETPROBES=y | ||
| 125 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 126 | CONFIG_HAVE_DMA_ATTRS=y | ||
| 127 | CONFIG_USE_GENERIC_SMP_HELPERS=y | ||
| 128 | # CONFIG_HAVE_CLK is not set | ||
| 129 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 130 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 131 | CONFIG_SLABINFO=y | ||
| 104 | CONFIG_RT_MUTEXES=y | 132 | CONFIG_RT_MUTEXES=y |
| 105 | # CONFIG_TINY_SHMEM is not set | 133 | # CONFIG_TINY_SHMEM is not set |
| 106 | CONFIG_BASE_SMALL=0 | 134 | CONFIG_BASE_SMALL=0 |
| 107 | CONFIG_MODULES=y | 135 | CONFIG_MODULES=y |
| 136 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 108 | CONFIG_MODULE_UNLOAD=y | 137 | CONFIG_MODULE_UNLOAD=y |
| 109 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 138 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 110 | CONFIG_MODVERSIONS=y | 139 | CONFIG_MODVERSIONS=y |
| @@ -114,6 +143,7 @@ CONFIG_STOP_MACHINE=y | |||
| 114 | CONFIG_BLOCK=y | 143 | CONFIG_BLOCK=y |
| 115 | # CONFIG_BLK_DEV_IO_TRACE is not set | 144 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 116 | # CONFIG_BLK_DEV_BSG is not set | 145 | # CONFIG_BLK_DEV_BSG is not set |
| 146 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 117 | CONFIG_BLOCK_COMPAT=y | 147 | CONFIG_BLOCK_COMPAT=y |
| 118 | 148 | ||
| 119 | # | 149 | # |
| @@ -128,29 +158,26 @@ CONFIG_DEFAULT_AS=y | |||
| 128 | # CONFIG_DEFAULT_CFQ is not set | 158 | # CONFIG_DEFAULT_CFQ is not set |
| 129 | # CONFIG_DEFAULT_NOOP is not set | 159 | # CONFIG_DEFAULT_NOOP is not set |
| 130 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 160 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 161 | CONFIG_CLASSIC_RCU=y | ||
| 131 | 162 | ||
| 132 | # | 163 | # |
| 133 | # Platform support | 164 | # Platform support |
| 134 | # | 165 | # |
| 135 | CONFIG_PPC_MULTIPLATFORM=y | 166 | CONFIG_PPC_MULTIPLATFORM=y |
| 136 | # CONFIG_PPC_82xx is not set | ||
| 137 | # CONFIG_PPC_83xx is not set | ||
| 138 | # CONFIG_PPC_86xx is not set | ||
| 139 | # CONFIG_PPC_PSERIES is not set | 167 | # CONFIG_PPC_PSERIES is not set |
| 140 | # CONFIG_PPC_ISERIES is not set | 168 | # CONFIG_PPC_ISERIES is not set |
| 141 | # CONFIG_PPC_MPC52xx is not set | ||
| 142 | # CONFIG_PPC_MPC5200 is not set | ||
| 143 | # CONFIG_PPC_PMAC is not set | 169 | # CONFIG_PPC_PMAC is not set |
| 144 | CONFIG_PPC_MAPLE=y | 170 | CONFIG_PPC_MAPLE=y |
| 145 | # CONFIG_PPC_PASEMI is not set | 171 | # CONFIG_PPC_PASEMI is not set |
| 146 | # CONFIG_PPC_CELLEB is not set | ||
| 147 | # CONFIG_PPC_PS3 is not set | 172 | # CONFIG_PPC_PS3 is not set |
| 148 | # CONFIG_PPC_CELL is not set | 173 | # CONFIG_PPC_CELL is not set |
| 149 | # CONFIG_PPC_CELL_NATIVE is not set | 174 | # CONFIG_PPC_CELL_NATIVE is not set |
| 150 | # CONFIG_PPC_IBM_CELL_BLADE is not set | 175 | # CONFIG_PPC_IBM_CELL_BLADE is not set |
| 176 | # CONFIG_PPC_CELLEB is not set | ||
| 151 | # CONFIG_PQ2ADS is not set | 177 | # CONFIG_PQ2ADS is not set |
| 152 | CONFIG_PPC_NATIVE=y | 178 | CONFIG_PPC_NATIVE=y |
| 153 | CONFIG_UDBG_RTAS_CONSOLE=y | 179 | CONFIG_UDBG_RTAS_CONSOLE=y |
| 180 | # CONFIG_IPIC is not set | ||
| 154 | CONFIG_MPIC=y | 181 | CONFIG_MPIC=y |
| 155 | # CONFIG_MPIC_WEIRD is not set | 182 | # CONFIG_MPIC_WEIRD is not set |
| 156 | # CONFIG_PPC_I8259 is not set | 183 | # CONFIG_PPC_I8259 is not set |
| @@ -166,7 +193,6 @@ CONFIG_PPC_970_NAP=y | |||
| 166 | # CONFIG_PPC_INDIRECT_IO is not set | 193 | # CONFIG_PPC_INDIRECT_IO is not set |
| 167 | # CONFIG_GENERIC_IOMAP is not set | 194 | # CONFIG_GENERIC_IOMAP is not set |
| 168 | # CONFIG_CPU_FREQ is not set | 195 | # CONFIG_CPU_FREQ is not set |
| 169 | # CONFIG_CPM2 is not set | ||
| 170 | # CONFIG_FSL_ULI1575 is not set | 196 | # CONFIG_FSL_ULI1575 is not set |
| 171 | 197 | ||
| 172 | # | 198 | # |
| @@ -181,16 +207,19 @@ CONFIG_HZ_250=y | |||
| 181 | # CONFIG_HZ_300 is not set | 207 | # CONFIG_HZ_300 is not set |
| 182 | # CONFIG_HZ_1000 is not set | 208 | # CONFIG_HZ_1000 is not set |
| 183 | CONFIG_HZ=250 | 209 | CONFIG_HZ=250 |
| 210 | CONFIG_SCHED_HRTICK=y | ||
| 184 | CONFIG_PREEMPT_NONE=y | 211 | CONFIG_PREEMPT_NONE=y |
| 185 | # CONFIG_PREEMPT_VOLUNTARY is not set | 212 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 186 | # CONFIG_PREEMPT is not set | 213 | # CONFIG_PREEMPT is not set |
| 187 | # CONFIG_PREEMPT_BKL is not set | ||
| 188 | CONFIG_BINFMT_ELF=y | 214 | CONFIG_BINFMT_ELF=y |
| 215 | CONFIG_COMPAT_BINFMT_ELF=y | ||
| 189 | # CONFIG_BINFMT_MISC is not set | 216 | # CONFIG_BINFMT_MISC is not set |
| 190 | CONFIG_FORCE_MAX_ZONEORDER=13 | ||
| 191 | CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y | 217 | CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y |
| 192 | CONFIG_IOMMU_VMERGE=y | 218 | CONFIG_IOMMU_VMERGE=y |
| 219 | CONFIG_IOMMU_HELPER=y | ||
| 193 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 220 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| 221 | CONFIG_ARCH_HAS_WALK_MEMORY=y | ||
| 222 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | ||
| 194 | CONFIG_KEXEC=y | 223 | CONFIG_KEXEC=y |
| 195 | # CONFIG_CRASH_DUMP is not set | 224 | # CONFIG_CRASH_DUMP is not set |
| 196 | CONFIG_IRQ_ALL_CPUS=y | 225 | CONFIG_IRQ_ALL_CPUS=y |
| @@ -207,18 +236,21 @@ CONFIG_FLATMEM=y | |||
| 207 | CONFIG_FLAT_NODE_MEM_MAP=y | 236 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 208 | # CONFIG_SPARSEMEM_STATIC is not set | 237 | # CONFIG_SPARSEMEM_STATIC is not set |
| 209 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y | 238 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y |
| 239 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 210 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 240 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 241 | # CONFIG_MIGRATION is not set | ||
| 211 | CONFIG_RESOURCES_64BIT=y | 242 | CONFIG_RESOURCES_64BIT=y |
| 212 | CONFIG_ZONE_DMA_FLAG=1 | 243 | CONFIG_ZONE_DMA_FLAG=1 |
| 213 | CONFIG_BOUNCE=y | 244 | CONFIG_BOUNCE=y |
| 214 | # CONFIG_PPC_HAS_HASH_64K is not set | 245 | # CONFIG_PPC_HAS_HASH_64K is not set |
| 215 | # CONFIG_PPC_64K_PAGES is not set | 246 | # CONFIG_PPC_64K_PAGES is not set |
| 247 | CONFIG_FORCE_MAX_ZONEORDER=13 | ||
| 216 | # CONFIG_SCHED_SMT is not set | 248 | # CONFIG_SCHED_SMT is not set |
| 217 | CONFIG_PROC_DEVICETREE=y | 249 | CONFIG_PROC_DEVICETREE=y |
| 218 | # CONFIG_CMDLINE_BOOL is not set | 250 | # CONFIG_CMDLINE_BOOL is not set |
| 251 | CONFIG_EXTRA_TARGETS="" | ||
| 219 | # CONFIG_PM is not set | 252 | # CONFIG_PM is not set |
| 220 | CONFIG_SECCOMP=y | 253 | CONFIG_SECCOMP=y |
| 221 | # CONFIG_WANT_DEVICE_TREE is not set | ||
| 222 | CONFIG_ISA_DMA_API=y | 254 | CONFIG_ISA_DMA_API=y |
| 223 | 255 | ||
| 224 | # | 256 | # |
| @@ -237,11 +269,10 @@ CONFIG_PCI_LEGACY=y | |||
| 237 | # CONFIG_PCI_DEBUG is not set | 269 | # CONFIG_PCI_DEBUG is not set |
| 238 | # CONFIG_PCCARD is not set | 270 | # CONFIG_PCCARD is not set |
| 239 | # CONFIG_HOTPLUG_PCI is not set | 271 | # CONFIG_HOTPLUG_PCI is not set |
| 272 | # CONFIG_HAS_RAPIDIO is not set | ||
| 273 | CONFIG_PAGE_OFFSET=0xc000000000000000 | ||
| 240 | CONFIG_KERNEL_START=0xc000000000000000 | 274 | CONFIG_KERNEL_START=0xc000000000000000 |
| 241 | 275 | CONFIG_PHYSICAL_START=0x00000000 | |
| 242 | # | ||
| 243 | # Networking | ||
| 244 | # | ||
| 245 | CONFIG_NET=y | 276 | CONFIG_NET=y |
| 246 | 277 | ||
| 247 | # | 278 | # |
| @@ -254,6 +285,7 @@ CONFIG_XFRM=y | |||
| 254 | CONFIG_XFRM_USER=m | 285 | CONFIG_XFRM_USER=m |
| 255 | # CONFIG_XFRM_SUB_POLICY is not set | 286 | # CONFIG_XFRM_SUB_POLICY is not set |
| 256 | # CONFIG_XFRM_MIGRATE is not set | 287 | # CONFIG_XFRM_MIGRATE is not set |
| 288 | # CONFIG_XFRM_STATISTICS is not set | ||
| 257 | # CONFIG_NET_KEY is not set | 289 | # CONFIG_NET_KEY is not set |
| 258 | CONFIG_INET=y | 290 | CONFIG_INET=y |
| 259 | CONFIG_IP_MULTICAST=y | 291 | CONFIG_IP_MULTICAST=y |
| @@ -284,8 +316,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 284 | CONFIG_DEFAULT_TCP_CONG="cubic" | 316 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 285 | # CONFIG_TCP_MD5SIG is not set | 317 | # CONFIG_TCP_MD5SIG is not set |
| 286 | # CONFIG_IPV6 is not set | 318 | # CONFIG_IPV6 is not set |
| 287 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 288 | # CONFIG_INET6_TUNNEL is not set | ||
| 289 | # CONFIG_NETWORK_SECMARK is not set | 319 | # CONFIG_NETWORK_SECMARK is not set |
| 290 | # CONFIG_NETFILTER is not set | 320 | # CONFIG_NETFILTER is not set |
| 291 | # CONFIG_IP_DCCP is not set | 321 | # CONFIG_IP_DCCP is not set |
| @@ -308,7 +338,9 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 308 | # Network testing | 338 | # Network testing |
| 309 | # | 339 | # |
| 310 | # CONFIG_NET_PKTGEN is not set | 340 | # CONFIG_NET_PKTGEN is not set |
| 341 | # CONFIG_NET_TCPPROBE is not set | ||
| 311 | # CONFIG_HAMRADIO is not set | 342 | # CONFIG_HAMRADIO is not set |
| 343 | # CONFIG_CAN is not set | ||
| 312 | # CONFIG_IRDA is not set | 344 | # CONFIG_IRDA is not set |
| 313 | # CONFIG_BT is not set | 345 | # CONFIG_BT is not set |
| 314 | # CONFIG_AF_RXRPC is not set | 346 | # CONFIG_AF_RXRPC is not set |
| @@ -334,12 +366,15 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | |||
| 334 | CONFIG_STANDALONE=y | 366 | CONFIG_STANDALONE=y |
| 335 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 367 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 336 | CONFIG_FW_LOADER=y | 368 | CONFIG_FW_LOADER=y |
| 369 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
| 370 | CONFIG_EXTRA_FIRMWARE="" | ||
| 337 | # CONFIG_DEBUG_DRIVER is not set | 371 | # CONFIG_DEBUG_DRIVER is not set |
| 338 | # CONFIG_DEBUG_DEVRES is not set | 372 | # CONFIG_DEBUG_DEVRES is not set |
| 339 | # CONFIG_SYS_HYPERVISOR is not set | 373 | # CONFIG_SYS_HYPERVISOR is not set |
| 340 | # CONFIG_CONNECTOR is not set | 374 | # CONFIG_CONNECTOR is not set |
| 341 | # CONFIG_MTD is not set | 375 | # CONFIG_MTD is not set |
| 342 | CONFIG_OF_DEVICE=y | 376 | CONFIG_OF_DEVICE=y |
| 377 | CONFIG_OF_I2C=y | ||
| 343 | # CONFIG_PARPORT is not set | 378 | # CONFIG_PARPORT is not set |
| 344 | CONFIG_BLK_DEV=y | 379 | CONFIG_BLK_DEV=y |
| 345 | # CONFIG_BLK_DEV_FD is not set | 380 | # CONFIG_BLK_DEV_FD is not set |
| @@ -354,24 +389,30 @@ CONFIG_BLK_DEV=y | |||
| 354 | CONFIG_BLK_DEV_RAM=y | 389 | CONFIG_BLK_DEV_RAM=y |
| 355 | CONFIG_BLK_DEV_RAM_COUNT=16 | 390 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 356 | CONFIG_BLK_DEV_RAM_SIZE=8192 | 391 | CONFIG_BLK_DEV_RAM_SIZE=8192 |
| 357 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 392 | # CONFIG_BLK_DEV_XIP is not set |
| 358 | # CONFIG_CDROM_PKTCDVD is not set | 393 | # CONFIG_CDROM_PKTCDVD is not set |
| 359 | # CONFIG_ATA_OVER_ETH is not set | 394 | # CONFIG_ATA_OVER_ETH is not set |
| 395 | # CONFIG_BLK_DEV_HD is not set | ||
| 360 | CONFIG_MISC_DEVICES=y | 396 | CONFIG_MISC_DEVICES=y |
| 361 | # CONFIG_PHANTOM is not set | 397 | # CONFIG_PHANTOM is not set |
| 362 | # CONFIG_EEPROM_93CX6 is not set | 398 | # CONFIG_EEPROM_93CX6 is not set |
| 363 | # CONFIG_SGI_IOC4 is not set | 399 | # CONFIG_SGI_IOC4 is not set |
| 364 | # CONFIG_TIFM_CORE is not set | 400 | # CONFIG_TIFM_CORE is not set |
| 401 | # CONFIG_ENCLOSURE_SERVICES is not set | ||
| 402 | # CONFIG_HP_ILO is not set | ||
| 403 | CONFIG_HAVE_IDE=y | ||
| 365 | CONFIG_IDE=y | 404 | CONFIG_IDE=y |
| 366 | CONFIG_BLK_DEV_IDE=y | 405 | CONFIG_BLK_DEV_IDE=y |
| 367 | 406 | ||
| 368 | # | 407 | # |
| 369 | # Please see Documentation/ide.txt for help/info on IDE drives | 408 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
| 370 | # | 409 | # |
| 410 | CONFIG_IDE_TIMINGS=y | ||
| 371 | # CONFIG_BLK_DEV_IDE_SATA is not set | 411 | # CONFIG_BLK_DEV_IDE_SATA is not set |
| 372 | CONFIG_BLK_DEV_IDEDISK=y | 412 | CONFIG_BLK_DEV_IDEDISK=y |
| 373 | # CONFIG_IDEDISK_MULTI_MODE is not set | 413 | # CONFIG_IDEDISK_MULTI_MODE is not set |
| 374 | CONFIG_BLK_DEV_IDECD=y | 414 | CONFIG_BLK_DEV_IDECD=y |
| 415 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y | ||
| 375 | # CONFIG_BLK_DEV_IDETAPE is not set | 416 | # CONFIG_BLK_DEV_IDETAPE is not set |
| 376 | # CONFIG_BLK_DEV_IDEFLOPPY is not set | 417 | # CONFIG_BLK_DEV_IDEFLOPPY is not set |
| 377 | # CONFIG_BLK_DEV_IDESCSI is not set | 418 | # CONFIG_BLK_DEV_IDESCSI is not set |
| @@ -381,14 +422,13 @@ CONFIG_IDE_PROC_FS=y | |||
| 381 | # | 422 | # |
| 382 | # IDE chipset support/bugfixes | 423 | # IDE chipset support/bugfixes |
| 383 | # | 424 | # |
| 384 | CONFIG_IDE_GENERIC=y | ||
| 385 | # CONFIG_BLK_DEV_PLATFORM is not set | 425 | # CONFIG_BLK_DEV_PLATFORM is not set |
| 426 | CONFIG_BLK_DEV_IDEDMA_SFF=y | ||
| 386 | 427 | ||
| 387 | # | 428 | # |
| 388 | # PCI IDE chipsets support | 429 | # PCI IDE chipsets support |
| 389 | # | 430 | # |
| 390 | CONFIG_BLK_DEV_IDEPCI=y | 431 | CONFIG_BLK_DEV_IDEPCI=y |
| 391 | CONFIG_IDEPCI_SHARE_IRQ=y | ||
| 392 | CONFIG_IDEPCI_PCIBUS_ORDER=y | 432 | CONFIG_IDEPCI_PCIBUS_ORDER=y |
| 393 | # CONFIG_BLK_DEV_OFFBOARD is not set | 433 | # CONFIG_BLK_DEV_OFFBOARD is not set |
| 394 | CONFIG_BLK_DEV_GENERIC=y | 434 | CONFIG_BLK_DEV_GENERIC=y |
| @@ -399,10 +439,8 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
| 399 | CONFIG_BLK_DEV_AMD74XX=y | 439 | CONFIG_BLK_DEV_AMD74XX=y |
| 400 | # CONFIG_BLK_DEV_CMD64X is not set | 440 | # CONFIG_BLK_DEV_CMD64X is not set |
| 401 | # CONFIG_BLK_DEV_TRIFLEX is not set | 441 | # CONFIG_BLK_DEV_TRIFLEX is not set |
| 402 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
| 403 | # CONFIG_BLK_DEV_CS5520 is not set | 442 | # CONFIG_BLK_DEV_CS5520 is not set |
| 404 | # CONFIG_BLK_DEV_CS5530 is not set | 443 | # CONFIG_BLK_DEV_CS5530 is not set |
| 405 | # CONFIG_BLK_DEV_HPT34X is not set | ||
| 406 | # CONFIG_BLK_DEV_HPT366 is not set | 444 | # CONFIG_BLK_DEV_HPT366 is not set |
| 407 | # CONFIG_BLK_DEV_JMICRON is not set | 445 | # CONFIG_BLK_DEV_JMICRON is not set |
| 408 | # CONFIG_BLK_DEV_SC1200 is not set | 446 | # CONFIG_BLK_DEV_SC1200 is not set |
| @@ -419,10 +457,7 @@ CONFIG_BLK_DEV_AMD74XX=y | |||
| 419 | # CONFIG_BLK_DEV_TRM290 is not set | 457 | # CONFIG_BLK_DEV_TRM290 is not set |
| 420 | # CONFIG_BLK_DEV_VIA82CXXX is not set | 458 | # CONFIG_BLK_DEV_VIA82CXXX is not set |
| 421 | # CONFIG_BLK_DEV_TC86C001 is not set | 459 | # CONFIG_BLK_DEV_TC86C001 is not set |
| 422 | # CONFIG_IDE_ARM is not set | ||
| 423 | CONFIG_BLK_DEV_IDEDMA=y | 460 | CONFIG_BLK_DEV_IDEDMA=y |
| 424 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | ||
| 425 | # CONFIG_BLK_DEV_HD is not set | ||
| 426 | 461 | ||
| 427 | # | 462 | # |
| 428 | # SCSI device support | 463 | # SCSI device support |
| @@ -483,6 +518,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 483 | # CONFIG_SCSI_IPS is not set | 518 | # CONFIG_SCSI_IPS is not set |
| 484 | # CONFIG_SCSI_INITIO is not set | 519 | # CONFIG_SCSI_INITIO is not set |
| 485 | # CONFIG_SCSI_INIA100 is not set | 520 | # CONFIG_SCSI_INIA100 is not set |
| 521 | # CONFIG_SCSI_MVSAS is not set | ||
| 486 | # CONFIG_SCSI_STEX is not set | 522 | # CONFIG_SCSI_STEX is not set |
| 487 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 523 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
| 488 | CONFIG_SCSI_IPR=y | 524 | CONFIG_SCSI_IPR=y |
| @@ -496,9 +532,13 @@ CONFIG_SCSI_IPR_DUMP=y | |||
| 496 | # CONFIG_SCSI_DC390T is not set | 532 | # CONFIG_SCSI_DC390T is not set |
| 497 | # CONFIG_SCSI_DEBUG is not set | 533 | # CONFIG_SCSI_DEBUG is not set |
| 498 | # CONFIG_SCSI_SRP is not set | 534 | # CONFIG_SCSI_SRP is not set |
| 535 | # CONFIG_SCSI_DH is not set | ||
| 499 | CONFIG_ATA=y | 536 | CONFIG_ATA=y |
| 500 | CONFIG_ATA_NONSTANDARD=y | 537 | CONFIG_ATA_NONSTANDARD=y |
| 538 | CONFIG_SATA_PMP=y | ||
| 501 | # CONFIG_SATA_AHCI is not set | 539 | # CONFIG_SATA_AHCI is not set |
| 540 | # CONFIG_SATA_SIL24 is not set | ||
| 541 | CONFIG_ATA_SFF=y | ||
| 502 | # CONFIG_SATA_SVW is not set | 542 | # CONFIG_SATA_SVW is not set |
| 503 | # CONFIG_ATA_PIIX is not set | 543 | # CONFIG_ATA_PIIX is not set |
| 504 | # CONFIG_SATA_MV is not set | 544 | # CONFIG_SATA_MV is not set |
| @@ -508,7 +548,6 @@ CONFIG_ATA_NONSTANDARD=y | |||
| 508 | # CONFIG_SATA_PROMISE is not set | 548 | # CONFIG_SATA_PROMISE is not set |
| 509 | # CONFIG_SATA_SX4 is not set | 549 | # CONFIG_SATA_SX4 is not set |
| 510 | # CONFIG_SATA_SIL is not set | 550 | # CONFIG_SATA_SIL is not set |
| 511 | # CONFIG_SATA_SIL24 is not set | ||
| 512 | # CONFIG_SATA_SIS is not set | 551 | # CONFIG_SATA_SIS is not set |
| 513 | # CONFIG_SATA_ULI is not set | 552 | # CONFIG_SATA_ULI is not set |
| 514 | # CONFIG_SATA_VIA is not set | 553 | # CONFIG_SATA_VIA is not set |
| @@ -537,6 +576,7 @@ CONFIG_ATA_NONSTANDARD=y | |||
| 537 | # CONFIG_PATA_MPIIX is not set | 576 | # CONFIG_PATA_MPIIX is not set |
| 538 | # CONFIG_PATA_OLDPIIX is not set | 577 | # CONFIG_PATA_OLDPIIX is not set |
| 539 | # CONFIG_PATA_NETCELL is not set | 578 | # CONFIG_PATA_NETCELL is not set |
| 579 | # CONFIG_PATA_NINJA32 is not set | ||
| 540 | # CONFIG_PATA_NS87410 is not set | 580 | # CONFIG_PATA_NS87410 is not set |
| 541 | # CONFIG_PATA_NS87415 is not set | 581 | # CONFIG_PATA_NS87415 is not set |
| 542 | # CONFIG_PATA_OPTI is not set | 582 | # CONFIG_PATA_OPTI is not set |
| @@ -551,27 +591,47 @@ CONFIG_ATA_NONSTANDARD=y | |||
| 551 | # CONFIG_PATA_SIS is not set | 591 | # CONFIG_PATA_SIS is not set |
| 552 | # CONFIG_PATA_VIA is not set | 592 | # CONFIG_PATA_VIA is not set |
| 553 | # CONFIG_PATA_WINBOND is not set | 593 | # CONFIG_PATA_WINBOND is not set |
| 594 | # CONFIG_PATA_PLATFORM is not set | ||
| 595 | # CONFIG_PATA_SCH is not set | ||
| 554 | # CONFIG_MD is not set | 596 | # CONFIG_MD is not set |
| 555 | # CONFIG_FUSION is not set | 597 | # CONFIG_FUSION is not set |
| 556 | 598 | ||
| 557 | # | 599 | # |
| 558 | # IEEE 1394 (FireWire) support | 600 | # IEEE 1394 (FireWire) support |
| 559 | # | 601 | # |
| 602 | |||
| 603 | # | ||
| 604 | # Enable only one of the two stacks, unless you know what you are doing | ||
| 605 | # | ||
| 560 | # CONFIG_FIREWIRE is not set | 606 | # CONFIG_FIREWIRE is not set |
| 561 | # CONFIG_IEEE1394 is not set | 607 | # CONFIG_IEEE1394 is not set |
| 562 | # CONFIG_I2O is not set | 608 | # CONFIG_I2O is not set |
| 563 | # CONFIG_MACINTOSH_DRIVERS is not set | 609 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 564 | CONFIG_NETDEVICES=y | 610 | CONFIG_NETDEVICES=y |
| 565 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 566 | # CONFIG_DUMMY is not set | 611 | # CONFIG_DUMMY is not set |
| 567 | # CONFIG_BONDING is not set | 612 | # CONFIG_BONDING is not set |
| 568 | # CONFIG_MACVLAN is not set | 613 | # CONFIG_MACVLAN is not set |
| 569 | # CONFIG_EQUALIZER is not set | 614 | # CONFIG_EQUALIZER is not set |
| 570 | # CONFIG_TUN is not set | 615 | # CONFIG_TUN is not set |
| 571 | # CONFIG_VETH is not set | 616 | # CONFIG_VETH is not set |
| 572 | # CONFIG_IP1000 is not set | ||
| 573 | # CONFIG_ARCNET is not set | 617 | # CONFIG_ARCNET is not set |
| 574 | # CONFIG_PHYLIB is not set | 618 | CONFIG_PHYLIB=y |
| 619 | |||
| 620 | # | ||
| 621 | # MII PHY device drivers | ||
| 622 | # | ||
| 623 | # CONFIG_MARVELL_PHY is not set | ||
| 624 | # CONFIG_DAVICOM_PHY is not set | ||
| 625 | # CONFIG_QSEMI_PHY is not set | ||
| 626 | # CONFIG_LXT_PHY is not set | ||
| 627 | # CONFIG_CICADA_PHY is not set | ||
| 628 | # CONFIG_VITESSE_PHY is not set | ||
| 629 | # CONFIG_SMSC_PHY is not set | ||
| 630 | # CONFIG_BROADCOM_PHY is not set | ||
| 631 | # CONFIG_ICPLUS_PHY is not set | ||
| 632 | # CONFIG_REALTEK_PHY is not set | ||
| 633 | # CONFIG_FIXED_PHY is not set | ||
| 634 | # CONFIG_MDIO_BITBANG is not set | ||
| 575 | CONFIG_NET_ETHERNET=y | 635 | CONFIG_NET_ETHERNET=y |
| 576 | CONFIG_MII=y | 636 | CONFIG_MII=y |
| 577 | # CONFIG_HAPPYMEAL is not set | 637 | # CONFIG_HAPPYMEAL is not set |
| @@ -587,7 +647,6 @@ CONFIG_MII=y | |||
| 587 | CONFIG_NET_PCI=y | 647 | CONFIG_NET_PCI=y |
| 588 | # CONFIG_PCNET32 is not set | 648 | # CONFIG_PCNET32 is not set |
| 589 | CONFIG_AMD8111_ETH=y | 649 | CONFIG_AMD8111_ETH=y |
| 590 | # CONFIG_AMD8111E_NAPI is not set | ||
| 591 | # CONFIG_ADAPTEC_STARFIRE is not set | 650 | # CONFIG_ADAPTEC_STARFIRE is not set |
| 592 | # CONFIG_B44 is not set | 651 | # CONFIG_B44 is not set |
| 593 | # CONFIG_FORCEDETH is not set | 652 | # CONFIG_FORCEDETH is not set |
| @@ -598,18 +657,21 @@ CONFIG_AMD8111_ETH=y | |||
| 598 | # CONFIG_NE2K_PCI is not set | 657 | # CONFIG_NE2K_PCI is not set |
| 599 | # CONFIG_8139CP is not set | 658 | # CONFIG_8139CP is not set |
| 600 | # CONFIG_8139TOO is not set | 659 | # CONFIG_8139TOO is not set |
| 660 | # CONFIG_R6040 is not set | ||
| 601 | # CONFIG_SIS900 is not set | 661 | # CONFIG_SIS900 is not set |
| 602 | # CONFIG_EPIC100 is not set | 662 | # CONFIG_EPIC100 is not set |
| 603 | # CONFIG_SUNDANCE is not set | 663 | # CONFIG_SUNDANCE is not set |
| 664 | # CONFIG_TLAN is not set | ||
| 604 | # CONFIG_VIA_RHINE is not set | 665 | # CONFIG_VIA_RHINE is not set |
| 605 | # CONFIG_SC92031 is not set | 666 | # CONFIG_SC92031 is not set |
| 606 | CONFIG_NETDEV_1000=y | 667 | CONFIG_NETDEV_1000=y |
| 607 | # CONFIG_ACENIC is not set | 668 | # CONFIG_ACENIC is not set |
| 608 | # CONFIG_DL2K is not set | 669 | # CONFIG_DL2K is not set |
| 609 | CONFIG_E1000=y | 670 | CONFIG_E1000=y |
| 610 | # CONFIG_E1000_NAPI is not set | ||
| 611 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | 671 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set |
| 612 | # CONFIG_E1000E is not set | 672 | # CONFIG_E1000E is not set |
| 673 | # CONFIG_IP1000 is not set | ||
| 674 | # CONFIG_IGB is not set | ||
| 613 | # CONFIG_NS83820 is not set | 675 | # CONFIG_NS83820 is not set |
| 614 | # CONFIG_HAMACHI is not set | 676 | # CONFIG_HAMACHI is not set |
| 615 | # CONFIG_YELLOWFIN is not set | 677 | # CONFIG_YELLOWFIN is not set |
| @@ -617,12 +679,12 @@ CONFIG_E1000=y | |||
| 617 | # CONFIG_SIS190 is not set | 679 | # CONFIG_SIS190 is not set |
| 618 | # CONFIG_SKGE is not set | 680 | # CONFIG_SKGE is not set |
| 619 | # CONFIG_SKY2 is not set | 681 | # CONFIG_SKY2 is not set |
| 620 | # CONFIG_SK98LIN is not set | ||
| 621 | # CONFIG_VIA_VELOCITY is not set | 682 | # CONFIG_VIA_VELOCITY is not set |
| 622 | CONFIG_TIGON3=y | 683 | CONFIG_TIGON3=y |
| 623 | # CONFIG_BNX2 is not set | 684 | # CONFIG_BNX2 is not set |
| 624 | # CONFIG_QLA3XXX is not set | 685 | # CONFIG_QLA3XXX is not set |
| 625 | # CONFIG_ATL1 is not set | 686 | # CONFIG_ATL1 is not set |
| 687 | # CONFIG_ATL1E is not set | ||
| 626 | CONFIG_NETDEV_10000=y | 688 | CONFIG_NETDEV_10000=y |
| 627 | # CONFIG_CHELSIO_T1 is not set | 689 | # CONFIG_CHELSIO_T1 is not set |
| 628 | # CONFIG_CHELSIO_T3 is not set | 690 | # CONFIG_CHELSIO_T3 is not set |
| @@ -632,9 +694,10 @@ CONFIG_NETDEV_10000=y | |||
| 632 | # CONFIG_MYRI10GE is not set | 694 | # CONFIG_MYRI10GE is not set |
| 633 | # CONFIG_NETXEN_NIC is not set | 695 | # CONFIG_NETXEN_NIC is not set |
| 634 | # CONFIG_NIU is not set | 696 | # CONFIG_NIU is not set |
| 635 | # CONFIG_PASEMI_MAC is not set | ||
| 636 | # CONFIG_MLX4_CORE is not set | 697 | # CONFIG_MLX4_CORE is not set |
| 637 | # CONFIG_TEHUTI is not set | 698 | # CONFIG_TEHUTI is not set |
| 699 | # CONFIG_BNX2X is not set | ||
| 700 | # CONFIG_SFC is not set | ||
| 638 | # CONFIG_TR is not set | 701 | # CONFIG_TR is not set |
| 639 | 702 | ||
| 640 | # | 703 | # |
| @@ -642,6 +705,7 @@ CONFIG_NETDEV_10000=y | |||
| 642 | # | 705 | # |
| 643 | # CONFIG_WLAN_PRE80211 is not set | 706 | # CONFIG_WLAN_PRE80211 is not set |
| 644 | # CONFIG_WLAN_80211 is not set | 707 | # CONFIG_WLAN_80211 is not set |
| 708 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 645 | 709 | ||
| 646 | # | 710 | # |
| 647 | # USB Network Adapters | 711 | # USB Network Adapters |
| @@ -657,7 +721,6 @@ CONFIG_USB_PEGASUS=y | |||
| 657 | # CONFIG_PPP is not set | 721 | # CONFIG_PPP is not set |
| 658 | # CONFIG_SLIP is not set | 722 | # CONFIG_SLIP is not set |
| 659 | # CONFIG_NET_FC is not set | 723 | # CONFIG_NET_FC is not set |
| 660 | # CONFIG_SHAPER is not set | ||
| 661 | # CONFIG_NETCONSOLE is not set | 724 | # CONFIG_NETCONSOLE is not set |
| 662 | # CONFIG_NETPOLL is not set | 725 | # CONFIG_NETPOLL is not set |
| 663 | # CONFIG_NET_POLL_CONTROLLER is not set | 726 | # CONFIG_NET_POLL_CONTROLLER is not set |
| @@ -702,10 +765,13 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=1200 | |||
| 702 | # Character devices | 765 | # Character devices |
| 703 | # | 766 | # |
| 704 | CONFIG_VT=y | 767 | CONFIG_VT=y |
| 768 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 705 | CONFIG_VT_CONSOLE=y | 769 | CONFIG_VT_CONSOLE=y |
| 706 | CONFIG_HW_CONSOLE=y | 770 | CONFIG_HW_CONSOLE=y |
| 707 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 771 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| 772 | CONFIG_DEVKMEM=y | ||
| 708 | # CONFIG_SERIAL_NONSTANDARD is not set | 773 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 774 | # CONFIG_NOZOMI is not set | ||
| 709 | 775 | ||
| 710 | # | 776 | # |
| 711 | # Serial drivers | 777 | # Serial drivers |
| @@ -742,16 +808,14 @@ CONFIG_DEVPORT=y | |||
| 742 | CONFIG_I2C=y | 808 | CONFIG_I2C=y |
| 743 | CONFIG_I2C_BOARDINFO=y | 809 | CONFIG_I2C_BOARDINFO=y |
| 744 | CONFIG_I2C_CHARDEV=y | 810 | CONFIG_I2C_CHARDEV=y |
| 811 | CONFIG_I2C_HELPER_AUTO=y | ||
| 745 | 812 | ||
| 746 | # | 813 | # |
| 747 | # I2C Algorithms | 814 | # I2C Hardware Bus support |
| 748 | # | 815 | # |
| 749 | CONFIG_I2C_ALGOBIT=y | ||
| 750 | # CONFIG_I2C_ALGOPCF is not set | ||
| 751 | # CONFIG_I2C_ALGOPCA is not set | ||
| 752 | 816 | ||
| 753 | # | 817 | # |
| 754 | # I2C Hardware Bus support | 818 | # PC SMBus host controller drivers |
| 755 | # | 819 | # |
| 756 | # CONFIG_I2C_ALI1535 is not set | 820 | # CONFIG_I2C_ALI1535 is not set |
| 757 | # CONFIG_I2C_ALI1563 is not set | 821 | # CONFIG_I2C_ALI1563 is not set |
| @@ -759,32 +823,47 @@ CONFIG_I2C_ALGOBIT=y | |||
| 759 | # CONFIG_I2C_AMD756 is not set | 823 | # CONFIG_I2C_AMD756 is not set |
| 760 | CONFIG_I2C_AMD8111=y | 824 | CONFIG_I2C_AMD8111=y |
| 761 | # CONFIG_I2C_I801 is not set | 825 | # CONFIG_I2C_I801 is not set |
| 762 | # CONFIG_I2C_I810 is not set | 826 | # CONFIG_I2C_ISCH is not set |
| 763 | # CONFIG_I2C_PIIX4 is not set | 827 | # CONFIG_I2C_PIIX4 is not set |
| 764 | # CONFIG_I2C_NFORCE2 is not set | 828 | # CONFIG_I2C_NFORCE2 is not set |
| 765 | # CONFIG_I2C_OCORES is not set | ||
| 766 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 767 | # CONFIG_I2C_PROSAVAGE is not set | ||
| 768 | # CONFIG_I2C_SAVAGE4 is not set | ||
| 769 | # CONFIG_I2C_SIMTEC is not set | ||
| 770 | # CONFIG_I2C_SIS5595 is not set | 829 | # CONFIG_I2C_SIS5595 is not set |
| 771 | # CONFIG_I2C_SIS630 is not set | 830 | # CONFIG_I2C_SIS630 is not set |
| 772 | # CONFIG_I2C_SIS96X is not set | 831 | # CONFIG_I2C_SIS96X is not set |
| 773 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 774 | # CONFIG_I2C_STUB is not set | ||
| 775 | # CONFIG_I2C_TINY_USB is not set | ||
| 776 | # CONFIG_I2C_VIA is not set | 832 | # CONFIG_I2C_VIA is not set |
| 777 | # CONFIG_I2C_VIAPRO is not set | 833 | # CONFIG_I2C_VIAPRO is not set |
| 834 | |||
| 835 | # | ||
| 836 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 837 | # | ||
| 838 | # CONFIG_I2C_OCORES is not set | ||
| 839 | # CONFIG_I2C_SIMTEC is not set | ||
| 840 | |||
| 841 | # | ||
| 842 | # External I2C/SMBus adapter drivers | ||
| 843 | # | ||
| 844 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 845 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 846 | # CONFIG_I2C_TINY_USB is not set | ||
| 847 | |||
| 848 | # | ||
| 849 | # Graphics adapter I2C/DDC channel drivers | ||
| 850 | # | ||
| 778 | # CONFIG_I2C_VOODOO3 is not set | 851 | # CONFIG_I2C_VOODOO3 is not set |
| 779 | 852 | ||
| 780 | # | 853 | # |
| 854 | # Other I2C/SMBus bus drivers | ||
| 855 | # | ||
| 856 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 857 | # CONFIG_I2C_STUB is not set | ||
| 858 | |||
| 859 | # | ||
| 781 | # Miscellaneous I2C Chip support | 860 | # Miscellaneous I2C Chip support |
| 782 | # | 861 | # |
| 783 | # CONFIG_SENSORS_DS1337 is not set | ||
| 784 | # CONFIG_SENSORS_DS1374 is not set | ||
| 785 | # CONFIG_DS1682 is not set | 862 | # CONFIG_DS1682 is not set |
| 863 | # CONFIG_AT24 is not set | ||
| 786 | # CONFIG_SENSORS_EEPROM is not set | 864 | # CONFIG_SENSORS_EEPROM is not set |
| 787 | # CONFIG_SENSORS_PCF8574 is not set | 865 | # CONFIG_SENSORS_PCF8574 is not set |
| 866 | # CONFIG_PCF8575 is not set | ||
| 788 | # CONFIG_SENSORS_PCA9539 is not set | 867 | # CONFIG_SENSORS_PCA9539 is not set |
| 789 | # CONFIG_SENSORS_PCF8591 is not set | 868 | # CONFIG_SENSORS_PCF8591 is not set |
| 790 | # CONFIG_SENSORS_MAX6875 is not set | 869 | # CONFIG_SENSORS_MAX6875 is not set |
| @@ -793,15 +872,14 @@ CONFIG_I2C_AMD8111=y | |||
| 793 | # CONFIG_I2C_DEBUG_ALGO is not set | 872 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 794 | # CONFIG_I2C_DEBUG_BUS is not set | 873 | # CONFIG_I2C_DEBUG_BUS is not set |
| 795 | # CONFIG_I2C_DEBUG_CHIP is not set | 874 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 796 | |||
| 797 | # | ||
| 798 | # SPI support | ||
| 799 | # | ||
| 800 | # CONFIG_SPI is not set | 875 | # CONFIG_SPI is not set |
| 801 | # CONFIG_SPI_MASTER is not set | 876 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
| 877 | # CONFIG_GPIOLIB is not set | ||
| 802 | # CONFIG_W1 is not set | 878 | # CONFIG_W1 is not set |
| 803 | # CONFIG_POWER_SUPPLY is not set | 879 | # CONFIG_POWER_SUPPLY is not set |
| 804 | # CONFIG_HWMON is not set | 880 | # CONFIG_HWMON is not set |
| 881 | # CONFIG_THERMAL is not set | ||
| 882 | # CONFIG_THERMAL_HWMON is not set | ||
| 805 | # CONFIG_WATCHDOG is not set | 883 | # CONFIG_WATCHDOG is not set |
| 806 | 884 | ||
| 807 | # | 885 | # |
| @@ -813,13 +891,25 @@ CONFIG_SSB_POSSIBLE=y | |||
| 813 | # | 891 | # |
| 814 | # Multifunction device drivers | 892 | # Multifunction device drivers |
| 815 | # | 893 | # |
| 894 | # CONFIG_MFD_CORE is not set | ||
| 816 | # CONFIG_MFD_SM501 is not set | 895 | # CONFIG_MFD_SM501 is not set |
| 896 | # CONFIG_HTC_PASIC3 is not set | ||
| 897 | # CONFIG_MFD_TMIO is not set | ||
| 817 | 898 | ||
| 818 | # | 899 | # |
| 819 | # Multimedia devices | 900 | # Multimedia devices |
| 820 | # | 901 | # |
| 902 | |||
| 903 | # | ||
| 904 | # Multimedia core support | ||
| 905 | # | ||
| 821 | # CONFIG_VIDEO_DEV is not set | 906 | # CONFIG_VIDEO_DEV is not set |
| 822 | # CONFIG_DVB_CORE is not set | 907 | # CONFIG_DVB_CORE is not set |
| 908 | # CONFIG_VIDEO_MEDIA is not set | ||
| 909 | |||
| 910 | # | ||
| 911 | # Multimedia drivers | ||
| 912 | # | ||
| 823 | # CONFIG_DAB is not set | 913 | # CONFIG_DAB is not set |
| 824 | 914 | ||
| 825 | # | 915 | # |
| @@ -842,10 +932,6 @@ CONFIG_SSB_POSSIBLE=y | |||
| 842 | # | 932 | # |
| 843 | # CONFIG_VGA_CONSOLE is not set | 933 | # CONFIG_VGA_CONSOLE is not set |
| 844 | CONFIG_DUMMY_CONSOLE=y | 934 | CONFIG_DUMMY_CONSOLE=y |
| 845 | |||
| 846 | # | ||
| 847 | # Sound | ||
| 848 | # | ||
| 849 | # CONFIG_SOUND is not set | 935 | # CONFIG_SOUND is not set |
| 850 | CONFIG_HID_SUPPORT=y | 936 | CONFIG_HID_SUPPORT=y |
| 851 | CONFIG_HID=y | 937 | CONFIG_HID=y |
| @@ -865,6 +951,7 @@ CONFIG_USB_ARCH_HAS_OHCI=y | |||
| 865 | CONFIG_USB_ARCH_HAS_EHCI=y | 951 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 866 | CONFIG_USB=y | 952 | CONFIG_USB=y |
| 867 | # CONFIG_USB_DEBUG is not set | 953 | # CONFIG_USB_DEBUG is not set |
| 954 | # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set | ||
| 868 | 955 | ||
| 869 | # | 956 | # |
| 870 | # Miscellaneous USB options | 957 | # Miscellaneous USB options |
| @@ -873,15 +960,18 @@ CONFIG_USB_DEVICEFS=y | |||
| 873 | CONFIG_USB_DEVICE_CLASS=y | 960 | CONFIG_USB_DEVICE_CLASS=y |
| 874 | # CONFIG_USB_DYNAMIC_MINORS is not set | 961 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 875 | # CONFIG_USB_OTG is not set | 962 | # CONFIG_USB_OTG is not set |
| 963 | CONFIG_USB_MON=y | ||
| 876 | 964 | ||
| 877 | # | 965 | # |
| 878 | # USB Host Controller Drivers | 966 | # USB Host Controller Drivers |
| 879 | # | 967 | # |
| 968 | # CONFIG_USB_C67X00_HCD is not set | ||
| 880 | CONFIG_USB_EHCI_HCD=y | 969 | CONFIG_USB_EHCI_HCD=y |
| 881 | CONFIG_USB_EHCI_SPLIT_ISO=y | ||
| 882 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 970 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
| 883 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 971 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 972 | # CONFIG_USB_EHCI_HCD_PPC_OF is not set | ||
| 884 | # CONFIG_USB_ISP116X_HCD is not set | 973 | # CONFIG_USB_ISP116X_HCD is not set |
| 974 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 885 | CONFIG_USB_OHCI_HCD=y | 975 | CONFIG_USB_OHCI_HCD=y |
| 886 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set | 976 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set |
| 887 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 977 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
| @@ -896,6 +986,7 @@ CONFIG_USB_UHCI_HCD=y | |||
| 896 | # | 986 | # |
| 897 | # CONFIG_USB_ACM is not set | 987 | # CONFIG_USB_ACM is not set |
| 898 | # CONFIG_USB_PRINTER is not set | 988 | # CONFIG_USB_PRINTER is not set |
| 989 | # CONFIG_USB_WDM is not set | ||
| 899 | 990 | ||
| 900 | # | 991 | # |
| 901 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 992 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -912,20 +1003,15 @@ CONFIG_USB_UHCI_HCD=y | |||
| 912 | # | 1003 | # |
| 913 | # CONFIG_USB_MDC800 is not set | 1004 | # CONFIG_USB_MDC800 is not set |
| 914 | # CONFIG_USB_MICROTEK is not set | 1005 | # CONFIG_USB_MICROTEK is not set |
| 915 | CONFIG_USB_MON=y | ||
| 916 | 1006 | ||
| 917 | # | 1007 | # |
| 918 | # USB port drivers | 1008 | # USB port drivers |
| 919 | # | 1009 | # |
| 920 | |||
| 921 | # | ||
| 922 | # USB Serial Converter support | ||
| 923 | # | ||
| 924 | CONFIG_USB_SERIAL=y | 1010 | CONFIG_USB_SERIAL=y |
| 925 | # CONFIG_USB_SERIAL_CONSOLE is not set | 1011 | # CONFIG_USB_SERIAL_CONSOLE is not set |
| 1012 | CONFIG_USB_EZUSB=y | ||
| 926 | CONFIG_USB_SERIAL_GENERIC=y | 1013 | CONFIG_USB_SERIAL_GENERIC=y |
| 927 | # CONFIG_USB_SERIAL_AIRCABLE is not set | 1014 | # CONFIG_USB_SERIAL_AIRCABLE is not set |
| 928 | # CONFIG_USB_SERIAL_AIRPRIME is not set | ||
| 929 | # CONFIG_USB_SERIAL_ARK3116 is not set | 1015 | # CONFIG_USB_SERIAL_ARK3116 is not set |
| 930 | # CONFIG_USB_SERIAL_BELKIN is not set | 1016 | # CONFIG_USB_SERIAL_BELKIN is not set |
| 931 | # CONFIG_USB_SERIAL_CH341 is not set | 1017 | # CONFIG_USB_SERIAL_CH341 is not set |
| @@ -943,6 +1029,7 @@ CONFIG_USB_SERIAL_CYPRESS_M8=m | |||
| 943 | # CONFIG_USB_SERIAL_EDGEPORT_TI is not set | 1029 | # CONFIG_USB_SERIAL_EDGEPORT_TI is not set |
| 944 | CONFIG_USB_SERIAL_GARMIN=m | 1030 | CONFIG_USB_SERIAL_GARMIN=m |
| 945 | CONFIG_USB_SERIAL_IPW=m | 1031 | CONFIG_USB_SERIAL_IPW=m |
| 1032 | # CONFIG_USB_SERIAL_IUU is not set | ||
| 946 | # CONFIG_USB_SERIAL_KEYSPAN_PDA is not set | 1033 | # CONFIG_USB_SERIAL_KEYSPAN_PDA is not set |
| 947 | CONFIG_USB_SERIAL_KEYSPAN=y | 1034 | CONFIG_USB_SERIAL_KEYSPAN=y |
| 948 | CONFIG_USB_SERIAL_KEYSPAN_MPR=y | 1035 | CONFIG_USB_SERIAL_KEYSPAN_MPR=y |
| @@ -962,9 +1049,11 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y | |||
| 962 | # CONFIG_USB_SERIAL_MCT_U232 is not set | 1049 | # CONFIG_USB_SERIAL_MCT_U232 is not set |
| 963 | # CONFIG_USB_SERIAL_MOS7720 is not set | 1050 | # CONFIG_USB_SERIAL_MOS7720 is not set |
| 964 | # CONFIG_USB_SERIAL_MOS7840 is not set | 1051 | # CONFIG_USB_SERIAL_MOS7840 is not set |
| 1052 | # CONFIG_USB_SERIAL_MOTOROLA is not set | ||
| 965 | # CONFIG_USB_SERIAL_NAVMAN is not set | 1053 | # CONFIG_USB_SERIAL_NAVMAN is not set |
| 966 | # CONFIG_USB_SERIAL_PL2303 is not set | 1054 | # CONFIG_USB_SERIAL_PL2303 is not set |
| 967 | # CONFIG_USB_SERIAL_OTI6858 is not set | 1055 | # CONFIG_USB_SERIAL_OTI6858 is not set |
| 1056 | # CONFIG_USB_SERIAL_SPCP8X5 is not set | ||
| 968 | # CONFIG_USB_SERIAL_HP4X is not set | 1057 | # CONFIG_USB_SERIAL_HP4X is not set |
| 969 | # CONFIG_USB_SERIAL_SAFE is not set | 1058 | # CONFIG_USB_SERIAL_SAFE is not set |
| 970 | # CONFIG_USB_SERIAL_SIERRAWIRELESS is not set | 1059 | # CONFIG_USB_SERIAL_SIERRAWIRELESS is not set |
| @@ -974,7 +1063,6 @@ CONFIG_USB_SERIAL_TI=m | |||
| 974 | # CONFIG_USB_SERIAL_OPTION is not set | 1063 | # CONFIG_USB_SERIAL_OPTION is not set |
| 975 | # CONFIG_USB_SERIAL_OMNINET is not set | 1064 | # CONFIG_USB_SERIAL_OMNINET is not set |
| 976 | # CONFIG_USB_SERIAL_DEBUG is not set | 1065 | # CONFIG_USB_SERIAL_DEBUG is not set |
| 977 | CONFIG_USB_EZUSB=y | ||
| 978 | 1066 | ||
| 979 | # | 1067 | # |
| 980 | # USB Miscellaneous drivers | 1068 | # USB Miscellaneous drivers |
| @@ -982,7 +1070,6 @@ CONFIG_USB_EZUSB=y | |||
| 982 | # CONFIG_USB_EMI62 is not set | 1070 | # CONFIG_USB_EMI62 is not set |
| 983 | # CONFIG_USB_EMI26 is not set | 1071 | # CONFIG_USB_EMI26 is not set |
| 984 | # CONFIG_USB_ADUTUX is not set | 1072 | # CONFIG_USB_ADUTUX is not set |
| 985 | # CONFIG_USB_AUERSWALD is not set | ||
| 986 | # CONFIG_USB_RIO500 is not set | 1073 | # CONFIG_USB_RIO500 is not set |
| 987 | # CONFIG_USB_LEGOTOWER is not set | 1074 | # CONFIG_USB_LEGOTOWER is not set |
| 988 | # CONFIG_USB_LCD is not set | 1075 | # CONFIG_USB_LCD is not set |
| @@ -999,24 +1086,16 @@ CONFIG_USB_EZUSB=y | |||
| 999 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1086 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 1000 | # CONFIG_USB_IOWARRIOR is not set | 1087 | # CONFIG_USB_IOWARRIOR is not set |
| 1001 | # CONFIG_USB_TEST is not set | 1088 | # CONFIG_USB_TEST is not set |
| 1002 | 1089 | # CONFIG_USB_ISIGHTFW is not set | |
| 1003 | # | ||
| 1004 | # USB DSL modem support | ||
| 1005 | # | ||
| 1006 | |||
| 1007 | # | ||
| 1008 | # USB Gadget Support | ||
| 1009 | # | ||
| 1010 | # CONFIG_USB_GADGET is not set | 1090 | # CONFIG_USB_GADGET is not set |
| 1011 | # CONFIG_MMC is not set | 1091 | # CONFIG_MMC is not set |
| 1092 | # CONFIG_MEMSTICK is not set | ||
| 1012 | # CONFIG_NEW_LEDS is not set | 1093 | # CONFIG_NEW_LEDS is not set |
| 1094 | # CONFIG_ACCESSIBILITY is not set | ||
| 1013 | # CONFIG_INFINIBAND is not set | 1095 | # CONFIG_INFINIBAND is not set |
| 1014 | # CONFIG_EDAC is not set | 1096 | # CONFIG_EDAC is not set |
| 1015 | # CONFIG_RTC_CLASS is not set | 1097 | # CONFIG_RTC_CLASS is not set |
| 1016 | 1098 | # CONFIG_DMADEVICES is not set | |
| 1017 | # | ||
| 1018 | # Userspace I/O | ||
| 1019 | # | ||
| 1020 | # CONFIG_UIO is not set | 1099 | # CONFIG_UIO is not set |
| 1021 | 1100 | ||
| 1022 | # | 1101 | # |
| @@ -1037,12 +1116,10 @@ CONFIG_FS_POSIX_ACL=y | |||
| 1037 | # CONFIG_XFS_FS is not set | 1116 | # CONFIG_XFS_FS is not set |
| 1038 | # CONFIG_GFS2_FS is not set | 1117 | # CONFIG_GFS2_FS is not set |
| 1039 | # CONFIG_OCFS2_FS is not set | 1118 | # CONFIG_OCFS2_FS is not set |
| 1040 | # CONFIG_MINIX_FS is not set | 1119 | CONFIG_DNOTIFY=y |
| 1041 | # CONFIG_ROMFS_FS is not set | ||
| 1042 | CONFIG_INOTIFY=y | 1120 | CONFIG_INOTIFY=y |
| 1043 | CONFIG_INOTIFY_USER=y | 1121 | CONFIG_INOTIFY_USER=y |
| 1044 | # CONFIG_QUOTA is not set | 1122 | # CONFIG_QUOTA is not set |
| 1045 | CONFIG_DNOTIFY=y | ||
| 1046 | # CONFIG_AUTOFS_FS is not set | 1123 | # CONFIG_AUTOFS_FS is not set |
| 1047 | # CONFIG_AUTOFS4_FS is not set | 1124 | # CONFIG_AUTOFS4_FS is not set |
| 1048 | # CONFIG_FUSE_FS is not set | 1125 | # CONFIG_FUSE_FS is not set |
| @@ -1088,8 +1165,11 @@ CONFIG_HUGETLB_PAGE=y | |||
| 1088 | # CONFIG_EFS_FS is not set | 1165 | # CONFIG_EFS_FS is not set |
| 1089 | CONFIG_CRAMFS=y | 1166 | CONFIG_CRAMFS=y |
| 1090 | # CONFIG_VXFS_FS is not set | 1167 | # CONFIG_VXFS_FS is not set |
| 1168 | # CONFIG_MINIX_FS is not set | ||
| 1169 | # CONFIG_OMFS_FS is not set | ||
| 1091 | # CONFIG_HPFS_FS is not set | 1170 | # CONFIG_HPFS_FS is not set |
| 1092 | # CONFIG_QNX4FS_FS is not set | 1171 | # CONFIG_QNX4FS_FS is not set |
| 1172 | # CONFIG_ROMFS_FS is not set | ||
| 1093 | # CONFIG_SYSV_FS is not set | 1173 | # CONFIG_SYSV_FS is not set |
| 1094 | # CONFIG_UFS_FS is not set | 1174 | # CONFIG_UFS_FS is not set |
| 1095 | CONFIG_NETWORK_FILESYSTEMS=y | 1175 | CONFIG_NETWORK_FILESYSTEMS=y |
| @@ -1097,16 +1177,14 @@ CONFIG_NFS_FS=y | |||
| 1097 | CONFIG_NFS_V3=y | 1177 | CONFIG_NFS_V3=y |
| 1098 | CONFIG_NFS_V3_ACL=y | 1178 | CONFIG_NFS_V3_ACL=y |
| 1099 | CONFIG_NFS_V4=y | 1179 | CONFIG_NFS_V4=y |
| 1100 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1101 | # CONFIG_NFSD is not set | ||
| 1102 | CONFIG_ROOT_NFS=y | 1180 | CONFIG_ROOT_NFS=y |
| 1181 | # CONFIG_NFSD is not set | ||
| 1103 | CONFIG_LOCKD=y | 1182 | CONFIG_LOCKD=y |
| 1104 | CONFIG_LOCKD_V4=y | 1183 | CONFIG_LOCKD_V4=y |
| 1105 | CONFIG_NFS_ACL_SUPPORT=y | 1184 | CONFIG_NFS_ACL_SUPPORT=y |
| 1106 | CONFIG_NFS_COMMON=y | 1185 | CONFIG_NFS_COMMON=y |
| 1107 | CONFIG_SUNRPC=y | 1186 | CONFIG_SUNRPC=y |
| 1108 | CONFIG_SUNRPC_GSS=y | 1187 | CONFIG_SUNRPC_GSS=y |
| 1109 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 1110 | CONFIG_RPCSEC_GSS_KRB5=y | 1188 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1111 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1189 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1112 | # CONFIG_SMB_FS is not set | 1190 | # CONFIG_SMB_FS is not set |
| @@ -1177,14 +1255,15 @@ CONFIG_NLS_DEFAULT="utf-8" | |||
| 1177 | # CONFIG_NLS_KOI8_U is not set | 1255 | # CONFIG_NLS_KOI8_U is not set |
| 1178 | CONFIG_NLS_UTF8=y | 1256 | CONFIG_NLS_UTF8=y |
| 1179 | # CONFIG_DLM is not set | 1257 | # CONFIG_DLM is not set |
| 1180 | # CONFIG_UCC_SLOW is not set | ||
| 1181 | 1258 | ||
| 1182 | # | 1259 | # |
| 1183 | # Library routines | 1260 | # Library routines |
| 1184 | # | 1261 | # |
| 1185 | CONFIG_BITREVERSE=y | 1262 | CONFIG_BITREVERSE=y |
| 1263 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1186 | CONFIG_CRC_CCITT=y | 1264 | CONFIG_CRC_CCITT=y |
| 1187 | # CONFIG_CRC16 is not set | 1265 | # CONFIG_CRC16 is not set |
| 1266 | CONFIG_CRC_T10DIF=y | ||
| 1188 | # CONFIG_CRC_ITU_T is not set | 1267 | # CONFIG_CRC_ITU_T is not set |
| 1189 | CONFIG_CRC32=y | 1268 | CONFIG_CRC32=y |
| 1190 | # CONFIG_CRC7 is not set | 1269 | # CONFIG_CRC7 is not set |
| @@ -1194,7 +1273,7 @@ CONFIG_PLIST=y | |||
| 1194 | CONFIG_HAS_IOMEM=y | 1273 | CONFIG_HAS_IOMEM=y |
| 1195 | CONFIG_HAS_IOPORT=y | 1274 | CONFIG_HAS_IOPORT=y |
| 1196 | CONFIG_HAS_DMA=y | 1275 | CONFIG_HAS_DMA=y |
| 1197 | # CONFIG_INSTRUMENTATION is not set | 1276 | CONFIG_HAVE_LMB=y |
| 1198 | 1277 | ||
| 1199 | # | 1278 | # |
| 1200 | # Kernel hacking | 1279 | # Kernel hacking |
| @@ -1202,6 +1281,7 @@ CONFIG_HAS_DMA=y | |||
| 1202 | # CONFIG_PRINTK_TIME is not set | 1281 | # CONFIG_PRINTK_TIME is not set |
| 1203 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1282 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1204 | CONFIG_ENABLE_MUST_CHECK=y | 1283 | CONFIG_ENABLE_MUST_CHECK=y |
| 1284 | CONFIG_FRAME_WARN=2048 | ||
| 1205 | CONFIG_MAGIC_SYSRQ=y | 1285 | CONFIG_MAGIC_SYSRQ=y |
| 1206 | # CONFIG_UNUSED_SYMBOLS is not set | 1286 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1207 | CONFIG_DEBUG_FS=y | 1287 | CONFIG_DEBUG_FS=y |
| @@ -1209,34 +1289,59 @@ CONFIG_DEBUG_FS=y | |||
| 1209 | CONFIG_DEBUG_KERNEL=y | 1289 | CONFIG_DEBUG_KERNEL=y |
| 1210 | # CONFIG_DEBUG_SHIRQ is not set | 1290 | # CONFIG_DEBUG_SHIRQ is not set |
| 1211 | CONFIG_DETECT_SOFTLOCKUP=y | 1291 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1292 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 1293 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 1212 | CONFIG_SCHED_DEBUG=y | 1294 | CONFIG_SCHED_DEBUG=y |
| 1213 | # CONFIG_SCHEDSTATS is not set | 1295 | CONFIG_SCHEDSTATS=y |
| 1214 | # CONFIG_TIMER_STATS is not set | 1296 | # CONFIG_TIMER_STATS is not set |
| 1297 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1215 | # CONFIG_SLUB_DEBUG_ON is not set | 1298 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1299 | # CONFIG_SLUB_STATS is not set | ||
| 1216 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1300 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| 1217 | # CONFIG_RT_MUTEX_TESTER is not set | 1301 | # CONFIG_RT_MUTEX_TESTER is not set |
| 1218 | # CONFIG_DEBUG_SPINLOCK is not set | 1302 | # CONFIG_DEBUG_SPINLOCK is not set |
| 1219 | # CONFIG_DEBUG_MUTEXES is not set | 1303 | # CONFIG_DEBUG_MUTEXES is not set |
| 1304 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
| 1305 | # CONFIG_PROVE_LOCKING is not set | ||
| 1306 | # CONFIG_LOCK_STAT is not set | ||
| 1220 | CONFIG_DEBUG_SPINLOCK_SLEEP=y | 1307 | CONFIG_DEBUG_SPINLOCK_SLEEP=y |
| 1221 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1308 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
| 1309 | CONFIG_STACKTRACE=y | ||
| 1222 | # CONFIG_DEBUG_KOBJECT is not set | 1310 | # CONFIG_DEBUG_KOBJECT is not set |
| 1223 | CONFIG_DEBUG_BUGVERBOSE=y | 1311 | CONFIG_DEBUG_BUGVERBOSE=y |
| 1224 | # CONFIG_DEBUG_INFO is not set | 1312 | # CONFIG_DEBUG_INFO is not set |
| 1225 | # CONFIG_DEBUG_VM is not set | 1313 | # CONFIG_DEBUG_VM is not set |
| 1314 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1315 | CONFIG_DEBUG_MEMORY_INIT=y | ||
| 1226 | # CONFIG_DEBUG_LIST is not set | 1316 | # CONFIG_DEBUG_LIST is not set |
| 1227 | # CONFIG_DEBUG_SG is not set | 1317 | # CONFIG_DEBUG_SG is not set |
| 1228 | # CONFIG_FORCED_INLINING is not set | 1318 | CONFIG_FRAME_POINTER=y |
| 1229 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1319 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 1230 | # CONFIG_RCU_TORTURE_TEST is not set | 1320 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1321 | # CONFIG_KPROBES_SANITY_TEST is not set | ||
| 1322 | # CONFIG_BACKTRACE_SELF_TEST is not set | ||
| 1323 | # CONFIG_LKDTM is not set | ||
| 1231 | # CONFIG_FAULT_INJECTION is not set | 1324 | # CONFIG_FAULT_INJECTION is not set |
| 1325 | CONFIG_LATENCYTOP=y | ||
| 1326 | # CONFIG_SYSCTL_SYSCALL_CHECK is not set | ||
| 1327 | CONFIG_HAVE_FTRACE=y | ||
| 1328 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1329 | # CONFIG_FTRACE is not set | ||
| 1330 | # CONFIG_IRQSOFF_TRACER is not set | ||
| 1331 | # CONFIG_SCHED_TRACER is not set | ||
| 1332 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1232 | # CONFIG_SAMPLES is not set | 1333 | # CONFIG_SAMPLES is not set |
| 1334 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1335 | # CONFIG_KGDB is not set | ||
| 1233 | CONFIG_DEBUG_STACKOVERFLOW=y | 1336 | CONFIG_DEBUG_STACKOVERFLOW=y |
| 1234 | CONFIG_DEBUG_STACK_USAGE=y | 1337 | CONFIG_DEBUG_STACK_USAGE=y |
| 1235 | # CONFIG_DEBUG_PAGEALLOC is not set | 1338 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1236 | CONFIG_DEBUGGER=y | 1339 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
| 1340 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
| 1237 | CONFIG_XMON=y | 1341 | CONFIG_XMON=y |
| 1238 | CONFIG_XMON_DEFAULT=y | 1342 | CONFIG_XMON_DEFAULT=y |
| 1239 | CONFIG_XMON_DISASSEMBLY=y | 1343 | CONFIG_XMON_DISASSEMBLY=y |
| 1344 | CONFIG_DEBUGGER=y | ||
| 1240 | # CONFIG_IRQSTACKS is not set | 1345 | # CONFIG_IRQSTACKS is not set |
| 1241 | # CONFIG_VIRQ_DEBUG is not set | 1346 | # CONFIG_VIRQ_DEBUG is not set |
| 1242 | CONFIG_BOOTX_TEXT=y | 1347 | CONFIG_BOOTX_TEXT=y |
| @@ -1249,44 +1354,84 @@ CONFIG_BOOTX_TEXT=y | |||
| 1249 | # CONFIG_SECURITY is not set | 1354 | # CONFIG_SECURITY is not set |
| 1250 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1355 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1251 | CONFIG_CRYPTO=y | 1356 | CONFIG_CRYPTO=y |
| 1357 | |||
| 1358 | # | ||
| 1359 | # Crypto core or helper | ||
| 1360 | # | ||
| 1252 | CONFIG_CRYPTO_ALGAPI=y | 1361 | CONFIG_CRYPTO_ALGAPI=y |
| 1253 | CONFIG_CRYPTO_BLKCIPHER=y | 1362 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1254 | CONFIG_CRYPTO_MANAGER=y | 1363 | CONFIG_CRYPTO_MANAGER=y |
| 1364 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1365 | # CONFIG_CRYPTO_NULL is not set | ||
| 1366 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1367 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1368 | # CONFIG_CRYPTO_TEST is not set | ||
| 1369 | |||
| 1370 | # | ||
| 1371 | # Authenticated Encryption with Associated Data | ||
| 1372 | # | ||
| 1373 | # CONFIG_CRYPTO_CCM is not set | ||
| 1374 | # CONFIG_CRYPTO_GCM is not set | ||
| 1375 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1376 | |||
| 1377 | # | ||
| 1378 | # Block modes | ||
| 1379 | # | ||
| 1380 | CONFIG_CRYPTO_CBC=y | ||
| 1381 | # CONFIG_CRYPTO_CTR is not set | ||
| 1382 | # CONFIG_CRYPTO_CTS is not set | ||
| 1383 | CONFIG_CRYPTO_ECB=m | ||
| 1384 | # CONFIG_CRYPTO_LRW is not set | ||
| 1385 | CONFIG_CRYPTO_PCBC=m | ||
| 1386 | # CONFIG_CRYPTO_XTS is not set | ||
| 1387 | |||
| 1388 | # | ||
| 1389 | # Hash modes | ||
| 1390 | # | ||
| 1255 | # CONFIG_CRYPTO_HMAC is not set | 1391 | # CONFIG_CRYPTO_HMAC is not set |
| 1256 | # CONFIG_CRYPTO_XCBC is not set | 1392 | # CONFIG_CRYPTO_XCBC is not set |
| 1257 | # CONFIG_CRYPTO_NULL is not set | 1393 | |
| 1394 | # | ||
| 1395 | # Digest | ||
| 1396 | # | ||
| 1397 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1258 | # CONFIG_CRYPTO_MD4 is not set | 1398 | # CONFIG_CRYPTO_MD4 is not set |
| 1259 | CONFIG_CRYPTO_MD5=y | 1399 | CONFIG_CRYPTO_MD5=y |
| 1400 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1401 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1402 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1403 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1404 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1260 | # CONFIG_CRYPTO_SHA1 is not set | 1405 | # CONFIG_CRYPTO_SHA1 is not set |
| 1261 | # CONFIG_CRYPTO_SHA256 is not set | 1406 | # CONFIG_CRYPTO_SHA256 is not set |
| 1262 | # CONFIG_CRYPTO_SHA512 is not set | 1407 | # CONFIG_CRYPTO_SHA512 is not set |
| 1263 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1264 | # CONFIG_CRYPTO_TGR192 is not set | 1408 | # CONFIG_CRYPTO_TGR192 is not set |
| 1265 | # CONFIG_CRYPTO_GF128MUL is not set | 1409 | # CONFIG_CRYPTO_WP512 is not set |
| 1266 | CONFIG_CRYPTO_ECB=m | 1410 | |
| 1267 | CONFIG_CRYPTO_CBC=y | 1411 | # |
| 1268 | CONFIG_CRYPTO_PCBC=m | 1412 | # Ciphers |
| 1269 | # CONFIG_CRYPTO_LRW is not set | 1413 | # |
| 1270 | # CONFIG_CRYPTO_XTS is not set | ||
| 1271 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1272 | CONFIG_CRYPTO_DES=y | ||
| 1273 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1274 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1275 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1276 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1277 | # CONFIG_CRYPTO_AES is not set | 1414 | # CONFIG_CRYPTO_AES is not set |
| 1415 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1416 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1417 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1418 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1278 | # CONFIG_CRYPTO_CAST5 is not set | 1419 | # CONFIG_CRYPTO_CAST5 is not set |
| 1279 | # CONFIG_CRYPTO_CAST6 is not set | 1420 | # CONFIG_CRYPTO_CAST6 is not set |
| 1280 | # CONFIG_CRYPTO_TEA is not set | 1421 | CONFIG_CRYPTO_DES=y |
| 1281 | # CONFIG_CRYPTO_ARC4 is not set | 1422 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1282 | # CONFIG_CRYPTO_KHAZAD is not set | 1423 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1283 | # CONFIG_CRYPTO_ANUBIS is not set | 1424 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1284 | # CONFIG_CRYPTO_SEED is not set | 1425 | # CONFIG_CRYPTO_SEED is not set |
| 1426 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1427 | # CONFIG_CRYPTO_TEA is not set | ||
| 1428 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1429 | |||
| 1430 | # | ||
| 1431 | # Compression | ||
| 1432 | # | ||
| 1285 | # CONFIG_CRYPTO_DEFLATE is not set | 1433 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1286 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1434 | # CONFIG_CRYPTO_LZO is not set |
| 1287 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1288 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1289 | # CONFIG_CRYPTO_TEST is not set | ||
| 1290 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1291 | # CONFIG_CRYPTO_HW is not set | 1435 | # CONFIG_CRYPTO_HW is not set |
| 1292 | # CONFIG_PPC_CLOCK is not set | 1436 | # CONFIG_PPC_CLOCK is not set |
| 1437 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/mpc7448_hpc2_defconfig b/arch/powerpc/configs/mpc7448_hpc2_defconfig index 066c583c1f8a..ab5199f26a24 100644 --- a/arch/powerpc/configs/mpc7448_hpc2_defconfig +++ b/arch/powerpc/configs/mpc7448_hpc2_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.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Mon Jun 9 08:52:11 2008 | 4 | # Thu Aug 21 00:52:06 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | 34 | CONFIG_STACKTRACE_SUPPORT=y |
| 35 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | 36 | CONFIG_LOCKDEP_SUPPORT=y |
| 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| @@ -88,7 +89,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 88 | CONFIG_SYSCTL=y | 89 | CONFIG_SYSCTL=y |
| 89 | CONFIG_EMBEDDED=y | 90 | CONFIG_EMBEDDED=y |
| 90 | CONFIG_SYSCTL_SYSCALL=y | 91 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 92 | CONFIG_KALLSYMS=y | 92 | CONFIG_KALLSYMS=y |
| 93 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 93 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 94 | CONFIG_HOTPLUG=y | 94 | CONFIG_HOTPLUG=y |
| @@ -112,10 +112,16 @@ CONFIG_SLUB=y | |||
| 112 | # CONFIG_PROFILING is not set | 112 | # CONFIG_PROFILING is not set |
| 113 | # CONFIG_MARKERS is not set | 113 | # CONFIG_MARKERS is not set |
| 114 | CONFIG_HAVE_OPROFILE=y | 114 | CONFIG_HAVE_OPROFILE=y |
| 115 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 116 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 115 | CONFIG_HAVE_KPROBES=y | 117 | CONFIG_HAVE_KPROBES=y |
| 116 | CONFIG_HAVE_KRETPROBES=y | 118 | CONFIG_HAVE_KRETPROBES=y |
| 119 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 117 | # CONFIG_HAVE_DMA_ATTRS is not set | 120 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 121 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 122 | # CONFIG_HAVE_CLK is not set | ||
| 118 | CONFIG_PROC_PAGE_MONITOR=y | 123 | CONFIG_PROC_PAGE_MONITOR=y |
| 124 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 119 | CONFIG_SLABINFO=y | 125 | CONFIG_SLABINFO=y |
| 120 | CONFIG_RT_MUTEXES=y | 126 | CONFIG_RT_MUTEXES=y |
| 121 | # CONFIG_TINY_SHMEM is not set | 127 | # CONFIG_TINY_SHMEM is not set |
| @@ -126,6 +132,7 @@ CONFIG_LBD=y | |||
| 126 | # CONFIG_BLK_DEV_IO_TRACE is not set | 132 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 127 | # CONFIG_LSF is not set | 133 | # CONFIG_LSF is not set |
| 128 | # CONFIG_BLK_DEV_BSG is not set | 134 | # CONFIG_BLK_DEV_BSG is not set |
| 135 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 129 | 136 | ||
| 130 | # | 137 | # |
| 131 | # IO Schedulers | 138 | # IO Schedulers |
| @@ -145,25 +152,25 @@ CONFIG_CLASSIC_RCU=y | |||
| 145 | # Platform support | 152 | # Platform support |
| 146 | # | 153 | # |
| 147 | CONFIG_PPC_MULTIPLATFORM=y | 154 | CONFIG_PPC_MULTIPLATFORM=y |
| 148 | # CONFIG_PPC_82xx is not set | ||
| 149 | # CONFIG_PPC_83xx is not set | ||
| 150 | # CONFIG_PPC_86xx is not set | ||
| 151 | CONFIG_CLASSIC32=y | 155 | CONFIG_CLASSIC32=y |
| 152 | # CONFIG_PPC_CHRP is not set | 156 | # CONFIG_PPC_CHRP is not set |
| 153 | # CONFIG_PPC_MPC512x is not set | ||
| 154 | # CONFIG_PPC_MPC5121 is not set | ||
| 155 | # CONFIG_MPC5121_ADS is not set | 157 | # CONFIG_MPC5121_ADS is not set |
| 158 | # CONFIG_MPC5121_GENERIC is not set | ||
| 156 | # CONFIG_PPC_MPC52xx is not set | 159 | # CONFIG_PPC_MPC52xx is not set |
| 157 | # CONFIG_PPC_PMAC is not set | 160 | # CONFIG_PPC_PMAC is not set |
| 158 | # CONFIG_PPC_CELL is not set | 161 | # CONFIG_PPC_CELL is not set |
| 159 | # CONFIG_PPC_CELL_NATIVE is not set | 162 | # CONFIG_PPC_CELL_NATIVE is not set |
| 163 | # CONFIG_PPC_82xx is not set | ||
| 160 | # CONFIG_PQ2ADS is not set | 164 | # CONFIG_PQ2ADS is not set |
| 165 | # CONFIG_PPC_83xx is not set | ||
| 166 | # CONFIG_PPC_86xx is not set | ||
| 161 | CONFIG_EMBEDDED6xx=y | 167 | CONFIG_EMBEDDED6xx=y |
| 162 | # CONFIG_LINKSTATION is not set | 168 | # CONFIG_LINKSTATION is not set |
| 163 | # CONFIG_STORCENTER is not set | 169 | # CONFIG_STORCENTER is not set |
| 164 | CONFIG_MPC7448HPC2=y | 170 | CONFIG_MPC7448HPC2=y |
| 165 | # CONFIG_PPC_HOLLY is not set | 171 | # CONFIG_PPC_HOLLY is not set |
| 166 | # CONFIG_PPC_PRPMC2800 is not set | 172 | # CONFIG_PPC_PRPMC2800 is not set |
| 173 | # CONFIG_PPC_C2K is not set | ||
| 167 | CONFIG_TSI108_BRIDGE=y | 174 | CONFIG_TSI108_BRIDGE=y |
| 168 | # CONFIG_IPIC is not set | 175 | # CONFIG_IPIC is not set |
| 169 | CONFIG_MPIC=y | 176 | CONFIG_MPIC=y |
| @@ -192,7 +199,7 @@ CONFIG_HZ_250=y | |||
| 192 | # CONFIG_HZ_300 is not set | 199 | # CONFIG_HZ_300 is not set |
| 193 | # CONFIG_HZ_1000 is not set | 200 | # CONFIG_HZ_1000 is not set |
| 194 | CONFIG_HZ=250 | 201 | CONFIG_HZ=250 |
| 195 | # CONFIG_SCHED_HRTICK is not set | 202 | CONFIG_SCHED_HRTICK=y |
| 196 | CONFIG_PREEMPT_NONE=y | 203 | CONFIG_PREEMPT_NONE=y |
| 197 | # CONFIG_PREEMPT_VOLUNTARY is not set | 204 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 198 | # CONFIG_PREEMPT is not set | 205 | # CONFIG_PREEMPT is not set |
| @@ -215,6 +222,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 215 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 222 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 216 | CONFIG_PAGEFLAGS_EXTENDED=y | 223 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 217 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 224 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 225 | CONFIG_MIGRATION=y | ||
| 218 | # CONFIG_RESOURCES_64BIT is not set | 226 | # CONFIG_RESOURCES_64BIT is not set |
| 219 | CONFIG_ZONE_DMA_FLAG=1 | 227 | CONFIG_ZONE_DMA_FLAG=1 |
| 220 | CONFIG_BOUNCE=y | 228 | CONFIG_BOUNCE=y |
| @@ -222,6 +230,7 @@ CONFIG_VIRT_TO_BUS=y | |||
| 222 | CONFIG_FORCE_MAX_ZONEORDER=11 | 230 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 223 | CONFIG_PROC_DEVICETREE=y | 231 | CONFIG_PROC_DEVICETREE=y |
| 224 | # CONFIG_CMDLINE_BOOL is not set | 232 | # CONFIG_CMDLINE_BOOL is not set |
| 233 | CONFIG_EXTRA_TARGETS="" | ||
| 225 | # CONFIG_PM is not set | 234 | # CONFIG_PM is not set |
| 226 | # CONFIG_SECCOMP is not set | 235 | # CONFIG_SECCOMP is not set |
| 227 | CONFIG_ISA_DMA_API=y | 236 | CONFIG_ISA_DMA_API=y |
| @@ -256,10 +265,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
| 256 | CONFIG_KERNEL_START=0xc0000000 | 265 | CONFIG_KERNEL_START=0xc0000000 |
| 257 | CONFIG_PHYSICAL_START=0x00000000 | 266 | CONFIG_PHYSICAL_START=0x00000000 |
| 258 | CONFIG_TASK_SIZE=0xc0000000 | 267 | CONFIG_TASK_SIZE=0xc0000000 |
| 259 | |||
| 260 | # | ||
| 261 | # Networking | ||
| 262 | # | ||
| 263 | CONFIG_NET=y | 268 | CONFIG_NET=y |
| 264 | 269 | ||
| 265 | # | 270 | # |
| @@ -374,12 +379,14 @@ CONFIG_BLK_DEV_RAM_SIZE=131072 | |||
| 374 | # CONFIG_BLK_DEV_XIP is not set | 379 | # CONFIG_BLK_DEV_XIP is not set |
| 375 | # CONFIG_CDROM_PKTCDVD is not set | 380 | # CONFIG_CDROM_PKTCDVD is not set |
| 376 | # CONFIG_ATA_OVER_ETH is not set | 381 | # CONFIG_ATA_OVER_ETH is not set |
| 382 | # CONFIG_BLK_DEV_HD is not set | ||
| 377 | CONFIG_MISC_DEVICES=y | 383 | CONFIG_MISC_DEVICES=y |
| 378 | # CONFIG_PHANTOM is not set | 384 | # CONFIG_PHANTOM is not set |
| 379 | # CONFIG_EEPROM_93CX6 is not set | 385 | # CONFIG_EEPROM_93CX6 is not set |
| 380 | # CONFIG_SGI_IOC4 is not set | 386 | # CONFIG_SGI_IOC4 is not set |
| 381 | # CONFIG_TIFM_CORE is not set | 387 | # CONFIG_TIFM_CORE is not set |
| 382 | # CONFIG_ENCLOSURE_SERVICES is not set | 388 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 389 | # CONFIG_HP_ILO is not set | ||
| 383 | CONFIG_HAVE_IDE=y | 390 | CONFIG_HAVE_IDE=y |
| 384 | # CONFIG_IDE is not set | 391 | # CONFIG_IDE is not set |
| 385 | 392 | ||
| @@ -457,6 +464,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 457 | # CONFIG_SCSI_NSP32 is not set | 464 | # CONFIG_SCSI_NSP32 is not set |
| 458 | # CONFIG_SCSI_DEBUG is not set | 465 | # CONFIG_SCSI_DEBUG is not set |
| 459 | # CONFIG_SCSI_SRP is not set | 466 | # CONFIG_SCSI_SRP is not set |
| 467 | # CONFIG_SCSI_DH is not set | ||
| 460 | CONFIG_ATA=y | 468 | CONFIG_ATA=y |
| 461 | # CONFIG_ATA_NONSTANDARD is not set | 469 | # CONFIG_ATA_NONSTANDARD is not set |
| 462 | CONFIG_SATA_PMP=y | 470 | CONFIG_SATA_PMP=y |
| @@ -523,12 +531,15 @@ CONFIG_SATA_MV=y | |||
| 523 | # | 531 | # |
| 524 | # IEEE 1394 (FireWire) support | 532 | # IEEE 1394 (FireWire) support |
| 525 | # | 533 | # |
| 534 | |||
| 535 | # | ||
| 536 | # Enable only one of the two stacks, unless you know what you are doing | ||
| 537 | # | ||
| 526 | # CONFIG_FIREWIRE is not set | 538 | # CONFIG_FIREWIRE is not set |
| 527 | # CONFIG_IEEE1394 is not set | 539 | # CONFIG_IEEE1394 is not set |
| 528 | # CONFIG_I2O is not set | 540 | # CONFIG_I2O is not set |
| 529 | # CONFIG_MACINTOSH_DRIVERS is not set | 541 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 530 | CONFIG_NETDEVICES=y | 542 | CONFIG_NETDEVICES=y |
| 531 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 532 | # CONFIG_DUMMY is not set | 543 | # CONFIG_DUMMY is not set |
| 533 | # CONFIG_BONDING is not set | 544 | # CONFIG_BONDING is not set |
| 534 | # CONFIG_MACVLAN is not set | 545 | # CONFIG_MACVLAN is not set |
| @@ -594,7 +605,6 @@ CONFIG_NETDEV_1000=y | |||
| 594 | # CONFIG_DL2K is not set | 605 | # CONFIG_DL2K is not set |
| 595 | # CONFIG_E1000 is not set | 606 | # CONFIG_E1000 is not set |
| 596 | # CONFIG_E1000E is not set | 607 | # CONFIG_E1000E is not set |
| 597 | # CONFIG_E1000E_ENABLED is not set | ||
| 598 | # CONFIG_IP1000 is not set | 608 | # CONFIG_IP1000 is not set |
| 599 | # CONFIG_IGB is not set | 609 | # CONFIG_IGB is not set |
| 600 | # CONFIG_NS83820 is not set | 610 | # CONFIG_NS83820 is not set |
| @@ -611,6 +621,7 @@ CONFIG_TSI108_ETH=y | |||
| 611 | # CONFIG_MV643XX_ETH is not set | 621 | # CONFIG_MV643XX_ETH is not set |
| 612 | # CONFIG_QLA3XXX is not set | 622 | # CONFIG_QLA3XXX is not set |
| 613 | # CONFIG_ATL1 is not set | 623 | # CONFIG_ATL1 is not set |
| 624 | # CONFIG_ATL1E is not set | ||
| 614 | CONFIG_NETDEV_10000=y | 625 | CONFIG_NETDEV_10000=y |
| 615 | # CONFIG_CHELSIO_T1 is not set | 626 | # CONFIG_CHELSIO_T1 is not set |
| 616 | # CONFIG_CHELSIO_T3 is not set | 627 | # CONFIG_CHELSIO_T3 is not set |
| @@ -716,6 +727,8 @@ CONFIG_GEN_RTC=y | |||
| 716 | CONFIG_DEVPORT=y | 727 | CONFIG_DEVPORT=y |
| 717 | # CONFIG_I2C is not set | 728 | # CONFIG_I2C is not set |
| 718 | # CONFIG_SPI is not set | 729 | # CONFIG_SPI is not set |
| 730 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 731 | # CONFIG_GPIOLIB is not set | ||
| 719 | # CONFIG_W1 is not set | 732 | # CONFIG_W1 is not set |
| 720 | # CONFIG_POWER_SUPPLY is not set | 733 | # CONFIG_POWER_SUPPLY is not set |
| 721 | CONFIG_HWMON=y | 734 | CONFIG_HWMON=y |
| @@ -736,6 +749,7 @@ CONFIG_HWMON=y | |||
| 736 | # CONFIG_SENSORS_W83627EHF is not set | 749 | # CONFIG_SENSORS_W83627EHF is not set |
| 737 | # CONFIG_HWMON_DEBUG_CHIP is not set | 750 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 738 | # CONFIG_THERMAL is not set | 751 | # CONFIG_THERMAL is not set |
| 752 | # CONFIG_THERMAL_HWMON is not set | ||
| 739 | # CONFIG_WATCHDOG is not set | 753 | # CONFIG_WATCHDOG is not set |
| 740 | 754 | ||
| 741 | # | 755 | # |
| @@ -747,8 +761,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 747 | # | 761 | # |
| 748 | # Multifunction device drivers | 762 | # Multifunction device drivers |
| 749 | # | 763 | # |
| 764 | # CONFIG_MFD_CORE is not set | ||
| 750 | # CONFIG_MFD_SM501 is not set | 765 | # CONFIG_MFD_SM501 is not set |
| 751 | # CONFIG_HTC_PASIC3 is not set | 766 | # CONFIG_HTC_PASIC3 is not set |
| 767 | # CONFIG_MFD_TMIO is not set | ||
| 752 | 768 | ||
| 753 | # | 769 | # |
| 754 | # Multimedia devices | 770 | # Multimedia devices |
| @@ -780,10 +796,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
| 780 | # Display device support | 796 | # Display device support |
| 781 | # | 797 | # |
| 782 | # CONFIG_DISPLAY_SUPPORT is not set | 798 | # CONFIG_DISPLAY_SUPPORT is not set |
| 783 | |||
| 784 | # | ||
| 785 | # Sound | ||
| 786 | # | ||
| 787 | # CONFIG_SOUND is not set | 799 | # CONFIG_SOUND is not set |
| 788 | CONFIG_HID_SUPPORT=y | 800 | CONFIG_HID_SUPPORT=y |
| 789 | CONFIG_HID=y | 801 | CONFIG_HID=y |
| @@ -798,6 +810,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 798 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 810 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
| 799 | 811 | ||
| 800 | # | 812 | # |
| 813 | # Enable Host or Gadget support to see Inventra options | ||
| 814 | # | ||
| 815 | |||
| 816 | # | ||
| 801 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 817 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 802 | # | 818 | # |
| 803 | # CONFIG_USB_GADGET is not set | 819 | # CONFIG_USB_GADGET is not set |
| @@ -875,6 +891,7 @@ CONFIG_TMPFS=y | |||
| 875 | # CONFIG_CRAMFS is not set | 891 | # CONFIG_CRAMFS is not set |
| 876 | # CONFIG_VXFS_FS is not set | 892 | # CONFIG_VXFS_FS is not set |
| 877 | # CONFIG_MINIX_FS is not set | 893 | # CONFIG_MINIX_FS is not set |
| 894 | # CONFIG_OMFS_FS is not set | ||
| 878 | # CONFIG_HPFS_FS is not set | 895 | # CONFIG_HPFS_FS is not set |
| 879 | # CONFIG_QNX4FS_FS is not set | 896 | # CONFIG_QNX4FS_FS is not set |
| 880 | # CONFIG_ROMFS_FS is not set | 897 | # CONFIG_ROMFS_FS is not set |
| @@ -884,12 +901,11 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 884 | CONFIG_NFS_FS=y | 901 | CONFIG_NFS_FS=y |
| 885 | # CONFIG_NFS_V3 is not set | 902 | # CONFIG_NFS_V3 is not set |
| 886 | # CONFIG_NFS_V4 is not set | 903 | # CONFIG_NFS_V4 is not set |
| 887 | # CONFIG_NFSD is not set | ||
| 888 | CONFIG_ROOT_NFS=y | 904 | CONFIG_ROOT_NFS=y |
| 905 | # CONFIG_NFSD is not set | ||
| 889 | CONFIG_LOCKD=y | 906 | CONFIG_LOCKD=y |
| 890 | CONFIG_NFS_COMMON=y | 907 | CONFIG_NFS_COMMON=y |
| 891 | CONFIG_SUNRPC=y | 908 | CONFIG_SUNRPC=y |
| 892 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 893 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 909 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 894 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 910 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 895 | # CONFIG_SMB_FS is not set | 911 | # CONFIG_SMB_FS is not set |
| @@ -929,6 +945,7 @@ CONFIG_BITREVERSE=y | |||
| 929 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 945 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 930 | # CONFIG_CRC_CCITT is not set | 946 | # CONFIG_CRC_CCITT is not set |
| 931 | # CONFIG_CRC16 is not set | 947 | # CONFIG_CRC16 is not set |
| 948 | CONFIG_CRC_T10DIF=y | ||
| 932 | # CONFIG_CRC_ITU_T is not set | 949 | # CONFIG_CRC_ITU_T is not set |
| 933 | CONFIG_CRC32=y | 950 | CONFIG_CRC32=y |
| 934 | # CONFIG_CRC7 is not set | 951 | # CONFIG_CRC7 is not set |
| @@ -954,7 +971,16 @@ CONFIG_FRAME_WARN=1024 | |||
| 954 | # CONFIG_SLUB_DEBUG_ON is not set | 971 | # CONFIG_SLUB_DEBUG_ON is not set |
| 955 | # CONFIG_SLUB_STATS is not set | 972 | # CONFIG_SLUB_STATS is not set |
| 956 | # CONFIG_DEBUG_BUGVERBOSE is not set | 973 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 974 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 975 | # CONFIG_LATENCYTOP is not set | ||
| 976 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 977 | CONFIG_HAVE_FTRACE=y | ||
| 978 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 979 | # CONFIG_FTRACE is not set | ||
| 980 | # CONFIG_SCHED_TRACER is not set | ||
| 981 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 957 | # CONFIG_SAMPLES is not set | 982 | # CONFIG_SAMPLES is not set |
| 983 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 958 | # CONFIG_IRQSTACKS is not set | 984 | # CONFIG_IRQSTACKS is not set |
| 959 | # CONFIG_BOOTX_TEXT is not set | 985 | # CONFIG_BOOTX_TEXT is not set |
| 960 | # CONFIG_PPC_EARLY_DEBUG is not set | 986 | # CONFIG_PPC_EARLY_DEBUG is not set |
| @@ -1007,6 +1033,10 @@ CONFIG_CRYPTO=y | |||
| 1007 | # CONFIG_CRYPTO_MD4 is not set | 1033 | # CONFIG_CRYPTO_MD4 is not set |
| 1008 | # CONFIG_CRYPTO_MD5 is not set | 1034 | # CONFIG_CRYPTO_MD5 is not set |
| 1009 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1035 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 1036 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1037 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1038 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1039 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1010 | # CONFIG_CRYPTO_SHA1 is not set | 1040 | # CONFIG_CRYPTO_SHA1 is not set |
| 1011 | # CONFIG_CRYPTO_SHA256 is not set | 1041 | # CONFIG_CRYPTO_SHA256 is not set |
| 1012 | # CONFIG_CRYPTO_SHA512 is not set | 1042 | # CONFIG_CRYPTO_SHA512 is not set |
diff --git a/arch/powerpc/configs/mpc8272_ads_defconfig b/arch/powerpc/configs/mpc8272_ads_defconfig index 30d7834b7db1..7c435c84c875 100644 --- a/arch/powerpc/configs/mpc8272_ads_defconfig +++ b/arch/powerpc/configs/mpc8272_ads_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.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Mon Jun 9 08:52:12 2008 | 4 | # Thu Aug 21 00:52:07 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -15,6 +15,7 @@ CONFIG_6xx=y | |||
| 15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
| 16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
| 17 | CONFIG_PPC_FPU=y | 17 | CONFIG_PPC_FPU=y |
| 18 | # CONFIG_ALTIVEC is not set | ||
| 18 | CONFIG_PPC_STD_MMU=y | 19 | CONFIG_PPC_STD_MMU=y |
| 19 | CONFIG_PPC_STD_MMU_32=y | 20 | CONFIG_PPC_STD_MMU_32=y |
| 20 | # CONFIG_PPC_MM_SLICES is not set | 21 | # CONFIG_PPC_MM_SLICES is not set |
| @@ -31,12 +32,14 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 31 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 32 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 33 | CONFIG_STACKTRACE_SUPPORT=y | 34 | CONFIG_STACKTRACE_SUPPORT=y |
| 35 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 34 | CONFIG_LOCKDEP_SUPPORT=y | 36 | CONFIG_LOCKDEP_SUPPORT=y |
| 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
| 38 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 40 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 39 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 41 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 42 | CONFIG_GENERIC_GPIO=y | ||
| 40 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 43 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
| 41 | CONFIG_PPC=y | 44 | CONFIG_PPC=y |
| 42 | CONFIG_EARLY_PRINTK=y | 45 | CONFIG_EARLY_PRINTK=y |
| @@ -45,11 +48,13 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | |||
| 45 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 48 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
| 46 | CONFIG_PPC_OF=y | 49 | CONFIG_PPC_OF=y |
| 47 | CONFIG_OF=y | 50 | CONFIG_OF=y |
| 48 | # CONFIG_PPC_UDBG_16550 is not set | 51 | CONFIG_PPC_UDBG_16550=y |
| 49 | # CONFIG_GENERIC_TBSYNC is not set | 52 | # CONFIG_GENERIC_TBSYNC is not set |
| 50 | CONFIG_AUDIT_ARCH=y | 53 | CONFIG_AUDIT_ARCH=y |
| 51 | CONFIG_GENERIC_BUG=y | 54 | CONFIG_GENERIC_BUG=y |
| 52 | CONFIG_DEFAULT_UIMAGE=y | 55 | CONFIG_DEFAULT_UIMAGE=y |
| 56 | CONFIG_HIBERNATE_32=y | ||
| 57 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
| 53 | # CONFIG_PPC_DCR_NATIVE is not set | 58 | # CONFIG_PPC_DCR_NATIVE is not set |
| 54 | # CONFIG_PPC_DCR_MMIO is not set | 59 | # CONFIG_PPC_DCR_MMIO is not set |
| 55 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 60 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| @@ -81,7 +86,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y | |||
| 81 | CONFIG_SYSCTL=y | 86 | CONFIG_SYSCTL=y |
| 82 | CONFIG_EMBEDDED=y | 87 | CONFIG_EMBEDDED=y |
| 83 | CONFIG_SYSCTL_SYSCALL=y | 88 | CONFIG_SYSCTL_SYSCALL=y |
| 84 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 85 | CONFIG_KALLSYMS=y | 89 | CONFIG_KALLSYMS=y |
| 86 | CONFIG_KALLSYMS_ALL=y | 90 | CONFIG_KALLSYMS_ALL=y |
| 87 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 91 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -89,6 +93,7 @@ CONFIG_HOTPLUG=y | |||
| 89 | CONFIG_PRINTK=y | 93 | CONFIG_PRINTK=y |
| 90 | CONFIG_BUG=y | 94 | CONFIG_BUG=y |
| 91 | CONFIG_ELF_CORE=y | 95 | CONFIG_ELF_CORE=y |
| 96 | CONFIG_PCSPKR_PLATFORM=y | ||
| 92 | CONFIG_COMPAT_BRK=y | 97 | CONFIG_COMPAT_BRK=y |
| 93 | CONFIG_BASE_FULL=y | 98 | CONFIG_BASE_FULL=y |
| 94 | CONFIG_FUTEX=y | 99 | CONFIG_FUTEX=y |
| @@ -106,10 +111,16 @@ CONFIG_SLUB=y | |||
| 106 | # CONFIG_PROFILING is not set | 111 | # CONFIG_PROFILING is not set |
| 107 | # CONFIG_MARKERS is not set | 112 | # CONFIG_MARKERS is not set |
| 108 | CONFIG_HAVE_OPROFILE=y | 113 | CONFIG_HAVE_OPROFILE=y |
| 114 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 115 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 109 | CONFIG_HAVE_KPROBES=y | 116 | CONFIG_HAVE_KPROBES=y |
| 110 | CONFIG_HAVE_KRETPROBES=y | 117 | CONFIG_HAVE_KRETPROBES=y |
| 118 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 111 | # CONFIG_HAVE_DMA_ATTRS is not set | 119 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 120 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 121 | CONFIG_HAVE_CLK=y | ||
| 112 | CONFIG_PROC_PAGE_MONITOR=y | 122 | CONFIG_PROC_PAGE_MONITOR=y |
| 123 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 113 | CONFIG_SLABINFO=y | 124 | CONFIG_SLABINFO=y |
| 114 | CONFIG_RT_MUTEXES=y | 125 | CONFIG_RT_MUTEXES=y |
| 115 | # CONFIG_TINY_SHMEM is not set | 126 | # CONFIG_TINY_SHMEM is not set |
| @@ -119,6 +130,7 @@ CONFIG_BLOCK=y | |||
| 119 | # CONFIG_LBD is not set | 130 | # CONFIG_LBD is not set |
| 120 | # CONFIG_BLK_DEV_IO_TRACE is not set | 131 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 121 | # CONFIG_LSF is not set | 132 | # CONFIG_LSF is not set |
| 133 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 122 | 134 | ||
| 123 | # | 135 | # |
| 124 | # IO Schedulers | 136 | # IO Schedulers |
| @@ -137,14 +149,16 @@ CONFIG_CLASSIC_RCU=y | |||
| 137 | # | 149 | # |
| 138 | # Platform support | 150 | # Platform support |
| 139 | # | 151 | # |
| 140 | # CONFIG_PPC_MULTIPLATFORM is not set | 152 | CONFIG_PPC_MULTIPLATFORM=y |
| 141 | CONFIG_PPC_82xx=y | 153 | CONFIG_CLASSIC32=y |
| 142 | # CONFIG_PPC_83xx is not set | 154 | CONFIG_PPC_CHRP=y |
| 143 | # CONFIG_PPC_86xx is not set | 155 | # CONFIG_MPC5121_ADS is not set |
| 144 | # CONFIG_PPC_MPC512x is not set | 156 | # CONFIG_MPC5121_GENERIC is not set |
| 145 | # CONFIG_PPC_MPC5121 is not set | 157 | # CONFIG_PPC_MPC52xx is not set |
| 158 | CONFIG_PPC_PMAC=y | ||
| 146 | # CONFIG_PPC_CELL is not set | 159 | # CONFIG_PPC_CELL is not set |
| 147 | # CONFIG_PPC_CELL_NATIVE is not set | 160 | # CONFIG_PPC_CELL_NATIVE is not set |
| 161 | CONFIG_PPC_82xx=y | ||
| 148 | CONFIG_MPC8272_ADS=y | 162 | CONFIG_MPC8272_ADS=y |
| 149 | # CONFIG_PQ2FADS is not set | 163 | # CONFIG_PQ2FADS is not set |
| 150 | # CONFIG_EP8248E is not set | 164 | # CONFIG_EP8248E is not set |
| @@ -152,19 +166,27 @@ CONFIG_PQ2ADS=y | |||
| 152 | CONFIG_8260=y | 166 | CONFIG_8260=y |
| 153 | CONFIG_8272=y | 167 | CONFIG_8272=y |
| 154 | CONFIG_PQ2_ADS_PCI_PIC=y | 168 | CONFIG_PQ2_ADS_PCI_PIC=y |
| 169 | # CONFIG_PPC_83xx is not set | ||
| 170 | # CONFIG_PPC_86xx is not set | ||
| 171 | # CONFIG_EMBEDDED6xx is not set | ||
| 172 | CONFIG_PPC_NATIVE=y | ||
| 173 | # CONFIG_UDBG_RTAS_CONSOLE is not set | ||
| 155 | # CONFIG_IPIC is not set | 174 | # CONFIG_IPIC is not set |
| 156 | # CONFIG_MPIC is not set | 175 | CONFIG_MPIC=y |
| 157 | # CONFIG_MPIC_WEIRD is not set | 176 | # CONFIG_MPIC_WEIRD is not set |
| 158 | # CONFIG_PPC_I8259 is not set | 177 | CONFIG_PPC_I8259=y |
| 159 | # CONFIG_PPC_RTAS is not set | 178 | CONFIG_PPC_RTAS=y |
| 179 | # CONFIG_RTAS_ERROR_LOGGING is not set | ||
| 180 | CONFIG_RTAS_PROC=y | ||
| 160 | # CONFIG_MMIO_NVRAM is not set | 181 | # CONFIG_MMIO_NVRAM is not set |
| 161 | # CONFIG_PPC_MPC106 is not set | 182 | CONFIG_PPC_MPC106=y |
| 162 | # CONFIG_PPC_970_NAP is not set | 183 | # CONFIG_PPC_970_NAP is not set |
| 163 | # CONFIG_PPC_INDIRECT_IO is not set | 184 | # CONFIG_PPC_INDIRECT_IO is not set |
| 164 | # CONFIG_GENERIC_IOMAP is not set | 185 | # CONFIG_GENERIC_IOMAP is not set |
| 165 | # CONFIG_CPU_FREQ is not set | 186 | # CONFIG_CPU_FREQ is not set |
| 187 | # CONFIG_PPC601_SYNC_FIX is not set | ||
| 188 | # CONFIG_TAU is not set | ||
| 166 | CONFIG_CPM2=y | 189 | CONFIG_CPM2=y |
| 167 | CONFIG_PPC_CPM_NEW_BINDING=y | ||
| 168 | # CONFIG_FSL_ULI1575 is not set | 190 | # CONFIG_FSL_ULI1575 is not set |
| 169 | CONFIG_CPM=y | 191 | CONFIG_CPM=y |
| 170 | 192 | ||
| @@ -181,7 +203,7 @@ CONFIG_HZ_250=y | |||
| 181 | # CONFIG_HZ_300 is not set | 203 | # CONFIG_HZ_300 is not set |
| 182 | # CONFIG_HZ_1000 is not set | 204 | # CONFIG_HZ_1000 is not set |
| 183 | CONFIG_HZ=250 | 205 | CONFIG_HZ=250 |
| 184 | # CONFIG_SCHED_HRTICK is not set | 206 | CONFIG_SCHED_HRTICK=y |
| 185 | CONFIG_PREEMPT_NONE=y | 207 | CONFIG_PREEMPT_NONE=y |
| 186 | # CONFIG_PREEMPT_VOLUNTARY is not set | 208 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 187 | # CONFIG_PREEMPT is not set | 209 | # CONFIG_PREEMPT is not set |
| @@ -199,6 +221,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 199 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 221 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 200 | CONFIG_PAGEFLAGS_EXTENDED=y | 222 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 201 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 223 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 224 | CONFIG_MIGRATION=y | ||
| 202 | # CONFIG_RESOURCES_64BIT is not set | 225 | # CONFIG_RESOURCES_64BIT is not set |
| 203 | CONFIG_ZONE_DMA_FLAG=1 | 226 | CONFIG_ZONE_DMA_FLAG=1 |
| 204 | CONFIG_BOUNCE=y | 227 | CONFIG_BOUNCE=y |
| @@ -206,6 +229,7 @@ CONFIG_VIRT_TO_BUS=y | |||
| 206 | CONFIG_FORCE_MAX_ZONEORDER=11 | 229 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 207 | CONFIG_PROC_DEVICETREE=y | 230 | CONFIG_PROC_DEVICETREE=y |
| 208 | # CONFIG_CMDLINE_BOOL is not set | 231 | # CONFIG_CMDLINE_BOOL is not set |
| 232 | CONFIG_EXTRA_TARGETS="" | ||
| 209 | # CONFIG_PM is not set | 233 | # CONFIG_PM is not set |
| 210 | CONFIG_SECCOMP=y | 234 | CONFIG_SECCOMP=y |
| 211 | CONFIG_ISA_DMA_API=y | 235 | CONFIG_ISA_DMA_API=y |
| @@ -213,9 +237,11 @@ CONFIG_ISA_DMA_API=y | |||
| 213 | # | 237 | # |
| 214 | # Bus options | 238 | # Bus options |
| 215 | # | 239 | # |
| 240 | # CONFIG_ISA is not set | ||
| 216 | CONFIG_ZONE_DMA=y | 241 | CONFIG_ZONE_DMA=y |
| 217 | CONFIG_PPC_INDIRECT_PCI=y | 242 | CONFIG_PPC_INDIRECT_PCI=y |
| 218 | CONFIG_FSL_SOC=y | 243 | CONFIG_FSL_SOC=y |
| 244 | CONFIG_PPC_PCI_CHOICE=y | ||
| 219 | CONFIG_PCI=y | 245 | CONFIG_PCI=y |
| 220 | CONFIG_PCI_DOMAINS=y | 246 | CONFIG_PCI_DOMAINS=y |
| 221 | CONFIG_PCI_SYSCALL=y | 247 | CONFIG_PCI_SYSCALL=y |
| @@ -242,10 +268,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
| 242 | CONFIG_KERNEL_START=0xc0000000 | 268 | CONFIG_KERNEL_START=0xc0000000 |
| 243 | CONFIG_PHYSICAL_START=0x00000000 | 269 | CONFIG_PHYSICAL_START=0x00000000 |
| 244 | CONFIG_TASK_SIZE=0xc0000000 | 270 | CONFIG_TASK_SIZE=0xc0000000 |
| 245 | |||
| 246 | # | ||
| 247 | # Networking | ||
| 248 | # | ||
| 249 | CONFIG_NET=y | 271 | CONFIG_NET=y |
| 250 | 272 | ||
| 251 | # | 273 | # |
| @@ -446,9 +468,11 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
| 446 | # | 468 | # |
| 447 | # CONFIG_MTD_UBI is not set | 469 | # CONFIG_MTD_UBI is not set |
| 448 | CONFIG_OF_DEVICE=y | 470 | CONFIG_OF_DEVICE=y |
| 471 | CONFIG_OF_GPIO=y | ||
| 449 | # CONFIG_PARPORT is not set | 472 | # CONFIG_PARPORT is not set |
| 450 | CONFIG_BLK_DEV=y | 473 | CONFIG_BLK_DEV=y |
| 451 | # CONFIG_BLK_DEV_FD is not set | 474 | # CONFIG_BLK_DEV_FD is not set |
| 475 | # CONFIG_MAC_FLOPPY is not set | ||
| 452 | # CONFIG_BLK_CPQ_DA is not set | 476 | # CONFIG_BLK_CPQ_DA is not set |
| 453 | # CONFIG_BLK_CPQ_CISS_DA is not set | 477 | # CONFIG_BLK_CPQ_CISS_DA is not set |
| 454 | # CONFIG_BLK_DEV_DAC960 is not set | 478 | # CONFIG_BLK_DEV_DAC960 is not set |
| @@ -460,6 +484,7 @@ CONFIG_BLK_DEV_LOOP=y | |||
| 460 | # CONFIG_BLK_DEV_RAM is not set | 484 | # CONFIG_BLK_DEV_RAM is not set |
| 461 | # CONFIG_CDROM_PKTCDVD is not set | 485 | # CONFIG_CDROM_PKTCDVD is not set |
| 462 | # CONFIG_ATA_OVER_ETH is not set | 486 | # CONFIG_ATA_OVER_ETH is not set |
| 487 | # CONFIG_BLK_DEV_HD is not set | ||
| 463 | # CONFIG_MISC_DEVICES is not set | 488 | # CONFIG_MISC_DEVICES is not set |
| 464 | CONFIG_HAVE_IDE=y | 489 | CONFIG_HAVE_IDE=y |
| 465 | # CONFIG_IDE is not set | 490 | # CONFIG_IDE is not set |
| @@ -480,13 +505,12 @@ CONFIG_HAVE_IDE=y | |||
| 480 | # | 505 | # |
| 481 | 506 | ||
| 482 | # | 507 | # |
| 483 | # An alternative FireWire stack is available with EXPERIMENTAL=y | 508 | # A new alternative FireWire stack is available with EXPERIMENTAL=y |
| 484 | # | 509 | # |
| 485 | # CONFIG_IEEE1394 is not set | 510 | # CONFIG_IEEE1394 is not set |
| 486 | # CONFIG_I2O is not set | 511 | # CONFIG_I2O is not set |
| 487 | # CONFIG_MACINTOSH_DRIVERS is not set | 512 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 488 | CONFIG_NETDEVICES=y | 513 | CONFIG_NETDEVICES=y |
| 489 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 490 | # CONFIG_DUMMY is not set | 514 | # CONFIG_DUMMY is not set |
| 491 | # CONFIG_BONDING is not set | 515 | # CONFIG_BONDING is not set |
| 492 | # CONFIG_EQUALIZER is not set | 516 | # CONFIG_EQUALIZER is not set |
| @@ -510,8 +534,11 @@ CONFIG_DAVICOM_PHY=y | |||
| 510 | # CONFIG_REALTEK_PHY is not set | 534 | # CONFIG_REALTEK_PHY is not set |
| 511 | # CONFIG_FIXED_PHY is not set | 535 | # CONFIG_FIXED_PHY is not set |
| 512 | CONFIG_MDIO_BITBANG=y | 536 | CONFIG_MDIO_BITBANG=y |
| 537 | # CONFIG_MDIO_OF_GPIO is not set | ||
| 513 | CONFIG_NET_ETHERNET=y | 538 | CONFIG_NET_ETHERNET=y |
| 514 | CONFIG_MII=y | 539 | CONFIG_MII=y |
| 540 | # CONFIG_MACE is not set | ||
| 541 | # CONFIG_BMAC is not set | ||
| 515 | # CONFIG_HAPPYMEAL is not set | 542 | # CONFIG_HAPPYMEAL is not set |
| 516 | # CONFIG_SUNGEM is not set | 543 | # CONFIG_SUNGEM is not set |
| 517 | # CONFIG_CASSINI is not set | 544 | # CONFIG_CASSINI is not set |
| @@ -533,7 +560,6 @@ CONFIG_NETDEV_1000=y | |||
| 533 | # CONFIG_DL2K is not set | 560 | # CONFIG_DL2K is not set |
| 534 | # CONFIG_E1000 is not set | 561 | # CONFIG_E1000 is not set |
| 535 | # CONFIG_E1000E is not set | 562 | # CONFIG_E1000E is not set |
| 536 | # CONFIG_E1000E_ENABLED is not set | ||
| 537 | # CONFIG_IGB is not set | 563 | # CONFIG_IGB is not set |
| 538 | # CONFIG_NS83820 is not set | 564 | # CONFIG_NS83820 is not set |
| 539 | # CONFIG_HAMACHI is not set | 565 | # CONFIG_HAMACHI is not set |
| @@ -545,6 +571,7 @@ CONFIG_NETDEV_1000=y | |||
| 545 | # CONFIG_TIGON3 is not set | 571 | # CONFIG_TIGON3 is not set |
| 546 | # CONFIG_BNX2 is not set | 572 | # CONFIG_BNX2 is not set |
| 547 | # CONFIG_GIANFAR is not set | 573 | # CONFIG_GIANFAR is not set |
| 574 | # CONFIG_MV643XX_ETH is not set | ||
| 548 | # CONFIG_QLA3XXX is not set | 575 | # CONFIG_QLA3XXX is not set |
| 549 | CONFIG_NETDEV_10000=y | 576 | CONFIG_NETDEV_10000=y |
| 550 | # CONFIG_CHELSIO_T1 is not set | 577 | # CONFIG_CHELSIO_T1 is not set |
| @@ -610,6 +637,7 @@ CONFIG_KEYBOARD_ATKBD=y | |||
| 610 | # CONFIG_KEYBOARD_XTKBD is not set | 637 | # CONFIG_KEYBOARD_XTKBD is not set |
| 611 | # CONFIG_KEYBOARD_NEWTON is not set | 638 | # CONFIG_KEYBOARD_NEWTON is not set |
| 612 | # CONFIG_KEYBOARD_STOWAWAY is not set | 639 | # CONFIG_KEYBOARD_STOWAWAY is not set |
| 640 | # CONFIG_KEYBOARD_GPIO is not set | ||
| 613 | CONFIG_INPUT_MOUSE=y | 641 | CONFIG_INPUT_MOUSE=y |
| 614 | CONFIG_MOUSE_PS2=y | 642 | CONFIG_MOUSE_PS2=y |
| 615 | CONFIG_MOUSE_PS2_ALPS=y | 643 | CONFIG_MOUSE_PS2_ALPS=y |
| @@ -620,6 +648,7 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y | |||
| 620 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 648 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
| 621 | # CONFIG_MOUSE_SERIAL is not set | 649 | # CONFIG_MOUSE_SERIAL is not set |
| 622 | # CONFIG_MOUSE_VSXXXAA is not set | 650 | # CONFIG_MOUSE_VSXXXAA is not set |
| 651 | # CONFIG_MOUSE_GPIO is not set | ||
| 623 | # CONFIG_INPUT_JOYSTICK is not set | 652 | # CONFIG_INPUT_JOYSTICK is not set |
| 624 | # CONFIG_INPUT_TABLET is not set | 653 | # CONFIG_INPUT_TABLET is not set |
| 625 | # CONFIG_INPUT_TOUCHSCREEN is not set | 654 | # CONFIG_INPUT_TOUCHSCREEN is not set |
| @@ -634,6 +663,7 @@ CONFIG_SERIO_SERPORT=y | |||
| 634 | # CONFIG_SERIO_PCIPS2 is not set | 663 | # CONFIG_SERIO_PCIPS2 is not set |
| 635 | CONFIG_SERIO_LIBPS2=y | 664 | CONFIG_SERIO_LIBPS2=y |
| 636 | # CONFIG_SERIO_RAW is not set | 665 | # CONFIG_SERIO_RAW is not set |
| 666 | # CONFIG_SERIO_XILINX_XPS_PS2 is not set | ||
| 637 | # CONFIG_GAMEPORT is not set | 667 | # CONFIG_GAMEPORT is not set |
| 638 | 668 | ||
| 639 | # | 669 | # |
| @@ -654,6 +684,7 @@ CONFIG_DEVKMEM=y | |||
| 654 | # CONFIG_SERIAL_UARTLITE is not set | 684 | # CONFIG_SERIAL_UARTLITE is not set |
| 655 | CONFIG_SERIAL_CORE=y | 685 | CONFIG_SERIAL_CORE=y |
| 656 | CONFIG_SERIAL_CORE_CONSOLE=y | 686 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 687 | # CONFIG_SERIAL_PMACZILOG is not set | ||
| 657 | CONFIG_SERIAL_CPM=y | 688 | CONFIG_SERIAL_CPM=y |
| 658 | CONFIG_SERIAL_CPM_CONSOLE=y | 689 | CONFIG_SERIAL_CPM_CONSOLE=y |
| 659 | CONFIG_SERIAL_CPM_SCC1=y | 690 | CONFIG_SERIAL_CPM_SCC1=y |
| @@ -666,6 +697,8 @@ CONFIG_SERIAL_CPM_SCC4=y | |||
| 666 | CONFIG_UNIX98_PTYS=y | 697 | CONFIG_UNIX98_PTYS=y |
| 667 | CONFIG_LEGACY_PTYS=y | 698 | CONFIG_LEGACY_PTYS=y |
| 668 | CONFIG_LEGACY_PTY_COUNT=256 | 699 | CONFIG_LEGACY_PTY_COUNT=256 |
| 700 | # CONFIG_BRIQ_PANEL is not set | ||
| 701 | # CONFIG_HVC_RTAS is not set | ||
| 669 | # CONFIG_IPMI_HANDLER is not set | 702 | # CONFIG_IPMI_HANDLER is not set |
| 670 | CONFIG_HW_RANDOM=y | 703 | CONFIG_HW_RANDOM=y |
| 671 | # CONFIG_NVRAM is not set | 704 | # CONFIG_NVRAM is not set |
| @@ -676,10 +709,28 @@ CONFIG_HW_RANDOM=y | |||
| 676 | CONFIG_DEVPORT=y | 709 | CONFIG_DEVPORT=y |
| 677 | # CONFIG_I2C is not set | 710 | # CONFIG_I2C is not set |
| 678 | # CONFIG_SPI is not set | 711 | # CONFIG_SPI is not set |
| 712 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 713 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | ||
| 714 | CONFIG_GPIOLIB=y | ||
| 715 | # CONFIG_DEBUG_GPIO is not set | ||
| 716 | |||
| 717 | # | ||
| 718 | # I2C GPIO expanders: | ||
| 719 | # | ||
| 720 | |||
| 721 | # | ||
| 722 | # PCI GPIO expanders: | ||
| 723 | # | ||
| 724 | # CONFIG_GPIO_BT8XX is not set | ||
| 725 | |||
| 726 | # | ||
| 727 | # SPI GPIO expanders: | ||
| 728 | # | ||
| 679 | # CONFIG_W1 is not set | 729 | # CONFIG_W1 is not set |
| 680 | # CONFIG_POWER_SUPPLY is not set | 730 | # CONFIG_POWER_SUPPLY is not set |
| 681 | # CONFIG_HWMON is not set | 731 | # CONFIG_HWMON is not set |
| 682 | # CONFIG_THERMAL is not set | 732 | # CONFIG_THERMAL is not set |
| 733 | # CONFIG_THERMAL_HWMON is not set | ||
| 683 | # CONFIG_WATCHDOG is not set | 734 | # CONFIG_WATCHDOG is not set |
| 684 | 735 | ||
| 685 | # | 736 | # |
| @@ -691,8 +742,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 691 | # | 742 | # |
| 692 | # Multifunction device drivers | 743 | # Multifunction device drivers |
| 693 | # | 744 | # |
| 745 | # CONFIG_MFD_CORE is not set | ||
| 694 | # CONFIG_MFD_SM501 is not set | 746 | # CONFIG_MFD_SM501 is not set |
| 695 | # CONFIG_HTC_PASIC3 is not set | 747 | # CONFIG_HTC_PASIC3 is not set |
| 748 | # CONFIG_MFD_TMIO is not set | ||
| 696 | 749 | ||
| 697 | # | 750 | # |
| 698 | # Multimedia devices | 751 | # Multimedia devices |
| @@ -724,10 +777,6 @@ CONFIG_DAB=y | |||
| 724 | # Display device support | 777 | # Display device support |
| 725 | # | 778 | # |
| 726 | # CONFIG_DISPLAY_SUPPORT is not set | 779 | # CONFIG_DISPLAY_SUPPORT is not set |
| 727 | |||
| 728 | # | ||
| 729 | # Sound | ||
| 730 | # | ||
| 731 | # CONFIG_SOUND is not set | 780 | # CONFIG_SOUND is not set |
| 732 | # CONFIG_HID_SUPPORT is not set | 781 | # CONFIG_HID_SUPPORT is not set |
| 733 | # CONFIG_USB_SUPPORT is not set | 782 | # CONFIG_USB_SUPPORT is not set |
| @@ -798,6 +847,7 @@ CONFIG_TMPFS=y | |||
| 798 | CONFIG_CRAMFS=y | 847 | CONFIG_CRAMFS=y |
| 799 | # CONFIG_VXFS_FS is not set | 848 | # CONFIG_VXFS_FS is not set |
| 800 | # CONFIG_MINIX_FS is not set | 849 | # CONFIG_MINIX_FS is not set |
| 850 | # CONFIG_OMFS_FS is not set | ||
| 801 | # CONFIG_HPFS_FS is not set | 851 | # CONFIG_HPFS_FS is not set |
| 802 | # CONFIG_QNX4FS_FS is not set | 852 | # CONFIG_QNX4FS_FS is not set |
| 803 | # CONFIG_ROMFS_FS is not set | 853 | # CONFIG_ROMFS_FS is not set |
| @@ -807,8 +857,8 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 807 | CONFIG_NFS_FS=y | 857 | CONFIG_NFS_FS=y |
| 808 | CONFIG_NFS_V3=y | 858 | CONFIG_NFS_V3=y |
| 809 | CONFIG_NFS_V3_ACL=y | 859 | CONFIG_NFS_V3_ACL=y |
| 810 | # CONFIG_NFSD is not set | ||
| 811 | CONFIG_ROOT_NFS=y | 860 | CONFIG_ROOT_NFS=y |
| 861 | # CONFIG_NFSD is not set | ||
| 812 | CONFIG_LOCKD=y | 862 | CONFIG_LOCKD=y |
| 813 | CONFIG_LOCKD_V4=y | 863 | CONFIG_LOCKD_V4=y |
| 814 | CONFIG_NFS_ACL_SUPPORT=y | 864 | CONFIG_NFS_ACL_SUPPORT=y |
| @@ -888,6 +938,7 @@ CONFIG_BITREVERSE=y | |||
| 888 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 938 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 889 | CONFIG_CRC_CCITT=y | 939 | CONFIG_CRC_CCITT=y |
| 890 | # CONFIG_CRC16 is not set | 940 | # CONFIG_CRC16 is not set |
| 941 | # CONFIG_CRC_T10DIF is not set | ||
| 891 | # CONFIG_CRC_ITU_T is not set | 942 | # CONFIG_CRC_ITU_T is not set |
| 892 | CONFIG_CRC32=y | 943 | CONFIG_CRC32=y |
| 893 | # CONFIG_CRC7 is not set | 944 | # CONFIG_CRC7 is not set |
| @@ -914,6 +965,8 @@ CONFIG_MAGIC_SYSRQ=y | |||
| 914 | CONFIG_DEBUG_KERNEL=y | 965 | CONFIG_DEBUG_KERNEL=y |
| 915 | # CONFIG_DEBUG_SHIRQ is not set | 966 | # CONFIG_DEBUG_SHIRQ is not set |
| 916 | CONFIG_DETECT_SOFTLOCKUP=y | 967 | CONFIG_DETECT_SOFTLOCKUP=y |
| 968 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 969 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 917 | CONFIG_SCHED_DEBUG=y | 970 | CONFIG_SCHED_DEBUG=y |
| 918 | # CONFIG_SCHEDSTATS is not set | 971 | # CONFIG_SCHEDSTATS is not set |
| 919 | # CONFIG_TIMER_STATS is not set | 972 | # CONFIG_TIMER_STATS is not set |
| @@ -931,19 +984,31 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
| 931 | CONFIG_DEBUG_INFO=y | 984 | CONFIG_DEBUG_INFO=y |
| 932 | # CONFIG_DEBUG_VM is not set | 985 | # CONFIG_DEBUG_VM is not set |
| 933 | # CONFIG_DEBUG_WRITECOUNT is not set | 986 | # CONFIG_DEBUG_WRITECOUNT is not set |
| 987 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 934 | # CONFIG_DEBUG_LIST is not set | 988 | # CONFIG_DEBUG_LIST is not set |
| 935 | # CONFIG_DEBUG_SG is not set | 989 | # CONFIG_DEBUG_SG is not set |
| 936 | # CONFIG_BOOT_PRINTK_DELAY is not set | 990 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 991 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 937 | # CONFIG_BACKTRACE_SELF_TEST is not set | 992 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 938 | # CONFIG_FAULT_INJECTION is not set | 993 | # CONFIG_FAULT_INJECTION is not set |
| 994 | # CONFIG_LATENCYTOP is not set | ||
| 995 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 996 | CONFIG_HAVE_FTRACE=y | ||
| 997 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 998 | # CONFIG_FTRACE is not set | ||
| 999 | # CONFIG_SCHED_TRACER is not set | ||
| 1000 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 939 | # CONFIG_SAMPLES is not set | 1001 | # CONFIG_SAMPLES is not set |
| 1002 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 940 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1003 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
| 941 | # CONFIG_DEBUG_STACK_USAGE is not set | 1004 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 942 | # CONFIG_DEBUG_PAGEALLOC is not set | 1005 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 943 | # CONFIG_DEBUGGER is not set | 1006 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
| 944 | # CONFIG_KGDB_CONSOLE is not set | 1007 | # CONFIG_FTR_FIXUP_SELFTEST is not set |
| 1008 | # CONFIG_XMON is not set | ||
| 945 | # CONFIG_IRQSTACKS is not set | 1009 | # CONFIG_IRQSTACKS is not set |
| 946 | CONFIG_BDI_SWITCH=y | 1010 | CONFIG_BDI_SWITCH=y |
| 1011 | # CONFIG_BOOTX_TEXT is not set | ||
| 947 | # CONFIG_PPC_EARLY_DEBUG is not set | 1012 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 948 | 1013 | ||
| 949 | # | 1014 | # |
| @@ -951,6 +1016,7 @@ CONFIG_BDI_SWITCH=y | |||
| 951 | # | 1016 | # |
| 952 | # CONFIG_KEYS is not set | 1017 | # CONFIG_KEYS is not set |
| 953 | # CONFIG_SECURITY is not set | 1018 | # CONFIG_SECURITY is not set |
| 1019 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
| 954 | CONFIG_CRYPTO=y | 1020 | CONFIG_CRYPTO=y |
| 955 | 1021 | ||
| 956 | # | 1022 | # |
| @@ -991,6 +1057,10 @@ CONFIG_CRYPTO_PCBC=y | |||
| 991 | # CONFIG_CRYPTO_MD4 is not set | 1057 | # CONFIG_CRYPTO_MD4 is not set |
| 992 | CONFIG_CRYPTO_MD5=y | 1058 | CONFIG_CRYPTO_MD5=y |
| 993 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1059 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 1060 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1061 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1062 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1063 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 994 | # CONFIG_CRYPTO_SHA1 is not set | 1064 | # CONFIG_CRYPTO_SHA1 is not set |
| 995 | # CONFIG_CRYPTO_SHA256 is not set | 1065 | # CONFIG_CRYPTO_SHA256 is not set |
| 996 | # CONFIG_CRYPTO_SHA512 is not set | 1066 | # CONFIG_CRYPTO_SHA512 is not set |
| @@ -1021,6 +1091,6 @@ CONFIG_CRYPTO_DES=y | |||
| 1021 | # CONFIG_CRYPTO_DEFLATE is not set | 1091 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1022 | # CONFIG_CRYPTO_LZO is not set | 1092 | # CONFIG_CRYPTO_LZO is not set |
| 1023 | # CONFIG_CRYPTO_HW is not set | 1093 | # CONFIG_CRYPTO_HW is not set |
| 1024 | # CONFIG_PPC_CLOCK is not set | 1094 | CONFIG_PPC_CLOCK=y |
| 1025 | CONFIG_PPC_LIB_RHEAP=y | 1095 | CONFIG_PPC_LIB_RHEAP=y |
| 1026 | # CONFIG_VIRTUALIZATION is not set | 1096 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/mpc83xx_defconfig b/arch/powerpc/configs/mpc83xx_defconfig index 4293c8be06e1..916e3df7cc45 100644 --- a/arch/powerpc/configs/mpc83xx_defconfig +++ b/arch/powerpc/configs/mpc83xx_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.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Mon Jun 9 08:52:14 2008 | 4 | # Thu Aug 21 07:16:25 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -16,6 +16,7 @@ CONFIG_6xx=y | |||
| 16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
| 17 | CONFIG_PPC_FPU=y | 17 | CONFIG_PPC_FPU=y |
| 18 | # CONFIG_FSL_EMB_PERFMON is not set | 18 | # CONFIG_FSL_EMB_PERFMON is not set |
| 19 | # CONFIG_ALTIVEC is not set | ||
| 19 | CONFIG_PPC_STD_MMU=y | 20 | CONFIG_PPC_STD_MMU=y |
| 20 | CONFIG_PPC_STD_MMU_32=y | 21 | CONFIG_PPC_STD_MMU_32=y |
| 21 | # CONFIG_PPC_MM_SLICES is not set | 22 | # CONFIG_PPC_MM_SLICES is not set |
| @@ -32,12 +33,14 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | 35 | CONFIG_STACKTRACE_SUPPORT=y |
| 36 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | 37 | CONFIG_LOCKDEP_SUPPORT=y |
| 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 39 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 38 | CONFIG_GENERIC_HWEIGHT=y | 40 | CONFIG_GENERIC_HWEIGHT=y |
| 39 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 41 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 40 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 42 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 43 | CONFIG_GENERIC_GPIO=y | ||
| 41 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 44 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
| 42 | CONFIG_PPC=y | 45 | CONFIG_PPC=y |
| 43 | CONFIG_EARLY_PRINTK=y | 46 | CONFIG_EARLY_PRINTK=y |
| @@ -51,6 +54,10 @@ CONFIG_PPC_UDBG_16550=y | |||
| 51 | CONFIG_AUDIT_ARCH=y | 54 | CONFIG_AUDIT_ARCH=y |
| 52 | CONFIG_GENERIC_BUG=y | 55 | CONFIG_GENERIC_BUG=y |
| 53 | CONFIG_DEFAULT_UIMAGE=y | 56 | CONFIG_DEFAULT_UIMAGE=y |
| 57 | CONFIG_REDBOOT=y | ||
| 58 | CONFIG_HIBERNATE_32=y | ||
| 59 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
| 60 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
| 54 | # CONFIG_PPC_DCR_NATIVE is not set | 61 | # CONFIG_PPC_DCR_NATIVE is not set |
| 55 | # CONFIG_PPC_DCR_MMIO is not set | 62 | # CONFIG_PPC_DCR_MMIO is not set |
| 56 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 63 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| @@ -88,13 +95,13 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 88 | CONFIG_SYSCTL=y | 95 | CONFIG_SYSCTL=y |
| 89 | CONFIG_EMBEDDED=y | 96 | CONFIG_EMBEDDED=y |
| 90 | CONFIG_SYSCTL_SYSCALL=y | 97 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 92 | CONFIG_KALLSYMS=y | 98 | CONFIG_KALLSYMS=y |
| 93 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 99 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 94 | CONFIG_HOTPLUG=y | 100 | CONFIG_HOTPLUG=y |
| 95 | CONFIG_PRINTK=y | 101 | CONFIG_PRINTK=y |
| 96 | CONFIG_BUG=y | 102 | CONFIG_BUG=y |
| 97 | CONFIG_ELF_CORE=y | 103 | CONFIG_ELF_CORE=y |
| 104 | CONFIG_PCSPKR_PLATFORM=y | ||
| 98 | CONFIG_COMPAT_BRK=y | 105 | CONFIG_COMPAT_BRK=y |
| 99 | CONFIG_BASE_FULL=y | 106 | CONFIG_BASE_FULL=y |
| 100 | CONFIG_FUTEX=y | 107 | CONFIG_FUTEX=y |
| @@ -112,10 +119,16 @@ CONFIG_SLAB=y | |||
| 112 | # CONFIG_MARKERS is not set | 119 | # CONFIG_MARKERS is not set |
| 113 | CONFIG_HAVE_OPROFILE=y | 120 | CONFIG_HAVE_OPROFILE=y |
| 114 | # CONFIG_KPROBES is not set | 121 | # CONFIG_KPROBES is not set |
| 122 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 123 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 115 | CONFIG_HAVE_KPROBES=y | 124 | CONFIG_HAVE_KPROBES=y |
| 116 | CONFIG_HAVE_KRETPROBES=y | 125 | CONFIG_HAVE_KRETPROBES=y |
| 126 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 117 | # CONFIG_HAVE_DMA_ATTRS is not set | 127 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 128 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 129 | # CONFIG_HAVE_CLK is not set | ||
| 118 | CONFIG_PROC_PAGE_MONITOR=y | 130 | CONFIG_PROC_PAGE_MONITOR=y |
| 131 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 119 | CONFIG_SLABINFO=y | 132 | CONFIG_SLABINFO=y |
| 120 | CONFIG_RT_MUTEXES=y | 133 | CONFIG_RT_MUTEXES=y |
| 121 | # CONFIG_TINY_SHMEM is not set | 134 | # CONFIG_TINY_SHMEM is not set |
| @@ -126,12 +139,13 @@ CONFIG_MODULE_UNLOAD=y | |||
| 126 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 139 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 127 | # CONFIG_MODVERSIONS is not set | 140 | # CONFIG_MODVERSIONS is not set |
| 128 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 141 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 129 | # CONFIG_KMOD is not set | 142 | CONFIG_KMOD=y |
| 130 | CONFIG_BLOCK=y | 143 | CONFIG_BLOCK=y |
| 131 | # CONFIG_LBD is not set | 144 | # CONFIG_LBD is not set |
| 132 | # CONFIG_BLK_DEV_IO_TRACE is not set | 145 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 133 | # CONFIG_LSF is not set | 146 | # CONFIG_LSF is not set |
| 134 | # CONFIG_BLK_DEV_BSG is not set | 147 | # CONFIG_BLK_DEV_BSG is not set |
| 148 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 135 | 149 | ||
| 136 | # | 150 | # |
| 137 | # IO Schedulers | 151 | # IO Schedulers |
| @@ -150,40 +164,52 @@ CONFIG_CLASSIC_RCU=y | |||
| 150 | # | 164 | # |
| 151 | # Platform support | 165 | # Platform support |
| 152 | # | 166 | # |
| 153 | # CONFIG_PPC_MULTIPLATFORM is not set | 167 | CONFIG_PPC_MULTIPLATFORM=y |
| 154 | # CONFIG_PPC_82xx is not set | 168 | CONFIG_CLASSIC32=y |
| 155 | CONFIG_PPC_83xx=y | 169 | CONFIG_PPC_CHRP=y |
| 156 | # CONFIG_PPC_86xx is not set | 170 | # CONFIG_MPC5121_ADS is not set |
| 157 | # CONFIG_PPC_MPC512x is not set | 171 | # CONFIG_MPC5121_GENERIC is not set |
| 158 | # CONFIG_PPC_MPC5121 is not set | 172 | # CONFIG_PPC_MPC52xx is not set |
| 173 | CONFIG_PPC_PMAC=y | ||
| 159 | # CONFIG_PPC_CELL is not set | 174 | # CONFIG_PPC_CELL is not set |
| 160 | # CONFIG_PPC_CELL_NATIVE is not set | 175 | # CONFIG_PPC_CELL_NATIVE is not set |
| 176 | # CONFIG_PPC_82xx is not set | ||
| 161 | # CONFIG_PQ2ADS is not set | 177 | # CONFIG_PQ2ADS is not set |
| 162 | CONFIG_MPC83xx=y | 178 | CONFIG_PPC_83xx=y |
| 163 | CONFIG_MPC831x_RDB=y | 179 | CONFIG_MPC831x_RDB=y |
| 164 | CONFIG_MPC832x_MDS=y | 180 | CONFIG_MPC832x_MDS=y |
| 165 | CONFIG_MPC832x_RDB=y | 181 | CONFIG_MPC832x_RDB=y |
| 166 | CONFIG_MPC834x_MDS=y | 182 | CONFIG_MPC834x_MDS=y |
| 167 | CONFIG_MPC834x_ITX=y | 183 | CONFIG_MPC834x_ITX=y |
| 168 | CONFIG_MPC836x_MDS=y | 184 | CONFIG_MPC836x_MDS=y |
| 185 | CONFIG_MPC836x_RDK=y | ||
| 169 | CONFIG_MPC837x_MDS=y | 186 | CONFIG_MPC837x_MDS=y |
| 170 | CONFIG_MPC837x_RDB=y | 187 | CONFIG_MPC837x_RDB=y |
| 171 | CONFIG_SBC834x=y | 188 | CONFIG_SBC834x=y |
| 189 | CONFIG_ASP834x=y | ||
| 172 | CONFIG_PPC_MPC831x=y | 190 | CONFIG_PPC_MPC831x=y |
| 173 | CONFIG_PPC_MPC832x=y | 191 | CONFIG_PPC_MPC832x=y |
| 174 | CONFIG_PPC_MPC834x=y | 192 | CONFIG_PPC_MPC834x=y |
| 175 | CONFIG_PPC_MPC837x=y | 193 | CONFIG_PPC_MPC837x=y |
| 194 | # CONFIG_PPC_86xx is not set | ||
| 195 | # CONFIG_EMBEDDED6xx is not set | ||
| 196 | CONFIG_PPC_NATIVE=y | ||
| 197 | # CONFIG_UDBG_RTAS_CONSOLE is not set | ||
| 176 | CONFIG_IPIC=y | 198 | CONFIG_IPIC=y |
| 177 | # CONFIG_MPIC is not set | 199 | CONFIG_MPIC=y |
| 178 | # CONFIG_MPIC_WEIRD is not set | 200 | # CONFIG_MPIC_WEIRD is not set |
| 179 | # CONFIG_PPC_I8259 is not set | 201 | CONFIG_PPC_I8259=y |
| 180 | # CONFIG_PPC_RTAS is not set | 202 | CONFIG_PPC_RTAS=y |
| 203 | # CONFIG_RTAS_ERROR_LOGGING is not set | ||
| 204 | CONFIG_RTAS_PROC=y | ||
| 181 | # CONFIG_MMIO_NVRAM is not set | 205 | # CONFIG_MMIO_NVRAM is not set |
| 182 | # CONFIG_PPC_MPC106 is not set | 206 | CONFIG_PPC_MPC106=y |
| 183 | # CONFIG_PPC_970_NAP is not set | 207 | # CONFIG_PPC_970_NAP is not set |
| 184 | # CONFIG_PPC_INDIRECT_IO is not set | 208 | # CONFIG_PPC_INDIRECT_IO is not set |
| 185 | # CONFIG_GENERIC_IOMAP is not set | 209 | # CONFIG_GENERIC_IOMAP is not set |
| 186 | # CONFIG_CPU_FREQ is not set | 210 | # CONFIG_CPU_FREQ is not set |
| 211 | # CONFIG_PPC601_SYNC_FIX is not set | ||
| 212 | # CONFIG_TAU is not set | ||
| 187 | CONFIG_QUICC_ENGINE=y | 213 | CONFIG_QUICC_ENGINE=y |
| 188 | # CONFIG_FSL_ULI1575 is not set | 214 | # CONFIG_FSL_ULI1575 is not set |
| 189 | 215 | ||
| @@ -211,6 +237,7 @@ CONFIG_MATH_EMULATION=y | |||
| 211 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 237 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| 212 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 238 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
| 213 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 239 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
| 240 | # CONFIG_KEXEC is not set | ||
| 214 | CONFIG_ARCH_FLATMEM_ENABLE=y | 241 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 215 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 242 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
| 216 | CONFIG_SELECT_MEMORY_MODEL=y | 243 | CONFIG_SELECT_MEMORY_MODEL=y |
| @@ -223,6 +250,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 223 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 250 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 224 | CONFIG_PAGEFLAGS_EXTENDED=y | 251 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 225 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 252 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 253 | CONFIG_MIGRATION=y | ||
| 226 | # CONFIG_RESOURCES_64BIT is not set | 254 | # CONFIG_RESOURCES_64BIT is not set |
| 227 | CONFIG_ZONE_DMA_FLAG=1 | 255 | CONFIG_ZONE_DMA_FLAG=1 |
| 228 | CONFIG_BOUNCE=y | 256 | CONFIG_BOUNCE=y |
| @@ -230,6 +258,7 @@ CONFIG_VIRT_TO_BUS=y | |||
| 230 | CONFIG_FORCE_MAX_ZONEORDER=11 | 258 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 231 | CONFIG_PROC_DEVICETREE=y | 259 | CONFIG_PROC_DEVICETREE=y |
| 232 | # CONFIG_CMDLINE_BOOL is not set | 260 | # CONFIG_CMDLINE_BOOL is not set |
| 261 | CONFIG_EXTRA_TARGETS="" | ||
| 233 | # CONFIG_PM is not set | 262 | # CONFIG_PM is not set |
| 234 | CONFIG_SECCOMP=y | 263 | CONFIG_SECCOMP=y |
| 235 | CONFIG_ISA_DMA_API=y | 264 | CONFIG_ISA_DMA_API=y |
| @@ -237,15 +266,24 @@ CONFIG_ISA_DMA_API=y | |||
| 237 | # | 266 | # |
| 238 | # Bus options | 267 | # Bus options |
| 239 | # | 268 | # |
| 269 | # CONFIG_ISA is not set | ||
| 240 | CONFIG_ZONE_DMA=y | 270 | CONFIG_ZONE_DMA=y |
| 241 | CONFIG_GENERIC_ISA_DMA=y | 271 | CONFIG_GENERIC_ISA_DMA=y |
| 242 | CONFIG_PPC_INDIRECT_PCI=y | 272 | CONFIG_PPC_INDIRECT_PCI=y |
| 243 | CONFIG_FSL_SOC=y | 273 | CONFIG_FSL_SOC=y |
| 244 | # CONFIG_PCI is not set | 274 | CONFIG_FSL_PCI=y |
| 245 | # CONFIG_PCI_DOMAINS is not set | 275 | CONFIG_FSL_LBC=y |
| 246 | # CONFIG_PCI_SYSCALL is not set | 276 | CONFIG_FSL_GTM=y |
| 247 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 277 | CONFIG_PPC_PCI_CHOICE=y |
| 278 | CONFIG_PCI=y | ||
| 279 | CONFIG_PCI_DOMAINS=y | ||
| 280 | CONFIG_PCI_SYSCALL=y | ||
| 281 | # CONFIG_PCIEPORTBUS is not set | ||
| 282 | CONFIG_ARCH_SUPPORTS_MSI=y | ||
| 283 | # CONFIG_PCI_MSI is not set | ||
| 284 | CONFIG_PCI_LEGACY=y | ||
| 248 | # CONFIG_PCCARD is not set | 285 | # CONFIG_PCCARD is not set |
| 286 | # CONFIG_HOTPLUG_PCI is not set | ||
| 249 | # CONFIG_HAS_RAPIDIO is not set | 287 | # CONFIG_HAS_RAPIDIO is not set |
| 250 | 288 | ||
| 251 | # | 289 | # |
| @@ -261,10 +299,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
| 261 | CONFIG_KERNEL_START=0xc0000000 | 299 | CONFIG_KERNEL_START=0xc0000000 |
| 262 | CONFIG_PHYSICAL_START=0x00000000 | 300 | CONFIG_PHYSICAL_START=0x00000000 |
| 263 | CONFIG_TASK_SIZE=0xc0000000 | 301 | CONFIG_TASK_SIZE=0xc0000000 |
| 264 | |||
| 265 | # | ||
| 266 | # Networking | ||
| 267 | # | ||
| 268 | CONFIG_NET=y | 302 | CONFIG_NET=y |
| 269 | 303 | ||
| 270 | # | 304 | # |
| @@ -412,11 +446,13 @@ CONFIG_MTD_CFI_UTIL=y | |||
| 412 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | 446 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set |
| 413 | # CONFIG_MTD_PHYSMAP is not set | 447 | # CONFIG_MTD_PHYSMAP is not set |
| 414 | CONFIG_MTD_PHYSMAP_OF=y | 448 | CONFIG_MTD_PHYSMAP_OF=y |
| 449 | # CONFIG_MTD_INTEL_VR_NOR is not set | ||
| 415 | # CONFIG_MTD_PLATRAM is not set | 450 | # CONFIG_MTD_PLATRAM is not set |
| 416 | 451 | ||
| 417 | # | 452 | # |
| 418 | # Self-contained MTD device drivers | 453 | # Self-contained MTD device drivers |
| 419 | # | 454 | # |
| 455 | # CONFIG_MTD_PMC551 is not set | ||
| 420 | # CONFIG_MTD_SLRAM is not set | 456 | # CONFIG_MTD_SLRAM is not set |
| 421 | # CONFIG_MTD_PHRAM is not set | 457 | # CONFIG_MTD_PHRAM is not set |
| 422 | # CONFIG_MTD_MTDRAM is not set | 458 | # CONFIG_MTD_MTDRAM is not set |
| @@ -434,10 +470,12 @@ CONFIG_MTD_NAND_VERIFY_WRITE=y | |||
| 434 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set | 470 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set |
| 435 | CONFIG_MTD_NAND_IDS=y | 471 | CONFIG_MTD_NAND_IDS=y |
| 436 | # CONFIG_MTD_NAND_DISKONCHIP is not set | 472 | # CONFIG_MTD_NAND_DISKONCHIP is not set |
| 473 | # CONFIG_MTD_NAND_CAFE is not set | ||
| 437 | # CONFIG_MTD_NAND_NANDSIM is not set | 474 | # CONFIG_MTD_NAND_NANDSIM is not set |
| 438 | # CONFIG_MTD_NAND_PLATFORM is not set | 475 | # CONFIG_MTD_NAND_PLATFORM is not set |
| 439 | # CONFIG_MTD_ALAUDA is not set | 476 | # CONFIG_MTD_ALAUDA is not set |
| 440 | CONFIG_MTD_NAND_FSL_ELBC=y | 477 | CONFIG_MTD_NAND_FSL_ELBC=y |
| 478 | # CONFIG_MTD_NAND_FSL_UPM is not set | ||
| 441 | # CONFIG_MTD_ONENAND is not set | 479 | # CONFIG_MTD_ONENAND is not set |
| 442 | 480 | ||
| 443 | # | 481 | # |
| @@ -445,14 +483,21 @@ CONFIG_MTD_NAND_FSL_ELBC=y | |||
| 445 | # | 483 | # |
| 446 | # CONFIG_MTD_UBI is not set | 484 | # CONFIG_MTD_UBI is not set |
| 447 | CONFIG_OF_DEVICE=y | 485 | CONFIG_OF_DEVICE=y |
| 486 | CONFIG_OF_GPIO=y | ||
| 448 | CONFIG_OF_I2C=y | 487 | CONFIG_OF_I2C=y |
| 449 | # CONFIG_PARPORT is not set | 488 | # CONFIG_PARPORT is not set |
| 450 | CONFIG_BLK_DEV=y | 489 | CONFIG_BLK_DEV=y |
| 451 | # CONFIG_BLK_DEV_FD is not set | 490 | # CONFIG_BLK_DEV_FD is not set |
| 491 | # CONFIG_MAC_FLOPPY is not set | ||
| 492 | # CONFIG_BLK_CPQ_DA is not set | ||
| 493 | # CONFIG_BLK_CPQ_CISS_DA is not set | ||
| 494 | # CONFIG_BLK_DEV_DAC960 is not set | ||
| 495 | # CONFIG_BLK_DEV_UMEM is not set | ||
| 452 | # CONFIG_BLK_DEV_COW_COMMON is not set | 496 | # CONFIG_BLK_DEV_COW_COMMON is not set |
| 453 | CONFIG_BLK_DEV_LOOP=y | 497 | CONFIG_BLK_DEV_LOOP=y |
| 454 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 498 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set |
| 455 | # CONFIG_BLK_DEV_NBD is not set | 499 | # CONFIG_BLK_DEV_NBD is not set |
| 500 | # CONFIG_BLK_DEV_SX8 is not set | ||
| 456 | # CONFIG_BLK_DEV_UB is not set | 501 | # CONFIG_BLK_DEV_UB is not set |
| 457 | CONFIG_BLK_DEV_RAM=y | 502 | CONFIG_BLK_DEV_RAM=y |
| 458 | CONFIG_BLK_DEV_RAM_COUNT=16 | 503 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| @@ -460,9 +505,14 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
| 460 | # CONFIG_BLK_DEV_XIP is not set | 505 | # CONFIG_BLK_DEV_XIP is not set |
| 461 | # CONFIG_CDROM_PKTCDVD is not set | 506 | # CONFIG_CDROM_PKTCDVD is not set |
| 462 | # CONFIG_ATA_OVER_ETH is not set | 507 | # CONFIG_ATA_OVER_ETH is not set |
| 508 | # CONFIG_BLK_DEV_HD is not set | ||
| 463 | CONFIG_MISC_DEVICES=y | 509 | CONFIG_MISC_DEVICES=y |
| 510 | # CONFIG_PHANTOM is not set | ||
| 464 | # CONFIG_EEPROM_93CX6 is not set | 511 | # CONFIG_EEPROM_93CX6 is not set |
| 512 | # CONFIG_SGI_IOC4 is not set | ||
| 513 | # CONFIG_TIFM_CORE is not set | ||
| 465 | # CONFIG_ENCLOSURE_SERVICES is not set | 514 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 515 | # CONFIG_HP_ILO is not set | ||
| 466 | CONFIG_HAVE_IDE=y | 516 | CONFIG_HAVE_IDE=y |
| 467 | # CONFIG_IDE is not set | 517 | # CONFIG_IDE is not set |
| 468 | 518 | ||
| @@ -505,24 +555,128 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 505 | # CONFIG_SCSI_SRP_ATTRS is not set | 555 | # CONFIG_SCSI_SRP_ATTRS is not set |
| 506 | CONFIG_SCSI_LOWLEVEL=y | 556 | CONFIG_SCSI_LOWLEVEL=y |
| 507 | # CONFIG_ISCSI_TCP is not set | 557 | # CONFIG_ISCSI_TCP is not set |
| 558 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | ||
| 559 | # CONFIG_SCSI_3W_9XXX is not set | ||
| 560 | # CONFIG_SCSI_ACARD is not set | ||
| 561 | # CONFIG_SCSI_AACRAID is not set | ||
| 562 | # CONFIG_SCSI_AIC7XXX is not set | ||
| 563 | # CONFIG_SCSI_AIC7XXX_OLD is not set | ||
| 564 | # CONFIG_SCSI_AIC79XX is not set | ||
| 565 | # CONFIG_SCSI_AIC94XX is not set | ||
| 566 | # CONFIG_SCSI_DPT_I2O is not set | ||
| 567 | # CONFIG_SCSI_ADVANSYS is not set | ||
| 568 | # CONFIG_SCSI_ARCMSR is not set | ||
| 569 | # CONFIG_MEGARAID_NEWGEN is not set | ||
| 570 | # CONFIG_MEGARAID_LEGACY is not set | ||
| 571 | # CONFIG_MEGARAID_SAS is not set | ||
| 572 | # CONFIG_SCSI_HPTIOP is not set | ||
| 573 | # CONFIG_SCSI_BUSLOGIC is not set | ||
| 574 | # CONFIG_SCSI_DMX3191D is not set | ||
| 575 | # CONFIG_SCSI_EATA is not set | ||
| 576 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | ||
| 577 | # CONFIG_SCSI_GDTH is not set | ||
| 578 | # CONFIG_SCSI_IPS is not set | ||
| 579 | # CONFIG_SCSI_INITIO is not set | ||
| 580 | # CONFIG_SCSI_INIA100 is not set | ||
| 581 | # CONFIG_SCSI_MVSAS is not set | ||
| 582 | # CONFIG_SCSI_STEX is not set | ||
| 583 | # CONFIG_SCSI_SYM53C8XX_2 is not set | ||
| 584 | # CONFIG_SCSI_IPR is not set | ||
| 585 | # CONFIG_SCSI_QLOGIC_1280 is not set | ||
| 586 | # CONFIG_SCSI_QLA_FC is not set | ||
| 587 | # CONFIG_SCSI_QLA_ISCSI is not set | ||
| 588 | # CONFIG_SCSI_LPFC is not set | ||
| 589 | # CONFIG_SCSI_DC395x is not set | ||
| 590 | # CONFIG_SCSI_DC390T is not set | ||
| 591 | # CONFIG_SCSI_NSP32 is not set | ||
| 508 | # CONFIG_SCSI_DEBUG is not set | 592 | # CONFIG_SCSI_DEBUG is not set |
| 593 | # CONFIG_SCSI_MESH is not set | ||
| 594 | # CONFIG_SCSI_MAC53C94 is not set | ||
| 595 | # CONFIG_SCSI_SRP is not set | ||
| 596 | # CONFIG_SCSI_DH is not set | ||
| 509 | CONFIG_ATA=y | 597 | CONFIG_ATA=y |
| 510 | # CONFIG_ATA_NONSTANDARD is not set | 598 | # CONFIG_ATA_NONSTANDARD is not set |
| 511 | CONFIG_SATA_PMP=y | 599 | CONFIG_SATA_PMP=y |
| 600 | # CONFIG_SATA_AHCI is not set | ||
| 601 | # CONFIG_SATA_SIL24 is not set | ||
| 512 | CONFIG_SATA_FSL=y | 602 | CONFIG_SATA_FSL=y |
| 513 | CONFIG_ATA_SFF=y | 603 | CONFIG_ATA_SFF=y |
| 604 | # CONFIG_SATA_SVW is not set | ||
| 605 | # CONFIG_ATA_PIIX is not set | ||
| 514 | # CONFIG_SATA_MV is not set | 606 | # CONFIG_SATA_MV is not set |
| 607 | # CONFIG_SATA_NV is not set | ||
| 608 | # CONFIG_PDC_ADMA is not set | ||
| 609 | # CONFIG_SATA_QSTOR is not set | ||
| 610 | # CONFIG_SATA_PROMISE is not set | ||
| 611 | # CONFIG_SATA_SX4 is not set | ||
| 612 | # CONFIG_SATA_SIL is not set | ||
| 613 | # CONFIG_SATA_SIS is not set | ||
| 614 | # CONFIG_SATA_ULI is not set | ||
| 615 | # CONFIG_SATA_VIA is not set | ||
| 616 | # CONFIG_SATA_VITESSE is not set | ||
| 617 | # CONFIG_SATA_INIC162X is not set | ||
| 618 | # CONFIG_PATA_ALI is not set | ||
| 619 | # CONFIG_PATA_AMD is not set | ||
| 620 | # CONFIG_PATA_ARTOP is not set | ||
| 621 | # CONFIG_PATA_ATIIXP is not set | ||
| 622 | # CONFIG_PATA_CMD640_PCI is not set | ||
| 623 | # CONFIG_PATA_CMD64X is not set | ||
| 624 | # CONFIG_PATA_CS5520 is not set | ||
| 625 | # CONFIG_PATA_CS5530 is not set | ||
| 626 | # CONFIG_PATA_CYPRESS is not set | ||
| 627 | # CONFIG_PATA_EFAR is not set | ||
| 628 | # CONFIG_ATA_GENERIC is not set | ||
| 629 | # CONFIG_PATA_HPT366 is not set | ||
| 630 | # CONFIG_PATA_HPT37X is not set | ||
| 631 | # CONFIG_PATA_HPT3X2N is not set | ||
| 632 | # CONFIG_PATA_HPT3X3 is not set | ||
| 633 | # CONFIG_PATA_IT821X is not set | ||
| 634 | # CONFIG_PATA_IT8213 is not set | ||
| 635 | # CONFIG_PATA_JMICRON is not set | ||
| 636 | # CONFIG_PATA_TRIFLEX is not set | ||
| 637 | # CONFIG_PATA_MARVELL is not set | ||
| 638 | # CONFIG_PATA_MPIIX is not set | ||
| 639 | # CONFIG_PATA_OLDPIIX is not set | ||
| 640 | # CONFIG_PATA_NETCELL is not set | ||
| 641 | # CONFIG_PATA_NINJA32 is not set | ||
| 642 | # CONFIG_PATA_NS87410 is not set | ||
| 643 | # CONFIG_PATA_NS87415 is not set | ||
| 644 | # CONFIG_PATA_OPTI is not set | ||
| 645 | # CONFIG_PATA_OPTIDMA is not set | ||
| 646 | # CONFIG_PATA_PDC_OLD is not set | ||
| 647 | # CONFIG_PATA_RADISYS is not set | ||
| 648 | # CONFIG_PATA_RZ1000 is not set | ||
| 649 | # CONFIG_PATA_SC1200 is not set | ||
| 650 | # CONFIG_PATA_SERVERWORKS is not set | ||
| 651 | # CONFIG_PATA_PDC2027X is not set | ||
| 652 | # CONFIG_PATA_SIL680 is not set | ||
| 653 | # CONFIG_PATA_SIS is not set | ||
| 654 | # CONFIG_PATA_VIA is not set | ||
| 655 | # CONFIG_PATA_WINBOND is not set | ||
| 515 | # CONFIG_PATA_PLATFORM is not set | 656 | # CONFIG_PATA_PLATFORM is not set |
| 657 | # CONFIG_PATA_SCH is not set | ||
| 516 | # CONFIG_MD is not set | 658 | # CONFIG_MD is not set |
| 659 | # CONFIG_FUSION is not set | ||
| 660 | |||
| 661 | # | ||
| 662 | # IEEE 1394 (FireWire) support | ||
| 663 | # | ||
| 664 | |||
| 665 | # | ||
| 666 | # Enable only one of the two stacks, unless you know what you are doing | ||
| 667 | # | ||
| 668 | # CONFIG_FIREWIRE is not set | ||
| 669 | # CONFIG_IEEE1394 is not set | ||
| 670 | # CONFIG_I2O is not set | ||
| 517 | # CONFIG_MACINTOSH_DRIVERS is not set | 671 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 518 | CONFIG_NETDEVICES=y | 672 | CONFIG_NETDEVICES=y |
| 519 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 520 | # CONFIG_DUMMY is not set | 673 | # CONFIG_DUMMY is not set |
| 521 | # CONFIG_BONDING is not set | 674 | # CONFIG_BONDING is not set |
| 522 | # CONFIG_MACVLAN is not set | 675 | # CONFIG_MACVLAN is not set |
| 523 | # CONFIG_EQUALIZER is not set | 676 | # CONFIG_EQUALIZER is not set |
| 524 | # CONFIG_TUN is not set | 677 | # CONFIG_TUN is not set |
| 525 | # CONFIG_VETH is not set | 678 | # CONFIG_VETH is not set |
| 679 | # CONFIG_ARCNET is not set | ||
| 526 | CONFIG_PHYLIB=y | 680 | CONFIG_PHYLIB=y |
| 527 | 681 | ||
| 528 | # | 682 | # |
| @@ -542,21 +696,60 @@ CONFIG_ICPLUS_PHY=y | |||
| 542 | # CONFIG_MDIO_BITBANG is not set | 696 | # CONFIG_MDIO_BITBANG is not set |
| 543 | CONFIG_NET_ETHERNET=y | 697 | CONFIG_NET_ETHERNET=y |
| 544 | CONFIG_MII=y | 698 | CONFIG_MII=y |
| 699 | # CONFIG_MACE is not set | ||
| 700 | # CONFIG_BMAC is not set | ||
| 701 | # CONFIG_HAPPYMEAL is not set | ||
| 702 | # CONFIG_SUNGEM is not set | ||
| 703 | # CONFIG_CASSINI is not set | ||
| 704 | # CONFIG_NET_VENDOR_3COM is not set | ||
| 705 | # CONFIG_NET_TULIP is not set | ||
| 706 | # CONFIG_HP100 is not set | ||
| 545 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 707 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
| 546 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 708 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 547 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 709 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| 548 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 710 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
| 711 | # CONFIG_NET_PCI is not set | ||
| 549 | # CONFIG_B44 is not set | 712 | # CONFIG_B44 is not set |
| 550 | CONFIG_NETDEV_1000=y | 713 | CONFIG_NETDEV_1000=y |
| 551 | # CONFIG_E1000E_ENABLED is not set | 714 | # CONFIG_ACENIC is not set |
| 715 | # CONFIG_DL2K is not set | ||
| 716 | # CONFIG_E1000 is not set | ||
| 717 | # CONFIG_E1000E is not set | ||
| 718 | # CONFIG_IP1000 is not set | ||
| 719 | # CONFIG_IGB is not set | ||
| 720 | # CONFIG_NS83820 is not set | ||
| 721 | # CONFIG_HAMACHI is not set | ||
| 722 | # CONFIG_YELLOWFIN is not set | ||
| 723 | # CONFIG_R8169 is not set | ||
| 724 | # CONFIG_SIS190 is not set | ||
| 725 | # CONFIG_SKGE is not set | ||
| 726 | # CONFIG_SKY2 is not set | ||
| 727 | # CONFIG_VIA_VELOCITY is not set | ||
| 728 | # CONFIG_TIGON3 is not set | ||
| 729 | # CONFIG_BNX2 is not set | ||
| 552 | CONFIG_GIANFAR=y | 730 | CONFIG_GIANFAR=y |
| 553 | # CONFIG_GFAR_NAPI is not set | ||
| 554 | CONFIG_UCC_GETH=y | 731 | CONFIG_UCC_GETH=y |
| 555 | # CONFIG_UGETH_NAPI is not set | ||
| 556 | # CONFIG_UGETH_MAGIC_PACKET is not set | 732 | # CONFIG_UGETH_MAGIC_PACKET is not set |
| 557 | # CONFIG_UGETH_FILTERING is not set | 733 | # CONFIG_UGETH_FILTERING is not set |
| 558 | # CONFIG_UGETH_TX_ON_DEMAND is not set | 734 | # CONFIG_UGETH_TX_ON_DEMAND is not set |
| 735 | # CONFIG_MV643XX_ETH is not set | ||
| 736 | # CONFIG_QLA3XXX is not set | ||
| 737 | # CONFIG_ATL1 is not set | ||
| 738 | # CONFIG_ATL1E is not set | ||
| 559 | CONFIG_NETDEV_10000=y | 739 | CONFIG_NETDEV_10000=y |
| 740 | # CONFIG_CHELSIO_T1 is not set | ||
| 741 | # CONFIG_CHELSIO_T3 is not set | ||
| 742 | # CONFIG_IXGBE is not set | ||
| 743 | # CONFIG_IXGB is not set | ||
| 744 | # CONFIG_S2IO is not set | ||
| 745 | # CONFIG_MYRI10GE is not set | ||
| 746 | # CONFIG_NETXEN_NIC is not set | ||
| 747 | # CONFIG_NIU is not set | ||
| 748 | # CONFIG_MLX4_CORE is not set | ||
| 749 | # CONFIG_TEHUTI is not set | ||
| 750 | # CONFIG_BNX2X is not set | ||
| 751 | # CONFIG_SFC is not set | ||
| 752 | # CONFIG_TR is not set | ||
| 560 | 753 | ||
| 561 | # | 754 | # |
| 562 | # Wireless LAN | 755 | # Wireless LAN |
| @@ -574,8 +767,11 @@ CONFIG_NETDEV_10000=y | |||
| 574 | # CONFIG_USB_RTL8150 is not set | 767 | # CONFIG_USB_RTL8150 is not set |
| 575 | # CONFIG_USB_USBNET is not set | 768 | # CONFIG_USB_USBNET is not set |
| 576 | # CONFIG_WAN is not set | 769 | # CONFIG_WAN is not set |
| 770 | # CONFIG_FDDI is not set | ||
| 771 | # CONFIG_HIPPI is not set | ||
| 577 | # CONFIG_PPP is not set | 772 | # CONFIG_PPP is not set |
| 578 | # CONFIG_SLIP is not set | 773 | # CONFIG_SLIP is not set |
| 774 | # CONFIG_NET_FC is not set | ||
| 579 | # CONFIG_NETCONSOLE is not set | 775 | # CONFIG_NETCONSOLE is not set |
| 580 | # CONFIG_NETPOLL is not set | 776 | # CONFIG_NETPOLL is not set |
| 581 | # CONFIG_NET_POLL_CONTROLLER is not set | 777 | # CONFIG_NET_POLL_CONTROLLER is not set |
| @@ -619,12 +815,14 @@ CONFIG_INPUT=y | |||
| 619 | # CONFIG_VT is not set | 815 | # CONFIG_VT is not set |
| 620 | CONFIG_DEVKMEM=y | 816 | CONFIG_DEVKMEM=y |
| 621 | # CONFIG_SERIAL_NONSTANDARD is not set | 817 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 818 | # CONFIG_NOZOMI is not set | ||
| 622 | 819 | ||
| 623 | # | 820 | # |
| 624 | # Serial drivers | 821 | # Serial drivers |
| 625 | # | 822 | # |
| 626 | CONFIG_SERIAL_8250=y | 823 | CONFIG_SERIAL_8250=y |
| 627 | CONFIG_SERIAL_8250_CONSOLE=y | 824 | CONFIG_SERIAL_8250_CONSOLE=y |
| 825 | CONFIG_SERIAL_8250_PCI=y | ||
| 628 | CONFIG_SERIAL_8250_NR_UARTS=4 | 826 | CONFIG_SERIAL_8250_NR_UARTS=4 |
| 629 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | 827 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 |
| 630 | # CONFIG_SERIAL_8250_EXTENDED is not set | 828 | # CONFIG_SERIAL_8250_EXTENDED is not set |
| @@ -635,43 +833,95 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
| 635 | # CONFIG_SERIAL_UARTLITE is not set | 833 | # CONFIG_SERIAL_UARTLITE is not set |
| 636 | CONFIG_SERIAL_CORE=y | 834 | CONFIG_SERIAL_CORE=y |
| 637 | CONFIG_SERIAL_CORE_CONSOLE=y | 835 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 836 | # CONFIG_SERIAL_PMACZILOG is not set | ||
| 837 | # CONFIG_SERIAL_JSM is not set | ||
| 638 | # CONFIG_SERIAL_OF_PLATFORM is not set | 838 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 639 | # CONFIG_SERIAL_QE is not set | 839 | # CONFIG_SERIAL_QE is not set |
| 640 | CONFIG_UNIX98_PTYS=y | 840 | CONFIG_UNIX98_PTYS=y |
| 641 | CONFIG_LEGACY_PTYS=y | 841 | CONFIG_LEGACY_PTYS=y |
| 642 | CONFIG_LEGACY_PTY_COUNT=256 | 842 | CONFIG_LEGACY_PTY_COUNT=256 |
| 843 | # CONFIG_BRIQ_PANEL is not set | ||
| 844 | # CONFIG_HVC_RTAS is not set | ||
| 643 | # CONFIG_IPMI_HANDLER is not set | 845 | # CONFIG_IPMI_HANDLER is not set |
| 644 | # CONFIG_HW_RANDOM is not set | 846 | CONFIG_HW_RANDOM=y |
| 645 | # CONFIG_NVRAM is not set | 847 | # CONFIG_NVRAM is not set |
| 646 | CONFIG_GEN_RTC=y | 848 | CONFIG_GEN_RTC=y |
| 647 | # CONFIG_GEN_RTC_X is not set | 849 | # CONFIG_GEN_RTC_X is not set |
| 648 | # CONFIG_R3964 is not set | 850 | # CONFIG_R3964 is not set |
| 851 | # CONFIG_APPLICOM is not set | ||
| 649 | # CONFIG_RAW_DRIVER is not set | 852 | # CONFIG_RAW_DRIVER is not set |
| 650 | # CONFIG_TCG_TPM is not set | 853 | # CONFIG_TCG_TPM is not set |
| 854 | CONFIG_DEVPORT=y | ||
| 651 | CONFIG_I2C=y | 855 | CONFIG_I2C=y |
| 652 | CONFIG_I2C_BOARDINFO=y | 856 | CONFIG_I2C_BOARDINFO=y |
| 653 | CONFIG_I2C_CHARDEV=y | 857 | CONFIG_I2C_CHARDEV=y |
| 858 | CONFIG_I2C_HELPER_AUTO=y | ||
| 654 | 859 | ||
| 655 | # | 860 | # |
| 656 | # I2C Hardware Bus support | 861 | # I2C Hardware Bus support |
| 657 | # | 862 | # |
| 863 | |||
| 864 | # | ||
| 865 | # PC SMBus host controller drivers | ||
| 866 | # | ||
| 867 | # CONFIG_I2C_ALI1535 is not set | ||
| 868 | # CONFIG_I2C_ALI1563 is not set | ||
| 869 | # CONFIG_I2C_ALI15X3 is not set | ||
| 870 | # CONFIG_I2C_AMD756 is not set | ||
| 871 | # CONFIG_I2C_AMD8111 is not set | ||
| 872 | # CONFIG_I2C_I801 is not set | ||
| 873 | # CONFIG_I2C_ISCH is not set | ||
| 874 | # CONFIG_I2C_PIIX4 is not set | ||
| 875 | # CONFIG_I2C_NFORCE2 is not set | ||
| 876 | # CONFIG_I2C_SIS5595 is not set | ||
| 877 | # CONFIG_I2C_SIS630 is not set | ||
| 878 | # CONFIG_I2C_SIS96X is not set | ||
| 879 | # CONFIG_I2C_VIA is not set | ||
| 880 | # CONFIG_I2C_VIAPRO is not set | ||
| 881 | |||
| 882 | # | ||
| 883 | # Mac SMBus host controller drivers | ||
| 884 | # | ||
| 885 | # CONFIG_I2C_HYDRA is not set | ||
| 886 | CONFIG_I2C_POWERMAC=y | ||
| 887 | |||
| 888 | # | ||
| 889 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 890 | # | ||
| 891 | # CONFIG_I2C_GPIO is not set | ||
| 658 | CONFIG_I2C_MPC=y | 892 | CONFIG_I2C_MPC=y |
| 659 | # CONFIG_I2C_OCORES is not set | 893 | # CONFIG_I2C_OCORES is not set |
| 660 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 661 | # CONFIG_I2C_SIMTEC is not set | 894 | # CONFIG_I2C_SIMTEC is not set |
| 895 | |||
| 896 | # | ||
| 897 | # External I2C/SMBus adapter drivers | ||
| 898 | # | ||
| 899 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 662 | # CONFIG_I2C_TAOS_EVM is not set | 900 | # CONFIG_I2C_TAOS_EVM is not set |
| 663 | # CONFIG_I2C_STUB is not set | ||
| 664 | # CONFIG_I2C_TINY_USB is not set | 901 | # CONFIG_I2C_TINY_USB is not set |
| 902 | |||
| 903 | # | ||
| 904 | # Graphics adapter I2C/DDC channel drivers | ||
| 905 | # | ||
| 906 | # CONFIG_I2C_VOODOO3 is not set | ||
| 907 | |||
| 908 | # | ||
| 909 | # Other I2C/SMBus bus drivers | ||
| 910 | # | ||
| 665 | # CONFIG_I2C_PCA_PLATFORM is not set | 911 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 912 | # CONFIG_I2C_STUB is not set | ||
| 666 | 913 | ||
| 667 | # | 914 | # |
| 668 | # Miscellaneous I2C Chip support | 915 | # Miscellaneous I2C Chip support |
| 669 | # | 916 | # |
| 670 | # CONFIG_DS1682 is not set | 917 | # CONFIG_DS1682 is not set |
| 918 | # CONFIG_AT24 is not set | ||
| 671 | # CONFIG_SENSORS_EEPROM is not set | 919 | # CONFIG_SENSORS_EEPROM is not set |
| 672 | # CONFIG_SENSORS_PCF8574 is not set | 920 | # CONFIG_SENSORS_PCF8574 is not set |
| 673 | # CONFIG_PCF8575 is not set | 921 | # CONFIG_PCF8575 is not set |
| 922 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 674 | # CONFIG_SENSORS_PCF8591 is not set | 923 | # CONFIG_SENSORS_PCF8591 is not set |
| 924 | # CONFIG_TPS65010 is not set | ||
| 675 | # CONFIG_SENSORS_MAX6875 is not set | 925 | # CONFIG_SENSORS_MAX6875 is not set |
| 676 | # CONFIG_SENSORS_TSL2550 is not set | 926 | # CONFIG_SENSORS_TSL2550 is not set |
| 677 | # CONFIG_I2C_DEBUG_CORE is not set | 927 | # CONFIG_I2C_DEBUG_CORE is not set |
| @@ -679,10 +929,31 @@ CONFIG_I2C_MPC=y | |||
| 679 | # CONFIG_I2C_DEBUG_BUS is not set | 929 | # CONFIG_I2C_DEBUG_BUS is not set |
| 680 | # CONFIG_I2C_DEBUG_CHIP is not set | 930 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 681 | # CONFIG_SPI is not set | 931 | # CONFIG_SPI is not set |
| 932 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 933 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | ||
| 934 | CONFIG_GPIOLIB=y | ||
| 935 | # CONFIG_GPIO_SYSFS is not set | ||
| 936 | |||
| 937 | # | ||
| 938 | # I2C GPIO expanders: | ||
| 939 | # | ||
| 940 | # CONFIG_GPIO_MAX732X is not set | ||
| 941 | # CONFIG_GPIO_PCA953X is not set | ||
| 942 | # CONFIG_GPIO_PCF857X is not set | ||
| 943 | |||
| 944 | # | ||
| 945 | # PCI GPIO expanders: | ||
| 946 | # | ||
| 947 | # CONFIG_GPIO_BT8XX is not set | ||
| 948 | |||
| 949 | # | ||
| 950 | # SPI GPIO expanders: | ||
| 951 | # | ||
| 682 | # CONFIG_W1 is not set | 952 | # CONFIG_W1 is not set |
| 683 | # CONFIG_POWER_SUPPLY is not set | 953 | # CONFIG_POWER_SUPPLY is not set |
| 684 | CONFIG_HWMON=y | 954 | CONFIG_HWMON=y |
| 685 | # CONFIG_HWMON_VID is not set | 955 | # CONFIG_HWMON_VID is not set |
| 956 | # CONFIG_SENSORS_AD7414 is not set | ||
| 686 | # CONFIG_SENSORS_AD7418 is not set | 957 | # CONFIG_SENSORS_AD7418 is not set |
| 687 | # CONFIG_SENSORS_ADM1021 is not set | 958 | # CONFIG_SENSORS_ADM1021 is not set |
| 688 | # CONFIG_SENSORS_ADM1025 is not set | 959 | # CONFIG_SENSORS_ADM1025 is not set |
| @@ -692,8 +963,10 @@ CONFIG_HWMON=y | |||
| 692 | # CONFIG_SENSORS_ADM9240 is not set | 963 | # CONFIG_SENSORS_ADM9240 is not set |
| 693 | # CONFIG_SENSORS_ADT7470 is not set | 964 | # CONFIG_SENSORS_ADT7470 is not set |
| 694 | # CONFIG_SENSORS_ADT7473 is not set | 965 | # CONFIG_SENSORS_ADT7473 is not set |
| 966 | # CONFIG_SENSORS_AMS is not set | ||
| 695 | # CONFIG_SENSORS_ATXP1 is not set | 967 | # CONFIG_SENSORS_ATXP1 is not set |
| 696 | # CONFIG_SENSORS_DS1621 is not set | 968 | # CONFIG_SENSORS_DS1621 is not set |
| 969 | # CONFIG_SENSORS_I5K_AMB is not set | ||
| 697 | # CONFIG_SENSORS_F71805F is not set | 970 | # CONFIG_SENSORS_F71805F is not set |
| 698 | # CONFIG_SENSORS_F71882FG is not set | 971 | # CONFIG_SENSORS_F71882FG is not set |
| 699 | # CONFIG_SENSORS_F75375S is not set | 972 | # CONFIG_SENSORS_F75375S is not set |
| @@ -715,13 +988,16 @@ CONFIG_HWMON=y | |||
| 715 | # CONFIG_SENSORS_MAX6650 is not set | 988 | # CONFIG_SENSORS_MAX6650 is not set |
| 716 | # CONFIG_SENSORS_PC87360 is not set | 989 | # CONFIG_SENSORS_PC87360 is not set |
| 717 | # CONFIG_SENSORS_PC87427 is not set | 990 | # CONFIG_SENSORS_PC87427 is not set |
| 991 | # CONFIG_SENSORS_SIS5595 is not set | ||
| 718 | # CONFIG_SENSORS_DME1737 is not set | 992 | # CONFIG_SENSORS_DME1737 is not set |
| 719 | # CONFIG_SENSORS_SMSC47M1 is not set | 993 | # CONFIG_SENSORS_SMSC47M1 is not set |
| 720 | # CONFIG_SENSORS_SMSC47M192 is not set | 994 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 721 | # CONFIG_SENSORS_SMSC47B397 is not set | 995 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 722 | # CONFIG_SENSORS_ADS7828 is not set | 996 | # CONFIG_SENSORS_ADS7828 is not set |
| 723 | # CONFIG_SENSORS_THMC50 is not set | 997 | # CONFIG_SENSORS_THMC50 is not set |
| 998 | # CONFIG_SENSORS_VIA686A is not set | ||
| 724 | # CONFIG_SENSORS_VT1211 is not set | 999 | # CONFIG_SENSORS_VT1211 is not set |
| 1000 | # CONFIG_SENSORS_VT8231 is not set | ||
| 725 | # CONFIG_SENSORS_W83781D is not set | 1001 | # CONFIG_SENSORS_W83781D is not set |
| 726 | # CONFIG_SENSORS_W83791D is not set | 1002 | # CONFIG_SENSORS_W83791D is not set |
| 727 | # CONFIG_SENSORS_W83792D is not set | 1003 | # CONFIG_SENSORS_W83792D is not set |
| @@ -732,6 +1008,7 @@ CONFIG_HWMON=y | |||
| 732 | # CONFIG_SENSORS_W83627EHF is not set | 1008 | # CONFIG_SENSORS_W83627EHF is not set |
| 733 | # CONFIG_HWMON_DEBUG_CHIP is not set | 1009 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 734 | # CONFIG_THERMAL is not set | 1010 | # CONFIG_THERMAL is not set |
| 1011 | # CONFIG_THERMAL_HWMON is not set | ||
| 735 | CONFIG_WATCHDOG=y | 1012 | CONFIG_WATCHDOG=y |
| 736 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 1013 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
| 737 | 1014 | ||
| @@ -739,7 +1016,15 @@ CONFIG_WATCHDOG=y | |||
| 739 | # Watchdog Device Drivers | 1016 | # Watchdog Device Drivers |
| 740 | # | 1017 | # |
| 741 | # CONFIG_SOFT_WATCHDOG is not set | 1018 | # CONFIG_SOFT_WATCHDOG is not set |
| 742 | CONFIG_83xx_WDT=y | 1019 | # CONFIG_ALIM7101_WDT is not set |
| 1020 | # CONFIG_8xxx_WDT is not set | ||
| 1021 | # CONFIG_WATCHDOG_RTAS is not set | ||
| 1022 | |||
| 1023 | # | ||
| 1024 | # PCI-based Watchdog Cards | ||
| 1025 | # | ||
| 1026 | # CONFIG_PCIPCWATCHDOG is not set | ||
| 1027 | # CONFIG_WDTPCI is not set | ||
| 743 | 1028 | ||
| 744 | # | 1029 | # |
| 745 | # USB-based Watchdog Cards | 1030 | # USB-based Watchdog Cards |
| @@ -755,8 +1040,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 755 | # | 1040 | # |
| 756 | # Multifunction device drivers | 1041 | # Multifunction device drivers |
| 757 | # | 1042 | # |
| 1043 | # CONFIG_MFD_CORE is not set | ||
| 758 | # CONFIG_MFD_SM501 is not set | 1044 | # CONFIG_MFD_SM501 is not set |
| 759 | # CONFIG_HTC_PASIC3 is not set | 1045 | # CONFIG_HTC_PASIC3 is not set |
| 1046 | # CONFIG_MFD_TMIO is not set | ||
| 760 | 1047 | ||
| 761 | # | 1048 | # |
| 762 | # Multimedia devices | 1049 | # Multimedia devices |
| @@ -778,6 +1065,8 @@ CONFIG_DAB=y | |||
| 778 | # | 1065 | # |
| 779 | # Graphics support | 1066 | # Graphics support |
| 780 | # | 1067 | # |
| 1068 | # CONFIG_AGP is not set | ||
| 1069 | # CONFIG_DRM is not set | ||
| 781 | # CONFIG_VGASTATE is not set | 1070 | # CONFIG_VGASTATE is not set |
| 782 | CONFIG_VIDEO_OUTPUT_CONTROL=m | 1071 | CONFIG_VIDEO_OUTPUT_CONTROL=m |
| 783 | # CONFIG_FB is not set | 1072 | # CONFIG_FB is not set |
| @@ -787,10 +1076,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m | |||
| 787 | # Display device support | 1076 | # Display device support |
| 788 | # | 1077 | # |
| 789 | # CONFIG_DISPLAY_SUPPORT is not set | 1078 | # CONFIG_DISPLAY_SUPPORT is not set |
| 790 | |||
| 791 | # | ||
| 792 | # Sound | ||
| 793 | # | ||
| 794 | # CONFIG_SOUND is not set | 1079 | # CONFIG_SOUND is not set |
| 795 | CONFIG_HID_SUPPORT=y | 1080 | CONFIG_HID_SUPPORT=y |
| 796 | CONFIG_HID=y | 1081 | CONFIG_HID=y |
| @@ -806,7 +1091,7 @@ CONFIG_USB_HID=y | |||
| 806 | # CONFIG_USB_HIDDEV is not set | 1091 | # CONFIG_USB_HIDDEV is not set |
| 807 | CONFIG_USB_SUPPORT=y | 1092 | CONFIG_USB_SUPPORT=y |
| 808 | CONFIG_USB_ARCH_HAS_HCD=y | 1093 | CONFIG_USB_ARCH_HAS_HCD=y |
| 809 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 1094 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 810 | CONFIG_USB_ARCH_HAS_EHCI=y | 1095 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 811 | CONFIG_USB=y | 1096 | CONFIG_USB=y |
| 812 | # CONFIG_USB_DEBUG is not set | 1097 | # CONFIG_USB_DEBUG is not set |
| @@ -821,6 +1106,7 @@ CONFIG_USB_DEVICE_CLASS=y | |||
| 821 | # CONFIG_USB_OTG is not set | 1106 | # CONFIG_USB_OTG is not set |
| 822 | # CONFIG_USB_OTG_WHITELIST is not set | 1107 | # CONFIG_USB_OTG_WHITELIST is not set |
| 823 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 1108 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
| 1109 | CONFIG_USB_MON=y | ||
| 824 | 1110 | ||
| 825 | # | 1111 | # |
| 826 | # USB Host Controller Drivers | 1112 | # USB Host Controller Drivers |
| @@ -833,6 +1119,8 @@ CONFIG_USB_EHCI_FSL=y | |||
| 833 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 1119 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
| 834 | # CONFIG_USB_ISP116X_HCD is not set | 1120 | # CONFIG_USB_ISP116X_HCD is not set |
| 835 | # CONFIG_USB_ISP1760_HCD is not set | 1121 | # CONFIG_USB_ISP1760_HCD is not set |
| 1122 | # CONFIG_USB_OHCI_HCD is not set | ||
| 1123 | # CONFIG_USB_UHCI_HCD is not set | ||
| 836 | # CONFIG_USB_SL811_HCD is not set | 1124 | # CONFIG_USB_SL811_HCD is not set |
| 837 | # CONFIG_USB_R8A66597_HCD is not set | 1125 | # CONFIG_USB_R8A66597_HCD is not set |
| 838 | 1126 | ||
| @@ -858,7 +1146,6 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y | |||
| 858 | # | 1146 | # |
| 859 | # CONFIG_USB_MDC800 is not set | 1147 | # CONFIG_USB_MDC800 is not set |
| 860 | # CONFIG_USB_MICROTEK is not set | 1148 | # CONFIG_USB_MICROTEK is not set |
| 861 | CONFIG_USB_MON=y | ||
| 862 | 1149 | ||
| 863 | # | 1150 | # |
| 864 | # USB port drivers | 1151 | # USB port drivers |
| @@ -871,7 +1158,6 @@ CONFIG_USB_MON=y | |||
| 871 | # CONFIG_USB_EMI62 is not set | 1158 | # CONFIG_USB_EMI62 is not set |
| 872 | # CONFIG_USB_EMI26 is not set | 1159 | # CONFIG_USB_EMI26 is not set |
| 873 | # CONFIG_USB_ADUTUX is not set | 1160 | # CONFIG_USB_ADUTUX is not set |
| 874 | # CONFIG_USB_AUERSWALD is not set | ||
| 875 | # CONFIG_USB_RIO500 is not set | 1161 | # CONFIG_USB_RIO500 is not set |
| 876 | # CONFIG_USB_LEGOTOWER is not set | 1162 | # CONFIG_USB_LEGOTOWER is not set |
| 877 | # CONFIG_USB_LCD is not set | 1163 | # CONFIG_USB_LCD is not set |
| @@ -893,6 +1179,7 @@ CONFIG_USB_MON=y | |||
| 893 | # CONFIG_MEMSTICK is not set | 1179 | # CONFIG_MEMSTICK is not set |
| 894 | # CONFIG_NEW_LEDS is not set | 1180 | # CONFIG_NEW_LEDS is not set |
| 895 | # CONFIG_ACCESSIBILITY is not set | 1181 | # CONFIG_ACCESSIBILITY is not set |
| 1182 | # CONFIG_INFINIBAND is not set | ||
| 896 | # CONFIG_EDAC is not set | 1183 | # CONFIG_EDAC is not set |
| 897 | # CONFIG_RTC_CLASS is not set | 1184 | # CONFIG_RTC_CLASS is not set |
| 898 | # CONFIG_DMADEVICES is not set | 1185 | # CONFIG_DMADEVICES is not set |
| @@ -963,6 +1250,7 @@ CONFIG_TMPFS=y | |||
| 963 | # CONFIG_CRAMFS is not set | 1250 | # CONFIG_CRAMFS is not set |
| 964 | # CONFIG_VXFS_FS is not set | 1251 | # CONFIG_VXFS_FS is not set |
| 965 | # CONFIG_MINIX_FS is not set | 1252 | # CONFIG_MINIX_FS is not set |
| 1253 | # CONFIG_OMFS_FS is not set | ||
| 966 | # CONFIG_HPFS_FS is not set | 1254 | # CONFIG_HPFS_FS is not set |
| 967 | # CONFIG_QNX4FS_FS is not set | 1255 | # CONFIG_QNX4FS_FS is not set |
| 968 | # CONFIG_ROMFS_FS is not set | 1256 | # CONFIG_ROMFS_FS is not set |
| @@ -973,14 +1261,13 @@ CONFIG_NFS_FS=y | |||
| 973 | CONFIG_NFS_V3=y | 1261 | CONFIG_NFS_V3=y |
| 974 | # CONFIG_NFS_V3_ACL is not set | 1262 | # CONFIG_NFS_V3_ACL is not set |
| 975 | CONFIG_NFS_V4=y | 1263 | CONFIG_NFS_V4=y |
| 976 | # CONFIG_NFSD is not set | ||
| 977 | CONFIG_ROOT_NFS=y | 1264 | CONFIG_ROOT_NFS=y |
| 1265 | # CONFIG_NFSD is not set | ||
| 978 | CONFIG_LOCKD=y | 1266 | CONFIG_LOCKD=y |
| 979 | CONFIG_LOCKD_V4=y | 1267 | CONFIG_LOCKD_V4=y |
| 980 | CONFIG_NFS_COMMON=y | 1268 | CONFIG_NFS_COMMON=y |
| 981 | CONFIG_SUNRPC=y | 1269 | CONFIG_SUNRPC=y |
| 982 | CONFIG_SUNRPC_GSS=y | 1270 | CONFIG_SUNRPC_GSS=y |
| 983 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 984 | CONFIG_RPCSEC_GSS_KRB5=y | 1271 | CONFIG_RPCSEC_GSS_KRB5=y |
| 985 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1272 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 986 | # CONFIG_SMB_FS is not set | 1273 | # CONFIG_SMB_FS is not set |
| @@ -1014,6 +1301,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 1014 | # CONFIG_DLM is not set | 1301 | # CONFIG_DLM is not set |
| 1015 | CONFIG_UCC_FAST=y | 1302 | CONFIG_UCC_FAST=y |
| 1016 | CONFIG_UCC=y | 1303 | CONFIG_UCC=y |
| 1304 | CONFIG_QE_GPIO=y | ||
| 1017 | 1305 | ||
| 1018 | # | 1306 | # |
| 1019 | # Library routines | 1307 | # Library routines |
| @@ -1022,6 +1310,7 @@ CONFIG_BITREVERSE=y | |||
| 1022 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1310 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 1023 | # CONFIG_CRC_CCITT is not set | 1311 | # CONFIG_CRC_CCITT is not set |
| 1024 | # CONFIG_CRC16 is not set | 1312 | # CONFIG_CRC16 is not set |
| 1313 | CONFIG_CRC_T10DIF=y | ||
| 1025 | # CONFIG_CRC_ITU_T is not set | 1314 | # CONFIG_CRC_ITU_T is not set |
| 1026 | CONFIG_CRC32=y | 1315 | CONFIG_CRC32=y |
| 1027 | # CONFIG_CRC7 is not set | 1316 | # CONFIG_CRC7 is not set |
| @@ -1045,8 +1334,18 @@ CONFIG_FRAME_WARN=1024 | |||
| 1045 | # CONFIG_HEADERS_CHECK is not set | 1334 | # CONFIG_HEADERS_CHECK is not set |
| 1046 | # CONFIG_DEBUG_KERNEL is not set | 1335 | # CONFIG_DEBUG_KERNEL is not set |
| 1047 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1336 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1337 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 1338 | # CONFIG_LATENCYTOP is not set | ||
| 1339 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1340 | CONFIG_HAVE_FTRACE=y | ||
| 1341 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1342 | # CONFIG_FTRACE is not set | ||
| 1343 | # CONFIG_SCHED_TRACER is not set | ||
| 1344 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1048 | # CONFIG_SAMPLES is not set | 1345 | # CONFIG_SAMPLES is not set |
| 1346 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1049 | # CONFIG_IRQSTACKS is not set | 1347 | # CONFIG_IRQSTACKS is not set |
| 1348 | # CONFIG_BOOTX_TEXT is not set | ||
| 1050 | # CONFIG_PPC_EARLY_DEBUG is not set | 1349 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1051 | 1350 | ||
| 1052 | # | 1351 | # |
| @@ -1061,12 +1360,14 @@ CONFIG_CRYPTO=y | |||
| 1061 | # Crypto core or helper | 1360 | # Crypto core or helper |
| 1062 | # | 1361 | # |
| 1063 | CONFIG_CRYPTO_ALGAPI=y | 1362 | CONFIG_CRYPTO_ALGAPI=y |
| 1363 | CONFIG_CRYPTO_AEAD=y | ||
| 1064 | CONFIG_CRYPTO_BLKCIPHER=y | 1364 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1365 | CONFIG_CRYPTO_HASH=y | ||
| 1065 | CONFIG_CRYPTO_MANAGER=y | 1366 | CONFIG_CRYPTO_MANAGER=y |
| 1066 | # CONFIG_CRYPTO_GF128MUL is not set | 1367 | # CONFIG_CRYPTO_GF128MUL is not set |
| 1067 | # CONFIG_CRYPTO_NULL is not set | 1368 | # CONFIG_CRYPTO_NULL is not set |
| 1068 | # CONFIG_CRYPTO_CRYPTD is not set | 1369 | # CONFIG_CRYPTO_CRYPTD is not set |
| 1069 | # CONFIG_CRYPTO_AUTHENC is not set | 1370 | CONFIG_CRYPTO_AUTHENC=y |
| 1070 | # CONFIG_CRYPTO_TEST is not set | 1371 | # CONFIG_CRYPTO_TEST is not set |
| 1071 | 1372 | ||
| 1072 | # | 1373 | # |
| @@ -1100,6 +1401,10 @@ CONFIG_CRYPTO_PCBC=m | |||
| 1100 | # CONFIG_CRYPTO_MD4 is not set | 1401 | # CONFIG_CRYPTO_MD4 is not set |
| 1101 | CONFIG_CRYPTO_MD5=y | 1402 | CONFIG_CRYPTO_MD5=y |
| 1102 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1403 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 1404 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1405 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1406 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1407 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1103 | # CONFIG_CRYPTO_SHA1 is not set | 1408 | # CONFIG_CRYPTO_SHA1 is not set |
| 1104 | # CONFIG_CRYPTO_SHA256 is not set | 1409 | # CONFIG_CRYPTO_SHA256 is not set |
| 1105 | # CONFIG_CRYPTO_SHA512 is not set | 1410 | # CONFIG_CRYPTO_SHA512 is not set |
| @@ -1131,6 +1436,8 @@ CONFIG_CRYPTO_DES=y | |||
| 1131 | # CONFIG_CRYPTO_DEFLATE is not set | 1436 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1132 | # CONFIG_CRYPTO_LZO is not set | 1437 | # CONFIG_CRYPTO_LZO is not set |
| 1133 | CONFIG_CRYPTO_HW=y | 1438 | CONFIG_CRYPTO_HW=y |
| 1439 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | ||
| 1440 | CONFIG_CRYPTO_DEV_TALITOS=y | ||
| 1134 | # CONFIG_PPC_CLOCK is not set | 1441 | # CONFIG_PPC_CLOCK is not set |
| 1135 | CONFIG_PPC_LIB_RHEAP=y | 1442 | CONFIG_PPC_LIB_RHEAP=y |
| 1136 | # CONFIG_VIRTUALIZATION is not set | 1443 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig index fa0170504b88..f0a13bebf50c 100644 --- a/arch/powerpc/configs/mpc85xx_defconfig +++ b/arch/powerpc/configs/mpc85xx_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.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Mon Jun 9 09:03:46 2008 | 4 | # Thu Aug 21 07:15:20 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -15,6 +15,7 @@ CONFIG_PPC_85xx=y | |||
| 15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
| 16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
| 17 | CONFIG_E500=y | 17 | CONFIG_E500=y |
| 18 | # CONFIG_PPC_E500MC is not set | ||
| 18 | CONFIG_BOOKE=y | 19 | CONFIG_BOOKE=y |
| 19 | CONFIG_FSL_BOOKE=y | 20 | CONFIG_FSL_BOOKE=y |
| 20 | CONFIG_FSL_EMB_PERFMON=y | 21 | CONFIG_FSL_EMB_PERFMON=y |
| @@ -33,12 +34,14 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 35 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | 36 | CONFIG_STACKTRACE_SUPPORT=y |
| 37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | 38 | CONFIG_LOCKDEP_SUPPORT=y |
| 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 38 | CONFIG_ARCH_HAS_ILOG2_U32=y | 40 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 39 | CONFIG_GENERIC_HWEIGHT=y | 41 | CONFIG_GENERIC_HWEIGHT=y |
| 40 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 42 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 41 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 43 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 44 | CONFIG_GENERIC_GPIO=y | ||
| 42 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 45 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
| 43 | CONFIG_PPC=y | 46 | CONFIG_PPC=y |
| 44 | CONFIG_EARLY_PRINTK=y | 47 | CONFIG_EARLY_PRINTK=y |
| @@ -92,7 +95,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 92 | CONFIG_SYSCTL=y | 95 | CONFIG_SYSCTL=y |
| 93 | CONFIG_EMBEDDED=y | 96 | CONFIG_EMBEDDED=y |
| 94 | CONFIG_SYSCTL_SYSCALL=y | 97 | CONFIG_SYSCTL_SYSCALL=y |
| 95 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 96 | CONFIG_KALLSYMS=y | 98 | CONFIG_KALLSYMS=y |
| 97 | CONFIG_KALLSYMS_ALL=y | 99 | CONFIG_KALLSYMS_ALL=y |
| 98 | CONFIG_KALLSYMS_EXTRA_PASS=y | 100 | CONFIG_KALLSYMS_EXTRA_PASS=y |
| @@ -118,10 +120,16 @@ CONFIG_SLUB=y | |||
| 118 | # CONFIG_MARKERS is not set | 120 | # CONFIG_MARKERS is not set |
| 119 | CONFIG_HAVE_OPROFILE=y | 121 | CONFIG_HAVE_OPROFILE=y |
| 120 | # CONFIG_KPROBES is not set | 122 | # CONFIG_KPROBES is not set |
| 123 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 124 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 121 | CONFIG_HAVE_KPROBES=y | 125 | CONFIG_HAVE_KPROBES=y |
| 122 | CONFIG_HAVE_KRETPROBES=y | 126 | CONFIG_HAVE_KRETPROBES=y |
| 127 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 123 | # CONFIG_HAVE_DMA_ATTRS is not set | 128 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 129 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 130 | CONFIG_HAVE_CLK=y | ||
| 124 | CONFIG_PROC_PAGE_MONITOR=y | 131 | CONFIG_PROC_PAGE_MONITOR=y |
| 132 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 125 | CONFIG_SLABINFO=y | 133 | CONFIG_SLABINFO=y |
| 126 | CONFIG_RT_MUTEXES=y | 134 | CONFIG_RT_MUTEXES=y |
| 127 | # CONFIG_TINY_SHMEM is not set | 135 | # CONFIG_TINY_SHMEM is not set |
| @@ -138,6 +146,7 @@ CONFIG_LBD=y | |||
| 138 | # CONFIG_BLK_DEV_IO_TRACE is not set | 146 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 139 | # CONFIG_LSF is not set | 147 | # CONFIG_LSF is not set |
| 140 | # CONFIG_BLK_DEV_BSG is not set | 148 | # CONFIG_BLK_DEV_BSG is not set |
| 149 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 141 | 150 | ||
| 142 | # | 151 | # |
| 143 | # IO Schedulers | 152 | # IO Schedulers |
| @@ -156,8 +165,6 @@ CONFIG_CLASSIC_RCU=y | |||
| 156 | # | 165 | # |
| 157 | # Platform support | 166 | # Platform support |
| 158 | # | 167 | # |
| 159 | # CONFIG_PPC_MPC512x is not set | ||
| 160 | # CONFIG_PPC_MPC5121 is not set | ||
| 161 | # CONFIG_PPC_CELL is not set | 168 | # CONFIG_PPC_CELL is not set |
| 162 | # CONFIG_PPC_CELL_NATIVE is not set | 169 | # CONFIG_PPC_CELL_NATIVE is not set |
| 163 | # CONFIG_PQ2ADS is not set | 170 | # CONFIG_PQ2ADS is not set |
| @@ -166,11 +173,13 @@ CONFIG_MPC8540_ADS=y | |||
| 166 | CONFIG_MPC8560_ADS=y | 173 | CONFIG_MPC8560_ADS=y |
| 167 | CONFIG_MPC85xx_CDS=y | 174 | CONFIG_MPC85xx_CDS=y |
| 168 | CONFIG_MPC85xx_MDS=y | 175 | CONFIG_MPC85xx_MDS=y |
| 176 | CONFIG_MPC8536_DS=y | ||
| 169 | CONFIG_MPC85xx_DS=y | 177 | CONFIG_MPC85xx_DS=y |
| 170 | CONFIG_KSI8560=y | 178 | CONFIG_KSI8560=y |
| 171 | # CONFIG_STX_GP3 is not set | 179 | # CONFIG_STX_GP3 is not set |
| 172 | CONFIG_TQM8540=y | 180 | CONFIG_TQM8540=y |
| 173 | CONFIG_TQM8541=y | 181 | CONFIG_TQM8541=y |
| 182 | CONFIG_TQM8548=y | ||
| 174 | CONFIG_TQM8555=y | 183 | CONFIG_TQM8555=y |
| 175 | CONFIG_TQM8560=y | 184 | CONFIG_TQM8560=y |
| 176 | CONFIG_SBC8548=y | 185 | CONFIG_SBC8548=y |
| @@ -189,7 +198,6 @@ CONFIG_PPC_I8259=y | |||
| 189 | # CONFIG_CPU_FREQ is not set | 198 | # CONFIG_CPU_FREQ is not set |
| 190 | CONFIG_QUICC_ENGINE=y | 199 | CONFIG_QUICC_ENGINE=y |
| 191 | CONFIG_CPM2=y | 200 | CONFIG_CPM2=y |
| 192 | CONFIG_PPC_CPM_NEW_BINDING=y | ||
| 193 | CONFIG_FSL_ULI1575=y | 201 | CONFIG_FSL_ULI1575=y |
| 194 | CONFIG_CPM=y | 202 | CONFIG_CPM=y |
| 195 | 203 | ||
| @@ -206,7 +214,7 @@ CONFIG_HZ_250=y | |||
| 206 | # CONFIG_HZ_300 is not set | 214 | # CONFIG_HZ_300 is not set |
| 207 | # CONFIG_HZ_1000 is not set | 215 | # CONFIG_HZ_1000 is not set |
| 208 | CONFIG_HZ=250 | 216 | CONFIG_HZ=250 |
| 209 | # CONFIG_SCHED_HRTICK is not set | 217 | CONFIG_SCHED_HRTICK=y |
| 210 | CONFIG_PREEMPT_NONE=y | 218 | CONFIG_PREEMPT_NONE=y |
| 211 | # CONFIG_PREEMPT_VOLUNTARY is not set | 219 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 212 | # CONFIG_PREEMPT is not set | 220 | # CONFIG_PREEMPT is not set |
| @@ -229,6 +237,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 229 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 237 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 230 | CONFIG_PAGEFLAGS_EXTENDED=y | 238 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 231 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 239 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 240 | CONFIG_MIGRATION=y | ||
| 232 | # CONFIG_RESOURCES_64BIT is not set | 241 | # CONFIG_RESOURCES_64BIT is not set |
| 233 | CONFIG_ZONE_DMA_FLAG=1 | 242 | CONFIG_ZONE_DMA_FLAG=1 |
| 234 | CONFIG_BOUNCE=y | 243 | CONFIG_BOUNCE=y |
| @@ -236,6 +245,7 @@ CONFIG_VIRT_TO_BUS=y | |||
| 236 | CONFIG_FORCE_MAX_ZONEORDER=11 | 245 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 237 | CONFIG_PROC_DEVICETREE=y | 246 | CONFIG_PROC_DEVICETREE=y |
| 238 | # CONFIG_CMDLINE_BOOL is not set | 247 | # CONFIG_CMDLINE_BOOL is not set |
| 248 | CONFIG_EXTRA_TARGETS="" | ||
| 239 | # CONFIG_PM is not set | 249 | # CONFIG_PM is not set |
| 240 | CONFIG_SECCOMP=y | 250 | CONFIG_SECCOMP=y |
| 241 | CONFIG_ISA_DMA_API=y | 251 | CONFIG_ISA_DMA_API=y |
| @@ -248,6 +258,7 @@ CONFIG_GENERIC_ISA_DMA=y | |||
| 248 | CONFIG_PPC_INDIRECT_PCI=y | 258 | CONFIG_PPC_INDIRECT_PCI=y |
| 249 | CONFIG_FSL_SOC=y | 259 | CONFIG_FSL_SOC=y |
| 250 | CONFIG_FSL_PCI=y | 260 | CONFIG_FSL_PCI=y |
| 261 | CONFIG_PPC_PCI_CHOICE=y | ||
| 251 | CONFIG_PCI=y | 262 | CONFIG_PCI=y |
| 252 | CONFIG_PCI_DOMAINS=y | 263 | CONFIG_PCI_DOMAINS=y |
| 253 | CONFIG_PCI_SYSCALL=y | 264 | CONFIG_PCI_SYSCALL=y |
| @@ -274,10 +285,6 @@ CONFIG_KERNEL_START=0xc0000000 | |||
| 274 | CONFIG_PHYSICAL_START=0x00000000 | 285 | CONFIG_PHYSICAL_START=0x00000000 |
| 275 | CONFIG_PHYSICAL_ALIGN=0x10000000 | 286 | CONFIG_PHYSICAL_ALIGN=0x10000000 |
| 276 | CONFIG_TASK_SIZE=0xc0000000 | 287 | CONFIG_TASK_SIZE=0xc0000000 |
| 277 | |||
| 278 | # | ||
| 279 | # Networking | ||
| 280 | # | ||
| 281 | CONFIG_NET=y | 288 | CONFIG_NET=y |
| 282 | 289 | ||
| 283 | # | 290 | # |
| @@ -403,12 +410,15 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | |||
| 403 | CONFIG_STANDALONE=y | 410 | CONFIG_STANDALONE=y |
| 404 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 411 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 405 | CONFIG_FW_LOADER=y | 412 | CONFIG_FW_LOADER=y |
| 413 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
| 414 | CONFIG_EXTRA_FIRMWARE="" | ||
| 406 | # CONFIG_DEBUG_DRIVER is not set | 415 | # CONFIG_DEBUG_DRIVER is not set |
| 407 | # CONFIG_DEBUG_DEVRES is not set | 416 | # CONFIG_DEBUG_DEVRES is not set |
| 408 | # CONFIG_SYS_HYPERVISOR is not set | 417 | # CONFIG_SYS_HYPERVISOR is not set |
| 409 | # CONFIG_CONNECTOR is not set | 418 | # CONFIG_CONNECTOR is not set |
| 410 | # CONFIG_MTD is not set | 419 | # CONFIG_MTD is not set |
| 411 | CONFIG_OF_DEVICE=y | 420 | CONFIG_OF_DEVICE=y |
| 421 | CONFIG_OF_GPIO=y | ||
| 412 | CONFIG_OF_I2C=y | 422 | CONFIG_OF_I2C=y |
| 413 | # CONFIG_PARPORT is not set | 423 | # CONFIG_PARPORT is not set |
| 414 | CONFIG_BLK_DEV=y | 424 | CONFIG_BLK_DEV=y |
| @@ -429,12 +439,14 @@ CONFIG_BLK_DEV_RAM_SIZE=131072 | |||
| 429 | # CONFIG_BLK_DEV_XIP is not set | 439 | # CONFIG_BLK_DEV_XIP is not set |
| 430 | # CONFIG_CDROM_PKTCDVD is not set | 440 | # CONFIG_CDROM_PKTCDVD is not set |
| 431 | # CONFIG_ATA_OVER_ETH is not set | 441 | # CONFIG_ATA_OVER_ETH is not set |
| 442 | # CONFIG_BLK_DEV_HD is not set | ||
| 432 | CONFIG_MISC_DEVICES=y | 443 | CONFIG_MISC_DEVICES=y |
| 433 | # CONFIG_PHANTOM is not set | 444 | # CONFIG_PHANTOM is not set |
| 434 | # CONFIG_EEPROM_93CX6 is not set | 445 | # CONFIG_EEPROM_93CX6 is not set |
| 435 | # CONFIG_SGI_IOC4 is not set | 446 | # CONFIG_SGI_IOC4 is not set |
| 436 | # CONFIG_TIFM_CORE is not set | 447 | # CONFIG_TIFM_CORE is not set |
| 437 | # CONFIG_ENCLOSURE_SERVICES is not set | 448 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 449 | # CONFIG_HP_ILO is not set | ||
| 438 | CONFIG_HAVE_IDE=y | 450 | CONFIG_HAVE_IDE=y |
| 439 | # CONFIG_IDE is not set | 451 | # CONFIG_IDE is not set |
| 440 | 452 | ||
| @@ -514,6 +526,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 514 | # CONFIG_SCSI_NSP32 is not set | 526 | # CONFIG_SCSI_NSP32 is not set |
| 515 | # CONFIG_SCSI_DEBUG is not set | 527 | # CONFIG_SCSI_DEBUG is not set |
| 516 | # CONFIG_SCSI_SRP is not set | 528 | # CONFIG_SCSI_SRP is not set |
| 529 | # CONFIG_SCSI_DH is not set | ||
| 517 | CONFIG_ATA=y | 530 | CONFIG_ATA=y |
| 518 | # CONFIG_ATA_NONSTANDARD is not set | 531 | # CONFIG_ATA_NONSTANDARD is not set |
| 519 | CONFIG_SATA_PMP=y | 532 | CONFIG_SATA_PMP=y |
| @@ -581,12 +594,15 @@ CONFIG_PATA_ALI=y | |||
| 581 | # | 594 | # |
| 582 | # IEEE 1394 (FireWire) support | 595 | # IEEE 1394 (FireWire) support |
| 583 | # | 596 | # |
| 597 | |||
| 598 | # | ||
| 599 | # Enable only one of the two stacks, unless you know what you are doing | ||
| 600 | # | ||
| 584 | # CONFIG_FIREWIRE is not set | 601 | # CONFIG_FIREWIRE is not set |
| 585 | # CONFIG_IEEE1394 is not set | 602 | # CONFIG_IEEE1394 is not set |
| 586 | # CONFIG_I2O is not set | 603 | # CONFIG_I2O is not set |
| 587 | # CONFIG_MACINTOSH_DRIVERS is not set | 604 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 588 | CONFIG_NETDEVICES=y | 605 | CONFIG_NETDEVICES=y |
| 589 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 590 | CONFIG_DUMMY=y | 606 | CONFIG_DUMMY=y |
| 591 | # CONFIG_BONDING is not set | 607 | # CONFIG_BONDING is not set |
| 592 | # CONFIG_MACVLAN is not set | 608 | # CONFIG_MACVLAN is not set |
| @@ -631,7 +647,6 @@ CONFIG_NETDEV_1000=y | |||
| 631 | # CONFIG_DL2K is not set | 647 | # CONFIG_DL2K is not set |
| 632 | # CONFIG_E1000 is not set | 648 | # CONFIG_E1000 is not set |
| 633 | # CONFIG_E1000E is not set | 649 | # CONFIG_E1000E is not set |
| 634 | # CONFIG_E1000E_ENABLED is not set | ||
| 635 | # CONFIG_IP1000 is not set | 650 | # CONFIG_IP1000 is not set |
| 636 | # CONFIG_IGB is not set | 651 | # CONFIG_IGB is not set |
| 637 | # CONFIG_NS83820 is not set | 652 | # CONFIG_NS83820 is not set |
| @@ -645,10 +660,10 @@ CONFIG_NETDEV_1000=y | |||
| 645 | # CONFIG_TIGON3 is not set | 660 | # CONFIG_TIGON3 is not set |
| 646 | # CONFIG_BNX2 is not set | 661 | # CONFIG_BNX2 is not set |
| 647 | CONFIG_GIANFAR=y | 662 | CONFIG_GIANFAR=y |
| 648 | CONFIG_GFAR_NAPI=y | ||
| 649 | # CONFIG_UCC_GETH is not set | 663 | # CONFIG_UCC_GETH is not set |
| 650 | # CONFIG_QLA3XXX is not set | 664 | # CONFIG_QLA3XXX is not set |
| 651 | # CONFIG_ATL1 is not set | 665 | # CONFIG_ATL1 is not set |
| 666 | # CONFIG_ATL1E is not set | ||
| 652 | CONFIG_NETDEV_10000=y | 667 | CONFIG_NETDEV_10000=y |
| 653 | # CONFIG_CHELSIO_T1 is not set | 668 | # CONFIG_CHELSIO_T1 is not set |
| 654 | # CONFIG_CHELSIO_T3 is not set | 669 | # CONFIG_CHELSIO_T3 is not set |
| @@ -725,12 +740,14 @@ CONFIG_SERIO_SERPORT=y | |||
| 725 | # CONFIG_SERIO_PCIPS2 is not set | 740 | # CONFIG_SERIO_PCIPS2 is not set |
| 726 | CONFIG_SERIO_LIBPS2=y | 741 | CONFIG_SERIO_LIBPS2=y |
| 727 | # CONFIG_SERIO_RAW is not set | 742 | # CONFIG_SERIO_RAW is not set |
| 743 | # CONFIG_SERIO_XILINX_XPS_PS2 is not set | ||
| 728 | # CONFIG_GAMEPORT is not set | 744 | # CONFIG_GAMEPORT is not set |
| 729 | 745 | ||
| 730 | # | 746 | # |
| 731 | # Character devices | 747 | # Character devices |
| 732 | # | 748 | # |
| 733 | CONFIG_VT=y | 749 | CONFIG_VT=y |
| 750 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 734 | CONFIG_VT_CONSOLE=y | 751 | CONFIG_VT_CONSOLE=y |
| 735 | CONFIG_HW_CONSOLE=y | 752 | CONFIG_HW_CONSOLE=y |
| 736 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 753 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| @@ -776,44 +793,68 @@ CONFIG_DEVPORT=y | |||
| 776 | CONFIG_I2C=y | 793 | CONFIG_I2C=y |
| 777 | CONFIG_I2C_BOARDINFO=y | 794 | CONFIG_I2C_BOARDINFO=y |
| 778 | # CONFIG_I2C_CHARDEV is not set | 795 | # CONFIG_I2C_CHARDEV is not set |
| 796 | CONFIG_I2C_HELPER_AUTO=y | ||
| 779 | 797 | ||
| 780 | # | 798 | # |
| 781 | # I2C Hardware Bus support | 799 | # I2C Hardware Bus support |
| 782 | # | 800 | # |
| 801 | |||
| 802 | # | ||
| 803 | # PC SMBus host controller drivers | ||
| 804 | # | ||
| 783 | # CONFIG_I2C_ALI1535 is not set | 805 | # CONFIG_I2C_ALI1535 is not set |
| 784 | # CONFIG_I2C_ALI1563 is not set | 806 | # CONFIG_I2C_ALI1563 is not set |
| 785 | # CONFIG_I2C_ALI15X3 is not set | 807 | # CONFIG_I2C_ALI15X3 is not set |
| 786 | # CONFIG_I2C_AMD756 is not set | 808 | # CONFIG_I2C_AMD756 is not set |
| 787 | # CONFIG_I2C_AMD8111 is not set | 809 | # CONFIG_I2C_AMD8111 is not set |
| 788 | # CONFIG_I2C_I801 is not set | 810 | # CONFIG_I2C_I801 is not set |
| 789 | # CONFIG_I2C_I810 is not set | 811 | # CONFIG_I2C_ISCH is not set |
| 790 | # CONFIG_I2C_PIIX4 is not set | 812 | # CONFIG_I2C_PIIX4 is not set |
| 791 | CONFIG_I2C_MPC=y | ||
| 792 | # CONFIG_I2C_NFORCE2 is not set | 813 | # CONFIG_I2C_NFORCE2 is not set |
| 793 | # CONFIG_I2C_OCORES is not set | ||
| 794 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 795 | # CONFIG_I2C_PROSAVAGE is not set | ||
| 796 | # CONFIG_I2C_SAVAGE4 is not set | ||
| 797 | # CONFIG_I2C_SIMTEC is not set | ||
| 798 | # CONFIG_I2C_SIS5595 is not set | 814 | # CONFIG_I2C_SIS5595 is not set |
| 799 | # CONFIG_I2C_SIS630 is not set | 815 | # CONFIG_I2C_SIS630 is not set |
| 800 | # CONFIG_I2C_SIS96X is not set | 816 | # CONFIG_I2C_SIS96X is not set |
| 801 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 802 | # CONFIG_I2C_STUB is not set | ||
| 803 | # CONFIG_I2C_TINY_USB is not set | ||
| 804 | # CONFIG_I2C_VIA is not set | 817 | # CONFIG_I2C_VIA is not set |
| 805 | # CONFIG_I2C_VIAPRO is not set | 818 | # CONFIG_I2C_VIAPRO is not set |
| 819 | |||
| 820 | # | ||
| 821 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 822 | # | ||
| 823 | # CONFIG_I2C_CPM is not set | ||
| 824 | # CONFIG_I2C_GPIO is not set | ||
| 825 | CONFIG_I2C_MPC=y | ||
| 826 | # CONFIG_I2C_OCORES is not set | ||
| 827 | # CONFIG_I2C_SIMTEC is not set | ||
| 828 | |||
| 829 | # | ||
| 830 | # External I2C/SMBus adapter drivers | ||
| 831 | # | ||
| 832 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 833 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 834 | # CONFIG_I2C_TINY_USB is not set | ||
| 835 | |||
| 836 | # | ||
| 837 | # Graphics adapter I2C/DDC channel drivers | ||
| 838 | # | ||
| 806 | # CONFIG_I2C_VOODOO3 is not set | 839 | # CONFIG_I2C_VOODOO3 is not set |
| 840 | |||
| 841 | # | ||
| 842 | # Other I2C/SMBus bus drivers | ||
| 843 | # | ||
| 807 | # CONFIG_I2C_PCA_PLATFORM is not set | 844 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 845 | # CONFIG_I2C_STUB is not set | ||
| 808 | 846 | ||
| 809 | # | 847 | # |
| 810 | # Miscellaneous I2C Chip support | 848 | # Miscellaneous I2C Chip support |
| 811 | # | 849 | # |
| 812 | # CONFIG_DS1682 is not set | 850 | # CONFIG_DS1682 is not set |
| 851 | # CONFIG_AT24 is not set | ||
| 813 | CONFIG_SENSORS_EEPROM=y | 852 | CONFIG_SENSORS_EEPROM=y |
| 814 | # CONFIG_SENSORS_PCF8574 is not set | 853 | # CONFIG_SENSORS_PCF8574 is not set |
| 815 | # CONFIG_PCF8575 is not set | 854 | # CONFIG_PCF8575 is not set |
| 855 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 816 | # CONFIG_SENSORS_PCF8591 is not set | 856 | # CONFIG_SENSORS_PCF8591 is not set |
| 857 | # CONFIG_TPS65010 is not set | ||
| 817 | # CONFIG_SENSORS_MAX6875 is not set | 858 | # CONFIG_SENSORS_MAX6875 is not set |
| 818 | # CONFIG_SENSORS_TSL2550 is not set | 859 | # CONFIG_SENSORS_TSL2550 is not set |
| 819 | # CONFIG_I2C_DEBUG_CORE is not set | 860 | # CONFIG_I2C_DEBUG_CORE is not set |
| @@ -821,10 +862,32 @@ CONFIG_SENSORS_EEPROM=y | |||
| 821 | # CONFIG_I2C_DEBUG_BUS is not set | 862 | # CONFIG_I2C_DEBUG_BUS is not set |
| 822 | # CONFIG_I2C_DEBUG_CHIP is not set | 863 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 823 | # CONFIG_SPI is not set | 864 | # CONFIG_SPI is not set |
| 865 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 866 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | ||
| 867 | CONFIG_GPIOLIB=y | ||
| 868 | # CONFIG_DEBUG_GPIO is not set | ||
| 869 | # CONFIG_GPIO_SYSFS is not set | ||
| 870 | |||
| 871 | # | ||
| 872 | # I2C GPIO expanders: | ||
| 873 | # | ||
| 874 | # CONFIG_GPIO_MAX732X is not set | ||
| 875 | # CONFIG_GPIO_PCA953X is not set | ||
| 876 | # CONFIG_GPIO_PCF857X is not set | ||
| 877 | |||
| 878 | # | ||
| 879 | # PCI GPIO expanders: | ||
| 880 | # | ||
| 881 | # CONFIG_GPIO_BT8XX is not set | ||
| 882 | |||
| 883 | # | ||
| 884 | # SPI GPIO expanders: | ||
| 885 | # | ||
| 824 | # CONFIG_W1 is not set | 886 | # CONFIG_W1 is not set |
| 825 | # CONFIG_POWER_SUPPLY is not set | 887 | # CONFIG_POWER_SUPPLY is not set |
| 826 | # CONFIG_HWMON is not set | 888 | # CONFIG_HWMON is not set |
| 827 | # CONFIG_THERMAL is not set | 889 | # CONFIG_THERMAL is not set |
| 890 | # CONFIG_THERMAL_HWMON is not set | ||
| 828 | # CONFIG_WATCHDOG is not set | 891 | # CONFIG_WATCHDOG is not set |
| 829 | 892 | ||
| 830 | # | 893 | # |
| @@ -836,8 +899,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 836 | # | 899 | # |
| 837 | # Multifunction device drivers | 900 | # Multifunction device drivers |
| 838 | # | 901 | # |
| 902 | # CONFIG_MFD_CORE is not set | ||
| 839 | # CONFIG_MFD_SM501 is not set | 903 | # CONFIG_MFD_SM501 is not set |
| 840 | # CONFIG_HTC_PASIC3 is not set | 904 | # CONFIG_HTC_PASIC3 is not set |
| 905 | # CONFIG_MFD_TMIO is not set | ||
| 841 | 906 | ||
| 842 | # | 907 | # |
| 843 | # Multimedia devices | 908 | # Multimedia devices |
| @@ -879,6 +944,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
| 879 | # CONFIG_DVB_TTUSB_BUDGET is not set | 944 | # CONFIG_DVB_TTUSB_BUDGET is not set |
| 880 | # CONFIG_DVB_TTUSB_DEC is not set | 945 | # CONFIG_DVB_TTUSB_DEC is not set |
| 881 | # CONFIG_DVB_CINERGYT2 is not set | 946 | # CONFIG_DVB_CINERGYT2 is not set |
| 947 | # CONFIG_DVB_SIANO_SMS1XXX is not set | ||
| 882 | 948 | ||
| 883 | # | 949 | # |
| 884 | # Supported FlexCopII (B2C2) Adapters | 950 | # Supported FlexCopII (B2C2) Adapters |
| @@ -925,6 +991,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
| 925 | # CONFIG_DVB_SP887X is not set | 991 | # CONFIG_DVB_SP887X is not set |
| 926 | # CONFIG_DVB_CX22700 is not set | 992 | # CONFIG_DVB_CX22700 is not set |
| 927 | # CONFIG_DVB_CX22702 is not set | 993 | # CONFIG_DVB_CX22702 is not set |
| 994 | # CONFIG_DVB_DRX397XD is not set | ||
| 928 | # CONFIG_DVB_L64781 is not set | 995 | # CONFIG_DVB_L64781 is not set |
| 929 | # CONFIG_DVB_TDA1004X is not set | 996 | # CONFIG_DVB_TDA1004X is not set |
| 930 | # CONFIG_DVB_NXT6000 is not set | 997 | # CONFIG_DVB_NXT6000 is not set |
| @@ -992,15 +1059,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
| 992 | CONFIG_VGA_CONSOLE=y | 1059 | CONFIG_VGA_CONSOLE=y |
| 993 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set | 1060 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set |
| 994 | CONFIG_DUMMY_CONSOLE=y | 1061 | CONFIG_DUMMY_CONSOLE=y |
| 995 | |||
| 996 | # | ||
| 997 | # Sound | ||
| 998 | # | ||
| 999 | CONFIG_SOUND=y | 1062 | CONFIG_SOUND=y |
| 1000 | |||
| 1001 | # | ||
| 1002 | # Advanced Linux Sound Architecture | ||
| 1003 | # | ||
| 1004 | CONFIG_SND=y | 1063 | CONFIG_SND=y |
| 1005 | CONFIG_SND_TIMER=y | 1064 | CONFIG_SND_TIMER=y |
| 1006 | CONFIG_SND_PCM=y | 1065 | CONFIG_SND_PCM=y |
| @@ -1014,19 +1073,15 @@ CONFIG_SND_PCM_OSS_PLUGINS=y | |||
| 1014 | CONFIG_SND_VERBOSE_PROCFS=y | 1073 | CONFIG_SND_VERBOSE_PROCFS=y |
| 1015 | # CONFIG_SND_VERBOSE_PRINTK is not set | 1074 | # CONFIG_SND_VERBOSE_PRINTK is not set |
| 1016 | # CONFIG_SND_DEBUG is not set | 1075 | # CONFIG_SND_DEBUG is not set |
| 1017 | 1076 | CONFIG_SND_VMASTER=y | |
| 1018 | # | ||
| 1019 | # Generic devices | ||
| 1020 | # | ||
| 1021 | CONFIG_SND_AC97_CODEC=y | 1077 | CONFIG_SND_AC97_CODEC=y |
| 1078 | CONFIG_SND_DRIVERS=y | ||
| 1022 | # CONFIG_SND_DUMMY is not set | 1079 | # CONFIG_SND_DUMMY is not set |
| 1023 | # CONFIG_SND_MTPAV is not set | 1080 | # CONFIG_SND_MTPAV is not set |
| 1024 | # CONFIG_SND_SERIAL_U16550 is not set | 1081 | # CONFIG_SND_SERIAL_U16550 is not set |
| 1025 | # CONFIG_SND_MPU401 is not set | 1082 | # CONFIG_SND_MPU401 is not set |
| 1026 | 1083 | # CONFIG_SND_AC97_POWER_SAVE is not set | |
| 1027 | # | 1084 | CONFIG_SND_PCI=y |
| 1028 | # PCI devices | ||
| 1029 | # | ||
| 1030 | # CONFIG_SND_AD1889 is not set | 1085 | # CONFIG_SND_AD1889 is not set |
| 1031 | # CONFIG_SND_ALS300 is not set | 1086 | # CONFIG_SND_ALS300 is not set |
| 1032 | # CONFIG_SND_ALS4000 is not set | 1087 | # CONFIG_SND_ALS4000 is not set |
| @@ -1088,39 +1143,12 @@ CONFIG_SND_INTEL8X0=y | |||
| 1088 | # CONFIG_SND_VIRTUOSO is not set | 1143 | # CONFIG_SND_VIRTUOSO is not set |
| 1089 | # CONFIG_SND_VX222 is not set | 1144 | # CONFIG_SND_VX222 is not set |
| 1090 | # CONFIG_SND_YMFPCI is not set | 1145 | # CONFIG_SND_YMFPCI is not set |
| 1091 | # CONFIG_SND_AC97_POWER_SAVE is not set | 1146 | CONFIG_SND_PPC=y |
| 1092 | 1147 | CONFIG_SND_USB=y | |
| 1093 | # | ||
| 1094 | # ALSA PowerMac devices | ||
| 1095 | # | ||
| 1096 | |||
| 1097 | # | ||
| 1098 | # ALSA PowerPC devices | ||
| 1099 | # | ||
| 1100 | |||
| 1101 | # | ||
| 1102 | # USB devices | ||
| 1103 | # | ||
| 1104 | # CONFIG_SND_USB_AUDIO is not set | 1148 | # CONFIG_SND_USB_AUDIO is not set |
| 1105 | # CONFIG_SND_USB_USX2Y is not set | 1149 | # CONFIG_SND_USB_USX2Y is not set |
| 1106 | # CONFIG_SND_USB_CAIAQ is not set | 1150 | # CONFIG_SND_USB_CAIAQ is not set |
| 1107 | |||
| 1108 | # | ||
| 1109 | # System on Chip audio support | ||
| 1110 | # | ||
| 1111 | # CONFIG_SND_SOC is not set | 1151 | # CONFIG_SND_SOC is not set |
| 1112 | |||
| 1113 | # | ||
| 1114 | # ALSA SoC audio for Freescale SOCs | ||
| 1115 | # | ||
| 1116 | |||
| 1117 | # | ||
| 1118 | # SoC Audio for the Texas Instruments OMAP | ||
| 1119 | # | ||
| 1120 | |||
| 1121 | # | ||
| 1122 | # Open Sound System | ||
| 1123 | # | ||
| 1124 | # CONFIG_SOUND_PRIME is not set | 1152 | # CONFIG_SOUND_PRIME is not set |
| 1125 | CONFIG_AC97_BUS=y | 1153 | CONFIG_AC97_BUS=y |
| 1126 | CONFIG_HID_SUPPORT=y | 1154 | CONFIG_HID_SUPPORT=y |
| @@ -1152,6 +1180,7 @@ CONFIG_USB_DEVICE_CLASS=y | |||
| 1152 | # CONFIG_USB_OTG is not set | 1180 | # CONFIG_USB_OTG is not set |
| 1153 | # CONFIG_USB_OTG_WHITELIST is not set | 1181 | # CONFIG_USB_OTG_WHITELIST is not set |
| 1154 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 1182 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
| 1183 | CONFIG_USB_MON=y | ||
| 1155 | 1184 | ||
| 1156 | # | 1185 | # |
| 1157 | # USB Host Controller Drivers | 1186 | # USB Host Controller Drivers |
| @@ -1175,6 +1204,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 1175 | # CONFIG_USB_UHCI_HCD is not set | 1204 | # CONFIG_USB_UHCI_HCD is not set |
| 1176 | # CONFIG_USB_SL811_HCD is not set | 1205 | # CONFIG_USB_SL811_HCD is not set |
| 1177 | # CONFIG_USB_R8A66597_HCD is not set | 1206 | # CONFIG_USB_R8A66597_HCD is not set |
| 1207 | # CONFIG_USB_MUSB_HDRC is not set | ||
| 1178 | 1208 | ||
| 1179 | # | 1209 | # |
| 1180 | # USB Device Class drivers | 1210 | # USB Device Class drivers |
| @@ -1203,6 +1233,7 @@ CONFIG_USB_STORAGE=y | |||
| 1203 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1233 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1204 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1234 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
| 1205 | # CONFIG_USB_STORAGE_KARMA is not set | 1235 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1236 | # CONFIG_USB_STORAGE_SIERRA is not set | ||
| 1206 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | 1237 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
| 1207 | # CONFIG_USB_LIBUSUAL is not set | 1238 | # CONFIG_USB_LIBUSUAL is not set |
| 1208 | 1239 | ||
| @@ -1211,7 +1242,6 @@ CONFIG_USB_STORAGE=y | |||
| 1211 | # | 1242 | # |
| 1212 | # CONFIG_USB_MDC800 is not set | 1243 | # CONFIG_USB_MDC800 is not set |
| 1213 | # CONFIG_USB_MICROTEK is not set | 1244 | # CONFIG_USB_MICROTEK is not set |
| 1214 | CONFIG_USB_MON=y | ||
| 1215 | 1245 | ||
| 1216 | # | 1246 | # |
| 1217 | # USB port drivers | 1247 | # USB port drivers |
| @@ -1224,7 +1254,6 @@ CONFIG_USB_MON=y | |||
| 1224 | # CONFIG_USB_EMI62 is not set | 1254 | # CONFIG_USB_EMI62 is not set |
| 1225 | # CONFIG_USB_EMI26 is not set | 1255 | # CONFIG_USB_EMI26 is not set |
| 1226 | # CONFIG_USB_ADUTUX is not set | 1256 | # CONFIG_USB_ADUTUX is not set |
| 1227 | # CONFIG_USB_AUERSWALD is not set | ||
| 1228 | # CONFIG_USB_RIO500 is not set | 1257 | # CONFIG_USB_RIO500 is not set |
| 1229 | # CONFIG_USB_LEGOTOWER is not set | 1258 | # CONFIG_USB_LEGOTOWER is not set |
| 1230 | # CONFIG_USB_LCD is not set | 1259 | # CONFIG_USB_LCD is not set |
| @@ -1285,6 +1314,7 @@ CONFIG_RTC_INTF_DEV=y | |||
| 1285 | # CONFIG_RTC_DRV_PCF8583 is not set | 1314 | # CONFIG_RTC_DRV_PCF8583 is not set |
| 1286 | # CONFIG_RTC_DRV_M41T80 is not set | 1315 | # CONFIG_RTC_DRV_M41T80 is not set |
| 1287 | # CONFIG_RTC_DRV_S35390A is not set | 1316 | # CONFIG_RTC_DRV_S35390A is not set |
| 1317 | # CONFIG_RTC_DRV_FM3130 is not set | ||
| 1288 | 1318 | ||
| 1289 | # | 1319 | # |
| 1290 | # SPI RTC drivers | 1320 | # SPI RTC drivers |
| @@ -1318,6 +1348,7 @@ CONFIG_DMA_ENGINE=y | |||
| 1318 | # DMA Clients | 1348 | # DMA Clients |
| 1319 | # | 1349 | # |
| 1320 | # CONFIG_NET_DMA is not set | 1350 | # CONFIG_NET_DMA is not set |
| 1351 | # CONFIG_DMATEST is not set | ||
| 1321 | # CONFIG_UIO is not set | 1352 | # CONFIG_UIO is not set |
| 1322 | 1353 | ||
| 1323 | # | 1354 | # |
| @@ -1332,6 +1363,7 @@ CONFIG_EXT3_FS_XATTR=y | |||
| 1332 | # CONFIG_EXT3_FS_SECURITY is not set | 1363 | # CONFIG_EXT3_FS_SECURITY is not set |
| 1333 | # CONFIG_EXT4DEV_FS is not set | 1364 | # CONFIG_EXT4DEV_FS is not set |
| 1334 | CONFIG_JBD=y | 1365 | CONFIG_JBD=y |
| 1366 | # CONFIG_JBD_DEBUG is not set | ||
| 1335 | CONFIG_FS_MBCACHE=y | 1367 | CONFIG_FS_MBCACHE=y |
| 1336 | # CONFIG_REISERFS_FS is not set | 1368 | # CONFIG_REISERFS_FS is not set |
| 1337 | # CONFIG_JFS_FS is not set | 1369 | # CONFIG_JFS_FS is not set |
| @@ -1394,6 +1426,7 @@ CONFIG_EFS_FS=m | |||
| 1394 | CONFIG_CRAMFS=y | 1426 | CONFIG_CRAMFS=y |
| 1395 | CONFIG_VXFS_FS=m | 1427 | CONFIG_VXFS_FS=m |
| 1396 | # CONFIG_MINIX_FS is not set | 1428 | # CONFIG_MINIX_FS is not set |
| 1429 | # CONFIG_OMFS_FS is not set | ||
| 1397 | CONFIG_HPFS_FS=m | 1430 | CONFIG_HPFS_FS=m |
| 1398 | CONFIG_QNX4FS_FS=m | 1431 | CONFIG_QNX4FS_FS=m |
| 1399 | # CONFIG_ROMFS_FS is not set | 1432 | # CONFIG_ROMFS_FS is not set |
| @@ -1406,17 +1439,16 @@ CONFIG_NFS_FS=y | |||
| 1406 | CONFIG_NFS_V3=y | 1439 | CONFIG_NFS_V3=y |
| 1407 | # CONFIG_NFS_V3_ACL is not set | 1440 | # CONFIG_NFS_V3_ACL is not set |
| 1408 | CONFIG_NFS_V4=y | 1441 | CONFIG_NFS_V4=y |
| 1442 | CONFIG_ROOT_NFS=y | ||
| 1409 | CONFIG_NFSD=y | 1443 | CONFIG_NFSD=y |
| 1410 | # CONFIG_NFSD_V3 is not set | 1444 | # CONFIG_NFSD_V3 is not set |
| 1411 | # CONFIG_NFSD_V4 is not set | 1445 | # CONFIG_NFSD_V4 is not set |
| 1412 | CONFIG_ROOT_NFS=y | ||
| 1413 | CONFIG_LOCKD=y | 1446 | CONFIG_LOCKD=y |
| 1414 | CONFIG_LOCKD_V4=y | 1447 | CONFIG_LOCKD_V4=y |
| 1415 | CONFIG_EXPORTFS=y | 1448 | CONFIG_EXPORTFS=y |
| 1416 | CONFIG_NFS_COMMON=y | 1449 | CONFIG_NFS_COMMON=y |
| 1417 | CONFIG_SUNRPC=y | 1450 | CONFIG_SUNRPC=y |
| 1418 | CONFIG_SUNRPC_GSS=y | 1451 | CONFIG_SUNRPC_GSS=y |
| 1419 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 1420 | CONFIG_RPCSEC_GSS_KRB5=y | 1452 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1421 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1453 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1422 | # CONFIG_SMB_FS is not set | 1454 | # CONFIG_SMB_FS is not set |
| @@ -1487,6 +1519,7 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
| 1487 | # CONFIG_NLS_KOI8_U is not set | 1519 | # CONFIG_NLS_KOI8_U is not set |
| 1488 | CONFIG_NLS_UTF8=m | 1520 | CONFIG_NLS_UTF8=m |
| 1489 | # CONFIG_DLM is not set | 1521 | # CONFIG_DLM is not set |
| 1522 | # CONFIG_QE_GPIO is not set | ||
| 1490 | 1523 | ||
| 1491 | # | 1524 | # |
| 1492 | # Library routines | 1525 | # Library routines |
| @@ -1495,6 +1528,7 @@ CONFIG_BITREVERSE=y | |||
| 1495 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1528 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 1496 | # CONFIG_CRC_CCITT is not set | 1529 | # CONFIG_CRC_CCITT is not set |
| 1497 | # CONFIG_CRC16 is not set | 1530 | # CONFIG_CRC16 is not set |
| 1531 | CONFIG_CRC_T10DIF=y | ||
| 1498 | CONFIG_CRC_ITU_T=m | 1532 | CONFIG_CRC_ITU_T=m |
| 1499 | CONFIG_CRC32=y | 1533 | CONFIG_CRC32=y |
| 1500 | # CONFIG_CRC7 is not set | 1534 | # CONFIG_CRC7 is not set |
| @@ -1515,11 +1549,13 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1515 | CONFIG_FRAME_WARN=1024 | 1549 | CONFIG_FRAME_WARN=1024 |
| 1516 | # CONFIG_MAGIC_SYSRQ is not set | 1550 | # CONFIG_MAGIC_SYSRQ is not set |
| 1517 | # CONFIG_UNUSED_SYMBOLS is not set | 1551 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1518 | # CONFIG_DEBUG_FS is not set | 1552 | CONFIG_DEBUG_FS=y |
| 1519 | # CONFIG_HEADERS_CHECK is not set | 1553 | # CONFIG_HEADERS_CHECK is not set |
| 1520 | CONFIG_DEBUG_KERNEL=y | 1554 | CONFIG_DEBUG_KERNEL=y |
| 1521 | # CONFIG_DEBUG_SHIRQ is not set | 1555 | # CONFIG_DEBUG_SHIRQ is not set |
| 1522 | CONFIG_DETECT_SOFTLOCKUP=y | 1556 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1557 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 1558 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 1523 | CONFIG_SCHED_DEBUG=y | 1559 | CONFIG_SCHED_DEBUG=y |
| 1524 | # CONFIG_SCHEDSTATS is not set | 1560 | # CONFIG_SCHEDSTATS is not set |
| 1525 | # CONFIG_TIMER_STATS is not set | 1561 | # CONFIG_TIMER_STATS is not set |
| @@ -1538,19 +1574,31 @@ CONFIG_SCHED_DEBUG=y | |||
| 1538 | CONFIG_DEBUG_INFO=y | 1574 | CONFIG_DEBUG_INFO=y |
| 1539 | # CONFIG_DEBUG_VM is not set | 1575 | # CONFIG_DEBUG_VM is not set |
| 1540 | # CONFIG_DEBUG_WRITECOUNT is not set | 1576 | # CONFIG_DEBUG_WRITECOUNT is not set |
| 1577 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 1541 | # CONFIG_DEBUG_LIST is not set | 1578 | # CONFIG_DEBUG_LIST is not set |
| 1542 | # CONFIG_DEBUG_SG is not set | 1579 | # CONFIG_DEBUG_SG is not set |
| 1543 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1580 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 1544 | # CONFIG_RCU_TORTURE_TEST is not set | 1581 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1545 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1582 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 1546 | # CONFIG_FAULT_INJECTION is not set | 1583 | # CONFIG_FAULT_INJECTION is not set |
| 1584 | # CONFIG_LATENCYTOP is not set | ||
| 1585 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1586 | CONFIG_HAVE_FTRACE=y | ||
| 1587 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1588 | # CONFIG_FTRACE is not set | ||
| 1589 | # CONFIG_SCHED_TRACER is not set | ||
| 1590 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1547 | # CONFIG_SAMPLES is not set | 1591 | # CONFIG_SAMPLES is not set |
| 1592 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1593 | # CONFIG_KGDB is not set | ||
| 1548 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1594 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
| 1549 | # CONFIG_DEBUG_STACK_USAGE is not set | 1595 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1550 | # CONFIG_DEBUG_PAGEALLOC is not set | 1596 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1551 | # CONFIG_DEBUGGER is not set | 1597 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
| 1552 | # CONFIG_KGDB_CONSOLE is not set | 1598 | # CONFIG_FTR_FIXUP_SELFTEST is not set |
| 1599 | # CONFIG_XMON is not set | ||
| 1553 | # CONFIG_IRQSTACKS is not set | 1600 | # CONFIG_IRQSTACKS is not set |
| 1601 | CONFIG_VIRQ_DEBUG=y | ||
| 1554 | # CONFIG_BDI_SWITCH is not set | 1602 | # CONFIG_BDI_SWITCH is not set |
| 1555 | # CONFIG_PPC_EARLY_DEBUG is not set | 1603 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1556 | 1604 | ||
| @@ -1606,6 +1654,10 @@ CONFIG_CRYPTO_HMAC=y | |||
| 1606 | # CONFIG_CRYPTO_MD4 is not set | 1654 | # CONFIG_CRYPTO_MD4 is not set |
| 1607 | CONFIG_CRYPTO_MD5=y | 1655 | CONFIG_CRYPTO_MD5=y |
| 1608 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1656 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 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 | ||
| 1609 | CONFIG_CRYPTO_SHA1=m | 1661 | CONFIG_CRYPTO_SHA1=m |
| 1610 | # CONFIG_CRYPTO_SHA256 is not set | 1662 | # CONFIG_CRYPTO_SHA256 is not set |
| 1611 | # CONFIG_CRYPTO_SHA512 is not set | 1663 | # CONFIG_CRYPTO_SHA512 is not set |
| @@ -1638,6 +1690,7 @@ CONFIG_CRYPTO_DES=y | |||
| 1638 | # CONFIG_CRYPTO_LZO is not set | 1690 | # CONFIG_CRYPTO_LZO is not set |
| 1639 | CONFIG_CRYPTO_HW=y | 1691 | CONFIG_CRYPTO_HW=y |
| 1640 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1692 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1641 | # CONFIG_PPC_CLOCK is not set | 1693 | # CONFIG_CRYPTO_DEV_TALITOS is not set |
| 1694 | CONFIG_PPC_CLOCK=y | ||
| 1642 | CONFIG_PPC_LIB_RHEAP=y | 1695 | CONFIG_PPC_LIB_RHEAP=y |
| 1643 | # CONFIG_VIRTUALIZATION is not set | 1696 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/mpc8610_hpcd_defconfig b/arch/powerpc/configs/mpc8610_hpcd_defconfig index cdf98ae3682b..1a9990731eb0 100644 --- a/arch/powerpc/configs/mpc8610_hpcd_defconfig +++ b/arch/powerpc/configs/mpc8610_hpcd_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.26 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Tue Jul 15 08:31:01 2008 | 4 | # Thu Aug 21 00:52:10 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | 34 | CONFIG_STACKTRACE_SUPPORT=y |
| 35 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | 36 | CONFIG_LOCKDEP_SUPPORT=y |
| 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| @@ -91,7 +92,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 91 | CONFIG_SYSCTL=y | 92 | CONFIG_SYSCTL=y |
| 92 | CONFIG_EMBEDDED=y | 93 | CONFIG_EMBEDDED=y |
| 93 | CONFIG_SYSCTL_SYSCALL=y | 94 | CONFIG_SYSCTL_SYSCALL=y |
| 94 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 95 | CONFIG_KALLSYMS=y | 95 | CONFIG_KALLSYMS=y |
| 96 | # CONFIG_KALLSYMS_ALL is not set | 96 | # CONFIG_KALLSYMS_ALL is not set |
| 97 | CONFIG_KALLSYMS_EXTRA_PASS=y | 97 | CONFIG_KALLSYMS_EXTRA_PASS=y |
| @@ -118,10 +118,16 @@ CONFIG_SLUB=y | |||
| 118 | # CONFIG_MARKERS is not set | 118 | # CONFIG_MARKERS is not set |
| 119 | CONFIG_HAVE_OPROFILE=y | 119 | CONFIG_HAVE_OPROFILE=y |
| 120 | # CONFIG_KPROBES is not set | 120 | # CONFIG_KPROBES is not set |
| 121 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 122 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 121 | CONFIG_HAVE_KPROBES=y | 123 | CONFIG_HAVE_KPROBES=y |
| 122 | CONFIG_HAVE_KRETPROBES=y | 124 | CONFIG_HAVE_KRETPROBES=y |
| 123 | CONFIG_HAVE_DMA_ATTRS=y | 125 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
| 126 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 127 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 128 | # CONFIG_HAVE_CLK is not set | ||
| 124 | CONFIG_PROC_PAGE_MONITOR=y | 129 | CONFIG_PROC_PAGE_MONITOR=y |
| 130 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 125 | CONFIG_SLABINFO=y | 131 | CONFIG_SLABINFO=y |
| 126 | CONFIG_RT_MUTEXES=y | 132 | CONFIG_RT_MUTEXES=y |
| 127 | # CONFIG_TINY_SHMEM is not set | 133 | # CONFIG_TINY_SHMEM is not set |
| @@ -138,6 +144,7 @@ CONFIG_BLOCK=y | |||
| 138 | # CONFIG_BLK_DEV_IO_TRACE is not set | 144 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 139 | # CONFIG_LSF is not set | 145 | # CONFIG_LSF is not set |
| 140 | # CONFIG_BLK_DEV_BSG is not set | 146 | # CONFIG_BLK_DEV_BSG is not set |
| 147 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 141 | 148 | ||
| 142 | # | 149 | # |
| 143 | # IO Schedulers | 150 | # IO Schedulers |
| @@ -159,9 +166,8 @@ CONFIG_CLASSIC_RCU=y | |||
| 159 | CONFIG_PPC_MULTIPLATFORM=y | 166 | CONFIG_PPC_MULTIPLATFORM=y |
| 160 | CONFIG_CLASSIC32=y | 167 | CONFIG_CLASSIC32=y |
| 161 | CONFIG_PPC_CHRP=y | 168 | CONFIG_PPC_CHRP=y |
| 162 | # CONFIG_PPC_MPC512x is not set | ||
| 163 | # CONFIG_PPC_MPC5121 is not set | ||
| 164 | # CONFIG_MPC5121_ADS is not set | 169 | # CONFIG_MPC5121_ADS is not set |
| 170 | # CONFIG_MPC5121_GENERIC is not set | ||
| 165 | # CONFIG_PPC_MPC52xx is not set | 171 | # CONFIG_PPC_MPC52xx is not set |
| 166 | CONFIG_PPC_PMAC=y | 172 | CONFIG_PPC_PMAC=y |
| 167 | # CONFIG_PPC_CELL is not set | 173 | # CONFIG_PPC_CELL is not set |
| @@ -207,7 +213,7 @@ CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | |||
| 207 | # CONFIG_HZ_300 is not set | 213 | # CONFIG_HZ_300 is not set |
| 208 | CONFIG_HZ_1000=y | 214 | CONFIG_HZ_1000=y |
| 209 | CONFIG_HZ=1000 | 215 | CONFIG_HZ=1000 |
| 210 | # CONFIG_SCHED_HRTICK is not set | 216 | CONFIG_SCHED_HRTICK=y |
| 211 | CONFIG_PREEMPT_NONE=y | 217 | CONFIG_PREEMPT_NONE=y |
| 212 | # CONFIG_PREEMPT_VOLUNTARY is not set | 218 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 213 | # CONFIG_PREEMPT is not set | 219 | # CONFIG_PREEMPT is not set |
| @@ -230,6 +236,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 230 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 236 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 231 | CONFIG_PAGEFLAGS_EXTENDED=y | 237 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 232 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 238 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 239 | CONFIG_MIGRATION=y | ||
| 233 | # CONFIG_RESOURCES_64BIT is not set | 240 | # CONFIG_RESOURCES_64BIT is not set |
| 234 | CONFIG_ZONE_DMA_FLAG=1 | 241 | CONFIG_ZONE_DMA_FLAG=1 |
| 235 | CONFIG_BOUNCE=y | 242 | CONFIG_BOUNCE=y |
| @@ -237,6 +244,7 @@ CONFIG_VIRT_TO_BUS=y | |||
| 237 | CONFIG_FORCE_MAX_ZONEORDER=12 | 244 | CONFIG_FORCE_MAX_ZONEORDER=12 |
| 238 | CONFIG_PROC_DEVICETREE=y | 245 | CONFIG_PROC_DEVICETREE=y |
| 239 | # CONFIG_CMDLINE_BOOL is not set | 246 | # CONFIG_CMDLINE_BOOL is not set |
| 247 | CONFIG_EXTRA_TARGETS="" | ||
| 240 | # CONFIG_PM is not set | 248 | # CONFIG_PM is not set |
| 241 | # CONFIG_SECCOMP is not set | 249 | # CONFIG_SECCOMP is not set |
| 242 | CONFIG_ISA_DMA_API=y | 250 | CONFIG_ISA_DMA_API=y |
| @@ -278,10 +286,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
| 278 | CONFIG_KERNEL_START=0xc0000000 | 286 | CONFIG_KERNEL_START=0xc0000000 |
| 279 | CONFIG_PHYSICAL_START=0x00000000 | 287 | CONFIG_PHYSICAL_START=0x00000000 |
| 280 | CONFIG_TASK_SIZE=0xc0000000 | 288 | CONFIG_TASK_SIZE=0xc0000000 |
| 281 | |||
| 282 | # | ||
| 283 | # Networking | ||
| 284 | # | ||
| 285 | CONFIG_NET=y | 289 | CONFIG_NET=y |
| 286 | 290 | ||
| 287 | # | 291 | # |
| @@ -391,6 +395,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | |||
| 391 | CONFIG_STANDALONE=y | 395 | CONFIG_STANDALONE=y |
| 392 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 396 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 393 | CONFIG_FW_LOADER=y | 397 | CONFIG_FW_LOADER=y |
| 398 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
| 399 | CONFIG_EXTRA_FIRMWARE="" | ||
| 394 | # CONFIG_DEBUG_DRIVER is not set | 400 | # CONFIG_DEBUG_DRIVER is not set |
| 395 | # CONFIG_DEBUG_DEVRES is not set | 401 | # CONFIG_DEBUG_DEVRES is not set |
| 396 | # CONFIG_SYS_HYPERVISOR is not set | 402 | # CONFIG_SYS_HYPERVISOR is not set |
| @@ -503,18 +509,17 @@ CONFIG_BLK_DEV_RAM_SIZE=131072 | |||
| 503 | # CONFIG_BLK_DEV_XIP is not set | 509 | # CONFIG_BLK_DEV_XIP is not set |
| 504 | # CONFIG_CDROM_PKTCDVD is not set | 510 | # CONFIG_CDROM_PKTCDVD is not set |
| 505 | # CONFIG_ATA_OVER_ETH is not set | 511 | # CONFIG_ATA_OVER_ETH is not set |
| 512 | # CONFIG_BLK_DEV_HD is not set | ||
| 506 | CONFIG_MISC_DEVICES=y | 513 | CONFIG_MISC_DEVICES=y |
| 507 | # CONFIG_PHANTOM is not set | 514 | # CONFIG_PHANTOM is not set |
| 508 | # CONFIG_EEPROM_93CX6 is not set | 515 | # CONFIG_EEPROM_93CX6 is not set |
| 509 | # CONFIG_SGI_IOC4 is not set | 516 | # CONFIG_SGI_IOC4 is not set |
| 510 | # CONFIG_TIFM_CORE is not set | 517 | # CONFIG_TIFM_CORE is not set |
| 511 | # CONFIG_ENCLOSURE_SERVICES is not set | 518 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 519 | # CONFIG_HP_ILO is not set | ||
| 512 | CONFIG_HAVE_IDE=y | 520 | CONFIG_HAVE_IDE=y |
| 513 | CONFIG_IDE=y | 521 | CONFIG_IDE=y |
| 514 | CONFIG_IDE_MAX_HWIFS=4 | ||
| 515 | # CONFIG_BLK_DEV_IDE is not set | 522 | # CONFIG_BLK_DEV_IDE is not set |
| 516 | # CONFIG_BLK_DEV_HD_ONLY is not set | ||
| 517 | # CONFIG_BLK_DEV_HD is not set | ||
| 518 | 523 | ||
| 519 | # | 524 | # |
| 520 | # SCSI device support | 525 | # SCSI device support |
| @@ -593,6 +598,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 593 | # CONFIG_SCSI_MESH is not set | 598 | # CONFIG_SCSI_MESH is not set |
| 594 | # CONFIG_SCSI_MAC53C94 is not set | 599 | # CONFIG_SCSI_MAC53C94 is not set |
| 595 | # CONFIG_SCSI_SRP is not set | 600 | # CONFIG_SCSI_SRP is not set |
| 601 | # CONFIG_SCSI_DH is not set | ||
| 596 | CONFIG_ATA=y | 602 | CONFIG_ATA=y |
| 597 | # CONFIG_ATA_NONSTANDARD is not set | 603 | # CONFIG_ATA_NONSTANDARD is not set |
| 598 | CONFIG_SATA_PMP=y | 604 | CONFIG_SATA_PMP=y |
| @@ -669,7 +675,6 @@ CONFIG_PATA_ALI=y | |||
| 669 | # CONFIG_I2O is not set | 675 | # CONFIG_I2O is not set |
| 670 | # CONFIG_MACINTOSH_DRIVERS is not set | 676 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 671 | CONFIG_NETDEVICES=y | 677 | CONFIG_NETDEVICES=y |
| 672 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 673 | CONFIG_DUMMY=y | 678 | CONFIG_DUMMY=y |
| 674 | # CONFIG_BONDING is not set | 679 | # CONFIG_BONDING is not set |
| 675 | # CONFIG_MACVLAN is not set | 680 | # CONFIG_MACVLAN is not set |
| @@ -756,12 +761,14 @@ CONFIG_SERIO_SERPORT=y | |||
| 756 | # CONFIG_SERIO_PCIPS2 is not set | 761 | # CONFIG_SERIO_PCIPS2 is not set |
| 757 | CONFIG_SERIO_LIBPS2=y | 762 | CONFIG_SERIO_LIBPS2=y |
| 758 | # CONFIG_SERIO_RAW is not set | 763 | # CONFIG_SERIO_RAW is not set |
| 764 | # CONFIG_SERIO_XILINX_XPS_PS2 is not set | ||
| 759 | # CONFIG_GAMEPORT is not set | 765 | # CONFIG_GAMEPORT is not set |
| 760 | 766 | ||
| 761 | # | 767 | # |
| 762 | # Character devices | 768 | # Character devices |
| 763 | # | 769 | # |
| 764 | CONFIG_VT=y | 770 | CONFIG_VT=y |
| 771 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 765 | CONFIG_VT_CONSOLE=y | 772 | CONFIG_VT_CONSOLE=y |
| 766 | CONFIG_HW_CONSOLE=y | 773 | CONFIG_HW_CONSOLE=y |
| 767 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 774 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| @@ -807,44 +814,69 @@ CONFIG_DEVPORT=y | |||
| 807 | CONFIG_I2C=y | 814 | CONFIG_I2C=y |
| 808 | CONFIG_I2C_BOARDINFO=y | 815 | CONFIG_I2C_BOARDINFO=y |
| 809 | # CONFIG_I2C_CHARDEV is not set | 816 | # CONFIG_I2C_CHARDEV is not set |
| 817 | CONFIG_I2C_HELPER_AUTO=y | ||
| 810 | 818 | ||
| 811 | # | 819 | # |
| 812 | # I2C Hardware Bus support | 820 | # I2C Hardware Bus support |
| 813 | # | 821 | # |
| 822 | |||
| 823 | # | ||
| 824 | # PC SMBus host controller drivers | ||
| 825 | # | ||
| 814 | # CONFIG_I2C_ALI1535 is not set | 826 | # CONFIG_I2C_ALI1535 is not set |
| 815 | # CONFIG_I2C_ALI1563 is not set | 827 | # CONFIG_I2C_ALI1563 is not set |
| 816 | # CONFIG_I2C_ALI15X3 is not set | 828 | # CONFIG_I2C_ALI15X3 is not set |
| 817 | # CONFIG_I2C_AMD756 is not set | 829 | # CONFIG_I2C_AMD756 is not set |
| 818 | # CONFIG_I2C_AMD8111 is not set | 830 | # CONFIG_I2C_AMD8111 is not set |
| 819 | # CONFIG_I2C_HYDRA is not set | ||
| 820 | # CONFIG_I2C_I801 is not set | 831 | # CONFIG_I2C_I801 is not set |
| 821 | # CONFIG_I2C_I810 is not set | 832 | # CONFIG_I2C_ISCH is not set |
| 822 | # CONFIG_I2C_PIIX4 is not set | 833 | # CONFIG_I2C_PIIX4 is not set |
| 823 | CONFIG_I2C_POWERMAC=y | ||
| 824 | CONFIG_I2C_MPC=y | ||
| 825 | # CONFIG_I2C_NFORCE2 is not set | 834 | # CONFIG_I2C_NFORCE2 is not set |
| 826 | # CONFIG_I2C_OCORES is not set | ||
| 827 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 828 | # CONFIG_I2C_PROSAVAGE is not set | ||
| 829 | # CONFIG_I2C_SAVAGE4 is not set | ||
| 830 | # CONFIG_I2C_SIMTEC is not set | ||
| 831 | # CONFIG_I2C_SIS5595 is not set | 835 | # CONFIG_I2C_SIS5595 is not set |
| 832 | # CONFIG_I2C_SIS630 is not set | 836 | # CONFIG_I2C_SIS630 is not set |
| 833 | # CONFIG_I2C_SIS96X is not set | 837 | # CONFIG_I2C_SIS96X is not set |
| 834 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 835 | # CONFIG_I2C_STUB is not set | ||
| 836 | # CONFIG_I2C_VIA is not set | 838 | # CONFIG_I2C_VIA is not set |
| 837 | # CONFIG_I2C_VIAPRO is not set | 839 | # CONFIG_I2C_VIAPRO is not set |
| 840 | |||
| 841 | # | ||
| 842 | # Mac SMBus host controller drivers | ||
| 843 | # | ||
| 844 | # CONFIG_I2C_HYDRA is not set | ||
| 845 | CONFIG_I2C_POWERMAC=y | ||
| 846 | |||
| 847 | # | ||
| 848 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 849 | # | ||
| 850 | CONFIG_I2C_MPC=y | ||
| 851 | # CONFIG_I2C_OCORES is not set | ||
| 852 | # CONFIG_I2C_SIMTEC is not set | ||
| 853 | |||
| 854 | # | ||
| 855 | # External I2C/SMBus adapter drivers | ||
| 856 | # | ||
| 857 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 858 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 859 | |||
| 860 | # | ||
| 861 | # Graphics adapter I2C/DDC channel drivers | ||
| 862 | # | ||
| 838 | # CONFIG_I2C_VOODOO3 is not set | 863 | # CONFIG_I2C_VOODOO3 is not set |
| 864 | |||
| 865 | # | ||
| 866 | # Other I2C/SMBus bus drivers | ||
| 867 | # | ||
| 839 | # CONFIG_I2C_PCA_PLATFORM is not set | 868 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 869 | # CONFIG_I2C_STUB is not set | ||
| 840 | 870 | ||
| 841 | # | 871 | # |
| 842 | # Miscellaneous I2C Chip support | 872 | # Miscellaneous I2C Chip support |
| 843 | # | 873 | # |
| 844 | # CONFIG_DS1682 is not set | 874 | # CONFIG_DS1682 is not set |
| 875 | # CONFIG_AT24 is not set | ||
| 845 | # CONFIG_SENSORS_EEPROM is not set | 876 | # CONFIG_SENSORS_EEPROM is not set |
| 846 | # CONFIG_SENSORS_PCF8574 is not set | 877 | # CONFIG_SENSORS_PCF8574 is not set |
| 847 | # CONFIG_PCF8575 is not set | 878 | # CONFIG_PCF8575 is not set |
| 879 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 848 | # CONFIG_SENSORS_PCF8591 is not set | 880 | # CONFIG_SENSORS_PCF8591 is not set |
| 849 | # CONFIG_SENSORS_MAX6875 is not set | 881 | # CONFIG_SENSORS_MAX6875 is not set |
| 850 | # CONFIG_SENSORS_TSL2550 is not set | 882 | # CONFIG_SENSORS_TSL2550 is not set |
| @@ -853,6 +885,8 @@ CONFIG_I2C_MPC=y | |||
| 853 | # CONFIG_I2C_DEBUG_BUS is not set | 885 | # CONFIG_I2C_DEBUG_BUS is not set |
| 854 | # CONFIG_I2C_DEBUG_CHIP is not set | 886 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 855 | # CONFIG_SPI is not set | 887 | # CONFIG_SPI is not set |
| 888 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 889 | # CONFIG_GPIOLIB is not set | ||
| 856 | # CONFIG_W1 is not set | 890 | # CONFIG_W1 is not set |
| 857 | # CONFIG_POWER_SUPPLY is not set | 891 | # CONFIG_POWER_SUPPLY is not set |
| 858 | # CONFIG_HWMON is not set | 892 | # CONFIG_HWMON is not set |
| @@ -869,8 +903,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 869 | # | 903 | # |
| 870 | # Multifunction device drivers | 904 | # Multifunction device drivers |
| 871 | # | 905 | # |
| 906 | # CONFIG_MFD_CORE is not set | ||
| 872 | # CONFIG_MFD_SM501 is not set | 907 | # CONFIG_MFD_SM501 is not set |
| 873 | # CONFIG_HTC_PASIC3 is not set | 908 | # CONFIG_HTC_PASIC3 is not set |
| 909 | # CONFIG_MFD_TMIO is not set | ||
| 874 | 910 | ||
| 875 | # | 911 | # |
| 876 | # Multimedia devices | 912 | # Multimedia devices |
| @@ -945,6 +981,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y | |||
| 945 | # CONFIG_FB_TRIDENT is not set | 981 | # CONFIG_FB_TRIDENT is not set |
| 946 | # CONFIG_FB_ARK is not set | 982 | # CONFIG_FB_ARK is not set |
| 947 | # CONFIG_FB_PM3 is not set | 983 | # CONFIG_FB_PM3 is not set |
| 984 | # CONFIG_FB_CARMINE is not set | ||
| 948 | CONFIG_FB_FSL_DIU=y | 985 | CONFIG_FB_FSL_DIU=y |
| 949 | # CONFIG_FB_IBM_GXT4500 is not set | 986 | # CONFIG_FB_IBM_GXT4500 is not set |
| 950 | # CONFIG_FB_VIRTUAL is not set | 987 | # CONFIG_FB_VIRTUAL is not set |
| @@ -963,15 +1000,7 @@ CONFIG_VGA_CONSOLE=y | |||
| 963 | CONFIG_DUMMY_CONSOLE=y | 1000 | CONFIG_DUMMY_CONSOLE=y |
| 964 | # CONFIG_FRAMEBUFFER_CONSOLE is not set | 1001 | # CONFIG_FRAMEBUFFER_CONSOLE is not set |
| 965 | # CONFIG_LOGO is not set | 1002 | # CONFIG_LOGO is not set |
| 966 | |||
| 967 | # | ||
| 968 | # Sound | ||
| 969 | # | ||
| 970 | CONFIG_SOUND=y | 1003 | CONFIG_SOUND=y |
| 971 | |||
| 972 | # | ||
| 973 | # Advanced Linux Sound Architecture | ||
| 974 | # | ||
| 975 | CONFIG_SND=y | 1004 | CONFIG_SND=y |
| 976 | CONFIG_SND_TIMER=y | 1005 | CONFIG_SND_TIMER=y |
| 977 | CONFIG_SND_PCM=y | 1006 | CONFIG_SND_PCM=y |
| @@ -985,18 +1014,12 @@ CONFIG_SND_PCM_OSS_PLUGINS=y | |||
| 985 | CONFIG_SND_VERBOSE_PROCFS=y | 1014 | CONFIG_SND_VERBOSE_PROCFS=y |
| 986 | # CONFIG_SND_VERBOSE_PRINTK is not set | 1015 | # CONFIG_SND_VERBOSE_PRINTK is not set |
| 987 | # CONFIG_SND_DEBUG is not set | 1016 | # CONFIG_SND_DEBUG is not set |
| 988 | 1017 | CONFIG_SND_DRIVERS=y | |
| 989 | # | ||
| 990 | # Generic devices | ||
| 991 | # | ||
| 992 | # CONFIG_SND_DUMMY is not set | 1018 | # CONFIG_SND_DUMMY is not set |
| 993 | # CONFIG_SND_MTPAV is not set | 1019 | # CONFIG_SND_MTPAV is not set |
| 994 | # CONFIG_SND_SERIAL_U16550 is not set | 1020 | # CONFIG_SND_SERIAL_U16550 is not set |
| 995 | # CONFIG_SND_MPU401 is not set | 1021 | # CONFIG_SND_MPU401 is not set |
| 996 | 1022 | CONFIG_SND_PCI=y | |
| 997 | # | ||
| 998 | # PCI devices | ||
| 999 | # | ||
| 1000 | # CONFIG_SND_AD1889 is not set | 1023 | # CONFIG_SND_AD1889 is not set |
| 1001 | # CONFIG_SND_ALS300 is not set | 1024 | # CONFIG_SND_ALS300 is not set |
| 1002 | # CONFIG_SND_ALS4000 is not set | 1025 | # CONFIG_SND_ALS4000 is not set |
| @@ -1058,42 +1081,14 @@ CONFIG_SND_VERBOSE_PROCFS=y | |||
| 1058 | # CONFIG_SND_VIRTUOSO is not set | 1081 | # CONFIG_SND_VIRTUOSO is not set |
| 1059 | # CONFIG_SND_VX222 is not set | 1082 | # CONFIG_SND_VX222 is not set |
| 1060 | # CONFIG_SND_YMFPCI is not set | 1083 | # CONFIG_SND_YMFPCI is not set |
| 1061 | 1084 | CONFIG_SND_PPC=y | |
| 1062 | # | ||
| 1063 | # ALSA PowerMac devices | ||
| 1064 | # | ||
| 1065 | # CONFIG_SND_POWERMAC is not set | 1085 | # CONFIG_SND_POWERMAC is not set |
| 1066 | |||
| 1067 | # | ||
| 1068 | # ALSA PowerPC devices | ||
| 1069 | # | ||
| 1070 | |||
| 1071 | # | ||
| 1072 | # Apple Onboard Audio driver | ||
| 1073 | # | ||
| 1074 | # CONFIG_SND_AOA is not set | 1086 | # CONFIG_SND_AOA is not set |
| 1075 | # CONFIG_SND_AOA_SOUNDBUS is not set | ||
| 1076 | |||
| 1077 | # | ||
| 1078 | # System on Chip audio support | ||
| 1079 | # | ||
| 1080 | CONFIG_SND_SOC=y | 1087 | CONFIG_SND_SOC=y |
| 1081 | |||
| 1082 | # | ||
| 1083 | # ALSA SoC audio for Freescale SOCs | ||
| 1084 | # | ||
| 1085 | CONFIG_SND_SOC_MPC8610=y | 1088 | CONFIG_SND_SOC_MPC8610=y |
| 1086 | CONFIG_SND_SOC_MPC8610_HPCD=y | 1089 | CONFIG_SND_SOC_MPC8610_HPCD=y |
| 1087 | |||
| 1088 | # | ||
| 1089 | # SoC Audio for the Texas Instruments OMAP | ||
| 1090 | # | ||
| 1091 | CONFIG_SND_SOC_CS4270=y | 1090 | CONFIG_SND_SOC_CS4270=y |
| 1092 | CONFIG_SND_SOC_CS4270_VD33_ERRATA=y | 1091 | CONFIG_SND_SOC_CS4270_VD33_ERRATA=y |
| 1093 | |||
| 1094 | # | ||
| 1095 | # Open Sound System | ||
| 1096 | # | ||
| 1097 | # CONFIG_SOUND_PRIME is not set | 1092 | # CONFIG_SOUND_PRIME is not set |
| 1098 | CONFIG_HID_SUPPORT=y | 1093 | CONFIG_HID_SUPPORT=y |
| 1099 | CONFIG_HID=y | 1094 | CONFIG_HID=y |
| @@ -1108,6 +1103,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 1108 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 1103 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
| 1109 | 1104 | ||
| 1110 | # | 1105 | # |
| 1106 | # Enable Host or Gadget support to see Inventra options | ||
| 1107 | # | ||
| 1108 | |||
| 1109 | # | ||
| 1111 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1110 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 1112 | # | 1111 | # |
| 1113 | # CONFIG_USB_GADGET is not set | 1112 | # CONFIG_USB_GADGET is not set |
| @@ -1235,6 +1234,7 @@ CONFIG_TMPFS=y | |||
| 1235 | # CONFIG_CRAMFS is not set | 1234 | # CONFIG_CRAMFS is not set |
| 1236 | # CONFIG_VXFS_FS is not set | 1235 | # CONFIG_VXFS_FS is not set |
| 1237 | # CONFIG_MINIX_FS is not set | 1236 | # CONFIG_MINIX_FS is not set |
| 1237 | # CONFIG_OMFS_FS is not set | ||
| 1238 | # CONFIG_HPFS_FS is not set | 1238 | # CONFIG_HPFS_FS is not set |
| 1239 | # CONFIG_QNX4FS_FS is not set | 1239 | # CONFIG_QNX4FS_FS is not set |
| 1240 | # CONFIG_ROMFS_FS is not set | 1240 | # CONFIG_ROMFS_FS is not set |
| @@ -1245,16 +1245,15 @@ CONFIG_NFS_FS=y | |||
| 1245 | CONFIG_NFS_V3=y | 1245 | CONFIG_NFS_V3=y |
| 1246 | # CONFIG_NFS_V3_ACL is not set | 1246 | # CONFIG_NFS_V3_ACL is not set |
| 1247 | # CONFIG_NFS_V4 is not set | 1247 | # CONFIG_NFS_V4 is not set |
| 1248 | CONFIG_ROOT_NFS=y | ||
| 1248 | CONFIG_NFSD=y | 1249 | CONFIG_NFSD=y |
| 1249 | # CONFIG_NFSD_V3 is not set | 1250 | # CONFIG_NFSD_V3 is not set |
| 1250 | # CONFIG_NFSD_V4 is not set | 1251 | # CONFIG_NFSD_V4 is not set |
| 1251 | CONFIG_ROOT_NFS=y | ||
| 1252 | CONFIG_LOCKD=y | 1252 | CONFIG_LOCKD=y |
| 1253 | CONFIG_LOCKD_V4=y | 1253 | CONFIG_LOCKD_V4=y |
| 1254 | CONFIG_EXPORTFS=y | 1254 | CONFIG_EXPORTFS=y |
| 1255 | CONFIG_NFS_COMMON=y | 1255 | CONFIG_NFS_COMMON=y |
| 1256 | CONFIG_SUNRPC=y | 1256 | CONFIG_SUNRPC=y |
| 1257 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 1258 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1257 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 1259 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1258 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1260 | # CONFIG_SMB_FS is not set | 1259 | # CONFIG_SMB_FS is not set |
| @@ -1334,6 +1333,7 @@ CONFIG_BITREVERSE=y | |||
| 1334 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1333 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 1335 | # CONFIG_CRC_CCITT is not set | 1334 | # CONFIG_CRC_CCITT is not set |
| 1336 | # CONFIG_CRC16 is not set | 1335 | # CONFIG_CRC16 is not set |
| 1336 | CONFIG_CRC_T10DIF=y | ||
| 1337 | # CONFIG_CRC_ITU_T is not set | 1337 | # CONFIG_CRC_ITU_T is not set |
| 1338 | CONFIG_CRC32=y | 1338 | CONFIG_CRC32=y |
| 1339 | # CONFIG_CRC7 is not set | 1339 | # CONFIG_CRC7 is not set |
| @@ -1358,6 +1358,8 @@ CONFIG_FRAME_WARN=1024 | |||
| 1358 | CONFIG_DEBUG_KERNEL=y | 1358 | CONFIG_DEBUG_KERNEL=y |
| 1359 | CONFIG_DEBUG_SHIRQ=y | 1359 | CONFIG_DEBUG_SHIRQ=y |
| 1360 | CONFIG_DETECT_SOFTLOCKUP=y | 1360 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1361 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 1362 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 1361 | CONFIG_SCHED_DEBUG=y | 1363 | CONFIG_SCHED_DEBUG=y |
| 1362 | # CONFIG_SCHEDSTATS is not set | 1364 | # CONFIG_SCHEDSTATS is not set |
| 1363 | # CONFIG_TIMER_STATS is not set | 1365 | # CONFIG_TIMER_STATS is not set |
| @@ -1376,19 +1378,29 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
| 1376 | CONFIG_DEBUG_INFO=y | 1378 | CONFIG_DEBUG_INFO=y |
| 1377 | # CONFIG_DEBUG_VM is not set | 1379 | # CONFIG_DEBUG_VM is not set |
| 1378 | # CONFIG_DEBUG_WRITECOUNT is not set | 1380 | # CONFIG_DEBUG_WRITECOUNT is not set |
| 1381 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 1379 | # CONFIG_DEBUG_LIST is not set | 1382 | # CONFIG_DEBUG_LIST is not set |
| 1380 | # CONFIG_DEBUG_SG is not set | 1383 | # CONFIG_DEBUG_SG is not set |
| 1381 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1384 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 1382 | # CONFIG_RCU_TORTURE_TEST is not set | 1385 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1383 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1386 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 1384 | # CONFIG_FAULT_INJECTION is not set | 1387 | # CONFIG_FAULT_INJECTION is not set |
| 1388 | # CONFIG_LATENCYTOP is not set | ||
| 1389 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1390 | CONFIG_HAVE_FTRACE=y | ||
| 1391 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1392 | # CONFIG_FTRACE is not set | ||
| 1393 | # CONFIG_SCHED_TRACER is not set | ||
| 1394 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1385 | # CONFIG_SAMPLES is not set | 1395 | # CONFIG_SAMPLES is not set |
| 1396 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1397 | # CONFIG_KGDB is not set | ||
| 1386 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1398 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
| 1387 | # CONFIG_DEBUG_STACK_USAGE is not set | 1399 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1388 | # CONFIG_DEBUG_PAGEALLOC is not set | 1400 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1389 | # CONFIG_DEBUGGER is not set | ||
| 1390 | # CONFIG_CODE_PATCHING_SELFTEST is not set | 1401 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
| 1391 | # CONFIG_FTR_FIXUP_SELFTEST is not set | 1402 | # CONFIG_FTR_FIXUP_SELFTEST is not set |
| 1403 | # CONFIG_XMON is not set | ||
| 1392 | # CONFIG_IRQSTACKS is not set | 1404 | # CONFIG_IRQSTACKS is not set |
| 1393 | # CONFIG_BDI_SWITCH is not set | 1405 | # CONFIG_BDI_SWITCH is not set |
| 1394 | # CONFIG_BOOTX_TEXT is not set | 1406 | # CONFIG_BOOTX_TEXT is not set |
| @@ -1443,6 +1455,10 @@ CONFIG_CRYPTO=y | |||
| 1443 | # CONFIG_CRYPTO_MD4 is not set | 1455 | # CONFIG_CRYPTO_MD4 is not set |
| 1444 | # CONFIG_CRYPTO_MD5 is not set | 1456 | # CONFIG_CRYPTO_MD5 is not set |
| 1445 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1457 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 1458 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1459 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1460 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1461 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1446 | # CONFIG_CRYPTO_SHA1 is not set | 1462 | # CONFIG_CRYPTO_SHA1 is not set |
| 1447 | # CONFIG_CRYPTO_SHA256 is not set | 1463 | # CONFIG_CRYPTO_SHA256 is not set |
| 1448 | # CONFIG_CRYPTO_SHA512 is not set | 1464 | # CONFIG_CRYPTO_SHA512 is not set |
| @@ -1475,6 +1491,7 @@ CONFIG_CRYPTO=y | |||
| 1475 | # CONFIG_CRYPTO_LZO is not set | 1491 | # CONFIG_CRYPTO_LZO is not set |
| 1476 | CONFIG_CRYPTO_HW=y | 1492 | CONFIG_CRYPTO_HW=y |
| 1477 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1493 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1494 | # CONFIG_CRYPTO_DEV_TALITOS is not set | ||
| 1478 | # CONFIG_PPC_CLOCK is not set | 1495 | # CONFIG_PPC_CLOCK is not set |
| 1479 | CONFIG_PPC_LIB_RHEAP=y | 1496 | CONFIG_PPC_LIB_RHEAP=y |
| 1480 | # CONFIG_VIRTUALIZATION is not set | 1497 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/mpc8641_hpcn_defconfig b/arch/powerpc/configs/mpc8641_hpcn_defconfig index 867b8c0215f3..ea09be31b6ea 100644 --- a/arch/powerpc/configs/mpc8641_hpcn_defconfig +++ b/arch/powerpc/configs/mpc8641_hpcn_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.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Mon Jun 9 08:52:15 2008 | 4 | # Thu Aug 21 00:52:11 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -33,6 +33,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | 35 | CONFIG_STACKTRACE_SUPPORT=y |
| 36 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | 37 | CONFIG_LOCKDEP_SUPPORT=y |
| 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 38 | CONFIG_ARCH_HAS_ILOG2_U32=y | 39 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| @@ -92,7 +93,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 92 | CONFIG_SYSCTL=y | 93 | CONFIG_SYSCTL=y |
| 93 | CONFIG_EMBEDDED=y | 94 | CONFIG_EMBEDDED=y |
| 94 | CONFIG_SYSCTL_SYSCALL=y | 95 | CONFIG_SYSCTL_SYSCALL=y |
| 95 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 96 | CONFIG_KALLSYMS=y | 96 | CONFIG_KALLSYMS=y |
| 97 | CONFIG_KALLSYMS_ALL=y | 97 | CONFIG_KALLSYMS_ALL=y |
| 98 | CONFIG_KALLSYMS_EXTRA_PASS=y | 98 | CONFIG_KALLSYMS_EXTRA_PASS=y |
| @@ -100,6 +100,7 @@ CONFIG_HOTPLUG=y | |||
| 100 | CONFIG_PRINTK=y | 100 | CONFIG_PRINTK=y |
| 101 | CONFIG_BUG=y | 101 | CONFIG_BUG=y |
| 102 | CONFIG_ELF_CORE=y | 102 | CONFIG_ELF_CORE=y |
| 103 | CONFIG_PCSPKR_PLATFORM=y | ||
| 103 | CONFIG_COMPAT_BRK=y | 104 | CONFIG_COMPAT_BRK=y |
| 104 | CONFIG_BASE_FULL=y | 105 | CONFIG_BASE_FULL=y |
| 105 | CONFIG_FUTEX=y | 106 | CONFIG_FUTEX=y |
| @@ -118,10 +119,16 @@ CONFIG_SLUB=y | |||
| 118 | # CONFIG_MARKERS is not set | 119 | # CONFIG_MARKERS is not set |
| 119 | CONFIG_HAVE_OPROFILE=y | 120 | CONFIG_HAVE_OPROFILE=y |
| 120 | # CONFIG_KPROBES is not set | 121 | # CONFIG_KPROBES is not set |
| 122 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 123 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 121 | CONFIG_HAVE_KPROBES=y | 124 | CONFIG_HAVE_KPROBES=y |
| 122 | CONFIG_HAVE_KRETPROBES=y | 125 | CONFIG_HAVE_KRETPROBES=y |
| 126 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 123 | # CONFIG_HAVE_DMA_ATTRS is not set | 127 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 128 | CONFIG_USE_GENERIC_SMP_HELPERS=y | ||
| 129 | # CONFIG_HAVE_CLK is not set | ||
| 124 | CONFIG_PROC_PAGE_MONITOR=y | 130 | CONFIG_PROC_PAGE_MONITOR=y |
| 131 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 125 | CONFIG_SLABINFO=y | 132 | CONFIG_SLABINFO=y |
| 126 | CONFIG_RT_MUTEXES=y | 133 | CONFIG_RT_MUTEXES=y |
| 127 | # CONFIG_TINY_SHMEM is not set | 134 | # CONFIG_TINY_SHMEM is not set |
| @@ -139,6 +146,7 @@ CONFIG_LBD=y | |||
| 139 | # CONFIG_BLK_DEV_IO_TRACE is not set | 146 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 140 | # CONFIG_LSF is not set | 147 | # CONFIG_LSF is not set |
| 141 | # CONFIG_BLK_DEV_BSG is not set | 148 | # CONFIG_BLK_DEV_BSG is not set |
| 149 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 142 | 150 | ||
| 143 | # | 151 | # |
| 144 | # IO Schedulers | 152 | # IO Schedulers |
| @@ -157,30 +165,40 @@ CONFIG_CLASSIC_RCU=y | |||
| 157 | # | 165 | # |
| 158 | # Platform support | 166 | # Platform support |
| 159 | # | 167 | # |
| 160 | # CONFIG_PPC_MULTIPLATFORM is not set | 168 | CONFIG_PPC_MULTIPLATFORM=y |
| 161 | # CONFIG_PPC_82xx is not set | 169 | CONFIG_CLASSIC32=y |
| 162 | # CONFIG_PPC_83xx is not set | 170 | CONFIG_PPC_CHRP=y |
| 163 | CONFIG_PPC_86xx=y | 171 | # CONFIG_MPC5121_ADS is not set |
| 164 | # CONFIG_PPC_MPC512x is not set | 172 | # CONFIG_MPC5121_GENERIC is not set |
| 165 | # CONFIG_PPC_MPC5121 is not set | 173 | # CONFIG_PPC_MPC52xx is not set |
| 174 | CONFIG_PPC_PMAC=y | ||
| 166 | # CONFIG_PPC_CELL is not set | 175 | # CONFIG_PPC_CELL is not set |
| 167 | # CONFIG_PPC_CELL_NATIVE is not set | 176 | # CONFIG_PPC_CELL_NATIVE is not set |
| 177 | # CONFIG_PPC_82xx is not set | ||
| 168 | # CONFIG_PQ2ADS is not set | 178 | # CONFIG_PQ2ADS is not set |
| 179 | # CONFIG_PPC_83xx is not set | ||
| 180 | CONFIG_PPC_86xx=y | ||
| 169 | CONFIG_MPC8641_HPCN=y | 181 | CONFIG_MPC8641_HPCN=y |
| 170 | # CONFIG_SBC8641D is not set | 182 | # CONFIG_SBC8641D is not set |
| 171 | # CONFIG_MPC8610_HPCD is not set | 183 | # CONFIG_MPC8610_HPCD is not set |
| 172 | CONFIG_MPC8641=y | 184 | CONFIG_MPC8641=y |
| 185 | CONFIG_PPC_NATIVE=y | ||
| 186 | # CONFIG_UDBG_RTAS_CONSOLE is not set | ||
| 173 | # CONFIG_IPIC is not set | 187 | # CONFIG_IPIC is not set |
| 174 | CONFIG_MPIC=y | 188 | CONFIG_MPIC=y |
| 175 | # CONFIG_MPIC_WEIRD is not set | 189 | # CONFIG_MPIC_WEIRD is not set |
| 176 | CONFIG_PPC_I8259=y | 190 | CONFIG_PPC_I8259=y |
| 177 | # CONFIG_PPC_RTAS is not set | 191 | CONFIG_PPC_RTAS=y |
| 192 | # CONFIG_RTAS_ERROR_LOGGING is not set | ||
| 193 | CONFIG_RTAS_PROC=y | ||
| 178 | # CONFIG_MMIO_NVRAM is not set | 194 | # CONFIG_MMIO_NVRAM is not set |
| 179 | # CONFIG_PPC_MPC106 is not set | 195 | CONFIG_PPC_MPC106=y |
| 180 | # CONFIG_PPC_970_NAP is not set | 196 | # CONFIG_PPC_970_NAP is not set |
| 181 | # CONFIG_PPC_INDIRECT_IO is not set | 197 | # CONFIG_PPC_INDIRECT_IO is not set |
| 182 | # CONFIG_GENERIC_IOMAP is not set | 198 | # CONFIG_GENERIC_IOMAP is not set |
| 183 | # CONFIG_CPU_FREQ is not set | 199 | # CONFIG_CPU_FREQ is not set |
| 200 | # CONFIG_PPC601_SYNC_FIX is not set | ||
| 201 | # CONFIG_TAU is not set | ||
| 184 | CONFIG_FSL_ULI1575=y | 202 | CONFIG_FSL_ULI1575=y |
| 185 | 203 | ||
| 186 | # | 204 | # |
| @@ -196,16 +214,18 @@ CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | |||
| 196 | # CONFIG_HZ_300 is not set | 214 | # CONFIG_HZ_300 is not set |
| 197 | CONFIG_HZ_1000=y | 215 | CONFIG_HZ_1000=y |
| 198 | CONFIG_HZ=1000 | 216 | CONFIG_HZ=1000 |
| 199 | # CONFIG_SCHED_HRTICK is not set | 217 | CONFIG_SCHED_HRTICK=y |
| 200 | CONFIG_PREEMPT_NONE=y | 218 | CONFIG_PREEMPT_NONE=y |
| 201 | # CONFIG_PREEMPT_VOLUNTARY is not set | 219 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 202 | # CONFIG_PREEMPT is not set | 220 | # CONFIG_PREEMPT is not set |
| 203 | CONFIG_BINFMT_ELF=y | 221 | CONFIG_BINFMT_ELF=y |
| 204 | CONFIG_BINFMT_MISC=m | 222 | CONFIG_BINFMT_MISC=m |
| 205 | # CONFIG_IOMMU_HELPER is not set | 223 | # CONFIG_IOMMU_HELPER is not set |
| 224 | # CONFIG_HOTPLUG_CPU is not set | ||
| 206 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 225 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| 207 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 226 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
| 208 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 227 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
| 228 | # CONFIG_KEXEC is not set | ||
| 209 | # CONFIG_IRQ_ALL_CPUS is not set | 229 | # CONFIG_IRQ_ALL_CPUS is not set |
| 210 | CONFIG_ARCH_FLATMEM_ENABLE=y | 230 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 211 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 231 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
| @@ -219,6 +239,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 219 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 239 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 220 | CONFIG_PAGEFLAGS_EXTENDED=y | 240 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 221 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 241 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 242 | CONFIG_MIGRATION=y | ||
| 222 | # CONFIG_RESOURCES_64BIT is not set | 243 | # CONFIG_RESOURCES_64BIT is not set |
| 223 | CONFIG_ZONE_DMA_FLAG=1 | 244 | CONFIG_ZONE_DMA_FLAG=1 |
| 224 | CONFIG_BOUNCE=y | 245 | CONFIG_BOUNCE=y |
| @@ -226,6 +247,7 @@ CONFIG_VIRT_TO_BUS=y | |||
| 226 | CONFIG_FORCE_MAX_ZONEORDER=11 | 247 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 227 | CONFIG_PROC_DEVICETREE=y | 248 | CONFIG_PROC_DEVICETREE=y |
| 228 | # CONFIG_CMDLINE_BOOL is not set | 249 | # CONFIG_CMDLINE_BOOL is not set |
| 250 | CONFIG_EXTRA_TARGETS="" | ||
| 229 | # CONFIG_PM is not set | 251 | # CONFIG_PM is not set |
| 230 | CONFIG_SECCOMP=y | 252 | CONFIG_SECCOMP=y |
| 231 | CONFIG_ISA_DMA_API=y | 253 | CONFIG_ISA_DMA_API=y |
| @@ -233,11 +255,13 @@ CONFIG_ISA_DMA_API=y | |||
| 233 | # | 255 | # |
| 234 | # Bus options | 256 | # Bus options |
| 235 | # | 257 | # |
| 258 | # CONFIG_ISA is not set | ||
| 236 | CONFIG_ZONE_DMA=y | 259 | CONFIG_ZONE_DMA=y |
| 237 | CONFIG_GENERIC_ISA_DMA=y | 260 | CONFIG_GENERIC_ISA_DMA=y |
| 238 | CONFIG_PPC_INDIRECT_PCI=y | 261 | CONFIG_PPC_INDIRECT_PCI=y |
| 239 | CONFIG_FSL_SOC=y | 262 | CONFIG_FSL_SOC=y |
| 240 | CONFIG_FSL_PCI=y | 263 | CONFIG_FSL_PCI=y |
| 264 | CONFIG_PPC_PCI_CHOICE=y | ||
| 241 | CONFIG_PCI=y | 265 | CONFIG_PCI=y |
| 242 | CONFIG_PCI_DOMAINS=y | 266 | CONFIG_PCI_DOMAINS=y |
| 243 | CONFIG_PCI_SYSCALL=y | 267 | CONFIG_PCI_SYSCALL=y |
| @@ -264,10 +288,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
| 264 | CONFIG_KERNEL_START=0xc0000000 | 288 | CONFIG_KERNEL_START=0xc0000000 |
| 265 | CONFIG_PHYSICAL_START=0x00000000 | 289 | CONFIG_PHYSICAL_START=0x00000000 |
| 266 | CONFIG_TASK_SIZE=0xc0000000 | 290 | CONFIG_TASK_SIZE=0xc0000000 |
| 267 | |||
| 268 | # | ||
| 269 | # Networking | ||
| 270 | # | ||
| 271 | CONFIG_NET=y | 291 | CONFIG_NET=y |
| 272 | 292 | ||
| 273 | # | 293 | # |
| @@ -393,6 +413,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | |||
| 393 | CONFIG_STANDALONE=y | 413 | CONFIG_STANDALONE=y |
| 394 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 414 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 395 | CONFIG_FW_LOADER=y | 415 | CONFIG_FW_LOADER=y |
| 416 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
| 417 | CONFIG_EXTRA_FIRMWARE="" | ||
| 396 | # CONFIG_DEBUG_DRIVER is not set | 418 | # CONFIG_DEBUG_DRIVER is not set |
| 397 | # CONFIG_DEBUG_DEVRES is not set | 419 | # CONFIG_DEBUG_DEVRES is not set |
| 398 | # CONFIG_SYS_HYPERVISOR is not set | 420 | # CONFIG_SYS_HYPERVISOR is not set |
| @@ -403,6 +425,7 @@ CONFIG_OF_I2C=y | |||
| 403 | # CONFIG_PARPORT is not set | 425 | # CONFIG_PARPORT is not set |
| 404 | CONFIG_BLK_DEV=y | 426 | CONFIG_BLK_DEV=y |
| 405 | # CONFIG_BLK_DEV_FD is not set | 427 | # CONFIG_BLK_DEV_FD is not set |
| 428 | # CONFIG_MAC_FLOPPY is not set | ||
| 406 | # CONFIG_BLK_CPQ_DA is not set | 429 | # CONFIG_BLK_CPQ_DA is not set |
| 407 | # CONFIG_BLK_CPQ_CISS_DA is not set | 430 | # CONFIG_BLK_CPQ_CISS_DA is not set |
| 408 | # CONFIG_BLK_DEV_DAC960 is not set | 431 | # CONFIG_BLK_DEV_DAC960 is not set |
| @@ -419,12 +442,14 @@ CONFIG_BLK_DEV_RAM_SIZE=131072 | |||
| 419 | # CONFIG_BLK_DEV_XIP is not set | 442 | # CONFIG_BLK_DEV_XIP is not set |
| 420 | # CONFIG_CDROM_PKTCDVD is not set | 443 | # CONFIG_CDROM_PKTCDVD is not set |
| 421 | # CONFIG_ATA_OVER_ETH is not set | 444 | # CONFIG_ATA_OVER_ETH is not set |
| 445 | # CONFIG_BLK_DEV_HD is not set | ||
| 422 | CONFIG_MISC_DEVICES=y | 446 | CONFIG_MISC_DEVICES=y |
| 423 | # CONFIG_PHANTOM is not set | 447 | # CONFIG_PHANTOM is not set |
| 424 | # CONFIG_EEPROM_93CX6 is not set | 448 | # CONFIG_EEPROM_93CX6 is not set |
| 425 | # CONFIG_SGI_IOC4 is not set | 449 | # CONFIG_SGI_IOC4 is not set |
| 426 | # CONFIG_TIFM_CORE is not set | 450 | # CONFIG_TIFM_CORE is not set |
| 427 | # CONFIG_ENCLOSURE_SERVICES is not set | 451 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 452 | # CONFIG_HP_ILO is not set | ||
| 428 | CONFIG_HAVE_IDE=y | 453 | CONFIG_HAVE_IDE=y |
| 429 | # CONFIG_IDE is not set | 454 | # CONFIG_IDE is not set |
| 430 | 455 | ||
| @@ -503,7 +528,10 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 503 | # CONFIG_SCSI_DC390T is not set | 528 | # CONFIG_SCSI_DC390T is not set |
| 504 | # CONFIG_SCSI_NSP32 is not set | 529 | # CONFIG_SCSI_NSP32 is not set |
| 505 | # CONFIG_SCSI_DEBUG is not set | 530 | # CONFIG_SCSI_DEBUG is not set |
| 531 | # CONFIG_SCSI_MESH is not set | ||
| 532 | # CONFIG_SCSI_MAC53C94 is not set | ||
| 506 | # CONFIG_SCSI_SRP is not set | 533 | # CONFIG_SCSI_SRP is not set |
| 534 | # CONFIG_SCSI_DH is not set | ||
| 507 | CONFIG_ATA=y | 535 | CONFIG_ATA=y |
| 508 | # CONFIG_ATA_NONSTANDARD is not set | 536 | # CONFIG_ATA_NONSTANDARD is not set |
| 509 | CONFIG_SATA_PMP=y | 537 | CONFIG_SATA_PMP=y |
| @@ -571,12 +599,15 @@ CONFIG_PATA_ALI=y | |||
| 571 | # | 599 | # |
| 572 | # IEEE 1394 (FireWire) support | 600 | # IEEE 1394 (FireWire) support |
| 573 | # | 601 | # |
| 602 | |||
| 603 | # | ||
| 604 | # Enable only one of the two stacks, unless you know what you are doing | ||
| 605 | # | ||
| 574 | # CONFIG_FIREWIRE is not set | 606 | # CONFIG_FIREWIRE is not set |
| 575 | # CONFIG_IEEE1394 is not set | 607 | # CONFIG_IEEE1394 is not set |
| 576 | # CONFIG_I2O is not set | 608 | # CONFIG_I2O is not set |
| 577 | # CONFIG_MACINTOSH_DRIVERS is not set | 609 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 578 | CONFIG_NETDEVICES=y | 610 | CONFIG_NETDEVICES=y |
| 579 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 580 | CONFIG_DUMMY=y | 611 | CONFIG_DUMMY=y |
| 581 | # CONFIG_BONDING is not set | 612 | # CONFIG_BONDING is not set |
| 582 | # CONFIG_MACVLAN is not set | 613 | # CONFIG_MACVLAN is not set |
| @@ -603,6 +634,8 @@ CONFIG_VITESSE_PHY=y | |||
| 603 | # CONFIG_MDIO_BITBANG is not set | 634 | # CONFIG_MDIO_BITBANG is not set |
| 604 | CONFIG_NET_ETHERNET=y | 635 | CONFIG_NET_ETHERNET=y |
| 605 | CONFIG_MII=y | 636 | CONFIG_MII=y |
| 637 | # CONFIG_MACE is not set | ||
| 638 | # CONFIG_BMAC is not set | ||
| 606 | # CONFIG_HAPPYMEAL is not set | 639 | # CONFIG_HAPPYMEAL is not set |
| 607 | # CONFIG_SUNGEM is not set | 640 | # CONFIG_SUNGEM is not set |
| 608 | # CONFIG_CASSINI is not set | 641 | # CONFIG_CASSINI is not set |
| @@ -620,7 +653,6 @@ CONFIG_NETDEV_1000=y | |||
| 620 | # CONFIG_DL2K is not set | 653 | # CONFIG_DL2K is not set |
| 621 | # CONFIG_E1000 is not set | 654 | # CONFIG_E1000 is not set |
| 622 | # CONFIG_E1000E is not set | 655 | # CONFIG_E1000E is not set |
| 623 | # CONFIG_E1000E_ENABLED is not set | ||
| 624 | # CONFIG_IP1000 is not set | 656 | # CONFIG_IP1000 is not set |
| 625 | # CONFIG_IGB is not set | 657 | # CONFIG_IGB is not set |
| 626 | # CONFIG_NS83820 is not set | 658 | # CONFIG_NS83820 is not set |
| @@ -634,9 +666,10 @@ CONFIG_NETDEV_1000=y | |||
| 634 | # CONFIG_TIGON3 is not set | 666 | # CONFIG_TIGON3 is not set |
| 635 | # CONFIG_BNX2 is not set | 667 | # CONFIG_BNX2 is not set |
| 636 | CONFIG_GIANFAR=y | 668 | CONFIG_GIANFAR=y |
| 637 | CONFIG_GFAR_NAPI=y | 669 | # CONFIG_MV643XX_ETH is not set |
| 638 | # CONFIG_QLA3XXX is not set | 670 | # CONFIG_QLA3XXX is not set |
| 639 | # CONFIG_ATL1 is not set | 671 | # CONFIG_ATL1 is not set |
| 672 | # CONFIG_ATL1E is not set | ||
| 640 | CONFIG_NETDEV_10000=y | 673 | CONFIG_NETDEV_10000=y |
| 641 | # CONFIG_CHELSIO_T1 is not set | 674 | # CONFIG_CHELSIO_T1 is not set |
| 642 | # CONFIG_CHELSIO_T3 is not set | 675 | # CONFIG_CHELSIO_T3 is not set |
| @@ -713,12 +746,14 @@ CONFIG_SERIO_SERPORT=y | |||
| 713 | # CONFIG_SERIO_PCIPS2 is not set | 746 | # CONFIG_SERIO_PCIPS2 is not set |
| 714 | CONFIG_SERIO_LIBPS2=y | 747 | CONFIG_SERIO_LIBPS2=y |
| 715 | # CONFIG_SERIO_RAW is not set | 748 | # CONFIG_SERIO_RAW is not set |
| 749 | # CONFIG_SERIO_XILINX_XPS_PS2 is not set | ||
| 716 | # CONFIG_GAMEPORT is not set | 750 | # CONFIG_GAMEPORT is not set |
| 717 | 751 | ||
| 718 | # | 752 | # |
| 719 | # Character devices | 753 | # Character devices |
| 720 | # | 754 | # |
| 721 | CONFIG_VT=y | 755 | CONFIG_VT=y |
| 756 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 722 | CONFIG_VT_CONSOLE=y | 757 | CONFIG_VT_CONSOLE=y |
| 723 | CONFIG_HW_CONSOLE=y | 758 | CONFIG_HW_CONSOLE=y |
| 724 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 759 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| @@ -746,11 +781,14 @@ CONFIG_SERIAL_8250_RSA=y | |||
| 746 | # CONFIG_SERIAL_UARTLITE is not set | 781 | # CONFIG_SERIAL_UARTLITE is not set |
| 747 | CONFIG_SERIAL_CORE=y | 782 | CONFIG_SERIAL_CORE=y |
| 748 | CONFIG_SERIAL_CORE_CONSOLE=y | 783 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 784 | # CONFIG_SERIAL_PMACZILOG is not set | ||
| 749 | # CONFIG_SERIAL_JSM is not set | 785 | # CONFIG_SERIAL_JSM is not set |
| 750 | # CONFIG_SERIAL_OF_PLATFORM is not set | 786 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 751 | CONFIG_UNIX98_PTYS=y | 787 | CONFIG_UNIX98_PTYS=y |
| 752 | CONFIG_LEGACY_PTYS=y | 788 | CONFIG_LEGACY_PTYS=y |
| 753 | CONFIG_LEGACY_PTY_COUNT=256 | 789 | CONFIG_LEGACY_PTY_COUNT=256 |
| 790 | # CONFIG_BRIQ_PANEL is not set | ||
| 791 | # CONFIG_HVC_RTAS is not set | ||
| 754 | # CONFIG_IPMI_HANDLER is not set | 792 | # CONFIG_IPMI_HANDLER is not set |
| 755 | # CONFIG_HW_RANDOM is not set | 793 | # CONFIG_HW_RANDOM is not set |
| 756 | CONFIG_NVRAM=y | 794 | CONFIG_NVRAM=y |
| @@ -762,43 +800,70 @@ CONFIG_DEVPORT=y | |||
| 762 | CONFIG_I2C=y | 800 | CONFIG_I2C=y |
| 763 | CONFIG_I2C_BOARDINFO=y | 801 | CONFIG_I2C_BOARDINFO=y |
| 764 | # CONFIG_I2C_CHARDEV is not set | 802 | # CONFIG_I2C_CHARDEV is not set |
| 803 | CONFIG_I2C_HELPER_AUTO=y | ||
| 765 | 804 | ||
| 766 | # | 805 | # |
| 767 | # I2C Hardware Bus support | 806 | # I2C Hardware Bus support |
| 768 | # | 807 | # |
| 808 | |||
| 809 | # | ||
| 810 | # PC SMBus host controller drivers | ||
| 811 | # | ||
| 769 | # CONFIG_I2C_ALI1535 is not set | 812 | # CONFIG_I2C_ALI1535 is not set |
| 770 | # CONFIG_I2C_ALI1563 is not set | 813 | # CONFIG_I2C_ALI1563 is not set |
| 771 | # CONFIG_I2C_ALI15X3 is not set | 814 | # CONFIG_I2C_ALI15X3 is not set |
| 772 | # CONFIG_I2C_AMD756 is not set | 815 | # CONFIG_I2C_AMD756 is not set |
| 773 | # CONFIG_I2C_AMD8111 is not set | 816 | # CONFIG_I2C_AMD8111 is not set |
| 774 | # CONFIG_I2C_I801 is not set | 817 | # CONFIG_I2C_I801 is not set |
| 775 | # CONFIG_I2C_I810 is not set | 818 | # CONFIG_I2C_ISCH is not set |
| 776 | # CONFIG_I2C_PIIX4 is not set | 819 | # CONFIG_I2C_PIIX4 is not set |
| 777 | CONFIG_I2C_MPC=y | ||
| 778 | # CONFIG_I2C_NFORCE2 is not set | 820 | # CONFIG_I2C_NFORCE2 is not set |
| 779 | # CONFIG_I2C_OCORES is not set | ||
| 780 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 781 | # CONFIG_I2C_PROSAVAGE is not set | ||
| 782 | # CONFIG_I2C_SAVAGE4 is not set | ||
| 783 | # CONFIG_I2C_SIMTEC is not set | ||
| 784 | # CONFIG_I2C_SIS5595 is not set | 821 | # CONFIG_I2C_SIS5595 is not set |
| 785 | # CONFIG_I2C_SIS630 is not set | 822 | # CONFIG_I2C_SIS630 is not set |
| 786 | # CONFIG_I2C_SIS96X is not set | 823 | # CONFIG_I2C_SIS96X is not set |
| 787 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 788 | # CONFIG_I2C_STUB is not set | ||
| 789 | # CONFIG_I2C_TINY_USB is not set | ||
| 790 | # CONFIG_I2C_VIA is not set | 824 | # CONFIG_I2C_VIA is not set |
| 791 | # CONFIG_I2C_VIAPRO is not set | 825 | # CONFIG_I2C_VIAPRO is not set |
| 826 | |||
| 827 | # | ||
| 828 | # Mac SMBus host controller drivers | ||
| 829 | # | ||
| 830 | # CONFIG_I2C_HYDRA is not set | ||
| 831 | CONFIG_I2C_POWERMAC=y | ||
| 832 | |||
| 833 | # | ||
| 834 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 835 | # | ||
| 836 | CONFIG_I2C_MPC=y | ||
| 837 | # CONFIG_I2C_OCORES is not set | ||
| 838 | # CONFIG_I2C_SIMTEC is not set | ||
| 839 | |||
| 840 | # | ||
| 841 | # External I2C/SMBus adapter drivers | ||
| 842 | # | ||
| 843 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 844 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 845 | # CONFIG_I2C_TINY_USB is not set | ||
| 846 | |||
| 847 | # | ||
| 848 | # Graphics adapter I2C/DDC channel drivers | ||
| 849 | # | ||
| 792 | # CONFIG_I2C_VOODOO3 is not set | 850 | # CONFIG_I2C_VOODOO3 is not set |
| 851 | |||
| 852 | # | ||
| 853 | # Other I2C/SMBus bus drivers | ||
| 854 | # | ||
| 793 | # CONFIG_I2C_PCA_PLATFORM is not set | 855 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 856 | # CONFIG_I2C_STUB is not set | ||
| 794 | 857 | ||
| 795 | # | 858 | # |
| 796 | # Miscellaneous I2C Chip support | 859 | # Miscellaneous I2C Chip support |
| 797 | # | 860 | # |
| 798 | # CONFIG_DS1682 is not set | 861 | # CONFIG_DS1682 is not set |
| 862 | # CONFIG_AT24 is not set | ||
| 799 | CONFIG_SENSORS_EEPROM=y | 863 | CONFIG_SENSORS_EEPROM=y |
| 800 | # CONFIG_SENSORS_PCF8574 is not set | 864 | # CONFIG_SENSORS_PCF8574 is not set |
| 801 | # CONFIG_PCF8575 is not set | 865 | # CONFIG_PCF8575 is not set |
| 866 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 802 | # CONFIG_SENSORS_PCF8591 is not set | 867 | # CONFIG_SENSORS_PCF8591 is not set |
| 803 | # CONFIG_SENSORS_MAX6875 is not set | 868 | # CONFIG_SENSORS_MAX6875 is not set |
| 804 | # CONFIG_SENSORS_TSL2550 is not set | 869 | # CONFIG_SENSORS_TSL2550 is not set |
| @@ -807,10 +872,13 @@ CONFIG_SENSORS_EEPROM=y | |||
| 807 | # CONFIG_I2C_DEBUG_BUS is not set | 872 | # CONFIG_I2C_DEBUG_BUS is not set |
| 808 | # CONFIG_I2C_DEBUG_CHIP is not set | 873 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 809 | # CONFIG_SPI is not set | 874 | # CONFIG_SPI is not set |
| 875 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 876 | # CONFIG_GPIOLIB is not set | ||
| 810 | # CONFIG_W1 is not set | 877 | # CONFIG_W1 is not set |
| 811 | # CONFIG_POWER_SUPPLY is not set | 878 | # CONFIG_POWER_SUPPLY is not set |
| 812 | # CONFIG_HWMON is not set | 879 | # CONFIG_HWMON is not set |
| 813 | # CONFIG_THERMAL is not set | 880 | # CONFIG_THERMAL is not set |
| 881 | # CONFIG_THERMAL_HWMON is not set | ||
| 814 | # CONFIG_WATCHDOG is not set | 882 | # CONFIG_WATCHDOG is not set |
| 815 | 883 | ||
| 816 | # | 884 | # |
| @@ -822,8 +890,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 822 | # | 890 | # |
| 823 | # Multifunction device drivers | 891 | # Multifunction device drivers |
| 824 | # | 892 | # |
| 893 | # CONFIG_MFD_CORE is not set | ||
| 825 | # CONFIG_MFD_SM501 is not set | 894 | # CONFIG_MFD_SM501 is not set |
| 826 | # CONFIG_HTC_PASIC3 is not set | 895 | # CONFIG_HTC_PASIC3 is not set |
| 896 | # CONFIG_MFD_TMIO is not set | ||
| 827 | 897 | ||
| 828 | # | 898 | # |
| 829 | # Multimedia devices | 899 | # Multimedia devices |
| @@ -865,6 +935,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
| 865 | # CONFIG_DVB_TTUSB_BUDGET is not set | 935 | # CONFIG_DVB_TTUSB_BUDGET is not set |
| 866 | # CONFIG_DVB_TTUSB_DEC is not set | 936 | # CONFIG_DVB_TTUSB_DEC is not set |
| 867 | # CONFIG_DVB_CINERGYT2 is not set | 937 | # CONFIG_DVB_CINERGYT2 is not set |
| 938 | # CONFIG_DVB_SIANO_SMS1XXX is not set | ||
| 868 | 939 | ||
| 869 | # | 940 | # |
| 870 | # Supported FlexCopII (B2C2) Adapters | 941 | # Supported FlexCopII (B2C2) Adapters |
| @@ -911,6 +982,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
| 911 | # CONFIG_DVB_SP887X is not set | 982 | # CONFIG_DVB_SP887X is not set |
| 912 | # CONFIG_DVB_CX22700 is not set | 983 | # CONFIG_DVB_CX22700 is not set |
| 913 | # CONFIG_DVB_CX22702 is not set | 984 | # CONFIG_DVB_CX22702 is not set |
| 985 | # CONFIG_DVB_DRX397XD is not set | ||
| 914 | # CONFIG_DVB_L64781 is not set | 986 | # CONFIG_DVB_L64781 is not set |
| 915 | # CONFIG_DVB_TDA1004X is not set | 987 | # CONFIG_DVB_TDA1004X is not set |
| 916 | # CONFIG_DVB_NXT6000 is not set | 988 | # CONFIG_DVB_NXT6000 is not set |
| @@ -978,15 +1050,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
| 978 | CONFIG_VGA_CONSOLE=y | 1050 | CONFIG_VGA_CONSOLE=y |
| 979 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set | 1051 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set |
| 980 | CONFIG_DUMMY_CONSOLE=y | 1052 | CONFIG_DUMMY_CONSOLE=y |
| 981 | |||
| 982 | # | ||
| 983 | # Sound | ||
| 984 | # | ||
| 985 | CONFIG_SOUND=y | 1053 | CONFIG_SOUND=y |
| 986 | |||
| 987 | # | ||
| 988 | # Advanced Linux Sound Architecture | ||
| 989 | # | ||
| 990 | CONFIG_SND=y | 1054 | CONFIG_SND=y |
| 991 | CONFIG_SND_TIMER=y | 1055 | CONFIG_SND_TIMER=y |
| 992 | CONFIG_SND_PCM=y | 1056 | CONFIG_SND_PCM=y |
| @@ -1000,19 +1064,15 @@ CONFIG_SND_PCM_OSS_PLUGINS=y | |||
| 1000 | CONFIG_SND_VERBOSE_PROCFS=y | 1064 | CONFIG_SND_VERBOSE_PROCFS=y |
| 1001 | # CONFIG_SND_VERBOSE_PRINTK is not set | 1065 | # CONFIG_SND_VERBOSE_PRINTK is not set |
| 1002 | # CONFIG_SND_DEBUG is not set | 1066 | # CONFIG_SND_DEBUG is not set |
| 1003 | 1067 | CONFIG_SND_VMASTER=y | |
| 1004 | # | ||
| 1005 | # Generic devices | ||
| 1006 | # | ||
| 1007 | CONFIG_SND_AC97_CODEC=y | 1068 | CONFIG_SND_AC97_CODEC=y |
| 1069 | CONFIG_SND_DRIVERS=y | ||
| 1008 | # CONFIG_SND_DUMMY is not set | 1070 | # CONFIG_SND_DUMMY is not set |
| 1009 | # CONFIG_SND_MTPAV is not set | 1071 | # CONFIG_SND_MTPAV is not set |
| 1010 | # CONFIG_SND_SERIAL_U16550 is not set | 1072 | # CONFIG_SND_SERIAL_U16550 is not set |
| 1011 | # CONFIG_SND_MPU401 is not set | 1073 | # CONFIG_SND_MPU401 is not set |
| 1012 | 1074 | # CONFIG_SND_AC97_POWER_SAVE is not set | |
| 1013 | # | 1075 | CONFIG_SND_PCI=y |
| 1014 | # PCI devices | ||
| 1015 | # | ||
| 1016 | # CONFIG_SND_AD1889 is not set | 1076 | # CONFIG_SND_AD1889 is not set |
| 1017 | # CONFIG_SND_ALS300 is not set | 1077 | # CONFIG_SND_ALS300 is not set |
| 1018 | # CONFIG_SND_ALS4000 is not set | 1078 | # CONFIG_SND_ALS4000 is not set |
| @@ -1074,39 +1134,14 @@ CONFIG_SND_INTEL8X0=y | |||
| 1074 | # CONFIG_SND_VIRTUOSO is not set | 1134 | # CONFIG_SND_VIRTUOSO is not set |
| 1075 | # CONFIG_SND_VX222 is not set | 1135 | # CONFIG_SND_VX222 is not set |
| 1076 | # CONFIG_SND_YMFPCI is not set | 1136 | # CONFIG_SND_YMFPCI is not set |
| 1077 | # CONFIG_SND_AC97_POWER_SAVE is not set | 1137 | CONFIG_SND_PPC=y |
| 1078 | 1138 | # CONFIG_SND_POWERMAC is not set | |
| 1079 | # | 1139 | # CONFIG_SND_AOA is not set |
| 1080 | # ALSA PowerMac devices | 1140 | CONFIG_SND_USB=y |
| 1081 | # | ||
| 1082 | |||
| 1083 | # | ||
| 1084 | # ALSA PowerPC devices | ||
| 1085 | # | ||
| 1086 | |||
| 1087 | # | ||
| 1088 | # USB devices | ||
| 1089 | # | ||
| 1090 | # CONFIG_SND_USB_AUDIO is not set | 1141 | # CONFIG_SND_USB_AUDIO is not set |
| 1091 | # CONFIG_SND_USB_USX2Y is not set | 1142 | # CONFIG_SND_USB_USX2Y is not set |
| 1092 | # CONFIG_SND_USB_CAIAQ is not set | 1143 | # CONFIG_SND_USB_CAIAQ is not set |
| 1093 | |||
| 1094 | # | ||
| 1095 | # System on Chip audio support | ||
| 1096 | # | ||
| 1097 | # CONFIG_SND_SOC is not set | 1144 | # CONFIG_SND_SOC is not set |
| 1098 | |||
| 1099 | # | ||
| 1100 | # ALSA SoC audio for Freescale SOCs | ||
| 1101 | # | ||
| 1102 | |||
| 1103 | # | ||
| 1104 | # SoC Audio for the Texas Instruments OMAP | ||
| 1105 | # | ||
| 1106 | |||
| 1107 | # | ||
| 1108 | # Open Sound System | ||
| 1109 | # | ||
| 1110 | # CONFIG_SOUND_PRIME is not set | 1145 | # CONFIG_SOUND_PRIME is not set |
| 1111 | CONFIG_AC97_BUS=y | 1146 | CONFIG_AC97_BUS=y |
| 1112 | CONFIG_HID_SUPPORT=y | 1147 | CONFIG_HID_SUPPORT=y |
| @@ -1138,6 +1173,7 @@ CONFIG_USB_DEVICE_CLASS=y | |||
| 1138 | # CONFIG_USB_OTG is not set | 1173 | # CONFIG_USB_OTG is not set |
| 1139 | # CONFIG_USB_OTG_WHITELIST is not set | 1174 | # CONFIG_USB_OTG_WHITELIST is not set |
| 1140 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 1175 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
| 1176 | CONFIG_USB_MON=y | ||
| 1141 | 1177 | ||
| 1142 | # | 1178 | # |
| 1143 | # USB Host Controller Drivers | 1179 | # USB Host Controller Drivers |
| @@ -1189,6 +1225,7 @@ CONFIG_USB_STORAGE=y | |||
| 1189 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1225 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1190 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1226 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
| 1191 | # CONFIG_USB_STORAGE_KARMA is not set | 1227 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1228 | # CONFIG_USB_STORAGE_SIERRA is not set | ||
| 1192 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | 1229 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
| 1193 | # CONFIG_USB_LIBUSUAL is not set | 1230 | # CONFIG_USB_LIBUSUAL is not set |
| 1194 | 1231 | ||
| @@ -1197,7 +1234,6 @@ CONFIG_USB_STORAGE=y | |||
| 1197 | # | 1234 | # |
| 1198 | # CONFIG_USB_MDC800 is not set | 1235 | # CONFIG_USB_MDC800 is not set |
| 1199 | # CONFIG_USB_MICROTEK is not set | 1236 | # CONFIG_USB_MICROTEK is not set |
| 1200 | CONFIG_USB_MON=y | ||
| 1201 | 1237 | ||
| 1202 | # | 1238 | # |
| 1203 | # USB port drivers | 1239 | # USB port drivers |
| @@ -1210,7 +1246,6 @@ CONFIG_USB_MON=y | |||
| 1210 | # CONFIG_USB_EMI62 is not set | 1246 | # CONFIG_USB_EMI62 is not set |
| 1211 | # CONFIG_USB_EMI26 is not set | 1247 | # CONFIG_USB_EMI26 is not set |
| 1212 | # CONFIG_USB_ADUTUX is not set | 1248 | # CONFIG_USB_ADUTUX is not set |
| 1213 | # CONFIG_USB_AUERSWALD is not set | ||
| 1214 | # CONFIG_USB_RIO500 is not set | 1249 | # CONFIG_USB_RIO500 is not set |
| 1215 | # CONFIG_USB_LEGOTOWER is not set | 1250 | # CONFIG_USB_LEGOTOWER is not set |
| 1216 | # CONFIG_USB_LCD is not set | 1251 | # CONFIG_USB_LCD is not set |
| @@ -1264,6 +1299,7 @@ CONFIG_RTC_INTF_DEV=y | |||
| 1264 | # CONFIG_RTC_DRV_PCF8583 is not set | 1299 | # CONFIG_RTC_DRV_PCF8583 is not set |
| 1265 | # CONFIG_RTC_DRV_M41T80 is not set | 1300 | # CONFIG_RTC_DRV_M41T80 is not set |
| 1266 | # CONFIG_RTC_DRV_S35390A is not set | 1301 | # CONFIG_RTC_DRV_S35390A is not set |
| 1302 | # CONFIG_RTC_DRV_FM3130 is not set | ||
| 1267 | 1303 | ||
| 1268 | # | 1304 | # |
| 1269 | # SPI RTC drivers | 1305 | # SPI RTC drivers |
| @@ -1362,6 +1398,7 @@ CONFIG_EFS_FS=m | |||
| 1362 | CONFIG_CRAMFS=y | 1398 | CONFIG_CRAMFS=y |
| 1363 | CONFIG_VXFS_FS=m | 1399 | CONFIG_VXFS_FS=m |
| 1364 | # CONFIG_MINIX_FS is not set | 1400 | # CONFIG_MINIX_FS is not set |
| 1401 | # CONFIG_OMFS_FS is not set | ||
| 1365 | CONFIG_HPFS_FS=m | 1402 | CONFIG_HPFS_FS=m |
| 1366 | CONFIG_QNX4FS_FS=m | 1403 | CONFIG_QNX4FS_FS=m |
| 1367 | # CONFIG_ROMFS_FS is not set | 1404 | # CONFIG_ROMFS_FS is not set |
| @@ -1374,17 +1411,16 @@ CONFIG_NFS_FS=y | |||
| 1374 | CONFIG_NFS_V3=y | 1411 | CONFIG_NFS_V3=y |
| 1375 | # CONFIG_NFS_V3_ACL is not set | 1412 | # CONFIG_NFS_V3_ACL is not set |
| 1376 | CONFIG_NFS_V4=y | 1413 | CONFIG_NFS_V4=y |
| 1414 | CONFIG_ROOT_NFS=y | ||
| 1377 | CONFIG_NFSD=y | 1415 | CONFIG_NFSD=y |
| 1378 | # CONFIG_NFSD_V3 is not set | 1416 | # CONFIG_NFSD_V3 is not set |
| 1379 | # CONFIG_NFSD_V4 is not set | 1417 | # CONFIG_NFSD_V4 is not set |
| 1380 | CONFIG_ROOT_NFS=y | ||
| 1381 | CONFIG_LOCKD=y | 1418 | CONFIG_LOCKD=y |
| 1382 | CONFIG_LOCKD_V4=y | 1419 | CONFIG_LOCKD_V4=y |
| 1383 | CONFIG_EXPORTFS=y | 1420 | CONFIG_EXPORTFS=y |
| 1384 | CONFIG_NFS_COMMON=y | 1421 | CONFIG_NFS_COMMON=y |
| 1385 | CONFIG_SUNRPC=y | 1422 | CONFIG_SUNRPC=y |
| 1386 | CONFIG_SUNRPC_GSS=y | 1423 | CONFIG_SUNRPC_GSS=y |
| 1387 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 1388 | CONFIG_RPCSEC_GSS_KRB5=y | 1424 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1389 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1425 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1390 | # CONFIG_SMB_FS is not set | 1426 | # CONFIG_SMB_FS is not set |
| @@ -1463,6 +1499,7 @@ CONFIG_BITREVERSE=y | |||
| 1463 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1499 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 1464 | # CONFIG_CRC_CCITT is not set | 1500 | # CONFIG_CRC_CCITT is not set |
| 1465 | # CONFIG_CRC16 is not set | 1501 | # CONFIG_CRC16 is not set |
| 1502 | CONFIG_CRC_T10DIF=y | ||
| 1466 | CONFIG_CRC_ITU_T=m | 1503 | CONFIG_CRC_ITU_T=m |
| 1467 | CONFIG_CRC32=y | 1504 | CONFIG_CRC32=y |
| 1468 | # CONFIG_CRC7 is not set | 1505 | # CONFIG_CRC7 is not set |
| @@ -1488,6 +1525,8 @@ CONFIG_FRAME_WARN=1024 | |||
| 1488 | CONFIG_DEBUG_KERNEL=y | 1525 | CONFIG_DEBUG_KERNEL=y |
| 1489 | # CONFIG_DEBUG_SHIRQ is not set | 1526 | # CONFIG_DEBUG_SHIRQ is not set |
| 1490 | CONFIG_DETECT_SOFTLOCKUP=y | 1527 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1528 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 1529 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 1491 | CONFIG_SCHED_DEBUG=y | 1530 | CONFIG_SCHED_DEBUG=y |
| 1492 | # CONFIG_SCHEDSTATS is not set | 1531 | # CONFIG_SCHEDSTATS is not set |
| 1493 | # CONFIG_TIMER_STATS is not set | 1532 | # CONFIG_TIMER_STATS is not set |
| @@ -1506,19 +1545,32 @@ CONFIG_SCHED_DEBUG=y | |||
| 1506 | CONFIG_DEBUG_INFO=y | 1545 | CONFIG_DEBUG_INFO=y |
| 1507 | # CONFIG_DEBUG_VM is not set | 1546 | # CONFIG_DEBUG_VM is not set |
| 1508 | # CONFIG_DEBUG_WRITECOUNT is not set | 1547 | # CONFIG_DEBUG_WRITECOUNT is not set |
| 1548 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 1509 | # CONFIG_DEBUG_LIST is not set | 1549 | # CONFIG_DEBUG_LIST is not set |
| 1510 | # CONFIG_DEBUG_SG is not set | 1550 | # CONFIG_DEBUG_SG is not set |
| 1511 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1551 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 1512 | # CONFIG_RCU_TORTURE_TEST is not set | 1552 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1513 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1553 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 1514 | # CONFIG_FAULT_INJECTION is not set | 1554 | # CONFIG_FAULT_INJECTION is not set |
| 1555 | # CONFIG_LATENCYTOP is not set | ||
| 1556 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1557 | CONFIG_HAVE_FTRACE=y | ||
| 1558 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1559 | # CONFIG_FTRACE is not set | ||
| 1560 | # CONFIG_SCHED_TRACER is not set | ||
| 1561 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1515 | # CONFIG_SAMPLES is not set | 1562 | # CONFIG_SAMPLES is not set |
| 1563 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1564 | # CONFIG_KGDB is not set | ||
| 1516 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1565 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
| 1517 | # CONFIG_DEBUG_STACK_USAGE is not set | 1566 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1518 | # CONFIG_DEBUG_PAGEALLOC is not set | 1567 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1519 | # CONFIG_DEBUGGER is not set | 1568 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
| 1569 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
| 1570 | # CONFIG_XMON is not set | ||
| 1520 | # CONFIG_IRQSTACKS is not set | 1571 | # CONFIG_IRQSTACKS is not set |
| 1521 | # CONFIG_BDI_SWITCH is not set | 1572 | # CONFIG_BDI_SWITCH is not set |
| 1573 | # CONFIG_BOOTX_TEXT is not set | ||
| 1522 | # CONFIG_PPC_EARLY_DEBUG is not set | 1574 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1523 | 1575 | ||
| 1524 | # | 1576 | # |
| @@ -1573,6 +1625,10 @@ CONFIG_CRYPTO_HMAC=y | |||
| 1573 | # CONFIG_CRYPTO_MD4 is not set | 1625 | # CONFIG_CRYPTO_MD4 is not set |
| 1574 | CONFIG_CRYPTO_MD5=y | 1626 | CONFIG_CRYPTO_MD5=y |
| 1575 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1627 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 1628 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1629 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1630 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1631 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1576 | CONFIG_CRYPTO_SHA1=m | 1632 | CONFIG_CRYPTO_SHA1=m |
| 1577 | # CONFIG_CRYPTO_SHA256 is not set | 1633 | # CONFIG_CRYPTO_SHA256 is not set |
| 1578 | # CONFIG_CRYPTO_SHA512 is not set | 1634 | # CONFIG_CRYPTO_SHA512 is not set |
| @@ -1605,5 +1661,6 @@ CONFIG_CRYPTO_DES=y | |||
| 1605 | # CONFIG_CRYPTO_LZO is not set | 1661 | # CONFIG_CRYPTO_LZO is not set |
| 1606 | CONFIG_CRYPTO_HW=y | 1662 | CONFIG_CRYPTO_HW=y |
| 1607 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1663 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1664 | # CONFIG_CRYPTO_DEV_TALITOS is not set | ||
| 1608 | # CONFIG_PPC_CLOCK is not set | 1665 | # CONFIG_PPC_CLOCK is not set |
| 1609 | # CONFIG_VIRTUALIZATION is not set | 1666 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/mpc866_ads_defconfig b/arch/powerpc/configs/mpc866_ads_defconfig index 46fffbcd3f99..1501c4336b3d 100644 --- a/arch/powerpc/configs/mpc866_ads_defconfig +++ b/arch/powerpc/configs/mpc866_ads_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.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Mon Jun 9 08:52:16 2008 | 4 | # Thu Aug 21 00:52:11 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -29,6 +29,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 29 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 29 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 30 | CONFIG_IRQ_PER_CPU=y | 30 | CONFIG_IRQ_PER_CPU=y |
| 31 | CONFIG_STACKTRACE_SUPPORT=y | 31 | CONFIG_STACKTRACE_SUPPORT=y |
| 32 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 32 | CONFIG_LOCKDEP_SUPPORT=y | 33 | CONFIG_LOCKDEP_SUPPORT=y |
| 33 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 34 | CONFIG_ARCH_HAS_ILOG2_U32=y | 35 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| @@ -106,10 +107,16 @@ CONFIG_SLUB=y | |||
| 106 | # CONFIG_PROFILING is not set | 107 | # CONFIG_PROFILING is not set |
| 107 | # CONFIG_MARKERS is not set | 108 | # CONFIG_MARKERS is not set |
| 108 | CONFIG_HAVE_OPROFILE=y | 109 | CONFIG_HAVE_OPROFILE=y |
| 110 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 111 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 109 | CONFIG_HAVE_KPROBES=y | 112 | CONFIG_HAVE_KPROBES=y |
| 110 | CONFIG_HAVE_KRETPROBES=y | 113 | CONFIG_HAVE_KRETPROBES=y |
| 114 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 111 | # CONFIG_HAVE_DMA_ATTRS is not set | 115 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 116 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 117 | CONFIG_HAVE_CLK=y | ||
| 112 | CONFIG_PROC_PAGE_MONITOR=y | 118 | CONFIG_PROC_PAGE_MONITOR=y |
| 119 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 113 | CONFIG_SLABINFO=y | 120 | CONFIG_SLABINFO=y |
| 114 | CONFIG_RT_MUTEXES=y | 121 | CONFIG_RT_MUTEXES=y |
| 115 | # CONFIG_TINY_SHMEM is not set | 122 | # CONFIG_TINY_SHMEM is not set |
| @@ -120,6 +127,7 @@ CONFIG_BLOCK=y | |||
| 120 | # CONFIG_BLK_DEV_IO_TRACE is not set | 127 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 121 | # CONFIG_LSF is not set | 128 | # CONFIG_LSF is not set |
| 122 | # CONFIG_BLK_DEV_BSG is not set | 129 | # CONFIG_BLK_DEV_BSG is not set |
| 130 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 123 | 131 | ||
| 124 | # | 132 | # |
| 125 | # IO Schedulers | 133 | # IO Schedulers |
| @@ -138,8 +146,6 @@ CONFIG_CLASSIC_RCU=y | |||
| 138 | # | 146 | # |
| 139 | # Platform support | 147 | # Platform support |
| 140 | # | 148 | # |
| 141 | # CONFIG_PPC_MPC512x is not set | ||
| 142 | # CONFIG_PPC_MPC5121 is not set | ||
| 143 | # CONFIG_PPC_CELL is not set | 149 | # CONFIG_PPC_CELL is not set |
| 144 | # CONFIG_PPC_CELL_NATIVE is not set | 150 | # CONFIG_PPC_CELL_NATIVE is not set |
| 145 | CONFIG_CPM1=y | 151 | CONFIG_CPM1=y |
| @@ -157,6 +163,7 @@ CONFIG_MPC86XADS=y | |||
| 157 | # Generic MPC8xx Options | 163 | # Generic MPC8xx Options |
| 158 | # | 164 | # |
| 159 | CONFIG_8xx_COPYBACK=y | 165 | CONFIG_8xx_COPYBACK=y |
| 166 | # CONFIG_8xx_GPIO is not set | ||
| 160 | CONFIG_8xx_CPU6=y | 167 | CONFIG_8xx_CPU6=y |
| 161 | CONFIG_8xx_CPU15=y | 168 | CONFIG_8xx_CPU15=y |
| 162 | CONFIG_NO_UCODE_PATCH=y | 169 | CONFIG_NO_UCODE_PATCH=y |
| @@ -175,7 +182,6 @@ CONFIG_NO_UCODE_PATCH=y | |||
| 175 | # CONFIG_PPC_INDIRECT_IO is not set | 182 | # CONFIG_PPC_INDIRECT_IO is not set |
| 176 | # CONFIG_GENERIC_IOMAP is not set | 183 | # CONFIG_GENERIC_IOMAP is not set |
| 177 | # CONFIG_CPU_FREQ is not set | 184 | # CONFIG_CPU_FREQ is not set |
| 178 | CONFIG_PPC_CPM_NEW_BINDING=y | ||
| 179 | # CONFIG_FSL_ULI1575 is not set | 185 | # CONFIG_FSL_ULI1575 is not set |
| 180 | CONFIG_CPM=y | 186 | CONFIG_CPM=y |
| 181 | 187 | ||
| @@ -192,7 +198,7 @@ CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | |||
| 192 | # CONFIG_HZ_300 is not set | 198 | # CONFIG_HZ_300 is not set |
| 193 | CONFIG_HZ_1000=y | 199 | CONFIG_HZ_1000=y |
| 194 | CONFIG_HZ=1000 | 200 | CONFIG_HZ=1000 |
| 195 | # CONFIG_SCHED_HRTICK is not set | 201 | CONFIG_SCHED_HRTICK=y |
| 196 | CONFIG_PREEMPT_NONE=y | 202 | CONFIG_PREEMPT_NONE=y |
| 197 | # CONFIG_PREEMPT_VOLUNTARY is not set | 203 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 198 | # CONFIG_PREEMPT is not set | 204 | # CONFIG_PREEMPT is not set |
| @@ -215,6 +221,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 215 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 221 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 216 | CONFIG_PAGEFLAGS_EXTENDED=y | 222 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 217 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 223 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 224 | CONFIG_MIGRATION=y | ||
| 218 | # CONFIG_RESOURCES_64BIT is not set | 225 | # CONFIG_RESOURCES_64BIT is not set |
| 219 | CONFIG_ZONE_DMA_FLAG=1 | 226 | CONFIG_ZONE_DMA_FLAG=1 |
| 220 | CONFIG_BOUNCE=y | 227 | CONFIG_BOUNCE=y |
| @@ -222,6 +229,7 @@ CONFIG_VIRT_TO_BUS=y | |||
| 222 | CONFIG_FORCE_MAX_ZONEORDER=11 | 229 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 223 | # CONFIG_PROC_DEVICETREE is not set | 230 | # CONFIG_PROC_DEVICETREE is not set |
| 224 | # CONFIG_CMDLINE_BOOL is not set | 231 | # CONFIG_CMDLINE_BOOL is not set |
| 232 | CONFIG_EXTRA_TARGETS="" | ||
| 225 | # CONFIG_PM is not set | 233 | # CONFIG_PM is not set |
| 226 | # CONFIG_SECCOMP is not set | 234 | # CONFIG_SECCOMP is not set |
| 227 | CONFIG_ISA_DMA_API=y | 235 | CONFIG_ISA_DMA_API=y |
| @@ -253,10 +261,6 @@ CONFIG_PHYSICAL_START=0x00000000 | |||
| 253 | CONFIG_TASK_SIZE=0x80000000 | 261 | CONFIG_TASK_SIZE=0x80000000 |
| 254 | CONFIG_CONSISTENT_START=0xfd000000 | 262 | CONFIG_CONSISTENT_START=0xfd000000 |
| 255 | CONFIG_CONSISTENT_SIZE=0x00200000 | 263 | CONFIG_CONSISTENT_SIZE=0x00200000 |
| 256 | |||
| 257 | # | ||
| 258 | # Networking | ||
| 259 | # | ||
| 260 | CONFIG_NET=y | 264 | CONFIG_NET=y |
| 261 | 265 | ||
| 262 | # | 266 | # |
| @@ -361,6 +365,7 @@ CONFIG_BLK_DEV_LOOP=y | |||
| 361 | # CONFIG_BLK_DEV_RAM is not set | 365 | # CONFIG_BLK_DEV_RAM is not set |
| 362 | # CONFIG_CDROM_PKTCDVD is not set | 366 | # CONFIG_CDROM_PKTCDVD is not set |
| 363 | # CONFIG_ATA_OVER_ETH is not set | 367 | # CONFIG_ATA_OVER_ETH is not set |
| 368 | # CONFIG_BLK_DEV_HD is not set | ||
| 364 | CONFIG_MISC_DEVICES=y | 369 | CONFIG_MISC_DEVICES=y |
| 365 | # CONFIG_EEPROM_93CX6 is not set | 370 | # CONFIG_EEPROM_93CX6 is not set |
| 366 | # CONFIG_ENCLOSURE_SERVICES is not set | 371 | # CONFIG_ENCLOSURE_SERVICES is not set |
| @@ -378,7 +383,6 @@ CONFIG_HAVE_IDE=y | |||
| 378 | # CONFIG_MD is not set | 383 | # CONFIG_MD is not set |
| 379 | # CONFIG_MACINTOSH_DRIVERS is not set | 384 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 380 | CONFIG_NETDEVICES=y | 385 | CONFIG_NETDEVICES=y |
| 381 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 382 | # CONFIG_DUMMY is not set | 386 | # CONFIG_DUMMY is not set |
| 383 | # CONFIG_BONDING is not set | 387 | # CONFIG_BONDING is not set |
| 384 | # CONFIG_MACVLAN is not set | 388 | # CONFIG_MACVLAN is not set |
| @@ -414,7 +418,6 @@ CONFIG_FS_ENET_HAS_SCC=y | |||
| 414 | CONFIG_FS_ENET_HAS_FEC=y | 418 | CONFIG_FS_ENET_HAS_FEC=y |
| 415 | CONFIG_FS_ENET_MDIO_FEC=y | 419 | CONFIG_FS_ENET_MDIO_FEC=y |
| 416 | CONFIG_NETDEV_1000=y | 420 | CONFIG_NETDEV_1000=y |
| 417 | # CONFIG_E1000E_ENABLED is not set | ||
| 418 | # CONFIG_GIANFAR is not set | 421 | # CONFIG_GIANFAR is not set |
| 419 | CONFIG_NETDEV_10000=y | 422 | CONFIG_NETDEV_10000=y |
| 420 | 423 | ||
| @@ -484,6 +487,7 @@ CONFIG_SERIO_I8042=y | |||
| 484 | CONFIG_SERIO_SERPORT=y | 487 | CONFIG_SERIO_SERPORT=y |
| 485 | CONFIG_SERIO_LIBPS2=y | 488 | CONFIG_SERIO_LIBPS2=y |
| 486 | # CONFIG_SERIO_RAW is not set | 489 | # CONFIG_SERIO_RAW is not set |
| 490 | # CONFIG_SERIO_XILINX_XPS_PS2 is not set | ||
| 487 | # CONFIG_GAMEPORT is not set | 491 | # CONFIG_GAMEPORT is not set |
| 488 | 492 | ||
| 489 | # | 493 | # |
| @@ -524,6 +528,8 @@ CONFIG_GEN_RTC=y | |||
| 524 | # CONFIG_TCG_TPM is not set | 528 | # CONFIG_TCG_TPM is not set |
| 525 | # CONFIG_I2C is not set | 529 | # CONFIG_I2C is not set |
| 526 | # CONFIG_SPI is not set | 530 | # CONFIG_SPI is not set |
| 531 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 532 | # CONFIG_GPIOLIB is not set | ||
| 527 | # CONFIG_W1 is not set | 533 | # CONFIG_W1 is not set |
| 528 | # CONFIG_POWER_SUPPLY is not set | 534 | # CONFIG_POWER_SUPPLY is not set |
| 529 | CONFIG_HWMON=y | 535 | CONFIG_HWMON=y |
| @@ -540,6 +546,7 @@ CONFIG_HWMON=y | |||
| 540 | # CONFIG_SENSORS_W83627EHF is not set | 546 | # CONFIG_SENSORS_W83627EHF is not set |
| 541 | # CONFIG_HWMON_DEBUG_CHIP is not set | 547 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 542 | # CONFIG_THERMAL is not set | 548 | # CONFIG_THERMAL is not set |
| 549 | # CONFIG_THERMAL_HWMON is not set | ||
| 543 | # CONFIG_WATCHDOG is not set | 550 | # CONFIG_WATCHDOG is not set |
| 544 | 551 | ||
| 545 | # | 552 | # |
| @@ -551,8 +558,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 551 | # | 558 | # |
| 552 | # Multifunction device drivers | 559 | # Multifunction device drivers |
| 553 | # | 560 | # |
| 561 | # CONFIG_MFD_CORE is not set | ||
| 554 | # CONFIG_MFD_SM501 is not set | 562 | # CONFIG_MFD_SM501 is not set |
| 555 | # CONFIG_HTC_PASIC3 is not set | 563 | # CONFIG_HTC_PASIC3 is not set |
| 564 | # CONFIG_MFD_TMIO is not set | ||
| 556 | 565 | ||
| 557 | # | 566 | # |
| 558 | # Multimedia devices | 567 | # Multimedia devices |
| @@ -582,10 +591,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
| 582 | # Display device support | 591 | # Display device support |
| 583 | # | 592 | # |
| 584 | # CONFIG_DISPLAY_SUPPORT is not set | 593 | # CONFIG_DISPLAY_SUPPORT is not set |
| 585 | |||
| 586 | # | ||
| 587 | # Sound | ||
| 588 | # | ||
| 589 | # CONFIG_SOUND is not set | 594 | # CONFIG_SOUND is not set |
| 590 | CONFIG_HID_SUPPORT=y | 595 | CONFIG_HID_SUPPORT=y |
| 591 | CONFIG_HID=y | 596 | CONFIG_HID=y |
| @@ -599,6 +604,10 @@ CONFIG_USB_SUPPORT=y | |||
| 599 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 604 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
| 600 | 605 | ||
| 601 | # | 606 | # |
| 607 | # Enable Host or Gadget support to see Inventra options | ||
| 608 | # | ||
| 609 | |||
| 610 | # | ||
| 602 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 611 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 603 | # | 612 | # |
| 604 | # CONFIG_USB_GADGET is not set | 613 | # CONFIG_USB_GADGET is not set |
| @@ -677,6 +686,7 @@ CONFIG_TMPFS=y | |||
| 677 | CONFIG_CRAMFS=y | 686 | CONFIG_CRAMFS=y |
| 678 | # CONFIG_VXFS_FS is not set | 687 | # CONFIG_VXFS_FS is not set |
| 679 | # CONFIG_MINIX_FS is not set | 688 | # CONFIG_MINIX_FS is not set |
| 689 | # CONFIG_OMFS_FS is not set | ||
| 680 | # CONFIG_HPFS_FS is not set | 690 | # CONFIG_HPFS_FS is not set |
| 681 | # CONFIG_QNX4FS_FS is not set | 691 | # CONFIG_QNX4FS_FS is not set |
| 682 | # CONFIG_ROMFS_FS is not set | 692 | # CONFIG_ROMFS_FS is not set |
| @@ -687,13 +697,12 @@ CONFIG_NFS_FS=y | |||
| 687 | CONFIG_NFS_V3=y | 697 | CONFIG_NFS_V3=y |
| 688 | # CONFIG_NFS_V3_ACL is not set | 698 | # CONFIG_NFS_V3_ACL is not set |
| 689 | # CONFIG_NFS_V4 is not set | 699 | # CONFIG_NFS_V4 is not set |
| 690 | # CONFIG_NFSD is not set | ||
| 691 | CONFIG_ROOT_NFS=y | 700 | CONFIG_ROOT_NFS=y |
| 701 | # CONFIG_NFSD is not set | ||
| 692 | CONFIG_LOCKD=y | 702 | CONFIG_LOCKD=y |
| 693 | CONFIG_LOCKD_V4=y | 703 | CONFIG_LOCKD_V4=y |
| 694 | CONFIG_NFS_COMMON=y | 704 | CONFIG_NFS_COMMON=y |
| 695 | CONFIG_SUNRPC=y | 705 | CONFIG_SUNRPC=y |
| 696 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 697 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 706 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 698 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 707 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 699 | # CONFIG_SMB_FS is not set | 708 | # CONFIG_SMB_FS is not set |
| @@ -733,6 +742,7 @@ CONFIG_BITREVERSE=y | |||
| 733 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 742 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 734 | CONFIG_CRC_CCITT=y | 743 | CONFIG_CRC_CCITT=y |
| 735 | # CONFIG_CRC16 is not set | 744 | # CONFIG_CRC16 is not set |
| 745 | # CONFIG_CRC_T10DIF is not set | ||
| 736 | # CONFIG_CRC_ITU_T is not set | 746 | # CONFIG_CRC_ITU_T is not set |
| 737 | CONFIG_CRC32=y | 747 | CONFIG_CRC32=y |
| 738 | # CONFIG_CRC7 is not set | 748 | # CONFIG_CRC7 is not set |
| @@ -758,7 +768,15 @@ CONFIG_FRAME_WARN=1024 | |||
| 758 | # CONFIG_DEBUG_KERNEL is not set | 768 | # CONFIG_DEBUG_KERNEL is not set |
| 759 | # CONFIG_SLUB_DEBUG_ON is not set | 769 | # CONFIG_SLUB_DEBUG_ON is not set |
| 760 | # CONFIG_SLUB_STATS is not set | 770 | # CONFIG_SLUB_STATS is not set |
| 771 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 772 | # CONFIG_LATENCYTOP is not set | ||
| 773 | CONFIG_HAVE_FTRACE=y | ||
| 774 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 775 | # CONFIG_FTRACE is not set | ||
| 776 | # CONFIG_SCHED_TRACER is not set | ||
| 777 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 761 | # CONFIG_SAMPLES is not set | 778 | # CONFIG_SAMPLES is not set |
| 779 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 762 | # CONFIG_IRQSTACKS is not set | 780 | # CONFIG_IRQSTACKS is not set |
| 763 | # CONFIG_PPC_EARLY_DEBUG is not set | 781 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 764 | 782 | ||
| @@ -810,6 +828,10 @@ CONFIG_CRYPTO=y | |||
| 810 | # CONFIG_CRYPTO_MD4 is not set | 828 | # CONFIG_CRYPTO_MD4 is not set |
| 811 | # CONFIG_CRYPTO_MD5 is not set | 829 | # CONFIG_CRYPTO_MD5 is not set |
| 812 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 830 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 831 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 832 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 833 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 834 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 813 | # CONFIG_CRYPTO_SHA1 is not set | 835 | # CONFIG_CRYPTO_SHA1 is not set |
| 814 | # CONFIG_CRYPTO_SHA256 is not set | 836 | # CONFIG_CRYPTO_SHA256 is not set |
| 815 | # CONFIG_CRYPTO_SHA512 is not set | 837 | # CONFIG_CRYPTO_SHA512 is not set |
| @@ -841,6 +863,7 @@ CONFIG_CRYPTO=y | |||
| 841 | # CONFIG_CRYPTO_DEFLATE is not set | 863 | # CONFIG_CRYPTO_DEFLATE is not set |
| 842 | # CONFIG_CRYPTO_LZO is not set | 864 | # CONFIG_CRYPTO_LZO is not set |
| 843 | CONFIG_CRYPTO_HW=y | 865 | CONFIG_CRYPTO_HW=y |
| 844 | # CONFIG_PPC_CLOCK is not set | 866 | # CONFIG_CRYPTO_DEV_TALITOS is not set |
| 867 | CONFIG_PPC_CLOCK=y | ||
| 845 | CONFIG_PPC_LIB_RHEAP=y | 868 | CONFIG_PPC_LIB_RHEAP=y |
| 846 | # CONFIG_VIRTUALIZATION is not set | 869 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/mpc885_ads_defconfig b/arch/powerpc/configs/mpc885_ads_defconfig index 9df78973005e..fc3f6dc58126 100644 --- a/arch/powerpc/configs/mpc885_ads_defconfig +++ b/arch/powerpc/configs/mpc885_ads_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.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Mon Jun 9 08:52:17 2008 | 4 | # Thu Aug 21 00:52:12 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -29,6 +29,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 29 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 29 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 30 | CONFIG_IRQ_PER_CPU=y | 30 | CONFIG_IRQ_PER_CPU=y |
| 31 | CONFIG_STACKTRACE_SUPPORT=y | 31 | CONFIG_STACKTRACE_SUPPORT=y |
| 32 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 32 | CONFIG_LOCKDEP_SUPPORT=y | 33 | CONFIG_LOCKDEP_SUPPORT=y |
| 33 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 34 | CONFIG_ARCH_HAS_ILOG2_U32=y | 35 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| @@ -108,10 +109,16 @@ CONFIG_SLUB=y | |||
| 108 | # CONFIG_PROFILING is not set | 109 | # CONFIG_PROFILING is not set |
| 109 | # CONFIG_MARKERS is not set | 110 | # CONFIG_MARKERS is not set |
| 110 | CONFIG_HAVE_OPROFILE=y | 111 | CONFIG_HAVE_OPROFILE=y |
| 112 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 113 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 111 | CONFIG_HAVE_KPROBES=y | 114 | CONFIG_HAVE_KPROBES=y |
| 112 | CONFIG_HAVE_KRETPROBES=y | 115 | CONFIG_HAVE_KRETPROBES=y |
| 116 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 113 | # CONFIG_HAVE_DMA_ATTRS is not set | 117 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 118 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 119 | CONFIG_HAVE_CLK=y | ||
| 114 | CONFIG_PROC_PAGE_MONITOR=y | 120 | CONFIG_PROC_PAGE_MONITOR=y |
| 121 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 115 | CONFIG_SLABINFO=y | 122 | CONFIG_SLABINFO=y |
| 116 | # CONFIG_TINY_SHMEM is not set | 123 | # CONFIG_TINY_SHMEM is not set |
| 117 | CONFIG_BASE_SMALL=1 | 124 | CONFIG_BASE_SMALL=1 |
| @@ -121,6 +128,7 @@ CONFIG_BLOCK=y | |||
| 121 | # CONFIG_BLK_DEV_IO_TRACE is not set | 128 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 122 | # CONFIG_LSF is not set | 129 | # CONFIG_LSF is not set |
| 123 | # CONFIG_BLK_DEV_BSG is not set | 130 | # CONFIG_BLK_DEV_BSG is not set |
| 131 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 124 | 132 | ||
| 125 | # | 133 | # |
| 126 | # IO Schedulers | 134 | # IO Schedulers |
| @@ -139,8 +147,6 @@ CONFIG_CLASSIC_RCU=y | |||
| 139 | # | 147 | # |
| 140 | # Platform support | 148 | # Platform support |
| 141 | # | 149 | # |
| 142 | # CONFIG_PPC_MPC512x is not set | ||
| 143 | # CONFIG_PPC_MPC5121 is not set | ||
| 144 | # CONFIG_PPC_CELL is not set | 150 | # CONFIG_PPC_CELL is not set |
| 145 | # CONFIG_PPC_CELL_NATIVE is not set | 151 | # CONFIG_PPC_CELL_NATIVE is not set |
| 146 | CONFIG_CPM1=y | 152 | CONFIG_CPM1=y |
| @@ -165,6 +171,7 @@ CONFIG_MPC8xx_SECOND_ETH_FEC2=y | |||
| 165 | # Generic MPC8xx Options | 171 | # Generic MPC8xx Options |
| 166 | # | 172 | # |
| 167 | CONFIG_8xx_COPYBACK=y | 173 | CONFIG_8xx_COPYBACK=y |
| 174 | # CONFIG_8xx_GPIO is not set | ||
| 168 | # CONFIG_8xx_CPU6 is not set | 175 | # CONFIG_8xx_CPU6 is not set |
| 169 | CONFIG_8xx_CPU15=y | 176 | CONFIG_8xx_CPU15=y |
| 170 | CONFIG_NO_UCODE_PATCH=y | 177 | CONFIG_NO_UCODE_PATCH=y |
| @@ -183,7 +190,6 @@ CONFIG_NO_UCODE_PATCH=y | |||
| 183 | # CONFIG_PPC_INDIRECT_IO is not set | 190 | # CONFIG_PPC_INDIRECT_IO is not set |
| 184 | # CONFIG_GENERIC_IOMAP is not set | 191 | # CONFIG_GENERIC_IOMAP is not set |
| 185 | # CONFIG_CPU_FREQ is not set | 192 | # CONFIG_CPU_FREQ is not set |
| 186 | CONFIG_PPC_CPM_NEW_BINDING=y | ||
| 187 | # CONFIG_FSL_ULI1575 is not set | 193 | # CONFIG_FSL_ULI1575 is not set |
| 188 | CONFIG_CPM=y | 194 | CONFIG_CPM=y |
| 189 | 195 | ||
| @@ -200,7 +206,7 @@ CONFIG_HZ_100=y | |||
| 200 | # CONFIG_HZ_300 is not set | 206 | # CONFIG_HZ_300 is not set |
| 201 | # CONFIG_HZ_1000 is not set | 207 | # CONFIG_HZ_1000 is not set |
| 202 | CONFIG_HZ=100 | 208 | CONFIG_HZ=100 |
| 203 | # CONFIG_SCHED_HRTICK is not set | 209 | CONFIG_SCHED_HRTICK=y |
| 204 | CONFIG_PREEMPT_NONE=y | 210 | CONFIG_PREEMPT_NONE=y |
| 205 | # CONFIG_PREEMPT_VOLUNTARY is not set | 211 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 206 | # CONFIG_PREEMPT is not set | 212 | # CONFIG_PREEMPT is not set |
| @@ -224,6 +230,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 224 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 230 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 225 | CONFIG_PAGEFLAGS_EXTENDED=y | 231 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 226 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 232 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 233 | CONFIG_MIGRATION=y | ||
| 227 | # CONFIG_RESOURCES_64BIT is not set | 234 | # CONFIG_RESOURCES_64BIT is not set |
| 228 | CONFIG_ZONE_DMA_FLAG=1 | 235 | CONFIG_ZONE_DMA_FLAG=1 |
| 229 | CONFIG_BOUNCE=y | 236 | CONFIG_BOUNCE=y |
| @@ -231,6 +238,7 @@ CONFIG_VIRT_TO_BUS=y | |||
| 231 | CONFIG_FORCE_MAX_ZONEORDER=11 | 238 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 232 | CONFIG_PROC_DEVICETREE=y | 239 | CONFIG_PROC_DEVICETREE=y |
| 233 | # CONFIG_CMDLINE_BOOL is not set | 240 | # CONFIG_CMDLINE_BOOL is not set |
| 241 | CONFIG_EXTRA_TARGETS="" | ||
| 234 | # CONFIG_PM is not set | 242 | # CONFIG_PM is not set |
| 235 | # CONFIG_SECCOMP is not set | 243 | # CONFIG_SECCOMP is not set |
| 236 | CONFIG_ISA_DMA_API=y | 244 | CONFIG_ISA_DMA_API=y |
| @@ -263,10 +271,6 @@ CONFIG_PHYSICAL_START=0x00000000 | |||
| 263 | CONFIG_TASK_SIZE=0x80000000 | 271 | CONFIG_TASK_SIZE=0x80000000 |
| 264 | CONFIG_CONSISTENT_START=0xfd000000 | 272 | CONFIG_CONSISTENT_START=0xfd000000 |
| 265 | CONFIG_CONSISTENT_SIZE=0x00200000 | 273 | CONFIG_CONSISTENT_SIZE=0x00200000 |
| 266 | |||
| 267 | # | ||
| 268 | # Networking | ||
| 269 | # | ||
| 270 | CONFIG_NET=y | 274 | CONFIG_NET=y |
| 271 | 275 | ||
| 272 | # | 276 | # |
| @@ -453,7 +457,6 @@ CONFIG_HAVE_IDE=y | |||
| 453 | # CONFIG_MD is not set | 457 | # CONFIG_MD is not set |
| 454 | # CONFIG_MACINTOSH_DRIVERS is not set | 458 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 455 | CONFIG_NETDEVICES=y | 459 | CONFIG_NETDEVICES=y |
| 456 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 457 | # CONFIG_DUMMY is not set | 460 | # CONFIG_DUMMY is not set |
| 458 | # CONFIG_BONDING is not set | 461 | # CONFIG_BONDING is not set |
| 459 | # CONFIG_MACVLAN is not set | 462 | # CONFIG_MACVLAN is not set |
| @@ -555,10 +558,13 @@ CONFIG_GEN_RTC=y | |||
| 555 | # CONFIG_TCG_TPM is not set | 558 | # CONFIG_TCG_TPM is not set |
| 556 | # CONFIG_I2C is not set | 559 | # CONFIG_I2C is not set |
| 557 | # CONFIG_SPI is not set | 560 | # CONFIG_SPI is not set |
| 561 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 562 | # CONFIG_GPIOLIB is not set | ||
| 558 | # CONFIG_W1 is not set | 563 | # CONFIG_W1 is not set |
| 559 | # CONFIG_POWER_SUPPLY is not set | 564 | # CONFIG_POWER_SUPPLY is not set |
| 560 | # CONFIG_HWMON is not set | 565 | # CONFIG_HWMON is not set |
| 561 | # CONFIG_THERMAL is not set | 566 | # CONFIG_THERMAL is not set |
| 567 | # CONFIG_THERMAL_HWMON is not set | ||
| 562 | # CONFIG_WATCHDOG is not set | 568 | # CONFIG_WATCHDOG is not set |
| 563 | 569 | ||
| 564 | # | 570 | # |
| @@ -570,8 +576,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 570 | # | 576 | # |
| 571 | # Multifunction device drivers | 577 | # Multifunction device drivers |
| 572 | # | 578 | # |
| 579 | # CONFIG_MFD_CORE is not set | ||
| 573 | # CONFIG_MFD_SM501 is not set | 580 | # CONFIG_MFD_SM501 is not set |
| 574 | # CONFIG_HTC_PASIC3 is not set | 581 | # CONFIG_HTC_PASIC3 is not set |
| 582 | # CONFIG_MFD_TMIO is not set | ||
| 575 | 583 | ||
| 576 | # | 584 | # |
| 577 | # Multimedia devices | 585 | # Multimedia devices |
| @@ -601,10 +609,6 @@ CONFIG_DAB=y | |||
| 601 | # Display device support | 609 | # Display device support |
| 602 | # | 610 | # |
| 603 | # CONFIG_DISPLAY_SUPPORT is not set | 611 | # CONFIG_DISPLAY_SUPPORT is not set |
| 604 | |||
| 605 | # | ||
| 606 | # Sound | ||
| 607 | # | ||
| 608 | # CONFIG_SOUND is not set | 612 | # CONFIG_SOUND is not set |
| 609 | # CONFIG_USB_SUPPORT is not set | 613 | # CONFIG_USB_SUPPORT is not set |
| 610 | # CONFIG_MMC is not set | 614 | # CONFIG_MMC is not set |
| @@ -673,6 +677,7 @@ CONFIG_TMPFS=y | |||
| 673 | CONFIG_CRAMFS=y | 677 | CONFIG_CRAMFS=y |
| 674 | # CONFIG_VXFS_FS is not set | 678 | # CONFIG_VXFS_FS is not set |
| 675 | # CONFIG_MINIX_FS is not set | 679 | # CONFIG_MINIX_FS is not set |
| 680 | # CONFIG_OMFS_FS is not set | ||
| 676 | # CONFIG_HPFS_FS is not set | 681 | # CONFIG_HPFS_FS is not set |
| 677 | # CONFIG_QNX4FS_FS is not set | 682 | # CONFIG_QNX4FS_FS is not set |
| 678 | # CONFIG_ROMFS_FS is not set | 683 | # CONFIG_ROMFS_FS is not set |
| @@ -683,13 +688,12 @@ CONFIG_NFS_FS=y | |||
| 683 | CONFIG_NFS_V3=y | 688 | CONFIG_NFS_V3=y |
| 684 | # CONFIG_NFS_V3_ACL is not set | 689 | # CONFIG_NFS_V3_ACL is not set |
| 685 | # CONFIG_NFS_V4 is not set | 690 | # CONFIG_NFS_V4 is not set |
| 686 | # CONFIG_NFSD is not set | ||
| 687 | CONFIG_ROOT_NFS=y | 691 | CONFIG_ROOT_NFS=y |
| 692 | # CONFIG_NFSD is not set | ||
| 688 | CONFIG_LOCKD=y | 693 | CONFIG_LOCKD=y |
| 689 | CONFIG_LOCKD_V4=y | 694 | CONFIG_LOCKD_V4=y |
| 690 | CONFIG_NFS_COMMON=y | 695 | CONFIG_NFS_COMMON=y |
| 691 | CONFIG_SUNRPC=y | 696 | CONFIG_SUNRPC=y |
| 692 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 693 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 697 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 694 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 698 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 695 | # CONFIG_SMB_FS is not set | 699 | # CONFIG_SMB_FS is not set |
| @@ -728,6 +732,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 728 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 732 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 729 | # CONFIG_CRC_CCITT is not set | 733 | # CONFIG_CRC_CCITT is not set |
| 730 | # CONFIG_CRC16 is not set | 734 | # CONFIG_CRC16 is not set |
| 735 | # CONFIG_CRC_T10DIF is not set | ||
| 731 | # CONFIG_CRC_ITU_T is not set | 736 | # CONFIG_CRC_ITU_T is not set |
| 732 | # CONFIG_CRC32 is not set | 737 | # CONFIG_CRC32 is not set |
| 733 | # CONFIG_CRC7 is not set | 738 | # CONFIG_CRC7 is not set |
| @@ -752,6 +757,8 @@ CONFIG_MAGIC_SYSRQ=y | |||
| 752 | CONFIG_DEBUG_KERNEL=y | 757 | CONFIG_DEBUG_KERNEL=y |
| 753 | # CONFIG_DEBUG_SHIRQ is not set | 758 | # CONFIG_DEBUG_SHIRQ is not set |
| 754 | CONFIG_DETECT_SOFTLOCKUP=y | 759 | CONFIG_DETECT_SOFTLOCKUP=y |
| 760 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 761 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 755 | CONFIG_SCHED_DEBUG=y | 762 | CONFIG_SCHED_DEBUG=y |
| 756 | # CONFIG_SCHEDSTATS is not set | 763 | # CONFIG_SCHEDSTATS is not set |
| 757 | # CONFIG_TIMER_STATS is not set | 764 | # CONFIG_TIMER_STATS is not set |
| @@ -767,16 +774,28 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
| 767 | CONFIG_DEBUG_INFO=y | 774 | CONFIG_DEBUG_INFO=y |
| 768 | # CONFIG_DEBUG_VM is not set | 775 | # CONFIG_DEBUG_VM is not set |
| 769 | # CONFIG_DEBUG_WRITECOUNT is not set | 776 | # CONFIG_DEBUG_WRITECOUNT is not set |
| 777 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 770 | # CONFIG_DEBUG_LIST is not set | 778 | # CONFIG_DEBUG_LIST is not set |
| 771 | # CONFIG_DEBUG_SG is not set | 779 | # CONFIG_DEBUG_SG is not set |
| 772 | # CONFIG_BOOT_PRINTK_DELAY is not set | 780 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 781 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 773 | # CONFIG_BACKTRACE_SELF_TEST is not set | 782 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 774 | # CONFIG_FAULT_INJECTION is not set | 783 | # CONFIG_FAULT_INJECTION is not set |
| 784 | # CONFIG_LATENCYTOP is not set | ||
| 785 | CONFIG_HAVE_FTRACE=y | ||
| 786 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 787 | # CONFIG_FTRACE is not set | ||
| 788 | # CONFIG_SCHED_TRACER is not set | ||
| 789 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 775 | # CONFIG_SAMPLES is not set | 790 | # CONFIG_SAMPLES is not set |
| 791 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 792 | # CONFIG_KGDB is not set | ||
| 776 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 793 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
| 777 | # CONFIG_DEBUG_STACK_USAGE is not set | 794 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 778 | # CONFIG_DEBUG_PAGEALLOC is not set | 795 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 779 | # CONFIG_DEBUGGER is not set | 796 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
| 797 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
| 798 | # CONFIG_XMON is not set | ||
| 780 | # CONFIG_IRQSTACKS is not set | 799 | # CONFIG_IRQSTACKS is not set |
| 781 | # CONFIG_BDI_SWITCH is not set | 800 | # CONFIG_BDI_SWITCH is not set |
| 782 | # CONFIG_PPC_EARLY_DEBUG is not set | 801 | # CONFIG_PPC_EARLY_DEBUG is not set |
| @@ -788,6 +807,6 @@ CONFIG_DEBUG_INFO=y | |||
| 788 | # CONFIG_SECURITY is not set | 807 | # CONFIG_SECURITY is not set |
| 789 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 808 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 790 | # CONFIG_CRYPTO is not set | 809 | # CONFIG_CRYPTO is not set |
| 791 | # CONFIG_PPC_CLOCK is not set | 810 | CONFIG_PPC_CLOCK=y |
| 792 | CONFIG_PPC_LIB_RHEAP=y | 811 | CONFIG_PPC_LIB_RHEAP=y |
| 793 | # CONFIG_VIRTUALIZATION is not set | 812 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig index 3688e4bb6fc2..80481f270133 100644 --- a/arch/powerpc/configs/pmac32_defconfig +++ b/arch/powerpc/configs/pmac32_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.26-rc3 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Tue May 20 20:02:24 2008 | 4 | # Tue Aug 26 13:20:26 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | 34 | CONFIG_STACKTRACE_SUPPORT=y |
| 35 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | 36 | CONFIG_LOCKDEP_SUPPORT=y |
| 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| @@ -93,9 +94,8 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 93 | CONFIG_SYSCTL=y | 94 | CONFIG_SYSCTL=y |
| 94 | # CONFIG_EMBEDDED is not set | 95 | # CONFIG_EMBEDDED is not set |
| 95 | CONFIG_SYSCTL_SYSCALL=y | 96 | CONFIG_SYSCTL_SYSCALL=y |
| 96 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 97 | CONFIG_KALLSYMS=y | 97 | CONFIG_KALLSYMS=y |
| 98 | # CONFIG_KALLSYMS_ALL is not set | 98 | CONFIG_KALLSYMS_ALL=y |
| 99 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 99 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 100 | CONFIG_HOTPLUG=y | 100 | CONFIG_HOTPLUG=y |
| 101 | CONFIG_PRINTK=y | 101 | CONFIG_PRINTK=y |
| @@ -120,10 +120,16 @@ CONFIG_PROFILING=y | |||
| 120 | CONFIG_OPROFILE=y | 120 | CONFIG_OPROFILE=y |
| 121 | CONFIG_HAVE_OPROFILE=y | 121 | CONFIG_HAVE_OPROFILE=y |
| 122 | # CONFIG_KPROBES is not set | 122 | # CONFIG_KPROBES is not set |
| 123 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 124 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 123 | CONFIG_HAVE_KPROBES=y | 125 | CONFIG_HAVE_KPROBES=y |
| 124 | CONFIG_HAVE_KRETPROBES=y | 126 | CONFIG_HAVE_KRETPROBES=y |
| 127 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 125 | # CONFIG_HAVE_DMA_ATTRS is not set | 128 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 129 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 130 | # CONFIG_HAVE_CLK is not set | ||
| 126 | CONFIG_PROC_PAGE_MONITOR=y | 131 | CONFIG_PROC_PAGE_MONITOR=y |
| 132 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 127 | CONFIG_SLABINFO=y | 133 | CONFIG_SLABINFO=y |
| 128 | CONFIG_RT_MUTEXES=y | 134 | CONFIG_RT_MUTEXES=y |
| 129 | # CONFIG_TINY_SHMEM is not set | 135 | # CONFIG_TINY_SHMEM is not set |
| @@ -140,6 +146,7 @@ CONFIG_LBD=y | |||
| 140 | # CONFIG_BLK_DEV_IO_TRACE is not set | 146 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 141 | CONFIG_LSF=y | 147 | CONFIG_LSF=y |
| 142 | CONFIG_BLK_DEV_BSG=y | 148 | CONFIG_BLK_DEV_BSG=y |
| 149 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 143 | 150 | ||
| 144 | # | 151 | # |
| 145 | # IO Schedulers | 152 | # IO Schedulers |
| @@ -159,19 +166,18 @@ CONFIG_CLASSIC_RCU=y | |||
| 159 | # Platform support | 166 | # Platform support |
| 160 | # | 167 | # |
| 161 | CONFIG_PPC_MULTIPLATFORM=y | 168 | CONFIG_PPC_MULTIPLATFORM=y |
| 162 | # CONFIG_PPC_82xx is not set | ||
| 163 | # CONFIG_PPC_83xx is not set | ||
| 164 | # CONFIG_PPC_86xx is not set | ||
| 165 | CONFIG_CLASSIC32=y | 169 | CONFIG_CLASSIC32=y |
| 166 | # CONFIG_PPC_CHRP is not set | 170 | # CONFIG_PPC_CHRP is not set |
| 167 | # CONFIG_PPC_MPC512x is not set | ||
| 168 | # CONFIG_PPC_MPC5121 is not set | ||
| 169 | # CONFIG_MPC5121_ADS is not set | 171 | # CONFIG_MPC5121_ADS is not set |
| 172 | # CONFIG_MPC5121_GENERIC is not set | ||
| 170 | # CONFIG_PPC_MPC52xx is not set | 173 | # CONFIG_PPC_MPC52xx is not set |
| 171 | CONFIG_PPC_PMAC=y | 174 | CONFIG_PPC_PMAC=y |
| 172 | # CONFIG_PPC_CELL is not set | 175 | # CONFIG_PPC_CELL is not set |
| 173 | # CONFIG_PPC_CELL_NATIVE is not set | 176 | # CONFIG_PPC_CELL_NATIVE is not set |
| 177 | # CONFIG_PPC_82xx is not set | ||
| 174 | # CONFIG_PQ2ADS is not set | 178 | # CONFIG_PQ2ADS is not set |
| 179 | # CONFIG_PPC_83xx is not set | ||
| 180 | # CONFIG_PPC_86xx is not set | ||
| 175 | # CONFIG_EMBEDDED6xx is not set | 181 | # CONFIG_EMBEDDED6xx is not set |
| 176 | CONFIG_PPC_NATIVE=y | 182 | CONFIG_PPC_NATIVE=y |
| 177 | # CONFIG_IPIC is not set | 183 | # CONFIG_IPIC is not set |
| @@ -221,7 +227,7 @@ CONFIG_HZ_250=y | |||
| 221 | # CONFIG_HZ_300 is not set | 227 | # CONFIG_HZ_300 is not set |
| 222 | # CONFIG_HZ_1000 is not set | 228 | # CONFIG_HZ_1000 is not set |
| 223 | CONFIG_HZ=250 | 229 | CONFIG_HZ=250 |
| 224 | # CONFIG_SCHED_HRTICK is not set | 230 | CONFIG_SCHED_HRTICK=y |
| 225 | CONFIG_PREEMPT_NONE=y | 231 | CONFIG_PREEMPT_NONE=y |
| 226 | # CONFIG_PREEMPT_VOLUNTARY is not set | 232 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 227 | # CONFIG_PREEMPT is not set | 233 | # CONFIG_PREEMPT is not set |
| @@ -244,6 +250,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 244 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 250 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 245 | CONFIG_PAGEFLAGS_EXTENDED=y | 251 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 246 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 252 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 253 | # CONFIG_MIGRATION is not set | ||
| 247 | # CONFIG_RESOURCES_64BIT is not set | 254 | # CONFIG_RESOURCES_64BIT is not set |
| 248 | CONFIG_ZONE_DMA_FLAG=1 | 255 | CONFIG_ZONE_DMA_FLAG=1 |
| 249 | CONFIG_BOUNCE=y | 256 | CONFIG_BOUNCE=y |
| @@ -251,6 +258,7 @@ CONFIG_VIRT_TO_BUS=y | |||
| 251 | CONFIG_FORCE_MAX_ZONEORDER=11 | 258 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 252 | CONFIG_PROC_DEVICETREE=y | 259 | CONFIG_PROC_DEVICETREE=y |
| 253 | # CONFIG_CMDLINE_BOOL is not set | 260 | # CONFIG_CMDLINE_BOOL is not set |
| 261 | CONFIG_EXTRA_TARGETS="" | ||
| 254 | CONFIG_ARCH_WANTS_FREEZER_CONTROL=y | 262 | CONFIG_ARCH_WANTS_FREEZER_CONTROL=y |
| 255 | CONFIG_PM=y | 263 | CONFIG_PM=y |
| 256 | CONFIG_PM_DEBUG=y | 264 | CONFIG_PM_DEBUG=y |
| @@ -314,10 +322,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
| 314 | CONFIG_KERNEL_START=0xc0000000 | 322 | CONFIG_KERNEL_START=0xc0000000 |
| 315 | CONFIG_PHYSICAL_START=0x00000000 | 323 | CONFIG_PHYSICAL_START=0x00000000 |
| 316 | CONFIG_TASK_SIZE=0xc0000000 | 324 | CONFIG_TASK_SIZE=0xc0000000 |
| 317 | |||
| 318 | # | ||
| 319 | # Networking | ||
| 320 | # | ||
| 321 | CONFIG_NET=y | 325 | CONFIG_NET=y |
| 322 | 326 | ||
| 323 | # | 327 | # |
| @@ -501,7 +505,6 @@ CONFIG_IP_DCCP_TFRC_LIB=m | |||
| 501 | # CONFIG_WAN_ROUTER is not set | 505 | # CONFIG_WAN_ROUTER is not set |
| 502 | # CONFIG_NET_SCHED is not set | 506 | # CONFIG_NET_SCHED is not set |
| 503 | CONFIG_NET_CLS_ROUTE=y | 507 | CONFIG_NET_CLS_ROUTE=y |
| 504 | CONFIG_NET_SCH_FIFO=y | ||
| 505 | 508 | ||
| 506 | # | 509 | # |
| 507 | # Network testing | 510 | # Network testing |
| @@ -571,6 +574,7 @@ CONFIG_BT_HIDP=m | |||
| 571 | # | 574 | # |
| 572 | CONFIG_BT_HCIUSB=m | 575 | CONFIG_BT_HCIUSB=m |
| 573 | # CONFIG_BT_HCIUSB_SCO is not set | 576 | # CONFIG_BT_HCIUSB_SCO is not set |
| 577 | # CONFIG_BT_HCIBTUSB is not set | ||
| 574 | # CONFIG_BT_HCIUART is not set | 578 | # CONFIG_BT_HCIUART is not set |
| 575 | CONFIG_BT_HCIBCM203X=m | 579 | CONFIG_BT_HCIBCM203X=m |
| 576 | # CONFIG_BT_HCIBPA10X is not set | 580 | # CONFIG_BT_HCIBPA10X is not set |
| @@ -588,27 +592,18 @@ CONFIG_BT_HCIBFUSB=m | |||
| 588 | CONFIG_CFG80211=m | 592 | CONFIG_CFG80211=m |
| 589 | CONFIG_NL80211=y | 593 | CONFIG_NL80211=y |
| 590 | CONFIG_WIRELESS_EXT=y | 594 | CONFIG_WIRELESS_EXT=y |
| 595 | CONFIG_WIRELESS_EXT_SYSFS=y | ||
| 591 | CONFIG_MAC80211=m | 596 | CONFIG_MAC80211=m |
| 592 | 597 | ||
| 593 | # | 598 | # |
| 594 | # Rate control algorithm selection | 599 | # Rate control algorithm selection |
| 595 | # | 600 | # |
| 601 | CONFIG_MAC80211_RC_PID=y | ||
| 596 | CONFIG_MAC80211_RC_DEFAULT_PID=y | 602 | CONFIG_MAC80211_RC_DEFAULT_PID=y |
| 597 | # CONFIG_MAC80211_RC_DEFAULT_NONE is not set | ||
| 598 | |||
| 599 | # | ||
| 600 | # Selecting 'y' for an algorithm will | ||
| 601 | # | ||
| 602 | |||
| 603 | # | ||
| 604 | # build the algorithm into mac80211. | ||
| 605 | # | ||
| 606 | CONFIG_MAC80211_RC_DEFAULT="pid" | 603 | CONFIG_MAC80211_RC_DEFAULT="pid" |
| 607 | CONFIG_MAC80211_RC_PID=y | ||
| 608 | # CONFIG_MAC80211_MESH is not set | 604 | # CONFIG_MAC80211_MESH is not set |
| 609 | CONFIG_MAC80211_LEDS=y | 605 | CONFIG_MAC80211_LEDS=y |
| 610 | # CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set | 606 | # CONFIG_MAC80211_DEBUG_MENU is not set |
| 611 | # CONFIG_MAC80211_DEBUG is not set | ||
| 612 | CONFIG_IEEE80211=m | 607 | CONFIG_IEEE80211=m |
| 613 | # CONFIG_IEEE80211_DEBUG is not set | 608 | # CONFIG_IEEE80211_DEBUG is not set |
| 614 | CONFIG_IEEE80211_CRYPT_WEP=m | 609 | CONFIG_IEEE80211_CRYPT_WEP=m |
| @@ -628,6 +623,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | |||
| 628 | # CONFIG_STANDALONE is not set | 623 | # CONFIG_STANDALONE is not set |
| 629 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 624 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 630 | CONFIG_FW_LOADER=y | 625 | CONFIG_FW_LOADER=y |
| 626 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
| 627 | CONFIG_EXTRA_FIRMWARE="" | ||
| 631 | # CONFIG_DEBUG_DRIVER is not set | 628 | # CONFIG_DEBUG_DRIVER is not set |
| 632 | # CONFIG_DEBUG_DEVRES is not set | 629 | # CONFIG_DEBUG_DEVRES is not set |
| 633 | # CONFIG_SYS_HYPERVISOR is not set | 630 | # CONFIG_SYS_HYPERVISOR is not set |
| @@ -656,12 +653,14 @@ CONFIG_BLK_DEV_RAM_SIZE=4096 | |||
| 656 | # CONFIG_BLK_DEV_XIP is not set | 653 | # CONFIG_BLK_DEV_XIP is not set |
| 657 | # CONFIG_CDROM_PKTCDVD is not set | 654 | # CONFIG_CDROM_PKTCDVD is not set |
| 658 | # CONFIG_ATA_OVER_ETH is not set | 655 | # CONFIG_ATA_OVER_ETH is not set |
| 656 | # CONFIG_BLK_DEV_HD is not set | ||
| 659 | CONFIG_MISC_DEVICES=y | 657 | CONFIG_MISC_DEVICES=y |
| 660 | # CONFIG_PHANTOM is not set | 658 | # CONFIG_PHANTOM is not set |
| 661 | # CONFIG_EEPROM_93CX6 is not set | 659 | # CONFIG_EEPROM_93CX6 is not set |
| 662 | # CONFIG_SGI_IOC4 is not set | 660 | # CONFIG_SGI_IOC4 is not set |
| 663 | # CONFIG_TIFM_CORE is not set | 661 | # CONFIG_TIFM_CORE is not set |
| 664 | # CONFIG_ENCLOSURE_SERVICES is not set | 662 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 663 | # CONFIG_HP_ILO is not set | ||
| 665 | CONFIG_HAVE_IDE=y | 664 | CONFIG_HAVE_IDE=y |
| 666 | CONFIG_IDE=y | 665 | CONFIG_IDE=y |
| 667 | CONFIG_BLK_DEV_IDE=y | 666 | CONFIG_BLK_DEV_IDE=y |
| @@ -669,6 +668,8 @@ CONFIG_BLK_DEV_IDE=y | |||
| 669 | # | 668 | # |
| 670 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | 669 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
| 671 | # | 670 | # |
| 671 | CONFIG_IDE_TIMINGS=y | ||
| 672 | CONFIG_IDE_ATAPI=y | ||
| 672 | # CONFIG_BLK_DEV_IDE_SATA is not set | 673 | # CONFIG_BLK_DEV_IDE_SATA is not set |
| 673 | CONFIG_BLK_DEV_IDEDISK=y | 674 | CONFIG_BLK_DEV_IDEDISK=y |
| 674 | # CONFIG_IDEDISK_MULTI_MODE is not set | 675 | # CONFIG_IDEDISK_MULTI_MODE is not set |
| @@ -685,7 +686,6 @@ CONFIG_IDE_PROC_FS=y | |||
| 685 | # | 686 | # |
| 686 | # IDE chipset support/bugfixes | 687 | # IDE chipset support/bugfixes |
| 687 | # | 688 | # |
| 688 | # CONFIG_IDE_GENERIC is not set | ||
| 689 | # CONFIG_BLK_DEV_PLATFORM is not set | 689 | # CONFIG_BLK_DEV_PLATFORM is not set |
| 690 | CONFIG_BLK_DEV_IDEDMA_SFF=y | 690 | CONFIG_BLK_DEV_IDEDMA_SFF=y |
| 691 | 691 | ||
| @@ -703,10 +703,8 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
| 703 | # CONFIG_BLK_DEV_AMD74XX is not set | 703 | # CONFIG_BLK_DEV_AMD74XX is not set |
| 704 | # CONFIG_BLK_DEV_CMD64X is not set | 704 | # CONFIG_BLK_DEV_CMD64X is not set |
| 705 | # CONFIG_BLK_DEV_TRIFLEX is not set | 705 | # CONFIG_BLK_DEV_TRIFLEX is not set |
| 706 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
| 707 | # CONFIG_BLK_DEV_CS5520 is not set | 706 | # CONFIG_BLK_DEV_CS5520 is not set |
| 708 | # CONFIG_BLK_DEV_CS5530 is not set | 707 | # CONFIG_BLK_DEV_CS5530 is not set |
| 709 | # CONFIG_BLK_DEV_HPT34X is not set | ||
| 710 | # CONFIG_BLK_DEV_HPT366 is not set | 708 | # CONFIG_BLK_DEV_HPT366 is not set |
| 711 | # CONFIG_BLK_DEV_JMICRON is not set | 709 | # CONFIG_BLK_DEV_JMICRON is not set |
| 712 | # CONFIG_BLK_DEV_SC1200 is not set | 710 | # CONFIG_BLK_DEV_SC1200 is not set |
| @@ -727,8 +725,6 @@ CONFIG_BLK_DEV_IDE_PMAC=y | |||
| 727 | CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y | 725 | CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y |
| 728 | CONFIG_BLK_DEV_IDEDMA_PMAC=y | 726 | CONFIG_BLK_DEV_IDEDMA_PMAC=y |
| 729 | CONFIG_BLK_DEV_IDEDMA=y | 727 | CONFIG_BLK_DEV_IDEDMA=y |
| 730 | # CONFIG_BLK_DEV_HD_ONLY is not set | ||
| 731 | # CONFIG_BLK_DEV_HD is not set | ||
| 732 | 728 | ||
| 733 | # | 729 | # |
| 734 | # SCSI device support | 730 | # SCSI device support |
| @@ -820,6 +816,7 @@ CONFIG_SCSI_MESH_RESET_DELAY_MS=4000 | |||
| 820 | CONFIG_SCSI_MAC53C94=y | 816 | CONFIG_SCSI_MAC53C94=y |
| 821 | # CONFIG_SCSI_SRP is not set | 817 | # CONFIG_SCSI_SRP is not set |
| 822 | # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set | 818 | # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set |
| 819 | # CONFIG_SCSI_DH is not set | ||
| 823 | # CONFIG_ATA is not set | 820 | # CONFIG_ATA is not set |
| 824 | CONFIG_MD=y | 821 | CONFIG_MD=y |
| 825 | CONFIG_BLK_DEV_MD=m | 822 | CONFIG_BLK_DEV_MD=m |
| @@ -844,30 +841,22 @@ CONFIG_DM_ZERO=m | |||
| 844 | # | 841 | # |
| 845 | # IEEE 1394 (FireWire) support | 842 | # IEEE 1394 (FireWire) support |
| 846 | # | 843 | # |
| 847 | # CONFIG_FIREWIRE is not set | ||
| 848 | CONFIG_IEEE1394=m | ||
| 849 | |||
| 850 | # | ||
| 851 | # Subsystem Options | ||
| 852 | # | ||
| 853 | # CONFIG_IEEE1394_VERBOSEDEBUG is not set | ||
| 854 | 844 | ||
| 855 | # | 845 | # |
| 856 | # Controllers | 846 | # Enable only one of the two stacks, unless you know what you are doing |
| 857 | # | 847 | # |
| 858 | # CONFIG_IEEE1394_PCILYNX is not set | 848 | # CONFIG_FIREWIRE is not set |
| 849 | CONFIG_IEEE1394=m | ||
| 859 | CONFIG_IEEE1394_OHCI1394=m | 850 | CONFIG_IEEE1394_OHCI1394=m |
| 860 | 851 | # CONFIG_IEEE1394_PCILYNX is not set | |
| 861 | # | ||
| 862 | # Protocols | ||
| 863 | # | ||
| 864 | CONFIG_IEEE1394_VIDEO1394=m | ||
| 865 | CONFIG_IEEE1394_SBP2=m | 852 | CONFIG_IEEE1394_SBP2=m |
| 866 | # CONFIG_IEEE1394_SBP2_PHYS_DMA is not set | 853 | # CONFIG_IEEE1394_SBP2_PHYS_DMA is not set |
| 867 | # CONFIG_IEEE1394_ETH1394_ROM_ENTRY is not set | 854 | # CONFIG_IEEE1394_ETH1394_ROM_ENTRY is not set |
| 868 | # CONFIG_IEEE1394_ETH1394 is not set | 855 | # CONFIG_IEEE1394_ETH1394 is not set |
| 869 | CONFIG_IEEE1394_DV1394=m | ||
| 870 | CONFIG_IEEE1394_RAWIO=m | 856 | CONFIG_IEEE1394_RAWIO=m |
| 857 | CONFIG_IEEE1394_VIDEO1394=m | ||
| 858 | CONFIG_IEEE1394_DV1394=m | ||
| 859 | # CONFIG_IEEE1394_VERBOSEDEBUG is not set | ||
| 871 | # CONFIG_I2O is not set | 860 | # CONFIG_I2O is not set |
| 872 | CONFIG_MACINTOSH_DRIVERS=y | 861 | CONFIG_MACINTOSH_DRIVERS=y |
| 873 | CONFIG_ADB=y | 862 | CONFIG_ADB=y |
| @@ -887,7 +876,6 @@ CONFIG_THERM_ADT746X=m | |||
| 887 | # CONFIG_ANSLCD is not set | 876 | # CONFIG_ANSLCD is not set |
| 888 | CONFIG_PMAC_RACKMETER=m | 877 | CONFIG_PMAC_RACKMETER=m |
| 889 | CONFIG_NETDEVICES=y | 878 | CONFIG_NETDEVICES=y |
| 890 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 891 | CONFIG_DUMMY=m | 879 | CONFIG_DUMMY=m |
| 892 | # CONFIG_BONDING is not set | 880 | # CONFIG_BONDING is not set |
| 893 | # CONFIG_MACVLAN is not set | 881 | # CONFIG_MACVLAN is not set |
| @@ -936,7 +924,6 @@ CONFIG_NETDEV_1000=y | |||
| 936 | # CONFIG_DL2K is not set | 924 | # CONFIG_DL2K is not set |
| 937 | # CONFIG_E1000 is not set | 925 | # CONFIG_E1000 is not set |
| 938 | # CONFIG_E1000E is not set | 926 | # CONFIG_E1000E is not set |
| 939 | # CONFIG_E1000E_ENABLED is not set | ||
| 940 | # CONFIG_IP1000 is not set | 927 | # CONFIG_IP1000 is not set |
| 941 | # CONFIG_IGB is not set | 928 | # CONFIG_IGB is not set |
| 942 | # CONFIG_NS83820 is not set | 929 | # CONFIG_NS83820 is not set |
| @@ -952,6 +939,7 @@ CONFIG_NETDEV_1000=y | |||
| 952 | # CONFIG_MV643XX_ETH is not set | 939 | # CONFIG_MV643XX_ETH is not set |
| 953 | # CONFIG_QLA3XXX is not set | 940 | # CONFIG_QLA3XXX is not set |
| 954 | # CONFIG_ATL1 is not set | 941 | # CONFIG_ATL1 is not set |
| 942 | # CONFIG_ATL1E is not set | ||
| 955 | CONFIG_NETDEV_10000=y | 943 | CONFIG_NETDEV_10000=y |
| 956 | # CONFIG_CHELSIO_T1 is not set | 944 | # CONFIG_CHELSIO_T1 is not set |
| 957 | # CONFIG_CHELSIO_T3 is not set | 945 | # CONFIG_CHELSIO_T3 is not set |
| @@ -994,13 +982,15 @@ CONFIG_PRISM54=m | |||
| 994 | # CONFIG_RTL8180 is not set | 982 | # CONFIG_RTL8180 is not set |
| 995 | # CONFIG_RTL8187 is not set | 983 | # CONFIG_RTL8187 is not set |
| 996 | # CONFIG_ADM8211 is not set | 984 | # CONFIG_ADM8211 is not set |
| 985 | # CONFIG_MAC80211_HWSIM is not set | ||
| 997 | CONFIG_P54_COMMON=m | 986 | CONFIG_P54_COMMON=m |
| 998 | # CONFIG_P54_USB is not set | 987 | # CONFIG_P54_USB is not set |
| 999 | # CONFIG_P54_PCI is not set | 988 | # CONFIG_P54_PCI is not set |
| 1000 | # CONFIG_ATH5K is not set | 989 | # CONFIG_ATH5K is not set |
| 990 | # CONFIG_ATH9K is not set | ||
| 1001 | # CONFIG_IWLCORE is not set | 991 | # CONFIG_IWLCORE is not set |
| 1002 | # CONFIG_IWLWIFI_LEDS is not set | 992 | # CONFIG_IWLWIFI_LEDS is not set |
| 1003 | # CONFIG_IWL4965 is not set | 993 | # CONFIG_IWLAGN is not set |
| 1004 | # CONFIG_IWL3945 is not set | 994 | # CONFIG_IWL3945 is not set |
| 1005 | # CONFIG_HOSTAP is not set | 995 | # CONFIG_HOSTAP is not set |
| 1006 | CONFIG_B43=m | 996 | CONFIG_B43=m |
| @@ -1095,6 +1085,7 @@ CONFIG_INPUT_MOUSE=y | |||
| 1095 | # CONFIG_MOUSE_PS2 is not set | 1085 | # CONFIG_MOUSE_PS2 is not set |
| 1096 | # CONFIG_MOUSE_SERIAL is not set | 1086 | # CONFIG_MOUSE_SERIAL is not set |
| 1097 | # CONFIG_MOUSE_APPLETOUCH is not set | 1087 | # CONFIG_MOUSE_APPLETOUCH is not set |
| 1088 | # CONFIG_MOUSE_BCM5974 is not set | ||
| 1098 | # CONFIG_MOUSE_VSXXXAA is not set | 1089 | # CONFIG_MOUSE_VSXXXAA is not set |
| 1099 | # CONFIG_INPUT_JOYSTICK is not set | 1090 | # CONFIG_INPUT_JOYSTICK is not set |
| 1100 | # CONFIG_INPUT_TABLET is not set | 1091 | # CONFIG_INPUT_TABLET is not set |
| @@ -1109,12 +1100,14 @@ CONFIG_SERIO=y | |||
| 1109 | # CONFIG_SERIO_SERPORT is not set | 1100 | # CONFIG_SERIO_SERPORT is not set |
| 1110 | # CONFIG_SERIO_PCIPS2 is not set | 1101 | # CONFIG_SERIO_PCIPS2 is not set |
| 1111 | # CONFIG_SERIO_RAW is not set | 1102 | # CONFIG_SERIO_RAW is not set |
| 1103 | # CONFIG_SERIO_XILINX_XPS_PS2 is not set | ||
| 1112 | # CONFIG_GAMEPORT is not set | 1104 | # CONFIG_GAMEPORT is not set |
| 1113 | 1105 | ||
| 1114 | # | 1106 | # |
| 1115 | # Character devices | 1107 | # Character devices |
| 1116 | # | 1108 | # |
| 1117 | CONFIG_VT=y | 1109 | CONFIG_VT=y |
| 1110 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 1118 | CONFIG_VT_CONSOLE=y | 1111 | CONFIG_VT_CONSOLE=y |
| 1119 | CONFIG_HW_CONSOLE=y | 1112 | CONFIG_HW_CONSOLE=y |
| 1120 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 1113 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| @@ -1165,45 +1158,70 @@ CONFIG_DEVPORT=y | |||
| 1165 | CONFIG_I2C=y | 1158 | CONFIG_I2C=y |
| 1166 | CONFIG_I2C_BOARDINFO=y | 1159 | CONFIG_I2C_BOARDINFO=y |
| 1167 | CONFIG_I2C_CHARDEV=m | 1160 | CONFIG_I2C_CHARDEV=m |
| 1161 | CONFIG_I2C_HELPER_AUTO=y | ||
| 1168 | CONFIG_I2C_ALGOBIT=y | 1162 | CONFIG_I2C_ALGOBIT=y |
| 1169 | 1163 | ||
| 1170 | # | 1164 | # |
| 1171 | # I2C Hardware Bus support | 1165 | # I2C Hardware Bus support |
| 1172 | # | 1166 | # |
| 1167 | |||
| 1168 | # | ||
| 1169 | # PC SMBus host controller drivers | ||
| 1170 | # | ||
| 1173 | # CONFIG_I2C_ALI1535 is not set | 1171 | # CONFIG_I2C_ALI1535 is not set |
| 1174 | # CONFIG_I2C_ALI1563 is not set | 1172 | # CONFIG_I2C_ALI1563 is not set |
| 1175 | # CONFIG_I2C_ALI15X3 is not set | 1173 | # CONFIG_I2C_ALI15X3 is not set |
| 1176 | # CONFIG_I2C_AMD756 is not set | 1174 | # CONFIG_I2C_AMD756 is not set |
| 1177 | # CONFIG_I2C_AMD8111 is not set | 1175 | # CONFIG_I2C_AMD8111 is not set |
| 1178 | # CONFIG_I2C_I801 is not set | 1176 | # CONFIG_I2C_I801 is not set |
| 1179 | # CONFIG_I2C_I810 is not set | 1177 | # CONFIG_I2C_ISCH is not set |
| 1180 | # CONFIG_I2C_PIIX4 is not set | 1178 | # CONFIG_I2C_PIIX4 is not set |
| 1181 | CONFIG_I2C_POWERMAC=y | ||
| 1182 | # CONFIG_I2C_MPC is not set | ||
| 1183 | # CONFIG_I2C_NFORCE2 is not set | 1179 | # CONFIG_I2C_NFORCE2 is not set |
| 1184 | # CONFIG_I2C_OCORES is not set | ||
| 1185 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 1186 | # CONFIG_I2C_PROSAVAGE is not set | ||
| 1187 | # CONFIG_I2C_SAVAGE4 is not set | ||
| 1188 | # CONFIG_I2C_SIMTEC is not set | ||
| 1189 | # CONFIG_I2C_SIS5595 is not set | 1180 | # CONFIG_I2C_SIS5595 is not set |
| 1190 | # CONFIG_I2C_SIS630 is not set | 1181 | # CONFIG_I2C_SIS630 is not set |
| 1191 | # CONFIG_I2C_SIS96X is not set | 1182 | # CONFIG_I2C_SIS96X is not set |
| 1192 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 1193 | # CONFIG_I2C_STUB is not set | ||
| 1194 | # CONFIG_I2C_TINY_USB is not set | ||
| 1195 | # CONFIG_I2C_VIA is not set | 1183 | # CONFIG_I2C_VIA is not set |
| 1196 | # CONFIG_I2C_VIAPRO is not set | 1184 | # CONFIG_I2C_VIAPRO is not set |
| 1185 | |||
| 1186 | # | ||
| 1187 | # Mac SMBus host controller drivers | ||
| 1188 | # | ||
| 1189 | CONFIG_I2C_POWERMAC=y | ||
| 1190 | |||
| 1191 | # | ||
| 1192 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 1193 | # | ||
| 1194 | # CONFIG_I2C_MPC is not set | ||
| 1195 | # CONFIG_I2C_OCORES is not set | ||
| 1196 | # CONFIG_I2C_SIMTEC is not set | ||
| 1197 | |||
| 1198 | # | ||
| 1199 | # External I2C/SMBus adapter drivers | ||
| 1200 | # | ||
| 1201 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 1202 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 1203 | # CONFIG_I2C_TINY_USB is not set | ||
| 1204 | |||
| 1205 | # | ||
| 1206 | # Graphics adapter I2C/DDC channel drivers | ||
| 1207 | # | ||
| 1197 | # CONFIG_I2C_VOODOO3 is not set | 1208 | # CONFIG_I2C_VOODOO3 is not set |
| 1209 | |||
| 1210 | # | ||
| 1211 | # Other I2C/SMBus bus drivers | ||
| 1212 | # | ||
| 1198 | # CONFIG_I2C_PCA_PLATFORM is not set | 1213 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 1214 | # CONFIG_I2C_STUB is not set | ||
| 1199 | 1215 | ||
| 1200 | # | 1216 | # |
| 1201 | # Miscellaneous I2C Chip support | 1217 | # Miscellaneous I2C Chip support |
| 1202 | # | 1218 | # |
| 1203 | # CONFIG_DS1682 is not set | 1219 | # CONFIG_DS1682 is not set |
| 1220 | # CONFIG_AT24 is not set | ||
| 1204 | # CONFIG_SENSORS_EEPROM is not set | 1221 | # CONFIG_SENSORS_EEPROM is not set |
| 1205 | # CONFIG_SENSORS_PCF8574 is not set | 1222 | # CONFIG_SENSORS_PCF8574 is not set |
| 1206 | # CONFIG_PCF8575 is not set | 1223 | # CONFIG_PCF8575 is not set |
| 1224 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 1207 | # CONFIG_SENSORS_PCF8591 is not set | 1225 | # CONFIG_SENSORS_PCF8591 is not set |
| 1208 | # CONFIG_SENSORS_MAX6875 is not set | 1226 | # CONFIG_SENSORS_MAX6875 is not set |
| 1209 | # CONFIG_SENSORS_TSL2550 is not set | 1227 | # CONFIG_SENSORS_TSL2550 is not set |
| @@ -1212,6 +1230,8 @@ CONFIG_I2C_POWERMAC=y | |||
| 1212 | # CONFIG_I2C_DEBUG_BUS is not set | 1230 | # CONFIG_I2C_DEBUG_BUS is not set |
| 1213 | # CONFIG_I2C_DEBUG_CHIP is not set | 1231 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 1214 | # CONFIG_SPI is not set | 1232 | # CONFIG_SPI is not set |
| 1233 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 1234 | # CONFIG_GPIOLIB is not set | ||
| 1215 | # CONFIG_W1 is not set | 1235 | # CONFIG_W1 is not set |
| 1216 | CONFIG_POWER_SUPPLY=y | 1236 | CONFIG_POWER_SUPPLY=y |
| 1217 | # CONFIG_POWER_SUPPLY_DEBUG is not set | 1237 | # CONFIG_POWER_SUPPLY_DEBUG is not set |
| @@ -1221,6 +1241,7 @@ CONFIG_APM_POWER=y | |||
| 1221 | CONFIG_BATTERY_PMU=y | 1241 | CONFIG_BATTERY_PMU=y |
| 1222 | # CONFIG_HWMON is not set | 1242 | # CONFIG_HWMON is not set |
| 1223 | # CONFIG_THERMAL is not set | 1243 | # CONFIG_THERMAL is not set |
| 1244 | # CONFIG_THERMAL_HWMON is not set | ||
| 1224 | # CONFIG_WATCHDOG is not set | 1245 | # CONFIG_WATCHDOG is not set |
| 1225 | 1246 | ||
| 1226 | # | 1247 | # |
| @@ -1241,8 +1262,10 @@ CONFIG_SSB_DRIVER_PCICORE=y | |||
| 1241 | # | 1262 | # |
| 1242 | # Multifunction device drivers | 1263 | # Multifunction device drivers |
| 1243 | # | 1264 | # |
| 1265 | # CONFIG_MFD_CORE is not set | ||
| 1244 | # CONFIG_MFD_SM501 is not set | 1266 | # CONFIG_MFD_SM501 is not set |
| 1245 | # CONFIG_HTC_PASIC3 is not set | 1267 | # CONFIG_HTC_PASIC3 is not set |
| 1268 | # CONFIG_MFD_TMIO is not set | ||
| 1246 | 1269 | ||
| 1247 | # | 1270 | # |
| 1248 | # Multimedia devices | 1271 | # Multimedia devices |
| @@ -1343,10 +1366,13 @@ CONFIG_FB_3DFX=y | |||
| 1343 | # CONFIG_FB_TRIDENT is not set | 1366 | # CONFIG_FB_TRIDENT is not set |
| 1344 | # CONFIG_FB_ARK is not set | 1367 | # CONFIG_FB_ARK is not set |
| 1345 | # CONFIG_FB_PM3 is not set | 1368 | # CONFIG_FB_PM3 is not set |
| 1369 | # CONFIG_FB_CARMINE is not set | ||
| 1346 | # CONFIG_FB_IBM_GXT4500 is not set | 1370 | # CONFIG_FB_IBM_GXT4500 is not set |
| 1347 | # CONFIG_FB_VIRTUAL is not set | 1371 | # CONFIG_FB_VIRTUAL is not set |
| 1348 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | 1372 | CONFIG_BACKLIGHT_LCD_SUPPORT=y |
| 1349 | CONFIG_LCD_CLASS_DEVICE=m | 1373 | CONFIG_LCD_CLASS_DEVICE=m |
| 1374 | # CONFIG_LCD_ILI9320 is not set | ||
| 1375 | # CONFIG_LCD_PLATFORM is not set | ||
| 1350 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | 1376 | CONFIG_BACKLIGHT_CLASS_DEVICE=y |
| 1351 | # CONFIG_BACKLIGHT_CORGI is not set | 1377 | # CONFIG_BACKLIGHT_CORGI is not set |
| 1352 | 1378 | ||
| @@ -1374,15 +1400,7 @@ CONFIG_LOGO=y | |||
| 1374 | CONFIG_LOGO_LINUX_MONO=y | 1400 | CONFIG_LOGO_LINUX_MONO=y |
| 1375 | CONFIG_LOGO_LINUX_VGA16=y | 1401 | CONFIG_LOGO_LINUX_VGA16=y |
| 1376 | CONFIG_LOGO_LINUX_CLUT224=y | 1402 | CONFIG_LOGO_LINUX_CLUT224=y |
| 1377 | |||
| 1378 | # | ||
| 1379 | # Sound | ||
| 1380 | # | ||
| 1381 | CONFIG_SOUND=m | 1403 | CONFIG_SOUND=m |
| 1382 | |||
| 1383 | # | ||
| 1384 | # Advanced Linux Sound Architecture | ||
| 1385 | # | ||
| 1386 | CONFIG_SND=m | 1404 | CONFIG_SND=m |
| 1387 | CONFIG_SND_TIMER=m | 1405 | CONFIG_SND_TIMER=m |
| 1388 | CONFIG_SND_PCM=m | 1406 | CONFIG_SND_PCM=m |
| @@ -1400,19 +1418,13 @@ CONFIG_SND_SUPPORT_OLD_API=y | |||
| 1400 | CONFIG_SND_VERBOSE_PROCFS=y | 1418 | CONFIG_SND_VERBOSE_PROCFS=y |
| 1401 | # CONFIG_SND_VERBOSE_PRINTK is not set | 1419 | # CONFIG_SND_VERBOSE_PRINTK is not set |
| 1402 | # CONFIG_SND_DEBUG is not set | 1420 | # CONFIG_SND_DEBUG is not set |
| 1403 | 1421 | CONFIG_SND_DRIVERS=y | |
| 1404 | # | ||
| 1405 | # Generic devices | ||
| 1406 | # | ||
| 1407 | CONFIG_SND_DUMMY=m | 1422 | CONFIG_SND_DUMMY=m |
| 1408 | # CONFIG_SND_VIRMIDI is not set | 1423 | # CONFIG_SND_VIRMIDI is not set |
| 1409 | # CONFIG_SND_MTPAV is not set | 1424 | # CONFIG_SND_MTPAV is not set |
| 1410 | # CONFIG_SND_SERIAL_U16550 is not set | 1425 | # CONFIG_SND_SERIAL_U16550 is not set |
| 1411 | # CONFIG_SND_MPU401 is not set | 1426 | # CONFIG_SND_MPU401 is not set |
| 1412 | 1427 | CONFIG_SND_PCI=y | |
| 1413 | # | ||
| 1414 | # PCI devices | ||
| 1415 | # | ||
| 1416 | # CONFIG_SND_AD1889 is not set | 1428 | # CONFIG_SND_AD1889 is not set |
| 1417 | # CONFIG_SND_ALS300 is not set | 1429 | # CONFIG_SND_ALS300 is not set |
| 1418 | # CONFIG_SND_ALS4000 is not set | 1430 | # CONFIG_SND_ALS4000 is not set |
| @@ -1474,20 +1486,9 @@ CONFIG_SND_DUMMY=m | |||
| 1474 | # CONFIG_SND_VIRTUOSO is not set | 1486 | # CONFIG_SND_VIRTUOSO is not set |
| 1475 | # CONFIG_SND_VX222 is not set | 1487 | # CONFIG_SND_VX222 is not set |
| 1476 | # CONFIG_SND_YMFPCI is not set | 1488 | # CONFIG_SND_YMFPCI is not set |
| 1477 | 1489 | CONFIG_SND_PPC=y | |
| 1478 | # | ||
| 1479 | # ALSA PowerMac devices | ||
| 1480 | # | ||
| 1481 | CONFIG_SND_POWERMAC=m | 1490 | CONFIG_SND_POWERMAC=m |
| 1482 | CONFIG_SND_POWERMAC_AUTO_DRC=y | 1491 | CONFIG_SND_POWERMAC_AUTO_DRC=y |
| 1483 | |||
| 1484 | # | ||
| 1485 | # ALSA PowerPC devices | ||
| 1486 | # | ||
| 1487 | |||
| 1488 | # | ||
| 1489 | # Apple Onboard Audio driver | ||
| 1490 | # | ||
| 1491 | CONFIG_SND_AOA=m | 1492 | CONFIG_SND_AOA=m |
| 1492 | CONFIG_SND_AOA_FABRIC_LAYOUT=m | 1493 | CONFIG_SND_AOA_FABRIC_LAYOUT=m |
| 1493 | CONFIG_SND_AOA_ONYX=m | 1494 | CONFIG_SND_AOA_ONYX=m |
| @@ -1495,36 +1496,14 @@ CONFIG_SND_AOA_TAS=m | |||
| 1495 | CONFIG_SND_AOA_TOONIE=m | 1496 | CONFIG_SND_AOA_TOONIE=m |
| 1496 | CONFIG_SND_AOA_SOUNDBUS=m | 1497 | CONFIG_SND_AOA_SOUNDBUS=m |
| 1497 | CONFIG_SND_AOA_SOUNDBUS_I2S=m | 1498 | CONFIG_SND_AOA_SOUNDBUS_I2S=m |
| 1498 | 1499 | CONFIG_SND_USB=y | |
| 1499 | # | ||
| 1500 | # USB devices | ||
| 1501 | # | ||
| 1502 | CONFIG_SND_USB_AUDIO=m | 1500 | CONFIG_SND_USB_AUDIO=m |
| 1503 | # CONFIG_SND_USB_USX2Y is not set | 1501 | # CONFIG_SND_USB_USX2Y is not set |
| 1504 | # CONFIG_SND_USB_CAIAQ is not set | 1502 | # CONFIG_SND_USB_CAIAQ is not set |
| 1505 | 1503 | CONFIG_SND_PCMCIA=y | |
| 1506 | # | ||
| 1507 | # PCMCIA devices | ||
| 1508 | # | ||
| 1509 | # CONFIG_SND_VXPOCKET is not set | 1504 | # CONFIG_SND_VXPOCKET is not set |
| 1510 | # CONFIG_SND_PDAUDIOCF is not set | 1505 | # CONFIG_SND_PDAUDIOCF is not set |
| 1511 | |||
| 1512 | # | ||
| 1513 | # System on Chip audio support | ||
| 1514 | # | ||
| 1515 | # CONFIG_SND_SOC is not set | 1506 | # CONFIG_SND_SOC is not set |
| 1516 | |||
| 1517 | # | ||
| 1518 | # ALSA SoC audio for Freescale SOCs | ||
| 1519 | # | ||
| 1520 | |||
| 1521 | # | ||
| 1522 | # SoC Audio for the Texas Instruments OMAP | ||
| 1523 | # | ||
| 1524 | |||
| 1525 | # | ||
| 1526 | # Open Sound System | ||
| 1527 | # | ||
| 1528 | # CONFIG_SOUND_PRIME is not set | 1507 | # CONFIG_SOUND_PRIME is not set |
| 1529 | CONFIG_HID_SUPPORT=y | 1508 | CONFIG_HID_SUPPORT=y |
| 1530 | CONFIG_HID=y | 1509 | CONFIG_HID=y |
| @@ -1554,6 +1533,7 @@ CONFIG_USB_DEVICE_CLASS=y | |||
| 1554 | CONFIG_USB_DYNAMIC_MINORS=y | 1533 | CONFIG_USB_DYNAMIC_MINORS=y |
| 1555 | # CONFIG_USB_SUSPEND is not set | 1534 | # CONFIG_USB_SUSPEND is not set |
| 1556 | # CONFIG_USB_OTG is not set | 1535 | # CONFIG_USB_OTG is not set |
| 1536 | CONFIG_USB_MON=y | ||
| 1557 | 1537 | ||
| 1558 | # | 1538 | # |
| 1559 | # USB Host Controller Drivers | 1539 | # USB Host Controller Drivers |
| @@ -1579,6 +1559,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 1579 | # | 1559 | # |
| 1580 | CONFIG_USB_ACM=m | 1560 | CONFIG_USB_ACM=m |
| 1581 | CONFIG_USB_PRINTER=m | 1561 | CONFIG_USB_PRINTER=m |
| 1562 | # CONFIG_USB_WDM is not set | ||
| 1582 | 1563 | ||
| 1583 | # | 1564 | # |
| 1584 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1565 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -1600,6 +1581,7 @@ CONFIG_USB_STORAGE=m | |||
| 1600 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1581 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1601 | CONFIG_USB_STORAGE_ONETOUCH=y | 1582 | CONFIG_USB_STORAGE_ONETOUCH=y |
| 1602 | # CONFIG_USB_STORAGE_KARMA is not set | 1583 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1584 | # CONFIG_USB_STORAGE_SIERRA is not set | ||
| 1603 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | 1585 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
| 1604 | # CONFIG_USB_LIBUSUAL is not set | 1586 | # CONFIG_USB_LIBUSUAL is not set |
| 1605 | 1587 | ||
| @@ -1608,7 +1590,6 @@ CONFIG_USB_STORAGE_ONETOUCH=y | |||
| 1608 | # | 1590 | # |
| 1609 | # CONFIG_USB_MDC800 is not set | 1591 | # CONFIG_USB_MDC800 is not set |
| 1610 | # CONFIG_USB_MICROTEK is not set | 1592 | # CONFIG_USB_MICROTEK is not set |
| 1611 | CONFIG_USB_MON=y | ||
| 1612 | 1593 | ||
| 1613 | # | 1594 | # |
| 1614 | # USB port drivers | 1595 | # USB port drivers |
| @@ -1617,7 +1598,6 @@ CONFIG_USB_SERIAL=m | |||
| 1617 | CONFIG_USB_EZUSB=y | 1598 | CONFIG_USB_EZUSB=y |
| 1618 | # CONFIG_USB_SERIAL_GENERIC is not set | 1599 | # CONFIG_USB_SERIAL_GENERIC is not set |
| 1619 | # CONFIG_USB_SERIAL_AIRCABLE is not set | 1600 | # CONFIG_USB_SERIAL_AIRCABLE is not set |
| 1620 | # CONFIG_USB_SERIAL_AIRPRIME is not set | ||
| 1621 | # CONFIG_USB_SERIAL_ARK3116 is not set | 1601 | # CONFIG_USB_SERIAL_ARK3116 is not set |
| 1622 | # CONFIG_USB_SERIAL_BELKIN is not set | 1602 | # CONFIG_USB_SERIAL_BELKIN is not set |
| 1623 | # CONFIG_USB_SERIAL_CH341 is not set | 1603 | # CONFIG_USB_SERIAL_CH341 is not set |
| @@ -1676,7 +1656,6 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y | |||
| 1676 | # CONFIG_USB_EMI62 is not set | 1656 | # CONFIG_USB_EMI62 is not set |
| 1677 | # CONFIG_USB_EMI26 is not set | 1657 | # CONFIG_USB_EMI26 is not set |
| 1678 | # CONFIG_USB_ADUTUX is not set | 1658 | # CONFIG_USB_ADUTUX is not set |
| 1679 | # CONFIG_USB_AUERSWALD is not set | ||
| 1680 | # CONFIG_USB_RIO500 is not set | 1659 | # CONFIG_USB_RIO500 is not set |
| 1681 | # CONFIG_USB_LEGOTOWER is not set | 1660 | # CONFIG_USB_LEGOTOWER is not set |
| 1682 | # CONFIG_USB_LCD is not set | 1661 | # CONFIG_USB_LCD is not set |
| @@ -1693,6 +1672,7 @@ CONFIG_USB_APPLEDISPLAY=m | |||
| 1693 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1672 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 1694 | # CONFIG_USB_IOWARRIOR is not set | 1673 | # CONFIG_USB_IOWARRIOR is not set |
| 1695 | # CONFIG_USB_TEST is not set | 1674 | # CONFIG_USB_TEST is not set |
| 1675 | # CONFIG_USB_ISIGHTFW is not set | ||
| 1696 | # CONFIG_USB_GADGET is not set | 1676 | # CONFIG_USB_GADGET is not set |
| 1697 | # CONFIG_MMC is not set | 1677 | # CONFIG_MMC is not set |
| 1698 | # CONFIG_MEMSTICK is not set | 1678 | # CONFIG_MEMSTICK is not set |
| @@ -1702,6 +1682,8 @@ CONFIG_LEDS_CLASS=y | |||
| 1702 | # | 1682 | # |
| 1703 | # LED drivers | 1683 | # LED drivers |
| 1704 | # | 1684 | # |
| 1685 | # CONFIG_LEDS_PCA9532 is not set | ||
| 1686 | # CONFIG_LEDS_PCA955X is not set | ||
| 1705 | 1687 | ||
| 1706 | # | 1688 | # |
| 1707 | # LED Triggers | 1689 | # LED Triggers |
| @@ -1789,6 +1771,7 @@ CONFIG_HFSPLUS_FS=m | |||
| 1789 | # CONFIG_CRAMFS is not set | 1771 | # CONFIG_CRAMFS is not set |
| 1790 | # CONFIG_VXFS_FS is not set | 1772 | # CONFIG_VXFS_FS is not set |
| 1791 | # CONFIG_MINIX_FS is not set | 1773 | # CONFIG_MINIX_FS is not set |
| 1774 | # CONFIG_OMFS_FS is not set | ||
| 1792 | # CONFIG_HPFS_FS is not set | 1775 | # CONFIG_HPFS_FS is not set |
| 1793 | # CONFIG_QNX4FS_FS is not set | 1776 | # CONFIG_QNX4FS_FS is not set |
| 1794 | # CONFIG_ROMFS_FS is not set | 1777 | # CONFIG_ROMFS_FS is not set |
| @@ -1811,7 +1794,6 @@ CONFIG_NFS_ACL_SUPPORT=y | |||
| 1811 | CONFIG_NFS_COMMON=y | 1794 | CONFIG_NFS_COMMON=y |
| 1812 | CONFIG_SUNRPC=y | 1795 | CONFIG_SUNRPC=y |
| 1813 | CONFIG_SUNRPC_GSS=y | 1796 | CONFIG_SUNRPC_GSS=y |
| 1814 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 1815 | CONFIG_RPCSEC_GSS_KRB5=y | 1797 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1816 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1798 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1817 | CONFIG_SMB_FS=m | 1799 | CONFIG_SMB_FS=m |
| @@ -1891,6 +1873,7 @@ CONFIG_BITREVERSE=y | |||
| 1891 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1873 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 1892 | CONFIG_CRC_CCITT=y | 1874 | CONFIG_CRC_CCITT=y |
| 1893 | CONFIG_CRC16=y | 1875 | CONFIG_CRC16=y |
| 1876 | CONFIG_CRC_T10DIF=y | ||
| 1894 | CONFIG_CRC_ITU_T=m | 1877 | CONFIG_CRC_ITU_T=m |
| 1895 | CONFIG_CRC32=y | 1878 | CONFIG_CRC32=y |
| 1896 | # CONFIG_CRC7 is not set | 1879 | # CONFIG_CRC7 is not set |
| @@ -1921,8 +1904,10 @@ CONFIG_MAGIC_SYSRQ=y | |||
| 1921 | CONFIG_DEBUG_KERNEL=y | 1904 | CONFIG_DEBUG_KERNEL=y |
| 1922 | # CONFIG_DEBUG_SHIRQ is not set | 1905 | # CONFIG_DEBUG_SHIRQ is not set |
| 1923 | CONFIG_DETECT_SOFTLOCKUP=y | 1906 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1907 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 1908 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 1924 | CONFIG_SCHED_DEBUG=y | 1909 | CONFIG_SCHED_DEBUG=y |
| 1925 | # CONFIG_SCHEDSTATS is not set | 1910 | CONFIG_SCHEDSTATS=y |
| 1926 | # CONFIG_TIMER_STATS is not set | 1911 | # CONFIG_TIMER_STATS is not set |
| 1927 | # CONFIG_DEBUG_OBJECTS is not set | 1912 | # CONFIG_DEBUG_OBJECTS is not set |
| 1928 | # CONFIG_SLUB_DEBUG_ON is not set | 1913 | # CONFIG_SLUB_DEBUG_ON is not set |
| @@ -1933,24 +1918,38 @@ CONFIG_SCHED_DEBUG=y | |||
| 1933 | # CONFIG_DEBUG_MUTEXES is not set | 1918 | # CONFIG_DEBUG_MUTEXES is not set |
| 1934 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1919 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
| 1935 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1920 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
| 1921 | CONFIG_STACKTRACE=y | ||
| 1936 | # CONFIG_DEBUG_KOBJECT is not set | 1922 | # CONFIG_DEBUG_KOBJECT is not set |
| 1937 | CONFIG_DEBUG_BUGVERBOSE=y | 1923 | CONFIG_DEBUG_BUGVERBOSE=y |
| 1938 | # CONFIG_DEBUG_INFO is not set | 1924 | # CONFIG_DEBUG_INFO is not set |
| 1939 | # CONFIG_DEBUG_VM is not set | 1925 | # CONFIG_DEBUG_VM is not set |
| 1940 | # CONFIG_DEBUG_WRITECOUNT is not set | 1926 | # CONFIG_DEBUG_WRITECOUNT is not set |
| 1927 | CONFIG_DEBUG_MEMORY_INIT=y | ||
| 1941 | # CONFIG_DEBUG_LIST is not set | 1928 | # CONFIG_DEBUG_LIST is not set |
| 1942 | # CONFIG_DEBUG_SG is not set | 1929 | # CONFIG_DEBUG_SG is not set |
| 1930 | CONFIG_FRAME_POINTER=y | ||
| 1943 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1931 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 1944 | # CONFIG_RCU_TORTURE_TEST is not set | 1932 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1945 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1933 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 1946 | # CONFIG_FAULT_INJECTION is not set | 1934 | # CONFIG_FAULT_INJECTION is not set |
| 1935 | CONFIG_LATENCYTOP=y | ||
| 1936 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1937 | CONFIG_HAVE_FTRACE=y | ||
| 1938 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1939 | # CONFIG_FTRACE is not set | ||
| 1940 | # CONFIG_SCHED_TRACER is not set | ||
| 1941 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1947 | # CONFIG_SAMPLES is not set | 1942 | # CONFIG_SAMPLES is not set |
| 1943 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1944 | # CONFIG_KGDB is not set | ||
| 1948 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1945 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
| 1949 | # CONFIG_DEBUG_STACK_USAGE is not set | 1946 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1950 | CONFIG_DEBUGGER=y | 1947 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
| 1948 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
| 1951 | CONFIG_XMON=y | 1949 | CONFIG_XMON=y |
| 1952 | CONFIG_XMON_DEFAULT=y | 1950 | CONFIG_XMON_DEFAULT=y |
| 1953 | CONFIG_XMON_DISASSEMBLY=y | 1951 | CONFIG_XMON_DISASSEMBLY=y |
| 1952 | CONFIG_DEBUGGER=y | ||
| 1954 | CONFIG_IRQSTACKS=y | 1953 | CONFIG_IRQSTACKS=y |
| 1955 | # CONFIG_BDI_SWITCH is not set | 1954 | # CONFIG_BDI_SWITCH is not set |
| 1956 | CONFIG_BOOTX_TEXT=y | 1955 | CONFIG_BOOTX_TEXT=y |
| @@ -2009,6 +2008,10 @@ CONFIG_CRYPTO_CRC32C=m | |||
| 2009 | CONFIG_CRYPTO_MD4=m | 2008 | CONFIG_CRYPTO_MD4=m |
| 2010 | CONFIG_CRYPTO_MD5=y | 2009 | CONFIG_CRYPTO_MD5=y |
| 2011 | CONFIG_CRYPTO_MICHAEL_MIC=m | 2010 | CONFIG_CRYPTO_MICHAEL_MIC=m |
| 2011 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 2012 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 2013 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 2014 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 2012 | CONFIG_CRYPTO_SHA1=y | 2015 | CONFIG_CRYPTO_SHA1=y |
| 2013 | CONFIG_CRYPTO_SHA256=m | 2016 | CONFIG_CRYPTO_SHA256=m |
| 2014 | CONFIG_CRYPTO_SHA512=m | 2017 | CONFIG_CRYPTO_SHA512=m |
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig index ce250bc98584..fc5930caeb5f 100644 --- a/arch/powerpc/configs/ppc64_defconfig +++ b/arch/powerpc/configs/ppc64_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.26-rc6 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Mon Jun 16 21:11:19 2008 | 4 | # Tue Aug 26 13:22:03 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
| 7 | 7 | ||
| @@ -14,6 +14,7 @@ CONFIG_POWER4=y | |||
| 14 | # CONFIG_TUNE_CELL is not set | 14 | # CONFIG_TUNE_CELL is not set |
| 15 | CONFIG_PPC_FPU=y | 15 | CONFIG_PPC_FPU=y |
| 16 | CONFIG_ALTIVEC=y | 16 | CONFIG_ALTIVEC=y |
| 17 | CONFIG_VSX=y | ||
| 17 | CONFIG_PPC_STD_MMU=y | 18 | CONFIG_PPC_STD_MMU=y |
| 18 | CONFIG_PPC_MM_SLICES=y | 19 | CONFIG_PPC_MM_SLICES=y |
| 19 | CONFIG_VIRT_CPU_ACCOUNTING=y | 20 | CONFIG_VIRT_CPU_ACCOUNTING=y |
| @@ -31,6 +32,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 31 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y | 32 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y |
| 32 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 33 | CONFIG_STACKTRACE_SUPPORT=y | 34 | CONFIG_STACKTRACE_SUPPORT=y |
| 35 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 34 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 36 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
| 35 | CONFIG_LOCKDEP_SUPPORT=y | 37 | CONFIG_LOCKDEP_SUPPORT=y |
| 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| @@ -105,7 +107,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y | |||
| 105 | CONFIG_SYSCTL=y | 107 | CONFIG_SYSCTL=y |
| 106 | # CONFIG_EMBEDDED is not set | 108 | # CONFIG_EMBEDDED is not set |
| 107 | CONFIG_SYSCTL_SYSCALL=y | 109 | CONFIG_SYSCTL_SYSCALL=y |
| 108 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 109 | CONFIG_KALLSYMS=y | 110 | CONFIG_KALLSYMS=y |
| 110 | CONFIG_KALLSYMS_ALL=y | 111 | CONFIG_KALLSYMS_ALL=y |
| 111 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 112 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -129,14 +130,20 @@ CONFIG_SLUB_DEBUG=y | |||
| 129 | CONFIG_SLUB=y | 130 | CONFIG_SLUB=y |
| 130 | # CONFIG_SLOB is not set | 131 | # CONFIG_SLOB is not set |
| 131 | CONFIG_PROFILING=y | 132 | CONFIG_PROFILING=y |
| 132 | # CONFIG_MARKERS is not set | 133 | CONFIG_MARKERS=y |
| 133 | CONFIG_OPROFILE=y | 134 | CONFIG_OPROFILE=y |
| 134 | CONFIG_HAVE_OPROFILE=y | 135 | CONFIG_HAVE_OPROFILE=y |
| 135 | # CONFIG_KPROBES is not set | 136 | # CONFIG_KPROBES is not set |
| 137 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 138 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 136 | CONFIG_HAVE_KPROBES=y | 139 | CONFIG_HAVE_KPROBES=y |
| 137 | CONFIG_HAVE_KRETPROBES=y | 140 | CONFIG_HAVE_KRETPROBES=y |
| 138 | # CONFIG_HAVE_DMA_ATTRS is not set | 141 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
| 142 | CONFIG_HAVE_DMA_ATTRS=y | ||
| 143 | CONFIG_USE_GENERIC_SMP_HELPERS=y | ||
| 144 | # CONFIG_HAVE_CLK is not set | ||
| 139 | CONFIG_PROC_PAGE_MONITOR=y | 145 | CONFIG_PROC_PAGE_MONITOR=y |
| 146 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 140 | CONFIG_SLABINFO=y | 147 | CONFIG_SLABINFO=y |
| 141 | CONFIG_RT_MUTEXES=y | 148 | CONFIG_RT_MUTEXES=y |
| 142 | # CONFIG_TINY_SHMEM is not set | 149 | # CONFIG_TINY_SHMEM is not set |
| @@ -152,6 +159,7 @@ CONFIG_STOP_MACHINE=y | |||
| 152 | CONFIG_BLOCK=y | 159 | CONFIG_BLOCK=y |
| 153 | CONFIG_BLK_DEV_IO_TRACE=y | 160 | CONFIG_BLK_DEV_IO_TRACE=y |
| 154 | CONFIG_BLK_DEV_BSG=y | 161 | CONFIG_BLK_DEV_BSG=y |
| 162 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 155 | CONFIG_BLOCK_COMPAT=y | 163 | CONFIG_BLOCK_COMPAT=y |
| 156 | 164 | ||
| 157 | # | 165 | # |
| @@ -172,14 +180,13 @@ CONFIG_CLASSIC_RCU=y | |||
| 172 | # Platform support | 180 | # Platform support |
| 173 | # | 181 | # |
| 174 | CONFIG_PPC_MULTIPLATFORM=y | 182 | CONFIG_PPC_MULTIPLATFORM=y |
| 175 | # CONFIG_PPC_82xx is not set | ||
| 176 | # CONFIG_PPC_83xx is not set | ||
| 177 | # CONFIG_PPC_86xx is not set | ||
| 178 | CONFIG_PPC_PSERIES=y | 183 | CONFIG_PPC_PSERIES=y |
| 179 | CONFIG_PPC_SPLPAR=y | 184 | CONFIG_PPC_SPLPAR=y |
| 180 | CONFIG_EEH=y | 185 | CONFIG_EEH=y |
| 181 | CONFIG_SCANLOG=m | 186 | CONFIG_SCANLOG=m |
| 182 | CONFIG_LPARCFG=y | 187 | CONFIG_LPARCFG=y |
| 188 | CONFIG_PPC_SMLPAR=y | ||
| 189 | CONFIG_CMM=y | ||
| 183 | CONFIG_PPC_ISERIES=y | 190 | CONFIG_PPC_ISERIES=y |
| 184 | 191 | ||
| 185 | # | 192 | # |
| @@ -189,8 +196,6 @@ CONFIG_VIODASD=y | |||
| 189 | CONFIG_VIOCD=m | 196 | CONFIG_VIOCD=m |
| 190 | CONFIG_VIOTAPE=m | 197 | CONFIG_VIOTAPE=m |
| 191 | CONFIG_VIOPATH=y | 198 | CONFIG_VIOPATH=y |
| 192 | # CONFIG_PPC_MPC512x is not set | ||
| 193 | # CONFIG_PPC_MPC5121 is not set | ||
| 194 | CONFIG_PPC_PMAC=y | 199 | CONFIG_PPC_PMAC=y |
| 195 | CONFIG_PPC_PMAC64=y | 200 | CONFIG_PPC_PMAC64=y |
| 196 | CONFIG_PPC_MAPLE=y | 201 | CONFIG_PPC_MAPLE=y |
| @@ -213,11 +218,15 @@ CONFIG_PPC_CELLEB=y | |||
| 213 | # | 218 | # |
| 214 | CONFIG_SPU_FS=m | 219 | CONFIG_SPU_FS=m |
| 215 | CONFIG_SPU_FS_64K_LS=y | 220 | CONFIG_SPU_FS_64K_LS=y |
| 221 | # CONFIG_SPU_TRACE is not set | ||
| 216 | CONFIG_SPU_BASE=y | 222 | CONFIG_SPU_BASE=y |
| 217 | CONFIG_CBE_RAS=y | 223 | CONFIG_CBE_RAS=y |
| 224 | CONFIG_PPC_IBM_CELL_RESETBUTTON=y | ||
| 225 | CONFIG_PPC_IBM_CELL_POWERBUTTON=m | ||
| 218 | CONFIG_CBE_THERM=m | 226 | CONFIG_CBE_THERM=m |
| 219 | CONFIG_CBE_CPUFREQ=m | 227 | CONFIG_CBE_CPUFREQ=m |
| 220 | CONFIG_CBE_CPUFREQ_PMI=m | 228 | CONFIG_CBE_CPUFREQ_PMI=m |
| 229 | CONFIG_CBE_CPUFREQ_SPU_GOVERNOR=m | ||
| 221 | CONFIG_OPROFILE_CELL=y | 230 | CONFIG_OPROFILE_CELL=y |
| 222 | # CONFIG_PQ2ADS is not set | 231 | # CONFIG_PQ2ADS is not set |
| 223 | CONFIG_PPC_NATIVE=y | 232 | CONFIG_PPC_NATIVE=y |
| @@ -279,7 +288,7 @@ CONFIG_HZ_250=y | |||
| 279 | # CONFIG_HZ_300 is not set | 288 | # CONFIG_HZ_300 is not set |
| 280 | # CONFIG_HZ_1000 is not set | 289 | # CONFIG_HZ_1000 is not set |
| 281 | CONFIG_HZ=250 | 290 | CONFIG_HZ=250 |
| 282 | # CONFIG_SCHED_HRTICK is not set | 291 | CONFIG_SCHED_HRTICK=y |
| 283 | CONFIG_PREEMPT_NONE=y | 292 | CONFIG_PREEMPT_NONE=y |
| 284 | # CONFIG_PREEMPT_VOLUNTARY is not set | 293 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 285 | # CONFIG_PREEMPT is not set | 294 | # CONFIG_PREEMPT is not set |
| @@ -315,8 +324,10 @@ CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y | |||
| 315 | CONFIG_SPARSEMEM_VMEMMAP=y | 324 | CONFIG_SPARSEMEM_VMEMMAP=y |
| 316 | CONFIG_MEMORY_HOTPLUG=y | 325 | CONFIG_MEMORY_HOTPLUG=y |
| 317 | CONFIG_MEMORY_HOTPLUG_SPARSE=y | 326 | CONFIG_MEMORY_HOTPLUG_SPARSE=y |
| 327 | CONFIG_MEMORY_HOTREMOVE=y | ||
| 318 | CONFIG_PAGEFLAGS_EXTENDED=y | 328 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 319 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 329 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 330 | CONFIG_MIGRATION=y | ||
| 320 | CONFIG_RESOURCES_64BIT=y | 331 | CONFIG_RESOURCES_64BIT=y |
| 321 | CONFIG_ZONE_DMA_FLAG=1 | 332 | CONFIG_ZONE_DMA_FLAG=1 |
| 322 | CONFIG_BOUNCE=y | 333 | CONFIG_BOUNCE=y |
| @@ -327,6 +338,7 @@ CONFIG_FORCE_MAX_ZONEORDER=13 | |||
| 327 | # CONFIG_SCHED_SMT is not set | 338 | # CONFIG_SCHED_SMT is not set |
| 328 | CONFIG_PROC_DEVICETREE=y | 339 | CONFIG_PROC_DEVICETREE=y |
| 329 | # CONFIG_CMDLINE_BOOL is not set | 340 | # CONFIG_CMDLINE_BOOL is not set |
| 341 | CONFIG_EXTRA_TARGETS="" | ||
| 330 | CONFIG_ARCH_WANTS_FREEZER_CONTROL=y | 342 | CONFIG_ARCH_WANTS_FREEZER_CONTROL=y |
| 331 | # CONFIG_PM is not set | 343 | # CONFIG_PM is not set |
| 332 | CONFIG_SECCOMP=y | 344 | CONFIG_SECCOMP=y |
| @@ -370,10 +382,6 @@ CONFIG_HOTPLUG_PCI_RPA_DLPAR=m | |||
| 370 | CONFIG_PAGE_OFFSET=0xc000000000000000 | 382 | CONFIG_PAGE_OFFSET=0xc000000000000000 |
| 371 | CONFIG_KERNEL_START=0xc000000000000000 | 383 | CONFIG_KERNEL_START=0xc000000000000000 |
| 372 | CONFIG_PHYSICAL_START=0x00000000 | 384 | CONFIG_PHYSICAL_START=0x00000000 |
| 373 | |||
| 374 | # | ||
| 375 | # Networking | ||
| 376 | # | ||
| 377 | CONFIG_NET=y | 385 | CONFIG_NET=y |
| 378 | 386 | ||
| 379 | # | 387 | # |
| @@ -387,6 +395,7 @@ CONFIG_XFRM_USER=m | |||
| 387 | # CONFIG_XFRM_SUB_POLICY is not set | 395 | # CONFIG_XFRM_SUB_POLICY is not set |
| 388 | # CONFIG_XFRM_MIGRATE is not set | 396 | # CONFIG_XFRM_MIGRATE is not set |
| 389 | # CONFIG_XFRM_STATISTICS is not set | 397 | # CONFIG_XFRM_STATISTICS is not set |
| 398 | CONFIG_XFRM_IPCOMP=m | ||
| 390 | CONFIG_NET_KEY=m | 399 | CONFIG_NET_KEY=m |
| 391 | # CONFIG_NET_KEY_MIGRATE is not set | 400 | # CONFIG_NET_KEY_MIGRATE is not set |
| 392 | CONFIG_INET=y | 401 | CONFIG_INET=y |
| @@ -578,6 +587,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | |||
| 578 | CONFIG_STANDALONE=y | 587 | CONFIG_STANDALONE=y |
| 579 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 588 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 580 | CONFIG_FW_LOADER=y | 589 | CONFIG_FW_LOADER=y |
| 590 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
| 591 | CONFIG_EXTRA_FIRMWARE="" | ||
| 581 | # CONFIG_DEBUG_DRIVER is not set | 592 | # CONFIG_DEBUG_DRIVER is not set |
| 582 | # CONFIG_DEBUG_DEVRES is not set | 593 | # CONFIG_DEBUG_DEVRES is not set |
| 583 | # CONFIG_SYS_HYPERVISOR is not set | 594 | # CONFIG_SYS_HYPERVISOR is not set |
| @@ -603,12 +614,14 @@ CONFIG_BLK_DEV_RAM_SIZE=65536 | |||
| 603 | # CONFIG_BLK_DEV_XIP is not set | 614 | # CONFIG_BLK_DEV_XIP is not set |
| 604 | # CONFIG_CDROM_PKTCDVD is not set | 615 | # CONFIG_CDROM_PKTCDVD is not set |
| 605 | # CONFIG_ATA_OVER_ETH is not set | 616 | # CONFIG_ATA_OVER_ETH is not set |
| 617 | # CONFIG_BLK_DEV_HD is not set | ||
| 606 | CONFIG_MISC_DEVICES=y | 618 | CONFIG_MISC_DEVICES=y |
| 607 | # CONFIG_PHANTOM is not set | 619 | # CONFIG_PHANTOM is not set |
| 608 | # CONFIG_EEPROM_93CX6 is not set | 620 | # CONFIG_EEPROM_93CX6 is not set |
| 609 | # CONFIG_SGI_IOC4 is not set | 621 | # CONFIG_SGI_IOC4 is not set |
| 610 | # CONFIG_TIFM_CORE is not set | 622 | # CONFIG_TIFM_CORE is not set |
| 611 | # CONFIG_ENCLOSURE_SERVICES is not set | 623 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 624 | # CONFIG_HP_ILO is not set | ||
| 612 | CONFIG_HAVE_IDE=y | 625 | CONFIG_HAVE_IDE=y |
| 613 | CONFIG_IDE=y | 626 | CONFIG_IDE=y |
| 614 | CONFIG_BLK_DEV_IDE=y | 627 | CONFIG_BLK_DEV_IDE=y |
| @@ -616,6 +629,7 @@ CONFIG_BLK_DEV_IDE=y | |||
| 616 | # | 629 | # |
| 617 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | 630 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
| 618 | # | 631 | # |
| 632 | CONFIG_IDE_TIMINGS=y | ||
| 619 | # CONFIG_BLK_DEV_IDE_SATA is not set | 633 | # CONFIG_BLK_DEV_IDE_SATA is not set |
| 620 | CONFIG_BLK_DEV_IDEDISK=y | 634 | CONFIG_BLK_DEV_IDEDISK=y |
| 621 | # CONFIG_IDEDISK_MULTI_MODE is not set | 635 | # CONFIG_IDEDISK_MULTI_MODE is not set |
| @@ -649,10 +663,8 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
| 649 | CONFIG_BLK_DEV_AMD74XX=y | 663 | CONFIG_BLK_DEV_AMD74XX=y |
| 650 | # CONFIG_BLK_DEV_CMD64X is not set | 664 | # CONFIG_BLK_DEV_CMD64X is not set |
| 651 | # CONFIG_BLK_DEV_TRIFLEX is not set | 665 | # CONFIG_BLK_DEV_TRIFLEX is not set |
| 652 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
| 653 | # CONFIG_BLK_DEV_CS5520 is not set | 666 | # CONFIG_BLK_DEV_CS5520 is not set |
| 654 | # CONFIG_BLK_DEV_CS5530 is not set | 667 | # CONFIG_BLK_DEV_CS5530 is not set |
| 655 | # CONFIG_BLK_DEV_HPT34X is not set | ||
| 656 | # CONFIG_BLK_DEV_HPT366 is not set | 668 | # CONFIG_BLK_DEV_HPT366 is not set |
| 657 | # CONFIG_BLK_DEV_JMICRON is not set | 669 | # CONFIG_BLK_DEV_JMICRON is not set |
| 658 | # CONFIG_BLK_DEV_SC1200 is not set | 670 | # CONFIG_BLK_DEV_SC1200 is not set |
| @@ -674,8 +686,6 @@ CONFIG_BLK_DEV_IDE_PMAC=y | |||
| 674 | CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y | 686 | CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y |
| 675 | CONFIG_BLK_DEV_IDEDMA_PMAC=y | 687 | CONFIG_BLK_DEV_IDEDMA_PMAC=y |
| 676 | CONFIG_BLK_DEV_IDEDMA=y | 688 | CONFIG_BLK_DEV_IDEDMA=y |
| 677 | # CONFIG_BLK_DEV_HD_ONLY is not set | ||
| 678 | # CONFIG_BLK_DEV_HD is not set | ||
| 679 | 689 | ||
| 680 | # | 690 | # |
| 681 | # SCSI device support | 691 | # SCSI device support |
| @@ -737,6 +747,8 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 737 | # CONFIG_SCSI_GDTH is not set | 747 | # CONFIG_SCSI_GDTH is not set |
| 738 | # CONFIG_SCSI_IPS is not set | 748 | # CONFIG_SCSI_IPS is not set |
| 739 | CONFIG_SCSI_IBMVSCSI=y | 749 | CONFIG_SCSI_IBMVSCSI=y |
| 750 | CONFIG_SCSI_IBMVFC=m | ||
| 751 | CONFIG_SCSI_IBMVFC_TRACE=y | ||
| 740 | # CONFIG_SCSI_INITIO is not set | 752 | # CONFIG_SCSI_INITIO is not set |
| 741 | # CONFIG_SCSI_INIA100 is not set | 753 | # CONFIG_SCSI_INIA100 is not set |
| 742 | # CONFIG_SCSI_MVSAS is not set | 754 | # CONFIG_SCSI_MVSAS is not set |
| @@ -758,6 +770,7 @@ CONFIG_SCSI_LPFC=m | |||
| 758 | CONFIG_SCSI_DEBUG=m | 770 | CONFIG_SCSI_DEBUG=m |
| 759 | # CONFIG_SCSI_SRP is not set | 771 | # CONFIG_SCSI_SRP is not set |
| 760 | # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set | 772 | # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set |
| 773 | # CONFIG_SCSI_DH is not set | ||
| 761 | CONFIG_ATA=y | 774 | CONFIG_ATA=y |
| 762 | CONFIG_ATA_NONSTANDARD=y | 775 | CONFIG_ATA_NONSTANDARD=y |
| 763 | CONFIG_SATA_PMP=y | 776 | CONFIG_SATA_PMP=y |
| @@ -837,9 +850,6 @@ CONFIG_DM_SNAPSHOT=m | |||
| 837 | CONFIG_DM_MIRROR=m | 850 | CONFIG_DM_MIRROR=m |
| 838 | CONFIG_DM_ZERO=m | 851 | CONFIG_DM_ZERO=m |
| 839 | CONFIG_DM_MULTIPATH=m | 852 | CONFIG_DM_MULTIPATH=m |
| 840 | CONFIG_DM_MULTIPATH_EMC=m | ||
| 841 | # CONFIG_DM_MULTIPATH_RDAC is not set | ||
| 842 | # CONFIG_DM_MULTIPATH_HP is not set | ||
| 843 | # CONFIG_DM_DELAY is not set | 853 | # CONFIG_DM_DELAY is not set |
| 844 | # CONFIG_DM_UEVENT is not set | 854 | # CONFIG_DM_UEVENT is not set |
| 845 | # CONFIG_FUSION is not set | 855 | # CONFIG_FUSION is not set |
| @@ -847,29 +857,21 @@ CONFIG_DM_MULTIPATH_EMC=m | |||
| 847 | # | 857 | # |
| 848 | # IEEE 1394 (FireWire) support | 858 | # IEEE 1394 (FireWire) support |
| 849 | # | 859 | # |
| 850 | # CONFIG_FIREWIRE is not set | ||
| 851 | CONFIG_IEEE1394=y | ||
| 852 | |||
| 853 | # | ||
| 854 | # Subsystem Options | ||
| 855 | # | ||
| 856 | # CONFIG_IEEE1394_VERBOSEDEBUG is not set | ||
| 857 | 860 | ||
| 858 | # | 861 | # |
| 859 | # Controllers | 862 | # Enable only one of the two stacks, unless you know what you are doing |
| 860 | # | 863 | # |
| 861 | # CONFIG_IEEE1394_PCILYNX is not set | 864 | # CONFIG_FIREWIRE is not set |
| 865 | CONFIG_IEEE1394=y | ||
| 862 | CONFIG_IEEE1394_OHCI1394=y | 866 | CONFIG_IEEE1394_OHCI1394=y |
| 863 | 867 | # CONFIG_IEEE1394_PCILYNX is not set | |
| 864 | # | ||
| 865 | # Protocols | ||
| 866 | # | ||
| 867 | CONFIG_IEEE1394_VIDEO1394=m | ||
| 868 | CONFIG_IEEE1394_SBP2=m | 868 | CONFIG_IEEE1394_SBP2=m |
| 869 | CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y | 869 | CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y |
| 870 | CONFIG_IEEE1394_ETH1394=m | 870 | CONFIG_IEEE1394_ETH1394=m |
| 871 | CONFIG_IEEE1394_DV1394=m | ||
| 872 | CONFIG_IEEE1394_RAWIO=y | 871 | CONFIG_IEEE1394_RAWIO=y |
| 872 | CONFIG_IEEE1394_VIDEO1394=m | ||
| 873 | CONFIG_IEEE1394_DV1394=m | ||
| 874 | # CONFIG_IEEE1394_VERBOSEDEBUG is not set | ||
| 873 | # CONFIG_I2O is not set | 875 | # CONFIG_I2O is not set |
| 874 | CONFIG_MACINTOSH_DRIVERS=y | 876 | CONFIG_MACINTOSH_DRIVERS=y |
| 875 | CONFIG_ADB_PMU=y | 877 | CONFIG_ADB_PMU=y |
| @@ -884,7 +886,6 @@ CONFIG_WINDFARM_PM112=y | |||
| 884 | CONFIG_WINDFARM_PM121=y | 886 | CONFIG_WINDFARM_PM121=y |
| 885 | # CONFIG_PMAC_RACKMETER is not set | 887 | # CONFIG_PMAC_RACKMETER is not set |
| 886 | CONFIG_NETDEVICES=y | 888 | CONFIG_NETDEVICES=y |
| 887 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 888 | CONFIG_DUMMY=m | 889 | CONFIG_DUMMY=m |
| 889 | CONFIG_BONDING=m | 890 | CONFIG_BONDING=m |
| 890 | # CONFIG_MACVLAN is not set | 891 | # CONFIG_MACVLAN is not set |
| @@ -942,6 +943,7 @@ CONFIG_E100=y | |||
| 942 | # CONFIG_SIS900 is not set | 943 | # CONFIG_SIS900 is not set |
| 943 | # CONFIG_EPIC100 is not set | 944 | # CONFIG_EPIC100 is not set |
| 944 | # CONFIG_SUNDANCE is not set | 945 | # CONFIG_SUNDANCE is not set |
| 946 | # CONFIG_TLAN is not set | ||
| 945 | # CONFIG_VIA_RHINE is not set | 947 | # CONFIG_VIA_RHINE is not set |
| 946 | # CONFIG_SC92031 is not set | 948 | # CONFIG_SC92031 is not set |
| 947 | CONFIG_NETDEV_1000=y | 949 | CONFIG_NETDEV_1000=y |
| @@ -949,10 +951,8 @@ CONFIG_ACENIC=y | |||
| 949 | CONFIG_ACENIC_OMIT_TIGON_I=y | 951 | CONFIG_ACENIC_OMIT_TIGON_I=y |
| 950 | # CONFIG_DL2K is not set | 952 | # CONFIG_DL2K is not set |
| 951 | CONFIG_E1000=y | 953 | CONFIG_E1000=y |
| 952 | # CONFIG_E1000_NAPI is not set | ||
| 953 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | 954 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set |
| 954 | # CONFIG_E1000E is not set | 955 | # CONFIG_E1000E is not set |
| 955 | # CONFIG_E1000E_ENABLED is not set | ||
| 956 | # CONFIG_IP1000 is not set | 956 | # CONFIG_IP1000 is not set |
| 957 | # CONFIG_IGB is not set | 957 | # CONFIG_IGB is not set |
| 958 | # CONFIG_NS83820 is not set | 958 | # CONFIG_NS83820 is not set |
| @@ -968,13 +968,13 @@ CONFIG_TIGON3=y | |||
| 968 | CONFIG_SPIDER_NET=m | 968 | CONFIG_SPIDER_NET=m |
| 969 | # CONFIG_QLA3XXX is not set | 969 | # CONFIG_QLA3XXX is not set |
| 970 | # CONFIG_ATL1 is not set | 970 | # CONFIG_ATL1 is not set |
| 971 | # CONFIG_ATL1E is not set | ||
| 971 | CONFIG_NETDEV_10000=y | 972 | CONFIG_NETDEV_10000=y |
| 972 | # CONFIG_CHELSIO_T1 is not set | 973 | # CONFIG_CHELSIO_T1 is not set |
| 973 | # CONFIG_CHELSIO_T3 is not set | 974 | # CONFIG_CHELSIO_T3 is not set |
| 974 | CONFIG_EHEA=m | 975 | CONFIG_EHEA=m |
| 975 | # CONFIG_IXGBE is not set | 976 | # CONFIG_IXGBE is not set |
| 976 | CONFIG_IXGB=m | 977 | CONFIG_IXGB=m |
| 977 | # CONFIG_IXGB_NAPI is not set | ||
| 978 | # CONFIG_S2IO is not set | 978 | # CONFIG_S2IO is not set |
| 979 | # CONFIG_MYRI10GE is not set | 979 | # CONFIG_MYRI10GE is not set |
| 980 | # CONFIG_NETXEN_NIC is not set | 980 | # CONFIG_NETXEN_NIC is not set |
| @@ -1068,6 +1068,7 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y | |||
| 1068 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 1068 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
| 1069 | # CONFIG_MOUSE_SERIAL is not set | 1069 | # CONFIG_MOUSE_SERIAL is not set |
| 1070 | # CONFIG_MOUSE_APPLETOUCH is not set | 1070 | # CONFIG_MOUSE_APPLETOUCH is not set |
| 1071 | # CONFIG_MOUSE_BCM5974 is not set | ||
| 1071 | # CONFIG_MOUSE_VSXXXAA is not set | 1072 | # CONFIG_MOUSE_VSXXXAA is not set |
| 1072 | # CONFIG_INPUT_JOYSTICK is not set | 1073 | # CONFIG_INPUT_JOYSTICK is not set |
| 1073 | # CONFIG_INPUT_TABLET is not set | 1074 | # CONFIG_INPUT_TABLET is not set |
| @@ -1090,12 +1091,14 @@ CONFIG_SERIO_I8042=y | |||
| 1090 | # CONFIG_SERIO_PCIPS2 is not set | 1091 | # CONFIG_SERIO_PCIPS2 is not set |
| 1091 | CONFIG_SERIO_LIBPS2=y | 1092 | CONFIG_SERIO_LIBPS2=y |
| 1092 | # CONFIG_SERIO_RAW is not set | 1093 | # CONFIG_SERIO_RAW is not set |
| 1094 | # CONFIG_SERIO_XILINX_XPS_PS2 is not set | ||
| 1093 | # CONFIG_GAMEPORT is not set | 1095 | # CONFIG_GAMEPORT is not set |
| 1094 | 1096 | ||
| 1095 | # | 1097 | # |
| 1096 | # Character devices | 1098 | # Character devices |
| 1097 | # | 1099 | # |
| 1098 | CONFIG_VT=y | 1100 | CONFIG_VT=y |
| 1101 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 1099 | CONFIG_VT_CONSOLE=y | 1102 | CONFIG_VT_CONSOLE=y |
| 1100 | CONFIG_HW_CONSOLE=y | 1103 | CONFIG_HW_CONSOLE=y |
| 1101 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 1104 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| @@ -1131,11 +1134,13 @@ CONFIG_UNIX98_PTYS=y | |||
| 1131 | CONFIG_LEGACY_PTYS=y | 1134 | CONFIG_LEGACY_PTYS=y |
| 1132 | CONFIG_LEGACY_PTY_COUNT=256 | 1135 | CONFIG_LEGACY_PTY_COUNT=256 |
| 1133 | CONFIG_HVC_DRIVER=y | 1136 | CONFIG_HVC_DRIVER=y |
| 1137 | CONFIG_HVC_IRQ=y | ||
| 1134 | CONFIG_HVC_CONSOLE=y | 1138 | CONFIG_HVC_CONSOLE=y |
| 1135 | CONFIG_HVC_ISERIES=y | 1139 | CONFIG_HVC_ISERIES=y |
| 1136 | CONFIG_HVC_RTAS=y | 1140 | CONFIG_HVC_RTAS=y |
| 1137 | CONFIG_HVC_BEAT=y | 1141 | CONFIG_HVC_BEAT=y |
| 1138 | CONFIG_HVCS=m | 1142 | CONFIG_HVCS=m |
| 1143 | CONFIG_IBM_BSR=m | ||
| 1139 | # CONFIG_IPMI_HANDLER is not set | 1144 | # CONFIG_IPMI_HANDLER is not set |
| 1140 | # CONFIG_HW_RANDOM is not set | 1145 | # CONFIG_HW_RANDOM is not set |
| 1141 | # CONFIG_R3964 is not set | 1146 | # CONFIG_R3964 is not set |
| @@ -1156,45 +1161,70 @@ CONFIG_DEVPORT=y | |||
| 1156 | CONFIG_I2C=y | 1161 | CONFIG_I2C=y |
| 1157 | CONFIG_I2C_BOARDINFO=y | 1162 | CONFIG_I2C_BOARDINFO=y |
| 1158 | CONFIG_I2C_CHARDEV=y | 1163 | CONFIG_I2C_CHARDEV=y |
| 1164 | CONFIG_I2C_HELPER_AUTO=y | ||
| 1159 | CONFIG_I2C_ALGOBIT=y | 1165 | CONFIG_I2C_ALGOBIT=y |
| 1160 | 1166 | ||
| 1161 | # | 1167 | # |
| 1162 | # I2C Hardware Bus support | 1168 | # I2C Hardware Bus support |
| 1163 | # | 1169 | # |
| 1170 | |||
| 1171 | # | ||
| 1172 | # PC SMBus host controller drivers | ||
| 1173 | # | ||
| 1164 | # CONFIG_I2C_ALI1535 is not set | 1174 | # CONFIG_I2C_ALI1535 is not set |
| 1165 | # CONFIG_I2C_ALI1563 is not set | 1175 | # CONFIG_I2C_ALI1563 is not set |
| 1166 | # CONFIG_I2C_ALI15X3 is not set | 1176 | # CONFIG_I2C_ALI15X3 is not set |
| 1167 | # CONFIG_I2C_AMD756 is not set | 1177 | # CONFIG_I2C_AMD756 is not set |
| 1168 | CONFIG_I2C_AMD8111=y | 1178 | CONFIG_I2C_AMD8111=y |
| 1169 | # CONFIG_I2C_I801 is not set | 1179 | # CONFIG_I2C_I801 is not set |
| 1170 | # CONFIG_I2C_I810 is not set | 1180 | # CONFIG_I2C_ISCH is not set |
| 1171 | # CONFIG_I2C_PIIX4 is not set | 1181 | # CONFIG_I2C_PIIX4 is not set |
| 1172 | CONFIG_I2C_POWERMAC=y | ||
| 1173 | # CONFIG_I2C_NFORCE2 is not set | 1182 | # CONFIG_I2C_NFORCE2 is not set |
| 1174 | # CONFIG_I2C_OCORES is not set | ||
| 1175 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 1176 | CONFIG_I2C_PASEMI=y | ||
| 1177 | # CONFIG_I2C_PROSAVAGE is not set | ||
| 1178 | # CONFIG_I2C_SAVAGE4 is not set | ||
| 1179 | # CONFIG_I2C_SIMTEC is not set | ||
| 1180 | # CONFIG_I2C_SIS5595 is not set | 1183 | # CONFIG_I2C_SIS5595 is not set |
| 1181 | # CONFIG_I2C_SIS630 is not set | 1184 | # CONFIG_I2C_SIS630 is not set |
| 1182 | # CONFIG_I2C_SIS96X is not set | 1185 | # CONFIG_I2C_SIS96X is not set |
| 1183 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 1184 | # CONFIG_I2C_STUB is not set | ||
| 1185 | # CONFIG_I2C_TINY_USB is not set | ||
| 1186 | # CONFIG_I2C_VIA is not set | 1186 | # CONFIG_I2C_VIA is not set |
| 1187 | # CONFIG_I2C_VIAPRO is not set | 1187 | # CONFIG_I2C_VIAPRO is not set |
| 1188 | |||
| 1189 | # | ||
| 1190 | # Mac SMBus host controller drivers | ||
| 1191 | # | ||
| 1192 | CONFIG_I2C_POWERMAC=y | ||
| 1193 | |||
| 1194 | # | ||
| 1195 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 1196 | # | ||
| 1197 | # CONFIG_I2C_OCORES is not set | ||
| 1198 | CONFIG_I2C_PASEMI=y | ||
| 1199 | # CONFIG_I2C_SIMTEC is not set | ||
| 1200 | |||
| 1201 | # | ||
| 1202 | # External I2C/SMBus adapter drivers | ||
| 1203 | # | ||
| 1204 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 1205 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 1206 | # CONFIG_I2C_TINY_USB is not set | ||
| 1207 | |||
| 1208 | # | ||
| 1209 | # Graphics adapter I2C/DDC channel drivers | ||
| 1210 | # | ||
| 1188 | # CONFIG_I2C_VOODOO3 is not set | 1211 | # CONFIG_I2C_VOODOO3 is not set |
| 1212 | |||
| 1213 | # | ||
| 1214 | # Other I2C/SMBus bus drivers | ||
| 1215 | # | ||
| 1189 | # CONFIG_I2C_PCA_PLATFORM is not set | 1216 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 1217 | # CONFIG_I2C_STUB is not set | ||
| 1190 | 1218 | ||
| 1191 | # | 1219 | # |
| 1192 | # Miscellaneous I2C Chip support | 1220 | # Miscellaneous I2C Chip support |
| 1193 | # | 1221 | # |
| 1194 | # CONFIG_DS1682 is not set | 1222 | # CONFIG_DS1682 is not set |
| 1223 | # CONFIG_AT24 is not set | ||
| 1195 | # CONFIG_SENSORS_EEPROM is not set | 1224 | # CONFIG_SENSORS_EEPROM is not set |
| 1196 | # CONFIG_SENSORS_PCF8574 is not set | 1225 | # CONFIG_SENSORS_PCF8574 is not set |
| 1197 | # CONFIG_PCF8575 is not set | 1226 | # CONFIG_PCF8575 is not set |
| 1227 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 1198 | # CONFIG_SENSORS_PCF8591 is not set | 1228 | # CONFIG_SENSORS_PCF8591 is not set |
| 1199 | # CONFIG_SENSORS_MAX6875 is not set | 1229 | # CONFIG_SENSORS_MAX6875 is not set |
| 1200 | # CONFIG_SENSORS_TSL2550 is not set | 1230 | # CONFIG_SENSORS_TSL2550 is not set |
| @@ -1203,10 +1233,13 @@ CONFIG_I2C_PASEMI=y | |||
| 1203 | # CONFIG_I2C_DEBUG_BUS is not set | 1233 | # CONFIG_I2C_DEBUG_BUS is not set |
| 1204 | # CONFIG_I2C_DEBUG_CHIP is not set | 1234 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 1205 | # CONFIG_SPI is not set | 1235 | # CONFIG_SPI is not set |
| 1236 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 1237 | # CONFIG_GPIOLIB is not set | ||
| 1206 | # CONFIG_W1 is not set | 1238 | # CONFIG_W1 is not set |
| 1207 | # CONFIG_POWER_SUPPLY is not set | 1239 | # CONFIG_POWER_SUPPLY is not set |
| 1208 | # CONFIG_HWMON is not set | 1240 | # CONFIG_HWMON is not set |
| 1209 | # CONFIG_THERMAL is not set | 1241 | # CONFIG_THERMAL is not set |
| 1242 | # CONFIG_THERMAL_HWMON is not set | ||
| 1210 | # CONFIG_WATCHDOG is not set | 1243 | # CONFIG_WATCHDOG is not set |
| 1211 | 1244 | ||
| 1212 | # | 1245 | # |
| @@ -1218,8 +1251,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1218 | # | 1251 | # |
| 1219 | # Multifunction device drivers | 1252 | # Multifunction device drivers |
| 1220 | # | 1253 | # |
| 1254 | # CONFIG_MFD_CORE is not set | ||
| 1221 | # CONFIG_MFD_SM501 is not set | 1255 | # CONFIG_MFD_SM501 is not set |
| 1222 | # CONFIG_HTC_PASIC3 is not set | 1256 | # CONFIG_HTC_PASIC3 is not set |
| 1257 | # CONFIG_MFD_TMIO is not set | ||
| 1223 | 1258 | ||
| 1224 | # | 1259 | # |
| 1225 | # Multimedia devices | 1260 | # Multimedia devices |
| @@ -1299,10 +1334,13 @@ CONFIG_FB_RADEON_BACKLIGHT=y | |||
| 1299 | # CONFIG_FB_TRIDENT is not set | 1334 | # CONFIG_FB_TRIDENT is not set |
| 1300 | # CONFIG_FB_ARK is not set | 1335 | # CONFIG_FB_ARK is not set |
| 1301 | # CONFIG_FB_PM3 is not set | 1336 | # CONFIG_FB_PM3 is not set |
| 1337 | # CONFIG_FB_CARMINE is not set | ||
| 1302 | CONFIG_FB_IBM_GXT4500=y | 1338 | CONFIG_FB_IBM_GXT4500=y |
| 1303 | # CONFIG_FB_VIRTUAL is not set | 1339 | # CONFIG_FB_VIRTUAL is not set |
| 1304 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | 1340 | CONFIG_BACKLIGHT_LCD_SUPPORT=y |
| 1305 | CONFIG_LCD_CLASS_DEVICE=y | 1341 | CONFIG_LCD_CLASS_DEVICE=y |
| 1342 | # CONFIG_LCD_ILI9320 is not set | ||
| 1343 | # CONFIG_LCD_PLATFORM is not set | ||
| 1306 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | 1344 | CONFIG_BACKLIGHT_CLASS_DEVICE=y |
| 1307 | # CONFIG_BACKLIGHT_CORGI is not set | 1345 | # CONFIG_BACKLIGHT_CORGI is not set |
| 1308 | 1346 | ||
| @@ -1331,15 +1369,7 @@ CONFIG_FB_LOGO_EXTRA=y | |||
| 1331 | CONFIG_LOGO_LINUX_MONO=y | 1369 | CONFIG_LOGO_LINUX_MONO=y |
| 1332 | CONFIG_LOGO_LINUX_VGA16=y | 1370 | CONFIG_LOGO_LINUX_VGA16=y |
| 1333 | CONFIG_LOGO_LINUX_CLUT224=y | 1371 | CONFIG_LOGO_LINUX_CLUT224=y |
| 1334 | |||
| 1335 | # | ||
| 1336 | # Sound | ||
| 1337 | # | ||
| 1338 | CONFIG_SOUND=m | 1372 | CONFIG_SOUND=m |
| 1339 | |||
| 1340 | # | ||
| 1341 | # Advanced Linux Sound Architecture | ||
| 1342 | # | ||
| 1343 | CONFIG_SND=m | 1373 | CONFIG_SND=m |
| 1344 | CONFIG_SND_TIMER=m | 1374 | CONFIG_SND_TIMER=m |
| 1345 | CONFIG_SND_PCM=m | 1375 | CONFIG_SND_PCM=m |
| @@ -1355,19 +1385,13 @@ CONFIG_SND_SUPPORT_OLD_API=y | |||
| 1355 | CONFIG_SND_VERBOSE_PROCFS=y | 1385 | CONFIG_SND_VERBOSE_PROCFS=y |
| 1356 | # CONFIG_SND_VERBOSE_PRINTK is not set | 1386 | # CONFIG_SND_VERBOSE_PRINTK is not set |
| 1357 | # CONFIG_SND_DEBUG is not set | 1387 | # CONFIG_SND_DEBUG is not set |
| 1358 | 1388 | CONFIG_SND_DRIVERS=y | |
| 1359 | # | ||
| 1360 | # Generic devices | ||
| 1361 | # | ||
| 1362 | # CONFIG_SND_DUMMY is not set | 1389 | # CONFIG_SND_DUMMY is not set |
| 1363 | # CONFIG_SND_VIRMIDI is not set | 1390 | # CONFIG_SND_VIRMIDI is not set |
| 1364 | # CONFIG_SND_MTPAV is not set | 1391 | # CONFIG_SND_MTPAV is not set |
| 1365 | # CONFIG_SND_SERIAL_U16550 is not set | 1392 | # CONFIG_SND_SERIAL_U16550 is not set |
| 1366 | # CONFIG_SND_MPU401 is not set | 1393 | # CONFIG_SND_MPU401 is not set |
| 1367 | 1394 | CONFIG_SND_PCI=y | |
| 1368 | # | ||
| 1369 | # PCI devices | ||
| 1370 | # | ||
| 1371 | # CONFIG_SND_AD1889 is not set | 1395 | # CONFIG_SND_AD1889 is not set |
| 1372 | # CONFIG_SND_ALS300 is not set | 1396 | # CONFIG_SND_ALS300 is not set |
| 1373 | # CONFIG_SND_ALS4000 is not set | 1397 | # CONFIG_SND_ALS4000 is not set |
| @@ -1429,20 +1453,9 @@ CONFIG_SND_VERBOSE_PROCFS=y | |||
| 1429 | # CONFIG_SND_VIRTUOSO is not set | 1453 | # CONFIG_SND_VIRTUOSO is not set |
| 1430 | # CONFIG_SND_VX222 is not set | 1454 | # CONFIG_SND_VX222 is not set |
| 1431 | # CONFIG_SND_YMFPCI is not set | 1455 | # CONFIG_SND_YMFPCI is not set |
| 1432 | 1456 | CONFIG_SND_PPC=y | |
| 1433 | # | ||
| 1434 | # ALSA PowerMac devices | ||
| 1435 | # | ||
| 1436 | CONFIG_SND_POWERMAC=m | 1457 | CONFIG_SND_POWERMAC=m |
| 1437 | CONFIG_SND_POWERMAC_AUTO_DRC=y | 1458 | CONFIG_SND_POWERMAC_AUTO_DRC=y |
| 1438 | |||
| 1439 | # | ||
| 1440 | # ALSA PowerPC devices | ||
| 1441 | # | ||
| 1442 | |||
| 1443 | # | ||
| 1444 | # Apple Onboard Audio driver | ||
| 1445 | # | ||
| 1446 | CONFIG_SND_AOA=m | 1459 | CONFIG_SND_AOA=m |
| 1447 | CONFIG_SND_AOA_FABRIC_LAYOUT=m | 1460 | CONFIG_SND_AOA_FABRIC_LAYOUT=m |
| 1448 | CONFIG_SND_AOA_ONYX=m | 1461 | CONFIG_SND_AOA_ONYX=m |
| @@ -1450,36 +1463,14 @@ CONFIG_SND_AOA_TAS=m | |||
| 1450 | CONFIG_SND_AOA_TOONIE=m | 1463 | CONFIG_SND_AOA_TOONIE=m |
| 1451 | CONFIG_SND_AOA_SOUNDBUS=m | 1464 | CONFIG_SND_AOA_SOUNDBUS=m |
| 1452 | CONFIG_SND_AOA_SOUNDBUS_I2S=m | 1465 | CONFIG_SND_AOA_SOUNDBUS_I2S=m |
| 1453 | 1466 | CONFIG_SND_USB=y | |
| 1454 | # | ||
| 1455 | # USB devices | ||
| 1456 | # | ||
| 1457 | # CONFIG_SND_USB_AUDIO is not set | 1467 | # CONFIG_SND_USB_AUDIO is not set |
| 1458 | # CONFIG_SND_USB_USX2Y is not set | 1468 | # CONFIG_SND_USB_USX2Y is not set |
| 1459 | # CONFIG_SND_USB_CAIAQ is not set | 1469 | # CONFIG_SND_USB_CAIAQ is not set |
| 1460 | 1470 | CONFIG_SND_PCMCIA=y | |
| 1461 | # | ||
| 1462 | # PCMCIA devices | ||
| 1463 | # | ||
| 1464 | # CONFIG_SND_VXPOCKET is not set | 1471 | # CONFIG_SND_VXPOCKET is not set |
| 1465 | # CONFIG_SND_PDAUDIOCF is not set | 1472 | # CONFIG_SND_PDAUDIOCF is not set |
| 1466 | |||
| 1467 | # | ||
| 1468 | # System on Chip audio support | ||
| 1469 | # | ||
| 1470 | # CONFIG_SND_SOC is not set | 1473 | # CONFIG_SND_SOC is not set |
| 1471 | |||
| 1472 | # | ||
| 1473 | # ALSA SoC audio for Freescale SOCs | ||
| 1474 | # | ||
| 1475 | |||
| 1476 | # | ||
| 1477 | # SoC Audio for the Texas Instruments OMAP | ||
| 1478 | # | ||
| 1479 | |||
| 1480 | # | ||
| 1481 | # Open Sound System | ||
| 1482 | # | ||
| 1483 | # CONFIG_SOUND_PRIME is not set | 1474 | # CONFIG_SOUND_PRIME is not set |
| 1484 | CONFIG_HID_SUPPORT=y | 1475 | CONFIG_HID_SUPPORT=y |
| 1485 | CONFIG_HID=y | 1476 | CONFIG_HID=y |
| @@ -1508,6 +1499,7 @@ CONFIG_USB_DEVICEFS=y | |||
| 1508 | CONFIG_USB_DEVICE_CLASS=y | 1499 | CONFIG_USB_DEVICE_CLASS=y |
| 1509 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1500 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 1510 | # CONFIG_USB_OTG is not set | 1501 | # CONFIG_USB_OTG is not set |
| 1502 | # CONFIG_USB_MON is not set | ||
| 1511 | 1503 | ||
| 1512 | # | 1504 | # |
| 1513 | # USB Host Controller Drivers | 1505 | # USB Host Controller Drivers |
| @@ -1556,6 +1548,7 @@ CONFIG_USB_STORAGE=m | |||
| 1556 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1548 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1557 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1549 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
| 1558 | # CONFIG_USB_STORAGE_KARMA is not set | 1550 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1551 | # CONFIG_USB_STORAGE_SIERRA is not set | ||
| 1559 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | 1552 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
| 1560 | # CONFIG_USB_LIBUSUAL is not set | 1553 | # CONFIG_USB_LIBUSUAL is not set |
| 1561 | 1554 | ||
| @@ -1564,7 +1557,6 @@ CONFIG_USB_STORAGE=m | |||
| 1564 | # | 1557 | # |
| 1565 | # CONFIG_USB_MDC800 is not set | 1558 | # CONFIG_USB_MDC800 is not set |
| 1566 | # CONFIG_USB_MICROTEK is not set | 1559 | # CONFIG_USB_MICROTEK is not set |
| 1567 | # CONFIG_USB_MON is not set | ||
| 1568 | 1560 | ||
| 1569 | # | 1561 | # |
| 1570 | # USB port drivers | 1562 | # USB port drivers |
| @@ -1577,7 +1569,6 @@ CONFIG_USB_STORAGE=m | |||
| 1577 | # CONFIG_USB_EMI62 is not set | 1569 | # CONFIG_USB_EMI62 is not set |
| 1578 | # CONFIG_USB_EMI26 is not set | 1570 | # CONFIG_USB_EMI26 is not set |
| 1579 | # CONFIG_USB_ADUTUX is not set | 1571 | # CONFIG_USB_ADUTUX is not set |
| 1580 | # CONFIG_USB_AUERSWALD is not set | ||
| 1581 | # CONFIG_USB_RIO500 is not set | 1572 | # CONFIG_USB_RIO500 is not set |
| 1582 | # CONFIG_USB_LEGOTOWER is not set | 1573 | # CONFIG_USB_LEGOTOWER is not set |
| 1583 | # CONFIG_USB_LCD is not set | 1574 | # CONFIG_USB_LCD is not set |
| @@ -1769,6 +1760,7 @@ CONFIG_HFSPLUS_FS=m | |||
| 1769 | CONFIG_CRAMFS=y | 1760 | CONFIG_CRAMFS=y |
| 1770 | # CONFIG_VXFS_FS is not set | 1761 | # CONFIG_VXFS_FS is not set |
| 1771 | # CONFIG_MINIX_FS is not set | 1762 | # CONFIG_MINIX_FS is not set |
| 1763 | # CONFIG_OMFS_FS is not set | ||
| 1772 | # CONFIG_HPFS_FS is not set | 1764 | # CONFIG_HPFS_FS is not set |
| 1773 | # CONFIG_QNX4FS_FS is not set | 1765 | # CONFIG_QNX4FS_FS is not set |
| 1774 | # CONFIG_ROMFS_FS is not set | 1766 | # CONFIG_ROMFS_FS is not set |
| @@ -1779,12 +1771,12 @@ CONFIG_NFS_FS=y | |||
| 1779 | CONFIG_NFS_V3=y | 1771 | CONFIG_NFS_V3=y |
| 1780 | CONFIG_NFS_V3_ACL=y | 1772 | CONFIG_NFS_V3_ACL=y |
| 1781 | CONFIG_NFS_V4=y | 1773 | CONFIG_NFS_V4=y |
| 1774 | CONFIG_ROOT_NFS=y | ||
| 1782 | CONFIG_NFSD=m | 1775 | CONFIG_NFSD=m |
| 1783 | CONFIG_NFSD_V2_ACL=y | 1776 | CONFIG_NFSD_V2_ACL=y |
| 1784 | CONFIG_NFSD_V3=y | 1777 | CONFIG_NFSD_V3=y |
| 1785 | CONFIG_NFSD_V3_ACL=y | 1778 | CONFIG_NFSD_V3_ACL=y |
| 1786 | CONFIG_NFSD_V4=y | 1779 | CONFIG_NFSD_V4=y |
| 1787 | CONFIG_ROOT_NFS=y | ||
| 1788 | CONFIG_LOCKD=y | 1780 | CONFIG_LOCKD=y |
| 1789 | CONFIG_LOCKD_V4=y | 1781 | CONFIG_LOCKD_V4=y |
| 1790 | CONFIG_EXPORTFS=m | 1782 | CONFIG_EXPORTFS=m |
| @@ -1793,7 +1785,6 @@ CONFIG_NFS_COMMON=y | |||
| 1793 | CONFIG_SUNRPC=y | 1785 | CONFIG_SUNRPC=y |
| 1794 | CONFIG_SUNRPC_GSS=y | 1786 | CONFIG_SUNRPC_GSS=y |
| 1795 | CONFIG_SUNRPC_XPRT_RDMA=m | 1787 | CONFIG_SUNRPC_XPRT_RDMA=m |
| 1796 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 1797 | CONFIG_RPCSEC_GSS_KRB5=y | 1788 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1798 | CONFIG_RPCSEC_GSS_SPKM3=m | 1789 | CONFIG_RPCSEC_GSS_SPKM3=m |
| 1799 | # CONFIG_SMB_FS is not set | 1790 | # CONFIG_SMB_FS is not set |
| @@ -1878,6 +1869,7 @@ CONFIG_BITREVERSE=y | |||
| 1878 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1869 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 1879 | CONFIG_CRC_CCITT=m | 1870 | CONFIG_CRC_CCITT=m |
| 1880 | # CONFIG_CRC16 is not set | 1871 | # CONFIG_CRC16 is not set |
| 1872 | CONFIG_CRC_T10DIF=y | ||
| 1881 | CONFIG_CRC_ITU_T=m | 1873 | CONFIG_CRC_ITU_T=m |
| 1882 | CONFIG_CRC32=y | 1874 | CONFIG_CRC32=y |
| 1883 | # CONFIG_CRC7 is not set | 1875 | # CONFIG_CRC7 is not set |
| @@ -1910,8 +1902,10 @@ CONFIG_DEBUG_FS=y | |||
| 1910 | CONFIG_DEBUG_KERNEL=y | 1902 | CONFIG_DEBUG_KERNEL=y |
| 1911 | # CONFIG_DEBUG_SHIRQ is not set | 1903 | # CONFIG_DEBUG_SHIRQ is not set |
| 1912 | CONFIG_DETECT_SOFTLOCKUP=y | 1904 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1905 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 1906 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 1913 | CONFIG_SCHED_DEBUG=y | 1907 | CONFIG_SCHED_DEBUG=y |
| 1914 | # CONFIG_SCHEDSTATS is not set | 1908 | CONFIG_SCHEDSTATS=y |
| 1915 | # CONFIG_TIMER_STATS is not set | 1909 | # CONFIG_TIMER_STATS is not set |
| 1916 | # CONFIG_DEBUG_OBJECTS is not set | 1910 | # CONFIG_DEBUG_OBJECTS is not set |
| 1917 | # CONFIG_SLUB_DEBUG_ON is not set | 1911 | # CONFIG_SLUB_DEBUG_ON is not set |
| @@ -1923,28 +1917,47 @@ CONFIG_DEBUG_MUTEXES=y | |||
| 1923 | # CONFIG_DEBUG_LOCK_ALLOC is not set | 1917 | # CONFIG_DEBUG_LOCK_ALLOC is not set |
| 1924 | # CONFIG_PROVE_LOCKING is not set | 1918 | # CONFIG_PROVE_LOCKING is not set |
| 1925 | # CONFIG_LOCK_STAT is not set | 1919 | # CONFIG_LOCK_STAT is not set |
| 1920 | CONFIG_TRACE_IRQFLAGS=y | ||
| 1926 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1921 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
| 1927 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1922 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
| 1923 | CONFIG_STACKTRACE=y | ||
| 1928 | # CONFIG_DEBUG_KOBJECT is not set | 1924 | # CONFIG_DEBUG_KOBJECT is not set |
| 1929 | CONFIG_DEBUG_BUGVERBOSE=y | 1925 | CONFIG_DEBUG_BUGVERBOSE=y |
| 1930 | # CONFIG_DEBUG_INFO is not set | 1926 | # CONFIG_DEBUG_INFO is not set |
| 1931 | # CONFIG_DEBUG_VM is not set | 1927 | # CONFIG_DEBUG_VM is not set |
| 1932 | # CONFIG_DEBUG_WRITECOUNT is not set | 1928 | # CONFIG_DEBUG_WRITECOUNT is not set |
| 1929 | CONFIG_DEBUG_MEMORY_INIT=y | ||
| 1933 | # CONFIG_DEBUG_LIST is not set | 1930 | # CONFIG_DEBUG_LIST is not set |
| 1934 | # CONFIG_DEBUG_SG is not set | 1931 | # CONFIG_DEBUG_SG is not set |
| 1932 | CONFIG_FRAME_POINTER=y | ||
| 1935 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1933 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 1936 | # CONFIG_RCU_TORTURE_TEST is not set | 1934 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1937 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1935 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 1938 | # CONFIG_FAULT_INJECTION is not set | 1936 | # CONFIG_FAULT_INJECTION is not set |
| 1937 | CONFIG_LATENCYTOP=y | ||
| 1938 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1939 | CONFIG_HAVE_FTRACE=y | ||
| 1940 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1941 | CONFIG_TRACER_MAX_TRACE=y | ||
| 1942 | CONFIG_TRACING=y | ||
| 1943 | # CONFIG_FTRACE is not set | ||
| 1944 | CONFIG_IRQSOFF_TRACER=y | ||
| 1945 | CONFIG_SCHED_TRACER=y | ||
| 1946 | CONFIG_CONTEXT_SWITCH_TRACER=y | ||
| 1947 | # CONFIG_FTRACE_STARTUP_TEST is not set | ||
| 1939 | # CONFIG_SAMPLES is not set | 1948 | # CONFIG_SAMPLES is not set |
| 1949 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1950 | # CONFIG_KGDB is not set | ||
| 1940 | CONFIG_DEBUG_STACKOVERFLOW=y | 1951 | CONFIG_DEBUG_STACKOVERFLOW=y |
| 1941 | CONFIG_DEBUG_STACK_USAGE=y | 1952 | CONFIG_DEBUG_STACK_USAGE=y |
| 1942 | # CONFIG_DEBUG_PAGEALLOC is not set | 1953 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1943 | # CONFIG_HCALL_STATS is not set | 1954 | # CONFIG_HCALL_STATS is not set |
| 1944 | CONFIG_DEBUGGER=y | 1955 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
| 1956 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
| 1945 | CONFIG_XMON=y | 1957 | CONFIG_XMON=y |
| 1946 | # CONFIG_XMON_DEFAULT is not set | 1958 | # CONFIG_XMON_DEFAULT is not set |
| 1947 | CONFIG_XMON_DISASSEMBLY=y | 1959 | CONFIG_XMON_DISASSEMBLY=y |
| 1960 | CONFIG_DEBUGGER=y | ||
| 1948 | CONFIG_IRQSTACKS=y | 1961 | CONFIG_IRQSTACKS=y |
| 1949 | # CONFIG_VIRQ_DEBUG is not set | 1962 | # CONFIG_VIRQ_DEBUG is not set |
| 1950 | CONFIG_BOOTX_TEXT=y | 1963 | CONFIG_BOOTX_TEXT=y |
| @@ -2007,6 +2020,10 @@ CONFIG_CRYPTO_CRC32C=m | |||
| 2007 | CONFIG_CRYPTO_MD4=m | 2020 | CONFIG_CRYPTO_MD4=m |
| 2008 | CONFIG_CRYPTO_MD5=y | 2021 | CONFIG_CRYPTO_MD5=y |
| 2009 | CONFIG_CRYPTO_MICHAEL_MIC=m | 2022 | CONFIG_CRYPTO_MICHAEL_MIC=m |
| 2023 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 2024 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 2025 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 2026 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 2010 | CONFIG_CRYPTO_SHA1=m | 2027 | CONFIG_CRYPTO_SHA1=m |
| 2011 | CONFIG_CRYPTO_SHA256=m | 2028 | CONFIG_CRYPTO_SHA256=m |
| 2012 | CONFIG_CRYPTO_SHA512=m | 2029 | CONFIG_CRYPTO_SHA512=m |
diff --git a/arch/powerpc/configs/ppc6xx_defconfig b/arch/powerpc/configs/ppc6xx_defconfig index e6e91c85da31..3c6dbdef56eb 100644 --- a/arch/powerpc/configs/ppc6xx_defconfig +++ b/arch/powerpc/configs/ppc6xx_defconfig | |||
| @@ -1,8 +1,7 @@ | |||
| 1 | # powerpc | ||
| 2 | # | 1 | # |
| 3 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 4 | # Linux kernel version: 2.6.26-git2 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 5 | # Tue Jul 15 23:54:18 2008 | 4 | # Tue Aug 26 13:29:50 2008 |
| 6 | # | 5 | # |
| 7 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 8 | 7 | ||
| @@ -112,7 +111,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y | |||
| 112 | CONFIG_SYSCTL=y | 111 | CONFIG_SYSCTL=y |
| 113 | # CONFIG_EMBEDDED is not set | 112 | # CONFIG_EMBEDDED is not set |
| 114 | CONFIG_SYSCTL_SYSCALL=y | 113 | CONFIG_SYSCTL_SYSCALL=y |
| 115 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 116 | CONFIG_KALLSYMS=y | 114 | CONFIG_KALLSYMS=y |
| 117 | CONFIG_KALLSYMS_ALL=y | 115 | CONFIG_KALLSYMS_ALL=y |
| 118 | CONFIG_KALLSYMS_EXTRA_PASS=y | 116 | CONFIG_KALLSYMS_EXTRA_PASS=y |
| @@ -140,12 +138,17 @@ CONFIG_MARKERS=y | |||
| 140 | CONFIG_OPROFILE=m | 138 | CONFIG_OPROFILE=m |
| 141 | CONFIG_HAVE_OPROFILE=y | 139 | CONFIG_HAVE_OPROFILE=y |
| 142 | CONFIG_KPROBES=y | 140 | CONFIG_KPROBES=y |
| 141 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 143 | CONFIG_KRETPROBES=y | 142 | CONFIG_KRETPROBES=y |
| 143 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 144 | CONFIG_HAVE_KPROBES=y | 144 | CONFIG_HAVE_KPROBES=y |
| 145 | CONFIG_HAVE_KRETPROBES=y | 145 | CONFIG_HAVE_KRETPROBES=y |
| 146 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 146 | # CONFIG_HAVE_DMA_ATTRS is not set | 147 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 147 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | 148 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set |
| 149 | CONFIG_HAVE_CLK=y | ||
| 148 | CONFIG_PROC_PAGE_MONITOR=y | 150 | CONFIG_PROC_PAGE_MONITOR=y |
| 151 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 149 | CONFIG_SLABINFO=y | 152 | CONFIG_SLABINFO=y |
| 150 | CONFIG_RT_MUTEXES=y | 153 | CONFIG_RT_MUTEXES=y |
| 151 | # CONFIG_TINY_SHMEM is not set | 154 | # CONFIG_TINY_SHMEM is not set |
| @@ -266,7 +269,6 @@ CONFIG_TAU=y | |||
| 266 | CONFIG_TAU_AVERAGE=y | 269 | CONFIG_TAU_AVERAGE=y |
| 267 | CONFIG_QUICC_ENGINE=y | 270 | CONFIG_QUICC_ENGINE=y |
| 268 | CONFIG_CPM2=y | 271 | CONFIG_CPM2=y |
| 269 | CONFIG_PPC_CPM_NEW_BINDING=y | ||
| 270 | CONFIG_FSL_ULI1575=y | 272 | CONFIG_FSL_ULI1575=y |
| 271 | CONFIG_CPM=y | 273 | CONFIG_CPM=y |
| 272 | CONFIG_PPC_BESTCOMM=y | 274 | CONFIG_PPC_BESTCOMM=y |
| @@ -287,7 +289,7 @@ CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | |||
| 287 | # CONFIG_HZ_300 is not set | 289 | # CONFIG_HZ_300 is not set |
| 288 | CONFIG_HZ_1000=y | 290 | CONFIG_HZ_1000=y |
| 289 | CONFIG_HZ=1000 | 291 | CONFIG_HZ=1000 |
| 290 | # CONFIG_SCHED_HRTICK is not set | 292 | CONFIG_SCHED_HRTICK=y |
| 291 | # CONFIG_PREEMPT_NONE is not set | 293 | # CONFIG_PREEMPT_NONE is not set |
| 292 | CONFIG_PREEMPT_VOLUNTARY=y | 294 | CONFIG_PREEMPT_VOLUNTARY=y |
| 293 | # CONFIG_PREEMPT is not set | 295 | # CONFIG_PREEMPT is not set |
| @@ -311,6 +313,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 311 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 313 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 312 | CONFIG_PAGEFLAGS_EXTENDED=y | 314 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 313 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 315 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 316 | # CONFIG_MIGRATION is not set | ||
| 314 | CONFIG_RESOURCES_64BIT=y | 317 | CONFIG_RESOURCES_64BIT=y |
| 315 | CONFIG_ZONE_DMA_FLAG=1 | 318 | CONFIG_ZONE_DMA_FLAG=1 |
| 316 | CONFIG_BOUNCE=y | 319 | CONFIG_BOUNCE=y |
| @@ -326,6 +329,7 @@ CONFIG_PM_DEBUG=y | |||
| 326 | CONFIG_CAN_PM_TRACE=y | 329 | CONFIG_CAN_PM_TRACE=y |
| 327 | CONFIG_PM_SLEEP=y | 330 | CONFIG_PM_SLEEP=y |
| 328 | CONFIG_SUSPEND=y | 331 | CONFIG_SUSPEND=y |
| 332 | # CONFIG_PM_TEST_SUSPEND is not set | ||
| 329 | CONFIG_SUSPEND_FREEZER=y | 333 | CONFIG_SUSPEND_FREEZER=y |
| 330 | CONFIG_HIBERNATION=y | 334 | CONFIG_HIBERNATION=y |
| 331 | CONFIG_PM_STD_PARTITION="" | 335 | CONFIG_PM_STD_PARTITION="" |
| @@ -344,6 +348,7 @@ CONFIG_FSL_SOC=y | |||
| 344 | CONFIG_FSL_PCI=y | 348 | CONFIG_FSL_PCI=y |
| 345 | CONFIG_FSL_LBC=y | 349 | CONFIG_FSL_LBC=y |
| 346 | CONFIG_FSL_GTM=y | 350 | CONFIG_FSL_GTM=y |
| 351 | CONFIG_PPC_PCI_CHOICE=y | ||
| 347 | CONFIG_PCI=y | 352 | CONFIG_PCI=y |
| 348 | CONFIG_PCI_DOMAINS=y | 353 | CONFIG_PCI_DOMAINS=y |
| 349 | CONFIG_PCI_SYSCALL=y | 354 | CONFIG_PCI_SYSCALL=y |
| @@ -395,10 +400,6 @@ CONFIG_KERNEL_START=0xc0000000 | |||
| 395 | CONFIG_PHYSICAL_START=0x00000000 | 400 | CONFIG_PHYSICAL_START=0x00000000 |
| 396 | # CONFIG_TASK_SIZE_BOOL is not set | 401 | # CONFIG_TASK_SIZE_BOOL is not set |
| 397 | CONFIG_TASK_SIZE=0xc0000000 | 402 | CONFIG_TASK_SIZE=0xc0000000 |
| 398 | |||
| 399 | # | ||
| 400 | # Networking | ||
| 401 | # | ||
| 402 | CONFIG_NET=y | 403 | CONFIG_NET=y |
| 403 | 404 | ||
| 404 | # | 405 | # |
| @@ -412,6 +413,7 @@ CONFIG_XFRM_USER=y | |||
| 412 | CONFIG_XFRM_SUB_POLICY=y | 413 | CONFIG_XFRM_SUB_POLICY=y |
| 413 | CONFIG_XFRM_MIGRATE=y | 414 | CONFIG_XFRM_MIGRATE=y |
| 414 | CONFIG_XFRM_STATISTICS=y | 415 | CONFIG_XFRM_STATISTICS=y |
| 416 | CONFIG_XFRM_IPCOMP=m | ||
| 415 | CONFIG_NET_KEY=m | 417 | CONFIG_NET_KEY=m |
| 416 | CONFIG_NET_KEY_MIGRATE=y | 418 | CONFIG_NET_KEY_MIGRATE=y |
| 417 | CONFIG_INET=y | 419 | CONFIG_INET=y |
| @@ -602,6 +604,7 @@ CONFIG_IP_NF_TARGET_ECN=m | |||
| 602 | CONFIG_IP_NF_TARGET_TTL=m | 604 | CONFIG_IP_NF_TARGET_TTL=m |
| 603 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | 605 | CONFIG_IP_NF_TARGET_CLUSTERIP=m |
| 604 | CONFIG_IP_NF_RAW=m | 606 | CONFIG_IP_NF_RAW=m |
| 607 | CONFIG_IP_NF_SECURITY=m | ||
| 605 | CONFIG_IP_NF_ARPTABLES=m | 608 | CONFIG_IP_NF_ARPTABLES=m |
| 606 | CONFIG_IP_NF_ARPFILTER=m | 609 | CONFIG_IP_NF_ARPFILTER=m |
| 607 | CONFIG_IP_NF_ARP_MANGLE=m | 610 | CONFIG_IP_NF_ARP_MANGLE=m |
| @@ -626,6 +629,7 @@ CONFIG_IP6_NF_TARGET_REJECT=m | |||
| 626 | CONFIG_IP6_NF_MANGLE=m | 629 | CONFIG_IP6_NF_MANGLE=m |
| 627 | CONFIG_IP6_NF_TARGET_HL=m | 630 | CONFIG_IP6_NF_TARGET_HL=m |
| 628 | CONFIG_IP6_NF_RAW=m | 631 | CONFIG_IP6_NF_RAW=m |
| 632 | CONFIG_IP6_NF_SECURITY=m | ||
| 629 | 633 | ||
| 630 | # | 634 | # |
| 631 | # DECnet: Netfilter Configuration | 635 | # DECnet: Netfilter Configuration |
| @@ -643,6 +647,7 @@ CONFIG_BRIDGE_EBT_802_3=m | |||
| 643 | CONFIG_BRIDGE_EBT_AMONG=m | 647 | CONFIG_BRIDGE_EBT_AMONG=m |
| 644 | CONFIG_BRIDGE_EBT_ARP=m | 648 | CONFIG_BRIDGE_EBT_ARP=m |
| 645 | CONFIG_BRIDGE_EBT_IP=m | 649 | CONFIG_BRIDGE_EBT_IP=m |
| 650 | CONFIG_BRIDGE_EBT_IP6=m | ||
| 646 | CONFIG_BRIDGE_EBT_LIMIT=m | 651 | CONFIG_BRIDGE_EBT_LIMIT=m |
| 647 | CONFIG_BRIDGE_EBT_MARK=m | 652 | CONFIG_BRIDGE_EBT_MARK=m |
| 648 | CONFIG_BRIDGE_EBT_PKTTYPE=m | 653 | CONFIG_BRIDGE_EBT_PKTTYPE=m |
| @@ -691,8 +696,10 @@ CONFIG_ATM_LANE=m | |||
| 691 | # CONFIG_ATM_MPOA is not set | 696 | # CONFIG_ATM_MPOA is not set |
| 692 | CONFIG_ATM_BR2684=m | 697 | CONFIG_ATM_BR2684=m |
| 693 | # CONFIG_ATM_BR2684_IPFILTER is not set | 698 | # CONFIG_ATM_BR2684_IPFILTER is not set |
| 699 | CONFIG_STP=m | ||
| 694 | CONFIG_BRIDGE=m | 700 | CONFIG_BRIDGE=m |
| 695 | CONFIG_VLAN_8021Q=m | 701 | CONFIG_VLAN_8021Q=m |
| 702 | # CONFIG_VLAN_8021Q_GVRP is not set | ||
| 696 | CONFIG_DECNET=m | 703 | CONFIG_DECNET=m |
| 697 | CONFIG_DECNET_ROUTER=y | 704 | CONFIG_DECNET_ROUTER=y |
| 698 | CONFIG_LLC=m | 705 | CONFIG_LLC=m |
| @@ -832,6 +839,7 @@ CONFIG_BT_HIDP=m | |||
| 832 | # | 839 | # |
| 833 | CONFIG_BT_HCIUSB=m | 840 | CONFIG_BT_HCIUSB=m |
| 834 | CONFIG_BT_HCIUSB_SCO=y | 841 | CONFIG_BT_HCIUSB_SCO=y |
| 842 | # CONFIG_BT_HCIBTUSB is not set | ||
| 835 | CONFIG_BT_HCIUART=m | 843 | CONFIG_BT_HCIUART=m |
| 836 | CONFIG_BT_HCIUART_H4=y | 844 | CONFIG_BT_HCIUART_H4=y |
| 837 | CONFIG_BT_HCIUART_BCSP=y | 845 | CONFIG_BT_HCIUART_BCSP=y |
| @@ -855,7 +863,6 @@ CONFIG_NL80211=y | |||
| 855 | CONFIG_WIRELESS_EXT=y | 863 | CONFIG_WIRELESS_EXT=y |
| 856 | CONFIG_WIRELESS_EXT_SYSFS=y | 864 | CONFIG_WIRELESS_EXT_SYSFS=y |
| 857 | CONFIG_MAC80211=m | 865 | CONFIG_MAC80211=m |
| 858 | CONFIG_MAC80211_QOS=y | ||
| 859 | 866 | ||
| 860 | # | 867 | # |
| 861 | # Rate control algorithm selection | 868 | # Rate control algorithm selection |
| @@ -941,12 +948,14 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8 | |||
| 941 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 948 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
| 942 | # CONFIG_ATA_OVER_ETH is not set | 949 | # CONFIG_ATA_OVER_ETH is not set |
| 943 | CONFIG_VIRTIO_BLK=m | 950 | CONFIG_VIRTIO_BLK=m |
| 951 | CONFIG_BLK_DEV_HD=y | ||
| 944 | CONFIG_MISC_DEVICES=y | 952 | CONFIG_MISC_DEVICES=y |
| 945 | # CONFIG_PHANTOM is not set | 953 | # CONFIG_PHANTOM is not set |
| 946 | CONFIG_EEPROM_93CX6=m | 954 | CONFIG_EEPROM_93CX6=m |
| 947 | # CONFIG_SGI_IOC4 is not set | 955 | # CONFIG_SGI_IOC4 is not set |
| 948 | # CONFIG_TIFM_CORE is not set | 956 | # CONFIG_TIFM_CORE is not set |
| 949 | CONFIG_ENCLOSURE_SERVICES=m | 957 | CONFIG_ENCLOSURE_SERVICES=m |
| 958 | # CONFIG_HP_ILO is not set | ||
| 950 | CONFIG_HAVE_IDE=y | 959 | CONFIG_HAVE_IDE=y |
| 951 | CONFIG_IDE=y | 960 | CONFIG_IDE=y |
| 952 | CONFIG_BLK_DEV_IDE=y | 961 | CONFIG_BLK_DEV_IDE=y |
| @@ -954,6 +963,7 @@ CONFIG_BLK_DEV_IDE=y | |||
| 954 | # | 963 | # |
| 955 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | 964 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
| 956 | # | 965 | # |
| 966 | CONFIG_IDE_TIMINGS=y | ||
| 957 | CONFIG_IDE_ATAPI=y | 967 | CONFIG_IDE_ATAPI=y |
| 958 | # CONFIG_BLK_DEV_IDE_SATA is not set | 968 | # CONFIG_BLK_DEV_IDE_SATA is not set |
| 959 | CONFIG_BLK_DEV_IDEDISK=y | 969 | CONFIG_BLK_DEV_IDEDISK=y |
| @@ -971,7 +981,6 @@ CONFIG_IDE_PROC_FS=y | |||
| 971 | # | 981 | # |
| 972 | # IDE chipset support/bugfixes | 982 | # IDE chipset support/bugfixes |
| 973 | # | 983 | # |
| 974 | # CONFIG_IDE_GENERIC is not set | ||
| 975 | # CONFIG_BLK_DEV_PLATFORM is not set | 984 | # CONFIG_BLK_DEV_PLATFORM is not set |
| 976 | # CONFIG_BLK_DEV_IDEPNP is not set | 985 | # CONFIG_BLK_DEV_IDEPNP is not set |
| 977 | CONFIG_BLK_DEV_IDEDMA_SFF=y | 986 | CONFIG_BLK_DEV_IDEDMA_SFF=y |
| @@ -990,10 +999,8 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
| 990 | # CONFIG_BLK_DEV_AMD74XX is not set | 999 | # CONFIG_BLK_DEV_AMD74XX is not set |
| 991 | # CONFIG_BLK_DEV_CMD64X is not set | 1000 | # CONFIG_BLK_DEV_CMD64X is not set |
| 992 | # CONFIG_BLK_DEV_TRIFLEX is not set | 1001 | # CONFIG_BLK_DEV_TRIFLEX is not set |
| 993 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
| 994 | # CONFIG_BLK_DEV_CS5520 is not set | 1002 | # CONFIG_BLK_DEV_CS5520 is not set |
| 995 | # CONFIG_BLK_DEV_CS5530 is not set | 1003 | # CONFIG_BLK_DEV_CS5530 is not set |
| 996 | # CONFIG_BLK_DEV_HPT34X is not set | ||
| 997 | # CONFIG_BLK_DEV_HPT366 is not set | 1004 | # CONFIG_BLK_DEV_HPT366 is not set |
| 998 | # CONFIG_BLK_DEV_JMICRON is not set | 1005 | # CONFIG_BLK_DEV_JMICRON is not set |
| 999 | # CONFIG_BLK_DEV_SC1200 is not set | 1006 | # CONFIG_BLK_DEV_SC1200 is not set |
| @@ -1014,8 +1021,6 @@ CONFIG_BLK_DEV_IDE_PMAC=y | |||
| 1014 | CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y | 1021 | CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y |
| 1015 | CONFIG_BLK_DEV_IDEDMA_PMAC=y | 1022 | CONFIG_BLK_DEV_IDEDMA_PMAC=y |
| 1016 | CONFIG_BLK_DEV_IDEDMA=y | 1023 | CONFIG_BLK_DEV_IDEDMA=y |
| 1017 | CONFIG_BLK_DEV_HD_ONLY=y | ||
| 1018 | CONFIG_BLK_DEV_HD=y | ||
| 1019 | 1024 | ||
| 1020 | # | 1025 | # |
| 1021 | # SCSI device support | 1026 | # SCSI device support |
| @@ -1125,6 +1130,7 @@ CONFIG_SCSI_DH=y | |||
| 1125 | CONFIG_SCSI_DH_RDAC=m | 1130 | CONFIG_SCSI_DH_RDAC=m |
| 1126 | CONFIG_SCSI_DH_HP_SW=m | 1131 | CONFIG_SCSI_DH_HP_SW=m |
| 1127 | CONFIG_SCSI_DH_EMC=m | 1132 | CONFIG_SCSI_DH_EMC=m |
| 1133 | # CONFIG_SCSI_DH_ALUA is not set | ||
| 1128 | CONFIG_ATA=y | 1134 | CONFIG_ATA=y |
| 1129 | # CONFIG_ATA_NONSTANDARD is not set | 1135 | # CONFIG_ATA_NONSTANDARD is not set |
| 1130 | # CONFIG_SATA_PMP is not set | 1136 | # CONFIG_SATA_PMP is not set |
| @@ -1246,7 +1252,6 @@ CONFIG_WINDFARM=y | |||
| 1246 | # CONFIG_ANSLCD is not set | 1252 | # CONFIG_ANSLCD is not set |
| 1247 | CONFIG_PMAC_RACKMETER=m | 1253 | CONFIG_PMAC_RACKMETER=m |
| 1248 | CONFIG_NETDEVICES=y | 1254 | CONFIG_NETDEVICES=y |
| 1249 | CONFIG_NETDEVICES_MULTIQUEUE=y | ||
| 1250 | CONFIG_IFB=m | 1255 | CONFIG_IFB=m |
| 1251 | CONFIG_DUMMY=m | 1256 | CONFIG_DUMMY=m |
| 1252 | CONFIG_BONDING=m | 1257 | CONFIG_BONDING=m |
| @@ -1256,7 +1261,7 @@ CONFIG_TUN=m | |||
| 1256 | CONFIG_VETH=m | 1261 | CONFIG_VETH=m |
| 1257 | CONFIG_NET_SB1000=m | 1262 | CONFIG_NET_SB1000=m |
| 1258 | # CONFIG_ARCNET is not set | 1263 | # CONFIG_ARCNET is not set |
| 1259 | CONFIG_PHYLIB=m | 1264 | CONFIG_PHYLIB=y |
| 1260 | 1265 | ||
| 1261 | # | 1266 | # |
| 1262 | # MII PHY device drivers | 1267 | # MII PHY device drivers |
| @@ -1271,7 +1276,9 @@ CONFIG_SMSC_PHY=m | |||
| 1271 | CONFIG_BROADCOM_PHY=m | 1276 | CONFIG_BROADCOM_PHY=m |
| 1272 | CONFIG_ICPLUS_PHY=m | 1277 | CONFIG_ICPLUS_PHY=m |
| 1273 | CONFIG_REALTEK_PHY=m | 1278 | CONFIG_REALTEK_PHY=m |
| 1279 | # CONFIG_FIXED_PHY is not set | ||
| 1274 | CONFIG_MDIO_BITBANG=y | 1280 | CONFIG_MDIO_BITBANG=y |
| 1281 | # CONFIG_MDIO_OF_GPIO is not set | ||
| 1275 | CONFIG_NET_ETHERNET=y | 1282 | CONFIG_NET_ETHERNET=y |
| 1276 | CONFIG_MII=m | 1283 | CONFIG_MII=m |
| 1277 | CONFIG_MACE=m | 1284 | CONFIG_MACE=m |
| @@ -1328,9 +1335,7 @@ CONFIG_NE2000=m | |||
| 1328 | CONFIG_NET_PCI=y | 1335 | CONFIG_NET_PCI=y |
| 1329 | CONFIG_PCNET32=m | 1336 | CONFIG_PCNET32=m |
| 1330 | CONFIG_AMD8111_ETH=m | 1337 | CONFIG_AMD8111_ETH=m |
| 1331 | CONFIG_AMD8111E_NAPI=y | ||
| 1332 | CONFIG_ADAPTEC_STARFIRE=m | 1338 | CONFIG_ADAPTEC_STARFIRE=m |
| 1333 | CONFIG_ADAPTEC_STARFIRE_NAPI=y | ||
| 1334 | # CONFIG_AC3200 is not set | 1339 | # CONFIG_AC3200 is not set |
| 1335 | # CONFIG_APRICOT is not set | 1340 | # CONFIG_APRICOT is not set |
| 1336 | CONFIG_B44=m | 1341 | CONFIG_B44=m |
| @@ -1359,7 +1364,6 @@ CONFIG_SUNDANCE=m | |||
| 1359 | CONFIG_TLAN=m | 1364 | CONFIG_TLAN=m |
| 1360 | CONFIG_VIA_RHINE=m | 1365 | CONFIG_VIA_RHINE=m |
| 1361 | CONFIG_VIA_RHINE_MMIO=y | 1366 | CONFIG_VIA_RHINE_MMIO=y |
| 1362 | CONFIG_VIA_RHINE_NAPI=y | ||
| 1363 | CONFIG_SC92031=m | 1367 | CONFIG_SC92031=m |
| 1364 | CONFIG_NET_POCKET=y | 1368 | CONFIG_NET_POCKET=y |
| 1365 | CONFIG_DE600=m | 1369 | CONFIG_DE600=m |
| @@ -1372,17 +1376,15 @@ CONFIG_ACENIC=m | |||
| 1372 | # CONFIG_ACENIC_OMIT_TIGON_I is not set | 1376 | # CONFIG_ACENIC_OMIT_TIGON_I is not set |
| 1373 | CONFIG_DL2K=m | 1377 | CONFIG_DL2K=m |
| 1374 | CONFIG_E1000=m | 1378 | CONFIG_E1000=m |
| 1375 | CONFIG_E1000_NAPI=y | ||
| 1376 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | 1379 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set |
| 1377 | CONFIG_E1000E=m | 1380 | CONFIG_E1000E=m |
| 1378 | CONFIG_E1000E_ENABLED=y | ||
| 1379 | CONFIG_IP1000=m | 1381 | CONFIG_IP1000=m |
| 1380 | CONFIG_IGB=m | 1382 | CONFIG_IGB=m |
| 1383 | CONFIG_IGB_LRO=y | ||
| 1381 | CONFIG_NS83820=m | 1384 | CONFIG_NS83820=m |
| 1382 | CONFIG_HAMACHI=m | 1385 | CONFIG_HAMACHI=m |
| 1383 | CONFIG_YELLOWFIN=m | 1386 | CONFIG_YELLOWFIN=m |
| 1384 | CONFIG_R8169=m | 1387 | CONFIG_R8169=m |
| 1385 | CONFIG_R8169_NAPI=y | ||
| 1386 | CONFIG_R8169_VLAN=y | 1388 | CONFIG_R8169_VLAN=y |
| 1387 | CONFIG_SIS190=m | 1389 | CONFIG_SIS190=m |
| 1388 | CONFIG_SKGE=m | 1390 | CONFIG_SKGE=m |
| @@ -1393,21 +1395,18 @@ CONFIG_VIA_VELOCITY=m | |||
| 1393 | CONFIG_TIGON3=m | 1395 | CONFIG_TIGON3=m |
| 1394 | CONFIG_BNX2=m | 1396 | CONFIG_BNX2=m |
| 1395 | CONFIG_GIANFAR=m | 1397 | CONFIG_GIANFAR=m |
| 1396 | CONFIG_GFAR_NAPI=y | ||
| 1397 | # CONFIG_UCC_GETH is not set | 1398 | # CONFIG_UCC_GETH is not set |
| 1398 | CONFIG_MV643XX_ETH=m | 1399 | CONFIG_MV643XX_ETH=m |
| 1399 | CONFIG_QLA3XXX=m | 1400 | CONFIG_QLA3XXX=m |
| 1400 | CONFIG_ATL1=m | 1401 | CONFIG_ATL1=m |
| 1402 | # CONFIG_ATL1E is not set | ||
| 1401 | CONFIG_NETDEV_10000=y | 1403 | CONFIG_NETDEV_10000=y |
| 1402 | CONFIG_CHELSIO_T1=m | 1404 | CONFIG_CHELSIO_T1=m |
| 1403 | CONFIG_CHELSIO_T1_1G=y | 1405 | CONFIG_CHELSIO_T1_1G=y |
| 1404 | CONFIG_CHELSIO_T1_NAPI=y | ||
| 1405 | CONFIG_CHELSIO_T3=m | 1406 | CONFIG_CHELSIO_T3=m |
| 1406 | CONFIG_IXGBE=m | 1407 | CONFIG_IXGBE=m |
| 1407 | CONFIG_IXGB=m | 1408 | CONFIG_IXGB=m |
| 1408 | CONFIG_IXGB_NAPI=y | ||
| 1409 | CONFIG_S2IO=m | 1409 | CONFIG_S2IO=m |
| 1410 | CONFIG_S2IO_NAPI=y | ||
| 1411 | CONFIG_MYRI10GE=m | 1410 | CONFIG_MYRI10GE=m |
| 1412 | CONFIG_NETXEN_NIC=m | 1411 | CONFIG_NETXEN_NIC=m |
| 1413 | CONFIG_NIU=m | 1412 | CONFIG_NIU=m |
| @@ -1477,8 +1476,7 @@ CONFIG_ATM_IDT77252_USE_SUNI=y | |||
| 1477 | # CONFIG_ATM_AMBASSADOR is not set | 1476 | # CONFIG_ATM_AMBASSADOR is not set |
| 1478 | # CONFIG_ATM_HORIZON is not set | 1477 | # CONFIG_ATM_HORIZON is not set |
| 1479 | # CONFIG_ATM_IA is not set | 1478 | # CONFIG_ATM_IA is not set |
| 1480 | CONFIG_ATM_FORE200E_MAYBE=m | 1479 | # CONFIG_ATM_FORE200E is not set |
| 1481 | # CONFIG_ATM_FORE200E_PCA is not set | ||
| 1482 | CONFIG_ATM_HE=m | 1480 | CONFIG_ATM_HE=m |
| 1483 | # CONFIG_ATM_HE_USE_SUNI is not set | 1481 | # CONFIG_ATM_HE_USE_SUNI is not set |
| 1484 | CONFIG_FDDI=y | 1482 | CONFIG_FDDI=y |
| @@ -1551,6 +1549,7 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y | |||
| 1551 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 1549 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
| 1552 | CONFIG_MOUSE_SERIAL=m | 1550 | CONFIG_MOUSE_SERIAL=m |
| 1553 | CONFIG_MOUSE_APPLETOUCH=m | 1551 | CONFIG_MOUSE_APPLETOUCH=m |
| 1552 | # CONFIG_MOUSE_BCM5974 is not set | ||
| 1554 | # CONFIG_MOUSE_INPORT is not set | 1553 | # CONFIG_MOUSE_INPORT is not set |
| 1555 | # CONFIG_MOUSE_LOGIBM is not set | 1554 | # CONFIG_MOUSE_LOGIBM is not set |
| 1556 | # CONFIG_MOUSE_PC110PAD is not set | 1555 | # CONFIG_MOUSE_PC110PAD is not set |
| @@ -1611,33 +1610,18 @@ CONFIG_SERIO_SERPORT=y | |||
| 1611 | # CONFIG_SERIO_PCIPS2 is not set | 1610 | # CONFIG_SERIO_PCIPS2 is not set |
| 1612 | CONFIG_SERIO_LIBPS2=y | 1611 | CONFIG_SERIO_LIBPS2=y |
| 1613 | CONFIG_SERIO_RAW=m | 1612 | CONFIG_SERIO_RAW=m |
| 1613 | # CONFIG_SERIO_XILINX_XPS_PS2 is not set | ||
| 1614 | CONFIG_GAMEPORT=m | 1614 | CONFIG_GAMEPORT=m |
| 1615 | CONFIG_GAMEPORT_NS558=m | 1615 | CONFIG_GAMEPORT_NS558=m |
| 1616 | CONFIG_GAMEPORT_L4=m | 1616 | CONFIG_GAMEPORT_L4=m |
| 1617 | CONFIG_GAMEPORT_EMU10K1=m | 1617 | CONFIG_GAMEPORT_EMU10K1=m |
| 1618 | CONFIG_GAMEPORT_FM801=m | 1618 | CONFIG_GAMEPORT_FM801=m |
| 1619 | CONFIG_INPUT_LIRC=y | ||
| 1620 | CONFIG_LIRC_DEV=m | ||
| 1621 | CONFIG_LIRC_ATIUSB=m | ||
| 1622 | CONFIG_LIRC_BT829=m | ||
| 1623 | CONFIG_LIRC_CMDIR=m | ||
| 1624 | CONFIG_LIRC_I2C=m | ||
| 1625 | CONFIG_LIRC_IGORPLUGUSB=m | ||
| 1626 | CONFIG_LIRC_IMON=m | ||
| 1627 | CONFIG_LIRC_IT87=m | ||
| 1628 | CONFIG_LIRC_MCEUSB=m | ||
| 1629 | CONFIG_LIRC_MCEUSB2=m | ||
| 1630 | CONFIG_LIRC_PVR150=m | ||
| 1631 | CONFIG_LIRC_PARALLEL=m | ||
| 1632 | CONFIG_LIRC_SERIAL=m | ||
| 1633 | CONFIG_LIRC_SIR=m | ||
| 1634 | CONFIG_LIRC_STREAMZAP=m | ||
| 1635 | CONFIG_LIRC_TTUSBIR=m | ||
| 1636 | 1619 | ||
| 1637 | # | 1620 | # |
| 1638 | # Character devices | 1621 | # Character devices |
| 1639 | # | 1622 | # |
| 1640 | CONFIG_VT=y | 1623 | CONFIG_VT=y |
| 1624 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 1641 | CONFIG_VT_CONSOLE=y | 1625 | CONFIG_VT_CONSOLE=y |
| 1642 | CONFIG_HW_CONSOLE=y | 1626 | CONFIG_HW_CONSOLE=y |
| 1643 | CONFIG_VT_HW_CONSOLE_BINDING=y | 1627 | CONFIG_VT_HW_CONSOLE_BINDING=y |
| @@ -1701,12 +1685,12 @@ CONFIG_SERIAL_OF_PLATFORM=y | |||
| 1701 | # CONFIG_SERIAL_QE is not set | 1685 | # CONFIG_SERIAL_QE is not set |
| 1702 | CONFIG_UNIX98_PTYS=y | 1686 | CONFIG_UNIX98_PTYS=y |
| 1703 | # CONFIG_LEGACY_PTYS is not set | 1687 | # CONFIG_LEGACY_PTYS is not set |
| 1704 | # CONFIG_CRASH is not set | ||
| 1705 | CONFIG_BRIQ_PANEL=m | 1688 | CONFIG_BRIQ_PANEL=m |
| 1706 | CONFIG_PRINTER=m | 1689 | CONFIG_PRINTER=m |
| 1707 | CONFIG_LP_CONSOLE=y | 1690 | CONFIG_LP_CONSOLE=y |
| 1708 | CONFIG_PPDEV=m | 1691 | CONFIG_PPDEV=m |
| 1709 | # CONFIG_HVC_RTAS is not set | 1692 | # CONFIG_HVC_RTAS is not set |
| 1693 | # CONFIG_VIRTIO_CONSOLE is not set | ||
| 1710 | # CONFIG_IPMI_HANDLER is not set | 1694 | # CONFIG_IPMI_HANDLER is not set |
| 1711 | CONFIG_HW_RANDOM=y | 1695 | CONFIG_HW_RANDOM=y |
| 1712 | CONFIG_HW_RANDOM_VIRTIO=m | 1696 | CONFIG_HW_RANDOM_VIRTIO=m |
| @@ -1728,6 +1712,7 @@ CONFIG_DEVPORT=y | |||
| 1728 | CONFIG_I2C=y | 1712 | CONFIG_I2C=y |
| 1729 | CONFIG_I2C_BOARDINFO=y | 1713 | CONFIG_I2C_BOARDINFO=y |
| 1730 | CONFIG_I2C_CHARDEV=m | 1714 | CONFIG_I2C_CHARDEV=m |
| 1715 | CONFIG_I2C_HELPER_AUTO=y | ||
| 1731 | CONFIG_I2C_ALGOBIT=y | 1716 | CONFIG_I2C_ALGOBIT=y |
| 1732 | CONFIG_I2C_ALGOPCA=m | 1717 | CONFIG_I2C_ALGOPCA=m |
| 1733 | 1718 | ||
| @@ -1807,20 +1792,24 @@ CONFIG_SENSORS_TSL2550=m | |||
| 1807 | # CONFIG_I2C_DEBUG_BUS is not set | 1792 | # CONFIG_I2C_DEBUG_BUS is not set |
| 1808 | # CONFIG_I2C_DEBUG_CHIP is not set | 1793 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 1809 | # CONFIG_SPI is not set | 1794 | # CONFIG_SPI is not set |
| 1810 | CONFIG_HAVE_GPIO_LIB=y | 1795 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
| 1811 | 1796 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | |
| 1812 | # | 1797 | CONFIG_GPIOLIB=y |
| 1813 | # GPIO Support | ||
| 1814 | # | ||
| 1815 | # CONFIG_DEBUG_GPIO is not set | 1798 | # CONFIG_DEBUG_GPIO is not set |
| 1799 | CONFIG_GPIO_SYSFS=y | ||
| 1816 | 1800 | ||
| 1817 | # | 1801 | # |
| 1818 | # I2C GPIO expanders: | 1802 | # I2C GPIO expanders: |
| 1819 | # | 1803 | # |
| 1804 | # CONFIG_GPIO_MAX732X is not set | ||
| 1820 | # CONFIG_GPIO_PCA953X is not set | 1805 | # CONFIG_GPIO_PCA953X is not set |
| 1821 | # CONFIG_GPIO_PCF857X is not set | 1806 | # CONFIG_GPIO_PCF857X is not set |
| 1822 | 1807 | ||
| 1823 | # | 1808 | # |
| 1809 | # PCI GPIO expanders: | ||
| 1810 | # | ||
| 1811 | |||
| 1812 | # | ||
| 1824 | # SPI GPIO expanders: | 1813 | # SPI GPIO expanders: |
| 1825 | # | 1814 | # |
| 1826 | CONFIG_W1=m | 1815 | CONFIG_W1=m |
| @@ -1850,6 +1839,7 @@ CONFIG_APM_POWER=m | |||
| 1850 | CONFIG_BATTERY_PMU=m | 1839 | CONFIG_BATTERY_PMU=m |
| 1851 | CONFIG_HWMON=m | 1840 | CONFIG_HWMON=m |
| 1852 | CONFIG_HWMON_VID=m | 1841 | CONFIG_HWMON_VID=m |
| 1842 | # CONFIG_SENSORS_AD7414 is not set | ||
| 1853 | CONFIG_SENSORS_AD7418=m | 1843 | CONFIG_SENSORS_AD7418=m |
| 1854 | CONFIG_SENSORS_ADM1021=m | 1844 | CONFIG_SENSORS_ADM1021=m |
| 1855 | CONFIG_SENSORS_ADM1025=m | 1845 | CONFIG_SENSORS_ADM1025=m |
| @@ -1913,8 +1903,9 @@ CONFIG_WATCHDOG=y | |||
| 1913 | # Watchdog Device Drivers | 1903 | # Watchdog Device Drivers |
| 1914 | # | 1904 | # |
| 1915 | CONFIG_SOFT_WATCHDOG=m | 1905 | CONFIG_SOFT_WATCHDOG=m |
| 1906 | # CONFIG_ALIM7101_WDT is not set | ||
| 1916 | # CONFIG_MPC5200_WDT is not set | 1907 | # CONFIG_MPC5200_WDT is not set |
| 1917 | CONFIG_83xx_WDT=m | 1908 | # CONFIG_8xxx_WDT is not set |
| 1918 | CONFIG_WATCHDOG_RTAS=m | 1909 | CONFIG_WATCHDOG_RTAS=m |
| 1919 | 1910 | ||
| 1920 | # | 1911 | # |
| @@ -1953,8 +1944,10 @@ CONFIG_SSB_DRIVER_PCICORE=y | |||
| 1953 | # | 1944 | # |
| 1954 | # Multifunction device drivers | 1945 | # Multifunction device drivers |
| 1955 | # | 1946 | # |
| 1947 | # CONFIG_MFD_CORE is not set | ||
| 1956 | CONFIG_MFD_SM501=m | 1948 | CONFIG_MFD_SM501=m |
| 1957 | # CONFIG_HTC_PASIC3 is not set | 1949 | # CONFIG_HTC_PASIC3 is not set |
| 1950 | # CONFIG_MFD_TMIO is not set | ||
| 1958 | 1951 | ||
| 1959 | # | 1952 | # |
| 1960 | # Multimedia devices | 1953 | # Multimedia devices |
| @@ -1993,6 +1986,7 @@ CONFIG_MEDIA_TUNER_QT1010=m | |||
| 1993 | CONFIG_MEDIA_TUNER_XC2028=m | 1986 | CONFIG_MEDIA_TUNER_XC2028=m |
| 1994 | CONFIG_MEDIA_TUNER_XC5000=m | 1987 | CONFIG_MEDIA_TUNER_XC5000=m |
| 1995 | CONFIG_MEDIA_TUNER_MXL5005S=m | 1988 | CONFIG_MEDIA_TUNER_MXL5005S=m |
| 1989 | CONFIG_MEDIA_TUNER_MXL5007T=m | ||
| 1996 | CONFIG_VIDEO_V4L2=m | 1990 | CONFIG_VIDEO_V4L2=m |
| 1997 | CONFIG_VIDEO_V4L1=m | 1991 | CONFIG_VIDEO_V4L1=m |
| 1998 | CONFIG_VIDEOBUF_GEN=m | 1992 | CONFIG_VIDEOBUF_GEN=m |
| @@ -2000,13 +1994,13 @@ CONFIG_VIDEOBUF_DMA_SG=m | |||
| 2000 | CONFIG_VIDEOBUF_VMALLOC=m | 1994 | CONFIG_VIDEOBUF_VMALLOC=m |
| 2001 | CONFIG_VIDEOBUF_DVB=m | 1995 | CONFIG_VIDEOBUF_DVB=m |
| 2002 | CONFIG_VIDEO_BTCX=m | 1996 | CONFIG_VIDEO_BTCX=m |
| 2003 | CONFIG_VIDEO_IR_I2C=m | ||
| 2004 | CONFIG_VIDEO_IR=m | 1997 | CONFIG_VIDEO_IR=m |
| 2005 | CONFIG_VIDEO_TVEEPROM=m | 1998 | CONFIG_VIDEO_TVEEPROM=m |
| 2006 | CONFIG_VIDEO_TUNER=m | 1999 | CONFIG_VIDEO_TUNER=m |
| 2007 | CONFIG_VIDEO_CAPTURE_DRIVERS=y | 2000 | CONFIG_VIDEO_CAPTURE_DRIVERS=y |
| 2008 | # CONFIG_VIDEO_ADV_DEBUG is not set | 2001 | # CONFIG_VIDEO_ADV_DEBUG is not set |
| 2009 | # CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set | 2002 | # CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set |
| 2003 | CONFIG_VIDEO_IR_I2C=m | ||
| 2010 | 2004 | ||
| 2011 | # | 2005 | # |
| 2012 | # Encoders/decoders and other helper chips | 2006 | # Encoders/decoders and other helper chips |
| @@ -2108,6 +2102,8 @@ CONFIG_VIDEO_CX18=m | |||
| 2108 | # CONFIG_VIDEO_CAFE_CCIC is not set | 2102 | # CONFIG_VIDEO_CAFE_CCIC is not set |
| 2109 | CONFIG_V4L_USB_DRIVERS=y | 2103 | CONFIG_V4L_USB_DRIVERS=y |
| 2110 | CONFIG_USB_VIDEO_CLASS=m | 2104 | CONFIG_USB_VIDEO_CLASS=m |
| 2105 | CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y | ||
| 2106 | CONFIG_USB_GSPCA=m | ||
| 2111 | CONFIG_VIDEO_PVRUSB2=m | 2107 | CONFIG_VIDEO_PVRUSB2=m |
| 2112 | CONFIG_VIDEO_PVRUSB2_SYSFS=y | 2108 | CONFIG_VIDEO_PVRUSB2_SYSFS=y |
| 2113 | CONFIG_VIDEO_PVRUSB2_DVB=y | 2109 | CONFIG_VIDEO_PVRUSB2_DVB=y |
| @@ -2133,11 +2129,14 @@ CONFIG_USB_PWC=m | |||
| 2133 | # CONFIG_USB_PWC_DEBUG is not set | 2129 | # CONFIG_USB_PWC_DEBUG is not set |
| 2134 | CONFIG_USB_ZR364XX=m | 2130 | CONFIG_USB_ZR364XX=m |
| 2135 | CONFIG_USB_STKWEBCAM=m | 2131 | CONFIG_USB_STKWEBCAM=m |
| 2132 | # CONFIG_USB_S2255 is not set | ||
| 2136 | CONFIG_SOC_CAMERA=m | 2133 | CONFIG_SOC_CAMERA=m |
| 2137 | CONFIG_SOC_CAMERA_MT9M001=m | 2134 | CONFIG_SOC_CAMERA_MT9M001=m |
| 2138 | # CONFIG_MT9M001_PCA9536_SWITCH is not set | 2135 | # CONFIG_MT9M001_PCA9536_SWITCH is not set |
| 2139 | CONFIG_SOC_CAMERA_MT9V022=m | 2136 | CONFIG_SOC_CAMERA_MT9V022=m |
| 2140 | # CONFIG_MT9V022_PCA9536_SWITCH is not set | 2137 | # CONFIG_MT9V022_PCA9536_SWITCH is not set |
| 2138 | # CONFIG_SOC_CAMERA_PLATFORM is not set | ||
| 2139 | # CONFIG_VIDEO_SH_MOBILE_CEU is not set | ||
| 2141 | CONFIG_RADIO_ADAPTERS=y | 2140 | CONFIG_RADIO_ADAPTERS=y |
| 2142 | # CONFIG_RADIO_CADET is not set | 2141 | # CONFIG_RADIO_CADET is not set |
| 2143 | # CONFIG_RADIO_RTRACK is not set | 2142 | # CONFIG_RADIO_RTRACK is not set |
| @@ -2194,6 +2193,8 @@ CONFIG_DVB_USB_DTT200U=m | |||
| 2194 | CONFIG_DVB_USB_OPERA1=m | 2193 | CONFIG_DVB_USB_OPERA1=m |
| 2195 | CONFIG_DVB_USB_AF9005=m | 2194 | CONFIG_DVB_USB_AF9005=m |
| 2196 | CONFIG_DVB_USB_AF9005_REMOTE=m | 2195 | CONFIG_DVB_USB_AF9005_REMOTE=m |
| 2196 | # CONFIG_DVB_USB_DW2102 is not set | ||
| 2197 | # CONFIG_DVB_USB_ANYSEE is not set | ||
| 2197 | CONFIG_DVB_TTUSB_BUDGET=m | 2198 | CONFIG_DVB_TTUSB_BUDGET=m |
| 2198 | CONFIG_DVB_TTUSB_DEC=m | 2199 | CONFIG_DVB_TTUSB_DEC=m |
| 2199 | CONFIG_DVB_CINERGYT2=m | 2200 | CONFIG_DVB_CINERGYT2=m |
| @@ -2203,6 +2204,7 @@ CONFIG_DVB_CINERGYT2_STREAM_BUF_SIZE=512 | |||
| 2203 | CONFIG_DVB_CINERGYT2_QUERY_INTERVAL=250 | 2204 | CONFIG_DVB_CINERGYT2_QUERY_INTERVAL=250 |
| 2204 | CONFIG_DVB_CINERGYT2_ENABLE_RC_INPUT_DEVICE=y | 2205 | CONFIG_DVB_CINERGYT2_ENABLE_RC_INPUT_DEVICE=y |
| 2205 | CONFIG_DVB_CINERGYT2_RC_QUERY_INTERVAL=100 | 2206 | CONFIG_DVB_CINERGYT2_RC_QUERY_INTERVAL=100 |
| 2207 | # CONFIG_DVB_SIANO_SMS1XXX is not set | ||
| 2206 | 2208 | ||
| 2207 | # | 2209 | # |
| 2208 | # Supported FlexCopII (B2C2) Adapters | 2210 | # Supported FlexCopII (B2C2) Adapters |
| @@ -2253,6 +2255,7 @@ CONFIG_DVB_SP8870=m | |||
| 2253 | CONFIG_DVB_SP887X=m | 2255 | CONFIG_DVB_SP887X=m |
| 2254 | CONFIG_DVB_CX22700=m | 2256 | CONFIG_DVB_CX22700=m |
| 2255 | CONFIG_DVB_CX22702=m | 2257 | CONFIG_DVB_CX22702=m |
| 2258 | # CONFIG_DVB_DRX397XD is not set | ||
| 2256 | CONFIG_DVB_L64781=m | 2259 | CONFIG_DVB_L64781=m |
| 2257 | CONFIG_DVB_TDA1004X=m | 2260 | CONFIG_DVB_TDA1004X=m |
| 2258 | CONFIG_DVB_NXT6000=m | 2261 | CONFIG_DVB_NXT6000=m |
| @@ -2389,12 +2392,15 @@ CONFIG_FB_TRIDENT=m | |||
| 2389 | CONFIG_FB_TRIDENT_ACCEL=y | 2392 | CONFIG_FB_TRIDENT_ACCEL=y |
| 2390 | # CONFIG_FB_ARK is not set | 2393 | # CONFIG_FB_ARK is not set |
| 2391 | # CONFIG_FB_PM3 is not set | 2394 | # CONFIG_FB_PM3 is not set |
| 2395 | # CONFIG_FB_CARMINE is not set | ||
| 2392 | # CONFIG_FB_FSL_DIU is not set | 2396 | # CONFIG_FB_FSL_DIU is not set |
| 2393 | CONFIG_FB_SM501=m | 2397 | CONFIG_FB_SM501=m |
| 2394 | CONFIG_FB_IBM_GXT4500=y | 2398 | CONFIG_FB_IBM_GXT4500=y |
| 2395 | # CONFIG_FB_VIRTUAL is not set | 2399 | # CONFIG_FB_VIRTUAL is not set |
| 2396 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | 2400 | CONFIG_BACKLIGHT_LCD_SUPPORT=y |
| 2397 | CONFIG_LCD_CLASS_DEVICE=m | 2401 | CONFIG_LCD_CLASS_DEVICE=m |
| 2402 | # CONFIG_LCD_ILI9320 is not set | ||
| 2403 | CONFIG_LCD_PLATFORM=m | ||
| 2398 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | 2404 | CONFIG_BACKLIGHT_CLASS_DEVICE=y |
| 2399 | # CONFIG_BACKLIGHT_CORGI is not set | 2405 | # CONFIG_BACKLIGHT_CORGI is not set |
| 2400 | 2406 | ||
| @@ -2613,6 +2619,7 @@ CONFIG_USB_DEVICEFS=y | |||
| 2613 | # CONFIG_USB_DYNAMIC_MINORS is not set | 2619 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 2614 | CONFIG_USB_SUSPEND=y | 2620 | CONFIG_USB_SUSPEND=y |
| 2615 | # CONFIG_USB_OTG is not set | 2621 | # CONFIG_USB_OTG is not set |
| 2622 | CONFIG_USB_MON=y | ||
| 2616 | 2623 | ||
| 2617 | # | 2624 | # |
| 2618 | # USB Host Controller Drivers | 2625 | # USB Host Controller Drivers |
| @@ -2640,6 +2647,7 @@ CONFIG_USB_U132_HCD=m | |||
| 2640 | CONFIG_USB_SL811_HCD=m | 2647 | CONFIG_USB_SL811_HCD=m |
| 2641 | # CONFIG_USB_SL811_CS is not set | 2648 | # CONFIG_USB_SL811_CS is not set |
| 2642 | # CONFIG_USB_R8A66597_HCD is not set | 2649 | # CONFIG_USB_R8A66597_HCD is not set |
| 2650 | # CONFIG_USB_MUSB_HDRC is not set | ||
| 2643 | 2651 | ||
| 2644 | # | 2652 | # |
| 2645 | # USB Device Class drivers | 2653 | # USB Device Class drivers |
| @@ -2668,6 +2676,7 @@ CONFIG_USB_STORAGE_JUMPSHOT=y | |||
| 2668 | CONFIG_USB_STORAGE_ALAUDA=y | 2676 | CONFIG_USB_STORAGE_ALAUDA=y |
| 2669 | CONFIG_USB_STORAGE_ONETOUCH=y | 2677 | CONFIG_USB_STORAGE_ONETOUCH=y |
| 2670 | CONFIG_USB_STORAGE_KARMA=y | 2678 | CONFIG_USB_STORAGE_KARMA=y |
| 2679 | # CONFIG_USB_STORAGE_SIERRA is not set | ||
| 2671 | CONFIG_USB_STORAGE_CYPRESS_ATACB=y | 2680 | CONFIG_USB_STORAGE_CYPRESS_ATACB=y |
| 2672 | # CONFIG_USB_LIBUSUAL is not set | 2681 | # CONFIG_USB_LIBUSUAL is not set |
| 2673 | 2682 | ||
| @@ -2676,7 +2685,6 @@ CONFIG_USB_STORAGE_CYPRESS_ATACB=y | |||
| 2676 | # | 2685 | # |
| 2677 | CONFIG_USB_MDC800=m | 2686 | CONFIG_USB_MDC800=m |
| 2678 | CONFIG_USB_MICROTEK=m | 2687 | CONFIG_USB_MICROTEK=m |
| 2679 | CONFIG_USB_MON=y | ||
| 2680 | 2688 | ||
| 2681 | # | 2689 | # |
| 2682 | # USB port drivers | 2690 | # USB port drivers |
| @@ -2686,7 +2694,6 @@ CONFIG_USB_SERIAL=m | |||
| 2686 | CONFIG_USB_EZUSB=y | 2694 | CONFIG_USB_EZUSB=y |
| 2687 | CONFIG_USB_SERIAL_GENERIC=y | 2695 | CONFIG_USB_SERIAL_GENERIC=y |
| 2688 | CONFIG_USB_SERIAL_AIRCABLE=m | 2696 | CONFIG_USB_SERIAL_AIRCABLE=m |
| 2689 | CONFIG_USB_SERIAL_AIRPRIME=m | ||
| 2690 | CONFIG_USB_SERIAL_ARK3116=m | 2697 | CONFIG_USB_SERIAL_ARK3116=m |
| 2691 | CONFIG_USB_SERIAL_BELKIN=m | 2698 | CONFIG_USB_SERIAL_BELKIN=m |
| 2692 | CONFIG_USB_SERIAL_CH341=m | 2699 | CONFIG_USB_SERIAL_CH341=m |
| @@ -2734,7 +2741,6 @@ CONFIG_USB_SERIAL_DEBUG=m | |||
| 2734 | CONFIG_USB_EMI62=m | 2741 | CONFIG_USB_EMI62=m |
| 2735 | CONFIG_USB_EMI26=m | 2742 | CONFIG_USB_EMI26=m |
| 2736 | CONFIG_USB_ADUTUX=m | 2743 | CONFIG_USB_ADUTUX=m |
| 2737 | CONFIG_USB_AUERSWALD=m | ||
| 2738 | # CONFIG_USB_RIO500 is not set | 2744 | # CONFIG_USB_RIO500 is not set |
| 2739 | CONFIG_USB_LEGOTOWER=m | 2745 | CONFIG_USB_LEGOTOWER=m |
| 2740 | CONFIG_USB_LCD=m | 2746 | CONFIG_USB_LCD=m |
| @@ -2770,7 +2776,9 @@ CONFIG_LEDS_CLASS=y | |||
| 2770 | # | 2776 | # |
| 2771 | # LED drivers | 2777 | # LED drivers |
| 2772 | # | 2778 | # |
| 2779 | # CONFIG_LEDS_PCA9532 is not set | ||
| 2773 | # CONFIG_LEDS_GPIO is not set | 2780 | # CONFIG_LEDS_GPIO is not set |
| 2781 | # CONFIG_LEDS_PCA955X is not set | ||
| 2774 | 2782 | ||
| 2775 | # | 2783 | # |
| 2776 | # LED Triggers | 2784 | # LED Triggers |
| @@ -2853,6 +2861,7 @@ CONFIG_KS0108_PORT=0x378 | |||
| 2853 | CONFIG_KS0108_DELAY=2 | 2861 | CONFIG_KS0108_DELAY=2 |
| 2854 | CONFIG_UIO=m | 2862 | CONFIG_UIO=m |
| 2855 | CONFIG_UIO_CIF=m | 2863 | CONFIG_UIO_CIF=m |
| 2864 | CONFIG_UIO_PDRV=m | ||
| 2856 | CONFIG_UIO_SMX=m | 2865 | CONFIG_UIO_SMX=m |
| 2857 | 2866 | ||
| 2858 | # | 2867 | # |
| @@ -2899,6 +2908,7 @@ CONFIG_GFS2_FS_LOCKING_DLM=m | |||
| 2899 | CONFIG_OCFS2_FS=m | 2908 | CONFIG_OCFS2_FS=m |
| 2900 | CONFIG_OCFS2_FS_O2CB=m | 2909 | CONFIG_OCFS2_FS_O2CB=m |
| 2901 | CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | 2910 | CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m |
| 2911 | CONFIG_OCFS2_FS_STATS=y | ||
| 2902 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 2912 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
| 2903 | # CONFIG_OCFS2_DEBUG_FS is not set | 2913 | # CONFIG_OCFS2_DEBUG_FS is not set |
| 2904 | CONFIG_DNOTIFY=y | 2914 | CONFIG_DNOTIFY=y |
| @@ -2959,11 +2969,9 @@ CONFIG_BEFS_FS=m | |||
| 2959 | CONFIG_BFS_FS=m | 2969 | CONFIG_BFS_FS=m |
| 2960 | CONFIG_EFS_FS=m | 2970 | CONFIG_EFS_FS=m |
| 2961 | CONFIG_CRAMFS=m | 2971 | CONFIG_CRAMFS=m |
| 2962 | CONFIG_SQUASHFS=m | ||
| 2963 | # CONFIG_SQUASHFS_EMBEDDED is not set | ||
| 2964 | CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 | ||
| 2965 | CONFIG_VXFS_FS=m | 2972 | CONFIG_VXFS_FS=m |
| 2966 | CONFIG_MINIX_FS=m | 2973 | CONFIG_MINIX_FS=m |
| 2974 | CONFIG_OMFS_FS=m | ||
| 2967 | # CONFIG_HPFS_FS is not set | 2975 | # CONFIG_HPFS_FS is not set |
| 2968 | CONFIG_QNX4FS_FS=m | 2976 | CONFIG_QNX4FS_FS=m |
| 2969 | CONFIG_ROMFS_FS=m | 2977 | CONFIG_ROMFS_FS=m |
| @@ -2988,7 +2996,6 @@ CONFIG_NFS_ACL_SUPPORT=m | |||
| 2988 | CONFIG_NFS_COMMON=y | 2996 | CONFIG_NFS_COMMON=y |
| 2989 | CONFIG_SUNRPC=m | 2997 | CONFIG_SUNRPC=m |
| 2990 | CONFIG_SUNRPC_GSS=m | 2998 | CONFIG_SUNRPC_GSS=m |
| 2991 | CONFIG_SUNRPC_BIND34=y | ||
| 2992 | CONFIG_RPCSEC_GSS_KRB5=m | 2999 | CONFIG_RPCSEC_GSS_KRB5=m |
| 2993 | CONFIG_RPCSEC_GSS_SPKM3=m | 3000 | CONFIG_RPCSEC_GSS_SPKM3=m |
| 2994 | # CONFIG_SMB_FS is not set | 3001 | # CONFIG_SMB_FS is not set |
| @@ -3011,7 +3018,6 @@ CONFIG_NCPFS_SMALLDOS=y | |||
| 3011 | CONFIG_NCPFS_NLS=y | 3018 | CONFIG_NCPFS_NLS=y |
| 3012 | CONFIG_NCPFS_EXTRAS=y | 3019 | CONFIG_NCPFS_EXTRAS=y |
| 3013 | CONFIG_CODA_FS=m | 3020 | CONFIG_CODA_FS=m |
| 3014 | # CONFIG_CODA_FS_OLD_API is not set | ||
| 3015 | # CONFIG_AFS_FS is not set | 3021 | # CONFIG_AFS_FS is not set |
| 3016 | CONFIG_9P_FS=m | 3022 | CONFIG_9P_FS=m |
| 3017 | 3023 | ||
| @@ -3087,7 +3093,7 @@ CONFIG_BITREVERSE=y | |||
| 3087 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 3093 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 3088 | CONFIG_CRC_CCITT=m | 3094 | CONFIG_CRC_CCITT=m |
| 3089 | CONFIG_CRC16=m | 3095 | CONFIG_CRC16=m |
| 3090 | CONFIG_CRC_T10DIF=m | 3096 | CONFIG_CRC_T10DIF=y |
| 3091 | CONFIG_CRC_ITU_T=m | 3097 | CONFIG_CRC_ITU_T=m |
| 3092 | CONFIG_CRC32=y | 3098 | CONFIG_CRC32=y |
| 3093 | # CONFIG_CRC7 is not set | 3099 | # CONFIG_CRC7 is not set |
| @@ -3120,6 +3126,8 @@ CONFIG_HEADERS_CHECK=y | |||
| 3120 | CONFIG_DEBUG_KERNEL=y | 3126 | CONFIG_DEBUG_KERNEL=y |
| 3121 | CONFIG_DEBUG_SHIRQ=y | 3127 | CONFIG_DEBUG_SHIRQ=y |
| 3122 | CONFIG_DETECT_SOFTLOCKUP=y | 3128 | CONFIG_DETECT_SOFTLOCKUP=y |
| 3129 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 3130 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 3123 | CONFIG_SCHED_DEBUG=y | 3131 | CONFIG_SCHED_DEBUG=y |
| 3124 | CONFIG_SCHEDSTATS=y | 3132 | CONFIG_SCHEDSTATS=y |
| 3125 | CONFIG_TIMER_STATS=y | 3133 | CONFIG_TIMER_STATS=y |
| @@ -3143,6 +3151,7 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
| 3143 | CONFIG_DEBUG_INFO=y | 3151 | CONFIG_DEBUG_INFO=y |
| 3144 | CONFIG_DEBUG_VM=y | 3152 | CONFIG_DEBUG_VM=y |
| 3145 | CONFIG_DEBUG_WRITECOUNT=y | 3153 | CONFIG_DEBUG_WRITECOUNT=y |
| 3154 | CONFIG_DEBUG_MEMORY_INIT=y | ||
| 3146 | CONFIG_DEBUG_LIST=y | 3155 | CONFIG_DEBUG_LIST=y |
| 3147 | CONFIG_DEBUG_SG=y | 3156 | CONFIG_DEBUG_SG=y |
| 3148 | CONFIG_FRAME_POINTER=y | 3157 | CONFIG_FRAME_POINTER=y |
| @@ -3158,6 +3167,7 @@ CONFIG_FAIL_MAKE_REQUEST=y | |||
| 3158 | CONFIG_FAULT_INJECTION_DEBUG_FS=y | 3167 | CONFIG_FAULT_INJECTION_DEBUG_FS=y |
| 3159 | CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y | 3168 | CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y |
| 3160 | CONFIG_LATENCYTOP=y | 3169 | CONFIG_LATENCYTOP=y |
| 3170 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 3161 | CONFIG_HAVE_FTRACE=y | 3171 | CONFIG_HAVE_FTRACE=y |
| 3162 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 3172 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
| 3163 | CONFIG_TRACER_MAX_TRACE=y | 3173 | CONFIG_TRACER_MAX_TRACE=y |
| @@ -3168,16 +3178,18 @@ CONFIG_CONTEXT_SWITCH_TRACER=y | |||
| 3168 | CONFIG_DYNAMIC_FTRACE=y | 3178 | CONFIG_DYNAMIC_FTRACE=y |
| 3169 | # CONFIG_FTRACE_STARTUP_TEST is not set | 3179 | # CONFIG_FTRACE_STARTUP_TEST is not set |
| 3170 | # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set | 3180 | # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set |
| 3181 | # CONFIG_BUILD_DOCSRC is not set | ||
| 3171 | # CONFIG_SAMPLES is not set | 3182 | # CONFIG_SAMPLES is not set |
| 3183 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 3184 | # CONFIG_KGDB is not set | ||
| 3172 | CONFIG_DEBUG_STACKOVERFLOW=y | 3185 | CONFIG_DEBUG_STACKOVERFLOW=y |
| 3173 | CONFIG_DEBUG_STACK_USAGE=y | 3186 | CONFIG_DEBUG_STACK_USAGE=y |
| 3174 | CONFIG_DEBUGGER=y | ||
| 3175 | # CONFIG_CODE_PATCHING_SELFTEST is not set | 3187 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
| 3176 | # CONFIG_FTR_FIXUP_SELFTEST is not set | 3188 | # CONFIG_FTR_FIXUP_SELFTEST is not set |
| 3177 | # CONFIG_KGDB_CONSOLE is not set | ||
| 3178 | CONFIG_XMON=y | 3189 | CONFIG_XMON=y |
| 3179 | # CONFIG_XMON_DEFAULT is not set | 3190 | # CONFIG_XMON_DEFAULT is not set |
| 3180 | CONFIG_XMON_DISASSEMBLY=y | 3191 | CONFIG_XMON_DISASSEMBLY=y |
| 3192 | CONFIG_DEBUGGER=y | ||
| 3181 | CONFIG_IRQSTACKS=y | 3193 | CONFIG_IRQSTACKS=y |
| 3182 | # CONFIG_VIRQ_DEBUG is not set | 3194 | # CONFIG_VIRQ_DEBUG is not set |
| 3183 | # CONFIG_BDI_SWITCH is not set | 3195 | # CONFIG_BDI_SWITCH is not set |
diff --git a/arch/powerpc/configs/pq2fads_defconfig b/arch/powerpc/configs/pq2fads_defconfig index bc3bf62ddc2f..b390b7476649 100644 --- a/arch/powerpc/configs/pq2fads_defconfig +++ b/arch/powerpc/configs/pq2fads_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.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Mon Jun 9 08:52:18 2008 | 4 | # Thu Aug 21 00:52:13 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -15,6 +15,7 @@ CONFIG_6xx=y | |||
| 15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
| 16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
| 17 | CONFIG_PPC_FPU=y | 17 | CONFIG_PPC_FPU=y |
| 18 | # CONFIG_ALTIVEC is not set | ||
| 18 | CONFIG_PPC_STD_MMU=y | 19 | CONFIG_PPC_STD_MMU=y |
| 19 | CONFIG_PPC_STD_MMU_32=y | 20 | CONFIG_PPC_STD_MMU_32=y |
| 20 | # CONFIG_PPC_MM_SLICES is not set | 21 | # CONFIG_PPC_MM_SLICES is not set |
| @@ -31,12 +32,14 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 31 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 32 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 33 | CONFIG_STACKTRACE_SUPPORT=y | 34 | CONFIG_STACKTRACE_SUPPORT=y |
| 35 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 34 | CONFIG_LOCKDEP_SUPPORT=y | 36 | CONFIG_LOCKDEP_SUPPORT=y |
| 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
| 38 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 40 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 39 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 41 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 42 | CONFIG_GENERIC_GPIO=y | ||
| 40 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 43 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
| 41 | CONFIG_PPC=y | 44 | CONFIG_PPC=y |
| 42 | CONFIG_EARLY_PRINTK=y | 45 | CONFIG_EARLY_PRINTK=y |
| @@ -45,11 +48,13 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | |||
| 45 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 48 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
| 46 | CONFIG_PPC_OF=y | 49 | CONFIG_PPC_OF=y |
| 47 | CONFIG_OF=y | 50 | CONFIG_OF=y |
| 48 | # CONFIG_PPC_UDBG_16550 is not set | 51 | CONFIG_PPC_UDBG_16550=y |
| 49 | # CONFIG_GENERIC_TBSYNC is not set | 52 | # CONFIG_GENERIC_TBSYNC is not set |
| 50 | CONFIG_AUDIT_ARCH=y | 53 | CONFIG_AUDIT_ARCH=y |
| 51 | CONFIG_GENERIC_BUG=y | 54 | CONFIG_GENERIC_BUG=y |
| 52 | CONFIG_DEFAULT_UIMAGE=y | 55 | CONFIG_DEFAULT_UIMAGE=y |
| 56 | CONFIG_HIBERNATE_32=y | ||
| 57 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
| 53 | # CONFIG_PPC_DCR_NATIVE is not set | 58 | # CONFIG_PPC_DCR_NATIVE is not set |
| 54 | # CONFIG_PPC_DCR_MMIO is not set | 59 | # CONFIG_PPC_DCR_MMIO is not set |
| 55 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 60 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| @@ -82,7 +87,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y | |||
| 82 | CONFIG_SYSCTL=y | 87 | CONFIG_SYSCTL=y |
| 83 | CONFIG_EMBEDDED=y | 88 | CONFIG_EMBEDDED=y |
| 84 | CONFIG_SYSCTL_SYSCALL=y | 89 | CONFIG_SYSCTL_SYSCALL=y |
| 85 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 86 | CONFIG_KALLSYMS=y | 90 | CONFIG_KALLSYMS=y |
| 87 | CONFIG_KALLSYMS_ALL=y | 91 | CONFIG_KALLSYMS_ALL=y |
| 88 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 92 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -90,6 +94,7 @@ CONFIG_HOTPLUG=y | |||
| 90 | CONFIG_PRINTK=y | 94 | CONFIG_PRINTK=y |
| 91 | CONFIG_BUG=y | 95 | CONFIG_BUG=y |
| 92 | CONFIG_ELF_CORE=y | 96 | CONFIG_ELF_CORE=y |
| 97 | CONFIG_PCSPKR_PLATFORM=y | ||
| 93 | CONFIG_COMPAT_BRK=y | 98 | CONFIG_COMPAT_BRK=y |
| 94 | CONFIG_BASE_FULL=y | 99 | CONFIG_BASE_FULL=y |
| 95 | CONFIG_FUTEX=y | 100 | CONFIG_FUTEX=y |
| @@ -107,10 +112,16 @@ CONFIG_SLUB=y | |||
| 107 | # CONFIG_PROFILING is not set | 112 | # CONFIG_PROFILING is not set |
| 108 | # CONFIG_MARKERS is not set | 113 | # CONFIG_MARKERS is not set |
| 109 | CONFIG_HAVE_OPROFILE=y | 114 | CONFIG_HAVE_OPROFILE=y |
| 115 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 116 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 110 | CONFIG_HAVE_KPROBES=y | 117 | CONFIG_HAVE_KPROBES=y |
| 111 | CONFIG_HAVE_KRETPROBES=y | 118 | CONFIG_HAVE_KRETPROBES=y |
| 119 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 112 | # CONFIG_HAVE_DMA_ATTRS is not set | 120 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 121 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 122 | CONFIG_HAVE_CLK=y | ||
| 113 | CONFIG_PROC_PAGE_MONITOR=y | 123 | CONFIG_PROC_PAGE_MONITOR=y |
| 124 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 114 | CONFIG_SLABINFO=y | 125 | CONFIG_SLABINFO=y |
| 115 | CONFIG_RT_MUTEXES=y | 126 | CONFIG_RT_MUTEXES=y |
| 116 | # CONFIG_TINY_SHMEM is not set | 127 | # CONFIG_TINY_SHMEM is not set |
| @@ -120,6 +131,7 @@ CONFIG_BLOCK=y | |||
| 120 | # CONFIG_LBD is not set | 131 | # CONFIG_LBD is not set |
| 121 | # CONFIG_BLK_DEV_IO_TRACE is not set | 132 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 122 | # CONFIG_LSF is not set | 133 | # CONFIG_LSF is not set |
| 134 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 123 | 135 | ||
| 124 | # | 136 | # |
| 125 | # IO Schedulers | 137 | # IO Schedulers |
| @@ -138,33 +150,43 @@ CONFIG_CLASSIC_RCU=y | |||
| 138 | # | 150 | # |
| 139 | # Platform support | 151 | # Platform support |
| 140 | # | 152 | # |
| 141 | # CONFIG_PPC_MULTIPLATFORM is not set | 153 | CONFIG_PPC_MULTIPLATFORM=y |
| 142 | CONFIG_PPC_82xx=y | 154 | CONFIG_CLASSIC32=y |
| 143 | # CONFIG_PPC_83xx is not set | 155 | CONFIG_PPC_CHRP=y |
| 144 | # CONFIG_PPC_86xx is not set | 156 | # CONFIG_MPC5121_ADS is not set |
| 145 | # CONFIG_PPC_MPC512x is not set | 157 | # CONFIG_MPC5121_GENERIC is not set |
| 146 | # CONFIG_PPC_MPC5121 is not set | 158 | # CONFIG_PPC_MPC52xx is not set |
| 159 | CONFIG_PPC_PMAC=y | ||
| 147 | # CONFIG_PPC_CELL is not set | 160 | # CONFIG_PPC_CELL is not set |
| 148 | # CONFIG_PPC_CELL_NATIVE is not set | 161 | # CONFIG_PPC_CELL_NATIVE is not set |
| 162 | CONFIG_PPC_82xx=y | ||
| 149 | # CONFIG_MPC8272_ADS is not set | 163 | # CONFIG_MPC8272_ADS is not set |
| 150 | CONFIG_PQ2FADS=y | 164 | CONFIG_PQ2FADS=y |
| 151 | # CONFIG_EP8248E is not set | 165 | # CONFIG_EP8248E is not set |
| 152 | CONFIG_PQ2ADS=y | 166 | CONFIG_PQ2ADS=y |
| 153 | CONFIG_8260=y | 167 | CONFIG_8260=y |
| 154 | CONFIG_PQ2_ADS_PCI_PIC=y | 168 | CONFIG_PQ2_ADS_PCI_PIC=y |
| 169 | # CONFIG_PPC_83xx is not set | ||
| 170 | # CONFIG_PPC_86xx is not set | ||
| 171 | # CONFIG_EMBEDDED6xx is not set | ||
| 172 | CONFIG_PPC_NATIVE=y | ||
| 173 | # CONFIG_UDBG_RTAS_CONSOLE is not set | ||
| 155 | # CONFIG_IPIC is not set | 174 | # CONFIG_IPIC is not set |
| 156 | # CONFIG_MPIC is not set | 175 | CONFIG_MPIC=y |
| 157 | # CONFIG_MPIC_WEIRD is not set | 176 | # CONFIG_MPIC_WEIRD is not set |
| 158 | # CONFIG_PPC_I8259 is not set | 177 | CONFIG_PPC_I8259=y |
| 159 | # CONFIG_PPC_RTAS is not set | 178 | CONFIG_PPC_RTAS=y |
| 179 | # CONFIG_RTAS_ERROR_LOGGING is not set | ||
| 180 | CONFIG_RTAS_PROC=y | ||
| 160 | # CONFIG_MMIO_NVRAM is not set | 181 | # CONFIG_MMIO_NVRAM is not set |
| 161 | # CONFIG_PPC_MPC106 is not set | 182 | CONFIG_PPC_MPC106=y |
| 162 | # CONFIG_PPC_970_NAP is not set | 183 | # CONFIG_PPC_970_NAP is not set |
| 163 | # CONFIG_PPC_INDIRECT_IO is not set | 184 | # CONFIG_PPC_INDIRECT_IO is not set |
| 164 | # CONFIG_GENERIC_IOMAP is not set | 185 | # CONFIG_GENERIC_IOMAP is not set |
| 165 | # CONFIG_CPU_FREQ is not set | 186 | # CONFIG_CPU_FREQ is not set |
| 187 | # CONFIG_PPC601_SYNC_FIX is not set | ||
| 188 | # CONFIG_TAU is not set | ||
| 166 | CONFIG_CPM2=y | 189 | CONFIG_CPM2=y |
| 167 | CONFIG_PPC_CPM_NEW_BINDING=y | ||
| 168 | # CONFIG_FSL_ULI1575 is not set | 190 | # CONFIG_FSL_ULI1575 is not set |
| 169 | CONFIG_CPM=y | 191 | CONFIG_CPM=y |
| 170 | 192 | ||
| @@ -181,7 +203,7 @@ CONFIG_HZ_250=y | |||
| 181 | # CONFIG_HZ_300 is not set | 203 | # CONFIG_HZ_300 is not set |
| 182 | # CONFIG_HZ_1000 is not set | 204 | # CONFIG_HZ_1000 is not set |
| 183 | CONFIG_HZ=250 | 205 | CONFIG_HZ=250 |
| 184 | # CONFIG_SCHED_HRTICK is not set | 206 | CONFIG_SCHED_HRTICK=y |
| 185 | CONFIG_PREEMPT_NONE=y | 207 | CONFIG_PREEMPT_NONE=y |
| 186 | # CONFIG_PREEMPT_VOLUNTARY is not set | 208 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 187 | # CONFIG_PREEMPT is not set | 209 | # CONFIG_PREEMPT is not set |
| @@ -199,6 +221,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 199 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 221 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 200 | CONFIG_PAGEFLAGS_EXTENDED=y | 222 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 201 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 223 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 224 | CONFIG_MIGRATION=y | ||
| 202 | # CONFIG_RESOURCES_64BIT is not set | 225 | # CONFIG_RESOURCES_64BIT is not set |
| 203 | CONFIG_ZONE_DMA_FLAG=1 | 226 | CONFIG_ZONE_DMA_FLAG=1 |
| 204 | CONFIG_BOUNCE=y | 227 | CONFIG_BOUNCE=y |
| @@ -206,6 +229,7 @@ CONFIG_VIRT_TO_BUS=y | |||
| 206 | CONFIG_FORCE_MAX_ZONEORDER=11 | 229 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 207 | CONFIG_PROC_DEVICETREE=y | 230 | CONFIG_PROC_DEVICETREE=y |
| 208 | # CONFIG_CMDLINE_BOOL is not set | 231 | # CONFIG_CMDLINE_BOOL is not set |
| 232 | CONFIG_EXTRA_TARGETS="" | ||
| 209 | # CONFIG_PM is not set | 233 | # CONFIG_PM is not set |
| 210 | CONFIG_SECCOMP=y | 234 | CONFIG_SECCOMP=y |
| 211 | CONFIG_ISA_DMA_API=y | 235 | CONFIG_ISA_DMA_API=y |
| @@ -213,9 +237,11 @@ CONFIG_ISA_DMA_API=y | |||
| 213 | # | 237 | # |
| 214 | # Bus options | 238 | # Bus options |
| 215 | # | 239 | # |
| 240 | # CONFIG_ISA is not set | ||
| 216 | CONFIG_ZONE_DMA=y | 241 | CONFIG_ZONE_DMA=y |
| 217 | CONFIG_PPC_INDIRECT_PCI=y | 242 | CONFIG_PPC_INDIRECT_PCI=y |
| 218 | CONFIG_FSL_SOC=y | 243 | CONFIG_FSL_SOC=y |
| 244 | CONFIG_PPC_PCI_CHOICE=y | ||
| 219 | CONFIG_PCI=y | 245 | CONFIG_PCI=y |
| 220 | CONFIG_PCI_DOMAINS=y | 246 | CONFIG_PCI_DOMAINS=y |
| 221 | CONFIG_PCI_SYSCALL=y | 247 | CONFIG_PCI_SYSCALL=y |
| @@ -243,10 +269,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
| 243 | CONFIG_KERNEL_START=0xc0000000 | 269 | CONFIG_KERNEL_START=0xc0000000 |
| 244 | CONFIG_PHYSICAL_START=0x00000000 | 270 | CONFIG_PHYSICAL_START=0x00000000 |
| 245 | CONFIG_TASK_SIZE=0xc0000000 | 271 | CONFIG_TASK_SIZE=0xc0000000 |
| 246 | |||
| 247 | # | ||
| 248 | # Networking | ||
| 249 | # | ||
| 250 | CONFIG_NET=y | 272 | CONFIG_NET=y |
| 251 | 273 | ||
| 252 | # | 274 | # |
| @@ -447,9 +469,11 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
| 447 | # | 469 | # |
| 448 | # CONFIG_MTD_UBI is not set | 470 | # CONFIG_MTD_UBI is not set |
| 449 | CONFIG_OF_DEVICE=y | 471 | CONFIG_OF_DEVICE=y |
| 472 | CONFIG_OF_GPIO=y | ||
| 450 | # CONFIG_PARPORT is not set | 473 | # CONFIG_PARPORT is not set |
| 451 | CONFIG_BLK_DEV=y | 474 | CONFIG_BLK_DEV=y |
| 452 | # CONFIG_BLK_DEV_FD is not set | 475 | # CONFIG_BLK_DEV_FD is not set |
| 476 | # CONFIG_MAC_FLOPPY is not set | ||
| 453 | # CONFIG_BLK_CPQ_DA is not set | 477 | # CONFIG_BLK_CPQ_DA is not set |
| 454 | # CONFIG_BLK_CPQ_CISS_DA is not set | 478 | # CONFIG_BLK_CPQ_CISS_DA is not set |
| 455 | # CONFIG_BLK_DEV_DAC960 is not set | 479 | # CONFIG_BLK_DEV_DAC960 is not set |
| @@ -461,14 +485,15 @@ CONFIG_BLK_DEV_LOOP=y | |||
| 461 | # CONFIG_BLK_DEV_RAM is not set | 485 | # CONFIG_BLK_DEV_RAM is not set |
| 462 | # CONFIG_CDROM_PKTCDVD is not set | 486 | # CONFIG_CDROM_PKTCDVD is not set |
| 463 | # CONFIG_ATA_OVER_ETH is not set | 487 | # CONFIG_ATA_OVER_ETH is not set |
| 488 | # CONFIG_BLK_DEV_HD is not set | ||
| 464 | CONFIG_MISC_DEVICES=y | 489 | CONFIG_MISC_DEVICES=y |
| 465 | # CONFIG_PHANTOM is not set | 490 | # CONFIG_PHANTOM is not set |
| 466 | # CONFIG_EEPROM_93CX6 is not set | 491 | # CONFIG_EEPROM_93CX6 is not set |
| 467 | # CONFIG_SGI_IOC4 is not set | 492 | # CONFIG_SGI_IOC4 is not set |
| 468 | # CONFIG_ENCLOSURE_SERVICES is not set | 493 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 494 | # CONFIG_HP_ILO is not set | ||
| 469 | CONFIG_HAVE_IDE=y | 495 | CONFIG_HAVE_IDE=y |
| 470 | CONFIG_IDE=y | 496 | CONFIG_IDE=y |
| 471 | CONFIG_IDE_MAX_HWIFS=4 | ||
| 472 | CONFIG_BLK_DEV_IDE=y | 497 | CONFIG_BLK_DEV_IDE=y |
| 473 | 498 | ||
| 474 | # | 499 | # |
| @@ -486,7 +511,6 @@ CONFIG_IDE_PROC_FS=y | |||
| 486 | # | 511 | # |
| 487 | # IDE chipset support/bugfixes | 512 | # IDE chipset support/bugfixes |
| 488 | # | 513 | # |
| 489 | # CONFIG_IDE_GENERIC is not set | ||
| 490 | # CONFIG_BLK_DEV_PLATFORM is not set | 514 | # CONFIG_BLK_DEV_PLATFORM is not set |
| 491 | 515 | ||
| 492 | # | 516 | # |
| @@ -498,9 +522,7 @@ CONFIG_IDE_PROC_FS=y | |||
| 498 | # CONFIG_BLK_DEV_AMD74XX is not set | 522 | # CONFIG_BLK_DEV_AMD74XX is not set |
| 499 | # CONFIG_BLK_DEV_CMD64X is not set | 523 | # CONFIG_BLK_DEV_CMD64X is not set |
| 500 | # CONFIG_BLK_DEV_TRIFLEX is not set | 524 | # CONFIG_BLK_DEV_TRIFLEX is not set |
| 501 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
| 502 | # CONFIG_BLK_DEV_CS5530 is not set | 525 | # CONFIG_BLK_DEV_CS5530 is not set |
| 503 | # CONFIG_BLK_DEV_HPT34X is not set | ||
| 504 | # CONFIG_BLK_DEV_HPT366 is not set | 526 | # CONFIG_BLK_DEV_HPT366 is not set |
| 505 | # CONFIG_BLK_DEV_JMICRON is not set | 527 | # CONFIG_BLK_DEV_JMICRON is not set |
| 506 | # CONFIG_BLK_DEV_SC1200 is not set | 528 | # CONFIG_BLK_DEV_SC1200 is not set |
| @@ -517,9 +539,8 @@ CONFIG_IDE_PROC_FS=y | |||
| 517 | # CONFIG_BLK_DEV_TRM290 is not set | 539 | # CONFIG_BLK_DEV_TRM290 is not set |
| 518 | # CONFIG_BLK_DEV_VIA82CXXX is not set | 540 | # CONFIG_BLK_DEV_VIA82CXXX is not set |
| 519 | # CONFIG_BLK_DEV_TC86C001 is not set | 541 | # CONFIG_BLK_DEV_TC86C001 is not set |
| 542 | # CONFIG_BLK_DEV_IDE_PMAC is not set | ||
| 520 | # CONFIG_BLK_DEV_IDEDMA is not set | 543 | # CONFIG_BLK_DEV_IDEDMA is not set |
| 521 | # CONFIG_BLK_DEV_HD_ONLY is not set | ||
| 522 | # CONFIG_BLK_DEV_HD is not set | ||
| 523 | 544 | ||
| 524 | # | 545 | # |
| 525 | # SCSI device support | 546 | # SCSI device support |
| @@ -537,13 +558,12 @@ CONFIG_IDE_PROC_FS=y | |||
| 537 | # | 558 | # |
| 538 | 559 | ||
| 539 | # | 560 | # |
| 540 | # An alternative FireWire stack is available with EXPERIMENTAL=y | 561 | # A new alternative FireWire stack is available with EXPERIMENTAL=y |
| 541 | # | 562 | # |
| 542 | # CONFIG_IEEE1394 is not set | 563 | # CONFIG_IEEE1394 is not set |
| 543 | # CONFIG_I2O is not set | 564 | # CONFIG_I2O is not set |
| 544 | # CONFIG_MACINTOSH_DRIVERS is not set | 565 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 545 | CONFIG_NETDEVICES=y | 566 | CONFIG_NETDEVICES=y |
| 546 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 547 | # CONFIG_DUMMY is not set | 567 | # CONFIG_DUMMY is not set |
| 548 | # CONFIG_BONDING is not set | 568 | # CONFIG_BONDING is not set |
| 549 | # CONFIG_EQUALIZER is not set | 569 | # CONFIG_EQUALIZER is not set |
| @@ -567,8 +587,11 @@ CONFIG_DAVICOM_PHY=y | |||
| 567 | # CONFIG_REALTEK_PHY is not set | 587 | # CONFIG_REALTEK_PHY is not set |
| 568 | # CONFIG_FIXED_PHY is not set | 588 | # CONFIG_FIXED_PHY is not set |
| 569 | CONFIG_MDIO_BITBANG=y | 589 | CONFIG_MDIO_BITBANG=y |
| 590 | # CONFIG_MDIO_OF_GPIO is not set | ||
| 570 | CONFIG_NET_ETHERNET=y | 591 | CONFIG_NET_ETHERNET=y |
| 571 | CONFIG_MII=y | 592 | CONFIG_MII=y |
| 593 | # CONFIG_MACE is not set | ||
| 594 | # CONFIG_BMAC is not set | ||
| 572 | # CONFIG_HAPPYMEAL is not set | 595 | # CONFIG_HAPPYMEAL is not set |
| 573 | # CONFIG_SUNGEM is not set | 596 | # CONFIG_SUNGEM is not set |
| 574 | # CONFIG_CASSINI is not set | 597 | # CONFIG_CASSINI is not set |
| @@ -590,7 +613,6 @@ CONFIG_NETDEV_1000=y | |||
| 590 | # CONFIG_DL2K is not set | 613 | # CONFIG_DL2K is not set |
| 591 | # CONFIG_E1000 is not set | 614 | # CONFIG_E1000 is not set |
| 592 | # CONFIG_E1000E is not set | 615 | # CONFIG_E1000E is not set |
| 593 | # CONFIG_E1000E_ENABLED is not set | ||
| 594 | # CONFIG_IGB is not set | 616 | # CONFIG_IGB is not set |
| 595 | # CONFIG_NS83820 is not set | 617 | # CONFIG_NS83820 is not set |
| 596 | # CONFIG_HAMACHI is not set | 618 | # CONFIG_HAMACHI is not set |
| @@ -602,6 +624,7 @@ CONFIG_NETDEV_1000=y | |||
| 602 | # CONFIG_TIGON3 is not set | 624 | # CONFIG_TIGON3 is not set |
| 603 | # CONFIG_BNX2 is not set | 625 | # CONFIG_BNX2 is not set |
| 604 | # CONFIG_GIANFAR is not set | 626 | # CONFIG_GIANFAR is not set |
| 627 | # CONFIG_MV643XX_ETH is not set | ||
| 605 | # CONFIG_QLA3XXX is not set | 628 | # CONFIG_QLA3XXX is not set |
| 606 | CONFIG_NETDEV_10000=y | 629 | CONFIG_NETDEV_10000=y |
| 607 | # CONFIG_CHELSIO_T1 is not set | 630 | # CONFIG_CHELSIO_T1 is not set |
| @@ -667,6 +690,7 @@ CONFIG_KEYBOARD_ATKBD=y | |||
| 667 | # CONFIG_KEYBOARD_XTKBD is not set | 690 | # CONFIG_KEYBOARD_XTKBD is not set |
| 668 | # CONFIG_KEYBOARD_NEWTON is not set | 691 | # CONFIG_KEYBOARD_NEWTON is not set |
| 669 | # CONFIG_KEYBOARD_STOWAWAY is not set | 692 | # CONFIG_KEYBOARD_STOWAWAY is not set |
| 693 | # CONFIG_KEYBOARD_GPIO is not set | ||
| 670 | CONFIG_INPUT_MOUSE=y | 694 | CONFIG_INPUT_MOUSE=y |
| 671 | CONFIG_MOUSE_PS2=y | 695 | CONFIG_MOUSE_PS2=y |
| 672 | CONFIG_MOUSE_PS2_ALPS=y | 696 | CONFIG_MOUSE_PS2_ALPS=y |
| @@ -677,7 +701,9 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y | |||
| 677 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 701 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
| 678 | # CONFIG_MOUSE_SERIAL is not set | 702 | # CONFIG_MOUSE_SERIAL is not set |
| 679 | # CONFIG_MOUSE_APPLETOUCH is not set | 703 | # CONFIG_MOUSE_APPLETOUCH is not set |
| 704 | # CONFIG_MOUSE_BCM5974 is not set | ||
| 680 | # CONFIG_MOUSE_VSXXXAA is not set | 705 | # CONFIG_MOUSE_VSXXXAA is not set |
| 706 | # CONFIG_MOUSE_GPIO is not set | ||
| 681 | # CONFIG_INPUT_JOYSTICK is not set | 707 | # CONFIG_INPUT_JOYSTICK is not set |
| 682 | # CONFIG_INPUT_TABLET is not set | 708 | # CONFIG_INPUT_TABLET is not set |
| 683 | # CONFIG_INPUT_TOUCHSCREEN is not set | 709 | # CONFIG_INPUT_TOUCHSCREEN is not set |
| @@ -692,6 +718,7 @@ CONFIG_SERIO_SERPORT=y | |||
| 692 | # CONFIG_SERIO_PCIPS2 is not set | 718 | # CONFIG_SERIO_PCIPS2 is not set |
| 693 | CONFIG_SERIO_LIBPS2=y | 719 | CONFIG_SERIO_LIBPS2=y |
| 694 | # CONFIG_SERIO_RAW is not set | 720 | # CONFIG_SERIO_RAW is not set |
| 721 | # CONFIG_SERIO_XILINX_XPS_PS2 is not set | ||
| 695 | # CONFIG_GAMEPORT is not set | 722 | # CONFIG_GAMEPORT is not set |
| 696 | 723 | ||
| 697 | # | 724 | # |
| @@ -712,6 +739,7 @@ CONFIG_DEVKMEM=y | |||
| 712 | # CONFIG_SERIAL_UARTLITE is not set | 739 | # CONFIG_SERIAL_UARTLITE is not set |
| 713 | CONFIG_SERIAL_CORE=y | 740 | CONFIG_SERIAL_CORE=y |
| 714 | CONFIG_SERIAL_CORE_CONSOLE=y | 741 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 742 | # CONFIG_SERIAL_PMACZILOG is not set | ||
| 715 | CONFIG_SERIAL_CPM=y | 743 | CONFIG_SERIAL_CPM=y |
| 716 | CONFIG_SERIAL_CPM_CONSOLE=y | 744 | CONFIG_SERIAL_CPM_CONSOLE=y |
| 717 | CONFIG_SERIAL_CPM_SCC1=y | 745 | CONFIG_SERIAL_CPM_SCC1=y |
| @@ -724,6 +752,8 @@ CONFIG_SERIAL_CPM_SCC4=y | |||
| 724 | CONFIG_UNIX98_PTYS=y | 752 | CONFIG_UNIX98_PTYS=y |
| 725 | CONFIG_LEGACY_PTYS=y | 753 | CONFIG_LEGACY_PTYS=y |
| 726 | CONFIG_LEGACY_PTY_COUNT=256 | 754 | CONFIG_LEGACY_PTY_COUNT=256 |
| 755 | # CONFIG_BRIQ_PANEL is not set | ||
| 756 | # CONFIG_HVC_RTAS is not set | ||
| 727 | # CONFIG_IPMI_HANDLER is not set | 757 | # CONFIG_IPMI_HANDLER is not set |
| 728 | CONFIG_HW_RANDOM=y | 758 | CONFIG_HW_RANDOM=y |
| 729 | # CONFIG_NVRAM is not set | 759 | # CONFIG_NVRAM is not set |
| @@ -734,10 +764,28 @@ CONFIG_HW_RANDOM=y | |||
| 734 | CONFIG_DEVPORT=y | 764 | CONFIG_DEVPORT=y |
| 735 | # CONFIG_I2C is not set | 765 | # CONFIG_I2C is not set |
| 736 | # CONFIG_SPI is not set | 766 | # CONFIG_SPI is not set |
| 767 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 768 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | ||
| 769 | CONFIG_GPIOLIB=y | ||
| 770 | # CONFIG_DEBUG_GPIO is not set | ||
| 771 | |||
| 772 | # | ||
| 773 | # I2C GPIO expanders: | ||
| 774 | # | ||
| 775 | |||
| 776 | # | ||
| 777 | # PCI GPIO expanders: | ||
| 778 | # | ||
| 779 | # CONFIG_GPIO_BT8XX is not set | ||
| 780 | |||
| 781 | # | ||
| 782 | # SPI GPIO expanders: | ||
| 783 | # | ||
| 737 | # CONFIG_W1 is not set | 784 | # CONFIG_W1 is not set |
| 738 | # CONFIG_POWER_SUPPLY is not set | 785 | # CONFIG_POWER_SUPPLY is not set |
| 739 | # CONFIG_HWMON is not set | 786 | # CONFIG_HWMON is not set |
| 740 | # CONFIG_THERMAL is not set | 787 | # CONFIG_THERMAL is not set |
| 788 | # CONFIG_THERMAL_HWMON is not set | ||
| 741 | # CONFIG_WATCHDOG is not set | 789 | # CONFIG_WATCHDOG is not set |
| 742 | 790 | ||
| 743 | # | 791 | # |
| @@ -749,8 +797,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 749 | # | 797 | # |
| 750 | # Multifunction device drivers | 798 | # Multifunction device drivers |
| 751 | # | 799 | # |
| 800 | # CONFIG_MFD_CORE is not set | ||
| 752 | # CONFIG_MFD_SM501 is not set | 801 | # CONFIG_MFD_SM501 is not set |
| 753 | # CONFIG_HTC_PASIC3 is not set | 802 | # CONFIG_HTC_PASIC3 is not set |
| 803 | # CONFIG_MFD_TMIO is not set | ||
| 754 | 804 | ||
| 755 | # | 805 | # |
| 756 | # Multimedia devices | 806 | # Multimedia devices |
| @@ -782,10 +832,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
| 782 | # Display device support | 832 | # Display device support |
| 783 | # | 833 | # |
| 784 | # CONFIG_DISPLAY_SUPPORT is not set | 834 | # CONFIG_DISPLAY_SUPPORT is not set |
| 785 | |||
| 786 | # | ||
| 787 | # Sound | ||
| 788 | # | ||
| 789 | # CONFIG_SOUND is not set | 835 | # CONFIG_SOUND is not set |
| 790 | # CONFIG_HID_SUPPORT is not set | 836 | # CONFIG_HID_SUPPORT is not set |
| 791 | CONFIG_USB_SUPPORT=y | 837 | CONFIG_USB_SUPPORT=y |
| @@ -795,6 +841,8 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 795 | # CONFIG_USB is not set | 841 | # CONFIG_USB is not set |
| 796 | # CONFIG_USB_OTG_WHITELIST is not set | 842 | # CONFIG_USB_OTG_WHITELIST is not set |
| 797 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 843 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
| 844 | # CONFIG_USB_MUSB_HDRC is not set | ||
| 845 | # CONFIG_USB_GADGET_MUSB_HDRC is not set | ||
| 798 | 846 | ||
| 799 | # | 847 | # |
| 800 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 848 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -807,7 +855,7 @@ CONFIG_USB_GADGET_SELECTED=y | |||
| 807 | # CONFIG_USB_GADGET_ATMEL_USBA is not set | 855 | # CONFIG_USB_GADGET_ATMEL_USBA is not set |
| 808 | # CONFIG_USB_GADGET_FSL_USB2 is not set | 856 | # CONFIG_USB_GADGET_FSL_USB2 is not set |
| 809 | # CONFIG_USB_GADGET_NET2280 is not set | 857 | # CONFIG_USB_GADGET_NET2280 is not set |
| 810 | # CONFIG_USB_GADGET_PXA2XX is not set | 858 | # CONFIG_USB_GADGET_PXA25X is not set |
| 811 | CONFIG_USB_GADGET_M66592=y | 859 | CONFIG_USB_GADGET_M66592=y |
| 812 | CONFIG_USB_M66592=y | 860 | CONFIG_USB_M66592=y |
| 813 | # CONFIG_USB_GADGET_PXA27X is not set | 861 | # CONFIG_USB_GADGET_PXA27X is not set |
| @@ -826,6 +874,7 @@ CONFIG_USB_ETH_RNDIS=y | |||
| 826 | # CONFIG_USB_G_SERIAL is not set | 874 | # CONFIG_USB_G_SERIAL is not set |
| 827 | # CONFIG_USB_MIDI_GADGET is not set | 875 | # CONFIG_USB_MIDI_GADGET is not set |
| 828 | # CONFIG_USB_G_PRINTER is not set | 876 | # CONFIG_USB_G_PRINTER is not set |
| 877 | # CONFIG_USB_CDC_COMPOSITE is not set | ||
| 829 | # CONFIG_MMC is not set | 878 | # CONFIG_MMC is not set |
| 830 | # CONFIG_MEMSTICK is not set | 879 | # CONFIG_MEMSTICK is not set |
| 831 | # CONFIG_NEW_LEDS is not set | 880 | # CONFIG_NEW_LEDS is not set |
| @@ -893,6 +942,7 @@ CONFIG_TMPFS=y | |||
| 893 | CONFIG_CRAMFS=y | 942 | CONFIG_CRAMFS=y |
| 894 | # CONFIG_VXFS_FS is not set | 943 | # CONFIG_VXFS_FS is not set |
| 895 | # CONFIG_MINIX_FS is not set | 944 | # CONFIG_MINIX_FS is not set |
| 945 | # CONFIG_OMFS_FS is not set | ||
| 896 | # CONFIG_HPFS_FS is not set | 946 | # CONFIG_HPFS_FS is not set |
| 897 | # CONFIG_QNX4FS_FS is not set | 947 | # CONFIG_QNX4FS_FS is not set |
| 898 | # CONFIG_ROMFS_FS is not set | 948 | # CONFIG_ROMFS_FS is not set |
| @@ -902,8 +952,8 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 902 | CONFIG_NFS_FS=y | 952 | CONFIG_NFS_FS=y |
| 903 | CONFIG_NFS_V3=y | 953 | CONFIG_NFS_V3=y |
| 904 | CONFIG_NFS_V3_ACL=y | 954 | CONFIG_NFS_V3_ACL=y |
| 905 | # CONFIG_NFSD is not set | ||
| 906 | CONFIG_ROOT_NFS=y | 955 | CONFIG_ROOT_NFS=y |
| 956 | # CONFIG_NFSD is not set | ||
| 907 | CONFIG_LOCKD=y | 957 | CONFIG_LOCKD=y |
| 908 | CONFIG_LOCKD_V4=y | 958 | CONFIG_LOCKD_V4=y |
| 909 | CONFIG_NFS_ACL_SUPPORT=y | 959 | CONFIG_NFS_ACL_SUPPORT=y |
| @@ -983,6 +1033,7 @@ CONFIG_BITREVERSE=y | |||
| 983 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1033 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 984 | CONFIG_CRC_CCITT=y | 1034 | CONFIG_CRC_CCITT=y |
| 985 | # CONFIG_CRC16 is not set | 1035 | # CONFIG_CRC16 is not set |
| 1036 | # CONFIG_CRC_T10DIF is not set | ||
| 986 | # CONFIG_CRC_ITU_T is not set | 1037 | # CONFIG_CRC_ITU_T is not set |
| 987 | CONFIG_CRC32=y | 1038 | CONFIG_CRC32=y |
| 988 | # CONFIG_CRC7 is not set | 1039 | # CONFIG_CRC7 is not set |
| @@ -1009,6 +1060,8 @@ CONFIG_MAGIC_SYSRQ=y | |||
| 1009 | CONFIG_DEBUG_KERNEL=y | 1060 | CONFIG_DEBUG_KERNEL=y |
| 1010 | # CONFIG_DEBUG_SHIRQ is not set | 1061 | # CONFIG_DEBUG_SHIRQ is not set |
| 1011 | CONFIG_DETECT_SOFTLOCKUP=y | 1062 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1063 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 1064 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 1012 | # CONFIG_SCHED_DEBUG is not set | 1065 | # CONFIG_SCHED_DEBUG is not set |
| 1013 | # CONFIG_SCHEDSTATS is not set | 1066 | # CONFIG_SCHEDSTATS is not set |
| 1014 | # CONFIG_TIMER_STATS is not set | 1067 | # CONFIG_TIMER_STATS is not set |
| @@ -1026,19 +1079,31 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
| 1026 | CONFIG_DEBUG_INFO=y | 1079 | CONFIG_DEBUG_INFO=y |
| 1027 | # CONFIG_DEBUG_VM is not set | 1080 | # CONFIG_DEBUG_VM is not set |
| 1028 | # CONFIG_DEBUG_WRITECOUNT is not set | 1081 | # CONFIG_DEBUG_WRITECOUNT is not set |
| 1082 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 1029 | # CONFIG_DEBUG_LIST is not set | 1083 | # CONFIG_DEBUG_LIST is not set |
| 1030 | # CONFIG_DEBUG_SG is not set | 1084 | # CONFIG_DEBUG_SG is not set |
| 1031 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1085 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 1086 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 1032 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1087 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 1033 | # CONFIG_FAULT_INJECTION is not set | 1088 | # CONFIG_FAULT_INJECTION is not set |
| 1089 | # CONFIG_LATENCYTOP is not set | ||
| 1090 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1091 | CONFIG_HAVE_FTRACE=y | ||
| 1092 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1093 | # CONFIG_FTRACE is not set | ||
| 1094 | # CONFIG_SCHED_TRACER is not set | ||
| 1095 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1034 | # CONFIG_SAMPLES is not set | 1096 | # CONFIG_SAMPLES is not set |
| 1097 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1035 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1098 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
| 1036 | # CONFIG_DEBUG_STACK_USAGE is not set | 1099 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1037 | # CONFIG_DEBUG_PAGEALLOC is not set | 1100 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1038 | # CONFIG_DEBUGGER is not set | 1101 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
| 1039 | # CONFIG_KGDB_CONSOLE is not set | 1102 | # CONFIG_FTR_FIXUP_SELFTEST is not set |
| 1103 | # CONFIG_XMON is not set | ||
| 1040 | # CONFIG_IRQSTACKS is not set | 1104 | # CONFIG_IRQSTACKS is not set |
| 1041 | CONFIG_BDI_SWITCH=y | 1105 | CONFIG_BDI_SWITCH=y |
| 1106 | # CONFIG_BOOTX_TEXT is not set | ||
| 1042 | # CONFIG_PPC_EARLY_DEBUG is not set | 1107 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1043 | 1108 | ||
| 1044 | # | 1109 | # |
| @@ -1046,6 +1111,7 @@ CONFIG_BDI_SWITCH=y | |||
| 1046 | # | 1111 | # |
| 1047 | # CONFIG_KEYS is not set | 1112 | # CONFIG_KEYS is not set |
| 1048 | # CONFIG_SECURITY is not set | 1113 | # CONFIG_SECURITY is not set |
| 1114 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
| 1049 | CONFIG_CRYPTO=y | 1115 | CONFIG_CRYPTO=y |
| 1050 | 1116 | ||
| 1051 | # | 1117 | # |
| @@ -1086,6 +1152,10 @@ CONFIG_CRYPTO_PCBC=y | |||
| 1086 | # CONFIG_CRYPTO_MD4 is not set | 1152 | # CONFIG_CRYPTO_MD4 is not set |
| 1087 | CONFIG_CRYPTO_MD5=y | 1153 | CONFIG_CRYPTO_MD5=y |
| 1088 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1154 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 1155 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1156 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1157 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1158 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1089 | # CONFIG_CRYPTO_SHA1 is not set | 1159 | # CONFIG_CRYPTO_SHA1 is not set |
| 1090 | # CONFIG_CRYPTO_SHA256 is not set | 1160 | # CONFIG_CRYPTO_SHA256 is not set |
| 1091 | # CONFIG_CRYPTO_SHA512 is not set | 1161 | # CONFIG_CRYPTO_SHA512 is not set |
| @@ -1117,6 +1187,7 @@ CONFIG_CRYPTO_DES=y | |||
| 1117 | # CONFIG_CRYPTO_LZO is not set | 1187 | # CONFIG_CRYPTO_LZO is not set |
| 1118 | CONFIG_CRYPTO_HW=y | 1188 | CONFIG_CRYPTO_HW=y |
| 1119 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1189 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1120 | # CONFIG_PPC_CLOCK is not set | 1190 | # CONFIG_CRYPTO_DEV_TALITOS is not set |
| 1191 | CONFIG_PPC_CLOCK=y | ||
| 1121 | CONFIG_PPC_LIB_RHEAP=y | 1192 | CONFIG_PPC_LIB_RHEAP=y |
| 1122 | # CONFIG_VIRTUALIZATION is not set | 1193 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/prpmc2800_defconfig b/arch/powerpc/configs/prpmc2800_defconfig index c6b83577c055..01b54eac1ff6 100644 --- a/arch/powerpc/configs/prpmc2800_defconfig +++ b/arch/powerpc/configs/prpmc2800_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.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Mon Jun 9 08:52:18 2008 | 4 | # Thu Aug 21 00:52:14 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -34,6 +34,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 35 | CONFIG_IRQ_PER_CPU=y | 35 | CONFIG_IRQ_PER_CPU=y |
| 36 | CONFIG_STACKTRACE_SUPPORT=y | 36 | CONFIG_STACKTRACE_SUPPORT=y |
| 37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 37 | CONFIG_LOCKDEP_SUPPORT=y | 38 | CONFIG_LOCKDEP_SUPPORT=y |
| 38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 39 | CONFIG_ARCH_HAS_ILOG2_U32=y | 40 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| @@ -94,7 +95,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 94 | CONFIG_SYSCTL=y | 95 | CONFIG_SYSCTL=y |
| 95 | # CONFIG_EMBEDDED is not set | 96 | # CONFIG_EMBEDDED is not set |
| 96 | CONFIG_SYSCTL_SYSCALL=y | 97 | CONFIG_SYSCTL_SYSCALL=y |
| 97 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 98 | CONFIG_KALLSYMS=y | 98 | CONFIG_KALLSYMS=y |
| 99 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 99 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 100 | CONFIG_HOTPLUG=y | 100 | CONFIG_HOTPLUG=y |
| @@ -118,10 +118,16 @@ CONFIG_SLUB=y | |||
| 118 | # CONFIG_PROFILING is not set | 118 | # CONFIG_PROFILING is not set |
| 119 | # CONFIG_MARKERS is not set | 119 | # CONFIG_MARKERS is not set |
| 120 | CONFIG_HAVE_OPROFILE=y | 120 | CONFIG_HAVE_OPROFILE=y |
| 121 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 122 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 121 | CONFIG_HAVE_KPROBES=y | 123 | CONFIG_HAVE_KPROBES=y |
| 122 | CONFIG_HAVE_KRETPROBES=y | 124 | CONFIG_HAVE_KRETPROBES=y |
| 125 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 123 | # CONFIG_HAVE_DMA_ATTRS is not set | 126 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 127 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 128 | # CONFIG_HAVE_CLK is not set | ||
| 124 | CONFIG_PROC_PAGE_MONITOR=y | 129 | CONFIG_PROC_PAGE_MONITOR=y |
| 130 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 125 | CONFIG_SLABINFO=y | 131 | CONFIG_SLABINFO=y |
| 126 | CONFIG_RT_MUTEXES=y | 132 | CONFIG_RT_MUTEXES=y |
| 127 | # CONFIG_TINY_SHMEM is not set | 133 | # CONFIG_TINY_SHMEM is not set |
| @@ -132,6 +138,7 @@ CONFIG_LBD=y | |||
| 132 | # CONFIG_BLK_DEV_IO_TRACE is not set | 138 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 133 | # CONFIG_LSF is not set | 139 | # CONFIG_LSF is not set |
| 134 | # CONFIG_BLK_DEV_BSG is not set | 140 | # CONFIG_BLK_DEV_BSG is not set |
| 141 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 135 | 142 | ||
| 136 | # | 143 | # |
| 137 | # IO Schedulers | 144 | # IO Schedulers |
| @@ -151,25 +158,25 @@ CONFIG_CLASSIC_RCU=y | |||
| 151 | # Platform support | 158 | # Platform support |
| 152 | # | 159 | # |
| 153 | CONFIG_PPC_MULTIPLATFORM=y | 160 | CONFIG_PPC_MULTIPLATFORM=y |
| 154 | # CONFIG_PPC_82xx is not set | ||
| 155 | # CONFIG_PPC_83xx is not set | ||
| 156 | # CONFIG_PPC_86xx is not set | ||
| 157 | CONFIG_CLASSIC32=y | 161 | CONFIG_CLASSIC32=y |
| 158 | # CONFIG_PPC_CHRP is not set | 162 | # CONFIG_PPC_CHRP is not set |
| 159 | # CONFIG_PPC_MPC512x is not set | ||
| 160 | # CONFIG_PPC_MPC5121 is not set | ||
| 161 | # CONFIG_MPC5121_ADS is not set | 163 | # CONFIG_MPC5121_ADS is not set |
| 164 | # CONFIG_MPC5121_GENERIC is not set | ||
| 162 | # CONFIG_PPC_MPC52xx is not set | 165 | # CONFIG_PPC_MPC52xx is not set |
| 163 | # CONFIG_PPC_PMAC is not set | 166 | # CONFIG_PPC_PMAC is not set |
| 164 | # CONFIG_PPC_CELL is not set | 167 | # CONFIG_PPC_CELL is not set |
| 165 | # CONFIG_PPC_CELL_NATIVE is not set | 168 | # CONFIG_PPC_CELL_NATIVE is not set |
| 169 | # CONFIG_PPC_82xx is not set | ||
| 166 | # CONFIG_PQ2ADS is not set | 170 | # CONFIG_PQ2ADS is not set |
| 171 | # CONFIG_PPC_83xx is not set | ||
| 172 | # CONFIG_PPC_86xx is not set | ||
| 167 | CONFIG_EMBEDDED6xx=y | 173 | CONFIG_EMBEDDED6xx=y |
| 168 | # CONFIG_LINKSTATION is not set | 174 | # CONFIG_LINKSTATION is not set |
| 169 | # CONFIG_STORCENTER is not set | 175 | # CONFIG_STORCENTER is not set |
| 170 | # CONFIG_MPC7448HPC2 is not set | 176 | # CONFIG_MPC7448HPC2 is not set |
| 171 | # CONFIG_PPC_HOLLY is not set | 177 | # CONFIG_PPC_HOLLY is not set |
| 172 | CONFIG_PPC_PRPMC2800=y | 178 | CONFIG_PPC_PRPMC2800=y |
| 179 | # CONFIG_PPC_C2K is not set | ||
| 173 | CONFIG_MV64X60=y | 180 | CONFIG_MV64X60=y |
| 174 | # CONFIG_IPIC is not set | 181 | # CONFIG_IPIC is not set |
| 175 | # CONFIG_MPIC is not set | 182 | # CONFIG_MPIC is not set |
| @@ -198,7 +205,7 @@ CONFIG_HZ_250=y | |||
| 198 | # CONFIG_HZ_300 is not set | 205 | # CONFIG_HZ_300 is not set |
| 199 | # CONFIG_HZ_1000 is not set | 206 | # CONFIG_HZ_1000 is not set |
| 200 | CONFIG_HZ=250 | 207 | CONFIG_HZ=250 |
| 201 | # CONFIG_SCHED_HRTICK is not set | 208 | CONFIG_SCHED_HRTICK=y |
| 202 | CONFIG_PREEMPT_NONE=y | 209 | CONFIG_PREEMPT_NONE=y |
| 203 | # CONFIG_PREEMPT_VOLUNTARY is not set | 210 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 204 | # CONFIG_PREEMPT is not set | 211 | # CONFIG_PREEMPT is not set |
| @@ -221,6 +228,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 221 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 228 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 222 | CONFIG_PAGEFLAGS_EXTENDED=y | 229 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 223 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 230 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 231 | CONFIG_MIGRATION=y | ||
| 224 | # CONFIG_RESOURCES_64BIT is not set | 232 | # CONFIG_RESOURCES_64BIT is not set |
| 225 | CONFIG_ZONE_DMA_FLAG=1 | 233 | CONFIG_ZONE_DMA_FLAG=1 |
| 226 | CONFIG_BOUNCE=y | 234 | CONFIG_BOUNCE=y |
| @@ -228,6 +236,7 @@ CONFIG_VIRT_TO_BUS=y | |||
| 228 | CONFIG_FORCE_MAX_ZONEORDER=11 | 236 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 229 | CONFIG_PROC_DEVICETREE=y | 237 | CONFIG_PROC_DEVICETREE=y |
| 230 | # CONFIG_CMDLINE_BOOL is not set | 238 | # CONFIG_CMDLINE_BOOL is not set |
| 239 | CONFIG_EXTRA_TARGETS="" | ||
| 231 | # CONFIG_PM is not set | 240 | # CONFIG_PM is not set |
| 232 | # CONFIG_SECCOMP is not set | 241 | # CONFIG_SECCOMP is not set |
| 233 | CONFIG_ISA_DMA_API=y | 242 | CONFIG_ISA_DMA_API=y |
| @@ -264,10 +273,6 @@ CONFIG_PHYSICAL_START=0x00000000 | |||
| 264 | CONFIG_TASK_SIZE=0xc0000000 | 273 | CONFIG_TASK_SIZE=0xc0000000 |
| 265 | CONFIG_CONSISTENT_START=0xff100000 | 274 | CONFIG_CONSISTENT_START=0xff100000 |
| 266 | CONFIG_CONSISTENT_SIZE=0x00200000 | 275 | CONFIG_CONSISTENT_SIZE=0x00200000 |
| 267 | |||
| 268 | # | ||
| 269 | # Networking | ||
| 270 | # | ||
| 271 | CONFIG_NET=y | 276 | CONFIG_NET=y |
| 272 | 277 | ||
| 273 | # | 278 | # |
| @@ -359,7 +364,9 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 359 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 364 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
| 360 | CONFIG_STANDALONE=y | 365 | CONFIG_STANDALONE=y |
| 361 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 366 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 362 | # CONFIG_FW_LOADER is not set | 367 | CONFIG_FW_LOADER=y |
| 368 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
| 369 | CONFIG_EXTRA_FIRMWARE="" | ||
| 363 | # CONFIG_SYS_HYPERVISOR is not set | 370 | # CONFIG_SYS_HYPERVISOR is not set |
| 364 | # CONFIG_CONNECTOR is not set | 371 | # CONFIG_CONNECTOR is not set |
| 365 | CONFIG_MTD=y | 372 | CONFIG_MTD=y |
| @@ -461,12 +468,14 @@ CONFIG_BLK_DEV_RAM_SIZE=131072 | |||
| 461 | # CONFIG_BLK_DEV_XIP is not set | 468 | # CONFIG_BLK_DEV_XIP is not set |
| 462 | # CONFIG_CDROM_PKTCDVD is not set | 469 | # CONFIG_CDROM_PKTCDVD is not set |
| 463 | # CONFIG_ATA_OVER_ETH is not set | 470 | # CONFIG_ATA_OVER_ETH is not set |
| 471 | # CONFIG_BLK_DEV_HD is not set | ||
| 464 | CONFIG_MISC_DEVICES=y | 472 | CONFIG_MISC_DEVICES=y |
| 465 | # CONFIG_PHANTOM is not set | 473 | # CONFIG_PHANTOM is not set |
| 466 | # CONFIG_EEPROM_93CX6 is not set | 474 | # CONFIG_EEPROM_93CX6 is not set |
| 467 | # CONFIG_SGI_IOC4 is not set | 475 | # CONFIG_SGI_IOC4 is not set |
| 468 | # CONFIG_TIFM_CORE is not set | 476 | # CONFIG_TIFM_CORE is not set |
| 469 | # CONFIG_ENCLOSURE_SERVICES is not set | 477 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 478 | # CONFIG_HP_ILO is not set | ||
| 470 | CONFIG_HAVE_IDE=y | 479 | CONFIG_HAVE_IDE=y |
| 471 | CONFIG_IDE=y | 480 | CONFIG_IDE=y |
| 472 | CONFIG_BLK_DEV_IDE=y | 481 | CONFIG_BLK_DEV_IDE=y |
| @@ -487,7 +496,6 @@ CONFIG_IDE_PROC_FS=y | |||
| 487 | # | 496 | # |
| 488 | # IDE chipset support/bugfixes | 497 | # IDE chipset support/bugfixes |
| 489 | # | 498 | # |
| 490 | CONFIG_IDE_GENERIC=y | ||
| 491 | # CONFIG_BLK_DEV_PLATFORM is not set | 499 | # CONFIG_BLK_DEV_PLATFORM is not set |
| 492 | CONFIG_BLK_DEV_IDEDMA_SFF=y | 500 | CONFIG_BLK_DEV_IDEDMA_SFF=y |
| 493 | 501 | ||
| @@ -505,10 +513,8 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
| 505 | # CONFIG_BLK_DEV_AMD74XX is not set | 513 | # CONFIG_BLK_DEV_AMD74XX is not set |
| 506 | # CONFIG_BLK_DEV_CMD64X is not set | 514 | # CONFIG_BLK_DEV_CMD64X is not set |
| 507 | # CONFIG_BLK_DEV_TRIFLEX is not set | 515 | # CONFIG_BLK_DEV_TRIFLEX is not set |
| 508 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
| 509 | # CONFIG_BLK_DEV_CS5520 is not set | 516 | # CONFIG_BLK_DEV_CS5520 is not set |
| 510 | # CONFIG_BLK_DEV_CS5530 is not set | 517 | # CONFIG_BLK_DEV_CS5530 is not set |
| 511 | # CONFIG_BLK_DEV_HPT34X is not set | ||
| 512 | # CONFIG_BLK_DEV_HPT366 is not set | 518 | # CONFIG_BLK_DEV_HPT366 is not set |
| 513 | # CONFIG_BLK_DEV_JMICRON is not set | 519 | # CONFIG_BLK_DEV_JMICRON is not set |
| 514 | # CONFIG_BLK_DEV_SC1200 is not set | 520 | # CONFIG_BLK_DEV_SC1200 is not set |
| @@ -526,8 +532,6 @@ CONFIG_BLK_DEV_PDC202XX_NEW=y | |||
| 526 | # CONFIG_BLK_DEV_VIA82CXXX is not set | 532 | # CONFIG_BLK_DEV_VIA82CXXX is not set |
| 527 | # CONFIG_BLK_DEV_TC86C001 is not set | 533 | # CONFIG_BLK_DEV_TC86C001 is not set |
| 528 | CONFIG_BLK_DEV_IDEDMA=y | 534 | CONFIG_BLK_DEV_IDEDMA=y |
| 529 | # CONFIG_BLK_DEV_HD_ONLY is not set | ||
| 530 | # CONFIG_BLK_DEV_HD is not set | ||
| 531 | 535 | ||
| 532 | # | 536 | # |
| 533 | # SCSI device support | 537 | # SCSI device support |
| @@ -603,6 +607,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 603 | # CONFIG_SCSI_NSP32 is not set | 607 | # CONFIG_SCSI_NSP32 is not set |
| 604 | # CONFIG_SCSI_DEBUG is not set | 608 | # CONFIG_SCSI_DEBUG is not set |
| 605 | # CONFIG_SCSI_SRP is not set | 609 | # CONFIG_SCSI_SRP is not set |
| 610 | # CONFIG_SCSI_DH is not set | ||
| 606 | CONFIG_ATA=y | 611 | CONFIG_ATA=y |
| 607 | # CONFIG_ATA_NONSTANDARD is not set | 612 | # CONFIG_ATA_NONSTANDARD is not set |
| 608 | CONFIG_SATA_PMP=y | 613 | CONFIG_SATA_PMP=y |
| @@ -669,6 +674,10 @@ CONFIG_SATA_MV=y | |||
| 669 | # | 674 | # |
| 670 | # IEEE 1394 (FireWire) support | 675 | # IEEE 1394 (FireWire) support |
| 671 | # | 676 | # |
| 677 | |||
| 678 | # | ||
| 679 | # Enable only one of the two stacks, unless you know what you are doing | ||
| 680 | # | ||
| 672 | # CONFIG_FIREWIRE is not set | 681 | # CONFIG_FIREWIRE is not set |
| 673 | # CONFIG_IEEE1394 is not set | 682 | # CONFIG_IEEE1394 is not set |
| 674 | # CONFIG_I2O is not set | 683 | # CONFIG_I2O is not set |
| @@ -676,7 +685,6 @@ CONFIG_MACINTOSH_DRIVERS=y | |||
| 676 | # CONFIG_MAC_EMUMOUSEBTN is not set | 685 | # CONFIG_MAC_EMUMOUSEBTN is not set |
| 677 | # CONFIG_WINDFARM is not set | 686 | # CONFIG_WINDFARM is not set |
| 678 | CONFIG_NETDEVICES=y | 687 | CONFIG_NETDEVICES=y |
| 679 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 680 | # CONFIG_DUMMY is not set | 688 | # CONFIG_DUMMY is not set |
| 681 | # CONFIG_BONDING is not set | 689 | # CONFIG_BONDING is not set |
| 682 | # CONFIG_MACVLAN is not set | 690 | # CONFIG_MACVLAN is not set |
| @@ -741,10 +749,8 @@ CONFIG_NETDEV_1000=y | |||
| 741 | # CONFIG_ACENIC is not set | 749 | # CONFIG_ACENIC is not set |
| 742 | # CONFIG_DL2K is not set | 750 | # CONFIG_DL2K is not set |
| 743 | CONFIG_E1000=y | 751 | CONFIG_E1000=y |
| 744 | # CONFIG_E1000_NAPI is not set | ||
| 745 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | 752 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set |
| 746 | # CONFIG_E1000E is not set | 753 | # CONFIG_E1000E is not set |
| 747 | # CONFIG_E1000E_ENABLED is not set | ||
| 748 | # CONFIG_IP1000 is not set | 754 | # CONFIG_IP1000 is not set |
| 749 | # CONFIG_IGB is not set | 755 | # CONFIG_IGB is not set |
| 750 | # CONFIG_NS83820 is not set | 756 | # CONFIG_NS83820 is not set |
| @@ -760,6 +766,7 @@ CONFIG_E1000=y | |||
| 760 | CONFIG_MV643XX_ETH=y | 766 | CONFIG_MV643XX_ETH=y |
| 761 | # CONFIG_QLA3XXX is not set | 767 | # CONFIG_QLA3XXX is not set |
| 762 | # CONFIG_ATL1 is not set | 768 | # CONFIG_ATL1 is not set |
| 769 | # CONFIG_ATL1E is not set | ||
| 763 | CONFIG_NETDEV_10000=y | 770 | CONFIG_NETDEV_10000=y |
| 764 | # CONFIG_CHELSIO_T1 is not set | 771 | # CONFIG_CHELSIO_T1 is not set |
| 765 | # CONFIG_CHELSIO_T3 is not set | 772 | # CONFIG_CHELSIO_T3 is not set |
| @@ -840,6 +847,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | |||
| 840 | # Character devices | 847 | # Character devices |
| 841 | # | 848 | # |
| 842 | CONFIG_VT=y | 849 | CONFIG_VT=y |
| 850 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 843 | CONFIG_VT_CONSOLE=y | 851 | CONFIG_VT_CONSOLE=y |
| 844 | CONFIG_HW_CONSOLE=y | 852 | CONFIG_HW_CONSOLE=y |
| 845 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 853 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| @@ -875,43 +883,64 @@ CONFIG_DEVPORT=y | |||
| 875 | CONFIG_I2C=y | 883 | CONFIG_I2C=y |
| 876 | CONFIG_I2C_BOARDINFO=y | 884 | CONFIG_I2C_BOARDINFO=y |
| 877 | CONFIG_I2C_CHARDEV=y | 885 | CONFIG_I2C_CHARDEV=y |
| 886 | CONFIG_I2C_HELPER_AUTO=y | ||
| 878 | 887 | ||
| 879 | # | 888 | # |
| 880 | # I2C Hardware Bus support | 889 | # I2C Hardware Bus support |
| 881 | # | 890 | # |
| 891 | |||
| 892 | # | ||
| 893 | # PC SMBus host controller drivers | ||
| 894 | # | ||
| 882 | # CONFIG_I2C_ALI1535 is not set | 895 | # CONFIG_I2C_ALI1535 is not set |
| 883 | # CONFIG_I2C_ALI1563 is not set | 896 | # CONFIG_I2C_ALI1563 is not set |
| 884 | # CONFIG_I2C_ALI15X3 is not set | 897 | # CONFIG_I2C_ALI15X3 is not set |
| 885 | # CONFIG_I2C_AMD756 is not set | 898 | # CONFIG_I2C_AMD756 is not set |
| 886 | # CONFIG_I2C_AMD8111 is not set | 899 | # CONFIG_I2C_AMD8111 is not set |
| 887 | # CONFIG_I2C_I801 is not set | 900 | # CONFIG_I2C_I801 is not set |
| 888 | # CONFIG_I2C_I810 is not set | 901 | # CONFIG_I2C_ISCH is not set |
| 889 | # CONFIG_I2C_PIIX4 is not set | 902 | # CONFIG_I2C_PIIX4 is not set |
| 890 | # CONFIG_I2C_MPC is not set | ||
| 891 | # CONFIG_I2C_NFORCE2 is not set | 903 | # CONFIG_I2C_NFORCE2 is not set |
| 892 | # CONFIG_I2C_OCORES is not set | ||
| 893 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 894 | # CONFIG_I2C_PROSAVAGE is not set | ||
| 895 | # CONFIG_I2C_SAVAGE4 is not set | ||
| 896 | # CONFIG_I2C_SIMTEC is not set | ||
| 897 | # CONFIG_I2C_SIS5595 is not set | 904 | # CONFIG_I2C_SIS5595 is not set |
| 898 | # CONFIG_I2C_SIS630 is not set | 905 | # CONFIG_I2C_SIS630 is not set |
| 899 | # CONFIG_I2C_SIS96X is not set | 906 | # CONFIG_I2C_SIS96X is not set |
| 900 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 901 | # CONFIG_I2C_TINY_USB is not set | ||
| 902 | # CONFIG_I2C_VIA is not set | 907 | # CONFIG_I2C_VIA is not set |
| 903 | # CONFIG_I2C_VIAPRO is not set | 908 | # CONFIG_I2C_VIAPRO is not set |
| 909 | |||
| 910 | # | ||
| 911 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 912 | # | ||
| 913 | # CONFIG_I2C_MPC is not set | ||
| 914 | CONFIG_I2C_MV64XXX=y | ||
| 915 | # CONFIG_I2C_OCORES is not set | ||
| 916 | # CONFIG_I2C_SIMTEC is not set | ||
| 917 | |||
| 918 | # | ||
| 919 | # External I2C/SMBus adapter drivers | ||
| 920 | # | ||
| 921 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 922 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 923 | # CONFIG_I2C_TINY_USB is not set | ||
| 924 | |||
| 925 | # | ||
| 926 | # Graphics adapter I2C/DDC channel drivers | ||
| 927 | # | ||
| 904 | # CONFIG_I2C_VOODOO3 is not set | 928 | # CONFIG_I2C_VOODOO3 is not set |
| 929 | |||
| 930 | # | ||
| 931 | # Other I2C/SMBus bus drivers | ||
| 932 | # | ||
| 905 | # CONFIG_I2C_PCA_PLATFORM is not set | 933 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 906 | CONFIG_I2C_MV64XXX=y | ||
| 907 | 934 | ||
| 908 | # | 935 | # |
| 909 | # Miscellaneous I2C Chip support | 936 | # Miscellaneous I2C Chip support |
| 910 | # | 937 | # |
| 911 | # CONFIG_DS1682 is not set | 938 | # CONFIG_DS1682 is not set |
| 939 | # CONFIG_AT24 is not set | ||
| 912 | # CONFIG_SENSORS_EEPROM is not set | 940 | # CONFIG_SENSORS_EEPROM is not set |
| 913 | # CONFIG_SENSORS_PCF8574 is not set | 941 | # CONFIG_SENSORS_PCF8574 is not set |
| 914 | # CONFIG_PCF8575 is not set | 942 | # CONFIG_PCF8575 is not set |
| 943 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 915 | # CONFIG_SENSORS_PCF8591 is not set | 944 | # CONFIG_SENSORS_PCF8591 is not set |
| 916 | # CONFIG_SENSORS_MAX6875 is not set | 945 | # CONFIG_SENSORS_MAX6875 is not set |
| 917 | # CONFIG_SENSORS_TSL2550 is not set | 946 | # CONFIG_SENSORS_TSL2550 is not set |
| @@ -920,10 +949,13 @@ CONFIG_I2C_MV64XXX=y | |||
| 920 | # CONFIG_I2C_DEBUG_BUS is not set | 949 | # CONFIG_I2C_DEBUG_BUS is not set |
| 921 | # CONFIG_I2C_DEBUG_CHIP is not set | 950 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 922 | # CONFIG_SPI is not set | 951 | # CONFIG_SPI is not set |
| 952 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 953 | # CONFIG_GPIOLIB is not set | ||
| 923 | # CONFIG_W1 is not set | 954 | # CONFIG_W1 is not set |
| 924 | # CONFIG_POWER_SUPPLY is not set | 955 | # CONFIG_POWER_SUPPLY is not set |
| 925 | CONFIG_HWMON=y | 956 | CONFIG_HWMON=y |
| 926 | # CONFIG_HWMON_VID is not set | 957 | # CONFIG_HWMON_VID is not set |
| 958 | # CONFIG_SENSORS_AD7414 is not set | ||
| 927 | # CONFIG_SENSORS_AD7418 is not set | 959 | # CONFIG_SENSORS_AD7418 is not set |
| 928 | # CONFIG_SENSORS_ADM1021 is not set | 960 | # CONFIG_SENSORS_ADM1021 is not set |
| 929 | # CONFIG_SENSORS_ADM1025 is not set | 961 | # CONFIG_SENSORS_ADM1025 is not set |
| @@ -977,6 +1009,7 @@ CONFIG_HWMON=y | |||
| 977 | # CONFIG_SENSORS_W83627EHF is not set | 1009 | # CONFIG_SENSORS_W83627EHF is not set |
| 978 | # CONFIG_HWMON_DEBUG_CHIP is not set | 1010 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 979 | # CONFIG_THERMAL is not set | 1011 | # CONFIG_THERMAL is not set |
| 1012 | # CONFIG_THERMAL_HWMON is not set | ||
| 980 | # CONFIG_WATCHDOG is not set | 1013 | # CONFIG_WATCHDOG is not set |
| 981 | 1014 | ||
| 982 | # | 1015 | # |
| @@ -988,8 +1021,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 988 | # | 1021 | # |
| 989 | # Multifunction device drivers | 1022 | # Multifunction device drivers |
| 990 | # | 1023 | # |
| 1024 | # CONFIG_MFD_CORE is not set | ||
| 991 | # CONFIG_MFD_SM501 is not set | 1025 | # CONFIG_MFD_SM501 is not set |
| 992 | # CONFIG_HTC_PASIC3 is not set | 1026 | # CONFIG_HTC_PASIC3 is not set |
| 1027 | # CONFIG_MFD_TMIO is not set | ||
| 993 | 1028 | ||
| 994 | # | 1029 | # |
| 995 | # Multimedia devices | 1030 | # Multimedia devices |
| @@ -1028,10 +1063,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
| 1028 | CONFIG_VGA_CONSOLE=y | 1063 | CONFIG_VGA_CONSOLE=y |
| 1029 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set | 1064 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set |
| 1030 | CONFIG_DUMMY_CONSOLE=y | 1065 | CONFIG_DUMMY_CONSOLE=y |
| 1031 | |||
| 1032 | # | ||
| 1033 | # Sound | ||
| 1034 | # | ||
| 1035 | # CONFIG_SOUND is not set | 1066 | # CONFIG_SOUND is not set |
| 1036 | CONFIG_HID_SUPPORT=y | 1067 | CONFIG_HID_SUPPORT=y |
| 1037 | CONFIG_HID=y | 1068 | CONFIG_HID=y |
| @@ -1060,6 +1091,7 @@ CONFIG_USB_DEVICEFS=y | |||
| 1060 | # CONFIG_USB_DEVICE_CLASS is not set | 1091 | # CONFIG_USB_DEVICE_CLASS is not set |
| 1061 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1092 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 1062 | # CONFIG_USB_OTG is not set | 1093 | # CONFIG_USB_OTG is not set |
| 1094 | CONFIG_USB_MON=y | ||
| 1063 | 1095 | ||
| 1064 | # | 1096 | # |
| 1065 | # USB Host Controller Drivers | 1097 | # USB Host Controller Drivers |
| @@ -1102,7 +1134,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 1102 | # | 1134 | # |
| 1103 | # CONFIG_USB_MDC800 is not set | 1135 | # CONFIG_USB_MDC800 is not set |
| 1104 | # CONFIG_USB_MICROTEK is not set | 1136 | # CONFIG_USB_MICROTEK is not set |
| 1105 | CONFIG_USB_MON=y | ||
| 1106 | 1137 | ||
| 1107 | # | 1138 | # |
| 1108 | # USB port drivers | 1139 | # USB port drivers |
| @@ -1115,7 +1146,6 @@ CONFIG_USB_MON=y | |||
| 1115 | # CONFIG_USB_EMI62 is not set | 1146 | # CONFIG_USB_EMI62 is not set |
| 1116 | # CONFIG_USB_EMI26 is not set | 1147 | # CONFIG_USB_EMI26 is not set |
| 1117 | # CONFIG_USB_ADUTUX is not set | 1148 | # CONFIG_USB_ADUTUX is not set |
| 1118 | # CONFIG_USB_AUERSWALD is not set | ||
| 1119 | # CONFIG_USB_RIO500 is not set | 1149 | # CONFIG_USB_RIO500 is not set |
| 1120 | # CONFIG_USB_LEGOTOWER is not set | 1150 | # CONFIG_USB_LEGOTOWER is not set |
| 1121 | # CONFIG_USB_LCD is not set | 1151 | # CONFIG_USB_LCD is not set |
| @@ -1169,6 +1199,7 @@ CONFIG_RTC_DRV_MAX6900=y | |||
| 1169 | # CONFIG_RTC_DRV_PCF8583 is not set | 1199 | # CONFIG_RTC_DRV_PCF8583 is not set |
| 1170 | # CONFIG_RTC_DRV_M41T80 is not set | 1200 | # CONFIG_RTC_DRV_M41T80 is not set |
| 1171 | # CONFIG_RTC_DRV_S35390A is not set | 1201 | # CONFIG_RTC_DRV_S35390A is not set |
| 1202 | # CONFIG_RTC_DRV_FM3130 is not set | ||
| 1172 | 1203 | ||
| 1173 | # | 1204 | # |
| 1174 | # SPI RTC drivers | 1205 | # SPI RTC drivers |
| @@ -1258,6 +1289,7 @@ CONFIG_TMPFS=y | |||
| 1258 | # CONFIG_CRAMFS is not set | 1289 | # CONFIG_CRAMFS is not set |
| 1259 | # CONFIG_VXFS_FS is not set | 1290 | # CONFIG_VXFS_FS is not set |
| 1260 | # CONFIG_MINIX_FS is not set | 1291 | # CONFIG_MINIX_FS is not set |
| 1292 | # CONFIG_OMFS_FS is not set | ||
| 1261 | # CONFIG_HPFS_FS is not set | 1293 | # CONFIG_HPFS_FS is not set |
| 1262 | # CONFIG_QNX4FS_FS is not set | 1294 | # CONFIG_QNX4FS_FS is not set |
| 1263 | # CONFIG_ROMFS_FS is not set | 1295 | # CONFIG_ROMFS_FS is not set |
| @@ -1267,12 +1299,11 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 1267 | CONFIG_NFS_FS=y | 1299 | CONFIG_NFS_FS=y |
| 1268 | # CONFIG_NFS_V3 is not set | 1300 | # CONFIG_NFS_V3 is not set |
| 1269 | # CONFIG_NFS_V4 is not set | 1301 | # CONFIG_NFS_V4 is not set |
| 1270 | # CONFIG_NFSD is not set | ||
| 1271 | CONFIG_ROOT_NFS=y | 1302 | CONFIG_ROOT_NFS=y |
| 1303 | # CONFIG_NFSD is not set | ||
| 1272 | CONFIG_LOCKD=y | 1304 | CONFIG_LOCKD=y |
| 1273 | CONFIG_NFS_COMMON=y | 1305 | CONFIG_NFS_COMMON=y |
| 1274 | CONFIG_SUNRPC=y | 1306 | CONFIG_SUNRPC=y |
| 1275 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 1276 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1307 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 1277 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1308 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1278 | # CONFIG_SMB_FS is not set | 1309 | # CONFIG_SMB_FS is not set |
| @@ -1312,6 +1343,7 @@ CONFIG_BITREVERSE=y | |||
| 1312 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1343 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 1313 | # CONFIG_CRC_CCITT is not set | 1344 | # CONFIG_CRC_CCITT is not set |
| 1314 | # CONFIG_CRC16 is not set | 1345 | # CONFIG_CRC16 is not set |
| 1346 | CONFIG_CRC_T10DIF=y | ||
| 1315 | # CONFIG_CRC_ITU_T is not set | 1347 | # CONFIG_CRC_ITU_T is not set |
| 1316 | CONFIG_CRC32=y | 1348 | CONFIG_CRC32=y |
| 1317 | # CONFIG_CRC7 is not set | 1349 | # CONFIG_CRC7 is not set |
| @@ -1337,7 +1369,16 @@ CONFIG_FRAME_WARN=1024 | |||
| 1337 | # CONFIG_SLUB_DEBUG_ON is not set | 1369 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1338 | # CONFIG_SLUB_STATS is not set | 1370 | # CONFIG_SLUB_STATS is not set |
| 1339 | CONFIG_DEBUG_BUGVERBOSE=y | 1371 | CONFIG_DEBUG_BUGVERBOSE=y |
| 1372 | CONFIG_DEBUG_MEMORY_INIT=y | ||
| 1373 | # CONFIG_LATENCYTOP is not set | ||
| 1374 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1375 | CONFIG_HAVE_FTRACE=y | ||
| 1376 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1377 | # CONFIG_FTRACE is not set | ||
| 1378 | # CONFIG_SCHED_TRACER is not set | ||
| 1379 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1340 | # CONFIG_SAMPLES is not set | 1380 | # CONFIG_SAMPLES is not set |
| 1381 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1341 | # CONFIG_IRQSTACKS is not set | 1382 | # CONFIG_IRQSTACKS is not set |
| 1342 | # CONFIG_BOOTX_TEXT is not set | 1383 | # CONFIG_BOOTX_TEXT is not set |
| 1343 | # CONFIG_PPC_EARLY_DEBUG is not set | 1384 | # CONFIG_PPC_EARLY_DEBUG is not set |
| @@ -1390,6 +1431,10 @@ CONFIG_CRYPTO=y | |||
| 1390 | # CONFIG_CRYPTO_MD4 is not set | 1431 | # CONFIG_CRYPTO_MD4 is not set |
| 1391 | # CONFIG_CRYPTO_MD5 is not set | 1432 | # CONFIG_CRYPTO_MD5 is not set |
| 1392 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1433 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 1434 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1435 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1436 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1437 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1393 | # CONFIG_CRYPTO_SHA1 is not set | 1438 | # CONFIG_CRYPTO_SHA1 is not set |
| 1394 | # CONFIG_CRYPTO_SHA256 is not set | 1439 | # CONFIG_CRYPTO_SHA256 is not set |
| 1395 | # CONFIG_CRYPTO_SHA512 is not set | 1440 | # CONFIG_CRYPTO_SHA512 is not set |
diff --git a/arch/powerpc/configs/ps3_defconfig b/arch/powerpc/configs/ps3_defconfig index f9a3d3b394cf..b6eee7c93cdd 100644 --- a/arch/powerpc/configs/ps3_defconfig +++ b/arch/powerpc/configs/ps3_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.26 | 3 | # Linux kernel version: 2.6.27-rc3 |
| 4 | # Wed Jul 16 13:59:24 2008 | 4 | # Wed Aug 20 08:16:53 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
| 7 | 7 | ||
| @@ -92,7 +92,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y | |||
| 92 | CONFIG_SYSCTL=y | 92 | CONFIG_SYSCTL=y |
| 93 | # CONFIG_EMBEDDED is not set | 93 | # CONFIG_EMBEDDED is not set |
| 94 | CONFIG_SYSCTL_SYSCALL=y | 94 | CONFIG_SYSCTL_SYSCALL=y |
| 95 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 96 | CONFIG_KALLSYMS=y | 95 | CONFIG_KALLSYMS=y |
| 97 | CONFIG_KALLSYMS_ALL=y | 96 | CONFIG_KALLSYMS_ALL=y |
| 98 | CONFIG_KALLSYMS_EXTRA_PASS=y | 97 | CONFIG_KALLSYMS_EXTRA_PASS=y |
| @@ -118,11 +117,16 @@ CONFIG_PROFILING=y | |||
| 118 | CONFIG_OPROFILE=m | 117 | CONFIG_OPROFILE=m |
| 119 | CONFIG_HAVE_OPROFILE=y | 118 | CONFIG_HAVE_OPROFILE=y |
| 120 | # CONFIG_KPROBES is not set | 119 | # CONFIG_KPROBES is not set |
| 120 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 121 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 121 | CONFIG_HAVE_KPROBES=y | 122 | CONFIG_HAVE_KPROBES=y |
| 122 | CONFIG_HAVE_KRETPROBES=y | 123 | CONFIG_HAVE_KRETPROBES=y |
| 124 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 123 | CONFIG_HAVE_DMA_ATTRS=y | 125 | CONFIG_HAVE_DMA_ATTRS=y |
| 124 | CONFIG_USE_GENERIC_SMP_HELPERS=y | 126 | CONFIG_USE_GENERIC_SMP_HELPERS=y |
| 127 | # CONFIG_HAVE_CLK is not set | ||
| 125 | CONFIG_PROC_PAGE_MONITOR=y | 128 | CONFIG_PROC_PAGE_MONITOR=y |
| 129 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 126 | CONFIG_SLABINFO=y | 130 | CONFIG_SLABINFO=y |
| 127 | CONFIG_RT_MUTEXES=y | 131 | CONFIG_RT_MUTEXES=y |
| 128 | # CONFIG_TINY_SHMEM is not set | 132 | # CONFIG_TINY_SHMEM is not set |
| @@ -179,6 +183,7 @@ CONFIG_PS3_STORAGE=y | |||
| 179 | CONFIG_PS3_DISK=y | 183 | CONFIG_PS3_DISK=y |
| 180 | CONFIG_PS3_ROM=y | 184 | CONFIG_PS3_ROM=y |
| 181 | CONFIG_PS3_FLASH=y | 185 | CONFIG_PS3_FLASH=y |
| 186 | CONFIG_OPROFILE_PS3=y | ||
| 182 | CONFIG_PS3_LPM=m | 187 | CONFIG_PS3_LPM=m |
| 183 | CONFIG_PPC_CELL=y | 188 | CONFIG_PPC_CELL=y |
| 184 | # CONFIG_PPC_CELL_NATIVE is not set | 189 | # CONFIG_PPC_CELL_NATIVE is not set |
| @@ -218,7 +223,7 @@ CONFIG_HZ_250=y | |||
| 218 | # CONFIG_HZ_300 is not set | 223 | # CONFIG_HZ_300 is not set |
| 219 | # CONFIG_HZ_1000 is not set | 224 | # CONFIG_HZ_1000 is not set |
| 220 | CONFIG_HZ=250 | 225 | CONFIG_HZ=250 |
| 221 | # CONFIG_SCHED_HRTICK is not set | 226 | CONFIG_SCHED_HRTICK=y |
| 222 | CONFIG_PREEMPT_NONE=y | 227 | CONFIG_PREEMPT_NONE=y |
| 223 | # CONFIG_PREEMPT_VOLUNTARY is not set | 228 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 224 | # CONFIG_PREEMPT is not set | 229 | # CONFIG_PREEMPT is not set |
| @@ -252,8 +257,10 @@ CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y | |||
| 252 | # CONFIG_SPARSEMEM_VMEMMAP is not set | 257 | # CONFIG_SPARSEMEM_VMEMMAP is not set |
| 253 | CONFIG_MEMORY_HOTPLUG=y | 258 | CONFIG_MEMORY_HOTPLUG=y |
| 254 | CONFIG_MEMORY_HOTPLUG_SPARSE=y | 259 | CONFIG_MEMORY_HOTPLUG_SPARSE=y |
| 260 | # CONFIG_MEMORY_HOTREMOVE is not set | ||
| 255 | CONFIG_PAGEFLAGS_EXTENDED=y | 261 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 256 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 262 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 263 | CONFIG_MIGRATION=y | ||
| 257 | CONFIG_RESOURCES_64BIT=y | 264 | CONFIG_RESOURCES_64BIT=y |
| 258 | CONFIG_ZONE_DMA_FLAG=1 | 265 | CONFIG_ZONE_DMA_FLAG=1 |
| 259 | CONFIG_BOUNCE=y | 266 | CONFIG_BOUNCE=y |
| @@ -276,19 +283,17 @@ CONFIG_ISA_DMA_API=y | |||
| 276 | # | 283 | # |
| 277 | CONFIG_ZONE_DMA=y | 284 | CONFIG_ZONE_DMA=y |
| 278 | CONFIG_GENERIC_ISA_DMA=y | 285 | CONFIG_GENERIC_ISA_DMA=y |
| 286 | CONFIG_PPC_PCI_CHOICE=y | ||
| 279 | # CONFIG_PCI is not set | 287 | # CONFIG_PCI is not set |
| 280 | # CONFIG_PCI_DOMAINS is not set | 288 | # CONFIG_PCI_DOMAINS is not set |
| 281 | # CONFIG_PCI_SYSCALL is not set | 289 | # CONFIG_PCI_SYSCALL is not set |
| 282 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 290 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 283 | # CONFIG_PCCARD is not set | 291 | # CONFIG_PCCARD is not set |
| 284 | # CONFIG_HAS_RAPIDIO is not set | 292 | # CONFIG_HAS_RAPIDIO is not set |
| 293 | # CONFIG_RELOCATABLE is not set | ||
| 285 | CONFIG_PAGE_OFFSET=0xc000000000000000 | 294 | CONFIG_PAGE_OFFSET=0xc000000000000000 |
| 286 | CONFIG_KERNEL_START=0xc000000000000000 | 295 | CONFIG_KERNEL_START=0xc000000000000000 |
| 287 | CONFIG_PHYSICAL_START=0x00000000 | 296 | CONFIG_PHYSICAL_START=0x00000000 |
| 288 | |||
| 289 | # | ||
| 290 | # Networking | ||
| 291 | # | ||
| 292 | CONFIG_NET=y | 297 | CONFIG_NET=y |
| 293 | 298 | ||
| 294 | # | 299 | # |
| @@ -399,9 +404,22 @@ CONFIG_BT_HCIUSB_SCO=y | |||
| 399 | # | 404 | # |
| 400 | # Wireless | 405 | # Wireless |
| 401 | # | 406 | # |
| 402 | # CONFIG_CFG80211 is not set | 407 | CONFIG_CFG80211=m |
| 408 | CONFIG_NL80211=y | ||
| 403 | CONFIG_WIRELESS_EXT=y | 409 | CONFIG_WIRELESS_EXT=y |
| 404 | # CONFIG_MAC80211 is not set | 410 | # CONFIG_WIRELESS_EXT_SYSFS is not set |
| 411 | CONFIG_MAC80211=m | ||
| 412 | |||
| 413 | # | ||
| 414 | # Rate control algorithm selection | ||
| 415 | # | ||
| 416 | CONFIG_MAC80211_RC_PID=y | ||
| 417 | CONFIG_MAC80211_RC_DEFAULT_PID=y | ||
| 418 | CONFIG_MAC80211_RC_DEFAULT="pid" | ||
| 419 | # CONFIG_MAC80211_MESH is not set | ||
| 420 | # CONFIG_MAC80211_LEDS is not set | ||
| 421 | # CONFIG_MAC80211_DEBUGFS is not set | ||
| 422 | # CONFIG_MAC80211_DEBUG_MENU is not set | ||
| 405 | CONFIG_IEEE80211=m | 423 | CONFIG_IEEE80211=m |
| 406 | # CONFIG_IEEE80211_DEBUG is not set | 424 | # CONFIG_IEEE80211_DEBUG is not set |
| 407 | CONFIG_IEEE80211_CRYPT_WEP=m | 425 | CONFIG_IEEE80211_CRYPT_WEP=m |
| @@ -420,14 +438,79 @@ CONFIG_IEEE80211_CRYPT_TKIP=m | |||
| 420 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 438 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
| 421 | CONFIG_STANDALONE=y | 439 | CONFIG_STANDALONE=y |
| 422 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 440 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 423 | CONFIG_FW_LOADER=m | 441 | CONFIG_FW_LOADER=y |
| 424 | # CONFIG_FIRMWARE_IN_KERNEL is not set | 442 | # CONFIG_FIRMWARE_IN_KERNEL is not set |
| 425 | CONFIG_EXTRA_FIRMWARE="" | 443 | CONFIG_EXTRA_FIRMWARE="" |
| 426 | # CONFIG_DEBUG_DRIVER is not set | 444 | # CONFIG_DEBUG_DRIVER is not set |
| 427 | # CONFIG_DEBUG_DEVRES is not set | 445 | # CONFIG_DEBUG_DEVRES is not set |
| 428 | # CONFIG_SYS_HYPERVISOR is not set | 446 | # CONFIG_SYS_HYPERVISOR is not set |
| 429 | # CONFIG_CONNECTOR is not set | 447 | # CONFIG_CONNECTOR is not set |
| 430 | # CONFIG_MTD is not set | 448 | CONFIG_MTD=y |
| 449 | CONFIG_MTD_DEBUG=y | ||
| 450 | CONFIG_MTD_DEBUG_VERBOSE=0 | ||
| 451 | # CONFIG_MTD_CONCAT is not set | ||
| 452 | # CONFIG_MTD_PARTITIONS is not set | ||
| 453 | |||
| 454 | # | ||
| 455 | # User Modules And Translation Layers | ||
| 456 | # | ||
| 457 | # CONFIG_MTD_CHAR is not set | ||
| 458 | CONFIG_MTD_BLKDEVS=y | ||
| 459 | CONFIG_MTD_BLOCK=y | ||
| 460 | # CONFIG_FTL is not set | ||
| 461 | # CONFIG_NFTL is not set | ||
| 462 | # CONFIG_INFTL is not set | ||
| 463 | # CONFIG_RFD_FTL is not set | ||
| 464 | # CONFIG_SSFDC is not set | ||
| 465 | # CONFIG_MTD_OOPS is not set | ||
| 466 | |||
| 467 | # | ||
| 468 | # RAM/ROM/Flash chip drivers | ||
| 469 | # | ||
| 470 | # CONFIG_MTD_CFI is not set | ||
| 471 | # CONFIG_MTD_JEDECPROBE is not set | ||
| 472 | CONFIG_MTD_MAP_BANK_WIDTH_1=y | ||
| 473 | CONFIG_MTD_MAP_BANK_WIDTH_2=y | ||
| 474 | CONFIG_MTD_MAP_BANK_WIDTH_4=y | ||
| 475 | # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set | ||
| 476 | # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set | ||
| 477 | # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set | ||
| 478 | CONFIG_MTD_CFI_I1=y | ||
| 479 | CONFIG_MTD_CFI_I2=y | ||
| 480 | # CONFIG_MTD_CFI_I4 is not set | ||
| 481 | # CONFIG_MTD_CFI_I8 is not set | ||
| 482 | # CONFIG_MTD_RAM is not set | ||
| 483 | # CONFIG_MTD_ROM is not set | ||
| 484 | # CONFIG_MTD_ABSENT is not set | ||
| 485 | |||
| 486 | # | ||
| 487 | # Mapping drivers for chip access | ||
| 488 | # | ||
| 489 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | ||
| 490 | # CONFIG_MTD_PLATRAM is not set | ||
| 491 | |||
| 492 | # | ||
| 493 | # Self-contained MTD device drivers | ||
| 494 | # | ||
| 495 | # CONFIG_MTD_SLRAM is not set | ||
| 496 | # CONFIG_MTD_PHRAM is not set | ||
| 497 | CONFIG_MTD_PS3VRAM=y | ||
| 498 | # CONFIG_MTD_MTDRAM is not set | ||
| 499 | # CONFIG_MTD_BLOCK2MTD is not set | ||
| 500 | |||
| 501 | # | ||
| 502 | # Disk-On-Chip Device Drivers | ||
| 503 | # | ||
| 504 | # CONFIG_MTD_DOC2000 is not set | ||
| 505 | # CONFIG_MTD_DOC2001 is not set | ||
| 506 | # CONFIG_MTD_DOC2001PLUS is not set | ||
| 507 | # CONFIG_MTD_NAND is not set | ||
| 508 | # CONFIG_MTD_ONENAND is not set | ||
| 509 | |||
| 510 | # | ||
| 511 | # UBI - Unsorted block images | ||
| 512 | # | ||
| 513 | # CONFIG_MTD_UBI is not set | ||
| 431 | CONFIG_OF_DEVICE=y | 514 | CONFIG_OF_DEVICE=y |
| 432 | # CONFIG_PARPORT is not set | 515 | # CONFIG_PARPORT is not set |
| 433 | CONFIG_BLK_DEV=y | 516 | CONFIG_BLK_DEV=y |
| @@ -443,6 +526,7 @@ CONFIG_BLK_DEV_RAM_SIZE=65535 | |||
| 443 | # CONFIG_BLK_DEV_XIP is not set | 526 | # CONFIG_BLK_DEV_XIP is not set |
| 444 | # CONFIG_CDROM_PKTCDVD is not set | 527 | # CONFIG_CDROM_PKTCDVD is not set |
| 445 | # CONFIG_ATA_OVER_ETH is not set | 528 | # CONFIG_ATA_OVER_ETH is not set |
| 529 | # CONFIG_BLK_DEV_HD is not set | ||
| 446 | CONFIG_MISC_DEVICES=y | 530 | CONFIG_MISC_DEVICES=y |
| 447 | # CONFIG_EEPROM_93CX6 is not set | 531 | # CONFIG_EEPROM_93CX6 is not set |
| 448 | # CONFIG_ENCLOSURE_SERVICES is not set | 532 | # CONFIG_ENCLOSURE_SERVICES is not set |
| @@ -494,7 +578,6 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 494 | # CONFIG_MD is not set | 578 | # CONFIG_MD is not set |
| 495 | # CONFIG_MACINTOSH_DRIVERS is not set | 579 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 496 | CONFIG_NETDEVICES=y | 580 | CONFIG_NETDEVICES=y |
| 497 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 498 | # CONFIG_DUMMY is not set | 581 | # CONFIG_DUMMY is not set |
| 499 | # CONFIG_BONDING is not set | 582 | # CONFIG_BONDING is not set |
| 500 | # CONFIG_MACVLAN is not set | 583 | # CONFIG_MACVLAN is not set |
| @@ -510,9 +593,9 @@ CONFIG_MII=m | |||
| 510 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 593 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
| 511 | # CONFIG_B44 is not set | 594 | # CONFIG_B44 is not set |
| 512 | CONFIG_NETDEV_1000=y | 595 | CONFIG_NETDEV_1000=y |
| 513 | # CONFIG_E1000E_ENABLED is not set | ||
| 514 | CONFIG_GELIC_NET=y | 596 | CONFIG_GELIC_NET=y |
| 515 | CONFIG_GELIC_WIRELESS=y | 597 | CONFIG_GELIC_WIRELESS=y |
| 598 | CONFIG_GELIC_WIRELESS_OLD_PSK_INTERFACE=y | ||
| 516 | # CONFIG_NETDEV_10000 is not set | 599 | # CONFIG_NETDEV_10000 is not set |
| 517 | 600 | ||
| 518 | # | 601 | # |
| @@ -523,8 +606,22 @@ CONFIG_WLAN_80211=y | |||
| 523 | # CONFIG_LIBERTAS is not set | 606 | # CONFIG_LIBERTAS is not set |
| 524 | # CONFIG_USB_ZD1201 is not set | 607 | # CONFIG_USB_ZD1201 is not set |
| 525 | # CONFIG_USB_NET_RNDIS_WLAN is not set | 608 | # CONFIG_USB_NET_RNDIS_WLAN is not set |
| 609 | # CONFIG_RTL8187 is not set | ||
| 610 | # CONFIG_MAC80211_HWSIM is not set | ||
| 611 | # CONFIG_P54_COMMON is not set | ||
| 526 | # CONFIG_IWLWIFI_LEDS is not set | 612 | # CONFIG_IWLWIFI_LEDS is not set |
| 527 | # CONFIG_HOSTAP is not set | 613 | # CONFIG_HOSTAP is not set |
| 614 | # CONFIG_B43 is not set | ||
| 615 | # CONFIG_B43LEGACY is not set | ||
| 616 | CONFIG_ZD1211RW=m | ||
| 617 | # CONFIG_ZD1211RW_DEBUG is not set | ||
| 618 | CONFIG_RT2X00=m | ||
| 619 | CONFIG_RT2X00_LIB=m | ||
| 620 | CONFIG_RT2X00_LIB_USB=m | ||
| 621 | CONFIG_RT2X00_LIB_FIRMWARE=y | ||
| 622 | # CONFIG_RT2500USB is not set | ||
| 623 | CONFIG_RT73USB=m | ||
| 624 | # CONFIG_RT2X00_DEBUG is not set | ||
| 528 | 625 | ||
| 529 | # | 626 | # |
| 530 | # USB Network Adapters | 627 | # USB Network Adapters |
| @@ -622,6 +719,7 @@ CONFIG_INPUT_JOYSTICK=y | |||
| 622 | # Character devices | 719 | # Character devices |
| 623 | # | 720 | # |
| 624 | CONFIG_VT=y | 721 | CONFIG_VT=y |
| 722 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 625 | CONFIG_VT_CONSOLE=y | 723 | CONFIG_VT_CONSOLE=y |
| 626 | CONFIG_HW_CONSOLE=y | 724 | CONFIG_HW_CONSOLE=y |
| 627 | CONFIG_VT_HW_CONSOLE_BINDING=y | 725 | CONFIG_VT_HW_CONSOLE_BINDING=y |
| @@ -647,6 +745,8 @@ CONFIG_LEGACY_PTY_COUNT=16 | |||
| 647 | # CONFIG_TCG_TPM is not set | 745 | # CONFIG_TCG_TPM is not set |
| 648 | # CONFIG_I2C is not set | 746 | # CONFIG_I2C is not set |
| 649 | # CONFIG_SPI is not set | 747 | # CONFIG_SPI is not set |
| 748 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 749 | # CONFIG_GPIOLIB is not set | ||
| 650 | # CONFIG_W1 is not set | 750 | # CONFIG_W1 is not set |
| 651 | # CONFIG_POWER_SUPPLY is not set | 751 | # CONFIG_POWER_SUPPLY is not set |
| 652 | # CONFIG_HWMON is not set | 752 | # CONFIG_HWMON is not set |
| @@ -663,8 +763,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 663 | # | 763 | # |
| 664 | # Multifunction device drivers | 764 | # Multifunction device drivers |
| 665 | # | 765 | # |
| 766 | # CONFIG_MFD_CORE is not set | ||
| 666 | # CONFIG_MFD_SM501 is not set | 767 | # CONFIG_MFD_SM501 is not set |
| 667 | # CONFIG_HTC_PASIC3 is not set | 768 | # CONFIG_HTC_PASIC3 is not set |
| 769 | # CONFIG_MFD_TMIO is not set | ||
| 668 | 770 | ||
| 669 | # | 771 | # |
| 670 | # Multimedia devices | 772 | # Multimedia devices |
| @@ -796,6 +898,7 @@ CONFIG_USB_DEVICEFS=y | |||
| 796 | # CONFIG_USB_DYNAMIC_MINORS is not set | 898 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 797 | CONFIG_USB_SUSPEND=y | 899 | CONFIG_USB_SUSPEND=y |
| 798 | # CONFIG_USB_OTG is not set | 900 | # CONFIG_USB_OTG is not set |
| 901 | CONFIG_USB_MON=y | ||
| 799 | 902 | ||
| 800 | # | 903 | # |
| 801 | # USB Host Controller Drivers | 904 | # USB Host Controller Drivers |
| @@ -817,6 +920,10 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 817 | # CONFIG_USB_R8A66597_HCD is not set | 920 | # CONFIG_USB_R8A66597_HCD is not set |
| 818 | 921 | ||
| 819 | # | 922 | # |
| 923 | # Enable Host or Gadget support to see Inventra options | ||
| 924 | # | ||
| 925 | |||
| 926 | # | ||
| 820 | # USB Device Class drivers | 927 | # USB Device Class drivers |
| 821 | # | 928 | # |
| 822 | # CONFIG_USB_ACM is not set | 929 | # CONFIG_USB_ACM is not set |
| @@ -843,6 +950,7 @@ CONFIG_USB_STORAGE=m | |||
| 843 | # CONFIG_USB_STORAGE_ALAUDA is not set | 950 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 844 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 951 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
| 845 | # CONFIG_USB_STORAGE_KARMA is not set | 952 | # CONFIG_USB_STORAGE_KARMA is not set |
| 953 | # CONFIG_USB_STORAGE_SIERRA is not set | ||
| 846 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | 954 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
| 847 | # CONFIG_USB_LIBUSUAL is not set | 955 | # CONFIG_USB_LIBUSUAL is not set |
| 848 | 956 | ||
| @@ -851,7 +959,6 @@ CONFIG_USB_STORAGE=m | |||
| 851 | # | 959 | # |
| 852 | # CONFIG_USB_MDC800 is not set | 960 | # CONFIG_USB_MDC800 is not set |
| 853 | # CONFIG_USB_MICROTEK is not set | 961 | # CONFIG_USB_MICROTEK is not set |
| 854 | CONFIG_USB_MON=y | ||
| 855 | 962 | ||
| 856 | # | 963 | # |
| 857 | # USB port drivers | 964 | # USB port drivers |
| @@ -864,7 +971,6 @@ CONFIG_USB_MON=y | |||
| 864 | # CONFIG_USB_EMI62 is not set | 971 | # CONFIG_USB_EMI62 is not set |
| 865 | # CONFIG_USB_EMI26 is not set | 972 | # CONFIG_USB_EMI26 is not set |
| 866 | # CONFIG_USB_ADUTUX is not set | 973 | # CONFIG_USB_ADUTUX is not set |
| 867 | # CONFIG_USB_AUERSWALD is not set | ||
| 868 | # CONFIG_USB_RIO500 is not set | 974 | # CONFIG_USB_RIO500 is not set |
| 869 | # CONFIG_USB_LEGOTOWER is not set | 975 | # CONFIG_USB_LEGOTOWER is not set |
| 870 | # CONFIG_USB_LCD is not set | 976 | # CONFIG_USB_LCD is not set |
| @@ -998,9 +1104,11 @@ CONFIG_HUGETLB_PAGE=y | |||
| 998 | # CONFIG_BEFS_FS is not set | 1104 | # CONFIG_BEFS_FS is not set |
| 999 | # CONFIG_BFS_FS is not set | 1105 | # CONFIG_BFS_FS is not set |
| 1000 | # CONFIG_EFS_FS is not set | 1106 | # CONFIG_EFS_FS is not set |
| 1107 | # CONFIG_JFFS2_FS is not set | ||
| 1001 | # CONFIG_CRAMFS is not set | 1108 | # CONFIG_CRAMFS is not set |
| 1002 | # CONFIG_VXFS_FS is not set | 1109 | # CONFIG_VXFS_FS is not set |
| 1003 | # CONFIG_MINIX_FS is not set | 1110 | # CONFIG_MINIX_FS is not set |
| 1111 | # CONFIG_OMFS_FS is not set | ||
| 1004 | # CONFIG_HPFS_FS is not set | 1112 | # CONFIG_HPFS_FS is not set |
| 1005 | # CONFIG_QNX4FS_FS is not set | 1113 | # CONFIG_QNX4FS_FS is not set |
| 1006 | # CONFIG_ROMFS_FS is not set | 1114 | # CONFIG_ROMFS_FS is not set |
| @@ -1011,14 +1119,13 @@ CONFIG_NFS_FS=y | |||
| 1011 | CONFIG_NFS_V3=y | 1119 | CONFIG_NFS_V3=y |
| 1012 | # CONFIG_NFS_V3_ACL is not set | 1120 | # CONFIG_NFS_V3_ACL is not set |
| 1013 | CONFIG_NFS_V4=y | 1121 | CONFIG_NFS_V4=y |
| 1014 | # CONFIG_NFSD is not set | ||
| 1015 | CONFIG_ROOT_NFS=y | 1122 | CONFIG_ROOT_NFS=y |
| 1123 | # CONFIG_NFSD is not set | ||
| 1016 | CONFIG_LOCKD=y | 1124 | CONFIG_LOCKD=y |
| 1017 | CONFIG_LOCKD_V4=y | 1125 | CONFIG_LOCKD_V4=y |
| 1018 | CONFIG_NFS_COMMON=y | 1126 | CONFIG_NFS_COMMON=y |
| 1019 | CONFIG_SUNRPC=y | 1127 | CONFIG_SUNRPC=y |
| 1020 | CONFIG_SUNRPC_GSS=y | 1128 | CONFIG_SUNRPC_GSS=y |
| 1021 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 1022 | CONFIG_RPCSEC_GSS_KRB5=y | 1129 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1023 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1130 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1024 | # CONFIG_SMB_FS is not set | 1131 | # CONFIG_SMB_FS is not set |
| @@ -1086,7 +1193,7 @@ CONFIG_BITREVERSE=y | |||
| 1086 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1193 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 1087 | CONFIG_CRC_CCITT=m | 1194 | CONFIG_CRC_CCITT=m |
| 1088 | # CONFIG_CRC16 is not set | 1195 | # CONFIG_CRC16 is not set |
| 1089 | # CONFIG_CRC_T10DIF is not set | 1196 | CONFIG_CRC_T10DIF=y |
| 1090 | CONFIG_CRC_ITU_T=m | 1197 | CONFIG_CRC_ITU_T=m |
| 1091 | CONFIG_CRC32=y | 1198 | CONFIG_CRC32=y |
| 1092 | # CONFIG_CRC7 is not set | 1199 | # CONFIG_CRC7 is not set |
| @@ -1115,6 +1222,8 @@ CONFIG_DEBUG_FS=y | |||
| 1115 | CONFIG_DEBUG_KERNEL=y | 1222 | CONFIG_DEBUG_KERNEL=y |
| 1116 | # CONFIG_DEBUG_SHIRQ is not set | 1223 | # CONFIG_DEBUG_SHIRQ is not set |
| 1117 | CONFIG_DETECT_SOFTLOCKUP=y | 1224 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1225 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 1226 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 1118 | CONFIG_SCHED_DEBUG=y | 1227 | CONFIG_SCHED_DEBUG=y |
| 1119 | # CONFIG_SCHEDSTATS is not set | 1228 | # CONFIG_SCHEDSTATS is not set |
| 1120 | # CONFIG_TIMER_STATS is not set | 1229 | # CONFIG_TIMER_STATS is not set |
| @@ -1138,6 +1247,7 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
| 1138 | CONFIG_DEBUG_INFO=y | 1247 | CONFIG_DEBUG_INFO=y |
| 1139 | # CONFIG_DEBUG_VM is not set | 1248 | # CONFIG_DEBUG_VM is not set |
| 1140 | CONFIG_DEBUG_WRITECOUNT=y | 1249 | CONFIG_DEBUG_WRITECOUNT=y |
| 1250 | CONFIG_DEBUG_MEMORY_INIT=y | ||
| 1141 | CONFIG_DEBUG_LIST=y | 1251 | CONFIG_DEBUG_LIST=y |
| 1142 | # CONFIG_DEBUG_SG is not set | 1252 | # CONFIG_DEBUG_SG is not set |
| 1143 | CONFIG_FRAME_POINTER=y | 1253 | CONFIG_FRAME_POINTER=y |
| @@ -1146,6 +1256,7 @@ CONFIG_FRAME_POINTER=y | |||
| 1146 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1256 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 1147 | # CONFIG_FAULT_INJECTION is not set | 1257 | # CONFIG_FAULT_INJECTION is not set |
| 1148 | # CONFIG_LATENCYTOP is not set | 1258 | # CONFIG_LATENCYTOP is not set |
| 1259 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1149 | CONFIG_HAVE_FTRACE=y | 1260 | CONFIG_HAVE_FTRACE=y |
| 1150 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1261 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
| 1151 | # CONFIG_FTRACE is not set | 1262 | # CONFIG_FTRACE is not set |
| @@ -1153,12 +1264,14 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y | |||
| 1153 | # CONFIG_SCHED_TRACER is not set | 1264 | # CONFIG_SCHED_TRACER is not set |
| 1154 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1265 | # CONFIG_CONTEXT_SWITCH_TRACER is not set |
| 1155 | # CONFIG_SAMPLES is not set | 1266 | # CONFIG_SAMPLES is not set |
| 1267 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1268 | # CONFIG_KGDB is not set | ||
| 1156 | CONFIG_DEBUG_STACKOVERFLOW=y | 1269 | CONFIG_DEBUG_STACKOVERFLOW=y |
| 1157 | # CONFIG_DEBUG_STACK_USAGE is not set | 1270 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1158 | # CONFIG_DEBUG_PAGEALLOC is not set | 1271 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1159 | # CONFIG_DEBUGGER is not set | ||
| 1160 | # CONFIG_CODE_PATCHING_SELFTEST is not set | 1272 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
| 1161 | # CONFIG_FTR_FIXUP_SELFTEST is not set | 1273 | # CONFIG_FTR_FIXUP_SELFTEST is not set |
| 1274 | # CONFIG_XMON is not set | ||
| 1162 | CONFIG_IRQSTACKS=y | 1275 | CONFIG_IRQSTACKS=y |
| 1163 | # CONFIG_VIRQ_DEBUG is not set | 1276 | # CONFIG_VIRQ_DEBUG is not set |
| 1164 | # CONFIG_BOOTX_TEXT is not set | 1277 | # CONFIG_BOOTX_TEXT is not set |
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig index fe6ffa683d78..e77c5e7a0be2 100644 --- a/arch/powerpc/configs/pseries_defconfig +++ b/arch/powerpc/configs/pseries_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.26-rc3 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Tue May 20 20:03:28 2008 | 4 | # Tue Aug 26 13:31:07 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
| 7 | 7 | ||
| @@ -14,6 +14,7 @@ CONFIG_POWER4=y | |||
| 14 | # CONFIG_TUNE_CELL is not set | 14 | # CONFIG_TUNE_CELL is not set |
| 15 | CONFIG_PPC_FPU=y | 15 | CONFIG_PPC_FPU=y |
| 16 | CONFIG_ALTIVEC=y | 16 | CONFIG_ALTIVEC=y |
| 17 | CONFIG_VSX=y | ||
| 17 | CONFIG_PPC_STD_MMU=y | 18 | CONFIG_PPC_STD_MMU=y |
| 18 | CONFIG_PPC_MM_SLICES=y | 19 | CONFIG_PPC_MM_SLICES=y |
| 19 | CONFIG_VIRT_CPU_ACCOUNTING=y | 20 | CONFIG_VIRT_CPU_ACCOUNTING=y |
| @@ -31,6 +32,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 31 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y | 32 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y |
| 32 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 33 | CONFIG_STACKTRACE_SUPPORT=y | 34 | CONFIG_STACKTRACE_SUPPORT=y |
| 35 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 34 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 36 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
| 35 | CONFIG_LOCKDEP_SUPPORT=y | 37 | CONFIG_LOCKDEP_SUPPORT=y |
| 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| @@ -104,7 +106,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y | |||
| 104 | CONFIG_SYSCTL=y | 106 | CONFIG_SYSCTL=y |
| 105 | # CONFIG_EMBEDDED is not set | 107 | # CONFIG_EMBEDDED is not set |
| 106 | CONFIG_SYSCTL_SYSCALL=y | 108 | CONFIG_SYSCTL_SYSCALL=y |
| 107 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 108 | CONFIG_KALLSYMS=y | 109 | CONFIG_KALLSYMS=y |
| 109 | CONFIG_KALLSYMS_ALL=y | 110 | CONFIG_KALLSYMS_ALL=y |
| 110 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 111 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -132,11 +133,17 @@ CONFIG_MARKERS=y | |||
| 132 | CONFIG_OPROFILE=y | 133 | CONFIG_OPROFILE=y |
| 133 | CONFIG_HAVE_OPROFILE=y | 134 | CONFIG_HAVE_OPROFILE=y |
| 134 | CONFIG_KPROBES=y | 135 | CONFIG_KPROBES=y |
| 136 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 135 | CONFIG_KRETPROBES=y | 137 | CONFIG_KRETPROBES=y |
| 138 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 136 | CONFIG_HAVE_KPROBES=y | 139 | CONFIG_HAVE_KPROBES=y |
| 137 | CONFIG_HAVE_KRETPROBES=y | 140 | CONFIG_HAVE_KRETPROBES=y |
| 138 | # CONFIG_HAVE_DMA_ATTRS is not set | 141 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
| 142 | CONFIG_HAVE_DMA_ATTRS=y | ||
| 143 | CONFIG_USE_GENERIC_SMP_HELPERS=y | ||
| 144 | # CONFIG_HAVE_CLK is not set | ||
| 139 | CONFIG_PROC_PAGE_MONITOR=y | 145 | CONFIG_PROC_PAGE_MONITOR=y |
| 146 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 140 | CONFIG_SLABINFO=y | 147 | CONFIG_SLABINFO=y |
| 141 | CONFIG_RT_MUTEXES=y | 148 | CONFIG_RT_MUTEXES=y |
| 142 | # CONFIG_TINY_SHMEM is not set | 149 | # CONFIG_TINY_SHMEM is not set |
| @@ -152,6 +159,7 @@ CONFIG_STOP_MACHINE=y | |||
| 152 | CONFIG_BLOCK=y | 159 | CONFIG_BLOCK=y |
| 153 | # CONFIG_BLK_DEV_IO_TRACE is not set | 160 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 154 | CONFIG_BLK_DEV_BSG=y | 161 | CONFIG_BLK_DEV_BSG=y |
| 162 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 155 | CONFIG_BLOCK_COMPAT=y | 163 | CONFIG_BLOCK_COMPAT=y |
| 156 | 164 | ||
| 157 | # | 165 | # |
| @@ -172,17 +180,14 @@ CONFIG_CLASSIC_RCU=y | |||
| 172 | # Platform support | 180 | # Platform support |
| 173 | # | 181 | # |
| 174 | CONFIG_PPC_MULTIPLATFORM=y | 182 | CONFIG_PPC_MULTIPLATFORM=y |
| 175 | # CONFIG_PPC_82xx is not set | ||
| 176 | # CONFIG_PPC_83xx is not set | ||
| 177 | # CONFIG_PPC_86xx is not set | ||
| 178 | CONFIG_PPC_PSERIES=y | 183 | CONFIG_PPC_PSERIES=y |
| 179 | CONFIG_PPC_SPLPAR=y | 184 | CONFIG_PPC_SPLPAR=y |
| 180 | CONFIG_EEH=y | 185 | CONFIG_EEH=y |
| 181 | CONFIG_SCANLOG=m | 186 | CONFIG_SCANLOG=m |
| 182 | CONFIG_LPARCFG=y | 187 | CONFIG_LPARCFG=y |
| 188 | CONFIG_PPC_SMLPAR=y | ||
| 189 | CONFIG_CMM=y | ||
| 183 | # CONFIG_PPC_ISERIES is not set | 190 | # CONFIG_PPC_ISERIES is not set |
| 184 | # CONFIG_PPC_MPC512x is not set | ||
| 185 | # CONFIG_PPC_MPC5121 is not set | ||
| 186 | # CONFIG_PPC_PMAC is not set | 191 | # CONFIG_PPC_PMAC is not set |
| 187 | # CONFIG_PPC_MAPLE is not set | 192 | # CONFIG_PPC_MAPLE is not set |
| 188 | # CONFIG_PPC_PASEMI is not set | 193 | # CONFIG_PPC_PASEMI is not set |
| @@ -226,7 +231,7 @@ CONFIG_HZ_250=y | |||
| 226 | # CONFIG_HZ_300 is not set | 231 | # CONFIG_HZ_300 is not set |
| 227 | # CONFIG_HZ_1000 is not set | 232 | # CONFIG_HZ_1000 is not set |
| 228 | CONFIG_HZ=250 | 233 | CONFIG_HZ=250 |
| 229 | # CONFIG_SCHED_HRTICK is not set | 234 | CONFIG_SCHED_HRTICK=y |
| 230 | CONFIG_PREEMPT_NONE=y | 235 | CONFIG_PREEMPT_NONE=y |
| 231 | # CONFIG_PREEMPT_VOLUNTARY is not set | 236 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 232 | # CONFIG_PREEMPT is not set | 237 | # CONFIG_PREEMPT is not set |
| @@ -275,6 +280,7 @@ CONFIG_FORCE_MAX_ZONEORDER=13 | |||
| 275 | CONFIG_SCHED_SMT=y | 280 | CONFIG_SCHED_SMT=y |
| 276 | CONFIG_PROC_DEVICETREE=y | 281 | CONFIG_PROC_DEVICETREE=y |
| 277 | # CONFIG_CMDLINE_BOOL is not set | 282 | # CONFIG_CMDLINE_BOOL is not set |
| 283 | CONFIG_EXTRA_TARGETS="" | ||
| 278 | # CONFIG_PM is not set | 284 | # CONFIG_PM is not set |
| 279 | CONFIG_SECCOMP=y | 285 | CONFIG_SECCOMP=y |
| 280 | CONFIG_ISA_DMA_API=y | 286 | CONFIG_ISA_DMA_API=y |
| @@ -304,10 +310,6 @@ CONFIG_HOTPLUG_PCI_RPA_DLPAR=m | |||
| 304 | CONFIG_PAGE_OFFSET=0xc000000000000000 | 310 | CONFIG_PAGE_OFFSET=0xc000000000000000 |
| 305 | CONFIG_KERNEL_START=0xc000000000000000 | 311 | CONFIG_KERNEL_START=0xc000000000000000 |
| 306 | CONFIG_PHYSICAL_START=0x00000000 | 312 | CONFIG_PHYSICAL_START=0x00000000 |
| 307 | |||
| 308 | # | ||
| 309 | # Networking | ||
| 310 | # | ||
| 311 | CONFIG_NET=y | 313 | CONFIG_NET=y |
| 312 | 314 | ||
| 313 | # | 315 | # |
| @@ -321,6 +323,7 @@ CONFIG_XFRM_USER=m | |||
| 321 | # CONFIG_XFRM_SUB_POLICY is not set | 323 | # CONFIG_XFRM_SUB_POLICY is not set |
| 322 | # CONFIG_XFRM_MIGRATE is not set | 324 | # CONFIG_XFRM_MIGRATE is not set |
| 323 | # CONFIG_XFRM_STATISTICS is not set | 325 | # CONFIG_XFRM_STATISTICS is not set |
| 326 | CONFIG_XFRM_IPCOMP=m | ||
| 324 | CONFIG_NET_KEY=m | 327 | CONFIG_NET_KEY=m |
| 325 | # CONFIG_NET_KEY_MIGRATE is not set | 328 | # CONFIG_NET_KEY_MIGRATE is not set |
| 326 | CONFIG_INET=y | 329 | CONFIG_INET=y |
| @@ -498,6 +501,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | |||
| 498 | CONFIG_STANDALONE=y | 501 | CONFIG_STANDALONE=y |
| 499 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 502 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 500 | CONFIG_FW_LOADER=y | 503 | CONFIG_FW_LOADER=y |
| 504 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
| 505 | CONFIG_EXTRA_FIRMWARE="" | ||
| 501 | # CONFIG_DEBUG_DRIVER is not set | 506 | # CONFIG_DEBUG_DRIVER is not set |
| 502 | # CONFIG_DEBUG_DEVRES is not set | 507 | # CONFIG_DEBUG_DEVRES is not set |
| 503 | # CONFIG_SYS_HYPERVISOR is not set | 508 | # CONFIG_SYS_HYPERVISOR is not set |
| @@ -531,12 +536,14 @@ CONFIG_BLK_DEV_RAM_SIZE=65536 | |||
| 531 | # CONFIG_BLK_DEV_XIP is not set | 536 | # CONFIG_BLK_DEV_XIP is not set |
| 532 | # CONFIG_CDROM_PKTCDVD is not set | 537 | # CONFIG_CDROM_PKTCDVD is not set |
| 533 | # CONFIG_ATA_OVER_ETH is not set | 538 | # CONFIG_ATA_OVER_ETH is not set |
| 539 | # CONFIG_BLK_DEV_HD is not set | ||
| 534 | CONFIG_MISC_DEVICES=y | 540 | CONFIG_MISC_DEVICES=y |
| 535 | # CONFIG_PHANTOM is not set | 541 | # CONFIG_PHANTOM is not set |
| 536 | # CONFIG_EEPROM_93CX6 is not set | 542 | # CONFIG_EEPROM_93CX6 is not set |
| 537 | # CONFIG_SGI_IOC4 is not set | 543 | # CONFIG_SGI_IOC4 is not set |
| 538 | # CONFIG_TIFM_CORE is not set | 544 | # CONFIG_TIFM_CORE is not set |
| 539 | # CONFIG_ENCLOSURE_SERVICES is not set | 545 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 546 | # CONFIG_HP_ILO is not set | ||
| 540 | CONFIG_HAVE_IDE=y | 547 | CONFIG_HAVE_IDE=y |
| 541 | CONFIG_IDE=y | 548 | CONFIG_IDE=y |
| 542 | CONFIG_BLK_DEV_IDE=y | 549 | CONFIG_BLK_DEV_IDE=y |
| @@ -544,6 +551,7 @@ CONFIG_BLK_DEV_IDE=y | |||
| 544 | # | 551 | # |
| 545 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | 552 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
| 546 | # | 553 | # |
| 554 | CONFIG_IDE_TIMINGS=y | ||
| 547 | # CONFIG_BLK_DEV_IDE_SATA is not set | 555 | # CONFIG_BLK_DEV_IDE_SATA is not set |
| 548 | CONFIG_BLK_DEV_IDEDISK=y | 556 | CONFIG_BLK_DEV_IDEDISK=y |
| 549 | # CONFIG_IDEDISK_MULTI_MODE is not set | 557 | # CONFIG_IDEDISK_MULTI_MODE is not set |
| @@ -575,10 +583,8 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
| 575 | CONFIG_BLK_DEV_AMD74XX=y | 583 | CONFIG_BLK_DEV_AMD74XX=y |
| 576 | # CONFIG_BLK_DEV_CMD64X is not set | 584 | # CONFIG_BLK_DEV_CMD64X is not set |
| 577 | # CONFIG_BLK_DEV_TRIFLEX is not set | 585 | # CONFIG_BLK_DEV_TRIFLEX is not set |
| 578 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
| 579 | # CONFIG_BLK_DEV_CS5520 is not set | 586 | # CONFIG_BLK_DEV_CS5520 is not set |
| 580 | # CONFIG_BLK_DEV_CS5530 is not set | 587 | # CONFIG_BLK_DEV_CS5530 is not set |
| 581 | # CONFIG_BLK_DEV_HPT34X is not set | ||
| 582 | # CONFIG_BLK_DEV_HPT366 is not set | 588 | # CONFIG_BLK_DEV_HPT366 is not set |
| 583 | # CONFIG_BLK_DEV_JMICRON is not set | 589 | # CONFIG_BLK_DEV_JMICRON is not set |
| 584 | # CONFIG_BLK_DEV_SC1200 is not set | 590 | # CONFIG_BLK_DEV_SC1200 is not set |
| @@ -596,8 +602,6 @@ CONFIG_BLK_DEV_AMD74XX=y | |||
| 596 | # CONFIG_BLK_DEV_VIA82CXXX is not set | 602 | # CONFIG_BLK_DEV_VIA82CXXX is not set |
| 597 | # CONFIG_BLK_DEV_TC86C001 is not set | 603 | # CONFIG_BLK_DEV_TC86C001 is not set |
| 598 | CONFIG_BLK_DEV_IDEDMA=y | 604 | CONFIG_BLK_DEV_IDEDMA=y |
| 599 | # CONFIG_BLK_DEV_HD_ONLY is not set | ||
| 600 | # CONFIG_BLK_DEV_HD is not set | ||
| 601 | 605 | ||
| 602 | # | 606 | # |
| 603 | # SCSI device support | 607 | # SCSI device support |
| @@ -659,6 +663,8 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 659 | # CONFIG_SCSI_GDTH is not set | 663 | # CONFIG_SCSI_GDTH is not set |
| 660 | # CONFIG_SCSI_IPS is not set | 664 | # CONFIG_SCSI_IPS is not set |
| 661 | CONFIG_SCSI_IBMVSCSI=y | 665 | CONFIG_SCSI_IBMVSCSI=y |
| 666 | CONFIG_SCSI_IBMVFC=m | ||
| 667 | CONFIG_SCSI_IBMVFC_TRACE=y | ||
| 662 | # CONFIG_SCSI_INITIO is not set | 668 | # CONFIG_SCSI_INITIO is not set |
| 663 | # CONFIG_SCSI_INIA100 is not set | 669 | # CONFIG_SCSI_INIA100 is not set |
| 664 | # CONFIG_SCSI_PPA is not set | 670 | # CONFIG_SCSI_PPA is not set |
| @@ -681,6 +687,7 @@ CONFIG_SCSI_LPFC=m | |||
| 681 | # CONFIG_SCSI_DC390T is not set | 687 | # CONFIG_SCSI_DC390T is not set |
| 682 | # CONFIG_SCSI_DEBUG is not set | 688 | # CONFIG_SCSI_DEBUG is not set |
| 683 | # CONFIG_SCSI_SRP is not set | 689 | # CONFIG_SCSI_SRP is not set |
| 690 | # CONFIG_SCSI_DH is not set | ||
| 684 | CONFIG_ATA=y | 691 | CONFIG_ATA=y |
| 685 | # CONFIG_ATA_NONSTANDARD is not set | 692 | # CONFIG_ATA_NONSTANDARD is not set |
| 686 | CONFIG_SATA_PMP=y | 693 | CONFIG_SATA_PMP=y |
| @@ -703,9 +710,6 @@ CONFIG_DM_SNAPSHOT=m | |||
| 703 | CONFIG_DM_MIRROR=m | 710 | CONFIG_DM_MIRROR=m |
| 704 | CONFIG_DM_ZERO=m | 711 | CONFIG_DM_ZERO=m |
| 705 | CONFIG_DM_MULTIPATH=m | 712 | CONFIG_DM_MULTIPATH=m |
| 706 | CONFIG_DM_MULTIPATH_EMC=m | ||
| 707 | # CONFIG_DM_MULTIPATH_RDAC is not set | ||
| 708 | # CONFIG_DM_MULTIPATH_HP is not set | ||
| 709 | # CONFIG_DM_DELAY is not set | 713 | # CONFIG_DM_DELAY is not set |
| 710 | # CONFIG_DM_UEVENT is not set | 714 | # CONFIG_DM_UEVENT is not set |
| 711 | # CONFIG_FUSION is not set | 715 | # CONFIG_FUSION is not set |
| @@ -713,12 +717,15 @@ CONFIG_DM_MULTIPATH_EMC=m | |||
| 713 | # | 717 | # |
| 714 | # IEEE 1394 (FireWire) support | 718 | # IEEE 1394 (FireWire) support |
| 715 | # | 719 | # |
| 720 | |||
| 721 | # | ||
| 722 | # Enable only one of the two stacks, unless you know what you are doing | ||
| 723 | # | ||
| 716 | # CONFIG_FIREWIRE is not set | 724 | # CONFIG_FIREWIRE is not set |
| 717 | # CONFIG_IEEE1394 is not set | 725 | # CONFIG_IEEE1394 is not set |
| 718 | # CONFIG_I2O is not set | 726 | # CONFIG_I2O is not set |
| 719 | # CONFIG_MACINTOSH_DRIVERS is not set | 727 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 720 | CONFIG_NETDEVICES=y | 728 | CONFIG_NETDEVICES=y |
| 721 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 722 | CONFIG_DUMMY=m | 729 | CONFIG_DUMMY=m |
| 723 | CONFIG_BONDING=m | 730 | CONFIG_BONDING=m |
| 724 | # CONFIG_MACVLAN is not set | 731 | # CONFIG_MACVLAN is not set |
| @@ -726,7 +733,23 @@ CONFIG_BONDING=m | |||
| 726 | CONFIG_TUN=m | 733 | CONFIG_TUN=m |
| 727 | # CONFIG_VETH is not set | 734 | # CONFIG_VETH is not set |
| 728 | # CONFIG_ARCNET is not set | 735 | # CONFIG_ARCNET is not set |
| 729 | # CONFIG_PHYLIB is not set | 736 | CONFIG_PHYLIB=y |
| 737 | |||
| 738 | # | ||
| 739 | # MII PHY device drivers | ||
| 740 | # | ||
| 741 | # CONFIG_MARVELL_PHY is not set | ||
| 742 | # CONFIG_DAVICOM_PHY is not set | ||
| 743 | # CONFIG_QSEMI_PHY is not set | ||
| 744 | # CONFIG_LXT_PHY is not set | ||
| 745 | # CONFIG_CICADA_PHY is not set | ||
| 746 | # CONFIG_VITESSE_PHY is not set | ||
| 747 | # CONFIG_SMSC_PHY is not set | ||
| 748 | # CONFIG_BROADCOM_PHY is not set | ||
| 749 | # CONFIG_ICPLUS_PHY is not set | ||
| 750 | # CONFIG_REALTEK_PHY is not set | ||
| 751 | # CONFIG_FIXED_PHY is not set | ||
| 752 | # CONFIG_MDIO_BITBANG is not set | ||
| 730 | CONFIG_NET_ETHERNET=y | 753 | CONFIG_NET_ETHERNET=y |
| 731 | CONFIG_MII=y | 754 | CONFIG_MII=y |
| 732 | # CONFIG_HAPPYMEAL is not set | 755 | # CONFIG_HAPPYMEAL is not set |
| @@ -759,6 +782,7 @@ CONFIG_E100=y | |||
| 759 | # CONFIG_SIS900 is not set | 782 | # CONFIG_SIS900 is not set |
| 760 | # CONFIG_EPIC100 is not set | 783 | # CONFIG_EPIC100 is not set |
| 761 | # CONFIG_SUNDANCE is not set | 784 | # CONFIG_SUNDANCE is not set |
| 785 | # CONFIG_TLAN is not set | ||
| 762 | # CONFIG_VIA_RHINE is not set | 786 | # CONFIG_VIA_RHINE is not set |
| 763 | # CONFIG_SC92031 is not set | 787 | # CONFIG_SC92031 is not set |
| 764 | # CONFIG_NET_POCKET is not set | 788 | # CONFIG_NET_POCKET is not set |
| @@ -767,10 +791,8 @@ CONFIG_ACENIC=y | |||
| 767 | CONFIG_ACENIC_OMIT_TIGON_I=y | 791 | CONFIG_ACENIC_OMIT_TIGON_I=y |
| 768 | # CONFIG_DL2K is not set | 792 | # CONFIG_DL2K is not set |
| 769 | CONFIG_E1000=y | 793 | CONFIG_E1000=y |
| 770 | # CONFIG_E1000_NAPI is not set | ||
| 771 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | 794 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set |
| 772 | # CONFIG_E1000E is not set | 795 | # CONFIG_E1000E is not set |
| 773 | # CONFIG_E1000E_ENABLED is not set | ||
| 774 | # CONFIG_IP1000 is not set | 796 | # CONFIG_IP1000 is not set |
| 775 | # CONFIG_IGB is not set | 797 | # CONFIG_IGB is not set |
| 776 | # CONFIG_NS83820 is not set | 798 | # CONFIG_NS83820 is not set |
| @@ -785,14 +807,14 @@ CONFIG_TIGON3=y | |||
| 785 | # CONFIG_BNX2 is not set | 807 | # CONFIG_BNX2 is not set |
| 786 | # CONFIG_QLA3XXX is not set | 808 | # CONFIG_QLA3XXX is not set |
| 787 | # CONFIG_ATL1 is not set | 809 | # CONFIG_ATL1 is not set |
| 810 | # CONFIG_ATL1E is not set | ||
| 788 | CONFIG_NETDEV_10000=y | 811 | CONFIG_NETDEV_10000=y |
| 789 | # CONFIG_CHELSIO_T1 is not set | 812 | # CONFIG_CHELSIO_T1 is not set |
| 790 | # CONFIG_CHELSIO_T3 is not set | 813 | # CONFIG_CHELSIO_T3 is not set |
| 814 | CONFIG_EHEA=y | ||
| 791 | # CONFIG_IXGBE is not set | 815 | # CONFIG_IXGBE is not set |
| 792 | CONFIG_IXGB=m | 816 | CONFIG_IXGB=m |
| 793 | # CONFIG_IXGB_NAPI is not set | ||
| 794 | CONFIG_S2IO=m | 817 | CONFIG_S2IO=m |
| 795 | # CONFIG_S2IO_NAPI is not set | ||
| 796 | # CONFIG_MYRI10GE is not set | 818 | # CONFIG_MYRI10GE is not set |
| 797 | # CONFIG_NETXEN_NIC is not set | 819 | # CONFIG_NETXEN_NIC is not set |
| 798 | # CONFIG_NIU is not set | 820 | # CONFIG_NIU is not set |
| @@ -883,6 +905,7 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y | |||
| 883 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 905 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
| 884 | # CONFIG_MOUSE_SERIAL is not set | 906 | # CONFIG_MOUSE_SERIAL is not set |
| 885 | # CONFIG_MOUSE_APPLETOUCH is not set | 907 | # CONFIG_MOUSE_APPLETOUCH is not set |
| 908 | # CONFIG_MOUSE_BCM5974 is not set | ||
| 886 | # CONFIG_MOUSE_VSXXXAA is not set | 909 | # CONFIG_MOUSE_VSXXXAA is not set |
| 887 | # CONFIG_INPUT_JOYSTICK is not set | 910 | # CONFIG_INPUT_JOYSTICK is not set |
| 888 | # CONFIG_INPUT_TABLET is not set | 911 | # CONFIG_INPUT_TABLET is not set |
| @@ -906,12 +929,14 @@ CONFIG_SERIO_I8042=y | |||
| 906 | # CONFIG_SERIO_PCIPS2 is not set | 929 | # CONFIG_SERIO_PCIPS2 is not set |
| 907 | CONFIG_SERIO_LIBPS2=y | 930 | CONFIG_SERIO_LIBPS2=y |
| 908 | # CONFIG_SERIO_RAW is not set | 931 | # CONFIG_SERIO_RAW is not set |
| 932 | # CONFIG_SERIO_XILINX_XPS_PS2 is not set | ||
| 909 | # CONFIG_GAMEPORT is not set | 933 | # CONFIG_GAMEPORT is not set |
| 910 | 934 | ||
| 911 | # | 935 | # |
| 912 | # Character devices | 936 | # Character devices |
| 913 | # | 937 | # |
| 914 | CONFIG_VT=y | 938 | CONFIG_VT=y |
| 939 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 915 | CONFIG_VT_CONSOLE=y | 940 | CONFIG_VT_CONSOLE=y |
| 916 | CONFIG_HW_CONSOLE=y | 941 | CONFIG_HW_CONSOLE=y |
| 917 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 942 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| @@ -943,6 +968,7 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 943 | # CONFIG_PRINTER is not set | 968 | # CONFIG_PRINTER is not set |
| 944 | # CONFIG_PPDEV is not set | 969 | # CONFIG_PPDEV is not set |
| 945 | CONFIG_HVC_DRIVER=y | 970 | CONFIG_HVC_DRIVER=y |
| 971 | CONFIG_HVC_IRQ=y | ||
| 946 | CONFIG_HVC_CONSOLE=y | 972 | CONFIG_HVC_CONSOLE=y |
| 947 | CONFIG_HVC_RTAS=y | 973 | CONFIG_HVC_RTAS=y |
| 948 | CONFIG_HVCS=m | 974 | CONFIG_HVCS=m |
| @@ -961,44 +987,65 @@ CONFIG_DEVPORT=y | |||
| 961 | CONFIG_I2C=y | 987 | CONFIG_I2C=y |
| 962 | CONFIG_I2C_BOARDINFO=y | 988 | CONFIG_I2C_BOARDINFO=y |
| 963 | # CONFIG_I2C_CHARDEV is not set | 989 | # CONFIG_I2C_CHARDEV is not set |
| 990 | CONFIG_I2C_HELPER_AUTO=y | ||
| 964 | CONFIG_I2C_ALGOBIT=y | 991 | CONFIG_I2C_ALGOBIT=y |
| 965 | 992 | ||
| 966 | # | 993 | # |
| 967 | # I2C Hardware Bus support | 994 | # I2C Hardware Bus support |
| 968 | # | 995 | # |
| 996 | |||
| 997 | # | ||
| 998 | # PC SMBus host controller drivers | ||
| 999 | # | ||
| 969 | # CONFIG_I2C_ALI1535 is not set | 1000 | # CONFIG_I2C_ALI1535 is not set |
| 970 | # CONFIG_I2C_ALI1563 is not set | 1001 | # CONFIG_I2C_ALI1563 is not set |
| 971 | # CONFIG_I2C_ALI15X3 is not set | 1002 | # CONFIG_I2C_ALI15X3 is not set |
| 972 | # CONFIG_I2C_AMD756 is not set | 1003 | # CONFIG_I2C_AMD756 is not set |
| 973 | # CONFIG_I2C_AMD8111 is not set | 1004 | # CONFIG_I2C_AMD8111 is not set |
| 974 | # CONFIG_I2C_I801 is not set | 1005 | # CONFIG_I2C_I801 is not set |
| 975 | # CONFIG_I2C_I810 is not set | 1006 | # CONFIG_I2C_ISCH is not set |
| 976 | # CONFIG_I2C_PIIX4 is not set | 1007 | # CONFIG_I2C_PIIX4 is not set |
| 977 | # CONFIG_I2C_NFORCE2 is not set | 1008 | # CONFIG_I2C_NFORCE2 is not set |
| 978 | # CONFIG_I2C_OCORES is not set | ||
| 979 | # CONFIG_I2C_PARPORT is not set | ||
| 980 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 981 | # CONFIG_I2C_PROSAVAGE is not set | ||
| 982 | # CONFIG_I2C_SAVAGE4 is not set | ||
| 983 | # CONFIG_I2C_SIMTEC is not set | ||
| 984 | # CONFIG_I2C_SIS5595 is not set | 1009 | # CONFIG_I2C_SIS5595 is not set |
| 985 | # CONFIG_I2C_SIS630 is not set | 1010 | # CONFIG_I2C_SIS630 is not set |
| 986 | # CONFIG_I2C_SIS96X is not set | 1011 | # CONFIG_I2C_SIS96X is not set |
| 987 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 988 | # CONFIG_I2C_STUB is not set | ||
| 989 | # CONFIG_I2C_TINY_USB is not set | ||
| 990 | # CONFIG_I2C_VIA is not set | 1012 | # CONFIG_I2C_VIA is not set |
| 991 | # CONFIG_I2C_VIAPRO is not set | 1013 | # CONFIG_I2C_VIAPRO is not set |
| 1014 | |||
| 1015 | # | ||
| 1016 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 1017 | # | ||
| 1018 | # CONFIG_I2C_OCORES is not set | ||
| 1019 | # CONFIG_I2C_SIMTEC is not set | ||
| 1020 | |||
| 1021 | # | ||
| 1022 | # External I2C/SMBus adapter drivers | ||
| 1023 | # | ||
| 1024 | # CONFIG_I2C_PARPORT is not set | ||
| 1025 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 1026 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 1027 | # CONFIG_I2C_TINY_USB is not set | ||
| 1028 | |||
| 1029 | # | ||
| 1030 | # Graphics adapter I2C/DDC channel drivers | ||
| 1031 | # | ||
| 992 | # CONFIG_I2C_VOODOO3 is not set | 1032 | # CONFIG_I2C_VOODOO3 is not set |
| 1033 | |||
| 1034 | # | ||
| 1035 | # Other I2C/SMBus bus drivers | ||
| 1036 | # | ||
| 993 | # CONFIG_I2C_PCA_PLATFORM is not set | 1037 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 1038 | # CONFIG_I2C_STUB is not set | ||
| 994 | 1039 | ||
| 995 | # | 1040 | # |
| 996 | # Miscellaneous I2C Chip support | 1041 | # Miscellaneous I2C Chip support |
| 997 | # | 1042 | # |
| 998 | # CONFIG_DS1682 is not set | 1043 | # CONFIG_DS1682 is not set |
| 1044 | # CONFIG_AT24 is not set | ||
| 999 | # CONFIG_SENSORS_EEPROM is not set | 1045 | # CONFIG_SENSORS_EEPROM is not set |
| 1000 | # CONFIG_SENSORS_PCF8574 is not set | 1046 | # CONFIG_SENSORS_PCF8574 is not set |
| 1001 | # CONFIG_PCF8575 is not set | 1047 | # CONFIG_PCF8575 is not set |
| 1048 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 1002 | # CONFIG_SENSORS_PCF8591 is not set | 1049 | # CONFIG_SENSORS_PCF8591 is not set |
| 1003 | # CONFIG_SENSORS_MAX6875 is not set | 1050 | # CONFIG_SENSORS_MAX6875 is not set |
| 1004 | # CONFIG_SENSORS_TSL2550 is not set | 1051 | # CONFIG_SENSORS_TSL2550 is not set |
| @@ -1007,10 +1054,13 @@ CONFIG_I2C_ALGOBIT=y | |||
| 1007 | # CONFIG_I2C_DEBUG_BUS is not set | 1054 | # CONFIG_I2C_DEBUG_BUS is not set |
| 1008 | # CONFIG_I2C_DEBUG_CHIP is not set | 1055 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 1009 | # CONFIG_SPI is not set | 1056 | # CONFIG_SPI is not set |
| 1057 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 1058 | # CONFIG_GPIOLIB is not set | ||
| 1010 | # CONFIG_W1 is not set | 1059 | # CONFIG_W1 is not set |
| 1011 | # CONFIG_POWER_SUPPLY is not set | 1060 | # CONFIG_POWER_SUPPLY is not set |
| 1012 | # CONFIG_HWMON is not set | 1061 | # CONFIG_HWMON is not set |
| 1013 | # CONFIG_THERMAL is not set | 1062 | # CONFIG_THERMAL is not set |
| 1063 | # CONFIG_THERMAL_HWMON is not set | ||
| 1014 | # CONFIG_WATCHDOG is not set | 1064 | # CONFIG_WATCHDOG is not set |
| 1015 | 1065 | ||
| 1016 | # | 1066 | # |
| @@ -1022,8 +1072,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1022 | # | 1072 | # |
| 1023 | # Multifunction device drivers | 1073 | # Multifunction device drivers |
| 1024 | # | 1074 | # |
| 1075 | # CONFIG_MFD_CORE is not set | ||
| 1025 | # CONFIG_MFD_SM501 is not set | 1076 | # CONFIG_MFD_SM501 is not set |
| 1026 | # CONFIG_HTC_PASIC3 is not set | 1077 | # CONFIG_HTC_PASIC3 is not set |
| 1078 | # CONFIG_MFD_TMIO is not set | ||
| 1027 | 1079 | ||
| 1028 | # | 1080 | # |
| 1029 | # Multimedia devices | 1081 | # Multimedia devices |
| @@ -1102,10 +1154,13 @@ CONFIG_FB_RADEON_BACKLIGHT=y | |||
| 1102 | # CONFIG_FB_TRIDENT is not set | 1154 | # CONFIG_FB_TRIDENT is not set |
| 1103 | # CONFIG_FB_ARK is not set | 1155 | # CONFIG_FB_ARK is not set |
| 1104 | # CONFIG_FB_PM3 is not set | 1156 | # CONFIG_FB_PM3 is not set |
| 1157 | # CONFIG_FB_CARMINE is not set | ||
| 1105 | CONFIG_FB_IBM_GXT4500=y | 1158 | CONFIG_FB_IBM_GXT4500=y |
| 1106 | # CONFIG_FB_VIRTUAL is not set | 1159 | # CONFIG_FB_VIRTUAL is not set |
| 1107 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | 1160 | CONFIG_BACKLIGHT_LCD_SUPPORT=y |
| 1108 | CONFIG_LCD_CLASS_DEVICE=m | 1161 | CONFIG_LCD_CLASS_DEVICE=m |
| 1162 | # CONFIG_LCD_ILI9320 is not set | ||
| 1163 | CONFIG_LCD_PLATFORM=m | ||
| 1109 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | 1164 | CONFIG_BACKLIGHT_CLASS_DEVICE=y |
| 1110 | # CONFIG_BACKLIGHT_CORGI is not set | 1165 | # CONFIG_BACKLIGHT_CORGI is not set |
| 1111 | 1166 | ||
| @@ -1133,10 +1188,6 @@ CONFIG_LOGO=y | |||
| 1133 | CONFIG_LOGO_LINUX_MONO=y | 1188 | CONFIG_LOGO_LINUX_MONO=y |
| 1134 | CONFIG_LOGO_LINUX_VGA16=y | 1189 | CONFIG_LOGO_LINUX_VGA16=y |
| 1135 | CONFIG_LOGO_LINUX_CLUT224=y | 1190 | CONFIG_LOGO_LINUX_CLUT224=y |
| 1136 | |||
| 1137 | # | ||
| 1138 | # Sound | ||
| 1139 | # | ||
| 1140 | # CONFIG_SOUND is not set | 1191 | # CONFIG_SOUND is not set |
| 1141 | CONFIG_HID_SUPPORT=y | 1192 | CONFIG_HID_SUPPORT=y |
| 1142 | CONFIG_HID=y | 1193 | CONFIG_HID=y |
| @@ -1165,6 +1216,7 @@ CONFIG_USB_DEVICEFS=y | |||
| 1165 | CONFIG_USB_DEVICE_CLASS=y | 1216 | CONFIG_USB_DEVICE_CLASS=y |
| 1166 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1217 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 1167 | # CONFIG_USB_OTG is not set | 1218 | # CONFIG_USB_OTG is not set |
| 1219 | CONFIG_USB_MON=y | ||
| 1168 | 1220 | ||
| 1169 | # | 1221 | # |
| 1170 | # USB Host Controller Drivers | 1222 | # USB Host Controller Drivers |
| @@ -1190,6 +1242,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 1190 | # | 1242 | # |
| 1191 | # CONFIG_USB_ACM is not set | 1243 | # CONFIG_USB_ACM is not set |
| 1192 | # CONFIG_USB_PRINTER is not set | 1244 | # CONFIG_USB_PRINTER is not set |
| 1245 | # CONFIG_USB_WDM is not set | ||
| 1193 | 1246 | ||
| 1194 | # | 1247 | # |
| 1195 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1248 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -1211,6 +1264,7 @@ CONFIG_USB_STORAGE=y | |||
| 1211 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1264 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1212 | CONFIG_USB_STORAGE_ONETOUCH=y | 1265 | CONFIG_USB_STORAGE_ONETOUCH=y |
| 1213 | # CONFIG_USB_STORAGE_KARMA is not set | 1266 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1267 | # CONFIG_USB_STORAGE_SIERRA is not set | ||
| 1214 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | 1268 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
| 1215 | # CONFIG_USB_LIBUSUAL is not set | 1269 | # CONFIG_USB_LIBUSUAL is not set |
| 1216 | 1270 | ||
| @@ -1219,7 +1273,6 @@ CONFIG_USB_STORAGE_ONETOUCH=y | |||
| 1219 | # | 1273 | # |
| 1220 | # CONFIG_USB_MDC800 is not set | 1274 | # CONFIG_USB_MDC800 is not set |
| 1221 | # CONFIG_USB_MICROTEK is not set | 1275 | # CONFIG_USB_MICROTEK is not set |
| 1222 | CONFIG_USB_MON=y | ||
| 1223 | 1276 | ||
| 1224 | # | 1277 | # |
| 1225 | # USB port drivers | 1278 | # USB port drivers |
| @@ -1233,7 +1286,6 @@ CONFIG_USB_MON=y | |||
| 1233 | # CONFIG_USB_EMI62 is not set | 1286 | # CONFIG_USB_EMI62 is not set |
| 1234 | # CONFIG_USB_EMI26 is not set | 1287 | # CONFIG_USB_EMI26 is not set |
| 1235 | # CONFIG_USB_ADUTUX is not set | 1288 | # CONFIG_USB_ADUTUX is not set |
| 1236 | # CONFIG_USB_AUERSWALD is not set | ||
| 1237 | # CONFIG_USB_RIO500 is not set | 1289 | # CONFIG_USB_RIO500 is not set |
| 1238 | # CONFIG_USB_LEGOTOWER is not set | 1290 | # CONFIG_USB_LEGOTOWER is not set |
| 1239 | # CONFIG_USB_LCD is not set | 1291 | # CONFIG_USB_LCD is not set |
| @@ -1250,6 +1302,7 @@ CONFIG_USB_MON=y | |||
| 1250 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1302 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 1251 | # CONFIG_USB_IOWARRIOR is not set | 1303 | # CONFIG_USB_IOWARRIOR is not set |
| 1252 | # CONFIG_USB_TEST is not set | 1304 | # CONFIG_USB_TEST is not set |
| 1305 | # CONFIG_USB_ISIGHTFW is not set | ||
| 1253 | # CONFIG_USB_GADGET is not set | 1306 | # CONFIG_USB_GADGET is not set |
| 1254 | # CONFIG_MMC is not set | 1307 | # CONFIG_MMC is not set |
| 1255 | # CONFIG_MEMSTICK is not set | 1308 | # CONFIG_MEMSTICK is not set |
| @@ -1316,6 +1369,7 @@ CONFIG_XFS_POSIX_ACL=y | |||
| 1316 | # CONFIG_GFS2_FS is not set | 1369 | # CONFIG_GFS2_FS is not set |
| 1317 | CONFIG_OCFS2_FS=m | 1370 | CONFIG_OCFS2_FS=m |
| 1318 | CONFIG_OCFS2_FS_O2CB=m | 1371 | CONFIG_OCFS2_FS_O2CB=m |
| 1372 | CONFIG_OCFS2_FS_STATS=y | ||
| 1319 | CONFIG_OCFS2_DEBUG_MASKLOG=y | 1373 | CONFIG_OCFS2_DEBUG_MASKLOG=y |
| 1320 | # CONFIG_OCFS2_DEBUG_FS is not set | 1374 | # CONFIG_OCFS2_DEBUG_FS is not set |
| 1321 | CONFIG_DNOTIFY=y | 1375 | CONFIG_DNOTIFY=y |
| @@ -1371,6 +1425,7 @@ CONFIG_CONFIGFS_FS=m | |||
| 1371 | CONFIG_CRAMFS=y | 1425 | CONFIG_CRAMFS=y |
| 1372 | # CONFIG_VXFS_FS is not set | 1426 | # CONFIG_VXFS_FS is not set |
| 1373 | # CONFIG_MINIX_FS is not set | 1427 | # CONFIG_MINIX_FS is not set |
| 1428 | # CONFIG_OMFS_FS is not set | ||
| 1374 | # CONFIG_HPFS_FS is not set | 1429 | # CONFIG_HPFS_FS is not set |
| 1375 | # CONFIG_QNX4FS_FS is not set | 1430 | # CONFIG_QNX4FS_FS is not set |
| 1376 | # CONFIG_ROMFS_FS is not set | 1431 | # CONFIG_ROMFS_FS is not set |
| @@ -1394,7 +1449,6 @@ CONFIG_NFS_COMMON=y | |||
| 1394 | CONFIG_SUNRPC=y | 1449 | CONFIG_SUNRPC=y |
| 1395 | CONFIG_SUNRPC_GSS=y | 1450 | CONFIG_SUNRPC_GSS=y |
| 1396 | CONFIG_SUNRPC_XPRT_RDMA=m | 1451 | CONFIG_SUNRPC_XPRT_RDMA=m |
| 1397 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 1398 | CONFIG_RPCSEC_GSS_KRB5=y | 1452 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1399 | CONFIG_RPCSEC_GSS_SPKM3=m | 1453 | CONFIG_RPCSEC_GSS_SPKM3=m |
| 1400 | # CONFIG_SMB_FS is not set | 1454 | # CONFIG_SMB_FS is not set |
| @@ -1463,6 +1517,7 @@ CONFIG_BITREVERSE=y | |||
| 1463 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1517 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 1464 | CONFIG_CRC_CCITT=m | 1518 | CONFIG_CRC_CCITT=m |
| 1465 | # CONFIG_CRC16 is not set | 1519 | # CONFIG_CRC16 is not set |
| 1520 | CONFIG_CRC_T10DIF=y | ||
| 1466 | CONFIG_CRC_ITU_T=m | 1521 | CONFIG_CRC_ITU_T=m |
| 1467 | CONFIG_CRC32=y | 1522 | CONFIG_CRC32=y |
| 1468 | # CONFIG_CRC7 is not set | 1523 | # CONFIG_CRC7 is not set |
| @@ -1495,8 +1550,10 @@ CONFIG_DEBUG_FS=y | |||
| 1495 | CONFIG_DEBUG_KERNEL=y | 1550 | CONFIG_DEBUG_KERNEL=y |
| 1496 | # CONFIG_DEBUG_SHIRQ is not set | 1551 | # CONFIG_DEBUG_SHIRQ is not set |
| 1497 | CONFIG_DETECT_SOFTLOCKUP=y | 1552 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1553 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 1554 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 1498 | CONFIG_SCHED_DEBUG=y | 1555 | CONFIG_SCHED_DEBUG=y |
| 1499 | # CONFIG_SCHEDSTATS is not set | 1556 | CONFIG_SCHEDSTATS=y |
| 1500 | # CONFIG_TIMER_STATS is not set | 1557 | # CONFIG_TIMER_STATS is not set |
| 1501 | # CONFIG_DEBUG_OBJECTS is not set | 1558 | # CONFIG_DEBUG_OBJECTS is not set |
| 1502 | # CONFIG_SLUB_DEBUG_ON is not set | 1559 | # CONFIG_SLUB_DEBUG_ON is not set |
| @@ -1508,30 +1565,49 @@ CONFIG_SCHED_DEBUG=y | |||
| 1508 | # CONFIG_DEBUG_LOCK_ALLOC is not set | 1565 | # CONFIG_DEBUG_LOCK_ALLOC is not set |
| 1509 | # CONFIG_PROVE_LOCKING is not set | 1566 | # CONFIG_PROVE_LOCKING is not set |
| 1510 | # CONFIG_LOCK_STAT is not set | 1567 | # CONFIG_LOCK_STAT is not set |
| 1568 | CONFIG_TRACE_IRQFLAGS=y | ||
| 1511 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1569 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
| 1512 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1570 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
| 1571 | CONFIG_STACKTRACE=y | ||
| 1513 | # CONFIG_DEBUG_KOBJECT is not set | 1572 | # CONFIG_DEBUG_KOBJECT is not set |
| 1514 | CONFIG_DEBUG_BUGVERBOSE=y | 1573 | CONFIG_DEBUG_BUGVERBOSE=y |
| 1515 | # CONFIG_DEBUG_INFO is not set | 1574 | # CONFIG_DEBUG_INFO is not set |
| 1516 | # CONFIG_DEBUG_VM is not set | 1575 | # CONFIG_DEBUG_VM is not set |
| 1517 | # CONFIG_DEBUG_WRITECOUNT is not set | 1576 | # CONFIG_DEBUG_WRITECOUNT is not set |
| 1577 | CONFIG_DEBUG_MEMORY_INIT=y | ||
| 1518 | # CONFIG_DEBUG_LIST is not set | 1578 | # CONFIG_DEBUG_LIST is not set |
| 1519 | # CONFIG_DEBUG_SG is not set | 1579 | # CONFIG_DEBUG_SG is not set |
| 1580 | CONFIG_FRAME_POINTER=y | ||
| 1520 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1581 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 1521 | # CONFIG_RCU_TORTURE_TEST is not set | 1582 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1522 | # CONFIG_KPROBES_SANITY_TEST is not set | 1583 | # CONFIG_KPROBES_SANITY_TEST is not set |
| 1523 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1584 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 1524 | # CONFIG_LKDTM is not set | 1585 | # CONFIG_LKDTM is not set |
| 1525 | # CONFIG_FAULT_INJECTION is not set | 1586 | # CONFIG_FAULT_INJECTION is not set |
| 1587 | CONFIG_LATENCYTOP=y | ||
| 1588 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1589 | CONFIG_HAVE_FTRACE=y | ||
| 1590 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1591 | CONFIG_TRACER_MAX_TRACE=y | ||
| 1592 | CONFIG_TRACING=y | ||
| 1593 | # CONFIG_FTRACE is not set | ||
| 1594 | CONFIG_IRQSOFF_TRACER=y | ||
| 1595 | CONFIG_SCHED_TRACER=y | ||
| 1596 | CONFIG_CONTEXT_SWITCH_TRACER=y | ||
| 1597 | # CONFIG_FTRACE_STARTUP_TEST is not set | ||
| 1526 | # CONFIG_SAMPLES is not set | 1598 | # CONFIG_SAMPLES is not set |
| 1599 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1600 | # CONFIG_KGDB is not set | ||
| 1527 | CONFIG_DEBUG_STACKOVERFLOW=y | 1601 | CONFIG_DEBUG_STACKOVERFLOW=y |
| 1528 | # CONFIG_DEBUG_STACK_USAGE is not set | 1602 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1529 | # CONFIG_DEBUG_PAGEALLOC is not set | 1603 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1530 | CONFIG_HCALL_STATS=y | 1604 | CONFIG_HCALL_STATS=y |
| 1531 | CONFIG_DEBUGGER=y | 1605 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
| 1606 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
| 1532 | CONFIG_XMON=y | 1607 | CONFIG_XMON=y |
| 1533 | CONFIG_XMON_DEFAULT=y | 1608 | CONFIG_XMON_DEFAULT=y |
| 1534 | CONFIG_XMON_DISASSEMBLY=y | 1609 | CONFIG_XMON_DISASSEMBLY=y |
| 1610 | CONFIG_DEBUGGER=y | ||
| 1535 | CONFIG_IRQSTACKS=y | 1611 | CONFIG_IRQSTACKS=y |
| 1536 | CONFIG_VIRQ_DEBUG=y | 1612 | CONFIG_VIRQ_DEBUG=y |
| 1537 | # CONFIG_BOOTX_TEXT is not set | 1613 | # CONFIG_BOOTX_TEXT is not set |
| @@ -1590,6 +1666,10 @@ CONFIG_CRYPTO_CRC32C=m | |||
| 1590 | CONFIG_CRYPTO_MD4=m | 1666 | CONFIG_CRYPTO_MD4=m |
| 1591 | CONFIG_CRYPTO_MD5=y | 1667 | CONFIG_CRYPTO_MD5=y |
| 1592 | CONFIG_CRYPTO_MICHAEL_MIC=m | 1668 | CONFIG_CRYPTO_MICHAEL_MIC=m |
| 1669 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1670 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1671 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1672 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1593 | CONFIG_CRYPTO_SHA1=m | 1673 | CONFIG_CRYPTO_SHA1=m |
| 1594 | CONFIG_CRYPTO_SHA256=m | 1674 | CONFIG_CRYPTO_SHA256=m |
| 1595 | CONFIG_CRYPTO_SHA512=m | 1675 | CONFIG_CRYPTO_SHA512=m |
diff --git a/arch/powerpc/configs/sbc8641d_defconfig b/arch/powerpc/configs/sbc8641d_defconfig index 8227510b41a9..f545421f9857 100644 --- a/arch/powerpc/configs/sbc8641d_defconfig +++ b/arch/powerpc/configs/sbc8641d_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.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Mon Jun 9 08:52:19 2008 | 4 | # Thu Aug 21 00:52:15 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -33,6 +33,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | 35 | CONFIG_STACKTRACE_SUPPORT=y |
| 36 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | 37 | CONFIG_LOCKDEP_SUPPORT=y |
| 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 38 | CONFIG_GENERIC_LOCKBREAK=y | 39 | CONFIG_GENERIC_LOCKBREAK=y |
| @@ -92,7 +93,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 92 | CONFIG_SYSCTL=y | 93 | CONFIG_SYSCTL=y |
| 93 | CONFIG_EMBEDDED=y | 94 | CONFIG_EMBEDDED=y |
| 94 | CONFIG_SYSCTL_SYSCALL=y | 95 | CONFIG_SYSCTL_SYSCALL=y |
| 95 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 96 | CONFIG_KALLSYMS=y | 96 | CONFIG_KALLSYMS=y |
| 97 | # CONFIG_KALLSYMS_ALL is not set | 97 | # CONFIG_KALLSYMS_ALL is not set |
| 98 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 98 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -100,6 +100,7 @@ CONFIG_HOTPLUG=y | |||
| 100 | CONFIG_PRINTK=y | 100 | CONFIG_PRINTK=y |
| 101 | CONFIG_BUG=y | 101 | CONFIG_BUG=y |
| 102 | CONFIG_ELF_CORE=y | 102 | CONFIG_ELF_CORE=y |
| 103 | CONFIG_PCSPKR_PLATFORM=y | ||
| 103 | CONFIG_COMPAT_BRK=y | 104 | CONFIG_COMPAT_BRK=y |
| 104 | CONFIG_BASE_FULL=y | 105 | CONFIG_BASE_FULL=y |
| 105 | CONFIG_FUTEX=y | 106 | CONFIG_FUTEX=y |
| @@ -117,10 +118,16 @@ CONFIG_SLAB=y | |||
| 117 | # CONFIG_MARKERS is not set | 118 | # CONFIG_MARKERS is not set |
| 118 | CONFIG_HAVE_OPROFILE=y | 119 | CONFIG_HAVE_OPROFILE=y |
| 119 | # CONFIG_KPROBES is not set | 120 | # CONFIG_KPROBES is not set |
| 121 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 122 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 120 | CONFIG_HAVE_KPROBES=y | 123 | CONFIG_HAVE_KPROBES=y |
| 121 | CONFIG_HAVE_KRETPROBES=y | 124 | CONFIG_HAVE_KRETPROBES=y |
| 125 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 122 | # CONFIG_HAVE_DMA_ATTRS is not set | 126 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 127 | CONFIG_USE_GENERIC_SMP_HELPERS=y | ||
| 128 | # CONFIG_HAVE_CLK is not set | ||
| 123 | CONFIG_PROC_PAGE_MONITOR=y | 129 | CONFIG_PROC_PAGE_MONITOR=y |
| 130 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 124 | CONFIG_SLABINFO=y | 131 | CONFIG_SLABINFO=y |
| 125 | CONFIG_RT_MUTEXES=y | 132 | CONFIG_RT_MUTEXES=y |
| 126 | # CONFIG_TINY_SHMEM is not set | 133 | # CONFIG_TINY_SHMEM is not set |
| @@ -138,6 +145,7 @@ CONFIG_BLOCK=y | |||
| 138 | # CONFIG_BLK_DEV_IO_TRACE is not set | 145 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 139 | # CONFIG_LSF is not set | 146 | # CONFIG_LSF is not set |
| 140 | # CONFIG_BLK_DEV_BSG is not set | 147 | # CONFIG_BLK_DEV_BSG is not set |
| 148 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 141 | 149 | ||
| 142 | # | 150 | # |
| 143 | # IO Schedulers | 151 | # IO Schedulers |
| @@ -156,30 +164,40 @@ CONFIG_CLASSIC_RCU=y | |||
| 156 | # | 164 | # |
| 157 | # Platform support | 165 | # Platform support |
| 158 | # | 166 | # |
| 159 | # CONFIG_PPC_MULTIPLATFORM is not set | 167 | CONFIG_PPC_MULTIPLATFORM=y |
| 160 | # CONFIG_PPC_82xx is not set | 168 | CONFIG_CLASSIC32=y |
| 161 | # CONFIG_PPC_83xx is not set | 169 | CONFIG_PPC_CHRP=y |
| 162 | CONFIG_PPC_86xx=y | 170 | # CONFIG_MPC5121_ADS is not set |
| 163 | # CONFIG_PPC_MPC512x is not set | 171 | # CONFIG_MPC5121_GENERIC is not set |
| 164 | # CONFIG_PPC_MPC5121 is not set | 172 | # CONFIG_PPC_MPC52xx is not set |
| 173 | CONFIG_PPC_PMAC=y | ||
| 165 | # CONFIG_PPC_CELL is not set | 174 | # CONFIG_PPC_CELL is not set |
| 166 | # CONFIG_PPC_CELL_NATIVE is not set | 175 | # CONFIG_PPC_CELL_NATIVE is not set |
| 176 | # CONFIG_PPC_82xx is not set | ||
| 167 | # CONFIG_PQ2ADS is not set | 177 | # CONFIG_PQ2ADS is not set |
| 178 | # CONFIG_PPC_83xx is not set | ||
| 179 | CONFIG_PPC_86xx=y | ||
| 168 | # CONFIG_MPC8641_HPCN is not set | 180 | # CONFIG_MPC8641_HPCN is not set |
| 169 | CONFIG_SBC8641D=y | 181 | CONFIG_SBC8641D=y |
| 170 | # CONFIG_MPC8610_HPCD is not set | 182 | # CONFIG_MPC8610_HPCD is not set |
| 171 | CONFIG_MPC8641=y | 183 | CONFIG_MPC8641=y |
| 184 | CONFIG_PPC_NATIVE=y | ||
| 185 | # CONFIG_UDBG_RTAS_CONSOLE is not set | ||
| 172 | # CONFIG_IPIC is not set | 186 | # CONFIG_IPIC is not set |
| 173 | CONFIG_MPIC=y | 187 | CONFIG_MPIC=y |
| 174 | # CONFIG_MPIC_WEIRD is not set | 188 | # CONFIG_MPIC_WEIRD is not set |
| 175 | # CONFIG_PPC_I8259 is not set | 189 | CONFIG_PPC_I8259=y |
| 176 | # CONFIG_PPC_RTAS is not set | 190 | CONFIG_PPC_RTAS=y |
| 191 | # CONFIG_RTAS_ERROR_LOGGING is not set | ||
| 192 | CONFIG_RTAS_PROC=y | ||
| 177 | # CONFIG_MMIO_NVRAM is not set | 193 | # CONFIG_MMIO_NVRAM is not set |
| 178 | # CONFIG_PPC_MPC106 is not set | 194 | CONFIG_PPC_MPC106=y |
| 179 | # CONFIG_PPC_970_NAP is not set | 195 | # CONFIG_PPC_970_NAP is not set |
| 180 | # CONFIG_PPC_INDIRECT_IO is not set | 196 | # CONFIG_PPC_INDIRECT_IO is not set |
| 181 | # CONFIG_GENERIC_IOMAP is not set | 197 | # CONFIG_GENERIC_IOMAP is not set |
| 182 | # CONFIG_CPU_FREQ is not set | 198 | # CONFIG_CPU_FREQ is not set |
| 199 | # CONFIG_PPC601_SYNC_FIX is not set | ||
| 200 | # CONFIG_TAU is not set | ||
| 183 | # CONFIG_FSL_ULI1575 is not set | 201 | # CONFIG_FSL_ULI1575 is not set |
| 184 | 202 | ||
| 185 | # | 203 | # |
| @@ -195,7 +213,7 @@ CONFIG_HZ_250=y | |||
| 195 | # CONFIG_HZ_300 is not set | 213 | # CONFIG_HZ_300 is not set |
| 196 | # CONFIG_HZ_1000 is not set | 214 | # CONFIG_HZ_1000 is not set |
| 197 | CONFIG_HZ=250 | 215 | CONFIG_HZ=250 |
| 198 | # CONFIG_SCHED_HRTICK is not set | 216 | CONFIG_SCHED_HRTICK=y |
| 199 | # CONFIG_PREEMPT_NONE is not set | 217 | # CONFIG_PREEMPT_NONE is not set |
| 200 | # CONFIG_PREEMPT_VOLUNTARY is not set | 218 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 201 | CONFIG_PREEMPT=y | 219 | CONFIG_PREEMPT=y |
| @@ -203,9 +221,11 @@ CONFIG_PREEMPT=y | |||
| 203 | CONFIG_BINFMT_ELF=y | 221 | CONFIG_BINFMT_ELF=y |
| 204 | CONFIG_BINFMT_MISC=m | 222 | CONFIG_BINFMT_MISC=m |
| 205 | # CONFIG_IOMMU_HELPER is not set | 223 | # CONFIG_IOMMU_HELPER is not set |
| 224 | # CONFIG_HOTPLUG_CPU is not set | ||
| 206 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 225 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| 207 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 226 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
| 208 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 227 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
| 228 | # CONFIG_KEXEC is not set | ||
| 209 | CONFIG_IRQ_ALL_CPUS=y | 229 | CONFIG_IRQ_ALL_CPUS=y |
| 210 | CONFIG_ARCH_FLATMEM_ENABLE=y | 230 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 211 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 231 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
| @@ -219,6 +239,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 219 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 239 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 220 | CONFIG_PAGEFLAGS_EXTENDED=y | 240 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 221 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 241 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 242 | CONFIG_MIGRATION=y | ||
| 222 | # CONFIG_RESOURCES_64BIT is not set | 243 | # CONFIG_RESOURCES_64BIT is not set |
| 223 | CONFIG_ZONE_DMA_FLAG=1 | 244 | CONFIG_ZONE_DMA_FLAG=1 |
| 224 | CONFIG_BOUNCE=y | 245 | CONFIG_BOUNCE=y |
| @@ -226,6 +247,7 @@ CONFIG_VIRT_TO_BUS=y | |||
| 226 | CONFIG_FORCE_MAX_ZONEORDER=11 | 247 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 227 | # CONFIG_PROC_DEVICETREE is not set | 248 | # CONFIG_PROC_DEVICETREE is not set |
| 228 | # CONFIG_CMDLINE_BOOL is not set | 249 | # CONFIG_CMDLINE_BOOL is not set |
| 250 | CONFIG_EXTRA_TARGETS="" | ||
| 229 | # CONFIG_PM is not set | 251 | # CONFIG_PM is not set |
| 230 | CONFIG_SECCOMP=y | 252 | CONFIG_SECCOMP=y |
| 231 | CONFIG_ISA_DMA_API=y | 253 | CONFIG_ISA_DMA_API=y |
| @@ -233,11 +255,13 @@ CONFIG_ISA_DMA_API=y | |||
| 233 | # | 255 | # |
| 234 | # Bus options | 256 | # Bus options |
| 235 | # | 257 | # |
| 258 | # CONFIG_ISA is not set | ||
| 236 | CONFIG_ZONE_DMA=y | 259 | CONFIG_ZONE_DMA=y |
| 237 | CONFIG_GENERIC_ISA_DMA=y | 260 | CONFIG_GENERIC_ISA_DMA=y |
| 238 | CONFIG_PPC_INDIRECT_PCI=y | 261 | CONFIG_PPC_INDIRECT_PCI=y |
| 239 | CONFIG_FSL_SOC=y | 262 | CONFIG_FSL_SOC=y |
| 240 | CONFIG_FSL_PCI=y | 263 | CONFIG_FSL_PCI=y |
| 264 | CONFIG_PPC_PCI_CHOICE=y | ||
| 241 | CONFIG_PCI=y | 265 | CONFIG_PCI=y |
| 242 | CONFIG_PCI_DOMAINS=y | 266 | CONFIG_PCI_DOMAINS=y |
| 243 | CONFIG_PCI_SYSCALL=y | 267 | CONFIG_PCI_SYSCALL=y |
| @@ -265,10 +289,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
| 265 | CONFIG_KERNEL_START=0xc0000000 | 289 | CONFIG_KERNEL_START=0xc0000000 |
| 266 | CONFIG_PHYSICAL_START=0x00000000 | 290 | CONFIG_PHYSICAL_START=0x00000000 |
| 267 | CONFIG_TASK_SIZE=0xc0000000 | 291 | CONFIG_TASK_SIZE=0xc0000000 |
| 268 | |||
| 269 | # | ||
| 270 | # Networking | ||
| 271 | # | ||
| 272 | CONFIG_NET=y | 292 | CONFIG_NET=y |
| 273 | 293 | ||
| 274 | # | 294 | # |
| @@ -282,6 +302,7 @@ CONFIG_XFRM_USER=m | |||
| 282 | # CONFIG_XFRM_SUB_POLICY is not set | 302 | # CONFIG_XFRM_SUB_POLICY is not set |
| 283 | # CONFIG_XFRM_MIGRATE is not set | 303 | # CONFIG_XFRM_MIGRATE is not set |
| 284 | # CONFIG_XFRM_STATISTICS is not set | 304 | # CONFIG_XFRM_STATISTICS is not set |
| 305 | CONFIG_XFRM_IPCOMP=m | ||
| 285 | CONFIG_NET_KEY=m | 306 | CONFIG_NET_KEY=m |
| 286 | # CONFIG_NET_KEY_MIGRATE is not set | 307 | # CONFIG_NET_KEY_MIGRATE is not set |
| 287 | CONFIG_INET=y | 308 | CONFIG_INET=y |
| @@ -406,6 +427,7 @@ CONFIG_IP_NF_MANGLE=m | |||
| 406 | CONFIG_IP_NF_TARGET_ECN=m | 427 | CONFIG_IP_NF_TARGET_ECN=m |
| 407 | # CONFIG_IP_NF_TARGET_TTL is not set | 428 | # CONFIG_IP_NF_TARGET_TTL is not set |
| 408 | CONFIG_IP_NF_RAW=m | 429 | CONFIG_IP_NF_RAW=m |
| 430 | # CONFIG_IP_NF_SECURITY is not set | ||
| 409 | CONFIG_IP_NF_ARPTABLES=m | 431 | CONFIG_IP_NF_ARPTABLES=m |
| 410 | CONFIG_IP_NF_ARPFILTER=m | 432 | CONFIG_IP_NF_ARPFILTER=m |
| 411 | CONFIG_IP_NF_ARP_MANGLE=m | 433 | CONFIG_IP_NF_ARP_MANGLE=m |
| @@ -429,6 +451,7 @@ CONFIG_IP6_NF_TARGET_LOG=m | |||
| 429 | CONFIG_IP6_NF_MANGLE=m | 451 | CONFIG_IP6_NF_MANGLE=m |
| 430 | # CONFIG_IP6_NF_TARGET_HL is not set | 452 | # CONFIG_IP6_NF_TARGET_HL is not set |
| 431 | CONFIG_IP6_NF_RAW=m | 453 | CONFIG_IP6_NF_RAW=m |
| 454 | # CONFIG_IP6_NF_SECURITY is not set | ||
| 432 | 455 | ||
| 433 | # | 456 | # |
| 434 | # Bridge: Netfilter Configuration | 457 | # Bridge: Netfilter Configuration |
| @@ -451,8 +474,10 @@ CONFIG_ATM_LANE=m | |||
| 451 | CONFIG_ATM_MPOA=m | 474 | CONFIG_ATM_MPOA=m |
| 452 | CONFIG_ATM_BR2684=m | 475 | CONFIG_ATM_BR2684=m |
| 453 | # CONFIG_ATM_BR2684_IPFILTER is not set | 476 | # CONFIG_ATM_BR2684_IPFILTER is not set |
| 477 | CONFIG_STP=m | ||
| 454 | CONFIG_BRIDGE=m | 478 | CONFIG_BRIDGE=m |
| 455 | CONFIG_VLAN_8021Q=m | 479 | CONFIG_VLAN_8021Q=m |
| 480 | # CONFIG_VLAN_8021Q_GVRP is not set | ||
| 456 | # CONFIG_DECNET is not set | 481 | # CONFIG_DECNET is not set |
| 457 | CONFIG_LLC=m | 482 | CONFIG_LLC=m |
| 458 | # CONFIG_LLC2 is not set | 483 | # CONFIG_LLC2 is not set |
| @@ -472,7 +497,6 @@ CONFIG_NET_SCH_HTB=m | |||
| 472 | CONFIG_NET_SCH_HFSC=m | 497 | CONFIG_NET_SCH_HFSC=m |
| 473 | CONFIG_NET_SCH_ATM=m | 498 | CONFIG_NET_SCH_ATM=m |
| 474 | CONFIG_NET_SCH_PRIO=m | 499 | CONFIG_NET_SCH_PRIO=m |
| 475 | # CONFIG_NET_SCH_RR is not set | ||
| 476 | CONFIG_NET_SCH_RED=m | 500 | CONFIG_NET_SCH_RED=m |
| 477 | CONFIG_NET_SCH_SFQ=m | 501 | CONFIG_NET_SCH_SFQ=m |
| 478 | CONFIG_NET_SCH_TEQL=m | 502 | CONFIG_NET_SCH_TEQL=m |
| @@ -625,6 +649,7 @@ CONFIG_OF_I2C=y | |||
| 625 | # CONFIG_PARPORT is not set | 649 | # CONFIG_PARPORT is not set |
| 626 | CONFIG_BLK_DEV=y | 650 | CONFIG_BLK_DEV=y |
| 627 | # CONFIG_BLK_DEV_FD is not set | 651 | # CONFIG_BLK_DEV_FD is not set |
| 652 | # CONFIG_MAC_FLOPPY is not set | ||
| 628 | # CONFIG_BLK_CPQ_DA is not set | 653 | # CONFIG_BLK_CPQ_DA is not set |
| 629 | # CONFIG_BLK_CPQ_CISS_DA is not set | 654 | # CONFIG_BLK_CPQ_CISS_DA is not set |
| 630 | # CONFIG_BLK_DEV_DAC960 is not set | 655 | # CONFIG_BLK_DEV_DAC960 is not set |
| @@ -640,12 +665,14 @@ CONFIG_BLK_DEV_RAM_SIZE=4096 | |||
| 640 | # CONFIG_BLK_DEV_XIP is not set | 665 | # CONFIG_BLK_DEV_XIP is not set |
| 641 | # CONFIG_CDROM_PKTCDVD is not set | 666 | # CONFIG_CDROM_PKTCDVD is not set |
| 642 | # CONFIG_ATA_OVER_ETH is not set | 667 | # CONFIG_ATA_OVER_ETH is not set |
| 668 | # CONFIG_BLK_DEV_HD is not set | ||
| 643 | CONFIG_MISC_DEVICES=y | 669 | CONFIG_MISC_DEVICES=y |
| 644 | # CONFIG_PHANTOM is not set | 670 | # CONFIG_PHANTOM is not set |
| 645 | # CONFIG_EEPROM_93CX6 is not set | 671 | # CONFIG_EEPROM_93CX6 is not set |
| 646 | # CONFIG_SGI_IOC4 is not set | 672 | # CONFIG_SGI_IOC4 is not set |
| 647 | # CONFIG_TIFM_CORE is not set | 673 | # CONFIG_TIFM_CORE is not set |
| 648 | # CONFIG_ENCLOSURE_SERVICES is not set | 674 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 675 | # CONFIG_HP_ILO is not set | ||
| 649 | CONFIG_HAVE_IDE=y | 676 | CONFIG_HAVE_IDE=y |
| 650 | # CONFIG_IDE is not set | 677 | # CONFIG_IDE is not set |
| 651 | 678 | ||
| @@ -680,12 +707,15 @@ CONFIG_DM_ZERO=y | |||
| 680 | # | 707 | # |
| 681 | # IEEE 1394 (FireWire) support | 708 | # IEEE 1394 (FireWire) support |
| 682 | # | 709 | # |
| 710 | |||
| 711 | # | ||
| 712 | # Enable only one of the two stacks, unless you know what you are doing | ||
| 713 | # | ||
| 683 | # CONFIG_FIREWIRE is not set | 714 | # CONFIG_FIREWIRE is not set |
| 684 | # CONFIG_IEEE1394 is not set | 715 | # CONFIG_IEEE1394 is not set |
| 685 | # CONFIG_I2O is not set | 716 | # CONFIG_I2O is not set |
| 686 | # CONFIG_MACINTOSH_DRIVERS is not set | 717 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 687 | CONFIG_NETDEVICES=y | 718 | CONFIG_NETDEVICES=y |
| 688 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 689 | CONFIG_DUMMY=m | 719 | CONFIG_DUMMY=m |
| 690 | CONFIG_BONDING=m | 720 | CONFIG_BONDING=m |
| 691 | # CONFIG_MACVLAN is not set | 721 | # CONFIG_MACVLAN is not set |
| @@ -712,6 +742,8 @@ CONFIG_BROADCOM_PHY=y | |||
| 712 | # CONFIG_MDIO_BITBANG is not set | 742 | # CONFIG_MDIO_BITBANG is not set |
| 713 | CONFIG_NET_ETHERNET=y | 743 | CONFIG_NET_ETHERNET=y |
| 714 | CONFIG_MII=y | 744 | CONFIG_MII=y |
| 745 | # CONFIG_MACE is not set | ||
| 746 | # CONFIG_BMAC is not set | ||
| 715 | # CONFIG_HAPPYMEAL is not set | 747 | # CONFIG_HAPPYMEAL is not set |
| 716 | # CONFIG_SUNGEM is not set | 748 | # CONFIG_SUNGEM is not set |
| 717 | # CONFIG_CASSINI is not set | 749 | # CONFIG_CASSINI is not set |
| @@ -729,7 +761,6 @@ CONFIG_NETDEV_1000=y | |||
| 729 | # CONFIG_DL2K is not set | 761 | # CONFIG_DL2K is not set |
| 730 | # CONFIG_E1000 is not set | 762 | # CONFIG_E1000 is not set |
| 731 | # CONFIG_E1000E is not set | 763 | # CONFIG_E1000E is not set |
| 732 | # CONFIG_E1000E_ENABLED is not set | ||
| 733 | # CONFIG_IP1000 is not set | 764 | # CONFIG_IP1000 is not set |
| 734 | # CONFIG_IGB is not set | 765 | # CONFIG_IGB is not set |
| 735 | # CONFIG_NS83820 is not set | 766 | # CONFIG_NS83820 is not set |
| @@ -743,9 +774,10 @@ CONFIG_NETDEV_1000=y | |||
| 743 | # CONFIG_TIGON3 is not set | 774 | # CONFIG_TIGON3 is not set |
| 744 | # CONFIG_BNX2 is not set | 775 | # CONFIG_BNX2 is not set |
| 745 | CONFIG_GIANFAR=y | 776 | CONFIG_GIANFAR=y |
| 746 | # CONFIG_GFAR_NAPI is not set | 777 | # CONFIG_MV643XX_ETH is not set |
| 747 | # CONFIG_QLA3XXX is not set | 778 | # CONFIG_QLA3XXX is not set |
| 748 | # CONFIG_ATL1 is not set | 779 | # CONFIG_ATL1 is not set |
| 780 | # CONFIG_ATL1E is not set | ||
| 749 | # CONFIG_NETDEV_10000 is not set | 781 | # CONFIG_NETDEV_10000 is not set |
| 750 | # CONFIG_TR is not set | 782 | # CONFIG_TR is not set |
| 751 | 783 | ||
| @@ -768,7 +800,7 @@ CONFIG_ATM_DRIVERS=y | |||
| 768 | # CONFIG_ATM_AMBASSADOR is not set | 800 | # CONFIG_ATM_AMBASSADOR is not set |
| 769 | # CONFIG_ATM_HORIZON is not set | 801 | # CONFIG_ATM_HORIZON is not set |
| 770 | # CONFIG_ATM_IA is not set | 802 | # CONFIG_ATM_IA is not set |
| 771 | # CONFIG_ATM_FORE200E_MAYBE is not set | 803 | # CONFIG_ATM_FORE200E is not set |
| 772 | # CONFIG_ATM_HE is not set | 804 | # CONFIG_ATM_HE is not set |
| 773 | # CONFIG_FDDI is not set | 805 | # CONFIG_FDDI is not set |
| 774 | # CONFIG_HIPPI is not set | 806 | # CONFIG_HIPPI is not set |
| @@ -834,6 +866,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | |||
| 834 | # Character devices | 866 | # Character devices |
| 835 | # | 867 | # |
| 836 | CONFIG_VT=y | 868 | CONFIG_VT=y |
| 869 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 837 | CONFIG_VT_CONSOLE=y | 870 | CONFIG_VT_CONSOLE=y |
| 838 | CONFIG_HW_CONSOLE=y | 871 | CONFIG_HW_CONSOLE=y |
| 839 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 872 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| @@ -857,11 +890,14 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=2 | |||
| 857 | # CONFIG_SERIAL_UARTLITE is not set | 890 | # CONFIG_SERIAL_UARTLITE is not set |
| 858 | CONFIG_SERIAL_CORE=y | 891 | CONFIG_SERIAL_CORE=y |
| 859 | CONFIG_SERIAL_CORE_CONSOLE=y | 892 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 893 | # CONFIG_SERIAL_PMACZILOG is not set | ||
| 860 | # CONFIG_SERIAL_JSM is not set | 894 | # CONFIG_SERIAL_JSM is not set |
| 861 | # CONFIG_SERIAL_OF_PLATFORM is not set | 895 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 862 | CONFIG_UNIX98_PTYS=y | 896 | CONFIG_UNIX98_PTYS=y |
| 863 | CONFIG_LEGACY_PTYS=y | 897 | CONFIG_LEGACY_PTYS=y |
| 864 | CONFIG_LEGACY_PTY_COUNT=256 | 898 | CONFIG_LEGACY_PTY_COUNT=256 |
| 899 | # CONFIG_BRIQ_PANEL is not set | ||
| 900 | # CONFIG_HVC_RTAS is not set | ||
| 865 | # CONFIG_IPMI_HANDLER is not set | 901 | # CONFIG_IPMI_HANDLER is not set |
| 866 | CONFIG_HW_RANDOM=m | 902 | CONFIG_HW_RANDOM=m |
| 867 | # CONFIG_NVRAM is not set | 903 | # CONFIG_NVRAM is not set |
| @@ -874,42 +910,69 @@ CONFIG_DEVPORT=y | |||
| 874 | CONFIG_I2C=y | 910 | CONFIG_I2C=y |
| 875 | CONFIG_I2C_BOARDINFO=y | 911 | CONFIG_I2C_BOARDINFO=y |
| 876 | CONFIG_I2C_CHARDEV=y | 912 | CONFIG_I2C_CHARDEV=y |
| 913 | CONFIG_I2C_HELPER_AUTO=y | ||
| 877 | 914 | ||
| 878 | # | 915 | # |
| 879 | # I2C Hardware Bus support | 916 | # I2C Hardware Bus support |
| 880 | # | 917 | # |
| 918 | |||
| 919 | # | ||
| 920 | # PC SMBus host controller drivers | ||
| 921 | # | ||
| 881 | # CONFIG_I2C_ALI1535 is not set | 922 | # CONFIG_I2C_ALI1535 is not set |
| 882 | # CONFIG_I2C_ALI1563 is not set | 923 | # CONFIG_I2C_ALI1563 is not set |
| 883 | # CONFIG_I2C_ALI15X3 is not set | 924 | # CONFIG_I2C_ALI15X3 is not set |
| 884 | # CONFIG_I2C_AMD756 is not set | 925 | # CONFIG_I2C_AMD756 is not set |
| 885 | # CONFIG_I2C_AMD8111 is not set | 926 | # CONFIG_I2C_AMD8111 is not set |
| 886 | # CONFIG_I2C_I801 is not set | 927 | # CONFIG_I2C_I801 is not set |
| 887 | # CONFIG_I2C_I810 is not set | 928 | # CONFIG_I2C_ISCH is not set |
| 888 | # CONFIG_I2C_PIIX4 is not set | 929 | # CONFIG_I2C_PIIX4 is not set |
| 889 | CONFIG_I2C_MPC=y | ||
| 890 | # CONFIG_I2C_NFORCE2 is not set | 930 | # CONFIG_I2C_NFORCE2 is not set |
| 891 | # CONFIG_I2C_OCORES is not set | ||
| 892 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 893 | # CONFIG_I2C_PROSAVAGE is not set | ||
| 894 | # CONFIG_I2C_SAVAGE4 is not set | ||
| 895 | # CONFIG_I2C_SIMTEC is not set | ||
| 896 | # CONFIG_I2C_SIS5595 is not set | 931 | # CONFIG_I2C_SIS5595 is not set |
| 897 | # CONFIG_I2C_SIS630 is not set | 932 | # CONFIG_I2C_SIS630 is not set |
| 898 | # CONFIG_I2C_SIS96X is not set | 933 | # CONFIG_I2C_SIS96X is not set |
| 899 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 900 | # CONFIG_I2C_STUB is not set | ||
| 901 | # CONFIG_I2C_VIA is not set | 934 | # CONFIG_I2C_VIA is not set |
| 902 | # CONFIG_I2C_VIAPRO is not set | 935 | # CONFIG_I2C_VIAPRO is not set |
| 936 | |||
| 937 | # | ||
| 938 | # Mac SMBus host controller drivers | ||
| 939 | # | ||
| 940 | # CONFIG_I2C_HYDRA is not set | ||
| 941 | CONFIG_I2C_POWERMAC=y | ||
| 942 | |||
| 943 | # | ||
| 944 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 945 | # | ||
| 946 | CONFIG_I2C_MPC=y | ||
| 947 | # CONFIG_I2C_OCORES is not set | ||
| 948 | # CONFIG_I2C_SIMTEC is not set | ||
| 949 | |||
| 950 | # | ||
| 951 | # External I2C/SMBus adapter drivers | ||
| 952 | # | ||
| 953 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 954 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 955 | |||
| 956 | # | ||
| 957 | # Graphics adapter I2C/DDC channel drivers | ||
| 958 | # | ||
| 903 | # CONFIG_I2C_VOODOO3 is not set | 959 | # CONFIG_I2C_VOODOO3 is not set |
| 960 | |||
| 961 | # | ||
| 962 | # Other I2C/SMBus bus drivers | ||
| 963 | # | ||
| 904 | # CONFIG_I2C_PCA_PLATFORM is not set | 964 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 965 | # CONFIG_I2C_STUB is not set | ||
| 905 | 966 | ||
| 906 | # | 967 | # |
| 907 | # Miscellaneous I2C Chip support | 968 | # Miscellaneous I2C Chip support |
| 908 | # | 969 | # |
| 909 | # CONFIG_DS1682 is not set | 970 | # CONFIG_DS1682 is not set |
| 971 | # CONFIG_AT24 is not set | ||
| 910 | # CONFIG_SENSORS_EEPROM is not set | 972 | # CONFIG_SENSORS_EEPROM is not set |
| 911 | # CONFIG_SENSORS_PCF8574 is not set | 973 | # CONFIG_SENSORS_PCF8574 is not set |
| 912 | # CONFIG_PCF8575 is not set | 974 | # CONFIG_PCF8575 is not set |
| 975 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 913 | # CONFIG_SENSORS_PCF8591 is not set | 976 | # CONFIG_SENSORS_PCF8591 is not set |
| 914 | # CONFIG_SENSORS_MAX6875 is not set | 977 | # CONFIG_SENSORS_MAX6875 is not set |
| 915 | # CONFIG_SENSORS_TSL2550 is not set | 978 | # CONFIG_SENSORS_TSL2550 is not set |
| @@ -918,10 +981,13 @@ CONFIG_I2C_MPC=y | |||
| 918 | # CONFIG_I2C_DEBUG_BUS is not set | 981 | # CONFIG_I2C_DEBUG_BUS is not set |
| 919 | # CONFIG_I2C_DEBUG_CHIP is not set | 982 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 920 | # CONFIG_SPI is not set | 983 | # CONFIG_SPI is not set |
| 984 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 985 | # CONFIG_GPIOLIB is not set | ||
| 921 | # CONFIG_W1 is not set | 986 | # CONFIG_W1 is not set |
| 922 | # CONFIG_POWER_SUPPLY is not set | 987 | # CONFIG_POWER_SUPPLY is not set |
| 923 | CONFIG_HWMON=y | 988 | CONFIG_HWMON=y |
| 924 | # CONFIG_HWMON_VID is not set | 989 | # CONFIG_HWMON_VID is not set |
| 990 | # CONFIG_SENSORS_AD7414 is not set | ||
| 925 | # CONFIG_SENSORS_AD7418 is not set | 991 | # CONFIG_SENSORS_AD7418 is not set |
| 926 | # CONFIG_SENSORS_ADM1021 is not set | 992 | # CONFIG_SENSORS_ADM1021 is not set |
| 927 | # CONFIG_SENSORS_ADM1025 is not set | 993 | # CONFIG_SENSORS_ADM1025 is not set |
| @@ -931,6 +997,7 @@ CONFIG_HWMON=y | |||
| 931 | # CONFIG_SENSORS_ADM9240 is not set | 997 | # CONFIG_SENSORS_ADM9240 is not set |
| 932 | # CONFIG_SENSORS_ADT7470 is not set | 998 | # CONFIG_SENSORS_ADT7470 is not set |
| 933 | # CONFIG_SENSORS_ADT7473 is not set | 999 | # CONFIG_SENSORS_ADT7473 is not set |
| 1000 | # CONFIG_SENSORS_AMS is not set | ||
| 934 | # CONFIG_SENSORS_ATXP1 is not set | 1001 | # CONFIG_SENSORS_ATXP1 is not set |
| 935 | # CONFIG_SENSORS_DS1621 is not set | 1002 | # CONFIG_SENSORS_DS1621 is not set |
| 936 | # CONFIG_SENSORS_I5K_AMB is not set | 1003 | # CONFIG_SENSORS_I5K_AMB is not set |
| @@ -975,6 +1042,7 @@ CONFIG_HWMON=y | |||
| 975 | # CONFIG_SENSORS_W83627EHF is not set | 1042 | # CONFIG_SENSORS_W83627EHF is not set |
| 976 | # CONFIG_HWMON_DEBUG_CHIP is not set | 1043 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 977 | # CONFIG_THERMAL is not set | 1044 | # CONFIG_THERMAL is not set |
| 1045 | # CONFIG_THERMAL_HWMON is not set | ||
| 978 | CONFIG_WATCHDOG=y | 1046 | CONFIG_WATCHDOG=y |
| 979 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 1047 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
| 980 | 1048 | ||
| @@ -982,6 +1050,9 @@ CONFIG_WATCHDOG=y | |||
| 982 | # Watchdog Device Drivers | 1050 | # Watchdog Device Drivers |
| 983 | # | 1051 | # |
| 984 | CONFIG_SOFT_WATCHDOG=m | 1052 | CONFIG_SOFT_WATCHDOG=m |
| 1053 | # CONFIG_ALIM7101_WDT is not set | ||
| 1054 | # CONFIG_8xxx_WDT is not set | ||
| 1055 | # CONFIG_WATCHDOG_RTAS is not set | ||
| 985 | 1056 | ||
| 986 | # | 1057 | # |
| 987 | # PCI-based Watchdog Cards | 1058 | # PCI-based Watchdog Cards |
| @@ -998,8 +1069,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 998 | # | 1069 | # |
| 999 | # Multifunction device drivers | 1070 | # Multifunction device drivers |
| 1000 | # | 1071 | # |
| 1072 | # CONFIG_MFD_CORE is not set | ||
| 1001 | # CONFIG_MFD_SM501 is not set | 1073 | # CONFIG_MFD_SM501 is not set |
| 1002 | # CONFIG_HTC_PASIC3 is not set | 1074 | # CONFIG_HTC_PASIC3 is not set |
| 1075 | # CONFIG_MFD_TMIO is not set | ||
| 1003 | 1076 | ||
| 1004 | # | 1077 | # |
| 1005 | # Multimedia devices | 1078 | # Multimedia devices |
| @@ -1038,10 +1111,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m | |||
| 1038 | CONFIG_VGA_CONSOLE=y | 1111 | CONFIG_VGA_CONSOLE=y |
| 1039 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set | 1112 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set |
| 1040 | CONFIG_DUMMY_CONSOLE=y | 1113 | CONFIG_DUMMY_CONSOLE=y |
| 1041 | |||
| 1042 | # | ||
| 1043 | # Sound | ||
| 1044 | # | ||
| 1045 | # CONFIG_SOUND is not set | 1114 | # CONFIG_SOUND is not set |
| 1046 | CONFIG_HID_SUPPORT=y | 1115 | CONFIG_HID_SUPPORT=y |
| 1047 | CONFIG_HID=y | 1116 | CONFIG_HID=y |
| @@ -1056,6 +1125,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 1056 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 1125 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
| 1057 | 1126 | ||
| 1058 | # | 1127 | # |
| 1128 | # Enable Host or Gadget support to see Inventra options | ||
| 1129 | # | ||
| 1130 | |||
| 1131 | # | ||
| 1059 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1132 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 1060 | # | 1133 | # |
| 1061 | # CONFIG_USB_GADGET is not set | 1134 | # CONFIG_USB_GADGET is not set |
| @@ -1096,6 +1169,7 @@ CONFIG_FS_POSIX_ACL=y | |||
| 1096 | # CONFIG_XFS_FS is not set | 1169 | # CONFIG_XFS_FS is not set |
| 1097 | CONFIG_OCFS2_FS=m | 1170 | CONFIG_OCFS2_FS=m |
| 1098 | CONFIG_OCFS2_FS_O2CB=m | 1171 | CONFIG_OCFS2_FS_O2CB=m |
| 1172 | CONFIG_OCFS2_FS_STATS=y | ||
| 1099 | CONFIG_OCFS2_DEBUG_MASKLOG=y | 1173 | CONFIG_OCFS2_DEBUG_MASKLOG=y |
| 1100 | # CONFIG_OCFS2_DEBUG_FS is not set | 1174 | # CONFIG_OCFS2_DEBUG_FS is not set |
| 1101 | CONFIG_DNOTIFY=y | 1175 | CONFIG_DNOTIFY=y |
| @@ -1145,6 +1219,7 @@ CONFIG_CONFIGFS_FS=m | |||
| 1145 | # CONFIG_CRAMFS is not set | 1219 | # CONFIG_CRAMFS is not set |
| 1146 | # CONFIG_VXFS_FS is not set | 1220 | # CONFIG_VXFS_FS is not set |
| 1147 | CONFIG_MINIX_FS=m | 1221 | CONFIG_MINIX_FS=m |
| 1222 | # CONFIG_OMFS_FS is not set | ||
| 1148 | # CONFIG_HPFS_FS is not set | 1223 | # CONFIG_HPFS_FS is not set |
| 1149 | # CONFIG_QNX4FS_FS is not set | 1224 | # CONFIG_QNX4FS_FS is not set |
| 1150 | CONFIG_ROMFS_FS=m | 1225 | CONFIG_ROMFS_FS=m |
| @@ -1155,14 +1230,13 @@ CONFIG_NFS_FS=y | |||
| 1155 | CONFIG_NFS_V3=y | 1230 | CONFIG_NFS_V3=y |
| 1156 | # CONFIG_NFS_V3_ACL is not set | 1231 | # CONFIG_NFS_V3_ACL is not set |
| 1157 | CONFIG_NFS_V4=y | 1232 | CONFIG_NFS_V4=y |
| 1158 | # CONFIG_NFSD is not set | ||
| 1159 | CONFIG_ROOT_NFS=y | 1233 | CONFIG_ROOT_NFS=y |
| 1234 | # CONFIG_NFSD is not set | ||
| 1160 | CONFIG_LOCKD=y | 1235 | CONFIG_LOCKD=y |
| 1161 | CONFIG_LOCKD_V4=y | 1236 | CONFIG_LOCKD_V4=y |
| 1162 | CONFIG_NFS_COMMON=y | 1237 | CONFIG_NFS_COMMON=y |
| 1163 | CONFIG_SUNRPC=y | 1238 | CONFIG_SUNRPC=y |
| 1164 | CONFIG_SUNRPC_GSS=y | 1239 | CONFIG_SUNRPC_GSS=y |
| 1165 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 1166 | CONFIG_RPCSEC_GSS_KRB5=y | 1240 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1167 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1241 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1168 | CONFIG_SMB_FS=m | 1242 | CONFIG_SMB_FS=m |
| @@ -1183,6 +1257,7 @@ CONFIG_CIFS_POSIX=y | |||
| 1183 | # Partition Types | 1257 | # Partition Types |
| 1184 | # | 1258 | # |
| 1185 | # CONFIG_PARTITION_ADVANCED is not set | 1259 | # CONFIG_PARTITION_ADVANCED is not set |
| 1260 | CONFIG_MAC_PARTITION=y | ||
| 1186 | CONFIG_MSDOS_PARTITION=y | 1261 | CONFIG_MSDOS_PARTITION=y |
| 1187 | CONFIG_NLS=m | 1262 | CONFIG_NLS=m |
| 1188 | CONFIG_NLS_DEFAULT="iso8859-1" | 1263 | CONFIG_NLS_DEFAULT="iso8859-1" |
| @@ -1233,6 +1308,7 @@ CONFIG_BITREVERSE=y | |||
| 1233 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1308 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 1234 | CONFIG_CRC_CCITT=m | 1309 | CONFIG_CRC_CCITT=m |
| 1235 | # CONFIG_CRC16 is not set | 1310 | # CONFIG_CRC16 is not set |
| 1311 | # CONFIG_CRC_T10DIF is not set | ||
| 1236 | # CONFIG_CRC_ITU_T is not set | 1312 | # CONFIG_CRC_ITU_T is not set |
| 1237 | CONFIG_CRC32=y | 1313 | CONFIG_CRC32=y |
| 1238 | # CONFIG_CRC7 is not set | 1314 | # CONFIG_CRC7 is not set |
| @@ -1259,6 +1335,8 @@ CONFIG_DEBUG_FS=y | |||
| 1259 | CONFIG_DEBUG_KERNEL=y | 1335 | CONFIG_DEBUG_KERNEL=y |
| 1260 | # CONFIG_DEBUG_SHIRQ is not set | 1336 | # CONFIG_DEBUG_SHIRQ is not set |
| 1261 | CONFIG_DETECT_SOFTLOCKUP=y | 1337 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1338 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 1339 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 1262 | CONFIG_SCHED_DEBUG=y | 1340 | CONFIG_SCHED_DEBUG=y |
| 1263 | # CONFIG_SCHEDSTATS is not set | 1341 | # CONFIG_SCHEDSTATS is not set |
| 1264 | # CONFIG_TIMER_STATS is not set | 1342 | # CONFIG_TIMER_STATS is not set |
| @@ -1275,21 +1353,34 @@ CONFIG_SCHED_DEBUG=y | |||
| 1275 | CONFIG_DEBUG_INFO=y | 1353 | CONFIG_DEBUG_INFO=y |
| 1276 | # CONFIG_DEBUG_VM is not set | 1354 | # CONFIG_DEBUG_VM is not set |
| 1277 | # CONFIG_DEBUG_WRITECOUNT is not set | 1355 | # CONFIG_DEBUG_WRITECOUNT is not set |
| 1356 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 1278 | # CONFIG_DEBUG_LIST is not set | 1357 | # CONFIG_DEBUG_LIST is not set |
| 1279 | # CONFIG_DEBUG_SG is not set | 1358 | # CONFIG_DEBUG_SG is not set |
| 1280 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1359 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 1281 | # CONFIG_RCU_TORTURE_TEST is not set | 1360 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1282 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1361 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 1283 | # CONFIG_FAULT_INJECTION is not set | 1362 | # CONFIG_FAULT_INJECTION is not set |
| 1363 | # CONFIG_LATENCYTOP is not set | ||
| 1364 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1365 | CONFIG_HAVE_FTRACE=y | ||
| 1366 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1367 | # CONFIG_FTRACE is not set | ||
| 1368 | # CONFIG_PREEMPT_TRACER is not set | ||
| 1369 | # CONFIG_SCHED_TRACER is not set | ||
| 1370 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1284 | # CONFIG_SAMPLES is not set | 1371 | # CONFIG_SAMPLES is not set |
| 1372 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1373 | # CONFIG_KGDB is not set | ||
| 1285 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1374 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
| 1286 | # CONFIG_DEBUG_STACK_USAGE is not set | 1375 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1287 | # CONFIG_DEBUG_PAGEALLOC is not set | 1376 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1288 | CONFIG_DEBUGGER=y | 1377 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
| 1378 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
| 1289 | # CONFIG_XMON is not set | 1379 | # CONFIG_XMON is not set |
| 1290 | # CONFIG_IRQSTACKS is not set | 1380 | # CONFIG_IRQSTACKS is not set |
| 1291 | # CONFIG_VIRQ_DEBUG is not set | 1381 | # CONFIG_VIRQ_DEBUG is not set |
| 1292 | # CONFIG_BDI_SWITCH is not set | 1382 | # CONFIG_BDI_SWITCH is not set |
| 1383 | # CONFIG_BOOTX_TEXT is not set | ||
| 1293 | # CONFIG_PPC_EARLY_DEBUG is not set | 1384 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1294 | 1385 | ||
| 1295 | # | 1386 | # |
| @@ -1299,7 +1390,6 @@ CONFIG_DEBUGGER=y | |||
| 1299 | CONFIG_SECURITY=y | 1390 | CONFIG_SECURITY=y |
| 1300 | CONFIG_SECURITY_NETWORK=y | 1391 | CONFIG_SECURITY_NETWORK=y |
| 1301 | # CONFIG_SECURITY_NETWORK_XFRM is not set | 1392 | # CONFIG_SECURITY_NETWORK_XFRM is not set |
| 1302 | CONFIG_SECURITY_CAPABILITIES=y | ||
| 1303 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1393 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1304 | CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0 | 1394 | CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0 |
| 1305 | CONFIG_CRYPTO=y | 1395 | CONFIG_CRYPTO=y |
| @@ -1349,6 +1439,10 @@ CONFIG_CRYPTO_CRC32C=m | |||
| 1349 | CONFIG_CRYPTO_MD4=m | 1439 | CONFIG_CRYPTO_MD4=m |
| 1350 | CONFIG_CRYPTO_MD5=y | 1440 | CONFIG_CRYPTO_MD5=y |
| 1351 | CONFIG_CRYPTO_MICHAEL_MIC=m | 1441 | CONFIG_CRYPTO_MICHAEL_MIC=m |
| 1442 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1443 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1444 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1445 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1352 | CONFIG_CRYPTO_SHA1=m | 1446 | CONFIG_CRYPTO_SHA1=m |
| 1353 | CONFIG_CRYPTO_SHA256=m | 1447 | CONFIG_CRYPTO_SHA256=m |
| 1354 | CONFIG_CRYPTO_SHA512=m | 1448 | CONFIG_CRYPTO_SHA512=m |
| @@ -1382,5 +1476,6 @@ CONFIG_CRYPTO_DEFLATE=m | |||
| 1382 | # CONFIG_CRYPTO_LZO is not set | 1476 | # CONFIG_CRYPTO_LZO is not set |
| 1383 | CONFIG_CRYPTO_HW=y | 1477 | CONFIG_CRYPTO_HW=y |
| 1384 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1478 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1479 | # CONFIG_CRYPTO_DEV_TALITOS is not set | ||
| 1385 | # CONFIG_PPC_CLOCK is not set | 1480 | # CONFIG_PPC_CLOCK is not set |
| 1386 | # CONFIG_VIRTUALIZATION is not set | 1481 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/storcenter_defconfig b/arch/powerpc/configs/storcenter_defconfig index 88f6aa8273be..4340cc1c5b6a 100644 --- a/arch/powerpc/configs/storcenter_defconfig +++ b/arch/powerpc/configs/storcenter_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.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Mon Jun 9 08:52:20 2008 | 4 | # Thu Aug 21 00:52:16 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | 34 | CONFIG_STACKTRACE_SUPPORT=y |
| 35 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | 36 | CONFIG_LOCKDEP_SUPPORT=y |
| 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| @@ -87,7 +88,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y | |||
| 87 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
| 88 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
| 89 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
| 90 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 91 | # CONFIG_KALLSYMS is not set | 91 | # CONFIG_KALLSYMS is not set |
| 92 | CONFIG_HOTPLUG=y | 92 | CONFIG_HOTPLUG=y |
| 93 | CONFIG_PRINTK=y | 93 | CONFIG_PRINTK=y |
| @@ -110,10 +110,16 @@ CONFIG_SLUB=y | |||
| 110 | # CONFIG_PROFILING is not set | 110 | # CONFIG_PROFILING is not set |
| 111 | # CONFIG_MARKERS is not set | 111 | # CONFIG_MARKERS is not set |
| 112 | CONFIG_HAVE_OPROFILE=y | 112 | CONFIG_HAVE_OPROFILE=y |
| 113 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 114 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 113 | CONFIG_HAVE_KPROBES=y | 115 | CONFIG_HAVE_KPROBES=y |
| 114 | CONFIG_HAVE_KRETPROBES=y | 116 | CONFIG_HAVE_KRETPROBES=y |
| 117 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 115 | # CONFIG_HAVE_DMA_ATTRS is not set | 118 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 119 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 120 | # CONFIG_HAVE_CLK is not set | ||
| 116 | CONFIG_PROC_PAGE_MONITOR=y | 121 | CONFIG_PROC_PAGE_MONITOR=y |
| 122 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 117 | CONFIG_SLABINFO=y | 123 | CONFIG_SLABINFO=y |
| 118 | CONFIG_RT_MUTEXES=y | 124 | CONFIG_RT_MUTEXES=y |
| 119 | # CONFIG_TINY_SHMEM is not set | 125 | # CONFIG_TINY_SHMEM is not set |
| @@ -130,6 +136,7 @@ CONFIG_LBD=y | |||
| 130 | # CONFIG_BLK_DEV_IO_TRACE is not set | 136 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 131 | # CONFIG_LSF is not set | 137 | # CONFIG_LSF is not set |
| 132 | # CONFIG_BLK_DEV_BSG is not set | 138 | # CONFIG_BLK_DEV_BSG is not set |
| 139 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 133 | 140 | ||
| 134 | # | 141 | # |
| 135 | # IO Schedulers | 142 | # IO Schedulers |
| @@ -149,25 +156,25 @@ CONFIG_CLASSIC_RCU=y | |||
| 149 | # Platform support | 156 | # Platform support |
| 150 | # | 157 | # |
| 151 | CONFIG_PPC_MULTIPLATFORM=y | 158 | CONFIG_PPC_MULTIPLATFORM=y |
| 152 | # CONFIG_PPC_82xx is not set | ||
| 153 | # CONFIG_PPC_83xx is not set | ||
| 154 | # CONFIG_PPC_86xx is not set | ||
| 155 | CONFIG_CLASSIC32=y | 159 | CONFIG_CLASSIC32=y |
| 156 | # CONFIG_PPC_CHRP is not set | 160 | # CONFIG_PPC_CHRP is not set |
| 157 | # CONFIG_PPC_MPC512x is not set | ||
| 158 | # CONFIG_PPC_MPC5121 is not set | ||
| 159 | # CONFIG_MPC5121_ADS is not set | 161 | # CONFIG_MPC5121_ADS is not set |
| 162 | # CONFIG_MPC5121_GENERIC is not set | ||
| 160 | # CONFIG_PPC_MPC52xx is not set | 163 | # CONFIG_PPC_MPC52xx is not set |
| 161 | # CONFIG_PPC_PMAC is not set | 164 | # CONFIG_PPC_PMAC is not set |
| 162 | # CONFIG_PPC_CELL is not set | 165 | # CONFIG_PPC_CELL is not set |
| 163 | # CONFIG_PPC_CELL_NATIVE is not set | 166 | # CONFIG_PPC_CELL_NATIVE is not set |
| 167 | # CONFIG_PPC_82xx is not set | ||
| 164 | # CONFIG_PQ2ADS is not set | 168 | # CONFIG_PQ2ADS is not set |
| 169 | # CONFIG_PPC_83xx is not set | ||
| 170 | # CONFIG_PPC_86xx is not set | ||
| 165 | CONFIG_EMBEDDED6xx=y | 171 | CONFIG_EMBEDDED6xx=y |
| 166 | # CONFIG_LINKSTATION is not set | 172 | # CONFIG_LINKSTATION is not set |
| 167 | CONFIG_STORCENTER=y | 173 | CONFIG_STORCENTER=y |
| 168 | # CONFIG_MPC7448HPC2 is not set | 174 | # CONFIG_MPC7448HPC2 is not set |
| 169 | # CONFIG_PPC_HOLLY is not set | 175 | # CONFIG_PPC_HOLLY is not set |
| 170 | # CONFIG_PPC_PRPMC2800 is not set | 176 | # CONFIG_PPC_PRPMC2800 is not set |
| 177 | # CONFIG_PPC_C2K is not set | ||
| 171 | CONFIG_MPC10X_BRIDGE=y | 178 | CONFIG_MPC10X_BRIDGE=y |
| 172 | CONFIG_MPC10X_OPENPIC=y | 179 | CONFIG_MPC10X_OPENPIC=y |
| 173 | # CONFIG_MPC10X_STORE_GATHERING is not set | 180 | # CONFIG_MPC10X_STORE_GATHERING is not set |
| @@ -221,6 +228,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 221 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 228 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 222 | CONFIG_PAGEFLAGS_EXTENDED=y | 229 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 223 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 230 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 231 | CONFIG_MIGRATION=y | ||
| 224 | # CONFIG_RESOURCES_64BIT is not set | 232 | # CONFIG_RESOURCES_64BIT is not set |
| 225 | CONFIG_ZONE_DMA_FLAG=1 | 233 | CONFIG_ZONE_DMA_FLAG=1 |
| 226 | CONFIG_BOUNCE=y | 234 | CONFIG_BOUNCE=y |
| @@ -229,6 +237,7 @@ CONFIG_FORCE_MAX_ZONEORDER=11 | |||
| 229 | CONFIG_PROC_DEVICETREE=y | 237 | CONFIG_PROC_DEVICETREE=y |
| 230 | CONFIG_CMDLINE_BOOL=y | 238 | CONFIG_CMDLINE_BOOL=y |
| 231 | CONFIG_CMDLINE="console=ttyS0,115200" | 239 | CONFIG_CMDLINE="console=ttyS0,115200" |
| 240 | CONFIG_EXTRA_TARGETS="" | ||
| 232 | # CONFIG_PM is not set | 241 | # CONFIG_PM is not set |
| 233 | # CONFIG_SECCOMP is not set | 242 | # CONFIG_SECCOMP is not set |
| 234 | CONFIG_ISA_DMA_API=y | 243 | CONFIG_ISA_DMA_API=y |
| @@ -264,10 +273,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
| 264 | CONFIG_KERNEL_START=0xc0000000 | 273 | CONFIG_KERNEL_START=0xc0000000 |
| 265 | CONFIG_PHYSICAL_START=0x00000000 | 274 | CONFIG_PHYSICAL_START=0x00000000 |
| 266 | CONFIG_TASK_SIZE=0xc0000000 | 275 | CONFIG_TASK_SIZE=0xc0000000 |
| 267 | |||
| 268 | # | ||
| 269 | # Networking | ||
| 270 | # | ||
| 271 | CONFIG_NET=y | 276 | CONFIG_NET=y |
| 272 | 277 | ||
| 273 | # | 278 | # |
| @@ -456,20 +461,22 @@ CONFIG_BLK_DEV=y | |||
| 456 | # CONFIG_BLK_DEV_RAM is not set | 461 | # CONFIG_BLK_DEV_RAM is not set |
| 457 | # CONFIG_CDROM_PKTCDVD is not set | 462 | # CONFIG_CDROM_PKTCDVD is not set |
| 458 | # CONFIG_ATA_OVER_ETH is not set | 463 | # CONFIG_ATA_OVER_ETH is not set |
| 464 | # CONFIG_BLK_DEV_HD is not set | ||
| 459 | CONFIG_MISC_DEVICES=y | 465 | CONFIG_MISC_DEVICES=y |
| 460 | # CONFIG_PHANTOM is not set | 466 | # CONFIG_PHANTOM is not set |
| 461 | # CONFIG_EEPROM_93CX6 is not set | 467 | # CONFIG_EEPROM_93CX6 is not set |
| 462 | # CONFIG_SGI_IOC4 is not set | 468 | # CONFIG_SGI_IOC4 is not set |
| 463 | # CONFIG_TIFM_CORE is not set | 469 | # CONFIG_TIFM_CORE is not set |
| 464 | # CONFIG_ENCLOSURE_SERVICES is not set | 470 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 471 | # CONFIG_HP_ILO is not set | ||
| 465 | CONFIG_HAVE_IDE=y | 472 | CONFIG_HAVE_IDE=y |
| 466 | CONFIG_IDE=y | 473 | CONFIG_IDE=y |
| 467 | CONFIG_IDE_MAX_HWIFS=4 | ||
| 468 | CONFIG_BLK_DEV_IDE=y | 474 | CONFIG_BLK_DEV_IDE=y |
| 469 | 475 | ||
| 470 | # | 476 | # |
| 471 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | 477 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
| 472 | # | 478 | # |
| 479 | CONFIG_IDE_TIMINGS=y | ||
| 473 | # CONFIG_BLK_DEV_IDE_SATA is not set | 480 | # CONFIG_BLK_DEV_IDE_SATA is not set |
| 474 | CONFIG_BLK_DEV_IDEDISK=y | 481 | CONFIG_BLK_DEV_IDEDISK=y |
| 475 | CONFIG_IDEDISK_MULTI_MODE=y | 482 | CONFIG_IDEDISK_MULTI_MODE=y |
| @@ -483,7 +490,6 @@ CONFIG_IDE_PROC_FS=y | |||
| 483 | # | 490 | # |
| 484 | # IDE chipset support/bugfixes | 491 | # IDE chipset support/bugfixes |
| 485 | # | 492 | # |
| 486 | CONFIG_IDE_GENERIC=y | ||
| 487 | # CONFIG_BLK_DEV_PLATFORM is not set | 493 | # CONFIG_BLK_DEV_PLATFORM is not set |
| 488 | CONFIG_BLK_DEV_IDEDMA_SFF=y | 494 | CONFIG_BLK_DEV_IDEDMA_SFF=y |
| 489 | 495 | ||
| @@ -500,10 +506,8 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
| 500 | # CONFIG_BLK_DEV_AMD74XX is not set | 506 | # CONFIG_BLK_DEV_AMD74XX is not set |
| 501 | # CONFIG_BLK_DEV_CMD64X is not set | 507 | # CONFIG_BLK_DEV_CMD64X is not set |
| 502 | # CONFIG_BLK_DEV_TRIFLEX is not set | 508 | # CONFIG_BLK_DEV_TRIFLEX is not set |
| 503 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
| 504 | # CONFIG_BLK_DEV_CS5520 is not set | 509 | # CONFIG_BLK_DEV_CS5520 is not set |
| 505 | # CONFIG_BLK_DEV_CS5530 is not set | 510 | # CONFIG_BLK_DEV_CS5530 is not set |
| 506 | # CONFIG_BLK_DEV_HPT34X is not set | ||
| 507 | # CONFIG_BLK_DEV_HPT366 is not set | 511 | # CONFIG_BLK_DEV_HPT366 is not set |
| 508 | # CONFIG_BLK_DEV_JMICRON is not set | 512 | # CONFIG_BLK_DEV_JMICRON is not set |
| 509 | # CONFIG_BLK_DEV_SC1200 is not set | 513 | # CONFIG_BLK_DEV_SC1200 is not set |
| @@ -521,8 +525,6 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
| 521 | CONFIG_BLK_DEV_VIA82CXXX=y | 525 | CONFIG_BLK_DEV_VIA82CXXX=y |
| 522 | # CONFIG_BLK_DEV_TC86C001 is not set | 526 | # CONFIG_BLK_DEV_TC86C001 is not set |
| 523 | CONFIG_BLK_DEV_IDEDMA=y | 527 | CONFIG_BLK_DEV_IDEDMA=y |
| 524 | # CONFIG_BLK_DEV_HD_ONLY is not set | ||
| 525 | # CONFIG_BLK_DEV_HD is not set | ||
| 526 | 528 | ||
| 527 | # | 529 | # |
| 528 | # SCSI device support | 530 | # SCSI device support |
| @@ -599,6 +601,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 599 | # CONFIG_SCSI_NSP32 is not set | 601 | # CONFIG_SCSI_NSP32 is not set |
| 600 | # CONFIG_SCSI_DEBUG is not set | 602 | # CONFIG_SCSI_DEBUG is not set |
| 601 | # CONFIG_SCSI_SRP is not set | 603 | # CONFIG_SCSI_SRP is not set |
| 604 | # CONFIG_SCSI_DH is not set | ||
| 602 | # CONFIG_ATA is not set | 605 | # CONFIG_ATA is not set |
| 603 | CONFIG_MD=y | 606 | CONFIG_MD=y |
| 604 | CONFIG_BLK_DEV_MD=y | 607 | CONFIG_BLK_DEV_MD=y |
| @@ -616,12 +619,15 @@ CONFIG_MD_RAID5_RESHAPE=y | |||
| 616 | # | 619 | # |
| 617 | # IEEE 1394 (FireWire) support | 620 | # IEEE 1394 (FireWire) support |
| 618 | # | 621 | # |
| 622 | |||
| 623 | # | ||
| 624 | # Enable only one of the two stacks, unless you know what you are doing | ||
| 625 | # | ||
| 619 | # CONFIG_FIREWIRE is not set | 626 | # CONFIG_FIREWIRE is not set |
| 620 | # CONFIG_IEEE1394 is not set | 627 | # CONFIG_IEEE1394 is not set |
| 621 | # CONFIG_I2O is not set | 628 | # CONFIG_I2O is not set |
| 622 | # CONFIG_MACINTOSH_DRIVERS is not set | 629 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 623 | CONFIG_NETDEVICES=y | 630 | CONFIG_NETDEVICES=y |
| 624 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 625 | CONFIG_DUMMY=m | 631 | CONFIG_DUMMY=m |
| 626 | # CONFIG_BONDING is not set | 632 | # CONFIG_BONDING is not set |
| 627 | # CONFIG_MACVLAN is not set | 633 | # CONFIG_MACVLAN is not set |
| @@ -635,14 +641,12 @@ CONFIG_NETDEV_1000=y | |||
| 635 | # CONFIG_DL2K is not set | 641 | # CONFIG_DL2K is not set |
| 636 | # CONFIG_E1000 is not set | 642 | # CONFIG_E1000 is not set |
| 637 | # CONFIG_E1000E is not set | 643 | # CONFIG_E1000E is not set |
| 638 | # CONFIG_E1000E_ENABLED is not set | ||
| 639 | # CONFIG_IP1000 is not set | 644 | # CONFIG_IP1000 is not set |
| 640 | # CONFIG_IGB is not set | 645 | # CONFIG_IGB is not set |
| 641 | # CONFIG_NS83820 is not set | 646 | # CONFIG_NS83820 is not set |
| 642 | # CONFIG_HAMACHI is not set | 647 | # CONFIG_HAMACHI is not set |
| 643 | # CONFIG_YELLOWFIN is not set | 648 | # CONFIG_YELLOWFIN is not set |
| 644 | CONFIG_R8169=y | 649 | CONFIG_R8169=y |
| 645 | # CONFIG_R8169_NAPI is not set | ||
| 646 | # CONFIG_SIS190 is not set | 650 | # CONFIG_SIS190 is not set |
| 647 | # CONFIG_SKGE is not set | 651 | # CONFIG_SKGE is not set |
| 648 | # CONFIG_SKY2 is not set | 652 | # CONFIG_SKY2 is not set |
| @@ -653,6 +657,7 @@ CONFIG_R8169=y | |||
| 653 | # CONFIG_MV643XX_ETH is not set | 657 | # CONFIG_MV643XX_ETH is not set |
| 654 | # CONFIG_QLA3XXX is not set | 658 | # CONFIG_QLA3XXX is not set |
| 655 | # CONFIG_ATL1 is not set | 659 | # CONFIG_ATL1 is not set |
| 660 | # CONFIG_ATL1E is not set | ||
| 656 | # CONFIG_NETDEV_10000 is not set | 661 | # CONFIG_NETDEV_10000 is not set |
| 657 | # CONFIG_TR is not set | 662 | # CONFIG_TR is not set |
| 658 | 663 | ||
| @@ -734,43 +739,64 @@ CONFIG_DEVPORT=y | |||
| 734 | CONFIG_I2C=y | 739 | CONFIG_I2C=y |
| 735 | CONFIG_I2C_BOARDINFO=y | 740 | CONFIG_I2C_BOARDINFO=y |
| 736 | CONFIG_I2C_CHARDEV=y | 741 | CONFIG_I2C_CHARDEV=y |
| 742 | CONFIG_I2C_HELPER_AUTO=y | ||
| 737 | 743 | ||
| 738 | # | 744 | # |
| 739 | # I2C Hardware Bus support | 745 | # I2C Hardware Bus support |
| 740 | # | 746 | # |
| 747 | |||
| 748 | # | ||
| 749 | # PC SMBus host controller drivers | ||
| 750 | # | ||
| 741 | # CONFIG_I2C_ALI1535 is not set | 751 | # CONFIG_I2C_ALI1535 is not set |
| 742 | # CONFIG_I2C_ALI1563 is not set | 752 | # CONFIG_I2C_ALI1563 is not set |
| 743 | # CONFIG_I2C_ALI15X3 is not set | 753 | # CONFIG_I2C_ALI15X3 is not set |
| 744 | # CONFIG_I2C_AMD756 is not set | 754 | # CONFIG_I2C_AMD756 is not set |
| 745 | # CONFIG_I2C_AMD8111 is not set | 755 | # CONFIG_I2C_AMD8111 is not set |
| 746 | # CONFIG_I2C_I801 is not set | 756 | # CONFIG_I2C_I801 is not set |
| 747 | # CONFIG_I2C_I810 is not set | 757 | # CONFIG_I2C_ISCH is not set |
| 748 | # CONFIG_I2C_PIIX4 is not set | 758 | # CONFIG_I2C_PIIX4 is not set |
| 749 | CONFIG_I2C_MPC=y | ||
| 750 | # CONFIG_I2C_NFORCE2 is not set | 759 | # CONFIG_I2C_NFORCE2 is not set |
| 751 | # CONFIG_I2C_OCORES is not set | ||
| 752 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 753 | # CONFIG_I2C_PROSAVAGE is not set | ||
| 754 | # CONFIG_I2C_SAVAGE4 is not set | ||
| 755 | # CONFIG_I2C_SIMTEC is not set | ||
| 756 | # CONFIG_I2C_SIS5595 is not set | 760 | # CONFIG_I2C_SIS5595 is not set |
| 757 | # CONFIG_I2C_SIS630 is not set | 761 | # CONFIG_I2C_SIS630 is not set |
| 758 | # CONFIG_I2C_SIS96X is not set | 762 | # CONFIG_I2C_SIS96X is not set |
| 759 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 760 | # CONFIG_I2C_STUB is not set | ||
| 761 | # CONFIG_I2C_TINY_USB is not set | ||
| 762 | # CONFIG_I2C_VIA is not set | 763 | # CONFIG_I2C_VIA is not set |
| 763 | # CONFIG_I2C_VIAPRO is not set | 764 | # CONFIG_I2C_VIAPRO is not set |
| 765 | |||
| 766 | # | ||
| 767 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 768 | # | ||
| 769 | CONFIG_I2C_MPC=y | ||
| 770 | # CONFIG_I2C_OCORES is not set | ||
| 771 | # CONFIG_I2C_SIMTEC is not set | ||
| 772 | |||
| 773 | # | ||
| 774 | # External I2C/SMBus adapter drivers | ||
| 775 | # | ||
| 776 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 777 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 778 | # CONFIG_I2C_TINY_USB is not set | ||
| 779 | |||
| 780 | # | ||
| 781 | # Graphics adapter I2C/DDC channel drivers | ||
| 782 | # | ||
| 764 | # CONFIG_I2C_VOODOO3 is not set | 783 | # CONFIG_I2C_VOODOO3 is not set |
| 784 | |||
| 785 | # | ||
| 786 | # Other I2C/SMBus bus drivers | ||
| 787 | # | ||
| 765 | # CONFIG_I2C_PCA_PLATFORM is not set | 788 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 789 | # CONFIG_I2C_STUB is not set | ||
| 766 | 790 | ||
| 767 | # | 791 | # |
| 768 | # Miscellaneous I2C Chip support | 792 | # Miscellaneous I2C Chip support |
| 769 | # | 793 | # |
| 770 | # CONFIG_DS1682 is not set | 794 | # CONFIG_DS1682 is not set |
| 795 | # CONFIG_AT24 is not set | ||
| 771 | # CONFIG_SENSORS_EEPROM is not set | 796 | # CONFIG_SENSORS_EEPROM is not set |
| 772 | # CONFIG_SENSORS_PCF8574 is not set | 797 | # CONFIG_SENSORS_PCF8574 is not set |
| 773 | # CONFIG_PCF8575 is not set | 798 | # CONFIG_PCF8575 is not set |
| 799 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 774 | # CONFIG_SENSORS_PCF8591 is not set | 800 | # CONFIG_SENSORS_PCF8591 is not set |
| 775 | # CONFIG_SENSORS_MAX6875 is not set | 801 | # CONFIG_SENSORS_MAX6875 is not set |
| 776 | # CONFIG_SENSORS_TSL2550 is not set | 802 | # CONFIG_SENSORS_TSL2550 is not set |
| @@ -779,10 +805,13 @@ CONFIG_I2C_MPC=y | |||
| 779 | # CONFIG_I2C_DEBUG_BUS is not set | 805 | # CONFIG_I2C_DEBUG_BUS is not set |
| 780 | # CONFIG_I2C_DEBUG_CHIP is not set | 806 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 781 | # CONFIG_SPI is not set | 807 | # CONFIG_SPI is not set |
| 808 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 809 | # CONFIG_GPIOLIB is not set | ||
| 782 | # CONFIG_W1 is not set | 810 | # CONFIG_W1 is not set |
| 783 | # CONFIG_POWER_SUPPLY is not set | 811 | # CONFIG_POWER_SUPPLY is not set |
| 784 | # CONFIG_HWMON is not set | 812 | # CONFIG_HWMON is not set |
| 785 | # CONFIG_THERMAL is not set | 813 | # CONFIG_THERMAL is not set |
| 814 | # CONFIG_THERMAL_HWMON is not set | ||
| 786 | # CONFIG_WATCHDOG is not set | 815 | # CONFIG_WATCHDOG is not set |
| 787 | 816 | ||
| 788 | # | 817 | # |
| @@ -794,8 +823,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 794 | # | 823 | # |
| 795 | # Multifunction device drivers | 824 | # Multifunction device drivers |
| 796 | # | 825 | # |
| 826 | # CONFIG_MFD_CORE is not set | ||
| 797 | # CONFIG_MFD_SM501 is not set | 827 | # CONFIG_MFD_SM501 is not set |
| 798 | # CONFIG_HTC_PASIC3 is not set | 828 | # CONFIG_HTC_PASIC3 is not set |
| 829 | # CONFIG_MFD_TMIO is not set | ||
| 799 | 830 | ||
| 800 | # | 831 | # |
| 801 | # Multimedia devices | 832 | # Multimedia devices |
| @@ -827,10 +858,6 @@ CONFIG_SSB_POSSIBLE=y | |||
| 827 | # Display device support | 858 | # Display device support |
| 828 | # | 859 | # |
| 829 | # CONFIG_DISPLAY_SUPPORT is not set | 860 | # CONFIG_DISPLAY_SUPPORT is not set |
| 830 | |||
| 831 | # | ||
| 832 | # Sound | ||
| 833 | # | ||
| 834 | # CONFIG_SOUND is not set | 861 | # CONFIG_SOUND is not set |
| 835 | CONFIG_USB_SUPPORT=y | 862 | CONFIG_USB_SUPPORT=y |
| 836 | CONFIG_USB_ARCH_HAS_HCD=y | 863 | CONFIG_USB_ARCH_HAS_HCD=y |
| @@ -849,6 +876,7 @@ CONFIG_USB_DEVICE_CLASS=y | |||
| 849 | # CONFIG_USB_OTG is not set | 876 | # CONFIG_USB_OTG is not set |
| 850 | # CONFIG_USB_OTG_WHITELIST is not set | 877 | # CONFIG_USB_OTG_WHITELIST is not set |
| 851 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 878 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
| 879 | # CONFIG_USB_MON is not set | ||
| 852 | 880 | ||
| 853 | # | 881 | # |
| 854 | # USB Host Controller Drivers | 882 | # USB Host Controller Drivers |
| @@ -896,6 +924,7 @@ CONFIG_USB_STORAGE=y | |||
| 896 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 924 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 897 | # CONFIG_USB_STORAGE_ALAUDA is not set | 925 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 898 | # CONFIG_USB_STORAGE_KARMA is not set | 926 | # CONFIG_USB_STORAGE_KARMA is not set |
| 927 | # CONFIG_USB_STORAGE_SIERRA is not set | ||
| 899 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | 928 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
| 900 | # CONFIG_USB_LIBUSUAL is not set | 929 | # CONFIG_USB_LIBUSUAL is not set |
| 901 | 930 | ||
| @@ -904,7 +933,6 @@ CONFIG_USB_STORAGE=y | |||
| 904 | # | 933 | # |
| 905 | # CONFIG_USB_MDC800 is not set | 934 | # CONFIG_USB_MDC800 is not set |
| 906 | # CONFIG_USB_MICROTEK is not set | 935 | # CONFIG_USB_MICROTEK is not set |
| 907 | # CONFIG_USB_MON is not set | ||
| 908 | 936 | ||
| 909 | # | 937 | # |
| 910 | # USB port drivers | 938 | # USB port drivers |
| @@ -917,7 +945,6 @@ CONFIG_USB_STORAGE=y | |||
| 917 | # CONFIG_USB_EMI62 is not set | 945 | # CONFIG_USB_EMI62 is not set |
| 918 | # CONFIG_USB_EMI26 is not set | 946 | # CONFIG_USB_EMI26 is not set |
| 919 | # CONFIG_USB_ADUTUX is not set | 947 | # CONFIG_USB_ADUTUX is not set |
| 920 | # CONFIG_USB_AUERSWALD is not set | ||
| 921 | # CONFIG_USB_RIO500 is not set | 948 | # CONFIG_USB_RIO500 is not set |
| 922 | # CONFIG_USB_LEGOTOWER is not set | 949 | # CONFIG_USB_LEGOTOWER is not set |
| 923 | # CONFIG_USB_LCD is not set | 950 | # CONFIG_USB_LCD is not set |
| @@ -971,6 +998,7 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 971 | # CONFIG_RTC_DRV_PCF8583 is not set | 998 | # CONFIG_RTC_DRV_PCF8583 is not set |
| 972 | # CONFIG_RTC_DRV_M41T80 is not set | 999 | # CONFIG_RTC_DRV_M41T80 is not set |
| 973 | # CONFIG_RTC_DRV_S35390A is not set | 1000 | # CONFIG_RTC_DRV_S35390A is not set |
| 1001 | # CONFIG_RTC_DRV_FM3130 is not set | ||
| 974 | 1002 | ||
| 975 | # | 1003 | # |
| 976 | # SPI RTC drivers | 1004 | # SPI RTC drivers |
| @@ -1074,6 +1102,7 @@ CONFIG_JFFS2_RTIME=y | |||
| 1074 | # CONFIG_CRAMFS is not set | 1102 | # CONFIG_CRAMFS is not set |
| 1075 | # CONFIG_VXFS_FS is not set | 1103 | # CONFIG_VXFS_FS is not set |
| 1076 | # CONFIG_MINIX_FS is not set | 1104 | # CONFIG_MINIX_FS is not set |
| 1105 | # CONFIG_OMFS_FS is not set | ||
| 1077 | # CONFIG_HPFS_FS is not set | 1106 | # CONFIG_HPFS_FS is not set |
| 1078 | # CONFIG_QNX4FS_FS is not set | 1107 | # CONFIG_QNX4FS_FS is not set |
| 1079 | # CONFIG_ROMFS_FS is not set | 1108 | # CONFIG_ROMFS_FS is not set |
| @@ -1151,6 +1180,7 @@ CONFIG_BITREVERSE=y | |||
| 1151 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1180 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 1152 | # CONFIG_CRC_CCITT is not set | 1181 | # CONFIG_CRC_CCITT is not set |
| 1153 | # CONFIG_CRC16 is not set | 1182 | # CONFIG_CRC16 is not set |
| 1183 | CONFIG_CRC_T10DIF=y | ||
| 1154 | # CONFIG_CRC_ITU_T is not set | 1184 | # CONFIG_CRC_ITU_T is not set |
| 1155 | CONFIG_CRC32=y | 1185 | CONFIG_CRC32=y |
| 1156 | # CONFIG_CRC7 is not set | 1186 | # CONFIG_CRC7 is not set |
| @@ -1178,7 +1208,16 @@ CONFIG_FRAME_WARN=1024 | |||
| 1178 | # CONFIG_SLUB_DEBUG_ON is not set | 1208 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1179 | # CONFIG_SLUB_STATS is not set | 1209 | # CONFIG_SLUB_STATS is not set |
| 1180 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1210 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1211 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 1212 | # CONFIG_LATENCYTOP is not set | ||
| 1213 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1214 | CONFIG_HAVE_FTRACE=y | ||
| 1215 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1216 | # CONFIG_FTRACE is not set | ||
| 1217 | # CONFIG_SCHED_TRACER is not set | ||
| 1218 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1181 | # CONFIG_SAMPLES is not set | 1219 | # CONFIG_SAMPLES is not set |
| 1220 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1182 | # CONFIG_IRQSTACKS is not set | 1221 | # CONFIG_IRQSTACKS is not set |
| 1183 | # CONFIG_BOOTX_TEXT is not set | 1222 | # CONFIG_BOOTX_TEXT is not set |
| 1184 | # CONFIG_PPC_EARLY_DEBUG is not set | 1223 | # CONFIG_PPC_EARLY_DEBUG is not set |
diff --git a/arch/powerpc/include/asm/cpm2.h b/arch/powerpc/include/asm/cpm2.h index 2a6fa0183ac9..0f5e8ff59a85 100644 --- a/arch/powerpc/include/asm/cpm2.h +++ b/arch/powerpc/include/asm/cpm2.h | |||
| @@ -337,6 +337,11 @@ typedef struct scc_param { | |||
| 337 | uint scc_tcrc; /* Internal */ | 337 | uint scc_tcrc; /* Internal */ |
| 338 | } sccp_t; | 338 | } sccp_t; |
| 339 | 339 | ||
| 340 | /* Function code bits. | ||
| 341 | */ | ||
| 342 | #define SCC_EB ((u_char) 0x10) /* Set big endian byte order */ | ||
| 343 | #define SCC_GBL ((u_char) 0x20) /* Snooping enabled */ | ||
| 344 | |||
| 340 | /* CPM Ethernet through SCC1. | 345 | /* CPM Ethernet through SCC1. |
| 341 | */ | 346 | */ |
| 342 | typedef struct scc_enet { | 347 | typedef struct scc_enet { |
diff --git a/arch/powerpc/include/asm/hvcall.h b/arch/powerpc/include/asm/hvcall.h index fbe2932fa9e9..6251a4b10be7 100644 --- a/arch/powerpc/include/asm/hvcall.h +++ b/arch/powerpc/include/asm/hvcall.h | |||
| @@ -291,6 +291,28 @@ struct hvcall_mpp_data { | |||
| 291 | }; | 291 | }; |
| 292 | 292 | ||
| 293 | int h_get_mpp(struct hvcall_mpp_data *); | 293 | int h_get_mpp(struct hvcall_mpp_data *); |
| 294 | |||
| 295 | #ifdef CONFIG_PPC_PSERIES | ||
| 296 | extern int CMO_PrPSP; | ||
| 297 | extern int CMO_SecPSP; | ||
| 298 | extern unsigned long CMO_PageSize; | ||
| 299 | |||
| 300 | static inline int cmo_get_primary_psp(void) | ||
| 301 | { | ||
| 302 | return CMO_PrPSP; | ||
| 303 | } | ||
| 304 | |||
| 305 | static inline int cmo_get_secondary_psp(void) | ||
| 306 | { | ||
| 307 | return CMO_SecPSP; | ||
| 308 | } | ||
| 309 | |||
| 310 | static inline unsigned long cmo_get_page_size(void) | ||
| 311 | { | ||
| 312 | return CMO_PageSize; | ||
| 313 | } | ||
| 314 | #endif /* CONFIG_PPC_PSERIES */ | ||
| 315 | |||
| 294 | #endif /* __ASSEMBLY__ */ | 316 | #endif /* __ASSEMBLY__ */ |
| 295 | #endif /* __KERNEL__ */ | 317 | #endif /* __KERNEL__ */ |
| 296 | #endif /* _ASM_POWERPC_HVCALL_H */ | 318 | #endif /* _ASM_POWERPC_HVCALL_H */ |
diff --git a/arch/powerpc/include/asm/ide.h b/arch/powerpc/include/asm/ide.h index 048480e340f2..da01b20aea59 100644 --- a/arch/powerpc/include/asm/ide.h +++ b/arch/powerpc/include/asm/ide.h | |||
| @@ -6,12 +6,7 @@ | |||
| 6 | #ifndef _ASM_POWERPC_IDE_H | 6 | #ifndef _ASM_POWERPC_IDE_H |
| 7 | #define _ASM_POWERPC_IDE_H | 7 | #define _ASM_POWERPC_IDE_H |
| 8 | 8 | ||
| 9 | #ifdef __KERNEL__ | 9 | #include <linux/compiler.h> |
| 10 | |||
| 11 | #ifndef __powerpc64__ | ||
| 12 | #include <linux/sched.h> | ||
| 13 | #include <asm/mpc8xx.h> | ||
| 14 | #endif | ||
| 15 | #include <asm/io.h> | 10 | #include <asm/io.h> |
| 16 | 11 | ||
| 17 | #define __ide_mm_insw(p, a, c) readsw((void __iomem *)(p), (a), (c)) | 12 | #define __ide_mm_insw(p, a, c) readsw((void __iomem *)(p), (a), (c)) |
| @@ -19,40 +14,4 @@ | |||
| 19 | #define __ide_mm_outsw(p, a, c) writesw((void __iomem *)(p), (a), (c)) | 14 | #define __ide_mm_outsw(p, a, c) writesw((void __iomem *)(p), (a), (c)) |
| 20 | #define __ide_mm_outsl(p, a, c) writesl((void __iomem *)(p), (a), (c)) | 15 | #define __ide_mm_outsl(p, a, c) writesl((void __iomem *)(p), (a), (c)) |
| 21 | 16 | ||
| 22 | #ifndef __powerpc64__ | ||
| 23 | #include <linux/ioport.h> | ||
| 24 | |||
| 25 | /* FIXME: use ide_platform host driver */ | ||
| 26 | static __inline__ int ide_default_irq(unsigned long base) | ||
| 27 | { | ||
| 28 | #ifdef CONFIG_PPLUS | ||
| 29 | switch (base) { | ||
| 30 | case 0x1f0: return 14; | ||
| 31 | case 0x170: return 15; | ||
| 32 | } | ||
| 33 | #endif | ||
| 34 | return 0; | ||
| 35 | } | ||
| 36 | |||
| 37 | /* FIXME: use ide_platform host driver */ | ||
| 38 | static __inline__ unsigned long ide_default_io_base(int index) | ||
| 39 | { | ||
| 40 | #ifdef CONFIG_PPLUS | ||
| 41 | switch (index) { | ||
| 42 | case 0: return 0x1f0; | ||
| 43 | case 1: return 0x170; | ||
| 44 | } | ||
| 45 | #endif | ||
| 46 | return 0; | ||
| 47 | } | ||
| 48 | |||
| 49 | #ifdef CONFIG_BLK_DEV_MPC8xx_IDE | ||
| 50 | #define IDE_ARCH_ACK_INTR 1 | ||
| 51 | #define ide_ack_intr(hwif) ((hwif)->ack_intr ? (hwif)->ack_intr(hwif) : 1) | ||
| 52 | #endif | ||
| 53 | |||
| 54 | #endif /* __powerpc64__ */ | ||
| 55 | |||
| 56 | #endif /* __KERNEL__ */ | ||
| 57 | |||
| 58 | #endif /* _ASM_POWERPC_IDE_H */ | 17 | #endif /* _ASM_POWERPC_IDE_H */ |
diff --git a/arch/powerpc/include/asm/irqflags.h b/arch/powerpc/include/asm/irqflags.h index 17ba3a881bfd..5f68ecfdf516 100644 --- a/arch/powerpc/include/asm/irqflags.h +++ b/arch/powerpc/include/asm/irqflags.h | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | #define TRACE_ENABLE_INTS bl .trace_hardirqs_on | 20 | #define TRACE_ENABLE_INTS bl .trace_hardirqs_on |
| 21 | #define TRACE_DISABLE_INTS bl .trace_hardirqs_off | 21 | #define TRACE_DISABLE_INTS bl .trace_hardirqs_off |
| 22 | #define TRACE_AND_RESTORE_IRQ_PARTIAL(en,skip) \ | 22 | #define TRACE_AND_RESTORE_IRQ_PARTIAL(en,skip) \ |
| 23 | cmpdi en, 0; \ | 23 | cmpdi en,0; \ |
| 24 | bne 95f; \ | 24 | bne 95f; \ |
| 25 | stb en,PACASOFTIRQEN(r13); \ | 25 | stb en,PACASOFTIRQEN(r13); \ |
| 26 | bl .trace_hardirqs_off; \ | 26 | bl .trace_hardirqs_off; \ |
| @@ -29,7 +29,8 @@ | |||
| 29 | li en,1; | 29 | li en,1; |
| 30 | #define TRACE_AND_RESTORE_IRQ(en) \ | 30 | #define TRACE_AND_RESTORE_IRQ(en) \ |
| 31 | TRACE_AND_RESTORE_IRQ_PARTIAL(en,96f); \ | 31 | TRACE_AND_RESTORE_IRQ_PARTIAL(en,96f); \ |
| 32 | 96: stb en,PACASOFTIRQEN(r13) | 32 | stb en,PACASOFTIRQEN(r13); \ |
| 33 | 96: | ||
| 33 | #else | 34 | #else |
| 34 | #define TRACE_ENABLE_INTS | 35 | #define TRACE_ENABLE_INTS |
| 35 | #define TRACE_DISABLE_INTS | 36 | #define TRACE_DISABLE_INTS |
diff --git a/arch/powerpc/include/asm/kexec.h b/arch/powerpc/include/asm/kexec.h index acdcdc66f1b6..3736d9b33289 100644 --- a/arch/powerpc/include/asm/kexec.h +++ b/arch/powerpc/include/asm/kexec.h | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | #define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE | 22 | #define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE |
| 23 | #endif | 23 | #endif |
| 24 | 24 | ||
| 25 | #define KEXEC_CONTROL_CODE_SIZE 4096 | 25 | #define KEXEC_CONTROL_PAGE_SIZE 4096 |
| 26 | 26 | ||
| 27 | /* The native architecture */ | 27 | /* The native architecture */ |
| 28 | #ifdef __powerpc64__ | 28 | #ifdef __powerpc64__ |
diff --git a/arch/powerpc/include/asm/mmu_context.h b/arch/powerpc/include/asm/mmu_context.h index 9102b8bf0ead..6b993ef452ff 100644 --- a/arch/powerpc/include/asm/mmu_context.h +++ b/arch/powerpc/include/asm/mmu_context.h | |||
| @@ -147,7 +147,6 @@ static inline void get_mmu_context(struct mm_struct *mm) | |||
| 147 | static inline int init_new_context(struct task_struct *t, struct mm_struct *mm) | 147 | static inline int init_new_context(struct task_struct *t, struct mm_struct *mm) |
| 148 | { | 148 | { |
| 149 | mm->context.id = NO_CONTEXT; | 149 | mm->context.id = NO_CONTEXT; |
| 150 | mm->context.vdso_base = 0; | ||
| 151 | return 0; | 150 | return 0; |
| 152 | } | 151 | } |
| 153 | 152 | ||
diff --git a/arch/powerpc/include/asm/pgtable-ppc64.h b/arch/powerpc/include/asm/pgtable-ppc64.h index db0b8f3b8807..4597c491e9b5 100644 --- a/arch/powerpc/include/asm/pgtable-ppc64.h +++ b/arch/powerpc/include/asm/pgtable-ppc64.h | |||
| @@ -153,12 +153,10 @@ | |||
| 153 | #define __S110 PAGE_SHARED_X | 153 | #define __S110 PAGE_SHARED_X |
| 154 | #define __S111 PAGE_SHARED_X | 154 | #define __S111 PAGE_SHARED_X |
| 155 | 155 | ||
| 156 | #ifdef CONFIG_HUGETLB_PAGE | 156 | #ifdef CONFIG_PPC_MM_SLICES |
| 157 | |||
| 158 | #define HAVE_ARCH_UNMAPPED_AREA | 157 | #define HAVE_ARCH_UNMAPPED_AREA |
| 159 | #define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN | 158 | #define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN |
| 160 | 159 | #endif /* CONFIG_PPC_MM_SLICES */ | |
| 161 | #endif | ||
| 162 | 160 | ||
| 163 | #ifndef __ASSEMBLY__ | 161 | #ifndef __ASSEMBLY__ |
| 164 | 162 | ||
diff --git a/arch/powerpc/include/asm/systbl.h b/arch/powerpc/include/asm/systbl.h index e084272ed1c2..f6cc7a43b4fa 100644 --- a/arch/powerpc/include/asm/systbl.h +++ b/arch/powerpc/include/asm/systbl.h | |||
| @@ -92,7 +92,7 @@ COMPAT_SYS_SPU(readlink) | |||
| 92 | SYSCALL(uselib) | 92 | SYSCALL(uselib) |
| 93 | SYSCALL(swapon) | 93 | SYSCALL(swapon) |
| 94 | SYSCALL(reboot) | 94 | SYSCALL(reboot) |
| 95 | SYSX(sys_ni_syscall,old32_readdir,old_readdir) | 95 | SYSX(sys_ni_syscall,compat_sys_old_readdir,old_readdir) |
| 96 | SYSCALL_SPU(mmap) | 96 | SYSCALL_SPU(mmap) |
| 97 | SYSCALL_SPU(munmap) | 97 | SYSCALL_SPU(munmap) |
| 98 | SYSCALL_SPU(truncate) | 98 | SYSCALL_SPU(truncate) |
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile index 64f5948ebc9d..946daea780f1 100644 --- a/arch/powerpc/kernel/Makefile +++ b/arch/powerpc/kernel/Makefile | |||
| @@ -14,12 +14,13 @@ endif | |||
| 14 | 14 | ||
| 15 | ifdef CONFIG_FTRACE | 15 | ifdef CONFIG_FTRACE |
| 16 | # Do not trace early boot code | 16 | # Do not trace early boot code |
| 17 | CFLAGS_REMOVE_cputable.o = -pg | 17 | CFLAGS_REMOVE_cputable.o = -pg -mno-sched-epilog |
| 18 | CFLAGS_REMOVE_prom_init.o = -pg | 18 | CFLAGS_REMOVE_prom_init.o = -pg -mno-sched-epilog |
| 19 | CFLAGS_REMOVE_btext.o = -pg -mno-sched-epilog | ||
| 19 | 20 | ||
| 20 | ifdef CONFIG_DYNAMIC_FTRACE | 21 | ifdef CONFIG_DYNAMIC_FTRACE |
| 21 | # dynamic ftrace setup. | 22 | # dynamic ftrace setup. |
| 22 | CFLAGS_REMOVE_ftrace.o = -pg | 23 | CFLAGS_REMOVE_ftrace.o = -pg -mno-sched-epilog |
| 23 | endif | 24 | endif |
| 24 | 25 | ||
| 25 | endif | 26 | endif |
diff --git a/arch/powerpc/kernel/align.c b/arch/powerpc/kernel/align.c index 367129789cc0..5af4e9b2dbe2 100644 --- a/arch/powerpc/kernel/align.c +++ b/arch/powerpc/kernel/align.c | |||
| @@ -647,7 +647,7 @@ static int emulate_vsx(unsigned char __user *addr, unsigned int reg, | |||
| 647 | unsigned int flags, unsigned int length) | 647 | unsigned int flags, unsigned int length) |
| 648 | { | 648 | { |
| 649 | char *ptr = (char *) ¤t->thread.TS_FPR(reg); | 649 | char *ptr = (char *) ¤t->thread.TS_FPR(reg); |
| 650 | int ret; | 650 | int ret = 0; |
| 651 | 651 | ||
| 652 | flush_vsx_to_thread(current); | 652 | flush_vsx_to_thread(current); |
| 653 | 653 | ||
diff --git a/arch/powerpc/kernel/crash_dump.c b/arch/powerpc/kernel/crash_dump.c index e0debcca0bfa..a323c9b32ee1 100644 --- a/arch/powerpc/kernel/crash_dump.c +++ b/arch/powerpc/kernel/crash_dump.c | |||
| @@ -86,6 +86,19 @@ static int __init parse_savemaxmem(char *p) | |||
| 86 | } | 86 | } |
| 87 | __setup("savemaxmem=", parse_savemaxmem); | 87 | __setup("savemaxmem=", parse_savemaxmem); |
| 88 | 88 | ||
| 89 | |||
| 90 | static size_t copy_oldmem_vaddr(void *vaddr, char *buf, size_t csize, | ||
| 91 | unsigned long offset, int userbuf) | ||
| 92 | { | ||
| 93 | if (userbuf) { | ||
| 94 | if (copy_to_user((char __user *)buf, (vaddr + offset), csize)) | ||
| 95 | return -EFAULT; | ||
| 96 | } else | ||
| 97 | memcpy(buf, (vaddr + offset), csize); | ||
| 98 | |||
| 99 | return csize; | ||
| 100 | } | ||
| 101 | |||
| 89 | /** | 102 | /** |
| 90 | * copy_oldmem_page - copy one page from "oldmem" | 103 | * copy_oldmem_page - copy one page from "oldmem" |
| 91 | * @pfn: page frame number to be copied | 104 | * @pfn: page frame number to be copied |
| @@ -107,16 +120,16 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf, | |||
| 107 | if (!csize) | 120 | if (!csize) |
| 108 | return 0; | 121 | return 0; |
| 109 | 122 | ||
| 110 | vaddr = __ioremap(pfn << PAGE_SHIFT, PAGE_SIZE, 0); | 123 | csize = min(csize, PAGE_SIZE); |
| 111 | 124 | ||
| 112 | if (userbuf) { | 125 | if (pfn < max_pfn) { |
| 113 | if (copy_to_user((char __user *)buf, (vaddr + offset), csize)) { | 126 | vaddr = __va(pfn << PAGE_SHIFT); |
| 114 | iounmap(vaddr); | 127 | csize = copy_oldmem_vaddr(vaddr, buf, csize, offset, userbuf); |
| 115 | return -EFAULT; | 128 | } else { |
| 116 | } | 129 | vaddr = __ioremap(pfn << PAGE_SHIFT, PAGE_SIZE, 0); |
| 117 | } else | 130 | csize = copy_oldmem_vaddr(vaddr, buf, csize, offset, userbuf); |
| 118 | memcpy(buf, (vaddr + offset), csize); | 131 | iounmap(vaddr); |
| 132 | } | ||
| 119 | 133 | ||
| 120 | iounmap(vaddr); | ||
| 121 | return csize; | 134 | return csize; |
| 122 | } | 135 | } |
diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S index 99ee2f0f0f2b..8bb657519299 100644 --- a/arch/powerpc/kernel/head_32.S +++ b/arch/powerpc/kernel/head_32.S | |||
| @@ -1155,7 +1155,7 @@ flush_tlbs: | |||
| 1155 | lis r10, 0x40 | 1155 | lis r10, 0x40 |
| 1156 | 1: addic. r10, r10, -0x1000 | 1156 | 1: addic. r10, r10, -0x1000 |
| 1157 | tlbie r10 | 1157 | tlbie r10 |
| 1158 | blt 1b | 1158 | bgt 1b |
| 1159 | sync | 1159 | sync |
| 1160 | blr | 1160 | blr |
| 1161 | 1161 | ||
diff --git a/arch/powerpc/kernel/ibmebus.c b/arch/powerpc/kernel/ibmebus.c index 9d42eb57aea3..a06362223f8d 100644 --- a/arch/powerpc/kernel/ibmebus.c +++ b/arch/powerpc/kernel/ibmebus.c | |||
| @@ -233,17 +233,6 @@ void ibmebus_free_irq(u32 ist, void *dev_id) | |||
| 233 | } | 233 | } |
| 234 | EXPORT_SYMBOL(ibmebus_free_irq); | 234 | EXPORT_SYMBOL(ibmebus_free_irq); |
| 235 | 235 | ||
| 236 | static ssize_t name_show(struct device *dev, | ||
| 237 | struct device_attribute *attr, char *buf) | ||
| 238 | { | ||
| 239 | return sprintf(buf, "%s\n", to_of_device(dev)->node->name); | ||
| 240 | } | ||
| 241 | |||
| 242 | static struct device_attribute ibmebus_dev_attrs[] = { | ||
| 243 | __ATTR_RO(name), | ||
| 244 | __ATTR_NULL | ||
| 245 | }; | ||
| 246 | |||
| 247 | static char *ibmebus_chomp(const char *in, size_t count) | 236 | static char *ibmebus_chomp(const char *in, size_t count) |
| 248 | { | 237 | { |
| 249 | char *out = kmalloc(count + 1, GFP_KERNEL); | 238 | char *out = kmalloc(count + 1, GFP_KERNEL); |
| @@ -327,7 +316,6 @@ static struct bus_attribute ibmebus_bus_attrs[] = { | |||
| 327 | 316 | ||
| 328 | struct bus_type ibmebus_bus_type = { | 317 | struct bus_type ibmebus_bus_type = { |
| 329 | .uevent = of_device_uevent, | 318 | .uevent = of_device_uevent, |
| 330 | .dev_attrs = ibmebus_dev_attrs, | ||
| 331 | .bus_attrs = ibmebus_bus_attrs | 319 | .bus_attrs = ibmebus_bus_attrs |
| 332 | }; | 320 | }; |
| 333 | EXPORT_SYMBOL(ibmebus_bus_type); | 321 | EXPORT_SYMBOL(ibmebus_bus_type); |
diff --git a/arch/powerpc/kernel/idle_6xx.S b/arch/powerpc/kernel/idle_6xx.S index 019b02d8844f..15c611de1ee2 100644 --- a/arch/powerpc/kernel/idle_6xx.S +++ b/arch/powerpc/kernel/idle_6xx.S | |||
| @@ -158,7 +158,7 @@ _GLOBAL(power_save_ppc32_restore) | |||
| 158 | stw r9,_NIP(r11) /* make it do a blr */ | 158 | stw r9,_NIP(r11) /* make it do a blr */ |
| 159 | 159 | ||
| 160 | #ifdef CONFIG_SMP | 160 | #ifdef CONFIG_SMP |
| 161 | mfspr r12,SPRN_SPRG3 | 161 | rlwinm r12,r11,0,0,31-THREAD_SHIFT |
| 162 | lwz r11,TI_CPU(r12) /* get cpu number * 4 */ | 162 | lwz r11,TI_CPU(r12) /* get cpu number * 4 */ |
| 163 | slwi r11,r11,2 | 163 | slwi r11,r11,2 |
| 164 | #else | 164 | #else |
diff --git a/arch/powerpc/kernel/idle_e500.S b/arch/powerpc/kernel/idle_e500.S index 06304034b393..47a1a983ff88 100644 --- a/arch/powerpc/kernel/idle_e500.S +++ b/arch/powerpc/kernel/idle_e500.S | |||
| @@ -84,10 +84,11 @@ _GLOBAL(power_save_ppc32_restore) | |||
| 84 | stw r9,_NIP(r11) /* make it do a blr */ | 84 | stw r9,_NIP(r11) /* make it do a blr */ |
| 85 | 85 | ||
| 86 | #ifdef CONFIG_SMP | 86 | #ifdef CONFIG_SMP |
| 87 | mfspr r12,SPRN_SPRG3 | 87 | rlwinm r12,r1,0,0,31-THREAD_SHIFT |
| 88 | lwz r11,TI_CPU(r12) /* get cpu number * 4 */ | 88 | lwz r11,TI_CPU(r12) /* get cpu number * 4 */ |
| 89 | slwi r11,r11,2 | 89 | slwi r11,r11,2 |
| 90 | #else | 90 | #else |
| 91 | li r11,0 | 91 | li r11,0 |
| 92 | #endif | 92 | #endif |
| 93 | |||
| 93 | b transfer_to_handler_cont | 94 | b transfer_to_handler_cont |
diff --git a/arch/powerpc/kernel/lparcfg.c b/arch/powerpc/kernel/lparcfg.c index 1a09719c7628..b3eef30b5131 100644 --- a/arch/powerpc/kernel/lparcfg.c +++ b/arch/powerpc/kernel/lparcfg.c | |||
| @@ -416,6 +416,8 @@ static void pseries_cmo_data(struct seq_file *m) | |||
| 416 | unsigned long cmo_faults = 0; | 416 | unsigned long cmo_faults = 0; |
| 417 | unsigned long cmo_fault_time = 0; | 417 | unsigned long cmo_fault_time = 0; |
| 418 | 418 | ||
| 419 | seq_printf(m, "cmo_enabled=%d\n", firmware_has_feature(FW_FEATURE_CMO)); | ||
| 420 | |||
| 419 | if (!firmware_has_feature(FW_FEATURE_CMO)) | 421 | if (!firmware_has_feature(FW_FEATURE_CMO)) |
| 420 | return; | 422 | return; |
| 421 | 423 | ||
| @@ -427,6 +429,9 @@ static void pseries_cmo_data(struct seq_file *m) | |||
| 427 | seq_printf(m, "cmo_faults=%lu\n", cmo_faults); | 429 | seq_printf(m, "cmo_faults=%lu\n", cmo_faults); |
| 428 | seq_printf(m, "cmo_fault_time_usec=%lu\n", | 430 | seq_printf(m, "cmo_fault_time_usec=%lu\n", |
| 429 | cmo_fault_time / tb_ticks_per_usec); | 431 | cmo_fault_time / tb_ticks_per_usec); |
| 432 | seq_printf(m, "cmo_primary_psp=%d\n", cmo_get_primary_psp()); | ||
| 433 | seq_printf(m, "cmo_secondary_psp=%d\n", cmo_get_secondary_psp()); | ||
| 434 | seq_printf(m, "cmo_page_size=%lu\n", cmo_get_page_size()); | ||
| 430 | } | 435 | } |
| 431 | 436 | ||
| 432 | static int pseries_lparcfg_data(struct seq_file *m, void *v) | 437 | static int pseries_lparcfg_data(struct seq_file *m, void *v) |
diff --git a/arch/powerpc/kernel/machine_kexec_32.c b/arch/powerpc/kernel/machine_kexec_32.c index cbaa34196797..ae63a964b858 100644 --- a/arch/powerpc/kernel/machine_kexec_32.c +++ b/arch/powerpc/kernel/machine_kexec_32.c | |||
| @@ -51,7 +51,7 @@ void default_machine_kexec(struct kimage *image) | |||
| 51 | relocate_new_kernel_size); | 51 | relocate_new_kernel_size); |
| 52 | 52 | ||
| 53 | flush_icache_range(reboot_code_buffer, | 53 | flush_icache_range(reboot_code_buffer, |
| 54 | reboot_code_buffer + KEXEC_CONTROL_CODE_SIZE); | 54 | reboot_code_buffer + KEXEC_CONTROL_PAGE_SIZE); |
| 55 | printk(KERN_INFO "Bye!\n"); | 55 | printk(KERN_INFO "Bye!\n"); |
| 56 | 56 | ||
| 57 | /* now call it */ | 57 | /* now call it */ |
diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S index 6321ae36f729..7a6dfbca7682 100644 --- a/arch/powerpc/kernel/misc_32.S +++ b/arch/powerpc/kernel/misc_32.S | |||
| @@ -899,7 +899,7 @@ relocate_new_kernel: | |||
| 899 | 899 | ||
| 900 | /* set a new stack at the bottom of our page... */ | 900 | /* set a new stack at the bottom of our page... */ |
| 901 | /* (not really needed now) */ | 901 | /* (not really needed now) */ |
| 902 | addi r1, r4, KEXEC_CONTROL_CODE_SIZE - 8 /* for LR Save+Back Chain */ | 902 | addi r1, r4, KEXEC_CONTROL_PAGE_SIZE - 8 /* for LR Save+Back Chain */ |
| 903 | stw r0, 0(r1) | 903 | stw r0, 0(r1) |
| 904 | 904 | ||
| 905 | /* Do the copies */ | 905 | /* Do the copies */ |
diff --git a/arch/powerpc/kernel/module.c b/arch/powerpc/kernel/module.c index af07003573c4..7ff292475269 100644 --- a/arch/powerpc/kernel/module.c +++ b/arch/powerpc/kernel/module.c | |||
| @@ -99,18 +99,3 @@ void module_arch_cleanup(struct module *mod) | |||
| 99 | { | 99 | { |
| 100 | module_bug_cleanup(mod); | 100 | module_bug_cleanup(mod); |
| 101 | } | 101 | } |
| 102 | |||
| 103 | struct bug_entry *module_find_bug(unsigned long bugaddr) | ||
| 104 | { | ||
| 105 | struct mod_arch_specific *mod; | ||
| 106 | unsigned int i; | ||
| 107 | struct bug_entry *bug; | ||
| 108 | |||
| 109 | list_for_each_entry(mod, &module_bug_list, bug_list) { | ||
| 110 | bug = mod->bug_table; | ||
| 111 | for (i = 0; i < mod->num_bugs; ++i, ++bug) | ||
| 112 | if (bugaddr == bug->bug_addr) | ||
| 113 | return bug; | ||
| 114 | } | ||
| 115 | return NULL; | ||
| 116 | } | ||
diff --git a/arch/powerpc/kernel/sys_ppc32.c b/arch/powerpc/kernel/sys_ppc32.c index 709f8cb8bfca..d98634c76060 100644 --- a/arch/powerpc/kernel/sys_ppc32.c +++ b/arch/powerpc/kernel/sys_ppc32.c | |||
| @@ -52,63 +52,6 @@ | |||
| 52 | #include <asm/ppc-pci.h> | 52 | #include <asm/ppc-pci.h> |
| 53 | #include <asm/syscalls.h> | 53 | #include <asm/syscalls.h> |
| 54 | 54 | ||
| 55 | struct old_linux_dirent32 { | ||
| 56 | u32 d_ino; | ||
| 57 | u32 d_offset; | ||
| 58 | unsigned short d_namlen; | ||
| 59 | char d_name[1]; | ||
| 60 | }; | ||
| 61 | |||
| 62 | struct readdir_callback32 { | ||
| 63 | struct old_linux_dirent32 __user * dirent; | ||
| 64 | int count; | ||
| 65 | }; | ||
| 66 | |||
| 67 | static int fillonedir(void * __buf, const char * name, int namlen, | ||
| 68 | off_t offset, u64 ino, unsigned int d_type) | ||
| 69 | { | ||
| 70 | struct readdir_callback32 * buf = (struct readdir_callback32 *) __buf; | ||
| 71 | struct old_linux_dirent32 __user * dirent; | ||
| 72 | ino_t d_ino; | ||
| 73 | |||
| 74 | if (buf->count) | ||
| 75 | return -EINVAL; | ||
| 76 | d_ino = ino; | ||
| 77 | if (sizeof(d_ino) < sizeof(ino) && d_ino != ino) | ||
| 78 | return -EOVERFLOW; | ||
| 79 | buf->count++; | ||
| 80 | dirent = buf->dirent; | ||
| 81 | put_user(d_ino, &dirent->d_ino); | ||
| 82 | put_user(offset, &dirent->d_offset); | ||
| 83 | put_user(namlen, &dirent->d_namlen); | ||
| 84 | copy_to_user(dirent->d_name, name, namlen); | ||
| 85 | put_user(0, dirent->d_name + namlen); | ||
| 86 | return 0; | ||
| 87 | } | ||
| 88 | |||
| 89 | asmlinkage int old32_readdir(unsigned int fd, struct old_linux_dirent32 __user *dirent, unsigned int count) | ||
| 90 | { | ||
| 91 | int error = -EBADF; | ||
| 92 | struct file * file; | ||
| 93 | struct readdir_callback32 buf; | ||
| 94 | |||
| 95 | file = fget(fd); | ||
| 96 | if (!file) | ||
| 97 | goto out; | ||
| 98 | |||
| 99 | buf.count = 0; | ||
| 100 | buf.dirent = dirent; | ||
| 101 | |||
| 102 | error = vfs_readdir(file, (filldir_t)fillonedir, &buf); | ||
| 103 | if (error < 0) | ||
| 104 | goto out_putf; | ||
| 105 | error = buf.count; | ||
| 106 | |||
| 107 | out_putf: | ||
| 108 | fput(file); | ||
| 109 | out: | ||
| 110 | return error; | ||
| 111 | } | ||
| 112 | 55 | ||
| 113 | asmlinkage long ppc32_select(u32 n, compat_ulong_t __user *inp, | 56 | asmlinkage long ppc32_select(u32 n, compat_ulong_t __user *inp, |
| 114 | compat_ulong_t __user *outp, compat_ulong_t __user *exp, | 57 | compat_ulong_t __user *outp, compat_ulong_t __user *exp, |
diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c index 22a3c33fd751..2750fbab1975 100644 --- a/arch/powerpc/kernel/vio.c +++ b/arch/powerpc/kernel/vio.c | |||
| @@ -1113,7 +1113,7 @@ static int vio_bus_probe(struct device *dev) | |||
| 1113 | return error; | 1113 | return error; |
| 1114 | } | 1114 | } |
| 1115 | error = viodrv->probe(viodev, id); | 1115 | error = viodrv->probe(viodev, id); |
| 1116 | if (error) | 1116 | if (error && firmware_has_feature(FW_FEATURE_CMO)) |
| 1117 | vio_cmo_bus_remove(viodev); | 1117 | vio_cmo_bus_remove(viodev); |
| 1118 | } | 1118 | } |
| 1119 | 1119 | ||
diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S index 4a8ce62fe112..9f6c1ca1739e 100644 --- a/arch/powerpc/kernel/vmlinux.lds.S +++ b/arch/powerpc/kernel/vmlinux.lds.S | |||
| @@ -66,11 +66,12 @@ SECTIONS | |||
| 66 | __got2_end = .; | 66 | __got2_end = .; |
| 67 | #endif /* CONFIG_PPC32 */ | 67 | #endif /* CONFIG_PPC32 */ |
| 68 | 68 | ||
| 69 | . = ALIGN(PAGE_SIZE); | ||
| 70 | _etext = .; | ||
| 71 | PROVIDE32 (etext = .); | ||
| 72 | } :kernel | 69 | } :kernel |
| 73 | 70 | ||
| 71 | . = ALIGN(PAGE_SIZE); | ||
| 72 | _etext = .; | ||
| 73 | PROVIDE32 (etext = .); | ||
| 74 | |||
| 74 | /* Read-only data */ | 75 | /* Read-only data */ |
| 75 | RODATA | 76 | RODATA |
| 76 | 77 | ||
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c index 14be408dfc9b..8920eea34528 100644 --- a/arch/powerpc/mm/hash_utils_64.c +++ b/arch/powerpc/mm/hash_utils_64.c | |||
| @@ -191,12 +191,17 @@ int htab_bolt_mapping(unsigned long vstart, unsigned long vend, | |||
| 191 | unsigned long hash, hpteg; | 191 | unsigned long hash, hpteg; |
| 192 | unsigned long vsid = get_kernel_vsid(vaddr, ssize); | 192 | unsigned long vsid = get_kernel_vsid(vaddr, ssize); |
| 193 | unsigned long va = hpt_va(vaddr, vsid, ssize); | 193 | unsigned long va = hpt_va(vaddr, vsid, ssize); |
| 194 | unsigned long tprot = prot; | ||
| 195 | |||
| 196 | /* Make kernel text executable */ | ||
| 197 | if (in_kernel_text(vaddr)) | ||
| 198 | tprot &= ~HPTE_R_N; | ||
| 194 | 199 | ||
| 195 | hash = hpt_hash(va, shift, ssize); | 200 | hash = hpt_hash(va, shift, ssize); |
| 196 | hpteg = ((hash & htab_hash_mask) * HPTES_PER_GROUP); | 201 | hpteg = ((hash & htab_hash_mask) * HPTES_PER_GROUP); |
| 197 | 202 | ||
| 198 | BUG_ON(!ppc_md.hpte_insert); | 203 | BUG_ON(!ppc_md.hpte_insert); |
| 199 | ret = ppc_md.hpte_insert(hpteg, va, paddr, prot, | 204 | ret = ppc_md.hpte_insert(hpteg, va, paddr, tprot, |
| 200 | HPTE_V_BOLTED, psize, ssize); | 205 | HPTE_V_BOLTED, psize, ssize); |
| 201 | 206 | ||
| 202 | if (ret < 0) | 207 | if (ret < 0) |
| @@ -584,7 +589,7 @@ void __init htab_initialize(void) | |||
| 584 | { | 589 | { |
| 585 | unsigned long table; | 590 | unsigned long table; |
| 586 | unsigned long pteg_count; | 591 | unsigned long pteg_count; |
| 587 | unsigned long prot, tprot; | 592 | unsigned long prot; |
| 588 | unsigned long base = 0, size = 0, limit; | 593 | unsigned long base = 0, size = 0, limit; |
| 589 | int i; | 594 | int i; |
| 590 | 595 | ||
| @@ -660,10 +665,9 @@ void __init htab_initialize(void) | |||
| 660 | for (i=0; i < lmb.memory.cnt; i++) { | 665 | for (i=0; i < lmb.memory.cnt; i++) { |
| 661 | base = (unsigned long)__va(lmb.memory.region[i].base); | 666 | base = (unsigned long)__va(lmb.memory.region[i].base); |
| 662 | size = lmb.memory.region[i].size; | 667 | size = lmb.memory.region[i].size; |
| 663 | tprot = prot | (in_kernel_text(base) ? _PAGE_EXEC : 0); | ||
| 664 | 668 | ||
| 665 | DBG("creating mapping for region: %lx..%lx (prot: %x)\n", | 669 | DBG("creating mapping for region: %lx..%lx (prot: %x)\n", |
| 666 | base, size, tprot); | 670 | base, size, prot); |
| 667 | 671 | ||
| 668 | #ifdef CONFIG_U3_DART | 672 | #ifdef CONFIG_U3_DART |
| 669 | /* Do not map the DART space. Fortunately, it will be aligned | 673 | /* Do not map the DART space. Fortunately, it will be aligned |
| @@ -680,21 +684,21 @@ void __init htab_initialize(void) | |||
| 680 | unsigned long dart_table_end = dart_tablebase + 16 * MB; | 684 | unsigned long dart_table_end = dart_tablebase + 16 * MB; |
| 681 | if (base != dart_tablebase) | 685 | if (base != dart_tablebase) |
| 682 | BUG_ON(htab_bolt_mapping(base, dart_tablebase, | 686 | BUG_ON(htab_bolt_mapping(base, dart_tablebase, |
| 683 | __pa(base), tprot, | 687 | __pa(base), prot, |
| 684 | mmu_linear_psize, | 688 | mmu_linear_psize, |
| 685 | mmu_kernel_ssize)); | 689 | mmu_kernel_ssize)); |
| 686 | if ((base + size) > dart_table_end) | 690 | if ((base + size) > dart_table_end) |
| 687 | BUG_ON(htab_bolt_mapping(dart_tablebase+16*MB, | 691 | BUG_ON(htab_bolt_mapping(dart_tablebase+16*MB, |
| 688 | base + size, | 692 | base + size, |
| 689 | __pa(dart_table_end), | 693 | __pa(dart_table_end), |
| 690 | tprot, | 694 | prot, |
| 691 | mmu_linear_psize, | 695 | mmu_linear_psize, |
| 692 | mmu_kernel_ssize)); | 696 | mmu_kernel_ssize)); |
| 693 | continue; | 697 | continue; |
| 694 | } | 698 | } |
| 695 | #endif /* CONFIG_U3_DART */ | 699 | #endif /* CONFIG_U3_DART */ |
| 696 | BUG_ON(htab_bolt_mapping(base, base + size, __pa(base), | 700 | BUG_ON(htab_bolt_mapping(base, base + size, __pa(base), |
| 697 | tprot, mmu_linear_psize, mmu_kernel_ssize)); | 701 | prot, mmu_linear_psize, mmu_kernel_ssize)); |
| 698 | } | 702 | } |
| 699 | 703 | ||
| 700 | /* | 704 | /* |
diff --git a/arch/powerpc/platforms/cell/spufs/run.c b/arch/powerpc/platforms/cell/spufs/run.c index f7edba6cb795..c9bb7cfd3dca 100644 --- a/arch/powerpc/platforms/cell/spufs/run.c +++ b/arch/powerpc/platforms/cell/spufs/run.c | |||
| @@ -206,11 +206,6 @@ static int spu_run_init(struct spu_context *ctx, u32 *npc) | |||
| 206 | (SPU_RUNCNTL_RUNNABLE | SPU_RUNCNTL_ISOLATE); | 206 | (SPU_RUNCNTL_RUNNABLE | SPU_RUNCNTL_ISOLATE); |
| 207 | if (runcntl == 0) | 207 | if (runcntl == 0) |
| 208 | runcntl = SPU_RUNCNTL_RUNNABLE; | 208 | runcntl = SPU_RUNCNTL_RUNNABLE; |
| 209 | } | ||
| 210 | |||
| 211 | if (ctx->flags & SPU_CREATE_NOSCHED) { | ||
| 212 | spuctx_switch_state(ctx, SPU_UTIL_USER); | ||
| 213 | ctx->ops->runcntl_write(ctx, runcntl); | ||
| 214 | } else { | 209 | } else { |
| 215 | unsigned long privcntl; | 210 | unsigned long privcntl; |
| 216 | 211 | ||
| @@ -219,9 +214,15 @@ static int spu_run_init(struct spu_context *ctx, u32 *npc) | |||
| 219 | else | 214 | else |
| 220 | privcntl = SPU_PRIVCNTL_MODE_NORMAL; | 215 | privcntl = SPU_PRIVCNTL_MODE_NORMAL; |
| 221 | 216 | ||
| 222 | ctx->ops->npc_write(ctx, *npc); | ||
| 223 | ctx->ops->privcntl_write(ctx, privcntl); | 217 | ctx->ops->privcntl_write(ctx, privcntl); |
| 224 | ctx->ops->runcntl_write(ctx, runcntl); | 218 | ctx->ops->npc_write(ctx, *npc); |
| 219 | } | ||
| 220 | |||
| 221 | ctx->ops->runcntl_write(ctx, runcntl); | ||
| 222 | |||
| 223 | if (ctx->flags & SPU_CREATE_NOSCHED) { | ||
| 224 | spuctx_switch_state(ctx, SPU_UTIL_USER); | ||
| 225 | } else { | ||
| 225 | 226 | ||
| 226 | if (ctx->state == SPU_STATE_SAVED) { | 227 | if (ctx->state == SPU_STATE_SAVED) { |
| 227 | ret = spu_activate(ctx, 0); | 228 | ret = spu_activate(ctx, 0); |
diff --git a/arch/powerpc/platforms/cell/spufs/sched.c b/arch/powerpc/platforms/cell/spufs/sched.c index 2deeeba7eccf..1c1b627ee843 100644 --- a/arch/powerpc/platforms/cell/spufs/sched.c +++ b/arch/powerpc/platforms/cell/spufs/sched.c | |||
| @@ -641,8 +641,10 @@ static struct spu *find_victim(struct spu_context *ctx) | |||
| 641 | 641 | ||
| 642 | if (tmp && tmp->prio > ctx->prio && | 642 | if (tmp && tmp->prio > ctx->prio && |
| 643 | !(tmp->flags & SPU_CREATE_NOSCHED) && | 643 | !(tmp->flags & SPU_CREATE_NOSCHED) && |
| 644 | (!victim || tmp->prio > victim->prio)) | 644 | (!victim || tmp->prio > victim->prio)) { |
| 645 | victim = spu->ctx; | 645 | victim = spu->ctx; |
| 646 | get_spu_context(victim); | ||
| 647 | } | ||
| 646 | } | 648 | } |
| 647 | mutex_unlock(&cbe_spu_info[node].list_mutex); | 649 | mutex_unlock(&cbe_spu_info[node].list_mutex); |
| 648 | 650 | ||
| @@ -658,6 +660,7 @@ static struct spu *find_victim(struct spu_context *ctx) | |||
| 658 | * look at another context or give up after X retries. | 660 | * look at another context or give up after X retries. |
| 659 | */ | 661 | */ |
| 660 | if (!mutex_trylock(&victim->state_mutex)) { | 662 | if (!mutex_trylock(&victim->state_mutex)) { |
| 663 | put_spu_context(victim); | ||
| 661 | victim = NULL; | 664 | victim = NULL; |
| 662 | goto restart; | 665 | goto restart; |
| 663 | } | 666 | } |
| @@ -670,6 +673,7 @@ static struct spu *find_victim(struct spu_context *ctx) | |||
| 670 | * restart the search. | 673 | * restart the search. |
| 671 | */ | 674 | */ |
| 672 | mutex_unlock(&victim->state_mutex); | 675 | mutex_unlock(&victim->state_mutex); |
| 676 | put_spu_context(victim); | ||
| 673 | victim = NULL; | 677 | victim = NULL; |
| 674 | goto restart; | 678 | goto restart; |
| 675 | } | 679 | } |
| @@ -687,6 +691,7 @@ static struct spu *find_victim(struct spu_context *ctx) | |||
| 687 | spu_add_to_rq(victim); | 691 | spu_add_to_rq(victim); |
| 688 | 692 | ||
| 689 | mutex_unlock(&victim->state_mutex); | 693 | mutex_unlock(&victim->state_mutex); |
| 694 | put_spu_context(victim); | ||
| 690 | 695 | ||
| 691 | return spu; | 696 | return spu; |
| 692 | } | 697 | } |
| @@ -985,9 +990,11 @@ static int spusched_thread(void *unused) | |||
| 985 | struct spu_context *ctx = spu->ctx; | 990 | struct spu_context *ctx = spu->ctx; |
| 986 | 991 | ||
| 987 | if (ctx) { | 992 | if (ctx) { |
| 993 | get_spu_context(ctx); | ||
| 988 | mutex_unlock(mtx); | 994 | mutex_unlock(mtx); |
| 989 | spusched_tick(ctx); | 995 | spusched_tick(ctx); |
| 990 | mutex_lock(mtx); | 996 | mutex_lock(mtx); |
| 997 | put_spu_context(ctx); | ||
| 991 | } | 998 | } |
| 992 | } | 999 | } |
| 993 | mutex_unlock(mtx); | 1000 | mutex_unlock(mtx); |
| @@ -1030,7 +1037,7 @@ void spuctx_switch_state(struct spu_context *ctx, | |||
| 1030 | node = spu->node; | 1037 | node = spu->node; |
| 1031 | if (old_state == SPU_UTIL_USER) | 1038 | if (old_state == SPU_UTIL_USER) |
| 1032 | atomic_dec(&cbe_spu_info[node].busy_spus); | 1039 | atomic_dec(&cbe_spu_info[node].busy_spus); |
| 1033 | if (new_state == SPU_UTIL_USER); | 1040 | if (new_state == SPU_UTIL_USER) |
| 1034 | atomic_inc(&cbe_spu_info[node].busy_spus); | 1041 | atomic_inc(&cbe_spu_info[node].busy_spus); |
| 1035 | } | 1042 | } |
| 1036 | } | 1043 | } |
diff --git a/arch/powerpc/platforms/powermac/Makefile b/arch/powerpc/platforms/powermac/Makefile index 58ecdd72630f..be60d64be7ad 100644 --- a/arch/powerpc/platforms/powermac/Makefile +++ b/arch/powerpc/platforms/powermac/Makefile | |||
| @@ -2,7 +2,7 @@ CFLAGS_bootx_init.o += -fPIC | |||
| 2 | 2 | ||
| 3 | ifdef CONFIG_FTRACE | 3 | ifdef CONFIG_FTRACE |
| 4 | # Do not trace early boot code | 4 | # Do not trace early boot code |
| 5 | CFLAGS_REMOVE_bootx_init.o = -pg | 5 | CFLAGS_REMOVE_bootx_init.o = -pg -mno-sched-epilog |
| 6 | endif | 6 | endif |
| 7 | 7 | ||
| 8 | obj-y += pic.o setup.o time.o feature.o pci.o \ | 8 | obj-y += pic.o setup.o time.o feature.o pci.o \ |
diff --git a/arch/powerpc/platforms/ps3/htab.c b/arch/powerpc/platforms/ps3/htab.c index 1cf901fa9031..6eb1d4d182c9 100644 --- a/arch/powerpc/platforms/ps3/htab.c +++ b/arch/powerpc/platforms/ps3/htab.c | |||
| @@ -29,138 +29,75 @@ | |||
| 29 | 29 | ||
| 30 | #include "platform.h" | 30 | #include "platform.h" |
| 31 | 31 | ||
| 32 | #if defined(DEBUG) | 32 | /** |
| 33 | #define DBG udbg_printf | 33 | * enum lpar_vas_id - id of LPAR virtual address space. |
| 34 | #else | 34 | * @lpar_vas_id_current: Current selected virtual address space |
| 35 | #define DBG pr_debug | 35 | * |
| 36 | #endif | 36 | * Identify the target LPAR address space. |
| 37 | 37 | */ | |
| 38 | static struct hash_pte *htab; | 38 | |
| 39 | static unsigned long htab_addr; | 39 | enum ps3_lpar_vas_id { |
| 40 | static unsigned char *bolttab; | 40 | PS3_LPAR_VAS_ID_CURRENT = 0, |
| 41 | static unsigned char *inusetab; | 41 | }; |
| 42 | 42 | ||
| 43 | static DEFINE_SPINLOCK(ps3_bolttab_lock); | 43 | |
| 44 | 44 | static DEFINE_SPINLOCK(ps3_htab_lock); | |
| 45 | #define debug_dump_hpte(_a, _b, _c, _d, _e, _f, _g) \ | ||
| 46 | _debug_dump_hpte(_a, _b, _c, _d, _e, _f, _g, __func__, __LINE__) | ||
| 47 | static void _debug_dump_hpte(unsigned long pa, unsigned long va, | ||
| 48 | unsigned long group, unsigned long bitmap, struct hash_pte lhpte, | ||
| 49 | int psize, unsigned long slot, const char* func, int line) | ||
| 50 | { | ||
| 51 | DBG("%s:%d: pa = %lxh\n", func, line, pa); | ||
| 52 | DBG("%s:%d: lpar = %lxh\n", func, line, | ||
| 53 | ps3_mm_phys_to_lpar(pa)); | ||
| 54 | DBG("%s:%d: va = %lxh\n", func, line, va); | ||
| 55 | DBG("%s:%d: group = %lxh\n", func, line, group); | ||
| 56 | DBG("%s:%d: bitmap = %lxh\n", func, line, bitmap); | ||
| 57 | DBG("%s:%d: hpte.v = %lxh\n", func, line, lhpte.v); | ||
| 58 | DBG("%s:%d: hpte.r = %lxh\n", func, line, lhpte.r); | ||
| 59 | DBG("%s:%d: psize = %xh\n", func, line, psize); | ||
| 60 | DBG("%s:%d: slot = %lxh\n", func, line, slot); | ||
| 61 | } | ||
| 62 | 45 | ||
| 63 | static long ps3_hpte_insert(unsigned long hpte_group, unsigned long va, | 46 | static long ps3_hpte_insert(unsigned long hpte_group, unsigned long va, |
| 64 | unsigned long pa, unsigned long rflags, unsigned long vflags, | 47 | unsigned long pa, unsigned long rflags, unsigned long vflags, |
| 65 | int psize, int ssize) | 48 | int psize, int ssize) |
| 66 | { | 49 | { |
| 67 | unsigned long slot; | 50 | int result; |
| 68 | struct hash_pte lhpte; | 51 | u64 hpte_v, hpte_r; |
| 69 | int secondary = 0; | 52 | u64 inserted_index; |
| 70 | unsigned long result; | 53 | u64 evicted_v, evicted_r; |
| 71 | unsigned long bitmap; | 54 | u64 hpte_v_array[4], hpte_rs; |
| 72 | unsigned long flags; | 55 | unsigned long flags; |
| 73 | unsigned long p_pteg, s_pteg, b_index, b_mask, cb, ci; | 56 | long ret = -1; |
| 74 | |||
| 75 | vflags &= ~HPTE_V_SECONDARY; /* this bit is ignored */ | ||
| 76 | |||
| 77 | lhpte.v = hpte_encode_v(va, psize, MMU_SEGSIZE_256M) | | ||
| 78 | vflags | HPTE_V_VALID; | ||
| 79 | lhpte.r = hpte_encode_r(ps3_mm_phys_to_lpar(pa), psize) | rflags; | ||
| 80 | |||
| 81 | p_pteg = hpte_group / HPTES_PER_GROUP; | ||
| 82 | s_pteg = ~p_pteg & htab_hash_mask; | ||
| 83 | |||
| 84 | spin_lock_irqsave(&ps3_bolttab_lock, flags); | ||
| 85 | |||
| 86 | BUG_ON(bolttab[p_pteg] == 0xff && bolttab[s_pteg] == 0xff); | ||
| 87 | 57 | ||
| 88 | bitmap = (inusetab[p_pteg] << 8) | inusetab[s_pteg]; | 58 | /* |
| 59 | * lv1_insert_htab_entry() will search for victim | ||
| 60 | * entry in both primary and secondary pte group | ||
| 61 | */ | ||
| 62 | vflags &= ~HPTE_V_SECONDARY; | ||
| 89 | 63 | ||
| 90 | if (bitmap == 0xffff) { | 64 | hpte_v = hpte_encode_v(va, psize, ssize) | vflags | HPTE_V_VALID; |
| 91 | /* | 65 | hpte_r = hpte_encode_r(ps3_mm_phys_to_lpar(pa), psize) | rflags; |
| 92 | * PTEG is full. Search for victim. | ||
| 93 | */ | ||
| 94 | bitmap &= ~((bolttab[p_pteg] << 8) | bolttab[s_pteg]); | ||
| 95 | do { | ||
| 96 | ci = mftb() & 15; | ||
| 97 | cb = 0x8000UL >> ci; | ||
| 98 | } while ((cb & bitmap) == 0); | ||
| 99 | } else { | ||
| 100 | /* | ||
| 101 | * search free slot in hardware order | ||
| 102 | * [primary] 0, 2, 4, 6, 1, 3, 5, 7 | ||
| 103 | * [secondary] 0, 2, 4, 6, 1, 3, 5, 7 | ||
| 104 | */ | ||
| 105 | for (ci = 0; ci < HPTES_PER_GROUP; ci += 2) { | ||
| 106 | cb = 0x8000UL >> ci; | ||
| 107 | if ((cb & bitmap) == 0) | ||
| 108 | goto found; | ||
| 109 | } | ||
| 110 | for (ci = 1; ci < HPTES_PER_GROUP; ci += 2) { | ||
| 111 | cb = 0x8000UL >> ci; | ||
| 112 | if ((cb & bitmap) == 0) | ||
| 113 | goto found; | ||
| 114 | } | ||
| 115 | for (ci = HPTES_PER_GROUP; ci < HPTES_PER_GROUP*2; ci += 2) { | ||
| 116 | cb = 0x8000UL >> ci; | ||
| 117 | if ((cb & bitmap) == 0) | ||
| 118 | goto found; | ||
| 119 | } | ||
| 120 | for (ci = HPTES_PER_GROUP+1; ci < HPTES_PER_GROUP*2; ci += 2) { | ||
| 121 | cb = 0x8000UL >> ci; | ||
| 122 | if ((cb & bitmap) == 0) | ||
| 123 | goto found; | ||
| 124 | } | ||
| 125 | } | ||
| 126 | 66 | ||
| 127 | found: | 67 | spin_lock_irqsave(&ps3_htab_lock, flags); |
| 128 | if (ci < HPTES_PER_GROUP) { | ||
| 129 | slot = p_pteg * HPTES_PER_GROUP + ci; | ||
| 130 | } else { | ||
| 131 | slot = s_pteg * HPTES_PER_GROUP + (ci & 7); | ||
| 132 | /* lhpte.dw0.dw0.h = 1; */ | ||
| 133 | vflags |= HPTE_V_SECONDARY; | ||
| 134 | lhpte.v |= HPTE_V_SECONDARY; | ||
| 135 | } | ||
| 136 | 68 | ||
| 137 | result = lv1_write_htab_entry(0, slot, lhpte.v, lhpte.r); | 69 | /* talk hvc to replace entries BOLTED == 0 */ |
| 70 | result = lv1_insert_htab_entry(PS3_LPAR_VAS_ID_CURRENT, hpte_group, | ||
| 71 | hpte_v, hpte_r, | ||
| 72 | HPTE_V_BOLTED, 0, | ||
| 73 | &inserted_index, | ||
| 74 | &evicted_v, &evicted_r); | ||
| 138 | 75 | ||
| 139 | if (result) { | 76 | if (result) { |
| 140 | debug_dump_hpte(pa, va, hpte_group, bitmap, lhpte, psize, slot); | 77 | /* all entries bolted !*/ |
| 78 | pr_info("%s:result=%d va=%lx pa=%lx ix=%lx v=%lx r=%lx\n", | ||
| 79 | __func__, result, va, pa, hpte_group, hpte_v, hpte_r); | ||
| 141 | BUG(); | 80 | BUG(); |
| 142 | } | 81 | } |
| 143 | 82 | ||
| 144 | /* | 83 | /* |
| 145 | * If used slot is not in primary HPTE group, | 84 | * see if the entry is inserted into secondary pteg |
| 146 | * the slot should be in secondary HPTE group. | ||
| 147 | */ | 85 | */ |
| 86 | result = lv1_read_htab_entries(PS3_LPAR_VAS_ID_CURRENT, | ||
| 87 | inserted_index & ~0x3UL, | ||
| 88 | &hpte_v_array[0], &hpte_v_array[1], | ||
| 89 | &hpte_v_array[2], &hpte_v_array[3], | ||
| 90 | &hpte_rs); | ||
| 91 | BUG_ON(result); | ||
| 148 | 92 | ||
| 149 | if ((hpte_group ^ slot) & ~(HPTES_PER_GROUP - 1)) { | 93 | if (hpte_v_array[inserted_index % 4] & HPTE_V_SECONDARY) |
| 150 | secondary = 1; | 94 | ret = (inserted_index & 7) | (1 << 3); |
| 151 | b_index = s_pteg; | 95 | else |
| 152 | } else { | 96 | ret = inserted_index & 7; |
| 153 | secondary = 0; | ||
| 154 | b_index = p_pteg; | ||
| 155 | } | ||
| 156 | 97 | ||
| 157 | b_mask = (lhpte.v & HPTE_V_BOLTED) ? 1 << 7 : 0 << 7; | 98 | spin_unlock_irqrestore(&ps3_htab_lock, flags); |
| 158 | bolttab[b_index] |= b_mask >> (slot & 7); | ||
| 159 | b_mask = 1 << 7; | ||
| 160 | inusetab[b_index] |= b_mask >> (slot & 7); | ||
| 161 | spin_unlock_irqrestore(&ps3_bolttab_lock, flags); | ||
| 162 | 99 | ||
| 163 | return (slot & 7) | (secondary << 3); | 100 | return ret; |
| 164 | } | 101 | } |
| 165 | 102 | ||
| 166 | static long ps3_hpte_remove(unsigned long hpte_group) | 103 | static long ps3_hpte_remove(unsigned long hpte_group) |
| @@ -172,39 +109,48 @@ static long ps3_hpte_remove(unsigned long hpte_group) | |||
| 172 | static long ps3_hpte_updatepp(unsigned long slot, unsigned long newpp, | 109 | static long ps3_hpte_updatepp(unsigned long slot, unsigned long newpp, |
| 173 | unsigned long va, int psize, int ssize, int local) | 110 | unsigned long va, int psize, int ssize, int local) |
| 174 | { | 111 | { |
| 112 | int result; | ||
| 113 | u64 hpte_v, want_v, hpte_rs; | ||
| 114 | u64 hpte_v_array[4]; | ||
| 175 | unsigned long flags; | 115 | unsigned long flags; |
| 176 | unsigned long result; | 116 | long ret; |
| 177 | unsigned long pteg, bit; | ||
| 178 | unsigned long hpte_v, want_v; | ||
| 179 | 117 | ||
| 180 | want_v = hpte_encode_v(va, psize, MMU_SEGSIZE_256M); | 118 | want_v = hpte_encode_v(va, psize, ssize); |
| 181 | 119 | ||
| 182 | spin_lock_irqsave(&ps3_bolttab_lock, flags); | 120 | spin_lock_irqsave(&ps3_htab_lock, flags); |
| 183 | 121 | ||
| 184 | hpte_v = htab[slot].v; | 122 | result = lv1_read_htab_entries(PS3_LPAR_VAS_ID_CURRENT, slot & ~0x3UL, |
| 185 | if (!HPTE_V_COMPARE(hpte_v, want_v) || !(hpte_v & HPTE_V_VALID)) { | 123 | &hpte_v_array[0], &hpte_v_array[1], |
| 186 | spin_unlock_irqrestore(&ps3_bolttab_lock, flags); | 124 | &hpte_v_array[2], &hpte_v_array[3], |
| 187 | 125 | &hpte_rs); | |
| 188 | /* ps3_hpte_insert() will be used to update PTE */ | ||
| 189 | return -1; | ||
| 190 | } | ||
| 191 | |||
| 192 | result = lv1_write_htab_entry(0, slot, 0, 0); | ||
| 193 | 126 | ||
| 194 | if (result) { | 127 | if (result) { |
| 195 | DBG("%s: va=%lx slot=%lx psize=%d result = %ld (0x%lx)\n", | 128 | pr_info("%s: res=%d read va=%lx slot=%lx psize=%d\n", |
| 196 | __func__, va, slot, psize, result, result); | 129 | __func__, result, va, slot, psize); |
| 197 | BUG(); | 130 | BUG(); |
| 198 | } | 131 | } |
| 199 | 132 | ||
| 200 | pteg = slot / HPTES_PER_GROUP; | 133 | hpte_v = hpte_v_array[slot % 4]; |
| 201 | bit = slot % HPTES_PER_GROUP; | ||
| 202 | inusetab[pteg] &= ~(0x80 >> bit); | ||
| 203 | 134 | ||
| 204 | spin_unlock_irqrestore(&ps3_bolttab_lock, flags); | 135 | /* |
| 136 | * As lv1_read_htab_entries() does not give us the RPN, we can | ||
| 137 | * not synthesize the new hpte_r value here, and therefore can | ||
| 138 | * not update the hpte with lv1_insert_htab_entry(), so we | ||
| 139 | * insted invalidate it and ask the caller to update it via | ||
| 140 | * ps3_hpte_insert() by returning a -1 value. | ||
| 141 | */ | ||
| 142 | if (!HPTE_V_COMPARE(hpte_v, want_v) || !(hpte_v & HPTE_V_VALID)) { | ||
| 143 | /* not found */ | ||
| 144 | ret = -1; | ||
| 145 | } else { | ||
| 146 | /* entry found, just invalidate it */ | ||
| 147 | result = lv1_write_htab_entry(PS3_LPAR_VAS_ID_CURRENT, | ||
| 148 | slot, 0, 0); | ||
| 149 | ret = -1; | ||
| 150 | } | ||
| 205 | 151 | ||
| 206 | /* ps3_hpte_insert() will be used to update PTE */ | 152 | spin_unlock_irqrestore(&ps3_htab_lock, flags); |
| 207 | return -1; | 153 | return ret; |
| 208 | } | 154 | } |
| 209 | 155 | ||
| 210 | static void ps3_hpte_updateboltedpp(unsigned long newpp, unsigned long ea, | 156 | static void ps3_hpte_updateboltedpp(unsigned long newpp, unsigned long ea, |
| @@ -217,45 +163,35 @@ static void ps3_hpte_invalidate(unsigned long slot, unsigned long va, | |||
| 217 | int psize, int ssize, int local) | 163 | int psize, int ssize, int local) |
| 218 | { | 164 | { |
| 219 | unsigned long flags; | 165 | unsigned long flags; |
| 220 | unsigned long result; | 166 | int result; |
| 221 | unsigned long pteg, bit; | 167 | |
| 168 | spin_lock_irqsave(&ps3_htab_lock, flags); | ||
| 222 | 169 | ||
| 223 | spin_lock_irqsave(&ps3_bolttab_lock, flags); | 170 | result = lv1_write_htab_entry(PS3_LPAR_VAS_ID_CURRENT, slot, 0, 0); |
| 224 | result = lv1_write_htab_entry(0, slot, 0, 0); | ||
| 225 | 171 | ||
| 226 | if (result) { | 172 | if (result) { |
| 227 | DBG("%s: va=%lx slot=%lx psize=%d result = %ld (0x%lx)\n", | 173 | pr_info("%s: res=%d va=%lx slot=%lx psize=%d\n", |
| 228 | __func__, va, slot, psize, result, result); | 174 | __func__, result, va, slot, psize); |
| 229 | BUG(); | 175 | BUG(); |
| 230 | } | 176 | } |
| 231 | 177 | ||
| 232 | pteg = slot / HPTES_PER_GROUP; | 178 | spin_unlock_irqrestore(&ps3_htab_lock, flags); |
| 233 | bit = slot % HPTES_PER_GROUP; | ||
| 234 | inusetab[pteg] &= ~(0x80 >> bit); | ||
| 235 | spin_unlock_irqrestore(&ps3_bolttab_lock, flags); | ||
| 236 | } | 179 | } |
| 237 | 180 | ||
| 238 | static void ps3_hpte_clear(void) | 181 | static void ps3_hpte_clear(void) |
| 239 | { | 182 | { |
| 240 | int result; | 183 | unsigned long hpte_count = (1UL << ppc64_pft_size) >> 4; |
| 241 | 184 | u64 i; | |
| 242 | DBG(" -> %s:%d\n", __func__, __LINE__); | ||
| 243 | 185 | ||
| 244 | result = lv1_unmap_htab(htab_addr); | 186 | for (i = 0; i < hpte_count; i++) |
| 245 | BUG_ON(result); | 187 | lv1_write_htab_entry(PS3_LPAR_VAS_ID_CURRENT, i, 0, 0); |
| 246 | 188 | ||
| 247 | ps3_mm_shutdown(); | 189 | ps3_mm_shutdown(); |
| 248 | ps3_mm_vas_destroy(); | 190 | ps3_mm_vas_destroy(); |
| 249 | |||
| 250 | DBG(" <- %s:%d\n", __func__, __LINE__); | ||
| 251 | } | 191 | } |
| 252 | 192 | ||
| 253 | void __init ps3_hpte_init(unsigned long htab_size) | 193 | void __init ps3_hpte_init(unsigned long htab_size) |
| 254 | { | 194 | { |
| 255 | long bitmap_size; | ||
| 256 | |||
| 257 | DBG(" -> %s:%d\n", __func__, __LINE__); | ||
| 258 | |||
| 259 | ppc_md.hpte_invalidate = ps3_hpte_invalidate; | 195 | ppc_md.hpte_invalidate = ps3_hpte_invalidate; |
| 260 | ppc_md.hpte_updatepp = ps3_hpte_updatepp; | 196 | ppc_md.hpte_updatepp = ps3_hpte_updatepp; |
| 261 | ppc_md.hpte_updateboltedpp = ps3_hpte_updateboltedpp; | 197 | ppc_md.hpte_updateboltedpp = ps3_hpte_updateboltedpp; |
| @@ -264,28 +200,5 @@ void __init ps3_hpte_init(unsigned long htab_size) | |||
| 264 | ppc_md.hpte_clear_all = ps3_hpte_clear; | 200 | ppc_md.hpte_clear_all = ps3_hpte_clear; |
| 265 | 201 | ||
| 266 | ppc64_pft_size = __ilog2(htab_size); | 202 | ppc64_pft_size = __ilog2(htab_size); |
| 267 | |||
| 268 | bitmap_size = htab_size / sizeof(struct hash_pte) / 8; | ||
| 269 | |||
| 270 | bolttab = __va(lmb_alloc(bitmap_size, 1)); | ||
| 271 | inusetab = __va(lmb_alloc(bitmap_size, 1)); | ||
| 272 | |||
| 273 | memset(bolttab, 0, bitmap_size); | ||
| 274 | memset(inusetab, 0, bitmap_size); | ||
| 275 | |||
| 276 | DBG(" <- %s:%d\n", __func__, __LINE__); | ||
| 277 | } | 203 | } |
| 278 | 204 | ||
| 279 | void __init ps3_map_htab(void) | ||
| 280 | { | ||
| 281 | long result; | ||
| 282 | unsigned long htab_size = (1UL << ppc64_pft_size); | ||
| 283 | |||
| 284 | result = lv1_map_htab(0, &htab_addr); | ||
| 285 | |||
| 286 | htab = (__force struct hash_pte *)ioremap_flags(htab_addr, htab_size, | ||
| 287 | pgprot_val(PAGE_READONLY_X)); | ||
| 288 | |||
| 289 | DBG("%s:%d: lpar %016lxh, virt %016lxh\n", __func__, __LINE__, | ||
| 290 | htab_addr, (unsigned long)htab); | ||
| 291 | } | ||
diff --git a/arch/powerpc/platforms/ps3/setup.c b/arch/powerpc/platforms/ps3/setup.c index a413abbd4123..77bc330263c4 100644 --- a/arch/powerpc/platforms/ps3/setup.c +++ b/arch/powerpc/platforms/ps3/setup.c | |||
| @@ -201,7 +201,6 @@ static void __init ps3_setup_arch(void) | |||
| 201 | ps3_firmware_version.rev); | 201 | ps3_firmware_version.rev); |
| 202 | 202 | ||
| 203 | ps3_spu_set_platform(); | 203 | ps3_spu_set_platform(); |
| 204 | ps3_map_htab(); | ||
| 205 | 204 | ||
| 206 | #ifdef CONFIG_SMP | 205 | #ifdef CONFIG_SMP |
| 207 | smp_init_ps3(); | 206 | smp_init_ps3(); |
diff --git a/arch/powerpc/platforms/ps3/spu.c b/arch/powerpc/platforms/ps3/spu.c index d135cef9ed6a..ccae3d446b98 100644 --- a/arch/powerpc/platforms/ps3/spu.c +++ b/arch/powerpc/platforms/ps3/spu.c | |||
| @@ -186,14 +186,24 @@ static void spu_unmap(struct spu *spu) | |||
| 186 | iounmap(spu_pdata(spu)->shadow); | 186 | iounmap(spu_pdata(spu)->shadow); |
| 187 | } | 187 | } |
| 188 | 188 | ||
| 189 | /** | ||
| 190 | * setup_areas - Map the spu regions into the address space. | ||
| 191 | * | ||
| 192 | * The current HV requires the spu shadow regs to be mapped with the | ||
| 193 | * PTE page protection bits set as read-only (PP=3). This implementation | ||
| 194 | * uses the low level __ioremap() to bypass the page protection settings | ||
| 195 | * inforced by ioremap_flags() to get the needed PTE bits set for the | ||
| 196 | * shadow regs. | ||
| 197 | */ | ||
| 198 | |||
| 189 | static int __init setup_areas(struct spu *spu) | 199 | static int __init setup_areas(struct spu *spu) |
| 190 | { | 200 | { |
| 191 | struct table {char* name; unsigned long addr; unsigned long size;}; | 201 | struct table {char* name; unsigned long addr; unsigned long size;}; |
| 202 | static const unsigned long shadow_flags = _PAGE_NO_CACHE | 3; | ||
| 192 | 203 | ||
| 193 | spu_pdata(spu)->shadow = ioremap_flags(spu_pdata(spu)->shadow_addr, | 204 | spu_pdata(spu)->shadow = __ioremap(spu_pdata(spu)->shadow_addr, |
| 194 | sizeof(struct spe_shadow), | 205 | sizeof(struct spe_shadow), |
| 195 | pgprot_val(PAGE_READONLY) | | 206 | shadow_flags); |
| 196 | _PAGE_NO_CACHE); | ||
| 197 | if (!spu_pdata(spu)->shadow) { | 207 | if (!spu_pdata(spu)->shadow) { |
| 198 | pr_debug("%s:%d: ioremap shadow failed\n", __func__, __LINE__); | 208 | pr_debug("%s:%d: ioremap shadow failed\n", __func__, __LINE__); |
| 199 | goto fail_ioremap; | 209 | goto fail_ioremap; |
diff --git a/arch/powerpc/platforms/pseries/plpar_wrappers.h b/arch/powerpc/platforms/pseries/plpar_wrappers.h index a437267c6bf8..d967c1893ab5 100644 --- a/arch/powerpc/platforms/pseries/plpar_wrappers.h +++ b/arch/powerpc/platforms/pseries/plpar_wrappers.h | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | #define _PSERIES_PLPAR_WRAPPERS_H | 2 | #define _PSERIES_PLPAR_WRAPPERS_H |
| 3 | 3 | ||
| 4 | #include <asm/hvcall.h> | 4 | #include <asm/hvcall.h> |
| 5 | #include <asm/page.h> | ||
| 5 | 6 | ||
| 6 | static inline long poll_pending(void) | 7 | static inline long poll_pending(void) |
| 7 | { | 8 | { |
| @@ -44,12 +45,34 @@ static inline long register_slb_shadow(unsigned long cpu, unsigned long vpa) | |||
| 44 | 45 | ||
| 45 | static inline long plpar_page_set_loaned(unsigned long vpa) | 46 | static inline long plpar_page_set_loaned(unsigned long vpa) |
| 46 | { | 47 | { |
| 47 | return plpar_hcall_norets(H_PAGE_INIT, H_PAGE_SET_LOANED, vpa, 0); | 48 | unsigned long cmo_page_sz = cmo_get_page_size(); |
| 49 | long rc = 0; | ||
| 50 | int i; | ||
| 51 | |||
| 52 | for (i = 0; !rc && i < PAGE_SIZE; i += cmo_page_sz) | ||
| 53 | rc = plpar_hcall_norets(H_PAGE_INIT, H_PAGE_SET_LOANED, vpa + i, 0); | ||
| 54 | |||
| 55 | for (i -= cmo_page_sz; rc && i != 0; i -= cmo_page_sz) | ||
| 56 | plpar_hcall_norets(H_PAGE_INIT, H_PAGE_SET_ACTIVE, | ||
| 57 | vpa + i - cmo_page_sz, 0); | ||
| 58 | |||
| 59 | return rc; | ||
| 48 | } | 60 | } |
| 49 | 61 | ||
| 50 | static inline long plpar_page_set_active(unsigned long vpa) | 62 | static inline long plpar_page_set_active(unsigned long vpa) |
| 51 | { | 63 | { |
| 52 | return plpar_hcall_norets(H_PAGE_INIT, H_PAGE_SET_ACTIVE, vpa, 0); | 64 | unsigned long cmo_page_sz = cmo_get_page_size(); |
| 65 | long rc = 0; | ||
| 66 | int i; | ||
| 67 | |||
| 68 | for (i = 0; !rc && i < PAGE_SIZE; i += cmo_page_sz) | ||
| 69 | rc = plpar_hcall_norets(H_PAGE_INIT, H_PAGE_SET_ACTIVE, vpa + i, 0); | ||
| 70 | |||
| 71 | for (i -= cmo_page_sz; rc && i != 0; i -= cmo_page_sz) | ||
| 72 | plpar_hcall_norets(H_PAGE_INIT, H_PAGE_SET_LOANED, | ||
| 73 | vpa + i - cmo_page_sz, 0); | ||
| 74 | |||
| 75 | return rc; | ||
| 53 | } | 76 | } |
| 54 | 77 | ||
| 55 | extern void vpa_init(int cpu); | 78 | extern void vpa_init(int cpu); |
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c index 063a0d2fba30..7b01d67b4e48 100644 --- a/arch/powerpc/platforms/pseries/setup.c +++ b/arch/powerpc/platforms/pseries/setup.c | |||
| @@ -68,6 +68,10 @@ | |||
| 68 | #include "plpar_wrappers.h" | 68 | #include "plpar_wrappers.h" |
| 69 | #include "pseries.h" | 69 | #include "pseries.h" |
| 70 | 70 | ||
| 71 | int CMO_PrPSP = -1; | ||
| 72 | int CMO_SecPSP = -1; | ||
| 73 | unsigned long CMO_PageSize = (ASM_CONST(1) << IOMMU_PAGE_SHIFT); | ||
| 74 | EXPORT_SYMBOL(CMO_PageSize); | ||
| 71 | 75 | ||
| 72 | int fwnmi_active; /* TRUE if an FWNMI handler is present */ | 76 | int fwnmi_active; /* TRUE if an FWNMI handler is present */ |
| 73 | 77 | ||
| @@ -325,8 +329,7 @@ void pSeries_cmo_feature_init(void) | |||
| 325 | { | 329 | { |
| 326 | char *ptr, *key, *value, *end; | 330 | char *ptr, *key, *value, *end; |
| 327 | int call_status; | 331 | int call_status; |
| 328 | int PrPSP = -1; | 332 | int page_order = IOMMU_PAGE_SHIFT; |
| 329 | int SecPSP = -1; | ||
| 330 | 333 | ||
| 331 | pr_debug(" -> fw_cmo_feature_init()\n"); | 334 | pr_debug(" -> fw_cmo_feature_init()\n"); |
| 332 | spin_lock(&rtas_data_buf_lock); | 335 | spin_lock(&rtas_data_buf_lock); |
| @@ -365,21 +368,31 @@ void pSeries_cmo_feature_init(void) | |||
| 365 | break; | 368 | break; |
| 366 | } | 369 | } |
| 367 | 370 | ||
| 368 | if (0 == strcmp(key, "PrPSP")) | 371 | if (0 == strcmp(key, "CMOPageSize")) |
| 369 | PrPSP = simple_strtol(value, NULL, 10); | 372 | page_order = simple_strtol(value, NULL, 10); |
| 373 | else if (0 == strcmp(key, "PrPSP")) | ||
| 374 | CMO_PrPSP = simple_strtol(value, NULL, 10); | ||
| 370 | else if (0 == strcmp(key, "SecPSP")) | 375 | else if (0 == strcmp(key, "SecPSP")) |
| 371 | SecPSP = simple_strtol(value, NULL, 10); | 376 | CMO_SecPSP = simple_strtol(value, NULL, 10); |
| 372 | value = key = ptr + 1; | 377 | value = key = ptr + 1; |
| 373 | } | 378 | } |
| 374 | ptr++; | 379 | ptr++; |
| 375 | } | 380 | } |
| 376 | 381 | ||
| 377 | if (PrPSP != -1 || SecPSP != -1) { | 382 | /* Page size is returned as the power of 2 of the page size, |
| 383 | * convert to the page size in bytes before returning | ||
| 384 | */ | ||
| 385 | CMO_PageSize = 1 << page_order; | ||
| 386 | pr_debug("CMO_PageSize = %lu\n", CMO_PageSize); | ||
| 387 | |||
| 388 | if (CMO_PrPSP != -1 || CMO_SecPSP != -1) { | ||
| 378 | pr_info("CMO enabled\n"); | 389 | pr_info("CMO enabled\n"); |
| 379 | pr_debug("CMO enabled, PrPSP=%d, SecPSP=%d\n", PrPSP, SecPSP); | 390 | pr_debug("CMO enabled, PrPSP=%d, SecPSP=%d\n", CMO_PrPSP, |
| 391 | CMO_SecPSP); | ||
| 380 | powerpc_firmware_features |= FW_FEATURE_CMO; | 392 | powerpc_firmware_features |= FW_FEATURE_CMO; |
| 381 | } else | 393 | } else |
| 382 | pr_debug("CMO not enabled, PrPSP=%d, SecPSP=%d\n", PrPSP, SecPSP); | 394 | pr_debug("CMO not enabled, PrPSP=%d, SecPSP=%d\n", CMO_PrPSP, |
| 395 | CMO_SecPSP); | ||
| 383 | spin_unlock(&rtas_data_buf_lock); | 396 | spin_unlock(&rtas_data_buf_lock); |
| 384 | pr_debug(" <- fw_cmo_feature_init()\n"); | 397 | pr_debug(" <- fw_cmo_feature_init()\n"); |
| 385 | } | 398 | } |
diff --git a/arch/powerpc/sysdev/bestcomm/gen_bd.c b/arch/powerpc/sysdev/bestcomm/gen_bd.c index a3a134c35b0a..e0a53e3147b2 100644 --- a/arch/powerpc/sysdev/bestcomm/gen_bd.c +++ b/arch/powerpc/sysdev/bestcomm/gen_bd.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * | 11 | * |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/version.h> | ||
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 17 | #include <linux/string.h> | 16 | #include <linux/string.h> |
diff --git a/arch/powerpc/sysdev/cpm_common.c b/arch/powerpc/sysdev/cpm_common.c index 53da8a079f96..00d3d17c84a3 100644 --- a/arch/powerpc/sysdev/cpm_common.c +++ b/arch/powerpc/sysdev/cpm_common.c | |||
| @@ -254,15 +254,11 @@ static int cpm2_gpio32_get(struct gpio_chip *gc, unsigned int gpio) | |||
| 254 | return !!(in_be32(&iop->dat) & pin_mask); | 254 | return !!(in_be32(&iop->dat) & pin_mask); |
| 255 | } | 255 | } |
| 256 | 256 | ||
| 257 | static void cpm2_gpio32_set(struct gpio_chip *gc, unsigned int gpio, int value) | 257 | static void __cpm2_gpio32_set(struct of_mm_gpio_chip *mm_gc, u32 pin_mask, |
| 258 | int value) | ||
| 258 | { | 259 | { |
| 259 | struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc); | ||
| 260 | struct cpm2_gpio32_chip *cpm2_gc = to_cpm2_gpio32_chip(mm_gc); | 260 | struct cpm2_gpio32_chip *cpm2_gc = to_cpm2_gpio32_chip(mm_gc); |
| 261 | struct cpm2_ioports __iomem *iop = mm_gc->regs; | 261 | struct cpm2_ioports __iomem *iop = mm_gc->regs; |
| 262 | unsigned long flags; | ||
| 263 | u32 pin_mask = 1 << (31 - gpio); | ||
| 264 | |||
| 265 | spin_lock_irqsave(&cpm2_gc->lock, flags); | ||
| 266 | 262 | ||
| 267 | if (value) | 263 | if (value) |
| 268 | cpm2_gc->cpdata |= pin_mask; | 264 | cpm2_gc->cpdata |= pin_mask; |
| @@ -270,6 +266,18 @@ static void cpm2_gpio32_set(struct gpio_chip *gc, unsigned int gpio, int value) | |||
| 270 | cpm2_gc->cpdata &= ~pin_mask; | 266 | cpm2_gc->cpdata &= ~pin_mask; |
| 271 | 267 | ||
| 272 | out_be32(&iop->dat, cpm2_gc->cpdata); | 268 | out_be32(&iop->dat, cpm2_gc->cpdata); |
| 269 | } | ||
| 270 | |||
| 271 | static void cpm2_gpio32_set(struct gpio_chip *gc, unsigned int gpio, int value) | ||
| 272 | { | ||
| 273 | struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc); | ||
| 274 | struct cpm2_gpio32_chip *cpm2_gc = to_cpm2_gpio32_chip(mm_gc); | ||
| 275 | unsigned long flags; | ||
| 276 | u32 pin_mask = 1 << (31 - gpio); | ||
| 277 | |||
| 278 | spin_lock_irqsave(&cpm2_gc->lock, flags); | ||
| 279 | |||
| 280 | __cpm2_gpio32_set(mm_gc, pin_mask, value); | ||
| 273 | 281 | ||
| 274 | spin_unlock_irqrestore(&cpm2_gc->lock, flags); | 282 | spin_unlock_irqrestore(&cpm2_gc->lock, flags); |
| 275 | } | 283 | } |
| @@ -277,14 +285,17 @@ static void cpm2_gpio32_set(struct gpio_chip *gc, unsigned int gpio, int value) | |||
| 277 | static int cpm2_gpio32_dir_out(struct gpio_chip *gc, unsigned int gpio, int val) | 285 | static int cpm2_gpio32_dir_out(struct gpio_chip *gc, unsigned int gpio, int val) |
| 278 | { | 286 | { |
| 279 | struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc); | 287 | struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc); |
| 288 | struct cpm2_gpio32_chip *cpm2_gc = to_cpm2_gpio32_chip(mm_gc); | ||
| 280 | struct cpm2_ioports __iomem *iop = mm_gc->regs; | 289 | struct cpm2_ioports __iomem *iop = mm_gc->regs; |
| 281 | u32 pin_mask; | 290 | unsigned long flags; |
| 291 | u32 pin_mask = 1 << (31 - gpio); | ||
| 282 | 292 | ||
| 283 | pin_mask = 1 << (31 - gpio); | 293 | spin_lock_irqsave(&cpm2_gc->lock, flags); |
| 284 | 294 | ||
| 285 | setbits32(&iop->dir, pin_mask); | 295 | setbits32(&iop->dir, pin_mask); |
| 296 | __cpm2_gpio32_set(mm_gc, pin_mask, val); | ||
| 286 | 297 | ||
| 287 | cpm2_gpio32_set(gc, gpio, val); | 298 | spin_unlock_irqrestore(&cpm2_gc->lock, flags); |
| 288 | 299 | ||
| 289 | return 0; | 300 | return 0; |
| 290 | } | 301 | } |
| @@ -292,13 +303,17 @@ static int cpm2_gpio32_dir_out(struct gpio_chip *gc, unsigned int gpio, int val) | |||
| 292 | static int cpm2_gpio32_dir_in(struct gpio_chip *gc, unsigned int gpio) | 303 | static int cpm2_gpio32_dir_in(struct gpio_chip *gc, unsigned int gpio) |
| 293 | { | 304 | { |
| 294 | struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc); | 305 | struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc); |
| 306 | struct cpm2_gpio32_chip *cpm2_gc = to_cpm2_gpio32_chip(mm_gc); | ||
| 295 | struct cpm2_ioports __iomem *iop = mm_gc->regs; | 307 | struct cpm2_ioports __iomem *iop = mm_gc->regs; |
| 296 | u32 pin_mask; | 308 | unsigned long flags; |
| 309 | u32 pin_mask = 1 << (31 - gpio); | ||
| 297 | 310 | ||
| 298 | pin_mask = 1 << (31 - gpio); | 311 | spin_lock_irqsave(&cpm2_gc->lock, flags); |
| 299 | 312 | ||
| 300 | clrbits32(&iop->dir, pin_mask); | 313 | clrbits32(&iop->dir, pin_mask); |
| 301 | 314 | ||
| 315 | spin_unlock_irqrestore(&cpm2_gc->lock, flags); | ||
| 316 | |||
| 302 | return 0; | 317 | return 0; |
| 303 | } | 318 | } |
| 304 | 319 | ||
diff --git a/arch/powerpc/sysdev/qe_lib/ucc_fast.c b/arch/powerpc/sysdev/qe_lib/ucc_fast.c index 1aecb075a72e..25fbbfaa837d 100644 --- a/arch/powerpc/sysdev/qe_lib/ucc_fast.c +++ b/arch/powerpc/sysdev/qe_lib/ucc_fast.c | |||
| @@ -208,6 +208,7 @@ int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** ucc | |||
| 208 | uccf->uf_regs = ioremap(uf_info->regs, sizeof(struct ucc_fast)); | 208 | uccf->uf_regs = ioremap(uf_info->regs, sizeof(struct ucc_fast)); |
| 209 | if (uccf->uf_regs == NULL) { | 209 | if (uccf->uf_regs == NULL) { |
| 210 | printk(KERN_ERR "%s: Cannot map UCC registers\n", __func__); | 210 | printk(KERN_ERR "%s: Cannot map UCC registers\n", __func__); |
| 211 | kfree(uccf); | ||
| 211 | return -ENOMEM; | 212 | return -ENOMEM; |
| 212 | } | 213 | } |
| 213 | 214 | ||
| @@ -355,6 +356,9 @@ void ucc_fast_free(struct ucc_fast_private * uccf) | |||
| 355 | if (uccf->ucc_fast_rx_virtual_fifo_base_offset) | 356 | if (uccf->ucc_fast_rx_virtual_fifo_base_offset) |
| 356 | qe_muram_free(uccf->ucc_fast_rx_virtual_fifo_base_offset); | 357 | qe_muram_free(uccf->ucc_fast_rx_virtual_fifo_base_offset); |
| 357 | 358 | ||
| 359 | if (uccf->uf_regs) | ||
| 360 | iounmap(uccf->uf_regs); | ||
| 361 | |||
| 358 | kfree(uccf); | 362 | kfree(uccf); |
| 359 | } | 363 | } |
| 360 | EXPORT_SYMBOL(ucc_fast_free); | 364 | EXPORT_SYMBOL(ucc_fast_free); |
diff --git a/arch/powerpc/sysdev/qe_lib/ucc_slow.c b/arch/powerpc/sysdev/qe_lib/ucc_slow.c index a578bc77b9d5..e1d6a1340157 100644 --- a/arch/powerpc/sysdev/qe_lib/ucc_slow.c +++ b/arch/powerpc/sysdev/qe_lib/ucc_slow.c | |||
| @@ -171,6 +171,7 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc | |||
| 171 | uccs->us_regs = ioremap(us_info->regs, sizeof(struct ucc_slow)); | 171 | uccs->us_regs = ioremap(us_info->regs, sizeof(struct ucc_slow)); |
| 172 | if (uccs->us_regs == NULL) { | 172 | if (uccs->us_regs == NULL) { |
| 173 | printk(KERN_ERR "%s: Cannot map UCC registers\n", __func__); | 173 | printk(KERN_ERR "%s: Cannot map UCC registers\n", __func__); |
| 174 | kfree(uccs); | ||
| 174 | return -ENOMEM; | 175 | return -ENOMEM; |
| 175 | } | 176 | } |
| 176 | 177 | ||
| @@ -367,10 +368,11 @@ void ucc_slow_free(struct ucc_slow_private * uccs) | |||
| 367 | if (uccs->tx_base_offset) | 368 | if (uccs->tx_base_offset) |
| 368 | qe_muram_free(uccs->tx_base_offset); | 369 | qe_muram_free(uccs->tx_base_offset); |
| 369 | 370 | ||
| 370 | if (uccs->us_pram) { | 371 | if (uccs->us_pram) |
| 371 | qe_muram_free(uccs->us_pram_offset); | 372 | qe_muram_free(uccs->us_pram_offset); |
| 372 | uccs->us_pram = NULL; | 373 | |
| 373 | } | 374 | if (uccs->us_regs) |
| 375 | iounmap(uccs->us_regs); | ||
| 374 | 376 | ||
| 375 | kfree(uccs); | 377 | kfree(uccs); |
| 376 | } | 378 | } |
diff --git a/arch/s390/defconfig b/arch/s390/defconfig index c5cdb975d590..9b0bc2c9fba0 100644 --- a/arch/s390/defconfig +++ b/arch/s390/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.26-rc4 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Fri May 30 09:49:33 2008 | 4 | # Thu Aug 21 19:43:29 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_SCHED_MC=y | 6 | CONFIG_SCHED_MC=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -68,7 +68,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 68 | CONFIG_SYSCTL=y | 68 | CONFIG_SYSCTL=y |
| 69 | # CONFIG_EMBEDDED is not set | 69 | # CONFIG_EMBEDDED is not set |
| 70 | CONFIG_SYSCTL_SYSCALL=y | 70 | CONFIG_SYSCTL_SYSCALL=y |
| 71 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 72 | CONFIG_KALLSYMS=y | 71 | CONFIG_KALLSYMS=y |
| 73 | # CONFIG_KALLSYMS_ALL is not set | 72 | # CONFIG_KALLSYMS_ALL is not set |
| 74 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 73 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -93,11 +92,17 @@ CONFIG_SLAB=y | |||
| 93 | # CONFIG_MARKERS is not set | 92 | # CONFIG_MARKERS is not set |
| 94 | CONFIG_HAVE_OPROFILE=y | 93 | CONFIG_HAVE_OPROFILE=y |
| 95 | CONFIG_KPROBES=y | 94 | CONFIG_KPROBES=y |
| 95 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
| 96 | CONFIG_KRETPROBES=y | 96 | CONFIG_KRETPROBES=y |
| 97 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
| 97 | CONFIG_HAVE_KPROBES=y | 98 | CONFIG_HAVE_KPROBES=y |
| 98 | CONFIG_HAVE_KRETPROBES=y | 99 | CONFIG_HAVE_KRETPROBES=y |
| 100 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
| 99 | # CONFIG_HAVE_DMA_ATTRS is not set | 101 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 102 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 103 | # CONFIG_HAVE_CLK is not set | ||
| 100 | CONFIG_PROC_PAGE_MONITOR=y | 104 | CONFIG_PROC_PAGE_MONITOR=y |
| 105 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 101 | CONFIG_SLABINFO=y | 106 | CONFIG_SLABINFO=y |
| 102 | CONFIG_RT_MUTEXES=y | 107 | CONFIG_RT_MUTEXES=y |
| 103 | # CONFIG_TINY_SHMEM is not set | 108 | # CONFIG_TINY_SHMEM is not set |
| @@ -113,6 +118,7 @@ CONFIG_STOP_MACHINE=y | |||
| 113 | CONFIG_BLOCK=y | 118 | CONFIG_BLOCK=y |
| 114 | # CONFIG_BLK_DEV_IO_TRACE is not set | 119 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 115 | CONFIG_BLK_DEV_BSG=y | 120 | CONFIG_BLK_DEV_BSG=y |
| 121 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 116 | CONFIG_BLOCK_COMPAT=y | 122 | CONFIG_BLOCK_COMPAT=y |
| 117 | 123 | ||
| 118 | # | 124 | # |
| @@ -175,6 +181,8 @@ CONFIG_PREEMPT=y | |||
| 175 | CONFIG_ARCH_SPARSEMEM_ENABLE=y | 181 | CONFIG_ARCH_SPARSEMEM_ENABLE=y |
| 176 | CONFIG_ARCH_SPARSEMEM_DEFAULT=y | 182 | CONFIG_ARCH_SPARSEMEM_DEFAULT=y |
| 177 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y | 183 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y |
| 184 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | ||
| 185 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | ||
| 178 | CONFIG_SELECT_MEMORY_MODEL=y | 186 | CONFIG_SELECT_MEMORY_MODEL=y |
| 179 | # CONFIG_FLATMEM_MANUAL is not set | 187 | # CONFIG_FLATMEM_MANUAL is not set |
| 180 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 188 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| @@ -185,8 +193,12 @@ CONFIG_HAVE_MEMORY_PRESENT=y | |||
| 185 | CONFIG_SPARSEMEM_EXTREME=y | 193 | CONFIG_SPARSEMEM_EXTREME=y |
| 186 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y | 194 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y |
| 187 | CONFIG_SPARSEMEM_VMEMMAP=y | 195 | CONFIG_SPARSEMEM_VMEMMAP=y |
| 196 | CONFIG_MEMORY_HOTPLUG=y | ||
| 197 | CONFIG_MEMORY_HOTPLUG_SPARSE=y | ||
| 198 | CONFIG_MEMORY_HOTREMOVE=y | ||
| 188 | CONFIG_PAGEFLAGS_EXTENDED=y | 199 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 189 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 200 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 201 | CONFIG_MIGRATION=y | ||
| 190 | CONFIG_RESOURCES_64BIT=y | 202 | CONFIG_RESOURCES_64BIT=y |
| 191 | CONFIG_ZONE_DMA_FLAG=1 | 203 | CONFIG_ZONE_DMA_FLAG=1 |
| 192 | CONFIG_BOUNCE=y | 204 | CONFIG_BOUNCE=y |
| @@ -198,6 +210,7 @@ CONFIG_VIRT_TO_BUS=y | |||
| 198 | CONFIG_MACHCHK_WARNING=y | 210 | CONFIG_MACHCHK_WARNING=y |
| 199 | CONFIG_QDIO=y | 211 | CONFIG_QDIO=y |
| 200 | # CONFIG_QDIO_DEBUG is not set | 212 | # CONFIG_QDIO_DEBUG is not set |
| 213 | CONFIG_CHSC_SCH=m | ||
| 201 | 214 | ||
| 202 | # | 215 | # |
| 203 | # Misc | 216 | # Misc |
| @@ -206,6 +219,7 @@ CONFIG_IPL=y | |||
| 206 | # CONFIG_IPL_TAPE is not set | 219 | # CONFIG_IPL_TAPE is not set |
| 207 | CONFIG_IPL_VM=y | 220 | CONFIG_IPL_VM=y |
| 208 | CONFIG_BINFMT_ELF=y | 221 | CONFIG_BINFMT_ELF=y |
| 222 | CONFIG_COMPAT_BINFMT_ELF=y | ||
| 209 | CONFIG_BINFMT_MISC=m | 223 | CONFIG_BINFMT_MISC=m |
| 210 | CONFIG_FORCE_MAX_ZONEORDER=9 | 224 | CONFIG_FORCE_MAX_ZONEORDER=9 |
| 211 | # CONFIG_PROCESS_DEBUG is not set | 225 | # CONFIG_PROCESS_DEBUG is not set |
| @@ -226,10 +240,6 @@ CONFIG_S390_HYPFS_FS=y | |||
| 226 | CONFIG_KEXEC=y | 240 | CONFIG_KEXEC=y |
| 227 | # CONFIG_ZFCPDUMP is not set | 241 | # CONFIG_ZFCPDUMP is not set |
| 228 | CONFIG_S390_GUEST=y | 242 | CONFIG_S390_GUEST=y |
| 229 | |||
| 230 | # | ||
| 231 | # Networking | ||
| 232 | # | ||
| 233 | CONFIG_NET=y | 243 | CONFIG_NET=y |
| 234 | 244 | ||
| 235 | # | 245 | # |
| @@ -364,7 +374,6 @@ CONFIG_NET_SCH_CBQ=m | |||
| 364 | # CONFIG_NET_SCH_HTB is not set | 374 | # CONFIG_NET_SCH_HTB is not set |
| 365 | # CONFIG_NET_SCH_HFSC is not set | 375 | # CONFIG_NET_SCH_HFSC is not set |
| 366 | CONFIG_NET_SCH_PRIO=m | 376 | CONFIG_NET_SCH_PRIO=m |
| 367 | CONFIG_NET_SCH_RR=m | ||
| 368 | CONFIG_NET_SCH_RED=m | 377 | CONFIG_NET_SCH_RED=m |
| 369 | CONFIG_NET_SCH_SFQ=m | 378 | CONFIG_NET_SCH_SFQ=m |
| 370 | CONFIG_NET_SCH_TEQL=m | 379 | CONFIG_NET_SCH_TEQL=m |
| @@ -430,7 +439,9 @@ CONFIG_CCW=y | |||
| 430 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 439 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
| 431 | CONFIG_STANDALONE=y | 440 | CONFIG_STANDALONE=y |
| 432 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 441 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 433 | # CONFIG_FW_LOADER is not set | 442 | CONFIG_FW_LOADER=y |
| 443 | # CONFIG_FIRMWARE_IN_KERNEL is not set | ||
| 444 | CONFIG_EXTRA_FIRMWARE="" | ||
| 434 | # CONFIG_DEBUG_DRIVER is not set | 445 | # CONFIG_DEBUG_DRIVER is not set |
| 435 | # CONFIG_DEBUG_DEVRES is not set | 446 | # CONFIG_DEBUG_DEVRES is not set |
| 436 | CONFIG_SYS_HYPERVISOR=y | 447 | CONFIG_SYS_HYPERVISOR=y |
| @@ -507,6 +518,11 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 507 | # CONFIG_ISCSI_TCP is not set | 518 | # CONFIG_ISCSI_TCP is not set |
| 508 | # CONFIG_SCSI_DEBUG is not set | 519 | # CONFIG_SCSI_DEBUG is not set |
| 509 | CONFIG_ZFCP=y | 520 | CONFIG_ZFCP=y |
| 521 | CONFIG_SCSI_DH=m | ||
| 522 | CONFIG_SCSI_DH_RDAC=m | ||
| 523 | CONFIG_SCSI_DH_HP_SW=m | ||
| 524 | CONFIG_SCSI_DH_EMC=m | ||
| 525 | CONFIG_SCSI_DH_ALUA=m | ||
| 510 | CONFIG_MD=y | 526 | CONFIG_MD=y |
| 511 | CONFIG_BLK_DEV_MD=y | 527 | CONFIG_BLK_DEV_MD=y |
| 512 | CONFIG_MD_LINEAR=m | 528 | CONFIG_MD_LINEAR=m |
| @@ -522,14 +538,10 @@ CONFIG_DM_CRYPT=y | |||
| 522 | CONFIG_DM_SNAPSHOT=y | 538 | CONFIG_DM_SNAPSHOT=y |
| 523 | CONFIG_DM_MIRROR=y | 539 | CONFIG_DM_MIRROR=y |
| 524 | CONFIG_DM_ZERO=y | 540 | CONFIG_DM_ZERO=y |
| 525 | CONFIG_DM_MULTIPATH=y | 541 | CONFIG_DM_MULTIPATH=m |
| 526 | # CONFIG_DM_MULTIPATH_EMC is not set | ||
| 527 | # CONFIG_DM_MULTIPATH_RDAC is not set | ||
| 528 | # CONFIG_DM_MULTIPATH_HP is not set | ||
| 529 | # CONFIG_DM_DELAY is not set | 542 | # CONFIG_DM_DELAY is not set |
| 530 | # CONFIG_DM_UEVENT is not set | 543 | # CONFIG_DM_UEVENT is not set |
| 531 | CONFIG_NETDEVICES=y | 544 | CONFIG_NETDEVICES=y |
| 532 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 533 | # CONFIG_IFB is not set | 545 | # CONFIG_IFB is not set |
| 534 | CONFIG_DUMMY=m | 546 | CONFIG_DUMMY=m |
| 535 | CONFIG_BONDING=m | 547 | CONFIG_BONDING=m |
| @@ -544,7 +556,6 @@ CONFIG_NET_ETHERNET=y | |||
| 544 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 556 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| 545 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 557 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
| 546 | CONFIG_NETDEV_1000=y | 558 | CONFIG_NETDEV_1000=y |
| 547 | # CONFIG_E1000E_ENABLED is not set | ||
| 548 | CONFIG_NETDEV_10000=y | 559 | CONFIG_NETDEV_10000=y |
| 549 | # CONFIG_TR is not set | 560 | # CONFIG_TR is not set |
| 550 | # CONFIG_WAN is not set | 561 | # CONFIG_WAN is not set |
| @@ -576,7 +587,10 @@ CONFIG_DEVKMEM=y | |||
| 576 | CONFIG_UNIX98_PTYS=y | 587 | CONFIG_UNIX98_PTYS=y |
| 577 | CONFIG_LEGACY_PTYS=y | 588 | CONFIG_LEGACY_PTYS=y |
| 578 | CONFIG_LEGACY_PTY_COUNT=256 | 589 | CONFIG_LEGACY_PTY_COUNT=256 |
| 590 | CONFIG_HVC_DRIVER=y | ||
| 591 | CONFIG_VIRTIO_CONSOLE=y | ||
| 579 | CONFIG_HW_RANDOM=m | 592 | CONFIG_HW_RANDOM=m |
| 593 | CONFIG_HW_RANDOM_VIRTIO=m | ||
| 580 | # CONFIG_R3964 is not set | 594 | # CONFIG_R3964 is not set |
| 581 | CONFIG_RAW_DRIVER=m | 595 | CONFIG_RAW_DRIVER=m |
| 582 | CONFIG_MAX_RAW_DEVS=256 | 596 | CONFIG_MAX_RAW_DEVS=256 |
| @@ -616,6 +630,7 @@ CONFIG_MONWRITER=m | |||
| 616 | CONFIG_S390_VMUR=m | 630 | CONFIG_S390_VMUR=m |
| 617 | # CONFIG_POWER_SUPPLY is not set | 631 | # CONFIG_POWER_SUPPLY is not set |
| 618 | # CONFIG_THERMAL is not set | 632 | # CONFIG_THERMAL is not set |
| 633 | # CONFIG_THERMAL_HWMON is not set | ||
| 619 | # CONFIG_WATCHDOG is not set | 634 | # CONFIG_WATCHDOG is not set |
| 620 | 635 | ||
| 621 | # | 636 | # |
| @@ -693,6 +708,7 @@ CONFIG_CONFIGFS_FS=m | |||
| 693 | # CONFIG_CRAMFS is not set | 708 | # CONFIG_CRAMFS is not set |
| 694 | # CONFIG_VXFS_FS is not set | 709 | # CONFIG_VXFS_FS is not set |
| 695 | # CONFIG_MINIX_FS is not set | 710 | # CONFIG_MINIX_FS is not set |
| 711 | # CONFIG_OMFS_FS is not set | ||
| 696 | # CONFIG_HPFS_FS is not set | 712 | # CONFIG_HPFS_FS is not set |
| 697 | # CONFIG_QNX4FS_FS is not set | 713 | # CONFIG_QNX4FS_FS is not set |
| 698 | # CONFIG_ROMFS_FS is not set | 714 | # CONFIG_ROMFS_FS is not set |
| @@ -712,7 +728,6 @@ CONFIG_LOCKD_V4=y | |||
| 712 | CONFIG_EXPORTFS=y | 728 | CONFIG_EXPORTFS=y |
| 713 | CONFIG_NFS_COMMON=y | 729 | CONFIG_NFS_COMMON=y |
| 714 | CONFIG_SUNRPC=y | 730 | CONFIG_SUNRPC=y |
| 715 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 716 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 731 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 717 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 732 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 718 | # CONFIG_SMB_FS is not set | 733 | # CONFIG_SMB_FS is not set |
| @@ -780,6 +795,7 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
| 780 | # CONFIG_DEBUG_INFO is not set | 795 | # CONFIG_DEBUG_INFO is not set |
| 781 | # CONFIG_DEBUG_VM is not set | 796 | # CONFIG_DEBUG_VM is not set |
| 782 | # CONFIG_DEBUG_WRITECOUNT is not set | 797 | # CONFIG_DEBUG_WRITECOUNT is not set |
| 798 | CONFIG_DEBUG_MEMORY_INIT=y | ||
| 783 | # CONFIG_DEBUG_LIST is not set | 799 | # CONFIG_DEBUG_LIST is not set |
| 784 | # CONFIG_DEBUG_SG is not set | 800 | # CONFIG_DEBUG_SG is not set |
| 785 | # CONFIG_FRAME_POINTER is not set | 801 | # CONFIG_FRAME_POINTER is not set |
| @@ -789,6 +805,7 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
| 789 | # CONFIG_LKDTM is not set | 805 | # CONFIG_LKDTM is not set |
| 790 | # CONFIG_FAULT_INJECTION is not set | 806 | # CONFIG_FAULT_INJECTION is not set |
| 791 | # CONFIG_LATENCYTOP is not set | 807 | # CONFIG_LATENCYTOP is not set |
| 808 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 792 | CONFIG_SAMPLES=y | 809 | CONFIG_SAMPLES=y |
| 793 | # CONFIG_SAMPLE_KOBJECT is not set | 810 | # CONFIG_SAMPLE_KOBJECT is not set |
| 794 | # CONFIG_SAMPLE_KPROBES is not set | 811 | # CONFIG_SAMPLE_KPROBES is not set |
| @@ -847,6 +864,10 @@ CONFIG_CRYPTO_HMAC=m | |||
| 847 | # CONFIG_CRYPTO_MD4 is not set | 864 | # CONFIG_CRYPTO_MD4 is not set |
| 848 | CONFIG_CRYPTO_MD5=m | 865 | CONFIG_CRYPTO_MD5=m |
| 849 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 866 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 867 | CONFIG_CRYPTO_RMD128=m | ||
| 868 | CONFIG_CRYPTO_RMD160=m | ||
| 869 | CONFIG_CRYPTO_RMD256=m | ||
| 870 | CONFIG_CRYPTO_RMD320=m | ||
| 850 | CONFIG_CRYPTO_SHA1=m | 871 | CONFIG_CRYPTO_SHA1=m |
| 851 | # CONFIG_CRYPTO_SHA256 is not set | 872 | # CONFIG_CRYPTO_SHA256 is not set |
| 852 | # CONFIG_CRYPTO_SHA512 is not set | 873 | # CONFIG_CRYPTO_SHA512 is not set |
| @@ -895,6 +916,7 @@ CONFIG_BITREVERSE=m | |||
| 895 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | 916 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set |
| 896 | # CONFIG_CRC_CCITT is not set | 917 | # CONFIG_CRC_CCITT is not set |
| 897 | # CONFIG_CRC16 is not set | 918 | # CONFIG_CRC16 is not set |
| 919 | CONFIG_CRC_T10DIF=y | ||
| 898 | # CONFIG_CRC_ITU_T is not set | 920 | # CONFIG_CRC_ITU_T is not set |
| 899 | CONFIG_CRC32=m | 921 | CONFIG_CRC32=m |
| 900 | CONFIG_CRC7=m | 922 | CONFIG_CRC7=m |
diff --git a/arch/s390/include/asm/bitops.h b/arch/s390/include/asm/bitops.h index b4eb24ab5af9..8e9243ae0c19 100644 --- a/arch/s390/include/asm/bitops.h +++ b/arch/s390/include/asm/bitops.h | |||
| @@ -709,7 +709,7 @@ static inline int find_next_zero_bit (const unsigned long * addr, | |||
| 709 | * __ffz_word returns __BITOPS_WORDSIZE | 709 | * __ffz_word returns __BITOPS_WORDSIZE |
| 710 | * if no zero bit is present in the word. | 710 | * if no zero bit is present in the word. |
| 711 | */ | 711 | */ |
| 712 | set = __ffz_word(0, *p >> bit) + bit; | 712 | set = __ffz_word(bit, *p >> bit); |
| 713 | if (set >= size) | 713 | if (set >= size) |
| 714 | return size + offset; | 714 | return size + offset; |
| 715 | if (set < __BITOPS_WORDSIZE) | 715 | if (set < __BITOPS_WORDSIZE) |
| @@ -824,7 +824,7 @@ static inline int ext2_find_next_zero_bit(void *vaddr, unsigned long size, | |||
| 824 | * s390 version of ffz returns __BITOPS_WORDSIZE | 824 | * s390 version of ffz returns __BITOPS_WORDSIZE |
| 825 | * if no zero bit is present in the word. | 825 | * if no zero bit is present in the word. |
| 826 | */ | 826 | */ |
| 827 | set = ffz(__load_ulong_le(p, 0) >> bit) + bit; | 827 | set = __ffz_word(bit, __load_ulong_le(p, 0) >> bit); |
| 828 | if (set >= size) | 828 | if (set >= size) |
| 829 | return size + offset; | 829 | return size + offset; |
| 830 | if (set < __BITOPS_WORDSIZE) | 830 | if (set < __BITOPS_WORDSIZE) |
| @@ -865,7 +865,7 @@ static inline int ext2_find_next_bit(void *vaddr, unsigned long size, | |||
| 865 | * s390 version of ffz returns __BITOPS_WORDSIZE | 865 | * s390 version of ffz returns __BITOPS_WORDSIZE |
| 866 | * if no zero bit is present in the word. | 866 | * if no zero bit is present in the word. |
| 867 | */ | 867 | */ |
| 868 | set = ffs(__load_ulong_le(p, 0) >> bit) + bit; | 868 | set = __ffs_word(0, __load_ulong_le(p, 0) & (~0UL << bit)); |
| 869 | if (set >= size) | 869 | if (set >= size) |
| 870 | return size + offset; | 870 | return size + offset; |
| 871 | if (set < __BITOPS_WORDSIZE) | 871 | if (set < __BITOPS_WORDSIZE) |
diff --git a/arch/s390/include/asm/kexec.h b/arch/s390/include/asm/kexec.h index f219c6411e0b..bb729b84a21e 100644 --- a/arch/s390/include/asm/kexec.h +++ b/arch/s390/include/asm/kexec.h | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | #define KEXEC_CONTROL_MEMORY_LIMIT (1UL<<31) | 31 | #define KEXEC_CONTROL_MEMORY_LIMIT (1UL<<31) |
| 32 | 32 | ||
| 33 | /* Allocate one page for the pdp and the second for the code */ | 33 | /* Allocate one page for the pdp and the second for the code */ |
| 34 | #define KEXEC_CONTROL_CODE_SIZE 4096 | 34 | #define KEXEC_CONTROL_PAGE_SIZE 4096 |
| 35 | 35 | ||
| 36 | /* The native architecture */ | 36 | /* The native architecture */ |
| 37 | #define KEXEC_ARCH KEXEC_ARCH_S390 | 37 | #define KEXEC_ARCH KEXEC_ARCH_S390 |
diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c index 9839767d0842..3e2c05cb6a87 100644 --- a/arch/s390/kernel/process.c +++ b/arch/s390/kernel/process.c | |||
| @@ -75,7 +75,9 @@ unsigned long thread_saved_pc(struct task_struct *tsk) | |||
| 75 | return sf->gprs[8]; | 75 | return sf->gprs[8]; |
| 76 | } | 76 | } |
| 77 | 77 | ||
| 78 | DEFINE_PER_CPU(struct s390_idle_data, s390_idle); | 78 | DEFINE_PER_CPU(struct s390_idle_data, s390_idle) = { |
| 79 | .lock = __SPIN_LOCK_UNLOCKED(s390_idle.lock) | ||
| 80 | }; | ||
| 79 | 81 | ||
| 80 | static int s390_idle_enter(void) | 82 | static int s390_idle_enter(void) |
| 81 | { | 83 | { |
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c index b795b3e24afd..00b9b4dec5eb 100644 --- a/arch/s390/kernel/smp.c +++ b/arch/s390/kernel/smp.c | |||
| @@ -610,7 +610,6 @@ static void __init smp_create_idle(unsigned int cpu) | |||
| 610 | if (IS_ERR(p)) | 610 | if (IS_ERR(p)) |
| 611 | panic("failed fork for CPU %u: %li", cpu, PTR_ERR(p)); | 611 | panic("failed fork for CPU %u: %li", cpu, PTR_ERR(p)); |
| 612 | current_set[cpu] = p; | 612 | current_set[cpu] = p; |
| 613 | spin_lock_init(&(&per_cpu(s390_idle, cpu))->lock); | ||
| 614 | } | 613 | } |
| 615 | 614 | ||
| 616 | static int __cpuinit smp_alloc_lowcore(int cpu) | 615 | static int __cpuinit smp_alloc_lowcore(int cpu) |
| @@ -845,7 +844,6 @@ void __init smp_prepare_boot_cpu(void) | |||
| 845 | current_set[0] = current; | 844 | current_set[0] = current; |
| 846 | smp_cpu_state[0] = CPU_STATE_CONFIGURED; | 845 | smp_cpu_state[0] = CPU_STATE_CONFIGURED; |
| 847 | smp_cpu_polarization[0] = POLARIZATION_UNKNWN; | 846 | smp_cpu_polarization[0] = POLARIZATION_UNKNWN; |
| 848 | spin_lock_init(&(&__get_cpu_var(s390_idle))->lock); | ||
| 849 | } | 847 | } |
| 850 | 848 | ||
| 851 | void __init smp_cpus_done(unsigned int max_cpus) | 849 | void __init smp_cpus_done(unsigned int max_cpus) |
diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S index 76c1e60c92f3..607bd67a18ce 100644 --- a/arch/s390/kernel/vmlinux.lds.S +++ b/arch/s390/kernel/vmlinux.lds.S | |||
| @@ -55,7 +55,7 @@ SECTIONS | |||
| 55 | __start___ex_table = .; | 55 | __start___ex_table = .; |
| 56 | *(__ex_table) | 56 | *(__ex_table) |
| 57 | __stop___ex_table = .; | 57 | __stop___ex_table = .; |
| 58 | } | 58 | } :data |
| 59 | 59 | ||
| 60 | .data : { /* Data */ | 60 | .data : { /* Data */ |
| 61 | DATA_DATA | 61 | DATA_DATA |
diff --git a/arch/sh/boards/board-ap325rxa.c b/arch/sh/boards/board-ap325rxa.c index 025d4fe55a58..fd1612590bf4 100644 --- a/arch/sh/boards/board-ap325rxa.c +++ b/arch/sh/boards/board-ap325rxa.c | |||
| @@ -140,6 +140,10 @@ static struct sh_mobile_lcdc_info lcdc_info = { | |||
| 140 | .vsync_len = 1, | 140 | .vsync_len = 1, |
| 141 | .sync = 0, /* hsync and vsync are active low */ | 141 | .sync = 0, /* hsync and vsync are active low */ |
| 142 | }, | 142 | }, |
| 143 | .lcd_size_cfg = { /* 7.0 inch */ | ||
| 144 | .width = 152, | ||
| 145 | .height = 91, | ||
| 146 | }, | ||
| 143 | .board_cfg = { | 147 | .board_cfg = { |
| 144 | .display_on = ap320_wvga_power_on, | 148 | .display_on = ap320_wvga_power_on, |
| 145 | }, | 149 | }, |
diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c index e499ee384d58..714dce91cc9b 100644 --- a/arch/sh/boards/mach-migor/setup.c +++ b/arch/sh/boards/mach-migor/setup.c | |||
| @@ -224,6 +224,10 @@ static struct sh_mobile_lcdc_info sh_mobile_lcdc_info = { | |||
| 224 | .vsync_len = 2, | 224 | .vsync_len = 2, |
| 225 | .sync = 0, | 225 | .sync = 0, |
| 226 | }, | 226 | }, |
| 227 | .lcd_size_cfg = { /* 7.0 inch */ | ||
| 228 | .width = 152, | ||
| 229 | .height = 91, | ||
| 230 | }, | ||
| 227 | } | 231 | } |
| 228 | #endif | 232 | #endif |
| 229 | #ifdef CONFIG_SH_MIGOR_QVGA | 233 | #ifdef CONFIG_SH_MIGOR_QVGA |
| @@ -245,6 +249,10 @@ static struct sh_mobile_lcdc_info sh_mobile_lcdc_info = { | |||
| 245 | .vsync_len = 2, | 249 | .vsync_len = 2, |
| 246 | .sync = FB_SYNC_HOR_HIGH_ACT, | 250 | .sync = FB_SYNC_HOR_HIGH_ACT, |
| 247 | }, | 251 | }, |
| 252 | .lcd_size_cfg = { /* 2.4 inch */ | ||
| 253 | .width = 49, | ||
| 254 | .height = 37, | ||
| 255 | }, | ||
| 248 | .board_cfg = { | 256 | .board_cfg = { |
| 249 | .setup_sys = migor_lcd_qvga_setup, | 257 | .setup_sys = migor_lcd_qvga_setup, |
| 250 | }, | 258 | }, |
diff --git a/arch/sh/boards/mach-sh7763rdp/setup.c b/arch/sh/boards/mach-sh7763rdp/setup.c index 925f16af7121..23850da05e3c 100644 --- a/arch/sh/boards/mach-sh7763rdp/setup.c +++ b/arch/sh/boards/mach-sh7763rdp/setup.c | |||
| @@ -15,8 +15,11 @@ | |||
| 15 | #include <linux/interrupt.h> | 15 | #include <linux/interrupt.h> |
| 16 | #include <linux/input.h> | 16 | #include <linux/input.h> |
| 17 | #include <linux/mtd/physmap.h> | 17 | #include <linux/mtd/physmap.h> |
| 18 | #include <asm/io.h> | 18 | #include <linux/fb.h> |
| 19 | #include <linux/io.h> | ||
| 19 | #include <asm/sh7763rdp.h> | 20 | #include <asm/sh7763rdp.h> |
| 21 | #include <asm/sh_eth.h> | ||
| 22 | #include <asm/sh7760fb.h> | ||
| 20 | 23 | ||
| 21 | /* NOR Flash */ | 24 | /* NOR Flash */ |
| 22 | static struct mtd_partition sh7763rdp_nor_flash_partitions[] = { | 25 | static struct mtd_partition sh7763rdp_nor_flash_partitions[] = { |
| @@ -60,8 +63,85 @@ static struct platform_device sh7763rdp_nor_flash_device = { | |||
| 60 | }, | 63 | }, |
| 61 | }; | 64 | }; |
| 62 | 65 | ||
| 66 | /* SH-Ether */ | ||
| 67 | static struct resource sh_eth_resources[] = { | ||
| 68 | { | ||
| 69 | .start = 0xFEE00800, /* use eth1 */ | ||
| 70 | .end = 0xFEE00F7C - 1, | ||
| 71 | .flags = IORESOURCE_MEM, | ||
| 72 | }, { | ||
| 73 | .start = 58, /* irq number */ | ||
| 74 | .end = 58, | ||
| 75 | .flags = IORESOURCE_IRQ, | ||
| 76 | }, | ||
| 77 | }; | ||
| 78 | |||
| 79 | static struct sh_eth_plat_data sh7763_eth_pdata = { | ||
| 80 | .phy = 1, | ||
| 81 | .edmac_endian = EDMAC_LITTLE_ENDIAN, | ||
| 82 | }; | ||
| 83 | |||
| 84 | static struct platform_device sh7763rdp_eth_device = { | ||
| 85 | .name = "sh-eth", | ||
| 86 | .resource = sh_eth_resources, | ||
| 87 | .num_resources = ARRAY_SIZE(sh_eth_resources), | ||
| 88 | .dev = { | ||
| 89 | .platform_data = &sh7763_eth_pdata, | ||
| 90 | }, | ||
| 91 | }; | ||
| 92 | |||
| 93 | /* SH7763 LCDC */ | ||
| 94 | static struct resource sh7763rdp_fb_resources[] = { | ||
| 95 | { | ||
| 96 | .start = 0xFFE80000, | ||
| 97 | .end = 0xFFE80442 - 1, | ||
| 98 | .flags = IORESOURCE_MEM, | ||
| 99 | }, | ||
| 100 | }; | ||
| 101 | |||
| 102 | static struct fb_videomode sh7763fb_videomode = { | ||
| 103 | .refresh = 60, | ||
| 104 | .name = "VGA Monitor", | ||
| 105 | .xres = 640, | ||
| 106 | .yres = 480, | ||
| 107 | .pixclock = 10000, | ||
| 108 | .left_margin = 80, | ||
| 109 | .right_margin = 24, | ||
| 110 | .upper_margin = 30, | ||
| 111 | .lower_margin = 1, | ||
| 112 | .hsync_len = 96, | ||
| 113 | .vsync_len = 1, | ||
| 114 | .sync = 0, | ||
| 115 | .vmode = FB_VMODE_NONINTERLACED, | ||
| 116 | .flag = FBINFO_FLAG_DEFAULT, | ||
| 117 | }; | ||
| 118 | |||
| 119 | static struct sh7760fb_platdata sh7763fb_def_pdata = { | ||
| 120 | .def_mode = &sh7763fb_videomode, | ||
| 121 | .ldmtr = (LDMTR_TFT_COLOR_16|LDMTR_MCNT), | ||
| 122 | .lddfr = LDDFR_16BPP_RGB565, | ||
| 123 | .ldpmmr = 0x0000, | ||
| 124 | .ldpspr = 0xFFFF, | ||
| 125 | .ldaclnr = 0x0001, | ||
| 126 | .ldickr = 0x1102, | ||
| 127 | .rotate = 0, | ||
| 128 | .novsync = 0, | ||
| 129 | .blank = NULL, | ||
| 130 | }; | ||
| 131 | |||
| 132 | static struct platform_device sh7763rdp_fb_device = { | ||
| 133 | .name = "sh7760-lcdc", | ||
| 134 | .resource = sh7763rdp_fb_resources, | ||
| 135 | .num_resources = ARRAY_SIZE(sh7763rdp_fb_resources), | ||
| 136 | .dev = { | ||
| 137 | .platform_data = &sh7763fb_def_pdata, | ||
| 138 | }, | ||
| 139 | }; | ||
| 140 | |||
| 63 | static struct platform_device *sh7763rdp_devices[] __initdata = { | 141 | static struct platform_device *sh7763rdp_devices[] __initdata = { |
| 64 | &sh7763rdp_nor_flash_device, | 142 | &sh7763rdp_nor_flash_device, |
| 143 | &sh7763rdp_eth_device, | ||
| 144 | &sh7763rdp_fb_device, | ||
| 65 | }; | 145 | }; |
| 66 | 146 | ||
| 67 | static int __init sh7763rdp_devices_setup(void) | 147 | static int __init sh7763rdp_devices_setup(void) |
| @@ -69,7 +149,7 @@ static int __init sh7763rdp_devices_setup(void) | |||
| 69 | return platform_add_devices(sh7763rdp_devices, | 149 | return platform_add_devices(sh7763rdp_devices, |
| 70 | ARRAY_SIZE(sh7763rdp_devices)); | 150 | ARRAY_SIZE(sh7763rdp_devices)); |
| 71 | } | 151 | } |
| 72 | __initcall(sh7763rdp_devices_setup); | 152 | device_initcall(sh7763rdp_devices_setup); |
| 73 | 153 | ||
| 74 | static void __init sh7763rdp_setup(char **cmdline_p) | 154 | static void __init sh7763rdp_setup(char **cmdline_p) |
| 75 | { | 155 | { |
diff --git a/arch/sh/boards/mach-x3proto/setup.c b/arch/sh/boards/mach-x3proto/setup.c index abc5b6d418fe..a70d23b21788 100644 --- a/arch/sh/boards/mach-x3proto/setup.c +++ b/arch/sh/boards/mach-x3proto/setup.c | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | * | 3 | * |
| 4 | * Renesas SH-X3 Prototype Board Support. | 4 | * Renesas SH-X3 Prototype Board Support. |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2007 Paul Mundt | 6 | * Copyright (C) 2007 - 2008 Paul Mundt |
| 7 | * | 7 | * |
| 8 | * This file is subject to the terms and conditions of the GNU General Public | 8 | * This file is subject to the terms and conditions of the GNU General Public |
| 9 | * License. See the file "COPYING" in the main directory of this archive | 9 | * License. See the file "COPYING" in the main directory of this archive |
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/platform_device.h> | 13 | #include <linux/platform_device.h> |
| 14 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 15 | #include <linux/io.h> | 15 | #include <linux/io.h> |
| 16 | #include <linux/smc91x.h> | ||
| 16 | #include <asm/ilsel.h> | 17 | #include <asm/ilsel.h> |
| 17 | 18 | ||
| 18 | static struct resource heartbeat_resources[] = { | 19 | static struct resource heartbeat_resources[] = { |
| @@ -30,6 +31,10 @@ static struct platform_device heartbeat_device = { | |||
| 30 | .resource = heartbeat_resources, | 31 | .resource = heartbeat_resources, |
| 31 | }; | 32 | }; |
| 32 | 33 | ||
| 34 | static struct smc91x_platdata smc91x_info = { | ||
| 35 | .flags = SMC91X_USE_16BIT | SMC91X_NOWAIT, | ||
| 36 | }; | ||
| 37 | |||
| 33 | static struct resource smc91x_resources[] = { | 38 | static struct resource smc91x_resources[] = { |
| 34 | [0] = { | 39 | [0] = { |
| 35 | .start = 0x18000300, | 40 | .start = 0x18000300, |
| @@ -47,6 +52,9 @@ static struct platform_device smc91x_device = { | |||
| 47 | .id = -1, | 52 | .id = -1, |
| 48 | .resource = smc91x_resources, | 53 | .resource = smc91x_resources, |
| 49 | .num_resources = ARRAY_SIZE(smc91x_resources), | 54 | .num_resources = ARRAY_SIZE(smc91x_resources), |
| 55 | .dev = { | ||
| 56 | .platform_data = &smc91x_info, | ||
| 57 | }, | ||
| 50 | }; | 58 | }; |
| 51 | 59 | ||
| 52 | static struct resource r8a66597_usb_host_resources[] = { | 60 | static struct resource r8a66597_usb_host_resources[] = { |
diff --git a/arch/sh/configs/sh7763rdp_defconfig b/arch/sh/configs/sh7763rdp_defconfig index 83f3fe5db3e5..baf830c4a7e4 100644 --- a/arch/sh/configs/sh7763rdp_defconfig +++ b/arch/sh/configs/sh7763rdp_defconfig | |||
| @@ -1,15 +1,17 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.26-rc4 | 3 | # Linux kernel version: 2.6.27-rc2 |
| 4 | # Fri Jun 6 12:20:17 2008 | 4 | # Fri Aug 8 13:44:20 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_SUPERH=y | 6 | CONFIG_SUPERH=y |
| 7 | CONFIG_SUPERH32=y | 7 | CONFIG_SUPERH32=y |
| 8 | CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig" | ||
| 8 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 9 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 9 | CONFIG_GENERIC_BUG=y | 10 | CONFIG_GENERIC_BUG=y |
| 10 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 11 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 11 | CONFIG_GENERIC_HWEIGHT=y | 12 | CONFIG_GENERIC_HWEIGHT=y |
| 12 | CONFIG_GENERIC_HARDIRQS=y | 13 | CONFIG_GENERIC_HARDIRQS=y |
| 14 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
| 13 | CONFIG_GENERIC_IRQ_PROBE=y | 15 | CONFIG_GENERIC_IRQ_PROBE=y |
| 14 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 16 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 15 | CONFIG_GENERIC_TIME=y | 17 | CONFIG_GENERIC_TIME=y |
| @@ -19,7 +21,6 @@ CONFIG_LOCKDEP_SUPPORT=y | |||
| 19 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 21 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
| 20 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 22 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
| 21 | CONFIG_ARCH_NO_VIRT_TO_BUS=y | 23 | CONFIG_ARCH_NO_VIRT_TO_BUS=y |
| 22 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
| 23 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 24 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 24 | 25 | ||
| 25 | # | 26 | # |
| @@ -83,10 +84,16 @@ CONFIG_PROFILING=y | |||
| 83 | # CONFIG_MARKERS is not set | 84 | # CONFIG_MARKERS is not set |
| 84 | CONFIG_OPROFILE=y | 85 | CONFIG_OPROFILE=y |
| 85 | CONFIG_HAVE_OPROFILE=y | 86 | CONFIG_HAVE_OPROFILE=y |
| 87 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
| 88 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
| 86 | # CONFIG_HAVE_KPROBES is not set | 89 | # CONFIG_HAVE_KPROBES is not set |
| 87 | # CONFIG_HAVE_KRETPROBES is not set | 90 | # CONFIG_HAVE_KRETPROBES is not set |
| 91 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
| 88 | # CONFIG_HAVE_DMA_ATTRS is not set | 92 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 93 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 94 | CONFIG_HAVE_CLK=y | ||
| 89 | CONFIG_PROC_PAGE_MONITOR=y | 95 | CONFIG_PROC_PAGE_MONITOR=y |
| 96 | CONFIG_HAVE_GENERIC_DMA_COHERENT=y | ||
| 90 | CONFIG_SLABINFO=y | 97 | CONFIG_SLABINFO=y |
| 91 | CONFIG_RT_MUTEXES=y | 98 | CONFIG_RT_MUTEXES=y |
| 92 | # CONFIG_TINY_SHMEM is not set | 99 | # CONFIG_TINY_SHMEM is not set |
| @@ -96,12 +103,13 @@ CONFIG_MODULES=y | |||
| 96 | # CONFIG_MODULE_UNLOAD is not set | 103 | # CONFIG_MODULE_UNLOAD is not set |
| 97 | # CONFIG_MODVERSIONS is not set | 104 | # CONFIG_MODVERSIONS is not set |
| 98 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 105 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 99 | # CONFIG_KMOD is not set | 106 | CONFIG_KMOD=y |
| 100 | CONFIG_BLOCK=y | 107 | CONFIG_BLOCK=y |
| 101 | # CONFIG_LBD is not set | 108 | # CONFIG_LBD is not set |
| 102 | # CONFIG_BLK_DEV_IO_TRACE is not set | 109 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 103 | # CONFIG_LSF is not set | 110 | # CONFIG_LSF is not set |
| 104 | # CONFIG_BLK_DEV_BSG is not set | 111 | # CONFIG_BLK_DEV_BSG is not set |
| 112 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 105 | 113 | ||
| 106 | # | 114 | # |
| 107 | # IO Schedulers | 115 | # IO Schedulers |
| @@ -177,6 +185,7 @@ CONFIG_PAGE_SIZE_4KB=y | |||
| 177 | # CONFIG_PAGE_SIZE_8KB is not set | 185 | # CONFIG_PAGE_SIZE_8KB is not set |
| 178 | # CONFIG_PAGE_SIZE_16KB is not set | 186 | # CONFIG_PAGE_SIZE_16KB is not set |
| 179 | # CONFIG_PAGE_SIZE_64KB is not set | 187 | # CONFIG_PAGE_SIZE_64KB is not set |
| 188 | CONFIG_ENTRY_OFFSET=0x00001000 | ||
| 180 | CONFIG_SELECT_MEMORY_MODEL=y | 189 | CONFIG_SELECT_MEMORY_MODEL=y |
| 181 | # CONFIG_FLATMEM_MANUAL is not set | 190 | # CONFIG_FLATMEM_MANUAL is not set |
| 182 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 191 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| @@ -258,6 +267,7 @@ CONFIG_HZ=250 | |||
| 258 | # CONFIG_SCHED_HRTICK is not set | 267 | # CONFIG_SCHED_HRTICK is not set |
| 259 | # CONFIG_KEXEC is not set | 268 | # CONFIG_KEXEC is not set |
| 260 | # CONFIG_CRASH_DUMP is not set | 269 | # CONFIG_CRASH_DUMP is not set |
| 270 | CONFIG_SECCOMP=y | ||
| 261 | CONFIG_PREEMPT_NONE=y | 271 | CONFIG_PREEMPT_NONE=y |
| 262 | # CONFIG_PREEMPT_VOLUNTARY is not set | 272 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 263 | # CONFIG_PREEMPT is not set | 273 | # CONFIG_PREEMPT is not set |
| @@ -282,10 +292,6 @@ CONFIG_CMDLINE="console=ttySC2,115200 root=/dev/sda1 rootdelay=10" | |||
| 282 | # | 292 | # |
| 283 | CONFIG_BINFMT_ELF=y | 293 | CONFIG_BINFMT_ELF=y |
| 284 | # CONFIG_BINFMT_MISC is not set | 294 | # CONFIG_BINFMT_MISC is not set |
| 285 | |||
| 286 | # | ||
| 287 | # Networking | ||
| 288 | # | ||
| 289 | CONFIG_NET=y | 295 | CONFIG_NET=y |
| 290 | 296 | ||
| 291 | # | 297 | # |
| @@ -361,6 +367,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 361 | # | 367 | # |
| 362 | # CONFIG_CFG80211 is not set | 368 | # CONFIG_CFG80211 is not set |
| 363 | CONFIG_WIRELESS_EXT=y | 369 | CONFIG_WIRELESS_EXT=y |
| 370 | CONFIG_WIRELESS_EXT_SYSFS=y | ||
| 364 | # CONFIG_MAC80211 is not set | 371 | # CONFIG_MAC80211 is not set |
| 365 | # CONFIG_IEEE80211 is not set | 372 | # CONFIG_IEEE80211 is not set |
| 366 | # CONFIG_RFKILL is not set | 373 | # CONFIG_RFKILL is not set |
| @@ -377,6 +384,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | |||
| 377 | CONFIG_STANDALONE=y | 384 | CONFIG_STANDALONE=y |
| 378 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 385 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 379 | CONFIG_FW_LOADER=y | 386 | CONFIG_FW_LOADER=y |
| 387 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
| 388 | CONFIG_EXTRA_FIRMWARE="" | ||
| 380 | # CONFIG_SYS_HYPERVISOR is not set | 389 | # CONFIG_SYS_HYPERVISOR is not set |
| 381 | # CONFIG_CONNECTOR is not set | 390 | # CONFIG_CONNECTOR is not set |
| 382 | CONFIG_MTD=y | 391 | CONFIG_MTD=y |
| @@ -471,6 +480,7 @@ CONFIG_BLK_DEV=y | |||
| 471 | # CONFIG_BLK_DEV_RAM is not set | 480 | # CONFIG_BLK_DEV_RAM is not set |
| 472 | # CONFIG_CDROM_PKTCDVD is not set | 481 | # CONFIG_CDROM_PKTCDVD is not set |
| 473 | # CONFIG_ATA_OVER_ETH is not set | 482 | # CONFIG_ATA_OVER_ETH is not set |
| 483 | # CONFIG_BLK_DEV_HD is not set | ||
| 474 | # CONFIG_MISC_DEVICES is not set | 484 | # CONFIG_MISC_DEVICES is not set |
| 475 | CONFIG_HAVE_IDE=y | 485 | CONFIG_HAVE_IDE=y |
| 476 | # CONFIG_IDE is not set | 486 | # CONFIG_IDE is not set |
| @@ -515,10 +525,10 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 515 | CONFIG_SCSI_LOWLEVEL=y | 525 | CONFIG_SCSI_LOWLEVEL=y |
| 516 | # CONFIG_ISCSI_TCP is not set | 526 | # CONFIG_ISCSI_TCP is not set |
| 517 | # CONFIG_SCSI_DEBUG is not set | 527 | # CONFIG_SCSI_DEBUG is not set |
| 528 | # CONFIG_SCSI_DH is not set | ||
| 518 | # CONFIG_ATA is not set | 529 | # CONFIG_ATA is not set |
| 519 | # CONFIG_MD is not set | 530 | # CONFIG_MD is not set |
| 520 | CONFIG_NETDEVICES=y | 531 | CONFIG_NETDEVICES=y |
| 521 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 522 | # CONFIG_DUMMY is not set | 532 | # CONFIG_DUMMY is not set |
| 523 | # CONFIG_BONDING is not set | 533 | # CONFIG_BONDING is not set |
| 524 | # CONFIG_MACVLAN is not set | 534 | # CONFIG_MACVLAN is not set |
| @@ -546,7 +556,9 @@ CONFIG_NET_ETHERNET=y | |||
| 546 | CONFIG_MII=y | 556 | CONFIG_MII=y |
| 547 | # CONFIG_AX88796 is not set | 557 | # CONFIG_AX88796 is not set |
| 548 | # CONFIG_STNIC is not set | 558 | # CONFIG_STNIC is not set |
| 559 | CONFIG_SH_ETH=y | ||
| 549 | # CONFIG_SMC91X is not set | 560 | # CONFIG_SMC91X is not set |
| 561 | # CONFIG_SMC911X is not set | ||
| 550 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 562 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
| 551 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 563 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 552 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 564 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| @@ -613,7 +625,11 @@ CONFIG_INPUT=y | |||
| 613 | # | 625 | # |
| 614 | # Character devices | 626 | # Character devices |
| 615 | # | 627 | # |
| 616 | # CONFIG_VT is not set | 628 | CONFIG_VT=y |
| 629 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 630 | CONFIG_VT_CONSOLE=y | ||
| 631 | CONFIG_HW_CONSOLE=y | ||
| 632 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
| 617 | CONFIG_DEVKMEM=y | 633 | CONFIG_DEVKMEM=y |
| 618 | # CONFIG_SERIAL_NONSTANDARD is not set | 634 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 619 | 635 | ||
| @@ -644,6 +660,7 @@ CONFIG_HW_RANDOM=y | |||
| 644 | # CONFIG_POWER_SUPPLY is not set | 660 | # CONFIG_POWER_SUPPLY is not set |
| 645 | # CONFIG_HWMON is not set | 661 | # CONFIG_HWMON is not set |
| 646 | # CONFIG_THERMAL is not set | 662 | # CONFIG_THERMAL is not set |
| 663 | # CONFIG_THERMAL_HWMON is not set | ||
| 647 | # CONFIG_WATCHDOG is not set | 664 | # CONFIG_WATCHDOG is not set |
| 648 | 665 | ||
| 649 | # | 666 | # |
| @@ -655,6 +672,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 655 | # | 672 | # |
| 656 | # Multifunction device drivers | 673 | # Multifunction device drivers |
| 657 | # | 674 | # |
| 675 | # CONFIG_MFD_CORE is not set | ||
| 658 | # CONFIG_MFD_SM501 is not set | 676 | # CONFIG_MFD_SM501 is not set |
| 659 | # CONFIG_HTC_PASIC3 is not set | 677 | # CONFIG_HTC_PASIC3 is not set |
| 660 | 678 | ||
| @@ -679,7 +697,34 @@ CONFIG_SSB_POSSIBLE=y | |||
| 679 | # | 697 | # |
| 680 | # CONFIG_VGASTATE is not set | 698 | # CONFIG_VGASTATE is not set |
| 681 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | 699 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set |
| 682 | # CONFIG_FB is not set | 700 | CONFIG_FB=y |
| 701 | # CONFIG_FIRMWARE_EDID is not set | ||
| 702 | # CONFIG_FB_DDC is not set | ||
| 703 | CONFIG_FB_CFB_FILLRECT=y | ||
| 704 | CONFIG_FB_CFB_COPYAREA=y | ||
| 705 | CONFIG_FB_CFB_IMAGEBLIT=y | ||
| 706 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | ||
| 707 | # CONFIG_FB_SYS_FILLRECT is not set | ||
| 708 | # CONFIG_FB_SYS_COPYAREA is not set | ||
| 709 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
| 710 | CONFIG_FB_FOREIGN_ENDIAN=y | ||
| 711 | CONFIG_FB_BOTH_ENDIAN=y | ||
| 712 | # CONFIG_FB_BIG_ENDIAN is not set | ||
| 713 | # CONFIG_FB_LITTLE_ENDIAN is not set | ||
| 714 | # CONFIG_FB_SYS_FOPS is not set | ||
| 715 | # CONFIG_FB_SVGALIB is not set | ||
| 716 | # CONFIG_FB_MACMODES is not set | ||
| 717 | # CONFIG_FB_BACKLIGHT is not set | ||
| 718 | # CONFIG_FB_MODE_HELPERS is not set | ||
| 719 | # CONFIG_FB_TILEBLITTING is not set | ||
| 720 | |||
| 721 | # | ||
| 722 | # Frame buffer hardware drivers | ||
| 723 | # | ||
| 724 | # CONFIG_FB_S1D13XXX is not set | ||
| 725 | # CONFIG_FB_SH_MOBILE_LCDC is not set | ||
| 726 | CONFIG_FB_SH7760=y | ||
| 727 | # CONFIG_FB_VIRTUAL is not set | ||
| 683 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 728 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 684 | 729 | ||
| 685 | # | 730 | # |
| @@ -688,8 +733,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 688 | # CONFIG_DISPLAY_SUPPORT is not set | 733 | # CONFIG_DISPLAY_SUPPORT is not set |
| 689 | 734 | ||
| 690 | # | 735 | # |
| 691 | # Sound | 736 | # Console display driver support |
| 692 | # | 737 | # |
| 738 | CONFIG_DUMMY_CONSOLE=y | ||
| 739 | CONFIG_FRAMEBUFFER_CONSOLE=y | ||
| 740 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set | ||
| 741 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | ||
| 742 | # CONFIG_FONTS is not set | ||
| 743 | CONFIG_FONT_8x8=y | ||
| 744 | CONFIG_FONT_8x16=y | ||
| 745 | CONFIG_LOGO=y | ||
| 746 | CONFIG_LOGO_LINUX_MONO=y | ||
| 747 | CONFIG_LOGO_LINUX_VGA16=y | ||
| 748 | CONFIG_LOGO_LINUX_CLUT224=y | ||
| 749 | CONFIG_LOGO_SUPERH_MONO=y | ||
| 750 | CONFIG_LOGO_SUPERH_VGA16=y | ||
| 751 | CONFIG_LOGO_SUPERH_CLUT224=y | ||
| 693 | # CONFIG_SOUND is not set | 752 | # CONFIG_SOUND is not set |
| 694 | # CONFIG_HID_SUPPORT is not set | 753 | # CONFIG_HID_SUPPORT is not set |
| 695 | CONFIG_USB_SUPPORT=y | 754 | CONFIG_USB_SUPPORT=y |
| @@ -788,11 +847,27 @@ CONFIG_USB_MON=y | |||
| 788 | # CONFIG_USB_IOWARRIOR is not set | 847 | # CONFIG_USB_IOWARRIOR is not set |
| 789 | # CONFIG_USB_ISIGHTFW is not set | 848 | # CONFIG_USB_ISIGHTFW is not set |
| 790 | # CONFIG_USB_GADGET is not set | 849 | # CONFIG_USB_GADGET is not set |
| 791 | # CONFIG_MMC is not set | 850 | CONFIG_MMC=y |
| 851 | # CONFIG_MMC_DEBUG is not set | ||
| 852 | # CONFIG_MMC_UNSAFE_RESUME is not set | ||
| 853 | |||
| 854 | # | ||
| 855 | # MMC/SD Card Drivers | ||
| 856 | # | ||
| 857 | CONFIG_MMC_BLOCK=y | ||
| 858 | CONFIG_MMC_BLOCK_BOUNCE=y | ||
| 859 | # CONFIG_SDIO_UART is not set | ||
| 860 | # CONFIG_MMC_TEST is not set | ||
| 861 | |||
| 862 | # | ||
| 863 | # MMC/SD Host Controller Drivers | ||
| 864 | # | ||
| 865 | # CONFIG_MMC_SDHCI is not set | ||
| 792 | # CONFIG_MEMSTICK is not set | 866 | # CONFIG_MEMSTICK is not set |
| 793 | # CONFIG_NEW_LEDS is not set | 867 | # CONFIG_NEW_LEDS is not set |
| 794 | # CONFIG_ACCESSIBILITY is not set | 868 | # CONFIG_ACCESSIBILITY is not set |
| 795 | # CONFIG_RTC_CLASS is not set | 869 | # CONFIG_RTC_CLASS is not set |
| 870 | # CONFIG_DMADEVICES is not set | ||
| 796 | # CONFIG_UIO is not set | 871 | # CONFIG_UIO is not set |
| 797 | 872 | ||
| 798 | # | 873 | # |
| @@ -865,6 +940,7 @@ CONFIG_TMPFS_POSIX_ACL=y | |||
| 865 | # CONFIG_CRAMFS is not set | 940 | # CONFIG_CRAMFS is not set |
| 866 | # CONFIG_VXFS_FS is not set | 941 | # CONFIG_VXFS_FS is not set |
| 867 | # CONFIG_MINIX_FS is not set | 942 | # CONFIG_MINIX_FS is not set |
| 943 | # CONFIG_OMFS_FS is not set | ||
| 868 | # CONFIG_HPFS_FS is not set | 944 | # CONFIG_HPFS_FS is not set |
| 869 | # CONFIG_QNX4FS_FS is not set | 945 | # CONFIG_QNX4FS_FS is not set |
| 870 | # CONFIG_ROMFS_FS is not set | 946 | # CONFIG_ROMFS_FS is not set |
| @@ -874,12 +950,11 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 874 | CONFIG_NFS_FS=y | 950 | CONFIG_NFS_FS=y |
| 875 | # CONFIG_NFS_V3 is not set | 951 | # CONFIG_NFS_V3 is not set |
| 876 | # CONFIG_NFS_V4 is not set | 952 | # CONFIG_NFS_V4 is not set |
| 877 | # CONFIG_NFSD is not set | ||
| 878 | CONFIG_ROOT_NFS=y | 953 | CONFIG_ROOT_NFS=y |
| 954 | # CONFIG_NFSD is not set | ||
| 879 | CONFIG_LOCKD=y | 955 | CONFIG_LOCKD=y |
| 880 | CONFIG_NFS_COMMON=y | 956 | CONFIG_NFS_COMMON=y |
| 881 | CONFIG_SUNRPC=y | 957 | CONFIG_SUNRPC=y |
| 882 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 883 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 958 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 884 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 959 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 885 | # CONFIG_SMB_FS is not set | 960 | # CONFIG_SMB_FS is not set |
| @@ -949,6 +1024,7 @@ CONFIG_FRAME_WARN=1024 | |||
| 949 | # CONFIG_HEADERS_CHECK is not set | 1024 | # CONFIG_HEADERS_CHECK is not set |
| 950 | # CONFIG_DEBUG_KERNEL is not set | 1025 | # CONFIG_DEBUG_KERNEL is not set |
| 951 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1026 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1027 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 952 | # CONFIG_SAMPLES is not set | 1028 | # CONFIG_SAMPLES is not set |
| 953 | # CONFIG_SH_STANDARD_BIOS is not set | 1029 | # CONFIG_SH_STANDARD_BIOS is not set |
| 954 | # CONFIG_EARLY_SCIF_CONSOLE is not set | 1030 | # CONFIG_EARLY_SCIF_CONSOLE is not set |
| @@ -1003,6 +1079,10 @@ CONFIG_CRYPTO=y | |||
| 1003 | # CONFIG_CRYPTO_MD4 is not set | 1079 | # CONFIG_CRYPTO_MD4 is not set |
| 1004 | # CONFIG_CRYPTO_MD5 is not set | 1080 | # CONFIG_CRYPTO_MD5 is not set |
| 1005 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1081 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 1082 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1083 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1084 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1085 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1006 | # CONFIG_CRYPTO_SHA1 is not set | 1086 | # CONFIG_CRYPTO_SHA1 is not set |
| 1007 | # CONFIG_CRYPTO_SHA256 is not set | 1087 | # CONFIG_CRYPTO_SHA256 is not set |
| 1008 | # CONFIG_CRYPTO_SHA512 is not set | 1088 | # CONFIG_CRYPTO_SHA512 is not set |
| @@ -1042,6 +1122,7 @@ CONFIG_BITREVERSE=y | |||
| 1042 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1122 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 1043 | # CONFIG_CRC_CCITT is not set | 1123 | # CONFIG_CRC_CCITT is not set |
| 1044 | # CONFIG_CRC16 is not set | 1124 | # CONFIG_CRC16 is not set |
| 1125 | CONFIG_CRC_T10DIF=y | ||
| 1045 | # CONFIG_CRC_ITU_T is not set | 1126 | # CONFIG_CRC_ITU_T is not set |
| 1046 | CONFIG_CRC32=y | 1127 | CONFIG_CRC32=y |
| 1047 | # CONFIG_CRC7 is not set | 1128 | # CONFIG_CRC7 is not set |
diff --git a/arch/sh/include/asm/flat.h b/arch/sh/include/asm/flat.h index 0cc800299e06..d3b2b4f109e3 100644 --- a/arch/sh/include/asm/flat.h +++ b/arch/sh/include/asm/flat.h | |||
| @@ -21,4 +21,11 @@ | |||
| 21 | #define flat_get_relocate_addr(rel) (rel) | 21 | #define flat_get_relocate_addr(rel) (rel) |
| 22 | #define flat_set_persistent(relval, p) ({ (void)p; 0; }) | 22 | #define flat_set_persistent(relval, p) ({ (void)p; 0; }) |
| 23 | 23 | ||
| 24 | #define FLAT_PLAT_INIT(_r) \ | ||
| 25 | do { _r->regs[0]=0; _r->regs[1]=0; _r->regs[2]=0; _r->regs[3]=0; \ | ||
| 26 | _r->regs[4]=0; _r->regs[5]=0; _r->regs[6]=0; _r->regs[7]=0; \ | ||
| 27 | _r->regs[8]=0; _r->regs[9]=0; _r->regs[10]=0; _r->regs[11]=0; \ | ||
| 28 | _r->regs[12]=0; _r->regs[13]=0; _r->regs[14]=0; \ | ||
| 29 | _r->sr = SR_FD; } while (0) | ||
| 30 | |||
| 24 | #endif /* __ASM_SH_FLAT_H */ | 31 | #endif /* __ASM_SH_FLAT_H */ |
diff --git a/arch/sh/include/asm/kexec.h b/arch/sh/include/asm/kexec.h index 00f4260ef09b..765a5e1660fc 100644 --- a/arch/sh/include/asm/kexec.h +++ b/arch/sh/include/asm/kexec.h | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | /* Maximum address we can use for the control code buffer */ | 21 | /* Maximum address we can use for the control code buffer */ |
| 22 | #define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE | 22 | #define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE |
| 23 | 23 | ||
| 24 | #define KEXEC_CONTROL_CODE_SIZE 4096 | 24 | #define KEXEC_CONTROL_PAGE_SIZE 4096 |
| 25 | 25 | ||
| 26 | /* The native architecture */ | 26 | /* The native architecture */ |
| 27 | #define KEXEC_ARCH KEXEC_ARCH_SH | 27 | #define KEXEC_ARCH KEXEC_ARCH_SH |
diff --git a/arch/sh/include/asm/migor.h b/arch/sh/include/asm/migor.h index 10016e0f4a4e..c12b632c540b 100644 --- a/arch/sh/include/asm/migor.h +++ b/arch/sh/include/asm/migor.h | |||
| @@ -42,9 +42,6 @@ | |||
| 42 | 42 | ||
| 43 | #define PORT_MSELCRB 0xa4050182 | 43 | #define PORT_MSELCRB 0xa4050182 |
| 44 | 44 | ||
| 45 | #define MSTPCR1 0xa4150034 | ||
| 46 | #define MSTPCR2 0xa4150038 | ||
| 47 | |||
| 48 | #define PORT_PSELA 0xa405014e | 45 | #define PORT_PSELA 0xa405014e |
| 49 | #define PORT_PSELB 0xa4050150 | 46 | #define PORT_PSELB 0xa4050150 |
| 50 | #define PORT_PSELC 0xa4050152 | 47 | #define PORT_PSELC 0xa4050152 |
diff --git a/arch/sh/include/asm/sh_mobile_lcdc.h b/arch/sh/include/asm/sh_mobile_lcdc.h index 27677727df4d..130102f663f5 100644 --- a/arch/sh/include/asm/sh_mobile_lcdc.h +++ b/arch/sh/include/asm/sh_mobile_lcdc.h | |||
| @@ -47,12 +47,18 @@ struct sh_mobile_lcdc_board_cfg { | |||
| 47 | void (*display_off)(void *board_data); | 47 | void (*display_off)(void *board_data); |
| 48 | }; | 48 | }; |
| 49 | 49 | ||
| 50 | struct sh_mobile_lcdc_lcd_size_cfg { /* width and height of panel in mm */ | ||
| 51 | unsigned long width; | ||
| 52 | unsigned long height; | ||
| 53 | }; | ||
| 54 | |||
| 50 | struct sh_mobile_lcdc_chan_cfg { | 55 | struct sh_mobile_lcdc_chan_cfg { |
| 51 | int chan; | 56 | int chan; |
| 52 | int bpp; | 57 | int bpp; |
| 53 | int interface_type; /* selects RGBn or SYSn I/F, see above */ | 58 | int interface_type; /* selects RGBn or SYSn I/F, see above */ |
| 54 | int clock_divider; | 59 | int clock_divider; |
| 55 | struct fb_videomode lcd_cfg; | 60 | struct fb_videomode lcd_cfg; |
| 61 | struct sh_mobile_lcdc_lcd_size_cfg lcd_size_cfg; | ||
| 56 | struct sh_mobile_lcdc_board_cfg board_cfg; | 62 | struct sh_mobile_lcdc_board_cfg board_cfg; |
| 57 | struct sh_mobile_lcdc_sys_bus_cfg sys_bus_cfg; /* only for SYSn I/F */ | 63 | struct sh_mobile_lcdc_sys_bus_cfg sys_bus_cfg; /* only for SYSn I/F */ |
| 58 | }; | 64 | }; |
diff --git a/arch/sh/include/cpu-sh3/cpu/cacheflush.h b/arch/sh/include/cpu-sh3/cpu/cacheflush.h index abc909880807..1ac27aae6700 100644 --- a/arch/sh/include/cpu-sh3/cpu/cacheflush.h +++ b/arch/sh/include/cpu-sh3/cpu/cacheflush.h | |||
| @@ -29,6 +29,16 @@ void flush_cache_page(struct vm_area_struct *vma, unsigned long addr, unsigned l | |||
| 29 | void flush_dcache_page(struct page *pg); | 29 | void flush_dcache_page(struct page *pg); |
| 30 | void flush_icache_range(unsigned long start, unsigned long end); | 30 | void flush_icache_range(unsigned long start, unsigned long end); |
| 31 | void flush_icache_page(struct vm_area_struct *vma, struct page *page); | 31 | void flush_icache_page(struct vm_area_struct *vma, struct page *page); |
| 32 | |||
| 33 | #define flush_dcache_mmap_lock(mapping) do { } while (0) | ||
| 34 | #define flush_dcache_mmap_unlock(mapping) do { } while (0) | ||
| 35 | |||
| 36 | /* SH3 has unified cache so no special action needed here */ | ||
| 37 | #define flush_cache_sigtramp(vaddr) do { } while (0) | ||
| 38 | #define flush_icache_user_range(vma,pg,adr,len) do { } while (0) | ||
| 39 | |||
| 40 | #define p3_cache_init() do { } while (0) | ||
| 41 | |||
| 32 | #else | 42 | #else |
| 33 | #include <cpu-common/cpu/cacheflush.h> | 43 | #include <cpu-common/cpu/cacheflush.h> |
| 34 | #endif | 44 | #endif |
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7723.c b/arch/sh/kernel/cpu/sh4a/setup-sh7723.c index cd6baffdc896..a7412cede534 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7723.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7723.c | |||
| @@ -45,7 +45,7 @@ static struct platform_device vpu_device = { | |||
| 45 | }; | 45 | }; |
| 46 | 46 | ||
| 47 | static struct uio_info veu0_platform_data = { | 47 | static struct uio_info veu0_platform_data = { |
| 48 | .name = "VEU", | 48 | .name = "VEU2H", |
| 49 | .version = "0", | 49 | .version = "0", |
| 50 | .irq = 54, | 50 | .irq = 54, |
| 51 | }; | 51 | }; |
| @@ -73,7 +73,7 @@ static struct platform_device veu0_device = { | |||
| 73 | }; | 73 | }; |
| 74 | 74 | ||
| 75 | static struct uio_info veu1_platform_data = { | 75 | static struct uio_info veu1_platform_data = { |
| 76 | .name = "VEU", | 76 | .name = "VEU2H", |
| 77 | .version = "0", | 77 | .version = "0", |
| 78 | .irq = 27, | 78 | .irq = 27, |
| 79 | }; | 79 | }; |
diff --git a/arch/sh/kernel/sh_ksyms_32.c b/arch/sh/kernel/sh_ksyms_32.c index 8f916536719c..6e1b1c271658 100644 --- a/arch/sh/kernel/sh_ksyms_32.c +++ b/arch/sh/kernel/sh_ksyms_32.c | |||
| @@ -107,10 +107,12 @@ DECLARE_EXPORT(__movmemSI12_i4); | |||
| 107 | * GCC >= 4.2 emits these for division, as do GCC 4.1.x versions of the ST | 107 | * GCC >= 4.2 emits these for division, as do GCC 4.1.x versions of the ST |
| 108 | * compiler which include backported patches. | 108 | * compiler which include backported patches. |
| 109 | */ | 109 | */ |
| 110 | DECLARE_EXPORT(__sdivsi3_i4i); | ||
| 111 | DECLARE_EXPORT(__udiv_qrnnd_16); | 110 | DECLARE_EXPORT(__udiv_qrnnd_16); |
| 111 | #if !defined(CONFIG_CPU_SH2) | ||
| 112 | DECLARE_EXPORT(__sdivsi3_i4i); | ||
| 112 | DECLARE_EXPORT(__udivsi3_i4i); | 113 | DECLARE_EXPORT(__udivsi3_i4i); |
| 113 | #endif | 114 | #endif |
| 115 | #endif | ||
| 114 | #else /* GCC 3.x */ | 116 | #else /* GCC 3.x */ |
| 115 | DECLARE_EXPORT(__movstr_i4_even); | 117 | DECLARE_EXPORT(__movstr_i4_even); |
| 116 | DECLARE_EXPORT(__movstr_i4_odd); | 118 | DECLARE_EXPORT(__movstr_i4_odd); |
diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig index 9c131cac91a4..8a03926ea84f 100644 --- a/arch/sh/mm/Kconfig +++ b/arch/sh/mm/Kconfig | |||
| @@ -181,10 +181,12 @@ config ENTRY_OFFSET | |||
| 181 | choice | 181 | choice |
| 182 | prompt "HugeTLB page size" | 182 | prompt "HugeTLB page size" |
| 183 | depends on HUGETLB_PAGE && (CPU_SH4 || CPU_SH5) && MMU | 183 | depends on HUGETLB_PAGE && (CPU_SH4 || CPU_SH5) && MMU |
| 184 | default HUGETLB_PAGE_SIZE_1MB if PAGE_SIZE_64KB | ||
| 184 | default HUGETLB_PAGE_SIZE_64K | 185 | default HUGETLB_PAGE_SIZE_64K |
| 185 | 186 | ||
| 186 | config HUGETLB_PAGE_SIZE_64K | 187 | config HUGETLB_PAGE_SIZE_64K |
| 187 | bool "64kB" | 188 | bool "64kB" |
| 189 | depends on !PAGE_SIZE_64KB | ||
| 188 | 190 | ||
| 189 | config HUGETLB_PAGE_SIZE_256K | 191 | config HUGETLB_PAGE_SIZE_256K |
| 190 | bool "256kB" | 192 | bool "256kB" |
diff --git a/arch/sh/mm/consistent.c b/arch/sh/mm/consistent.c index b2ce014401b5..895bb3f335c7 100644 --- a/arch/sh/mm/consistent.c +++ b/arch/sh/mm/consistent.c | |||
| @@ -95,6 +95,29 @@ void dma_cache_sync(struct device *dev, void *vaddr, size_t size, | |||
| 95 | } | 95 | } |
| 96 | EXPORT_SYMBOL(dma_cache_sync); | 96 | EXPORT_SYMBOL(dma_cache_sync); |
| 97 | 97 | ||
| 98 | static int __init memchunk_setup(char *str) | ||
| 99 | { | ||
| 100 | return 1; /* accept anything that begins with "memchunk." */ | ||
| 101 | } | ||
| 102 | __setup("memchunk.", memchunk_setup); | ||
| 103 | |||
| 104 | static void memchunk_cmdline_override(char *name, unsigned long *sizep) | ||
| 105 | { | ||
| 106 | char *p = boot_command_line; | ||
| 107 | int k = strlen(name); | ||
| 108 | |||
| 109 | while ((p = strstr(p, "memchunk."))) { | ||
| 110 | p += 9; /* strlen("memchunk.") */ | ||
| 111 | if (!strncmp(name, p, k) && p[k] == '=') { | ||
| 112 | p += k + 1; | ||
| 113 | *sizep = memparse(p, NULL); | ||
| 114 | pr_info("%s: forcing memory chunk size to 0x%08lx\n", | ||
| 115 | name, *sizep); | ||
| 116 | break; | ||
| 117 | } | ||
| 118 | } | ||
| 119 | } | ||
| 120 | |||
| 98 | int platform_resource_setup_memory(struct platform_device *pdev, | 121 | int platform_resource_setup_memory(struct platform_device *pdev, |
| 99 | char *name, unsigned long memsize) | 122 | char *name, unsigned long memsize) |
| 100 | { | 123 | { |
| @@ -109,6 +132,10 @@ int platform_resource_setup_memory(struct platform_device *pdev, | |||
| 109 | return -EINVAL; | 132 | return -EINVAL; |
| 110 | } | 133 | } |
| 111 | 134 | ||
| 135 | memchunk_cmdline_override(name, &memsize); | ||
| 136 | if (!memsize) | ||
| 137 | return 0; | ||
| 138 | |||
| 112 | buf = dma_alloc_coherent(NULL, memsize, &dma_handle, GFP_KERNEL); | 139 | buf = dma_alloc_coherent(NULL, memsize, &dma_handle, GFP_KERNEL); |
| 113 | if (!buf) { | 140 | if (!buf) { |
| 114 | pr_warning("%s: unable to allocate memory\n", name); | 141 | pr_warning("%s: unable to allocate memory\n", name); |
diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile index 6668e6037af6..9592889a6fd0 100644 --- a/arch/sparc/Makefile +++ b/arch/sparc/Makefile | |||
| @@ -52,20 +52,24 @@ endif | |||
| 52 | export INIT_Y CORE_Y DRIVERS_Y NET_Y LIBS_Y HEAD_Y kallsyms.o | 52 | export INIT_Y CORE_Y DRIVERS_Y NET_Y LIBS_Y HEAD_Y kallsyms.o |
| 53 | 53 | ||
| 54 | # Default target | 54 | # Default target |
| 55 | all: image | 55 | all: zImage |
| 56 | 56 | ||
| 57 | boot := arch/sparc/boot | 57 | boot := arch/sparc/boot |
| 58 | 58 | ||
| 59 | image tftpboot.img: vmlinux | 59 | image zImage tftpboot.img: vmlinux |
| 60 | $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ | 60 | $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ |
| 61 | 61 | ||
| 62 | archclean: | 62 | archclean: |
| 63 | $(Q)$(MAKE) $(clean)=$(boot) | 63 | $(Q)$(MAKE) $(clean)=$(boot) |
| 64 | 64 | ||
| 65 | # This is the image used for packaging | ||
| 66 | KBUILD_IMAGE := $(boot)/zImage | ||
| 67 | |||
| 65 | CLEAN_FILES += arch/$(ARCH)/boot/System.map | 68 | CLEAN_FILES += arch/$(ARCH)/boot/System.map |
| 66 | 69 | ||
| 67 | # Don't use tabs in echo arguments. | 70 | # Don't use tabs in echo arguments. |
| 68 | define archhelp | 71 | define archhelp |
| 69 | echo '* image - kernel image ($(boot)/image)' | 72 | echo '* image - kernel image ($(boot)/image)' |
| 73 | echo '* zImage - stripped kernel image ($(boot)/zImage)' | ||
| 70 | echo ' tftpboot.img - image prepared for tftp' | 74 | echo ' tftpboot.img - image prepared for tftp' |
| 71 | endef | 75 | endef |
diff --git a/arch/sparc/boot/Makefile b/arch/sparc/boot/Makefile index 22d331e1e941..3e77a9f52248 100644 --- a/arch/sparc/boot/Makefile +++ b/arch/sparc/boot/Makefile | |||
| @@ -19,6 +19,9 @@ quiet_cmd_sysmap = SYSMAP $(obj)/System.map | |||
| 19 | cmd_sysmap = $(CONFIG_SHELL) $(srctree)/scripts/mksysmap | 19 | cmd_sysmap = $(CONFIG_SHELL) $(srctree)/scripts/mksysmap |
| 20 | quiet_cmd_image = LD $@ | 20 | quiet_cmd_image = LD $@ |
| 21 | cmd_image = $(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LDFLAGS_$(@F)) -o $@ | 21 | cmd_image = $(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LDFLAGS_$(@F)) -o $@ |
| 22 | quiet_cmd_strip = STRIP $@ | ||
| 23 | cmd_strip = $(STRIP) -R .comment -R .note -K sun4u_init -K _end -K _start $(obj)/image -o $@ | ||
| 24 | |||
| 22 | 25 | ||
| 23 | define rule_image | 26 | define rule_image |
| 24 | $(if $($(quiet)cmd_image), \ | 27 | $(if $($(quiet)cmd_image), \ |
| @@ -49,6 +52,9 @@ LDFLAGS_image := -T arch/sparc/kernel/vmlinux.lds $(BTOBJS) \ | |||
| 49 | $(obj)/image: $(obj)/btfix.o FORCE | 52 | $(obj)/image: $(obj)/btfix.o FORCE |
| 50 | $(call if_changed_rule,image) | 53 | $(call if_changed_rule,image) |
| 51 | 54 | ||
| 55 | $(obj)/zImage: $(obj)/image | ||
| 56 | $(call if_changed,strip) | ||
| 57 | |||
| 52 | $(obj)/tftpboot.img: $(obj)/piggyback $(obj)/System.map $(obj)/image FORCE | 58 | $(obj)/tftpboot.img: $(obj)/piggyback $(obj)/System.map $(obj)/image FORCE |
| 53 | $(call if_changed,elftoaout) | 59 | $(call if_changed,elftoaout) |
| 54 | $(call if_changed,piggy) | 60 | $(call if_changed,piggy) |
diff --git a/arch/sparc/include/asm/irq_64.h b/arch/sparc/include/asm/irq_64.h index 3473e25231d9..e3dd9303643d 100644 --- a/arch/sparc/include/asm/irq_64.h +++ b/arch/sparc/include/asm/irq_64.h | |||
| @@ -93,4 +93,8 @@ static inline unsigned long get_softint(void) | |||
| 93 | void __trigger_all_cpu_backtrace(void); | 93 | void __trigger_all_cpu_backtrace(void); |
| 94 | #define trigger_all_cpu_backtrace() __trigger_all_cpu_backtrace() | 94 | #define trigger_all_cpu_backtrace() __trigger_all_cpu_backtrace() |
| 95 | 95 | ||
| 96 | extern void *hardirq_stack[NR_CPUS]; | ||
| 97 | extern void *softirq_stack[NR_CPUS]; | ||
| 98 | #define __ARCH_HAS_DO_SOFTIRQ | ||
| 99 | |||
| 96 | #endif | 100 | #endif |
diff --git a/arch/sparc/include/asm/of_device.h b/arch/sparc/include/asm/of_device.h index e5f5aedc2293..bba777a416d3 100644 --- a/arch/sparc/include/asm/of_device.h +++ b/arch/sparc/include/asm/of_device.h | |||
| @@ -30,8 +30,7 @@ struct of_device | |||
| 30 | extern void __iomem *of_ioremap(struct resource *res, unsigned long offset, unsigned long size, char *name); | 30 | extern void __iomem *of_ioremap(struct resource *res, unsigned long offset, unsigned long size, char *name); |
| 31 | extern void of_iounmap(struct resource *res, void __iomem *base, unsigned long size); | 31 | extern void of_iounmap(struct resource *res, void __iomem *base, unsigned long size); |
| 32 | 32 | ||
| 33 | /* These are just here during the transition */ | 33 | /* This is just here during the transition */ |
| 34 | #include <linux/of_device.h> | ||
| 35 | #include <linux/of_platform.h> | 34 | #include <linux/of_platform.h> |
| 36 | 35 | ||
| 37 | #endif /* __KERNEL__ */ | 36 | #endif /* __KERNEL__ */ |
diff --git a/arch/sparc/include/asm/smp_32.h b/arch/sparc/include/asm/smp_32.h index 7201752cf934..a8180e546a48 100644 --- a/arch/sparc/include/asm/smp_32.h +++ b/arch/sparc/include/asm/smp_32.h | |||
| @@ -50,27 +50,24 @@ struct seq_file; | |||
| 50 | void smp_bogo(struct seq_file *); | 50 | void smp_bogo(struct seq_file *); |
| 51 | void smp_info(struct seq_file *); | 51 | void smp_info(struct seq_file *); |
| 52 | 52 | ||
| 53 | BTFIXUPDEF_CALL(void, smp_cross_call, smpfunc_t, unsigned long, unsigned long, unsigned long, unsigned long, unsigned long) | 53 | BTFIXUPDEF_CALL(void, smp_cross_call, smpfunc_t, cpumask_t, unsigned long, unsigned long, unsigned long, unsigned long) |
| 54 | BTFIXUPDEF_CALL(int, __hard_smp_processor_id, void) | 54 | BTFIXUPDEF_CALL(int, __hard_smp_processor_id, void) |
| 55 | BTFIXUPDEF_BLACKBOX(hard_smp_processor_id) | 55 | BTFIXUPDEF_BLACKBOX(hard_smp_processor_id) |
| 56 | BTFIXUPDEF_BLACKBOX(load_current) | 56 | BTFIXUPDEF_BLACKBOX(load_current) |
| 57 | 57 | ||
| 58 | #define smp_cross_call(func,arg1,arg2,arg3,arg4,arg5) BTFIXUP_CALL(smp_cross_call)(func,arg1,arg2,arg3,arg4,arg5) | 58 | #define smp_cross_call(func,mask,arg1,arg2,arg3,arg4) BTFIXUP_CALL(smp_cross_call)(func,mask,arg1,arg2,arg3,arg4) |
| 59 | 59 | ||
| 60 | static inline void xc0(smpfunc_t func) { smp_cross_call(func, 0, 0, 0, 0, 0); } | 60 | static inline void xc0(smpfunc_t func) { smp_cross_call(func, cpu_online_map, 0, 0, 0, 0); } |
| 61 | static inline void xc1(smpfunc_t func, unsigned long arg1) | 61 | static inline void xc1(smpfunc_t func, unsigned long arg1) |
| 62 | { smp_cross_call(func, arg1, 0, 0, 0, 0); } | 62 | { smp_cross_call(func, cpu_online_map, arg1, 0, 0, 0); } |
| 63 | static inline void xc2(smpfunc_t func, unsigned long arg1, unsigned long arg2) | 63 | static inline void xc2(smpfunc_t func, unsigned long arg1, unsigned long arg2) |
| 64 | { smp_cross_call(func, arg1, arg2, 0, 0, 0); } | 64 | { smp_cross_call(func, cpu_online_map, arg1, arg2, 0, 0); } |
| 65 | static inline void xc3(smpfunc_t func, unsigned long arg1, unsigned long arg2, | 65 | static inline void xc3(smpfunc_t func, unsigned long arg1, unsigned long arg2, |
| 66 | unsigned long arg3) | 66 | unsigned long arg3) |
| 67 | { smp_cross_call(func, arg1, arg2, arg3, 0, 0); } | 67 | { smp_cross_call(func, cpu_online_map, arg1, arg2, arg3, 0); } |
| 68 | static inline void xc4(smpfunc_t func, unsigned long arg1, unsigned long arg2, | 68 | static inline void xc4(smpfunc_t func, unsigned long arg1, unsigned long arg2, |
| 69 | unsigned long arg3, unsigned long arg4) | 69 | unsigned long arg3, unsigned long arg4) |
| 70 | { smp_cross_call(func, arg1, arg2, arg3, arg4, 0); } | 70 | { smp_cross_call(func, cpu_online_map, arg1, arg2, arg3, arg4); } |
| 71 | static inline void xc5(smpfunc_t func, unsigned long arg1, unsigned long arg2, | ||
| 72 | unsigned long arg3, unsigned long arg4, unsigned long arg5) | ||
| 73 | { smp_cross_call(func, arg1, arg2, arg3, arg4, arg5); } | ||
| 74 | 71 | ||
| 75 | static inline int smp_call_function(void (*func)(void *info), void *info, int wait) | 72 | static inline int smp_call_function(void (*func)(void *info), void *info, int wait) |
| 76 | { | 73 | { |
| @@ -78,6 +75,14 @@ static inline int smp_call_function(void (*func)(void *info), void *info, int wa | |||
| 78 | return 0; | 75 | return 0; |
| 79 | } | 76 | } |
| 80 | 77 | ||
| 78 | static inline int smp_call_function_single(int cpuid, void (*func) (void *info), | ||
| 79 | void *info, int wait) | ||
| 80 | { | ||
| 81 | smp_cross_call((smpfunc_t)func, cpumask_of_cpu(cpuid), | ||
| 82 | (unsigned long) info, 0, 0, 0); | ||
| 83 | return 0; | ||
| 84 | } | ||
| 85 | |||
| 81 | static inline int cpu_logical_map(int cpu) | 86 | static inline int cpu_logical_map(int cpu) |
| 82 | { | 87 | { |
| 83 | return cpu; | 88 | return cpu; |
diff --git a/arch/sparc/kernel/of_device.c b/arch/sparc/kernel/of_device.c index cc4c235c4f59..c481d45f97b7 100644 --- a/arch/sparc/kernel/of_device.c +++ b/arch/sparc/kernel/of_device.c | |||
| @@ -70,7 +70,7 @@ struct of_bus { | |||
| 70 | int *addrc, int *sizec); | 70 | int *addrc, int *sizec); |
| 71 | int (*map)(u32 *addr, const u32 *range, | 71 | int (*map)(u32 *addr, const u32 *range, |
| 72 | int na, int ns, int pna); | 72 | int na, int ns, int pna); |
| 73 | unsigned int (*get_flags)(const u32 *addr); | 73 | unsigned long (*get_flags)(const u32 *addr, unsigned long); |
| 74 | }; | 74 | }; |
| 75 | 75 | ||
| 76 | /* | 76 | /* |
| @@ -130,8 +130,10 @@ static int of_bus_default_map(u32 *addr, const u32 *range, | |||
| 130 | return 0; | 130 | return 0; |
| 131 | } | 131 | } |
| 132 | 132 | ||
| 133 | static unsigned int of_bus_default_get_flags(const u32 *addr) | 133 | static unsigned long of_bus_default_get_flags(const u32 *addr, unsigned long flags) |
| 134 | { | 134 | { |
| 135 | if (flags) | ||
| 136 | return flags; | ||
| 135 | return IORESOURCE_MEM; | 137 | return IORESOURCE_MEM; |
| 136 | } | 138 | } |
| 137 | 139 | ||
| @@ -194,17 +196,21 @@ static int of_bus_pci_map(u32 *addr, const u32 *range, | |||
| 194 | return 0; | 196 | return 0; |
| 195 | } | 197 | } |
| 196 | 198 | ||
| 197 | static unsigned int of_bus_pci_get_flags(const u32 *addr) | 199 | static unsigned long of_bus_pci_get_flags(const u32 *addr, unsigned long flags) |
| 198 | { | 200 | { |
| 199 | unsigned int flags = 0; | ||
| 200 | u32 w = addr[0]; | 201 | u32 w = addr[0]; |
| 201 | 202 | ||
| 203 | /* For PCI, we override whatever child busses may have used. */ | ||
| 204 | flags = 0; | ||
| 202 | switch((w >> 24) & 0x03) { | 205 | switch((w >> 24) & 0x03) { |
| 203 | case 0x01: | 206 | case 0x01: |
| 204 | flags |= IORESOURCE_IO; | 207 | flags |= IORESOURCE_IO; |
| 208 | break; | ||
| 209 | |||
| 205 | case 0x02: /* 32 bits */ | 210 | case 0x02: /* 32 bits */ |
| 206 | case 0x03: /* 64 bits */ | 211 | case 0x03: /* 64 bits */ |
| 207 | flags |= IORESOURCE_MEM; | 212 | flags |= IORESOURCE_MEM; |
| 213 | break; | ||
| 208 | } | 214 | } |
| 209 | if (w & 0x40000000) | 215 | if (w & 0x40000000) |
| 210 | flags |= IORESOURCE_PREFETCH; | 216 | flags |= IORESOURCE_PREFETCH; |
| @@ -362,10 +368,11 @@ static void __init build_device_resources(struct of_device *op, | |||
| 362 | int pna, pns; | 368 | int pna, pns; |
| 363 | 369 | ||
| 364 | size = of_read_addr(reg + na, ns); | 370 | size = of_read_addr(reg + na, ns); |
| 365 | flags = bus->get_flags(reg); | ||
| 366 | 371 | ||
| 367 | memcpy(addr, reg, na * 4); | 372 | memcpy(addr, reg, na * 4); |
| 368 | 373 | ||
| 374 | flags = bus->get_flags(reg, 0); | ||
| 375 | |||
| 369 | /* If the immediate parent has no ranges property to apply, | 376 | /* If the immediate parent has no ranges property to apply, |
| 370 | * just use a 1<->1 mapping. | 377 | * just use a 1<->1 mapping. |
| 371 | */ | 378 | */ |
| @@ -393,6 +400,8 @@ static void __init build_device_resources(struct of_device *op, | |||
| 393 | dna, dns, pna)) | 400 | dna, dns, pna)) |
| 394 | break; | 401 | break; |
| 395 | 402 | ||
| 403 | flags = pbus->get_flags(addr, flags); | ||
| 404 | |||
| 396 | dna = pna; | 405 | dna = pna; |
| 397 | dns = pns; | 406 | dns = pns; |
| 398 | dbus = pbus; | 407 | dbus = pbus; |
diff --git a/arch/sparc/kernel/sun4d_smp.c b/arch/sparc/kernel/sun4d_smp.c index dfde77ff0848..69596402a500 100644 --- a/arch/sparc/kernel/sun4d_smp.c +++ b/arch/sparc/kernel/sun4d_smp.c | |||
| @@ -262,8 +262,9 @@ static struct smp_funcall { | |||
| 262 | static DEFINE_SPINLOCK(cross_call_lock); | 262 | static DEFINE_SPINLOCK(cross_call_lock); |
| 263 | 263 | ||
| 264 | /* Cross calls must be serialized, at least currently. */ | 264 | /* Cross calls must be serialized, at least currently. */ |
| 265 | void smp4d_cross_call(smpfunc_t func, unsigned long arg1, unsigned long arg2, | 265 | static void smp4d_cross_call(smpfunc_t func, cpumask_t mask, unsigned long arg1, |
| 266 | unsigned long arg3, unsigned long arg4, unsigned long arg5) | 266 | unsigned long arg2, unsigned long arg3, |
| 267 | unsigned long arg4) | ||
| 267 | { | 268 | { |
| 268 | if(smp_processors_ready) { | 269 | if(smp_processors_ready) { |
| 269 | register int high = smp_highest_cpu; | 270 | register int high = smp_highest_cpu; |
| @@ -278,7 +279,7 @@ void smp4d_cross_call(smpfunc_t func, unsigned long arg1, unsigned long arg2, | |||
| 278 | register unsigned long a2 asm("i2") = arg2; | 279 | register unsigned long a2 asm("i2") = arg2; |
| 279 | register unsigned long a3 asm("i3") = arg3; | 280 | register unsigned long a3 asm("i3") = arg3; |
| 280 | register unsigned long a4 asm("i4") = arg4; | 281 | register unsigned long a4 asm("i4") = arg4; |
| 281 | register unsigned long a5 asm("i5") = arg5; | 282 | register unsigned long a5 asm("i5") = 0; |
| 282 | 283 | ||
| 283 | __asm__ __volatile__( | 284 | __asm__ __volatile__( |
| 284 | "std %0, [%6]\n\t" | 285 | "std %0, [%6]\n\t" |
| @@ -290,11 +291,10 @@ void smp4d_cross_call(smpfunc_t func, unsigned long arg1, unsigned long arg2, | |||
| 290 | 291 | ||
| 291 | /* Init receive/complete mapping, plus fire the IPI's off. */ | 292 | /* Init receive/complete mapping, plus fire the IPI's off. */ |
| 292 | { | 293 | { |
| 293 | cpumask_t mask; | ||
| 294 | register int i; | 294 | register int i; |
| 295 | 295 | ||
| 296 | mask = cpumask_of_cpu(hard_smp4d_processor_id()); | 296 | cpu_clear(smp_processor_id(), mask); |
| 297 | cpus_andnot(mask, cpu_online_map, mask); | 297 | cpus_and(mask, cpu_online_map, mask); |
| 298 | for(i = 0; i <= high; i++) { | 298 | for(i = 0; i <= high; i++) { |
| 299 | if (cpu_isset(i, mask)) { | 299 | if (cpu_isset(i, mask)) { |
| 300 | ccall_info.processors_in[i] = 0; | 300 | ccall_info.processors_in[i] = 0; |
| @@ -309,12 +309,16 @@ void smp4d_cross_call(smpfunc_t func, unsigned long arg1, unsigned long arg2, | |||
| 309 | 309 | ||
| 310 | i = 0; | 310 | i = 0; |
| 311 | do { | 311 | do { |
| 312 | if (!cpu_isset(i, mask)) | ||
| 313 | continue; | ||
| 312 | while(!ccall_info.processors_in[i]) | 314 | while(!ccall_info.processors_in[i]) |
| 313 | barrier(); | 315 | barrier(); |
| 314 | } while(++i <= high); | 316 | } while(++i <= high); |
| 315 | 317 | ||
| 316 | i = 0; | 318 | i = 0; |
| 317 | do { | 319 | do { |
| 320 | if (!cpu_isset(i, mask)) | ||
| 321 | continue; | ||
| 318 | while(!ccall_info.processors_out[i]) | 322 | while(!ccall_info.processors_out[i]) |
| 319 | barrier(); | 323 | barrier(); |
| 320 | } while(++i <= high); | 324 | } while(++i <= high); |
diff --git a/arch/sparc/kernel/sun4m_smp.c b/arch/sparc/kernel/sun4m_smp.c index 406ac1abc83a..a14a76ac7f36 100644 --- a/arch/sparc/kernel/sun4m_smp.c +++ b/arch/sparc/kernel/sun4m_smp.c | |||
| @@ -244,9 +244,9 @@ static struct smp_funcall { | |||
| 244 | static DEFINE_SPINLOCK(cross_call_lock); | 244 | static DEFINE_SPINLOCK(cross_call_lock); |
| 245 | 245 | ||
| 246 | /* Cross calls must be serialized, at least currently. */ | 246 | /* Cross calls must be serialized, at least currently. */ |
| 247 | static void smp4m_cross_call(smpfunc_t func, unsigned long arg1, | 247 | static void smp4m_cross_call(smpfunc_t func, cpumask_t mask, unsigned long arg1, |
| 248 | unsigned long arg2, unsigned long arg3, | 248 | unsigned long arg2, unsigned long arg3, |
| 249 | unsigned long arg4, unsigned long arg5) | 249 | unsigned long arg4) |
| 250 | { | 250 | { |
| 251 | register int ncpus = SUN4M_NCPUS; | 251 | register int ncpus = SUN4M_NCPUS; |
| 252 | unsigned long flags; | 252 | unsigned long flags; |
| @@ -259,14 +259,14 @@ static void smp4m_cross_call(smpfunc_t func, unsigned long arg1, | |||
| 259 | ccall_info.arg2 = arg2; | 259 | ccall_info.arg2 = arg2; |
| 260 | ccall_info.arg3 = arg3; | 260 | ccall_info.arg3 = arg3; |
| 261 | ccall_info.arg4 = arg4; | 261 | ccall_info.arg4 = arg4; |
| 262 | ccall_info.arg5 = arg5; | 262 | ccall_info.arg5 = 0; |
| 263 | 263 | ||
| 264 | /* Init receive/complete mapping, plus fire the IPI's off. */ | 264 | /* Init receive/complete mapping, plus fire the IPI's off. */ |
| 265 | { | 265 | { |
| 266 | cpumask_t mask = cpu_online_map; | ||
| 267 | register int i; | 266 | register int i; |
| 268 | 267 | ||
| 269 | cpu_clear(smp_processor_id(), mask); | 268 | cpu_clear(smp_processor_id(), mask); |
| 269 | cpus_and(mask, cpu_online_map, mask); | ||
| 270 | for(i = 0; i < ncpus; i++) { | 270 | for(i = 0; i < ncpus; i++) { |
| 271 | if (cpu_isset(i, mask)) { | 271 | if (cpu_isset(i, mask)) { |
| 272 | ccall_info.processors_in[i] = 0; | 272 | ccall_info.processors_in[i] = 0; |
| @@ -284,12 +284,16 @@ static void smp4m_cross_call(smpfunc_t func, unsigned long arg1, | |||
| 284 | 284 | ||
| 285 | i = 0; | 285 | i = 0; |
| 286 | do { | 286 | do { |
| 287 | if (!cpu_isset(i, mask)) | ||
| 288 | continue; | ||
| 287 | while(!ccall_info.processors_in[i]) | 289 | while(!ccall_info.processors_in[i]) |
| 288 | barrier(); | 290 | barrier(); |
| 289 | } while(++i < ncpus); | 291 | } while(++i < ncpus); |
| 290 | 292 | ||
| 291 | i = 0; | 293 | i = 0; |
| 292 | do { | 294 | do { |
| 295 | if (!cpu_isset(i, mask)) | ||
| 296 | continue; | ||
| 293 | while(!ccall_info.processors_out[i]) | 297 | while(!ccall_info.processors_out[i]) |
| 294 | barrier(); | 298 | barrier(); |
| 295 | } while(++i < ncpus); | 299 | } while(++i < ncpus); |
diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig index 923a98959fa7..36b4b7ab9cfb 100644 --- a/arch/sparc64/Kconfig +++ b/arch/sparc64/Kconfig | |||
| @@ -231,6 +231,7 @@ endmenu | |||
| 231 | 231 | ||
| 232 | config NUMA | 232 | config NUMA |
| 233 | bool "NUMA support" | 233 | bool "NUMA support" |
| 234 | depends on SMP | ||
| 234 | 235 | ||
| 235 | config NODES_SHIFT | 236 | config NODES_SHIFT |
| 236 | int | 237 | int |
diff --git a/arch/sparc64/kernel/irq.c b/arch/sparc64/kernel/irq.c index ba43d85e8dde..9b6689d9d570 100644 --- a/arch/sparc64/kernel/irq.c +++ b/arch/sparc64/kernel/irq.c | |||
| @@ -682,10 +682,32 @@ void ack_bad_irq(unsigned int virt_irq) | |||
| 682 | ino, virt_irq); | 682 | ino, virt_irq); |
| 683 | } | 683 | } |
| 684 | 684 | ||
| 685 | void *hardirq_stack[NR_CPUS]; | ||
| 686 | void *softirq_stack[NR_CPUS]; | ||
| 687 | |||
| 688 | static __attribute__((always_inline)) void *set_hardirq_stack(void) | ||
| 689 | { | ||
| 690 | void *orig_sp, *sp = hardirq_stack[smp_processor_id()]; | ||
| 691 | |||
| 692 | __asm__ __volatile__("mov %%sp, %0" : "=r" (orig_sp)); | ||
| 693 | if (orig_sp < sp || | ||
| 694 | orig_sp > (sp + THREAD_SIZE)) { | ||
| 695 | sp += THREAD_SIZE - 192 - STACK_BIAS; | ||
| 696 | __asm__ __volatile__("mov %0, %%sp" : : "r" (sp)); | ||
| 697 | } | ||
| 698 | |||
| 699 | return orig_sp; | ||
| 700 | } | ||
| 701 | static __attribute__((always_inline)) void restore_hardirq_stack(void *orig_sp) | ||
| 702 | { | ||
| 703 | __asm__ __volatile__("mov %0, %%sp" : : "r" (orig_sp)); | ||
| 704 | } | ||
| 705 | |||
| 685 | void handler_irq(int irq, struct pt_regs *regs) | 706 | void handler_irq(int irq, struct pt_regs *regs) |
| 686 | { | 707 | { |
| 687 | unsigned long pstate, bucket_pa; | 708 | unsigned long pstate, bucket_pa; |
| 688 | struct pt_regs *old_regs; | 709 | struct pt_regs *old_regs; |
| 710 | void *orig_sp; | ||
| 689 | 711 | ||
| 690 | clear_softint(1 << irq); | 712 | clear_softint(1 << irq); |
| 691 | 713 | ||
| @@ -703,6 +725,8 @@ void handler_irq(int irq, struct pt_regs *regs) | |||
| 703 | "i" (PSTATE_IE) | 725 | "i" (PSTATE_IE) |
| 704 | : "memory"); | 726 | : "memory"); |
| 705 | 727 | ||
| 728 | orig_sp = set_hardirq_stack(); | ||
| 729 | |||
| 706 | while (bucket_pa) { | 730 | while (bucket_pa) { |
| 707 | struct irq_desc *desc; | 731 | struct irq_desc *desc; |
| 708 | unsigned long next_pa; | 732 | unsigned long next_pa; |
| @@ -719,10 +743,38 @@ void handler_irq(int irq, struct pt_regs *regs) | |||
| 719 | bucket_pa = next_pa; | 743 | bucket_pa = next_pa; |
| 720 | } | 744 | } |
| 721 | 745 | ||
| 746 | restore_hardirq_stack(orig_sp); | ||
| 747 | |||
| 722 | irq_exit(); | 748 | irq_exit(); |
| 723 | set_irq_regs(old_regs); | 749 | set_irq_regs(old_regs); |
| 724 | } | 750 | } |
| 725 | 751 | ||
| 752 | void do_softirq(void) | ||
| 753 | { | ||
| 754 | unsigned long flags; | ||
| 755 | |||
| 756 | if (in_interrupt()) | ||
| 757 | return; | ||
| 758 | |||
| 759 | local_irq_save(flags); | ||
| 760 | |||
| 761 | if (local_softirq_pending()) { | ||
| 762 | void *orig_sp, *sp = softirq_stack[smp_processor_id()]; | ||
| 763 | |||
| 764 | sp += THREAD_SIZE - 192 - STACK_BIAS; | ||
| 765 | |||
| 766 | __asm__ __volatile__("mov %%sp, %0\n\t" | ||
| 767 | "mov %1, %%sp" | ||
| 768 | : "=&r" (orig_sp) | ||
| 769 | : "r" (sp)); | ||
| 770 | __do_softirq(); | ||
| 771 | __asm__ __volatile__("mov %0, %%sp" | ||
| 772 | : : "r" (orig_sp)); | ||
| 773 | } | ||
| 774 | |||
| 775 | local_irq_restore(flags); | ||
| 776 | } | ||
| 777 | |||
| 726 | #ifdef CONFIG_HOTPLUG_CPU | 778 | #ifdef CONFIG_HOTPLUG_CPU |
| 727 | void fixup_irqs(void) | 779 | void fixup_irqs(void) |
| 728 | { | 780 | { |
diff --git a/arch/sparc64/kernel/kstack.h b/arch/sparc64/kernel/kstack.h new file mode 100644 index 000000000000..4248d969272f --- /dev/null +++ b/arch/sparc64/kernel/kstack.h | |||
| @@ -0,0 +1,60 @@ | |||
| 1 | #ifndef _KSTACK_H | ||
| 2 | #define _KSTACK_H | ||
| 3 | |||
| 4 | #include <linux/thread_info.h> | ||
| 5 | #include <linux/sched.h> | ||
| 6 | #include <asm/ptrace.h> | ||
| 7 | #include <asm/irq.h> | ||
| 8 | |||
| 9 | /* SP must be STACK_BIAS adjusted already. */ | ||
| 10 | static inline bool kstack_valid(struct thread_info *tp, unsigned long sp) | ||
| 11 | { | ||
| 12 | unsigned long base = (unsigned long) tp; | ||
| 13 | |||
| 14 | if (sp >= (base + sizeof(struct thread_info)) && | ||
| 15 | sp <= (base + THREAD_SIZE - sizeof(struct sparc_stackf))) | ||
| 16 | return true; | ||
| 17 | |||
| 18 | if (hardirq_stack[tp->cpu]) { | ||
| 19 | base = (unsigned long) hardirq_stack[tp->cpu]; | ||
| 20 | if (sp >= base && | ||
| 21 | sp <= (base + THREAD_SIZE - sizeof(struct sparc_stackf))) | ||
| 22 | return true; | ||
| 23 | base = (unsigned long) softirq_stack[tp->cpu]; | ||
| 24 | if (sp >= base && | ||
| 25 | sp <= (base + THREAD_SIZE - sizeof(struct sparc_stackf))) | ||
| 26 | return true; | ||
| 27 | } | ||
| 28 | return false; | ||
| 29 | } | ||
| 30 | |||
| 31 | /* Does "regs" point to a valid pt_regs trap frame? */ | ||
| 32 | static inline bool kstack_is_trap_frame(struct thread_info *tp, struct pt_regs *regs) | ||
| 33 | { | ||
| 34 | unsigned long base = (unsigned long) tp; | ||
| 35 | unsigned long addr = (unsigned long) regs; | ||
| 36 | |||
| 37 | if (addr >= base && | ||
| 38 | addr <= (base + THREAD_SIZE - sizeof(*regs))) | ||
| 39 | goto check_magic; | ||
| 40 | |||
| 41 | if (hardirq_stack[tp->cpu]) { | ||
| 42 | base = (unsigned long) hardirq_stack[tp->cpu]; | ||
| 43 | if (addr >= base && | ||
| 44 | addr <= (base + THREAD_SIZE - sizeof(*regs))) | ||
| 45 | goto check_magic; | ||
| 46 | base = (unsigned long) softirq_stack[tp->cpu]; | ||
| 47 | if (addr >= base && | ||
| 48 | addr <= (base + THREAD_SIZE - sizeof(*regs))) | ||
| 49 | goto check_magic; | ||
| 50 | } | ||
| 51 | return false; | ||
| 52 | |||
| 53 | check_magic: | ||
| 54 | if ((regs->magic & ~0x1ff) == PT_REGS_MAGIC) | ||
| 55 | return true; | ||
| 56 | return false; | ||
| 57 | |||
| 58 | } | ||
| 59 | |||
| 60 | #endif /* _KSTACK_H */ | ||
diff --git a/arch/sparc64/kernel/of_device.c b/arch/sparc64/kernel/of_device.c index f8b50cbf4bf7..f845f150f565 100644 --- a/arch/sparc64/kernel/of_device.c +++ b/arch/sparc64/kernel/of_device.c | |||
| @@ -96,7 +96,7 @@ struct of_bus { | |||
| 96 | int *addrc, int *sizec); | 96 | int *addrc, int *sizec); |
| 97 | int (*map)(u32 *addr, const u32 *range, | 97 | int (*map)(u32 *addr, const u32 *range, |
| 98 | int na, int ns, int pna); | 98 | int na, int ns, int pna); |
| 99 | unsigned int (*get_flags)(const u32 *addr); | 99 | unsigned long (*get_flags)(const u32 *addr, unsigned long); |
| 100 | }; | 100 | }; |
| 101 | 101 | ||
| 102 | /* | 102 | /* |
| @@ -156,8 +156,10 @@ static int of_bus_default_map(u32 *addr, const u32 *range, | |||
| 156 | return 0; | 156 | return 0; |
| 157 | } | 157 | } |
| 158 | 158 | ||
| 159 | static unsigned int of_bus_default_get_flags(const u32 *addr) | 159 | static unsigned long of_bus_default_get_flags(const u32 *addr, unsigned long flags) |
| 160 | { | 160 | { |
| 161 | if (flags) | ||
| 162 | return flags; | ||
| 161 | return IORESOURCE_MEM; | 163 | return IORESOURCE_MEM; |
| 162 | } | 164 | } |
| 163 | 165 | ||
| @@ -249,17 +251,21 @@ static int of_bus_pci_map(u32 *addr, const u32 *range, | |||
| 249 | return 0; | 251 | return 0; |
| 250 | } | 252 | } |
| 251 | 253 | ||
| 252 | static unsigned int of_bus_pci_get_flags(const u32 *addr) | 254 | static unsigned long of_bus_pci_get_flags(const u32 *addr, unsigned long flags) |
| 253 | { | 255 | { |
| 254 | unsigned int flags = 0; | ||
| 255 | u32 w = addr[0]; | 256 | u32 w = addr[0]; |
| 256 | 257 | ||
| 258 | /* For PCI, we override whatever child busses may have used. */ | ||
| 259 | flags = 0; | ||
| 257 | switch((w >> 24) & 0x03) { | 260 | switch((w >> 24) & 0x03) { |
| 258 | case 0x01: | 261 | case 0x01: |
| 259 | flags |= IORESOURCE_IO; | 262 | flags |= IORESOURCE_IO; |
| 263 | break; | ||
| 264 | |||
| 260 | case 0x02: /* 32 bits */ | 265 | case 0x02: /* 32 bits */ |
| 261 | case 0x03: /* 64 bits */ | 266 | case 0x03: /* 64 bits */ |
| 262 | flags |= IORESOURCE_MEM; | 267 | flags |= IORESOURCE_MEM; |
| 268 | break; | ||
| 263 | } | 269 | } |
| 264 | if (w & 0x40000000) | 270 | if (w & 0x40000000) |
| 265 | flags |= IORESOURCE_PREFETCH; | 271 | flags |= IORESOURCE_PREFETCH; |
| @@ -478,10 +484,10 @@ static void __init build_device_resources(struct of_device *op, | |||
| 478 | int pna, pns; | 484 | int pna, pns; |
| 479 | 485 | ||
| 480 | size = of_read_addr(reg + na, ns); | 486 | size = of_read_addr(reg + na, ns); |
| 481 | flags = bus->get_flags(reg); | ||
| 482 | |||
| 483 | memcpy(addr, reg, na * 4); | 487 | memcpy(addr, reg, na * 4); |
| 484 | 488 | ||
| 489 | flags = bus->get_flags(addr, 0); | ||
| 490 | |||
| 485 | if (use_1to1_mapping(pp)) { | 491 | if (use_1to1_mapping(pp)) { |
| 486 | result = of_read_addr(addr, na); | 492 | result = of_read_addr(addr, na); |
| 487 | goto build_res; | 493 | goto build_res; |
| @@ -506,6 +512,8 @@ static void __init build_device_resources(struct of_device *op, | |||
| 506 | dna, dns, pna)) | 512 | dna, dns, pna)) |
| 507 | break; | 513 | break; |
| 508 | 514 | ||
| 515 | flags = pbus->get_flags(addr, flags); | ||
| 516 | |||
| 509 | dna = pna; | 517 | dna = pna; |
| 510 | dns = pns; | 518 | dns = pns; |
| 511 | dbus = pbus; | 519 | dbus = pbus; |
diff --git a/arch/sparc64/kernel/process.c b/arch/sparc64/kernel/process.c index 7f5debdc5fed..15f4178592e7 100644 --- a/arch/sparc64/kernel/process.c +++ b/arch/sparc64/kernel/process.c | |||
| @@ -52,6 +52,8 @@ | |||
| 52 | #include <asm/irq_regs.h> | 52 | #include <asm/irq_regs.h> |
| 53 | #include <asm/smp.h> | 53 | #include <asm/smp.h> |
| 54 | 54 | ||
| 55 | #include "kstack.h" | ||
| 56 | |||
| 55 | static void sparc64_yield(int cpu) | 57 | static void sparc64_yield(int cpu) |
| 56 | { | 58 | { |
| 57 | if (tlb_type != hypervisor) | 59 | if (tlb_type != hypervisor) |
| @@ -235,19 +237,6 @@ void show_regs(struct pt_regs *regs) | |||
| 235 | struct global_reg_snapshot global_reg_snapshot[NR_CPUS]; | 237 | struct global_reg_snapshot global_reg_snapshot[NR_CPUS]; |
| 236 | static DEFINE_SPINLOCK(global_reg_snapshot_lock); | 238 | static DEFINE_SPINLOCK(global_reg_snapshot_lock); |
| 237 | 239 | ||
| 238 | static bool kstack_valid(struct thread_info *tp, struct reg_window *rw) | ||
| 239 | { | ||
| 240 | unsigned long thread_base, fp; | ||
| 241 | |||
| 242 | thread_base = (unsigned long) tp; | ||
| 243 | fp = (unsigned long) rw; | ||
| 244 | |||
| 245 | if (fp < (thread_base + sizeof(struct thread_info)) || | ||
| 246 | fp >= (thread_base + THREAD_SIZE)) | ||
| 247 | return false; | ||
| 248 | return true; | ||
| 249 | } | ||
| 250 | |||
| 251 | static void __global_reg_self(struct thread_info *tp, struct pt_regs *regs, | 240 | static void __global_reg_self(struct thread_info *tp, struct pt_regs *regs, |
| 252 | int this_cpu) | 241 | int this_cpu) |
| 253 | { | 242 | { |
| @@ -264,11 +253,11 @@ static void __global_reg_self(struct thread_info *tp, struct pt_regs *regs, | |||
| 264 | 253 | ||
| 265 | rw = (struct reg_window *) | 254 | rw = (struct reg_window *) |
| 266 | (regs->u_regs[UREG_FP] + STACK_BIAS); | 255 | (regs->u_regs[UREG_FP] + STACK_BIAS); |
| 267 | if (kstack_valid(tp, rw)) { | 256 | if (kstack_valid(tp, (unsigned long) rw)) { |
| 268 | global_reg_snapshot[this_cpu].i7 = rw->ins[7]; | 257 | global_reg_snapshot[this_cpu].i7 = rw->ins[7]; |
| 269 | rw = (struct reg_window *) | 258 | rw = (struct reg_window *) |
| 270 | (rw->ins[6] + STACK_BIAS); | 259 | (rw->ins[6] + STACK_BIAS); |
| 271 | if (kstack_valid(tp, rw)) | 260 | if (kstack_valid(tp, (unsigned long) rw)) |
| 272 | global_reg_snapshot[this_cpu].rpc = rw->ins[7]; | 261 | global_reg_snapshot[this_cpu].rpc = rw->ins[7]; |
| 273 | } | 262 | } |
| 274 | } else { | 263 | } else { |
| @@ -828,7 +817,7 @@ out: | |||
| 828 | unsigned long get_wchan(struct task_struct *task) | 817 | unsigned long get_wchan(struct task_struct *task) |
| 829 | { | 818 | { |
| 830 | unsigned long pc, fp, bias = 0; | 819 | unsigned long pc, fp, bias = 0; |
| 831 | unsigned long thread_info_base; | 820 | struct thread_info *tp; |
| 832 | struct reg_window *rw; | 821 | struct reg_window *rw; |
| 833 | unsigned long ret = 0; | 822 | unsigned long ret = 0; |
| 834 | int count = 0; | 823 | int count = 0; |
| @@ -837,14 +826,12 @@ unsigned long get_wchan(struct task_struct *task) | |||
| 837 | task->state == TASK_RUNNING) | 826 | task->state == TASK_RUNNING) |
| 838 | goto out; | 827 | goto out; |
| 839 | 828 | ||
| 840 | thread_info_base = (unsigned long) task_stack_page(task); | 829 | tp = task_thread_info(task); |
| 841 | bias = STACK_BIAS; | 830 | bias = STACK_BIAS; |
| 842 | fp = task_thread_info(task)->ksp + bias; | 831 | fp = task_thread_info(task)->ksp + bias; |
| 843 | 832 | ||
| 844 | do { | 833 | do { |
| 845 | /* Bogus frame pointer? */ | 834 | if (!kstack_valid(tp, fp)) |
| 846 | if (fp < (thread_info_base + sizeof(struct thread_info)) || | ||
| 847 | fp >= (thread_info_base + THREAD_SIZE)) | ||
| 848 | break; | 835 | break; |
| 849 | rw = (struct reg_window *) fp; | 836 | rw = (struct reg_window *) fp; |
| 850 | pc = rw->ins[7]; | 837 | pc = rw->ins[7]; |
diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c index 27b81775a4de..743ccad61c60 100644 --- a/arch/sparc64/kernel/smp.c +++ b/arch/sparc64/kernel/smp.c | |||
| @@ -858,9 +858,7 @@ void smp_tsb_sync(struct mm_struct *mm) | |||
| 858 | extern unsigned long xcall_flush_tlb_mm; | 858 | extern unsigned long xcall_flush_tlb_mm; |
| 859 | extern unsigned long xcall_flush_tlb_pending; | 859 | extern unsigned long xcall_flush_tlb_pending; |
| 860 | extern unsigned long xcall_flush_tlb_kernel_range; | 860 | extern unsigned long xcall_flush_tlb_kernel_range; |
| 861 | #ifdef CONFIG_MAGIC_SYSRQ | ||
| 862 | extern unsigned long xcall_fetch_glob_regs; | 861 | extern unsigned long xcall_fetch_glob_regs; |
| 863 | #endif | ||
| 864 | extern unsigned long xcall_receive_signal; | 862 | extern unsigned long xcall_receive_signal; |
| 865 | extern unsigned long xcall_new_mmu_context_version; | 863 | extern unsigned long xcall_new_mmu_context_version; |
| 866 | #ifdef CONFIG_KGDB | 864 | #ifdef CONFIG_KGDB |
| @@ -1005,12 +1003,10 @@ void kgdb_roundup_cpus(unsigned long flags) | |||
| 1005 | } | 1003 | } |
| 1006 | #endif | 1004 | #endif |
| 1007 | 1005 | ||
| 1008 | #ifdef CONFIG_MAGIC_SYSRQ | ||
| 1009 | void smp_fetch_global_regs(void) | 1006 | void smp_fetch_global_regs(void) |
| 1010 | { | 1007 | { |
| 1011 | smp_cross_call(&xcall_fetch_glob_regs, 0, 0, 0); | 1008 | smp_cross_call(&xcall_fetch_glob_regs, 0, 0, 0); |
| 1012 | } | 1009 | } |
| 1013 | #endif | ||
| 1014 | 1010 | ||
| 1015 | /* We know that the window frames of the user have been flushed | 1011 | /* We know that the window frames of the user have been flushed |
| 1016 | * to the stack before we get here because all callers of us | 1012 | * to the stack before we get here because all callers of us |
diff --git a/arch/sparc64/kernel/stacktrace.c b/arch/sparc64/kernel/stacktrace.c index e9d7f0660f2e..4e21d4a57d3b 100644 --- a/arch/sparc64/kernel/stacktrace.c +++ b/arch/sparc64/kernel/stacktrace.c | |||
| @@ -5,10 +5,12 @@ | |||
| 5 | #include <asm/ptrace.h> | 5 | #include <asm/ptrace.h> |
| 6 | #include <asm/stacktrace.h> | 6 | #include <asm/stacktrace.h> |
| 7 | 7 | ||
| 8 | #include "kstack.h" | ||
| 9 | |||
| 8 | void save_stack_trace(struct stack_trace *trace) | 10 | void save_stack_trace(struct stack_trace *trace) |
| 9 | { | 11 | { |
| 10 | unsigned long ksp, fp, thread_base; | ||
| 11 | struct thread_info *tp = task_thread_info(current); | 12 | struct thread_info *tp = task_thread_info(current); |
| 13 | unsigned long ksp, fp; | ||
| 12 | 14 | ||
| 13 | stack_trace_flush(); | 15 | stack_trace_flush(); |
| 14 | 16 | ||
| @@ -18,23 +20,18 @@ void save_stack_trace(struct stack_trace *trace) | |||
| 18 | ); | 20 | ); |
| 19 | 21 | ||
| 20 | fp = ksp + STACK_BIAS; | 22 | fp = ksp + STACK_BIAS; |
| 21 | thread_base = (unsigned long) tp; | ||
| 22 | do { | 23 | do { |
| 23 | struct sparc_stackf *sf; | 24 | struct sparc_stackf *sf; |
| 24 | struct pt_regs *regs; | 25 | struct pt_regs *regs; |
| 25 | unsigned long pc; | 26 | unsigned long pc; |
| 26 | 27 | ||
| 27 | /* Bogus frame pointer? */ | 28 | if (!kstack_valid(tp, fp)) |
| 28 | if (fp < (thread_base + sizeof(struct thread_info)) || | ||
| 29 | fp > (thread_base + THREAD_SIZE - sizeof(struct sparc_stackf))) | ||
| 30 | break; | 29 | break; |
| 31 | 30 | ||
| 32 | sf = (struct sparc_stackf *) fp; | 31 | sf = (struct sparc_stackf *) fp; |
| 33 | regs = (struct pt_regs *) (sf + 1); | 32 | regs = (struct pt_regs *) (sf + 1); |
| 34 | 33 | ||
| 35 | if (((unsigned long)regs <= | 34 | if (kstack_is_trap_frame(tp, regs)) { |
| 36 | (thread_base + THREAD_SIZE - sizeof(*regs))) && | ||
| 37 | (regs->magic & ~0x1ff) == PT_REGS_MAGIC) { | ||
| 38 | if (!(regs->tstate & TSTATE_PRIV)) | 35 | if (!(regs->tstate & TSTATE_PRIV)) |
| 39 | break; | 36 | break; |
| 40 | pc = regs->tpc; | 37 | pc = regs->tpc; |
diff --git a/arch/sparc64/kernel/traps.c b/arch/sparc64/kernel/traps.c index 404e8561e2d0..3d924121c796 100644 --- a/arch/sparc64/kernel/traps.c +++ b/arch/sparc64/kernel/traps.c | |||
| @@ -39,6 +39,7 @@ | |||
| 39 | #include <asm/prom.h> | 39 | #include <asm/prom.h> |
| 40 | 40 | ||
| 41 | #include "entry.h" | 41 | #include "entry.h" |
| 42 | #include "kstack.h" | ||
| 42 | 43 | ||
| 43 | /* When an irrecoverable trap occurs at tl > 0, the trap entry | 44 | /* When an irrecoverable trap occurs at tl > 0, the trap entry |
| 44 | * code logs the trap state registers at every level in the trap | 45 | * code logs the trap state registers at every level in the trap |
| @@ -2115,14 +2116,12 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp) | |||
| 2115 | struct pt_regs *regs; | 2116 | struct pt_regs *regs; |
| 2116 | unsigned long pc; | 2117 | unsigned long pc; |
| 2117 | 2118 | ||
| 2118 | /* Bogus frame pointer? */ | 2119 | if (!kstack_valid(tp, fp)) |
| 2119 | if (fp < (thread_base + sizeof(struct thread_info)) || | ||
| 2120 | fp >= (thread_base + THREAD_SIZE)) | ||
| 2121 | break; | 2120 | break; |
| 2122 | sf = (struct sparc_stackf *) fp; | 2121 | sf = (struct sparc_stackf *) fp; |
| 2123 | regs = (struct pt_regs *) (sf + 1); | 2122 | regs = (struct pt_regs *) (sf + 1); |
| 2124 | 2123 | ||
| 2125 | if ((regs->magic & ~0x1ff) == PT_REGS_MAGIC) { | 2124 | if (kstack_is_trap_frame(tp, regs)) { |
| 2126 | if (!(regs->tstate & TSTATE_PRIV)) | 2125 | if (!(regs->tstate & TSTATE_PRIV)) |
| 2127 | break; | 2126 | break; |
| 2128 | pc = regs->tpc; | 2127 | pc = regs->tpc; |
diff --git a/arch/sparc64/lib/mcount.S b/arch/sparc64/lib/mcount.S index 7735a7a60533..fad90ddb3a28 100644 --- a/arch/sparc64/lib/mcount.S +++ b/arch/sparc64/lib/mcount.S | |||
| @@ -48,12 +48,45 @@ mcount: | |||
| 48 | sub %g3, STACK_BIAS, %g3 | 48 | sub %g3, STACK_BIAS, %g3 |
| 49 | cmp %sp, %g3 | 49 | cmp %sp, %g3 |
| 50 | bg,pt %xcc, 1f | 50 | bg,pt %xcc, 1f |
| 51 | sethi %hi(panicstring), %g3 | 51 | nop |
| 52 | lduh [%g6 + TI_CPU], %g1 | ||
| 53 | sethi %hi(hardirq_stack), %g3 | ||
| 54 | or %g3, %lo(hardirq_stack), %g3 | ||
| 55 | sllx %g1, 3, %g1 | ||
| 56 | ldx [%g3 + %g1], %g7 | ||
| 57 | sub %g7, STACK_BIAS, %g7 | ||
| 58 | cmp %sp, %g7 | ||
| 59 | bleu,pt %xcc, 2f | ||
| 60 | sethi %hi(THREAD_SIZE), %g3 | ||
| 61 | add %g7, %g3, %g7 | ||
| 62 | cmp %sp, %g7 | ||
| 63 | blu,pn %xcc, 1f | ||
| 64 | 2: sethi %hi(softirq_stack), %g3 | ||
| 65 | or %g3, %lo(softirq_stack), %g3 | ||
| 66 | ldx [%g3 + %g1], %g7 | ||
| 67 | cmp %sp, %g7 | ||
| 68 | bleu,pt %xcc, 2f | ||
| 69 | sethi %hi(THREAD_SIZE), %g3 | ||
| 70 | add %g7, %g3, %g7 | ||
| 71 | cmp %sp, %g7 | ||
| 72 | blu,pn %xcc, 1f | ||
| 73 | nop | ||
| 74 | /* If we are already on ovstack, don't hop onto it | ||
| 75 | * again, we are already trying to output the stack overflow | ||
| 76 | * message. | ||
| 77 | */ | ||
| 52 | sethi %hi(ovstack), %g7 ! cant move to panic stack fast enough | 78 | sethi %hi(ovstack), %g7 ! cant move to panic stack fast enough |
| 53 | or %g7, %lo(ovstack), %g7 | 79 | or %g7, %lo(ovstack), %g7 |
| 54 | add %g7, OVSTACKSIZE, %g7 | 80 | add %g7, OVSTACKSIZE, %g3 |
| 81 | sub %g3, STACK_BIAS + 192, %g3 | ||
| 55 | sub %g7, STACK_BIAS, %g7 | 82 | sub %g7, STACK_BIAS, %g7 |
| 56 | mov %g7, %sp | 83 | cmp %sp, %g7 |
| 84 | blu,pn %xcc, 2f | ||
| 85 | cmp %sp, %g3 | ||
| 86 | bleu,pn %xcc, 1f | ||
| 87 | nop | ||
| 88 | 2: mov %g3, %sp | ||
| 89 | sethi %hi(panicstring), %g3 | ||
| 57 | call prom_printf | 90 | call prom_printf |
| 58 | or %g3, %lo(panicstring), %o0 | 91 | or %g3, %lo(panicstring), %o0 |
| 59 | call prom_halt | 92 | call prom_halt |
diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c index 4e821b3ecb03..a41df7bef035 100644 --- a/arch/sparc64/mm/init.c +++ b/arch/sparc64/mm/init.c | |||
| @@ -49,6 +49,7 @@ | |||
| 49 | #include <asm/sstate.h> | 49 | #include <asm/sstate.h> |
| 50 | #include <asm/mdesc.h> | 50 | #include <asm/mdesc.h> |
| 51 | #include <asm/cpudata.h> | 51 | #include <asm/cpudata.h> |
| 52 | #include <asm/irq.h> | ||
| 52 | 53 | ||
| 53 | #define MAX_PHYS_ADDRESS (1UL << 42UL) | 54 | #define MAX_PHYS_ADDRESS (1UL << 42UL) |
| 54 | #define KPTE_BITMAP_CHUNK_SZ (256UL * 1024UL * 1024UL) | 55 | #define KPTE_BITMAP_CHUNK_SZ (256UL * 1024UL * 1024UL) |
| @@ -795,6 +796,9 @@ static unsigned long nid_range(unsigned long start, unsigned long end, | |||
| 795 | start += PAGE_SIZE; | 796 | start += PAGE_SIZE; |
| 796 | } | 797 | } |
| 797 | 798 | ||
| 799 | if (start > end) | ||
| 800 | start = end; | ||
| 801 | |||
| 798 | return start; | 802 | return start; |
| 799 | } | 803 | } |
| 800 | #else | 804 | #else |
| @@ -1722,8 +1726,7 @@ void __init paging_init(void) | |||
| 1722 | 1726 | ||
| 1723 | find_ramdisk(phys_base); | 1727 | find_ramdisk(phys_base); |
| 1724 | 1728 | ||
| 1725 | if (cmdline_memory_size) | 1729 | lmb_enforce_memory_limit(cmdline_memory_size); |
| 1726 | lmb_enforce_memory_limit(phys_base + cmdline_memory_size); | ||
| 1727 | 1730 | ||
| 1728 | lmb_analyze(); | 1731 | lmb_analyze(); |
| 1729 | lmb_dump_all(); | 1732 | lmb_dump_all(); |
| @@ -1771,6 +1774,16 @@ void __init paging_init(void) | |||
| 1771 | if (tlb_type == hypervisor) | 1774 | if (tlb_type == hypervisor) |
| 1772 | sun4v_mdesc_init(); | 1775 | sun4v_mdesc_init(); |
| 1773 | 1776 | ||
| 1777 | /* Once the OF device tree and MDESC have been setup, we know | ||
| 1778 | * the list of possible cpus. Therefore we can allocate the | ||
| 1779 | * IRQ stacks. | ||
| 1780 | */ | ||
| 1781 | for_each_possible_cpu(i) { | ||
| 1782 | /* XXX Use node local allocations... XXX */ | ||
| 1783 | softirq_stack[i] = __va(lmb_alloc(THREAD_SIZE, THREAD_SIZE)); | ||
| 1784 | hardirq_stack[i] = __va(lmb_alloc(THREAD_SIZE, THREAD_SIZE)); | ||
| 1785 | } | ||
| 1786 | |||
| 1774 | /* Setup bootmem... */ | 1787 | /* Setup bootmem... */ |
| 1775 | last_valid_pfn = end_pfn = bootmem_init(phys_base); | 1788 | last_valid_pfn = end_pfn = bootmem_init(phys_base); |
| 1776 | 1789 | ||
| @@ -1830,7 +1843,7 @@ static int pavail_rescan_ents __initdata; | |||
| 1830 | * memory list again, and make sure it provides at least as much | 1843 | * memory list again, and make sure it provides at least as much |
| 1831 | * memory as 'pavail' does. | 1844 | * memory as 'pavail' does. |
| 1832 | */ | 1845 | */ |
| 1833 | static void setup_valid_addr_bitmap_from_pavail(void) | 1846 | static void __init setup_valid_addr_bitmap_from_pavail(void) |
| 1834 | { | 1847 | { |
| 1835 | int i; | 1848 | int i; |
| 1836 | 1849 | ||
| @@ -1950,6 +1963,15 @@ void __init mem_init(void) | |||
| 1950 | void free_initmem(void) | 1963 | void free_initmem(void) |
| 1951 | { | 1964 | { |
| 1952 | unsigned long addr, initend; | 1965 | unsigned long addr, initend; |
| 1966 | int do_free = 1; | ||
| 1967 | |||
| 1968 | /* If the physical memory maps were trimmed by kernel command | ||
| 1969 | * line options, don't even try freeing this initmem stuff up. | ||
| 1970 | * The kernel image could have been in the trimmed out region | ||
| 1971 | * and if so the freeing below will free invalid page structs. | ||
| 1972 | */ | ||
| 1973 | if (cmdline_memory_size) | ||
| 1974 | do_free = 0; | ||
| 1953 | 1975 | ||
| 1954 | /* | 1976 | /* |
| 1955 | * The init section is aligned to 8k in vmlinux.lds. Page align for >8k pagesizes. | 1977 | * The init section is aligned to 8k in vmlinux.lds. Page align for >8k pagesizes. |
| @@ -1964,13 +1986,16 @@ void free_initmem(void) | |||
| 1964 | ((unsigned long) __va(kern_base)) - | 1986 | ((unsigned long) __va(kern_base)) - |
| 1965 | ((unsigned long) KERNBASE)); | 1987 | ((unsigned long) KERNBASE)); |
| 1966 | memset((void *)addr, POISON_FREE_INITMEM, PAGE_SIZE); | 1988 | memset((void *)addr, POISON_FREE_INITMEM, PAGE_SIZE); |
| 1967 | p = virt_to_page(page); | ||
| 1968 | 1989 | ||
| 1969 | ClearPageReserved(p); | 1990 | if (do_free) { |
| 1970 | init_page_count(p); | 1991 | p = virt_to_page(page); |
| 1971 | __free_page(p); | 1992 | |
| 1972 | num_physpages++; | 1993 | ClearPageReserved(p); |
| 1973 | totalram_pages++; | 1994 | init_page_count(p); |
| 1995 | __free_page(p); | ||
| 1996 | num_physpages++; | ||
| 1997 | totalram_pages++; | ||
| 1998 | } | ||
| 1974 | } | 1999 | } |
| 1975 | } | 2000 | } |
| 1976 | 2001 | ||
diff --git a/arch/sparc64/mm/ultra.S b/arch/sparc64/mm/ultra.S index ff1dc44d363e..86773e89dc1b 100644 --- a/arch/sparc64/mm/ultra.S +++ b/arch/sparc64/mm/ultra.S | |||
| @@ -480,7 +480,6 @@ xcall_sync_tick: | |||
| 480 | b rtrap_xcall | 480 | b rtrap_xcall |
| 481 | ldx [%sp + PTREGS_OFF + PT_V9_TSTATE], %l1 | 481 | ldx [%sp + PTREGS_OFF + PT_V9_TSTATE], %l1 |
| 482 | 482 | ||
| 483 | #ifdef CONFIG_MAGIC_SYSRQ | ||
| 484 | .globl xcall_fetch_glob_regs | 483 | .globl xcall_fetch_glob_regs |
| 485 | xcall_fetch_glob_regs: | 484 | xcall_fetch_glob_regs: |
| 486 | sethi %hi(global_reg_snapshot), %g1 | 485 | sethi %hi(global_reg_snapshot), %g1 |
| @@ -511,7 +510,6 @@ xcall_fetch_glob_regs: | |||
| 511 | membar #StoreStore | 510 | membar #StoreStore |
| 512 | stx %g3, [%g1 + GR_SNAP_THREAD] | 511 | stx %g3, [%g1 + GR_SNAP_THREAD] |
| 513 | retry | 512 | retry |
| 514 | #endif /* CONFIG_MAGIC_SYSRQ */ | ||
| 515 | 513 | ||
| 516 | #ifdef DCACHE_ALIASING_POSSIBLE | 514 | #ifdef DCACHE_ALIASING_POSSIBLE |
| 517 | .align 32 | 515 | .align 32 |
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index e2305c7d881b..962388cffa89 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
| @@ -22,7 +22,6 @@ config X86 | |||
| 22 | select HAVE_IDE | 22 | select HAVE_IDE |
| 23 | select HAVE_OPROFILE | 23 | select HAVE_OPROFILE |
| 24 | select HAVE_IOREMAP_PROT | 24 | select HAVE_IOREMAP_PROT |
| 25 | select HAVE_GET_USER_PAGES_FAST | ||
| 26 | select HAVE_KPROBES | 25 | select HAVE_KPROBES |
| 27 | select ARCH_WANT_OPTIONAL_GPIOLIB | 26 | select ARCH_WANT_OPTIONAL_GPIOLIB |
| 28 | select HAVE_KRETPROBES | 27 | select HAVE_KRETPROBES |
| @@ -578,35 +577,29 @@ config SWIOTLB | |||
| 578 | 577 | ||
| 579 | config IOMMU_HELPER | 578 | config IOMMU_HELPER |
| 580 | def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB || AMD_IOMMU) | 579 | def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB || AMD_IOMMU) |
| 580 | |||
| 581 | config MAXSMP | 581 | config MAXSMP |
| 582 | bool "Configure Maximum number of SMP Processors and NUMA Nodes" | 582 | bool "Configure Maximum number of SMP Processors and NUMA Nodes" |
| 583 | depends on X86_64 && SMP | 583 | depends on X86_64 && SMP && BROKEN |
| 584 | default n | 584 | default n |
| 585 | help | 585 | help |
| 586 | Configure maximum number of CPUS and NUMA Nodes for this architecture. | 586 | Configure maximum number of CPUS and NUMA Nodes for this architecture. |
| 587 | If unsure, say N. | 587 | If unsure, say N. |
| 588 | 588 | ||
| 589 | if MAXSMP | ||
| 590 | config NR_CPUS | ||
| 591 | int | ||
| 592 | default "4096" | ||
| 593 | endif | ||
| 594 | |||
| 595 | if !MAXSMP | ||
| 596 | config NR_CPUS | 589 | config NR_CPUS |
| 597 | int "Maximum number of CPUs (2-4096)" | 590 | int "Maximum number of CPUs (2-512)" if !MAXSMP |
| 598 | range 2 4096 | 591 | range 2 512 |
| 599 | depends on SMP | 592 | depends on SMP |
| 593 | default "4096" if MAXSMP | ||
| 600 | default "32" if X86_NUMAQ || X86_SUMMIT || X86_BIGSMP || X86_ES7000 | 594 | default "32" if X86_NUMAQ || X86_SUMMIT || X86_BIGSMP || X86_ES7000 |
| 601 | default "8" | 595 | default "8" |
| 602 | help | 596 | help |
| 603 | This allows you to specify the maximum number of CPUs which this | 597 | This allows you to specify the maximum number of CPUs which this |
| 604 | kernel will support. The maximum supported value is 4096 and the | 598 | kernel will support. The maximum supported value is 512 and the |
| 605 | minimum value which makes sense is 2. | 599 | minimum value which makes sense is 2. |
| 606 | 600 | ||
| 607 | This is purely to save memory - each supported CPU adds | 601 | This is purely to save memory - each supported CPU adds |
| 608 | approximately eight kilobytes to the kernel image. | 602 | approximately eight kilobytes to the kernel image. |
| 609 | endif | ||
| 610 | 603 | ||
| 611 | config SCHED_SMT | 604 | config SCHED_SMT |
| 612 | bool "SMT (Hyperthreading) scheduler support" | 605 | bool "SMT (Hyperthreading) scheduler support" |
| @@ -952,9 +945,9 @@ config NUMA | |||
| 952 | local memory controller of the CPU and add some more | 945 | local memory controller of the CPU and add some more |
| 953 | NUMA awareness to the kernel. | 946 | NUMA awareness to the kernel. |
| 954 | 947 | ||
| 955 | For i386 this is currently highly experimental and should be only | 948 | For 32-bit this is currently highly experimental and should be only |
| 956 | used for kernel development. It might also cause boot failures. | 949 | used for kernel development. It might also cause boot failures. |
| 957 | For x86_64 this is recommended on all multiprocessor Opteron systems. | 950 | For 64-bit this is recommended on all multiprocessor Opteron systems. |
| 958 | If the system is EM64T, you should say N unless your system is | 951 | If the system is EM64T, you should say N unless your system is |
| 959 | EM64T NUMA. | 952 | EM64T NUMA. |
| 960 | 953 | ||
| @@ -997,17 +990,10 @@ config NUMA_EMU | |||
| 997 | into virtual nodes when booted with "numa=fake=N", where N is the | 990 | into virtual nodes when booted with "numa=fake=N", where N is the |
| 998 | number of nodes. This is only useful for debugging. | 991 | number of nodes. This is only useful for debugging. |
| 999 | 992 | ||
| 1000 | if MAXSMP | ||
| 1001 | |||
| 1002 | config NODES_SHIFT | 993 | config NODES_SHIFT |
| 1003 | int | 994 | int "Maximum NUMA Nodes (as a power of 2)" if !MAXSMP |
| 1004 | default "9" | ||
| 1005 | endif | ||
| 1006 | |||
| 1007 | if !MAXSMP | ||
| 1008 | config NODES_SHIFT | ||
| 1009 | int "Maximum NUMA Nodes (as a power of 2)" | ||
| 1010 | range 1 9 if X86_64 | 995 | range 1 9 if X86_64 |
| 996 | default "9" if MAXSMP | ||
| 1011 | default "6" if X86_64 | 997 | default "6" if X86_64 |
| 1012 | default "4" if X86_NUMAQ | 998 | default "4" if X86_NUMAQ |
| 1013 | default "3" | 999 | default "3" |
| @@ -1015,7 +1001,6 @@ config NODES_SHIFT | |||
| 1015 | help | 1001 | help |
| 1016 | Specify the maximum number of NUMA Nodes available on the target | 1002 | Specify the maximum number of NUMA Nodes available on the target |
| 1017 | system. Increases memory reserved to accomodate various tables. | 1003 | system. Increases memory reserved to accomodate various tables. |
| 1018 | endif | ||
| 1019 | 1004 | ||
| 1020 | config HAVE_ARCH_BOOTMEM_NODE | 1005 | config HAVE_ARCH_BOOTMEM_NODE |
| 1021 | def_bool y | 1006 | def_bool y |
| @@ -1264,7 +1249,7 @@ config KEXEC | |||
| 1264 | strongly in flux, so no good recommendation can be made. | 1249 | strongly in flux, so no good recommendation can be made. |
| 1265 | 1250 | ||
| 1266 | config CRASH_DUMP | 1251 | config CRASH_DUMP |
| 1267 | bool "kernel crash dumps (EXPERIMENTAL)" | 1252 | bool "kernel crash dumps" |
| 1268 | depends on X86_64 || (X86_32 && HIGHMEM) | 1253 | depends on X86_64 || (X86_32 && HIGHMEM) |
| 1269 | help | 1254 | help |
| 1270 | Generate crash dump after being started by kexec. | 1255 | Generate crash dump after being started by kexec. |
diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h index a34b9982c7cb..cc0ef13fba7a 100644 --- a/arch/x86/boot/boot.h +++ b/arch/x86/boot/boot.h | |||
| @@ -24,10 +24,14 @@ | |||
| 24 | #include <linux/edd.h> | 24 | #include <linux/edd.h> |
| 25 | #include <asm/boot.h> | 25 | #include <asm/boot.h> |
| 26 | #include <asm/setup.h> | 26 | #include <asm/setup.h> |
| 27 | #include "bitops.h" | ||
| 28 | #include <asm/cpufeature.h> | ||
| 27 | 29 | ||
| 28 | /* Useful macros */ | 30 | /* Useful macros */ |
| 29 | #define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)])) | 31 | #define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)])) |
| 30 | 32 | ||
| 33 | #define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x))) | ||
| 34 | |||
| 31 | extern struct setup_header hdr; | 35 | extern struct setup_header hdr; |
| 32 | extern struct boot_params boot_params; | 36 | extern struct boot_params boot_params; |
| 33 | 37 | ||
| @@ -242,6 +246,12 @@ int cmdline_find_option(const char *option, char *buffer, int bufsize); | |||
| 242 | int cmdline_find_option_bool(const char *option); | 246 | int cmdline_find_option_bool(const char *option); |
| 243 | 247 | ||
| 244 | /* cpu.c, cpucheck.c */ | 248 | /* cpu.c, cpucheck.c */ |
| 249 | struct cpu_features { | ||
| 250 | int level; /* Family, or 64 for x86-64 */ | ||
| 251 | int model; | ||
| 252 | u32 flags[NCAPINTS]; | ||
| 253 | }; | ||
| 254 | extern struct cpu_features cpu; | ||
| 245 | int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr); | 255 | int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr); |
| 246 | int validate_cpu(void); | 256 | int validate_cpu(void); |
| 247 | 257 | ||
diff --git a/arch/x86/boot/cpu.c b/arch/x86/boot/cpu.c index 92d6fd73dc7d..75298fe2edca 100644 --- a/arch/x86/boot/cpu.c +++ b/arch/x86/boot/cpu.c | |||
| @@ -16,9 +16,6 @@ | |||
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include "boot.h" | 18 | #include "boot.h" |
| 19 | #include "bitops.h" | ||
| 20 | #include <asm/cpufeature.h> | ||
| 21 | |||
| 22 | #include "cpustr.h" | 19 | #include "cpustr.h" |
| 23 | 20 | ||
| 24 | static char *cpu_name(int level) | 21 | static char *cpu_name(int level) |
diff --git a/arch/x86/boot/cpucheck.c b/arch/x86/boot/cpucheck.c index 7804389ee005..4b9ae7c56748 100644 --- a/arch/x86/boot/cpucheck.c +++ b/arch/x86/boot/cpucheck.c | |||
| @@ -22,21 +22,13 @@ | |||
| 22 | 22 | ||
| 23 | #ifdef _SETUP | 23 | #ifdef _SETUP |
| 24 | # include "boot.h" | 24 | # include "boot.h" |
| 25 | # include "bitops.h" | ||
| 26 | #endif | 25 | #endif |
| 27 | #include <linux/types.h> | 26 | #include <linux/types.h> |
| 28 | #include <asm/cpufeature.h> | ||
| 29 | #include <asm/processor-flags.h> | 27 | #include <asm/processor-flags.h> |
| 30 | #include <asm/required-features.h> | 28 | #include <asm/required-features.h> |
| 31 | #include <asm/msr-index.h> | 29 | #include <asm/msr-index.h> |
| 32 | 30 | ||
| 33 | struct cpu_features { | 31 | struct cpu_features cpu; |
| 34 | int level; /* Family, or 64 for x86-64 */ | ||
| 35 | int model; | ||
| 36 | u32 flags[NCAPINTS]; | ||
| 37 | }; | ||
| 38 | |||
| 39 | static struct cpu_features cpu; | ||
| 40 | static u32 cpu_vendor[3]; | 32 | static u32 cpu_vendor[3]; |
| 41 | static u32 err_flags[NCAPINTS]; | 33 | static u32 err_flags[NCAPINTS]; |
| 42 | 34 | ||
diff --git a/arch/x86/boot/main.c b/arch/x86/boot/main.c index 2296164b54d2..197421db1af1 100644 --- a/arch/x86/boot/main.c +++ b/arch/x86/boot/main.c | |||
| @@ -73,6 +73,11 @@ static void keyboard_set_repeat(void) | |||
| 73 | */ | 73 | */ |
| 74 | static void query_ist(void) | 74 | static void query_ist(void) |
| 75 | { | 75 | { |
| 76 | /* Some older BIOSes apparently crash on this call, so filter | ||
| 77 | it from machines too old to have SpeedStep at all. */ | ||
| 78 | if (cpu.level < 6) | ||
| 79 | return; | ||
| 80 | |||
| 76 | asm("int $0x15" | 81 | asm("int $0x15" |
| 77 | : "=a" (boot_params.ist_info.signature), | 82 | : "=a" (boot_params.ist_info.signature), |
| 78 | "=b" (boot_params.ist_info.command), | 83 | "=b" (boot_params.ist_info.command), |
diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c index 53165c97336b..8c3c25f35578 100644 --- a/arch/x86/boot/memory.c +++ b/arch/x86/boot/memory.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include "boot.h" | 15 | #include "boot.h" |
| 16 | #include <linux/kernel.h> | ||
| 17 | 16 | ||
| 18 | #define SMAP 0x534d4150 /* ASCII "SMAP" */ | 17 | #define SMAP 0x534d4150 /* ASCII "SMAP" */ |
| 19 | 18 | ||
diff --git a/arch/x86/configs/i386_defconfig b/arch/x86/configs/i386_defconfig index 4d73f53287b6..104275e191a8 100644 --- a/arch/x86/configs/i386_defconfig +++ b/arch/x86/configs/i386_defconfig | |||
| @@ -1,13 +1,13 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.26-rc1 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Sun May 4 19:59:02 2008 | 4 | # Mon Aug 25 15:04:00 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_64BIT is not set | 6 | # CONFIG_64BIT is not set |
| 7 | CONFIG_X86_32=y | 7 | CONFIG_X86_32=y |
| 8 | # CONFIG_X86_64 is not set | 8 | # CONFIG_X86_64 is not set |
| 9 | CONFIG_X86=y | 9 | CONFIG_X86=y |
| 10 | CONFIG_DEFCONFIG_LIST="arch/x86/configs/i386_defconfig" | 10 | CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig" |
| 11 | # CONFIG_GENERIC_LOCKBREAK is not set | 11 | # CONFIG_GENERIC_LOCKBREAK is not set |
| 12 | CONFIG_GENERIC_TIME=y | 12 | CONFIG_GENERIC_TIME=y |
| 13 | CONFIG_GENERIC_CMOS_UPDATE=y | 13 | CONFIG_GENERIC_CMOS_UPDATE=y |
| @@ -53,6 +53,7 @@ CONFIG_X86_HT=y | |||
| 53 | CONFIG_X86_BIOS_REBOOT=y | 53 | CONFIG_X86_BIOS_REBOOT=y |
| 54 | CONFIG_X86_TRAMPOLINE=y | 54 | CONFIG_X86_TRAMPOLINE=y |
| 55 | CONFIG_KTIME_SCALAR=y | 55 | CONFIG_KTIME_SCALAR=y |
| 56 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
| 56 | 57 | ||
| 57 | # | 58 | # |
| 58 | # General setup | 59 | # General setup |
| @@ -82,6 +83,7 @@ CONFIG_CGROUPS=y | |||
| 82 | CONFIG_CGROUP_NS=y | 83 | CONFIG_CGROUP_NS=y |
| 83 | # CONFIG_CGROUP_DEVICE is not set | 84 | # CONFIG_CGROUP_DEVICE is not set |
| 84 | CONFIG_CPUSETS=y | 85 | CONFIG_CPUSETS=y |
| 86 | CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y | ||
| 85 | CONFIG_GROUP_SCHED=y | 87 | CONFIG_GROUP_SCHED=y |
| 86 | CONFIG_FAIR_GROUP_SCHED=y | 88 | CONFIG_FAIR_GROUP_SCHED=y |
| 87 | # CONFIG_RT_GROUP_SCHED is not set | 89 | # CONFIG_RT_GROUP_SCHED is not set |
| @@ -105,7 +107,6 @@ CONFIG_SYSCTL=y | |||
| 105 | # CONFIG_EMBEDDED is not set | 107 | # CONFIG_EMBEDDED is not set |
| 106 | CONFIG_UID16=y | 108 | CONFIG_UID16=y |
| 107 | CONFIG_SYSCTL_SYSCALL=y | 109 | CONFIG_SYSCTL_SYSCALL=y |
| 108 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 109 | CONFIG_KALLSYMS=y | 110 | CONFIG_KALLSYMS=y |
| 110 | CONFIG_KALLSYMS_ALL=y | 111 | CONFIG_KALLSYMS_ALL=y |
| 111 | CONFIG_KALLSYMS_EXTRA_PASS=y | 112 | CONFIG_KALLSYMS_EXTRA_PASS=y |
| @@ -113,6 +114,7 @@ CONFIG_HOTPLUG=y | |||
| 113 | CONFIG_PRINTK=y | 114 | CONFIG_PRINTK=y |
| 114 | CONFIG_BUG=y | 115 | CONFIG_BUG=y |
| 115 | CONFIG_ELF_CORE=y | 116 | CONFIG_ELF_CORE=y |
| 117 | CONFIG_PCSPKR_PLATFORM=y | ||
| 116 | # CONFIG_COMPAT_BRK is not set | 118 | # CONFIG_COMPAT_BRK is not set |
| 117 | CONFIG_BASE_FULL=y | 119 | CONFIG_BASE_FULL=y |
| 118 | CONFIG_FUTEX=y | 120 | CONFIG_FUTEX=y |
| @@ -132,27 +134,35 @@ CONFIG_MARKERS=y | |||
| 132 | # CONFIG_OPROFILE is not set | 134 | # CONFIG_OPROFILE is not set |
| 133 | CONFIG_HAVE_OPROFILE=y | 135 | CONFIG_HAVE_OPROFILE=y |
| 134 | CONFIG_KPROBES=y | 136 | CONFIG_KPROBES=y |
| 137 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 135 | CONFIG_KRETPROBES=y | 138 | CONFIG_KRETPROBES=y |
| 139 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 136 | CONFIG_HAVE_KPROBES=y | 140 | CONFIG_HAVE_KPROBES=y |
| 137 | CONFIG_HAVE_KRETPROBES=y | 141 | CONFIG_HAVE_KRETPROBES=y |
| 142 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
| 138 | # CONFIG_HAVE_DMA_ATTRS is not set | 143 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 144 | CONFIG_USE_GENERIC_SMP_HELPERS=y | ||
| 145 | # CONFIG_HAVE_CLK is not set | ||
| 139 | CONFIG_PROC_PAGE_MONITOR=y | 146 | CONFIG_PROC_PAGE_MONITOR=y |
| 147 | CONFIG_HAVE_GENERIC_DMA_COHERENT=y | ||
| 140 | CONFIG_SLABINFO=y | 148 | CONFIG_SLABINFO=y |
| 141 | CONFIG_RT_MUTEXES=y | 149 | CONFIG_RT_MUTEXES=y |
| 142 | # CONFIG_TINY_SHMEM is not set | 150 | # CONFIG_TINY_SHMEM is not set |
| 143 | CONFIG_BASE_SMALL=0 | 151 | CONFIG_BASE_SMALL=0 |
| 144 | CONFIG_MODULES=y | 152 | CONFIG_MODULES=y |
| 153 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 145 | CONFIG_MODULE_UNLOAD=y | 154 | CONFIG_MODULE_UNLOAD=y |
| 146 | CONFIG_MODULE_FORCE_UNLOAD=y | 155 | CONFIG_MODULE_FORCE_UNLOAD=y |
| 147 | # CONFIG_MODVERSIONS is not set | 156 | # CONFIG_MODVERSIONS is not set |
| 148 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 157 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 149 | # CONFIG_KMOD is not set | 158 | CONFIG_KMOD=y |
| 150 | CONFIG_STOP_MACHINE=y | 159 | CONFIG_STOP_MACHINE=y |
| 151 | CONFIG_BLOCK=y | 160 | CONFIG_BLOCK=y |
| 152 | # CONFIG_LBD is not set | 161 | # CONFIG_LBD is not set |
| 153 | CONFIG_BLK_DEV_IO_TRACE=y | 162 | CONFIG_BLK_DEV_IO_TRACE=y |
| 154 | # CONFIG_LSF is not set | 163 | # CONFIG_LSF is not set |
| 155 | CONFIG_BLK_DEV_BSG=y | 164 | CONFIG_BLK_DEV_BSG=y |
| 165 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 156 | 166 | ||
| 157 | # | 167 | # |
| 158 | # IO Schedulers | 168 | # IO Schedulers |
| @@ -176,19 +186,17 @@ CONFIG_NO_HZ=y | |||
| 176 | CONFIG_HIGH_RES_TIMERS=y | 186 | CONFIG_HIGH_RES_TIMERS=y |
| 177 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | 187 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y |
| 178 | CONFIG_SMP=y | 188 | CONFIG_SMP=y |
| 189 | CONFIG_X86_FIND_SMP_CONFIG=y | ||
| 190 | CONFIG_X86_MPPARSE=y | ||
| 179 | CONFIG_X86_PC=y | 191 | CONFIG_X86_PC=y |
| 180 | # CONFIG_X86_ELAN is not set | 192 | # CONFIG_X86_ELAN is not set |
| 181 | # CONFIG_X86_VOYAGER is not set | 193 | # CONFIG_X86_VOYAGER is not set |
| 182 | # CONFIG_X86_NUMAQ is not set | ||
| 183 | # CONFIG_X86_SUMMIT is not set | ||
| 184 | # CONFIG_X86_BIGSMP is not set | ||
| 185 | # CONFIG_X86_VISWS is not set | ||
| 186 | # CONFIG_X86_GENERICARCH is not set | 194 | # CONFIG_X86_GENERICARCH is not set |
| 187 | # CONFIG_X86_ES7000 is not set | ||
| 188 | # CONFIG_X86_RDC321X is not set | ||
| 189 | # CONFIG_X86_VSMP is not set | 195 | # CONFIG_X86_VSMP is not set |
| 196 | # CONFIG_X86_RDC321X is not set | ||
| 190 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 197 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 191 | # CONFIG_PARAVIRT_GUEST is not set | 198 | # CONFIG_PARAVIRT_GUEST is not set |
| 199 | # CONFIG_MEMTEST is not set | ||
| 192 | # CONFIG_M386 is not set | 200 | # CONFIG_M386 is not set |
| 193 | # CONFIG_M486 is not set | 201 | # CONFIG_M486 is not set |
| 194 | # CONFIG_M586 is not set | 202 | # CONFIG_M586 is not set |
| @@ -215,21 +223,19 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | |||
| 215 | # CONFIG_MPSC is not set | 223 | # CONFIG_MPSC is not set |
| 216 | CONFIG_MCORE2=y | 224 | CONFIG_MCORE2=y |
| 217 | # CONFIG_GENERIC_CPU is not set | 225 | # CONFIG_GENERIC_CPU is not set |
| 218 | # CONFIG_X86_GENERIC is not set | 226 | CONFIG_X86_GENERIC=y |
| 219 | CONFIG_X86_CPU=y | 227 | CONFIG_X86_CPU=y |
| 220 | CONFIG_X86_CMPXCHG=y | 228 | CONFIG_X86_CMPXCHG=y |
| 221 | CONFIG_X86_L1_CACHE_SHIFT=6 | 229 | CONFIG_X86_L1_CACHE_SHIFT=7 |
| 222 | CONFIG_X86_XADD=y | 230 | CONFIG_X86_XADD=y |
| 223 | CONFIG_X86_WP_WORKS_OK=y | 231 | CONFIG_X86_WP_WORKS_OK=y |
| 224 | CONFIG_X86_INVLPG=y | 232 | CONFIG_X86_INVLPG=y |
| 225 | CONFIG_X86_BSWAP=y | 233 | CONFIG_X86_BSWAP=y |
| 226 | CONFIG_X86_POPAD_OK=y | 234 | CONFIG_X86_POPAD_OK=y |
| 227 | CONFIG_X86_GOOD_APIC=y | ||
| 228 | CONFIG_X86_INTEL_USERCOPY=y | 235 | CONFIG_X86_INTEL_USERCOPY=y |
| 229 | CONFIG_X86_USE_PPRO_CHECKSUM=y | 236 | CONFIG_X86_USE_PPRO_CHECKSUM=y |
| 230 | CONFIG_X86_P6_NOP=y | ||
| 231 | CONFIG_X86_TSC=y | 237 | CONFIG_X86_TSC=y |
| 232 | CONFIG_X86_MINIMUM_CPU_FAMILY=6 | 238 | CONFIG_X86_MINIMUM_CPU_FAMILY=4 |
| 233 | CONFIG_X86_DEBUGCTLMSR=y | 239 | CONFIG_X86_DEBUGCTLMSR=y |
| 234 | CONFIG_HPET_TIMER=y | 240 | CONFIG_HPET_TIMER=y |
| 235 | CONFIG_HPET_EMULATE_RTC=y | 241 | CONFIG_HPET_EMULATE_RTC=y |
| @@ -247,7 +253,7 @@ CONFIG_X86_IO_APIC=y | |||
| 247 | CONFIG_VM86=y | 253 | CONFIG_VM86=y |
| 248 | # CONFIG_TOSHIBA is not set | 254 | # CONFIG_TOSHIBA is not set |
| 249 | # CONFIG_I8K is not set | 255 | # CONFIG_I8K is not set |
| 250 | # CONFIG_X86_REBOOTFIXUPS is not set | 256 | CONFIG_X86_REBOOTFIXUPS=y |
| 251 | # CONFIG_MICROCODE is not set | 257 | # CONFIG_MICROCODE is not set |
| 252 | CONFIG_X86_MSR=y | 258 | CONFIG_X86_MSR=y |
| 253 | CONFIG_X86_CPUID=y | 259 | CONFIG_X86_CPUID=y |
| @@ -256,32 +262,28 @@ CONFIG_HIGHMEM4G=y | |||
| 256 | # CONFIG_HIGHMEM64G is not set | 262 | # CONFIG_HIGHMEM64G is not set |
| 257 | CONFIG_PAGE_OFFSET=0xC0000000 | 263 | CONFIG_PAGE_OFFSET=0xC0000000 |
| 258 | CONFIG_HIGHMEM=y | 264 | CONFIG_HIGHMEM=y |
| 259 | CONFIG_NEED_NODE_MEMMAP_SIZE=y | ||
| 260 | CONFIG_ARCH_FLATMEM_ENABLE=y | 265 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 261 | CONFIG_ARCH_SPARSEMEM_ENABLE=y | 266 | CONFIG_ARCH_SPARSEMEM_ENABLE=y |
| 262 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y | 267 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y |
| 263 | CONFIG_SELECT_MEMORY_MODEL=y | 268 | CONFIG_SELECT_MEMORY_MODEL=y |
| 264 | # CONFIG_FLATMEM_MANUAL is not set | 269 | CONFIG_FLATMEM_MANUAL=y |
| 265 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 270 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| 266 | CONFIG_SPARSEMEM_MANUAL=y | 271 | # CONFIG_SPARSEMEM_MANUAL is not set |
| 267 | CONFIG_SPARSEMEM=y | 272 | CONFIG_FLATMEM=y |
| 268 | CONFIG_HAVE_MEMORY_PRESENT=y | 273 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 269 | CONFIG_SPARSEMEM_STATIC=y | 274 | CONFIG_SPARSEMEM_STATIC=y |
| 270 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 275 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 271 | |||
| 272 | # | ||
| 273 | # Memory hotplug is currently incompatible with Software Suspend | ||
| 274 | # | ||
| 275 | CONFIG_PAGEFLAGS_EXTENDED=y | 276 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 276 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 277 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 277 | CONFIG_RESOURCES_64BIT=y | 278 | CONFIG_RESOURCES_64BIT=y |
| 278 | CONFIG_ZONE_DMA_FLAG=1 | 279 | CONFIG_ZONE_DMA_FLAG=1 |
| 279 | CONFIG_BOUNCE=y | 280 | CONFIG_BOUNCE=y |
| 280 | CONFIG_VIRT_TO_BUS=y | 281 | CONFIG_VIRT_TO_BUS=y |
| 281 | # CONFIG_HIGHPTE is not set | 282 | CONFIG_HIGHPTE=y |
| 282 | # CONFIG_MATH_EMULATION is not set | 283 | # CONFIG_MATH_EMULATION is not set |
| 283 | CONFIG_MTRR=y | 284 | CONFIG_MTRR=y |
| 284 | # CONFIG_X86_PAT is not set | 285 | # CONFIG_MTRR_SANITIZER is not set |
| 286 | CONFIG_X86_PAT=y | ||
| 285 | CONFIG_EFI=y | 287 | CONFIG_EFI=y |
| 286 | # CONFIG_IRQBALANCE is not set | 288 | # CONFIG_IRQBALANCE is not set |
| 287 | CONFIG_SECCOMP=y | 289 | CONFIG_SECCOMP=y |
| @@ -293,6 +295,7 @@ CONFIG_HZ=1000 | |||
| 293 | CONFIG_SCHED_HRTICK=y | 295 | CONFIG_SCHED_HRTICK=y |
| 294 | CONFIG_KEXEC=y | 296 | CONFIG_KEXEC=y |
| 295 | CONFIG_CRASH_DUMP=y | 297 | CONFIG_CRASH_DUMP=y |
| 298 | # CONFIG_KEXEC_JUMP is not set | ||
| 296 | CONFIG_PHYSICAL_START=0x1000000 | 299 | CONFIG_PHYSICAL_START=0x1000000 |
| 297 | CONFIG_RELOCATABLE=y | 300 | CONFIG_RELOCATABLE=y |
| 298 | CONFIG_PHYSICAL_ALIGN=0x200000 | 301 | CONFIG_PHYSICAL_ALIGN=0x200000 |
| @@ -312,6 +315,7 @@ CONFIG_PM_TRACE_RTC=y | |||
| 312 | CONFIG_PM_SLEEP_SMP=y | 315 | CONFIG_PM_SLEEP_SMP=y |
| 313 | CONFIG_PM_SLEEP=y | 316 | CONFIG_PM_SLEEP=y |
| 314 | CONFIG_SUSPEND=y | 317 | CONFIG_SUSPEND=y |
| 318 | # CONFIG_PM_TEST_SUSPEND is not set | ||
| 315 | CONFIG_SUSPEND_FREEZER=y | 319 | CONFIG_SUSPEND_FREEZER=y |
| 316 | CONFIG_HIBERNATION=y | 320 | CONFIG_HIBERNATION=y |
| 317 | CONFIG_PM_STD_PARTITION="" | 321 | CONFIG_PM_STD_PARTITION="" |
| @@ -337,6 +341,7 @@ CONFIG_ACPI_THERMAL=y | |||
| 337 | CONFIG_ACPI_BLACKLIST_YEAR=0 | 341 | CONFIG_ACPI_BLACKLIST_YEAR=0 |
| 338 | # CONFIG_ACPI_DEBUG is not set | 342 | # CONFIG_ACPI_DEBUG is not set |
| 339 | CONFIG_ACPI_EC=y | 343 | CONFIG_ACPI_EC=y |
| 344 | # CONFIG_ACPI_PCI_SLOT is not set | ||
| 340 | CONFIG_ACPI_POWER=y | 345 | CONFIG_ACPI_POWER=y |
| 341 | CONFIG_ACPI_SYSTEM=y | 346 | CONFIG_ACPI_SYSTEM=y |
| 342 | CONFIG_X86_PM_TIMER=y | 347 | CONFIG_X86_PM_TIMER=y |
| @@ -395,8 +400,8 @@ CONFIG_PCI=y | |||
| 395 | # CONFIG_PCI_GOBIOS is not set | 400 | # CONFIG_PCI_GOBIOS is not set |
| 396 | # CONFIG_PCI_GOMMCONFIG is not set | 401 | # CONFIG_PCI_GOMMCONFIG is not set |
| 397 | # CONFIG_PCI_GODIRECT is not set | 402 | # CONFIG_PCI_GODIRECT is not set |
| 398 | CONFIG_PCI_GOANY=y | ||
| 399 | # CONFIG_PCI_GOOLPC is not set | 403 | # CONFIG_PCI_GOOLPC is not set |
| 404 | CONFIG_PCI_GOANY=y | ||
| 400 | CONFIG_PCI_BIOS=y | 405 | CONFIG_PCI_BIOS=y |
| 401 | CONFIG_PCI_DIRECT=y | 406 | CONFIG_PCI_DIRECT=y |
| 402 | CONFIG_PCI_MMCONFIG=y | 407 | CONFIG_PCI_MMCONFIG=y |
| @@ -448,10 +453,6 @@ CONFIG_HOTPLUG_PCI=y | |||
| 448 | CONFIG_BINFMT_ELF=y | 453 | CONFIG_BINFMT_ELF=y |
| 449 | # CONFIG_BINFMT_AOUT is not set | 454 | # CONFIG_BINFMT_AOUT is not set |
| 450 | CONFIG_BINFMT_MISC=y | 455 | CONFIG_BINFMT_MISC=y |
| 451 | |||
| 452 | # | ||
| 453 | # Networking | ||
| 454 | # | ||
| 455 | CONFIG_NET=y | 456 | CONFIG_NET=y |
| 456 | 457 | ||
| 457 | # | 458 | # |
| @@ -475,7 +476,10 @@ CONFIG_IP_FIB_HASH=y | |||
| 475 | CONFIG_IP_MULTIPLE_TABLES=y | 476 | CONFIG_IP_MULTIPLE_TABLES=y |
| 476 | CONFIG_IP_ROUTE_MULTIPATH=y | 477 | CONFIG_IP_ROUTE_MULTIPATH=y |
| 477 | CONFIG_IP_ROUTE_VERBOSE=y | 478 | CONFIG_IP_ROUTE_VERBOSE=y |
| 478 | # CONFIG_IP_PNP is not set | 479 | CONFIG_IP_PNP=y |
| 480 | CONFIG_IP_PNP_DHCP=y | ||
| 481 | CONFIG_IP_PNP_BOOTP=y | ||
| 482 | CONFIG_IP_PNP_RARP=y | ||
| 479 | # CONFIG_NET_IPIP is not set | 483 | # CONFIG_NET_IPIP is not set |
| 480 | # CONFIG_NET_IPGRE is not set | 484 | # CONFIG_NET_IPGRE is not set |
| 481 | CONFIG_IP_MROUTE=y | 485 | CONFIG_IP_MROUTE=y |
| @@ -618,7 +622,6 @@ CONFIG_NET_SCHED=y | |||
| 618 | # CONFIG_NET_SCH_HTB is not set | 622 | # CONFIG_NET_SCH_HTB is not set |
| 619 | # CONFIG_NET_SCH_HFSC is not set | 623 | # CONFIG_NET_SCH_HFSC is not set |
| 620 | # CONFIG_NET_SCH_PRIO is not set | 624 | # CONFIG_NET_SCH_PRIO is not set |
| 621 | # CONFIG_NET_SCH_RR is not set | ||
| 622 | # CONFIG_NET_SCH_RED is not set | 625 | # CONFIG_NET_SCH_RED is not set |
| 623 | # CONFIG_NET_SCH_SFQ is not set | 626 | # CONFIG_NET_SCH_SFQ is not set |
| 624 | # CONFIG_NET_SCH_TEQL is not set | 627 | # CONFIG_NET_SCH_TEQL is not set |
| @@ -680,28 +683,19 @@ CONFIG_FIB_RULES=y | |||
| 680 | CONFIG_CFG80211=y | 683 | CONFIG_CFG80211=y |
| 681 | CONFIG_NL80211=y | 684 | CONFIG_NL80211=y |
| 682 | CONFIG_WIRELESS_EXT=y | 685 | CONFIG_WIRELESS_EXT=y |
| 686 | CONFIG_WIRELESS_EXT_SYSFS=y | ||
| 683 | CONFIG_MAC80211=y | 687 | CONFIG_MAC80211=y |
| 684 | 688 | ||
| 685 | # | 689 | # |
| 686 | # Rate control algorithm selection | 690 | # Rate control algorithm selection |
| 687 | # | 691 | # |
| 692 | CONFIG_MAC80211_RC_PID=y | ||
| 688 | CONFIG_MAC80211_RC_DEFAULT_PID=y | 693 | CONFIG_MAC80211_RC_DEFAULT_PID=y |
| 689 | # CONFIG_MAC80211_RC_DEFAULT_NONE is not set | ||
| 690 | |||
| 691 | # | ||
| 692 | # Selecting 'y' for an algorithm will | ||
| 693 | # | ||
| 694 | |||
| 695 | # | ||
| 696 | # build the algorithm into mac80211. | ||
| 697 | # | ||
| 698 | CONFIG_MAC80211_RC_DEFAULT="pid" | 694 | CONFIG_MAC80211_RC_DEFAULT="pid" |
| 699 | CONFIG_MAC80211_RC_PID=y | ||
| 700 | # CONFIG_MAC80211_MESH is not set | 695 | # CONFIG_MAC80211_MESH is not set |
| 701 | CONFIG_MAC80211_LEDS=y | 696 | CONFIG_MAC80211_LEDS=y |
| 702 | # CONFIG_MAC80211_DEBUGFS is not set | 697 | # CONFIG_MAC80211_DEBUGFS is not set |
| 703 | # CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set | 698 | # CONFIG_MAC80211_DEBUG_MENU is not set |
| 704 | # CONFIG_MAC80211_DEBUG is not set | ||
| 705 | # CONFIG_IEEE80211 is not set | 699 | # CONFIG_IEEE80211 is not set |
| 706 | # CONFIG_RFKILL is not set | 700 | # CONFIG_RFKILL is not set |
| 707 | # CONFIG_NET_9P is not set | 701 | # CONFIG_NET_9P is not set |
| @@ -717,6 +711,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | |||
| 717 | CONFIG_STANDALONE=y | 711 | CONFIG_STANDALONE=y |
| 718 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 712 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 719 | CONFIG_FW_LOADER=y | 713 | CONFIG_FW_LOADER=y |
| 714 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
| 715 | CONFIG_EXTRA_FIRMWARE="" | ||
| 720 | # CONFIG_DEBUG_DRIVER is not set | 716 | # CONFIG_DEBUG_DRIVER is not set |
| 721 | CONFIG_DEBUG_DEVRES=y | 717 | CONFIG_DEBUG_DEVRES=y |
| 722 | # CONFIG_SYS_HYPERVISOR is not set | 718 | # CONFIG_SYS_HYPERVISOR is not set |
| @@ -749,6 +745,7 @@ CONFIG_BLK_DEV_RAM_SIZE=16384 | |||
| 749 | # CONFIG_BLK_DEV_XIP is not set | 745 | # CONFIG_BLK_DEV_XIP is not set |
| 750 | # CONFIG_CDROM_PKTCDVD is not set | 746 | # CONFIG_CDROM_PKTCDVD is not set |
| 751 | # CONFIG_ATA_OVER_ETH is not set | 747 | # CONFIG_ATA_OVER_ETH is not set |
| 748 | # CONFIG_BLK_DEV_HD is not set | ||
| 752 | CONFIG_MISC_DEVICES=y | 749 | CONFIG_MISC_DEVICES=y |
| 753 | # CONFIG_IBM_ASM is not set | 750 | # CONFIG_IBM_ASM is not set |
| 754 | # CONFIG_PHANTOM is not set | 751 | # CONFIG_PHANTOM is not set |
| @@ -760,10 +757,12 @@ CONFIG_MISC_DEVICES=y | |||
| 760 | # CONFIG_FUJITSU_LAPTOP is not set | 757 | # CONFIG_FUJITSU_LAPTOP is not set |
| 761 | # CONFIG_TC1100_WMI is not set | 758 | # CONFIG_TC1100_WMI is not set |
| 762 | # CONFIG_MSI_LAPTOP is not set | 759 | # CONFIG_MSI_LAPTOP is not set |
| 760 | # CONFIG_COMPAL_LAPTOP is not set | ||
| 763 | # CONFIG_SONY_LAPTOP is not set | 761 | # CONFIG_SONY_LAPTOP is not set |
| 764 | # CONFIG_THINKPAD_ACPI is not set | 762 | # CONFIG_THINKPAD_ACPI is not set |
| 765 | # CONFIG_INTEL_MENLOW is not set | 763 | # CONFIG_INTEL_MENLOW is not set |
| 766 | # CONFIG_ENCLOSURE_SERVICES is not set | 764 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 765 | # CONFIG_HP_ILO is not set | ||
| 767 | CONFIG_HAVE_IDE=y | 766 | CONFIG_HAVE_IDE=y |
| 768 | # CONFIG_IDE is not set | 767 | # CONFIG_IDE is not set |
| 769 | 768 | ||
| @@ -802,12 +801,13 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 802 | # | 801 | # |
| 803 | CONFIG_SCSI_SPI_ATTRS=y | 802 | CONFIG_SCSI_SPI_ATTRS=y |
| 804 | # CONFIG_SCSI_FC_ATTRS is not set | 803 | # CONFIG_SCSI_FC_ATTRS is not set |
| 805 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 804 | CONFIG_SCSI_ISCSI_ATTRS=y |
| 806 | # CONFIG_SCSI_SAS_ATTRS is not set | 805 | # CONFIG_SCSI_SAS_ATTRS is not set |
| 807 | # CONFIG_SCSI_SAS_LIBSAS is not set | 806 | # CONFIG_SCSI_SAS_LIBSAS is not set |
| 808 | # CONFIG_SCSI_SRP_ATTRS is not set | 807 | # CONFIG_SCSI_SRP_ATTRS is not set |
| 809 | # CONFIG_SCSI_LOWLEVEL is not set | 808 | # CONFIG_SCSI_LOWLEVEL is not set |
| 810 | # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set | 809 | # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set |
| 810 | # CONFIG_SCSI_DH is not set | ||
| 811 | CONFIG_ATA=y | 811 | CONFIG_ATA=y |
| 812 | # CONFIG_ATA_NONSTANDARD is not set | 812 | # CONFIG_ATA_NONSTANDARD is not set |
| 813 | CONFIG_ATA_ACPI=y | 813 | CONFIG_ATA_ACPI=y |
| @@ -842,7 +842,7 @@ CONFIG_PATA_AMD=y | |||
| 842 | # CONFIG_PATA_CS5536 is not set | 842 | # CONFIG_PATA_CS5536 is not set |
| 843 | # CONFIG_PATA_CYPRESS is not set | 843 | # CONFIG_PATA_CYPRESS is not set |
| 844 | # CONFIG_PATA_EFAR is not set | 844 | # CONFIG_PATA_EFAR is not set |
| 845 | # CONFIG_ATA_GENERIC is not set | 845 | CONFIG_ATA_GENERIC=y |
| 846 | # CONFIG_PATA_HPT366 is not set | 846 | # CONFIG_PATA_HPT366 is not set |
| 847 | # CONFIG_PATA_HPT37X is not set | 847 | # CONFIG_PATA_HPT37X is not set |
| 848 | # CONFIG_PATA_HPT3X2N is not set | 848 | # CONFIG_PATA_HPT3X2N is not set |
| @@ -852,7 +852,7 @@ CONFIG_PATA_AMD=y | |||
| 852 | # CONFIG_PATA_JMICRON is not set | 852 | # CONFIG_PATA_JMICRON is not set |
| 853 | # CONFIG_PATA_TRIFLEX is not set | 853 | # CONFIG_PATA_TRIFLEX is not set |
| 854 | # CONFIG_PATA_MARVELL is not set | 854 | # CONFIG_PATA_MARVELL is not set |
| 855 | # CONFIG_PATA_MPIIX is not set | 855 | CONFIG_PATA_MPIIX=y |
| 856 | CONFIG_PATA_OLDPIIX=y | 856 | CONFIG_PATA_OLDPIIX=y |
| 857 | # CONFIG_PATA_NETCELL is not set | 857 | # CONFIG_PATA_NETCELL is not set |
| 858 | # CONFIG_PATA_NINJA32 is not set | 858 | # CONFIG_PATA_NINJA32 is not set |
| @@ -871,6 +871,7 @@ CONFIG_PATA_OLDPIIX=y | |||
| 871 | # CONFIG_PATA_SIS is not set | 871 | # CONFIG_PATA_SIS is not set |
| 872 | # CONFIG_PATA_VIA is not set | 872 | # CONFIG_PATA_VIA is not set |
| 873 | # CONFIG_PATA_WINBOND is not set | 873 | # CONFIG_PATA_WINBOND is not set |
| 874 | CONFIG_PATA_SCH=y | ||
| 874 | CONFIG_MD=y | 875 | CONFIG_MD=y |
| 875 | CONFIG_BLK_DEV_MD=y | 876 | CONFIG_BLK_DEV_MD=y |
| 876 | # CONFIG_MD_LINEAR is not set | 877 | # CONFIG_MD_LINEAR is not set |
| @@ -894,13 +895,16 @@ CONFIG_DM_ZERO=y | |||
| 894 | # | 895 | # |
| 895 | # IEEE 1394 (FireWire) support | 896 | # IEEE 1394 (FireWire) support |
| 896 | # | 897 | # |
| 898 | |||
| 899 | # | ||
| 900 | # Enable only one of the two stacks, unless you know what you are doing | ||
| 901 | # | ||
| 897 | # CONFIG_FIREWIRE is not set | 902 | # CONFIG_FIREWIRE is not set |
| 898 | # CONFIG_IEEE1394 is not set | 903 | # CONFIG_IEEE1394 is not set |
| 899 | # CONFIG_I2O is not set | 904 | # CONFIG_I2O is not set |
| 900 | CONFIG_MACINTOSH_DRIVERS=y | 905 | CONFIG_MACINTOSH_DRIVERS=y |
| 901 | CONFIG_MAC_EMUMOUSEBTN=y | 906 | CONFIG_MAC_EMUMOUSEBTN=y |
| 902 | CONFIG_NETDEVICES=y | 907 | CONFIG_NETDEVICES=y |
| 903 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 904 | # CONFIG_IFB is not set | 908 | # CONFIG_IFB is not set |
| 905 | # CONFIG_DUMMY is not set | 909 | # CONFIG_DUMMY is not set |
| 906 | # CONFIG_BONDING is not set | 910 | # CONFIG_BONDING is not set |
| @@ -910,7 +914,23 @@ CONFIG_NETDEVICES=y | |||
| 910 | # CONFIG_VETH is not set | 914 | # CONFIG_VETH is not set |
| 911 | # CONFIG_NET_SB1000 is not set | 915 | # CONFIG_NET_SB1000 is not set |
| 912 | # CONFIG_ARCNET is not set | 916 | # CONFIG_ARCNET is not set |
| 913 | # CONFIG_PHYLIB is not set | 917 | CONFIG_PHYLIB=y |
| 918 | |||
| 919 | # | ||
| 920 | # MII PHY device drivers | ||
| 921 | # | ||
| 922 | # CONFIG_MARVELL_PHY is not set | ||
| 923 | # CONFIG_DAVICOM_PHY is not set | ||
| 924 | # CONFIG_QSEMI_PHY is not set | ||
| 925 | # CONFIG_LXT_PHY is not set | ||
| 926 | # CONFIG_CICADA_PHY is not set | ||
| 927 | # CONFIG_VITESSE_PHY is not set | ||
| 928 | # CONFIG_SMSC_PHY is not set | ||
| 929 | # CONFIG_BROADCOM_PHY is not set | ||
| 930 | # CONFIG_ICPLUS_PHY is not set | ||
| 931 | # CONFIG_REALTEK_PHY is not set | ||
| 932 | # CONFIG_FIXED_PHY is not set | ||
| 933 | # CONFIG_MDIO_BITBANG is not set | ||
| 914 | CONFIG_NET_ETHERNET=y | 934 | CONFIG_NET_ETHERNET=y |
| 915 | CONFIG_MII=y | 935 | CONFIG_MII=y |
| 916 | # CONFIG_HAPPYMEAL is not set | 936 | # CONFIG_HAPPYMEAL is not set |
| @@ -943,10 +963,10 @@ CONFIG_FORCEDETH=y | |||
| 943 | CONFIG_E100=y | 963 | CONFIG_E100=y |
| 944 | # CONFIG_FEALNX is not set | 964 | # CONFIG_FEALNX is not set |
| 945 | # CONFIG_NATSEMI is not set | 965 | # CONFIG_NATSEMI is not set |
| 946 | # CONFIG_NE2K_PCI is not set | 966 | CONFIG_NE2K_PCI=y |
| 947 | # CONFIG_8139CP is not set | 967 | # CONFIG_8139CP is not set |
| 948 | CONFIG_8139TOO=y | 968 | CONFIG_8139TOO=y |
| 949 | CONFIG_8139TOO_PIO=y | 969 | # CONFIG_8139TOO_PIO is not set |
| 950 | # CONFIG_8139TOO_TUNE_TWISTER is not set | 970 | # CONFIG_8139TOO_TUNE_TWISTER is not set |
| 951 | # CONFIG_8139TOO_8129 is not set | 971 | # CONFIG_8139TOO_8129 is not set |
| 952 | # CONFIG_8139_OLD_RX_RESET is not set | 972 | # CONFIG_8139_OLD_RX_RESET is not set |
| @@ -961,25 +981,24 @@ CONFIG_NETDEV_1000=y | |||
| 961 | # CONFIG_ACENIC is not set | 981 | # CONFIG_ACENIC is not set |
| 962 | # CONFIG_DL2K is not set | 982 | # CONFIG_DL2K is not set |
| 963 | CONFIG_E1000=y | 983 | CONFIG_E1000=y |
| 964 | # CONFIG_E1000_NAPI is not set | ||
| 965 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | 984 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set |
| 966 | # CONFIG_E1000E is not set | 985 | CONFIG_E1000E=y |
| 967 | # CONFIG_E1000E_ENABLED is not set | ||
| 968 | # CONFIG_IP1000 is not set | 986 | # CONFIG_IP1000 is not set |
| 969 | # CONFIG_IGB is not set | 987 | # CONFIG_IGB is not set |
| 970 | # CONFIG_NS83820 is not set | 988 | # CONFIG_NS83820 is not set |
| 971 | # CONFIG_HAMACHI is not set | 989 | # CONFIG_HAMACHI is not set |
| 972 | # CONFIG_YELLOWFIN is not set | 990 | # CONFIG_YELLOWFIN is not set |
| 973 | # CONFIG_R8169 is not set | 991 | CONFIG_R8169=y |
| 974 | # CONFIG_SIS190 is not set | 992 | # CONFIG_SIS190 is not set |
| 975 | # CONFIG_SKGE is not set | 993 | # CONFIG_SKGE is not set |
| 976 | CONFIG_SKY2=y | 994 | CONFIG_SKY2=y |
| 977 | # CONFIG_SKY2_DEBUG is not set | 995 | # CONFIG_SKY2_DEBUG is not set |
| 978 | # CONFIG_VIA_VELOCITY is not set | 996 | # CONFIG_VIA_VELOCITY is not set |
| 979 | CONFIG_TIGON3=y | 997 | CONFIG_TIGON3=y |
| 980 | # CONFIG_BNX2 is not set | 998 | CONFIG_BNX2=y |
| 981 | # CONFIG_QLA3XXX is not set | 999 | # CONFIG_QLA3XXX is not set |
| 982 | # CONFIG_ATL1 is not set | 1000 | # CONFIG_ATL1 is not set |
| 1001 | # CONFIG_ATL1E is not set | ||
| 983 | CONFIG_NETDEV_10000=y | 1002 | CONFIG_NETDEV_10000=y |
| 984 | # CONFIG_CHELSIO_T1 is not set | 1003 | # CONFIG_CHELSIO_T1 is not set |
| 985 | # CONFIG_CHELSIO_T3 is not set | 1004 | # CONFIG_CHELSIO_T3 is not set |
| @@ -1019,13 +1038,14 @@ CONFIG_WLAN_80211=y | |||
| 1019 | # CONFIG_RTL8180 is not set | 1038 | # CONFIG_RTL8180 is not set |
| 1020 | # CONFIG_RTL8187 is not set | 1039 | # CONFIG_RTL8187 is not set |
| 1021 | # CONFIG_ADM8211 is not set | 1040 | # CONFIG_ADM8211 is not set |
| 1041 | # CONFIG_MAC80211_HWSIM is not set | ||
| 1022 | # CONFIG_P54_COMMON is not set | 1042 | # CONFIG_P54_COMMON is not set |
| 1023 | CONFIG_ATH5K=y | 1043 | CONFIG_ATH5K=y |
| 1024 | # CONFIG_ATH5K_DEBUG is not set | 1044 | # CONFIG_ATH5K_DEBUG is not set |
| 1025 | # CONFIG_IWLWIFI is not set | 1045 | # CONFIG_ATH9K is not set |
| 1026 | # CONFIG_IWLCORE is not set | 1046 | # CONFIG_IWLCORE is not set |
| 1027 | # CONFIG_IWLWIFI_LEDS is not set | 1047 | # CONFIG_IWLWIFI_LEDS is not set |
| 1028 | # CONFIG_IWL4965 is not set | 1048 | # CONFIG_IWLAGN is not set |
| 1029 | # CONFIG_IWL3945 is not set | 1049 | # CONFIG_IWL3945 is not set |
| 1030 | # CONFIG_HOSTAP is not set | 1050 | # CONFIG_HOSTAP is not set |
| 1031 | # CONFIG_B43 is not set | 1051 | # CONFIG_B43 is not set |
| @@ -1105,6 +1125,7 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y | |||
| 1105 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 1125 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
| 1106 | # CONFIG_MOUSE_SERIAL is not set | 1126 | # CONFIG_MOUSE_SERIAL is not set |
| 1107 | # CONFIG_MOUSE_APPLETOUCH is not set | 1127 | # CONFIG_MOUSE_APPLETOUCH is not set |
| 1128 | # CONFIG_MOUSE_BCM5974 is not set | ||
| 1108 | # CONFIG_MOUSE_VSXXXAA is not set | 1129 | # CONFIG_MOUSE_VSXXXAA is not set |
| 1109 | CONFIG_INPUT_JOYSTICK=y | 1130 | CONFIG_INPUT_JOYSTICK=y |
| 1110 | # CONFIG_JOYSTICK_ANALOG is not set | 1131 | # CONFIG_JOYSTICK_ANALOG is not set |
| @@ -1139,12 +1160,14 @@ CONFIG_INPUT_TOUCHSCREEN=y | |||
| 1139 | # CONFIG_TOUCHSCREEN_GUNZE is not set | 1160 | # CONFIG_TOUCHSCREEN_GUNZE is not set |
| 1140 | # CONFIG_TOUCHSCREEN_ELO is not set | 1161 | # CONFIG_TOUCHSCREEN_ELO is not set |
| 1141 | # CONFIG_TOUCHSCREEN_MTOUCH is not set | 1162 | # CONFIG_TOUCHSCREEN_MTOUCH is not set |
| 1163 | # CONFIG_TOUCHSCREEN_INEXIO is not set | ||
| 1142 | # CONFIG_TOUCHSCREEN_MK712 is not set | 1164 | # CONFIG_TOUCHSCREEN_MK712 is not set |
| 1143 | # CONFIG_TOUCHSCREEN_PENMOUNT is not set | 1165 | # CONFIG_TOUCHSCREEN_PENMOUNT is not set |
| 1144 | # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set | 1166 | # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set |
| 1145 | # CONFIG_TOUCHSCREEN_TOUCHWIN is not set | 1167 | # CONFIG_TOUCHSCREEN_TOUCHWIN is not set |
| 1146 | # CONFIG_TOUCHSCREEN_UCB1400 is not set | 1168 | # CONFIG_TOUCHSCREEN_UCB1400 is not set |
| 1147 | # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set | 1169 | # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set |
| 1170 | # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set | ||
| 1148 | CONFIG_INPUT_MISC=y | 1171 | CONFIG_INPUT_MISC=y |
| 1149 | # CONFIG_INPUT_PCSPKR is not set | 1172 | # CONFIG_INPUT_PCSPKR is not set |
| 1150 | # CONFIG_INPUT_APANEL is not set | 1173 | # CONFIG_INPUT_APANEL is not set |
| @@ -1173,6 +1196,7 @@ CONFIG_SERIO_LIBPS2=y | |||
| 1173 | # Character devices | 1196 | # Character devices |
| 1174 | # | 1197 | # |
| 1175 | CONFIG_VT=y | 1198 | CONFIG_VT=y |
| 1199 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 1176 | CONFIG_VT_CONSOLE=y | 1200 | CONFIG_VT_CONSOLE=y |
| 1177 | CONFIG_HW_CONSOLE=y | 1201 | CONFIG_HW_CONSOLE=y |
| 1178 | CONFIG_VT_HW_CONSOLE_BINDING=y | 1202 | CONFIG_VT_HW_CONSOLE_BINDING=y |
| @@ -1223,8 +1247,8 @@ CONFIG_UNIX98_PTYS=y | |||
| 1223 | # CONFIG_LEGACY_PTYS is not set | 1247 | # CONFIG_LEGACY_PTYS is not set |
| 1224 | # CONFIG_IPMI_HANDLER is not set | 1248 | # CONFIG_IPMI_HANDLER is not set |
| 1225 | CONFIG_HW_RANDOM=y | 1249 | CONFIG_HW_RANDOM=y |
| 1226 | # CONFIG_HW_RANDOM_INTEL is not set | 1250 | CONFIG_HW_RANDOM_INTEL=y |
| 1227 | # CONFIG_HW_RANDOM_AMD is not set | 1251 | CONFIG_HW_RANDOM_AMD=y |
| 1228 | CONFIG_HW_RANDOM_GEODE=y | 1252 | CONFIG_HW_RANDOM_GEODE=y |
| 1229 | CONFIG_HW_RANDOM_VIA=y | 1253 | CONFIG_HW_RANDOM_VIA=y |
| 1230 | CONFIG_NVRAM=y | 1254 | CONFIG_NVRAM=y |
| @@ -1245,7 +1269,6 @@ CONFIG_NVRAM=y | |||
| 1245 | # CONFIG_CS5535_GPIO is not set | 1269 | # CONFIG_CS5535_GPIO is not set |
| 1246 | # CONFIG_RAW_DRIVER is not set | 1270 | # CONFIG_RAW_DRIVER is not set |
| 1247 | CONFIG_HPET=y | 1271 | CONFIG_HPET=y |
| 1248 | # CONFIG_HPET_RTC_IRQ is not set | ||
| 1249 | # CONFIG_HPET_MMAP is not set | 1272 | # CONFIG_HPET_MMAP is not set |
| 1250 | # CONFIG_HANGCHECK_TIMER is not set | 1273 | # CONFIG_HANGCHECK_TIMER is not set |
| 1251 | # CONFIG_TCG_TPM is not set | 1274 | # CONFIG_TCG_TPM is not set |
| @@ -1254,43 +1277,64 @@ CONFIG_DEVPORT=y | |||
| 1254 | CONFIG_I2C=y | 1277 | CONFIG_I2C=y |
| 1255 | CONFIG_I2C_BOARDINFO=y | 1278 | CONFIG_I2C_BOARDINFO=y |
| 1256 | # CONFIG_I2C_CHARDEV is not set | 1279 | # CONFIG_I2C_CHARDEV is not set |
| 1280 | CONFIG_I2C_HELPER_AUTO=y | ||
| 1257 | 1281 | ||
| 1258 | # | 1282 | # |
| 1259 | # I2C Hardware Bus support | 1283 | # I2C Hardware Bus support |
| 1260 | # | 1284 | # |
| 1285 | |||
| 1286 | # | ||
| 1287 | # PC SMBus host controller drivers | ||
| 1288 | # | ||
| 1261 | # CONFIG_I2C_ALI1535 is not set | 1289 | # CONFIG_I2C_ALI1535 is not set |
| 1262 | # CONFIG_I2C_ALI1563 is not set | 1290 | # CONFIG_I2C_ALI1563 is not set |
| 1263 | # CONFIG_I2C_ALI15X3 is not set | 1291 | # CONFIG_I2C_ALI15X3 is not set |
| 1264 | # CONFIG_I2C_AMD756 is not set | 1292 | # CONFIG_I2C_AMD756 is not set |
| 1265 | # CONFIG_I2C_AMD8111 is not set | 1293 | # CONFIG_I2C_AMD8111 is not set |
| 1266 | CONFIG_I2C_I801=y | 1294 | CONFIG_I2C_I801=y |
| 1267 | # CONFIG_I2C_I810 is not set | 1295 | # CONFIG_I2C_ISCH is not set |
| 1268 | # CONFIG_I2C_PIIX4 is not set | 1296 | # CONFIG_I2C_PIIX4 is not set |
| 1269 | # CONFIG_I2C_NFORCE2 is not set | 1297 | # CONFIG_I2C_NFORCE2 is not set |
| 1270 | # CONFIG_I2C_OCORES is not set | ||
| 1271 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 1272 | # CONFIG_I2C_PROSAVAGE is not set | ||
| 1273 | # CONFIG_I2C_SAVAGE4 is not set | ||
| 1274 | # CONFIG_I2C_SIMTEC is not set | ||
| 1275 | # CONFIG_SCx200_ACB is not set | ||
| 1276 | # CONFIG_I2C_SIS5595 is not set | 1298 | # CONFIG_I2C_SIS5595 is not set |
| 1277 | # CONFIG_I2C_SIS630 is not set | 1299 | # CONFIG_I2C_SIS630 is not set |
| 1278 | # CONFIG_I2C_SIS96X is not set | 1300 | # CONFIG_I2C_SIS96X is not set |
| 1279 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 1280 | # CONFIG_I2C_STUB is not set | ||
| 1281 | # CONFIG_I2C_TINY_USB is not set | ||
| 1282 | # CONFIG_I2C_VIA is not set | 1301 | # CONFIG_I2C_VIA is not set |
| 1283 | # CONFIG_I2C_VIAPRO is not set | 1302 | # CONFIG_I2C_VIAPRO is not set |
| 1303 | |||
| 1304 | # | ||
| 1305 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 1306 | # | ||
| 1307 | # CONFIG_I2C_OCORES is not set | ||
| 1308 | # CONFIG_I2C_SIMTEC is not set | ||
| 1309 | |||
| 1310 | # | ||
| 1311 | # External I2C/SMBus adapter drivers | ||
| 1312 | # | ||
| 1313 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 1314 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 1315 | # CONFIG_I2C_TINY_USB is not set | ||
| 1316 | |||
| 1317 | # | ||
| 1318 | # Graphics adapter I2C/DDC channel drivers | ||
| 1319 | # | ||
| 1284 | # CONFIG_I2C_VOODOO3 is not set | 1320 | # CONFIG_I2C_VOODOO3 is not set |
| 1321 | |||
| 1322 | # | ||
| 1323 | # Other I2C/SMBus bus drivers | ||
| 1324 | # | ||
| 1285 | # CONFIG_I2C_PCA_PLATFORM is not set | 1325 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 1326 | # CONFIG_I2C_STUB is not set | ||
| 1327 | # CONFIG_SCx200_ACB is not set | ||
| 1286 | 1328 | ||
| 1287 | # | 1329 | # |
| 1288 | # Miscellaneous I2C Chip support | 1330 | # Miscellaneous I2C Chip support |
| 1289 | # | 1331 | # |
| 1290 | # CONFIG_DS1682 is not set | 1332 | # CONFIG_DS1682 is not set |
| 1333 | # CONFIG_AT24 is not set | ||
| 1291 | # CONFIG_SENSORS_EEPROM is not set | 1334 | # CONFIG_SENSORS_EEPROM is not set |
| 1292 | # CONFIG_SENSORS_PCF8574 is not set | 1335 | # CONFIG_SENSORS_PCF8574 is not set |
| 1293 | # CONFIG_PCF8575 is not set | 1336 | # CONFIG_PCF8575 is not set |
| 1337 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 1294 | # CONFIG_SENSORS_PCF8591 is not set | 1338 | # CONFIG_SENSORS_PCF8591 is not set |
| 1295 | # CONFIG_SENSORS_MAX6875 is not set | 1339 | # CONFIG_SENSORS_MAX6875 is not set |
| 1296 | # CONFIG_SENSORS_TSL2550 is not set | 1340 | # CONFIG_SENSORS_TSL2550 is not set |
| @@ -1299,6 +1343,8 @@ CONFIG_I2C_I801=y | |||
| 1299 | # CONFIG_I2C_DEBUG_BUS is not set | 1343 | # CONFIG_I2C_DEBUG_BUS is not set |
| 1300 | # CONFIG_I2C_DEBUG_CHIP is not set | 1344 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 1301 | # CONFIG_SPI is not set | 1345 | # CONFIG_SPI is not set |
| 1346 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 1347 | # CONFIG_GPIOLIB is not set | ||
| 1302 | # CONFIG_W1 is not set | 1348 | # CONFIG_W1 is not set |
| 1303 | CONFIG_POWER_SUPPLY=y | 1349 | CONFIG_POWER_SUPPLY=y |
| 1304 | # CONFIG_POWER_SUPPLY_DEBUG is not set | 1350 | # CONFIG_POWER_SUPPLY_DEBUG is not set |
| @@ -1360,8 +1406,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1360 | # | 1406 | # |
| 1361 | # Multifunction device drivers | 1407 | # Multifunction device drivers |
| 1362 | # | 1408 | # |
| 1409 | # CONFIG_MFD_CORE is not set | ||
| 1363 | # CONFIG_MFD_SM501 is not set | 1410 | # CONFIG_MFD_SM501 is not set |
| 1364 | # CONFIG_HTC_PASIC3 is not set | 1411 | # CONFIG_HTC_PASIC3 is not set |
| 1412 | # CONFIG_MFD_TMIO is not set | ||
| 1365 | 1413 | ||
| 1366 | # | 1414 | # |
| 1367 | # Multimedia devices | 1415 | # Multimedia devices |
| @@ -1372,6 +1420,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1372 | # | 1420 | # |
| 1373 | # CONFIG_VIDEO_DEV is not set | 1421 | # CONFIG_VIDEO_DEV is not set |
| 1374 | # CONFIG_DVB_CORE is not set | 1422 | # CONFIG_DVB_CORE is not set |
| 1423 | # CONFIG_VIDEO_MEDIA is not set | ||
| 1375 | 1424 | ||
| 1376 | # | 1425 | # |
| 1377 | # Multimedia drivers | 1426 | # Multimedia drivers |
| @@ -1418,7 +1467,6 @@ CONFIG_FB_CFB_IMAGEBLIT=y | |||
| 1418 | # CONFIG_FB_SYS_IMAGEBLIT is not set | 1467 | # CONFIG_FB_SYS_IMAGEBLIT is not set |
| 1419 | # CONFIG_FB_FOREIGN_ENDIAN is not set | 1468 | # CONFIG_FB_FOREIGN_ENDIAN is not set |
| 1420 | # CONFIG_FB_SYS_FOPS is not set | 1469 | # CONFIG_FB_SYS_FOPS is not set |
| 1421 | CONFIG_FB_DEFERRED_IO=y | ||
| 1422 | # CONFIG_FB_SVGALIB is not set | 1470 | # CONFIG_FB_SVGALIB is not set |
| 1423 | # CONFIG_FB_MACMODES is not set | 1471 | # CONFIG_FB_MACMODES is not set |
| 1424 | # CONFIG_FB_BACKLIGHT is not set | 1472 | # CONFIG_FB_BACKLIGHT is not set |
| @@ -1463,6 +1511,7 @@ CONFIG_FB_EFI=y | |||
| 1463 | # CONFIG_FB_TRIDENT is not set | 1511 | # CONFIG_FB_TRIDENT is not set |
| 1464 | # CONFIG_FB_ARK is not set | 1512 | # CONFIG_FB_ARK is not set |
| 1465 | # CONFIG_FB_PM3 is not set | 1513 | # CONFIG_FB_PM3 is not set |
| 1514 | # CONFIG_FB_CARMINE is not set | ||
| 1466 | # CONFIG_FB_GEODE is not set | 1515 | # CONFIG_FB_GEODE is not set |
| 1467 | # CONFIG_FB_VIRTUAL is not set | 1516 | # CONFIG_FB_VIRTUAL is not set |
| 1468 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | 1517 | CONFIG_BACKLIGHT_LCD_SUPPORT=y |
| @@ -1470,6 +1519,7 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y | |||
| 1470 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | 1519 | CONFIG_BACKLIGHT_CLASS_DEVICE=y |
| 1471 | # CONFIG_BACKLIGHT_CORGI is not set | 1520 | # CONFIG_BACKLIGHT_CORGI is not set |
| 1472 | # CONFIG_BACKLIGHT_PROGEAR is not set | 1521 | # CONFIG_BACKLIGHT_PROGEAR is not set |
| 1522 | # CONFIG_BACKLIGHT_MBP_NVIDIA is not set | ||
| 1473 | 1523 | ||
| 1474 | # | 1524 | # |
| 1475 | # Display device support | 1525 | # Display device support |
| @@ -1489,15 +1539,7 @@ CONFIG_LOGO=y | |||
| 1489 | # CONFIG_LOGO_LINUX_MONO is not set | 1539 | # CONFIG_LOGO_LINUX_MONO is not set |
| 1490 | # CONFIG_LOGO_LINUX_VGA16 is not set | 1540 | # CONFIG_LOGO_LINUX_VGA16 is not set |
| 1491 | CONFIG_LOGO_LINUX_CLUT224=y | 1541 | CONFIG_LOGO_LINUX_CLUT224=y |
| 1492 | |||
| 1493 | # | ||
| 1494 | # Sound | ||
| 1495 | # | ||
| 1496 | CONFIG_SOUND=y | 1542 | CONFIG_SOUND=y |
| 1497 | |||
| 1498 | # | ||
| 1499 | # Advanced Linux Sound Architecture | ||
| 1500 | # | ||
| 1501 | CONFIG_SND=y | 1543 | CONFIG_SND=y |
| 1502 | CONFIG_SND_TIMER=y | 1544 | CONFIG_SND_TIMER=y |
| 1503 | CONFIG_SND_PCM=y | 1545 | CONFIG_SND_PCM=y |
| @@ -1515,20 +1557,14 @@ CONFIG_SND_VERBOSE_PROCFS=y | |||
| 1515 | # CONFIG_SND_VERBOSE_PRINTK is not set | 1557 | # CONFIG_SND_VERBOSE_PRINTK is not set |
| 1516 | # CONFIG_SND_DEBUG is not set | 1558 | # CONFIG_SND_DEBUG is not set |
| 1517 | CONFIG_SND_VMASTER=y | 1559 | CONFIG_SND_VMASTER=y |
| 1518 | 1560 | CONFIG_SND_DRIVERS=y | |
| 1519 | # | ||
| 1520 | # Generic devices | ||
| 1521 | # | ||
| 1522 | # CONFIG_SND_PCSP is not set | 1561 | # CONFIG_SND_PCSP is not set |
| 1523 | # CONFIG_SND_DUMMY is not set | 1562 | # CONFIG_SND_DUMMY is not set |
| 1524 | # CONFIG_SND_VIRMIDI is not set | 1563 | # CONFIG_SND_VIRMIDI is not set |
| 1525 | # CONFIG_SND_MTPAV is not set | 1564 | # CONFIG_SND_MTPAV is not set |
| 1526 | # CONFIG_SND_SERIAL_U16550 is not set | 1565 | # CONFIG_SND_SERIAL_U16550 is not set |
| 1527 | # CONFIG_SND_MPU401 is not set | 1566 | # CONFIG_SND_MPU401 is not set |
| 1528 | 1567 | CONFIG_SND_PCI=y | |
| 1529 | # | ||
| 1530 | # PCI devices | ||
| 1531 | # | ||
| 1532 | # CONFIG_SND_AD1889 is not set | 1568 | # CONFIG_SND_AD1889 is not set |
| 1533 | # CONFIG_SND_ALS300 is not set | 1569 | # CONFIG_SND_ALS300 is not set |
| 1534 | # CONFIG_SND_ALS4000 is not set | 1570 | # CONFIG_SND_ALS4000 is not set |
| @@ -1603,36 +1639,14 @@ CONFIG_SND_HDA_GENERIC=y | |||
| 1603 | # CONFIG_SND_VIRTUOSO is not set | 1639 | # CONFIG_SND_VIRTUOSO is not set |
| 1604 | # CONFIG_SND_VX222 is not set | 1640 | # CONFIG_SND_VX222 is not set |
| 1605 | # CONFIG_SND_YMFPCI is not set | 1641 | # CONFIG_SND_YMFPCI is not set |
| 1606 | 1642 | CONFIG_SND_USB=y | |
| 1607 | # | ||
| 1608 | # USB devices | ||
| 1609 | # | ||
| 1610 | # CONFIG_SND_USB_AUDIO is not set | 1643 | # CONFIG_SND_USB_AUDIO is not set |
| 1611 | # CONFIG_SND_USB_USX2Y is not set | 1644 | # CONFIG_SND_USB_USX2Y is not set |
| 1612 | # CONFIG_SND_USB_CAIAQ is not set | 1645 | # CONFIG_SND_USB_CAIAQ is not set |
| 1613 | 1646 | CONFIG_SND_PCMCIA=y | |
| 1614 | # | ||
| 1615 | # PCMCIA devices | ||
| 1616 | # | ||
| 1617 | # CONFIG_SND_VXPOCKET is not set | 1647 | # CONFIG_SND_VXPOCKET is not set |
| 1618 | # CONFIG_SND_PDAUDIOCF is not set | 1648 | # CONFIG_SND_PDAUDIOCF is not set |
| 1619 | |||
| 1620 | # | ||
| 1621 | # System on Chip audio support | ||
| 1622 | # | ||
| 1623 | # CONFIG_SND_SOC is not set | 1649 | # CONFIG_SND_SOC is not set |
| 1624 | |||
| 1625 | # | ||
| 1626 | # ALSA SoC audio for Freescale SOCs | ||
| 1627 | # | ||
| 1628 | |||
| 1629 | # | ||
| 1630 | # SoC Audio for the Texas Instruments OMAP | ||
| 1631 | # | ||
| 1632 | |||
| 1633 | # | ||
| 1634 | # Open Sound System | ||
| 1635 | # | ||
| 1636 | # CONFIG_SOUND_PRIME is not set | 1650 | # CONFIG_SOUND_PRIME is not set |
| 1637 | CONFIG_HID_SUPPORT=y | 1651 | CONFIG_HID_SUPPORT=y |
| 1638 | CONFIG_HID=y | 1652 | CONFIG_HID=y |
| @@ -1668,6 +1682,7 @@ CONFIG_USB_DEVICEFS=y | |||
| 1668 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1682 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 1669 | CONFIG_USB_SUSPEND=y | 1683 | CONFIG_USB_SUSPEND=y |
| 1670 | # CONFIG_USB_OTG is not set | 1684 | # CONFIG_USB_OTG is not set |
| 1685 | CONFIG_USB_MON=y | ||
| 1671 | 1686 | ||
| 1672 | # | 1687 | # |
| 1673 | # USB Host Controller Drivers | 1688 | # USB Host Controller Drivers |
| @@ -1691,6 +1706,7 @@ CONFIG_USB_UHCI_HCD=y | |||
| 1691 | # | 1706 | # |
| 1692 | # CONFIG_USB_ACM is not set | 1707 | # CONFIG_USB_ACM is not set |
| 1693 | CONFIG_USB_PRINTER=y | 1708 | CONFIG_USB_PRINTER=y |
| 1709 | # CONFIG_USB_WDM is not set | ||
| 1694 | 1710 | ||
| 1695 | # | 1711 | # |
| 1696 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1712 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -1712,6 +1728,7 @@ CONFIG_USB_STORAGE=y | |||
| 1712 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1728 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1713 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1729 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
| 1714 | # CONFIG_USB_STORAGE_KARMA is not set | 1730 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1731 | # CONFIG_USB_STORAGE_SIERRA is not set | ||
| 1715 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | 1732 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
| 1716 | CONFIG_USB_LIBUSUAL=y | 1733 | CONFIG_USB_LIBUSUAL=y |
| 1717 | 1734 | ||
| @@ -1720,7 +1737,6 @@ CONFIG_USB_LIBUSUAL=y | |||
| 1720 | # | 1737 | # |
| 1721 | # CONFIG_USB_MDC800 is not set | 1738 | # CONFIG_USB_MDC800 is not set |
| 1722 | # CONFIG_USB_MICROTEK is not set | 1739 | # CONFIG_USB_MICROTEK is not set |
| 1723 | CONFIG_USB_MON=y | ||
| 1724 | 1740 | ||
| 1725 | # | 1741 | # |
| 1726 | # USB port drivers | 1742 | # USB port drivers |
| @@ -1733,7 +1749,6 @@ CONFIG_USB_MON=y | |||
| 1733 | # CONFIG_USB_EMI62 is not set | 1749 | # CONFIG_USB_EMI62 is not set |
| 1734 | # CONFIG_USB_EMI26 is not set | 1750 | # CONFIG_USB_EMI26 is not set |
| 1735 | # CONFIG_USB_ADUTUX is not set | 1751 | # CONFIG_USB_ADUTUX is not set |
| 1736 | # CONFIG_USB_AUERSWALD is not set | ||
| 1737 | # CONFIG_USB_RIO500 is not set | 1752 | # CONFIG_USB_RIO500 is not set |
| 1738 | # CONFIG_USB_LEGOTOWER is not set | 1753 | # CONFIG_USB_LEGOTOWER is not set |
| 1739 | # CONFIG_USB_LCD is not set | 1754 | # CONFIG_USB_LCD is not set |
| @@ -1750,6 +1765,7 @@ CONFIG_USB_MON=y | |||
| 1750 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1765 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 1751 | # CONFIG_USB_IOWARRIOR is not set | 1766 | # CONFIG_USB_IOWARRIOR is not set |
| 1752 | # CONFIG_USB_TEST is not set | 1767 | # CONFIG_USB_TEST is not set |
| 1768 | # CONFIG_USB_ISIGHTFW is not set | ||
| 1753 | # CONFIG_USB_GADGET is not set | 1769 | # CONFIG_USB_GADGET is not set |
| 1754 | # CONFIG_MMC is not set | 1770 | # CONFIG_MMC is not set |
| 1755 | # CONFIG_MEMSTICK is not set | 1771 | # CONFIG_MEMSTICK is not set |
| @@ -1759,7 +1775,9 @@ CONFIG_LEDS_CLASS=y | |||
| 1759 | # | 1775 | # |
| 1760 | # LED drivers | 1776 | # LED drivers |
| 1761 | # | 1777 | # |
| 1778 | # CONFIG_LEDS_PCA9532 is not set | ||
| 1762 | # CONFIG_LEDS_CLEVO_MAIL is not set | 1779 | # CONFIG_LEDS_CLEVO_MAIL is not set |
| 1780 | # CONFIG_LEDS_PCA955X is not set | ||
| 1763 | 1781 | ||
| 1764 | # | 1782 | # |
| 1765 | # LED Triggers | 1783 | # LED Triggers |
| @@ -1805,6 +1823,7 @@ CONFIG_RTC_INTF_DEV=y | |||
| 1805 | # CONFIG_RTC_DRV_PCF8583 is not set | 1823 | # CONFIG_RTC_DRV_PCF8583 is not set |
| 1806 | # CONFIG_RTC_DRV_M41T80 is not set | 1824 | # CONFIG_RTC_DRV_M41T80 is not set |
| 1807 | # CONFIG_RTC_DRV_S35390A is not set | 1825 | # CONFIG_RTC_DRV_S35390A is not set |
| 1826 | # CONFIG_RTC_DRV_FM3130 is not set | ||
| 1808 | 1827 | ||
| 1809 | # | 1828 | # |
| 1810 | # SPI RTC drivers | 1829 | # SPI RTC drivers |
| @@ -1837,11 +1856,13 @@ CONFIG_DMADEVICES=y | |||
| 1837 | # Firmware Drivers | 1856 | # Firmware Drivers |
| 1838 | # | 1857 | # |
| 1839 | # CONFIG_EDD is not set | 1858 | # CONFIG_EDD is not set |
| 1859 | CONFIG_FIRMWARE_MEMMAP=y | ||
| 1840 | CONFIG_EFI_VARS=y | 1860 | CONFIG_EFI_VARS=y |
| 1841 | # CONFIG_DELL_RBU is not set | 1861 | # CONFIG_DELL_RBU is not set |
| 1842 | # CONFIG_DCDBAS is not set | 1862 | # CONFIG_DCDBAS is not set |
| 1843 | CONFIG_DMIID=y | 1863 | CONFIG_DMIID=y |
| 1844 | # CONFIG_ISCSI_IBFT_FIND is not set | 1864 | CONFIG_ISCSI_IBFT_FIND=y |
| 1865 | CONFIG_ISCSI_IBFT=y | ||
| 1845 | 1866 | ||
| 1846 | # | 1867 | # |
| 1847 | # File systems | 1868 | # File systems |
| @@ -1920,14 +1941,27 @@ CONFIG_HUGETLB_PAGE=y | |||
| 1920 | # CONFIG_CRAMFS is not set | 1941 | # CONFIG_CRAMFS is not set |
| 1921 | # CONFIG_VXFS_FS is not set | 1942 | # CONFIG_VXFS_FS is not set |
| 1922 | # CONFIG_MINIX_FS is not set | 1943 | # CONFIG_MINIX_FS is not set |
| 1944 | # CONFIG_OMFS_FS is not set | ||
| 1923 | # CONFIG_HPFS_FS is not set | 1945 | # CONFIG_HPFS_FS is not set |
| 1924 | # CONFIG_QNX4FS_FS is not set | 1946 | # CONFIG_QNX4FS_FS is not set |
| 1925 | # CONFIG_ROMFS_FS is not set | 1947 | # CONFIG_ROMFS_FS is not set |
| 1926 | # CONFIG_SYSV_FS is not set | 1948 | # CONFIG_SYSV_FS is not set |
| 1927 | # CONFIG_UFS_FS is not set | 1949 | # CONFIG_UFS_FS is not set |
| 1928 | CONFIG_NETWORK_FILESYSTEMS=y | 1950 | CONFIG_NETWORK_FILESYSTEMS=y |
| 1929 | # CONFIG_NFS_FS is not set | 1951 | CONFIG_NFS_FS=y |
| 1952 | CONFIG_NFS_V3=y | ||
| 1953 | CONFIG_NFS_V3_ACL=y | ||
| 1954 | CONFIG_NFS_V4=y | ||
| 1955 | CONFIG_ROOT_NFS=y | ||
| 1930 | # CONFIG_NFSD is not set | 1956 | # CONFIG_NFSD is not set |
| 1957 | CONFIG_LOCKD=y | ||
| 1958 | CONFIG_LOCKD_V4=y | ||
| 1959 | CONFIG_NFS_ACL_SUPPORT=y | ||
| 1960 | CONFIG_NFS_COMMON=y | ||
| 1961 | CONFIG_SUNRPC=y | ||
| 1962 | CONFIG_SUNRPC_GSS=y | ||
| 1963 | CONFIG_RPCSEC_GSS_KRB5=y | ||
| 1964 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
| 1931 | # CONFIG_SMB_FS is not set | 1965 | # CONFIG_SMB_FS is not set |
| 1932 | # CONFIG_CIFS is not set | 1966 | # CONFIG_CIFS is not set |
| 1933 | # CONFIG_NCP_FS is not set | 1967 | # CONFIG_NCP_FS is not set |
| @@ -2001,9 +2035,9 @@ CONFIG_NLS_UTF8=y | |||
| 2001 | # Kernel hacking | 2035 | # Kernel hacking |
| 2002 | # | 2036 | # |
| 2003 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 2037 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
| 2004 | # CONFIG_PRINTK_TIME is not set | 2038 | CONFIG_PRINTK_TIME=y |
| 2005 | # CONFIG_ENABLE_WARN_DEPRECATED is not set | 2039 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 2006 | # CONFIG_ENABLE_MUST_CHECK is not set | 2040 | CONFIG_ENABLE_MUST_CHECK=y |
| 2007 | CONFIG_FRAME_WARN=2048 | 2041 | CONFIG_FRAME_WARN=2048 |
| 2008 | CONFIG_MAGIC_SYSRQ=y | 2042 | CONFIG_MAGIC_SYSRQ=y |
| 2009 | # CONFIG_UNUSED_SYMBOLS is not set | 2043 | # CONFIG_UNUSED_SYMBOLS is not set |
| @@ -2033,6 +2067,7 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
| 2033 | # CONFIG_DEBUG_INFO is not set | 2067 | # CONFIG_DEBUG_INFO is not set |
| 2034 | # CONFIG_DEBUG_VM is not set | 2068 | # CONFIG_DEBUG_VM is not set |
| 2035 | # CONFIG_DEBUG_WRITECOUNT is not set | 2069 | # CONFIG_DEBUG_WRITECOUNT is not set |
| 2070 | CONFIG_DEBUG_MEMORY_INIT=y | ||
| 2036 | # CONFIG_DEBUG_LIST is not set | 2071 | # CONFIG_DEBUG_LIST is not set |
| 2037 | # CONFIG_DEBUG_SG is not set | 2072 | # CONFIG_DEBUG_SG is not set |
| 2038 | CONFIG_FRAME_POINTER=y | 2073 | CONFIG_FRAME_POINTER=y |
| @@ -2043,23 +2078,32 @@ CONFIG_FRAME_POINTER=y | |||
| 2043 | # CONFIG_LKDTM is not set | 2078 | # CONFIG_LKDTM is not set |
| 2044 | # CONFIG_FAULT_INJECTION is not set | 2079 | # CONFIG_FAULT_INJECTION is not set |
| 2045 | # CONFIG_LATENCYTOP is not set | 2080 | # CONFIG_LATENCYTOP is not set |
| 2081 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 2082 | CONFIG_HAVE_FTRACE=y | ||
| 2083 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 2084 | # CONFIG_FTRACE is not set | ||
| 2085 | # CONFIG_IRQSOFF_TRACER is not set | ||
| 2086 | # CONFIG_SYSPROF_TRACER is not set | ||
| 2087 | # CONFIG_SCHED_TRACER is not set | ||
| 2088 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 2046 | CONFIG_PROVIDE_OHCI1394_DMA_INIT=y | 2089 | CONFIG_PROVIDE_OHCI1394_DMA_INIT=y |
| 2047 | # CONFIG_SAMPLES is not set | 2090 | # CONFIG_SAMPLES is not set |
| 2048 | # CONFIG_KGDB is not set | ||
| 2049 | CONFIG_HAVE_ARCH_KGDB=y | 2091 | CONFIG_HAVE_ARCH_KGDB=y |
| 2092 | # CONFIG_KGDB is not set | ||
| 2050 | # CONFIG_STRICT_DEVMEM is not set | 2093 | # CONFIG_STRICT_DEVMEM is not set |
| 2094 | CONFIG_X86_VERBOSE_BOOTUP=y | ||
| 2051 | CONFIG_EARLY_PRINTK=y | 2095 | CONFIG_EARLY_PRINTK=y |
| 2052 | CONFIG_DEBUG_STACKOVERFLOW=y | 2096 | CONFIG_DEBUG_STACKOVERFLOW=y |
| 2053 | CONFIG_DEBUG_STACK_USAGE=y | 2097 | CONFIG_DEBUG_STACK_USAGE=y |
| 2054 | # CONFIG_DEBUG_PAGEALLOC is not set | 2098 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 2099 | # CONFIG_DEBUG_PER_CPU_MAPS is not set | ||
| 2055 | # CONFIG_X86_PTDUMP is not set | 2100 | # CONFIG_X86_PTDUMP is not set |
| 2056 | CONFIG_DEBUG_RODATA=y | 2101 | CONFIG_DEBUG_RODATA=y |
| 2057 | # CONFIG_DEBUG_RODATA_TEST is not set | 2102 | # CONFIG_DEBUG_RODATA_TEST is not set |
| 2058 | CONFIG_DEBUG_NX_TEST=m | 2103 | CONFIG_DEBUG_NX_TEST=m |
| 2059 | # CONFIG_4KSTACKS is not set | 2104 | # CONFIG_4KSTACKS is not set |
| 2060 | CONFIG_X86_FIND_SMP_CONFIG=y | ||
| 2061 | CONFIG_X86_MPPARSE=y | ||
| 2062 | CONFIG_DOUBLEFAULT=y | 2105 | CONFIG_DOUBLEFAULT=y |
| 2106 | # CONFIG_MMIOTRACE is not set | ||
| 2063 | CONFIG_IO_DELAY_TYPE_0X80=0 | 2107 | CONFIG_IO_DELAY_TYPE_0X80=0 |
| 2064 | CONFIG_IO_DELAY_TYPE_0XED=1 | 2108 | CONFIG_IO_DELAY_TYPE_0XED=1 |
| 2065 | CONFIG_IO_DELAY_TYPE_UDELAY=2 | 2109 | CONFIG_IO_DELAY_TYPE_UDELAY=2 |
| @@ -2071,6 +2115,7 @@ CONFIG_IO_DELAY_0X80=y | |||
| 2071 | CONFIG_DEFAULT_IO_DELAY_TYPE=0 | 2115 | CONFIG_DEFAULT_IO_DELAY_TYPE=0 |
| 2072 | CONFIG_DEBUG_BOOT_PARAMS=y | 2116 | CONFIG_DEBUG_BOOT_PARAMS=y |
| 2073 | # CONFIG_CPA_DEBUG is not set | 2117 | # CONFIG_CPA_DEBUG is not set |
| 2118 | # CONFIG_OPTIMIZE_INLINING is not set | ||
| 2074 | 2119 | ||
| 2075 | # | 2120 | # |
| 2076 | # Security options | 2121 | # Security options |
| @@ -2080,7 +2125,6 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y | |||
| 2080 | CONFIG_SECURITY=y | 2125 | CONFIG_SECURITY=y |
| 2081 | CONFIG_SECURITY_NETWORK=y | 2126 | CONFIG_SECURITY_NETWORK=y |
| 2082 | # CONFIG_SECURITY_NETWORK_XFRM is not set | 2127 | # CONFIG_SECURITY_NETWORK_XFRM is not set |
| 2083 | CONFIG_SECURITY_CAPABILITIES=y | ||
| 2084 | CONFIG_SECURITY_FILE_CAPABILITIES=y | 2128 | CONFIG_SECURITY_FILE_CAPABILITIES=y |
| 2085 | # CONFIG_SECURITY_ROOTPLUG is not set | 2129 | # CONFIG_SECURITY_ROOTPLUG is not set |
| 2086 | CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536 | 2130 | CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536 |
| @@ -2141,6 +2185,10 @@ CONFIG_CRYPTO_HMAC=y | |||
| 2141 | # CONFIG_CRYPTO_MD4 is not set | 2185 | # CONFIG_CRYPTO_MD4 is not set |
| 2142 | CONFIG_CRYPTO_MD5=y | 2186 | CONFIG_CRYPTO_MD5=y |
| 2143 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 2187 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 2188 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 2189 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 2190 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 2191 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 2144 | CONFIG_CRYPTO_SHA1=y | 2192 | CONFIG_CRYPTO_SHA1=y |
| 2145 | # CONFIG_CRYPTO_SHA256 is not set | 2193 | # CONFIG_CRYPTO_SHA256 is not set |
| 2146 | # CONFIG_CRYPTO_SHA512 is not set | 2194 | # CONFIG_CRYPTO_SHA512 is not set |
| @@ -2151,7 +2199,7 @@ CONFIG_CRYPTO_SHA1=y | |||
| 2151 | # Ciphers | 2199 | # Ciphers |
| 2152 | # | 2200 | # |
| 2153 | CONFIG_CRYPTO_AES=y | 2201 | CONFIG_CRYPTO_AES=y |
| 2154 | # CONFIG_CRYPTO_AES_586 is not set | 2202 | CONFIG_CRYPTO_AES_586=y |
| 2155 | # CONFIG_CRYPTO_ANUBIS is not set | 2203 | # CONFIG_CRYPTO_ANUBIS is not set |
| 2156 | CONFIG_CRYPTO_ARC4=y | 2204 | CONFIG_CRYPTO_ARC4=y |
| 2157 | # CONFIG_CRYPTO_BLOWFISH is not set | 2205 | # CONFIG_CRYPTO_BLOWFISH is not set |
| @@ -2193,6 +2241,7 @@ CONFIG_GENERIC_FIND_FIRST_BIT=y | |||
| 2193 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 2241 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 2194 | # CONFIG_CRC_CCITT is not set | 2242 | # CONFIG_CRC_CCITT is not set |
| 2195 | # CONFIG_CRC16 is not set | 2243 | # CONFIG_CRC16 is not set |
| 2244 | CONFIG_CRC_T10DIF=y | ||
| 2196 | # CONFIG_CRC_ITU_T is not set | 2245 | # CONFIG_CRC_ITU_T is not set |
| 2197 | CONFIG_CRC32=y | 2246 | CONFIG_CRC32=y |
| 2198 | # CONFIG_CRC7 is not set | 2247 | # CONFIG_CRC7 is not set |
diff --git a/arch/x86/configs/x86_64_defconfig b/arch/x86/configs/x86_64_defconfig index a40452429625..678c8acefe04 100644 --- a/arch/x86/configs/x86_64_defconfig +++ b/arch/x86/configs/x86_64_defconfig | |||
| @@ -1,13 +1,13 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.26-rc1 | 3 | # Linux kernel version: 2.6.27-rc4 |
| 4 | # Sun May 4 19:59:57 2008 | 4 | # Mon Aug 25 14:40:46 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_64BIT=y | 6 | CONFIG_64BIT=y |
| 7 | # CONFIG_X86_32 is not set | 7 | # CONFIG_X86_32 is not set |
| 8 | CONFIG_X86_64=y | 8 | CONFIG_X86_64=y |
| 9 | CONFIG_X86=y | 9 | CONFIG_X86=y |
| 10 | CONFIG_DEFCONFIG_LIST="arch/x86/configs/x86_64_defconfig" | 10 | CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig" |
| 11 | # CONFIG_GENERIC_LOCKBREAK is not set | 11 | # CONFIG_GENERIC_LOCKBREAK is not set |
| 12 | CONFIG_GENERIC_TIME=y | 12 | CONFIG_GENERIC_TIME=y |
| 13 | CONFIG_GENERIC_CMOS_UPDATE=y | 13 | CONFIG_GENERIC_CMOS_UPDATE=y |
| @@ -53,6 +53,7 @@ CONFIG_X86_HT=y | |||
| 53 | CONFIG_X86_BIOS_REBOOT=y | 53 | CONFIG_X86_BIOS_REBOOT=y |
| 54 | CONFIG_X86_TRAMPOLINE=y | 54 | CONFIG_X86_TRAMPOLINE=y |
| 55 | # CONFIG_KTIME_SCALAR is not set | 55 | # CONFIG_KTIME_SCALAR is not set |
| 56 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
| 56 | 57 | ||
| 57 | # | 58 | # |
| 58 | # General setup | 59 | # General setup |
| @@ -82,6 +83,7 @@ CONFIG_CGROUPS=y | |||
| 82 | CONFIG_CGROUP_NS=y | 83 | CONFIG_CGROUP_NS=y |
| 83 | # CONFIG_CGROUP_DEVICE is not set | 84 | # CONFIG_CGROUP_DEVICE is not set |
| 84 | CONFIG_CPUSETS=y | 85 | CONFIG_CPUSETS=y |
| 86 | CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y | ||
| 85 | CONFIG_GROUP_SCHED=y | 87 | CONFIG_GROUP_SCHED=y |
| 86 | CONFIG_FAIR_GROUP_SCHED=y | 88 | CONFIG_FAIR_GROUP_SCHED=y |
| 87 | # CONFIG_RT_GROUP_SCHED is not set | 89 | # CONFIG_RT_GROUP_SCHED is not set |
| @@ -105,7 +107,6 @@ CONFIG_SYSCTL=y | |||
| 105 | # CONFIG_EMBEDDED is not set | 107 | # CONFIG_EMBEDDED is not set |
| 106 | CONFIG_UID16=y | 108 | CONFIG_UID16=y |
| 107 | CONFIG_SYSCTL_SYSCALL=y | 109 | CONFIG_SYSCTL_SYSCALL=y |
| 108 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 109 | CONFIG_KALLSYMS=y | 110 | CONFIG_KALLSYMS=y |
| 110 | CONFIG_KALLSYMS_ALL=y | 111 | CONFIG_KALLSYMS_ALL=y |
| 111 | CONFIG_KALLSYMS_EXTRA_PASS=y | 112 | CONFIG_KALLSYMS_EXTRA_PASS=y |
| @@ -113,6 +114,7 @@ CONFIG_HOTPLUG=y | |||
| 113 | CONFIG_PRINTK=y | 114 | CONFIG_PRINTK=y |
| 114 | CONFIG_BUG=y | 115 | CONFIG_BUG=y |
| 115 | CONFIG_ELF_CORE=y | 116 | CONFIG_ELF_CORE=y |
| 117 | CONFIG_PCSPKR_PLATFORM=y | ||
| 116 | # CONFIG_COMPAT_BRK is not set | 118 | # CONFIG_COMPAT_BRK is not set |
| 117 | CONFIG_BASE_FULL=y | 119 | CONFIG_BASE_FULL=y |
| 118 | CONFIG_FUTEX=y | 120 | CONFIG_FUTEX=y |
| @@ -132,25 +134,33 @@ CONFIG_MARKERS=y | |||
| 132 | # CONFIG_OPROFILE is not set | 134 | # CONFIG_OPROFILE is not set |
| 133 | CONFIG_HAVE_OPROFILE=y | 135 | CONFIG_HAVE_OPROFILE=y |
| 134 | CONFIG_KPROBES=y | 136 | CONFIG_KPROBES=y |
| 137 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 135 | CONFIG_KRETPROBES=y | 138 | CONFIG_KRETPROBES=y |
| 139 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 136 | CONFIG_HAVE_KPROBES=y | 140 | CONFIG_HAVE_KPROBES=y |
| 137 | CONFIG_HAVE_KRETPROBES=y | 141 | CONFIG_HAVE_KRETPROBES=y |
| 142 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
| 138 | # CONFIG_HAVE_DMA_ATTRS is not set | 143 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 144 | CONFIG_USE_GENERIC_SMP_HELPERS=y | ||
| 145 | # CONFIG_HAVE_CLK is not set | ||
| 139 | CONFIG_PROC_PAGE_MONITOR=y | 146 | CONFIG_PROC_PAGE_MONITOR=y |
| 147 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 140 | CONFIG_SLABINFO=y | 148 | CONFIG_SLABINFO=y |
| 141 | CONFIG_RT_MUTEXES=y | 149 | CONFIG_RT_MUTEXES=y |
| 142 | # CONFIG_TINY_SHMEM is not set | 150 | # CONFIG_TINY_SHMEM is not set |
| 143 | CONFIG_BASE_SMALL=0 | 151 | CONFIG_BASE_SMALL=0 |
| 144 | CONFIG_MODULES=y | 152 | CONFIG_MODULES=y |
| 153 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 145 | CONFIG_MODULE_UNLOAD=y | 154 | CONFIG_MODULE_UNLOAD=y |
| 146 | CONFIG_MODULE_FORCE_UNLOAD=y | 155 | CONFIG_MODULE_FORCE_UNLOAD=y |
| 147 | # CONFIG_MODVERSIONS is not set | 156 | # CONFIG_MODVERSIONS is not set |
| 148 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 157 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 149 | # CONFIG_KMOD is not set | 158 | CONFIG_KMOD=y |
| 150 | CONFIG_STOP_MACHINE=y | 159 | CONFIG_STOP_MACHINE=y |
| 151 | CONFIG_BLOCK=y | 160 | CONFIG_BLOCK=y |
| 152 | CONFIG_BLK_DEV_IO_TRACE=y | 161 | CONFIG_BLK_DEV_IO_TRACE=y |
| 153 | CONFIG_BLK_DEV_BSG=y | 162 | CONFIG_BLK_DEV_BSG=y |
| 163 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 154 | CONFIG_BLOCK_COMPAT=y | 164 | CONFIG_BLOCK_COMPAT=y |
| 155 | 165 | ||
| 156 | # | 166 | # |
| @@ -175,20 +185,15 @@ CONFIG_NO_HZ=y | |||
| 175 | CONFIG_HIGH_RES_TIMERS=y | 185 | CONFIG_HIGH_RES_TIMERS=y |
| 176 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | 186 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y |
| 177 | CONFIG_SMP=y | 187 | CONFIG_SMP=y |
| 188 | CONFIG_X86_FIND_SMP_CONFIG=y | ||
| 189 | CONFIG_X86_MPPARSE=y | ||
| 178 | CONFIG_X86_PC=y | 190 | CONFIG_X86_PC=y |
| 179 | # CONFIG_X86_ELAN is not set | 191 | # CONFIG_X86_ELAN is not set |
| 180 | # CONFIG_X86_VOYAGER is not set | 192 | # CONFIG_X86_VOYAGER is not set |
| 181 | # CONFIG_X86_NUMAQ is not set | ||
| 182 | # CONFIG_X86_SUMMIT is not set | ||
| 183 | # CONFIG_X86_BIGSMP is not set | ||
| 184 | # CONFIG_X86_VISWS is not set | ||
| 185 | # CONFIG_X86_GENERICARCH is not set | 193 | # CONFIG_X86_GENERICARCH is not set |
| 186 | # CONFIG_X86_ES7000 is not set | ||
| 187 | # CONFIG_X86_RDC321X is not set | ||
| 188 | # CONFIG_X86_VSMP is not set | 194 | # CONFIG_X86_VSMP is not set |
| 189 | # CONFIG_PARAVIRT_GUEST is not set | 195 | # CONFIG_PARAVIRT_GUEST is not set |
| 190 | CONFIG_MEMTEST_BOOTPARAM=y | 196 | # CONFIG_MEMTEST is not set |
| 191 | CONFIG_MEMTEST_BOOTPARAM_VALUE=0 | ||
| 192 | # CONFIG_M386 is not set | 197 | # CONFIG_M386 is not set |
| 193 | # CONFIG_M486 is not set | 198 | # CONFIG_M486 is not set |
| 194 | # CONFIG_M586 is not set | 199 | # CONFIG_M586 is not set |
| @@ -220,11 +225,12 @@ CONFIG_X86_L1_CACHE_BYTES=64 | |||
| 220 | CONFIG_X86_INTERNODE_CACHE_BYTES=64 | 225 | CONFIG_X86_INTERNODE_CACHE_BYTES=64 |
| 221 | CONFIG_X86_CMPXCHG=y | 226 | CONFIG_X86_CMPXCHG=y |
| 222 | CONFIG_X86_L1_CACHE_SHIFT=6 | 227 | CONFIG_X86_L1_CACHE_SHIFT=6 |
| 223 | CONFIG_X86_GOOD_APIC=y | 228 | CONFIG_X86_WP_WORKS_OK=y |
| 224 | CONFIG_X86_INTEL_USERCOPY=y | 229 | CONFIG_X86_INTEL_USERCOPY=y |
| 225 | CONFIG_X86_USE_PPRO_CHECKSUM=y | 230 | CONFIG_X86_USE_PPRO_CHECKSUM=y |
| 226 | CONFIG_X86_P6_NOP=y | 231 | CONFIG_X86_P6_NOP=y |
| 227 | CONFIG_X86_TSC=y | 232 | CONFIG_X86_TSC=y |
| 233 | CONFIG_X86_CMPXCHG64=y | ||
| 228 | CONFIG_X86_CMOV=y | 234 | CONFIG_X86_CMOV=y |
| 229 | CONFIG_X86_MINIMUM_CPU_FAMILY=64 | 235 | CONFIG_X86_MINIMUM_CPU_FAMILY=64 |
| 230 | CONFIG_X86_DEBUGCTLMSR=y | 236 | CONFIG_X86_DEBUGCTLMSR=y |
| @@ -234,8 +240,10 @@ CONFIG_DMI=y | |||
| 234 | CONFIG_GART_IOMMU=y | 240 | CONFIG_GART_IOMMU=y |
| 235 | CONFIG_CALGARY_IOMMU=y | 241 | CONFIG_CALGARY_IOMMU=y |
| 236 | CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y | 242 | CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y |
| 243 | CONFIG_AMD_IOMMU=y | ||
| 237 | CONFIG_SWIOTLB=y | 244 | CONFIG_SWIOTLB=y |
| 238 | CONFIG_IOMMU_HELPER=y | 245 | CONFIG_IOMMU_HELPER=y |
| 246 | # CONFIG_MAXSMP is not set | ||
| 239 | CONFIG_NR_CPUS=4 | 247 | CONFIG_NR_CPUS=4 |
| 240 | # CONFIG_SCHED_SMT is not set | 248 | # CONFIG_SCHED_SMT is not set |
| 241 | CONFIG_SCHED_MC=y | 249 | CONFIG_SCHED_MC=y |
| @@ -281,6 +289,7 @@ CONFIG_ZONE_DMA_FLAG=1 | |||
| 281 | CONFIG_BOUNCE=y | 289 | CONFIG_BOUNCE=y |
| 282 | CONFIG_VIRT_TO_BUS=y | 290 | CONFIG_VIRT_TO_BUS=y |
| 283 | CONFIG_MTRR=y | 291 | CONFIG_MTRR=y |
| 292 | # CONFIG_MTRR_SANITIZER is not set | ||
| 284 | # CONFIG_X86_PAT is not set | 293 | # CONFIG_X86_PAT is not set |
| 285 | CONFIG_EFI=y | 294 | CONFIG_EFI=y |
| 286 | CONFIG_SECCOMP=y | 295 | CONFIG_SECCOMP=y |
| @@ -313,6 +322,7 @@ CONFIG_PM_TRACE_RTC=y | |||
| 313 | CONFIG_PM_SLEEP_SMP=y | 322 | CONFIG_PM_SLEEP_SMP=y |
| 314 | CONFIG_PM_SLEEP=y | 323 | CONFIG_PM_SLEEP=y |
| 315 | CONFIG_SUSPEND=y | 324 | CONFIG_SUSPEND=y |
| 325 | # CONFIG_PM_TEST_SUSPEND is not set | ||
| 316 | CONFIG_SUSPEND_FREEZER=y | 326 | CONFIG_SUSPEND_FREEZER=y |
| 317 | CONFIG_HIBERNATION=y | 327 | CONFIG_HIBERNATION=y |
| 318 | CONFIG_PM_STD_PARTITION="" | 328 | CONFIG_PM_STD_PARTITION="" |
| @@ -339,6 +349,7 @@ CONFIG_ACPI_NUMA=y | |||
| 339 | CONFIG_ACPI_BLACKLIST_YEAR=0 | 349 | CONFIG_ACPI_BLACKLIST_YEAR=0 |
| 340 | # CONFIG_ACPI_DEBUG is not set | 350 | # CONFIG_ACPI_DEBUG is not set |
| 341 | CONFIG_ACPI_EC=y | 351 | CONFIG_ACPI_EC=y |
| 352 | # CONFIG_ACPI_PCI_SLOT is not set | ||
| 342 | CONFIG_ACPI_POWER=y | 353 | CONFIG_ACPI_POWER=y |
| 343 | CONFIG_ACPI_SYSTEM=y | 354 | CONFIG_ACPI_SYSTEM=y |
| 344 | CONFIG_X86_PM_TIMER=y | 355 | CONFIG_X86_PM_TIMER=y |
| @@ -437,10 +448,6 @@ CONFIG_IA32_EMULATION=y | |||
| 437 | CONFIG_COMPAT=y | 448 | CONFIG_COMPAT=y |
| 438 | CONFIG_COMPAT_FOR_U64_ALIGNMENT=y | 449 | CONFIG_COMPAT_FOR_U64_ALIGNMENT=y |
| 439 | CONFIG_SYSVIPC_COMPAT=y | 450 | CONFIG_SYSVIPC_COMPAT=y |
| 440 | |||
| 441 | # | ||
| 442 | # Networking | ||
| 443 | # | ||
| 444 | CONFIG_NET=y | 451 | CONFIG_NET=y |
| 445 | 452 | ||
| 446 | # | 453 | # |
| @@ -464,7 +471,10 @@ CONFIG_IP_FIB_HASH=y | |||
| 464 | CONFIG_IP_MULTIPLE_TABLES=y | 471 | CONFIG_IP_MULTIPLE_TABLES=y |
| 465 | CONFIG_IP_ROUTE_MULTIPATH=y | 472 | CONFIG_IP_ROUTE_MULTIPATH=y |
| 466 | CONFIG_IP_ROUTE_VERBOSE=y | 473 | CONFIG_IP_ROUTE_VERBOSE=y |
| 467 | # CONFIG_IP_PNP is not set | 474 | CONFIG_IP_PNP=y |
| 475 | CONFIG_IP_PNP_DHCP=y | ||
| 476 | CONFIG_IP_PNP_BOOTP=y | ||
| 477 | CONFIG_IP_PNP_RARP=y | ||
| 468 | # CONFIG_NET_IPIP is not set | 478 | # CONFIG_NET_IPIP is not set |
| 469 | # CONFIG_NET_IPGRE is not set | 479 | # CONFIG_NET_IPGRE is not set |
| 470 | CONFIG_IP_MROUTE=y | 480 | CONFIG_IP_MROUTE=y |
| @@ -607,7 +617,6 @@ CONFIG_NET_SCHED=y | |||
| 607 | # CONFIG_NET_SCH_HTB is not set | 617 | # CONFIG_NET_SCH_HTB is not set |
| 608 | # CONFIG_NET_SCH_HFSC is not set | 618 | # CONFIG_NET_SCH_HFSC is not set |
| 609 | # CONFIG_NET_SCH_PRIO is not set | 619 | # CONFIG_NET_SCH_PRIO is not set |
| 610 | # CONFIG_NET_SCH_RR is not set | ||
| 611 | # CONFIG_NET_SCH_RED is not set | 620 | # CONFIG_NET_SCH_RED is not set |
| 612 | # CONFIG_NET_SCH_SFQ is not set | 621 | # CONFIG_NET_SCH_SFQ is not set |
| 613 | # CONFIG_NET_SCH_TEQL is not set | 622 | # CONFIG_NET_SCH_TEQL is not set |
| @@ -669,28 +678,19 @@ CONFIG_FIB_RULES=y | |||
| 669 | CONFIG_CFG80211=y | 678 | CONFIG_CFG80211=y |
| 670 | CONFIG_NL80211=y | 679 | CONFIG_NL80211=y |
| 671 | CONFIG_WIRELESS_EXT=y | 680 | CONFIG_WIRELESS_EXT=y |
| 681 | CONFIG_WIRELESS_EXT_SYSFS=y | ||
| 672 | CONFIG_MAC80211=y | 682 | CONFIG_MAC80211=y |
| 673 | 683 | ||
| 674 | # | 684 | # |
| 675 | # Rate control algorithm selection | 685 | # Rate control algorithm selection |
| 676 | # | 686 | # |
| 687 | CONFIG_MAC80211_RC_PID=y | ||
| 677 | CONFIG_MAC80211_RC_DEFAULT_PID=y | 688 | CONFIG_MAC80211_RC_DEFAULT_PID=y |
| 678 | # CONFIG_MAC80211_RC_DEFAULT_NONE is not set | ||
| 679 | |||
| 680 | # | ||
| 681 | # Selecting 'y' for an algorithm will | ||
| 682 | # | ||
| 683 | |||
| 684 | # | ||
| 685 | # build the algorithm into mac80211. | ||
| 686 | # | ||
| 687 | CONFIG_MAC80211_RC_DEFAULT="pid" | 689 | CONFIG_MAC80211_RC_DEFAULT="pid" |
| 688 | CONFIG_MAC80211_RC_PID=y | ||
| 689 | # CONFIG_MAC80211_MESH is not set | 690 | # CONFIG_MAC80211_MESH is not set |
| 690 | CONFIG_MAC80211_LEDS=y | 691 | CONFIG_MAC80211_LEDS=y |
| 691 | # CONFIG_MAC80211_DEBUGFS is not set | 692 | # CONFIG_MAC80211_DEBUGFS is not set |
| 692 | # CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set | 693 | # CONFIG_MAC80211_DEBUG_MENU is not set |
| 693 | # CONFIG_MAC80211_DEBUG is not set | ||
| 694 | # CONFIG_IEEE80211 is not set | 694 | # CONFIG_IEEE80211 is not set |
| 695 | # CONFIG_RFKILL is not set | 695 | # CONFIG_RFKILL is not set |
| 696 | # CONFIG_NET_9P is not set | 696 | # CONFIG_NET_9P is not set |
| @@ -706,6 +706,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | |||
| 706 | CONFIG_STANDALONE=y | 706 | CONFIG_STANDALONE=y |
| 707 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 707 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 708 | CONFIG_FW_LOADER=y | 708 | CONFIG_FW_LOADER=y |
| 709 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
| 710 | CONFIG_EXTRA_FIRMWARE="" | ||
| 709 | # CONFIG_DEBUG_DRIVER is not set | 711 | # CONFIG_DEBUG_DRIVER is not set |
| 710 | CONFIG_DEBUG_DEVRES=y | 712 | CONFIG_DEBUG_DEVRES=y |
| 711 | # CONFIG_SYS_HYPERVISOR is not set | 713 | # CONFIG_SYS_HYPERVISOR is not set |
| @@ -738,6 +740,7 @@ CONFIG_BLK_DEV_RAM_SIZE=16384 | |||
| 738 | # CONFIG_BLK_DEV_XIP is not set | 740 | # CONFIG_BLK_DEV_XIP is not set |
| 739 | # CONFIG_CDROM_PKTCDVD is not set | 741 | # CONFIG_CDROM_PKTCDVD is not set |
| 740 | # CONFIG_ATA_OVER_ETH is not set | 742 | # CONFIG_ATA_OVER_ETH is not set |
| 743 | # CONFIG_BLK_DEV_HD is not set | ||
| 741 | CONFIG_MISC_DEVICES=y | 744 | CONFIG_MISC_DEVICES=y |
| 742 | # CONFIG_IBM_ASM is not set | 745 | # CONFIG_IBM_ASM is not set |
| 743 | # CONFIG_PHANTOM is not set | 746 | # CONFIG_PHANTOM is not set |
| @@ -748,10 +751,14 @@ CONFIG_MISC_DEVICES=y | |||
| 748 | # CONFIG_ASUS_LAPTOP is not set | 751 | # CONFIG_ASUS_LAPTOP is not set |
| 749 | # CONFIG_FUJITSU_LAPTOP is not set | 752 | # CONFIG_FUJITSU_LAPTOP is not set |
| 750 | # CONFIG_MSI_LAPTOP is not set | 753 | # CONFIG_MSI_LAPTOP is not set |
| 754 | # CONFIG_COMPAL_LAPTOP is not set | ||
| 751 | # CONFIG_SONY_LAPTOP is not set | 755 | # CONFIG_SONY_LAPTOP is not set |
| 752 | # CONFIG_THINKPAD_ACPI is not set | 756 | # CONFIG_THINKPAD_ACPI is not set |
| 753 | # CONFIG_INTEL_MENLOW is not set | 757 | # CONFIG_INTEL_MENLOW is not set |
| 754 | # CONFIG_ENCLOSURE_SERVICES is not set | 758 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 759 | # CONFIG_SGI_XP is not set | ||
| 760 | # CONFIG_HP_ILO is not set | ||
| 761 | # CONFIG_SGI_GRU is not set | ||
| 755 | CONFIG_HAVE_IDE=y | 762 | CONFIG_HAVE_IDE=y |
| 756 | # CONFIG_IDE is not set | 763 | # CONFIG_IDE is not set |
| 757 | 764 | ||
| @@ -790,12 +797,13 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 790 | # | 797 | # |
| 791 | CONFIG_SCSI_SPI_ATTRS=y | 798 | CONFIG_SCSI_SPI_ATTRS=y |
| 792 | # CONFIG_SCSI_FC_ATTRS is not set | 799 | # CONFIG_SCSI_FC_ATTRS is not set |
| 793 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 800 | CONFIG_SCSI_ISCSI_ATTRS=y |
| 794 | # CONFIG_SCSI_SAS_ATTRS is not set | 801 | # CONFIG_SCSI_SAS_ATTRS is not set |
| 795 | # CONFIG_SCSI_SAS_LIBSAS is not set | 802 | # CONFIG_SCSI_SAS_LIBSAS is not set |
| 796 | # CONFIG_SCSI_SRP_ATTRS is not set | 803 | # CONFIG_SCSI_SRP_ATTRS is not set |
| 797 | # CONFIG_SCSI_LOWLEVEL is not set | 804 | # CONFIG_SCSI_LOWLEVEL is not set |
| 798 | # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set | 805 | # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set |
| 806 | # CONFIG_SCSI_DH is not set | ||
| 799 | CONFIG_ATA=y | 807 | CONFIG_ATA=y |
| 800 | # CONFIG_ATA_NONSTANDARD is not set | 808 | # CONFIG_ATA_NONSTANDARD is not set |
| 801 | CONFIG_ATA_ACPI=y | 809 | CONFIG_ATA_ACPI=y |
| @@ -857,6 +865,7 @@ CONFIG_PATA_OLDPIIX=y | |||
| 857 | # CONFIG_PATA_SIS is not set | 865 | # CONFIG_PATA_SIS is not set |
| 858 | # CONFIG_PATA_VIA is not set | 866 | # CONFIG_PATA_VIA is not set |
| 859 | # CONFIG_PATA_WINBOND is not set | 867 | # CONFIG_PATA_WINBOND is not set |
| 868 | CONFIG_PATA_SCH=y | ||
| 860 | CONFIG_MD=y | 869 | CONFIG_MD=y |
| 861 | CONFIG_BLK_DEV_MD=y | 870 | CONFIG_BLK_DEV_MD=y |
| 862 | # CONFIG_MD_LINEAR is not set | 871 | # CONFIG_MD_LINEAR is not set |
| @@ -880,13 +889,16 @@ CONFIG_DM_ZERO=y | |||
| 880 | # | 889 | # |
| 881 | # IEEE 1394 (FireWire) support | 890 | # IEEE 1394 (FireWire) support |
| 882 | # | 891 | # |
| 892 | |||
| 893 | # | ||
| 894 | # Enable only one of the two stacks, unless you know what you are doing | ||
| 895 | # | ||
| 883 | # CONFIG_FIREWIRE is not set | 896 | # CONFIG_FIREWIRE is not set |
| 884 | # CONFIG_IEEE1394 is not set | 897 | # CONFIG_IEEE1394 is not set |
| 885 | # CONFIG_I2O is not set | 898 | # CONFIG_I2O is not set |
| 886 | CONFIG_MACINTOSH_DRIVERS=y | 899 | CONFIG_MACINTOSH_DRIVERS=y |
| 887 | CONFIG_MAC_EMUMOUSEBTN=y | 900 | CONFIG_MAC_EMUMOUSEBTN=y |
| 888 | CONFIG_NETDEVICES=y | 901 | CONFIG_NETDEVICES=y |
| 889 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 890 | # CONFIG_IFB is not set | 902 | # CONFIG_IFB is not set |
| 891 | # CONFIG_DUMMY is not set | 903 | # CONFIG_DUMMY is not set |
| 892 | # CONFIG_BONDING is not set | 904 | # CONFIG_BONDING is not set |
| @@ -896,7 +908,23 @@ CONFIG_NETDEVICES=y | |||
| 896 | # CONFIG_VETH is not set | 908 | # CONFIG_VETH is not set |
| 897 | # CONFIG_NET_SB1000 is not set | 909 | # CONFIG_NET_SB1000 is not set |
| 898 | # CONFIG_ARCNET is not set | 910 | # CONFIG_ARCNET is not set |
| 899 | # CONFIG_PHYLIB is not set | 911 | CONFIG_PHYLIB=y |
| 912 | |||
| 913 | # | ||
| 914 | # MII PHY device drivers | ||
| 915 | # | ||
| 916 | # CONFIG_MARVELL_PHY is not set | ||
| 917 | # CONFIG_DAVICOM_PHY is not set | ||
| 918 | # CONFIG_QSEMI_PHY is not set | ||
| 919 | # CONFIG_LXT_PHY is not set | ||
| 920 | # CONFIG_CICADA_PHY is not set | ||
| 921 | # CONFIG_VITESSE_PHY is not set | ||
| 922 | # CONFIG_SMSC_PHY is not set | ||
| 923 | # CONFIG_BROADCOM_PHY is not set | ||
| 924 | # CONFIG_ICPLUS_PHY is not set | ||
| 925 | # CONFIG_REALTEK_PHY is not set | ||
| 926 | # CONFIG_FIXED_PHY is not set | ||
| 927 | # CONFIG_MDIO_BITBANG is not set | ||
| 900 | CONFIG_NET_ETHERNET=y | 928 | CONFIG_NET_ETHERNET=y |
| 901 | CONFIG_MII=y | 929 | CONFIG_MII=y |
| 902 | # CONFIG_HAPPYMEAL is not set | 930 | # CONFIG_HAPPYMEAL is not set |
| @@ -940,16 +968,15 @@ CONFIG_8139TOO_PIO=y | |||
| 940 | # CONFIG_SIS900 is not set | 968 | # CONFIG_SIS900 is not set |
| 941 | # CONFIG_EPIC100 is not set | 969 | # CONFIG_EPIC100 is not set |
| 942 | # CONFIG_SUNDANCE is not set | 970 | # CONFIG_SUNDANCE is not set |
| 971 | # CONFIG_TLAN is not set | ||
| 943 | # CONFIG_VIA_RHINE is not set | 972 | # CONFIG_VIA_RHINE is not set |
| 944 | # CONFIG_SC92031 is not set | 973 | # CONFIG_SC92031 is not set |
| 945 | CONFIG_NETDEV_1000=y | 974 | CONFIG_NETDEV_1000=y |
| 946 | # CONFIG_ACENIC is not set | 975 | # CONFIG_ACENIC is not set |
| 947 | # CONFIG_DL2K is not set | 976 | # CONFIG_DL2K is not set |
| 948 | CONFIG_E1000=y | 977 | CONFIG_E1000=y |
| 949 | # CONFIG_E1000_NAPI is not set | ||
| 950 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | 978 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set |
| 951 | # CONFIG_E1000E is not set | 979 | # CONFIG_E1000E is not set |
| 952 | # CONFIG_E1000E_ENABLED is not set | ||
| 953 | # CONFIG_IP1000 is not set | 980 | # CONFIG_IP1000 is not set |
| 954 | # CONFIG_IGB is not set | 981 | # CONFIG_IGB is not set |
| 955 | # CONFIG_NS83820 is not set | 982 | # CONFIG_NS83820 is not set |
| @@ -965,6 +992,7 @@ CONFIG_TIGON3=y | |||
| 965 | # CONFIG_BNX2 is not set | 992 | # CONFIG_BNX2 is not set |
| 966 | # CONFIG_QLA3XXX is not set | 993 | # CONFIG_QLA3XXX is not set |
| 967 | # CONFIG_ATL1 is not set | 994 | # CONFIG_ATL1 is not set |
| 995 | # CONFIG_ATL1E is not set | ||
| 968 | CONFIG_NETDEV_10000=y | 996 | CONFIG_NETDEV_10000=y |
| 969 | # CONFIG_CHELSIO_T1 is not set | 997 | # CONFIG_CHELSIO_T1 is not set |
| 970 | # CONFIG_CHELSIO_T3 is not set | 998 | # CONFIG_CHELSIO_T3 is not set |
| @@ -1003,13 +1031,14 @@ CONFIG_WLAN_80211=y | |||
| 1003 | # CONFIG_RTL8180 is not set | 1031 | # CONFIG_RTL8180 is not set |
| 1004 | # CONFIG_RTL8187 is not set | 1032 | # CONFIG_RTL8187 is not set |
| 1005 | # CONFIG_ADM8211 is not set | 1033 | # CONFIG_ADM8211 is not set |
| 1034 | # CONFIG_MAC80211_HWSIM is not set | ||
| 1006 | # CONFIG_P54_COMMON is not set | 1035 | # CONFIG_P54_COMMON is not set |
| 1007 | CONFIG_ATH5K=y | 1036 | CONFIG_ATH5K=y |
| 1008 | # CONFIG_ATH5K_DEBUG is not set | 1037 | # CONFIG_ATH5K_DEBUG is not set |
| 1009 | # CONFIG_IWLWIFI is not set | 1038 | # CONFIG_ATH9K is not set |
| 1010 | # CONFIG_IWLCORE is not set | 1039 | # CONFIG_IWLCORE is not set |
| 1011 | # CONFIG_IWLWIFI_LEDS is not set | 1040 | # CONFIG_IWLWIFI_LEDS is not set |
| 1012 | # CONFIG_IWL4965 is not set | 1041 | # CONFIG_IWLAGN is not set |
| 1013 | # CONFIG_IWL3945 is not set | 1042 | # CONFIG_IWL3945 is not set |
| 1014 | # CONFIG_HOSTAP is not set | 1043 | # CONFIG_HOSTAP is not set |
| 1015 | # CONFIG_B43 is not set | 1044 | # CONFIG_B43 is not set |
| @@ -1088,6 +1117,7 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y | |||
| 1088 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 1117 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
| 1089 | # CONFIG_MOUSE_SERIAL is not set | 1118 | # CONFIG_MOUSE_SERIAL is not set |
| 1090 | # CONFIG_MOUSE_APPLETOUCH is not set | 1119 | # CONFIG_MOUSE_APPLETOUCH is not set |
| 1120 | # CONFIG_MOUSE_BCM5974 is not set | ||
| 1091 | # CONFIG_MOUSE_VSXXXAA is not set | 1121 | # CONFIG_MOUSE_VSXXXAA is not set |
| 1092 | CONFIG_INPUT_JOYSTICK=y | 1122 | CONFIG_INPUT_JOYSTICK=y |
| 1093 | # CONFIG_JOYSTICK_ANALOG is not set | 1123 | # CONFIG_JOYSTICK_ANALOG is not set |
| @@ -1122,12 +1152,14 @@ CONFIG_INPUT_TOUCHSCREEN=y | |||
| 1122 | # CONFIG_TOUCHSCREEN_GUNZE is not set | 1152 | # CONFIG_TOUCHSCREEN_GUNZE is not set |
| 1123 | # CONFIG_TOUCHSCREEN_ELO is not set | 1153 | # CONFIG_TOUCHSCREEN_ELO is not set |
| 1124 | # CONFIG_TOUCHSCREEN_MTOUCH is not set | 1154 | # CONFIG_TOUCHSCREEN_MTOUCH is not set |
| 1155 | # CONFIG_TOUCHSCREEN_INEXIO is not set | ||
| 1125 | # CONFIG_TOUCHSCREEN_MK712 is not set | 1156 | # CONFIG_TOUCHSCREEN_MK712 is not set |
| 1126 | # CONFIG_TOUCHSCREEN_PENMOUNT is not set | 1157 | # CONFIG_TOUCHSCREEN_PENMOUNT is not set |
| 1127 | # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set | 1158 | # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set |
| 1128 | # CONFIG_TOUCHSCREEN_TOUCHWIN is not set | 1159 | # CONFIG_TOUCHSCREEN_TOUCHWIN is not set |
| 1129 | # CONFIG_TOUCHSCREEN_UCB1400 is not set | 1160 | # CONFIG_TOUCHSCREEN_UCB1400 is not set |
| 1130 | # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set | 1161 | # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set |
| 1162 | # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set | ||
| 1131 | CONFIG_INPUT_MISC=y | 1163 | CONFIG_INPUT_MISC=y |
| 1132 | # CONFIG_INPUT_PCSPKR is not set | 1164 | # CONFIG_INPUT_PCSPKR is not set |
| 1133 | # CONFIG_INPUT_APANEL is not set | 1165 | # CONFIG_INPUT_APANEL is not set |
| @@ -1155,6 +1187,7 @@ CONFIG_SERIO_LIBPS2=y | |||
| 1155 | # Character devices | 1187 | # Character devices |
| 1156 | # | 1188 | # |
| 1157 | CONFIG_VT=y | 1189 | CONFIG_VT=y |
| 1190 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 1158 | CONFIG_VT_CONSOLE=y | 1191 | CONFIG_VT_CONSOLE=y |
| 1159 | CONFIG_HW_CONSOLE=y | 1192 | CONFIG_HW_CONSOLE=y |
| 1160 | CONFIG_VT_HW_CONSOLE_BINDING=y | 1193 | CONFIG_VT_HW_CONSOLE_BINDING=y |
| @@ -1222,7 +1255,6 @@ CONFIG_NVRAM=y | |||
| 1222 | # CONFIG_PC8736x_GPIO is not set | 1255 | # CONFIG_PC8736x_GPIO is not set |
| 1223 | # CONFIG_RAW_DRIVER is not set | 1256 | # CONFIG_RAW_DRIVER is not set |
| 1224 | CONFIG_HPET=y | 1257 | CONFIG_HPET=y |
| 1225 | # CONFIG_HPET_RTC_IRQ is not set | ||
| 1226 | # CONFIG_HPET_MMAP is not set | 1258 | # CONFIG_HPET_MMAP is not set |
| 1227 | # CONFIG_HANGCHECK_TIMER is not set | 1259 | # CONFIG_HANGCHECK_TIMER is not set |
| 1228 | # CONFIG_TCG_TPM is not set | 1260 | # CONFIG_TCG_TPM is not set |
| @@ -1231,42 +1263,63 @@ CONFIG_DEVPORT=y | |||
| 1231 | CONFIG_I2C=y | 1263 | CONFIG_I2C=y |
| 1232 | CONFIG_I2C_BOARDINFO=y | 1264 | CONFIG_I2C_BOARDINFO=y |
| 1233 | # CONFIG_I2C_CHARDEV is not set | 1265 | # CONFIG_I2C_CHARDEV is not set |
| 1266 | CONFIG_I2C_HELPER_AUTO=y | ||
| 1234 | 1267 | ||
| 1235 | # | 1268 | # |
| 1236 | # I2C Hardware Bus support | 1269 | # I2C Hardware Bus support |
| 1237 | # | 1270 | # |
| 1271 | |||
| 1272 | # | ||
| 1273 | # PC SMBus host controller drivers | ||
| 1274 | # | ||
| 1238 | # CONFIG_I2C_ALI1535 is not set | 1275 | # CONFIG_I2C_ALI1535 is not set |
| 1239 | # CONFIG_I2C_ALI1563 is not set | 1276 | # CONFIG_I2C_ALI1563 is not set |
| 1240 | # CONFIG_I2C_ALI15X3 is not set | 1277 | # CONFIG_I2C_ALI15X3 is not set |
| 1241 | # CONFIG_I2C_AMD756 is not set | 1278 | # CONFIG_I2C_AMD756 is not set |
| 1242 | # CONFIG_I2C_AMD8111 is not set | 1279 | # CONFIG_I2C_AMD8111 is not set |
| 1243 | CONFIG_I2C_I801=y | 1280 | CONFIG_I2C_I801=y |
| 1244 | # CONFIG_I2C_I810 is not set | 1281 | # CONFIG_I2C_ISCH is not set |
| 1245 | # CONFIG_I2C_PIIX4 is not set | 1282 | # CONFIG_I2C_PIIX4 is not set |
| 1246 | # CONFIG_I2C_NFORCE2 is not set | 1283 | # CONFIG_I2C_NFORCE2 is not set |
| 1247 | # CONFIG_I2C_OCORES is not set | ||
| 1248 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 1249 | # CONFIG_I2C_PROSAVAGE is not set | ||
| 1250 | # CONFIG_I2C_SAVAGE4 is not set | ||
| 1251 | # CONFIG_I2C_SIMTEC is not set | ||
| 1252 | # CONFIG_I2C_SIS5595 is not set | 1284 | # CONFIG_I2C_SIS5595 is not set |
| 1253 | # CONFIG_I2C_SIS630 is not set | 1285 | # CONFIG_I2C_SIS630 is not set |
| 1254 | # CONFIG_I2C_SIS96X is not set | 1286 | # CONFIG_I2C_SIS96X is not set |
| 1255 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 1256 | # CONFIG_I2C_STUB is not set | ||
| 1257 | # CONFIG_I2C_TINY_USB is not set | ||
| 1258 | # CONFIG_I2C_VIA is not set | 1287 | # CONFIG_I2C_VIA is not set |
| 1259 | # CONFIG_I2C_VIAPRO is not set | 1288 | # CONFIG_I2C_VIAPRO is not set |
| 1289 | |||
| 1290 | # | ||
| 1291 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 1292 | # | ||
| 1293 | # CONFIG_I2C_OCORES is not set | ||
| 1294 | # CONFIG_I2C_SIMTEC is not set | ||
| 1295 | |||
| 1296 | # | ||
| 1297 | # External I2C/SMBus adapter drivers | ||
| 1298 | # | ||
| 1299 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 1300 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 1301 | # CONFIG_I2C_TINY_USB is not set | ||
| 1302 | |||
| 1303 | # | ||
| 1304 | # Graphics adapter I2C/DDC channel drivers | ||
| 1305 | # | ||
| 1260 | # CONFIG_I2C_VOODOO3 is not set | 1306 | # CONFIG_I2C_VOODOO3 is not set |
| 1307 | |||
| 1308 | # | ||
| 1309 | # Other I2C/SMBus bus drivers | ||
| 1310 | # | ||
| 1261 | # CONFIG_I2C_PCA_PLATFORM is not set | 1311 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 1312 | # CONFIG_I2C_STUB is not set | ||
| 1262 | 1313 | ||
| 1263 | # | 1314 | # |
| 1264 | # Miscellaneous I2C Chip support | 1315 | # Miscellaneous I2C Chip support |
| 1265 | # | 1316 | # |
| 1266 | # CONFIG_DS1682 is not set | 1317 | # CONFIG_DS1682 is not set |
| 1318 | # CONFIG_AT24 is not set | ||
| 1267 | # CONFIG_SENSORS_EEPROM is not set | 1319 | # CONFIG_SENSORS_EEPROM is not set |
| 1268 | # CONFIG_SENSORS_PCF8574 is not set | 1320 | # CONFIG_SENSORS_PCF8574 is not set |
| 1269 | # CONFIG_PCF8575 is not set | 1321 | # CONFIG_PCF8575 is not set |
| 1322 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 1270 | # CONFIG_SENSORS_PCF8591 is not set | 1323 | # CONFIG_SENSORS_PCF8591 is not set |
| 1271 | # CONFIG_SENSORS_MAX6875 is not set | 1324 | # CONFIG_SENSORS_MAX6875 is not set |
| 1272 | # CONFIG_SENSORS_TSL2550 is not set | 1325 | # CONFIG_SENSORS_TSL2550 is not set |
| @@ -1275,6 +1328,8 @@ CONFIG_I2C_I801=y | |||
| 1275 | # CONFIG_I2C_DEBUG_BUS is not set | 1328 | # CONFIG_I2C_DEBUG_BUS is not set |
| 1276 | # CONFIG_I2C_DEBUG_CHIP is not set | 1329 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 1277 | # CONFIG_SPI is not set | 1330 | # CONFIG_SPI is not set |
| 1331 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 1332 | # CONFIG_GPIOLIB is not set | ||
| 1278 | # CONFIG_W1 is not set | 1333 | # CONFIG_W1 is not set |
| 1279 | CONFIG_POWER_SUPPLY=y | 1334 | CONFIG_POWER_SUPPLY=y |
| 1280 | # CONFIG_POWER_SUPPLY_DEBUG is not set | 1335 | # CONFIG_POWER_SUPPLY_DEBUG is not set |
| @@ -1335,8 +1390,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1335 | # | 1390 | # |
| 1336 | # Multifunction device drivers | 1391 | # Multifunction device drivers |
| 1337 | # | 1392 | # |
| 1393 | # CONFIG_MFD_CORE is not set | ||
| 1338 | # CONFIG_MFD_SM501 is not set | 1394 | # CONFIG_MFD_SM501 is not set |
| 1339 | # CONFIG_HTC_PASIC3 is not set | 1395 | # CONFIG_HTC_PASIC3 is not set |
| 1396 | # CONFIG_MFD_TMIO is not set | ||
| 1340 | 1397 | ||
| 1341 | # | 1398 | # |
| 1342 | # Multimedia devices | 1399 | # Multimedia devices |
| @@ -1347,6 +1404,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1347 | # | 1404 | # |
| 1348 | # CONFIG_VIDEO_DEV is not set | 1405 | # CONFIG_VIDEO_DEV is not set |
| 1349 | # CONFIG_DVB_CORE is not set | 1406 | # CONFIG_DVB_CORE is not set |
| 1407 | # CONFIG_VIDEO_MEDIA is not set | ||
| 1350 | 1408 | ||
| 1351 | # | 1409 | # |
| 1352 | # Multimedia drivers | 1410 | # Multimedia drivers |
| @@ -1387,7 +1445,6 @@ CONFIG_FB_CFB_IMAGEBLIT=y | |||
| 1387 | # CONFIG_FB_SYS_IMAGEBLIT is not set | 1445 | # CONFIG_FB_SYS_IMAGEBLIT is not set |
| 1388 | # CONFIG_FB_FOREIGN_ENDIAN is not set | 1446 | # CONFIG_FB_FOREIGN_ENDIAN is not set |
| 1389 | # CONFIG_FB_SYS_FOPS is not set | 1447 | # CONFIG_FB_SYS_FOPS is not set |
| 1390 | CONFIG_FB_DEFERRED_IO=y | ||
| 1391 | # CONFIG_FB_SVGALIB is not set | 1448 | # CONFIG_FB_SVGALIB is not set |
| 1392 | # CONFIG_FB_MACMODES is not set | 1449 | # CONFIG_FB_MACMODES is not set |
| 1393 | # CONFIG_FB_BACKLIGHT is not set | 1450 | # CONFIG_FB_BACKLIGHT is not set |
| @@ -1430,6 +1487,7 @@ CONFIG_FB_EFI=y | |||
| 1430 | # CONFIG_FB_TRIDENT is not set | 1487 | # CONFIG_FB_TRIDENT is not set |
| 1431 | # CONFIG_FB_ARK is not set | 1488 | # CONFIG_FB_ARK is not set |
| 1432 | # CONFIG_FB_PM3 is not set | 1489 | # CONFIG_FB_PM3 is not set |
| 1490 | # CONFIG_FB_CARMINE is not set | ||
| 1433 | # CONFIG_FB_GEODE is not set | 1491 | # CONFIG_FB_GEODE is not set |
| 1434 | # CONFIG_FB_VIRTUAL is not set | 1492 | # CONFIG_FB_VIRTUAL is not set |
| 1435 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | 1493 | CONFIG_BACKLIGHT_LCD_SUPPORT=y |
| @@ -1437,6 +1495,7 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y | |||
| 1437 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | 1495 | CONFIG_BACKLIGHT_CLASS_DEVICE=y |
| 1438 | # CONFIG_BACKLIGHT_CORGI is not set | 1496 | # CONFIG_BACKLIGHT_CORGI is not set |
| 1439 | # CONFIG_BACKLIGHT_PROGEAR is not set | 1497 | # CONFIG_BACKLIGHT_PROGEAR is not set |
| 1498 | # CONFIG_BACKLIGHT_MBP_NVIDIA is not set | ||
| 1440 | 1499 | ||
| 1441 | # | 1500 | # |
| 1442 | # Display device support | 1501 | # Display device support |
| @@ -1456,15 +1515,7 @@ CONFIG_LOGO=y | |||
| 1456 | # CONFIG_LOGO_LINUX_MONO is not set | 1515 | # CONFIG_LOGO_LINUX_MONO is not set |
| 1457 | # CONFIG_LOGO_LINUX_VGA16 is not set | 1516 | # CONFIG_LOGO_LINUX_VGA16 is not set |
| 1458 | CONFIG_LOGO_LINUX_CLUT224=y | 1517 | CONFIG_LOGO_LINUX_CLUT224=y |
| 1459 | |||
| 1460 | # | ||
| 1461 | # Sound | ||
| 1462 | # | ||
| 1463 | CONFIG_SOUND=y | 1518 | CONFIG_SOUND=y |
| 1464 | |||
| 1465 | # | ||
| 1466 | # Advanced Linux Sound Architecture | ||
| 1467 | # | ||
| 1468 | CONFIG_SND=y | 1519 | CONFIG_SND=y |
| 1469 | CONFIG_SND_TIMER=y | 1520 | CONFIG_SND_TIMER=y |
| 1470 | CONFIG_SND_PCM=y | 1521 | CONFIG_SND_PCM=y |
| @@ -1482,20 +1533,14 @@ CONFIG_SND_VERBOSE_PROCFS=y | |||
| 1482 | # CONFIG_SND_VERBOSE_PRINTK is not set | 1533 | # CONFIG_SND_VERBOSE_PRINTK is not set |
| 1483 | # CONFIG_SND_DEBUG is not set | 1534 | # CONFIG_SND_DEBUG is not set |
| 1484 | CONFIG_SND_VMASTER=y | 1535 | CONFIG_SND_VMASTER=y |
| 1485 | 1536 | CONFIG_SND_DRIVERS=y | |
| 1486 | # | ||
| 1487 | # Generic devices | ||
| 1488 | # | ||
| 1489 | # CONFIG_SND_PCSP is not set | 1537 | # CONFIG_SND_PCSP is not set |
| 1490 | # CONFIG_SND_DUMMY is not set | 1538 | # CONFIG_SND_DUMMY is not set |
| 1491 | # CONFIG_SND_VIRMIDI is not set | 1539 | # CONFIG_SND_VIRMIDI is not set |
| 1492 | # CONFIG_SND_MTPAV is not set | 1540 | # CONFIG_SND_MTPAV is not set |
| 1493 | # CONFIG_SND_SERIAL_U16550 is not set | 1541 | # CONFIG_SND_SERIAL_U16550 is not set |
| 1494 | # CONFIG_SND_MPU401 is not set | 1542 | # CONFIG_SND_MPU401 is not set |
| 1495 | 1543 | CONFIG_SND_PCI=y | |
| 1496 | # | ||
| 1497 | # PCI devices | ||
| 1498 | # | ||
| 1499 | # CONFIG_SND_AD1889 is not set | 1544 | # CONFIG_SND_AD1889 is not set |
| 1500 | # CONFIG_SND_ALS300 is not set | 1545 | # CONFIG_SND_ALS300 is not set |
| 1501 | # CONFIG_SND_ALS4000 is not set | 1546 | # CONFIG_SND_ALS4000 is not set |
| @@ -1568,36 +1613,14 @@ CONFIG_SND_HDA_GENERIC=y | |||
| 1568 | # CONFIG_SND_VIRTUOSO is not set | 1613 | # CONFIG_SND_VIRTUOSO is not set |
| 1569 | # CONFIG_SND_VX222 is not set | 1614 | # CONFIG_SND_VX222 is not set |
| 1570 | # CONFIG_SND_YMFPCI is not set | 1615 | # CONFIG_SND_YMFPCI is not set |
| 1571 | 1616 | CONFIG_SND_USB=y | |
| 1572 | # | ||
| 1573 | # USB devices | ||
| 1574 | # | ||
| 1575 | # CONFIG_SND_USB_AUDIO is not set | 1617 | # CONFIG_SND_USB_AUDIO is not set |
| 1576 | # CONFIG_SND_USB_USX2Y is not set | 1618 | # CONFIG_SND_USB_USX2Y is not set |
| 1577 | # CONFIG_SND_USB_CAIAQ is not set | 1619 | # CONFIG_SND_USB_CAIAQ is not set |
| 1578 | 1620 | CONFIG_SND_PCMCIA=y | |
| 1579 | # | ||
| 1580 | # PCMCIA devices | ||
| 1581 | # | ||
| 1582 | # CONFIG_SND_VXPOCKET is not set | 1621 | # CONFIG_SND_VXPOCKET is not set |
| 1583 | # CONFIG_SND_PDAUDIOCF is not set | 1622 | # CONFIG_SND_PDAUDIOCF is not set |
| 1584 | |||
| 1585 | # | ||
| 1586 | # System on Chip audio support | ||
| 1587 | # | ||
| 1588 | # CONFIG_SND_SOC is not set | 1623 | # CONFIG_SND_SOC is not set |
| 1589 | |||
| 1590 | # | ||
| 1591 | # ALSA SoC audio for Freescale SOCs | ||
| 1592 | # | ||
| 1593 | |||
| 1594 | # | ||
| 1595 | # SoC Audio for the Texas Instruments OMAP | ||
| 1596 | # | ||
| 1597 | |||
| 1598 | # | ||
| 1599 | # Open Sound System | ||
| 1600 | # | ||
| 1601 | # CONFIG_SOUND_PRIME is not set | 1624 | # CONFIG_SOUND_PRIME is not set |
| 1602 | CONFIG_HID_SUPPORT=y | 1625 | CONFIG_HID_SUPPORT=y |
| 1603 | CONFIG_HID=y | 1626 | CONFIG_HID=y |
| @@ -1633,6 +1656,7 @@ CONFIG_USB_DEVICEFS=y | |||
| 1633 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1656 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 1634 | CONFIG_USB_SUSPEND=y | 1657 | CONFIG_USB_SUSPEND=y |
| 1635 | # CONFIG_USB_OTG is not set | 1658 | # CONFIG_USB_OTG is not set |
| 1659 | CONFIG_USB_MON=y | ||
| 1636 | 1660 | ||
| 1637 | # | 1661 | # |
| 1638 | # USB Host Controller Drivers | 1662 | # USB Host Controller Drivers |
| @@ -1656,6 +1680,7 @@ CONFIG_USB_UHCI_HCD=y | |||
| 1656 | # | 1680 | # |
| 1657 | # CONFIG_USB_ACM is not set | 1681 | # CONFIG_USB_ACM is not set |
| 1658 | CONFIG_USB_PRINTER=y | 1682 | CONFIG_USB_PRINTER=y |
| 1683 | # CONFIG_USB_WDM is not set | ||
| 1659 | 1684 | ||
| 1660 | # | 1685 | # |
| 1661 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1686 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -1677,6 +1702,7 @@ CONFIG_USB_STORAGE=y | |||
| 1677 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1702 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1678 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1703 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
| 1679 | # CONFIG_USB_STORAGE_KARMA is not set | 1704 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1705 | # CONFIG_USB_STORAGE_SIERRA is not set | ||
| 1680 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | 1706 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
| 1681 | CONFIG_USB_LIBUSUAL=y | 1707 | CONFIG_USB_LIBUSUAL=y |
| 1682 | 1708 | ||
| @@ -1685,7 +1711,6 @@ CONFIG_USB_LIBUSUAL=y | |||
| 1685 | # | 1711 | # |
| 1686 | # CONFIG_USB_MDC800 is not set | 1712 | # CONFIG_USB_MDC800 is not set |
| 1687 | # CONFIG_USB_MICROTEK is not set | 1713 | # CONFIG_USB_MICROTEK is not set |
| 1688 | CONFIG_USB_MON=y | ||
| 1689 | 1714 | ||
| 1690 | # | 1715 | # |
| 1691 | # USB port drivers | 1716 | # USB port drivers |
| @@ -1698,7 +1723,6 @@ CONFIG_USB_MON=y | |||
| 1698 | # CONFIG_USB_EMI62 is not set | 1723 | # CONFIG_USB_EMI62 is not set |
| 1699 | # CONFIG_USB_EMI26 is not set | 1724 | # CONFIG_USB_EMI26 is not set |
| 1700 | # CONFIG_USB_ADUTUX is not set | 1725 | # CONFIG_USB_ADUTUX is not set |
| 1701 | # CONFIG_USB_AUERSWALD is not set | ||
| 1702 | # CONFIG_USB_RIO500 is not set | 1726 | # CONFIG_USB_RIO500 is not set |
| 1703 | # CONFIG_USB_LEGOTOWER is not set | 1727 | # CONFIG_USB_LEGOTOWER is not set |
| 1704 | # CONFIG_USB_LCD is not set | 1728 | # CONFIG_USB_LCD is not set |
| @@ -1715,6 +1739,7 @@ CONFIG_USB_MON=y | |||
| 1715 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1739 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 1716 | # CONFIG_USB_IOWARRIOR is not set | 1740 | # CONFIG_USB_IOWARRIOR is not set |
| 1717 | # CONFIG_USB_TEST is not set | 1741 | # CONFIG_USB_TEST is not set |
| 1742 | # CONFIG_USB_ISIGHTFW is not set | ||
| 1718 | # CONFIG_USB_GADGET is not set | 1743 | # CONFIG_USB_GADGET is not set |
| 1719 | # CONFIG_MMC is not set | 1744 | # CONFIG_MMC is not set |
| 1720 | # CONFIG_MEMSTICK is not set | 1745 | # CONFIG_MEMSTICK is not set |
| @@ -1724,7 +1749,9 @@ CONFIG_LEDS_CLASS=y | |||
| 1724 | # | 1749 | # |
| 1725 | # LED drivers | 1750 | # LED drivers |
| 1726 | # | 1751 | # |
| 1752 | # CONFIG_LEDS_PCA9532 is not set | ||
| 1727 | # CONFIG_LEDS_CLEVO_MAIL is not set | 1753 | # CONFIG_LEDS_CLEVO_MAIL is not set |
| 1754 | # CONFIG_LEDS_PCA955X is not set | ||
| 1728 | 1755 | ||
| 1729 | # | 1756 | # |
| 1730 | # LED Triggers | 1757 | # LED Triggers |
| @@ -1770,6 +1797,7 @@ CONFIG_RTC_INTF_DEV=y | |||
| 1770 | # CONFIG_RTC_DRV_PCF8583 is not set | 1797 | # CONFIG_RTC_DRV_PCF8583 is not set |
| 1771 | # CONFIG_RTC_DRV_M41T80 is not set | 1798 | # CONFIG_RTC_DRV_M41T80 is not set |
| 1772 | # CONFIG_RTC_DRV_S35390A is not set | 1799 | # CONFIG_RTC_DRV_S35390A is not set |
| 1800 | # CONFIG_RTC_DRV_FM3130 is not set | ||
| 1773 | 1801 | ||
| 1774 | # | 1802 | # |
| 1775 | # SPI RTC drivers | 1803 | # SPI RTC drivers |
| @@ -1802,11 +1830,13 @@ CONFIG_DMADEVICES=y | |||
| 1802 | # Firmware Drivers | 1830 | # Firmware Drivers |
| 1803 | # | 1831 | # |
| 1804 | # CONFIG_EDD is not set | 1832 | # CONFIG_EDD is not set |
| 1833 | CONFIG_FIRMWARE_MEMMAP=y | ||
| 1805 | CONFIG_EFI_VARS=y | 1834 | CONFIG_EFI_VARS=y |
| 1806 | # CONFIG_DELL_RBU is not set | 1835 | # CONFIG_DELL_RBU is not set |
| 1807 | # CONFIG_DCDBAS is not set | 1836 | # CONFIG_DCDBAS is not set |
| 1808 | CONFIG_DMIID=y | 1837 | CONFIG_DMIID=y |
| 1809 | # CONFIG_ISCSI_IBFT_FIND is not set | 1838 | CONFIG_ISCSI_IBFT_FIND=y |
| 1839 | CONFIG_ISCSI_IBFT=y | ||
| 1810 | 1840 | ||
| 1811 | # | 1841 | # |
| 1812 | # File systems | 1842 | # File systems |
| @@ -1886,14 +1916,27 @@ CONFIG_HUGETLB_PAGE=y | |||
| 1886 | # CONFIG_CRAMFS is not set | 1916 | # CONFIG_CRAMFS is not set |
| 1887 | # CONFIG_VXFS_FS is not set | 1917 | # CONFIG_VXFS_FS is not set |
| 1888 | # CONFIG_MINIX_FS is not set | 1918 | # CONFIG_MINIX_FS is not set |
| 1919 | # CONFIG_OMFS_FS is not set | ||
| 1889 | # CONFIG_HPFS_FS is not set | 1920 | # CONFIG_HPFS_FS is not set |
| 1890 | # CONFIG_QNX4FS_FS is not set | 1921 | # CONFIG_QNX4FS_FS is not set |
| 1891 | # CONFIG_ROMFS_FS is not set | 1922 | # CONFIG_ROMFS_FS is not set |
| 1892 | # CONFIG_SYSV_FS is not set | 1923 | # CONFIG_SYSV_FS is not set |
| 1893 | # CONFIG_UFS_FS is not set | 1924 | # CONFIG_UFS_FS is not set |
| 1894 | CONFIG_NETWORK_FILESYSTEMS=y | 1925 | CONFIG_NETWORK_FILESYSTEMS=y |
| 1895 | # CONFIG_NFS_FS is not set | 1926 | CONFIG_NFS_FS=y |
| 1927 | CONFIG_NFS_V3=y | ||
| 1928 | CONFIG_NFS_V3_ACL=y | ||
| 1929 | CONFIG_NFS_V4=y | ||
| 1930 | CONFIG_ROOT_NFS=y | ||
| 1896 | # CONFIG_NFSD is not set | 1931 | # CONFIG_NFSD is not set |
| 1932 | CONFIG_LOCKD=y | ||
| 1933 | CONFIG_LOCKD_V4=y | ||
| 1934 | CONFIG_NFS_ACL_SUPPORT=y | ||
| 1935 | CONFIG_NFS_COMMON=y | ||
| 1936 | CONFIG_SUNRPC=y | ||
| 1937 | CONFIG_SUNRPC_GSS=y | ||
| 1938 | CONFIG_RPCSEC_GSS_KRB5=y | ||
| 1939 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
| 1897 | # CONFIG_SMB_FS is not set | 1940 | # CONFIG_SMB_FS is not set |
| 1898 | # CONFIG_CIFS is not set | 1941 | # CONFIG_CIFS is not set |
| 1899 | # CONFIG_NCP_FS is not set | 1942 | # CONFIG_NCP_FS is not set |
| @@ -1967,9 +2010,9 @@ CONFIG_NLS_UTF8=y | |||
| 1967 | # Kernel hacking | 2010 | # Kernel hacking |
| 1968 | # | 2011 | # |
| 1969 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 2012 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
| 1970 | # CONFIG_PRINTK_TIME is not set | 2013 | CONFIG_PRINTK_TIME=y |
| 1971 | # CONFIG_ENABLE_WARN_DEPRECATED is not set | 2014 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1972 | # CONFIG_ENABLE_MUST_CHECK is not set | 2015 | CONFIG_ENABLE_MUST_CHECK=y |
| 1973 | CONFIG_FRAME_WARN=2048 | 2016 | CONFIG_FRAME_WARN=2048 |
| 1974 | CONFIG_MAGIC_SYSRQ=y | 2017 | CONFIG_MAGIC_SYSRQ=y |
| 1975 | # CONFIG_UNUSED_SYMBOLS is not set | 2018 | # CONFIG_UNUSED_SYMBOLS is not set |
| @@ -1998,6 +2041,7 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
| 1998 | # CONFIG_DEBUG_INFO is not set | 2041 | # CONFIG_DEBUG_INFO is not set |
| 1999 | # CONFIG_DEBUG_VM is not set | 2042 | # CONFIG_DEBUG_VM is not set |
| 2000 | # CONFIG_DEBUG_WRITECOUNT is not set | 2043 | # CONFIG_DEBUG_WRITECOUNT is not set |
| 2044 | CONFIG_DEBUG_MEMORY_INIT=y | ||
| 2001 | # CONFIG_DEBUG_LIST is not set | 2045 | # CONFIG_DEBUG_LIST is not set |
| 2002 | # CONFIG_DEBUG_SG is not set | 2046 | # CONFIG_DEBUG_SG is not set |
| 2003 | CONFIG_FRAME_POINTER=y | 2047 | CONFIG_FRAME_POINTER=y |
| @@ -2008,11 +2052,20 @@ CONFIG_FRAME_POINTER=y | |||
| 2008 | # CONFIG_LKDTM is not set | 2052 | # CONFIG_LKDTM is not set |
| 2009 | # CONFIG_FAULT_INJECTION is not set | 2053 | # CONFIG_FAULT_INJECTION is not set |
| 2010 | # CONFIG_LATENCYTOP is not set | 2054 | # CONFIG_LATENCYTOP is not set |
| 2055 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 2056 | CONFIG_HAVE_FTRACE=y | ||
| 2057 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 2058 | # CONFIG_FTRACE is not set | ||
| 2059 | # CONFIG_IRQSOFF_TRACER is not set | ||
| 2060 | # CONFIG_SYSPROF_TRACER is not set | ||
| 2061 | # CONFIG_SCHED_TRACER is not set | ||
| 2062 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 2011 | CONFIG_PROVIDE_OHCI1394_DMA_INIT=y | 2063 | CONFIG_PROVIDE_OHCI1394_DMA_INIT=y |
| 2012 | # CONFIG_SAMPLES is not set | 2064 | # CONFIG_SAMPLES is not set |
| 2013 | # CONFIG_KGDB is not set | ||
| 2014 | CONFIG_HAVE_ARCH_KGDB=y | 2065 | CONFIG_HAVE_ARCH_KGDB=y |
| 2066 | # CONFIG_KGDB is not set | ||
| 2015 | # CONFIG_STRICT_DEVMEM is not set | 2067 | # CONFIG_STRICT_DEVMEM is not set |
| 2068 | CONFIG_X86_VERBOSE_BOOTUP=y | ||
| 2016 | CONFIG_EARLY_PRINTK=y | 2069 | CONFIG_EARLY_PRINTK=y |
| 2017 | CONFIG_DEBUG_STACKOVERFLOW=y | 2070 | CONFIG_DEBUG_STACKOVERFLOW=y |
| 2018 | CONFIG_DEBUG_STACK_USAGE=y | 2071 | CONFIG_DEBUG_STACK_USAGE=y |
| @@ -2023,8 +2076,8 @@ CONFIG_DEBUG_RODATA=y | |||
| 2023 | # CONFIG_DIRECT_GBPAGES is not set | 2076 | # CONFIG_DIRECT_GBPAGES is not set |
| 2024 | # CONFIG_DEBUG_RODATA_TEST is not set | 2077 | # CONFIG_DEBUG_RODATA_TEST is not set |
| 2025 | CONFIG_DEBUG_NX_TEST=m | 2078 | CONFIG_DEBUG_NX_TEST=m |
| 2026 | CONFIG_X86_MPPARSE=y | ||
| 2027 | # CONFIG_IOMMU_DEBUG is not set | 2079 | # CONFIG_IOMMU_DEBUG is not set |
| 2080 | # CONFIG_MMIOTRACE is not set | ||
| 2028 | CONFIG_IO_DELAY_TYPE_0X80=0 | 2081 | CONFIG_IO_DELAY_TYPE_0X80=0 |
| 2029 | CONFIG_IO_DELAY_TYPE_0XED=1 | 2082 | CONFIG_IO_DELAY_TYPE_0XED=1 |
| 2030 | CONFIG_IO_DELAY_TYPE_UDELAY=2 | 2083 | CONFIG_IO_DELAY_TYPE_UDELAY=2 |
| @@ -2036,6 +2089,7 @@ CONFIG_IO_DELAY_0X80=y | |||
| 2036 | CONFIG_DEFAULT_IO_DELAY_TYPE=0 | 2089 | CONFIG_DEFAULT_IO_DELAY_TYPE=0 |
| 2037 | CONFIG_DEBUG_BOOT_PARAMS=y | 2090 | CONFIG_DEBUG_BOOT_PARAMS=y |
| 2038 | # CONFIG_CPA_DEBUG is not set | 2091 | # CONFIG_CPA_DEBUG is not set |
| 2092 | # CONFIG_OPTIMIZE_INLINING is not set | ||
| 2039 | 2093 | ||
| 2040 | # | 2094 | # |
| 2041 | # Security options | 2095 | # Security options |
| @@ -2045,7 +2099,6 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y | |||
| 2045 | CONFIG_SECURITY=y | 2099 | CONFIG_SECURITY=y |
| 2046 | CONFIG_SECURITY_NETWORK=y | 2100 | CONFIG_SECURITY_NETWORK=y |
| 2047 | # CONFIG_SECURITY_NETWORK_XFRM is not set | 2101 | # CONFIG_SECURITY_NETWORK_XFRM is not set |
| 2048 | CONFIG_SECURITY_CAPABILITIES=y | ||
| 2049 | CONFIG_SECURITY_FILE_CAPABILITIES=y | 2102 | CONFIG_SECURITY_FILE_CAPABILITIES=y |
| 2050 | # CONFIG_SECURITY_ROOTPLUG is not set | 2103 | # CONFIG_SECURITY_ROOTPLUG is not set |
| 2051 | CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536 | 2104 | CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536 |
| @@ -2106,6 +2159,10 @@ CONFIG_CRYPTO_HMAC=y | |||
| 2106 | # CONFIG_CRYPTO_MD4 is not set | 2159 | # CONFIG_CRYPTO_MD4 is not set |
| 2107 | CONFIG_CRYPTO_MD5=y | 2160 | CONFIG_CRYPTO_MD5=y |
| 2108 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 2161 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 2162 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 2163 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 2164 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 2165 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 2109 | CONFIG_CRYPTO_SHA1=y | 2166 | CONFIG_CRYPTO_SHA1=y |
| 2110 | # CONFIG_CRYPTO_SHA256 is not set | 2167 | # CONFIG_CRYPTO_SHA256 is not set |
| 2111 | # CONFIG_CRYPTO_SHA512 is not set | 2168 | # CONFIG_CRYPTO_SHA512 is not set |
| @@ -2155,6 +2212,7 @@ CONFIG_GENERIC_FIND_FIRST_BIT=y | |||
| 2155 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 2212 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 2156 | # CONFIG_CRC_CCITT is not set | 2213 | # CONFIG_CRC_CCITT is not set |
| 2157 | # CONFIG_CRC16 is not set | 2214 | # CONFIG_CRC16 is not set |
| 2215 | CONFIG_CRC_T10DIF=y | ||
| 2158 | # CONFIG_CRC_ITU_T is not set | 2216 | # CONFIG_CRC_ITU_T is not set |
| 2159 | CONFIG_CRC32=y | 2217 | CONFIG_CRC32=y |
| 2160 | # CONFIG_CRC7 is not set | 2218 | # CONFIG_CRC7 is not set |
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index fa88a1d71290..bfd10fd211cd 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c | |||
| @@ -97,6 +97,8 @@ static u64 acpi_lapic_addr __initdata = APIC_DEFAULT_PHYS_BASE; | |||
| 97 | #warning ACPI uses CMPXCHG, i486 and later hardware | 97 | #warning ACPI uses CMPXCHG, i486 and later hardware |
| 98 | #endif | 98 | #endif |
| 99 | 99 | ||
| 100 | static int acpi_mcfg_64bit_base_addr __initdata = FALSE; | ||
| 101 | |||
| 100 | /* -------------------------------------------------------------------------- | 102 | /* -------------------------------------------------------------------------- |
| 101 | Boot-time Configuration | 103 | Boot-time Configuration |
| 102 | -------------------------------------------------------------------------- */ | 104 | -------------------------------------------------------------------------- */ |
| @@ -158,6 +160,14 @@ char *__init __acpi_map_table(unsigned long phys, unsigned long size) | |||
| 158 | struct acpi_mcfg_allocation *pci_mmcfg_config; | 160 | struct acpi_mcfg_allocation *pci_mmcfg_config; |
| 159 | int pci_mmcfg_config_num; | 161 | int pci_mmcfg_config_num; |
| 160 | 162 | ||
| 163 | static int __init acpi_mcfg_oem_check(struct acpi_table_mcfg *mcfg) | ||
| 164 | { | ||
| 165 | if (!strcmp(mcfg->header.oem_id, "SGI")) | ||
| 166 | acpi_mcfg_64bit_base_addr = TRUE; | ||
| 167 | |||
| 168 | return 0; | ||
| 169 | } | ||
| 170 | |||
| 161 | int __init acpi_parse_mcfg(struct acpi_table_header *header) | 171 | int __init acpi_parse_mcfg(struct acpi_table_header *header) |
| 162 | { | 172 | { |
| 163 | struct acpi_table_mcfg *mcfg; | 173 | struct acpi_table_mcfg *mcfg; |
| @@ -190,8 +200,12 @@ int __init acpi_parse_mcfg(struct acpi_table_header *header) | |||
| 190 | } | 200 | } |
| 191 | 201 | ||
| 192 | memcpy(pci_mmcfg_config, &mcfg[1], config_size); | 202 | memcpy(pci_mmcfg_config, &mcfg[1], config_size); |
| 203 | |||
| 204 | acpi_mcfg_oem_check(mcfg); | ||
| 205 | |||
| 193 | for (i = 0; i < pci_mmcfg_config_num; ++i) { | 206 | for (i = 0; i < pci_mmcfg_config_num; ++i) { |
| 194 | if (pci_mmcfg_config[i].address > 0xFFFFFFFF) { | 207 | if ((pci_mmcfg_config[i].address > 0xFFFFFFFF) && |
| 208 | !acpi_mcfg_64bit_base_addr) { | ||
| 195 | printk(KERN_ERR PREFIX | 209 | printk(KERN_ERR PREFIX |
| 196 | "MMCONFIG not in low 4GB of memory\n"); | 210 | "MMCONFIG not in low 4GB of memory\n"); |
| 197 | kfree(pci_mmcfg_config); | 211 | kfree(pci_mmcfg_config); |
diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c index fa2161d5003b..426e5d91b63a 100644 --- a/arch/x86/kernel/acpi/sleep.c +++ b/arch/x86/kernel/acpi/sleep.c | |||
| @@ -20,7 +20,7 @@ unsigned long acpi_realmode_flags; | |||
| 20 | /* address in low memory of the wakeup routine. */ | 20 | /* address in low memory of the wakeup routine. */ |
| 21 | static unsigned long acpi_realmode; | 21 | static unsigned long acpi_realmode; |
| 22 | 22 | ||
| 23 | #ifdef CONFIG_64BIT | 23 | #if defined(CONFIG_SMP) && defined(CONFIG_64BIT) |
| 24 | static char temp_stack[10240]; | 24 | static char temp_stack[10240]; |
| 25 | #endif | 25 | #endif |
| 26 | 26 | ||
| @@ -86,7 +86,7 @@ int acpi_save_state_mem(void) | |||
| 86 | #endif /* !CONFIG_64BIT */ | 86 | #endif /* !CONFIG_64BIT */ |
| 87 | 87 | ||
| 88 | header->pmode_cr0 = read_cr0(); | 88 | header->pmode_cr0 = read_cr0(); |
| 89 | header->pmode_cr4 = read_cr4(); | 89 | header->pmode_cr4 = read_cr4_safe(); |
| 90 | header->realmode_flags = acpi_realmode_flags; | 90 | header->realmode_flags = acpi_realmode_flags; |
| 91 | header->real_magic = 0x12345678; | 91 | header->real_magic = 0x12345678; |
| 92 | 92 | ||
diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c index 22d7d050905d..69b4d060b21c 100644 --- a/arch/x86/kernel/amd_iommu.c +++ b/arch/x86/kernel/amd_iommu.c | |||
| @@ -65,7 +65,7 @@ static int __iommu_queue_command(struct amd_iommu *iommu, struct iommu_cmd *cmd) | |||
| 65 | u8 *target; | 65 | u8 *target; |
| 66 | 66 | ||
| 67 | tail = readl(iommu->mmio_base + MMIO_CMD_TAIL_OFFSET); | 67 | tail = readl(iommu->mmio_base + MMIO_CMD_TAIL_OFFSET); |
| 68 | target = (iommu->cmd_buf + tail); | 68 | target = iommu->cmd_buf + tail; |
| 69 | memcpy_toio(target, cmd, sizeof(*cmd)); | 69 | memcpy_toio(target, cmd, sizeof(*cmd)); |
| 70 | tail = (tail + sizeof(*cmd)) % iommu->cmd_buf_size; | 70 | tail = (tail + sizeof(*cmd)) % iommu->cmd_buf_size; |
| 71 | head = readl(iommu->mmio_base + MMIO_CMD_HEAD_OFFSET); | 71 | head = readl(iommu->mmio_base + MMIO_CMD_HEAD_OFFSET); |
| @@ -101,16 +101,13 @@ static int iommu_queue_command(struct amd_iommu *iommu, struct iommu_cmd *cmd) | |||
| 101 | */ | 101 | */ |
| 102 | static int iommu_completion_wait(struct amd_iommu *iommu) | 102 | static int iommu_completion_wait(struct amd_iommu *iommu) |
| 103 | { | 103 | { |
| 104 | int ret; | 104 | int ret, ready = 0; |
| 105 | unsigned status = 0; | ||
| 105 | struct iommu_cmd cmd; | 106 | struct iommu_cmd cmd; |
| 106 | volatile u64 ready = 0; | ||
| 107 | unsigned long ready_phys = virt_to_phys(&ready); | ||
| 108 | unsigned long i = 0; | 107 | unsigned long i = 0; |
| 109 | 108 | ||
| 110 | memset(&cmd, 0, sizeof(cmd)); | 109 | memset(&cmd, 0, sizeof(cmd)); |
| 111 | cmd.data[0] = LOW_U32(ready_phys) | CMD_COMPL_WAIT_STORE_MASK; | 110 | cmd.data[0] = CMD_COMPL_WAIT_INT_MASK; |
| 112 | cmd.data[1] = upper_32_bits(ready_phys); | ||
| 113 | cmd.data[2] = 1; /* value written to 'ready' */ | ||
| 114 | CMD_SET_TYPE(&cmd, CMD_COMPL_WAIT); | 111 | CMD_SET_TYPE(&cmd, CMD_COMPL_WAIT); |
| 115 | 112 | ||
| 116 | iommu->need_sync = 0; | 113 | iommu->need_sync = 0; |
| @@ -122,9 +119,15 @@ static int iommu_completion_wait(struct amd_iommu *iommu) | |||
| 122 | 119 | ||
| 123 | while (!ready && (i < EXIT_LOOP_COUNT)) { | 120 | while (!ready && (i < EXIT_LOOP_COUNT)) { |
| 124 | ++i; | 121 | ++i; |
| 125 | cpu_relax(); | 122 | /* wait for the bit to become one */ |
| 123 | status = readl(iommu->mmio_base + MMIO_STATUS_OFFSET); | ||
| 124 | ready = status & MMIO_STATUS_COM_WAIT_INT_MASK; | ||
| 126 | } | 125 | } |
| 127 | 126 | ||
| 127 | /* set bit back to zero */ | ||
| 128 | status &= ~MMIO_STATUS_COM_WAIT_INT_MASK; | ||
| 129 | writel(status, iommu->mmio_base + MMIO_STATUS_OFFSET); | ||
| 130 | |||
| 128 | if (unlikely((i == EXIT_LOOP_COUNT) && printk_ratelimit())) | 131 | if (unlikely((i == EXIT_LOOP_COUNT) && printk_ratelimit())) |
| 129 | printk(KERN_WARNING "AMD IOMMU: Completion wait loop failed\n"); | 132 | printk(KERN_WARNING "AMD IOMMU: Completion wait loop failed\n"); |
| 130 | 133 | ||
| @@ -161,7 +164,7 @@ static int iommu_queue_inv_iommu_pages(struct amd_iommu *iommu, | |||
| 161 | address &= PAGE_MASK; | 164 | address &= PAGE_MASK; |
| 162 | CMD_SET_TYPE(&cmd, CMD_INV_IOMMU_PAGES); | 165 | CMD_SET_TYPE(&cmd, CMD_INV_IOMMU_PAGES); |
| 163 | cmd.data[1] |= domid; | 166 | cmd.data[1] |= domid; |
| 164 | cmd.data[2] = LOW_U32(address); | 167 | cmd.data[2] = lower_32_bits(address); |
| 165 | cmd.data[3] = upper_32_bits(address); | 168 | cmd.data[3] = upper_32_bits(address); |
| 166 | if (s) /* size bit - we flush more than one 4kb page */ | 169 | if (s) /* size bit - we flush more than one 4kb page */ |
| 167 | cmd.data[2] |= CMD_INV_IOMMU_PAGES_SIZE_MASK; | 170 | cmd.data[2] |= CMD_INV_IOMMU_PAGES_SIZE_MASK; |
diff --git a/arch/x86/kernel/amd_iommu_init.c b/arch/x86/kernel/amd_iommu_init.c index d9a9da597e79..a69cc0f52042 100644 --- a/arch/x86/kernel/amd_iommu_init.c +++ b/arch/x86/kernel/amd_iommu_init.c | |||
| @@ -801,6 +801,21 @@ static int __init init_memory_definitions(struct acpi_table_header *table) | |||
| 801 | } | 801 | } |
| 802 | 802 | ||
| 803 | /* | 803 | /* |
| 804 | * Init the device table to not allow DMA access for devices and | ||
| 805 | * suppress all page faults | ||
| 806 | */ | ||
| 807 | static void init_device_table(void) | ||
| 808 | { | ||
| 809 | u16 devid; | ||
| 810 | |||
| 811 | for (devid = 0; devid <= amd_iommu_last_bdf; ++devid) { | ||
| 812 | set_dev_entry_bit(devid, DEV_ENTRY_VALID); | ||
| 813 | set_dev_entry_bit(devid, DEV_ENTRY_TRANSLATION); | ||
| 814 | set_dev_entry_bit(devid, DEV_ENTRY_NO_PAGE_FAULT); | ||
| 815 | } | ||
| 816 | } | ||
| 817 | |||
| 818 | /* | ||
| 804 | * This function finally enables all IOMMUs found in the system after | 819 | * This function finally enables all IOMMUs found in the system after |
| 805 | * they have been initialized | 820 | * they have been initialized |
| 806 | */ | 821 | */ |
| @@ -931,6 +946,9 @@ int __init amd_iommu_init(void) | |||
| 931 | if (amd_iommu_pd_alloc_bitmap == NULL) | 946 | if (amd_iommu_pd_alloc_bitmap == NULL) |
| 932 | goto free; | 947 | goto free; |
| 933 | 948 | ||
| 949 | /* init the device table */ | ||
| 950 | init_device_table(); | ||
| 951 | |||
| 934 | /* | 952 | /* |
| 935 | * let all alias entries point to itself | 953 | * let all alias entries point to itself |
| 936 | */ | 954 | */ |
| @@ -954,15 +972,15 @@ int __init amd_iommu_init(void) | |||
| 954 | if (acpi_table_parse("IVRS", init_memory_definitions) != 0) | 972 | if (acpi_table_parse("IVRS", init_memory_definitions) != 0) |
| 955 | goto free; | 973 | goto free; |
| 956 | 974 | ||
| 957 | ret = amd_iommu_init_dma_ops(); | 975 | ret = sysdev_class_register(&amd_iommu_sysdev_class); |
| 958 | if (ret) | 976 | if (ret) |
| 959 | goto free; | 977 | goto free; |
| 960 | 978 | ||
| 961 | ret = sysdev_class_register(&amd_iommu_sysdev_class); | 979 | ret = sysdev_register(&device_amd_iommu); |
| 962 | if (ret) | 980 | if (ret) |
| 963 | goto free; | 981 | goto free; |
| 964 | 982 | ||
| 965 | ret = sysdev_register(&device_amd_iommu); | 983 | ret = amd_iommu_init_dma_ops(); |
| 966 | if (ret) | 984 | if (ret) |
| 967 | goto free; | 985 | goto free; |
| 968 | 986 | ||
diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c index d6c898358371..f88bd0d982b0 100644 --- a/arch/x86/kernel/apic_32.c +++ b/arch/x86/kernel/apic_32.c | |||
| @@ -1454,8 +1454,6 @@ void disconnect_bsp_APIC(int virt_wire_setup) | |||
| 1454 | } | 1454 | } |
| 1455 | } | 1455 | } |
| 1456 | 1456 | ||
| 1457 | unsigned int __cpuinitdata maxcpus = NR_CPUS; | ||
| 1458 | |||
| 1459 | void __cpuinit generic_processor_info(int apicid, int version) | 1457 | void __cpuinit generic_processor_info(int apicid, int version) |
| 1460 | { | 1458 | { |
| 1461 | int cpu; | 1459 | int cpu; |
| @@ -1482,12 +1480,6 @@ void __cpuinit generic_processor_info(int apicid, int version) | |||
| 1482 | return; | 1480 | return; |
| 1483 | } | 1481 | } |
| 1484 | 1482 | ||
| 1485 | if (num_processors >= maxcpus) { | ||
| 1486 | printk(KERN_WARNING "WARNING: maxcpus limit of %i reached." | ||
| 1487 | " Processor ignored.\n", maxcpus); | ||
| 1488 | return; | ||
| 1489 | } | ||
| 1490 | |||
| 1491 | num_processors++; | 1483 | num_processors++; |
| 1492 | cpus_complement(tmp_map, cpu_present_map); | 1484 | cpus_complement(tmp_map, cpu_present_map); |
| 1493 | cpu = first_cpu(tmp_map); | 1485 | cpu = first_cpu(tmp_map); |
| @@ -1720,15 +1712,19 @@ static int __init parse_lapic_timer_c2_ok(char *arg) | |||
| 1720 | } | 1712 | } |
| 1721 | early_param("lapic_timer_c2_ok", parse_lapic_timer_c2_ok); | 1713 | early_param("lapic_timer_c2_ok", parse_lapic_timer_c2_ok); |
| 1722 | 1714 | ||
| 1723 | static int __init apic_set_verbosity(char *str) | 1715 | static int __init apic_set_verbosity(char *arg) |
| 1724 | { | 1716 | { |
| 1725 | if (strcmp("debug", str) == 0) | 1717 | if (!arg) |
| 1718 | return -EINVAL; | ||
| 1719 | |||
| 1720 | if (strcmp(arg, "debug") == 0) | ||
| 1726 | apic_verbosity = APIC_DEBUG; | 1721 | apic_verbosity = APIC_DEBUG; |
| 1727 | else if (strcmp("verbose", str) == 0) | 1722 | else if (strcmp(arg, "verbose") == 0) |
| 1728 | apic_verbosity = APIC_VERBOSE; | 1723 | apic_verbosity = APIC_VERBOSE; |
| 1729 | return 1; | 1724 | |
| 1725 | return 0; | ||
| 1730 | } | 1726 | } |
| 1731 | __setup("apic=", apic_set_verbosity); | 1727 | early_param("apic", apic_set_verbosity); |
| 1732 | 1728 | ||
| 1733 | static int __init lapic_insert_resource(void) | 1729 | static int __init lapic_insert_resource(void) |
| 1734 | { | 1730 | { |
diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c index 7f1f030da7ee..446c062e831c 100644 --- a/arch/x86/kernel/apic_64.c +++ b/arch/x86/kernel/apic_64.c | |||
| @@ -90,7 +90,6 @@ static unsigned long apic_phys; | |||
| 90 | 90 | ||
| 91 | unsigned long mp_lapic_addr; | 91 | unsigned long mp_lapic_addr; |
| 92 | 92 | ||
| 93 | unsigned int __cpuinitdata maxcpus = NR_CPUS; | ||
| 94 | /* | 93 | /* |
| 95 | * Get the LAPIC version | 94 | * Get the LAPIC version |
| 96 | */ | 95 | */ |
| @@ -1062,12 +1061,6 @@ void __cpuinit generic_processor_info(int apicid, int version) | |||
| 1062 | return; | 1061 | return; |
| 1063 | } | 1062 | } |
| 1064 | 1063 | ||
| 1065 | if (num_processors >= maxcpus) { | ||
| 1066 | printk(KERN_WARNING "WARNING: maxcpus limit of %i reached." | ||
| 1067 | " Processor ignored.\n", maxcpus); | ||
| 1068 | return; | ||
| 1069 | } | ||
| 1070 | |||
| 1071 | num_processors++; | 1064 | num_processors++; |
| 1072 | cpus_complement(tmp_map, cpu_present_map); | 1065 | cpus_complement(tmp_map, cpu_present_map); |
| 1073 | cpu = first_cpu(tmp_map); | 1066 | cpu = first_cpu(tmp_map); |
diff --git a/arch/x86/kernel/cpu/addon_cpuid_features.c b/arch/x86/kernel/cpu/addon_cpuid_features.c index 84a8220a6072..a6ef672adbba 100644 --- a/arch/x86/kernel/cpu/addon_cpuid_features.c +++ b/arch/x86/kernel/cpu/addon_cpuid_features.c | |||
| @@ -56,9 +56,22 @@ void __cpuinit validate_pat_support(struct cpuinfo_x86 *c) | |||
| 56 | 56 | ||
| 57 | switch (c->x86_vendor) { | 57 | switch (c->x86_vendor) { |
| 58 | case X86_VENDOR_INTEL: | 58 | case X86_VENDOR_INTEL: |
| 59 | if (c->x86 == 0xF || (c->x86 == 6 && c->x86_model >= 15)) | 59 | /* |
| 60 | * There is a known erratum on Pentium III and Core Solo | ||
| 61 | * and Core Duo CPUs. | ||
| 62 | * " Page with PAT set to WC while associated MTRR is UC | ||
| 63 | * may consolidate to UC " | ||
| 64 | * Because of this erratum, it is better to stick with | ||
| 65 | * setting WC in MTRR rather than using PAT on these CPUs. | ||
| 66 | * | ||
| 67 | * Enable PAT WC only on P4, Core 2 or later CPUs. | ||
| 68 | */ | ||
| 69 | if (c->x86 > 0x6 || (c->x86 == 6 && c->x86_model >= 15)) | ||
| 60 | return; | 70 | return; |
| 61 | break; | 71 | |
| 72 | pat_disable("PAT WC disabled due to known CPU erratum."); | ||
| 73 | return; | ||
| 74 | |||
| 62 | case X86_VENDOR_AMD: | 75 | case X86_VENDOR_AMD: |
| 63 | case X86_VENDOR_CENTAUR: | 76 | case X86_VENDOR_CENTAUR: |
| 64 | case X86_VENDOR_TRANSMETA: | 77 | case X86_VENDOR_TRANSMETA: |
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index c9b58a806e85..c8e315f1aa83 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c | |||
| @@ -50,6 +50,8 @@ static double __initdata y = 3145727.0; | |||
| 50 | */ | 50 | */ |
| 51 | static void __init check_fpu(void) | 51 | static void __init check_fpu(void) |
| 52 | { | 52 | { |
| 53 | s32 fdiv_bug; | ||
| 54 | |||
| 53 | if (!boot_cpu_data.hard_math) { | 55 | if (!boot_cpu_data.hard_math) { |
| 54 | #ifndef CONFIG_MATH_EMULATION | 56 | #ifndef CONFIG_MATH_EMULATION |
| 55 | printk(KERN_EMERG "No coprocessor found and no math emulation present.\n"); | 57 | printk(KERN_EMERG "No coprocessor found and no math emulation present.\n"); |
| @@ -74,8 +76,10 @@ static void __init check_fpu(void) | |||
| 74 | "fistpl %0\n\t" | 76 | "fistpl %0\n\t" |
| 75 | "fwait\n\t" | 77 | "fwait\n\t" |
| 76 | "fninit" | 78 | "fninit" |
| 77 | : "=m" (*&boot_cpu_data.fdiv_bug) | 79 | : "=m" (*&fdiv_bug) |
| 78 | : "m" (*&x), "m" (*&y)); | 80 | : "m" (*&x), "m" (*&y)); |
| 81 | |||
| 82 | boot_cpu_data.fdiv_bug = fdiv_bug; | ||
| 79 | if (boot_cpu_data.fdiv_bug) | 83 | if (boot_cpu_data.fdiv_bug) |
| 80 | printk("Hmm, FPU with FDIV bug.\n"); | 84 | printk("Hmm, FPU with FDIV bug.\n"); |
| 81 | } | 85 | } |
diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c index 4e7271999a74..84bb395038d8 100644 --- a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c +++ b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c | |||
| @@ -737,63 +737,44 @@ static int find_psb_table(struct powernow_k8_data *data) | |||
| 737 | #ifdef CONFIG_X86_POWERNOW_K8_ACPI | 737 | #ifdef CONFIG_X86_POWERNOW_K8_ACPI |
| 738 | static void powernow_k8_acpi_pst_values(struct powernow_k8_data *data, unsigned int index) | 738 | static void powernow_k8_acpi_pst_values(struct powernow_k8_data *data, unsigned int index) |
| 739 | { | 739 | { |
| 740 | if (!data->acpi_data->state_count || (cpu_family == CPU_HW_PSTATE)) | 740 | if (!data->acpi_data.state_count || (cpu_family == CPU_HW_PSTATE)) |
| 741 | return; | 741 | return; |
| 742 | 742 | ||
| 743 | data->irt = (data->acpi_data->states[index].control >> IRT_SHIFT) & IRT_MASK; | 743 | data->irt = (data->acpi_data.states[index].control >> IRT_SHIFT) & IRT_MASK; |
| 744 | data->rvo = (data->acpi_data->states[index].control >> RVO_SHIFT) & RVO_MASK; | 744 | data->rvo = (data->acpi_data.states[index].control >> RVO_SHIFT) & RVO_MASK; |
| 745 | data->exttype = (data->acpi_data->states[index].control >> EXT_TYPE_SHIFT) & EXT_TYPE_MASK; | 745 | data->exttype = (data->acpi_data.states[index].control >> EXT_TYPE_SHIFT) & EXT_TYPE_MASK; |
| 746 | data->plllock = (data->acpi_data->states[index].control >> PLL_L_SHIFT) & PLL_L_MASK; | 746 | data->plllock = (data->acpi_data.states[index].control >> PLL_L_SHIFT) & PLL_L_MASK; |
| 747 | data->vidmvs = 1 << ((data->acpi_data->states[index].control >> MVS_SHIFT) & MVS_MASK); | 747 | data->vidmvs = 1 << ((data->acpi_data.states[index].control >> MVS_SHIFT) & MVS_MASK); |
| 748 | data->vstable = (data->acpi_data->states[index].control >> VST_SHIFT) & VST_MASK; | 748 | data->vstable = (data->acpi_data.states[index].control >> VST_SHIFT) & VST_MASK; |
| 749 | } | ||
| 750 | |||
| 751 | |||
| 752 | static struct acpi_processor_performance *acpi_perf_data; | ||
| 753 | static int preregister_valid; | ||
| 754 | |||
| 755 | static int powernow_k8_cpu_preinit_acpi(void) | ||
| 756 | { | ||
| 757 | acpi_perf_data = alloc_percpu(struct acpi_processor_performance); | ||
| 758 | if (!acpi_perf_data) | ||
| 759 | return -ENODEV; | ||
| 760 | |||
| 761 | if (acpi_processor_preregister_performance(acpi_perf_data)) | ||
| 762 | return -ENODEV; | ||
| 763 | else | ||
| 764 | preregister_valid = 1; | ||
| 765 | return 0; | ||
| 766 | } | 749 | } |
| 767 | 750 | ||
| 768 | static int powernow_k8_cpu_init_acpi(struct powernow_k8_data *data) | 751 | static int powernow_k8_cpu_init_acpi(struct powernow_k8_data *data) |
| 769 | { | 752 | { |
| 770 | struct cpufreq_frequency_table *powernow_table; | 753 | struct cpufreq_frequency_table *powernow_table; |
| 771 | int ret_val; | 754 | int ret_val; |
| 772 | int cpu = 0; | ||
| 773 | 755 | ||
| 774 | data->acpi_data = percpu_ptr(acpi_perf_data, cpu); | 756 | if (acpi_processor_register_performance(&data->acpi_data, data->cpu)) { |
| 775 | if (acpi_processor_register_performance(data->acpi_data, data->cpu)) { | ||
| 776 | dprintk("register performance failed: bad ACPI data\n"); | 757 | dprintk("register performance failed: bad ACPI data\n"); |
| 777 | return -EIO; | 758 | return -EIO; |
| 778 | } | 759 | } |
| 779 | 760 | ||
| 780 | /* verify the data contained in the ACPI structures */ | 761 | /* verify the data contained in the ACPI structures */ |
| 781 | if (data->acpi_data->state_count <= 1) { | 762 | if (data->acpi_data.state_count <= 1) { |
| 782 | dprintk("No ACPI P-States\n"); | 763 | dprintk("No ACPI P-States\n"); |
| 783 | goto err_out; | 764 | goto err_out; |
| 784 | } | 765 | } |
| 785 | 766 | ||
| 786 | if ((data->acpi_data->control_register.space_id != ACPI_ADR_SPACE_FIXED_HARDWARE) || | 767 | if ((data->acpi_data.control_register.space_id != ACPI_ADR_SPACE_FIXED_HARDWARE) || |
| 787 | (data->acpi_data->status_register.space_id != ACPI_ADR_SPACE_FIXED_HARDWARE)) { | 768 | (data->acpi_data.status_register.space_id != ACPI_ADR_SPACE_FIXED_HARDWARE)) { |
| 788 | dprintk("Invalid control/status registers (%x - %x)\n", | 769 | dprintk("Invalid control/status registers (%x - %x)\n", |
| 789 | data->acpi_data->control_register.space_id, | 770 | data->acpi_data.control_register.space_id, |
| 790 | data->acpi_data->status_register.space_id); | 771 | data->acpi_data.status_register.space_id); |
| 791 | goto err_out; | 772 | goto err_out; |
| 792 | } | 773 | } |
| 793 | 774 | ||
| 794 | /* fill in data->powernow_table */ | 775 | /* fill in data->powernow_table */ |
| 795 | powernow_table = kmalloc((sizeof(struct cpufreq_frequency_table) | 776 | powernow_table = kmalloc((sizeof(struct cpufreq_frequency_table) |
| 796 | * (data->acpi_data->state_count + 1)), GFP_KERNEL); | 777 | * (data->acpi_data.state_count + 1)), GFP_KERNEL); |
| 797 | if (!powernow_table) { | 778 | if (!powernow_table) { |
| 798 | dprintk("powernow_table memory alloc failure\n"); | 779 | dprintk("powernow_table memory alloc failure\n"); |
| 799 | goto err_out; | 780 | goto err_out; |
| @@ -806,12 +787,12 @@ static int powernow_k8_cpu_init_acpi(struct powernow_k8_data *data) | |||
| 806 | if (ret_val) | 787 | if (ret_val) |
| 807 | goto err_out_mem; | 788 | goto err_out_mem; |
| 808 | 789 | ||
| 809 | powernow_table[data->acpi_data->state_count].frequency = CPUFREQ_TABLE_END; | 790 | powernow_table[data->acpi_data.state_count].frequency = CPUFREQ_TABLE_END; |
| 810 | powernow_table[data->acpi_data->state_count].index = 0; | 791 | powernow_table[data->acpi_data.state_count].index = 0; |
| 811 | data->powernow_table = powernow_table; | 792 | data->powernow_table = powernow_table; |
| 812 | 793 | ||
| 813 | /* fill in data */ | 794 | /* fill in data */ |
| 814 | data->numps = data->acpi_data->state_count; | 795 | data->numps = data->acpi_data.state_count; |
| 815 | if (first_cpu(per_cpu(cpu_core_map, data->cpu)) == data->cpu) | 796 | if (first_cpu(per_cpu(cpu_core_map, data->cpu)) == data->cpu) |
| 816 | print_basics(data); | 797 | print_basics(data); |
| 817 | powernow_k8_acpi_pst_values(data, 0); | 798 | powernow_k8_acpi_pst_values(data, 0); |
| @@ -819,31 +800,16 @@ static int powernow_k8_cpu_init_acpi(struct powernow_k8_data *data) | |||
| 819 | /* notify BIOS that we exist */ | 800 | /* notify BIOS that we exist */ |
| 820 | acpi_processor_notify_smm(THIS_MODULE); | 801 | acpi_processor_notify_smm(THIS_MODULE); |
| 821 | 802 | ||
| 822 | /* determine affinity, from ACPI if available */ | ||
| 823 | if (preregister_valid) { | ||
| 824 | if ((data->acpi_data->shared_type == CPUFREQ_SHARED_TYPE_ALL) || | ||
| 825 | (data->acpi_data->shared_type == CPUFREQ_SHARED_TYPE_ANY)) | ||
| 826 | data->starting_core_affinity = data->acpi_data->shared_cpu_map; | ||
| 827 | else | ||
| 828 | data->starting_core_affinity = cpumask_of_cpu(data->cpu); | ||
| 829 | } else { | ||
| 830 | /* best guess from family if not */ | ||
| 831 | if (cpu_family == CPU_HW_PSTATE) | ||
| 832 | data->starting_core_affinity = cpumask_of_cpu(data->cpu); | ||
| 833 | else | ||
| 834 | data->starting_core_affinity = per_cpu(cpu_core_map, data->cpu); | ||
| 835 | } | ||
| 836 | |||
| 837 | return 0; | 803 | return 0; |
| 838 | 804 | ||
| 839 | err_out_mem: | 805 | err_out_mem: |
| 840 | kfree(powernow_table); | 806 | kfree(powernow_table); |
| 841 | 807 | ||
| 842 | err_out: | 808 | err_out: |
| 843 | acpi_processor_unregister_performance(data->acpi_data, data->cpu); | 809 | acpi_processor_unregister_performance(&data->acpi_data, data->cpu); |
| 844 | 810 | ||
| 845 | /* data->acpi_data.state_count informs us at ->exit() whether ACPI was used */ | 811 | /* data->acpi_data.state_count informs us at ->exit() whether ACPI was used */ |
| 846 | data->acpi_data->state_count = 0; | 812 | data->acpi_data.state_count = 0; |
| 847 | 813 | ||
| 848 | return -ENODEV; | 814 | return -ENODEV; |
| 849 | } | 815 | } |
| @@ -855,10 +821,10 @@ static int fill_powernow_table_pstate(struct powernow_k8_data *data, struct cpuf | |||
| 855 | rdmsr(MSR_PSTATE_CUR_LIMIT, hi, lo); | 821 | rdmsr(MSR_PSTATE_CUR_LIMIT, hi, lo); |
| 856 | data->max_hw_pstate = (hi & HW_PSTATE_MAX_MASK) >> HW_PSTATE_MAX_SHIFT; | 822 | data->max_hw_pstate = (hi & HW_PSTATE_MAX_MASK) >> HW_PSTATE_MAX_SHIFT; |
| 857 | 823 | ||
| 858 | for (i = 0; i < data->acpi_data->state_count; i++) { | 824 | for (i = 0; i < data->acpi_data.state_count; i++) { |
| 859 | u32 index; | 825 | u32 index; |
| 860 | 826 | ||
| 861 | index = data->acpi_data->states[i].control & HW_PSTATE_MASK; | 827 | index = data->acpi_data.states[i].control & HW_PSTATE_MASK; |
| 862 | if (index > data->max_hw_pstate) { | 828 | if (index > data->max_hw_pstate) { |
| 863 | printk(KERN_ERR PFX "invalid pstate %d - bad value %d.\n", i, index); | 829 | printk(KERN_ERR PFX "invalid pstate %d - bad value %d.\n", i, index); |
| 864 | printk(KERN_ERR PFX "Please report to BIOS manufacturer\n"); | 830 | printk(KERN_ERR PFX "Please report to BIOS manufacturer\n"); |
| @@ -874,7 +840,7 @@ static int fill_powernow_table_pstate(struct powernow_k8_data *data, struct cpuf | |||
| 874 | 840 | ||
| 875 | powernow_table[i].index = index; | 841 | powernow_table[i].index = index; |
| 876 | 842 | ||
| 877 | powernow_table[i].frequency = data->acpi_data->states[i].core_frequency * 1000; | 843 | powernow_table[i].frequency = data->acpi_data.states[i].core_frequency * 1000; |
| 878 | } | 844 | } |
| 879 | return 0; | 845 | return 0; |
| 880 | } | 846 | } |
| @@ -883,16 +849,16 @@ static int fill_powernow_table_fidvid(struct powernow_k8_data *data, struct cpuf | |||
| 883 | { | 849 | { |
| 884 | int i; | 850 | int i; |
| 885 | int cntlofreq = 0; | 851 | int cntlofreq = 0; |
| 886 | for (i = 0; i < data->acpi_data->state_count; i++) { | 852 | for (i = 0; i < data->acpi_data.state_count; i++) { |
| 887 | u32 fid; | 853 | u32 fid; |
| 888 | u32 vid; | 854 | u32 vid; |
| 889 | 855 | ||
| 890 | if (data->exttype) { | 856 | if (data->exttype) { |
| 891 | fid = data->acpi_data->states[i].status & EXT_FID_MASK; | 857 | fid = data->acpi_data.states[i].status & EXT_FID_MASK; |
| 892 | vid = (data->acpi_data->states[i].status >> VID_SHIFT) & EXT_VID_MASK; | 858 | vid = (data->acpi_data.states[i].status >> VID_SHIFT) & EXT_VID_MASK; |
| 893 | } else { | 859 | } else { |
| 894 | fid = data->acpi_data->states[i].control & FID_MASK; | 860 | fid = data->acpi_data.states[i].control & FID_MASK; |
| 895 | vid = (data->acpi_data->states[i].control >> VID_SHIFT) & VID_MASK; | 861 | vid = (data->acpi_data.states[i].control >> VID_SHIFT) & VID_MASK; |
| 896 | } | 862 | } |
| 897 | 863 | ||
| 898 | dprintk(" %d : fid 0x%x, vid 0x%x\n", i, fid, vid); | 864 | dprintk(" %d : fid 0x%x, vid 0x%x\n", i, fid, vid); |
| @@ -933,10 +899,10 @@ static int fill_powernow_table_fidvid(struct powernow_k8_data *data, struct cpuf | |||
| 933 | cntlofreq = i; | 899 | cntlofreq = i; |
| 934 | } | 900 | } |
| 935 | 901 | ||
| 936 | if (powernow_table[i].frequency != (data->acpi_data->states[i].core_frequency * 1000)) { | 902 | if (powernow_table[i].frequency != (data->acpi_data.states[i].core_frequency * 1000)) { |
| 937 | printk(KERN_INFO PFX "invalid freq entries %u kHz vs. %u kHz\n", | 903 | printk(KERN_INFO PFX "invalid freq entries %u kHz vs. %u kHz\n", |
| 938 | powernow_table[i].frequency, | 904 | powernow_table[i].frequency, |
| 939 | (unsigned int) (data->acpi_data->states[i].core_frequency * 1000)); | 905 | (unsigned int) (data->acpi_data.states[i].core_frequency * 1000)); |
| 940 | powernow_table[i].frequency = CPUFREQ_ENTRY_INVALID; | 906 | powernow_table[i].frequency = CPUFREQ_ENTRY_INVALID; |
| 941 | continue; | 907 | continue; |
| 942 | } | 908 | } |
| @@ -946,12 +912,11 @@ static int fill_powernow_table_fidvid(struct powernow_k8_data *data, struct cpuf | |||
| 946 | 912 | ||
| 947 | static void powernow_k8_cpu_exit_acpi(struct powernow_k8_data *data) | 913 | static void powernow_k8_cpu_exit_acpi(struct powernow_k8_data *data) |
| 948 | { | 914 | { |
| 949 | if (data->acpi_data->state_count) | 915 | if (data->acpi_data.state_count) |
| 950 | acpi_processor_unregister_performance(data->acpi_data, data->cpu); | 916 | acpi_processor_unregister_performance(&data->acpi_data, data->cpu); |
| 951 | } | 917 | } |
| 952 | 918 | ||
| 953 | #else | 919 | #else |
| 954 | static int powernow_k8_cpu_preinit_acpi(void) { return -ENODEV; } | ||
| 955 | static int powernow_k8_cpu_init_acpi(struct powernow_k8_data *data) { return -ENODEV; } | 920 | static int powernow_k8_cpu_init_acpi(struct powernow_k8_data *data) { return -ENODEV; } |
| 956 | static void powernow_k8_cpu_exit_acpi(struct powernow_k8_data *data) { return; } | 921 | static void powernow_k8_cpu_exit_acpi(struct powernow_k8_data *data) { return; } |
| 957 | static void powernow_k8_acpi_pst_values(struct powernow_k8_data *data, unsigned int index) { return; } | 922 | static void powernow_k8_acpi_pst_values(struct powernow_k8_data *data, unsigned int index) { return; } |
| @@ -1136,7 +1101,7 @@ static int powernowk8_verify(struct cpufreq_policy *pol) | |||
| 1136 | static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol) | 1101 | static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol) |
| 1137 | { | 1102 | { |
| 1138 | struct powernow_k8_data *data; | 1103 | struct powernow_k8_data *data; |
| 1139 | cpumask_t oldmask = CPU_MASK_ALL; | 1104 | cpumask_t oldmask; |
| 1140 | int rc; | 1105 | int rc; |
| 1141 | 1106 | ||
| 1142 | if (!cpu_online(pol->cpu)) | 1107 | if (!cpu_online(pol->cpu)) |
| @@ -1209,7 +1174,10 @@ static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol) | |||
| 1209 | /* run on any CPU again */ | 1174 | /* run on any CPU again */ |
| 1210 | set_cpus_allowed_ptr(current, &oldmask); | 1175 | set_cpus_allowed_ptr(current, &oldmask); |
| 1211 | 1176 | ||
| 1212 | pol->cpus = data->starting_core_affinity; | 1177 | if (cpu_family == CPU_HW_PSTATE) |
| 1178 | pol->cpus = cpumask_of_cpu(pol->cpu); | ||
| 1179 | else | ||
| 1180 | pol->cpus = per_cpu(cpu_core_map, pol->cpu); | ||
| 1213 | data->available_cores = &(pol->cpus); | 1181 | data->available_cores = &(pol->cpus); |
| 1214 | 1182 | ||
| 1215 | /* Take a crude guess here. | 1183 | /* Take a crude guess here. |
| @@ -1332,7 +1300,6 @@ static int __cpuinit powernowk8_init(void) | |||
| 1332 | } | 1300 | } |
| 1333 | 1301 | ||
| 1334 | if (supported_cpus == num_online_cpus()) { | 1302 | if (supported_cpus == num_online_cpus()) { |
| 1335 | powernow_k8_cpu_preinit_acpi(); | ||
| 1336 | printk(KERN_INFO PFX "Found %d %s " | 1303 | printk(KERN_INFO PFX "Found %d %s " |
| 1337 | "processors (%d cpu cores) (" VERSION ")\n", | 1304 | "processors (%d cpu cores) (" VERSION ")\n", |
| 1338 | num_online_nodes(), | 1305 | num_online_nodes(), |
| @@ -1349,10 +1316,6 @@ static void __exit powernowk8_exit(void) | |||
| 1349 | dprintk("exit\n"); | 1316 | dprintk("exit\n"); |
| 1350 | 1317 | ||
| 1351 | cpufreq_unregister_driver(&cpufreq_amd64_driver); | 1318 | cpufreq_unregister_driver(&cpufreq_amd64_driver); |
| 1352 | |||
| 1353 | #ifdef CONFIG_X86_POWERNOW_K8_ACPI | ||
| 1354 | free_percpu(acpi_perf_data); | ||
| 1355 | #endif | ||
| 1356 | } | 1319 | } |
| 1357 | 1320 | ||
| 1358 | MODULE_AUTHOR("Paul Devriendt <paul.devriendt@amd.com> and Mark Langsdorf <mark.langsdorf@amd.com>"); | 1321 | MODULE_AUTHOR("Paul Devriendt <paul.devriendt@amd.com> and Mark Langsdorf <mark.langsdorf@amd.com>"); |
diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k8.h b/arch/x86/kernel/cpu/cpufreq/powernow-k8.h index a62612cd4be8..ab48cfed4d96 100644 --- a/arch/x86/kernel/cpu/cpufreq/powernow-k8.h +++ b/arch/x86/kernel/cpu/cpufreq/powernow-k8.h | |||
| @@ -33,13 +33,12 @@ struct powernow_k8_data { | |||
| 33 | #ifdef CONFIG_X86_POWERNOW_K8_ACPI | 33 | #ifdef CONFIG_X86_POWERNOW_K8_ACPI |
| 34 | /* the acpi table needs to be kept. it's only available if ACPI was | 34 | /* the acpi table needs to be kept. it's only available if ACPI was |
| 35 | * used to determine valid frequency/vid/fid states */ | 35 | * used to determine valid frequency/vid/fid states */ |
| 36 | struct acpi_processor_performance *acpi_data; | 36 | struct acpi_processor_performance acpi_data; |
| 37 | #endif | 37 | #endif |
| 38 | /* we need to keep track of associated cores, but let cpufreq | 38 | /* we need to keep track of associated cores, but let cpufreq |
| 39 | * handle hotplug events - so just point at cpufreq pol->cpus | 39 | * handle hotplug events - so just point at cpufreq pol->cpus |
| 40 | * structure */ | 40 | * structure */ |
| 41 | cpumask_t *available_cores; | 41 | cpumask_t *available_cores; |
| 42 | cpumask_t starting_core_affinity; | ||
| 43 | }; | 42 | }; |
| 44 | 43 | ||
| 45 | 44 | ||
diff --git a/arch/x86/kernel/cpu/cyrix.c b/arch/x86/kernel/cpu/cyrix.c index 3fd7a67bb06a..e710a21bb6e8 100644 --- a/arch/x86/kernel/cpu/cyrix.c +++ b/arch/x86/kernel/cpu/cyrix.c | |||
| @@ -134,23 +134,6 @@ static void __cpuinit set_cx86_memwb(void) | |||
| 134 | setCx86(CX86_CCR2, getCx86(CX86_CCR2) | 0x14); | 134 | setCx86(CX86_CCR2, getCx86(CX86_CCR2) | 0x14); |
| 135 | } | 135 | } |
| 136 | 136 | ||
| 137 | static void __cpuinit set_cx86_inc(void) | ||
| 138 | { | ||
| 139 | unsigned char ccr3; | ||
| 140 | |||
| 141 | printk(KERN_INFO "Enable Incrementor on Cyrix/NSC processor.\n"); | ||
| 142 | |||
| 143 | ccr3 = getCx86(CX86_CCR3); | ||
| 144 | setCx86(CX86_CCR3, (ccr3 & 0x0f) | 0x10); /* enable MAPEN */ | ||
| 145 | /* PCR1 -- Performance Control */ | ||
| 146 | /* Incrementor on, whatever that is */ | ||
| 147 | setCx86(CX86_PCR1, getCx86(CX86_PCR1) | 0x02); | ||
| 148 | /* PCR0 -- Performance Control */ | ||
| 149 | /* Incrementor Margin 10 */ | ||
| 150 | setCx86(CX86_PCR0, getCx86(CX86_PCR0) | 0x04); | ||
| 151 | setCx86(CX86_CCR3, ccr3); /* disable MAPEN */ | ||
| 152 | } | ||
| 153 | |||
| 154 | /* | 137 | /* |
| 155 | * Configure later MediaGX and/or Geode processor. | 138 | * Configure later MediaGX and/or Geode processor. |
| 156 | */ | 139 | */ |
| @@ -174,7 +157,6 @@ static void __cpuinit geode_configure(void) | |||
| 174 | 157 | ||
| 175 | set_cx86_memwb(); | 158 | set_cx86_memwb(); |
| 176 | set_cx86_reorder(); | 159 | set_cx86_reorder(); |
| 177 | set_cx86_inc(); | ||
| 178 | 160 | ||
| 179 | local_irq_restore(flags); | 161 | local_irq_restore(flags); |
| 180 | } | 162 | } |
diff --git a/arch/x86/kernel/cpu/mcheck/mce_64.c b/arch/x86/kernel/cpu/mcheck/mce_64.c index 65a339678ece..726a5fcdf341 100644 --- a/arch/x86/kernel/cpu/mcheck/mce_64.c +++ b/arch/x86/kernel/cpu/mcheck/mce_64.c | |||
| @@ -759,6 +759,7 @@ static struct sysdev_class mce_sysclass = { | |||
| 759 | }; | 759 | }; |
| 760 | 760 | ||
| 761 | DEFINE_PER_CPU(struct sys_device, device_mce); | 761 | DEFINE_PER_CPU(struct sys_device, device_mce); |
| 762 | void (*threshold_cpu_callback)(unsigned long action, unsigned int cpu) __cpuinitdata; | ||
| 762 | 763 | ||
| 763 | /* Why are there no generic functions for this? */ | 764 | /* Why are there no generic functions for this? */ |
| 764 | #define ACCESSOR(name, var, start) \ | 765 | #define ACCESSOR(name, var, start) \ |
| @@ -883,9 +884,13 @@ static int __cpuinit mce_cpu_callback(struct notifier_block *nfb, | |||
| 883 | case CPU_ONLINE: | 884 | case CPU_ONLINE: |
| 884 | case CPU_ONLINE_FROZEN: | 885 | case CPU_ONLINE_FROZEN: |
| 885 | mce_create_device(cpu); | 886 | mce_create_device(cpu); |
| 887 | if (threshold_cpu_callback) | ||
| 888 | threshold_cpu_callback(action, cpu); | ||
| 886 | break; | 889 | break; |
| 887 | case CPU_DEAD: | 890 | case CPU_DEAD: |
| 888 | case CPU_DEAD_FROZEN: | 891 | case CPU_DEAD_FROZEN: |
| 892 | if (threshold_cpu_callback) | ||
| 893 | threshold_cpu_callback(action, cpu); | ||
| 889 | mce_remove_device(cpu); | 894 | mce_remove_device(cpu); |
| 890 | break; | 895 | break; |
| 891 | } | 896 | } |
diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd_64.c b/arch/x86/kernel/cpu/mcheck/mce_amd_64.c index 88736cadbaa6..5eb390a4b2e9 100644 --- a/arch/x86/kernel/cpu/mcheck/mce_amd_64.c +++ b/arch/x86/kernel/cpu/mcheck/mce_amd_64.c | |||
| @@ -628,6 +628,7 @@ static void threshold_remove_bank(unsigned int cpu, int bank) | |||
| 628 | deallocate_threshold_block(cpu, bank); | 628 | deallocate_threshold_block(cpu, bank); |
| 629 | 629 | ||
| 630 | free_out: | 630 | free_out: |
| 631 | kobject_del(b->kobj); | ||
| 631 | kobject_put(b->kobj); | 632 | kobject_put(b->kobj); |
| 632 | kfree(b); | 633 | kfree(b); |
| 633 | per_cpu(threshold_banks, cpu)[bank] = NULL; | 634 | per_cpu(threshold_banks, cpu)[bank] = NULL; |
| @@ -645,14 +646,11 @@ static void threshold_remove_device(unsigned int cpu) | |||
| 645 | } | 646 | } |
| 646 | 647 | ||
| 647 | /* get notified when a cpu comes on/off */ | 648 | /* get notified when a cpu comes on/off */ |
| 648 | static int __cpuinit threshold_cpu_callback(struct notifier_block *nfb, | 649 | static void __cpuinit amd_64_threshold_cpu_callback(unsigned long action, |
| 649 | unsigned long action, void *hcpu) | 650 | unsigned int cpu) |
| 650 | { | 651 | { |
| 651 | /* cpu was unsigned int to begin with */ | ||
| 652 | unsigned int cpu = (unsigned long)hcpu; | ||
| 653 | |||
| 654 | if (cpu >= NR_CPUS) | 652 | if (cpu >= NR_CPUS) |
| 655 | goto out; | 653 | return; |
| 656 | 654 | ||
| 657 | switch (action) { | 655 | switch (action) { |
| 658 | case CPU_ONLINE: | 656 | case CPU_ONLINE: |
| @@ -666,14 +664,8 @@ static int __cpuinit threshold_cpu_callback(struct notifier_block *nfb, | |||
| 666 | default: | 664 | default: |
| 667 | break; | 665 | break; |
| 668 | } | 666 | } |
| 669 | out: | ||
| 670 | return NOTIFY_OK; | ||
| 671 | } | 667 | } |
| 672 | 668 | ||
| 673 | static struct notifier_block threshold_cpu_notifier __cpuinitdata = { | ||
| 674 | .notifier_call = threshold_cpu_callback, | ||
| 675 | }; | ||
| 676 | |||
| 677 | static __init int threshold_init_device(void) | 669 | static __init int threshold_init_device(void) |
| 678 | { | 670 | { |
| 679 | unsigned lcpu = 0; | 671 | unsigned lcpu = 0; |
| @@ -684,7 +676,7 @@ static __init int threshold_init_device(void) | |||
| 684 | if (err) | 676 | if (err) |
| 685 | return err; | 677 | return err; |
| 686 | } | 678 | } |
| 687 | register_hotcpu_notifier(&threshold_cpu_notifier); | 679 | threshold_cpu_callback = amd_64_threshold_cpu_callback; |
| 688 | return 0; | 680 | return 0; |
| 689 | } | 681 | } |
| 690 | 682 | ||
diff --git a/arch/x86/kernel/cpu/mtrr/generic.c b/arch/x86/kernel/cpu/mtrr/generic.c index 509bd3d9eacd..cb7d3b6a80eb 100644 --- a/arch/x86/kernel/cpu/mtrr/generic.c +++ b/arch/x86/kernel/cpu/mtrr/generic.c | |||
| @@ -379,6 +379,7 @@ static void generic_get_mtrr(unsigned int reg, unsigned long *base, | |||
| 379 | unsigned long *size, mtrr_type *type) | 379 | unsigned long *size, mtrr_type *type) |
| 380 | { | 380 | { |
| 381 | unsigned int mask_lo, mask_hi, base_lo, base_hi; | 381 | unsigned int mask_lo, mask_hi, base_lo, base_hi; |
| 382 | unsigned int tmp, hi; | ||
| 382 | 383 | ||
| 383 | rdmsr(MTRRphysMask_MSR(reg), mask_lo, mask_hi); | 384 | rdmsr(MTRRphysMask_MSR(reg), mask_lo, mask_hi); |
| 384 | if ((mask_lo & 0x800) == 0) { | 385 | if ((mask_lo & 0x800) == 0) { |
| @@ -392,8 +393,23 @@ static void generic_get_mtrr(unsigned int reg, unsigned long *base, | |||
| 392 | rdmsr(MTRRphysBase_MSR(reg), base_lo, base_hi); | 393 | rdmsr(MTRRphysBase_MSR(reg), base_lo, base_hi); |
| 393 | 394 | ||
| 394 | /* Work out the shifted address mask. */ | 395 | /* Work out the shifted address mask. */ |
| 395 | mask_lo = size_or_mask | mask_hi << (32 - PAGE_SHIFT) | 396 | tmp = mask_hi << (32 - PAGE_SHIFT) | mask_lo >> PAGE_SHIFT; |
| 396 | | mask_lo >> PAGE_SHIFT; | 397 | mask_lo = size_or_mask | tmp; |
| 398 | /* Expand tmp with high bits to all 1s*/ | ||
| 399 | hi = fls(tmp); | ||
| 400 | if (hi > 0) { | ||
| 401 | tmp |= ~((1<<(hi - 1)) - 1); | ||
| 402 | |||
| 403 | if (tmp != mask_lo) { | ||
| 404 | static int once = 1; | ||
| 405 | |||
| 406 | if (once) { | ||
| 407 | printk(KERN_INFO "mtrr: your BIOS has set up an incorrect mask, fixing it up.\n"); | ||
| 408 | once = 0; | ||
| 409 | } | ||
| 410 | mask_lo = tmp; | ||
| 411 | } | ||
| 412 | } | ||
| 397 | 413 | ||
| 398 | /* This works correctly if size is a power of two, i.e. a | 414 | /* This works correctly if size is a power of two, i.e. a |
| 399 | contiguous range. */ | 415 | contiguous range. */ |
diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c index 6f23969c8faf..b117d7f8a564 100644 --- a/arch/x86/kernel/cpu/mtrr/main.c +++ b/arch/x86/kernel/cpu/mtrr/main.c | |||
| @@ -1496,11 +1496,8 @@ int __init mtrr_trim_uncached_memory(unsigned long end_pfn) | |||
| 1496 | 1496 | ||
| 1497 | /* kvm/qemu doesn't have mtrr set right, don't trim them all */ | 1497 | /* kvm/qemu doesn't have mtrr set right, don't trim them all */ |
| 1498 | if (!highest_pfn) { | 1498 | if (!highest_pfn) { |
| 1499 | if (!kvm_para_available()) { | 1499 | WARN(!kvm_para_available(), KERN_WARNING |
| 1500 | printk(KERN_WARNING | ||
| 1501 | "WARNING: strange, CPU MTRRs all blank?\n"); | 1500 | "WARNING: strange, CPU MTRRs all blank?\n"); |
| 1502 | WARN_ON(1); | ||
| 1503 | } | ||
| 1504 | return 0; | 1501 | return 0; |
| 1505 | } | 1502 | } |
| 1506 | 1503 | ||
diff --git a/arch/x86/kernel/cpu/perfctr-watchdog.c b/arch/x86/kernel/cpu/perfctr-watchdog.c index de7439f82b92..05cc22dbd4ff 100644 --- a/arch/x86/kernel/cpu/perfctr-watchdog.c +++ b/arch/x86/kernel/cpu/perfctr-watchdog.c | |||
| @@ -478,7 +478,13 @@ static int setup_p4_watchdog(unsigned nmi_hz) | |||
| 478 | perfctr_msr = MSR_P4_IQ_PERFCTR1; | 478 | perfctr_msr = MSR_P4_IQ_PERFCTR1; |
| 479 | evntsel_msr = MSR_P4_CRU_ESCR0; | 479 | evntsel_msr = MSR_P4_CRU_ESCR0; |
| 480 | cccr_msr = MSR_P4_IQ_CCCR1; | 480 | cccr_msr = MSR_P4_IQ_CCCR1; |
| 481 | cccr_val = P4_CCCR_OVF_PMI1 | P4_CCCR_ESCR_SELECT(4); | 481 | |
| 482 | /* Pentium 4 D processors don't support P4_CCCR_OVF_PMI1 */ | ||
| 483 | if (boot_cpu_data.x86_model == 4 && boot_cpu_data.x86_mask == 4) | ||
| 484 | cccr_val = P4_CCCR_OVF_PMI0; | ||
| 485 | else | ||
| 486 | cccr_val = P4_CCCR_OVF_PMI1; | ||
| 487 | cccr_val |= P4_CCCR_ESCR_SELECT(4); | ||
| 482 | } | 488 | } |
| 483 | 489 | ||
| 484 | evntsel = P4_ESCR_EVENT_SELECT(0x3F) | 490 | evntsel = P4_ESCR_EVENT_SELECT(0x3F) |
diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c index 14b11b3be31c..8e9cd6a8ec12 100644 --- a/arch/x86/kernel/cpuid.c +++ b/arch/x86/kernel/cpuid.c | |||
| @@ -89,6 +89,8 @@ static ssize_t cpuid_read(struct file *file, char __user *buf, | |||
| 89 | struct cpuid_regs cmd; | 89 | struct cpuid_regs cmd; |
| 90 | int cpu = iminor(file->f_path.dentry->d_inode); | 90 | int cpu = iminor(file->f_path.dentry->d_inode); |
| 91 | u64 pos = *ppos; | 91 | u64 pos = *ppos; |
| 92 | ssize_t bytes = 0; | ||
| 93 | int err = 0; | ||
| 92 | 94 | ||
| 93 | if (count % 16) | 95 | if (count % 16) |
| 94 | return -EINVAL; /* Invalid chunk size */ | 96 | return -EINVAL; /* Invalid chunk size */ |
| @@ -96,14 +98,19 @@ static ssize_t cpuid_read(struct file *file, char __user *buf, | |||
| 96 | for (; count; count -= 16) { | 98 | for (; count; count -= 16) { |
| 97 | cmd.eax = pos; | 99 | cmd.eax = pos; |
| 98 | cmd.ecx = pos >> 32; | 100 | cmd.ecx = pos >> 32; |
| 99 | smp_call_function_single(cpu, cpuid_smp_cpuid, &cmd, 1); | 101 | err = smp_call_function_single(cpu, cpuid_smp_cpuid, &cmd, 1); |
| 100 | if (copy_to_user(tmp, &cmd, 16)) | 102 | if (err) |
| 101 | return -EFAULT; | 103 | break; |
| 104 | if (copy_to_user(tmp, &cmd, 16)) { | ||
| 105 | err = -EFAULT; | ||
| 106 | break; | ||
| 107 | } | ||
| 102 | tmp += 16; | 108 | tmp += 16; |
| 109 | bytes += 16; | ||
| 103 | *ppos = ++pos; | 110 | *ppos = ++pos; |
| 104 | } | 111 | } |
| 105 | 112 | ||
| 106 | return tmp - buf; | 113 | return bytes ? bytes : err; |
| 107 | } | 114 | } |
| 108 | 115 | ||
| 109 | static int cpuid_open(struct inode *inode, struct file *file) | 116 | static int cpuid_open(struct inode *inode, struct file *file) |
diff --git a/arch/x86/kernel/efi_32.c b/arch/x86/kernel/efi_32.c index 4b63c8e1f13b..5cab48ee61a4 100644 --- a/arch/x86/kernel/efi_32.c +++ b/arch/x86/kernel/efi_32.c | |||
| @@ -53,7 +53,7 @@ void efi_call_phys_prelog(void) | |||
| 53 | * directory. If I have PAE, I just need to duplicate one entry in | 53 | * directory. If I have PAE, I just need to duplicate one entry in |
| 54 | * page directory. | 54 | * page directory. |
| 55 | */ | 55 | */ |
| 56 | cr4 = read_cr4(); | 56 | cr4 = read_cr4_safe(); |
| 57 | 57 | ||
| 58 | if (cr4 & X86_CR4_PAE) { | 58 | if (cr4 & X86_CR4_PAE) { |
| 59 | efi_bak_pg_dir_pointer[0].pgd = | 59 | efi_bak_pg_dir_pointer[0].pgd = |
| @@ -91,7 +91,7 @@ void efi_call_phys_epilog(void) | |||
| 91 | gdt_descr.size = GDT_SIZE - 1; | 91 | gdt_descr.size = GDT_SIZE - 1; |
| 92 | load_gdt(&gdt_descr); | 92 | load_gdt(&gdt_descr); |
| 93 | 93 | ||
| 94 | cr4 = read_cr4(); | 94 | cr4 = read_cr4_safe(); |
| 95 | 95 | ||
| 96 | if (cr4 & X86_CR4_PAE) { | 96 | if (cr4 & X86_CR4_PAE) { |
| 97 | swapper_pg_dir[pgd_index(0)].pgd = | 97 | swapper_pg_dir[pgd_index(0)].pgd = |
diff --git a/arch/x86/kernel/genx2apic_uv_x.c b/arch/x86/kernel/genx2apic_uv_x.c index 2cfcbded888a..bfa837cb16be 100644 --- a/arch/x86/kernel/genx2apic_uv_x.c +++ b/arch/x86/kernel/genx2apic_uv_x.c | |||
| @@ -222,7 +222,7 @@ static __init void map_low_mmrs(void) | |||
| 222 | 222 | ||
| 223 | enum map_type {map_wb, map_uc}; | 223 | enum map_type {map_wb, map_uc}; |
| 224 | 224 | ||
| 225 | static void map_high(char *id, unsigned long base, int shift, enum map_type map_type) | 225 | static __init void map_high(char *id, unsigned long base, int shift, enum map_type map_type) |
| 226 | { | 226 | { |
| 227 | unsigned long bytes, paddr; | 227 | unsigned long bytes, paddr; |
| 228 | 228 | ||
| @@ -293,7 +293,9 @@ static __init void uv_rtc_init(void) | |||
| 293 | sn_rtc_cycles_per_second = ticks_per_sec; | 293 | sn_rtc_cycles_per_second = ticks_per_sec; |
| 294 | } | 294 | } |
| 295 | 295 | ||
| 296 | static __init void uv_system_init(void) | 296 | static bool uv_system_inited; |
| 297 | |||
| 298 | void __init uv_system_init(void) | ||
| 297 | { | 299 | { |
| 298 | union uvh_si_addr_map_config_u m_n_config; | 300 | union uvh_si_addr_map_config_u m_n_config; |
| 299 | union uvh_node_id_u node_id; | 301 | union uvh_node_id_u node_id; |
| @@ -383,6 +385,7 @@ static __init void uv_system_init(void) | |||
| 383 | map_mmr_high(max_pnode); | 385 | map_mmr_high(max_pnode); |
| 384 | map_config_high(max_pnode); | 386 | map_config_high(max_pnode); |
| 385 | map_mmioh_high(max_pnode); | 387 | map_mmioh_high(max_pnode); |
| 388 | uv_system_inited = true; | ||
| 386 | } | 389 | } |
| 387 | 390 | ||
| 388 | /* | 391 | /* |
| @@ -391,8 +394,7 @@ static __init void uv_system_init(void) | |||
| 391 | */ | 394 | */ |
| 392 | void __cpuinit uv_cpu_init(void) | 395 | void __cpuinit uv_cpu_init(void) |
| 393 | { | 396 | { |
| 394 | if (!uv_node_to_blade) | 397 | BUG_ON(!uv_system_inited); |
| 395 | uv_system_init(); | ||
| 396 | 398 | ||
| 397 | uv_blade_info[uv_numa_blade_id()].nr_online_cpus++; | 399 | uv_blade_info[uv_numa_blade_id()].nr_online_cpus++; |
| 398 | 400 | ||
diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c index 1b318e903bf6..9bfc4d72fb2e 100644 --- a/arch/x86/kernel/head64.c +++ b/arch/x86/kernel/head64.c | |||
| @@ -88,6 +88,7 @@ void __init x86_64_start_kernel(char * real_mode_data) | |||
| 88 | BUILD_BUG_ON(!(MODULES_VADDR > __START_KERNEL)); | 88 | BUILD_BUG_ON(!(MODULES_VADDR > __START_KERNEL)); |
| 89 | BUILD_BUG_ON(!(((MODULES_END - 1) & PGDIR_MASK) == | 89 | BUILD_BUG_ON(!(((MODULES_END - 1) & PGDIR_MASK) == |
| 90 | (__START_KERNEL & PGDIR_MASK))); | 90 | (__START_KERNEL & PGDIR_MASK))); |
| 91 | BUILD_BUG_ON(__fix_to_virt(__end_of_fixed_addresses) <= MODULES_END); | ||
| 91 | 92 | ||
| 92 | /* clear bss before set_intr_gate with early_idt_handler */ | 93 | /* clear bss before set_intr_gate with early_idt_handler */ |
| 93 | clear_bss(); | 94 | clear_bss(); |
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c index ad2b15a1334d..59fd3b6b1303 100644 --- a/arch/x86/kernel/hpet.c +++ b/arch/x86/kernel/hpet.c | |||
| @@ -359,6 +359,7 @@ static int hpet_clocksource_register(void) | |||
| 359 | int __init hpet_enable(void) | 359 | int __init hpet_enable(void) |
| 360 | { | 360 | { |
| 361 | unsigned long id; | 361 | unsigned long id; |
| 362 | int i; | ||
| 362 | 363 | ||
| 363 | if (!is_hpet_capable()) | 364 | if (!is_hpet_capable()) |
| 364 | return 0; | 365 | return 0; |
| @@ -369,6 +370,29 @@ int __init hpet_enable(void) | |||
| 369 | * Read the period and check for a sane value: | 370 | * Read the period and check for a sane value: |
| 370 | */ | 371 | */ |
| 371 | hpet_period = hpet_readl(HPET_PERIOD); | 372 | hpet_period = hpet_readl(HPET_PERIOD); |
| 373 | |||
| 374 | /* | ||
| 375 | * AMD SB700 based systems with spread spectrum enabled use a | ||
| 376 | * SMM based HPET emulation to provide proper frequency | ||
| 377 | * setting. The SMM code is initialized with the first HPET | ||
| 378 | * register access and takes some time to complete. During | ||
| 379 | * this time the config register reads 0xffffffff. We check | ||
| 380 | * for max. 1000 loops whether the config register reads a non | ||
| 381 | * 0xffffffff value to make sure that HPET is up and running | ||
| 382 | * before we go further. A counting loop is safe, as the HPET | ||
| 383 | * access takes thousands of CPU cycles. On non SB700 based | ||
| 384 | * machines this check is only done once and has no side | ||
| 385 | * effects. | ||
| 386 | */ | ||
| 387 | for (i = 0; hpet_readl(HPET_CFG) == 0xFFFFFFFF; i++) { | ||
| 388 | if (i == 1000) { | ||
| 389 | printk(KERN_WARNING | ||
| 390 | "HPET config register value = 0xFFFFFFFF. " | ||
| 391 | "Disabling HPET\n"); | ||
| 392 | goto out_nohpet; | ||
| 393 | } | ||
| 394 | } | ||
| 395 | |||
| 372 | if (hpet_period < HPET_MIN_PERIOD || hpet_period > HPET_MAX_PERIOD) | 396 | if (hpet_period < HPET_MIN_PERIOD || hpet_period > HPET_MAX_PERIOD) |
| 373 | goto out_nohpet; | 397 | goto out_nohpet; |
| 374 | 398 | ||
diff --git a/arch/x86/kernel/io_apic_32.c b/arch/x86/kernel/io_apic_32.c index de9aa0e3a9c5..09cddb57bec4 100644 --- a/arch/x86/kernel/io_apic_32.c +++ b/arch/x86/kernel/io_apic_32.c | |||
| @@ -57,7 +57,7 @@ atomic_t irq_mis_count; | |||
| 57 | static struct { int pin, apic; } ioapic_i8259 = { -1, -1 }; | 57 | static struct { int pin, apic; } ioapic_i8259 = { -1, -1 }; |
| 58 | 58 | ||
| 59 | static DEFINE_SPINLOCK(ioapic_lock); | 59 | static DEFINE_SPINLOCK(ioapic_lock); |
| 60 | static DEFINE_SPINLOCK(vector_lock); | 60 | DEFINE_SPINLOCK(vector_lock); |
| 61 | 61 | ||
| 62 | int timer_through_8259 __initdata; | 62 | int timer_through_8259 __initdata; |
| 63 | 63 | ||
| @@ -1209,10 +1209,6 @@ static int assign_irq_vector(int irq) | |||
| 1209 | return vector; | 1209 | return vector; |
| 1210 | } | 1210 | } |
| 1211 | 1211 | ||
| 1212 | void setup_vector_irq(int cpu) | ||
| 1213 | { | ||
| 1214 | } | ||
| 1215 | |||
| 1216 | static struct irq_chip ioapic_chip; | 1212 | static struct irq_chip ioapic_chip; |
| 1217 | 1213 | ||
| 1218 | #define IOAPIC_AUTO -1 | 1214 | #define IOAPIC_AUTO -1 |
diff --git a/arch/x86/kernel/io_apic_64.c b/arch/x86/kernel/io_apic_64.c index 8269434d1707..61a83b70c18f 100644 --- a/arch/x86/kernel/io_apic_64.c +++ b/arch/x86/kernel/io_apic_64.c | |||
| @@ -101,7 +101,7 @@ int timer_through_8259 __initdata; | |||
| 101 | static struct { int pin, apic; } ioapic_i8259 = { -1, -1 }; | 101 | static struct { int pin, apic; } ioapic_i8259 = { -1, -1 }; |
| 102 | 102 | ||
| 103 | static DEFINE_SPINLOCK(ioapic_lock); | 103 | static DEFINE_SPINLOCK(ioapic_lock); |
| 104 | DEFINE_SPINLOCK(vector_lock); | 104 | static DEFINE_SPINLOCK(vector_lock); |
| 105 | 105 | ||
| 106 | /* | 106 | /* |
| 107 | * # of IRQ routing registers | 107 | * # of IRQ routing registers |
| @@ -697,6 +697,19 @@ static int pin_2_irq(int idx, int apic, int pin) | |||
| 697 | return irq; | 697 | return irq; |
| 698 | } | 698 | } |
| 699 | 699 | ||
| 700 | void lock_vector_lock(void) | ||
| 701 | { | ||
| 702 | /* Used to the online set of cpus does not change | ||
| 703 | * during assign_irq_vector. | ||
| 704 | */ | ||
| 705 | spin_lock(&vector_lock); | ||
| 706 | } | ||
| 707 | |||
| 708 | void unlock_vector_lock(void) | ||
| 709 | { | ||
| 710 | spin_unlock(&vector_lock); | ||
| 711 | } | ||
| 712 | |||
| 700 | static int __assign_irq_vector(int irq, cpumask_t mask) | 713 | static int __assign_irq_vector(int irq, cpumask_t mask) |
| 701 | { | 714 | { |
| 702 | /* | 715 | /* |
| @@ -802,7 +815,7 @@ static void __clear_irq_vector(int irq) | |||
| 802 | cpus_clear(cfg->domain); | 815 | cpus_clear(cfg->domain); |
| 803 | } | 816 | } |
| 804 | 817 | ||
| 805 | static void __setup_vector_irq(int cpu) | 818 | void __setup_vector_irq(int cpu) |
| 806 | { | 819 | { |
| 807 | /* Initialize vector_irq on a new cpu */ | 820 | /* Initialize vector_irq on a new cpu */ |
| 808 | /* This function must be called with vector_lock held */ | 821 | /* This function must be called with vector_lock held */ |
| @@ -825,14 +838,6 @@ static void __setup_vector_irq(int cpu) | |||
| 825 | } | 838 | } |
| 826 | } | 839 | } |
| 827 | 840 | ||
| 828 | void setup_vector_irq(int cpu) | ||
| 829 | { | ||
| 830 | spin_lock(&vector_lock); | ||
| 831 | __setup_vector_irq(smp_processor_id()); | ||
| 832 | spin_unlock(&vector_lock); | ||
| 833 | } | ||
| 834 | |||
| 835 | |||
| 836 | static struct irq_chip ioapic_chip; | 841 | static struct irq_chip ioapic_chip; |
| 837 | 842 | ||
| 838 | static void ioapic_register_intr(int irq, unsigned long trigger) | 843 | static void ioapic_register_intr(int irq, unsigned long trigger) |
diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c index 9fe478d98406..0732adba05ca 100644 --- a/arch/x86/kernel/machine_kexec_32.c +++ b/arch/x86/kernel/machine_kexec_32.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 13 | #include <linux/numa.h> | 13 | #include <linux/numa.h> |
| 14 | #include <linux/ftrace.h> | 14 | #include <linux/ftrace.h> |
| 15 | #include <linux/suspend.h> | ||
| 15 | 16 | ||
| 16 | #include <asm/pgtable.h> | 17 | #include <asm/pgtable.h> |
| 17 | #include <asm/pgalloc.h> | 18 | #include <asm/pgalloc.h> |
| @@ -78,7 +79,7 @@ static void load_segments(void) | |||
| 78 | /* | 79 | /* |
| 79 | * A architecture hook called to validate the | 80 | * A architecture hook called to validate the |
| 80 | * proposed image and prepare the control pages | 81 | * proposed image and prepare the control pages |
| 81 | * as needed. The pages for KEXEC_CONTROL_CODE_SIZE | 82 | * as needed. The pages for KEXEC_CONTROL_PAGE_SIZE |
| 82 | * have been allocated, but the segments have yet | 83 | * have been allocated, but the segments have yet |
| 83 | * been copied into the kernel. | 84 | * been copied into the kernel. |
| 84 | * | 85 | * |
| @@ -113,6 +114,7 @@ void machine_kexec(struct kimage *image) | |||
| 113 | { | 114 | { |
| 114 | unsigned long page_list[PAGES_NR]; | 115 | unsigned long page_list[PAGES_NR]; |
| 115 | void *control_page; | 116 | void *control_page; |
| 117 | int save_ftrace_enabled; | ||
| 116 | asmlinkage unsigned long | 118 | asmlinkage unsigned long |
| 117 | (*relocate_kernel_ptr)(unsigned long indirection_page, | 119 | (*relocate_kernel_ptr)(unsigned long indirection_page, |
| 118 | unsigned long control_page, | 120 | unsigned long control_page, |
| @@ -120,7 +122,12 @@ void machine_kexec(struct kimage *image) | |||
| 120 | unsigned int has_pae, | 122 | unsigned int has_pae, |
| 121 | unsigned int preserve_context); | 123 | unsigned int preserve_context); |
| 122 | 124 | ||
| 123 | tracer_disable(); | 125 | #ifdef CONFIG_KEXEC_JUMP |
| 126 | if (kexec_image->preserve_context) | ||
| 127 | save_processor_state(); | ||
| 128 | #endif | ||
| 129 | |||
| 130 | save_ftrace_enabled = __ftrace_enabled_save(); | ||
| 124 | 131 | ||
| 125 | /* Interrupts aren't acceptable while we reboot */ | 132 | /* Interrupts aren't acceptable while we reboot */ |
| 126 | local_irq_disable(); | 133 | local_irq_disable(); |
| @@ -138,7 +145,7 @@ void machine_kexec(struct kimage *image) | |||
| 138 | } | 145 | } |
| 139 | 146 | ||
| 140 | control_page = page_address(image->control_code_page); | 147 | control_page = page_address(image->control_code_page); |
| 141 | memcpy(control_page, relocate_kernel, PAGE_SIZE/2); | 148 | memcpy(control_page, relocate_kernel, KEXEC_CONTROL_CODE_MAX_SIZE); |
| 142 | 149 | ||
| 143 | relocate_kernel_ptr = control_page; | 150 | relocate_kernel_ptr = control_page; |
| 144 | page_list[PA_CONTROL_PAGE] = __pa(control_page); | 151 | page_list[PA_CONTROL_PAGE] = __pa(control_page); |
| @@ -178,6 +185,13 @@ void machine_kexec(struct kimage *image) | |||
| 178 | (unsigned long)page_list, | 185 | (unsigned long)page_list, |
| 179 | image->start, cpu_has_pae, | 186 | image->start, cpu_has_pae, |
| 180 | image->preserve_context); | 187 | image->preserve_context); |
| 188 | |||
| 189 | #ifdef CONFIG_KEXEC_JUMP | ||
| 190 | if (kexec_image->preserve_context) | ||
| 191 | restore_processor_state(); | ||
| 192 | #endif | ||
| 193 | |||
| 194 | __ftrace_enabled_restore(save_ftrace_enabled); | ||
| 181 | } | 195 | } |
| 182 | 196 | ||
| 183 | void arch_crash_save_vmcoreinfo(void) | 197 | void arch_crash_save_vmcoreinfo(void) |
diff --git a/arch/x86/kernel/mfgpt_32.c b/arch/x86/kernel/mfgpt_32.c index 07c0f828f488..3b599518c322 100644 --- a/arch/x86/kernel/mfgpt_32.c +++ b/arch/x86/kernel/mfgpt_32.c | |||
| @@ -33,6 +33,8 @@ | |||
| 33 | #include <linux/module.h> | 33 | #include <linux/module.h> |
| 34 | #include <asm/geode.h> | 34 | #include <asm/geode.h> |
| 35 | 35 | ||
| 36 | #define MFGPT_DEFAULT_IRQ 7 | ||
| 37 | |||
| 36 | static struct mfgpt_timer_t { | 38 | static struct mfgpt_timer_t { |
| 37 | unsigned int avail:1; | 39 | unsigned int avail:1; |
| 38 | } mfgpt_timers[MFGPT_MAX_TIMERS]; | 40 | } mfgpt_timers[MFGPT_MAX_TIMERS]; |
| @@ -157,29 +159,48 @@ int geode_mfgpt_toggle_event(int timer, int cmp, int event, int enable) | |||
| 157 | } | 159 | } |
| 158 | EXPORT_SYMBOL_GPL(geode_mfgpt_toggle_event); | 160 | EXPORT_SYMBOL_GPL(geode_mfgpt_toggle_event); |
| 159 | 161 | ||
| 160 | int geode_mfgpt_set_irq(int timer, int cmp, int irq, int enable) | 162 | int geode_mfgpt_set_irq(int timer, int cmp, int *irq, int enable) |
| 161 | { | 163 | { |
| 162 | u32 val, dummy; | 164 | u32 zsel, lpc, dummy; |
| 163 | int offset; | 165 | int shift; |
| 164 | 166 | ||
| 165 | if (timer < 0 || timer >= MFGPT_MAX_TIMERS) | 167 | if (timer < 0 || timer >= MFGPT_MAX_TIMERS) |
| 166 | return -EIO; | 168 | return -EIO; |
| 167 | 169 | ||
| 168 | if (geode_mfgpt_toggle_event(timer, cmp, MFGPT_EVENT_IRQ, enable)) | 170 | /* |
| 171 | * Unfortunately, MFGPTs come in pairs sharing their IRQ lines. If VSA | ||
| 172 | * is using the same CMP of the timer's Siamese twin, the IRQ is set to | ||
| 173 | * 2, and we mustn't use nor change it. | ||
| 174 | * XXX: Likewise, 2 Linux drivers might clash if the 2nd overwrites the | ||
| 175 | * IRQ of the 1st. This can only happen if forcing an IRQ, calling this | ||
| 176 | * with *irq==0 is safe. Currently there _are_ no 2 drivers. | ||
| 177 | */ | ||
| 178 | rdmsr(MSR_PIC_ZSEL_LOW, zsel, dummy); | ||
| 179 | shift = ((cmp == MFGPT_CMP1 ? 0 : 4) + timer % 4) * 4; | ||
| 180 | if (((zsel >> shift) & 0xF) == 2) | ||
| 169 | return -EIO; | 181 | return -EIO; |
| 170 | 182 | ||
| 171 | rdmsr(MSR_PIC_ZSEL_LOW, val, dummy); | 183 | /* Choose IRQ: if none supplied, keep IRQ already set or use default */ |
| 184 | if (!*irq) | ||
| 185 | *irq = (zsel >> shift) & 0xF; | ||
| 186 | if (!*irq) | ||
| 187 | *irq = MFGPT_DEFAULT_IRQ; | ||
| 172 | 188 | ||
| 173 | offset = (timer % 4) * 4; | 189 | /* Can't use IRQ if it's 0 (=disabled), 2, or routed to LPC */ |
| 174 | 190 | if (*irq < 1 || *irq == 2 || *irq > 15) | |
| 175 | val &= ~((0xF << offset) | (0xF << (offset + 16))); | 191 | return -EIO; |
| 192 | rdmsr(MSR_PIC_IRQM_LPC, lpc, dummy); | ||
| 193 | if (lpc & (1 << *irq)) | ||
| 194 | return -EIO; | ||
| 176 | 195 | ||
| 196 | /* All chosen and checked - go for it */ | ||
| 197 | if (geode_mfgpt_toggle_event(timer, cmp, MFGPT_EVENT_IRQ, enable)) | ||
| 198 | return -EIO; | ||
| 177 | if (enable) { | 199 | if (enable) { |
| 178 | val |= (irq & 0x0F) << (offset); | 200 | zsel = (zsel & ~(0xF << shift)) | (*irq << shift); |
| 179 | val |= (irq & 0x0F) << (offset + 16); | 201 | wrmsr(MSR_PIC_ZSEL_LOW, zsel, dummy); |
| 180 | } | 202 | } |
| 181 | 203 | ||
| 182 | wrmsr(MSR_PIC_ZSEL_LOW, val, dummy); | ||
| 183 | return 0; | 204 | return 0; |
| 184 | } | 205 | } |
| 185 | 206 | ||
| @@ -242,7 +263,7 @@ EXPORT_SYMBOL_GPL(geode_mfgpt_alloc_timer); | |||
| 242 | static unsigned int mfgpt_tick_mode = CLOCK_EVT_MODE_SHUTDOWN; | 263 | static unsigned int mfgpt_tick_mode = CLOCK_EVT_MODE_SHUTDOWN; |
| 243 | static u16 mfgpt_event_clock; | 264 | static u16 mfgpt_event_clock; |
| 244 | 265 | ||
| 245 | static int irq = 7; | 266 | static int irq; |
| 246 | static int __init mfgpt_setup(char *str) | 267 | static int __init mfgpt_setup(char *str) |
| 247 | { | 268 | { |
| 248 | get_option(&str, &irq); | 269 | get_option(&str, &irq); |
| @@ -346,7 +367,7 @@ int __init mfgpt_timer_setup(void) | |||
| 346 | mfgpt_event_clock = timer; | 367 | mfgpt_event_clock = timer; |
| 347 | 368 | ||
| 348 | /* Set up the IRQ on the MFGPT side */ | 369 | /* Set up the IRQ on the MFGPT side */ |
| 349 | if (geode_mfgpt_setup_irq(mfgpt_event_clock, MFGPT_CMP2, irq)) { | 370 | if (geode_mfgpt_setup_irq(mfgpt_event_clock, MFGPT_CMP2, &irq)) { |
| 350 | printk(KERN_ERR "mfgpt-timer: Could not set up IRQ %d\n", irq); | 371 | printk(KERN_ERR "mfgpt-timer: Could not set up IRQ %d\n", irq); |
| 351 | return -EIO; | 372 | return -EIO; |
| 352 | } | 373 | } |
| @@ -374,13 +395,14 @@ int __init mfgpt_timer_setup(void) | |||
| 374 | &mfgpt_clockevent); | 395 | &mfgpt_clockevent); |
| 375 | 396 | ||
| 376 | printk(KERN_INFO | 397 | printk(KERN_INFO |
| 377 | "mfgpt-timer: registering the MFGPT timer as a clock event.\n"); | 398 | "mfgpt-timer: Registering MFGPT timer %d as a clock event, using IRQ %d\n", |
| 399 | timer, irq); | ||
| 378 | clockevents_register_device(&mfgpt_clockevent); | 400 | clockevents_register_device(&mfgpt_clockevent); |
| 379 | 401 | ||
| 380 | return 0; | 402 | return 0; |
| 381 | 403 | ||
| 382 | err: | 404 | err: |
| 383 | geode_mfgpt_release_irq(mfgpt_event_clock, MFGPT_CMP2, irq); | 405 | geode_mfgpt_release_irq(mfgpt_event_clock, MFGPT_CMP2, &irq); |
| 384 | printk(KERN_ERR | 406 | printk(KERN_ERR |
| 385 | "mfgpt-timer: Unable to set up the MFGPT clock source\n"); | 407 | "mfgpt-timer: Unable to set up the MFGPT clock source\n"); |
| 386 | return -EIO; | 408 | return -EIO; |
diff --git a/arch/x86/kernel/mmconf-fam10h_64.c b/arch/x86/kernel/mmconf-fam10h_64.c index fdfdc550b366..efc2f361fe85 100644 --- a/arch/x86/kernel/mmconf-fam10h_64.c +++ b/arch/x86/kernel/mmconf-fam10h_64.c | |||
| @@ -238,7 +238,7 @@ static struct dmi_system_id __devinitdata mmconf_dmi_table[] = { | |||
| 238 | {} | 238 | {} |
| 239 | }; | 239 | }; |
| 240 | 240 | ||
| 241 | void __init check_enable_amd_mmconf_dmi(void) | 241 | void __cpuinit check_enable_amd_mmconf_dmi(void) |
| 242 | { | 242 | { |
| 243 | dmi_check_system(mmconf_dmi_table); | 243 | dmi_check_system(mmconf_dmi_table); |
| 244 | } | 244 | } |
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c index 6ae005ccaed8..b3fb430725cb 100644 --- a/arch/x86/kernel/mpparse.c +++ b/arch/x86/kernel/mpparse.c | |||
| @@ -49,7 +49,7 @@ static int __init mpf_checksum(unsigned char *mp, int len) | |||
| 49 | return sum & 0xFF; | 49 | return sum & 0xFF; |
| 50 | } | 50 | } |
| 51 | 51 | ||
| 52 | static void __cpuinit MP_processor_info(struct mpc_config_processor *m) | 52 | static void __init MP_processor_info(struct mpc_config_processor *m) |
| 53 | { | 53 | { |
| 54 | int apicid; | 54 | int apicid; |
| 55 | char *bootup_cpu = ""; | 55 | char *bootup_cpu = ""; |
| @@ -83,7 +83,7 @@ static void __init MP_bus_info(struct mpc_config_bus *m) | |||
| 83 | if (x86_quirks->mpc_oem_bus_info) | 83 | if (x86_quirks->mpc_oem_bus_info) |
| 84 | x86_quirks->mpc_oem_bus_info(m, str); | 84 | x86_quirks->mpc_oem_bus_info(m, str); |
| 85 | else | 85 | else |
| 86 | printk(KERN_INFO "Bus #%d is %s\n", m->mpc_busid, str); | 86 | apic_printk(APIC_VERBOSE, "Bus #%d is %s\n", m->mpc_busid, str); |
| 87 | 87 | ||
| 88 | #if MAX_MP_BUSSES < 256 | 88 | #if MAX_MP_BUSSES < 256 |
| 89 | if (m->mpc_busid >= MAX_MP_BUSSES) { | 89 | if (m->mpc_busid >= MAX_MP_BUSSES) { |
| @@ -154,7 +154,7 @@ static void __init MP_ioapic_info(struct mpc_config_ioapic *m) | |||
| 154 | 154 | ||
| 155 | static void print_MP_intsrc_info(struct mpc_config_intsrc *m) | 155 | static void print_MP_intsrc_info(struct mpc_config_intsrc *m) |
| 156 | { | 156 | { |
| 157 | printk(KERN_CONT "Int: type %d, pol %d, trig %d, bus %02x," | 157 | apic_printk(APIC_VERBOSE, "Int: type %d, pol %d, trig %d, bus %02x," |
| 158 | " IRQ %02x, APIC ID %x, APIC INT %02x\n", | 158 | " IRQ %02x, APIC ID %x, APIC INT %02x\n", |
| 159 | m->mpc_irqtype, m->mpc_irqflag & 3, | 159 | m->mpc_irqtype, m->mpc_irqflag & 3, |
| 160 | (m->mpc_irqflag >> 2) & 3, m->mpc_srcbus, | 160 | (m->mpc_irqflag >> 2) & 3, m->mpc_srcbus, |
| @@ -163,7 +163,7 @@ static void print_MP_intsrc_info(struct mpc_config_intsrc *m) | |||
| 163 | 163 | ||
| 164 | static void __init print_mp_irq_info(struct mp_config_intsrc *mp_irq) | 164 | static void __init print_mp_irq_info(struct mp_config_intsrc *mp_irq) |
| 165 | { | 165 | { |
| 166 | printk(KERN_CONT "Int: type %d, pol %d, trig %d, bus %02x," | 166 | apic_printk(APIC_VERBOSE, "Int: type %d, pol %d, trig %d, bus %02x," |
| 167 | " IRQ %02x, APIC ID %x, APIC INT %02x\n", | 167 | " IRQ %02x, APIC ID %x, APIC INT %02x\n", |
| 168 | mp_irq->mp_irqtype, mp_irq->mp_irqflag & 3, | 168 | mp_irq->mp_irqtype, mp_irq->mp_irqflag & 3, |
| 169 | (mp_irq->mp_irqflag >> 2) & 3, mp_irq->mp_srcbus, | 169 | (mp_irq->mp_irqflag >> 2) & 3, mp_irq->mp_srcbus, |
| @@ -235,7 +235,7 @@ static void __init MP_intsrc_info(struct mpc_config_intsrc *m) | |||
| 235 | 235 | ||
| 236 | static void __init MP_lintsrc_info(struct mpc_config_lintsrc *m) | 236 | static void __init MP_lintsrc_info(struct mpc_config_lintsrc *m) |
| 237 | { | 237 | { |
| 238 | printk(KERN_INFO "Lint: type %d, pol %d, trig %d, bus %02x," | 238 | apic_printk(APIC_VERBOSE, "Lint: type %d, pol %d, trig %d, bus %02x," |
| 239 | " IRQ %02x, APIC ID %x, APIC LINT %02x\n", | 239 | " IRQ %02x, APIC ID %x, APIC LINT %02x\n", |
| 240 | m->mpc_irqtype, m->mpc_irqflag & 3, | 240 | m->mpc_irqtype, m->mpc_irqflag & 3, |
| 241 | (m->mpc_irqflag >> 2) & 3, m->mpc_srcbusid, | 241 | (m->mpc_irqflag >> 2) & 3, m->mpc_srcbusid, |
| @@ -484,7 +484,7 @@ static void __init construct_default_ioirq_mptable(int mpc_default_type) | |||
| 484 | } | 484 | } |
| 485 | 485 | ||
| 486 | 486 | ||
| 487 | static void construct_ioapic_table(int mpc_default_type) | 487 | static void __init construct_ioapic_table(int mpc_default_type) |
| 488 | { | 488 | { |
| 489 | struct mpc_config_ioapic ioapic; | 489 | struct mpc_config_ioapic ioapic; |
| 490 | struct mpc_config_bus bus; | 490 | struct mpc_config_bus bus; |
| @@ -529,7 +529,7 @@ static void construct_ioapic_table(int mpc_default_type) | |||
| 529 | construct_default_ioirq_mptable(mpc_default_type); | 529 | construct_default_ioirq_mptable(mpc_default_type); |
| 530 | } | 530 | } |
| 531 | #else | 531 | #else |
| 532 | static inline void construct_ioapic_table(int mpc_default_type) { } | 532 | static inline void __init construct_ioapic_table(int mpc_default_type) { } |
| 533 | #endif | 533 | #endif |
| 534 | 534 | ||
| 535 | static inline void __init construct_default_ISA_mptable(int mpc_default_type) | 535 | static inline void __init construct_default_ISA_mptable(int mpc_default_type) |
| @@ -695,7 +695,8 @@ static int __init smp_scan_config(unsigned long base, unsigned long length, | |||
| 695 | unsigned int *bp = phys_to_virt(base); | 695 | unsigned int *bp = phys_to_virt(base); |
| 696 | struct intel_mp_floating *mpf; | 696 | struct intel_mp_floating *mpf; |
| 697 | 697 | ||
| 698 | printk(KERN_DEBUG "Scan SMP from %p for %ld bytes.\n", bp, length); | 698 | apic_printk(APIC_VERBOSE, "Scan SMP from %p for %ld bytes.\n", |
| 699 | bp, length); | ||
| 699 | BUILD_BUG_ON(sizeof(*mpf) != 16); | 700 | BUILD_BUG_ON(sizeof(*mpf) != 16); |
| 700 | 701 | ||
| 701 | while (length > 0) { | 702 | while (length > 0) { |
diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c index 9fd809552447..2e2af5d18191 100644 --- a/arch/x86/kernel/msr.c +++ b/arch/x86/kernel/msr.c | |||
| @@ -72,21 +72,28 @@ static ssize_t msr_read(struct file *file, char __user *buf, | |||
| 72 | u32 data[2]; | 72 | u32 data[2]; |
| 73 | u32 reg = *ppos; | 73 | u32 reg = *ppos; |
| 74 | int cpu = iminor(file->f_path.dentry->d_inode); | 74 | int cpu = iminor(file->f_path.dentry->d_inode); |
| 75 | int err; | 75 | int err = 0; |
| 76 | ssize_t bytes = 0; | ||
| 76 | 77 | ||
| 77 | if (count % 8) | 78 | if (count % 8) |
| 78 | return -EINVAL; /* Invalid chunk size */ | 79 | return -EINVAL; /* Invalid chunk size */ |
| 79 | 80 | ||
| 80 | for (; count; count -= 8) { | 81 | for (; count; count -= 8) { |
| 81 | err = rdmsr_safe_on_cpu(cpu, reg, &data[0], &data[1]); | 82 | err = rdmsr_safe_on_cpu(cpu, reg, &data[0], &data[1]); |
| 82 | if (err) | 83 | if (err) { |
| 83 | return -EIO; | 84 | if (err == -EFAULT) /* Fix idiotic error code */ |
| 84 | if (copy_to_user(tmp, &data, 8)) | 85 | err = -EIO; |
| 85 | return -EFAULT; | 86 | break; |
| 87 | } | ||
| 88 | if (copy_to_user(tmp, &data, 8)) { | ||
| 89 | err = -EFAULT; | ||
| 90 | break; | ||
| 91 | } | ||
| 86 | tmp += 2; | 92 | tmp += 2; |
| 93 | bytes += 8; | ||
| 87 | } | 94 | } |
| 88 | 95 | ||
| 89 | return ((char __user *)tmp) - buf; | 96 | return bytes ? bytes : err; |
| 90 | } | 97 | } |
| 91 | 98 | ||
| 92 | static ssize_t msr_write(struct file *file, const char __user *buf, | 99 | static ssize_t msr_write(struct file *file, const char __user *buf, |
| @@ -96,21 +103,28 @@ static ssize_t msr_write(struct file *file, const char __user *buf, | |||
| 96 | u32 data[2]; | 103 | u32 data[2]; |
| 97 | u32 reg = *ppos; | 104 | u32 reg = *ppos; |
| 98 | int cpu = iminor(file->f_path.dentry->d_inode); | 105 | int cpu = iminor(file->f_path.dentry->d_inode); |
| 99 | int err; | 106 | int err = 0; |
| 107 | ssize_t bytes = 0; | ||
| 100 | 108 | ||
| 101 | if (count % 8) | 109 | if (count % 8) |
| 102 | return -EINVAL; /* Invalid chunk size */ | 110 | return -EINVAL; /* Invalid chunk size */ |
| 103 | 111 | ||
| 104 | for (; count; count -= 8) { | 112 | for (; count; count -= 8) { |
| 105 | if (copy_from_user(&data, tmp, 8)) | 113 | if (copy_from_user(&data, tmp, 8)) { |
| 106 | return -EFAULT; | 114 | err = -EFAULT; |
| 115 | break; | ||
| 116 | } | ||
| 107 | err = wrmsr_safe_on_cpu(cpu, reg, data[0], data[1]); | 117 | err = wrmsr_safe_on_cpu(cpu, reg, data[0], data[1]); |
| 108 | if (err) | 118 | if (err) { |
| 109 | return -EIO; | 119 | if (err == -EFAULT) /* Fix idiotic error code */ |
| 120 | err = -EIO; | ||
| 121 | break; | ||
| 122 | } | ||
| 110 | tmp += 2; | 123 | tmp += 2; |
| 124 | bytes += 8; | ||
| 111 | } | 125 | } |
| 112 | 126 | ||
| 113 | return ((char __user *)tmp) - buf; | 127 | return bytes ? bytes : err; |
| 114 | } | 128 | } |
| 115 | 129 | ||
| 116 | static int msr_open(struct inode *inode, struct file *file) | 130 | static int msr_open(struct inode *inode, struct file *file) |
| @@ -131,7 +145,7 @@ static int msr_open(struct inode *inode, struct file *file) | |||
| 131 | ret = -EIO; /* MSR not supported */ | 145 | ret = -EIO; /* MSR not supported */ |
| 132 | out: | 146 | out: |
| 133 | unlock_kernel(); | 147 | unlock_kernel(); |
| 134 | return 0; | 148 | return ret; |
| 135 | } | 149 | } |
| 136 | 150 | ||
| 137 | /* | 151 | /* |
diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c index ac6d51222e7d..abb78a2cc4ad 100644 --- a/arch/x86/kernel/nmi.c +++ b/arch/x86/kernel/nmi.c | |||
| @@ -114,6 +114,23 @@ static __init void nmi_cpu_busy(void *data) | |||
| 114 | } | 114 | } |
| 115 | #endif | 115 | #endif |
| 116 | 116 | ||
| 117 | static void report_broken_nmi(int cpu, int *prev_nmi_count) | ||
| 118 | { | ||
| 119 | printk(KERN_CONT "\n"); | ||
| 120 | |||
| 121 | printk(KERN_WARNING | ||
| 122 | "WARNING: CPU#%d: NMI appears to be stuck (%d->%d)!\n", | ||
| 123 | cpu, prev_nmi_count[cpu], get_nmi_count(cpu)); | ||
| 124 | |||
| 125 | printk(KERN_WARNING | ||
| 126 | "Please report this to bugzilla.kernel.org,\n"); | ||
| 127 | printk(KERN_WARNING | ||
| 128 | "and attach the output of the 'dmesg' command.\n"); | ||
| 129 | |||
| 130 | per_cpu(wd_enabled, cpu) = 0; | ||
| 131 | atomic_dec(&nmi_active); | ||
| 132 | } | ||
| 133 | |||
| 117 | int __init check_nmi_watchdog(void) | 134 | int __init check_nmi_watchdog(void) |
| 118 | { | 135 | { |
| 119 | unsigned int *prev_nmi_count; | 136 | unsigned int *prev_nmi_count; |
| @@ -141,15 +158,8 @@ int __init check_nmi_watchdog(void) | |||
| 141 | for_each_online_cpu(cpu) { | 158 | for_each_online_cpu(cpu) { |
| 142 | if (!per_cpu(wd_enabled, cpu)) | 159 | if (!per_cpu(wd_enabled, cpu)) |
| 143 | continue; | 160 | continue; |
| 144 | if (get_nmi_count(cpu) - prev_nmi_count[cpu] <= 5) { | 161 | if (get_nmi_count(cpu) - prev_nmi_count[cpu] <= 5) |
| 145 | printk(KERN_WARNING "WARNING: CPU#%d: NMI " | 162 | report_broken_nmi(cpu, prev_nmi_count); |
| 146 | "appears to be stuck (%d->%d)!\n", | ||
| 147 | cpu, | ||
| 148 | prev_nmi_count[cpu], | ||
| 149 | get_nmi_count(cpu)); | ||
| 150 | per_cpu(wd_enabled, cpu) = 0; | ||
| 151 | atomic_dec(&nmi_active); | ||
| 152 | } | ||
| 153 | } | 163 | } |
| 154 | endflag = 1; | 164 | endflag = 1; |
| 155 | if (!atomic_read(&nmi_active)) { | 165 | if (!atomic_read(&nmi_active)) { |
diff --git a/arch/x86/kernel/numaq_32.c b/arch/x86/kernel/numaq_32.c index b8c45610b20a..eecc8c18f010 100644 --- a/arch/x86/kernel/numaq_32.c +++ b/arch/x86/kernel/numaq_32.c | |||
| @@ -73,7 +73,7 @@ static void __init smp_dump_qct(void) | |||
| 73 | } | 73 | } |
| 74 | 74 | ||
| 75 | 75 | ||
| 76 | void __init numaq_tsc_disable(void) | 76 | void __cpuinit numaq_tsc_disable(void) |
| 77 | { | 77 | { |
| 78 | if (!found_numaq) | 78 | if (!found_numaq) |
| 79 | return; | 79 | return; |
diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c index 94da4d52d798..300da17e61cb 100644 --- a/arch/x86/kernel/paravirt.c +++ b/arch/x86/kernel/paravirt.c | |||
| @@ -471,7 +471,7 @@ struct pv_lock_ops pv_lock_ops = { | |||
| 471 | .spin_unlock = __ticket_spin_unlock, | 471 | .spin_unlock = __ticket_spin_unlock, |
| 472 | #endif | 472 | #endif |
| 473 | }; | 473 | }; |
| 474 | EXPORT_SYMBOL_GPL(pv_lock_ops); | 474 | EXPORT_SYMBOL(pv_lock_ops); |
| 475 | 475 | ||
| 476 | EXPORT_SYMBOL_GPL(pv_time_ops); | 476 | EXPORT_SYMBOL_GPL(pv_time_ops); |
| 477 | EXPORT_SYMBOL (pv_cpu_ops); | 477 | EXPORT_SYMBOL (pv_cpu_ops); |
diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c index b67a4b1d4eae..dcdac6c826e9 100644 --- a/arch/x86/kernel/pci-calgary_64.c +++ b/arch/x86/kernel/pci-calgary_64.c | |||
| @@ -343,9 +343,8 @@ static void iommu_free(struct iommu_table *tbl, dma_addr_t dma_addr, | |||
| 343 | /* were we called with bad_dma_address? */ | 343 | /* were we called with bad_dma_address? */ |
| 344 | badend = bad_dma_address + (EMERGENCY_PAGES * PAGE_SIZE); | 344 | badend = bad_dma_address + (EMERGENCY_PAGES * PAGE_SIZE); |
| 345 | if (unlikely((dma_addr >= bad_dma_address) && (dma_addr < badend))) { | 345 | if (unlikely((dma_addr >= bad_dma_address) && (dma_addr < badend))) { |
| 346 | printk(KERN_ERR "Calgary: driver tried unmapping bad DMA " | 346 | WARN(1, KERN_ERR "Calgary: driver tried unmapping bad DMA " |
| 347 | "address 0x%Lx\n", dma_addr); | 347 | "address 0x%Lx\n", dma_addr); |
| 348 | WARN_ON(1); | ||
| 349 | return; | 348 | return; |
| 350 | } | 349 | } |
| 351 | 350 | ||
| @@ -1269,13 +1268,15 @@ static inline int __init determine_tce_table_size(u64 ram) | |||
| 1269 | static int __init build_detail_arrays(void) | 1268 | static int __init build_detail_arrays(void) |
| 1270 | { | 1269 | { |
| 1271 | unsigned long ptr; | 1270 | unsigned long ptr; |
| 1272 | int i, scal_detail_size, rio_detail_size; | 1271 | unsigned numnodes, i; |
| 1272 | int scal_detail_size, rio_detail_size; | ||
| 1273 | 1273 | ||
| 1274 | if (rio_table_hdr->num_scal_dev > MAX_NUMNODES){ | 1274 | numnodes = rio_table_hdr->num_scal_dev; |
| 1275 | if (numnodes > MAX_NUMNODES){ | ||
| 1275 | printk(KERN_WARNING | 1276 | printk(KERN_WARNING |
| 1276 | "Calgary: MAX_NUMNODES too low! Defined as %d, " | 1277 | "Calgary: MAX_NUMNODES too low! Defined as %d, " |
| 1277 | "but system has %d nodes.\n", | 1278 | "but system has %d nodes.\n", |
| 1278 | MAX_NUMNODES, rio_table_hdr->num_scal_dev); | 1279 | MAX_NUMNODES, numnodes); |
| 1279 | return -ENODEV; | 1280 | return -ENODEV; |
| 1280 | } | 1281 | } |
| 1281 | 1282 | ||
| @@ -1296,8 +1297,7 @@ static int __init build_detail_arrays(void) | |||
| 1296 | } | 1297 | } |
| 1297 | 1298 | ||
| 1298 | ptr = ((unsigned long)rio_table_hdr) + 3; | 1299 | ptr = ((unsigned long)rio_table_hdr) + 3; |
| 1299 | for (i = 0; i < rio_table_hdr->num_scal_dev; | 1300 | for (i = 0; i < numnodes; i++, ptr += scal_detail_size) |
| 1300 | i++, ptr += scal_detail_size) | ||
| 1301 | scal_devs[i] = (struct scal_detail *)ptr; | 1301 | scal_devs[i] = (struct scal_detail *)ptr; |
| 1302 | 1302 | ||
| 1303 | for (i = 0; i < rio_table_hdr->num_rio_dev; | 1303 | for (i = 0; i < rio_table_hdr->num_rio_dev; |
| @@ -1350,7 +1350,7 @@ static void calgary_init_bitmap_from_tce_table(struct iommu_table *tbl) | |||
| 1350 | * Function for kdump case. Get the tce tables from first kernel | 1350 | * Function for kdump case. Get the tce tables from first kernel |
| 1351 | * by reading the contents of the base adress register of calgary iommu | 1351 | * by reading the contents of the base adress register of calgary iommu |
| 1352 | */ | 1352 | */ |
| 1353 | static void get_tce_space_from_tar() | 1353 | static void __init get_tce_space_from_tar(void) |
| 1354 | { | 1354 | { |
| 1355 | int bus; | 1355 | int bus; |
| 1356 | void __iomem *target; | 1356 | void __iomem *target; |
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c index 53bc653ed5ca..3b7a1ddcc0bc 100644 --- a/arch/x86/kernel/process_32.c +++ b/arch/x86/kernel/process_32.c | |||
| @@ -95,7 +95,6 @@ static inline void play_dead(void) | |||
| 95 | { | 95 | { |
| 96 | /* This must be done before dead CPU ack */ | 96 | /* This must be done before dead CPU ack */ |
| 97 | cpu_exit_clear(); | 97 | cpu_exit_clear(); |
| 98 | wbinvd(); | ||
| 99 | mb(); | 98 | mb(); |
| 100 | /* Ack it */ | 99 | /* Ack it */ |
| 101 | __get_cpu_var(cpu_state) = CPU_DEAD; | 100 | __get_cpu_var(cpu_state) = CPU_DEAD; |
| @@ -104,8 +103,8 @@ static inline void play_dead(void) | |||
| 104 | * With physical CPU hotplug, we should halt the cpu | 103 | * With physical CPU hotplug, we should halt the cpu |
| 105 | */ | 104 | */ |
| 106 | local_irq_disable(); | 105 | local_irq_disable(); |
| 107 | while (1) | 106 | /* mask all interrupts, flush any and all caches, and halt */ |
| 108 | halt(); | 107 | wbinvd_halt(); |
| 109 | } | 108 | } |
| 110 | #else | 109 | #else |
| 111 | static inline void play_dead(void) | 110 | static inline void play_dead(void) |
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index 3fb62a7d9a16..71553b664e2a 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c | |||
| @@ -93,14 +93,13 @@ DECLARE_PER_CPU(int, cpu_state); | |||
| 93 | static inline void play_dead(void) | 93 | static inline void play_dead(void) |
| 94 | { | 94 | { |
| 95 | idle_task_exit(); | 95 | idle_task_exit(); |
| 96 | wbinvd(); | ||
| 97 | mb(); | 96 | mb(); |
| 98 | /* Ack it */ | 97 | /* Ack it */ |
| 99 | __get_cpu_var(cpu_state) = CPU_DEAD; | 98 | __get_cpu_var(cpu_state) = CPU_DEAD; |
| 100 | 99 | ||
| 101 | local_irq_disable(); | 100 | local_irq_disable(); |
| 102 | while (1) | 101 | /* mask all interrupts, flush any and all caches, and halt */ |
| 103 | halt(); | 102 | wbinvd_halt(); |
| 104 | } | 103 | } |
| 105 | #else | 104 | #else |
| 106 | static inline void play_dead(void) | 105 | static inline void play_dead(void) |
diff --git a/arch/x86/kernel/relocate_kernel_32.S b/arch/x86/kernel/relocate_kernel_32.S index 703310a99023..6f50664b2ba5 100644 --- a/arch/x86/kernel/relocate_kernel_32.S +++ b/arch/x86/kernel/relocate_kernel_32.S | |||
| @@ -20,10 +20,11 @@ | |||
| 20 | #define PAGE_ATTR (_PAGE_PRESENT | _PAGE_RW | _PAGE_ACCESSED | _PAGE_DIRTY) | 20 | #define PAGE_ATTR (_PAGE_PRESENT | _PAGE_RW | _PAGE_ACCESSED | _PAGE_DIRTY) |
| 21 | #define PAE_PGD_ATTR (_PAGE_PRESENT) | 21 | #define PAE_PGD_ATTR (_PAGE_PRESENT) |
| 22 | 22 | ||
| 23 | /* control_page + PAGE_SIZE/2 ~ control_page + PAGE_SIZE * 3/4 are | 23 | /* control_page + KEXEC_CONTROL_CODE_MAX_SIZE |
| 24 | * used to save some data for jumping back | 24 | * ~ control_page + PAGE_SIZE are used as data storage and stack for |
| 25 | * jumping back | ||
| 25 | */ | 26 | */ |
| 26 | #define DATA(offset) (PAGE_SIZE/2+(offset)) | 27 | #define DATA(offset) (KEXEC_CONTROL_CODE_MAX_SIZE+(offset)) |
| 27 | 28 | ||
| 28 | /* Minimal CPU state */ | 29 | /* Minimal CPU state */ |
| 29 | #define ESP DATA(0x0) | 30 | #define ESP DATA(0x0) |
| @@ -376,3 +377,6 @@ swap_pages: | |||
| 376 | popl %ebx | 377 | popl %ebx |
| 377 | popl %ebp | 378 | popl %ebp |
| 378 | ret | 379 | ret |
| 380 | |||
| 381 | .globl kexec_control_code_size | ||
| 382 | .set kexec_control_code_size, . - relocate_kernel | ||
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 2d888586385d..362d4e7f2d38 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c | |||
| @@ -445,7 +445,7 @@ static void __init reserve_early_setup_data(void) | |||
| 445 | * @size: Size of the crashkernel memory to reserve. | 445 | * @size: Size of the crashkernel memory to reserve. |
| 446 | * Returns the base address on success, and -1ULL on failure. | 446 | * Returns the base address on success, and -1ULL on failure. |
| 447 | */ | 447 | */ |
| 448 | unsigned long long find_and_reserve_crashkernel(unsigned long long size) | 448 | unsigned long long __init find_and_reserve_crashkernel(unsigned long long size) |
| 449 | { | 449 | { |
| 450 | const unsigned long long alignment = 16<<20; /* 16M */ | 450 | const unsigned long long alignment = 16<<20; /* 16M */ |
| 451 | unsigned long long start = 0LL; | 451 | unsigned long long start = 0LL; |
| @@ -670,6 +670,14 @@ void __init setup_arch(char **cmdline_p) | |||
| 670 | 670 | ||
| 671 | parse_early_param(); | 671 | parse_early_param(); |
| 672 | 672 | ||
| 673 | #if defined(CONFIG_VMI) && defined(CONFIG_X86_32) | ||
| 674 | /* | ||
| 675 | * Must be before kernel pagetables are setup | ||
| 676 | * or fixmap area is touched. | ||
| 677 | */ | ||
| 678 | vmi_init(); | ||
| 679 | #endif | ||
| 680 | |||
| 673 | /* after early param, so could get panic from serial */ | 681 | /* after early param, so could get panic from serial */ |
| 674 | reserve_early_setup_data(); | 682 | reserve_early_setup_data(); |
| 675 | 683 | ||
| @@ -817,14 +825,6 @@ void __init setup_arch(char **cmdline_p) | |||
| 817 | kvmclock_init(); | 825 | kvmclock_init(); |
| 818 | #endif | 826 | #endif |
| 819 | 827 | ||
| 820 | #if defined(CONFIG_VMI) && defined(CONFIG_X86_32) | ||
| 821 | /* | ||
| 822 | * Must be after max_low_pfn is determined, and before kernel | ||
| 823 | * pagetables are setup. | ||
| 824 | */ | ||
| 825 | vmi_init(); | ||
| 826 | #endif | ||
| 827 | |||
| 828 | paravirt_pagetable_setup_start(swapper_pg_dir); | 828 | paravirt_pagetable_setup_start(swapper_pg_dir); |
| 829 | paging_init(); | 829 | paging_init(); |
| 830 | paravirt_pagetable_setup_done(swapper_pg_dir); | 830 | paravirt_pagetable_setup_done(swapper_pg_dir); |
| @@ -861,12 +861,6 @@ void __init setup_arch(char **cmdline_p) | |||
| 861 | init_apic_mappings(); | 861 | init_apic_mappings(); |
| 862 | ioapic_init_mappings(); | 862 | ioapic_init_mappings(); |
| 863 | 863 | ||
| 864 | #if defined(CONFIG_SMP) && defined(CONFIG_X86_PC) && defined(CONFIG_X86_32) | ||
| 865 | if (def_to_bigsmp) | ||
| 866 | printk(KERN_WARNING "More than 8 CPUs detected and " | ||
| 867 | "CONFIG_X86_PC cannot handle it.\nUse " | ||
| 868 | "CONFIG_X86_GENERICARCH or CONFIG_X86_BIGSMP.\n"); | ||
| 869 | #endif | ||
| 870 | kvm_guest_init(); | 864 | kvm_guest_init(); |
| 871 | 865 | ||
| 872 | e820_reserve_resources(); | 866 | e820_reserve_resources(); |
diff --git a/arch/x86/kernel/signal_64.c b/arch/x86/kernel/signal_64.c index b45ef8ddd651..ca316b5b742c 100644 --- a/arch/x86/kernel/signal_64.c +++ b/arch/x86/kernel/signal_64.c | |||
| @@ -104,7 +104,16 @@ static inline int restore_i387(struct _fpstate __user *buf) | |||
| 104 | clts(); | 104 | clts(); |
| 105 | task_thread_info(current)->status |= TS_USEDFPU; | 105 | task_thread_info(current)->status |= TS_USEDFPU; |
| 106 | } | 106 | } |
| 107 | return restore_fpu_checking((__force struct i387_fxsave_struct *)buf); | 107 | err = restore_fpu_checking((__force struct i387_fxsave_struct *)buf); |
| 108 | if (unlikely(err)) { | ||
| 109 | /* | ||
| 110 | * Encountered an error while doing the restore from the | ||
| 111 | * user buffer, clear the fpu state. | ||
| 112 | */ | ||
| 113 | clear_fpu(tsk); | ||
| 114 | clear_used_math(); | ||
| 115 | } | ||
| 116 | return err; | ||
| 108 | } | 117 | } |
| 109 | 118 | ||
| 110 | /* | 119 | /* |
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 332512767f4f..7985c5b3f916 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c | |||
| @@ -326,12 +326,16 @@ static void __cpuinit start_secondary(void *unused) | |||
| 326 | * for which cpus receive the IPI. Holding this | 326 | * for which cpus receive the IPI. Holding this |
| 327 | * lock helps us to not include this cpu in a currently in progress | 327 | * lock helps us to not include this cpu in a currently in progress |
| 328 | * smp_call_function(). | 328 | * smp_call_function(). |
| 329 | * | ||
| 330 | * We need to hold vector_lock so there the set of online cpus | ||
| 331 | * does not change while we are assigning vectors to cpus. Holding | ||
| 332 | * this lock ensures we don't half assign or remove an irq from a cpu. | ||
| 329 | */ | 333 | */ |
| 330 | ipi_call_lock_irq(); | 334 | ipi_call_lock_irq(); |
| 331 | #ifdef CONFIG_X86_IO_APIC | 335 | lock_vector_lock(); |
| 332 | setup_vector_irq(smp_processor_id()); | 336 | __setup_vector_irq(smp_processor_id()); |
| 333 | #endif | ||
| 334 | cpu_set(smp_processor_id(), cpu_online_map); | 337 | cpu_set(smp_processor_id(), cpu_online_map); |
| 338 | unlock_vector_lock(); | ||
| 335 | ipi_call_unlock_irq(); | 339 | ipi_call_unlock_irq(); |
| 336 | per_cpu(cpu_state, smp_processor_id()) = CPU_ONLINE; | 340 | per_cpu(cpu_state, smp_processor_id()) = CPU_ONLINE; |
| 337 | 341 | ||
| @@ -752,6 +756,14 @@ static void __cpuinit do_fork_idle(struct work_struct *work) | |||
| 752 | } | 756 | } |
| 753 | 757 | ||
| 754 | #ifdef CONFIG_X86_64 | 758 | #ifdef CONFIG_X86_64 |
| 759 | |||
| 760 | /* __ref because it's safe to call free_bootmem when after_bootmem == 0. */ | ||
| 761 | static void __ref free_bootmem_pda(struct x8664_pda *oldpda) | ||
| 762 | { | ||
| 763 | if (!after_bootmem) | ||
| 764 | free_bootmem((unsigned long)oldpda, sizeof(*oldpda)); | ||
| 765 | } | ||
| 766 | |||
| 755 | /* | 767 | /* |
| 756 | * Allocate node local memory for the AP pda. | 768 | * Allocate node local memory for the AP pda. |
| 757 | * | 769 | * |
| @@ -780,8 +792,7 @@ int __cpuinit get_local_pda(int cpu) | |||
| 780 | 792 | ||
| 781 | if (oldpda) { | 793 | if (oldpda) { |
| 782 | memcpy(newpda, oldpda, size); | 794 | memcpy(newpda, oldpda, size); |
| 783 | if (!after_bootmem) | 795 | free_bootmem_pda(oldpda); |
| 784 | free_bootmem((unsigned long)oldpda, size); | ||
| 785 | } | 796 | } |
| 786 | 797 | ||
| 787 | newpda->in_bootmem = 0; | 798 | newpda->in_bootmem = 0; |
| @@ -1044,6 +1055,34 @@ static __init void disable_smp(void) | |||
| 1044 | static int __init smp_sanity_check(unsigned max_cpus) | 1055 | static int __init smp_sanity_check(unsigned max_cpus) |
| 1045 | { | 1056 | { |
| 1046 | preempt_disable(); | 1057 | preempt_disable(); |
| 1058 | |||
| 1059 | #if defined(CONFIG_X86_PC) && defined(CONFIG_X86_32) | ||
| 1060 | if (def_to_bigsmp && nr_cpu_ids > 8) { | ||
| 1061 | unsigned int cpu; | ||
| 1062 | unsigned nr; | ||
| 1063 | |||
| 1064 | printk(KERN_WARNING | ||
| 1065 | "More than 8 CPUs detected - skipping them.\n" | ||
| 1066 | "Use CONFIG_X86_GENERICARCH and CONFIG_X86_BIGSMP.\n"); | ||
| 1067 | |||
| 1068 | nr = 0; | ||
| 1069 | for_each_present_cpu(cpu) { | ||
| 1070 | if (nr >= 8) | ||
| 1071 | cpu_clear(cpu, cpu_present_map); | ||
| 1072 | nr++; | ||
| 1073 | } | ||
| 1074 | |||
| 1075 | nr = 0; | ||
| 1076 | for_each_possible_cpu(cpu) { | ||
| 1077 | if (nr >= 8) | ||
| 1078 | cpu_clear(cpu, cpu_possible_map); | ||
| 1079 | nr++; | ||
| 1080 | } | ||
| 1081 | |||
| 1082 | nr_cpu_ids = 8; | ||
| 1083 | } | ||
| 1084 | #endif | ||
| 1085 | |||
| 1047 | if (!physid_isset(hard_smp_processor_id(), phys_cpu_present_map)) { | 1086 | if (!physid_isset(hard_smp_processor_id(), phys_cpu_present_map)) { |
| 1048 | printk(KERN_WARNING "weird, boot CPU (#%d) not listed" | 1087 | printk(KERN_WARNING "weird, boot CPU (#%d) not listed" |
| 1049 | "by the BIOS.\n", hard_smp_processor_id()); | 1088 | "by the BIOS.\n", hard_smp_processor_id()); |
| @@ -1182,6 +1221,9 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus) | |||
| 1182 | printk(KERN_INFO "CPU%d: ", 0); | 1221 | printk(KERN_INFO "CPU%d: ", 0); |
| 1183 | print_cpu_info(&cpu_data(0)); | 1222 | print_cpu_info(&cpu_data(0)); |
| 1184 | setup_boot_clock(); | 1223 | setup_boot_clock(); |
| 1224 | |||
| 1225 | if (is_uv_system()) | ||
| 1226 | uv_system_init(); | ||
| 1185 | out: | 1227 | out: |
| 1186 | preempt_enable(); | 1228 | preempt_enable(); |
| 1187 | } | 1229 | } |
| @@ -1336,7 +1378,9 @@ int __cpu_disable(void) | |||
| 1336 | remove_siblinginfo(cpu); | 1378 | remove_siblinginfo(cpu); |
| 1337 | 1379 | ||
| 1338 | /* It's now safe to remove this processor from the online map */ | 1380 | /* It's now safe to remove this processor from the online map */ |
| 1381 | lock_vector_lock(); | ||
| 1339 | remove_cpu_from_maps(cpu); | 1382 | remove_cpu_from_maps(cpu); |
| 1383 | unlock_vector_lock(); | ||
| 1340 | fixup_irqs(cpu_online_map); | 1384 | fixup_irqs(cpu_online_map); |
| 1341 | return 0; | 1385 | return 0; |
| 1342 | } | 1386 | } |
| @@ -1370,17 +1414,3 @@ void __cpu_die(unsigned int cpu) | |||
| 1370 | BUG(); | 1414 | BUG(); |
| 1371 | } | 1415 | } |
| 1372 | #endif | 1416 | #endif |
| 1373 | |||
| 1374 | /* | ||
| 1375 | * If the BIOS enumerates physical processors before logical, | ||
| 1376 | * maxcpus=N at enumeration-time can be used to disable HT. | ||
| 1377 | */ | ||
| 1378 | static int __init parse_maxcpus(char *arg) | ||
| 1379 | { | ||
| 1380 | extern unsigned int maxcpus; | ||
| 1381 | |||
| 1382 | if (arg) | ||
| 1383 | maxcpus = simple_strtoul(arg, NULL, 0); | ||
| 1384 | return 0; | ||
| 1385 | } | ||
| 1386 | early_param("maxcpus", parse_maxcpus); | ||
diff --git a/arch/x86/kernel/smpcommon.c b/arch/x86/kernel/smpcommon.c index 99941b37eca0..397e309839dd 100644 --- a/arch/x86/kernel/smpcommon.c +++ b/arch/x86/kernel/smpcommon.c | |||
| @@ -8,18 +8,21 @@ | |||
| 8 | DEFINE_PER_CPU(unsigned long, this_cpu_off); | 8 | DEFINE_PER_CPU(unsigned long, this_cpu_off); |
| 9 | EXPORT_PER_CPU_SYMBOL(this_cpu_off); | 9 | EXPORT_PER_CPU_SYMBOL(this_cpu_off); |
| 10 | 10 | ||
| 11 | /* Initialize the CPU's GDT. This is either the boot CPU doing itself | 11 | /* |
| 12 | (still using the master per-cpu area), or a CPU doing it for a | 12 | * Initialize the CPU's GDT. This is either the boot CPU doing itself |
| 13 | secondary which will soon come up. */ | 13 | * (still using the master per-cpu area), or a CPU doing it for a |
| 14 | * secondary which will soon come up. | ||
| 15 | */ | ||
| 14 | __cpuinit void init_gdt(int cpu) | 16 | __cpuinit void init_gdt(int cpu) |
| 15 | { | 17 | { |
| 16 | struct desc_struct *gdt = get_cpu_gdt_table(cpu); | 18 | struct desc_struct gdt; |
| 17 | 19 | ||
| 18 | pack_descriptor(&gdt[GDT_ENTRY_PERCPU], | 20 | pack_descriptor(&gdt, __per_cpu_offset[cpu], 0xFFFFF, |
| 19 | __per_cpu_offset[cpu], 0xFFFFF, | ||
| 20 | 0x2 | DESCTYPE_S, 0x8); | 21 | 0x2 | DESCTYPE_S, 0x8); |
| 22 | gdt.s = 1; | ||
| 21 | 23 | ||
| 22 | gdt[GDT_ENTRY_PERCPU].s = 1; | 24 | write_gdt_entry(get_cpu_gdt_table(cpu), |
| 25 | GDT_ENTRY_PERCPU, &gdt, DESCTYPE_S); | ||
| 23 | 26 | ||
| 24 | per_cpu(this_cpu_off, cpu) = __per_cpu_offset[cpu]; | 27 | per_cpu(this_cpu_off, cpu) = __per_cpu_offset[cpu]; |
| 25 | per_cpu(cpu_number, cpu) = cpu; | 28 | per_cpu(cpu_number, cpu) = cpu; |
diff --git a/arch/x86/kernel/tlb_uv.c b/arch/x86/kernel/tlb_uv.c index d0fbb7712ab0..8b8c0d6640fa 100644 --- a/arch/x86/kernel/tlb_uv.c +++ b/arch/x86/kernel/tlb_uv.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <asm/genapic.h> | 17 | #include <asm/genapic.h> |
| 18 | #include <asm/idle.h> | 18 | #include <asm/idle.h> |
| 19 | #include <asm/tsc.h> | 19 | #include <asm/tsc.h> |
| 20 | #include <asm/irq_vectors.h> | ||
| 20 | 21 | ||
| 21 | #include <mach_apic.h> | 22 | #include <mach_apic.h> |
| 22 | 23 | ||
| @@ -783,7 +784,7 @@ static int __init uv_bau_init(void) | |||
| 783 | uv_init_blade(blade, node, cur_cpu); | 784 | uv_init_blade(blade, node, cur_cpu); |
| 784 | cur_cpu += uv_blade_nr_possible_cpus(blade); | 785 | cur_cpu += uv_blade_nr_possible_cpus(blade); |
| 785 | } | 786 | } |
| 786 | set_intr_gate(UV_BAU_MESSAGE, uv_bau_message_intr1); | 787 | alloc_intr_gate(UV_BAU_MESSAGE, uv_bau_message_intr1); |
| 787 | uv_enable_timeouts(); | 788 | uv_enable_timeouts(); |
| 788 | 789 | ||
| 789 | return 0; | 790 | return 0; |
diff --git a/arch/x86/kernel/traps_64.c b/arch/x86/kernel/traps_64.c index 3f18d73f420c..513caaca7115 100644 --- a/arch/x86/kernel/traps_64.c +++ b/arch/x86/kernel/traps_64.c | |||
| @@ -1131,7 +1131,14 @@ asmlinkage void math_state_restore(void) | |||
| 1131 | } | 1131 | } |
| 1132 | 1132 | ||
| 1133 | clts(); /* Allow maths ops (or we recurse) */ | 1133 | clts(); /* Allow maths ops (or we recurse) */ |
| 1134 | restore_fpu_checking(&me->thread.xstate->fxsave); | 1134 | /* |
| 1135 | * Paranoid restore. send a SIGSEGV if we fail to restore the state. | ||
| 1136 | */ | ||
| 1137 | if (unlikely(restore_fpu_checking(&me->thread.xstate->fxsave))) { | ||
| 1138 | stts(); | ||
| 1139 | force_sig(SIGSEGV, me); | ||
| 1140 | return; | ||
| 1141 | } | ||
| 1135 | task_thread_info(me)->status |= TS_USEDFPU; | 1142 | task_thread_info(me)->status |= TS_USEDFPU; |
| 1136 | me->fpu_counter++; | 1143 | me->fpu_counter++; |
| 1137 | } | 1144 | } |
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c index 7603c0553909..8f98e9de1b82 100644 --- a/arch/x86/kernel/tsc.c +++ b/arch/x86/kernel/tsc.c | |||
| @@ -104,7 +104,7 @@ __setup("notsc", notsc_setup); | |||
| 104 | /* | 104 | /* |
| 105 | * Read TSC and the reference counters. Take care of SMI disturbance | 105 | * Read TSC and the reference counters. Take care of SMI disturbance |
| 106 | */ | 106 | */ |
| 107 | static u64 __init tsc_read_refs(u64 *pm, u64 *hpet) | 107 | static u64 tsc_read_refs(u64 *pm, u64 *hpet) |
| 108 | { | 108 | { |
| 109 | u64 t1, t2; | 109 | u64 t1, t2; |
| 110 | int i; | 110 | int i; |
| @@ -122,80 +122,216 @@ static u64 __init tsc_read_refs(u64 *pm, u64 *hpet) | |||
| 122 | return ULLONG_MAX; | 122 | return ULLONG_MAX; |
| 123 | } | 123 | } |
| 124 | 124 | ||
| 125 | /** | 125 | /* |
| 126 | * native_calibrate_tsc - calibrate the tsc on boot | 126 | * Try to calibrate the TSC against the Programmable |
| 127 | * Interrupt Timer and return the frequency of the TSC | ||
| 128 | * in kHz. | ||
| 129 | * | ||
| 130 | * Return ULONG_MAX on failure to calibrate. | ||
| 127 | */ | 131 | */ |
| 128 | unsigned long native_calibrate_tsc(void) | 132 | static unsigned long pit_calibrate_tsc(void) |
| 129 | { | 133 | { |
| 130 | unsigned long flags; | 134 | u64 tsc, t1, t2, delta; |
| 131 | u64 tsc1, tsc2, tr1, tr2, delta, pm1, pm2, hpet1, hpet2; | 135 | unsigned long tscmin, tscmax; |
| 132 | int hpet = is_hpet_enabled(); | 136 | int pitcnt; |
| 133 | unsigned int tsc_khz_val = 0; | ||
| 134 | |||
| 135 | local_irq_save(flags); | ||
| 136 | |||
| 137 | tsc1 = tsc_read_refs(&pm1, hpet ? &hpet1 : NULL); | ||
| 138 | 137 | ||
| 138 | /* Set the Gate high, disable speaker */ | ||
| 139 | outb((inb(0x61) & ~0x02) | 0x01, 0x61); | 139 | outb((inb(0x61) & ~0x02) | 0x01, 0x61); |
| 140 | 140 | ||
| 141 | /* | ||
| 142 | * Setup CTC channel 2* for mode 0, (interrupt on terminal | ||
| 143 | * count mode), binary count. Set the latch register to 50ms | ||
| 144 | * (LSB then MSB) to begin countdown. | ||
| 145 | */ | ||
| 141 | outb(0xb0, 0x43); | 146 | outb(0xb0, 0x43); |
| 142 | outb((CLOCK_TICK_RATE / (1000 / 50)) & 0xff, 0x42); | 147 | outb((CLOCK_TICK_RATE / (1000 / 50)) & 0xff, 0x42); |
| 143 | outb((CLOCK_TICK_RATE / (1000 / 50)) >> 8, 0x42); | 148 | outb((CLOCK_TICK_RATE / (1000 / 50)) >> 8, 0x42); |
| 144 | tr1 = get_cycles(); | ||
| 145 | while ((inb(0x61) & 0x20) == 0); | ||
| 146 | tr2 = get_cycles(); | ||
| 147 | 149 | ||
| 148 | tsc2 = tsc_read_refs(&pm2, hpet ? &hpet2 : NULL); | 150 | tsc = t1 = t2 = get_cycles(); |
| 149 | 151 | ||
| 150 | local_irq_restore(flags); | 152 | pitcnt = 0; |
| 153 | tscmax = 0; | ||
| 154 | tscmin = ULONG_MAX; | ||
| 155 | while ((inb(0x61) & 0x20) == 0) { | ||
| 156 | t2 = get_cycles(); | ||
| 157 | delta = t2 - tsc; | ||
| 158 | tsc = t2; | ||
| 159 | if ((unsigned long) delta < tscmin) | ||
| 160 | tscmin = (unsigned int) delta; | ||
| 161 | if ((unsigned long) delta > tscmax) | ||
| 162 | tscmax = (unsigned int) delta; | ||
| 163 | pitcnt++; | ||
| 164 | } | ||
| 151 | 165 | ||
| 152 | /* | 166 | /* |
| 153 | * Preset the result with the raw and inaccurate PIT | 167 | * Sanity checks: |
| 154 | * calibration value | 168 | * |
| 169 | * If we were not able to read the PIT more than 5000 | ||
| 170 | * times, then we have been hit by a massive SMI | ||
| 171 | * | ||
| 172 | * If the maximum is 10 times larger than the minimum, | ||
| 173 | * then we got hit by an SMI as well. | ||
| 155 | */ | 174 | */ |
| 156 | delta = (tr2 - tr1); | 175 | if (pitcnt < 5000 || tscmax > 10 * tscmin) |
| 176 | return ULONG_MAX; | ||
| 177 | |||
| 178 | /* Calculate the PIT value */ | ||
| 179 | delta = t2 - t1; | ||
| 157 | do_div(delta, 50); | 180 | do_div(delta, 50); |
| 158 | tsc_khz_val = delta; | 181 | return delta; |
| 182 | } | ||
| 183 | |||
| 184 | |||
| 185 | /** | ||
| 186 | * native_calibrate_tsc - calibrate the tsc on boot | ||
| 187 | */ | ||
| 188 | unsigned long native_calibrate_tsc(void) | ||
| 189 | { | ||
| 190 | u64 tsc1, tsc2, delta, pm1, pm2, hpet1, hpet2; | ||
| 191 | unsigned long tsc_pit_min = ULONG_MAX, tsc_ref_min = ULONG_MAX; | ||
| 192 | unsigned long flags; | ||
| 193 | int hpet = is_hpet_enabled(), i; | ||
| 194 | |||
| 195 | /* | ||
| 196 | * Run 5 calibration loops to get the lowest frequency value | ||
| 197 | * (the best estimate). We use two different calibration modes | ||
| 198 | * here: | ||
| 199 | * | ||
| 200 | * 1) PIT loop. We set the PIT Channel 2 to oneshot mode and | ||
| 201 | * load a timeout of 50ms. We read the time right after we | ||
| 202 | * started the timer and wait until the PIT count down reaches | ||
| 203 | * zero. In each wait loop iteration we read the TSC and check | ||
| 204 | * the delta to the previous read. We keep track of the min | ||
| 205 | * and max values of that delta. The delta is mostly defined | ||
| 206 | * by the IO time of the PIT access, so we can detect when a | ||
| 207 | * SMI/SMM disturbance happend between the two reads. If the | ||
| 208 | * maximum time is significantly larger than the minimum time, | ||
| 209 | * then we discard the result and have another try. | ||
| 210 | * | ||
| 211 | * 2) Reference counter. If available we use the HPET or the | ||
| 212 | * PMTIMER as a reference to check the sanity of that value. | ||
| 213 | * We use separate TSC readouts and check inside of the | ||
| 214 | * reference read for a SMI/SMM disturbance. We dicard | ||
| 215 | * disturbed values here as well. We do that around the PIT | ||
| 216 | * calibration delay loop as we have to wait for a certain | ||
| 217 | * amount of time anyway. | ||
| 218 | */ | ||
| 219 | for (i = 0; i < 5; i++) { | ||
| 220 | unsigned long tsc_pit_khz; | ||
| 221 | |||
| 222 | /* | ||
| 223 | * Read the start value and the reference count of | ||
| 224 | * hpet/pmtimer when available. Then do the PIT | ||
| 225 | * calibration, which will take at least 50ms, and | ||
| 226 | * read the end value. | ||
| 227 | */ | ||
| 228 | local_irq_save(flags); | ||
| 229 | tsc1 = tsc_read_refs(&pm1, hpet ? &hpet1 : NULL); | ||
| 230 | tsc_pit_khz = pit_calibrate_tsc(); | ||
| 231 | tsc2 = tsc_read_refs(&pm2, hpet ? &hpet2 : NULL); | ||
| 232 | local_irq_restore(flags); | ||
| 233 | |||
| 234 | /* Pick the lowest PIT TSC calibration so far */ | ||
| 235 | tsc_pit_min = min(tsc_pit_min, tsc_pit_khz); | ||
| 236 | |||
| 237 | /* hpet or pmtimer available ? */ | ||
| 238 | if (!hpet && !pm1 && !pm2) | ||
| 239 | continue; | ||
| 240 | |||
| 241 | /* Check, whether the sampling was disturbed by an SMI */ | ||
| 242 | if (tsc1 == ULLONG_MAX || tsc2 == ULLONG_MAX) | ||
| 243 | continue; | ||
| 244 | |||
| 245 | tsc2 = (tsc2 - tsc1) * 1000000LL; | ||
| 246 | |||
| 247 | if (hpet) { | ||
| 248 | if (hpet2 < hpet1) | ||
| 249 | hpet2 += 0x100000000ULL; | ||
| 250 | hpet2 -= hpet1; | ||
| 251 | tsc1 = ((u64)hpet2 * hpet_readl(HPET_PERIOD)); | ||
| 252 | do_div(tsc1, 1000000); | ||
| 253 | } else { | ||
| 254 | if (pm2 < pm1) | ||
| 255 | pm2 += (u64)ACPI_PM_OVRRUN; | ||
| 256 | pm2 -= pm1; | ||
| 257 | tsc1 = pm2 * 1000000000LL; | ||
| 258 | do_div(tsc1, PMTMR_TICKS_PER_SEC); | ||
| 259 | } | ||
| 260 | |||
| 261 | do_div(tsc2, tsc1); | ||
| 262 | tsc_ref_min = min(tsc_ref_min, (unsigned long) tsc2); | ||
| 263 | } | ||
| 264 | |||
| 265 | /* | ||
| 266 | * Now check the results. | ||
| 267 | */ | ||
| 268 | if (tsc_pit_min == ULONG_MAX) { | ||
| 269 | /* PIT gave no useful value */ | ||
| 270 | printk(KERN_WARNING "TSC: Unable to calibrate against PIT\n"); | ||
| 271 | |||
| 272 | /* We don't have an alternative source, disable TSC */ | ||
| 273 | if (!hpet && !pm1 && !pm2) { | ||
| 274 | printk("TSC: No reference (HPET/PMTIMER) available\n"); | ||
| 275 | return 0; | ||
| 276 | } | ||
| 277 | |||
| 278 | /* The alternative source failed as well, disable TSC */ | ||
| 279 | if (tsc_ref_min == ULONG_MAX) { | ||
| 280 | printk(KERN_WARNING "TSC: HPET/PMTIMER calibration " | ||
| 281 | "failed due to SMI disturbance.\n"); | ||
| 282 | return 0; | ||
| 283 | } | ||
| 284 | |||
| 285 | /* Use the alternative source */ | ||
| 286 | printk(KERN_INFO "TSC: using %s reference calibration\n", | ||
| 287 | hpet ? "HPET" : "PMTIMER"); | ||
| 288 | |||
| 289 | return tsc_ref_min; | ||
| 290 | } | ||
| 159 | 291 | ||
| 160 | /* hpet or pmtimer available ? */ | 292 | /* We don't have an alternative source, use the PIT calibration value */ |
| 161 | if (!hpet && !pm1 && !pm2) { | 293 | if (!hpet && !pm1 && !pm2) { |
| 162 | printk(KERN_INFO "TSC calibrated against PIT\n"); | 294 | printk(KERN_INFO "TSC: Using PIT calibration value\n"); |
| 163 | goto out; | 295 | return tsc_pit_min; |
| 164 | } | 296 | } |
| 165 | 297 | ||
| 166 | /* Check, whether the sampling was disturbed by an SMI */ | 298 | /* The alternative source failed, use the PIT calibration value */ |
| 167 | if (tsc1 == ULLONG_MAX || tsc2 == ULLONG_MAX) { | 299 | if (tsc_ref_min == ULONG_MAX) { |
| 168 | printk(KERN_WARNING "TSC calibration disturbed by SMI, " | 300 | printk(KERN_WARNING "TSC: HPET/PMTIMER calibration failed due " |
| 169 | "using PIT calibration result\n"); | 301 | "to SMI disturbance. Using PIT calibration\n"); |
| 170 | goto out; | 302 | return tsc_pit_min; |
| 171 | } | 303 | } |
| 172 | 304 | ||
| 173 | tsc2 = (tsc2 - tsc1) * 1000000LL; | 305 | /* Check the reference deviation */ |
| 174 | 306 | delta = ((u64) tsc_pit_min) * 100; | |
| 175 | if (hpet) { | 307 | do_div(delta, tsc_ref_min); |
| 176 | printk(KERN_INFO "TSC calibrated against HPET\n"); | 308 | |
| 177 | if (hpet2 < hpet1) | 309 | /* |
| 178 | hpet2 += 0x100000000ULL; | 310 | * If both calibration results are inside a 5% window, the we |
| 179 | hpet2 -= hpet1; | 311 | * use the lower frequency of those as it is probably the |
| 180 | tsc1 = ((u64)hpet2 * hpet_readl(HPET_PERIOD)); | 312 | * closest estimate. |
| 181 | do_div(tsc1, 1000000); | 313 | */ |
| 182 | } else { | 314 | if (delta >= 95 && delta <= 105) { |
| 183 | printk(KERN_INFO "TSC calibrated against PM_TIMER\n"); | 315 | printk(KERN_INFO "TSC: PIT calibration confirmed by %s.\n", |
| 184 | if (pm2 < pm1) | 316 | hpet ? "HPET" : "PMTIMER"); |
| 185 | pm2 += (u64)ACPI_PM_OVRRUN; | 317 | printk(KERN_INFO "TSC: using %s calibration value\n", |
| 186 | pm2 -= pm1; | 318 | tsc_pit_min <= tsc_ref_min ? "PIT" : |
| 187 | tsc1 = pm2 * 1000000000LL; | 319 | hpet ? "HPET" : "PMTIMER"); |
| 188 | do_div(tsc1, PMTMR_TICKS_PER_SEC); | 320 | return tsc_pit_min <= tsc_ref_min ? tsc_pit_min : tsc_ref_min; |
| 189 | } | 321 | } |
| 190 | 322 | ||
| 191 | do_div(tsc2, tsc1); | 323 | printk(KERN_WARNING "TSC: PIT calibration deviates from %s: %lu %lu.\n", |
| 192 | tsc_khz_val = tsc2; | 324 | hpet ? "HPET" : "PMTIMER", tsc_pit_min, tsc_ref_min); |
| 193 | 325 | ||
| 194 | out: | 326 | /* |
| 195 | return tsc_khz_val; | 327 | * The calibration values differ too much. In doubt, we use |
| 328 | * the PIT value as we know that there are PMTIMERs around | ||
| 329 | * running at double speed. | ||
| 330 | */ | ||
| 331 | printk(KERN_INFO "TSC: Using PIT calibration value\n"); | ||
| 332 | return tsc_pit_min; | ||
| 196 | } | 333 | } |
| 197 | 334 | ||
| 198 | |||
| 199 | #ifdef CONFIG_X86_32 | 335 | #ifdef CONFIG_X86_32 |
| 200 | /* Only called from the Powernow K7 cpu freq driver */ | 336 | /* Only called from the Powernow K7 cpu freq driver */ |
| 201 | int recalibrate_cpu_khz(void) | 337 | int recalibrate_cpu_khz(void) |
| @@ -314,7 +450,7 @@ static int time_cpufreq_notifier(struct notifier_block *nb, unsigned long val, | |||
| 314 | mark_tsc_unstable("cpufreq changes"); | 450 | mark_tsc_unstable("cpufreq changes"); |
| 315 | } | 451 | } |
| 316 | 452 | ||
| 317 | set_cyc2ns_scale(tsc_khz_ref, freq->cpu); | 453 | set_cyc2ns_scale(tsc_khz, freq->cpu); |
| 318 | 454 | ||
| 319 | return 0; | 455 | return 0; |
| 320 | } | 456 | } |
| @@ -325,6 +461,10 @@ static struct notifier_block time_cpufreq_notifier_block = { | |||
| 325 | 461 | ||
| 326 | static int __init cpufreq_tsc(void) | 462 | static int __init cpufreq_tsc(void) |
| 327 | { | 463 | { |
| 464 | if (!cpu_has_tsc) | ||
| 465 | return 0; | ||
| 466 | if (boot_cpu_has(X86_FEATURE_CONSTANT_TSC)) | ||
| 467 | return 0; | ||
| 328 | cpufreq_register_notifier(&time_cpufreq_notifier_block, | 468 | cpufreq_register_notifier(&time_cpufreq_notifier_block, |
| 329 | CPUFREQ_TRANSITION_NOTIFIER); | 469 | CPUFREQ_TRANSITION_NOTIFIER); |
| 330 | return 0; | 470 | return 0; |
diff --git a/arch/x86/kernel/tsc_sync.c b/arch/x86/kernel/tsc_sync.c index 0577825cf89b..9ffb01c31c40 100644 --- a/arch/x86/kernel/tsc_sync.c +++ b/arch/x86/kernel/tsc_sync.c | |||
| @@ -88,11 +88,9 @@ static __cpuinit void check_tsc_warp(void) | |||
| 88 | __raw_spin_unlock(&sync_lock); | 88 | __raw_spin_unlock(&sync_lock); |
| 89 | } | 89 | } |
| 90 | } | 90 | } |
| 91 | if (!(now-start)) { | 91 | WARN(!(now-start), |
| 92 | printk("Warning: zero tsc calibration delta: %Ld [max: %Ld]\n", | 92 | "Warning: zero tsc calibration delta: %Ld [max: %Ld]\n", |
| 93 | now-start, end-start); | 93 | now-start, end-start); |
| 94 | WARN_ON(1); | ||
| 95 | } | ||
| 96 | } | 94 | } |
| 97 | 95 | ||
| 98 | /* | 96 | /* |
diff --git a/arch/x86/kernel/visws_quirks.c b/arch/x86/kernel/visws_quirks.c index 41e01b145c48..594ef47f0a63 100644 --- a/arch/x86/kernel/visws_quirks.c +++ b/arch/x86/kernel/visws_quirks.c | |||
| @@ -184,8 +184,6 @@ static int __init visws_get_smp_config(unsigned int early) | |||
| 184 | return 1; | 184 | return 1; |
| 185 | } | 185 | } |
| 186 | 186 | ||
| 187 | extern unsigned int __cpuinitdata maxcpus; | ||
| 188 | |||
| 189 | /* | 187 | /* |
| 190 | * The Visual Workstation is Intel MP compliant in the hardware | 188 | * The Visual Workstation is Intel MP compliant in the hardware |
| 191 | * sense, but it doesn't have a BIOS(-configuration table). | 189 | * sense, but it doesn't have a BIOS(-configuration table). |
| @@ -244,8 +242,8 @@ static int __init visws_find_smp_config(unsigned int reserve) | |||
| 244 | ncpus = CO_CPU_MAX; | 242 | ncpus = CO_CPU_MAX; |
| 245 | } | 243 | } |
| 246 | 244 | ||
| 247 | if (ncpus > maxcpus) | 245 | if (ncpus > setup_max_cpus) |
| 248 | ncpus = maxcpus; | 246 | ncpus = setup_max_cpus; |
| 249 | 247 | ||
| 250 | #ifdef CONFIG_X86_LOCAL_APIC | 248 | #ifdef CONFIG_X86_LOCAL_APIC |
| 251 | smp_found_config = 1; | 249 | smp_found_config = 1; |
diff --git a/arch/x86/kernel/vmi_32.c b/arch/x86/kernel/vmi_32.c index 0a1b1a9d922d..6ca515d6db54 100644 --- a/arch/x86/kernel/vmi_32.c +++ b/arch/x86/kernel/vmi_32.c | |||
| @@ -37,6 +37,7 @@ | |||
| 37 | #include <asm/timer.h> | 37 | #include <asm/timer.h> |
| 38 | #include <asm/vmi_time.h> | 38 | #include <asm/vmi_time.h> |
| 39 | #include <asm/kmap_types.h> | 39 | #include <asm/kmap_types.h> |
| 40 | #include <asm/setup.h> | ||
| 40 | 41 | ||
| 41 | /* Convenient for calling VMI functions indirectly in the ROM */ | 42 | /* Convenient for calling VMI functions indirectly in the ROM */ |
| 42 | typedef u32 __attribute__((regparm(1))) (VROMFUNC)(void); | 43 | typedef u32 __attribute__((regparm(1))) (VROMFUNC)(void); |
| @@ -683,7 +684,7 @@ void vmi_bringup(void) | |||
| 683 | { | 684 | { |
| 684 | /* We must establish the lowmem mapping for MMU ops to work */ | 685 | /* We must establish the lowmem mapping for MMU ops to work */ |
| 685 | if (vmi_ops.set_linear_mapping) | 686 | if (vmi_ops.set_linear_mapping) |
| 686 | vmi_ops.set_linear_mapping(0, (void *)__PAGE_OFFSET, max_low_pfn, 0); | 687 | vmi_ops.set_linear_mapping(0, (void *)__PAGE_OFFSET, MAXMEM_PFN, 0); |
| 687 | } | 688 | } |
| 688 | 689 | ||
| 689 | /* | 690 | /* |
diff --git a/arch/x86/kernel/vmlinux_32.lds.S b/arch/x86/kernel/vmlinux_32.lds.S index cdb2363697d2..af5bdad84604 100644 --- a/arch/x86/kernel/vmlinux_32.lds.S +++ b/arch/x86/kernel/vmlinux_32.lds.S | |||
| @@ -209,3 +209,11 @@ SECTIONS | |||
| 209 | 209 | ||
| 210 | DWARF_DEBUG | 210 | DWARF_DEBUG |
| 211 | } | 211 | } |
| 212 | |||
| 213 | #ifdef CONFIG_KEXEC | ||
| 214 | /* Link time checks */ | ||
| 215 | #include <asm/kexec.h> | ||
| 216 | |||
| 217 | ASSERT(kexec_control_code_size <= KEXEC_CONTROL_CODE_MAX_SIZE, | ||
| 218 | "kexec control code size is too big") | ||
| 219 | #endif | ||
diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h index f72ac1fa35f0..4a814bff21f2 100644 --- a/arch/x86/kvm/paging_tmpl.h +++ b/arch/x86/kvm/paging_tmpl.h | |||
| @@ -345,7 +345,7 @@ static u64 *FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr, | |||
| 345 | shadow_addr = __pa(shadow_page->spt); | 345 | shadow_addr = __pa(shadow_page->spt); |
| 346 | shadow_pte = shadow_addr | PT_PRESENT_MASK | PT_ACCESSED_MASK | 346 | shadow_pte = shadow_addr | PT_PRESENT_MASK | PT_ACCESSED_MASK |
| 347 | | PT_WRITABLE_MASK | PT_USER_MASK; | 347 | | PT_WRITABLE_MASK | PT_USER_MASK; |
| 348 | *shadow_ent = shadow_pte; | 348 | set_shadow_pte(shadow_ent, shadow_pte); |
| 349 | } | 349 | } |
| 350 | 350 | ||
| 351 | mmu_set_spte(vcpu, shadow_ent, access, walker->pte_access & access, | 351 | mmu_set_spte(vcpu, shadow_ent, access, walker->pte_access & access, |
diff --git a/arch/x86/lib/msr-on-cpu.c b/arch/x86/lib/msr-on-cpu.c index d5a2b39f882b..01b868ba82f8 100644 --- a/arch/x86/lib/msr-on-cpu.c +++ b/arch/x86/lib/msr-on-cpu.c | |||
| @@ -30,10 +30,11 @@ static int _rdmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h, int safe) | |||
| 30 | 30 | ||
| 31 | rv.msr_no = msr_no; | 31 | rv.msr_no = msr_no; |
| 32 | if (safe) { | 32 | if (safe) { |
| 33 | smp_call_function_single(cpu, __rdmsr_safe_on_cpu, &rv, 1); | 33 | err = smp_call_function_single(cpu, __rdmsr_safe_on_cpu, |
| 34 | err = rv.err; | 34 | &rv, 1); |
| 35 | err = err ? err : rv.err; | ||
| 35 | } else { | 36 | } else { |
| 36 | smp_call_function_single(cpu, __rdmsr_on_cpu, &rv, 1); | 37 | err = smp_call_function_single(cpu, __rdmsr_on_cpu, &rv, 1); |
| 37 | } | 38 | } |
| 38 | *l = rv.l; | 39 | *l = rv.l; |
| 39 | *h = rv.h; | 40 | *h = rv.h; |
| @@ -64,23 +65,24 @@ static int _wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h, int safe) | |||
| 64 | rv.l = l; | 65 | rv.l = l; |
| 65 | rv.h = h; | 66 | rv.h = h; |
| 66 | if (safe) { | 67 | if (safe) { |
| 67 | smp_call_function_single(cpu, __wrmsr_safe_on_cpu, &rv, 1); | 68 | err = smp_call_function_single(cpu, __wrmsr_safe_on_cpu, |
| 68 | err = rv.err; | 69 | &rv, 1); |
| 70 | err = err ? err : rv.err; | ||
| 69 | } else { | 71 | } else { |
| 70 | smp_call_function_single(cpu, __wrmsr_on_cpu, &rv, 1); | 72 | err = smp_call_function_single(cpu, __wrmsr_on_cpu, &rv, 1); |
| 71 | } | 73 | } |
| 72 | 74 | ||
| 73 | return err; | 75 | return err; |
| 74 | } | 76 | } |
| 75 | 77 | ||
| 76 | void wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h) | 78 | int wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h) |
| 77 | { | 79 | { |
| 78 | _wrmsr_on_cpu(cpu, msr_no, l, h, 0); | 80 | return _wrmsr_on_cpu(cpu, msr_no, l, h, 0); |
| 79 | } | 81 | } |
| 80 | 82 | ||
| 81 | void rdmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h) | 83 | int rdmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h) |
| 82 | { | 84 | { |
| 83 | _rdmsr_on_cpu(cpu, msr_no, l, h, 0); | 85 | return _rdmsr_on_cpu(cpu, msr_no, l, h, 0); |
| 84 | } | 86 | } |
| 85 | 87 | ||
| 86 | /* These "safe" variants are slower and should be used when the target MSR | 88 | /* These "safe" variants are slower and should be used when the target MSR |
diff --git a/arch/x86/mach-rdc321x/platform.c b/arch/x86/mach-rdc321x/platform.c index a037041817c7..4f4e50c3ad3b 100644 --- a/arch/x86/mach-rdc321x/platform.c +++ b/arch/x86/mach-rdc321x/platform.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | #include <linux/list.h> | 25 | #include <linux/list.h> |
| 26 | #include <linux/device.h> | 26 | #include <linux/device.h> |
| 27 | #include <linux/platform_device.h> | 27 | #include <linux/platform_device.h> |
| 28 | #include <linux/version.h> | ||
| 29 | #include <linux/leds.h> | 28 | #include <linux/leds.h> |
| 30 | 29 | ||
| 31 | #include <asm/gpio.h> | 30 | #include <asm/gpio.h> |
diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile index 2977ea37791f..dfb932dcf136 100644 --- a/arch/x86/mm/Makefile +++ b/arch/x86/mm/Makefile | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | obj-y := init_$(BITS).o fault.o ioremap.o extable.o pageattr.o mmap.o \ | 1 | obj-y := init_$(BITS).o fault.o ioremap.o extable.o pageattr.o mmap.o \ |
| 2 | pat.o pgtable.o | 2 | pat.o pgtable.o gup.o |
| 3 | 3 | ||
| 4 | obj-$(CONFIG_HAVE_GET_USER_PAGES_FAST) += gup.o | ||
| 5 | obj-$(CONFIG_X86_32) += pgtable_32.o | 4 | obj-$(CONFIG_X86_32) += pgtable_32.o |
| 6 | 5 | ||
| 7 | obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o | 6 | obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o |
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index 129618ca0ea2..d3746efb060d 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c | |||
| @@ -60,7 +60,7 @@ static unsigned long dma_reserve __initdata; | |||
| 60 | 60 | ||
| 61 | DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); | 61 | DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); |
| 62 | 62 | ||
| 63 | int direct_gbpages __meminitdata | 63 | int direct_gbpages |
| 64 | #ifdef CONFIG_DIRECT_GBPAGES | 64 | #ifdef CONFIG_DIRECT_GBPAGES |
| 65 | = 1 | 65 | = 1 |
| 66 | #endif | 66 | #endif |
| @@ -88,7 +88,11 @@ early_param("gbpages", parse_direct_gbpages_on); | |||
| 88 | 88 | ||
| 89 | int after_bootmem; | 89 | int after_bootmem; |
| 90 | 90 | ||
| 91 | static __init void *spp_getpage(void) | 91 | /* |
| 92 | * NOTE: This function is marked __ref because it calls __init function | ||
| 93 | * (alloc_bootmem_pages). It's safe to do it ONLY when after_bootmem == 0. | ||
| 94 | */ | ||
| 95 | static __ref void *spp_getpage(void) | ||
| 92 | { | 96 | { |
| 93 | void *ptr; | 97 | void *ptr; |
| 94 | 98 | ||
| @@ -237,7 +241,7 @@ static unsigned long __initdata table_start; | |||
| 237 | static unsigned long __meminitdata table_end; | 241 | static unsigned long __meminitdata table_end; |
| 238 | static unsigned long __meminitdata table_top; | 242 | static unsigned long __meminitdata table_top; |
| 239 | 243 | ||
| 240 | static __meminit void *alloc_low_page(unsigned long *phys) | 244 | static __ref void *alloc_low_page(unsigned long *phys) |
| 241 | { | 245 | { |
| 242 | unsigned long pfn = table_end++; | 246 | unsigned long pfn = table_end++; |
| 243 | void *adr; | 247 | void *adr; |
| @@ -258,7 +262,7 @@ static __meminit void *alloc_low_page(unsigned long *phys) | |||
| 258 | return adr; | 262 | return adr; |
| 259 | } | 263 | } |
| 260 | 264 | ||
| 261 | static __meminit void unmap_low_page(void *adr) | 265 | static __ref void unmap_low_page(void *adr) |
| 262 | { | 266 | { |
| 263 | if (after_bootmem) | 267 | if (after_bootmem) |
| 264 | return; | 268 | return; |
| @@ -314,6 +318,7 @@ phys_pmd_init(pmd_t *pmd_page, unsigned long address, unsigned long end, | |||
| 314 | { | 318 | { |
| 315 | unsigned long pages = 0; | 319 | unsigned long pages = 0; |
| 316 | unsigned long last_map_addr = end; | 320 | unsigned long last_map_addr = end; |
| 321 | unsigned long start = address; | ||
| 317 | 322 | ||
| 318 | int i = pmd_index(address); | 323 | int i = pmd_index(address); |
| 319 | 324 | ||
| @@ -331,16 +336,24 @@ phys_pmd_init(pmd_t *pmd_page, unsigned long address, unsigned long end, | |||
| 331 | } | 336 | } |
| 332 | 337 | ||
| 333 | if (pmd_val(*pmd)) { | 338 | if (pmd_val(*pmd)) { |
| 334 | if (!pmd_large(*pmd)) | 339 | if (!pmd_large(*pmd)) { |
| 340 | spin_lock(&init_mm.page_table_lock); | ||
| 335 | last_map_addr = phys_pte_update(pmd, address, | 341 | last_map_addr = phys_pte_update(pmd, address, |
| 336 | end); | 342 | end); |
| 343 | spin_unlock(&init_mm.page_table_lock); | ||
| 344 | } | ||
| 345 | /* Count entries we're using from level2_ident_pgt */ | ||
| 346 | if (start == 0) | ||
| 347 | pages++; | ||
| 337 | continue; | 348 | continue; |
| 338 | } | 349 | } |
| 339 | 350 | ||
| 340 | if (page_size_mask & (1<<PG_LEVEL_2M)) { | 351 | if (page_size_mask & (1<<PG_LEVEL_2M)) { |
| 341 | pages++; | 352 | pages++; |
| 353 | spin_lock(&init_mm.page_table_lock); | ||
| 342 | set_pte((pte_t *)pmd, | 354 | set_pte((pte_t *)pmd, |
| 343 | pfn_pte(address >> PAGE_SHIFT, PAGE_KERNEL_LARGE)); | 355 | pfn_pte(address >> PAGE_SHIFT, PAGE_KERNEL_LARGE)); |
| 356 | spin_unlock(&init_mm.page_table_lock); | ||
| 344 | last_map_addr = (address & PMD_MASK) + PMD_SIZE; | 357 | last_map_addr = (address & PMD_MASK) + PMD_SIZE; |
| 345 | continue; | 358 | continue; |
| 346 | } | 359 | } |
| @@ -349,7 +362,9 @@ phys_pmd_init(pmd_t *pmd_page, unsigned long address, unsigned long end, | |||
| 349 | last_map_addr = phys_pte_init(pte, address, end); | 362 | last_map_addr = phys_pte_init(pte, address, end); |
| 350 | unmap_low_page(pte); | 363 | unmap_low_page(pte); |
| 351 | 364 | ||
| 365 | spin_lock(&init_mm.page_table_lock); | ||
| 352 | pmd_populate_kernel(&init_mm, pmd, __va(pte_phys)); | 366 | pmd_populate_kernel(&init_mm, pmd, __va(pte_phys)); |
| 367 | spin_unlock(&init_mm.page_table_lock); | ||
| 353 | } | 368 | } |
| 354 | update_page_count(PG_LEVEL_2M, pages); | 369 | update_page_count(PG_LEVEL_2M, pages); |
| 355 | return last_map_addr; | 370 | return last_map_addr; |
| @@ -362,9 +377,7 @@ phys_pmd_update(pud_t *pud, unsigned long address, unsigned long end, | |||
| 362 | pmd_t *pmd = pmd_offset(pud, 0); | 377 | pmd_t *pmd = pmd_offset(pud, 0); |
| 363 | unsigned long last_map_addr; | 378 | unsigned long last_map_addr; |
| 364 | 379 | ||
| 365 | spin_lock(&init_mm.page_table_lock); | ||
| 366 | last_map_addr = phys_pmd_init(pmd, address, end, page_size_mask); | 380 | last_map_addr = phys_pmd_init(pmd, address, end, page_size_mask); |
| 367 | spin_unlock(&init_mm.page_table_lock); | ||
| 368 | __flush_tlb_all(); | 381 | __flush_tlb_all(); |
| 369 | return last_map_addr; | 382 | return last_map_addr; |
| 370 | } | 383 | } |
| @@ -400,20 +413,21 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end, | |||
| 400 | 413 | ||
| 401 | if (page_size_mask & (1<<PG_LEVEL_1G)) { | 414 | if (page_size_mask & (1<<PG_LEVEL_1G)) { |
| 402 | pages++; | 415 | pages++; |
| 416 | spin_lock(&init_mm.page_table_lock); | ||
| 403 | set_pte((pte_t *)pud, | 417 | set_pte((pte_t *)pud, |
| 404 | pfn_pte(addr >> PAGE_SHIFT, PAGE_KERNEL_LARGE)); | 418 | pfn_pte(addr >> PAGE_SHIFT, PAGE_KERNEL_LARGE)); |
| 419 | spin_unlock(&init_mm.page_table_lock); | ||
| 405 | last_map_addr = (addr & PUD_MASK) + PUD_SIZE; | 420 | last_map_addr = (addr & PUD_MASK) + PUD_SIZE; |
| 406 | continue; | 421 | continue; |
| 407 | } | 422 | } |
| 408 | 423 | ||
| 409 | pmd = alloc_low_page(&pmd_phys); | 424 | pmd = alloc_low_page(&pmd_phys); |
| 410 | |||
| 411 | spin_lock(&init_mm.page_table_lock); | ||
| 412 | last_map_addr = phys_pmd_init(pmd, addr, end, page_size_mask); | 425 | last_map_addr = phys_pmd_init(pmd, addr, end, page_size_mask); |
| 413 | unmap_low_page(pmd); | 426 | unmap_low_page(pmd); |
| 427 | |||
| 428 | spin_lock(&init_mm.page_table_lock); | ||
| 414 | pud_populate(&init_mm, pud, __va(pmd_phys)); | 429 | pud_populate(&init_mm, pud, __va(pmd_phys)); |
| 415 | spin_unlock(&init_mm.page_table_lock); | 430 | spin_unlock(&init_mm.page_table_lock); |
| 416 | |||
| 417 | } | 431 | } |
| 418 | __flush_tlb_all(); | 432 | __flush_tlb_all(); |
| 419 | update_page_count(PG_LEVEL_1G, pages); | 433 | update_page_count(PG_LEVEL_1G, pages); |
| @@ -505,16 +519,14 @@ static unsigned long __init kernel_physical_mapping_init(unsigned long start, | |||
| 505 | continue; | 519 | continue; |
| 506 | } | 520 | } |
| 507 | 521 | ||
| 508 | if (after_bootmem) | 522 | pud = alloc_low_page(&pud_phys); |
| 509 | pud = pud_offset(pgd, start & PGDIR_MASK); | ||
| 510 | else | ||
| 511 | pud = alloc_low_page(&pud_phys); | ||
| 512 | |||
| 513 | last_map_addr = phys_pud_init(pud, __pa(start), __pa(next), | 523 | last_map_addr = phys_pud_init(pud, __pa(start), __pa(next), |
| 514 | page_size_mask); | 524 | page_size_mask); |
| 515 | unmap_low_page(pud); | 525 | unmap_low_page(pud); |
| 516 | pgd_populate(&init_mm, pgd_offset_k(start), | 526 | |
| 517 | __va(pud_phys)); | 527 | spin_lock(&init_mm.page_table_lock); |
| 528 | pgd_populate(&init_mm, pgd, __va(pud_phys)); | ||
| 529 | spin_unlock(&init_mm.page_table_lock); | ||
| 518 | } | 530 | } |
| 519 | 531 | ||
| 520 | return last_map_addr; | 532 | return last_map_addr; |
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c index 016f335bbeea..d4b6e6a29ae3 100644 --- a/arch/x86/mm/ioremap.c +++ b/arch/x86/mm/ioremap.c | |||
| @@ -170,7 +170,7 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr, | |||
| 170 | phys_addr &= PAGE_MASK; | 170 | phys_addr &= PAGE_MASK; |
| 171 | size = PAGE_ALIGN(last_addr+1) - phys_addr; | 171 | size = PAGE_ALIGN(last_addr+1) - phys_addr; |
| 172 | 172 | ||
| 173 | retval = reserve_memtype(phys_addr, phys_addr + size, | 173 | retval = reserve_memtype(phys_addr, (u64)phys_addr + size, |
| 174 | prot_val, &new_prot_val); | 174 | prot_val, &new_prot_val); |
| 175 | if (retval) { | 175 | if (retval) { |
| 176 | pr_debug("Warning: reserve_memtype returned %d\n", retval); | 176 | pr_debug("Warning: reserve_memtype returned %d\n", retval); |
| @@ -553,13 +553,11 @@ static int __init check_early_ioremap_leak(void) | |||
| 553 | { | 553 | { |
| 554 | if (!early_ioremap_nested) | 554 | if (!early_ioremap_nested) |
| 555 | return 0; | 555 | return 0; |
| 556 | 556 | WARN(1, KERN_WARNING | |
| 557 | printk(KERN_WARNING | ||
| 558 | "Debug warning: early ioremap leak of %d areas detected.\n", | 557 | "Debug warning: early ioremap leak of %d areas detected.\n", |
| 559 | early_ioremap_nested); | 558 | early_ioremap_nested); |
| 560 | printk(KERN_WARNING | 559 | printk(KERN_WARNING |
| 561 | "please boot with early_ioremap_debug and report the dmesg.\n"); | 560 | "please boot with early_ioremap_debug and report the dmesg.\n"); |
| 562 | WARN_ON(1); | ||
| 563 | 561 | ||
| 564 | return 1; | 562 | return 1; |
| 565 | } | 563 | } |
diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c index e7397e108beb..635b50e85581 100644 --- a/arch/x86/mm/mmio-mod.c +++ b/arch/x86/mm/mmio-mod.c | |||
| @@ -430,7 +430,9 @@ static void enter_uniprocessor(void) | |||
| 430 | "may miss events.\n"); | 430 | "may miss events.\n"); |
| 431 | } | 431 | } |
| 432 | 432 | ||
| 433 | static void leave_uniprocessor(void) | 433 | /* __ref because leave_uniprocessor calls cpu_up which is __cpuinit, |
| 434 | but this whole function is ifdefed CONFIG_HOTPLUG_CPU */ | ||
| 435 | static void __ref leave_uniprocessor(void) | ||
| 434 | { | 436 | { |
| 435 | int cpu; | 437 | int cpu; |
| 436 | int err; | 438 | int err; |
diff --git a/arch/x86/mm/pageattr-test.c b/arch/x86/mm/pageattr-test.c index 0dcd42eb94e6..d4aa503caaa2 100644 --- a/arch/x86/mm/pageattr-test.c +++ b/arch/x86/mm/pageattr-test.c | |||
| @@ -221,8 +221,7 @@ static int pageattr_test(void) | |||
| 221 | failed += print_split(&sc); | 221 | failed += print_split(&sc); |
| 222 | 222 | ||
| 223 | if (failed) { | 223 | if (failed) { |
| 224 | printk(KERN_ERR "NOT PASSED. Please report.\n"); | 224 | WARN(1, KERN_ERR "NOT PASSED. Please report.\n"); |
| 225 | WARN_ON(1); | ||
| 226 | return -EINVAL; | 225 | return -EINVAL; |
| 227 | } else { | 226 | } else { |
| 228 | if (print) | 227 | if (print) |
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c index 65c6e46bf059..43e2f8483e4f 100644 --- a/arch/x86/mm/pageattr.c +++ b/arch/x86/mm/pageattr.c | |||
| @@ -55,13 +55,19 @@ static void split_page_count(int level) | |||
| 55 | 55 | ||
| 56 | int arch_report_meminfo(char *page) | 56 | int arch_report_meminfo(char *page) |
| 57 | { | 57 | { |
| 58 | int n = sprintf(page, "DirectMap4k: %8lu\n" | 58 | int n = sprintf(page, "DirectMap4k: %8lu kB\n", |
| 59 | "DirectMap2M: %8lu\n", | 59 | direct_pages_count[PG_LEVEL_4K] << 2); |
| 60 | direct_pages_count[PG_LEVEL_4K], | 60 | #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE) |
| 61 | direct_pages_count[PG_LEVEL_2M]); | 61 | n += sprintf(page + n, "DirectMap2M: %8lu kB\n", |
| 62 | direct_pages_count[PG_LEVEL_2M] << 11); | ||
| 63 | #else | ||
| 64 | n += sprintf(page + n, "DirectMap4M: %8lu kB\n", | ||
| 65 | direct_pages_count[PG_LEVEL_2M] << 12); | ||
| 66 | #endif | ||
| 62 | #ifdef CONFIG_X86_64 | 67 | #ifdef CONFIG_X86_64 |
| 63 | n += sprintf(page + n, "DirectMap1G: %8lu\n", | 68 | if (direct_gbpages) |
| 64 | direct_pages_count[PG_LEVEL_1G]); | 69 | n += sprintf(page + n, "DirectMap1G: %8lu kB\n", |
| 70 | direct_pages_count[PG_LEVEL_1G] << 20); | ||
| 65 | #endif | 71 | #endif |
| 66 | return n; | 72 | return n; |
| 67 | } | 73 | } |
| @@ -592,10 +598,9 @@ repeat: | |||
| 592 | if (!pte_val(old_pte)) { | 598 | if (!pte_val(old_pte)) { |
| 593 | if (!primary) | 599 | if (!primary) |
| 594 | return 0; | 600 | return 0; |
| 595 | printk(KERN_WARNING "CPA: called for zero pte. " | 601 | WARN(1, KERN_WARNING "CPA: called for zero pte. " |
| 596 | "vaddr = %lx cpa->vaddr = %lx\n", address, | 602 | "vaddr = %lx cpa->vaddr = %lx\n", address, |
| 597 | cpa->vaddr); | 603 | cpa->vaddr); |
| 598 | WARN_ON(1); | ||
| 599 | return -EINVAL; | 604 | return -EINVAL; |
| 600 | } | 605 | } |
| 601 | 606 | ||
| @@ -844,7 +849,7 @@ int set_memory_uc(unsigned long addr, int numpages) | |||
| 844 | /* | 849 | /* |
| 845 | * for now UC MINUS. see comments in ioremap_nocache() | 850 | * for now UC MINUS. see comments in ioremap_nocache() |
| 846 | */ | 851 | */ |
| 847 | if (reserve_memtype(addr, addr + numpages * PAGE_SIZE, | 852 | if (reserve_memtype(__pa(addr), __pa(addr) + numpages * PAGE_SIZE, |
| 848 | _PAGE_CACHE_UC_MINUS, NULL)) | 853 | _PAGE_CACHE_UC_MINUS, NULL)) |
| 849 | return -EINVAL; | 854 | return -EINVAL; |
| 850 | 855 | ||
| @@ -863,7 +868,7 @@ int set_memory_wc(unsigned long addr, int numpages) | |||
| 863 | if (!pat_enabled) | 868 | if (!pat_enabled) |
| 864 | return set_memory_uc(addr, numpages); | 869 | return set_memory_uc(addr, numpages); |
| 865 | 870 | ||
| 866 | if (reserve_memtype(addr, addr + numpages * PAGE_SIZE, | 871 | if (reserve_memtype(__pa(addr), __pa(addr) + numpages * PAGE_SIZE, |
| 867 | _PAGE_CACHE_WC, NULL)) | 872 | _PAGE_CACHE_WC, NULL)) |
| 868 | return -EINVAL; | 873 | return -EINVAL; |
| 869 | 874 | ||
| @@ -879,7 +884,7 @@ int _set_memory_wb(unsigned long addr, int numpages) | |||
| 879 | 884 | ||
| 880 | int set_memory_wb(unsigned long addr, int numpages) | 885 | int set_memory_wb(unsigned long addr, int numpages) |
| 881 | { | 886 | { |
| 882 | free_memtype(addr, addr + numpages * PAGE_SIZE); | 887 | free_memtype(__pa(addr), __pa(addr) + numpages * PAGE_SIZE); |
| 883 | 888 | ||
| 884 | return _set_memory_wb(addr, numpages); | 889 | return _set_memory_wb(addr, numpages); |
| 885 | } | 890 | } |
diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c index 2fe30916d4b6..2a50e0fa64a5 100644 --- a/arch/x86/mm/pat.c +++ b/arch/x86/mm/pat.c | |||
| @@ -207,6 +207,9 @@ static int chk_conflict(struct memtype *new, struct memtype *entry, | |||
| 207 | return -EBUSY; | 207 | return -EBUSY; |
| 208 | } | 208 | } |
| 209 | 209 | ||
| 210 | static struct memtype *cached_entry; | ||
| 211 | static u64 cached_start; | ||
| 212 | |||
| 210 | /* | 213 | /* |
| 211 | * req_type typically has one of the: | 214 | * req_type typically has one of the: |
| 212 | * - _PAGE_CACHE_WB | 215 | * - _PAGE_CACHE_WB |
| @@ -280,11 +283,17 @@ int reserve_memtype(u64 start, u64 end, unsigned long req_type, | |||
| 280 | 283 | ||
| 281 | spin_lock(&memtype_lock); | 284 | spin_lock(&memtype_lock); |
| 282 | 285 | ||
| 286 | if (cached_entry && start >= cached_start) | ||
| 287 | entry = cached_entry; | ||
| 288 | else | ||
| 289 | entry = list_entry(&memtype_list, struct memtype, nd); | ||
| 290 | |||
| 283 | /* Search for existing mapping that overlaps the current range */ | 291 | /* Search for existing mapping that overlaps the current range */ |
| 284 | where = NULL; | 292 | where = NULL; |
| 285 | list_for_each_entry(entry, &memtype_list, nd) { | 293 | list_for_each_entry_continue(entry, &memtype_list, nd) { |
| 286 | if (end <= entry->start) { | 294 | if (end <= entry->start) { |
| 287 | where = entry->nd.prev; | 295 | where = entry->nd.prev; |
| 296 | cached_entry = list_entry(where, struct memtype, nd); | ||
| 288 | break; | 297 | break; |
| 289 | } else if (start <= entry->start) { /* end > entry->start */ | 298 | } else if (start <= entry->start) { /* end > entry->start */ |
| 290 | err = chk_conflict(new, entry, new_type); | 299 | err = chk_conflict(new, entry, new_type); |
| @@ -292,6 +301,8 @@ int reserve_memtype(u64 start, u64 end, unsigned long req_type, | |||
| 292 | dprintk("Overlap at 0x%Lx-0x%Lx\n", | 301 | dprintk("Overlap at 0x%Lx-0x%Lx\n", |
| 293 | entry->start, entry->end); | 302 | entry->start, entry->end); |
| 294 | where = entry->nd.prev; | 303 | where = entry->nd.prev; |
| 304 | cached_entry = list_entry(where, | ||
| 305 | struct memtype, nd); | ||
| 295 | } | 306 | } |
| 296 | break; | 307 | break; |
| 297 | } else if (start < entry->end) { /* start > entry->start */ | 308 | } else if (start < entry->end) { /* start > entry->start */ |
| @@ -299,7 +310,20 @@ int reserve_memtype(u64 start, u64 end, unsigned long req_type, | |||
| 299 | if (!err) { | 310 | if (!err) { |
| 300 | dprintk("Overlap at 0x%Lx-0x%Lx\n", | 311 | dprintk("Overlap at 0x%Lx-0x%Lx\n", |
| 301 | entry->start, entry->end); | 312 | entry->start, entry->end); |
| 302 | where = &entry->nd; | 313 | cached_entry = list_entry(entry->nd.prev, |
| 314 | struct memtype, nd); | ||
| 315 | |||
| 316 | /* | ||
| 317 | * Move to right position in the linked | ||
| 318 | * list to add this new entry | ||
| 319 | */ | ||
| 320 | list_for_each_entry_continue(entry, | ||
| 321 | &memtype_list, nd) { | ||
| 322 | if (start <= entry->start) { | ||
| 323 | where = entry->nd.prev; | ||
| 324 | break; | ||
| 325 | } | ||
| 326 | } | ||
| 303 | } | 327 | } |
| 304 | break; | 328 | break; |
| 305 | } | 329 | } |
| @@ -314,6 +338,8 @@ int reserve_memtype(u64 start, u64 end, unsigned long req_type, | |||
| 314 | return err; | 338 | return err; |
| 315 | } | 339 | } |
| 316 | 340 | ||
| 341 | cached_start = start; | ||
| 342 | |||
| 317 | if (where) | 343 | if (where) |
| 318 | list_add(&new->nd, where); | 344 | list_add(&new->nd, where); |
| 319 | else | 345 | else |
| @@ -343,6 +369,9 @@ int free_memtype(u64 start, u64 end) | |||
| 343 | spin_lock(&memtype_lock); | 369 | spin_lock(&memtype_lock); |
| 344 | list_for_each_entry(entry, &memtype_list, nd) { | 370 | list_for_each_entry(entry, &memtype_list, nd) { |
| 345 | if (entry->start == start && entry->end == end) { | 371 | if (entry->start == start && entry->end == end) { |
| 372 | if (cached_entry == entry || cached_start == start) | ||
| 373 | cached_entry = NULL; | ||
| 374 | |||
| 346 | list_del(&entry->nd); | 375 | list_del(&entry->nd); |
| 347 | kfree(entry); | 376 | kfree(entry); |
| 348 | err = 0; | 377 | err = 0; |
| @@ -361,14 +390,6 @@ int free_memtype(u64 start, u64 end) | |||
| 361 | } | 390 | } |
| 362 | 391 | ||
| 363 | 392 | ||
| 364 | /* | ||
| 365 | * /dev/mem mmap interface. The memtype used for mapping varies: | ||
| 366 | * - Use UC for mappings with O_SYNC flag | ||
| 367 | * - Without O_SYNC flag, if there is any conflict in reserve_memtype, | ||
| 368 | * inherit the memtype from existing mapping. | ||
| 369 | * - Else use UC_MINUS memtype (for backward compatibility with existing | ||
| 370 | * X drivers. | ||
| 371 | */ | ||
| 372 | pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn, | 393 | pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn, |
| 373 | unsigned long size, pgprot_t vma_prot) | 394 | unsigned long size, pgprot_t vma_prot) |
| 374 | { | 395 | { |
| @@ -406,14 +427,14 @@ int phys_mem_access_prot_allowed(struct file *file, unsigned long pfn, | |||
| 406 | unsigned long size, pgprot_t *vma_prot) | 427 | unsigned long size, pgprot_t *vma_prot) |
| 407 | { | 428 | { |
| 408 | u64 offset = ((u64) pfn) << PAGE_SHIFT; | 429 | u64 offset = ((u64) pfn) << PAGE_SHIFT; |
| 409 | unsigned long flags = _PAGE_CACHE_UC_MINUS; | 430 | unsigned long flags = -1; |
| 410 | int retval; | 431 | int retval; |
| 411 | 432 | ||
| 412 | if (!range_is_allowed(pfn, size)) | 433 | if (!range_is_allowed(pfn, size)) |
| 413 | return 0; | 434 | return 0; |
| 414 | 435 | ||
| 415 | if (file->f_flags & O_SYNC) { | 436 | if (file->f_flags & O_SYNC) { |
| 416 | flags = _PAGE_CACHE_UC; | 437 | flags = _PAGE_CACHE_UC_MINUS; |
| 417 | } | 438 | } |
| 418 | 439 | ||
| 419 | #ifdef CONFIG_X86_32 | 440 | #ifdef CONFIG_X86_32 |
| @@ -436,13 +457,14 @@ int phys_mem_access_prot_allowed(struct file *file, unsigned long pfn, | |||
| 436 | #endif | 457 | #endif |
| 437 | 458 | ||
| 438 | /* | 459 | /* |
| 439 | * With O_SYNC, we can only take UC mapping. Fail if we cannot. | 460 | * With O_SYNC, we can only take UC_MINUS mapping. Fail if we cannot. |
| 461 | * | ||
| 440 | * Without O_SYNC, we want to get | 462 | * Without O_SYNC, we want to get |
| 441 | * - WB for WB-able memory and no other conflicting mappings | 463 | * - WB for WB-able memory and no other conflicting mappings |
| 442 | * - UC_MINUS for non-WB-able memory with no other conflicting mappings | 464 | * - UC_MINUS for non-WB-able memory with no other conflicting mappings |
| 443 | * - Inherit from confliting mappings otherwise | 465 | * - Inherit from confliting mappings otherwise |
| 444 | */ | 466 | */ |
| 445 | if (flags != _PAGE_CACHE_UC_MINUS) { | 467 | if (flags != -1) { |
| 446 | retval = reserve_memtype(offset, offset + size, flags, NULL); | 468 | retval = reserve_memtype(offset, offset + size, flags, NULL); |
| 447 | } else { | 469 | } else { |
| 448 | retval = reserve_memtype(offset, offset + size, -1, &flags); | 470 | retval = reserve_memtype(offset, offset + size, -1, &flags); |
diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c index 557b2abceef8..d50302774fe2 100644 --- a/arch/x86/mm/pgtable.c +++ b/arch/x86/mm/pgtable.c | |||
| @@ -207,6 +207,9 @@ static void pgd_prepopulate_pmd(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmds[]) | |||
| 207 | unsigned long addr; | 207 | unsigned long addr; |
| 208 | int i; | 208 | int i; |
| 209 | 209 | ||
| 210 | if (PREALLOCATED_PMDS == 0) /* Work around gcc-3.4.x bug */ | ||
| 211 | return; | ||
| 212 | |||
| 210 | pud = pud_offset(pgd, 0); | 213 | pud = pud_offset(pgd, 0); |
| 211 | 214 | ||
| 212 | for (addr = i = 0; i < PREALLOCATED_PMDS; | 215 | for (addr = i = 0; i < PREALLOCATED_PMDS; |
diff --git a/arch/x86/mm/srat_32.c b/arch/x86/mm/srat_32.c index 1eb2973a301c..16ae70fc57e7 100644 --- a/arch/x86/mm/srat_32.c +++ b/arch/x86/mm/srat_32.c | |||
| @@ -178,7 +178,7 @@ void acpi_numa_arch_fixup(void) | |||
| 178 | * start of the node, and that the current "end" address is after | 178 | * start of the node, and that the current "end" address is after |
| 179 | * the previous one. | 179 | * the previous one. |
| 180 | */ | 180 | */ |
| 181 | static __init void node_read_chunk(int nid, struct node_memory_chunk_s *memory_chunk) | 181 | static __init int node_read_chunk(int nid, struct node_memory_chunk_s *memory_chunk) |
| 182 | { | 182 | { |
| 183 | /* | 183 | /* |
| 184 | * Only add present memory as told by the e820. | 184 | * Only add present memory as told by the e820. |
| @@ -189,10 +189,10 @@ static __init void node_read_chunk(int nid, struct node_memory_chunk_s *memory_c | |||
| 189 | if (memory_chunk->start_pfn >= max_pfn) { | 189 | if (memory_chunk->start_pfn >= max_pfn) { |
| 190 | printk(KERN_INFO "Ignoring SRAT pfns: %08lx - %08lx\n", | 190 | printk(KERN_INFO "Ignoring SRAT pfns: %08lx - %08lx\n", |
| 191 | memory_chunk->start_pfn, memory_chunk->end_pfn); | 191 | memory_chunk->start_pfn, memory_chunk->end_pfn); |
| 192 | return; | 192 | return -1; |
| 193 | } | 193 | } |
| 194 | if (memory_chunk->nid != nid) | 194 | if (memory_chunk->nid != nid) |
| 195 | return; | 195 | return -1; |
| 196 | 196 | ||
| 197 | if (!node_has_online_mem(nid)) | 197 | if (!node_has_online_mem(nid)) |
| 198 | node_start_pfn[nid] = memory_chunk->start_pfn; | 198 | node_start_pfn[nid] = memory_chunk->start_pfn; |
| @@ -202,6 +202,8 @@ static __init void node_read_chunk(int nid, struct node_memory_chunk_s *memory_c | |||
| 202 | 202 | ||
| 203 | if (node_end_pfn[nid] < memory_chunk->end_pfn) | 203 | if (node_end_pfn[nid] < memory_chunk->end_pfn) |
| 204 | node_end_pfn[nid] = memory_chunk->end_pfn; | 204 | node_end_pfn[nid] = memory_chunk->end_pfn; |
| 205 | |||
| 206 | return 0; | ||
| 205 | } | 207 | } |
| 206 | 208 | ||
| 207 | int __init get_memcfg_from_srat(void) | 209 | int __init get_memcfg_from_srat(void) |
| @@ -259,7 +261,9 @@ int __init get_memcfg_from_srat(void) | |||
| 259 | printk(KERN_DEBUG | 261 | printk(KERN_DEBUG |
| 260 | "chunk %d nid %d start_pfn %08lx end_pfn %08lx\n", | 262 | "chunk %d nid %d start_pfn %08lx end_pfn %08lx\n", |
| 261 | j, chunk->nid, chunk->start_pfn, chunk->end_pfn); | 263 | j, chunk->nid, chunk->start_pfn, chunk->end_pfn); |
| 262 | node_read_chunk(chunk->nid, chunk); | 264 | if (node_read_chunk(chunk->nid, chunk)) |
| 265 | continue; | ||
| 266 | |||
| 263 | e820_register_active_regions(chunk->nid, chunk->start_pfn, | 267 | e820_register_active_regions(chunk->nid, chunk->start_pfn, |
| 264 | min(chunk->end_pfn, max_pfn)); | 268 | min(chunk->end_pfn, max_pfn)); |
| 265 | } | 269 | } |
diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c index 3f90289410e6..0227694f7dab 100644 --- a/arch/x86/oprofile/nmi_int.c +++ b/arch/x86/oprofile/nmi_int.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/slab.h> | 15 | #include <linux/slab.h> |
| 16 | #include <linux/moduleparam.h> | 16 | #include <linux/moduleparam.h> |
| 17 | #include <linux/kdebug.h> | 17 | #include <linux/kdebug.h> |
| 18 | #include <linux/cpu.h> | ||
| 18 | #include <asm/nmi.h> | 19 | #include <asm/nmi.h> |
| 19 | #include <asm/msr.h> | 20 | #include <asm/msr.h> |
| 20 | #include <asm/apic.h> | 21 | #include <asm/apic.h> |
| @@ -28,23 +29,48 @@ static DEFINE_PER_CPU(unsigned long, saved_lvtpc); | |||
| 28 | 29 | ||
| 29 | static int nmi_start(void); | 30 | static int nmi_start(void); |
| 30 | static void nmi_stop(void); | 31 | static void nmi_stop(void); |
| 32 | static void nmi_cpu_start(void *dummy); | ||
| 33 | static void nmi_cpu_stop(void *dummy); | ||
| 31 | 34 | ||
| 32 | /* 0 == registered but off, 1 == registered and on */ | 35 | /* 0 == registered but off, 1 == registered and on */ |
| 33 | static int nmi_enabled = 0; | 36 | static int nmi_enabled = 0; |
| 34 | 37 | ||
| 38 | #ifdef CONFIG_SMP | ||
| 39 | static int oprofile_cpu_notifier(struct notifier_block *b, unsigned long action, | ||
| 40 | void *data) | ||
| 41 | { | ||
| 42 | int cpu = (unsigned long)data; | ||
| 43 | switch (action) { | ||
| 44 | case CPU_DOWN_FAILED: | ||
| 45 | case CPU_ONLINE: | ||
| 46 | smp_call_function_single(cpu, nmi_cpu_start, NULL, 0); | ||
| 47 | break; | ||
| 48 | case CPU_DOWN_PREPARE: | ||
| 49 | smp_call_function_single(cpu, nmi_cpu_stop, NULL, 1); | ||
| 50 | break; | ||
| 51 | } | ||
| 52 | return NOTIFY_DONE; | ||
| 53 | } | ||
| 54 | |||
| 55 | static struct notifier_block oprofile_cpu_nb = { | ||
| 56 | .notifier_call = oprofile_cpu_notifier | ||
| 57 | }; | ||
| 58 | #endif | ||
| 59 | |||
| 35 | #ifdef CONFIG_PM | 60 | #ifdef CONFIG_PM |
| 36 | 61 | ||
| 37 | static int nmi_suspend(struct sys_device *dev, pm_message_t state) | 62 | static int nmi_suspend(struct sys_device *dev, pm_message_t state) |
| 38 | { | 63 | { |
| 64 | /* Only one CPU left, just stop that one */ | ||
| 39 | if (nmi_enabled == 1) | 65 | if (nmi_enabled == 1) |
| 40 | nmi_stop(); | 66 | nmi_cpu_stop(NULL); |
| 41 | return 0; | 67 | return 0; |
| 42 | } | 68 | } |
| 43 | 69 | ||
| 44 | static int nmi_resume(struct sys_device *dev) | 70 | static int nmi_resume(struct sys_device *dev) |
| 45 | { | 71 | { |
| 46 | if (nmi_enabled == 1) | 72 | if (nmi_enabled == 1) |
| 47 | nmi_start(); | 73 | nmi_cpu_start(NULL); |
| 48 | return 0; | 74 | return 0; |
| 49 | } | 75 | } |
| 50 | 76 | ||
| @@ -463,6 +489,9 @@ int __init op_nmi_init(struct oprofile_operations *ops) | |||
| 463 | } | 489 | } |
| 464 | 490 | ||
| 465 | init_sysfs(); | 491 | init_sysfs(); |
| 492 | #ifdef CONFIG_SMP | ||
| 493 | register_cpu_notifier(&oprofile_cpu_nb); | ||
| 494 | #endif | ||
| 466 | using_nmi = 1; | 495 | using_nmi = 1; |
| 467 | ops->create_files = nmi_create_files; | 496 | ops->create_files = nmi_create_files; |
| 468 | ops->setup = nmi_setup; | 497 | ops->setup = nmi_setup; |
| @@ -476,6 +505,10 @@ int __init op_nmi_init(struct oprofile_operations *ops) | |||
| 476 | 505 | ||
| 477 | void op_nmi_exit(void) | 506 | void op_nmi_exit(void) |
| 478 | { | 507 | { |
| 479 | if (using_nmi) | 508 | if (using_nmi) { |
| 480 | exit_sysfs(); | 509 | exit_sysfs(); |
| 510 | #ifdef CONFIG_SMP | ||
| 511 | unregister_cpu_notifier(&oprofile_cpu_nb); | ||
| 512 | #endif | ||
| 513 | } | ||
| 481 | } | 514 | } |
diff --git a/arch/x86/pci/amd_bus.c b/arch/x86/pci/amd_bus.c index dbf532369711..6a0fca78c362 100644 --- a/arch/x86/pci/amd_bus.c +++ b/arch/x86/pci/amd_bus.c | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | #include <linux/init.h> | 1 | #include <linux/init.h> |
| 2 | #include <linux/pci.h> | 2 | #include <linux/pci.h> |
| 3 | #include <linux/topology.h> | 3 | #include <linux/topology.h> |
| 4 | #include <linux/cpu.h> | ||
| 4 | #include "pci.h" | 5 | #include "pci.h" |
| 5 | 6 | ||
| 6 | #ifdef CONFIG_X86_64 | 7 | #ifdef CONFIG_X86_64 |
| @@ -555,15 +556,17 @@ static int __init early_fill_mp_bus_info(void) | |||
| 555 | return 0; | 556 | return 0; |
| 556 | } | 557 | } |
| 557 | 558 | ||
| 558 | postcore_initcall(early_fill_mp_bus_info); | 559 | #else /* !CONFIG_X86_64 */ |
| 559 | 560 | ||
| 560 | #endif | 561 | static int __init early_fill_mp_bus_info(void) { return 0; } |
| 562 | |||
| 563 | #endif /* !CONFIG_X86_64 */ | ||
| 561 | 564 | ||
| 562 | /* common 32/64 bit code */ | 565 | /* common 32/64 bit code */ |
| 563 | 566 | ||
| 564 | #define ENABLE_CF8_EXT_CFG (1ULL << 46) | 567 | #define ENABLE_CF8_EXT_CFG (1ULL << 46) |
| 565 | 568 | ||
| 566 | static void enable_pci_io_ecs_per_cpu(void *unused) | 569 | static void enable_pci_io_ecs(void *unused) |
| 567 | { | 570 | { |
| 568 | u64 reg; | 571 | u64 reg; |
| 569 | rdmsrl(MSR_AMD64_NB_CFG, reg); | 572 | rdmsrl(MSR_AMD64_NB_CFG, reg); |
| @@ -573,14 +576,51 @@ static void enable_pci_io_ecs_per_cpu(void *unused) | |||
| 573 | } | 576 | } |
| 574 | } | 577 | } |
| 575 | 578 | ||
| 576 | static int __init enable_pci_io_ecs(void) | 579 | static int __cpuinit amd_cpu_notify(struct notifier_block *self, |
| 580 | unsigned long action, void *hcpu) | ||
| 577 | { | 581 | { |
| 582 | int cpu = (long)hcpu; | ||
| 583 | switch(action) { | ||
| 584 | case CPU_ONLINE: | ||
| 585 | case CPU_ONLINE_FROZEN: | ||
| 586 | smp_call_function_single(cpu, enable_pci_io_ecs, NULL, 0); | ||
| 587 | break; | ||
| 588 | default: | ||
| 589 | break; | ||
| 590 | } | ||
| 591 | return NOTIFY_OK; | ||
| 592 | } | ||
| 593 | |||
| 594 | static struct notifier_block __cpuinitdata amd_cpu_notifier = { | ||
| 595 | .notifier_call = amd_cpu_notify, | ||
| 596 | }; | ||
| 597 | |||
| 598 | static int __init pci_io_ecs_init(void) | ||
| 599 | { | ||
| 600 | int cpu; | ||
| 601 | |||
| 578 | /* assume all cpus from fam10h have IO ECS */ | 602 | /* assume all cpus from fam10h have IO ECS */ |
| 579 | if (boot_cpu_data.x86 < 0x10) | 603 | if (boot_cpu_data.x86 < 0x10) |
| 580 | return 0; | 604 | return 0; |
| 581 | on_each_cpu(enable_pci_io_ecs_per_cpu, NULL, 1); | 605 | |
| 606 | register_cpu_notifier(&amd_cpu_notifier); | ||
| 607 | for_each_online_cpu(cpu) | ||
| 608 | amd_cpu_notify(&amd_cpu_notifier, (unsigned long)CPU_ONLINE, | ||
| 609 | (void *)(long)cpu); | ||
| 582 | pci_probe |= PCI_HAS_IO_ECS; | 610 | pci_probe |= PCI_HAS_IO_ECS; |
| 611 | |||
| 612 | return 0; | ||
| 613 | } | ||
| 614 | |||
| 615 | static int __init amd_postcore_init(void) | ||
| 616 | { | ||
| 617 | if (boot_cpu_data.x86_vendor != X86_VENDOR_AMD) | ||
| 618 | return 0; | ||
| 619 | |||
| 620 | early_fill_mp_bus_info(); | ||
| 621 | pci_io_ecs_init(); | ||
| 622 | |||
| 583 | return 0; | 623 | return 0; |
| 584 | } | 624 | } |
| 585 | 625 | ||
| 586 | postcore_initcall(enable_pci_io_ecs); | 626 | postcore_initcall(amd_postcore_init); |
diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c index 5807d1bc73f7..8791fc55e715 100644 --- a/arch/x86/pci/i386.c +++ b/arch/x86/pci/i386.c | |||
| @@ -128,8 +128,7 @@ static void __init pcibios_allocate_bus_resources(struct list_head *bus_list) | |||
| 128 | pr = pci_find_parent_resource(dev, r); | 128 | pr = pci_find_parent_resource(dev, r); |
| 129 | if (!r->start || !pr || | 129 | if (!r->start || !pr || |
| 130 | request_resource(pr, r) < 0) { | 130 | request_resource(pr, r) < 0) { |
| 131 | dev_err(&dev->dev, "BAR %d: can't " | 131 | dev_err(&dev->dev, "BAR %d: can't allocate resource\n", idx); |
| 132 | "allocate resource\n", idx); | ||
| 133 | /* | 132 | /* |
| 134 | * Something is wrong with the region. | 133 | * Something is wrong with the region. |
| 135 | * Invalidate the resource to prevent | 134 | * Invalidate the resource to prevent |
| @@ -164,15 +163,13 @@ static void __init pcibios_allocate_resources(int pass) | |||
| 164 | else | 163 | else |
| 165 | disabled = !(command & PCI_COMMAND_MEMORY); | 164 | disabled = !(command & PCI_COMMAND_MEMORY); |
| 166 | if (pass == disabled) { | 165 | if (pass == disabled) { |
| 167 | dev_dbg(&dev->dev, "resource %#08llx-%#08llx " | 166 | dev_dbg(&dev->dev, "resource %#08llx-%#08llx (f=%lx, d=%d, p=%d)\n", |
| 168 | "(f=%lx, d=%d, p=%d)\n", | ||
| 169 | (unsigned long long) r->start, | 167 | (unsigned long long) r->start, |
| 170 | (unsigned long long) r->end, | 168 | (unsigned long long) r->end, |
| 171 | r->flags, disabled, pass); | 169 | r->flags, disabled, pass); |
| 172 | pr = pci_find_parent_resource(dev, r); | 170 | pr = pci_find_parent_resource(dev, r); |
| 173 | if (!pr || request_resource(pr, r) < 0) { | 171 | if (!pr || request_resource(pr, r) < 0) { |
| 174 | dev_err(&dev->dev, "BAR %d: can't " | 172 | dev_err(&dev->dev, "BAR %d: can't allocate resource\n", idx); |
| 175 | "allocate resource\n", idx); | ||
| 176 | /* We'll assign a new address later */ | 173 | /* We'll assign a new address later */ |
| 177 | r->end -= r->start; | 174 | r->end -= r->start; |
| 178 | r->start = 0; | 175 | r->start = 0; |
diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c index fec0123b33a9..8e077185e185 100644 --- a/arch/x86/pci/irq.c +++ b/arch/x86/pci/irq.c | |||
| @@ -590,6 +590,8 @@ static __init int intel_router_probe(struct irq_router *r, struct pci_dev *route | |||
| 590 | case PCI_DEVICE_ID_INTEL_ICH10_1: | 590 | case PCI_DEVICE_ID_INTEL_ICH10_1: |
| 591 | case PCI_DEVICE_ID_INTEL_ICH10_2: | 591 | case PCI_DEVICE_ID_INTEL_ICH10_2: |
| 592 | case PCI_DEVICE_ID_INTEL_ICH10_3: | 592 | case PCI_DEVICE_ID_INTEL_ICH10_3: |
| 593 | case PCI_DEVICE_ID_INTEL_PCH_0: | ||
| 594 | case PCI_DEVICE_ID_INTEL_PCH_1: | ||
| 593 | r->name = "PIIX/ICH"; | 595 | r->name = "PIIX/ICH"; |
| 594 | r->get = pirq_piix_get; | 596 | r->get = pirq_piix_get; |
| 595 | r->set = pirq_piix_set; | 597 | r->set = pirq_piix_set; |
diff --git a/arch/x86/pci/legacy.c b/arch/x86/pci/legacy.c index ec9ce35e44d6..b722dd481b39 100644 --- a/arch/x86/pci/legacy.c +++ b/arch/x86/pci/legacy.c | |||
| @@ -14,7 +14,7 @@ static void __devinit pcibios_fixup_peer_bridges(void) | |||
| 14 | int n, devfn; | 14 | int n, devfn; |
| 15 | long node; | 15 | long node; |
| 16 | 16 | ||
| 17 | if (pcibios_last_bus <= 0 || pcibios_last_bus >= 0xff) | 17 | if (pcibios_last_bus <= 0 || pcibios_last_bus > 0xff) |
| 18 | return; | 18 | return; |
| 19 | DBG("PCI: Peer bridge fixup\n"); | 19 | DBG("PCI: Peer bridge fixup\n"); |
| 20 | 20 | ||
diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c index 23faaa890ffc..d9635764ce3d 100644 --- a/arch/x86/pci/mmconfig-shared.c +++ b/arch/x86/pci/mmconfig-shared.c | |||
| @@ -293,7 +293,7 @@ static acpi_status __init find_mboard_resource(acpi_handle handle, u32 lvl, | |||
| 293 | return AE_OK; | 293 | return AE_OK; |
| 294 | } | 294 | } |
| 295 | 295 | ||
| 296 | static int __init is_acpi_reserved(unsigned long start, unsigned long end) | 296 | static int __init is_acpi_reserved(u64 start, u64 end, unsigned not_used) |
| 297 | { | 297 | { |
| 298 | struct resource mcfg_res; | 298 | struct resource mcfg_res; |
| 299 | 299 | ||
| @@ -310,6 +310,41 @@ static int __init is_acpi_reserved(unsigned long start, unsigned long end) | |||
| 310 | return mcfg_res.flags; | 310 | return mcfg_res.flags; |
| 311 | } | 311 | } |
| 312 | 312 | ||
| 313 | typedef int (*check_reserved_t)(u64 start, u64 end, unsigned type); | ||
| 314 | |||
| 315 | static int __init is_mmconf_reserved(check_reserved_t is_reserved, | ||
| 316 | u64 addr, u64 size, int i, | ||
| 317 | typeof(pci_mmcfg_config[0]) *cfg, int with_e820) | ||
| 318 | { | ||
| 319 | u64 old_size = size; | ||
| 320 | int valid = 0; | ||
| 321 | |||
| 322 | while (!is_reserved(addr, addr + size - 1, E820_RESERVED)) { | ||
| 323 | size >>= 1; | ||
| 324 | if (size < (16UL<<20)) | ||
| 325 | break; | ||
| 326 | } | ||
| 327 | |||
| 328 | if (size >= (16UL<<20) || size == old_size) { | ||
| 329 | printk(KERN_NOTICE | ||
| 330 | "PCI: MCFG area at %Lx reserved in %s\n", | ||
| 331 | addr, with_e820?"E820":"ACPI motherboard resources"); | ||
| 332 | valid = 1; | ||
| 333 | |||
| 334 | if (old_size != size) { | ||
| 335 | /* update end_bus_number */ | ||
| 336 | cfg->end_bus_number = cfg->start_bus_number + ((size>>20) - 1); | ||
| 337 | printk(KERN_NOTICE "PCI: updated MCFG configuration %d: base %lx " | ||
| 338 | "segment %hu buses %u - %u\n", | ||
| 339 | i, (unsigned long)cfg->address, cfg->pci_segment, | ||
| 340 | (unsigned int)cfg->start_bus_number, | ||
| 341 | (unsigned int)cfg->end_bus_number); | ||
| 342 | } | ||
| 343 | } | ||
| 344 | |||
| 345 | return valid; | ||
| 346 | } | ||
| 347 | |||
| 313 | static void __init pci_mmcfg_reject_broken(int early) | 348 | static void __init pci_mmcfg_reject_broken(int early) |
| 314 | { | 349 | { |
| 315 | typeof(pci_mmcfg_config[0]) *cfg; | 350 | typeof(pci_mmcfg_config[0]) *cfg; |
| @@ -324,21 +359,22 @@ static void __init pci_mmcfg_reject_broken(int early) | |||
| 324 | 359 | ||
| 325 | for (i = 0; i < pci_mmcfg_config_num; i++) { | 360 | for (i = 0; i < pci_mmcfg_config_num; i++) { |
| 326 | int valid = 0; | 361 | int valid = 0; |
| 327 | u32 size = (cfg->end_bus_number + 1) << 20; | 362 | u64 addr, size; |
| 363 | |||
| 328 | cfg = &pci_mmcfg_config[i]; | 364 | cfg = &pci_mmcfg_config[i]; |
| 365 | addr = cfg->start_bus_number; | ||
| 366 | addr <<= 20; | ||
| 367 | addr += cfg->address; | ||
| 368 | size = cfg->end_bus_number + 1 - cfg->start_bus_number; | ||
| 369 | size <<= 20; | ||
| 329 | printk(KERN_NOTICE "PCI: MCFG configuration %d: base %lx " | 370 | printk(KERN_NOTICE "PCI: MCFG configuration %d: base %lx " |
| 330 | "segment %hu buses %u - %u\n", | 371 | "segment %hu buses %u - %u\n", |
| 331 | i, (unsigned long)cfg->address, cfg->pci_segment, | 372 | i, (unsigned long)cfg->address, cfg->pci_segment, |
| 332 | (unsigned int)cfg->start_bus_number, | 373 | (unsigned int)cfg->start_bus_number, |
| 333 | (unsigned int)cfg->end_bus_number); | 374 | (unsigned int)cfg->end_bus_number); |
| 334 | 375 | ||
| 335 | if (!early && | 376 | if (!early) |
| 336 | is_acpi_reserved(cfg->address, cfg->address + size - 1)) { | 377 | valid = is_mmconf_reserved(is_acpi_reserved, addr, size, i, cfg, 0); |
| 337 | printk(KERN_NOTICE "PCI: MCFG area at %Lx reserved " | ||
| 338 | "in ACPI motherboard resources\n", | ||
| 339 | cfg->address); | ||
| 340 | valid = 1; | ||
| 341 | } | ||
| 342 | 378 | ||
| 343 | if (valid) | 379 | if (valid) |
| 344 | continue; | 380 | continue; |
| @@ -347,16 +383,11 @@ static void __init pci_mmcfg_reject_broken(int early) | |||
| 347 | printk(KERN_ERR "PCI: BIOS Bug: MCFG area at %Lx is not" | 383 | printk(KERN_ERR "PCI: BIOS Bug: MCFG area at %Lx is not" |
| 348 | " reserved in ACPI motherboard resources\n", | 384 | " reserved in ACPI motherboard resources\n", |
| 349 | cfg->address); | 385 | cfg->address); |
| 386 | |||
| 350 | /* Don't try to do this check unless configuration | 387 | /* Don't try to do this check unless configuration |
| 351 | type 1 is available. how about type 2 ?*/ | 388 | type 1 is available. how about type 2 ?*/ |
| 352 | if (raw_pci_ops && e820_all_mapped(cfg->address, | 389 | if (raw_pci_ops) |
| 353 | cfg->address + size - 1, | 390 | valid = is_mmconf_reserved(e820_all_mapped, addr, size, i, cfg, 1); |
| 354 | E820_RESERVED)) { | ||
| 355 | printk(KERN_NOTICE | ||
| 356 | "PCI: MCFG area at %Lx reserved in E820\n", | ||
| 357 | cfg->address); | ||
| 358 | valid = 1; | ||
| 359 | } | ||
| 360 | 391 | ||
| 361 | if (!valid) | 392 | if (!valid) |
| 362 | goto reject; | 393 | goto reject; |
| @@ -365,7 +396,7 @@ static void __init pci_mmcfg_reject_broken(int early) | |||
| 365 | return; | 396 | return; |
| 366 | 397 | ||
| 367 | reject: | 398 | reject: |
| 368 | printk(KERN_ERR "PCI: Not using MMCONFIG.\n"); | 399 | printk(KERN_INFO "PCI: Not using MMCONFIG.\n"); |
| 369 | pci_mmcfg_arch_free(); | 400 | pci_mmcfg_arch_free(); |
| 370 | kfree(pci_mmcfg_config); | 401 | kfree(pci_mmcfg_config); |
| 371 | pci_mmcfg_config = NULL; | 402 | pci_mmcfg_config = NULL; |
diff --git a/arch/x86/power/cpu_32.c b/arch/x86/power/cpu_32.c index 7dc5d5cf50a2..d3e083dea720 100644 --- a/arch/x86/power/cpu_32.c +++ b/arch/x86/power/cpu_32.c | |||
| @@ -45,7 +45,7 @@ static void __save_processor_state(struct saved_context *ctxt) | |||
| 45 | ctxt->cr0 = read_cr0(); | 45 | ctxt->cr0 = read_cr0(); |
| 46 | ctxt->cr2 = read_cr2(); | 46 | ctxt->cr2 = read_cr2(); |
| 47 | ctxt->cr3 = read_cr3(); | 47 | ctxt->cr3 = read_cr3(); |
| 48 | ctxt->cr4 = read_cr4(); | 48 | ctxt->cr4 = read_cr4_safe(); |
| 49 | } | 49 | } |
| 50 | 50 | ||
| 51 | /* Needed by apm.c */ | 51 | /* Needed by apm.c */ |
| @@ -98,7 +98,9 @@ static void __restore_processor_state(struct saved_context *ctxt) | |||
| 98 | /* | 98 | /* |
| 99 | * control registers | 99 | * control registers |
| 100 | */ | 100 | */ |
| 101 | write_cr4(ctxt->cr4); | 101 | /* cr4 was introduced in the Pentium CPU */ |
| 102 | if (ctxt->cr4) | ||
| 103 | write_cr4(ctxt->cr4); | ||
| 102 | write_cr3(ctxt->cr3); | 104 | write_cr3(ctxt->cr3); |
| 103 | write_cr2(ctxt->cr2); | 105 | write_cr2(ctxt->cr2); |
| 104 | write_cr0(ctxt->cr0); | 106 | write_cr0(ctxt->cr0); |
diff --git a/arch/x86/power/hibernate_asm_32.S b/arch/x86/power/hibernate_asm_32.S index b95aa6cfe3cb..4fc7e872c85e 100644 --- a/arch/x86/power/hibernate_asm_32.S +++ b/arch/x86/power/hibernate_asm_32.S | |||
| @@ -28,9 +28,9 @@ ENTRY(swsusp_arch_suspend) | |||
| 28 | ret | 28 | ret |
| 29 | 29 | ||
| 30 | ENTRY(restore_image) | 30 | ENTRY(restore_image) |
| 31 | movl resume_pg_dir, %ecx | 31 | movl resume_pg_dir, %eax |
| 32 | subl $__PAGE_OFFSET, %ecx | 32 | subl $__PAGE_OFFSET, %eax |
| 33 | movl %ecx, %cr3 | 33 | movl %eax, %cr3 |
| 34 | 34 | ||
| 35 | movl restore_pblist, %edx | 35 | movl restore_pblist, %edx |
| 36 | .p2align 4,,7 | 36 | .p2align 4,,7 |
| @@ -52,17 +52,21 @@ copy_loop: | |||
| 52 | 52 | ||
| 53 | done: | 53 | done: |
| 54 | /* go back to the original page tables */ | 54 | /* go back to the original page tables */ |
| 55 | movl $swapper_pg_dir, %ecx | 55 | movl $swapper_pg_dir, %eax |
| 56 | subl $__PAGE_OFFSET, %ecx | 56 | subl $__PAGE_OFFSET, %eax |
| 57 | movl %ecx, %cr3 | 57 | movl %eax, %cr3 |
| 58 | /* Flush TLB, including "global" things (vmalloc) */ | 58 | /* Flush TLB, including "global" things (vmalloc) */ |
| 59 | movl mmu_cr4_features, %eax | 59 | movl mmu_cr4_features, %ecx |
| 60 | movl %eax, %edx | 60 | jecxz 1f # cr4 Pentium and higher, skip if zero |
| 61 | movl %ecx, %edx | ||
| 61 | andl $~(1<<7), %edx; # PGE | 62 | andl $~(1<<7), %edx; # PGE |
| 62 | movl %edx, %cr4; # turn off PGE | 63 | movl %edx, %cr4; # turn off PGE |
| 63 | movl %cr3, %ecx; # flush TLB | 64 | 1: |
| 64 | movl %ecx, %cr3 | 65 | movl %cr3, %eax; # flush TLB |
| 65 | movl %eax, %cr4; # turn PGE back on | 66 | movl %eax, %cr3 |
| 67 | jecxz 1f # cr4 Pentium and higher, skip if zero | ||
| 68 | movl %ecx, %cr4; # turn PGE back on | ||
| 69 | 1: | ||
| 66 | 70 | ||
| 67 | movl saved_context_esp, %esp | 71 | movl saved_context_esp, %esp |
| 68 | movl saved_context_ebp, %ebp | 72 | movl saved_context_ebp, %ebp |
diff --git a/block/blk-core.c b/block/blk-core.c index 4889eb86a39e..2cba5ef97b2b 100644 --- a/block/blk-core.c +++ b/block/blk-core.c | |||
| @@ -582,6 +582,8 @@ blk_init_queue_node(request_fn_proc *rfn, spinlock_t *lock, int node_id) | |||
| 582 | 582 | ||
| 583 | q->sg_reserved_size = INT_MAX; | 583 | q->sg_reserved_size = INT_MAX; |
| 584 | 584 | ||
| 585 | blk_set_cmd_filter_defaults(&q->cmd_filter); | ||
| 586 | |||
| 585 | /* | 587 | /* |
| 586 | * all done | 588 | * all done |
| 587 | */ | 589 | */ |
diff --git a/block/blk-tag.c b/block/blk-tag.c index 32667beb03ee..ed5166fbc599 100644 --- a/block/blk-tag.c +++ b/block/blk-tag.c | |||
| @@ -38,7 +38,8 @@ static int __blk_free_tags(struct blk_queue_tag *bqt) | |||
| 38 | 38 | ||
| 39 | retval = atomic_dec_and_test(&bqt->refcnt); | 39 | retval = atomic_dec_and_test(&bqt->refcnt); |
| 40 | if (retval) { | 40 | if (retval) { |
| 41 | BUG_ON(bqt->busy); | 41 | BUG_ON(find_first_bit(bqt->tag_map, bqt->max_depth) < |
| 42 | bqt->max_depth); | ||
| 42 | 43 | ||
| 43 | kfree(bqt->tag_index); | 44 | kfree(bqt->tag_index); |
| 44 | bqt->tag_index = NULL; | 45 | bqt->tag_index = NULL; |
| @@ -147,7 +148,6 @@ static struct blk_queue_tag *__blk_queue_init_tags(struct request_queue *q, | |||
| 147 | if (init_tag_map(q, tags, depth)) | 148 | if (init_tag_map(q, tags, depth)) |
| 148 | goto fail; | 149 | goto fail; |
| 149 | 150 | ||
| 150 | tags->busy = 0; | ||
| 151 | atomic_set(&tags->refcnt, 1); | 151 | atomic_set(&tags->refcnt, 1); |
| 152 | return tags; | 152 | return tags; |
| 153 | fail: | 153 | fail: |
| @@ -313,7 +313,6 @@ void blk_queue_end_tag(struct request_queue *q, struct request *rq) | |||
| 313 | * unlock memory barrier semantics. | 313 | * unlock memory barrier semantics. |
| 314 | */ | 314 | */ |
| 315 | clear_bit_unlock(tag, bqt->tag_map); | 315 | clear_bit_unlock(tag, bqt->tag_map); |
| 316 | bqt->busy--; | ||
| 317 | } | 316 | } |
| 318 | EXPORT_SYMBOL(blk_queue_end_tag); | 317 | EXPORT_SYMBOL(blk_queue_end_tag); |
| 319 | 318 | ||
| @@ -368,7 +367,6 @@ int blk_queue_start_tag(struct request_queue *q, struct request *rq) | |||
| 368 | bqt->tag_index[tag] = rq; | 367 | bqt->tag_index[tag] = rq; |
| 369 | blkdev_dequeue_request(rq); | 368 | blkdev_dequeue_request(rq); |
| 370 | list_add(&rq->queuelist, &q->tag_busy_list); | 369 | list_add(&rq->queuelist, &q->tag_busy_list); |
| 371 | bqt->busy++; | ||
| 372 | return 0; | 370 | return 0; |
| 373 | } | 371 | } |
| 374 | EXPORT_SYMBOL(blk_queue_start_tag); | 372 | EXPORT_SYMBOL(blk_queue_start_tag); |
diff --git a/block/bsg.c b/block/bsg.c index 5a68b09a69ba..0aae8d7ba99c 100644 --- a/block/bsg.c +++ b/block/bsg.c | |||
| @@ -45,8 +45,6 @@ struct bsg_device { | |||
| 45 | char name[BUS_ID_SIZE]; | 45 | char name[BUS_ID_SIZE]; |
| 46 | int max_queue; | 46 | int max_queue; |
| 47 | unsigned long flags; | 47 | unsigned long flags; |
| 48 | struct blk_scsi_cmd_filter *cmd_filter; | ||
| 49 | mode_t *f_mode; | ||
| 50 | }; | 48 | }; |
| 51 | 49 | ||
| 52 | enum { | 50 | enum { |
| @@ -174,7 +172,8 @@ unlock: | |||
| 174 | } | 172 | } |
| 175 | 173 | ||
| 176 | static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq, | 174 | static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq, |
| 177 | struct sg_io_v4 *hdr, struct bsg_device *bd) | 175 | struct sg_io_v4 *hdr, struct bsg_device *bd, |
| 176 | int has_write_perm) | ||
| 178 | { | 177 | { |
| 179 | if (hdr->request_len > BLK_MAX_CDB) { | 178 | if (hdr->request_len > BLK_MAX_CDB) { |
| 180 | rq->cmd = kzalloc(hdr->request_len, GFP_KERNEL); | 179 | rq->cmd = kzalloc(hdr->request_len, GFP_KERNEL); |
| @@ -187,8 +186,7 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq, | |||
| 187 | return -EFAULT; | 186 | return -EFAULT; |
| 188 | 187 | ||
| 189 | if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) { | 188 | if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) { |
| 190 | if (blk_cmd_filter_verify_command(bd->cmd_filter, rq->cmd, | 189 | if (blk_verify_command(&q->cmd_filter, rq->cmd, has_write_perm)) |
| 191 | bd->f_mode)) | ||
| 192 | return -EPERM; | 190 | return -EPERM; |
| 193 | } else if (!capable(CAP_SYS_RAWIO)) | 191 | } else if (!capable(CAP_SYS_RAWIO)) |
| 194 | return -EPERM; | 192 | return -EPERM; |
| @@ -244,7 +242,7 @@ bsg_validate_sgv4_hdr(struct request_queue *q, struct sg_io_v4 *hdr, int *rw) | |||
| 244 | * map sg_io_v4 to a request. | 242 | * map sg_io_v4 to a request. |
| 245 | */ | 243 | */ |
| 246 | static struct request * | 244 | static struct request * |
| 247 | bsg_map_hdr(struct bsg_device *bd, struct sg_io_v4 *hdr) | 245 | bsg_map_hdr(struct bsg_device *bd, struct sg_io_v4 *hdr, int has_write_perm) |
| 248 | { | 246 | { |
| 249 | struct request_queue *q = bd->queue; | 247 | struct request_queue *q = bd->queue; |
| 250 | struct request *rq, *next_rq = NULL; | 248 | struct request *rq, *next_rq = NULL; |
| @@ -266,7 +264,7 @@ bsg_map_hdr(struct bsg_device *bd, struct sg_io_v4 *hdr) | |||
| 266 | rq = blk_get_request(q, rw, GFP_KERNEL); | 264 | rq = blk_get_request(q, rw, GFP_KERNEL); |
| 267 | if (!rq) | 265 | if (!rq) |
| 268 | return ERR_PTR(-ENOMEM); | 266 | return ERR_PTR(-ENOMEM); |
| 269 | ret = blk_fill_sgv4_hdr_rq(q, rq, hdr, bd); | 267 | ret = blk_fill_sgv4_hdr_rq(q, rq, hdr, bd, has_write_perm); |
| 270 | if (ret) | 268 | if (ret) |
| 271 | goto out; | 269 | goto out; |
| 272 | 270 | ||
| @@ -568,25 +566,6 @@ static inline void bsg_set_block(struct bsg_device *bd, struct file *file) | |||
| 568 | set_bit(BSG_F_BLOCK, &bd->flags); | 566 | set_bit(BSG_F_BLOCK, &bd->flags); |
| 569 | } | 567 | } |
| 570 | 568 | ||
| 571 | static void bsg_set_cmd_filter(struct bsg_device *bd, | ||
| 572 | struct file *file) | ||
| 573 | { | ||
| 574 | struct inode *inode; | ||
| 575 | struct gendisk *disk; | ||
| 576 | |||
| 577 | if (!file) | ||
| 578 | return; | ||
| 579 | |||
| 580 | inode = file->f_dentry->d_inode; | ||
| 581 | if (!inode) | ||
| 582 | return; | ||
| 583 | |||
| 584 | disk = inode->i_bdev->bd_disk; | ||
| 585 | |||
| 586 | bd->cmd_filter = &disk->cmd_filter; | ||
| 587 | bd->f_mode = &file->f_mode; | ||
| 588 | } | ||
| 589 | |||
| 590 | /* | 569 | /* |
| 591 | * Check if the error is a "real" error that we should return. | 570 | * Check if the error is a "real" error that we should return. |
| 592 | */ | 571 | */ |
| @@ -608,7 +587,6 @@ bsg_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) | |||
| 608 | dprintk("%s: read %Zd bytes\n", bd->name, count); | 587 | dprintk("%s: read %Zd bytes\n", bd->name, count); |
| 609 | 588 | ||
| 610 | bsg_set_block(bd, file); | 589 | bsg_set_block(bd, file); |
| 611 | bsg_set_cmd_filter(bd, file); | ||
| 612 | 590 | ||
| 613 | bytes_read = 0; | 591 | bytes_read = 0; |
| 614 | ret = __bsg_read(buf, count, bd, NULL, &bytes_read); | 592 | ret = __bsg_read(buf, count, bd, NULL, &bytes_read); |
| @@ -621,7 +599,7 @@ bsg_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) | |||
| 621 | } | 599 | } |
| 622 | 600 | ||
| 623 | static int __bsg_write(struct bsg_device *bd, const char __user *buf, | 601 | static int __bsg_write(struct bsg_device *bd, const char __user *buf, |
| 624 | size_t count, ssize_t *bytes_written) | 602 | size_t count, ssize_t *bytes_written, int has_write_perm) |
| 625 | { | 603 | { |
| 626 | struct bsg_command *bc; | 604 | struct bsg_command *bc; |
| 627 | struct request *rq; | 605 | struct request *rq; |
| @@ -652,7 +630,7 @@ static int __bsg_write(struct bsg_device *bd, const char __user *buf, | |||
| 652 | /* | 630 | /* |
| 653 | * get a request, fill in the blanks, and add to request queue | 631 | * get a request, fill in the blanks, and add to request queue |
| 654 | */ | 632 | */ |
| 655 | rq = bsg_map_hdr(bd, &bc->hdr); | 633 | rq = bsg_map_hdr(bd, &bc->hdr, has_write_perm); |
| 656 | if (IS_ERR(rq)) { | 634 | if (IS_ERR(rq)) { |
| 657 | ret = PTR_ERR(rq); | 635 | ret = PTR_ERR(rq); |
| 658 | rq = NULL; | 636 | rq = NULL; |
| @@ -683,10 +661,11 @@ bsg_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos) | |||
| 683 | dprintk("%s: write %Zd bytes\n", bd->name, count); | 661 | dprintk("%s: write %Zd bytes\n", bd->name, count); |
| 684 | 662 | ||
| 685 | bsg_set_block(bd, file); | 663 | bsg_set_block(bd, file); |
| 686 | bsg_set_cmd_filter(bd, file); | ||
| 687 | 664 | ||
| 688 | bytes_written = 0; | 665 | bytes_written = 0; |
| 689 | ret = __bsg_write(bd, buf, count, &bytes_written); | 666 | ret = __bsg_write(bd, buf, count, &bytes_written, |
| 667 | file->f_mode & FMODE_WRITE); | ||
| 668 | |||
| 690 | *ppos = bytes_written; | 669 | *ppos = bytes_written; |
| 691 | 670 | ||
| 692 | /* | 671 | /* |
| @@ -792,7 +771,6 @@ static struct bsg_device *bsg_add_device(struct inode *inode, | |||
| 792 | bd->queue = rq; | 771 | bd->queue = rq; |
| 793 | 772 | ||
| 794 | bsg_set_block(bd, file); | 773 | bsg_set_block(bd, file); |
| 795 | bsg_set_cmd_filter(bd, file); | ||
| 796 | 774 | ||
| 797 | atomic_set(&bd->ref_count, 1); | 775 | atomic_set(&bd->ref_count, 1); |
| 798 | mutex_lock(&bsg_mutex); | 776 | mutex_lock(&bsg_mutex); |
| @@ -943,7 +921,7 @@ static long bsg_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | |||
| 943 | if (copy_from_user(&hdr, uarg, sizeof(hdr))) | 921 | if (copy_from_user(&hdr, uarg, sizeof(hdr))) |
| 944 | return -EFAULT; | 922 | return -EFAULT; |
| 945 | 923 | ||
| 946 | rq = bsg_map_hdr(bd, &hdr); | 924 | rq = bsg_map_hdr(bd, &hdr, file->f_mode & FMODE_WRITE); |
| 947 | if (IS_ERR(rq)) | 925 | if (IS_ERR(rq)) |
| 948 | return PTR_ERR(rq); | 926 | return PTR_ERR(rq); |
| 949 | 927 | ||
diff --git a/block/cmd-filter.c b/block/cmd-filter.c index eec4404fd357..228b6447e89f 100644 --- a/block/cmd-filter.c +++ b/block/cmd-filter.c | |||
| @@ -20,15 +20,14 @@ | |||
| 20 | #include <linux/list.h> | 20 | #include <linux/list.h> |
| 21 | #include <linux/genhd.h> | 21 | #include <linux/genhd.h> |
| 22 | #include <linux/spinlock.h> | 22 | #include <linux/spinlock.h> |
| 23 | #include <linux/parser.h> | ||
| 24 | #include <linux/capability.h> | 23 | #include <linux/capability.h> |
| 25 | #include <linux/bitops.h> | 24 | #include <linux/bitops.h> |
| 26 | 25 | ||
| 27 | #include <scsi/scsi.h> | 26 | #include <scsi/scsi.h> |
| 28 | #include <linux/cdrom.h> | 27 | #include <linux/cdrom.h> |
| 29 | 28 | ||
| 30 | int blk_cmd_filter_verify_command(struct blk_scsi_cmd_filter *filter, | 29 | int blk_verify_command(struct blk_cmd_filter *filter, |
| 31 | unsigned char *cmd, mode_t *f_mode) | 30 | unsigned char *cmd, int has_write_perm) |
| 32 | { | 31 | { |
| 33 | /* root can do any command. */ | 32 | /* root can do any command. */ |
| 34 | if (capable(CAP_SYS_RAWIO)) | 33 | if (capable(CAP_SYS_RAWIO)) |
| @@ -43,34 +42,15 @@ int blk_cmd_filter_verify_command(struct blk_scsi_cmd_filter *filter, | |||
| 43 | return 0; | 42 | return 0; |
| 44 | 43 | ||
| 45 | /* Write-safe commands require a writable open */ | 44 | /* Write-safe commands require a writable open */ |
| 46 | if (test_bit(cmd[0], filter->write_ok) && (*f_mode & FMODE_WRITE)) | 45 | if (test_bit(cmd[0], filter->write_ok) && has_write_perm) |
| 47 | return 0; | 46 | return 0; |
| 48 | 47 | ||
| 49 | return -EPERM; | 48 | return -EPERM; |
| 50 | } | 49 | } |
| 51 | EXPORT_SYMBOL(blk_cmd_filter_verify_command); | ||
| 52 | |||
| 53 | int blk_verify_command(struct file *file, unsigned char *cmd) | ||
| 54 | { | ||
| 55 | struct gendisk *disk; | ||
| 56 | struct inode *inode; | ||
| 57 | |||
| 58 | if (!file) | ||
| 59 | return -EINVAL; | ||
| 60 | |||
| 61 | inode = file->f_dentry->d_inode; | ||
| 62 | if (!inode) | ||
| 63 | return -EINVAL; | ||
| 64 | |||
| 65 | disk = inode->i_bdev->bd_disk; | ||
| 66 | |||
| 67 | return blk_cmd_filter_verify_command(&disk->cmd_filter, | ||
| 68 | cmd, &file->f_mode); | ||
| 69 | } | ||
| 70 | EXPORT_SYMBOL(blk_verify_command); | 50 | EXPORT_SYMBOL(blk_verify_command); |
| 71 | 51 | ||
| 72 | /* and now, the sysfs stuff */ | 52 | /* and now, the sysfs stuff */ |
| 73 | static ssize_t rcf_cmds_show(struct blk_scsi_cmd_filter *filter, char *page, | 53 | static ssize_t rcf_cmds_show(struct blk_cmd_filter *filter, char *page, |
| 74 | int rw) | 54 | int rw) |
| 75 | { | 55 | { |
| 76 | char *npage = page; | 56 | char *npage = page; |
| @@ -84,8 +64,7 @@ static ssize_t rcf_cmds_show(struct blk_scsi_cmd_filter *filter, char *page, | |||
| 84 | 64 | ||
| 85 | for (i = 0; i < BLK_SCSI_MAX_CMDS; i++) { | 65 | for (i = 0; i < BLK_SCSI_MAX_CMDS; i++) { |
| 86 | if (test_bit(i, okbits)) { | 66 | if (test_bit(i, okbits)) { |
| 87 | sprintf(npage, "%02x", i); | 67 | npage += sprintf(npage, "0x%02x", i); |
| 88 | npage += 2; | ||
| 89 | if (i < BLK_SCSI_MAX_CMDS - 1) | 68 | if (i < BLK_SCSI_MAX_CMDS - 1) |
| 90 | sprintf(npage++, " "); | 69 | sprintf(npage++, " "); |
| 91 | } | 70 | } |
| @@ -97,57 +76,65 @@ static ssize_t rcf_cmds_show(struct blk_scsi_cmd_filter *filter, char *page, | |||
| 97 | return npage - page; | 76 | return npage - page; |
| 98 | } | 77 | } |
| 99 | 78 | ||
| 100 | static ssize_t rcf_readcmds_show(struct blk_scsi_cmd_filter *filter, char *page) | 79 | static ssize_t rcf_readcmds_show(struct blk_cmd_filter *filter, char *page) |
| 101 | { | 80 | { |
| 102 | return rcf_cmds_show(filter, page, READ); | 81 | return rcf_cmds_show(filter, page, READ); |
| 103 | } | 82 | } |
| 104 | 83 | ||
| 105 | static ssize_t rcf_writecmds_show(struct blk_scsi_cmd_filter *filter, | 84 | static ssize_t rcf_writecmds_show(struct blk_cmd_filter *filter, |
| 106 | char *page) | 85 | char *page) |
| 107 | { | 86 | { |
| 108 | return rcf_cmds_show(filter, page, WRITE); | 87 | return rcf_cmds_show(filter, page, WRITE); |
| 109 | } | 88 | } |
| 110 | 89 | ||
| 111 | static ssize_t rcf_cmds_store(struct blk_scsi_cmd_filter *filter, | 90 | static ssize_t rcf_cmds_store(struct blk_cmd_filter *filter, |
| 112 | const char *page, size_t count, int rw) | 91 | const char *page, size_t count, int rw) |
| 113 | { | 92 | { |
| 114 | ssize_t ret = 0; | ||
| 115 | unsigned long okbits[BLK_SCSI_CMD_PER_LONG], *target_okbits; | 93 | unsigned long okbits[BLK_SCSI_CMD_PER_LONG], *target_okbits; |
| 116 | int cmd, status, len; | 94 | int cmd, set; |
| 117 | substring_t ss; | 95 | char *p, *status; |
| 118 | 96 | ||
| 119 | memset(&okbits, 0, sizeof(okbits)); | 97 | if (rw == READ) { |
| 120 | 98 | memcpy(&okbits, filter->read_ok, sizeof(okbits)); | |
| 121 | for (len = strlen(page); len > 0; len -= 3) { | 99 | target_okbits = filter->read_ok; |
| 122 | if (len < 2) | 100 | } else { |
| 123 | break; | 101 | memcpy(&okbits, filter->write_ok, sizeof(okbits)); |
| 124 | ss.from = (char *) page + ret; | 102 | target_okbits = filter->write_ok; |
| 125 | ss.to = (char *) page + ret + 2; | 103 | } |
| 126 | ret += 3; | 104 | |
| 127 | status = match_hex(&ss, &cmd); | 105 | while ((p = strsep((char **)&page, " ")) != NULL) { |
| 106 | set = 1; | ||
| 107 | |||
| 108 | if (p[0] == '+') { | ||
| 109 | p++; | ||
| 110 | } else if (p[0] == '-') { | ||
| 111 | set = 0; | ||
| 112 | p++; | ||
| 113 | } | ||
| 114 | |||
| 115 | cmd = simple_strtol(p, &status, 16); | ||
| 116 | |||
| 128 | /* either of these cases means invalid input, so do nothing. */ | 117 | /* either of these cases means invalid input, so do nothing. */ |
| 129 | if (status || cmd >= BLK_SCSI_MAX_CMDS) | 118 | if ((status == p) || cmd >= BLK_SCSI_MAX_CMDS) |
| 130 | return -EINVAL; | 119 | return -EINVAL; |
| 131 | 120 | ||
| 132 | __set_bit(cmd, okbits); | 121 | if (set) |
| 122 | __set_bit(cmd, okbits); | ||
| 123 | else | ||
| 124 | __clear_bit(cmd, okbits); | ||
| 133 | } | 125 | } |
| 134 | 126 | ||
| 135 | if (rw == READ) | 127 | memcpy(target_okbits, okbits, sizeof(okbits)); |
| 136 | target_okbits = filter->read_ok; | ||
| 137 | else | ||
| 138 | target_okbits = filter->write_ok; | ||
| 139 | |||
| 140 | memmove(target_okbits, okbits, sizeof(okbits)); | ||
| 141 | return count; | 128 | return count; |
| 142 | } | 129 | } |
| 143 | 130 | ||
| 144 | static ssize_t rcf_readcmds_store(struct blk_scsi_cmd_filter *filter, | 131 | static ssize_t rcf_readcmds_store(struct blk_cmd_filter *filter, |
| 145 | const char *page, size_t count) | 132 | const char *page, size_t count) |
| 146 | { | 133 | { |
| 147 | return rcf_cmds_store(filter, page, count, READ); | 134 | return rcf_cmds_store(filter, page, count, READ); |
| 148 | } | 135 | } |
| 149 | 136 | ||
| 150 | static ssize_t rcf_writecmds_store(struct blk_scsi_cmd_filter *filter, | 137 | static ssize_t rcf_writecmds_store(struct blk_cmd_filter *filter, |
| 151 | const char *page, size_t count) | 138 | const char *page, size_t count) |
| 152 | { | 139 | { |
| 153 | return rcf_cmds_store(filter, page, count, WRITE); | 140 | return rcf_cmds_store(filter, page, count, WRITE); |
| @@ -155,8 +142,8 @@ static ssize_t rcf_writecmds_store(struct blk_scsi_cmd_filter *filter, | |||
| 155 | 142 | ||
| 156 | struct rcf_sysfs_entry { | 143 | struct rcf_sysfs_entry { |
| 157 | struct attribute attr; | 144 | struct attribute attr; |
| 158 | ssize_t (*show)(struct blk_scsi_cmd_filter *, char *); | 145 | ssize_t (*show)(struct blk_cmd_filter *, char *); |
| 159 | ssize_t (*store)(struct blk_scsi_cmd_filter *, const char *, size_t); | 146 | ssize_t (*store)(struct blk_cmd_filter *, const char *, size_t); |
| 160 | }; | 147 | }; |
| 161 | 148 | ||
| 162 | static struct rcf_sysfs_entry rcf_readcmds_entry = { | 149 | static struct rcf_sysfs_entry rcf_readcmds_entry = { |
| @@ -183,9 +170,9 @@ static ssize_t | |||
| 183 | rcf_attr_show(struct kobject *kobj, struct attribute *attr, char *page) | 170 | rcf_attr_show(struct kobject *kobj, struct attribute *attr, char *page) |
| 184 | { | 171 | { |
| 185 | struct rcf_sysfs_entry *entry = to_rcf(attr); | 172 | struct rcf_sysfs_entry *entry = to_rcf(attr); |
| 186 | struct blk_scsi_cmd_filter *filter; | 173 | struct blk_cmd_filter *filter; |
| 187 | 174 | ||
| 188 | filter = container_of(kobj, struct blk_scsi_cmd_filter, kobj); | 175 | filter = container_of(kobj, struct blk_cmd_filter, kobj); |
| 189 | if (entry->show) | 176 | if (entry->show) |
| 190 | return entry->show(filter, page); | 177 | return entry->show(filter, page); |
| 191 | 178 | ||
| @@ -197,7 +184,7 @@ rcf_attr_store(struct kobject *kobj, struct attribute *attr, | |||
| 197 | const char *page, size_t length) | 184 | const char *page, size_t length) |
| 198 | { | 185 | { |
| 199 | struct rcf_sysfs_entry *entry = to_rcf(attr); | 186 | struct rcf_sysfs_entry *entry = to_rcf(attr); |
| 200 | struct blk_scsi_cmd_filter *filter; | 187 | struct blk_cmd_filter *filter; |
| 201 | 188 | ||
| 202 | if (!capable(CAP_SYS_RAWIO)) | 189 | if (!capable(CAP_SYS_RAWIO)) |
| 203 | return -EPERM; | 190 | return -EPERM; |
| @@ -205,7 +192,7 @@ rcf_attr_store(struct kobject *kobj, struct attribute *attr, | |||
| 205 | if (!entry->store) | 192 | if (!entry->store) |
| 206 | return -EINVAL; | 193 | return -EINVAL; |
| 207 | 194 | ||
| 208 | filter = container_of(kobj, struct blk_scsi_cmd_filter, kobj); | 195 | filter = container_of(kobj, struct blk_cmd_filter, kobj); |
| 209 | return entry->store(filter, page, length); | 196 | return entry->store(filter, page, length); |
| 210 | } | 197 | } |
| 211 | 198 | ||
| @@ -219,116 +206,30 @@ static struct kobj_type rcf_ktype = { | |||
| 219 | .default_attrs = default_attrs, | 206 | .default_attrs = default_attrs, |
| 220 | }; | 207 | }; |
| 221 | 208 | ||
| 222 | #ifndef MAINTENANCE_IN_CMD | ||
| 223 | #define MAINTENANCE_IN_CMD 0xa3 | ||
| 224 | #endif | ||
| 225 | |||
| 226 | static void rcf_set_defaults(struct blk_scsi_cmd_filter *filter) | ||
| 227 | { | ||
| 228 | /* Basic read-only commands */ | ||
| 229 | __set_bit(TEST_UNIT_READY, filter->read_ok); | ||
| 230 | __set_bit(REQUEST_SENSE, filter->read_ok); | ||
| 231 | __set_bit(READ_6, filter->read_ok); | ||
| 232 | __set_bit(READ_10, filter->read_ok); | ||
| 233 | __set_bit(READ_12, filter->read_ok); | ||
| 234 | __set_bit(READ_16, filter->read_ok); | ||
| 235 | __set_bit(READ_BUFFER, filter->read_ok); | ||
| 236 | __set_bit(READ_DEFECT_DATA, filter->read_ok); | ||
| 237 | __set_bit(READ_CAPACITY, filter->read_ok); | ||
| 238 | __set_bit(READ_LONG, filter->read_ok); | ||
| 239 | __set_bit(INQUIRY, filter->read_ok); | ||
| 240 | __set_bit(MODE_SENSE, filter->read_ok); | ||
| 241 | __set_bit(MODE_SENSE_10, filter->read_ok); | ||
| 242 | __set_bit(LOG_SENSE, filter->read_ok); | ||
| 243 | __set_bit(START_STOP, filter->read_ok); | ||
| 244 | __set_bit(GPCMD_VERIFY_10, filter->read_ok); | ||
| 245 | __set_bit(VERIFY_16, filter->read_ok); | ||
| 246 | __set_bit(REPORT_LUNS, filter->read_ok); | ||
| 247 | __set_bit(SERVICE_ACTION_IN, filter->read_ok); | ||
| 248 | __set_bit(RECEIVE_DIAGNOSTIC, filter->read_ok); | ||
| 249 | __set_bit(MAINTENANCE_IN_CMD, filter->read_ok); | ||
| 250 | __set_bit(GPCMD_READ_BUFFER_CAPACITY, filter->read_ok); | ||
| 251 | |||
| 252 | /* Audio CD commands */ | ||
| 253 | __set_bit(GPCMD_PLAY_CD, filter->read_ok); | ||
| 254 | __set_bit(GPCMD_PLAY_AUDIO_10, filter->read_ok); | ||
| 255 | __set_bit(GPCMD_PLAY_AUDIO_MSF, filter->read_ok); | ||
| 256 | __set_bit(GPCMD_PLAY_AUDIO_TI, filter->read_ok); | ||
| 257 | __set_bit(GPCMD_PAUSE_RESUME, filter->read_ok); | ||
| 258 | |||
| 259 | /* CD/DVD data reading */ | ||
| 260 | __set_bit(GPCMD_READ_CD, filter->read_ok); | ||
| 261 | __set_bit(GPCMD_READ_CD_MSF, filter->read_ok); | ||
| 262 | __set_bit(GPCMD_READ_DISC_INFO, filter->read_ok); | ||
| 263 | __set_bit(GPCMD_READ_CDVD_CAPACITY, filter->read_ok); | ||
| 264 | __set_bit(GPCMD_READ_DVD_STRUCTURE, filter->read_ok); | ||
| 265 | __set_bit(GPCMD_READ_HEADER, filter->read_ok); | ||
| 266 | __set_bit(GPCMD_READ_TRACK_RZONE_INFO, filter->read_ok); | ||
| 267 | __set_bit(GPCMD_READ_SUBCHANNEL, filter->read_ok); | ||
| 268 | __set_bit(GPCMD_READ_TOC_PMA_ATIP, filter->read_ok); | ||
| 269 | __set_bit(GPCMD_REPORT_KEY, filter->read_ok); | ||
| 270 | __set_bit(GPCMD_SCAN, filter->read_ok); | ||
| 271 | __set_bit(GPCMD_GET_CONFIGURATION, filter->read_ok); | ||
| 272 | __set_bit(GPCMD_READ_FORMAT_CAPACITIES, filter->read_ok); | ||
| 273 | __set_bit(GPCMD_GET_EVENT_STATUS_NOTIFICATION, filter->read_ok); | ||
| 274 | __set_bit(GPCMD_GET_PERFORMANCE, filter->read_ok); | ||
| 275 | __set_bit(GPCMD_SEEK, filter->read_ok); | ||
| 276 | __set_bit(GPCMD_STOP_PLAY_SCAN, filter->read_ok); | ||
| 277 | |||
| 278 | /* Basic writing commands */ | ||
| 279 | __set_bit(WRITE_6, filter->write_ok); | ||
| 280 | __set_bit(WRITE_10, filter->write_ok); | ||
| 281 | __set_bit(WRITE_VERIFY, filter->write_ok); | ||
| 282 | __set_bit(WRITE_12, filter->write_ok); | ||
| 283 | __set_bit(WRITE_VERIFY_12, filter->write_ok); | ||
| 284 | __set_bit(WRITE_16, filter->write_ok); | ||
| 285 | __set_bit(WRITE_LONG, filter->write_ok); | ||
| 286 | __set_bit(WRITE_LONG_2, filter->write_ok); | ||
| 287 | __set_bit(ERASE, filter->write_ok); | ||
| 288 | __set_bit(GPCMD_MODE_SELECT_10, filter->write_ok); | ||
| 289 | __set_bit(MODE_SELECT, filter->write_ok); | ||
| 290 | __set_bit(LOG_SELECT, filter->write_ok); | ||
| 291 | __set_bit(GPCMD_BLANK, filter->write_ok); | ||
| 292 | __set_bit(GPCMD_CLOSE_TRACK, filter->write_ok); | ||
| 293 | __set_bit(GPCMD_FLUSH_CACHE, filter->write_ok); | ||
| 294 | __set_bit(GPCMD_FORMAT_UNIT, filter->write_ok); | ||
| 295 | __set_bit(GPCMD_REPAIR_RZONE_TRACK, filter->write_ok); | ||
| 296 | __set_bit(GPCMD_RESERVE_RZONE_TRACK, filter->write_ok); | ||
| 297 | __set_bit(GPCMD_SEND_DVD_STRUCTURE, filter->write_ok); | ||
| 298 | __set_bit(GPCMD_SEND_EVENT, filter->write_ok); | ||
| 299 | __set_bit(GPCMD_SEND_KEY, filter->write_ok); | ||
| 300 | __set_bit(GPCMD_SEND_OPC, filter->write_ok); | ||
| 301 | __set_bit(GPCMD_SEND_CUE_SHEET, filter->write_ok); | ||
| 302 | __set_bit(GPCMD_SET_SPEED, filter->write_ok); | ||
| 303 | __set_bit(GPCMD_PREVENT_ALLOW_MEDIUM_REMOVAL, filter->write_ok); | ||
| 304 | __set_bit(GPCMD_LOAD_UNLOAD, filter->write_ok); | ||
| 305 | __set_bit(GPCMD_SET_STREAMING, filter->write_ok); | ||
| 306 | } | ||
| 307 | |||
| 308 | int blk_register_filter(struct gendisk *disk) | 209 | int blk_register_filter(struct gendisk *disk) |
| 309 | { | 210 | { |
| 310 | int ret; | 211 | int ret; |
| 311 | struct blk_scsi_cmd_filter *filter = &disk->cmd_filter; | 212 | struct blk_cmd_filter *filter = &disk->queue->cmd_filter; |
| 312 | struct kobject *parent = kobject_get(disk->holder_dir->parent); | 213 | struct kobject *parent = kobject_get(disk->holder_dir->parent); |
| 313 | 214 | ||
| 314 | if (!parent) | 215 | if (!parent) |
| 315 | return -ENODEV; | 216 | return -ENODEV; |
| 316 | 217 | ||
| 317 | ret = kobject_init_and_add(&filter->kobj, &rcf_ktype, parent, | 218 | ret = kobject_init_and_add(&filter->kobj, &rcf_ktype, parent, |
| 318 | "%s", "cmd_filter"); | 219 | "%s", "cmd_filter"); |
| 319 | 220 | ||
| 320 | if (ret < 0) | 221 | if (ret < 0) |
| 321 | return ret; | 222 | return ret; |
| 322 | 223 | ||
| 323 | rcf_set_defaults(filter); | ||
| 324 | return 0; | 224 | return 0; |
| 325 | } | 225 | } |
| 226 | EXPORT_SYMBOL(blk_register_filter); | ||
| 326 | 227 | ||
| 327 | void blk_unregister_filter(struct gendisk *disk) | 228 | void blk_unregister_filter(struct gendisk *disk) |
| 328 | { | 229 | { |
| 329 | struct blk_scsi_cmd_filter *filter = &disk->cmd_filter; | 230 | struct blk_cmd_filter *filter = &disk->queue->cmd_filter; |
| 330 | 231 | ||
| 331 | kobject_put(&filter->kobj); | 232 | kobject_put(&filter->kobj); |
| 332 | kobject_put(disk->holder_dir->parent); | 233 | kobject_put(disk->holder_dir->parent); |
| 333 | } | 234 | } |
| 334 | 235 | EXPORT_SYMBOL(blk_unregister_filter); | |
diff --git a/block/genhd.c b/block/genhd.c index c13cc77291af..e0ce23ac2ece 100644 --- a/block/genhd.c +++ b/block/genhd.c | |||
| @@ -190,7 +190,6 @@ void add_disk(struct gendisk *disk) | |||
| 190 | disk->minors, NULL, exact_match, exact_lock, disk); | 190 | disk->minors, NULL, exact_match, exact_lock, disk); |
| 191 | register_disk(disk); | 191 | register_disk(disk); |
| 192 | blk_register_queue(disk); | 192 | blk_register_queue(disk); |
| 193 | blk_register_filter(disk); | ||
| 194 | 193 | ||
| 195 | bdi = &disk->queue->backing_dev_info; | 194 | bdi = &disk->queue->backing_dev_info; |
| 196 | bdi_register_dev(bdi, MKDEV(disk->major, disk->first_minor)); | 195 | bdi_register_dev(bdi, MKDEV(disk->major, disk->first_minor)); |
| @@ -203,7 +202,6 @@ EXPORT_SYMBOL(del_gendisk); /* in partitions/check.c */ | |||
| 203 | 202 | ||
| 204 | void unlink_gendisk(struct gendisk *disk) | 203 | void unlink_gendisk(struct gendisk *disk) |
| 205 | { | 204 | { |
| 206 | blk_unregister_filter(disk); | ||
| 207 | sysfs_remove_link(&disk->dev.kobj, "bdi"); | 205 | sysfs_remove_link(&disk->dev.kobj, "bdi"); |
| 208 | bdi_unregister(&disk->queue->backing_dev_info); | 206 | bdi_unregister(&disk->queue->backing_dev_info); |
| 209 | blk_unregister_queue(disk); | 207 | blk_unregister_queue(disk); |
| @@ -293,27 +291,30 @@ void __init printk_all_partitions(void) | |||
| 293 | /* iterator */ | 291 | /* iterator */ |
| 294 | static int find_start(struct device *dev, void *data) | 292 | static int find_start(struct device *dev, void *data) |
| 295 | { | 293 | { |
| 296 | loff_t k = *(loff_t *)data; | 294 | loff_t *k = data; |
| 297 | 295 | ||
| 298 | if (dev->type != &disk_type) | 296 | if (dev->type != &disk_type) |
| 299 | return 0; | 297 | return 0; |
| 300 | if (!k--) | 298 | if (!*k) |
| 301 | return 1; | 299 | return 1; |
| 300 | (*k)--; | ||
| 302 | return 0; | 301 | return 0; |
| 303 | } | 302 | } |
| 304 | 303 | ||
| 305 | static void *part_start(struct seq_file *part, loff_t *pos) | 304 | static void *part_start(struct seq_file *part, loff_t *pos) |
| 306 | { | 305 | { |
| 307 | struct device *dev; | 306 | struct device *dev; |
| 308 | loff_t n = *pos; | 307 | loff_t k = *pos; |
| 309 | 308 | ||
| 310 | if (!n) | 309 | if (!k) |
| 311 | seq_puts(part, "major minor #blocks name\n\n"); | 310 | part->private = (void *)1LU; /* tell show to print header */ |
| 312 | 311 | ||
| 313 | mutex_lock(&block_class_lock); | 312 | mutex_lock(&block_class_lock); |
| 314 | dev = class_find_device(&block_class, NULL, (void *)pos, find_start); | 313 | dev = class_find_device(&block_class, NULL, &k, find_start); |
| 315 | if (dev) | 314 | if (dev) { |
| 315 | put_device(dev); | ||
| 316 | return dev_to_disk(dev); | 316 | return dev_to_disk(dev); |
| 317 | } | ||
| 317 | return NULL; | 318 | return NULL; |
| 318 | } | 319 | } |
| 319 | 320 | ||
| @@ -330,8 +331,10 @@ static void *part_next(struct seq_file *part, void *v, loff_t *pos) | |||
| 330 | struct device *dev; | 331 | struct device *dev; |
| 331 | ++*pos; | 332 | ++*pos; |
| 332 | dev = class_find_device(&block_class, &gp->dev, NULL, find_next); | 333 | dev = class_find_device(&block_class, &gp->dev, NULL, find_next); |
| 333 | if (dev) | 334 | if (dev) { |
| 335 | put_device(dev); | ||
| 334 | return dev_to_disk(dev); | 336 | return dev_to_disk(dev); |
| 337 | } | ||
| 335 | return NULL; | 338 | return NULL; |
| 336 | } | 339 | } |
| 337 | 340 | ||
| @@ -346,6 +349,17 @@ static int show_partition(struct seq_file *part, void *v) | |||
| 346 | int n; | 349 | int n; |
| 347 | char buf[BDEVNAME_SIZE]; | 350 | char buf[BDEVNAME_SIZE]; |
| 348 | 351 | ||
| 352 | /* | ||
| 353 | * Print header if start told us to do. This is to preserve | ||
| 354 | * the original behavior of not printing header if no | ||
| 355 | * partition exists. This hackery will be removed later with | ||
| 356 | * class iteration clean up. | ||
| 357 | */ | ||
| 358 | if (part->private) { | ||
| 359 | seq_puts(part, "major minor #blocks name\n\n"); | ||
| 360 | part->private = NULL; | ||
| 361 | } | ||
| 362 | |||
| 349 | /* Don't show non-partitionable removeable devices or empty devices */ | 363 | /* Don't show non-partitionable removeable devices or empty devices */ |
| 350 | if (!get_capacity(sgp) || | 364 | if (!get_capacity(sgp) || |
| 351 | (sgp->minors == 1 && (sgp->flags & GENHD_FL_REMOVABLE))) | 365 | (sgp->minors == 1 && (sgp->flags & GENHD_FL_REMOVABLE))) |
| @@ -568,11 +582,14 @@ static struct device_type disk_type = { | |||
| 568 | static void *diskstats_start(struct seq_file *part, loff_t *pos) | 582 | static void *diskstats_start(struct seq_file *part, loff_t *pos) |
| 569 | { | 583 | { |
| 570 | struct device *dev; | 584 | struct device *dev; |
| 585 | loff_t k = *pos; | ||
| 571 | 586 | ||
| 572 | mutex_lock(&block_class_lock); | 587 | mutex_lock(&block_class_lock); |
| 573 | dev = class_find_device(&block_class, NULL, (void *)pos, find_start); | 588 | dev = class_find_device(&block_class, NULL, &k, find_start); |
| 574 | if (dev) | 589 | if (dev) { |
| 590 | put_device(dev); | ||
| 575 | return dev_to_disk(dev); | 591 | return dev_to_disk(dev); |
| 592 | } | ||
| 576 | return NULL; | 593 | return NULL; |
| 577 | } | 594 | } |
| 578 | 595 | ||
| @@ -583,8 +600,10 @@ static void *diskstats_next(struct seq_file *part, void *v, loff_t *pos) | |||
| 583 | 600 | ||
| 584 | ++*pos; | 601 | ++*pos; |
| 585 | dev = class_find_device(&block_class, &gp->dev, NULL, find_next); | 602 | dev = class_find_device(&block_class, &gp->dev, NULL, find_next); |
| 586 | if (dev) | 603 | if (dev) { |
| 604 | put_device(dev); | ||
| 587 | return dev_to_disk(dev); | 605 | return dev_to_disk(dev); |
| 606 | } | ||
| 588 | return NULL; | 607 | return NULL; |
| 589 | } | 608 | } |
| 590 | 609 | ||
| @@ -712,10 +731,12 @@ dev_t blk_lookup_devt(const char *name, int part) | |||
| 712 | mutex_lock(&block_class_lock); | 731 | mutex_lock(&block_class_lock); |
| 713 | find.name = name; | 732 | find.name = name; |
| 714 | find.part = part; | 733 | find.part = part; |
| 715 | dev = class_find_device(&block_class, NULL, (void *)&find, match_id); | 734 | dev = class_find_device(&block_class, NULL, &find, match_id); |
| 716 | if (dev) | 735 | if (dev) { |
| 736 | put_device(dev); | ||
| 717 | devt = MKDEV(MAJOR(dev->devt), | 737 | devt = MKDEV(MAJOR(dev->devt), |
| 718 | MINOR(dev->devt) + part); | 738 | MINOR(dev->devt) + part); |
| 739 | } | ||
| 719 | mutex_unlock(&block_class_lock); | 740 | mutex_unlock(&block_class_lock); |
| 720 | 741 | ||
| 721 | return devt; | 742 | return devt; |
diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c index 12a5182173f6..ec4b7f234626 100644 --- a/block/scsi_ioctl.c +++ b/block/scsi_ioctl.c | |||
| @@ -105,12 +105,96 @@ static int sg_emulated_host(struct request_queue *q, int __user *p) | |||
| 105 | return put_user(1, p); | 105 | return put_user(1, p); |
| 106 | } | 106 | } |
| 107 | 107 | ||
| 108 | void blk_set_cmd_filter_defaults(struct blk_cmd_filter *filter) | ||
| 109 | { | ||
| 110 | /* Basic read-only commands */ | ||
| 111 | __set_bit(TEST_UNIT_READY, filter->read_ok); | ||
| 112 | __set_bit(REQUEST_SENSE, filter->read_ok); | ||
| 113 | __set_bit(READ_6, filter->read_ok); | ||
| 114 | __set_bit(READ_10, filter->read_ok); | ||
| 115 | __set_bit(READ_12, filter->read_ok); | ||
| 116 | __set_bit(READ_16, filter->read_ok); | ||
| 117 | __set_bit(READ_BUFFER, filter->read_ok); | ||
| 118 | __set_bit(READ_DEFECT_DATA, filter->read_ok); | ||
| 119 | __set_bit(READ_CAPACITY, filter->read_ok); | ||
| 120 | __set_bit(READ_LONG, filter->read_ok); | ||
| 121 | __set_bit(INQUIRY, filter->read_ok); | ||
| 122 | __set_bit(MODE_SENSE, filter->read_ok); | ||
| 123 | __set_bit(MODE_SENSE_10, filter->read_ok); | ||
| 124 | __set_bit(LOG_SENSE, filter->read_ok); | ||
| 125 | __set_bit(START_STOP, filter->read_ok); | ||
| 126 | __set_bit(GPCMD_VERIFY_10, filter->read_ok); | ||
| 127 | __set_bit(VERIFY_16, filter->read_ok); | ||
| 128 | __set_bit(REPORT_LUNS, filter->read_ok); | ||
| 129 | __set_bit(SERVICE_ACTION_IN, filter->read_ok); | ||
| 130 | __set_bit(RECEIVE_DIAGNOSTIC, filter->read_ok); | ||
| 131 | __set_bit(MAINTENANCE_IN, filter->read_ok); | ||
| 132 | __set_bit(GPCMD_READ_BUFFER_CAPACITY, filter->read_ok); | ||
| 133 | |||
| 134 | /* Audio CD commands */ | ||
| 135 | __set_bit(GPCMD_PLAY_CD, filter->read_ok); | ||
| 136 | __set_bit(GPCMD_PLAY_AUDIO_10, filter->read_ok); | ||
| 137 | __set_bit(GPCMD_PLAY_AUDIO_MSF, filter->read_ok); | ||
| 138 | __set_bit(GPCMD_PLAY_AUDIO_TI, filter->read_ok); | ||
| 139 | __set_bit(GPCMD_PAUSE_RESUME, filter->read_ok); | ||
| 140 | |||
| 141 | /* CD/DVD data reading */ | ||
| 142 | __set_bit(GPCMD_READ_CD, filter->read_ok); | ||
| 143 | __set_bit(GPCMD_READ_CD_MSF, filter->read_ok); | ||
| 144 | __set_bit(GPCMD_READ_DISC_INFO, filter->read_ok); | ||
| 145 | __set_bit(GPCMD_READ_CDVD_CAPACITY, filter->read_ok); | ||
| 146 | __set_bit(GPCMD_READ_DVD_STRUCTURE, filter->read_ok); | ||
| 147 | __set_bit(GPCMD_READ_HEADER, filter->read_ok); | ||
| 148 | __set_bit(GPCMD_READ_TRACK_RZONE_INFO, filter->read_ok); | ||
| 149 | __set_bit(GPCMD_READ_SUBCHANNEL, filter->read_ok); | ||
| 150 | __set_bit(GPCMD_READ_TOC_PMA_ATIP, filter->read_ok); | ||
| 151 | __set_bit(GPCMD_REPORT_KEY, filter->read_ok); | ||
| 152 | __set_bit(GPCMD_SCAN, filter->read_ok); | ||
| 153 | __set_bit(GPCMD_GET_CONFIGURATION, filter->read_ok); | ||
| 154 | __set_bit(GPCMD_READ_FORMAT_CAPACITIES, filter->read_ok); | ||
| 155 | __set_bit(GPCMD_GET_EVENT_STATUS_NOTIFICATION, filter->read_ok); | ||
| 156 | __set_bit(GPCMD_GET_PERFORMANCE, filter->read_ok); | ||
| 157 | __set_bit(GPCMD_SEEK, filter->read_ok); | ||
| 158 | __set_bit(GPCMD_STOP_PLAY_SCAN, filter->read_ok); | ||
| 159 | |||
| 160 | /* Basic writing commands */ | ||
| 161 | __set_bit(WRITE_6, filter->write_ok); | ||
| 162 | __set_bit(WRITE_10, filter->write_ok); | ||
| 163 | __set_bit(WRITE_VERIFY, filter->write_ok); | ||
| 164 | __set_bit(WRITE_12, filter->write_ok); | ||
| 165 | __set_bit(WRITE_VERIFY_12, filter->write_ok); | ||
| 166 | __set_bit(WRITE_16, filter->write_ok); | ||
| 167 | __set_bit(WRITE_LONG, filter->write_ok); | ||
| 168 | __set_bit(WRITE_LONG_2, filter->write_ok); | ||
| 169 | __set_bit(ERASE, filter->write_ok); | ||
| 170 | __set_bit(GPCMD_MODE_SELECT_10, filter->write_ok); | ||
| 171 | __set_bit(MODE_SELECT, filter->write_ok); | ||
| 172 | __set_bit(LOG_SELECT, filter->write_ok); | ||
| 173 | __set_bit(GPCMD_BLANK, filter->write_ok); | ||
| 174 | __set_bit(GPCMD_CLOSE_TRACK, filter->write_ok); | ||
| 175 | __set_bit(GPCMD_FLUSH_CACHE, filter->write_ok); | ||
| 176 | __set_bit(GPCMD_FORMAT_UNIT, filter->write_ok); | ||
| 177 | __set_bit(GPCMD_REPAIR_RZONE_TRACK, filter->write_ok); | ||
| 178 | __set_bit(GPCMD_RESERVE_RZONE_TRACK, filter->write_ok); | ||
| 179 | __set_bit(GPCMD_SEND_DVD_STRUCTURE, filter->write_ok); | ||
| 180 | __set_bit(GPCMD_SEND_EVENT, filter->write_ok); | ||
| 181 | __set_bit(GPCMD_SEND_KEY, filter->write_ok); | ||
| 182 | __set_bit(GPCMD_SEND_OPC, filter->write_ok); | ||
| 183 | __set_bit(GPCMD_SEND_CUE_SHEET, filter->write_ok); | ||
| 184 | __set_bit(GPCMD_SET_SPEED, filter->write_ok); | ||
| 185 | __set_bit(GPCMD_PREVENT_ALLOW_MEDIUM_REMOVAL, filter->write_ok); | ||
| 186 | __set_bit(GPCMD_LOAD_UNLOAD, filter->write_ok); | ||
| 187 | __set_bit(GPCMD_SET_STREAMING, filter->write_ok); | ||
| 188 | } | ||
| 189 | EXPORT_SYMBOL_GPL(blk_set_cmd_filter_defaults); | ||
| 190 | |||
| 108 | static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq, | 191 | static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq, |
| 109 | struct sg_io_hdr *hdr, struct file *file) | 192 | struct sg_io_hdr *hdr, struct file *file) |
| 110 | { | 193 | { |
| 111 | if (copy_from_user(rq->cmd, hdr->cmdp, hdr->cmd_len)) | 194 | if (copy_from_user(rq->cmd, hdr->cmdp, hdr->cmd_len)) |
| 112 | return -EFAULT; | 195 | return -EFAULT; |
| 113 | if (blk_verify_command(file, rq->cmd)) | 196 | if (blk_verify_command(&q->cmd_filter, rq->cmd, |
| 197 | file->f_mode & FMODE_WRITE)) | ||
| 114 | return -EPERM; | 198 | return -EPERM; |
| 115 | 199 | ||
| 116 | /* | 200 | /* |
| @@ -298,7 +382,7 @@ int sg_scsi_ioctl(struct file *file, struct request_queue *q, | |||
| 298 | struct gendisk *disk, struct scsi_ioctl_command __user *sic) | 382 | struct gendisk *disk, struct scsi_ioctl_command __user *sic) |
| 299 | { | 383 | { |
| 300 | struct request *rq; | 384 | struct request *rq; |
| 301 | int err; | 385 | int err, write_perm = 0; |
| 302 | unsigned int in_len, out_len, bytes, opcode, cmdlen; | 386 | unsigned int in_len, out_len, bytes, opcode, cmdlen; |
| 303 | char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE]; | 387 | char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE]; |
| 304 | 388 | ||
| @@ -340,7 +424,11 @@ int sg_scsi_ioctl(struct file *file, struct request_queue *q, | |||
| 340 | if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len)) | 424 | if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len)) |
| 341 | goto error; | 425 | goto error; |
| 342 | 426 | ||
| 343 | err = blk_verify_command(file, rq->cmd); | 427 | /* scsi_ioctl passes NULL */ |
| 428 | if (file && (file->f_mode & FMODE_WRITE)) | ||
| 429 | write_perm = 1; | ||
| 430 | |||
| 431 | err = blk_verify_command(&q->cmd_filter, rq->cmd, write_perm); | ||
| 344 | if (err) | 432 | if (err) |
| 345 | goto error; | 433 | goto error; |
| 346 | 434 | ||
diff --git a/crypto/authenc.c b/crypto/authenc.c index 4b226768752a..fd9f06c63d76 100644 --- a/crypto/authenc.c +++ b/crypto/authenc.c | |||
| @@ -174,8 +174,9 @@ static int crypto_authenc_genicv(struct aead_request *req, u8 *iv, | |||
| 174 | static void crypto_authenc_encrypt_done(struct crypto_async_request *req, | 174 | static void crypto_authenc_encrypt_done(struct crypto_async_request *req, |
| 175 | int err) | 175 | int err) |
| 176 | { | 176 | { |
| 177 | struct aead_request *areq = req->data; | ||
| 178 | |||
| 177 | if (!err) { | 179 | if (!err) { |
| 178 | struct aead_request *areq = req->data; | ||
| 179 | struct crypto_aead *authenc = crypto_aead_reqtfm(areq); | 180 | struct crypto_aead *authenc = crypto_aead_reqtfm(areq); |
| 180 | struct crypto_authenc_ctx *ctx = crypto_aead_ctx(authenc); | 181 | struct crypto_authenc_ctx *ctx = crypto_aead_ctx(authenc); |
| 181 | struct ablkcipher_request *abreq = aead_request_ctx(areq); | 182 | struct ablkcipher_request *abreq = aead_request_ctx(areq); |
| @@ -185,7 +186,7 @@ static void crypto_authenc_encrypt_done(struct crypto_async_request *req, | |||
| 185 | err = crypto_authenc_genicv(areq, iv, 0); | 186 | err = crypto_authenc_genicv(areq, iv, 0); |
| 186 | } | 187 | } |
| 187 | 188 | ||
| 188 | aead_request_complete(req->data, err); | 189 | aead_request_complete(areq, err); |
| 189 | } | 190 | } |
| 190 | 191 | ||
| 191 | static int crypto_authenc_encrypt(struct aead_request *req) | 192 | static int crypto_authenc_encrypt(struct aead_request *req) |
| @@ -216,14 +217,15 @@ static int crypto_authenc_encrypt(struct aead_request *req) | |||
| 216 | static void crypto_authenc_givencrypt_done(struct crypto_async_request *req, | 217 | static void crypto_authenc_givencrypt_done(struct crypto_async_request *req, |
| 217 | int err) | 218 | int err) |
| 218 | { | 219 | { |
| 220 | struct aead_request *areq = req->data; | ||
| 221 | |||
| 219 | if (!err) { | 222 | if (!err) { |
| 220 | struct aead_request *areq = req->data; | ||
| 221 | struct skcipher_givcrypt_request *greq = aead_request_ctx(areq); | 223 | struct skcipher_givcrypt_request *greq = aead_request_ctx(areq); |
| 222 | 224 | ||
| 223 | err = crypto_authenc_genicv(areq, greq->giv, 0); | 225 | err = crypto_authenc_genicv(areq, greq->giv, 0); |
| 224 | } | 226 | } |
| 225 | 227 | ||
| 226 | aead_request_complete(req->data, err); | 228 | aead_request_complete(areq, err); |
| 227 | } | 229 | } |
| 228 | 230 | ||
| 229 | static int crypto_authenc_givencrypt(struct aead_givcrypt_request *req) | 231 | static int crypto_authenc_givencrypt(struct aead_givcrypt_request *req) |
diff --git a/crypto/digest.c b/crypto/digest.c index ac0919460d14..5d3f1303da98 100644 --- a/crypto/digest.c +++ b/crypto/digest.c | |||
| @@ -225,7 +225,7 @@ int crypto_init_digest_ops_async(struct crypto_tfm *tfm) | |||
| 225 | struct ahash_tfm *crt = &tfm->crt_ahash; | 225 | struct ahash_tfm *crt = &tfm->crt_ahash; |
| 226 | struct digest_alg *dalg = &tfm->__crt_alg->cra_digest; | 226 | struct digest_alg *dalg = &tfm->__crt_alg->cra_digest; |
| 227 | 227 | ||
| 228 | if (dalg->dia_digestsize > crypto_tfm_alg_blocksize(tfm)) | 228 | if (dalg->dia_digestsize > PAGE_SIZE / 8) |
| 229 | return -EINVAL; | 229 | return -EINVAL; |
| 230 | 230 | ||
| 231 | crt->init = digest_async_init; | 231 | crt->init = digest_async_init; |
diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c index 59821a22d752..66368022e0bf 100644 --- a/crypto/tcrypt.c +++ b/crypto/tcrypt.c | |||
| @@ -481,21 +481,31 @@ next_one: | |||
| 481 | 481 | ||
| 482 | for (k = 0, temp = 0; k < template[i].np; k++) { | 482 | for (k = 0, temp = 0; k < template[i].np; k++) { |
| 483 | printk(KERN_INFO "page %u\n", k); | 483 | printk(KERN_INFO "page %u\n", k); |
| 484 | q = &axbuf[IDX[k]]; | 484 | q = &xbuf[IDX[k]]; |
| 485 | hexdump(q, template[i].tap[k]); | 485 | |
| 486 | n = template[i].tap[k]; | ||
| 487 | if (k == template[i].np - 1) | ||
| 488 | n += enc ? authsize : -authsize; | ||
| 489 | hexdump(q, n); | ||
| 486 | printk(KERN_INFO "%s\n", | 490 | printk(KERN_INFO "%s\n", |
| 487 | memcmp(q, template[i].result + temp, | 491 | memcmp(q, template[i].result + temp, n) ? |
| 488 | template[i].tap[k] - | ||
| 489 | (k < template[i].np - 1 || enc ? | ||
| 490 | 0 : authsize)) ? | ||
| 491 | "fail" : "pass"); | 492 | "fail" : "pass"); |
| 492 | 493 | ||
| 493 | for (n = 0; q[template[i].tap[k] + n]; n++) | 494 | q += n; |
| 494 | ; | 495 | if (k == template[i].np - 1 && !enc) { |
| 496 | if (memcmp(q, template[i].input + | ||
| 497 | temp + n, authsize)) | ||
| 498 | n = authsize; | ||
| 499 | else | ||
| 500 | n = 0; | ||
| 501 | } else { | ||
| 502 | for (n = 0; q[n]; n++) | ||
| 503 | ; | ||
| 504 | } | ||
| 495 | if (n) { | 505 | if (n) { |
| 496 | printk("Result buffer corruption %u " | 506 | printk("Result buffer corruption %u " |
| 497 | "bytes:\n", n); | 507 | "bytes:\n", n); |
| 498 | hexdump(&q[template[i].tap[k]], n); | 508 | hexdump(q, n); |
| 499 | } | 509 | } |
| 500 | 510 | ||
| 501 | temp += template[i].tap[k]; | 511 | temp += template[i].tap[k]; |
diff --git a/drivers/Makefile b/drivers/Makefile index a280ab3d0833..2735bde73475 100644 --- a/drivers/Makefile +++ b/drivers/Makefile | |||
| @@ -57,6 +57,7 @@ obj-$(CONFIG_ATA_OVER_ETH) += block/aoe/ | |||
| 57 | obj-$(CONFIG_PARIDE) += block/paride/ | 57 | obj-$(CONFIG_PARIDE) += block/paride/ |
| 58 | obj-$(CONFIG_TC) += tc/ | 58 | obj-$(CONFIG_TC) += tc/ |
| 59 | obj-$(CONFIG_USB) += usb/ | 59 | obj-$(CONFIG_USB) += usb/ |
| 60 | obj-$(CONFIG_USB_MUSB_HDRC) += usb/musb/ | ||
| 60 | obj-$(CONFIG_PCI) += usb/ | 61 | obj-$(CONFIG_PCI) += usb/ |
| 61 | obj-$(CONFIG_USB_GADGET) += usb/gadget/ | 62 | obj-$(CONFIG_USB_GADGET) += usb/gadget/ |
| 62 | obj-$(CONFIG_SERIO) += input/serio/ | 63 | obj-$(CONFIG_SERIO) += input/serio/ |
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c index bb7c51f712bd..7d2edf143f16 100644 --- a/drivers/acpi/dock.c +++ b/drivers/acpi/dock.c | |||
| @@ -563,9 +563,6 @@ EXPORT_SYMBOL_GPL(unregister_hotplug_dock_device); | |||
| 563 | */ | 563 | */ |
| 564 | static int handle_eject_request(struct dock_station *ds, u32 event) | 564 | static int handle_eject_request(struct dock_station *ds, u32 event) |
| 565 | { | 565 | { |
| 566 | if (!dock_present(ds)) | ||
| 567 | return -ENODEV; | ||
| 568 | |||
| 569 | if (dock_in_progress(ds)) | 566 | if (dock_in_progress(ds)) |
| 570 | return -EBUSY; | 567 | return -EBUSY; |
| 571 | 568 | ||
| @@ -573,8 +570,16 @@ static int handle_eject_request(struct dock_station *ds, u32 event) | |||
| 573 | * here we need to generate the undock | 570 | * here we need to generate the undock |
| 574 | * event prior to actually doing the undock | 571 | * event prior to actually doing the undock |
| 575 | * so that the device struct still exists. | 572 | * so that the device struct still exists. |
| 573 | * Also, even send the dock event if the | ||
| 574 | * device is not present anymore | ||
| 576 | */ | 575 | */ |
| 577 | dock_event(ds, event, UNDOCK_EVENT); | 576 | dock_event(ds, event, UNDOCK_EVENT); |
| 577 | |||
| 578 | if (!dock_present(ds)) { | ||
| 579 | complete_undock(ds); | ||
| 580 | return -ENODEV; | ||
| 581 | } | ||
| 582 | |||
| 578 | hotplug_dock_devices(ds, ACPI_NOTIFY_EJECT_REQUEST); | 583 | hotplug_dock_devices(ds, ACPI_NOTIFY_EJECT_REQUEST); |
| 579 | undock(ds); | 584 | undock(ds); |
| 580 | eject_dock(ds); | 585 | eject_dock(ds); |
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index 5622aee996b2..13593f9f2197 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c | |||
| @@ -110,6 +110,31 @@ static struct acpi_ec { | |||
| 110 | u8 handlers_installed; | 110 | u8 handlers_installed; |
| 111 | } *boot_ec, *first_ec; | 111 | } *boot_ec, *first_ec; |
| 112 | 112 | ||
| 113 | /* | ||
| 114 | * Some Asus system have exchanged ECDT data/command IO addresses. | ||
| 115 | */ | ||
| 116 | static int print_ecdt_error(const struct dmi_system_id *id) | ||
| 117 | { | ||
| 118 | printk(KERN_NOTICE PREFIX "%s detected - " | ||
| 119 | "ECDT has exchanged control/data I/O address\n", | ||
| 120 | id->ident); | ||
| 121 | return 0; | ||
| 122 | } | ||
| 123 | |||
| 124 | static struct dmi_system_id __cpuinitdata ec_dmi_table[] = { | ||
| 125 | { | ||
| 126 | print_ecdt_error, "Asus L4R", { | ||
| 127 | DMI_MATCH(DMI_BIOS_VERSION, "1008.006"), | ||
| 128 | DMI_MATCH(DMI_PRODUCT_NAME, "L4R"), | ||
| 129 | DMI_MATCH(DMI_BOARD_NAME, "L4R") }, NULL}, | ||
| 130 | { | ||
| 131 | print_ecdt_error, "Asus M6R", { | ||
| 132 | DMI_MATCH(DMI_BIOS_VERSION, "0207"), | ||
| 133 | DMI_MATCH(DMI_PRODUCT_NAME, "M6R"), | ||
| 134 | DMI_MATCH(DMI_BOARD_NAME, "M6R") }, NULL}, | ||
| 135 | {}, | ||
| 136 | }; | ||
| 137 | |||
| 113 | /* -------------------------------------------------------------------------- | 138 | /* -------------------------------------------------------------------------- |
| 114 | Transaction Management | 139 | Transaction Management |
| 115 | -------------------------------------------------------------------------- */ | 140 | -------------------------------------------------------------------------- */ |
| @@ -196,6 +221,8 @@ static int acpi_ec_wait(struct acpi_ec *ec, enum ec_event event, int force_poll) | |||
| 196 | return 0; | 221 | return 0; |
| 197 | msleep(1); | 222 | msleep(1); |
| 198 | } | 223 | } |
| 224 | if (acpi_ec_check_status(ec,event)) | ||
| 225 | return 0; | ||
| 199 | } | 226 | } |
| 200 | pr_err(PREFIX "acpi_ec_wait timeout, status = 0x%2.2x, event = %s\n", | 227 | pr_err(PREFIX "acpi_ec_wait timeout, status = 0x%2.2x, event = %s\n", |
| 201 | acpi_ec_read_status(ec), | 228 | acpi_ec_read_status(ec), |
| @@ -911,6 +938,15 @@ int __init acpi_ec_ecdt_probe(void) | |||
| 911 | pr_info(PREFIX "EC description table is found, configuring boot EC\n"); | 938 | pr_info(PREFIX "EC description table is found, configuring boot EC\n"); |
| 912 | boot_ec->command_addr = ecdt_ptr->control.address; | 939 | boot_ec->command_addr = ecdt_ptr->control.address; |
| 913 | boot_ec->data_addr = ecdt_ptr->data.address; | 940 | boot_ec->data_addr = ecdt_ptr->data.address; |
| 941 | if (dmi_check_system(ec_dmi_table)) { | ||
| 942 | /* | ||
| 943 | * If the board falls into ec_dmi_table, it means | ||
| 944 | * that ECDT table gives the incorrect command/status | ||
| 945 | * & data I/O address. Just fix it. | ||
| 946 | */ | ||
| 947 | boot_ec->data_addr = ecdt_ptr->control.address; | ||
| 948 | boot_ec->command_addr = ecdt_ptr->data.address; | ||
| 949 | } | ||
| 914 | boot_ec->gpe = ecdt_ptr->gpe; | 950 | boot_ec->gpe = ecdt_ptr->gpe; |
| 915 | boot_ec->handle = ACPI_ROOT_OBJECT; | 951 | boot_ec->handle = ACPI_ROOT_OBJECT; |
| 916 | acpi_get_handle(ACPI_ROOT_OBJECT, ecdt_ptr->id, &boot_ec->handle); | 952 | acpi_get_handle(ACPI_ROOT_OBJECT, ecdt_ptr->id, &boot_ec->handle); |
diff --git a/drivers/acpi/executer/exconfig.c b/drivers/acpi/executer/exconfig.c index 2a32c843cb4a..8892b9824fae 100644 --- a/drivers/acpi/executer/exconfig.c +++ b/drivers/acpi/executer/exconfig.c | |||
| @@ -479,5 +479,8 @@ acpi_status acpi_ex_unload_table(union acpi_operand_object *ddb_handle) | |||
| 479 | 479 | ||
| 480 | acpi_tb_set_table_loaded_flag(table_index, FALSE); | 480 | acpi_tb_set_table_loaded_flag(table_index, FALSE); |
| 481 | 481 | ||
| 482 | /* Table unloaded, remove a reference to the ddb_handle object */ | ||
| 483 | |||
| 484 | acpi_ut_remove_reference(ddb_handle); | ||
| 482 | return_ACPI_STATUS(AE_OK); | 485 | return_ACPI_STATUS(AE_OK); |
| 483 | } | 486 | } |
diff --git a/drivers/acpi/namespace/nsnames.c b/drivers/acpi/namespace/nsnames.c index 549db42f16cf..bd5773878009 100644 --- a/drivers/acpi/namespace/nsnames.c +++ b/drivers/acpi/namespace/nsnames.c | |||
| @@ -56,13 +56,14 @@ ACPI_MODULE_NAME("nsnames") | |||
| 56 | * Size - Size of the pathname | 56 | * Size - Size of the pathname |
| 57 | * *name_buffer - Where to return the pathname | 57 | * *name_buffer - Where to return the pathname |
| 58 | * | 58 | * |
| 59 | * RETURN: Places the pathname into the name_buffer, in external format | 59 | * RETURN: Status |
| 60 | * Places the pathname into the name_buffer, in external format | ||
| 60 | * (name segments separated by path separators) | 61 | * (name segments separated by path separators) |
| 61 | * | 62 | * |
| 62 | * DESCRIPTION: Generate a full pathaname | 63 | * DESCRIPTION: Generate a full pathaname |
| 63 | * | 64 | * |
| 64 | ******************************************************************************/ | 65 | ******************************************************************************/ |
| 65 | void | 66 | acpi_status |
| 66 | acpi_ns_build_external_path(struct acpi_namespace_node *node, | 67 | acpi_ns_build_external_path(struct acpi_namespace_node *node, |
| 67 | acpi_size size, char *name_buffer) | 68 | acpi_size size, char *name_buffer) |
| 68 | { | 69 | { |
| @@ -77,7 +78,7 @@ acpi_ns_build_external_path(struct acpi_namespace_node *node, | |||
| 77 | if (index < ACPI_NAME_SIZE) { | 78 | if (index < ACPI_NAME_SIZE) { |
| 78 | name_buffer[0] = AML_ROOT_PREFIX; | 79 | name_buffer[0] = AML_ROOT_PREFIX; |
| 79 | name_buffer[1] = 0; | 80 | name_buffer[1] = 0; |
| 80 | return; | 81 | return (AE_OK); |
| 81 | } | 82 | } |
| 82 | 83 | ||
| 83 | /* Store terminator byte, then build name backwards */ | 84 | /* Store terminator byte, then build name backwards */ |
| @@ -105,11 +106,13 @@ acpi_ns_build_external_path(struct acpi_namespace_node *node, | |||
| 105 | 106 | ||
| 106 | if (index != 0) { | 107 | if (index != 0) { |
| 107 | ACPI_ERROR((AE_INFO, | 108 | ACPI_ERROR((AE_INFO, |
| 108 | "Could not construct pathname; index=%X, size=%X, Path=%s", | 109 | "Could not construct external pathname; index=%X, size=%X, Path=%s", |
| 109 | (u32) index, (u32) size, &name_buffer[size])); | 110 | (u32) index, (u32) size, &name_buffer[size])); |
| 111 | |||
| 112 | return (AE_BAD_PARAMETER); | ||
| 110 | } | 113 | } |
| 111 | 114 | ||
| 112 | return; | 115 | return (AE_OK); |
| 113 | } | 116 | } |
| 114 | 117 | ||
| 115 | #ifdef ACPI_DEBUG_OUTPUT | 118 | #ifdef ACPI_DEBUG_OUTPUT |
| @@ -129,6 +132,7 @@ acpi_ns_build_external_path(struct acpi_namespace_node *node, | |||
| 129 | 132 | ||
| 130 | char *acpi_ns_get_external_pathname(struct acpi_namespace_node *node) | 133 | char *acpi_ns_get_external_pathname(struct acpi_namespace_node *node) |
| 131 | { | 134 | { |
| 135 | acpi_status status; | ||
| 132 | char *name_buffer; | 136 | char *name_buffer; |
| 133 | acpi_size size; | 137 | acpi_size size; |
| 134 | 138 | ||
| @@ -138,8 +142,7 @@ char *acpi_ns_get_external_pathname(struct acpi_namespace_node *node) | |||
| 138 | 142 | ||
| 139 | size = acpi_ns_get_pathname_length(node); | 143 | size = acpi_ns_get_pathname_length(node); |
| 140 | if (!size) { | 144 | if (!size) { |
| 141 | ACPI_ERROR((AE_INFO, "Invalid node failure")); | 145 | return (NULL); |
| 142 | return_PTR(NULL); | ||
| 143 | } | 146 | } |
| 144 | 147 | ||
| 145 | /* Allocate a buffer to be returned to caller */ | 148 | /* Allocate a buffer to be returned to caller */ |
| @@ -152,7 +155,11 @@ char *acpi_ns_get_external_pathname(struct acpi_namespace_node *node) | |||
| 152 | 155 | ||
| 153 | /* Build the path in the allocated buffer */ | 156 | /* Build the path in the allocated buffer */ |
| 154 | 157 | ||
| 155 | acpi_ns_build_external_path(node, size, name_buffer); | 158 | status = acpi_ns_build_external_path(node, size, name_buffer); |
| 159 | if (ACPI_FAILURE(status)) { | ||
| 160 | return (NULL); | ||
| 161 | } | ||
| 162 | |||
| 156 | return_PTR(name_buffer); | 163 | return_PTR(name_buffer); |
| 157 | } | 164 | } |
| 158 | #endif | 165 | #endif |
| @@ -186,7 +193,7 @@ acpi_size acpi_ns_get_pathname_length(struct acpi_namespace_node *node) | |||
| 186 | while (next_node && (next_node != acpi_gbl_root_node)) { | 193 | while (next_node && (next_node != acpi_gbl_root_node)) { |
| 187 | if (ACPI_GET_DESCRIPTOR_TYPE(next_node) != ACPI_DESC_TYPE_NAMED) { | 194 | if (ACPI_GET_DESCRIPTOR_TYPE(next_node) != ACPI_DESC_TYPE_NAMED) { |
| 188 | ACPI_ERROR((AE_INFO, | 195 | ACPI_ERROR((AE_INFO, |
| 189 | "Invalid NS Node (%p) while traversing path", | 196 | "Invalid Namespace Node (%p) while traversing namespace", |
| 190 | next_node)); | 197 | next_node)); |
| 191 | return 0; | 198 | return 0; |
| 192 | } | 199 | } |
| @@ -234,8 +241,7 @@ acpi_ns_handle_to_pathname(acpi_handle target_handle, | |||
| 234 | 241 | ||
| 235 | required_size = acpi_ns_get_pathname_length(node); | 242 | required_size = acpi_ns_get_pathname_length(node); |
| 236 | if (!required_size) { | 243 | if (!required_size) { |
| 237 | ACPI_ERROR((AE_INFO, "Invalid node failure")); | 244 | return_ACPI_STATUS(AE_BAD_PARAMETER); |
| 238 | return_ACPI_STATUS(AE_ERROR); | ||
| 239 | } | 245 | } |
| 240 | 246 | ||
| 241 | /* Validate/Allocate/Clear caller buffer */ | 247 | /* Validate/Allocate/Clear caller buffer */ |
| @@ -247,7 +253,11 @@ acpi_ns_handle_to_pathname(acpi_handle target_handle, | |||
| 247 | 253 | ||
| 248 | /* Build the path in the caller buffer */ | 254 | /* Build the path in the caller buffer */ |
| 249 | 255 | ||
| 250 | acpi_ns_build_external_path(node, required_size, buffer->pointer); | 256 | status = |
| 257 | acpi_ns_build_external_path(node, required_size, buffer->pointer); | ||
| 258 | if (ACPI_FAILURE(status)) { | ||
| 259 | return_ACPI_STATUS(status); | ||
| 260 | } | ||
| 251 | 261 | ||
| 252 | ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "%s [%X]\n", | 262 | ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "%s [%X]\n", |
| 253 | (char *)buffer->pointer, (u32) required_size)); | 263 | (char *)buffer->pointer, (u32) required_size)); |
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c index 89f3b2abfdc7..cf47805a7448 100644 --- a/drivers/acpi/pci_link.c +++ b/drivers/acpi/pci_link.c | |||
| @@ -849,7 +849,7 @@ static int __init acpi_irq_penalty_update(char *str, int used) | |||
| 849 | if (irq < 0) | 849 | if (irq < 0) |
| 850 | continue; | 850 | continue; |
| 851 | 851 | ||
| 852 | if (irq >= ACPI_MAX_IRQS) | 852 | if (irq >= ARRAY_SIZE(acpi_irq_penalty)) |
| 853 | continue; | 853 | continue; |
| 854 | 854 | ||
| 855 | if (used) | 855 | if (used) |
| @@ -872,10 +872,12 @@ static int __init acpi_irq_penalty_update(char *str, int used) | |||
| 872 | */ | 872 | */ |
| 873 | void acpi_penalize_isa_irq(int irq, int active) | 873 | void acpi_penalize_isa_irq(int irq, int active) |
| 874 | { | 874 | { |
| 875 | if (active) | 875 | if (irq >= 0 && irq < ARRAY_SIZE(acpi_irq_penalty)) { |
| 876 | acpi_irq_penalty[irq] += PIRQ_PENALTY_ISA_USED; | 876 | if (active) |
| 877 | else | 877 | acpi_irq_penalty[irq] += PIRQ_PENALTY_ISA_USED; |
| 878 | acpi_irq_penalty[irq] += PIRQ_PENALTY_PCI_USING; | 878 | else |
| 879 | acpi_irq_penalty[irq] += PIRQ_PENALTY_PCI_USING; | ||
| 880 | } | ||
| 879 | } | 881 | } |
| 880 | 882 | ||
| 881 | /* | 883 | /* |
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c index e36422a7122c..ee68ac54c0d4 100644 --- a/drivers/acpi/processor_core.c +++ b/drivers/acpi/processor_core.c | |||
| @@ -123,7 +123,7 @@ struct acpi_processor_errata errata __read_mostly; | |||
| 123 | static int set_no_mwait(const struct dmi_system_id *id) | 123 | static int set_no_mwait(const struct dmi_system_id *id) |
| 124 | { | 124 | { |
| 125 | printk(KERN_NOTICE PREFIX "%s detected - " | 125 | printk(KERN_NOTICE PREFIX "%s detected - " |
| 126 | "disable mwait for CPU C-stetes\n", id->ident); | 126 | "disabling mwait for CPU C-states\n", id->ident); |
| 127 | idle_nomwait = 1; | 127 | idle_nomwait = 1; |
| 128 | return 0; | 128 | return 0; |
| 129 | } | 129 | } |
| @@ -138,7 +138,7 @@ static struct dmi_system_id __cpuinitdata processor_idle_dmi_table[] = { | |||
| 138 | { | 138 | { |
| 139 | set_no_mwait, "Extensa 5220", { | 139 | set_no_mwait, "Extensa 5220", { |
| 140 | DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"), | 140 | DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"), |
| 141 | DMI_MATCH(DMI_SYS_VENDOR, "ACER"), | 141 | DMI_MATCH(DMI_SYS_VENDOR, "Acer"), |
| 142 | DMI_MATCH(DMI_PRODUCT_VERSION, "0100"), | 142 | DMI_MATCH(DMI_PRODUCT_VERSION, "0100"), |
| 143 | DMI_MATCH(DMI_BOARD_NAME, "Columbia") }, NULL}, | 143 | DMI_MATCH(DMI_BOARD_NAME, "Columbia") }, NULL}, |
| 144 | {}, | 144 | {}, |
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index 283c08f5f4d4..cf5b1b7b684f 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c | |||
| @@ -41,7 +41,6 @@ | |||
| 41 | #include <linux/pm_qos_params.h> | 41 | #include <linux/pm_qos_params.h> |
| 42 | #include <linux/clockchips.h> | 42 | #include <linux/clockchips.h> |
| 43 | #include <linux/cpuidle.h> | 43 | #include <linux/cpuidle.h> |
| 44 | #include <linux/cpuidle.h> | ||
| 45 | 44 | ||
| 46 | /* | 45 | /* |
| 47 | * Include the apic definitions for x86 to have the APIC timer related defines | 46 | * Include the apic definitions for x86 to have the APIC timer related defines |
diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c index 0133af49cf06..80e32093e977 100644 --- a/drivers/acpi/processor_perflib.c +++ b/drivers/acpi/processor_perflib.c | |||
| @@ -70,7 +70,7 @@ static DEFINE_MUTEX(performance_mutex); | |||
| 70 | * 0 -> cpufreq low level drivers initialized -> consider _PPC values | 70 | * 0 -> cpufreq low level drivers initialized -> consider _PPC values |
| 71 | * 1 -> ignore _PPC totally -> forced by user through boot param | 71 | * 1 -> ignore _PPC totally -> forced by user through boot param |
| 72 | */ | 72 | */ |
| 73 | static unsigned int ignore_ppc = -1; | 73 | static int ignore_ppc = -1; |
| 74 | module_param(ignore_ppc, uint, 0644); | 74 | module_param(ignore_ppc, uint, 0644); |
| 75 | MODULE_PARM_DESC(ignore_ppc, "If the frequency of your machine gets wrongly" \ | 75 | MODULE_PARM_DESC(ignore_ppc, "If the frequency of your machine gets wrongly" \ |
| 76 | "limited by BIOS, this should help"); | 76 | "limited by BIOS, this should help"); |
diff --git a/drivers/acpi/resources/rscalc.c b/drivers/acpi/resources/rscalc.c index f61ebc679e66..d9063ea414e3 100644 --- a/drivers/acpi/resources/rscalc.c +++ b/drivers/acpi/resources/rscalc.c | |||
| @@ -587,6 +587,9 @@ acpi_rs_get_pci_routing_table_length(union acpi_operand_object *package_object, | |||
| 587 | } else { | 587 | } else { |
| 588 | temp_size_needed += | 588 | temp_size_needed += |
| 589 | acpi_ns_get_pathname_length((*sub_object_list)->reference.node); | 589 | acpi_ns_get_pathname_length((*sub_object_list)->reference.node); |
| 590 | if (!temp_size_needed) { | ||
| 591 | return_ACPI_STATUS(AE_BAD_PARAMETER); | ||
| 592 | } | ||
| 590 | } | 593 | } |
| 591 | } else { | 594 | } else { |
| 592 | /* | 595 | /* |
diff --git a/drivers/acpi/utilities/utalloc.c b/drivers/acpi/utilities/utalloc.c index e7bf34a7b1d2..7dcb67e0b215 100644 --- a/drivers/acpi/utilities/utalloc.c +++ b/drivers/acpi/utilities/utalloc.c | |||
| @@ -242,10 +242,12 @@ acpi_ut_initialize_buffer(struct acpi_buffer * buffer, | |||
| 242 | { | 242 | { |
| 243 | acpi_status status = AE_OK; | 243 | acpi_status status = AE_OK; |
| 244 | 244 | ||
| 245 | if (!required_length) { | 245 | /* Parameter validation */ |
| 246 | WARN_ON(1); | 246 | |
| 247 | return AE_ERROR; | 247 | if (!buffer || !required_length) { |
| 248 | return (AE_BAD_PARAMETER); | ||
| 248 | } | 249 | } |
| 250 | |||
| 249 | switch (buffer->length) { | 251 | switch (buffer->length) { |
| 250 | case ACPI_NO_BUFFER: | 252 | case ACPI_NO_BUFFER: |
| 251 | 253 | ||
diff --git a/drivers/acpi/utilities/utdelete.c b/drivers/acpi/utilities/utdelete.c index c5c791a575c9..42609d3a8aa9 100644 --- a/drivers/acpi/utilities/utdelete.c +++ b/drivers/acpi/utilities/utdelete.c | |||
| @@ -135,6 +135,10 @@ static void acpi_ut_delete_internal_obj(union acpi_operand_object *object) | |||
| 135 | obj_pointer = object->package.elements; | 135 | obj_pointer = object->package.elements; |
| 136 | break; | 136 | break; |
| 137 | 137 | ||
| 138 | /* | ||
| 139 | * These objects have a possible list of notify handlers. | ||
| 140 | * Device object also may have a GPE block. | ||
| 141 | */ | ||
| 138 | case ACPI_TYPE_DEVICE: | 142 | case ACPI_TYPE_DEVICE: |
| 139 | 143 | ||
| 140 | if (object->device.gpe_block) { | 144 | if (object->device.gpe_block) { |
| @@ -142,9 +146,14 @@ static void acpi_ut_delete_internal_obj(union acpi_operand_object *object) | |||
| 142 | gpe_block); | 146 | gpe_block); |
| 143 | } | 147 | } |
| 144 | 148 | ||
| 145 | /* Walk the handler list for this device */ | 149 | /*lint -fallthrough */ |
| 150 | |||
| 151 | case ACPI_TYPE_PROCESSOR: | ||
| 152 | case ACPI_TYPE_THERMAL: | ||
| 153 | |||
| 154 | /* Walk the notify handler list for this object */ | ||
| 146 | 155 | ||
| 147 | handler_desc = object->device.handler; | 156 | handler_desc = object->common_notify.handler; |
| 148 | while (handler_desc) { | 157 | while (handler_desc) { |
| 149 | next_desc = handler_desc->address_space.next; | 158 | next_desc = handler_desc->address_space.next; |
| 150 | acpi_ut_remove_reference(handler_desc); | 159 | acpi_ut_remove_reference(handler_desc); |
diff --git a/drivers/acpi/utilities/utobject.c b/drivers/acpi/utilities/utobject.c index e25484495e65..916eff399eb3 100644 --- a/drivers/acpi/utilities/utobject.c +++ b/drivers/acpi/utilities/utobject.c | |||
| @@ -425,6 +425,7 @@ acpi_ut_get_simple_object_size(union acpi_operand_object *internal_object, | |||
| 425 | acpi_size * obj_length) | 425 | acpi_size * obj_length) |
| 426 | { | 426 | { |
| 427 | acpi_size length; | 427 | acpi_size length; |
| 428 | acpi_size size; | ||
| 428 | acpi_status status = AE_OK; | 429 | acpi_status status = AE_OK; |
| 429 | 430 | ||
| 430 | ACPI_FUNCTION_TRACE_PTR(ut_get_simple_object_size, internal_object); | 431 | ACPI_FUNCTION_TRACE_PTR(ut_get_simple_object_size, internal_object); |
| @@ -484,10 +485,14 @@ acpi_ut_get_simple_object_size(union acpi_operand_object *internal_object, | |||
| 484 | * Get the actual length of the full pathname to this object. | 485 | * Get the actual length of the full pathname to this object. |
| 485 | * The reference will be converted to the pathname to the object | 486 | * The reference will be converted to the pathname to the object |
| 486 | */ | 487 | */ |
| 487 | length += | 488 | size = |
| 488 | ACPI_ROUND_UP_TO_NATIVE_WORD | 489 | acpi_ns_get_pathname_length(internal_object-> |
| 489 | (acpi_ns_get_pathname_length | 490 | reference.node); |
| 490 | (internal_object->reference.node)); | 491 | if (!size) { |
| 492 | return_ACPI_STATUS(AE_BAD_PARAMETER); | ||
| 493 | } | ||
| 494 | |||
| 495 | length += ACPI_ROUND_UP_TO_NATIVE_WORD(size); | ||
| 491 | break; | 496 | break; |
| 492 | 497 | ||
| 493 | default: | 498 | default: |
diff --git a/drivers/acpi/wmi.c b/drivers/acpi/wmi.c index c33b1c6e93b1..cfe2c833474d 100644 --- a/drivers/acpi/wmi.c +++ b/drivers/acpi/wmi.c | |||
| @@ -347,7 +347,7 @@ struct acpi_buffer *out) | |||
| 347 | strcpy(method, "WQ"); | 347 | strcpy(method, "WQ"); |
| 348 | strncat(method, block->object_id, 2); | 348 | strncat(method, block->object_id, 2); |
| 349 | 349 | ||
| 350 | status = acpi_evaluate_object(handle, method, NULL, out); | 350 | status = acpi_evaluate_object(handle, method, &input, out); |
| 351 | 351 | ||
| 352 | /* | 352 | /* |
| 353 | * If ACPI_WMI_EXPENSIVE, call the relevant WCxx method, even if | 353 | * If ACPI_WMI_EXPENSIVE, call the relevant WCxx method, even if |
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index ef3e5522e1a4..c729e6988bbb 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c | |||
| @@ -486,6 +486,8 @@ static const struct pci_device_id ahci_pci_tbl[] = { | |||
| 486 | { PCI_VDEVICE(INTEL, 0x502b), board_ahci }, /* Tolapai */ | 486 | { PCI_VDEVICE(INTEL, 0x502b), board_ahci }, /* Tolapai */ |
| 487 | { PCI_VDEVICE(INTEL, 0x3a05), board_ahci }, /* ICH10 */ | 487 | { PCI_VDEVICE(INTEL, 0x3a05), board_ahci }, /* ICH10 */ |
| 488 | { PCI_VDEVICE(INTEL, 0x3a25), board_ahci }, /* ICH10 */ | 488 | { PCI_VDEVICE(INTEL, 0x3a25), board_ahci }, /* ICH10 */ |
| 489 | { PCI_VDEVICE(INTEL, 0x3b24), board_ahci }, /* PCH RAID */ | ||
| 490 | { PCI_VDEVICE(INTEL, 0x3b2b), board_ahci }, /* PCH RAID */ | ||
| 489 | 491 | ||
| 490 | /* JMicron 360/1/3/5/6, match class to avoid IDE function */ | 492 | /* JMicron 360/1/3/5/6, match class to avoid IDE function */ |
| 491 | { PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, | 493 | { PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, |
| @@ -575,9 +577,9 @@ static const struct pci_device_id ahci_pci_tbl[] = { | |||
| 575 | { PCI_VDEVICE(NVIDIA, 0x0bc7), board_ahci }, /* MCP7B */ | 577 | { PCI_VDEVICE(NVIDIA, 0x0bc7), board_ahci }, /* MCP7B */ |
| 576 | 578 | ||
| 577 | /* SiS */ | 579 | /* SiS */ |
| 578 | { PCI_VDEVICE(SI, 0x1184), board_ahci_nopmp }, /* SiS 966 */ | 580 | { PCI_VDEVICE(SI, 0x1184), board_ahci }, /* SiS 966 */ |
| 579 | { PCI_VDEVICE(SI, 0x1185), board_ahci_nopmp }, /* SiS 968 */ | 581 | { PCI_VDEVICE(SI, 0x1185), board_ahci }, /* SiS 968 */ |
| 580 | { PCI_VDEVICE(SI, 0x0186), board_ahci_nopmp }, /* SiS 968 */ | 582 | { PCI_VDEVICE(SI, 0x0186), board_ahci }, /* SiS 968 */ |
| 581 | 583 | ||
| 582 | /* Marvell */ | 584 | /* Marvell */ |
| 583 | { PCI_VDEVICE(MARVELL, 0x6145), board_ahci_mv }, /* 6145 */ | 585 | { PCI_VDEVICE(MARVELL, 0x6145), board_ahci_mv }, /* 6145 */ |
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c index c294121fd69e..b1d08a8f5003 100644 --- a/drivers/ata/ata_piix.c +++ b/drivers/ata/ata_piix.c | |||
| @@ -275,6 +275,14 @@ static const struct pci_device_id piix_pci_tbl[] = { | |||
| 275 | { 0x8086, 0x3a20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata }, | 275 | { 0x8086, 0x3a20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata }, |
| 276 | /* SATA Controller IDE (ICH10) */ | 276 | /* SATA Controller IDE (ICH10) */ |
| 277 | { 0x8086, 0x3a26, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, | 277 | { 0x8086, 0x3a26, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, |
| 278 | /* SATA Controller IDE (PCH) */ | ||
| 279 | { 0x8086, 0x3b20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata }, | ||
| 280 | /* SATA Controller IDE (PCH) */ | ||
| 281 | { 0x8086, 0x3b26, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, | ||
| 282 | /* SATA Controller IDE (PCH) */ | ||
| 283 | { 0x8086, 0x3b2d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, | ||
| 284 | /* SATA Controller IDE (PCH) */ | ||
| 285 | { 0x8086, 0x3b2e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata }, | ||
| 278 | 286 | ||
| 279 | { } /* terminate list */ | 287 | { } /* terminate list */ |
| 280 | }; | 288 | }; |
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 5ba96c5052c8..79e3a8e7a84a 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c | |||
| @@ -104,6 +104,7 @@ struct ata_force_param { | |||
| 104 | unsigned long xfer_mask; | 104 | unsigned long xfer_mask; |
| 105 | unsigned int horkage_on; | 105 | unsigned int horkage_on; |
| 106 | unsigned int horkage_off; | 106 | unsigned int horkage_off; |
| 107 | unsigned int lflags; | ||
| 107 | }; | 108 | }; |
| 108 | 109 | ||
| 109 | struct ata_force_ent { | 110 | struct ata_force_ent { |
| @@ -196,22 +197,23 @@ void ata_force_cbl(struct ata_port *ap) | |||
| 196 | } | 197 | } |
| 197 | 198 | ||
| 198 | /** | 199 | /** |
| 199 | * ata_force_spd_limit - force SATA spd limit according to libata.force | 200 | * ata_force_link_limits - force link limits according to libata.force |
| 200 | * @link: ATA link of interest | 201 | * @link: ATA link of interest |
| 201 | * | 202 | * |
| 202 | * Force SATA spd limit according to libata.force and whine about | 203 | * Force link flags and SATA spd limit according to libata.force |
| 203 | * it. When only the port part is specified (e.g. 1:), the limit | 204 | * and whine about it. When only the port part is specified |
| 204 | * applies to all links connected to both the host link and all | 205 | * (e.g. 1:), the limit applies to all links connected to both |
| 205 | * fan-out ports connected via PMP. If the device part is | 206 | * the host link and all fan-out ports connected via PMP. If the |
| 206 | * specified as 0 (e.g. 1.00:), it specifies the first fan-out | 207 | * device part is specified as 0 (e.g. 1.00:), it specifies the |
| 207 | * link not the host link. Device number 15 always points to the | 208 | * first fan-out link not the host link. Device number 15 always |
| 208 | * host link whether PMP is attached or not. | 209 | * points to the host link whether PMP is attached or not. |
| 209 | * | 210 | * |
| 210 | * LOCKING: | 211 | * LOCKING: |
| 211 | * EH context. | 212 | * EH context. |
| 212 | */ | 213 | */ |
| 213 | static void ata_force_spd_limit(struct ata_link *link) | 214 | static void ata_force_link_limits(struct ata_link *link) |
| 214 | { | 215 | { |
| 216 | bool did_spd = false; | ||
| 215 | int linkno, i; | 217 | int linkno, i; |
| 216 | 218 | ||
| 217 | if (ata_is_host_link(link)) | 219 | if (ata_is_host_link(link)) |
| @@ -228,13 +230,22 @@ static void ata_force_spd_limit(struct ata_link *link) | |||
| 228 | if (fe->device != -1 && fe->device != linkno) | 230 | if (fe->device != -1 && fe->device != linkno) |
| 229 | continue; | 231 | continue; |
| 230 | 232 | ||
| 231 | if (!fe->param.spd_limit) | 233 | /* only honor the first spd limit */ |
| 232 | continue; | 234 | if (!did_spd && fe->param.spd_limit) { |
| 235 | link->hw_sata_spd_limit = (1 << fe->param.spd_limit) - 1; | ||
| 236 | ata_link_printk(link, KERN_NOTICE, | ||
| 237 | "FORCE: PHY spd limit set to %s\n", | ||
| 238 | fe->param.name); | ||
| 239 | did_spd = true; | ||
| 240 | } | ||
| 233 | 241 | ||
| 234 | link->hw_sata_spd_limit = (1 << fe->param.spd_limit) - 1; | 242 | /* let lflags stack */ |
| 235 | ata_link_printk(link, KERN_NOTICE, | 243 | if (fe->param.lflags) { |
| 236 | "FORCE: PHY spd limit set to %s\n", fe->param.name); | 244 | link->flags |= fe->param.lflags; |
| 237 | return; | 245 | ata_link_printk(link, KERN_NOTICE, |
| 246 | "FORCE: link flag 0x%x forced -> 0x%x\n", | ||
| 247 | fe->param.lflags, link->flags); | ||
| 248 | } | ||
| 238 | } | 249 | } |
| 239 | } | 250 | } |
| 240 | 251 | ||
| @@ -3277,7 +3288,7 @@ int ata_do_set_mode(struct ata_link *link, struct ata_device **r_failed_dev) | |||
| 3277 | dev->dma_mode = ata_xfer_mask2mode(dma_mask); | 3288 | dev->dma_mode = ata_xfer_mask2mode(dma_mask); |
| 3278 | 3289 | ||
| 3279 | found = 1; | 3290 | found = 1; |
| 3280 | if (dev->dma_mode != 0xff) | 3291 | if (ata_dma_enabled(dev)) |
| 3281 | used_dma = 1; | 3292 | used_dma = 1; |
| 3282 | } | 3293 | } |
| 3283 | if (!found) | 3294 | if (!found) |
| @@ -3302,7 +3313,7 @@ int ata_do_set_mode(struct ata_link *link, struct ata_device **r_failed_dev) | |||
| 3302 | 3313 | ||
| 3303 | /* step 3: set host DMA timings */ | 3314 | /* step 3: set host DMA timings */ |
| 3304 | ata_link_for_each_dev(dev, link) { | 3315 | ata_link_for_each_dev(dev, link) { |
| 3305 | if (!ata_dev_enabled(dev) || dev->dma_mode == 0xff) | 3316 | if (!ata_dev_enabled(dev) || !ata_dma_enabled(dev)) |
| 3306 | continue; | 3317 | continue; |
| 3307 | 3318 | ||
| 3308 | dev->xfer_mode = dev->dma_mode; | 3319 | dev->xfer_mode = dev->dma_mode; |
| @@ -5188,19 +5199,18 @@ void ata_link_init(struct ata_port *ap, struct ata_link *link, int pmp) | |||
| 5188 | */ | 5199 | */ |
| 5189 | int sata_link_init_spd(struct ata_link *link) | 5200 | int sata_link_init_spd(struct ata_link *link) |
| 5190 | { | 5201 | { |
| 5191 | u32 scontrol; | ||
| 5192 | u8 spd; | 5202 | u8 spd; |
| 5193 | int rc; | 5203 | int rc; |
| 5194 | 5204 | ||
| 5195 | rc = sata_scr_read(link, SCR_CONTROL, &scontrol); | 5205 | rc = sata_scr_read(link, SCR_CONTROL, &link->saved_scontrol); |
| 5196 | if (rc) | 5206 | if (rc) |
| 5197 | return rc; | 5207 | return rc; |
| 5198 | 5208 | ||
| 5199 | spd = (scontrol >> 4) & 0xf; | 5209 | spd = (link->saved_scontrol >> 4) & 0xf; |
| 5200 | if (spd) | 5210 | if (spd) |
| 5201 | link->hw_sata_spd_limit &= (1 << spd) - 1; | 5211 | link->hw_sata_spd_limit &= (1 << spd) - 1; |
| 5202 | 5212 | ||
| 5203 | ata_force_spd_limit(link); | 5213 | ata_force_link_limits(link); |
| 5204 | 5214 | ||
| 5205 | link->sata_spd_limit = link->hw_sata_spd_limit; | 5215 | link->sata_spd_limit = link->hw_sata_spd_limit; |
| 5206 | 5216 | ||
| @@ -5783,9 +5793,10 @@ static void ata_port_detach(struct ata_port *ap) | |||
| 5783 | ata_port_wait_eh(ap); | 5793 | ata_port_wait_eh(ap); |
| 5784 | 5794 | ||
| 5785 | /* EH is now guaranteed to see UNLOADING - EH context belongs | 5795 | /* EH is now guaranteed to see UNLOADING - EH context belongs |
| 5786 | * to us. Disable all existing devices. | 5796 | * to us. Restore SControl and disable all existing devices. |
| 5787 | */ | 5797 | */ |
| 5788 | ata_port_for_each_link(link, ap) { | 5798 | __ata_port_for_each_link(link, ap) { |
| 5799 | sata_scr_write(link, SCR_CONTROL, link->saved_scontrol); | ||
| 5789 | ata_link_for_each_dev(dev, link) | 5800 | ata_link_for_each_dev(dev, link) |
| 5790 | ata_dev_disable(dev); | 5801 | ata_dev_disable(dev); |
| 5791 | } | 5802 | } |
| @@ -5991,6 +6002,9 @@ static int __init ata_parse_force_one(char **cur, | |||
| 5991 | { "udma133", .xfer_mask = 1 << (ATA_SHIFT_UDMA + 6) }, | 6002 | { "udma133", .xfer_mask = 1 << (ATA_SHIFT_UDMA + 6) }, |
| 5992 | { "udma/133", .xfer_mask = 1 << (ATA_SHIFT_UDMA + 6) }, | 6003 | { "udma/133", .xfer_mask = 1 << (ATA_SHIFT_UDMA + 6) }, |
| 5993 | { "udma7", .xfer_mask = 1 << (ATA_SHIFT_UDMA + 7) }, | 6004 | { "udma7", .xfer_mask = 1 << (ATA_SHIFT_UDMA + 7) }, |
| 6005 | { "nohrst", .lflags = ATA_LFLAG_NO_HRST }, | ||
| 6006 | { "nosrst", .lflags = ATA_LFLAG_NO_SRST }, | ||
| 6007 | { "norst", .lflags = ATA_LFLAG_NO_HRST | ATA_LFLAG_NO_SRST }, | ||
| 5994 | }; | 6008 | }; |
| 5995 | char *start = *cur, *p = *cur; | 6009 | char *start = *cur, *p = *cur; |
| 5996 | char *id, *val, *endp; | 6010 | char *id, *val, *endp; |
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c index 58bdc538d229..c1db2f234d2e 100644 --- a/drivers/ata/libata-eh.c +++ b/drivers/ata/libata-eh.c | |||
| @@ -2040,7 +2040,7 @@ static void ata_eh_link_report(struct ata_link *link) | |||
| 2040 | } | 2040 | } |
| 2041 | 2041 | ||
| 2042 | if (ehc->i.serror) | 2042 | if (ehc->i.serror) |
| 2043 | ata_port_printk(ap, KERN_ERR, | 2043 | ata_link_printk(link, KERN_ERR, |
| 2044 | "SError: { %s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s}\n", | 2044 | "SError: { %s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s}\n", |
| 2045 | ehc->i.serror & SERR_DATA_RECOVERED ? "RecovData " : "", | 2045 | ehc->i.serror & SERR_DATA_RECOVERED ? "RecovData " : "", |
| 2046 | ehc->i.serror & SERR_COMM_RECOVERED ? "RecovComm " : "", | 2046 | ehc->i.serror & SERR_COMM_RECOVERED ? "RecovComm " : "", |
| @@ -2171,18 +2171,12 @@ static int ata_do_reset(struct ata_link *link, ata_reset_fn_t reset, | |||
| 2171 | } | 2171 | } |
| 2172 | 2172 | ||
| 2173 | static int ata_eh_followup_srst_needed(struct ata_link *link, | 2173 | static int ata_eh_followup_srst_needed(struct ata_link *link, |
| 2174 | int rc, int classify, | 2174 | int rc, const unsigned int *classes) |
| 2175 | const unsigned int *classes) | ||
| 2176 | { | 2175 | { |
| 2177 | if ((link->flags & ATA_LFLAG_NO_SRST) || ata_link_offline(link)) | 2176 | if ((link->flags & ATA_LFLAG_NO_SRST) || ata_link_offline(link)) |
| 2178 | return 0; | 2177 | return 0; |
| 2179 | if (rc == -EAGAIN) { | 2178 | if (rc == -EAGAIN) |
| 2180 | if (classify) | 2179 | return 1; |
| 2181 | return 1; | ||
| 2182 | rc = 0; | ||
| 2183 | } | ||
| 2184 | if (rc != 0) | ||
| 2185 | return 0; | ||
| 2186 | if (sata_pmp_supported(link->ap) && ata_is_host_link(link)) | 2180 | if (sata_pmp_supported(link->ap) && ata_is_host_link(link)) |
| 2187 | return 1; | 2181 | return 1; |
| 2188 | return 0; | 2182 | return 0; |
| @@ -2210,6 +2204,10 @@ int ata_eh_reset(struct ata_link *link, int classify, | |||
| 2210 | */ | 2204 | */ |
| 2211 | while (ata_eh_reset_timeouts[max_tries] != ULONG_MAX) | 2205 | while (ata_eh_reset_timeouts[max_tries] != ULONG_MAX) |
| 2212 | max_tries++; | 2206 | max_tries++; |
| 2207 | if (link->flags & ATA_LFLAG_NO_HRST) | ||
| 2208 | hardreset = NULL; | ||
| 2209 | if (link->flags & ATA_LFLAG_NO_SRST) | ||
| 2210 | softreset = NULL; | ||
| 2213 | 2211 | ||
| 2214 | now = jiffies; | 2212 | now = jiffies; |
| 2215 | deadline = ata_deadline(ehc->last_reset, ATA_EH_RESET_COOL_DOWN); | 2213 | deadline = ata_deadline(ehc->last_reset, ATA_EH_RESET_COOL_DOWN); |
| @@ -2247,10 +2245,10 @@ int ata_eh_reset(struct ata_link *link, int classify, | |||
| 2247 | ehc->i.action &= ~ATA_EH_RESET; | 2245 | ehc->i.action &= ~ATA_EH_RESET; |
| 2248 | if (hardreset) { | 2246 | if (hardreset) { |
| 2249 | reset = hardreset; | 2247 | reset = hardreset; |
| 2250 | ehc->i.action = ATA_EH_HARDRESET; | 2248 | ehc->i.action |= ATA_EH_HARDRESET; |
| 2251 | } else if (softreset) { | 2249 | } else if (softreset) { |
| 2252 | reset = softreset; | 2250 | reset = softreset; |
| 2253 | ehc->i.action = ATA_EH_SOFTRESET; | 2251 | ehc->i.action |= ATA_EH_SOFTRESET; |
| 2254 | } | 2252 | } |
| 2255 | 2253 | ||
| 2256 | if (prereset) { | 2254 | if (prereset) { |
| @@ -2305,9 +2303,11 @@ int ata_eh_reset(struct ata_link *link, int classify, | |||
| 2305 | ehc->i.flags |= ATA_EHI_DID_SOFTRESET; | 2303 | ehc->i.flags |= ATA_EHI_DID_SOFTRESET; |
| 2306 | 2304 | ||
| 2307 | rc = ata_do_reset(link, reset, classes, deadline); | 2305 | rc = ata_do_reset(link, reset, classes, deadline); |
| 2306 | if (rc && rc != -EAGAIN) | ||
| 2307 | goto fail; | ||
| 2308 | 2308 | ||
| 2309 | if (reset == hardreset && | 2309 | if (reset == hardreset && |
| 2310 | ata_eh_followup_srst_needed(link, rc, classify, classes)) { | 2310 | ata_eh_followup_srst_needed(link, rc, classes)) { |
| 2311 | /* okay, let's do follow-up softreset */ | 2311 | /* okay, let's do follow-up softreset */ |
| 2312 | reset = softreset; | 2312 | reset = softreset; |
| 2313 | 2313 | ||
| @@ -2322,10 +2322,6 @@ int ata_eh_reset(struct ata_link *link, int classify, | |||
| 2322 | ata_eh_about_to_do(link, NULL, ATA_EH_RESET); | 2322 | ata_eh_about_to_do(link, NULL, ATA_EH_RESET); |
| 2323 | rc = ata_do_reset(link, reset, classes, deadline); | 2323 | rc = ata_do_reset(link, reset, classes, deadline); |
| 2324 | } | 2324 | } |
| 2325 | |||
| 2326 | /* -EAGAIN can happen if we skipped followup SRST */ | ||
| 2327 | if (rc && rc != -EAGAIN) | ||
| 2328 | goto fail; | ||
| 2329 | } else { | 2325 | } else { |
| 2330 | if (verbose) | 2326 | if (verbose) |
| 2331 | ata_link_printk(link, KERN_INFO, "no reset method " | 2327 | ata_link_printk(link, KERN_INFO, "no reset method " |
diff --git a/drivers/ata/pata_acpi.c b/drivers/ata/pata_acpi.c index fbe605711554..eb919c16a03e 100644 --- a/drivers/ata/pata_acpi.c +++ b/drivers/ata/pata_acpi.c | |||
| @@ -181,7 +181,7 @@ static unsigned int pacpi_qc_issue(struct ata_queued_cmd *qc) | |||
| 181 | 181 | ||
| 182 | if (adev != acpi->last) { | 182 | if (adev != acpi->last) { |
| 183 | pacpi_set_piomode(ap, adev); | 183 | pacpi_set_piomode(ap, adev); |
| 184 | if (adev->dma_mode) | 184 | if (ata_dma_enabled(adev)) |
| 185 | pacpi_set_dmamode(ap, adev); | 185 | pacpi_set_dmamode(ap, adev); |
| 186 | acpi->last = adev; | 186 | acpi->last = adev; |
| 187 | } | 187 | } |
diff --git a/drivers/ata/pata_atiixp.c b/drivers/ata/pata_atiixp.c index d7de7baf58a8..e8a0d99d7356 100644 --- a/drivers/ata/pata_atiixp.c +++ b/drivers/ata/pata_atiixp.c | |||
| @@ -183,7 +183,7 @@ static void atiixp_bmdma_start(struct ata_queued_cmd *qc) | |||
| 183 | u16 tmp16; | 183 | u16 tmp16; |
| 184 | 184 | ||
| 185 | pci_read_config_word(pdev, ATIIXP_IDE_UDMA_CONTROL, &tmp16); | 185 | pci_read_config_word(pdev, ATIIXP_IDE_UDMA_CONTROL, &tmp16); |
| 186 | if (adev->dma_mode >= XFER_UDMA_0) | 186 | if (ata_using_udma(adev)) |
| 187 | tmp16 |= (1 << dn); | 187 | tmp16 |= (1 << dn); |
| 188 | else | 188 | else |
| 189 | tmp16 &= ~(1 << dn); | 189 | tmp16 &= ~(1 << dn); |
diff --git a/drivers/ata/pata_cs5530.c b/drivers/ata/pata_cs5530.c index 744beebaaf49..0c4b271a9d5a 100644 --- a/drivers/ata/pata_cs5530.c +++ b/drivers/ata/pata_cs5530.c | |||
| @@ -149,10 +149,10 @@ static unsigned int cs5530_qc_issue(struct ata_queued_cmd *qc) | |||
| 149 | struct ata_device *prev = ap->private_data; | 149 | struct ata_device *prev = ap->private_data; |
| 150 | 150 | ||
| 151 | /* See if the DMA settings could be wrong */ | 151 | /* See if the DMA settings could be wrong */ |
| 152 | if (adev->dma_mode != 0 && adev != prev && prev != NULL) { | 152 | if (ata_dma_enabled(adev) && adev != prev && prev != NULL) { |
| 153 | /* Maybe, but do the channels match MWDMA/UDMA ? */ | 153 | /* Maybe, but do the channels match MWDMA/UDMA ? */ |
| 154 | if ((adev->dma_mode >= XFER_UDMA_0 && prev->dma_mode < XFER_UDMA_0) || | 154 | if ((ata_using_udma(adev) && !ata_using_udma(prev)) || |
| 155 | (adev->dma_mode < XFER_UDMA_0 && prev->dma_mode >= XFER_UDMA_0)) | 155 | (ata_using_udma(prev) && !ata_using_udma(adev))) |
| 156 | /* Switch the mode bits */ | 156 | /* Switch the mode bits */ |
| 157 | cs5530_set_dmamode(ap, adev); | 157 | cs5530_set_dmamode(ap, adev); |
| 158 | } | 158 | } |
diff --git a/drivers/ata/pata_it821x.c b/drivers/ata/pata_it821x.c index 27843c70eb9d..0221c9a46769 100644 --- a/drivers/ata/pata_it821x.c +++ b/drivers/ata/pata_it821x.c | |||
| @@ -606,7 +606,7 @@ static void it821x_display_disk(int n, u8 *buf) | |||
| 606 | { | 606 | { |
| 607 | unsigned char id[41]; | 607 | unsigned char id[41]; |
| 608 | int mode = 0; | 608 | int mode = 0; |
| 609 | char *mtype; | 609 | char *mtype = ""; |
| 610 | char mbuf[8]; | 610 | char mbuf[8]; |
| 611 | char *cbl = "(40 wire cable)"; | 611 | char *cbl = "(40 wire cable)"; |
| 612 | 612 | ||
diff --git a/drivers/ata/pata_oldpiix.c b/drivers/ata/pata_oldpiix.c index e678af383d13..df64f2443001 100644 --- a/drivers/ata/pata_oldpiix.c +++ b/drivers/ata/pata_oldpiix.c | |||
| @@ -198,7 +198,7 @@ static unsigned int oldpiix_qc_issue(struct ata_queued_cmd *qc) | |||
| 198 | 198 | ||
| 199 | if (adev != ap->private_data) { | 199 | if (adev != ap->private_data) { |
| 200 | oldpiix_set_piomode(ap, adev); | 200 | oldpiix_set_piomode(ap, adev); |
| 201 | if (adev->dma_mode) | 201 | if (ata_dma_enabled(adev)) |
| 202 | oldpiix_set_dmamode(ap, adev); | 202 | oldpiix_set_dmamode(ap, adev); |
| 203 | } | 203 | } |
| 204 | return ata_sff_qc_issue(qc); | 204 | return ata_sff_qc_issue(qc); |
diff --git a/drivers/ata/pata_sc1200.c b/drivers/ata/pata_sc1200.c index cbab397e3db7..0278fd2b8fb1 100644 --- a/drivers/ata/pata_sc1200.c +++ b/drivers/ata/pata_sc1200.c | |||
| @@ -167,10 +167,10 @@ static unsigned int sc1200_qc_issue(struct ata_queued_cmd *qc) | |||
| 167 | struct ata_device *prev = ap->private_data; | 167 | struct ata_device *prev = ap->private_data; |
| 168 | 168 | ||
| 169 | /* See if the DMA settings could be wrong */ | 169 | /* See if the DMA settings could be wrong */ |
| 170 | if (adev->dma_mode != 0 && adev != prev && prev != NULL) { | 170 | if (ata_dma_enabled(adev) && adev != prev && prev != NULL) { |
| 171 | /* Maybe, but do the channels match MWDMA/UDMA ? */ | 171 | /* Maybe, but do the channels match MWDMA/UDMA ? */ |
| 172 | if ((adev->dma_mode >= XFER_UDMA_0 && prev->dma_mode < XFER_UDMA_0) || | 172 | if ((ata_using_udma(adev) && !ata_using_udma(prev)) || |
| 173 | (adev->dma_mode < XFER_UDMA_0 && prev->dma_mode >= XFER_UDMA_0)) | 173 | (ata_using_udma(prev) && !ata_using_udma(adev))) |
| 174 | /* Switch the mode bits */ | 174 | /* Switch the mode bits */ |
| 175 | sc1200_set_dmamode(ap, adev); | 175 | sc1200_set_dmamode(ap, adev); |
| 176 | } | 176 | } |
diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c index 57d951b11f2d..8fdb2ce73210 100644 --- a/drivers/ata/pata_via.c +++ b/drivers/ata/pata_via.c | |||
| @@ -324,62 +324,26 @@ static void via_set_dmamode(struct ata_port *ap, struct ata_device *adev) | |||
| 324 | } | 324 | } |
| 325 | 325 | ||
| 326 | /** | 326 | /** |
| 327 | * via_ata_sff_tf_load - send taskfile registers to host controller | 327 | * via_tf_load - send taskfile registers to host controller |
| 328 | * @ap: Port to which output is sent | 328 | * @ap: Port to which output is sent |
| 329 | * @tf: ATA taskfile register set | 329 | * @tf: ATA taskfile register set |
| 330 | * | 330 | * |
| 331 | * Outputs ATA taskfile to standard ATA host controller. | 331 | * Outputs ATA taskfile to standard ATA host controller. |
| 332 | * | 332 | * |
| 333 | * Note: This is to fix the internal bug of via chipsets, which | 333 | * Note: This is to fix the internal bug of via chipsets, which |
| 334 | * will reset the device register after changing the IEN bit on | 334 | * will reset the device register after changing the IEN bit on |
| 335 | * ctl register | 335 | * ctl register |
| 336 | */ | 336 | */ |
| 337 | static void via_ata_tf_load(struct ata_port *ap, const struct ata_taskfile *tf) | 337 | static void via_tf_load(struct ata_port *ap, const struct ata_taskfile *tf) |
| 338 | { | 338 | { |
| 339 | struct ata_ioports *ioaddr = &ap->ioaddr; | 339 | struct ata_taskfile tmp_tf; |
| 340 | unsigned int is_addr = tf->flags & ATA_TFLAG_ISADDR; | ||
| 341 | |||
| 342 | if (tf->ctl != ap->last_ctl) { | ||
| 343 | iowrite8(tf->ctl, ioaddr->ctl_addr); | ||
| 344 | iowrite8(tf->device, ioaddr->device_addr); | ||
| 345 | ap->last_ctl = tf->ctl; | ||
| 346 | ata_wait_idle(ap); | ||
| 347 | } | ||
| 348 | |||
| 349 | if (is_addr && (tf->flags & ATA_TFLAG_LBA48)) { | ||
| 350 | iowrite8(tf->hob_feature, ioaddr->feature_addr); | ||
| 351 | iowrite8(tf->hob_nsect, ioaddr->nsect_addr); | ||
| 352 | iowrite8(tf->hob_lbal, ioaddr->lbal_addr); | ||
| 353 | iowrite8(tf->hob_lbam, ioaddr->lbam_addr); | ||
| 354 | iowrite8(tf->hob_lbah, ioaddr->lbah_addr); | ||
| 355 | VPRINTK("hob: feat 0x%X nsect 0x%X, lba 0x%X 0x%X 0x%X\n", | ||
| 356 | tf->hob_feature, | ||
| 357 | tf->hob_nsect, | ||
| 358 | tf->hob_lbal, | ||
| 359 | tf->hob_lbam, | ||
| 360 | tf->hob_lbah); | ||
| 361 | } | ||
| 362 | 340 | ||
| 363 | if (is_addr) { | 341 | if (ap->ctl != ap->last_ctl && !(tf->flags & ATA_TFLAG_DEVICE)) { |
| 364 | iowrite8(tf->feature, ioaddr->feature_addr); | 342 | tmp_tf = *tf; |
| 365 | iowrite8(tf->nsect, ioaddr->nsect_addr); | 343 | tmp_tf.flags |= ATA_TFLAG_DEVICE; |
| 366 | iowrite8(tf->lbal, ioaddr->lbal_addr); | 344 | tf = &tmp_tf; |
| 367 | iowrite8(tf->lbam, ioaddr->lbam_addr); | ||
| 368 | iowrite8(tf->lbah, ioaddr->lbah_addr); | ||
| 369 | VPRINTK("feat 0x%X nsect 0x%X lba 0x%X 0x%X 0x%X\n", | ||
| 370 | tf->feature, | ||
| 371 | tf->nsect, | ||
| 372 | tf->lbal, | ||
| 373 | tf->lbam, | ||
| 374 | tf->lbah); | ||
| 375 | } | 345 | } |
| 376 | 346 | ata_sff_tf_load(ap, tf); | |
| 377 | if (tf->flags & ATA_TFLAG_DEVICE) { | ||
| 378 | iowrite8(tf->device, ioaddr->device_addr); | ||
| 379 | VPRINTK("device 0x%X\n", tf->device); | ||
| 380 | } | ||
| 381 | |||
| 382 | ata_wait_idle(ap); | ||
| 383 | } | 347 | } |
| 384 | 348 | ||
| 385 | static struct scsi_host_template via_sht = { | 349 | static struct scsi_host_template via_sht = { |
| @@ -392,13 +356,12 @@ static struct ata_port_operations via_port_ops = { | |||
| 392 | .set_piomode = via_set_piomode, | 356 | .set_piomode = via_set_piomode, |
| 393 | .set_dmamode = via_set_dmamode, | 357 | .set_dmamode = via_set_dmamode, |
| 394 | .prereset = via_pre_reset, | 358 | .prereset = via_pre_reset, |
| 395 | .sff_tf_load = via_ata_tf_load, | 359 | .sff_tf_load = via_tf_load, |
| 396 | }; | 360 | }; |
| 397 | 361 | ||
| 398 | static struct ata_port_operations via_port_ops_noirq = { | 362 | static struct ata_port_operations via_port_ops_noirq = { |
| 399 | .inherits = &via_port_ops, | 363 | .inherits = &via_port_ops, |
| 400 | .sff_data_xfer = ata_sff_data_xfer_noirq, | 364 | .sff_data_xfer = ata_sff_data_xfer_noirq, |
| 401 | .sff_tf_load = via_ata_tf_load, | ||
| 402 | }; | 365 | }; |
| 403 | 366 | ||
| 404 | /** | 367 | /** |
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c index ad169ffbc4cb..13c1d2af18ac 100644 --- a/drivers/ata/sata_mv.c +++ b/drivers/ata/sata_mv.c | |||
| @@ -1134,30 +1134,16 @@ static int mv_qc_defer(struct ata_queued_cmd *qc) | |||
| 1134 | if (ap->nr_active_links == 0) | 1134 | if (ap->nr_active_links == 0) |
| 1135 | return 0; | 1135 | return 0; |
| 1136 | 1136 | ||
| 1137 | if (pp->pp_flags & MV_PP_FLAG_EDMA_EN) { | 1137 | /* |
| 1138 | /* | 1138 | * The port is operating in host queuing mode (EDMA) with NCQ |
| 1139 | * The port is operating in host queuing mode (EDMA). | 1139 | * enabled, allow multiple NCQ commands. EDMA also allows |
| 1140 | * It can accomodate a new qc if the qc protocol | 1140 | * queueing multiple DMA commands but libata core currently |
| 1141 | * is compatible with the current host queue mode. | 1141 | * doesn't allow it. |
| 1142 | */ | 1142 | */ |
| 1143 | if (pp->pp_flags & MV_PP_FLAG_NCQ_EN) { | 1143 | if ((pp->pp_flags & MV_PP_FLAG_EDMA_EN) && |
| 1144 | /* | 1144 | (pp->pp_flags & MV_PP_FLAG_NCQ_EN) && ata_is_ncq(qc->tf.protocol)) |
| 1145 | * The host queue (EDMA) is in NCQ mode. | 1145 | return 0; |
| 1146 | * If the new qc is also an NCQ command, | 1146 | |
| 1147 | * then allow the new qc. | ||
| 1148 | */ | ||
| 1149 | if (qc->tf.protocol == ATA_PROT_NCQ) | ||
| 1150 | return 0; | ||
| 1151 | } else { | ||
| 1152 | /* | ||
| 1153 | * The host queue (EDMA) is in non-NCQ, DMA mode. | ||
| 1154 | * If the new qc is also a non-NCQ, DMA command, | ||
| 1155 | * then allow the new qc. | ||
| 1156 | */ | ||
| 1157 | if (qc->tf.protocol == ATA_PROT_DMA) | ||
| 1158 | return 0; | ||
| 1159 | } | ||
| 1160 | } | ||
| 1161 | return ATA_DEFER_PORT; | 1147 | return ATA_DEFER_PORT; |
| 1162 | } | 1148 | } |
| 1163 | 1149 | ||
| @@ -3036,7 +3022,8 @@ static int mv_chip_id(struct ata_host *host, unsigned int board_idx) | |||
| 3036 | break; | 3022 | break; |
| 3037 | case chip_soc: | 3023 | case chip_soc: |
| 3038 | hpriv->ops = &mv_soc_ops; | 3024 | hpriv->ops = &mv_soc_ops; |
| 3039 | hp_flags |= MV_HP_FLAG_SOC | MV_HP_ERRATA_60X1C0; | 3025 | hp_flags |= MV_HP_FLAG_SOC | MV_HP_GEN_IIE | |
| 3026 | MV_HP_ERRATA_60X1C0; | ||
| 3040 | break; | 3027 | break; |
| 3041 | 3028 | ||
| 3042 | default: | 3029 | default: |
diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c index 2ebd07f2ef81..5effec6f5458 100644 --- a/drivers/atm/adummy.c +++ b/drivers/atm/adummy.c | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/module.h> | 5 | #include <linux/module.h> |
| 6 | #include <linux/version.h> | ||
| 7 | #include <linux/kernel.h> | 6 | #include <linux/kernel.h> |
| 8 | #include <linux/skbuff.h> | 7 | #include <linux/skbuff.h> |
| 9 | #include <linux/errno.h> | 8 | #include <linux/errno.h> |
diff --git a/drivers/base/class.c b/drivers/base/class.c index 5667c2f02c51..cc5e28c8885c 100644 --- a/drivers/base/class.c +++ b/drivers/base/class.c | |||
| @@ -295,6 +295,12 @@ int class_for_each_device(struct class *class, struct device *start, | |||
| 295 | 295 | ||
| 296 | if (!class) | 296 | if (!class) |
| 297 | return -EINVAL; | 297 | return -EINVAL; |
| 298 | if (!class->p) { | ||
| 299 | WARN(1, "%s called for class '%s' before it was initialized", | ||
| 300 | __func__, class->name); | ||
| 301 | return -EINVAL; | ||
| 302 | } | ||
| 303 | |||
| 298 | mutex_lock(&class->p->class_mutex); | 304 | mutex_lock(&class->p->class_mutex); |
| 299 | list_for_each_entry(dev, &class->p->class_devices, node) { | 305 | list_for_each_entry(dev, &class->p->class_devices, node) { |
| 300 | if (start) { | 306 | if (start) { |
| @@ -344,6 +350,11 @@ struct device *class_find_device(struct class *class, struct device *start, | |||
| 344 | 350 | ||
| 345 | if (!class) | 351 | if (!class) |
| 346 | return NULL; | 352 | return NULL; |
| 353 | if (!class->p) { | ||
| 354 | WARN(1, "%s called for class '%s' before it was initialized", | ||
| 355 | __func__, class->name); | ||
| 356 | return NULL; | ||
| 357 | } | ||
| 347 | 358 | ||
| 348 | mutex_lock(&class->p->class_mutex); | 359 | mutex_lock(&class->p->class_mutex); |
| 349 | list_for_each_entry(dev, &class->p->class_devices, node) { | 360 | list_for_each_entry(dev, &class->p->class_devices, node) { |
diff --git a/drivers/base/core.c b/drivers/base/core.c index 068aa1c9538c..d021c98605b3 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c | |||
| @@ -53,7 +53,7 @@ static inline int device_is_not_partition(struct device *dev) | |||
| 53 | * it is attached to. If it is not attached to a bus either, an empty | 53 | * it is attached to. If it is not attached to a bus either, an empty |
| 54 | * string will be returned. | 54 | * string will be returned. |
| 55 | */ | 55 | */ |
| 56 | const char *dev_driver_string(struct device *dev) | 56 | const char *dev_driver_string(const struct device *dev) |
| 57 | { | 57 | { |
| 58 | return dev->driver ? dev->driver->name : | 58 | return dev->driver ? dev->driver->name : |
| 59 | (dev->bus ? dev->bus->name : | 59 | (dev->bus ? dev->bus->name : |
| @@ -541,6 +541,7 @@ void device_initialize(struct device *dev) | |||
| 541 | spin_lock_init(&dev->devres_lock); | 541 | spin_lock_init(&dev->devres_lock); |
| 542 | INIT_LIST_HEAD(&dev->devres_head); | 542 | INIT_LIST_HEAD(&dev->devres_head); |
| 543 | device_init_wakeup(dev, 0); | 543 | device_init_wakeup(dev, 0); |
| 544 | device_pm_init(dev); | ||
| 544 | set_dev_node(dev, -1); | 545 | set_dev_node(dev, -1); |
| 545 | } | 546 | } |
| 546 | 547 | ||
| @@ -843,13 +844,19 @@ int device_add(struct device *dev) | |||
| 843 | { | 844 | { |
| 844 | struct device *parent = NULL; | 845 | struct device *parent = NULL; |
| 845 | struct class_interface *class_intf; | 846 | struct class_interface *class_intf; |
| 846 | int error; | 847 | int error = -EINVAL; |
| 847 | 848 | ||
| 848 | dev = get_device(dev); | 849 | dev = get_device(dev); |
| 849 | if (!dev || !strlen(dev->bus_id)) { | 850 | if (!dev) |
| 850 | error = -EINVAL; | 851 | goto done; |
| 851 | goto Done; | 852 | |
| 852 | } | 853 | /* Temporarily support init_name if it is set. |
| 854 | * It will override bus_id for now */ | ||
| 855 | if (dev->init_name) | ||
| 856 | dev_set_name(dev, "%s", dev->init_name); | ||
| 857 | |||
| 858 | if (!strlen(dev->bus_id)) | ||
| 859 | goto done; | ||
| 853 | 860 | ||
| 854 | pr_debug("device: '%s': %s\n", dev->bus_id, __func__); | 861 | pr_debug("device: '%s': %s\n", dev->bus_id, __func__); |
| 855 | 862 | ||
| @@ -897,9 +904,10 @@ int device_add(struct device *dev) | |||
| 897 | error = bus_add_device(dev); | 904 | error = bus_add_device(dev); |
| 898 | if (error) | 905 | if (error) |
| 899 | goto BusError; | 906 | goto BusError; |
| 900 | error = device_pm_add(dev); | 907 | error = dpm_sysfs_add(dev); |
| 901 | if (error) | 908 | if (error) |
| 902 | goto PMError; | 909 | goto DPMError; |
| 910 | device_pm_add(dev); | ||
| 903 | kobject_uevent(&dev->kobj, KOBJ_ADD); | 911 | kobject_uevent(&dev->kobj, KOBJ_ADD); |
| 904 | bus_attach_device(dev); | 912 | bus_attach_device(dev); |
| 905 | if (parent) | 913 | if (parent) |
| @@ -917,10 +925,10 @@ int device_add(struct device *dev) | |||
| 917 | class_intf->add_dev(dev, class_intf); | 925 | class_intf->add_dev(dev, class_intf); |
| 918 | mutex_unlock(&dev->class->p->class_mutex); | 926 | mutex_unlock(&dev->class->p->class_mutex); |
| 919 | } | 927 | } |
| 920 | Done: | 928 | done: |
| 921 | put_device(dev); | 929 | put_device(dev); |
| 922 | return error; | 930 | return error; |
| 923 | PMError: | 931 | DPMError: |
| 924 | bus_remove_device(dev); | 932 | bus_remove_device(dev); |
| 925 | BusError: | 933 | BusError: |
| 926 | if (dev->bus) | 934 | if (dev->bus) |
| @@ -944,7 +952,7 @@ int device_add(struct device *dev) | |||
| 944 | cleanup_device_parent(dev); | 952 | cleanup_device_parent(dev); |
| 945 | if (parent) | 953 | if (parent) |
| 946 | put_device(parent); | 954 | put_device(parent); |
| 947 | goto Done; | 955 | goto done; |
| 948 | } | 956 | } |
| 949 | 957 | ||
| 950 | /** | 958 | /** |
| @@ -1007,6 +1015,7 @@ void device_del(struct device *dev) | |||
| 1007 | struct class_interface *class_intf; | 1015 | struct class_interface *class_intf; |
| 1008 | 1016 | ||
| 1009 | device_pm_remove(dev); | 1017 | device_pm_remove(dev); |
| 1018 | dpm_sysfs_remove(dev); | ||
| 1010 | if (parent) | 1019 | if (parent) |
| 1011 | klist_del(&dev->knode_parent); | 1020 | klist_del(&dev->knode_parent); |
| 1012 | if (MAJOR(dev->devt)) { | 1021 | if (MAJOR(dev->devt)) { |
diff --git a/drivers/base/driver.c b/drivers/base/driver.c index 2ef5acf4368b..1e2bda780e48 100644 --- a/drivers/base/driver.c +++ b/drivers/base/driver.c | |||
| @@ -16,9 +16,6 @@ | |||
| 16 | #include <linux/string.h> | 16 | #include <linux/string.h> |
| 17 | #include "base.h" | 17 | #include "base.h" |
| 18 | 18 | ||
| 19 | #define to_dev(node) container_of(node, struct device, driver_list) | ||
| 20 | |||
| 21 | |||
| 22 | static struct device *next_device(struct klist_iter *i) | 19 | static struct device *next_device(struct klist_iter *i) |
| 23 | { | 20 | { |
| 24 | struct klist_node *n = klist_next(i); | 21 | struct klist_node *n = klist_next(i); |
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 3250c5257b74..273a944d4040 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c | |||
| @@ -67,20 +67,16 @@ void device_pm_unlock(void) | |||
| 67 | * device_pm_add - add a device to the list of active devices | 67 | * device_pm_add - add a device to the list of active devices |
| 68 | * @dev: Device to be added to the list | 68 | * @dev: Device to be added to the list |
| 69 | */ | 69 | */ |
| 70 | int device_pm_add(struct device *dev) | 70 | void device_pm_add(struct device *dev) |
| 71 | { | 71 | { |
| 72 | int error; | ||
| 73 | |||
| 74 | pr_debug("PM: Adding info for %s:%s\n", | 72 | pr_debug("PM: Adding info for %s:%s\n", |
| 75 | dev->bus ? dev->bus->name : "No Bus", | 73 | dev->bus ? dev->bus->name : "No Bus", |
| 76 | kobject_name(&dev->kobj)); | 74 | kobject_name(&dev->kobj)); |
| 77 | mutex_lock(&dpm_list_mtx); | 75 | mutex_lock(&dpm_list_mtx); |
| 78 | if (dev->parent) { | 76 | if (dev->parent) { |
| 79 | if (dev->parent->power.status >= DPM_SUSPENDING) { | 77 | if (dev->parent->power.status >= DPM_SUSPENDING) |
| 80 | dev_warn(dev, "parent %s is sleeping, will not add\n", | 78 | dev_warn(dev, "parent %s should not be sleeping\n", |
| 81 | dev->parent->bus_id); | 79 | dev->parent->bus_id); |
| 82 | WARN_ON(true); | ||
| 83 | } | ||
| 84 | } else if (transition_started) { | 80 | } else if (transition_started) { |
| 85 | /* | 81 | /* |
| 86 | * We refuse to register parentless devices while a PM | 82 | * We refuse to register parentless devices while a PM |
| @@ -89,13 +85,9 @@ int device_pm_add(struct device *dev) | |||
| 89 | */ | 85 | */ |
| 90 | WARN_ON(true); | 86 | WARN_ON(true); |
| 91 | } | 87 | } |
| 92 | error = dpm_sysfs_add(dev); | 88 | |
| 93 | if (!error) { | 89 | list_add_tail(&dev->power.entry, &dpm_list); |
| 94 | dev->power.status = DPM_ON; | ||
| 95 | list_add_tail(&dev->power.entry, &dpm_list); | ||
| 96 | } | ||
| 97 | mutex_unlock(&dpm_list_mtx); | 90 | mutex_unlock(&dpm_list_mtx); |
| 98 | return error; | ||
| 99 | } | 91 | } |
| 100 | 92 | ||
| 101 | /** | 93 | /** |
| @@ -110,7 +102,6 @@ void device_pm_remove(struct device *dev) | |||
| 110 | dev->bus ? dev->bus->name : "No Bus", | 102 | dev->bus ? dev->bus->name : "No Bus", |
| 111 | kobject_name(&dev->kobj)); | 103 | kobject_name(&dev->kobj)); |
| 112 | mutex_lock(&dpm_list_mtx); | 104 | mutex_lock(&dpm_list_mtx); |
| 113 | dpm_sysfs_remove(dev); | ||
| 114 | list_del_init(&dev->power.entry); | 105 | list_del_init(&dev->power.entry); |
| 115 | mutex_unlock(&dpm_list_mtx); | 106 | mutex_unlock(&dpm_list_mtx); |
| 116 | } | 107 | } |
diff --git a/drivers/base/power/power.h b/drivers/base/power/power.h index a3252c0e2887..41f51fae042f 100644 --- a/drivers/base/power/power.h +++ b/drivers/base/power/power.h | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | static inline void device_pm_init(struct device *dev) | ||
| 2 | { | ||
| 3 | dev->power.status = DPM_ON; | ||
| 4 | } | ||
| 5 | |||
| 1 | #ifdef CONFIG_PM_SLEEP | 6 | #ifdef CONFIG_PM_SLEEP |
| 2 | 7 | ||
| 3 | /* | 8 | /* |
| @@ -11,12 +16,12 @@ static inline struct device *to_device(struct list_head *entry) | |||
| 11 | return container_of(entry, struct device, power.entry); | 16 | return container_of(entry, struct device, power.entry); |
| 12 | } | 17 | } |
| 13 | 18 | ||
| 14 | extern int device_pm_add(struct device *); | 19 | extern void device_pm_add(struct device *); |
| 15 | extern void device_pm_remove(struct device *); | 20 | extern void device_pm_remove(struct device *); |
| 16 | 21 | ||
| 17 | #else /* CONFIG_PM_SLEEP */ | 22 | #else /* CONFIG_PM_SLEEP */ |
| 18 | 23 | ||
| 19 | static inline int device_pm_add(struct device *dev) { return 0; } | 24 | static inline void device_pm_add(struct device *dev) {} |
| 20 | static inline void device_pm_remove(struct device *dev) {} | 25 | static inline void device_pm_remove(struct device *dev) {} |
| 21 | 26 | ||
| 22 | #endif | 27 | #endif |
diff --git a/drivers/block/brd.c b/drivers/block/brd.c index 24b97b0bef99..d070d492e385 100644 --- a/drivers/block/brd.c +++ b/drivers/block/brd.c | |||
| @@ -571,8 +571,8 @@ out_free: | |||
| 571 | list_del(&brd->brd_list); | 571 | list_del(&brd->brd_list); |
| 572 | brd_free(brd); | 572 | brd_free(brd); |
| 573 | } | 573 | } |
| 574 | unregister_blkdev(RAMDISK_MAJOR, "ramdisk"); | ||
| 574 | 575 | ||
| 575 | unregister_blkdev(RAMDISK_MAJOR, "brd"); | ||
| 576 | return -ENOMEM; | 576 | return -ENOMEM; |
| 577 | } | 577 | } |
| 578 | 578 | ||
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index ad98dda6037d..1778e4a2c672 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c | |||
| @@ -707,15 +707,15 @@ static int __init nbd_init(void) | |||
| 707 | 707 | ||
| 708 | BUILD_BUG_ON(sizeof(struct nbd_request) != 28); | 708 | BUILD_BUG_ON(sizeof(struct nbd_request) != 28); |
| 709 | 709 | ||
| 710 | nbd_dev = kcalloc(nbds_max, sizeof(*nbd_dev), GFP_KERNEL); | ||
| 711 | if (!nbd_dev) | ||
| 712 | return -ENOMEM; | ||
| 713 | |||
| 714 | if (max_part < 0) { | 710 | if (max_part < 0) { |
| 715 | printk(KERN_CRIT "nbd: max_part must be >= 0\n"); | 711 | printk(KERN_CRIT "nbd: max_part must be >= 0\n"); |
| 716 | return -EINVAL; | 712 | return -EINVAL; |
| 717 | } | 713 | } |
| 718 | 714 | ||
| 715 | nbd_dev = kcalloc(nbds_max, sizeof(*nbd_dev), GFP_KERNEL); | ||
| 716 | if (!nbd_dev) | ||
| 717 | return -ENOMEM; | ||
| 718 | |||
| 719 | part_shift = 0; | 719 | part_shift = 0; |
| 720 | if (max_part > 0) | 720 | if (max_part > 0) |
| 721 | part_shift = fls(max_part); | 721 | part_shift = fls(max_part); |
| @@ -779,6 +779,7 @@ out: | |||
| 779 | blk_cleanup_queue(nbd_dev[i].disk->queue); | 779 | blk_cleanup_queue(nbd_dev[i].disk->queue); |
| 780 | put_disk(nbd_dev[i].disk); | 780 | put_disk(nbd_dev[i].disk); |
| 781 | } | 781 | } |
| 782 | kfree(nbd_dev); | ||
| 782 | return err; | 783 | return err; |
| 783 | } | 784 | } |
| 784 | 785 | ||
| @@ -795,6 +796,7 @@ static void __exit nbd_cleanup(void) | |||
| 795 | } | 796 | } |
| 796 | } | 797 | } |
| 797 | unregister_blkdev(NBD_MAJOR, "nbd"); | 798 | unregister_blkdev(NBD_MAJOR, "nbd"); |
| 799 | kfree(nbd_dev); | ||
| 798 | printk(KERN_INFO "nbd: unregistered device at major %d\n", NBD_MAJOR); | 800 | printk(KERN_INFO "nbd: unregistered device at major %d\n", NBD_MAJOR); |
| 799 | } | 801 | } |
| 800 | 802 | ||
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c index 158eed4d5161..29b7a648cc6e 100644 --- a/drivers/block/pktcdvd.c +++ b/drivers/block/pktcdvd.c | |||
| @@ -49,7 +49,6 @@ | |||
| 49 | #include <linux/types.h> | 49 | #include <linux/types.h> |
| 50 | #include <linux/kernel.h> | 50 | #include <linux/kernel.h> |
| 51 | #include <linux/kthread.h> | 51 | #include <linux/kthread.h> |
| 52 | #include <linux/smp_lock.h> | ||
| 53 | #include <linux/errno.h> | 52 | #include <linux/errno.h> |
| 54 | #include <linux/spinlock.h> | 53 | #include <linux/spinlock.h> |
| 55 | #include <linux/file.h> | 54 | #include <linux/file.h> |
| @@ -2798,14 +2797,9 @@ out_mem: | |||
| 2798 | return ret; | 2797 | return ret; |
| 2799 | } | 2798 | } |
| 2800 | 2799 | ||
| 2801 | static long pkt_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | 2800 | static int pkt_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) |
| 2802 | { | 2801 | { |
| 2803 | struct inode *inode = file->f_path.dentry->d_inode; | 2802 | struct pktcdvd_device *pd = inode->i_bdev->bd_disk->private_data; |
| 2804 | struct pktcdvd_device *pd; | ||
| 2805 | long ret; | ||
| 2806 | |||
| 2807 | lock_kernel(); | ||
| 2808 | pd = inode->i_bdev->bd_disk->private_data; | ||
| 2809 | 2803 | ||
| 2810 | VPRINTK("pkt_ioctl: cmd %x, dev %d:%d\n", cmd, imajor(inode), iminor(inode)); | 2804 | VPRINTK("pkt_ioctl: cmd %x, dev %d:%d\n", cmd, imajor(inode), iminor(inode)); |
| 2811 | 2805 | ||
| @@ -2818,8 +2812,7 @@ static long pkt_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | |||
| 2818 | case CDROM_LAST_WRITTEN: | 2812 | case CDROM_LAST_WRITTEN: |
| 2819 | case CDROM_SEND_PACKET: | 2813 | case CDROM_SEND_PACKET: |
| 2820 | case SCSI_IOCTL_SEND_COMMAND: | 2814 | case SCSI_IOCTL_SEND_COMMAND: |
| 2821 | ret = blkdev_ioctl(pd->bdev->bd_inode, file, cmd, arg); | 2815 | return blkdev_ioctl(pd->bdev->bd_inode, file, cmd, arg); |
| 2822 | break; | ||
| 2823 | 2816 | ||
| 2824 | case CDROMEJECT: | 2817 | case CDROMEJECT: |
| 2825 | /* | 2818 | /* |
| @@ -2828,15 +2821,14 @@ static long pkt_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | |||
| 2828 | */ | 2821 | */ |
| 2829 | if (pd->refcnt == 1) | 2822 | if (pd->refcnt == 1) |
| 2830 | pkt_lock_door(pd, 0); | 2823 | pkt_lock_door(pd, 0); |
| 2831 | ret = blkdev_ioctl(pd->bdev->bd_inode, file, cmd, arg); | 2824 | return blkdev_ioctl(pd->bdev->bd_inode, file, cmd, arg); |
| 2832 | break; | ||
| 2833 | 2825 | ||
| 2834 | default: | 2826 | default: |
| 2835 | VPRINTK(DRIVER_NAME": Unknown ioctl for %s (%x)\n", pd->name, cmd); | 2827 | VPRINTK(DRIVER_NAME": Unknown ioctl for %s (%x)\n", pd->name, cmd); |
| 2836 | ret = -ENOTTY; | 2828 | return -ENOTTY; |
| 2837 | } | 2829 | } |
| 2838 | unlock_kernel(); | 2830 | |
| 2839 | return ret; | 2831 | return 0; |
| 2840 | } | 2832 | } |
| 2841 | 2833 | ||
| 2842 | static int pkt_media_changed(struct gendisk *disk) | 2834 | static int pkt_media_changed(struct gendisk *disk) |
| @@ -2858,7 +2850,7 @@ static struct block_device_operations pktcdvd_ops = { | |||
| 2858 | .owner = THIS_MODULE, | 2850 | .owner = THIS_MODULE, |
| 2859 | .open = pkt_open, | 2851 | .open = pkt_open, |
| 2860 | .release = pkt_close, | 2852 | .release = pkt_close, |
| 2861 | .unlocked_ioctl = pkt_ioctl, | 2853 | .ioctl = pkt_ioctl, |
| 2862 | .media_changed = pkt_media_changed, | 2854 | .media_changed = pkt_media_changed, |
| 2863 | }; | 2855 | }; |
| 2864 | 2856 | ||
| @@ -3023,8 +3015,7 @@ static void pkt_get_status(struct pkt_ctrl_command *ctrl_cmd) | |||
| 3023 | mutex_unlock(&ctl_mutex); | 3015 | mutex_unlock(&ctl_mutex); |
| 3024 | } | 3016 | } |
| 3025 | 3017 | ||
| 3026 | static long pkt_ctl_ioctl(struct file *file, unsigned int cmd, | 3018 | static int pkt_ctl_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) |
| 3027 | unsigned long arg) | ||
| 3028 | { | 3019 | { |
| 3029 | void __user *argp = (void __user *)arg; | 3020 | void __user *argp = (void __user *)arg; |
| 3030 | struct pkt_ctrl_command ctrl_cmd; | 3021 | struct pkt_ctrl_command ctrl_cmd; |
| @@ -3041,22 +3032,16 @@ static long pkt_ctl_ioctl(struct file *file, unsigned int cmd, | |||
| 3041 | case PKT_CTRL_CMD_SETUP: | 3032 | case PKT_CTRL_CMD_SETUP: |
| 3042 | if (!capable(CAP_SYS_ADMIN)) | 3033 | if (!capable(CAP_SYS_ADMIN)) |
| 3043 | return -EPERM; | 3034 | return -EPERM; |
| 3044 | lock_kernel(); | ||
| 3045 | ret = pkt_setup_dev(new_decode_dev(ctrl_cmd.dev), &pkt_dev); | 3035 | ret = pkt_setup_dev(new_decode_dev(ctrl_cmd.dev), &pkt_dev); |
| 3046 | ctrl_cmd.pkt_dev = new_encode_dev(pkt_dev); | 3036 | ctrl_cmd.pkt_dev = new_encode_dev(pkt_dev); |
| 3047 | unlock_kernel(); | ||
| 3048 | break; | 3037 | break; |
| 3049 | case PKT_CTRL_CMD_TEARDOWN: | 3038 | case PKT_CTRL_CMD_TEARDOWN: |
| 3050 | if (!capable(CAP_SYS_ADMIN)) | 3039 | if (!capable(CAP_SYS_ADMIN)) |
| 3051 | return -EPERM; | 3040 | return -EPERM; |
| 3052 | lock_kernel(); | ||
| 3053 | ret = pkt_remove_dev(new_decode_dev(ctrl_cmd.pkt_dev)); | 3041 | ret = pkt_remove_dev(new_decode_dev(ctrl_cmd.pkt_dev)); |
| 3054 | unlock_kernel(); | ||
| 3055 | break; | 3042 | break; |
| 3056 | case PKT_CTRL_CMD_STATUS: | 3043 | case PKT_CTRL_CMD_STATUS: |
| 3057 | lock_kernel(); | ||
| 3058 | pkt_get_status(&ctrl_cmd); | 3044 | pkt_get_status(&ctrl_cmd); |
| 3059 | unlock_kernel(); | ||
| 3060 | break; | 3045 | break; |
| 3061 | default: | 3046 | default: |
| 3062 | return -ENOTTY; | 3047 | return -ENOTTY; |
| @@ -3069,7 +3054,7 @@ static long pkt_ctl_ioctl(struct file *file, unsigned int cmd, | |||
| 3069 | 3054 | ||
| 3070 | 3055 | ||
| 3071 | static const struct file_operations pkt_ctl_fops = { | 3056 | static const struct file_operations pkt_ctl_fops = { |
| 3072 | .unlocked_ioctl = pkt_ctl_ioctl, | 3057 | .ioctl = pkt_ctl_ioctl, |
| 3073 | .owner = THIS_MODULE, | 3058 | .owner = THIS_MODULE, |
| 3074 | }; | 3059 | }; |
| 3075 | 3060 | ||
diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig index a235ca787465..7cb4029a5375 100644 --- a/drivers/bluetooth/Kconfig +++ b/drivers/bluetooth/Kconfig | |||
| @@ -3,8 +3,8 @@ menu "Bluetooth device drivers" | |||
| 3 | depends on BT | 3 | depends on BT |
| 4 | 4 | ||
| 5 | config BT_HCIUSB | 5 | config BT_HCIUSB |
| 6 | tristate "HCI USB driver" | 6 | tristate "HCI USB driver (old version)" |
| 7 | depends on USB | 7 | depends on USB && BT_HCIBTUSB=n |
| 8 | help | 8 | help |
| 9 | Bluetooth HCI USB driver. | 9 | Bluetooth HCI USB driver. |
| 10 | This driver is required if you want to use Bluetooth devices with | 10 | This driver is required if you want to use Bluetooth devices with |
| @@ -23,15 +23,13 @@ config BT_HCIUSB_SCO | |||
| 23 | Say Y here to compile support for SCO over HCI USB. | 23 | Say Y here to compile support for SCO over HCI USB. |
| 24 | 24 | ||
| 25 | config BT_HCIBTUSB | 25 | config BT_HCIBTUSB |
| 26 | tristate "HCI USB driver (alternate version)" | 26 | tristate "HCI USB driver" |
| 27 | depends on USB && EXPERIMENTAL && BT_HCIUSB=n | 27 | depends on USB |
| 28 | help | 28 | help |
| 29 | Bluetooth HCI USB driver. | 29 | Bluetooth HCI USB driver. |
| 30 | This driver is required if you want to use Bluetooth devices with | 30 | This driver is required if you want to use Bluetooth devices with |
| 31 | USB interface. | 31 | USB interface. |
| 32 | 32 | ||
| 33 | This driver is still experimental and has no SCO support. | ||
| 34 | |||
| 35 | Say Y here to compile support for Bluetooth USB devices into the | 33 | Say Y here to compile support for Bluetooth USB devices into the |
| 36 | kernel or say M to compile it as module (btusb). | 34 | kernel or say M to compile it as module (btusb). |
| 37 | 35 | ||
diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c index 593b7c595038..27058477cc8b 100644 --- a/drivers/bluetooth/bt3c_cs.c +++ b/drivers/bluetooth/bt3c_cs.c | |||
| @@ -60,7 +60,7 @@ | |||
| 60 | /* ======================== Module parameters ======================== */ | 60 | /* ======================== Module parameters ======================== */ |
| 61 | 61 | ||
| 62 | 62 | ||
| 63 | MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>, Jose Orlando Pereira <jop@di.uminho.pt>"); | 63 | MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>"); |
| 64 | MODULE_DESCRIPTION("Bluetooth driver for the 3Com Bluetooth PCMCIA card"); | 64 | MODULE_DESCRIPTION("Bluetooth driver for the 3Com Bluetooth PCMCIA card"); |
| 65 | MODULE_LICENSE("GPL"); | 65 | MODULE_LICENSE("GPL"); |
| 66 | MODULE_FIRMWARE("BT3CPCC.bin"); | 66 | MODULE_FIRMWARE("BT3CPCC.bin"); |
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 95ae9ba5661e..6a010681ecf3 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | * | 2 | * |
| 3 | * Generic Bluetooth USB driver | 3 | * Generic Bluetooth USB driver |
| 4 | * | 4 | * |
| 5 | * Copyright (C) 2005-2007 Marcel Holtmann <marcel@holtmann.org> | 5 | * Copyright (C) 2005-2008 Marcel Holtmann <marcel@holtmann.org> |
| 6 | * | 6 | * |
| 7 | * | 7 | * |
| 8 | * This program is free software; you can redistribute it and/or modify | 8 | * This program is free software; you can redistribute it and/or modify |
| @@ -41,7 +41,7 @@ | |||
| 41 | #define BT_DBG(D...) | 41 | #define BT_DBG(D...) |
| 42 | #endif | 42 | #endif |
| 43 | 43 | ||
| 44 | #define VERSION "0.2" | 44 | #define VERSION "0.3" |
| 45 | 45 | ||
| 46 | static int ignore_dga; | 46 | static int ignore_dga; |
| 47 | static int ignore_csr; | 47 | static int ignore_csr; |
| @@ -160,12 +160,16 @@ static struct usb_device_id blacklist_table[] = { | |||
| 160 | { } /* Terminating entry */ | 160 | { } /* Terminating entry */ |
| 161 | }; | 161 | }; |
| 162 | 162 | ||
| 163 | #define BTUSB_MAX_ISOC_FRAMES 10 | ||
| 164 | |||
| 163 | #define BTUSB_INTR_RUNNING 0 | 165 | #define BTUSB_INTR_RUNNING 0 |
| 164 | #define BTUSB_BULK_RUNNING 1 | 166 | #define BTUSB_BULK_RUNNING 1 |
| 167 | #define BTUSB_ISOC_RUNNING 2 | ||
| 165 | 168 | ||
| 166 | struct btusb_data { | 169 | struct btusb_data { |
| 167 | struct hci_dev *hdev; | 170 | struct hci_dev *hdev; |
| 168 | struct usb_device *udev; | 171 | struct usb_device *udev; |
| 172 | struct usb_interface *isoc; | ||
| 169 | 173 | ||
| 170 | spinlock_t lock; | 174 | spinlock_t lock; |
| 171 | 175 | ||
| @@ -176,10 +180,15 @@ struct btusb_data { | |||
| 176 | struct usb_anchor tx_anchor; | 180 | struct usb_anchor tx_anchor; |
| 177 | struct usb_anchor intr_anchor; | 181 | struct usb_anchor intr_anchor; |
| 178 | struct usb_anchor bulk_anchor; | 182 | struct usb_anchor bulk_anchor; |
| 183 | struct usb_anchor isoc_anchor; | ||
| 179 | 184 | ||
| 180 | struct usb_endpoint_descriptor *intr_ep; | 185 | struct usb_endpoint_descriptor *intr_ep; |
| 181 | struct usb_endpoint_descriptor *bulk_tx_ep; | 186 | struct usb_endpoint_descriptor *bulk_tx_ep; |
| 182 | struct usb_endpoint_descriptor *bulk_rx_ep; | 187 | struct usb_endpoint_descriptor *bulk_rx_ep; |
| 188 | struct usb_endpoint_descriptor *isoc_tx_ep; | ||
| 189 | struct usb_endpoint_descriptor *isoc_rx_ep; | ||
| 190 | |||
| 191 | int isoc_altsetting; | ||
| 183 | }; | 192 | }; |
| 184 | 193 | ||
| 185 | static void btusb_intr_complete(struct urb *urb) | 194 | static void btusb_intr_complete(struct urb *urb) |
| @@ -195,6 +204,8 @@ static void btusb_intr_complete(struct urb *urb) | |||
| 195 | return; | 204 | return; |
| 196 | 205 | ||
| 197 | if (urb->status == 0) { | 206 | if (urb->status == 0) { |
| 207 | hdev->stat.byte_rx += urb->actual_length; | ||
| 208 | |||
| 198 | if (hci_recv_fragment(hdev, HCI_EVENT_PKT, | 209 | if (hci_recv_fragment(hdev, HCI_EVENT_PKT, |
| 199 | urb->transfer_buffer, | 210 | urb->transfer_buffer, |
| 200 | urb->actual_length) < 0) { | 211 | urb->actual_length) < 0) { |
| @@ -216,7 +227,7 @@ static void btusb_intr_complete(struct urb *urb) | |||
| 216 | } | 227 | } |
| 217 | } | 228 | } |
| 218 | 229 | ||
| 219 | static inline int btusb_submit_intr_urb(struct hci_dev *hdev) | 230 | static int btusb_submit_intr_urb(struct hci_dev *hdev) |
| 220 | { | 231 | { |
| 221 | struct btusb_data *data = hdev->driver_data; | 232 | struct btusb_data *data = hdev->driver_data; |
| 222 | struct urb *urb; | 233 | struct urb *urb; |
| @@ -226,6 +237,9 @@ static inline int btusb_submit_intr_urb(struct hci_dev *hdev) | |||
| 226 | 237 | ||
| 227 | BT_DBG("%s", hdev->name); | 238 | BT_DBG("%s", hdev->name); |
| 228 | 239 | ||
| 240 | if (!data->intr_ep) | ||
| 241 | return -ENODEV; | ||
| 242 | |||
| 229 | urb = usb_alloc_urb(0, GFP_ATOMIC); | 243 | urb = usb_alloc_urb(0, GFP_ATOMIC); |
| 230 | if (!urb) | 244 | if (!urb) |
| 231 | return -ENOMEM; | 245 | return -ENOMEM; |
| @@ -274,6 +288,8 @@ static void btusb_bulk_complete(struct urb *urb) | |||
| 274 | return; | 288 | return; |
| 275 | 289 | ||
| 276 | if (urb->status == 0) { | 290 | if (urb->status == 0) { |
| 291 | hdev->stat.byte_rx += urb->actual_length; | ||
| 292 | |||
| 277 | if (hci_recv_fragment(hdev, HCI_ACLDATA_PKT, | 293 | if (hci_recv_fragment(hdev, HCI_ACLDATA_PKT, |
| 278 | urb->transfer_buffer, | 294 | urb->transfer_buffer, |
| 279 | urb->actual_length) < 0) { | 295 | urb->actual_length) < 0) { |
| @@ -295,7 +311,7 @@ static void btusb_bulk_complete(struct urb *urb) | |||
| 295 | } | 311 | } |
| 296 | } | 312 | } |
| 297 | 313 | ||
| 298 | static inline int btusb_submit_bulk_urb(struct hci_dev *hdev) | 314 | static int btusb_submit_bulk_urb(struct hci_dev *hdev) |
| 299 | { | 315 | { |
| 300 | struct btusb_data *data = hdev->driver_data; | 316 | struct btusb_data *data = hdev->driver_data; |
| 301 | struct urb *urb; | 317 | struct urb *urb; |
| @@ -305,6 +321,9 @@ static inline int btusb_submit_bulk_urb(struct hci_dev *hdev) | |||
| 305 | 321 | ||
| 306 | BT_DBG("%s", hdev->name); | 322 | BT_DBG("%s", hdev->name); |
| 307 | 323 | ||
| 324 | if (!data->bulk_rx_ep) | ||
| 325 | return -ENODEV; | ||
| 326 | |||
| 308 | urb = usb_alloc_urb(0, GFP_KERNEL); | 327 | urb = usb_alloc_urb(0, GFP_KERNEL); |
| 309 | if (!urb) | 328 | if (!urb) |
| 310 | return -ENOMEM; | 329 | return -ENOMEM; |
| @@ -339,6 +358,127 @@ static inline int btusb_submit_bulk_urb(struct hci_dev *hdev) | |||
| 339 | return err; | 358 | return err; |
| 340 | } | 359 | } |
| 341 | 360 | ||
| 361 | static void btusb_isoc_complete(struct urb *urb) | ||
| 362 | { | ||
| 363 | struct hci_dev *hdev = urb->context; | ||
| 364 | struct btusb_data *data = hdev->driver_data; | ||
| 365 | int i, err; | ||
| 366 | |||
| 367 | BT_DBG("%s urb %p status %d count %d", hdev->name, | ||
| 368 | urb, urb->status, urb->actual_length); | ||
| 369 | |||
| 370 | if (!test_bit(HCI_RUNNING, &hdev->flags)) | ||
| 371 | return; | ||
| 372 | |||
| 373 | if (urb->status == 0) { | ||
| 374 | for (i = 0; i < urb->number_of_packets; i++) { | ||
| 375 | unsigned int offset = urb->iso_frame_desc[i].offset; | ||
| 376 | unsigned int length = urb->iso_frame_desc[i].actual_length; | ||
| 377 | |||
| 378 | if (urb->iso_frame_desc[i].status) | ||
| 379 | continue; | ||
| 380 | |||
| 381 | hdev->stat.byte_rx += length; | ||
| 382 | |||
| 383 | if (hci_recv_fragment(hdev, HCI_SCODATA_PKT, | ||
| 384 | urb->transfer_buffer + offset, | ||
| 385 | length) < 0) { | ||
| 386 | BT_ERR("%s corrupted SCO packet", hdev->name); | ||
| 387 | hdev->stat.err_rx++; | ||
| 388 | } | ||
| 389 | } | ||
| 390 | } | ||
| 391 | |||
| 392 | if (!test_bit(BTUSB_ISOC_RUNNING, &data->flags)) | ||
| 393 | return; | ||
| 394 | |||
| 395 | usb_anchor_urb(urb, &data->isoc_anchor); | ||
| 396 | |||
| 397 | err = usb_submit_urb(urb, GFP_ATOMIC); | ||
| 398 | if (err < 0) { | ||
| 399 | BT_ERR("%s urb %p failed to resubmit (%d)", | ||
| 400 | hdev->name, urb, -err); | ||
| 401 | usb_unanchor_urb(urb); | ||
| 402 | } | ||
| 403 | } | ||
| 404 | |||
| 405 | static void inline __fill_isoc_descriptor(struct urb *urb, int len, int mtu) | ||
| 406 | { | ||
| 407 | int i, offset = 0; | ||
| 408 | |||
| 409 | BT_DBG("len %d mtu %d", len, mtu); | ||
| 410 | |||
| 411 | for (i = 0; i < BTUSB_MAX_ISOC_FRAMES && len >= mtu; | ||
| 412 | i++, offset += mtu, len -= mtu) { | ||
| 413 | urb->iso_frame_desc[i].offset = offset; | ||
| 414 | urb->iso_frame_desc[i].length = mtu; | ||
| 415 | } | ||
| 416 | |||
| 417 | if (len && i < BTUSB_MAX_ISOC_FRAMES) { | ||
| 418 | urb->iso_frame_desc[i].offset = offset; | ||
| 419 | urb->iso_frame_desc[i].length = len; | ||
| 420 | i++; | ||
| 421 | } | ||
| 422 | |||
| 423 | urb->number_of_packets = i; | ||
| 424 | } | ||
| 425 | |||
| 426 | static int btusb_submit_isoc_urb(struct hci_dev *hdev) | ||
| 427 | { | ||
| 428 | struct btusb_data *data = hdev->driver_data; | ||
| 429 | struct urb *urb; | ||
| 430 | unsigned char *buf; | ||
| 431 | unsigned int pipe; | ||
| 432 | int err, size; | ||
| 433 | |||
| 434 | BT_DBG("%s", hdev->name); | ||
| 435 | |||
| 436 | if (!data->isoc_rx_ep) | ||
| 437 | return -ENODEV; | ||
| 438 | |||
| 439 | urb = usb_alloc_urb(BTUSB_MAX_ISOC_FRAMES, GFP_KERNEL); | ||
| 440 | if (!urb) | ||
| 441 | return -ENOMEM; | ||
| 442 | |||
| 443 | size = le16_to_cpu(data->isoc_rx_ep->wMaxPacketSize) * | ||
| 444 | BTUSB_MAX_ISOC_FRAMES; | ||
| 445 | |||
| 446 | buf = kmalloc(size, GFP_KERNEL); | ||
| 447 | if (!buf) { | ||
| 448 | usb_free_urb(urb); | ||
| 449 | return -ENOMEM; | ||
| 450 | } | ||
| 451 | |||
| 452 | pipe = usb_rcvisocpipe(data->udev, data->isoc_rx_ep->bEndpointAddress); | ||
| 453 | |||
| 454 | urb->dev = data->udev; | ||
| 455 | urb->pipe = pipe; | ||
| 456 | urb->context = hdev; | ||
| 457 | urb->complete = btusb_isoc_complete; | ||
| 458 | urb->interval = data->isoc_rx_ep->bInterval; | ||
| 459 | |||
| 460 | urb->transfer_flags = URB_FREE_BUFFER | URB_ISO_ASAP; | ||
| 461 | urb->transfer_buffer = buf; | ||
| 462 | urb->transfer_buffer_length = size; | ||
| 463 | |||
| 464 | __fill_isoc_descriptor(urb, size, | ||
| 465 | le16_to_cpu(data->isoc_rx_ep->wMaxPacketSize)); | ||
| 466 | |||
| 467 | usb_anchor_urb(urb, &data->isoc_anchor); | ||
| 468 | |||
| 469 | err = usb_submit_urb(urb, GFP_KERNEL); | ||
| 470 | if (err < 0) { | ||
| 471 | BT_ERR("%s urb %p submission failed (%d)", | ||
| 472 | hdev->name, urb, -err); | ||
| 473 | usb_unanchor_urb(urb); | ||
| 474 | kfree(buf); | ||
| 475 | } | ||
| 476 | |||
| 477 | usb_free_urb(urb); | ||
| 478 | |||
| 479 | return err; | ||
| 480 | } | ||
| 481 | |||
| 342 | static void btusb_tx_complete(struct urb *urb) | 482 | static void btusb_tx_complete(struct urb *urb) |
| 343 | { | 483 | { |
| 344 | struct sk_buff *skb = urb->context; | 484 | struct sk_buff *skb = urb->context; |
| @@ -392,6 +532,9 @@ static int btusb_close(struct hci_dev *hdev) | |||
| 392 | if (!test_and_clear_bit(HCI_RUNNING, &hdev->flags)) | 532 | if (!test_and_clear_bit(HCI_RUNNING, &hdev->flags)) |
| 393 | return 0; | 533 | return 0; |
| 394 | 534 | ||
| 535 | clear_bit(BTUSB_ISOC_RUNNING, &data->flags); | ||
| 536 | usb_kill_anchored_urbs(&data->intr_anchor); | ||
| 537 | |||
| 395 | clear_bit(BTUSB_BULK_RUNNING, &data->flags); | 538 | clear_bit(BTUSB_BULK_RUNNING, &data->flags); |
| 396 | usb_kill_anchored_urbs(&data->bulk_anchor); | 539 | usb_kill_anchored_urbs(&data->bulk_anchor); |
| 397 | 540 | ||
| @@ -453,6 +596,9 @@ static int btusb_send_frame(struct sk_buff *skb) | |||
| 453 | break; | 596 | break; |
| 454 | 597 | ||
| 455 | case HCI_ACLDATA_PKT: | 598 | case HCI_ACLDATA_PKT: |
| 599 | if (!data->bulk_tx_ep || hdev->conn_hash.acl_num < 1) | ||
| 600 | return -ENODEV; | ||
| 601 | |||
| 456 | urb = usb_alloc_urb(0, GFP_ATOMIC); | 602 | urb = usb_alloc_urb(0, GFP_ATOMIC); |
| 457 | if (!urb) | 603 | if (!urb) |
| 458 | return -ENOMEM; | 604 | return -ENOMEM; |
| @@ -467,9 +613,31 @@ static int btusb_send_frame(struct sk_buff *skb) | |||
| 467 | break; | 613 | break; |
| 468 | 614 | ||
| 469 | case HCI_SCODATA_PKT: | 615 | case HCI_SCODATA_PKT: |
| 616 | if (!data->isoc_tx_ep || hdev->conn_hash.sco_num < 1) | ||
| 617 | return -ENODEV; | ||
| 618 | |||
| 619 | urb = usb_alloc_urb(BTUSB_MAX_ISOC_FRAMES, GFP_ATOMIC); | ||
| 620 | if (!urb) | ||
| 621 | return -ENOMEM; | ||
| 622 | |||
| 623 | pipe = usb_sndisocpipe(data->udev, | ||
| 624 | data->isoc_tx_ep->bEndpointAddress); | ||
| 625 | |||
| 626 | urb->dev = data->udev; | ||
| 627 | urb->pipe = pipe; | ||
| 628 | urb->context = skb; | ||
| 629 | urb->complete = btusb_tx_complete; | ||
| 630 | urb->interval = data->isoc_tx_ep->bInterval; | ||
| 631 | |||
| 632 | urb->transfer_flags = URB_ISO_ASAP; | ||
| 633 | urb->transfer_buffer = skb->data; | ||
| 634 | urb->transfer_buffer_length = skb->len; | ||
| 635 | |||
| 636 | __fill_isoc_descriptor(urb, skb->len, | ||
| 637 | le16_to_cpu(data->isoc_tx_ep->wMaxPacketSize)); | ||
| 638 | |||
| 470 | hdev->stat.sco_tx++; | 639 | hdev->stat.sco_tx++; |
| 471 | kfree_skb(skb); | 640 | break; |
| 472 | return 0; | ||
| 473 | 641 | ||
| 474 | default: | 642 | default: |
| 475 | return -EILSEQ; | 643 | return -EILSEQ; |
| @@ -508,22 +676,86 @@ static void btusb_notify(struct hci_dev *hdev, unsigned int evt) | |||
| 508 | schedule_work(&data->work); | 676 | schedule_work(&data->work); |
| 509 | } | 677 | } |
| 510 | 678 | ||
| 679 | static int inline __set_isoc_interface(struct hci_dev *hdev, int altsetting) | ||
| 680 | { | ||
| 681 | struct btusb_data *data = hdev->driver_data; | ||
| 682 | struct usb_interface *intf = data->isoc; | ||
| 683 | struct usb_endpoint_descriptor *ep_desc; | ||
| 684 | int i, err; | ||
| 685 | |||
| 686 | if (!data->isoc) | ||
| 687 | return -ENODEV; | ||
| 688 | |||
| 689 | err = usb_set_interface(data->udev, 1, altsetting); | ||
| 690 | if (err < 0) { | ||
| 691 | BT_ERR("%s setting interface failed (%d)", hdev->name, -err); | ||
| 692 | return err; | ||
| 693 | } | ||
| 694 | |||
| 695 | data->isoc_altsetting = altsetting; | ||
| 696 | |||
| 697 | data->isoc_tx_ep = NULL; | ||
| 698 | data->isoc_rx_ep = NULL; | ||
| 699 | |||
| 700 | for (i = 0; i < intf->cur_altsetting->desc.bNumEndpoints; i++) { | ||
| 701 | ep_desc = &intf->cur_altsetting->endpoint[i].desc; | ||
| 702 | |||
| 703 | if (!data->isoc_tx_ep && usb_endpoint_is_isoc_out(ep_desc)) { | ||
| 704 | data->isoc_tx_ep = ep_desc; | ||
| 705 | continue; | ||
| 706 | } | ||
| 707 | |||
| 708 | if (!data->isoc_rx_ep && usb_endpoint_is_isoc_in(ep_desc)) { | ||
| 709 | data->isoc_rx_ep = ep_desc; | ||
| 710 | continue; | ||
| 711 | } | ||
| 712 | } | ||
| 713 | |||
| 714 | if (!data->isoc_tx_ep || !data->isoc_rx_ep) { | ||
| 715 | BT_ERR("%s invalid SCO descriptors", hdev->name); | ||
| 716 | return -ENODEV; | ||
| 717 | } | ||
| 718 | |||
| 719 | return 0; | ||
| 720 | } | ||
| 721 | |||
| 511 | static void btusb_work(struct work_struct *work) | 722 | static void btusb_work(struct work_struct *work) |
| 512 | { | 723 | { |
| 513 | struct btusb_data *data = container_of(work, struct btusb_data, work); | 724 | struct btusb_data *data = container_of(work, struct btusb_data, work); |
| 514 | struct hci_dev *hdev = data->hdev; | 725 | struct hci_dev *hdev = data->hdev; |
| 515 | 726 | ||
| 516 | if (hdev->conn_hash.acl_num == 0) { | 727 | if (hdev->conn_hash.acl_num > 0) { |
| 728 | if (!test_and_set_bit(BTUSB_BULK_RUNNING, &data->flags)) { | ||
| 729 | if (btusb_submit_bulk_urb(hdev) < 0) | ||
| 730 | clear_bit(BTUSB_BULK_RUNNING, &data->flags); | ||
| 731 | else | ||
| 732 | btusb_submit_bulk_urb(hdev); | ||
| 733 | } | ||
| 734 | } else { | ||
| 517 | clear_bit(BTUSB_BULK_RUNNING, &data->flags); | 735 | clear_bit(BTUSB_BULK_RUNNING, &data->flags); |
| 518 | usb_kill_anchored_urbs(&data->bulk_anchor); | 736 | usb_kill_anchored_urbs(&data->bulk_anchor); |
| 519 | return; | ||
| 520 | } | 737 | } |
| 521 | 738 | ||
| 522 | if (!test_and_set_bit(BTUSB_BULK_RUNNING, &data->flags)) { | 739 | if (hdev->conn_hash.sco_num > 0) { |
| 523 | if (btusb_submit_bulk_urb(hdev) < 0) | 740 | if (data->isoc_altsetting != 2) { |
| 524 | clear_bit(BTUSB_BULK_RUNNING, &data->flags); | 741 | clear_bit(BTUSB_ISOC_RUNNING, &data->flags); |
| 525 | else | 742 | usb_kill_anchored_urbs(&data->isoc_anchor); |
| 526 | btusb_submit_bulk_urb(hdev); | 743 | |
| 744 | if (__set_isoc_interface(hdev, 2) < 0) | ||
| 745 | return; | ||
| 746 | } | ||
| 747 | |||
| 748 | if (!test_and_set_bit(BTUSB_ISOC_RUNNING, &data->flags)) { | ||
| 749 | if (btusb_submit_isoc_urb(hdev) < 0) | ||
| 750 | clear_bit(BTUSB_ISOC_RUNNING, &data->flags); | ||
| 751 | else | ||
| 752 | btusb_submit_isoc_urb(hdev); | ||
| 753 | } | ||
| 754 | } else { | ||
| 755 | clear_bit(BTUSB_ISOC_RUNNING, &data->flags); | ||
| 756 | usb_kill_anchored_urbs(&data->isoc_anchor); | ||
| 757 | |||
| 758 | __set_isoc_interface(hdev, 0); | ||
| 527 | } | 759 | } |
| 528 | } | 760 | } |
| 529 | 761 | ||
| @@ -597,6 +829,7 @@ static int btusb_probe(struct usb_interface *intf, | |||
| 597 | init_usb_anchor(&data->tx_anchor); | 829 | init_usb_anchor(&data->tx_anchor); |
| 598 | init_usb_anchor(&data->intr_anchor); | 830 | init_usb_anchor(&data->intr_anchor); |
| 599 | init_usb_anchor(&data->bulk_anchor); | 831 | init_usb_anchor(&data->bulk_anchor); |
| 832 | init_usb_anchor(&data->isoc_anchor); | ||
| 600 | 833 | ||
| 601 | hdev = hci_alloc_dev(); | 834 | hdev = hci_alloc_dev(); |
| 602 | if (!hdev) { | 835 | if (!hdev) { |
| @@ -620,6 +853,9 @@ static int btusb_probe(struct usb_interface *intf, | |||
| 620 | 853 | ||
| 621 | hdev->owner = THIS_MODULE; | 854 | hdev->owner = THIS_MODULE; |
| 622 | 855 | ||
| 856 | /* interface numbers are hardcoded in the spec */ | ||
| 857 | data->isoc = usb_ifnum_to_if(data->udev, 1); | ||
| 858 | |||
| 623 | if (reset || id->driver_info & BTUSB_RESET) | 859 | if (reset || id->driver_info & BTUSB_RESET) |
| 624 | set_bit(HCI_QUIRK_RESET_ON_INIT, &hdev->quirks); | 860 | set_bit(HCI_QUIRK_RESET_ON_INIT, &hdev->quirks); |
| 625 | 861 | ||
| @@ -628,11 +864,16 @@ static int btusb_probe(struct usb_interface *intf, | |||
| 628 | set_bit(HCI_QUIRK_FIXUP_BUFFER_SIZE, &hdev->quirks); | 864 | set_bit(HCI_QUIRK_FIXUP_BUFFER_SIZE, &hdev->quirks); |
| 629 | } | 865 | } |
| 630 | 866 | ||
| 867 | if (id->driver_info & BTUSB_BROKEN_ISOC) | ||
| 868 | data->isoc = NULL; | ||
| 869 | |||
| 631 | if (id->driver_info & BTUSB_SNIFFER) { | 870 | if (id->driver_info & BTUSB_SNIFFER) { |
| 632 | struct usb_device *udev = interface_to_usbdev(intf); | 871 | struct usb_device *udev = data->udev; |
| 633 | 872 | ||
| 634 | if (le16_to_cpu(udev->descriptor.bcdDevice) > 0x997) | 873 | if (le16_to_cpu(udev->descriptor.bcdDevice) > 0x997) |
| 635 | set_bit(HCI_QUIRK_RAW_DEVICE, &hdev->quirks); | 874 | set_bit(HCI_QUIRK_RAW_DEVICE, &hdev->quirks); |
| 875 | |||
| 876 | data->isoc = NULL; | ||
| 636 | } | 877 | } |
| 637 | 878 | ||
| 638 | if (id->driver_info & BTUSB_BCM92035) { | 879 | if (id->driver_info & BTUSB_BCM92035) { |
| @@ -646,6 +887,16 @@ static int btusb_probe(struct usb_interface *intf, | |||
| 646 | } | 887 | } |
| 647 | } | 888 | } |
| 648 | 889 | ||
| 890 | if (data->isoc) { | ||
| 891 | err = usb_driver_claim_interface(&btusb_driver, | ||
| 892 | data->isoc, NULL); | ||
| 893 | if (err < 0) { | ||
| 894 | hci_free_dev(hdev); | ||
| 895 | kfree(data); | ||
| 896 | return err; | ||
| 897 | } | ||
| 898 | } | ||
| 899 | |||
| 649 | err = hci_register_dev(hdev); | 900 | err = hci_register_dev(hdev); |
| 650 | if (err < 0) { | 901 | if (err < 0) { |
| 651 | hci_free_dev(hdev); | 902 | hci_free_dev(hdev); |
| @@ -670,6 +921,9 @@ static void btusb_disconnect(struct usb_interface *intf) | |||
| 670 | 921 | ||
| 671 | hdev = data->hdev; | 922 | hdev = data->hdev; |
| 672 | 923 | ||
| 924 | if (data->isoc) | ||
| 925 | usb_driver_release_interface(&btusb_driver, data->isoc); | ||
| 926 | |||
| 673 | usb_set_intfdata(intf, NULL); | 927 | usb_set_intfdata(intf, NULL); |
| 674 | 928 | ||
| 675 | hci_unregister_dev(hdev); | 929 | hci_unregister_dev(hdev); |
diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c index 69df187d74ce..8dfcf77cb717 100644 --- a/drivers/bluetooth/hci_ldisc.c +++ b/drivers/bluetooth/hci_ldisc.c | |||
| @@ -577,7 +577,7 @@ module_exit(hci_uart_exit); | |||
| 577 | module_param(reset, bool, 0644); | 577 | module_param(reset, bool, 0644); |
| 578 | MODULE_PARM_DESC(reset, "Send HCI reset command on initialization"); | 578 | MODULE_PARM_DESC(reset, "Send HCI reset command on initialization"); |
| 579 | 579 | ||
| 580 | MODULE_AUTHOR("Maxim Krasnyansky <maxk@qualcomm.com>, Marcel Holtmann <marcel@holtmann.org>"); | 580 | MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>"); |
| 581 | MODULE_DESCRIPTION("Bluetooth HCI UART driver ver " VERSION); | 581 | MODULE_DESCRIPTION("Bluetooth HCI UART driver ver " VERSION); |
| 582 | MODULE_VERSION(VERSION); | 582 | MODULE_VERSION(VERSION); |
| 583 | MODULE_LICENSE("GPL"); | 583 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/bluetooth/hci_usb.c b/drivers/bluetooth/hci_usb.c index e397572bf574..3c453924f838 100644 --- a/drivers/bluetooth/hci_usb.c +++ b/drivers/bluetooth/hci_usb.c | |||
| @@ -1130,7 +1130,7 @@ module_param(isoc, int, 0644); | |||
| 1130 | MODULE_PARM_DESC(isoc, "Set isochronous transfers for SCO over HCI support"); | 1130 | MODULE_PARM_DESC(isoc, "Set isochronous transfers for SCO over HCI support"); |
| 1131 | #endif | 1131 | #endif |
| 1132 | 1132 | ||
| 1133 | MODULE_AUTHOR("Maxim Krasnyansky <maxk@qualcomm.com>, Marcel Holtmann <marcel@holtmann.org>"); | 1133 | MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>"); |
| 1134 | MODULE_DESCRIPTION("Bluetooth HCI USB driver ver " VERSION); | 1134 | MODULE_DESCRIPTION("Bluetooth HCI USB driver ver " VERSION); |
| 1135 | MODULE_VERSION(VERSION); | 1135 | MODULE_VERSION(VERSION); |
| 1136 | MODULE_LICENSE("GPL"); | 1136 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c index d97700aa54a9..7320a71b6368 100644 --- a/drivers/bluetooth/hci_vhci.c +++ b/drivers/bluetooth/hci_vhci.c | |||
| @@ -377,7 +377,7 @@ module_exit(vhci_exit); | |||
| 377 | module_param(minor, int, 0444); | 377 | module_param(minor, int, 0444); |
| 378 | MODULE_PARM_DESC(minor, "Miscellaneous minor device number"); | 378 | MODULE_PARM_DESC(minor, "Miscellaneous minor device number"); |
| 379 | 379 | ||
| 380 | MODULE_AUTHOR("Maxim Krasnyansky <maxk@qualcomm.com>, Marcel Holtmann <marcel@holtmann.org>"); | 380 | MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>"); |
| 381 | MODULE_DESCRIPTION("Bluetooth virtual HCI driver ver " VERSION); | 381 | MODULE_DESCRIPTION("Bluetooth virtual HCI driver ver " VERSION); |
| 382 | MODULE_VERSION(VERSION); | 382 | MODULE_VERSION(VERSION); |
| 383 | MODULE_LICENSE("GPL"); | 383 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c index d9d1b65d206c..74031de517e6 100644 --- a/drivers/cdrom/cdrom.c +++ b/drivers/cdrom/cdrom.c | |||
| @@ -408,7 +408,6 @@ int register_cdrom(struct cdrom_device_info *cdi) | |||
| 408 | ENSURE(get_last_session, CDC_MULTI_SESSION); | 408 | ENSURE(get_last_session, CDC_MULTI_SESSION); |
| 409 | ENSURE(get_mcn, CDC_MCN); | 409 | ENSURE(get_mcn, CDC_MCN); |
| 410 | ENSURE(reset, CDC_RESET); | 410 | ENSURE(reset, CDC_RESET); |
| 411 | ENSURE(audio_ioctl, CDC_PLAY_AUDIO); | ||
| 412 | ENSURE(generic_packet, CDC_GENERIC_PACKET); | 411 | ENSURE(generic_packet, CDC_GENERIC_PACKET); |
| 413 | cdi->mc_flags = 0; | 412 | cdi->mc_flags = 0; |
| 414 | cdo->n_minors = 0; | 413 | cdo->n_minors = 0; |
| @@ -2506,8 +2505,6 @@ static int cdrom_ioctl_get_subchnl(struct cdrom_device_info *cdi, | |||
| 2506 | 2505 | ||
| 2507 | /* cdinfo(CD_DO_IOCTL,"entering CDROMSUBCHNL\n");*/ | 2506 | /* cdinfo(CD_DO_IOCTL,"entering CDROMSUBCHNL\n");*/ |
| 2508 | 2507 | ||
| 2509 | if (!CDROM_CAN(CDC_PLAY_AUDIO)) | ||
| 2510 | return -ENOSYS; | ||
| 2511 | if (copy_from_user(&q, argp, sizeof(q))) | 2508 | if (copy_from_user(&q, argp, sizeof(q))) |
| 2512 | return -EFAULT; | 2509 | return -EFAULT; |
| 2513 | 2510 | ||
| @@ -2538,8 +2535,6 @@ static int cdrom_ioctl_read_tochdr(struct cdrom_device_info *cdi, | |||
| 2538 | 2535 | ||
| 2539 | /* cdinfo(CD_DO_IOCTL, "entering CDROMREADTOCHDR\n"); */ | 2536 | /* cdinfo(CD_DO_IOCTL, "entering CDROMREADTOCHDR\n"); */ |
| 2540 | 2537 | ||
| 2541 | if (!CDROM_CAN(CDC_PLAY_AUDIO)) | ||
| 2542 | return -ENOSYS; | ||
| 2543 | if (copy_from_user(&header, argp, sizeof(header))) | 2538 | if (copy_from_user(&header, argp, sizeof(header))) |
| 2544 | return -EFAULT; | 2539 | return -EFAULT; |
| 2545 | 2540 | ||
| @@ -2562,8 +2557,6 @@ static int cdrom_ioctl_read_tocentry(struct cdrom_device_info *cdi, | |||
| 2562 | 2557 | ||
| 2563 | /* cdinfo(CD_DO_IOCTL, "entering CDROMREADTOCENTRY\n"); */ | 2558 | /* cdinfo(CD_DO_IOCTL, "entering CDROMREADTOCENTRY\n"); */ |
| 2564 | 2559 | ||
| 2565 | if (!CDROM_CAN(CDC_PLAY_AUDIO)) | ||
| 2566 | return -ENOSYS; | ||
| 2567 | if (copy_from_user(&entry, argp, sizeof(entry))) | 2560 | if (copy_from_user(&entry, argp, sizeof(entry))) |
| 2568 | return -EFAULT; | 2561 | return -EFAULT; |
| 2569 | 2562 | ||
diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c index 1e0455bd6df9..1231d95aa695 100644 --- a/drivers/cdrom/gdrom.c +++ b/drivers/cdrom/gdrom.c | |||
| @@ -471,6 +471,12 @@ cleanup_sense_final: | |||
| 471 | return err; | 471 | return err; |
| 472 | } | 472 | } |
| 473 | 473 | ||
| 474 | static int gdrom_audio_ioctl(struct cdrom_device_info *cdi, unsigned int cmd, | ||
| 475 | void *arg) | ||
| 476 | { | ||
| 477 | return -EINVAL; | ||
| 478 | } | ||
| 479 | |||
| 474 | static struct cdrom_device_ops gdrom_ops = { | 480 | static struct cdrom_device_ops gdrom_ops = { |
| 475 | .open = gdrom_open, | 481 | .open = gdrom_open, |
| 476 | .release = gdrom_release, | 482 | .release = gdrom_release, |
| @@ -478,6 +484,7 @@ static struct cdrom_device_ops gdrom_ops = { | |||
| 478 | .media_changed = gdrom_mediachanged, | 484 | .media_changed = gdrom_mediachanged, |
| 479 | .get_last_session = gdrom_get_last_session, | 485 | .get_last_session = gdrom_get_last_session, |
| 480 | .reset = gdrom_hardreset, | 486 | .reset = gdrom_hardreset, |
| 487 | .audio_ioctl = gdrom_audio_ioctl, | ||
| 481 | .capability = CDC_MULTI_SESSION | CDC_MEDIA_CHANGED | | 488 | .capability = CDC_MULTI_SESSION | CDC_MEDIA_CHANGED | |
| 482 | CDC_RESET | CDC_DRIVE_STATUS | CDC_CD_R, | 489 | CDC_RESET | CDC_DRIVE_STATUS | CDC_CD_R, |
| 483 | .n_minors = 1, | 490 | .n_minors = 1, |
diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c index 9d0dfe6e0d63..031e0e1a1a3b 100644 --- a/drivers/cdrom/viocd.c +++ b/drivers/cdrom/viocd.c | |||
| @@ -550,12 +550,19 @@ return_complete: | |||
| 550 | } | 550 | } |
| 551 | } | 551 | } |
| 552 | 552 | ||
| 553 | static int viocd_audio_ioctl(struct cdrom_device_info *cdi, unsigned int cmd, | ||
| 554 | void *arg) | ||
| 555 | { | ||
| 556 | return -EINVAL; | ||
| 557 | } | ||
| 558 | |||
| 553 | static struct cdrom_device_ops viocd_dops = { | 559 | static struct cdrom_device_ops viocd_dops = { |
| 554 | .open = viocd_open, | 560 | .open = viocd_open, |
| 555 | .release = viocd_release, | 561 | .release = viocd_release, |
| 556 | .media_changed = viocd_media_changed, | 562 | .media_changed = viocd_media_changed, |
| 557 | .lock_door = viocd_lock_door, | 563 | .lock_door = viocd_lock_door, |
| 558 | .generic_packet = viocd_packet, | 564 | .generic_packet = viocd_packet, |
| 565 | .audio_ioctl = viocd_audio_ioctl, | ||
| 559 | .capability = CDC_CLOSE_TRAY | CDC_OPEN_TRAY | CDC_LOCK | CDC_SELECT_SPEED | CDC_SELECT_DISC | CDC_MULTI_SESSION | CDC_MCN | CDC_MEDIA_CHANGED | CDC_PLAY_AUDIO | CDC_RESET | CDC_DRIVE_STATUS | CDC_GENERIC_PACKET | CDC_CD_R | CDC_CD_RW | CDC_DVD | CDC_DVD_R | CDC_DVD_RAM | CDC_RAM | 566 | .capability = CDC_CLOSE_TRAY | CDC_OPEN_TRAY | CDC_LOCK | CDC_SELECT_SPEED | CDC_SELECT_DISC | CDC_MULTI_SESSION | CDC_MCN | CDC_MEDIA_CHANGED | CDC_PLAY_AUDIO | CDC_RESET | CDC_DRIVE_STATUS | CDC_GENERIC_PACKET | CDC_CD_R | CDC_CD_RW | CDC_DVD | CDC_DVD_R | CDC_DVD_RAM | CDC_RAM |
| 560 | }; | 567 | }; |
| 561 | 568 | ||
diff --git a/drivers/char/agp/agp.h b/drivers/char/agp/agp.h index 81e14bea54bd..4bada0e8b812 100644 --- a/drivers/char/agp/agp.h +++ b/drivers/char/agp/agp.h | |||
| @@ -148,6 +148,9 @@ struct agp_bridge_data { | |||
| 148 | char minor_version; | 148 | char minor_version; |
| 149 | struct list_head list; | 149 | struct list_head list; |
| 150 | u32 apbase_config; | 150 | u32 apbase_config; |
| 151 | /* list of agp_memory mapped to the aperture */ | ||
| 152 | struct list_head mapped_list; | ||
| 153 | spinlock_t mapped_lock; | ||
| 151 | }; | 154 | }; |
| 152 | 155 | ||
| 153 | #define KB(x) ((x) * 1024) | 156 | #define KB(x) ((x) * 1024) |
diff --git a/drivers/char/agp/ali-agp.c b/drivers/char/agp/ali-agp.c index 1ffb381130c3..31dcd9142d54 100644 --- a/drivers/char/agp/ali-agp.c +++ b/drivers/char/agp/ali-agp.c | |||
| @@ -110,7 +110,8 @@ static int ali_configure(void) | |||
| 110 | 110 | ||
| 111 | nlvm_addr+= agp_bridge->gart_bus_addr; | 111 | nlvm_addr+= agp_bridge->gart_bus_addr; |
| 112 | nlvm_addr|=(agp_bridge->gart_bus_addr>>12); | 112 | nlvm_addr|=(agp_bridge->gart_bus_addr>>12); |
| 113 | printk(KERN_INFO PFX "nlvm top &base = %8x\n",nlvm_addr); | 113 | dev_info(&agp_bridge->dev->dev, "nlvm top &base = %8x\n", |
| 114 | nlvm_addr); | ||
| 114 | } | 115 | } |
| 115 | #endif | 116 | #endif |
| 116 | 117 | ||
| @@ -315,8 +316,8 @@ static int __devinit agp_ali_probe(struct pci_dev *pdev, | |||
| 315 | goto found; | 316 | goto found; |
| 316 | } | 317 | } |
| 317 | 318 | ||
| 318 | printk(KERN_ERR PFX "Unsupported ALi chipset (device id: %04x)\n", | 319 | dev_err(&pdev->dev, "unsupported ALi chipset [%04x/%04x])\n", |
| 319 | pdev->device); | 320 | pdev->vendor, pdev->device); |
| 320 | return -ENODEV; | 321 | return -ENODEV; |
| 321 | 322 | ||
| 322 | 323 | ||
| @@ -361,8 +362,7 @@ found: | |||
| 361 | bridge->driver = &ali_generic_bridge; | 362 | bridge->driver = &ali_generic_bridge; |
| 362 | } | 363 | } |
| 363 | 364 | ||
| 364 | printk(KERN_INFO PFX "Detected ALi %s chipset\n", | 365 | dev_info(&pdev->dev, "ALi %s chipset\n", devs[j].chipset_name); |
| 365 | devs[j].chipset_name); | ||
| 366 | 366 | ||
| 367 | /* Fill in the mode register */ | 367 | /* Fill in the mode register */ |
| 368 | pci_read_config_dword(pdev, | 368 | pci_read_config_dword(pdev, |
diff --git a/drivers/char/agp/amd-k7-agp.c b/drivers/char/agp/amd-k7-agp.c index 39a0718bc616..e280531843be 100644 --- a/drivers/char/agp/amd-k7-agp.c +++ b/drivers/char/agp/amd-k7-agp.c | |||
| @@ -419,8 +419,8 @@ static int __devinit agp_amdk7_probe(struct pci_dev *pdev, | |||
| 419 | return -ENODEV; | 419 | return -ENODEV; |
| 420 | 420 | ||
| 421 | j = ent - agp_amdk7_pci_table; | 421 | j = ent - agp_amdk7_pci_table; |
| 422 | printk(KERN_INFO PFX "Detected AMD %s chipset\n", | 422 | dev_info(&pdev->dev, "AMD %s chipset\n", |
| 423 | amd_agp_device_ids[j].chipset_name); | 423 | amd_agp_device_ids[j].chipset_name); |
| 424 | 424 | ||
| 425 | bridge = agp_alloc_bridge(); | 425 | bridge = agp_alloc_bridge(); |
| 426 | if (!bridge) | 426 | if (!bridge) |
| @@ -442,7 +442,7 @@ static int __devinit agp_amdk7_probe(struct pci_dev *pdev, | |||
| 442 | while (!cap_ptr) { | 442 | while (!cap_ptr) { |
| 443 | gfxcard = pci_get_class(PCI_CLASS_DISPLAY_VGA<<8, gfxcard); | 443 | gfxcard = pci_get_class(PCI_CLASS_DISPLAY_VGA<<8, gfxcard); |
| 444 | if (!gfxcard) { | 444 | if (!gfxcard) { |
| 445 | printk (KERN_INFO PFX "Couldn't find an AGP VGA controller.\n"); | 445 | dev_info(&pdev->dev, "no AGP VGA controller\n"); |
| 446 | return -ENODEV; | 446 | return -ENODEV; |
| 447 | } | 447 | } |
| 448 | cap_ptr = pci_find_capability(gfxcard, PCI_CAP_ID_AGP); | 448 | cap_ptr = pci_find_capability(gfxcard, PCI_CAP_ID_AGP); |
| @@ -453,7 +453,7 @@ static int __devinit agp_amdk7_probe(struct pci_dev *pdev, | |||
| 453 | (if necessary at all). */ | 453 | (if necessary at all). */ |
| 454 | if (gfxcard->vendor == PCI_VENDOR_ID_NVIDIA) { | 454 | if (gfxcard->vendor == PCI_VENDOR_ID_NVIDIA) { |
| 455 | agp_bridge->flags |= AGP_ERRATA_1X; | 455 | agp_bridge->flags |= AGP_ERRATA_1X; |
| 456 | printk (KERN_INFO PFX "AMD 751 chipset with NVidia GeForce detected. Forcing to 1X due to errata.\n"); | 456 | dev_info(&pdev->dev, "AMD 751 chipset with NVidia GeForce; forcing 1X due to errata\n"); |
| 457 | } | 457 | } |
| 458 | pci_dev_put(gfxcard); | 458 | pci_dev_put(gfxcard); |
| 459 | } | 459 | } |
| @@ -469,7 +469,7 @@ static int __devinit agp_amdk7_probe(struct pci_dev *pdev, | |||
| 469 | agp_bridge->flags = AGP_ERRATA_FASTWRITES; | 469 | agp_bridge->flags = AGP_ERRATA_FASTWRITES; |
| 470 | agp_bridge->flags |= AGP_ERRATA_SBA; | 470 | agp_bridge->flags |= AGP_ERRATA_SBA; |
| 471 | agp_bridge->flags |= AGP_ERRATA_1X; | 471 | agp_bridge->flags |= AGP_ERRATA_1X; |
| 472 | printk (KERN_INFO PFX "AMD 761 chipset with errata detected - disabling AGP fast writes & SBA and forcing to 1X.\n"); | 472 | dev_info(&pdev->dev, "AMD 761 chipset with errata; disabling AGP fast writes & SBA and forcing to 1X\n"); |
| 473 | } | 473 | } |
| 474 | } | 474 | } |
| 475 | 475 | ||
diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c index 481ffe87c716..7495c522d8e4 100644 --- a/drivers/char/agp/amd64-agp.c +++ b/drivers/char/agp/amd64-agp.c | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | 34 | ||
| 35 | static struct resource *aperture_resource; | 35 | static struct resource *aperture_resource; |
| 36 | static int __initdata agp_try_unsupported = 1; | 36 | static int __initdata agp_try_unsupported = 1; |
| 37 | static int agp_bridges_found; | ||
| 37 | 38 | ||
| 38 | static void amd64_tlbflush(struct agp_memory *temp) | 39 | static void amd64_tlbflush(struct agp_memory *temp) |
| 39 | { | 40 | { |
| @@ -293,12 +294,13 @@ static __devinit int fix_northbridge(struct pci_dev *nb, struct pci_dev *agp, | |||
| 293 | * so let double check that order, and lets trust the AMD NB settings | 294 | * so let double check that order, and lets trust the AMD NB settings |
| 294 | */ | 295 | */ |
| 295 | if (order >=0 && aper + (32ULL<<(20 + order)) > 0x100000000ULL) { | 296 | if (order >=0 && aper + (32ULL<<(20 + order)) > 0x100000000ULL) { |
| 296 | printk(KERN_INFO "Aperture size %u MB is not right, using settings from NB\n", | 297 | dev_info(&agp->dev, "aperture size %u MB is not right, using settings from NB\n", |
| 297 | 32 << order); | 298 | 32 << order); |
| 298 | order = nb_order; | 299 | order = nb_order; |
| 299 | } | 300 | } |
| 300 | 301 | ||
| 301 | printk(KERN_INFO PFX "Aperture from AGP @ %Lx size %u MB\n", aper, 32 << order); | 302 | dev_info(&agp->dev, "aperture from AGP @ %Lx size %u MB\n", |
| 303 | aper, 32 << order); | ||
| 302 | if (order < 0 || !agp_aperture_valid(aper, (32*1024*1024)<<order)) | 304 | if (order < 0 || !agp_aperture_valid(aper, (32*1024*1024)<<order)) |
| 303 | return -1; | 305 | return -1; |
| 304 | 306 | ||
| @@ -319,10 +321,10 @@ static __devinit int cache_nbs (struct pci_dev *pdev, u32 cap_ptr) | |||
| 319 | for (i = 0; i < num_k8_northbridges; i++) { | 321 | for (i = 0; i < num_k8_northbridges; i++) { |
| 320 | struct pci_dev *dev = k8_northbridges[i]; | 322 | struct pci_dev *dev = k8_northbridges[i]; |
| 321 | if (fix_northbridge(dev, pdev, cap_ptr) < 0) { | 323 | if (fix_northbridge(dev, pdev, cap_ptr) < 0) { |
| 322 | printk(KERN_ERR PFX "No usable aperture found.\n"); | 324 | dev_err(&dev->dev, "no usable aperture found\n"); |
| 323 | #ifdef __x86_64__ | 325 | #ifdef __x86_64__ |
| 324 | /* should port this to i386 */ | 326 | /* should port this to i386 */ |
| 325 | printk(KERN_ERR PFX "Consider rebooting with iommu=memaper=2 to get a good aperture.\n"); | 327 | dev_err(&dev->dev, "consider rebooting with iommu=memaper=2 to get a good aperture\n"); |
| 326 | #endif | 328 | #endif |
| 327 | return -1; | 329 | return -1; |
| 328 | } | 330 | } |
| @@ -345,14 +347,14 @@ static void __devinit amd8151_init(struct pci_dev *pdev, struct agp_bridge_data | |||
| 345 | default: revstring="??"; break; | 347 | default: revstring="??"; break; |
| 346 | } | 348 | } |
| 347 | 349 | ||
| 348 | printk (KERN_INFO PFX "Detected AMD 8151 AGP Bridge rev %s\n", revstring); | 350 | dev_info(&pdev->dev, "AMD 8151 AGP Bridge rev %s\n", revstring); |
| 349 | 351 | ||
| 350 | /* | 352 | /* |
| 351 | * Work around errata. | 353 | * Work around errata. |
| 352 | * Chips before B2 stepping incorrectly reporting v3.5 | 354 | * Chips before B2 stepping incorrectly reporting v3.5 |
| 353 | */ | 355 | */ |
| 354 | if (pdev->revision < 0x13) { | 356 | if (pdev->revision < 0x13) { |
| 355 | printk (KERN_INFO PFX "Correcting AGP revision (reports 3.5, is really 3.0)\n"); | 357 | dev_info(&pdev->dev, "correcting AGP revision (reports 3.5, is really 3.0)\n"); |
| 356 | bridge->major_version = 3; | 358 | bridge->major_version = 3; |
| 357 | bridge->minor_version = 0; | 359 | bridge->minor_version = 0; |
| 358 | } | 360 | } |
| @@ -375,11 +377,11 @@ static int __devinit uli_agp_init(struct pci_dev *pdev) | |||
| 375 | struct pci_dev *dev1; | 377 | struct pci_dev *dev1; |
| 376 | int i; | 378 | int i; |
| 377 | unsigned size = amd64_fetch_size(); | 379 | unsigned size = amd64_fetch_size(); |
| 378 | printk(KERN_INFO "Setting up ULi AGP.\n"); | 380 | |
| 381 | dev_info(&pdev->dev, "setting up ULi AGP\n"); | ||
| 379 | dev1 = pci_get_slot (pdev->bus,PCI_DEVFN(0,0)); | 382 | dev1 = pci_get_slot (pdev->bus,PCI_DEVFN(0,0)); |
| 380 | if (dev1 == NULL) { | 383 | if (dev1 == NULL) { |
| 381 | printk(KERN_INFO PFX "Detected a ULi chipset, " | 384 | dev_info(&pdev->dev, "can't find ULi secondary device\n"); |
| 382 | "but could not fine the secondary device.\n"); | ||
| 383 | return -ENODEV; | 385 | return -ENODEV; |
| 384 | } | 386 | } |
| 385 | 387 | ||
| @@ -388,7 +390,7 @@ static int __devinit uli_agp_init(struct pci_dev *pdev) | |||
| 388 | break; | 390 | break; |
| 389 | 391 | ||
| 390 | if (i == ARRAY_SIZE(uli_sizes)) { | 392 | if (i == ARRAY_SIZE(uli_sizes)) { |
| 391 | printk(KERN_INFO PFX "No ULi size found for %d\n", size); | 393 | dev_info(&pdev->dev, "no ULi size found for %d\n", size); |
| 392 | return -ENODEV; | 394 | return -ENODEV; |
| 393 | } | 395 | } |
| 394 | 396 | ||
| @@ -433,13 +435,11 @@ static int nforce3_agp_init(struct pci_dev *pdev) | |||
| 433 | int i; | 435 | int i; |
| 434 | unsigned size = amd64_fetch_size(); | 436 | unsigned size = amd64_fetch_size(); |
| 435 | 437 | ||
| 436 | printk(KERN_INFO PFX "Setting up Nforce3 AGP.\n"); | 438 | dev_info(&pdev->dev, "setting up Nforce3 AGP\n"); |
| 437 | 439 | ||
| 438 | dev1 = pci_get_slot(pdev->bus, PCI_DEVFN(11, 0)); | 440 | dev1 = pci_get_slot(pdev->bus, PCI_DEVFN(11, 0)); |
| 439 | if (dev1 == NULL) { | 441 | if (dev1 == NULL) { |
| 440 | printk(KERN_INFO PFX "agpgart: Detected an NVIDIA " | 442 | dev_info(&pdev->dev, "can't find Nforce3 secondary device\n"); |
| 441 | "nForce3 chipset, but could not find " | ||
| 442 | "the secondary device.\n"); | ||
| 443 | return -ENODEV; | 443 | return -ENODEV; |
| 444 | } | 444 | } |
| 445 | 445 | ||
| @@ -448,7 +448,7 @@ static int nforce3_agp_init(struct pci_dev *pdev) | |||
| 448 | break; | 448 | break; |
| 449 | 449 | ||
| 450 | if (i == ARRAY_SIZE(nforce3_sizes)) { | 450 | if (i == ARRAY_SIZE(nforce3_sizes)) { |
| 451 | printk(KERN_INFO PFX "No NForce3 size found for %d\n", size); | 451 | dev_info(&pdev->dev, "no NForce3 size found for %d\n", size); |
| 452 | return -ENODEV; | 452 | return -ENODEV; |
| 453 | } | 453 | } |
| 454 | 454 | ||
| @@ -462,7 +462,7 @@ static int nforce3_agp_init(struct pci_dev *pdev) | |||
| 462 | 462 | ||
| 463 | /* if x86-64 aperture base is beyond 4G, exit here */ | 463 | /* if x86-64 aperture base is beyond 4G, exit here */ |
| 464 | if ( (apbase & 0x7fff) >> (32 - 25) ) { | 464 | if ( (apbase & 0x7fff) >> (32 - 25) ) { |
| 465 | printk(KERN_INFO PFX "aperture base > 4G\n"); | 465 | dev_info(&pdev->dev, "aperture base > 4G\n"); |
| 466 | return -ENODEV; | 466 | return -ENODEV; |
| 467 | } | 467 | } |
| 468 | 468 | ||
| @@ -489,6 +489,7 @@ static int __devinit agp_amd64_probe(struct pci_dev *pdev, | |||
| 489 | { | 489 | { |
| 490 | struct agp_bridge_data *bridge; | 490 | struct agp_bridge_data *bridge; |
| 491 | u8 cap_ptr; | 491 | u8 cap_ptr; |
| 492 | int err; | ||
| 492 | 493 | ||
| 493 | cap_ptr = pci_find_capability(pdev, PCI_CAP_ID_AGP); | 494 | cap_ptr = pci_find_capability(pdev, PCI_CAP_ID_AGP); |
| 494 | if (!cap_ptr) | 495 | if (!cap_ptr) |
| @@ -504,7 +505,8 @@ static int __devinit agp_amd64_probe(struct pci_dev *pdev, | |||
| 504 | pdev->device == PCI_DEVICE_ID_AMD_8151_0) { | 505 | pdev->device == PCI_DEVICE_ID_AMD_8151_0) { |
| 505 | amd8151_init(pdev, bridge); | 506 | amd8151_init(pdev, bridge); |
| 506 | } else { | 507 | } else { |
| 507 | printk(KERN_INFO PFX "Detected AGP bridge %x\n", pdev->devfn); | 508 | dev_info(&pdev->dev, "AGP bridge [%04x/%04x]\n", |
| 509 | pdev->vendor, pdev->device); | ||
| 508 | } | 510 | } |
| 509 | 511 | ||
| 510 | bridge->driver = &amd_8151_driver; | 512 | bridge->driver = &amd_8151_driver; |
| @@ -536,7 +538,12 @@ static int __devinit agp_amd64_probe(struct pci_dev *pdev, | |||
| 536 | } | 538 | } |
| 537 | 539 | ||
| 538 | pci_set_drvdata(pdev, bridge); | 540 | pci_set_drvdata(pdev, bridge); |
| 539 | return agp_add_bridge(bridge); | 541 | err = agp_add_bridge(bridge); |
| 542 | if (err < 0) | ||
| 543 | return err; | ||
| 544 | |||
| 545 | agp_bridges_found++; | ||
| 546 | return 0; | ||
| 540 | } | 547 | } |
| 541 | 548 | ||
| 542 | static void __devexit agp_amd64_remove(struct pci_dev *pdev) | 549 | static void __devexit agp_amd64_remove(struct pci_dev *pdev) |
| @@ -713,7 +720,11 @@ int __init agp_amd64_init(void) | |||
| 713 | 720 | ||
| 714 | if (agp_off) | 721 | if (agp_off) |
| 715 | return -EINVAL; | 722 | return -EINVAL; |
| 716 | if (pci_register_driver(&agp_amd64_pci_driver) < 0) { | 723 | err = pci_register_driver(&agp_amd64_pci_driver); |
| 724 | if (err < 0) | ||
| 725 | return err; | ||
| 726 | |||
| 727 | if (agp_bridges_found == 0) { | ||
| 717 | struct pci_dev *dev; | 728 | struct pci_dev *dev; |
| 718 | if (!agp_try_unsupported && !agp_try_unsupported_boot) { | 729 | if (!agp_try_unsupported && !agp_try_unsupported_boot) { |
| 719 | printk(KERN_INFO PFX "No supported AGP bridge found.\n"); | 730 | printk(KERN_INFO PFX "No supported AGP bridge found.\n"); |
diff --git a/drivers/char/agp/ati-agp.c b/drivers/char/agp/ati-agp.c index 3a4566c0d84f..6ecbcafb34b1 100644 --- a/drivers/char/agp/ati-agp.c +++ b/drivers/char/agp/ati-agp.c | |||
| @@ -486,8 +486,8 @@ static int __devinit agp_ati_probe(struct pci_dev *pdev, | |||
| 486 | goto found; | 486 | goto found; |
| 487 | } | 487 | } |
| 488 | 488 | ||
| 489 | printk(KERN_ERR PFX | 489 | dev_err(&pdev->dev, "unsupported Ati chipset [%04x/%04x])\n", |
| 490 | "Unsupported Ati chipset (device id: %04x)\n", pdev->device); | 490 | pdev->vendor, pdev->device); |
| 491 | return -ENODEV; | 491 | return -ENODEV; |
| 492 | 492 | ||
| 493 | found: | 493 | found: |
| @@ -500,8 +500,7 @@ found: | |||
| 500 | 500 | ||
| 501 | bridge->driver = &ati_generic_bridge; | 501 | bridge->driver = &ati_generic_bridge; |
| 502 | 502 | ||
| 503 | printk(KERN_INFO PFX "Detected Ati %s chipset\n", | 503 | dev_info(&pdev->dev, "Ati %s chipset\n", devs[j].chipset_name); |
| 504 | devs[j].chipset_name); | ||
| 505 | 504 | ||
| 506 | /* Fill in the mode register */ | 505 | /* Fill in the mode register */ |
| 507 | pci_read_config_dword(pdev, | 506 | pci_read_config_dword(pdev, |
diff --git a/drivers/char/agp/backend.c b/drivers/char/agp/backend.c index 1ec87104e68c..3a3cc03d401c 100644 --- a/drivers/char/agp/backend.c +++ b/drivers/char/agp/backend.c | |||
| @@ -144,7 +144,8 @@ static int agp_backend_initialize(struct agp_bridge_data *bridge) | |||
| 144 | void *addr = bridge->driver->agp_alloc_page(bridge); | 144 | void *addr = bridge->driver->agp_alloc_page(bridge); |
| 145 | 145 | ||
| 146 | if (!addr) { | 146 | if (!addr) { |
| 147 | printk(KERN_ERR PFX "unable to get memory for scratch page.\n"); | 147 | dev_err(&bridge->dev->dev, |
| 148 | "can't get memory for scratch page\n"); | ||
| 148 | return -ENOMEM; | 149 | return -ENOMEM; |
| 149 | } | 150 | } |
| 150 | 151 | ||
| @@ -155,13 +156,13 @@ static int agp_backend_initialize(struct agp_bridge_data *bridge) | |||
| 155 | 156 | ||
| 156 | size_value = bridge->driver->fetch_size(); | 157 | size_value = bridge->driver->fetch_size(); |
| 157 | if (size_value == 0) { | 158 | if (size_value == 0) { |
| 158 | printk(KERN_ERR PFX "unable to determine aperture size.\n"); | 159 | dev_err(&bridge->dev->dev, "can't determine aperture size\n"); |
| 159 | rc = -EINVAL; | 160 | rc = -EINVAL; |
| 160 | goto err_out; | 161 | goto err_out; |
| 161 | } | 162 | } |
| 162 | if (bridge->driver->create_gatt_table(bridge)) { | 163 | if (bridge->driver->create_gatt_table(bridge)) { |
| 163 | printk(KERN_ERR PFX | 164 | dev_err(&bridge->dev->dev, |
| 164 | "unable to get memory for graphics translation table.\n"); | 165 | "can't get memory for graphics translation table\n"); |
| 165 | rc = -ENOMEM; | 166 | rc = -ENOMEM; |
| 166 | goto err_out; | 167 | goto err_out; |
| 167 | } | 168 | } |
| @@ -169,7 +170,8 @@ static int agp_backend_initialize(struct agp_bridge_data *bridge) | |||
| 169 | 170 | ||
| 170 | bridge->key_list = vmalloc(PAGE_SIZE * 4); | 171 | bridge->key_list = vmalloc(PAGE_SIZE * 4); |
| 171 | if (bridge->key_list == NULL) { | 172 | if (bridge->key_list == NULL) { |
| 172 | printk(KERN_ERR PFX "error allocating memory for key lists.\n"); | 173 | dev_err(&bridge->dev->dev, |
| 174 | "can't allocate memory for key lists\n"); | ||
| 173 | rc = -ENOMEM; | 175 | rc = -ENOMEM; |
| 174 | goto err_out; | 176 | goto err_out; |
| 175 | } | 177 | } |
| @@ -179,10 +181,12 @@ static int agp_backend_initialize(struct agp_bridge_data *bridge) | |||
| 179 | memset(bridge->key_list, 0, PAGE_SIZE * 4); | 181 | memset(bridge->key_list, 0, PAGE_SIZE * 4); |
| 180 | 182 | ||
| 181 | if (bridge->driver->configure()) { | 183 | if (bridge->driver->configure()) { |
| 182 | printk(KERN_ERR PFX "error configuring host chipset.\n"); | 184 | dev_err(&bridge->dev->dev, "error configuring host chipset\n"); |
| 183 | rc = -EINVAL; | 185 | rc = -EINVAL; |
| 184 | goto err_out; | 186 | goto err_out; |
| 185 | } | 187 | } |
| 188 | INIT_LIST_HEAD(&bridge->mapped_list); | ||
| 189 | spin_lock_init(&bridge->mapped_lock); | ||
| 186 | 190 | ||
| 187 | return 0; | 191 | return 0; |
| 188 | 192 | ||
| @@ -269,25 +273,27 @@ int agp_add_bridge(struct agp_bridge_data *bridge) | |||
| 269 | 273 | ||
| 270 | /* Grab reference on the chipset driver. */ | 274 | /* Grab reference on the chipset driver. */ |
| 271 | if (!try_module_get(bridge->driver->owner)) { | 275 | if (!try_module_get(bridge->driver->owner)) { |
| 272 | printk (KERN_INFO PFX "Couldn't lock chipset driver.\n"); | 276 | dev_info(&bridge->dev->dev, "can't lock chipset driver\n"); |
| 273 | return -EINVAL; | 277 | return -EINVAL; |
| 274 | } | 278 | } |
| 275 | 279 | ||
| 276 | error = agp_backend_initialize(bridge); | 280 | error = agp_backend_initialize(bridge); |
| 277 | if (error) { | 281 | if (error) { |
| 278 | printk (KERN_INFO PFX "agp_backend_initialize() failed.\n"); | 282 | dev_info(&bridge->dev->dev, |
| 283 | "agp_backend_initialize() failed\n"); | ||
| 279 | goto err_out; | 284 | goto err_out; |
| 280 | } | 285 | } |
| 281 | 286 | ||
| 282 | if (list_empty(&agp_bridges)) { | 287 | if (list_empty(&agp_bridges)) { |
| 283 | error = agp_frontend_initialize(); | 288 | error = agp_frontend_initialize(); |
| 284 | if (error) { | 289 | if (error) { |
| 285 | printk (KERN_INFO PFX "agp_frontend_initialize() failed.\n"); | 290 | dev_info(&bridge->dev->dev, |
| 291 | "agp_frontend_initialize() failed\n"); | ||
| 286 | goto frontend_err; | 292 | goto frontend_err; |
| 287 | } | 293 | } |
| 288 | 294 | ||
| 289 | printk(KERN_INFO PFX "AGP aperture is %dM @ 0x%lx\n", | 295 | dev_info(&bridge->dev->dev, "AGP aperture is %dM @ 0x%lx\n", |
| 290 | bridge->driver->fetch_size(), bridge->gart_bus_addr); | 296 | bridge->driver->fetch_size(), bridge->gart_bus_addr); |
| 291 | 297 | ||
| 292 | } | 298 | } |
| 293 | 299 | ||
diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c index eaa1a355bb32..118dbde25dc7 100644 --- a/drivers/char/agp/generic.c +++ b/drivers/char/agp/generic.c | |||
| @@ -429,6 +429,10 @@ int agp_bind_memory(struct agp_memory *curr, off_t pg_start) | |||
| 429 | 429 | ||
| 430 | curr->is_bound = true; | 430 | curr->is_bound = true; |
| 431 | curr->pg_start = pg_start; | 431 | curr->pg_start = pg_start; |
| 432 | spin_lock(&agp_bridge->mapped_lock); | ||
| 433 | list_add(&curr->mapped_list, &agp_bridge->mapped_list); | ||
| 434 | spin_unlock(&agp_bridge->mapped_lock); | ||
| 435 | |||
| 432 | return 0; | 436 | return 0; |
| 433 | } | 437 | } |
| 434 | EXPORT_SYMBOL(agp_bind_memory); | 438 | EXPORT_SYMBOL(agp_bind_memory); |
| @@ -461,10 +465,34 @@ int agp_unbind_memory(struct agp_memory *curr) | |||
| 461 | 465 | ||
| 462 | curr->is_bound = false; | 466 | curr->is_bound = false; |
| 463 | curr->pg_start = 0; | 467 | curr->pg_start = 0; |
| 468 | spin_lock(&curr->bridge->mapped_lock); | ||
| 469 | list_del(&curr->mapped_list); | ||
| 470 | spin_unlock(&curr->bridge->mapped_lock); | ||
| 464 | return 0; | 471 | return 0; |
| 465 | } | 472 | } |
| 466 | EXPORT_SYMBOL(agp_unbind_memory); | 473 | EXPORT_SYMBOL(agp_unbind_memory); |
| 467 | 474 | ||
| 475 | /** | ||
| 476 | * agp_rebind_emmory - Rewrite the entire GATT, useful on resume | ||
| 477 | */ | ||
| 478 | int agp_rebind_memory(void) | ||
| 479 | { | ||
| 480 | struct agp_memory *curr; | ||
| 481 | int ret_val = 0; | ||
| 482 | |||
| 483 | spin_lock(&agp_bridge->mapped_lock); | ||
| 484 | list_for_each_entry(curr, &agp_bridge->mapped_list, mapped_list) { | ||
| 485 | ret_val = curr->bridge->driver->insert_memory(curr, | ||
| 486 | curr->pg_start, | ||
| 487 | curr->type); | ||
| 488 | if (ret_val != 0) | ||
| 489 | break; | ||
| 490 | } | ||
| 491 | spin_unlock(&agp_bridge->mapped_lock); | ||
| 492 | return ret_val; | ||
| 493 | } | ||
| 494 | EXPORT_SYMBOL(agp_rebind_memory); | ||
| 495 | |||
| 468 | /* End - Routines for handling swapping of agp_memory into the GATT */ | 496 | /* End - Routines for handling swapping of agp_memory into the GATT */ |
| 469 | 497 | ||
| 470 | 498 | ||
| @@ -771,8 +799,8 @@ void agp_device_command(u32 bridge_agpstat, bool agp_v3) | |||
| 771 | if (!agp) | 799 | if (!agp) |
| 772 | continue; | 800 | continue; |
| 773 | 801 | ||
| 774 | printk(KERN_INFO PFX "Putting AGP V%d device at %s into %dx mode\n", | 802 | dev_info(&device->dev, "putting AGP V%d device into %dx mode\n", |
| 775 | agp_v3 ? 3 : 2, pci_name(device), mode); | 803 | agp_v3 ? 3 : 2, mode); |
| 776 | pci_write_config_dword(device, agp + PCI_AGP_COMMAND, bridge_agpstat); | 804 | pci_write_config_dword(device, agp + PCI_AGP_COMMAND, bridge_agpstat); |
| 777 | } | 805 | } |
| 778 | } | 806 | } |
| @@ -800,10 +828,8 @@ void agp_generic_enable(struct agp_bridge_data *bridge, u32 requested_mode) | |||
| 800 | 828 | ||
| 801 | get_agp_version(agp_bridge); | 829 | get_agp_version(agp_bridge); |
| 802 | 830 | ||
| 803 | printk(KERN_INFO PFX "Found an AGP %d.%d compliant device at %s.\n", | 831 | dev_info(&agp_bridge->dev->dev, "AGP %d.%d bridge\n", |
| 804 | agp_bridge->major_version, | 832 | agp_bridge->major_version, agp_bridge->minor_version); |
| 805 | agp_bridge->minor_version, | ||
| 806 | pci_name(agp_bridge->dev)); | ||
| 807 | 833 | ||
| 808 | pci_read_config_dword(agp_bridge->dev, | 834 | pci_read_config_dword(agp_bridge->dev, |
| 809 | agp_bridge->capndx + PCI_AGP_STATUS, &bridge_agpstat); | 835 | agp_bridge->capndx + PCI_AGP_STATUS, &bridge_agpstat); |
| @@ -832,8 +858,7 @@ void agp_generic_enable(struct agp_bridge_data *bridge, u32 requested_mode) | |||
| 832 | pci_write_config_dword(bridge->dev, | 858 | pci_write_config_dword(bridge->dev, |
| 833 | bridge->capndx+AGPCTRL, temp); | 859 | bridge->capndx+AGPCTRL, temp); |
| 834 | 860 | ||
| 835 | printk(KERN_INFO PFX "Device is in legacy mode," | 861 | dev_info(&bridge->dev->dev, "bridge is in legacy mode, falling back to 2.x\n"); |
| 836 | " falling back to 2.x\n"); | ||
| 837 | } | 862 | } |
| 838 | } | 863 | } |
| 839 | 864 | ||
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c index df702642ab8f..016fdf0623a4 100644 --- a/drivers/char/agp/intel-agp.c +++ b/drivers/char/agp/intel-agp.c | |||
| @@ -32,8 +32,8 @@ | |||
| 32 | #define PCI_DEVICE_ID_INTEL_Q35_IG 0x29B2 | 32 | #define PCI_DEVICE_ID_INTEL_Q35_IG 0x29B2 |
| 33 | #define PCI_DEVICE_ID_INTEL_Q33_HB 0x29D0 | 33 | #define PCI_DEVICE_ID_INTEL_Q33_HB 0x29D0 |
| 34 | #define PCI_DEVICE_ID_INTEL_Q33_IG 0x29D2 | 34 | #define PCI_DEVICE_ID_INTEL_Q33_IG 0x29D2 |
| 35 | #define PCI_DEVICE_ID_INTEL_IGD_HB 0x2A40 | 35 | #define PCI_DEVICE_ID_INTEL_GM45_HB 0x2A40 |
| 36 | #define PCI_DEVICE_ID_INTEL_IGD_IG 0x2A42 | 36 | #define PCI_DEVICE_ID_INTEL_GM45_IG 0x2A42 |
| 37 | #define PCI_DEVICE_ID_INTEL_IGD_E_HB 0x2E00 | 37 | #define PCI_DEVICE_ID_INTEL_IGD_E_HB 0x2E00 |
| 38 | #define PCI_DEVICE_ID_INTEL_IGD_E_IG 0x2E02 | 38 | #define PCI_DEVICE_ID_INTEL_IGD_E_IG 0x2E02 |
| 39 | #define PCI_DEVICE_ID_INTEL_Q45_HB 0x2E10 | 39 | #define PCI_DEVICE_ID_INTEL_Q45_HB 0x2E10 |
| @@ -55,7 +55,7 @@ | |||
| 55 | agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965G_HB || \ | 55 | agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965G_HB || \ |
| 56 | agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965GM_HB || \ | 56 | agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965GM_HB || \ |
| 57 | agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965GME_HB || \ | 57 | agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965GME_HB || \ |
| 58 | agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_IGD_HB) | 58 | agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_GM45_HB) |
| 59 | 59 | ||
| 60 | #define IS_G33 (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_G33_HB || \ | 60 | #define IS_G33 (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_G33_HB || \ |
| 61 | agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_Q35_HB || \ | 61 | agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_Q35_HB || \ |
| @@ -161,7 +161,7 @@ static int intel_i810_fetch_size(void) | |||
| 161 | values = A_SIZE_FIX(agp_bridge->driver->aperture_sizes); | 161 | values = A_SIZE_FIX(agp_bridge->driver->aperture_sizes); |
| 162 | 162 | ||
| 163 | if ((smram_miscc & I810_GMS) == I810_GMS_DISABLE) { | 163 | if ((smram_miscc & I810_GMS) == I810_GMS_DISABLE) { |
| 164 | printk(KERN_WARNING PFX "i810 is disabled\n"); | 164 | dev_warn(&agp_bridge->dev->dev, "i810 is disabled\n"); |
| 165 | return 0; | 165 | return 0; |
| 166 | } | 166 | } |
| 167 | if ((smram_miscc & I810_GFX_MEM_WIN_SIZE) == I810_GFX_MEM_WIN_32M) { | 167 | if ((smram_miscc & I810_GFX_MEM_WIN_SIZE) == I810_GFX_MEM_WIN_32M) { |
| @@ -193,7 +193,8 @@ static int intel_i810_configure(void) | |||
| 193 | 193 | ||
| 194 | intel_private.registers = ioremap(temp, 128 * 4096); | 194 | intel_private.registers = ioremap(temp, 128 * 4096); |
| 195 | if (!intel_private.registers) { | 195 | if (!intel_private.registers) { |
| 196 | printk(KERN_ERR PFX "Unable to remap memory.\n"); | 196 | dev_err(&intel_private.pcidev->dev, |
| 197 | "can't remap memory\n"); | ||
| 197 | return -ENOMEM; | 198 | return -ENOMEM; |
| 198 | } | 199 | } |
| 199 | } | 200 | } |
| @@ -201,7 +202,8 @@ static int intel_i810_configure(void) | |||
| 201 | if ((readl(intel_private.registers+I810_DRAM_CTL) | 202 | if ((readl(intel_private.registers+I810_DRAM_CTL) |
| 202 | & I810_DRAM_ROW_0) == I810_DRAM_ROW_0_SDRAM) { | 203 | & I810_DRAM_ROW_0) == I810_DRAM_ROW_0_SDRAM) { |
| 203 | /* This will need to be dynamically assigned */ | 204 | /* This will need to be dynamically assigned */ |
| 204 | printk(KERN_INFO PFX "detected 4MB dedicated video ram.\n"); | 205 | dev_info(&intel_private.pcidev->dev, |
| 206 | "detected 4MB dedicated video ram\n"); | ||
| 205 | intel_private.num_dcache_entries = 1024; | 207 | intel_private.num_dcache_entries = 1024; |
| 206 | } | 208 | } |
| 207 | pci_read_config_dword(intel_private.pcidev, I810_GMADDR, &temp); | 209 | pci_read_config_dword(intel_private.pcidev, I810_GMADDR, &temp); |
| @@ -500,8 +502,8 @@ static void intel_i830_init_gtt_entries(void) | |||
| 500 | size = 1024 + 512; | 502 | size = 1024 + 512; |
| 501 | break; | 503 | break; |
| 502 | default: | 504 | default: |
| 503 | printk(KERN_INFO PFX "Unknown page table size, " | 505 | dev_info(&intel_private.pcidev->dev, |
| 504 | "assuming 512KB\n"); | 506 | "unknown page table size, assuming 512KB\n"); |
| 505 | size = 512; | 507 | size = 512; |
| 506 | } | 508 | } |
| 507 | size += 4; /* add in BIOS popup space */ | 509 | size += 4; /* add in BIOS popup space */ |
| @@ -515,8 +517,8 @@ static void intel_i830_init_gtt_entries(void) | |||
| 515 | size = 2048; | 517 | size = 2048; |
| 516 | break; | 518 | break; |
| 517 | default: | 519 | default: |
| 518 | printk(KERN_INFO PFX "Unknown page table size 0x%x, " | 520 | dev_info(&agp_bridge->dev->dev, |
| 519 | "assuming 512KB\n", | 521 | "unknown page table size 0x%x, assuming 512KB\n", |
| 520 | (gmch_ctrl & G33_PGETBL_SIZE_MASK)); | 522 | (gmch_ctrl & G33_PGETBL_SIZE_MASK)); |
| 521 | size = 512; | 523 | size = 512; |
| 522 | } | 524 | } |
| @@ -627,11 +629,11 @@ static void intel_i830_init_gtt_entries(void) | |||
| 627 | } | 629 | } |
| 628 | } | 630 | } |
| 629 | if (gtt_entries > 0) | 631 | if (gtt_entries > 0) |
| 630 | printk(KERN_INFO PFX "Detected %dK %s memory.\n", | 632 | dev_info(&agp_bridge->dev->dev, "detected %dK %s memory\n", |
| 631 | gtt_entries / KB(1), local ? "local" : "stolen"); | 633 | gtt_entries / KB(1), local ? "local" : "stolen"); |
| 632 | else | 634 | else |
| 633 | printk(KERN_INFO PFX | 635 | dev_info(&agp_bridge->dev->dev, |
| 634 | "No pre-allocated video memory detected.\n"); | 636 | "no pre-allocated video memory detected\n"); |
| 635 | gtt_entries /= KB(4); | 637 | gtt_entries /= KB(4); |
| 636 | 638 | ||
| 637 | intel_private.gtt_entries = gtt_entries; | 639 | intel_private.gtt_entries = gtt_entries; |
| @@ -801,10 +803,12 @@ static int intel_i830_insert_entries(struct agp_memory *mem, off_t pg_start, | |||
| 801 | num_entries = A_SIZE_FIX(temp)->num_entries; | 803 | num_entries = A_SIZE_FIX(temp)->num_entries; |
| 802 | 804 | ||
| 803 | if (pg_start < intel_private.gtt_entries) { | 805 | if (pg_start < intel_private.gtt_entries) { |
| 804 | printk(KERN_DEBUG PFX "pg_start == 0x%.8lx,intel_private.gtt_entries == 0x%.8x\n", | 806 | dev_printk(KERN_DEBUG, &intel_private.pcidev->dev, |
| 805 | pg_start, intel_private.gtt_entries); | 807 | "pg_start == 0x%.8lx, intel_private.gtt_entries == 0x%.8x\n", |
| 808 | pg_start, intel_private.gtt_entries); | ||
| 806 | 809 | ||
| 807 | printk(KERN_INFO PFX "Trying to insert into local/stolen memory\n"); | 810 | dev_info(&intel_private.pcidev->dev, |
| 811 | "trying to insert into local/stolen memory\n"); | ||
| 808 | goto out_err; | 812 | goto out_err; |
| 809 | } | 813 | } |
| 810 | 814 | ||
| @@ -851,7 +855,8 @@ static int intel_i830_remove_entries(struct agp_memory *mem, off_t pg_start, | |||
| 851 | return 0; | 855 | return 0; |
| 852 | 856 | ||
| 853 | if (pg_start < intel_private.gtt_entries) { | 857 | if (pg_start < intel_private.gtt_entries) { |
| 854 | printk(KERN_INFO PFX "Trying to disable local/stolen memory\n"); | 858 | dev_info(&intel_private.pcidev->dev, |
| 859 | "trying to disable local/stolen memory\n"); | ||
| 855 | return -EINVAL; | 860 | return -EINVAL; |
| 856 | } | 861 | } |
| 857 | 862 | ||
| @@ -957,7 +962,7 @@ static void intel_i9xx_setup_flush(void) | |||
| 957 | if (intel_private.ifp_resource.start) { | 962 | if (intel_private.ifp_resource.start) { |
| 958 | intel_private.i9xx_flush_page = ioremap_nocache(intel_private.ifp_resource.start, PAGE_SIZE); | 963 | intel_private.i9xx_flush_page = ioremap_nocache(intel_private.ifp_resource.start, PAGE_SIZE); |
| 959 | if (!intel_private.i9xx_flush_page) | 964 | if (!intel_private.i9xx_flush_page) |
| 960 | printk(KERN_INFO "unable to ioremap flush page - no chipset flushing"); | 965 | dev_info(&intel_private.pcidev->dev, "can't ioremap flush page - no chipset flushing"); |
| 961 | } | 966 | } |
| 962 | } | 967 | } |
| 963 | 968 | ||
| @@ -1028,10 +1033,12 @@ static int intel_i915_insert_entries(struct agp_memory *mem, off_t pg_start, | |||
| 1028 | num_entries = A_SIZE_FIX(temp)->num_entries; | 1033 | num_entries = A_SIZE_FIX(temp)->num_entries; |
| 1029 | 1034 | ||
| 1030 | if (pg_start < intel_private.gtt_entries) { | 1035 | if (pg_start < intel_private.gtt_entries) { |
| 1031 | printk(KERN_DEBUG PFX "pg_start == 0x%.8lx,intel_private.gtt_entries == 0x%.8x\n", | 1036 | dev_printk(KERN_DEBUG, &intel_private.pcidev->dev, |
| 1032 | pg_start, intel_private.gtt_entries); | 1037 | "pg_start == 0x%.8lx, intel_private.gtt_entries == 0x%.8x\n", |
| 1038 | pg_start, intel_private.gtt_entries); | ||
| 1033 | 1039 | ||
| 1034 | printk(KERN_INFO PFX "Trying to insert into local/stolen memory\n"); | 1040 | dev_info(&intel_private.pcidev->dev, |
| 1041 | "trying to insert into local/stolen memory\n"); | ||
| 1035 | goto out_err; | 1042 | goto out_err; |
| 1036 | } | 1043 | } |
| 1037 | 1044 | ||
| @@ -1078,7 +1085,8 @@ static int intel_i915_remove_entries(struct agp_memory *mem, off_t pg_start, | |||
| 1078 | return 0; | 1085 | return 0; |
| 1079 | 1086 | ||
| 1080 | if (pg_start < intel_private.gtt_entries) { | 1087 | if (pg_start < intel_private.gtt_entries) { |
| 1081 | printk(KERN_INFO PFX "Trying to disable local/stolen memory\n"); | 1088 | dev_info(&intel_private.pcidev->dev, |
| 1089 | "trying to disable local/stolen memory\n"); | ||
| 1082 | return -EINVAL; | 1090 | return -EINVAL; |
| 1083 | } | 1091 | } |
| 1084 | 1092 | ||
| @@ -1182,7 +1190,7 @@ static unsigned long intel_i965_mask_memory(struct agp_bridge_data *bridge, | |||
| 1182 | static void intel_i965_get_gtt_range(int *gtt_offset, int *gtt_size) | 1190 | static void intel_i965_get_gtt_range(int *gtt_offset, int *gtt_size) |
| 1183 | { | 1191 | { |
| 1184 | switch (agp_bridge->dev->device) { | 1192 | switch (agp_bridge->dev->device) { |
| 1185 | case PCI_DEVICE_ID_INTEL_IGD_HB: | 1193 | case PCI_DEVICE_ID_INTEL_GM45_HB: |
| 1186 | case PCI_DEVICE_ID_INTEL_IGD_E_HB: | 1194 | case PCI_DEVICE_ID_INTEL_IGD_E_HB: |
| 1187 | case PCI_DEVICE_ID_INTEL_Q45_HB: | 1195 | case PCI_DEVICE_ID_INTEL_Q45_HB: |
| 1188 | case PCI_DEVICE_ID_INTEL_G45_HB: | 1196 | case PCI_DEVICE_ID_INTEL_G45_HB: |
| @@ -1379,7 +1387,7 @@ static int intel_815_configure(void) | |||
| 1379 | /* the Intel 815 chipset spec. says that bits 29-31 in the | 1387 | /* the Intel 815 chipset spec. says that bits 29-31 in the |
| 1380 | * ATTBASE register are reserved -> try not to write them */ | 1388 | * ATTBASE register are reserved -> try not to write them */ |
| 1381 | if (agp_bridge->gatt_bus_addr & INTEL_815_ATTBASE_MASK) { | 1389 | if (agp_bridge->gatt_bus_addr & INTEL_815_ATTBASE_MASK) { |
| 1382 | printk(KERN_EMERG PFX "gatt bus addr too high"); | 1390 | dev_emerg(&agp_bridge->dev->dev, "gatt bus addr too high"); |
| 1383 | return -EINVAL; | 1391 | return -EINVAL; |
| 1384 | } | 1392 | } |
| 1385 | 1393 | ||
| @@ -2117,8 +2125,8 @@ static const struct intel_driver_description { | |||
| 2117 | NULL, &intel_g33_driver }, | 2125 | NULL, &intel_g33_driver }, |
| 2118 | { PCI_DEVICE_ID_INTEL_Q33_HB, PCI_DEVICE_ID_INTEL_Q33_IG, 0, "Q33", | 2126 | { PCI_DEVICE_ID_INTEL_Q33_HB, PCI_DEVICE_ID_INTEL_Q33_IG, 0, "Q33", |
| 2119 | NULL, &intel_g33_driver }, | 2127 | NULL, &intel_g33_driver }, |
| 2120 | { PCI_DEVICE_ID_INTEL_IGD_HB, PCI_DEVICE_ID_INTEL_IGD_IG, 0, | 2128 | { PCI_DEVICE_ID_INTEL_GM45_HB, PCI_DEVICE_ID_INTEL_GM45_IG, 0, |
| 2121 | "Intel Integrated Graphics Device", NULL, &intel_i965_driver }, | 2129 | "Mobile Intel? GM45 Express", NULL, &intel_i965_driver }, |
| 2122 | { PCI_DEVICE_ID_INTEL_IGD_E_HB, PCI_DEVICE_ID_INTEL_IGD_E_IG, 0, | 2130 | { PCI_DEVICE_ID_INTEL_IGD_E_HB, PCI_DEVICE_ID_INTEL_IGD_E_IG, 0, |
| 2123 | "Intel Integrated Graphics Device", NULL, &intel_i965_driver }, | 2131 | "Intel Integrated Graphics Device", NULL, &intel_i965_driver }, |
| 2124 | { PCI_DEVICE_ID_INTEL_Q45_HB, PCI_DEVICE_ID_INTEL_Q45_IG, 0, | 2132 | { PCI_DEVICE_ID_INTEL_Q45_HB, PCI_DEVICE_ID_INTEL_Q45_IG, 0, |
| @@ -2163,8 +2171,8 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev, | |||
| 2163 | 2171 | ||
| 2164 | if (intel_agp_chipsets[i].name == NULL) { | 2172 | if (intel_agp_chipsets[i].name == NULL) { |
| 2165 | if (cap_ptr) | 2173 | if (cap_ptr) |
| 2166 | printk(KERN_WARNING PFX "Unsupported Intel chipset" | 2174 | dev_warn(&pdev->dev, "unsupported Intel chipset [%04x/%04x]\n", |
| 2167 | "(device id: %04x)\n", pdev->device); | 2175 | pdev->vendor, pdev->device); |
| 2168 | agp_put_bridge(bridge); | 2176 | agp_put_bridge(bridge); |
| 2169 | return -ENODEV; | 2177 | return -ENODEV; |
| 2170 | } | 2178 | } |
| @@ -2172,9 +2180,8 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev, | |||
| 2172 | if (bridge->driver == NULL) { | 2180 | if (bridge->driver == NULL) { |
| 2173 | /* bridge has no AGP and no IGD detected */ | 2181 | /* bridge has no AGP and no IGD detected */ |
| 2174 | if (cap_ptr) | 2182 | if (cap_ptr) |
| 2175 | printk(KERN_WARNING PFX "Failed to find bridge device " | 2183 | dev_warn(&pdev->dev, "can't find bridge device (chip_id: %04x)\n", |
| 2176 | "(chip_id: %04x)\n", | 2184 | intel_agp_chipsets[i].gmch_chip_id); |
| 2177 | intel_agp_chipsets[i].gmch_chip_id); | ||
| 2178 | agp_put_bridge(bridge); | 2185 | agp_put_bridge(bridge); |
| 2179 | return -ENODEV; | 2186 | return -ENODEV; |
| 2180 | } | 2187 | } |
| @@ -2183,8 +2190,7 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev, | |||
| 2183 | bridge->capndx = cap_ptr; | 2190 | bridge->capndx = cap_ptr; |
| 2184 | bridge->dev_private_data = &intel_private; | 2191 | bridge->dev_private_data = &intel_private; |
| 2185 | 2192 | ||
| 2186 | printk(KERN_INFO PFX "Detected an Intel %s Chipset.\n", | 2193 | dev_info(&pdev->dev, "Intel %s Chipset\n", intel_agp_chipsets[i].name); |
| 2187 | intel_agp_chipsets[i].name); | ||
| 2188 | 2194 | ||
| 2189 | /* | 2195 | /* |
| 2190 | * The following fixes the case where the BIOS has "forgotten" to | 2196 | * The following fixes the case where the BIOS has "forgotten" to |
| @@ -2194,7 +2200,7 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev, | |||
| 2194 | r = &pdev->resource[0]; | 2200 | r = &pdev->resource[0]; |
| 2195 | if (!r->start && r->end) { | 2201 | if (!r->start && r->end) { |
| 2196 | if (pci_assign_resource(pdev, 0)) { | 2202 | if (pci_assign_resource(pdev, 0)) { |
| 2197 | printk(KERN_ERR PFX "could not assign resource 0\n"); | 2203 | dev_err(&pdev->dev, "can't assign resource 0\n"); |
| 2198 | agp_put_bridge(bridge); | 2204 | agp_put_bridge(bridge); |
| 2199 | return -ENODEV; | 2205 | return -ENODEV; |
| 2200 | } | 2206 | } |
| @@ -2206,7 +2212,7 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev, | |||
| 2206 | * 20030610 - hamish@zot.org | 2212 | * 20030610 - hamish@zot.org |
| 2207 | */ | 2213 | */ |
| 2208 | if (pci_enable_device(pdev)) { | 2214 | if (pci_enable_device(pdev)) { |
| 2209 | printk(KERN_ERR PFX "Unable to Enable PCI device\n"); | 2215 | dev_err(&pdev->dev, "can't enable PCI device\n"); |
| 2210 | agp_put_bridge(bridge); | 2216 | agp_put_bridge(bridge); |
| 2211 | return -ENODEV; | 2217 | return -ENODEV; |
| 2212 | } | 2218 | } |
| @@ -2238,6 +2244,7 @@ static void __devexit agp_intel_remove(struct pci_dev *pdev) | |||
| 2238 | static int agp_intel_resume(struct pci_dev *pdev) | 2244 | static int agp_intel_resume(struct pci_dev *pdev) |
| 2239 | { | 2245 | { |
| 2240 | struct agp_bridge_data *bridge = pci_get_drvdata(pdev); | 2246 | struct agp_bridge_data *bridge = pci_get_drvdata(pdev); |
| 2247 | int ret_val; | ||
| 2241 | 2248 | ||
| 2242 | pci_restore_state(pdev); | 2249 | pci_restore_state(pdev); |
| 2243 | 2250 | ||
| @@ -2265,6 +2272,10 @@ static int agp_intel_resume(struct pci_dev *pdev) | |||
| 2265 | else if (bridge->driver == &intel_i965_driver) | 2272 | else if (bridge->driver == &intel_i965_driver) |
| 2266 | intel_i915_configure(); | 2273 | intel_i915_configure(); |
| 2267 | 2274 | ||
| 2275 | ret_val = agp_rebind_memory(); | ||
| 2276 | if (ret_val != 0) | ||
| 2277 | return ret_val; | ||
| 2278 | |||
| 2268 | return 0; | 2279 | return 0; |
| 2269 | } | 2280 | } |
| 2270 | #endif | 2281 | #endif |
| @@ -2315,7 +2326,7 @@ static struct pci_device_id agp_intel_pci_table[] = { | |||
| 2315 | ID(PCI_DEVICE_ID_INTEL_G33_HB), | 2326 | ID(PCI_DEVICE_ID_INTEL_G33_HB), |
| 2316 | ID(PCI_DEVICE_ID_INTEL_Q35_HB), | 2327 | ID(PCI_DEVICE_ID_INTEL_Q35_HB), |
| 2317 | ID(PCI_DEVICE_ID_INTEL_Q33_HB), | 2328 | ID(PCI_DEVICE_ID_INTEL_Q33_HB), |
| 2318 | ID(PCI_DEVICE_ID_INTEL_IGD_HB), | 2329 | ID(PCI_DEVICE_ID_INTEL_GM45_HB), |
| 2319 | ID(PCI_DEVICE_ID_INTEL_IGD_E_HB), | 2330 | ID(PCI_DEVICE_ID_INTEL_IGD_E_HB), |
| 2320 | ID(PCI_DEVICE_ID_INTEL_Q45_HB), | 2331 | ID(PCI_DEVICE_ID_INTEL_Q45_HB), |
| 2321 | ID(PCI_DEVICE_ID_INTEL_G45_HB), | 2332 | ID(PCI_DEVICE_ID_INTEL_G45_HB), |
diff --git a/drivers/char/agp/isoch.c b/drivers/char/agp/isoch.c index 3f9ccde62377..c73385cc4b8a 100644 --- a/drivers/char/agp/isoch.c +++ b/drivers/char/agp/isoch.c | |||
| @@ -153,7 +153,7 @@ static int agp_3_5_isochronous_node_enable(struct agp_bridge_data *bridge, | |||
| 153 | 153 | ||
| 154 | /* Check if this configuration has any chance of working */ | 154 | /* Check if this configuration has any chance of working */ |
| 155 | if (tot_bw > target.maxbw) { | 155 | if (tot_bw > target.maxbw) { |
| 156 | printk(KERN_ERR PFX "isochronous bandwidth required " | 156 | dev_err(&td->dev, "isochronous bandwidth required " |
| 157 | "by AGP 3.0 devices exceeds that which is supported by " | 157 | "by AGP 3.0 devices exceeds that which is supported by " |
| 158 | "the AGP 3.0 bridge!\n"); | 158 | "the AGP 3.0 bridge!\n"); |
| 159 | ret = -ENODEV; | 159 | ret = -ENODEV; |
| @@ -188,7 +188,7 @@ static int agp_3_5_isochronous_node_enable(struct agp_bridge_data *bridge, | |||
| 188 | /* Exit if the minimal ISOCH_N allocation among the masters is more | 188 | /* Exit if the minimal ISOCH_N allocation among the masters is more |
| 189 | * than the target can handle. */ | 189 | * than the target can handle. */ |
| 190 | if (tot_n > target.n) { | 190 | if (tot_n > target.n) { |
| 191 | printk(KERN_ERR PFX "number of isochronous " | 191 | dev_err(&td->dev, "number of isochronous " |
| 192 | "transactions per period required by AGP 3.0 devices " | 192 | "transactions per period required by AGP 3.0 devices " |
| 193 | "exceeds that which is supported by the AGP 3.0 " | 193 | "exceeds that which is supported by the AGP 3.0 " |
| 194 | "bridge!\n"); | 194 | "bridge!\n"); |
| @@ -229,7 +229,7 @@ static int agp_3_5_isochronous_node_enable(struct agp_bridge_data *bridge, | |||
| 229 | /* Exit if the minimal RQ needs of the masters exceeds what the target | 229 | /* Exit if the minimal RQ needs of the masters exceeds what the target |
| 230 | * can provide. */ | 230 | * can provide. */ |
| 231 | if (tot_rq > rq_isoch) { | 231 | if (tot_rq > rq_isoch) { |
| 232 | printk(KERN_ERR PFX "number of request queue slots " | 232 | dev_err(&td->dev, "number of request queue slots " |
| 233 | "required by the isochronous bandwidth requested by " | 233 | "required by the isochronous bandwidth requested by " |
| 234 | "AGP 3.0 devices exceeds the number provided by the " | 234 | "AGP 3.0 devices exceeds the number provided by the " |
| 235 | "AGP 3.0 bridge!\n"); | 235 | "AGP 3.0 bridge!\n"); |
| @@ -359,8 +359,9 @@ int agp_3_5_enable(struct agp_bridge_data *bridge) | |||
| 359 | case 0x0001: /* Unclassified device */ | 359 | case 0x0001: /* Unclassified device */ |
| 360 | /* Don't know what this is, but log it for investigation. */ | 360 | /* Don't know what this is, but log it for investigation. */ |
| 361 | if (mcapndx != 0) { | 361 | if (mcapndx != 0) { |
| 362 | printk (KERN_INFO PFX "Wacky, found unclassified AGP device. %x:%x\n", | 362 | dev_info(&td->dev, "wacky, found unclassified AGP device %s [%04x/%04x]\n", |
| 363 | dev->vendor, dev->device); | 363 | pci_name(dev), |
| 364 | dev->vendor, dev->device); | ||
| 364 | } | 365 | } |
| 365 | continue; | 366 | continue; |
| 366 | 367 | ||
| @@ -407,17 +408,18 @@ int agp_3_5_enable(struct agp_bridge_data *bridge) | |||
| 407 | } | 408 | } |
| 408 | 409 | ||
| 409 | if (mcapndx == 0) { | 410 | if (mcapndx == 0) { |
| 410 | printk(KERN_ERR PFX "woah! Non-AGP device " | 411 | dev_err(&td->dev, "woah! Non-AGP device %s on " |
| 411 | "found on the secondary bus of an AGP 3.5 bridge!\n"); | 412 | "secondary bus of AGP 3.5 bridge!\n", |
| 413 | pci_name(dev)); | ||
| 412 | ret = -ENODEV; | 414 | ret = -ENODEV; |
| 413 | goto free_and_exit; | 415 | goto free_and_exit; |
| 414 | } | 416 | } |
| 415 | 417 | ||
| 416 | mmajor = (ncapid >> AGP_MAJOR_VERSION_SHIFT) & 0xf; | 418 | mmajor = (ncapid >> AGP_MAJOR_VERSION_SHIFT) & 0xf; |
| 417 | if (mmajor < 3) { | 419 | if (mmajor < 3) { |
| 418 | printk(KERN_ERR PFX "woah! AGP 2.0 device " | 420 | dev_err(&td->dev, "woah! AGP 2.0 device %s on " |
| 419 | "found on the secondary bus of an AGP 3.5 " | 421 | "secondary bus of AGP 3.5 bridge operating " |
| 420 | "bridge operating with AGP 3.0 electricals!\n"); | 422 | "with AGP 3.0 electricals!\n", pci_name(dev)); |
| 421 | ret = -ENODEV; | 423 | ret = -ENODEV; |
| 422 | goto free_and_exit; | 424 | goto free_and_exit; |
| 423 | } | 425 | } |
| @@ -427,10 +429,10 @@ int agp_3_5_enable(struct agp_bridge_data *bridge) | |||
| 427 | pci_read_config_dword(dev, cur->capndx+AGPSTAT, &mstatus); | 429 | pci_read_config_dword(dev, cur->capndx+AGPSTAT, &mstatus); |
| 428 | 430 | ||
| 429 | if (((mstatus >> 3) & 0x1) == 0) { | 431 | if (((mstatus >> 3) & 0x1) == 0) { |
| 430 | printk(KERN_ERR PFX "woah! AGP 3.x device " | 432 | dev_err(&td->dev, "woah! AGP 3.x device %s not " |
| 431 | "not operating in AGP 3.x mode found on the " | 433 | "operating in AGP 3.x mode on secondary bus " |
| 432 | "secondary bus of an AGP 3.5 bridge operating " | 434 | "of AGP 3.5 bridge operating with AGP 3.0 " |
| 433 | "with AGP 3.0 electricals!\n"); | 435 | "electricals!\n", pci_name(dev)); |
| 434 | ret = -ENODEV; | 436 | ret = -ENODEV; |
| 435 | goto free_and_exit; | 437 | goto free_and_exit; |
| 436 | } | 438 | } |
| @@ -444,9 +446,9 @@ int agp_3_5_enable(struct agp_bridge_data *bridge) | |||
| 444 | if (isoch) { | 446 | if (isoch) { |
| 445 | ret = agp_3_5_isochronous_node_enable(bridge, dev_list, ndevs); | 447 | ret = agp_3_5_isochronous_node_enable(bridge, dev_list, ndevs); |
| 446 | if (ret) { | 448 | if (ret) { |
| 447 | printk(KERN_INFO PFX "Something bad happened setting " | 449 | dev_info(&td->dev, "something bad happened setting " |
| 448 | "up isochronous xfers. Falling back to " | 450 | "up isochronous xfers; falling back to " |
| 449 | "non-isochronous xfer mode.\n"); | 451 | "non-isochronous xfer mode\n"); |
| 450 | } else { | 452 | } else { |
| 451 | goto free_and_exit; | 453 | goto free_and_exit; |
| 452 | } | 454 | } |
| @@ -466,4 +468,3 @@ free_and_exit: | |||
| 466 | get_out: | 468 | get_out: |
| 467 | return ret; | 469 | return ret; |
| 468 | } | 470 | } |
| 469 | |||
diff --git a/drivers/char/agp/sis-agp.c b/drivers/char/agp/sis-agp.c index b6791846809f..2587ef96a960 100644 --- a/drivers/char/agp/sis-agp.c +++ b/drivers/char/agp/sis-agp.c | |||
| @@ -79,10 +79,8 @@ static void sis_delayed_enable(struct agp_bridge_data *bridge, u32 mode) | |||
| 79 | u32 command; | 79 | u32 command; |
| 80 | int rate; | 80 | int rate; |
| 81 | 81 | ||
| 82 | printk(KERN_INFO PFX "Found an AGP %d.%d compliant device at %s.\n", | 82 | dev_info(&agp_bridge->dev->dev, "AGP %d.%d bridge\n", |
| 83 | agp_bridge->major_version, | 83 | agp_bridge->major_version, agp_bridge->minor_version); |
| 84 | agp_bridge->minor_version, | ||
| 85 | pci_name(agp_bridge->dev)); | ||
| 86 | 84 | ||
| 87 | pci_read_config_dword(agp_bridge->dev, agp_bridge->capndx + PCI_AGP_STATUS, &command); | 85 | pci_read_config_dword(agp_bridge->dev, agp_bridge->capndx + PCI_AGP_STATUS, &command); |
| 88 | command = agp_collect_device_status(bridge, mode, command); | 86 | command = agp_collect_device_status(bridge, mode, command); |
| @@ -94,8 +92,8 @@ static void sis_delayed_enable(struct agp_bridge_data *bridge, u32 mode) | |||
| 94 | if (!agp) | 92 | if (!agp) |
| 95 | continue; | 93 | continue; |
| 96 | 94 | ||
| 97 | printk(KERN_INFO PFX "Putting AGP V3 device at %s into %dx mode\n", | 95 | dev_info(&agp_bridge->dev->dev, "putting AGP V3 device at %s into %dx mode\n", |
| 98 | pci_name(device), rate); | 96 | pci_name(device), rate); |
| 99 | 97 | ||
| 100 | pci_write_config_dword(device, agp + PCI_AGP_COMMAND, command); | 98 | pci_write_config_dword(device, agp + PCI_AGP_COMMAND, command); |
| 101 | 99 | ||
| @@ -105,7 +103,7 @@ static void sis_delayed_enable(struct agp_bridge_data *bridge, u32 mode) | |||
| 105 | * cannot be configured | 103 | * cannot be configured |
| 106 | */ | 104 | */ |
| 107 | if (device->device == bridge->dev->device) { | 105 | if (device->device == bridge->dev->device) { |
| 108 | printk(KERN_INFO PFX "SiS delay workaround: giving bridge time to recover.\n"); | 106 | dev_info(&agp_bridge->dev->dev, "SiS delay workaround: giving bridge time to recover\n"); |
| 109 | msleep(10); | 107 | msleep(10); |
| 110 | } | 108 | } |
| 111 | } | 109 | } |
| @@ -190,7 +188,8 @@ static int __devinit agp_sis_probe(struct pci_dev *pdev, | |||
| 190 | return -ENODEV; | 188 | return -ENODEV; |
| 191 | 189 | ||
| 192 | 190 | ||
| 193 | printk(KERN_INFO PFX "Detected SiS chipset - id:%i\n", pdev->device); | 191 | dev_info(&pdev->dev, "SiS chipset [%04x/%04x]\n", |
| 192 | pdev->vendor, pdev->device); | ||
| 194 | bridge = agp_alloc_bridge(); | 193 | bridge = agp_alloc_bridge(); |
| 195 | if (!bridge) | 194 | if (!bridge) |
| 196 | return -ENOMEM; | 195 | return -ENOMEM; |
| @@ -242,7 +241,7 @@ static struct pci_device_id agp_sis_pci_table[] = { | |||
| 242 | .class = (PCI_CLASS_BRIDGE_HOST << 8), | 241 | .class = (PCI_CLASS_BRIDGE_HOST << 8), |
| 243 | .class_mask = ~0, | 242 | .class_mask = ~0, |
| 244 | .vendor = PCI_VENDOR_ID_SI, | 243 | .vendor = PCI_VENDOR_ID_SI, |
| 245 | .device = PCI_DEVICE_ID_SI_5591_AGP, | 244 | .device = PCI_DEVICE_ID_SI_5591, |
| 246 | .subvendor = PCI_ANY_ID, | 245 | .subvendor = PCI_ANY_ID, |
| 247 | .subdevice = PCI_ANY_ID, | 246 | .subdevice = PCI_ANY_ID, |
| 248 | }, | 247 | }, |
diff --git a/drivers/char/agp/sworks-agp.c b/drivers/char/agp/sworks-agp.c index 0e054c134490..2fb27fe4c10c 100644 --- a/drivers/char/agp/sworks-agp.c +++ b/drivers/char/agp/sworks-agp.c | |||
| @@ -241,7 +241,8 @@ static void serverworks_tlbflush(struct agp_memory *temp) | |||
| 241 | while (readb(serverworks_private.registers+SVWRKS_POSTFLUSH) == 1) { | 241 | while (readb(serverworks_private.registers+SVWRKS_POSTFLUSH) == 1) { |
| 242 | cpu_relax(); | 242 | cpu_relax(); |
| 243 | if (time_after(jiffies, timeout)) { | 243 | if (time_after(jiffies, timeout)) { |
| 244 | printk(KERN_ERR PFX "TLB post flush took more than 3 seconds\n"); | 244 | dev_err(&serverworks_private.svrwrks_dev->dev, |
| 245 | "TLB post flush took more than 3 seconds\n"); | ||
| 245 | break; | 246 | break; |
| 246 | } | 247 | } |
| 247 | } | 248 | } |
| @@ -251,7 +252,8 @@ static void serverworks_tlbflush(struct agp_memory *temp) | |||
| 251 | while (readl(serverworks_private.registers+SVWRKS_DIRFLUSH) == 1) { | 252 | while (readl(serverworks_private.registers+SVWRKS_DIRFLUSH) == 1) { |
| 252 | cpu_relax(); | 253 | cpu_relax(); |
| 253 | if (time_after(jiffies, timeout)) { | 254 | if (time_after(jiffies, timeout)) { |
| 254 | printk(KERN_ERR PFX "TLB Dir flush took more than 3 seconds\n"); | 255 | dev_err(&serverworks_private.svrwrks_dev->dev, |
| 256 | "TLB Dir flush took more than 3 seconds\n"); | ||
| 255 | break; | 257 | break; |
| 256 | } | 258 | } |
| 257 | } | 259 | } |
| @@ -271,7 +273,7 @@ static int serverworks_configure(void) | |||
| 271 | temp = (temp & PCI_BASE_ADDRESS_MEM_MASK); | 273 | temp = (temp & PCI_BASE_ADDRESS_MEM_MASK); |
| 272 | serverworks_private.registers = (volatile u8 __iomem *) ioremap(temp, 4096); | 274 | serverworks_private.registers = (volatile u8 __iomem *) ioremap(temp, 4096); |
| 273 | if (!serverworks_private.registers) { | 275 | if (!serverworks_private.registers) { |
| 274 | printk (KERN_ERR PFX "Unable to ioremap() memory.\n"); | 276 | dev_err(&agp_bridge->dev->dev, "can't ioremap(%#x)\n", temp); |
| 275 | return -ENOMEM; | 277 | return -ENOMEM; |
| 276 | } | 278 | } |
| 277 | 279 | ||
| @@ -451,7 +453,7 @@ static int __devinit agp_serverworks_probe(struct pci_dev *pdev, | |||
| 451 | 453 | ||
| 452 | switch (pdev->device) { | 454 | switch (pdev->device) { |
| 453 | case 0x0006: | 455 | case 0x0006: |
| 454 | printk (KERN_ERR PFX "ServerWorks CNB20HE is unsupported due to lack of documentation.\n"); | 456 | dev_err(&pdev->dev, "ServerWorks CNB20HE is unsupported due to lack of documentation\n"); |
| 455 | return -ENODEV; | 457 | return -ENODEV; |
| 456 | 458 | ||
| 457 | case PCI_DEVICE_ID_SERVERWORKS_HE: | 459 | case PCI_DEVICE_ID_SERVERWORKS_HE: |
| @@ -461,8 +463,8 @@ static int __devinit agp_serverworks_probe(struct pci_dev *pdev, | |||
| 461 | 463 | ||
| 462 | default: | 464 | default: |
| 463 | if (cap_ptr) | 465 | if (cap_ptr) |
| 464 | printk(KERN_ERR PFX "Unsupported Serverworks chipset " | 466 | dev_err(&pdev->dev, "unsupported Serverworks chipset " |
| 465 | "(device id: %04x)\n", pdev->device); | 467 | "[%04x/%04x]\n", pdev->vendor, pdev->device); |
| 466 | return -ENODEV; | 468 | return -ENODEV; |
| 467 | } | 469 | } |
| 468 | 470 | ||
| @@ -470,8 +472,7 @@ static int __devinit agp_serverworks_probe(struct pci_dev *pdev, | |||
| 470 | bridge_dev = pci_get_bus_and_slot((unsigned int)pdev->bus->number, | 472 | bridge_dev = pci_get_bus_and_slot((unsigned int)pdev->bus->number, |
| 471 | PCI_DEVFN(0, 1)); | 473 | PCI_DEVFN(0, 1)); |
| 472 | if (!bridge_dev) { | 474 | if (!bridge_dev) { |
| 473 | printk(KERN_INFO PFX "Detected a Serverworks chipset " | 475 | dev_info(&pdev->dev, "can't find secondary device\n"); |
| 474 | "but could not find the secondary device.\n"); | ||
| 475 | return -ENODEV; | 476 | return -ENODEV; |
| 476 | } | 477 | } |
| 477 | 478 | ||
| @@ -482,8 +483,8 @@ static int __devinit agp_serverworks_probe(struct pci_dev *pdev, | |||
| 482 | if (temp & PCI_BASE_ADDRESS_MEM_TYPE_64) { | 483 | if (temp & PCI_BASE_ADDRESS_MEM_TYPE_64) { |
| 483 | pci_read_config_dword(pdev, SVWRKS_APSIZE + 4, &temp2); | 484 | pci_read_config_dword(pdev, SVWRKS_APSIZE + 4, &temp2); |
| 484 | if (temp2 != 0) { | 485 | if (temp2 != 0) { |
| 485 | printk(KERN_INFO PFX "Detected 64 bit aperture address, " | 486 | dev_info(&pdev->dev, "64 bit aperture address, " |
| 486 | "but top bits are not zero. Disabling agp\n"); | 487 | "but top bits are not zero; disabling AGP\n"); |
| 487 | return -ENODEV; | 488 | return -ENODEV; |
| 488 | } | 489 | } |
| 489 | serverworks_private.mm_addr_ofs = 0x18; | 490 | serverworks_private.mm_addr_ofs = 0x18; |
| @@ -495,8 +496,8 @@ static int __devinit agp_serverworks_probe(struct pci_dev *pdev, | |||
| 495 | pci_read_config_dword(pdev, | 496 | pci_read_config_dword(pdev, |
| 496 | serverworks_private.mm_addr_ofs + 4, &temp2); | 497 | serverworks_private.mm_addr_ofs + 4, &temp2); |
| 497 | if (temp2 != 0) { | 498 | if (temp2 != 0) { |
| 498 | printk(KERN_INFO PFX "Detected 64 bit MMIO address, " | 499 | dev_info(&pdev->dev, "64 bit MMIO address, but top " |
| 499 | "but top bits are not zero. Disabling agp\n"); | 500 | "bits are not zero; disabling AGP\n"); |
| 500 | return -ENODEV; | 501 | return -ENODEV; |
| 501 | } | 502 | } |
| 502 | } | 503 | } |
diff --git a/drivers/char/agp/uninorth-agp.c b/drivers/char/agp/uninorth-agp.c index d2fa3cfca02a..eef72709ec53 100644 --- a/drivers/char/agp/uninorth-agp.c +++ b/drivers/char/agp/uninorth-agp.c | |||
| @@ -46,8 +46,8 @@ static int uninorth_fetch_size(void) | |||
| 46 | break; | 46 | break; |
| 47 | 47 | ||
| 48 | if (i == agp_bridge->driver->num_aperture_sizes) { | 48 | if (i == agp_bridge->driver->num_aperture_sizes) { |
| 49 | printk(KERN_ERR PFX "Invalid aperture size, using" | 49 | dev_err(&agp_bridge->dev->dev, "invalid aperture size, " |
| 50 | " default\n"); | 50 | "using default\n"); |
| 51 | size = 0; | 51 | size = 0; |
| 52 | aperture = NULL; | 52 | aperture = NULL; |
| 53 | } | 53 | } |
| @@ -108,8 +108,8 @@ static int uninorth_configure(void) | |||
| 108 | 108 | ||
| 109 | current_size = A_SIZE_32(agp_bridge->current_size); | 109 | current_size = A_SIZE_32(agp_bridge->current_size); |
| 110 | 110 | ||
| 111 | printk(KERN_INFO PFX "configuring for size idx: %d\n", | 111 | dev_info(&agp_bridge->dev->dev, "configuring for size idx: %d\n", |
| 112 | current_size->size_value); | 112 | current_size->size_value); |
| 113 | 113 | ||
| 114 | /* aperture size and gatt addr */ | 114 | /* aperture size and gatt addr */ |
| 115 | pci_write_config_dword(agp_bridge->dev, | 115 | pci_write_config_dword(agp_bridge->dev, |
| @@ -197,8 +197,9 @@ static int u3_insert_memory(struct agp_memory *mem, off_t pg_start, int type) | |||
| 197 | gp = (u32 *) &agp_bridge->gatt_table[pg_start]; | 197 | gp = (u32 *) &agp_bridge->gatt_table[pg_start]; |
| 198 | for (i = 0; i < mem->page_count; ++i) { | 198 | for (i = 0; i < mem->page_count; ++i) { |
| 199 | if (gp[i]) { | 199 | if (gp[i]) { |
| 200 | printk("u3_insert_memory: entry 0x%x occupied (%x)\n", | 200 | dev_info(&agp_bridge->dev->dev, |
| 201 | i, gp[i]); | 201 | "u3_insert_memory: entry 0x%x occupied (%x)\n", |
| 202 | i, gp[i]); | ||
| 202 | return -EBUSY; | 203 | return -EBUSY; |
| 203 | } | 204 | } |
| 204 | } | 205 | } |
| @@ -276,8 +277,8 @@ static void uninorth_agp_enable(struct agp_bridge_data *bridge, u32 mode) | |||
| 276 | &scratch); | 277 | &scratch); |
| 277 | } while ((scratch & PCI_AGP_COMMAND_AGP) == 0 && ++timeout < 1000); | 278 | } while ((scratch & PCI_AGP_COMMAND_AGP) == 0 && ++timeout < 1000); |
| 278 | if ((scratch & PCI_AGP_COMMAND_AGP) == 0) | 279 | if ((scratch & PCI_AGP_COMMAND_AGP) == 0) |
| 279 | printk(KERN_ERR PFX "failed to write UniNorth AGP" | 280 | dev_err(&bridge->dev->dev, "can't write UniNorth AGP " |
| 280 | " command register\n"); | 281 | "command register\n"); |
| 281 | 282 | ||
| 282 | if (uninorth_rev >= 0x30) { | 283 | if (uninorth_rev >= 0x30) { |
| 283 | /* This is an AGP V3 */ | 284 | /* This is an AGP V3 */ |
| @@ -330,8 +331,8 @@ static int agp_uninorth_suspend(struct pci_dev *pdev) | |||
| 330 | pci_read_config_dword(device, agp + PCI_AGP_COMMAND, &cmd); | 331 | pci_read_config_dword(device, agp + PCI_AGP_COMMAND, &cmd); |
| 331 | if (!(cmd & PCI_AGP_COMMAND_AGP)) | 332 | if (!(cmd & PCI_AGP_COMMAND_AGP)) |
| 332 | continue; | 333 | continue; |
| 333 | printk("uninorth-agp: disabling AGP on device %s\n", | 334 | dev_info(&pdev->dev, "disabling AGP on device %s\n", |
| 334 | pci_name(device)); | 335 | pci_name(device)); |
| 335 | cmd &= ~PCI_AGP_COMMAND_AGP; | 336 | cmd &= ~PCI_AGP_COMMAND_AGP; |
| 336 | pci_write_config_dword(device, agp + PCI_AGP_COMMAND, cmd); | 337 | pci_write_config_dword(device, agp + PCI_AGP_COMMAND, cmd); |
| 337 | } | 338 | } |
| @@ -341,8 +342,7 @@ static int agp_uninorth_suspend(struct pci_dev *pdev) | |||
| 341 | pci_read_config_dword(pdev, agp + PCI_AGP_COMMAND, &cmd); | 342 | pci_read_config_dword(pdev, agp + PCI_AGP_COMMAND, &cmd); |
| 342 | bridge->dev_private_data = (void *)(long)cmd; | 343 | bridge->dev_private_data = (void *)(long)cmd; |
| 343 | if (cmd & PCI_AGP_COMMAND_AGP) { | 344 | if (cmd & PCI_AGP_COMMAND_AGP) { |
| 344 | printk("uninorth-agp: disabling AGP on bridge %s\n", | 345 | dev_info(&pdev->dev, "disabling AGP on bridge\n"); |
| 345 | pci_name(pdev)); | ||
| 346 | cmd &= ~PCI_AGP_COMMAND_AGP; | 346 | cmd &= ~PCI_AGP_COMMAND_AGP; |
| 347 | pci_write_config_dword(pdev, agp + PCI_AGP_COMMAND, cmd); | 347 | pci_write_config_dword(pdev, agp + PCI_AGP_COMMAND, cmd); |
| 348 | } | 348 | } |
| @@ -591,14 +591,14 @@ static int __devinit agp_uninorth_probe(struct pci_dev *pdev, | |||
| 591 | /* probe for known chipsets */ | 591 | /* probe for known chipsets */ |
| 592 | for (j = 0; devs[j].chipset_name != NULL; ++j) { | 592 | for (j = 0; devs[j].chipset_name != NULL; ++j) { |
| 593 | if (pdev->device == devs[j].device_id) { | 593 | if (pdev->device == devs[j].device_id) { |
| 594 | printk(KERN_INFO PFX "Detected Apple %s chipset\n", | 594 | dev_info(&pdev->dev, "Apple %s chipset\n", |
| 595 | devs[j].chipset_name); | 595 | devs[j].chipset_name); |
| 596 | goto found; | 596 | goto found; |
| 597 | } | 597 | } |
| 598 | } | 598 | } |
| 599 | 599 | ||
| 600 | printk(KERN_ERR PFX "Unsupported Apple chipset (device id: %04x).\n", | 600 | dev_err(&pdev->dev, "unsupported Apple chipset [%04x/%04x]\n", |
| 601 | pdev->device); | 601 | pdev->vendor, pdev->device); |
| 602 | return -ENODEV; | 602 | return -ENODEV; |
| 603 | 603 | ||
| 604 | found: | 604 | found: |
diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c index 02aac104842d..fd64137b1ab9 100644 --- a/drivers/char/hvc_console.c +++ b/drivers/char/hvc_console.c | |||
| @@ -322,11 +322,10 @@ static int hvc_open(struct tty_struct *tty, struct file * filp) | |||
| 322 | 322 | ||
| 323 | hp->tty = tty; | 323 | hp->tty = tty; |
| 324 | 324 | ||
| 325 | if (hp->ops->notifier_add) | ||
| 326 | rc = hp->ops->notifier_add(hp, hp->data); | ||
| 327 | |||
| 328 | spin_unlock_irqrestore(&hp->lock, flags); | 325 | spin_unlock_irqrestore(&hp->lock, flags); |
| 329 | 326 | ||
| 327 | if (hp->ops->notifier_add) | ||
| 328 | rc = hp->ops->notifier_add(hp, hp->data); | ||
| 330 | 329 | ||
| 331 | /* | 330 | /* |
| 332 | * If the notifier fails we return an error. The tty layer | 331 | * If the notifier fails we return an error. The tty layer |
diff --git a/drivers/char/hw_random/via-rng.c b/drivers/char/hw_random/via-rng.c index f7feae4ebb5e..128202e18fc9 100644 --- a/drivers/char/hw_random/via-rng.c +++ b/drivers/char/hw_random/via-rng.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | #include <asm/io.h> | 31 | #include <asm/io.h> |
| 32 | #include <asm/msr.h> | 32 | #include <asm/msr.h> |
| 33 | #include <asm/cpufeature.h> | 33 | #include <asm/cpufeature.h> |
| 34 | #include <asm/i387.h> | ||
| 34 | 35 | ||
| 35 | 36 | ||
| 36 | #define PFX KBUILD_MODNAME ": " | 37 | #define PFX KBUILD_MODNAME ": " |
| @@ -67,16 +68,23 @@ enum { | |||
| 67 | * Another possible performance boost may come from simply buffering | 68 | * Another possible performance boost may come from simply buffering |
| 68 | * until we have 4 bytes, thus returning a u32 at a time, | 69 | * until we have 4 bytes, thus returning a u32 at a time, |
| 69 | * instead of the current u8-at-a-time. | 70 | * instead of the current u8-at-a-time. |
| 71 | * | ||
| 72 | * Padlock instructions can generate a spurious DNA fault, so | ||
| 73 | * we have to call them in the context of irq_ts_save/restore() | ||
| 70 | */ | 74 | */ |
| 71 | 75 | ||
| 72 | static inline u32 xstore(u32 *addr, u32 edx_in) | 76 | static inline u32 xstore(u32 *addr, u32 edx_in) |
| 73 | { | 77 | { |
| 74 | u32 eax_out; | 78 | u32 eax_out; |
| 79 | int ts_state; | ||
| 80 | |||
| 81 | ts_state = irq_ts_save(); | ||
| 75 | 82 | ||
| 76 | asm(".byte 0x0F,0xA7,0xC0 /* xstore %%edi (addr=%0) */" | 83 | asm(".byte 0x0F,0xA7,0xC0 /* xstore %%edi (addr=%0) */" |
| 77 | :"=m"(*addr), "=a"(eax_out) | 84 | :"=m"(*addr), "=a"(eax_out) |
| 78 | :"D"(addr), "d"(edx_in)); | 85 | :"D"(addr), "d"(edx_in)); |
| 79 | 86 | ||
| 87 | irq_ts_restore(ts_state); | ||
| 80 | return eax_out; | 88 | return eax_out; |
| 81 | } | 89 | } |
| 82 | 90 | ||
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c index f52931e1c16e..8e8afb6141f9 100644 --- a/drivers/char/ipmi/ipmi_si_intf.c +++ b/drivers/char/ipmi/ipmi_si_intf.c | |||
| @@ -2695,15 +2695,13 @@ static __devinit void default_find_bmc(void) | |||
| 2695 | for (i = 0; ; i++) { | 2695 | for (i = 0; ; i++) { |
| 2696 | if (!ipmi_defaults[i].port) | 2696 | if (!ipmi_defaults[i].port) |
| 2697 | break; | 2697 | break; |
| 2698 | |||
| 2699 | info = kzalloc(sizeof(*info), GFP_KERNEL); | ||
| 2700 | if (!info) | ||
| 2701 | return; | ||
| 2702 | |||
| 2703 | #ifdef CONFIG_PPC_MERGE | 2698 | #ifdef CONFIG_PPC_MERGE |
| 2704 | if (check_legacy_ioport(ipmi_defaults[i].port)) | 2699 | if (check_legacy_ioport(ipmi_defaults[i].port)) |
| 2705 | continue; | 2700 | continue; |
| 2706 | #endif | 2701 | #endif |
| 2702 | info = kzalloc(sizeof(*info), GFP_KERNEL); | ||
| 2703 | if (!info) | ||
| 2704 | return; | ||
| 2707 | 2705 | ||
| 2708 | info->addr_source = NULL; | 2706 | info->addr_source = NULL; |
| 2709 | 2707 | ||
diff --git a/drivers/char/pcmcia/ipwireless/tty.c b/drivers/char/pcmcia/ipwireless/tty.c index b1414507997c..3a23e7694d55 100644 --- a/drivers/char/pcmcia/ipwireless/tty.c +++ b/drivers/char/pcmcia/ipwireless/tty.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | #include <linux/tty_driver.h> | 29 | #include <linux/tty_driver.h> |
| 30 | #include <linux/tty_flip.h> | 30 | #include <linux/tty_flip.h> |
| 31 | #include <linux/uaccess.h> | 31 | #include <linux/uaccess.h> |
| 32 | #include <linux/version.h> | ||
| 33 | 32 | ||
| 34 | #include "tty.h" | 33 | #include "tty.h" |
| 35 | #include "network.h" | 34 | #include "network.h" |
diff --git a/drivers/char/random.c b/drivers/char/random.c index e0d0e371909c..7ce1ac4baa6d 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c | |||
| @@ -407,7 +407,7 @@ struct entropy_store { | |||
| 407 | /* read-write data: */ | 407 | /* read-write data: */ |
| 408 | spinlock_t lock; | 408 | spinlock_t lock; |
| 409 | unsigned add_ptr; | 409 | unsigned add_ptr; |
| 410 | int entropy_count; | 410 | int entropy_count; /* Must at no time exceed ->POOLBITS! */ |
| 411 | int input_rotate; | 411 | int input_rotate; |
| 412 | }; | 412 | }; |
| 413 | 413 | ||
| @@ -520,6 +520,7 @@ static void mix_pool_bytes(struct entropy_store *r, const void *in, int bytes) | |||
| 520 | static void credit_entropy_bits(struct entropy_store *r, int nbits) | 520 | static void credit_entropy_bits(struct entropy_store *r, int nbits) |
| 521 | { | 521 | { |
| 522 | unsigned long flags; | 522 | unsigned long flags; |
| 523 | int entropy_count; | ||
| 523 | 524 | ||
| 524 | if (!nbits) | 525 | if (!nbits) |
| 525 | return; | 526 | return; |
| @@ -527,20 +528,20 @@ static void credit_entropy_bits(struct entropy_store *r, int nbits) | |||
| 527 | spin_lock_irqsave(&r->lock, flags); | 528 | spin_lock_irqsave(&r->lock, flags); |
| 528 | 529 | ||
| 529 | DEBUG_ENT("added %d entropy credits to %s\n", nbits, r->name); | 530 | DEBUG_ENT("added %d entropy credits to %s\n", nbits, r->name); |
| 530 | r->entropy_count += nbits; | 531 | entropy_count = r->entropy_count; |
| 531 | if (r->entropy_count < 0) { | 532 | entropy_count += nbits; |
| 533 | if (entropy_count < 0) { | ||
| 532 | DEBUG_ENT("negative entropy/overflow\n"); | 534 | DEBUG_ENT("negative entropy/overflow\n"); |
| 533 | r->entropy_count = 0; | 535 | entropy_count = 0; |
| 534 | } else if (r->entropy_count > r->poolinfo->POOLBITS) | 536 | } else if (entropy_count > r->poolinfo->POOLBITS) |
| 535 | r->entropy_count = r->poolinfo->POOLBITS; | 537 | entropy_count = r->poolinfo->POOLBITS; |
| 538 | r->entropy_count = entropy_count; | ||
| 536 | 539 | ||
| 537 | /* should we wake readers? */ | 540 | /* should we wake readers? */ |
| 538 | if (r == &input_pool && | 541 | if (r == &input_pool && entropy_count >= random_read_wakeup_thresh) { |
| 539 | r->entropy_count >= random_read_wakeup_thresh) { | ||
| 540 | wake_up_interruptible(&random_read_wait); | 542 | wake_up_interruptible(&random_read_wait); |
| 541 | kill_fasync(&fasync, SIGIO, POLL_IN); | 543 | kill_fasync(&fasync, SIGIO, POLL_IN); |
| 542 | } | 544 | } |
| 543 | |||
| 544 | spin_unlock_irqrestore(&r->lock, flags); | 545 | spin_unlock_irqrestore(&r->lock, flags); |
| 545 | } | 546 | } |
| 546 | 547 | ||
| @@ -1571,6 +1572,7 @@ u32 secure_ipv4_port_ephemeral(__be32 saddr, __be32 daddr, __be16 dport) | |||
| 1571 | 1572 | ||
| 1572 | return half_md4_transform(hash, keyptr->secret); | 1573 | return half_md4_transform(hash, keyptr->secret); |
| 1573 | } | 1574 | } |
| 1575 | EXPORT_SYMBOL_GPL(secure_ipv4_port_ephemeral); | ||
| 1574 | 1576 | ||
| 1575 | #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) | 1577 | #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) |
| 1576 | u32 secure_ipv6_port_ephemeral(const __be32 *saddr, const __be32 *daddr, | 1578 | u32 secure_ipv6_port_ephemeral(const __be32 *saddr, const __be32 *daddr, |
diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c index d9799e2bcfbf..f53d4d00faf0 100644 --- a/drivers/char/rtc.c +++ b/drivers/char/rtc.c | |||
| @@ -78,7 +78,6 @@ | |||
| 78 | #include <linux/wait.h> | 78 | #include <linux/wait.h> |
| 79 | #include <linux/bcd.h> | 79 | #include <linux/bcd.h> |
| 80 | #include <linux/delay.h> | 80 | #include <linux/delay.h> |
| 81 | #include <linux/smp_lock.h> | ||
| 82 | #include <linux/uaccess.h> | 81 | #include <linux/uaccess.h> |
| 83 | 82 | ||
| 84 | #include <asm/current.h> | 83 | #include <asm/current.h> |
diff --git a/drivers/char/synclink_gt.c b/drivers/char/synclink_gt.c index 509c89ac5bd3..08911ed66494 100644 --- a/drivers/char/synclink_gt.c +++ b/drivers/char/synclink_gt.c | |||
| @@ -47,7 +47,6 @@ | |||
| 47 | 47 | ||
| 48 | 48 | ||
| 49 | #include <linux/module.h> | 49 | #include <linux/module.h> |
| 50 | #include <linux/version.h> | ||
| 51 | #include <linux/errno.h> | 50 | #include <linux/errno.h> |
| 52 | #include <linux/signal.h> | 51 | #include <linux/signal.h> |
| 53 | #include <linux/sched.h> | 52 | #include <linux/sched.h> |
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c index 0e6866fe0f96..daeb8f766971 100644 --- a/drivers/char/tty_io.c +++ b/drivers/char/tty_io.c | |||
| @@ -2496,45 +2496,26 @@ static int tiocgwinsz(struct tty_struct *tty, struct winsize __user *arg) | |||
| 2496 | } | 2496 | } |
| 2497 | 2497 | ||
| 2498 | /** | 2498 | /** |
| 2499 | * tiocswinsz - implement window size set ioctl | 2499 | * tty_do_resize - resize event |
| 2500 | * @tty; tty | 2500 | * @tty: tty being resized |
| 2501 | * @arg: user buffer for result | 2501 | * @real_tty: real tty (not the same as tty if using a pty/tty pair) |
| 2502 | * @rows: rows (character) | ||
| 2503 | * @cols: cols (character) | ||
| 2502 | * | 2504 | * |
| 2503 | * Copies the user idea of the window size to the kernel. Traditionally | 2505 | * Update the termios variables and send the neccessary signals to |
| 2504 | * this is just advisory information but for the Linux console it | 2506 | * peform a terminal resize correctly |
| 2505 | * actually has driver level meaning and triggers a VC resize. | ||
| 2506 | * | ||
| 2507 | * Locking: | ||
| 2508 | * Called function use the console_sem is used to ensure we do | ||
| 2509 | * not try and resize the console twice at once. | ||
| 2510 | * The tty->termios_mutex is used to ensure we don't double | ||
| 2511 | * resize and get confused. Lock order - tty->termios_mutex before | ||
| 2512 | * console sem | ||
| 2513 | */ | 2507 | */ |
| 2514 | 2508 | ||
| 2515 | static int tiocswinsz(struct tty_struct *tty, struct tty_struct *real_tty, | 2509 | int tty_do_resize(struct tty_struct *tty, struct tty_struct *real_tty, |
| 2516 | struct winsize __user *arg) | 2510 | struct winsize *ws) |
| 2517 | { | 2511 | { |
| 2518 | struct winsize tmp_ws; | ||
| 2519 | struct pid *pgrp, *rpgrp; | 2512 | struct pid *pgrp, *rpgrp; |
| 2520 | unsigned long flags; | 2513 | unsigned long flags; |
| 2521 | 2514 | ||
| 2522 | if (copy_from_user(&tmp_ws, arg, sizeof(*arg))) | 2515 | /* For a PTY we need to lock the tty side */ |
| 2523 | return -EFAULT; | 2516 | mutex_lock(&real_tty->termios_mutex); |
| 2524 | 2517 | if (!memcmp(ws, &tty->winsize, sizeof(*ws))) | |
| 2525 | mutex_lock(&tty->termios_mutex); | ||
| 2526 | if (!memcmp(&tmp_ws, &tty->winsize, sizeof(*arg))) | ||
| 2527 | goto done; | 2518 | goto done; |
| 2528 | |||
| 2529 | #ifdef CONFIG_VT | ||
| 2530 | if (tty->driver->type == TTY_DRIVER_TYPE_CONSOLE) { | ||
| 2531 | if (vc_lock_resize(tty->driver_data, tmp_ws.ws_col, | ||
| 2532 | tmp_ws.ws_row)) { | ||
| 2533 | mutex_unlock(&tty->termios_mutex); | ||
| 2534 | return -ENXIO; | ||
| 2535 | } | ||
| 2536 | } | ||
| 2537 | #endif | ||
| 2538 | /* Get the PID values and reference them so we can | 2519 | /* Get the PID values and reference them so we can |
| 2539 | avoid holding the tty ctrl lock while sending signals */ | 2520 | avoid holding the tty ctrl lock while sending signals */ |
| 2540 | spin_lock_irqsave(&tty->ctrl_lock, flags); | 2521 | spin_lock_irqsave(&tty->ctrl_lock, flags); |
| @@ -2550,14 +2531,42 @@ static int tiocswinsz(struct tty_struct *tty, struct tty_struct *real_tty, | |||
| 2550 | put_pid(pgrp); | 2531 | put_pid(pgrp); |
| 2551 | put_pid(rpgrp); | 2532 | put_pid(rpgrp); |
| 2552 | 2533 | ||
| 2553 | tty->winsize = tmp_ws; | 2534 | tty->winsize = *ws; |
| 2554 | real_tty->winsize = tmp_ws; | 2535 | real_tty->winsize = *ws; |
| 2555 | done: | 2536 | done: |
| 2556 | mutex_unlock(&tty->termios_mutex); | 2537 | mutex_unlock(&real_tty->termios_mutex); |
| 2557 | return 0; | 2538 | return 0; |
| 2558 | } | 2539 | } |
| 2559 | 2540 | ||
| 2560 | /** | 2541 | /** |
| 2542 | * tiocswinsz - implement window size set ioctl | ||
| 2543 | * @tty; tty | ||
| 2544 | * @arg: user buffer for result | ||
| 2545 | * | ||
| 2546 | * Copies the user idea of the window size to the kernel. Traditionally | ||
| 2547 | * this is just advisory information but for the Linux console it | ||
| 2548 | * actually has driver level meaning and triggers a VC resize. | ||
| 2549 | * | ||
| 2550 | * Locking: | ||
| 2551 | * Driver dependant. The default do_resize method takes the | ||
| 2552 | * tty termios mutex and ctrl_lock. The console takes its own lock | ||
| 2553 | * then calls into the default method. | ||
| 2554 | */ | ||
| 2555 | |||
| 2556 | static int tiocswinsz(struct tty_struct *tty, struct tty_struct *real_tty, | ||
| 2557 | struct winsize __user *arg) | ||
| 2558 | { | ||
| 2559 | struct winsize tmp_ws; | ||
| 2560 | if (copy_from_user(&tmp_ws, arg, sizeof(*arg))) | ||
| 2561 | return -EFAULT; | ||
| 2562 | |||
| 2563 | if (tty->ops->resize) | ||
| 2564 | return tty->ops->resize(tty, real_tty, &tmp_ws); | ||
| 2565 | else | ||
| 2566 | return tty_do_resize(tty, real_tty, &tmp_ws); | ||
| 2567 | } | ||
| 2568 | |||
| 2569 | /** | ||
| 2561 | * tioccons - allow admin to move logical console | 2570 | * tioccons - allow admin to move logical console |
| 2562 | * @file: the file to become console | 2571 | * @file: the file to become console |
| 2563 | * | 2572 | * |
diff --git a/drivers/char/tty_ioctl.c b/drivers/char/tty_ioctl.c index ea9fc5d03b99..bf34e4597421 100644 --- a/drivers/char/tty_ioctl.c +++ b/drivers/char/tty_ioctl.c | |||
| @@ -937,12 +937,14 @@ int tty_mode_ioctl(struct tty_struct *tty, struct file *file, | |||
| 937 | return 0; | 937 | return 0; |
| 938 | #endif | 938 | #endif |
| 939 | case TIOCGSOFTCAR: | 939 | case TIOCGSOFTCAR: |
| 940 | return put_user(C_CLOCAL(tty) ? 1 : 0, | 940 | /* FIXME: for correctness we may need to take the termios |
| 941 | lock here - review */ | ||
| 942 | return put_user(C_CLOCAL(real_tty) ? 1 : 0, | ||
| 941 | (int __user *)arg); | 943 | (int __user *)arg); |
| 942 | case TIOCSSOFTCAR: | 944 | case TIOCSSOFTCAR: |
| 943 | if (get_user(arg, (unsigned int __user *) arg)) | 945 | if (get_user(arg, (unsigned int __user *) arg)) |
| 944 | return -EFAULT; | 946 | return -EFAULT; |
| 945 | return tty_change_softcar(tty, arg); | 947 | return tty_change_softcar(real_tty, arg); |
| 946 | default: | 948 | default: |
| 947 | return -ENOIOCTLCMD; | 949 | return -ENOIOCTLCMD; |
| 948 | } | 950 | } |
diff --git a/drivers/char/vt.c b/drivers/char/vt.c index 1bc00c9d860d..60359c360912 100644 --- a/drivers/char/vt.c +++ b/drivers/char/vt.c | |||
| @@ -803,7 +803,25 @@ static inline int resize_screen(struct vc_data *vc, int width, int height, | |||
| 803 | */ | 803 | */ |
| 804 | #define VC_RESIZE_MAXCOL (32767) | 804 | #define VC_RESIZE_MAXCOL (32767) |
| 805 | #define VC_RESIZE_MAXROW (32767) | 805 | #define VC_RESIZE_MAXROW (32767) |
| 806 | int vc_resize(struct vc_data *vc, unsigned int cols, unsigned int lines) | 806 | |
| 807 | /** | ||
| 808 | * vc_do_resize - resizing method for the tty | ||
| 809 | * @tty: tty being resized | ||
| 810 | * @real_tty: real tty (different to tty if a pty/tty pair) | ||
| 811 | * @vc: virtual console private data | ||
| 812 | * @cols: columns | ||
| 813 | * @lines: lines | ||
| 814 | * | ||
| 815 | * Resize a virtual console, clipping according to the actual constraints. | ||
| 816 | * If the caller passes a tty structure then update the termios winsize | ||
| 817 | * information and perform any neccessary signal handling. | ||
| 818 | * | ||
| 819 | * Caller must hold the console semaphore. Takes the termios mutex and | ||
| 820 | * ctrl_lock of the tty IFF a tty is passed. | ||
| 821 | */ | ||
| 822 | |||
| 823 | static int vc_do_resize(struct tty_struct *tty, struct tty_struct *real_tty, | ||
| 824 | struct vc_data *vc, unsigned int cols, unsigned int lines) | ||
| 807 | { | 825 | { |
| 808 | unsigned long old_origin, new_origin, new_scr_end, rlth, rrem, err = 0; | 826 | unsigned long old_origin, new_origin, new_scr_end, rlth, rrem, err = 0; |
| 809 | unsigned int old_cols, old_rows, old_row_size, old_screen_size; | 827 | unsigned int old_cols, old_rows, old_row_size, old_screen_size; |
| @@ -907,24 +925,15 @@ int vc_resize(struct vc_data *vc, unsigned int cols, unsigned int lines) | |||
| 907 | gotoxy(vc, vc->vc_x, vc->vc_y); | 925 | gotoxy(vc, vc->vc_x, vc->vc_y); |
| 908 | save_cur(vc); | 926 | save_cur(vc); |
| 909 | 927 | ||
| 910 | if (vc->vc_tty) { | 928 | if (tty) { |
| 911 | struct winsize ws, *cws = &vc->vc_tty->winsize; | 929 | /* Rewrite the requested winsize data with the actual |
| 912 | struct pid *pgrp = NULL; | 930 | resulting sizes */ |
| 913 | 931 | struct winsize ws; | |
| 914 | memset(&ws, 0, sizeof(ws)); | 932 | memset(&ws, 0, sizeof(ws)); |
| 915 | ws.ws_row = vc->vc_rows; | 933 | ws.ws_row = vc->vc_rows; |
| 916 | ws.ws_col = vc->vc_cols; | 934 | ws.ws_col = vc->vc_cols; |
| 917 | ws.ws_ypixel = vc->vc_scan_lines; | 935 | ws.ws_ypixel = vc->vc_scan_lines; |
| 918 | 936 | tty_do_resize(tty, real_tty, &ws); | |
| 919 | spin_lock_irq(&vc->vc_tty->ctrl_lock); | ||
| 920 | if ((ws.ws_row != cws->ws_row || ws.ws_col != cws->ws_col)) | ||
| 921 | pgrp = get_pid(vc->vc_tty->pgrp); | ||
| 922 | spin_unlock_irq(&vc->vc_tty->ctrl_lock); | ||
| 923 | if (pgrp) { | ||
| 924 | kill_pgrp(vc->vc_tty->pgrp, SIGWINCH, 1); | ||
| 925 | put_pid(pgrp); | ||
| 926 | } | ||
| 927 | *cws = ws; | ||
| 928 | } | 937 | } |
| 929 | 938 | ||
| 930 | if (CON_IS_VISIBLE(vc)) | 939 | if (CON_IS_VISIBLE(vc)) |
| @@ -932,14 +941,47 @@ int vc_resize(struct vc_data *vc, unsigned int cols, unsigned int lines) | |||
| 932 | return err; | 941 | return err; |
| 933 | } | 942 | } |
| 934 | 943 | ||
| 935 | int vc_lock_resize(struct vc_data *vc, unsigned int cols, unsigned int lines) | 944 | /** |
| 945 | * vc_resize - resize a VT | ||
| 946 | * @vc: virtual console | ||
| 947 | * @cols: columns | ||
| 948 | * @rows: rows | ||
| 949 | * | ||
| 950 | * Resize a virtual console as seen from the console end of things. We | ||
| 951 | * use the common vc_do_resize methods to update the structures. The | ||
| 952 | * caller must hold the console sem to protect console internals and | ||
| 953 | * vc->vc_tty | ||
| 954 | */ | ||
| 955 | |||
| 956 | int vc_resize(struct vc_data *vc, unsigned int cols, unsigned int rows) | ||
| 957 | { | ||
| 958 | return vc_do_resize(vc->vc_tty, vc->vc_tty, vc, cols, rows); | ||
| 959 | } | ||
| 960 | |||
| 961 | /** | ||
| 962 | * vt_resize - resize a VT | ||
| 963 | * @tty: tty to resize | ||
| 964 | * @real_tty: tty if a pty/tty pair | ||
| 965 | * @ws: winsize attributes | ||
| 966 | * | ||
| 967 | * Resize a virtual terminal. This is called by the tty layer as we | ||
| 968 | * register our own handler for resizing. The mutual helper does all | ||
| 969 | * the actual work. | ||
| 970 | * | ||
| 971 | * Takes the console sem and the called methods then take the tty | ||
| 972 | * termios_mutex and the tty ctrl_lock in that order. | ||
| 973 | */ | ||
| 974 | |||
| 975 | int vt_resize(struct tty_struct *tty, struct tty_struct *real_tty, | ||
| 976 | struct winsize *ws) | ||
| 936 | { | 977 | { |
| 937 | int rc; | 978 | struct vc_data *vc = tty->driver_data; |
| 979 | int ret; | ||
| 938 | 980 | ||
| 939 | acquire_console_sem(); | 981 | acquire_console_sem(); |
| 940 | rc = vc_resize(vc, cols, lines); | 982 | ret = vc_do_resize(tty, real_tty, vc, ws->ws_col, ws->ws_row); |
| 941 | release_console_sem(); | 983 | release_console_sem(); |
| 942 | return rc; | 984 | return ret; |
| 943 | } | 985 | } |
| 944 | 986 | ||
| 945 | void vc_deallocate(unsigned int currcons) | 987 | void vc_deallocate(unsigned int currcons) |
| @@ -2907,6 +2949,7 @@ static const struct tty_operations con_ops = { | |||
| 2907 | .start = con_start, | 2949 | .start = con_start, |
| 2908 | .throttle = con_throttle, | 2950 | .throttle = con_throttle, |
| 2909 | .unthrottle = con_unthrottle, | 2951 | .unthrottle = con_unthrottle, |
| 2952 | .resize = vt_resize, | ||
| 2910 | }; | 2953 | }; |
| 2911 | 2954 | ||
| 2912 | int __init vty_init(void) | 2955 | int __init vty_init(void) |
| @@ -4061,7 +4104,6 @@ EXPORT_SYMBOL(default_blu); | |||
| 4061 | EXPORT_SYMBOL(update_region); | 4104 | EXPORT_SYMBOL(update_region); |
| 4062 | EXPORT_SYMBOL(redraw_screen); | 4105 | EXPORT_SYMBOL(redraw_screen); |
| 4063 | EXPORT_SYMBOL(vc_resize); | 4106 | EXPORT_SYMBOL(vc_resize); |
| 4064 | EXPORT_SYMBOL(vc_lock_resize); | ||
| 4065 | EXPORT_SYMBOL(fg_console); | 4107 | EXPORT_SYMBOL(fg_console); |
| 4066 | EXPORT_SYMBOL(console_blank_hook); | 4108 | EXPORT_SYMBOL(console_blank_hook); |
| 4067 | EXPORT_SYMBOL(console_blanked); | 4109 | EXPORT_SYMBOL(console_blanked); |
diff --git a/drivers/char/vt_ioctl.c b/drivers/char/vt_ioctl.c index 3211afd9d57e..c904e9ad4a71 100644 --- a/drivers/char/vt_ioctl.c +++ b/drivers/char/vt_ioctl.c | |||
| @@ -947,14 +947,16 @@ int vt_ioctl(struct tty_struct *tty, struct file * file, | |||
| 947 | get_user(cc, &vtsizes->v_cols)) | 947 | get_user(cc, &vtsizes->v_cols)) |
| 948 | ret = -EFAULT; | 948 | ret = -EFAULT; |
| 949 | else { | 949 | else { |
| 950 | acquire_console_sem(); | ||
| 950 | for (i = 0; i < MAX_NR_CONSOLES; i++) { | 951 | for (i = 0; i < MAX_NR_CONSOLES; i++) { |
| 951 | vc = vc_cons[i].d; | 952 | vc = vc_cons[i].d; |
| 952 | 953 | ||
| 953 | if (vc) { | 954 | if (vc) { |
| 954 | vc->vc_resize_user = 1; | 955 | vc->vc_resize_user = 1; |
| 955 | vc_lock_resize(vc_cons[i].d, cc, ll); | 956 | vc_resize(vc_cons[i].d, cc, ll); |
| 956 | } | 957 | } |
| 957 | } | 958 | } |
| 959 | release_console_sem(); | ||
| 958 | } | 960 | } |
| 959 | break; | 961 | break; |
| 960 | } | 962 | } |
diff --git a/drivers/char/xilinx_hwicap/buffer_icap.h b/drivers/char/xilinx_hwicap/buffer_icap.h index c5b1840906b2..8b0252bf06e2 100644 --- a/drivers/char/xilinx_hwicap/buffer_icap.h +++ b/drivers/char/xilinx_hwicap/buffer_icap.h | |||
| @@ -38,7 +38,6 @@ | |||
| 38 | 38 | ||
| 39 | #include <linux/types.h> | 39 | #include <linux/types.h> |
| 40 | #include <linux/cdev.h> | 40 | #include <linux/cdev.h> |
| 41 | #include <linux/version.h> | ||
| 42 | #include <linux/platform_device.h> | 41 | #include <linux/platform_device.h> |
| 43 | 42 | ||
| 44 | #include <asm/io.h> | 43 | #include <asm/io.h> |
diff --git a/drivers/char/xilinx_hwicap/fifo_icap.h b/drivers/char/xilinx_hwicap/fifo_icap.h index ffabd3ba2bd8..62bda453c90b 100644 --- a/drivers/char/xilinx_hwicap/fifo_icap.h +++ b/drivers/char/xilinx_hwicap/fifo_icap.h | |||
| @@ -38,7 +38,6 @@ | |||
| 38 | 38 | ||
| 39 | #include <linux/types.h> | 39 | #include <linux/types.h> |
| 40 | #include <linux/cdev.h> | 40 | #include <linux/cdev.h> |
| 41 | #include <linux/version.h> | ||
| 42 | #include <linux/platform_device.h> | 41 | #include <linux/platform_device.h> |
| 43 | 42 | ||
| 44 | #include <asm/io.h> | 43 | #include <asm/io.h> |
diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.c b/drivers/char/xilinx_hwicap/xilinx_hwicap.c index 8bfee5fb7223..278c9857bcf5 100644 --- a/drivers/char/xilinx_hwicap/xilinx_hwicap.c +++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.c | |||
| @@ -74,7 +74,6 @@ | |||
| 74 | * currently programmed in the FPGA. | 74 | * currently programmed in the FPGA. |
| 75 | */ | 75 | */ |
| 76 | 76 | ||
| 77 | #include <linux/version.h> | ||
| 78 | #include <linux/module.h> | 77 | #include <linux/module.h> |
| 79 | #include <linux/kernel.h> | 78 | #include <linux/kernel.h> |
| 80 | #include <linux/types.h> | 79 | #include <linux/types.h> |
diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.h b/drivers/char/xilinx_hwicap/xilinx_hwicap.h index 1f9c8b082dbe..24d0d9b938fb 100644 --- a/drivers/char/xilinx_hwicap/xilinx_hwicap.h +++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.h | |||
| @@ -38,7 +38,6 @@ | |||
| 38 | 38 | ||
| 39 | #include <linux/types.h> | 39 | #include <linux/types.h> |
| 40 | #include <linux/cdev.h> | 40 | #include <linux/cdev.h> |
| 41 | #include <linux/version.h> | ||
| 42 | #include <linux/platform_device.h> | 41 | #include <linux/platform_device.h> |
| 43 | 42 | ||
| 44 | #include <asm/io.h> | 43 | #include <asm/io.h> |
diff --git a/drivers/cpuidle/governors/ladder.c b/drivers/cpuidle/governors/ladder.c index ba7b9a6b17a1..a4bec3f919aa 100644 --- a/drivers/cpuidle/governors/ladder.c +++ b/drivers/cpuidle/governors/ladder.c | |||
| @@ -67,10 +67,17 @@ static int ladder_select_state(struct cpuidle_device *dev) | |||
| 67 | struct ladder_device *ldev = &__get_cpu_var(ladder_devices); | 67 | struct ladder_device *ldev = &__get_cpu_var(ladder_devices); |
| 68 | struct ladder_device_state *last_state; | 68 | struct ladder_device_state *last_state; |
| 69 | int last_residency, last_idx = ldev->last_state_idx; | 69 | int last_residency, last_idx = ldev->last_state_idx; |
| 70 | int latency_req = pm_qos_requirement(PM_QOS_CPU_DMA_LATENCY); | ||
| 70 | 71 | ||
| 71 | if (unlikely(!ldev)) | 72 | if (unlikely(!ldev)) |
| 72 | return 0; | 73 | return 0; |
| 73 | 74 | ||
| 75 | /* Special case when user has set very strict latency requirement */ | ||
| 76 | if (unlikely(latency_req == 0)) { | ||
| 77 | ladder_do_selection(ldev, last_idx, 0); | ||
| 78 | return 0; | ||
| 79 | } | ||
| 80 | |||
| 74 | last_state = &ldev->states[last_idx]; | 81 | last_state = &ldev->states[last_idx]; |
| 75 | 82 | ||
| 76 | if (dev->states[last_idx].flags & CPUIDLE_FLAG_TIME_VALID) | 83 | if (dev->states[last_idx].flags & CPUIDLE_FLAG_TIME_VALID) |
| @@ -81,8 +88,7 @@ static int ladder_select_state(struct cpuidle_device *dev) | |||
| 81 | /* consider promotion */ | 88 | /* consider promotion */ |
| 82 | if (last_idx < dev->state_count - 1 && | 89 | if (last_idx < dev->state_count - 1 && |
| 83 | last_residency > last_state->threshold.promotion_time && | 90 | last_residency > last_state->threshold.promotion_time && |
| 84 | dev->states[last_idx + 1].exit_latency <= | 91 | dev->states[last_idx + 1].exit_latency <= latency_req) { |
| 85 | pm_qos_requirement(PM_QOS_CPU_DMA_LATENCY)) { | ||
| 86 | last_state->stats.promotion_count++; | 92 | last_state->stats.promotion_count++; |
| 87 | last_state->stats.demotion_count = 0; | 93 | last_state->stats.demotion_count = 0; |
| 88 | if (last_state->stats.promotion_count >= last_state->threshold.promotion_count) { | 94 | if (last_state->stats.promotion_count >= last_state->threshold.promotion_count) { |
| @@ -92,7 +98,19 @@ static int ladder_select_state(struct cpuidle_device *dev) | |||
| 92 | } | 98 | } |
| 93 | 99 | ||
| 94 | /* consider demotion */ | 100 | /* consider demotion */ |
| 95 | if (last_idx > 0 && | 101 | if (last_idx > CPUIDLE_DRIVER_STATE_START && |
| 102 | dev->states[last_idx].exit_latency > latency_req) { | ||
| 103 | int i; | ||
| 104 | |||
| 105 | for (i = last_idx - 1; i > CPUIDLE_DRIVER_STATE_START; i--) { | ||
| 106 | if (dev->states[i].exit_latency <= latency_req) | ||
| 107 | break; | ||
| 108 | } | ||
| 109 | ladder_do_selection(ldev, last_idx, i); | ||
| 110 | return i; | ||
| 111 | } | ||
| 112 | |||
| 113 | if (last_idx > CPUIDLE_DRIVER_STATE_START && | ||
| 96 | last_residency < last_state->threshold.demotion_time) { | 114 | last_residency < last_state->threshold.demotion_time) { |
| 97 | last_state->stats.demotion_count++; | 115 | last_state->stats.demotion_count++; |
| 98 | last_state->stats.promotion_count = 0; | 116 | last_state->stats.promotion_count = 0; |
| @@ -117,7 +135,7 @@ static int ladder_enable_device(struct cpuidle_device *dev) | |||
| 117 | struct ladder_device_state *lstate; | 135 | struct ladder_device_state *lstate; |
| 118 | struct cpuidle_state *state; | 136 | struct cpuidle_state *state; |
| 119 | 137 | ||
| 120 | ldev->last_state_idx = 0; | 138 | ldev->last_state_idx = CPUIDLE_DRIVER_STATE_START; |
| 121 | 139 | ||
| 122 | for (i = 0; i < dev->state_count; i++) { | 140 | for (i = 0; i < dev->state_count; i++) { |
| 123 | state = &dev->states[i]; | 141 | state = &dev->states[i]; |
diff --git a/drivers/cpuidle/governors/menu.c b/drivers/cpuidle/governors/menu.c index 78d77c5dc35c..8d7cf3f31450 100644 --- a/drivers/cpuidle/governors/menu.c +++ b/drivers/cpuidle/governors/menu.c | |||
| @@ -34,21 +34,28 @@ static DEFINE_PER_CPU(struct menu_device, menu_devices); | |||
| 34 | static int menu_select(struct cpuidle_device *dev) | 34 | static int menu_select(struct cpuidle_device *dev) |
| 35 | { | 35 | { |
| 36 | struct menu_device *data = &__get_cpu_var(menu_devices); | 36 | struct menu_device *data = &__get_cpu_var(menu_devices); |
| 37 | int latency_req = pm_qos_requirement(PM_QOS_CPU_DMA_LATENCY); | ||
| 37 | int i; | 38 | int i; |
| 38 | 39 | ||
| 40 | /* Special case when user has set very strict latency requirement */ | ||
| 41 | if (unlikely(latency_req == 0)) { | ||
| 42 | data->last_state_idx = 0; | ||
| 43 | return 0; | ||
| 44 | } | ||
| 45 | |||
| 39 | /* determine the expected residency time */ | 46 | /* determine the expected residency time */ |
| 40 | data->expected_us = | 47 | data->expected_us = |
| 41 | (u32) ktime_to_ns(tick_nohz_get_sleep_length()) / 1000; | 48 | (u32) ktime_to_ns(tick_nohz_get_sleep_length()) / 1000; |
| 42 | 49 | ||
| 43 | /* find the deepest idle state that satisfies our constraints */ | 50 | /* find the deepest idle state that satisfies our constraints */ |
| 44 | for (i = 1; i < dev->state_count; i++) { | 51 | for (i = CPUIDLE_DRIVER_STATE_START + 1; i < dev->state_count; i++) { |
| 45 | struct cpuidle_state *s = &dev->states[i]; | 52 | struct cpuidle_state *s = &dev->states[i]; |
| 46 | 53 | ||
| 47 | if (s->target_residency > data->expected_us) | 54 | if (s->target_residency > data->expected_us) |
| 48 | break; | 55 | break; |
| 49 | if (s->target_residency > data->predicted_us) | 56 | if (s->target_residency > data->predicted_us) |
| 50 | break; | 57 | break; |
| 51 | if (s->exit_latency > pm_qos_requirement(PM_QOS_CPU_DMA_LATENCY)) | 58 | if (s->exit_latency > latency_req) |
| 52 | break; | 59 | break; |
| 53 | } | 60 | } |
| 54 | 61 | ||
| @@ -67,9 +74,9 @@ static void menu_reflect(struct cpuidle_device *dev) | |||
| 67 | { | 74 | { |
| 68 | struct menu_device *data = &__get_cpu_var(menu_devices); | 75 | struct menu_device *data = &__get_cpu_var(menu_devices); |
| 69 | int last_idx = data->last_state_idx; | 76 | int last_idx = data->last_state_idx; |
| 70 | unsigned int measured_us = | 77 | unsigned int last_idle_us = cpuidle_get_last_residency(dev); |
| 71 | cpuidle_get_last_residency(dev) + data->elapsed_us; | ||
| 72 | struct cpuidle_state *target = &dev->states[last_idx]; | 78 | struct cpuidle_state *target = &dev->states[last_idx]; |
| 79 | unsigned int measured_us; | ||
| 73 | 80 | ||
| 74 | /* | 81 | /* |
| 75 | * Ugh, this idle state doesn't support residency measurements, so we | 82 | * Ugh, this idle state doesn't support residency measurements, so we |
| @@ -77,20 +84,27 @@ static void menu_reflect(struct cpuidle_device *dev) | |||
| 77 | * for one full standard timer tick. However, be aware that this | 84 | * for one full standard timer tick. However, be aware that this |
| 78 | * could potentially result in a suboptimal state transition. | 85 | * could potentially result in a suboptimal state transition. |
| 79 | */ | 86 | */ |
| 80 | if (!(target->flags & CPUIDLE_FLAG_TIME_VALID)) | 87 | if (unlikely(!(target->flags & CPUIDLE_FLAG_TIME_VALID))) |
| 81 | measured_us = USEC_PER_SEC / HZ; | 88 | last_idle_us = USEC_PER_SEC / HZ; |
| 89 | |||
| 90 | /* | ||
| 91 | * measured_us and elapsed_us are the cumulative idle time, since the | ||
| 92 | * last time we were woken out of idle by an interrupt. | ||
| 93 | */ | ||
| 94 | if (data->elapsed_us <= data->elapsed_us + last_idle_us) | ||
| 95 | measured_us = data->elapsed_us + last_idle_us; | ||
| 96 | else | ||
| 97 | measured_us = -1; | ||
| 98 | |||
| 99 | /* Predict time until next break event */ | ||
| 100 | data->predicted_us = max(measured_us, data->last_measured_us); | ||
| 82 | 101 | ||
| 83 | /* Predict time remaining until next break event */ | 102 | if (last_idle_us + BREAK_FUZZ < |
| 84 | if (measured_us + BREAK_FUZZ < data->expected_us - target->exit_latency) { | 103 | data->expected_us - target->exit_latency) { |
| 85 | data->predicted_us = max(measured_us, data->last_measured_us); | ||
| 86 | data->last_measured_us = measured_us; | 104 | data->last_measured_us = measured_us; |
| 87 | data->elapsed_us = 0; | 105 | data->elapsed_us = 0; |
| 88 | } else { | 106 | } else { |
| 89 | if (data->elapsed_us < data->elapsed_us + measured_us) | 107 | data->elapsed_us = measured_us; |
| 90 | data->elapsed_us = measured_us; | ||
| 91 | else | ||
| 92 | data->elapsed_us = -1; | ||
| 93 | data->predicted_us = max(measured_us, data->last_measured_us); | ||
| 94 | } | 108 | } |
| 95 | } | 109 | } |
| 96 | 110 | ||
diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c index 31a0e0b455b6..97b003839fb6 100644 --- a/drivers/cpuidle/sysfs.c +++ b/drivers/cpuidle/sysfs.c | |||
| @@ -21,8 +21,8 @@ static int __init cpuidle_sysfs_setup(char *unused) | |||
| 21 | } | 21 | } |
| 22 | __setup("cpuidle_sysfs_switch", cpuidle_sysfs_setup); | 22 | __setup("cpuidle_sysfs_switch", cpuidle_sysfs_setup); |
| 23 | 23 | ||
| 24 | static ssize_t show_available_governors(struct sys_device *dev, | 24 | static ssize_t show_available_governors(struct sysdev_class *class, |
| 25 | struct sysdev_attribute *attr, char *buf) | 25 | char *buf) |
| 26 | { | 26 | { |
| 27 | ssize_t i = 0; | 27 | ssize_t i = 0; |
| 28 | struct cpuidle_governor *tmp; | 28 | struct cpuidle_governor *tmp; |
| @@ -40,8 +40,8 @@ out: | |||
| 40 | return i; | 40 | return i; |
| 41 | } | 41 | } |
| 42 | 42 | ||
| 43 | static ssize_t show_current_driver(struct sys_device *dev, | 43 | static ssize_t show_current_driver(struct sysdev_class *class, |
| 44 | struct sysdev_attribute *attr, char *buf) | 44 | char *buf) |
| 45 | { | 45 | { |
| 46 | ssize_t ret; | 46 | ssize_t ret; |
| 47 | 47 | ||
| @@ -55,8 +55,8 @@ static ssize_t show_current_driver(struct sys_device *dev, | |||
| 55 | return ret; | 55 | return ret; |
| 56 | } | 56 | } |
| 57 | 57 | ||
| 58 | static ssize_t show_current_governor(struct sys_device *dev, | 58 | static ssize_t show_current_governor(struct sysdev_class *class, |
| 59 | struct sysdev_attribute *attr, char *buf) | 59 | char *buf) |
| 60 | { | 60 | { |
| 61 | ssize_t ret; | 61 | ssize_t ret; |
| 62 | 62 | ||
| @@ -70,9 +70,8 @@ static ssize_t show_current_governor(struct sys_device *dev, | |||
| 70 | return ret; | 70 | return ret; |
| 71 | } | 71 | } |
| 72 | 72 | ||
| 73 | static ssize_t store_current_governor(struct sys_device *dev, | 73 | static ssize_t store_current_governor(struct sysdev_class *class, |
| 74 | struct sysdev_attribute *attr, | 74 | const char *buf, size_t count) |
| 75 | const char *buf, size_t count) | ||
| 76 | { | 75 | { |
| 77 | char gov_name[CPUIDLE_NAME_LEN]; | 76 | char gov_name[CPUIDLE_NAME_LEN]; |
| 78 | int ret = -EINVAL; | 77 | int ret = -EINVAL; |
| @@ -104,8 +103,9 @@ static ssize_t store_current_governor(struct sys_device *dev, | |||
| 104 | return count; | 103 | return count; |
| 105 | } | 104 | } |
| 106 | 105 | ||
| 107 | static SYSDEV_ATTR(current_driver, 0444, show_current_driver, NULL); | 106 | static SYSDEV_CLASS_ATTR(current_driver, 0444, show_current_driver, NULL); |
| 108 | static SYSDEV_ATTR(current_governor_ro, 0444, show_current_governor, NULL); | 107 | static SYSDEV_CLASS_ATTR(current_governor_ro, 0444, show_current_governor, |
| 108 | NULL); | ||
| 109 | 109 | ||
| 110 | static struct attribute *cpuclass_default_attrs[] = { | 110 | static struct attribute *cpuclass_default_attrs[] = { |
| 111 | &attr_current_driver.attr, | 111 | &attr_current_driver.attr, |
| @@ -113,9 +113,10 @@ static struct attribute *cpuclass_default_attrs[] = { | |||
| 113 | NULL | 113 | NULL |
| 114 | }; | 114 | }; |
| 115 | 115 | ||
| 116 | static SYSDEV_ATTR(available_governors, 0444, show_available_governors, NULL); | 116 | static SYSDEV_CLASS_ATTR(available_governors, 0444, show_available_governors, |
| 117 | static SYSDEV_ATTR(current_governor, 0644, show_current_governor, | 117 | NULL); |
| 118 | store_current_governor); | 118 | static SYSDEV_CLASS_ATTR(current_governor, 0644, show_current_governor, |
| 119 | store_current_governor); | ||
| 119 | 120 | ||
| 120 | static struct attribute *cpuclass_switch_attrs[] = { | 121 | static struct attribute *cpuclass_switch_attrs[] = { |
| 121 | &attr_available_governors.attr, | 122 | &attr_available_governors.attr, |
diff --git a/drivers/crypto/padlock-aes.c b/drivers/crypto/padlock-aes.c index 54a2a166e566..bf2917d197a0 100644 --- a/drivers/crypto/padlock-aes.c +++ b/drivers/crypto/padlock-aes.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/interrupt.h> | 16 | #include <linux/interrupt.h> |
| 17 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 18 | #include <asm/byteorder.h> | 18 | #include <asm/byteorder.h> |
| 19 | #include <asm/i387.h> | ||
| 19 | #include "padlock.h" | 20 | #include "padlock.h" |
| 20 | 21 | ||
| 21 | /* Control word. */ | 22 | /* Control word. */ |
| @@ -141,6 +142,12 @@ static inline void padlock_reset_key(void) | |||
| 141 | asm volatile ("pushfl; popfl"); | 142 | asm volatile ("pushfl; popfl"); |
| 142 | } | 143 | } |
| 143 | 144 | ||
| 145 | /* | ||
| 146 | * While the padlock instructions don't use FP/SSE registers, they | ||
| 147 | * generate a spurious DNA fault when cr0.ts is '1'. These instructions | ||
| 148 | * should be used only inside the irq_ts_save/restore() context | ||
| 149 | */ | ||
| 150 | |||
| 144 | static inline void padlock_xcrypt(const u8 *input, u8 *output, void *key, | 151 | static inline void padlock_xcrypt(const u8 *input, u8 *output, void *key, |
| 145 | void *control_word) | 152 | void *control_word) |
| 146 | { | 153 | { |
| @@ -205,15 +212,23 @@ static inline u8 *padlock_xcrypt_cbc(const u8 *input, u8 *output, void *key, | |||
| 205 | static void aes_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in) | 212 | static void aes_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in) |
| 206 | { | 213 | { |
| 207 | struct aes_ctx *ctx = aes_ctx(tfm); | 214 | struct aes_ctx *ctx = aes_ctx(tfm); |
| 215 | int ts_state; | ||
| 208 | padlock_reset_key(); | 216 | padlock_reset_key(); |
| 217 | |||
| 218 | ts_state = irq_ts_save(); | ||
| 209 | aes_crypt(in, out, ctx->E, &ctx->cword.encrypt); | 219 | aes_crypt(in, out, ctx->E, &ctx->cword.encrypt); |
| 220 | irq_ts_restore(ts_state); | ||
| 210 | } | 221 | } |
| 211 | 222 | ||
| 212 | static void aes_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in) | 223 | static void aes_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in) |
| 213 | { | 224 | { |
| 214 | struct aes_ctx *ctx = aes_ctx(tfm); | 225 | struct aes_ctx *ctx = aes_ctx(tfm); |
| 226 | int ts_state; | ||
| 215 | padlock_reset_key(); | 227 | padlock_reset_key(); |
| 228 | |||
| 229 | ts_state = irq_ts_save(); | ||
| 216 | aes_crypt(in, out, ctx->D, &ctx->cword.decrypt); | 230 | aes_crypt(in, out, ctx->D, &ctx->cword.decrypt); |
| 231 | irq_ts_restore(ts_state); | ||
| 217 | } | 232 | } |
| 218 | 233 | ||
| 219 | static struct crypto_alg aes_alg = { | 234 | static struct crypto_alg aes_alg = { |
| @@ -244,12 +259,14 @@ static int ecb_aes_encrypt(struct blkcipher_desc *desc, | |||
| 244 | struct aes_ctx *ctx = blk_aes_ctx(desc->tfm); | 259 | struct aes_ctx *ctx = blk_aes_ctx(desc->tfm); |
| 245 | struct blkcipher_walk walk; | 260 | struct blkcipher_walk walk; |
| 246 | int err; | 261 | int err; |
| 262 | int ts_state; | ||
| 247 | 263 | ||
| 248 | padlock_reset_key(); | 264 | padlock_reset_key(); |
| 249 | 265 | ||
| 250 | blkcipher_walk_init(&walk, dst, src, nbytes); | 266 | blkcipher_walk_init(&walk, dst, src, nbytes); |
| 251 | err = blkcipher_walk_virt(desc, &walk); | 267 | err = blkcipher_walk_virt(desc, &walk); |
| 252 | 268 | ||
| 269 | ts_state = irq_ts_save(); | ||
| 253 | while ((nbytes = walk.nbytes)) { | 270 | while ((nbytes = walk.nbytes)) { |
| 254 | padlock_xcrypt_ecb(walk.src.virt.addr, walk.dst.virt.addr, | 271 | padlock_xcrypt_ecb(walk.src.virt.addr, walk.dst.virt.addr, |
| 255 | ctx->E, &ctx->cword.encrypt, | 272 | ctx->E, &ctx->cword.encrypt, |
| @@ -257,6 +274,7 @@ static int ecb_aes_encrypt(struct blkcipher_desc *desc, | |||
| 257 | nbytes &= AES_BLOCK_SIZE - 1; | 274 | nbytes &= AES_BLOCK_SIZE - 1; |
| 258 | err = blkcipher_walk_done(desc, &walk, nbytes); | 275 | err = blkcipher_walk_done(desc, &walk, nbytes); |
| 259 | } | 276 | } |
| 277 | irq_ts_restore(ts_state); | ||
| 260 | 278 | ||
| 261 | return err; | 279 | return err; |
| 262 | } | 280 | } |
| @@ -268,12 +286,14 @@ static int ecb_aes_decrypt(struct blkcipher_desc *desc, | |||
| 268 | struct aes_ctx *ctx = blk_aes_ctx(desc->tfm); | 286 | struct aes_ctx *ctx = blk_aes_ctx(desc->tfm); |
| 269 | struct blkcipher_walk walk; | 287 | struct blkcipher_walk walk; |
| 270 | int err; | 288 | int err; |
| 289 | int ts_state; | ||
| 271 | 290 | ||
| 272 | padlock_reset_key(); | 291 | padlock_reset_key(); |
| 273 | 292 | ||
| 274 | blkcipher_walk_init(&walk, dst, src, nbytes); | 293 | blkcipher_walk_init(&walk, dst, src, nbytes); |
| 275 | err = blkcipher_walk_virt(desc, &walk); | 294 | err = blkcipher_walk_virt(desc, &walk); |
| 276 | 295 | ||
| 296 | ts_state = irq_ts_save(); | ||
| 277 | while ((nbytes = walk.nbytes)) { | 297 | while ((nbytes = walk.nbytes)) { |
| 278 | padlock_xcrypt_ecb(walk.src.virt.addr, walk.dst.virt.addr, | 298 | padlock_xcrypt_ecb(walk.src.virt.addr, walk.dst.virt.addr, |
| 279 | ctx->D, &ctx->cword.decrypt, | 299 | ctx->D, &ctx->cword.decrypt, |
| @@ -281,7 +301,7 @@ static int ecb_aes_decrypt(struct blkcipher_desc *desc, | |||
| 281 | nbytes &= AES_BLOCK_SIZE - 1; | 301 | nbytes &= AES_BLOCK_SIZE - 1; |
| 282 | err = blkcipher_walk_done(desc, &walk, nbytes); | 302 | err = blkcipher_walk_done(desc, &walk, nbytes); |
| 283 | } | 303 | } |
| 284 | 304 | irq_ts_restore(ts_state); | |
| 285 | return err; | 305 | return err; |
| 286 | } | 306 | } |
| 287 | 307 | ||
| @@ -314,12 +334,14 @@ static int cbc_aes_encrypt(struct blkcipher_desc *desc, | |||
| 314 | struct aes_ctx *ctx = blk_aes_ctx(desc->tfm); | 334 | struct aes_ctx *ctx = blk_aes_ctx(desc->tfm); |
| 315 | struct blkcipher_walk walk; | 335 | struct blkcipher_walk walk; |
| 316 | int err; | 336 | int err; |
| 337 | int ts_state; | ||
| 317 | 338 | ||
| 318 | padlock_reset_key(); | 339 | padlock_reset_key(); |
| 319 | 340 | ||
| 320 | blkcipher_walk_init(&walk, dst, src, nbytes); | 341 | blkcipher_walk_init(&walk, dst, src, nbytes); |
| 321 | err = blkcipher_walk_virt(desc, &walk); | 342 | err = blkcipher_walk_virt(desc, &walk); |
| 322 | 343 | ||
| 344 | ts_state = irq_ts_save(); | ||
| 323 | while ((nbytes = walk.nbytes)) { | 345 | while ((nbytes = walk.nbytes)) { |
| 324 | u8 *iv = padlock_xcrypt_cbc(walk.src.virt.addr, | 346 | u8 *iv = padlock_xcrypt_cbc(walk.src.virt.addr, |
| 325 | walk.dst.virt.addr, ctx->E, | 347 | walk.dst.virt.addr, ctx->E, |
| @@ -329,6 +351,7 @@ static int cbc_aes_encrypt(struct blkcipher_desc *desc, | |||
| 329 | nbytes &= AES_BLOCK_SIZE - 1; | 351 | nbytes &= AES_BLOCK_SIZE - 1; |
| 330 | err = blkcipher_walk_done(desc, &walk, nbytes); | 352 | err = blkcipher_walk_done(desc, &walk, nbytes); |
| 331 | } | 353 | } |
| 354 | irq_ts_restore(ts_state); | ||
| 332 | 355 | ||
| 333 | return err; | 356 | return err; |
| 334 | } | 357 | } |
| @@ -340,12 +363,14 @@ static int cbc_aes_decrypt(struct blkcipher_desc *desc, | |||
| 340 | struct aes_ctx *ctx = blk_aes_ctx(desc->tfm); | 363 | struct aes_ctx *ctx = blk_aes_ctx(desc->tfm); |
| 341 | struct blkcipher_walk walk; | 364 | struct blkcipher_walk walk; |
| 342 | int err; | 365 | int err; |
| 366 | int ts_state; | ||
| 343 | 367 | ||
| 344 | padlock_reset_key(); | 368 | padlock_reset_key(); |
| 345 | 369 | ||
| 346 | blkcipher_walk_init(&walk, dst, src, nbytes); | 370 | blkcipher_walk_init(&walk, dst, src, nbytes); |
| 347 | err = blkcipher_walk_virt(desc, &walk); | 371 | err = blkcipher_walk_virt(desc, &walk); |
| 348 | 372 | ||
| 373 | ts_state = irq_ts_save(); | ||
| 349 | while ((nbytes = walk.nbytes)) { | 374 | while ((nbytes = walk.nbytes)) { |
| 350 | padlock_xcrypt_cbc(walk.src.virt.addr, walk.dst.virt.addr, | 375 | padlock_xcrypt_cbc(walk.src.virt.addr, walk.dst.virt.addr, |
| 351 | ctx->D, walk.iv, &ctx->cword.decrypt, | 376 | ctx->D, walk.iv, &ctx->cword.decrypt, |
| @@ -354,6 +379,7 @@ static int cbc_aes_decrypt(struct blkcipher_desc *desc, | |||
| 354 | err = blkcipher_walk_done(desc, &walk, nbytes); | 379 | err = blkcipher_walk_done(desc, &walk, nbytes); |
| 355 | } | 380 | } |
| 356 | 381 | ||
| 382 | irq_ts_restore(ts_state); | ||
| 357 | return err; | 383 | return err; |
| 358 | } | 384 | } |
| 359 | 385 | ||
diff --git a/drivers/crypto/padlock-sha.c b/drivers/crypto/padlock-sha.c index 40d5680fa013..a7fbadebf623 100644 --- a/drivers/crypto/padlock-sha.c +++ b/drivers/crypto/padlock-sha.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/interrupt.h> | 22 | #include <linux/interrupt.h> |
| 23 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 24 | #include <linux/scatterlist.h> | 24 | #include <linux/scatterlist.h> |
| 25 | #include <asm/i387.h> | ||
| 25 | #include "padlock.h" | 26 | #include "padlock.h" |
| 26 | 27 | ||
| 27 | #define SHA1_DEFAULT_FALLBACK "sha1-generic" | 28 | #define SHA1_DEFAULT_FALLBACK "sha1-generic" |
| @@ -102,6 +103,7 @@ static void padlock_do_sha1(const char *in, char *out, int count) | |||
| 102 | * PadLock microcode needs it that big. */ | 103 | * PadLock microcode needs it that big. */ |
| 103 | char buf[128+16]; | 104 | char buf[128+16]; |
| 104 | char *result = NEAREST_ALIGNED(buf); | 105 | char *result = NEAREST_ALIGNED(buf); |
| 106 | int ts_state; | ||
| 105 | 107 | ||
| 106 | ((uint32_t *)result)[0] = SHA1_H0; | 108 | ((uint32_t *)result)[0] = SHA1_H0; |
| 107 | ((uint32_t *)result)[1] = SHA1_H1; | 109 | ((uint32_t *)result)[1] = SHA1_H1; |
| @@ -109,9 +111,12 @@ static void padlock_do_sha1(const char *in, char *out, int count) | |||
| 109 | ((uint32_t *)result)[3] = SHA1_H3; | 111 | ((uint32_t *)result)[3] = SHA1_H3; |
| 110 | ((uint32_t *)result)[4] = SHA1_H4; | 112 | ((uint32_t *)result)[4] = SHA1_H4; |
| 111 | 113 | ||
| 114 | /* prevent taking the spurious DNA fault with padlock. */ | ||
| 115 | ts_state = irq_ts_save(); | ||
| 112 | asm volatile (".byte 0xf3,0x0f,0xa6,0xc8" /* rep xsha1 */ | 116 | asm volatile (".byte 0xf3,0x0f,0xa6,0xc8" /* rep xsha1 */ |
| 113 | : "+S"(in), "+D"(result) | 117 | : "+S"(in), "+D"(result) |
| 114 | : "c"(count), "a"(0)); | 118 | : "c"(count), "a"(0)); |
| 119 | irq_ts_restore(ts_state); | ||
| 115 | 120 | ||
| 116 | padlock_output_block((uint32_t *)result, (uint32_t *)out, 5); | 121 | padlock_output_block((uint32_t *)result, (uint32_t *)out, 5); |
| 117 | } | 122 | } |
| @@ -123,6 +128,7 @@ static void padlock_do_sha256(const char *in, char *out, int count) | |||
| 123 | * PadLock microcode needs it that big. */ | 128 | * PadLock microcode needs it that big. */ |
| 124 | char buf[128+16]; | 129 | char buf[128+16]; |
| 125 | char *result = NEAREST_ALIGNED(buf); | 130 | char *result = NEAREST_ALIGNED(buf); |
| 131 | int ts_state; | ||
| 126 | 132 | ||
| 127 | ((uint32_t *)result)[0] = SHA256_H0; | 133 | ((uint32_t *)result)[0] = SHA256_H0; |
| 128 | ((uint32_t *)result)[1] = SHA256_H1; | 134 | ((uint32_t *)result)[1] = SHA256_H1; |
| @@ -133,9 +139,12 @@ static void padlock_do_sha256(const char *in, char *out, int count) | |||
| 133 | ((uint32_t *)result)[6] = SHA256_H6; | 139 | ((uint32_t *)result)[6] = SHA256_H6; |
| 134 | ((uint32_t *)result)[7] = SHA256_H7; | 140 | ((uint32_t *)result)[7] = SHA256_H7; |
| 135 | 141 | ||
| 142 | /* prevent taking the spurious DNA fault with padlock. */ | ||
| 143 | ts_state = irq_ts_save(); | ||
| 136 | asm volatile (".byte 0xf3,0x0f,0xa6,0xd0" /* rep xsha256 */ | 144 | asm volatile (".byte 0xf3,0x0f,0xa6,0xd0" /* rep xsha256 */ |
| 137 | : "+S"(in), "+D"(result) | 145 | : "+S"(in), "+D"(result) |
| 138 | : "c"(count), "a"(0)); | 146 | : "c"(count), "a"(0)); |
| 147 | irq_ts_restore(ts_state); | ||
| 139 | 148 | ||
| 140 | padlock_output_block((uint32_t *)result, (uint32_t *)out, 8); | 149 | padlock_output_block((uint32_t *)result, (uint32_t *)out, 8); |
| 141 | } | 150 | } |
diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c index 681c15f42083..ee827a7f7c6a 100644 --- a/drivers/crypto/talitos.c +++ b/drivers/crypto/talitos.c | |||
| @@ -96,6 +96,9 @@ struct talitos_private { | |||
| 96 | unsigned int exec_units; | 96 | unsigned int exec_units; |
| 97 | unsigned int desc_types; | 97 | unsigned int desc_types; |
| 98 | 98 | ||
| 99 | /* SEC Compatibility info */ | ||
| 100 | unsigned long features; | ||
| 101 | |||
| 99 | /* next channel to be assigned next incoming descriptor */ | 102 | /* next channel to be assigned next incoming descriptor */ |
| 100 | atomic_t last_chan; | 103 | atomic_t last_chan; |
| 101 | 104 | ||
| @@ -133,6 +136,9 @@ struct talitos_private { | |||
| 133 | struct hwrng rng; | 136 | struct hwrng rng; |
| 134 | }; | 137 | }; |
| 135 | 138 | ||
| 139 | /* .features flag */ | ||
| 140 | #define TALITOS_FTR_SRC_LINK_TBL_LEN_INCLUDES_EXTENT 0x00000001 | ||
| 141 | |||
| 136 | /* | 142 | /* |
| 137 | * map virtual single (contiguous) pointer to h/w descriptor pointer | 143 | * map virtual single (contiguous) pointer to h/w descriptor pointer |
| 138 | */ | 144 | */ |
| @@ -785,7 +791,7 @@ static void ipsec_esp_encrypt_done(struct device *dev, | |||
| 785 | /* copy the generated ICV to dst */ | 791 | /* copy the generated ICV to dst */ |
| 786 | if (edesc->dma_len) { | 792 | if (edesc->dma_len) { |
| 787 | icvdata = &edesc->link_tbl[edesc->src_nents + | 793 | icvdata = &edesc->link_tbl[edesc->src_nents + |
| 788 | edesc->dst_nents + 1]; | 794 | edesc->dst_nents + 2]; |
| 789 | sg = sg_last(areq->dst, edesc->dst_nents); | 795 | sg = sg_last(areq->dst, edesc->dst_nents); |
| 790 | memcpy((char *)sg_virt(sg) + sg->length - ctx->authsize, | 796 | memcpy((char *)sg_virt(sg) + sg->length - ctx->authsize, |
| 791 | icvdata, ctx->authsize); | 797 | icvdata, ctx->authsize); |
| @@ -814,7 +820,7 @@ static void ipsec_esp_decrypt_done(struct device *dev, | |||
| 814 | /* auth check */ | 820 | /* auth check */ |
| 815 | if (edesc->dma_len) | 821 | if (edesc->dma_len) |
| 816 | icvdata = &edesc->link_tbl[edesc->src_nents + | 822 | icvdata = &edesc->link_tbl[edesc->src_nents + |
| 817 | edesc->dst_nents + 1]; | 823 | edesc->dst_nents + 2]; |
| 818 | else | 824 | else |
| 819 | icvdata = &edesc->link_tbl[0]; | 825 | icvdata = &edesc->link_tbl[0]; |
| 820 | 826 | ||
| @@ -921,10 +927,30 @@ static int ipsec_esp(struct ipsec_esp_edesc *edesc, struct aead_request *areq, | |||
| 921 | sg_count = sg_to_link_tbl(areq->src, sg_count, cryptlen, | 927 | sg_count = sg_to_link_tbl(areq->src, sg_count, cryptlen, |
| 922 | &edesc->link_tbl[0]); | 928 | &edesc->link_tbl[0]); |
| 923 | if (sg_count > 1) { | 929 | if (sg_count > 1) { |
| 930 | struct talitos_ptr *link_tbl_ptr = | ||
| 931 | &edesc->link_tbl[sg_count-1]; | ||
| 932 | struct scatterlist *sg; | ||
| 933 | struct talitos_private *priv = dev_get_drvdata(dev); | ||
| 934 | |||
| 924 | desc->ptr[4].j_extent |= DESC_PTR_LNKTBL_JUMP; | 935 | desc->ptr[4].j_extent |= DESC_PTR_LNKTBL_JUMP; |
| 925 | desc->ptr[4].ptr = cpu_to_be32(edesc->dma_link_tbl); | 936 | desc->ptr[4].ptr = cpu_to_be32(edesc->dma_link_tbl); |
| 926 | dma_sync_single_for_device(ctx->dev, edesc->dma_link_tbl, | 937 | dma_sync_single_for_device(ctx->dev, edesc->dma_link_tbl, |
| 927 | edesc->dma_len, DMA_BIDIRECTIONAL); | 938 | edesc->dma_len, DMA_BIDIRECTIONAL); |
| 939 | /* If necessary for this SEC revision, | ||
| 940 | * add a link table entry for ICV. | ||
| 941 | */ | ||
| 942 | if ((priv->features & | ||
| 943 | TALITOS_FTR_SRC_LINK_TBL_LEN_INCLUDES_EXTENT) && | ||
| 944 | (edesc->desc.hdr & DESC_HDR_MODE0_ENCRYPT) == 0) { | ||
| 945 | link_tbl_ptr->j_extent = 0; | ||
| 946 | link_tbl_ptr++; | ||
| 947 | link_tbl_ptr->j_extent = DESC_PTR_LNKTBL_RETURN; | ||
| 948 | link_tbl_ptr->len = cpu_to_be16(authsize); | ||
| 949 | sg = sg_last(areq->src, edesc->src_nents ? : 1); | ||
| 950 | link_tbl_ptr->ptr = cpu_to_be32( | ||
| 951 | (char *)sg_dma_address(sg) | ||
| 952 | + sg->length - authsize); | ||
| 953 | } | ||
| 928 | } else { | 954 | } else { |
| 929 | /* Only one segment now, so no link tbl needed */ | 955 | /* Only one segment now, so no link tbl needed */ |
| 930 | desc->ptr[4].ptr = cpu_to_be32(sg_dma_address(areq->src)); | 956 | desc->ptr[4].ptr = cpu_to_be32(sg_dma_address(areq->src)); |
| @@ -944,12 +970,11 @@ static int ipsec_esp(struct ipsec_esp_edesc *edesc, struct aead_request *areq, | |||
| 944 | desc->ptr[5].ptr = cpu_to_be32(sg_dma_address(areq->dst)); | 970 | desc->ptr[5].ptr = cpu_to_be32(sg_dma_address(areq->dst)); |
| 945 | } else { | 971 | } else { |
| 946 | struct talitos_ptr *link_tbl_ptr = | 972 | struct talitos_ptr *link_tbl_ptr = |
| 947 | &edesc->link_tbl[edesc->src_nents]; | 973 | &edesc->link_tbl[edesc->src_nents + 1]; |
| 948 | struct scatterlist *sg; | ||
| 949 | 974 | ||
| 950 | desc->ptr[5].ptr = cpu_to_be32((struct talitos_ptr *) | 975 | desc->ptr[5].ptr = cpu_to_be32((struct talitos_ptr *) |
| 951 | edesc->dma_link_tbl + | 976 | edesc->dma_link_tbl + |
| 952 | edesc->src_nents); | 977 | edesc->src_nents + 1); |
| 953 | if (areq->src == areq->dst) { | 978 | if (areq->src == areq->dst) { |
| 954 | memcpy(link_tbl_ptr, &edesc->link_tbl[0], | 979 | memcpy(link_tbl_ptr, &edesc->link_tbl[0], |
| 955 | edesc->src_nents * sizeof(struct talitos_ptr)); | 980 | edesc->src_nents * sizeof(struct talitos_ptr)); |
| @@ -957,14 +982,10 @@ static int ipsec_esp(struct ipsec_esp_edesc *edesc, struct aead_request *areq, | |||
| 957 | sg_count = sg_to_link_tbl(areq->dst, sg_count, cryptlen, | 982 | sg_count = sg_to_link_tbl(areq->dst, sg_count, cryptlen, |
| 958 | link_tbl_ptr); | 983 | link_tbl_ptr); |
| 959 | } | 984 | } |
| 985 | /* Add an entry to the link table for ICV data */ | ||
| 960 | link_tbl_ptr += sg_count - 1; | 986 | link_tbl_ptr += sg_count - 1; |
| 961 | |||
| 962 | /* handle case where sg_last contains the ICV exclusively */ | ||
| 963 | sg = sg_last(areq->dst, edesc->dst_nents); | ||
| 964 | if (sg->length == ctx->authsize) | ||
| 965 | link_tbl_ptr--; | ||
| 966 | |||
| 967 | link_tbl_ptr->j_extent = 0; | 987 | link_tbl_ptr->j_extent = 0; |
| 988 | sg_count++; | ||
| 968 | link_tbl_ptr++; | 989 | link_tbl_ptr++; |
| 969 | link_tbl_ptr->j_extent = DESC_PTR_LNKTBL_RETURN; | 990 | link_tbl_ptr->j_extent = DESC_PTR_LNKTBL_RETURN; |
| 970 | link_tbl_ptr->len = cpu_to_be16(authsize); | 991 | link_tbl_ptr->len = cpu_to_be16(authsize); |
| @@ -973,7 +994,7 @@ static int ipsec_esp(struct ipsec_esp_edesc *edesc, struct aead_request *areq, | |||
| 973 | link_tbl_ptr->ptr = cpu_to_be32((struct talitos_ptr *) | 994 | link_tbl_ptr->ptr = cpu_to_be32((struct talitos_ptr *) |
| 974 | edesc->dma_link_tbl + | 995 | edesc->dma_link_tbl + |
| 975 | edesc->src_nents + | 996 | edesc->src_nents + |
| 976 | edesc->dst_nents + 1); | 997 | edesc->dst_nents + 2); |
| 977 | 998 | ||
| 978 | desc->ptr[5].j_extent |= DESC_PTR_LNKTBL_JUMP; | 999 | desc->ptr[5].j_extent |= DESC_PTR_LNKTBL_JUMP; |
| 979 | dma_sync_single_for_device(ctx->dev, edesc->dma_link_tbl, | 1000 | dma_sync_single_for_device(ctx->dev, edesc->dma_link_tbl, |
| @@ -1040,12 +1061,12 @@ static struct ipsec_esp_edesc *ipsec_esp_edesc_alloc(struct aead_request *areq, | |||
| 1040 | 1061 | ||
| 1041 | /* | 1062 | /* |
| 1042 | * allocate space for base edesc plus the link tables, | 1063 | * allocate space for base edesc plus the link tables, |
| 1043 | * allowing for a separate entry for the generated ICV (+ 1), | 1064 | * allowing for two separate entries for ICV and generated ICV (+ 2), |
| 1044 | * and the ICV data itself | 1065 | * and the ICV data itself |
| 1045 | */ | 1066 | */ |
| 1046 | alloc_len = sizeof(struct ipsec_esp_edesc); | 1067 | alloc_len = sizeof(struct ipsec_esp_edesc); |
| 1047 | if (src_nents || dst_nents) { | 1068 | if (src_nents || dst_nents) { |
| 1048 | dma_len = (src_nents + dst_nents + 1) * | 1069 | dma_len = (src_nents + dst_nents + 2) * |
| 1049 | sizeof(struct talitos_ptr) + ctx->authsize; | 1070 | sizeof(struct talitos_ptr) + ctx->authsize; |
| 1050 | alloc_len += dma_len; | 1071 | alloc_len += dma_len; |
| 1051 | } else { | 1072 | } else { |
| @@ -1104,7 +1125,7 @@ static int aead_authenc_decrypt(struct aead_request *req) | |||
| 1104 | /* stash incoming ICV for later cmp with ICV generated by the h/w */ | 1125 | /* stash incoming ICV for later cmp with ICV generated by the h/w */ |
| 1105 | if (edesc->dma_len) | 1126 | if (edesc->dma_len) |
| 1106 | icvdata = &edesc->link_tbl[edesc->src_nents + | 1127 | icvdata = &edesc->link_tbl[edesc->src_nents + |
| 1107 | edesc->dst_nents + 1]; | 1128 | edesc->dst_nents + 2]; |
| 1108 | else | 1129 | else |
| 1109 | icvdata = &edesc->link_tbl[0]; | 1130 | icvdata = &edesc->link_tbl[0]; |
| 1110 | 1131 | ||
| @@ -1480,6 +1501,9 @@ static int talitos_probe(struct of_device *ofdev, | |||
| 1480 | goto err_out; | 1501 | goto err_out; |
| 1481 | } | 1502 | } |
| 1482 | 1503 | ||
| 1504 | if (of_device_is_compatible(np, "fsl,sec3.0")) | ||
| 1505 | priv->features |= TALITOS_FTR_SRC_LINK_TBL_LEN_INCLUDES_EXTENT; | ||
| 1506 | |||
| 1483 | priv->head_lock = kmalloc(sizeof(spinlock_t) * priv->num_channels, | 1507 | priv->head_lock = kmalloc(sizeof(spinlock_t) * priv->num_channels, |
| 1484 | GFP_KERNEL); | 1508 | GFP_KERNEL); |
| 1485 | priv->tail_lock = kmalloc(sizeof(spinlock_t) * priv->num_channels, | 1509 | priv->tail_lock = kmalloc(sizeof(spinlock_t) * priv->num_channels, |
diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c index a4e4494663bf..0328da020a10 100644 --- a/drivers/dma/mv_xor.c +++ b/drivers/dma/mv_xor.c | |||
| @@ -25,7 +25,7 @@ | |||
| 25 | #include <linux/interrupt.h> | 25 | #include <linux/interrupt.h> |
| 26 | #include <linux/platform_device.h> | 26 | #include <linux/platform_device.h> |
| 27 | #include <linux/memory.h> | 27 | #include <linux/memory.h> |
| 28 | #include <asm/plat-orion/mv_xor.h> | 28 | #include <plat/mv_xor.h> |
| 29 | #include "mv_xor.h" | 29 | #include "mv_xor.h" |
| 30 | 30 | ||
| 31 | static void mv_xor_issue_pending(struct dma_chan *chan); | 31 | static void mv_xor_issue_pending(struct dma_chan *chan); |
diff --git a/drivers/edac/edac_core.h b/drivers/edac/edac_core.h index b27b13c5eb5a..4b55ec607a88 100644 --- a/drivers/edac/edac_core.h +++ b/drivers/edac/edac_core.h | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | #include <linux/platform_device.h> | 34 | #include <linux/platform_device.h> |
| 35 | #include <linux/sysdev.h> | 35 | #include <linux/sysdev.h> |
| 36 | #include <linux/workqueue.h> | 36 | #include <linux/workqueue.h> |
| 37 | #include <linux/version.h> | ||
| 38 | 37 | ||
| 39 | #define EDAC_MC_LABEL_LEN 31 | 38 | #define EDAC_MC_LABEL_LEN 31 |
| 40 | #define EDAC_DEVICE_NAME_LEN 31 | 39 | #define EDAC_DEVICE_NAME_LEN 31 |
diff --git a/drivers/firewire/Kconfig b/drivers/firewire/Kconfig index fa6d6abefd4d..450902438208 100644 --- a/drivers/firewire/Kconfig +++ b/drivers/firewire/Kconfig | |||
| @@ -12,8 +12,8 @@ config FIREWIRE | |||
| 12 | This is the "Juju" FireWire stack, a new alternative implementation | 12 | This is the "Juju" FireWire stack, a new alternative implementation |
| 13 | designed for robustness and simplicity. You can build either this | 13 | designed for robustness and simplicity. You can build either this |
| 14 | stack, or the old stack (the ieee1394 driver, ohci1394 etc.) or both. | 14 | stack, or the old stack (the ieee1394 driver, ohci1394 etc.) or both. |
| 15 | Please read http://wiki.linux1394.org/JujuMigration before you | 15 | Please read http://ieee1394.wiki.kernel.org/index.php/Juju_Migration |
| 16 | enable the new stack. | 16 | before you enable the new stack. |
| 17 | 17 | ||
| 18 | To compile this driver as a module, say M here: the module will be | 18 | To compile this driver as a module, say M here: the module will be |
| 19 | called firewire-core. | 19 | called firewire-core. |
diff --git a/drivers/firmware/iscsi_ibft.c b/drivers/firmware/iscsi_ibft.c index 8024e3bfd877..b91ef63126ed 100644 --- a/drivers/firmware/iscsi_ibft.c +++ b/drivers/firmware/iscsi_ibft.c | |||
| @@ -669,8 +669,7 @@ static int __init ibft_register_kobjects(struct ibft_table_header *header, | |||
| 669 | 669 | ||
| 670 | control = (void *)header + sizeof(*header); | 670 | control = (void *)header + sizeof(*header); |
| 671 | end = (void *)control + control->hdr.length; | 671 | end = (void *)control + control->hdr.length; |
| 672 | eot_offset = (void *)header + header->length - | 672 | eot_offset = (void *)header + header->length - (void *)control; |
| 673 | (void *)control - sizeof(*header); | ||
| 674 | rc = ibft_verify_hdr("control", (struct ibft_hdr *)control, id_control, | 673 | rc = ibft_verify_hdr("control", (struct ibft_hdr *)control, id_control, |
| 675 | sizeof(*control)); | 674 | sizeof(*control)); |
| 676 | 675 | ||
diff --git a/drivers/firmware/memmap.c b/drivers/firmware/memmap.c index 001622eb86f9..3bf8ee120d42 100644 --- a/drivers/firmware/memmap.c +++ b/drivers/firmware/memmap.c | |||
| @@ -84,20 +84,23 @@ static struct kobj_type memmap_ktype = { | |||
| 84 | */ | 84 | */ |
| 85 | 85 | ||
| 86 | /* | 86 | /* |
| 87 | * Firmware memory map entries | 87 | * Firmware memory map entries. No locking is needed because the |
| 88 | * firmware_map_add() and firmware_map_add_early() functions are called | ||
| 89 | * in firmware initialisation code in one single thread of execution. | ||
| 88 | */ | 90 | */ |
| 89 | static LIST_HEAD(map_entries); | 91 | static LIST_HEAD(map_entries); |
| 90 | 92 | ||
| 91 | /** | 93 | /** |
| 92 | * Common implementation of firmware_map_add() and firmware_map_add_early() | 94 | * firmware_map_add_entry() - Does the real work to add a firmware memmap entry. |
| 93 | * which expects a pre-allocated struct firmware_map_entry. | ||
| 94 | * | ||
| 95 | * @start: Start of the memory range. | 95 | * @start: Start of the memory range. |
| 96 | * @end: End of the memory range (inclusive). | 96 | * @end: End of the memory range (inclusive). |
| 97 | * @type: Type of the memory range. | 97 | * @type: Type of the memory range. |
| 98 | * @entry: Pre-allocated (either kmalloc() or bootmem allocator), uninitialised | 98 | * @entry: Pre-allocated (either kmalloc() or bootmem allocator), uninitialised |
| 99 | * entry. | 99 | * entry. |
| 100 | */ | 100 | * |
| 101 | * Common implementation of firmware_map_add() and firmware_map_add_early() | ||
| 102 | * which expects a pre-allocated struct firmware_map_entry. | ||
| 103 | **/ | ||
| 101 | static int firmware_map_add_entry(resource_size_t start, resource_size_t end, | 104 | static int firmware_map_add_entry(resource_size_t start, resource_size_t end, |
| 102 | const char *type, | 105 | const char *type, |
| 103 | struct firmware_map_entry *entry) | 106 | struct firmware_map_entry *entry) |
| @@ -115,33 +118,52 @@ static int firmware_map_add_entry(resource_size_t start, resource_size_t end, | |||
| 115 | return 0; | 118 | return 0; |
| 116 | } | 119 | } |
| 117 | 120 | ||
| 118 | /* | 121 | /** |
| 119 | * See <linux/firmware-map.h> for documentation. | 122 | * firmware_map_add() - Adds a firmware mapping entry. |
| 120 | */ | 123 | * @start: Start of the memory range. |
| 124 | * @end: End of the memory range (inclusive). | ||
| 125 | * @type: Type of the memory range. | ||
| 126 | * | ||
| 127 | * This function uses kmalloc() for memory | ||
| 128 | * allocation. Use firmware_map_add_early() if you want to use the bootmem | ||
| 129 | * allocator. | ||
| 130 | * | ||
| 131 | * That function must be called before late_initcall. | ||
| 132 | * | ||
| 133 | * Returns 0 on success, or -ENOMEM if no memory could be allocated. | ||
| 134 | **/ | ||
| 121 | int firmware_map_add(resource_size_t start, resource_size_t end, | 135 | int firmware_map_add(resource_size_t start, resource_size_t end, |
| 122 | const char *type) | 136 | const char *type) |
| 123 | { | 137 | { |
| 124 | struct firmware_map_entry *entry; | 138 | struct firmware_map_entry *entry; |
| 125 | 139 | ||
| 126 | entry = kmalloc(sizeof(struct firmware_map_entry), GFP_ATOMIC); | 140 | entry = kmalloc(sizeof(struct firmware_map_entry), GFP_ATOMIC); |
| 127 | WARN_ON(!entry); | ||
| 128 | if (!entry) | 141 | if (!entry) |
| 129 | return -ENOMEM; | 142 | return -ENOMEM; |
| 130 | 143 | ||
| 131 | return firmware_map_add_entry(start, end, type, entry); | 144 | return firmware_map_add_entry(start, end, type, entry); |
| 132 | } | 145 | } |
| 133 | 146 | ||
| 134 | /* | 147 | /** |
| 135 | * See <linux/firmware-map.h> for documentation. | 148 | * firmware_map_add_early() - Adds a firmware mapping entry. |
| 136 | */ | 149 | * @start: Start of the memory range. |
| 150 | * @end: End of the memory range (inclusive). | ||
| 151 | * @type: Type of the memory range. | ||
| 152 | * | ||
| 153 | * Adds a firmware mapping entry. This function uses the bootmem allocator | ||
| 154 | * for memory allocation. Use firmware_map_add() if you want to use kmalloc(). | ||
| 155 | * | ||
| 156 | * That function must be called before late_initcall. | ||
| 157 | * | ||
| 158 | * Returns 0 on success, or -ENOMEM if no memory could be allocated. | ||
| 159 | **/ | ||
| 137 | int __init firmware_map_add_early(resource_size_t start, resource_size_t end, | 160 | int __init firmware_map_add_early(resource_size_t start, resource_size_t end, |
| 138 | const char *type) | 161 | const char *type) |
| 139 | { | 162 | { |
| 140 | struct firmware_map_entry *entry; | 163 | struct firmware_map_entry *entry; |
| 141 | 164 | ||
| 142 | entry = alloc_bootmem_low(sizeof(struct firmware_map_entry)); | 165 | entry = alloc_bootmem_low(sizeof(struct firmware_map_entry)); |
| 143 | WARN_ON(!entry); | 166 | if (WARN_ON(!entry)) |
| 144 | if (!entry) | ||
| 145 | return -ENOMEM; | 167 | return -ENOMEM; |
| 146 | 168 | ||
| 147 | return firmware_map_add_entry(start, end, type, entry); | 169 | return firmware_map_add_entry(start, end, type, entry); |
| @@ -183,7 +205,10 @@ static ssize_t memmap_attr_show(struct kobject *kobj, | |||
| 183 | /* | 205 | /* |
| 184 | * Initialises stuff and adds the entries in the map_entries list to | 206 | * Initialises stuff and adds the entries in the map_entries list to |
| 185 | * sysfs. Important is that firmware_map_add() and firmware_map_add_early() | 207 | * sysfs. Important is that firmware_map_add() and firmware_map_add_early() |
| 186 | * must be called before late_initcall. | 208 | * must be called before late_initcall. That's just because that function |
| 209 | * is called as late_initcall() function, which means that if you call | ||
| 210 | * firmware_map_add() or firmware_map_add_early() afterwards, the entries | ||
| 211 | * are not added to sysfs. | ||
| 187 | */ | 212 | */ |
| 188 | static int __init memmap_init(void) | 213 | static int __init memmap_init(void) |
| 189 | { | 214 | { |
| @@ -192,13 +217,13 @@ static int __init memmap_init(void) | |||
| 192 | struct kset *memmap_kset; | 217 | struct kset *memmap_kset; |
| 193 | 218 | ||
| 194 | memmap_kset = kset_create_and_add("memmap", NULL, firmware_kobj); | 219 | memmap_kset = kset_create_and_add("memmap", NULL, firmware_kobj); |
| 195 | WARN_ON(!memmap_kset); | 220 | if (WARN_ON(!memmap_kset)) |
| 196 | if (!memmap_kset) | ||
| 197 | return -ENOMEM; | 221 | return -ENOMEM; |
| 198 | 222 | ||
| 199 | list_for_each_entry(entry, &map_entries, list) { | 223 | list_for_each_entry(entry, &map_entries, list) { |
| 200 | entry->kobj.kset = memmap_kset; | 224 | entry->kobj.kset = memmap_kset; |
| 201 | kobject_add(&entry->kobj, NULL, "%d", i++); | 225 | if (kobject_add(&entry->kobj, NULL, "%d", i++)) |
| 226 | kobject_put(&entry->kobj); | ||
| 202 | } | 227 | } |
| 203 | 228 | ||
| 204 | return 0; | 229 | return 0; |
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c index 089c015c01d1..53f0e5af1cc8 100644 --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c | |||
| @@ -400,27 +400,31 @@ static void drm_locked_tasklet_func(unsigned long data) | |||
| 400 | { | 400 | { |
| 401 | struct drm_device *dev = (struct drm_device *)data; | 401 | struct drm_device *dev = (struct drm_device *)data; |
| 402 | unsigned long irqflags; | 402 | unsigned long irqflags; |
| 403 | 403 | void (*tasklet_func)(struct drm_device *); | |
| 404 | |||
| 404 | spin_lock_irqsave(&dev->tasklet_lock, irqflags); | 405 | spin_lock_irqsave(&dev->tasklet_lock, irqflags); |
| 406 | tasklet_func = dev->locked_tasklet_func; | ||
| 407 | spin_unlock_irqrestore(&dev->tasklet_lock, irqflags); | ||
| 405 | 408 | ||
| 406 | if (!dev->locked_tasklet_func || | 409 | if (!tasklet_func || |
| 407 | !drm_lock_take(&dev->lock, | 410 | !drm_lock_take(&dev->lock, |
| 408 | DRM_KERNEL_CONTEXT)) { | 411 | DRM_KERNEL_CONTEXT)) { |
| 409 | spin_unlock_irqrestore(&dev->tasklet_lock, irqflags); | ||
| 410 | return; | 412 | return; |
| 411 | } | 413 | } |
| 412 | 414 | ||
| 413 | dev->lock.lock_time = jiffies; | 415 | dev->lock.lock_time = jiffies; |
| 414 | atomic_inc(&dev->counts[_DRM_STAT_LOCKS]); | 416 | atomic_inc(&dev->counts[_DRM_STAT_LOCKS]); |
| 415 | 417 | ||
| 416 | dev->locked_tasklet_func(dev); | 418 | spin_lock_irqsave(&dev->tasklet_lock, irqflags); |
| 419 | tasklet_func = dev->locked_tasklet_func; | ||
| 420 | dev->locked_tasklet_func = NULL; | ||
| 421 | spin_unlock_irqrestore(&dev->tasklet_lock, irqflags); | ||
| 422 | |||
| 423 | if (tasklet_func != NULL) | ||
| 424 | tasklet_func(dev); | ||
| 417 | 425 | ||
| 418 | drm_lock_free(&dev->lock, | 426 | drm_lock_free(&dev->lock, |
| 419 | DRM_KERNEL_CONTEXT); | 427 | DRM_KERNEL_CONTEXT); |
| 420 | |||
| 421 | dev->locked_tasklet_func = NULL; | ||
| 422 | |||
| 423 | spin_unlock_irqrestore(&dev->tasklet_lock, irqflags); | ||
| 424 | } | 428 | } |
| 425 | 429 | ||
| 426 | /** | 430 | /** |
diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c index 0998723cde79..a4caf95485d7 100644 --- a/drivers/gpu/drm/drm_lock.c +++ b/drivers/gpu/drm/drm_lock.c | |||
| @@ -105,14 +105,19 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv) | |||
| 105 | ret ? "interrupted" : "has lock"); | 105 | ret ? "interrupted" : "has lock"); |
| 106 | if (ret) return ret; | 106 | if (ret) return ret; |
| 107 | 107 | ||
| 108 | sigemptyset(&dev->sigmask); | 108 | /* don't set the block all signals on the master process for now |
| 109 | sigaddset(&dev->sigmask, SIGSTOP); | 109 | * really probably not the correct answer but lets us debug xkb |
| 110 | sigaddset(&dev->sigmask, SIGTSTP); | 110 | * xserver for now */ |
| 111 | sigaddset(&dev->sigmask, SIGTTIN); | 111 | if (!file_priv->master) { |
| 112 | sigaddset(&dev->sigmask, SIGTTOU); | 112 | sigemptyset(&dev->sigmask); |
| 113 | dev->sigdata.context = lock->context; | 113 | sigaddset(&dev->sigmask, SIGSTOP); |
| 114 | dev->sigdata.lock = dev->lock.hw_lock; | 114 | sigaddset(&dev->sigmask, SIGTSTP); |
| 115 | block_all_signals(drm_notifier, &dev->sigdata, &dev->sigmask); | 115 | sigaddset(&dev->sigmask, SIGTTIN); |
| 116 | sigaddset(&dev->sigmask, SIGTTOU); | ||
| 117 | dev->sigdata.context = lock->context; | ||
| 118 | dev->sigdata.lock = dev->lock.hw_lock; | ||
| 119 | block_all_signals(drm_notifier, &dev->sigdata, &dev->sigmask); | ||
| 120 | } | ||
| 116 | 121 | ||
| 117 | if (dev->driver->dma_ready && (lock->flags & _DRM_LOCK_READY)) | 122 | if (dev->driver->dma_ready && (lock->flags & _DRM_LOCK_READY)) |
| 118 | dev->driver->dma_ready(dev); | 123 | dev->driver->dma_ready(dev); |
| @@ -150,6 +155,7 @@ int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv) | |||
| 150 | { | 155 | { |
| 151 | struct drm_lock *lock = data; | 156 | struct drm_lock *lock = data; |
| 152 | unsigned long irqflags; | 157 | unsigned long irqflags; |
| 158 | void (*tasklet_func)(struct drm_device *); | ||
| 153 | 159 | ||
| 154 | if (lock->context == DRM_KERNEL_CONTEXT) { | 160 | if (lock->context == DRM_KERNEL_CONTEXT) { |
| 155 | DRM_ERROR("Process %d using kernel context %d\n", | 161 | DRM_ERROR("Process %d using kernel context %d\n", |
| @@ -158,14 +164,11 @@ int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv) | |||
| 158 | } | 164 | } |
| 159 | 165 | ||
| 160 | spin_lock_irqsave(&dev->tasklet_lock, irqflags); | 166 | spin_lock_irqsave(&dev->tasklet_lock, irqflags); |
| 161 | 167 | tasklet_func = dev->locked_tasklet_func; | |
| 162 | if (dev->locked_tasklet_func) { | 168 | dev->locked_tasklet_func = NULL; |
| 163 | dev->locked_tasklet_func(dev); | ||
| 164 | |||
| 165 | dev->locked_tasklet_func = NULL; | ||
| 166 | } | ||
| 167 | |||
| 168 | spin_unlock_irqrestore(&dev->tasklet_lock, irqflags); | 169 | spin_unlock_irqrestore(&dev->tasklet_lock, irqflags); |
| 170 | if (tasklet_func != NULL) | ||
| 171 | tasklet_func(dev); | ||
| 169 | 172 | ||
| 170 | atomic_inc(&dev->counts[_DRM_STAT_UNLOCKS]); | 173 | atomic_inc(&dev->counts[_DRM_STAT_UNLOCKS]); |
| 171 | 174 | ||
diff --git a/drivers/gpu/drm/radeon/r300_cmdbuf.c b/drivers/gpu/drm/radeon/r300_cmdbuf.c index 702df45320f7..4b27d9abb7bc 100644 --- a/drivers/gpu/drm/radeon/r300_cmdbuf.c +++ b/drivers/gpu/drm/radeon/r300_cmdbuf.c | |||
| @@ -77,6 +77,9 @@ static int r300_emit_cliprects(drm_radeon_private_t *dev_priv, | |||
| 77 | return -EFAULT; | 77 | return -EFAULT; |
| 78 | } | 78 | } |
| 79 | 79 | ||
| 80 | box.x2--; /* Hardware expects inclusive bottom-right corner */ | ||
| 81 | box.y2--; | ||
| 82 | |||
| 80 | if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RV515) { | 83 | if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RV515) { |
| 81 | box.x1 = (box.x1) & | 84 | box.x1 = (box.x1) & |
| 82 | R300_CLIPRECT_MASK; | 85 | R300_CLIPRECT_MASK; |
| @@ -95,8 +98,8 @@ static int r300_emit_cliprects(drm_radeon_private_t *dev_priv, | |||
| 95 | R300_CLIPRECT_MASK; | 98 | R300_CLIPRECT_MASK; |
| 96 | box.y2 = (box.y2 + R300_CLIPRECT_OFFSET) & | 99 | box.y2 = (box.y2 + R300_CLIPRECT_OFFSET) & |
| 97 | R300_CLIPRECT_MASK; | 100 | R300_CLIPRECT_MASK; |
| 98 | |||
| 99 | } | 101 | } |
| 102 | |||
| 100 | OUT_RING((box.x1 << R300_CLIPRECT_X_SHIFT) | | 103 | OUT_RING((box.x1 << R300_CLIPRECT_X_SHIFT) | |
| 101 | (box.y1 << R300_CLIPRECT_Y_SHIFT)); | 104 | (box.y1 << R300_CLIPRECT_Y_SHIFT)); |
| 102 | OUT_RING((box.x2 << R300_CLIPRECT_X_SHIFT) | | 105 | OUT_RING((box.x2 << R300_CLIPRECT_X_SHIFT) | |
| @@ -136,6 +139,18 @@ static int r300_emit_cliprects(drm_radeon_private_t *dev_priv, | |||
| 136 | ADVANCE_RING(); | 139 | ADVANCE_RING(); |
| 137 | } | 140 | } |
| 138 | 141 | ||
| 142 | /* flus cache and wait idle clean after cliprect change */ | ||
| 143 | BEGIN_RING(2); | ||
| 144 | OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0)); | ||
| 145 | OUT_RING(R300_RB3D_DC_FLUSH); | ||
| 146 | ADVANCE_RING(); | ||
| 147 | BEGIN_RING(2); | ||
| 148 | OUT_RING(CP_PACKET0(RADEON_WAIT_UNTIL, 0)); | ||
| 149 | OUT_RING(RADEON_WAIT_3D_IDLECLEAN); | ||
| 150 | ADVANCE_RING(); | ||
| 151 | /* set flush flag */ | ||
| 152 | dev_priv->track_flush |= RADEON_FLUSH_EMITED; | ||
| 153 | |||
| 139 | return 0; | 154 | return 0; |
| 140 | } | 155 | } |
| 141 | 156 | ||
| @@ -166,13 +181,13 @@ void r300_init_reg_flags(struct drm_device *dev) | |||
| 166 | ADD_RANGE(0x21DC, 1); | 181 | ADD_RANGE(0x21DC, 1); |
| 167 | ADD_RANGE(R300_VAP_UNKNOWN_221C, 1); | 182 | ADD_RANGE(R300_VAP_UNKNOWN_221C, 1); |
| 168 | ADD_RANGE(R300_VAP_CLIP_X_0, 4); | 183 | ADD_RANGE(R300_VAP_CLIP_X_0, 4); |
| 169 | ADD_RANGE(R300_VAP_PVS_WAITIDLE, 1); | 184 | ADD_RANGE(R300_VAP_PVS_STATE_FLUSH_REG, 1); |
| 170 | ADD_RANGE(R300_VAP_UNKNOWN_2288, 1); | 185 | ADD_RANGE(R300_VAP_UNKNOWN_2288, 1); |
| 171 | ADD_RANGE(R300_VAP_OUTPUT_VTX_FMT_0, 2); | 186 | ADD_RANGE(R300_VAP_OUTPUT_VTX_FMT_0, 2); |
| 172 | ADD_RANGE(R300_VAP_PVS_CNTL_1, 3); | 187 | ADD_RANGE(R300_VAP_PVS_CNTL_1, 3); |
| 173 | ADD_RANGE(R300_GB_ENABLE, 1); | 188 | ADD_RANGE(R300_GB_ENABLE, 1); |
| 174 | ADD_RANGE(R300_GB_MSPOS0, 5); | 189 | ADD_RANGE(R300_GB_MSPOS0, 5); |
| 175 | ADD_RANGE(R300_TX_CNTL, 1); | 190 | ADD_RANGE(R300_TX_INVALTAGS, 1); |
| 176 | ADD_RANGE(R300_TX_ENABLE, 1); | 191 | ADD_RANGE(R300_TX_ENABLE, 1); |
| 177 | ADD_RANGE(0x4200, 4); | 192 | ADD_RANGE(0x4200, 4); |
| 178 | ADD_RANGE(0x4214, 1); | 193 | ADD_RANGE(0x4214, 1); |
| @@ -388,15 +403,28 @@ static __inline__ int r300_emit_vpu(drm_radeon_private_t *dev_priv, | |||
| 388 | if (sz * 16 > cmdbuf->bufsz) | 403 | if (sz * 16 > cmdbuf->bufsz) |
| 389 | return -EINVAL; | 404 | return -EINVAL; |
| 390 | 405 | ||
| 391 | BEGIN_RING(5 + sz * 4); | 406 | /* VAP is very sensitive so we purge cache before we program it |
| 392 | /* Wait for VAP to come to senses.. */ | 407 | * and we also flush its state before & after */ |
| 393 | /* there is no need to emit it multiple times, (only once before VAP is programmed, | 408 | BEGIN_RING(6); |
| 394 | but this optimization is for later */ | 409 | OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0)); |
| 395 | OUT_RING_REG(R300_VAP_PVS_WAITIDLE, 0); | 410 | OUT_RING(R300_RB3D_DC_FLUSH); |
| 411 | OUT_RING(CP_PACKET0(RADEON_WAIT_UNTIL, 0)); | ||
| 412 | OUT_RING(RADEON_WAIT_3D_IDLECLEAN); | ||
| 413 | OUT_RING(CP_PACKET0(R300_VAP_PVS_STATE_FLUSH_REG, 0)); | ||
| 414 | OUT_RING(0); | ||
| 415 | ADVANCE_RING(); | ||
| 416 | /* set flush flag */ | ||
| 417 | dev_priv->track_flush |= RADEON_FLUSH_EMITED; | ||
| 418 | |||
| 419 | BEGIN_RING(3 + sz * 4); | ||
| 396 | OUT_RING_REG(R300_VAP_PVS_UPLOAD_ADDRESS, addr); | 420 | OUT_RING_REG(R300_VAP_PVS_UPLOAD_ADDRESS, addr); |
| 397 | OUT_RING(CP_PACKET0_TABLE(R300_VAP_PVS_UPLOAD_DATA, sz * 4 - 1)); | 421 | OUT_RING(CP_PACKET0_TABLE(R300_VAP_PVS_UPLOAD_DATA, sz * 4 - 1)); |
| 398 | OUT_RING_TABLE((int *)cmdbuf->buf, sz * 4); | 422 | OUT_RING_TABLE((int *)cmdbuf->buf, sz * 4); |
| 423 | ADVANCE_RING(); | ||
| 399 | 424 | ||
| 425 | BEGIN_RING(2); | ||
| 426 | OUT_RING(CP_PACKET0(R300_VAP_PVS_STATE_FLUSH_REG, 0)); | ||
| 427 | OUT_RING(0); | ||
| 400 | ADVANCE_RING(); | 428 | ADVANCE_RING(); |
| 401 | 429 | ||
| 402 | cmdbuf->buf += sz * 16; | 430 | cmdbuf->buf += sz * 16; |
| @@ -424,6 +452,15 @@ static __inline__ int r300_emit_clear(drm_radeon_private_t *dev_priv, | |||
| 424 | OUT_RING_TABLE((int *)cmdbuf->buf, 8); | 452 | OUT_RING_TABLE((int *)cmdbuf->buf, 8); |
| 425 | ADVANCE_RING(); | 453 | ADVANCE_RING(); |
| 426 | 454 | ||
| 455 | BEGIN_RING(4); | ||
| 456 | OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0)); | ||
| 457 | OUT_RING(R300_RB3D_DC_FLUSH); | ||
| 458 | OUT_RING(CP_PACKET0(RADEON_WAIT_UNTIL, 0)); | ||
| 459 | OUT_RING(RADEON_WAIT_3D_IDLECLEAN); | ||
| 460 | ADVANCE_RING(); | ||
| 461 | /* set flush flag */ | ||
| 462 | dev_priv->track_flush |= RADEON_FLUSH_EMITED; | ||
| 463 | |||
| 427 | cmdbuf->buf += 8 * 4; | 464 | cmdbuf->buf += 8 * 4; |
| 428 | cmdbuf->bufsz -= 8 * 4; | 465 | cmdbuf->bufsz -= 8 * 4; |
| 429 | 466 | ||
| @@ -543,22 +580,23 @@ static __inline__ int r300_emit_bitblt_multi(drm_radeon_private_t *dev_priv, | |||
| 543 | return 0; | 580 | return 0; |
| 544 | } | 581 | } |
| 545 | 582 | ||
| 546 | static __inline__ int r300_emit_indx_buffer(drm_radeon_private_t *dev_priv, | 583 | static __inline__ int r300_emit_draw_indx_2(drm_radeon_private_t *dev_priv, |
| 547 | drm_radeon_kcmd_buffer_t *cmdbuf) | 584 | drm_radeon_kcmd_buffer_t *cmdbuf) |
| 548 | { | 585 | { |
| 549 | u32 *cmd = (u32 *) cmdbuf->buf; | 586 | u32 *cmd; |
| 550 | int count, ret; | 587 | int count; |
| 588 | int expected_count; | ||
| 551 | RING_LOCALS; | 589 | RING_LOCALS; |
| 552 | 590 | ||
| 553 | count=(cmd[0]>>16) & 0x3fff; | 591 | cmd = (u32 *) cmdbuf->buf; |
| 592 | count = (cmd[0]>>16) & 0x3fff; | ||
| 593 | expected_count = cmd[1] >> 16; | ||
| 594 | if (!(cmd[1] & R300_VAP_VF_CNTL__INDEX_SIZE_32bit)) | ||
| 595 | expected_count = (expected_count+1)/2; | ||
| 554 | 596 | ||
| 555 | if ((cmd[1] & 0x8000ffff) != 0x80000810) { | 597 | if (count && count != expected_count) { |
| 556 | DRM_ERROR("Invalid indx_buffer reg address %08X\n", cmd[1]); | 598 | DRM_ERROR("3D_DRAW_INDX_2: packet size %i, expected %i\n", |
| 557 | return -EINVAL; | 599 | count, expected_count); |
| 558 | } | ||
| 559 | ret = !radeon_check_offset(dev_priv, cmd[2]); | ||
| 560 | if (ret) { | ||
| 561 | DRM_ERROR("Invalid indx_buffer offset is %08X\n", cmd[2]); | ||
| 562 | return -EINVAL; | 600 | return -EINVAL; |
| 563 | } | 601 | } |
| 564 | 602 | ||
| @@ -570,6 +608,50 @@ static __inline__ int r300_emit_indx_buffer(drm_radeon_private_t *dev_priv, | |||
| 570 | cmdbuf->buf += (count+2)*4; | 608 | cmdbuf->buf += (count+2)*4; |
| 571 | cmdbuf->bufsz -= (count+2)*4; | 609 | cmdbuf->bufsz -= (count+2)*4; |
| 572 | 610 | ||
| 611 | if (!count) { | ||
| 612 | drm_r300_cmd_header_t header; | ||
| 613 | |||
| 614 | if (cmdbuf->bufsz < 4*4 + sizeof(header)) { | ||
| 615 | DRM_ERROR("3D_DRAW_INDX_2: expect subsequent INDX_BUFFER, but stream is too short.\n"); | ||
| 616 | return -EINVAL; | ||
| 617 | } | ||
| 618 | |||
| 619 | header.u = *(unsigned int *)cmdbuf->buf; | ||
| 620 | |||
| 621 | cmdbuf->buf += sizeof(header); | ||
| 622 | cmdbuf->bufsz -= sizeof(header); | ||
| 623 | cmd = (u32 *) cmdbuf->buf; | ||
| 624 | |||
| 625 | if (header.header.cmd_type != R300_CMD_PACKET3 || | ||
| 626 | header.packet3.packet != R300_CMD_PACKET3_RAW || | ||
| 627 | cmd[0] != CP_PACKET3(RADEON_CP_INDX_BUFFER, 2)) { | ||
| 628 | DRM_ERROR("3D_DRAW_INDX_2: expect subsequent INDX_BUFFER.\n"); | ||
| 629 | return -EINVAL; | ||
| 630 | } | ||
| 631 | |||
| 632 | if ((cmd[1] & 0x8000ffff) != 0x80000810) { | ||
| 633 | DRM_ERROR("Invalid indx_buffer reg address %08X\n", cmd[1]); | ||
| 634 | return -EINVAL; | ||
| 635 | } | ||
| 636 | if (!radeon_check_offset(dev_priv, cmd[2])) { | ||
| 637 | DRM_ERROR("Invalid indx_buffer offset is %08X\n", cmd[2]); | ||
| 638 | return -EINVAL; | ||
| 639 | } | ||
| 640 | if (cmd[3] != expected_count) { | ||
| 641 | DRM_ERROR("INDX_BUFFER: buffer size %i, expected %i\n", | ||
| 642 | cmd[3], expected_count); | ||
| 643 | return -EINVAL; | ||
| 644 | } | ||
| 645 | |||
| 646 | BEGIN_RING(4); | ||
| 647 | OUT_RING(cmd[0]); | ||
| 648 | OUT_RING_TABLE((int *)(cmdbuf->buf + 4), 3); | ||
| 649 | ADVANCE_RING(); | ||
| 650 | |||
| 651 | cmdbuf->buf += 4*4; | ||
| 652 | cmdbuf->bufsz -= 4*4; | ||
| 653 | } | ||
| 654 | |||
| 573 | return 0; | 655 | return 0; |
| 574 | } | 656 | } |
| 575 | 657 | ||
| @@ -613,11 +695,22 @@ static __inline__ int r300_emit_raw_packet3(drm_radeon_private_t *dev_priv, | |||
| 613 | case RADEON_CNTL_BITBLT_MULTI: | 695 | case RADEON_CNTL_BITBLT_MULTI: |
| 614 | return r300_emit_bitblt_multi(dev_priv, cmdbuf); | 696 | return r300_emit_bitblt_multi(dev_priv, cmdbuf); |
| 615 | 697 | ||
| 616 | case RADEON_CP_INDX_BUFFER: /* DRAW_INDX_2 without INDX_BUFFER seems to lock up the gpu */ | 698 | case RADEON_CP_INDX_BUFFER: |
| 617 | return r300_emit_indx_buffer(dev_priv, cmdbuf); | 699 | DRM_ERROR("packet3 INDX_BUFFER without preceding 3D_DRAW_INDX_2 is illegal.\n"); |
| 618 | case RADEON_CP_3D_DRAW_IMMD_2: /* triggers drawing using in-packet vertex data */ | 700 | return -EINVAL; |
| 619 | case RADEON_CP_3D_DRAW_VBUF_2: /* triggers drawing of vertex buffers setup elsewhere */ | 701 | case RADEON_CP_3D_DRAW_IMMD_2: |
| 620 | case RADEON_CP_3D_DRAW_INDX_2: /* triggers drawing using indices to vertex buffer */ | 702 | /* triggers drawing using in-packet vertex data */ |
| 703 | case RADEON_CP_3D_DRAW_VBUF_2: | ||
| 704 | /* triggers drawing of vertex buffers setup elsewhere */ | ||
| 705 | dev_priv->track_flush &= ~(RADEON_FLUSH_EMITED | | ||
| 706 | RADEON_PURGE_EMITED); | ||
| 707 | break; | ||
| 708 | case RADEON_CP_3D_DRAW_INDX_2: | ||
| 709 | /* triggers drawing using indices to vertex buffer */ | ||
| 710 | /* whenever we send vertex we clear flush & purge */ | ||
| 711 | dev_priv->track_flush &= ~(RADEON_FLUSH_EMITED | | ||
| 712 | RADEON_PURGE_EMITED); | ||
| 713 | return r300_emit_draw_indx_2(dev_priv, cmdbuf); | ||
| 621 | case RADEON_WAIT_FOR_IDLE: | 714 | case RADEON_WAIT_FOR_IDLE: |
| 622 | case RADEON_CP_NOP: | 715 | case RADEON_CP_NOP: |
| 623 | /* these packets are safe */ | 716 | /* these packets are safe */ |
| @@ -713,17 +806,53 @@ static __inline__ int r300_emit_packet3(drm_radeon_private_t *dev_priv, | |||
| 713 | */ | 806 | */ |
| 714 | static __inline__ void r300_pacify(drm_radeon_private_t *dev_priv) | 807 | static __inline__ void r300_pacify(drm_radeon_private_t *dev_priv) |
| 715 | { | 808 | { |
| 809 | uint32_t cache_z, cache_3d, cache_2d; | ||
| 716 | RING_LOCALS; | 810 | RING_LOCALS; |
| 717 | 811 | ||
| 718 | BEGIN_RING(6); | 812 | cache_z = R300_ZC_FLUSH; |
| 719 | OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0)); | 813 | cache_2d = R300_RB2D_DC_FLUSH; |
| 720 | OUT_RING(R300_RB3D_DSTCACHE_UNKNOWN_0A); | 814 | cache_3d = R300_RB3D_DC_FLUSH; |
| 815 | if (!(dev_priv->track_flush & RADEON_PURGE_EMITED)) { | ||
| 816 | /* we can purge, primitive where draw since last purge */ | ||
| 817 | cache_z |= R300_ZC_FREE; | ||
| 818 | cache_2d |= R300_RB2D_DC_FREE; | ||
| 819 | cache_3d |= R300_RB3D_DC_FREE; | ||
| 820 | } | ||
| 821 | |||
| 822 | /* flush & purge zbuffer */ | ||
| 823 | BEGIN_RING(2); | ||
| 721 | OUT_RING(CP_PACKET0(R300_ZB_ZCACHE_CTLSTAT, 0)); | 824 | OUT_RING(CP_PACKET0(R300_ZB_ZCACHE_CTLSTAT, 0)); |
| 722 | OUT_RING(R300_ZB_ZCACHE_CTLSTAT_ZC_FLUSH_FLUSH_AND_FREE| | 825 | OUT_RING(cache_z); |
| 723 | R300_ZB_ZCACHE_CTLSTAT_ZC_FREE_FREE); | 826 | ADVANCE_RING(); |
| 724 | OUT_RING(CP_PACKET3(RADEON_CP_NOP, 0)); | 827 | /* flush & purge 3d */ |
| 725 | OUT_RING(0x0); | 828 | BEGIN_RING(2); |
| 829 | OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0)); | ||
| 830 | OUT_RING(cache_3d); | ||
| 831 | ADVANCE_RING(); | ||
| 832 | /* flush & purge texture */ | ||
| 833 | BEGIN_RING(2); | ||
| 834 | OUT_RING(CP_PACKET0(R300_TX_INVALTAGS, 0)); | ||
| 835 | OUT_RING(0); | ||
| 836 | ADVANCE_RING(); | ||
| 837 | /* FIXME: is this one really needed ? */ | ||
| 838 | BEGIN_RING(2); | ||
| 839 | OUT_RING(CP_PACKET0(R300_RB3D_AARESOLVE_CTL, 0)); | ||
| 840 | OUT_RING(0); | ||
| 841 | ADVANCE_RING(); | ||
| 842 | BEGIN_RING(2); | ||
| 843 | OUT_RING(CP_PACKET0(RADEON_WAIT_UNTIL, 0)); | ||
| 844 | OUT_RING(RADEON_WAIT_3D_IDLECLEAN); | ||
| 845 | ADVANCE_RING(); | ||
| 846 | /* flush & purge 2d through E2 as RB2D will trigger lockup */ | ||
| 847 | BEGIN_RING(4); | ||
| 848 | OUT_RING(CP_PACKET0(R300_DSTCACHE_CTLSTAT, 0)); | ||
| 849 | OUT_RING(cache_2d); | ||
| 850 | OUT_RING(CP_PACKET0(RADEON_WAIT_UNTIL, 0)); | ||
| 851 | OUT_RING(RADEON_WAIT_2D_IDLECLEAN | | ||
| 852 | RADEON_WAIT_HOST_IDLECLEAN); | ||
| 726 | ADVANCE_RING(); | 853 | ADVANCE_RING(); |
| 854 | /* set flush & purge flags */ | ||
| 855 | dev_priv->track_flush |= RADEON_FLUSH_EMITED | RADEON_PURGE_EMITED; | ||
| 727 | } | 856 | } |
| 728 | 857 | ||
| 729 | /** | 858 | /** |
| @@ -905,8 +1034,7 @@ int r300_do_cp_cmdbuf(struct drm_device *dev, | |||
| 905 | 1034 | ||
| 906 | DRM_DEBUG("\n"); | 1035 | DRM_DEBUG("\n"); |
| 907 | 1036 | ||
| 908 | /* See the comment above r300_emit_begin3d for why this call must be here, | 1037 | /* pacify */ |
| 909 | * and what the cleanup gotos are for. */ | ||
| 910 | r300_pacify(dev_priv); | 1038 | r300_pacify(dev_priv); |
| 911 | 1039 | ||
| 912 | if (cmdbuf->nbox <= R300_SIMULTANEOUS_CLIPRECTS) { | 1040 | if (cmdbuf->nbox <= R300_SIMULTANEOUS_CLIPRECTS) { |
diff --git a/drivers/gpu/drm/radeon/r300_reg.h b/drivers/gpu/drm/radeon/r300_reg.h index a6802f26afc4..ee6f811599a3 100644 --- a/drivers/gpu/drm/radeon/r300_reg.h +++ b/drivers/gpu/drm/radeon/r300_reg.h | |||
| @@ -317,7 +317,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. | |||
| 317 | * Therefore, I suspect writing zero to 0x2284 synchronizes the engine and | 317 | * Therefore, I suspect writing zero to 0x2284 synchronizes the engine and |
| 318 | * avoids bugs caused by still running shaders reading bad data from memory. | 318 | * avoids bugs caused by still running shaders reading bad data from memory. |
| 319 | */ | 319 | */ |
| 320 | #define R300_VAP_PVS_WAITIDLE 0x2284 /* GUESS */ | 320 | #define R300_VAP_PVS_STATE_FLUSH_REG 0x2284 |
| 321 | 321 | ||
| 322 | /* Absolutely no clue what this register is about. */ | 322 | /* Absolutely no clue what this register is about. */ |
| 323 | #define R300_VAP_UNKNOWN_2288 0x2288 | 323 | #define R300_VAP_UNKNOWN_2288 0x2288 |
| @@ -513,7 +513,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. | |||
| 513 | /* gap */ | 513 | /* gap */ |
| 514 | 514 | ||
| 515 | /* Zero to flush caches. */ | 515 | /* Zero to flush caches. */ |
| 516 | #define R300_TX_CNTL 0x4100 | 516 | #define R300_TX_INVALTAGS 0x4100 |
| 517 | #define R300_TX_FLUSH 0x0 | 517 | #define R300_TX_FLUSH 0x0 |
| 518 | 518 | ||
| 519 | /* The upper enable bits are guessed, based on fglrx reported limits. */ | 519 | /* The upper enable bits are guessed, based on fglrx reported limits. */ |
| @@ -1362,6 +1362,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. | |||
| 1362 | #define R300_RB3D_COLORPITCH2 0x4E40 /* GUESS */ | 1362 | #define R300_RB3D_COLORPITCH2 0x4E40 /* GUESS */ |
| 1363 | #define R300_RB3D_COLORPITCH3 0x4E44 /* GUESS */ | 1363 | #define R300_RB3D_COLORPITCH3 0x4E44 /* GUESS */ |
| 1364 | 1364 | ||
| 1365 | #define R300_RB3D_AARESOLVE_CTL 0x4E88 | ||
| 1365 | /* gap */ | 1366 | /* gap */ |
| 1366 | 1367 | ||
| 1367 | /* Guess by Vladimir. | 1368 | /* Guess by Vladimir. |
diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c index f0de81a5689d..248ab4a7d39f 100644 --- a/drivers/gpu/drm/radeon/radeon_cp.c +++ b/drivers/gpu/drm/radeon/radeon_cp.c | |||
| @@ -40,6 +40,7 @@ | |||
| 40 | #define RADEON_FIFO_DEBUG 0 | 40 | #define RADEON_FIFO_DEBUG 0 |
| 41 | 41 | ||
| 42 | static int radeon_do_cleanup_cp(struct drm_device * dev); | 42 | static int radeon_do_cleanup_cp(struct drm_device * dev); |
| 43 | static void radeon_do_cp_start(drm_radeon_private_t * dev_priv); | ||
| 43 | 44 | ||
| 44 | static u32 R500_READ_MCIND(drm_radeon_private_t *dev_priv, int addr) | 45 | static u32 R500_READ_MCIND(drm_radeon_private_t *dev_priv, int addr) |
| 45 | { | 46 | { |
| @@ -198,23 +199,8 @@ static int radeon_do_pixcache_flush(drm_radeon_private_t * dev_priv) | |||
| 198 | DRM_UDELAY(1); | 199 | DRM_UDELAY(1); |
| 199 | } | 200 | } |
| 200 | } else { | 201 | } else { |
| 201 | /* 3D */ | 202 | /* don't flush or purge cache here or lockup */ |
| 202 | tmp = RADEON_READ(R300_RB3D_DSTCACHE_CTLSTAT); | 203 | return 0; |
| 203 | tmp |= RADEON_RB3D_DC_FLUSH_ALL; | ||
| 204 | RADEON_WRITE(R300_RB3D_DSTCACHE_CTLSTAT, tmp); | ||
| 205 | |||
| 206 | /* 2D */ | ||
| 207 | tmp = RADEON_READ(R300_DSTCACHE_CTLSTAT); | ||
| 208 | tmp |= RADEON_RB3D_DC_FLUSH_ALL; | ||
| 209 | RADEON_WRITE(R300_DSTCACHE_CTLSTAT, tmp); | ||
| 210 | |||
| 211 | for (i = 0; i < dev_priv->usec_timeout; i++) { | ||
| 212 | if (!(RADEON_READ(R300_DSTCACHE_CTLSTAT) | ||
| 213 | & RADEON_RB3D_DC_BUSY)) { | ||
| 214 | return 0; | ||
| 215 | } | ||
| 216 | DRM_UDELAY(1); | ||
| 217 | } | ||
| 218 | } | 204 | } |
| 219 | 205 | ||
| 220 | #if RADEON_FIFO_DEBUG | 206 | #if RADEON_FIFO_DEBUG |
| @@ -237,6 +223,9 @@ static int radeon_do_wait_for_fifo(drm_radeon_private_t * dev_priv, int entries) | |||
| 237 | return 0; | 223 | return 0; |
| 238 | DRM_UDELAY(1); | 224 | DRM_UDELAY(1); |
| 239 | } | 225 | } |
| 226 | DRM_DEBUG("wait for fifo failed status : 0x%08X 0x%08X\n", | ||
| 227 | RADEON_READ(RADEON_RBBM_STATUS), | ||
| 228 | RADEON_READ(R300_VAP_CNTL_STATUS)); | ||
| 240 | 229 | ||
| 241 | #if RADEON_FIFO_DEBUG | 230 | #if RADEON_FIFO_DEBUG |
| 242 | DRM_ERROR("failed!\n"); | 231 | DRM_ERROR("failed!\n"); |
| @@ -263,6 +252,9 @@ static int radeon_do_wait_for_idle(drm_radeon_private_t * dev_priv) | |||
| 263 | } | 252 | } |
| 264 | DRM_UDELAY(1); | 253 | DRM_UDELAY(1); |
| 265 | } | 254 | } |
| 255 | DRM_DEBUG("wait idle failed status : 0x%08X 0x%08X\n", | ||
| 256 | RADEON_READ(RADEON_RBBM_STATUS), | ||
| 257 | RADEON_READ(R300_VAP_CNTL_STATUS)); | ||
| 266 | 258 | ||
| 267 | #if RADEON_FIFO_DEBUG | 259 | #if RADEON_FIFO_DEBUG |
| 268 | DRM_ERROR("failed!\n"); | 260 | DRM_ERROR("failed!\n"); |
| @@ -443,14 +435,20 @@ static void radeon_do_cp_start(drm_radeon_private_t * dev_priv) | |||
| 443 | 435 | ||
| 444 | dev_priv->cp_running = 1; | 436 | dev_priv->cp_running = 1; |
| 445 | 437 | ||
| 446 | BEGIN_RING(6); | 438 | BEGIN_RING(8); |
| 447 | 439 | /* isync can only be written through cp on r5xx write it here */ | |
| 440 | OUT_RING(CP_PACKET0(RADEON_ISYNC_CNTL, 0)); | ||
| 441 | OUT_RING(RADEON_ISYNC_ANY2D_IDLE3D | | ||
| 442 | RADEON_ISYNC_ANY3D_IDLE2D | | ||
| 443 | RADEON_ISYNC_WAIT_IDLEGUI | | ||
| 444 | RADEON_ISYNC_CPSCRATCH_IDLEGUI); | ||
| 448 | RADEON_PURGE_CACHE(); | 445 | RADEON_PURGE_CACHE(); |
| 449 | RADEON_PURGE_ZCACHE(); | 446 | RADEON_PURGE_ZCACHE(); |
| 450 | RADEON_WAIT_UNTIL_IDLE(); | 447 | RADEON_WAIT_UNTIL_IDLE(); |
| 451 | |||
| 452 | ADVANCE_RING(); | 448 | ADVANCE_RING(); |
| 453 | COMMIT_RING(); | 449 | COMMIT_RING(); |
| 450 | |||
| 451 | dev_priv->track_flush |= RADEON_FLUSH_EMITED | RADEON_PURGE_EMITED; | ||
| 454 | } | 452 | } |
| 455 | 453 | ||
| 456 | /* Reset the Command Processor. This will not flush any pending | 454 | /* Reset the Command Processor. This will not flush any pending |
diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h index 3f0eca957aa7..099381693175 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.h +++ b/drivers/gpu/drm/radeon/radeon_drv.h | |||
| @@ -220,6 +220,9 @@ struct radeon_virt_surface { | |||
| 220 | struct drm_file *file_priv; | 220 | struct drm_file *file_priv; |
| 221 | }; | 221 | }; |
| 222 | 222 | ||
| 223 | #define RADEON_FLUSH_EMITED (1 < 0) | ||
| 224 | #define RADEON_PURGE_EMITED (1 < 1) | ||
| 225 | |||
| 223 | typedef struct drm_radeon_private { | 226 | typedef struct drm_radeon_private { |
| 224 | drm_radeon_ring_buffer_t ring; | 227 | drm_radeon_ring_buffer_t ring; |
| 225 | drm_radeon_sarea_t *sarea_priv; | 228 | drm_radeon_sarea_t *sarea_priv; |
| @@ -311,6 +314,7 @@ typedef struct drm_radeon_private { | |||
| 311 | unsigned long fb_aper_offset; | 314 | unsigned long fb_aper_offset; |
| 312 | 315 | ||
| 313 | int num_gb_pipes; | 316 | int num_gb_pipes; |
| 317 | int track_flush; | ||
| 314 | } drm_radeon_private_t; | 318 | } drm_radeon_private_t; |
| 315 | 319 | ||
| 316 | typedef struct drm_radeon_buf_priv { | 320 | typedef struct drm_radeon_buf_priv { |
| @@ -693,7 +697,6 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev, | |||
| 693 | #define R300_ZB_ZCACHE_CTLSTAT 0x4f18 | 697 | #define R300_ZB_ZCACHE_CTLSTAT 0x4f18 |
| 694 | # define R300_ZC_FLUSH (1 << 0) | 698 | # define R300_ZC_FLUSH (1 << 0) |
| 695 | # define R300_ZC_FREE (1 << 1) | 699 | # define R300_ZC_FREE (1 << 1) |
| 696 | # define R300_ZC_FLUSH_ALL 0x3 | ||
| 697 | # define R300_ZC_BUSY (1 << 31) | 700 | # define R300_ZC_BUSY (1 << 31) |
| 698 | #define RADEON_RB3D_DSTCACHE_CTLSTAT 0x325c | 701 | #define RADEON_RB3D_DSTCACHE_CTLSTAT 0x325c |
| 699 | # define RADEON_RB3D_DC_FLUSH (3 << 0) | 702 | # define RADEON_RB3D_DC_FLUSH (3 << 0) |
| @@ -701,6 +704,8 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev, | |||
| 701 | # define RADEON_RB3D_DC_FLUSH_ALL 0xf | 704 | # define RADEON_RB3D_DC_FLUSH_ALL 0xf |
| 702 | # define RADEON_RB3D_DC_BUSY (1 << 31) | 705 | # define RADEON_RB3D_DC_BUSY (1 << 31) |
| 703 | #define R300_RB3D_DSTCACHE_CTLSTAT 0x4e4c | 706 | #define R300_RB3D_DSTCACHE_CTLSTAT 0x4e4c |
| 707 | # define R300_RB3D_DC_FLUSH (2 << 0) | ||
| 708 | # define R300_RB3D_DC_FREE (2 << 2) | ||
| 704 | # define R300_RB3D_DC_FINISH (1 << 4) | 709 | # define R300_RB3D_DC_FINISH (1 << 4) |
| 705 | #define RADEON_RB3D_ZSTENCILCNTL 0x1c2c | 710 | #define RADEON_RB3D_ZSTENCILCNTL 0x1c2c |
| 706 | # define RADEON_Z_TEST_MASK (7 << 4) | 711 | # define RADEON_Z_TEST_MASK (7 << 4) |
| @@ -1246,17 +1251,17 @@ do { \ | |||
| 1246 | OUT_RING(RADEON_RB3D_DC_FLUSH); \ | 1251 | OUT_RING(RADEON_RB3D_DC_FLUSH); \ |
| 1247 | } else { \ | 1252 | } else { \ |
| 1248 | OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0)); \ | 1253 | OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0)); \ |
| 1249 | OUT_RING(RADEON_RB3D_DC_FLUSH); \ | 1254 | OUT_RING(R300_RB3D_DC_FLUSH); \ |
| 1250 | } \ | 1255 | } \ |
| 1251 | } while (0) | 1256 | } while (0) |
| 1252 | 1257 | ||
| 1253 | #define RADEON_PURGE_CACHE() do { \ | 1258 | #define RADEON_PURGE_CACHE() do { \ |
| 1254 | if ((dev_priv->flags & RADEON_FAMILY_MASK) <= CHIP_RV280) { \ | 1259 | if ((dev_priv->flags & RADEON_FAMILY_MASK) <= CHIP_RV280) { \ |
| 1255 | OUT_RING(CP_PACKET0(RADEON_RB3D_DSTCACHE_CTLSTAT, 0)); \ | 1260 | OUT_RING(CP_PACKET0(RADEON_RB3D_DSTCACHE_CTLSTAT, 0)); \ |
| 1256 | OUT_RING(RADEON_RB3D_DC_FLUSH_ALL); \ | 1261 | OUT_RING(RADEON_RB3D_DC_FLUSH | RADEON_RB3D_DC_FREE); \ |
| 1257 | } else { \ | 1262 | } else { \ |
| 1258 | OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0)); \ | 1263 | OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0)); \ |
| 1259 | OUT_RING(RADEON_RB3D_DC_FLUSH_ALL); \ | 1264 | OUT_RING(R300_RB3D_DC_FLUSH | R300_RB3D_DC_FREE); \ |
| 1260 | } \ | 1265 | } \ |
| 1261 | } while (0) | 1266 | } while (0) |
| 1262 | 1267 | ||
| @@ -1273,10 +1278,10 @@ do { \ | |||
| 1273 | #define RADEON_PURGE_ZCACHE() do { \ | 1278 | #define RADEON_PURGE_ZCACHE() do { \ |
| 1274 | if ((dev_priv->flags & RADEON_FAMILY_MASK) <= CHIP_RV280) { \ | 1279 | if ((dev_priv->flags & RADEON_FAMILY_MASK) <= CHIP_RV280) { \ |
| 1275 | OUT_RING(CP_PACKET0(RADEON_RB3D_ZCACHE_CTLSTAT, 0)); \ | 1280 | OUT_RING(CP_PACKET0(RADEON_RB3D_ZCACHE_CTLSTAT, 0)); \ |
| 1276 | OUT_RING(RADEON_RB3D_ZC_FLUSH_ALL); \ | 1281 | OUT_RING(RADEON_RB3D_ZC_FLUSH | RADEON_RB3D_ZC_FREE); \ |
| 1277 | } else { \ | 1282 | } else { \ |
| 1278 | OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0)); \ | 1283 | OUT_RING(CP_PACKET0(R300_ZB_ZCACHE_CTLSTAT, 0)); \ |
| 1279 | OUT_RING(R300_ZC_FLUSH_ALL); \ | 1284 | OUT_RING(R300_ZC_FLUSH | R300_ZC_FREE); \ |
| 1280 | } \ | 1285 | } \ |
| 1281 | } while (0) | 1286 | } while (0) |
| 1282 | 1287 | ||
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c index 61e78a4369b9..b15f88249639 100644 --- a/drivers/hid/usbhid/hid-quirks.c +++ b/drivers/hid/usbhid/hid-quirks.c | |||
| @@ -654,12 +654,12 @@ static const struct hid_blacklist { | |||
| 654 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN }, | 654 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN }, |
| 655 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD }, | 655 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD }, |
| 656 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN }, | 656 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN }, |
| 657 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI, HID_QUIRK_APPLE_HAS_FN }, | 657 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE }, |
| 658 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD }, | 658 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD | HID_QUIRK_IGNORE_MOUSE}, |
| 659 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_JIS, HID_QUIRK_APPLE_HAS_FN }, | 659 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_JIS, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE}, |
| 660 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI, HID_QUIRK_APPLE_HAS_FN }, | 660 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE}, |
| 661 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD }, | 661 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD | HID_QUIRK_IGNORE_MOUSE }, |
| 662 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_JIS, HID_QUIRK_APPLE_HAS_FN }, | 662 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_JIS, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE }, |
| 663 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE }, | 663 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE }, |
| 664 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE }, | 664 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE }, |
| 665 | 665 | ||
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig index bf4ebfb86fa5..d402e8d813ce 100644 --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig | |||
| @@ -77,6 +77,22 @@ config SENSORS_AD7418 | |||
| 77 | This driver can also be built as a module. If so, the module | 77 | This driver can also be built as a module. If so, the module |
| 78 | will be called ad7418. | 78 | will be called ad7418. |
| 79 | 79 | ||
| 80 | config SENSORS_ADCXX | ||
| 81 | tristate "National Semiconductor ADCxxxSxxx" | ||
| 82 | depends on SPI_MASTER && EXPERIMENTAL | ||
| 83 | help | ||
| 84 | If you say yes here you get support for the National Semiconductor | ||
| 85 | ADC<bb><c>S<sss> chip family, where | ||
| 86 | * bb is the resolution in number of bits (8, 10, 12) | ||
| 87 | * c is the number of channels (1, 2, 4, 8) | ||
| 88 | * sss is the maximum conversion speed (021 for 200 kSPS, 051 for 500 | ||
| 89 | kSPS and 101 for 1 MSPS) | ||
| 90 | |||
| 91 | Examples : ADC081S101, ADC124S501, ... | ||
| 92 | |||
| 93 | This driver can also be built as a module. If so, the module | ||
| 94 | will be called adcxx. | ||
| 95 | |||
| 80 | config SENSORS_ADM1021 | 96 | config SENSORS_ADM1021 |
| 81 | tristate "Analog Devices ADM1021 and compatibles" | 97 | tristate "Analog Devices ADM1021 and compatibles" |
| 82 | depends on I2C | 98 | depends on I2C |
diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile index 7943e5cefb06..950134ab8426 100644 --- a/drivers/hwmon/Makefile +++ b/drivers/hwmon/Makefile | |||
| @@ -17,6 +17,7 @@ obj-$(CONFIG_SENSORS_ABITUGURU) += abituguru.o | |||
| 17 | obj-$(CONFIG_SENSORS_ABITUGURU3)+= abituguru3.o | 17 | obj-$(CONFIG_SENSORS_ABITUGURU3)+= abituguru3.o |
| 18 | obj-$(CONFIG_SENSORS_AD7414) += ad7414.o | 18 | obj-$(CONFIG_SENSORS_AD7414) += ad7414.o |
| 19 | obj-$(CONFIG_SENSORS_AD7418) += ad7418.o | 19 | obj-$(CONFIG_SENSORS_AD7418) += ad7418.o |
| 20 | obj-$(CONFIG_SENSORS_ADCXX) += adcxx.o | ||
| 20 | obj-$(CONFIG_SENSORS_ADM1021) += adm1021.o | 21 | obj-$(CONFIG_SENSORS_ADM1021) += adm1021.o |
| 21 | obj-$(CONFIG_SENSORS_ADM1025) += adm1025.o | 22 | obj-$(CONFIG_SENSORS_ADM1025) += adm1025.o |
| 22 | obj-$(CONFIG_SENSORS_ADM1026) += adm1026.o | 23 | obj-$(CONFIG_SENSORS_ADM1026) += adm1026.o |
diff --git a/drivers/hwmon/abituguru3.c b/drivers/hwmon/abituguru3.c index f00f497b9ca9..d568c65c1370 100644 --- a/drivers/hwmon/abituguru3.c +++ b/drivers/hwmon/abituguru3.c | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | /* | 1 | /* |
| 2 | abituguru3.c Copyright (c) 2006 Hans de Goede <j.w.r.degoede@hhs.nl> | 2 | abituguru3.c |
| 3 | |||
| 4 | Copyright (c) 2006-2008 Hans de Goede <j.w.r.degoede@hhs.nl> | ||
| 5 | Copyright (c) 2008 Alistair John Strachan <alistair@devzero.co.uk> | ||
| 3 | 6 | ||
| 4 | This program is free software; you can redistribute it and/or modify | 7 | This program is free software; you can redistribute it and/or modify |
| 5 | it under the terms of the GNU General Public License as published by | 8 | it under the terms of the GNU General Public License as published by |
| @@ -116,7 +119,7 @@ struct abituguru3_sensor_info { | |||
| 116 | 119 | ||
| 117 | struct abituguru3_motherboard_info { | 120 | struct abituguru3_motherboard_info { |
| 118 | u16 id; | 121 | u16 id; |
| 119 | const char *name; | 122 | const char *dmi_name; |
| 120 | /* + 1 -> end of sensors indicated by a sensor with name == NULL */ | 123 | /* + 1 -> end of sensors indicated by a sensor with name == NULL */ |
| 121 | struct abituguru3_sensor_info sensors[ABIT_UGURU3_MAX_NO_SENSORS + 1]; | 124 | struct abituguru3_sensor_info sensors[ABIT_UGURU3_MAX_NO_SENSORS + 1]; |
| 122 | }; | 125 | }; |
| @@ -161,7 +164,7 @@ struct abituguru3_data { | |||
| 161 | 164 | ||
| 162 | /* Constants */ | 165 | /* Constants */ |
| 163 | static const struct abituguru3_motherboard_info abituguru3_motherboards[] = { | 166 | static const struct abituguru3_motherboard_info abituguru3_motherboards[] = { |
| 164 | { 0x000C, "unknown", { | 167 | { 0x000C, NULL /* Unknown, need DMI string */, { |
| 165 | { "CPU Core", 0, 0, 10, 1, 0 }, | 168 | { "CPU Core", 0, 0, 10, 1, 0 }, |
| 166 | { "DDR", 1, 0, 10, 1, 0 }, | 169 | { "DDR", 1, 0, 10, 1, 0 }, |
| 167 | { "DDR VTT", 2, 0, 10, 1, 0 }, | 170 | { "DDR VTT", 2, 0, 10, 1, 0 }, |
| @@ -183,7 +186,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = { | |||
| 183 | { "AUX1 Fan", 35, 2, 60, 1, 0 }, | 186 | { "AUX1 Fan", 35, 2, 60, 1, 0 }, |
| 184 | { NULL, 0, 0, 0, 0, 0 } } | 187 | { NULL, 0, 0, 0, 0, 0 } } |
| 185 | }, | 188 | }, |
| 186 | { 0x000D, "Abit AW8", { | 189 | { 0x000D, NULL /* Abit AW8, need DMI string */, { |
| 187 | { "CPU Core", 0, 0, 10, 1, 0 }, | 190 | { "CPU Core", 0, 0, 10, 1, 0 }, |
| 188 | { "DDR", 1, 0, 10, 1, 0 }, | 191 | { "DDR", 1, 0, 10, 1, 0 }, |
| 189 | { "DDR VTT", 2, 0, 10, 1, 0 }, | 192 | { "DDR VTT", 2, 0, 10, 1, 0 }, |
| @@ -212,7 +215,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = { | |||
| 212 | { "AUX5 Fan", 39, 2, 60, 1, 0 }, | 215 | { "AUX5 Fan", 39, 2, 60, 1, 0 }, |
| 213 | { NULL, 0, 0, 0, 0, 0 } } | 216 | { NULL, 0, 0, 0, 0, 0 } } |
| 214 | }, | 217 | }, |
| 215 | { 0x000E, "AL-8", { | 218 | { 0x000E, NULL /* AL-8, need DMI string */, { |
| 216 | { "CPU Core", 0, 0, 10, 1, 0 }, | 219 | { "CPU Core", 0, 0, 10, 1, 0 }, |
| 217 | { "DDR", 1, 0, 10, 1, 0 }, | 220 | { "DDR", 1, 0, 10, 1, 0 }, |
| 218 | { "DDR VTT", 2, 0, 10, 1, 0 }, | 221 | { "DDR VTT", 2, 0, 10, 1, 0 }, |
| @@ -233,7 +236,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = { | |||
| 233 | { "SYS Fan", 34, 2, 60, 1, 0 }, | 236 | { "SYS Fan", 34, 2, 60, 1, 0 }, |
| 234 | { NULL, 0, 0, 0, 0, 0 } } | 237 | { NULL, 0, 0, 0, 0, 0 } } |
| 235 | }, | 238 | }, |
| 236 | { 0x000F, "unknown", { | 239 | { 0x000F, NULL /* Unknown, need DMI string */, { |
| 237 | { "CPU Core", 0, 0, 10, 1, 0 }, | 240 | { "CPU Core", 0, 0, 10, 1, 0 }, |
| 238 | { "DDR", 1, 0, 10, 1, 0 }, | 241 | { "DDR", 1, 0, 10, 1, 0 }, |
| 239 | { "DDR VTT", 2, 0, 10, 1, 0 }, | 242 | { "DDR VTT", 2, 0, 10, 1, 0 }, |
| @@ -254,7 +257,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = { | |||
| 254 | { "SYS Fan", 34, 2, 60, 1, 0 }, | 257 | { "SYS Fan", 34, 2, 60, 1, 0 }, |
| 255 | { NULL, 0, 0, 0, 0, 0 } } | 258 | { NULL, 0, 0, 0, 0, 0 } } |
| 256 | }, | 259 | }, |
| 257 | { 0x0010, "Abit NI8 SLI GR", { | 260 | { 0x0010, NULL /* Abit NI8 SLI GR, need DMI string */, { |
| 258 | { "CPU Core", 0, 0, 10, 1, 0 }, | 261 | { "CPU Core", 0, 0, 10, 1, 0 }, |
| 259 | { "DDR", 1, 0, 10, 1, 0 }, | 262 | { "DDR", 1, 0, 10, 1, 0 }, |
| 260 | { "DDR VTT", 2, 0, 10, 1, 0 }, | 263 | { "DDR VTT", 2, 0, 10, 1, 0 }, |
| @@ -276,7 +279,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = { | |||
| 276 | { "OTES1 Fan", 36, 2, 60, 1, 0 }, | 279 | { "OTES1 Fan", 36, 2, 60, 1, 0 }, |
| 277 | { NULL, 0, 0, 0, 0, 0 } } | 280 | { NULL, 0, 0, 0, 0, 0 } } |
| 278 | }, | 281 | }, |
| 279 | { 0x0011, "Abit AT8 32X", { | 282 | { 0x0011, NULL /* Abit AT8 32X, need DMI string */, { |
| 280 | { "CPU Core", 0, 0, 10, 1, 0 }, | 283 | { "CPU Core", 0, 0, 10, 1, 0 }, |
| 281 | { "DDR", 1, 0, 20, 1, 0 }, | 284 | { "DDR", 1, 0, 20, 1, 0 }, |
| 282 | { "DDR VTT", 2, 0, 10, 1, 0 }, | 285 | { "DDR VTT", 2, 0, 10, 1, 0 }, |
| @@ -302,7 +305,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = { | |||
| 302 | { "AUX2 Fan", 36, 2, 60, 1, 0 }, | 305 | { "AUX2 Fan", 36, 2, 60, 1, 0 }, |
| 303 | { NULL, 0, 0, 0, 0, 0 } } | 306 | { NULL, 0, 0, 0, 0, 0 } } |
| 304 | }, | 307 | }, |
| 305 | { 0x0012, "Abit AN8 32X", { | 308 | { 0x0012, NULL /* Abit AN8 32X, need DMI string */, { |
| 306 | { "CPU Core", 0, 0, 10, 1, 0 }, | 309 | { "CPU Core", 0, 0, 10, 1, 0 }, |
| 307 | { "DDR", 1, 0, 20, 1, 0 }, | 310 | { "DDR", 1, 0, 20, 1, 0 }, |
| 308 | { "DDR VTT", 2, 0, 10, 1, 0 }, | 311 | { "DDR VTT", 2, 0, 10, 1, 0 }, |
| @@ -324,7 +327,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = { | |||
| 324 | { "AUX1 Fan", 36, 2, 60, 1, 0 }, | 327 | { "AUX1 Fan", 36, 2, 60, 1, 0 }, |
| 325 | { NULL, 0, 0, 0, 0, 0 } } | 328 | { NULL, 0, 0, 0, 0, 0 } } |
| 326 | }, | 329 | }, |
| 327 | { 0x0013, "Abit AW8D", { | 330 | { 0x0013, NULL /* Abit AW8D, need DMI string */, { |
| 328 | { "CPU Core", 0, 0, 10, 1, 0 }, | 331 | { "CPU Core", 0, 0, 10, 1, 0 }, |
| 329 | { "DDR", 1, 0, 10, 1, 0 }, | 332 | { "DDR", 1, 0, 10, 1, 0 }, |
| 330 | { "DDR VTT", 2, 0, 10, 1, 0 }, | 333 | { "DDR VTT", 2, 0, 10, 1, 0 }, |
| @@ -353,7 +356,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = { | |||
| 353 | { "AUX5 Fan", 39, 2, 60, 1, 0 }, | 356 | { "AUX5 Fan", 39, 2, 60, 1, 0 }, |
| 354 | { NULL, 0, 0, 0, 0, 0 } } | 357 | { NULL, 0, 0, 0, 0, 0 } } |
| 355 | }, | 358 | }, |
| 356 | { 0x0014, "Abit AB9 Pro", { | 359 | { 0x0014, NULL /* Abit AB9 Pro, need DMI string */, { |
| 357 | { "CPU Core", 0, 0, 10, 1, 0 }, | 360 | { "CPU Core", 0, 0, 10, 1, 0 }, |
| 358 | { "DDR", 1, 0, 10, 1, 0 }, | 361 | { "DDR", 1, 0, 10, 1, 0 }, |
| 359 | { "DDR VTT", 2, 0, 10, 1, 0 }, | 362 | { "DDR VTT", 2, 0, 10, 1, 0 }, |
| @@ -374,7 +377,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = { | |||
| 374 | { "SYS Fan", 34, 2, 60, 1, 0 }, | 377 | { "SYS Fan", 34, 2, 60, 1, 0 }, |
| 375 | { NULL, 0, 0, 0, 0, 0 } } | 378 | { NULL, 0, 0, 0, 0, 0 } } |
| 376 | }, | 379 | }, |
| 377 | { 0x0015, "unknown", { | 380 | { 0x0015, NULL /* Unknown, need DMI string */, { |
| 378 | { "CPU Core", 0, 0, 10, 1, 0 }, | 381 | { "CPU Core", 0, 0, 10, 1, 0 }, |
| 379 | { "DDR", 1, 0, 20, 1, 0 }, | 382 | { "DDR", 1, 0, 20, 1, 0 }, |
| 380 | { "DDR VTT", 2, 0, 10, 1, 0 }, | 383 | { "DDR VTT", 2, 0, 10, 1, 0 }, |
| @@ -398,7 +401,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = { | |||
| 398 | { "AUX3 Fan", 36, 2, 60, 1, 0 }, | 401 | { "AUX3 Fan", 36, 2, 60, 1, 0 }, |
| 399 | { NULL, 0, 0, 0, 0, 0 } } | 402 | { NULL, 0, 0, 0, 0, 0 } } |
| 400 | }, | 403 | }, |
| 401 | { 0x0016, "AW9D-MAX", { | 404 | { 0x0016, NULL /* AW9D-MAX, need DMI string */, { |
| 402 | { "CPU Core", 0, 0, 10, 1, 0 }, | 405 | { "CPU Core", 0, 0, 10, 1, 0 }, |
| 403 | { "DDR2", 1, 0, 20, 1, 0 }, | 406 | { "DDR2", 1, 0, 20, 1, 0 }, |
| 404 | { "DDR2 VTT", 2, 0, 10, 1, 0 }, | 407 | { "DDR2 VTT", 2, 0, 10, 1, 0 }, |
| @@ -426,7 +429,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = { | |||
| 426 | { "OTES1 Fan", 38, 2, 60, 1, 0 }, | 429 | { "OTES1 Fan", 38, 2, 60, 1, 0 }, |
| 427 | { NULL, 0, 0, 0, 0, 0 } } | 430 | { NULL, 0, 0, 0, 0, 0 } } |
| 428 | }, | 431 | }, |
| 429 | { 0x0017, "unknown", { | 432 | { 0x0017, NULL /* Unknown, need DMI string */, { |
| 430 | { "CPU Core", 0, 0, 10, 1, 0 }, | 433 | { "CPU Core", 0, 0, 10, 1, 0 }, |
| 431 | { "DDR2", 1, 0, 20, 1, 0 }, | 434 | { "DDR2", 1, 0, 20, 1, 0 }, |
| 432 | { "DDR2 VTT", 2, 0, 10, 1, 0 }, | 435 | { "DDR2 VTT", 2, 0, 10, 1, 0 }, |
| @@ -451,7 +454,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = { | |||
| 451 | { "AUX3 FAN", 37, 2, 60, 1, 0 }, | 454 | { "AUX3 FAN", 37, 2, 60, 1, 0 }, |
| 452 | { NULL, 0, 0, 0, 0, 0 } } | 455 | { NULL, 0, 0, 0, 0, 0 } } |
| 453 | }, | 456 | }, |
| 454 | { 0x0018, "unknown", { | 457 | { 0x0018, NULL /* Unknown, need DMI string */, { |
| 455 | { "CPU Core", 0, 0, 10, 1, 0 }, | 458 | { "CPU Core", 0, 0, 10, 1, 0 }, |
| 456 | { "DDR2", 1, 0, 20, 1, 0 }, | 459 | { "DDR2", 1, 0, 20, 1, 0 }, |
| 457 | { "DDR2 VTT", 2, 0, 10, 1, 0 }, | 460 | { "DDR2 VTT", 2, 0, 10, 1, 0 }, |
| @@ -478,7 +481,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = { | |||
| 478 | { "AUX3 Fan", 36, 2, 60, 1, 0 }, | 481 | { "AUX3 Fan", 36, 2, 60, 1, 0 }, |
| 479 | { NULL, 0, 0, 0, 0, 0 } } | 482 | { NULL, 0, 0, 0, 0, 0 } } |
| 480 | }, | 483 | }, |
| 481 | { 0x0019, "unknown", { | 484 | { 0x0019, NULL /* Unknown, need DMI string */, { |
| 482 | { "CPU Core", 7, 0, 10, 1, 0 }, | 485 | { "CPU Core", 7, 0, 10, 1, 0 }, |
| 483 | { "DDR2", 13, 0, 20, 1, 0 }, | 486 | { "DDR2", 13, 0, 20, 1, 0 }, |
| 484 | { "DDR2 VTT", 14, 0, 10, 1, 0 }, | 487 | { "DDR2 VTT", 14, 0, 10, 1, 0 }, |
| @@ -505,7 +508,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = { | |||
| 505 | { "AUX3 FAN", 36, 2, 60, 1, 0 }, | 508 | { "AUX3 FAN", 36, 2, 60, 1, 0 }, |
| 506 | { NULL, 0, 0, 0, 0, 0 } } | 509 | { NULL, 0, 0, 0, 0, 0 } } |
| 507 | }, | 510 | }, |
| 508 | { 0x001A, "Abit IP35 Pro", { | 511 | { 0x001A, "IP35 Pro(Intel P35-ICH9R)", { |
| 509 | { "CPU Core", 0, 0, 10, 1, 0 }, | 512 | { "CPU Core", 0, 0, 10, 1, 0 }, |
| 510 | { "DDR2", 1, 0, 20, 1, 0 }, | 513 | { "DDR2", 1, 0, 20, 1, 0 }, |
| 511 | { "DDR2 VTT", 2, 0, 10, 1, 0 }, | 514 | { "DDR2 VTT", 2, 0, 10, 1, 0 }, |
| @@ -533,7 +536,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = { | |||
| 533 | { "AUX4 Fan", 37, 2, 60, 1, 0 }, | 536 | { "AUX4 Fan", 37, 2, 60, 1, 0 }, |
| 534 | { NULL, 0, 0, 0, 0, 0 } } | 537 | { NULL, 0, 0, 0, 0, 0 } } |
| 535 | }, | 538 | }, |
| 536 | { 0x001B, "unknown", { | 539 | { 0x001B, NULL /* Unknown, need DMI string */, { |
| 537 | { "CPU Core", 0, 0, 10, 1, 0 }, | 540 | { "CPU Core", 0, 0, 10, 1, 0 }, |
| 538 | { "DDR3", 1, 0, 20, 1, 0 }, | 541 | { "DDR3", 1, 0, 20, 1, 0 }, |
| 539 | { "DDR3 VTT", 2, 0, 10, 1, 0 }, | 542 | { "DDR3 VTT", 2, 0, 10, 1, 0 }, |
| @@ -560,7 +563,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = { | |||
| 560 | { "AUX3 Fan", 36, 2, 60, 1, 0 }, | 563 | { "AUX3 Fan", 36, 2, 60, 1, 0 }, |
| 561 | { NULL, 0, 0, 0, 0, 0 } } | 564 | { NULL, 0, 0, 0, 0, 0 } } |
| 562 | }, | 565 | }, |
| 563 | { 0x001C, "unknown", { | 566 | { 0x001C, NULL /* Unknown, need DMI string */, { |
| 564 | { "CPU Core", 0, 0, 10, 1, 0 }, | 567 | { "CPU Core", 0, 0, 10, 1, 0 }, |
| 565 | { "DDR2", 1, 0, 20, 1, 0 }, | 568 | { "DDR2", 1, 0, 20, 1, 0 }, |
| 566 | { "DDR2 VTT", 2, 0, 10, 1, 0 }, | 569 | { "DDR2 VTT", 2, 0, 10, 1, 0 }, |
| @@ -935,9 +938,18 @@ static int __devinit abituguru3_probe(struct platform_device *pdev) | |||
| 935 | goto abituguru3_probe_error; | 938 | goto abituguru3_probe_error; |
| 936 | } | 939 | } |
| 937 | data->sensors = abituguru3_motherboards[i].sensors; | 940 | data->sensors = abituguru3_motherboards[i].sensors; |
| 941 | |||
| 938 | printk(KERN_INFO ABIT_UGURU3_NAME ": found Abit uGuru3, motherboard " | 942 | printk(KERN_INFO ABIT_UGURU3_NAME ": found Abit uGuru3, motherboard " |
| 939 | "ID: %04X (%s)\n", (unsigned int)id, | 943 | "ID: %04X\n", (unsigned int)id); |
| 940 | abituguru3_motherboards[i].name); | 944 | |
| 945 | #ifdef CONFIG_DMI | ||
| 946 | if (!abituguru3_motherboards[i].dmi_name) { | ||
| 947 | printk(KERN_WARNING ABIT_UGURU3_NAME ": this motherboard was " | ||
| 948 | "not detected using DMI. Please send the output of " | ||
| 949 | "\"dmidecode\" to the abituguru3 maintainer" | ||
| 950 | "(see MAINTAINERS)\n"); | ||
| 951 | } | ||
| 952 | #endif | ||
| 941 | 953 | ||
| 942 | /* Fill the sysfs attr array */ | 954 | /* Fill the sysfs attr array */ |
| 943 | sysfs_attr_i = 0; | 955 | sysfs_attr_i = 0; |
| @@ -1109,6 +1121,46 @@ static struct platform_driver abituguru3_driver = { | |||
| 1109 | .resume = abituguru3_resume | 1121 | .resume = abituguru3_resume |
| 1110 | }; | 1122 | }; |
| 1111 | 1123 | ||
| 1124 | #ifdef CONFIG_DMI | ||
| 1125 | |||
| 1126 | static int __init abituguru3_dmi_detect(void) | ||
| 1127 | { | ||
| 1128 | const char *board_vendor, *board_name; | ||
| 1129 | int i, err = (force) ? 1 : -ENODEV; | ||
| 1130 | |||
| 1131 | board_vendor = dmi_get_system_info(DMI_BOARD_VENDOR); | ||
| 1132 | if (!board_vendor || strcmp(board_vendor, "http://www.abit.com.tw/")) | ||
| 1133 | return err; | ||
| 1134 | |||
| 1135 | board_name = dmi_get_system_info(DMI_BOARD_NAME); | ||
| 1136 | if (!board_name) | ||
| 1137 | return err; | ||
| 1138 | |||
| 1139 | for (i = 0; abituguru3_motherboards[i].id; i++) { | ||
| 1140 | const char *dmi_name = abituguru3_motherboards[i].dmi_name; | ||
| 1141 | if (dmi_name && !strcmp(dmi_name, board_name)) | ||
| 1142 | break; | ||
| 1143 | } | ||
| 1144 | |||
| 1145 | if (!abituguru3_motherboards[i].id) | ||
| 1146 | return 1; | ||
| 1147 | |||
| 1148 | return 0; | ||
| 1149 | } | ||
| 1150 | |||
| 1151 | #else /* !CONFIG_DMI */ | ||
| 1152 | |||
| 1153 | static inline int abituguru3_dmi_detect(void) | ||
| 1154 | { | ||
| 1155 | return -ENODEV; | ||
| 1156 | } | ||
| 1157 | |||
| 1158 | #endif /* CONFIG_DMI */ | ||
| 1159 | |||
| 1160 | /* FIXME: Manual detection should die eventually; we need to collect stable | ||
| 1161 | * DMI model names first before we can rely entirely on CONFIG_DMI. | ||
| 1162 | */ | ||
| 1163 | |||
| 1112 | static int __init abituguru3_detect(void) | 1164 | static int __init abituguru3_detect(void) |
| 1113 | { | 1165 | { |
| 1114 | /* See if there is an uguru3 there. An idle uGuru3 will hold 0x00 or | 1166 | /* See if there is an uguru3 there. An idle uGuru3 will hold 0x00 or |
| @@ -1119,7 +1171,7 @@ static int __init abituguru3_detect(void) | |||
| 1119 | if (((data_val == 0x00) || (data_val == 0x08)) && | 1171 | if (((data_val == 0x00) || (data_val == 0x08)) && |
| 1120 | ((cmd_val == 0xAC) || (cmd_val == 0x05) || | 1172 | ((cmd_val == 0xAC) || (cmd_val == 0x05) || |
| 1121 | (cmd_val == 0x55))) | 1173 | (cmd_val == 0x55))) |
| 1122 | return ABIT_UGURU3_BASE; | 1174 | return 0; |
| 1123 | 1175 | ||
| 1124 | ABIT_UGURU3_DEBUG("no Abit uGuru3 found, data = 0x%02X, cmd = " | 1176 | ABIT_UGURU3_DEBUG("no Abit uGuru3 found, data = 0x%02X, cmd = " |
| 1125 | "0x%02X\n", (unsigned int)data_val, (unsigned int)cmd_val); | 1177 | "0x%02X\n", (unsigned int)data_val, (unsigned int)cmd_val); |
| @@ -1127,7 +1179,7 @@ static int __init abituguru3_detect(void) | |||
| 1127 | if (force) { | 1179 | if (force) { |
| 1128 | printk(KERN_INFO ABIT_UGURU3_NAME ": Assuming Abit uGuru3 is " | 1180 | printk(KERN_INFO ABIT_UGURU3_NAME ": Assuming Abit uGuru3 is " |
| 1129 | "present because of \"force\" parameter\n"); | 1181 | "present because of \"force\" parameter\n"); |
| 1130 | return ABIT_UGURU3_BASE; | 1182 | return 0; |
| 1131 | } | 1183 | } |
| 1132 | 1184 | ||
| 1133 | /* No uGuru3 found */ | 1185 | /* No uGuru3 found */ |
| @@ -1138,27 +1190,29 @@ static struct platform_device *abituguru3_pdev; | |||
| 1138 | 1190 | ||
| 1139 | static int __init abituguru3_init(void) | 1191 | static int __init abituguru3_init(void) |
| 1140 | { | 1192 | { |
| 1141 | int address, err; | ||
| 1142 | struct resource res = { .flags = IORESOURCE_IO }; | 1193 | struct resource res = { .flags = IORESOURCE_IO }; |
| 1143 | 1194 | int err; | |
| 1144 | #ifdef CONFIG_DMI | 1195 | |
| 1145 | const char *board_vendor = dmi_get_system_info(DMI_BOARD_VENDOR); | 1196 | /* Attempt DMI detection first */ |
| 1146 | 1197 | err = abituguru3_dmi_detect(); | |
| 1147 | /* safety check, refuse to load on non Abit motherboards */ | 1198 | if (err < 0) |
| 1148 | if (!force && (!board_vendor || | 1199 | return err; |
| 1149 | strcmp(board_vendor, "http://www.abit.com.tw/"))) | 1200 | |
| 1150 | return -ENODEV; | 1201 | /* Fall back to manual detection if there was no exact |
| 1151 | #endif | 1202 | * board name match, or force was specified. |
| 1152 | 1203 | */ | |
| 1153 | address = abituguru3_detect(); | 1204 | if (err > 0) { |
| 1154 | if (address < 0) | 1205 | err = abituguru3_detect(); |
| 1155 | return address; | 1206 | if (err) |
| 1207 | return err; | ||
| 1208 | } | ||
| 1156 | 1209 | ||
| 1157 | err = platform_driver_register(&abituguru3_driver); | 1210 | err = platform_driver_register(&abituguru3_driver); |
| 1158 | if (err) | 1211 | if (err) |
| 1159 | goto exit; | 1212 | goto exit; |
| 1160 | 1213 | ||
| 1161 | abituguru3_pdev = platform_device_alloc(ABIT_UGURU3_NAME, address); | 1214 | abituguru3_pdev = platform_device_alloc(ABIT_UGURU3_NAME, |
| 1215 | ABIT_UGURU3_BASE); | ||
| 1162 | if (!abituguru3_pdev) { | 1216 | if (!abituguru3_pdev) { |
| 1163 | printk(KERN_ERR ABIT_UGURU3_NAME | 1217 | printk(KERN_ERR ABIT_UGURU3_NAME |
| 1164 | ": Device allocation failed\n"); | 1218 | ": Device allocation failed\n"); |
| @@ -1166,8 +1220,8 @@ static int __init abituguru3_init(void) | |||
| 1166 | goto exit_driver_unregister; | 1220 | goto exit_driver_unregister; |
| 1167 | } | 1221 | } |
| 1168 | 1222 | ||
| 1169 | res.start = address; | 1223 | res.start = ABIT_UGURU3_BASE; |
| 1170 | res.end = address + ABIT_UGURU3_REGION_LENGTH - 1; | 1224 | res.end = ABIT_UGURU3_BASE + ABIT_UGURU3_REGION_LENGTH - 1; |
| 1171 | res.name = ABIT_UGURU3_NAME; | 1225 | res.name = ABIT_UGURU3_NAME; |
| 1172 | 1226 | ||
| 1173 | err = platform_device_add_resources(abituguru3_pdev, &res, 1); | 1227 | err = platform_device_add_resources(abituguru3_pdev, &res, 1); |
diff --git a/drivers/hwmon/adcxx.c b/drivers/hwmon/adcxx.c new file mode 100644 index 000000000000..242294db3db6 --- /dev/null +++ b/drivers/hwmon/adcxx.c | |||
| @@ -0,0 +1,329 @@ | |||
| 1 | /* | ||
| 2 | * adcxx.c | ||
| 3 | * | ||
| 4 | * The adcxx4s is an AD converter family from National Semiconductor (NS). | ||
| 5 | * | ||
| 6 | * Copyright (c) 2008 Marc Pignat <marc.pignat@hevs.ch> | ||
| 7 | * | ||
| 8 | * The adcxx4s communicates with a host processor via an SPI/Microwire Bus | ||
| 9 | * interface. This driver supports the whole family of devices with name | ||
| 10 | * ADC<bb><c>S<sss>, where | ||
| 11 | * * bb is the resolution in number of bits (8, 10, 12) | ||
| 12 | * * c is the number of channels (1, 2, 4, 8) | ||
| 13 | * * sss is the maximum conversion speed (021 for 200 kSPS, 051 for 500 kSPS | ||
| 14 | * and 101 for 1 MSPS) | ||
| 15 | * | ||
| 16 | * Complete datasheets are available at National's website here: | ||
| 17 | * http://www.national.com/ds/DC/ADC<bb><c>S<sss>.pdf | ||
| 18 | * | ||
| 19 | * Handling of 8, 10 and 12 bits converters are the same, the | ||
| 20 | * unavailable bits are 0 :) | ||
| 21 | * | ||
| 22 | * This program is free software; you can redistribute it and/or modify | ||
| 23 | * it under the terms of the GNU General Public License as published by | ||
| 24 | * the Free Software Foundation; either version 2 of the License, or | ||
| 25 | * (at your option) any later version. | ||
| 26 | * | ||
| 27 | * This program is distributed in the hope that it will be useful, | ||
| 28 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 29 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 30 | * GNU General Public License for more details. | ||
| 31 | * | ||
| 32 | * You should have received a copy of the GNU General Public License | ||
| 33 | * along with this program; if not, write to the Free Software | ||
| 34 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | ||
| 35 | */ | ||
| 36 | |||
| 37 | #include <linux/init.h> | ||
| 38 | #include <linux/module.h> | ||
| 39 | #include <linux/kernel.h> | ||
| 40 | #include <linux/device.h> | ||
| 41 | #include <linux/err.h> | ||
| 42 | #include <linux/sysfs.h> | ||
| 43 | #include <linux/hwmon.h> | ||
| 44 | #include <linux/hwmon-sysfs.h> | ||
| 45 | #include <linux/mutex.h> | ||
| 46 | #include <linux/spi/spi.h> | ||
| 47 | |||
| 48 | #define DRVNAME "adcxx" | ||
| 49 | |||
| 50 | struct adcxx { | ||
| 51 | struct device *hwmon_dev; | ||
| 52 | struct mutex lock; | ||
| 53 | u32 channels; | ||
| 54 | u32 reference; /* in millivolts */ | ||
| 55 | }; | ||
| 56 | |||
| 57 | /* sysfs hook function */ | ||
| 58 | static ssize_t adcxx_read(struct device *dev, | ||
| 59 | struct device_attribute *devattr, char *buf) | ||
| 60 | { | ||
| 61 | struct spi_device *spi = to_spi_device(dev); | ||
| 62 | struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); | ||
| 63 | struct adcxx *adc = dev_get_drvdata(&spi->dev); | ||
| 64 | u8 tx_buf[2] = { attr->index << 3 }; /* other bits are don't care */ | ||
| 65 | u8 rx_buf[2]; | ||
| 66 | int status; | ||
| 67 | int value; | ||
| 68 | |||
| 69 | if (mutex_lock_interruptible(&adc->lock)) | ||
| 70 | return -ERESTARTSYS; | ||
| 71 | |||
| 72 | status = spi_write_then_read(spi, tx_buf, sizeof(tx_buf), | ||
| 73 | rx_buf, sizeof(rx_buf)); | ||
| 74 | if (status < 0) { | ||
| 75 | dev_warn(dev, "spi_write_then_read failed with status %d\n", | ||
| 76 | status); | ||
| 77 | goto out; | ||
| 78 | } | ||
| 79 | |||
| 80 | value = (rx_buf[0] << 8) + rx_buf[1]; | ||
| 81 | dev_dbg(dev, "raw value = 0x%x\n", value); | ||
| 82 | |||
| 83 | value = value * adc->reference >> 12; | ||
| 84 | status = sprintf(buf, "%d\n", value); | ||
| 85 | out: | ||
| 86 | mutex_unlock(&adc->lock); | ||
| 87 | return status; | ||
| 88 | } | ||
| 89 | |||
| 90 | static ssize_t adcxx_show_min(struct device *dev, | ||
| 91 | struct device_attribute *devattr, char *buf) | ||
| 92 | { | ||
| 93 | /* The minimum reference is 0 for this chip family */ | ||
| 94 | return sprintf(buf, "0\n"); | ||
| 95 | } | ||
| 96 | |||
| 97 | static ssize_t adcxx_show_max(struct device *dev, | ||
| 98 | struct device_attribute *devattr, char *buf) | ||
| 99 | { | ||
| 100 | struct spi_device *spi = to_spi_device(dev); | ||
| 101 | struct adcxx *adc = dev_get_drvdata(&spi->dev); | ||
| 102 | u32 reference; | ||
| 103 | |||
| 104 | if (mutex_lock_interruptible(&adc->lock)) | ||
| 105 | return -ERESTARTSYS; | ||
| 106 | |||
| 107 | reference = adc->reference; | ||
| 108 | |||
| 109 | mutex_unlock(&adc->lock); | ||
| 110 | |||
| 111 | return sprintf(buf, "%d\n", reference); | ||
| 112 | } | ||
| 113 | |||
| 114 | static ssize_t adcxx_set_max(struct device *dev, | ||
| 115 | struct device_attribute *devattr, const char *buf, size_t count) | ||
| 116 | { | ||
| 117 | struct spi_device *spi = to_spi_device(dev); | ||
| 118 | struct adcxx *adc = dev_get_drvdata(&spi->dev); | ||
| 119 | unsigned long value; | ||
| 120 | |||
| 121 | if (strict_strtoul(buf, 10, &value)) | ||
| 122 | return -EINVAL; | ||
| 123 | |||
| 124 | if (mutex_lock_interruptible(&adc->lock)) | ||
| 125 | return -ERESTARTSYS; | ||
| 126 | |||
| 127 | adc->reference = value; | ||
| 128 | |||
| 129 | mutex_unlock(&adc->lock); | ||
| 130 | |||
| 131 | return count; | ||
| 132 | } | ||
| 133 | |||
| 134 | static ssize_t adcxx_show_name(struct device *dev, struct device_attribute | ||
| 135 | *devattr, char *buf) | ||
| 136 | { | ||
| 137 | struct spi_device *spi = to_spi_device(dev); | ||
| 138 | struct adcxx *adc = dev_get_drvdata(&spi->dev); | ||
| 139 | |||
| 140 | return sprintf(buf, "adcxx%ds\n", adc->channels); | ||
| 141 | } | ||
| 142 | |||
| 143 | static struct sensor_device_attribute ad_input[] = { | ||
| 144 | SENSOR_ATTR(name, S_IRUGO, adcxx_show_name, NULL, 0), | ||
| 145 | SENSOR_ATTR(in_min, S_IRUGO, adcxx_show_min, NULL, 0), | ||
| 146 | SENSOR_ATTR(in_max, S_IWUSR | S_IRUGO, adcxx_show_max, | ||
| 147 | adcxx_set_max, 0), | ||
| 148 | SENSOR_ATTR(in0_input, S_IRUGO, adcxx_read, NULL, 0), | ||
| 149 | SENSOR_ATTR(in1_input, S_IRUGO, adcxx_read, NULL, 1), | ||
| 150 | SENSOR_ATTR(in2_input, S_IRUGO, adcxx_read, NULL, 2), | ||
| 151 | SENSOR_ATTR(in3_input, S_IRUGO, adcxx_read, NULL, 3), | ||
| 152 | SENSOR_ATTR(in4_input, S_IRUGO, adcxx_read, NULL, 4), | ||
| 153 | SENSOR_ATTR(in5_input, S_IRUGO, adcxx_read, NULL, 5), | ||
| 154 | SENSOR_ATTR(in6_input, S_IRUGO, adcxx_read, NULL, 6), | ||
| 155 | SENSOR_ATTR(in7_input, S_IRUGO, adcxx_read, NULL, 7), | ||
| 156 | }; | ||
| 157 | |||
| 158 | /*----------------------------------------------------------------------*/ | ||
| 159 | |||
| 160 | static int __devinit adcxx_probe(struct spi_device *spi, int channels) | ||
| 161 | { | ||
| 162 | struct adcxx *adc; | ||
| 163 | int status; | ||
| 164 | int i; | ||
| 165 | |||
| 166 | adc = kzalloc(sizeof *adc, GFP_KERNEL); | ||
| 167 | if (!adc) | ||
| 168 | return -ENOMEM; | ||
| 169 | |||
| 170 | /* set a default value for the reference */ | ||
| 171 | adc->reference = 3300; | ||
| 172 | adc->channels = channels; | ||
| 173 | mutex_init(&adc->lock); | ||
| 174 | |||
| 175 | mutex_lock(&adc->lock); | ||
| 176 | |||
| 177 | dev_set_drvdata(&spi->dev, adc); | ||
| 178 | |||
| 179 | for (i = 0; i < 3 + adc->channels; i++) { | ||
| 180 | status = device_create_file(&spi->dev, &ad_input[i].dev_attr); | ||
| 181 | if (status) { | ||
| 182 | dev_err(&spi->dev, "device_create_file failed.\n"); | ||
| 183 | goto out_err; | ||
| 184 | } | ||
| 185 | } | ||
| 186 | |||
| 187 | adc->hwmon_dev = hwmon_device_register(&spi->dev); | ||
| 188 | if (IS_ERR(adc->hwmon_dev)) { | ||
| 189 | dev_err(&spi->dev, "hwmon_device_register failed.\n"); | ||
| 190 | status = PTR_ERR(adc->hwmon_dev); | ||
| 191 | goto out_err; | ||
| 192 | } | ||
| 193 | |||
| 194 | mutex_unlock(&adc->lock); | ||
| 195 | return 0; | ||
| 196 | |||
| 197 | out_err: | ||
| 198 | for (i--; i >= 0; i--) | ||
| 199 | device_remove_file(&spi->dev, &ad_input[i].dev_attr); | ||
| 200 | |||
| 201 | dev_set_drvdata(&spi->dev, NULL); | ||
| 202 | mutex_unlock(&adc->lock); | ||
| 203 | kfree(adc); | ||
| 204 | return status; | ||
| 205 | } | ||
| 206 | |||
| 207 | static int __devinit adcxx1s_probe(struct spi_device *spi) | ||
| 208 | { | ||
| 209 | return adcxx_probe(spi, 1); | ||
| 210 | } | ||
| 211 | |||
| 212 | static int __devinit adcxx2s_probe(struct spi_device *spi) | ||
| 213 | { | ||
| 214 | return adcxx_probe(spi, 2); | ||
| 215 | } | ||
| 216 | |||
| 217 | static int __devinit adcxx4s_probe(struct spi_device *spi) | ||
| 218 | { | ||
| 219 | return adcxx_probe(spi, 4); | ||
| 220 | } | ||
| 221 | |||
| 222 | static int __devinit adcxx8s_probe(struct spi_device *spi) | ||
| 223 | { | ||
| 224 | return adcxx_probe(spi, 8); | ||
| 225 | } | ||
| 226 | |||
| 227 | static int __devexit adcxx_remove(struct spi_device *spi) | ||
| 228 | { | ||
| 229 | struct adcxx *adc = dev_get_drvdata(&spi->dev); | ||
| 230 | int i; | ||
| 231 | |||
| 232 | mutex_lock(&adc->lock); | ||
| 233 | hwmon_device_unregister(adc->hwmon_dev); | ||
| 234 | for (i = 0; i < 3 + adc->channels; i++) | ||
| 235 | device_remove_file(&spi->dev, &ad_input[i].dev_attr); | ||
| 236 | |||
| 237 | dev_set_drvdata(&spi->dev, NULL); | ||
| 238 | mutex_unlock(&adc->lock); | ||
| 239 | kfree(adc); | ||
| 240 | |||
| 241 | return 0; | ||
| 242 | } | ||
| 243 | |||
| 244 | static struct spi_driver adcxx1s_driver = { | ||
| 245 | .driver = { | ||
| 246 | .name = "adcxx1s", | ||
| 247 | .owner = THIS_MODULE, | ||
| 248 | }, | ||
| 249 | .probe = adcxx1s_probe, | ||
| 250 | .remove = __devexit_p(adcxx_remove), | ||
| 251 | }; | ||
| 252 | |||
| 253 | static struct spi_driver adcxx2s_driver = { | ||
| 254 | .driver = { | ||
| 255 | .name = "adcxx2s", | ||
| 256 | .owner = THIS_MODULE, | ||
| 257 | }, | ||
| 258 | .probe = adcxx2s_probe, | ||
| 259 | .remove = __devexit_p(adcxx_remove), | ||
| 260 | }; | ||
| 261 | |||
| 262 | static struct spi_driver adcxx4s_driver = { | ||
| 263 | .driver = { | ||
| 264 | .name = "adcxx4s", | ||
| 265 | .owner = THIS_MODULE, | ||
| 266 | }, | ||
| 267 | .probe = adcxx4s_probe, | ||
| 268 | .remove = __devexit_p(adcxx_remove), | ||
| 269 | }; | ||
| 270 | |||
| 271 | static struct spi_driver adcxx8s_driver = { | ||
| 272 | .driver = { | ||
| 273 | .name = "adcxx8s", | ||
| 274 | .owner = THIS_MODULE, | ||
| 275 | }, | ||
| 276 | .probe = adcxx8s_probe, | ||
| 277 | .remove = __devexit_p(adcxx_remove), | ||
| 278 | }; | ||
| 279 | |||
| 280 | static int __init init_adcxx(void) | ||
| 281 | { | ||
| 282 | int status; | ||
| 283 | status = spi_register_driver(&adcxx1s_driver); | ||
| 284 | if (status) | ||
| 285 | goto reg_1_failed; | ||
| 286 | |||
| 287 | status = spi_register_driver(&adcxx2s_driver); | ||
| 288 | if (status) | ||
| 289 | goto reg_2_failed; | ||
| 290 | |||
| 291 | status = spi_register_driver(&adcxx4s_driver); | ||
| 292 | if (status) | ||
| 293 | goto reg_4_failed; | ||
| 294 | |||
| 295 | status = spi_register_driver(&adcxx8s_driver); | ||
| 296 | if (status) | ||
| 297 | goto reg_8_failed; | ||
| 298 | |||
| 299 | return status; | ||
| 300 | |||
| 301 | reg_8_failed: | ||
| 302 | spi_unregister_driver(&adcxx4s_driver); | ||
| 303 | reg_4_failed: | ||
| 304 | spi_unregister_driver(&adcxx2s_driver); | ||
| 305 | reg_2_failed: | ||
| 306 | spi_unregister_driver(&adcxx1s_driver); | ||
| 307 | reg_1_failed: | ||
| 308 | return status; | ||
| 309 | } | ||
| 310 | |||
| 311 | static void __exit exit_adcxx(void) | ||
| 312 | { | ||
| 313 | spi_unregister_driver(&adcxx1s_driver); | ||
| 314 | spi_unregister_driver(&adcxx2s_driver); | ||
| 315 | spi_unregister_driver(&adcxx4s_driver); | ||
| 316 | spi_unregister_driver(&adcxx8s_driver); | ||
| 317 | } | ||
| 318 | |||
| 319 | module_init(init_adcxx); | ||
| 320 | module_exit(exit_adcxx); | ||
| 321 | |||
| 322 | MODULE_AUTHOR("Marc Pignat"); | ||
| 323 | MODULE_DESCRIPTION("National Semiconductor adcxx8sxxx Linux driver"); | ||
| 324 | MODULE_LICENSE("GPL"); | ||
| 325 | |||
| 326 | MODULE_ALIAS("adcxx1s"); | ||
| 327 | MODULE_ALIAS("adcxx2s"); | ||
| 328 | MODULE_ALIAS("adcxx4s"); | ||
| 329 | MODULE_ALIAS("adcxx8s"); | ||
diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c index aacc0c4b809c..b06b8e090a27 100644 --- a/drivers/hwmon/applesmc.c +++ b/drivers/hwmon/applesmc.c | |||
| @@ -98,6 +98,12 @@ static const char* temperature_sensors_sets[][36] = { | |||
| 98 | "TH1P", "TH2P", "TH3P", "TMAP", "TMAS", "TMBS", "TM0P", "TM0S", | 98 | "TH1P", "TH2P", "TH3P", "TMAP", "TMAS", "TMBS", "TM0P", "TM0S", |
| 99 | "TM1P", "TM1S", "TM2P", "TM2S", "TM3S", "TM8P", "TM8S", "TM9P", | 99 | "TM1P", "TM1S", "TM2P", "TM2S", "TM3S", "TM8P", "TM8S", "TM9P", |
| 100 | "TM9S", "TN0H", "TS0C", NULL }, | 100 | "TM9S", "TN0H", "TS0C", NULL }, |
| 101 | /* Set 5: iMac */ | ||
| 102 | { "TC0D", "TA0P", "TG0P", "TG0D", "TG0H", "TH0P", "Tm0P", "TO0P", | ||
| 103 | "Tp0C", NULL }, | ||
| 104 | /* Set 6: Macbook3 set */ | ||
| 105 | { "TB0T", "TC0D", "TC0P", "TM0P", "TN0P", "TTF0", "TW0P", "Th0H", | ||
| 106 | "Th0S", "Th1H", NULL }, | ||
| 101 | }; | 107 | }; |
| 102 | 108 | ||
| 103 | /* List of keys used to read/write fan speeds */ | 109 | /* List of keys used to read/write fan speeds */ |
| @@ -1223,6 +1229,10 @@ static __initdata struct dmi_match_data applesmc_dmi_data[] = { | |||
| 1223 | { .accelerometer = 0, .light = 0, .temperature_set = 3 }, | 1229 | { .accelerometer = 0, .light = 0, .temperature_set = 3 }, |
| 1224 | /* MacPro: temperature set 4 */ | 1230 | /* MacPro: temperature set 4 */ |
| 1225 | { .accelerometer = 0, .light = 0, .temperature_set = 4 }, | 1231 | { .accelerometer = 0, .light = 0, .temperature_set = 4 }, |
| 1232 | /* iMac: temperature set 5 */ | ||
| 1233 | { .accelerometer = 0, .light = 0, .temperature_set = 5 }, | ||
| 1234 | /* MacBook3: accelerometer and temperature set 6 */ | ||
| 1235 | { .accelerometer = 1, .light = 0, .temperature_set = 6 }, | ||
| 1226 | }; | 1236 | }; |
| 1227 | 1237 | ||
| 1228 | /* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1". | 1238 | /* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1". |
| @@ -1232,10 +1242,14 @@ static __initdata struct dmi_system_id applesmc_whitelist[] = { | |||
| 1232 | DMI_MATCH(DMI_BOARD_VENDOR,"Apple"), | 1242 | DMI_MATCH(DMI_BOARD_VENDOR,"Apple"), |
| 1233 | DMI_MATCH(DMI_PRODUCT_NAME,"MacBookPro") }, | 1243 | DMI_MATCH(DMI_PRODUCT_NAME,"MacBookPro") }, |
| 1234 | (void*)&applesmc_dmi_data[0]}, | 1244 | (void*)&applesmc_dmi_data[0]}, |
| 1235 | { applesmc_dmi_match, "Apple MacBook", { | 1245 | { applesmc_dmi_match, "Apple MacBook (v2)", { |
| 1236 | DMI_MATCH(DMI_BOARD_VENDOR,"Apple"), | 1246 | DMI_MATCH(DMI_BOARD_VENDOR,"Apple"), |
| 1237 | DMI_MATCH(DMI_PRODUCT_NAME,"MacBook2") }, | 1247 | DMI_MATCH(DMI_PRODUCT_NAME,"MacBook2") }, |
| 1238 | (void*)&applesmc_dmi_data[1]}, | 1248 | (void*)&applesmc_dmi_data[1]}, |
| 1249 | { applesmc_dmi_match, "Apple MacBook (v3)", { | ||
| 1250 | DMI_MATCH(DMI_BOARD_VENDOR,"Apple"), | ||
| 1251 | DMI_MATCH(DMI_PRODUCT_NAME,"MacBook3") }, | ||
| 1252 | (void*)&applesmc_dmi_data[6]}, | ||
| 1239 | { applesmc_dmi_match, "Apple MacBook", { | 1253 | { applesmc_dmi_match, "Apple MacBook", { |
| 1240 | DMI_MATCH(DMI_BOARD_VENDOR,"Apple"), | 1254 | DMI_MATCH(DMI_BOARD_VENDOR,"Apple"), |
| 1241 | DMI_MATCH(DMI_PRODUCT_NAME,"MacBook") }, | 1255 | DMI_MATCH(DMI_PRODUCT_NAME,"MacBook") }, |
| @@ -1248,6 +1262,10 @@ static __initdata struct dmi_system_id applesmc_whitelist[] = { | |||
| 1248 | DMI_MATCH(DMI_BOARD_VENDOR,"Apple"), | 1262 | DMI_MATCH(DMI_BOARD_VENDOR,"Apple"), |
| 1249 | DMI_MATCH(DMI_PRODUCT_NAME,"MacPro2") }, | 1263 | DMI_MATCH(DMI_PRODUCT_NAME,"MacPro2") }, |
| 1250 | (void*)&applesmc_dmi_data[4]}, | 1264 | (void*)&applesmc_dmi_data[4]}, |
| 1265 | { applesmc_dmi_match, "Apple iMac", { | ||
| 1266 | DMI_MATCH(DMI_BOARD_VENDOR,"Apple"), | ||
| 1267 | DMI_MATCH(DMI_PRODUCT_NAME,"iMac") }, | ||
| 1268 | (void*)&applesmc_dmi_data[5]}, | ||
| 1251 | { .ident = NULL } | 1269 | { .ident = NULL } |
| 1252 | }; | 1270 | }; |
| 1253 | 1271 | ||
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c index 70239acecc8e..93c17223b527 100644 --- a/drivers/hwmon/coretemp.c +++ b/drivers/hwmon/coretemp.c | |||
| @@ -413,10 +413,11 @@ static int __init coretemp_init(void) | |||
| 413 | for_each_online_cpu(i) { | 413 | for_each_online_cpu(i) { |
| 414 | struct cpuinfo_x86 *c = &cpu_data(i); | 414 | struct cpuinfo_x86 *c = &cpu_data(i); |
| 415 | 415 | ||
| 416 | /* check if family 6, models 0xe, 0xf, 0x16, 0x17 */ | 416 | /* check if family 6, models 0xe, 0xf, 0x16, 0x17, 0x1A */ |
| 417 | if ((c->cpuid_level < 0) || (c->x86 != 0x6) || | 417 | if ((c->cpuid_level < 0) || (c->x86 != 0x6) || |
| 418 | !((c->x86_model == 0xe) || (c->x86_model == 0xf) || | 418 | !((c->x86_model == 0xe) || (c->x86_model == 0xf) || |
| 419 | (c->x86_model == 0x16) || (c->x86_model == 0x17))) { | 419 | (c->x86_model == 0x16) || (c->x86_model == 0x17) || |
| 420 | (c->x86_model == 0x1A))) { | ||
| 420 | 421 | ||
| 421 | /* supported CPU not found, but report the unknown | 422 | /* supported CPU not found, but report the unknown |
| 422 | family 6 CPU */ | 423 | family 6 CPU */ |
diff --git a/drivers/hwmon/hwmon-vid.c b/drivers/hwmon/hwmon-vid.c index 7b0a32c4dcfb..c54eff92be4a 100644 --- a/drivers/hwmon/hwmon-vid.c +++ b/drivers/hwmon/hwmon-vid.c | |||
| @@ -37,13 +37,21 @@ | |||
| 37 | * For VRD 10.0 and up, "VRD x.y Design Guide", | 37 | * For VRD 10.0 and up, "VRD x.y Design Guide", |
| 38 | * available at http://developer.intel.com/. | 38 | * available at http://developer.intel.com/. |
| 39 | * | 39 | * |
| 40 | * AMD NPT 0Fh (Athlon64 & Opteron), AMD Publication 32559, | 40 | * AMD Athlon 64 and AMD Opteron Processors, AMD Publication 26094, |
| 41 | * http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/26094.PDF | ||
| 42 | * Table 74. VID Code Voltages | ||
| 43 | * This corresponds to an arbitrary VRM code of 24 in the functions below. | ||
| 44 | * These CPU models (K8 revision <= E) have 5 VID pins. See also: | ||
| 45 | * Revision Guide for AMD Athlon 64 and AMD Opteron Processors, AMD Publication 25759, | ||
| 46 | * http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/25759.pdf | ||
| 47 | * | ||
| 48 | * AMD NPT Family 0Fh Processors, AMD Publication 32559, | ||
| 41 | * http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/32559.pdf | 49 | * http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/32559.pdf |
| 42 | * Table 71. VID Code Voltages | 50 | * Table 71. VID Code Voltages |
| 43 | * AMD Opteron processors don't follow the Intel specifications. | 51 | * This corresponds to an arbitrary VRM code of 25 in the functions below. |
| 44 | * I'm going to "make up" 2.4 as the spec number for the Opterons. | 52 | * These CPU models (K8 revision >= F) have 6 VID pins. See also: |
| 45 | * No good reason just a mnemonic for the 24x Opteron processor | 53 | * Revision Guide for AMD NPT Family 0Fh Processors, AMD Publication 33610, |
| 46 | * series. | 54 | * http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/33610.pdf |
| 47 | * | 55 | * |
| 48 | * The 17 specification is in fact Intel Mobile Voltage Positioning - | 56 | * The 17 specification is in fact Intel Mobile Voltage Positioning - |
| 49 | * (IMVP-II). You can find more information in the datasheet of Max1718 | 57 | * (IMVP-II). You can find more information in the datasheet of Max1718 |
| @@ -95,7 +103,12 @@ int vid_from_reg(int val, u8 vrm) | |||
| 95 | return 0; | 103 | return 0; |
| 96 | return((1600000 - (val - 2) * 6250 + 500) / 1000); | 104 | return((1600000 - (val - 2) * 6250 + 500) / 1000); |
| 97 | 105 | ||
| 98 | case 24: /* AMD NPT 0Fh (Athlon64 & Opteron) */ | 106 | case 24: /* Athlon64 & Opteron */ |
| 107 | val &= 0x1f; | ||
| 108 | if (val == 0x1f) | ||
| 109 | return 0; | ||
| 110 | /* fall through */ | ||
| 111 | case 25: /* AMD NPT 0Fh */ | ||
| 99 | val &= 0x3f; | 112 | val &= 0x3f; |
| 100 | return (val < 32) ? 1550 - 25 * val | 113 | return (val < 32) ? 1550 - 25 * val |
| 101 | : 775 - (25 * (val - 31)) / 2; | 114 | : 775 - (25 * (val - 31)) / 2; |
| @@ -157,11 +170,16 @@ struct vrm_model { | |||
| 157 | 170 | ||
| 158 | #ifdef CONFIG_X86 | 171 | #ifdef CONFIG_X86 |
| 159 | 172 | ||
| 160 | /* the stepping parameter is highest acceptable stepping for current line */ | 173 | /* |
| 174 | * The stepping parameter is highest acceptable stepping for current line. | ||
| 175 | * The model match must be exact for 4-bit values. For model values 0x10 | ||
| 176 | * and above (extended model), all models below the parameter will match. | ||
| 177 | */ | ||
| 161 | 178 | ||
| 162 | static struct vrm_model vrm_models[] = { | 179 | static struct vrm_model vrm_models[] = { |
| 163 | {X86_VENDOR_AMD, 0x6, ANY, ANY, 90}, /* Athlon Duron etc */ | 180 | {X86_VENDOR_AMD, 0x6, ANY, ANY, 90}, /* Athlon Duron etc */ |
| 164 | {X86_VENDOR_AMD, 0xF, ANY, ANY, 24}, /* Athlon 64, Opteron and above VRM 24 */ | 181 | {X86_VENDOR_AMD, 0xF, 0x3F, ANY, 24}, /* Athlon 64, Opteron */ |
| 182 | {X86_VENDOR_AMD, 0xF, ANY, ANY, 25}, /* NPT family 0Fh */ | ||
| 165 | {X86_VENDOR_INTEL, 0x6, 0x9, ANY, 13}, /* Pentium M (130 nm) */ | 183 | {X86_VENDOR_INTEL, 0x6, 0x9, ANY, 13}, /* Pentium M (130 nm) */ |
| 166 | {X86_VENDOR_INTEL, 0x6, 0xB, ANY, 85}, /* Tualatin */ | 184 | {X86_VENDOR_INTEL, 0x6, 0xB, ANY, 85}, /* Tualatin */ |
| 167 | {X86_VENDOR_INTEL, 0x6, 0xD, ANY, 13}, /* Pentium M (90 nm) */ | 185 | {X86_VENDOR_INTEL, 0x6, 0xD, ANY, 13}, /* Pentium M (90 nm) */ |
| @@ -189,6 +207,8 @@ static u8 find_vrm(u8 eff_family, u8 eff_model, u8 eff_stepping, u8 vendor) | |||
| 189 | if (vrm_models[i].vendor==vendor) | 207 | if (vrm_models[i].vendor==vendor) |
| 190 | if ((vrm_models[i].eff_family==eff_family) | 208 | if ((vrm_models[i].eff_family==eff_family) |
| 191 | && ((vrm_models[i].eff_model==eff_model) || | 209 | && ((vrm_models[i].eff_model==eff_model) || |
| 210 | (vrm_models[i].eff_model >= 0x10 && | ||
| 211 | eff_model <= vrm_models[i].eff_model) || | ||
| 192 | (vrm_models[i].eff_model==ANY)) && | 212 | (vrm_models[i].eff_model==ANY)) && |
| 193 | (eff_stepping <= vrm_models[i].eff_stepping)) | 213 | (eff_stepping <= vrm_models[i].eff_stepping)) |
| 194 | return vrm_models[i].vrm_type; | 214 | return vrm_models[i].vrm_type; |
diff --git a/drivers/hwmon/i5k_amb.c b/drivers/hwmon/i5k_amb.c index f9e2ed621f7b..2ede9388096b 100644 --- a/drivers/hwmon/i5k_amb.c +++ b/drivers/hwmon/i5k_amb.c | |||
| @@ -81,6 +81,8 @@ static unsigned long amb_reg_temp(unsigned int amb) | |||
| 81 | #define MAX_AMBS_PER_CHANNEL 16 | 81 | #define MAX_AMBS_PER_CHANNEL 16 |
| 82 | #define MAX_AMBS (MAX_MEM_CHANNELS * \ | 82 | #define MAX_AMBS (MAX_MEM_CHANNELS * \ |
| 83 | MAX_AMBS_PER_CHANNEL) | 83 | MAX_AMBS_PER_CHANNEL) |
| 84 | #define CHANNEL_SHIFT 4 | ||
| 85 | #define DIMM_MASK 0xF | ||
| 84 | /* | 86 | /* |
| 85 | * Ugly hack: For some reason the highest bit is set if there | 87 | * Ugly hack: For some reason the highest bit is set if there |
| 86 | * are _any_ DIMMs in the channel. Attempting to read from | 88 | * are _any_ DIMMs in the channel. Attempting to read from |
| @@ -89,7 +91,7 @@ static unsigned long amb_reg_temp(unsigned int amb) | |||
| 89 | * might prevent us from seeing the 16th DIMM in the channel. | 91 | * might prevent us from seeing the 16th DIMM in the channel. |
| 90 | */ | 92 | */ |
| 91 | #define REAL_MAX_AMBS_PER_CHANNEL 15 | 93 | #define REAL_MAX_AMBS_PER_CHANNEL 15 |
| 92 | #define KNOBS_PER_AMB 5 | 94 | #define KNOBS_PER_AMB 6 |
| 93 | 95 | ||
| 94 | static unsigned long amb_num_from_reg(unsigned int byte_num, unsigned int bit) | 96 | static unsigned long amb_num_from_reg(unsigned int byte_num, unsigned int bit) |
| 95 | { | 97 | { |
| @@ -238,6 +240,16 @@ static ssize_t show_amb_temp(struct device *dev, | |||
| 238 | 500 * amb_read_byte(data, amb_reg_temp(attr->index))); | 240 | 500 * amb_read_byte(data, amb_reg_temp(attr->index))); |
| 239 | } | 241 | } |
| 240 | 242 | ||
| 243 | static ssize_t show_label(struct device *dev, | ||
| 244 | struct device_attribute *devattr, | ||
| 245 | char *buf) | ||
| 246 | { | ||
| 247 | struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); | ||
| 248 | |||
| 249 | return sprintf(buf, "Ch. %d DIMM %d\n", attr->index >> CHANNEL_SHIFT, | ||
| 250 | attr->index & DIMM_MASK); | ||
| 251 | } | ||
| 252 | |||
| 241 | static int __devinit i5k_amb_hwmon_init(struct platform_device *pdev) | 253 | static int __devinit i5k_amb_hwmon_init(struct platform_device *pdev) |
| 242 | { | 254 | { |
| 243 | int i, j, k, d = 0; | 255 | int i, j, k, d = 0; |
| @@ -268,6 +280,20 @@ static int __devinit i5k_amb_hwmon_init(struct platform_device *pdev) | |||
| 268 | continue; | 280 | continue; |
| 269 | d++; | 281 | d++; |
| 270 | 282 | ||
| 283 | /* sysfs label */ | ||
| 284 | iattr = data->attrs + data->num_attrs; | ||
| 285 | snprintf(iattr->name, AMB_SYSFS_NAME_LEN, | ||
| 286 | "temp%d_label", d); | ||
| 287 | iattr->s_attr.dev_attr.attr.name = iattr->name; | ||
| 288 | iattr->s_attr.dev_attr.attr.mode = S_IRUGO; | ||
| 289 | iattr->s_attr.dev_attr.show = show_label; | ||
| 290 | iattr->s_attr.index = k; | ||
| 291 | res = device_create_file(&pdev->dev, | ||
| 292 | &iattr->s_attr.dev_attr); | ||
| 293 | if (res) | ||
| 294 | goto exit_remove; | ||
| 295 | data->num_attrs++; | ||
| 296 | |||
| 271 | /* Temperature sysfs knob */ | 297 | /* Temperature sysfs knob */ |
| 272 | iattr = data->attrs + data->num_attrs; | 298 | iattr = data->attrs + data->num_attrs; |
| 273 | snprintf(iattr->name, AMB_SYSFS_NAME_LEN, | 299 | snprintf(iattr->name, AMB_SYSFS_NAME_LEN, |
diff --git a/drivers/hwmon/ibmaem.c b/drivers/hwmon/ibmaem.c index c9416e657487..0f70dc204105 100644 --- a/drivers/hwmon/ibmaem.c +++ b/drivers/hwmon/ibmaem.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * A hwmon driver for the IBM Active Energy Manager temperature/power sensors | 2 | * A hwmon driver for the IBM System Director Active Energy Manager (AEM) |
| 3 | * and capping functionality. | 3 | * temperature/power/energy sensors and capping functionality. |
| 4 | * Copyright (C) 2008 IBM | 4 | * Copyright (C) 2008 IBM |
| 5 | * | 5 | * |
| 6 | * Author: Darrick J. Wong <djwong@us.ibm.com> | 6 | * Author: Darrick J. Wong <djwong@us.ibm.com> |
| @@ -463,12 +463,18 @@ static int aem_read_sensor(struct aem_data *data, u8 elt, u8 reg, | |||
| 463 | } | 463 | } |
| 464 | 464 | ||
| 465 | /* Update AEM energy registers */ | 465 | /* Update AEM energy registers */ |
| 466 | static void update_aem_energy_one(struct aem_data *data, int which) | ||
| 467 | { | ||
| 468 | aem_read_sensor(data, AEM_ENERGY_ELEMENT, which, | ||
| 469 | &data->energy[which], 8); | ||
| 470 | } | ||
| 471 | |||
| 466 | static void update_aem_energy(struct aem_data *data) | 472 | static void update_aem_energy(struct aem_data *data) |
| 467 | { | 473 | { |
| 468 | aem_read_sensor(data, AEM_ENERGY_ELEMENT, 0, &data->energy[0], 8); | 474 | update_aem_energy_one(data, 0); |
| 469 | if (data->ver_major < 2) | 475 | if (data->ver_major < 2) |
| 470 | return; | 476 | return; |
| 471 | aem_read_sensor(data, AEM_ENERGY_ELEMENT, 1, &data->energy[1], 8); | 477 | update_aem_energy_one(data, 1); |
| 472 | } | 478 | } |
| 473 | 479 | ||
| 474 | /* Update all AEM1 sensors */ | 480 | /* Update all AEM1 sensors */ |
| @@ -676,7 +682,8 @@ static int aem_find_aem2(struct aem_ipmi_data *data, | |||
| 676 | return -ETIMEDOUT; | 682 | return -ETIMEDOUT; |
| 677 | 683 | ||
| 678 | if (data->rx_result || data->rx_msg_len != sizeof(*fi_resp) || | 684 | if (data->rx_result || data->rx_msg_len != sizeof(*fi_resp) || |
| 679 | memcmp(&fi_resp->id, &system_x_id, sizeof(system_x_id))) | 685 | memcmp(&fi_resp->id, &system_x_id, sizeof(system_x_id)) || |
| 686 | fi_resp->num_instances <= instance_num) | ||
| 680 | return -ENOENT; | 687 | return -ENOENT; |
| 681 | 688 | ||
| 682 | return 0; | 689 | return 0; |
| @@ -849,7 +856,7 @@ static ssize_t aem_show_power(struct device *dev, | |||
| 849 | struct timespec b, a; | 856 | struct timespec b, a; |
| 850 | 857 | ||
| 851 | mutex_lock(&data->lock); | 858 | mutex_lock(&data->lock); |
| 852 | update_aem_energy(data); | 859 | update_aem_energy_one(data, attr->index); |
| 853 | getnstimeofday(&b); | 860 | getnstimeofday(&b); |
| 854 | before = data->energy[attr->index]; | 861 | before = data->energy[attr->index]; |
| 855 | 862 | ||
| @@ -861,7 +868,7 @@ static ssize_t aem_show_power(struct device *dev, | |||
| 861 | return 0; | 868 | return 0; |
| 862 | } | 869 | } |
| 863 | 870 | ||
| 864 | update_aem_energy(data); | 871 | update_aem_energy_one(data, attr->index); |
| 865 | getnstimeofday(&a); | 872 | getnstimeofday(&a); |
| 866 | after = data->energy[attr->index]; | 873 | after = data->energy[attr->index]; |
| 867 | mutex_unlock(&data->lock); | 874 | mutex_unlock(&data->lock); |
| @@ -880,7 +887,9 @@ static ssize_t aem_show_energy(struct device *dev, | |||
| 880 | { | 887 | { |
| 881 | struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); | 888 | struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); |
| 882 | struct aem_data *a = dev_get_drvdata(dev); | 889 | struct aem_data *a = dev_get_drvdata(dev); |
| 883 | a->update(a); | 890 | mutex_lock(&a->lock); |
| 891 | update_aem_energy_one(a, attr->index); | ||
| 892 | mutex_unlock(&a->lock); | ||
| 884 | 893 | ||
| 885 | return sprintf(buf, "%llu\n", | 894 | return sprintf(buf, "%llu\n", |
| 886 | (unsigned long long)a->energy[attr->index] * 1000); | 895 | (unsigned long long)a->energy[attr->index] * 1000); |
| @@ -1104,7 +1113,7 @@ static void __exit aem_exit(void) | |||
| 1104 | } | 1113 | } |
| 1105 | 1114 | ||
| 1106 | MODULE_AUTHOR("Darrick J. Wong <djwong@us.ibm.com>"); | 1115 | MODULE_AUTHOR("Darrick J. Wong <djwong@us.ibm.com>"); |
| 1107 | MODULE_DESCRIPTION("IBM Active Energy Manager power/temp sensor driver"); | 1116 | MODULE_DESCRIPTION("IBM AEM power/temp/energy sensor driver"); |
| 1108 | MODULE_LICENSE("GPL"); | 1117 | MODULE_LICENSE("GPL"); |
| 1109 | 1118 | ||
| 1110 | module_init(aem_init); | 1119 | module_init(aem_init); |
diff --git a/drivers/hwmon/w83791d.c b/drivers/hwmon/w83791d.c index daa7d121483b..de21142d106c 100644 --- a/drivers/hwmon/w83791d.c +++ b/drivers/hwmon/w83791d.c | |||
| @@ -1055,9 +1055,10 @@ static int w83791d_probe(struct i2c_client *client, | |||
| 1055 | { | 1055 | { |
| 1056 | struct w83791d_data *data; | 1056 | struct w83791d_data *data; |
| 1057 | struct device *dev = &client->dev; | 1057 | struct device *dev = &client->dev; |
| 1058 | int i, val1, err; | 1058 | int i, err; |
| 1059 | 1059 | ||
| 1060 | #ifdef DEBUG | 1060 | #ifdef DEBUG |
| 1061 | int val1; | ||
| 1061 | val1 = w83791d_read(client, W83791D_REG_DID_VID4); | 1062 | val1 = w83791d_read(client, W83791D_REG_DID_VID4); |
| 1062 | dev_dbg(dev, "Device ID version: %d.%d (0x%02x)\n", | 1063 | dev_dbg(dev, "Device ID version: %d.%d (0x%02x)\n", |
| 1063 | (val1 >> 5) & 0x07, (val1 >> 1) & 0x0f, val1); | 1064 | (val1 >> 5) & 0x07, (val1 >> 1) & 0x0f, val1); |
diff --git a/drivers/i2c/busses/i2c-at91.c b/drivers/i2c/busses/i2c-at91.c index c1adcdbf7979..9efb02137254 100644 --- a/drivers/i2c/busses/i2c-at91.c +++ b/drivers/i2c/busses/i2c-at91.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 17 | #include <linux/version.h> | ||
| 18 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 19 | #include <linux/err.h> | 18 | #include <linux/err.h> |
| 20 | #include <linux/slab.h> | 19 | #include <linux/slab.h> |
diff --git a/drivers/i2c/chips/isp1301_omap.c b/drivers/i2c/chips/isp1301_omap.c index 18355ae2155d..4655b794ebe3 100644 --- a/drivers/i2c/chips/isp1301_omap.c +++ b/drivers/i2c/chips/isp1301_omap.c | |||
| @@ -1593,7 +1593,7 @@ fail1: | |||
| 1593 | if (machine_is_omap_h2()) { | 1593 | if (machine_is_omap_h2()) { |
| 1594 | /* full speed signaling by default */ | 1594 | /* full speed signaling by default */ |
| 1595 | isp1301_set_bits(isp, ISP1301_MODE_CONTROL_1, | 1595 | isp1301_set_bits(isp, ISP1301_MODE_CONTROL_1, |
| 1596 | MC1_SPEED_REG); | 1596 | MC1_SPEED); |
| 1597 | isp1301_set_bits(isp, ISP1301_MODE_CONTROL_2, | 1597 | isp1301_set_bits(isp, ISP1301_MODE_CONTROL_2, |
| 1598 | MC2_SPD_SUSP_CTRL); | 1598 | MC2_SPD_SUSP_CTRL); |
| 1599 | 1599 | ||
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index 550853f79ae8..b346a687ab59 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c | |||
| @@ -108,6 +108,9 @@ static int i2c_device_probe(struct device *dev) | |||
| 108 | if (!driver->probe || !driver->id_table) | 108 | if (!driver->probe || !driver->id_table) |
| 109 | return -ENODEV; | 109 | return -ENODEV; |
| 110 | client->driver = driver; | 110 | client->driver = driver; |
| 111 | if (!device_can_wakeup(&client->dev)) | ||
| 112 | device_init_wakeup(&client->dev, | ||
| 113 | client->flags & I2C_CLIENT_WAKE); | ||
| 111 | dev_dbg(dev, "probe\n"); | 114 | dev_dbg(dev, "probe\n"); |
| 112 | 115 | ||
| 113 | status = driver->probe(client, i2c_match_id(driver->id_table, client)); | 116 | status = driver->probe(client, i2c_match_id(driver->id_table, client)); |
| @@ -262,9 +265,8 @@ i2c_new_device(struct i2c_adapter *adap, struct i2c_board_info const *info) | |||
| 262 | client->adapter = adap; | 265 | client->adapter = adap; |
| 263 | 266 | ||
| 264 | client->dev.platform_data = info->platform_data; | 267 | client->dev.platform_data = info->platform_data; |
| 265 | device_init_wakeup(&client->dev, info->flags & I2C_CLIENT_WAKE); | ||
| 266 | 268 | ||
| 267 | client->flags = info->flags & ~I2C_CLIENT_WAKE; | 269 | client->flags = info->flags; |
| 268 | client->addr = info->addr; | 270 | client->addr = info->addr; |
| 269 | client->irq = info->irq; | 271 | client->irq = info->irq; |
| 270 | 272 | ||
| @@ -1188,8 +1190,8 @@ int i2c_probe(struct i2c_adapter *adapter, | |||
| 1188 | && address_data->normal_i2c[0] == I2C_CLIENT_END) | 1190 | && address_data->normal_i2c[0] == I2C_CLIENT_END) |
| 1189 | return 0; | 1191 | return 0; |
| 1190 | 1192 | ||
| 1191 | dev_warn(&adapter->dev, "SMBus Quick command not supported, " | 1193 | dev_dbg(&adapter->dev, "SMBus Quick command not supported, " |
| 1192 | "can't probe for chips\n"); | 1194 | "can't probe for chips\n"); |
| 1193 | return -EOPNOTSUPP; | 1195 | return -EOPNOTSUPP; |
| 1194 | } | 1196 | } |
| 1195 | 1197 | ||
| @@ -1350,6 +1352,10 @@ static int i2c_detect(struct i2c_adapter *adapter, struct i2c_driver *driver) | |||
| 1350 | } | 1352 | } |
| 1351 | } | 1353 | } |
| 1352 | 1354 | ||
| 1355 | /* Stop here if the classes do not match */ | ||
| 1356 | if (!(adapter->class & driver->class)) | ||
| 1357 | goto exit_free; | ||
| 1358 | |||
| 1353 | /* Stop here if we can't use SMBUS_QUICK */ | 1359 | /* Stop here if we can't use SMBUS_QUICK */ |
| 1354 | if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_QUICK)) { | 1360 | if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_QUICK)) { |
| 1355 | if (address_data->probe[0] == I2C_CLIENT_END | 1361 | if (address_data->probe[0] == I2C_CLIENT_END |
| @@ -1362,10 +1368,6 @@ static int i2c_detect(struct i2c_adapter *adapter, struct i2c_driver *driver) | |||
| 1362 | goto exit_free; | 1368 | goto exit_free; |
| 1363 | } | 1369 | } |
| 1364 | 1370 | ||
| 1365 | /* Stop here if the classes do not match */ | ||
| 1366 | if (!(adapter->class & driver->class)) | ||
| 1367 | goto exit_free; | ||
| 1368 | |||
| 1369 | /* Probe entries are done second, and are not affected by ignore | 1371 | /* Probe entries are done second, and are not affected by ignore |
| 1370 | entries either */ | 1372 | entries either */ |
| 1371 | for (i = 0; address_data->probe[i] != I2C_CLIENT_END; i += 2) { | 1373 | for (i = 0; address_data->probe[i] != I2C_CLIENT_END; i += 2) { |
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig index a34758d29516..fc735ab08ff4 100644 --- a/drivers/ide/Kconfig +++ b/drivers/ide/Kconfig | |||
| @@ -242,7 +242,7 @@ config BLK_DEV_IDEFLOPPY | |||
| 242 | module will be called ide-floppy. | 242 | module will be called ide-floppy. |
| 243 | 243 | ||
| 244 | config BLK_DEV_IDESCSI | 244 | config BLK_DEV_IDESCSI |
| 245 | tristate "SCSI emulation support" | 245 | tristate "SCSI emulation support (DEPRECATED)" |
| 246 | depends on SCSI | 246 | depends on SCSI |
| 247 | select IDE_ATAPI | 247 | select IDE_ATAPI |
| 248 | ---help--- | 248 | ---help--- |
| @@ -255,20 +255,6 @@ config BLK_DEV_IDESCSI | |||
| 255 | and will allow you to use a SCSI device driver instead of a native | 255 | and will allow you to use a SCSI device driver instead of a native |
| 256 | ATAPI driver. | 256 | ATAPI driver. |
| 257 | 257 | ||
| 258 | This is useful if you have an ATAPI device for which no native | ||
| 259 | driver has been written (for example, an ATAPI PD-CD drive); | ||
| 260 | you can then use this emulation together with an appropriate SCSI | ||
| 261 | device driver. In order to do this, say Y here and to "SCSI support" | ||
| 262 | and "SCSI generic support", below. You must then provide the kernel | ||
| 263 | command line "hdx=ide-scsi" (try "man bootparam" or see the | ||
| 264 | documentation of your boot loader (lilo or loadlin) about how to | ||
| 265 | pass options to the kernel at boot time) for devices if you want the | ||
| 266 | native EIDE sub-drivers to skip over the native support, so that | ||
| 267 | this SCSI emulation can be used instead. | ||
| 268 | |||
| 269 | Note that this option does NOT allow you to attach SCSI devices to a | ||
| 270 | box that doesn't have a SCSI host adapter installed. | ||
| 271 | |||
| 272 | If both this SCSI emulation and native ATAPI support are compiled | 258 | If both this SCSI emulation and native ATAPI support are compiled |
| 273 | into the kernel, the native support will be used. | 259 | into the kernel, the native support will be used. |
| 274 | 260 | ||
diff --git a/drivers/ide/arm/palm_bk3710.c b/drivers/ide/arm/palm_bk3710.c index f788fa5a977b..4fd91dcf1dc2 100644 --- a/drivers/ide/arm/palm_bk3710.c +++ b/drivers/ide/arm/palm_bk3710.c | |||
| @@ -343,11 +343,10 @@ static struct ide_port_info __devinitdata palm_bk3710_port_info = { | |||
| 343 | .mwdma_mask = ATA_MWDMA2, | 343 | .mwdma_mask = ATA_MWDMA2, |
| 344 | }; | 344 | }; |
| 345 | 345 | ||
| 346 | static int __devinit palm_bk3710_probe(struct platform_device *pdev) | 346 | static int __init palm_bk3710_probe(struct platform_device *pdev) |
| 347 | { | 347 | { |
| 348 | struct clk *clk; | 348 | struct clk *clk; |
| 349 | struct resource *mem, *irq; | 349 | struct resource *mem, *irq; |
| 350 | struct ide_host *host; | ||
| 351 | unsigned long base, rate; | 350 | unsigned long base, rate; |
| 352 | int i, rc; | 351 | int i, rc; |
| 353 | hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL }; | 352 | hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL }; |
| @@ -390,6 +389,7 @@ static int __devinit palm_bk3710_probe(struct platform_device *pdev) | |||
| 390 | hw.io_ports_array[i] = base + IDE_PALM_ATA_PRI_REG_OFFSET + i; | 389 | hw.io_ports_array[i] = base + IDE_PALM_ATA_PRI_REG_OFFSET + i; |
| 391 | hw.io_ports.ctl_addr = base + IDE_PALM_ATA_PRI_CTL_OFFSET; | 390 | hw.io_ports.ctl_addr = base + IDE_PALM_ATA_PRI_CTL_OFFSET; |
| 392 | hw.irq = irq->start; | 391 | hw.irq = irq->start; |
| 392 | hw.dev = &pdev->dev; | ||
| 393 | hw.chipset = ide_palm3710; | 393 | hw.chipset = ide_palm3710; |
| 394 | 394 | ||
| 395 | palm_bk3710_port_info.udma_mask = rate < 100000000 ? ATA_UDMA4 : | 395 | palm_bk3710_port_info.udma_mask = rate < 100000000 ? ATA_UDMA4 : |
| @@ -413,13 +413,11 @@ static struct platform_driver platform_bk_driver = { | |||
| 413 | .name = "palm_bk3710", | 413 | .name = "palm_bk3710", |
| 414 | .owner = THIS_MODULE, | 414 | .owner = THIS_MODULE, |
| 415 | }, | 415 | }, |
| 416 | .probe = palm_bk3710_probe, | ||
| 417 | .remove = NULL, | ||
| 418 | }; | 416 | }; |
| 419 | 417 | ||
| 420 | static int __init palm_bk3710_init(void) | 418 | static int __init palm_bk3710_init(void) |
| 421 | { | 419 | { |
| 422 | return platform_driver_register(&platform_bk_driver); | 420 | return platform_driver_probe(&platform_bk_driver, palm_bk3710_probe); |
| 423 | } | 421 | } |
| 424 | 422 | ||
| 425 | module_init(palm_bk3710_init); | 423 | module_init(palm_bk3710_init); |
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index 89a112d513ad..f1489999cf91 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c | |||
| @@ -1272,9 +1272,9 @@ static ide_startstop_t ide_cd_do_request(ide_drive_t *drive, struct request *rq, | |||
| 1272 | */ | 1272 | */ |
| 1273 | static void msf_from_bcd(struct atapi_msf *msf) | 1273 | static void msf_from_bcd(struct atapi_msf *msf) |
| 1274 | { | 1274 | { |
| 1275 | msf->minute = BCD2BIN(msf->minute); | 1275 | msf->minute = bcd2bin(msf->minute); |
| 1276 | msf->second = BCD2BIN(msf->second); | 1276 | msf->second = bcd2bin(msf->second); |
| 1277 | msf->frame = BCD2BIN(msf->frame); | 1277 | msf->frame = bcd2bin(msf->frame); |
| 1278 | } | 1278 | } |
| 1279 | 1279 | ||
| 1280 | int cdrom_check_status(ide_drive_t *drive, struct request_sense *sense) | 1280 | int cdrom_check_status(ide_drive_t *drive, struct request_sense *sense) |
| @@ -1415,8 +1415,8 @@ int ide_cd_read_toc(ide_drive_t *drive, struct request_sense *sense) | |||
| 1415 | return stat; | 1415 | return stat; |
| 1416 | 1416 | ||
| 1417 | if (drive->atapi_flags & IDE_AFLAG_TOCTRACKS_AS_BCD) { | 1417 | if (drive->atapi_flags & IDE_AFLAG_TOCTRACKS_AS_BCD) { |
| 1418 | toc->hdr.first_track = BCD2BIN(toc->hdr.first_track); | 1418 | toc->hdr.first_track = bcd2bin(toc->hdr.first_track); |
| 1419 | toc->hdr.last_track = BCD2BIN(toc->hdr.last_track); | 1419 | toc->hdr.last_track = bcd2bin(toc->hdr.last_track); |
| 1420 | } | 1420 | } |
| 1421 | 1421 | ||
| 1422 | ntracks = toc->hdr.last_track - toc->hdr.first_track + 1; | 1422 | ntracks = toc->hdr.last_track - toc->hdr.first_track + 1; |
| @@ -1456,8 +1456,8 @@ int ide_cd_read_toc(ide_drive_t *drive, struct request_sense *sense) | |||
| 1456 | return stat; | 1456 | return stat; |
| 1457 | 1457 | ||
| 1458 | if (drive->atapi_flags & IDE_AFLAG_TOCTRACKS_AS_BCD) { | 1458 | if (drive->atapi_flags & IDE_AFLAG_TOCTRACKS_AS_BCD) { |
| 1459 | toc->hdr.first_track = (u8)BIN2BCD(CDROM_LEADOUT); | 1459 | toc->hdr.first_track = (u8)bin2bcd(CDROM_LEADOUT); |
| 1460 | toc->hdr.last_track = (u8)BIN2BCD(CDROM_LEADOUT); | 1460 | toc->hdr.last_track = (u8)bin2bcd(CDROM_LEADOUT); |
| 1461 | } else { | 1461 | } else { |
| 1462 | toc->hdr.first_track = CDROM_LEADOUT; | 1462 | toc->hdr.first_track = CDROM_LEADOUT; |
| 1463 | toc->hdr.last_track = CDROM_LEADOUT; | 1463 | toc->hdr.last_track = CDROM_LEADOUT; |
| @@ -1470,14 +1470,14 @@ int ide_cd_read_toc(ide_drive_t *drive, struct request_sense *sense) | |||
| 1470 | toc->hdr.toc_length = be16_to_cpu(toc->hdr.toc_length); | 1470 | toc->hdr.toc_length = be16_to_cpu(toc->hdr.toc_length); |
| 1471 | 1471 | ||
| 1472 | if (drive->atapi_flags & IDE_AFLAG_TOCTRACKS_AS_BCD) { | 1472 | if (drive->atapi_flags & IDE_AFLAG_TOCTRACKS_AS_BCD) { |
| 1473 | toc->hdr.first_track = BCD2BIN(toc->hdr.first_track); | 1473 | toc->hdr.first_track = bcd2bin(toc->hdr.first_track); |
| 1474 | toc->hdr.last_track = BCD2BIN(toc->hdr.last_track); | 1474 | toc->hdr.last_track = bcd2bin(toc->hdr.last_track); |
| 1475 | } | 1475 | } |
| 1476 | 1476 | ||
| 1477 | for (i = 0; i <= ntracks; i++) { | 1477 | for (i = 0; i <= ntracks; i++) { |
| 1478 | if (drive->atapi_flags & IDE_AFLAG_TOCADDR_AS_BCD) { | 1478 | if (drive->atapi_flags & IDE_AFLAG_TOCADDR_AS_BCD) { |
| 1479 | if (drive->atapi_flags & IDE_AFLAG_TOCTRACKS_AS_BCD) | 1479 | if (drive->atapi_flags & IDE_AFLAG_TOCTRACKS_AS_BCD) |
| 1480 | toc->ent[i].track = BCD2BIN(toc->ent[i].track); | 1480 | toc->ent[i].track = bcd2bin(toc->ent[i].track); |
| 1481 | msf_from_bcd(&toc->ent[i].addr.msf); | 1481 | msf_from_bcd(&toc->ent[i].addr.msf); |
| 1482 | } | 1482 | } |
| 1483 | toc->ent[i].addr.lba = msf_to_lba(toc->ent[i].addr.msf.minute, | 1483 | toc->ent[i].addr.lba = msf_to_lba(toc->ent[i].addr.msf.minute, |
| @@ -1933,6 +1933,7 @@ static void ide_cd_remove(ide_drive_t *drive) | |||
| 1933 | 1933 | ||
| 1934 | ide_proc_unregister_driver(drive, info->driver); | 1934 | ide_proc_unregister_driver(drive, info->driver); |
| 1935 | 1935 | ||
| 1936 | blk_unregister_filter(info->disk); | ||
| 1936 | del_gendisk(info->disk); | 1937 | del_gendisk(info->disk); |
| 1937 | 1938 | ||
| 1938 | ide_cd_put(info); | 1939 | ide_cd_put(info); |
| @@ -2158,6 +2159,7 @@ static int ide_cd_probe(ide_drive_t *drive) | |||
| 2158 | g->fops = &idecd_ops; | 2159 | g->fops = &idecd_ops; |
| 2159 | g->flags |= GENHD_FL_REMOVABLE; | 2160 | g->flags |= GENHD_FL_REMOVABLE; |
| 2160 | add_disk(g); | 2161 | add_disk(g); |
| 2162 | blk_register_filter(g); | ||
| 2161 | return 0; | 2163 | return 0; |
| 2162 | 2164 | ||
| 2163 | out_free_cd: | 2165 | out_free_cd: |
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c index 68b9cf0138b0..07ef88bd109b 100644 --- a/drivers/ide/ide-disk.c +++ b/drivers/ide/ide-disk.c | |||
| @@ -445,20 +445,6 @@ static void idedisk_check_hpa(ide_drive_t *drive) | |||
| 445 | } | 445 | } |
| 446 | } | 446 | } |
| 447 | 447 | ||
| 448 | /* | ||
| 449 | * Compute drive->capacity, the full capacity of the drive | ||
| 450 | * Called with drive->id != NULL. | ||
| 451 | * | ||
| 452 | * To compute capacity, this uses either of | ||
| 453 | * | ||
| 454 | * 1. CHS value set by user (whatever user sets will be trusted) | ||
| 455 | * 2. LBA value from target drive (require new ATA feature) | ||
| 456 | * 3. LBA value from system BIOS (new one is OK, old one may break) | ||
| 457 | * 4. CHS value from system BIOS (traditional style) | ||
| 458 | * | ||
| 459 | * in above order (i.e., if value of higher priority is available, | ||
| 460 | * reset will be ignored). | ||
| 461 | */ | ||
| 462 | static void init_idedisk_capacity(ide_drive_t *drive) | 448 | static void init_idedisk_capacity(ide_drive_t *drive) |
| 463 | { | 449 | { |
| 464 | struct hd_driveid *id = drive->id; | 450 | struct hd_driveid *id = drive->id; |
diff --git a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c index 40644b6f1c00..3187215e8f89 100644 --- a/drivers/ide/pci/aec62xx.c +++ b/drivers/ide/pci/aec62xx.c | |||
| @@ -307,7 +307,7 @@ static struct pci_driver driver = { | |||
| 307 | .name = "AEC62xx_IDE", | 307 | .name = "AEC62xx_IDE", |
| 308 | .id_table = aec62xx_pci_tbl, | 308 | .id_table = aec62xx_pci_tbl, |
| 309 | .probe = aec62xx_init_one, | 309 | .probe = aec62xx_init_one, |
| 310 | .remove = aec62xx_remove, | 310 | .remove = __devexit_p(aec62xx_remove), |
| 311 | }; | 311 | }; |
| 312 | 312 | ||
| 313 | static int __init aec62xx_ide_init(void) | 313 | static int __init aec62xx_ide_init(void) |
diff --git a/drivers/ide/pci/cy82c693.c b/drivers/ide/pci/cy82c693.c index bfae2f882f48..e6d8ee88d56d 100644 --- a/drivers/ide/pci/cy82c693.c +++ b/drivers/ide/pci/cy82c693.c | |||
| @@ -447,7 +447,7 @@ static struct pci_driver driver = { | |||
| 447 | .name = "Cypress_IDE", | 447 | .name = "Cypress_IDE", |
| 448 | .id_table = cy82c693_pci_tbl, | 448 | .id_table = cy82c693_pci_tbl, |
| 449 | .probe = cy82c693_init_one, | 449 | .probe = cy82c693_init_one, |
| 450 | .remove = cy82c693_remove, | 450 | .remove = __devexit_p(cy82c693_remove), |
| 451 | }; | 451 | }; |
| 452 | 452 | ||
| 453 | static int __init cy82c693_ide_init(void) | 453 | static int __init cy82c693_ide_init(void) |
diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c index 748793a413ab..eb107eef0dbc 100644 --- a/drivers/ide/pci/hpt366.c +++ b/drivers/ide/pci/hpt366.c | |||
| @@ -1620,7 +1620,7 @@ static struct pci_driver driver = { | |||
| 1620 | .name = "HPT366_IDE", | 1620 | .name = "HPT366_IDE", |
| 1621 | .id_table = hpt366_pci_tbl, | 1621 | .id_table = hpt366_pci_tbl, |
| 1622 | .probe = hpt366_init_one, | 1622 | .probe = hpt366_init_one, |
| 1623 | .remove = hpt366_remove, | 1623 | .remove = __devexit_p(hpt366_remove), |
| 1624 | }; | 1624 | }; |
| 1625 | 1625 | ||
| 1626 | static int __init hpt366_ide_init(void) | 1626 | static int __init hpt366_ide_init(void) |
diff --git a/drivers/ide/pci/it821x.c b/drivers/ide/pci/it821x.c index b6dc723de702..4a1508a707cc 100644 --- a/drivers/ide/pci/it821x.c +++ b/drivers/ide/pci/it821x.c | |||
| @@ -686,7 +686,7 @@ static struct pci_driver driver = { | |||
| 686 | .name = "ITE821x IDE", | 686 | .name = "ITE821x IDE", |
| 687 | .id_table = it821x_pci_tbl, | 687 | .id_table = it821x_pci_tbl, |
| 688 | .probe = it821x_init_one, | 688 | .probe = it821x_init_one, |
| 689 | .remove = it821x_remove, | 689 | .remove = __devexit_p(it821x_remove), |
| 690 | }; | 690 | }; |
| 691 | 691 | ||
| 692 | static int __init it821x_ide_init(void) | 692 | static int __init it821x_ide_init(void) |
diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c index 0f609b72f470..d477da6b5858 100644 --- a/drivers/ide/pci/pdc202xx_new.c +++ b/drivers/ide/pci/pdc202xx_new.c | |||
| @@ -566,7 +566,7 @@ static struct pci_driver driver = { | |||
| 566 | .name = "Promise_IDE", | 566 | .name = "Promise_IDE", |
| 567 | .id_table = pdc202new_pci_tbl, | 567 | .id_table = pdc202new_pci_tbl, |
| 568 | .probe = pdc202new_init_one, | 568 | .probe = pdc202new_init_one, |
| 569 | .remove = pdc202new_remove, | 569 | .remove = __devexit_p(pdc202new_remove), |
| 570 | }; | 570 | }; |
| 571 | 571 | ||
| 572 | static int __init pdc202new_ide_init(void) | 572 | static int __init pdc202new_ide_init(void) |
diff --git a/drivers/ide/pci/scc_pata.c b/drivers/ide/pci/scc_pata.c index 6cde48bba6f8..44cccd1e086a 100644 --- a/drivers/ide/pci/scc_pata.c +++ b/drivers/ide/pci/scc_pata.c | |||
| @@ -954,7 +954,7 @@ static struct pci_driver driver = { | |||
| 954 | .name = "SCC IDE", | 954 | .name = "SCC IDE", |
| 955 | .id_table = scc_pci_tbl, | 955 | .id_table = scc_pci_tbl, |
| 956 | .probe = scc_init_one, | 956 | .probe = scc_init_one, |
| 957 | .remove = scc_remove, | 957 | .remove = __devexit_p(scc_remove), |
| 958 | }; | 958 | }; |
| 959 | 959 | ||
| 960 | static int scc_ide_init(void) | 960 | static int scc_ide_init(void) |
diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c index 42eef19a18f1..681306c9d79b 100644 --- a/drivers/ide/pci/sgiioc4.c +++ b/drivers/ide/pci/sgiioc4.c | |||
| @@ -621,9 +621,9 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev) | |||
| 621 | if (!request_mem_region(cmd_phys_base, IOC4_CMD_CTL_BLK_SIZE, | 621 | if (!request_mem_region(cmd_phys_base, IOC4_CMD_CTL_BLK_SIZE, |
| 622 | DRV_NAME)) { | 622 | DRV_NAME)) { |
| 623 | printk(KERN_ERR | 623 | printk(KERN_ERR |
| 624 | "%s : %s -- ERROR, Addresses " | 624 | "%s %s: -- ERROR, Addresses " |
| 625 | "0x%p to 0x%p ALREADY in use\n", | 625 | "0x%p to 0x%p ALREADY in use\n", |
| 626 | __func__, DRV_NAME, (void *) cmd_phys_base, | 626 | DRV_NAME, pci_name(dev), (void *)cmd_phys_base, |
| 627 | (void *) cmd_phys_base + IOC4_CMD_CTL_BLK_SIZE); | 627 | (void *) cmd_phys_base + IOC4_CMD_CTL_BLK_SIZE); |
| 628 | return -ENOMEM; | 628 | return -ENOMEM; |
| 629 | } | 629 | } |
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c index 445ce6fbea33..db2b88a369ab 100644 --- a/drivers/ide/pci/siimage.c +++ b/drivers/ide/pci/siimage.c | |||
| @@ -832,7 +832,7 @@ static struct pci_driver driver = { | |||
| 832 | .name = "SiI_IDE", | 832 | .name = "SiI_IDE", |
| 833 | .id_table = siimage_pci_tbl, | 833 | .id_table = siimage_pci_tbl, |
| 834 | .probe = siimage_init_one, | 834 | .probe = siimage_init_one, |
| 835 | .remove = siimage_remove, | 835 | .remove = __devexit_p(siimage_remove), |
| 836 | }; | 836 | }; |
| 837 | 837 | ||
| 838 | static int __init siimage_ide_init(void) | 838 | static int __init siimage_ide_init(void) |
diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c index e5a4b42b4e33..5efe21d6ef97 100644 --- a/drivers/ide/pci/sis5513.c +++ b/drivers/ide/pci/sis5513.c | |||
| @@ -610,7 +610,7 @@ static struct pci_driver driver = { | |||
| 610 | .name = "SIS_IDE", | 610 | .name = "SIS_IDE", |
| 611 | .id_table = sis5513_pci_tbl, | 611 | .id_table = sis5513_pci_tbl, |
| 612 | .probe = sis5513_init_one, | 612 | .probe = sis5513_init_one, |
| 613 | .remove = sis5513_remove, | 613 | .remove = __devexit_p(sis5513_remove), |
| 614 | }; | 614 | }; |
| 615 | 615 | ||
| 616 | static int __init sis5513_ide_init(void) | 616 | static int __init sis5513_ide_init(void) |
diff --git a/drivers/ide/pci/tc86c001.c b/drivers/ide/pci/tc86c001.c index 7fc88c375e5d..927277c54ec9 100644 --- a/drivers/ide/pci/tc86c001.c +++ b/drivers/ide/pci/tc86c001.c | |||
| @@ -249,7 +249,7 @@ static struct pci_driver driver = { | |||
| 249 | .name = "TC86C001", | 249 | .name = "TC86C001", |
| 250 | .id_table = tc86c001_pci_tbl, | 250 | .id_table = tc86c001_pci_tbl, |
| 251 | .probe = tc86c001_init_one, | 251 | .probe = tc86c001_init_one, |
| 252 | .remove = tc86c001_remove, | 252 | .remove = __devexit_p(tc86c001_remove), |
| 253 | }; | 253 | }; |
| 254 | 254 | ||
| 255 | static int __init tc86c001_ide_init(void) | 255 | static int __init tc86c001_ide_init(void) |
diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c index a6b2cc83f293..94fb9ab3223f 100644 --- a/drivers/ide/pci/via82cxxx.c +++ b/drivers/ide/pci/via82cxxx.c | |||
| @@ -491,7 +491,7 @@ static struct pci_driver driver = { | |||
| 491 | .name = "VIA_IDE", | 491 | .name = "VIA_IDE", |
| 492 | .id_table = via_pci_tbl, | 492 | .id_table = via_pci_tbl, |
| 493 | .probe = via_init_one, | 493 | .probe = via_init_one, |
| 494 | .remove = via_remove, | 494 | .remove = __devexit_p(via_remove), |
| 495 | }; | 495 | }; |
| 496 | 496 | ||
| 497 | static int __init via_ide_init(void) | 497 | static int __init via_ide_init(void) |
diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c index 994a21e5a0aa..16240a789650 100644 --- a/drivers/ieee1394/nodemgr.c +++ b/drivers/ieee1394/nodemgr.c | |||
| @@ -844,7 +844,7 @@ static struct node_entry *nodemgr_create_node(octlet_t guid, struct csr1212_csr | |||
| 844 | ne->host = host; | 844 | ne->host = host; |
| 845 | ne->nodeid = nodeid; | 845 | ne->nodeid = nodeid; |
| 846 | ne->generation = generation; | 846 | ne->generation = generation; |
| 847 | ne->needs_probe = 1; | 847 | ne->needs_probe = true; |
| 848 | 848 | ||
| 849 | ne->guid = guid; | 849 | ne->guid = guid; |
| 850 | ne->guid_vendor_id = (guid >> 40) & 0xffffff; | 850 | ne->guid_vendor_id = (guid >> 40) & 0xffffff; |
| @@ -1144,7 +1144,7 @@ static void nodemgr_process_root_directory(struct host_info *hi, struct node_ent | |||
| 1144 | struct csr1212_keyval *kv, *vendor_name_kv = NULL; | 1144 | struct csr1212_keyval *kv, *vendor_name_kv = NULL; |
| 1145 | u8 last_key_id = 0; | 1145 | u8 last_key_id = 0; |
| 1146 | 1146 | ||
| 1147 | ne->needs_probe = 0; | 1147 | ne->needs_probe = false; |
| 1148 | 1148 | ||
| 1149 | csr1212_for_each_dir_entry(ne->csr, kv, ne->csr->root_kv, dentry) { | 1149 | csr1212_for_each_dir_entry(ne->csr, kv, ne->csr->root_kv, dentry) { |
| 1150 | switch (kv->key.id) { | 1150 | switch (kv->key.id) { |
| @@ -1295,7 +1295,7 @@ static void nodemgr_update_node(struct node_entry *ne, struct csr1212_csr *csr, | |||
| 1295 | nodemgr_update_bus_options(ne); | 1295 | nodemgr_update_bus_options(ne); |
| 1296 | 1296 | ||
| 1297 | /* Mark the node as new, so it gets re-probed */ | 1297 | /* Mark the node as new, so it gets re-probed */ |
| 1298 | ne->needs_probe = 1; | 1298 | ne->needs_probe = true; |
| 1299 | } else { | 1299 | } else { |
| 1300 | /* old cache is valid, so update its generation */ | 1300 | /* old cache is valid, so update its generation */ |
| 1301 | struct nodemgr_csr_info *ci = ne->csr->private; | 1301 | struct nodemgr_csr_info *ci = ne->csr->private; |
| @@ -1566,57 +1566,60 @@ static void nodemgr_probe_ne(struct host_info *hi, struct node_entry *ne, int ge | |||
| 1566 | struct probe_param { | 1566 | struct probe_param { |
| 1567 | struct host_info *hi; | 1567 | struct host_info *hi; |
| 1568 | int generation; | 1568 | int generation; |
| 1569 | bool probe_now; | ||
| 1569 | }; | 1570 | }; |
| 1570 | 1571 | ||
| 1571 | static int __nodemgr_node_probe(struct device *dev, void *data) | 1572 | static int node_probe(struct device *dev, void *data) |
| 1572 | { | 1573 | { |
| 1573 | struct probe_param *param = (struct probe_param *)data; | 1574 | struct probe_param *p = data; |
| 1574 | struct node_entry *ne; | 1575 | struct node_entry *ne; |
| 1575 | 1576 | ||
| 1577 | if (p->generation != get_hpsb_generation(p->hi->host)) | ||
| 1578 | return -EAGAIN; | ||
| 1579 | |||
| 1576 | ne = container_of(dev, struct node_entry, node_dev); | 1580 | ne = container_of(dev, struct node_entry, node_dev); |
| 1577 | if (!ne->needs_probe) | 1581 | if (ne->needs_probe == p->probe_now) |
| 1578 | nodemgr_probe_ne(param->hi, ne, param->generation); | 1582 | nodemgr_probe_ne(p->hi, ne, p->generation); |
| 1579 | if (ne->needs_probe) | ||
| 1580 | nodemgr_probe_ne(param->hi, ne, param->generation); | ||
| 1581 | return 0; | 1583 | return 0; |
| 1582 | } | 1584 | } |
| 1583 | 1585 | ||
| 1584 | static void nodemgr_node_probe(struct host_info *hi, int generation) | 1586 | static void nodemgr_node_probe(struct host_info *hi, int generation) |
| 1585 | { | 1587 | { |
| 1586 | struct hpsb_host *host = hi->host; | 1588 | struct probe_param p; |
| 1587 | struct probe_param param; | ||
| 1588 | 1589 | ||
| 1589 | param.hi = hi; | 1590 | p.hi = hi; |
| 1590 | param.generation = generation; | 1591 | p.generation = generation; |
| 1591 | /* Do some processing of the nodes we've probed. This pulls them | 1592 | /* |
| 1593 | * Do some processing of the nodes we've probed. This pulls them | ||
| 1592 | * into the sysfs layer if needed, and can result in processing of | 1594 | * into the sysfs layer if needed, and can result in processing of |
| 1593 | * unit-directories, or just updating the node and it's | 1595 | * unit-directories, or just updating the node and it's |
| 1594 | * unit-directories. | 1596 | * unit-directories. |
| 1595 | * | 1597 | * |
| 1596 | * Run updates before probes. Usually, updates are time-critical | 1598 | * Run updates before probes. Usually, updates are time-critical |
| 1597 | * while probes are time-consuming. (Well, those probes need some | 1599 | * while probes are time-consuming. |
| 1598 | * improvement...) */ | ||
| 1599 | |||
| 1600 | class_for_each_device(&nodemgr_ne_class, NULL, ¶m, | ||
| 1601 | __nodemgr_node_probe); | ||
| 1602 | |||
| 1603 | /* If we had a bus reset while we were scanning the bus, it is | ||
| 1604 | * possible that we did not probe all nodes. In that case, we | ||
| 1605 | * skip the clean up for now, since we could remove nodes that | ||
| 1606 | * were still on the bus. Another bus scan is pending which will | ||
| 1607 | * do the clean up eventually. | ||
| 1608 | * | 1600 | * |
| 1601 | * Meanwhile, another bus reset may have happened. In this case we | ||
| 1602 | * skip everything here and let the next bus scan handle it. | ||
| 1603 | * Otherwise we may prematurely remove nodes which are still there. | ||
| 1604 | */ | ||
| 1605 | p.probe_now = false; | ||
| 1606 | if (class_for_each_device(&nodemgr_ne_class, NULL, &p, node_probe) != 0) | ||
| 1607 | return; | ||
| 1608 | |||
| 1609 | p.probe_now = true; | ||
| 1610 | if (class_for_each_device(&nodemgr_ne_class, NULL, &p, node_probe) != 0) | ||
| 1611 | return; | ||
| 1612 | /* | ||
| 1609 | * Now let's tell the bus to rescan our devices. This may seem | 1613 | * Now let's tell the bus to rescan our devices. This may seem |
| 1610 | * like overhead, but the driver-model core will only scan a | 1614 | * like overhead, but the driver-model core will only scan a |
| 1611 | * device for a driver when either the device is added, or when a | 1615 | * device for a driver when either the device is added, or when a |
| 1612 | * new driver is added. A bus reset is a good reason to rescan | 1616 | * new driver is added. A bus reset is a good reason to rescan |
| 1613 | * devices that were there before. For example, an sbp2 device | 1617 | * devices that were there before. For example, an sbp2 device |
| 1614 | * may become available for login, if the host that held it was | 1618 | * may become available for login, if the host that held it was |
| 1615 | * just removed. */ | 1619 | * just removed. |
| 1616 | 1620 | */ | |
| 1617 | if (generation == get_hpsb_generation(host)) | 1621 | if (bus_rescan_devices(&ieee1394_bus_type) != 0) |
| 1618 | if (bus_rescan_devices(&ieee1394_bus_type)) | 1622 | HPSB_DEBUG("bus_rescan_devices had an error"); |
| 1619 | HPSB_DEBUG("bus_rescan_devices had an error"); | ||
| 1620 | } | 1623 | } |
| 1621 | 1624 | ||
| 1622 | static int nodemgr_send_resume_packet(struct hpsb_host *host) | 1625 | static int nodemgr_send_resume_packet(struct hpsb_host *host) |
diff --git a/drivers/ieee1394/nodemgr.h b/drivers/ieee1394/nodemgr.h index 919e92e2a955..6eb26465a84c 100644 --- a/drivers/ieee1394/nodemgr.h +++ b/drivers/ieee1394/nodemgr.h | |||
| @@ -97,7 +97,7 @@ struct node_entry { | |||
| 97 | struct hpsb_host *host; /* Host this node is attached to */ | 97 | struct hpsb_host *host; /* Host this node is attached to */ |
| 98 | nodeid_t nodeid; /* NodeID */ | 98 | nodeid_t nodeid; /* NodeID */ |
| 99 | struct bus_options busopt; /* Bus Options */ | 99 | struct bus_options busopt; /* Bus Options */ |
| 100 | int needs_probe; | 100 | bool needs_probe; |
| 101 | unsigned int generation; /* Synced with hpsb generation */ | 101 | unsigned int generation; /* Synced with hpsb generation */ |
| 102 | 102 | ||
| 103 | /* The following is read from the config rom */ | 103 | /* The following is read from the config rom */ |
diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c index 9cbf3154d243..1d6ad3435537 100644 --- a/drivers/ieee1394/sbp2.c +++ b/drivers/ieee1394/sbp2.c | |||
| @@ -731,15 +731,26 @@ static int sbp2_update(struct unit_directory *ud) | |||
| 731 | { | 731 | { |
| 732 | struct sbp2_lu *lu = ud->device.driver_data; | 732 | struct sbp2_lu *lu = ud->device.driver_data; |
| 733 | 733 | ||
| 734 | if (sbp2_reconnect_device(lu)) { | 734 | if (sbp2_reconnect_device(lu) != 0) { |
| 735 | /* Reconnect has failed. Perhaps we didn't reconnect fast | 735 | /* |
| 736 | * enough. Try a regular login, but first log out just in | 736 | * Reconnect failed. If another bus reset happened, |
| 737 | * case of any weirdness. */ | 737 | * let nodemgr proceed and call sbp2_update again later |
| 738 | * (or sbp2_remove if this node went away). | ||
| 739 | */ | ||
| 740 | if (!hpsb_node_entry_valid(lu->ne)) | ||
| 741 | return 0; | ||
| 742 | /* | ||
| 743 | * Or the target rejected the reconnect because we weren't | ||
| 744 | * fast enough. Try a regular login, but first log out | ||
| 745 | * just in case of any weirdness. | ||
| 746 | */ | ||
| 738 | sbp2_logout_device(lu); | 747 | sbp2_logout_device(lu); |
| 739 | 748 | ||
| 740 | if (sbp2_login_device(lu)) { | 749 | if (sbp2_login_device(lu) != 0) { |
| 741 | /* Login failed too, just fail, and the backend | 750 | if (!hpsb_node_entry_valid(lu->ne)) |
| 742 | * will call our sbp2_remove for us */ | 751 | return 0; |
| 752 | |||
| 753 | /* Maybe another initiator won the login. */ | ||
| 743 | SBP2_ERR("Failed to reconnect to sbp2 device!"); | 754 | SBP2_ERR("Failed to reconnect to sbp2 device!"); |
| 744 | return -EBUSY; | 755 | return -EBUSY; |
| 745 | } | 756 | } |
diff --git a/drivers/infiniband/hw/ehca/ehca_classes.h b/drivers/infiniband/hw/ehca/ehca_classes.h index 0b0618edd645..1ab919f836a8 100644 --- a/drivers/infiniband/hw/ehca/ehca_classes.h +++ b/drivers/infiniband/hw/ehca/ehca_classes.h | |||
| @@ -156,6 +156,14 @@ struct ehca_mod_qp_parm { | |||
| 156 | 156 | ||
| 157 | #define EHCA_MOD_QP_PARM_MAX 4 | 157 | #define EHCA_MOD_QP_PARM_MAX 4 |
| 158 | 158 | ||
| 159 | #define QMAP_IDX_MASK 0xFFFFULL | ||
| 160 | |||
| 161 | /* struct for tracking if cqes have been reported to the application */ | ||
| 162 | struct ehca_qmap_entry { | ||
| 163 | u16 app_wr_id; | ||
| 164 | u16 reported; | ||
| 165 | }; | ||
| 166 | |||
| 159 | struct ehca_qp { | 167 | struct ehca_qp { |
| 160 | union { | 168 | union { |
| 161 | struct ib_qp ib_qp; | 169 | struct ib_qp ib_qp; |
| @@ -165,6 +173,7 @@ struct ehca_qp { | |||
| 165 | enum ehca_ext_qp_type ext_type; | 173 | enum ehca_ext_qp_type ext_type; |
| 166 | enum ib_qp_state state; | 174 | enum ib_qp_state state; |
| 167 | struct ipz_queue ipz_squeue; | 175 | struct ipz_queue ipz_squeue; |
| 176 | struct ehca_qmap_entry *sq_map; | ||
| 168 | struct ipz_queue ipz_rqueue; | 177 | struct ipz_queue ipz_rqueue; |
| 169 | struct h_galpas galpas; | 178 | struct h_galpas galpas; |
| 170 | u32 qkey; | 179 | u32 qkey; |
diff --git a/drivers/infiniband/hw/ehca/ehca_qes.h b/drivers/infiniband/hw/ehca/ehca_qes.h index 818803057ebf..5d28e3e98a20 100644 --- a/drivers/infiniband/hw/ehca/ehca_qes.h +++ b/drivers/infiniband/hw/ehca/ehca_qes.h | |||
| @@ -213,6 +213,7 @@ struct ehca_wqe { | |||
| 213 | #define WC_STATUS_ERROR_BIT 0x80000000 | 213 | #define WC_STATUS_ERROR_BIT 0x80000000 |
| 214 | #define WC_STATUS_REMOTE_ERROR_FLAGS 0x0000F800 | 214 | #define WC_STATUS_REMOTE_ERROR_FLAGS 0x0000F800 |
| 215 | #define WC_STATUS_PURGE_BIT 0x10 | 215 | #define WC_STATUS_PURGE_BIT 0x10 |
| 216 | #define WC_SEND_RECEIVE_BIT 0x80 | ||
| 216 | 217 | ||
| 217 | struct ehca_cqe { | 218 | struct ehca_cqe { |
| 218 | u64 work_request_id; | 219 | u64 work_request_id; |
diff --git a/drivers/infiniband/hw/ehca/ehca_qp.c b/drivers/infiniband/hw/ehca/ehca_qp.c index ea13efddf175..b6bcee036734 100644 --- a/drivers/infiniband/hw/ehca/ehca_qp.c +++ b/drivers/infiniband/hw/ehca/ehca_qp.c | |||
| @@ -412,6 +412,7 @@ static struct ehca_qp *internal_create_qp( | |||
| 412 | struct ehca_shca *shca = container_of(pd->device, struct ehca_shca, | 412 | struct ehca_shca *shca = container_of(pd->device, struct ehca_shca, |
| 413 | ib_device); | 413 | ib_device); |
| 414 | struct ib_ucontext *context = NULL; | 414 | struct ib_ucontext *context = NULL; |
| 415 | u32 nr_qes; | ||
| 415 | u64 h_ret; | 416 | u64 h_ret; |
| 416 | int is_llqp = 0, has_srq = 0; | 417 | int is_llqp = 0, has_srq = 0; |
| 417 | int qp_type, max_send_sge, max_recv_sge, ret; | 418 | int qp_type, max_send_sge, max_recv_sge, ret; |
| @@ -715,6 +716,15 @@ static struct ehca_qp *internal_create_qp( | |||
| 715 | "and pages ret=%i", ret); | 716 | "and pages ret=%i", ret); |
| 716 | goto create_qp_exit2; | 717 | goto create_qp_exit2; |
| 717 | } | 718 | } |
| 719 | nr_qes = my_qp->ipz_squeue.queue_length / | ||
| 720 | my_qp->ipz_squeue.qe_size; | ||
| 721 | my_qp->sq_map = vmalloc(nr_qes * | ||
| 722 | sizeof(struct ehca_qmap_entry)); | ||
| 723 | if (!my_qp->sq_map) { | ||
| 724 | ehca_err(pd->device, "Couldn't allocate squeue " | ||
| 725 | "map ret=%i", ret); | ||
| 726 | goto create_qp_exit3; | ||
| 727 | } | ||
| 718 | } | 728 | } |
| 719 | 729 | ||
| 720 | if (HAS_RQ(my_qp)) { | 730 | if (HAS_RQ(my_qp)) { |
| @@ -724,7 +734,7 @@ static struct ehca_qp *internal_create_qp( | |||
| 724 | if (ret) { | 734 | if (ret) { |
| 725 | ehca_err(pd->device, "Couldn't initialize rqueue " | 735 | ehca_err(pd->device, "Couldn't initialize rqueue " |
| 726 | "and pages ret=%i", ret); | 736 | "and pages ret=%i", ret); |
| 727 | goto create_qp_exit3; | 737 | goto create_qp_exit4; |
| 728 | } | 738 | } |
| 729 | } | 739 | } |
| 730 | 740 | ||
| @@ -770,7 +780,7 @@ static struct ehca_qp *internal_create_qp( | |||
| 770 | if (!my_qp->mod_qp_parm) { | 780 | if (!my_qp->mod_qp_parm) { |
| 771 | ehca_err(pd->device, | 781 | ehca_err(pd->device, |
| 772 | "Could not alloc mod_qp_parm"); | 782 | "Could not alloc mod_qp_parm"); |
| 773 | goto create_qp_exit4; | 783 | goto create_qp_exit5; |
| 774 | } | 784 | } |
| 775 | } | 785 | } |
| 776 | } | 786 | } |
| @@ -780,7 +790,7 @@ static struct ehca_qp *internal_create_qp( | |||
| 780 | h_ret = ehca_define_sqp(shca, my_qp, init_attr); | 790 | h_ret = ehca_define_sqp(shca, my_qp, init_attr); |
| 781 | if (h_ret != H_SUCCESS) { | 791 | if (h_ret != H_SUCCESS) { |
| 782 | ret = ehca2ib_return_code(h_ret); | 792 | ret = ehca2ib_return_code(h_ret); |
| 783 | goto create_qp_exit5; | 793 | goto create_qp_exit6; |
| 784 | } | 794 | } |
| 785 | } | 795 | } |
| 786 | 796 | ||
| @@ -789,7 +799,7 @@ static struct ehca_qp *internal_create_qp( | |||
| 789 | if (ret) { | 799 | if (ret) { |
| 790 | ehca_err(pd->device, | 800 | ehca_err(pd->device, |
| 791 | "Couldn't assign qp to send_cq ret=%i", ret); | 801 | "Couldn't assign qp to send_cq ret=%i", ret); |
| 792 | goto create_qp_exit5; | 802 | goto create_qp_exit6; |
| 793 | } | 803 | } |
| 794 | } | 804 | } |
| 795 | 805 | ||
| @@ -815,22 +825,26 @@ static struct ehca_qp *internal_create_qp( | |||
| 815 | if (ib_copy_to_udata(udata, &resp, sizeof resp)) { | 825 | if (ib_copy_to_udata(udata, &resp, sizeof resp)) { |
| 816 | ehca_err(pd->device, "Copy to udata failed"); | 826 | ehca_err(pd->device, "Copy to udata failed"); |
| 817 | ret = -EINVAL; | 827 | ret = -EINVAL; |
| 818 | goto create_qp_exit6; | 828 | goto create_qp_exit7; |
| 819 | } | 829 | } |
| 820 | } | 830 | } |
| 821 | 831 | ||
| 822 | return my_qp; | 832 | return my_qp; |
| 823 | 833 | ||
| 824 | create_qp_exit6: | 834 | create_qp_exit7: |
| 825 | ehca_cq_unassign_qp(my_qp->send_cq, my_qp->real_qp_num); | 835 | ehca_cq_unassign_qp(my_qp->send_cq, my_qp->real_qp_num); |
| 826 | 836 | ||
| 827 | create_qp_exit5: | 837 | create_qp_exit6: |
| 828 | kfree(my_qp->mod_qp_parm); | 838 | kfree(my_qp->mod_qp_parm); |
| 829 | 839 | ||
| 830 | create_qp_exit4: | 840 | create_qp_exit5: |
| 831 | if (HAS_RQ(my_qp)) | 841 | if (HAS_RQ(my_qp)) |
| 832 | ipz_queue_dtor(my_pd, &my_qp->ipz_rqueue); | 842 | ipz_queue_dtor(my_pd, &my_qp->ipz_rqueue); |
| 833 | 843 | ||
| 844 | create_qp_exit4: | ||
| 845 | if (HAS_SQ(my_qp)) | ||
| 846 | vfree(my_qp->sq_map); | ||
| 847 | |||
| 834 | create_qp_exit3: | 848 | create_qp_exit3: |
| 835 | if (HAS_SQ(my_qp)) | 849 | if (HAS_SQ(my_qp)) |
| 836 | ipz_queue_dtor(my_pd, &my_qp->ipz_squeue); | 850 | ipz_queue_dtor(my_pd, &my_qp->ipz_squeue); |
| @@ -1534,8 +1548,6 @@ static int internal_modify_qp(struct ib_qp *ibqp, | |||
| 1534 | if (attr_mask & IB_QP_QKEY) | 1548 | if (attr_mask & IB_QP_QKEY) |
| 1535 | my_qp->qkey = attr->qkey; | 1549 | my_qp->qkey = attr->qkey; |
| 1536 | 1550 | ||
| 1537 | my_qp->state = qp_new_state; | ||
| 1538 | |||
| 1539 | modify_qp_exit2: | 1551 | modify_qp_exit2: |
| 1540 | if (squeue_locked) { /* this means: sqe -> rts */ | 1552 | if (squeue_locked) { /* this means: sqe -> rts */ |
| 1541 | spin_unlock_irqrestore(&my_qp->spinlock_s, flags); | 1553 | spin_unlock_irqrestore(&my_qp->spinlock_s, flags); |
| @@ -1551,6 +1563,8 @@ modify_qp_exit1: | |||
| 1551 | int ehca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask, | 1563 | int ehca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask, |
| 1552 | struct ib_udata *udata) | 1564 | struct ib_udata *udata) |
| 1553 | { | 1565 | { |
| 1566 | int ret = 0; | ||
| 1567 | |||
| 1554 | struct ehca_shca *shca = container_of(ibqp->device, struct ehca_shca, | 1568 | struct ehca_shca *shca = container_of(ibqp->device, struct ehca_shca, |
| 1555 | ib_device); | 1569 | ib_device); |
| 1556 | struct ehca_qp *my_qp = container_of(ibqp, struct ehca_qp, ib_qp); | 1570 | struct ehca_qp *my_qp = container_of(ibqp, struct ehca_qp, ib_qp); |
| @@ -1597,12 +1611,18 @@ int ehca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask, | |||
| 1597 | attr->qp_state, my_qp->init_attr.port_num, | 1611 | attr->qp_state, my_qp->init_attr.port_num, |
| 1598 | ibqp->qp_type); | 1612 | ibqp->qp_type); |
| 1599 | spin_unlock_irqrestore(&sport->mod_sqp_lock, flags); | 1613 | spin_unlock_irqrestore(&sport->mod_sqp_lock, flags); |
| 1600 | return 0; | 1614 | goto out; |
| 1601 | } | 1615 | } |
| 1602 | spin_unlock_irqrestore(&sport->mod_sqp_lock, flags); | 1616 | spin_unlock_irqrestore(&sport->mod_sqp_lock, flags); |
| 1603 | } | 1617 | } |
| 1604 | 1618 | ||
| 1605 | return internal_modify_qp(ibqp, attr, attr_mask, 0); | 1619 | ret = internal_modify_qp(ibqp, attr, attr_mask, 0); |
| 1620 | |||
| 1621 | out: | ||
| 1622 | if ((ret == 0) && (attr_mask & IB_QP_STATE)) | ||
| 1623 | my_qp->state = attr->qp_state; | ||
| 1624 | |||
| 1625 | return ret; | ||
| 1606 | } | 1626 | } |
| 1607 | 1627 | ||
| 1608 | void ehca_recover_sqp(struct ib_qp *sqp) | 1628 | void ehca_recover_sqp(struct ib_qp *sqp) |
| @@ -1973,8 +1993,10 @@ static int internal_destroy_qp(struct ib_device *dev, struct ehca_qp *my_qp, | |||
| 1973 | 1993 | ||
| 1974 | if (HAS_RQ(my_qp)) | 1994 | if (HAS_RQ(my_qp)) |
| 1975 | ipz_queue_dtor(my_pd, &my_qp->ipz_rqueue); | 1995 | ipz_queue_dtor(my_pd, &my_qp->ipz_rqueue); |
| 1976 | if (HAS_SQ(my_qp)) | 1996 | if (HAS_SQ(my_qp)) { |
| 1977 | ipz_queue_dtor(my_pd, &my_qp->ipz_squeue); | 1997 | ipz_queue_dtor(my_pd, &my_qp->ipz_squeue); |
| 1998 | vfree(my_qp->sq_map); | ||
| 1999 | } | ||
| 1978 | kmem_cache_free(qp_cache, my_qp); | 2000 | kmem_cache_free(qp_cache, my_qp); |
| 1979 | atomic_dec(&shca->num_qps); | 2001 | atomic_dec(&shca->num_qps); |
| 1980 | return 0; | 2002 | return 0; |
diff --git a/drivers/infiniband/hw/ehca/ehca_reqs.c b/drivers/infiniband/hw/ehca/ehca_reqs.c index 898c8b5c38dd..4426d82fe798 100644 --- a/drivers/infiniband/hw/ehca/ehca_reqs.c +++ b/drivers/infiniband/hw/ehca/ehca_reqs.c | |||
| @@ -139,6 +139,7 @@ static void trace_send_wr_ud(const struct ib_send_wr *send_wr) | |||
| 139 | static inline int ehca_write_swqe(struct ehca_qp *qp, | 139 | static inline int ehca_write_swqe(struct ehca_qp *qp, |
| 140 | struct ehca_wqe *wqe_p, | 140 | struct ehca_wqe *wqe_p, |
| 141 | const struct ib_send_wr *send_wr, | 141 | const struct ib_send_wr *send_wr, |
| 142 | u32 sq_map_idx, | ||
| 142 | int hidden) | 143 | int hidden) |
| 143 | { | 144 | { |
| 144 | u32 idx; | 145 | u32 idx; |
| @@ -157,7 +158,11 @@ static inline int ehca_write_swqe(struct ehca_qp *qp, | |||
| 157 | /* clear wqe header until sglist */ | 158 | /* clear wqe header until sglist */ |
| 158 | memset(wqe_p, 0, offsetof(struct ehca_wqe, u.ud_av.sg_list)); | 159 | memset(wqe_p, 0, offsetof(struct ehca_wqe, u.ud_av.sg_list)); |
| 159 | 160 | ||
| 160 | wqe_p->work_request_id = send_wr->wr_id; | 161 | wqe_p->work_request_id = send_wr->wr_id & ~QMAP_IDX_MASK; |
| 162 | wqe_p->work_request_id |= sq_map_idx & QMAP_IDX_MASK; | ||
| 163 | |||
| 164 | qp->sq_map[sq_map_idx].app_wr_id = send_wr->wr_id & QMAP_IDX_MASK; | ||
| 165 | qp->sq_map[sq_map_idx].reported = 0; | ||
| 161 | 166 | ||
| 162 | switch (send_wr->opcode) { | 167 | switch (send_wr->opcode) { |
| 163 | case IB_WR_SEND: | 168 | case IB_WR_SEND: |
| @@ -381,6 +386,7 @@ static inline int post_one_send(struct ehca_qp *my_qp, | |||
| 381 | { | 386 | { |
| 382 | struct ehca_wqe *wqe_p; | 387 | struct ehca_wqe *wqe_p; |
| 383 | int ret; | 388 | int ret; |
| 389 | u32 sq_map_idx; | ||
| 384 | u64 start_offset = my_qp->ipz_squeue.current_q_offset; | 390 | u64 start_offset = my_qp->ipz_squeue.current_q_offset; |
| 385 | 391 | ||
| 386 | /* get pointer next to free WQE */ | 392 | /* get pointer next to free WQE */ |
| @@ -393,8 +399,15 @@ static inline int post_one_send(struct ehca_qp *my_qp, | |||
| 393 | "qp_num=%x", my_qp->ib_qp.qp_num); | 399 | "qp_num=%x", my_qp->ib_qp.qp_num); |
| 394 | return -ENOMEM; | 400 | return -ENOMEM; |
| 395 | } | 401 | } |
| 402 | |||
| 403 | /* | ||
| 404 | * Get the index of the WQE in the send queue. The same index is used | ||
| 405 | * for writing into the sq_map. | ||
| 406 | */ | ||
| 407 | sq_map_idx = start_offset / my_qp->ipz_squeue.qe_size; | ||
| 408 | |||
| 396 | /* write a SEND WQE into the QUEUE */ | 409 | /* write a SEND WQE into the QUEUE */ |
| 397 | ret = ehca_write_swqe(my_qp, wqe_p, cur_send_wr, hidden); | 410 | ret = ehca_write_swqe(my_qp, wqe_p, cur_send_wr, sq_map_idx, hidden); |
| 398 | /* | 411 | /* |
| 399 | * if something failed, | 412 | * if something failed, |
| 400 | * reset the free entry pointer to the start value | 413 | * reset the free entry pointer to the start value |
| @@ -589,7 +602,7 @@ static inline int ehca_poll_cq_one(struct ib_cq *cq, struct ib_wc *wc) | |||
| 589 | struct ehca_qp *my_qp; | 602 | struct ehca_qp *my_qp; |
| 590 | int cqe_count = 0, is_error; | 603 | int cqe_count = 0, is_error; |
| 591 | 604 | ||
| 592 | poll_cq_one_read_cqe: | 605 | repoll: |
| 593 | cqe = (struct ehca_cqe *) | 606 | cqe = (struct ehca_cqe *) |
| 594 | ipz_qeit_get_inc_valid(&my_cq->ipz_queue); | 607 | ipz_qeit_get_inc_valid(&my_cq->ipz_queue); |
| 595 | if (!cqe) { | 608 | if (!cqe) { |
| @@ -617,7 +630,7 @@ poll_cq_one_read_cqe: | |||
| 617 | ehca_dmp(cqe, 64, "cq_num=%x qp_num=%x", | 630 | ehca_dmp(cqe, 64, "cq_num=%x qp_num=%x", |
| 618 | my_cq->cq_number, cqe->local_qp_number); | 631 | my_cq->cq_number, cqe->local_qp_number); |
| 619 | /* ignore this purged cqe */ | 632 | /* ignore this purged cqe */ |
| 620 | goto poll_cq_one_read_cqe; | 633 | goto repoll; |
| 621 | } | 634 | } |
| 622 | spin_lock_irqsave(&qp->spinlock_s, flags); | 635 | spin_lock_irqsave(&qp->spinlock_s, flags); |
| 623 | purgeflag = qp->sqerr_purgeflag; | 636 | purgeflag = qp->sqerr_purgeflag; |
| @@ -636,7 +649,7 @@ poll_cq_one_read_cqe: | |||
| 636 | * that caused sqe and turn off purge flag | 649 | * that caused sqe and turn off purge flag |
| 637 | */ | 650 | */ |
| 638 | qp->sqerr_purgeflag = 0; | 651 | qp->sqerr_purgeflag = 0; |
| 639 | goto poll_cq_one_read_cqe; | 652 | goto repoll; |
| 640 | } | 653 | } |
| 641 | } | 654 | } |
| 642 | 655 | ||
| @@ -654,8 +667,34 @@ poll_cq_one_read_cqe: | |||
| 654 | my_cq, my_cq->cq_number); | 667 | my_cq, my_cq->cq_number); |
| 655 | } | 668 | } |
| 656 | 669 | ||
| 657 | /* we got a completion! */ | 670 | read_lock(&ehca_qp_idr_lock); |
| 658 | wc->wr_id = cqe->work_request_id; | 671 | my_qp = idr_find(&ehca_qp_idr, cqe->qp_token); |
| 672 | read_unlock(&ehca_qp_idr_lock); | ||
| 673 | if (!my_qp) | ||
| 674 | goto repoll; | ||
| 675 | wc->qp = &my_qp->ib_qp; | ||
| 676 | |||
| 677 | if (!(cqe->w_completion_flags & WC_SEND_RECEIVE_BIT)) { | ||
| 678 | struct ehca_qmap_entry *qmap_entry; | ||
| 679 | /* | ||
| 680 | * We got a send completion and need to restore the original | ||
| 681 | * wr_id. | ||
| 682 | */ | ||
| 683 | qmap_entry = &my_qp->sq_map[cqe->work_request_id & | ||
| 684 | QMAP_IDX_MASK]; | ||
| 685 | |||
| 686 | if (qmap_entry->reported) { | ||
| 687 | ehca_warn(cq->device, "Double cqe on qp_num=%#x", | ||
| 688 | my_qp->real_qp_num); | ||
| 689 | /* found a double cqe, discard it and read next one */ | ||
| 690 | goto repoll; | ||
| 691 | } | ||
| 692 | wc->wr_id = cqe->work_request_id & ~QMAP_IDX_MASK; | ||
| 693 | wc->wr_id |= qmap_entry->app_wr_id; | ||
| 694 | qmap_entry->reported = 1; | ||
| 695 | } else | ||
| 696 | /* We got a receive completion. */ | ||
| 697 | wc->wr_id = cqe->work_request_id; | ||
| 659 | 698 | ||
| 660 | /* eval ib_wc_opcode */ | 699 | /* eval ib_wc_opcode */ |
| 661 | wc->opcode = ib_wc_opcode[cqe->optype]-1; | 700 | wc->opcode = ib_wc_opcode[cqe->optype]-1; |
| @@ -667,7 +706,7 @@ poll_cq_one_read_cqe: | |||
| 667 | ehca_dmp(cqe, 64, "ehca_cq=%p cq_num=%x", | 706 | ehca_dmp(cqe, 64, "ehca_cq=%p cq_num=%x", |
| 668 | my_cq, my_cq->cq_number); | 707 | my_cq, my_cq->cq_number); |
| 669 | /* update also queue adder to throw away this entry!!! */ | 708 | /* update also queue adder to throw away this entry!!! */ |
| 670 | goto poll_cq_one_exit0; | 709 | goto repoll; |
| 671 | } | 710 | } |
| 672 | 711 | ||
| 673 | /* eval ib_wc_status */ | 712 | /* eval ib_wc_status */ |
| @@ -678,11 +717,6 @@ poll_cq_one_read_cqe: | |||
| 678 | } else | 717 | } else |
| 679 | wc->status = IB_WC_SUCCESS; | 718 | wc->status = IB_WC_SUCCESS; |
| 680 | 719 | ||
| 681 | read_lock(&ehca_qp_idr_lock); | ||
| 682 | my_qp = idr_find(&ehca_qp_idr, cqe->qp_token); | ||
| 683 | wc->qp = &my_qp->ib_qp; | ||
| 684 | read_unlock(&ehca_qp_idr_lock); | ||
| 685 | |||
| 686 | wc->byte_len = cqe->nr_bytes_transferred; | 720 | wc->byte_len = cqe->nr_bytes_transferred; |
| 687 | wc->pkey_index = cqe->pkey_index; | 721 | wc->pkey_index = cqe->pkey_index; |
| 688 | wc->slid = cqe->rlid; | 722 | wc->slid = cqe->rlid; |
diff --git a/drivers/infiniband/hw/ehca/ehca_tools.h b/drivers/infiniband/hw/ehca/ehca_tools.h index ec950bf8c479..21f7d06f14ad 100644 --- a/drivers/infiniband/hw/ehca/ehca_tools.h +++ b/drivers/infiniband/hw/ehca/ehca_tools.h | |||
| @@ -54,7 +54,6 @@ | |||
| 54 | #include <linux/module.h> | 54 | #include <linux/module.h> |
| 55 | #include <linux/moduleparam.h> | 55 | #include <linux/moduleparam.h> |
| 56 | #include <linux/vmalloc.h> | 56 | #include <linux/vmalloc.h> |
| 57 | #include <linux/version.h> | ||
| 58 | #include <linux/notifier.h> | 57 | #include <linux/notifier.h> |
| 59 | #include <linux/cpu.h> | 58 | #include <linux/cpu.h> |
| 60 | #include <linux/device.h> | 59 | #include <linux/device.h> |
diff --git a/drivers/infiniband/hw/ipath/ipath_fs.c b/drivers/infiniband/hw/ipath/ipath_fs.c index 23faba9d21eb..8bb5170b4e41 100644 --- a/drivers/infiniband/hw/ipath/ipath_fs.c +++ b/drivers/infiniband/hw/ipath/ipath_fs.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | * SOFTWARE. | 31 | * SOFTWARE. |
| 32 | */ | 32 | */ |
| 33 | 33 | ||
| 34 | #include <linux/version.h> | ||
| 35 | #include <linux/module.h> | 34 | #include <linux/module.h> |
| 36 | #include <linux/fs.h> | 35 | #include <linux/fs.h> |
| 37 | #include <linux/mount.h> | 36 | #include <linux/mount.h> |
diff --git a/drivers/infiniband/hw/ipath/ipath_iba7220.c b/drivers/infiniband/hw/ipath/ipath_iba7220.c index d90f5e9a54fa..9839e20119bc 100644 --- a/drivers/infiniband/hw/ipath/ipath_iba7220.c +++ b/drivers/infiniband/hw/ipath/ipath_iba7220.c | |||
| @@ -1720,7 +1720,7 @@ static void ipath_7220_put_tid(struct ipath_devdata *dd, u64 __iomem *tidptr, | |||
| 1720 | "not 2KB aligned!\n", pa); | 1720 | "not 2KB aligned!\n", pa); |
| 1721 | return; | 1721 | return; |
| 1722 | } | 1722 | } |
| 1723 | if (pa >= (1UL << IBA7220_TID_SZ_SHIFT)) { | 1723 | if (chippa >= (1UL << IBA7220_TID_SZ_SHIFT)) { |
| 1724 | ipath_dev_err(dd, | 1724 | ipath_dev_err(dd, |
| 1725 | "BUG: Physical page address 0x%lx " | 1725 | "BUG: Physical page address 0x%lx " |
| 1726 | "larger than supported\n", pa); | 1726 | "larger than supported\n", pa); |
diff --git a/drivers/infiniband/hw/ipath/ipath_ud.c b/drivers/infiniband/hw/ipath/ipath_ud.c index 36aa242c487c..729446f56aab 100644 --- a/drivers/infiniband/hw/ipath/ipath_ud.c +++ b/drivers/infiniband/hw/ipath/ipath_ud.c | |||
| @@ -267,6 +267,7 @@ int ipath_make_ud_req(struct ipath_qp *qp) | |||
| 267 | u16 lrh0; | 267 | u16 lrh0; |
| 268 | u16 lid; | 268 | u16 lid; |
| 269 | int ret = 0; | 269 | int ret = 0; |
| 270 | int next_cur; | ||
| 270 | 271 | ||
| 271 | spin_lock_irqsave(&qp->s_lock, flags); | 272 | spin_lock_irqsave(&qp->s_lock, flags); |
| 272 | 273 | ||
| @@ -290,8 +291,9 @@ int ipath_make_ud_req(struct ipath_qp *qp) | |||
| 290 | goto bail; | 291 | goto bail; |
| 291 | 292 | ||
| 292 | wqe = get_swqe_ptr(qp, qp->s_cur); | 293 | wqe = get_swqe_ptr(qp, qp->s_cur); |
| 293 | if (++qp->s_cur >= qp->s_size) | 294 | next_cur = qp->s_cur + 1; |
| 294 | qp->s_cur = 0; | 295 | if (next_cur >= qp->s_size) |
| 296 | next_cur = 0; | ||
| 295 | 297 | ||
| 296 | /* Construct the header. */ | 298 | /* Construct the header. */ |
| 297 | ah_attr = &to_iah(wqe->wr.wr.ud.ah)->attr; | 299 | ah_attr = &to_iah(wqe->wr.wr.ud.ah)->attr; |
| @@ -315,6 +317,7 @@ int ipath_make_ud_req(struct ipath_qp *qp) | |||
| 315 | qp->s_flags |= IPATH_S_WAIT_DMA; | 317 | qp->s_flags |= IPATH_S_WAIT_DMA; |
| 316 | goto bail; | 318 | goto bail; |
| 317 | } | 319 | } |
| 320 | qp->s_cur = next_cur; | ||
| 318 | spin_unlock_irqrestore(&qp->s_lock, flags); | 321 | spin_unlock_irqrestore(&qp->s_lock, flags); |
| 319 | ipath_ud_loopback(qp, wqe); | 322 | ipath_ud_loopback(qp, wqe); |
| 320 | spin_lock_irqsave(&qp->s_lock, flags); | 323 | spin_lock_irqsave(&qp->s_lock, flags); |
| @@ -323,6 +326,7 @@ int ipath_make_ud_req(struct ipath_qp *qp) | |||
| 323 | } | 326 | } |
| 324 | } | 327 | } |
| 325 | 328 | ||
| 329 | qp->s_cur = next_cur; | ||
| 326 | extra_bytes = -wqe->length & 3; | 330 | extra_bytes = -wqe->length & 3; |
| 327 | nwords = (wqe->length + extra_bytes) >> 2; | 331 | nwords = (wqe->length + extra_bytes) >> 2; |
| 328 | 332 | ||
diff --git a/drivers/infiniband/hw/mlx4/mr.c b/drivers/infiniband/hw/mlx4/mr.c index a4cdb465cd1d..87f5c5a87b98 100644 --- a/drivers/infiniband/hw/mlx4/mr.c +++ b/drivers/infiniband/hw/mlx4/mr.c | |||
| @@ -204,6 +204,8 @@ struct ib_mr *mlx4_ib_alloc_fast_reg_mr(struct ib_pd *pd, | |||
| 204 | if (err) | 204 | if (err) |
| 205 | goto err_mr; | 205 | goto err_mr; |
| 206 | 206 | ||
| 207 | mr->ibmr.rkey = mr->ibmr.lkey = mr->mmr.key; | ||
| 208 | |||
| 207 | return &mr->ibmr; | 209 | return &mr->ibmr; |
| 208 | 210 | ||
| 209 | err_mr: | 211 | err_mr: |
diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h index 39bd897b40c6..8eb7ae96974d 100644 --- a/drivers/infiniband/hw/nes/nes.h +++ b/drivers/infiniband/hw/nes/nes.h | |||
| @@ -43,7 +43,6 @@ | |||
| 43 | #include <linux/dma-mapping.h> | 43 | #include <linux/dma-mapping.h> |
| 44 | #include <linux/workqueue.h> | 44 | #include <linux/workqueue.h> |
| 45 | #include <linux/slab.h> | 45 | #include <linux/slab.h> |
| 46 | #include <linux/version.h> | ||
| 47 | #include <asm/io.h> | 46 | #include <asm/io.h> |
| 48 | #include <linux/crc32c.h> | 47 | #include <linux/crc32c.h> |
| 49 | 48 | ||
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c index 7ebc400a4b3d..341ffedafed6 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c | |||
| @@ -202,7 +202,7 @@ static void ipoib_cm_free_rx_ring(struct net_device *dev, | |||
| 202 | dev_kfree_skb_any(rx_ring[i].skb); | 202 | dev_kfree_skb_any(rx_ring[i].skb); |
| 203 | } | 203 | } |
| 204 | 204 | ||
| 205 | kfree(rx_ring); | 205 | vfree(rx_ring); |
| 206 | } | 206 | } |
| 207 | 207 | ||
| 208 | static void ipoib_cm_start_rx_drain(struct ipoib_dev_priv *priv) | 208 | static void ipoib_cm_start_rx_drain(struct ipoib_dev_priv *priv) |
| @@ -352,9 +352,14 @@ static int ipoib_cm_nonsrq_init_rx(struct net_device *dev, struct ib_cm_id *cm_i | |||
| 352 | int ret; | 352 | int ret; |
| 353 | int i; | 353 | int i; |
| 354 | 354 | ||
| 355 | rx->rx_ring = kcalloc(ipoib_recvq_size, sizeof *rx->rx_ring, GFP_KERNEL); | 355 | rx->rx_ring = vmalloc(ipoib_recvq_size * sizeof *rx->rx_ring); |
| 356 | if (!rx->rx_ring) | 356 | if (!rx->rx_ring) { |
| 357 | printk(KERN_WARNING "%s: failed to allocate CM non-SRQ ring (%d entries)\n", | ||
| 358 | priv->ca->name, ipoib_recvq_size); | ||
| 357 | return -ENOMEM; | 359 | return -ENOMEM; |
| 360 | } | ||
| 361 | |||
| 362 | memset(rx->rx_ring, 0, ipoib_recvq_size * sizeof *rx->rx_ring); | ||
| 358 | 363 | ||
| 359 | t = kmalloc(sizeof *t, GFP_KERNEL); | 364 | t = kmalloc(sizeof *t, GFP_KERNEL); |
| 360 | if (!t) { | 365 | if (!t) { |
| @@ -1494,14 +1499,16 @@ static void ipoib_cm_create_srq(struct net_device *dev, int max_sge) | |||
| 1494 | return; | 1499 | return; |
| 1495 | } | 1500 | } |
| 1496 | 1501 | ||
| 1497 | priv->cm.srq_ring = kzalloc(ipoib_recvq_size * sizeof *priv->cm.srq_ring, | 1502 | priv->cm.srq_ring = vmalloc(ipoib_recvq_size * sizeof *priv->cm.srq_ring); |
| 1498 | GFP_KERNEL); | ||
| 1499 | if (!priv->cm.srq_ring) { | 1503 | if (!priv->cm.srq_ring) { |
| 1500 | printk(KERN_WARNING "%s: failed to allocate CM SRQ ring (%d entries)\n", | 1504 | printk(KERN_WARNING "%s: failed to allocate CM SRQ ring (%d entries)\n", |
| 1501 | priv->ca->name, ipoib_recvq_size); | 1505 | priv->ca->name, ipoib_recvq_size); |
| 1502 | ib_destroy_srq(priv->cm.srq); | 1506 | ib_destroy_srq(priv->cm.srq); |
| 1503 | priv->cm.srq = NULL; | 1507 | priv->cm.srq = NULL; |
| 1508 | return; | ||
| 1504 | } | 1509 | } |
| 1510 | |||
| 1511 | memset(priv->cm.srq_ring, 0, ipoib_recvq_size * sizeof *priv->cm.srq_ring); | ||
| 1505 | } | 1512 | } |
| 1506 | 1513 | ||
| 1507 | int ipoib_cm_dev_init(struct net_device *dev) | 1514 | int ipoib_cm_dev_init(struct net_device *dev) |
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c index f51201b17bfd..7e9e218738fa 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_main.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c | |||
| @@ -156,14 +156,8 @@ static int ipoib_stop(struct net_device *dev) | |||
| 156 | 156 | ||
| 157 | netif_stop_queue(dev); | 157 | netif_stop_queue(dev); |
| 158 | 158 | ||
| 159 | /* | 159 | ipoib_ib_dev_down(dev, 0); |
| 160 | * Now flush workqueue to make sure a scheduled task doesn't | 160 | ipoib_ib_dev_stop(dev, 0); |
| 161 | * bring our internal state back up. | ||
| 162 | */ | ||
| 163 | flush_workqueue(ipoib_workqueue); | ||
| 164 | |||
| 165 | ipoib_ib_dev_down(dev, 1); | ||
| 166 | ipoib_ib_dev_stop(dev, 1); | ||
| 167 | 161 | ||
| 168 | if (!test_bit(IPOIB_FLAG_SUBINTERFACE, &priv->flags)) { | 162 | if (!test_bit(IPOIB_FLAG_SUBINTERFACE, &priv->flags)) { |
| 169 | struct ipoib_dev_priv *cpriv; | 163 | struct ipoib_dev_priv *cpriv; |
| @@ -1314,7 +1308,7 @@ sysfs_failed: | |||
| 1314 | 1308 | ||
| 1315 | register_failed: | 1309 | register_failed: |
| 1316 | ib_unregister_event_handler(&priv->event_handler); | 1310 | ib_unregister_event_handler(&priv->event_handler); |
| 1317 | flush_scheduled_work(); | 1311 | flush_workqueue(ipoib_workqueue); |
| 1318 | 1312 | ||
| 1319 | event_failed: | 1313 | event_failed: |
| 1320 | ipoib_dev_cleanup(priv->dev); | 1314 | ipoib_dev_cleanup(priv->dev); |
| @@ -1373,7 +1367,12 @@ static void ipoib_remove_one(struct ib_device *device) | |||
| 1373 | 1367 | ||
| 1374 | list_for_each_entry_safe(priv, tmp, dev_list, list) { | 1368 | list_for_each_entry_safe(priv, tmp, dev_list, list) { |
| 1375 | ib_unregister_event_handler(&priv->event_handler); | 1369 | ib_unregister_event_handler(&priv->event_handler); |
| 1376 | flush_scheduled_work(); | 1370 | |
| 1371 | rtnl_lock(); | ||
| 1372 | dev_change_flags(priv->dev, priv->dev->flags & ~IFF_UP); | ||
| 1373 | rtnl_unlock(); | ||
| 1374 | |||
| 1375 | flush_workqueue(ipoib_workqueue); | ||
| 1377 | 1376 | ||
| 1378 | unregister_netdev(priv->dev); | 1377 | unregister_netdev(priv->dev); |
| 1379 | ipoib_dev_cleanup(priv->dev); | 1378 | ipoib_dev_cleanup(priv->dev); |
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c index 8950e9546f4e..ac33c8f3ea85 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c | |||
| @@ -392,8 +392,16 @@ static int ipoib_mcast_join_complete(int status, | |||
| 392 | &priv->mcast_task, 0); | 392 | &priv->mcast_task, 0); |
| 393 | mutex_unlock(&mcast_mutex); | 393 | mutex_unlock(&mcast_mutex); |
| 394 | 394 | ||
| 395 | if (mcast == priv->broadcast) | 395 | if (mcast == priv->broadcast) { |
| 396 | /* | ||
| 397 | * Take RTNL lock here to avoid racing with | ||
| 398 | * ipoib_stop() and turning the carrier back | ||
| 399 | * on while a device is being removed. | ||
| 400 | */ | ||
| 401 | rtnl_lock(); | ||
| 396 | netif_carrier_on(dev); | 402 | netif_carrier_on(dev); |
| 403 | rtnl_unlock(); | ||
| 404 | } | ||
| 397 | 405 | ||
| 398 | return 0; | 406 | return 0; |
| 399 | } | 407 | } |
diff --git a/drivers/infiniband/ulp/iser/iser_verbs.c b/drivers/infiniband/ulp/iser/iser_verbs.c index 63462ecca147..26ff6214a81f 100644 --- a/drivers/infiniband/ulp/iser/iser_verbs.c +++ b/drivers/infiniband/ulp/iser/iser_verbs.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | #include <linux/kernel.h> | 33 | #include <linux/kernel.h> |
| 34 | #include <linux/module.h> | 34 | #include <linux/module.h> |
| 35 | #include <linux/delay.h> | 35 | #include <linux/delay.h> |
| 36 | #include <linux/version.h> | ||
| 37 | 36 | ||
| 38 | #include "iscsi_iser.h" | 37 | #include "iscsi_iser.h" |
| 39 | 38 | ||
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c index 2d65411f6763..3524bef62be6 100644 --- a/drivers/input/evdev.c +++ b/drivers/input/evdev.c | |||
| @@ -647,6 +647,47 @@ static int str_to_user(const char *str, unsigned int maxlen, void __user *p) | |||
| 647 | return copy_to_user(p, str, len) ? -EFAULT : len; | 647 | return copy_to_user(p, str, len) ? -EFAULT : len; |
| 648 | } | 648 | } |
| 649 | 649 | ||
| 650 | #define OLD_KEY_MAX 0x1ff | ||
| 651 | static int handle_eviocgbit(struct input_dev *dev, unsigned int cmd, void __user *p, int compat_mode) | ||
| 652 | { | ||
| 653 | static unsigned long keymax_warn_time; | ||
| 654 | unsigned long *bits; | ||
| 655 | int len; | ||
| 656 | |||
| 657 | switch (_IOC_NR(cmd) & EV_MAX) { | ||
| 658 | |||
| 659 | case 0: bits = dev->evbit; len = EV_MAX; break; | ||
| 660 | case EV_KEY: bits = dev->keybit; len = KEY_MAX; break; | ||
| 661 | case EV_REL: bits = dev->relbit; len = REL_MAX; break; | ||
| 662 | case EV_ABS: bits = dev->absbit; len = ABS_MAX; break; | ||
| 663 | case EV_MSC: bits = dev->mscbit; len = MSC_MAX; break; | ||
| 664 | case EV_LED: bits = dev->ledbit; len = LED_MAX; break; | ||
| 665 | case EV_SND: bits = dev->sndbit; len = SND_MAX; break; | ||
| 666 | case EV_FF: bits = dev->ffbit; len = FF_MAX; break; | ||
| 667 | case EV_SW: bits = dev->swbit; len = SW_MAX; break; | ||
| 668 | default: return -EINVAL; | ||
| 669 | } | ||
| 670 | |||
| 671 | /* | ||
| 672 | * Work around bugs in userspace programs that like to do | ||
| 673 | * EVIOCGBIT(EV_KEY, KEY_MAX) and not realize that 'len' | ||
| 674 | * should be in bytes, not in bits. | ||
| 675 | */ | ||
| 676 | if ((_IOC_NR(cmd) & EV_MAX) == EV_KEY && _IOC_SIZE(cmd) == OLD_KEY_MAX) { | ||
| 677 | len = OLD_KEY_MAX; | ||
| 678 | if (printk_timed_ratelimit(&keymax_warn_time, 10 * 1000)) | ||
| 679 | printk(KERN_WARNING | ||
| 680 | "evdev.c(EVIOCGBIT): Suspicious buffer size %u, " | ||
| 681 | "limiting output to %zu bytes. See " | ||
| 682 | "http://userweb.kernel.org/~dtor/eviocgbit-bug.html\n", | ||
| 683 | OLD_KEY_MAX, | ||
| 684 | BITS_TO_LONGS(OLD_KEY_MAX) * sizeof(long)); | ||
| 685 | } | ||
| 686 | |||
| 687 | return bits_to_user(bits, len, _IOC_SIZE(cmd), p, compat_mode); | ||
| 688 | } | ||
| 689 | #undef OLD_KEY_MAX | ||
| 690 | |||
| 650 | static long evdev_do_ioctl(struct file *file, unsigned int cmd, | 691 | static long evdev_do_ioctl(struct file *file, unsigned int cmd, |
| 651 | void __user *p, int compat_mode) | 692 | void __user *p, int compat_mode) |
| 652 | { | 693 | { |
| @@ -733,26 +774,8 @@ static long evdev_do_ioctl(struct file *file, unsigned int cmd, | |||
| 733 | 774 | ||
| 734 | if (_IOC_DIR(cmd) == _IOC_READ) { | 775 | if (_IOC_DIR(cmd) == _IOC_READ) { |
| 735 | 776 | ||
| 736 | if ((_IOC_NR(cmd) & ~EV_MAX) == _IOC_NR(EVIOCGBIT(0, 0))) { | 777 | if ((_IOC_NR(cmd) & ~EV_MAX) == _IOC_NR(EVIOCGBIT(0, 0))) |
| 737 | 778 | return handle_eviocgbit(dev, cmd, p, compat_mode); | |
| 738 | unsigned long *bits; | ||
| 739 | int len; | ||
| 740 | |||
| 741 | switch (_IOC_NR(cmd) & EV_MAX) { | ||
| 742 | |||
| 743 | case 0: bits = dev->evbit; len = EV_MAX; break; | ||
| 744 | case EV_KEY: bits = dev->keybit; len = KEY_MAX; break; | ||
| 745 | case EV_REL: bits = dev->relbit; len = REL_MAX; break; | ||
| 746 | case EV_ABS: bits = dev->absbit; len = ABS_MAX; break; | ||
| 747 | case EV_MSC: bits = dev->mscbit; len = MSC_MAX; break; | ||
| 748 | case EV_LED: bits = dev->ledbit; len = LED_MAX; break; | ||
| 749 | case EV_SND: bits = dev->sndbit; len = SND_MAX; break; | ||
| 750 | case EV_FF: bits = dev->ffbit; len = FF_MAX; break; | ||
| 751 | case EV_SW: bits = dev->swbit; len = SW_MAX; break; | ||
| 752 | default: return -EINVAL; | ||
| 753 | } | ||
| 754 | return bits_to_user(bits, len, _IOC_SIZE(cmd), p, compat_mode); | ||
| 755 | } | ||
| 756 | 779 | ||
| 757 | if (_IOC_NR(cmd) == _IOC_NR(EVIOCGKEY(0))) | 780 | if (_IOC_NR(cmd) == _IOC_NR(EVIOCGKEY(0))) |
| 758 | return bits_to_user(dev->key, KEY_MAX, _IOC_SIZE(cmd), | 781 | return bits_to_user(dev->key, KEY_MAX, _IOC_SIZE(cmd), |
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index 87d3e7eabffd..6791be81eb29 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c | |||
| @@ -127,6 +127,7 @@ static const struct xpad_device { | |||
| 127 | { 0x0738, 0x4716, "Mad Catz Wired Xbox 360 Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX360 }, | 127 | { 0x0738, 0x4716, "Mad Catz Wired Xbox 360 Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX360 }, |
| 128 | { 0x0738, 0x6040, "Mad Catz Beat Pad Pro", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX }, | 128 | { 0x0738, 0x6040, "Mad Catz Beat Pad Pro", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX }, |
| 129 | { 0x0c12, 0x8802, "Zeroplus Xbox Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX }, | 129 | { 0x0c12, 0x8802, "Zeroplus Xbox Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX }, |
| 130 | { 0x0c12, 0x880a, "Pelican Eclipse PL-2023", MAP_DPAD_TO_AXES, XTYPE_XBOX }, | ||
| 130 | { 0x0c12, 0x8810, "Zeroplus Xbox Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX }, | 131 | { 0x0c12, 0x8810, "Zeroplus Xbox Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX }, |
| 131 | { 0x0c12, 0x9902, "HAMA VibraX - *FAULTY HARDWARE*", MAP_DPAD_TO_AXES, XTYPE_XBOX }, | 132 | { 0x0c12, 0x9902, "HAMA VibraX - *FAULTY HARDWARE*", MAP_DPAD_TO_AXES, XTYPE_XBOX }, |
| 132 | { 0x0e4c, 0x1097, "Radica Gamester Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX }, | 133 | { 0x0e4c, 0x1097, "Radica Gamester Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX }, |
diff --git a/drivers/input/keyboard/bf54x-keys.c b/drivers/input/keyboard/bf54x-keys.c index 54ed8e2e1c02..e348cfccc17a 100644 --- a/drivers/input/keyboard/bf54x-keys.c +++ b/drivers/input/keyboard/bf54x-keys.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 32 | #include <linux/version.h> | ||
| 33 | 32 | ||
| 34 | #include <linux/init.h> | 33 | #include <linux/init.h> |
| 35 | #include <linux/fs.h> | 34 | #include <linux/fs.h> |
| @@ -44,7 +43,7 @@ | |||
| 44 | #include <linux/input.h> | 43 | #include <linux/input.h> |
| 45 | 44 | ||
| 46 | #include <asm/portmux.h> | 45 | #include <asm/portmux.h> |
| 47 | #include <asm/mach/bf54x_keys.h> | 46 | #include <mach/bf54x_keys.h> |
| 48 | 47 | ||
| 49 | #define DRV_NAME "bf54x-keys" | 48 | #define DRV_NAME "bf54x-keys" |
| 50 | #define TIME_SCALE 100 /* 100 ns */ | 49 | #define TIME_SCALE 100 /* 100 ns */ |
diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c index be58730e636a..ec96b369dd7a 100644 --- a/drivers/input/keyboard/gpio_keys.c +++ b/drivers/input/keyboard/gpio_keys.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 12 | #include <linux/version.h> | ||
| 13 | 12 | ||
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 15 | #include <linux/fs.h> | 14 | #include <linux/fs.h> |
| @@ -118,6 +117,7 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev) | |||
| 118 | unsigned int type = button->type ?: EV_KEY; | 117 | unsigned int type = button->type ?: EV_KEY; |
| 119 | 118 | ||
| 120 | bdata->input = input; | 119 | bdata->input = input; |
| 120 | bdata->button = button; | ||
| 121 | setup_timer(&bdata->timer, | 121 | setup_timer(&bdata->timer, |
| 122 | gpio_check_button, (unsigned long)bdata); | 122 | gpio_check_button, (unsigned long)bdata); |
| 123 | 123 | ||
| @@ -256,7 +256,7 @@ static int gpio_keys_resume(struct platform_device *pdev) | |||
| 256 | #define gpio_keys_resume NULL | 256 | #define gpio_keys_resume NULL |
| 257 | #endif | 257 | #endif |
| 258 | 258 | ||
| 259 | struct platform_driver gpio_keys_device_driver = { | 259 | static struct platform_driver gpio_keys_device_driver = { |
| 260 | .probe = gpio_keys_probe, | 260 | .probe = gpio_keys_probe, |
| 261 | .remove = __devexit_p(gpio_keys_remove), | 261 | .remove = __devexit_p(gpio_keys_remove), |
| 262 | .suspend = gpio_keys_suspend, | 262 | .suspend = gpio_keys_suspend, |
diff --git a/drivers/input/misc/cobalt_btns.c b/drivers/input/misc/cobalt_btns.c index 6a1f48b76e32..2adf9cb265da 100644 --- a/drivers/input/misc/cobalt_btns.c +++ b/drivers/input/misc/cobalt_btns.c | |||
| @@ -148,6 +148,9 @@ static int __devexit cobalt_buttons_remove(struct platform_device *pdev) | |||
| 148 | return 0; | 148 | return 0; |
| 149 | } | 149 | } |
| 150 | 150 | ||
| 151 | MODULE_AUTHOR("Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>"); | ||
| 152 | MODULE_DESCRIPTION("Cobalt button interface driver"); | ||
| 153 | MODULE_LICENSE("GPL"); | ||
| 151 | /* work with hotplug and coldplug */ | 154 | /* work with hotplug and coldplug */ |
| 152 | MODULE_ALIAS("platform:Cobalt buttons"); | 155 | MODULE_ALIAS("platform:Cobalt buttons"); |
| 153 | 156 | ||
diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig index 7bbea097cda2..f996546fc443 100644 --- a/drivers/input/mouse/Kconfig +++ b/drivers/input/mouse/Kconfig | |||
| @@ -130,6 +130,29 @@ config MOUSE_APPLETOUCH | |||
| 130 | To compile this driver as a module, choose M here: the | 130 | To compile this driver as a module, choose M here: the |
| 131 | module will be called appletouch. | 131 | module will be called appletouch. |
| 132 | 132 | ||
| 133 | config MOUSE_BCM5974 | ||
| 134 | tristate "Apple USB BCM5974 Multitouch trackpad support" | ||
| 135 | depends on USB_ARCH_HAS_HCD | ||
| 136 | select USB | ||
| 137 | help | ||
| 138 | Say Y here if you have an Apple USB BCM5974 Multitouch | ||
| 139 | trackpad. | ||
| 140 | |||
| 141 | The BCM5974 is the multitouch trackpad found in the Macbook | ||
| 142 | Air (JAN2008) and Macbook Pro Penryn (FEB2008) laptops. | ||
| 143 | |||
| 144 | It is also found in the IPhone (2007) and Ipod Touch (2008). | ||
| 145 | |||
| 146 | This driver provides multitouch functionality together with | ||
| 147 | the synaptics X11 driver. | ||
| 148 | |||
| 149 | The interface is currently identical to the appletouch interface, | ||
| 150 | for further information, see | ||
| 151 | <file:Documentation/input/appletouch.txt>. | ||
| 152 | |||
| 153 | To compile this driver as a module, choose M here: the | ||
| 154 | module will be called bcm5974. | ||
| 155 | |||
| 133 | config MOUSE_INPORT | 156 | config MOUSE_INPORT |
| 134 | tristate "InPort/MS/ATIXL busmouse" | 157 | tristate "InPort/MS/ATIXL busmouse" |
| 135 | depends on ISA | 158 | depends on ISA |
diff --git a/drivers/input/mouse/Makefile b/drivers/input/mouse/Makefile index 9e6e36330820..d4d202516090 100644 --- a/drivers/input/mouse/Makefile +++ b/drivers/input/mouse/Makefile | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | 6 | ||
| 7 | obj-$(CONFIG_MOUSE_AMIGA) += amimouse.o | 7 | obj-$(CONFIG_MOUSE_AMIGA) += amimouse.o |
| 8 | obj-$(CONFIG_MOUSE_APPLETOUCH) += appletouch.o | 8 | obj-$(CONFIG_MOUSE_APPLETOUCH) += appletouch.o |
| 9 | obj-$(CONFIG_MOUSE_BCM5974) += bcm5974.o | ||
| 9 | obj-$(CONFIG_MOUSE_ATARI) += atarimouse.o | 10 | obj-$(CONFIG_MOUSE_ATARI) += atarimouse.o |
| 10 | obj-$(CONFIG_MOUSE_RISCPC) += rpcmouse.o | 11 | obj-$(CONFIG_MOUSE_RISCPC) += rpcmouse.o |
| 11 | obj-$(CONFIG_MOUSE_INPORT) += inport.o | 12 | obj-$(CONFIG_MOUSE_INPORT) += inport.o |
diff --git a/drivers/input/mouse/bcm5974.c b/drivers/input/mouse/bcm5974.c new file mode 100644 index 000000000000..2ec921bf3c60 --- /dev/null +++ b/drivers/input/mouse/bcm5974.c | |||
| @@ -0,0 +1,681 @@ | |||
| 1 | /* | ||
| 2 | * Apple USB BCM5974 (Macbook Air and Penryn Macbook Pro) multitouch driver | ||
| 3 | * | ||
| 4 | * Copyright (C) 2008 Henrik Rydberg (rydberg@euromail.se) | ||
| 5 | * | ||
| 6 | * The USB initialization and package decoding was made by | ||
| 7 | * Scott Shawcroft as part of the touchd user-space driver project: | ||
| 8 | * Copyright (C) 2008 Scott Shawcroft (scott.shawcroft@gmail.com) | ||
| 9 | * | ||
| 10 | * The BCM5974 driver is based on the appletouch driver: | ||
| 11 | * Copyright (C) 2001-2004 Greg Kroah-Hartman (greg@kroah.com) | ||
| 12 | * Copyright (C) 2005 Johannes Berg (johannes@sipsolutions.net) | ||
| 13 | * Copyright (C) 2005 Stelian Pop (stelian@popies.net) | ||
| 14 | * Copyright (C) 2005 Frank Arnold (frank@scirocco-5v-turbo.de) | ||
| 15 | * Copyright (C) 2005 Peter Osterlund (petero2@telia.com) | ||
| 16 | * Copyright (C) 2005 Michael Hanselmann (linux-kernel@hansmi.ch) | ||
| 17 | * Copyright (C) 2006 Nicolas Boichat (nicolas@boichat.ch) | ||
| 18 | * | ||
| 19 | * This program is free software; you can redistribute it and/or modify | ||
| 20 | * it under the terms of the GNU General Public License as published by | ||
| 21 | * the Free Software Foundation; either version 2 of the License, or | ||
| 22 | * (at your option) any later version. | ||
| 23 | * | ||
| 24 | * This program is distributed in the hope that it will be useful, | ||
| 25 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 26 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 27 | * GNU General Public License for more details. | ||
| 28 | * | ||
| 29 | * You should have received a copy of the GNU General Public License | ||
| 30 | * along with this program; if not, write to the Free Software | ||
| 31 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | ||
| 32 | * | ||
| 33 | */ | ||
| 34 | |||
| 35 | #include <linux/kernel.h> | ||
| 36 | #include <linux/errno.h> | ||
| 37 | #include <linux/init.h> | ||
| 38 | #include <linux/slab.h> | ||
| 39 | #include <linux/module.h> | ||
| 40 | #include <linux/usb/input.h> | ||
| 41 | #include <linux/hid.h> | ||
| 42 | #include <linux/mutex.h> | ||
| 43 | |||
| 44 | #define USB_VENDOR_ID_APPLE 0x05ac | ||
| 45 | |||
| 46 | /* MacbookAir, aka wellspring */ | ||
| 47 | #define USB_DEVICE_ID_APPLE_WELLSPRING_ANSI 0x0223 | ||
| 48 | #define USB_DEVICE_ID_APPLE_WELLSPRING_ISO 0x0224 | ||
| 49 | #define USB_DEVICE_ID_APPLE_WELLSPRING_JIS 0x0225 | ||
| 50 | /* MacbookProPenryn, aka wellspring2 */ | ||
| 51 | #define USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI 0x0230 | ||
| 52 | #define USB_DEVICE_ID_APPLE_WELLSPRING2_ISO 0x0231 | ||
| 53 | #define USB_DEVICE_ID_APPLE_WELLSPRING2_JIS 0x0232 | ||
| 54 | |||
| 55 | #define BCM5974_DEVICE(prod) { \ | ||
| 56 | .match_flags = (USB_DEVICE_ID_MATCH_DEVICE | \ | ||
| 57 | USB_DEVICE_ID_MATCH_INT_CLASS | \ | ||
| 58 | USB_DEVICE_ID_MATCH_INT_PROTOCOL), \ | ||
| 59 | .idVendor = USB_VENDOR_ID_APPLE, \ | ||
| 60 | .idProduct = (prod), \ | ||
| 61 | .bInterfaceClass = USB_INTERFACE_CLASS_HID, \ | ||
| 62 | .bInterfaceProtocol = USB_INTERFACE_PROTOCOL_MOUSE \ | ||
| 63 | } | ||
| 64 | |||
| 65 | /* table of devices that work with this driver */ | ||
| 66 | static const struct usb_device_id bcm5974_table [] = { | ||
| 67 | /* MacbookAir1.1 */ | ||
| 68 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING_ANSI), | ||
| 69 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING_ISO), | ||
| 70 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING_JIS), | ||
| 71 | /* MacbookProPenryn */ | ||
| 72 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI), | ||
| 73 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING2_ISO), | ||
| 74 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING2_JIS), | ||
| 75 | /* Terminating entry */ | ||
| 76 | {} | ||
| 77 | }; | ||
| 78 | MODULE_DEVICE_TABLE(usb, bcm5974_table); | ||
| 79 | |||
| 80 | MODULE_AUTHOR("Henrik Rydberg"); | ||
| 81 | MODULE_DESCRIPTION("Apple USB BCM5974 multitouch driver"); | ||
| 82 | MODULE_LICENSE("GPL"); | ||
| 83 | |||
| 84 | #define dprintk(level, format, a...)\ | ||
| 85 | { if (debug >= level) printk(KERN_DEBUG format, ##a); } | ||
| 86 | |||
| 87 | static int debug = 1; | ||
| 88 | module_param(debug, int, 0644); | ||
| 89 | MODULE_PARM_DESC(debug, "Activate debugging output"); | ||
| 90 | |||
| 91 | /* button data structure */ | ||
| 92 | struct bt_data { | ||
| 93 | u8 unknown1; /* constant */ | ||
| 94 | u8 button; /* left button */ | ||
| 95 | u8 rel_x; /* relative x coordinate */ | ||
| 96 | u8 rel_y; /* relative y coordinate */ | ||
| 97 | }; | ||
| 98 | |||
| 99 | /* trackpad header structure */ | ||
| 100 | struct tp_header { | ||
| 101 | u8 unknown1[16]; /* constants, timers, etc */ | ||
| 102 | u8 fingers; /* number of fingers on trackpad */ | ||
| 103 | u8 unknown2[9]; /* constants, timers, etc */ | ||
| 104 | }; | ||
| 105 | |||
| 106 | /* trackpad finger structure */ | ||
| 107 | struct tp_finger { | ||
| 108 | __le16 origin; /* left/right origin? */ | ||
| 109 | __le16 abs_x; /* absolute x coodinate */ | ||
| 110 | __le16 abs_y; /* absolute y coodinate */ | ||
| 111 | __le16 rel_x; /* relative x coodinate */ | ||
| 112 | __le16 rel_y; /* relative y coodinate */ | ||
| 113 | __le16 size_major; /* finger size, major axis? */ | ||
| 114 | __le16 size_minor; /* finger size, minor axis? */ | ||
| 115 | __le16 orientation; /* 16384 when point, else 15 bit angle */ | ||
| 116 | __le16 force_major; /* trackpad force, major axis? */ | ||
| 117 | __le16 force_minor; /* trackpad force, minor axis? */ | ||
| 118 | __le16 unused[3]; /* zeros */ | ||
| 119 | __le16 multi; /* one finger: varies, more fingers: constant */ | ||
| 120 | }; | ||
| 121 | |||
| 122 | /* trackpad data structure, empirically at least ten fingers */ | ||
| 123 | struct tp_data { | ||
| 124 | struct tp_header header; | ||
| 125 | struct tp_finger finger[16]; | ||
| 126 | }; | ||
| 127 | |||
| 128 | /* device-specific parameters */ | ||
| 129 | struct bcm5974_param { | ||
| 130 | int dim; /* logical dimension */ | ||
| 131 | int fuzz; /* logical noise value */ | ||
| 132 | int devmin; /* device minimum reading */ | ||
| 133 | int devmax; /* device maximum reading */ | ||
| 134 | }; | ||
| 135 | |||
| 136 | /* device-specific configuration */ | ||
| 137 | struct bcm5974_config { | ||
| 138 | int ansi, iso, jis; /* the product id of this device */ | ||
| 139 | int bt_ep; /* the endpoint of the button interface */ | ||
| 140 | int bt_datalen; /* data length of the button interface */ | ||
| 141 | int tp_ep; /* the endpoint of the trackpad interface */ | ||
| 142 | int tp_datalen; /* data length of the trackpad interface */ | ||
| 143 | struct bcm5974_param p; /* finger pressure limits */ | ||
| 144 | struct bcm5974_param w; /* finger width limits */ | ||
| 145 | struct bcm5974_param x; /* horizontal limits */ | ||
| 146 | struct bcm5974_param y; /* vertical limits */ | ||
| 147 | }; | ||
| 148 | |||
| 149 | /* logical device structure */ | ||
| 150 | struct bcm5974 { | ||
| 151 | char phys[64]; | ||
| 152 | struct usb_device *udev; /* usb device */ | ||
| 153 | struct usb_interface *intf; /* our interface */ | ||
| 154 | struct input_dev *input; /* input dev */ | ||
| 155 | struct bcm5974_config cfg; /* device configuration */ | ||
| 156 | struct mutex pm_mutex; /* serialize access to open/suspend */ | ||
| 157 | int opened; /* 1: opened, 0: closed */ | ||
| 158 | struct urb *bt_urb; /* button usb request block */ | ||
| 159 | struct bt_data *bt_data; /* button transferred data */ | ||
| 160 | struct urb *tp_urb; /* trackpad usb request block */ | ||
| 161 | struct tp_data *tp_data; /* trackpad transferred data */ | ||
| 162 | }; | ||
| 163 | |||
| 164 | /* logical dimensions */ | ||
| 165 | #define DIM_PRESSURE 256 /* maximum finger pressure */ | ||
| 166 | #define DIM_WIDTH 16 /* maximum finger width */ | ||
| 167 | #define DIM_X 1280 /* maximum trackpad x value */ | ||
| 168 | #define DIM_Y 800 /* maximum trackpad y value */ | ||
| 169 | |||
| 170 | /* logical signal quality */ | ||
| 171 | #define SN_PRESSURE 45 /* pressure signal-to-noise ratio */ | ||
| 172 | #define SN_WIDTH 100 /* width signal-to-noise ratio */ | ||
| 173 | #define SN_COORD 250 /* coordinate signal-to-noise ratio */ | ||
| 174 | |||
| 175 | /* device constants */ | ||
| 176 | static const struct bcm5974_config bcm5974_config_table[] = { | ||
| 177 | { | ||
| 178 | USB_DEVICE_ID_APPLE_WELLSPRING_ANSI, | ||
| 179 | USB_DEVICE_ID_APPLE_WELLSPRING_ISO, | ||
| 180 | USB_DEVICE_ID_APPLE_WELLSPRING_JIS, | ||
| 181 | 0x84, sizeof(struct bt_data), | ||
| 182 | 0x81, sizeof(struct tp_data), | ||
| 183 | { DIM_PRESSURE, DIM_PRESSURE / SN_PRESSURE, 0, 256 }, | ||
| 184 | { DIM_WIDTH, DIM_WIDTH / SN_WIDTH, 0, 2048 }, | ||
| 185 | { DIM_X, DIM_X / SN_COORD, -4824, 5342 }, | ||
| 186 | { DIM_Y, DIM_Y / SN_COORD, -172, 5820 } | ||
| 187 | }, | ||
| 188 | { | ||
| 189 | USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI, | ||
| 190 | USB_DEVICE_ID_APPLE_WELLSPRING2_ISO, | ||
| 191 | USB_DEVICE_ID_APPLE_WELLSPRING2_JIS, | ||
| 192 | 0x84, sizeof(struct bt_data), | ||
| 193 | 0x81, sizeof(struct tp_data), | ||
| 194 | { DIM_PRESSURE, DIM_PRESSURE / SN_PRESSURE, 0, 256 }, | ||
| 195 | { DIM_WIDTH, DIM_WIDTH / SN_WIDTH, 0, 2048 }, | ||
| 196 | { DIM_X, DIM_X / SN_COORD, -4824, 4824 }, | ||
| 197 | { DIM_Y, DIM_Y / SN_COORD, -172, 4290 } | ||
| 198 | }, | ||
| 199 | {} | ||
| 200 | }; | ||
| 201 | |||
| 202 | /* return the device-specific configuration by device */ | ||
| 203 | static const struct bcm5974_config *bcm5974_get_config(struct usb_device *udev) | ||
| 204 | { | ||
| 205 | u16 id = le16_to_cpu(udev->descriptor.idProduct); | ||
| 206 | const struct bcm5974_config *cfg; | ||
| 207 | |||
| 208 | for (cfg = bcm5974_config_table; cfg->ansi; ++cfg) | ||
| 209 | if (cfg->ansi == id || cfg->iso == id || cfg->jis == id) | ||
| 210 | return cfg; | ||
| 211 | |||
| 212 | return bcm5974_config_table; | ||
| 213 | } | ||
| 214 | |||
| 215 | /* convert 16-bit little endian to signed integer */ | ||
| 216 | static inline int raw2int(__le16 x) | ||
| 217 | { | ||
| 218 | return (signed short)le16_to_cpu(x); | ||
| 219 | } | ||
| 220 | |||
| 221 | /* scale device data to logical dimensions (asserts devmin < devmax) */ | ||
| 222 | static inline int int2scale(const struct bcm5974_param *p, int x) | ||
| 223 | { | ||
| 224 | return x * p->dim / (p->devmax - p->devmin); | ||
| 225 | } | ||
| 226 | |||
| 227 | /* all logical value ranges are [0,dim). */ | ||
| 228 | static inline int int2bound(const struct bcm5974_param *p, int x) | ||
| 229 | { | ||
| 230 | int s = int2scale(p, x); | ||
| 231 | |||
| 232 | return clamp_val(s, 0, p->dim - 1); | ||
| 233 | } | ||
| 234 | |||
| 235 | /* setup which logical events to report */ | ||
| 236 | static void setup_events_to_report(struct input_dev *input_dev, | ||
| 237 | const struct bcm5974_config *cfg) | ||
| 238 | { | ||
| 239 | __set_bit(EV_ABS, input_dev->evbit); | ||
| 240 | |||
| 241 | input_set_abs_params(input_dev, ABS_PRESSURE, | ||
| 242 | 0, cfg->p.dim, cfg->p.fuzz, 0); | ||
| 243 | input_set_abs_params(input_dev, ABS_TOOL_WIDTH, | ||
| 244 | 0, cfg->w.dim, cfg->w.fuzz, 0); | ||
| 245 | input_set_abs_params(input_dev, ABS_X, | ||
| 246 | 0, cfg->x.dim, cfg->x.fuzz, 0); | ||
| 247 | input_set_abs_params(input_dev, ABS_Y, | ||
| 248 | 0, cfg->y.dim, cfg->y.fuzz, 0); | ||
| 249 | |||
| 250 | __set_bit(EV_KEY, input_dev->evbit); | ||
| 251 | __set_bit(BTN_TOOL_FINGER, input_dev->keybit); | ||
| 252 | __set_bit(BTN_TOOL_DOUBLETAP, input_dev->keybit); | ||
| 253 | __set_bit(BTN_TOOL_TRIPLETAP, input_dev->keybit); | ||
| 254 | __set_bit(BTN_LEFT, input_dev->keybit); | ||
| 255 | } | ||
| 256 | |||
| 257 | /* report button data as logical button state */ | ||
| 258 | static int report_bt_state(struct bcm5974 *dev, int size) | ||
| 259 | { | ||
| 260 | if (size != sizeof(struct bt_data)) | ||
| 261 | return -EIO; | ||
| 262 | |||
| 263 | input_report_key(dev->input, BTN_LEFT, dev->bt_data->button); | ||
| 264 | input_sync(dev->input); | ||
| 265 | |||
| 266 | return 0; | ||
| 267 | } | ||
| 268 | |||
| 269 | /* report trackpad data as logical trackpad state */ | ||
| 270 | static int report_tp_state(struct bcm5974 *dev, int size) | ||
| 271 | { | ||
| 272 | const struct bcm5974_config *c = &dev->cfg; | ||
| 273 | const struct tp_finger *f = dev->tp_data->finger; | ||
| 274 | struct input_dev *input = dev->input; | ||
| 275 | const int fingers = (size - 26) / 28; | ||
| 276 | int p = 0, w, x, y, n = 0; | ||
| 277 | |||
| 278 | if (size < 26 || (size - 26) % 28 != 0) | ||
| 279 | return -EIO; | ||
| 280 | |||
| 281 | if (fingers) { | ||
| 282 | p = raw2int(f->force_major); | ||
| 283 | w = raw2int(f->size_major); | ||
| 284 | x = raw2int(f->abs_x); | ||
| 285 | y = raw2int(f->abs_y); | ||
| 286 | n = p > 0 ? fingers : 0; | ||
| 287 | |||
| 288 | dprintk(9, | ||
| 289 | "bcm5974: p: %+05d w: %+05d x: %+05d y: %+05d n: %d\n", | ||
| 290 | p, w, x, y, n); | ||
| 291 | |||
| 292 | input_report_abs(input, ABS_TOOL_WIDTH, int2bound(&c->w, w)); | ||
| 293 | input_report_abs(input, ABS_X, int2bound(&c->x, x - c->x.devmin)); | ||
| 294 | input_report_abs(input, ABS_Y, int2bound(&c->y, c->y.devmax - y)); | ||
| 295 | } | ||
| 296 | |||
| 297 | input_report_abs(input, ABS_PRESSURE, int2bound(&c->p, p)); | ||
| 298 | |||
| 299 | input_report_key(input, BTN_TOOL_FINGER, n == 1); | ||
| 300 | input_report_key(input, BTN_TOOL_DOUBLETAP, n == 2); | ||
| 301 | input_report_key(input, BTN_TOOL_TRIPLETAP, n > 2); | ||
| 302 | |||
| 303 | input_sync(input); | ||
| 304 | |||
| 305 | return 0; | ||
| 306 | } | ||
| 307 | |||
| 308 | /* Wellspring initialization constants */ | ||
| 309 | #define BCM5974_WELLSPRING_MODE_READ_REQUEST_ID 1 | ||
| 310 | #define BCM5974_WELLSPRING_MODE_WRITE_REQUEST_ID 9 | ||
| 311 | #define BCM5974_WELLSPRING_MODE_REQUEST_VALUE 0x300 | ||
| 312 | #define BCM5974_WELLSPRING_MODE_REQUEST_INDEX 0 | ||
| 313 | #define BCM5974_WELLSPRING_MODE_VENDOR_VALUE 0x01 | ||
| 314 | |||
| 315 | static int bcm5974_wellspring_mode(struct bcm5974 *dev) | ||
| 316 | { | ||
| 317 | char *data = kmalloc(8, GFP_KERNEL); | ||
| 318 | int retval = 0, size; | ||
| 319 | |||
| 320 | if (!data) { | ||
| 321 | err("bcm5974: out of memory"); | ||
| 322 | retval = -ENOMEM; | ||
| 323 | goto out; | ||
| 324 | } | ||
| 325 | |||
| 326 | /* read configuration */ | ||
| 327 | size = usb_control_msg(dev->udev, usb_rcvctrlpipe(dev->udev, 0), | ||
| 328 | BCM5974_WELLSPRING_MODE_READ_REQUEST_ID, | ||
| 329 | USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_INTERFACE, | ||
| 330 | BCM5974_WELLSPRING_MODE_REQUEST_VALUE, | ||
| 331 | BCM5974_WELLSPRING_MODE_REQUEST_INDEX, data, 8, 5000); | ||
| 332 | |||
| 333 | if (size != 8) { | ||
| 334 | err("bcm5974: could not read from device"); | ||
| 335 | retval = -EIO; | ||
| 336 | goto out; | ||
| 337 | } | ||
| 338 | |||
| 339 | /* apply the mode switch */ | ||
| 340 | data[0] = BCM5974_WELLSPRING_MODE_VENDOR_VALUE; | ||
| 341 | |||
| 342 | /* write configuration */ | ||
| 343 | size = usb_control_msg(dev->udev, usb_sndctrlpipe(dev->udev, 0), | ||
| 344 | BCM5974_WELLSPRING_MODE_WRITE_REQUEST_ID, | ||
| 345 | USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE, | ||
| 346 | BCM5974_WELLSPRING_MODE_REQUEST_VALUE, | ||
| 347 | BCM5974_WELLSPRING_MODE_REQUEST_INDEX, data, 8, 5000); | ||
| 348 | |||
| 349 | if (size != 8) { | ||
| 350 | err("bcm5974: could not write to device"); | ||
| 351 | retval = -EIO; | ||
| 352 | goto out; | ||
| 353 | } | ||
| 354 | |||
| 355 | dprintk(2, "bcm5974: switched to wellspring mode.\n"); | ||
| 356 | |||
| 357 | out: | ||
| 358 | kfree(data); | ||
| 359 | return retval; | ||
| 360 | } | ||
| 361 | |||
| 362 | static void bcm5974_irq_button(struct urb *urb) | ||
| 363 | { | ||
| 364 | struct bcm5974 *dev = urb->context; | ||
| 365 | int error; | ||
| 366 | |||
| 367 | switch (urb->status) { | ||
| 368 | case 0: | ||
| 369 | break; | ||
| 370 | case -EOVERFLOW: | ||
| 371 | case -ECONNRESET: | ||
| 372 | case -ENOENT: | ||
| 373 | case -ESHUTDOWN: | ||
| 374 | dbg("bcm5974: button urb shutting down: %d", urb->status); | ||
| 375 | return; | ||
| 376 | default: | ||
| 377 | dbg("bcm5974: button urb status: %d", urb->status); | ||
| 378 | goto exit; | ||
| 379 | } | ||
| 380 | |||
| 381 | if (report_bt_state(dev, dev->bt_urb->actual_length)) | ||
| 382 | dprintk(1, "bcm5974: bad button package, length: %d\n", | ||
| 383 | dev->bt_urb->actual_length); | ||
| 384 | |||
| 385 | exit: | ||
| 386 | error = usb_submit_urb(dev->bt_urb, GFP_ATOMIC); | ||
| 387 | if (error) | ||
| 388 | err("bcm5974: button urb failed: %d", error); | ||
| 389 | } | ||
| 390 | |||
| 391 | static void bcm5974_irq_trackpad(struct urb *urb) | ||
| 392 | { | ||
| 393 | struct bcm5974 *dev = urb->context; | ||
| 394 | int error; | ||
| 395 | |||
| 396 | switch (urb->status) { | ||
| 397 | case 0: | ||
| 398 | break; | ||
| 399 | case -EOVERFLOW: | ||
| 400 | case -ECONNRESET: | ||
| 401 | case -ENOENT: | ||
| 402 | case -ESHUTDOWN: | ||
| 403 | dbg("bcm5974: trackpad urb shutting down: %d", urb->status); | ||
| 404 | return; | ||
| 405 | default: | ||
| 406 | dbg("bcm5974: trackpad urb status: %d", urb->status); | ||
| 407 | goto exit; | ||
| 408 | } | ||
| 409 | |||
| 410 | /* control response ignored */ | ||
| 411 | if (dev->tp_urb->actual_length == 2) | ||
| 412 | goto exit; | ||
| 413 | |||
| 414 | if (report_tp_state(dev, dev->tp_urb->actual_length)) | ||
| 415 | dprintk(1, "bcm5974: bad trackpad package, length: %d\n", | ||
| 416 | dev->tp_urb->actual_length); | ||
| 417 | |||
| 418 | exit: | ||
| 419 | error = usb_submit_urb(dev->tp_urb, GFP_ATOMIC); | ||
| 420 | if (error) | ||
| 421 | err("bcm5974: trackpad urb failed: %d", error); | ||
| 422 | } | ||
| 423 | |||
| 424 | /* | ||
| 425 | * The Wellspring trackpad, like many recent Apple trackpads, share | ||
| 426 | * the usb device with the keyboard. Since keyboards are usually | ||
| 427 | * handled by the HID system, the device ends up being handled by two | ||
| 428 | * modules. Setting up the device therefore becomes slightly | ||
| 429 | * complicated. To enable multitouch features, a mode switch is | ||
| 430 | * required, which is usually applied via the control interface of the | ||
| 431 | * device. It can be argued where this switch should take place. In | ||
| 432 | * some drivers, like appletouch, the switch is made during | ||
| 433 | * probe. However, the hid module may also alter the state of the | ||
| 434 | * device, resulting in trackpad malfunction under certain | ||
| 435 | * circumstances. To get around this problem, there is at least one | ||
| 436 | * example that utilizes the USB_QUIRK_RESET_RESUME quirk in order to | ||
| 437 | * recieve a reset_resume request rather than the normal resume. | ||
| 438 | * Since the implementation of reset_resume is equal to mode switch | ||
| 439 | * plus start_traffic, it seems easier to always do the switch when | ||
| 440 | * starting traffic on the device. | ||
| 441 | */ | ||
| 442 | static int bcm5974_start_traffic(struct bcm5974 *dev) | ||
| 443 | { | ||
| 444 | if (bcm5974_wellspring_mode(dev)) { | ||
| 445 | dprintk(1, "bcm5974: mode switch failed\n"); | ||
| 446 | goto error; | ||
| 447 | } | ||
| 448 | |||
| 449 | if (usb_submit_urb(dev->bt_urb, GFP_KERNEL)) | ||
| 450 | goto error; | ||
| 451 | |||
| 452 | if (usb_submit_urb(dev->tp_urb, GFP_KERNEL)) | ||
| 453 | goto err_kill_bt; | ||
| 454 | |||
| 455 | return 0; | ||
| 456 | |||
| 457 | err_kill_bt: | ||
| 458 | usb_kill_urb(dev->bt_urb); | ||
| 459 | error: | ||
| 460 | return -EIO; | ||
| 461 | } | ||
| 462 | |||
| 463 | static void bcm5974_pause_traffic(struct bcm5974 *dev) | ||
| 464 | { | ||
| 465 | usb_kill_urb(dev->tp_urb); | ||
| 466 | usb_kill_urb(dev->bt_urb); | ||
| 467 | } | ||
| 468 | |||
| 469 | /* | ||
| 470 | * The code below implements open/close and manual suspend/resume. | ||
| 471 | * All functions may be called in random order. | ||
| 472 | * | ||
| 473 | * Opening a suspended device fails with EACCES - permission denied. | ||
| 474 | * | ||
| 475 | * Failing a resume leaves the device resumed but closed. | ||
| 476 | */ | ||
| 477 | static int bcm5974_open(struct input_dev *input) | ||
| 478 | { | ||
| 479 | struct bcm5974 *dev = input_get_drvdata(input); | ||
| 480 | int error; | ||
| 481 | |||
| 482 | error = usb_autopm_get_interface(dev->intf); | ||
| 483 | if (error) | ||
| 484 | return error; | ||
| 485 | |||
| 486 | mutex_lock(&dev->pm_mutex); | ||
| 487 | |||
| 488 | error = bcm5974_start_traffic(dev); | ||
| 489 | if (!error) | ||
| 490 | dev->opened = 1; | ||
| 491 | |||
| 492 | mutex_unlock(&dev->pm_mutex); | ||
| 493 | |||
| 494 | if (error) | ||
| 495 | usb_autopm_put_interface(dev->intf); | ||
| 496 | |||
| 497 | return error; | ||
| 498 | } | ||
| 499 | |||
| 500 | static void bcm5974_close(struct input_dev *input) | ||
| 501 | { | ||
| 502 | struct bcm5974 *dev = input_get_drvdata(input); | ||
| 503 | |||
| 504 | mutex_lock(&dev->pm_mutex); | ||
| 505 | |||
| 506 | bcm5974_pause_traffic(dev); | ||
| 507 | dev->opened = 0; | ||
| 508 | |||
| 509 | mutex_unlock(&dev->pm_mutex); | ||
| 510 | |||
| 511 | usb_autopm_put_interface(dev->intf); | ||
| 512 | } | ||
| 513 | |||
| 514 | static int bcm5974_suspend(struct usb_interface *iface, pm_message_t message) | ||
| 515 | { | ||
| 516 | struct bcm5974 *dev = usb_get_intfdata(iface); | ||
| 517 | |||
| 518 | mutex_lock(&dev->pm_mutex); | ||
| 519 | |||
| 520 | if (dev->opened) | ||
| 521 | bcm5974_pause_traffic(dev); | ||
| 522 | |||
| 523 | mutex_unlock(&dev->pm_mutex); | ||
| 524 | |||
| 525 | return 0; | ||
| 526 | } | ||
| 527 | |||
| 528 | static int bcm5974_resume(struct usb_interface *iface) | ||
| 529 | { | ||
| 530 | struct bcm5974 *dev = usb_get_intfdata(iface); | ||
| 531 | int error = 0; | ||
| 532 | |||
| 533 | mutex_lock(&dev->pm_mutex); | ||
| 534 | |||
| 535 | if (dev->opened) | ||
| 536 | error = bcm5974_start_traffic(dev); | ||
| 537 | |||
| 538 | mutex_unlock(&dev->pm_mutex); | ||
| 539 | |||
| 540 | return error; | ||
| 541 | } | ||
| 542 | |||
| 543 | static int bcm5974_probe(struct usb_interface *iface, | ||
| 544 | const struct usb_device_id *id) | ||
| 545 | { | ||
| 546 | struct usb_device *udev = interface_to_usbdev(iface); | ||
| 547 | const struct bcm5974_config *cfg; | ||
| 548 | struct bcm5974 *dev; | ||
| 549 | struct input_dev *input_dev; | ||
| 550 | int error = -ENOMEM; | ||
| 551 | |||
| 552 | /* find the product index */ | ||
| 553 | cfg = bcm5974_get_config(udev); | ||
| 554 | |||
| 555 | /* allocate memory for our device state and initialize it */ | ||
| 556 | dev = kzalloc(sizeof(struct bcm5974), GFP_KERNEL); | ||
| 557 | input_dev = input_allocate_device(); | ||
| 558 | if (!dev || !input_dev) { | ||
| 559 | err("bcm5974: out of memory"); | ||
| 560 | goto err_free_devs; | ||
| 561 | } | ||
| 562 | |||
| 563 | dev->udev = udev; | ||
| 564 | dev->intf = iface; | ||
| 565 | dev->input = input_dev; | ||
| 566 | dev->cfg = *cfg; | ||
| 567 | mutex_init(&dev->pm_mutex); | ||
| 568 | |||
| 569 | /* setup urbs */ | ||
| 570 | dev->bt_urb = usb_alloc_urb(0, GFP_KERNEL); | ||
| 571 | if (!dev->bt_urb) | ||
| 572 | goto err_free_devs; | ||
| 573 | |||
| 574 | dev->tp_urb = usb_alloc_urb(0, GFP_KERNEL); | ||
| 575 | if (!dev->tp_urb) | ||
| 576 | goto err_free_bt_urb; | ||
| 577 | |||
| 578 | dev->bt_data = usb_buffer_alloc(dev->udev, | ||
| 579 | dev->cfg.bt_datalen, GFP_KERNEL, | ||
| 580 | &dev->bt_urb->transfer_dma); | ||
| 581 | if (!dev->bt_data) | ||
| 582 | goto err_free_urb; | ||
| 583 | |||
| 584 | dev->tp_data = usb_buffer_alloc(dev->udev, | ||
| 585 | dev->cfg.tp_datalen, GFP_KERNEL, | ||
| 586 | &dev->tp_urb->transfer_dma); | ||
| 587 | if (!dev->tp_data) | ||
| 588 | goto err_free_bt_buffer; | ||
| 589 | |||
| 590 | usb_fill_int_urb(dev->bt_urb, udev, | ||
| 591 | usb_rcvintpipe(udev, cfg->bt_ep), | ||
| 592 | dev->bt_data, dev->cfg.bt_datalen, | ||
| 593 | bcm5974_irq_button, dev, 1); | ||
| 594 | |||
| 595 | usb_fill_int_urb(dev->tp_urb, udev, | ||
| 596 | usb_rcvintpipe(udev, cfg->tp_ep), | ||
| 597 | dev->tp_data, dev->cfg.tp_datalen, | ||
| 598 | bcm5974_irq_trackpad, dev, 1); | ||
| 599 | |||
| 600 | /* create bcm5974 device */ | ||
| 601 | usb_make_path(udev, dev->phys, sizeof(dev->phys)); | ||
| 602 | strlcat(dev->phys, "/input0", sizeof(dev->phys)); | ||
| 603 | |||
| 604 | input_dev->name = "bcm5974"; | ||
| 605 | input_dev->phys = dev->phys; | ||
| 606 | usb_to_input_id(dev->udev, &input_dev->id); | ||
| 607 | input_dev->dev.parent = &iface->dev; | ||
| 608 | |||
| 609 | input_set_drvdata(input_dev, dev); | ||
| 610 | |||
| 611 | input_dev->open = bcm5974_open; | ||
| 612 | input_dev->close = bcm5974_close; | ||
| 613 | |||
| 614 | setup_events_to_report(input_dev, cfg); | ||
| 615 | |||
| 616 | error = input_register_device(dev->input); | ||
| 617 | if (error) | ||
| 618 | goto err_free_buffer; | ||
| 619 | |||
| 620 | /* save our data pointer in this interface device */ | ||
| 621 | usb_set_intfdata(iface, dev); | ||
| 622 | |||
| 623 | return 0; | ||
| 624 | |||
| 625 | err_free_buffer: | ||
| 626 | usb_buffer_free(dev->udev, dev->cfg.tp_datalen, | ||
| 627 | dev->tp_data, dev->tp_urb->transfer_dma); | ||
| 628 | err_free_bt_buffer: | ||
| 629 | usb_buffer_free(dev->udev, dev->cfg.bt_datalen, | ||
| 630 | dev->bt_data, dev->bt_urb->transfer_dma); | ||
| 631 | err_free_urb: | ||
| 632 | usb_free_urb(dev->tp_urb); | ||
| 633 | err_free_bt_urb: | ||
| 634 | usb_free_urb(dev->bt_urb); | ||
| 635 | err_free_devs: | ||
| 636 | usb_set_intfdata(iface, NULL); | ||
| 637 | input_free_device(input_dev); | ||
| 638 | kfree(dev); | ||
| 639 | return error; | ||
| 640 | } | ||
| 641 | |||
| 642 | static void bcm5974_disconnect(struct usb_interface *iface) | ||
| 643 | { | ||
| 644 | struct bcm5974 *dev = usb_get_intfdata(iface); | ||
| 645 | |||
| 646 | usb_set_intfdata(iface, NULL); | ||
| 647 | |||
| 648 | input_unregister_device(dev->input); | ||
| 649 | usb_buffer_free(dev->udev, dev->cfg.tp_datalen, | ||
| 650 | dev->tp_data, dev->tp_urb->transfer_dma); | ||
| 651 | usb_buffer_free(dev->udev, dev->cfg.bt_datalen, | ||
| 652 | dev->bt_data, dev->bt_urb->transfer_dma); | ||
| 653 | usb_free_urb(dev->tp_urb); | ||
| 654 | usb_free_urb(dev->bt_urb); | ||
| 655 | kfree(dev); | ||
| 656 | } | ||
| 657 | |||
| 658 | static struct usb_driver bcm5974_driver = { | ||
| 659 | .name = "bcm5974", | ||
| 660 | .probe = bcm5974_probe, | ||
| 661 | .disconnect = bcm5974_disconnect, | ||
| 662 | .suspend = bcm5974_suspend, | ||
| 663 | .resume = bcm5974_resume, | ||
| 664 | .reset_resume = bcm5974_resume, | ||
| 665 | .id_table = bcm5974_table, | ||
| 666 | .supports_autosuspend = 1, | ||
| 667 | }; | ||
| 668 | |||
| 669 | static int __init bcm5974_init(void) | ||
| 670 | { | ||
| 671 | return usb_register(&bcm5974_driver); | ||
| 672 | } | ||
| 673 | |||
| 674 | static void __exit bcm5974_exit(void) | ||
| 675 | { | ||
| 676 | usb_deregister(&bcm5974_driver); | ||
| 677 | } | ||
| 678 | |||
| 679 | module_init(bcm5974_init); | ||
| 680 | module_exit(bcm5974_exit); | ||
| 681 | |||
diff --git a/drivers/input/mouse/gpio_mouse.c b/drivers/input/mouse/gpio_mouse.c index 339290184871..72cf5e33790e 100644 --- a/drivers/input/mouse/gpio_mouse.c +++ b/drivers/input/mouse/gpio_mouse.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/init.h> | 11 | #include <linux/init.h> |
| 12 | #include <linux/version.h> | ||
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/platform_device.h> | 13 | #include <linux/platform_device.h> |
| 15 | #include <linux/input-polldev.h> | 14 | #include <linux/input-polldev.h> |
diff --git a/drivers/input/serio/i8042-sparcio.h b/drivers/input/serio/i8042-sparcio.h index 66bafe308b0c..692a79ec2a22 100644 --- a/drivers/input/serio/i8042-sparcio.h +++ b/drivers/input/serio/i8042-sparcio.h | |||
| @@ -1,10 +1,11 @@ | |||
| 1 | #ifndef _I8042_SPARCIO_H | 1 | #ifndef _I8042_SPARCIO_H |
| 2 | #define _I8042_SPARCIO_H | 2 | #define _I8042_SPARCIO_H |
| 3 | 3 | ||
| 4 | #include <linux/of_device.h> | ||
| 5 | |||
| 4 | #include <asm/io.h> | 6 | #include <asm/io.h> |
| 5 | #include <asm/oplib.h> | 7 | #include <asm/oplib.h> |
| 6 | #include <asm/prom.h> | 8 | #include <asm/prom.h> |
| 7 | #include <asm/of_device.h> | ||
| 8 | 9 | ||
| 9 | static int i8042_kbd_irq = -1; | 10 | static int i8042_kbd_irq = -1; |
| 10 | static int i8042_aux_irq = -1; | 11 | static int i8042_aux_irq = -1; |
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h index fe732a574ec2..3282b741e246 100644 --- a/drivers/input/serio/i8042-x86ia64io.h +++ b/drivers/input/serio/i8042-x86ia64io.h | |||
| @@ -394,6 +394,13 @@ static struct dmi_system_id __initdata i8042_dmi_dritek_table[] = { | |||
| 394 | DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 2490"), | 394 | DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 2490"), |
| 395 | }, | 395 | }, |
| 396 | }, | 396 | }, |
| 397 | { | ||
| 398 | .ident = "Acer TravelMate 4280", | ||
| 399 | .matches = { | ||
| 400 | DMI_MATCH(DMI_SYS_VENDOR, "Acer"), | ||
| 401 | DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 4280"), | ||
| 402 | }, | ||
| 403 | }, | ||
| 397 | { } | 404 | { } |
| 398 | }; | 405 | }; |
| 399 | 406 | ||
diff --git a/drivers/input/serio/xilinx_ps2.c b/drivers/input/serio/xilinx_ps2.c index 0ed044d5e685..765007899d9a 100644 --- a/drivers/input/serio/xilinx_ps2.c +++ b/drivers/input/serio/xilinx_ps2.c | |||
| @@ -269,8 +269,8 @@ static int xps2_setup(struct device *dev, struct resource *regs_res, | |||
| 269 | * we have the PS2 in a good state */ | 269 | * we have the PS2 in a good state */ |
| 270 | out_be32(drvdata->base_address + XPS2_SRST_OFFSET, XPS2_SRST_RESET); | 270 | out_be32(drvdata->base_address + XPS2_SRST_OFFSET, XPS2_SRST_RESET); |
| 271 | 271 | ||
| 272 | dev_info(dev, "Xilinx PS2 at 0x%08X mapped to 0x%08X, irq=%d\n", | 272 | dev_info(dev, "Xilinx PS2 at 0x%08X mapped to 0x%p, irq=%d\n", |
| 273 | drvdata->phys_addr, (u32)drvdata->base_address, drvdata->irq); | 273 | drvdata->phys_addr, drvdata->base_address, drvdata->irq); |
| 274 | 274 | ||
| 275 | serio = &drvdata->serio; | 275 | serio = &drvdata->serio; |
| 276 | serio->id.type = SERIO_8042; | 276 | serio->id.type = SERIO_8042; |
diff --git a/drivers/input/tablet/gtco.c b/drivers/input/tablet/gtco.c index b9b7a98bc5a5..7df0228e836e 100644 --- a/drivers/input/tablet/gtco.c +++ b/drivers/input/tablet/gtco.c | |||
| @@ -64,7 +64,6 @@ Scott Hill shill@gtcocalcomp.com | |||
| 64 | #include <asm/byteorder.h> | 64 | #include <asm/byteorder.h> |
| 65 | 65 | ||
| 66 | 66 | ||
| 67 | #include <linux/version.h> | ||
| 68 | #include <linux/usb/input.h> | 67 | #include <linux/usb/input.h> |
| 69 | 68 | ||
| 70 | /* Version with a Major number of 2 is for kernel inclusion only. */ | 69 | /* Version with a Major number of 2 is for kernel inclusion only. */ |
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig index 6e60a97a234c..25287e80e236 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig | |||
| @@ -249,29 +249,26 @@ config TOUCHSCREEN_WM97XX | |||
| 249 | config TOUCHSCREEN_WM9705 | 249 | config TOUCHSCREEN_WM9705 |
| 250 | bool "WM9705 Touchscreen interface support" | 250 | bool "WM9705 Touchscreen interface support" |
| 251 | depends on TOUCHSCREEN_WM97XX | 251 | depends on TOUCHSCREEN_WM97XX |
| 252 | default y | ||
| 252 | help | 253 | help |
| 253 | Say Y here if you have a Wolfson Microelectronics WM9705 | 254 | Say Y here to enable support for the Wolfson Microelectronics |
| 254 | touchscreen controller connected to your system. | 255 | WM9705 touchscreen controller. |
| 255 | |||
| 256 | If unsure, say N. | ||
| 257 | 256 | ||
| 258 | config TOUCHSCREEN_WM9712 | 257 | config TOUCHSCREEN_WM9712 |
| 259 | bool "WM9712 Touchscreen interface support" | 258 | bool "WM9712 Touchscreen interface support" |
| 260 | depends on TOUCHSCREEN_WM97XX | 259 | depends on TOUCHSCREEN_WM97XX |
| 260 | default y | ||
| 261 | help | 261 | help |
| 262 | Say Y here if you have a Wolfson Microelectronics WM9712 | 262 | Say Y here to enable support for the Wolfson Microelectronics |
| 263 | touchscreen controller connected to your system. | 263 | WM9712 touchscreen controller. |
| 264 | |||
| 265 | If unsure, say N. | ||
| 266 | 264 | ||
| 267 | config TOUCHSCREEN_WM9713 | 265 | config TOUCHSCREEN_WM9713 |
| 268 | bool "WM9713 Touchscreen interface support" | 266 | bool "WM9713 Touchscreen interface support" |
| 269 | depends on TOUCHSCREEN_WM97XX | 267 | depends on TOUCHSCREEN_WM97XX |
| 268 | default y | ||
| 270 | help | 269 | help |
| 271 | Say Y here if you have a Wolfson Microelectronics WM9713 touchscreen | 270 | Say Y here to enable support for the Wolfson Microelectronics |
| 272 | controller connected to your system. | 271 | WM9713 touchscreen controller. |
| 273 | |||
| 274 | If unsure, say N. | ||
| 275 | 272 | ||
| 276 | config TOUCHSCREEN_WM97XX_MAINSTONE | 273 | config TOUCHSCREEN_WM97XX_MAINSTONE |
| 277 | tristate "WM97xx Mainstone accelerated touch" | 274 | tristate "WM97xx Mainstone accelerated touch" |
diff --git a/drivers/input/touchscreen/mainstone-wm97xx.c b/drivers/input/touchscreen/mainstone-wm97xx.c index 283f93a0cee2..37a555f37306 100644 --- a/drivers/input/touchscreen/mainstone-wm97xx.c +++ b/drivers/input/touchscreen/mainstone-wm97xx.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | 25 | ||
| 26 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 27 | #include <linux/moduleparam.h> | 27 | #include <linux/moduleparam.h> |
| 28 | #include <linux/version.h> | ||
| 29 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
| 30 | #include <linux/init.h> | 29 | #include <linux/init.h> |
| 31 | #include <linux/delay.h> | 30 | #include <linux/delay.h> |
diff --git a/drivers/input/touchscreen/migor_ts.c b/drivers/input/touchscreen/migor_ts.c index c1cd99d58981..504ca11749a1 100644 --- a/drivers/input/touchscreen/migor_ts.c +++ b/drivers/input/touchscreen/migor_ts.c | |||
| @@ -173,7 +173,7 @@ static int migor_ts_probe(struct i2c_client *client, | |||
| 173 | input_set_abs_params(input, ABS_X, 95, 955, 0, 0); | 173 | input_set_abs_params(input, ABS_X, 95, 955, 0, 0); |
| 174 | input_set_abs_params(input, ABS_Y, 85, 935, 0, 0); | 174 | input_set_abs_params(input, ABS_Y, 85, 935, 0, 0); |
| 175 | 175 | ||
| 176 | input->name = client->driver_name; | 176 | input->name = client->name; |
| 177 | input->id.bustype = BUS_I2C; | 177 | input->id.bustype = BUS_I2C; |
| 178 | input->dev.parent = &client->dev; | 178 | input->dev.parent = &client->dev; |
| 179 | 179 | ||
| @@ -192,7 +192,7 @@ static int migor_ts_probe(struct i2c_client *client, | |||
| 192 | goto err1; | 192 | goto err1; |
| 193 | 193 | ||
| 194 | error = request_irq(priv->irq, migor_ts_isr, IRQF_TRIGGER_LOW, | 194 | error = request_irq(priv->irq, migor_ts_isr, IRQF_TRIGGER_LOW, |
| 195 | client->driver_name, priv); | 195 | client->name, priv); |
| 196 | if (error) { | 196 | if (error) { |
| 197 | dev_err(&client->dev, "Unable to request touchscreen IRQ.\n"); | 197 | dev_err(&client->dev, "Unable to request touchscreen IRQ.\n"); |
| 198 | goto err2; | 198 | goto err2; |
| @@ -224,12 +224,19 @@ static int migor_ts_remove(struct i2c_client *client) | |||
| 224 | return 0; | 224 | return 0; |
| 225 | } | 225 | } |
| 226 | 226 | ||
| 227 | static const struct i2c_device_id migor_ts_id[] = { | ||
| 228 | { "migor_ts", 0 }, | ||
| 229 | { } | ||
| 230 | }; | ||
| 231 | MODULE_DEVICE_TABLE(i2c, migor_ts); | ||
| 232 | |||
| 227 | static struct i2c_driver migor_ts_driver = { | 233 | static struct i2c_driver migor_ts_driver = { |
| 228 | .driver = { | 234 | .driver = { |
| 229 | .name = "migor_ts", | 235 | .name = "migor_ts", |
| 230 | }, | 236 | }, |
| 231 | .probe = migor_ts_probe, | 237 | .probe = migor_ts_probe, |
| 232 | .remove = migor_ts_remove, | 238 | .remove = migor_ts_remove, |
| 239 | .id_table = migor_ts_id, | ||
| 233 | }; | 240 | }; |
| 234 | 241 | ||
| 235 | static int __init migor_ts_init(void) | 242 | static int __init migor_ts_init(void) |
diff --git a/drivers/input/touchscreen/wm9705.c b/drivers/input/touchscreen/wm9705.c index 978e1a13ffc7..372efbc694ff 100644 --- a/drivers/input/touchscreen/wm9705.c +++ b/drivers/input/touchscreen/wm9705.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | 17 | ||
| 18 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 19 | #include <linux/moduleparam.h> | 19 | #include <linux/moduleparam.h> |
| 20 | #include <linux/version.h> | ||
| 21 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
| 22 | #include <linux/input.h> | 21 | #include <linux/input.h> |
| 23 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
diff --git a/drivers/input/touchscreen/wm9712.c b/drivers/input/touchscreen/wm9712.c index 4c5d85a249ae..c8bb1e7335fc 100644 --- a/drivers/input/touchscreen/wm9712.c +++ b/drivers/input/touchscreen/wm9712.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | 17 | ||
| 18 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 19 | #include <linux/moduleparam.h> | 19 | #include <linux/moduleparam.h> |
| 20 | #include <linux/version.h> | ||
| 21 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
| 22 | #include <linux/input.h> | 21 | #include <linux/input.h> |
| 23 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
diff --git a/drivers/input/touchscreen/wm9713.c b/drivers/input/touchscreen/wm9713.c index 838458792ea0..781ee83547e6 100644 --- a/drivers/input/touchscreen/wm9713.c +++ b/drivers/input/touchscreen/wm9713.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | 17 | ||
| 18 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 19 | #include <linux/moduleparam.h> | 19 | #include <linux/moduleparam.h> |
| 20 | #include <linux/version.h> | ||
| 21 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
| 22 | #include <linux/input.h> | 21 | #include <linux/input.h> |
| 23 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
diff --git a/drivers/input/touchscreen/wm97xx-core.c b/drivers/input/touchscreen/wm97xx-core.c index cdc24ad314e0..d589ab0e3adc 100644 --- a/drivers/input/touchscreen/wm97xx-core.c +++ b/drivers/input/touchscreen/wm97xx-core.c | |||
| @@ -37,7 +37,6 @@ | |||
| 37 | 37 | ||
| 38 | #include <linux/module.h> | 38 | #include <linux/module.h> |
| 39 | #include <linux/moduleparam.h> | 39 | #include <linux/moduleparam.h> |
| 40 | #include <linux/version.h> | ||
| 41 | #include <linux/kernel.h> | 40 | #include <linux/kernel.h> |
| 42 | #include <linux/init.h> | 41 | #include <linux/init.h> |
| 43 | #include <linux/delay.h> | 42 | #include <linux/delay.h> |
diff --git a/drivers/lguest/lguest_device.c b/drivers/lguest/lguest_device.c index 37344aaee22f..a661bbdae3d6 100644 --- a/drivers/lguest/lguest_device.c +++ b/drivers/lguest/lguest_device.c | |||
| @@ -98,6 +98,10 @@ static u32 lg_get_features(struct virtio_device *vdev) | |||
| 98 | return features; | 98 | return features; |
| 99 | } | 99 | } |
| 100 | 100 | ||
| 101 | /* The virtio core takes the features the Host offers, and copies the | ||
| 102 | * ones supported by the driver into the vdev->features array. Once | ||
| 103 | * that's all sorted out, this routine is called so we can tell the | ||
| 104 | * Host which features we understand and accept. */ | ||
| 101 | static void lg_finalize_features(struct virtio_device *vdev) | 105 | static void lg_finalize_features(struct virtio_device *vdev) |
| 102 | { | 106 | { |
| 103 | unsigned int i, bits; | 107 | unsigned int i, bits; |
| @@ -108,6 +112,10 @@ static void lg_finalize_features(struct virtio_device *vdev) | |||
| 108 | /* Give virtio_ring a chance to accept features. */ | 112 | /* Give virtio_ring a chance to accept features. */ |
| 109 | vring_transport_features(vdev); | 113 | vring_transport_features(vdev); |
| 110 | 114 | ||
| 115 | /* The vdev->feature array is a Linux bitmask: this isn't the | ||
| 116 | * same as a the simple array of bits used by lguest devices | ||
| 117 | * for features. So we do this slow, manual conversion which is | ||
| 118 | * completely general. */ | ||
| 111 | memset(out_features, 0, desc->feature_len); | 119 | memset(out_features, 0, desc->feature_len); |
| 112 | bits = min_t(unsigned, desc->feature_len, sizeof(vdev->features)) * 8; | 120 | bits = min_t(unsigned, desc->feature_len, sizeof(vdev->features)) * 8; |
| 113 | for (i = 0; i < bits; i++) { | 121 | for (i = 0; i < bits; i++) { |
diff --git a/drivers/lguest/page_tables.c b/drivers/lguest/page_tables.c index d93500f24fbb..81d0c6053447 100644 --- a/drivers/lguest/page_tables.c +++ b/drivers/lguest/page_tables.c | |||
| @@ -108,9 +108,8 @@ static unsigned long gpte_addr(pgd_t gpgd, unsigned long vaddr) | |||
| 108 | } | 108 | } |
| 109 | /*:*/ | 109 | /*:*/ |
| 110 | 110 | ||
| 111 | /*M:014 get_pfn is slow; it takes the mmap sem and calls get_user_pages. We | 111 | /*M:014 get_pfn is slow: we could probably try to grab batches of pages here as |
| 112 | * could probably try to grab batches of pages here as an optimization | 112 | * an optimization (ie. pre-faulting). :*/ |
| 113 | * (ie. pre-faulting). :*/ | ||
| 114 | 113 | ||
| 115 | /*H:350 This routine takes a page number given by the Guest and converts it to | 114 | /*H:350 This routine takes a page number given by the Guest and converts it to |
| 116 | * an actual, physical page number. It can fail for several reasons: the | 115 | * an actual, physical page number. It can fail for several reasons: the |
| @@ -123,19 +122,13 @@ static unsigned long gpte_addr(pgd_t gpgd, unsigned long vaddr) | |||
| 123 | static unsigned long get_pfn(unsigned long virtpfn, int write) | 122 | static unsigned long get_pfn(unsigned long virtpfn, int write) |
| 124 | { | 123 | { |
| 125 | struct page *page; | 124 | struct page *page; |
| 126 | /* This value indicates failure. */ | ||
| 127 | unsigned long ret = -1UL; | ||
| 128 | 125 | ||
| 129 | /* get_user_pages() is a complex interface: it gets the "struct | 126 | /* gup me one page at this address please! */ |
| 130 | * vm_area_struct" and "struct page" assocated with a range of pages. | 127 | if (get_user_pages_fast(virtpfn << PAGE_SHIFT, 1, write, &page) == 1) |
| 131 | * It also needs the task's mmap_sem held, and is not very quick. | 128 | return page_to_pfn(page); |
| 132 | * It returns the number of pages it got. */ | 129 | |
| 133 | down_read(¤t->mm->mmap_sem); | 130 | /* This value indicates failure. */ |
| 134 | if (get_user_pages(current, current->mm, virtpfn << PAGE_SHIFT, | 131 | return -1UL; |
| 135 | 1, write, 1, &page, NULL) == 1) | ||
| 136 | ret = page_to_pfn(page); | ||
| 137 | up_read(¤t->mm->mmap_sem); | ||
| 138 | return ret; | ||
| 139 | } | 132 | } |
| 140 | 133 | ||
| 141 | /*H:340 Converting a Guest page table entry to a shadow (ie. real) page table | 134 | /*H:340 Converting a Guest page table entry to a shadow (ie. real) page table |
| @@ -174,7 +167,7 @@ static pte_t gpte_to_spte(struct lg_cpu *cpu, pte_t gpte, int write) | |||
| 174 | /*H:460 And to complete the chain, release_pte() looks like this: */ | 167 | /*H:460 And to complete the chain, release_pte() looks like this: */ |
| 175 | static void release_pte(pte_t pte) | 168 | static void release_pte(pte_t pte) |
| 176 | { | 169 | { |
| 177 | /* Remember that get_user_pages() took a reference to the page, in | 170 | /* Remember that get_user_pages_fast() took a reference to the page, in |
| 178 | * get_pfn()? We have to put it back now. */ | 171 | * get_pfn()? We have to put it back now. */ |
| 179 | if (pte_flags(pte) & _PAGE_PRESENT) | 172 | if (pte_flags(pte) & _PAGE_PRESENT) |
| 180 | put_page(pfn_to_page(pte_pfn(pte))); | 173 | put_page(pfn_to_page(pte_pfn(pte))); |
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c index 7e65bad522cb..ac89a5deaca2 100644 --- a/drivers/md/bitmap.c +++ b/drivers/md/bitmap.c | |||
| @@ -238,15 +238,47 @@ static struct page *read_sb_page(mddev_t *mddev, long offset, unsigned long inde | |||
| 238 | 238 | ||
| 239 | } | 239 | } |
| 240 | 240 | ||
| 241 | static mdk_rdev_t *next_active_rdev(mdk_rdev_t *rdev, mddev_t *mddev) | ||
| 242 | { | ||
| 243 | /* Iterate the disks of an mddev, using rcu to protect access to the | ||
| 244 | * linked list, and raising the refcount of devices we return to ensure | ||
| 245 | * they don't disappear while in use. | ||
| 246 | * As devices are only added or removed when raid_disk is < 0 and | ||
| 247 | * nr_pending is 0 and In_sync is clear, the entries we return will | ||
| 248 | * still be in the same position on the list when we re-enter | ||
| 249 | * list_for_each_continue_rcu. | ||
| 250 | */ | ||
| 251 | struct list_head *pos; | ||
| 252 | rcu_read_lock(); | ||
| 253 | if (rdev == NULL) | ||
| 254 | /* start at the beginning */ | ||
| 255 | pos = &mddev->disks; | ||
| 256 | else { | ||
| 257 | /* release the previous rdev and start from there. */ | ||
| 258 | rdev_dec_pending(rdev, mddev); | ||
| 259 | pos = &rdev->same_set; | ||
| 260 | } | ||
| 261 | list_for_each_continue_rcu(pos, &mddev->disks) { | ||
| 262 | rdev = list_entry(pos, mdk_rdev_t, same_set); | ||
| 263 | if (rdev->raid_disk >= 0 && | ||
| 264 | test_bit(In_sync, &rdev->flags) && | ||
| 265 | !test_bit(Faulty, &rdev->flags)) { | ||
| 266 | /* this is a usable devices */ | ||
| 267 | atomic_inc(&rdev->nr_pending); | ||
| 268 | rcu_read_unlock(); | ||
| 269 | return rdev; | ||
| 270 | } | ||
| 271 | } | ||
| 272 | rcu_read_unlock(); | ||
| 273 | return NULL; | ||
| 274 | } | ||
| 275 | |||
| 241 | static int write_sb_page(struct bitmap *bitmap, struct page *page, int wait) | 276 | static int write_sb_page(struct bitmap *bitmap, struct page *page, int wait) |
| 242 | { | 277 | { |
| 243 | mdk_rdev_t *rdev; | 278 | mdk_rdev_t *rdev = NULL; |
| 244 | mddev_t *mddev = bitmap->mddev; | 279 | mddev_t *mddev = bitmap->mddev; |
| 245 | 280 | ||
| 246 | rcu_read_lock(); | 281 | while ((rdev = next_active_rdev(rdev, mddev)) != NULL) { |
| 247 | rdev_for_each_rcu(rdev, mddev) | ||
| 248 | if (test_bit(In_sync, &rdev->flags) | ||
| 249 | && !test_bit(Faulty, &rdev->flags)) { | ||
| 250 | int size = PAGE_SIZE; | 282 | int size = PAGE_SIZE; |
| 251 | if (page->index == bitmap->file_pages-1) | 283 | if (page->index == bitmap->file_pages-1) |
| 252 | size = roundup(bitmap->last_page_size, | 284 | size = roundup(bitmap->last_page_size, |
| @@ -281,8 +313,7 @@ static int write_sb_page(struct bitmap *bitmap, struct page *page, int wait) | |||
| 281 | + page->index * (PAGE_SIZE/512), | 313 | + page->index * (PAGE_SIZE/512), |
| 282 | size, | 314 | size, |
| 283 | page); | 315 | page); |
| 284 | } | 316 | } |
| 285 | rcu_read_unlock(); | ||
| 286 | 317 | ||
| 287 | if (wait) | 318 | if (wait) |
| 288 | md_super_wait(mddev); | 319 | md_super_wait(mddev); |
diff --git a/drivers/md/md.c b/drivers/md/md.c index c7aae66c6f9b..4790c83d78d0 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c | |||
| @@ -2393,6 +2393,8 @@ static void analyze_sbs(mddev_t * mddev) | |||
| 2393 | 2393 | ||
| 2394 | } | 2394 | } |
| 2395 | 2395 | ||
| 2396 | static void md_safemode_timeout(unsigned long data); | ||
| 2397 | |||
| 2396 | static ssize_t | 2398 | static ssize_t |
| 2397 | safe_delay_show(mddev_t *mddev, char *page) | 2399 | safe_delay_show(mddev_t *mddev, char *page) |
| 2398 | { | 2400 | { |
| @@ -2432,9 +2434,12 @@ safe_delay_store(mddev_t *mddev, const char *cbuf, size_t len) | |||
| 2432 | if (msec == 0) | 2434 | if (msec == 0) |
| 2433 | mddev->safemode_delay = 0; | 2435 | mddev->safemode_delay = 0; |
| 2434 | else { | 2436 | else { |
| 2437 | unsigned long old_delay = mddev->safemode_delay; | ||
| 2435 | mddev->safemode_delay = (msec*HZ)/1000; | 2438 | mddev->safemode_delay = (msec*HZ)/1000; |
| 2436 | if (mddev->safemode_delay == 0) | 2439 | if (mddev->safemode_delay == 0) |
| 2437 | mddev->safemode_delay = 1; | 2440 | mddev->safemode_delay = 1; |
| 2441 | if (mddev->safemode_delay < old_delay) | ||
| 2442 | md_safemode_timeout((unsigned long)mddev); | ||
| 2438 | } | 2443 | } |
| 2439 | return len; | 2444 | return len; |
| 2440 | } | 2445 | } |
| @@ -3836,8 +3841,6 @@ static int do_md_stop(mddev_t * mddev, int mode, int is_open) | |||
| 3836 | 3841 | ||
| 3837 | del_timer_sync(&mddev->safemode_timer); | 3842 | del_timer_sync(&mddev->safemode_timer); |
| 3838 | 3843 | ||
| 3839 | invalidate_partition(disk, 0); | ||
| 3840 | |||
| 3841 | switch(mode) { | 3844 | switch(mode) { |
| 3842 | case 1: /* readonly */ | 3845 | case 1: /* readonly */ |
| 3843 | err = -ENXIO; | 3846 | err = -ENXIO; |
| @@ -4634,6 +4637,11 @@ static int update_size(mddev_t *mddev, sector_t num_sectors) | |||
| 4634 | */ | 4637 | */ |
| 4635 | if (mddev->sync_thread) | 4638 | if (mddev->sync_thread) |
| 4636 | return -EBUSY; | 4639 | return -EBUSY; |
| 4640 | if (mddev->bitmap) | ||
| 4641 | /* Sorry, cannot grow a bitmap yet, just remove it, | ||
| 4642 | * grow, and re-add. | ||
| 4643 | */ | ||
| 4644 | return -EBUSY; | ||
| 4637 | rdev_for_each(rdev, tmp, mddev) { | 4645 | rdev_for_each(rdev, tmp, mddev) { |
| 4638 | sector_t avail; | 4646 | sector_t avail; |
| 4639 | avail = rdev->size * 2; | 4647 | avail = rdev->size * 2; |
| @@ -5993,7 +6001,7 @@ static int remove_and_add_spares(mddev_t *mddev) | |||
| 5993 | } | 6001 | } |
| 5994 | } | 6002 | } |
| 5995 | 6003 | ||
| 5996 | if (mddev->degraded) { | 6004 | if (mddev->degraded && ! mddev->ro) { |
| 5997 | rdev_for_each(rdev, rtmp, mddev) { | 6005 | rdev_for_each(rdev, rtmp, mddev) { |
| 5998 | if (rdev->raid_disk >= 0 && | 6006 | if (rdev->raid_disk >= 0 && |
| 5999 | !test_bit(In_sync, &rdev->flags) && | 6007 | !test_bit(In_sync, &rdev->flags) && |
| @@ -6067,6 +6075,8 @@ void md_check_recovery(mddev_t *mddev) | |||
| 6067 | flush_signals(current); | 6075 | flush_signals(current); |
| 6068 | } | 6076 | } |
| 6069 | 6077 | ||
| 6078 | if (mddev->ro && !test_bit(MD_RECOVERY_NEEDED, &mddev->recovery)) | ||
| 6079 | return; | ||
| 6070 | if ( ! ( | 6080 | if ( ! ( |
| 6071 | (mddev->flags && !mddev->external) || | 6081 | (mddev->flags && !mddev->external) || |
| 6072 | test_bit(MD_RECOVERY_NEEDED, &mddev->recovery) || | 6082 | test_bit(MD_RECOVERY_NEEDED, &mddev->recovery) || |
| @@ -6080,6 +6090,15 @@ void md_check_recovery(mddev_t *mddev) | |||
| 6080 | if (mddev_trylock(mddev)) { | 6090 | if (mddev_trylock(mddev)) { |
| 6081 | int spares = 0; | 6091 | int spares = 0; |
| 6082 | 6092 | ||
| 6093 | if (mddev->ro) { | ||
| 6094 | /* Only thing we do on a ro array is remove | ||
| 6095 | * failed devices. | ||
| 6096 | */ | ||
| 6097 | remove_and_add_spares(mddev); | ||
| 6098 | clear_bit(MD_RECOVERY_NEEDED, &mddev->recovery); | ||
| 6099 | goto unlock; | ||
| 6100 | } | ||
| 6101 | |||
| 6083 | if (!mddev->external) { | 6102 | if (!mddev->external) { |
| 6084 | int did_change = 0; | 6103 | int did_change = 0; |
| 6085 | spin_lock_irq(&mddev->write_lock); | 6104 | spin_lock_irq(&mddev->write_lock); |
| @@ -6117,7 +6136,8 @@ void md_check_recovery(mddev_t *mddev) | |||
| 6117 | /* resync has finished, collect result */ | 6136 | /* resync has finished, collect result */ |
| 6118 | md_unregister_thread(mddev->sync_thread); | 6137 | md_unregister_thread(mddev->sync_thread); |
| 6119 | mddev->sync_thread = NULL; | 6138 | mddev->sync_thread = NULL; |
| 6120 | if (!test_bit(MD_RECOVERY_INTR, &mddev->recovery)) { | 6139 | if (!test_bit(MD_RECOVERY_INTR, &mddev->recovery) && |
| 6140 | !test_bit(MD_RECOVERY_REQUESTED, &mddev->recovery)) { | ||
| 6121 | /* success...*/ | 6141 | /* success...*/ |
| 6122 | /* activate any spares */ | 6142 | /* activate any spares */ |
| 6123 | if (mddev->pers->spare_active(mddev)) | 6143 | if (mddev->pers->spare_active(mddev)) |
| @@ -6169,6 +6189,7 @@ void md_check_recovery(mddev_t *mddev) | |||
| 6169 | } else if ((spares = remove_and_add_spares(mddev))) { | 6189 | } else if ((spares = remove_and_add_spares(mddev))) { |
| 6170 | clear_bit(MD_RECOVERY_SYNC, &mddev->recovery); | 6190 | clear_bit(MD_RECOVERY_SYNC, &mddev->recovery); |
| 6171 | clear_bit(MD_RECOVERY_CHECK, &mddev->recovery); | 6191 | clear_bit(MD_RECOVERY_CHECK, &mddev->recovery); |
| 6192 | clear_bit(MD_RECOVERY_REQUESTED, &mddev->recovery); | ||
| 6172 | set_bit(MD_RECOVERY_RECOVER, &mddev->recovery); | 6193 | set_bit(MD_RECOVERY_RECOVER, &mddev->recovery); |
| 6173 | } else if (mddev->recovery_cp < MaxSector) { | 6194 | } else if (mddev->recovery_cp < MaxSector) { |
| 6174 | set_bit(MD_RECOVERY_SYNC, &mddev->recovery); | 6195 | set_bit(MD_RECOVERY_SYNC, &mddev->recovery); |
| @@ -6232,7 +6253,11 @@ static int md_notify_reboot(struct notifier_block *this, | |||
| 6232 | 6253 | ||
| 6233 | for_each_mddev(mddev, tmp) | 6254 | for_each_mddev(mddev, tmp) |
| 6234 | if (mddev_trylock(mddev)) { | 6255 | if (mddev_trylock(mddev)) { |
| 6235 | do_md_stop (mddev, 1, 0); | 6256 | /* Force a switch to readonly even array |
| 6257 | * appears to still be in use. Hence | ||
| 6258 | * the '100'. | ||
| 6259 | */ | ||
| 6260 | do_md_stop (mddev, 1, 100); | ||
| 6236 | mddev_unlock(mddev); | 6261 | mddev_unlock(mddev); |
| 6237 | } | 6262 | } |
| 6238 | /* | 6263 | /* |
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index d41bebb6da0f..e34cd0e62473 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c | |||
| @@ -76,11 +76,13 @@ static void r10bio_pool_free(void *r10_bio, void *data) | |||
| 76 | kfree(r10_bio); | 76 | kfree(r10_bio); |
| 77 | } | 77 | } |
| 78 | 78 | ||
| 79 | /* Maximum size of each resync request */ | ||
| 79 | #define RESYNC_BLOCK_SIZE (64*1024) | 80 | #define RESYNC_BLOCK_SIZE (64*1024) |
| 80 | //#define RESYNC_BLOCK_SIZE PAGE_SIZE | ||
| 81 | #define RESYNC_SECTORS (RESYNC_BLOCK_SIZE >> 9) | ||
| 82 | #define RESYNC_PAGES ((RESYNC_BLOCK_SIZE + PAGE_SIZE-1) / PAGE_SIZE) | 81 | #define RESYNC_PAGES ((RESYNC_BLOCK_SIZE + PAGE_SIZE-1) / PAGE_SIZE) |
| 83 | #define RESYNC_WINDOW (2048*1024) | 82 | /* amount of memory to reserve for resync requests */ |
| 83 | #define RESYNC_WINDOW (1024*1024) | ||
| 84 | /* maximum number of concurrent requests, memory permitting */ | ||
| 85 | #define RESYNC_DEPTH (32*1024*1024/RESYNC_BLOCK_SIZE) | ||
| 84 | 86 | ||
| 85 | /* | 87 | /* |
| 86 | * When performing a resync, we need to read and compare, so | 88 | * When performing a resync, we need to read and compare, so |
| @@ -690,7 +692,6 @@ static int flush_pending_writes(conf_t *conf) | |||
| 690 | * there is no normal IO happeing. It must arrange to call | 692 | * there is no normal IO happeing. It must arrange to call |
| 691 | * lower_barrier when the particular background IO completes. | 693 | * lower_barrier when the particular background IO completes. |
| 692 | */ | 694 | */ |
| 693 | #define RESYNC_DEPTH 32 | ||
| 694 | 695 | ||
| 695 | static void raise_barrier(conf_t *conf, int force) | 696 | static void raise_barrier(conf_t *conf, int force) |
| 696 | { | 697 | { |
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 40e939675657..224de022e7c5 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c | |||
| @@ -2568,10 +2568,10 @@ static bool handle_stripe5(struct stripe_head *sh) | |||
| 2568 | if (dev->written) | 2568 | if (dev->written) |
| 2569 | s.written++; | 2569 | s.written++; |
| 2570 | rdev = rcu_dereference(conf->disks[i].rdev); | 2570 | rdev = rcu_dereference(conf->disks[i].rdev); |
| 2571 | if (rdev && unlikely(test_bit(Blocked, &rdev->flags))) { | 2571 | if (blocked_rdev == NULL && |
| 2572 | rdev && unlikely(test_bit(Blocked, &rdev->flags))) { | ||
| 2572 | blocked_rdev = rdev; | 2573 | blocked_rdev = rdev; |
| 2573 | atomic_inc(&rdev->nr_pending); | 2574 | atomic_inc(&rdev->nr_pending); |
| 2574 | break; | ||
| 2575 | } | 2575 | } |
| 2576 | if (!rdev || !test_bit(In_sync, &rdev->flags)) { | 2576 | if (!rdev || !test_bit(In_sync, &rdev->flags)) { |
| 2577 | /* The ReadError flag will just be confusing now */ | 2577 | /* The ReadError flag will just be confusing now */ |
| @@ -2588,8 +2588,14 @@ static bool handle_stripe5(struct stripe_head *sh) | |||
| 2588 | rcu_read_unlock(); | 2588 | rcu_read_unlock(); |
| 2589 | 2589 | ||
| 2590 | if (unlikely(blocked_rdev)) { | 2590 | if (unlikely(blocked_rdev)) { |
| 2591 | set_bit(STRIPE_HANDLE, &sh->state); | 2591 | if (s.syncing || s.expanding || s.expanded || |
| 2592 | goto unlock; | 2592 | s.to_write || s.written) { |
| 2593 | set_bit(STRIPE_HANDLE, &sh->state); | ||
| 2594 | goto unlock; | ||
| 2595 | } | ||
| 2596 | /* There is nothing for the blocked_rdev to block */ | ||
| 2597 | rdev_dec_pending(blocked_rdev, conf->mddev); | ||
| 2598 | blocked_rdev = NULL; | ||
| 2593 | } | 2599 | } |
| 2594 | 2600 | ||
| 2595 | if (s.to_fill && !test_bit(STRIPE_BIOFILL_RUN, &sh->state)) { | 2601 | if (s.to_fill && !test_bit(STRIPE_BIOFILL_RUN, &sh->state)) { |
| @@ -2832,10 +2838,10 @@ static bool handle_stripe6(struct stripe_head *sh, struct page *tmp_page) | |||
| 2832 | if (dev->written) | 2838 | if (dev->written) |
| 2833 | s.written++; | 2839 | s.written++; |
| 2834 | rdev = rcu_dereference(conf->disks[i].rdev); | 2840 | rdev = rcu_dereference(conf->disks[i].rdev); |
| 2835 | if (rdev && unlikely(test_bit(Blocked, &rdev->flags))) { | 2841 | if (blocked_rdev == NULL && |
| 2842 | rdev && unlikely(test_bit(Blocked, &rdev->flags))) { | ||
| 2836 | blocked_rdev = rdev; | 2843 | blocked_rdev = rdev; |
| 2837 | atomic_inc(&rdev->nr_pending); | 2844 | atomic_inc(&rdev->nr_pending); |
| 2838 | break; | ||
| 2839 | } | 2845 | } |
| 2840 | if (!rdev || !test_bit(In_sync, &rdev->flags)) { | 2846 | if (!rdev || !test_bit(In_sync, &rdev->flags)) { |
| 2841 | /* The ReadError flag will just be confusing now */ | 2847 | /* The ReadError flag will just be confusing now */ |
| @@ -2853,9 +2859,16 @@ static bool handle_stripe6(struct stripe_head *sh, struct page *tmp_page) | |||
| 2853 | rcu_read_unlock(); | 2859 | rcu_read_unlock(); |
| 2854 | 2860 | ||
| 2855 | if (unlikely(blocked_rdev)) { | 2861 | if (unlikely(blocked_rdev)) { |
| 2856 | set_bit(STRIPE_HANDLE, &sh->state); | 2862 | if (s.syncing || s.expanding || s.expanded || |
| 2857 | goto unlock; | 2863 | s.to_write || s.written) { |
| 2864 | set_bit(STRIPE_HANDLE, &sh->state); | ||
| 2865 | goto unlock; | ||
| 2866 | } | ||
| 2867 | /* There is nothing for the blocked_rdev to block */ | ||
| 2868 | rdev_dec_pending(blocked_rdev, conf->mddev); | ||
| 2869 | blocked_rdev = NULL; | ||
| 2858 | } | 2870 | } |
| 2871 | |||
| 2859 | pr_debug("locked=%d uptodate=%d to_read=%d" | 2872 | pr_debug("locked=%d uptodate=%d to_read=%d" |
| 2860 | " to_write=%d failed=%d failed_num=%d,%d\n", | 2873 | " to_write=%d failed=%d failed_num=%d,%d\n", |
| 2861 | s.locked, s.uptodate, s.to_read, s.to_write, s.failed, | 2874 | s.locked, s.uptodate, s.to_read, s.to_write, s.failed, |
| @@ -4446,6 +4459,9 @@ static int raid5_check_reshape(mddev_t *mddev) | |||
| 4446 | return -EINVAL; /* Cannot shrink array or change level yet */ | 4459 | return -EINVAL; /* Cannot shrink array or change level yet */ |
| 4447 | if (mddev->delta_disks == 0) | 4460 | if (mddev->delta_disks == 0) |
| 4448 | return 0; /* nothing to do */ | 4461 | return 0; /* nothing to do */ |
| 4462 | if (mddev->bitmap) | ||
| 4463 | /* Cannot grow a bitmap yet */ | ||
| 4464 | return -EBUSY; | ||
| 4449 | 4465 | ||
| 4450 | /* Can only proceed if there are plenty of stripe_heads. | 4466 | /* Can only proceed if there are plenty of stripe_heads. |
| 4451 | * We need a minimum of one full stripe,, and for sensible progress | 4467 | * We need a minimum of one full stripe,, and for sensible progress |
diff --git a/drivers/media/video/dabusb.c b/drivers/media/video/dabusb.c index 48f4b92a8f8b..79faedf58521 100644 --- a/drivers/media/video/dabusb.c +++ b/drivers/media/video/dabusb.c | |||
| @@ -403,6 +403,7 @@ static int dabusb_fpga_download (pdabusb_t s, const char *fname) | |||
| 403 | ret = request_firmware(&fw, "dabusb/bitstream.bin", &s->usbdev->dev); | 403 | ret = request_firmware(&fw, "dabusb/bitstream.bin", &s->usbdev->dev); |
| 404 | if (ret) { | 404 | if (ret) { |
| 405 | err("Failed to load \"dabusb/bitstream.bin\": %d\n", ret); | 405 | err("Failed to load \"dabusb/bitstream.bin\": %d\n", ret); |
| 406 | kfree(b); | ||
| 406 | return ret; | 407 | return ret; |
| 407 | } | 408 | } |
| 408 | 409 | ||
diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c index c6408a62d95e..bc2a807f210d 100644 --- a/drivers/mfd/asic3.c +++ b/drivers/mfd/asic3.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * | 16 | * |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/version.h> | ||
| 20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 21 | #include <linux/irq.h> | 20 | #include <linux/irq.h> |
| 22 | #include <linux/gpio.h> | 21 | #include <linux/gpio.h> |
diff --git a/drivers/misc/acer-wmi.c b/drivers/misc/acer-wmi.c index e7a3fe508dff..d8b0d326e452 100644 --- a/drivers/misc/acer-wmi.c +++ b/drivers/misc/acer-wmi.c | |||
| @@ -192,6 +192,9 @@ static struct quirk_entry *quirks; | |||
| 192 | 192 | ||
| 193 | static void set_quirks(void) | 193 | static void set_quirks(void) |
| 194 | { | 194 | { |
| 195 | if (!interface) | ||
| 196 | return; | ||
| 197 | |||
| 195 | if (quirks->mailled) | 198 | if (quirks->mailled) |
| 196 | interface->capability |= ACER_CAP_MAILLED; | 199 | interface->capability |= ACER_CAP_MAILLED; |
| 197 | 200 | ||
| @@ -803,11 +806,30 @@ static acpi_status get_u32(u32 *value, u32 cap) | |||
| 803 | 806 | ||
| 804 | static acpi_status set_u32(u32 value, u32 cap) | 807 | static acpi_status set_u32(u32 value, u32 cap) |
| 805 | { | 808 | { |
| 809 | acpi_status status; | ||
| 810 | |||
| 806 | if (interface->capability & cap) { | 811 | if (interface->capability & cap) { |
| 807 | switch (interface->type) { | 812 | switch (interface->type) { |
| 808 | case ACER_AMW0: | 813 | case ACER_AMW0: |
| 809 | return AMW0_set_u32(value, cap, interface); | 814 | return AMW0_set_u32(value, cap, interface); |
| 810 | case ACER_AMW0_V2: | 815 | case ACER_AMW0_V2: |
| 816 | if (cap == ACER_CAP_MAILLED) | ||
| 817 | return AMW0_set_u32(value, cap, interface); | ||
| 818 | |||
| 819 | /* | ||
| 820 | * On some models, some WMID methods don't toggle | ||
| 821 | * properly. For those cases, we want to run the AMW0 | ||
| 822 | * method afterwards to be certain we've really toggled | ||
| 823 | * the device state. | ||
| 824 | */ | ||
| 825 | if (cap == ACER_CAP_WIRELESS || | ||
| 826 | cap == ACER_CAP_BLUETOOTH) { | ||
| 827 | status = WMID_set_u32(value, cap, interface); | ||
| 828 | if (ACPI_FAILURE(status)) | ||
| 829 | return status; | ||
| 830 | |||
| 831 | return AMW0_set_u32(value, cap, interface); | ||
| 832 | } | ||
| 811 | case ACER_WMID: | 833 | case ACER_WMID: |
| 812 | return WMID_set_u32(value, cap, interface); | 834 | return WMID_set_u32(value, cap, interface); |
| 813 | default: | 835 | default: |
| @@ -1167,7 +1189,7 @@ static int create_debugfs(void) | |||
| 1167 | return 0; | 1189 | return 0; |
| 1168 | 1190 | ||
| 1169 | error_debugfs: | 1191 | error_debugfs: |
| 1170 | remove_debugfs(); | 1192 | remove_debugfs(); |
| 1171 | return -ENOMEM; | 1193 | return -ENOMEM; |
| 1172 | } | 1194 | } |
| 1173 | 1195 | ||
| @@ -1218,6 +1240,8 @@ static int __init acer_wmi_init(void) | |||
| 1218 | return -ENODEV; | 1240 | return -ENODEV; |
| 1219 | } | 1241 | } |
| 1220 | 1242 | ||
| 1243 | set_quirks(); | ||
| 1244 | |||
| 1221 | if (platform_driver_register(&acer_platform_driver)) { | 1245 | if (platform_driver_register(&acer_platform_driver)) { |
| 1222 | printk(ACER_ERR "Unable to register platform driver.\n"); | 1246 | printk(ACER_ERR "Unable to register platform driver.\n"); |
| 1223 | goto error_platform_register; | 1247 | goto error_platform_register; |
| @@ -1248,6 +1272,7 @@ error_platform_register: | |||
| 1248 | static void __exit acer_wmi_exit(void) | 1272 | static void __exit acer_wmi_exit(void) |
| 1249 | { | 1273 | { |
| 1250 | remove_sysfs(acer_platform_device); | 1274 | remove_sysfs(acer_platform_device); |
| 1275 | remove_debugfs(); | ||
| 1251 | platform_device_del(acer_platform_device); | 1276 | platform_device_del(acer_platform_device); |
| 1252 | platform_driver_unregister(&acer_platform_driver); | 1277 | platform_driver_unregister(&acer_platform_driver); |
| 1253 | 1278 | ||
diff --git a/drivers/misc/eeepc-laptop.c b/drivers/misc/eeepc-laptop.c index 9e8d79e7e9f4..facdb9893c84 100644 --- a/drivers/misc/eeepc-laptop.c +++ b/drivers/misc/eeepc-laptop.c | |||
| @@ -553,9 +553,9 @@ static void eeepc_hwmon_exit(void) | |||
| 553 | hwmon = eeepc_hwmon_device; | 553 | hwmon = eeepc_hwmon_device; |
| 554 | if (!hwmon) | 554 | if (!hwmon) |
| 555 | return ; | 555 | return ; |
| 556 | hwmon_device_unregister(hwmon); | ||
| 557 | sysfs_remove_group(&hwmon->kobj, | 556 | sysfs_remove_group(&hwmon->kobj, |
| 558 | &hwmon_attribute_group); | 557 | &hwmon_attribute_group); |
| 558 | hwmon_device_unregister(hwmon); | ||
| 559 | eeepc_hwmon_device = NULL; | 559 | eeepc_hwmon_device = NULL; |
| 560 | } | 560 | } |
| 561 | 561 | ||
diff --git a/drivers/misc/eeprom_93cx6.c b/drivers/misc/eeprom_93cx6.c index ea55654e5948..15b1780025c8 100644 --- a/drivers/misc/eeprom_93cx6.c +++ b/drivers/misc/eeprom_93cx6.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | 26 | ||
| 27 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
| 28 | #include <linux/module.h> | 28 | #include <linux/module.h> |
| 29 | #include <linux/version.h> | ||
| 30 | #include <linux/delay.h> | 29 | #include <linux/delay.h> |
| 31 | #include <linux/eeprom_93cx6.h> | 30 | #include <linux/eeprom_93cx6.h> |
| 32 | 31 | ||
diff --git a/drivers/misc/hp-wmi.c b/drivers/misc/hp-wmi.c index 1dbcbcb323a2..6d407c2a4f91 100644 --- a/drivers/misc/hp-wmi.c +++ b/drivers/misc/hp-wmi.c | |||
| @@ -49,6 +49,7 @@ MODULE_ALIAS("wmi:5FB7F034-2C63-45e9-BE91-3D44E2C707E4"); | |||
| 49 | #define HPWMI_ALS_QUERY 0x3 | 49 | #define HPWMI_ALS_QUERY 0x3 |
| 50 | #define HPWMI_DOCK_QUERY 0x4 | 50 | #define HPWMI_DOCK_QUERY 0x4 |
| 51 | #define HPWMI_WIRELESS_QUERY 0x5 | 51 | #define HPWMI_WIRELESS_QUERY 0x5 |
| 52 | #define HPWMI_HOTKEY_QUERY 0xc | ||
| 52 | 53 | ||
| 53 | static int __init hp_wmi_bios_setup(struct platform_device *device); | 54 | static int __init hp_wmi_bios_setup(struct platform_device *device); |
| 54 | static int __exit hp_wmi_bios_remove(struct platform_device *device); | 55 | static int __exit hp_wmi_bios_remove(struct platform_device *device); |
| @@ -69,7 +70,7 @@ struct bios_return { | |||
| 69 | 70 | ||
| 70 | struct key_entry { | 71 | struct key_entry { |
| 71 | char type; /* See KE_* below */ | 72 | char type; /* See KE_* below */ |
| 72 | u8 code; | 73 | u16 code; |
| 73 | u16 keycode; | 74 | u16 keycode; |
| 74 | }; | 75 | }; |
| 75 | 76 | ||
| @@ -79,7 +80,9 @@ static struct key_entry hp_wmi_keymap[] = { | |||
| 79 | {KE_SW, 0x01, SW_DOCK}, | 80 | {KE_SW, 0x01, SW_DOCK}, |
| 80 | {KE_KEY, 0x02, KEY_BRIGHTNESSUP}, | 81 | {KE_KEY, 0x02, KEY_BRIGHTNESSUP}, |
| 81 | {KE_KEY, 0x03, KEY_BRIGHTNESSDOWN}, | 82 | {KE_KEY, 0x03, KEY_BRIGHTNESSDOWN}, |
| 82 | {KE_KEY, 0x04, KEY_HELP}, | 83 | {KE_KEY, 0x20e6, KEY_PROG1}, |
| 84 | {KE_KEY, 0x2142, KEY_MEDIA}, | ||
| 85 | {KE_KEY, 0x231b, KEY_HELP}, | ||
| 83 | {KE_END, 0} | 86 | {KE_END, 0} |
| 84 | }; | 87 | }; |
| 85 | 88 | ||
| @@ -177,9 +180,9 @@ static int hp_wmi_wifi_state(void) | |||
| 177 | int wireless = hp_wmi_perform_query(HPWMI_WIRELESS_QUERY, 0, 0); | 180 | int wireless = hp_wmi_perform_query(HPWMI_WIRELESS_QUERY, 0, 0); |
| 178 | 181 | ||
| 179 | if (wireless & 0x100) | 182 | if (wireless & 0x100) |
| 180 | return 1; | 183 | return RFKILL_STATE_UNBLOCKED; |
| 181 | else | 184 | else |
| 182 | return 0; | 185 | return RFKILL_STATE_SOFT_BLOCKED; |
| 183 | } | 186 | } |
| 184 | 187 | ||
| 185 | static int hp_wmi_bluetooth_state(void) | 188 | static int hp_wmi_bluetooth_state(void) |
| @@ -187,9 +190,9 @@ static int hp_wmi_bluetooth_state(void) | |||
| 187 | int wireless = hp_wmi_perform_query(HPWMI_WIRELESS_QUERY, 0, 0); | 190 | int wireless = hp_wmi_perform_query(HPWMI_WIRELESS_QUERY, 0, 0); |
| 188 | 191 | ||
| 189 | if (wireless & 0x10000) | 192 | if (wireless & 0x10000) |
| 190 | return 1; | 193 | return RFKILL_STATE_UNBLOCKED; |
| 191 | else | 194 | else |
| 192 | return 0; | 195 | return RFKILL_STATE_SOFT_BLOCKED; |
| 193 | } | 196 | } |
| 194 | 197 | ||
| 195 | static int hp_wmi_wwan_state(void) | 198 | static int hp_wmi_wwan_state(void) |
| @@ -197,9 +200,9 @@ static int hp_wmi_wwan_state(void) | |||
| 197 | int wireless = hp_wmi_perform_query(HPWMI_WIRELESS_QUERY, 0, 0); | 200 | int wireless = hp_wmi_perform_query(HPWMI_WIRELESS_QUERY, 0, 0); |
| 198 | 201 | ||
| 199 | if (wireless & 0x1000000) | 202 | if (wireless & 0x1000000) |
| 200 | return 1; | 203 | return RFKILL_STATE_UNBLOCKED; |
| 201 | else | 204 | else |
| 202 | return 0; | 205 | return RFKILL_STATE_SOFT_BLOCKED; |
| 203 | } | 206 | } |
| 204 | 207 | ||
| 205 | static ssize_t show_display(struct device *dev, struct device_attribute *attr, | 208 | static ssize_t show_display(struct device *dev, struct device_attribute *attr, |
| @@ -318,6 +321,9 @@ void hp_wmi_notify(u32 value, void *context) | |||
| 318 | 321 | ||
| 319 | if (obj && obj->type == ACPI_TYPE_BUFFER && obj->buffer.length == 8) { | 322 | if (obj && obj->type == ACPI_TYPE_BUFFER && obj->buffer.length == 8) { |
| 320 | int eventcode = *((u8 *) obj->buffer.pointer); | 323 | int eventcode = *((u8 *) obj->buffer.pointer); |
| 324 | if (eventcode == 0x4) | ||
| 325 | eventcode = hp_wmi_perform_query(HPWMI_HOTKEY_QUERY, 0, | ||
| 326 | 0); | ||
| 321 | key = hp_wmi_get_entry_by_scancode(eventcode); | 327 | key = hp_wmi_get_entry_by_scancode(eventcode); |
| 322 | if (key) { | 328 | if (key) { |
| 323 | switch (key->type) { | 329 | switch (key->type) { |
| @@ -338,12 +344,14 @@ void hp_wmi_notify(u32 value, void *context) | |||
| 338 | } | 344 | } |
| 339 | } else if (eventcode == 0x5) { | 345 | } else if (eventcode == 0x5) { |
| 340 | if (wifi_rfkill) | 346 | if (wifi_rfkill) |
| 341 | wifi_rfkill->state = hp_wmi_wifi_state(); | 347 | rfkill_force_state(wifi_rfkill, |
| 348 | hp_wmi_wifi_state()); | ||
| 342 | if (bluetooth_rfkill) | 349 | if (bluetooth_rfkill) |
| 343 | bluetooth_rfkill->state = | 350 | rfkill_force_state(bluetooth_rfkill, |
| 344 | hp_wmi_bluetooth_state(); | 351 | hp_wmi_bluetooth_state()); |
| 345 | if (wwan_rfkill) | 352 | if (wwan_rfkill) |
| 346 | wwan_rfkill->state = hp_wmi_wwan_state(); | 353 | rfkill_force_state(wwan_rfkill, |
| 354 | hp_wmi_wwan_state()); | ||
| 347 | } else | 355 | } else |
| 348 | printk(KERN_INFO "HP WMI: Unknown key pressed - %x\n", | 356 | printk(KERN_INFO "HP WMI: Unknown key pressed - %x\n", |
| 349 | eventcode); | 357 | eventcode); |
| @@ -398,6 +406,7 @@ static void cleanup_sysfs(struct platform_device *device) | |||
| 398 | static int __init hp_wmi_bios_setup(struct platform_device *device) | 406 | static int __init hp_wmi_bios_setup(struct platform_device *device) |
| 399 | { | 407 | { |
| 400 | int err; | 408 | int err; |
| 409 | int wireless = hp_wmi_perform_query(HPWMI_WIRELESS_QUERY, 0, 0); | ||
| 401 | 410 | ||
| 402 | err = device_create_file(&device->dev, &dev_attr_display); | 411 | err = device_create_file(&device->dev, &dev_attr_display); |
| 403 | if (err) | 412 | if (err) |
| @@ -412,28 +421,33 @@ static int __init hp_wmi_bios_setup(struct platform_device *device) | |||
| 412 | if (err) | 421 | if (err) |
| 413 | goto add_sysfs_error; | 422 | goto add_sysfs_error; |
| 414 | 423 | ||
| 415 | wifi_rfkill = rfkill_allocate(&device->dev, RFKILL_TYPE_WLAN); | 424 | if (wireless & 0x1) { |
| 416 | wifi_rfkill->name = "hp-wifi"; | 425 | wifi_rfkill = rfkill_allocate(&device->dev, RFKILL_TYPE_WLAN); |
| 417 | wifi_rfkill->state = hp_wmi_wifi_state(); | 426 | wifi_rfkill->name = "hp-wifi"; |
| 418 | wifi_rfkill->toggle_radio = hp_wmi_wifi_set; | 427 | wifi_rfkill->state = hp_wmi_wifi_state(); |
| 419 | wifi_rfkill->user_claim_unsupported = 1; | 428 | wifi_rfkill->toggle_radio = hp_wmi_wifi_set; |
| 420 | 429 | wifi_rfkill->user_claim_unsupported = 1; | |
| 421 | bluetooth_rfkill = rfkill_allocate(&device->dev, | 430 | rfkill_register(wifi_rfkill); |
| 422 | RFKILL_TYPE_BLUETOOTH); | 431 | } |
| 423 | bluetooth_rfkill->name = "hp-bluetooth"; | 432 | |
| 424 | bluetooth_rfkill->state = hp_wmi_bluetooth_state(); | 433 | if (wireless & 0x2) { |
| 425 | bluetooth_rfkill->toggle_radio = hp_wmi_bluetooth_set; | 434 | bluetooth_rfkill = rfkill_allocate(&device->dev, |
| 426 | bluetooth_rfkill->user_claim_unsupported = 1; | 435 | RFKILL_TYPE_BLUETOOTH); |
| 427 | 436 | bluetooth_rfkill->name = "hp-bluetooth"; | |
| 428 | wwan_rfkill = rfkill_allocate(&device->dev, RFKILL_TYPE_WIMAX); | 437 | bluetooth_rfkill->state = hp_wmi_bluetooth_state(); |
| 429 | wwan_rfkill->name = "hp-wwan"; | 438 | bluetooth_rfkill->toggle_radio = hp_wmi_bluetooth_set; |
| 430 | wwan_rfkill->state = hp_wmi_wwan_state(); | 439 | bluetooth_rfkill->user_claim_unsupported = 1; |
| 431 | wwan_rfkill->toggle_radio = hp_wmi_wwan_set; | 440 | rfkill_register(bluetooth_rfkill); |
| 432 | wwan_rfkill->user_claim_unsupported = 1; | 441 | } |
| 433 | 442 | ||
| 434 | rfkill_register(wifi_rfkill); | 443 | if (wireless & 0x4) { |
| 435 | rfkill_register(bluetooth_rfkill); | 444 | wwan_rfkill = rfkill_allocate(&device->dev, RFKILL_TYPE_WWAN); |
| 436 | rfkill_register(wwan_rfkill); | 445 | wwan_rfkill->name = "hp-wwan"; |
| 446 | wwan_rfkill->state = hp_wmi_wwan_state(); | ||
| 447 | wwan_rfkill->toggle_radio = hp_wmi_wwan_set; | ||
| 448 | wwan_rfkill->user_claim_unsupported = 1; | ||
| 449 | rfkill_register(wwan_rfkill); | ||
| 450 | } | ||
| 437 | 451 | ||
| 438 | return 0; | 452 | return 0; |
| 439 | add_sysfs_error: | 453 | add_sysfs_error: |
| @@ -445,9 +459,12 @@ static int __exit hp_wmi_bios_remove(struct platform_device *device) | |||
| 445 | { | 459 | { |
| 446 | cleanup_sysfs(device); | 460 | cleanup_sysfs(device); |
| 447 | 461 | ||
| 448 | rfkill_unregister(wifi_rfkill); | 462 | if (wifi_rfkill) |
| 449 | rfkill_unregister(bluetooth_rfkill); | 463 | rfkill_unregister(wifi_rfkill); |
| 450 | rfkill_unregister(wwan_rfkill); | 464 | if (bluetooth_rfkill) |
| 465 | rfkill_unregister(bluetooth_rfkill); | ||
| 466 | if (wwan_rfkill) | ||
| 467 | rfkill_unregister(wwan_rfkill); | ||
| 451 | 468 | ||
| 452 | return 0; | 469 | return 0; |
| 453 | } | 470 | } |
diff --git a/drivers/misc/sgi-gru/grutables.h b/drivers/misc/sgi-gru/grutables.h index 4251018f70ff..a78f70deeb59 100644 --- a/drivers/misc/sgi-gru/grutables.h +++ b/drivers/misc/sgi-gru/grutables.h | |||
| @@ -279,7 +279,7 @@ struct gru_stats_s { | |||
| 279 | #if defined CONFIG_IA64 | 279 | #if defined CONFIG_IA64 |
| 280 | #define VADDR_HI_BIT 64 | 280 | #define VADDR_HI_BIT 64 |
| 281 | #define GRUREGION(addr) ((addr) >> (VADDR_HI_BIT - 3) & 3) | 281 | #define GRUREGION(addr) ((addr) >> (VADDR_HI_BIT - 3) & 3) |
| 282 | #elif defined __x86_64 | 282 | #elif defined CONFIG_X86_64 |
| 283 | #define VADDR_HI_BIT 48 | 283 | #define VADDR_HI_BIT 48 |
| 284 | #define GRUREGION(addr) (0) /* ZZZ could do better */ | 284 | #define GRUREGION(addr) (0) /* ZZZ could do better */ |
| 285 | #else | 285 | #else |
diff --git a/drivers/mmc/host/at91_mci.c b/drivers/mmc/host/at91_mci.c index 6915f40ac8ab..1f8b5b36222c 100644 --- a/drivers/mmc/host/at91_mci.c +++ b/drivers/mmc/host/at91_mci.c | |||
| @@ -621,12 +621,21 @@ static void at91_mci_send_command(struct at91mci_host *host, struct mmc_command | |||
| 621 | if (cpu_is_at91sam9260 () || cpu_is_at91sam9263()) | 621 | if (cpu_is_at91sam9260 () || cpu_is_at91sam9263()) |
| 622 | if (host->total_length < 12) | 622 | if (host->total_length < 12) |
| 623 | host->total_length = 12; | 623 | host->total_length = 12; |
| 624 | host->buffer = dma_alloc_coherent(NULL, | 624 | |
| 625 | host->total_length, | 625 | host->buffer = kmalloc(host->total_length, GFP_KERNEL); |
| 626 | &host->physical_address, GFP_KERNEL); | 626 | if (!host->buffer) { |
| 627 | pr_debug("Can't alloc tx buffer\n"); | ||
| 628 | cmd->error = -ENOMEM; | ||
| 629 | mmc_request_done(host->mmc, host->request); | ||
| 630 | return; | ||
| 631 | } | ||
| 627 | 632 | ||
| 628 | at91_mci_sg_to_dma(host, data); | 633 | at91_mci_sg_to_dma(host, data); |
| 629 | 634 | ||
| 635 | host->physical_address = dma_map_single(NULL, | ||
| 636 | host->buffer, host->total_length, | ||
| 637 | DMA_TO_DEVICE); | ||
| 638 | |||
| 630 | pr_debug("Transmitting %d bytes\n", host->total_length); | 639 | pr_debug("Transmitting %d bytes\n", host->total_length); |
| 631 | 640 | ||
| 632 | at91_mci_write(host, ATMEL_PDC_TPR, host->physical_address); | 641 | at91_mci_write(host, ATMEL_PDC_TPR, host->physical_address); |
| @@ -694,7 +703,10 @@ static void at91_mci_completed_command(struct at91mci_host *host, unsigned int s | |||
| 694 | cmd->resp[3] = at91_mci_read(host, AT91_MCI_RSPR(3)); | 703 | cmd->resp[3] = at91_mci_read(host, AT91_MCI_RSPR(3)); |
| 695 | 704 | ||
| 696 | if (host->buffer) { | 705 | if (host->buffer) { |
| 697 | dma_free_coherent(NULL, host->total_length, host->buffer, host->physical_address); | 706 | dma_unmap_single(NULL, |
| 707 | host->physical_address, host->total_length, | ||
| 708 | DMA_TO_DEVICE); | ||
| 709 | kfree(host->buffer); | ||
| 698 | host->buffer = NULL; | 710 | host->buffer = NULL; |
| 699 | } | 711 | } |
| 700 | 712 | ||
diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c index 7c994e1ae276..ae16d845d746 100644 --- a/drivers/mmc/host/s3cmci.c +++ b/drivers/mmc/host/s3cmci.c | |||
| @@ -595,8 +595,9 @@ static irqreturn_t s3cmci_irq_cd(int irq, void *dev_id) | |||
| 595 | return IRQ_HANDLED; | 595 | return IRQ_HANDLED; |
| 596 | } | 596 | } |
| 597 | 597 | ||
| 598 | void s3cmci_dma_done_callback(struct s3c2410_dma_chan *dma_ch, void *buf_id, | 598 | static void s3cmci_dma_done_callback(struct s3c2410_dma_chan *dma_ch, |
| 599 | int size, enum s3c2410_dma_buffresult result) | 599 | void *buf_id, int size, |
| 600 | enum s3c2410_dma_buffresult result) | ||
| 600 | { | 601 | { |
| 601 | struct s3cmci_host *host = buf_id; | 602 | struct s3cmci_host *host = buf_id; |
| 602 | unsigned long iflags; | 603 | unsigned long iflags; |
| @@ -740,8 +741,8 @@ request_done: | |||
| 740 | mmc_request_done(host->mmc, mrq); | 741 | mmc_request_done(host->mmc, mrq); |
| 741 | } | 742 | } |
| 742 | 743 | ||
| 743 | 744 | static void s3cmci_dma_setup(struct s3cmci_host *host, | |
| 744 | void s3cmci_dma_setup(struct s3cmci_host *host, enum s3c2410_dmasrc source) | 745 | enum s3c2410_dmasrc source) |
| 745 | { | 746 | { |
| 746 | static enum s3c2410_dmasrc last_source = -1; | 747 | static enum s3c2410_dmasrc last_source = -1; |
| 747 | static int setup_ok; | 748 | static int setup_ok; |
| @@ -1003,8 +1004,9 @@ static void s3cmci_send_request(struct mmc_host *mmc) | |||
| 1003 | enable_irq(host->irq); | 1004 | enable_irq(host->irq); |
| 1004 | } | 1005 | } |
| 1005 | 1006 | ||
| 1006 | static int s3cmci_card_present(struct s3cmci_host *host) | 1007 | static int s3cmci_card_present(struct mmc_host *mmc) |
| 1007 | { | 1008 | { |
| 1009 | struct s3cmci_host *host = mmc_priv(mmc); | ||
| 1008 | struct s3c24xx_mci_pdata *pdata = host->pdata; | 1010 | struct s3c24xx_mci_pdata *pdata = host->pdata; |
| 1009 | int ret; | 1011 | int ret; |
| 1010 | 1012 | ||
| @@ -1023,7 +1025,7 @@ static void s3cmci_request(struct mmc_host *mmc, struct mmc_request *mrq) | |||
| 1023 | host->cmd_is_stop = 0; | 1025 | host->cmd_is_stop = 0; |
| 1024 | host->mrq = mrq; | 1026 | host->mrq = mrq; |
| 1025 | 1027 | ||
| 1026 | if (s3cmci_card_present(host) == 0) { | 1028 | if (s3cmci_card_present(mmc) == 0) { |
| 1027 | dbg(host, dbg_err, "%s: no medium present\n", __func__); | 1029 | dbg(host, dbg_err, "%s: no medium present\n", __func__); |
| 1028 | host->mrq->cmd->error = -ENOMEDIUM; | 1030 | host->mrq->cmd->error = -ENOMEDIUM; |
| 1029 | mmc_request_done(mmc, mrq); | 1031 | mmc_request_done(mmc, mrq); |
| @@ -1138,6 +1140,7 @@ static struct mmc_host_ops s3cmci_ops = { | |||
| 1138 | .request = s3cmci_request, | 1140 | .request = s3cmci_request, |
| 1139 | .set_ios = s3cmci_set_ios, | 1141 | .set_ios = s3cmci_set_ios, |
| 1140 | .get_ro = s3cmci_get_ro, | 1142 | .get_ro = s3cmci_get_ro, |
| 1143 | .get_cd = s3cmci_card_present, | ||
| 1141 | }; | 1144 | }; |
| 1142 | 1145 | ||
| 1143 | static struct s3c24xx_mci_pdata s3cmci_def_pdata = { | 1146 | static struct s3c24xx_mci_pdata s3cmci_def_pdata = { |
| @@ -1206,7 +1209,7 @@ static int __devinit s3cmci_probe(struct platform_device *pdev, int is2440) | |||
| 1206 | } | 1209 | } |
| 1207 | 1210 | ||
| 1208 | host->base = ioremap(host->mem->start, RESSIZE(host->mem)); | 1211 | host->base = ioremap(host->mem->start, RESSIZE(host->mem)); |
| 1209 | if (host->base == 0) { | 1212 | if (!host->base) { |
| 1210 | dev_err(&pdev->dev, "failed to ioremap() io memory region.\n"); | 1213 | dev_err(&pdev->dev, "failed to ioremap() io memory region.\n"); |
| 1211 | ret = -EINVAL; | 1214 | ret = -EINVAL; |
| 1212 | goto probe_free_mem_region; | 1215 | goto probe_free_mem_region; |
diff --git a/drivers/mmc/host/sdricoh_cs.c b/drivers/mmc/host/sdricoh_cs.c index f99e9f721629..1df44d966bdb 100644 --- a/drivers/mmc/host/sdricoh_cs.c +++ b/drivers/mmc/host/sdricoh_cs.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | #include <linux/pci.h> | 29 | #include <linux/pci.h> |
| 30 | #include <linux/ioport.h> | 30 | #include <linux/ioport.h> |
| 31 | #include <linux/scatterlist.h> | 31 | #include <linux/scatterlist.h> |
| 32 | #include <linux/version.h> | ||
| 33 | 32 | ||
| 34 | #include <pcmcia/cs_types.h> | 33 | #include <pcmcia/cs_types.h> |
| 35 | #include <pcmcia/cs.h> | 34 | #include <pcmcia/cs.h> |
diff --git a/drivers/mtd/maps/amd76xrom.c b/drivers/mtd/maps/amd76xrom.c index 948b86f35ef4..d1eec7d3243f 100644 --- a/drivers/mtd/maps/amd76xrom.c +++ b/drivers/mtd/maps/amd76xrom.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | 6 | ||
| 7 | #include <linux/module.h> | 7 | #include <linux/module.h> |
| 8 | #include <linux/types.h> | 8 | #include <linux/types.h> |
| 9 | #include <linux/version.h> | ||
| 10 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
| 11 | #include <linux/init.h> | 10 | #include <linux/init.h> |
| 12 | #include <asm/io.h> | 11 | #include <asm/io.h> |
diff --git a/drivers/mtd/maps/ck804xrom.c b/drivers/mtd/maps/ck804xrom.c index effaf7cdefab..1a6feb4474de 100644 --- a/drivers/mtd/maps/ck804xrom.c +++ b/drivers/mtd/maps/ck804xrom.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | 9 | ||
| 10 | #include <linux/module.h> | 10 | #include <linux/module.h> |
| 11 | #include <linux/types.h> | 11 | #include <linux/types.h> |
| 12 | #include <linux/version.h> | ||
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 15 | #include <asm/io.h> | 14 | #include <asm/io.h> |
diff --git a/drivers/mtd/maps/esb2rom.c b/drivers/mtd/maps/esb2rom.c index aa64a4752781..bbbcdd4c8d13 100644 --- a/drivers/mtd/maps/esb2rom.c +++ b/drivers/mtd/maps/esb2rom.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | 12 | ||
| 13 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 14 | #include <linux/types.h> | 14 | #include <linux/types.h> |
| 15 | #include <linux/version.h> | ||
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 18 | #include <asm/io.h> | 17 | #include <asm/io.h> |
diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c index d2f331876e4c..e00d424e6575 100644 --- a/drivers/mtd/mtdchar.c +++ b/drivers/mtd/mtdchar.c | |||
| @@ -410,16 +410,20 @@ static int mtd_ioctl(struct inode *inode, struct file *file, | |||
| 410 | 410 | ||
| 411 | case MEMGETREGIONINFO: | 411 | case MEMGETREGIONINFO: |
| 412 | { | 412 | { |
| 413 | struct region_info_user ur; | 413 | uint32_t ur_idx; |
| 414 | struct mtd_erase_region_info *kr; | ||
| 415 | struct region_info_user *ur = (struct region_info_user *) argp; | ||
| 414 | 416 | ||
| 415 | if (copy_from_user(&ur, argp, sizeof(struct region_info_user))) | 417 | if (get_user(ur_idx, &(ur->regionindex))) |
| 416 | return -EFAULT; | 418 | return -EFAULT; |
| 417 | 419 | ||
| 418 | if (ur.regionindex >= mtd->numeraseregions) | 420 | kr = &(mtd->eraseregions[ur_idx]); |
| 419 | return -EINVAL; | 421 | |
| 420 | if (copy_to_user(argp, &(mtd->eraseregions[ur.regionindex]), | 422 | if (put_user(kr->offset, &(ur->offset)) |
| 421 | sizeof(struct mtd_erase_region_info))) | 423 | || put_user(kr->erasesize, &(ur->erasesize)) |
| 424 | || put_user(kr->numblocks, &(ur->numblocks))) | ||
| 422 | return -EFAULT; | 425 | return -EFAULT; |
| 426 | |||
| 423 | break; | 427 | break; |
| 424 | } | 428 | } |
| 425 | 429 | ||
diff --git a/drivers/mtd/nand/au1550nd.c b/drivers/mtd/nand/au1550nd.c index 761946ea45b1..92c334ff4508 100644 --- a/drivers/mtd/nand/au1550nd.c +++ b/drivers/mtd/nand/au1550nd.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #include <linux/mtd/mtd.h> | 16 | #include <linux/mtd/mtd.h> |
| 17 | #include <linux/mtd/nand.h> | 17 | #include <linux/mtd/nand.h> |
| 18 | #include <linux/mtd/partitions.h> | 18 | #include <linux/mtd/partitions.h> |
| 19 | #include <linux/version.h> | ||
| 20 | #include <asm/io.h> | 19 | #include <asm/io.h> |
| 21 | 20 | ||
| 22 | #include <asm/mach-au1x00/au1xxx.h> | 21 | #include <asm/mach-au1x00/au1xxx.h> |
diff --git a/drivers/mtd/nand/orion_nand.c b/drivers/mtd/nand/orion_nand.c index 64002488c6ee..917cf8d3ae95 100644 --- a/drivers/mtd/nand/orion_nand.c +++ b/drivers/mtd/nand/orion_nand.c | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | #include <asm/io.h> | 19 | #include <asm/io.h> |
| 20 | #include <asm/sizes.h> | 20 | #include <asm/sizes.h> |
| 21 | #include <mach/hardware.h> | 21 | #include <mach/hardware.h> |
| 22 | #include <asm/plat-orion/orion_nand.h> | 22 | #include <plat/orion_nand.h> |
| 23 | 23 | ||
| 24 | #ifdef CONFIG_MTD_CMDLINE_PARTS | 24 | #ifdef CONFIG_MTD_CMDLINE_PARTS |
| 25 | static const char *part_probes[] = { "cmdlinepart", NULL }; | 25 | static const char *part_probes[] = { "cmdlinepart", NULL }; |
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 4b4cb2bf4f11..4a11296a9514 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -822,14 +822,14 @@ config ULTRA32 | |||
| 822 | will be called smc-ultra32. | 822 | will be called smc-ultra32. |
| 823 | 823 | ||
| 824 | config BFIN_MAC | 824 | config BFIN_MAC |
| 825 | tristate "Blackfin 527/536/537 on-chip mac support" | 825 | tristate "Blackfin on-chip MAC support" |
| 826 | depends on NET_ETHERNET && (BF527 || BF537 || BF536) | 826 | depends on NET_ETHERNET && (BF526 || BF527 || BF536 || BF537) |
| 827 | select CRC32 | 827 | select CRC32 |
| 828 | select MII | 828 | select MII |
| 829 | select PHYLIB | 829 | select PHYLIB |
| 830 | select BFIN_MAC_USE_L1 if DMA_UNCACHED_NONE | 830 | select BFIN_MAC_USE_L1 if DMA_UNCACHED_NONE |
| 831 | help | 831 | help |
| 832 | This is the driver for blackfin on-chip mac device. Say Y if you want it | 832 | This is the driver for Blackfin on-chip mac device. Say Y if you want it |
| 833 | compiled into the kernel. This driver is also available as a module | 833 | compiled into the kernel. This driver is also available as a module |
| 834 | ( = code which can be inserted in and removed from the running kernel | 834 | ( = code which can be inserted in and removed from the running kernel |
| 835 | whenever you want). The module will be called bfin_mac. | 835 | whenever you want). The module will be called bfin_mac. |
| @@ -1172,7 +1172,7 @@ config ETH16I | |||
| 1172 | 1172 | ||
| 1173 | config NE2000 | 1173 | config NE2000 |
| 1174 | tristate "NE2000/NE1000 support" | 1174 | tristate "NE2000/NE1000 support" |
| 1175 | depends on NET_ISA || (Q40 && m) || M32R || TOSHIBA_RBTX4927 || TOSHIBA_RBTX4938 | 1175 | depends on NET_ISA || (Q40 && m) || M32R || MACH_TX49XX |
| 1176 | select CRC32 | 1176 | select CRC32 |
| 1177 | ---help--- | 1177 | ---help--- |
| 1178 | If you have a network (Ethernet) card of this type, say Y and read | 1178 | If you have a network (Ethernet) card of this type, say Y and read |
diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c index e4483de84e7f..66de80b64b92 100644 --- a/drivers/net/acenic.c +++ b/drivers/net/acenic.c | |||
| @@ -52,7 +52,6 @@ | |||
| 52 | 52 | ||
| 53 | #include <linux/module.h> | 53 | #include <linux/module.h> |
| 54 | #include <linux/moduleparam.h> | 54 | #include <linux/moduleparam.h> |
| 55 | #include <linux/version.h> | ||
| 56 | #include <linux/types.h> | 55 | #include <linux/types.h> |
| 57 | #include <linux/errno.h> | 56 | #include <linux/errno.h> |
| 58 | #include <linux/ioport.h> | 57 | #include <linux/ioport.h> |
diff --git a/drivers/net/arm/ixp4xx_eth.c b/drivers/net/arm/ixp4xx_eth.c index 020771bfb603..e2d702b8b2e4 100644 --- a/drivers/net/arm/ixp4xx_eth.c +++ b/drivers/net/arm/ixp4xx_eth.c | |||
| @@ -551,7 +551,7 @@ static int eth_poll(struct napi_struct *napi, int budget) | |||
| 551 | if ((skb = netdev_alloc_skb(dev, RX_BUFF_SIZE))) { | 551 | if ((skb = netdev_alloc_skb(dev, RX_BUFF_SIZE))) { |
| 552 | phys = dma_map_single(&dev->dev, skb->data, | 552 | phys = dma_map_single(&dev->dev, skb->data, |
| 553 | RX_BUFF_SIZE, DMA_FROM_DEVICE); | 553 | RX_BUFF_SIZE, DMA_FROM_DEVICE); |
| 554 | if (dma_mapping_error(phys)) { | 554 | if (dma_mapping_error(&dev->dev, phys)) { |
| 555 | dev_kfree_skb(skb); | 555 | dev_kfree_skb(skb); |
| 556 | skb = NULL; | 556 | skb = NULL; |
| 557 | } | 557 | } |
| @@ -698,7 +698,7 @@ static int eth_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 698 | #endif | 698 | #endif |
| 699 | 699 | ||
| 700 | phys = dma_map_single(&dev->dev, mem, bytes, DMA_TO_DEVICE); | 700 | phys = dma_map_single(&dev->dev, mem, bytes, DMA_TO_DEVICE); |
| 701 | if (dma_mapping_error(phys)) { | 701 | if (dma_mapping_error(&dev->dev, phys)) { |
| 702 | #ifdef __ARMEB__ | 702 | #ifdef __ARMEB__ |
| 703 | dev_kfree_skb(skb); | 703 | dev_kfree_skb(skb); |
| 704 | #else | 704 | #else |
| @@ -883,7 +883,7 @@ static int init_queues(struct port *port) | |||
| 883 | desc->buf_len = MAX_MRU; | 883 | desc->buf_len = MAX_MRU; |
| 884 | desc->data = dma_map_single(&port->netdev->dev, data, | 884 | desc->data = dma_map_single(&port->netdev->dev, data, |
| 885 | RX_BUFF_SIZE, DMA_FROM_DEVICE); | 885 | RX_BUFF_SIZE, DMA_FROM_DEVICE); |
| 886 | if (dma_mapping_error(desc->data)) { | 886 | if (dma_mapping_error(&port->netdev->dev, desc->data)) { |
| 887 | free_buffer(buff); | 887 | free_buffer(buff); |
| 888 | return -EIO; | 888 | return -EIO; |
| 889 | } | 889 | } |
diff --git a/drivers/net/atl1e/atl1e_ethtool.c b/drivers/net/atl1e/atl1e_ethtool.c index cdc3b85b10b9..619c6583e1aa 100644 --- a/drivers/net/atl1e/atl1e_ethtool.c +++ b/drivers/net/atl1e/atl1e_ethtool.c | |||
| @@ -355,7 +355,7 @@ static int atl1e_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) | |||
| 355 | struct atl1e_adapter *adapter = netdev_priv(netdev); | 355 | struct atl1e_adapter *adapter = netdev_priv(netdev); |
| 356 | 356 | ||
| 357 | if (wol->wolopts & (WAKE_ARP | WAKE_MAGICSECURE | | 357 | if (wol->wolopts & (WAKE_ARP | WAKE_MAGICSECURE | |
| 358 | WAKE_MCAST | WAKE_BCAST | WAKE_MCAST)) | 358 | WAKE_UCAST | WAKE_MCAST | WAKE_BCAST)) |
| 359 | return -EOPNOTSUPP; | 359 | return -EOPNOTSUPP; |
| 360 | /* these settings will always override what we currently have */ | 360 | /* these settings will always override what we currently have */ |
| 361 | adapter->wol = 0; | 361 | adapter->wol = 0; |
diff --git a/drivers/net/atl1e/atl1e_main.c b/drivers/net/atl1e/atl1e_main.c index 82d7be1655d3..7685b995ff9b 100644 --- a/drivers/net/atl1e/atl1e_main.c +++ b/drivers/net/atl1e/atl1e_main.c | |||
| @@ -2232,10 +2232,11 @@ static int atl1e_resume(struct pci_dev *pdev) | |||
| 2232 | 2232 | ||
| 2233 | AT_WRITE_REG(&adapter->hw, REG_WOL_CTRL, 0); | 2233 | AT_WRITE_REG(&adapter->hw, REG_WOL_CTRL, 0); |
| 2234 | 2234 | ||
| 2235 | if (netif_running(netdev)) | 2235 | if (netif_running(netdev)) { |
| 2236 | err = atl1e_request_irq(adapter); | 2236 | err = atl1e_request_irq(adapter); |
| 2237 | if (err) | 2237 | if (err) |
| 2238 | return err; | 2238 | return err; |
| 2239 | } | ||
| 2239 | 2240 | ||
| 2240 | atl1e_reset_hw(&adapter->hw); | 2241 | atl1e_reset_hw(&adapter->hw); |
| 2241 | 2242 | ||
diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c index e6a7bb79d4df..e23ce77712f1 100644 --- a/drivers/net/atlx/atl1.c +++ b/drivers/net/atlx/atl1.c | |||
| @@ -3022,7 +3022,6 @@ static int __devinit atl1_probe(struct pci_dev *pdev, | |||
| 3022 | netdev->features = NETIF_F_HW_CSUM; | 3022 | netdev->features = NETIF_F_HW_CSUM; |
| 3023 | netdev->features |= NETIF_F_SG; | 3023 | netdev->features |= NETIF_F_SG; |
| 3024 | netdev->features |= (NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX); | 3024 | netdev->features |= (NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX); |
| 3025 | netdev->features |= NETIF_F_TSO; | ||
| 3026 | netdev->features |= NETIF_F_LLTX; | 3025 | netdev->features |= NETIF_F_LLTX; |
| 3027 | 3026 | ||
| 3028 | /* | 3027 | /* |
diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c index cb8be490e5ae..5ee1b0557a02 100644 --- a/drivers/net/au1000_eth.c +++ b/drivers/net/au1000_eth.c | |||
| @@ -807,7 +807,7 @@ err_out: | |||
| 807 | static int au1000_init(struct net_device *dev) | 807 | static int au1000_init(struct net_device *dev) |
| 808 | { | 808 | { |
| 809 | struct au1000_private *aup = (struct au1000_private *) dev->priv; | 809 | struct au1000_private *aup = (struct au1000_private *) dev->priv; |
| 810 | u32 flags; | 810 | unsigned long flags; |
| 811 | int i; | 811 | int i; |
| 812 | u32 control; | 812 | u32 control; |
| 813 | 813 | ||
diff --git a/drivers/net/ax88796.c b/drivers/net/ax88796.c index 0b4adf4a0f7d..a886a4b9f7e5 100644 --- a/drivers/net/ax88796.c +++ b/drivers/net/ax88796.c | |||
| @@ -554,7 +554,7 @@ static int ax_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) | |||
| 554 | 554 | ||
| 555 | spin_lock_irqsave(&ax->mii_lock, flags); | 555 | spin_lock_irqsave(&ax->mii_lock, flags); |
| 556 | mii_ethtool_gset(&ax->mii, cmd); | 556 | mii_ethtool_gset(&ax->mii, cmd); |
| 557 | spin_lock_irqsave(&ax->mii_lock, flags); | 557 | spin_unlock_irqrestore(&ax->mii_lock, flags); |
| 558 | 558 | ||
| 559 | return 0; | 559 | return 0; |
| 560 | } | 560 | } |
| @@ -567,7 +567,7 @@ static int ax_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) | |||
| 567 | 567 | ||
| 568 | spin_lock_irqsave(&ax->mii_lock, flags); | 568 | spin_lock_irqsave(&ax->mii_lock, flags); |
| 569 | rc = mii_ethtool_sset(&ax->mii, cmd); | 569 | rc = mii_ethtool_sset(&ax->mii, cmd); |
| 570 | spin_lock_irqsave(&ax->mii_lock, flags); | 570 | spin_unlock_irqrestore(&ax->mii_lock, flags); |
| 571 | 571 | ||
| 572 | return rc; | 572 | return rc; |
| 573 | } | 573 | } |
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index 5ebde67d4297..2486a656f12d 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c | |||
| @@ -35,8 +35,8 @@ | |||
| 35 | #include <linux/time.h> | 35 | #include <linux/time.h> |
| 36 | #include <linux/ethtool.h> | 36 | #include <linux/ethtool.h> |
| 37 | #include <linux/mii.h> | 37 | #include <linux/mii.h> |
| 38 | #ifdef NETIF_F_HW_VLAN_TX | ||
| 39 | #include <linux/if_vlan.h> | 38 | #include <linux/if_vlan.h> |
| 39 | #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE) | ||
| 40 | #define BCM_VLAN 1 | 40 | #define BCM_VLAN 1 |
| 41 | #endif | 41 | #endif |
| 42 | #include <net/ip.h> | 42 | #include <net/ip.h> |
| @@ -57,8 +57,8 @@ | |||
| 57 | 57 | ||
| 58 | #define DRV_MODULE_NAME "bnx2" | 58 | #define DRV_MODULE_NAME "bnx2" |
| 59 | #define PFX DRV_MODULE_NAME ": " | 59 | #define PFX DRV_MODULE_NAME ": " |
| 60 | #define DRV_MODULE_VERSION "1.7.9" | 60 | #define DRV_MODULE_VERSION "1.8.0" |
| 61 | #define DRV_MODULE_RELDATE "July 18, 2008" | 61 | #define DRV_MODULE_RELDATE "Aug 14, 2008" |
| 62 | 62 | ||
| 63 | #define RUN_AT(x) (jiffies + (x)) | 63 | #define RUN_AT(x) (jiffies + (x)) |
| 64 | 64 | ||
| @@ -2876,6 +2876,8 @@ bnx2_rx_int(struct bnx2 *bp, struct bnx2_napi *bnapi, int budget) | |||
| 2876 | struct sw_bd *rx_buf; | 2876 | struct sw_bd *rx_buf; |
| 2877 | struct sk_buff *skb; | 2877 | struct sk_buff *skb; |
| 2878 | dma_addr_t dma_addr; | 2878 | dma_addr_t dma_addr; |
| 2879 | u16 vtag = 0; | ||
| 2880 | int hw_vlan __maybe_unused = 0; | ||
| 2879 | 2881 | ||
| 2880 | sw_ring_cons = RX_RING_IDX(sw_cons); | 2882 | sw_ring_cons = RX_RING_IDX(sw_cons); |
| 2881 | sw_ring_prod = RX_RING_IDX(sw_prod); | 2883 | sw_ring_prod = RX_RING_IDX(sw_prod); |
| @@ -2919,7 +2921,7 @@ bnx2_rx_int(struct bnx2 *bp, struct bnx2_napi *bnapi, int budget) | |||
| 2919 | if (len <= bp->rx_copy_thresh) { | 2921 | if (len <= bp->rx_copy_thresh) { |
| 2920 | struct sk_buff *new_skb; | 2922 | struct sk_buff *new_skb; |
| 2921 | 2923 | ||
| 2922 | new_skb = netdev_alloc_skb(bp->dev, len + 2); | 2924 | new_skb = netdev_alloc_skb(bp->dev, len + 6); |
| 2923 | if (new_skb == NULL) { | 2925 | if (new_skb == NULL) { |
| 2924 | bnx2_reuse_rx_skb(bp, rxr, skb, sw_ring_cons, | 2926 | bnx2_reuse_rx_skb(bp, rxr, skb, sw_ring_cons, |
| 2925 | sw_ring_prod); | 2927 | sw_ring_prod); |
| @@ -2928,9 +2930,9 @@ bnx2_rx_int(struct bnx2 *bp, struct bnx2_napi *bnapi, int budget) | |||
| 2928 | 2930 | ||
| 2929 | /* aligned copy */ | 2931 | /* aligned copy */ |
| 2930 | skb_copy_from_linear_data_offset(skb, | 2932 | skb_copy_from_linear_data_offset(skb, |
| 2931 | BNX2_RX_OFFSET - 2, | 2933 | BNX2_RX_OFFSET - 6, |
| 2932 | new_skb->data, len + 2); | 2934 | new_skb->data, len + 6); |
| 2933 | skb_reserve(new_skb, 2); | 2935 | skb_reserve(new_skb, 6); |
| 2934 | skb_put(new_skb, len); | 2936 | skb_put(new_skb, len); |
| 2935 | 2937 | ||
| 2936 | bnx2_reuse_rx_skb(bp, rxr, skb, | 2938 | bnx2_reuse_rx_skb(bp, rxr, skb, |
| @@ -2941,6 +2943,25 @@ bnx2_rx_int(struct bnx2 *bp, struct bnx2_napi *bnapi, int budget) | |||
| 2941 | dma_addr, (sw_ring_cons << 16) | sw_ring_prod))) | 2943 | dma_addr, (sw_ring_cons << 16) | sw_ring_prod))) |
| 2942 | goto next_rx; | 2944 | goto next_rx; |
| 2943 | 2945 | ||
| 2946 | if ((status & L2_FHDR_STATUS_L2_VLAN_TAG) && | ||
| 2947 | !(bp->rx_mode & BNX2_EMAC_RX_MODE_KEEP_VLAN_TAG)) { | ||
| 2948 | vtag = rx_hdr->l2_fhdr_vlan_tag; | ||
| 2949 | #ifdef BCM_VLAN | ||
| 2950 | if (bp->vlgrp) | ||
| 2951 | hw_vlan = 1; | ||
| 2952 | else | ||
| 2953 | #endif | ||
| 2954 | { | ||
| 2955 | struct vlan_ethhdr *ve = (struct vlan_ethhdr *) | ||
| 2956 | __skb_push(skb, 4); | ||
| 2957 | |||
| 2958 | memmove(ve, skb->data + 4, ETH_ALEN * 2); | ||
| 2959 | ve->h_vlan_proto = htons(ETH_P_8021Q); | ||
| 2960 | ve->h_vlan_TCI = htons(vtag); | ||
| 2961 | len += 4; | ||
| 2962 | } | ||
| 2963 | } | ||
| 2964 | |||
| 2944 | skb->protocol = eth_type_trans(skb, bp->dev); | 2965 | skb->protocol = eth_type_trans(skb, bp->dev); |
| 2945 | 2966 | ||
| 2946 | if ((len > (bp->dev->mtu + ETH_HLEN)) && | 2967 | if ((len > (bp->dev->mtu + ETH_HLEN)) && |
| @@ -2962,10 +2983,8 @@ bnx2_rx_int(struct bnx2 *bp, struct bnx2_napi *bnapi, int budget) | |||
| 2962 | } | 2983 | } |
| 2963 | 2984 | ||
| 2964 | #ifdef BCM_VLAN | 2985 | #ifdef BCM_VLAN |
| 2965 | if ((status & L2_FHDR_STATUS_L2_VLAN_TAG) && bp->vlgrp) { | 2986 | if (hw_vlan) |
| 2966 | vlan_hwaccel_receive_skb(skb, bp->vlgrp, | 2987 | vlan_hwaccel_receive_skb(skb, bp->vlgrp, vtag); |
| 2967 | rx_hdr->l2_fhdr_vlan_tag); | ||
| 2968 | } | ||
| 2969 | else | 2988 | else |
| 2970 | #endif | 2989 | #endif |
| 2971 | netif_receive_skb(skb); | 2990 | netif_receive_skb(skb); |
| @@ -3237,10 +3256,10 @@ bnx2_set_rx_mode(struct net_device *dev) | |||
| 3237 | BNX2_EMAC_RX_MODE_KEEP_VLAN_TAG); | 3256 | BNX2_EMAC_RX_MODE_KEEP_VLAN_TAG); |
| 3238 | sort_mode = 1 | BNX2_RPM_SORT_USER0_BC_EN; | 3257 | sort_mode = 1 | BNX2_RPM_SORT_USER0_BC_EN; |
| 3239 | #ifdef BCM_VLAN | 3258 | #ifdef BCM_VLAN |
| 3240 | if (!bp->vlgrp && !(bp->flags & BNX2_FLAG_ASF_ENABLE)) | 3259 | if (!bp->vlgrp && (bp->flags & BNX2_FLAG_CAN_KEEP_VLAN)) |
| 3241 | rx_mode |= BNX2_EMAC_RX_MODE_KEEP_VLAN_TAG; | 3260 | rx_mode |= BNX2_EMAC_RX_MODE_KEEP_VLAN_TAG; |
| 3242 | #else | 3261 | #else |
| 3243 | if (!(bp->flags & BNX2_FLAG_ASF_ENABLE)) | 3262 | if (bp->flags & BNX2_FLAG_CAN_KEEP_VLAN) |
| 3244 | rx_mode |= BNX2_EMAC_RX_MODE_KEEP_VLAN_TAG; | 3263 | rx_mode |= BNX2_EMAC_RX_MODE_KEEP_VLAN_TAG; |
| 3245 | #endif | 3264 | #endif |
| 3246 | if (dev->flags & IFF_PROMISC) { | 3265 | if (dev->flags & IFF_PROMISC) { |
| @@ -5963,10 +5982,12 @@ bnx2_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 5963 | vlan_tag_flags |= TX_BD_FLAGS_TCP_UDP_CKSUM; | 5982 | vlan_tag_flags |= TX_BD_FLAGS_TCP_UDP_CKSUM; |
| 5964 | } | 5983 | } |
| 5965 | 5984 | ||
| 5985 | #ifdef BCM_VLAN | ||
| 5966 | if (bp->vlgrp && vlan_tx_tag_present(skb)) { | 5986 | if (bp->vlgrp && vlan_tx_tag_present(skb)) { |
| 5967 | vlan_tag_flags |= | 5987 | vlan_tag_flags |= |
| 5968 | (TX_BD_FLAGS_VLAN_TAG | (vlan_tx_tag_get(skb) << 16)); | 5988 | (TX_BD_FLAGS_VLAN_TAG | (vlan_tx_tag_get(skb) << 16)); |
| 5969 | } | 5989 | } |
| 5990 | #endif | ||
| 5970 | if ((mss = skb_shinfo(skb)->gso_size)) { | 5991 | if ((mss = skb_shinfo(skb)->gso_size)) { |
| 5971 | u32 tcp_opt_len, ip_tcp_len; | 5992 | u32 tcp_opt_len, ip_tcp_len; |
| 5972 | struct iphdr *iph; | 5993 | struct iphdr *iph; |
diff --git a/drivers/net/bnx2x.h b/drivers/net/bnx2x.h index 4bf4f7b205f2..fd705d1295a7 100644 --- a/drivers/net/bnx2x.h +++ b/drivers/net/bnx2x.h | |||
| @@ -40,20 +40,20 @@ | |||
| 40 | #define DP(__mask, __fmt, __args...) do { \ | 40 | #define DP(__mask, __fmt, __args...) do { \ |
| 41 | if (bp->msglevel & (__mask)) \ | 41 | if (bp->msglevel & (__mask)) \ |
| 42 | printk(DP_LEVEL "[%s:%d(%s)]" __fmt, __func__, __LINE__, \ | 42 | printk(DP_LEVEL "[%s:%d(%s)]" __fmt, __func__, __LINE__, \ |
| 43 | bp->dev?(bp->dev->name):"?", ##__args); \ | 43 | bp->dev ? (bp->dev->name) : "?", ##__args); \ |
| 44 | } while (0) | 44 | } while (0) |
| 45 | 45 | ||
| 46 | /* errors debug print */ | 46 | /* errors debug print */ |
| 47 | #define BNX2X_DBG_ERR(__fmt, __args...) do { \ | 47 | #define BNX2X_DBG_ERR(__fmt, __args...) do { \ |
| 48 | if (bp->msglevel & NETIF_MSG_PROBE) \ | 48 | if (bp->msglevel & NETIF_MSG_PROBE) \ |
| 49 | printk(KERN_ERR "[%s:%d(%s)]" __fmt, __func__, __LINE__, \ | 49 | printk(KERN_ERR "[%s:%d(%s)]" __fmt, __func__, __LINE__, \ |
| 50 | bp->dev?(bp->dev->name):"?", ##__args); \ | 50 | bp->dev ? (bp->dev->name) : "?", ##__args); \ |
| 51 | } while (0) | 51 | } while (0) |
| 52 | 52 | ||
| 53 | /* for errors (never masked) */ | 53 | /* for errors (never masked) */ |
| 54 | #define BNX2X_ERR(__fmt, __args...) do { \ | 54 | #define BNX2X_ERR(__fmt, __args...) do { \ |
| 55 | printk(KERN_ERR "[%s:%d(%s)]" __fmt, __func__, __LINE__, \ | 55 | printk(KERN_ERR "[%s:%d(%s)]" __fmt, __func__, __LINE__, \ |
| 56 | bp->dev?(bp->dev->name):"?", ##__args); \ | 56 | bp->dev ? (bp->dev->name) : "?", ##__args); \ |
| 57 | } while (0) | 57 | } while (0) |
| 58 | 58 | ||
| 59 | /* before we have a dev->name use dev_info() */ | 59 | /* before we have a dev->name use dev_info() */ |
| @@ -120,16 +120,8 @@ | |||
| 120 | #define SHMEM_RD(bp, field) REG_RD(bp, SHMEM_ADDR(bp, field)) | 120 | #define SHMEM_RD(bp, field) REG_RD(bp, SHMEM_ADDR(bp, field)) |
| 121 | #define SHMEM_WR(bp, field, val) REG_WR(bp, SHMEM_ADDR(bp, field), val) | 121 | #define SHMEM_WR(bp, field, val) REG_WR(bp, SHMEM_ADDR(bp, field), val) |
| 122 | 122 | ||
| 123 | #define NIG_WR(reg, val) REG_WR(bp, reg, val) | 123 | #define EMAC_RD(bp, reg) REG_RD(bp, emac_base + reg) |
| 124 | #define EMAC_WR(reg, val) REG_WR(bp, emac_base + reg, val) | 124 | #define EMAC_WR(bp, reg, val) REG_WR(bp, emac_base + reg, val) |
| 125 | #define BMAC_WR(reg, val) REG_WR(bp, GRCBASE_NIG + bmac_addr + reg, val) | ||
| 126 | |||
| 127 | |||
| 128 | #define for_each_queue(bp, var) for (var = 0; var < bp->num_queues; var++) | ||
| 129 | |||
| 130 | #define for_each_nondefault_queue(bp, var) \ | ||
| 131 | for (var = 1; var < bp->num_queues; var++) | ||
| 132 | #define is_multi(bp) (bp->num_queues > 1) | ||
| 133 | 125 | ||
| 134 | 126 | ||
| 135 | /* fast path */ | 127 | /* fast path */ |
| @@ -159,11 +151,13 @@ struct sw_rx_page { | |||
| 159 | #define PAGES_PER_SGE_SHIFT 0 | 151 | #define PAGES_PER_SGE_SHIFT 0 |
| 160 | #define PAGES_PER_SGE (1 << PAGES_PER_SGE_SHIFT) | 152 | #define PAGES_PER_SGE (1 << PAGES_PER_SGE_SHIFT) |
| 161 | 153 | ||
| 154 | #define BCM_RX_ETH_PAYLOAD_ALIGN 64 | ||
| 155 | |||
| 162 | /* SGE ring related macros */ | 156 | /* SGE ring related macros */ |
| 163 | #define NUM_RX_SGE_PAGES 2 | 157 | #define NUM_RX_SGE_PAGES 2 |
| 164 | #define RX_SGE_CNT (BCM_PAGE_SIZE / sizeof(struct eth_rx_sge)) | 158 | #define RX_SGE_CNT (BCM_PAGE_SIZE / sizeof(struct eth_rx_sge)) |
| 165 | #define MAX_RX_SGE_CNT (RX_SGE_CNT - 2) | 159 | #define MAX_RX_SGE_CNT (RX_SGE_CNT - 2) |
| 166 | /* RX_SGE_CNT is promissed to be a power of 2 */ | 160 | /* RX_SGE_CNT is promised to be a power of 2 */ |
| 167 | #define RX_SGE_MASK (RX_SGE_CNT - 1) | 161 | #define RX_SGE_MASK (RX_SGE_CNT - 1) |
| 168 | #define NUM_RX_SGE (RX_SGE_CNT * NUM_RX_SGE_PAGES) | 162 | #define NUM_RX_SGE (RX_SGE_CNT * NUM_RX_SGE_PAGES) |
| 169 | #define MAX_RX_SGE (NUM_RX_SGE - 1) | 163 | #define MAX_RX_SGE (NUM_RX_SGE - 1) |
| @@ -258,8 +252,7 @@ struct bnx2x_fastpath { | |||
| 258 | 252 | ||
| 259 | unsigned long tx_pkt, | 253 | unsigned long tx_pkt, |
| 260 | rx_pkt, | 254 | rx_pkt, |
| 261 | rx_calls, | 255 | rx_calls; |
| 262 | rx_alloc_failed; | ||
| 263 | /* TPA related */ | 256 | /* TPA related */ |
| 264 | struct sw_rx_bd tpa_pool[ETH_MAX_AGGREGATION_QUEUES_E1H]; | 257 | struct sw_rx_bd tpa_pool[ETH_MAX_AGGREGATION_QUEUES_E1H]; |
| 265 | u8 tpa_state[ETH_MAX_AGGREGATION_QUEUES_E1H]; | 258 | u8 tpa_state[ETH_MAX_AGGREGATION_QUEUES_E1H]; |
| @@ -275,6 +268,15 @@ struct bnx2x_fastpath { | |||
| 275 | 268 | ||
| 276 | #define bnx2x_fp(bp, nr, var) (bp->fp[nr].var) | 269 | #define bnx2x_fp(bp, nr, var) (bp->fp[nr].var) |
| 277 | 270 | ||
| 271 | #define BNX2X_HAS_TX_WORK(fp) \ | ||
| 272 | ((fp->tx_pkt_prod != le16_to_cpu(*fp->tx_cons_sb)) || \ | ||
| 273 | (fp->tx_pkt_prod != fp->tx_pkt_cons)) | ||
| 274 | |||
| 275 | #define BNX2X_HAS_RX_WORK(fp) \ | ||
| 276 | (fp->rx_comp_cons != rx_cons_sb) | ||
| 277 | |||
| 278 | #define BNX2X_HAS_WORK(fp) (BNX2X_HAS_RX_WORK(fp) || BNX2X_HAS_TX_WORK(fp)) | ||
| 279 | |||
| 278 | 280 | ||
| 279 | /* MC hsi */ | 281 | /* MC hsi */ |
| 280 | #define MAX_FETCH_BD 13 /* HW max BDs per packet */ | 282 | #define MAX_FETCH_BD 13 /* HW max BDs per packet */ |
| @@ -317,7 +319,7 @@ struct bnx2x_fastpath { | |||
| 317 | #define RCQ_BD(x) ((x) & MAX_RCQ_BD) | 319 | #define RCQ_BD(x) ((x) & MAX_RCQ_BD) |
| 318 | 320 | ||
| 319 | 321 | ||
| 320 | /* This is needed for determening of last_max */ | 322 | /* This is needed for determining of last_max */ |
| 321 | #define SUB_S16(a, b) (s16)((s16)(a) - (s16)(b)) | 323 | #define SUB_S16(a, b) (s16)((s16)(a) - (s16)(b)) |
| 322 | 324 | ||
| 323 | #define __SGE_MASK_SET_BIT(el, bit) \ | 325 | #define __SGE_MASK_SET_BIT(el, bit) \ |
| @@ -386,20 +388,28 @@ struct bnx2x_fastpath { | |||
| 386 | #define TPA_TYPE(cqe_fp_flags) ((cqe_fp_flags) & \ | 388 | #define TPA_TYPE(cqe_fp_flags) ((cqe_fp_flags) & \ |
| 387 | (TPA_TYPE_START | TPA_TYPE_END)) | 389 | (TPA_TYPE_START | TPA_TYPE_END)) |
| 388 | 390 | ||
| 389 | #define BNX2X_RX_SUM_OK(cqe) \ | 391 | #define ETH_RX_ERROR_FALGS ETH_FAST_PATH_RX_CQE_PHY_DECODE_ERR_FLG |
| 390 | (!(cqe->fast_path_cqe.status_flags & \ | 392 | |
| 391 | (ETH_FAST_PATH_RX_CQE_IP_XSUM_NO_VALIDATION_FLG | \ | 393 | #define BNX2X_IP_CSUM_ERR(cqe) \ |
| 392 | ETH_FAST_PATH_RX_CQE_L4_XSUM_NO_VALIDATION_FLG))) | 394 | (!((cqe)->fast_path_cqe.status_flags & \ |
| 395 | ETH_FAST_PATH_RX_CQE_IP_XSUM_NO_VALIDATION_FLG) && \ | ||
| 396 | ((cqe)->fast_path_cqe.type_error_flags & \ | ||
| 397 | ETH_FAST_PATH_RX_CQE_IP_BAD_XSUM_FLG)) | ||
| 398 | |||
| 399 | #define BNX2X_L4_CSUM_ERR(cqe) \ | ||
| 400 | (!((cqe)->fast_path_cqe.status_flags & \ | ||
| 401 | ETH_FAST_PATH_RX_CQE_L4_XSUM_NO_VALIDATION_FLG) && \ | ||
| 402 | ((cqe)->fast_path_cqe.type_error_flags & \ | ||
| 403 | ETH_FAST_PATH_RX_CQE_L4_BAD_XSUM_FLG)) | ||
| 404 | |||
| 405 | #define BNX2X_RX_CSUM_OK(cqe) \ | ||
| 406 | (!(BNX2X_L4_CSUM_ERR(cqe) || BNX2X_IP_CSUM_ERR(cqe))) | ||
| 393 | 407 | ||
| 394 | #define BNX2X_RX_SUM_FIX(cqe) \ | 408 | #define BNX2X_RX_SUM_FIX(cqe) \ |
| 395 | ((le16_to_cpu(cqe->fast_path_cqe.pars_flags.flags) & \ | 409 | ((le16_to_cpu(cqe->fast_path_cqe.pars_flags.flags) & \ |
| 396 | PARSING_FLAGS_OVER_ETHERNET_PROTOCOL) == \ | 410 | PARSING_FLAGS_OVER_ETHERNET_PROTOCOL) == \ |
| 397 | (1 << PARSING_FLAGS_OVER_ETHERNET_PROTOCOL_SHIFT)) | 411 | (1 << PARSING_FLAGS_OVER_ETHERNET_PROTOCOL_SHIFT)) |
| 398 | 412 | ||
| 399 | #define ETH_RX_ERROR_FALGS (ETH_FAST_PATH_RX_CQE_PHY_DECODE_ERR_FLG | \ | ||
| 400 | ETH_FAST_PATH_RX_CQE_IP_BAD_XSUM_FLG | \ | ||
| 401 | ETH_FAST_PATH_RX_CQE_L4_BAD_XSUM_FLG) | ||
| 402 | |||
| 403 | 413 | ||
| 404 | #define FP_USB_FUNC_OFF (2 + 2*HC_USTORM_SB_NUM_INDICES) | 414 | #define FP_USB_FUNC_OFF (2 + 2*HC_USTORM_SB_NUM_INDICES) |
| 405 | #define FP_CSB_FUNC_OFF (2 + 2*HC_CSTORM_SB_NUM_INDICES) | 415 | #define FP_CSB_FUNC_OFF (2 + 2*HC_CSTORM_SB_NUM_INDICES) |
| @@ -647,6 +657,8 @@ struct bnx2x_eth_stats { | |||
| 647 | 657 | ||
| 648 | u32 brb_drop_hi; | 658 | u32 brb_drop_hi; |
| 649 | u32 brb_drop_lo; | 659 | u32 brb_drop_lo; |
| 660 | u32 brb_truncate_hi; | ||
| 661 | u32 brb_truncate_lo; | ||
| 650 | 662 | ||
| 651 | u32 jabber_packets_received; | 663 | u32 jabber_packets_received; |
| 652 | 664 | ||
| @@ -663,6 +675,9 @@ struct bnx2x_eth_stats { | |||
| 663 | u32 mac_discard; | 675 | u32 mac_discard; |
| 664 | 676 | ||
| 665 | u32 driver_xoff; | 677 | u32 driver_xoff; |
| 678 | u32 rx_err_discard_pkt; | ||
| 679 | u32 rx_skb_alloc_failed; | ||
| 680 | u32 hw_csum_err; | ||
| 666 | }; | 681 | }; |
| 667 | 682 | ||
| 668 | #define STATS_OFFSET32(stat_name) \ | 683 | #define STATS_OFFSET32(stat_name) \ |
| @@ -737,8 +752,7 @@ struct bnx2x { | |||
| 737 | 752 | ||
| 738 | u32 rx_csum; | 753 | u32 rx_csum; |
| 739 | u32 rx_offset; | 754 | u32 rx_offset; |
| 740 | u32 rx_buf_use_size; /* useable size */ | 755 | u32 rx_buf_size; |
| 741 | u32 rx_buf_size; /* with alignment */ | ||
| 742 | #define ETH_OVREHEAD (ETH_HLEN + 8) /* 8 for CRC + VLAN */ | 756 | #define ETH_OVREHEAD (ETH_HLEN + 8) /* 8 for CRC + VLAN */ |
| 743 | #define ETH_MIN_PACKET_SIZE 60 | 757 | #define ETH_MIN_PACKET_SIZE 60 |
| 744 | #define ETH_MAX_PACKET_SIZE 1500 | 758 | #define ETH_MAX_PACKET_SIZE 1500 |
| @@ -753,7 +767,6 @@ struct bnx2x { | |||
| 753 | u16 def_att_idx; | 767 | u16 def_att_idx; |
| 754 | u32 attn_state; | 768 | u32 attn_state; |
| 755 | struct attn_route attn_group[MAX_DYNAMIC_ATTN_GRPS]; | 769 | struct attn_route attn_group[MAX_DYNAMIC_ATTN_GRPS]; |
| 756 | u32 aeu_mask; | ||
| 757 | u32 nig_mask; | 770 | u32 nig_mask; |
| 758 | 771 | ||
| 759 | /* slow path ring */ | 772 | /* slow path ring */ |
| @@ -772,7 +785,7 @@ struct bnx2x { | |||
| 772 | u8 stats_pending; | 785 | u8 stats_pending; |
| 773 | u8 set_mac_pending; | 786 | u8 set_mac_pending; |
| 774 | 787 | ||
| 775 | /* End of fileds used in the performance code paths */ | 788 | /* End of fields used in the performance code paths */ |
| 776 | 789 | ||
| 777 | int panic; | 790 | int panic; |
| 778 | int msglevel; | 791 | int msglevel; |
| @@ -794,9 +807,6 @@ struct bnx2x { | |||
| 794 | #define BP_FUNC(bp) (bp->func) | 807 | #define BP_FUNC(bp) (bp->func) |
| 795 | #define BP_E1HVN(bp) (bp->func >> 1) | 808 | #define BP_E1HVN(bp) (bp->func >> 1) |
| 796 | #define BP_L_ID(bp) (BP_E1HVN(bp) << 2) | 809 | #define BP_L_ID(bp) (BP_E1HVN(bp) << 2) |
| 797 | /* assorted E1HVN */ | ||
| 798 | #define IS_E1HMF(bp) (bp->e1hmf != 0) | ||
| 799 | #define BP_MAX_QUEUES(bp) (IS_E1HMF(bp) ? 4 : 16) | ||
| 800 | 810 | ||
| 801 | int pm_cap; | 811 | int pm_cap; |
| 802 | int pcie_cap; | 812 | int pcie_cap; |
| @@ -821,6 +831,7 @@ struct bnx2x { | |||
| 821 | u32 mf_config; | 831 | u32 mf_config; |
| 822 | u16 e1hov; | 832 | u16 e1hov; |
| 823 | u8 e1hmf; | 833 | u8 e1hmf; |
| 834 | #define IS_E1HMF(bp) (bp->e1hmf != 0) | ||
| 824 | 835 | ||
| 825 | u8 wol; | 836 | u8 wol; |
| 826 | 837 | ||
| @@ -836,7 +847,6 @@ struct bnx2x { | |||
| 836 | u16 rx_ticks_int; | 847 | u16 rx_ticks_int; |
| 837 | u16 rx_ticks; | 848 | u16 rx_ticks; |
| 838 | 849 | ||
| 839 | u32 stats_ticks; | ||
| 840 | u32 lin_cnt; | 850 | u32 lin_cnt; |
| 841 | 851 | ||
| 842 | int state; | 852 | int state; |
| @@ -852,6 +862,7 @@ struct bnx2x { | |||
| 852 | #define BNX2X_STATE_ERROR 0xf000 | 862 | #define BNX2X_STATE_ERROR 0xf000 |
| 853 | 863 | ||
| 854 | int num_queues; | 864 | int num_queues; |
| 865 | #define BP_MAX_QUEUES(bp) (IS_E1HMF(bp) ? 4 : 16) | ||
| 855 | 866 | ||
| 856 | u32 rx_mode; | 867 | u32 rx_mode; |
| 857 | #define BNX2X_RX_MODE_NONE 0 | 868 | #define BNX2X_RX_MODE_NONE 0 |
| @@ -902,10 +913,17 @@ struct bnx2x { | |||
| 902 | }; | 913 | }; |
| 903 | 914 | ||
| 904 | 915 | ||
| 916 | #define for_each_queue(bp, var) for (var = 0; var < bp->num_queues; var++) | ||
| 917 | |||
| 918 | #define for_each_nondefault_queue(bp, var) \ | ||
| 919 | for (var = 1; var < bp->num_queues; var++) | ||
| 920 | #define is_multi(bp) (bp->num_queues > 1) | ||
| 921 | |||
| 922 | |||
| 905 | void bnx2x_read_dmae(struct bnx2x *bp, u32 src_addr, u32 len32); | 923 | void bnx2x_read_dmae(struct bnx2x *bp, u32 src_addr, u32 len32); |
| 906 | void bnx2x_write_dmae(struct bnx2x *bp, dma_addr_t dma_addr, u32 dst_addr, | 924 | void bnx2x_write_dmae(struct bnx2x *bp, dma_addr_t dma_addr, u32 dst_addr, |
| 907 | u32 len32); | 925 | u32 len32); |
| 908 | int bnx2x_set_gpio(struct bnx2x *bp, int gpio_num, u32 mode); | 926 | int bnx2x_set_gpio(struct bnx2x *bp, int gpio_num, u32 mode, u8 port); |
| 909 | 927 | ||
| 910 | static inline u32 reg_poll(struct bnx2x *bp, u32 reg, u32 expected, int ms, | 928 | static inline u32 reg_poll(struct bnx2x *bp, u32 reg, u32 expected, int ms, |
| 911 | int wait) | 929 | int wait) |
| @@ -976,7 +994,7 @@ static inline u32 reg_poll(struct bnx2x *bp, u32 reg, u32 expected, int ms, | |||
| 976 | #define PCICFG_LINK_SPEED_SHIFT 16 | 994 | #define PCICFG_LINK_SPEED_SHIFT 16 |
| 977 | 995 | ||
| 978 | 996 | ||
| 979 | #define BNX2X_NUM_STATS 39 | 997 | #define BNX2X_NUM_STATS 42 |
| 980 | #define BNX2X_NUM_TESTS 8 | 998 | #define BNX2X_NUM_TESTS 8 |
| 981 | 999 | ||
| 982 | #define BNX2X_MAC_LOOPBACK 0 | 1000 | #define BNX2X_MAC_LOOPBACK 0 |
| @@ -1007,10 +1025,10 @@ static inline u32 reg_poll(struct bnx2x *bp, u32 reg, u32 expected, int ms, | |||
| 1007 | /* resolution of the rate shaping timer - 100 usec */ | 1025 | /* resolution of the rate shaping timer - 100 usec */ |
| 1008 | #define RS_PERIODIC_TIMEOUT_USEC 100 | 1026 | #define RS_PERIODIC_TIMEOUT_USEC 100 |
| 1009 | /* resolution of fairness algorithm in usecs - | 1027 | /* resolution of fairness algorithm in usecs - |
| 1010 | coefficient for clauclating the actuall t fair */ | 1028 | coefficient for calculating the actual t fair */ |
| 1011 | #define T_FAIR_COEF 10000000 | 1029 | #define T_FAIR_COEF 10000000 |
| 1012 | /* number of bytes in single QM arbitration cycle - | 1030 | /* number of bytes in single QM arbitration cycle - |
| 1013 | coeffiecnt for calculating the fairness timer */ | 1031 | coefficient for calculating the fairness timer */ |
| 1014 | #define QM_ARB_BYTES 40000 | 1032 | #define QM_ARB_BYTES 40000 |
| 1015 | #define FAIR_MEM 2 | 1033 | #define FAIR_MEM 2 |
| 1016 | 1034 | ||
diff --git a/drivers/net/bnx2x_fw_defs.h b/drivers/net/bnx2x_fw_defs.h index e3da7f69d27b..192fa981b930 100644 --- a/drivers/net/bnx2x_fw_defs.h +++ b/drivers/net/bnx2x_fw_defs.h | |||
| @@ -9,165 +9,171 @@ | |||
| 9 | 9 | ||
| 10 | 10 | ||
| 11 | #define CSTORM_ASSERT_LIST_INDEX_OFFSET \ | 11 | #define CSTORM_ASSERT_LIST_INDEX_OFFSET \ |
| 12 | (IS_E1H_OFFSET? 0x7000 : 0x1000) | 12 | (IS_E1H_OFFSET ? 0x7000 : 0x1000) |
| 13 | #define CSTORM_ASSERT_LIST_OFFSET(idx) \ | 13 | #define CSTORM_ASSERT_LIST_OFFSET(idx) \ |
| 14 | (IS_E1H_OFFSET? (0x7020 + (idx * 0x10)) : (0x1020 + (idx * 0x10))) | 14 | (IS_E1H_OFFSET ? (0x7020 + (idx * 0x10)) : (0x1020 + (idx * 0x10))) |
| 15 | #define CSTORM_DEF_SB_HC_DISABLE_OFFSET(function, index) \ | 15 | #define CSTORM_DEF_SB_HC_DISABLE_OFFSET(function, index) \ |
| 16 | (IS_E1H_OFFSET? (0x8522 + ((function>>1) * 0x40) + ((function&1) \ | 16 | (IS_E1H_OFFSET ? (0x8522 + ((function>>1) * 0x40) + \ |
| 17 | * 0x100) + (index * 0x4)) : (0x1922 + (function * 0x40) + (index \ | 17 | ((function&1) * 0x100) + (index * 0x4)) : (0x1922 + (function * \ |
| 18 | * 0x4))) | 18 | 0x40) + (index * 0x4))) |
| 19 | #define CSTORM_DEF_SB_HOST_SB_ADDR_OFFSET(function) \ | 19 | #define CSTORM_DEF_SB_HOST_SB_ADDR_OFFSET(function) \ |
| 20 | (IS_E1H_OFFSET? (0x8500 + ((function>>1) * 0x40) + ((function&1) \ | 20 | (IS_E1H_OFFSET ? (0x8500 + ((function>>1) * 0x40) + \ |
| 21 | * 0x100)) : (0x1900 + (function * 0x40))) | 21 | ((function&1) * 0x100)) : (0x1900 + (function * 0x40))) |
| 22 | #define CSTORM_DEF_SB_HOST_STATUS_BLOCK_OFFSET(function) \ | 22 | #define CSTORM_DEF_SB_HOST_STATUS_BLOCK_OFFSET(function) \ |
| 23 | (IS_E1H_OFFSET? (0x8508 + ((function>>1) * 0x40) + ((function&1) \ | 23 | (IS_E1H_OFFSET ? (0x8508 + ((function>>1) * 0x40) + \ |
| 24 | * 0x100)) : (0x1908 + (function * 0x40))) | 24 | ((function&1) * 0x100)) : (0x1908 + (function * 0x40))) |
| 25 | #define CSTORM_FUNCTION_MODE_OFFSET \ | 25 | #define CSTORM_FUNCTION_MODE_OFFSET \ |
| 26 | (IS_E1H_OFFSET? 0x11e8 : 0xffffffff) | 26 | (IS_E1H_OFFSET ? 0x11e8 : 0xffffffff) |
| 27 | #define CSTORM_HC_BTR_OFFSET(port) \ | 27 | #define CSTORM_HC_BTR_OFFSET(port) \ |
| 28 | (IS_E1H_OFFSET? (0x8704 + (port * 0xf0)) : (0x1984 + (port * 0xc0))) | 28 | (IS_E1H_OFFSET ? (0x8704 + (port * 0xf0)) : (0x1984 + (port * 0xc0))) |
| 29 | #define CSTORM_SB_HC_DISABLE_OFFSET(port, cpu_id, index) \ | 29 | #define CSTORM_SB_HC_DISABLE_OFFSET(port, cpu_id, index) \ |
| 30 | (IS_E1H_OFFSET? (0x801a + (port * 0x280) + (cpu_id * 0x28) + \ | 30 | (IS_E1H_OFFSET ? (0x801a + (port * 0x280) + (cpu_id * 0x28) + \ |
| 31 | (index * 0x4)) : (0x141a + (port * 0x280) + (cpu_id * 0x28) + \ | 31 | (index * 0x4)) : (0x141a + (port * 0x280) + (cpu_id * 0x28) + \ |
| 32 | (index * 0x4))) | 32 | (index * 0x4))) |
| 33 | #define CSTORM_SB_HC_TIMEOUT_OFFSET(port, cpu_id, index) \ | 33 | #define CSTORM_SB_HC_TIMEOUT_OFFSET(port, cpu_id, index) \ |
| 34 | (IS_E1H_OFFSET? (0x8018 + (port * 0x280) + (cpu_id * 0x28) + \ | 34 | (IS_E1H_OFFSET ? (0x8018 + (port * 0x280) + (cpu_id * 0x28) + \ |
| 35 | (index * 0x4)) : (0x1418 + (port * 0x280) + (cpu_id * 0x28) + \ | 35 | (index * 0x4)) : (0x1418 + (port * 0x280) + (cpu_id * 0x28) + \ |
| 36 | (index * 0x4))) | 36 | (index * 0x4))) |
| 37 | #define CSTORM_SB_HOST_SB_ADDR_OFFSET(port, cpu_id) \ | 37 | #define CSTORM_SB_HOST_SB_ADDR_OFFSET(port, cpu_id) \ |
| 38 | (IS_E1H_OFFSET? (0x8000 + (port * 0x280) + (cpu_id * 0x28)) : \ | 38 | (IS_E1H_OFFSET ? (0x8000 + (port * 0x280) + (cpu_id * 0x28)) : \ |
| 39 | (0x1400 + (port * 0x280) + (cpu_id * 0x28))) | 39 | (0x1400 + (port * 0x280) + (cpu_id * 0x28))) |
| 40 | #define CSTORM_SB_HOST_STATUS_BLOCK_OFFSET(port, cpu_id) \ | 40 | #define CSTORM_SB_HOST_STATUS_BLOCK_OFFSET(port, cpu_id) \ |
| 41 | (IS_E1H_OFFSET? (0x8008 + (port * 0x280) + (cpu_id * 0x28)) : \ | 41 | (IS_E1H_OFFSET ? (0x8008 + (port * 0x280) + (cpu_id * 0x28)) : \ |
| 42 | (0x1408 + (port * 0x280) + (cpu_id * 0x28))) | 42 | (0x1408 + (port * 0x280) + (cpu_id * 0x28))) |
| 43 | #define CSTORM_STATS_FLAGS_OFFSET(function) \ | 43 | #define CSTORM_STATS_FLAGS_OFFSET(function) \ |
| 44 | (IS_E1H_OFFSET? (0x1108 + (function * 0x8)) : (0x5108 + \ | 44 | (IS_E1H_OFFSET ? (0x1108 + (function * 0x8)) : (0x5108 + \ |
| 45 | (function * 0x8))) | 45 | (function * 0x8))) |
| 46 | #define TSTORM_APPROXIMATE_MATCH_MULTICAST_FILTERING_OFFSET(function) \ | 46 | #define TSTORM_APPROXIMATE_MATCH_MULTICAST_FILTERING_OFFSET(function) \ |
| 47 | (IS_E1H_OFFSET? (0x31c0 + (function * 0x20)) : 0xffffffff) | 47 | (IS_E1H_OFFSET ? (0x31c0 + (function * 0x20)) : 0xffffffff) |
| 48 | #define TSTORM_ASSERT_LIST_INDEX_OFFSET \ | 48 | #define TSTORM_ASSERT_LIST_INDEX_OFFSET \ |
| 49 | (IS_E1H_OFFSET? 0xa000 : 0x1000) | 49 | (IS_E1H_OFFSET ? 0xa000 : 0x1000) |
| 50 | #define TSTORM_ASSERT_LIST_OFFSET(idx) \ | 50 | #define TSTORM_ASSERT_LIST_OFFSET(idx) \ |
| 51 | (IS_E1H_OFFSET? (0xa020 + (idx * 0x10)) : (0x1020 + (idx * 0x10))) | 51 | (IS_E1H_OFFSET ? (0xa020 + (idx * 0x10)) : (0x1020 + (idx * 0x10))) |
| 52 | #define TSTORM_CLIENT_CONFIG_OFFSET(port, client_id) \ | 52 | #define TSTORM_CLIENT_CONFIG_OFFSET(port, client_id) \ |
| 53 | (IS_E1H_OFFSET? (0x3358 + (port * 0x3e8) + (client_id * 0x28)) : \ | 53 | (IS_E1H_OFFSET ? (0x3358 + (port * 0x3e8) + (client_id * 0x28)) \ |
| 54 | (0x9c8 + (port * 0x2f8) + (client_id * 0x28))) | 54 | : (0x9c8 + (port * 0x2f8) + (client_id * 0x28))) |
| 55 | #define TSTORM_DEF_SB_HC_DISABLE_OFFSET(function, index) \ | 55 | #define TSTORM_DEF_SB_HC_DISABLE_OFFSET(function, index) \ |
| 56 | (IS_E1H_OFFSET? (0xb01a + ((function>>1) * 0x28) + ((function&1) \ | 56 | (IS_E1H_OFFSET ? (0xb01a + ((function>>1) * 0x28) + \ |
| 57 | * 0xa0) + (index * 0x4)) : (0x141a + (function * 0x28) + (index * \ | 57 | ((function&1) * 0xa0) + (index * 0x4)) : (0x141a + (function * \ |
| 58 | 0x4))) | 58 | 0x28) + (index * 0x4))) |
| 59 | #define TSTORM_DEF_SB_HOST_SB_ADDR_OFFSET(function) \ | 59 | #define TSTORM_DEF_SB_HOST_SB_ADDR_OFFSET(function) \ |
| 60 | (IS_E1H_OFFSET? (0xb000 + ((function>>1) * 0x28) + ((function&1) \ | 60 | (IS_E1H_OFFSET ? (0xb000 + ((function>>1) * 0x28) + \ |
| 61 | * 0xa0)) : (0x1400 + (function * 0x28))) | 61 | ((function&1) * 0xa0)) : (0x1400 + (function * 0x28))) |
| 62 | #define TSTORM_DEF_SB_HOST_STATUS_BLOCK_OFFSET(function) \ | 62 | #define TSTORM_DEF_SB_HOST_STATUS_BLOCK_OFFSET(function) \ |
| 63 | (IS_E1H_OFFSET? (0xb008 + ((function>>1) * 0x28) + ((function&1) \ | 63 | (IS_E1H_OFFSET ? (0xb008 + ((function>>1) * 0x28) + \ |
| 64 | * 0xa0)) : (0x1408 + (function * 0x28))) | 64 | ((function&1) * 0xa0)) : (0x1408 + (function * 0x28))) |
| 65 | #define TSTORM_ETH_STATS_QUERY_ADDR_OFFSET(function) \ | 65 | #define TSTORM_ETH_STATS_QUERY_ADDR_OFFSET(function) \ |
| 66 | (IS_E1H_OFFSET? (0x2b80 + (function * 0x8)) : (0x4b68 + \ | 66 | (IS_E1H_OFFSET ? (0x2b80 + (function * 0x8)) : (0x4b68 + \ |
| 67 | (function * 0x8))) | 67 | (function * 0x8))) |
| 68 | #define TSTORM_FUNCTION_COMMON_CONFIG_OFFSET(function) \ | 68 | #define TSTORM_FUNCTION_COMMON_CONFIG_OFFSET(function) \ |
| 69 | (IS_E1H_OFFSET? (0x3000 + (function * 0x38)) : (0x1500 + \ | 69 | (IS_E1H_OFFSET ? (0x3000 + (function * 0x38)) : (0x1500 + \ |
| 70 | (function * 0x38))) | 70 | (function * 0x38))) |
| 71 | #define TSTORM_FUNCTION_MODE_OFFSET \ | 71 | #define TSTORM_FUNCTION_MODE_OFFSET \ |
| 72 | (IS_E1H_OFFSET? 0x1ad0 : 0xffffffff) | 72 | (IS_E1H_OFFSET ? 0x1ad0 : 0xffffffff) |
| 73 | #define TSTORM_HC_BTR_OFFSET(port) \ | 73 | #define TSTORM_HC_BTR_OFFSET(port) \ |
| 74 | (IS_E1H_OFFSET? (0xb144 + (port * 0x30)) : (0x1454 + (port * 0x18))) | 74 | (IS_E1H_OFFSET ? (0xb144 + (port * 0x30)) : (0x1454 + (port * 0x18))) |
| 75 | #define TSTORM_INDIRECTION_TABLE_OFFSET(function) \ | 75 | #define TSTORM_INDIRECTION_TABLE_OFFSET(function) \ |
| 76 | (IS_E1H_OFFSET? (0x12c8 + (function * 0x80)) : (0x22c8 + \ | 76 | (IS_E1H_OFFSET ? (0x12c8 + (function * 0x80)) : (0x22c8 + \ |
| 77 | (function * 0x80))) | 77 | (function * 0x80))) |
| 78 | #define TSTORM_INDIRECTION_TABLE_SIZE 0x80 | 78 | #define TSTORM_INDIRECTION_TABLE_SIZE 0x80 |
| 79 | #define TSTORM_MAC_FILTER_CONFIG_OFFSET(function) \ | 79 | #define TSTORM_MAC_FILTER_CONFIG_OFFSET(function) \ |
| 80 | (IS_E1H_OFFSET? (0x3008 + (function * 0x38)) : (0x1508 + \ | 80 | (IS_E1H_OFFSET ? (0x3008 + (function * 0x38)) : (0x1508 + \ |
| 81 | (function * 0x38))) | 81 | (function * 0x38))) |
| 82 | #define TSTORM_PER_COUNTER_ID_STATS_OFFSET(port, stats_counter_id) \ | ||
| 83 | (IS_E1H_OFFSET ? (0x2010 + (port * 0x5b0) + (stats_counter_id * \ | ||
| 84 | 0x50)) : (0x4000 + (port * 0x3f0) + (stats_counter_id * 0x38))) | ||
| 82 | #define TSTORM_RX_PRODS_OFFSET(port, client_id) \ | 85 | #define TSTORM_RX_PRODS_OFFSET(port, client_id) \ |
| 83 | (IS_E1H_OFFSET? (0x3350 + (port * 0x3e8) + (client_id * 0x28)) : \ | 86 | (IS_E1H_OFFSET ? (0x3350 + (port * 0x3e8) + (client_id * 0x28)) \ |
| 84 | (0x9c0 + (port * 0x2f8) + (client_id * 0x28))) | 87 | : (0x9c0 + (port * 0x2f8) + (client_id * 0x28))) |
| 85 | #define TSTORM_STATS_FLAGS_OFFSET(function) \ | 88 | #define TSTORM_STATS_FLAGS_OFFSET(function) \ |
| 86 | (IS_E1H_OFFSET? (0x2c00 + (function * 0x8)) : (0x4b88 + \ | 89 | (IS_E1H_OFFSET ? (0x2c00 + (function * 0x8)) : (0x4b88 + \ |
| 87 | (function * 0x8))) | 90 | (function * 0x8))) |
| 88 | #define TSTORM_TPA_EXIST_OFFSET (IS_E1H_OFFSET? 0x3b30 : 0x1c20) | 91 | #define TSTORM_TPA_EXIST_OFFSET (IS_E1H_OFFSET ? 0x3b30 : 0x1c20) |
| 89 | #define USTORM_AGG_DATA_OFFSET (IS_E1H_OFFSET? 0xa040 : 0x2c10) | 92 | #define USTORM_AGG_DATA_OFFSET (IS_E1H_OFFSET ? 0xa040 : 0x2c10) |
| 90 | #define USTORM_AGG_DATA_SIZE (IS_E1H_OFFSET? 0x2440 : 0x1200) | 93 | #define USTORM_AGG_DATA_SIZE (IS_E1H_OFFSET ? 0x2440 : 0x1200) |
| 91 | #define USTORM_ASSERT_LIST_INDEX_OFFSET \ | 94 | #define USTORM_ASSERT_LIST_INDEX_OFFSET \ |
| 92 | (IS_E1H_OFFSET? 0x8000 : 0x1000) | 95 | (IS_E1H_OFFSET ? 0x8000 : 0x1000) |
| 93 | #define USTORM_ASSERT_LIST_OFFSET(idx) \ | 96 | #define USTORM_ASSERT_LIST_OFFSET(idx) \ |
| 94 | (IS_E1H_OFFSET? (0x8020 + (idx * 0x10)) : (0x1020 + (idx * 0x10))) | 97 | (IS_E1H_OFFSET ? (0x8020 + (idx * 0x10)) : (0x1020 + (idx * 0x10))) |
| 95 | #define USTORM_CQE_PAGE_BASE_OFFSET(port, clientId) \ | 98 | #define USTORM_CQE_PAGE_BASE_OFFSET(port, clientId) \ |
| 96 | (IS_E1H_OFFSET? (0x3298 + (port * 0x258) + (clientId * 0x18)) : \ | 99 | (IS_E1H_OFFSET ? (0x3298 + (port * 0x258) + (clientId * 0x18)) : \ |
| 97 | (0x5450 + (port * 0x1c8) + (clientId * 0x18))) | 100 | (0x5450 + (port * 0x1c8) + (clientId * 0x18))) |
| 98 | #define USTORM_DEF_SB_HC_DISABLE_OFFSET(function, index) \ | 101 | #define USTORM_DEF_SB_HC_DISABLE_OFFSET(function, index) \ |
| 99 | (IS_E1H_OFFSET? (0x951a + ((function>>1) * 0x28) + ((function&1) \ | 102 | (IS_E1H_OFFSET ? (0x951a + ((function>>1) * 0x28) + \ |
| 100 | * 0xa0) + (index * 0x4)) : (0x191a + (function * 0x28) + (index * \ | 103 | ((function&1) * 0xa0) + (index * 0x4)) : (0x191a + (function * \ |
| 101 | 0x4))) | 104 | 0x28) + (index * 0x4))) |
| 102 | #define USTORM_DEF_SB_HOST_SB_ADDR_OFFSET(function) \ | 105 | #define USTORM_DEF_SB_HOST_SB_ADDR_OFFSET(function) \ |
| 103 | (IS_E1H_OFFSET? (0x9500 + ((function>>1) * 0x28) + ((function&1) \ | 106 | (IS_E1H_OFFSET ? (0x9500 + ((function>>1) * 0x28) + \ |
| 104 | * 0xa0)) : (0x1900 + (function * 0x28))) | 107 | ((function&1) * 0xa0)) : (0x1900 + (function * 0x28))) |
| 105 | #define USTORM_DEF_SB_HOST_STATUS_BLOCK_OFFSET(function) \ | 108 | #define USTORM_DEF_SB_HOST_STATUS_BLOCK_OFFSET(function) \ |
| 106 | (IS_E1H_OFFSET? (0x9508 + ((function>>1) * 0x28) + ((function&1) \ | 109 | (IS_E1H_OFFSET ? (0x9508 + ((function>>1) * 0x28) + \ |
| 107 | * 0xa0)) : (0x1908 + (function * 0x28))) | 110 | ((function&1) * 0xa0)) : (0x1908 + (function * 0x28))) |
| 108 | #define USTORM_FUNCTION_MODE_OFFSET \ | 111 | #define USTORM_FUNCTION_MODE_OFFSET \ |
| 109 | (IS_E1H_OFFSET? 0x2448 : 0xffffffff) | 112 | (IS_E1H_OFFSET ? 0x2448 : 0xffffffff) |
| 110 | #define USTORM_HC_BTR_OFFSET(port) \ | 113 | #define USTORM_HC_BTR_OFFSET(port) \ |
| 111 | (IS_E1H_OFFSET? (0x9644 + (port * 0xd0)) : (0x1954 + (port * 0xb8))) | 114 | (IS_E1H_OFFSET ? (0x9644 + (port * 0xd0)) : (0x1954 + (port * 0xb8))) |
| 112 | #define USTORM_MAX_AGG_SIZE_OFFSET(port, clientId) \ | 115 | #define USTORM_MAX_AGG_SIZE_OFFSET(port, clientId) \ |
| 113 | (IS_E1H_OFFSET? (0x3290 + (port * 0x258) + (clientId * 0x18)) : \ | 116 | (IS_E1H_OFFSET ? (0x3290 + (port * 0x258) + (clientId * 0x18)) : \ |
| 114 | (0x5448 + (port * 0x1c8) + (clientId * 0x18))) | 117 | (0x5448 + (port * 0x1c8) + (clientId * 0x18))) |
| 115 | #define USTORM_MEM_WORKAROUND_ADDRESS_OFFSET(function) \ | 118 | #define USTORM_MEM_WORKAROUND_ADDRESS_OFFSET(function) \ |
| 116 | (IS_E1H_OFFSET? (0x2408 + (function * 0x8)) : (0x5408 + \ | 119 | (IS_E1H_OFFSET ? (0x2408 + (function * 0x8)) : (0x5408 + \ |
| 117 | (function * 0x8))) | 120 | (function * 0x8))) |
| 118 | #define USTORM_SB_HC_DISABLE_OFFSET(port, cpu_id, index) \ | 121 | #define USTORM_SB_HC_DISABLE_OFFSET(port, cpu_id, index) \ |
| 119 | (IS_E1H_OFFSET? (0x901a + (port * 0x280) + (cpu_id * 0x28) + \ | 122 | (IS_E1H_OFFSET ? (0x901a + (port * 0x280) + (cpu_id * 0x28) + \ |
| 120 | (index * 0x4)) : (0x141a + (port * 0x280) + (cpu_id * 0x28) + \ | 123 | (index * 0x4)) : (0x141a + (port * 0x280) + (cpu_id * 0x28) + \ |
| 121 | (index * 0x4))) | 124 | (index * 0x4))) |
| 122 | #define USTORM_SB_HC_TIMEOUT_OFFSET(port, cpu_id, index) \ | 125 | #define USTORM_SB_HC_TIMEOUT_OFFSET(port, cpu_id, index) \ |
| 123 | (IS_E1H_OFFSET? (0x9018 + (port * 0x280) + (cpu_id * 0x28) + \ | 126 | (IS_E1H_OFFSET ? (0x9018 + (port * 0x280) + (cpu_id * 0x28) + \ |
| 124 | (index * 0x4)) : (0x1418 + (port * 0x280) + (cpu_id * 0x28) + \ | 127 | (index * 0x4)) : (0x1418 + (port * 0x280) + (cpu_id * 0x28) + \ |
| 125 | (index * 0x4))) | 128 | (index * 0x4))) |
| 126 | #define USTORM_SB_HOST_SB_ADDR_OFFSET(port, cpu_id) \ | 129 | #define USTORM_SB_HOST_SB_ADDR_OFFSET(port, cpu_id) \ |
| 127 | (IS_E1H_OFFSET? (0x9000 + (port * 0x280) + (cpu_id * 0x28)) : \ | 130 | (IS_E1H_OFFSET ? (0x9000 + (port * 0x280) + (cpu_id * 0x28)) : \ |
| 128 | (0x1400 + (port * 0x280) + (cpu_id * 0x28))) | 131 | (0x1400 + (port * 0x280) + (cpu_id * 0x28))) |
| 129 | #define USTORM_SB_HOST_STATUS_BLOCK_OFFSET(port, cpu_id) \ | 132 | #define USTORM_SB_HOST_STATUS_BLOCK_OFFSET(port, cpu_id) \ |
| 130 | (IS_E1H_OFFSET? (0x9008 + (port * 0x280) + (cpu_id * 0x28)) : \ | 133 | (IS_E1H_OFFSET ? (0x9008 + (port * 0x280) + (cpu_id * 0x28)) : \ |
| 131 | (0x1408 + (port * 0x280) + (cpu_id * 0x28))) | 134 | (0x1408 + (port * 0x280) + (cpu_id * 0x28))) |
| 132 | #define XSTORM_ASSERT_LIST_INDEX_OFFSET \ | 135 | #define XSTORM_ASSERT_LIST_INDEX_OFFSET \ |
| 133 | (IS_E1H_OFFSET? 0x9000 : 0x1000) | 136 | (IS_E1H_OFFSET ? 0x9000 : 0x1000) |
| 134 | #define XSTORM_ASSERT_LIST_OFFSET(idx) \ | 137 | #define XSTORM_ASSERT_LIST_OFFSET(idx) \ |
| 135 | (IS_E1H_OFFSET? (0x9020 + (idx * 0x10)) : (0x1020 + (idx * 0x10))) | 138 | (IS_E1H_OFFSET ? (0x9020 + (idx * 0x10)) : (0x1020 + (idx * 0x10))) |
| 136 | #define XSTORM_CMNG_PER_PORT_VARS_OFFSET(port) \ | 139 | #define XSTORM_CMNG_PER_PORT_VARS_OFFSET(port) \ |
| 137 | (IS_E1H_OFFSET? (0x24a8 + (port * 0x40)) : (0x3ba0 + (port * 0x40))) | 140 | (IS_E1H_OFFSET ? (0x24a8 + (port * 0x40)) : (0x3ba0 + (port * 0x40))) |
| 138 | #define XSTORM_DEF_SB_HC_DISABLE_OFFSET(function, index) \ | 141 | #define XSTORM_DEF_SB_HC_DISABLE_OFFSET(function, index) \ |
| 139 | (IS_E1H_OFFSET? (0xa01a + ((function>>1) * 0x28) + ((function&1) \ | 142 | (IS_E1H_OFFSET ? (0xa01a + ((function>>1) * 0x28) + \ |
| 140 | * 0xa0) + (index * 0x4)) : (0x141a + (function * 0x28) + (index * \ | 143 | ((function&1) * 0xa0) + (index * 0x4)) : (0x141a + (function * \ |
| 141 | 0x4))) | 144 | 0x28) + (index * 0x4))) |
| 142 | #define XSTORM_DEF_SB_HOST_SB_ADDR_OFFSET(function) \ | 145 | #define XSTORM_DEF_SB_HOST_SB_ADDR_OFFSET(function) \ |
| 143 | (IS_E1H_OFFSET? (0xa000 + ((function>>1) * 0x28) + ((function&1) \ | 146 | (IS_E1H_OFFSET ? (0xa000 + ((function>>1) * 0x28) + \ |
| 144 | * 0xa0)) : (0x1400 + (function * 0x28))) | 147 | ((function&1) * 0xa0)) : (0x1400 + (function * 0x28))) |
| 145 | #define XSTORM_DEF_SB_HOST_STATUS_BLOCK_OFFSET(function) \ | 148 | #define XSTORM_DEF_SB_HOST_STATUS_BLOCK_OFFSET(function) \ |
| 146 | (IS_E1H_OFFSET? (0xa008 + ((function>>1) * 0x28) + ((function&1) \ | 149 | (IS_E1H_OFFSET ? (0xa008 + ((function>>1) * 0x28) + \ |
| 147 | * 0xa0)) : (0x1408 + (function * 0x28))) | 150 | ((function&1) * 0xa0)) : (0x1408 + (function * 0x28))) |
| 148 | #define XSTORM_E1HOV_OFFSET(function) \ | 151 | #define XSTORM_E1HOV_OFFSET(function) \ |
| 149 | (IS_E1H_OFFSET? (0x2ab8 + (function * 0x2)) : 0xffffffff) | 152 | (IS_E1H_OFFSET ? (0x2ab8 + (function * 0x2)) : 0xffffffff) |
| 150 | #define XSTORM_ETH_STATS_QUERY_ADDR_OFFSET(function) \ | 153 | #define XSTORM_ETH_STATS_QUERY_ADDR_OFFSET(function) \ |
| 151 | (IS_E1H_OFFSET? (0x2418 + (function * 0x8)) : (0x3b70 + \ | 154 | (IS_E1H_OFFSET ? (0x2418 + (function * 0x8)) : (0x3b70 + \ |
| 152 | (function * 0x8))) | 155 | (function * 0x8))) |
| 153 | #define XSTORM_FAIRNESS_PER_VN_VARS_OFFSET(function) \ | 156 | #define XSTORM_FAIRNESS_PER_VN_VARS_OFFSET(function) \ |
| 154 | (IS_E1H_OFFSET? (0x2568 + (function * 0x70)) : (0x3c60 + \ | 157 | (IS_E1H_OFFSET ? (0x2568 + (function * 0x70)) : (0x3c60 + \ |
| 155 | (function * 0x70))) | 158 | (function * 0x70))) |
| 156 | #define XSTORM_FUNCTION_MODE_OFFSET \ | 159 | #define XSTORM_FUNCTION_MODE_OFFSET \ |
| 157 | (IS_E1H_OFFSET? 0x2ac8 : 0xffffffff) | 160 | (IS_E1H_OFFSET ? 0x2ac8 : 0xffffffff) |
| 158 | #define XSTORM_HC_BTR_OFFSET(port) \ | 161 | #define XSTORM_HC_BTR_OFFSET(port) \ |
| 159 | (IS_E1H_OFFSET? (0xa144 + (port * 0x30)) : (0x1454 + (port * 0x18))) | 162 | (IS_E1H_OFFSET ? (0xa144 + (port * 0x30)) : (0x1454 + (port * 0x18))) |
| 163 | #define XSTORM_PER_COUNTER_ID_STATS_OFFSET(port, stats_counter_id) \ | ||
| 164 | (IS_E1H_OFFSET ? (0xc000 + (port * 0x3f0) + (stats_counter_id * \ | ||
| 165 | 0x38)) : (0x3378 + (port * 0x3f0) + (stats_counter_id * 0x38))) | ||
| 160 | #define XSTORM_RATE_SHAPING_PER_VN_VARS_OFFSET(function) \ | 166 | #define XSTORM_RATE_SHAPING_PER_VN_VARS_OFFSET(function) \ |
| 161 | (IS_E1H_OFFSET? (0x2528 + (function * 0x70)) : (0x3c20 + \ | 167 | (IS_E1H_OFFSET ? (0x2528 + (function * 0x70)) : (0x3c20 + \ |
| 162 | (function * 0x70))) | 168 | (function * 0x70))) |
| 163 | #define XSTORM_SPQ_PAGE_BASE_OFFSET(function) \ | 169 | #define XSTORM_SPQ_PAGE_BASE_OFFSET(function) \ |
| 164 | (IS_E1H_OFFSET? (0x2000 + (function * 0x10)) : (0x3328 + \ | 170 | (IS_E1H_OFFSET ? (0x2000 + (function * 0x10)) : (0x3328 + \ |
| 165 | (function * 0x10))) | 171 | (function * 0x10))) |
| 166 | #define XSTORM_SPQ_PROD_OFFSET(function) \ | 172 | #define XSTORM_SPQ_PROD_OFFSET(function) \ |
| 167 | (IS_E1H_OFFSET? (0x2008 + (function * 0x10)) : (0x3330 + \ | 173 | (IS_E1H_OFFSET ? (0x2008 + (function * 0x10)) : (0x3330 + \ |
| 168 | (function * 0x10))) | 174 | (function * 0x10))) |
| 169 | #define XSTORM_STATS_FLAGS_OFFSET(function) \ | 175 | #define XSTORM_STATS_FLAGS_OFFSET(function) \ |
| 170 | (IS_E1H_OFFSET? (0x23d8 + (function * 0x8)) : (0x3b60 + \ | 176 | (IS_E1H_OFFSET ? (0x23d8 + (function * 0x8)) : (0x3b60 + \ |
| 171 | (function * 0x8))) | 177 | (function * 0x8))) |
| 172 | #define COMMON_ASM_INVALID_ASSERT_OPCODE 0x0 | 178 | #define COMMON_ASM_INVALID_ASSERT_OPCODE 0x0 |
| 173 | 179 | ||
diff --git a/drivers/net/bnx2x_hsi.h b/drivers/net/bnx2x_hsi.h index d3e8198d7dba..efd764427fa1 100644 --- a/drivers/net/bnx2x_hsi.h +++ b/drivers/net/bnx2x_hsi.h | |||
| @@ -1268,7 +1268,7 @@ struct doorbell { | |||
| 1268 | 1268 | ||
| 1269 | 1269 | ||
| 1270 | /* | 1270 | /* |
| 1271 | * IGU driver acknowlegement register | 1271 | * IGU driver acknowledgement register |
| 1272 | */ | 1272 | */ |
| 1273 | struct igu_ack_register { | 1273 | struct igu_ack_register { |
| 1274 | #if defined(__BIG_ENDIAN) | 1274 | #if defined(__BIG_ENDIAN) |
| @@ -1882,7 +1882,7 @@ struct timers_block_context { | |||
| 1882 | }; | 1882 | }; |
| 1883 | 1883 | ||
| 1884 | /* | 1884 | /* |
| 1885 | * structure for easy accessability to assembler | 1885 | * structure for easy accessibility to assembler |
| 1886 | */ | 1886 | */ |
| 1887 | struct eth_tx_bd_flags { | 1887 | struct eth_tx_bd_flags { |
| 1888 | u8 as_bitfield; | 1888 | u8 as_bitfield; |
| @@ -2044,7 +2044,7 @@ struct eth_context { | |||
| 2044 | 2044 | ||
| 2045 | 2045 | ||
| 2046 | /* | 2046 | /* |
| 2047 | * ethernet doorbell | 2047 | * Ethernet doorbell |
| 2048 | */ | 2048 | */ |
| 2049 | struct eth_tx_doorbell { | 2049 | struct eth_tx_doorbell { |
| 2050 | #if defined(__BIG_ENDIAN) | 2050 | #if defined(__BIG_ENDIAN) |
| @@ -2256,7 +2256,7 @@ struct ramrod_data { | |||
| 2256 | }; | 2256 | }; |
| 2257 | 2257 | ||
| 2258 | /* | 2258 | /* |
| 2259 | * union for ramrod data for ethernet protocol (CQE) (force size of 16 bits) | 2259 | * union for ramrod data for Ethernet protocol (CQE) (force size of 16 bits) |
| 2260 | */ | 2260 | */ |
| 2261 | union eth_ramrod_data { | 2261 | union eth_ramrod_data { |
| 2262 | struct ramrod_data general; | 2262 | struct ramrod_data general; |
| @@ -2330,7 +2330,7 @@ struct spe_hdr { | |||
| 2330 | }; | 2330 | }; |
| 2331 | 2331 | ||
| 2332 | /* | 2332 | /* |
| 2333 | * ethernet slow path element | 2333 | * Ethernet slow path element |
| 2334 | */ | 2334 | */ |
| 2335 | union eth_specific_data { | 2335 | union eth_specific_data { |
| 2336 | u8 protocol_data[8]; | 2336 | u8 protocol_data[8]; |
| @@ -2343,7 +2343,7 @@ union eth_specific_data { | |||
| 2343 | }; | 2343 | }; |
| 2344 | 2344 | ||
| 2345 | /* | 2345 | /* |
| 2346 | * ethernet slow path element | 2346 | * Ethernet slow path element |
| 2347 | */ | 2347 | */ |
| 2348 | struct eth_spe { | 2348 | struct eth_spe { |
| 2349 | struct spe_hdr hdr; | 2349 | struct spe_hdr hdr; |
| @@ -2615,7 +2615,7 @@ struct tstorm_eth_rx_producers { | |||
| 2615 | 2615 | ||
| 2616 | 2616 | ||
| 2617 | /* | 2617 | /* |
| 2618 | * common flag to indicate existance of TPA. | 2618 | * common flag to indicate existence of TPA. |
| 2619 | */ | 2619 | */ |
| 2620 | struct tstorm_eth_tpa_exist { | 2620 | struct tstorm_eth_tpa_exist { |
| 2621 | #if defined(__BIG_ENDIAN) | 2621 | #if defined(__BIG_ENDIAN) |
| @@ -2765,7 +2765,7 @@ struct tstorm_common_stats { | |||
| 2765 | }; | 2765 | }; |
| 2766 | 2766 | ||
| 2767 | /* | 2767 | /* |
| 2768 | * Eth statistics query sturcture for the eth_stats_quesry ramrod | 2768 | * Eth statistics query structure for the eth_stats_query ramrod |
| 2769 | */ | 2769 | */ |
| 2770 | struct eth_stats_query { | 2770 | struct eth_stats_query { |
| 2771 | struct xstorm_common_stats xstorm_common; | 2771 | struct xstorm_common_stats xstorm_common; |
diff --git a/drivers/net/bnx2x_init.h b/drivers/net/bnx2x_init.h index 4c7750789b62..130927cfc75b 100644 --- a/drivers/net/bnx2x_init.h +++ b/drivers/net/bnx2x_init.h | |||
| @@ -72,26 +72,26 @@ | |||
| 72 | 72 | ||
| 73 | 73 | ||
| 74 | struct raw_op { | 74 | struct raw_op { |
| 75 | u32 op :8; | 75 | u32 op:8; |
| 76 | u32 offset :24; | 76 | u32 offset:24; |
| 77 | u32 raw_data; | 77 | u32 raw_data; |
| 78 | }; | 78 | }; |
| 79 | 79 | ||
| 80 | struct op_read { | 80 | struct op_read { |
| 81 | u32 op :8; | 81 | u32 op:8; |
| 82 | u32 offset :24; | 82 | u32 offset:24; |
| 83 | u32 pad; | 83 | u32 pad; |
| 84 | }; | 84 | }; |
| 85 | 85 | ||
| 86 | struct op_write { | 86 | struct op_write { |
| 87 | u32 op :8; | 87 | u32 op:8; |
| 88 | u32 offset :24; | 88 | u32 offset:24; |
| 89 | u32 val; | 89 | u32 val; |
| 90 | }; | 90 | }; |
| 91 | 91 | ||
| 92 | struct op_string_write { | 92 | struct op_string_write { |
| 93 | u32 op :8; | 93 | u32 op:8; |
| 94 | u32 offset :24; | 94 | u32 offset:24; |
| 95 | #ifdef __LITTLE_ENDIAN | 95 | #ifdef __LITTLE_ENDIAN |
| 96 | u16 data_off; | 96 | u16 data_off; |
| 97 | u16 data_len; | 97 | u16 data_len; |
| @@ -102,8 +102,8 @@ struct op_string_write { | |||
| 102 | }; | 102 | }; |
| 103 | 103 | ||
| 104 | struct op_zero { | 104 | struct op_zero { |
| 105 | u32 op :8; | 105 | u32 op:8; |
| 106 | u32 offset :24; | 106 | u32 offset:24; |
| 107 | u32 len; | 107 | u32 len; |
| 108 | }; | 108 | }; |
| 109 | 109 | ||
| @@ -208,7 +208,7 @@ static void bnx2x_init_wr_64(struct bnx2x *bp, u32 addr, const u32 *data, | |||
| 208 | /********************************************************* | 208 | /********************************************************* |
| 209 | There are different blobs for each PRAM section. | 209 | There are different blobs for each PRAM section. |
| 210 | In addition, each blob write operation is divided into a few operations | 210 | In addition, each blob write operation is divided into a few operations |
| 211 | in order to decrease the amount of phys. contigious buffer needed. | 211 | in order to decrease the amount of phys. contiguous buffer needed. |
| 212 | Thus, when we select a blob the address may be with some offset | 212 | Thus, when we select a blob the address may be with some offset |
| 213 | from the beginning of PRAM section. | 213 | from the beginning of PRAM section. |
| 214 | The same holds for the INT_TABLE sections. | 214 | The same holds for the INT_TABLE sections. |
| @@ -336,7 +336,7 @@ static void bnx2x_init_block(struct bnx2x *bp, u32 op_start, u32 op_end) | |||
| 336 | len = op->str_wr.data_len; | 336 | len = op->str_wr.data_len; |
| 337 | data = data_base + op->str_wr.data_off; | 337 | data = data_base + op->str_wr.data_off; |
| 338 | 338 | ||
| 339 | /* carefull! it must be in order */ | 339 | /* careful! it must be in order */ |
| 340 | if (unlikely(op_type > OP_WB)) { | 340 | if (unlikely(op_type > OP_WB)) { |
| 341 | 341 | ||
| 342 | /* If E1 only */ | 342 | /* If E1 only */ |
| @@ -740,7 +740,7 @@ static u8 calc_crc8(u32 data, u8 crc) | |||
| 740 | return crc_res; | 740 | return crc_res; |
| 741 | } | 741 | } |
| 742 | 742 | ||
| 743 | /* regiesers addresses are not in order | 743 | /* registers addresses are not in order |
| 744 | so these arrays help simplify the code */ | 744 | so these arrays help simplify the code */ |
| 745 | static const int cm_start[E1H_FUNC_MAX][9] = { | 745 | static const int cm_start[E1H_FUNC_MAX][9] = { |
| 746 | {MISC_FUNC0_START, TCM_FUNC0_START, UCM_FUNC0_START, CCM_FUNC0_START, | 746 | {MISC_FUNC0_START, TCM_FUNC0_START, UCM_FUNC0_START, CCM_FUNC0_START, |
diff --git a/drivers/net/bnx2x_init_values.h b/drivers/net/bnx2x_init_values.h index 63019055e4bb..9755bf6b08dd 100644 --- a/drivers/net/bnx2x_init_values.h +++ b/drivers/net/bnx2x_init_values.h | |||
| @@ -901,31 +901,28 @@ static const struct raw_op init_ops[] = { | |||
| 901 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x3760, 0x4}, | 901 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x3760, 0x4}, |
| 902 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x1e20, 0x42}, | 902 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x1e20, 0x42}, |
| 903 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x3738, 0x9}, | 903 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x3738, 0x9}, |
| 904 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3000, 0x400}, | 904 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x4b68, 0x2}, |
| 905 | {OP_SW_E1H, USEM_REG_FAST_MEMORY + 0x3738 + 0x24, 0x10293}, | 905 | {OP_SW_E1H, USEM_REG_FAST_MEMORY + 0x3738 + 0x24, 0x10293}, |
| 906 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x2c00, 0x2}, | 906 | {OP_SW_E1, USEM_REG_FAST_MEMORY + 0x4b68 + 0x8, 0x20278}, |
| 907 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x3180, 0x42}, | 907 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x3180, 0x42}, |
| 908 | {OP_SW_E1, USEM_REG_FAST_MEMORY + 0x2c00 + 0x8, 0x20278}, | 908 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x4b10, 0x2}, |
| 909 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5000, 0x400}, | 909 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5000, 0x400}, |
| 910 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x4b68, 0x2}, | 910 | {OP_SW_E1, USEM_REG_FAST_MEMORY + 0x2830, 0x2027a}, |
| 911 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x4000, 0x2}, | 911 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x4000, 0x2}, |
| 912 | {OP_SW_E1, USEM_REG_FAST_MEMORY + 0x4b68 + 0x8, 0x2027a}, | ||
| 913 | {OP_SW_E1H, USEM_REG_FAST_MEMORY + 0x4000 + 0x8, 0x20294}, | 912 | {OP_SW_E1H, USEM_REG_FAST_MEMORY + 0x4000 + 0x8, 0x20294}, |
| 914 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x4b10, 0x2}, | ||
| 915 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x6b68, 0x2}, | 913 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x6b68, 0x2}, |
| 916 | {OP_SW_E1, USEM_REG_FAST_MEMORY + 0x2830, 0x2027c}, | ||
| 917 | {OP_SW_E1H, USEM_REG_FAST_MEMORY + 0x6b68 + 0x8, 0x20296}, | 914 | {OP_SW_E1H, USEM_REG_FAST_MEMORY + 0x6b68 + 0x8, 0x20296}, |
| 918 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x6b10, 0x2}, | 915 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x6b10, 0x2}, |
| 919 | {OP_SW_E1H, USEM_REG_FAST_MEMORY + 0x74c0, 0x20298}, | 916 | {OP_SW_E1H, USEM_REG_FAST_MEMORY + 0x74c0, 0x20298}, |
| 920 | {OP_WR, USEM_REG_FAST_MEMORY + 0x10800, 0x1000000}, | 917 | {OP_WR, USEM_REG_FAST_MEMORY + 0x10800, 0x1000000}, |
| 921 | {OP_SW_E1, USEM_REG_FAST_MEMORY + 0x10c00, 0x10027e}, | 918 | {OP_SW_E1, USEM_REG_FAST_MEMORY + 0x10c00, 0x10027c}, |
| 922 | {OP_SW_E1H, USEM_REG_FAST_MEMORY + 0x10c00, 0x10029a}, | 919 | {OP_SW_E1H, USEM_REG_FAST_MEMORY + 0x10c00, 0x10029a}, |
| 923 | {OP_WR, USEM_REG_FAST_MEMORY + 0x10800, 0x0}, | 920 | {OP_WR, USEM_REG_FAST_MEMORY + 0x10800, 0x0}, |
| 924 | {OP_SW_E1, USEM_REG_FAST_MEMORY + 0x10c40, 0x10028e}, | 921 | {OP_SW_E1, USEM_REG_FAST_MEMORY + 0x10c40, 0x10028c}, |
| 925 | {OP_SW_E1H, USEM_REG_FAST_MEMORY + 0x10c40, 0x1002aa}, | 922 | {OP_SW_E1H, USEM_REG_FAST_MEMORY + 0x10c40, 0x1002aa}, |
| 926 | {OP_ZP_E1, USEM_REG_INT_TABLE, 0xc20000}, | 923 | {OP_ZP_E1, USEM_REG_INT_TABLE, 0xc20000}, |
| 927 | {OP_ZP_E1H, USEM_REG_INT_TABLE, 0xc40000}, | 924 | {OP_ZP_E1H, USEM_REG_INT_TABLE, 0xc40000}, |
| 928 | {OP_WR_64_E1, USEM_REG_INT_TABLE + 0x368, 0x13029e}, | 925 | {OP_WR_64_E1, USEM_REG_INT_TABLE + 0x368, 0x13029c}, |
| 929 | {OP_WR_64_E1H, USEM_REG_INT_TABLE + 0x368, 0x1302ba}, | 926 | {OP_WR_64_E1H, USEM_REG_INT_TABLE + 0x368, 0x1302ba}, |
| 930 | {OP_ZP_E1, USEM_REG_PRAM, 0x311c0000}, | 927 | {OP_ZP_E1, USEM_REG_PRAM, 0x311c0000}, |
| 931 | {OP_ZP_E1H, USEM_REG_PRAM, 0x31070000}, | 928 | {OP_ZP_E1H, USEM_REG_PRAM, 0x31070000}, |
| @@ -933,11 +930,11 @@ static const struct raw_op init_ops[] = { | |||
| 933 | {OP_ZP_E1H, USEM_REG_PRAM + 0x8000, 0x330e0c42}, | 930 | {OP_ZP_E1H, USEM_REG_PRAM + 0x8000, 0x330e0c42}, |
| 934 | {OP_ZP_E1, USEM_REG_PRAM + 0x10000, 0x38561919}, | 931 | {OP_ZP_E1, USEM_REG_PRAM + 0x10000, 0x38561919}, |
| 935 | {OP_ZP_E1H, USEM_REG_PRAM + 0x10000, 0x389b1906}, | 932 | {OP_ZP_E1H, USEM_REG_PRAM + 0x10000, 0x389b1906}, |
| 936 | {OP_WR_64_E1, USEM_REG_PRAM + 0x17fe0, 0x500402a0}, | 933 | {OP_WR_64_E1, USEM_REG_PRAM + 0x17fe0, 0x5004029e}, |
| 937 | {OP_ZP_E1H, USEM_REG_PRAM + 0x18000, 0x132272d}, | 934 | {OP_ZP_E1H, USEM_REG_PRAM + 0x18000, 0x132272d}, |
| 938 | {OP_WR_64_E1H, USEM_REG_PRAM + 0x18250, 0x4fb602bc}, | 935 | {OP_WR_64_E1H, USEM_REG_PRAM + 0x18250, 0x4fb602bc}, |
| 939 | #define USEM_COMMON_END 790 | 936 | #define USEM_COMMON_END 787 |
| 940 | #define USEM_PORT0_START 790 | 937 | #define USEM_PORT0_START 787 |
| 941 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x1400, 0xa0}, | 938 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x1400, 0xa0}, |
| 942 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x9000, 0xa0}, | 939 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x9000, 0xa0}, |
| 943 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x1900, 0xa}, | 940 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x1900, 0xa}, |
| @@ -950,44 +947,27 @@ static const struct raw_op init_ops[] = { | |||
| 950 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x3288, 0x96}, | 947 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x3288, 0x96}, |
| 951 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x5440, 0x72}, | 948 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x5440, 0x72}, |
| 952 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5000, 0x20}, | 949 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5000, 0x20}, |
| 953 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3000, 0x20}, | 950 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x4b78, 0x52}, |
| 954 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5100, 0x20}, | 951 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5100, 0x20}, |
| 955 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3100, 0x20}, | 952 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x4e08, 0xc}, |
| 956 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5200, 0x20}, | 953 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5200, 0x20}, |
| 957 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3200, 0x20}, | ||
| 958 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5300, 0x20}, | 954 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5300, 0x20}, |
| 959 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3300, 0x20}, | ||
| 960 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5400, 0x20}, | 955 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5400, 0x20}, |
| 961 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3400, 0x20}, | ||
| 962 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5500, 0x20}, | 956 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5500, 0x20}, |
| 963 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3500, 0x20}, | ||
| 964 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5600, 0x20}, | 957 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5600, 0x20}, |
| 965 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3600, 0x20}, | ||
| 966 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5700, 0x20}, | 958 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5700, 0x20}, |
| 967 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3700, 0x20}, | ||
| 968 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5800, 0x20}, | 959 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5800, 0x20}, |
| 969 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3800, 0x20}, | ||
| 970 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5900, 0x20}, | 960 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5900, 0x20}, |
| 971 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3900, 0x20}, | ||
| 972 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5a00, 0x20}, | 961 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5a00, 0x20}, |
| 973 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3a00, 0x20}, | ||
| 974 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5b00, 0x20}, | 962 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5b00, 0x20}, |
| 975 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3b00, 0x20}, | ||
| 976 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5c00, 0x20}, | 963 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5c00, 0x20}, |
| 977 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3c00, 0x20}, | ||
| 978 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5d00, 0x20}, | 964 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5d00, 0x20}, |
| 979 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3d00, 0x20}, | ||
| 980 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5e00, 0x20}, | 965 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5e00, 0x20}, |
| 981 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3e00, 0x20}, | ||
| 982 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5f00, 0x20}, | 966 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5f00, 0x20}, |
| 983 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3f00, 0x20}, | ||
| 984 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x6b78, 0x52}, | 967 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x6b78, 0x52}, |
| 985 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x2c10, 0x2}, | ||
| 986 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x6e08, 0xc}, | 968 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x6e08, 0xc}, |
| 987 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x4b78, 0x52}, | 969 | #define USEM_PORT0_END 818 |
| 988 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x4e08, 0xc}, | 970 | #define USEM_PORT1_START 818 |
| 989 | #define USEM_PORT0_END 838 | ||
| 990 | #define USEM_PORT1_START 838 | ||
| 991 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x1680, 0xa0}, | 971 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x1680, 0xa0}, |
| 992 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x9280, 0xa0}, | 972 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x9280, 0xa0}, |
| 993 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x1928, 0xa}, | 973 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x1928, 0xa}, |
| @@ -1000,76 +980,59 @@ static const struct raw_op init_ops[] = { | |||
| 1000 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x34e0, 0x96}, | 980 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x34e0, 0x96}, |
| 1001 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x5608, 0x72}, | 981 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x5608, 0x72}, |
| 1002 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5080, 0x20}, | 982 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5080, 0x20}, |
| 1003 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3080, 0x20}, | 983 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x4cc0, 0x52}, |
| 1004 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5180, 0x20}, | 984 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5180, 0x20}, |
| 1005 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3180, 0x20}, | 985 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x4e38, 0xc}, |
| 1006 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5280, 0x20}, | 986 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5280, 0x20}, |
| 1007 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3280, 0x20}, | ||
| 1008 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5380, 0x20}, | 987 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5380, 0x20}, |
| 1009 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3380, 0x20}, | ||
| 1010 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5480, 0x20}, | 988 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5480, 0x20}, |
| 1011 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3480, 0x20}, | ||
| 1012 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5580, 0x20}, | 989 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5580, 0x20}, |
| 1013 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3580, 0x20}, | ||
| 1014 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5680, 0x20}, | 990 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5680, 0x20}, |
| 1015 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3680, 0x20}, | ||
| 1016 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5780, 0x20}, | 991 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5780, 0x20}, |
| 1017 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3780, 0x20}, | ||
| 1018 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5880, 0x20}, | 992 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5880, 0x20}, |
| 1019 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3880, 0x20}, | ||
| 1020 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5980, 0x20}, | 993 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5980, 0x20}, |
| 1021 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3980, 0x20}, | ||
| 1022 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5a80, 0x20}, | 994 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5a80, 0x20}, |
| 1023 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3a80, 0x20}, | ||
| 1024 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5b80, 0x20}, | 995 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5b80, 0x20}, |
| 1025 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3b80, 0x20}, | ||
| 1026 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5c80, 0x20}, | 996 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5c80, 0x20}, |
| 1027 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3c80, 0x20}, | ||
| 1028 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5d80, 0x20}, | 997 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5d80, 0x20}, |
| 1029 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3d80, 0x20}, | ||
| 1030 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5e80, 0x20}, | 998 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5e80, 0x20}, |
| 1031 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3e80, 0x20}, | ||
| 1032 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5f80, 0x20}, | 999 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x5f80, 0x20}, |
| 1033 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x3f80, 0x20}, | ||
| 1034 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x6cc0, 0x52}, | 1000 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x6cc0, 0x52}, |
| 1035 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x2c20, 0x2}, | ||
| 1036 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x6e38, 0xc}, | 1001 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x6e38, 0xc}, |
| 1037 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x4cc0, 0x52}, | 1002 | #define USEM_PORT1_END 849 |
| 1038 | {OP_ZR_E1, USEM_REG_FAST_MEMORY + 0x4e38, 0xc}, | 1003 | #define USEM_FUNC0_START 849 |
| 1039 | #define USEM_PORT1_END 886 | ||
| 1040 | #define USEM_FUNC0_START 886 | ||
| 1041 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x3000, 0x4}, | 1004 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x3000, 0x4}, |
| 1042 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x4010, 0x2}, | 1005 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x4010, 0x2}, |
| 1043 | #define USEM_FUNC0_END 888 | 1006 | #define USEM_FUNC0_END 851 |
| 1044 | #define USEM_FUNC1_START 888 | 1007 | #define USEM_FUNC1_START 851 |
| 1045 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x3010, 0x4}, | 1008 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x3010, 0x4}, |
| 1046 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x4020, 0x2}, | 1009 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x4020, 0x2}, |
| 1047 | #define USEM_FUNC1_END 890 | 1010 | #define USEM_FUNC1_END 853 |
| 1048 | #define USEM_FUNC2_START 890 | 1011 | #define USEM_FUNC2_START 853 |
| 1049 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x3020, 0x4}, | 1012 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x3020, 0x4}, |
| 1050 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x4030, 0x2}, | 1013 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x4030, 0x2}, |
| 1051 | #define USEM_FUNC2_END 892 | 1014 | #define USEM_FUNC2_END 855 |
| 1052 | #define USEM_FUNC3_START 892 | 1015 | #define USEM_FUNC3_START 855 |
| 1053 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x3030, 0x4}, | 1016 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x3030, 0x4}, |
| 1054 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x4040, 0x2}, | 1017 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x4040, 0x2}, |
| 1055 | #define USEM_FUNC3_END 894 | 1018 | #define USEM_FUNC3_END 857 |
| 1056 | #define USEM_FUNC4_START 894 | 1019 | #define USEM_FUNC4_START 857 |
| 1057 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x3040, 0x4}, | 1020 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x3040, 0x4}, |
| 1058 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x4050, 0x2}, | 1021 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x4050, 0x2}, |
| 1059 | #define USEM_FUNC4_END 896 | 1022 | #define USEM_FUNC4_END 859 |
| 1060 | #define USEM_FUNC5_START 896 | 1023 | #define USEM_FUNC5_START 859 |
| 1061 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x3050, 0x4}, | 1024 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x3050, 0x4}, |
| 1062 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x4060, 0x2}, | 1025 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x4060, 0x2}, |
| 1063 | #define USEM_FUNC5_END 898 | 1026 | #define USEM_FUNC5_END 861 |
| 1064 | #define USEM_FUNC6_START 898 | 1027 | #define USEM_FUNC6_START 861 |
| 1065 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x3060, 0x4}, | 1028 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x3060, 0x4}, |
| 1066 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x4070, 0x2}, | 1029 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x4070, 0x2}, |
| 1067 | #define USEM_FUNC6_END 900 | 1030 | #define USEM_FUNC6_END 863 |
| 1068 | #define USEM_FUNC7_START 900 | 1031 | #define USEM_FUNC7_START 863 |
| 1069 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x3070, 0x4}, | 1032 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x3070, 0x4}, |
| 1070 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x4080, 0x2}, | 1033 | {OP_ZR_E1H, USEM_REG_FAST_MEMORY + 0x4080, 0x2}, |
| 1071 | #define USEM_FUNC7_END 902 | 1034 | #define USEM_FUNC7_END 865 |
| 1072 | #define CSEM_COMMON_START 902 | 1035 | #define CSEM_COMMON_START 865 |
| 1073 | {OP_RD, CSEM_REG_MSG_NUM_FIC0, 0x0}, | 1036 | {OP_RD, CSEM_REG_MSG_NUM_FIC0, 0x0}, |
| 1074 | {OP_RD, CSEM_REG_MSG_NUM_FIC1, 0x0}, | 1037 | {OP_RD, CSEM_REG_MSG_NUM_FIC1, 0x0}, |
| 1075 | {OP_RD, CSEM_REG_MSG_NUM_FOC0, 0x0}, | 1038 | {OP_RD, CSEM_REG_MSG_NUM_FOC0, 0x0}, |
| @@ -1128,29 +1091,29 @@ static const struct raw_op init_ops[] = { | |||
| 1128 | {OP_WR_E1H, CSEM_REG_FAST_MEMORY + 0x11e8, 0x0}, | 1091 | {OP_WR_E1H, CSEM_REG_FAST_MEMORY + 0x11e8, 0x0}, |
| 1129 | {OP_ZR_E1, CSEM_REG_FAST_MEMORY + 0x25c0, 0x240}, | 1092 | {OP_ZR_E1, CSEM_REG_FAST_MEMORY + 0x25c0, 0x240}, |
| 1130 | {OP_ZR_E1H, CSEM_REG_FAST_MEMORY + 0x3000, 0xc0}, | 1093 | {OP_ZR_E1H, CSEM_REG_FAST_MEMORY + 0x3000, 0xc0}, |
| 1131 | {OP_SW_E1, CSEM_REG_FAST_MEMORY + 0x2ec8, 0x802a2}, | 1094 | {OP_SW_E1, CSEM_REG_FAST_MEMORY + 0x2ec8, 0x802a0}, |
| 1132 | {OP_ZR_E1H, CSEM_REG_FAST_MEMORY + 0x4070, 0x80}, | 1095 | {OP_ZR_E1H, CSEM_REG_FAST_MEMORY + 0x4070, 0x80}, |
| 1133 | {OP_ZR_E1H, CSEM_REG_FAST_MEMORY + 0x5280, 0x4}, | 1096 | {OP_ZR_E1H, CSEM_REG_FAST_MEMORY + 0x5280, 0x4}, |
| 1134 | {OP_ZR_E1H, CSEM_REG_FAST_MEMORY + 0x6280, 0x240}, | 1097 | {OP_ZR_E1H, CSEM_REG_FAST_MEMORY + 0x6280, 0x240}, |
| 1135 | {OP_SW_E1H, CSEM_REG_FAST_MEMORY + 0x6b88, 0x2002be}, | 1098 | {OP_SW_E1H, CSEM_REG_FAST_MEMORY + 0x6b88, 0x2002be}, |
| 1136 | {OP_WR, CSEM_REG_FAST_MEMORY + 0x10800, 0x13fffff}, | 1099 | {OP_WR, CSEM_REG_FAST_MEMORY + 0x10800, 0x13fffff}, |
| 1137 | {OP_SW_E1, CSEM_REG_FAST_MEMORY + 0x10c00, 0x1002aa}, | 1100 | {OP_SW_E1, CSEM_REG_FAST_MEMORY + 0x10c00, 0x1002a8}, |
| 1138 | {OP_SW_E1H, CSEM_REG_FAST_MEMORY + 0x10c00, 0x1002de}, | 1101 | {OP_SW_E1H, CSEM_REG_FAST_MEMORY + 0x10c00, 0x1002de}, |
| 1139 | {OP_WR, CSEM_REG_FAST_MEMORY + 0x10800, 0x0}, | 1102 | {OP_WR, CSEM_REG_FAST_MEMORY + 0x10800, 0x0}, |
| 1140 | {OP_SW_E1, CSEM_REG_FAST_MEMORY + 0x10c40, 0x1002ba}, | 1103 | {OP_SW_E1, CSEM_REG_FAST_MEMORY + 0x10c40, 0x1002b8}, |
| 1141 | {OP_SW_E1H, CSEM_REG_FAST_MEMORY + 0x10c40, 0x1002ee}, | 1104 | {OP_SW_E1H, CSEM_REG_FAST_MEMORY + 0x10c40, 0x1002ee}, |
| 1142 | {OP_ZP_E1, CSEM_REG_INT_TABLE, 0x6e0000}, | 1105 | {OP_ZP_E1, CSEM_REG_INT_TABLE, 0x6e0000}, |
| 1143 | {OP_ZP_E1H, CSEM_REG_INT_TABLE, 0x6f0000}, | 1106 | {OP_ZP_E1H, CSEM_REG_INT_TABLE, 0x6f0000}, |
| 1144 | {OP_WR_64_E1, CSEM_REG_INT_TABLE + 0x380, 0x1002ca}, | 1107 | {OP_WR_64_E1, CSEM_REG_INT_TABLE + 0x380, 0x1002c8}, |
| 1145 | {OP_WR_64_E1H, CSEM_REG_INT_TABLE + 0x380, 0x1002fe}, | 1108 | {OP_WR_64_E1H, CSEM_REG_INT_TABLE + 0x380, 0x1002fe}, |
| 1146 | {OP_ZP_E1, CSEM_REG_PRAM, 0x32580000}, | 1109 | {OP_ZP_E1, CSEM_REG_PRAM, 0x32580000}, |
| 1147 | {OP_ZP_E1H, CSEM_REG_PRAM, 0x31fa0000}, | 1110 | {OP_ZP_E1H, CSEM_REG_PRAM, 0x31fa0000}, |
| 1148 | {OP_ZP_E1, CSEM_REG_PRAM + 0x8000, 0x18270c96}, | 1111 | {OP_ZP_E1, CSEM_REG_PRAM + 0x8000, 0x18270c96}, |
| 1149 | {OP_ZP_E1H, CSEM_REG_PRAM + 0x8000, 0x19040c7f}, | 1112 | {OP_ZP_E1H, CSEM_REG_PRAM + 0x8000, 0x19040c7f}, |
| 1150 | {OP_WR_64_E1, CSEM_REG_PRAM + 0xb210, 0x682402cc}, | 1113 | {OP_WR_64_E1, CSEM_REG_PRAM + 0xb210, 0x682402ca}, |
| 1151 | {OP_WR_64_E1H, CSEM_REG_PRAM + 0xb430, 0x67e00300}, | 1114 | {OP_WR_64_E1H, CSEM_REG_PRAM + 0xb430, 0x67e00300}, |
| 1152 | #define CSEM_COMMON_END 981 | 1115 | #define CSEM_COMMON_END 944 |
| 1153 | #define CSEM_PORT0_START 981 | 1116 | #define CSEM_PORT0_START 944 |
| 1154 | {OP_ZR_E1, CSEM_REG_FAST_MEMORY + 0x1400, 0xa0}, | 1117 | {OP_ZR_E1, CSEM_REG_FAST_MEMORY + 0x1400, 0xa0}, |
| 1155 | {OP_ZR_E1H, CSEM_REG_FAST_MEMORY + 0x8000, 0xa0}, | 1118 | {OP_ZR_E1H, CSEM_REG_FAST_MEMORY + 0x8000, 0xa0}, |
| 1156 | {OP_ZR_E1, CSEM_REG_FAST_MEMORY + 0x1900, 0x10}, | 1119 | {OP_ZR_E1, CSEM_REG_FAST_MEMORY + 0x1900, 0x10}, |
| @@ -1163,8 +1126,8 @@ static const struct raw_op init_ops[] = { | |||
| 1163 | {OP_ZR_E1H, CSEM_REG_FAST_MEMORY + 0x6040, 0x30}, | 1126 | {OP_ZR_E1H, CSEM_REG_FAST_MEMORY + 0x6040, 0x30}, |
| 1164 | {OP_ZR_E1, CSEM_REG_FAST_MEMORY + 0x3040, 0x6}, | 1127 | {OP_ZR_E1, CSEM_REG_FAST_MEMORY + 0x3040, 0x6}, |
| 1165 | {OP_ZR_E1, CSEM_REG_FAST_MEMORY + 0x2410, 0x30}, | 1128 | {OP_ZR_E1, CSEM_REG_FAST_MEMORY + 0x2410, 0x30}, |
| 1166 | #define CSEM_PORT0_END 993 | 1129 | #define CSEM_PORT0_END 956 |
| 1167 | #define CSEM_PORT1_START 993 | 1130 | #define CSEM_PORT1_START 956 |
| 1168 | {OP_ZR_E1, CSEM_REG_FAST_MEMORY + 0x1680, 0xa0}, | 1131 | {OP_ZR_E1, CSEM_REG_FAST_MEMORY + 0x1680, 0xa0}, |
| 1169 | {OP_ZR_E1H, CSEM_REG_FAST_MEMORY + 0x8280, 0xa0}, | 1132 | {OP_ZR_E1H, CSEM_REG_FAST_MEMORY + 0x8280, 0xa0}, |
| 1170 | {OP_ZR_E1, CSEM_REG_FAST_MEMORY + 0x1940, 0x10}, | 1133 | {OP_ZR_E1, CSEM_REG_FAST_MEMORY + 0x1940, 0x10}, |
| @@ -1177,43 +1140,43 @@ static const struct raw_op init_ops[] = { | |||
| 1177 | {OP_ZR_E1H, CSEM_REG_FAST_MEMORY + 0x6100, 0x30}, | 1140 | {OP_ZR_E1H, CSEM_REG_FAST_MEMORY + 0x6100, 0x30}, |
| 1178 | {OP_ZR_E1, CSEM_REG_FAST_MEMORY + 0x3058, 0x6}, | 1141 | {OP_ZR_E1, CSEM_REG_FAST_MEMORY + 0x3058, 0x6}, |
| 1179 | {OP_ZR_E1, CSEM_REG_FAST_MEMORY + 0x24d0, 0x30}, | 1142 | {OP_ZR_E1, CSEM_REG_FAST_MEMORY + 0x24d0, 0x30}, |
| 1180 | #define CSEM_PORT1_END 1005 | 1143 | #define CSEM_PORT1_END 968 |
| 1181 | #define CSEM_FUNC0_START 1005 | 1144 | #define CSEM_FUNC0_START 968 |
| 1182 | {OP_WR_E1H, CSEM_REG_FAST_MEMORY + 0x1148, 0x0}, | 1145 | {OP_WR_E1H, CSEM_REG_FAST_MEMORY + 0x1148, 0x0}, |
| 1183 | {OP_ZR_E1H, CSEM_REG_FAST_MEMORY + 0x3300, 0x2}, | 1146 | {OP_ZR_E1H, CSEM_REG_FAST_MEMORY + 0x3300, 0x2}, |
| 1184 | #define CSEM_FUNC0_END 1007 | 1147 | #define CSEM_FUNC0_END 970 |
| 1185 | #define CSEM_FUNC1_START 1007 | 1148 | #define CSEM_FUNC1_START 970 |
| 1186 | {OP_WR_E1H, CSEM_REG_FAST_MEMORY + 0x114c, 0x0}, | 1149 | {OP_WR_E1H, CSEM_REG_FAST_MEMORY + 0x114c, 0x0}, |
| 1187 | {OP_ZR_E1H, CSEM_REG_FAST_MEMORY + 0x3308, 0x2}, | 1150 | {OP_ZR_E1H, CSEM_REG_FAST_MEMORY + 0x3308, 0x2}, |
| 1188 | #define CSEM_FUNC1_END 1009 | 1151 | #define CSEM_FUNC1_END 972 |
| 1189 | #define CSEM_FUNC2_START 1009 | 1152 | #define CSEM_FUNC2_START 972 |
| 1190 | {OP_WR_E1H, CSEM_REG_FAST_MEMORY + 0x1150, 0x0}, | 1153 | {OP_WR_E1H, CSEM_REG_FAST_MEMORY + 0x1150, 0x0}, |
| 1191 | {OP_ZR_E1H, CSEM_REG_FAST_MEMORY + 0x3310, 0x2}, | 1154 | {OP_ZR_E1H, CSEM_REG_FAST_MEMORY + 0x3310, 0x2}, |
| 1192 | #define CSEM_FUNC2_END 1011 | 1155 | #define CSEM_FUNC2_END 974 |
| 1193 | #define CSEM_FUNC3_START 1011 | 1156 | #define CSEM_FUNC3_START 974 |
| 1194 | {OP_WR_E1H, CSEM_REG_FAST_MEMORY + 0x1154, 0x0}, | 1157 | {OP_WR_E1H, CSEM_REG_FAST_MEMORY + 0x1154, 0x0}, |
| 1195 | {OP_ZR_E1H, CSEM_REG_FAST_MEMORY + 0x3318, 0x2}, | 1158 | {OP_ZR_E1H, CSEM_REG_FAST_MEMORY + 0x3318, 0x2}, |
| 1196 | #define CSEM_FUNC3_END 1013 | 1159 | #define CSEM_FUNC3_END 976 |
| 1197 | #define CSEM_FUNC4_START 1013 | 1160 | #define CSEM_FUNC4_START 976 |
| 1198 | {OP_WR_E1H, CSEM_REG_FAST_MEMORY + 0x1158, 0x0}, | 1161 | {OP_WR_E1H, CSEM_REG_FAST_MEMORY + 0x1158, 0x0}, |
| 1199 | {OP_ZR_E1H, CSEM_REG_FAST_MEMORY + 0x3320, 0x2}, | 1162 | {OP_ZR_E1H, CSEM_REG_FAST_MEMORY + 0x3320, 0x2}, |
| 1200 | #define CSEM_FUNC4_END 1015 | 1163 | #define CSEM_FUNC4_END 978 |
| 1201 | #define CSEM_FUNC5_START 1015 | 1164 | #define CSEM_FUNC5_START 978 |
| 1202 | {OP_WR_E1H, CSEM_REG_FAST_MEMORY + 0x115c, 0x0}, | 1165 | {OP_WR_E1H, CSEM_REG_FAST_MEMORY + 0x115c, 0x0}, |
| 1203 | {OP_ZR_E1H, CSEM_REG_FAST_MEMORY + 0x3328, 0x2}, | 1166 | {OP_ZR_E1H, CSEM_REG_FAST_MEMORY + 0x3328, 0x2}, |
| 1204 | #define CSEM_FUNC5_END 1017 | 1167 | #define CSEM_FUNC5_END 980 |
| 1205 | #define CSEM_FUNC6_START 1017 | 1168 | #define CSEM_FUNC6_START 980 |
| 1206 | {OP_WR_E1H, CSEM_REG_FAST_MEMORY + 0x1160, 0x0}, | 1169 | {OP_WR_E1H, CSEM_REG_FAST_MEMORY + 0x1160, 0x0}, |
| 1207 | {OP_ZR_E1H, CSEM_REG_FAST_MEMORY + 0x3330, 0x2}, | 1170 | {OP_ZR_E1H, CSEM_REG_FAST_MEMORY + 0x3330, 0x2}, |
| 1208 | #define CSEM_FUNC6_END 1019 | 1171 | #define CSEM_FUNC6_END 982 |
| 1209 | #define CSEM_FUNC7_START 1019 | 1172 | #define CSEM_FUNC7_START 982 |
| 1210 | {OP_WR_E1H, CSEM_REG_FAST_MEMORY + 0x1164, 0x0}, | 1173 | {OP_WR_E1H, CSEM_REG_FAST_MEMORY + 0x1164, 0x0}, |
| 1211 | {OP_ZR_E1H, CSEM_REG_FAST_MEMORY + 0x3338, 0x2}, | 1174 | {OP_ZR_E1H, CSEM_REG_FAST_MEMORY + 0x3338, 0x2}, |
| 1212 | #define CSEM_FUNC7_END 1021 | 1175 | #define CSEM_FUNC7_END 984 |
| 1213 | #define XPB_COMMON_START 1021 | 1176 | #define XPB_COMMON_START 984 |
| 1214 | {OP_WR, GRCBASE_XPB + PB_REG_CONTROL, 0x20}, | 1177 | {OP_WR, GRCBASE_XPB + PB_REG_CONTROL, 0x20}, |
| 1215 | #define XPB_COMMON_END 1022 | 1178 | #define XPB_COMMON_END 985 |
| 1216 | #define DQ_COMMON_START 1022 | 1179 | #define DQ_COMMON_START 985 |
| 1217 | {OP_WR, DORQ_REG_MODE_ACT, 0x2}, | 1180 | {OP_WR, DORQ_REG_MODE_ACT, 0x2}, |
| 1218 | {OP_WR, DORQ_REG_NORM_CID_OFST, 0x3}, | 1181 | {OP_WR, DORQ_REG_NORM_CID_OFST, 0x3}, |
| 1219 | {OP_WR, DORQ_REG_OUTST_REQ, 0x4}, | 1182 | {OP_WR, DORQ_REG_OUTST_REQ, 0x4}, |
| @@ -1232,8 +1195,8 @@ static const struct raw_op init_ops[] = { | |||
| 1232 | {OP_WR, DORQ_REG_DQ_FIFO_AFULL_TH, 0x76c}, | 1195 | {OP_WR, DORQ_REG_DQ_FIFO_AFULL_TH, 0x76c}, |
| 1233 | {OP_WR, DORQ_REG_REGN, 0x7c1004}, | 1196 | {OP_WR, DORQ_REG_REGN, 0x7c1004}, |
| 1234 | {OP_WR, DORQ_REG_IF_EN, 0xf}, | 1197 | {OP_WR, DORQ_REG_IF_EN, 0xf}, |
| 1235 | #define DQ_COMMON_END 1040 | 1198 | #define DQ_COMMON_END 1003 |
| 1236 | #define TIMERS_COMMON_START 1040 | 1199 | #define TIMERS_COMMON_START 1003 |
| 1237 | {OP_ZR, TM_REG_CLIN_PRIOR0_CLIENT, 0x2}, | 1200 | {OP_ZR, TM_REG_CLIN_PRIOR0_CLIENT, 0x2}, |
| 1238 | {OP_WR, TM_REG_LIN_SETCLR_FIFO_ALFULL_THR, 0x1c}, | 1201 | {OP_WR, TM_REG_LIN_SETCLR_FIFO_ALFULL_THR, 0x1c}, |
| 1239 | {OP_WR, TM_REG_CFC_AC_CRDCNT_VAL, 0x1}, | 1202 | {OP_WR, TM_REG_CFC_AC_CRDCNT_VAL, 0x1}, |
| @@ -1256,14 +1219,14 @@ static const struct raw_op init_ops[] = { | |||
| 1256 | {OP_WR, TM_REG_EN_CL0_INPUT, 0x1}, | 1219 | {OP_WR, TM_REG_EN_CL0_INPUT, 0x1}, |
| 1257 | {OP_WR, TM_REG_EN_CL1_INPUT, 0x1}, | 1220 | {OP_WR, TM_REG_EN_CL1_INPUT, 0x1}, |
| 1258 | {OP_WR, TM_REG_EN_CL2_INPUT, 0x1}, | 1221 | {OP_WR, TM_REG_EN_CL2_INPUT, 0x1}, |
| 1259 | #define TIMERS_COMMON_END 1062 | 1222 | #define TIMERS_COMMON_END 1025 |
| 1260 | #define TIMERS_PORT0_START 1062 | 1223 | #define TIMERS_PORT0_START 1025 |
| 1261 | {OP_ZR, TM_REG_LIN0_PHY_ADDR, 0x2}, | 1224 | {OP_ZR, TM_REG_LIN0_PHY_ADDR, 0x2}, |
| 1262 | #define TIMERS_PORT0_END 1063 | 1225 | #define TIMERS_PORT0_END 1026 |
| 1263 | #define TIMERS_PORT1_START 1063 | 1226 | #define TIMERS_PORT1_START 1026 |
| 1264 | {OP_ZR, TM_REG_LIN1_PHY_ADDR, 0x2}, | 1227 | {OP_ZR, TM_REG_LIN1_PHY_ADDR, 0x2}, |
| 1265 | #define TIMERS_PORT1_END 1064 | 1228 | #define TIMERS_PORT1_END 1027 |
| 1266 | #define XSDM_COMMON_START 1064 | 1229 | #define XSDM_COMMON_START 1027 |
| 1267 | {OP_WR_E1, XSDM_REG_CFC_RSP_START_ADDR, 0x614}, | 1230 | {OP_WR_E1, XSDM_REG_CFC_RSP_START_ADDR, 0x614}, |
| 1268 | {OP_WR_E1H, XSDM_REG_CFC_RSP_START_ADDR, 0x424}, | 1231 | {OP_WR_E1H, XSDM_REG_CFC_RSP_START_ADDR, 0x424}, |
| 1269 | {OP_WR_E1, XSDM_REG_CMP_COUNTER_START_ADDR, 0x600}, | 1232 | {OP_WR_E1, XSDM_REG_CMP_COUNTER_START_ADDR, 0x600}, |
| @@ -1311,8 +1274,8 @@ static const struct raw_op init_ops[] = { | |||
| 1311 | {OP_WR_ASIC, XSDM_REG_TIMER_TICK, 0x3e8}, | 1274 | {OP_WR_ASIC, XSDM_REG_TIMER_TICK, 0x3e8}, |
| 1312 | {OP_WR_EMUL, XSDM_REG_TIMER_TICK, 0x1}, | 1275 | {OP_WR_EMUL, XSDM_REG_TIMER_TICK, 0x1}, |
| 1313 | {OP_WR_FPGA, XSDM_REG_TIMER_TICK, 0xa}, | 1276 | {OP_WR_FPGA, XSDM_REG_TIMER_TICK, 0xa}, |
| 1314 | #define XSDM_COMMON_END 1111 | 1277 | #define XSDM_COMMON_END 1074 |
| 1315 | #define QM_COMMON_START 1111 | 1278 | #define QM_COMMON_START 1074 |
| 1316 | {OP_WR, QM_REG_ACTCTRINITVAL_0, 0x6}, | 1279 | {OP_WR, QM_REG_ACTCTRINITVAL_0, 0x6}, |
| 1317 | {OP_WR, QM_REG_ACTCTRINITVAL_1, 0x5}, | 1280 | {OP_WR, QM_REG_ACTCTRINITVAL_1, 0x5}, |
| 1318 | {OP_WR, QM_REG_ACTCTRINITVAL_2, 0xa}, | 1281 | {OP_WR, QM_REG_ACTCTRINITVAL_2, 0xa}, |
| @@ -1613,8 +1576,8 @@ static const struct raw_op init_ops[] = { | |||
| 1613 | {OP_WR_E1H, QM_REG_PQ2PCIFUNC_6, 0x5}, | 1576 | {OP_WR_E1H, QM_REG_PQ2PCIFUNC_6, 0x5}, |
| 1614 | {OP_WR_E1H, QM_REG_PQ2PCIFUNC_7, 0x7}, | 1577 | {OP_WR_E1H, QM_REG_PQ2PCIFUNC_7, 0x7}, |
| 1615 | {OP_WR, QM_REG_CMINTEN, 0xff}, | 1578 | {OP_WR, QM_REG_CMINTEN, 0xff}, |
| 1616 | #define QM_COMMON_END 1411 | 1579 | #define QM_COMMON_END 1374 |
| 1617 | #define PBF_COMMON_START 1411 | 1580 | #define PBF_COMMON_START 1374 |
| 1618 | {OP_WR, PBF_REG_INIT, 0x1}, | 1581 | {OP_WR, PBF_REG_INIT, 0x1}, |
| 1619 | {OP_WR, PBF_REG_INIT_P4, 0x1}, | 1582 | {OP_WR, PBF_REG_INIT_P4, 0x1}, |
| 1620 | {OP_WR, PBF_REG_MAC_LB_ENABLE, 0x1}, | 1583 | {OP_WR, PBF_REG_MAC_LB_ENABLE, 0x1}, |
| @@ -1622,20 +1585,20 @@ static const struct raw_op init_ops[] = { | |||
| 1622 | {OP_WR, PBF_REG_INIT_P4, 0x0}, | 1585 | {OP_WR, PBF_REG_INIT_P4, 0x0}, |
| 1623 | {OP_WR, PBF_REG_INIT, 0x0}, | 1586 | {OP_WR, PBF_REG_INIT, 0x0}, |
| 1624 | {OP_WR, PBF_REG_DISABLE_NEW_TASK_PROC_P4, 0x0}, | 1587 | {OP_WR, PBF_REG_DISABLE_NEW_TASK_PROC_P4, 0x0}, |
| 1625 | #define PBF_COMMON_END 1418 | 1588 | #define PBF_COMMON_END 1381 |
| 1626 | #define PBF_PORT0_START 1418 | 1589 | #define PBF_PORT0_START 1381 |
| 1627 | {OP_WR, PBF_REG_INIT_P0, 0x1}, | 1590 | {OP_WR, PBF_REG_INIT_P0, 0x1}, |
| 1628 | {OP_WR, PBF_REG_MAC_IF0_ENABLE, 0x1}, | 1591 | {OP_WR, PBF_REG_MAC_IF0_ENABLE, 0x1}, |
| 1629 | {OP_WR, PBF_REG_INIT_P0, 0x0}, | 1592 | {OP_WR, PBF_REG_INIT_P0, 0x0}, |
| 1630 | {OP_WR, PBF_REG_DISABLE_NEW_TASK_PROC_P0, 0x0}, | 1593 | {OP_WR, PBF_REG_DISABLE_NEW_TASK_PROC_P0, 0x0}, |
| 1631 | #define PBF_PORT0_END 1422 | 1594 | #define PBF_PORT0_END 1385 |
| 1632 | #define PBF_PORT1_START 1422 | 1595 | #define PBF_PORT1_START 1385 |
| 1633 | {OP_WR, PBF_REG_INIT_P1, 0x1}, | 1596 | {OP_WR, PBF_REG_INIT_P1, 0x1}, |
| 1634 | {OP_WR, PBF_REG_MAC_IF1_ENABLE, 0x1}, | 1597 | {OP_WR, PBF_REG_MAC_IF1_ENABLE, 0x1}, |
| 1635 | {OP_WR, PBF_REG_INIT_P1, 0x0}, | 1598 | {OP_WR, PBF_REG_INIT_P1, 0x0}, |
| 1636 | {OP_WR, PBF_REG_DISABLE_NEW_TASK_PROC_P1, 0x0}, | 1599 | {OP_WR, PBF_REG_DISABLE_NEW_TASK_PROC_P1, 0x0}, |
| 1637 | #define PBF_PORT1_END 1426 | 1600 | #define PBF_PORT1_END 1389 |
| 1638 | #define XCM_COMMON_START 1426 | 1601 | #define XCM_COMMON_START 1389 |
| 1639 | {OP_WR, XCM_REG_XX_OVFL_EVNT_ID, 0x32}, | 1602 | {OP_WR, XCM_REG_XX_OVFL_EVNT_ID, 0x32}, |
| 1640 | {OP_WR, XCM_REG_XQM_XCM_HDR_P, 0x3150020}, | 1603 | {OP_WR, XCM_REG_XQM_XCM_HDR_P, 0x3150020}, |
| 1641 | {OP_WR, XCM_REG_XQM_XCM_HDR_S, 0x3150020}, | 1604 | {OP_WR, XCM_REG_XQM_XCM_HDR_S, 0x3150020}, |
| @@ -1670,7 +1633,7 @@ static const struct raw_op init_ops[] = { | |||
| 1670 | {OP_WR_E1, XCM_REG_XX_MSG_NUM, 0x1f}, | 1633 | {OP_WR_E1, XCM_REG_XX_MSG_NUM, 0x1f}, |
| 1671 | {OP_WR_E1H, XCM_REG_XX_MSG_NUM, 0x20}, | 1634 | {OP_WR_E1H, XCM_REG_XX_MSG_NUM, 0x20}, |
| 1672 | {OP_ZR, XCM_REG_XX_TABLE, 0x12}, | 1635 | {OP_ZR, XCM_REG_XX_TABLE, 0x12}, |
| 1673 | {OP_SW_E1, XCM_REG_XX_DESCR_TABLE, 0x1f02ce}, | 1636 | {OP_SW_E1, XCM_REG_XX_DESCR_TABLE, 0x1f02cc}, |
| 1674 | {OP_SW_E1H, XCM_REG_XX_DESCR_TABLE, 0x1f0302}, | 1637 | {OP_SW_E1H, XCM_REG_XX_DESCR_TABLE, 0x1f0302}, |
| 1675 | {OP_WR, XCM_REG_N_SM_CTX_LD_0, 0xf}, | 1638 | {OP_WR, XCM_REG_N_SM_CTX_LD_0, 0xf}, |
| 1676 | {OP_WR, XCM_REG_N_SM_CTX_LD_1, 0x7}, | 1639 | {OP_WR, XCM_REG_N_SM_CTX_LD_1, 0x7}, |
| @@ -1700,8 +1663,8 @@ static const struct raw_op init_ops[] = { | |||
| 1700 | {OP_WR, XCM_REG_CDU_SM_WR_IFEN, 0x1}, | 1663 | {OP_WR, XCM_REG_CDU_SM_WR_IFEN, 0x1}, |
| 1701 | {OP_WR, XCM_REG_CDU_SM_RD_IFEN, 0x1}, | 1664 | {OP_WR, XCM_REG_CDU_SM_RD_IFEN, 0x1}, |
| 1702 | {OP_WR, XCM_REG_XCM_CFC_IFEN, 0x1}, | 1665 | {OP_WR, XCM_REG_XCM_CFC_IFEN, 0x1}, |
| 1703 | #define XCM_COMMON_END 1490 | 1666 | #define XCM_COMMON_END 1453 |
| 1704 | #define XCM_PORT0_START 1490 | 1667 | #define XCM_PORT0_START 1453 |
| 1705 | {OP_WR_E1, XCM_REG_GLB_DEL_ACK_TMR_VAL_0, 0xc8}, | 1668 | {OP_WR_E1, XCM_REG_GLB_DEL_ACK_TMR_VAL_0, 0xc8}, |
| 1706 | {OP_WR_E1, XCM_REG_GLB_DEL_ACK_MAX_CNT_0, 0x2}, | 1669 | {OP_WR_E1, XCM_REG_GLB_DEL_ACK_MAX_CNT_0, 0x2}, |
| 1707 | {OP_WR_E1, XCM_REG_WU_DA_SET_TMR_CNT_FLG_CMD00, 0x0}, | 1670 | {OP_WR_E1, XCM_REG_WU_DA_SET_TMR_CNT_FLG_CMD00, 0x0}, |
| @@ -1710,8 +1673,8 @@ static const struct raw_op init_ops[] = { | |||
| 1710 | {OP_WR_E1, XCM_REG_WU_DA_CNT_CMD10, 0x2}, | 1673 | {OP_WR_E1, XCM_REG_WU_DA_CNT_CMD10, 0x2}, |
| 1711 | {OP_WR_E1, XCM_REG_WU_DA_CNT_UPD_VAL00, 0xff}, | 1674 | {OP_WR_E1, XCM_REG_WU_DA_CNT_UPD_VAL00, 0xff}, |
| 1712 | {OP_WR_E1, XCM_REG_WU_DA_CNT_UPD_VAL10, 0xff}, | 1675 | {OP_WR_E1, XCM_REG_WU_DA_CNT_UPD_VAL10, 0xff}, |
| 1713 | #define XCM_PORT0_END 1498 | 1676 | #define XCM_PORT0_END 1461 |
| 1714 | #define XCM_PORT1_START 1498 | 1677 | #define XCM_PORT1_START 1461 |
| 1715 | {OP_WR_E1, XCM_REG_GLB_DEL_ACK_TMR_VAL_1, 0xc8}, | 1678 | {OP_WR_E1, XCM_REG_GLB_DEL_ACK_TMR_VAL_1, 0xc8}, |
| 1716 | {OP_WR_E1, XCM_REG_GLB_DEL_ACK_MAX_CNT_1, 0x2}, | 1679 | {OP_WR_E1, XCM_REG_GLB_DEL_ACK_MAX_CNT_1, 0x2}, |
| 1717 | {OP_WR_E1, XCM_REG_WU_DA_SET_TMR_CNT_FLG_CMD01, 0x0}, | 1680 | {OP_WR_E1, XCM_REG_WU_DA_SET_TMR_CNT_FLG_CMD01, 0x0}, |
| @@ -1720,8 +1683,8 @@ static const struct raw_op init_ops[] = { | |||
| 1720 | {OP_WR_E1, XCM_REG_WU_DA_CNT_CMD11, 0x2}, | 1683 | {OP_WR_E1, XCM_REG_WU_DA_CNT_CMD11, 0x2}, |
| 1721 | {OP_WR_E1, XCM_REG_WU_DA_CNT_UPD_VAL01, 0xff}, | 1684 | {OP_WR_E1, XCM_REG_WU_DA_CNT_UPD_VAL01, 0xff}, |
| 1722 | {OP_WR_E1, XCM_REG_WU_DA_CNT_UPD_VAL11, 0xff}, | 1685 | {OP_WR_E1, XCM_REG_WU_DA_CNT_UPD_VAL11, 0xff}, |
| 1723 | #define XCM_PORT1_END 1506 | 1686 | #define XCM_PORT1_END 1469 |
| 1724 | #define XCM_FUNC0_START 1506 | 1687 | #define XCM_FUNC0_START 1469 |
| 1725 | {OP_WR_E1H, XCM_REG_GLB_DEL_ACK_TMR_VAL_0, 0xc8}, | 1688 | {OP_WR_E1H, XCM_REG_GLB_DEL_ACK_TMR_VAL_0, 0xc8}, |
| 1726 | {OP_WR_E1H, XCM_REG_GLB_DEL_ACK_MAX_CNT_0, 0x2}, | 1689 | {OP_WR_E1H, XCM_REG_GLB_DEL_ACK_MAX_CNT_0, 0x2}, |
| 1727 | {OP_WR_E1H, XCM_REG_WU_DA_SET_TMR_CNT_FLG_CMD00, 0x0}, | 1690 | {OP_WR_E1H, XCM_REG_WU_DA_SET_TMR_CNT_FLG_CMD00, 0x0}, |
| @@ -1731,8 +1694,8 @@ static const struct raw_op init_ops[] = { | |||
| 1731 | {OP_WR_E1H, XCM_REG_WU_DA_CNT_UPD_VAL00, 0xff}, | 1694 | {OP_WR_E1H, XCM_REG_WU_DA_CNT_UPD_VAL00, 0xff}, |
| 1732 | {OP_WR_E1H, XCM_REG_WU_DA_CNT_UPD_VAL10, 0xff}, | 1695 | {OP_WR_E1H, XCM_REG_WU_DA_CNT_UPD_VAL10, 0xff}, |
| 1733 | {OP_WR_E1H, XCM_REG_PHYS_QNUM3_0, 0x0}, | 1696 | {OP_WR_E1H, XCM_REG_PHYS_QNUM3_0, 0x0}, |
| 1734 | #define XCM_FUNC0_END 1515 | 1697 | #define XCM_FUNC0_END 1478 |
| 1735 | #define XCM_FUNC1_START 1515 | 1698 | #define XCM_FUNC1_START 1478 |
| 1736 | {OP_WR_E1H, XCM_REG_GLB_DEL_ACK_TMR_VAL_1, 0xc8}, | 1699 | {OP_WR_E1H, XCM_REG_GLB_DEL_ACK_TMR_VAL_1, 0xc8}, |
| 1737 | {OP_WR_E1H, XCM_REG_GLB_DEL_ACK_MAX_CNT_1, 0x2}, | 1700 | {OP_WR_E1H, XCM_REG_GLB_DEL_ACK_MAX_CNT_1, 0x2}, |
| 1738 | {OP_WR_E1H, XCM_REG_WU_DA_SET_TMR_CNT_FLG_CMD01, 0x0}, | 1701 | {OP_WR_E1H, XCM_REG_WU_DA_SET_TMR_CNT_FLG_CMD01, 0x0}, |
| @@ -1742,8 +1705,8 @@ static const struct raw_op init_ops[] = { | |||
| 1742 | {OP_WR_E1H, XCM_REG_WU_DA_CNT_UPD_VAL01, 0xff}, | 1705 | {OP_WR_E1H, XCM_REG_WU_DA_CNT_UPD_VAL01, 0xff}, |
| 1743 | {OP_WR_E1H, XCM_REG_WU_DA_CNT_UPD_VAL11, 0xff}, | 1706 | {OP_WR_E1H, XCM_REG_WU_DA_CNT_UPD_VAL11, 0xff}, |
| 1744 | {OP_WR_E1H, XCM_REG_PHYS_QNUM3_1, 0x0}, | 1707 | {OP_WR_E1H, XCM_REG_PHYS_QNUM3_1, 0x0}, |
| 1745 | #define XCM_FUNC1_END 1524 | 1708 | #define XCM_FUNC1_END 1487 |
| 1746 | #define XCM_FUNC2_START 1524 | 1709 | #define XCM_FUNC2_START 1487 |
| 1747 | {OP_WR_E1H, XCM_REG_GLB_DEL_ACK_TMR_VAL_0, 0xc8}, | 1710 | {OP_WR_E1H, XCM_REG_GLB_DEL_ACK_TMR_VAL_0, 0xc8}, |
| 1748 | {OP_WR_E1H, XCM_REG_GLB_DEL_ACK_MAX_CNT_0, 0x2}, | 1711 | {OP_WR_E1H, XCM_REG_GLB_DEL_ACK_MAX_CNT_0, 0x2}, |
| 1749 | {OP_WR_E1H, XCM_REG_WU_DA_SET_TMR_CNT_FLG_CMD00, 0x0}, | 1712 | {OP_WR_E1H, XCM_REG_WU_DA_SET_TMR_CNT_FLG_CMD00, 0x0}, |
| @@ -1753,8 +1716,8 @@ static const struct raw_op init_ops[] = { | |||
| 1753 | {OP_WR_E1H, XCM_REG_WU_DA_CNT_UPD_VAL00, 0xff}, | 1716 | {OP_WR_E1H, XCM_REG_WU_DA_CNT_UPD_VAL00, 0xff}, |
| 1754 | {OP_WR_E1H, XCM_REG_WU_DA_CNT_UPD_VAL10, 0xff}, | 1717 | {OP_WR_E1H, XCM_REG_WU_DA_CNT_UPD_VAL10, 0xff}, |
| 1755 | {OP_WR_E1H, XCM_REG_PHYS_QNUM3_0, 0x0}, | 1718 | {OP_WR_E1H, XCM_REG_PHYS_QNUM3_0, 0x0}, |
| 1756 | #define XCM_FUNC2_END 1533 | 1719 | #define XCM_FUNC2_END 1496 |
| 1757 | #define XCM_FUNC3_START 1533 | 1720 | #define XCM_FUNC3_START 1496 |
| 1758 | {OP_WR_E1H, XCM_REG_GLB_DEL_ACK_TMR_VAL_1, 0xc8}, | 1721 | {OP_WR_E1H, XCM_REG_GLB_DEL_ACK_TMR_VAL_1, 0xc8}, |
| 1759 | {OP_WR_E1H, XCM_REG_GLB_DEL_ACK_MAX_CNT_1, 0x2}, | 1722 | {OP_WR_E1H, XCM_REG_GLB_DEL_ACK_MAX_CNT_1, 0x2}, |
| 1760 | {OP_WR_E1H, XCM_REG_WU_DA_SET_TMR_CNT_FLG_CMD01, 0x0}, | 1723 | {OP_WR_E1H, XCM_REG_WU_DA_SET_TMR_CNT_FLG_CMD01, 0x0}, |
| @@ -1764,8 +1727,8 @@ static const struct raw_op init_ops[] = { | |||
| 1764 | {OP_WR_E1H, XCM_REG_WU_DA_CNT_UPD_VAL01, 0xff}, | 1727 | {OP_WR_E1H, XCM_REG_WU_DA_CNT_UPD_VAL01, 0xff}, |
| 1765 | {OP_WR_E1H, XCM_REG_WU_DA_CNT_UPD_VAL11, 0xff}, | 1728 | {OP_WR_E1H, XCM_REG_WU_DA_CNT_UPD_VAL11, 0xff}, |
| 1766 | {OP_WR_E1H, XCM_REG_PHYS_QNUM3_1, 0x0}, | 1729 | {OP_WR_E1H, XCM_REG_PHYS_QNUM3_1, 0x0}, |
| 1767 | #define XCM_FUNC3_END 1542 | 1730 | #define XCM_FUNC3_END 1505 |
| 1768 | #define XCM_FUNC4_START 1542 | 1731 | #define XCM_FUNC4_START 1505 |
| 1769 | {OP_WR_E1H, XCM_REG_GLB_DEL_ACK_TMR_VAL_0, 0xc8}, | 1732 | {OP_WR_E1H, XCM_REG_GLB_DEL_ACK_TMR_VAL_0, 0xc8}, |
| 1770 | {OP_WR_E1H, XCM_REG_GLB_DEL_ACK_MAX_CNT_0, 0x2}, | 1733 | {OP_WR_E1H, XCM_REG_GLB_DEL_ACK_MAX_CNT_0, 0x2}, |
| 1771 | {OP_WR_E1H, XCM_REG_WU_DA_SET_TMR_CNT_FLG_CMD00, 0x0}, | 1734 | {OP_WR_E1H, XCM_REG_WU_DA_SET_TMR_CNT_FLG_CMD00, 0x0}, |
| @@ -1775,8 +1738,8 @@ static const struct raw_op init_ops[] = { | |||
| 1775 | {OP_WR_E1H, XCM_REG_WU_DA_CNT_UPD_VAL00, 0xff}, | 1738 | {OP_WR_E1H, XCM_REG_WU_DA_CNT_UPD_VAL00, 0xff}, |
| 1776 | {OP_WR_E1H, XCM_REG_WU_DA_CNT_UPD_VAL10, 0xff}, | 1739 | {OP_WR_E1H, XCM_REG_WU_DA_CNT_UPD_VAL10, 0xff}, |
| 1777 | {OP_WR_E1H, XCM_REG_PHYS_QNUM3_0, 0x0}, | 1740 | {OP_WR_E1H, XCM_REG_PHYS_QNUM3_0, 0x0}, |
| 1778 | #define XCM_FUNC4_END 1551 | 1741 | #define XCM_FUNC4_END 1514 |
| 1779 | #define XCM_FUNC5_START 1551 | 1742 | #define XCM_FUNC5_START 1514 |
| 1780 | {OP_WR_E1H, XCM_REG_GLB_DEL_ACK_TMR_VAL_1, 0xc8}, | 1743 | {OP_WR_E1H, XCM_REG_GLB_DEL_ACK_TMR_VAL_1, 0xc8}, |
| 1781 | {OP_WR_E1H, XCM_REG_GLB_DEL_ACK_MAX_CNT_1, 0x2}, | 1744 | {OP_WR_E1H, XCM_REG_GLB_DEL_ACK_MAX_CNT_1, 0x2}, |
| 1782 | {OP_WR_E1H, XCM_REG_WU_DA_SET_TMR_CNT_FLG_CMD01, 0x0}, | 1745 | {OP_WR_E1H, XCM_REG_WU_DA_SET_TMR_CNT_FLG_CMD01, 0x0}, |
| @@ -1786,8 +1749,8 @@ static const struct raw_op init_ops[] = { | |||
| 1786 | {OP_WR_E1H, XCM_REG_WU_DA_CNT_UPD_VAL01, 0xff}, | 1749 | {OP_WR_E1H, XCM_REG_WU_DA_CNT_UPD_VAL01, 0xff}, |
| 1787 | {OP_WR_E1H, XCM_REG_WU_DA_CNT_UPD_VAL11, 0xff}, | 1750 | {OP_WR_E1H, XCM_REG_WU_DA_CNT_UPD_VAL11, 0xff}, |
| 1788 | {OP_WR_E1H, XCM_REG_PHYS_QNUM3_1, 0x0}, | 1751 | {OP_WR_E1H, XCM_REG_PHYS_QNUM3_1, 0x0}, |
| 1789 | #define XCM_FUNC5_END 1560 | 1752 | #define XCM_FUNC5_END 1523 |
| 1790 | #define XCM_FUNC6_START 1560 | 1753 | #define XCM_FUNC6_START 1523 |
| 1791 | {OP_WR_E1H, XCM_REG_GLB_DEL_ACK_TMR_VAL_0, 0xc8}, | 1754 | {OP_WR_E1H, XCM_REG_GLB_DEL_ACK_TMR_VAL_0, 0xc8}, |
| 1792 | {OP_WR_E1H, XCM_REG_GLB_DEL_ACK_MAX_CNT_0, 0x2}, | 1755 | {OP_WR_E1H, XCM_REG_GLB_DEL_ACK_MAX_CNT_0, 0x2}, |
| 1793 | {OP_WR_E1H, XCM_REG_WU_DA_SET_TMR_CNT_FLG_CMD00, 0x0}, | 1756 | {OP_WR_E1H, XCM_REG_WU_DA_SET_TMR_CNT_FLG_CMD00, 0x0}, |
| @@ -1797,8 +1760,8 @@ static const struct raw_op init_ops[] = { | |||
| 1797 | {OP_WR_E1H, XCM_REG_WU_DA_CNT_UPD_VAL00, 0xff}, | 1760 | {OP_WR_E1H, XCM_REG_WU_DA_CNT_UPD_VAL00, 0xff}, |
| 1798 | {OP_WR_E1H, XCM_REG_WU_DA_CNT_UPD_VAL10, 0xff}, | 1761 | {OP_WR_E1H, XCM_REG_WU_DA_CNT_UPD_VAL10, 0xff}, |
| 1799 | {OP_WR_E1H, XCM_REG_PHYS_QNUM3_0, 0x0}, | 1762 | {OP_WR_E1H, XCM_REG_PHYS_QNUM3_0, 0x0}, |
| 1800 | #define XCM_FUNC6_END 1569 | 1763 | #define XCM_FUNC6_END 1532 |
| 1801 | #define XCM_FUNC7_START 1569 | 1764 | #define XCM_FUNC7_START 1532 |
| 1802 | {OP_WR_E1H, XCM_REG_GLB_DEL_ACK_TMR_VAL_1, 0xc8}, | 1765 | {OP_WR_E1H, XCM_REG_GLB_DEL_ACK_TMR_VAL_1, 0xc8}, |
| 1803 | {OP_WR_E1H, XCM_REG_GLB_DEL_ACK_MAX_CNT_1, 0x2}, | 1766 | {OP_WR_E1H, XCM_REG_GLB_DEL_ACK_MAX_CNT_1, 0x2}, |
| 1804 | {OP_WR_E1H, XCM_REG_WU_DA_SET_TMR_CNT_FLG_CMD01, 0x0}, | 1767 | {OP_WR_E1H, XCM_REG_WU_DA_SET_TMR_CNT_FLG_CMD01, 0x0}, |
| @@ -1808,8 +1771,8 @@ static const struct raw_op init_ops[] = { | |||
| 1808 | {OP_WR_E1H, XCM_REG_WU_DA_CNT_UPD_VAL01, 0xff}, | 1771 | {OP_WR_E1H, XCM_REG_WU_DA_CNT_UPD_VAL01, 0xff}, |
| 1809 | {OP_WR_E1H, XCM_REG_WU_DA_CNT_UPD_VAL11, 0xff}, | 1772 | {OP_WR_E1H, XCM_REG_WU_DA_CNT_UPD_VAL11, 0xff}, |
| 1810 | {OP_WR_E1H, XCM_REG_PHYS_QNUM3_1, 0x0}, | 1773 | {OP_WR_E1H, XCM_REG_PHYS_QNUM3_1, 0x0}, |
| 1811 | #define XCM_FUNC7_END 1578 | 1774 | #define XCM_FUNC7_END 1541 |
| 1812 | #define XSEM_COMMON_START 1578 | 1775 | #define XSEM_COMMON_START 1541 |
| 1813 | {OP_RD, XSEM_REG_MSG_NUM_FIC0, 0x0}, | 1776 | {OP_RD, XSEM_REG_MSG_NUM_FIC0, 0x0}, |
| 1814 | {OP_RD, XSEM_REG_MSG_NUM_FIC1, 0x0}, | 1777 | {OP_RD, XSEM_REG_MSG_NUM_FIC1, 0x0}, |
| 1815 | {OP_RD, XSEM_REG_MSG_NUM_FOC0, 0x0}, | 1778 | {OP_RD, XSEM_REG_MSG_NUM_FOC0, 0x0}, |
| @@ -1876,9 +1839,9 @@ static const struct raw_op init_ops[] = { | |||
| 1876 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x9000, 0x2}, | 1839 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x9000, 0x2}, |
| 1877 | {OP_WR_E1, XSEM_REG_FAST_MEMORY + 0x3368, 0x0}, | 1840 | {OP_WR_E1, XSEM_REG_FAST_MEMORY + 0x3368, 0x0}, |
| 1878 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x21a8, 0x86}, | 1841 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x21a8, 0x86}, |
| 1879 | {OP_SW_E1, XSEM_REG_FAST_MEMORY + 0x3370, 0x202ed}, | 1842 | {OP_SW_E1, XSEM_REG_FAST_MEMORY + 0x3370, 0x202eb}, |
| 1880 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x2000, 0x20}, | 1843 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x2000, 0x20}, |
| 1881 | {OP_SW_E1, XSEM_REG_FAST_MEMORY + 0x3b90, 0x402ef}, | 1844 | {OP_SW_E1, XSEM_REG_FAST_MEMORY + 0x3b90, 0x402ed}, |
| 1882 | {OP_WR_E1H, XSEM_REG_FAST_MEMORY + 0x23c8, 0x0}, | 1845 | {OP_WR_E1H, XSEM_REG_FAST_MEMORY + 0x23c8, 0x0}, |
| 1883 | {OP_WR_E1, XSEM_REG_FAST_MEMORY + 0x1518, 0x1}, | 1846 | {OP_WR_E1, XSEM_REG_FAST_MEMORY + 0x1518, 0x1}, |
| 1884 | {OP_SW_E1H, XSEM_REG_FAST_MEMORY + 0x23d0, 0x20321}, | 1847 | {OP_SW_E1H, XSEM_REG_FAST_MEMORY + 0x23d0, 0x20321}, |
| @@ -1886,29 +1849,29 @@ static const struct raw_op init_ops[] = { | |||
| 1886 | {OP_SW_E1H, XSEM_REG_FAST_MEMORY + 0x2498, 0x40323}, | 1849 | {OP_SW_E1H, XSEM_REG_FAST_MEMORY + 0x2498, 0x40323}, |
| 1887 | {OP_WR_E1, XSEM_REG_FAST_MEMORY + 0x1838, 0x0}, | 1850 | {OP_WR_E1, XSEM_REG_FAST_MEMORY + 0x1838, 0x0}, |
| 1888 | {OP_WR_E1H, XSEM_REG_FAST_MEMORY + 0x2ac8, 0x0}, | 1851 | {OP_WR_E1H, XSEM_REG_FAST_MEMORY + 0x2ac8, 0x0}, |
| 1889 | {OP_SW_E1, XSEM_REG_FAST_MEMORY + 0x1820, 0x202f3}, | 1852 | {OP_SW_E1, XSEM_REG_FAST_MEMORY + 0x1820, 0x202f1}, |
| 1890 | {OP_WR_E1H, XSEM_REG_FAST_MEMORY + 0x2ab8, 0x0}, | 1853 | {OP_WR_E1H, XSEM_REG_FAST_MEMORY + 0x2ab8, 0x0}, |
| 1891 | {OP_ZR_E1, XSEM_REG_FAST_MEMORY + 0x4ac0, 0x2}, | 1854 | {OP_ZR_E1, XSEM_REG_FAST_MEMORY + 0x4ac0, 0x2}, |
| 1892 | {OP_WR_E1H, XSEM_REG_FAST_MEMORY + 0x3010, 0x1}, | 1855 | {OP_WR_E1H, XSEM_REG_FAST_MEMORY + 0x3010, 0x1}, |
| 1893 | {OP_ZR_E1, XSEM_REG_FAST_MEMORY + 0x4b00, 0x4}, | 1856 | {OP_ZR_E1, XSEM_REG_FAST_MEMORY + 0x4b00, 0x4}, |
| 1894 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x4040, 0x10}, | 1857 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x4040, 0x10}, |
| 1895 | {OP_SW_E1, XSEM_REG_FAST_MEMORY + 0x1f50, 0x202f5}, | 1858 | {OP_SW_E1, XSEM_REG_FAST_MEMORY + 0x1f50, 0x202f3}, |
| 1896 | {OP_SW_E1H, XSEM_REG_FAST_MEMORY + 0x4000, 0x100327}, | 1859 | {OP_SW_E1H, XSEM_REG_FAST_MEMORY + 0x4000, 0x100327}, |
| 1897 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x6ac0, 0x2}, | 1860 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x6ac0, 0x2}, |
| 1898 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x6b00, 0x4}, | 1861 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x6b00, 0x4}, |
| 1899 | {OP_SW_E1H, XSEM_REG_FAST_MEMORY + 0x83b0, 0x20337}, | 1862 | {OP_SW_E1H, XSEM_REG_FAST_MEMORY + 0x83b0, 0x20337}, |
| 1900 | {OP_WR, XSEM_REG_FAST_MEMORY + 0x10800, 0x0}, | 1863 | {OP_WR, XSEM_REG_FAST_MEMORY + 0x10800, 0x0}, |
| 1901 | {OP_SW_E1, XSEM_REG_FAST_MEMORY + 0x10c00, 0x1002f7}, | 1864 | {OP_SW_E1, XSEM_REG_FAST_MEMORY + 0x10c00, 0x1002f5}, |
| 1902 | {OP_SW_E1H, XSEM_REG_FAST_MEMORY + 0x10c00, 0x100339}, | 1865 | {OP_SW_E1H, XSEM_REG_FAST_MEMORY + 0x10c00, 0x100339}, |
| 1903 | {OP_WR, XSEM_REG_FAST_MEMORY + 0x10800, 0x1000000}, | 1866 | {OP_WR, XSEM_REG_FAST_MEMORY + 0x10800, 0x1000000}, |
| 1904 | {OP_SW_E1, XSEM_REG_FAST_MEMORY + 0x10c40, 0x80307}, | 1867 | {OP_SW_E1, XSEM_REG_FAST_MEMORY + 0x10c40, 0x80305}, |
| 1905 | {OP_SW_E1H, XSEM_REG_FAST_MEMORY + 0x10c40, 0x80349}, | 1868 | {OP_SW_E1H, XSEM_REG_FAST_MEMORY + 0x10c40, 0x80349}, |
| 1906 | {OP_WR, XSEM_REG_FAST_MEMORY + 0x10800, 0x2000000}, | 1869 | {OP_WR, XSEM_REG_FAST_MEMORY + 0x10800, 0x2000000}, |
| 1907 | {OP_SW_E1, XSEM_REG_FAST_MEMORY + 0x10c60, 0x8030f}, | 1870 | {OP_SW_E1, XSEM_REG_FAST_MEMORY + 0x10c60, 0x8030d}, |
| 1908 | {OP_SW_E1H, XSEM_REG_FAST_MEMORY + 0x10c60, 0x80351}, | 1871 | {OP_SW_E1H, XSEM_REG_FAST_MEMORY + 0x10c60, 0x80351}, |
| 1909 | {OP_ZP_E1, XSEM_REG_INT_TABLE, 0xa90000}, | 1872 | {OP_ZP_E1, XSEM_REG_INT_TABLE, 0xa90000}, |
| 1910 | {OP_ZP_E1H, XSEM_REG_INT_TABLE, 0xac0000}, | 1873 | {OP_ZP_E1H, XSEM_REG_INT_TABLE, 0xac0000}, |
| 1911 | {OP_WR_64_E1, XSEM_REG_INT_TABLE + 0x368, 0x130317}, | 1874 | {OP_WR_64_E1, XSEM_REG_INT_TABLE + 0x368, 0x130315}, |
| 1912 | {OP_WR_64_E1H, XSEM_REG_INT_TABLE + 0x368, 0x130359}, | 1875 | {OP_WR_64_E1H, XSEM_REG_INT_TABLE + 0x368, 0x130359}, |
| 1913 | {OP_ZP_E1, XSEM_REG_PRAM, 0x344e0000}, | 1876 | {OP_ZP_E1, XSEM_REG_PRAM, 0x344e0000}, |
| 1914 | {OP_ZP_E1H, XSEM_REG_PRAM, 0x34620000}, | 1877 | {OP_ZP_E1H, XSEM_REG_PRAM, 0x34620000}, |
| @@ -1918,10 +1881,10 @@ static const struct raw_op init_ops[] = { | |||
| 1918 | {OP_ZP_E1H, XSEM_REG_PRAM + 0x10000, 0x3e971b22}, | 1881 | {OP_ZP_E1H, XSEM_REG_PRAM + 0x10000, 0x3e971b22}, |
| 1919 | {OP_ZP_E1, XSEM_REG_PRAM + 0x18000, 0x1dd02ad2}, | 1882 | {OP_ZP_E1, XSEM_REG_PRAM + 0x18000, 0x1dd02ad2}, |
| 1920 | {OP_ZP_E1H, XSEM_REG_PRAM + 0x18000, 0x21542ac8}, | 1883 | {OP_ZP_E1H, XSEM_REG_PRAM + 0x18000, 0x21542ac8}, |
| 1921 | {OP_WR_64_E1, XSEM_REG_PRAM + 0x1c0d0, 0x47e60319}, | 1884 | {OP_WR_64_E1, XSEM_REG_PRAM + 0x1c0d0, 0x47e60317}, |
| 1922 | {OP_WR_64_E1H, XSEM_REG_PRAM + 0x1c8d0, 0x46e6035b}, | 1885 | {OP_WR_64_E1H, XSEM_REG_PRAM + 0x1c8d0, 0x46e6035b}, |
| 1923 | #define XSEM_COMMON_END 1688 | 1886 | #define XSEM_COMMON_END 1651 |
| 1924 | #define XSEM_PORT0_START 1688 | 1887 | #define XSEM_PORT0_START 1651 |
| 1925 | {OP_ZR_E1, XSEM_REG_FAST_MEMORY + 0x3ba0, 0x10}, | 1888 | {OP_ZR_E1, XSEM_REG_FAST_MEMORY + 0x3ba0, 0x10}, |
| 1926 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0xc000, 0xfc}, | 1889 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0xc000, 0xfc}, |
| 1927 | {OP_ZR_E1, XSEM_REG_FAST_MEMORY + 0x3c20, 0x1c}, | 1890 | {OP_ZR_E1, XSEM_REG_FAST_MEMORY + 0x3c20, 0x1c}, |
| @@ -1934,7 +1897,7 @@ static const struct raw_op init_ops[] = { | |||
| 1934 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x26e8, 0x1c}, | 1897 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x26e8, 0x1c}, |
| 1935 | {OP_WR_E1, XSEM_REG_FAST_MEMORY + 0x3b58, 0x0}, | 1898 | {OP_WR_E1, XSEM_REG_FAST_MEMORY + 0x3b58, 0x0}, |
| 1936 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x27c8, 0x1c}, | 1899 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x27c8, 0x1c}, |
| 1937 | {OP_SW_E1, XSEM_REG_FAST_MEMORY + 0x3d10, 0x10031b}, | 1900 | {OP_SW_E1, XSEM_REG_FAST_MEMORY + 0x3d10, 0x100319}, |
| 1938 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0xa000, 0x28}, | 1901 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0xa000, 0x28}, |
| 1939 | {OP_WR_E1, XSEM_REG_FAST_MEMORY + 0x1500, 0x0}, | 1902 | {OP_WR_E1, XSEM_REG_FAST_MEMORY + 0x1500, 0x0}, |
| 1940 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0xa140, 0xc}, | 1903 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0xa140, 0xc}, |
| @@ -1950,12 +1913,12 @@ static const struct raw_op init_ops[] = { | |||
| 1950 | {OP_SW_E1H, XSEM_REG_FAST_MEMORY + 0x6ac8, 0x2035d}, | 1913 | {OP_SW_E1H, XSEM_REG_FAST_MEMORY + 0x6ac8, 0x2035d}, |
| 1951 | {OP_WR_E1, XSEM_REG_FAST_MEMORY + 0x50b8, 0x1}, | 1914 | {OP_WR_E1, XSEM_REG_FAST_MEMORY + 0x50b8, 0x1}, |
| 1952 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x6b10, 0x42}, | 1915 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x6b10, 0x42}, |
| 1953 | {OP_SW_E1, XSEM_REG_FAST_MEMORY + 0x4ac8, 0x2032b}, | 1916 | {OP_SW_E1, XSEM_REG_FAST_MEMORY + 0x4ac8, 0x20329}, |
| 1954 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x6d20, 0x4}, | 1917 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x6d20, 0x4}, |
| 1955 | {OP_ZR_E1, XSEM_REG_FAST_MEMORY + 0x4b10, 0x42}, | 1918 | {OP_ZR_E1, XSEM_REG_FAST_MEMORY + 0x4b10, 0x42}, |
| 1956 | {OP_ZR_E1, XSEM_REG_FAST_MEMORY + 0x4d20, 0x4}, | 1919 | {OP_ZR_E1, XSEM_REG_FAST_MEMORY + 0x4d20, 0x4}, |
| 1957 | #define XSEM_PORT0_END 1720 | 1920 | #define XSEM_PORT0_END 1683 |
| 1958 | #define XSEM_PORT1_START 1720 | 1921 | #define XSEM_PORT1_START 1683 |
| 1959 | {OP_ZR_E1, XSEM_REG_FAST_MEMORY + 0x3be0, 0x10}, | 1922 | {OP_ZR_E1, XSEM_REG_FAST_MEMORY + 0x3be0, 0x10}, |
| 1960 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0xc3f0, 0xfc}, | 1923 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0xc3f0, 0xfc}, |
| 1961 | {OP_ZR_E1, XSEM_REG_FAST_MEMORY + 0x3c90, 0x1c}, | 1924 | {OP_ZR_E1, XSEM_REG_FAST_MEMORY + 0x3c90, 0x1c}, |
| @@ -1968,7 +1931,7 @@ static const struct raw_op init_ops[] = { | |||
| 1968 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x2758, 0x1c}, | 1931 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x2758, 0x1c}, |
| 1969 | {OP_WR_E1, XSEM_REG_FAST_MEMORY + 0x3b5c, 0x0}, | 1932 | {OP_WR_E1, XSEM_REG_FAST_MEMORY + 0x3b5c, 0x0}, |
| 1970 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x2838, 0x1c}, | 1933 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x2838, 0x1c}, |
| 1971 | {OP_SW_E1, XSEM_REG_FAST_MEMORY + 0x3d50, 0x10032d}, | 1934 | {OP_SW_E1, XSEM_REG_FAST_MEMORY + 0x3d50, 0x10032b}, |
| 1972 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0xa0a0, 0x28}, | 1935 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0xa0a0, 0x28}, |
| 1973 | {OP_WR_E1, XSEM_REG_FAST_MEMORY + 0x1504, 0x0}, | 1936 | {OP_WR_E1, XSEM_REG_FAST_MEMORY + 0x1504, 0x0}, |
| 1974 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0xa170, 0xc}, | 1937 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0xa170, 0xc}, |
| @@ -1984,65 +1947,65 @@ static const struct raw_op init_ops[] = { | |||
| 1984 | {OP_SW_E1H, XSEM_REG_FAST_MEMORY + 0x6ad0, 0x2035f}, | 1947 | {OP_SW_E1H, XSEM_REG_FAST_MEMORY + 0x6ad0, 0x2035f}, |
| 1985 | {OP_WR_E1, XSEM_REG_FAST_MEMORY + 0x50bc, 0x1}, | 1948 | {OP_WR_E1, XSEM_REG_FAST_MEMORY + 0x50bc, 0x1}, |
| 1986 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x6c18, 0x42}, | 1949 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x6c18, 0x42}, |
| 1987 | {OP_SW_E1, XSEM_REG_FAST_MEMORY + 0x4ad0, 0x2033d}, | 1950 | {OP_SW_E1, XSEM_REG_FAST_MEMORY + 0x4ad0, 0x2033b}, |
| 1988 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x6d30, 0x4}, | 1951 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x6d30, 0x4}, |
| 1989 | {OP_ZR_E1, XSEM_REG_FAST_MEMORY + 0x4c18, 0x42}, | 1952 | {OP_ZR_E1, XSEM_REG_FAST_MEMORY + 0x4c18, 0x42}, |
| 1990 | {OP_ZR_E1, XSEM_REG_FAST_MEMORY + 0x4d30, 0x4}, | 1953 | {OP_ZR_E1, XSEM_REG_FAST_MEMORY + 0x4d30, 0x4}, |
| 1991 | #define XSEM_PORT1_END 1752 | 1954 | #define XSEM_PORT1_END 1715 |
| 1992 | #define XSEM_FUNC0_START 1752 | 1955 | #define XSEM_FUNC0_START 1715 |
| 1993 | {OP_WR_E1H, XSEM_REG_FAST_MEMORY + 0xc7e0, 0x0}, | 1956 | {OP_WR_E1H, XSEM_REG_FAST_MEMORY + 0xc7e0, 0x0}, |
| 1994 | {OP_SW_E1H, XSEM_REG_FAST_MEMORY + 0x28b8, 0x100361}, | 1957 | {OP_SW_E1H, XSEM_REG_FAST_MEMORY + 0x28b8, 0x100361}, |
| 1995 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x5048, 0xe}, | 1958 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x5048, 0xe}, |
| 1996 | #define XSEM_FUNC0_END 1755 | 1959 | #define XSEM_FUNC0_END 1718 |
| 1997 | #define XSEM_FUNC1_START 1755 | 1960 | #define XSEM_FUNC1_START 1718 |
| 1998 | {OP_WR_E1H, XSEM_REG_FAST_MEMORY + 0xc7e4, 0x0}, | 1961 | {OP_WR_E1H, XSEM_REG_FAST_MEMORY + 0xc7e4, 0x0}, |
| 1999 | {OP_SW_E1H, XSEM_REG_FAST_MEMORY + 0x28f8, 0x100371}, | 1962 | {OP_SW_E1H, XSEM_REG_FAST_MEMORY + 0x28f8, 0x100371}, |
| 2000 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x5080, 0xe}, | 1963 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x5080, 0xe}, |
| 2001 | #define XSEM_FUNC1_END 1758 | 1964 | #define XSEM_FUNC1_END 1721 |
| 2002 | #define XSEM_FUNC2_START 1758 | 1965 | #define XSEM_FUNC2_START 1721 |
| 2003 | {OP_WR_E1H, XSEM_REG_FAST_MEMORY + 0xc7e8, 0x0}, | 1966 | {OP_WR_E1H, XSEM_REG_FAST_MEMORY + 0xc7e8, 0x0}, |
| 2004 | {OP_SW_E1H, XSEM_REG_FAST_MEMORY + 0x2938, 0x100381}, | 1967 | {OP_SW_E1H, XSEM_REG_FAST_MEMORY + 0x2938, 0x100381}, |
| 2005 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x50b8, 0xe}, | 1968 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x50b8, 0xe}, |
| 2006 | #define XSEM_FUNC2_END 1761 | 1969 | #define XSEM_FUNC2_END 1724 |
| 2007 | #define XSEM_FUNC3_START 1761 | 1970 | #define XSEM_FUNC3_START 1724 |
| 2008 | {OP_WR_E1H, XSEM_REG_FAST_MEMORY + 0xc7ec, 0x0}, | 1971 | {OP_WR_E1H, XSEM_REG_FAST_MEMORY + 0xc7ec, 0x0}, |
| 2009 | {OP_SW_E1H, XSEM_REG_FAST_MEMORY + 0x2978, 0x100391}, | 1972 | {OP_SW_E1H, XSEM_REG_FAST_MEMORY + 0x2978, 0x100391}, |
| 2010 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x50f0, 0xe}, | 1973 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x50f0, 0xe}, |
| 2011 | #define XSEM_FUNC3_END 1764 | 1974 | #define XSEM_FUNC3_END 1727 |
| 2012 | #define XSEM_FUNC4_START 1764 | 1975 | #define XSEM_FUNC4_START 1727 |
| 2013 | {OP_WR_E1H, XSEM_REG_FAST_MEMORY + 0xc7f0, 0x0}, | 1976 | {OP_WR_E1H, XSEM_REG_FAST_MEMORY + 0xc7f0, 0x0}, |
| 2014 | {OP_SW_E1H, XSEM_REG_FAST_MEMORY + 0x29b8, 0x1003a1}, | 1977 | {OP_SW_E1H, XSEM_REG_FAST_MEMORY + 0x29b8, 0x1003a1}, |
| 2015 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x5128, 0xe}, | 1978 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x5128, 0xe}, |
| 2016 | #define XSEM_FUNC4_END 1767 | 1979 | #define XSEM_FUNC4_END 1730 |
| 2017 | #define XSEM_FUNC5_START 1767 | 1980 | #define XSEM_FUNC5_START 1730 |
| 2018 | {OP_WR_E1H, XSEM_REG_FAST_MEMORY + 0xc7f4, 0x0}, | 1981 | {OP_WR_E1H, XSEM_REG_FAST_MEMORY + 0xc7f4, 0x0}, |
| 2019 | {OP_SW_E1H, XSEM_REG_FAST_MEMORY + 0x29f8, 0x1003b1}, | 1982 | {OP_SW_E1H, XSEM_REG_FAST_MEMORY + 0x29f8, 0x1003b1}, |
| 2020 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x5160, 0xe}, | 1983 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x5160, 0xe}, |
| 2021 | #define XSEM_FUNC5_END 1770 | 1984 | #define XSEM_FUNC5_END 1733 |
| 2022 | #define XSEM_FUNC6_START 1770 | 1985 | #define XSEM_FUNC6_START 1733 |
| 2023 | {OP_WR_E1H, XSEM_REG_FAST_MEMORY + 0xc7f8, 0x0}, | 1986 | {OP_WR_E1H, XSEM_REG_FAST_MEMORY + 0xc7f8, 0x0}, |
| 2024 | {OP_SW_E1H, XSEM_REG_FAST_MEMORY + 0x2a38, 0x1003c1}, | 1987 | {OP_SW_E1H, XSEM_REG_FAST_MEMORY + 0x2a38, 0x1003c1}, |
| 2025 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x5198, 0xe}, | 1988 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x5198, 0xe}, |
| 2026 | #define XSEM_FUNC6_END 1773 | 1989 | #define XSEM_FUNC6_END 1736 |
| 2027 | #define XSEM_FUNC7_START 1773 | 1990 | #define XSEM_FUNC7_START 1736 |
| 2028 | {OP_WR_E1H, XSEM_REG_FAST_MEMORY + 0xc7fc, 0x0}, | 1991 | {OP_WR_E1H, XSEM_REG_FAST_MEMORY + 0xc7fc, 0x0}, |
| 2029 | {OP_SW_E1H, XSEM_REG_FAST_MEMORY + 0x2a78, 0x1003d1}, | 1992 | {OP_SW_E1H, XSEM_REG_FAST_MEMORY + 0x2a78, 0x1003d1}, |
| 2030 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x51d0, 0xe}, | 1993 | {OP_ZR_E1H, XSEM_REG_FAST_MEMORY + 0x51d0, 0xe}, |
| 2031 | #define XSEM_FUNC7_END 1776 | 1994 | #define XSEM_FUNC7_END 1739 |
| 2032 | #define CDU_COMMON_START 1776 | 1995 | #define CDU_COMMON_START 1739 |
| 2033 | {OP_WR, CDU_REG_CDU_CONTROL0, 0x1}, | 1996 | {OP_WR, CDU_REG_CDU_CONTROL0, 0x1}, |
| 2034 | {OP_WR_E1H, CDU_REG_MF_MODE, 0x1}, | 1997 | {OP_WR_E1H, CDU_REG_MF_MODE, 0x1}, |
| 2035 | {OP_WR, CDU_REG_CDU_CHK_MASK0, 0x3d000}, | 1998 | {OP_WR, CDU_REG_CDU_CHK_MASK0, 0x3d000}, |
| 2036 | {OP_WR, CDU_REG_CDU_CHK_MASK1, 0x3d}, | 1999 | {OP_WR, CDU_REG_CDU_CHK_MASK1, 0x3d}, |
| 2037 | {OP_WB_E1, CDU_REG_L1TT, 0x200033f}, | 2000 | {OP_WB_E1, CDU_REG_L1TT, 0x200033d}, |
| 2038 | {OP_WB_E1H, CDU_REG_L1TT, 0x20003e1}, | 2001 | {OP_WB_E1H, CDU_REG_L1TT, 0x20003e1}, |
| 2039 | {OP_WB_E1, CDU_REG_MATT, 0x20053f}, | 2002 | {OP_WB_E1, CDU_REG_MATT, 0x20053d}, |
| 2040 | {OP_WB_E1H, CDU_REG_MATT, 0x2805e1}, | 2003 | {OP_WB_E1H, CDU_REG_MATT, 0x2805e1}, |
| 2041 | {OP_ZR_E1, CDU_REG_MATT + 0x80, 0x2}, | 2004 | {OP_ZR_E1, CDU_REG_MATT + 0x80, 0x2}, |
| 2042 | {OP_WB_E1, CDU_REG_MATT + 0x88, 0x6055f}, | 2005 | {OP_WB_E1, CDU_REG_MATT + 0x88, 0x6055d}, |
| 2043 | {OP_ZR, CDU_REG_MATT + 0xa0, 0x18}, | 2006 | {OP_ZR, CDU_REG_MATT + 0xa0, 0x18}, |
| 2044 | #define CDU_COMMON_END 1787 | 2007 | #define CDU_COMMON_END 1750 |
| 2045 | #define DMAE_COMMON_START 1787 | 2008 | #define DMAE_COMMON_START 1750 |
| 2046 | {OP_ZR, DMAE_REG_CMD_MEM, 0xe0}, | 2009 | {OP_ZR, DMAE_REG_CMD_MEM, 0xe0}, |
| 2047 | {OP_WR, DMAE_REG_CRC16C_INIT, 0x0}, | 2010 | {OP_WR, DMAE_REG_CRC16C_INIT, 0x0}, |
| 2048 | {OP_WR, DMAE_REG_CRC16T10_INIT, 0x1}, | 2011 | {OP_WR, DMAE_REG_CRC16T10_INIT, 0x1}, |
| @@ -2050,24 +2013,24 @@ static const struct raw_op init_ops[] = { | |||
| 2050 | {OP_WR_E1H, DMAE_REG_PXP_REQ_INIT_CRD, 0x2}, | 2013 | {OP_WR_E1H, DMAE_REG_PXP_REQ_INIT_CRD, 0x2}, |
| 2051 | {OP_WR, DMAE_REG_PCI_IFEN, 0x1}, | 2014 | {OP_WR, DMAE_REG_PCI_IFEN, 0x1}, |
| 2052 | {OP_WR, DMAE_REG_GRC_IFEN, 0x1}, | 2015 | {OP_WR, DMAE_REG_GRC_IFEN, 0x1}, |
| 2053 | #define DMAE_COMMON_END 1794 | 2016 | #define DMAE_COMMON_END 1757 |
| 2054 | #define PXP_COMMON_START 1794 | 2017 | #define PXP_COMMON_START 1757 |
| 2055 | {OP_WB_E1, PXP_REG_HST_INBOUND_INT + 0x400, 0x50565}, | 2018 | {OP_WB_E1, PXP_REG_HST_INBOUND_INT + 0x400, 0x50563}, |
| 2056 | {OP_WB_E1H, PXP_REG_HST_INBOUND_INT + 0x400, 0x50609}, | 2019 | {OP_WB_E1H, PXP_REG_HST_INBOUND_INT + 0x400, 0x50609}, |
| 2057 | {OP_WB_E1, PXP_REG_HST_INBOUND_INT + 0x420, 0x5056a}, | 2020 | {OP_WB_E1, PXP_REG_HST_INBOUND_INT + 0x420, 0x50568}, |
| 2058 | {OP_WB_E1H, PXP_REG_HST_INBOUND_INT, 0x5060e}, | 2021 | {OP_WB_E1H, PXP_REG_HST_INBOUND_INT, 0x5060e}, |
| 2059 | {OP_WB_E1, PXP_REG_HST_INBOUND_INT, 0x5056f}, | 2022 | {OP_WB_E1, PXP_REG_HST_INBOUND_INT, 0x5056d}, |
| 2060 | #define PXP_COMMON_END 1799 | 2023 | #define PXP_COMMON_END 1762 |
| 2061 | #define CFC_COMMON_START 1799 | 2024 | #define CFC_COMMON_START 1762 |
| 2062 | {OP_ZR_E1H, CFC_REG_LINK_LIST, 0x100}, | 2025 | {OP_ZR_E1H, CFC_REG_LINK_LIST, 0x100}, |
| 2063 | {OP_WR, CFC_REG_CONTROL0, 0x10}, | 2026 | {OP_WR, CFC_REG_CONTROL0, 0x10}, |
| 2064 | {OP_WR, CFC_REG_DISABLE_ON_ERROR, 0x3fff}, | 2027 | {OP_WR, CFC_REG_DISABLE_ON_ERROR, 0x3fff}, |
| 2065 | {OP_WR, CFC_REG_LCREQ_WEIGHTS, 0x84924a}, | 2028 | {OP_WR, CFC_REG_LCREQ_WEIGHTS, 0x84924a}, |
| 2066 | #define CFC_COMMON_END 1803 | 2029 | #define CFC_COMMON_END 1766 |
| 2067 | #define HC_COMMON_START 1803 | 2030 | #define HC_COMMON_START 1766 |
| 2068 | {OP_ZR_E1, HC_REG_USTORM_ADDR_FOR_COALESCE, 0x4}, | 2031 | {OP_ZR_E1, HC_REG_USTORM_ADDR_FOR_COALESCE, 0x4}, |
| 2069 | #define HC_COMMON_END 1804 | 2032 | #define HC_COMMON_END 1767 |
| 2070 | #define HC_PORT0_START 1804 | 2033 | #define HC_PORT0_START 1767 |
| 2071 | {OP_WR_E1, HC_REG_CONFIG_0, 0x1080}, | 2034 | {OP_WR_E1, HC_REG_CONFIG_0, 0x1080}, |
| 2072 | {OP_ZR_E1, HC_REG_UC_RAM_ADDR_0, 0x2}, | 2035 | {OP_ZR_E1, HC_REG_UC_RAM_ADDR_0, 0x2}, |
| 2073 | {OP_WR_E1, HC_REG_ATTN_NUM_P0, 0x10}, | 2036 | {OP_WR_E1, HC_REG_ATTN_NUM_P0, 0x10}, |
| @@ -2086,8 +2049,8 @@ static const struct raw_op init_ops[] = { | |||
| 2086 | {OP_ZR_E1, HC_REG_STATISTIC_COUNTERS + 0x120, 0x4a}, | 2049 | {OP_ZR_E1, HC_REG_STATISTIC_COUNTERS + 0x120, 0x4a}, |
| 2087 | {OP_ZR_E1, HC_REG_STATISTIC_COUNTERS + 0x370, 0x4a}, | 2050 | {OP_ZR_E1, HC_REG_STATISTIC_COUNTERS + 0x370, 0x4a}, |
| 2088 | {OP_ZR_E1, HC_REG_STATISTIC_COUNTERS + 0x5c0, 0x4a}, | 2051 | {OP_ZR_E1, HC_REG_STATISTIC_COUNTERS + 0x5c0, 0x4a}, |
| 2089 | #define HC_PORT0_END 1822 | 2052 | #define HC_PORT0_END 1785 |
| 2090 | #define HC_PORT1_START 1822 | 2053 | #define HC_PORT1_START 1785 |
| 2091 | {OP_WR_E1, HC_REG_CONFIG_1, 0x1080}, | 2054 | {OP_WR_E1, HC_REG_CONFIG_1, 0x1080}, |
| 2092 | {OP_ZR_E1, HC_REG_UC_RAM_ADDR_1, 0x2}, | 2055 | {OP_ZR_E1, HC_REG_UC_RAM_ADDR_1, 0x2}, |
| 2093 | {OP_WR_E1, HC_REG_ATTN_NUM_P1, 0x10}, | 2056 | {OP_WR_E1, HC_REG_ATTN_NUM_P1, 0x10}, |
| @@ -2106,8 +2069,8 @@ static const struct raw_op init_ops[] = { | |||
| 2106 | {OP_ZR_E1, HC_REG_STATISTIC_COUNTERS + 0x248, 0x4a}, | 2069 | {OP_ZR_E1, HC_REG_STATISTIC_COUNTERS + 0x248, 0x4a}, |
| 2107 | {OP_ZR_E1, HC_REG_STATISTIC_COUNTERS + 0x498, 0x4a}, | 2070 | {OP_ZR_E1, HC_REG_STATISTIC_COUNTERS + 0x498, 0x4a}, |
| 2108 | {OP_ZR_E1, HC_REG_STATISTIC_COUNTERS + 0x6e8, 0x4a}, | 2071 | {OP_ZR_E1, HC_REG_STATISTIC_COUNTERS + 0x6e8, 0x4a}, |
| 2109 | #define HC_PORT1_END 1840 | 2072 | #define HC_PORT1_END 1803 |
| 2110 | #define HC_FUNC0_START 1840 | 2073 | #define HC_FUNC0_START 1803 |
| 2111 | {OP_WR_E1H, HC_REG_CONFIG_0, 0x1080}, | 2074 | {OP_WR_E1H, HC_REG_CONFIG_0, 0x1080}, |
| 2112 | {OP_WR_E1H, HC_REG_FUNC_NUM_P0, 0x0}, | 2075 | {OP_WR_E1H, HC_REG_FUNC_NUM_P0, 0x0}, |
| 2113 | {OP_WR_E1H, HC_REG_ATTN_NUM_P0, 0x10}, | 2076 | {OP_WR_E1H, HC_REG_ATTN_NUM_P0, 0x10}, |
| @@ -2123,8 +2086,8 @@ static const struct raw_op init_ops[] = { | |||
| 2123 | {OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x120, 0x4a}, | 2086 | {OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x120, 0x4a}, |
| 2124 | {OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x370, 0x4a}, | 2087 | {OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x370, 0x4a}, |
| 2125 | {OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x5c0, 0x4a}, | 2088 | {OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x5c0, 0x4a}, |
| 2126 | #define HC_FUNC0_END 1855 | 2089 | #define HC_FUNC0_END 1818 |
| 2127 | #define HC_FUNC1_START 1855 | 2090 | #define HC_FUNC1_START 1818 |
| 2128 | {OP_WR_E1H, HC_REG_CONFIG_1, 0x1080}, | 2091 | {OP_WR_E1H, HC_REG_CONFIG_1, 0x1080}, |
| 2129 | {OP_WR_E1H, HC_REG_FUNC_NUM_P1, 0x1}, | 2092 | {OP_WR_E1H, HC_REG_FUNC_NUM_P1, 0x1}, |
| 2130 | {OP_WR_E1H, HC_REG_ATTN_NUM_P1, 0x10}, | 2093 | {OP_WR_E1H, HC_REG_ATTN_NUM_P1, 0x10}, |
| @@ -2140,8 +2103,8 @@ static const struct raw_op init_ops[] = { | |||
| 2140 | {OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x248, 0x4a}, | 2103 | {OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x248, 0x4a}, |
| 2141 | {OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x498, 0x4a}, | 2104 | {OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x498, 0x4a}, |
| 2142 | {OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x6e8, 0x4a}, | 2105 | {OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x6e8, 0x4a}, |
| 2143 | #define HC_FUNC1_END 1870 | 2106 | #define HC_FUNC1_END 1833 |
| 2144 | #define HC_FUNC2_START 1870 | 2107 | #define HC_FUNC2_START 1833 |
| 2145 | {OP_WR_E1H, HC_REG_CONFIG_0, 0x1080}, | 2108 | {OP_WR_E1H, HC_REG_CONFIG_0, 0x1080}, |
| 2146 | {OP_WR_E1H, HC_REG_FUNC_NUM_P0, 0x2}, | 2109 | {OP_WR_E1H, HC_REG_FUNC_NUM_P0, 0x2}, |
| 2147 | {OP_WR_E1H, HC_REG_ATTN_NUM_P0, 0x10}, | 2110 | {OP_WR_E1H, HC_REG_ATTN_NUM_P0, 0x10}, |
| @@ -2157,8 +2120,8 @@ static const struct raw_op init_ops[] = { | |||
| 2157 | {OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x120, 0x4a}, | 2120 | {OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x120, 0x4a}, |
| 2158 | {OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x370, 0x4a}, | 2121 | {OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x370, 0x4a}, |
| 2159 | {OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x5c0, 0x4a}, | 2122 | {OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x5c0, 0x4a}, |
| 2160 | #define HC_FUNC2_END 1885 | 2123 | #define HC_FUNC2_END 1848 |
| 2161 | #define HC_FUNC3_START 1885 | 2124 | #define HC_FUNC3_START 1848 |
| 2162 | {OP_WR_E1H, HC_REG_CONFIG_1, 0x1080}, | 2125 | {OP_WR_E1H, HC_REG_CONFIG_1, 0x1080}, |
| 2163 | {OP_WR_E1H, HC_REG_FUNC_NUM_P1, 0x3}, | 2126 | {OP_WR_E1H, HC_REG_FUNC_NUM_P1, 0x3}, |
| 2164 | {OP_WR_E1H, HC_REG_ATTN_NUM_P1, 0x10}, | 2127 | {OP_WR_E1H, HC_REG_ATTN_NUM_P1, 0x10}, |
| @@ -2174,8 +2137,8 @@ static const struct raw_op init_ops[] = { | |||
| 2174 | {OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x248, 0x4a}, | 2137 | {OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x248, 0x4a}, |
| 2175 | {OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x498, 0x4a}, | 2138 | {OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x498, 0x4a}, |
| 2176 | {OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x6e8, 0x4a}, | 2139 | {OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x6e8, 0x4a}, |
| 2177 | #define HC_FUNC3_END 1900 | 2140 | #define HC_FUNC3_END 1863 |
| 2178 | #define HC_FUNC4_START 1900 | 2141 | #define HC_FUNC4_START 1863 |
| 2179 | {OP_WR_E1H, HC_REG_CONFIG_0, 0x1080}, | 2142 | {OP_WR_E1H, HC_REG_CONFIG_0, 0x1080}, |
| 2180 | {OP_WR_E1H, HC_REG_FUNC_NUM_P0, 0x4}, | 2143 | {OP_WR_E1H, HC_REG_FUNC_NUM_P0, 0x4}, |
| 2181 | {OP_WR_E1H, HC_REG_ATTN_NUM_P0, 0x10}, | 2144 | {OP_WR_E1H, HC_REG_ATTN_NUM_P0, 0x10}, |
| @@ -2191,8 +2154,8 @@ static const struct raw_op init_ops[] = { | |||
| 2191 | {OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x120, 0x4a}, | 2154 | {OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x120, 0x4a}, |
| 2192 | {OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x370, 0x4a}, | 2155 | {OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x370, 0x4a}, |
| 2193 | {OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x5c0, 0x4a}, | 2156 | {OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x5c0, 0x4a}, |
| 2194 | #define HC_FUNC4_END 1915 | 2157 | #define HC_FUNC4_END 1878 |
| 2195 | #define HC_FUNC5_START 1915 | 2158 | #define HC_FUNC5_START 1878 |
| 2196 | {OP_WR_E1H, HC_REG_CONFIG_1, 0x1080}, | 2159 | {OP_WR_E1H, HC_REG_CONFIG_1, 0x1080}, |
| 2197 | {OP_WR_E1H, HC_REG_FUNC_NUM_P1, 0x5}, | 2160 | {OP_WR_E1H, HC_REG_FUNC_NUM_P1, 0x5}, |
| 2198 | {OP_WR_E1H, HC_REG_ATTN_NUM_P1, 0x10}, | 2161 | {OP_WR_E1H, HC_REG_ATTN_NUM_P1, 0x10}, |
| @@ -2208,8 +2171,8 @@ static const struct raw_op init_ops[] = { | |||
| 2208 | {OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x248, 0x4a}, | 2171 | {OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x248, 0x4a}, |
| 2209 | {OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x498, 0x4a}, | 2172 | {OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x498, 0x4a}, |
| 2210 | {OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x6e8, 0x4a}, | 2173 | {OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x6e8, 0x4a}, |
| 2211 | #define HC_FUNC5_END 1930 | 2174 | #define HC_FUNC5_END 1893 |
| 2212 | #define HC_FUNC6_START 1930 | 2175 | #define HC_FUNC6_START 1893 |
| 2213 | {OP_WR_E1H, HC_REG_CONFIG_0, 0x1080}, | 2176 | {OP_WR_E1H, HC_REG_CONFIG_0, 0x1080}, |
| 2214 | {OP_WR_E1H, HC_REG_FUNC_NUM_P0, 0x6}, | 2177 | {OP_WR_E1H, HC_REG_FUNC_NUM_P0, 0x6}, |
| 2215 | {OP_WR_E1H, HC_REG_ATTN_NUM_P0, 0x10}, | 2178 | {OP_WR_E1H, HC_REG_ATTN_NUM_P0, 0x10}, |
| @@ -2225,8 +2188,8 @@ static const struct raw_op init_ops[] = { | |||
| 2225 | {OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x120, 0x4a}, | 2188 | {OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x120, 0x4a}, |
| 2226 | {OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x370, 0x4a}, | 2189 | {OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x370, 0x4a}, |
| 2227 | {OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x5c0, 0x4a}, | 2190 | {OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x5c0, 0x4a}, |
| 2228 | #define HC_FUNC6_END 1945 | 2191 | #define HC_FUNC6_END 1908 |
| 2229 | #define HC_FUNC7_START 1945 | 2192 | #define HC_FUNC7_START 1908 |
| 2230 | {OP_WR_E1H, HC_REG_CONFIG_1, 0x1080}, | 2193 | {OP_WR_E1H, HC_REG_CONFIG_1, 0x1080}, |
| 2231 | {OP_WR_E1H, HC_REG_FUNC_NUM_P1, 0x7}, | 2194 | {OP_WR_E1H, HC_REG_FUNC_NUM_P1, 0x7}, |
| 2232 | {OP_WR_E1H, HC_REG_ATTN_NUM_P1, 0x10}, | 2195 | {OP_WR_E1H, HC_REG_ATTN_NUM_P1, 0x10}, |
| @@ -2242,8 +2205,8 @@ static const struct raw_op init_ops[] = { | |||
| 2242 | {OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x248, 0x4a}, | 2205 | {OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x248, 0x4a}, |
| 2243 | {OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x498, 0x4a}, | 2206 | {OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x498, 0x4a}, |
| 2244 | {OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x6e8, 0x4a}, | 2207 | {OP_ZR_E1H, HC_REG_STATISTIC_COUNTERS + 0x6e8, 0x4a}, |
| 2245 | #define HC_FUNC7_END 1960 | 2208 | #define HC_FUNC7_END 1923 |
| 2246 | #define PXP2_COMMON_START 1960 | 2209 | #define PXP2_COMMON_START 1923 |
| 2247 | {OP_WR_E1, PXP2_REG_PGL_CONTROL0, 0xe38340}, | 2210 | {OP_WR_E1, PXP2_REG_PGL_CONTROL0, 0xe38340}, |
| 2248 | {OP_WR_E1H, PXP2_REG_RQ_DRAM_ALIGN, 0x1}, | 2211 | {OP_WR_E1H, PXP2_REG_RQ_DRAM_ALIGN, 0x1}, |
| 2249 | {OP_WR, PXP2_REG_PGL_CONTROL1, 0x3c10}, | 2212 | {OP_WR, PXP2_REG_PGL_CONTROL1, 0x3c10}, |
| @@ -2361,8 +2324,8 @@ static const struct raw_op init_ops[] = { | |||
| 2361 | {OP_WR_E1H, PXP2_REG_RQ_ILT_MODE, 0x1}, | 2324 | {OP_WR_E1H, PXP2_REG_RQ_ILT_MODE, 0x1}, |
| 2362 | {OP_WR, PXP2_REG_RQ_RBC_DONE, 0x1}, | 2325 | {OP_WR, PXP2_REG_RQ_RBC_DONE, 0x1}, |
| 2363 | {OP_WR_E1H, PXP2_REG_PGL_CONTROL0, 0xe38340}, | 2326 | {OP_WR_E1H, PXP2_REG_PGL_CONTROL0, 0xe38340}, |
| 2364 | #define PXP2_COMMON_END 2077 | 2327 | #define PXP2_COMMON_END 2040 |
| 2365 | #define MISC_AEU_COMMON_START 2077 | 2328 | #define MISC_AEU_COMMON_START 2040 |
| 2366 | {OP_ZR, MISC_REG_AEU_GENERAL_ATTN_0, 0x16}, | 2329 | {OP_ZR, MISC_REG_AEU_GENERAL_ATTN_0, 0x16}, |
| 2367 | {OP_WR_E1H, MISC_REG_AEU_ENABLE1_NIG_0, 0x55540000}, | 2330 | {OP_WR_E1H, MISC_REG_AEU_ENABLE1_NIG_0, 0x55540000}, |
| 2368 | {OP_WR_E1H, MISC_REG_AEU_ENABLE2_NIG_0, 0x55555555}, | 2331 | {OP_WR_E1H, MISC_REG_AEU_ENABLE2_NIG_0, 0x55555555}, |
| @@ -2382,8 +2345,8 @@ static const struct raw_op init_ops[] = { | |||
| 2382 | {OP_WR_E1H, MISC_REG_AEU_ENABLE4_PXP_1, 0x0}, | 2345 | {OP_WR_E1H, MISC_REG_AEU_ENABLE4_PXP_1, 0x0}, |
| 2383 | {OP_WR_E1H, MISC_REG_AEU_CLR_LATCH_SIGNAL, 0xc00}, | 2346 | {OP_WR_E1H, MISC_REG_AEU_CLR_LATCH_SIGNAL, 0xc00}, |
| 2384 | {OP_WR_E1H, MISC_REG_AEU_GENERAL_MASK, 0x3}, | 2347 | {OP_WR_E1H, MISC_REG_AEU_GENERAL_MASK, 0x3}, |
| 2385 | #define MISC_AEU_COMMON_END 2096 | 2348 | #define MISC_AEU_COMMON_END 2059 |
| 2386 | #define MISC_AEU_PORT0_START 2096 | 2349 | #define MISC_AEU_PORT0_START 2059 |
| 2387 | {OP_WR_E1, MISC_REG_AEU_ENABLE1_FUNC_0_OUT_0, 0xbf5c0000}, | 2350 | {OP_WR_E1, MISC_REG_AEU_ENABLE1_FUNC_0_OUT_0, 0xbf5c0000}, |
| 2388 | {OP_WR_E1H, MISC_REG_AEU_ENABLE1_FUNC_0_OUT_0, 0xff5c0000}, | 2351 | {OP_WR_E1H, MISC_REG_AEU_ENABLE1_FUNC_0_OUT_0, 0xff5c0000}, |
| 2389 | {OP_WR_E1, MISC_REG_AEU_ENABLE2_FUNC_0_OUT_0, 0xfff51fef}, | 2352 | {OP_WR_E1, MISC_REG_AEU_ENABLE2_FUNC_0_OUT_0, 0xfff51fef}, |
| @@ -2416,8 +2379,8 @@ static const struct raw_op init_ops[] = { | |||
| 2416 | {OP_WR_E1, MISC_REG_AEU_INVERTER_1_FUNC_0, 0x0}, | 2379 | {OP_WR_E1, MISC_REG_AEU_INVERTER_1_FUNC_0, 0x0}, |
| 2417 | {OP_ZR_E1, MISC_REG_AEU_INVERTER_2_FUNC_0, 0x3}, | 2380 | {OP_ZR_E1, MISC_REG_AEU_INVERTER_2_FUNC_0, 0x3}, |
| 2418 | {OP_WR_E1, MISC_REG_AEU_MASK_ATTN_FUNC_0, 0x7}, | 2381 | {OP_WR_E1, MISC_REG_AEU_MASK_ATTN_FUNC_0, 0x7}, |
| 2419 | #define MISC_AEU_PORT0_END 2128 | 2382 | #define MISC_AEU_PORT0_END 2091 |
| 2420 | #define MISC_AEU_PORT1_START 2128 | 2383 | #define MISC_AEU_PORT1_START 2091 |
| 2421 | {OP_WR_E1, MISC_REG_AEU_ENABLE1_FUNC_1_OUT_0, 0xbf5c0000}, | 2384 | {OP_WR_E1, MISC_REG_AEU_ENABLE1_FUNC_1_OUT_0, 0xbf5c0000}, |
| 2422 | {OP_WR_E1H, MISC_REG_AEU_ENABLE1_FUNC_1_OUT_0, 0xff5c0000}, | 2385 | {OP_WR_E1H, MISC_REG_AEU_ENABLE1_FUNC_1_OUT_0, 0xff5c0000}, |
| 2423 | {OP_WR_E1, MISC_REG_AEU_ENABLE2_FUNC_1_OUT_0, 0xfff51fef}, | 2386 | {OP_WR_E1, MISC_REG_AEU_ENABLE2_FUNC_1_OUT_0, 0xfff51fef}, |
| @@ -2450,7 +2413,7 @@ static const struct raw_op init_ops[] = { | |||
| 2450 | {OP_WR_E1, MISC_REG_AEU_INVERTER_1_FUNC_1, 0x0}, | 2413 | {OP_WR_E1, MISC_REG_AEU_INVERTER_1_FUNC_1, 0x0}, |
| 2451 | {OP_ZR_E1, MISC_REG_AEU_INVERTER_2_FUNC_1, 0x3}, | 2414 | {OP_ZR_E1, MISC_REG_AEU_INVERTER_2_FUNC_1, 0x3}, |
| 2452 | {OP_WR_E1, MISC_REG_AEU_MASK_ATTN_FUNC_1, 0x7}, | 2415 | {OP_WR_E1, MISC_REG_AEU_MASK_ATTN_FUNC_1, 0x7}, |
| 2453 | #define MISC_AEU_PORT1_END 2160 | 2416 | #define MISC_AEU_PORT1_END 2123 |
| 2454 | 2417 | ||
| 2455 | }; | 2418 | }; |
| 2456 | 2419 | ||
| @@ -2560,103 +2523,92 @@ static const u32 init_data_e1[] = { | |||
| 2560 | 0x00049c00, 0x00051f80, 0x0005a300, 0x00062680, 0x0006aa00, 0x00072d80, | 2523 | 0x00049c00, 0x00051f80, 0x0005a300, 0x00062680, 0x0006aa00, 0x00072d80, |
| 2561 | 0x0007b100, 0x00083480, 0x0008b800, 0x00093b80, 0x0009bf00, 0x000a4280, | 2524 | 0x0007b100, 0x00083480, 0x0008b800, 0x00093b80, 0x0009bf00, 0x000a4280, |
| 2562 | 0x000ac600, 0x000b4980, 0x000bcd00, 0x000c5080, 0x000cd400, 0x000d5780, | 2525 | 0x000ac600, 0x000b4980, 0x000bcd00, 0x000c5080, 0x000cd400, 0x000d5780, |
| 2563 | 0x000ddb00, 0x00001900, 0x00000028, 0x00000000, 0x00100000, 0x00000000, | 2526 | 0x000ddb00, 0x00001900, 0x00100000, 0x00000000, 0x00000000, 0xffffffff, |
| 2564 | 0x00000000, 0xffffffff, 0x40000000, 0x40000000, 0x40000000, 0x40000000, | ||
| 2565 | 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, | 2527 | 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, |
| 2566 | 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, | 2528 | 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, |
| 2567 | 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, | 2529 | 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, |
| 2568 | 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, | 2530 | 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, |
| 2569 | 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x00000000, 0x00007ff8, | ||
| 2570 | 0x00000000, 0x00001500, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, | ||
| 2571 | 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0x40000000, 0x40000000, | ||
| 2572 | 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, | 2531 | 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, |
| 2532 | 0x40000000, 0x40000000, 0x00000000, 0x00007ff8, 0x00000000, 0x00001500, | ||
| 2533 | 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, | ||
| 2534 | 0xffffffff, 0xffffffff, 0x40000000, 0x40000000, 0x40000000, 0x40000000, | ||
| 2573 | 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, | 2535 | 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, |
| 2574 | 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, | 2536 | 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, |
| 2575 | 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, | 2537 | 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, |
| 2576 | 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, | 2538 | 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, |
| 2577 | 0x00000000, 0x00007ff8, 0x00000000, 0x00003500, 0x00001000, 0x00002080, | 2539 | 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x00000000, 0x00007ff8, |
| 2578 | 0x00003100, 0x00004180, 0x00005200, 0x00006280, 0x00007300, 0x00008380, | 2540 | 0x00000000, 0x00003500, 0x00001000, 0x00002080, 0x00003100, 0x00004180, |
| 2579 | 0x00009400, 0x0000a480, 0x0000b500, 0x0000c580, 0x0000d600, 0x0000e680, | 2541 | 0x00005200, 0x00006280, 0x00007300, 0x00008380, 0x00009400, 0x0000a480, |
| 2580 | 0x0000f700, 0x00010780, 0x00011800, 0x00012880, 0x00013900, 0x00014980, | 2542 | 0x0000b500, 0x0000c580, 0x0000d600, 0x0000e680, 0x0000f700, 0x00010780, |
| 2581 | 0x00015a00, 0x00016a80, 0x00017b00, 0x00018b80, 0x00019c00, 0x0001ac80, | 2543 | 0x00011800, 0x00012880, 0x00013900, 0x00014980, 0x00015a00, 0x00016a80, |
| 2582 | 0x0001bd00, 0x0001cd80, 0x0001de00, 0x0001ee80, 0x0001ff00, 0x00000000, | 2544 | 0x00017b00, 0x00018b80, 0x00019c00, 0x0001ac80, 0x0001bd00, 0x0001cd80, |
| 2583 | 0x00010001, 0x00000604, 0xccccccc1, 0xffffffff, 0xffffffff, 0xcccc0201, | 2545 | 0x0001de00, 0x0001ee80, 0x0001ff00, 0x00000000, 0x00010001, 0x00000604, |
| 2584 | 0xcccccccc, 0x00000000, 0xffffffff, 0x40000000, 0x40000000, 0x40000000, | 2546 | 0xccccccc1, 0xffffffff, 0xffffffff, 0xcccc0201, 0xcccccccc, 0x00000000, |
| 2547 | 0xffffffff, 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, | ||
| 2585 | 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, | 2548 | 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, |
| 2586 | 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, | 2549 | 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, |
| 2587 | 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, | 2550 | 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, |
| 2588 | 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, | 2551 | 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, |
| 2589 | 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x00000000, | 2552 | 0x40000000, 0x40000000, 0x40000000, 0x00000000, 0x00007ff8, 0x00000000, |
| 2590 | 0x00007ff8, 0x00000000, 0x00003500, 0x0000ffff, 0x00000000, 0x0000ffff, | 2553 | 0x00003500, 0x0000ffff, 0x00000000, 0x0000ffff, 0x00000000, 0x0000ffff, |
| 2591 | 0x00000000, 0x0000ffff, 0x00000000, 0x0000ffff, 0x00000000, 0x0000ffff, | 2554 | 0x00000000, 0x0000ffff, 0x00000000, 0x0000ffff, 0x00000000, 0x0000ffff, |
| 2555 | 0x00000000, 0x0000ffff, 0x00000000, 0x0000ffff, 0x00000000, 0x00100000, | ||
| 2592 | 0x00000000, 0x0000ffff, 0x00000000, 0x0000ffff, 0x00000000, 0x0000ffff, | 2556 | 0x00000000, 0x0000ffff, 0x00000000, 0x0000ffff, 0x00000000, 0x0000ffff, |
| 2593 | 0x00000000, 0x00100000, 0x00000000, 0x0000ffff, 0x00000000, 0x0000ffff, | ||
| 2594 | 0x00000000, 0x0000ffff, 0x00000000, 0x0000ffff, 0x00000000, 0x0000ffff, | 2557 | 0x00000000, 0x0000ffff, 0x00000000, 0x0000ffff, 0x00000000, 0x0000ffff, |
| 2595 | 0x00000000, 0x0000ffff, 0x00000000, 0x0000ffff, 0x00000000, 0x0000ffff, | 2558 | 0x00000000, 0x0000ffff, 0x00000000, 0x0000ffff, 0x00000000, 0x00100000, |
| 2596 | 0x00000000, 0x00100000, 0x00000000, 0xfffffff3, 0x320fffff, 0x0c30c30c, | 2559 | 0x00000000, 0xfffffff3, 0x320fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, |
| 2597 | 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0000cf3c, 0xcdcdcdcd, 0xfffffff1, | 2560 | 0xf3cf3cf3, 0x0000cf3c, 0xcdcdcdcd, 0xfffffff1, 0x30efffff, 0x0c30c30c, |
| 2598 | 0x30efffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0001cf3c, | ||
| 2599 | 0xcdcdcdcd, 0xfffffff6, 0x305fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, | ||
| 2600 | 0xf3cf3cf3, 0x0002cf3c, 0xcdcdcdcd, 0xfffff406, 0x1cbfffff, 0x0c30c305, | ||
| 2601 | 0xc30c30c3, 0xcf300014, 0xf3cf3cf3, 0x0004cf3c, 0xcdcdcdcd, 0xfffffff2, | ||
| 2602 | 0x304fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0008cf3c, | ||
| 2603 | 0xcdcdcdcd, 0xfffffffa, 0x302fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, | ||
| 2604 | 0xf3cf3cf3, 0x0010cf3c, 0xcdcdcdcd, 0xfffffff7, 0x31efffff, 0x0c30c30c, | ||
| 2605 | 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0020cf3c, 0xcdcdcdcd, 0xfffffff5, | ||
| 2606 | 0x302fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0040cf3c, | ||
| 2607 | 0xcdcdcdcd, 0xfffffff3, 0x310fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, | ||
| 2608 | 0xf3cf3cf3, 0x0000cf3c, 0xcdcdcdcd, 0xfffffff1, 0x310fffff, 0x0c30c30c, | ||
| 2609 | 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0001cf3c, 0xcdcdcdcd, 0xfffffff6, | 2561 | 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0001cf3c, 0xcdcdcdcd, 0xfffffff6, |
| 2610 | 0x305fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0002cf3c, | 2562 | 0x305fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0002cf3c, |
| 2611 | 0xcdcdcdcd, 0xfffff406, 0x1cbfffff, 0x0c30c305, 0xc30c30c3, 0xcf300014, | 2563 | 0xcdcdcdcd, 0xfffff406, 0x1cbfffff, 0x0c30c305, 0xc30c30c3, 0xcf300014, |
| 2612 | 0xf3cf3cf3, 0x0004cf3c, 0xcdcdcdcd, 0xfffffff2, 0x304fffff, 0x0c30c30c, | 2564 | 0xf3cf3cf3, 0x0004cf3c, 0xcdcdcdcd, 0xfffffff2, 0x304fffff, 0x0c30c30c, |
| 2613 | 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0008cf3c, 0xcdcdcdcd, 0xfffffffa, | 2565 | 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0008cf3c, 0xcdcdcdcd, 0xfffffffa, |
| 2614 | 0x302fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0010cf3c, | 2566 | 0x302fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0010cf3c, |
| 2615 | 0xcdcdcdcd, 0xfffffff7, 0x30efffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, | 2567 | 0xcdcdcdcd, 0xfffffff7, 0x31efffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, |
| 2616 | 0xf3cf3cf3, 0x0020cf3c, 0xcdcdcdcd, 0xfffffff5, 0x304fffff, 0x0c30c30c, | 2568 | 0xf3cf3cf3, 0x0020cf3c, 0xcdcdcdcd, 0xfffffff5, 0x302fffff, 0x0c30c30c, |
| 2617 | 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0040cf3c, 0xcdcdcdcd, 0xfffffff3, | 2569 | 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0040cf3c, 0xcdcdcdcd, 0xfffffff3, |
| 2618 | 0x31efffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0000cf3c, | 2570 | 0x310fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0000cf3c, |
| 2619 | 0xcdcdcdcd, 0xfffffff1, 0x310fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, | 2571 | 0xcdcdcdcd, 0xfffffff1, 0x310fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, |
| 2620 | 0xf3cf3cf3, 0x0001cf3c, 0xcdcdcdcd, 0xfffffff6, 0x305fffff, 0x0c30c30c, | 2572 | 0xf3cf3cf3, 0x0001cf3c, 0xcdcdcdcd, 0xfffffff6, 0x305fffff, 0x0c30c30c, |
| 2621 | 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0002cf3c, 0xcdcdcdcd, 0xfffff406, | 2573 | 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0002cf3c, 0xcdcdcdcd, 0xfffff406, |
| 2622 | 0x1cbfffff, 0x0c30c305, 0xc30c30c3, 0xcf300014, 0xf3cf3cf3, 0x0004cf3c, | 2574 | 0x1cbfffff, 0x0c30c305, 0xc30c30c3, 0xcf300014, 0xf3cf3cf3, 0x0004cf3c, |
| 2623 | 0xcdcdcdcd, 0xfffffff2, 0x304fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, | 2575 | 0xcdcdcdcd, 0xfffffff2, 0x304fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, |
| 2624 | 0xf3cf3cf3, 0x0008cf3c, 0xcdcdcdcd, 0xfffffffa, 0x302fffff, 0x0c30c30c, | 2576 | 0xf3cf3cf3, 0x0008cf3c, 0xcdcdcdcd, 0xfffffffa, 0x302fffff, 0x0c30c30c, |
| 2625 | 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0010cf3c, 0xcdcdcdcd, 0xffffff97, | 2577 | 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0010cf3c, 0xcdcdcdcd, 0xfffffff7, |
| 2626 | 0x056fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cc000, 0xf3cf3cf3, 0x0020cf3c, | 2578 | 0x30efffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0020cf3c, |
| 2627 | 0xcdcdcdcd, 0xfffffff5, 0x310fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, | 2579 | 0xcdcdcdcd, 0xfffffff5, 0x304fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, |
| 2628 | 0xf3cf3cf3, 0x0040cf3c, 0xcdcdcdcd, 0xfffffff3, 0x320fffff, 0x0c30c30c, | 2580 | 0xf3cf3cf3, 0x0040cf3c, 0xcdcdcdcd, 0xfffffff3, 0x31efffff, 0x0c30c30c, |
| 2629 | 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0000cf3c, 0xcdcdcdcd, 0xfffffff1, | 2581 | 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0000cf3c, 0xcdcdcdcd, 0xfffffff1, |
| 2630 | 0x310fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0001cf3c, | 2582 | 0x310fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0001cf3c, |
| 2631 | 0xcdcdcdcd, 0xfffffff6, 0x305fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, | 2583 | 0xcdcdcdcd, 0xfffffff6, 0x305fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, |
| 2632 | 0xf3cf3cf3, 0x0002cf3c, 0xcdcdcdcd, 0xfffff406, 0x1cbfffff, 0x0c30c305, | 2584 | 0xf3cf3cf3, 0x0002cf3c, 0xcdcdcdcd, 0xfffff406, 0x1cbfffff, 0x0c30c305, |
| 2633 | 0xc30c30c3, 0xcf300014, 0xf3cf3cf3, 0x0004cf3c, 0xcdcdcdcd, 0xfffffff2, | 2585 | 0xc30c30c3, 0xcf300014, 0xf3cf3cf3, 0x0004cf3c, 0xcdcdcdcd, 0xfffffff2, |
| 2634 | 0x304fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0008cf3c, | 2586 | 0x304fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0008cf3c, |
| 2635 | 0xcdcdcdcd, 0xffffff8a, 0x042fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cc000, | 2587 | 0xcdcdcdcd, 0xfffffffa, 0x302fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, |
| 2636 | 0xf3cf3cf3, 0x0010cf3c, 0xcdcdcdcd, 0xffffff97, 0x05cfffff, 0x0c30c30c, | 2588 | 0xf3cf3cf3, 0x0010cf3c, 0xcdcdcdcd, 0xffffff97, 0x056fffff, 0x0c30c30c, |
| 2637 | 0xc30c30c3, 0xcf3cc000, 0xf3cf3cf3, 0x0020cf3c, 0xcdcdcdcd, 0xfffffff5, | 2589 | 0xc30c30c3, 0xcf3cc000, 0xf3cf3cf3, 0x0020cf3c, 0xcdcdcdcd, 0xfffffff5, |
| 2638 | 0x310fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0040cf3c, | 2590 | 0x310fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0040cf3c, |
| 2639 | 0xcdcdcdcd, 0xfffffff3, 0x300fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, | 2591 | 0xcdcdcdcd, 0xfffffff3, 0x320fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, |
| 2640 | 0xf3cf3cf3, 0x0000cf3c, 0xcdcdcdcd, 0xfffffff1, 0x300fffff, 0x0c30c30c, | 2592 | 0xf3cf3cf3, 0x0000cf3c, 0xcdcdcdcd, 0xfffffff1, 0x310fffff, 0x0c30c30c, |
| 2641 | 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0001cf3c, 0xcdcdcdcd, 0xfffffff6, | 2593 | 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0001cf3c, 0xcdcdcdcd, 0xfffffff6, |
| 2642 | 0x305fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0002cf3c, | 2594 | 0x305fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0002cf3c, |
| 2643 | 0xcdcdcdcd, 0xfffff406, 0x1cbfffff, 0x0c30c305, 0xc30c30c3, 0xcf300014, | 2595 | 0xcdcdcdcd, 0xfffff406, 0x1cbfffff, 0x0c30c305, 0xc30c30c3, 0xcf300014, |
| 2644 | 0xf3cf3cf3, 0x0004cf3c, 0xcdcdcdcd, 0xfffffff2, 0x304fffff, 0x0c30c30c, | 2596 | 0xf3cf3cf3, 0x0004cf3c, 0xcdcdcdcd, 0xfffffff2, 0x304fffff, 0x0c30c30c, |
| 2645 | 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0008cf3c, 0xcdcdcdcd, 0xfffffffa, | 2597 | 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0008cf3c, 0xcdcdcdcd, 0xffffff8a, |
| 2646 | 0x302fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0010cf3c, | 2598 | 0x042fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cc000, 0xf3cf3cf3, 0x0010cf3c, |
| 2647 | 0xcdcdcdcd, 0xffffff97, 0x040fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cc000, | 2599 | 0xcdcdcdcd, 0xffffff97, 0x05cfffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cc000, |
| 2648 | 0xf3cf3cf3, 0x0020cf3c, 0xcdcdcdcd, 0xfffffff5, 0x300fffff, 0x0c30c30c, | 2600 | 0xf3cf3cf3, 0x0020cf3c, 0xcdcdcdcd, 0xfffffff5, 0x310fffff, 0x0c30c30c, |
| 2649 | 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0040cf3c, 0xcdcdcdcd, 0xffffffff, | 2601 | 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0040cf3c, 0xcdcdcdcd, 0xfffffff3, |
| 2650 | 0x30cfffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf3cc, 0xf3cf3cf3, 0x0000cf3c, | 2602 | 0x300fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0000cf3c, |
| 2651 | 0xcdcdcdcd, 0xffffffff, 0x30cfffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf3cc, | 2603 | 0xcdcdcdcd, 0xfffffff1, 0x300fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, |
| 2652 | 0xf3cf3cf3, 0x0001cf3c, 0xcdcdcdcd, 0xffffffff, 0x30cfffff, 0x0c30c30c, | 2604 | 0xf3cf3cf3, 0x0001cf3c, 0xcdcdcdcd, 0xfffffff6, 0x305fffff, 0x0c30c30c, |
| 2653 | 0xc30c30c3, 0xcf3cf3cc, 0xf3cf3cf3, 0x0002cf3c, 0xcdcdcdcd, 0xffffffff, | 2605 | 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0002cf3c, 0xcdcdcdcd, 0xfffff406, |
| 2654 | 0x30cfffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf3cc, 0xf3cf3cf3, 0x0004cf3c, | 2606 | 0x1cbfffff, 0x0c30c305, 0xc30c30c3, 0xcf300014, 0xf3cf3cf3, 0x0004cf3c, |
| 2655 | 0xcdcdcdcd, 0xffffffff, 0x30cfffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf3cc, | 2607 | 0xcdcdcdcd, 0xfffffff2, 0x304fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, |
| 2656 | 0xf3cf3cf3, 0x0008cf3c, 0xcdcdcdcd, 0xffffffff, 0x30cfffff, 0x0c30c30c, | 2608 | 0xf3cf3cf3, 0x0008cf3c, 0xcdcdcdcd, 0xfffffffa, 0x302fffff, 0x0c30c30c, |
| 2657 | 0xc30c30c3, 0xcf3cf3cc, 0xf3cf3cf3, 0x0010cf3c, 0xcdcdcdcd, 0xffffffff, | 2609 | 0xc30c30c3, 0xcf3cf300, 0xf3cf3cf3, 0x0010cf3c, 0xcdcdcdcd, 0xffffff97, |
| 2658 | 0x30cfffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf3cc, 0xf3cf3cf3, 0x0020cf3c, | 2610 | 0x040fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cc000, 0xf3cf3cf3, 0x0020cf3c, |
| 2659 | 0xcdcdcdcd, 0xffffffff, 0x30cfffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf3cc, | 2611 | 0xcdcdcdcd, 0xfffffff5, 0x300fffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf300, |
| 2660 | 0xf3cf3cf3, 0x0040cf3c, 0xcdcdcdcd, 0xffffffff, 0x30cfffff, 0x0c30c30c, | 2612 | 0xf3cf3cf3, 0x0040cf3c, 0xcdcdcdcd, 0xffffffff, 0x30cfffff, 0x0c30c30c, |
| 2661 | 0xc30c30c3, 0xcf3cf3cc, 0xf3cf3cf3, 0x0000cf3c, 0xcdcdcdcd, 0xffffffff, | 2613 | 0xc30c30c3, 0xcf3cf3cc, 0xf3cf3cf3, 0x0000cf3c, 0xcdcdcdcd, 0xffffffff, |
| 2662 | 0x30cfffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf3cc, 0xf3cf3cf3, 0x0001cf3c, | 2614 | 0x30cfffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf3cc, 0xf3cf3cf3, 0x0001cf3c, |
| @@ -2678,16 +2630,27 @@ static const u32 init_data_e1[] = { | |||
| 2678 | 0x30cfffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf3cc, 0xf3cf3cf3, 0x0010cf3c, | 2630 | 0x30cfffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf3cc, 0xf3cf3cf3, 0x0010cf3c, |
| 2679 | 0xcdcdcdcd, 0xffffffff, 0x30cfffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf3cc, | 2631 | 0xcdcdcdcd, 0xffffffff, 0x30cfffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf3cc, |
| 2680 | 0xf3cf3cf3, 0x0020cf3c, 0xcdcdcdcd, 0xffffffff, 0x30cfffff, 0x0c30c30c, | 2632 | 0xf3cf3cf3, 0x0020cf3c, 0xcdcdcdcd, 0xffffffff, 0x30cfffff, 0x0c30c30c, |
| 2681 | 0xc30c30c3, 0xcf3cf3cc, 0xf3cf3cf3, 0x0040cf3c, 0xcdcdcdcd, 0x00100000, | 2633 | 0xc30c30c3, 0xcf3cf3cc, 0xf3cf3cf3, 0x0040cf3c, 0xcdcdcdcd, 0xffffffff, |
| 2682 | 0x00070100, 0x00028170, 0x000b8198, 0x00020250, 0x00010270, 0x000f0280, | 2634 | 0x30cfffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf3cc, 0xf3cf3cf3, 0x0000cf3c, |
| 2683 | 0x00010370, 0x00080000, 0x00080080, 0x00028100, 0x000b8128, 0x000201e0, | 2635 | 0xcdcdcdcd, 0xffffffff, 0x30cfffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf3cc, |
| 2684 | 0x00010200, 0x00070210, 0x00020280, 0x000f0000, 0x000800f0, 0x00028170, | 2636 | 0xf3cf3cf3, 0x0001cf3c, 0xcdcdcdcd, 0xffffffff, 0x30cfffff, 0x0c30c30c, |
| 2685 | 0x000b8198, 0x00020250, 0x00010270, 0x000b8280, 0x00080338, 0x00100000, | 2637 | 0xc30c30c3, 0xcf3cf3cc, 0xf3cf3cf3, 0x0002cf3c, 0xcdcdcdcd, 0xffffffff, |
| 2686 | 0x00080100, 0x00028180, 0x000b81a8, 0x00020260, 0x00018280, 0x000e8298, | 2638 | 0x30cfffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf3cc, 0xf3cf3cf3, 0x0004cf3c, |
| 2687 | 0x00080380, 0x00028000, 0x000b8028, 0x000200e0, 0x00010100, 0x00008110, | 2639 | 0xcdcdcdcd, 0xffffffff, 0x30cfffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf3cc, |
| 2688 | 0x00000118, 0xcccccccc, 0xcccccccc, 0xcccccccc, 0xcccccccc, 0x00002000, | 2640 | 0xf3cf3cf3, 0x0008cf3c, 0xcdcdcdcd, 0xffffffff, 0x30cfffff, 0x0c30c30c, |
| 2689 | 0xcccccccc, 0xcccccccc, 0xcccccccc, 0xcccccccc, 0x00002000, 0xcccccccc, | 2641 | 0xc30c30c3, 0xcf3cf3cc, 0xf3cf3cf3, 0x0010cf3c, 0xcdcdcdcd, 0xffffffff, |
| 2690 | 0xcccccccc, 0xcccccccc, 0xcccccccc, 0x00002000 | 2642 | 0x30cfffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf3cc, 0xf3cf3cf3, 0x0020cf3c, |
| 2643 | 0xcdcdcdcd, 0xffffffff, 0x30cfffff, 0x0c30c30c, 0xc30c30c3, 0xcf3cf3cc, | ||
| 2644 | 0xf3cf3cf3, 0x0040cf3c, 0xcdcdcdcd, 0x00100000, 0x00070100, 0x00028170, | ||
| 2645 | 0x000b8198, 0x00020250, 0x00010270, 0x000f0280, 0x00010370, 0x00080000, | ||
| 2646 | 0x00080080, 0x00028100, 0x000b8128, 0x000201e0, 0x00010200, 0x00070210, | ||
| 2647 | 0x00020280, 0x000f0000, 0x000800f0, 0x00028170, 0x000b8198, 0x00020250, | ||
| 2648 | 0x00010270, 0x000b8280, 0x00080338, 0x00100000, 0x00080100, 0x00028180, | ||
| 2649 | 0x000b81a8, 0x00020260, 0x00018280, 0x000e8298, 0x00080380, 0x00028000, | ||
| 2650 | 0x000b8028, 0x000200e0, 0x00010100, 0x00008110, 0x00000118, 0xcccccccc, | ||
| 2651 | 0xcccccccc, 0xcccccccc, 0xcccccccc, 0x00002000, 0xcccccccc, 0xcccccccc, | ||
| 2652 | 0xcccccccc, 0xcccccccc, 0x00002000, 0xcccccccc, 0xcccccccc, 0xcccccccc, | ||
| 2653 | 0xcccccccc, 0x00002000 | ||
| 2691 | }; | 2654 | }; |
| 2692 | 2655 | ||
| 2693 | static const u32 init_data_e1h[] = { | 2656 | static const u32 init_data_e1h[] = { |
diff --git a/drivers/net/bnx2x_link.c b/drivers/net/bnx2x_link.c index ff2743db10d9..4ce7fe9c5251 100644 --- a/drivers/net/bnx2x_link.c +++ b/drivers/net/bnx2x_link.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | #include <linux/delay.h> | 21 | #include <linux/delay.h> |
| 22 | #include <linux/ethtool.h> | 22 | #include <linux/ethtool.h> |
| 23 | #include <linux/mutex.h> | 23 | #include <linux/mutex.h> |
| 24 | #include <linux/version.h> | ||
| 25 | 24 | ||
| 26 | #include "bnx2x_reg.h" | 25 | #include "bnx2x_reg.h" |
| 27 | #include "bnx2x_fw_defs.h" | 26 | #include "bnx2x_fw_defs.h" |
| @@ -31,17 +30,16 @@ | |||
| 31 | 30 | ||
| 32 | /********************************************************/ | 31 | /********************************************************/ |
| 33 | #define SUPPORT_CL73 0 /* Currently no */ | 32 | #define SUPPORT_CL73 0 /* Currently no */ |
| 34 | #define ETH_HLEN 14 | 33 | #define ETH_HLEN 14 |
| 35 | #define ETH_OVREHEAD (ETH_HLEN + 8)/* 8 for CRC + VLAN*/ | 34 | #define ETH_OVREHEAD (ETH_HLEN + 8)/* 8 for CRC + VLAN*/ |
| 36 | #define ETH_MIN_PACKET_SIZE 60 | 35 | #define ETH_MIN_PACKET_SIZE 60 |
| 37 | #define ETH_MAX_PACKET_SIZE 1500 | 36 | #define ETH_MAX_PACKET_SIZE 1500 |
| 38 | #define ETH_MAX_JUMBO_PACKET_SIZE 9600 | 37 | #define ETH_MAX_JUMBO_PACKET_SIZE 9600 |
| 39 | #define MDIO_ACCESS_TIMEOUT 1000 | 38 | #define MDIO_ACCESS_TIMEOUT 1000 |
| 40 | #define BMAC_CONTROL_RX_ENABLE 2 | 39 | #define BMAC_CONTROL_RX_ENABLE 2 |
| 41 | #define MAX_MTU_SIZE 5000 | ||
| 42 | 40 | ||
| 43 | /***********************************************************/ | 41 | /***********************************************************/ |
| 44 | /* Shortcut definitions */ | 42 | /* Shortcut definitions */ |
| 45 | /***********************************************************/ | 43 | /***********************************************************/ |
| 46 | 44 | ||
| 47 | #define NIG_STATUS_XGXS0_LINK10G \ | 45 | #define NIG_STATUS_XGXS0_LINK10G \ |
| @@ -80,12 +78,12 @@ | |||
| 80 | 78 | ||
| 81 | #define AUTONEG_CL37 SHARED_HW_CFG_AN_ENABLE_CL37 | 79 | #define AUTONEG_CL37 SHARED_HW_CFG_AN_ENABLE_CL37 |
| 82 | #define AUTONEG_CL73 SHARED_HW_CFG_AN_ENABLE_CL73 | 80 | #define AUTONEG_CL73 SHARED_HW_CFG_AN_ENABLE_CL73 |
| 83 | #define AUTONEG_BAM SHARED_HW_CFG_AN_ENABLE_BAM | 81 | #define AUTONEG_BAM SHARED_HW_CFG_AN_ENABLE_BAM |
| 84 | #define AUTONEG_PARALLEL \ | 82 | #define AUTONEG_PARALLEL \ |
| 85 | SHARED_HW_CFG_AN_ENABLE_PARALLEL_DETECTION | 83 | SHARED_HW_CFG_AN_ENABLE_PARALLEL_DETECTION |
| 86 | #define AUTONEG_SGMII_FIBER_AUTODET \ | 84 | #define AUTONEG_SGMII_FIBER_AUTODET \ |
| 87 | SHARED_HW_CFG_AN_EN_SGMII_FIBER_AUTO_DETECT | 85 | SHARED_HW_CFG_AN_EN_SGMII_FIBER_AUTO_DETECT |
| 88 | #define AUTONEG_REMOTE_PHY SHARED_HW_CFG_AN_ENABLE_REMOTE_PHY | 86 | #define AUTONEG_REMOTE_PHY SHARED_HW_CFG_AN_ENABLE_REMOTE_PHY |
| 89 | 87 | ||
| 90 | #define GP_STATUS_PAUSE_RSOLUTION_TXSIDE \ | 88 | #define GP_STATUS_PAUSE_RSOLUTION_TXSIDE \ |
| 91 | MDIO_GP_STATUS_TOP_AN_STATUS1_PAUSE_RSOLUTION_TXSIDE | 89 | MDIO_GP_STATUS_TOP_AN_STATUS1_PAUSE_RSOLUTION_TXSIDE |
| @@ -202,11 +200,10 @@ static void bnx2x_emac_init(struct link_params *params, | |||
| 202 | /* init emac - use read-modify-write */ | 200 | /* init emac - use read-modify-write */ |
| 203 | /* self clear reset */ | 201 | /* self clear reset */ |
| 204 | val = REG_RD(bp, emac_base + EMAC_REG_EMAC_MODE); | 202 | val = REG_RD(bp, emac_base + EMAC_REG_EMAC_MODE); |
| 205 | EMAC_WR(EMAC_REG_EMAC_MODE, (val | EMAC_MODE_RESET)); | 203 | EMAC_WR(bp, EMAC_REG_EMAC_MODE, (val | EMAC_MODE_RESET)); |
| 206 | 204 | ||
| 207 | timeout = 200; | 205 | timeout = 200; |
| 208 | do | 206 | do { |
| 209 | { | ||
| 210 | val = REG_RD(bp, emac_base + EMAC_REG_EMAC_MODE); | 207 | val = REG_RD(bp, emac_base + EMAC_REG_EMAC_MODE); |
| 211 | DP(NETIF_MSG_LINK, "EMAC reset reg is %u\n", val); | 208 | DP(NETIF_MSG_LINK, "EMAC reset reg is %u\n", val); |
| 212 | if (!timeout) { | 209 | if (!timeout) { |
| @@ -214,18 +211,18 @@ static void bnx2x_emac_init(struct link_params *params, | |||
| 214 | return; | 211 | return; |
| 215 | } | 212 | } |
| 216 | timeout--; | 213 | timeout--; |
| 217 | }while (val & EMAC_MODE_RESET); | 214 | } while (val & EMAC_MODE_RESET); |
| 218 | 215 | ||
| 219 | /* Set mac address */ | 216 | /* Set mac address */ |
| 220 | val = ((params->mac_addr[0] << 8) | | 217 | val = ((params->mac_addr[0] << 8) | |
| 221 | params->mac_addr[1]); | 218 | params->mac_addr[1]); |
| 222 | EMAC_WR(EMAC_REG_EMAC_MAC_MATCH, val); | 219 | EMAC_WR(bp, EMAC_REG_EMAC_MAC_MATCH, val); |
| 223 | 220 | ||
| 224 | val = ((params->mac_addr[2] << 24) | | 221 | val = ((params->mac_addr[2] << 24) | |
| 225 | (params->mac_addr[3] << 16) | | 222 | (params->mac_addr[3] << 16) | |
| 226 | (params->mac_addr[4] << 8) | | 223 | (params->mac_addr[4] << 8) | |
| 227 | params->mac_addr[5]); | 224 | params->mac_addr[5]); |
| 228 | EMAC_WR(EMAC_REG_EMAC_MAC_MATCH + 4, val); | 225 | EMAC_WR(bp, EMAC_REG_EMAC_MAC_MATCH + 4, val); |
| 229 | } | 226 | } |
| 230 | 227 | ||
| 231 | static u8 bnx2x_emac_enable(struct link_params *params, | 228 | static u8 bnx2x_emac_enable(struct link_params *params, |
| @@ -286,7 +283,7 @@ static u8 bnx2x_emac_enable(struct link_params *params, | |||
| 286 | if (CHIP_REV_IS_SLOW(bp)) { | 283 | if (CHIP_REV_IS_SLOW(bp)) { |
| 287 | /* config GMII mode */ | 284 | /* config GMII mode */ |
| 288 | val = REG_RD(bp, emac_base + EMAC_REG_EMAC_MODE); | 285 | val = REG_RD(bp, emac_base + EMAC_REG_EMAC_MODE); |
| 289 | EMAC_WR(EMAC_REG_EMAC_MODE, | 286 | EMAC_WR(bp, EMAC_REG_EMAC_MODE, |
| 290 | (val | EMAC_MODE_PORT_GMII)); | 287 | (val | EMAC_MODE_PORT_GMII)); |
| 291 | } else { /* ASIC */ | 288 | } else { /* ASIC */ |
| 292 | /* pause enable/disable */ | 289 | /* pause enable/disable */ |
| @@ -298,17 +295,19 @@ static u8 bnx2x_emac_enable(struct link_params *params, | |||
| 298 | EMAC_RX_MODE_FLOW_EN); | 295 | EMAC_RX_MODE_FLOW_EN); |
| 299 | 296 | ||
| 300 | bnx2x_bits_dis(bp, emac_base + EMAC_REG_EMAC_TX_MODE, | 297 | bnx2x_bits_dis(bp, emac_base + EMAC_REG_EMAC_TX_MODE, |
| 301 | EMAC_TX_MODE_EXT_PAUSE_EN); | 298 | (EMAC_TX_MODE_EXT_PAUSE_EN | |
| 299 | EMAC_TX_MODE_FLOW_EN)); | ||
| 302 | if (vars->flow_ctrl & FLOW_CTRL_TX) | 300 | if (vars->flow_ctrl & FLOW_CTRL_TX) |
| 303 | bnx2x_bits_en(bp, emac_base + | 301 | bnx2x_bits_en(bp, emac_base + |
| 304 | EMAC_REG_EMAC_TX_MODE, | 302 | EMAC_REG_EMAC_TX_MODE, |
| 305 | EMAC_TX_MODE_EXT_PAUSE_EN); | 303 | (EMAC_TX_MODE_EXT_PAUSE_EN | |
| 304 | EMAC_TX_MODE_FLOW_EN)); | ||
| 306 | } | 305 | } |
| 307 | 306 | ||
| 308 | /* KEEP_VLAN_TAG, promiscuous */ | 307 | /* KEEP_VLAN_TAG, promiscuous */ |
| 309 | val = REG_RD(bp, emac_base + EMAC_REG_EMAC_RX_MODE); | 308 | val = REG_RD(bp, emac_base + EMAC_REG_EMAC_RX_MODE); |
| 310 | val |= EMAC_RX_MODE_KEEP_VLAN_TAG | EMAC_RX_MODE_PROMISCUOUS; | 309 | val |= EMAC_RX_MODE_KEEP_VLAN_TAG | EMAC_RX_MODE_PROMISCUOUS; |
| 311 | EMAC_WR(EMAC_REG_EMAC_RX_MODE, val); | 310 | EMAC_WR(bp, EMAC_REG_EMAC_RX_MODE, val); |
| 312 | 311 | ||
| 313 | /* Set Loopback */ | 312 | /* Set Loopback */ |
| 314 | val = REG_RD(bp, emac_base + EMAC_REG_EMAC_MODE); | 313 | val = REG_RD(bp, emac_base + EMAC_REG_EMAC_MODE); |
| @@ -316,10 +315,10 @@ static u8 bnx2x_emac_enable(struct link_params *params, | |||
| 316 | val |= 0x810; | 315 | val |= 0x810; |
| 317 | else | 316 | else |
| 318 | val &= ~0x810; | 317 | val &= ~0x810; |
| 319 | EMAC_WR(EMAC_REG_EMAC_MODE, val); | 318 | EMAC_WR(bp, EMAC_REG_EMAC_MODE, val); |
| 320 | 319 | ||
| 321 | /* enable emac for jumbo packets */ | 320 | /* enable emac for jumbo packets */ |
| 322 | EMAC_WR(EMAC_REG_EMAC_RX_MTU_SIZE, | 321 | EMAC_WR(bp, EMAC_REG_EMAC_RX_MTU_SIZE, |
| 323 | (EMAC_RX_MTU_SIZE_JUMBO_ENA | | 322 | (EMAC_RX_MTU_SIZE_JUMBO_ENA | |
| 324 | (ETH_MAX_JUMBO_PACKET_SIZE + ETH_OVREHEAD))); | 323 | (ETH_MAX_JUMBO_PACKET_SIZE + ETH_OVREHEAD))); |
| 325 | 324 | ||
| @@ -591,9 +590,9 @@ void bnx2x_link_status_update(struct link_params *params, | |||
| 591 | vars->flow_ctrl &= ~FLOW_CTRL_RX; | 590 | vars->flow_ctrl &= ~FLOW_CTRL_RX; |
| 592 | 591 | ||
| 593 | if (vars->phy_flags & PHY_XGXS_FLAG) { | 592 | if (vars->phy_flags & PHY_XGXS_FLAG) { |
| 594 | if (params->req_line_speed && | 593 | if (vars->line_speed && |
| 595 | ((params->req_line_speed == SPEED_10) || | 594 | ((vars->line_speed == SPEED_10) || |
| 596 | (params->req_line_speed == SPEED_100))) { | 595 | (vars->line_speed == SPEED_100))) { |
| 597 | vars->phy_flags |= PHY_SGMII_FLAG; | 596 | vars->phy_flags |= PHY_SGMII_FLAG; |
| 598 | } else { | 597 | } else { |
| 599 | vars->phy_flags &= ~PHY_SGMII_FLAG; | 598 | vars->phy_flags &= ~PHY_SGMII_FLAG; |
| @@ -645,7 +644,7 @@ static void bnx2x_bmac_rx_disable(struct bnx2x *bp, u8 port) | |||
| 645 | u32 bmac_addr = port ? NIG_REG_INGRESS_BMAC1_MEM : | 644 | u32 bmac_addr = port ? NIG_REG_INGRESS_BMAC1_MEM : |
| 646 | NIG_REG_INGRESS_BMAC0_MEM; | 645 | NIG_REG_INGRESS_BMAC0_MEM; |
| 647 | u32 wb_data[2]; | 646 | u32 wb_data[2]; |
| 648 | u32 nig_bmac_enable = REG_RD(bp, NIG_REG_BMAC0_REGS_OUT_EN + port*4); | 647 | u32 nig_bmac_enable = REG_RD(bp, NIG_REG_BMAC0_REGS_OUT_EN + port*4); |
| 649 | 648 | ||
| 650 | /* Only if the bmac is out of reset */ | 649 | /* Only if the bmac is out of reset */ |
| 651 | if (REG_RD(bp, MISC_REG_RESET_REG_2) & | 650 | if (REG_RD(bp, MISC_REG_RESET_REG_2) & |
| @@ -670,7 +669,6 @@ static u8 bnx2x_pbf_update(struct link_params *params, u32 flow_ctrl, | |||
| 670 | u8 port = params->port; | 669 | u8 port = params->port; |
| 671 | u32 init_crd, crd; | 670 | u32 init_crd, crd; |
| 672 | u32 count = 1000; | 671 | u32 count = 1000; |
| 673 | u32 pause = 0; | ||
| 674 | 672 | ||
| 675 | /* disable port */ | 673 | /* disable port */ |
| 676 | REG_WR(bp, PBF_REG_DISABLE_NEW_TASK_PROC_P0 + port*4, 0x1); | 674 | REG_WR(bp, PBF_REG_DISABLE_NEW_TASK_PROC_P0 + port*4, 0x1); |
| @@ -693,33 +691,25 @@ static u8 bnx2x_pbf_update(struct link_params *params, u32 flow_ctrl, | |||
| 693 | return -EINVAL; | 691 | return -EINVAL; |
| 694 | } | 692 | } |
| 695 | 693 | ||
| 696 | if (flow_ctrl & FLOW_CTRL_RX) | 694 | if (flow_ctrl & FLOW_CTRL_RX || |
| 697 | pause = 1; | 695 | line_speed == SPEED_10 || |
| 698 | REG_WR(bp, PBF_REG_P0_PAUSE_ENABLE + port*4, pause); | 696 | line_speed == SPEED_100 || |
| 699 | if (pause) { | 697 | line_speed == SPEED_1000 || |
| 698 | line_speed == SPEED_2500) { | ||
| 699 | REG_WR(bp, PBF_REG_P0_PAUSE_ENABLE + port*4, 1); | ||
| 700 | /* update threshold */ | 700 | /* update threshold */ |
| 701 | REG_WR(bp, PBF_REG_P0_ARB_THRSH + port*4, 0); | 701 | REG_WR(bp, PBF_REG_P0_ARB_THRSH + port*4, 0); |
| 702 | /* update init credit */ | 702 | /* update init credit */ |
| 703 | init_crd = 778; /* (800-18-4) */ | 703 | init_crd = 778; /* (800-18-4) */ |
| 704 | 704 | ||
| 705 | } else { | 705 | } else { |
| 706 | u32 thresh = (ETH_MAX_JUMBO_PACKET_SIZE + | 706 | u32 thresh = (ETH_MAX_JUMBO_PACKET_SIZE + |
| 707 | ETH_OVREHEAD)/16; | 707 | ETH_OVREHEAD)/16; |
| 708 | 708 | REG_WR(bp, PBF_REG_P0_PAUSE_ENABLE + port*4, 0); | |
| 709 | /* update threshold */ | 709 | /* update threshold */ |
| 710 | REG_WR(bp, PBF_REG_P0_ARB_THRSH + port*4, thresh); | 710 | REG_WR(bp, PBF_REG_P0_ARB_THRSH + port*4, thresh); |
| 711 | /* update init credit */ | 711 | /* update init credit */ |
| 712 | switch (line_speed) { | 712 | switch (line_speed) { |
| 713 | case SPEED_10: | ||
| 714 | case SPEED_100: | ||
| 715 | case SPEED_1000: | ||
| 716 | init_crd = thresh + 55 - 22; | ||
| 717 | break; | ||
| 718 | |||
| 719 | case SPEED_2500: | ||
| 720 | init_crd = thresh + 138 - 22; | ||
| 721 | break; | ||
| 722 | |||
| 723 | case SPEED_10000: | 713 | case SPEED_10000: |
| 724 | init_crd = thresh + 553 - 22; | 714 | init_crd = thresh + 553 - 22; |
| 725 | break; | 715 | break; |
| @@ -764,10 +754,10 @@ static u32 bnx2x_get_emac_base(u32 ext_phy_type, u8 port) | |||
| 764 | emac_base = GRCBASE_EMAC0; | 754 | emac_base = GRCBASE_EMAC0; |
| 765 | break; | 755 | break; |
| 766 | case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073: | 756 | case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073: |
| 767 | emac_base = (port) ? GRCBASE_EMAC0: GRCBASE_EMAC1; | 757 | emac_base = (port) ? GRCBASE_EMAC0 : GRCBASE_EMAC1; |
| 768 | break; | 758 | break; |
| 769 | default: | 759 | default: |
| 770 | emac_base = (port) ? GRCBASE_EMAC1: GRCBASE_EMAC0; | 760 | emac_base = (port) ? GRCBASE_EMAC1 : GRCBASE_EMAC0; |
| 771 | break; | 761 | break; |
| 772 | } | 762 | } |
| 773 | return emac_base; | 763 | return emac_base; |
| @@ -1044,7 +1034,7 @@ static void bnx2x_set_swap_lanes(struct link_params *params) | |||
| 1044 | } | 1034 | } |
| 1045 | 1035 | ||
| 1046 | static void bnx2x_set_parallel_detection(struct link_params *params, | 1036 | static void bnx2x_set_parallel_detection(struct link_params *params, |
| 1047 | u8 phy_flags) | 1037 | u8 phy_flags) |
| 1048 | { | 1038 | { |
| 1049 | struct bnx2x *bp = params->bp; | 1039 | struct bnx2x *bp = params->bp; |
| 1050 | u16 control2; | 1040 | u16 control2; |
| @@ -1114,7 +1104,7 @@ static void bnx2x_set_autoneg(struct link_params *params, | |||
| 1114 | MDIO_COMBO_IEEE0_MII_CONTROL, ®_val); | 1104 | MDIO_COMBO_IEEE0_MII_CONTROL, ®_val); |
| 1115 | 1105 | ||
| 1116 | /* CL37 Autoneg Enabled */ | 1106 | /* CL37 Autoneg Enabled */ |
| 1117 | if (params->req_line_speed == SPEED_AUTO_NEG) | 1107 | if (vars->line_speed == SPEED_AUTO_NEG) |
| 1118 | reg_val |= MDIO_COMBO_IEEO_MII_CONTROL_AN_EN; | 1108 | reg_val |= MDIO_COMBO_IEEO_MII_CONTROL_AN_EN; |
| 1119 | else /* CL37 Autoneg Disabled */ | 1109 | else /* CL37 Autoneg Disabled */ |
| 1120 | reg_val &= ~(MDIO_COMBO_IEEO_MII_CONTROL_AN_EN | | 1110 | reg_val &= ~(MDIO_COMBO_IEEO_MII_CONTROL_AN_EN | |
| @@ -1132,7 +1122,7 @@ static void bnx2x_set_autoneg(struct link_params *params, | |||
| 1132 | MDIO_REG_BANK_SERDES_DIGITAL, | 1122 | MDIO_REG_BANK_SERDES_DIGITAL, |
| 1133 | MDIO_SERDES_DIGITAL_A_1000X_CONTROL1, ®_val); | 1123 | MDIO_SERDES_DIGITAL_A_1000X_CONTROL1, ®_val); |
| 1134 | reg_val &= ~MDIO_SERDES_DIGITAL_A_1000X_CONTROL1_SIGNAL_DETECT_EN; | 1124 | reg_val &= ~MDIO_SERDES_DIGITAL_A_1000X_CONTROL1_SIGNAL_DETECT_EN; |
| 1135 | if (params->req_line_speed == SPEED_AUTO_NEG) | 1125 | if (vars->line_speed == SPEED_AUTO_NEG) |
| 1136 | reg_val |= MDIO_SERDES_DIGITAL_A_1000X_CONTROL1_AUTODET; | 1126 | reg_val |= MDIO_SERDES_DIGITAL_A_1000X_CONTROL1_AUTODET; |
| 1137 | else | 1127 | else |
| 1138 | reg_val &= ~MDIO_SERDES_DIGITAL_A_1000X_CONTROL1_AUTODET; | 1128 | reg_val &= ~MDIO_SERDES_DIGITAL_A_1000X_CONTROL1_AUTODET; |
| @@ -1148,7 +1138,7 @@ static void bnx2x_set_autoneg(struct link_params *params, | |||
| 1148 | MDIO_REG_BANK_BAM_NEXT_PAGE, | 1138 | MDIO_REG_BANK_BAM_NEXT_PAGE, |
| 1149 | MDIO_BAM_NEXT_PAGE_MP5_NEXT_PAGE_CTRL, | 1139 | MDIO_BAM_NEXT_PAGE_MP5_NEXT_PAGE_CTRL, |
| 1150 | ®_val); | 1140 | ®_val); |
| 1151 | if (params->req_line_speed == SPEED_AUTO_NEG) { | 1141 | if (vars->line_speed == SPEED_AUTO_NEG) { |
| 1152 | /* Enable BAM aneg Mode and TetonII aneg Mode */ | 1142 | /* Enable BAM aneg Mode and TetonII aneg Mode */ |
| 1153 | reg_val |= (MDIO_BAM_NEXT_PAGE_MP5_NEXT_PAGE_CTRL_BAM_MODE | | 1143 | reg_val |= (MDIO_BAM_NEXT_PAGE_MP5_NEXT_PAGE_CTRL_BAM_MODE | |
| 1154 | MDIO_BAM_NEXT_PAGE_MP5_NEXT_PAGE_CTRL_TETON_AN); | 1144 | MDIO_BAM_NEXT_PAGE_MP5_NEXT_PAGE_CTRL_TETON_AN); |
| @@ -1164,7 +1154,7 @@ static void bnx2x_set_autoneg(struct link_params *params, | |||
| 1164 | reg_val); | 1154 | reg_val); |
| 1165 | 1155 | ||
| 1166 | /* Enable Clause 73 Aneg */ | 1156 | /* Enable Clause 73 Aneg */ |
| 1167 | if ((params->req_line_speed == SPEED_AUTO_NEG) && | 1157 | if ((vars->line_speed == SPEED_AUTO_NEG) && |
| 1168 | (SUPPORT_CL73)) { | 1158 | (SUPPORT_CL73)) { |
| 1169 | /* Enable BAM Station Manager */ | 1159 | /* Enable BAM Station Manager */ |
| 1170 | 1160 | ||
| @@ -1226,7 +1216,8 @@ static void bnx2x_set_autoneg(struct link_params *params, | |||
| 1226 | } | 1216 | } |
| 1227 | 1217 | ||
| 1228 | /* program SerDes, forced speed */ | 1218 | /* program SerDes, forced speed */ |
| 1229 | static void bnx2x_program_serdes(struct link_params *params) | 1219 | static void bnx2x_program_serdes(struct link_params *params, |
| 1220 | struct link_vars *vars) | ||
| 1230 | { | 1221 | { |
| 1231 | struct bnx2x *bp = params->bp; | 1222 | struct bnx2x *bp = params->bp; |
| 1232 | u16 reg_val; | 1223 | u16 reg_val; |
| @@ -1248,28 +1239,35 @@ static void bnx2x_program_serdes(struct link_params *params) | |||
| 1248 | 1239 | ||
| 1249 | /* program speed | 1240 | /* program speed |
| 1250 | - needed only if the speed is greater than 1G (2.5G or 10G) */ | 1241 | - needed only if the speed is greater than 1G (2.5G or 10G) */ |
| 1251 | if (!((params->req_line_speed == SPEED_1000) || | 1242 | CL45_RD_OVER_CL22(bp, params->port, |
| 1252 | (params->req_line_speed == SPEED_100) || | ||
| 1253 | (params->req_line_speed == SPEED_10))) { | ||
| 1254 | CL45_RD_OVER_CL22(bp, params->port, | ||
| 1255 | params->phy_addr, | 1243 | params->phy_addr, |
| 1256 | MDIO_REG_BANK_SERDES_DIGITAL, | 1244 | MDIO_REG_BANK_SERDES_DIGITAL, |
| 1257 | MDIO_SERDES_DIGITAL_MISC1, ®_val); | 1245 | MDIO_SERDES_DIGITAL_MISC1, ®_val); |
| 1258 | /* clearing the speed value before setting the right speed */ | 1246 | /* clearing the speed value before setting the right speed */ |
| 1259 | reg_val &= ~MDIO_SERDES_DIGITAL_MISC1_FORCE_SPEED_MASK; | 1247 | DP(NETIF_MSG_LINK, "MDIO_REG_BANK_SERDES_DIGITAL = 0x%x\n", reg_val); |
| 1248 | |||
| 1249 | reg_val &= ~(MDIO_SERDES_DIGITAL_MISC1_FORCE_SPEED_MASK | | ||
| 1250 | MDIO_SERDES_DIGITAL_MISC1_FORCE_SPEED_SEL); | ||
| 1251 | |||
| 1252 | if (!((vars->line_speed == SPEED_1000) || | ||
| 1253 | (vars->line_speed == SPEED_100) || | ||
| 1254 | (vars->line_speed == SPEED_10))) { | ||
| 1255 | |||
| 1260 | reg_val |= (MDIO_SERDES_DIGITAL_MISC1_REFCLK_SEL_156_25M | | 1256 | reg_val |= (MDIO_SERDES_DIGITAL_MISC1_REFCLK_SEL_156_25M | |
| 1261 | MDIO_SERDES_DIGITAL_MISC1_FORCE_SPEED_SEL); | 1257 | MDIO_SERDES_DIGITAL_MISC1_FORCE_SPEED_SEL); |
| 1262 | if (params->req_line_speed == SPEED_10000) | 1258 | if (vars->line_speed == SPEED_10000) |
| 1263 | reg_val |= | 1259 | reg_val |= |
| 1264 | MDIO_SERDES_DIGITAL_MISC1_FORCE_SPEED_10G_CX4; | 1260 | MDIO_SERDES_DIGITAL_MISC1_FORCE_SPEED_10G_CX4; |
| 1265 | if (params->req_line_speed == SPEED_13000) | 1261 | if (vars->line_speed == SPEED_13000) |
| 1266 | reg_val |= | 1262 | reg_val |= |
| 1267 | MDIO_SERDES_DIGITAL_MISC1_FORCE_SPEED_13G; | 1263 | MDIO_SERDES_DIGITAL_MISC1_FORCE_SPEED_13G; |
| 1268 | CL45_WR_OVER_CL22(bp, params->port, | 1264 | } |
| 1265 | |||
| 1266 | CL45_WR_OVER_CL22(bp, params->port, | ||
| 1269 | params->phy_addr, | 1267 | params->phy_addr, |
| 1270 | MDIO_REG_BANK_SERDES_DIGITAL, | 1268 | MDIO_REG_BANK_SERDES_DIGITAL, |
| 1271 | MDIO_SERDES_DIGITAL_MISC1, reg_val); | 1269 | MDIO_SERDES_DIGITAL_MISC1, reg_val); |
| 1272 | } | 1270 | |
| 1273 | } | 1271 | } |
| 1274 | 1272 | ||
| 1275 | static void bnx2x_set_brcm_cl37_advertisment(struct link_params *params) | 1273 | static void bnx2x_set_brcm_cl37_advertisment(struct link_params *params) |
| @@ -1295,48 +1293,49 @@ static void bnx2x_set_brcm_cl37_advertisment(struct link_params *params) | |||
| 1295 | MDIO_OVER_1G_UP3, 0); | 1293 | MDIO_OVER_1G_UP3, 0); |
| 1296 | } | 1294 | } |
| 1297 | 1295 | ||
| 1298 | static void bnx2x_set_ieee_aneg_advertisment(struct link_params *params, | 1296 | static void bnx2x_calc_ieee_aneg_adv(struct link_params *params, u32 *ieee_fc) |
| 1299 | u32 *ieee_fc) | ||
| 1300 | { | 1297 | { |
| 1301 | struct bnx2x *bp = params->bp; | 1298 | *ieee_fc = MDIO_COMBO_IEEE0_AUTO_NEG_ADV_FULL_DUPLEX; |
| 1302 | /* for AN, we are always publishing full duplex */ | ||
| 1303 | u16 an_adv = MDIO_COMBO_IEEE0_AUTO_NEG_ADV_FULL_DUPLEX; | ||
| 1304 | |||
| 1305 | /* resolve pause mode and advertisement | 1299 | /* resolve pause mode and advertisement |
| 1306 | * Please refer to Table 28B-3 of the 802.3ab-1999 spec */ | 1300 | * Please refer to Table 28B-3 of the 802.3ab-1999 spec */ |
| 1307 | 1301 | ||
| 1308 | switch (params->req_flow_ctrl) { | 1302 | switch (params->req_flow_ctrl) { |
| 1309 | case FLOW_CTRL_AUTO: | 1303 | case FLOW_CTRL_AUTO: |
| 1310 | if (params->mtu <= MAX_MTU_SIZE) { | 1304 | if (params->req_fc_auto_adv == FLOW_CTRL_BOTH) { |
| 1311 | an_adv |= | 1305 | *ieee_fc |= |
| 1312 | MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_BOTH; | 1306 | MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_BOTH; |
| 1313 | } else { | 1307 | } else { |
| 1314 | an_adv |= | 1308 | *ieee_fc |= |
| 1315 | MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_ASYMMETRIC; | 1309 | MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_ASYMMETRIC; |
| 1316 | } | 1310 | } |
| 1317 | break; | 1311 | break; |
| 1318 | case FLOW_CTRL_TX: | 1312 | case FLOW_CTRL_TX: |
| 1319 | an_adv |= | 1313 | *ieee_fc |= |
| 1320 | MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_ASYMMETRIC; | 1314 | MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_ASYMMETRIC; |
| 1321 | break; | 1315 | break; |
| 1322 | 1316 | ||
| 1323 | case FLOW_CTRL_RX: | 1317 | case FLOW_CTRL_RX: |
| 1324 | case FLOW_CTRL_BOTH: | 1318 | case FLOW_CTRL_BOTH: |
| 1325 | an_adv |= MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_BOTH; | 1319 | *ieee_fc |= MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_BOTH; |
| 1326 | break; | 1320 | break; |
| 1327 | 1321 | ||
| 1328 | case FLOW_CTRL_NONE: | 1322 | case FLOW_CTRL_NONE: |
| 1329 | default: | 1323 | default: |
| 1330 | an_adv |= MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_NONE; | 1324 | *ieee_fc |= MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_NONE; |
| 1331 | break; | 1325 | break; |
| 1332 | } | 1326 | } |
| 1327 | } | ||
| 1333 | 1328 | ||
| 1334 | *ieee_fc = an_adv; | 1329 | static void bnx2x_set_ieee_aneg_advertisment(struct link_params *params, |
| 1330 | u32 ieee_fc) | ||
| 1331 | { | ||
| 1332 | struct bnx2x *bp = params->bp; | ||
| 1333 | /* for AN, we are always publishing full duplex */ | ||
| 1335 | 1334 | ||
| 1336 | CL45_WR_OVER_CL22(bp, params->port, | 1335 | CL45_WR_OVER_CL22(bp, params->port, |
| 1337 | params->phy_addr, | 1336 | params->phy_addr, |
| 1338 | MDIO_REG_BANK_COMBO_IEEE0, | 1337 | MDIO_REG_BANK_COMBO_IEEE0, |
| 1339 | MDIO_COMBO_IEEE0_AUTO_NEG_ADV, an_adv); | 1338 | MDIO_COMBO_IEEE0_AUTO_NEG_ADV, (u16)ieee_fc); |
| 1340 | } | 1339 | } |
| 1341 | 1340 | ||
| 1342 | static void bnx2x_restart_autoneg(struct link_params *params) | 1341 | static void bnx2x_restart_autoneg(struct link_params *params) |
| @@ -1382,7 +1381,8 @@ static void bnx2x_restart_autoneg(struct link_params *params) | |||
| 1382 | } | 1381 | } |
| 1383 | } | 1382 | } |
| 1384 | 1383 | ||
| 1385 | static void bnx2x_initialize_sgmii_process(struct link_params *params) | 1384 | static void bnx2x_initialize_sgmii_process(struct link_params *params, |
| 1385 | struct link_vars *vars) | ||
| 1386 | { | 1386 | { |
| 1387 | struct bnx2x *bp = params->bp; | 1387 | struct bnx2x *bp = params->bp; |
| 1388 | u16 control1; | 1388 | u16 control1; |
| @@ -1406,7 +1406,7 @@ static void bnx2x_initialize_sgmii_process(struct link_params *params) | |||
| 1406 | control1); | 1406 | control1); |
| 1407 | 1407 | ||
| 1408 | /* if forced speed */ | 1408 | /* if forced speed */ |
| 1409 | if (!(params->req_line_speed == SPEED_AUTO_NEG)) { | 1409 | if (!(vars->line_speed == SPEED_AUTO_NEG)) { |
| 1410 | /* set speed, disable autoneg */ | 1410 | /* set speed, disable autoneg */ |
| 1411 | u16 mii_control; | 1411 | u16 mii_control; |
| 1412 | 1412 | ||
| @@ -1419,7 +1419,7 @@ static void bnx2x_initialize_sgmii_process(struct link_params *params) | |||
| 1419 | MDIO_COMBO_IEEO_MII_CONTROL_MAN_SGMII_SP_MASK| | 1419 | MDIO_COMBO_IEEO_MII_CONTROL_MAN_SGMII_SP_MASK| |
| 1420 | MDIO_COMBO_IEEO_MII_CONTROL_FULL_DUPLEX); | 1420 | MDIO_COMBO_IEEO_MII_CONTROL_FULL_DUPLEX); |
| 1421 | 1421 | ||
| 1422 | switch (params->req_line_speed) { | 1422 | switch (vars->line_speed) { |
| 1423 | case SPEED_100: | 1423 | case SPEED_100: |
| 1424 | mii_control |= | 1424 | mii_control |= |
| 1425 | MDIO_COMBO_IEEO_MII_CONTROL_MAN_SGMII_SP_100; | 1425 | MDIO_COMBO_IEEO_MII_CONTROL_MAN_SGMII_SP_100; |
| @@ -1433,8 +1433,8 @@ static void bnx2x_initialize_sgmii_process(struct link_params *params) | |||
| 1433 | break; | 1433 | break; |
| 1434 | default: | 1434 | default: |
| 1435 | /* invalid speed for SGMII */ | 1435 | /* invalid speed for SGMII */ |
| 1436 | DP(NETIF_MSG_LINK, "Invalid req_line_speed 0x%x\n", | 1436 | DP(NETIF_MSG_LINK, "Invalid line_speed 0x%x\n", |
| 1437 | params->req_line_speed); | 1437 | vars->line_speed); |
| 1438 | break; | 1438 | break; |
| 1439 | } | 1439 | } |
| 1440 | 1440 | ||
| @@ -1460,20 +1460,20 @@ static void bnx2x_initialize_sgmii_process(struct link_params *params) | |||
| 1460 | */ | 1460 | */ |
| 1461 | 1461 | ||
| 1462 | static void bnx2x_pause_resolve(struct link_vars *vars, u32 pause_result) | 1462 | static void bnx2x_pause_resolve(struct link_vars *vars, u32 pause_result) |
| 1463 | { | 1463 | { /* LD LP */ |
| 1464 | switch (pause_result) { /* ASYM P ASYM P */ | 1464 | switch (pause_result) { /* ASYM P ASYM P */ |
| 1465 | case 0xb: /* 1 0 1 1 */ | 1465 | case 0xb: /* 1 0 1 1 */ |
| 1466 | vars->flow_ctrl = FLOW_CTRL_TX; | 1466 | vars->flow_ctrl = FLOW_CTRL_TX; |
| 1467 | break; | 1467 | break; |
| 1468 | 1468 | ||
| 1469 | case 0xe: /* 1 1 1 0 */ | 1469 | case 0xe: /* 1 1 1 0 */ |
| 1470 | vars->flow_ctrl = FLOW_CTRL_RX; | 1470 | vars->flow_ctrl = FLOW_CTRL_RX; |
| 1471 | break; | 1471 | break; |
| 1472 | 1472 | ||
| 1473 | case 0x5: /* 0 1 0 1 */ | 1473 | case 0x5: /* 0 1 0 1 */ |
| 1474 | case 0x7: /* 0 1 1 1 */ | 1474 | case 0x7: /* 0 1 1 1 */ |
| 1475 | case 0xd: /* 1 1 0 1 */ | 1475 | case 0xd: /* 1 1 0 1 */ |
| 1476 | case 0xf: /* 1 1 1 1 */ | 1476 | case 0xf: /* 1 1 1 1 */ |
| 1477 | vars->flow_ctrl = FLOW_CTRL_BOTH; | 1477 | vars->flow_ctrl = FLOW_CTRL_BOTH; |
| 1478 | break; | 1478 | break; |
| 1479 | 1479 | ||
| @@ -1531,6 +1531,28 @@ static u8 bnx2x_ext_phy_resove_fc(struct link_params *params, | |||
| 1531 | DP(NETIF_MSG_LINK, "Ext PHY pause result 0x%x \n", | 1531 | DP(NETIF_MSG_LINK, "Ext PHY pause result 0x%x \n", |
| 1532 | pause_result); | 1532 | pause_result); |
| 1533 | bnx2x_pause_resolve(vars, pause_result); | 1533 | bnx2x_pause_resolve(vars, pause_result); |
| 1534 | if (vars->flow_ctrl == FLOW_CTRL_NONE && | ||
| 1535 | ext_phy_type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073) { | ||
| 1536 | bnx2x_cl45_read(bp, port, | ||
| 1537 | ext_phy_type, | ||
| 1538 | ext_phy_addr, | ||
| 1539 | MDIO_AN_DEVAD, | ||
| 1540 | MDIO_AN_REG_CL37_FC_LD, &ld_pause); | ||
| 1541 | |||
| 1542 | bnx2x_cl45_read(bp, port, | ||
| 1543 | ext_phy_type, | ||
| 1544 | ext_phy_addr, | ||
| 1545 | MDIO_AN_DEVAD, | ||
| 1546 | MDIO_AN_REG_CL37_FC_LP, &lp_pause); | ||
| 1547 | pause_result = (ld_pause & | ||
| 1548 | MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_BOTH) >> 5; | ||
| 1549 | pause_result |= (lp_pause & | ||
| 1550 | MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_BOTH) >> 7; | ||
| 1551 | |||
| 1552 | bnx2x_pause_resolve(vars, pause_result); | ||
| 1553 | DP(NETIF_MSG_LINK, "Ext PHY CL37 pause result 0x%x \n", | ||
| 1554 | pause_result); | ||
| 1555 | } | ||
| 1534 | } | 1556 | } |
| 1535 | return ret; | 1557 | return ret; |
| 1536 | } | 1558 | } |
| @@ -1541,8 +1563,8 @@ static void bnx2x_flow_ctrl_resolve(struct link_params *params, | |||
| 1541 | u32 gp_status) | 1563 | u32 gp_status) |
| 1542 | { | 1564 | { |
| 1543 | struct bnx2x *bp = params->bp; | 1565 | struct bnx2x *bp = params->bp; |
| 1544 | u16 ld_pause; /* local driver */ | 1566 | u16 ld_pause; /* local driver */ |
| 1545 | u16 lp_pause; /* link partner */ | 1567 | u16 lp_pause; /* link partner */ |
| 1546 | u16 pause_result; | 1568 | u16 pause_result; |
| 1547 | 1569 | ||
| 1548 | vars->flow_ctrl = FLOW_CTRL_NONE; | 1570 | vars->flow_ctrl = FLOW_CTRL_NONE; |
| @@ -1573,13 +1595,10 @@ static void bnx2x_flow_ctrl_resolve(struct link_params *params, | |||
| 1573 | (bnx2x_ext_phy_resove_fc(params, vars))) { | 1595 | (bnx2x_ext_phy_resove_fc(params, vars))) { |
| 1574 | return; | 1596 | return; |
| 1575 | } else { | 1597 | } else { |
| 1576 | vars->flow_ctrl = params->req_flow_ctrl; | 1598 | if (params->req_flow_ctrl == FLOW_CTRL_AUTO) |
| 1577 | if (vars->flow_ctrl == FLOW_CTRL_AUTO) { | 1599 | vars->flow_ctrl = params->req_fc_auto_adv; |
| 1578 | if (params->mtu <= MAX_MTU_SIZE) | 1600 | else |
| 1579 | vars->flow_ctrl = FLOW_CTRL_BOTH; | 1601 | vars->flow_ctrl = params->req_flow_ctrl; |
| 1580 | else | ||
| 1581 | vars->flow_ctrl = FLOW_CTRL_TX; | ||
| 1582 | } | ||
| 1583 | } | 1602 | } |
| 1584 | DP(NETIF_MSG_LINK, "flow_ctrl 0x%x\n", vars->flow_ctrl); | 1603 | DP(NETIF_MSG_LINK, "flow_ctrl 0x%x\n", vars->flow_ctrl); |
| 1585 | } | 1604 | } |
| @@ -1590,6 +1609,7 @@ static u8 bnx2x_link_settings_status(struct link_params *params, | |||
| 1590 | u32 gp_status) | 1609 | u32 gp_status) |
| 1591 | { | 1610 | { |
| 1592 | struct bnx2x *bp = params->bp; | 1611 | struct bnx2x *bp = params->bp; |
| 1612 | |||
| 1593 | u8 rc = 0; | 1613 | u8 rc = 0; |
| 1594 | vars->link_status = 0; | 1614 | vars->link_status = 0; |
| 1595 | 1615 | ||
| @@ -1690,7 +1710,11 @@ static u8 bnx2x_link_settings_status(struct link_params *params, | |||
| 1690 | 1710 | ||
| 1691 | vars->link_status |= LINK_STATUS_SERDES_LINK; | 1711 | vars->link_status |= LINK_STATUS_SERDES_LINK; |
| 1692 | 1712 | ||
| 1693 | if (params->req_line_speed == SPEED_AUTO_NEG) { | 1713 | if ((params->req_line_speed == SPEED_AUTO_NEG) && |
| 1714 | ((XGXS_EXT_PHY_TYPE(params->ext_phy_config) == | ||
| 1715 | PORT_HW_CFG_XGXS_EXT_PHY_TYPE_DIRECT) || | ||
| 1716 | (XGXS_EXT_PHY_TYPE(params->ext_phy_config) == | ||
| 1717 | PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8705))) { | ||
| 1694 | vars->autoneg = AUTO_NEG_ENABLED; | 1718 | vars->autoneg = AUTO_NEG_ENABLED; |
| 1695 | 1719 | ||
| 1696 | if (gp_status & MDIO_AN_CL73_OR_37_COMPLETE) { | 1720 | if (gp_status & MDIO_AN_CL73_OR_37_COMPLETE) { |
| @@ -1705,18 +1729,18 @@ static u8 bnx2x_link_settings_status(struct link_params *params, | |||
| 1705 | 1729 | ||
| 1706 | } | 1730 | } |
| 1707 | if (vars->flow_ctrl & FLOW_CTRL_TX) | 1731 | if (vars->flow_ctrl & FLOW_CTRL_TX) |
| 1708 | vars->link_status |= | 1732 | vars->link_status |= |
| 1709 | LINK_STATUS_TX_FLOW_CONTROL_ENABLED; | 1733 | LINK_STATUS_TX_FLOW_CONTROL_ENABLED; |
| 1710 | 1734 | ||
| 1711 | if (vars->flow_ctrl & FLOW_CTRL_RX) | 1735 | if (vars->flow_ctrl & FLOW_CTRL_RX) |
| 1712 | vars->link_status |= | 1736 | vars->link_status |= |
| 1713 | LINK_STATUS_RX_FLOW_CONTROL_ENABLED; | 1737 | LINK_STATUS_RX_FLOW_CONTROL_ENABLED; |
| 1714 | 1738 | ||
| 1715 | } else { /* link_down */ | 1739 | } else { /* link_down */ |
| 1716 | DP(NETIF_MSG_LINK, "phy link down\n"); | 1740 | DP(NETIF_MSG_LINK, "phy link down\n"); |
| 1717 | 1741 | ||
| 1718 | vars->phy_link_up = 0; | 1742 | vars->phy_link_up = 0; |
| 1719 | vars->line_speed = 0; | 1743 | |
| 1720 | vars->duplex = DUPLEX_FULL; | 1744 | vars->duplex = DUPLEX_FULL; |
| 1721 | vars->flow_ctrl = FLOW_CTRL_NONE; | 1745 | vars->flow_ctrl = FLOW_CTRL_NONE; |
| 1722 | vars->autoneg = AUTO_NEG_DISABLED; | 1746 | vars->autoneg = AUTO_NEG_DISABLED; |
| @@ -1817,15 +1841,15 @@ static u8 bnx2x_emac_program(struct link_params *params, | |||
| 1817 | } | 1841 | } |
| 1818 | 1842 | ||
| 1819 | /*****************************************************************************/ | 1843 | /*****************************************************************************/ |
| 1820 | /* External Phy section */ | 1844 | /* External Phy section */ |
| 1821 | /*****************************************************************************/ | 1845 | /*****************************************************************************/ |
| 1822 | static void bnx2x_hw_reset(struct bnx2x *bp) | 1846 | static void bnx2x_hw_reset(struct bnx2x *bp, u8 port) |
| 1823 | { | 1847 | { |
| 1824 | bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_1, | 1848 | bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_1, |
| 1825 | MISC_REGISTERS_GPIO_OUTPUT_LOW); | 1849 | MISC_REGISTERS_GPIO_OUTPUT_LOW, port); |
| 1826 | msleep(1); | 1850 | msleep(1); |
| 1827 | bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_1, | 1851 | bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_1, |
| 1828 | MISC_REGISTERS_GPIO_OUTPUT_HIGH); | 1852 | MISC_REGISTERS_GPIO_OUTPUT_HIGH, port); |
| 1829 | } | 1853 | } |
| 1830 | 1854 | ||
| 1831 | static void bnx2x_ext_phy_reset(struct link_params *params, | 1855 | static void bnx2x_ext_phy_reset(struct link_params *params, |
| @@ -1854,10 +1878,11 @@ static void bnx2x_ext_phy_reset(struct link_params *params, | |||
| 1854 | 1878 | ||
| 1855 | /* Restore normal power mode*/ | 1879 | /* Restore normal power mode*/ |
| 1856 | bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2, | 1880 | bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2, |
| 1857 | MISC_REGISTERS_GPIO_OUTPUT_HIGH); | 1881 | MISC_REGISTERS_GPIO_OUTPUT_HIGH, |
| 1882 | params->port); | ||
| 1858 | 1883 | ||
| 1859 | /* HW reset */ | 1884 | /* HW reset */ |
| 1860 | bnx2x_hw_reset(bp); | 1885 | bnx2x_hw_reset(bp, params->port); |
| 1861 | 1886 | ||
| 1862 | bnx2x_cl45_write(bp, params->port, | 1887 | bnx2x_cl45_write(bp, params->port, |
| 1863 | ext_phy_type, | 1888 | ext_phy_type, |
| @@ -1869,7 +1894,8 @@ static void bnx2x_ext_phy_reset(struct link_params *params, | |||
| 1869 | /* Unset Low Power Mode and SW reset */ | 1894 | /* Unset Low Power Mode and SW reset */ |
| 1870 | /* Restore normal power mode*/ | 1895 | /* Restore normal power mode*/ |
| 1871 | bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2, | 1896 | bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2, |
| 1872 | MISC_REGISTERS_GPIO_OUTPUT_HIGH); | 1897 | MISC_REGISTERS_GPIO_OUTPUT_HIGH, |
| 1898 | params->port); | ||
| 1873 | 1899 | ||
| 1874 | DP(NETIF_MSG_LINK, "XGXS 8072\n"); | 1900 | DP(NETIF_MSG_LINK, "XGXS 8072\n"); |
| 1875 | bnx2x_cl45_write(bp, params->port, | 1901 | bnx2x_cl45_write(bp, params->port, |
| @@ -1887,19 +1913,14 @@ static void bnx2x_ext_phy_reset(struct link_params *params, | |||
| 1887 | 1913 | ||
| 1888 | /* Restore normal power mode*/ | 1914 | /* Restore normal power mode*/ |
| 1889 | bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2, | 1915 | bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2, |
| 1890 | MISC_REGISTERS_GPIO_OUTPUT_HIGH); | 1916 | MISC_REGISTERS_GPIO_OUTPUT_HIGH, |
| 1917 | params->port); | ||
| 1891 | 1918 | ||
| 1892 | bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_1, | 1919 | bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_1, |
| 1893 | MISC_REGISTERS_GPIO_OUTPUT_HIGH); | 1920 | MISC_REGISTERS_GPIO_OUTPUT_HIGH, |
| 1921 | params->port); | ||
| 1894 | 1922 | ||
| 1895 | DP(NETIF_MSG_LINK, "XGXS 8073\n"); | 1923 | DP(NETIF_MSG_LINK, "XGXS 8073\n"); |
| 1896 | bnx2x_cl45_write(bp, | ||
| 1897 | params->port, | ||
| 1898 | ext_phy_type, | ||
| 1899 | ext_phy_addr, | ||
| 1900 | MDIO_PMA_DEVAD, | ||
| 1901 | MDIO_PMA_REG_CTRL, | ||
| 1902 | 1<<15); | ||
| 1903 | } | 1924 | } |
| 1904 | break; | 1925 | break; |
| 1905 | 1926 | ||
| @@ -1908,10 +1929,11 @@ static void bnx2x_ext_phy_reset(struct link_params *params, | |||
| 1908 | 1929 | ||
| 1909 | /* Restore normal power mode*/ | 1930 | /* Restore normal power mode*/ |
| 1910 | bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2, | 1931 | bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2, |
| 1911 | MISC_REGISTERS_GPIO_OUTPUT_HIGH); | 1932 | MISC_REGISTERS_GPIO_OUTPUT_HIGH, |
| 1933 | params->port); | ||
| 1912 | 1934 | ||
| 1913 | /* HW reset */ | 1935 | /* HW reset */ |
| 1914 | bnx2x_hw_reset(bp); | 1936 | bnx2x_hw_reset(bp, params->port); |
| 1915 | 1937 | ||
| 1916 | break; | 1938 | break; |
| 1917 | 1939 | ||
| @@ -1934,7 +1956,7 @@ static void bnx2x_ext_phy_reset(struct link_params *params, | |||
| 1934 | 1956 | ||
| 1935 | case PORT_HW_CFG_SERDES_EXT_PHY_TYPE_BCM5482: | 1957 | case PORT_HW_CFG_SERDES_EXT_PHY_TYPE_BCM5482: |
| 1936 | DP(NETIF_MSG_LINK, "SerDes 5482\n"); | 1958 | DP(NETIF_MSG_LINK, "SerDes 5482\n"); |
| 1937 | bnx2x_hw_reset(bp); | 1959 | bnx2x_hw_reset(bp, params->port); |
| 1938 | break; | 1960 | break; |
| 1939 | 1961 | ||
| 1940 | default: | 1962 | default: |
| @@ -2098,42 +2120,45 @@ static u8 bnx2x_bcm8073_xaui_wa(struct link_params *params) | |||
| 2098 | 2120 | ||
| 2099 | } | 2121 | } |
| 2100 | 2122 | ||
| 2101 | static void bnx2x_bcm8073_external_rom_boot(struct link_params *params) | 2123 | static void bnx2x_bcm8073_external_rom_boot(struct bnx2x *bp, u8 port, |
| 2124 | u8 ext_phy_addr) | ||
| 2102 | { | 2125 | { |
| 2103 | struct bnx2x *bp = params->bp; | 2126 | u16 fw_ver1, fw_ver2; |
| 2104 | u8 port = params->port; | 2127 | /* Boot port from external ROM */ |
| 2105 | u8 ext_phy_addr = ((params->ext_phy_config & | ||
| 2106 | PORT_HW_CFG_XGXS_EXT_PHY_ADDR_MASK) >> | ||
| 2107 | PORT_HW_CFG_XGXS_EXT_PHY_ADDR_SHIFT); | ||
| 2108 | u32 ext_phy_type = XGXS_EXT_PHY_TYPE(params->ext_phy_config); | ||
| 2109 | u16 fw_ver1, fw_ver2, val; | ||
| 2110 | /* Need to wait 100ms after reset */ | ||
| 2111 | msleep(100); | ||
| 2112 | /* Boot port from external ROM */ | ||
| 2113 | /* EDC grst */ | 2128 | /* EDC grst */ |
| 2114 | bnx2x_cl45_write(bp, port, ext_phy_type, ext_phy_addr, | 2129 | bnx2x_cl45_write(bp, port, |
| 2130 | PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073, | ||
| 2131 | ext_phy_addr, | ||
| 2115 | MDIO_PMA_DEVAD, | 2132 | MDIO_PMA_DEVAD, |
| 2116 | MDIO_PMA_REG_GEN_CTRL, | 2133 | MDIO_PMA_REG_GEN_CTRL, |
| 2117 | 0x0001); | 2134 | 0x0001); |
| 2118 | 2135 | ||
| 2119 | /* ucode reboot and rst */ | 2136 | /* ucode reboot and rst */ |
| 2120 | bnx2x_cl45_write(bp, port, ext_phy_type, ext_phy_addr, | 2137 | bnx2x_cl45_write(bp, port, |
| 2138 | PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073, | ||
| 2139 | ext_phy_addr, | ||
| 2121 | MDIO_PMA_DEVAD, | 2140 | MDIO_PMA_DEVAD, |
| 2122 | MDIO_PMA_REG_GEN_CTRL, | 2141 | MDIO_PMA_REG_GEN_CTRL, |
| 2123 | 0x008c); | 2142 | 0x008c); |
| 2124 | 2143 | ||
| 2125 | bnx2x_cl45_write(bp, port, ext_phy_type, ext_phy_addr, | 2144 | bnx2x_cl45_write(bp, port, |
| 2145 | PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073, | ||
| 2146 | ext_phy_addr, | ||
| 2126 | MDIO_PMA_DEVAD, | 2147 | MDIO_PMA_DEVAD, |
| 2127 | MDIO_PMA_REG_MISC_CTRL1, 0x0001); | 2148 | MDIO_PMA_REG_MISC_CTRL1, 0x0001); |
| 2128 | 2149 | ||
| 2129 | /* Reset internal microprocessor */ | 2150 | /* Reset internal microprocessor */ |
| 2130 | bnx2x_cl45_write(bp, port, ext_phy_type, ext_phy_addr, | 2151 | bnx2x_cl45_write(bp, port, |
| 2152 | PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073, | ||
| 2153 | ext_phy_addr, | ||
| 2131 | MDIO_PMA_DEVAD, | 2154 | MDIO_PMA_DEVAD, |
| 2132 | MDIO_PMA_REG_GEN_CTRL, | 2155 | MDIO_PMA_REG_GEN_CTRL, |
| 2133 | MDIO_PMA_REG_GEN_CTRL_ROM_MICRO_RESET); | 2156 | MDIO_PMA_REG_GEN_CTRL_ROM_MICRO_RESET); |
| 2134 | 2157 | ||
| 2135 | /* Release srst bit */ | 2158 | /* Release srst bit */ |
| 2136 | bnx2x_cl45_write(bp, port, ext_phy_type, ext_phy_addr, | 2159 | bnx2x_cl45_write(bp, port, |
| 2160 | PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073, | ||
| 2161 | ext_phy_addr, | ||
| 2137 | MDIO_PMA_DEVAD, | 2162 | MDIO_PMA_DEVAD, |
| 2138 | MDIO_PMA_REG_GEN_CTRL, | 2163 | MDIO_PMA_REG_GEN_CTRL, |
| 2139 | MDIO_PMA_REG_GEN_CTRL_ROM_RESET_INTERNAL_MP); | 2164 | MDIO_PMA_REG_GEN_CTRL_ROM_RESET_INTERNAL_MP); |
| @@ -2142,35 +2167,52 @@ static void bnx2x_bcm8073_external_rom_boot(struct link_params *params) | |||
| 2142 | msleep(100); | 2167 | msleep(100); |
| 2143 | 2168 | ||
| 2144 | /* Clear ser_boot_ctl bit */ | 2169 | /* Clear ser_boot_ctl bit */ |
| 2145 | bnx2x_cl45_write(bp, port, ext_phy_type, ext_phy_addr, | 2170 | bnx2x_cl45_write(bp, port, |
| 2171 | PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073, | ||
| 2172 | ext_phy_addr, | ||
| 2146 | MDIO_PMA_DEVAD, | 2173 | MDIO_PMA_DEVAD, |
| 2147 | MDIO_PMA_REG_MISC_CTRL1, 0x0000); | 2174 | MDIO_PMA_REG_MISC_CTRL1, 0x0000); |
| 2148 | 2175 | ||
| 2149 | bnx2x_cl45_read(bp, port, ext_phy_type, ext_phy_addr, | 2176 | bnx2x_cl45_read(bp, port, PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073, |
| 2150 | MDIO_PMA_DEVAD, | 2177 | ext_phy_addr, |
| 2151 | MDIO_PMA_REG_ROM_VER1, &fw_ver1); | 2178 | MDIO_PMA_DEVAD, |
| 2152 | bnx2x_cl45_read(bp, port, ext_phy_type, ext_phy_addr, | 2179 | MDIO_PMA_REG_ROM_VER1, &fw_ver1); |
| 2153 | MDIO_PMA_DEVAD, | 2180 | bnx2x_cl45_read(bp, port, |
| 2154 | MDIO_PMA_REG_ROM_VER2, &fw_ver2); | 2181 | PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073, |
| 2182 | ext_phy_addr, | ||
| 2183 | MDIO_PMA_DEVAD, | ||
| 2184 | MDIO_PMA_REG_ROM_VER2, &fw_ver2); | ||
| 2155 | DP(NETIF_MSG_LINK, "8073 FW version 0x%x:0x%x\n", fw_ver1, fw_ver2); | 2185 | DP(NETIF_MSG_LINK, "8073 FW version 0x%x:0x%x\n", fw_ver1, fw_ver2); |
| 2156 | 2186 | ||
| 2157 | /* Only set bit 10 = 1 (Tx power down) */ | 2187 | } |
| 2158 | bnx2x_cl45_read(bp, port, ext_phy_type, ext_phy_addr, | ||
| 2159 | MDIO_PMA_DEVAD, | ||
| 2160 | MDIO_PMA_REG_TX_POWER_DOWN, &val); | ||
| 2161 | 2188 | ||
| 2189 | static void bnx2x_bcm807x_force_10G(struct link_params *params) | ||
| 2190 | { | ||
| 2191 | struct bnx2x *bp = params->bp; | ||
| 2192 | u8 port = params->port; | ||
| 2193 | u8 ext_phy_addr = ((params->ext_phy_config & | ||
| 2194 | PORT_HW_CFG_XGXS_EXT_PHY_ADDR_MASK) >> | ||
| 2195 | PORT_HW_CFG_XGXS_EXT_PHY_ADDR_SHIFT); | ||
| 2196 | u32 ext_phy_type = XGXS_EXT_PHY_TYPE(params->ext_phy_config); | ||
| 2197 | |||
| 2198 | /* Force KR or KX */ | ||
| 2162 | bnx2x_cl45_write(bp, port, ext_phy_type, ext_phy_addr, | 2199 | bnx2x_cl45_write(bp, port, ext_phy_type, ext_phy_addr, |
| 2163 | MDIO_PMA_DEVAD, | 2200 | MDIO_PMA_DEVAD, |
| 2164 | MDIO_PMA_REG_TX_POWER_DOWN, (val | 1<<10)); | 2201 | MDIO_PMA_REG_CTRL, |
| 2165 | 2202 | 0x2040); | |
| 2166 | msleep(600); | ||
| 2167 | /* Release bit 10 (Release Tx power down) */ | ||
| 2168 | bnx2x_cl45_write(bp, port, ext_phy_type, ext_phy_addr, | 2203 | bnx2x_cl45_write(bp, port, ext_phy_type, ext_phy_addr, |
| 2169 | MDIO_PMA_DEVAD, | 2204 | MDIO_PMA_DEVAD, |
| 2170 | MDIO_PMA_REG_TX_POWER_DOWN, (val & (~(1<<10)))); | 2205 | MDIO_PMA_REG_10G_CTRL2, |
| 2171 | 2206 | 0x000b); | |
| 2207 | bnx2x_cl45_write(bp, port, ext_phy_type, ext_phy_addr, | ||
| 2208 | MDIO_PMA_DEVAD, | ||
| 2209 | MDIO_PMA_REG_BCM_CTRL, | ||
| 2210 | 0x0000); | ||
| 2211 | bnx2x_cl45_write(bp, port, ext_phy_type, ext_phy_addr, | ||
| 2212 | MDIO_AN_DEVAD, | ||
| 2213 | MDIO_AN_REG_CTRL, | ||
| 2214 | 0x0000); | ||
| 2172 | } | 2215 | } |
| 2173 | |||
| 2174 | static void bnx2x_bcm8073_set_xaui_low_power_mode(struct link_params *params) | 2216 | static void bnx2x_bcm8073_set_xaui_low_power_mode(struct link_params *params) |
| 2175 | { | 2217 | { |
| 2176 | struct bnx2x *bp = params->bp; | 2218 | struct bnx2x *bp = params->bp; |
| @@ -2236,32 +2278,51 @@ static void bnx2x_bcm8073_set_xaui_low_power_mode(struct link_params *params) | |||
| 2236 | bnx2x_cl45_write(bp, port, ext_phy_type, ext_phy_addr, | 2278 | bnx2x_cl45_write(bp, port, ext_phy_type, ext_phy_addr, |
| 2237 | MDIO_XS_DEVAD, MDIO_XS_PLL_SEQUENCER, val); | 2279 | MDIO_XS_DEVAD, MDIO_XS_PLL_SEQUENCER, val); |
| 2238 | } | 2280 | } |
| 2239 | static void bnx2x_bcm807x_force_10G(struct link_params *params) | 2281 | |
| 2282 | static void bnx2x_8073_set_pause_cl37(struct link_params *params, | ||
| 2283 | struct link_vars *vars) | ||
| 2240 | { | 2284 | { |
| 2285 | |||
| 2241 | struct bnx2x *bp = params->bp; | 2286 | struct bnx2x *bp = params->bp; |
| 2242 | u8 port = params->port; | 2287 | u16 cl37_val; |
| 2243 | u8 ext_phy_addr = ((params->ext_phy_config & | 2288 | u8 ext_phy_addr = ((params->ext_phy_config & |
| 2244 | PORT_HW_CFG_XGXS_EXT_PHY_ADDR_MASK) >> | 2289 | PORT_HW_CFG_XGXS_EXT_PHY_ADDR_MASK) >> |
| 2245 | PORT_HW_CFG_XGXS_EXT_PHY_ADDR_SHIFT); | 2290 | PORT_HW_CFG_XGXS_EXT_PHY_ADDR_SHIFT); |
| 2246 | u32 ext_phy_type = XGXS_EXT_PHY_TYPE(params->ext_phy_config); | 2291 | u32 ext_phy_type = XGXS_EXT_PHY_TYPE(params->ext_phy_config); |
| 2247 | 2292 | ||
| 2248 | /* Force KR or KX */ | 2293 | bnx2x_cl45_read(bp, params->port, |
| 2249 | bnx2x_cl45_write(bp, port, ext_phy_type, ext_phy_addr, | 2294 | ext_phy_type, |
| 2250 | MDIO_PMA_DEVAD, | 2295 | ext_phy_addr, |
| 2251 | MDIO_PMA_REG_CTRL, | 2296 | MDIO_AN_DEVAD, |
| 2252 | 0x2040); | 2297 | MDIO_AN_REG_CL37_FC_LD, &cl37_val); |
| 2253 | bnx2x_cl45_write(bp, port, ext_phy_type, ext_phy_addr, | 2298 | |
| 2254 | MDIO_PMA_DEVAD, | 2299 | cl37_val &= ~MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_BOTH; |
| 2255 | MDIO_PMA_REG_10G_CTRL2, | 2300 | /* Please refer to Table 28B-3 of 802.3ab-1999 spec. */ |
| 2256 | 0x000b); | 2301 | |
| 2257 | bnx2x_cl45_write(bp, port, ext_phy_type, ext_phy_addr, | 2302 | if ((vars->ieee_fc & |
| 2258 | MDIO_PMA_DEVAD, | 2303 | MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_SYMMETRIC) == |
| 2259 | MDIO_PMA_REG_BCM_CTRL, | 2304 | MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_SYMMETRIC) { |
| 2260 | 0x0000); | 2305 | cl37_val |= MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_SYMMETRIC; |
| 2261 | bnx2x_cl45_write(bp, port, ext_phy_type, ext_phy_addr, | 2306 | } |
| 2307 | if ((vars->ieee_fc & | ||
| 2308 | MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_ASYMMETRIC) == | ||
| 2309 | MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_ASYMMETRIC) { | ||
| 2310 | cl37_val |= MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_ASYMMETRIC; | ||
| 2311 | } | ||
| 2312 | if ((vars->ieee_fc & | ||
| 2313 | MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_BOTH) == | ||
| 2314 | MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_BOTH) { | ||
| 2315 | cl37_val |= MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_BOTH; | ||
| 2316 | } | ||
| 2317 | DP(NETIF_MSG_LINK, | ||
| 2318 | "Ext phy AN advertize cl37 0x%x\n", cl37_val); | ||
| 2319 | |||
| 2320 | bnx2x_cl45_write(bp, params->port, | ||
| 2321 | ext_phy_type, | ||
| 2322 | ext_phy_addr, | ||
| 2262 | MDIO_AN_DEVAD, | 2323 | MDIO_AN_DEVAD, |
| 2263 | MDIO_AN_REG_CTRL, | 2324 | MDIO_AN_REG_CL37_FC_LD, cl37_val); |
| 2264 | 0x0000); | 2325 | msleep(500); |
| 2265 | } | 2326 | } |
| 2266 | 2327 | ||
| 2267 | static void bnx2x_ext_phy_set_pause(struct link_params *params, | 2328 | static void bnx2x_ext_phy_set_pause(struct link_params *params, |
| @@ -2282,13 +2343,16 @@ static void bnx2x_ext_phy_set_pause(struct link_params *params, | |||
| 2282 | MDIO_AN_REG_ADV_PAUSE, &val); | 2343 | MDIO_AN_REG_ADV_PAUSE, &val); |
| 2283 | 2344 | ||
| 2284 | val &= ~MDIO_AN_REG_ADV_PAUSE_BOTH; | 2345 | val &= ~MDIO_AN_REG_ADV_PAUSE_BOTH; |
| 2346 | |||
| 2285 | /* Please refer to Table 28B-3 of 802.3ab-1999 spec. */ | 2347 | /* Please refer to Table 28B-3 of 802.3ab-1999 spec. */ |
| 2286 | 2348 | ||
| 2287 | if (vars->ieee_fc & | 2349 | if ((vars->ieee_fc & |
| 2350 | MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_ASYMMETRIC) == | ||
| 2288 | MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_ASYMMETRIC) { | 2351 | MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_ASYMMETRIC) { |
| 2289 | val |= MDIO_AN_REG_ADV_PAUSE_ASYMMETRIC; | 2352 | val |= MDIO_AN_REG_ADV_PAUSE_ASYMMETRIC; |
| 2290 | } | 2353 | } |
| 2291 | if (vars->ieee_fc & | 2354 | if ((vars->ieee_fc & |
| 2355 | MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_BOTH) == | ||
| 2292 | MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_BOTH) { | 2356 | MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_BOTH) { |
| 2293 | val |= | 2357 | val |= |
| 2294 | MDIO_AN_REG_ADV_PAUSE_PAUSE; | 2358 | MDIO_AN_REG_ADV_PAUSE_PAUSE; |
| @@ -2302,6 +2366,65 @@ static void bnx2x_ext_phy_set_pause(struct link_params *params, | |||
| 2302 | MDIO_AN_REG_ADV_PAUSE, val); | 2366 | MDIO_AN_REG_ADV_PAUSE, val); |
| 2303 | } | 2367 | } |
| 2304 | 2368 | ||
| 2369 | |||
| 2370 | static void bnx2x_init_internal_phy(struct link_params *params, | ||
| 2371 | struct link_vars *vars) | ||
| 2372 | { | ||
| 2373 | struct bnx2x *bp = params->bp; | ||
| 2374 | u8 port = params->port; | ||
| 2375 | if (!(vars->phy_flags & PHY_SGMII_FLAG)) { | ||
| 2376 | u16 bank, rx_eq; | ||
| 2377 | |||
| 2378 | rx_eq = ((params->serdes_config & | ||
| 2379 | PORT_HW_CFG_SERDES_RX_DRV_EQUALIZER_MASK) >> | ||
| 2380 | PORT_HW_CFG_SERDES_RX_DRV_EQUALIZER_SHIFT); | ||
| 2381 | |||
| 2382 | DP(NETIF_MSG_LINK, "setting rx eq to 0x%x\n", rx_eq); | ||
| 2383 | for (bank = MDIO_REG_BANK_RX0; bank <= MDIO_REG_BANK_RX_ALL; | ||
| 2384 | bank += (MDIO_REG_BANK_RX1-MDIO_REG_BANK_RX0)) { | ||
| 2385 | CL45_WR_OVER_CL22(bp, port, | ||
| 2386 | params->phy_addr, | ||
| 2387 | bank , | ||
| 2388 | MDIO_RX0_RX_EQ_BOOST, | ||
| 2389 | ((rx_eq & | ||
| 2390 | MDIO_RX0_RX_EQ_BOOST_EQUALIZER_CTRL_MASK) | | ||
| 2391 | MDIO_RX0_RX_EQ_BOOST_OFFSET_CTRL)); | ||
| 2392 | } | ||
| 2393 | |||
| 2394 | /* forced speed requested? */ | ||
| 2395 | if (vars->line_speed != SPEED_AUTO_NEG) { | ||
| 2396 | DP(NETIF_MSG_LINK, "not SGMII, no AN\n"); | ||
| 2397 | |||
| 2398 | /* disable autoneg */ | ||
| 2399 | bnx2x_set_autoneg(params, vars); | ||
| 2400 | |||
| 2401 | /* program speed and duplex */ | ||
| 2402 | bnx2x_program_serdes(params, vars); | ||
| 2403 | |||
| 2404 | } else { /* AN_mode */ | ||
| 2405 | DP(NETIF_MSG_LINK, "not SGMII, AN\n"); | ||
| 2406 | |||
| 2407 | /* AN enabled */ | ||
| 2408 | bnx2x_set_brcm_cl37_advertisment(params); | ||
| 2409 | |||
| 2410 | /* program duplex & pause advertisement (for aneg) */ | ||
| 2411 | bnx2x_set_ieee_aneg_advertisment(params, | ||
| 2412 | vars->ieee_fc); | ||
| 2413 | |||
| 2414 | /* enable autoneg */ | ||
| 2415 | bnx2x_set_autoneg(params, vars); | ||
| 2416 | |||
| 2417 | /* enable and restart AN */ | ||
| 2418 | bnx2x_restart_autoneg(params); | ||
| 2419 | } | ||
| 2420 | |||
| 2421 | } else { /* SGMII mode */ | ||
| 2422 | DP(NETIF_MSG_LINK, "SGMII\n"); | ||
| 2423 | |||
| 2424 | bnx2x_initialize_sgmii_process(params, vars); | ||
| 2425 | } | ||
| 2426 | } | ||
| 2427 | |||
| 2305 | static u8 bnx2x_ext_phy_init(struct link_params *params, struct link_vars *vars) | 2428 | static u8 bnx2x_ext_phy_init(struct link_params *params, struct link_vars *vars) |
| 2306 | { | 2429 | { |
| 2307 | struct bnx2x *bp = params->bp; | 2430 | struct bnx2x *bp = params->bp; |
| @@ -2343,7 +2466,6 @@ static u8 bnx2x_ext_phy_init(struct link_params *params, struct link_vars *vars) | |||
| 2343 | 2466 | ||
| 2344 | switch (ext_phy_type) { | 2467 | switch (ext_phy_type) { |
| 2345 | case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_DIRECT: | 2468 | case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_DIRECT: |
| 2346 | DP(NETIF_MSG_LINK, "XGXS Direct\n"); | ||
| 2347 | break; | 2469 | break; |
| 2348 | 2470 | ||
| 2349 | case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8705: | 2471 | case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8705: |
| @@ -2419,7 +2541,7 @@ static u8 bnx2x_ext_phy_init(struct link_params *params, struct link_vars *vars) | |||
| 2419 | ext_phy_type, | 2541 | ext_phy_type, |
| 2420 | ext_phy_addr, | 2542 | ext_phy_addr, |
| 2421 | MDIO_AN_DEVAD, | 2543 | MDIO_AN_DEVAD, |
| 2422 | MDIO_AN_REG_CL37_FD, | 2544 | MDIO_AN_REG_CL37_FC_LP, |
| 2423 | 0x0020); | 2545 | 0x0020); |
| 2424 | /* Enable CL37 AN */ | 2546 | /* Enable CL37 AN */ |
| 2425 | bnx2x_cl45_write(bp, params->port, | 2547 | bnx2x_cl45_write(bp, params->port, |
| @@ -2458,54 +2580,43 @@ static u8 bnx2x_ext_phy_init(struct link_params *params, struct link_vars *vars) | |||
| 2458 | rx_alarm_ctrl_val = 0x400; | 2580 | rx_alarm_ctrl_val = 0x400; |
| 2459 | lasi_ctrl_val = 0x0004; | 2581 | lasi_ctrl_val = 0x0004; |
| 2460 | } else { | 2582 | } else { |
| 2461 | /* In 8073, port1 is directed through emac0 and | ||
| 2462 | * port0 is directed through emac1 | ||
| 2463 | */ | ||
| 2464 | rx_alarm_ctrl_val = (1<<2); | 2583 | rx_alarm_ctrl_val = (1<<2); |
| 2465 | /*lasi_ctrl_val = 0x0005;*/ | ||
| 2466 | lasi_ctrl_val = 0x0004; | 2584 | lasi_ctrl_val = 0x0004; |
| 2467 | } | 2585 | } |
| 2468 | 2586 | ||
| 2469 | /* Wait for soft reset to get cleared upto 1 sec */ | 2587 | /* enable LASI */ |
| 2470 | for (cnt = 0; cnt < 1000; cnt++) { | 2588 | bnx2x_cl45_write(bp, params->port, |
| 2471 | bnx2x_cl45_read(bp, params->port, | 2589 | ext_phy_type, |
| 2472 | ext_phy_type, | 2590 | ext_phy_addr, |
| 2473 | ext_phy_addr, | 2591 | MDIO_PMA_DEVAD, |
| 2474 | MDIO_PMA_DEVAD, | 2592 | MDIO_PMA_REG_RX_ALARM_CTRL, |
| 2475 | MDIO_PMA_REG_CTRL, | 2593 | rx_alarm_ctrl_val); |
| 2476 | &ctrl); | 2594 | |
| 2477 | if (!(ctrl & (1<<15))) | 2595 | bnx2x_cl45_write(bp, params->port, |
| 2478 | break; | 2596 | ext_phy_type, |
| 2479 | msleep(1); | 2597 | ext_phy_addr, |
| 2480 | } | 2598 | MDIO_PMA_DEVAD, |
| 2481 | DP(NETIF_MSG_LINK, | 2599 | MDIO_PMA_REG_LASI_CTRL, |
| 2482 | "807x control reg 0x%x (after %d ms)\n", | 2600 | lasi_ctrl_val); |
| 2483 | ctrl, cnt); | 2601 | |
| 2602 | bnx2x_8073_set_pause_cl37(params, vars); | ||
| 2484 | 2603 | ||
| 2485 | if (ext_phy_type == | 2604 | if (ext_phy_type == |
| 2486 | PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8072){ | 2605 | PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8072){ |
| 2487 | bnx2x_bcm8072_external_rom_boot(params); | 2606 | bnx2x_bcm8072_external_rom_boot(params); |
| 2488 | } else { | 2607 | } else { |
| 2489 | bnx2x_bcm8073_external_rom_boot(params); | 2608 | |
| 2490 | /* In case of 8073 with long xaui lines, | 2609 | /* In case of 8073 with long xaui lines, |
| 2491 | don't set the 8073 xaui low power*/ | 2610 | don't set the 8073 xaui low power*/ |
| 2492 | bnx2x_bcm8073_set_xaui_low_power_mode(params); | 2611 | bnx2x_bcm8073_set_xaui_low_power_mode(params); |
| 2493 | } | 2612 | } |
| 2494 | 2613 | ||
| 2495 | /* enable LASI */ | 2614 | bnx2x_cl45_read(bp, params->port, |
| 2496 | bnx2x_cl45_write(bp, params->port, | 2615 | ext_phy_type, |
| 2497 | ext_phy_type, | 2616 | ext_phy_addr, |
| 2498 | ext_phy_addr, | 2617 | MDIO_PMA_DEVAD, |
| 2499 | MDIO_PMA_DEVAD, | 2618 | 0xca13, |
| 2500 | MDIO_PMA_REG_RX_ALARM_CTRL, | 2619 | &tmp1); |
| 2501 | rx_alarm_ctrl_val); | ||
| 2502 | |||
| 2503 | bnx2x_cl45_write(bp, params->port, | ||
| 2504 | ext_phy_type, | ||
| 2505 | ext_phy_addr, | ||
| 2506 | MDIO_PMA_DEVAD, | ||
| 2507 | MDIO_PMA_REG_LASI_CTRL, | ||
| 2508 | lasi_ctrl_val); | ||
| 2509 | 2620 | ||
| 2510 | bnx2x_cl45_read(bp, params->port, | 2621 | bnx2x_cl45_read(bp, params->port, |
| 2511 | ext_phy_type, | 2622 | ext_phy_type, |
| @@ -2519,12 +2630,21 @@ static u8 bnx2x_ext_phy_init(struct link_params *params, struct link_vars *vars) | |||
| 2519 | /* If this is forced speed, set to KR or KX | 2630 | /* If this is forced speed, set to KR or KX |
| 2520 | * (all other are not supported) | 2631 | * (all other are not supported) |
| 2521 | */ | 2632 | */ |
| 2522 | if (!(params->req_line_speed == SPEED_AUTO_NEG)) { | 2633 | if (params->loopback_mode == LOOPBACK_EXT) { |
| 2523 | if (params->req_line_speed == SPEED_10000) { | 2634 | bnx2x_bcm807x_force_10G(params); |
| 2524 | bnx2x_bcm807x_force_10G(params); | 2635 | DP(NETIF_MSG_LINK, |
| 2525 | DP(NETIF_MSG_LINK, | 2636 | "Forced speed 10G on 807X\n"); |
| 2526 | "Forced speed 10G on 807X\n"); | 2637 | break; |
| 2527 | break; | 2638 | } else { |
| 2639 | bnx2x_cl45_write(bp, params->port, | ||
| 2640 | ext_phy_type, ext_phy_addr, | ||
| 2641 | MDIO_PMA_DEVAD, | ||
| 2642 | MDIO_PMA_REG_BCM_CTRL, | ||
| 2643 | 0x0002); | ||
| 2644 | } | ||
| 2645 | if (params->req_line_speed != SPEED_AUTO_NEG) { | ||
| 2646 | if (params->req_line_speed == SPEED_10000) { | ||
| 2647 | val = (1<<7); | ||
| 2528 | } else if (params->req_line_speed == | 2648 | } else if (params->req_line_speed == |
| 2529 | SPEED_2500) { | 2649 | SPEED_2500) { |
| 2530 | val = (1<<5); | 2650 | val = (1<<5); |
| @@ -2539,11 +2659,14 @@ static u8 bnx2x_ext_phy_init(struct link_params *params, struct link_vars *vars) | |||
| 2539 | PORT_HW_CFG_SPEED_CAPABILITY_D0_10G) | 2659 | PORT_HW_CFG_SPEED_CAPABILITY_D0_10G) |
| 2540 | val |= (1<<7); | 2660 | val |= (1<<7); |
| 2541 | 2661 | ||
| 2662 | /* Note that 2.5G works only when | ||
| 2663 | used with 1G advertisment */ | ||
| 2542 | if (params->speed_cap_mask & | 2664 | if (params->speed_cap_mask & |
| 2543 | PORT_HW_CFG_SPEED_CAPABILITY_D0_1G) | 2665 | (PORT_HW_CFG_SPEED_CAPABILITY_D0_1G | |
| 2666 | PORT_HW_CFG_SPEED_CAPABILITY_D0_2_5G)) | ||
| 2544 | val |= (1<<5); | 2667 | val |= (1<<5); |
| 2545 | DP(NETIF_MSG_LINK, "807x autoneg val = 0x%x\n", val); | 2668 | DP(NETIF_MSG_LINK, |
| 2546 | /*val = ((1<<5)|(1<<7));*/ | 2669 | "807x autoneg val = 0x%x\n", val); |
| 2547 | } | 2670 | } |
| 2548 | 2671 | ||
| 2549 | bnx2x_cl45_write(bp, params->port, | 2672 | bnx2x_cl45_write(bp, params->port, |
| @@ -2554,20 +2677,19 @@ static u8 bnx2x_ext_phy_init(struct link_params *params, struct link_vars *vars) | |||
| 2554 | 2677 | ||
| 2555 | if (ext_phy_type == | 2678 | if (ext_phy_type == |
| 2556 | PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073) { | 2679 | PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073) { |
| 2557 | /* Disable 2.5Ghz */ | 2680 | |
| 2558 | bnx2x_cl45_read(bp, params->port, | 2681 | bnx2x_cl45_read(bp, params->port, |
| 2559 | ext_phy_type, | 2682 | ext_phy_type, |
| 2560 | ext_phy_addr, | 2683 | ext_phy_addr, |
| 2561 | MDIO_AN_DEVAD, | 2684 | MDIO_AN_DEVAD, |
| 2562 | 0x8329, &tmp1); | 2685 | 0x8329, &tmp1); |
| 2563 | /* SUPPORT_SPEED_CAPABILITY | 2686 | |
| 2564 | (Due to the nature of the link order, its not | 2687 | if (((params->speed_cap_mask & |
| 2565 | possible to enable 2.5G within the autoneg | 2688 | PORT_HW_CFG_SPEED_CAPABILITY_D0_2_5G) && |
| 2566 | capabilities) | 2689 | (params->req_line_speed == |
| 2567 | if (params->speed_cap_mask & | 2690 | SPEED_AUTO_NEG)) || |
| 2568 | PORT_HW_CFG_SPEED_CAPABILITY_D0_2_5G) | 2691 | (params->req_line_speed == |
| 2569 | */ | 2692 | SPEED_2500)) { |
| 2570 | if (params->req_line_speed == SPEED_2500) { | ||
| 2571 | u16 phy_ver; | 2693 | u16 phy_ver; |
| 2572 | /* Allow 2.5G for A1 and above */ | 2694 | /* Allow 2.5G for A1 and above */ |
| 2573 | bnx2x_cl45_read(bp, params->port, | 2695 | bnx2x_cl45_read(bp, params->port, |
| @@ -2575,49 +2697,53 @@ static u8 bnx2x_ext_phy_init(struct link_params *params, struct link_vars *vars) | |||
| 2575 | ext_phy_addr, | 2697 | ext_phy_addr, |
| 2576 | MDIO_PMA_DEVAD, | 2698 | MDIO_PMA_DEVAD, |
| 2577 | 0xc801, &phy_ver); | 2699 | 0xc801, &phy_ver); |
| 2578 | 2700 | DP(NETIF_MSG_LINK, "Add 2.5G\n"); | |
| 2579 | if (phy_ver > 0) | 2701 | if (phy_ver > 0) |
| 2580 | tmp1 |= 1; | 2702 | tmp1 |= 1; |
| 2581 | else | 2703 | else |
| 2582 | tmp1 &= 0xfffe; | 2704 | tmp1 &= 0xfffe; |
| 2583 | } | 2705 | } else { |
| 2584 | else | 2706 | DP(NETIF_MSG_LINK, "Disable 2.5G\n"); |
| 2585 | tmp1 &= 0xfffe; | 2707 | tmp1 &= 0xfffe; |
| 2708 | } | ||
| 2586 | 2709 | ||
| 2587 | bnx2x_cl45_write(bp, params->port, | 2710 | bnx2x_cl45_write(bp, params->port, |
| 2588 | ext_phy_type, | 2711 | ext_phy_type, |
| 2589 | ext_phy_addr, | 2712 | ext_phy_addr, |
| 2590 | MDIO_AN_DEVAD, | 2713 | MDIO_AN_DEVAD, |
| 2591 | 0x8329, tmp1); | 2714 | 0x8329, tmp1); |
| 2592 | } | 2715 | } |
| 2593 | /* Add support for CL37 (passive mode) I */ | 2716 | |
| 2594 | bnx2x_cl45_write(bp, params->port, | 2717 | /* Add support for CL37 (passive mode) II */ |
| 2718 | |||
| 2719 | bnx2x_cl45_read(bp, params->port, | ||
| 2595 | ext_phy_type, | 2720 | ext_phy_type, |
| 2596 | ext_phy_addr, | 2721 | ext_phy_addr, |
| 2597 | MDIO_AN_DEVAD, | 2722 | MDIO_AN_DEVAD, |
| 2598 | MDIO_AN_REG_CL37_CL73, 0x040c); | 2723 | MDIO_AN_REG_CL37_FC_LD, |
| 2599 | /* Add support for CL37 (passive mode) II */ | 2724 | &tmp1); |
| 2725 | |||
| 2600 | bnx2x_cl45_write(bp, params->port, | 2726 | bnx2x_cl45_write(bp, params->port, |
| 2601 | ext_phy_type, | 2727 | ext_phy_type, |
| 2602 | ext_phy_addr, | 2728 | ext_phy_addr, |
| 2603 | MDIO_AN_DEVAD, | 2729 | MDIO_AN_DEVAD, |
| 2604 | MDIO_AN_REG_CL37_FD, 0x20); | 2730 | MDIO_AN_REG_CL37_FC_LD, (tmp1 | |
| 2731 | ((params->req_duplex == DUPLEX_FULL) ? | ||
| 2732 | 0x20 : 0x40))); | ||
| 2733 | |||
| 2605 | /* Add support for CL37 (passive mode) III */ | 2734 | /* Add support for CL37 (passive mode) III */ |
| 2606 | bnx2x_cl45_write(bp, params->port, | 2735 | bnx2x_cl45_write(bp, params->port, |
| 2607 | ext_phy_type, | 2736 | ext_phy_type, |
| 2608 | ext_phy_addr, | 2737 | ext_phy_addr, |
| 2609 | MDIO_AN_DEVAD, | 2738 | MDIO_AN_DEVAD, |
| 2610 | MDIO_AN_REG_CL37_AN, 0x1000); | 2739 | MDIO_AN_REG_CL37_AN, 0x1000); |
| 2611 | /* Restart autoneg */ | ||
| 2612 | msleep(500); | ||
| 2613 | 2740 | ||
| 2614 | if (ext_phy_type == | 2741 | if (ext_phy_type == |
| 2615 | PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073) { | 2742 | PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073) { |
| 2616 | 2743 | /* The SNR will improve about 2db by changing | |
| 2617 | /* The SNR will improve about 2db by changing the | ||
| 2618 | BW and FEE main tap. Rest commands are executed | 2744 | BW and FEE main tap. Rest commands are executed |
| 2619 | after link is up*/ | 2745 | after link is up*/ |
| 2620 | /* Change FFE main cursor to 5 in EDC register */ | 2746 | /*Change FFE main cursor to 5 in EDC register*/ |
| 2621 | if (bnx2x_8073_is_snr_needed(params)) | 2747 | if (bnx2x_8073_is_snr_needed(params)) |
| 2622 | bnx2x_cl45_write(bp, params->port, | 2748 | bnx2x_cl45_write(bp, params->port, |
| 2623 | ext_phy_type, | 2749 | ext_phy_type, |
| @@ -2626,25 +2752,28 @@ static u8 bnx2x_ext_phy_init(struct link_params *params, struct link_vars *vars) | |||
| 2626 | MDIO_PMA_REG_EDC_FFE_MAIN, | 2752 | MDIO_PMA_REG_EDC_FFE_MAIN, |
| 2627 | 0xFB0C); | 2753 | 0xFB0C); |
| 2628 | 2754 | ||
| 2629 | /* Enable FEC (Forware Error Correction) | 2755 | /* Enable FEC (Forware Error Correction) |
| 2630 | Request in the AN */ | 2756 | Request in the AN */ |
| 2631 | bnx2x_cl45_read(bp, params->port, | 2757 | bnx2x_cl45_read(bp, params->port, |
| 2632 | ext_phy_type, | 2758 | ext_phy_type, |
| 2633 | ext_phy_addr, | 2759 | ext_phy_addr, |
| 2634 | MDIO_AN_DEVAD, | 2760 | MDIO_AN_DEVAD, |
| 2635 | MDIO_AN_REG_ADV2, &tmp1); | 2761 | MDIO_AN_REG_ADV2, &tmp1); |
| 2636 | 2762 | ||
| 2637 | tmp1 |= (1<<15); | 2763 | tmp1 |= (1<<15); |
| 2764 | |||
| 2765 | bnx2x_cl45_write(bp, params->port, | ||
| 2766 | ext_phy_type, | ||
| 2767 | ext_phy_addr, | ||
| 2768 | MDIO_AN_DEVAD, | ||
| 2769 | MDIO_AN_REG_ADV2, tmp1); | ||
| 2638 | 2770 | ||
| 2639 | bnx2x_cl45_write(bp, params->port, | ||
| 2640 | ext_phy_type, | ||
| 2641 | ext_phy_addr, | ||
| 2642 | MDIO_AN_DEVAD, | ||
| 2643 | MDIO_AN_REG_ADV2, tmp1); | ||
| 2644 | } | 2771 | } |
| 2645 | 2772 | ||
| 2646 | bnx2x_ext_phy_set_pause(params, vars); | 2773 | bnx2x_ext_phy_set_pause(params, vars); |
| 2647 | 2774 | ||
| 2775 | /* Restart autoneg */ | ||
| 2776 | msleep(500); | ||
| 2648 | bnx2x_cl45_write(bp, params->port, | 2777 | bnx2x_cl45_write(bp, params->port, |
| 2649 | ext_phy_type, | 2778 | ext_phy_type, |
| 2650 | ext_phy_addr, | 2779 | ext_phy_addr, |
| @@ -2701,10 +2830,7 @@ static u8 bnx2x_ext_phy_init(struct link_params *params, struct link_vars *vars) | |||
| 2701 | } | 2830 | } |
| 2702 | 2831 | ||
| 2703 | } else { /* SerDes */ | 2832 | } else { /* SerDes */ |
| 2704 | /* ext_phy_addr = ((bp->ext_phy_config & | 2833 | |
| 2705 | PORT_HW_CFG_SERDES_EXT_PHY_ADDR_MASK) >> | ||
| 2706 | PORT_HW_CFG_SERDES_EXT_PHY_ADDR_SHIFT); | ||
| 2707 | */ | ||
| 2708 | ext_phy_type = SERDES_EXT_PHY_TYPE(params->ext_phy_config); | 2834 | ext_phy_type = SERDES_EXT_PHY_TYPE(params->ext_phy_config); |
| 2709 | switch (ext_phy_type) { | 2835 | switch (ext_phy_type) { |
| 2710 | case PORT_HW_CFG_SERDES_EXT_PHY_TYPE_DIRECT: | 2836 | case PORT_HW_CFG_SERDES_EXT_PHY_TYPE_DIRECT: |
| @@ -2726,7 +2852,7 @@ static u8 bnx2x_ext_phy_init(struct link_params *params, struct link_vars *vars) | |||
| 2726 | 2852 | ||
| 2727 | 2853 | ||
| 2728 | static u8 bnx2x_ext_phy_is_link_up(struct link_params *params, | 2854 | static u8 bnx2x_ext_phy_is_link_up(struct link_params *params, |
| 2729 | struct link_vars *vars) | 2855 | struct link_vars *vars) |
| 2730 | { | 2856 | { |
| 2731 | struct bnx2x *bp = params->bp; | 2857 | struct bnx2x *bp = params->bp; |
| 2732 | u32 ext_phy_type; | 2858 | u32 ext_phy_type; |
| @@ -2767,6 +2893,8 @@ static u8 bnx2x_ext_phy_is_link_up(struct link_params *params, | |||
| 2767 | MDIO_PMA_REG_RX_SD, &rx_sd); | 2893 | MDIO_PMA_REG_RX_SD, &rx_sd); |
| 2768 | DP(NETIF_MSG_LINK, "8705 rx_sd 0x%x\n", rx_sd); | 2894 | DP(NETIF_MSG_LINK, "8705 rx_sd 0x%x\n", rx_sd); |
| 2769 | ext_phy_link_up = (rx_sd & 0x1); | 2895 | ext_phy_link_up = (rx_sd & 0x1); |
| 2896 | if (ext_phy_link_up) | ||
| 2897 | vars->line_speed = SPEED_10000; | ||
| 2770 | break; | 2898 | break; |
| 2771 | 2899 | ||
| 2772 | case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8706: | 2900 | case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8706: |
| @@ -2810,6 +2938,13 @@ static u8 bnx2x_ext_phy_is_link_up(struct link_params *params, | |||
| 2810 | */ | 2938 | */ |
| 2811 | ext_phy_link_up = ((rx_sd & pcs_status & 0x1) || | 2939 | ext_phy_link_up = ((rx_sd & pcs_status & 0x1) || |
| 2812 | (val2 & (1<<1))); | 2940 | (val2 & (1<<1))); |
| 2941 | if (ext_phy_link_up) { | ||
| 2942 | if (val2 & (1<<1)) | ||
| 2943 | vars->line_speed = SPEED_1000; | ||
| 2944 | else | ||
| 2945 | vars->line_speed = SPEED_10000; | ||
| 2946 | } | ||
| 2947 | |||
| 2813 | /* clear LASI indication*/ | 2948 | /* clear LASI indication*/ |
| 2814 | bnx2x_cl45_read(bp, params->port, ext_phy_type, | 2949 | bnx2x_cl45_read(bp, params->port, ext_phy_type, |
| 2815 | ext_phy_addr, | 2950 | ext_phy_addr, |
| @@ -2820,6 +2955,8 @@ static u8 bnx2x_ext_phy_is_link_up(struct link_params *params, | |||
| 2820 | case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8072: | 2955 | case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8072: |
| 2821 | case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073: | 2956 | case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073: |
| 2822 | { | 2957 | { |
| 2958 | u16 link_status = 0; | ||
| 2959 | u16 an1000_status = 0; | ||
| 2823 | if (ext_phy_type == | 2960 | if (ext_phy_type == |
| 2824 | PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8072) { | 2961 | PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8072) { |
| 2825 | bnx2x_cl45_read(bp, params->port, | 2962 | bnx2x_cl45_read(bp, params->port, |
| @@ -2846,14 +2983,9 @@ static u8 bnx2x_ext_phy_is_link_up(struct link_params *params, | |||
| 2846 | MDIO_PMA_DEVAD, | 2983 | MDIO_PMA_DEVAD, |
| 2847 | MDIO_PMA_REG_LASI_STATUS, &val1); | 2984 | MDIO_PMA_REG_LASI_STATUS, &val1); |
| 2848 | 2985 | ||
| 2849 | bnx2x_cl45_read(bp, params->port, | ||
| 2850 | ext_phy_type, | ||
| 2851 | ext_phy_addr, | ||
| 2852 | MDIO_PMA_DEVAD, | ||
| 2853 | MDIO_PMA_REG_LASI_STATUS, &val2); | ||
| 2854 | DP(NETIF_MSG_LINK, | 2986 | DP(NETIF_MSG_LINK, |
| 2855 | "8703 LASI status 0x%x->0x%x\n", | 2987 | "8703 LASI status 0x%x\n", |
| 2856 | val1, val2); | 2988 | val1); |
| 2857 | } | 2989 | } |
| 2858 | 2990 | ||
| 2859 | /* clear the interrupt LASI status register */ | 2991 | /* clear the interrupt LASI status register */ |
| @@ -2869,20 +3001,23 @@ static u8 bnx2x_ext_phy_is_link_up(struct link_params *params, | |||
| 2869 | MDIO_PCS_REG_STATUS, &val1); | 3001 | MDIO_PCS_REG_STATUS, &val1); |
| 2870 | DP(NETIF_MSG_LINK, "807x PCS status 0x%x->0x%x\n", | 3002 | DP(NETIF_MSG_LINK, "807x PCS status 0x%x->0x%x\n", |
| 2871 | val2, val1); | 3003 | val2, val1); |
| 2872 | /* Check the LASI */ | 3004 | /* Clear MSG-OUT */ |
| 2873 | bnx2x_cl45_read(bp, params->port, | 3005 | bnx2x_cl45_read(bp, params->port, |
| 2874 | ext_phy_type, | 3006 | ext_phy_type, |
| 2875 | ext_phy_addr, | 3007 | ext_phy_addr, |
| 2876 | MDIO_PMA_DEVAD, | 3008 | MDIO_PMA_DEVAD, |
| 2877 | MDIO_PMA_REG_RX_ALARM, &val2); | 3009 | 0xca13, |
| 3010 | &val1); | ||
| 3011 | |||
| 3012 | /* Check the LASI */ | ||
| 2878 | bnx2x_cl45_read(bp, params->port, | 3013 | bnx2x_cl45_read(bp, params->port, |
| 2879 | ext_phy_type, | 3014 | ext_phy_type, |
| 2880 | ext_phy_addr, | 3015 | ext_phy_addr, |
| 2881 | MDIO_PMA_DEVAD, | 3016 | MDIO_PMA_DEVAD, |
| 2882 | MDIO_PMA_REG_RX_ALARM, | 3017 | MDIO_PMA_REG_RX_ALARM, &val2); |
| 2883 | &val1); | 3018 | |
| 2884 | DP(NETIF_MSG_LINK, "KR 0x9003 0x%x->0x%x\n", | 3019 | DP(NETIF_MSG_LINK, "KR 0x9003 0x%x\n", val2); |
| 2885 | val2, val1); | 3020 | |
| 2886 | /* Check the link status */ | 3021 | /* Check the link status */ |
| 2887 | bnx2x_cl45_read(bp, params->port, | 3022 | bnx2x_cl45_read(bp, params->port, |
| 2888 | ext_phy_type, | 3023 | ext_phy_type, |
| @@ -2905,29 +3040,29 @@ static u8 bnx2x_ext_phy_is_link_up(struct link_params *params, | |||
| 2905 | DP(NETIF_MSG_LINK, "PMA_REG_STATUS=0x%x\n", val1); | 3040 | DP(NETIF_MSG_LINK, "PMA_REG_STATUS=0x%x\n", val1); |
| 2906 | if (ext_phy_type == | 3041 | if (ext_phy_type == |
| 2907 | PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073) { | 3042 | PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073) { |
| 2908 | u16 an1000_status = 0; | 3043 | |
| 2909 | if (ext_phy_link_up && | 3044 | if (ext_phy_link_up && |
| 2910 | ( | 3045 | ((params->req_line_speed != |
| 2911 | (params->req_line_speed != SPEED_10000) | 3046 | SPEED_10000))) { |
| 2912 | )) { | ||
| 2913 | if (bnx2x_bcm8073_xaui_wa(params) | 3047 | if (bnx2x_bcm8073_xaui_wa(params) |
| 2914 | != 0) { | 3048 | != 0) { |
| 2915 | ext_phy_link_up = 0; | 3049 | ext_phy_link_up = 0; |
| 2916 | break; | 3050 | break; |
| 2917 | } | 3051 | } |
| 2918 | bnx2x_cl45_read(bp, params->port, | 3052 | } |
| 3053 | bnx2x_cl45_read(bp, params->port, | ||
| 2919 | ext_phy_type, | 3054 | ext_phy_type, |
| 2920 | ext_phy_addr, | 3055 | ext_phy_addr, |
| 2921 | MDIO_XS_DEVAD, | 3056 | MDIO_AN_DEVAD, |
| 2922 | 0x8304, | 3057 | 0x8304, |
| 2923 | &an1000_status); | 3058 | &an1000_status); |
| 2924 | bnx2x_cl45_read(bp, params->port, | 3059 | bnx2x_cl45_read(bp, params->port, |
| 2925 | ext_phy_type, | 3060 | ext_phy_type, |
| 2926 | ext_phy_addr, | 3061 | ext_phy_addr, |
| 2927 | MDIO_XS_DEVAD, | 3062 | MDIO_AN_DEVAD, |
| 2928 | 0x8304, | 3063 | 0x8304, |
| 2929 | &an1000_status); | 3064 | &an1000_status); |
| 2930 | } | 3065 | |
| 2931 | /* Check the link status on 1.1.2 */ | 3066 | /* Check the link status on 1.1.2 */ |
| 2932 | bnx2x_cl45_read(bp, params->port, | 3067 | bnx2x_cl45_read(bp, params->port, |
| 2933 | ext_phy_type, | 3068 | ext_phy_type, |
| @@ -2943,8 +3078,8 @@ static u8 bnx2x_ext_phy_is_link_up(struct link_params *params, | |||
| 2943 | "an_link_status=0x%x\n", | 3078 | "an_link_status=0x%x\n", |
| 2944 | val2, val1, an1000_status); | 3079 | val2, val1, an1000_status); |
| 2945 | 3080 | ||
| 2946 | ext_phy_link_up = (((val1 & 4) == 4) || | 3081 | ext_phy_link_up = (((val1 & 4) == 4) || |
| 2947 | (an1000_status & (1<<1))); | 3082 | (an1000_status & (1<<1))); |
| 2948 | if (ext_phy_link_up && | 3083 | if (ext_phy_link_up && |
| 2949 | bnx2x_8073_is_snr_needed(params)) { | 3084 | bnx2x_8073_is_snr_needed(params)) { |
| 2950 | /* The SNR will improve about 2dbby | 3085 | /* The SNR will improve about 2dbby |
| @@ -2968,8 +3103,74 @@ static u8 bnx2x_ext_phy_is_link_up(struct link_params *params, | |||
| 2968 | MDIO_PMA_REG_CDR_BANDWIDTH, | 3103 | MDIO_PMA_REG_CDR_BANDWIDTH, |
| 2969 | 0x0333); | 3104 | 0x0333); |
| 2970 | 3105 | ||
| 3106 | |||
| 3107 | } | ||
| 3108 | bnx2x_cl45_read(bp, params->port, | ||
| 3109 | ext_phy_type, | ||
| 3110 | ext_phy_addr, | ||
| 3111 | MDIO_PMA_DEVAD, | ||
| 3112 | 0xc820, | ||
| 3113 | &link_status); | ||
| 3114 | |||
| 3115 | /* Bits 0..2 --> speed detected, | ||
| 3116 | bits 13..15--> link is down */ | ||
| 3117 | if ((link_status & (1<<2)) && | ||
| 3118 | (!(link_status & (1<<15)))) { | ||
| 3119 | ext_phy_link_up = 1; | ||
| 3120 | vars->line_speed = SPEED_10000; | ||
| 3121 | DP(NETIF_MSG_LINK, | ||
| 3122 | "port %x: External link" | ||
| 3123 | " up in 10G\n", params->port); | ||
| 3124 | } else if ((link_status & (1<<1)) && | ||
| 3125 | (!(link_status & (1<<14)))) { | ||
| 3126 | ext_phy_link_up = 1; | ||
| 3127 | vars->line_speed = SPEED_2500; | ||
| 3128 | DP(NETIF_MSG_LINK, | ||
| 3129 | "port %x: External link" | ||
| 3130 | " up in 2.5G\n", params->port); | ||
| 3131 | } else if ((link_status & (1<<0)) && | ||
| 3132 | (!(link_status & (1<<13)))) { | ||
| 3133 | ext_phy_link_up = 1; | ||
| 3134 | vars->line_speed = SPEED_1000; | ||
| 3135 | DP(NETIF_MSG_LINK, | ||
| 3136 | "port %x: External link" | ||
| 3137 | " up in 1G\n", params->port); | ||
| 3138 | } else { | ||
| 3139 | ext_phy_link_up = 0; | ||
| 3140 | DP(NETIF_MSG_LINK, | ||
| 3141 | "port %x: External link" | ||
| 3142 | " is down\n", params->port); | ||
| 3143 | } | ||
| 3144 | } else { | ||
| 3145 | /* See if 1G link is up for the 8072 */ | ||
| 3146 | bnx2x_cl45_read(bp, params->port, | ||
| 3147 | ext_phy_type, | ||
| 3148 | ext_phy_addr, | ||
| 3149 | MDIO_AN_DEVAD, | ||
| 3150 | 0x8304, | ||
| 3151 | &an1000_status); | ||
| 3152 | bnx2x_cl45_read(bp, params->port, | ||
| 3153 | ext_phy_type, | ||
| 3154 | ext_phy_addr, | ||
| 3155 | MDIO_AN_DEVAD, | ||
| 3156 | 0x8304, | ||
| 3157 | &an1000_status); | ||
| 3158 | if (an1000_status & (1<<1)) { | ||
| 3159 | ext_phy_link_up = 1; | ||
| 3160 | vars->line_speed = SPEED_1000; | ||
| 3161 | DP(NETIF_MSG_LINK, | ||
| 3162 | "port %x: External link" | ||
| 3163 | " up in 1G\n", params->port); | ||
| 3164 | } else if (ext_phy_link_up) { | ||
| 3165 | ext_phy_link_up = 1; | ||
| 3166 | vars->line_speed = SPEED_10000; | ||
| 3167 | DP(NETIF_MSG_LINK, | ||
| 3168 | "port %x: External link" | ||
| 3169 | " up in 10G\n", params->port); | ||
| 2971 | } | 3170 | } |
| 2972 | } | 3171 | } |
| 3172 | |||
| 3173 | |||
| 2973 | break; | 3174 | break; |
| 2974 | } | 3175 | } |
| 2975 | case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101: | 3176 | case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101: |
| @@ -3006,6 +3207,7 @@ static u8 bnx2x_ext_phy_is_link_up(struct link_params *params, | |||
| 3006 | MDIO_AN_DEVAD, | 3207 | MDIO_AN_DEVAD, |
| 3007 | MDIO_AN_REG_MASTER_STATUS, | 3208 | MDIO_AN_REG_MASTER_STATUS, |
| 3008 | &val2); | 3209 | &val2); |
| 3210 | vars->line_speed = SPEED_10000; | ||
| 3009 | DP(NETIF_MSG_LINK, | 3211 | DP(NETIF_MSG_LINK, |
| 3010 | "SFX7101 AN status 0x%x->Master=%x\n", | 3212 | "SFX7101 AN status 0x%x->Master=%x\n", |
| 3011 | val2, | 3213 | val2, |
| @@ -3100,7 +3302,7 @@ static void bnx2x_link_int_enable(struct link_params *params) | |||
| 3100 | * link management | 3302 | * link management |
| 3101 | */ | 3303 | */ |
| 3102 | static void bnx2x_link_int_ack(struct link_params *params, | 3304 | static void bnx2x_link_int_ack(struct link_params *params, |
| 3103 | struct link_vars *vars, u16 is_10g) | 3305 | struct link_vars *vars, u8 is_10g) |
| 3104 | { | 3306 | { |
| 3105 | struct bnx2x *bp = params->bp; | 3307 | struct bnx2x *bp = params->bp; |
| 3106 | u8 port = params->port; | 3308 | u8 port = params->port; |
| @@ -3181,7 +3383,8 @@ static u8 bnx2x_format_ver(u32 num, u8 *str, u16 len) | |||
| 3181 | } | 3383 | } |
| 3182 | 3384 | ||
| 3183 | 3385 | ||
| 3184 | static void bnx2x_turn_on_sf(struct bnx2x *bp, u8 port, u8 ext_phy_addr) | 3386 | static void bnx2x_turn_on_ef(struct bnx2x *bp, u8 port, u8 ext_phy_addr, |
| 3387 | u32 ext_phy_type) | ||
| 3185 | { | 3388 | { |
| 3186 | u32 cnt = 0; | 3389 | u32 cnt = 0; |
| 3187 | u16 ctrl = 0; | 3390 | u16 ctrl = 0; |
| @@ -3192,12 +3395,14 @@ static void bnx2x_turn_on_sf(struct bnx2x *bp, u8 port, u8 ext_phy_addr) | |||
| 3192 | 3395 | ||
| 3193 | /* take ext phy out of reset */ | 3396 | /* take ext phy out of reset */ |
| 3194 | bnx2x_set_gpio(bp, | 3397 | bnx2x_set_gpio(bp, |
| 3195 | MISC_REGISTERS_GPIO_2, | 3398 | MISC_REGISTERS_GPIO_2, |
| 3196 | MISC_REGISTERS_GPIO_HIGH); | 3399 | MISC_REGISTERS_GPIO_HIGH, |
| 3400 | port); | ||
| 3197 | 3401 | ||
| 3198 | bnx2x_set_gpio(bp, | 3402 | bnx2x_set_gpio(bp, |
| 3199 | MISC_REGISTERS_GPIO_1, | 3403 | MISC_REGISTERS_GPIO_1, |
| 3200 | MISC_REGISTERS_GPIO_HIGH); | 3404 | MISC_REGISTERS_GPIO_HIGH, |
| 3405 | port); | ||
| 3201 | 3406 | ||
| 3202 | /* wait for 5ms */ | 3407 | /* wait for 5ms */ |
| 3203 | msleep(5); | 3408 | msleep(5); |
| @@ -3205,7 +3410,7 @@ static void bnx2x_turn_on_sf(struct bnx2x *bp, u8 port, u8 ext_phy_addr) | |||
| 3205 | for (cnt = 0; cnt < 1000; cnt++) { | 3410 | for (cnt = 0; cnt < 1000; cnt++) { |
| 3206 | msleep(1); | 3411 | msleep(1); |
| 3207 | bnx2x_cl45_read(bp, port, | 3412 | bnx2x_cl45_read(bp, port, |
| 3208 | PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101, | 3413 | ext_phy_type, |
| 3209 | ext_phy_addr, | 3414 | ext_phy_addr, |
| 3210 | MDIO_PMA_DEVAD, | 3415 | MDIO_PMA_DEVAD, |
| 3211 | MDIO_PMA_REG_CTRL, | 3416 | MDIO_PMA_REG_CTRL, |
| @@ -3217,13 +3422,17 @@ static void bnx2x_turn_on_sf(struct bnx2x *bp, u8 port, u8 ext_phy_addr) | |||
| 3217 | } | 3422 | } |
| 3218 | } | 3423 | } |
| 3219 | 3424 | ||
| 3220 | static void bnx2x_turn_off_sf(struct bnx2x *bp) | 3425 | static void bnx2x_turn_off_sf(struct bnx2x *bp, u8 port) |
| 3221 | { | 3426 | { |
| 3222 | /* put sf to reset */ | 3427 | /* put sf to reset */ |
| 3223 | bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_1, MISC_REGISTERS_GPIO_LOW); | ||
| 3224 | bnx2x_set_gpio(bp, | 3428 | bnx2x_set_gpio(bp, |
| 3225 | MISC_REGISTERS_GPIO_2, | 3429 | MISC_REGISTERS_GPIO_1, |
| 3226 | MISC_REGISTERS_GPIO_LOW); | 3430 | MISC_REGISTERS_GPIO_LOW, |
| 3431 | port); | ||
| 3432 | bnx2x_set_gpio(bp, | ||
| 3433 | MISC_REGISTERS_GPIO_2, | ||
| 3434 | MISC_REGISTERS_GPIO_LOW, | ||
| 3435 | port); | ||
| 3227 | } | 3436 | } |
| 3228 | 3437 | ||
| 3229 | u8 bnx2x_get_ext_phy_fw_version(struct link_params *params, u8 driver_loaded, | 3438 | u8 bnx2x_get_ext_phy_fw_version(struct link_params *params, u8 driver_loaded, |
| @@ -3253,7 +3462,8 @@ u8 bnx2x_get_ext_phy_fw_version(struct link_params *params, u8 driver_loaded, | |||
| 3253 | 3462 | ||
| 3254 | /* Take ext phy out of reset */ | 3463 | /* Take ext phy out of reset */ |
| 3255 | if (!driver_loaded) | 3464 | if (!driver_loaded) |
| 3256 | bnx2x_turn_on_sf(bp, params->port, ext_phy_addr); | 3465 | bnx2x_turn_on_ef(bp, params->port, ext_phy_addr, |
| 3466 | ext_phy_type); | ||
| 3257 | 3467 | ||
| 3258 | /* wait for 1ms */ | 3468 | /* wait for 1ms */ |
| 3259 | msleep(1); | 3469 | msleep(1); |
| @@ -3276,11 +3486,16 @@ u8 bnx2x_get_ext_phy_fw_version(struct link_params *params, u8 driver_loaded, | |||
| 3276 | version[4] = '\0'; | 3486 | version[4] = '\0'; |
| 3277 | 3487 | ||
| 3278 | if (!driver_loaded) | 3488 | if (!driver_loaded) |
| 3279 | bnx2x_turn_off_sf(bp); | 3489 | bnx2x_turn_off_sf(bp, params->port); |
| 3280 | break; | 3490 | break; |
| 3281 | case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8072: | 3491 | case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8072: |
| 3282 | case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073: | 3492 | case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073: |
| 3283 | { | 3493 | { |
| 3494 | /* Take ext phy out of reset */ | ||
| 3495 | if (!driver_loaded) | ||
| 3496 | bnx2x_turn_on_ef(bp, params->port, ext_phy_addr, | ||
| 3497 | ext_phy_type); | ||
| 3498 | |||
| 3284 | bnx2x_cl45_read(bp, params->port, ext_phy_type, | 3499 | bnx2x_cl45_read(bp, params->port, ext_phy_type, |
| 3285 | ext_phy_addr, | 3500 | ext_phy_addr, |
| 3286 | MDIO_PMA_DEVAD, | 3501 | MDIO_PMA_DEVAD, |
| @@ -3333,7 +3548,7 @@ static void bnx2x_set_xgxs_loopback(struct link_params *params, | |||
| 3333 | struct bnx2x *bp = params->bp; | 3548 | struct bnx2x *bp = params->bp; |
| 3334 | 3549 | ||
| 3335 | if (is_10g) { | 3550 | if (is_10g) { |
| 3336 | u32 md_devad; | 3551 | u32 md_devad; |
| 3337 | 3552 | ||
| 3338 | DP(NETIF_MSG_LINK, "XGXS 10G loopback enable\n"); | 3553 | DP(NETIF_MSG_LINK, "XGXS 10G loopback enable\n"); |
| 3339 | 3554 | ||
| @@ -3553,6 +3768,8 @@ u8 bnx2x_set_led(struct bnx2x *bp, u8 port, u8 mode, u32 speed, | |||
| 3553 | u16 hw_led_mode, u32 chip_id) | 3768 | u16 hw_led_mode, u32 chip_id) |
| 3554 | { | 3769 | { |
| 3555 | u8 rc = 0; | 3770 | u8 rc = 0; |
| 3771 | u32 tmp; | ||
| 3772 | u32 emac_base = port ? GRCBASE_EMAC1 : GRCBASE_EMAC0; | ||
| 3556 | DP(NETIF_MSG_LINK, "bnx2x_set_led: port %x, mode %d\n", port, mode); | 3773 | DP(NETIF_MSG_LINK, "bnx2x_set_led: port %x, mode %d\n", port, mode); |
| 3557 | DP(NETIF_MSG_LINK, "speed 0x%x, hw_led_mode 0x%x\n", | 3774 | DP(NETIF_MSG_LINK, "speed 0x%x, hw_led_mode 0x%x\n", |
| 3558 | speed, hw_led_mode); | 3775 | speed, hw_led_mode); |
| @@ -3561,6 +3778,9 @@ u8 bnx2x_set_led(struct bnx2x *bp, u8 port, u8 mode, u32 speed, | |||
| 3561 | REG_WR(bp, NIG_REG_LED_10G_P0 + port*4, 0); | 3778 | REG_WR(bp, NIG_REG_LED_10G_P0 + port*4, 0); |
| 3562 | REG_WR(bp, NIG_REG_LED_MODE_P0 + port*4, | 3779 | REG_WR(bp, NIG_REG_LED_MODE_P0 + port*4, |
| 3563 | SHARED_HW_CFG_LED_MAC1); | 3780 | SHARED_HW_CFG_LED_MAC1); |
| 3781 | |||
| 3782 | tmp = EMAC_RD(bp, EMAC_REG_EMAC_LED); | ||
| 3783 | EMAC_WR(bp, EMAC_REG_EMAC_LED, (tmp | EMAC_LED_OVERRIDE)); | ||
| 3564 | break; | 3784 | break; |
| 3565 | 3785 | ||
| 3566 | case LED_MODE_OPER: | 3786 | case LED_MODE_OPER: |
| @@ -3572,6 +3792,10 @@ u8 bnx2x_set_led(struct bnx2x *bp, u8 port, u8 mode, u32 speed, | |||
| 3572 | LED_BLINK_RATE_VAL); | 3792 | LED_BLINK_RATE_VAL); |
| 3573 | REG_WR(bp, NIG_REG_LED_CONTROL_BLINK_RATE_ENA_P0 + | 3793 | REG_WR(bp, NIG_REG_LED_CONTROL_BLINK_RATE_ENA_P0 + |
| 3574 | port*4, 1); | 3794 | port*4, 1); |
| 3795 | tmp = EMAC_RD(bp, EMAC_REG_EMAC_LED); | ||
| 3796 | EMAC_WR(bp, EMAC_REG_EMAC_LED, | ||
| 3797 | (tmp & (~EMAC_LED_OVERRIDE))); | ||
| 3798 | |||
| 3575 | if (!CHIP_IS_E1H(bp) && | 3799 | if (!CHIP_IS_E1H(bp) && |
| 3576 | ((speed == SPEED_2500) || | 3800 | ((speed == SPEED_2500) || |
| 3577 | (speed == SPEED_1000) || | 3801 | (speed == SPEED_1000) || |
| @@ -3622,7 +3846,8 @@ static u8 bnx2x_link_initialize(struct link_params *params, | |||
| 3622 | struct bnx2x *bp = params->bp; | 3846 | struct bnx2x *bp = params->bp; |
| 3623 | u8 port = params->port; | 3847 | u8 port = params->port; |
| 3624 | u8 rc = 0; | 3848 | u8 rc = 0; |
| 3625 | 3849 | u8 non_ext_phy; | |
| 3850 | u32 ext_phy_type = XGXS_EXT_PHY_TYPE(params->ext_phy_config); | ||
| 3626 | /* Activate the external PHY */ | 3851 | /* Activate the external PHY */ |
| 3627 | bnx2x_ext_phy_reset(params, vars); | 3852 | bnx2x_ext_phy_reset(params, vars); |
| 3628 | 3853 | ||
| @@ -3644,10 +3869,6 @@ static u8 bnx2x_link_initialize(struct link_params *params, | |||
| 3644 | bnx2x_set_swap_lanes(params); | 3869 | bnx2x_set_swap_lanes(params); |
| 3645 | } | 3870 | } |
| 3646 | 3871 | ||
| 3647 | /* Set Parallel Detect */ | ||
| 3648 | if (params->req_line_speed == SPEED_AUTO_NEG) | ||
| 3649 | bnx2x_set_parallel_detection(params, vars->phy_flags); | ||
| 3650 | |||
| 3651 | if (vars->phy_flags & PHY_XGXS_FLAG) { | 3872 | if (vars->phy_flags & PHY_XGXS_FLAG) { |
| 3652 | if (params->req_line_speed && | 3873 | if (params->req_line_speed && |
| 3653 | ((params->req_line_speed == SPEED_100) || | 3874 | ((params->req_line_speed == SPEED_100) || |
| @@ -3657,68 +3878,33 @@ static u8 bnx2x_link_initialize(struct link_params *params, | |||
| 3657 | vars->phy_flags &= ~PHY_SGMII_FLAG; | 3878 | vars->phy_flags &= ~PHY_SGMII_FLAG; |
| 3658 | } | 3879 | } |
| 3659 | } | 3880 | } |
| 3881 | /* In case of external phy existance, the line speed would be the | ||
| 3882 | line speed linked up by the external phy. In case it is direct only, | ||
| 3883 | then the line_speed during initialization will be equal to the | ||
| 3884 | req_line_speed*/ | ||
| 3885 | vars->line_speed = params->req_line_speed; | ||
| 3660 | 3886 | ||
| 3661 | if (!(vars->phy_flags & PHY_SGMII_FLAG)) { | 3887 | bnx2x_calc_ieee_aneg_adv(params, &vars->ieee_fc); |
| 3662 | u16 bank, rx_eq; | ||
| 3663 | |||
| 3664 | rx_eq = ((params->serdes_config & | ||
| 3665 | PORT_HW_CFG_SERDES_RX_DRV_EQUALIZER_MASK) >> | ||
| 3666 | PORT_HW_CFG_SERDES_RX_DRV_EQUALIZER_SHIFT); | ||
| 3667 | 3888 | ||
| 3668 | DP(NETIF_MSG_LINK, "setting rx eq to 0x%x\n", rx_eq); | 3889 | /* init ext phy and enable link state int */ |
| 3669 | for (bank = MDIO_REG_BANK_RX0; bank <= MDIO_REG_BANK_RX_ALL; | 3890 | non_ext_phy = ((ext_phy_type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_DIRECT) || |
| 3670 | bank += (MDIO_REG_BANK_RX1-MDIO_REG_BANK_RX0)) { | 3891 | (params->loopback_mode == LOOPBACK_XGXS_10) || |
| 3671 | CL45_WR_OVER_CL22(bp, port, | 3892 | (params->loopback_mode == LOOPBACK_EXT_PHY)); |
| 3672 | params->phy_addr, | 3893 | |
| 3673 | bank , | 3894 | if (non_ext_phy || |
| 3674 | MDIO_RX0_RX_EQ_BOOST, | 3895 | (ext_phy_type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8705)) { |
| 3675 | ((rx_eq & | 3896 | if (params->req_line_speed == SPEED_AUTO_NEG) |
| 3676 | MDIO_RX0_RX_EQ_BOOST_EQUALIZER_CTRL_MASK) | | 3897 | bnx2x_set_parallel_detection(params, vars->phy_flags); |
| 3677 | MDIO_RX0_RX_EQ_BOOST_OFFSET_CTRL)); | 3898 | bnx2x_init_internal_phy(params, vars); |
| 3678 | } | ||
| 3679 | |||
| 3680 | /* forced speed requested? */ | ||
| 3681 | if (params->req_line_speed != SPEED_AUTO_NEG) { | ||
| 3682 | DP(NETIF_MSG_LINK, "not SGMII, no AN\n"); | ||
| 3683 | |||
| 3684 | /* disable autoneg */ | ||
| 3685 | bnx2x_set_autoneg(params, vars); | ||
| 3686 | |||
| 3687 | /* program speed and duplex */ | ||
| 3688 | bnx2x_program_serdes(params); | ||
| 3689 | vars->ieee_fc = | ||
| 3690 | MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_NONE; | ||
| 3691 | |||
| 3692 | } else { /* AN_mode */ | ||
| 3693 | DP(NETIF_MSG_LINK, "not SGMII, AN\n"); | ||
| 3694 | |||
| 3695 | /* AN enabled */ | ||
| 3696 | bnx2x_set_brcm_cl37_advertisment(params); | ||
| 3697 | |||
| 3698 | /* program duplex & pause advertisement (for aneg) */ | ||
| 3699 | bnx2x_set_ieee_aneg_advertisment(params, | ||
| 3700 | &vars->ieee_fc); | ||
| 3701 | |||
| 3702 | /* enable autoneg */ | ||
| 3703 | bnx2x_set_autoneg(params, vars); | ||
| 3704 | |||
| 3705 | /* enable and restart AN */ | ||
| 3706 | bnx2x_restart_autoneg(params); | ||
| 3707 | } | ||
| 3708 | |||
| 3709 | } else { /* SGMII mode */ | ||
| 3710 | DP(NETIF_MSG_LINK, "SGMII\n"); | ||
| 3711 | |||
| 3712 | bnx2x_initialize_sgmii_process(params); | ||
| 3713 | } | 3899 | } |
| 3714 | 3900 | ||
| 3715 | /* init ext phy and enable link state int */ | 3901 | if (!non_ext_phy) |
| 3716 | rc |= bnx2x_ext_phy_init(params, vars); | 3902 | rc |= bnx2x_ext_phy_init(params, vars); |
| 3717 | 3903 | ||
| 3718 | bnx2x_bits_dis(bp, NIG_REG_STATUS_INTERRUPT_PORT0 + port*4, | 3904 | bnx2x_bits_dis(bp, NIG_REG_STATUS_INTERRUPT_PORT0 + port*4, |
| 3719 | (NIG_STATUS_XGXS0_LINK10G | | 3905 | (NIG_STATUS_XGXS0_LINK10G | |
| 3720 | NIG_STATUS_XGXS0_LINK_STATUS | | 3906 | NIG_STATUS_XGXS0_LINK_STATUS | |
| 3721 | NIG_STATUS_SERDES0_LINK_STATUS)); | 3907 | NIG_STATUS_SERDES0_LINK_STATUS)); |
| 3722 | 3908 | ||
| 3723 | return rc; | 3909 | return rc; |
| 3724 | 3910 | ||
| @@ -3730,15 +3916,23 @@ u8 bnx2x_phy_init(struct link_params *params, struct link_vars *vars) | |||
| 3730 | struct bnx2x *bp = params->bp; | 3916 | struct bnx2x *bp = params->bp; |
| 3731 | 3917 | ||
| 3732 | u32 val; | 3918 | u32 val; |
| 3733 | DP(NETIF_MSG_LINK, "Phy Initialization started\n"); | 3919 | DP(NETIF_MSG_LINK, "Phy Initialization started \n"); |
| 3734 | DP(NETIF_MSG_LINK, "req_speed = %d, req_flowctrl=%d\n", | 3920 | DP(NETIF_MSG_LINK, "req_speed = %d, req_flowctrl=%d\n", |
| 3735 | params->req_line_speed, params->req_flow_ctrl); | 3921 | params->req_line_speed, params->req_flow_ctrl); |
| 3736 | vars->link_status = 0; | 3922 | vars->link_status = 0; |
| 3923 | vars->phy_link_up = 0; | ||
| 3924 | vars->link_up = 0; | ||
| 3925 | vars->line_speed = 0; | ||
| 3926 | vars->duplex = DUPLEX_FULL; | ||
| 3927 | vars->flow_ctrl = FLOW_CTRL_NONE; | ||
| 3928 | vars->mac_type = MAC_TYPE_NONE; | ||
| 3929 | |||
| 3737 | if (params->switch_cfg == SWITCH_CFG_1G) | 3930 | if (params->switch_cfg == SWITCH_CFG_1G) |
| 3738 | vars->phy_flags = PHY_SERDES_FLAG; | 3931 | vars->phy_flags = PHY_SERDES_FLAG; |
| 3739 | else | 3932 | else |
| 3740 | vars->phy_flags = PHY_XGXS_FLAG; | 3933 | vars->phy_flags = PHY_XGXS_FLAG; |
| 3741 | 3934 | ||
| 3935 | |||
| 3742 | /* disable attentions */ | 3936 | /* disable attentions */ |
| 3743 | bnx2x_bits_dis(bp, NIG_REG_MASK_INTERRUPT_PORT0 + params->port*4, | 3937 | bnx2x_bits_dis(bp, NIG_REG_MASK_INTERRUPT_PORT0 + params->port*4, |
| 3744 | (NIG_MASK_XGXS0_LINK_STATUS | | 3938 | (NIG_MASK_XGXS0_LINK_STATUS | |
| @@ -3894,6 +4088,7 @@ u8 bnx2x_phy_init(struct link_params *params, struct link_vars *vars) | |||
| 3894 | } | 4088 | } |
| 3895 | 4089 | ||
| 3896 | bnx2x_link_initialize(params, vars); | 4090 | bnx2x_link_initialize(params, vars); |
| 4091 | msleep(30); | ||
| 3897 | bnx2x_link_int_enable(params); | 4092 | bnx2x_link_int_enable(params); |
| 3898 | } | 4093 | } |
| 3899 | return 0; | 4094 | return 0; |
| @@ -3943,39 +4138,22 @@ u8 bnx2x_link_reset(struct link_params *params, struct link_vars *vars) | |||
| 3943 | /* HW reset */ | 4138 | /* HW reset */ |
| 3944 | 4139 | ||
| 3945 | bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_1, | 4140 | bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_1, |
| 3946 | MISC_REGISTERS_GPIO_OUTPUT_LOW); | 4141 | MISC_REGISTERS_GPIO_OUTPUT_LOW, |
| 4142 | port); | ||
| 3947 | 4143 | ||
| 3948 | bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2, | 4144 | bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2, |
| 3949 | MISC_REGISTERS_GPIO_OUTPUT_LOW); | 4145 | MISC_REGISTERS_GPIO_OUTPUT_LOW, |
| 4146 | port); | ||
| 3950 | 4147 | ||
| 3951 | DP(NETIF_MSG_LINK, "reset external PHY\n"); | 4148 | DP(NETIF_MSG_LINK, "reset external PHY\n"); |
| 3952 | } else { | 4149 | } else if (ext_phy_type == |
| 3953 | 4150 | PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073) { | |
| 3954 | u8 ext_phy_addr = ((ext_phy_config & | 4151 | DP(NETIF_MSG_LINK, "Setting 8073 port %d into " |
| 3955 | PORT_HW_CFG_XGXS_EXT_PHY_ADDR_MASK) >> | ||
| 3956 | PORT_HW_CFG_XGXS_EXT_PHY_ADDR_SHIFT); | ||
| 3957 | |||
| 3958 | /* SW reset */ | ||
| 3959 | bnx2x_cl45_write(bp, port, ext_phy_type, ext_phy_addr, | ||
| 3960 | MDIO_PMA_DEVAD, | ||
| 3961 | MDIO_PMA_REG_CTRL, | ||
| 3962 | 1<<15); | ||
| 3963 | |||
| 3964 | /* Set Low Power Mode */ | ||
| 3965 | bnx2x_cl45_write(bp, port, ext_phy_type, ext_phy_addr, | ||
| 3966 | MDIO_PMA_DEVAD, | ||
| 3967 | MDIO_PMA_REG_CTRL, | ||
| 3968 | 1<<11); | ||
| 3969 | |||
| 3970 | |||
| 3971 | if (ext_phy_type == | ||
| 3972 | PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073) { | ||
| 3973 | DP(NETIF_MSG_LINK, "Setting 8073 port %d into" | ||
| 3974 | "low power mode\n", | 4152 | "low power mode\n", |
| 3975 | port); | 4153 | port); |
| 3976 | bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2, | 4154 | bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2, |
| 3977 | MISC_REGISTERS_GPIO_OUTPUT_LOW); | 4155 | MISC_REGISTERS_GPIO_OUTPUT_LOW, |
| 3978 | } | 4156 | port); |
| 3979 | } | 4157 | } |
| 3980 | } | 4158 | } |
| 3981 | /* reset the SerDes/XGXS */ | 4159 | /* reset the SerDes/XGXS */ |
| @@ -3995,6 +4173,73 @@ u8 bnx2x_link_reset(struct link_params *params, struct link_vars *vars) | |||
| 3995 | return 0; | 4173 | return 0; |
| 3996 | } | 4174 | } |
| 3997 | 4175 | ||
| 4176 | static u8 bnx2x_update_link_down(struct link_params *params, | ||
| 4177 | struct link_vars *vars) | ||
| 4178 | { | ||
| 4179 | struct bnx2x *bp = params->bp; | ||
| 4180 | u8 port = params->port; | ||
| 4181 | DP(NETIF_MSG_LINK, "Port %x: Link is down\n", port); | ||
| 4182 | bnx2x_set_led(bp, port, LED_MODE_OFF, | ||
| 4183 | 0, params->hw_led_mode, | ||
| 4184 | params->chip_id); | ||
| 4185 | |||
| 4186 | /* indicate no mac active */ | ||
| 4187 | vars->mac_type = MAC_TYPE_NONE; | ||
| 4188 | |||
| 4189 | /* update shared memory */ | ||
| 4190 | vars->link_status = 0; | ||
| 4191 | vars->line_speed = 0; | ||
| 4192 | bnx2x_update_mng(params, vars->link_status); | ||
| 4193 | |||
| 4194 | /* activate nig drain */ | ||
| 4195 | REG_WR(bp, NIG_REG_EGRESS_DRAIN0_MODE + port*4, 1); | ||
| 4196 | |||
| 4197 | /* reset BigMac */ | ||
| 4198 | bnx2x_bmac_rx_disable(bp, params->port); | ||
| 4199 | REG_WR(bp, GRCBASE_MISC + | ||
| 4200 | MISC_REGISTERS_RESET_REG_2_CLEAR, | ||
| 4201 | (MISC_REGISTERS_RESET_REG_2_RST_BMAC0 << port)); | ||
| 4202 | return 0; | ||
| 4203 | } | ||
| 4204 | |||
| 4205 | static u8 bnx2x_update_link_up(struct link_params *params, | ||
| 4206 | struct link_vars *vars, | ||
| 4207 | u8 link_10g, u32 gp_status) | ||
| 4208 | { | ||
| 4209 | struct bnx2x *bp = params->bp; | ||
| 4210 | u8 port = params->port; | ||
| 4211 | u8 rc = 0; | ||
| 4212 | vars->link_status |= LINK_STATUS_LINK_UP; | ||
| 4213 | if (link_10g) { | ||
| 4214 | bnx2x_bmac_enable(params, vars, 0); | ||
| 4215 | bnx2x_set_led(bp, port, LED_MODE_OPER, | ||
| 4216 | SPEED_10000, params->hw_led_mode, | ||
| 4217 | params->chip_id); | ||
| 4218 | |||
| 4219 | } else { | ||
| 4220 | bnx2x_emac_enable(params, vars, 0); | ||
| 4221 | rc = bnx2x_emac_program(params, vars->line_speed, | ||
| 4222 | vars->duplex); | ||
| 4223 | |||
| 4224 | /* AN complete? */ | ||
| 4225 | if (gp_status & MDIO_AN_CL73_OR_37_COMPLETE) { | ||
| 4226 | if (!(vars->phy_flags & | ||
| 4227 | PHY_SGMII_FLAG)) | ||
| 4228 | bnx2x_set_sgmii_tx_driver(params); | ||
| 4229 | } | ||
| 4230 | } | ||
| 4231 | |||
| 4232 | /* PBF - link up */ | ||
| 4233 | rc |= bnx2x_pbf_update(params, vars->flow_ctrl, | ||
| 4234 | vars->line_speed); | ||
| 4235 | |||
| 4236 | /* disable drain */ | ||
| 4237 | REG_WR(bp, NIG_REG_EGRESS_DRAIN0_MODE + port*4, 0); | ||
| 4238 | |||
| 4239 | /* update shared memory */ | ||
| 4240 | bnx2x_update_mng(params, vars->link_status); | ||
| 4241 | return rc; | ||
| 4242 | } | ||
| 3998 | /* This function should called upon link interrupt */ | 4243 | /* This function should called upon link interrupt */ |
| 3999 | /* In case vars->link_up, driver needs to | 4244 | /* In case vars->link_up, driver needs to |
| 4000 | 1. Update the pbf | 4245 | 1. Update the pbf |
| @@ -4012,10 +4257,10 @@ u8 bnx2x_link_update(struct link_params *params, struct link_vars *vars) | |||
| 4012 | { | 4257 | { |
| 4013 | struct bnx2x *bp = params->bp; | 4258 | struct bnx2x *bp = params->bp; |
| 4014 | u8 port = params->port; | 4259 | u8 port = params->port; |
| 4015 | u16 i; | ||
| 4016 | u16 gp_status; | 4260 | u16 gp_status; |
| 4017 | u16 link_10g; | 4261 | u8 link_10g; |
| 4018 | u8 rc = 0; | 4262 | u8 ext_phy_link_up, rc = 0; |
| 4263 | u32 ext_phy_type; | ||
| 4019 | 4264 | ||
| 4020 | DP(NETIF_MSG_LINK, "port %x, XGXS?%x, int_status 0x%x\n", | 4265 | DP(NETIF_MSG_LINK, "port %x, XGXS?%x, int_status 0x%x\n", |
| 4021 | port, | 4266 | port, |
| @@ -4031,15 +4276,16 @@ u8 bnx2x_link_update(struct link_params *params, struct link_vars *vars) | |||
| 4031 | REG_RD(bp, NIG_REG_XGXS0_STATUS_LINK10G + port*0x68), | 4276 | REG_RD(bp, NIG_REG_XGXS0_STATUS_LINK10G + port*0x68), |
| 4032 | REG_RD(bp, NIG_REG_XGXS0_STATUS_LINK_STATUS + port*0x68)); | 4277 | REG_RD(bp, NIG_REG_XGXS0_STATUS_LINK_STATUS + port*0x68)); |
| 4033 | 4278 | ||
| 4279 | ext_phy_type = XGXS_EXT_PHY_TYPE(params->ext_phy_config); | ||
| 4034 | 4280 | ||
| 4035 | /* avoid fast toggling */ | 4281 | /* Check external link change only for non-direct */ |
| 4036 | for (i = 0; i < 10; i++) { | 4282 | ext_phy_link_up = bnx2x_ext_phy_is_link_up(params, vars); |
| 4037 | msleep(10); | 4283 | |
| 4038 | CL45_RD_OVER_CL22(bp, port, params->phy_addr, | 4284 | /* Read gp_status */ |
| 4039 | MDIO_REG_BANK_GP_STATUS, | 4285 | CL45_RD_OVER_CL22(bp, port, params->phy_addr, |
| 4040 | MDIO_GP_STATUS_TOP_AN_STATUS1, | 4286 | MDIO_REG_BANK_GP_STATUS, |
| 4041 | &gp_status); | 4287 | MDIO_GP_STATUS_TOP_AN_STATUS1, |
| 4042 | } | 4288 | &gp_status); |
| 4043 | 4289 | ||
| 4044 | rc = bnx2x_link_settings_status(params, vars, gp_status); | 4290 | rc = bnx2x_link_settings_status(params, vars, gp_status); |
| 4045 | if (rc != 0) | 4291 | if (rc != 0) |
| @@ -4055,73 +4301,177 @@ u8 bnx2x_link_update(struct link_params *params, struct link_vars *vars) | |||
| 4055 | 4301 | ||
| 4056 | bnx2x_link_int_ack(params, vars, link_10g); | 4302 | bnx2x_link_int_ack(params, vars, link_10g); |
| 4057 | 4303 | ||
| 4304 | /* In case external phy link is up, and internal link is down | ||
| 4305 | ( not initialized yet probably after link initialization, it needs | ||
| 4306 | to be initialized. | ||
| 4307 | Note that after link down-up as result of cable plug, | ||
| 4308 | the xgxs link would probably become up again without the need to | ||
| 4309 | initialize it*/ | ||
| 4310 | |||
| 4311 | if ((ext_phy_type != PORT_HW_CFG_SERDES_EXT_PHY_TYPE_DIRECT) && | ||
| 4312 | (ext_phy_type != PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8705) && | ||
| 4313 | (ext_phy_link_up && !vars->phy_link_up)) | ||
| 4314 | bnx2x_init_internal_phy(params, vars); | ||
| 4315 | |||
| 4058 | /* link is up only if both local phy and external phy are up */ | 4316 | /* link is up only if both local phy and external phy are up */ |
| 4059 | vars->link_up = (vars->phy_link_up && | 4317 | vars->link_up = (ext_phy_link_up && vars->phy_link_up); |
| 4060 | bnx2x_ext_phy_is_link_up(params, vars)); | ||
| 4061 | 4318 | ||
| 4062 | if (!vars->phy_link_up && | 4319 | if (vars->link_up) |
| 4063 | REG_RD(bp, NIG_REG_EMAC0_STATUS_MISC_MI_INT + port*0x18)) { | 4320 | rc = bnx2x_update_link_up(params, vars, link_10g, gp_status); |
| 4064 | bnx2x_ext_phy_is_link_up(params, vars); /* Clear interrupt */ | 4321 | else |
| 4322 | rc = bnx2x_update_link_down(params, vars); | ||
| 4323 | |||
| 4324 | return rc; | ||
| 4325 | } | ||
| 4326 | |||
| 4327 | static u8 bnx2x_8073_common_init_phy(struct bnx2x *bp, u32 shmem_base) | ||
| 4328 | { | ||
| 4329 | u8 ext_phy_addr[PORT_MAX]; | ||
| 4330 | u16 val; | ||
| 4331 | s8 port; | ||
| 4332 | |||
| 4333 | /* PART1 - Reset both phys */ | ||
| 4334 | for (port = PORT_MAX - 1; port >= PORT_0; port--) { | ||
| 4335 | /* Extract the ext phy address for the port */ | ||
| 4336 | u32 ext_phy_config = REG_RD(bp, shmem_base + | ||
| 4337 | offsetof(struct shmem_region, | ||
| 4338 | dev_info.port_hw_config[port].external_phy_config)); | ||
| 4339 | |||
| 4340 | /* disable attentions */ | ||
| 4341 | bnx2x_bits_dis(bp, NIG_REG_MASK_INTERRUPT_PORT0 + port*4, | ||
| 4342 | (NIG_MASK_XGXS0_LINK_STATUS | | ||
| 4343 | NIG_MASK_XGXS0_LINK10G | | ||
| 4344 | NIG_MASK_SERDES0_LINK_STATUS | | ||
| 4345 | NIG_MASK_MI_INT)); | ||
| 4346 | |||
| 4347 | ext_phy_addr[port] = | ||
| 4348 | ((ext_phy_config & | ||
| 4349 | PORT_HW_CFG_XGXS_EXT_PHY_ADDR_MASK) >> | ||
| 4350 | PORT_HW_CFG_XGXS_EXT_PHY_ADDR_SHIFT); | ||
| 4351 | |||
| 4352 | /* Need to take the phy out of low power mode in order | ||
| 4353 | to write to access its registers */ | ||
| 4354 | bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2, | ||
| 4355 | MISC_REGISTERS_GPIO_OUTPUT_HIGH, port); | ||
| 4356 | |||
| 4357 | /* Reset the phy */ | ||
| 4358 | bnx2x_cl45_write(bp, port, | ||
| 4359 | PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073, | ||
| 4360 | ext_phy_addr[port], | ||
| 4361 | MDIO_PMA_DEVAD, | ||
| 4362 | MDIO_PMA_REG_CTRL, | ||
| 4363 | 1<<15); | ||
| 4065 | } | 4364 | } |
| 4066 | 4365 | ||
| 4067 | if (vars->link_up) { | 4366 | /* Add delay of 150ms after reset */ |
| 4068 | vars->link_status |= LINK_STATUS_LINK_UP; | 4367 | msleep(150); |
| 4069 | if (link_10g) { | ||
| 4070 | bnx2x_bmac_enable(params, vars, 0); | ||
| 4071 | bnx2x_set_led(bp, port, LED_MODE_OPER, | ||
| 4072 | SPEED_10000, params->hw_led_mode, | ||
| 4073 | params->chip_id); | ||
| 4074 | 4368 | ||
| 4075 | } else { | 4369 | /* PART2 - Download firmware to both phys */ |
| 4076 | bnx2x_emac_enable(params, vars, 0); | 4370 | for (port = PORT_MAX - 1; port >= PORT_0; port--) { |
| 4077 | rc = bnx2x_emac_program(params, vars->line_speed, | 4371 | u16 fw_ver1; |
| 4078 | vars->duplex); | ||
| 4079 | 4372 | ||
| 4080 | /* AN complete? */ | 4373 | bnx2x_bcm8073_external_rom_boot(bp, port, |
| 4081 | if (gp_status & MDIO_AN_CL73_OR_37_COMPLETE) { | 4374 | ext_phy_addr[port]); |
| 4082 | if (!(vars->phy_flags & | 4375 | |
| 4083 | PHY_SGMII_FLAG)) | 4376 | bnx2x_cl45_read(bp, port, PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073, |
| 4084 | bnx2x_set_sgmii_tx_driver(params); | 4377 | ext_phy_addr[port], |
| 4085 | } | 4378 | MDIO_PMA_DEVAD, |
| 4379 | MDIO_PMA_REG_ROM_VER1, &fw_ver1); | ||
| 4380 | if (fw_ver1 == 0) { | ||
| 4381 | DP(NETIF_MSG_LINK, | ||
| 4382 | "bnx2x_8073_common_init_phy port %x " | ||
| 4383 | "fw Download failed\n", port); | ||
| 4384 | return -EINVAL; | ||
| 4086 | } | 4385 | } |
| 4087 | 4386 | ||
| 4088 | /* PBF - link up */ | 4387 | /* Only set bit 10 = 1 (Tx power down) */ |
| 4089 | rc |= bnx2x_pbf_update(params, vars->flow_ctrl, | 4388 | bnx2x_cl45_read(bp, port, |
| 4090 | vars->line_speed); | 4389 | PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073, |
| 4390 | ext_phy_addr[port], | ||
| 4391 | MDIO_PMA_DEVAD, | ||
| 4392 | MDIO_PMA_REG_TX_POWER_DOWN, &val); | ||
| 4091 | 4393 | ||
| 4092 | /* disable drain */ | 4394 | /* Phase1 of TX_POWER_DOWN reset */ |
| 4093 | REG_WR(bp, NIG_REG_EGRESS_DRAIN0_MODE + port*4, 0); | 4395 | bnx2x_cl45_write(bp, port, |
| 4396 | PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073, | ||
| 4397 | ext_phy_addr[port], | ||
| 4398 | MDIO_PMA_DEVAD, | ||
| 4399 | MDIO_PMA_REG_TX_POWER_DOWN, | ||
| 4400 | (val | 1<<10)); | ||
| 4401 | } | ||
| 4094 | 4402 | ||
| 4095 | /* update shared memory */ | 4403 | /* Toggle Transmitter: Power down and then up with 600ms |
| 4096 | bnx2x_update_mng(params, vars->link_status); | 4404 | delay between */ |
| 4405 | msleep(600); | ||
| 4097 | 4406 | ||
| 4098 | } else { /* link down */ | 4407 | /* PART3 - complete TX_POWER_DOWN process, and set GPIO2 back to low */ |
| 4099 | DP(NETIF_MSG_LINK, "Port %x: Link is down\n", params->port); | 4408 | for (port = PORT_MAX - 1; port >= PORT_0; port--) { |
| 4100 | bnx2x_set_led(bp, port, LED_MODE_OFF, | 4409 | /* Phase2 of POWER_DOWN_RESET*/ |
| 4101 | 0, params->hw_led_mode, | 4410 | /* Release bit 10 (Release Tx power down) */ |
| 4102 | params->chip_id); | 4411 | bnx2x_cl45_read(bp, port, |
| 4412 | PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073, | ||
| 4413 | ext_phy_addr[port], | ||
| 4414 | MDIO_PMA_DEVAD, | ||
| 4415 | MDIO_PMA_REG_TX_POWER_DOWN, &val); | ||
| 4103 | 4416 | ||
| 4104 | /* indicate no mac active */ | 4417 | bnx2x_cl45_write(bp, port, |
| 4105 | vars->mac_type = MAC_TYPE_NONE; | 4418 | PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073, |
| 4419 | ext_phy_addr[port], | ||
| 4420 | MDIO_PMA_DEVAD, | ||
| 4421 | MDIO_PMA_REG_TX_POWER_DOWN, (val & (~(1<<10)))); | ||
| 4422 | msleep(15); | ||
| 4106 | 4423 | ||
| 4107 | /* update shared memory */ | 4424 | /* Read modify write the SPI-ROM version select register */ |
| 4108 | vars->link_status = 0; | 4425 | bnx2x_cl45_read(bp, port, |
| 4109 | bnx2x_update_mng(params, vars->link_status); | 4426 | PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073, |
| 4427 | ext_phy_addr[port], | ||
| 4428 | MDIO_PMA_DEVAD, | ||
| 4429 | MDIO_PMA_REG_EDC_FFE_MAIN, &val); | ||
| 4430 | bnx2x_cl45_write(bp, port, | ||
| 4431 | PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073, | ||
| 4432 | ext_phy_addr[port], | ||
| 4433 | MDIO_PMA_DEVAD, | ||
| 4434 | MDIO_PMA_REG_EDC_FFE_MAIN, (val | (1<<12))); | ||
| 4110 | 4435 | ||
| 4111 | /* activate nig drain */ | 4436 | /* set GPIO2 back to LOW */ |
| 4112 | REG_WR(bp, NIG_REG_EGRESS_DRAIN0_MODE + port*4, 1); | 4437 | bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2, |
| 4438 | MISC_REGISTERS_GPIO_OUTPUT_LOW, port); | ||
| 4439 | } | ||
| 4440 | return 0; | ||
| 4113 | 4441 | ||
| 4114 | /* reset BigMac */ | 4442 | } |
| 4115 | bnx2x_bmac_rx_disable(bp, params->port); | ||
| 4116 | REG_WR(bp, GRCBASE_MISC + | ||
| 4117 | MISC_REGISTERS_RESET_REG_2_CLEAR, | ||
| 4118 | (MISC_REGISTERS_RESET_REG_2_RST_BMAC0 << port)); | ||
| 4119 | 4443 | ||
| 4444 | u8 bnx2x_common_init_phy(struct bnx2x *bp, u32 shmem_base) | ||
| 4445 | { | ||
| 4446 | u8 rc = 0; | ||
| 4447 | u32 ext_phy_type; | ||
| 4448 | |||
| 4449 | DP(NETIF_MSG_LINK, "bnx2x_common_init_phy\n"); | ||
| 4450 | |||
| 4451 | /* Read the ext_phy_type for arbitrary port(0) */ | ||
| 4452 | ext_phy_type = XGXS_EXT_PHY_TYPE( | ||
| 4453 | REG_RD(bp, shmem_base + | ||
| 4454 | offsetof(struct shmem_region, | ||
| 4455 | dev_info.port_hw_config[0].external_phy_config))); | ||
| 4456 | |||
| 4457 | switch (ext_phy_type) { | ||
| 4458 | case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073: | ||
| 4459 | { | ||
| 4460 | rc = bnx2x_8073_common_init_phy(bp, shmem_base); | ||
| 4461 | break; | ||
| 4462 | } | ||
| 4463 | default: | ||
| 4464 | DP(NETIF_MSG_LINK, | ||
| 4465 | "bnx2x_common_init_phy: ext_phy 0x%x not required\n", | ||
| 4466 | ext_phy_type); | ||
| 4467 | break; | ||
| 4120 | } | 4468 | } |
| 4121 | 4469 | ||
| 4122 | return rc; | 4470 | return rc; |
| 4123 | } | 4471 | } |
| 4124 | 4472 | ||
| 4473 | |||
| 4474 | |||
| 4125 | static void bnx2x_sfx7101_sp_sw_reset(struct bnx2x *bp, u8 port, u8 phy_addr) | 4475 | static void bnx2x_sfx7101_sp_sw_reset(struct bnx2x *bp, u8 port, u8 phy_addr) |
| 4126 | { | 4476 | { |
| 4127 | u16 val, cnt; | 4477 | u16 val, cnt; |
| @@ -4154,7 +4504,7 @@ static void bnx2x_sfx7101_sp_sw_reset(struct bnx2x *bp, u8 port, u8 phy_addr) | |||
| 4154 | } | 4504 | } |
| 4155 | #define RESERVED_SIZE 256 | 4505 | #define RESERVED_SIZE 256 |
| 4156 | /* max application is 160K bytes - data at end of RAM */ | 4506 | /* max application is 160K bytes - data at end of RAM */ |
| 4157 | #define MAX_APP_SIZE 160*1024 - RESERVED_SIZE | 4507 | #define MAX_APP_SIZE (160*1024 - RESERVED_SIZE) |
| 4158 | 4508 | ||
| 4159 | /* Header is 14 bytes */ | 4509 | /* Header is 14 bytes */ |
| 4160 | #define HEADER_SIZE 14 | 4510 | #define HEADER_SIZE 14 |
| @@ -4192,12 +4542,12 @@ static u8 bnx2x_sfx7101_flash_download(struct bnx2x *bp, u8 port, | |||
| 4192 | size = MAX_APP_SIZE+HEADER_SIZE; | 4542 | size = MAX_APP_SIZE+HEADER_SIZE; |
| 4193 | } | 4543 | } |
| 4194 | DP(NETIF_MSG_LINK, "File version is %c%c\n", data[0x14e], data[0x14f]); | 4544 | DP(NETIF_MSG_LINK, "File version is %c%c\n", data[0x14e], data[0x14f]); |
| 4195 | DP(NETIF_MSG_LINK, " %c%c\n", data[0x150], data[0x151]); | 4545 | DP(NETIF_MSG_LINK, " %c%c\n", data[0x150], data[0x151]); |
| 4196 | /* Put the DSP in download mode by setting FLASH_CFG[2] to 1 | 4546 | /* Put the DSP in download mode by setting FLASH_CFG[2] to 1 |
| 4197 | and issuing a reset.*/ | 4547 | and issuing a reset.*/ |
| 4198 | 4548 | ||
| 4199 | bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_0, | 4549 | bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_0, |
| 4200 | MISC_REGISTERS_GPIO_HIGH); | 4550 | MISC_REGISTERS_GPIO_HIGH, port); |
| 4201 | 4551 | ||
| 4202 | bnx2x_sfx7101_sp_sw_reset(bp, port, ext_phy_addr); | 4552 | bnx2x_sfx7101_sp_sw_reset(bp, port, ext_phy_addr); |
| 4203 | 4553 | ||
| @@ -4429,7 +4779,8 @@ static u8 bnx2x_sfx7101_flash_download(struct bnx2x *bp, u8 port, | |||
| 4429 | } | 4779 | } |
| 4430 | 4780 | ||
| 4431 | /* DSP Remove Download Mode */ | 4781 | /* DSP Remove Download Mode */ |
| 4432 | bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_0, MISC_REGISTERS_GPIO_LOW); | 4782 | bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_0, |
| 4783 | MISC_REGISTERS_GPIO_LOW, port); | ||
| 4433 | 4784 | ||
| 4434 | bnx2x_sfx7101_sp_sw_reset(bp, port, ext_phy_addr); | 4785 | bnx2x_sfx7101_sp_sw_reset(bp, port, ext_phy_addr); |
| 4435 | 4786 | ||
| @@ -4437,7 +4788,7 @@ static u8 bnx2x_sfx7101_flash_download(struct bnx2x *bp, u8 port, | |||
| 4437 | for (cnt = 0; cnt < 100; cnt++) | 4788 | for (cnt = 0; cnt < 100; cnt++) |
| 4438 | msleep(5); | 4789 | msleep(5); |
| 4439 | 4790 | ||
| 4440 | bnx2x_hw_reset(bp); | 4791 | bnx2x_hw_reset(bp, port); |
| 4441 | 4792 | ||
| 4442 | for (cnt = 0; cnt < 100; cnt++) | 4793 | for (cnt = 0; cnt < 100; cnt++) |
| 4443 | msleep(5); | 4794 | msleep(5); |
| @@ -4473,7 +4824,7 @@ static u8 bnx2x_sfx7101_flash_download(struct bnx2x *bp, u8 port, | |||
| 4473 | MDIO_PMA_REG_7101_VER2, | 4824 | MDIO_PMA_REG_7101_VER2, |
| 4474 | &image_revision2); | 4825 | &image_revision2); |
| 4475 | 4826 | ||
| 4476 | if (data[0x14e] != (image_revision2&0xFF) || | 4827 | if (data[0x14e] != (image_revision2&0xFF) || |
| 4477 | data[0x14f] != ((image_revision2&0xFF00)>>8) || | 4828 | data[0x14f] != ((image_revision2&0xFF00)>>8) || |
| 4478 | data[0x150] != (image_revision1&0xFF) || | 4829 | data[0x150] != (image_revision1&0xFF) || |
| 4479 | data[0x151] != ((image_revision1&0xFF00)>>8)) { | 4830 | data[0x151] != ((image_revision1&0xFF00)>>8)) { |
| @@ -4508,11 +4859,11 @@ u8 bnx2x_flash_download(struct bnx2x *bp, u8 port, u32 ext_phy_config, | |||
| 4508 | case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101: | 4859 | case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101: |
| 4509 | /* Take ext phy out of reset */ | 4860 | /* Take ext phy out of reset */ |
| 4510 | if (!driver_loaded) | 4861 | if (!driver_loaded) |
| 4511 | bnx2x_turn_on_sf(bp, port, ext_phy_addr); | 4862 | bnx2x_turn_on_ef(bp, port, ext_phy_addr, ext_phy_type); |
| 4512 | rc = bnx2x_sfx7101_flash_download(bp, port, ext_phy_addr, | 4863 | rc = bnx2x_sfx7101_flash_download(bp, port, ext_phy_addr, |
| 4513 | data, size); | 4864 | data, size); |
| 4514 | if (!driver_loaded) | 4865 | if (!driver_loaded) |
| 4515 | bnx2x_turn_off_sf(bp); | 4866 | bnx2x_turn_off_sf(bp, port); |
| 4516 | break; | 4867 | break; |
| 4517 | case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_DIRECT: | 4868 | case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_DIRECT: |
| 4518 | case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_FAILURE: | 4869 | case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_FAILURE: |
diff --git a/drivers/net/bnx2x_link.h b/drivers/net/bnx2x_link.h index 714d37ac95de..86d54a17b411 100644 --- a/drivers/net/bnx2x_link.h +++ b/drivers/net/bnx2x_link.h | |||
| @@ -55,14 +55,17 @@ struct link_params { | |||
| 55 | #define LOOPBACK_BMAC 2 | 55 | #define LOOPBACK_BMAC 2 |
| 56 | #define LOOPBACK_XGXS_10 3 | 56 | #define LOOPBACK_XGXS_10 3 |
| 57 | #define LOOPBACK_EXT_PHY 4 | 57 | #define LOOPBACK_EXT_PHY 4 |
| 58 | #define LOOPBACK_EXT 5 | ||
| 58 | 59 | ||
| 59 | u16 req_duplex; | 60 | u16 req_duplex; |
| 60 | u16 req_flow_ctrl; | 61 | u16 req_flow_ctrl; |
| 62 | u16 req_fc_auto_adv; /* Should be set to TX / BOTH when | ||
| 63 | req_flow_ctrl is set to AUTO */ | ||
| 61 | u16 req_line_speed; /* Also determine AutoNeg */ | 64 | u16 req_line_speed; /* Also determine AutoNeg */ |
| 62 | 65 | ||
| 63 | /* Device parameters */ | 66 | /* Device parameters */ |
| 64 | u8 mac_addr[6]; | 67 | u8 mac_addr[6]; |
| 65 | u16 mtu; | 68 | |
| 66 | 69 | ||
| 67 | 70 | ||
| 68 | /* shmem parameters */ | 71 | /* shmem parameters */ |
| @@ -140,7 +143,7 @@ u8 bnx2x_cl45_write(struct bnx2x *bp, u8 port, u32 ext_phy_type, | |||
| 140 | u8 phy_addr, u8 devad, u16 reg, u16 val); | 143 | u8 phy_addr, u8 devad, u16 reg, u16 val); |
| 141 | 144 | ||
| 142 | /* Reads the link_status from the shmem, | 145 | /* Reads the link_status from the shmem, |
| 143 | and update the link vars accordinaly */ | 146 | and update the link vars accordingly */ |
| 144 | void bnx2x_link_status_update(struct link_params *input, | 147 | void bnx2x_link_status_update(struct link_params *input, |
| 145 | struct link_vars *output); | 148 | struct link_vars *output); |
| 146 | /* returns string representing the fw_version of the external phy */ | 149 | /* returns string representing the fw_version of the external phy */ |
| @@ -149,7 +152,7 @@ u8 bnx2x_get_ext_phy_fw_version(struct link_params *params, u8 driver_loaded, | |||
| 149 | 152 | ||
| 150 | /* Set/Unset the led | 153 | /* Set/Unset the led |
| 151 | Basically, the CLC takes care of the led for the link, but in case one needs | 154 | Basically, the CLC takes care of the led for the link, but in case one needs |
| 152 | to set/unset the led unnatually, set the "mode" to LED_MODE_OPER to | 155 | to set/unset the led unnaturally, set the "mode" to LED_MODE_OPER to |
| 153 | blink the led, and LED_MODE_OFF to set the led off.*/ | 156 | blink the led, and LED_MODE_OFF to set the led off.*/ |
| 154 | u8 bnx2x_set_led(struct bnx2x *bp, u8 port, u8 mode, u32 speed, | 157 | u8 bnx2x_set_led(struct bnx2x *bp, u8 port, u8 mode, u32 speed, |
| 155 | u16 hw_led_mode, u32 chip_id); | 158 | u16 hw_led_mode, u32 chip_id); |
| @@ -164,5 +167,7 @@ u8 bnx2x_flash_download(struct bnx2x *bp, u8 port, u32 ext_phy_config, | |||
| 164 | otherwise link is down*/ | 167 | otherwise link is down*/ |
| 165 | u8 bnx2x_test_link(struct link_params *input, struct link_vars *vars); | 168 | u8 bnx2x_test_link(struct link_params *input, struct link_vars *vars); |
| 166 | 169 | ||
| 170 | /* One-time initialization for external phy after power up */ | ||
| 171 | u8 bnx2x_common_init_phy(struct bnx2x *bp, u32 shmem_base); | ||
| 167 | 172 | ||
| 168 | #endif /* BNX2X_LINK_H */ | 173 | #endif /* BNX2X_LINK_H */ |
diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c index 272a4bd25953..a8eb3c4a47c8 100644 --- a/drivers/net/bnx2x_main.c +++ b/drivers/net/bnx2x_main.c | |||
| @@ -44,7 +44,6 @@ | |||
| 44 | #include <net/ip.h> | 44 | #include <net/ip.h> |
| 45 | #include <net/tcp.h> | 45 | #include <net/tcp.h> |
| 46 | #include <net/checksum.h> | 46 | #include <net/checksum.h> |
| 47 | #include <linux/version.h> | ||
| 48 | #include <net/ip6_checksum.h> | 47 | #include <net/ip6_checksum.h> |
| 49 | #include <linux/workqueue.h> | 48 | #include <linux/workqueue.h> |
| 50 | #include <linux/crc32.h> | 49 | #include <linux/crc32.h> |
| @@ -60,8 +59,8 @@ | |||
| 60 | #include "bnx2x.h" | 59 | #include "bnx2x.h" |
| 61 | #include "bnx2x_init.h" | 60 | #include "bnx2x_init.h" |
| 62 | 61 | ||
| 63 | #define DRV_MODULE_VERSION "1.45.6" | 62 | #define DRV_MODULE_VERSION "1.45.21" |
| 64 | #define DRV_MODULE_RELDATE "2008/06/23" | 63 | #define DRV_MODULE_RELDATE "2008/09/03" |
| 65 | #define BNX2X_BC_VER 0x040200 | 64 | #define BNX2X_BC_VER 0x040200 |
| 66 | 65 | ||
| 67 | /* Time in jiffies before concluding the transmitter is hung */ | 66 | /* Time in jiffies before concluding the transmitter is hung */ |
| @@ -76,23 +75,21 @@ MODULE_DESCRIPTION("Broadcom NetXtreme II BCM57710 Driver"); | |||
| 76 | MODULE_LICENSE("GPL"); | 75 | MODULE_LICENSE("GPL"); |
| 77 | MODULE_VERSION(DRV_MODULE_VERSION); | 76 | MODULE_VERSION(DRV_MODULE_VERSION); |
| 78 | 77 | ||
| 78 | static int disable_tpa; | ||
| 79 | static int use_inta; | 79 | static int use_inta; |
| 80 | static int poll; | 80 | static int poll; |
| 81 | static int debug; | 81 | static int debug; |
| 82 | static int disable_tpa; | ||
| 83 | static int nomcp; | ||
| 84 | static int load_count[3]; /* 0-common, 1-port0, 2-port1 */ | 82 | static int load_count[3]; /* 0-common, 1-port0, 2-port1 */ |
| 85 | static int use_multi; | 83 | static int use_multi; |
| 86 | 84 | ||
| 85 | module_param(disable_tpa, int, 0); | ||
| 87 | module_param(use_inta, int, 0); | 86 | module_param(use_inta, int, 0); |
| 88 | module_param(poll, int, 0); | 87 | module_param(poll, int, 0); |
| 89 | module_param(debug, int, 0); | 88 | module_param(debug, int, 0); |
| 90 | module_param(disable_tpa, int, 0); | 89 | MODULE_PARM_DESC(disable_tpa, "disable the TPA (LRO) feature"); |
| 91 | module_param(nomcp, int, 0); | ||
| 92 | MODULE_PARM_DESC(use_inta, "use INT#A instead of MSI-X"); | 90 | MODULE_PARM_DESC(use_inta, "use INT#A instead of MSI-X"); |
| 93 | MODULE_PARM_DESC(poll, "use polling (for debug)"); | 91 | MODULE_PARM_DESC(poll, "use polling (for debug)"); |
| 94 | MODULE_PARM_DESC(debug, "default debug msglevel"); | 92 | MODULE_PARM_DESC(debug, "default debug msglevel"); |
| 95 | MODULE_PARM_DESC(nomcp, "ignore management CPU"); | ||
| 96 | 93 | ||
| 97 | #ifdef BNX2X_MULTI | 94 | #ifdef BNX2X_MULTI |
| 98 | module_param(use_multi, int, 0); | 95 | module_param(use_multi, int, 0); |
| @@ -237,17 +234,16 @@ void bnx2x_write_dmae(struct bnx2x *bp, dma_addr_t dma_addr, u32 dst_addr, | |||
| 237 | while (*wb_comp != DMAE_COMP_VAL) { | 234 | while (*wb_comp != DMAE_COMP_VAL) { |
| 238 | DP(BNX2X_MSG_OFF, "wb_comp 0x%08x\n", *wb_comp); | 235 | DP(BNX2X_MSG_OFF, "wb_comp 0x%08x\n", *wb_comp); |
| 239 | 236 | ||
| 240 | /* adjust delay for emulation/FPGA */ | ||
| 241 | if (CHIP_REV_IS_SLOW(bp)) | ||
| 242 | msleep(100); | ||
| 243 | else | ||
| 244 | udelay(5); | ||
| 245 | |||
| 246 | if (!cnt) { | 237 | if (!cnt) { |
| 247 | BNX2X_ERR("dmae timeout!\n"); | 238 | BNX2X_ERR("dmae timeout!\n"); |
| 248 | break; | 239 | break; |
| 249 | } | 240 | } |
| 250 | cnt--; | 241 | cnt--; |
| 242 | /* adjust delay for emulation/FPGA */ | ||
| 243 | if (CHIP_REV_IS_SLOW(bp)) | ||
| 244 | msleep(100); | ||
| 245 | else | ||
| 246 | udelay(5); | ||
| 251 | } | 247 | } |
| 252 | 248 | ||
| 253 | mutex_unlock(&bp->dmae_mutex); | 249 | mutex_unlock(&bp->dmae_mutex); |
| @@ -310,17 +306,16 @@ void bnx2x_read_dmae(struct bnx2x *bp, u32 src_addr, u32 len32) | |||
| 310 | 306 | ||
| 311 | while (*wb_comp != DMAE_COMP_VAL) { | 307 | while (*wb_comp != DMAE_COMP_VAL) { |
| 312 | 308 | ||
| 313 | /* adjust delay for emulation/FPGA */ | ||
| 314 | if (CHIP_REV_IS_SLOW(bp)) | ||
| 315 | msleep(100); | ||
| 316 | else | ||
| 317 | udelay(5); | ||
| 318 | |||
| 319 | if (!cnt) { | 309 | if (!cnt) { |
| 320 | BNX2X_ERR("dmae timeout!\n"); | 310 | BNX2X_ERR("dmae timeout!\n"); |
| 321 | break; | 311 | break; |
| 322 | } | 312 | } |
| 323 | cnt--; | 313 | cnt--; |
| 314 | /* adjust delay for emulation/FPGA */ | ||
| 315 | if (CHIP_REV_IS_SLOW(bp)) | ||
| 316 | msleep(100); | ||
| 317 | else | ||
| 318 | udelay(5); | ||
| 324 | } | 319 | } |
| 325 | DP(BNX2X_MSG_OFF, "data [0x%08x 0x%08x 0x%08x 0x%08x]\n", | 320 | DP(BNX2X_MSG_OFF, "data [0x%08x 0x%08x 0x%08x 0x%08x]\n", |
| 326 | bp->slowpath->wb_data[0], bp->slowpath->wb_data[1], | 321 | bp->slowpath->wb_data[0], bp->slowpath->wb_data[1], |
| @@ -503,6 +498,9 @@ static void bnx2x_panic_dump(struct bnx2x *bp) | |||
| 503 | int i; | 498 | int i; |
| 504 | u16 j, start, end; | 499 | u16 j, start, end; |
| 505 | 500 | ||
| 501 | bp->stats_state = STATS_STATE_DISABLED; | ||
| 502 | DP(BNX2X_MSG_STATS, "stats_state - DISABLED\n"); | ||
| 503 | |||
| 506 | BNX2X_ERR("begin crash dump -----------------\n"); | 504 | BNX2X_ERR("begin crash dump -----------------\n"); |
| 507 | 505 | ||
| 508 | for_each_queue(bp, i) { | 506 | for_each_queue(bp, i) { |
| @@ -513,17 +511,20 @@ static void bnx2x_panic_dump(struct bnx2x *bp) | |||
| 513 | " tx_bd_prod(%x) tx_bd_cons(%x) *tx_cons_sb(%x)\n", | 511 | " tx_bd_prod(%x) tx_bd_cons(%x) *tx_cons_sb(%x)\n", |
| 514 | i, fp->tx_pkt_prod, fp->tx_pkt_cons, fp->tx_bd_prod, | 512 | i, fp->tx_pkt_prod, fp->tx_pkt_cons, fp->tx_bd_prod, |
| 515 | fp->tx_bd_cons, le16_to_cpu(*fp->tx_cons_sb)); | 513 | fp->tx_bd_cons, le16_to_cpu(*fp->tx_cons_sb)); |
| 516 | BNX2X_ERR(" rx_comp_prod(%x) rx_comp_cons(%x)" | 514 | BNX2X_ERR(" rx_bd_prod(%x) rx_bd_cons(%x)" |
| 517 | " *rx_cons_sb(%x) *rx_bd_cons_sb(%x)" | 515 | " *rx_bd_cons_sb(%x) rx_comp_prod(%x)" |
| 518 | " rx_sge_prod(%x) last_max_sge(%x)\n", | 516 | " rx_comp_cons(%x) *rx_cons_sb(%x)\n", |
| 519 | fp->rx_comp_prod, fp->rx_comp_cons, | 517 | fp->rx_bd_prod, fp->rx_bd_cons, |
| 520 | le16_to_cpu(*fp->rx_cons_sb), | 518 | le16_to_cpu(*fp->rx_bd_cons_sb), fp->rx_comp_prod, |
| 521 | le16_to_cpu(*fp->rx_bd_cons_sb), | 519 | fp->rx_comp_cons, le16_to_cpu(*fp->rx_cons_sb)); |
| 522 | fp->rx_sge_prod, fp->last_max_sge); | 520 | BNX2X_ERR(" rx_sge_prod(%x) last_max_sge(%x)" |
| 523 | BNX2X_ERR(" fp_c_idx(%x) fp_u_idx(%x)" | 521 | " fp_c_idx(%x) *sb_c_idx(%x) fp_u_idx(%x)" |
| 524 | " bd data(%x,%x) rx_alloc_failed(%lx)\n", | 522 | " *sb_u_idx(%x) bd data(%x,%x)\n", |
| 525 | fp->fp_c_idx, fp->fp_u_idx, hw_prods->packets_prod, | 523 | fp->rx_sge_prod, fp->last_max_sge, fp->fp_c_idx, |
| 526 | hw_prods->bds_prod, fp->rx_alloc_failed); | 524 | fp->status_blk->c_status_block.status_block_index, |
| 525 | fp->fp_u_idx, | ||
| 526 | fp->status_blk->u_status_block.status_block_index, | ||
| 527 | hw_prods->packets_prod, hw_prods->bds_prod); | ||
| 527 | 528 | ||
| 528 | start = TX_BD(le16_to_cpu(*fp->tx_cons_sb) - 10); | 529 | start = TX_BD(le16_to_cpu(*fp->tx_cons_sb) - 10); |
| 529 | end = TX_BD(le16_to_cpu(*fp->tx_cons_sb) + 245); | 530 | end = TX_BD(le16_to_cpu(*fp->tx_cons_sb) + 245); |
| @@ -553,8 +554,8 @@ static void bnx2x_panic_dump(struct bnx2x *bp) | |||
| 553 | j, rx_bd[1], rx_bd[0], sw_bd->skb); | 554 | j, rx_bd[1], rx_bd[0], sw_bd->skb); |
| 554 | } | 555 | } |
| 555 | 556 | ||
| 556 | start = 0; | 557 | start = RX_SGE(fp->rx_sge_prod); |
| 557 | end = RX_SGE_CNT*NUM_RX_SGE_PAGES; | 558 | end = RX_SGE(fp->last_max_sge); |
| 558 | for (j = start; j < end; j++) { | 559 | for (j = start; j < end; j++) { |
| 559 | u32 *rx_sge = (u32 *)&fp->rx_sge_ring[j]; | 560 | u32 *rx_sge = (u32 *)&fp->rx_sge_ring[j]; |
| 560 | struct sw_rx_page *sw_page = &fp->rx_page_ring[j]; | 561 | struct sw_rx_page *sw_page = &fp->rx_page_ring[j]; |
| @@ -582,9 +583,6 @@ static void bnx2x_panic_dump(struct bnx2x *bp) | |||
| 582 | bnx2x_fw_dump(bp); | 583 | bnx2x_fw_dump(bp); |
| 583 | bnx2x_mc_assert(bp); | 584 | bnx2x_mc_assert(bp); |
| 584 | BNX2X_ERR("end crash dump -----------------\n"); | 585 | BNX2X_ERR("end crash dump -----------------\n"); |
| 585 | |||
| 586 | bp->stats_state = STATS_STATE_DISABLED; | ||
| 587 | DP(BNX2X_MSG_STATS, "stats_state - DISABLED\n"); | ||
| 588 | } | 586 | } |
| 589 | 587 | ||
| 590 | static void bnx2x_int_enable(struct bnx2x *bp) | 588 | static void bnx2x_int_enable(struct bnx2x *bp) |
| @@ -684,7 +682,8 @@ static void bnx2x_int_disable_sync(struct bnx2x *bp) | |||
| 684 | static inline void bnx2x_ack_sb(struct bnx2x *bp, u8 sb_id, | 682 | static inline void bnx2x_ack_sb(struct bnx2x *bp, u8 sb_id, |
| 685 | u8 storm, u16 index, u8 op, u8 update) | 683 | u8 storm, u16 index, u8 op, u8 update) |
| 686 | { | 684 | { |
| 687 | u32 igu_addr = (IGU_ADDR_INT_ACK + IGU_FUNC_BASE * BP_FUNC(bp)) * 8; | 685 | u32 hc_addr = (HC_REG_COMMAND_REG + BP_PORT(bp)*32 + |
| 686 | COMMAND_REG_INT_ACK); | ||
| 688 | struct igu_ack_register igu_ack; | 687 | struct igu_ack_register igu_ack; |
| 689 | 688 | ||
| 690 | igu_ack.status_block_index = index; | 689 | igu_ack.status_block_index = index; |
| @@ -694,9 +693,9 @@ static inline void bnx2x_ack_sb(struct bnx2x *bp, u8 sb_id, | |||
| 694 | (update << IGU_ACK_REGISTER_UPDATE_INDEX_SHIFT) | | 693 | (update << IGU_ACK_REGISTER_UPDATE_INDEX_SHIFT) | |
| 695 | (op << IGU_ACK_REGISTER_INTERRUPT_MODE_SHIFT)); | 694 | (op << IGU_ACK_REGISTER_INTERRUPT_MODE_SHIFT)); |
| 696 | 695 | ||
| 697 | DP(BNX2X_MSG_OFF, "write 0x%08x to IGU addr 0x%x\n", | 696 | DP(BNX2X_MSG_OFF, "write 0x%08x to HC addr 0x%x\n", |
| 698 | (*(u32 *)&igu_ack), BAR_IGU_INTMEM + igu_addr); | 697 | (*(u32 *)&igu_ack), hc_addr); |
| 699 | REG_WR(bp, BAR_IGU_INTMEM + igu_addr, (*(u32 *)&igu_ack)); | 698 | REG_WR(bp, hc_addr, (*(u32 *)&igu_ack)); |
| 700 | } | 699 | } |
| 701 | 700 | ||
| 702 | static inline u16 bnx2x_update_fpsb_idx(struct bnx2x_fastpath *fp) | 701 | static inline u16 bnx2x_update_fpsb_idx(struct bnx2x_fastpath *fp) |
| @@ -716,36 +715,15 @@ static inline u16 bnx2x_update_fpsb_idx(struct bnx2x_fastpath *fp) | |||
| 716 | return rc; | 715 | return rc; |
| 717 | } | 716 | } |
| 718 | 717 | ||
| 719 | static inline int bnx2x_has_work(struct bnx2x_fastpath *fp) | ||
| 720 | { | ||
| 721 | u16 rx_cons_sb = le16_to_cpu(*fp->rx_cons_sb); | ||
| 722 | |||
| 723 | if ((rx_cons_sb & MAX_RCQ_DESC_CNT) == MAX_RCQ_DESC_CNT) | ||
| 724 | rx_cons_sb++; | ||
| 725 | |||
| 726 | if ((fp->rx_comp_cons != rx_cons_sb) || | ||
| 727 | (fp->tx_pkt_prod != le16_to_cpu(*fp->tx_cons_sb)) || | ||
| 728 | (fp->tx_pkt_prod != fp->tx_pkt_cons)) | ||
| 729 | return 1; | ||
| 730 | |||
| 731 | return 0; | ||
| 732 | } | ||
| 733 | |||
| 734 | static u16 bnx2x_ack_int(struct bnx2x *bp) | 718 | static u16 bnx2x_ack_int(struct bnx2x *bp) |
| 735 | { | 719 | { |
| 736 | u32 igu_addr = (IGU_ADDR_SIMD_MASK + IGU_FUNC_BASE * BP_FUNC(bp)) * 8; | 720 | u32 hc_addr = (HC_REG_COMMAND_REG + BP_PORT(bp)*32 + |
| 737 | u32 result = REG_RD(bp, BAR_IGU_INTMEM + igu_addr); | 721 | COMMAND_REG_SIMD_MASK); |
| 722 | u32 result = REG_RD(bp, hc_addr); | ||
| 738 | 723 | ||
| 739 | DP(BNX2X_MSG_OFF, "read 0x%08x from IGU addr 0x%x\n", | 724 | DP(BNX2X_MSG_OFF, "read 0x%08x from HC addr 0x%x\n", |
| 740 | result, BAR_IGU_INTMEM + igu_addr); | 725 | result, hc_addr); |
| 741 | 726 | ||
| 742 | #ifdef IGU_DEBUG | ||
| 743 | #warning IGU_DEBUG active | ||
| 744 | if (result == 0) { | ||
| 745 | BNX2X_ERR("read %x from IGU\n", result); | ||
| 746 | REG_WR(bp, TM_REG_TIMER_SOFT_RST, 0); | ||
| 747 | } | ||
| 748 | #endif | ||
| 749 | return result; | 727 | return result; |
| 750 | } | 728 | } |
| 751 | 729 | ||
| @@ -898,6 +876,7 @@ static void bnx2x_tx_int(struct bnx2x_fastpath *fp, int work) | |||
| 898 | netif_tx_lock(bp->dev); | 876 | netif_tx_lock(bp->dev); |
| 899 | 877 | ||
| 900 | if (netif_queue_stopped(bp->dev) && | 878 | if (netif_queue_stopped(bp->dev) && |
| 879 | (bp->state == BNX2X_STATE_OPEN) && | ||
| 901 | (bnx2x_tx_avail(fp) >= MAX_SKB_FRAGS + 3)) | 880 | (bnx2x_tx_avail(fp) >= MAX_SKB_FRAGS + 3)) |
| 902 | netif_wake_queue(bp->dev); | 881 | netif_wake_queue(bp->dev); |
| 903 | 882 | ||
| @@ -905,6 +884,7 @@ static void bnx2x_tx_int(struct bnx2x_fastpath *fp, int work) | |||
| 905 | } | 884 | } |
| 906 | } | 885 | } |
| 907 | 886 | ||
| 887 | |||
| 908 | static void bnx2x_sp_event(struct bnx2x_fastpath *fp, | 888 | static void bnx2x_sp_event(struct bnx2x_fastpath *fp, |
| 909 | union eth_rx_cqe *rr_cqe) | 889 | union eth_rx_cqe *rr_cqe) |
| 910 | { | 890 | { |
| @@ -960,6 +940,7 @@ static void bnx2x_sp_event(struct bnx2x_fastpath *fp, | |||
| 960 | bnx2x_fp(bp, cid, state) = BNX2X_FP_STATE_CLOSED; | 940 | bnx2x_fp(bp, cid, state) = BNX2X_FP_STATE_CLOSED; |
| 961 | break; | 941 | break; |
| 962 | 942 | ||
| 943 | |||
| 963 | case (RAMROD_CMD_ID_ETH_SET_MAC | BNX2X_STATE_OPEN): | 944 | case (RAMROD_CMD_ID_ETH_SET_MAC | BNX2X_STATE_OPEN): |
| 964 | case (RAMROD_CMD_ID_ETH_SET_MAC | BNX2X_STATE_DIAG): | 945 | case (RAMROD_CMD_ID_ETH_SET_MAC | BNX2X_STATE_DIAG): |
| 965 | DP(NETIF_MSG_IFUP, "got set mac ramrod\n"); | 946 | DP(NETIF_MSG_IFUP, "got set mac ramrod\n"); |
| @@ -1046,7 +1027,7 @@ static inline int bnx2x_alloc_rx_skb(struct bnx2x *bp, | |||
| 1046 | if (unlikely(skb == NULL)) | 1027 | if (unlikely(skb == NULL)) |
| 1047 | return -ENOMEM; | 1028 | return -ENOMEM; |
| 1048 | 1029 | ||
| 1049 | mapping = pci_map_single(bp->pdev, skb->data, bp->rx_buf_use_size, | 1030 | mapping = pci_map_single(bp->pdev, skb->data, bp->rx_buf_size, |
| 1050 | PCI_DMA_FROMDEVICE); | 1031 | PCI_DMA_FROMDEVICE); |
| 1051 | if (unlikely(dma_mapping_error(&bp->pdev->dev, mapping))) { | 1032 | if (unlikely(dma_mapping_error(&bp->pdev->dev, mapping))) { |
| 1052 | dev_kfree_skb(skb); | 1033 | dev_kfree_skb(skb); |
| @@ -1169,8 +1150,8 @@ static inline void bnx2x_init_sge_ring_bit_mask(struct bnx2x_fastpath *fp) | |||
| 1169 | memset(fp->sge_mask, 0xff, | 1150 | memset(fp->sge_mask, 0xff, |
| 1170 | (NUM_RX_SGE >> RX_SGE_MASK_ELEM_SHIFT)*sizeof(u64)); | 1151 | (NUM_RX_SGE >> RX_SGE_MASK_ELEM_SHIFT)*sizeof(u64)); |
| 1171 | 1152 | ||
| 1172 | /* Clear the two last indeces in the page to 1: | 1153 | /* Clear the two last indices in the page to 1: |
| 1173 | these are the indeces that correspond to the "next" element, | 1154 | these are the indices that correspond to the "next" element, |
| 1174 | hence will never be indicated and should be removed from | 1155 | hence will never be indicated and should be removed from |
| 1175 | the calculations. */ | 1156 | the calculations. */ |
| 1176 | bnx2x_clear_sge_mask_next_elems(fp); | 1157 | bnx2x_clear_sge_mask_next_elems(fp); |
| @@ -1188,7 +1169,7 @@ static void bnx2x_tpa_start(struct bnx2x_fastpath *fp, u16 queue, | |||
| 1188 | /* move empty skb from pool to prod and map it */ | 1169 | /* move empty skb from pool to prod and map it */ |
| 1189 | prod_rx_buf->skb = fp->tpa_pool[queue].skb; | 1170 | prod_rx_buf->skb = fp->tpa_pool[queue].skb; |
| 1190 | mapping = pci_map_single(bp->pdev, fp->tpa_pool[queue].skb->data, | 1171 | mapping = pci_map_single(bp->pdev, fp->tpa_pool[queue].skb->data, |
| 1191 | bp->rx_buf_use_size, PCI_DMA_FROMDEVICE); | 1172 | bp->rx_buf_size, PCI_DMA_FROMDEVICE); |
| 1192 | pci_unmap_addr_set(prod_rx_buf, mapping, mapping); | 1173 | pci_unmap_addr_set(prod_rx_buf, mapping, mapping); |
| 1193 | 1174 | ||
| 1194 | /* move partial skb from cons to pool (don't unmap yet) */ | 1175 | /* move partial skb from cons to pool (don't unmap yet) */ |
| @@ -1261,7 +1242,7 @@ static int bnx2x_fill_frag_skb(struct bnx2x *bp, struct bnx2x_fastpath *fp, | |||
| 1261 | where we are and drop the whole packet */ | 1242 | where we are and drop the whole packet */ |
| 1262 | err = bnx2x_alloc_rx_sge(bp, fp, sge_idx); | 1243 | err = bnx2x_alloc_rx_sge(bp, fp, sge_idx); |
| 1263 | if (unlikely(err)) { | 1244 | if (unlikely(err)) { |
| 1264 | fp->rx_alloc_failed++; | 1245 | bp->eth_stats.rx_skb_alloc_failed++; |
| 1265 | return err; | 1246 | return err; |
| 1266 | } | 1247 | } |
| 1267 | 1248 | ||
| @@ -1295,16 +1276,15 @@ static void bnx2x_tpa_stop(struct bnx2x *bp, struct bnx2x_fastpath *fp, | |||
| 1295 | pool entry status to BNX2X_TPA_STOP even if new skb allocation | 1276 | pool entry status to BNX2X_TPA_STOP even if new skb allocation |
| 1296 | fails. */ | 1277 | fails. */ |
| 1297 | pci_unmap_single(bp->pdev, pci_unmap_addr(rx_buf, mapping), | 1278 | pci_unmap_single(bp->pdev, pci_unmap_addr(rx_buf, mapping), |
| 1298 | bp->rx_buf_use_size, PCI_DMA_FROMDEVICE); | 1279 | bp->rx_buf_size, PCI_DMA_FROMDEVICE); |
| 1299 | 1280 | ||
| 1300 | /* if alloc failed drop the packet and keep the buffer in the bin */ | ||
| 1301 | if (likely(new_skb)) { | 1281 | if (likely(new_skb)) { |
| 1282 | /* fix ip xsum and give it to the stack */ | ||
| 1283 | /* (no need to map the new skb) */ | ||
| 1302 | 1284 | ||
| 1303 | prefetch(skb); | 1285 | prefetch(skb); |
| 1304 | prefetch(((char *)(skb)) + 128); | 1286 | prefetch(((char *)(skb)) + 128); |
| 1305 | 1287 | ||
| 1306 | /* else fix ip xsum and give it to the stack */ | ||
| 1307 | /* (no need to map the new skb) */ | ||
| 1308 | #ifdef BNX2X_STOP_ON_ERROR | 1288 | #ifdef BNX2X_STOP_ON_ERROR |
| 1309 | if (pad + len > bp->rx_buf_size) { | 1289 | if (pad + len > bp->rx_buf_size) { |
| 1310 | BNX2X_ERR("skb_put is about to fail... " | 1290 | BNX2X_ERR("skb_put is about to fail... " |
| @@ -1353,9 +1333,10 @@ static void bnx2x_tpa_stop(struct bnx2x *bp, struct bnx2x_fastpath *fp, | |||
| 1353 | fp->tpa_pool[queue].skb = new_skb; | 1333 | fp->tpa_pool[queue].skb = new_skb; |
| 1354 | 1334 | ||
| 1355 | } else { | 1335 | } else { |
| 1336 | /* else drop the packet and keep the buffer in the bin */ | ||
| 1356 | DP(NETIF_MSG_RX_STATUS, | 1337 | DP(NETIF_MSG_RX_STATUS, |
| 1357 | "Failed to allocate new skb - dropping packet!\n"); | 1338 | "Failed to allocate new skb - dropping packet!\n"); |
| 1358 | fp->rx_alloc_failed++; | 1339 | bp->eth_stats.rx_skb_alloc_failed++; |
| 1359 | } | 1340 | } |
| 1360 | 1341 | ||
| 1361 | fp->tpa_state[queue] = BNX2X_TPA_STOP; | 1342 | fp->tpa_state[queue] = BNX2X_TPA_STOP; |
| @@ -1390,7 +1371,6 @@ static int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget) | |||
| 1390 | u16 bd_cons, bd_prod, bd_prod_fw, comp_ring_cons; | 1371 | u16 bd_cons, bd_prod, bd_prod_fw, comp_ring_cons; |
| 1391 | u16 hw_comp_cons, sw_comp_cons, sw_comp_prod; | 1372 | u16 hw_comp_cons, sw_comp_cons, sw_comp_prod; |
| 1392 | int rx_pkt = 0; | 1373 | int rx_pkt = 0; |
| 1393 | u16 queue; | ||
| 1394 | 1374 | ||
| 1395 | #ifdef BNX2X_STOP_ON_ERROR | 1375 | #ifdef BNX2X_STOP_ON_ERROR |
| 1396 | if (unlikely(bp->panic)) | 1376 | if (unlikely(bp->panic)) |
| @@ -1456,7 +1436,7 @@ static int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget) | |||
| 1456 | if ((!fp->disable_tpa) && | 1436 | if ((!fp->disable_tpa) && |
| 1457 | (TPA_TYPE(cqe_fp_flags) != | 1437 | (TPA_TYPE(cqe_fp_flags) != |
| 1458 | (TPA_TYPE_START | TPA_TYPE_END))) { | 1438 | (TPA_TYPE_START | TPA_TYPE_END))) { |
| 1459 | queue = cqe->fast_path_cqe.queue_index; | 1439 | u16 queue = cqe->fast_path_cqe.queue_index; |
| 1460 | 1440 | ||
| 1461 | if (TPA_TYPE(cqe_fp_flags) == TPA_TYPE_START) { | 1441 | if (TPA_TYPE(cqe_fp_flags) == TPA_TYPE_START) { |
| 1462 | DP(NETIF_MSG_RX_STATUS, | 1442 | DP(NETIF_MSG_RX_STATUS, |
| @@ -1503,11 +1483,10 @@ static int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget) | |||
| 1503 | 1483 | ||
| 1504 | /* is this an error packet? */ | 1484 | /* is this an error packet? */ |
| 1505 | if (unlikely(cqe_fp_flags & ETH_RX_ERROR_FALGS)) { | 1485 | if (unlikely(cqe_fp_flags & ETH_RX_ERROR_FALGS)) { |
| 1506 | /* do we sometimes forward error packets anyway? */ | ||
| 1507 | DP(NETIF_MSG_RX_ERR, | 1486 | DP(NETIF_MSG_RX_ERR, |
| 1508 | "ERROR flags %x rx packet %u\n", | 1487 | "ERROR flags %x rx packet %u\n", |
| 1509 | cqe_fp_flags, sw_comp_cons); | 1488 | cqe_fp_flags, sw_comp_cons); |
| 1510 | /* TBD make sure MC counts this as a drop */ | 1489 | bp->eth_stats.rx_err_discard_pkt++; |
| 1511 | goto reuse_rx; | 1490 | goto reuse_rx; |
| 1512 | } | 1491 | } |
| 1513 | 1492 | ||
| @@ -1524,7 +1503,7 @@ static int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget) | |||
| 1524 | DP(NETIF_MSG_RX_ERR, | 1503 | DP(NETIF_MSG_RX_ERR, |
| 1525 | "ERROR packet dropped " | 1504 | "ERROR packet dropped " |
| 1526 | "because of alloc failure\n"); | 1505 | "because of alloc failure\n"); |
| 1527 | fp->rx_alloc_failed++; | 1506 | bp->eth_stats.rx_skb_alloc_failed++; |
| 1528 | goto reuse_rx; | 1507 | goto reuse_rx; |
| 1529 | } | 1508 | } |
| 1530 | 1509 | ||
| @@ -1541,7 +1520,7 @@ static int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget) | |||
| 1541 | } else if (bnx2x_alloc_rx_skb(bp, fp, bd_prod) == 0) { | 1520 | } else if (bnx2x_alloc_rx_skb(bp, fp, bd_prod) == 0) { |
| 1542 | pci_unmap_single(bp->pdev, | 1521 | pci_unmap_single(bp->pdev, |
| 1543 | pci_unmap_addr(rx_buf, mapping), | 1522 | pci_unmap_addr(rx_buf, mapping), |
| 1544 | bp->rx_buf_use_size, | 1523 | bp->rx_buf_size, |
| 1545 | PCI_DMA_FROMDEVICE); | 1524 | PCI_DMA_FROMDEVICE); |
| 1546 | skb_reserve(skb, pad); | 1525 | skb_reserve(skb, pad); |
| 1547 | skb_put(skb, len); | 1526 | skb_put(skb, len); |
| @@ -1550,7 +1529,7 @@ static int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget) | |||
| 1550 | DP(NETIF_MSG_RX_ERR, | 1529 | DP(NETIF_MSG_RX_ERR, |
| 1551 | "ERROR packet dropped because " | 1530 | "ERROR packet dropped because " |
| 1552 | "of alloc failure\n"); | 1531 | "of alloc failure\n"); |
| 1553 | fp->rx_alloc_failed++; | 1532 | bp->eth_stats.rx_skb_alloc_failed++; |
| 1554 | reuse_rx: | 1533 | reuse_rx: |
| 1555 | bnx2x_reuse_rx_skb(fp, skb, bd_cons, bd_prod); | 1534 | bnx2x_reuse_rx_skb(fp, skb, bd_cons, bd_prod); |
| 1556 | goto next_rx; | 1535 | goto next_rx; |
| @@ -1559,10 +1538,12 @@ reuse_rx: | |||
| 1559 | skb->protocol = eth_type_trans(skb, bp->dev); | 1538 | skb->protocol = eth_type_trans(skb, bp->dev); |
| 1560 | 1539 | ||
| 1561 | skb->ip_summed = CHECKSUM_NONE; | 1540 | skb->ip_summed = CHECKSUM_NONE; |
| 1562 | if (bp->rx_csum && BNX2X_RX_SUM_OK(cqe)) | 1541 | if (bp->rx_csum) { |
| 1563 | skb->ip_summed = CHECKSUM_UNNECESSARY; | 1542 | if (likely(BNX2X_RX_CSUM_OK(cqe))) |
| 1564 | 1543 | skb->ip_summed = CHECKSUM_UNNECESSARY; | |
| 1565 | /* TBD do we pass bad csum packets in promisc */ | 1544 | else |
| 1545 | bp->eth_stats.hw_csum_err++; | ||
| 1546 | } | ||
| 1566 | } | 1547 | } |
| 1567 | 1548 | ||
| 1568 | #ifdef BCM_VLAN | 1549 | #ifdef BCM_VLAN |
| @@ -1615,6 +1596,12 @@ static irqreturn_t bnx2x_msix_fp_int(int irq, void *fp_cookie) | |||
| 1615 | struct net_device *dev = bp->dev; | 1596 | struct net_device *dev = bp->dev; |
| 1616 | int index = FP_IDX(fp); | 1597 | int index = FP_IDX(fp); |
| 1617 | 1598 | ||
| 1599 | /* Return here if interrupt is disabled */ | ||
| 1600 | if (unlikely(atomic_read(&bp->intr_sem) != 0)) { | ||
| 1601 | DP(NETIF_MSG_INTR, "called but intr_sem not 0, returning\n"); | ||
| 1602 | return IRQ_HANDLED; | ||
| 1603 | } | ||
| 1604 | |||
| 1618 | DP(BNX2X_MSG_FP, "got an MSI-X interrupt on IDX:SB [%d:%d]\n", | 1605 | DP(BNX2X_MSG_FP, "got an MSI-X interrupt on IDX:SB [%d:%d]\n", |
| 1619 | index, FP_SB_ID(fp)); | 1606 | index, FP_SB_ID(fp)); |
| 1620 | bnx2x_ack_sb(bp, FP_SB_ID(fp), USTORM_ID, 0, IGU_INT_DISABLE, 0); | 1607 | bnx2x_ack_sb(bp, FP_SB_ID(fp), USTORM_ID, 0, IGU_INT_DISABLE, 0); |
| @@ -1648,17 +1635,17 @@ static irqreturn_t bnx2x_interrupt(int irq, void *dev_instance) | |||
| 1648 | } | 1635 | } |
| 1649 | DP(NETIF_MSG_INTR, "got an interrupt status %u\n", status); | 1636 | DP(NETIF_MSG_INTR, "got an interrupt status %u\n", status); |
| 1650 | 1637 | ||
| 1651 | #ifdef BNX2X_STOP_ON_ERROR | ||
| 1652 | if (unlikely(bp->panic)) | ||
| 1653 | return IRQ_HANDLED; | ||
| 1654 | #endif | ||
| 1655 | |||
| 1656 | /* Return here if interrupt is disabled */ | 1638 | /* Return here if interrupt is disabled */ |
| 1657 | if (unlikely(atomic_read(&bp->intr_sem) != 0)) { | 1639 | if (unlikely(atomic_read(&bp->intr_sem) != 0)) { |
| 1658 | DP(NETIF_MSG_INTR, "called but intr_sem not 0, returning\n"); | 1640 | DP(NETIF_MSG_INTR, "called but intr_sem not 0, returning\n"); |
| 1659 | return IRQ_HANDLED; | 1641 | return IRQ_HANDLED; |
| 1660 | } | 1642 | } |
| 1661 | 1643 | ||
| 1644 | #ifdef BNX2X_STOP_ON_ERROR | ||
| 1645 | if (unlikely(bp->panic)) | ||
| 1646 | return IRQ_HANDLED; | ||
| 1647 | #endif | ||
| 1648 | |||
| 1662 | mask = 0x2 << bp->fp[0].sb_id; | 1649 | mask = 0x2 << bp->fp[0].sb_id; |
| 1663 | if (status & mask) { | 1650 | if (status & mask) { |
| 1664 | struct bnx2x_fastpath *fp = &bp->fp[0]; | 1651 | struct bnx2x_fastpath *fp = &bp->fp[0]; |
| @@ -1699,11 +1686,12 @@ static void bnx2x_stats_handle(struct bnx2x *bp, enum bnx2x_stats_event event); | |||
| 1699 | * General service functions | 1686 | * General service functions |
| 1700 | */ | 1687 | */ |
| 1701 | 1688 | ||
| 1702 | static int bnx2x_hw_lock(struct bnx2x *bp, u32 resource) | 1689 | static int bnx2x_acquire_hw_lock(struct bnx2x *bp, u32 resource) |
| 1703 | { | 1690 | { |
| 1704 | u32 lock_status; | 1691 | u32 lock_status; |
| 1705 | u32 resource_bit = (1 << resource); | 1692 | u32 resource_bit = (1 << resource); |
| 1706 | u8 port = BP_PORT(bp); | 1693 | int func = BP_FUNC(bp); |
| 1694 | u32 hw_lock_control_reg; | ||
| 1707 | int cnt; | 1695 | int cnt; |
| 1708 | 1696 | ||
| 1709 | /* Validating that the resource is within range */ | 1697 | /* Validating that the resource is within range */ |
| @@ -1714,20 +1702,26 @@ static int bnx2x_hw_lock(struct bnx2x *bp, u32 resource) | |||
| 1714 | return -EINVAL; | 1702 | return -EINVAL; |
| 1715 | } | 1703 | } |
| 1716 | 1704 | ||
| 1705 | if (func <= 5) { | ||
| 1706 | hw_lock_control_reg = (MISC_REG_DRIVER_CONTROL_1 + func*8); | ||
| 1707 | } else { | ||
| 1708 | hw_lock_control_reg = | ||
| 1709 | (MISC_REG_DRIVER_CONTROL_7 + (func - 6)*8); | ||
| 1710 | } | ||
| 1711 | |||
| 1717 | /* Validating that the resource is not already taken */ | 1712 | /* Validating that the resource is not already taken */ |
| 1718 | lock_status = REG_RD(bp, MISC_REG_DRIVER_CONTROL_1 + port*8); | 1713 | lock_status = REG_RD(bp, hw_lock_control_reg); |
| 1719 | if (lock_status & resource_bit) { | 1714 | if (lock_status & resource_bit) { |
| 1720 | DP(NETIF_MSG_HW, "lock_status 0x%x resource_bit 0x%x\n", | 1715 | DP(NETIF_MSG_HW, "lock_status 0x%x resource_bit 0x%x\n", |
| 1721 | lock_status, resource_bit); | 1716 | lock_status, resource_bit); |
| 1722 | return -EEXIST; | 1717 | return -EEXIST; |
| 1723 | } | 1718 | } |
| 1724 | 1719 | ||
| 1725 | /* Try for 1 second every 5ms */ | 1720 | /* Try for 5 second every 5ms */ |
| 1726 | for (cnt = 0; cnt < 200; cnt++) { | 1721 | for (cnt = 0; cnt < 1000; cnt++) { |
| 1727 | /* Try to acquire the lock */ | 1722 | /* Try to acquire the lock */ |
| 1728 | REG_WR(bp, MISC_REG_DRIVER_CONTROL_1 + port*8 + 4, | 1723 | REG_WR(bp, hw_lock_control_reg + 4, resource_bit); |
| 1729 | resource_bit); | 1724 | lock_status = REG_RD(bp, hw_lock_control_reg); |
| 1730 | lock_status = REG_RD(bp, MISC_REG_DRIVER_CONTROL_1 + port*8); | ||
| 1731 | if (lock_status & resource_bit) | 1725 | if (lock_status & resource_bit) |
| 1732 | return 0; | 1726 | return 0; |
| 1733 | 1727 | ||
| @@ -1737,11 +1731,12 @@ static int bnx2x_hw_lock(struct bnx2x *bp, u32 resource) | |||
| 1737 | return -EAGAIN; | 1731 | return -EAGAIN; |
| 1738 | } | 1732 | } |
| 1739 | 1733 | ||
| 1740 | static int bnx2x_hw_unlock(struct bnx2x *bp, u32 resource) | 1734 | static int bnx2x_release_hw_lock(struct bnx2x *bp, u32 resource) |
| 1741 | { | 1735 | { |
| 1742 | u32 lock_status; | 1736 | u32 lock_status; |
| 1743 | u32 resource_bit = (1 << resource); | 1737 | u32 resource_bit = (1 << resource); |
| 1744 | u8 port = BP_PORT(bp); | 1738 | int func = BP_FUNC(bp); |
| 1739 | u32 hw_lock_control_reg; | ||
| 1745 | 1740 | ||
| 1746 | /* Validating that the resource is within range */ | 1741 | /* Validating that the resource is within range */ |
| 1747 | if (resource > HW_LOCK_MAX_RESOURCE_VALUE) { | 1742 | if (resource > HW_LOCK_MAX_RESOURCE_VALUE) { |
| @@ -1751,20 +1746,27 @@ static int bnx2x_hw_unlock(struct bnx2x *bp, u32 resource) | |||
| 1751 | return -EINVAL; | 1746 | return -EINVAL; |
| 1752 | } | 1747 | } |
| 1753 | 1748 | ||
| 1749 | if (func <= 5) { | ||
| 1750 | hw_lock_control_reg = (MISC_REG_DRIVER_CONTROL_1 + func*8); | ||
| 1751 | } else { | ||
| 1752 | hw_lock_control_reg = | ||
| 1753 | (MISC_REG_DRIVER_CONTROL_7 + (func - 6)*8); | ||
| 1754 | } | ||
| 1755 | |||
| 1754 | /* Validating that the resource is currently taken */ | 1756 | /* Validating that the resource is currently taken */ |
| 1755 | lock_status = REG_RD(bp, MISC_REG_DRIVER_CONTROL_1 + port*8); | 1757 | lock_status = REG_RD(bp, hw_lock_control_reg); |
| 1756 | if (!(lock_status & resource_bit)) { | 1758 | if (!(lock_status & resource_bit)) { |
| 1757 | DP(NETIF_MSG_HW, "lock_status 0x%x resource_bit 0x%x\n", | 1759 | DP(NETIF_MSG_HW, "lock_status 0x%x resource_bit 0x%x\n", |
| 1758 | lock_status, resource_bit); | 1760 | lock_status, resource_bit); |
| 1759 | return -EFAULT; | 1761 | return -EFAULT; |
| 1760 | } | 1762 | } |
| 1761 | 1763 | ||
| 1762 | REG_WR(bp, MISC_REG_DRIVER_CONTROL_1 + port*8, resource_bit); | 1764 | REG_WR(bp, hw_lock_control_reg, resource_bit); |
| 1763 | return 0; | 1765 | return 0; |
| 1764 | } | 1766 | } |
| 1765 | 1767 | ||
| 1766 | /* HW Lock for shared dual port PHYs */ | 1768 | /* HW Lock for shared dual port PHYs */ |
| 1767 | static void bnx2x_phy_hw_lock(struct bnx2x *bp) | 1769 | static void bnx2x_acquire_phy_lock(struct bnx2x *bp) |
| 1768 | { | 1770 | { |
| 1769 | u32 ext_phy_type = XGXS_EXT_PHY_TYPE(bp->link_params.ext_phy_config); | 1771 | u32 ext_phy_type = XGXS_EXT_PHY_TYPE(bp->link_params.ext_phy_config); |
| 1770 | 1772 | ||
| @@ -1772,25 +1774,25 @@ static void bnx2x_phy_hw_lock(struct bnx2x *bp) | |||
| 1772 | 1774 | ||
| 1773 | if ((ext_phy_type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8072) || | 1775 | if ((ext_phy_type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8072) || |
| 1774 | (ext_phy_type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073)) | 1776 | (ext_phy_type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073)) |
| 1775 | bnx2x_hw_lock(bp, HW_LOCK_RESOURCE_8072_MDIO); | 1777 | bnx2x_acquire_hw_lock(bp, HW_LOCK_RESOURCE_8072_MDIO); |
| 1776 | } | 1778 | } |
| 1777 | 1779 | ||
| 1778 | static void bnx2x_phy_hw_unlock(struct bnx2x *bp) | 1780 | static void bnx2x_release_phy_lock(struct bnx2x *bp) |
| 1779 | { | 1781 | { |
| 1780 | u32 ext_phy_type = XGXS_EXT_PHY_TYPE(bp->link_params.ext_phy_config); | 1782 | u32 ext_phy_type = XGXS_EXT_PHY_TYPE(bp->link_params.ext_phy_config); |
| 1781 | 1783 | ||
| 1782 | if ((ext_phy_type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8072) || | 1784 | if ((ext_phy_type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8072) || |
| 1783 | (ext_phy_type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073)) | 1785 | (ext_phy_type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073)) |
| 1784 | bnx2x_hw_unlock(bp, HW_LOCK_RESOURCE_8072_MDIO); | 1786 | bnx2x_release_hw_lock(bp, HW_LOCK_RESOURCE_8072_MDIO); |
| 1785 | 1787 | ||
| 1786 | mutex_unlock(&bp->port.phy_mutex); | 1788 | mutex_unlock(&bp->port.phy_mutex); |
| 1787 | } | 1789 | } |
| 1788 | 1790 | ||
| 1789 | int bnx2x_set_gpio(struct bnx2x *bp, int gpio_num, u32 mode) | 1791 | int bnx2x_set_gpio(struct bnx2x *bp, int gpio_num, u32 mode, u8 port) |
| 1790 | { | 1792 | { |
| 1791 | /* The GPIO should be swapped if swap register is set and active */ | 1793 | /* The GPIO should be swapped if swap register is set and active */ |
| 1792 | int gpio_port = (REG_RD(bp, NIG_REG_PORT_SWAP) && | 1794 | int gpio_port = (REG_RD(bp, NIG_REG_PORT_SWAP) && |
| 1793 | REG_RD(bp, NIG_REG_STRAP_OVERRIDE)) ^ BP_PORT(bp); | 1795 | REG_RD(bp, NIG_REG_STRAP_OVERRIDE)) ^ port; |
| 1794 | int gpio_shift = gpio_num + | 1796 | int gpio_shift = gpio_num + |
| 1795 | (gpio_port ? MISC_REGISTERS_GPIO_PORT_SHIFT : 0); | 1797 | (gpio_port ? MISC_REGISTERS_GPIO_PORT_SHIFT : 0); |
| 1796 | u32 gpio_mask = (1 << gpio_shift); | 1798 | u32 gpio_mask = (1 << gpio_shift); |
| @@ -1801,7 +1803,7 @@ int bnx2x_set_gpio(struct bnx2x *bp, int gpio_num, u32 mode) | |||
| 1801 | return -EINVAL; | 1803 | return -EINVAL; |
| 1802 | } | 1804 | } |
| 1803 | 1805 | ||
| 1804 | bnx2x_hw_lock(bp, HW_LOCK_RESOURCE_GPIO); | 1806 | bnx2x_acquire_hw_lock(bp, HW_LOCK_RESOURCE_GPIO); |
| 1805 | /* read GPIO and mask except the float bits */ | 1807 | /* read GPIO and mask except the float bits */ |
| 1806 | gpio_reg = (REG_RD(bp, MISC_REG_GPIO) & MISC_REGISTERS_GPIO_FLOAT); | 1808 | gpio_reg = (REG_RD(bp, MISC_REG_GPIO) & MISC_REGISTERS_GPIO_FLOAT); |
| 1807 | 1809 | ||
| @@ -1822,7 +1824,7 @@ int bnx2x_set_gpio(struct bnx2x *bp, int gpio_num, u32 mode) | |||
| 1822 | gpio_reg |= (gpio_mask << MISC_REGISTERS_GPIO_SET_POS); | 1824 | gpio_reg |= (gpio_mask << MISC_REGISTERS_GPIO_SET_POS); |
| 1823 | break; | 1825 | break; |
| 1824 | 1826 | ||
| 1825 | case MISC_REGISTERS_GPIO_INPUT_HI_Z : | 1827 | case MISC_REGISTERS_GPIO_INPUT_HI_Z: |
| 1826 | DP(NETIF_MSG_LINK, "Set GPIO %d (shift %d) -> input\n", | 1828 | DP(NETIF_MSG_LINK, "Set GPIO %d (shift %d) -> input\n", |
| 1827 | gpio_num, gpio_shift); | 1829 | gpio_num, gpio_shift); |
| 1828 | /* set FLOAT */ | 1830 | /* set FLOAT */ |
| @@ -1834,7 +1836,7 @@ int bnx2x_set_gpio(struct bnx2x *bp, int gpio_num, u32 mode) | |||
| 1834 | } | 1836 | } |
| 1835 | 1837 | ||
| 1836 | REG_WR(bp, MISC_REG_GPIO, gpio_reg); | 1838 | REG_WR(bp, MISC_REG_GPIO, gpio_reg); |
| 1837 | bnx2x_hw_unlock(bp, HW_LOCK_RESOURCE_GPIO); | 1839 | bnx2x_release_hw_lock(bp, HW_LOCK_RESOURCE_GPIO); |
| 1838 | 1840 | ||
| 1839 | return 0; | 1841 | return 0; |
| 1840 | } | 1842 | } |
| @@ -1850,19 +1852,19 @@ static int bnx2x_set_spio(struct bnx2x *bp, int spio_num, u32 mode) | |||
| 1850 | return -EINVAL; | 1852 | return -EINVAL; |
| 1851 | } | 1853 | } |
| 1852 | 1854 | ||
| 1853 | bnx2x_hw_lock(bp, HW_LOCK_RESOURCE_SPIO); | 1855 | bnx2x_acquire_hw_lock(bp, HW_LOCK_RESOURCE_SPIO); |
| 1854 | /* read SPIO and mask except the float bits */ | 1856 | /* read SPIO and mask except the float bits */ |
| 1855 | spio_reg = (REG_RD(bp, MISC_REG_SPIO) & MISC_REGISTERS_SPIO_FLOAT); | 1857 | spio_reg = (REG_RD(bp, MISC_REG_SPIO) & MISC_REGISTERS_SPIO_FLOAT); |
| 1856 | 1858 | ||
| 1857 | switch (mode) { | 1859 | switch (mode) { |
| 1858 | case MISC_REGISTERS_SPIO_OUTPUT_LOW : | 1860 | case MISC_REGISTERS_SPIO_OUTPUT_LOW: |
| 1859 | DP(NETIF_MSG_LINK, "Set SPIO %d -> output low\n", spio_num); | 1861 | DP(NETIF_MSG_LINK, "Set SPIO %d -> output low\n", spio_num); |
| 1860 | /* clear FLOAT and set CLR */ | 1862 | /* clear FLOAT and set CLR */ |
| 1861 | spio_reg &= ~(spio_mask << MISC_REGISTERS_SPIO_FLOAT_POS); | 1863 | spio_reg &= ~(spio_mask << MISC_REGISTERS_SPIO_FLOAT_POS); |
| 1862 | spio_reg |= (spio_mask << MISC_REGISTERS_SPIO_CLR_POS); | 1864 | spio_reg |= (spio_mask << MISC_REGISTERS_SPIO_CLR_POS); |
| 1863 | break; | 1865 | break; |
| 1864 | 1866 | ||
| 1865 | case MISC_REGISTERS_SPIO_OUTPUT_HIGH : | 1867 | case MISC_REGISTERS_SPIO_OUTPUT_HIGH: |
| 1866 | DP(NETIF_MSG_LINK, "Set SPIO %d -> output high\n", spio_num); | 1868 | DP(NETIF_MSG_LINK, "Set SPIO %d -> output high\n", spio_num); |
| 1867 | /* clear FLOAT and set SET */ | 1869 | /* clear FLOAT and set SET */ |
| 1868 | spio_reg &= ~(spio_mask << MISC_REGISTERS_SPIO_FLOAT_POS); | 1870 | spio_reg &= ~(spio_mask << MISC_REGISTERS_SPIO_FLOAT_POS); |
| @@ -1880,7 +1882,7 @@ static int bnx2x_set_spio(struct bnx2x *bp, int spio_num, u32 mode) | |||
| 1880 | } | 1882 | } |
| 1881 | 1883 | ||
| 1882 | REG_WR(bp, MISC_REG_SPIO, spio_reg); | 1884 | REG_WR(bp, MISC_REG_SPIO, spio_reg); |
| 1883 | bnx2x_hw_unlock(bp, HW_LOCK_RESOURCE_SPIO); | 1885 | bnx2x_release_hw_lock(bp, HW_LOCK_RESOURCE_SPIO); |
| 1884 | 1886 | ||
| 1885 | return 0; | 1887 | return 0; |
| 1886 | } | 1888 | } |
| @@ -1940,46 +1942,63 @@ static void bnx2x_link_report(struct bnx2x *bp) | |||
| 1940 | 1942 | ||
| 1941 | static u8 bnx2x_initial_phy_init(struct bnx2x *bp) | 1943 | static u8 bnx2x_initial_phy_init(struct bnx2x *bp) |
| 1942 | { | 1944 | { |
| 1943 | u8 rc; | 1945 | if (!BP_NOMCP(bp)) { |
| 1946 | u8 rc; | ||
| 1944 | 1947 | ||
| 1945 | /* Initialize link parameters structure variables */ | 1948 | /* Initialize link parameters structure variables */ |
| 1946 | bp->link_params.mtu = bp->dev->mtu; | 1949 | /* It is recommended to turn off RX FC for jumbo frames |
| 1950 | for better performance */ | ||
| 1951 | if (IS_E1HMF(bp)) | ||
| 1952 | bp->link_params.req_fc_auto_adv = FLOW_CTRL_BOTH; | ||
| 1953 | else if (bp->dev->mtu > 5000) | ||
| 1954 | bp->link_params.req_fc_auto_adv = FLOW_CTRL_TX; | ||
| 1955 | else | ||
| 1956 | bp->link_params.req_fc_auto_adv = FLOW_CTRL_BOTH; | ||
| 1947 | 1957 | ||
| 1948 | bnx2x_phy_hw_lock(bp); | 1958 | bnx2x_acquire_phy_lock(bp); |
| 1949 | rc = bnx2x_phy_init(&bp->link_params, &bp->link_vars); | 1959 | rc = bnx2x_phy_init(&bp->link_params, &bp->link_vars); |
| 1950 | bnx2x_phy_hw_unlock(bp); | 1960 | bnx2x_release_phy_lock(bp); |
| 1951 | 1961 | ||
| 1952 | if (bp->link_vars.link_up) | 1962 | if (bp->link_vars.link_up) |
| 1953 | bnx2x_link_report(bp); | 1963 | bnx2x_link_report(bp); |
| 1954 | 1964 | ||
| 1955 | bnx2x_calc_fc_adv(bp); | 1965 | bnx2x_calc_fc_adv(bp); |
| 1956 | 1966 | ||
| 1957 | return rc; | 1967 | return rc; |
| 1968 | } | ||
| 1969 | BNX2X_ERR("Bootcode is missing -not initializing link\n"); | ||
| 1970 | return -EINVAL; | ||
| 1958 | } | 1971 | } |
| 1959 | 1972 | ||
| 1960 | static void bnx2x_link_set(struct bnx2x *bp) | 1973 | static void bnx2x_link_set(struct bnx2x *bp) |
| 1961 | { | 1974 | { |
| 1962 | bnx2x_phy_hw_lock(bp); | 1975 | if (!BP_NOMCP(bp)) { |
| 1963 | bnx2x_phy_init(&bp->link_params, &bp->link_vars); | 1976 | bnx2x_acquire_phy_lock(bp); |
| 1964 | bnx2x_phy_hw_unlock(bp); | 1977 | bnx2x_phy_init(&bp->link_params, &bp->link_vars); |
| 1978 | bnx2x_release_phy_lock(bp); | ||
| 1965 | 1979 | ||
| 1966 | bnx2x_calc_fc_adv(bp); | 1980 | bnx2x_calc_fc_adv(bp); |
| 1981 | } else | ||
| 1982 | BNX2X_ERR("Bootcode is missing -not setting link\n"); | ||
| 1967 | } | 1983 | } |
| 1968 | 1984 | ||
| 1969 | static void bnx2x__link_reset(struct bnx2x *bp) | 1985 | static void bnx2x__link_reset(struct bnx2x *bp) |
| 1970 | { | 1986 | { |
| 1971 | bnx2x_phy_hw_lock(bp); | 1987 | if (!BP_NOMCP(bp)) { |
| 1972 | bnx2x_link_reset(&bp->link_params, &bp->link_vars); | 1988 | bnx2x_acquire_phy_lock(bp); |
| 1973 | bnx2x_phy_hw_unlock(bp); | 1989 | bnx2x_link_reset(&bp->link_params, &bp->link_vars); |
| 1990 | bnx2x_release_phy_lock(bp); | ||
| 1991 | } else | ||
| 1992 | BNX2X_ERR("Bootcode is missing -not resetting link\n"); | ||
| 1974 | } | 1993 | } |
| 1975 | 1994 | ||
| 1976 | static u8 bnx2x_link_test(struct bnx2x *bp) | 1995 | static u8 bnx2x_link_test(struct bnx2x *bp) |
| 1977 | { | 1996 | { |
| 1978 | u8 rc; | 1997 | u8 rc; |
| 1979 | 1998 | ||
| 1980 | bnx2x_phy_hw_lock(bp); | 1999 | bnx2x_acquire_phy_lock(bp); |
| 1981 | rc = bnx2x_test_link(&bp->link_params, &bp->link_vars); | 2000 | rc = bnx2x_test_link(&bp->link_params, &bp->link_vars); |
| 1982 | bnx2x_phy_hw_unlock(bp); | 2001 | bnx2x_release_phy_lock(bp); |
| 1983 | 2002 | ||
| 1984 | return rc; | 2003 | return rc; |
| 1985 | } | 2004 | } |
| @@ -1991,7 +2010,7 @@ static u8 bnx2x_link_test(struct bnx2x *bp) | |||
| 1991 | sum of vn_min_rates | 2010 | sum of vn_min_rates |
| 1992 | or | 2011 | or |
| 1993 | 0 - if all the min_rates are 0. | 2012 | 0 - if all the min_rates are 0. |
| 1994 | In the later case fainess algorithm should be deactivated. | 2013 | In the later case fairness algorithm should be deactivated. |
| 1995 | If not all min_rates are zero then those that are zeroes will | 2014 | If not all min_rates are zero then those that are zeroes will |
| 1996 | be set to 1. | 2015 | be set to 1. |
| 1997 | */ | 2016 | */ |
| @@ -2114,7 +2133,7 @@ static void bnx2x_init_vn_minmax(struct bnx2x *bp, int func, | |||
| 2114 | FUNC_MF_CFG_MIN_BW_SHIFT) * 100; | 2133 | FUNC_MF_CFG_MIN_BW_SHIFT) * 100; |
| 2115 | /* If FAIRNESS is enabled (not all min rates are zeroes) and | 2134 | /* If FAIRNESS is enabled (not all min rates are zeroes) and |
| 2116 | if current min rate is zero - set it to 1. | 2135 | if current min rate is zero - set it to 1. |
| 2117 | This is a requirment of the algorithm. */ | 2136 | This is a requirement of the algorithm. */ |
| 2118 | if ((vn_min_rate == 0) && wsum) | 2137 | if ((vn_min_rate == 0) && wsum) |
| 2119 | vn_min_rate = DEF_MIN_RATE; | 2138 | vn_min_rate = DEF_MIN_RATE; |
| 2120 | vn_max_rate = ((vn_cfg & FUNC_MF_CFG_MAX_BW_MASK) >> | 2139 | vn_max_rate = ((vn_cfg & FUNC_MF_CFG_MAX_BW_MASK) >> |
| @@ -2203,9 +2222,9 @@ static void bnx2x_link_attn(struct bnx2x *bp) | |||
| 2203 | /* Make sure that we are synced with the current statistics */ | 2222 | /* Make sure that we are synced with the current statistics */ |
| 2204 | bnx2x_stats_handle(bp, STATS_EVENT_STOP); | 2223 | bnx2x_stats_handle(bp, STATS_EVENT_STOP); |
| 2205 | 2224 | ||
| 2206 | bnx2x_phy_hw_lock(bp); | 2225 | bnx2x_acquire_phy_lock(bp); |
| 2207 | bnx2x_link_update(&bp->link_params, &bp->link_vars); | 2226 | bnx2x_link_update(&bp->link_params, &bp->link_vars); |
| 2208 | bnx2x_phy_hw_unlock(bp); | 2227 | bnx2x_release_phy_lock(bp); |
| 2209 | 2228 | ||
| 2210 | if (bp->link_vars.link_up) { | 2229 | if (bp->link_vars.link_up) { |
| 2211 | 2230 | ||
| @@ -2357,7 +2376,7 @@ static int bnx2x_sp_post(struct bnx2x *bp, int command, int cid, | |||
| 2357 | } | 2376 | } |
| 2358 | 2377 | ||
| 2359 | /* acquire split MCP access lock register */ | 2378 | /* acquire split MCP access lock register */ |
| 2360 | static int bnx2x_lock_alr(struct bnx2x *bp) | 2379 | static int bnx2x_acquire_alr(struct bnx2x *bp) |
| 2361 | { | 2380 | { |
| 2362 | u32 i, j, val; | 2381 | u32 i, j, val; |
| 2363 | int rc = 0; | 2382 | int rc = 0; |
| @@ -2374,15 +2393,15 @@ static int bnx2x_lock_alr(struct bnx2x *bp) | |||
| 2374 | msleep(5); | 2393 | msleep(5); |
| 2375 | } | 2394 | } |
| 2376 | if (!(val & (1L << 31))) { | 2395 | if (!(val & (1L << 31))) { |
| 2377 | BNX2X_ERR("Cannot acquire nvram interface\n"); | 2396 | BNX2X_ERR("Cannot acquire MCP access lock register\n"); |
| 2378 | rc = -EBUSY; | 2397 | rc = -EBUSY; |
| 2379 | } | 2398 | } |
| 2380 | 2399 | ||
| 2381 | return rc; | 2400 | return rc; |
| 2382 | } | 2401 | } |
| 2383 | 2402 | ||
| 2384 | /* Release split MCP access lock register */ | 2403 | /* release split MCP access lock register */ |
| 2385 | static void bnx2x_unlock_alr(struct bnx2x *bp) | 2404 | static void bnx2x_release_alr(struct bnx2x *bp) |
| 2386 | { | 2405 | { |
| 2387 | u32 val = 0; | 2406 | u32 val = 0; |
| 2388 | 2407 | ||
| @@ -2395,7 +2414,6 @@ static inline u16 bnx2x_update_dsb_idx(struct bnx2x *bp) | |||
| 2395 | u16 rc = 0; | 2414 | u16 rc = 0; |
| 2396 | 2415 | ||
| 2397 | barrier(); /* status block is written to by the chip */ | 2416 | barrier(); /* status block is written to by the chip */ |
| 2398 | |||
| 2399 | if (bp->def_att_idx != def_sb->atten_status_block.attn_bits_index) { | 2417 | if (bp->def_att_idx != def_sb->atten_status_block.attn_bits_index) { |
| 2400 | bp->def_att_idx = def_sb->atten_status_block.attn_bits_index; | 2418 | bp->def_att_idx = def_sb->atten_status_block.attn_bits_index; |
| 2401 | rc |= 1; | 2419 | rc |= 1; |
| @@ -2426,26 +2444,31 @@ static inline u16 bnx2x_update_dsb_idx(struct bnx2x *bp) | |||
| 2426 | static void bnx2x_attn_int_asserted(struct bnx2x *bp, u32 asserted) | 2444 | static void bnx2x_attn_int_asserted(struct bnx2x *bp, u32 asserted) |
| 2427 | { | 2445 | { |
| 2428 | int port = BP_PORT(bp); | 2446 | int port = BP_PORT(bp); |
| 2429 | int func = BP_FUNC(bp); | 2447 | u32 hc_addr = (HC_REG_COMMAND_REG + port*32 + |
| 2430 | u32 igu_addr = (IGU_ADDR_ATTN_BITS_SET + IGU_FUNC_BASE * func) * 8; | 2448 | COMMAND_REG_ATTN_BITS_SET); |
| 2431 | u32 aeu_addr = port ? MISC_REG_AEU_MASK_ATTN_FUNC_1 : | 2449 | u32 aeu_addr = port ? MISC_REG_AEU_MASK_ATTN_FUNC_1 : |
| 2432 | MISC_REG_AEU_MASK_ATTN_FUNC_0; | 2450 | MISC_REG_AEU_MASK_ATTN_FUNC_0; |
| 2433 | u32 nig_int_mask_addr = port ? NIG_REG_MASK_INTERRUPT_PORT1 : | 2451 | u32 nig_int_mask_addr = port ? NIG_REG_MASK_INTERRUPT_PORT1 : |
| 2434 | NIG_REG_MASK_INTERRUPT_PORT0; | 2452 | NIG_REG_MASK_INTERRUPT_PORT0; |
| 2453 | u32 aeu_mask; | ||
| 2435 | 2454 | ||
| 2436 | if (~bp->aeu_mask & (asserted & 0xff)) | ||
| 2437 | BNX2X_ERR("IGU ERROR\n"); | ||
| 2438 | if (bp->attn_state & asserted) | 2455 | if (bp->attn_state & asserted) |
| 2439 | BNX2X_ERR("IGU ERROR\n"); | 2456 | BNX2X_ERR("IGU ERROR\n"); |
| 2440 | 2457 | ||
| 2458 | bnx2x_acquire_hw_lock(bp, HW_LOCK_RESOURCE_PORT0_ATT_MASK + port); | ||
| 2459 | aeu_mask = REG_RD(bp, aeu_addr); | ||
| 2460 | |||
| 2441 | DP(NETIF_MSG_HW, "aeu_mask %x newly asserted %x\n", | 2461 | DP(NETIF_MSG_HW, "aeu_mask %x newly asserted %x\n", |
| 2442 | bp->aeu_mask, asserted); | 2462 | aeu_mask, asserted); |
| 2443 | bp->aeu_mask &= ~(asserted & 0xff); | 2463 | aeu_mask &= ~(asserted & 0xff); |
| 2444 | DP(NETIF_MSG_HW, "after masking: aeu_mask %x\n", bp->aeu_mask); | 2464 | DP(NETIF_MSG_HW, "new mask %x\n", aeu_mask); |
| 2445 | 2465 | ||
| 2446 | REG_WR(bp, aeu_addr, bp->aeu_mask); | 2466 | REG_WR(bp, aeu_addr, aeu_mask); |
| 2467 | bnx2x_release_hw_lock(bp, HW_LOCK_RESOURCE_PORT0_ATT_MASK + port); | ||
| 2447 | 2468 | ||
| 2469 | DP(NETIF_MSG_HW, "attn_state %x\n", bp->attn_state); | ||
| 2448 | bp->attn_state |= asserted; | 2470 | bp->attn_state |= asserted; |
| 2471 | DP(NETIF_MSG_HW, "new state %x\n", bp->attn_state); | ||
| 2449 | 2472 | ||
| 2450 | if (asserted & ATTN_HARD_WIRED_MASK) { | 2473 | if (asserted & ATTN_HARD_WIRED_MASK) { |
| 2451 | if (asserted & ATTN_NIG_FOR_FUNC) { | 2474 | if (asserted & ATTN_NIG_FOR_FUNC) { |
| @@ -2500,9 +2523,9 @@ static void bnx2x_attn_int_asserted(struct bnx2x *bp, u32 asserted) | |||
| 2500 | 2523 | ||
| 2501 | } /* if hardwired */ | 2524 | } /* if hardwired */ |
| 2502 | 2525 | ||
| 2503 | DP(NETIF_MSG_HW, "about to mask 0x%08x at IGU addr 0x%x\n", | 2526 | DP(NETIF_MSG_HW, "about to mask 0x%08x at HC addr 0x%x\n", |
| 2504 | asserted, BAR_IGU_INTMEM + igu_addr); | 2527 | asserted, hc_addr); |
| 2505 | REG_WR(bp, BAR_IGU_INTMEM + igu_addr, asserted); | 2528 | REG_WR(bp, hc_addr, asserted); |
| 2506 | 2529 | ||
| 2507 | /* now set back the mask */ | 2530 | /* now set back the mask */ |
| 2508 | if (asserted & ATTN_NIG_FOR_FUNC) | 2531 | if (asserted & ATTN_NIG_FOR_FUNC) |
| @@ -2527,15 +2550,16 @@ static inline void bnx2x_attn_int_deasserted0(struct bnx2x *bp, u32 attn) | |||
| 2527 | BNX2X_ERR("SPIO5 hw attention\n"); | 2550 | BNX2X_ERR("SPIO5 hw attention\n"); |
| 2528 | 2551 | ||
| 2529 | switch (bp->common.board & SHARED_HW_CFG_BOARD_TYPE_MASK) { | 2552 | switch (bp->common.board & SHARED_HW_CFG_BOARD_TYPE_MASK) { |
| 2553 | case SHARED_HW_CFG_BOARD_TYPE_BCM957710A1021G: | ||
| 2530 | case SHARED_HW_CFG_BOARD_TYPE_BCM957710A1022G: | 2554 | case SHARED_HW_CFG_BOARD_TYPE_BCM957710A1022G: |
| 2531 | /* Fan failure attention */ | 2555 | /* Fan failure attention */ |
| 2532 | 2556 | ||
| 2533 | /* The PHY reset is controled by GPIO 1 */ | 2557 | /* The PHY reset is controlled by GPIO 1 */ |
| 2534 | bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_1, | 2558 | bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_1, |
| 2535 | MISC_REGISTERS_GPIO_OUTPUT_LOW); | 2559 | MISC_REGISTERS_GPIO_OUTPUT_LOW, port); |
| 2536 | /* Low power mode is controled by GPIO 2 */ | 2560 | /* Low power mode is controlled by GPIO 2 */ |
| 2537 | bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2, | 2561 | bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2, |
| 2538 | MISC_REGISTERS_GPIO_OUTPUT_LOW); | 2562 | MISC_REGISTERS_GPIO_OUTPUT_LOW, port); |
| 2539 | /* mark the failure */ | 2563 | /* mark the failure */ |
| 2540 | bp->link_params.ext_phy_config &= | 2564 | bp->link_params.ext_phy_config &= |
| 2541 | ~PORT_HW_CFG_XGXS_EXT_PHY_TYPE_MASK; | 2565 | ~PORT_HW_CFG_XGXS_EXT_PHY_TYPE_MASK; |
| @@ -2699,10 +2723,11 @@ static void bnx2x_attn_int_deasserted(struct bnx2x *bp, u32 deasserted) | |||
| 2699 | int index; | 2723 | int index; |
| 2700 | u32 reg_addr; | 2724 | u32 reg_addr; |
| 2701 | u32 val; | 2725 | u32 val; |
| 2726 | u32 aeu_mask; | ||
| 2702 | 2727 | ||
| 2703 | /* need to take HW lock because MCP or other port might also | 2728 | /* need to take HW lock because MCP or other port might also |
| 2704 | try to handle this event */ | 2729 | try to handle this event */ |
| 2705 | bnx2x_lock_alr(bp); | 2730 | bnx2x_acquire_alr(bp); |
| 2706 | 2731 | ||
| 2707 | attn.sig[0] = REG_RD(bp, MISC_REG_AEU_AFTER_INVERT_1_FUNC_0 + port*4); | 2732 | attn.sig[0] = REG_RD(bp, MISC_REG_AEU_AFTER_INVERT_1_FUNC_0 + port*4); |
| 2708 | attn.sig[1] = REG_RD(bp, MISC_REG_AEU_AFTER_INVERT_2_FUNC_0 + port*4); | 2733 | attn.sig[1] = REG_RD(bp, MISC_REG_AEU_AFTER_INVERT_2_FUNC_0 + port*4); |
| @@ -2734,32 +2759,35 @@ static void bnx2x_attn_int_deasserted(struct bnx2x *bp, u32 deasserted) | |||
| 2734 | HW_PRTY_ASSERT_SET_1) || | 2759 | HW_PRTY_ASSERT_SET_1) || |
| 2735 | (attn.sig[2] & group_mask.sig[2] & | 2760 | (attn.sig[2] & group_mask.sig[2] & |
| 2736 | HW_PRTY_ASSERT_SET_2)) | 2761 | HW_PRTY_ASSERT_SET_2)) |
| 2737 | BNX2X_ERR("FATAL HW block parity attention\n"); | 2762 | BNX2X_ERR("FATAL HW block parity attention\n"); |
| 2738 | } | 2763 | } |
| 2739 | } | 2764 | } |
| 2740 | 2765 | ||
| 2741 | bnx2x_unlock_alr(bp); | 2766 | bnx2x_release_alr(bp); |
| 2742 | 2767 | ||
| 2743 | reg_addr = (IGU_ADDR_ATTN_BITS_CLR + IGU_FUNC_BASE * BP_FUNC(bp)) * 8; | 2768 | reg_addr = (HC_REG_COMMAND_REG + port*32 + COMMAND_REG_ATTN_BITS_CLR); |
| 2744 | 2769 | ||
| 2745 | val = ~deasserted; | 2770 | val = ~deasserted; |
| 2746 | /* DP(NETIF_MSG_INTR, "write 0x%08x to IGU addr 0x%x\n", | 2771 | DP(NETIF_MSG_HW, "about to mask 0x%08x at HC addr 0x%x\n", |
| 2747 | val, BAR_IGU_INTMEM + reg_addr); */ | 2772 | val, reg_addr); |
| 2748 | REG_WR(bp, BAR_IGU_INTMEM + reg_addr, val); | 2773 | REG_WR(bp, reg_addr, val); |
| 2749 | 2774 | ||
| 2750 | if (bp->aeu_mask & (deasserted & 0xff)) | ||
| 2751 | BNX2X_ERR("IGU BUG!\n"); | ||
| 2752 | if (~bp->attn_state & deasserted) | 2775 | if (~bp->attn_state & deasserted) |
| 2753 | BNX2X_ERR("IGU BUG!\n"); | 2776 | BNX2X_ERR("IGU ERROR\n"); |
| 2754 | 2777 | ||
| 2755 | reg_addr = port ? MISC_REG_AEU_MASK_ATTN_FUNC_1 : | 2778 | reg_addr = port ? MISC_REG_AEU_MASK_ATTN_FUNC_1 : |
| 2756 | MISC_REG_AEU_MASK_ATTN_FUNC_0; | 2779 | MISC_REG_AEU_MASK_ATTN_FUNC_0; |
| 2757 | 2780 | ||
| 2758 | DP(NETIF_MSG_HW, "aeu_mask %x\n", bp->aeu_mask); | 2781 | bnx2x_acquire_hw_lock(bp, HW_LOCK_RESOURCE_PORT0_ATT_MASK + port); |
| 2759 | bp->aeu_mask |= (deasserted & 0xff); | 2782 | aeu_mask = REG_RD(bp, reg_addr); |
| 2760 | 2783 | ||
| 2761 | DP(NETIF_MSG_HW, "new mask %x\n", bp->aeu_mask); | 2784 | DP(NETIF_MSG_HW, "aeu_mask %x newly deasserted %x\n", |
| 2762 | REG_WR(bp, reg_addr, bp->aeu_mask); | 2785 | aeu_mask, deasserted); |
| 2786 | aeu_mask |= (deasserted & 0xff); | ||
| 2787 | DP(NETIF_MSG_HW, "new mask %x\n", aeu_mask); | ||
| 2788 | |||
| 2789 | REG_WR(bp, reg_addr, aeu_mask); | ||
| 2790 | bnx2x_release_hw_lock(bp, HW_LOCK_RESOURCE_PORT0_ATT_MASK + port); | ||
| 2763 | 2791 | ||
| 2764 | DP(NETIF_MSG_HW, "attn_state %x\n", bp->attn_state); | 2792 | DP(NETIF_MSG_HW, "attn_state %x\n", bp->attn_state); |
| 2765 | bp->attn_state &= ~deasserted; | 2793 | bp->attn_state &= ~deasserted; |
| @@ -2800,7 +2828,7 @@ static void bnx2x_sp_task(struct work_struct *work) | |||
| 2800 | 2828 | ||
| 2801 | /* Return here if interrupt is disabled */ | 2829 | /* Return here if interrupt is disabled */ |
| 2802 | if (unlikely(atomic_read(&bp->intr_sem) != 0)) { | 2830 | if (unlikely(atomic_read(&bp->intr_sem) != 0)) { |
| 2803 | DP(BNX2X_MSG_SP, "called but intr_sem not 0, returning\n"); | 2831 | DP(NETIF_MSG_INTR, "called but intr_sem not 0, returning\n"); |
| 2804 | return; | 2832 | return; |
| 2805 | } | 2833 | } |
| 2806 | 2834 | ||
| @@ -2808,7 +2836,7 @@ static void bnx2x_sp_task(struct work_struct *work) | |||
| 2808 | /* if (status == 0) */ | 2836 | /* if (status == 0) */ |
| 2809 | /* BNX2X_ERR("spurious slowpath interrupt!\n"); */ | 2837 | /* BNX2X_ERR("spurious slowpath interrupt!\n"); */ |
| 2810 | 2838 | ||
| 2811 | DP(BNX2X_MSG_SP, "got a slowpath interrupt (updated %x)\n", status); | 2839 | DP(NETIF_MSG_INTR, "got a slowpath interrupt (updated %x)\n", status); |
| 2812 | 2840 | ||
| 2813 | /* HW attentions */ | 2841 | /* HW attentions */ |
| 2814 | if (status & 0x1) | 2842 | if (status & 0x1) |
| @@ -2838,7 +2866,7 @@ static irqreturn_t bnx2x_msix_sp_int(int irq, void *dev_instance) | |||
| 2838 | 2866 | ||
| 2839 | /* Return here if interrupt is disabled */ | 2867 | /* Return here if interrupt is disabled */ |
| 2840 | if (unlikely(atomic_read(&bp->intr_sem) != 0)) { | 2868 | if (unlikely(atomic_read(&bp->intr_sem) != 0)) { |
| 2841 | DP(BNX2X_MSG_SP, "called but intr_sem not 0, returning\n"); | 2869 | DP(NETIF_MSG_INTR, "called but intr_sem not 0, returning\n"); |
| 2842 | return IRQ_HANDLED; | 2870 | return IRQ_HANDLED; |
| 2843 | } | 2871 | } |
| 2844 | 2872 | ||
| @@ -2876,11 +2904,11 @@ static irqreturn_t bnx2x_msix_sp_int(int irq, void *dev_instance) | |||
| 2876 | /* underflow */ \ | 2904 | /* underflow */ \ |
| 2877 | d_hi = m_hi - s_hi; \ | 2905 | d_hi = m_hi - s_hi; \ |
| 2878 | if (d_hi > 0) { \ | 2906 | if (d_hi > 0) { \ |
| 2879 | /* we can 'loan' 1 */ \ | 2907 | /* we can 'loan' 1 */ \ |
| 2880 | d_hi--; \ | 2908 | d_hi--; \ |
| 2881 | d_lo = m_lo + (UINT_MAX - s_lo) + 1; \ | 2909 | d_lo = m_lo + (UINT_MAX - s_lo) + 1; \ |
| 2882 | } else { \ | 2910 | } else { \ |
| 2883 | /* m_hi <= s_hi */ \ | 2911 | /* m_hi <= s_hi */ \ |
| 2884 | d_hi = 0; \ | 2912 | d_hi = 0; \ |
| 2885 | d_lo = 0; \ | 2913 | d_lo = 0; \ |
| 2886 | } \ | 2914 | } \ |
| @@ -2890,7 +2918,7 @@ static irqreturn_t bnx2x_msix_sp_int(int irq, void *dev_instance) | |||
| 2890 | d_hi = 0; \ | 2918 | d_hi = 0; \ |
| 2891 | d_lo = 0; \ | 2919 | d_lo = 0; \ |
| 2892 | } else { \ | 2920 | } else { \ |
| 2893 | /* m_hi >= s_hi */ \ | 2921 | /* m_hi >= s_hi */ \ |
| 2894 | d_hi = m_hi - s_hi; \ | 2922 | d_hi = m_hi - s_hi; \ |
| 2895 | d_lo = m_lo - s_lo; \ | 2923 | d_lo = m_lo - s_lo; \ |
| 2896 | } \ | 2924 | } \ |
| @@ -2963,37 +2991,6 @@ static inline long bnx2x_hilo(u32 *hiref) | |||
| 2963 | * Init service functions | 2991 | * Init service functions |
| 2964 | */ | 2992 | */ |
| 2965 | 2993 | ||
| 2966 | static void bnx2x_storm_stats_init(struct bnx2x *bp) | ||
| 2967 | { | ||
| 2968 | int func = BP_FUNC(bp); | ||
| 2969 | |||
| 2970 | REG_WR(bp, BAR_XSTRORM_INTMEM + XSTORM_STATS_FLAGS_OFFSET(func), 1); | ||
| 2971 | REG_WR(bp, BAR_XSTRORM_INTMEM + | ||
| 2972 | XSTORM_STATS_FLAGS_OFFSET(func) + 4, 0); | ||
| 2973 | |||
| 2974 | REG_WR(bp, BAR_TSTRORM_INTMEM + TSTORM_STATS_FLAGS_OFFSET(func), 1); | ||
| 2975 | REG_WR(bp, BAR_TSTRORM_INTMEM + | ||
| 2976 | TSTORM_STATS_FLAGS_OFFSET(func) + 4, 0); | ||
| 2977 | |||
| 2978 | REG_WR(bp, BAR_CSTRORM_INTMEM + CSTORM_STATS_FLAGS_OFFSET(func), 0); | ||
| 2979 | REG_WR(bp, BAR_CSTRORM_INTMEM + | ||
| 2980 | CSTORM_STATS_FLAGS_OFFSET(func) + 4, 0); | ||
| 2981 | |||
| 2982 | REG_WR(bp, BAR_XSTRORM_INTMEM + | ||
| 2983 | XSTORM_ETH_STATS_QUERY_ADDR_OFFSET(func), | ||
| 2984 | U64_LO(bnx2x_sp_mapping(bp, fw_stats))); | ||
| 2985 | REG_WR(bp, BAR_XSTRORM_INTMEM + | ||
| 2986 | XSTORM_ETH_STATS_QUERY_ADDR_OFFSET(func) + 4, | ||
| 2987 | U64_HI(bnx2x_sp_mapping(bp, fw_stats))); | ||
| 2988 | |||
| 2989 | REG_WR(bp, BAR_TSTRORM_INTMEM + | ||
| 2990 | TSTORM_ETH_STATS_QUERY_ADDR_OFFSET(func), | ||
| 2991 | U64_LO(bnx2x_sp_mapping(bp, fw_stats))); | ||
| 2992 | REG_WR(bp, BAR_TSTRORM_INTMEM + | ||
| 2993 | TSTORM_ETH_STATS_QUERY_ADDR_OFFSET(func) + 4, | ||
| 2994 | U64_HI(bnx2x_sp_mapping(bp, fw_stats))); | ||
| 2995 | } | ||
| 2996 | |||
| 2997 | static void bnx2x_storm_stats_post(struct bnx2x *bp) | 2994 | static void bnx2x_storm_stats_post(struct bnx2x *bp) |
| 2998 | { | 2995 | { |
| 2999 | if (!bp->stats_pending) { | 2996 | if (!bp->stats_pending) { |
| @@ -3032,6 +3029,8 @@ static void bnx2x_stats_init(struct bnx2x *bp) | |||
| 3032 | memset(&(bp->port.old_nig_stats), 0, sizeof(struct nig_stats)); | 3029 | memset(&(bp->port.old_nig_stats), 0, sizeof(struct nig_stats)); |
| 3033 | bp->port.old_nig_stats.brb_discard = | 3030 | bp->port.old_nig_stats.brb_discard = |
| 3034 | REG_RD(bp, NIG_REG_STAT0_BRB_DISCARD + port*0x38); | 3031 | REG_RD(bp, NIG_REG_STAT0_BRB_DISCARD + port*0x38); |
| 3032 | bp->port.old_nig_stats.brb_truncate = | ||
| 3033 | REG_RD(bp, NIG_REG_STAT0_BRB_TRUNCATE + port*0x38); | ||
| 3035 | REG_RD_DMAE(bp, NIG_REG_STAT0_EGRESS_MAC_PKT0 + port*0x50, | 3034 | REG_RD_DMAE(bp, NIG_REG_STAT0_EGRESS_MAC_PKT0 + port*0x50, |
| 3036 | &(bp->port.old_nig_stats.egress_mac_pkt0_lo), 2); | 3035 | &(bp->port.old_nig_stats.egress_mac_pkt0_lo), 2); |
| 3037 | REG_RD_DMAE(bp, NIG_REG_STAT0_EGRESS_MAC_PKT1 + port*0x50, | 3036 | REG_RD_DMAE(bp, NIG_REG_STAT0_EGRESS_MAC_PKT1 + port*0x50, |
| @@ -3101,12 +3100,12 @@ static int bnx2x_stats_comp(struct bnx2x *bp) | |||
| 3101 | 3100 | ||
| 3102 | might_sleep(); | 3101 | might_sleep(); |
| 3103 | while (*stats_comp != DMAE_COMP_VAL) { | 3102 | while (*stats_comp != DMAE_COMP_VAL) { |
| 3104 | msleep(1); | ||
| 3105 | if (!cnt) { | 3103 | if (!cnt) { |
| 3106 | BNX2X_ERR("timeout waiting for stats finished\n"); | 3104 | BNX2X_ERR("timeout waiting for stats finished\n"); |
| 3107 | break; | 3105 | break; |
| 3108 | } | 3106 | } |
| 3109 | cnt--; | 3107 | cnt--; |
| 3108 | msleep(1); | ||
| 3110 | } | 3109 | } |
| 3111 | return 1; | 3110 | return 1; |
| 3112 | } | 3111 | } |
| @@ -3451,8 +3450,7 @@ static void bnx2x_bmac_stats_update(struct bnx2x *bp) | |||
| 3451 | UPDATE_STAT64(rx_stat_grovr, rx_stat_dot3statsframestoolong); | 3450 | UPDATE_STAT64(rx_stat_grovr, rx_stat_dot3statsframestoolong); |
| 3452 | UPDATE_STAT64(rx_stat_grfrg, rx_stat_etherstatsfragments); | 3451 | UPDATE_STAT64(rx_stat_grfrg, rx_stat_etherstatsfragments); |
| 3453 | UPDATE_STAT64(rx_stat_grjbr, rx_stat_etherstatsjabbers); | 3452 | UPDATE_STAT64(rx_stat_grjbr, rx_stat_etherstatsjabbers); |
| 3454 | UPDATE_STAT64(rx_stat_grxpf, rx_stat_bmac_xpf); | 3453 | UPDATE_STAT64(rx_stat_grxcf, rx_stat_maccontrolframesreceived); |
| 3455 | UPDATE_STAT64(rx_stat_grxcf, rx_stat_bmac_xcf); | ||
| 3456 | UPDATE_STAT64(rx_stat_grxpf, rx_stat_xoffstateentered); | 3454 | UPDATE_STAT64(rx_stat_grxpf, rx_stat_xoffstateentered); |
| 3457 | UPDATE_STAT64(rx_stat_grxpf, rx_stat_xoffpauseframesreceived); | 3455 | UPDATE_STAT64(rx_stat_grxpf, rx_stat_xoffpauseframesreceived); |
| 3458 | UPDATE_STAT64(tx_stat_gtxpf, tx_stat_outxoffsent); | 3456 | UPDATE_STAT64(tx_stat_gtxpf, tx_stat_outxoffsent); |
| @@ -3536,6 +3534,8 @@ static int bnx2x_hw_stats_update(struct bnx2x *bp) | |||
| 3536 | 3534 | ||
| 3537 | ADD_EXTEND_64(pstats->brb_drop_hi, pstats->brb_drop_lo, | 3535 | ADD_EXTEND_64(pstats->brb_drop_hi, pstats->brb_drop_lo, |
| 3538 | new->brb_discard - old->brb_discard); | 3536 | new->brb_discard - old->brb_discard); |
| 3537 | ADD_EXTEND_64(estats->brb_truncate_hi, estats->brb_truncate_lo, | ||
| 3538 | new->brb_truncate - old->brb_truncate); | ||
| 3539 | 3539 | ||
| 3540 | UPDATE_STAT64_NIG(egress_mac_pkt0, | 3540 | UPDATE_STAT64_NIG(egress_mac_pkt0, |
| 3541 | etherstatspkts1024octetsto1522octets); | 3541 | etherstatspkts1024octetsto1522octets); |
| @@ -3713,8 +3713,7 @@ static void bnx2x_net_stats_update(struct bnx2x *bp) | |||
| 3713 | nstats->rx_length_errors = | 3713 | nstats->rx_length_errors = |
| 3714 | estats->rx_stat_etherstatsundersizepkts_lo + | 3714 | estats->rx_stat_etherstatsundersizepkts_lo + |
| 3715 | estats->jabber_packets_received; | 3715 | estats->jabber_packets_received; |
| 3716 | nstats->rx_over_errors = estats->brb_drop_lo + | 3716 | nstats->rx_over_errors = estats->brb_drop_lo + estats->brb_truncate_lo; |
| 3717 | estats->brb_truncate_discard; | ||
| 3718 | nstats->rx_crc_errors = estats->rx_stat_dot3statsfcserrors_lo; | 3717 | nstats->rx_crc_errors = estats->rx_stat_dot3statsfcserrors_lo; |
| 3719 | nstats->rx_frame_errors = estats->rx_stat_dot3statsalignmenterrors_lo; | 3718 | nstats->rx_frame_errors = estats->rx_stat_dot3statsalignmenterrors_lo; |
| 3720 | nstats->rx_fifo_errors = old_tclient->no_buff_discard; | 3719 | nstats->rx_fifo_errors = old_tclient->no_buff_discard; |
| @@ -3783,7 +3782,7 @@ static void bnx2x_stats_update(struct bnx2x *bp) | |||
| 3783 | bp->fp->rx_comp_cons), | 3782 | bp->fp->rx_comp_cons), |
| 3784 | le16_to_cpu(*bp->fp->rx_cons_sb), nstats->rx_packets); | 3783 | le16_to_cpu(*bp->fp->rx_cons_sb), nstats->rx_packets); |
| 3785 | printk(KERN_DEBUG " %s (Xoff events %u) brb drops %u\n", | 3784 | printk(KERN_DEBUG " %s (Xoff events %u) brb drops %u\n", |
| 3786 | netif_queue_stopped(bp->dev)? "Xoff" : "Xon", | 3785 | netif_queue_stopped(bp->dev) ? "Xoff" : "Xon", |
| 3787 | estats->driver_xoff, estats->brb_drop_lo); | 3786 | estats->driver_xoff, estats->brb_drop_lo); |
| 3788 | printk(KERN_DEBUG "tstats: checksum_discard %u " | 3787 | printk(KERN_DEBUG "tstats: checksum_discard %u " |
| 3789 | "packets_too_big_discard %u no_buff_discard %u " | 3788 | "packets_too_big_discard %u no_buff_discard %u " |
| @@ -3994,14 +3993,14 @@ static void bnx2x_zero_sb(struct bnx2x *bp, int sb_id) | |||
| 3994 | 3993 | ||
| 3995 | bnx2x_init_fill(bp, BAR_USTRORM_INTMEM + | 3994 | bnx2x_init_fill(bp, BAR_USTRORM_INTMEM + |
| 3996 | USTORM_SB_HOST_STATUS_BLOCK_OFFSET(port, sb_id), 0, | 3995 | USTORM_SB_HOST_STATUS_BLOCK_OFFSET(port, sb_id), 0, |
| 3997 | sizeof(struct ustorm_def_status_block)/4); | 3996 | sizeof(struct ustorm_status_block)/4); |
| 3998 | bnx2x_init_fill(bp, BAR_CSTRORM_INTMEM + | 3997 | bnx2x_init_fill(bp, BAR_CSTRORM_INTMEM + |
| 3999 | CSTORM_SB_HOST_STATUS_BLOCK_OFFSET(port, sb_id), 0, | 3998 | CSTORM_SB_HOST_STATUS_BLOCK_OFFSET(port, sb_id), 0, |
| 4000 | sizeof(struct cstorm_def_status_block)/4); | 3999 | sizeof(struct cstorm_status_block)/4); |
| 4001 | } | 4000 | } |
| 4002 | 4001 | ||
| 4003 | static void bnx2x_init_sb(struct bnx2x *bp, int sb_id, | 4002 | static void bnx2x_init_sb(struct bnx2x *bp, struct host_status_block *sb, |
| 4004 | struct host_status_block *sb, dma_addr_t mapping) | 4003 | dma_addr_t mapping, int sb_id) |
| 4005 | { | 4004 | { |
| 4006 | int port = BP_PORT(bp); | 4005 | int port = BP_PORT(bp); |
| 4007 | int func = BP_FUNC(bp); | 4006 | int func = BP_FUNC(bp); |
| @@ -4077,7 +4076,6 @@ static void bnx2x_init_def_sb(struct bnx2x *bp, | |||
| 4077 | atten_status_block); | 4076 | atten_status_block); |
| 4078 | def_sb->atten_status_block.status_block_id = sb_id; | 4077 | def_sb->atten_status_block.status_block_id = sb_id; |
| 4079 | 4078 | ||
| 4080 | bp->def_att_idx = 0; | ||
| 4081 | bp->attn_state = 0; | 4079 | bp->attn_state = 0; |
| 4082 | 4080 | ||
| 4083 | reg_offset = (port ? MISC_REG_AEU_ENABLE1_FUNC_1_OUT_0 : | 4081 | reg_offset = (port ? MISC_REG_AEU_ENABLE1_FUNC_1_OUT_0 : |
| @@ -4094,9 +4092,6 @@ static void bnx2x_init_def_sb(struct bnx2x *bp, | |||
| 4094 | reg_offset + 0xc + 0x10*index); | 4092 | reg_offset + 0xc + 0x10*index); |
| 4095 | } | 4093 | } |
| 4096 | 4094 | ||
| 4097 | bp->aeu_mask = REG_RD(bp, (port ? MISC_REG_AEU_MASK_ATTN_FUNC_1 : | ||
| 4098 | MISC_REG_AEU_MASK_ATTN_FUNC_0)); | ||
| 4099 | |||
| 4100 | reg_offset = (port ? HC_REG_ATTN_MSG1_ADDR_L : | 4095 | reg_offset = (port ? HC_REG_ATTN_MSG1_ADDR_L : |
| 4101 | HC_REG_ATTN_MSG0_ADDR_L); | 4096 | HC_REG_ATTN_MSG0_ADDR_L); |
| 4102 | 4097 | ||
| @@ -4114,17 +4109,13 @@ static void bnx2x_init_def_sb(struct bnx2x *bp, | |||
| 4114 | u_def_status_block); | 4109 | u_def_status_block); |
| 4115 | def_sb->u_def_status_block.status_block_id = sb_id; | 4110 | def_sb->u_def_status_block.status_block_id = sb_id; |
| 4116 | 4111 | ||
| 4117 | bp->def_u_idx = 0; | ||
| 4118 | |||
| 4119 | REG_WR(bp, BAR_USTRORM_INTMEM + | 4112 | REG_WR(bp, BAR_USTRORM_INTMEM + |
| 4120 | USTORM_DEF_SB_HOST_SB_ADDR_OFFSET(func), U64_LO(section)); | 4113 | USTORM_DEF_SB_HOST_SB_ADDR_OFFSET(func), U64_LO(section)); |
| 4121 | REG_WR(bp, BAR_USTRORM_INTMEM + | 4114 | REG_WR(bp, BAR_USTRORM_INTMEM + |
| 4122 | ((USTORM_DEF_SB_HOST_SB_ADDR_OFFSET(func)) + 4), | 4115 | ((USTORM_DEF_SB_HOST_SB_ADDR_OFFSET(func)) + 4), |
| 4123 | U64_HI(section)); | 4116 | U64_HI(section)); |
| 4124 | REG_WR8(bp, BAR_USTRORM_INTMEM + DEF_USB_FUNC_OFF + | 4117 | REG_WR8(bp, BAR_USTRORM_INTMEM + DEF_USB_FUNC_OFF + |
| 4125 | USTORM_DEF_SB_HOST_STATUS_BLOCK_OFFSET(func), func); | 4118 | USTORM_DEF_SB_HOST_STATUS_BLOCK_OFFSET(func), func); |
| 4126 | REG_WR(bp, BAR_USTRORM_INTMEM + USTORM_HC_BTR_OFFSET(func), | ||
| 4127 | BNX2X_BTR); | ||
| 4128 | 4119 | ||
| 4129 | for (index = 0; index < HC_USTORM_DEF_SB_NUM_INDICES; index++) | 4120 | for (index = 0; index < HC_USTORM_DEF_SB_NUM_INDICES; index++) |
| 4130 | REG_WR16(bp, BAR_USTRORM_INTMEM + | 4121 | REG_WR16(bp, BAR_USTRORM_INTMEM + |
| @@ -4135,17 +4126,13 @@ static void bnx2x_init_def_sb(struct bnx2x *bp, | |||
| 4135 | c_def_status_block); | 4126 | c_def_status_block); |
| 4136 | def_sb->c_def_status_block.status_block_id = sb_id; | 4127 | def_sb->c_def_status_block.status_block_id = sb_id; |
| 4137 | 4128 | ||
| 4138 | bp->def_c_idx = 0; | ||
| 4139 | |||
| 4140 | REG_WR(bp, BAR_CSTRORM_INTMEM + | 4129 | REG_WR(bp, BAR_CSTRORM_INTMEM + |
| 4141 | CSTORM_DEF_SB_HOST_SB_ADDR_OFFSET(func), U64_LO(section)); | 4130 | CSTORM_DEF_SB_HOST_SB_ADDR_OFFSET(func), U64_LO(section)); |
| 4142 | REG_WR(bp, BAR_CSTRORM_INTMEM + | 4131 | REG_WR(bp, BAR_CSTRORM_INTMEM + |
| 4143 | ((CSTORM_DEF_SB_HOST_SB_ADDR_OFFSET(func)) + 4), | 4132 | ((CSTORM_DEF_SB_HOST_SB_ADDR_OFFSET(func)) + 4), |
| 4144 | U64_HI(section)); | 4133 | U64_HI(section)); |
| 4145 | REG_WR8(bp, BAR_CSTRORM_INTMEM + DEF_CSB_FUNC_OFF + | 4134 | REG_WR8(bp, BAR_CSTRORM_INTMEM + DEF_CSB_FUNC_OFF + |
| 4146 | CSTORM_DEF_SB_HOST_STATUS_BLOCK_OFFSET(func), func); | 4135 | CSTORM_DEF_SB_HOST_STATUS_BLOCK_OFFSET(func), func); |
| 4147 | REG_WR(bp, BAR_CSTRORM_INTMEM + CSTORM_HC_BTR_OFFSET(func), | ||
| 4148 | BNX2X_BTR); | ||
| 4149 | 4136 | ||
| 4150 | for (index = 0; index < HC_CSTORM_DEF_SB_NUM_INDICES; index++) | 4137 | for (index = 0; index < HC_CSTORM_DEF_SB_NUM_INDICES; index++) |
| 4151 | REG_WR16(bp, BAR_CSTRORM_INTMEM + | 4138 | REG_WR16(bp, BAR_CSTRORM_INTMEM + |
| @@ -4156,17 +4143,13 @@ static void bnx2x_init_def_sb(struct bnx2x *bp, | |||
| 4156 | t_def_status_block); | 4143 | t_def_status_block); |
| 4157 | def_sb->t_def_status_block.status_block_id = sb_id; | 4144 | def_sb->t_def_status_block.status_block_id = sb_id; |
| 4158 | 4145 | ||
| 4159 | bp->def_t_idx = 0; | ||
| 4160 | |||
| 4161 | REG_WR(bp, BAR_TSTRORM_INTMEM + | 4146 | REG_WR(bp, BAR_TSTRORM_INTMEM + |
| 4162 | TSTORM_DEF_SB_HOST_SB_ADDR_OFFSET(func), U64_LO(section)); | 4147 | TSTORM_DEF_SB_HOST_SB_ADDR_OFFSET(func), U64_LO(section)); |
| 4163 | REG_WR(bp, BAR_TSTRORM_INTMEM + | 4148 | REG_WR(bp, BAR_TSTRORM_INTMEM + |
| 4164 | ((TSTORM_DEF_SB_HOST_SB_ADDR_OFFSET(func)) + 4), | 4149 | ((TSTORM_DEF_SB_HOST_SB_ADDR_OFFSET(func)) + 4), |
| 4165 | U64_HI(section)); | 4150 | U64_HI(section)); |
| 4166 | REG_WR8(bp, BAR_TSTRORM_INTMEM + DEF_TSB_FUNC_OFF + | 4151 | REG_WR8(bp, BAR_TSTRORM_INTMEM + DEF_TSB_FUNC_OFF + |
| 4167 | TSTORM_DEF_SB_HOST_STATUS_BLOCK_OFFSET(func), func); | 4152 | TSTORM_DEF_SB_HOST_STATUS_BLOCK_OFFSET(func), func); |
| 4168 | REG_WR(bp, BAR_TSTRORM_INTMEM + TSTORM_HC_BTR_OFFSET(func), | ||
| 4169 | BNX2X_BTR); | ||
| 4170 | 4153 | ||
| 4171 | for (index = 0; index < HC_TSTORM_DEF_SB_NUM_INDICES; index++) | 4154 | for (index = 0; index < HC_TSTORM_DEF_SB_NUM_INDICES; index++) |
| 4172 | REG_WR16(bp, BAR_TSTRORM_INTMEM + | 4155 | REG_WR16(bp, BAR_TSTRORM_INTMEM + |
| @@ -4177,23 +4160,20 @@ static void bnx2x_init_def_sb(struct bnx2x *bp, | |||
| 4177 | x_def_status_block); | 4160 | x_def_status_block); |
| 4178 | def_sb->x_def_status_block.status_block_id = sb_id; | 4161 | def_sb->x_def_status_block.status_block_id = sb_id; |
| 4179 | 4162 | ||
| 4180 | bp->def_x_idx = 0; | ||
| 4181 | |||
| 4182 | REG_WR(bp, BAR_XSTRORM_INTMEM + | 4163 | REG_WR(bp, BAR_XSTRORM_INTMEM + |
| 4183 | XSTORM_DEF_SB_HOST_SB_ADDR_OFFSET(func), U64_LO(section)); | 4164 | XSTORM_DEF_SB_HOST_SB_ADDR_OFFSET(func), U64_LO(section)); |
| 4184 | REG_WR(bp, BAR_XSTRORM_INTMEM + | 4165 | REG_WR(bp, BAR_XSTRORM_INTMEM + |
| 4185 | ((XSTORM_DEF_SB_HOST_SB_ADDR_OFFSET(func)) + 4), | 4166 | ((XSTORM_DEF_SB_HOST_SB_ADDR_OFFSET(func)) + 4), |
| 4186 | U64_HI(section)); | 4167 | U64_HI(section)); |
| 4187 | REG_WR8(bp, BAR_XSTRORM_INTMEM + DEF_XSB_FUNC_OFF + | 4168 | REG_WR8(bp, BAR_XSTRORM_INTMEM + DEF_XSB_FUNC_OFF + |
| 4188 | XSTORM_DEF_SB_HOST_STATUS_BLOCK_OFFSET(func), func); | 4169 | XSTORM_DEF_SB_HOST_STATUS_BLOCK_OFFSET(func), func); |
| 4189 | REG_WR(bp, BAR_XSTRORM_INTMEM + XSTORM_HC_BTR_OFFSET(func), | ||
| 4190 | BNX2X_BTR); | ||
| 4191 | 4170 | ||
| 4192 | for (index = 0; index < HC_XSTORM_DEF_SB_NUM_INDICES; index++) | 4171 | for (index = 0; index < HC_XSTORM_DEF_SB_NUM_INDICES; index++) |
| 4193 | REG_WR16(bp, BAR_XSTRORM_INTMEM + | 4172 | REG_WR16(bp, BAR_XSTRORM_INTMEM + |
| 4194 | XSTORM_DEF_SB_HC_DISABLE_OFFSET(func, index), 1); | 4173 | XSTORM_DEF_SB_HC_DISABLE_OFFSET(func, index), 1); |
| 4195 | 4174 | ||
| 4196 | bp->stats_pending = 0; | 4175 | bp->stats_pending = 0; |
| 4176 | bp->set_mac_pending = 0; | ||
| 4197 | 4177 | ||
| 4198 | bnx2x_ack_sb(bp, sb_id, CSTORM_ID, 0, IGU_INT_ENABLE, 0); | 4178 | bnx2x_ack_sb(bp, sb_id, CSTORM_ID, 0, IGU_INT_ENABLE, 0); |
| 4199 | } | 4179 | } |
| @@ -4209,21 +4189,25 @@ static void bnx2x_update_coalesce(struct bnx2x *bp) | |||
| 4209 | /* HC_INDEX_U_ETH_RX_CQ_CONS */ | 4189 | /* HC_INDEX_U_ETH_RX_CQ_CONS */ |
| 4210 | REG_WR8(bp, BAR_USTRORM_INTMEM + | 4190 | REG_WR8(bp, BAR_USTRORM_INTMEM + |
| 4211 | USTORM_SB_HC_TIMEOUT_OFFSET(port, sb_id, | 4191 | USTORM_SB_HC_TIMEOUT_OFFSET(port, sb_id, |
| 4212 | HC_INDEX_U_ETH_RX_CQ_CONS), | 4192 | U_SB_ETH_RX_CQ_INDEX), |
| 4213 | bp->rx_ticks/12); | 4193 | bp->rx_ticks/12); |
| 4214 | REG_WR16(bp, BAR_USTRORM_INTMEM + | 4194 | REG_WR16(bp, BAR_USTRORM_INTMEM + |
| 4215 | USTORM_SB_HC_DISABLE_OFFSET(port, sb_id, | 4195 | USTORM_SB_HC_DISABLE_OFFSET(port, sb_id, |
| 4216 | HC_INDEX_U_ETH_RX_CQ_CONS), | 4196 | U_SB_ETH_RX_CQ_INDEX), |
| 4197 | bp->rx_ticks ? 0 : 1); | ||
| 4198 | REG_WR16(bp, BAR_USTRORM_INTMEM + | ||
| 4199 | USTORM_SB_HC_DISABLE_OFFSET(port, sb_id, | ||
| 4200 | U_SB_ETH_RX_BD_INDEX), | ||
| 4217 | bp->rx_ticks ? 0 : 1); | 4201 | bp->rx_ticks ? 0 : 1); |
| 4218 | 4202 | ||
| 4219 | /* HC_INDEX_C_ETH_TX_CQ_CONS */ | 4203 | /* HC_INDEX_C_ETH_TX_CQ_CONS */ |
| 4220 | REG_WR8(bp, BAR_CSTRORM_INTMEM + | 4204 | REG_WR8(bp, BAR_CSTRORM_INTMEM + |
| 4221 | CSTORM_SB_HC_TIMEOUT_OFFSET(port, sb_id, | 4205 | CSTORM_SB_HC_TIMEOUT_OFFSET(port, sb_id, |
| 4222 | HC_INDEX_C_ETH_TX_CQ_CONS), | 4206 | C_SB_ETH_TX_CQ_INDEX), |
| 4223 | bp->tx_ticks/12); | 4207 | bp->tx_ticks/12); |
| 4224 | REG_WR16(bp, BAR_CSTRORM_INTMEM + | 4208 | REG_WR16(bp, BAR_CSTRORM_INTMEM + |
| 4225 | CSTORM_SB_HC_DISABLE_OFFSET(port, sb_id, | 4209 | CSTORM_SB_HC_DISABLE_OFFSET(port, sb_id, |
| 4226 | HC_INDEX_C_ETH_TX_CQ_CONS), | 4210 | C_SB_ETH_TX_CQ_INDEX), |
| 4227 | bp->tx_ticks ? 0 : 1); | 4211 | bp->tx_ticks ? 0 : 1); |
| 4228 | } | 4212 | } |
| 4229 | } | 4213 | } |
| @@ -4245,7 +4229,7 @@ static inline void bnx2x_free_tpa_pool(struct bnx2x *bp, | |||
| 4245 | if (fp->tpa_state[i] == BNX2X_TPA_START) | 4229 | if (fp->tpa_state[i] == BNX2X_TPA_START) |
| 4246 | pci_unmap_single(bp->pdev, | 4230 | pci_unmap_single(bp->pdev, |
| 4247 | pci_unmap_addr(rx_buf, mapping), | 4231 | pci_unmap_addr(rx_buf, mapping), |
| 4248 | bp->rx_buf_use_size, | 4232 | bp->rx_buf_size, |
| 4249 | PCI_DMA_FROMDEVICE); | 4233 | PCI_DMA_FROMDEVICE); |
| 4250 | 4234 | ||
| 4251 | dev_kfree_skb(skb); | 4235 | dev_kfree_skb(skb); |
| @@ -4256,23 +4240,24 @@ static inline void bnx2x_free_tpa_pool(struct bnx2x *bp, | |||
| 4256 | static void bnx2x_init_rx_rings(struct bnx2x *bp) | 4240 | static void bnx2x_init_rx_rings(struct bnx2x *bp) |
| 4257 | { | 4241 | { |
| 4258 | int func = BP_FUNC(bp); | 4242 | int func = BP_FUNC(bp); |
| 4259 | u16 ring_prod, cqe_ring_prod = 0; | 4243 | int max_agg_queues = CHIP_IS_E1(bp) ? ETH_MAX_AGGREGATION_QUEUES_E1 : |
| 4244 | ETH_MAX_AGGREGATION_QUEUES_E1H; | ||
| 4245 | u16 ring_prod, cqe_ring_prod; | ||
| 4260 | int i, j; | 4246 | int i, j; |
| 4261 | 4247 | ||
| 4262 | bp->rx_buf_use_size = bp->dev->mtu; | 4248 | bp->rx_buf_size = bp->dev->mtu; |
| 4263 | bp->rx_buf_use_size += bp->rx_offset + ETH_OVREHEAD; | 4249 | bp->rx_buf_size += bp->rx_offset + ETH_OVREHEAD + |
| 4264 | bp->rx_buf_size = bp->rx_buf_use_size + 64; | 4250 | BCM_RX_ETH_PAYLOAD_ALIGN; |
| 4265 | 4251 | ||
| 4266 | if (bp->flags & TPA_ENABLE_FLAG) { | 4252 | if (bp->flags & TPA_ENABLE_FLAG) { |
| 4267 | DP(NETIF_MSG_IFUP, | 4253 | DP(NETIF_MSG_IFUP, |
| 4268 | "rx_buf_use_size %d rx_buf_size %d effective_mtu %d\n", | 4254 | "rx_buf_size %d effective_mtu %d\n", |
| 4269 | bp->rx_buf_use_size, bp->rx_buf_size, | 4255 | bp->rx_buf_size, bp->dev->mtu + ETH_OVREHEAD); |
| 4270 | bp->dev->mtu + ETH_OVREHEAD); | ||
| 4271 | 4256 | ||
| 4272 | for_each_queue(bp, j) { | 4257 | for_each_queue(bp, j) { |
| 4273 | for (i = 0; i < ETH_MAX_AGGREGATION_QUEUES_E1H; i++) { | 4258 | struct bnx2x_fastpath *fp = &bp->fp[j]; |
| 4274 | struct bnx2x_fastpath *fp = &bp->fp[j]; | ||
| 4275 | 4259 | ||
| 4260 | for (i = 0; i < max_agg_queues; i++) { | ||
| 4276 | fp->tpa_pool[i].skb = | 4261 | fp->tpa_pool[i].skb = |
| 4277 | netdev_alloc_skb(bp->dev, bp->rx_buf_size); | 4262 | netdev_alloc_skb(bp->dev, bp->rx_buf_size); |
| 4278 | if (!fp->tpa_pool[i].skb) { | 4263 | if (!fp->tpa_pool[i].skb) { |
| @@ -4352,8 +4337,7 @@ static void bnx2x_init_rx_rings(struct bnx2x *bp) | |||
| 4352 | BNX2X_ERR("disabling TPA for queue[%d]\n", j); | 4337 | BNX2X_ERR("disabling TPA for queue[%d]\n", j); |
| 4353 | /* Cleanup already allocated elements */ | 4338 | /* Cleanup already allocated elements */ |
| 4354 | bnx2x_free_rx_sge_range(bp, fp, ring_prod); | 4339 | bnx2x_free_rx_sge_range(bp, fp, ring_prod); |
| 4355 | bnx2x_free_tpa_pool(bp, fp, | 4340 | bnx2x_free_tpa_pool(bp, fp, max_agg_queues); |
| 4356 | ETH_MAX_AGGREGATION_QUEUES_E1H); | ||
| 4357 | fp->disable_tpa = 1; | 4341 | fp->disable_tpa = 1; |
| 4358 | ring_prod = 0; | 4342 | ring_prod = 0; |
| 4359 | break; | 4343 | break; |
| @@ -4363,13 +4347,13 @@ static void bnx2x_init_rx_rings(struct bnx2x *bp) | |||
| 4363 | fp->rx_sge_prod = ring_prod; | 4347 | fp->rx_sge_prod = ring_prod; |
| 4364 | 4348 | ||
| 4365 | /* Allocate BDs and initialize BD ring */ | 4349 | /* Allocate BDs and initialize BD ring */ |
| 4366 | fp->rx_comp_cons = fp->rx_alloc_failed = 0; | 4350 | fp->rx_comp_cons = 0; |
| 4367 | cqe_ring_prod = ring_prod = 0; | 4351 | cqe_ring_prod = ring_prod = 0; |
| 4368 | for (i = 0; i < bp->rx_ring_size; i++) { | 4352 | for (i = 0; i < bp->rx_ring_size; i++) { |
| 4369 | if (bnx2x_alloc_rx_skb(bp, fp, ring_prod) < 0) { | 4353 | if (bnx2x_alloc_rx_skb(bp, fp, ring_prod) < 0) { |
| 4370 | BNX2X_ERR("was only able to allocate " | 4354 | BNX2X_ERR("was only able to allocate " |
| 4371 | "%d rx skbs\n", i); | 4355 | "%d rx skbs\n", i); |
| 4372 | fp->rx_alloc_failed++; | 4356 | bp->eth_stats.rx_skb_alloc_failed++; |
| 4373 | break; | 4357 | break; |
| 4374 | } | 4358 | } |
| 4375 | ring_prod = NEXT_RX_IDX(ring_prod); | 4359 | ring_prod = NEXT_RX_IDX(ring_prod); |
| @@ -4477,9 +4461,10 @@ static void bnx2x_init_context(struct bnx2x *bp) | |||
| 4477 | context->ustorm_st_context.common.status_block_id = sb_id; | 4461 | context->ustorm_st_context.common.status_block_id = sb_id; |
| 4478 | context->ustorm_st_context.common.flags = | 4462 | context->ustorm_st_context.common.flags = |
| 4479 | USTORM_ETH_ST_CONTEXT_CONFIG_ENABLE_MC_ALIGNMENT; | 4463 | USTORM_ETH_ST_CONTEXT_CONFIG_ENABLE_MC_ALIGNMENT; |
| 4480 | context->ustorm_st_context.common.mc_alignment_size = 64; | 4464 | context->ustorm_st_context.common.mc_alignment_size = |
| 4465 | BCM_RX_ETH_PAYLOAD_ALIGN; | ||
| 4481 | context->ustorm_st_context.common.bd_buff_size = | 4466 | context->ustorm_st_context.common.bd_buff_size = |
| 4482 | bp->rx_buf_use_size; | 4467 | bp->rx_buf_size; |
| 4483 | context->ustorm_st_context.common.bd_page_base_hi = | 4468 | context->ustorm_st_context.common.bd_page_base_hi = |
| 4484 | U64_HI(fp->rx_desc_mapping); | 4469 | U64_HI(fp->rx_desc_mapping); |
| 4485 | context->ustorm_st_context.common.bd_page_base_lo = | 4470 | context->ustorm_st_context.common.bd_page_base_lo = |
| @@ -4497,7 +4482,7 @@ static void bnx2x_init_context(struct bnx2x *bp) | |||
| 4497 | } | 4482 | } |
| 4498 | 4483 | ||
| 4499 | context->cstorm_st_context.sb_index_number = | 4484 | context->cstorm_st_context.sb_index_number = |
| 4500 | HC_INDEX_C_ETH_TX_CQ_CONS; | 4485 | C_SB_ETH_TX_CQ_INDEX; |
| 4501 | context->cstorm_st_context.status_block_id = sb_id; | 4486 | context->cstorm_st_context.status_block_id = sb_id; |
| 4502 | 4487 | ||
| 4503 | context->xstorm_ag_context.cdu_reserved = | 4488 | context->xstorm_ag_context.cdu_reserved = |
| @@ -4535,7 +4520,7 @@ static void bnx2x_set_client_config(struct bnx2x *bp) | |||
| 4535 | int i; | 4520 | int i; |
| 4536 | 4521 | ||
| 4537 | tstorm_client.mtu = bp->dev->mtu + ETH_OVREHEAD; | 4522 | tstorm_client.mtu = bp->dev->mtu + ETH_OVREHEAD; |
| 4538 | tstorm_client.statistics_counter_id = 0; | 4523 | tstorm_client.statistics_counter_id = BP_CL_ID(bp); |
| 4539 | tstorm_client.config_flags = | 4524 | tstorm_client.config_flags = |
| 4540 | TSTORM_ETH_CLIENT_CONFIG_STATSITICS_ENABLE; | 4525 | TSTORM_ETH_CLIENT_CONFIG_STATSITICS_ENABLE; |
| 4541 | #ifdef BCM_VLAN | 4526 | #ifdef BCM_VLAN |
| @@ -4579,7 +4564,7 @@ static void bnx2x_set_storm_rx_mode(struct bnx2x *bp) | |||
| 4579 | int func = BP_FUNC(bp); | 4564 | int func = BP_FUNC(bp); |
| 4580 | int i; | 4565 | int i; |
| 4581 | 4566 | ||
| 4582 | DP(NETIF_MSG_RX_STATUS, "rx mode is %d\n", mode); | 4567 | DP(NETIF_MSG_IFUP, "rx mode %d mask 0x%x\n", mode, mask); |
| 4583 | 4568 | ||
| 4584 | switch (mode) { | 4569 | switch (mode) { |
| 4585 | case BNX2X_RX_MODE_NONE: /* no Rx */ | 4570 | case BNX2X_RX_MODE_NONE: /* no Rx */ |
| @@ -4617,13 +4602,46 @@ static void bnx2x_set_storm_rx_mode(struct bnx2x *bp) | |||
| 4617 | bnx2x_set_client_config(bp); | 4602 | bnx2x_set_client_config(bp); |
| 4618 | } | 4603 | } |
| 4619 | 4604 | ||
| 4620 | static void bnx2x_init_internal(struct bnx2x *bp) | 4605 | static void bnx2x_init_internal_common(struct bnx2x *bp) |
| 4606 | { | ||
| 4607 | int i; | ||
| 4608 | |||
| 4609 | if (bp->flags & TPA_ENABLE_FLAG) { | ||
| 4610 | struct tstorm_eth_tpa_exist tpa = {0}; | ||
| 4611 | |||
| 4612 | tpa.tpa_exist = 1; | ||
| 4613 | |||
| 4614 | REG_WR(bp, BAR_TSTRORM_INTMEM + TSTORM_TPA_EXIST_OFFSET, | ||
| 4615 | ((u32 *)&tpa)[0]); | ||
| 4616 | REG_WR(bp, BAR_TSTRORM_INTMEM + TSTORM_TPA_EXIST_OFFSET + 4, | ||
| 4617 | ((u32 *)&tpa)[1]); | ||
| 4618 | } | ||
| 4619 | |||
| 4620 | /* Zero this manually as its initialization is | ||
| 4621 | currently missing in the initTool */ | ||
| 4622 | for (i = 0; i < (USTORM_AGG_DATA_SIZE >> 2); i++) | ||
| 4623 | REG_WR(bp, BAR_USTRORM_INTMEM + | ||
| 4624 | USTORM_AGG_DATA_OFFSET + i * 4, 0); | ||
| 4625 | } | ||
| 4626 | |||
| 4627 | static void bnx2x_init_internal_port(struct bnx2x *bp) | ||
| 4628 | { | ||
| 4629 | int port = BP_PORT(bp); | ||
| 4630 | |||
| 4631 | REG_WR(bp, BAR_USTRORM_INTMEM + USTORM_HC_BTR_OFFSET(port), BNX2X_BTR); | ||
| 4632 | REG_WR(bp, BAR_CSTRORM_INTMEM + CSTORM_HC_BTR_OFFSET(port), BNX2X_BTR); | ||
| 4633 | REG_WR(bp, BAR_TSTRORM_INTMEM + TSTORM_HC_BTR_OFFSET(port), BNX2X_BTR); | ||
| 4634 | REG_WR(bp, BAR_XSTRORM_INTMEM + XSTORM_HC_BTR_OFFSET(port), BNX2X_BTR); | ||
| 4635 | } | ||
| 4636 | |||
| 4637 | static void bnx2x_init_internal_func(struct bnx2x *bp) | ||
| 4621 | { | 4638 | { |
| 4622 | struct tstorm_eth_function_common_config tstorm_config = {0}; | 4639 | struct tstorm_eth_function_common_config tstorm_config = {0}; |
| 4623 | struct stats_indication_flags stats_flags = {0}; | 4640 | struct stats_indication_flags stats_flags = {0}; |
| 4624 | int port = BP_PORT(bp); | 4641 | int port = BP_PORT(bp); |
| 4625 | int func = BP_FUNC(bp); | 4642 | int func = BP_FUNC(bp); |
| 4626 | int i; | 4643 | int i; |
| 4644 | u16 max_agg_size; | ||
| 4627 | 4645 | ||
| 4628 | if (is_multi(bp)) { | 4646 | if (is_multi(bp)) { |
| 4629 | tstorm_config.config_flags = MULTI_FLAGS; | 4647 | tstorm_config.config_flags = MULTI_FLAGS; |
| @@ -4636,31 +4654,53 @@ static void bnx2x_init_internal(struct bnx2x *bp) | |||
| 4636 | TSTORM_FUNCTION_COMMON_CONFIG_OFFSET(func), | 4654 | TSTORM_FUNCTION_COMMON_CONFIG_OFFSET(func), |
| 4637 | (*(u32 *)&tstorm_config)); | 4655 | (*(u32 *)&tstorm_config)); |
| 4638 | 4656 | ||
| 4639 | /* DP(NETIF_MSG_IFUP, "tstorm_config: 0x%08x\n", | ||
| 4640 | (*(u32 *)&tstorm_config)); */ | ||
| 4641 | |||
| 4642 | bp->rx_mode = BNX2X_RX_MODE_NONE; /* no rx until link is up */ | 4657 | bp->rx_mode = BNX2X_RX_MODE_NONE; /* no rx until link is up */ |
| 4643 | bnx2x_set_storm_rx_mode(bp); | 4658 | bnx2x_set_storm_rx_mode(bp); |
| 4644 | 4659 | ||
| 4660 | /* reset xstorm per client statistics */ | ||
| 4661 | for (i = 0; i < sizeof(struct xstorm_per_client_stats) / 4; i++) { | ||
| 4662 | REG_WR(bp, BAR_XSTRORM_INTMEM + | ||
| 4663 | XSTORM_PER_COUNTER_ID_STATS_OFFSET(port, BP_CL_ID(bp)) + | ||
| 4664 | i*4, 0); | ||
| 4665 | } | ||
| 4666 | /* reset tstorm per client statistics */ | ||
| 4667 | for (i = 0; i < sizeof(struct tstorm_per_client_stats) / 4; i++) { | ||
| 4668 | REG_WR(bp, BAR_TSTRORM_INTMEM + | ||
| 4669 | TSTORM_PER_COUNTER_ID_STATS_OFFSET(port, BP_CL_ID(bp)) + | ||
| 4670 | i*4, 0); | ||
| 4671 | } | ||
| 4672 | |||
| 4673 | /* Init statistics related context */ | ||
| 4645 | stats_flags.collect_eth = 1; | 4674 | stats_flags.collect_eth = 1; |
| 4646 | 4675 | ||
| 4647 | REG_WR(bp, BAR_XSTRORM_INTMEM + XSTORM_STATS_FLAGS_OFFSET(port), | 4676 | REG_WR(bp, BAR_XSTRORM_INTMEM + XSTORM_STATS_FLAGS_OFFSET(func), |
| 4648 | ((u32 *)&stats_flags)[0]); | 4677 | ((u32 *)&stats_flags)[0]); |
| 4649 | REG_WR(bp, BAR_XSTRORM_INTMEM + XSTORM_STATS_FLAGS_OFFSET(port) + 4, | 4678 | REG_WR(bp, BAR_XSTRORM_INTMEM + XSTORM_STATS_FLAGS_OFFSET(func) + 4, |
| 4650 | ((u32 *)&stats_flags)[1]); | 4679 | ((u32 *)&stats_flags)[1]); |
| 4651 | 4680 | ||
| 4652 | REG_WR(bp, BAR_TSTRORM_INTMEM + TSTORM_STATS_FLAGS_OFFSET(port), | 4681 | REG_WR(bp, BAR_TSTRORM_INTMEM + TSTORM_STATS_FLAGS_OFFSET(func), |
| 4653 | ((u32 *)&stats_flags)[0]); | 4682 | ((u32 *)&stats_flags)[0]); |
| 4654 | REG_WR(bp, BAR_TSTRORM_INTMEM + TSTORM_STATS_FLAGS_OFFSET(port) + 4, | 4683 | REG_WR(bp, BAR_TSTRORM_INTMEM + TSTORM_STATS_FLAGS_OFFSET(func) + 4, |
| 4655 | ((u32 *)&stats_flags)[1]); | 4684 | ((u32 *)&stats_flags)[1]); |
| 4656 | 4685 | ||
| 4657 | REG_WR(bp, BAR_CSTRORM_INTMEM + CSTORM_STATS_FLAGS_OFFSET(port), | 4686 | REG_WR(bp, BAR_CSTRORM_INTMEM + CSTORM_STATS_FLAGS_OFFSET(func), |
| 4658 | ((u32 *)&stats_flags)[0]); | 4687 | ((u32 *)&stats_flags)[0]); |
| 4659 | REG_WR(bp, BAR_CSTRORM_INTMEM + CSTORM_STATS_FLAGS_OFFSET(port) + 4, | 4688 | REG_WR(bp, BAR_CSTRORM_INTMEM + CSTORM_STATS_FLAGS_OFFSET(func) + 4, |
| 4660 | ((u32 *)&stats_flags)[1]); | 4689 | ((u32 *)&stats_flags)[1]); |
| 4661 | 4690 | ||
| 4662 | /* DP(NETIF_MSG_IFUP, "stats_flags: 0x%08x 0x%08x\n", | 4691 | REG_WR(bp, BAR_XSTRORM_INTMEM + |
| 4663 | ((u32 *)&stats_flags)[0], ((u32 *)&stats_flags)[1]); */ | 4692 | XSTORM_ETH_STATS_QUERY_ADDR_OFFSET(func), |
| 4693 | U64_LO(bnx2x_sp_mapping(bp, fw_stats))); | ||
| 4694 | REG_WR(bp, BAR_XSTRORM_INTMEM + | ||
| 4695 | XSTORM_ETH_STATS_QUERY_ADDR_OFFSET(func) + 4, | ||
| 4696 | U64_HI(bnx2x_sp_mapping(bp, fw_stats))); | ||
| 4697 | |||
| 4698 | REG_WR(bp, BAR_TSTRORM_INTMEM + | ||
| 4699 | TSTORM_ETH_STATS_QUERY_ADDR_OFFSET(func), | ||
| 4700 | U64_LO(bnx2x_sp_mapping(bp, fw_stats))); | ||
| 4701 | REG_WR(bp, BAR_TSTRORM_INTMEM + | ||
| 4702 | TSTORM_ETH_STATS_QUERY_ADDR_OFFSET(func) + 4, | ||
| 4703 | U64_HI(bnx2x_sp_mapping(bp, fw_stats))); | ||
| 4664 | 4704 | ||
| 4665 | if (CHIP_IS_E1H(bp)) { | 4705 | if (CHIP_IS_E1H(bp)) { |
| 4666 | REG_WR8(bp, BAR_XSTRORM_INTMEM + XSTORM_FUNCTION_MODE_OFFSET, | 4706 | REG_WR8(bp, BAR_XSTRORM_INTMEM + XSTORM_FUNCTION_MODE_OFFSET, |
| @@ -4676,15 +4716,12 @@ static void bnx2x_init_internal(struct bnx2x *bp) | |||
| 4676 | bp->e1hov); | 4716 | bp->e1hov); |
| 4677 | } | 4717 | } |
| 4678 | 4718 | ||
| 4679 | /* Zero this manualy as its initialization is | 4719 | /* Init CQ ring mapping and aggregation size */ |
| 4680 | currently missing in the initTool */ | 4720 | max_agg_size = min((u32)(bp->rx_buf_size + |
| 4681 | for (i = 0; i < USTORM_AGG_DATA_SIZE >> 2; i++) | 4721 | 8*BCM_PAGE_SIZE*PAGES_PER_SGE), |
| 4682 | REG_WR(bp, BAR_USTRORM_INTMEM + | 4722 | (u32)0xffff); |
| 4683 | USTORM_AGG_DATA_OFFSET + 4*i, 0); | ||
| 4684 | |||
| 4685 | for_each_queue(bp, i) { | 4723 | for_each_queue(bp, i) { |
| 4686 | struct bnx2x_fastpath *fp = &bp->fp[i]; | 4724 | struct bnx2x_fastpath *fp = &bp->fp[i]; |
| 4687 | u16 max_agg_size; | ||
| 4688 | 4725 | ||
| 4689 | REG_WR(bp, BAR_USTRORM_INTMEM + | 4726 | REG_WR(bp, BAR_USTRORM_INTMEM + |
| 4690 | USTORM_CQE_PAGE_BASE_OFFSET(port, FP_CL_ID(fp)), | 4727 | USTORM_CQE_PAGE_BASE_OFFSET(port, FP_CL_ID(fp)), |
| @@ -4693,16 +4730,34 @@ static void bnx2x_init_internal(struct bnx2x *bp) | |||
| 4693 | USTORM_CQE_PAGE_BASE_OFFSET(port, FP_CL_ID(fp)) + 4, | 4730 | USTORM_CQE_PAGE_BASE_OFFSET(port, FP_CL_ID(fp)) + 4, |
| 4694 | U64_HI(fp->rx_comp_mapping)); | 4731 | U64_HI(fp->rx_comp_mapping)); |
| 4695 | 4732 | ||
| 4696 | max_agg_size = min((u32)(bp->rx_buf_use_size + | ||
| 4697 | 8*BCM_PAGE_SIZE*PAGES_PER_SGE), | ||
| 4698 | (u32)0xffff); | ||
| 4699 | REG_WR16(bp, BAR_USTRORM_INTMEM + | 4733 | REG_WR16(bp, BAR_USTRORM_INTMEM + |
| 4700 | USTORM_MAX_AGG_SIZE_OFFSET(port, FP_CL_ID(fp)), | 4734 | USTORM_MAX_AGG_SIZE_OFFSET(port, FP_CL_ID(fp)), |
| 4701 | max_agg_size); | 4735 | max_agg_size); |
| 4702 | } | 4736 | } |
| 4703 | } | 4737 | } |
| 4704 | 4738 | ||
| 4705 | static void bnx2x_nic_init(struct bnx2x *bp) | 4739 | static void bnx2x_init_internal(struct bnx2x *bp, u32 load_code) |
| 4740 | { | ||
| 4741 | switch (load_code) { | ||
| 4742 | case FW_MSG_CODE_DRV_LOAD_COMMON: | ||
| 4743 | bnx2x_init_internal_common(bp); | ||
| 4744 | /* no break */ | ||
| 4745 | |||
| 4746 | case FW_MSG_CODE_DRV_LOAD_PORT: | ||
| 4747 | bnx2x_init_internal_port(bp); | ||
| 4748 | /* no break */ | ||
| 4749 | |||
| 4750 | case FW_MSG_CODE_DRV_LOAD_FUNCTION: | ||
| 4751 | bnx2x_init_internal_func(bp); | ||
| 4752 | break; | ||
| 4753 | |||
| 4754 | default: | ||
| 4755 | BNX2X_ERR("Unknown load_code (0x%x) from MCP\n", load_code); | ||
| 4756 | break; | ||
| 4757 | } | ||
| 4758 | } | ||
| 4759 | |||
| 4760 | static void bnx2x_nic_init(struct bnx2x *bp, u32 load_code) | ||
| 4706 | { | 4761 | { |
| 4707 | int i; | 4762 | int i; |
| 4708 | 4763 | ||
| @@ -4717,19 +4772,20 @@ static void bnx2x_nic_init(struct bnx2x *bp) | |||
| 4717 | DP(NETIF_MSG_IFUP, | 4772 | DP(NETIF_MSG_IFUP, |
| 4718 | "bnx2x_init_sb(%p,%p) index %d cl_id %d sb %d\n", | 4773 | "bnx2x_init_sb(%p,%p) index %d cl_id %d sb %d\n", |
| 4719 | bp, fp->status_blk, i, FP_CL_ID(fp), FP_SB_ID(fp)); | 4774 | bp, fp->status_blk, i, FP_CL_ID(fp), FP_SB_ID(fp)); |
| 4720 | bnx2x_init_sb(bp, FP_SB_ID(fp), fp->status_blk, | 4775 | bnx2x_init_sb(bp, fp->status_blk, fp->status_blk_mapping, |
| 4721 | fp->status_blk_mapping); | 4776 | FP_SB_ID(fp)); |
| 4777 | bnx2x_update_fpsb_idx(fp); | ||
| 4722 | } | 4778 | } |
| 4723 | 4779 | ||
| 4724 | bnx2x_init_def_sb(bp, bp->def_status_blk, | 4780 | bnx2x_init_def_sb(bp, bp->def_status_blk, bp->def_status_blk_mapping, |
| 4725 | bp->def_status_blk_mapping, DEF_SB_ID); | 4781 | DEF_SB_ID); |
| 4782 | bnx2x_update_dsb_idx(bp); | ||
| 4726 | bnx2x_update_coalesce(bp); | 4783 | bnx2x_update_coalesce(bp); |
| 4727 | bnx2x_init_rx_rings(bp); | 4784 | bnx2x_init_rx_rings(bp); |
| 4728 | bnx2x_init_tx_ring(bp); | 4785 | bnx2x_init_tx_ring(bp); |
| 4729 | bnx2x_init_sp_ring(bp); | 4786 | bnx2x_init_sp_ring(bp); |
| 4730 | bnx2x_init_context(bp); | 4787 | bnx2x_init_context(bp); |
| 4731 | bnx2x_init_internal(bp); | 4788 | bnx2x_init_internal(bp, load_code); |
| 4732 | bnx2x_storm_stats_init(bp); | ||
| 4733 | bnx2x_init_ind_table(bp); | 4789 | bnx2x_init_ind_table(bp); |
| 4734 | bnx2x_int_enable(bp); | 4790 | bnx2x_int_enable(bp); |
| 4735 | } | 4791 | } |
| @@ -4878,7 +4934,7 @@ static int bnx2x_int_mem_test(struct bnx2x *bp) | |||
| 4878 | REG_WR(bp, TSDM_REG_ENABLE_IN1, 0x0); | 4934 | REG_WR(bp, TSDM_REG_ENABLE_IN1, 0x0); |
| 4879 | REG_WR(bp, TCM_REG_PRS_IFEN, 0x0); | 4935 | REG_WR(bp, TCM_REG_PRS_IFEN, 0x0); |
| 4880 | REG_WR(bp, CFC_REG_DEBUG0, 0x1); | 4936 | REG_WR(bp, CFC_REG_DEBUG0, 0x1); |
| 4881 | NIG_WR(NIG_REG_PRS_REQ_IN_EN, 0x0); | 4937 | REG_WR(bp, NIG_REG_PRS_REQ_IN_EN, 0x0); |
| 4882 | 4938 | ||
| 4883 | /* Write 0 to parser credits for CFC search request */ | 4939 | /* Write 0 to parser credits for CFC search request */ |
| 4884 | REG_WR(bp, PRS_REG_CFC_SEARCH_INITIAL_CREDIT, 0x0); | 4940 | REG_WR(bp, PRS_REG_CFC_SEARCH_INITIAL_CREDIT, 0x0); |
| @@ -4933,7 +4989,7 @@ static int bnx2x_int_mem_test(struct bnx2x *bp) | |||
| 4933 | REG_WR(bp, TSDM_REG_ENABLE_IN1, 0x0); | 4989 | REG_WR(bp, TSDM_REG_ENABLE_IN1, 0x0); |
| 4934 | REG_WR(bp, TCM_REG_PRS_IFEN, 0x0); | 4990 | REG_WR(bp, TCM_REG_PRS_IFEN, 0x0); |
| 4935 | REG_WR(bp, CFC_REG_DEBUG0, 0x1); | 4991 | REG_WR(bp, CFC_REG_DEBUG0, 0x1); |
| 4936 | NIG_WR(NIG_REG_PRS_REQ_IN_EN, 0x0); | 4992 | REG_WR(bp, NIG_REG_PRS_REQ_IN_EN, 0x0); |
| 4937 | 4993 | ||
| 4938 | /* Write 0 to parser credits for CFC search request */ | 4994 | /* Write 0 to parser credits for CFC search request */ |
| 4939 | REG_WR(bp, PRS_REG_CFC_SEARCH_INITIAL_CREDIT, 0x0); | 4995 | REG_WR(bp, PRS_REG_CFC_SEARCH_INITIAL_CREDIT, 0x0); |
| @@ -5000,7 +5056,7 @@ static int bnx2x_int_mem_test(struct bnx2x *bp) | |||
| 5000 | REG_WR(bp, TSDM_REG_ENABLE_IN1, 0x7fffffff); | 5056 | REG_WR(bp, TSDM_REG_ENABLE_IN1, 0x7fffffff); |
| 5001 | REG_WR(bp, TCM_REG_PRS_IFEN, 0x1); | 5057 | REG_WR(bp, TCM_REG_PRS_IFEN, 0x1); |
| 5002 | REG_WR(bp, CFC_REG_DEBUG0, 0x0); | 5058 | REG_WR(bp, CFC_REG_DEBUG0, 0x0); |
| 5003 | NIG_WR(NIG_REG_PRS_REQ_IN_EN, 0x1); | 5059 | REG_WR(bp, NIG_REG_PRS_REQ_IN_EN, 0x1); |
| 5004 | 5060 | ||
| 5005 | DP(NETIF_MSG_HW, "done\n"); | 5061 | DP(NETIF_MSG_HW, "done\n"); |
| 5006 | 5062 | ||
| @@ -5089,11 +5145,6 @@ static int bnx2x_init_common(struct bnx2x *bp) | |||
| 5089 | REG_WR(bp, PXP2_REG_RD_CDURD_SWAP_MODE, 1); | 5145 | REG_WR(bp, PXP2_REG_RD_CDURD_SWAP_MODE, 1); |
| 5090 | #endif | 5146 | #endif |
| 5091 | 5147 | ||
| 5092 | #ifndef BCM_ISCSI | ||
| 5093 | /* set NIC mode */ | ||
| 5094 | REG_WR(bp, PRS_REG_NIC_MODE, 1); | ||
| 5095 | #endif | ||
| 5096 | |||
| 5097 | REG_WR(bp, PXP2_REG_RQ_CDU_P_SIZE, 2); | 5148 | REG_WR(bp, PXP2_REG_RQ_CDU_P_SIZE, 2); |
| 5098 | #ifdef BCM_ISCSI | 5149 | #ifdef BCM_ISCSI |
| 5099 | REG_WR(bp, PXP2_REG_RQ_TM_P_SIZE, 5); | 5150 | REG_WR(bp, PXP2_REG_RQ_TM_P_SIZE, 5); |
| @@ -5163,6 +5214,8 @@ static int bnx2x_init_common(struct bnx2x *bp) | |||
| 5163 | } | 5214 | } |
| 5164 | 5215 | ||
| 5165 | bnx2x_init_block(bp, PRS_COMMON_START, PRS_COMMON_END); | 5216 | bnx2x_init_block(bp, PRS_COMMON_START, PRS_COMMON_END); |
| 5217 | /* set NIC mode */ | ||
| 5218 | REG_WR(bp, PRS_REG_NIC_MODE, 1); | ||
| 5166 | if (CHIP_IS_E1H(bp)) | 5219 | if (CHIP_IS_E1H(bp)) |
| 5167 | REG_WR(bp, PRS_REG_E1HOV_MODE, IS_E1HMF(bp)); | 5220 | REG_WR(bp, PRS_REG_E1HOV_MODE, IS_E1HMF(bp)); |
| 5168 | 5221 | ||
| @@ -5296,6 +5349,7 @@ static int bnx2x_init_common(struct bnx2x *bp) | |||
| 5296 | } | 5349 | } |
| 5297 | 5350 | ||
| 5298 | switch (bp->common.board & SHARED_HW_CFG_BOARD_TYPE_MASK) { | 5351 | switch (bp->common.board & SHARED_HW_CFG_BOARD_TYPE_MASK) { |
| 5352 | case SHARED_HW_CFG_BOARD_TYPE_BCM957710A1021G: | ||
| 5299 | case SHARED_HW_CFG_BOARD_TYPE_BCM957710A1022G: | 5353 | case SHARED_HW_CFG_BOARD_TYPE_BCM957710A1022G: |
| 5300 | /* Fan failure is indicated by SPIO 5 */ | 5354 | /* Fan failure is indicated by SPIO 5 */ |
| 5301 | bnx2x_set_spio(bp, MISC_REGISTERS_SPIO_5, | 5355 | bnx2x_set_spio(bp, MISC_REGISTERS_SPIO_5, |
| @@ -5322,16 +5376,12 @@ static int bnx2x_init_common(struct bnx2x *bp) | |||
| 5322 | 5376 | ||
| 5323 | enable_blocks_attention(bp); | 5377 | enable_blocks_attention(bp); |
| 5324 | 5378 | ||
| 5325 | if (bp->flags & TPA_ENABLE_FLAG) { | 5379 | if (!BP_NOMCP(bp)) { |
| 5326 | struct tstorm_eth_tpa_exist tmp = {0}; | 5380 | bnx2x_acquire_phy_lock(bp); |
| 5327 | 5381 | bnx2x_common_init_phy(bp, bp->common.shmem_base); | |
| 5328 | tmp.tpa_exist = 1; | 5382 | bnx2x_release_phy_lock(bp); |
| 5329 | 5383 | } else | |
| 5330 | REG_WR(bp, BAR_TSTRORM_INTMEM + TSTORM_TPA_EXIST_OFFSET, | 5384 | BNX2X_ERR("Bootcode is missing - can not initialize link\n"); |
| 5331 | ((u32 *)&tmp)[0]); | ||
| 5332 | REG_WR(bp, BAR_TSTRORM_INTMEM + TSTORM_TPA_EXIST_OFFSET + 4, | ||
| 5333 | ((u32 *)&tmp)[1]); | ||
| 5334 | } | ||
| 5335 | 5385 | ||
| 5336 | return 0; | 5386 | return 0; |
| 5337 | } | 5387 | } |
| @@ -5483,6 +5533,7 @@ static int bnx2x_init_port(struct bnx2x *bp) | |||
| 5483 | /* Port DMAE comes here */ | 5533 | /* Port DMAE comes here */ |
| 5484 | 5534 | ||
| 5485 | switch (bp->common.board & SHARED_HW_CFG_BOARD_TYPE_MASK) { | 5535 | switch (bp->common.board & SHARED_HW_CFG_BOARD_TYPE_MASK) { |
| 5536 | case SHARED_HW_CFG_BOARD_TYPE_BCM957710A1021G: | ||
| 5486 | case SHARED_HW_CFG_BOARD_TYPE_BCM957710A1022G: | 5537 | case SHARED_HW_CFG_BOARD_TYPE_BCM957710A1022G: |
| 5487 | /* add SPIO 5 to group 0 */ | 5538 | /* add SPIO 5 to group 0 */ |
| 5488 | val = REG_RD(bp, MISC_REG_AEU_ENABLE1_FUNC_0_OUT_0); | 5539 | val = REG_RD(bp, MISC_REG_AEU_ENABLE1_FUNC_0_OUT_0); |
| @@ -5638,18 +5689,23 @@ static u32 bnx2x_fw_command(struct bnx2x *bp, u32 command) | |||
| 5638 | int func = BP_FUNC(bp); | 5689 | int func = BP_FUNC(bp); |
| 5639 | u32 seq = ++bp->fw_seq; | 5690 | u32 seq = ++bp->fw_seq; |
| 5640 | u32 rc = 0; | 5691 | u32 rc = 0; |
| 5692 | u32 cnt = 1; | ||
| 5693 | u8 delay = CHIP_REV_IS_SLOW(bp) ? 100 : 10; | ||
| 5641 | 5694 | ||
| 5642 | SHMEM_WR(bp, func_mb[func].drv_mb_header, (command | seq)); | 5695 | SHMEM_WR(bp, func_mb[func].drv_mb_header, (command | seq)); |
| 5643 | DP(BNX2X_MSG_MCP, "wrote command (%x) to FW MB\n", (command | seq)); | 5696 | DP(BNX2X_MSG_MCP, "wrote command (%x) to FW MB\n", (command | seq)); |
| 5644 | 5697 | ||
| 5645 | /* let the FW do it's magic ... */ | 5698 | do { |
| 5646 | msleep(100); /* TBD */ | 5699 | /* let the FW do it's magic ... */ |
| 5700 | msleep(delay); | ||
| 5647 | 5701 | ||
| 5648 | if (CHIP_REV_IS_SLOW(bp)) | 5702 | rc = SHMEM_RD(bp, func_mb[func].fw_mb_header); |
| 5649 | msleep(900); | ||
| 5650 | 5703 | ||
| 5651 | rc = SHMEM_RD(bp, func_mb[func].fw_mb_header); | 5704 | /* Give the FW up to 2 second (200*10ms) */ |
| 5652 | DP(BNX2X_MSG_MCP, "read (%x) seq is (%x) from FW MB\n", rc, seq); | 5705 | } while ((seq != (rc & FW_MSG_SEQ_NUMBER_MASK)) && (cnt++ < 200)); |
| 5706 | |||
| 5707 | DP(BNX2X_MSG_MCP, "[after %d ms] read (%x) seq is (%x) from FW MB\n", | ||
| 5708 | cnt*delay, rc, seq); | ||
| 5653 | 5709 | ||
| 5654 | /* is this a reply to our command? */ | 5710 | /* is this a reply to our command? */ |
| 5655 | if (seq == (rc & FW_MSG_SEQ_NUMBER_MASK)) { | 5711 | if (seq == (rc & FW_MSG_SEQ_NUMBER_MASK)) { |
| @@ -5713,6 +5769,7 @@ static void bnx2x_free_mem(struct bnx2x *bp) | |||
| 5713 | NUM_RCQ_BD); | 5769 | NUM_RCQ_BD); |
| 5714 | 5770 | ||
| 5715 | /* SGE ring */ | 5771 | /* SGE ring */ |
| 5772 | BNX2X_FREE(bnx2x_fp(bp, i, rx_page_ring)); | ||
| 5716 | BNX2X_PCI_FREE(bnx2x_fp(bp, i, rx_sge_ring), | 5773 | BNX2X_PCI_FREE(bnx2x_fp(bp, i, rx_sge_ring), |
| 5717 | bnx2x_fp(bp, i, rx_sge_mapping), | 5774 | bnx2x_fp(bp, i, rx_sge_mapping), |
| 5718 | BCM_PAGE_SIZE * NUM_RX_SGE_PAGES); | 5775 | BCM_PAGE_SIZE * NUM_RX_SGE_PAGES); |
| @@ -5883,14 +5940,15 @@ static void bnx2x_free_rx_skbs(struct bnx2x *bp) | |||
| 5883 | 5940 | ||
| 5884 | pci_unmap_single(bp->pdev, | 5941 | pci_unmap_single(bp->pdev, |
| 5885 | pci_unmap_addr(rx_buf, mapping), | 5942 | pci_unmap_addr(rx_buf, mapping), |
| 5886 | bp->rx_buf_use_size, | 5943 | bp->rx_buf_size, |
| 5887 | PCI_DMA_FROMDEVICE); | 5944 | PCI_DMA_FROMDEVICE); |
| 5888 | 5945 | ||
| 5889 | rx_buf->skb = NULL; | 5946 | rx_buf->skb = NULL; |
| 5890 | dev_kfree_skb(skb); | 5947 | dev_kfree_skb(skb); |
| 5891 | } | 5948 | } |
| 5892 | if (!fp->disable_tpa) | 5949 | if (!fp->disable_tpa) |
| 5893 | bnx2x_free_tpa_pool(bp, fp, | 5950 | bnx2x_free_tpa_pool(bp, fp, CHIP_IS_E1(bp) ? |
| 5951 | ETH_MAX_AGGREGATION_QUEUES_E1 : | ||
| 5894 | ETH_MAX_AGGREGATION_QUEUES_E1H); | 5952 | ETH_MAX_AGGREGATION_QUEUES_E1H); |
| 5895 | } | 5953 | } |
| 5896 | } | 5954 | } |
| @@ -5976,8 +6034,8 @@ static int bnx2x_req_msix_irqs(struct bnx2x *bp) | |||
| 5976 | bnx2x_msix_fp_int, 0, | 6034 | bnx2x_msix_fp_int, 0, |
| 5977 | bp->dev->name, &bp->fp[i]); | 6035 | bp->dev->name, &bp->fp[i]); |
| 5978 | if (rc) { | 6036 | if (rc) { |
| 5979 | BNX2X_ERR("request fp #%d irq failed rc %d\n", | 6037 | BNX2X_ERR("request fp #%d irq failed rc -%d\n", |
| 5980 | i + offset, rc); | 6038 | i + offset, -rc); |
| 5981 | bnx2x_free_msix_irqs(bp); | 6039 | bnx2x_free_msix_irqs(bp); |
| 5982 | return -EBUSY; | 6040 | return -EBUSY; |
| 5983 | } | 6041 | } |
| @@ -6000,11 +6058,49 @@ static int bnx2x_req_irq(struct bnx2x *bp) | |||
| 6000 | return rc; | 6058 | return rc; |
| 6001 | } | 6059 | } |
| 6002 | 6060 | ||
| 6061 | static void bnx2x_napi_enable(struct bnx2x *bp) | ||
| 6062 | { | ||
| 6063 | int i; | ||
| 6064 | |||
| 6065 | for_each_queue(bp, i) | ||
| 6066 | napi_enable(&bnx2x_fp(bp, i, napi)); | ||
| 6067 | } | ||
| 6068 | |||
| 6069 | static void bnx2x_napi_disable(struct bnx2x *bp) | ||
| 6070 | { | ||
| 6071 | int i; | ||
| 6072 | |||
| 6073 | for_each_queue(bp, i) | ||
| 6074 | napi_disable(&bnx2x_fp(bp, i, napi)); | ||
| 6075 | } | ||
| 6076 | |||
| 6077 | static void bnx2x_netif_start(struct bnx2x *bp) | ||
| 6078 | { | ||
| 6079 | if (atomic_dec_and_test(&bp->intr_sem)) { | ||
| 6080 | if (netif_running(bp->dev)) { | ||
| 6081 | if (bp->state == BNX2X_STATE_OPEN) | ||
| 6082 | netif_wake_queue(bp->dev); | ||
| 6083 | bnx2x_napi_enable(bp); | ||
| 6084 | bnx2x_int_enable(bp); | ||
| 6085 | } | ||
| 6086 | } | ||
| 6087 | } | ||
| 6088 | |||
| 6089 | static void bnx2x_netif_stop(struct bnx2x *bp) | ||
| 6090 | { | ||
| 6091 | bnx2x_int_disable_sync(bp); | ||
| 6092 | if (netif_running(bp->dev)) { | ||
| 6093 | bnx2x_napi_disable(bp); | ||
| 6094 | netif_tx_disable(bp->dev); | ||
| 6095 | bp->dev->trans_start = jiffies; /* prevent tx timeout */ | ||
| 6096 | } | ||
| 6097 | } | ||
| 6098 | |||
| 6003 | /* | 6099 | /* |
| 6004 | * Init service functions | 6100 | * Init service functions |
| 6005 | */ | 6101 | */ |
| 6006 | 6102 | ||
| 6007 | static void bnx2x_set_mac_addr_e1(struct bnx2x *bp) | 6103 | static void bnx2x_set_mac_addr_e1(struct bnx2x *bp, int set) |
| 6008 | { | 6104 | { |
| 6009 | struct mac_configuration_cmd *config = bnx2x_sp(bp, mac_config); | 6105 | struct mac_configuration_cmd *config = bnx2x_sp(bp, mac_config); |
| 6010 | int port = BP_PORT(bp); | 6106 | int port = BP_PORT(bp); |
| @@ -6026,11 +6122,15 @@ static void bnx2x_set_mac_addr_e1(struct bnx2x *bp) | |||
| 6026 | config->config_table[0].cam_entry.lsb_mac_addr = | 6122 | config->config_table[0].cam_entry.lsb_mac_addr = |
| 6027 | swab16(*(u16 *)&bp->dev->dev_addr[4]); | 6123 | swab16(*(u16 *)&bp->dev->dev_addr[4]); |
| 6028 | config->config_table[0].cam_entry.flags = cpu_to_le16(port); | 6124 | config->config_table[0].cam_entry.flags = cpu_to_le16(port); |
| 6029 | config->config_table[0].target_table_entry.flags = 0; | 6125 | if (set) |
| 6126 | config->config_table[0].target_table_entry.flags = 0; | ||
| 6127 | else | ||
| 6128 | CAM_INVALIDATE(config->config_table[0]); | ||
| 6030 | config->config_table[0].target_table_entry.client_id = 0; | 6129 | config->config_table[0].target_table_entry.client_id = 0; |
| 6031 | config->config_table[0].target_table_entry.vlan_id = 0; | 6130 | config->config_table[0].target_table_entry.vlan_id = 0; |
| 6032 | 6131 | ||
| 6033 | DP(NETIF_MSG_IFUP, "setting MAC (%04x:%04x:%04x)\n", | 6132 | DP(NETIF_MSG_IFUP, "%s MAC (%04x:%04x:%04x)\n", |
| 6133 | (set ? "setting" : "clearing"), | ||
| 6034 | config->config_table[0].cam_entry.msb_mac_addr, | 6134 | config->config_table[0].cam_entry.msb_mac_addr, |
| 6035 | config->config_table[0].cam_entry.middle_mac_addr, | 6135 | config->config_table[0].cam_entry.middle_mac_addr, |
| 6036 | config->config_table[0].cam_entry.lsb_mac_addr); | 6136 | config->config_table[0].cam_entry.lsb_mac_addr); |
| @@ -6040,8 +6140,11 @@ static void bnx2x_set_mac_addr_e1(struct bnx2x *bp) | |||
| 6040 | config->config_table[1].cam_entry.middle_mac_addr = 0xffff; | 6140 | config->config_table[1].cam_entry.middle_mac_addr = 0xffff; |
| 6041 | config->config_table[1].cam_entry.lsb_mac_addr = 0xffff; | 6141 | config->config_table[1].cam_entry.lsb_mac_addr = 0xffff; |
| 6042 | config->config_table[1].cam_entry.flags = cpu_to_le16(port); | 6142 | config->config_table[1].cam_entry.flags = cpu_to_le16(port); |
| 6043 | config->config_table[1].target_table_entry.flags = | 6143 | if (set) |
| 6144 | config->config_table[1].target_table_entry.flags = | ||
| 6044 | TSTORM_CAM_TARGET_TABLE_ENTRY_BROADCAST; | 6145 | TSTORM_CAM_TARGET_TABLE_ENTRY_BROADCAST; |
| 6146 | else | ||
| 6147 | CAM_INVALIDATE(config->config_table[1]); | ||
| 6045 | config->config_table[1].target_table_entry.client_id = 0; | 6148 | config->config_table[1].target_table_entry.client_id = 0; |
| 6046 | config->config_table[1].target_table_entry.vlan_id = 0; | 6149 | config->config_table[1].target_table_entry.vlan_id = 0; |
| 6047 | 6150 | ||
| @@ -6050,12 +6153,12 @@ static void bnx2x_set_mac_addr_e1(struct bnx2x *bp) | |||
| 6050 | U64_LO(bnx2x_sp_mapping(bp, mac_config)), 0); | 6153 | U64_LO(bnx2x_sp_mapping(bp, mac_config)), 0); |
| 6051 | } | 6154 | } |
| 6052 | 6155 | ||
| 6053 | static void bnx2x_set_mac_addr_e1h(struct bnx2x *bp) | 6156 | static void bnx2x_set_mac_addr_e1h(struct bnx2x *bp, int set) |
| 6054 | { | 6157 | { |
| 6055 | struct mac_configuration_cmd_e1h *config = | 6158 | struct mac_configuration_cmd_e1h *config = |
| 6056 | (struct mac_configuration_cmd_e1h *)bnx2x_sp(bp, mac_config); | 6159 | (struct mac_configuration_cmd_e1h *)bnx2x_sp(bp, mac_config); |
| 6057 | 6160 | ||
| 6058 | if (bp->state != BNX2X_STATE_OPEN) { | 6161 | if (set && (bp->state != BNX2X_STATE_OPEN)) { |
| 6059 | DP(NETIF_MSG_IFUP, "state is %x, returning\n", bp->state); | 6162 | DP(NETIF_MSG_IFUP, "state is %x, returning\n", bp->state); |
| 6060 | return; | 6163 | return; |
| 6061 | } | 6164 | } |
| @@ -6079,9 +6182,14 @@ static void bnx2x_set_mac_addr_e1h(struct bnx2x *bp) | |||
| 6079 | config->config_table[0].client_id = BP_L_ID(bp); | 6182 | config->config_table[0].client_id = BP_L_ID(bp); |
| 6080 | config->config_table[0].vlan_id = 0; | 6183 | config->config_table[0].vlan_id = 0; |
| 6081 | config->config_table[0].e1hov_id = cpu_to_le16(bp->e1hov); | 6184 | config->config_table[0].e1hov_id = cpu_to_le16(bp->e1hov); |
| 6082 | config->config_table[0].flags = BP_PORT(bp); | 6185 | if (set) |
| 6186 | config->config_table[0].flags = BP_PORT(bp); | ||
| 6187 | else | ||
| 6188 | config->config_table[0].flags = | ||
| 6189 | MAC_CONFIGURATION_ENTRY_E1H_ACTION_TYPE; | ||
| 6083 | 6190 | ||
| 6084 | DP(NETIF_MSG_IFUP, "setting MAC (%04x:%04x:%04x) E1HOV %d CLID %d\n", | 6191 | DP(NETIF_MSG_IFUP, "%s MAC (%04x:%04x:%04x) E1HOV %d CLID %d\n", |
| 6192 | (set ? "setting" : "clearing"), | ||
| 6085 | config->config_table[0].msb_mac_addr, | 6193 | config->config_table[0].msb_mac_addr, |
| 6086 | config->config_table[0].middle_mac_addr, | 6194 | config->config_table[0].middle_mac_addr, |
| 6087 | config->config_table[0].lsb_mac_addr, bp->e1hov, BP_L_ID(bp)); | 6195 | config->config_table[0].lsb_mac_addr, bp->e1hov, BP_L_ID(bp)); |
| @@ -6106,13 +6214,13 @@ static int bnx2x_wait_ramrod(struct bnx2x *bp, int state, int idx, | |||
| 6106 | bnx2x_rx_int(bp->fp, 10); | 6214 | bnx2x_rx_int(bp->fp, 10); |
| 6107 | /* if index is different from 0 | 6215 | /* if index is different from 0 |
| 6108 | * the reply for some commands will | 6216 | * the reply for some commands will |
| 6109 | * be on the none default queue | 6217 | * be on the non default queue |
| 6110 | */ | 6218 | */ |
| 6111 | if (idx) | 6219 | if (idx) |
| 6112 | bnx2x_rx_int(&bp->fp[idx], 10); | 6220 | bnx2x_rx_int(&bp->fp[idx], 10); |
| 6113 | } | 6221 | } |
| 6114 | mb(); /* state is changed by bnx2x_sp_event() */ | ||
| 6115 | 6222 | ||
| 6223 | mb(); /* state is changed by bnx2x_sp_event() */ | ||
| 6116 | if (*state_p == state) | 6224 | if (*state_p == state) |
| 6117 | return 0; | 6225 | return 0; |
| 6118 | 6226 | ||
| @@ -6167,7 +6275,6 @@ static int bnx2x_nic_load(struct bnx2x *bp, int load_mode) | |||
| 6167 | { | 6275 | { |
| 6168 | u32 load_code; | 6276 | u32 load_code; |
| 6169 | int i, rc; | 6277 | int i, rc; |
| 6170 | |||
| 6171 | #ifdef BNX2X_STOP_ON_ERROR | 6278 | #ifdef BNX2X_STOP_ON_ERROR |
| 6172 | if (unlikely(bp->panic)) | 6279 | if (unlikely(bp->panic)) |
| 6173 | return -EPERM; | 6280 | return -EPERM; |
| @@ -6183,22 +6290,24 @@ static int bnx2x_nic_load(struct bnx2x *bp, int load_mode) | |||
| 6183 | if (!BP_NOMCP(bp)) { | 6290 | if (!BP_NOMCP(bp)) { |
| 6184 | load_code = bnx2x_fw_command(bp, DRV_MSG_CODE_LOAD_REQ); | 6291 | load_code = bnx2x_fw_command(bp, DRV_MSG_CODE_LOAD_REQ); |
| 6185 | if (!load_code) { | 6292 | if (!load_code) { |
| 6186 | BNX2X_ERR("MCP response failure, unloading\n"); | 6293 | BNX2X_ERR("MCP response failure, aborting\n"); |
| 6187 | return -EBUSY; | 6294 | return -EBUSY; |
| 6188 | } | 6295 | } |
| 6189 | if (load_code == FW_MSG_CODE_DRV_LOAD_REFUSED) | 6296 | if (load_code == FW_MSG_CODE_DRV_LOAD_REFUSED) |
| 6190 | return -EBUSY; /* other port in diagnostic mode */ | 6297 | return -EBUSY; /* other port in diagnostic mode */ |
| 6191 | 6298 | ||
| 6192 | } else { | 6299 | } else { |
| 6300 | int port = BP_PORT(bp); | ||
| 6301 | |||
| 6193 | DP(NETIF_MSG_IFUP, "NO MCP load counts before us %d, %d, %d\n", | 6302 | DP(NETIF_MSG_IFUP, "NO MCP load counts before us %d, %d, %d\n", |
| 6194 | load_count[0], load_count[1], load_count[2]); | 6303 | load_count[0], load_count[1], load_count[2]); |
| 6195 | load_count[0]++; | 6304 | load_count[0]++; |
| 6196 | load_count[1 + BP_PORT(bp)]++; | 6305 | load_count[1 + port]++; |
| 6197 | DP(NETIF_MSG_IFUP, "NO MCP new load counts %d, %d, %d\n", | 6306 | DP(NETIF_MSG_IFUP, "NO MCP new load counts %d, %d, %d\n", |
| 6198 | load_count[0], load_count[1], load_count[2]); | 6307 | load_count[0], load_count[1], load_count[2]); |
| 6199 | if (load_count[0] == 1) | 6308 | if (load_count[0] == 1) |
| 6200 | load_code = FW_MSG_CODE_DRV_LOAD_COMMON; | 6309 | load_code = FW_MSG_CODE_DRV_LOAD_COMMON; |
| 6201 | else if (load_count[1 + BP_PORT(bp)] == 1) | 6310 | else if (load_count[1 + port] == 1) |
| 6202 | load_code = FW_MSG_CODE_DRV_LOAD_PORT; | 6311 | load_code = FW_MSG_CODE_DRV_LOAD_PORT; |
| 6203 | else | 6312 | else |
| 6204 | load_code = FW_MSG_CODE_DRV_LOAD_FUNCTION; | 6313 | load_code = FW_MSG_CODE_DRV_LOAD_FUNCTION; |
| @@ -6247,9 +6356,6 @@ static int bnx2x_nic_load(struct bnx2x *bp, int load_mode) | |||
| 6247 | bnx2x_fp(bp, i, disable_tpa) = | 6356 | bnx2x_fp(bp, i, disable_tpa) = |
| 6248 | ((bp->flags & TPA_ENABLE_FLAG) == 0); | 6357 | ((bp->flags & TPA_ENABLE_FLAG) == 0); |
| 6249 | 6358 | ||
| 6250 | /* Disable interrupt handling until HW is initialized */ | ||
| 6251 | atomic_set(&bp->intr_sem, 1); | ||
| 6252 | |||
| 6253 | if (bp->flags & USING_MSIX_FLAG) { | 6359 | if (bp->flags & USING_MSIX_FLAG) { |
| 6254 | rc = bnx2x_req_msix_irqs(bp); | 6360 | rc = bnx2x_req_msix_irqs(bp); |
| 6255 | if (rc) { | 6361 | if (rc) { |
| @@ -6273,22 +6379,19 @@ static int bnx2x_nic_load(struct bnx2x *bp, int load_mode) | |||
| 6273 | rc = bnx2x_init_hw(bp, load_code); | 6379 | rc = bnx2x_init_hw(bp, load_code); |
| 6274 | if (rc) { | 6380 | if (rc) { |
| 6275 | BNX2X_ERR("HW init failed, aborting\n"); | 6381 | BNX2X_ERR("HW init failed, aborting\n"); |
| 6276 | goto load_error; | 6382 | goto load_int_disable; |
| 6277 | } | 6383 | } |
| 6278 | 6384 | ||
| 6279 | /* Enable interrupt handling */ | ||
| 6280 | atomic_set(&bp->intr_sem, 0); | ||
| 6281 | |||
| 6282 | /* Setup NIC internals and enable interrupts */ | 6385 | /* Setup NIC internals and enable interrupts */ |
| 6283 | bnx2x_nic_init(bp); | 6386 | bnx2x_nic_init(bp, load_code); |
| 6284 | 6387 | ||
| 6285 | /* Send LOAD_DONE command to MCP */ | 6388 | /* Send LOAD_DONE command to MCP */ |
| 6286 | if (!BP_NOMCP(bp)) { | 6389 | if (!BP_NOMCP(bp)) { |
| 6287 | load_code = bnx2x_fw_command(bp, DRV_MSG_CODE_LOAD_DONE); | 6390 | load_code = bnx2x_fw_command(bp, DRV_MSG_CODE_LOAD_DONE); |
| 6288 | if (!load_code) { | 6391 | if (!load_code) { |
| 6289 | BNX2X_ERR("MCP response failure, unloading\n"); | 6392 | BNX2X_ERR("MCP response failure, aborting\n"); |
| 6290 | rc = -EBUSY; | 6393 | rc = -EBUSY; |
| 6291 | goto load_int_disable; | 6394 | goto load_rings_free; |
| 6292 | } | 6395 | } |
| 6293 | } | 6396 | } |
| 6294 | 6397 | ||
| @@ -6298,15 +6401,15 @@ static int bnx2x_nic_load(struct bnx2x *bp, int load_mode) | |||
| 6298 | 6401 | ||
| 6299 | /* Enable Rx interrupt handling before sending the ramrod | 6402 | /* Enable Rx interrupt handling before sending the ramrod |
| 6300 | as it's completed on Rx FP queue */ | 6403 | as it's completed on Rx FP queue */ |
| 6301 | for_each_queue(bp, i) | 6404 | bnx2x_napi_enable(bp); |
| 6302 | napi_enable(&bnx2x_fp(bp, i, napi)); | 6405 | |
| 6406 | /* Enable interrupt handling */ | ||
| 6407 | atomic_set(&bp->intr_sem, 0); | ||
| 6303 | 6408 | ||
| 6304 | rc = bnx2x_setup_leading(bp); | 6409 | rc = bnx2x_setup_leading(bp); |
| 6305 | if (rc) { | 6410 | if (rc) { |
| 6306 | #ifdef BNX2X_STOP_ON_ERROR | 6411 | BNX2X_ERR("Setup leading failed!\n"); |
| 6307 | bp->panic = 1; | 6412 | goto load_netif_stop; |
| 6308 | #endif | ||
| 6309 | goto load_stop_netif; | ||
| 6310 | } | 6413 | } |
| 6311 | 6414 | ||
| 6312 | if (CHIP_IS_E1H(bp)) | 6415 | if (CHIP_IS_E1H(bp)) |
| @@ -6319,13 +6422,13 @@ static int bnx2x_nic_load(struct bnx2x *bp, int load_mode) | |||
| 6319 | for_each_nondefault_queue(bp, i) { | 6422 | for_each_nondefault_queue(bp, i) { |
| 6320 | rc = bnx2x_setup_multi(bp, i); | 6423 | rc = bnx2x_setup_multi(bp, i); |
| 6321 | if (rc) | 6424 | if (rc) |
| 6322 | goto load_stop_netif; | 6425 | goto load_netif_stop; |
| 6323 | } | 6426 | } |
| 6324 | 6427 | ||
| 6325 | if (CHIP_IS_E1(bp)) | 6428 | if (CHIP_IS_E1(bp)) |
| 6326 | bnx2x_set_mac_addr_e1(bp); | 6429 | bnx2x_set_mac_addr_e1(bp, 1); |
| 6327 | else | 6430 | else |
| 6328 | bnx2x_set_mac_addr_e1h(bp); | 6431 | bnx2x_set_mac_addr_e1h(bp, 1); |
| 6329 | 6432 | ||
| 6330 | if (bp->port.pmf) | 6433 | if (bp->port.pmf) |
| 6331 | bnx2x_initial_phy_init(bp); | 6434 | bnx2x_initial_phy_init(bp); |
| @@ -6339,7 +6442,6 @@ static int bnx2x_nic_load(struct bnx2x *bp, int load_mode) | |||
| 6339 | break; | 6442 | break; |
| 6340 | 6443 | ||
| 6341 | case LOAD_OPEN: | 6444 | case LOAD_OPEN: |
| 6342 | /* IRQ is only requested from bnx2x_open */ | ||
| 6343 | netif_start_queue(bp->dev); | 6445 | netif_start_queue(bp->dev); |
| 6344 | bnx2x_set_rx_mode(bp->dev); | 6446 | bnx2x_set_rx_mode(bp->dev); |
| 6345 | if (bp->flags & USING_MSIX_FLAG) | 6447 | if (bp->flags & USING_MSIX_FLAG) |
| @@ -6365,21 +6467,17 @@ static int bnx2x_nic_load(struct bnx2x *bp, int load_mode) | |||
| 6365 | 6467 | ||
| 6366 | return 0; | 6468 | return 0; |
| 6367 | 6469 | ||
| 6368 | load_stop_netif: | 6470 | load_netif_stop: |
| 6471 | bnx2x_napi_disable(bp); | ||
| 6472 | load_rings_free: | ||
| 6473 | /* Free SKBs, SGEs, TPA pool and driver internals */ | ||
| 6474 | bnx2x_free_skbs(bp); | ||
| 6369 | for_each_queue(bp, i) | 6475 | for_each_queue(bp, i) |
| 6370 | napi_disable(&bnx2x_fp(bp, i, napi)); | 6476 | bnx2x_free_rx_sge_range(bp, bp->fp + i, NUM_RX_SGE); |
| 6371 | |||
| 6372 | load_int_disable: | 6477 | load_int_disable: |
| 6373 | bnx2x_int_disable_sync(bp); | 6478 | bnx2x_int_disable_sync(bp); |
| 6374 | |||
| 6375 | /* Release IRQs */ | 6479 | /* Release IRQs */ |
| 6376 | bnx2x_free_irq(bp); | 6480 | bnx2x_free_irq(bp); |
| 6377 | |||
| 6378 | /* Free SKBs, SGEs, TPA pool and driver internals */ | ||
| 6379 | bnx2x_free_skbs(bp); | ||
| 6380 | for_each_queue(bp, i) | ||
| 6381 | bnx2x_free_rx_sge_range(bp, bp->fp + i, | ||
| 6382 | RX_SGE_CNT*NUM_RX_SGE_PAGES); | ||
| 6383 | load_error: | 6481 | load_error: |
| 6384 | bnx2x_free_mem(bp); | 6482 | bnx2x_free_mem(bp); |
| 6385 | 6483 | ||
| @@ -6394,7 +6492,7 @@ static int bnx2x_stop_multi(struct bnx2x *bp, int index) | |||
| 6394 | 6492 | ||
| 6395 | /* halt the connection */ | 6493 | /* halt the connection */ |
| 6396 | bp->fp[index].state = BNX2X_FP_STATE_HALTING; | 6494 | bp->fp[index].state = BNX2X_FP_STATE_HALTING; |
| 6397 | bnx2x_sp_post(bp, RAMROD_CMD_ID_ETH_HALT, index, 0, 0, 0); | 6495 | bnx2x_sp_post(bp, RAMROD_CMD_ID_ETH_HALT, index, 0, index, 0); |
| 6398 | 6496 | ||
| 6399 | /* Wait for completion */ | 6497 | /* Wait for completion */ |
| 6400 | rc = bnx2x_wait_ramrod(bp, BNX2X_FP_STATE_HALTED, index, | 6498 | rc = bnx2x_wait_ramrod(bp, BNX2X_FP_STATE_HALTED, index, |
| @@ -6411,7 +6509,7 @@ static int bnx2x_stop_multi(struct bnx2x *bp, int index) | |||
| 6411 | return rc; | 6509 | return rc; |
| 6412 | } | 6510 | } |
| 6413 | 6511 | ||
| 6414 | static void bnx2x_stop_leading(struct bnx2x *bp) | 6512 | static int bnx2x_stop_leading(struct bnx2x *bp) |
| 6415 | { | 6513 | { |
| 6416 | u16 dsb_sp_prod_idx; | 6514 | u16 dsb_sp_prod_idx; |
| 6417 | /* if the other port is handling traffic, | 6515 | /* if the other port is handling traffic, |
| @@ -6429,7 +6527,7 @@ static void bnx2x_stop_leading(struct bnx2x *bp) | |||
| 6429 | rc = bnx2x_wait_ramrod(bp, BNX2X_FP_STATE_HALTED, 0, | 6527 | rc = bnx2x_wait_ramrod(bp, BNX2X_FP_STATE_HALTED, 0, |
| 6430 | &(bp->fp[0].state), 1); | 6528 | &(bp->fp[0].state), 1); |
| 6431 | if (rc) /* timeout */ | 6529 | if (rc) /* timeout */ |
| 6432 | return; | 6530 | return rc; |
| 6433 | 6531 | ||
| 6434 | dsb_sp_prod_idx = *bp->dsb_sp_prod; | 6532 | dsb_sp_prod_idx = *bp->dsb_sp_prod; |
| 6435 | 6533 | ||
| @@ -6441,20 +6539,24 @@ static void bnx2x_stop_leading(struct bnx2x *bp) | |||
| 6441 | so there is not much to do if this times out | 6539 | so there is not much to do if this times out |
| 6442 | */ | 6540 | */ |
| 6443 | while (dsb_sp_prod_idx == *bp->dsb_sp_prod) { | 6541 | while (dsb_sp_prod_idx == *bp->dsb_sp_prod) { |
| 6444 | msleep(1); | ||
| 6445 | if (!cnt) { | 6542 | if (!cnt) { |
| 6446 | DP(NETIF_MSG_IFDOWN, "timeout waiting for port del " | 6543 | DP(NETIF_MSG_IFDOWN, "timeout waiting for port del " |
| 6447 | "dsb_sp_prod 0x%x != dsb_sp_prod_idx 0x%x\n", | 6544 | "dsb_sp_prod 0x%x != dsb_sp_prod_idx 0x%x\n", |
| 6448 | *bp->dsb_sp_prod, dsb_sp_prod_idx); | 6545 | *bp->dsb_sp_prod, dsb_sp_prod_idx); |
| 6449 | #ifdef BNX2X_STOP_ON_ERROR | 6546 | #ifdef BNX2X_STOP_ON_ERROR |
| 6450 | bnx2x_panic(); | 6547 | bnx2x_panic(); |
| 6548 | #else | ||
| 6549 | rc = -EBUSY; | ||
| 6451 | #endif | 6550 | #endif |
| 6452 | break; | 6551 | break; |
| 6453 | } | 6552 | } |
| 6454 | cnt--; | 6553 | cnt--; |
| 6554 | msleep(1); | ||
| 6455 | } | 6555 | } |
| 6456 | bp->state = BNX2X_STATE_CLOSING_WAIT4_UNLOAD; | 6556 | bp->state = BNX2X_STATE_CLOSING_WAIT4_UNLOAD; |
| 6457 | bp->fp[0].state = BNX2X_FP_STATE_CLOSED; | 6557 | bp->fp[0].state = BNX2X_FP_STATE_CLOSED; |
| 6558 | |||
| 6559 | return rc; | ||
| 6458 | } | 6560 | } |
| 6459 | 6561 | ||
| 6460 | static void bnx2x_reset_func(struct bnx2x *bp) | 6562 | static void bnx2x_reset_func(struct bnx2x *bp) |
| @@ -6496,7 +6598,7 @@ static void bnx2x_reset_port(struct bnx2x *bp) | |||
| 6496 | val = REG_RD(bp, BRB1_REG_PORT_NUM_OCC_BLOCKS_0 + port*4); | 6598 | val = REG_RD(bp, BRB1_REG_PORT_NUM_OCC_BLOCKS_0 + port*4); |
| 6497 | if (val) | 6599 | if (val) |
| 6498 | DP(NETIF_MSG_IFDOWN, | 6600 | DP(NETIF_MSG_IFDOWN, |
| 6499 | "BRB1 is not empty %d blooks are occupied\n", val); | 6601 | "BRB1 is not empty %d blocks are occupied\n", val); |
| 6500 | 6602 | ||
| 6501 | /* TODO: Close Doorbell port? */ | 6603 | /* TODO: Close Doorbell port? */ |
| 6502 | } | 6604 | } |
| @@ -6536,43 +6638,35 @@ static void bnx2x_reset_chip(struct bnx2x *bp, u32 reset_code) | |||
| 6536 | } | 6638 | } |
| 6537 | } | 6639 | } |
| 6538 | 6640 | ||
| 6539 | /* msut be called with rtnl_lock */ | 6641 | /* must be called with rtnl_lock */ |
| 6540 | static int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode) | 6642 | static int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode) |
| 6541 | { | 6643 | { |
| 6644 | int port = BP_PORT(bp); | ||
| 6542 | u32 reset_code = 0; | 6645 | u32 reset_code = 0; |
| 6543 | int i, cnt; | 6646 | int i, cnt, rc; |
| 6544 | 6647 | ||
| 6545 | bp->state = BNX2X_STATE_CLOSING_WAIT4_HALT; | 6648 | bp->state = BNX2X_STATE_CLOSING_WAIT4_HALT; |
| 6546 | 6649 | ||
| 6547 | bp->rx_mode = BNX2X_RX_MODE_NONE; | 6650 | bp->rx_mode = BNX2X_RX_MODE_NONE; |
| 6548 | bnx2x_set_storm_rx_mode(bp); | 6651 | bnx2x_set_storm_rx_mode(bp); |
| 6549 | 6652 | ||
| 6550 | if (netif_running(bp->dev)) { | 6653 | bnx2x_netif_stop(bp); |
| 6551 | netif_tx_disable(bp->dev); | 6654 | if (!netif_running(bp->dev)) |
| 6552 | bp->dev->trans_start = jiffies; /* prevent tx timeout */ | 6655 | bnx2x_napi_disable(bp); |
| 6553 | } | ||
| 6554 | |||
| 6555 | del_timer_sync(&bp->timer); | 6656 | del_timer_sync(&bp->timer); |
| 6556 | SHMEM_WR(bp, func_mb[BP_FUNC(bp)].drv_pulse_mb, | 6657 | SHMEM_WR(bp, func_mb[BP_FUNC(bp)].drv_pulse_mb, |
| 6557 | (DRV_PULSE_ALWAYS_ALIVE | bp->fw_drv_pulse_wr_seq)); | 6658 | (DRV_PULSE_ALWAYS_ALIVE | bp->fw_drv_pulse_wr_seq)); |
| 6558 | bnx2x_stats_handle(bp, STATS_EVENT_STOP); | 6659 | bnx2x_stats_handle(bp, STATS_EVENT_STOP); |
| 6559 | 6660 | ||
| 6560 | /* Wait until all fast path tasks complete */ | 6661 | /* Wait until tx fast path tasks complete */ |
| 6561 | for_each_queue(bp, i) { | 6662 | for_each_queue(bp, i) { |
| 6562 | struct bnx2x_fastpath *fp = &bp->fp[i]; | 6663 | struct bnx2x_fastpath *fp = &bp->fp[i]; |
| 6563 | 6664 | ||
| 6564 | #ifdef BNX2X_STOP_ON_ERROR | ||
| 6565 | #ifdef __powerpc64__ | ||
| 6566 | DP(NETIF_MSG_RX_STATUS, "fp->tpa_queue_used = 0x%lx\n", | ||
| 6567 | #else | ||
| 6568 | DP(NETIF_MSG_IFDOWN, "fp->tpa_queue_used = 0x%llx\n", | ||
| 6569 | #endif | ||
| 6570 | fp->tpa_queue_used); | ||
| 6571 | #endif | ||
| 6572 | cnt = 1000; | 6665 | cnt = 1000; |
| 6573 | smp_rmb(); | 6666 | smp_rmb(); |
| 6574 | while (bnx2x_has_work(fp)) { | 6667 | while (BNX2X_HAS_TX_WORK(fp)) { |
| 6575 | msleep(1); | 6668 | |
| 6669 | bnx2x_tx_int(fp, 1000); | ||
| 6576 | if (!cnt) { | 6670 | if (!cnt) { |
| 6577 | BNX2X_ERR("timeout waiting for queue[%d]\n", | 6671 | BNX2X_ERR("timeout waiting for queue[%d]\n", |
| 6578 | i); | 6672 | i); |
| @@ -6584,40 +6678,68 @@ static int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode) | |||
| 6584 | #endif | 6678 | #endif |
| 6585 | } | 6679 | } |
| 6586 | cnt--; | 6680 | cnt--; |
| 6681 | msleep(1); | ||
| 6587 | smp_rmb(); | 6682 | smp_rmb(); |
| 6588 | } | 6683 | } |
| 6589 | } | 6684 | } |
| 6590 | 6685 | /* Give HW time to discard old tx messages */ | |
| 6591 | /* Wait until all slow path tasks complete */ | 6686 | msleep(1); |
| 6592 | cnt = 1000; | ||
| 6593 | while ((bp->spq_left != MAX_SPQ_PENDING) && cnt--) | ||
| 6594 | msleep(1); | ||
| 6595 | |||
| 6596 | for_each_queue(bp, i) | ||
| 6597 | napi_disable(&bnx2x_fp(bp, i, napi)); | ||
| 6598 | /* Disable interrupts after Tx and Rx are disabled on stack level */ | ||
| 6599 | bnx2x_int_disable_sync(bp); | ||
| 6600 | 6687 | ||
| 6601 | /* Release IRQs */ | 6688 | /* Release IRQs */ |
| 6602 | bnx2x_free_irq(bp); | 6689 | bnx2x_free_irq(bp); |
| 6603 | 6690 | ||
| 6604 | if (bp->flags & NO_WOL_FLAG) | 6691 | if (CHIP_IS_E1(bp)) { |
| 6692 | struct mac_configuration_cmd *config = | ||
| 6693 | bnx2x_sp(bp, mcast_config); | ||
| 6694 | |||
| 6695 | bnx2x_set_mac_addr_e1(bp, 0); | ||
| 6696 | |||
| 6697 | for (i = 0; i < config->hdr.length_6b; i++) | ||
| 6698 | CAM_INVALIDATE(config->config_table[i]); | ||
| 6699 | |||
| 6700 | config->hdr.length_6b = i; | ||
| 6701 | if (CHIP_REV_IS_SLOW(bp)) | ||
| 6702 | config->hdr.offset = BNX2X_MAX_EMUL_MULTI*(1 + port); | ||
| 6703 | else | ||
| 6704 | config->hdr.offset = BNX2X_MAX_MULTICAST*(1 + port); | ||
| 6705 | config->hdr.client_id = BP_CL_ID(bp); | ||
| 6706 | config->hdr.reserved1 = 0; | ||
| 6707 | |||
| 6708 | bnx2x_sp_post(bp, RAMROD_CMD_ID_ETH_SET_MAC, 0, | ||
| 6709 | U64_HI(bnx2x_sp_mapping(bp, mcast_config)), | ||
| 6710 | U64_LO(bnx2x_sp_mapping(bp, mcast_config)), 0); | ||
| 6711 | |||
| 6712 | } else { /* E1H */ | ||
| 6713 | REG_WR(bp, NIG_REG_LLH0_FUNC_EN + port*8, 0); | ||
| 6714 | |||
| 6715 | bnx2x_set_mac_addr_e1h(bp, 0); | ||
| 6716 | |||
| 6717 | for (i = 0; i < MC_HASH_SIZE; i++) | ||
| 6718 | REG_WR(bp, MC_HASH_OFFSET(bp, i), 0); | ||
| 6719 | } | ||
| 6720 | |||
| 6721 | if (unload_mode == UNLOAD_NORMAL) | ||
| 6722 | reset_code = DRV_MSG_CODE_UNLOAD_REQ_WOL_DIS; | ||
| 6723 | |||
| 6724 | else if (bp->flags & NO_WOL_FLAG) { | ||
| 6605 | reset_code = DRV_MSG_CODE_UNLOAD_REQ_WOL_MCP; | 6725 | reset_code = DRV_MSG_CODE_UNLOAD_REQ_WOL_MCP; |
| 6726 | if (CHIP_IS_E1H(bp)) | ||
| 6727 | REG_WR(bp, MISC_REG_E1HMF_MODE, 0); | ||
| 6606 | 6728 | ||
| 6607 | else if (bp->wol) { | 6729 | } else if (bp->wol) { |
| 6608 | u32 emac_base = BP_PORT(bp) ? GRCBASE_EMAC1 : GRCBASE_EMAC0; | 6730 | u32 emac_base = port ? GRCBASE_EMAC1 : GRCBASE_EMAC0; |
| 6609 | u8 *mac_addr = bp->dev->dev_addr; | 6731 | u8 *mac_addr = bp->dev->dev_addr; |
| 6610 | u32 val; | 6732 | u32 val; |
| 6611 | |||
| 6612 | /* The mac address is written to entries 1-4 to | 6733 | /* The mac address is written to entries 1-4 to |
| 6613 | preserve entry 0 which is used by the PMF */ | 6734 | preserve entry 0 which is used by the PMF */ |
| 6735 | u8 entry = (BP_E1HVN(bp) + 1)*8; | ||
| 6736 | |||
| 6614 | val = (mac_addr[0] << 8) | mac_addr[1]; | 6737 | val = (mac_addr[0] << 8) | mac_addr[1]; |
| 6615 | EMAC_WR(EMAC_REG_EMAC_MAC_MATCH + (BP_E1HVN(bp) + 1)*8, val); | 6738 | EMAC_WR(bp, EMAC_REG_EMAC_MAC_MATCH + entry, val); |
| 6616 | 6739 | ||
| 6617 | val = (mac_addr[2] << 24) | (mac_addr[3] << 16) | | 6740 | val = (mac_addr[2] << 24) | (mac_addr[3] << 16) | |
| 6618 | (mac_addr[4] << 8) | mac_addr[5]; | 6741 | (mac_addr[4] << 8) | mac_addr[5]; |
| 6619 | EMAC_WR(EMAC_REG_EMAC_MAC_MATCH + (BP_E1HVN(bp) + 1)*8 + 4, | 6742 | EMAC_WR(bp, EMAC_REG_EMAC_MAC_MATCH + entry + 4, val); |
| 6620 | val); | ||
| 6621 | 6743 | ||
| 6622 | reset_code = DRV_MSG_CODE_UNLOAD_REQ_WOL_EN; | 6744 | reset_code = DRV_MSG_CODE_UNLOAD_REQ_WOL_EN; |
| 6623 | 6745 | ||
| @@ -6630,23 +6752,14 @@ static int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode) | |||
| 6630 | if (bnx2x_stop_multi(bp, i)) | 6752 | if (bnx2x_stop_multi(bp, i)) |
| 6631 | goto unload_error; | 6753 | goto unload_error; |
| 6632 | 6754 | ||
| 6633 | if (CHIP_IS_E1H(bp)) | 6755 | rc = bnx2x_stop_leading(bp); |
| 6634 | REG_WR(bp, NIG_REG_LLH0_FUNC_EN + BP_PORT(bp)*8, 0); | 6756 | if (rc) { |
| 6635 | |||
| 6636 | bnx2x_stop_leading(bp); | ||
| 6637 | #ifdef BNX2X_STOP_ON_ERROR | ||
| 6638 | /* If ramrod completion timed out - break here! */ | ||
| 6639 | if (bp->panic) { | ||
| 6640 | BNX2X_ERR("Stop leading failed!\n"); | 6757 | BNX2X_ERR("Stop leading failed!\n"); |
| 6758 | #ifdef BNX2X_STOP_ON_ERROR | ||
| 6641 | return -EBUSY; | 6759 | return -EBUSY; |
| 6642 | } | 6760 | #else |
| 6761 | goto unload_error; | ||
| 6643 | #endif | 6762 | #endif |
| 6644 | |||
| 6645 | if ((bp->state != BNX2X_STATE_CLOSING_WAIT4_UNLOAD) || | ||
| 6646 | (bp->fp[0].state != BNX2X_FP_STATE_CLOSED)) { | ||
| 6647 | DP(NETIF_MSG_IFDOWN, "failed to close leading properly! " | ||
| 6648 | "state 0x%x fp[0].state 0x%x\n", | ||
| 6649 | bp->state, bp->fp[0].state); | ||
| 6650 | } | 6763 | } |
| 6651 | 6764 | ||
| 6652 | unload_error: | 6765 | unload_error: |
| @@ -6656,12 +6769,12 @@ unload_error: | |||
| 6656 | DP(NETIF_MSG_IFDOWN, "NO MCP load counts %d, %d, %d\n", | 6769 | DP(NETIF_MSG_IFDOWN, "NO MCP load counts %d, %d, %d\n", |
| 6657 | load_count[0], load_count[1], load_count[2]); | 6770 | load_count[0], load_count[1], load_count[2]); |
| 6658 | load_count[0]--; | 6771 | load_count[0]--; |
| 6659 | load_count[1 + BP_PORT(bp)]--; | 6772 | load_count[1 + port]--; |
| 6660 | DP(NETIF_MSG_IFDOWN, "NO MCP new load counts %d, %d, %d\n", | 6773 | DP(NETIF_MSG_IFDOWN, "NO MCP new load counts %d, %d, %d\n", |
| 6661 | load_count[0], load_count[1], load_count[2]); | 6774 | load_count[0], load_count[1], load_count[2]); |
| 6662 | if (load_count[0] == 0) | 6775 | if (load_count[0] == 0) |
| 6663 | reset_code = FW_MSG_CODE_DRV_UNLOAD_COMMON; | 6776 | reset_code = FW_MSG_CODE_DRV_UNLOAD_COMMON; |
| 6664 | else if (load_count[1 + BP_PORT(bp)] == 0) | 6777 | else if (load_count[1 + port] == 0) |
| 6665 | reset_code = FW_MSG_CODE_DRV_UNLOAD_PORT; | 6778 | reset_code = FW_MSG_CODE_DRV_UNLOAD_PORT; |
| 6666 | else | 6779 | else |
| 6667 | reset_code = FW_MSG_CODE_DRV_UNLOAD_FUNCTION; | 6780 | reset_code = FW_MSG_CODE_DRV_UNLOAD_FUNCTION; |
| @@ -6681,8 +6794,7 @@ unload_error: | |||
| 6681 | /* Free SKBs, SGEs, TPA pool and driver internals */ | 6794 | /* Free SKBs, SGEs, TPA pool and driver internals */ |
| 6682 | bnx2x_free_skbs(bp); | 6795 | bnx2x_free_skbs(bp); |
| 6683 | for_each_queue(bp, i) | 6796 | for_each_queue(bp, i) |
| 6684 | bnx2x_free_rx_sge_range(bp, bp->fp + i, | 6797 | bnx2x_free_rx_sge_range(bp, bp->fp + i, NUM_RX_SGE); |
| 6685 | RX_SGE_CNT*NUM_RX_SGE_PAGES); | ||
| 6686 | bnx2x_free_mem(bp); | 6798 | bnx2x_free_mem(bp); |
| 6687 | 6799 | ||
| 6688 | bp->state = BNX2X_STATE_CLOSED; | 6800 | bp->state = BNX2X_STATE_CLOSED; |
| @@ -6733,49 +6845,88 @@ static void __devinit bnx2x_undi_unload(struct bnx2x *bp) | |||
| 6733 | /* Check if it is the UNDI driver | 6845 | /* Check if it is the UNDI driver |
| 6734 | * UNDI driver initializes CID offset for normal bell to 0x7 | 6846 | * UNDI driver initializes CID offset for normal bell to 0x7 |
| 6735 | */ | 6847 | */ |
| 6848 | bnx2x_acquire_hw_lock(bp, HW_LOCK_RESOURCE_UNDI); | ||
| 6736 | val = REG_RD(bp, DORQ_REG_NORM_CID_OFST); | 6849 | val = REG_RD(bp, DORQ_REG_NORM_CID_OFST); |
| 6850 | if (val == 0x7) | ||
| 6851 | REG_WR(bp, DORQ_REG_NORM_CID_OFST, 0); | ||
| 6852 | bnx2x_release_hw_lock(bp, HW_LOCK_RESOURCE_UNDI); | ||
| 6853 | |||
| 6737 | if (val == 0x7) { | 6854 | if (val == 0x7) { |
| 6738 | u32 reset_code = DRV_MSG_CODE_UNLOAD_REQ_WOL_DIS; | 6855 | u32 reset_code = DRV_MSG_CODE_UNLOAD_REQ_WOL_DIS; |
| 6739 | /* save our func and fw_seq */ | 6856 | /* save our func */ |
| 6740 | int func = BP_FUNC(bp); | 6857 | int func = BP_FUNC(bp); |
| 6741 | u16 fw_seq = bp->fw_seq; | 6858 | u32 swap_en; |
| 6859 | u32 swap_val; | ||
| 6742 | 6860 | ||
| 6743 | BNX2X_DEV_INFO("UNDI is active! reset device\n"); | 6861 | BNX2X_DEV_INFO("UNDI is active! reset device\n"); |
| 6744 | 6862 | ||
| 6745 | /* try unload UNDI on port 0 */ | 6863 | /* try unload UNDI on port 0 */ |
| 6746 | bp->func = 0; | 6864 | bp->func = 0; |
| 6747 | bp->fw_seq = (SHMEM_RD(bp, | 6865 | bp->fw_seq = |
| 6748 | func_mb[bp->func].drv_mb_header) & | 6866 | (SHMEM_RD(bp, func_mb[bp->func].drv_mb_header) & |
| 6749 | DRV_MSG_SEQ_NUMBER_MASK); | 6867 | DRV_MSG_SEQ_NUMBER_MASK); |
| 6750 | |||
| 6751 | reset_code = bnx2x_fw_command(bp, reset_code); | 6868 | reset_code = bnx2x_fw_command(bp, reset_code); |
| 6752 | bnx2x_fw_command(bp, DRV_MSG_CODE_UNLOAD_DONE); | ||
| 6753 | 6869 | ||
| 6754 | /* if UNDI is loaded on the other port */ | 6870 | /* if UNDI is loaded on the other port */ |
| 6755 | if (reset_code != FW_MSG_CODE_DRV_UNLOAD_COMMON) { | 6871 | if (reset_code != FW_MSG_CODE_DRV_UNLOAD_COMMON) { |
| 6756 | 6872 | ||
| 6873 | /* send "DONE" for previous unload */ | ||
| 6874 | bnx2x_fw_command(bp, DRV_MSG_CODE_UNLOAD_DONE); | ||
| 6875 | |||
| 6876 | /* unload UNDI on port 1 */ | ||
| 6757 | bp->func = 1; | 6877 | bp->func = 1; |
| 6758 | bp->fw_seq = (SHMEM_RD(bp, | 6878 | bp->fw_seq = |
| 6759 | func_mb[bp->func].drv_mb_header) & | 6879 | (SHMEM_RD(bp, func_mb[bp->func].drv_mb_header) & |
| 6760 | DRV_MSG_SEQ_NUMBER_MASK); | 6880 | DRV_MSG_SEQ_NUMBER_MASK); |
| 6761 | 6881 | reset_code = DRV_MSG_CODE_UNLOAD_REQ_WOL_DIS; | |
| 6762 | bnx2x_fw_command(bp, | 6882 | |
| 6763 | DRV_MSG_CODE_UNLOAD_REQ_WOL_DIS); | 6883 | bnx2x_fw_command(bp, reset_code); |
| 6764 | bnx2x_fw_command(bp, | ||
| 6765 | DRV_MSG_CODE_UNLOAD_DONE); | ||
| 6766 | |||
| 6767 | /* restore our func and fw_seq */ | ||
| 6768 | bp->func = func; | ||
| 6769 | bp->fw_seq = fw_seq; | ||
| 6770 | } | 6884 | } |
| 6771 | 6885 | ||
| 6886 | REG_WR(bp, (BP_PORT(bp) ? HC_REG_CONFIG_1 : | ||
| 6887 | HC_REG_CONFIG_0), 0x1000); | ||
| 6888 | |||
| 6889 | /* close input traffic and wait for it */ | ||
| 6890 | /* Do not rcv packets to BRB */ | ||
| 6891 | REG_WR(bp, | ||
| 6892 | (BP_PORT(bp) ? NIG_REG_LLH1_BRB1_DRV_MASK : | ||
| 6893 | NIG_REG_LLH0_BRB1_DRV_MASK), 0x0); | ||
| 6894 | /* Do not direct rcv packets that are not for MCP to | ||
| 6895 | * the BRB */ | ||
| 6896 | REG_WR(bp, | ||
| 6897 | (BP_PORT(bp) ? NIG_REG_LLH1_BRB1_NOT_MCP : | ||
| 6898 | NIG_REG_LLH0_BRB1_NOT_MCP), 0x0); | ||
| 6899 | /* clear AEU */ | ||
| 6900 | REG_WR(bp, | ||
| 6901 | (BP_PORT(bp) ? MISC_REG_AEU_MASK_ATTN_FUNC_1 : | ||
| 6902 | MISC_REG_AEU_MASK_ATTN_FUNC_0), 0); | ||
| 6903 | msleep(10); | ||
| 6904 | |||
| 6905 | /* save NIG port swap info */ | ||
| 6906 | swap_val = REG_RD(bp, NIG_REG_PORT_SWAP); | ||
| 6907 | swap_en = REG_RD(bp, NIG_REG_STRAP_OVERRIDE); | ||
| 6772 | /* reset device */ | 6908 | /* reset device */ |
| 6773 | REG_WR(bp, | 6909 | REG_WR(bp, |
| 6774 | GRCBASE_MISC + MISC_REGISTERS_RESET_REG_1_CLEAR, | 6910 | GRCBASE_MISC + MISC_REGISTERS_RESET_REG_1_CLEAR, |
| 6775 | 0xd3ffff7f); | 6911 | 0xd3ffffff); |
| 6776 | REG_WR(bp, | 6912 | REG_WR(bp, |
| 6777 | GRCBASE_MISC + MISC_REGISTERS_RESET_REG_2_CLEAR, | 6913 | GRCBASE_MISC + MISC_REGISTERS_RESET_REG_2_CLEAR, |
| 6778 | 0x1403); | 6914 | 0x1403); |
| 6915 | /* take the NIG out of reset and restore swap values */ | ||
| 6916 | REG_WR(bp, | ||
| 6917 | GRCBASE_MISC + MISC_REGISTERS_RESET_REG_1_SET, | ||
| 6918 | MISC_REGISTERS_RESET_REG_1_RST_NIG); | ||
| 6919 | REG_WR(bp, NIG_REG_PORT_SWAP, swap_val); | ||
| 6920 | REG_WR(bp, NIG_REG_STRAP_OVERRIDE, swap_en); | ||
| 6921 | |||
| 6922 | /* send unload done to the MCP */ | ||
| 6923 | bnx2x_fw_command(bp, DRV_MSG_CODE_UNLOAD_DONE); | ||
| 6924 | |||
| 6925 | /* restore our func and fw_seq */ | ||
| 6926 | bp->func = func; | ||
| 6927 | bp->fw_seq = | ||
| 6928 | (SHMEM_RD(bp, func_mb[bp->func].drv_mb_header) & | ||
| 6929 | DRV_MSG_SEQ_NUMBER_MASK); | ||
| 6779 | } | 6930 | } |
| 6780 | } | 6931 | } |
| 6781 | } | 6932 | } |
| @@ -6783,6 +6934,7 @@ static void __devinit bnx2x_undi_unload(struct bnx2x *bp) | |||
| 6783 | static void __devinit bnx2x_get_common_hwinfo(struct bnx2x *bp) | 6934 | static void __devinit bnx2x_get_common_hwinfo(struct bnx2x *bp) |
| 6784 | { | 6935 | { |
| 6785 | u32 val, val2, val3, val4, id; | 6936 | u32 val, val2, val3, val4, id; |
| 6937 | u16 pmc; | ||
| 6786 | 6938 | ||
| 6787 | /* Get the chip revision id and number. */ | 6939 | /* Get the chip revision id and number. */ |
| 6788 | /* chip num:16-31, rev:12-15, metal:4-11, bond_id:0-3 */ | 6940 | /* chip num:16-31, rev:12-15, metal:4-11, bond_id:0-3 */ |
| @@ -6840,8 +6992,16 @@ static void __devinit bnx2x_get_common_hwinfo(struct bnx2x *bp) | |||
| 6840 | BNX2X_ERR("This driver needs bc_ver %X but found %X," | 6992 | BNX2X_ERR("This driver needs bc_ver %X but found %X," |
| 6841 | " please upgrade BC\n", BNX2X_BC_VER, val); | 6993 | " please upgrade BC\n", BNX2X_BC_VER, val); |
| 6842 | } | 6994 | } |
| 6843 | BNX2X_DEV_INFO("%sWoL Capable\n", | 6995 | |
| 6844 | (bp->flags & NO_WOL_FLAG)? "Not " : ""); | 6996 | if (BP_E1HVN(bp) == 0) { |
| 6997 | pci_read_config_word(bp->pdev, bp->pm_cap + PCI_PM_PMC, &pmc); | ||
| 6998 | bp->flags |= (pmc & PCI_PM_CAP_PME_D3cold) ? 0 : NO_WOL_FLAG; | ||
| 6999 | } else { | ||
| 7000 | /* no WOL capability for E1HVN != 0 */ | ||
| 7001 | bp->flags |= NO_WOL_FLAG; | ||
| 7002 | } | ||
| 7003 | BNX2X_DEV_INFO("%sWoL capable\n", | ||
| 7004 | (bp->flags & NO_WOL_FLAG) ? "Not " : ""); | ||
| 6845 | 7005 | ||
| 6846 | val = SHMEM_RD(bp, dev_info.shared_hw_config.part_num); | 7006 | val = SHMEM_RD(bp, dev_info.shared_hw_config.part_num); |
| 6847 | val2 = SHMEM_RD(bp, dev_info.shared_hw_config.part_num[4]); | 7007 | val2 = SHMEM_RD(bp, dev_info.shared_hw_config.part_num[4]); |
| @@ -7274,9 +7434,8 @@ static int __devinit bnx2x_get_hwinfo(struct bnx2x *bp) | |||
| 7274 | bp->mf_config = | 7434 | bp->mf_config = |
| 7275 | SHMEM_RD(bp, mf_cfg.func_mf_config[func].config); | 7435 | SHMEM_RD(bp, mf_cfg.func_mf_config[func].config); |
| 7276 | 7436 | ||
| 7277 | val = | 7437 | val = (SHMEM_RD(bp, mf_cfg.func_mf_config[func].e1hov_tag) & |
| 7278 | (SHMEM_RD(bp, mf_cfg.func_mf_config[func].e1hov_tag) & | 7438 | FUNC_MF_CFG_E1HOV_TAG_MASK); |
| 7279 | FUNC_MF_CFG_E1HOV_TAG_MASK); | ||
| 7280 | if (val != FUNC_MF_CFG_E1HOV_TAG_DEFAULT) { | 7439 | if (val != FUNC_MF_CFG_E1HOV_TAG_DEFAULT) { |
| 7281 | 7440 | ||
| 7282 | bp->e1hov = val; | 7441 | bp->e1hov = val; |
| @@ -7324,7 +7483,7 @@ static int __devinit bnx2x_get_hwinfo(struct bnx2x *bp) | |||
| 7324 | 7483 | ||
| 7325 | if (BP_NOMCP(bp)) { | 7484 | if (BP_NOMCP(bp)) { |
| 7326 | /* only supposed to happen on emulation/FPGA */ | 7485 | /* only supposed to happen on emulation/FPGA */ |
| 7327 | BNX2X_ERR("warning rendom MAC workaround active\n"); | 7486 | BNX2X_ERR("warning random MAC workaround active\n"); |
| 7328 | random_ether_addr(bp->dev->dev_addr); | 7487 | random_ether_addr(bp->dev->dev_addr); |
| 7329 | memcpy(bp->dev->perm_addr, bp->dev->dev_addr, ETH_ALEN); | 7488 | memcpy(bp->dev->perm_addr, bp->dev->dev_addr, ETH_ALEN); |
| 7330 | } | 7489 | } |
| @@ -7337,8 +7496,8 @@ static int __devinit bnx2x_init_bp(struct bnx2x *bp) | |||
| 7337 | int func = BP_FUNC(bp); | 7496 | int func = BP_FUNC(bp); |
| 7338 | int rc; | 7497 | int rc; |
| 7339 | 7498 | ||
| 7340 | if (nomcp) | 7499 | /* Disable interrupt handling until HW is initialized */ |
| 7341 | bp->flags |= NO_MCP_FLAG; | 7500 | atomic_set(&bp->intr_sem, 1); |
| 7342 | 7501 | ||
| 7343 | mutex_init(&bp->port.phy_mutex); | 7502 | mutex_init(&bp->port.phy_mutex); |
| 7344 | 7503 | ||
| @@ -7377,8 +7536,6 @@ static int __devinit bnx2x_init_bp(struct bnx2x *bp) | |||
| 7377 | bp->tx_ticks = 50; | 7536 | bp->tx_ticks = 50; |
| 7378 | bp->rx_ticks = 25; | 7537 | bp->rx_ticks = 25; |
| 7379 | 7538 | ||
| 7380 | bp->stats_ticks = 1000000 & 0xffff00; | ||
| 7381 | |||
| 7382 | bp->timer_interval = (CHIP_REV_IS_SLOW(bp) ? 5*HZ : HZ); | 7539 | bp->timer_interval = (CHIP_REV_IS_SLOW(bp) ? 5*HZ : HZ); |
| 7383 | bp->current_interval = (poll ? poll : bp->timer_interval); | 7540 | bp->current_interval = (poll ? poll : bp->timer_interval); |
| 7384 | 7541 | ||
| @@ -7628,25 +7785,25 @@ static void bnx2x_get_drvinfo(struct net_device *dev, | |||
| 7628 | struct ethtool_drvinfo *info) | 7785 | struct ethtool_drvinfo *info) |
| 7629 | { | 7786 | { |
| 7630 | struct bnx2x *bp = netdev_priv(dev); | 7787 | struct bnx2x *bp = netdev_priv(dev); |
| 7631 | char phy_fw_ver[PHY_FW_VER_LEN]; | 7788 | u8 phy_fw_ver[PHY_FW_VER_LEN]; |
| 7632 | 7789 | ||
| 7633 | strcpy(info->driver, DRV_MODULE_NAME); | 7790 | strcpy(info->driver, DRV_MODULE_NAME); |
| 7634 | strcpy(info->version, DRV_MODULE_VERSION); | 7791 | strcpy(info->version, DRV_MODULE_VERSION); |
| 7635 | 7792 | ||
| 7636 | phy_fw_ver[0] = '\0'; | 7793 | phy_fw_ver[0] = '\0'; |
| 7637 | if (bp->port.pmf) { | 7794 | if (bp->port.pmf) { |
| 7638 | bnx2x_phy_hw_lock(bp); | 7795 | bnx2x_acquire_phy_lock(bp); |
| 7639 | bnx2x_get_ext_phy_fw_version(&bp->link_params, | 7796 | bnx2x_get_ext_phy_fw_version(&bp->link_params, |
| 7640 | (bp->state != BNX2X_STATE_CLOSED), | 7797 | (bp->state != BNX2X_STATE_CLOSED), |
| 7641 | phy_fw_ver, PHY_FW_VER_LEN); | 7798 | phy_fw_ver, PHY_FW_VER_LEN); |
| 7642 | bnx2x_phy_hw_unlock(bp); | 7799 | bnx2x_release_phy_lock(bp); |
| 7643 | } | 7800 | } |
| 7644 | 7801 | ||
| 7645 | snprintf(info->fw_version, 32, "%d.%d.%d:%d BC:%x%s%s", | 7802 | snprintf(info->fw_version, 32, "BC:%d.%d.%d%s%s", |
| 7646 | BCM_5710_FW_MAJOR_VERSION, BCM_5710_FW_MINOR_VERSION, | 7803 | (bp->common.bc_ver & 0xff0000) >> 16, |
| 7647 | BCM_5710_FW_REVISION_VERSION, | 7804 | (bp->common.bc_ver & 0xff00) >> 8, |
| 7648 | BCM_5710_FW_COMPILE_FLAGS, bp->common.bc_ver, | 7805 | (bp->common.bc_ver & 0xff), |
| 7649 | ((phy_fw_ver[0] != '\0')? " PHY:":""), phy_fw_ver); | 7806 | ((phy_fw_ver[0] != '\0') ? " PHY:" : ""), phy_fw_ver); |
| 7650 | strcpy(info->bus_info, pci_name(bp->pdev)); | 7807 | strcpy(info->bus_info, pci_name(bp->pdev)); |
| 7651 | info->n_stats = BNX2X_NUM_STATS; | 7808 | info->n_stats = BNX2X_NUM_STATS; |
| 7652 | info->testinfo_len = BNX2X_NUM_TESTS; | 7809 | info->testinfo_len = BNX2X_NUM_TESTS; |
| @@ -8097,7 +8254,7 @@ static int bnx2x_set_eeprom(struct net_device *dev, | |||
| 8097 | if (eeprom->magic == 0x00504859) | 8254 | if (eeprom->magic == 0x00504859) |
| 8098 | if (bp->port.pmf) { | 8255 | if (bp->port.pmf) { |
| 8099 | 8256 | ||
| 8100 | bnx2x_phy_hw_lock(bp); | 8257 | bnx2x_acquire_phy_lock(bp); |
| 8101 | rc = bnx2x_flash_download(bp, BP_PORT(bp), | 8258 | rc = bnx2x_flash_download(bp, BP_PORT(bp), |
| 8102 | bp->link_params.ext_phy_config, | 8259 | bp->link_params.ext_phy_config, |
| 8103 | (bp->state != BNX2X_STATE_CLOSED), | 8260 | (bp->state != BNX2X_STATE_CLOSED), |
| @@ -8109,7 +8266,7 @@ static int bnx2x_set_eeprom(struct net_device *dev, | |||
| 8109 | rc |= bnx2x_phy_init(&bp->link_params, | 8266 | rc |= bnx2x_phy_init(&bp->link_params, |
| 8110 | &bp->link_vars); | 8267 | &bp->link_vars); |
| 8111 | } | 8268 | } |
| 8112 | bnx2x_phy_hw_unlock(bp); | 8269 | bnx2x_release_phy_lock(bp); |
| 8113 | 8270 | ||
| 8114 | } else /* Only the PMF can access the PHY */ | 8271 | } else /* Only the PMF can access the PHY */ |
| 8115 | return -EINVAL; | 8272 | return -EINVAL; |
| @@ -8128,7 +8285,6 @@ static int bnx2x_get_coalesce(struct net_device *dev, | |||
| 8128 | 8285 | ||
| 8129 | coal->rx_coalesce_usecs = bp->rx_ticks; | 8286 | coal->rx_coalesce_usecs = bp->rx_ticks; |
| 8130 | coal->tx_coalesce_usecs = bp->tx_ticks; | 8287 | coal->tx_coalesce_usecs = bp->tx_ticks; |
| 8131 | coal->stats_block_coalesce_usecs = bp->stats_ticks; | ||
| 8132 | 8288 | ||
| 8133 | return 0; | 8289 | return 0; |
| 8134 | } | 8290 | } |
| @@ -8146,44 +8302,12 @@ static int bnx2x_set_coalesce(struct net_device *dev, | |||
| 8146 | if (bp->tx_ticks > 0x3000) | 8302 | if (bp->tx_ticks > 0x3000) |
| 8147 | bp->tx_ticks = 0x3000; | 8303 | bp->tx_ticks = 0x3000; |
| 8148 | 8304 | ||
| 8149 | bp->stats_ticks = coal->stats_block_coalesce_usecs; | ||
| 8150 | if (bp->stats_ticks > 0xffff00) | ||
| 8151 | bp->stats_ticks = 0xffff00; | ||
| 8152 | bp->stats_ticks &= 0xffff00; | ||
| 8153 | |||
| 8154 | if (netif_running(dev)) | 8305 | if (netif_running(dev)) |
| 8155 | bnx2x_update_coalesce(bp); | 8306 | bnx2x_update_coalesce(bp); |
| 8156 | 8307 | ||
| 8157 | return 0; | 8308 | return 0; |
| 8158 | } | 8309 | } |
| 8159 | 8310 | ||
| 8160 | static int bnx2x_set_flags(struct net_device *dev, u32 data) | ||
| 8161 | { | ||
| 8162 | struct bnx2x *bp = netdev_priv(dev); | ||
| 8163 | int changed = 0; | ||
| 8164 | int rc = 0; | ||
| 8165 | |||
| 8166 | if (data & ETH_FLAG_LRO) { | ||
| 8167 | if (!(dev->features & NETIF_F_LRO)) { | ||
| 8168 | dev->features |= NETIF_F_LRO; | ||
| 8169 | bp->flags |= TPA_ENABLE_FLAG; | ||
| 8170 | changed = 1; | ||
| 8171 | } | ||
| 8172 | |||
| 8173 | } else if (dev->features & NETIF_F_LRO) { | ||
| 8174 | dev->features &= ~NETIF_F_LRO; | ||
| 8175 | bp->flags &= ~TPA_ENABLE_FLAG; | ||
| 8176 | changed = 1; | ||
| 8177 | } | ||
| 8178 | |||
| 8179 | if (changed && netif_running(dev)) { | ||
| 8180 | bnx2x_nic_unload(bp, UNLOAD_NORMAL); | ||
| 8181 | rc = bnx2x_nic_load(bp, LOAD_NORMAL); | ||
| 8182 | } | ||
| 8183 | |||
| 8184 | return rc; | ||
| 8185 | } | ||
| 8186 | |||
| 8187 | static void bnx2x_get_ringparam(struct net_device *dev, | 8311 | static void bnx2x_get_ringparam(struct net_device *dev, |
| 8188 | struct ethtool_ringparam *ering) | 8312 | struct ethtool_ringparam *ering) |
| 8189 | { | 8313 | { |
| @@ -8266,7 +8390,7 @@ static int bnx2x_set_pauseparam(struct net_device *dev, | |||
| 8266 | 8390 | ||
| 8267 | if (epause->autoneg) { | 8391 | if (epause->autoneg) { |
| 8268 | if (!(bp->port.supported & SUPPORTED_Autoneg)) { | 8392 | if (!(bp->port.supported & SUPPORTED_Autoneg)) { |
| 8269 | DP(NETIF_MSG_LINK, "Autoneg not supported\n"); | 8393 | DP(NETIF_MSG_LINK, "autoneg not supported\n"); |
| 8270 | return -EINVAL; | 8394 | return -EINVAL; |
| 8271 | } | 8395 | } |
| 8272 | 8396 | ||
| @@ -8285,6 +8409,34 @@ static int bnx2x_set_pauseparam(struct net_device *dev, | |||
| 8285 | return 0; | 8409 | return 0; |
| 8286 | } | 8410 | } |
| 8287 | 8411 | ||
| 8412 | static int bnx2x_set_flags(struct net_device *dev, u32 data) | ||
| 8413 | { | ||
| 8414 | struct bnx2x *bp = netdev_priv(dev); | ||
| 8415 | int changed = 0; | ||
| 8416 | int rc = 0; | ||
| 8417 | |||
| 8418 | /* TPA requires Rx CSUM offloading */ | ||
| 8419 | if ((data & ETH_FLAG_LRO) && bp->rx_csum) { | ||
| 8420 | if (!(dev->features & NETIF_F_LRO)) { | ||
| 8421 | dev->features |= NETIF_F_LRO; | ||
| 8422 | bp->flags |= TPA_ENABLE_FLAG; | ||
| 8423 | changed = 1; | ||
| 8424 | } | ||
| 8425 | |||
| 8426 | } else if (dev->features & NETIF_F_LRO) { | ||
| 8427 | dev->features &= ~NETIF_F_LRO; | ||
| 8428 | bp->flags &= ~TPA_ENABLE_FLAG; | ||
| 8429 | changed = 1; | ||
| 8430 | } | ||
| 8431 | |||
| 8432 | if (changed && netif_running(dev)) { | ||
| 8433 | bnx2x_nic_unload(bp, UNLOAD_NORMAL); | ||
| 8434 | rc = bnx2x_nic_load(bp, LOAD_NORMAL); | ||
| 8435 | } | ||
| 8436 | |||
| 8437 | return rc; | ||
| 8438 | } | ||
| 8439 | |||
| 8288 | static u32 bnx2x_get_rx_csum(struct net_device *dev) | 8440 | static u32 bnx2x_get_rx_csum(struct net_device *dev) |
| 8289 | { | 8441 | { |
| 8290 | struct bnx2x *bp = netdev_priv(dev); | 8442 | struct bnx2x *bp = netdev_priv(dev); |
| @@ -8295,9 +8447,19 @@ static u32 bnx2x_get_rx_csum(struct net_device *dev) | |||
| 8295 | static int bnx2x_set_rx_csum(struct net_device *dev, u32 data) | 8447 | static int bnx2x_set_rx_csum(struct net_device *dev, u32 data) |
| 8296 | { | 8448 | { |
| 8297 | struct bnx2x *bp = netdev_priv(dev); | 8449 | struct bnx2x *bp = netdev_priv(dev); |
| 8450 | int rc = 0; | ||
| 8298 | 8451 | ||
| 8299 | bp->rx_csum = data; | 8452 | bp->rx_csum = data; |
| 8300 | return 0; | 8453 | |
| 8454 | /* Disable TPA, when Rx CSUM is disabled. Otherwise all | ||
| 8455 | TPA'ed packets will be discarded due to wrong TCP CSUM */ | ||
| 8456 | if (!data) { | ||
| 8457 | u32 flags = ethtool_op_get_flags(dev); | ||
| 8458 | |||
| 8459 | rc = bnx2x_set_flags(dev, (flags & ~ETH_FLAG_LRO)); | ||
| 8460 | } | ||
| 8461 | |||
| 8462 | return rc; | ||
| 8301 | } | 8463 | } |
| 8302 | 8464 | ||
| 8303 | static int bnx2x_set_tso(struct net_device *dev, u32 data) | 8465 | static int bnx2x_set_tso(struct net_device *dev, u32 data) |
| @@ -8335,6 +8497,7 @@ static int bnx2x_test_registers(struct bnx2x *bp) | |||
| 8335 | { | 8497 | { |
| 8336 | int idx, i, rc = -ENODEV; | 8498 | int idx, i, rc = -ENODEV; |
| 8337 | u32 wr_val = 0; | 8499 | u32 wr_val = 0; |
| 8500 | int port = BP_PORT(bp); | ||
| 8338 | static const struct { | 8501 | static const struct { |
| 8339 | u32 offset0; | 8502 | u32 offset0; |
| 8340 | u32 offset1; | 8503 | u32 offset1; |
| @@ -8400,7 +8563,6 @@ static int bnx2x_test_registers(struct bnx2x *bp) | |||
| 8400 | 8563 | ||
| 8401 | for (i = 0; reg_tbl[i].offset0 != 0xffffffff; i++) { | 8564 | for (i = 0; reg_tbl[i].offset0 != 0xffffffff; i++) { |
| 8402 | u32 offset, mask, save_val, val; | 8565 | u32 offset, mask, save_val, val; |
| 8403 | int port = BP_PORT(bp); | ||
| 8404 | 8566 | ||
| 8405 | offset = reg_tbl[i].offset0 + port*reg_tbl[i].offset1; | 8567 | offset = reg_tbl[i].offset0 + port*reg_tbl[i].offset1; |
| 8406 | mask = reg_tbl[i].mask; | 8568 | mask = reg_tbl[i].mask; |
| @@ -8446,16 +8608,17 @@ static int bnx2x_test_memory(struct bnx2x *bp) | |||
| 8446 | static const struct { | 8608 | static const struct { |
| 8447 | char *name; | 8609 | char *name; |
| 8448 | u32 offset; | 8610 | u32 offset; |
| 8449 | u32 mask; | 8611 | u32 e1_mask; |
| 8612 | u32 e1h_mask; | ||
| 8450 | } prty_tbl[] = { | 8613 | } prty_tbl[] = { |
| 8451 | { "CCM_REG_CCM_PRTY_STS", CCM_REG_CCM_PRTY_STS, 0 }, | 8614 | { "CCM_PRTY_STS", CCM_REG_CCM_PRTY_STS, 0x3ffc0, 0 }, |
| 8452 | { "CFC_REG_CFC_PRTY_STS", CFC_REG_CFC_PRTY_STS, 0 }, | 8615 | { "CFC_PRTY_STS", CFC_REG_CFC_PRTY_STS, 0x2, 0x2 }, |
| 8453 | { "DMAE_REG_DMAE_PRTY_STS", DMAE_REG_DMAE_PRTY_STS, 0 }, | 8616 | { "DMAE_PRTY_STS", DMAE_REG_DMAE_PRTY_STS, 0, 0 }, |
| 8454 | { "TCM_REG_TCM_PRTY_STS", TCM_REG_TCM_PRTY_STS, 0 }, | 8617 | { "TCM_PRTY_STS", TCM_REG_TCM_PRTY_STS, 0x3ffc0, 0 }, |
| 8455 | { "UCM_REG_UCM_PRTY_STS", UCM_REG_UCM_PRTY_STS, 0 }, | 8618 | { "UCM_PRTY_STS", UCM_REG_UCM_PRTY_STS, 0x3ffc0, 0 }, |
| 8456 | { "XCM_REG_XCM_PRTY_STS", XCM_REG_XCM_PRTY_STS, 0x1 }, | 8619 | { "XCM_PRTY_STS", XCM_REG_XCM_PRTY_STS, 0x3ffc1, 0 }, |
| 8457 | 8620 | ||
| 8458 | { NULL, 0xffffffff, 0 } | 8621 | { NULL, 0xffffffff, 0, 0 } |
| 8459 | }; | 8622 | }; |
| 8460 | 8623 | ||
| 8461 | if (!netif_running(bp->dev)) | 8624 | if (!netif_running(bp->dev)) |
| @@ -8469,7 +8632,8 @@ static int bnx2x_test_memory(struct bnx2x *bp) | |||
| 8469 | /* Check the parity status */ | 8632 | /* Check the parity status */ |
| 8470 | for (i = 0; prty_tbl[i].offset != 0xffffffff; i++) { | 8633 | for (i = 0; prty_tbl[i].offset != 0xffffffff; i++) { |
| 8471 | val = REG_RD(bp, prty_tbl[i].offset); | 8634 | val = REG_RD(bp, prty_tbl[i].offset); |
| 8472 | if (val & ~(prty_tbl[i].mask)) { | 8635 | if ((CHIP_IS_E1(bp) && (val & ~(prty_tbl[i].e1_mask))) || |
| 8636 | (CHIP_IS_E1H(bp) && (val & ~(prty_tbl[i].e1h_mask)))) { | ||
| 8473 | DP(NETIF_MSG_HW, | 8637 | DP(NETIF_MSG_HW, |
| 8474 | "%s is 0x%x\n", prty_tbl[i].name, val); | 8638 | "%s is 0x%x\n", prty_tbl[i].name, val); |
| 8475 | goto test_mem_exit; | 8639 | goto test_mem_exit; |
| @@ -8482,34 +8646,6 @@ test_mem_exit: | |||
| 8482 | return rc; | 8646 | return rc; |
| 8483 | } | 8647 | } |
| 8484 | 8648 | ||
| 8485 | static void bnx2x_netif_start(struct bnx2x *bp) | ||
| 8486 | { | ||
| 8487 | int i; | ||
| 8488 | |||
| 8489 | if (atomic_dec_and_test(&bp->intr_sem)) { | ||
| 8490 | if (netif_running(bp->dev)) { | ||
| 8491 | bnx2x_int_enable(bp); | ||
| 8492 | for_each_queue(bp, i) | ||
| 8493 | napi_enable(&bnx2x_fp(bp, i, napi)); | ||
| 8494 | if (bp->state == BNX2X_STATE_OPEN) | ||
| 8495 | netif_wake_queue(bp->dev); | ||
| 8496 | } | ||
| 8497 | } | ||
| 8498 | } | ||
| 8499 | |||
| 8500 | static void bnx2x_netif_stop(struct bnx2x *bp) | ||
| 8501 | { | ||
| 8502 | int i; | ||
| 8503 | |||
| 8504 | if (netif_running(bp->dev)) { | ||
| 8505 | netif_tx_disable(bp->dev); | ||
| 8506 | bp->dev->trans_start = jiffies; /* prevent tx timeout */ | ||
| 8507 | for_each_queue(bp, i) | ||
| 8508 | napi_disable(&bnx2x_fp(bp, i, napi)); | ||
| 8509 | } | ||
| 8510 | bnx2x_int_disable_sync(bp); | ||
| 8511 | } | ||
| 8512 | |||
| 8513 | static void bnx2x_wait_for_link(struct bnx2x *bp, u8 link_up) | 8649 | static void bnx2x_wait_for_link(struct bnx2x *bp, u8 link_up) |
| 8514 | { | 8650 | { |
| 8515 | int cnt = 1000; | 8651 | int cnt = 1000; |
| @@ -8539,15 +8675,15 @@ static int bnx2x_run_loopback(struct bnx2x *bp, int loopback_mode, u8 link_up) | |||
| 8539 | 8675 | ||
| 8540 | if (loopback_mode == BNX2X_MAC_LOOPBACK) { | 8676 | if (loopback_mode == BNX2X_MAC_LOOPBACK) { |
| 8541 | bp->link_params.loopback_mode = LOOPBACK_BMAC; | 8677 | bp->link_params.loopback_mode = LOOPBACK_BMAC; |
| 8542 | bnx2x_phy_hw_lock(bp); | 8678 | bnx2x_acquire_phy_lock(bp); |
| 8543 | bnx2x_phy_init(&bp->link_params, &bp->link_vars); | 8679 | bnx2x_phy_init(&bp->link_params, &bp->link_vars); |
| 8544 | bnx2x_phy_hw_unlock(bp); | 8680 | bnx2x_release_phy_lock(bp); |
| 8545 | 8681 | ||
| 8546 | } else if (loopback_mode == BNX2X_PHY_LOOPBACK) { | 8682 | } else if (loopback_mode == BNX2X_PHY_LOOPBACK) { |
| 8547 | bp->link_params.loopback_mode = LOOPBACK_XGXS_10; | 8683 | bp->link_params.loopback_mode = LOOPBACK_XGXS_10; |
| 8548 | bnx2x_phy_hw_lock(bp); | 8684 | bnx2x_acquire_phy_lock(bp); |
| 8549 | bnx2x_phy_init(&bp->link_params, &bp->link_vars); | 8685 | bnx2x_phy_init(&bp->link_params, &bp->link_vars); |
| 8550 | bnx2x_phy_hw_unlock(bp); | 8686 | bnx2x_release_phy_lock(bp); |
| 8551 | /* wait until link state is restored */ | 8687 | /* wait until link state is restored */ |
| 8552 | bnx2x_wait_for_link(bp, link_up); | 8688 | bnx2x_wait_for_link(bp, link_up); |
| 8553 | 8689 | ||
| @@ -8771,7 +8907,7 @@ static void bnx2x_self_test(struct net_device *dev, | |||
| 8771 | if (!netif_running(dev)) | 8907 | if (!netif_running(dev)) |
| 8772 | return; | 8908 | return; |
| 8773 | 8909 | ||
| 8774 | /* offline tests are not suppoerted in MF mode */ | 8910 | /* offline tests are not supported in MF mode */ |
| 8775 | if (IS_E1HMF(bp)) | 8911 | if (IS_E1HMF(bp)) |
| 8776 | etest->flags &= ~ETH_TEST_FL_OFFLINE; | 8912 | etest->flags &= ~ETH_TEST_FL_OFFLINE; |
| 8777 | 8913 | ||
| @@ -8827,76 +8963,99 @@ static const struct { | |||
| 8827 | long offset; | 8963 | long offset; |
| 8828 | int size; | 8964 | int size; |
| 8829 | u32 flags; | 8965 | u32 flags; |
| 8830 | char string[ETH_GSTRING_LEN]; | 8966 | #define STATS_FLAGS_PORT 1 |
| 8967 | #define STATS_FLAGS_FUNC 2 | ||
| 8968 | u8 string[ETH_GSTRING_LEN]; | ||
| 8831 | } bnx2x_stats_arr[BNX2X_NUM_STATS] = { | 8969 | } bnx2x_stats_arr[BNX2X_NUM_STATS] = { |
| 8832 | /* 1 */ { STATS_OFFSET32(valid_bytes_received_hi), 8, 1, "rx_bytes" }, | 8970 | /* 1 */ { STATS_OFFSET32(valid_bytes_received_hi), |
| 8833 | { STATS_OFFSET32(error_bytes_received_hi), 8, 1, "rx_error_bytes" }, | 8971 | 8, STATS_FLAGS_FUNC, "rx_bytes" }, |
| 8834 | { STATS_OFFSET32(total_bytes_transmitted_hi), 8, 1, "tx_bytes" }, | 8972 | { STATS_OFFSET32(error_bytes_received_hi), |
| 8835 | { STATS_OFFSET32(tx_stat_ifhcoutbadoctets_hi), 8, 0, "tx_error_bytes" }, | 8973 | 8, STATS_FLAGS_FUNC, "rx_error_bytes" }, |
| 8974 | { STATS_OFFSET32(total_bytes_transmitted_hi), | ||
| 8975 | 8, STATS_FLAGS_FUNC, "tx_bytes" }, | ||
| 8976 | { STATS_OFFSET32(tx_stat_ifhcoutbadoctets_hi), | ||
| 8977 | 8, STATS_FLAGS_PORT, "tx_error_bytes" }, | ||
| 8836 | { STATS_OFFSET32(total_unicast_packets_received_hi), | 8978 | { STATS_OFFSET32(total_unicast_packets_received_hi), |
| 8837 | 8, 1, "rx_ucast_packets" }, | 8979 | 8, STATS_FLAGS_FUNC, "rx_ucast_packets" }, |
| 8838 | { STATS_OFFSET32(total_multicast_packets_received_hi), | 8980 | { STATS_OFFSET32(total_multicast_packets_received_hi), |
| 8839 | 8, 1, "rx_mcast_packets" }, | 8981 | 8, STATS_FLAGS_FUNC, "rx_mcast_packets" }, |
| 8840 | { STATS_OFFSET32(total_broadcast_packets_received_hi), | 8982 | { STATS_OFFSET32(total_broadcast_packets_received_hi), |
| 8841 | 8, 1, "rx_bcast_packets" }, | 8983 | 8, STATS_FLAGS_FUNC, "rx_bcast_packets" }, |
| 8842 | { STATS_OFFSET32(total_unicast_packets_transmitted_hi), | 8984 | { STATS_OFFSET32(total_unicast_packets_transmitted_hi), |
| 8843 | 8, 1, "tx_packets" }, | 8985 | 8, STATS_FLAGS_FUNC, "tx_packets" }, |
| 8844 | { STATS_OFFSET32(tx_stat_dot3statsinternalmactransmiterrors_hi), | 8986 | { STATS_OFFSET32(tx_stat_dot3statsinternalmactransmiterrors_hi), |
| 8845 | 8, 0, "tx_mac_errors" }, | 8987 | 8, STATS_FLAGS_PORT, "tx_mac_errors" }, |
| 8846 | /* 10 */{ STATS_OFFSET32(rx_stat_dot3statscarriersenseerrors_hi), | 8988 | /* 10 */{ STATS_OFFSET32(rx_stat_dot3statscarriersenseerrors_hi), |
| 8847 | 8, 0, "tx_carrier_errors" }, | 8989 | 8, STATS_FLAGS_PORT, "tx_carrier_errors" }, |
| 8848 | { STATS_OFFSET32(rx_stat_dot3statsfcserrors_hi), | 8990 | { STATS_OFFSET32(rx_stat_dot3statsfcserrors_hi), |
| 8849 | 8, 0, "rx_crc_errors" }, | 8991 | 8, STATS_FLAGS_PORT, "rx_crc_errors" }, |
| 8850 | { STATS_OFFSET32(rx_stat_dot3statsalignmenterrors_hi), | 8992 | { STATS_OFFSET32(rx_stat_dot3statsalignmenterrors_hi), |
| 8851 | 8, 0, "rx_align_errors" }, | 8993 | 8, STATS_FLAGS_PORT, "rx_align_errors" }, |
| 8852 | { STATS_OFFSET32(tx_stat_dot3statssinglecollisionframes_hi), | 8994 | { STATS_OFFSET32(tx_stat_dot3statssinglecollisionframes_hi), |
| 8853 | 8, 0, "tx_single_collisions" }, | 8995 | 8, STATS_FLAGS_PORT, "tx_single_collisions" }, |
| 8854 | { STATS_OFFSET32(tx_stat_dot3statsmultiplecollisionframes_hi), | 8996 | { STATS_OFFSET32(tx_stat_dot3statsmultiplecollisionframes_hi), |
| 8855 | 8, 0, "tx_multi_collisions" }, | 8997 | 8, STATS_FLAGS_PORT, "tx_multi_collisions" }, |
| 8856 | { STATS_OFFSET32(tx_stat_dot3statsdeferredtransmissions_hi), | 8998 | { STATS_OFFSET32(tx_stat_dot3statsdeferredtransmissions_hi), |
| 8857 | 8, 0, "tx_deferred" }, | 8999 | 8, STATS_FLAGS_PORT, "tx_deferred" }, |
| 8858 | { STATS_OFFSET32(tx_stat_dot3statsexcessivecollisions_hi), | 9000 | { STATS_OFFSET32(tx_stat_dot3statsexcessivecollisions_hi), |
| 8859 | 8, 0, "tx_excess_collisions" }, | 9001 | 8, STATS_FLAGS_PORT, "tx_excess_collisions" }, |
| 8860 | { STATS_OFFSET32(tx_stat_dot3statslatecollisions_hi), | 9002 | { STATS_OFFSET32(tx_stat_dot3statslatecollisions_hi), |
| 8861 | 8, 0, "tx_late_collisions" }, | 9003 | 8, STATS_FLAGS_PORT, "tx_late_collisions" }, |
| 8862 | { STATS_OFFSET32(tx_stat_etherstatscollisions_hi), | 9004 | { STATS_OFFSET32(tx_stat_etherstatscollisions_hi), |
| 8863 | 8, 0, "tx_total_collisions" }, | 9005 | 8, STATS_FLAGS_PORT, "tx_total_collisions" }, |
| 8864 | { STATS_OFFSET32(rx_stat_etherstatsfragments_hi), | 9006 | { STATS_OFFSET32(rx_stat_etherstatsfragments_hi), |
| 8865 | 8, 0, "rx_fragments" }, | 9007 | 8, STATS_FLAGS_PORT, "rx_fragments" }, |
| 8866 | /* 20 */{ STATS_OFFSET32(rx_stat_etherstatsjabbers_hi), 8, 0, "rx_jabbers" }, | 9008 | /* 20 */{ STATS_OFFSET32(rx_stat_etherstatsjabbers_hi), |
| 9009 | 8, STATS_FLAGS_PORT, "rx_jabbers" }, | ||
| 8867 | { STATS_OFFSET32(rx_stat_etherstatsundersizepkts_hi), | 9010 | { STATS_OFFSET32(rx_stat_etherstatsundersizepkts_hi), |
| 8868 | 8, 0, "rx_undersize_packets" }, | 9011 | 8, STATS_FLAGS_PORT, "rx_undersize_packets" }, |
| 8869 | { STATS_OFFSET32(jabber_packets_received), | 9012 | { STATS_OFFSET32(jabber_packets_received), |
| 8870 | 4, 1, "rx_oversize_packets" }, | 9013 | 4, STATS_FLAGS_FUNC, "rx_oversize_packets" }, |
| 8871 | { STATS_OFFSET32(tx_stat_etherstatspkts64octets_hi), | 9014 | { STATS_OFFSET32(tx_stat_etherstatspkts64octets_hi), |
| 8872 | 8, 0, "tx_64_byte_packets" }, | 9015 | 8, STATS_FLAGS_PORT, "tx_64_byte_packets" }, |
| 8873 | { STATS_OFFSET32(tx_stat_etherstatspkts65octetsto127octets_hi), | 9016 | { STATS_OFFSET32(tx_stat_etherstatspkts65octetsto127octets_hi), |
| 8874 | 8, 0, "tx_65_to_127_byte_packets" }, | 9017 | 8, STATS_FLAGS_PORT, "tx_65_to_127_byte_packets" }, |
| 8875 | { STATS_OFFSET32(tx_stat_etherstatspkts128octetsto255octets_hi), | 9018 | { STATS_OFFSET32(tx_stat_etherstatspkts128octetsto255octets_hi), |
| 8876 | 8, 0, "tx_128_to_255_byte_packets" }, | 9019 | 8, STATS_FLAGS_PORT, "tx_128_to_255_byte_packets" }, |
| 8877 | { STATS_OFFSET32(tx_stat_etherstatspkts256octetsto511octets_hi), | 9020 | { STATS_OFFSET32(tx_stat_etherstatspkts256octetsto511octets_hi), |
| 8878 | 8, 0, "tx_256_to_511_byte_packets" }, | 9021 | 8, STATS_FLAGS_PORT, "tx_256_to_511_byte_packets" }, |
| 8879 | { STATS_OFFSET32(tx_stat_etherstatspkts512octetsto1023octets_hi), | 9022 | { STATS_OFFSET32(tx_stat_etherstatspkts512octetsto1023octets_hi), |
| 8880 | 8, 0, "tx_512_to_1023_byte_packets" }, | 9023 | 8, STATS_FLAGS_PORT, "tx_512_to_1023_byte_packets" }, |
| 8881 | { STATS_OFFSET32(etherstatspkts1024octetsto1522octets_hi), | 9024 | { STATS_OFFSET32(etherstatspkts1024octetsto1522octets_hi), |
| 8882 | 8, 0, "tx_1024_to_1522_byte_packets" }, | 9025 | 8, STATS_FLAGS_PORT, "tx_1024_to_1522_byte_packets" }, |
| 8883 | { STATS_OFFSET32(etherstatspktsover1522octets_hi), | 9026 | { STATS_OFFSET32(etherstatspktsover1522octets_hi), |
| 8884 | 8, 0, "tx_1523_to_9022_byte_packets" }, | 9027 | 8, STATS_FLAGS_PORT, "tx_1523_to_9022_byte_packets" }, |
| 8885 | /* 30 */{ STATS_OFFSET32(rx_stat_xonpauseframesreceived_hi), | 9028 | /* 30 */{ STATS_OFFSET32(rx_stat_xonpauseframesreceived_hi), |
| 8886 | 8, 0, "rx_xon_frames" }, | 9029 | 8, STATS_FLAGS_PORT, "rx_xon_frames" }, |
| 8887 | { STATS_OFFSET32(rx_stat_xoffpauseframesreceived_hi), | 9030 | { STATS_OFFSET32(rx_stat_xoffpauseframesreceived_hi), |
| 8888 | 8, 0, "rx_xoff_frames" }, | 9031 | 8, STATS_FLAGS_PORT, "rx_xoff_frames" }, |
| 8889 | { STATS_OFFSET32(tx_stat_outxonsent_hi), 8, 0, "tx_xon_frames" }, | 9032 | { STATS_OFFSET32(tx_stat_outxonsent_hi), |
| 8890 | { STATS_OFFSET32(tx_stat_outxoffsent_hi), 8, 0, "tx_xoff_frames" }, | 9033 | 8, STATS_FLAGS_PORT, "tx_xon_frames" }, |
| 9034 | { STATS_OFFSET32(tx_stat_outxoffsent_hi), | ||
| 9035 | 8, STATS_FLAGS_PORT, "tx_xoff_frames" }, | ||
| 8891 | { STATS_OFFSET32(rx_stat_maccontrolframesreceived_hi), | 9036 | { STATS_OFFSET32(rx_stat_maccontrolframesreceived_hi), |
| 8892 | 8, 0, "rx_mac_ctrl_frames" }, | 9037 | 8, STATS_FLAGS_PORT, "rx_mac_ctrl_frames" }, |
| 8893 | { STATS_OFFSET32(mac_filter_discard), 4, 1, "rx_filtered_packets" }, | 9038 | { STATS_OFFSET32(mac_filter_discard), |
| 8894 | { STATS_OFFSET32(no_buff_discard), 4, 1, "rx_discards" }, | 9039 | 4, STATS_FLAGS_PORT, "rx_filtered_packets" }, |
| 8895 | { STATS_OFFSET32(xxoverflow_discard), 4, 1, "rx_fw_discards" }, | 9040 | { STATS_OFFSET32(no_buff_discard), |
| 8896 | { STATS_OFFSET32(brb_drop_hi), 8, 1, "brb_discard" }, | 9041 | 4, STATS_FLAGS_FUNC, "rx_discards" }, |
| 8897 | /* 39 */{ STATS_OFFSET32(brb_truncate_discard), 8, 1, "brb_truncate" } | 9042 | { STATS_OFFSET32(xxoverflow_discard), |
| 9043 | 4, STATS_FLAGS_PORT, "rx_fw_discards" }, | ||
| 9044 | { STATS_OFFSET32(brb_drop_hi), | ||
| 9045 | 8, STATS_FLAGS_PORT, "brb_discard" }, | ||
| 9046 | { STATS_OFFSET32(brb_truncate_hi), | ||
| 9047 | 8, STATS_FLAGS_PORT, "brb_truncate" }, | ||
| 9048 | /* 40 */{ STATS_OFFSET32(rx_err_discard_pkt), | ||
| 9049 | 4, STATS_FLAGS_FUNC, "rx_phy_ip_err_discards"}, | ||
| 9050 | { STATS_OFFSET32(rx_skb_alloc_failed), | ||
| 9051 | 4, STATS_FLAGS_FUNC, "rx_skb_alloc_discard" }, | ||
| 9052 | /* 42 */{ STATS_OFFSET32(hw_csum_err), | ||
| 9053 | 4, STATS_FLAGS_FUNC, "rx_csum_offload_errors" } | ||
| 8898 | }; | 9054 | }; |
| 8899 | 9055 | ||
| 9056 | #define IS_NOT_E1HMF_STAT(bp, i) \ | ||
| 9057 | (IS_E1HMF(bp) && (bnx2x_stats_arr[i].flags & STATS_FLAGS_PORT)) | ||
| 9058 | |||
| 8900 | static void bnx2x_get_strings(struct net_device *dev, u32 stringset, u8 *buf) | 9059 | static void bnx2x_get_strings(struct net_device *dev, u32 stringset, u8 *buf) |
| 8901 | { | 9060 | { |
| 8902 | struct bnx2x *bp = netdev_priv(dev); | 9061 | struct bnx2x *bp = netdev_priv(dev); |
| @@ -8905,7 +9064,7 @@ static void bnx2x_get_strings(struct net_device *dev, u32 stringset, u8 *buf) | |||
| 8905 | switch (stringset) { | 9064 | switch (stringset) { |
| 8906 | case ETH_SS_STATS: | 9065 | case ETH_SS_STATS: |
| 8907 | for (i = 0, j = 0; i < BNX2X_NUM_STATS; i++) { | 9066 | for (i = 0, j = 0; i < BNX2X_NUM_STATS; i++) { |
| 8908 | if (IS_E1HMF(bp) && (!bnx2x_stats_arr[i].flags)) | 9067 | if (IS_NOT_E1HMF_STAT(bp, i)) |
| 8909 | continue; | 9068 | continue; |
| 8910 | strcpy(buf + j*ETH_GSTRING_LEN, | 9069 | strcpy(buf + j*ETH_GSTRING_LEN, |
| 8911 | bnx2x_stats_arr[i].string); | 9070 | bnx2x_stats_arr[i].string); |
| @@ -8925,7 +9084,7 @@ static int bnx2x_get_stats_count(struct net_device *dev) | |||
| 8925 | int i, num_stats = 0; | 9084 | int i, num_stats = 0; |
| 8926 | 9085 | ||
| 8927 | for (i = 0; i < BNX2X_NUM_STATS; i++) { | 9086 | for (i = 0; i < BNX2X_NUM_STATS; i++) { |
| 8928 | if (IS_E1HMF(bp) && (!bnx2x_stats_arr[i].flags)) | 9087 | if (IS_NOT_E1HMF_STAT(bp, i)) |
| 8929 | continue; | 9088 | continue; |
| 8930 | num_stats++; | 9089 | num_stats++; |
| 8931 | } | 9090 | } |
| @@ -8940,7 +9099,7 @@ static void bnx2x_get_ethtool_stats(struct net_device *dev, | |||
| 8940 | int i, j; | 9099 | int i, j; |
| 8941 | 9100 | ||
| 8942 | for (i = 0, j = 0; i < BNX2X_NUM_STATS; i++) { | 9101 | for (i = 0, j = 0; i < BNX2X_NUM_STATS; i++) { |
| 8943 | if (IS_E1HMF(bp) && (!bnx2x_stats_arr[i].flags)) | 9102 | if (IS_NOT_E1HMF_STAT(bp, i)) |
| 8944 | continue; | 9103 | continue; |
| 8945 | 9104 | ||
| 8946 | if (bnx2x_stats_arr[i].size == 0) { | 9105 | if (bnx2x_stats_arr[i].size == 0) { |
| @@ -9057,7 +9216,7 @@ static int bnx2x_set_power_state(struct bnx2x *bp, pci_power_t state) | |||
| 9057 | PCI_PM_CTRL_PME_STATUS)); | 9216 | PCI_PM_CTRL_PME_STATUS)); |
| 9058 | 9217 | ||
| 9059 | if (pmcsr & PCI_PM_CTRL_STATE_MASK) | 9218 | if (pmcsr & PCI_PM_CTRL_STATE_MASK) |
| 9060 | /* delay required during transition out of D3hot */ | 9219 | /* delay required during transition out of D3hot */ |
| 9061 | msleep(20); | 9220 | msleep(20); |
| 9062 | break; | 9221 | break; |
| 9063 | 9222 | ||
| @@ -9092,6 +9251,7 @@ static int bnx2x_poll(struct napi_struct *napi, int budget) | |||
| 9092 | napi); | 9251 | napi); |
| 9093 | struct bnx2x *bp = fp->bp; | 9252 | struct bnx2x *bp = fp->bp; |
| 9094 | int work_done = 0; | 9253 | int work_done = 0; |
| 9254 | u16 rx_cons_sb; | ||
| 9095 | 9255 | ||
| 9096 | #ifdef BNX2X_STOP_ON_ERROR | 9256 | #ifdef BNX2X_STOP_ON_ERROR |
| 9097 | if (unlikely(bp->panic)) | 9257 | if (unlikely(bp->panic)) |
| @@ -9104,17 +9264,22 @@ static int bnx2x_poll(struct napi_struct *napi, int budget) | |||
| 9104 | 9264 | ||
| 9105 | bnx2x_update_fpsb_idx(fp); | 9265 | bnx2x_update_fpsb_idx(fp); |
| 9106 | 9266 | ||
| 9107 | if ((fp->tx_pkt_prod != le16_to_cpu(*fp->tx_cons_sb)) || | 9267 | if (BNX2X_HAS_TX_WORK(fp)) |
| 9108 | (fp->tx_pkt_prod != fp->tx_pkt_cons)) | ||
| 9109 | bnx2x_tx_int(fp, budget); | 9268 | bnx2x_tx_int(fp, budget); |
| 9110 | 9269 | ||
| 9111 | if (le16_to_cpu(*fp->rx_cons_sb) != fp->rx_comp_cons) | 9270 | rx_cons_sb = le16_to_cpu(*fp->rx_cons_sb); |
| 9271 | if ((rx_cons_sb & MAX_RCQ_DESC_CNT) == MAX_RCQ_DESC_CNT) | ||
| 9272 | rx_cons_sb++; | ||
| 9273 | if (BNX2X_HAS_RX_WORK(fp)) | ||
| 9112 | work_done = bnx2x_rx_int(fp, budget); | 9274 | work_done = bnx2x_rx_int(fp, budget); |
| 9113 | 9275 | ||
| 9114 | rmb(); /* bnx2x_has_work() reads the status block */ | 9276 | rmb(); /* BNX2X_HAS_WORK() reads the status block */ |
| 9277 | rx_cons_sb = le16_to_cpu(*fp->rx_cons_sb); | ||
| 9278 | if ((rx_cons_sb & MAX_RCQ_DESC_CNT) == MAX_RCQ_DESC_CNT) | ||
| 9279 | rx_cons_sb++; | ||
| 9115 | 9280 | ||
| 9116 | /* must not complete if we consumed full budget */ | 9281 | /* must not complete if we consumed full budget */ |
| 9117 | if ((work_done < budget) && !bnx2x_has_work(fp)) { | 9282 | if ((work_done < budget) && !BNX2X_HAS_WORK(fp)) { |
| 9118 | 9283 | ||
| 9119 | #ifdef BNX2X_STOP_ON_ERROR | 9284 | #ifdef BNX2X_STOP_ON_ERROR |
| 9120 | poll_panic: | 9285 | poll_panic: |
| @@ -9131,7 +9296,7 @@ poll_panic: | |||
| 9131 | 9296 | ||
| 9132 | 9297 | ||
| 9133 | /* we split the first BD into headers and data BDs | 9298 | /* we split the first BD into headers and data BDs |
| 9134 | * to ease the pain of our fellow micocode engineers | 9299 | * to ease the pain of our fellow microcode engineers |
| 9135 | * we use one mapping for both BDs | 9300 | * we use one mapping for both BDs |
| 9136 | * So far this has only been observed to happen | 9301 | * So far this has only been observed to happen |
| 9137 | * in Other Operating Systems(TM) | 9302 | * in Other Operating Systems(TM) |
| @@ -9238,7 +9403,7 @@ static int bnx2x_pkt_req_lin(struct bnx2x *bp, struct sk_buff *skb, | |||
| 9238 | /* Check if LSO packet needs to be copied: | 9403 | /* Check if LSO packet needs to be copied: |
| 9239 | 3 = 1 (for headers BD) + 2 (for PBD and last BD) */ | 9404 | 3 = 1 (for headers BD) + 2 (for PBD and last BD) */ |
| 9240 | int wnd_size = MAX_FETCH_BD - 3; | 9405 | int wnd_size = MAX_FETCH_BD - 3; |
| 9241 | /* Number of widnows to check */ | 9406 | /* Number of windows to check */ |
| 9242 | int num_wnds = skb_shinfo(skb)->nr_frags - wnd_size; | 9407 | int num_wnds = skb_shinfo(skb)->nr_frags - wnd_size; |
| 9243 | int wnd_idx = 0; | 9408 | int wnd_idx = 0; |
| 9244 | int frag_idx = 0; | 9409 | int frag_idx = 0; |
| @@ -9327,8 +9492,7 @@ static int bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 9327 | fp_index = (smp_processor_id() % bp->num_queues); | 9492 | fp_index = (smp_processor_id() % bp->num_queues); |
| 9328 | fp = &bp->fp[fp_index]; | 9493 | fp = &bp->fp[fp_index]; |
| 9329 | 9494 | ||
| 9330 | if (unlikely(bnx2x_tx_avail(bp->fp) < | 9495 | if (unlikely(bnx2x_tx_avail(fp) < (skb_shinfo(skb)->nr_frags + 3))) { |
| 9331 | (skb_shinfo(skb)->nr_frags + 3))) { | ||
| 9332 | bp->eth_stats.driver_xoff++, | 9496 | bp->eth_stats.driver_xoff++, |
| 9333 | netif_stop_queue(dev); | 9497 | netif_stop_queue(dev); |
| 9334 | BNX2X_ERR("BUG! Tx ring full when queue awake!\n"); | 9498 | BNX2X_ERR("BUG! Tx ring full when queue awake!\n"); |
| @@ -9340,7 +9504,7 @@ static int bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 9340 | skb->ip_summed, skb->protocol, ipv6_hdr(skb)->nexthdr, | 9504 | skb->ip_summed, skb->protocol, ipv6_hdr(skb)->nexthdr, |
| 9341 | ip_hdr(skb)->protocol, skb_shinfo(skb)->gso_type, xmit_type); | 9505 | ip_hdr(skb)->protocol, skb_shinfo(skb)->gso_type, xmit_type); |
| 9342 | 9506 | ||
| 9343 | /* First, check if we need to linearaize the skb | 9507 | /* First, check if we need to linearize the skb |
| 9344 | (due to FW restrictions) */ | 9508 | (due to FW restrictions) */ |
| 9345 | if (bnx2x_pkt_req_lin(bp, skb, xmit_type)) { | 9509 | if (bnx2x_pkt_req_lin(bp, skb, xmit_type)) { |
| 9346 | /* Statistics of linearization */ | 9510 | /* Statistics of linearization */ |
| @@ -9349,7 +9513,7 @@ static int bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 9349 | DP(NETIF_MSG_TX_QUEUED, "SKB linearization failed - " | 9513 | DP(NETIF_MSG_TX_QUEUED, "SKB linearization failed - " |
| 9350 | "silently dropping this SKB\n"); | 9514 | "silently dropping this SKB\n"); |
| 9351 | dev_kfree_skb_any(skb); | 9515 | dev_kfree_skb_any(skb); |
| 9352 | return 0; | 9516 | return NETDEV_TX_OK; |
| 9353 | } | 9517 | } |
| 9354 | } | 9518 | } |
| 9355 | 9519 | ||
| @@ -9372,7 +9536,8 @@ static int bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 9372 | tx_bd->bd_flags.as_bitfield = ETH_TX_BD_FLAGS_START_BD; | 9536 | tx_bd->bd_flags.as_bitfield = ETH_TX_BD_FLAGS_START_BD; |
| 9373 | tx_bd->general_data = (UNICAST_ADDRESS << | 9537 | tx_bd->general_data = (UNICAST_ADDRESS << |
| 9374 | ETH_TX_BD_ETH_ADDR_TYPE_SHIFT); | 9538 | ETH_TX_BD_ETH_ADDR_TYPE_SHIFT); |
| 9375 | tx_bd->general_data |= 1; /* header nbd */ | 9539 | /* header nbd */ |
| 9540 | tx_bd->general_data |= (1 << ETH_TX_BD_HDR_NBDS_SHIFT); | ||
| 9376 | 9541 | ||
| 9377 | /* remember the first BD of the packet */ | 9542 | /* remember the first BD of the packet */ |
| 9378 | tx_buf->first_bd = fp->tx_bd_prod; | 9543 | tx_buf->first_bd = fp->tx_bd_prod; |
| @@ -9390,7 +9555,6 @@ static int bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 9390 | tx_bd->vlan = cpu_to_le16(pkt_prod); | 9555 | tx_bd->vlan = cpu_to_le16(pkt_prod); |
| 9391 | 9556 | ||
| 9392 | if (xmit_type) { | 9557 | if (xmit_type) { |
| 9393 | |||
| 9394 | /* turn on parsing and get a BD */ | 9558 | /* turn on parsing and get a BD */ |
| 9395 | bd_prod = TX_BD(NEXT_TX_IDX(bd_prod)); | 9559 | bd_prod = TX_BD(NEXT_TX_IDX(bd_prod)); |
| 9396 | pbd = (void *)&fp->tx_desc_ring[bd_prod]; | 9560 | pbd = (void *)&fp->tx_desc_ring[bd_prod]; |
| @@ -9451,7 +9615,7 @@ static int bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 9451 | 9615 | ||
| 9452 | tx_bd->addr_hi = cpu_to_le32(U64_HI(mapping)); | 9616 | tx_bd->addr_hi = cpu_to_le32(U64_HI(mapping)); |
| 9453 | tx_bd->addr_lo = cpu_to_le32(U64_LO(mapping)); | 9617 | tx_bd->addr_lo = cpu_to_le32(U64_LO(mapping)); |
| 9454 | nbd = skb_shinfo(skb)->nr_frags + ((pbd == NULL)? 1 : 2); | 9618 | nbd = skb_shinfo(skb)->nr_frags + ((pbd == NULL) ? 1 : 2); |
| 9455 | tx_bd->nbd = cpu_to_le16(nbd); | 9619 | tx_bd->nbd = cpu_to_le16(nbd); |
| 9456 | tx_bd->nbytes = cpu_to_le16(skb_headlen(skb)); | 9620 | tx_bd->nbytes = cpu_to_le16(skb_headlen(skb)); |
| 9457 | 9621 | ||
| @@ -9721,9 +9885,9 @@ static int bnx2x_change_mac_addr(struct net_device *dev, void *p) | |||
| 9721 | memcpy(dev->dev_addr, addr->sa_data, dev->addr_len); | 9885 | memcpy(dev->dev_addr, addr->sa_data, dev->addr_len); |
| 9722 | if (netif_running(dev)) { | 9886 | if (netif_running(dev)) { |
| 9723 | if (CHIP_IS_E1(bp)) | 9887 | if (CHIP_IS_E1(bp)) |
| 9724 | bnx2x_set_mac_addr_e1(bp); | 9888 | bnx2x_set_mac_addr_e1(bp, 1); |
| 9725 | else | 9889 | else |
| 9726 | bnx2x_set_mac_addr_e1h(bp); | 9890 | bnx2x_set_mac_addr_e1h(bp, 1); |
| 9727 | } | 9891 | } |
| 9728 | 9892 | ||
| 9729 | return 0; | 9893 | return 0; |
| @@ -9734,6 +9898,7 @@ static int bnx2x_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) | |||
| 9734 | { | 9898 | { |
| 9735 | struct mii_ioctl_data *data = if_mii(ifr); | 9899 | struct mii_ioctl_data *data = if_mii(ifr); |
| 9736 | struct bnx2x *bp = netdev_priv(dev); | 9900 | struct bnx2x *bp = netdev_priv(dev); |
| 9901 | int port = BP_PORT(bp); | ||
| 9737 | int err; | 9902 | int err; |
| 9738 | 9903 | ||
| 9739 | switch (cmd) { | 9904 | switch (cmd) { |
| @@ -9749,7 +9914,7 @@ static int bnx2x_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) | |||
| 9749 | return -EAGAIN; | 9914 | return -EAGAIN; |
| 9750 | 9915 | ||
| 9751 | mutex_lock(&bp->port.phy_mutex); | 9916 | mutex_lock(&bp->port.phy_mutex); |
| 9752 | err = bnx2x_cl45_read(bp, BP_PORT(bp), 0, bp->port.phy_addr, | 9917 | err = bnx2x_cl45_read(bp, port, 0, bp->port.phy_addr, |
| 9753 | DEFAULT_PHY_DEV_ADDR, | 9918 | DEFAULT_PHY_DEV_ADDR, |
| 9754 | (data->reg_num & 0x1f), &mii_regval); | 9919 | (data->reg_num & 0x1f), &mii_regval); |
| 9755 | data->val_out = mii_regval; | 9920 | data->val_out = mii_regval; |
| @@ -9765,7 +9930,7 @@ static int bnx2x_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) | |||
| 9765 | return -EAGAIN; | 9930 | return -EAGAIN; |
| 9766 | 9931 | ||
| 9767 | mutex_lock(&bp->port.phy_mutex); | 9932 | mutex_lock(&bp->port.phy_mutex); |
| 9768 | err = bnx2x_cl45_write(bp, BP_PORT(bp), 0, bp->port.phy_addr, | 9933 | err = bnx2x_cl45_write(bp, port, 0, bp->port.phy_addr, |
| 9769 | DEFAULT_PHY_DEV_ADDR, | 9934 | DEFAULT_PHY_DEV_ADDR, |
| 9770 | (data->reg_num & 0x1f), data->val_in); | 9935 | (data->reg_num & 0x1f), data->val_in); |
| 9771 | mutex_unlock(&bp->port.phy_mutex); | 9936 | mutex_unlock(&bp->port.phy_mutex); |
| @@ -10141,7 +10306,7 @@ static int bnx2x_suspend(struct pci_dev *pdev, pm_message_t state) | |||
| 10141 | 10306 | ||
| 10142 | netif_device_detach(dev); | 10307 | netif_device_detach(dev); |
| 10143 | 10308 | ||
| 10144 | bnx2x_nic_unload(bp, UNLOAD_NORMAL); | 10309 | bnx2x_nic_unload(bp, UNLOAD_CLOSE); |
| 10145 | 10310 | ||
| 10146 | bnx2x_set_power_state(bp, pci_choose_state(pdev, state)); | 10311 | bnx2x_set_power_state(bp, pci_choose_state(pdev, state)); |
| 10147 | 10312 | ||
| @@ -10174,7 +10339,7 @@ static int bnx2x_resume(struct pci_dev *pdev) | |||
| 10174 | bnx2x_set_power_state(bp, PCI_D0); | 10339 | bnx2x_set_power_state(bp, PCI_D0); |
| 10175 | netif_device_attach(dev); | 10340 | netif_device_attach(dev); |
| 10176 | 10341 | ||
| 10177 | rc = bnx2x_nic_load(bp, LOAD_NORMAL); | 10342 | rc = bnx2x_nic_load(bp, LOAD_OPEN); |
| 10178 | 10343 | ||
| 10179 | rtnl_unlock(); | 10344 | rtnl_unlock(); |
| 10180 | 10345 | ||
diff --git a/drivers/net/bnx2x_reg.h b/drivers/net/bnx2x_reg.h index 15c9a9946724..a67b0c358ae4 100644 --- a/drivers/net/bnx2x_reg.h +++ b/drivers/net/bnx2x_reg.h | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | * it under the terms of the GNU General Public License as published by | 6 | * it under the terms of the GNU General Public License as published by |
| 7 | * the Free Software Foundation. | 7 | * the Free Software Foundation. |
| 8 | * | 8 | * |
| 9 | * The registers description starts with the regsister Access type followed | 9 | * The registers description starts with the register Access type followed |
| 10 | * by size in bits. For example [RW 32]. The access types are: | 10 | * by size in bits. For example [RW 32]. The access types are: |
| 11 | * R - Read only | 11 | * R - Read only |
| 12 | * RC - Clear on read | 12 | * RC - Clear on read |
| @@ -49,7 +49,7 @@ | |||
| 49 | /* [RW 10] Write client 0: Assert pause threshold. */ | 49 | /* [RW 10] Write client 0: Assert pause threshold. */ |
| 50 | #define BRB1_REG_PAUSE_LOW_THRESHOLD_0 0x60068 | 50 | #define BRB1_REG_PAUSE_LOW_THRESHOLD_0 0x60068 |
| 51 | #define BRB1_REG_PAUSE_LOW_THRESHOLD_1 0x6006c | 51 | #define BRB1_REG_PAUSE_LOW_THRESHOLD_1 0x6006c |
| 52 | /* [R 24] The number of full blocks occpied by port. */ | 52 | /* [R 24] The number of full blocks occupied by port. */ |
| 53 | #define BRB1_REG_PORT_NUM_OCC_BLOCKS_0 0x60094 | 53 | #define BRB1_REG_PORT_NUM_OCC_BLOCKS_0 0x60094 |
| 54 | /* [RW 1] Reset the design by software. */ | 54 | /* [RW 1] Reset the design by software. */ |
| 55 | #define BRB1_REG_SOFT_RESET 0x600dc | 55 | #define BRB1_REG_SOFT_RESET 0x600dc |
| @@ -740,6 +740,7 @@ | |||
| 740 | #define HC_REG_ATTN_MSG1_ADDR_L 0x108020 | 740 | #define HC_REG_ATTN_MSG1_ADDR_L 0x108020 |
| 741 | #define HC_REG_ATTN_NUM_P0 0x108038 | 741 | #define HC_REG_ATTN_NUM_P0 0x108038 |
| 742 | #define HC_REG_ATTN_NUM_P1 0x10803c | 742 | #define HC_REG_ATTN_NUM_P1 0x10803c |
| 743 | #define HC_REG_COMMAND_REG 0x108180 | ||
| 743 | #define HC_REG_CONFIG_0 0x108000 | 744 | #define HC_REG_CONFIG_0 0x108000 |
| 744 | #define HC_REG_CONFIG_1 0x108004 | 745 | #define HC_REG_CONFIG_1 0x108004 |
| 745 | #define HC_REG_FUNC_NUM_P0 0x1080ac | 746 | #define HC_REG_FUNC_NUM_P0 0x1080ac |
| @@ -1372,6 +1373,23 @@ | |||
| 1372 | be asserted). */ | 1373 | be asserted). */ |
| 1373 | #define MISC_REG_DRIVER_CONTROL_16 0xa5f0 | 1374 | #define MISC_REG_DRIVER_CONTROL_16 0xa5f0 |
| 1374 | #define MISC_REG_DRIVER_CONTROL_16_SIZE 2 | 1375 | #define MISC_REG_DRIVER_CONTROL_16_SIZE 2 |
| 1376 | /* [RW 32] The following driver registers(1...16) represent 16 drivers and | ||
| 1377 | 32 clients. Each client can be controlled by one driver only. One in each | ||
| 1378 | bit represent that this driver control the appropriate client (Ex: bit 5 | ||
| 1379 | is set means this driver control client number 5). addr1 = set; addr0 = | ||
| 1380 | clear; read from both addresses will give the same result = status. write | ||
| 1381 | to address 1 will set a request to control all the clients that their | ||
| 1382 | appropriate bit (in the write command) is set. if the client is free (the | ||
| 1383 | appropriate bit in all the other drivers is clear) one will be written to | ||
| 1384 | that driver register; if the client isn't free the bit will remain zero. | ||
| 1385 | if the appropriate bit is set (the driver request to gain control on a | ||
| 1386 | client it already controls the ~MISC_REGISTERS_INT_STS.GENERIC_SW | ||
| 1387 | interrupt will be asserted). write to address 0 will set a request to | ||
| 1388 | free all the clients that their appropriate bit (in the write command) is | ||
| 1389 | set. if the appropriate bit is clear (the driver request to free a client | ||
| 1390 | it doesn't controls the ~MISC_REGISTERS_INT_STS.GENERIC_SW interrupt will | ||
| 1391 | be asserted). */ | ||
| 1392 | #define MISC_REG_DRIVER_CONTROL_7 0xa3c8 | ||
| 1375 | /* [RW 1] e1hmf for WOL. If clr WOL signal o the PXP will be send on bit 0 | 1393 | /* [RW 1] e1hmf for WOL. If clr WOL signal o the PXP will be send on bit 0 |
| 1376 | only. */ | 1394 | only. */ |
| 1377 | #define MISC_REG_E1HMF_MODE 0xa5f8 | 1395 | #define MISC_REG_E1HMF_MODE 0xa5f8 |
| @@ -1394,13 +1412,13 @@ | |||
| 1394 | #define MISC_REG_GPIO 0xa490 | 1412 | #define MISC_REG_GPIO 0xa490 |
| 1395 | /* [R 28] this field hold the last information that caused reserved | 1413 | /* [R 28] this field hold the last information that caused reserved |
| 1396 | attention. bits [19:0] - address; [22:20] function; [23] reserved; | 1414 | attention. bits [19:0] - address; [22:20] function; [23] reserved; |
| 1397 | [27:24] the master thatcaused the attention - according to the following | 1415 | [27:24] the master that caused the attention - according to the following |
| 1398 | encodeing:1 = pxp; 2 = mcp; 3 = usdm; 4 = tsdm; 5 = xsdm; 6 = csdm; 7 = | 1416 | encodeing:1 = pxp; 2 = mcp; 3 = usdm; 4 = tsdm; 5 = xsdm; 6 = csdm; 7 = |
| 1399 | dbu; 8 = dmae */ | 1417 | dbu; 8 = dmae */ |
| 1400 | #define MISC_REG_GRC_RSV_ATTN 0xa3c0 | 1418 | #define MISC_REG_GRC_RSV_ATTN 0xa3c0 |
| 1401 | /* [R 28] this field hold the last information that caused timeout | 1419 | /* [R 28] this field hold the last information that caused timeout |
| 1402 | attention. bits [19:0] - address; [22:20] function; [23] reserved; | 1420 | attention. bits [19:0] - address; [22:20] function; [23] reserved; |
| 1403 | [27:24] the master thatcaused the attention - according to the following | 1421 | [27:24] the master that caused the attention - according to the following |
| 1404 | encodeing:1 = pxp; 2 = mcp; 3 = usdm; 4 = tsdm; 5 = xsdm; 6 = csdm; 7 = | 1422 | encodeing:1 = pxp; 2 = mcp; 3 = usdm; 4 = tsdm; 5 = xsdm; 6 = csdm; 7 = |
| 1405 | dbu; 8 = dmae */ | 1423 | dbu; 8 = dmae */ |
| 1406 | #define MISC_REG_GRC_TIMEOUT_ATTN 0xa3c4 | 1424 | #define MISC_REG_GRC_TIMEOUT_ATTN 0xa3c4 |
| @@ -1677,6 +1695,7 @@ | |||
| 1677 | /* [RW 8] init credit counter for port0 in LLH */ | 1695 | /* [RW 8] init credit counter for port0 in LLH */ |
| 1678 | #define NIG_REG_LLH0_XCM_INIT_CREDIT 0x10554 | 1696 | #define NIG_REG_LLH0_XCM_INIT_CREDIT 0x10554 |
| 1679 | #define NIG_REG_LLH0_XCM_MASK 0x10130 | 1697 | #define NIG_REG_LLH0_XCM_MASK 0x10130 |
| 1698 | #define NIG_REG_LLH1_BRB1_DRV_MASK 0x10248 | ||
| 1680 | /* [RW 1] send to BRB1 if no match on any of RMP rules. */ | 1699 | /* [RW 1] send to BRB1 if no match on any of RMP rules. */ |
| 1681 | #define NIG_REG_LLH1_BRB1_NOT_MCP 0x102dc | 1700 | #define NIG_REG_LLH1_BRB1_NOT_MCP 0x102dc |
| 1682 | /* [RW 2] Determine the classification participants. 0: no classification.1: | 1701 | /* [RW 2] Determine the classification participants. 0: no classification.1: |
| @@ -1727,6 +1746,9 @@ | |||
| 1727 | /* [R 32] Rx statistics : In user packets discarded due to BRB backpressure | 1746 | /* [R 32] Rx statistics : In user packets discarded due to BRB backpressure |
| 1728 | for port0 */ | 1747 | for port0 */ |
| 1729 | #define NIG_REG_STAT0_BRB_DISCARD 0x105f0 | 1748 | #define NIG_REG_STAT0_BRB_DISCARD 0x105f0 |
| 1749 | /* [R 32] Rx statistics : In user packets truncated due to BRB backpressure | ||
| 1750 | for port0 */ | ||
| 1751 | #define NIG_REG_STAT0_BRB_TRUNCATE 0x105f8 | ||
| 1730 | /* [WB_R 36] Tx statistics : Number of packets from emac0 or bmac0 that | 1752 | /* [WB_R 36] Tx statistics : Number of packets from emac0 or bmac0 that |
| 1731 | between 1024 and 1522 bytes for port0 */ | 1753 | between 1024 and 1522 bytes for port0 */ |
| 1732 | #define NIG_REG_STAT0_EGRESS_MAC_PKT0 0x10750 | 1754 | #define NIG_REG_STAT0_EGRESS_MAC_PKT0 0x10750 |
| @@ -2298,7 +2320,7 @@ | |||
| 2298 | /* [RW 3] page size in L2P table for QM module; -4k; -8k; -16k; -32k; -64k; | 2320 | /* [RW 3] page size in L2P table for QM module; -4k; -8k; -16k; -32k; -64k; |
| 2299 | -128k */ | 2321 | -128k */ |
| 2300 | #define PXP2_REG_RQ_QM_P_SIZE 0x120050 | 2322 | #define PXP2_REG_RQ_QM_P_SIZE 0x120050 |
| 2301 | /* [RW 1] 1' indicates that the RBC has finished configurating the PSWRQ */ | 2323 | /* [RW 1] 1' indicates that the RBC has finished configuring the PSWRQ */ |
| 2302 | #define PXP2_REG_RQ_RBC_DONE 0x1201b0 | 2324 | #define PXP2_REG_RQ_RBC_DONE 0x1201b0 |
| 2303 | /* [RW 3] Max burst size filed for read requests port 0; 000 - 128B; | 2325 | /* [RW 3] Max burst size filed for read requests port 0; 000 - 128B; |
| 2304 | 001:256B; 010: 512B; 11:1K:100:2K; 01:4K */ | 2326 | 001:256B; 010: 512B; 11:1K:100:2K; 01:4K */ |
| @@ -2406,7 +2428,7 @@ | |||
| 2406 | /* [RW 2] 0 - 128B; - 256B; - 512B; - 1024B; when the payload in the | 2428 | /* [RW 2] 0 - 128B; - 256B; - 512B; - 1024B; when the payload in the |
| 2407 | buffer reaches this number has_payload will be asserted */ | 2429 | buffer reaches this number has_payload will be asserted */ |
| 2408 | #define PXP2_REG_WR_DMAE_MPS 0x1205ec | 2430 | #define PXP2_REG_WR_DMAE_MPS 0x1205ec |
| 2409 | /* [RW 10] if Number of entries in dmae fifo will be higer than this | 2431 | /* [RW 10] if Number of entries in dmae fifo will be higher than this |
| 2410 | threshold then has_payload indication will be asserted; the default value | 2432 | threshold then has_payload indication will be asserted; the default value |
| 2411 | should be equal to > write MBS size! */ | 2433 | should be equal to > write MBS size! */ |
| 2412 | #define PXP2_REG_WR_DMAE_TH 0x120368 | 2434 | #define PXP2_REG_WR_DMAE_TH 0x120368 |
| @@ -2427,7 +2449,7 @@ | |||
| 2427 | /* [RW 2] 0 - 128B; - 256B; - 512B; - 1024B; when the payload in the | 2449 | /* [RW 2] 0 - 128B; - 256B; - 512B; - 1024B; when the payload in the |
| 2428 | buffer reaches this number has_payload will be asserted */ | 2450 | buffer reaches this number has_payload will be asserted */ |
| 2429 | #define PXP2_REG_WR_TSDM_MPS 0x1205d4 | 2451 | #define PXP2_REG_WR_TSDM_MPS 0x1205d4 |
| 2430 | /* [RW 10] if Number of entries in usdmdp fifo will be higer than this | 2452 | /* [RW 10] if Number of entries in usdmdp fifo will be higher than this |
| 2431 | threshold then has_payload indication will be asserted; the default value | 2453 | threshold then has_payload indication will be asserted; the default value |
| 2432 | should be equal to > write MBS size! */ | 2454 | should be equal to > write MBS size! */ |
| 2433 | #define PXP2_REG_WR_USDMDP_TH 0x120348 | 2455 | #define PXP2_REG_WR_USDMDP_TH 0x120348 |
| @@ -3294,12 +3316,12 @@ | |||
| 3294 | #define XSEM_XSEM_INT_MASK_0_REG_ADDRESS_ERROR_SIZE 0 | 3316 | #define XSEM_XSEM_INT_MASK_0_REG_ADDRESS_ERROR_SIZE 0 |
| 3295 | #define CFC_DEBUG1_REG_WRITE_AC (0x1<<4) | 3317 | #define CFC_DEBUG1_REG_WRITE_AC (0x1<<4) |
| 3296 | #define CFC_DEBUG1_REG_WRITE_AC_SIZE 4 | 3318 | #define CFC_DEBUG1_REG_WRITE_AC_SIZE 4 |
| 3297 | /* [R 1] debug only: This bit indicates wheter indicates that external | 3319 | /* [R 1] debug only: This bit indicates whether indicates that external |
| 3298 | buffer was wrapped (oldest data was thrown); Relevant only when | 3320 | buffer was wrapped (oldest data was thrown); Relevant only when |
| 3299 | ~dbg_registers_debug_target=2 (PCI) & ~dbg_registers_full_mode=1 (wrap); */ | 3321 | ~dbg_registers_debug_target=2 (PCI) & ~dbg_registers_full_mode=1 (wrap); */ |
| 3300 | #define DBG_REG_WRAP_ON_EXT_BUFFER 0xc124 | 3322 | #define DBG_REG_WRAP_ON_EXT_BUFFER 0xc124 |
| 3301 | #define DBG_REG_WRAP_ON_EXT_BUFFER_SIZE 1 | 3323 | #define DBG_REG_WRAP_ON_EXT_BUFFER_SIZE 1 |
| 3302 | /* [R 1] debug only: This bit indicates wheter the internal buffer was | 3324 | /* [R 1] debug only: This bit indicates whether the internal buffer was |
| 3303 | wrapped (oldest data was thrown) Relevant only when | 3325 | wrapped (oldest data was thrown) Relevant only when |
| 3304 | ~dbg_registers_debug_target=0 (internal buffer) */ | 3326 | ~dbg_registers_debug_target=0 (internal buffer) */ |
| 3305 | #define DBG_REG_WRAP_ON_INT_BUFFER 0xc128 | 3327 | #define DBG_REG_WRAP_ON_INT_BUFFER 0xc128 |
| @@ -4944,6 +4966,7 @@ | |||
| 4944 | #define EMAC_RX_MODE_PROMISCUOUS (1L<<8) | 4966 | #define EMAC_RX_MODE_PROMISCUOUS (1L<<8) |
| 4945 | #define EMAC_RX_MTU_SIZE_JUMBO_ENA (1L<<31) | 4967 | #define EMAC_RX_MTU_SIZE_JUMBO_ENA (1L<<31) |
| 4946 | #define EMAC_TX_MODE_EXT_PAUSE_EN (1L<<3) | 4968 | #define EMAC_TX_MODE_EXT_PAUSE_EN (1L<<3) |
| 4969 | #define EMAC_TX_MODE_FLOW_EN (1L<<4) | ||
| 4947 | #define MISC_REGISTERS_GPIO_0 0 | 4970 | #define MISC_REGISTERS_GPIO_0 0 |
| 4948 | #define MISC_REGISTERS_GPIO_1 1 | 4971 | #define MISC_REGISTERS_GPIO_1 1 |
| 4949 | #define MISC_REGISTERS_GPIO_2 2 | 4972 | #define MISC_REGISTERS_GPIO_2 2 |
| @@ -4959,6 +4982,7 @@ | |||
| 4959 | #define MISC_REGISTERS_GPIO_PORT_SHIFT 4 | 4982 | #define MISC_REGISTERS_GPIO_PORT_SHIFT 4 |
| 4960 | #define MISC_REGISTERS_GPIO_SET_POS 8 | 4983 | #define MISC_REGISTERS_GPIO_SET_POS 8 |
| 4961 | #define MISC_REGISTERS_RESET_REG_1_CLEAR 0x588 | 4984 | #define MISC_REGISTERS_RESET_REG_1_CLEAR 0x588 |
| 4985 | #define MISC_REGISTERS_RESET_REG_1_RST_NIG (0x1<<7) | ||
| 4962 | #define MISC_REGISTERS_RESET_REG_1_SET 0x584 | 4986 | #define MISC_REGISTERS_RESET_REG_1_SET 0x584 |
| 4963 | #define MISC_REGISTERS_RESET_REG_2_CLEAR 0x598 | 4987 | #define MISC_REGISTERS_RESET_REG_2_CLEAR 0x598 |
| 4964 | #define MISC_REGISTERS_RESET_REG_2_RST_BMAC0 (0x1<<0) | 4988 | #define MISC_REGISTERS_RESET_REG_2_RST_BMAC0 (0x1<<0) |
| @@ -4993,7 +5017,9 @@ | |||
| 4993 | #define HW_LOCK_MAX_RESOURCE_VALUE 31 | 5017 | #define HW_LOCK_MAX_RESOURCE_VALUE 31 |
| 4994 | #define HW_LOCK_RESOURCE_8072_MDIO 0 | 5018 | #define HW_LOCK_RESOURCE_8072_MDIO 0 |
| 4995 | #define HW_LOCK_RESOURCE_GPIO 1 | 5019 | #define HW_LOCK_RESOURCE_GPIO 1 |
| 5020 | #define HW_LOCK_RESOURCE_PORT0_ATT_MASK 3 | ||
| 4996 | #define HW_LOCK_RESOURCE_SPIO 2 | 5021 | #define HW_LOCK_RESOURCE_SPIO 2 |
| 5022 | #define HW_LOCK_RESOURCE_UNDI 5 | ||
| 4997 | #define AEU_INPUTS_ATTN_BITS_BRB_PARITY_ERROR (1<<18) | 5023 | #define AEU_INPUTS_ATTN_BITS_BRB_PARITY_ERROR (1<<18) |
| 4998 | #define AEU_INPUTS_ATTN_BITS_CCM_HW_INTERRUPT (1<<31) | 5024 | #define AEU_INPUTS_ATTN_BITS_CCM_HW_INTERRUPT (1<<31) |
| 4999 | #define AEU_INPUTS_ATTN_BITS_CDU_HW_INTERRUPT (1<<9) | 5025 | #define AEU_INPUTS_ATTN_BITS_CDU_HW_INTERRUPT (1<<9) |
| @@ -5144,59 +5170,73 @@ | |||
| 5144 | #define GRCBASE_MISC_AEU GRCBASE_MISC | 5170 | #define GRCBASE_MISC_AEU GRCBASE_MISC |
| 5145 | 5171 | ||
| 5146 | 5172 | ||
| 5147 | /*the offset of the configuration space in the pci core register*/ | 5173 | /* offset of configuration space in the pci core register */ |
| 5148 | #define PCICFG_OFFSET 0x2000 | 5174 | #define PCICFG_OFFSET 0x2000 |
| 5149 | #define PCICFG_VENDOR_ID_OFFSET 0x00 | 5175 | #define PCICFG_VENDOR_ID_OFFSET 0x00 |
| 5150 | #define PCICFG_DEVICE_ID_OFFSET 0x02 | 5176 | #define PCICFG_DEVICE_ID_OFFSET 0x02 |
| 5151 | #define PCICFG_COMMAND_OFFSET 0x04 | 5177 | #define PCICFG_COMMAND_OFFSET 0x04 |
| 5178 | #define PCICFG_COMMAND_IO_SPACE (1<<0) | ||
| 5179 | #define PCICFG_COMMAND_MEM_SPACE (1<<1) | ||
| 5180 | #define PCICFG_COMMAND_BUS_MASTER (1<<2) | ||
| 5181 | #define PCICFG_COMMAND_SPECIAL_CYCLES (1<<3) | ||
| 5182 | #define PCICFG_COMMAND_MWI_CYCLES (1<<4) | ||
| 5183 | #define PCICFG_COMMAND_VGA_SNOOP (1<<5) | ||
| 5184 | #define PCICFG_COMMAND_PERR_ENA (1<<6) | ||
| 5185 | #define PCICFG_COMMAND_STEPPING (1<<7) | ||
| 5186 | #define PCICFG_COMMAND_SERR_ENA (1<<8) | ||
| 5187 | #define PCICFG_COMMAND_FAST_B2B (1<<9) | ||
| 5188 | #define PCICFG_COMMAND_INT_DISABLE (1<<10) | ||
| 5189 | #define PCICFG_COMMAND_RESERVED (0x1f<<11) | ||
| 5152 | #define PCICFG_STATUS_OFFSET 0x06 | 5190 | #define PCICFG_STATUS_OFFSET 0x06 |
| 5153 | #define PCICFG_REVESION_ID 0x08 | 5191 | #define PCICFG_REVESION_ID 0x08 |
| 5154 | #define PCICFG_CACHE_LINE_SIZE 0x0c | 5192 | #define PCICFG_CACHE_LINE_SIZE 0x0c |
| 5155 | #define PCICFG_LATENCY_TIMER 0x0d | 5193 | #define PCICFG_LATENCY_TIMER 0x0d |
| 5156 | #define PCICFG_BAR_1_LOW 0x10 | 5194 | #define PCICFG_BAR_1_LOW 0x10 |
| 5157 | #define PCICFG_BAR_1_HIGH 0x14 | 5195 | #define PCICFG_BAR_1_HIGH 0x14 |
| 5158 | #define PCICFG_BAR_2_LOW 0x18 | 5196 | #define PCICFG_BAR_2_LOW 0x18 |
| 5159 | #define PCICFG_BAR_2_HIGH 0x1c | 5197 | #define PCICFG_BAR_2_HIGH 0x1c |
| 5160 | #define PCICFG_SUBSYSTEM_VENDOR_ID_OFFSET 0x2c | 5198 | #define PCICFG_SUBSYSTEM_VENDOR_ID_OFFSET 0x2c |
| 5161 | #define PCICFG_SUBSYSTEM_ID_OFFSET 0x2e | 5199 | #define PCICFG_SUBSYSTEM_ID_OFFSET 0x2e |
| 5162 | #define PCICFG_INT_LINE 0x3c | 5200 | #define PCICFG_INT_LINE 0x3c |
| 5163 | #define PCICFG_INT_PIN 0x3d | 5201 | #define PCICFG_INT_PIN 0x3d |
| 5164 | #define PCICFG_PM_CSR_OFFSET 0x4c | 5202 | #define PCICFG_PM_CAPABILITY 0x48 |
| 5165 | #define PCICFG_GRC_ADDRESS 0x78 | 5203 | #define PCICFG_PM_CAPABILITY_VERSION (0x3<<16) |
| 5166 | #define PCICFG_GRC_DATA 0x80 | 5204 | #define PCICFG_PM_CAPABILITY_CLOCK (1<<19) |
| 5205 | #define PCICFG_PM_CAPABILITY_RESERVED (1<<20) | ||
| 5206 | #define PCICFG_PM_CAPABILITY_DSI (1<<21) | ||
| 5207 | #define PCICFG_PM_CAPABILITY_AUX_CURRENT (0x7<<22) | ||
| 5208 | #define PCICFG_PM_CAPABILITY_D1_SUPPORT (1<<25) | ||
| 5209 | #define PCICFG_PM_CAPABILITY_D2_SUPPORT (1<<26) | ||
| 5210 | #define PCICFG_PM_CAPABILITY_PME_IN_D0 (1<<27) | ||
| 5211 | #define PCICFG_PM_CAPABILITY_PME_IN_D1 (1<<28) | ||
| 5212 | #define PCICFG_PM_CAPABILITY_PME_IN_D2 (1<<29) | ||
| 5213 | #define PCICFG_PM_CAPABILITY_PME_IN_D3_HOT (1<<30) | ||
| 5214 | #define PCICFG_PM_CAPABILITY_PME_IN_D3_COLD (1<<31) | ||
| 5215 | #define PCICFG_PM_CSR_OFFSET 0x4c | ||
| 5216 | #define PCICFG_PM_CSR_STATE (0x3<<0) | ||
| 5217 | #define PCICFG_PM_CSR_PME_ENABLE (1<<8) | ||
| 5218 | #define PCICFG_PM_CSR_PME_STATUS (1<<15) | ||
| 5219 | #define PCICFG_GRC_ADDRESS 0x78 | ||
| 5220 | #define PCICFG_GRC_DATA 0x80 | ||
| 5167 | #define PCICFG_DEVICE_CONTROL 0xb4 | 5221 | #define PCICFG_DEVICE_CONTROL 0xb4 |
| 5168 | #define PCICFG_LINK_CONTROL 0xbc | 5222 | #define PCICFG_LINK_CONTROL 0xbc |
| 5169 | 5223 | ||
| 5170 | #define PCICFG_COMMAND_IO_SPACE (1<<0) | ||
| 5171 | #define PCICFG_COMMAND_MEM_SPACE (1<<1) | ||
| 5172 | #define PCICFG_COMMAND_BUS_MASTER (1<<2) | ||
| 5173 | #define PCICFG_COMMAND_SPECIAL_CYCLES (1<<3) | ||
| 5174 | #define PCICFG_COMMAND_MWI_CYCLES (1<<4) | ||
| 5175 | #define PCICFG_COMMAND_VGA_SNOOP (1<<5) | ||
| 5176 | #define PCICFG_COMMAND_PERR_ENA (1<<6) | ||
| 5177 | #define PCICFG_COMMAND_STEPPING (1<<7) | ||
| 5178 | #define PCICFG_COMMAND_SERR_ENA (1<<8) | ||
| 5179 | #define PCICFG_COMMAND_FAST_B2B (1<<9) | ||
| 5180 | #define PCICFG_COMMAND_INT_DISABLE (1<<10) | ||
| 5181 | #define PCICFG_COMMAND_RESERVED (0x1f<<11) | ||
| 5182 | |||
| 5183 | #define PCICFG_PM_CSR_STATE (0x3<<0) | ||
| 5184 | #define PCICFG_PM_CSR_PME_STATUS (1<<15) | ||
| 5185 | 5224 | ||
| 5186 | #define BAR_USTRORM_INTMEM 0x400000 | 5225 | #define BAR_USTRORM_INTMEM 0x400000 |
| 5187 | #define BAR_CSTRORM_INTMEM 0x410000 | 5226 | #define BAR_CSTRORM_INTMEM 0x410000 |
| 5188 | #define BAR_XSTRORM_INTMEM 0x420000 | 5227 | #define BAR_XSTRORM_INTMEM 0x420000 |
| 5189 | #define BAR_TSTRORM_INTMEM 0x430000 | 5228 | #define BAR_TSTRORM_INTMEM 0x430000 |
| 5190 | 5229 | ||
| 5230 | /* for accessing the IGU in case of status block ACK */ | ||
| 5191 | #define BAR_IGU_INTMEM 0x440000 | 5231 | #define BAR_IGU_INTMEM 0x440000 |
| 5192 | 5232 | ||
| 5193 | #define BAR_DOORBELL_OFFSET 0x800000 | 5233 | #define BAR_DOORBELL_OFFSET 0x800000 |
| 5194 | 5234 | ||
| 5195 | #define BAR_ME_REGISTER 0x450000 | 5235 | #define BAR_ME_REGISTER 0x450000 |
| 5196 | 5236 | ||
| 5197 | 5237 | /* config_2 offset */ | |
| 5198 | #define GRC_CONFIG_2_SIZE_REG 0x408 /* config_2 offset */ | 5238 | #define GRC_CONFIG_2_SIZE_REG 0x408 |
| 5199 | #define PCI_CONFIG_2_BAR1_SIZE (0xfL<<0) | 5239 | #define PCI_CONFIG_2_BAR1_SIZE (0xfL<<0) |
| 5200 | #define PCI_CONFIG_2_BAR1_SIZE_DISABLED (0L<<0) | 5240 | #define PCI_CONFIG_2_BAR1_SIZE_DISABLED (0L<<0) |
| 5201 | #define PCI_CONFIG_2_BAR1_SIZE_64K (1L<<0) | 5241 | #define PCI_CONFIG_2_BAR1_SIZE_64K (1L<<0) |
| 5202 | #define PCI_CONFIG_2_BAR1_SIZE_128K (2L<<0) | 5242 | #define PCI_CONFIG_2_BAR1_SIZE_128K (2L<<0) |
| @@ -5213,11 +5253,11 @@ | |||
| 5213 | #define PCI_CONFIG_2_BAR1_SIZE_256M (13L<<0) | 5253 | #define PCI_CONFIG_2_BAR1_SIZE_256M (13L<<0) |
| 5214 | #define PCI_CONFIG_2_BAR1_SIZE_512M (14L<<0) | 5254 | #define PCI_CONFIG_2_BAR1_SIZE_512M (14L<<0) |
| 5215 | #define PCI_CONFIG_2_BAR1_SIZE_1G (15L<<0) | 5255 | #define PCI_CONFIG_2_BAR1_SIZE_1G (15L<<0) |
| 5216 | #define PCI_CONFIG_2_BAR1_64ENA (1L<<4) | 5256 | #define PCI_CONFIG_2_BAR1_64ENA (1L<<4) |
| 5217 | #define PCI_CONFIG_2_EXP_ROM_RETRY (1L<<5) | 5257 | #define PCI_CONFIG_2_EXP_ROM_RETRY (1L<<5) |
| 5218 | #define PCI_CONFIG_2_CFG_CYCLE_RETRY (1L<<6) | 5258 | #define PCI_CONFIG_2_CFG_CYCLE_RETRY (1L<<6) |
| 5219 | #define PCI_CONFIG_2_FIRST_CFG_DONE (1L<<7) | 5259 | #define PCI_CONFIG_2_FIRST_CFG_DONE (1L<<7) |
| 5220 | #define PCI_CONFIG_2_EXP_ROM_SIZE (0xffL<<8) | 5260 | #define PCI_CONFIG_2_EXP_ROM_SIZE (0xffL<<8) |
| 5221 | #define PCI_CONFIG_2_EXP_ROM_SIZE_DISABLED (0L<<8) | 5261 | #define PCI_CONFIG_2_EXP_ROM_SIZE_DISABLED (0L<<8) |
| 5222 | #define PCI_CONFIG_2_EXP_ROM_SIZE_2K (1L<<8) | 5262 | #define PCI_CONFIG_2_EXP_ROM_SIZE_2K (1L<<8) |
| 5223 | #define PCI_CONFIG_2_EXP_ROM_SIZE_4K (2L<<8) | 5263 | #define PCI_CONFIG_2_EXP_ROM_SIZE_4K (2L<<8) |
| @@ -5234,46 +5274,44 @@ | |||
| 5234 | #define PCI_CONFIG_2_EXP_ROM_SIZE_8M (13L<<8) | 5274 | #define PCI_CONFIG_2_EXP_ROM_SIZE_8M (13L<<8) |
| 5235 | #define PCI_CONFIG_2_EXP_ROM_SIZE_16M (14L<<8) | 5275 | #define PCI_CONFIG_2_EXP_ROM_SIZE_16M (14L<<8) |
| 5236 | #define PCI_CONFIG_2_EXP_ROM_SIZE_32M (15L<<8) | 5276 | #define PCI_CONFIG_2_EXP_ROM_SIZE_32M (15L<<8) |
| 5237 | #define PCI_CONFIG_2_BAR_PREFETCH (1L<<16) | 5277 | #define PCI_CONFIG_2_BAR_PREFETCH (1L<<16) |
| 5238 | #define PCI_CONFIG_2_RESERVED0 (0x7fffL<<17) | 5278 | #define PCI_CONFIG_2_RESERVED0 (0x7fffL<<17) |
| 5239 | 5279 | ||
| 5240 | /* config_3 offset */ | 5280 | /* config_3 offset */ |
| 5241 | #define GRC_CONFIG_3_SIZE_REG (0x40c) | 5281 | #define GRC_CONFIG_3_SIZE_REG 0x40c |
| 5242 | #define PCI_CONFIG_3_STICKY_BYTE (0xffL<<0) | 5282 | #define PCI_CONFIG_3_STICKY_BYTE (0xffL<<0) |
| 5243 | #define PCI_CONFIG_3_FORCE_PME (1L<<24) | 5283 | #define PCI_CONFIG_3_FORCE_PME (1L<<24) |
| 5244 | #define PCI_CONFIG_3_PME_STATUS (1L<<25) | 5284 | #define PCI_CONFIG_3_PME_STATUS (1L<<25) |
| 5245 | #define PCI_CONFIG_3_PME_ENABLE (1L<<26) | 5285 | #define PCI_CONFIG_3_PME_ENABLE (1L<<26) |
| 5246 | #define PCI_CONFIG_3_PM_STATE (0x3L<<27) | 5286 | #define PCI_CONFIG_3_PM_STATE (0x3L<<27) |
| 5247 | #define PCI_CONFIG_3_VAUX_PRESET (1L<<30) | 5287 | #define PCI_CONFIG_3_VAUX_PRESET (1L<<30) |
| 5248 | #define PCI_CONFIG_3_PCI_POWER (1L<<31) | 5288 | #define PCI_CONFIG_3_PCI_POWER (1L<<31) |
| 5249 | |||
| 5250 | /* config_2 offset */ | ||
| 5251 | #define GRC_CONFIG_2_SIZE_REG 0x408 | ||
| 5252 | 5289 | ||
| 5253 | #define GRC_BAR2_CONFIG 0x4e0 | 5290 | #define GRC_BAR2_CONFIG 0x4e0 |
| 5254 | #define PCI_CONFIG_2_BAR2_SIZE (0xfL<<0) | 5291 | #define PCI_CONFIG_2_BAR2_SIZE (0xfL<<0) |
| 5255 | #define PCI_CONFIG_2_BAR2_SIZE_DISABLED (0L<<0) | 5292 | #define PCI_CONFIG_2_BAR2_SIZE_DISABLED (0L<<0) |
| 5256 | #define PCI_CONFIG_2_BAR2_SIZE_64K (1L<<0) | 5293 | #define PCI_CONFIG_2_BAR2_SIZE_64K (1L<<0) |
| 5257 | #define PCI_CONFIG_2_BAR2_SIZE_128K (2L<<0) | 5294 | #define PCI_CONFIG_2_BAR2_SIZE_128K (2L<<0) |
| 5258 | #define PCI_CONFIG_2_BAR2_SIZE_256K (3L<<0) | 5295 | #define PCI_CONFIG_2_BAR2_SIZE_256K (3L<<0) |
| 5259 | #define PCI_CONFIG_2_BAR2_SIZE_512K (4L<<0) | 5296 | #define PCI_CONFIG_2_BAR2_SIZE_512K (4L<<0) |
| 5260 | #define PCI_CONFIG_2_BAR2_SIZE_1M (5L<<0) | 5297 | #define PCI_CONFIG_2_BAR2_SIZE_1M (5L<<0) |
| 5261 | #define PCI_CONFIG_2_BAR2_SIZE_2M (6L<<0) | 5298 | #define PCI_CONFIG_2_BAR2_SIZE_2M (6L<<0) |
| 5262 | #define PCI_CONFIG_2_BAR2_SIZE_4M (7L<<0) | 5299 | #define PCI_CONFIG_2_BAR2_SIZE_4M (7L<<0) |
| 5263 | #define PCI_CONFIG_2_BAR2_SIZE_8M (8L<<0) | 5300 | #define PCI_CONFIG_2_BAR2_SIZE_8M (8L<<0) |
| 5264 | #define PCI_CONFIG_2_BAR2_SIZE_16M (9L<<0) | 5301 | #define PCI_CONFIG_2_BAR2_SIZE_16M (9L<<0) |
| 5265 | #define PCI_CONFIG_2_BAR2_SIZE_32M (10L<<0) | 5302 | #define PCI_CONFIG_2_BAR2_SIZE_32M (10L<<0) |
| 5266 | #define PCI_CONFIG_2_BAR2_SIZE_64M (11L<<0) | 5303 | #define PCI_CONFIG_2_BAR2_SIZE_64M (11L<<0) |
| 5267 | #define PCI_CONFIG_2_BAR2_SIZE_128M (12L<<0) | 5304 | #define PCI_CONFIG_2_BAR2_SIZE_128M (12L<<0) |
| 5268 | #define PCI_CONFIG_2_BAR2_SIZE_256M (13L<<0) | 5305 | #define PCI_CONFIG_2_BAR2_SIZE_256M (13L<<0) |
| 5269 | #define PCI_CONFIG_2_BAR2_SIZE_512M (14L<<0) | 5306 | #define PCI_CONFIG_2_BAR2_SIZE_512M (14L<<0) |
| 5270 | #define PCI_CONFIG_2_BAR2_SIZE_1G (15L<<0) | 5307 | #define PCI_CONFIG_2_BAR2_SIZE_1G (15L<<0) |
| 5271 | #define PCI_CONFIG_2_BAR2_64ENA (1L<<4) | 5308 | #define PCI_CONFIG_2_BAR2_64ENA (1L<<4) |
| 5309 | |||
| 5310 | #define PCI_PM_DATA_A 0x410 | ||
| 5311 | #define PCI_PM_DATA_B 0x414 | ||
| 5312 | #define PCI_ID_VAL1 0x434 | ||
| 5313 | #define PCI_ID_VAL2 0x438 | ||
| 5272 | 5314 | ||
| 5273 | #define PCI_PM_DATA_A (0x410) | ||
| 5274 | #define PCI_PM_DATA_B (0x414) | ||
| 5275 | #define PCI_ID_VAL1 (0x434) | ||
| 5276 | #define PCI_ID_VAL2 (0x438) | ||
| 5277 | 5315 | ||
| 5278 | #define MDIO_REG_BANK_CL73_IEEEB0 0x0 | 5316 | #define MDIO_REG_BANK_CL73_IEEEB0 0x0 |
| 5279 | #define MDIO_CL73_IEEEB0_CL73_AN_CONTROL 0x0 | 5317 | #define MDIO_CL73_IEEEB0_CL73_AN_CONTROL 0x0 |
| @@ -5522,6 +5560,8 @@ Theotherbitsarereservedandshouldbezero*/ | |||
| 5522 | #define MDIO_PMA_REG_GEN_CTRL 0xca10 | 5560 | #define MDIO_PMA_REG_GEN_CTRL 0xca10 |
| 5523 | #define MDIO_PMA_REG_GEN_CTRL_ROM_RESET_INTERNAL_MP 0x0188 | 5561 | #define MDIO_PMA_REG_GEN_CTRL_ROM_RESET_INTERNAL_MP 0x0188 |
| 5524 | #define MDIO_PMA_REG_GEN_CTRL_ROM_MICRO_RESET 0x018a | 5562 | #define MDIO_PMA_REG_GEN_CTRL_ROM_MICRO_RESET 0x018a |
| 5563 | #define MDIO_PMA_REG_M8051_MSGIN_REG 0xca12 | ||
| 5564 | #define MDIO_PMA_REG_M8051_MSGOUT_REG 0xca13 | ||
| 5525 | #define MDIO_PMA_REG_ROM_VER1 0xca19 | 5565 | #define MDIO_PMA_REG_ROM_VER1 0xca19 |
| 5526 | #define MDIO_PMA_REG_ROM_VER2 0xca1a | 5566 | #define MDIO_PMA_REG_ROM_VER2 0xca1a |
| 5527 | #define MDIO_PMA_REG_EDC_FFE_MAIN 0xca1b | 5567 | #define MDIO_PMA_REG_EDC_FFE_MAIN 0xca1b |
| @@ -5576,7 +5616,8 @@ Theotherbitsarereservedandshouldbezero*/ | |||
| 5576 | #define MDIO_AN_REG_LINK_STATUS 0x8304 | 5616 | #define MDIO_AN_REG_LINK_STATUS 0x8304 |
| 5577 | #define MDIO_AN_REG_CL37_CL73 0x8370 | 5617 | #define MDIO_AN_REG_CL37_CL73 0x8370 |
| 5578 | #define MDIO_AN_REG_CL37_AN 0xffe0 | 5618 | #define MDIO_AN_REG_CL37_AN 0xffe0 |
| 5579 | #define MDIO_AN_REG_CL37_FD 0xffe4 | 5619 | #define MDIO_AN_REG_CL37_FC_LD 0xffe4 |
| 5620 | #define MDIO_AN_REG_CL37_FC_LP 0xffe5 | ||
| 5580 | 5621 | ||
| 5581 | 5622 | ||
| 5582 | #define IGU_FUNC_BASE 0x0400 | 5623 | #define IGU_FUNC_BASE 0x0400 |
| @@ -5600,4 +5641,13 @@ Theotherbitsarereservedandshouldbezero*/ | |||
| 5600 | #define IGU_INT_NOP 2 | 5641 | #define IGU_INT_NOP 2 |
| 5601 | #define IGU_INT_NOP2 3 | 5642 | #define IGU_INT_NOP2 3 |
| 5602 | 5643 | ||
| 5644 | #define COMMAND_REG_INT_ACK 0x0 | ||
| 5645 | #define COMMAND_REG_PROD_UPD 0x4 | ||
| 5646 | #define COMMAND_REG_ATTN_BITS_UPD 0x8 | ||
| 5647 | #define COMMAND_REG_ATTN_BITS_SET 0xc | ||
| 5648 | #define COMMAND_REG_ATTN_BITS_CLR 0x10 | ||
| 5649 | #define COMMAND_REG_COALESCE_NOW 0x14 | ||
| 5650 | #define COMMAND_REG_SIMD_MASK 0x18 | ||
| 5651 | #define COMMAND_REG_SIMD_NOMASK 0x1c | ||
| 5652 | |||
| 5603 | 5653 | ||
diff --git a/drivers/net/cpmac.c b/drivers/net/cpmac.c index a7800e559090..ec6b0af3d46b 100644 --- a/drivers/net/cpmac.c +++ b/drivers/net/cpmac.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | #include <linux/errno.h> | 26 | #include <linux/errno.h> |
| 27 | #include <linux/types.h> | 27 | #include <linux/types.h> |
| 28 | #include <linux/delay.h> | 28 | #include <linux/delay.h> |
| 29 | #include <linux/version.h> | ||
| 30 | 29 | ||
| 31 | #include <linux/netdevice.h> | 30 | #include <linux/netdevice.h> |
| 32 | #include <linux/etherdevice.h> | 31 | #include <linux/etherdevice.h> |
diff --git a/drivers/net/e100.c b/drivers/net/e100.c index 19d32a227be1..453115acaad2 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c | |||
| @@ -1838,7 +1838,7 @@ static int e100_rx_indicate(struct nic *nic, struct rx *rx, | |||
| 1838 | if ((le16_to_cpu(rfd->command) & cb_el) && | 1838 | if ((le16_to_cpu(rfd->command) & cb_el) && |
| 1839 | (RU_RUNNING == nic->ru_running)) | 1839 | (RU_RUNNING == nic->ru_running)) |
| 1840 | 1840 | ||
| 1841 | if (readb(&nic->csr->scb.status) & rus_no_res) | 1841 | if (ioread8(&nic->csr->scb.status) & rus_no_res) |
| 1842 | nic->ru_running = RU_SUSPENDED; | 1842 | nic->ru_running = RU_SUSPENDED; |
| 1843 | return -ENODATA; | 1843 | return -ENODATA; |
| 1844 | } | 1844 | } |
| @@ -1861,7 +1861,7 @@ static int e100_rx_indicate(struct nic *nic, struct rx *rx, | |||
| 1861 | if ((le16_to_cpu(rfd->command) & cb_el) && | 1861 | if ((le16_to_cpu(rfd->command) & cb_el) && |
| 1862 | (RU_RUNNING == nic->ru_running)) { | 1862 | (RU_RUNNING == nic->ru_running)) { |
| 1863 | 1863 | ||
| 1864 | if (readb(&nic->csr->scb.status) & rus_no_res) | 1864 | if (ioread8(&nic->csr->scb.status) & rus_no_res) |
| 1865 | nic->ru_running = RU_SUSPENDED; | 1865 | nic->ru_running = RU_SUSPENDED; |
| 1866 | } | 1866 | } |
| 1867 | 1867 | ||
diff --git a/drivers/net/e1000/e1000_param.c b/drivers/net/e1000/e1000_param.c index b9f90a5d3d4d..213437d13154 100644 --- a/drivers/net/e1000/e1000_param.c +++ b/drivers/net/e1000/e1000_param.c | |||
| @@ -208,7 +208,7 @@ struct e1000_option { | |||
| 208 | } r; | 208 | } r; |
| 209 | struct { /* list_option info */ | 209 | struct { /* list_option info */ |
| 210 | int nr; | 210 | int nr; |
| 211 | struct e1000_opt_list { int i; char *str; } *p; | 211 | const struct e1000_opt_list { int i; char *str; } *p; |
| 212 | } l; | 212 | } l; |
| 213 | } arg; | 213 | } arg; |
| 214 | }; | 214 | }; |
| @@ -242,7 +242,7 @@ static int __devinit e1000_validate_option(unsigned int *value, | |||
| 242 | break; | 242 | break; |
| 243 | case list_option: { | 243 | case list_option: { |
| 244 | int i; | 244 | int i; |
| 245 | struct e1000_opt_list *ent; | 245 | const struct e1000_opt_list *ent; |
| 246 | 246 | ||
| 247 | for (i = 0; i < opt->arg.l.nr; i++) { | 247 | for (i = 0; i < opt->arg.l.nr; i++) { |
| 248 | ent = &opt->arg.l.p[i]; | 248 | ent = &opt->arg.l.p[i]; |
| @@ -279,7 +279,9 @@ static void e1000_check_copper_options(struct e1000_adapter *adapter); | |||
| 279 | 279 | ||
| 280 | void __devinit e1000_check_options(struct e1000_adapter *adapter) | 280 | void __devinit e1000_check_options(struct e1000_adapter *adapter) |
| 281 | { | 281 | { |
| 282 | struct e1000_option opt; | ||
| 282 | int bd = adapter->bd_number; | 283 | int bd = adapter->bd_number; |
| 284 | |||
| 283 | if (bd >= E1000_MAX_NIC) { | 285 | if (bd >= E1000_MAX_NIC) { |
| 284 | DPRINTK(PROBE, NOTICE, | 286 | DPRINTK(PROBE, NOTICE, |
| 285 | "Warning: no configuration for board #%i\n", bd); | 287 | "Warning: no configuration for board #%i\n", bd); |
| @@ -287,19 +289,21 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter) | |||
| 287 | } | 289 | } |
| 288 | 290 | ||
| 289 | { /* Transmit Descriptor Count */ | 291 | { /* Transmit Descriptor Count */ |
| 290 | struct e1000_option opt = { | 292 | struct e1000_tx_ring *tx_ring = adapter->tx_ring; |
| 293 | int i; | ||
| 294 | e1000_mac_type mac_type = adapter->hw.mac_type; | ||
| 295 | |||
| 296 | opt = (struct e1000_option) { | ||
| 291 | .type = range_option, | 297 | .type = range_option, |
| 292 | .name = "Transmit Descriptors", | 298 | .name = "Transmit Descriptors", |
| 293 | .err = "using default of " | 299 | .err = "using default of " |
| 294 | __MODULE_STRING(E1000_DEFAULT_TXD), | 300 | __MODULE_STRING(E1000_DEFAULT_TXD), |
| 295 | .def = E1000_DEFAULT_TXD, | 301 | .def = E1000_DEFAULT_TXD, |
| 296 | .arg = { .r = { .min = E1000_MIN_TXD }} | 302 | .arg = { .r = { |
| 303 | .min = E1000_MIN_TXD, | ||
| 304 | .max = mac_type < e1000_82544 ? E1000_MAX_TXD : E1000_MAX_82544_TXD | ||
| 305 | }} | ||
| 297 | }; | 306 | }; |
| 298 | struct e1000_tx_ring *tx_ring = adapter->tx_ring; | ||
| 299 | int i; | ||
| 300 | e1000_mac_type mac_type = adapter->hw.mac_type; | ||
| 301 | opt.arg.r.max = mac_type < e1000_82544 ? | ||
| 302 | E1000_MAX_TXD : E1000_MAX_82544_TXD; | ||
| 303 | 307 | ||
| 304 | if (num_TxDescriptors > bd) { | 308 | if (num_TxDescriptors > bd) { |
| 305 | tx_ring->count = TxDescriptors[bd]; | 309 | tx_ring->count = TxDescriptors[bd]; |
| @@ -313,19 +317,21 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter) | |||
| 313 | tx_ring[i].count = tx_ring->count; | 317 | tx_ring[i].count = tx_ring->count; |
| 314 | } | 318 | } |
| 315 | { /* Receive Descriptor Count */ | 319 | { /* Receive Descriptor Count */ |
| 316 | struct e1000_option opt = { | 320 | struct e1000_rx_ring *rx_ring = adapter->rx_ring; |
| 321 | int i; | ||
| 322 | e1000_mac_type mac_type = adapter->hw.mac_type; | ||
| 323 | |||
| 324 | opt = (struct e1000_option) { | ||
| 317 | .type = range_option, | 325 | .type = range_option, |
| 318 | .name = "Receive Descriptors", | 326 | .name = "Receive Descriptors", |
| 319 | .err = "using default of " | 327 | .err = "using default of " |
| 320 | __MODULE_STRING(E1000_DEFAULT_RXD), | 328 | __MODULE_STRING(E1000_DEFAULT_RXD), |
| 321 | .def = E1000_DEFAULT_RXD, | 329 | .def = E1000_DEFAULT_RXD, |
| 322 | .arg = { .r = { .min = E1000_MIN_RXD }} | 330 | .arg = { .r = { |
| 331 | .min = E1000_MIN_RXD, | ||
| 332 | .max = mac_type < e1000_82544 ? E1000_MAX_RXD : E1000_MAX_82544_RXD | ||
| 333 | }} | ||
| 323 | }; | 334 | }; |
| 324 | struct e1000_rx_ring *rx_ring = adapter->rx_ring; | ||
| 325 | int i; | ||
| 326 | e1000_mac_type mac_type = adapter->hw.mac_type; | ||
| 327 | opt.arg.r.max = mac_type < e1000_82544 ? E1000_MAX_RXD : | ||
| 328 | E1000_MAX_82544_RXD; | ||
| 329 | 335 | ||
| 330 | if (num_RxDescriptors > bd) { | 336 | if (num_RxDescriptors > bd) { |
| 331 | rx_ring->count = RxDescriptors[bd]; | 337 | rx_ring->count = RxDescriptors[bd]; |
| @@ -339,7 +345,7 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter) | |||
| 339 | rx_ring[i].count = rx_ring->count; | 345 | rx_ring[i].count = rx_ring->count; |
| 340 | } | 346 | } |
| 341 | { /* Checksum Offload Enable/Disable */ | 347 | { /* Checksum Offload Enable/Disable */ |
| 342 | struct e1000_option opt = { | 348 | opt = (struct e1000_option) { |
| 343 | .type = enable_option, | 349 | .type = enable_option, |
| 344 | .name = "Checksum Offload", | 350 | .name = "Checksum Offload", |
| 345 | .err = "defaulting to Enabled", | 351 | .err = "defaulting to Enabled", |
| @@ -363,7 +369,7 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter) | |||
| 363 | { E1000_FC_FULL, "Flow Control Enabled" }, | 369 | { E1000_FC_FULL, "Flow Control Enabled" }, |
| 364 | { E1000_FC_DEFAULT, "Flow Control Hardware Default" }}; | 370 | { E1000_FC_DEFAULT, "Flow Control Hardware Default" }}; |
| 365 | 371 | ||
| 366 | struct e1000_option opt = { | 372 | opt = (struct e1000_option) { |
| 367 | .type = list_option, | 373 | .type = list_option, |
| 368 | .name = "Flow Control", | 374 | .name = "Flow Control", |
| 369 | .err = "reading default settings from EEPROM", | 375 | .err = "reading default settings from EEPROM", |
| @@ -381,7 +387,7 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter) | |||
| 381 | } | 387 | } |
| 382 | } | 388 | } |
| 383 | { /* Transmit Interrupt Delay */ | 389 | { /* Transmit Interrupt Delay */ |
| 384 | struct e1000_option opt = { | 390 | opt = (struct e1000_option) { |
| 385 | .type = range_option, | 391 | .type = range_option, |
| 386 | .name = "Transmit Interrupt Delay", | 392 | .name = "Transmit Interrupt Delay", |
| 387 | .err = "using default of " __MODULE_STRING(DEFAULT_TIDV), | 393 | .err = "using default of " __MODULE_STRING(DEFAULT_TIDV), |
| @@ -399,7 +405,7 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter) | |||
| 399 | } | 405 | } |
| 400 | } | 406 | } |
| 401 | { /* Transmit Absolute Interrupt Delay */ | 407 | { /* Transmit Absolute Interrupt Delay */ |
| 402 | struct e1000_option opt = { | 408 | opt = (struct e1000_option) { |
| 403 | .type = range_option, | 409 | .type = range_option, |
| 404 | .name = "Transmit Absolute Interrupt Delay", | 410 | .name = "Transmit Absolute Interrupt Delay", |
| 405 | .err = "using default of " __MODULE_STRING(DEFAULT_TADV), | 411 | .err = "using default of " __MODULE_STRING(DEFAULT_TADV), |
| @@ -417,7 +423,7 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter) | |||
| 417 | } | 423 | } |
| 418 | } | 424 | } |
| 419 | { /* Receive Interrupt Delay */ | 425 | { /* Receive Interrupt Delay */ |
| 420 | struct e1000_option opt = { | 426 | opt = (struct e1000_option) { |
| 421 | .type = range_option, | 427 | .type = range_option, |
| 422 | .name = "Receive Interrupt Delay", | 428 | .name = "Receive Interrupt Delay", |
| 423 | .err = "using default of " __MODULE_STRING(DEFAULT_RDTR), | 429 | .err = "using default of " __MODULE_STRING(DEFAULT_RDTR), |
| @@ -435,7 +441,7 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter) | |||
| 435 | } | 441 | } |
| 436 | } | 442 | } |
| 437 | { /* Receive Absolute Interrupt Delay */ | 443 | { /* Receive Absolute Interrupt Delay */ |
| 438 | struct e1000_option opt = { | 444 | opt = (struct e1000_option) { |
| 439 | .type = range_option, | 445 | .type = range_option, |
| 440 | .name = "Receive Absolute Interrupt Delay", | 446 | .name = "Receive Absolute Interrupt Delay", |
| 441 | .err = "using default of " __MODULE_STRING(DEFAULT_RADV), | 447 | .err = "using default of " __MODULE_STRING(DEFAULT_RADV), |
| @@ -453,7 +459,7 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter) | |||
| 453 | } | 459 | } |
| 454 | } | 460 | } |
| 455 | { /* Interrupt Throttling Rate */ | 461 | { /* Interrupt Throttling Rate */ |
| 456 | struct e1000_option opt = { | 462 | opt = (struct e1000_option) { |
| 457 | .type = range_option, | 463 | .type = range_option, |
| 458 | .name = "Interrupt Throttling Rate (ints/sec)", | 464 | .name = "Interrupt Throttling Rate (ints/sec)", |
| 459 | .err = "using default of " __MODULE_STRING(DEFAULT_ITR), | 465 | .err = "using default of " __MODULE_STRING(DEFAULT_ITR), |
| @@ -497,7 +503,7 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter) | |||
| 497 | } | 503 | } |
| 498 | } | 504 | } |
| 499 | { /* Smart Power Down */ | 505 | { /* Smart Power Down */ |
| 500 | struct e1000_option opt = { | 506 | opt = (struct e1000_option) { |
| 501 | .type = enable_option, | 507 | .type = enable_option, |
| 502 | .name = "PHY Smart Power Down", | 508 | .name = "PHY Smart Power Down", |
| 503 | .err = "defaulting to Disabled", | 509 | .err = "defaulting to Disabled", |
| @@ -513,7 +519,7 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter) | |||
| 513 | } | 519 | } |
| 514 | } | 520 | } |
| 515 | { /* Kumeran Lock Loss Workaround */ | 521 | { /* Kumeran Lock Loss Workaround */ |
| 516 | struct e1000_option opt = { | 522 | opt = (struct e1000_option) { |
| 517 | .type = enable_option, | 523 | .type = enable_option, |
| 518 | .name = "Kumeran Lock Loss Workaround", | 524 | .name = "Kumeran Lock Loss Workaround", |
| 519 | .err = "defaulting to Enabled", | 525 | .err = "defaulting to Enabled", |
| @@ -578,16 +584,18 @@ static void __devinit e1000_check_fiber_options(struct e1000_adapter *adapter) | |||
| 578 | 584 | ||
| 579 | static void __devinit e1000_check_copper_options(struct e1000_adapter *adapter) | 585 | static void __devinit e1000_check_copper_options(struct e1000_adapter *adapter) |
| 580 | { | 586 | { |
| 587 | struct e1000_option opt; | ||
| 581 | unsigned int speed, dplx, an; | 588 | unsigned int speed, dplx, an; |
| 582 | int bd = adapter->bd_number; | 589 | int bd = adapter->bd_number; |
| 583 | 590 | ||
| 584 | { /* Speed */ | 591 | { /* Speed */ |
| 585 | struct e1000_opt_list speed_list[] = {{ 0, "" }, | 592 | static const struct e1000_opt_list speed_list[] = { |
| 586 | { SPEED_10, "" }, | 593 | { 0, "" }, |
| 587 | { SPEED_100, "" }, | 594 | { SPEED_10, "" }, |
| 588 | { SPEED_1000, "" }}; | 595 | { SPEED_100, "" }, |
| 596 | { SPEED_1000, "" }}; | ||
| 589 | 597 | ||
| 590 | struct e1000_option opt = { | 598 | opt = (struct e1000_option) { |
| 591 | .type = list_option, | 599 | .type = list_option, |
| 592 | .name = "Speed", | 600 | .name = "Speed", |
| 593 | .err = "parameter ignored", | 601 | .err = "parameter ignored", |
| @@ -604,11 +612,12 @@ static void __devinit e1000_check_copper_options(struct e1000_adapter *adapter) | |||
| 604 | } | 612 | } |
| 605 | } | 613 | } |
| 606 | { /* Duplex */ | 614 | { /* Duplex */ |
| 607 | struct e1000_opt_list dplx_list[] = {{ 0, "" }, | 615 | static const struct e1000_opt_list dplx_list[] = { |
| 608 | { HALF_DUPLEX, "" }, | 616 | { 0, "" }, |
| 609 | { FULL_DUPLEX, "" }}; | 617 | { HALF_DUPLEX, "" }, |
| 618 | { FULL_DUPLEX, "" }}; | ||
| 610 | 619 | ||
| 611 | struct e1000_option opt = { | 620 | opt = (struct e1000_option) { |
| 612 | .type = list_option, | 621 | .type = list_option, |
| 613 | .name = "Duplex", | 622 | .name = "Duplex", |
| 614 | .err = "parameter ignored", | 623 | .err = "parameter ignored", |
| @@ -637,7 +646,7 @@ static void __devinit e1000_check_copper_options(struct e1000_adapter *adapter) | |||
| 637 | "parameter ignored\n"); | 646 | "parameter ignored\n"); |
| 638 | adapter->hw.autoneg_advertised = AUTONEG_ADV_DEFAULT; | 647 | adapter->hw.autoneg_advertised = AUTONEG_ADV_DEFAULT; |
| 639 | } else { /* Autoneg */ | 648 | } else { /* Autoneg */ |
| 640 | struct e1000_opt_list an_list[] = | 649 | static const struct e1000_opt_list an_list[] = |
| 641 | #define AA "AutoNeg advertising " | 650 | #define AA "AutoNeg advertising " |
| 642 | {{ 0x01, AA "10/HD" }, | 651 | {{ 0x01, AA "10/HD" }, |
| 643 | { 0x02, AA "10/FD" }, | 652 | { 0x02, AA "10/FD" }, |
| @@ -671,7 +680,7 @@ static void __devinit e1000_check_copper_options(struct e1000_adapter *adapter) | |||
| 671 | { 0x2e, AA "1000/FD, 100/FD, 100/HD, 10/FD" }, | 680 | { 0x2e, AA "1000/FD, 100/FD, 100/HD, 10/FD" }, |
| 672 | { 0x2f, AA "1000/FD, 100/FD, 100/HD, 10/FD, 10/HD" }}; | 681 | { 0x2f, AA "1000/FD, 100/FD, 100/HD, 10/FD, 10/HD" }}; |
| 673 | 682 | ||
| 674 | struct e1000_option opt = { | 683 | opt = (struct e1000_option) { |
| 675 | .type = list_option, | 684 | .type = list_option, |
| 676 | .name = "AutoNeg", | 685 | .name = "AutoNeg", |
| 677 | .err = "parameter ignored", | 686 | .err = "parameter ignored", |
diff --git a/drivers/net/e1000e/defines.h b/drivers/net/e1000e/defines.h index f823b8ba5785..14b0e6cd3b8d 100644 --- a/drivers/net/e1000e/defines.h +++ b/drivers/net/e1000e/defines.h | |||
| @@ -389,7 +389,7 @@ | |||
| 389 | 389 | ||
| 390 | /* Interrupt Cause Set */ | 390 | /* Interrupt Cause Set */ |
| 391 | #define E1000_ICS_LSC E1000_ICR_LSC /* Link Status Change */ | 391 | #define E1000_ICS_LSC E1000_ICR_LSC /* Link Status Change */ |
| 392 | #define E1000_ICS_RXDMT0 E1000_ICR_RXDMT0 /* rx desc min. threshold */ | 392 | #define E1000_ICS_RXSEQ E1000_ICR_RXSEQ /* Rx sequence error */ |
| 393 | #define E1000_ICS_RXDMT0 E1000_ICR_RXDMT0 /* Rx desc min. threshold */ | 393 | #define E1000_ICS_RXDMT0 E1000_ICR_RXDMT0 /* Rx desc min. threshold */ |
| 394 | 394 | ||
| 395 | /* Transmit Descriptor Control */ | 395 | /* Transmit Descriptor Control */ |
diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h index cf57050d99d8..ac4e506b4f88 100644 --- a/drivers/net/e1000e/e1000.h +++ b/drivers/net/e1000e/e1000.h | |||
| @@ -326,6 +326,7 @@ struct e1000_info { | |||
| 326 | #define FLAG_RX_CSUM_ENABLED (1 << 28) | 326 | #define FLAG_RX_CSUM_ENABLED (1 << 28) |
| 327 | #define FLAG_TSO_FORCE (1 << 29) | 327 | #define FLAG_TSO_FORCE (1 << 29) |
| 328 | #define FLAG_RX_RESTART_NOW (1 << 30) | 328 | #define FLAG_RX_RESTART_NOW (1 << 30) |
| 329 | #define FLAG_MSI_TEST_FAILED (1 << 31) | ||
| 329 | 330 | ||
| 330 | #define E1000_RX_DESC_PS(R, i) \ | 331 | #define E1000_RX_DESC_PS(R, i) \ |
| 331 | (&(((union e1000_rx_desc_packet_split *)((R).desc))[i])) | 332 | (&(((union e1000_rx_desc_packet_split *)((R).desc))[i])) |
diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/e1000e/ethtool.c index cf9679f2b7c4..e21c9e0f3738 100644 --- a/drivers/net/e1000e/ethtool.c +++ b/drivers/net/e1000e/ethtool.c | |||
| @@ -177,7 +177,7 @@ static u32 e1000_get_link(struct net_device *netdev) | |||
| 177 | u32 status; | 177 | u32 status; |
| 178 | 178 | ||
| 179 | status = er32(STATUS); | 179 | status = er32(STATUS); |
| 180 | return (status & E1000_STATUS_LU); | 180 | return (status & E1000_STATUS_LU) ? 1 : 0; |
| 181 | } | 181 | } |
| 182 | 182 | ||
| 183 | static int e1000_set_spd_dplx(struct e1000_adapter *adapter, u16 spddplx) | 183 | static int e1000_set_spd_dplx(struct e1000_adapter *adapter, u16 spddplx) |
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index 05b0b2f9c54b..d266510c8a94 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c | |||
| @@ -510,9 +510,12 @@ static bool e1000_clean_rx_irq(struct e1000_adapter *adapter, | |||
| 510 | netdev_alloc_skb(netdev, length + NET_IP_ALIGN); | 510 | netdev_alloc_skb(netdev, length + NET_IP_ALIGN); |
| 511 | if (new_skb) { | 511 | if (new_skb) { |
| 512 | skb_reserve(new_skb, NET_IP_ALIGN); | 512 | skb_reserve(new_skb, NET_IP_ALIGN); |
| 513 | memcpy(new_skb->data - NET_IP_ALIGN, | 513 | skb_copy_to_linear_data_offset(new_skb, |
| 514 | skb->data - NET_IP_ALIGN, | 514 | -NET_IP_ALIGN, |
| 515 | length + NET_IP_ALIGN); | 515 | (skb->data - |
| 516 | NET_IP_ALIGN), | ||
| 517 | (length + | ||
| 518 | NET_IP_ALIGN)); | ||
| 516 | /* save the skb in buffer_info as good */ | 519 | /* save the skb in buffer_info as good */ |
| 517 | buffer_info->skb = skb; | 520 | buffer_info->skb = skb; |
| 518 | skb = new_skb; | 521 | skb = new_skb; |
| @@ -1233,26 +1236,36 @@ static irqreturn_t e1000_intr(int irq, void *data) | |||
| 1233 | return IRQ_HANDLED; | 1236 | return IRQ_HANDLED; |
| 1234 | } | 1237 | } |
| 1235 | 1238 | ||
| 1239 | /** | ||
| 1240 | * e1000_request_irq - initialize interrupts | ||
| 1241 | * | ||
| 1242 | * Attempts to configure interrupts using the best available | ||
| 1243 | * capabilities of the hardware and kernel. | ||
| 1244 | **/ | ||
| 1236 | static int e1000_request_irq(struct e1000_adapter *adapter) | 1245 | static int e1000_request_irq(struct e1000_adapter *adapter) |
| 1237 | { | 1246 | { |
| 1238 | struct net_device *netdev = adapter->netdev; | 1247 | struct net_device *netdev = adapter->netdev; |
| 1239 | irq_handler_t handler = e1000_intr; | ||
| 1240 | int irq_flags = IRQF_SHARED; | 1248 | int irq_flags = IRQF_SHARED; |
| 1241 | int err; | 1249 | int err; |
| 1242 | 1250 | ||
| 1243 | if (!pci_enable_msi(adapter->pdev)) { | 1251 | if (!(adapter->flags & FLAG_MSI_TEST_FAILED)) { |
| 1244 | adapter->flags |= FLAG_MSI_ENABLED; | 1252 | err = pci_enable_msi(adapter->pdev); |
| 1245 | handler = e1000_intr_msi; | 1253 | if (!err) { |
| 1246 | irq_flags = 0; | 1254 | adapter->flags |= FLAG_MSI_ENABLED; |
| 1255 | irq_flags = 0; | ||
| 1256 | } | ||
| 1247 | } | 1257 | } |
| 1248 | 1258 | ||
| 1249 | err = request_irq(adapter->pdev->irq, handler, irq_flags, netdev->name, | 1259 | err = request_irq(adapter->pdev->irq, |
| 1250 | netdev); | 1260 | ((adapter->flags & FLAG_MSI_ENABLED) ? |
| 1261 | &e1000_intr_msi : &e1000_intr), | ||
| 1262 | irq_flags, netdev->name, netdev); | ||
| 1251 | if (err) { | 1263 | if (err) { |
| 1252 | e_err("Unable to allocate %s interrupt (return: %d)\n", | 1264 | if (adapter->flags & FLAG_MSI_ENABLED) { |
| 1253 | adapter->flags & FLAG_MSI_ENABLED ? "MSI":"INTx", err); | ||
| 1254 | if (adapter->flags & FLAG_MSI_ENABLED) | ||
| 1255 | pci_disable_msi(adapter->pdev); | 1265 | pci_disable_msi(adapter->pdev); |
| 1266 | adapter->flags &= ~FLAG_MSI_ENABLED; | ||
| 1267 | } | ||
| 1268 | e_err("Unable to allocate interrupt, Error: %d\n", err); | ||
| 1256 | } | 1269 | } |
| 1257 | 1270 | ||
| 1258 | return err; | 1271 | return err; |
| @@ -2592,6 +2605,135 @@ err: | |||
| 2592 | } | 2605 | } |
| 2593 | 2606 | ||
| 2594 | /** | 2607 | /** |
| 2608 | * e1000_intr_msi_test - Interrupt Handler | ||
| 2609 | * @irq: interrupt number | ||
| 2610 | * @data: pointer to a network interface device structure | ||
| 2611 | **/ | ||
| 2612 | static irqreturn_t e1000_intr_msi_test(int irq, void *data) | ||
| 2613 | { | ||
| 2614 | struct net_device *netdev = data; | ||
| 2615 | struct e1000_adapter *adapter = netdev_priv(netdev); | ||
| 2616 | struct e1000_hw *hw = &adapter->hw; | ||
| 2617 | u32 icr = er32(ICR); | ||
| 2618 | |||
| 2619 | e_dbg("%s: icr is %08X\n", netdev->name, icr); | ||
| 2620 | if (icr & E1000_ICR_RXSEQ) { | ||
| 2621 | adapter->flags &= ~FLAG_MSI_TEST_FAILED; | ||
| 2622 | wmb(); | ||
| 2623 | } | ||
| 2624 | |||
| 2625 | return IRQ_HANDLED; | ||
| 2626 | } | ||
| 2627 | |||
| 2628 | /** | ||
| 2629 | * e1000_test_msi_interrupt - Returns 0 for successful test | ||
| 2630 | * @adapter: board private struct | ||
| 2631 | * | ||
| 2632 | * code flow taken from tg3.c | ||
| 2633 | **/ | ||
| 2634 | static int e1000_test_msi_interrupt(struct e1000_adapter *adapter) | ||
| 2635 | { | ||
| 2636 | struct net_device *netdev = adapter->netdev; | ||
| 2637 | struct e1000_hw *hw = &adapter->hw; | ||
| 2638 | int err; | ||
| 2639 | |||
| 2640 | /* poll_enable hasn't been called yet, so don't need disable */ | ||
| 2641 | /* clear any pending events */ | ||
| 2642 | er32(ICR); | ||
| 2643 | |||
| 2644 | /* free the real vector and request a test handler */ | ||
| 2645 | e1000_free_irq(adapter); | ||
| 2646 | |||
| 2647 | /* Assume that the test fails, if it succeeds then the test | ||
| 2648 | * MSI irq handler will unset this flag */ | ||
| 2649 | adapter->flags |= FLAG_MSI_TEST_FAILED; | ||
| 2650 | |||
| 2651 | err = pci_enable_msi(adapter->pdev); | ||
| 2652 | if (err) | ||
| 2653 | goto msi_test_failed; | ||
| 2654 | |||
| 2655 | err = request_irq(adapter->pdev->irq, &e1000_intr_msi_test, 0, | ||
| 2656 | netdev->name, netdev); | ||
| 2657 | if (err) { | ||
| 2658 | pci_disable_msi(adapter->pdev); | ||
| 2659 | goto msi_test_failed; | ||
| 2660 | } | ||
| 2661 | |||
| 2662 | wmb(); | ||
| 2663 | |||
| 2664 | e1000_irq_enable(adapter); | ||
| 2665 | |||
| 2666 | /* fire an unusual interrupt on the test handler */ | ||
| 2667 | ew32(ICS, E1000_ICS_RXSEQ); | ||
| 2668 | e1e_flush(); | ||
| 2669 | msleep(50); | ||
| 2670 | |||
| 2671 | e1000_irq_disable(adapter); | ||
| 2672 | |||
| 2673 | rmb(); | ||
| 2674 | |||
| 2675 | if (adapter->flags & FLAG_MSI_TEST_FAILED) { | ||
| 2676 | err = -EIO; | ||
| 2677 | e_info("MSI interrupt test failed!\n"); | ||
| 2678 | } | ||
| 2679 | |||
| 2680 | free_irq(adapter->pdev->irq, netdev); | ||
| 2681 | pci_disable_msi(adapter->pdev); | ||
| 2682 | |||
| 2683 | if (err == -EIO) | ||
| 2684 | goto msi_test_failed; | ||
| 2685 | |||
| 2686 | /* okay so the test worked, restore settings */ | ||
| 2687 | e_dbg("%s: MSI interrupt test succeeded!\n", netdev->name); | ||
| 2688 | msi_test_failed: | ||
| 2689 | /* restore the original vector, even if it failed */ | ||
| 2690 | e1000_request_irq(adapter); | ||
| 2691 | return err; | ||
| 2692 | } | ||
| 2693 | |||
| 2694 | /** | ||
| 2695 | * e1000_test_msi - Returns 0 if MSI test succeeds or INTx mode is restored | ||
| 2696 | * @adapter: board private struct | ||
| 2697 | * | ||
| 2698 | * code flow taken from tg3.c, called with e1000 interrupts disabled. | ||
| 2699 | **/ | ||
| 2700 | static int e1000_test_msi(struct e1000_adapter *adapter) | ||
| 2701 | { | ||
| 2702 | int err; | ||
| 2703 | u16 pci_cmd; | ||
| 2704 | |||
| 2705 | if (!(adapter->flags & FLAG_MSI_ENABLED)) | ||
| 2706 | return 0; | ||
| 2707 | |||
| 2708 | /* disable SERR in case the MSI write causes a master abort */ | ||
| 2709 | pci_read_config_word(adapter->pdev, PCI_COMMAND, &pci_cmd); | ||
| 2710 | pci_write_config_word(adapter->pdev, PCI_COMMAND, | ||
| 2711 | pci_cmd & ~PCI_COMMAND_SERR); | ||
| 2712 | |||
| 2713 | err = e1000_test_msi_interrupt(adapter); | ||
| 2714 | |||
| 2715 | /* restore previous setting of command word */ | ||
| 2716 | pci_write_config_word(adapter->pdev, PCI_COMMAND, pci_cmd); | ||
| 2717 | |||
| 2718 | /* success ! */ | ||
| 2719 | if (!err) | ||
| 2720 | return 0; | ||
| 2721 | |||
| 2722 | /* EIO means MSI test failed */ | ||
| 2723 | if (err != -EIO) | ||
| 2724 | return err; | ||
| 2725 | |||
| 2726 | /* back to INTx mode */ | ||
| 2727 | e_warn("MSI interrupt test failed, using legacy interrupt.\n"); | ||
| 2728 | |||
| 2729 | e1000_free_irq(adapter); | ||
| 2730 | |||
| 2731 | err = e1000_request_irq(adapter); | ||
| 2732 | |||
| 2733 | return err; | ||
| 2734 | } | ||
| 2735 | |||
| 2736 | /** | ||
| 2595 | * e1000_open - Called when a network interface is made active | 2737 | * e1000_open - Called when a network interface is made active |
| 2596 | * @netdev: network interface device structure | 2738 | * @netdev: network interface device structure |
| 2597 | * | 2739 | * |
| @@ -2649,6 +2791,19 @@ static int e1000_open(struct net_device *netdev) | |||
| 2649 | if (err) | 2791 | if (err) |
| 2650 | goto err_req_irq; | 2792 | goto err_req_irq; |
| 2651 | 2793 | ||
| 2794 | /* | ||
| 2795 | * Work around PCIe errata with MSI interrupts causing some chipsets to | ||
| 2796 | * ignore e1000e MSI messages, which means we need to test our MSI | ||
| 2797 | * interrupt now | ||
| 2798 | */ | ||
| 2799 | { | ||
| 2800 | err = e1000_test_msi(adapter); | ||
| 2801 | if (err) { | ||
| 2802 | e_err("Interrupt allocation failed\n"); | ||
| 2803 | goto err_req_irq; | ||
| 2804 | } | ||
| 2805 | } | ||
| 2806 | |||
| 2652 | /* From here on the code is the same as e1000e_up() */ | 2807 | /* From here on the code is the same as e1000e_up() */ |
| 2653 | clear_bit(__E1000_DOWN, &adapter->state); | 2808 | clear_bit(__E1000_DOWN, &adapter->state); |
| 2654 | 2809 | ||
| @@ -3055,7 +3210,7 @@ static void e1000_watchdog_task(struct work_struct *work) | |||
| 3055 | case SPEED_10: | 3210 | case SPEED_10: |
| 3056 | txb2b = 0; | 3211 | txb2b = 0; |
| 3057 | netdev->tx_queue_len = 10; | 3212 | netdev->tx_queue_len = 10; |
| 3058 | adapter->tx_timeout_factor = 14; | 3213 | adapter->tx_timeout_factor = 16; |
| 3059 | break; | 3214 | break; |
| 3060 | case SPEED_100: | 3215 | case SPEED_100: |
| 3061 | txb2b = 0; | 3216 | txb2b = 0; |
| @@ -3721,7 +3876,7 @@ static int e1000_change_mtu(struct net_device *netdev, int new_mtu) | |||
| 3721 | struct e1000_adapter *adapter = netdev_priv(netdev); | 3876 | struct e1000_adapter *adapter = netdev_priv(netdev); |
| 3722 | int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN; | 3877 | int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN; |
| 3723 | 3878 | ||
| 3724 | if ((max_frame < ETH_ZLEN + ETH_FCS_LEN) || | 3879 | if ((new_mtu < ETH_ZLEN + ETH_FCS_LEN + VLAN_HLEN) || |
| 3725 | (max_frame > MAX_JUMBO_FRAME_SIZE)) { | 3880 | (max_frame > MAX_JUMBO_FRAME_SIZE)) { |
| 3726 | e_err("Invalid MTU setting\n"); | 3881 | e_err("Invalid MTU setting\n"); |
| 3727 | return -EINVAL; | 3882 | return -EINVAL; |
diff --git a/drivers/net/e1000e/param.c b/drivers/net/e1000e/param.c index 8effc3107f9a..ed912e023a72 100644 --- a/drivers/net/e1000e/param.c +++ b/drivers/net/e1000e/param.c | |||
| @@ -324,14 +324,27 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter) | |||
| 324 | adapter->itr = 20000; | 324 | adapter->itr = 20000; |
| 325 | break; | 325 | break; |
| 326 | default: | 326 | default: |
| 327 | e1000_validate_option(&adapter->itr, &opt, | ||
| 328 | adapter); | ||
| 329 | /* | 327 | /* |
| 330 | * save the setting, because the dynamic bits | 328 | * Save the setting, because the dynamic bits |
| 331 | * change itr. clear the lower two bits | 329 | * change itr. |
| 332 | * because they are used as control | ||
| 333 | */ | 330 | */ |
| 334 | adapter->itr_setting = adapter->itr & ~3; | 331 | if (e1000_validate_option(&adapter->itr, &opt, |
| 332 | adapter) && | ||
| 333 | (adapter->itr == 3)) { | ||
| 334 | /* | ||
| 335 | * In case of invalid user value, | ||
| 336 | * default to conservative mode. | ||
| 337 | */ | ||
| 338 | adapter->itr_setting = adapter->itr; | ||
| 339 | adapter->itr = 20000; | ||
| 340 | } else { | ||
| 341 | /* | ||
| 342 | * Clear the lower two bits because | ||
| 343 | * they are used as control. | ||
| 344 | */ | ||
| 345 | adapter->itr_setting = | ||
| 346 | adapter->itr & ~3; | ||
| 347 | } | ||
| 335 | break; | 348 | break; |
| 336 | } | 349 | } |
| 337 | } else { | 350 | } else { |
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c index 053971e5fc94..331b86b01fa9 100644 --- a/drivers/net/forcedeth.c +++ b/drivers/net/forcedeth.c | |||
| @@ -5522,7 +5522,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i | |||
| 5522 | if (id->driver_data & DEV_HAS_CHECKSUM) { | 5522 | if (id->driver_data & DEV_HAS_CHECKSUM) { |
| 5523 | np->rx_csum = 1; | 5523 | np->rx_csum = 1; |
| 5524 | np->txrxctl_bits |= NVREG_TXRXCTL_RXCHECK; | 5524 | np->txrxctl_bits |= NVREG_TXRXCTL_RXCHECK; |
| 5525 | dev->features |= NETIF_F_HW_CSUM | NETIF_F_SG; | 5525 | dev->features |= NETIF_F_IP_CSUM | NETIF_F_SG; |
| 5526 | dev->features |= NETIF_F_TSO; | 5526 | dev->features |= NETIF_F_TSO; |
| 5527 | } | 5527 | } |
| 5528 | 5528 | ||
| @@ -5835,7 +5835,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i | |||
| 5835 | 5835 | ||
| 5836 | dev_printk(KERN_INFO, &pci_dev->dev, "%s%s%s%s%s%s%s%s%s%sdesc-v%u\n", | 5836 | dev_printk(KERN_INFO, &pci_dev->dev, "%s%s%s%s%s%s%s%s%s%sdesc-v%u\n", |
| 5837 | dev->features & NETIF_F_HIGHDMA ? "highdma " : "", | 5837 | dev->features & NETIF_F_HIGHDMA ? "highdma " : "", |
| 5838 | dev->features & (NETIF_F_HW_CSUM | NETIF_F_SG) ? | 5838 | dev->features & (NETIF_F_IP_CSUM | NETIF_F_SG) ? |
| 5839 | "csum " : "", | 5839 | "csum " : "", |
| 5840 | dev->features & (NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_TX) ? | 5840 | dev->features & (NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_TX) ? |
| 5841 | "vlan " : "", | 5841 | "vlan " : "", |
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c index 9a51ec8293cc..9d461825bf4c 100644 --- a/drivers/net/fs_enet/fs_enet-main.c +++ b/drivers/net/fs_enet/fs_enet-main.c | |||
| @@ -792,6 +792,10 @@ static int fs_enet_open(struct net_device *dev) | |||
| 792 | int r; | 792 | int r; |
| 793 | int err; | 793 | int err; |
| 794 | 794 | ||
| 795 | /* to initialize the fep->cur_rx,... */ | ||
| 796 | /* not doing this, will cause a crash in fs_enet_rx_napi */ | ||
| 797 | fs_init_bds(fep->ndev); | ||
| 798 | |||
| 795 | if (fep->fpi->use_napi) | 799 | if (fep->fpi->use_napi) |
| 796 | napi_enable(&fep->napi); | 800 | napi_enable(&fep->napi); |
| 797 | 801 | ||
| @@ -1167,6 +1171,10 @@ static struct of_device_id fs_enet_match[] = { | |||
| 1167 | .compatible = "fsl,cpm1-scc-enet", | 1171 | .compatible = "fsl,cpm1-scc-enet", |
| 1168 | .data = (void *)&fs_scc_ops, | 1172 | .data = (void *)&fs_scc_ops, |
| 1169 | }, | 1173 | }, |
| 1174 | { | ||
| 1175 | .compatible = "fsl,cpm2-scc-enet", | ||
| 1176 | .data = (void *)&fs_scc_ops, | ||
| 1177 | }, | ||
| 1170 | #endif | 1178 | #endif |
| 1171 | #ifdef CONFIG_FS_ENET_HAS_FCC | 1179 | #ifdef CONFIG_FS_ENET_HAS_FCC |
| 1172 | { | 1180 | { |
diff --git a/drivers/net/fs_enet/mac-scc.c b/drivers/net/fs_enet/mac-scc.c index 029b3c7ef29c..22f50dd8b277 100644 --- a/drivers/net/fs_enet/mac-scc.c +++ b/drivers/net/fs_enet/mac-scc.c | |||
| @@ -47,7 +47,6 @@ | |||
| 47 | #include "fs_enet.h" | 47 | #include "fs_enet.h" |
| 48 | 48 | ||
| 49 | /*************************************************/ | 49 | /*************************************************/ |
| 50 | |||
| 51 | #if defined(CONFIG_CPM1) | 50 | #if defined(CONFIG_CPM1) |
| 52 | /* for a 8xx __raw_xxx's are sufficient */ | 51 | /* for a 8xx __raw_xxx's are sufficient */ |
| 53 | #define __fs_out32(addr, x) __raw_writel(x, addr) | 52 | #define __fs_out32(addr, x) __raw_writel(x, addr) |
| @@ -62,6 +61,8 @@ | |||
| 62 | #define __fs_out16(addr, x) out_be16(addr, x) | 61 | #define __fs_out16(addr, x) out_be16(addr, x) |
| 63 | #define __fs_in32(addr) in_be32(addr) | 62 | #define __fs_in32(addr) in_be32(addr) |
| 64 | #define __fs_in16(addr) in_be16(addr) | 63 | #define __fs_in16(addr) in_be16(addr) |
| 64 | #define __fs_out8(addr, x) out_8(addr, x) | ||
| 65 | #define __fs_in8(addr) in_8(addr) | ||
| 65 | #endif | 66 | #endif |
| 66 | 67 | ||
| 67 | /* write, read, set bits, clear bits */ | 68 | /* write, read, set bits, clear bits */ |
| @@ -262,8 +263,13 @@ static void restart(struct net_device *dev) | |||
| 262 | 263 | ||
| 263 | /* Initialize function code registers for big-endian. | 264 | /* Initialize function code registers for big-endian. |
| 264 | */ | 265 | */ |
| 266 | #ifndef CONFIG_NOT_COHERENT_CACHE | ||
| 267 | W8(ep, sen_genscc.scc_rfcr, SCC_EB | SCC_GBL); | ||
| 268 | W8(ep, sen_genscc.scc_tfcr, SCC_EB | SCC_GBL); | ||
| 269 | #else | ||
| 265 | W8(ep, sen_genscc.scc_rfcr, SCC_EB); | 270 | W8(ep, sen_genscc.scc_rfcr, SCC_EB); |
| 266 | W8(ep, sen_genscc.scc_tfcr, SCC_EB); | 271 | W8(ep, sen_genscc.scc_tfcr, SCC_EB); |
| 272 | #endif | ||
| 267 | 273 | ||
| 268 | /* Set maximum bytes per receive buffer. | 274 | /* Set maximum bytes per receive buffer. |
| 269 | * This appears to be an Ethernet frame size, not the buffer | 275 | * This appears to be an Ethernet frame size, not the buffer |
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index ca6cf6ecb37b..4320a983a588 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c | |||
| @@ -105,6 +105,7 @@ const char gfar_driver_version[] = "1.3"; | |||
| 105 | 105 | ||
| 106 | static int gfar_enet_open(struct net_device *dev); | 106 | static int gfar_enet_open(struct net_device *dev); |
| 107 | static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev); | 107 | static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev); |
| 108 | static void gfar_reset_task(struct work_struct *work); | ||
| 108 | static void gfar_timeout(struct net_device *dev); | 109 | static void gfar_timeout(struct net_device *dev); |
| 109 | static int gfar_close(struct net_device *dev); | 110 | static int gfar_close(struct net_device *dev); |
| 110 | struct sk_buff *gfar_new_skb(struct net_device *dev); | 111 | struct sk_buff *gfar_new_skb(struct net_device *dev); |
| @@ -134,9 +135,7 @@ static int gfar_process_frame(struct net_device *dev, struct sk_buff *skb, int l | |||
| 134 | static void gfar_vlan_rx_register(struct net_device *netdev, | 135 | static void gfar_vlan_rx_register(struct net_device *netdev, |
| 135 | struct vlan_group *grp); | 136 | struct vlan_group *grp); |
| 136 | void gfar_halt(struct net_device *dev); | 137 | void gfar_halt(struct net_device *dev); |
| 137 | #ifdef CONFIG_PM | ||
| 138 | static void gfar_halt_nodisable(struct net_device *dev); | 138 | static void gfar_halt_nodisable(struct net_device *dev); |
| 139 | #endif | ||
| 140 | void gfar_start(struct net_device *dev); | 139 | void gfar_start(struct net_device *dev); |
| 141 | static void gfar_clear_exact_match(struct net_device *dev); | 140 | static void gfar_clear_exact_match(struct net_device *dev); |
| 142 | static void gfar_set_mac_for_addr(struct net_device *dev, int num, u8 *addr); | 141 | static void gfar_set_mac_for_addr(struct net_device *dev, int num, u8 *addr); |
| @@ -211,6 +210,7 @@ static int gfar_probe(struct platform_device *pdev) | |||
| 211 | spin_lock_init(&priv->txlock); | 210 | spin_lock_init(&priv->txlock); |
| 212 | spin_lock_init(&priv->rxlock); | 211 | spin_lock_init(&priv->rxlock); |
| 213 | spin_lock_init(&priv->bflock); | 212 | spin_lock_init(&priv->bflock); |
| 213 | INIT_WORK(&priv->reset_task, gfar_reset_task); | ||
| 214 | 214 | ||
| 215 | platform_set_drvdata(pdev, dev); | 215 | platform_set_drvdata(pdev, dev); |
| 216 | 216 | ||
| @@ -631,7 +631,6 @@ static void init_registers(struct net_device *dev) | |||
| 631 | } | 631 | } |
| 632 | 632 | ||
| 633 | 633 | ||
| 634 | #ifdef CONFIG_PM | ||
| 635 | /* Halt the receive and transmit queues */ | 634 | /* Halt the receive and transmit queues */ |
| 636 | static void gfar_halt_nodisable(struct net_device *dev) | 635 | static void gfar_halt_nodisable(struct net_device *dev) |
| 637 | { | 636 | { |
| @@ -657,7 +656,6 @@ static void gfar_halt_nodisable(struct net_device *dev) | |||
| 657 | cpu_relax(); | 656 | cpu_relax(); |
| 658 | } | 657 | } |
| 659 | } | 658 | } |
| 660 | #endif | ||
| 661 | 659 | ||
| 662 | /* Halt the receive and transmit queues */ | 660 | /* Halt the receive and transmit queues */ |
| 663 | void gfar_halt(struct net_device *dev) | 661 | void gfar_halt(struct net_device *dev) |
| @@ -666,6 +664,8 @@ void gfar_halt(struct net_device *dev) | |||
| 666 | struct gfar __iomem *regs = priv->regs; | 664 | struct gfar __iomem *regs = priv->regs; |
| 667 | u32 tempval; | 665 | u32 tempval; |
| 668 | 666 | ||
| 667 | gfar_halt_nodisable(dev); | ||
| 668 | |||
| 669 | /* Disable Rx and Tx */ | 669 | /* Disable Rx and Tx */ |
| 670 | tempval = gfar_read(®s->maccfg1); | 670 | tempval = gfar_read(®s->maccfg1); |
| 671 | tempval &= ~(MACCFG1_RX_EN | MACCFG1_TX_EN); | 671 | tempval &= ~(MACCFG1_RX_EN | MACCFG1_TX_EN); |
| @@ -1214,6 +1214,7 @@ static int gfar_close(struct net_device *dev) | |||
| 1214 | 1214 | ||
| 1215 | napi_disable(&priv->napi); | 1215 | napi_disable(&priv->napi); |
| 1216 | 1216 | ||
| 1217 | cancel_work_sync(&priv->reset_task); | ||
| 1217 | stop_gfar(dev); | 1218 | stop_gfar(dev); |
| 1218 | 1219 | ||
| 1219 | /* Disconnect from the PHY */ | 1220 | /* Disconnect from the PHY */ |
| @@ -1328,13 +1329,16 @@ static int gfar_change_mtu(struct net_device *dev, int new_mtu) | |||
| 1328 | return 0; | 1329 | return 0; |
| 1329 | } | 1330 | } |
| 1330 | 1331 | ||
| 1331 | /* gfar_timeout gets called when a packet has not been | 1332 | /* gfar_reset_task gets scheduled when a packet has not been |
| 1332 | * transmitted after a set amount of time. | 1333 | * transmitted after a set amount of time. |
| 1333 | * For now, assume that clearing out all the structures, and | 1334 | * For now, assume that clearing out all the structures, and |
| 1334 | * starting over will fix the problem. */ | 1335 | * starting over will fix the problem. |
| 1335 | static void gfar_timeout(struct net_device *dev) | 1336 | */ |
| 1337 | static void gfar_reset_task(struct work_struct *work) | ||
| 1336 | { | 1338 | { |
| 1337 | dev->stats.tx_errors++; | 1339 | struct gfar_private *priv = container_of(work, struct gfar_private, |
| 1340 | reset_task); | ||
| 1341 | struct net_device *dev = priv->dev; | ||
| 1338 | 1342 | ||
| 1339 | if (dev->flags & IFF_UP) { | 1343 | if (dev->flags & IFF_UP) { |
| 1340 | stop_gfar(dev); | 1344 | stop_gfar(dev); |
| @@ -1344,6 +1348,14 @@ static void gfar_timeout(struct net_device *dev) | |||
| 1344 | netif_tx_schedule_all(dev); | 1348 | netif_tx_schedule_all(dev); |
| 1345 | } | 1349 | } |
| 1346 | 1350 | ||
| 1351 | static void gfar_timeout(struct net_device *dev) | ||
| 1352 | { | ||
| 1353 | struct gfar_private *priv = netdev_priv(dev); | ||
| 1354 | |||
| 1355 | dev->stats.tx_errors++; | ||
| 1356 | schedule_work(&priv->reset_task); | ||
| 1357 | } | ||
| 1358 | |||
| 1347 | /* Interrupt Handler for Transmit complete */ | 1359 | /* Interrupt Handler for Transmit complete */ |
| 1348 | static int gfar_clean_tx_ring(struct net_device *dev) | 1360 | static int gfar_clean_tx_ring(struct net_device *dev) |
| 1349 | { | 1361 | { |
diff --git a/drivers/net/gianfar.h b/drivers/net/gianfar.h index d59df98bd636..f46e9b63af13 100644 --- a/drivers/net/gianfar.h +++ b/drivers/net/gianfar.h | |||
| @@ -756,6 +756,7 @@ struct gfar_private { | |||
| 756 | 756 | ||
| 757 | uint32_t msg_enable; | 757 | uint32_t msg_enable; |
| 758 | 758 | ||
| 759 | struct work_struct reset_task; | ||
| 759 | /* Network Statistics */ | 760 | /* Network Statistics */ |
| 760 | struct gfar_extra_stats extra_stats; | 761 | struct gfar_extra_stats extra_stats; |
| 761 | }; | 762 | }; |
diff --git a/drivers/net/gianfar_sysfs.c b/drivers/net/gianfar_sysfs.c index 5116f68e01b9..782c20170082 100644 --- a/drivers/net/gianfar_sysfs.c +++ b/drivers/net/gianfar_sysfs.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | 33 | ||
| 34 | #include <asm/uaccess.h> | 34 | #include <asm/uaccess.h> |
| 35 | #include <linux/module.h> | 35 | #include <linux/module.h> |
| 36 | #include <linux/version.h> | ||
| 37 | 36 | ||
| 38 | #include "gianfar.h" | 37 | #include "gianfar.h" |
| 39 | 38 | ||
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c index 2e720f26ca83..ccd9d9058f6d 100644 --- a/drivers/net/ibm_newemac/core.c +++ b/drivers/net/ibm_newemac/core.c | |||
| @@ -663,9 +663,6 @@ static int emac_configure(struct emac_instance *dev) | |||
| 663 | if (emac_phy_gpcs(dev->phy.mode)) | 663 | if (emac_phy_gpcs(dev->phy.mode)) |
| 664 | emac_mii_reset_phy(&dev->phy); | 664 | emac_mii_reset_phy(&dev->phy); |
| 665 | 665 | ||
| 666 | /* Required for Pause packet support in EMAC */ | ||
| 667 | dev_mc_add(ndev, default_mcast_addr, sizeof(default_mcast_addr), 1); | ||
| 668 | |||
| 669 | return 0; | 666 | return 0; |
| 670 | } | 667 | } |
| 671 | 668 | ||
| @@ -1150,6 +1147,9 @@ static int emac_open(struct net_device *ndev) | |||
| 1150 | } else | 1147 | } else |
| 1151 | netif_carrier_on(dev->ndev); | 1148 | netif_carrier_on(dev->ndev); |
| 1152 | 1149 | ||
| 1150 | /* Required for Pause packet support in EMAC */ | ||
| 1151 | dev_mc_add(ndev, default_mcast_addr, sizeof(default_mcast_addr), 1); | ||
| 1152 | |||
| 1153 | emac_configure(dev); | 1153 | emac_configure(dev); |
| 1154 | mal_poll_add(dev->mal, &dev->commac); | 1154 | mal_poll_add(dev->mal, &dev->commac); |
| 1155 | mal_enable_tx_channel(dev->mal, dev->mal_tx_chan); | 1155 | mal_enable_tx_channel(dev->mal, dev->mal_tx_chan); |
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c index a03fe1fb61ca..c2d57f836088 100644 --- a/drivers/net/ibmveth.c +++ b/drivers/net/ibmveth.c | |||
| @@ -904,8 +904,6 @@ static int ibmveth_start_xmit(struct sk_buff *skb, struct net_device *netdev) | |||
| 904 | unsigned long data_dma_addr; | 904 | unsigned long data_dma_addr; |
| 905 | 905 | ||
| 906 | desc.fields.flags_len = IBMVETH_BUF_VALID | skb->len; | 906 | desc.fields.flags_len = IBMVETH_BUF_VALID | skb->len; |
| 907 | data_dma_addr = dma_map_single(&adapter->vdev->dev, skb->data, | ||
| 908 | skb->len, DMA_TO_DEVICE); | ||
| 909 | 907 | ||
| 910 | if (skb->ip_summed == CHECKSUM_PARTIAL && | 908 | if (skb->ip_summed == CHECKSUM_PARTIAL && |
| 911 | ip_hdr(skb)->protocol != IPPROTO_TCP && skb_checksum_help(skb)) { | 909 | ip_hdr(skb)->protocol != IPPROTO_TCP && skb_checksum_help(skb)) { |
| @@ -924,6 +922,8 @@ static int ibmveth_start_xmit(struct sk_buff *skb, struct net_device *netdev) | |||
| 924 | buf[1] = 0; | 922 | buf[1] = 0; |
| 925 | } | 923 | } |
| 926 | 924 | ||
| 925 | data_dma_addr = dma_map_single(&adapter->vdev->dev, skb->data, | ||
| 926 | skb->len, DMA_TO_DEVICE); | ||
| 927 | if (dma_mapping_error(&adapter->vdev->dev, data_dma_addr)) { | 927 | if (dma_mapping_error(&adapter->vdev->dev, data_dma_addr)) { |
| 928 | if (!firmware_has_feature(FW_FEATURE_CMO)) | 928 | if (!firmware_has_feature(FW_FEATURE_CMO)) |
| 929 | ibmveth_error_printk("tx: unable to map xmit buffer\n"); | 929 | ibmveth_error_printk("tx: unable to map xmit buffer\n"); |
| @@ -932,6 +932,7 @@ static int ibmveth_start_xmit(struct sk_buff *skb, struct net_device *netdev) | |||
| 932 | desc.fields.address = adapter->bounce_buffer_dma; | 932 | desc.fields.address = adapter->bounce_buffer_dma; |
| 933 | tx_map_failed++; | 933 | tx_map_failed++; |
| 934 | used_bounce = 1; | 934 | used_bounce = 1; |
| 935 | wmb(); | ||
| 935 | } else | 936 | } else |
| 936 | desc.fields.address = data_dma_addr; | 937 | desc.fields.address = data_dma_addr; |
| 937 | 938 | ||
diff --git a/drivers/net/igb/e1000_82575.c b/drivers/net/igb/e1000_82575.c index bb823acc7443..f5e2e7235fcb 100644 --- a/drivers/net/igb/e1000_82575.c +++ b/drivers/net/igb/e1000_82575.c | |||
| @@ -87,7 +87,6 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw) | |||
| 87 | case E1000_DEV_ID_82576: | 87 | case E1000_DEV_ID_82576: |
| 88 | case E1000_DEV_ID_82576_FIBER: | 88 | case E1000_DEV_ID_82576_FIBER: |
| 89 | case E1000_DEV_ID_82576_SERDES: | 89 | case E1000_DEV_ID_82576_SERDES: |
| 90 | case E1000_DEV_ID_82576_QUAD_COPPER: | ||
| 91 | mac->type = e1000_82576; | 90 | mac->type = e1000_82576; |
| 92 | break; | 91 | break; |
| 93 | default: | 92 | default: |
diff --git a/drivers/net/igb/e1000_hw.h b/drivers/net/igb/e1000_hw.h index a65ccc3095c3..99504a600a80 100644 --- a/drivers/net/igb/e1000_hw.h +++ b/drivers/net/igb/e1000_hw.h | |||
| @@ -41,7 +41,6 @@ struct e1000_hw; | |||
| 41 | #define E1000_DEV_ID_82576 0x10C9 | 41 | #define E1000_DEV_ID_82576 0x10C9 |
| 42 | #define E1000_DEV_ID_82576_FIBER 0x10E6 | 42 | #define E1000_DEV_ID_82576_FIBER 0x10E6 |
| 43 | #define E1000_DEV_ID_82576_SERDES 0x10E7 | 43 | #define E1000_DEV_ID_82576_SERDES 0x10E7 |
| 44 | #define E1000_DEV_ID_82576_QUAD_COPPER 0x10E8 | ||
| 45 | #define E1000_DEV_ID_82575EB_COPPER 0x10A7 | 44 | #define E1000_DEV_ID_82575EB_COPPER 0x10A7 |
| 46 | #define E1000_DEV_ID_82575EB_FIBER_SERDES 0x10A9 | 45 | #define E1000_DEV_ID_82575EB_FIBER_SERDES 0x10A9 |
| 47 | #define E1000_DEV_ID_82575GB_QUAD_COPPER 0x10D6 | 46 | #define E1000_DEV_ID_82575GB_QUAD_COPPER 0x10D6 |
diff --git a/drivers/net/igb/igb_ethtool.c b/drivers/net/igb/igb_ethtool.c index 11aee1309951..58906c984be9 100644 --- a/drivers/net/igb/igb_ethtool.c +++ b/drivers/net/igb/igb_ethtool.c | |||
| @@ -373,13 +373,17 @@ static void igb_get_regs(struct net_device *netdev, | |||
| 373 | regs_buff[12] = rd32(E1000_EECD); | 373 | regs_buff[12] = rd32(E1000_EECD); |
| 374 | 374 | ||
| 375 | /* Interrupt */ | 375 | /* Interrupt */ |
| 376 | regs_buff[13] = rd32(E1000_EICR); | 376 | /* Reading EICS for EICR because they read the |
| 377 | * same but EICS does not clear on read */ | ||
| 378 | regs_buff[13] = rd32(E1000_EICS); | ||
| 377 | regs_buff[14] = rd32(E1000_EICS); | 379 | regs_buff[14] = rd32(E1000_EICS); |
| 378 | regs_buff[15] = rd32(E1000_EIMS); | 380 | regs_buff[15] = rd32(E1000_EIMS); |
| 379 | regs_buff[16] = rd32(E1000_EIMC); | 381 | regs_buff[16] = rd32(E1000_EIMC); |
| 380 | regs_buff[17] = rd32(E1000_EIAC); | 382 | regs_buff[17] = rd32(E1000_EIAC); |
| 381 | regs_buff[18] = rd32(E1000_EIAM); | 383 | regs_buff[18] = rd32(E1000_EIAM); |
| 382 | regs_buff[19] = rd32(E1000_ICR); | 384 | /* Reading ICS for ICR because they read the |
| 385 | * same but ICS does not clear on read */ | ||
| 386 | regs_buff[19] = rd32(E1000_ICS); | ||
| 383 | regs_buff[20] = rd32(E1000_ICS); | 387 | regs_buff[20] = rd32(E1000_ICS); |
| 384 | regs_buff[21] = rd32(E1000_IMS); | 388 | regs_buff[21] = rd32(E1000_IMS); |
| 385 | regs_buff[22] = rd32(E1000_IMC); | 389 | regs_buff[22] = rd32(E1000_IMC); |
| @@ -1746,15 +1750,6 @@ static int igb_wol_exclusion(struct igb_adapter *adapter, | |||
| 1746 | /* return success for non excluded adapter ports */ | 1750 | /* return success for non excluded adapter ports */ |
| 1747 | retval = 0; | 1751 | retval = 0; |
| 1748 | break; | 1752 | break; |
| 1749 | case E1000_DEV_ID_82576_QUAD_COPPER: | ||
| 1750 | /* quad port adapters only support WoL on port A */ | ||
| 1751 | if (!(adapter->flags & IGB_FLAG_QUAD_PORT_A)) { | ||
| 1752 | wol->supported = 0; | ||
| 1753 | break; | ||
| 1754 | } | ||
| 1755 | /* return success for non excluded adapter ports */ | ||
| 1756 | retval = 0; | ||
| 1757 | break; | ||
| 1758 | default: | 1753 | default: |
| 1759 | /* dual port cards only support WoL on port A from now on | 1754 | /* dual port cards only support WoL on port A from now on |
| 1760 | * unless it was enabled in the eeprom for port B | 1755 | * unless it was enabled in the eeprom for port B |
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index 8f66e15ec8d6..634c4c9d87be 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c | |||
| @@ -61,7 +61,6 @@ static struct pci_device_id igb_pci_tbl[] = { | |||
| 61 | { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576), board_82575 }, | 61 | { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576), board_82575 }, |
| 62 | { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_FIBER), board_82575 }, | 62 | { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_FIBER), board_82575 }, |
| 63 | { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_SERDES), board_82575 }, | 63 | { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_SERDES), board_82575 }, |
| 64 | { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_QUAD_COPPER), board_82575 }, | ||
| 65 | { PCI_VDEVICE(INTEL, E1000_DEV_ID_82575EB_COPPER), board_82575 }, | 64 | { PCI_VDEVICE(INTEL, E1000_DEV_ID_82575EB_COPPER), board_82575 }, |
| 66 | { PCI_VDEVICE(INTEL, E1000_DEV_ID_82575EB_FIBER_SERDES), board_82575 }, | 65 | { PCI_VDEVICE(INTEL, E1000_DEV_ID_82575EB_FIBER_SERDES), board_82575 }, |
| 67 | { PCI_VDEVICE(INTEL, E1000_DEV_ID_82575GB_QUAD_COPPER), board_82575 }, | 66 | { PCI_VDEVICE(INTEL, E1000_DEV_ID_82575GB_QUAD_COPPER), board_82575 }, |
| @@ -521,7 +520,7 @@ static void igb_set_interrupt_capability(struct igb_adapter *adapter) | |||
| 521 | adapter->msix_entries, | 520 | adapter->msix_entries, |
| 522 | numvecs); | 521 | numvecs); |
| 523 | if (err == 0) | 522 | if (err == 0) |
| 524 | return; | 523 | goto out; |
| 525 | 524 | ||
| 526 | igb_reset_interrupt_capability(adapter); | 525 | igb_reset_interrupt_capability(adapter); |
| 527 | 526 | ||
| @@ -531,7 +530,7 @@ msi_only: | |||
| 531 | adapter->num_tx_queues = 1; | 530 | adapter->num_tx_queues = 1; |
| 532 | if (!pci_enable_msi(adapter->pdev)) | 531 | if (!pci_enable_msi(adapter->pdev)) |
| 533 | adapter->flags |= IGB_FLAG_HAS_MSI; | 532 | adapter->flags |= IGB_FLAG_HAS_MSI; |
| 534 | 533 | out: | |
| 535 | /* Notify the stack of the (possibly) reduced Tx Queue count. */ | 534 | /* Notify the stack of the (possibly) reduced Tx Queue count. */ |
| 536 | adapter->netdev->real_num_tx_queues = adapter->num_tx_queues; | 535 | adapter->netdev->real_num_tx_queues = adapter->num_tx_queues; |
| 537 | return; | 536 | return; |
| @@ -1217,16 +1216,6 @@ static int __devinit igb_probe(struct pci_dev *pdev, | |||
| 1217 | if (rd32(E1000_STATUS) & E1000_STATUS_FUNC_1) | 1216 | if (rd32(E1000_STATUS) & E1000_STATUS_FUNC_1) |
| 1218 | adapter->eeprom_wol = 0; | 1217 | adapter->eeprom_wol = 0; |
| 1219 | break; | 1218 | break; |
| 1220 | case E1000_DEV_ID_82576_QUAD_COPPER: | ||
| 1221 | /* if quad port adapter, disable WoL on all but port A */ | ||
| 1222 | if (global_quad_port_a != 0) | ||
| 1223 | adapter->eeprom_wol = 0; | ||
| 1224 | else | ||
| 1225 | adapter->flags |= IGB_FLAG_QUAD_PORT_A; | ||
| 1226 | /* Reset for multiple quad port adapters */ | ||
| 1227 | if (++global_quad_port_a == 4) | ||
| 1228 | global_quad_port_a = 0; | ||
| 1229 | break; | ||
| 1230 | } | 1219 | } |
| 1231 | 1220 | ||
| 1232 | /* initialize the wol settings based on the eeprom settings */ | 1221 | /* initialize the wol settings based on the eeprom settings */ |
| @@ -2290,7 +2279,9 @@ static void igb_watchdog_task(struct work_struct *work) | |||
| 2290 | struct igb_ring *tx_ring = adapter->tx_ring; | 2279 | struct igb_ring *tx_ring = adapter->tx_ring; |
| 2291 | struct e1000_mac_info *mac = &adapter->hw.mac; | 2280 | struct e1000_mac_info *mac = &adapter->hw.mac; |
| 2292 | u32 link; | 2281 | u32 link; |
| 2282 | u32 eics = 0; | ||
| 2293 | s32 ret_val; | 2283 | s32 ret_val; |
| 2284 | int i; | ||
| 2294 | 2285 | ||
| 2295 | if ((netif_carrier_ok(netdev)) && | 2286 | if ((netif_carrier_ok(netdev)) && |
| 2296 | (rd32(E1000_STATUS) & E1000_STATUS_LU)) | 2287 | (rd32(E1000_STATUS) & E1000_STATUS_LU)) |
| @@ -2392,7 +2383,13 @@ link_up: | |||
| 2392 | } | 2383 | } |
| 2393 | 2384 | ||
| 2394 | /* Cause software interrupt to ensure rx ring is cleaned */ | 2385 | /* Cause software interrupt to ensure rx ring is cleaned */ |
| 2395 | wr32(E1000_ICS, E1000_ICS_RXDMT0); | 2386 | if (adapter->msix_entries) { |
| 2387 | for (i = 0; i < adapter->num_rx_queues; i++) | ||
| 2388 | eics |= adapter->rx_ring[i].eims_value; | ||
| 2389 | wr32(E1000_EICS, eics); | ||
| 2390 | } else { | ||
| 2391 | wr32(E1000_ICS, E1000_ICS_RXDMT0); | ||
| 2392 | } | ||
| 2396 | 2393 | ||
| 2397 | /* Force detection of hung controller every watchdog period */ | 2394 | /* Force detection of hung controller every watchdog period */ |
| 2398 | tx_ring->detect_tx_hung = true; | 2395 | tx_ring->detect_tx_hung = true; |
diff --git a/drivers/net/ipg.h b/drivers/net/ipg.h index e0e718ab4c2e..dd9318f19497 100644 --- a/drivers/net/ipg.h +++ b/drivers/net/ipg.h | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | #ifndef __LINUX_IPG_H | 7 | #ifndef __LINUX_IPG_H |
| 8 | #define __LINUX_IPG_H | 8 | #define __LINUX_IPG_H |
| 9 | 9 | ||
| 10 | #include <linux/version.h> | ||
| 11 | #include <linux/module.h> | 10 | #include <linux/module.h> |
| 12 | 11 | ||
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| @@ -21,7 +20,6 @@ | |||
| 21 | #include <linux/etherdevice.h> | 20 | #include <linux/etherdevice.h> |
| 22 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 23 | #include <linux/skbuff.h> | 22 | #include <linux/skbuff.h> |
| 24 | #include <linux/version.h> | ||
| 25 | #include <asm/bitops.h> | 23 | #include <asm/bitops.h> |
| 26 | 24 | ||
| 27 | /* | 25 | /* |
diff --git a/drivers/net/ixgbe/ixgbe_82598.c b/drivers/net/ixgbe/ixgbe_82598.c index 2f38e847e2cd..f96358b641af 100644 --- a/drivers/net/ixgbe/ixgbe_82598.c +++ b/drivers/net/ixgbe/ixgbe_82598.c | |||
| @@ -190,6 +190,7 @@ static enum ixgbe_media_type ixgbe_get_media_type_82598(struct ixgbe_hw *hw) | |||
| 190 | case IXGBE_DEV_ID_82598AF_DUAL_PORT: | 190 | case IXGBE_DEV_ID_82598AF_DUAL_PORT: |
| 191 | case IXGBE_DEV_ID_82598AF_SINGLE_PORT: | 191 | case IXGBE_DEV_ID_82598AF_SINGLE_PORT: |
| 192 | case IXGBE_DEV_ID_82598EB_CX4: | 192 | case IXGBE_DEV_ID_82598EB_CX4: |
| 193 | case IXGBE_DEV_ID_82598_CX4_DUAL_PORT: | ||
| 193 | media_type = ixgbe_media_type_fiber; | 194 | media_type = ixgbe_media_type_fiber; |
| 194 | break; | 195 | break; |
| 195 | case IXGBE_DEV_ID_82598AT_DUAL_PORT: | 196 | case IXGBE_DEV_ID_82598AT_DUAL_PORT: |
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index e5f3da8468cc..a417be7f8be5 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c | |||
| @@ -48,7 +48,7 @@ char ixgbe_driver_name[] = "ixgbe"; | |||
| 48 | static const char ixgbe_driver_string[] = | 48 | static const char ixgbe_driver_string[] = |
| 49 | "Intel(R) 10 Gigabit PCI Express Network Driver"; | 49 | "Intel(R) 10 Gigabit PCI Express Network Driver"; |
| 50 | 50 | ||
| 51 | #define DRV_VERSION "1.3.18-k2" | 51 | #define DRV_VERSION "1.3.18-k4" |
| 52 | const char ixgbe_driver_version[] = DRV_VERSION; | 52 | const char ixgbe_driver_version[] = DRV_VERSION; |
| 53 | static const char ixgbe_copyright[] = | 53 | static const char ixgbe_copyright[] = |
| 54 | "Copyright (c) 1999-2007 Intel Corporation."; | 54 | "Copyright (c) 1999-2007 Intel Corporation."; |
| @@ -72,6 +72,8 @@ static struct pci_device_id ixgbe_pci_tbl[] = { | |||
| 72 | board_82598 }, | 72 | board_82598 }, |
| 73 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598EB_CX4), | 73 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598EB_CX4), |
| 74 | board_82598 }, | 74 | board_82598 }, |
| 75 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598_CX4_DUAL_PORT), | ||
| 76 | board_82598 }, | ||
| 75 | 77 | ||
| 76 | /* required last entry */ | 78 | /* required last entry */ |
| 77 | {0, } | 79 | {0, } |
| @@ -1634,16 +1636,17 @@ static void ixgbe_set_multi(struct net_device *netdev) | |||
| 1634 | struct ixgbe_hw *hw = &adapter->hw; | 1636 | struct ixgbe_hw *hw = &adapter->hw; |
| 1635 | struct dev_mc_list *mc_ptr; | 1637 | struct dev_mc_list *mc_ptr; |
| 1636 | u8 *mta_list; | 1638 | u8 *mta_list; |
| 1637 | u32 fctrl; | 1639 | u32 fctrl, vlnctrl; |
| 1638 | int i; | 1640 | int i; |
| 1639 | 1641 | ||
| 1640 | /* Check for Promiscuous and All Multicast modes */ | 1642 | /* Check for Promiscuous and All Multicast modes */ |
| 1641 | 1643 | ||
| 1642 | fctrl = IXGBE_READ_REG(hw, IXGBE_FCTRL); | 1644 | fctrl = IXGBE_READ_REG(hw, IXGBE_FCTRL); |
| 1645 | vlnctrl = IXGBE_READ_REG(hw, IXGBE_VLNCTRL); | ||
| 1643 | 1646 | ||
| 1644 | if (netdev->flags & IFF_PROMISC) { | 1647 | if (netdev->flags & IFF_PROMISC) { |
| 1645 | fctrl |= (IXGBE_FCTRL_UPE | IXGBE_FCTRL_MPE); | 1648 | fctrl |= (IXGBE_FCTRL_UPE | IXGBE_FCTRL_MPE); |
| 1646 | fctrl &= ~IXGBE_VLNCTRL_VFE; | 1649 | vlnctrl &= ~IXGBE_VLNCTRL_VFE; |
| 1647 | } else { | 1650 | } else { |
| 1648 | if (netdev->flags & IFF_ALLMULTI) { | 1651 | if (netdev->flags & IFF_ALLMULTI) { |
| 1649 | fctrl |= IXGBE_FCTRL_MPE; | 1652 | fctrl |= IXGBE_FCTRL_MPE; |
| @@ -1651,10 +1654,11 @@ static void ixgbe_set_multi(struct net_device *netdev) | |||
| 1651 | } else { | 1654 | } else { |
| 1652 | fctrl &= ~(IXGBE_FCTRL_UPE | IXGBE_FCTRL_MPE); | 1655 | fctrl &= ~(IXGBE_FCTRL_UPE | IXGBE_FCTRL_MPE); |
| 1653 | } | 1656 | } |
| 1654 | fctrl |= IXGBE_VLNCTRL_VFE; | 1657 | vlnctrl |= IXGBE_VLNCTRL_VFE; |
| 1655 | } | 1658 | } |
| 1656 | 1659 | ||
| 1657 | IXGBE_WRITE_REG(hw, IXGBE_FCTRL, fctrl); | 1660 | IXGBE_WRITE_REG(hw, IXGBE_FCTRL, fctrl); |
| 1661 | IXGBE_WRITE_REG(hw, IXGBE_VLNCTRL, vlnctrl); | ||
| 1658 | 1662 | ||
| 1659 | if (netdev->mc_count) { | 1663 | if (netdev->mc_count) { |
| 1660 | mta_list = kcalloc(netdev->mc_count, ETH_ALEN, GFP_ATOMIC); | 1664 | mta_list = kcalloc(netdev->mc_count, ETH_ALEN, GFP_ATOMIC); |
| @@ -2300,6 +2304,12 @@ static int __devinit ixgbe_set_interrupt_capability(struct ixgbe_adapter | |||
| 2300 | int vector, v_budget; | 2304 | int vector, v_budget; |
| 2301 | 2305 | ||
| 2302 | /* | 2306 | /* |
| 2307 | * Set the default interrupt throttle rate. | ||
| 2308 | */ | ||
| 2309 | adapter->rx_eitr = (1000000 / IXGBE_DEFAULT_ITR_RX_USECS); | ||
| 2310 | adapter->tx_eitr = (1000000 / IXGBE_DEFAULT_ITR_TX_USECS); | ||
| 2311 | |||
| 2312 | /* | ||
| 2303 | * It's easy to be greedy for MSI-X vectors, but it really | 2313 | * It's easy to be greedy for MSI-X vectors, but it really |
| 2304 | * doesn't do us much good if we have a lot more vectors | 2314 | * doesn't do us much good if we have a lot more vectors |
| 2305 | * than CPU's. So let's be conservative and only ask for | 2315 | * than CPU's. So let's be conservative and only ask for |
diff --git a/drivers/net/ixgbe/ixgbe_type.h b/drivers/net/ixgbe/ixgbe_type.h index 1ad7cb9c25a8..c0282a223df3 100644 --- a/drivers/net/ixgbe/ixgbe_type.h +++ b/drivers/net/ixgbe/ixgbe_type.h | |||
| @@ -39,6 +39,7 @@ | |||
| 39 | #define IXGBE_DEV_ID_82598AF_SINGLE_PORT 0x10C7 | 39 | #define IXGBE_DEV_ID_82598AF_SINGLE_PORT 0x10C7 |
| 40 | #define IXGBE_DEV_ID_82598AT_DUAL_PORT 0x10C8 | 40 | #define IXGBE_DEV_ID_82598AT_DUAL_PORT 0x10C8 |
| 41 | #define IXGBE_DEV_ID_82598EB_CX4 0x10DD | 41 | #define IXGBE_DEV_ID_82598EB_CX4 0x10DD |
| 42 | #define IXGBE_DEV_ID_82598_CX4_DUAL_PORT 0x10EC | ||
| 42 | 43 | ||
| 43 | /* General Registers */ | 44 | /* General Registers */ |
| 44 | #define IXGBE_CTRL 0x00000 | 45 | #define IXGBE_CTRL 0x00000 |
diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c index 49f6bc036a92..3b43bfd85a0f 100644 --- a/drivers/net/loopback.c +++ b/drivers/net/loopback.c | |||
| @@ -64,68 +64,6 @@ struct pcpu_lstats { | |||
| 64 | unsigned long bytes; | 64 | unsigned long bytes; |
| 65 | }; | 65 | }; |
| 66 | 66 | ||
| 67 | /* KISS: just allocate small chunks and copy bits. | ||
| 68 | * | ||
| 69 | * So, in fact, this is documentation, explaining what we expect | ||
| 70 | * of largesending device modulo TCP checksum, which is ignored for loopback. | ||
| 71 | */ | ||
| 72 | |||
| 73 | #ifdef LOOPBACK_TSO | ||
| 74 | static void emulate_large_send_offload(struct sk_buff *skb) | ||
| 75 | { | ||
| 76 | struct iphdr *iph = ip_hdr(skb); | ||
| 77 | struct tcphdr *th = (struct tcphdr *)(skb_network_header(skb) + | ||
| 78 | (iph->ihl * 4)); | ||
| 79 | unsigned int doffset = (iph->ihl + th->doff) * 4; | ||
| 80 | unsigned int mtu = skb_shinfo(skb)->gso_size + doffset; | ||
| 81 | unsigned int offset = 0; | ||
| 82 | u32 seq = ntohl(th->seq); | ||
| 83 | u16 id = ntohs(iph->id); | ||
| 84 | |||
| 85 | while (offset + doffset < skb->len) { | ||
| 86 | unsigned int frag_size = min(mtu, skb->len - offset) - doffset; | ||
| 87 | struct sk_buff *nskb = alloc_skb(mtu + 32, GFP_ATOMIC); | ||
| 88 | |||
| 89 | if (!nskb) | ||
| 90 | break; | ||
| 91 | skb_reserve(nskb, 32); | ||
| 92 | skb_set_mac_header(nskb, -ETH_HLEN); | ||
| 93 | skb_reset_network_header(nskb); | ||
| 94 | iph = ip_hdr(nskb); | ||
| 95 | skb_copy_to_linear_data(nskb, skb_network_header(skb), | ||
| 96 | doffset); | ||
| 97 | if (skb_copy_bits(skb, | ||
| 98 | doffset + offset, | ||
| 99 | nskb->data + doffset, | ||
| 100 | frag_size)) | ||
| 101 | BUG(); | ||
| 102 | skb_put(nskb, doffset + frag_size); | ||
| 103 | nskb->ip_summed = CHECKSUM_UNNECESSARY; | ||
| 104 | nskb->dev = skb->dev; | ||
| 105 | nskb->priority = skb->priority; | ||
| 106 | nskb->protocol = skb->protocol; | ||
| 107 | nskb->dst = dst_clone(skb->dst); | ||
| 108 | memcpy(nskb->cb, skb->cb, sizeof(skb->cb)); | ||
| 109 | nskb->pkt_type = skb->pkt_type; | ||
| 110 | |||
| 111 | th = (struct tcphdr *)(skb_network_header(nskb) + iph->ihl * 4); | ||
| 112 | iph->tot_len = htons(frag_size + doffset); | ||
| 113 | iph->id = htons(id); | ||
| 114 | iph->check = 0; | ||
| 115 | iph->check = ip_fast_csum((unsigned char *) iph, iph->ihl); | ||
| 116 | th->seq = htonl(seq); | ||
| 117 | if (offset + doffset + frag_size < skb->len) | ||
| 118 | th->fin = th->psh = 0; | ||
| 119 | netif_rx(nskb); | ||
| 120 | offset += frag_size; | ||
| 121 | seq += frag_size; | ||
| 122 | id++; | ||
| 123 | } | ||
| 124 | |||
| 125 | dev_kfree_skb(skb); | ||
| 126 | } | ||
| 127 | #endif /* LOOPBACK_TSO */ | ||
| 128 | |||
| 129 | /* | 67 | /* |
| 130 | * The higher levels take care of making this non-reentrant (it's | 68 | * The higher levels take care of making this non-reentrant (it's |
| 131 | * called with bh's disabled). | 69 | * called with bh's disabled). |
| @@ -137,9 +75,6 @@ static int loopback_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 137 | skb_orphan(skb); | 75 | skb_orphan(skb); |
| 138 | 76 | ||
| 139 | skb->protocol = eth_type_trans(skb,dev); | 77 | skb->protocol = eth_type_trans(skb,dev); |
| 140 | #ifndef LOOPBACK_MUST_CHECKSUM | ||
| 141 | skb->ip_summed = CHECKSUM_UNNECESSARY; | ||
| 142 | #endif | ||
| 143 | 78 | ||
| 144 | #ifdef LOOPBACK_TSO | 79 | #ifdef LOOPBACK_TSO |
| 145 | if (skb_is_gso(skb)) { | 80 | if (skb_is_gso(skb)) { |
| @@ -234,9 +169,7 @@ static void loopback_setup(struct net_device *dev) | |||
| 234 | dev->type = ARPHRD_LOOPBACK; /* 0x0001*/ | 169 | dev->type = ARPHRD_LOOPBACK; /* 0x0001*/ |
| 235 | dev->flags = IFF_LOOPBACK; | 170 | dev->flags = IFF_LOOPBACK; |
| 236 | dev->features = NETIF_F_SG | NETIF_F_FRAGLIST | 171 | dev->features = NETIF_F_SG | NETIF_F_FRAGLIST |
| 237 | #ifdef LOOPBACK_TSO | ||
| 238 | | NETIF_F_TSO | 172 | | NETIF_F_TSO |
| 239 | #endif | ||
| 240 | | NETIF_F_NO_CSUM | 173 | | NETIF_F_NO_CSUM |
| 241 | | NETIF_F_HIGHDMA | 174 | | NETIF_F_HIGHDMA |
| 242 | | NETIF_F_LLTX | 175 | | NETIF_F_LLTX |
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c index 46819af3b062..0a18b9e96da1 100644 --- a/drivers/net/mv643xx_eth.c +++ b/drivers/net/mv643xx_eth.c | |||
| @@ -55,7 +55,7 @@ | |||
| 55 | #include <asm/system.h> | 55 | #include <asm/system.h> |
| 56 | 56 | ||
| 57 | static char mv643xx_eth_driver_name[] = "mv643xx_eth"; | 57 | static char mv643xx_eth_driver_name[] = "mv643xx_eth"; |
| 58 | static char mv643xx_eth_driver_version[] = "1.2"; | 58 | static char mv643xx_eth_driver_version[] = "1.3"; |
| 59 | 59 | ||
| 60 | #define MV643XX_ETH_CHECKSUM_OFFLOAD_TX | 60 | #define MV643XX_ETH_CHECKSUM_OFFLOAD_TX |
| 61 | #define MV643XX_ETH_NAPI | 61 | #define MV643XX_ETH_NAPI |
| @@ -474,11 +474,19 @@ static void rxq_refill(struct rx_queue *rxq) | |||
| 474 | /* | 474 | /* |
| 475 | * Reserve 2+14 bytes for an ethernet header (the | 475 | * Reserve 2+14 bytes for an ethernet header (the |
| 476 | * hardware automatically prepends 2 bytes of dummy | 476 | * hardware automatically prepends 2 bytes of dummy |
| 477 | * data to each received packet), 4 bytes for a VLAN | 477 | * data to each received packet), 16 bytes for up to |
| 478 | * header, and 4 bytes for the trailing FCS -- 24 | 478 | * four VLAN tags, and 4 bytes for the trailing FCS |
| 479 | * bytes total. | 479 | * -- 36 bytes total. |
| 480 | */ | 480 | */ |
| 481 | skb_size = mp->dev->mtu + 24; | 481 | skb_size = mp->dev->mtu + 36; |
| 482 | |||
| 483 | /* | ||
| 484 | * Make sure that the skb size is a multiple of 8 | ||
| 485 | * bytes, as the lower three bits of the receive | ||
| 486 | * descriptor's buffer size field are ignored by | ||
| 487 | * the hardware. | ||
| 488 | */ | ||
| 489 | skb_size = (skb_size + 7) & ~7; | ||
| 482 | 490 | ||
| 483 | skb = dev_alloc_skb(skb_size + dma_get_cache_alignment() - 1); | 491 | skb = dev_alloc_skb(skb_size + dma_get_cache_alignment() - 1); |
| 484 | if (skb == NULL) | 492 | if (skb == NULL) |
| @@ -509,10 +517,8 @@ static void rxq_refill(struct rx_queue *rxq) | |||
| 509 | skb_reserve(skb, 2); | 517 | skb_reserve(skb, 2); |
| 510 | } | 518 | } |
| 511 | 519 | ||
| 512 | if (rxq->rx_desc_count != rxq->rx_ring_size) { | 520 | if (rxq->rx_desc_count != rxq->rx_ring_size) |
| 513 | rxq->rx_oom.expires = jiffies + (HZ / 10); | 521 | mod_timer(&rxq->rx_oom, jiffies + (HZ / 10)); |
| 514 | add_timer(&rxq->rx_oom); | ||
| 515 | } | ||
| 516 | 522 | ||
| 517 | spin_unlock_irqrestore(&mp->lock, flags); | 523 | spin_unlock_irqrestore(&mp->lock, flags); |
| 518 | } | 524 | } |
| @@ -529,7 +535,7 @@ static int rxq_process(struct rx_queue *rxq, int budget) | |||
| 529 | int rx; | 535 | int rx; |
| 530 | 536 | ||
| 531 | rx = 0; | 537 | rx = 0; |
| 532 | while (rx < budget) { | 538 | while (rx < budget && rxq->rx_desc_count) { |
| 533 | struct rx_desc *rx_desc; | 539 | struct rx_desc *rx_desc; |
| 534 | unsigned int cmd_sts; | 540 | unsigned int cmd_sts; |
| 535 | struct sk_buff *skb; | 541 | struct sk_buff *skb; |
| @@ -554,7 +560,7 @@ static int rxq_process(struct rx_queue *rxq, int budget) | |||
| 554 | spin_unlock_irqrestore(&mp->lock, flags); | 560 | spin_unlock_irqrestore(&mp->lock, flags); |
| 555 | 561 | ||
| 556 | dma_unmap_single(NULL, rx_desc->buf_ptr + 2, | 562 | dma_unmap_single(NULL, rx_desc->buf_ptr + 2, |
| 557 | mp->dev->mtu + 24, DMA_FROM_DEVICE); | 563 | rx_desc->buf_size, DMA_FROM_DEVICE); |
| 558 | rxq->rx_desc_count--; | 564 | rxq->rx_desc_count--; |
| 559 | rx++; | 565 | rx++; |
| 560 | 566 | ||
| @@ -636,9 +642,9 @@ static int mv643xx_eth_poll(struct napi_struct *napi, int budget) | |||
| 636 | txq_reclaim(mp->txq + i, 0); | 642 | txq_reclaim(mp->txq + i, 0); |
| 637 | 643 | ||
| 638 | if (netif_carrier_ok(mp->dev)) { | 644 | if (netif_carrier_ok(mp->dev)) { |
| 639 | spin_lock(&mp->lock); | 645 | spin_lock_irq(&mp->lock); |
| 640 | __txq_maybe_wake(mp->txq + mp->txq_primary); | 646 | __txq_maybe_wake(mp->txq + mp->txq_primary); |
| 641 | spin_unlock(&mp->lock); | 647 | spin_unlock_irq(&mp->lock); |
| 642 | } | 648 | } |
| 643 | } | 649 | } |
| 644 | #endif | 650 | #endif |
| @@ -650,8 +656,6 @@ static int mv643xx_eth_poll(struct napi_struct *napi, int budget) | |||
| 650 | 656 | ||
| 651 | if (rx < budget) { | 657 | if (rx < budget) { |
| 652 | netif_rx_complete(mp->dev, napi); | 658 | netif_rx_complete(mp->dev, napi); |
| 653 | wrl(mp, INT_CAUSE(mp->port_num), 0); | ||
| 654 | wrl(mp, INT_CAUSE_EXT(mp->port_num), 0); | ||
| 655 | wrl(mp, INT_MASK(mp->port_num), INT_TX_END | INT_RX | INT_EXT); | 659 | wrl(mp, INT_MASK(mp->port_num), INT_TX_END | INT_RX | INT_EXT); |
| 656 | } | 660 | } |
| 657 | 661 | ||
| @@ -1796,6 +1800,7 @@ static irqreturn_t mv643xx_eth_irq(int irq, void *dev_id) | |||
| 1796 | */ | 1800 | */ |
| 1797 | #ifdef MV643XX_ETH_NAPI | 1801 | #ifdef MV643XX_ETH_NAPI |
| 1798 | if (int_cause & INT_RX) { | 1802 | if (int_cause & INT_RX) { |
| 1803 | wrl(mp, INT_CAUSE(mp->port_num), ~(int_cause & INT_RX)); | ||
| 1799 | wrl(mp, INT_MASK(mp->port_num), 0x00000000); | 1804 | wrl(mp, INT_MASK(mp->port_num), 0x00000000); |
| 1800 | rdl(mp, INT_MASK(mp->port_num)); | 1805 | rdl(mp, INT_MASK(mp->port_num)); |
| 1801 | 1806 | ||
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c index f1de38f8b742..d6524db321af 100644 --- a/drivers/net/myri10ge/myri10ge.c +++ b/drivers/net/myri10ge/myri10ge.c | |||
| @@ -56,7 +56,6 @@ | |||
| 56 | #include <linux/ethtool.h> | 56 | #include <linux/ethtool.h> |
| 57 | #include <linux/firmware.h> | 57 | #include <linux/firmware.h> |
| 58 | #include <linux/delay.h> | 58 | #include <linux/delay.h> |
| 59 | #include <linux/version.h> | ||
| 60 | #include <linux/timer.h> | 59 | #include <linux/timer.h> |
| 61 | #include <linux/vmalloc.h> | 60 | #include <linux/vmalloc.h> |
| 62 | #include <linux/crc32.h> | 61 | #include <linux/crc32.h> |
| @@ -76,7 +75,7 @@ | |||
| 76 | #include "myri10ge_mcp.h" | 75 | #include "myri10ge_mcp.h" |
| 77 | #include "myri10ge_mcp_gen_header.h" | 76 | #include "myri10ge_mcp_gen_header.h" |
| 78 | 77 | ||
| 79 | #define MYRI10GE_VERSION_STR "1.3.99-1.347" | 78 | #define MYRI10GE_VERSION_STR "1.4.3-1.358" |
| 80 | 79 | ||
| 81 | MODULE_DESCRIPTION("Myricom 10G driver (10GbE)"); | 80 | MODULE_DESCRIPTION("Myricom 10G driver (10GbE)"); |
| 82 | MODULE_AUTHOR("Maintainer: help@myri.com"); | 81 | MODULE_AUTHOR("Maintainer: help@myri.com"); |
| @@ -3548,7 +3547,11 @@ static void myri10ge_probe_slices(struct myri10ge_priv *mgp) | |||
| 3548 | 3547 | ||
| 3549 | /* try to load the slice aware rss firmware */ | 3548 | /* try to load the slice aware rss firmware */ |
| 3550 | old_fw = mgp->fw_name; | 3549 | old_fw = mgp->fw_name; |
| 3551 | if (old_fw == myri10ge_fw_aligned) | 3550 | if (myri10ge_fw_name != NULL) { |
| 3551 | dev_info(&mgp->pdev->dev, "overriding rss firmware to %s\n", | ||
| 3552 | myri10ge_fw_name); | ||
| 3553 | mgp->fw_name = myri10ge_fw_name; | ||
| 3554 | } else if (old_fw == myri10ge_fw_aligned) | ||
| 3552 | mgp->fw_name = myri10ge_fw_rss_aligned; | 3555 | mgp->fw_name = myri10ge_fw_rss_aligned; |
| 3553 | else | 3556 | else |
| 3554 | mgp->fw_name = myri10ge_fw_rss_unaligned; | 3557 | mgp->fw_name = myri10ge_fw_rss_unaligned; |
diff --git a/drivers/net/ne.c b/drivers/net/ne.c index 42443d697423..fa3ceca4e15c 100644 --- a/drivers/net/ne.c +++ b/drivers/net/ne.c | |||
| @@ -118,7 +118,7 @@ bad_clone_list[] __initdata = { | |||
| 118 | {"E-LAN100", "E-LAN200", {0x00, 0x00, 0x5d}}, /* Broken ne1000 clones */ | 118 | {"E-LAN100", "E-LAN200", {0x00, 0x00, 0x5d}}, /* Broken ne1000 clones */ |
| 119 | {"PCM-4823", "PCM-4823", {0x00, 0xc0, 0x6c}}, /* Broken Advantech MoBo */ | 119 | {"PCM-4823", "PCM-4823", {0x00, 0xc0, 0x6c}}, /* Broken Advantech MoBo */ |
| 120 | {"REALTEK", "RTL8019", {0x00, 0x00, 0xe8}}, /* no-name with Realtek chip */ | 120 | {"REALTEK", "RTL8019", {0x00, 0x00, 0xe8}}, /* no-name with Realtek chip */ |
| 121 | #if defined(CONFIG_TOSHIBA_RBTX4927) || defined(CONFIG_TOSHIBA_RBTX4938) | 121 | #ifdef CONFIG_MACH_TX49XX |
| 122 | {"RBHMA4X00-RTL8019", "RBHMA4X00/RTL8019", {0x00, 0x60, 0x0a}}, /* Toshiba built-in */ | 122 | {"RBHMA4X00-RTL8019", "RBHMA4X00/RTL8019", {0x00, 0x60, 0x0a}}, /* Toshiba built-in */ |
| 123 | #endif | 123 | #endif |
| 124 | {"LCS-8834", "LCS-8836", {0x04, 0x04, 0x37}}, /* ShinyNet (SET) */ | 124 | {"LCS-8834", "LCS-8836", {0x04, 0x04, 0x37}}, /* ShinyNet (SET) */ |
| @@ -142,7 +142,7 @@ bad_clone_list[] __initdata = { | |||
| 142 | #if defined(CONFIG_PLAT_MAPPI) | 142 | #if defined(CONFIG_PLAT_MAPPI) |
| 143 | # define DCR_VAL 0x4b | 143 | # define DCR_VAL 0x4b |
| 144 | #elif defined(CONFIG_PLAT_OAKS32R) || \ | 144 | #elif defined(CONFIG_PLAT_OAKS32R) || \ |
| 145 | defined(CONFIG_TOSHIBA_RBTX4927) || defined(CONFIG_TOSHIBA_RBTX4938) | 145 | defined(CONFIG_MACH_TX49XX) |
| 146 | # define DCR_VAL 0x48 /* 8-bit mode */ | 146 | # define DCR_VAL 0x48 /* 8-bit mode */ |
| 147 | #else | 147 | #else |
| 148 | # define DCR_VAL 0x49 | 148 | # define DCR_VAL 0x49 |
diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/netxen/netxen_nic.h index 93a7b9b668d5..244ab49c4337 100644 --- a/drivers/net/netxen/netxen_nic.h +++ b/drivers/net/netxen/netxen_nic.h | |||
| @@ -45,7 +45,6 @@ | |||
| 45 | #include <linux/in.h> | 45 | #include <linux/in.h> |
| 46 | #include <linux/tcp.h> | 46 | #include <linux/tcp.h> |
| 47 | #include <linux/skbuff.h> | 47 | #include <linux/skbuff.h> |
| 48 | #include <linux/version.h> | ||
| 49 | 48 | ||
| 50 | #include <linux/ethtool.h> | 49 | #include <linux/ethtool.h> |
| 51 | #include <linux/mii.h> | 50 | #include <linux/mii.h> |
| @@ -66,8 +65,8 @@ | |||
| 66 | 65 | ||
| 67 | #define _NETXEN_NIC_LINUX_MAJOR 4 | 66 | #define _NETXEN_NIC_LINUX_MAJOR 4 |
| 68 | #define _NETXEN_NIC_LINUX_MINOR 0 | 67 | #define _NETXEN_NIC_LINUX_MINOR 0 |
| 69 | #define _NETXEN_NIC_LINUX_SUBVERSION 0 | 68 | #define _NETXEN_NIC_LINUX_SUBVERSION 11 |
| 70 | #define NETXEN_NIC_LINUX_VERSIONID "4.0.0" | 69 | #define NETXEN_NIC_LINUX_VERSIONID "4.0.11" |
| 71 | 70 | ||
| 72 | #define NETXEN_VERSION_CODE(a, b, c) (((a) << 16) + ((b) << 8) + (c)) | 71 | #define NETXEN_VERSION_CODE(a, b, c) (((a) << 16) + ((b) << 8) + (c)) |
| 73 | 72 | ||
| @@ -1615,7 +1614,8 @@ dma_watchdog_wakeup(struct netxen_adapter *adapter) | |||
| 1615 | 1614 | ||
| 1616 | 1615 | ||
| 1617 | int netxen_is_flash_supported(struct netxen_adapter *adapter); | 1616 | int netxen_is_flash_supported(struct netxen_adapter *adapter); |
| 1618 | int netxen_get_flash_mac_addr(struct netxen_adapter *adapter, __le64 mac[]); | 1617 | int netxen_get_flash_mac_addr(struct netxen_adapter *adapter, __le64 *mac); |
| 1618 | int netxen_p3_get_mac_addr(struct netxen_adapter *adapter, __le64 *mac); | ||
| 1619 | extern void netxen_change_ringparam(struct netxen_adapter *adapter); | 1619 | extern void netxen_change_ringparam(struct netxen_adapter *adapter); |
| 1620 | extern int netxen_rom_fast_read(struct netxen_adapter *adapter, int addr, | 1620 | extern int netxen_rom_fast_read(struct netxen_adapter *adapter, int addr, |
| 1621 | int *valp); | 1621 | int *valp); |
diff --git a/drivers/net/netxen/netxen_nic_ethtool.c b/drivers/net/netxen/netxen_nic_ethtool.c index 4ad3e0844b99..b974ca0fc530 100644 --- a/drivers/net/netxen/netxen_nic_ethtool.c +++ b/drivers/net/netxen/netxen_nic_ethtool.c | |||
| @@ -38,7 +38,6 @@ | |||
| 38 | #include <asm/io.h> | 38 | #include <asm/io.h> |
| 39 | #include <linux/netdevice.h> | 39 | #include <linux/netdevice.h> |
| 40 | #include <linux/ethtool.h> | 40 | #include <linux/ethtool.h> |
| 41 | #include <linux/version.h> | ||
| 42 | 41 | ||
| 43 | #include "netxen_nic.h" | 42 | #include "netxen_nic.h" |
| 44 | #include "netxen_nic_hw.h" | 43 | #include "netxen_nic_hw.h" |
diff --git a/drivers/net/netxen/netxen_nic_hdr.h b/drivers/net/netxen/netxen_nic_hdr.h index e8e8d73f6ed7..e80f9e3e5973 100644 --- a/drivers/net/netxen/netxen_nic_hdr.h +++ b/drivers/net/netxen/netxen_nic_hdr.h | |||
| @@ -32,8 +32,6 @@ | |||
| 32 | 32 | ||
| 33 | #include <linux/module.h> | 33 | #include <linux/module.h> |
| 34 | #include <linux/kernel.h> | 34 | #include <linux/kernel.h> |
| 35 | #include <linux/version.h> | ||
| 36 | |||
| 37 | #include <linux/spinlock.h> | 35 | #include <linux/spinlock.h> |
| 38 | #include <asm/irq.h> | 36 | #include <asm/irq.h> |
| 39 | #include <linux/init.h> | 37 | #include <linux/init.h> |
diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c index 9aa20f961618..84978f80f396 100644 --- a/drivers/net/netxen/netxen_nic_hw.c +++ b/drivers/net/netxen/netxen_nic_hw.c | |||
| @@ -733,31 +733,56 @@ static int netxen_get_flash_block(struct netxen_adapter *adapter, int base, | |||
| 733 | return 0; | 733 | return 0; |
| 734 | } | 734 | } |
| 735 | 735 | ||
| 736 | int netxen_get_flash_mac_addr(struct netxen_adapter *adapter, __le64 mac[]) | 736 | int netxen_get_flash_mac_addr(struct netxen_adapter *adapter, __le64 *mac) |
| 737 | { | 737 | { |
| 738 | __le32 *pmac = (__le32 *) & mac[0]; | 738 | __le32 *pmac = (__le32 *) mac; |
| 739 | u32 offset; | ||
| 739 | 740 | ||
| 740 | if (netxen_get_flash_block(adapter, | 741 | offset = NETXEN_USER_START + |
| 741 | NETXEN_USER_START + | 742 | offsetof(struct netxen_new_user_info, mac_addr) + |
| 742 | offsetof(struct netxen_new_user_info, | 743 | adapter->portnum * sizeof(u64); |
| 743 | mac_addr), | 744 | |
| 744 | FLASH_NUM_PORTS * sizeof(u64), pmac) == -1) { | 745 | if (netxen_get_flash_block(adapter, offset, sizeof(u64), pmac) == -1) |
| 745 | return -1; | 746 | return -1; |
| 746 | } | 747 | |
| 747 | if (*mac == cpu_to_le64(~0ULL)) { | 748 | if (*mac == cpu_to_le64(~0ULL)) { |
| 749 | |||
| 750 | offset = NETXEN_USER_START_OLD + | ||
| 751 | offsetof(struct netxen_user_old_info, mac_addr) + | ||
| 752 | adapter->portnum * sizeof(u64); | ||
| 753 | |||
| 748 | if (netxen_get_flash_block(adapter, | 754 | if (netxen_get_flash_block(adapter, |
| 749 | NETXEN_USER_START_OLD + | 755 | offset, sizeof(u64), pmac) == -1) |
| 750 | offsetof(struct netxen_user_old_info, | ||
| 751 | mac_addr), | ||
| 752 | FLASH_NUM_PORTS * sizeof(u64), | ||
| 753 | pmac) == -1) | ||
| 754 | return -1; | 756 | return -1; |
| 757 | |||
| 755 | if (*mac == cpu_to_le64(~0ULL)) | 758 | if (*mac == cpu_to_le64(~0ULL)) |
| 756 | return -1; | 759 | return -1; |
| 757 | } | 760 | } |
| 758 | return 0; | 761 | return 0; |
| 759 | } | 762 | } |
| 760 | 763 | ||
| 764 | int netxen_p3_get_mac_addr(struct netxen_adapter *adapter, __le64 *mac) | ||
| 765 | { | ||
| 766 | uint32_t crbaddr, mac_hi, mac_lo; | ||
| 767 | int pci_func = adapter->ahw.pci_func; | ||
| 768 | |||
| 769 | crbaddr = CRB_MAC_BLOCK_START + | ||
| 770 | (4 * ((pci_func/2) * 3)) + (4 * (pci_func & 1)); | ||
| 771 | |||
| 772 | adapter->hw_read_wx(adapter, crbaddr, &mac_lo, 4); | ||
| 773 | adapter->hw_read_wx(adapter, crbaddr+4, &mac_hi, 4); | ||
| 774 | |||
| 775 | mac_hi = cpu_to_le32(mac_hi); | ||
| 776 | mac_lo = cpu_to_le32(mac_lo); | ||
| 777 | |||
| 778 | if (pci_func & 1) | ||
| 779 | *mac = ((mac_lo >> 16) | ((u64)mac_hi << 16)); | ||
| 780 | else | ||
| 781 | *mac = ((mac_lo) | ((u64)mac_hi << 32)); | ||
| 782 | |||
| 783 | return 0; | ||
| 784 | } | ||
| 785 | |||
| 761 | #define CRB_WIN_LOCK_TIMEOUT 100000000 | 786 | #define CRB_WIN_LOCK_TIMEOUT 100000000 |
| 762 | 787 | ||
| 763 | static int crb_win_lock(struct netxen_adapter *adapter) | 788 | static int crb_win_lock(struct netxen_adapter *adapter) |
| @@ -2183,10 +2208,10 @@ void netxen_nic_flash_print(struct netxen_adapter *adapter) | |||
| 2183 | if (adapter->portnum == 0) { | 2208 | if (adapter->portnum == 0) { |
| 2184 | get_brd_name_by_type(board_info->board_type, brd_name); | 2209 | get_brd_name_by_type(board_info->board_type, brd_name); |
| 2185 | 2210 | ||
| 2186 | printk("NetXen %s Board S/N %s Chip id 0x%x\n", | 2211 | printk(KERN_INFO "NetXen %s Board S/N %s Chip rev 0x%x\n", |
| 2187 | brd_name, serial_num, board_info->chip_id); | 2212 | brd_name, serial_num, adapter->ahw.revision_id); |
| 2188 | printk("NetXen Firmware version %d.%d.%d\n", fw_major, | 2213 | printk(KERN_INFO "NetXen Firmware version %d.%d.%d\n", |
| 2189 | fw_minor, fw_build); | 2214 | fw_major, fw_minor, fw_build); |
| 2190 | } | 2215 | } |
| 2191 | 2216 | ||
| 2192 | if (NETXEN_VERSION_CODE(fw_major, fw_minor, fw_build) < | 2217 | if (NETXEN_VERSION_CODE(fw_major, fw_minor, fw_build) < |
diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c index 519fc860e17e..5bba675d0504 100644 --- a/drivers/net/netxen/netxen_nic_init.c +++ b/drivers/net/netxen/netxen_nic_init.c | |||
| @@ -1079,10 +1079,12 @@ int netxen_initialize_adapter_offload(struct netxen_adapter *adapter) | |||
| 1079 | 1079 | ||
| 1080 | void netxen_free_adapter_offload(struct netxen_adapter *adapter) | 1080 | void netxen_free_adapter_offload(struct netxen_adapter *adapter) |
| 1081 | { | 1081 | { |
| 1082 | int i; | 1082 | int i = 100; |
| 1083 | |||
| 1084 | if (!adapter->dummy_dma.addr) | ||
| 1085 | return; | ||
| 1083 | 1086 | ||
| 1084 | if (adapter->dummy_dma.addr) { | 1087 | if (NX_IS_REVISION_P2(adapter->ahw.revision_id)) { |
| 1085 | i = 100; | ||
| 1086 | do { | 1088 | do { |
| 1087 | if (dma_watchdog_shutdown_request(adapter) == 1) | 1089 | if (dma_watchdog_shutdown_request(adapter) == 1) |
| 1088 | break; | 1090 | break; |
| @@ -1090,17 +1092,17 @@ void netxen_free_adapter_offload(struct netxen_adapter *adapter) | |||
| 1090 | if (dma_watchdog_shutdown_poll_result(adapter) == 1) | 1092 | if (dma_watchdog_shutdown_poll_result(adapter) == 1) |
| 1091 | break; | 1093 | break; |
| 1092 | } while (--i); | 1094 | } while (--i); |
| 1095 | } | ||
| 1093 | 1096 | ||
| 1094 | if (i) { | 1097 | if (i) { |
| 1095 | pci_free_consistent(adapter->pdev, | 1098 | pci_free_consistent(adapter->pdev, |
| 1096 | NETXEN_HOST_DUMMY_DMA_SIZE, | 1099 | NETXEN_HOST_DUMMY_DMA_SIZE, |
| 1097 | adapter->dummy_dma.addr, | 1100 | adapter->dummy_dma.addr, |
| 1098 | adapter->dummy_dma.phys_addr); | 1101 | adapter->dummy_dma.phys_addr); |
| 1099 | adapter->dummy_dma.addr = NULL; | 1102 | adapter->dummy_dma.addr = NULL; |
| 1100 | } else { | 1103 | } else { |
| 1101 | printk(KERN_ERR "%s: dma_watchdog_shutdown failed\n", | 1104 | printk(KERN_ERR "%s: dma_watchdog_shutdown failed\n", |
| 1102 | adapter->netdev->name); | 1105 | adapter->netdev->name); |
| 1103 | } | ||
| 1104 | } | 1106 | } |
| 1105 | } | 1107 | } |
| 1106 | 1108 | ||
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index 7615c715e66e..008fd6618a5f 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c | |||
| @@ -149,76 +149,18 @@ static uint32_t msi_tgt_status[8] = { | |||
| 149 | 149 | ||
| 150 | static struct netxen_legacy_intr_set legacy_intr[] = NX_LEGACY_INTR_CONFIG; | 150 | static struct netxen_legacy_intr_set legacy_intr[] = NX_LEGACY_INTR_CONFIG; |
| 151 | 151 | ||
| 152 | static void netxen_nic_disable_int(struct netxen_adapter *adapter) | 152 | static inline void netxen_nic_disable_int(struct netxen_adapter *adapter) |
| 153 | { | 153 | { |
| 154 | u32 mask = 0x7ff; | 154 | adapter->pci_write_normalize(adapter, adapter->crb_intr_mask, 0); |
| 155 | int retries = 32; | ||
| 156 | int pci_fn = adapter->ahw.pci_func; | ||
| 157 | |||
| 158 | if (adapter->msi_mode != MSI_MODE_MULTIFUNC) | ||
| 159 | adapter->pci_write_normalize(adapter, | ||
| 160 | adapter->crb_intr_mask, 0); | ||
| 161 | |||
| 162 | if (adapter->intr_scheme != -1 && | ||
| 163 | adapter->intr_scheme != INTR_SCHEME_PERPORT) | ||
| 164 | adapter->pci_write_immediate(adapter, ISR_INT_MASK, mask); | ||
| 165 | |||
| 166 | if (!NETXEN_IS_MSI_FAMILY(adapter)) { | ||
| 167 | do { | ||
| 168 | adapter->pci_write_immediate(adapter, | ||
| 169 | adapter->legacy_intr.tgt_status_reg, | ||
| 170 | 0xffffffff); | ||
| 171 | mask = adapter->pci_read_immediate(adapter, | ||
| 172 | ISR_INT_VECTOR); | ||
| 173 | if (!(mask & 0x80)) | ||
| 174 | break; | ||
| 175 | udelay(10); | ||
| 176 | } while (--retries); | ||
| 177 | |||
| 178 | if (!retries) { | ||
| 179 | printk(KERN_NOTICE "%s: Failed to disable interrupt\n", | ||
| 180 | netxen_nic_driver_name); | ||
| 181 | } | ||
| 182 | } else { | ||
| 183 | if (adapter->msi_mode == MSI_MODE_MULTIFUNC) { | ||
| 184 | adapter->pci_write_immediate(adapter, | ||
| 185 | msi_tgt_status[pci_fn], 0xffffffff); | ||
| 186 | } | ||
| 187 | } | ||
| 188 | } | 155 | } |
| 189 | 156 | ||
| 190 | static void netxen_nic_enable_int(struct netxen_adapter *adapter) | 157 | static inline void netxen_nic_enable_int(struct netxen_adapter *adapter) |
| 191 | { | 158 | { |
| 192 | u32 mask; | ||
| 193 | |||
| 194 | if (adapter->intr_scheme != -1 && | ||
| 195 | adapter->intr_scheme != INTR_SCHEME_PERPORT) { | ||
| 196 | switch (adapter->ahw.board_type) { | ||
| 197 | case NETXEN_NIC_GBE: | ||
| 198 | mask = 0x77b; | ||
| 199 | break; | ||
| 200 | case NETXEN_NIC_XGBE: | ||
| 201 | mask = 0x77f; | ||
| 202 | break; | ||
| 203 | default: | ||
| 204 | mask = 0x7ff; | ||
| 205 | break; | ||
| 206 | } | ||
| 207 | |||
| 208 | adapter->pci_write_immediate(adapter, ISR_INT_MASK, mask); | ||
| 209 | } | ||
| 210 | |||
| 211 | adapter->pci_write_normalize(adapter, adapter->crb_intr_mask, 0x1); | 159 | adapter->pci_write_normalize(adapter, adapter->crb_intr_mask, 0x1); |
| 212 | 160 | ||
| 213 | if (!NETXEN_IS_MSI_FAMILY(adapter)) { | 161 | if (!NETXEN_IS_MSI_FAMILY(adapter)) |
| 214 | mask = 0xbff; | 162 | adapter->pci_write_immediate(adapter, |
| 215 | if (adapter->intr_scheme == INTR_SCHEME_PERPORT) | 163 | adapter->legacy_intr.tgt_mask_reg, 0xfbff); |
| 216 | adapter->pci_write_immediate(adapter, | ||
| 217 | adapter->legacy_intr.tgt_mask_reg, mask); | ||
| 218 | else | ||
| 219 | adapter->pci_write_normalize(adapter, | ||
| 220 | CRB_INT_VECTOR, 0); | ||
| 221 | } | ||
| 222 | } | 164 | } |
| 223 | 165 | ||
| 224 | static int nx_set_dma_mask(struct netxen_adapter *adapter, uint8_t revision_id) | 166 | static int nx_set_dma_mask(struct netxen_adapter *adapter, uint8_t revision_id) |
| @@ -417,16 +359,6 @@ static void netxen_pcie_strap_init(struct netxen_adapter *adapter) | |||
| 417 | int i, pos; | 359 | int i, pos; |
| 418 | struct pci_dev *pdev; | 360 | struct pci_dev *pdev; |
| 419 | 361 | ||
| 420 | pdev = pci_get_device(0x1166, 0x0140, NULL); | ||
| 421 | if (pdev) { | ||
| 422 | pci_dev_put(pdev); | ||
| 423 | adapter->hw_read_wx(adapter, | ||
| 424 | NETXEN_PCIE_REG(PCIE_TGT_SPLIT_CHICKEN), &chicken, 4); | ||
| 425 | chicken |= 0x4000; | ||
| 426 | adapter->hw_write_wx(adapter, | ||
| 427 | NETXEN_PCIE_REG(PCIE_TGT_SPLIT_CHICKEN), &chicken, 4); | ||
| 428 | } | ||
| 429 | |||
| 430 | pdev = adapter->pdev; | 362 | pdev = adapter->pdev; |
| 431 | 363 | ||
| 432 | adapter->hw_read_wx(adapter, | 364 | adapter->hw_read_wx(adapter, |
| @@ -501,6 +433,44 @@ static void netxen_init_msix_entries(struct netxen_adapter *adapter) | |||
| 501 | adapter->msix_entries[i].entry = i; | 433 | adapter->msix_entries[i].entry = i; |
| 502 | } | 434 | } |
| 503 | 435 | ||
| 436 | static int | ||
| 437 | netxen_read_mac_addr(struct netxen_adapter *adapter) | ||
| 438 | { | ||
| 439 | int i; | ||
| 440 | unsigned char *p; | ||
| 441 | __le64 mac_addr; | ||
| 442 | DECLARE_MAC_BUF(mac); | ||
| 443 | struct net_device *netdev = adapter->netdev; | ||
| 444 | struct pci_dev *pdev = adapter->pdev; | ||
| 445 | |||
| 446 | if (netxen_is_flash_supported(adapter) != 0) | ||
| 447 | return -EIO; | ||
| 448 | |||
| 449 | if (NX_IS_REVISION_P3(adapter->ahw.revision_id)) { | ||
| 450 | if (netxen_p3_get_mac_addr(adapter, &mac_addr) != 0) | ||
| 451 | return -EIO; | ||
| 452 | } else { | ||
| 453 | if (netxen_get_flash_mac_addr(adapter, &mac_addr) != 0) | ||
| 454 | return -EIO; | ||
| 455 | } | ||
| 456 | |||
| 457 | p = (unsigned char *)&mac_addr; | ||
| 458 | for (i = 0; i < 6; i++) | ||
| 459 | netdev->dev_addr[i] = *(p + 5 - i); | ||
| 460 | |||
| 461 | memcpy(netdev->perm_addr, netdev->dev_addr, netdev->addr_len); | ||
| 462 | |||
| 463 | /* set station address */ | ||
| 464 | |||
| 465 | if (!is_valid_ether_addr(netdev->perm_addr)) { | ||
| 466 | dev_warn(&pdev->dev, "Bad MAC address %s.\n", | ||
| 467 | print_mac(mac, netdev->dev_addr)); | ||
| 468 | } else | ||
| 469 | adapter->macaddr_set(adapter, netdev->dev_addr); | ||
| 470 | |||
| 471 | return 0; | ||
| 472 | } | ||
| 473 | |||
| 504 | /* | 474 | /* |
| 505 | * netxen_nic_probe() | 475 | * netxen_nic_probe() |
| 506 | * | 476 | * |
| @@ -529,10 +499,8 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 529 | unsigned long mem_base, mem_len, db_base, db_len, pci_len0 = 0; | 499 | unsigned long mem_base, mem_len, db_base, db_len, pci_len0 = 0; |
| 530 | int i = 0, err; | 500 | int i = 0, err; |
| 531 | int first_driver, first_boot; | 501 | int first_driver, first_boot; |
| 532 | __le64 mac_addr[FLASH_NUM_PORTS + 1]; | ||
| 533 | u32 val; | 502 | u32 val; |
| 534 | int pci_func_id = PCI_FUNC(pdev->devfn); | 503 | int pci_func_id = PCI_FUNC(pdev->devfn); |
| 535 | DECLARE_MAC_BUF(mac); | ||
| 536 | struct netxen_legacy_intr_set *legacy_intrp; | 504 | struct netxen_legacy_intr_set *legacy_intrp; |
| 537 | uint8_t revision_id; | 505 | uint8_t revision_id; |
| 538 | 506 | ||
| @@ -545,6 +513,13 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 545 | return -ENODEV; | 513 | return -ENODEV; |
| 546 | } | 514 | } |
| 547 | 515 | ||
| 516 | if (pdev->revision >= NX_P3_A0 && pdev->revision < NX_P3_B1) { | ||
| 517 | printk(KERN_WARNING "NetXen chip revisions between 0x%x-0x%x" | ||
| 518 | "will not be enabled.\n", | ||
| 519 | NX_P3_A0, NX_P3_B1); | ||
| 520 | return -ENODEV; | ||
| 521 | } | ||
| 522 | |||
| 548 | if ((err = pci_enable_device(pdev))) | 523 | if ((err = pci_enable_device(pdev))) |
| 549 | return err; | 524 | return err; |
| 550 | 525 | ||
| @@ -898,34 +873,14 @@ request_msi: | |||
| 898 | goto err_out_disable_msi; | 873 | goto err_out_disable_msi; |
| 899 | 874 | ||
| 900 | init_timer(&adapter->watchdog_timer); | 875 | init_timer(&adapter->watchdog_timer); |
| 901 | adapter->ahw.linkup = 0; | ||
| 902 | adapter->watchdog_timer.function = &netxen_watchdog; | 876 | adapter->watchdog_timer.function = &netxen_watchdog; |
| 903 | adapter->watchdog_timer.data = (unsigned long)adapter; | 877 | adapter->watchdog_timer.data = (unsigned long)adapter; |
| 904 | INIT_WORK(&adapter->watchdog_task, netxen_watchdog_task); | 878 | INIT_WORK(&adapter->watchdog_task, netxen_watchdog_task); |
| 905 | INIT_WORK(&adapter->tx_timeout_task, netxen_tx_timeout_task); | 879 | INIT_WORK(&adapter->tx_timeout_task, netxen_tx_timeout_task); |
| 906 | 880 | ||
| 907 | if (netxen_is_flash_supported(adapter) == 0 && | 881 | err = netxen_read_mac_addr(adapter); |
| 908 | netxen_get_flash_mac_addr(adapter, mac_addr) == 0) { | 882 | if (err) |
| 909 | unsigned char *p; | 883 | dev_warn(&pdev->dev, "failed to read mac addr\n"); |
| 910 | |||
| 911 | p = (unsigned char *)&mac_addr[adapter->portnum]; | ||
| 912 | netdev->dev_addr[0] = *(p + 5); | ||
| 913 | netdev->dev_addr[1] = *(p + 4); | ||
| 914 | netdev->dev_addr[2] = *(p + 3); | ||
| 915 | netdev->dev_addr[3] = *(p + 2); | ||
| 916 | netdev->dev_addr[4] = *(p + 1); | ||
| 917 | netdev->dev_addr[5] = *(p + 0); | ||
| 918 | |||
| 919 | memcpy(netdev->perm_addr, netdev->dev_addr, | ||
| 920 | netdev->addr_len); | ||
| 921 | if (!is_valid_ether_addr(netdev->perm_addr)) { | ||
| 922 | printk(KERN_ERR "%s: Bad MAC address %s.\n", | ||
| 923 | netxen_nic_driver_name, | ||
| 924 | print_mac(mac, netdev->dev_addr)); | ||
| 925 | } else { | ||
| 926 | adapter->macaddr_set(adapter, netdev->dev_addr); | ||
| 927 | } | ||
| 928 | } | ||
| 929 | 884 | ||
| 930 | netif_carrier_off(netdev); | 885 | netif_carrier_off(netdev); |
| 931 | netif_stop_queue(netdev); | 886 | netif_stop_queue(netdev); |
| @@ -1000,6 +955,7 @@ static void __devexit netxen_nic_remove(struct pci_dev *pdev) | |||
| 1000 | 955 | ||
| 1001 | if (adapter->is_up == NETXEN_ADAPTER_UP_MAGIC) { | 956 | if (adapter->is_up == NETXEN_ADAPTER_UP_MAGIC) { |
| 1002 | netxen_free_hw_resources(adapter); | 957 | netxen_free_hw_resources(adapter); |
| 958 | netxen_release_rx_buffers(adapter); | ||
| 1003 | netxen_free_sw_resources(adapter); | 959 | netxen_free_sw_resources(adapter); |
| 1004 | } | 960 | } |
| 1005 | 961 | ||
| @@ -1069,6 +1025,15 @@ static int netxen_nic_open(struct net_device *netdev) | |||
| 1069 | goto err_out_free_sw; | 1025 | goto err_out_free_sw; |
| 1070 | } | 1026 | } |
| 1071 | 1027 | ||
| 1028 | if ((adapter->msi_mode != MSI_MODE_MULTIFUNC) || | ||
| 1029 | (adapter->intr_scheme != INTR_SCHEME_PERPORT)) { | ||
| 1030 | printk(KERN_ERR "%s: Firmware interrupt scheme is " | ||
| 1031 | "incompatible with driver\n", | ||
| 1032 | netdev->name); | ||
| 1033 | adapter->driver_mismatch = 1; | ||
| 1034 | goto err_out_free_hw; | ||
| 1035 | } | ||
| 1036 | |||
| 1072 | if (adapter->fw_major < 4) { | 1037 | if (adapter->fw_major < 4) { |
| 1073 | adapter->crb_addr_cmd_producer = | 1038 | adapter->crb_addr_cmd_producer = |
| 1074 | crb_cmd_producer[adapter->portnum]; | 1039 | crb_cmd_producer[adapter->portnum]; |
| @@ -1094,7 +1059,7 @@ static int netxen_nic_open(struct net_device *netdev) | |||
| 1094 | flags, netdev->name, adapter); | 1059 | flags, netdev->name, adapter); |
| 1095 | if (err) { | 1060 | if (err) { |
| 1096 | printk(KERN_ERR "request_irq failed with: %d\n", err); | 1061 | printk(KERN_ERR "request_irq failed with: %d\n", err); |
| 1097 | goto err_out_free_hw; | 1062 | goto err_out_free_rxbuf; |
| 1098 | } | 1063 | } |
| 1099 | 1064 | ||
| 1100 | adapter->is_up = NETXEN_ADAPTER_UP_MAGIC; | 1065 | adapter->is_up = NETXEN_ADAPTER_UP_MAGIC; |
| @@ -1116,6 +1081,7 @@ static int netxen_nic_open(struct net_device *netdev) | |||
| 1116 | if (adapter->set_mtu) | 1081 | if (adapter->set_mtu) |
| 1117 | adapter->set_mtu(adapter, netdev->mtu); | 1082 | adapter->set_mtu(adapter, netdev->mtu); |
| 1118 | 1083 | ||
| 1084 | adapter->ahw.linkup = 0; | ||
| 1119 | mod_timer(&adapter->watchdog_timer, jiffies); | 1085 | mod_timer(&adapter->watchdog_timer, jiffies); |
| 1120 | 1086 | ||
| 1121 | napi_enable(&adapter->napi); | 1087 | napi_enable(&adapter->napi); |
| @@ -1127,6 +1093,8 @@ static int netxen_nic_open(struct net_device *netdev) | |||
| 1127 | 1093 | ||
| 1128 | err_out_free_irq: | 1094 | err_out_free_irq: |
| 1129 | free_irq(adapter->irq, adapter); | 1095 | free_irq(adapter->irq, adapter); |
| 1096 | err_out_free_rxbuf: | ||
| 1097 | netxen_release_rx_buffers(adapter); | ||
| 1130 | err_out_free_hw: | 1098 | err_out_free_hw: |
| 1131 | netxen_free_hw_resources(adapter); | 1099 | netxen_free_hw_resources(adapter); |
| 1132 | err_out_free_sw: | 1100 | err_out_free_sw: |
| @@ -1152,10 +1120,8 @@ static int netxen_nic_close(struct net_device *netdev) | |||
| 1152 | 1120 | ||
| 1153 | netxen_release_tx_buffers(adapter); | 1121 | netxen_release_tx_buffers(adapter); |
| 1154 | 1122 | ||
| 1155 | if (adapter->is_up == NETXEN_ADAPTER_UP_MAGIC) { | 1123 | FLUSH_SCHEDULED_WORK(); |
| 1156 | FLUSH_SCHEDULED_WORK(); | 1124 | del_timer_sync(&adapter->watchdog_timer); |
| 1157 | del_timer_sync(&adapter->watchdog_timer); | ||
| 1158 | } | ||
| 1159 | 1125 | ||
| 1160 | return 0; | 1126 | return 0; |
| 1161 | } | 1127 | } |
| @@ -1458,7 +1424,8 @@ void netxen_watchdog_task(struct work_struct *work) | |||
| 1458 | 1424 | ||
| 1459 | netxen_nic_handle_phy_intr(adapter); | 1425 | netxen_nic_handle_phy_intr(adapter); |
| 1460 | 1426 | ||
| 1461 | mod_timer(&adapter->watchdog_timer, jiffies + 2 * HZ); | 1427 | if (netif_running(adapter->netdev)) |
| 1428 | mod_timer(&adapter->watchdog_timer, jiffies + 2 * HZ); | ||
| 1462 | } | 1429 | } |
| 1463 | 1430 | ||
| 1464 | static void netxen_tx_timeout(struct net_device *netdev) | 1431 | static void netxen_tx_timeout(struct net_device *netdev) |
| @@ -1518,18 +1485,9 @@ struct net_device_stats *netxen_nic_get_stats(struct net_device *netdev) | |||
| 1518 | return stats; | 1485 | return stats; |
| 1519 | } | 1486 | } |
| 1520 | 1487 | ||
| 1521 | static inline void | ||
| 1522 | netxen_handle_int(struct netxen_adapter *adapter) | ||
| 1523 | { | ||
| 1524 | netxen_nic_disable_int(adapter); | ||
| 1525 | napi_schedule(&adapter->napi); | ||
| 1526 | } | ||
| 1527 | |||
| 1528 | static irqreturn_t netxen_intr(int irq, void *data) | 1488 | static irqreturn_t netxen_intr(int irq, void *data) |
| 1529 | { | 1489 | { |
| 1530 | struct netxen_adapter *adapter = data; | 1490 | struct netxen_adapter *adapter = data; |
| 1531 | u32 our_int = 0; | ||
| 1532 | |||
| 1533 | u32 status = 0; | 1491 | u32 status = 0; |
| 1534 | 1492 | ||
| 1535 | status = adapter->pci_read_immediate(adapter, ISR_INT_VECTOR); | 1493 | status = adapter->pci_read_immediate(adapter, ISR_INT_VECTOR); |
| @@ -1544,22 +1502,32 @@ static irqreturn_t netxen_intr(int irq, void *data) | |||
| 1544 | if (!ISR_LEGACY_INT_TRIGGERED(status)) | 1502 | if (!ISR_LEGACY_INT_TRIGGERED(status)) |
| 1545 | return IRQ_NONE; | 1503 | return IRQ_NONE; |
| 1546 | 1504 | ||
| 1547 | } else if (NX_IS_REVISION_P2(adapter->ahw.revision_id)) { | 1505 | } else { |
| 1506 | unsigned long our_int = 0; | ||
| 1548 | 1507 | ||
| 1549 | our_int = adapter->pci_read_normalize(adapter, CRB_INT_VECTOR); | 1508 | our_int = adapter->pci_read_normalize(adapter, CRB_INT_VECTOR); |
| 1509 | |||
| 1550 | /* not our interrupt */ | 1510 | /* not our interrupt */ |
| 1551 | if ((our_int & (0x80 << adapter->portnum)) == 0) | 1511 | if (!test_and_clear_bit((7 + adapter->portnum), &our_int)) |
| 1552 | return IRQ_NONE; | 1512 | return IRQ_NONE; |
| 1553 | 1513 | ||
| 1554 | if (adapter->intr_scheme == INTR_SCHEME_PERPORT) { | 1514 | /* claim interrupt */ |
| 1555 | /* claim interrupt */ | 1515 | adapter->pci_write_normalize(adapter, |
| 1556 | adapter->pci_write_normalize(adapter, | 1516 | CRB_INT_VECTOR, (our_int & 0xffffffff)); |
| 1557 | CRB_INT_VECTOR, | ||
| 1558 | our_int & ~((u32)(0x80 << adapter->portnum))); | ||
| 1559 | } | ||
| 1560 | } | 1517 | } |
| 1561 | 1518 | ||
| 1562 | netxen_handle_int(adapter); | 1519 | /* clear interrupt */ |
| 1520 | if (adapter->fw_major < 4) | ||
| 1521 | netxen_nic_disable_int(adapter); | ||
| 1522 | |||
| 1523 | adapter->pci_write_immediate(adapter, | ||
| 1524 | adapter->legacy_intr.tgt_status_reg, | ||
| 1525 | 0xffffffff); | ||
| 1526 | /* read twice to ensure write is flushed */ | ||
| 1527 | adapter->pci_read_immediate(adapter, ISR_INT_VECTOR); | ||
| 1528 | adapter->pci_read_immediate(adapter, ISR_INT_VECTOR); | ||
| 1529 | |||
| 1530 | napi_schedule(&adapter->napi); | ||
| 1563 | 1531 | ||
| 1564 | return IRQ_HANDLED; | 1532 | return IRQ_HANDLED; |
| 1565 | } | 1533 | } |
| @@ -1568,7 +1536,11 @@ static irqreturn_t netxen_msi_intr(int irq, void *data) | |||
| 1568 | { | 1536 | { |
| 1569 | struct netxen_adapter *adapter = data; | 1537 | struct netxen_adapter *adapter = data; |
| 1570 | 1538 | ||
| 1571 | netxen_handle_int(adapter); | 1539 | /* clear interrupt */ |
| 1540 | adapter->pci_write_immediate(adapter, | ||
| 1541 | msi_tgt_status[adapter->ahw.pci_func], 0xffffffff); | ||
| 1542 | |||
| 1543 | napi_schedule(&adapter->napi); | ||
| 1572 | return IRQ_HANDLED; | 1544 | return IRQ_HANDLED; |
| 1573 | } | 1545 | } |
| 1574 | 1546 | ||
diff --git a/drivers/net/netxen/netxen_nic_phan_reg.h b/drivers/net/netxen/netxen_nic_phan_reg.h index 83e5ee57bfef..b293adcc95ab 100644 --- a/drivers/net/netxen/netxen_nic_phan_reg.h +++ b/drivers/net/netxen/netxen_nic_phan_reg.h | |||
| @@ -125,6 +125,8 @@ | |||
| 125 | #define CRB_SW_INT_MASK_2 NETXEN_NIC_REG(0x1e4) | 125 | #define CRB_SW_INT_MASK_2 NETXEN_NIC_REG(0x1e4) |
| 126 | #define CRB_SW_INT_MASK_3 NETXEN_NIC_REG(0x1e8) | 126 | #define CRB_SW_INT_MASK_3 NETXEN_NIC_REG(0x1e8) |
| 127 | 127 | ||
| 128 | #define CRB_MAC_BLOCK_START NETXEN_CAM_RAM(0x1c0) | ||
| 129 | |||
| 128 | /* | 130 | /* |
| 129 | * capabilities register, can be used to selectively enable/disable features | 131 | * capabilities register, can be used to selectively enable/disable features |
| 130 | * for backward compability | 132 | * for backward compability |
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c index 3f682d49a4e6..52bf11b73c6e 100644 --- a/drivers/net/pcmcia/axnet_cs.c +++ b/drivers/net/pcmcia/axnet_cs.c | |||
| @@ -784,6 +784,7 @@ static struct pcmcia_device_id axnet_ids[] = { | |||
| 784 | PCMCIA_DEVICE_PROD_ID12("corega K.K.", "corega FEther PCC-TXD", 0x5261440f, 0x436768c5), | 784 | PCMCIA_DEVICE_PROD_ID12("corega K.K.", "corega FEther PCC-TXD", 0x5261440f, 0x436768c5), |
| 785 | PCMCIA_DEVICE_PROD_ID12("corega K.K.", "corega FEtherII PCC-TXD", 0x5261440f, 0x730df72e), | 785 | PCMCIA_DEVICE_PROD_ID12("corega K.K.", "corega FEtherII PCC-TXD", 0x5261440f, 0x730df72e), |
| 786 | PCMCIA_DEVICE_PROD_ID12("Dynalink", "L100C16", 0x55632fd5, 0x66bc2a90), | 786 | PCMCIA_DEVICE_PROD_ID12("Dynalink", "L100C16", 0x55632fd5, 0x66bc2a90), |
| 787 | PCMCIA_DEVICE_PROD_ID12("IO DATA", "ETXPCM", 0x547e66dc, 0x233adac2), | ||
| 787 | PCMCIA_DEVICE_PROD_ID12("Linksys", "EtherFast 10/100 PC Card (PCMPC100 V3)", 0x0733cc81, 0x232019a8), | 788 | PCMCIA_DEVICE_PROD_ID12("Linksys", "EtherFast 10/100 PC Card (PCMPC100 V3)", 0x0733cc81, 0x232019a8), |
| 788 | PCMCIA_DEVICE_PROD_ID12("MELCO", "LPC3-TX", 0x481e0094, 0xf91af609), | 789 | PCMCIA_DEVICE_PROD_ID12("MELCO", "LPC3-TX", 0x481e0094, 0xf91af609), |
| 789 | PCMCIA_DEVICE_PROD_ID12("PCMCIA", "100BASE", 0x281f1c5d, 0x7c2add04), | 790 | PCMCIA_DEVICE_PROD_ID12("PCMCIA", "100BASE", 0x281f1c5d, 0x7c2add04), |
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c index 2d4c4ad89b8d..ebc1ae6bcbe5 100644 --- a/drivers/net/pcmcia/pcnet_cs.c +++ b/drivers/net/pcmcia/pcnet_cs.c | |||
| @@ -1626,6 +1626,7 @@ static struct pcmcia_device_id pcnet_ids[] = { | |||
| 1626 | PCMCIA_DEVICE_PROD_ID12("corega K.K.", "corega EtherII PCC-TD", 0x5261440f, 0xc49bd73d), | 1626 | PCMCIA_DEVICE_PROD_ID12("corega K.K.", "corega EtherII PCC-TD", 0x5261440f, 0xc49bd73d), |
| 1627 | PCMCIA_DEVICE_PROD_ID12("Corega K.K.", "corega EtherII PCC-TD", 0xd4fdcbd8, 0xc49bd73d), | 1627 | PCMCIA_DEVICE_PROD_ID12("Corega K.K.", "corega EtherII PCC-TD", 0xd4fdcbd8, 0xc49bd73d), |
| 1628 | PCMCIA_DEVICE_PROD_ID12("corega K.K.", "corega Ether PCC-T", 0x5261440f, 0x6705fcaa), | 1628 | PCMCIA_DEVICE_PROD_ID12("corega K.K.", "corega Ether PCC-T", 0x5261440f, 0x6705fcaa), |
| 1629 | PCMCIA_DEVICE_PROD_ID12("corega K.K.", "corega Ether PCC-TD", 0x5261440f, 0x47d5ca83), | ||
| 1629 | PCMCIA_DEVICE_PROD_ID12("corega K.K.", "corega FastEther PCC-TX", 0x5261440f, 0x485e85d9), | 1630 | PCMCIA_DEVICE_PROD_ID12("corega K.K.", "corega FastEther PCC-TX", 0x5261440f, 0x485e85d9), |
| 1630 | PCMCIA_DEVICE_PROD_ID12("Corega,K.K.", "Ethernet LAN Card", 0x110d26d9, 0x9fd2f0a2), | 1631 | PCMCIA_DEVICE_PROD_ID12("Corega,K.K.", "Ethernet LAN Card", 0x110d26d9, 0x9fd2f0a2), |
| 1631 | PCMCIA_DEVICE_PROD_ID12("corega,K.K.", "Ethernet LAN Card", 0x9791a90e, 0x9fd2f0a2), | 1632 | PCMCIA_DEVICE_PROD_ID12("corega,K.K.", "Ethernet LAN Card", 0x9791a90e, 0x9fd2f0a2), |
| @@ -1737,7 +1738,6 @@ static struct pcmcia_device_id pcnet_ids[] = { | |||
| 1737 | PCMCIA_DEVICE_PROD_ID1("CyQ've 10 Base-T LAN CARD", 0x94faf360), | 1738 | PCMCIA_DEVICE_PROD_ID1("CyQ've 10 Base-T LAN CARD", 0x94faf360), |
| 1738 | PCMCIA_DEVICE_PROD_ID1("EP-210 PCMCIA LAN CARD.", 0x8850b4de), | 1739 | PCMCIA_DEVICE_PROD_ID1("EP-210 PCMCIA LAN CARD.", 0x8850b4de), |
| 1739 | PCMCIA_DEVICE_PROD_ID1("ETHER-C16", 0x06a8514f), | 1740 | PCMCIA_DEVICE_PROD_ID1("ETHER-C16", 0x06a8514f), |
| 1740 | PCMCIA_DEVICE_PROD_ID1("IC-CARD", 0x60cb09a6), | ||
| 1741 | PCMCIA_DEVICE_PROD_ID1("NE2000 Compatible", 0x75b8ad5a), | 1741 | PCMCIA_DEVICE_PROD_ID1("NE2000 Compatible", 0x75b8ad5a), |
| 1742 | PCMCIA_DEVICE_PROD_ID2("EN-6200P2", 0xa996d078), | 1742 | PCMCIA_DEVICE_PROD_ID2("EN-6200P2", 0xa996d078), |
| 1743 | /* too generic! */ | 1743 | /* too generic! */ |
diff --git a/drivers/net/ppp_mppe.c b/drivers/net/ppp_mppe.c index b35d79449500..88f03c9e9403 100644 --- a/drivers/net/ppp_mppe.c +++ b/drivers/net/ppp_mppe.c | |||
| @@ -46,7 +46,6 @@ | |||
| 46 | #include <linux/err.h> | 46 | #include <linux/err.h> |
| 47 | #include <linux/module.h> | 47 | #include <linux/module.h> |
| 48 | #include <linux/kernel.h> | 48 | #include <linux/kernel.h> |
| 49 | #include <linux/version.h> | ||
| 50 | #include <linux/init.h> | 49 | #include <linux/init.h> |
| 51 | #include <linux/types.h> | 50 | #include <linux/types.h> |
| 52 | #include <linux/slab.h> | 51 | #include <linux/slab.h> |
diff --git a/drivers/net/pppol2tp.c b/drivers/net/pppol2tp.c index f9298827a76c..ff175e8f36b2 100644 --- a/drivers/net/pppol2tp.c +++ b/drivers/net/pppol2tp.c | |||
| @@ -61,7 +61,6 @@ | |||
| 61 | */ | 61 | */ |
| 62 | 62 | ||
| 63 | #include <linux/module.h> | 63 | #include <linux/module.h> |
| 64 | #include <linux/version.h> | ||
| 65 | #include <linux/string.h> | 64 | #include <linux/string.h> |
| 66 | #include <linux/list.h> | 65 | #include <linux/list.h> |
| 67 | #include <asm/uaccess.h> | 66 | #include <asm/uaccess.h> |
diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c index 6531ff565c54..5d86281d9363 100644 --- a/drivers/net/r6040.c +++ b/drivers/net/r6040.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | 24 | ||
| 25 | #include <linux/kernel.h> | 25 | #include <linux/kernel.h> |
| 26 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 27 | #include <linux/version.h> | ||
| 28 | #include <linux/moduleparam.h> | 27 | #include <linux/moduleparam.h> |
| 29 | #include <linux/string.h> | 28 | #include <linux/string.h> |
| 30 | #include <linux/timer.h> | 29 | #include <linux/timer.h> |
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index a3e3895e5032..0f6f9747d255 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c | |||
| @@ -2792,7 +2792,7 @@ static int rtl8169_rx_interrupt(struct net_device *dev, | |||
| 2792 | pkt_size, PCI_DMA_FROMDEVICE); | 2792 | pkt_size, PCI_DMA_FROMDEVICE); |
| 2793 | rtl8169_mark_to_asic(desc, tp->rx_buf_sz); | 2793 | rtl8169_mark_to_asic(desc, tp->rx_buf_sz); |
| 2794 | } else { | 2794 | } else { |
| 2795 | pci_unmap_single(pdev, addr, pkt_size, | 2795 | pci_unmap_single(pdev, addr, tp->rx_buf_sz, |
| 2796 | PCI_DMA_FROMDEVICE); | 2796 | PCI_DMA_FROMDEVICE); |
| 2797 | tp->Rx_skbuff[entry] = NULL; | 2797 | tp->Rx_skbuff[entry] = NULL; |
| 2798 | } | 2798 | } |
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c index 25e62cf58d3a..1c370e6aa641 100644 --- a/drivers/net/sh_eth.c +++ b/drivers/net/sh_eth.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * the file called "COPYING". | 20 | * the file called "COPYING". |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <linux/version.h> | ||
| 24 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 25 | #include <linux/dma-mapping.h> | 24 | #include <linux/dma-mapping.h> |
| 26 | #include <linux/etherdevice.h> | 25 | #include <linux/etherdevice.h> |
diff --git a/drivers/net/skfp/ess.c b/drivers/net/skfp/ess.c index 889f98724610..a85efcfd9d0e 100644 --- a/drivers/net/skfp/ess.c +++ b/drivers/net/skfp/ess.c | |||
| @@ -510,7 +510,7 @@ static void ess_send_response(struct s_smc *smc, struct smt_header *sm, | |||
| 510 | chg->path.para.p_type = SMT_P320B ; | 510 | chg->path.para.p_type = SMT_P320B ; |
| 511 | chg->path.para.p_len = sizeof(struct smt_p_320b) - PARA_LEN ; | 511 | chg->path.para.p_len = sizeof(struct smt_p_320b) - PARA_LEN ; |
| 512 | chg->path.mib_index = SBAPATHINDEX ; | 512 | chg->path.mib_index = SBAPATHINDEX ; |
| 513 | chg->path.path_pad = (u_short)NULL ; | 513 | chg->path.path_pad = 0; |
| 514 | chg->path.path_index = PRIMARY_RING ; | 514 | chg->path.path_index = PRIMARY_RING ; |
| 515 | 515 | ||
| 516 | /* set P320F */ | 516 | /* set P320F */ |
| @@ -606,7 +606,7 @@ static void ess_send_alc_req(struct s_smc *smc) | |||
| 606 | req->path.para.p_type = SMT_P320B ; | 606 | req->path.para.p_type = SMT_P320B ; |
| 607 | req->path.para.p_len = sizeof(struct smt_p_320b) - PARA_LEN ; | 607 | req->path.para.p_len = sizeof(struct smt_p_320b) - PARA_LEN ; |
| 608 | req->path.mib_index = SBAPATHINDEX ; | 608 | req->path.mib_index = SBAPATHINDEX ; |
| 609 | req->path.path_pad = (u_short)NULL ; | 609 | req->path.path_pad = 0; |
| 610 | req->path.path_index = PRIMARY_RING ; | 610 | req->path.path_index = PRIMARY_RING ; |
| 611 | 611 | ||
| 612 | /* set P0017 */ | 612 | /* set P0017 */ |
| @@ -636,7 +636,7 @@ static void ess_send_alc_req(struct s_smc *smc) | |||
| 636 | /* set P19 */ | 636 | /* set P19 */ |
| 637 | req->a_addr.para.p_type = SMT_P0019 ; | 637 | req->a_addr.para.p_type = SMT_P0019 ; |
| 638 | req->a_addr.para.p_len = sizeof(struct smt_p_0019) - PARA_LEN ; | 638 | req->a_addr.para.p_len = sizeof(struct smt_p_0019) - PARA_LEN ; |
| 639 | req->a_addr.sba_pad = (u_short)NULL ; | 639 | req->a_addr.sba_pad = 0; |
| 640 | req->a_addr.alloc_addr = null_addr ; | 640 | req->a_addr.alloc_addr = null_addr ; |
| 641 | 641 | ||
| 642 | /* set P1A */ | 642 | /* set P1A */ |
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 7d29edcd40b4..e24b25ca1c69 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | 24 | ||
| 25 | #include <linux/crc32.h> | 25 | #include <linux/crc32.h> |
| 26 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
| 27 | #include <linux/version.h> | ||
| 28 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 29 | #include <linux/netdevice.h> | 28 | #include <linux/netdevice.h> |
| 30 | #include <linux/dma-mapping.h> | 29 | #include <linux/dma-mapping.h> |
| @@ -666,11 +665,16 @@ static void sky2_phy_power_down(struct sky2_hw *hw, unsigned port) | |||
| 666 | 665 | ||
| 667 | if (hw->chip_id != CHIP_ID_YUKON_EC) { | 666 | if (hw->chip_id != CHIP_ID_YUKON_EC) { |
| 668 | if (hw->chip_id == CHIP_ID_YUKON_EC_U) { | 667 | if (hw->chip_id == CHIP_ID_YUKON_EC_U) { |
| 669 | ctrl = gm_phy_read(hw, port, PHY_MARV_PHY_CTRL); | 668 | /* select page 2 to access MAC control register */ |
| 669 | gm_phy_write(hw, port, PHY_MARV_EXT_ADR, 2); | ||
| 670 | 670 | ||
| 671 | ctrl = gm_phy_read(hw, port, PHY_MARV_PHY_CTRL); | ||
| 671 | /* enable Power Down */ | 672 | /* enable Power Down */ |
| 672 | ctrl |= PHY_M_PC_POW_D_ENA; | 673 | ctrl |= PHY_M_PC_POW_D_ENA; |
| 673 | gm_phy_write(hw, port, PHY_MARV_PHY_CTRL, ctrl); | 674 | gm_phy_write(hw, port, PHY_MARV_PHY_CTRL, ctrl); |
| 675 | |||
| 676 | /* set page register back to 0 */ | ||
| 677 | gm_phy_write(hw, port, PHY_MARV_EXT_ADR, 0); | ||
| 674 | } | 678 | } |
| 675 | 679 | ||
| 676 | /* set IEEE compatible Power Down Mode (dev. #4.99) */ | 680 | /* set IEEE compatible Power Down Mode (dev. #4.99) */ |
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c index 2040965d7724..24768c10cadb 100644 --- a/drivers/net/smc91x.c +++ b/drivers/net/smc91x.c | |||
| @@ -2255,7 +2255,7 @@ static int smc_drv_remove(struct platform_device *pdev) | |||
| 2255 | 2255 | ||
| 2256 | res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "smc91x-regs"); | 2256 | res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "smc91x-regs"); |
| 2257 | if (!res) | 2257 | if (!res) |
| 2258 | platform_get_resource(pdev, IORESOURCE_MEM, 0); | 2258 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
| 2259 | release_mem_region(res->start, SMC_IO_EXTENT); | 2259 | release_mem_region(res->start, SMC_IO_EXTENT); |
| 2260 | 2260 | ||
| 2261 | free_netdev(ndev); | 2261 | free_netdev(ndev); |
diff --git a/drivers/net/tehuti.h b/drivers/net/tehuti.h index c66dfc9ec1ec..7db48f1cd949 100644 --- a/drivers/net/tehuti.h +++ b/drivers/net/tehuti.h | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | #include <linux/sched.h> | 27 | #include <linux/sched.h> |
| 28 | #include <linux/tty.h> | 28 | #include <linux/tty.h> |
| 29 | #include <linux/if_vlan.h> | 29 | #include <linux/if_vlan.h> |
| 30 | #include <linux/version.h> | ||
| 31 | #include <linux/interrupt.h> | 30 | #include <linux/interrupt.h> |
| 32 | #include <linux/vmalloc.h> | 31 | #include <linux/vmalloc.h> |
| 33 | #include <asm/byteorder.h> | 32 | #include <asm/byteorder.h> |
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index d2439b85a790..71d2c5cfdad9 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
| @@ -66,8 +66,8 @@ | |||
| 66 | 66 | ||
| 67 | #define DRV_MODULE_NAME "tg3" | 67 | #define DRV_MODULE_NAME "tg3" |
| 68 | #define PFX DRV_MODULE_NAME ": " | 68 | #define PFX DRV_MODULE_NAME ": " |
| 69 | #define DRV_MODULE_VERSION "3.93" | 69 | #define DRV_MODULE_VERSION "3.94" |
| 70 | #define DRV_MODULE_RELDATE "May 22, 2008" | 70 | #define DRV_MODULE_RELDATE "August 14, 2008" |
| 71 | 71 | ||
| 72 | #define TG3_DEF_MAC_MODE 0 | 72 | #define TG3_DEF_MAC_MODE 0 |
| 73 | #define TG3_DEF_RX_MODE 0 | 73 | #define TG3_DEF_RX_MODE 0 |
| @@ -536,6 +536,7 @@ static int tg3_ape_lock(struct tg3 *tp, int locknum) | |||
| 536 | return 0; | 536 | return 0; |
| 537 | 537 | ||
| 538 | switch (locknum) { | 538 | switch (locknum) { |
| 539 | case TG3_APE_LOCK_GRC: | ||
| 539 | case TG3_APE_LOCK_MEM: | 540 | case TG3_APE_LOCK_MEM: |
| 540 | break; | 541 | break; |
| 541 | default: | 542 | default: |
| @@ -573,6 +574,7 @@ static void tg3_ape_unlock(struct tg3 *tp, int locknum) | |||
| 573 | return; | 574 | return; |
| 574 | 575 | ||
| 575 | switch (locknum) { | 576 | switch (locknum) { |
| 577 | case TG3_APE_LOCK_GRC: | ||
| 576 | case TG3_APE_LOCK_MEM: | 578 | case TG3_APE_LOCK_MEM: |
| 577 | break; | 579 | break; |
| 578 | default: | 580 | default: |
| @@ -1018,15 +1020,43 @@ static void tg3_mdio_fini(struct tg3 *tp) | |||
| 1018 | } | 1020 | } |
| 1019 | 1021 | ||
| 1020 | /* tp->lock is held. */ | 1022 | /* tp->lock is held. */ |
| 1023 | static inline void tg3_generate_fw_event(struct tg3 *tp) | ||
| 1024 | { | ||
| 1025 | u32 val; | ||
| 1026 | |||
| 1027 | val = tr32(GRC_RX_CPU_EVENT); | ||
| 1028 | val |= GRC_RX_CPU_DRIVER_EVENT; | ||
| 1029 | tw32_f(GRC_RX_CPU_EVENT, val); | ||
| 1030 | |||
| 1031 | tp->last_event_jiffies = jiffies; | ||
| 1032 | } | ||
| 1033 | |||
| 1034 | #define TG3_FW_EVENT_TIMEOUT_USEC 2500 | ||
| 1035 | |||
| 1036 | /* tp->lock is held. */ | ||
| 1021 | static void tg3_wait_for_event_ack(struct tg3 *tp) | 1037 | static void tg3_wait_for_event_ack(struct tg3 *tp) |
| 1022 | { | 1038 | { |
| 1023 | int i; | 1039 | int i; |
| 1040 | unsigned int delay_cnt; | ||
| 1041 | long time_remain; | ||
| 1042 | |||
| 1043 | /* If enough time has passed, no wait is necessary. */ | ||
| 1044 | time_remain = (long)(tp->last_event_jiffies + 1 + | ||
| 1045 | usecs_to_jiffies(TG3_FW_EVENT_TIMEOUT_USEC)) - | ||
| 1046 | (long)jiffies; | ||
| 1047 | if (time_remain < 0) | ||
| 1048 | return; | ||
| 1024 | 1049 | ||
| 1025 | /* Wait for up to 2.5 milliseconds */ | 1050 | /* Check if we can shorten the wait time. */ |
| 1026 | for (i = 0; i < 250000; i++) { | 1051 | delay_cnt = jiffies_to_usecs(time_remain); |
| 1052 | if (delay_cnt > TG3_FW_EVENT_TIMEOUT_USEC) | ||
| 1053 | delay_cnt = TG3_FW_EVENT_TIMEOUT_USEC; | ||
| 1054 | delay_cnt = (delay_cnt >> 3) + 1; | ||
| 1055 | |||
| 1056 | for (i = 0; i < delay_cnt; i++) { | ||
| 1027 | if (!(tr32(GRC_RX_CPU_EVENT) & GRC_RX_CPU_DRIVER_EVENT)) | 1057 | if (!(tr32(GRC_RX_CPU_EVENT) & GRC_RX_CPU_DRIVER_EVENT)) |
| 1028 | break; | 1058 | break; |
| 1029 | udelay(10); | 1059 | udelay(8); |
| 1030 | } | 1060 | } |
| 1031 | } | 1061 | } |
| 1032 | 1062 | ||
| @@ -1075,9 +1105,7 @@ static void tg3_ump_link_report(struct tg3 *tp) | |||
| 1075 | val = 0; | 1105 | val = 0; |
| 1076 | tg3_write_mem(tp, NIC_SRAM_FW_CMD_DATA_MBOX + 12, val); | 1106 | tg3_write_mem(tp, NIC_SRAM_FW_CMD_DATA_MBOX + 12, val); |
| 1077 | 1107 | ||
| 1078 | val = tr32(GRC_RX_CPU_EVENT); | 1108 | tg3_generate_fw_event(tp); |
| 1079 | val |= GRC_RX_CPU_DRIVER_EVENT; | ||
| 1080 | tw32_f(GRC_RX_CPU_EVENT, val); | ||
| 1081 | } | 1109 | } |
| 1082 | 1110 | ||
| 1083 | static void tg3_link_report(struct tg3 *tp) | 1111 | static void tg3_link_report(struct tg3 *tp) |
| @@ -2124,6 +2152,13 @@ static int tg3_set_power_state(struct tg3 *tp, pci_power_t state) | |||
| 2124 | (tp->tg3_flags & TG3_FLAG_WOL_ENABLE)) | 2152 | (tp->tg3_flags & TG3_FLAG_WOL_ENABLE)) |
| 2125 | mac_mode |= MAC_MODE_MAGIC_PKT_ENABLE; | 2153 | mac_mode |= MAC_MODE_MAGIC_PKT_ENABLE; |
| 2126 | 2154 | ||
| 2155 | if (tp->tg3_flags3 & TG3_FLG3_ENABLE_APE) { | ||
| 2156 | mac_mode |= tp->mac_mode & | ||
| 2157 | (MAC_MODE_APE_TX_EN | MAC_MODE_APE_RX_EN); | ||
| 2158 | if (mac_mode & MAC_MODE_APE_TX_EN) | ||
| 2159 | mac_mode |= MAC_MODE_TDE_ENABLE; | ||
| 2160 | } | ||
| 2161 | |||
| 2127 | tw32_f(MAC_MODE, mac_mode); | 2162 | tw32_f(MAC_MODE, mac_mode); |
| 2128 | udelay(100); | 2163 | udelay(100); |
| 2129 | 2164 | ||
| @@ -5493,7 +5528,7 @@ static void tg3_ape_send_event(struct tg3 *tp, u32 event) | |||
| 5493 | return; | 5528 | return; |
| 5494 | 5529 | ||
| 5495 | apedata = tg3_ape_read32(tp, TG3_APE_FW_STATUS); | 5530 | apedata = tg3_ape_read32(tp, TG3_APE_FW_STATUS); |
| 5496 | if (apedata != APE_FW_STATUS_READY) | 5531 | if (!(apedata & APE_FW_STATUS_READY)) |
| 5497 | return; | 5532 | return; |
| 5498 | 5533 | ||
| 5499 | /* Wait for up to 1 millisecond for APE to service previous event. */ | 5534 | /* Wait for up to 1 millisecond for APE to service previous event. */ |
| @@ -5760,6 +5795,8 @@ static int tg3_chip_reset(struct tg3 *tp) | |||
| 5760 | 5795 | ||
| 5761 | tg3_mdio_stop(tp); | 5796 | tg3_mdio_stop(tp); |
| 5762 | 5797 | ||
| 5798 | tg3_ape_lock(tp, TG3_APE_LOCK_GRC); | ||
| 5799 | |||
| 5763 | /* No matching tg3_nvram_unlock() after this because | 5800 | /* No matching tg3_nvram_unlock() after this because |
| 5764 | * chip reset below will undo the nvram lock. | 5801 | * chip reset below will undo the nvram lock. |
| 5765 | */ | 5802 | */ |
| @@ -5908,12 +5945,19 @@ static int tg3_chip_reset(struct tg3 *tp) | |||
| 5908 | } else if (tp->tg3_flags2 & TG3_FLG2_MII_SERDES) { | 5945 | } else if (tp->tg3_flags2 & TG3_FLG2_MII_SERDES) { |
| 5909 | tp->mac_mode = MAC_MODE_PORT_MODE_GMII; | 5946 | tp->mac_mode = MAC_MODE_PORT_MODE_GMII; |
| 5910 | tw32_f(MAC_MODE, tp->mac_mode); | 5947 | tw32_f(MAC_MODE, tp->mac_mode); |
| 5948 | } else if (tp->tg3_flags3 & TG3_FLG3_ENABLE_APE) { | ||
| 5949 | tp->mac_mode &= (MAC_MODE_APE_TX_EN | MAC_MODE_APE_RX_EN); | ||
| 5950 | if (tp->mac_mode & MAC_MODE_APE_TX_EN) | ||
| 5951 | tp->mac_mode |= MAC_MODE_TDE_ENABLE; | ||
| 5952 | tw32_f(MAC_MODE, tp->mac_mode); | ||
| 5911 | } else | 5953 | } else |
| 5912 | tw32_f(MAC_MODE, 0); | 5954 | tw32_f(MAC_MODE, 0); |
| 5913 | udelay(40); | 5955 | udelay(40); |
| 5914 | 5956 | ||
| 5915 | tg3_mdio_start(tp); | 5957 | tg3_mdio_start(tp); |
| 5916 | 5958 | ||
| 5959 | tg3_ape_unlock(tp, TG3_APE_LOCK_GRC); | ||
| 5960 | |||
| 5917 | err = tg3_poll_fw(tp); | 5961 | err = tg3_poll_fw(tp); |
| 5918 | if (err) | 5962 | if (err) |
| 5919 | return err; | 5963 | return err; |
| @@ -5935,6 +5979,7 @@ static int tg3_chip_reset(struct tg3 *tp) | |||
| 5935 | tg3_read_mem(tp, NIC_SRAM_DATA_CFG, &nic_cfg); | 5979 | tg3_read_mem(tp, NIC_SRAM_DATA_CFG, &nic_cfg); |
| 5936 | if (nic_cfg & NIC_SRAM_DATA_CFG_ASF_ENABLE) { | 5980 | if (nic_cfg & NIC_SRAM_DATA_CFG_ASF_ENABLE) { |
| 5937 | tp->tg3_flags |= TG3_FLAG_ENABLE_ASF; | 5981 | tp->tg3_flags |= TG3_FLAG_ENABLE_ASF; |
| 5982 | tp->last_event_jiffies = jiffies; | ||
| 5938 | if (tp->tg3_flags2 & TG3_FLG2_5750_PLUS) | 5983 | if (tp->tg3_flags2 & TG3_FLG2_5750_PLUS) |
| 5939 | tp->tg3_flags2 |= TG3_FLG2_ASF_NEW_HANDSHAKE; | 5984 | tp->tg3_flags2 |= TG3_FLG2_ASF_NEW_HANDSHAKE; |
| 5940 | } | 5985 | } |
| @@ -5948,15 +5993,12 @@ static void tg3_stop_fw(struct tg3 *tp) | |||
| 5948 | { | 5993 | { |
| 5949 | if ((tp->tg3_flags & TG3_FLAG_ENABLE_ASF) && | 5994 | if ((tp->tg3_flags & TG3_FLAG_ENABLE_ASF) && |
| 5950 | !(tp->tg3_flags3 & TG3_FLG3_ENABLE_APE)) { | 5995 | !(tp->tg3_flags3 & TG3_FLG3_ENABLE_APE)) { |
| 5951 | u32 val; | ||
| 5952 | |||
| 5953 | /* Wait for RX cpu to ACK the previous event. */ | 5996 | /* Wait for RX cpu to ACK the previous event. */ |
| 5954 | tg3_wait_for_event_ack(tp); | 5997 | tg3_wait_for_event_ack(tp); |
| 5955 | 5998 | ||
| 5956 | tg3_write_mem(tp, NIC_SRAM_FW_CMD_MBOX, FWCMD_NICDRV_PAUSE_FW); | 5999 | tg3_write_mem(tp, NIC_SRAM_FW_CMD_MBOX, FWCMD_NICDRV_PAUSE_FW); |
| 5957 | val = tr32(GRC_RX_CPU_EVENT); | 6000 | |
| 5958 | val |= GRC_RX_CPU_DRIVER_EVENT; | 6001 | tg3_generate_fw_event(tp); |
| 5959 | tw32(GRC_RX_CPU_EVENT, val); | ||
| 5960 | 6002 | ||
| 5961 | /* Wait for RX cpu to ACK this event. */ | 6003 | /* Wait for RX cpu to ACK this event. */ |
| 5962 | tg3_wait_for_event_ack(tp); | 6004 | tg3_wait_for_event_ack(tp); |
| @@ -7406,7 +7448,11 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy) | |||
| 7406 | udelay(10); | 7448 | udelay(10); |
| 7407 | } | 7449 | } |
| 7408 | 7450 | ||
| 7409 | tp->mac_mode = MAC_MODE_TXSTAT_ENABLE | MAC_MODE_RXSTAT_ENABLE | | 7451 | if (tp->tg3_flags3 & TG3_FLG3_ENABLE_APE) |
| 7452 | tp->mac_mode &= MAC_MODE_APE_TX_EN | MAC_MODE_APE_RX_EN; | ||
| 7453 | else | ||
| 7454 | tp->mac_mode = 0; | ||
| 7455 | tp->mac_mode |= MAC_MODE_TXSTAT_ENABLE | MAC_MODE_RXSTAT_ENABLE | | ||
| 7410 | MAC_MODE_TDE_ENABLE | MAC_MODE_RDE_ENABLE | MAC_MODE_FHDE_ENABLE; | 7456 | MAC_MODE_TDE_ENABLE | MAC_MODE_RDE_ENABLE | MAC_MODE_FHDE_ENABLE; |
| 7411 | if (!(tp->tg3_flags2 & TG3_FLG2_5705_PLUS) && | 7457 | if (!(tp->tg3_flags2 & TG3_FLG2_5705_PLUS) && |
| 7412 | !(tp->tg3_flags2 & TG3_FLG2_PHY_SERDES) && | 7458 | !(tp->tg3_flags2 & TG3_FLG2_PHY_SERDES) && |
| @@ -7840,9 +7886,8 @@ static void tg3_timer(unsigned long __opaque) | |||
| 7840 | * resets. | 7886 | * resets. |
| 7841 | */ | 7887 | */ |
| 7842 | if (!--tp->asf_counter) { | 7888 | if (!--tp->asf_counter) { |
| 7843 | if (tp->tg3_flags & TG3_FLAG_ENABLE_ASF) { | 7889 | if ((tp->tg3_flags & TG3_FLAG_ENABLE_ASF) && |
| 7844 | u32 val; | 7890 | !(tp->tg3_flags3 & TG3_FLG3_ENABLE_APE)) { |
| 7845 | |||
| 7846 | tg3_wait_for_event_ack(tp); | 7891 | tg3_wait_for_event_ack(tp); |
| 7847 | 7892 | ||
| 7848 | tg3_write_mem(tp, NIC_SRAM_FW_CMD_MBOX, | 7893 | tg3_write_mem(tp, NIC_SRAM_FW_CMD_MBOX, |
| @@ -7850,9 +7895,8 @@ static void tg3_timer(unsigned long __opaque) | |||
| 7850 | tg3_write_mem(tp, NIC_SRAM_FW_CMD_LEN_MBOX, 4); | 7895 | tg3_write_mem(tp, NIC_SRAM_FW_CMD_LEN_MBOX, 4); |
| 7851 | /* 5 seconds timeout */ | 7896 | /* 5 seconds timeout */ |
| 7852 | tg3_write_mem(tp, NIC_SRAM_FW_CMD_DATA_MBOX, 5); | 7897 | tg3_write_mem(tp, NIC_SRAM_FW_CMD_DATA_MBOX, 5); |
| 7853 | val = tr32(GRC_RX_CPU_EVENT); | 7898 | |
| 7854 | val |= GRC_RX_CPU_DRIVER_EVENT; | 7899 | tg3_generate_fw_event(tp); |
| 7855 | tw32_f(GRC_RX_CPU_EVENT, val); | ||
| 7856 | } | 7900 | } |
| 7857 | tp->asf_counter = tp->asf_multiplier; | 7901 | tp->asf_counter = tp->asf_multiplier; |
| 7858 | } | 7902 | } |
| @@ -8422,6 +8466,11 @@ static inline unsigned long get_stat64(tg3_stat64_t *val) | |||
| 8422 | return ret; | 8466 | return ret; |
| 8423 | } | 8467 | } |
| 8424 | 8468 | ||
| 8469 | static inline u64 get_estat64(tg3_stat64_t *val) | ||
| 8470 | { | ||
| 8471 | return ((u64)val->high << 32) | ((u64)val->low); | ||
| 8472 | } | ||
| 8473 | |||
| 8425 | static unsigned long calc_crc_errors(struct tg3 *tp) | 8474 | static unsigned long calc_crc_errors(struct tg3 *tp) |
| 8426 | { | 8475 | { |
| 8427 | struct tg3_hw_stats *hw_stats = tp->hw_stats; | 8476 | struct tg3_hw_stats *hw_stats = tp->hw_stats; |
| @@ -8450,7 +8499,7 @@ static unsigned long calc_crc_errors(struct tg3 *tp) | |||
| 8450 | 8499 | ||
| 8451 | #define ESTAT_ADD(member) \ | 8500 | #define ESTAT_ADD(member) \ |
| 8452 | estats->member = old_estats->member + \ | 8501 | estats->member = old_estats->member + \ |
| 8453 | get_stat64(&hw_stats->member) | 8502 | get_estat64(&hw_stats->member) |
| 8454 | 8503 | ||
| 8455 | static struct tg3_ethtool_stats *tg3_get_estats(struct tg3 *tp) | 8504 | static struct tg3_ethtool_stats *tg3_get_estats(struct tg3 *tp) |
| 8456 | { | 8505 | { |
| @@ -12416,6 +12465,13 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) | |||
| 12416 | tp->misc_host_ctrl); | 12465 | tp->misc_host_ctrl); |
| 12417 | } | 12466 | } |
| 12418 | 12467 | ||
| 12468 | /* Preserve the APE MAC_MODE bits */ | ||
| 12469 | if (tp->tg3_flags3 & TG3_FLG3_ENABLE_APE) | ||
| 12470 | tp->mac_mode = tr32(MAC_MODE) | | ||
| 12471 | MAC_MODE_APE_TX_EN | MAC_MODE_APE_RX_EN; | ||
| 12472 | else | ||
| 12473 | tp->mac_mode = TG3_DEF_MAC_MODE; | ||
| 12474 | |||
| 12419 | /* these are limited to 10/100 only */ | 12475 | /* these are limited to 10/100 only */ |
| 12420 | if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5703 && | 12476 | if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5703 && |
| 12421 | (grc_misc_cfg == 0x8000 || grc_misc_cfg == 0x4000)) || | 12477 | (grc_misc_cfg == 0x8000 || grc_misc_cfg == 0x4000)) || |
| @@ -13275,7 +13331,6 @@ static int __devinit tg3_init_one(struct pci_dev *pdev, | |||
| 13275 | tp->pdev = pdev; | 13331 | tp->pdev = pdev; |
| 13276 | tp->dev = dev; | 13332 | tp->dev = dev; |
| 13277 | tp->pm_cap = pm_cap; | 13333 | tp->pm_cap = pm_cap; |
| 13278 | tp->mac_mode = TG3_DEF_MAC_MODE; | ||
| 13279 | tp->rx_mode = TG3_DEF_RX_MODE; | 13334 | tp->rx_mode = TG3_DEF_RX_MODE; |
| 13280 | tp->tx_mode = TG3_DEF_TX_MODE; | 13335 | tp->tx_mode = TG3_DEF_TX_MODE; |
| 13281 | 13336 | ||
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h index df07842172b7..f5b8cab8d4b5 100644 --- a/drivers/net/tg3.h +++ b/drivers/net/tg3.h | |||
| @@ -325,6 +325,8 @@ | |||
| 325 | #define MAC_MODE_TDE_ENABLE 0x00200000 | 325 | #define MAC_MODE_TDE_ENABLE 0x00200000 |
| 326 | #define MAC_MODE_RDE_ENABLE 0x00400000 | 326 | #define MAC_MODE_RDE_ENABLE 0x00400000 |
| 327 | #define MAC_MODE_FHDE_ENABLE 0x00800000 | 327 | #define MAC_MODE_FHDE_ENABLE 0x00800000 |
| 328 | #define MAC_MODE_APE_RX_EN 0x08000000 | ||
| 329 | #define MAC_MODE_APE_TX_EN 0x10000000 | ||
| 328 | #define MAC_STATUS 0x00000404 | 330 | #define MAC_STATUS 0x00000404 |
| 329 | #define MAC_STATUS_PCS_SYNCED 0x00000001 | 331 | #define MAC_STATUS_PCS_SYNCED 0x00000001 |
| 330 | #define MAC_STATUS_SIGNAL_DET 0x00000002 | 332 | #define MAC_STATUS_SIGNAL_DET 0x00000002 |
| @@ -1889,6 +1891,7 @@ | |||
| 1889 | #define APE_EVENT_STATUS_EVENT_PENDING 0x80000000 | 1891 | #define APE_EVENT_STATUS_EVENT_PENDING 0x80000000 |
| 1890 | 1892 | ||
| 1891 | /* APE convenience enumerations. */ | 1893 | /* APE convenience enumerations. */ |
| 1894 | #define TG3_APE_LOCK_GRC 1 | ||
| 1892 | #define TG3_APE_LOCK_MEM 4 | 1895 | #define TG3_APE_LOCK_MEM 4 |
| 1893 | 1896 | ||
| 1894 | #define TG3_EEPROM_SB_F1R2_MBA_OFF 0x10 | 1897 | #define TG3_EEPROM_SB_F1R2_MBA_OFF 0x10 |
| @@ -2429,7 +2432,10 @@ struct tg3 { | |||
| 2429 | struct tg3_ethtool_stats estats; | 2432 | struct tg3_ethtool_stats estats; |
| 2430 | struct tg3_ethtool_stats estats_prev; | 2433 | struct tg3_ethtool_stats estats_prev; |
| 2431 | 2434 | ||
| 2435 | union { | ||
| 2432 | unsigned long phy_crc_errors; | 2436 | unsigned long phy_crc_errors; |
| 2437 | unsigned long last_event_jiffies; | ||
| 2438 | }; | ||
| 2433 | 2439 | ||
| 2434 | u32 rx_offset; | 2440 | u32 rx_offset; |
| 2435 | u32 tg3_flags; | 2441 | u32 tg3_flags; |
diff --git a/drivers/net/tlan.c b/drivers/net/tlan.c index 85246ed7cb9c..ec871f646766 100644 --- a/drivers/net/tlan.c +++ b/drivers/net/tlan.c | |||
| @@ -360,8 +360,8 @@ TLan_GetSKB( const struct tlan_list_tag *tag) | |||
| 360 | { | 360 | { |
| 361 | unsigned long addr; | 361 | unsigned long addr; |
| 362 | 362 | ||
| 363 | addr = tag->buffer[8].address; | 363 | addr = tag->buffer[9].address; |
| 364 | addr |= (tag->buffer[9].address << 16) << 16; | 364 | addr |= (tag->buffer[8].address << 16) << 16; |
| 365 | return (struct sk_buff *) addr; | 365 | return (struct sk_buff *) addr; |
| 366 | } | 366 | } |
| 367 | 367 | ||
| @@ -1984,7 +1984,6 @@ static void TLan_ResetLists( struct net_device *dev ) | |||
| 1984 | TLanList *list; | 1984 | TLanList *list; |
| 1985 | dma_addr_t list_phys; | 1985 | dma_addr_t list_phys; |
| 1986 | struct sk_buff *skb; | 1986 | struct sk_buff *skb; |
| 1987 | void *t = NULL; | ||
| 1988 | 1987 | ||
| 1989 | priv->txHead = 0; | 1988 | priv->txHead = 0; |
| 1990 | priv->txTail = 0; | 1989 | priv->txTail = 0; |
| @@ -2022,7 +2021,8 @@ static void TLan_ResetLists( struct net_device *dev ) | |||
| 2022 | } | 2021 | } |
| 2023 | 2022 | ||
| 2024 | skb_reserve( skb, NET_IP_ALIGN ); | 2023 | skb_reserve( skb, NET_IP_ALIGN ); |
| 2025 | list->buffer[0].address = pci_map_single(priv->pciDev, t, | 2024 | list->buffer[0].address = pci_map_single(priv->pciDev, |
| 2025 | skb->data, | ||
| 2026 | TLAN_MAX_FRAME_SIZE, | 2026 | TLAN_MAX_FRAME_SIZE, |
| 2027 | PCI_DMA_FROMDEVICE); | 2027 | PCI_DMA_FROMDEVICE); |
| 2028 | TLan_StoreSKB(list, skb); | 2028 | TLan_StoreSKB(list, skb); |
diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c index 47d84cd28097..59d1673f9387 100644 --- a/drivers/net/tokenring/lanstreamer.c +++ b/drivers/net/tokenring/lanstreamer.c | |||
| @@ -119,7 +119,6 @@ | |||
| 119 | #include <linux/pci.h> | 119 | #include <linux/pci.h> |
| 120 | #include <linux/dma-mapping.h> | 120 | #include <linux/dma-mapping.h> |
| 121 | #include <linux/spinlock.h> | 121 | #include <linux/spinlock.h> |
| 122 | #include <linux/version.h> | ||
| 123 | #include <linux/bitops.h> | 122 | #include <linux/bitops.h> |
| 124 | #include <linux/jiffies.h> | 123 | #include <linux/jiffies.h> |
| 125 | 124 | ||
diff --git a/drivers/net/tokenring/lanstreamer.h b/drivers/net/tokenring/lanstreamer.h index e7bb3494afc7..13ccee6449c1 100644 --- a/drivers/net/tokenring/lanstreamer.h +++ b/drivers/net/tokenring/lanstreamer.h | |||
| @@ -60,8 +60,6 @@ | |||
| 60 | * | 60 | * |
| 61 | */ | 61 | */ |
| 62 | 62 | ||
| 63 | #include <linux/version.h> | ||
| 64 | |||
| 65 | /* MAX_INTR - the maximum number of times we can loop | 63 | /* MAX_INTR - the maximum number of times we can loop |
| 66 | * inside the interrupt function before returning | 64 | * inside the interrupt function before returning |
| 67 | * control to the OS (maximum value is 256) | 65 | * control to the OS (maximum value is 256) |
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index e6bbc639c2d0..6daea0c91862 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c | |||
| @@ -358,6 +358,66 @@ static unsigned int tun_chr_poll(struct file *file, poll_table * wait) | |||
| 358 | return mask; | 358 | return mask; |
| 359 | } | 359 | } |
| 360 | 360 | ||
| 361 | /* prepad is the amount to reserve at front. len is length after that. | ||
| 362 | * linear is a hint as to how much to copy (usually headers). */ | ||
| 363 | static struct sk_buff *tun_alloc_skb(size_t prepad, size_t len, size_t linear, | ||
| 364 | gfp_t gfp) | ||
| 365 | { | ||
| 366 | struct sk_buff *skb; | ||
| 367 | unsigned int i; | ||
| 368 | |||
| 369 | skb = alloc_skb(prepad + len, gfp|__GFP_NOWARN); | ||
| 370 | if (skb) { | ||
| 371 | skb_reserve(skb, prepad); | ||
| 372 | skb_put(skb, len); | ||
| 373 | return skb; | ||
| 374 | } | ||
| 375 | |||
| 376 | /* Under a page? Don't bother with paged skb. */ | ||
| 377 | if (prepad + len < PAGE_SIZE) | ||
| 378 | return NULL; | ||
| 379 | |||
| 380 | /* Start with a normal skb, and add pages. */ | ||
| 381 | skb = alloc_skb(prepad + linear, gfp); | ||
| 382 | if (!skb) | ||
| 383 | return NULL; | ||
| 384 | |||
| 385 | skb_reserve(skb, prepad); | ||
| 386 | skb_put(skb, linear); | ||
| 387 | |||
| 388 | len -= linear; | ||
| 389 | |||
| 390 | for (i = 0; i < MAX_SKB_FRAGS; i++) { | ||
| 391 | skb_frag_t *f = &skb_shinfo(skb)->frags[i]; | ||
| 392 | |||
| 393 | f->page = alloc_page(gfp|__GFP_ZERO); | ||
| 394 | if (!f->page) | ||
| 395 | break; | ||
| 396 | |||
| 397 | f->page_offset = 0; | ||
| 398 | f->size = PAGE_SIZE; | ||
| 399 | |||
| 400 | skb->data_len += PAGE_SIZE; | ||
| 401 | skb->len += PAGE_SIZE; | ||
| 402 | skb->truesize += PAGE_SIZE; | ||
| 403 | skb_shinfo(skb)->nr_frags++; | ||
| 404 | |||
| 405 | if (len < PAGE_SIZE) { | ||
| 406 | len = 0; | ||
| 407 | break; | ||
| 408 | } | ||
| 409 | len -= PAGE_SIZE; | ||
| 410 | } | ||
| 411 | |||
| 412 | /* Too large, or alloc fail? */ | ||
| 413 | if (unlikely(len)) { | ||
| 414 | kfree_skb(skb); | ||
| 415 | skb = NULL; | ||
| 416 | } | ||
| 417 | |||
| 418 | return skb; | ||
| 419 | } | ||
| 420 | |||
| 361 | /* Get packet from user space buffer */ | 421 | /* Get packet from user space buffer */ |
| 362 | static __inline__ ssize_t tun_get_user(struct tun_struct *tun, struct iovec *iv, size_t count) | 422 | static __inline__ ssize_t tun_get_user(struct tun_struct *tun, struct iovec *iv, size_t count) |
| 363 | { | 423 | { |
| @@ -391,14 +451,12 @@ static __inline__ ssize_t tun_get_user(struct tun_struct *tun, struct iovec *iv, | |||
| 391 | return -EINVAL; | 451 | return -EINVAL; |
| 392 | } | 452 | } |
| 393 | 453 | ||
| 394 | if (!(skb = alloc_skb(len + align, GFP_KERNEL))) { | 454 | if (!(skb = tun_alloc_skb(align, len, gso.hdr_len, GFP_KERNEL))) { |
| 395 | tun->dev->stats.rx_dropped++; | 455 | tun->dev->stats.rx_dropped++; |
| 396 | return -ENOMEM; | 456 | return -ENOMEM; |
| 397 | } | 457 | } |
| 398 | 458 | ||
| 399 | if (align) | 459 | if (skb_copy_datagram_from_iovec(skb, 0, iv, len)) { |
| 400 | skb_reserve(skb, align); | ||
| 401 | if (memcpy_fromiovec(skb_put(skb, len), iv, len)) { | ||
| 402 | tun->dev->stats.rx_dropped++; | 460 | tun->dev->stats.rx_dropped++; |
| 403 | kfree_skb(skb); | 461 | kfree_skb(skb); |
| 404 | return -EFAULT; | 462 | return -EFAULT; |
| @@ -748,6 +806,36 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr) | |||
| 748 | return err; | 806 | return err; |
| 749 | } | 807 | } |
| 750 | 808 | ||
| 809 | static int tun_get_iff(struct net *net, struct file *file, struct ifreq *ifr) | ||
| 810 | { | ||
| 811 | struct tun_struct *tun = file->private_data; | ||
| 812 | |||
| 813 | if (!tun) | ||
| 814 | return -EBADFD; | ||
| 815 | |||
| 816 | DBG(KERN_INFO "%s: tun_get_iff\n", tun->dev->name); | ||
| 817 | |||
| 818 | strcpy(ifr->ifr_name, tun->dev->name); | ||
| 819 | |||
| 820 | ifr->ifr_flags = 0; | ||
| 821 | |||
| 822 | if (ifr->ifr_flags & TUN_TUN_DEV) | ||
| 823 | ifr->ifr_flags |= IFF_TUN; | ||
| 824 | else | ||
| 825 | ifr->ifr_flags |= IFF_TAP; | ||
| 826 | |||
| 827 | if (tun->flags & TUN_NO_PI) | ||
| 828 | ifr->ifr_flags |= IFF_NO_PI; | ||
| 829 | |||
| 830 | if (tun->flags & TUN_ONE_QUEUE) | ||
| 831 | ifr->ifr_flags |= IFF_ONE_QUEUE; | ||
| 832 | |||
| 833 | if (tun->flags & TUN_VNET_HDR) | ||
| 834 | ifr->ifr_flags |= IFF_VNET_HDR; | ||
| 835 | |||
| 836 | return 0; | ||
| 837 | } | ||
| 838 | |||
| 751 | /* This is like a cut-down ethtool ops, except done via tun fd so no | 839 | /* This is like a cut-down ethtool ops, except done via tun fd so no |
| 752 | * privs required. */ | 840 | * privs required. */ |
| 753 | static int set_offload(struct net_device *dev, unsigned long arg) | 841 | static int set_offload(struct net_device *dev, unsigned long arg) |
| @@ -833,6 +921,15 @@ static int tun_chr_ioctl(struct inode *inode, struct file *file, | |||
| 833 | DBG(KERN_INFO "%s: tun_chr_ioctl cmd %d\n", tun->dev->name, cmd); | 921 | DBG(KERN_INFO "%s: tun_chr_ioctl cmd %d\n", tun->dev->name, cmd); |
| 834 | 922 | ||
| 835 | switch (cmd) { | 923 | switch (cmd) { |
| 924 | case TUNGETIFF: | ||
| 925 | ret = tun_get_iff(current->nsproxy->net_ns, file, &ifr); | ||
| 926 | if (ret) | ||
| 927 | return ret; | ||
| 928 | |||
| 929 | if (copy_to_user(argp, &ifr, sizeof(ifr))) | ||
| 930 | return -EFAULT; | ||
| 931 | break; | ||
| 932 | |||
| 836 | case TUNSETNOCSUM: | 933 | case TUNSETNOCSUM: |
| 837 | /* Disable/Enable checksum */ | 934 | /* Disable/Enable checksum */ |
| 838 | if (arg) | 935 | if (arg) |
diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c index 8549f1159a30..734ce0977f02 100644 --- a/drivers/net/typhoon.c +++ b/drivers/net/typhoon.c | |||
| @@ -128,7 +128,6 @@ static const int multicast_filter_limit = 32; | |||
| 128 | #include <asm/io.h> | 128 | #include <asm/io.h> |
| 129 | #include <asm/uaccess.h> | 129 | #include <asm/uaccess.h> |
| 130 | #include <linux/in6.h> | 130 | #include <linux/in6.h> |
| 131 | #include <linux/version.h> | ||
| 132 | #include <linux/dma-mapping.h> | 131 | #include <linux/dma-mapping.h> |
| 133 | 132 | ||
| 134 | #include "typhoon.h" | 133 | #include "typhoon.h" |
diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig index 68e198bd538b..0973b6e37024 100644 --- a/drivers/net/usb/Kconfig +++ b/drivers/net/usb/Kconfig | |||
| @@ -154,17 +154,6 @@ config USB_NET_AX8817X | |||
| 154 | This driver creates an interface named "ethX", where X depends on | 154 | This driver creates an interface named "ethX", where X depends on |
| 155 | what other networking devices you have in use. | 155 | what other networking devices you have in use. |
| 156 | 156 | ||
| 157 | config USB_HSO | ||
| 158 | tristate "Option USB High Speed Mobile Devices" | ||
| 159 | depends on USB && RFKILL | ||
| 160 | default n | ||
| 161 | help | ||
| 162 | Choose this option if you have an Option HSDPA/HSUPA card. | ||
| 163 | These cards support downlink speeds of 7.2Mbps or greater. | ||
| 164 | |||
| 165 | To compile this driver as a module, choose M here: the | ||
| 166 | module will be called hso. | ||
| 167 | |||
| 168 | config USB_NET_CDCETHER | 157 | config USB_NET_CDCETHER |
| 169 | tristate "CDC Ethernet support (smart devices such as cable modems)" | 158 | tristate "CDC Ethernet support (smart devices such as cable modems)" |
| 170 | depends on USB_USBNET | 159 | depends on USB_USBNET |
| @@ -337,5 +326,15 @@ config USB_NET_ZAURUS | |||
| 337 | really need this non-conformant variant of CDC Ethernet (or in | 326 | really need this non-conformant variant of CDC Ethernet (or in |
| 338 | some cases CDC MDLM) protocol, not "g_ether". | 327 | some cases CDC MDLM) protocol, not "g_ether". |
| 339 | 328 | ||
| 329 | config USB_HSO | ||
| 330 | tristate "Option USB High Speed Mobile Devices" | ||
| 331 | depends on USB && RFKILL | ||
| 332 | default n | ||
| 333 | help | ||
| 334 | Choose this option if you have an Option HSDPA/HSUPA card. | ||
| 335 | These cards support downlink speeds of 7.2Mbps or greater. | ||
| 336 | |||
| 337 | To compile this driver as a module, choose M here: the | ||
| 338 | module will be called hso. | ||
| 340 | 339 | ||
| 341 | endmenu | 340 | endmenu |
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c index 031d07b105af..6e42b5a8c22b 100644 --- a/drivers/net/usb/hso.c +++ b/drivers/net/usb/hso.c | |||
| @@ -102,8 +102,12 @@ | |||
| 102 | 102 | ||
| 103 | #define MAX_RX_URBS 2 | 103 | #define MAX_RX_URBS 2 |
| 104 | 104 | ||
| 105 | #define get_serial_by_tty(x) \ | 105 | static inline struct hso_serial *get_serial_by_tty(struct tty_struct *tty) |
| 106 | (x ? (struct hso_serial *)x->driver_data : NULL) | 106 | { |
| 107 | if (tty) | ||
| 108 | return tty->driver_data; | ||
| 109 | return NULL; | ||
| 110 | } | ||
| 107 | 111 | ||
| 108 | /*****************************************************************************/ | 112 | /*****************************************************************************/ |
| 109 | /* Debugging functions */ | 113 | /* Debugging functions */ |
| @@ -294,24 +298,25 @@ static int hso_get_activity(struct hso_device *hso_dev); | |||
| 294 | 298 | ||
| 295 | /* #define DEBUG */ | 299 | /* #define DEBUG */ |
| 296 | 300 | ||
| 297 | #define dev2net(x) (x->port_data.dev_net) | 301 | static inline struct hso_net *dev2net(struct hso_device *hso_dev) |
| 298 | #define dev2ser(x) (x->port_data.dev_serial) | 302 | { |
| 303 | return hso_dev->port_data.dev_net; | ||
| 304 | } | ||
| 305 | |||
| 306 | static inline struct hso_serial *dev2ser(struct hso_device *hso_dev) | ||
| 307 | { | ||
| 308 | return hso_dev->port_data.dev_serial; | ||
| 309 | } | ||
| 299 | 310 | ||
| 300 | /* Debugging functions */ | 311 | /* Debugging functions */ |
| 301 | #ifdef DEBUG | 312 | #ifdef DEBUG |
| 302 | static void dbg_dump(int line_count, const char *func_name, unsigned char *buf, | 313 | static void dbg_dump(int line_count, const char *func_name, unsigned char *buf, |
| 303 | unsigned int len) | 314 | unsigned int len) |
| 304 | { | 315 | { |
| 305 | u8 i = 0; | 316 | static char name[255]; |
| 306 | 317 | ||
| 307 | printk(KERN_DEBUG "[%d:%s]: len %d", line_count, func_name, len); | 318 | sprintf(name, "hso[%d:%s]", line_count, func_name); |
| 308 | 319 | print_hex_dump_bytes(name, DUMP_PREFIX_NONE, buf, len); | |
| 309 | for (i = 0; i < len; i++) { | ||
| 310 | if (!(i % 16)) | ||
| 311 | printk("\n 0x%03x: ", i); | ||
| 312 | printk("%02x ", (unsigned char)buf[i]); | ||
| 313 | } | ||
| 314 | printk("\n"); | ||
| 315 | } | 320 | } |
| 316 | 321 | ||
| 317 | #define DUMP(buf_, len_) \ | 322 | #define DUMP(buf_, len_) \ |
| @@ -392,7 +397,7 @@ static const struct usb_device_id hso_ids[] = { | |||
| 392 | {default_port_device(0x0af0, 0xc031)}, /* Icon-Edge */ | 397 | {default_port_device(0x0af0, 0xc031)}, /* Icon-Edge */ |
| 393 | {icon321_port_device(0x0af0, 0xd013)}, /* Module HSxPA */ | 398 | {icon321_port_device(0x0af0, 0xd013)}, /* Module HSxPA */ |
| 394 | {icon321_port_device(0x0af0, 0xd031)}, /* Icon-321 */ | 399 | {icon321_port_device(0x0af0, 0xd031)}, /* Icon-321 */ |
| 395 | {default_port_device(0x0af0, 0xd033)}, /* Icon-322 */ | 400 | {icon321_port_device(0x0af0, 0xd033)}, /* Icon-322 */ |
| 396 | {USB_DEVICE(0x0af0, 0x7301)}, /* GE40x */ | 401 | {USB_DEVICE(0x0af0, 0x7301)}, /* GE40x */ |
| 397 | {USB_DEVICE(0x0af0, 0x7361)}, /* GE40x */ | 402 | {USB_DEVICE(0x0af0, 0x7361)}, /* GE40x */ |
| 398 | {USB_DEVICE(0x0af0, 0x7401)}, /* GI 0401 */ | 403 | {USB_DEVICE(0x0af0, 0x7401)}, /* GI 0401 */ |
| @@ -528,13 +533,12 @@ static struct hso_serial *get_serial_by_shared_int_and_type( | |||
| 528 | 533 | ||
| 529 | static struct hso_serial *get_serial_by_index(unsigned index) | 534 | static struct hso_serial *get_serial_by_index(unsigned index) |
| 530 | { | 535 | { |
| 531 | struct hso_serial *serial; | 536 | struct hso_serial *serial = NULL; |
| 532 | unsigned long flags; | 537 | unsigned long flags; |
| 533 | 538 | ||
| 534 | if (!serial_table[index]) | ||
| 535 | return NULL; | ||
| 536 | spin_lock_irqsave(&serial_table_lock, flags); | 539 | spin_lock_irqsave(&serial_table_lock, flags); |
| 537 | serial = dev2ser(serial_table[index]); | 540 | if (serial_table[index]) |
| 541 | serial = dev2ser(serial_table[index]); | ||
| 538 | spin_unlock_irqrestore(&serial_table_lock, flags); | 542 | spin_unlock_irqrestore(&serial_table_lock, flags); |
| 539 | 543 | ||
| 540 | return serial; | 544 | return serial; |
| @@ -561,6 +565,7 @@ static int get_free_serial_index(void) | |||
| 561 | static void set_serial_by_index(unsigned index, struct hso_serial *serial) | 565 | static void set_serial_by_index(unsigned index, struct hso_serial *serial) |
| 562 | { | 566 | { |
| 563 | unsigned long flags; | 567 | unsigned long flags; |
| 568 | |||
| 564 | spin_lock_irqsave(&serial_table_lock, flags); | 569 | spin_lock_irqsave(&serial_table_lock, flags); |
| 565 | if (serial) | 570 | if (serial) |
| 566 | serial_table[index] = serial->parent; | 571 | serial_table[index] = serial->parent; |
| @@ -569,7 +574,7 @@ static void set_serial_by_index(unsigned index, struct hso_serial *serial) | |||
| 569 | spin_unlock_irqrestore(&serial_table_lock, flags); | 574 | spin_unlock_irqrestore(&serial_table_lock, flags); |
| 570 | } | 575 | } |
| 571 | 576 | ||
| 572 | /* log a meaningfull explanation of an USB status */ | 577 | /* log a meaningful explanation of an USB status */ |
| 573 | static void log_usb_status(int status, const char *function) | 578 | static void log_usb_status(int status, const char *function) |
| 574 | { | 579 | { |
| 575 | char *explanation; | 580 | char *explanation; |
| @@ -1103,8 +1108,8 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp) | |||
| 1103 | /* reset the rts and dtr */ | 1108 | /* reset the rts and dtr */ |
| 1104 | /* do the actual close */ | 1109 | /* do the actual close */ |
| 1105 | serial->open_count--; | 1110 | serial->open_count--; |
| 1111 | kref_put(&serial->parent->ref, hso_serial_ref_free); | ||
| 1106 | if (serial->open_count <= 0) { | 1112 | if (serial->open_count <= 0) { |
| 1107 | kref_put(&serial->parent->ref, hso_serial_ref_free); | ||
| 1108 | serial->open_count = 0; | 1113 | serial->open_count = 0; |
| 1109 | if (serial->tty) { | 1114 | if (serial->tty) { |
| 1110 | serial->tty->driver_data = NULL; | 1115 | serial->tty->driver_data = NULL; |
| @@ -1467,7 +1472,8 @@ static void hso_std_serial_write_bulk_callback(struct urb *urb) | |||
| 1467 | return; | 1472 | return; |
| 1468 | } | 1473 | } |
| 1469 | hso_put_activity(serial->parent); | 1474 | hso_put_activity(serial->parent); |
| 1470 | tty_wakeup(serial->tty); | 1475 | if (serial->tty) |
| 1476 | tty_wakeup(serial->tty); | ||
| 1471 | hso_kick_transmit(serial); | 1477 | hso_kick_transmit(serial); |
| 1472 | 1478 | ||
| 1473 | D1(" "); | 1479 | D1(" "); |
| @@ -1538,7 +1544,8 @@ static void ctrl_callback(struct urb *urb) | |||
| 1538 | clear_bit(HSO_SERIAL_FLAG_RX_SENT, &serial->flags); | 1544 | clear_bit(HSO_SERIAL_FLAG_RX_SENT, &serial->flags); |
| 1539 | } else { | 1545 | } else { |
| 1540 | hso_put_activity(serial->parent); | 1546 | hso_put_activity(serial->parent); |
| 1541 | tty_wakeup(serial->tty); | 1547 | if (serial->tty) |
| 1548 | tty_wakeup(serial->tty); | ||
| 1542 | /* response to a write command */ | 1549 | /* response to a write command */ |
| 1543 | hso_kick_transmit(serial); | 1550 | hso_kick_transmit(serial); |
| 1544 | } | 1551 | } |
| @@ -2606,6 +2613,7 @@ static int hso_resume(struct usb_interface *iface) | |||
| 2606 | "Transmitting lingering data\n"); | 2613 | "Transmitting lingering data\n"); |
| 2607 | hso_net_start_xmit(hso_net->skb_tx_buf, | 2614 | hso_net_start_xmit(hso_net->skb_tx_buf, |
| 2608 | hso_net->net); | 2615 | hso_net->net); |
| 2616 | hso_net->skb_tx_buf = NULL; | ||
| 2609 | } | 2617 | } |
| 2610 | result = hso_start_net_device(network_table[i]); | 2618 | result = hso_start_net_device(network_table[i]); |
| 2611 | if (result) | 2619 | if (result) |
| @@ -2652,7 +2660,7 @@ static void hso_free_interface(struct usb_interface *interface) | |||
| 2652 | hso_stop_net_device(network_table[i]); | 2660 | hso_stop_net_device(network_table[i]); |
| 2653 | cancel_work_sync(&network_table[i]->async_put_intf); | 2661 | cancel_work_sync(&network_table[i]->async_put_intf); |
| 2654 | cancel_work_sync(&network_table[i]->async_get_intf); | 2662 | cancel_work_sync(&network_table[i]->async_get_intf); |
| 2655 | if(rfk) | 2663 | if (rfk) |
| 2656 | rfkill_unregister(rfk); | 2664 | rfkill_unregister(rfk); |
| 2657 | hso_free_net_device(network_table[i]); | 2665 | hso_free_net_device(network_table[i]); |
| 2658 | } | 2666 | } |
| @@ -2723,7 +2731,7 @@ static int hso_mux_submit_intr_urb(struct hso_shared_int *shared_int, | |||
| 2723 | } | 2731 | } |
| 2724 | 2732 | ||
| 2725 | /* operations setup of the serial interface */ | 2733 | /* operations setup of the serial interface */ |
| 2726 | static struct tty_operations hso_serial_ops = { | 2734 | static const struct tty_operations hso_serial_ops = { |
| 2727 | .open = hso_serial_open, | 2735 | .open = hso_serial_open, |
| 2728 | .close = hso_serial_close, | 2736 | .close = hso_serial_close, |
| 2729 | .write = hso_serial_write, | 2737 | .write = hso_serial_write, |
diff --git a/drivers/net/usb/mcs7830.c b/drivers/net/usb/mcs7830.c index c3d119f997f5..ca9d00c1194e 100644 --- a/drivers/net/usb/mcs7830.c +++ b/drivers/net/usb/mcs7830.c | |||
| @@ -46,6 +46,10 @@ | |||
| 46 | 46 | ||
| 47 | #define MCS7830_VENDOR_ID 0x9710 | 47 | #define MCS7830_VENDOR_ID 0x9710 |
| 48 | #define MCS7830_PRODUCT_ID 0x7830 | 48 | #define MCS7830_PRODUCT_ID 0x7830 |
| 49 | #define MCS7730_PRODUCT_ID 0x7730 | ||
| 50 | |||
| 51 | #define SITECOM_VENDOR_ID 0x0DF6 | ||
| 52 | #define LN_030_PRODUCT_ID 0x0021 | ||
| 49 | 53 | ||
| 50 | #define MCS7830_MII_ADVERTISE (ADVERTISE_PAUSE_CAP | ADVERTISE_100FULL | \ | 54 | #define MCS7830_MII_ADVERTISE (ADVERTISE_PAUSE_CAP | ADVERTISE_100FULL | \ |
| 51 | ADVERTISE_100HALF | ADVERTISE_10FULL | \ | 55 | ADVERTISE_100HALF | ADVERTISE_10FULL | \ |
| @@ -442,6 +446,29 @@ static struct ethtool_ops mcs7830_ethtool_ops = { | |||
| 442 | .nway_reset = usbnet_nway_reset, | 446 | .nway_reset = usbnet_nway_reset, |
| 443 | }; | 447 | }; |
| 444 | 448 | ||
| 449 | static int mcs7830_set_mac_address(struct net_device *netdev, void *p) | ||
| 450 | { | ||
| 451 | int ret; | ||
| 452 | struct usbnet *dev = netdev_priv(netdev); | ||
| 453 | struct sockaddr *addr = p; | ||
| 454 | |||
| 455 | if (netif_running(netdev)) | ||
| 456 | return -EBUSY; | ||
| 457 | |||
| 458 | if (!is_valid_ether_addr(addr->sa_data)) | ||
| 459 | return -EINVAL; | ||
| 460 | |||
| 461 | memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len); | ||
| 462 | |||
| 463 | ret = mcs7830_set_reg(dev, HIF_REG_ETHERNET_ADDR, ETH_ALEN, | ||
| 464 | netdev->dev_addr); | ||
| 465 | |||
| 466 | if (ret < 0) | ||
| 467 | return ret; | ||
| 468 | |||
| 469 | return 0; | ||
| 470 | } | ||
| 471 | |||
| 445 | static int mcs7830_bind(struct usbnet *dev, struct usb_interface *udev) | 472 | static int mcs7830_bind(struct usbnet *dev, struct usb_interface *udev) |
| 446 | { | 473 | { |
| 447 | struct net_device *net = dev->net; | 474 | struct net_device *net = dev->net; |
| @@ -455,6 +482,7 @@ static int mcs7830_bind(struct usbnet *dev, struct usb_interface *udev) | |||
| 455 | net->ethtool_ops = &mcs7830_ethtool_ops; | 482 | net->ethtool_ops = &mcs7830_ethtool_ops; |
| 456 | net->set_multicast_list = mcs7830_set_multicast; | 483 | net->set_multicast_list = mcs7830_set_multicast; |
| 457 | mcs7830_set_multicast(net); | 484 | mcs7830_set_multicast(net); |
| 485 | net->set_mac_address = mcs7830_set_mac_address; | ||
| 458 | 486 | ||
| 459 | /* reserve space for the status byte on rx */ | 487 | /* reserve space for the status byte on rx */ |
| 460 | dev->rx_urb_size = ETH_FRAME_LEN + 1; | 488 | dev->rx_urb_size = ETH_FRAME_LEN + 1; |
| @@ -491,7 +519,16 @@ static int mcs7830_rx_fixup(struct usbnet *dev, struct sk_buff *skb) | |||
| 491 | } | 519 | } |
| 492 | 520 | ||
| 493 | static const struct driver_info moschip_info = { | 521 | static const struct driver_info moschip_info = { |
| 494 | .description = "MOSCHIP 7830 usb-NET adapter", | 522 | .description = "MOSCHIP 7830/7730 usb-NET adapter", |
| 523 | .bind = mcs7830_bind, | ||
| 524 | .rx_fixup = mcs7830_rx_fixup, | ||
| 525 | .flags = FLAG_ETHER, | ||
| 526 | .in = 1, | ||
| 527 | .out = 2, | ||
| 528 | }; | ||
| 529 | |||
| 530 | static const struct driver_info sitecom_info = { | ||
| 531 | .description = "Sitecom LN-30 usb-NET adapter", | ||
| 495 | .bind = mcs7830_bind, | 532 | .bind = mcs7830_bind, |
| 496 | .rx_fixup = mcs7830_rx_fixup, | 533 | .rx_fixup = mcs7830_rx_fixup, |
| 497 | .flags = FLAG_ETHER, | 534 | .flags = FLAG_ETHER, |
| @@ -504,6 +541,14 @@ static const struct usb_device_id products[] = { | |||
| 504 | USB_DEVICE(MCS7830_VENDOR_ID, MCS7830_PRODUCT_ID), | 541 | USB_DEVICE(MCS7830_VENDOR_ID, MCS7830_PRODUCT_ID), |
| 505 | .driver_info = (unsigned long) &moschip_info, | 542 | .driver_info = (unsigned long) &moschip_info, |
| 506 | }, | 543 | }, |
| 544 | { | ||
| 545 | USB_DEVICE(MCS7830_VENDOR_ID, MCS7730_PRODUCT_ID), | ||
| 546 | .driver_info = (unsigned long) &moschip_info, | ||
| 547 | }, | ||
| 548 | { | ||
| 549 | USB_DEVICE(SITECOM_VENDOR_ID, LN_030_PRODUCT_ID), | ||
| 550 | .driver_info = (unsigned long) &sitecom_info, | ||
| 551 | }, | ||
| 507 | {}, | 552 | {}, |
| 508 | }; | 553 | }; |
| 509 | MODULE_DEVICE_TABLE(usb, products); | 554 | MODULE_DEVICE_TABLE(usb, products); |
diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c index a84ba487c713..8c19307e5040 100644 --- a/drivers/net/usb/pegasus.c +++ b/drivers/net/usb/pegasus.c | |||
| @@ -117,7 +117,7 @@ static void ctrl_callback(struct urb *urb) | |||
| 117 | case -ENOENT: | 117 | case -ENOENT: |
| 118 | break; | 118 | break; |
| 119 | default: | 119 | default: |
| 120 | if (netif_msg_drv(pegasus)) | 120 | if (netif_msg_drv(pegasus) && printk_ratelimit()) |
| 121 | dev_dbg(&pegasus->intf->dev, "%s, status %d\n", | 121 | dev_dbg(&pegasus->intf->dev, "%s, status %d\n", |
| 122 | __FUNCTION__, urb->status); | 122 | __FUNCTION__, urb->status); |
| 123 | } | 123 | } |
| @@ -166,7 +166,7 @@ static int get_registers(pegasus_t * pegasus, __u16 indx, __u16 size, | |||
| 166 | set_current_state(TASK_RUNNING); | 166 | set_current_state(TASK_RUNNING); |
| 167 | if (ret == -ENODEV) | 167 | if (ret == -ENODEV) |
| 168 | netif_device_detach(pegasus->net); | 168 | netif_device_detach(pegasus->net); |
| 169 | if (netif_msg_drv(pegasus)) | 169 | if (netif_msg_drv(pegasus) && printk_ratelimit()) |
| 170 | dev_err(&pegasus->intf->dev, "%s, status %d\n", | 170 | dev_err(&pegasus->intf->dev, "%s, status %d\n", |
| 171 | __FUNCTION__, ret); | 171 | __FUNCTION__, ret); |
| 172 | goto out; | 172 | goto out; |
| @@ -275,7 +275,7 @@ static int set_register(pegasus_t * pegasus, __u16 indx, __u8 data) | |||
| 275 | if ((ret = usb_submit_urb(pegasus->ctrl_urb, GFP_ATOMIC))) { | 275 | if ((ret = usb_submit_urb(pegasus->ctrl_urb, GFP_ATOMIC))) { |
| 276 | if (ret == -ENODEV) | 276 | if (ret == -ENODEV) |
| 277 | netif_device_detach(pegasus->net); | 277 | netif_device_detach(pegasus->net); |
| 278 | if (netif_msg_drv(pegasus)) | 278 | if (netif_msg_drv(pegasus) && printk_ratelimit()) |
| 279 | dev_err(&pegasus->intf->dev, "%s, status %d\n", | 279 | dev_err(&pegasus->intf->dev, "%s, status %d\n", |
| 280 | __FUNCTION__, ret); | 280 | __FUNCTION__, ret); |
| 281 | goto out; | 281 | goto out; |
| @@ -1209,8 +1209,7 @@ static void pegasus_set_multicast(struct net_device *net) | |||
| 1209 | pegasus->eth_regs[EthCtrl2] |= RX_PROMISCUOUS; | 1209 | pegasus->eth_regs[EthCtrl2] |= RX_PROMISCUOUS; |
| 1210 | if (netif_msg_link(pegasus)) | 1210 | if (netif_msg_link(pegasus)) |
| 1211 | pr_info("%s: Promiscuous mode enabled.\n", net->name); | 1211 | pr_info("%s: Promiscuous mode enabled.\n", net->name); |
| 1212 | } else if (net->mc_count || | 1212 | } else if (net->mc_count || (net->flags & IFF_ALLMULTI)) { |
| 1213 | (net->flags & IFF_ALLMULTI)) { | ||
| 1214 | pegasus->eth_regs[EthCtrl0] |= RX_MULTICAST; | 1213 | pegasus->eth_regs[EthCtrl0] |= RX_MULTICAST; |
| 1215 | pegasus->eth_regs[EthCtrl2] &= ~RX_PROMISCUOUS; | 1214 | pegasus->eth_regs[EthCtrl2] &= ~RX_PROMISCUOUS; |
| 1216 | if (netif_msg_link(pegasus)) | 1215 | if (netif_msg_link(pegasus)) |
| @@ -1220,6 +1219,8 @@ static void pegasus_set_multicast(struct net_device *net) | |||
| 1220 | pegasus->eth_regs[EthCtrl2] &= ~RX_PROMISCUOUS; | 1219 | pegasus->eth_regs[EthCtrl2] &= ~RX_PROMISCUOUS; |
| 1221 | } | 1220 | } |
| 1222 | 1221 | ||
| 1222 | pegasus->ctrl_urb->status = 0; | ||
| 1223 | |||
| 1223 | pegasus->flags |= ETH_REGS_CHANGE; | 1224 | pegasus->flags |= ETH_REGS_CHANGE; |
| 1224 | ctrl_callback(pegasus->ctrl_urb); | 1225 | ctrl_callback(pegasus->ctrl_urb); |
| 1225 | } | 1226 | } |
diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c index e59255a155a9..6596cd0742b9 100644 --- a/drivers/net/wan/sbni.c +++ b/drivers/net/wan/sbni.c | |||
| @@ -1317,7 +1317,7 @@ sbni_ioctl( struct net_device *dev, struct ifreq *ifr, int cmd ) | |||
| 1317 | break; | 1317 | break; |
| 1318 | 1318 | ||
| 1319 | case SIOCDEVRESINSTATS : | 1319 | case SIOCDEVRESINSTATS : |
| 1320 | if( current->euid != 0 ) /* root only */ | 1320 | if (!capable(CAP_NET_ADMIN)) |
| 1321 | return -EPERM; | 1321 | return -EPERM; |
| 1322 | memset( &nl->in_stats, 0, sizeof(struct sbni_in_stats) ); | 1322 | memset( &nl->in_stats, 0, sizeof(struct sbni_in_stats) ); |
| 1323 | break; | 1323 | break; |
| @@ -1334,7 +1334,7 @@ sbni_ioctl( struct net_device *dev, struct ifreq *ifr, int cmd ) | |||
| 1334 | break; | 1334 | break; |
| 1335 | 1335 | ||
| 1336 | case SIOCDEVSHWSTATE : | 1336 | case SIOCDEVSHWSTATE : |
| 1337 | if( current->euid != 0 ) /* root only */ | 1337 | if (!capable(CAP_NET_ADMIN)) |
| 1338 | return -EPERM; | 1338 | return -EPERM; |
| 1339 | 1339 | ||
| 1340 | spin_lock( &nl->lock ); | 1340 | spin_lock( &nl->lock ); |
| @@ -1355,7 +1355,7 @@ sbni_ioctl( struct net_device *dev, struct ifreq *ifr, int cmd ) | |||
| 1355 | #ifdef CONFIG_SBNI_MULTILINE | 1355 | #ifdef CONFIG_SBNI_MULTILINE |
| 1356 | 1356 | ||
| 1357 | case SIOCDEVENSLAVE : | 1357 | case SIOCDEVENSLAVE : |
| 1358 | if( current->euid != 0 ) /* root only */ | 1358 | if (!capable(CAP_NET_ADMIN)) |
| 1359 | return -EPERM; | 1359 | return -EPERM; |
| 1360 | 1360 | ||
| 1361 | if (copy_from_user( slave_name, ifr->ifr_data, sizeof slave_name )) | 1361 | if (copy_from_user( slave_name, ifr->ifr_data, sizeof slave_name )) |
| @@ -1370,7 +1370,7 @@ sbni_ioctl( struct net_device *dev, struct ifreq *ifr, int cmd ) | |||
| 1370 | return enslave( dev, slave_dev ); | 1370 | return enslave( dev, slave_dev ); |
| 1371 | 1371 | ||
| 1372 | case SIOCDEVEMANSIPATE : | 1372 | case SIOCDEVEMANSIPATE : |
| 1373 | if( current->euid != 0 ) /* root only */ | 1373 | if (!capable(CAP_NET_ADMIN)) |
| 1374 | return -EPERM; | 1374 | return -EPERM; |
| 1375 | 1375 | ||
| 1376 | return emancipate( dev ); | 1376 | return emancipate( dev ); |
diff --git a/drivers/net/wd.c b/drivers/net/wd.c index 6f9aa1643743..fa14255282af 100644 --- a/drivers/net/wd.c +++ b/drivers/net/wd.c | |||
| @@ -337,7 +337,7 @@ static int __init wd_probe1(struct net_device *dev, int ioaddr) | |||
| 337 | #ifdef CONFIG_NET_POLL_CONTROLLER | 337 | #ifdef CONFIG_NET_POLL_CONTROLLER |
| 338 | dev->poll_controller = ei_poll; | 338 | dev->poll_controller = ei_poll; |
| 339 | #endif | 339 | #endif |
| 340 | NS8390p_init(dev, 0); | 340 | NS8390_init(dev, 0); |
| 341 | 341 | ||
| 342 | #if 1 | 342 | #if 1 |
| 343 | /* Enable interrupt generation on softconfig cards -- M.U */ | 343 | /* Enable interrupt generation on softconfig cards -- M.U */ |
diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c index 2028866f5995..0676c6d84383 100644 --- a/drivers/net/wireless/ath5k/base.c +++ b/drivers/net/wireless/ath5k/base.c | |||
| @@ -40,7 +40,6 @@ | |||
| 40 | * | 40 | * |
| 41 | */ | 41 | */ |
| 42 | 42 | ||
| 43 | #include <linux/version.h> | ||
| 44 | #include <linux/module.h> | 43 | #include <linux/module.h> |
| 45 | #include <linux/delay.h> | 44 | #include <linux/delay.h> |
| 46 | #include <linux/hardirq.h> | 45 | #include <linux/hardirq.h> |
| @@ -252,7 +251,7 @@ static inline void ath5k_txbuf_free(struct ath5k_softc *sc, | |||
| 252 | return; | 251 | return; |
| 253 | pci_unmap_single(sc->pdev, bf->skbaddr, bf->skb->len, | 252 | pci_unmap_single(sc->pdev, bf->skbaddr, bf->skb->len, |
| 254 | PCI_DMA_TODEVICE); | 253 | PCI_DMA_TODEVICE); |
| 255 | dev_kfree_skb(bf->skb); | 254 | dev_kfree_skb_any(bf->skb); |
| 256 | bf->skb = NULL; | 255 | bf->skb = NULL; |
| 257 | } | 256 | } |
| 258 | 257 | ||
| @@ -467,6 +466,7 @@ ath5k_pci_probe(struct pci_dev *pdev, | |||
| 467 | mutex_init(&sc->lock); | 466 | mutex_init(&sc->lock); |
| 468 | spin_lock_init(&sc->rxbuflock); | 467 | spin_lock_init(&sc->rxbuflock); |
| 469 | spin_lock_init(&sc->txbuflock); | 468 | spin_lock_init(&sc->txbuflock); |
| 469 | spin_lock_init(&sc->block); | ||
| 470 | 470 | ||
| 471 | /* Set private data */ | 471 | /* Set private data */ |
| 472 | pci_set_drvdata(pdev, hw); | 472 | pci_set_drvdata(pdev, hw); |
| @@ -587,7 +587,6 @@ ath5k_pci_suspend(struct pci_dev *pdev, pm_message_t state) | |||
| 587 | ath5k_stop_hw(sc); | 587 | ath5k_stop_hw(sc); |
| 588 | 588 | ||
| 589 | free_irq(pdev->irq, sc); | 589 | free_irq(pdev->irq, sc); |
| 590 | pci_disable_msi(pdev); | ||
| 591 | pci_save_state(pdev); | 590 | pci_save_state(pdev); |
| 592 | pci_disable_device(pdev); | 591 | pci_disable_device(pdev); |
| 593 | pci_set_power_state(pdev, PCI_D3hot); | 592 | pci_set_power_state(pdev, PCI_D3hot); |
| @@ -616,12 +615,10 @@ ath5k_pci_resume(struct pci_dev *pdev) | |||
| 616 | */ | 615 | */ |
| 617 | pci_write_config_byte(pdev, 0x41, 0); | 616 | pci_write_config_byte(pdev, 0x41, 0); |
| 618 | 617 | ||
| 619 | pci_enable_msi(pdev); | ||
| 620 | |||
| 621 | err = request_irq(pdev->irq, ath5k_intr, IRQF_SHARED, "ath", sc); | 618 | err = request_irq(pdev->irq, ath5k_intr, IRQF_SHARED, "ath", sc); |
| 622 | if (err) { | 619 | if (err) { |
| 623 | ATH5K_ERR(sc, "request_irq failed\n"); | 620 | ATH5K_ERR(sc, "request_irq failed\n"); |
| 624 | goto err_msi; | 621 | goto err_no_irq; |
| 625 | } | 622 | } |
| 626 | 623 | ||
| 627 | err = ath5k_init(sc); | 624 | err = ath5k_init(sc); |
| @@ -642,8 +639,7 @@ ath5k_pci_resume(struct pci_dev *pdev) | |||
| 642 | return 0; | 639 | return 0; |
| 643 | err_irq: | 640 | err_irq: |
| 644 | free_irq(pdev->irq, sc); | 641 | free_irq(pdev->irq, sc); |
| 645 | err_msi: | 642 | err_no_irq: |
| 646 | pci_disable_msi(pdev); | ||
| 647 | pci_disable_device(pdev); | 643 | pci_disable_device(pdev); |
| 648 | return err; | 644 | return err; |
| 649 | } | 645 | } |
| @@ -2184,8 +2180,11 @@ ath5k_beacon_config(struct ath5k_softc *sc) | |||
| 2184 | 2180 | ||
| 2185 | sc->imask |= AR5K_INT_SWBA; | 2181 | sc->imask |= AR5K_INT_SWBA; |
| 2186 | 2182 | ||
| 2187 | if (ath5k_hw_hasveol(ah)) | 2183 | if (ath5k_hw_hasveol(ah)) { |
| 2184 | spin_lock(&sc->block); | ||
| 2188 | ath5k_beacon_send(sc); | 2185 | ath5k_beacon_send(sc); |
| 2186 | spin_unlock(&sc->block); | ||
| 2187 | } | ||
| 2189 | } | 2188 | } |
| 2190 | /* TODO else AP */ | 2189 | /* TODO else AP */ |
| 2191 | 2190 | ||
| @@ -2408,7 +2407,9 @@ ath5k_intr(int irq, void *dev_id) | |||
| 2408 | TSF_TO_TU(tsf), | 2407 | TSF_TO_TU(tsf), |
| 2409 | (unsigned long long) tsf); | 2408 | (unsigned long long) tsf); |
| 2410 | } else { | 2409 | } else { |
| 2410 | spin_lock(&sc->block); | ||
| 2411 | ath5k_beacon_send(sc); | 2411 | ath5k_beacon_send(sc); |
| 2412 | spin_unlock(&sc->block); | ||
| 2412 | } | 2413 | } |
| 2413 | } | 2414 | } |
| 2414 | if (status & AR5K_INT_RXEOL) { | 2415 | if (status & AR5K_INT_RXEOL) { |
| @@ -2750,6 +2751,11 @@ static int ath5k_add_interface(struct ieee80211_hw *hw, | |||
| 2750 | ret = -EOPNOTSUPP; | 2751 | ret = -EOPNOTSUPP; |
| 2751 | goto end; | 2752 | goto end; |
| 2752 | } | 2753 | } |
| 2754 | |||
| 2755 | /* Set to a reasonable value. Note that this will | ||
| 2756 | * be set to mac80211's value at ath5k_config(). */ | ||
| 2757 | sc->bintval = 1000; | ||
| 2758 | |||
| 2753 | ret = 0; | 2759 | ret = 0; |
| 2754 | end: | 2760 | end: |
| 2755 | mutex_unlock(&sc->lock); | 2761 | mutex_unlock(&sc->lock); |
| @@ -2794,9 +2800,6 @@ ath5k_config_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif, | |||
| 2794 | struct ath5k_hw *ah = sc->ah; | 2800 | struct ath5k_hw *ah = sc->ah; |
| 2795 | int ret; | 2801 | int ret; |
| 2796 | 2802 | ||
| 2797 | /* Set to a reasonable value. Note that this will | ||
| 2798 | * be set to mac80211's value at ath5k_config(). */ | ||
| 2799 | sc->bintval = 1000; | ||
| 2800 | mutex_lock(&sc->lock); | 2803 | mutex_lock(&sc->lock); |
| 2801 | if (sc->vif != vif) { | 2804 | if (sc->vif != vif) { |
| 2802 | ret = -EIO; | 2805 | ret = -EIO; |
| @@ -3055,6 +3058,7 @@ static int | |||
| 3055 | ath5k_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb) | 3058 | ath5k_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb) |
| 3056 | { | 3059 | { |
| 3057 | struct ath5k_softc *sc = hw->priv; | 3060 | struct ath5k_softc *sc = hw->priv; |
| 3061 | unsigned long flags; | ||
| 3058 | int ret; | 3062 | int ret; |
| 3059 | 3063 | ||
| 3060 | ath5k_debug_dump_skb(sc, skb, "BC ", 1); | 3064 | ath5k_debug_dump_skb(sc, skb, "BC ", 1); |
| @@ -3064,12 +3068,14 @@ ath5k_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb) | |||
| 3064 | goto end; | 3068 | goto end; |
| 3065 | } | 3069 | } |
| 3066 | 3070 | ||
| 3071 | spin_lock_irqsave(&sc->block, flags); | ||
| 3067 | ath5k_txbuf_free(sc, sc->bbuf); | 3072 | ath5k_txbuf_free(sc, sc->bbuf); |
| 3068 | sc->bbuf->skb = skb; | 3073 | sc->bbuf->skb = skb; |
| 3069 | ret = ath5k_beacon_setup(sc, sc->bbuf); | 3074 | ret = ath5k_beacon_setup(sc, sc->bbuf); |
| 3070 | if (ret) | 3075 | if (ret) |
| 3071 | sc->bbuf->skb = NULL; | 3076 | sc->bbuf->skb = NULL; |
| 3072 | else { | 3077 | spin_unlock_irqrestore(&sc->block, flags); |
| 3078 | if (!ret) { | ||
| 3073 | ath5k_beacon_config(sc); | 3079 | ath5k_beacon_config(sc); |
| 3074 | mmiowb(); | 3080 | mmiowb(); |
| 3075 | } | 3081 | } |
diff --git a/drivers/net/wireless/ath5k/base.h b/drivers/net/wireless/ath5k/base.h index d7e03e6b8271..7ec2f377d5c7 100644 --- a/drivers/net/wireless/ath5k/base.h +++ b/drivers/net/wireless/ath5k/base.h | |||
| @@ -172,6 +172,7 @@ struct ath5k_softc { | |||
| 172 | struct tasklet_struct txtq; /* tx intr tasklet */ | 172 | struct tasklet_struct txtq; /* tx intr tasklet */ |
| 173 | struct ath5k_led tx_led; /* tx led */ | 173 | struct ath5k_led tx_led; /* tx led */ |
| 174 | 174 | ||
| 175 | spinlock_t block; /* protects beacon */ | ||
| 175 | struct ath5k_buf *bbuf; /* beacon buffer */ | 176 | struct ath5k_buf *bbuf; /* beacon buffer */ |
| 176 | unsigned int bhalq, /* SW q for outgoing beacons */ | 177 | unsigned int bhalq, /* SW q for outgoing beacons */ |
| 177 | bmisscount, /* missed beacon transmits */ | 178 | bmisscount, /* missed beacon transmits */ |
diff --git a/drivers/net/wireless/ath9k/hw.c b/drivers/net/wireless/ath9k/hw.c index bde162f128ab..6dbfed0b4149 100644 --- a/drivers/net/wireless/ath9k/hw.c +++ b/drivers/net/wireless/ath9k/hw.c | |||
| @@ -5017,7 +5017,11 @@ static void ath9k_hw_spur_mitigate(struct ath_hal *ah, | |||
| 5017 | 5017 | ||
| 5018 | for (i = 0; i < 123; i++) { | 5018 | for (i = 0; i < 123; i++) { |
| 5019 | if ((cur_vit_mask > lower) && (cur_vit_mask < upper)) { | 5019 | if ((cur_vit_mask > lower) && (cur_vit_mask < upper)) { |
| 5020 | if ((abs(cur_vit_mask - bin)) < 75) | 5020 | |
| 5021 | /* workaround for gcc bug #37014 */ | ||
| 5022 | volatile int tmp = abs(cur_vit_mask - bin); | ||
| 5023 | |||
| 5024 | if (tmp < 75) | ||
| 5021 | mask_amt = 1; | 5025 | mask_amt = 1; |
| 5022 | else | 5026 | else |
| 5023 | mask_amt = 0; | 5027 | mask_amt = 0; |
| @@ -7281,15 +7285,15 @@ ath9k_hw_set_keycache_entry(struct ath_hal *ah, u16 entry, | |||
| 7281 | } | 7285 | } |
| 7282 | break; | 7286 | break; |
| 7283 | case ATH9K_CIPHER_WEP: | 7287 | case ATH9K_CIPHER_WEP: |
| 7284 | if (k->kv_len < 40 / NBBY) { | 7288 | if (k->kv_len < LEN_WEP40) { |
| 7285 | DPRINTF(ah->ah_sc, ATH_DBG_KEYCACHE, | 7289 | DPRINTF(ah->ah_sc, ATH_DBG_KEYCACHE, |
| 7286 | "%s: WEP key length %u too small\n", | 7290 | "%s: WEP key length %u too small\n", |
| 7287 | __func__, k->kv_len); | 7291 | __func__, k->kv_len); |
| 7288 | return false; | 7292 | return false; |
| 7289 | } | 7293 | } |
| 7290 | if (k->kv_len <= 40 / NBBY) | 7294 | if (k->kv_len <= LEN_WEP40) |
| 7291 | keyType = AR_KEYTABLE_TYPE_40; | 7295 | keyType = AR_KEYTABLE_TYPE_40; |
| 7292 | else if (k->kv_len <= 104 / NBBY) | 7296 | else if (k->kv_len <= LEN_WEP104) |
| 7293 | keyType = AR_KEYTABLE_TYPE_104; | 7297 | keyType = AR_KEYTABLE_TYPE_104; |
| 7294 | else | 7298 | else |
| 7295 | keyType = AR_KEYTABLE_TYPE_128; | 7299 | keyType = AR_KEYTABLE_TYPE_128; |
| @@ -7309,7 +7313,7 @@ ath9k_hw_set_keycache_entry(struct ath_hal *ah, u16 entry, | |||
| 7309 | key2 = get_unaligned_le32(k->kv_val + 6) ^ xorMask; | 7313 | key2 = get_unaligned_le32(k->kv_val + 6) ^ xorMask; |
| 7310 | key3 = (get_unaligned_le16(k->kv_val + 10) ^ xorMask) & 0xffff; | 7314 | key3 = (get_unaligned_le16(k->kv_val + 10) ^ xorMask) & 0xffff; |
| 7311 | key4 = get_unaligned_le32(k->kv_val + 12) ^ xorMask; | 7315 | key4 = get_unaligned_le32(k->kv_val + 12) ^ xorMask; |
| 7312 | if (k->kv_len <= 104 / NBBY) | 7316 | if (k->kv_len <= LEN_WEP104) |
| 7313 | key4 &= 0xff; | 7317 | key4 &= 0xff; |
| 7314 | 7318 | ||
| 7315 | if (keyType == AR_KEYTABLE_TYPE_TKIP && ATH9K_IS_MIC_ENABLED(ah)) { | 7319 | if (keyType == AR_KEYTABLE_TYPE_TKIP && ATH9K_IS_MIC_ENABLED(ah)) { |
diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c index 2888778040e4..c5107f269f24 100644 --- a/drivers/net/wireless/ath9k/main.c +++ b/drivers/net/wireless/ath9k/main.c | |||
| @@ -206,7 +206,8 @@ static int ath_key_config(struct ath_softc *sc, | |||
| 206 | if (!ret) | 206 | if (!ret) |
| 207 | return -EIO; | 207 | return -EIO; |
| 208 | 208 | ||
| 209 | sc->sc_keytype = hk.kv_type; | 209 | if (mac) |
| 210 | sc->sc_keytype = hk.kv_type; | ||
| 210 | return 0; | 211 | return 0; |
| 211 | } | 212 | } |
| 212 | 213 | ||
| @@ -756,7 +757,8 @@ static int ath9k_set_key(struct ieee80211_hw *hw, | |||
| 756 | key->hw_key_idx = key->keyidx; | 757 | key->hw_key_idx = key->keyidx; |
| 757 | /* push IV and Michael MIC generation to stack */ | 758 | /* push IV and Michael MIC generation to stack */ |
| 758 | key->flags |= IEEE80211_KEY_FLAG_GENERATE_IV; | 759 | key->flags |= IEEE80211_KEY_FLAG_GENERATE_IV; |
| 759 | key->flags |= IEEE80211_KEY_FLAG_GENERATE_MMIC; | 760 | if (key->alg == ALG_TKIP) |
| 761 | key->flags |= IEEE80211_KEY_FLAG_GENERATE_MMIC; | ||
| 760 | } | 762 | } |
| 761 | break; | 763 | break; |
| 762 | case DISABLE_KEY: | 764 | case DISABLE_KEY: |
| @@ -1065,8 +1067,16 @@ void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb, | |||
| 1065 | tx_info->flags |= IEEE80211_TX_STAT_AMPDU_NO_BACK; | 1067 | tx_info->flags |= IEEE80211_TX_STAT_AMPDU_NO_BACK; |
| 1066 | tx_status->flags &= ~ATH_TX_BAR; | 1068 | tx_status->flags &= ~ATH_TX_BAR; |
| 1067 | } | 1069 | } |
| 1068 | if (tx_status->flags) | 1070 | |
| 1069 | tx_info->status.excessive_retries = 1; | 1071 | if (tx_status->flags & (ATH_TX_ERROR | ATH_TX_XRETRY)) { |
| 1072 | if (!(tx_info->flags & IEEE80211_TX_CTL_NO_ACK)) { | ||
| 1073 | /* Frame was not ACKed, but an ACK was expected */ | ||
| 1074 | tx_info->status.excessive_retries = 1; | ||
| 1075 | } | ||
| 1076 | } else { | ||
| 1077 | /* Frame was ACKed */ | ||
| 1078 | tx_info->flags |= IEEE80211_TX_STAT_ACK; | ||
| 1079 | } | ||
| 1070 | 1080 | ||
| 1071 | tx_info->status.retry_count = tx_status->retries; | 1081 | tx_info->status.retry_count = tx_status->retries; |
| 1072 | 1082 | ||
diff --git a/drivers/net/wireless/ath9k/recv.c b/drivers/net/wireless/ath9k/recv.c index 2fe806175c01..20ddb7acdb94 100644 --- a/drivers/net/wireless/ath9k/recv.c +++ b/drivers/net/wireless/ath9k/recv.c | |||
| @@ -360,8 +360,9 @@ static void ath_rx_flush_tid(struct ath_softc *sc, | |||
| 360 | struct ath_arx_tid *rxtid, int drop) | 360 | struct ath_arx_tid *rxtid, int drop) |
| 361 | { | 361 | { |
| 362 | struct ath_rxbuf *rxbuf; | 362 | struct ath_rxbuf *rxbuf; |
| 363 | unsigned long flag; | ||
| 363 | 364 | ||
| 364 | spin_lock_bh(&rxtid->tidlock); | 365 | spin_lock_irqsave(&rxtid->tidlock, flag); |
| 365 | while (rxtid->baw_head != rxtid->baw_tail) { | 366 | while (rxtid->baw_head != rxtid->baw_tail) { |
| 366 | rxbuf = rxtid->rxbuf + rxtid->baw_head; | 367 | rxbuf = rxtid->rxbuf + rxtid->baw_head; |
| 367 | if (!rxbuf->rx_wbuf) { | 368 | if (!rxbuf->rx_wbuf) { |
| @@ -382,7 +383,7 @@ static void ath_rx_flush_tid(struct ath_softc *sc, | |||
| 382 | INCR(rxtid->baw_head, ATH_TID_MAX_BUFS); | 383 | INCR(rxtid->baw_head, ATH_TID_MAX_BUFS); |
| 383 | INCR(rxtid->seq_next, IEEE80211_SEQ_MAX); | 384 | INCR(rxtid->seq_next, IEEE80211_SEQ_MAX); |
| 384 | } | 385 | } |
| 385 | spin_unlock_bh(&rxtid->tidlock); | 386 | spin_unlock_irqrestore(&rxtid->tidlock, flag); |
| 386 | } | 387 | } |
| 387 | 388 | ||
| 388 | static struct sk_buff *ath_rxbuf_alloc(struct ath_softc *sc, | 389 | static struct sk_buff *ath_rxbuf_alloc(struct ath_softc *sc, |
diff --git a/drivers/net/wireless/ath9k/xmit.c b/drivers/net/wireless/ath9k/xmit.c index 157f830ee6b8..550129f717e2 100644 --- a/drivers/net/wireless/ath9k/xmit.c +++ b/drivers/net/wireless/ath9k/xmit.c | |||
| @@ -357,9 +357,9 @@ static int ath_tx_prepare(struct ath_softc *sc, | |||
| 357 | txctl->flags = ATH9K_TXDESC_CLRDMASK; /* needed for crypto errors */ | 357 | txctl->flags = ATH9K_TXDESC_CLRDMASK; /* needed for crypto errors */ |
| 358 | 358 | ||
| 359 | if (tx_info->flags & IEEE80211_TX_CTL_NO_ACK) | 359 | if (tx_info->flags & IEEE80211_TX_CTL_NO_ACK) |
| 360 | tx_info->flags |= ATH9K_TXDESC_NOACK; | 360 | txctl->flags |= ATH9K_TXDESC_NOACK; |
| 361 | if (tx_info->flags & IEEE80211_TX_CTL_USE_RTS_CTS) | 361 | if (tx_info->flags & IEEE80211_TX_CTL_USE_RTS_CTS) |
| 362 | tx_info->flags |= ATH9K_TXDESC_RTSENA; | 362 | txctl->flags |= ATH9K_TXDESC_RTSENA; |
| 363 | 363 | ||
| 364 | /* | 364 | /* |
| 365 | * Setup for rate calculations. | 365 | * Setup for rate calculations. |
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c index bd35bb0a1480..bd65c485098c 100644 --- a/drivers/net/wireless/atmel.c +++ b/drivers/net/wireless/atmel.c | |||
| @@ -1304,7 +1304,7 @@ EXPORT_SYMBOL(atmel_open); | |||
| 1304 | int atmel_open(struct net_device *dev) | 1304 | int atmel_open(struct net_device *dev) |
| 1305 | { | 1305 | { |
| 1306 | struct atmel_private *priv = netdev_priv(dev); | 1306 | struct atmel_private *priv = netdev_priv(dev); |
| 1307 | int i, channel; | 1307 | int i, channel, err; |
| 1308 | 1308 | ||
| 1309 | /* any scheduled timer is no longer needed and might screw things up.. */ | 1309 | /* any scheduled timer is no longer needed and might screw things up.. */ |
| 1310 | del_timer_sync(&priv->management_timer); | 1310 | del_timer_sync(&priv->management_timer); |
| @@ -1328,8 +1328,9 @@ int atmel_open(struct net_device *dev) | |||
| 1328 | priv->site_survey_state = SITE_SURVEY_IDLE; | 1328 | priv->site_survey_state = SITE_SURVEY_IDLE; |
| 1329 | priv->station_is_associated = 0; | 1329 | priv->station_is_associated = 0; |
| 1330 | 1330 | ||
| 1331 | if (!reset_atmel_card(dev)) | 1331 | err = reset_atmel_card(dev); |
| 1332 | return -EAGAIN; | 1332 | if (err) |
| 1333 | return err; | ||
| 1333 | 1334 | ||
| 1334 | if (priv->config_reg_domain) { | 1335 | if (priv->config_reg_domain) { |
| 1335 | priv->reg_domain = priv->config_reg_domain; | 1336 | priv->reg_domain = priv->config_reg_domain; |
| @@ -3061,12 +3062,20 @@ static void authenticate(struct atmel_private *priv, u16 frame_len) | |||
| 3061 | } | 3062 | } |
| 3062 | 3063 | ||
| 3063 | if (status == WLAN_STATUS_NOT_SUPPORTED_AUTH_ALG) { | 3064 | if (status == WLAN_STATUS_NOT_SUPPORTED_AUTH_ALG) { |
| 3064 | /* Do opensystem first, then try sharedkey */ | 3065 | /* Flip back and forth between WEP auth modes until the max |
| 3066 | * authentication tries has been exceeded. | ||
| 3067 | */ | ||
| 3065 | if (system == WLAN_AUTH_OPEN) { | 3068 | if (system == WLAN_AUTH_OPEN) { |
| 3066 | priv->CurrentAuthentTransactionSeqNum = 0x001; | 3069 | priv->CurrentAuthentTransactionSeqNum = 0x001; |
| 3067 | priv->exclude_unencrypted = 1; | 3070 | priv->exclude_unencrypted = 1; |
| 3068 | send_authentication_request(priv, WLAN_AUTH_SHARED_KEY, NULL, 0); | 3071 | send_authentication_request(priv, WLAN_AUTH_SHARED_KEY, NULL, 0); |
| 3069 | return; | 3072 | return; |
| 3073 | } else if ( system == WLAN_AUTH_SHARED_KEY | ||
| 3074 | && priv->wep_is_on) { | ||
| 3075 | priv->CurrentAuthentTransactionSeqNum = 0x001; | ||
| 3076 | priv->exclude_unencrypted = 0; | ||
| 3077 | send_authentication_request(priv, WLAN_AUTH_OPEN, NULL, 0); | ||
| 3078 | return; | ||
| 3070 | } else if (priv->connect_to_any_BSS) { | 3079 | } else if (priv->connect_to_any_BSS) { |
| 3071 | int bss_index; | 3080 | int bss_index; |
| 3072 | 3081 | ||
| @@ -3580,12 +3589,12 @@ static int atmel_wakeup_firmware(struct atmel_private *priv) | |||
| 3580 | 3589 | ||
| 3581 | if (i == 0) { | 3590 | if (i == 0) { |
| 3582 | printk(KERN_ALERT "%s: MAC failed to boot.\n", priv->dev->name); | 3591 | printk(KERN_ALERT "%s: MAC failed to boot.\n", priv->dev->name); |
| 3583 | return 0; | 3592 | return -EIO; |
| 3584 | } | 3593 | } |
| 3585 | 3594 | ||
| 3586 | if ((priv->host_info_base = atmel_read16(priv->dev, MR2)) == 0xffff) { | 3595 | if ((priv->host_info_base = atmel_read16(priv->dev, MR2)) == 0xffff) { |
| 3587 | printk(KERN_ALERT "%s: card missing.\n", priv->dev->name); | 3596 | printk(KERN_ALERT "%s: card missing.\n", priv->dev->name); |
| 3588 | return 0; | 3597 | return -ENODEV; |
| 3589 | } | 3598 | } |
| 3590 | 3599 | ||
| 3591 | /* now check for completion of MAC initialization through | 3600 | /* now check for completion of MAC initialization through |
| @@ -3609,19 +3618,19 @@ static int atmel_wakeup_firmware(struct atmel_private *priv) | |||
| 3609 | if (i == 0) { | 3618 | if (i == 0) { |
| 3610 | printk(KERN_ALERT "%s: MAC failed to initialise.\n", | 3619 | printk(KERN_ALERT "%s: MAC failed to initialise.\n", |
| 3611 | priv->dev->name); | 3620 | priv->dev->name); |
| 3612 | return 0; | 3621 | return -EIO; |
| 3613 | } | 3622 | } |
| 3614 | 3623 | ||
| 3615 | /* Check for MAC_INIT_OK only on the register that the MAC_INIT_OK was set */ | 3624 | /* Check for MAC_INIT_OK only on the register that the MAC_INIT_OK was set */ |
| 3616 | if ((mr3 & MAC_INIT_COMPLETE) && | 3625 | if ((mr3 & MAC_INIT_COMPLETE) && |
| 3617 | !(atmel_read16(priv->dev, MR3) & MAC_INIT_OK)) { | 3626 | !(atmel_read16(priv->dev, MR3) & MAC_INIT_OK)) { |
| 3618 | printk(KERN_ALERT "%s: MAC failed MR3 self-test.\n", priv->dev->name); | 3627 | printk(KERN_ALERT "%s: MAC failed MR3 self-test.\n", priv->dev->name); |
| 3619 | return 0; | 3628 | return -EIO; |
| 3620 | } | 3629 | } |
| 3621 | if ((mr1 & MAC_INIT_COMPLETE) && | 3630 | if ((mr1 & MAC_INIT_COMPLETE) && |
| 3622 | !(atmel_read16(priv->dev, MR1) & MAC_INIT_OK)) { | 3631 | !(atmel_read16(priv->dev, MR1) & MAC_INIT_OK)) { |
| 3623 | printk(KERN_ALERT "%s: MAC failed MR1 self-test.\n", priv->dev->name); | 3632 | printk(KERN_ALERT "%s: MAC failed MR1 self-test.\n", priv->dev->name); |
| 3624 | return 0; | 3633 | return -EIO; |
| 3625 | } | 3634 | } |
| 3626 | 3635 | ||
| 3627 | atmel_copy_to_host(priv->dev, (unsigned char *)iface, | 3636 | atmel_copy_to_host(priv->dev, (unsigned char *)iface, |
| @@ -3642,7 +3651,7 @@ static int atmel_wakeup_firmware(struct atmel_private *priv) | |||
| 3642 | iface->func_ctrl = le16_to_cpu(iface->func_ctrl); | 3651 | iface->func_ctrl = le16_to_cpu(iface->func_ctrl); |
| 3643 | iface->mac_status = le16_to_cpu(iface->mac_status); | 3652 | iface->mac_status = le16_to_cpu(iface->mac_status); |
| 3644 | 3653 | ||
| 3645 | return 1; | 3654 | return 0; |
| 3646 | } | 3655 | } |
| 3647 | 3656 | ||
| 3648 | /* determine type of memory and MAC address */ | 3657 | /* determine type of memory and MAC address */ |
| @@ -3693,7 +3702,7 @@ static int probe_atmel_card(struct net_device *dev) | |||
| 3693 | /* Standard firmware in flash, boot it up and ask | 3702 | /* Standard firmware in flash, boot it up and ask |
| 3694 | for the Mac Address */ | 3703 | for the Mac Address */ |
| 3695 | priv->card_type = CARD_TYPE_SPI_FLASH; | 3704 | priv->card_type = CARD_TYPE_SPI_FLASH; |
| 3696 | if (atmel_wakeup_firmware(priv)) { | 3705 | if (atmel_wakeup_firmware(priv) == 0) { |
| 3697 | atmel_get_mib(priv, Mac_Address_Mib_Type, 0, dev->dev_addr, 6); | 3706 | atmel_get_mib(priv, Mac_Address_Mib_Type, 0, dev->dev_addr, 6); |
| 3698 | 3707 | ||
| 3699 | /* got address, now squash it again until the network | 3708 | /* got address, now squash it again until the network |
| @@ -3835,6 +3844,7 @@ static int reset_atmel_card(struct net_device *dev) | |||
| 3835 | struct atmel_private *priv = netdev_priv(dev); | 3844 | struct atmel_private *priv = netdev_priv(dev); |
| 3836 | u8 configuration; | 3845 | u8 configuration; |
| 3837 | int old_state = priv->station_state; | 3846 | int old_state = priv->station_state; |
| 3847 | int err = 0; | ||
| 3838 | 3848 | ||
| 3839 | /* data to add to the firmware names, in priority order | 3849 | /* data to add to the firmware names, in priority order |
| 3840 | this implemenents firmware versioning */ | 3850 | this implemenents firmware versioning */ |
| @@ -3868,11 +3878,12 @@ static int reset_atmel_card(struct net_device *dev) | |||
| 3868 | dev->name); | 3878 | dev->name); |
| 3869 | strcpy(priv->firmware_id, "atmel_at76c502.bin"); | 3879 | strcpy(priv->firmware_id, "atmel_at76c502.bin"); |
| 3870 | } | 3880 | } |
| 3871 | if (request_firmware(&fw_entry, priv->firmware_id, priv->sys_dev) != 0) { | 3881 | err = request_firmware(&fw_entry, priv->firmware_id, priv->sys_dev); |
| 3882 | if (err != 0) { | ||
| 3872 | printk(KERN_ALERT | 3883 | printk(KERN_ALERT |
| 3873 | "%s: firmware %s is missing, cannot continue.\n", | 3884 | "%s: firmware %s is missing, cannot continue.\n", |
| 3874 | dev->name, priv->firmware_id); | 3885 | dev->name, priv->firmware_id); |
| 3875 | return 0; | 3886 | return err; |
| 3876 | } | 3887 | } |
| 3877 | } else { | 3888 | } else { |
| 3878 | int fw_index = 0; | 3889 | int fw_index = 0; |
| @@ -3901,7 +3912,7 @@ static int reset_atmel_card(struct net_device *dev) | |||
| 3901 | "%s: firmware %s is missing, cannot start.\n", | 3912 | "%s: firmware %s is missing, cannot start.\n", |
| 3902 | dev->name, priv->firmware_id); | 3913 | dev->name, priv->firmware_id); |
| 3903 | priv->firmware_id[0] = '\0'; | 3914 | priv->firmware_id[0] = '\0'; |
| 3904 | return 0; | 3915 | return -ENOENT; |
| 3905 | } | 3916 | } |
| 3906 | } | 3917 | } |
| 3907 | 3918 | ||
| @@ -3926,8 +3937,9 @@ static int reset_atmel_card(struct net_device *dev) | |||
| 3926 | release_firmware(fw_entry); | 3937 | release_firmware(fw_entry); |
| 3927 | } | 3938 | } |
| 3928 | 3939 | ||
| 3929 | if (!atmel_wakeup_firmware(priv)) | 3940 | err = atmel_wakeup_firmware(priv); |
| 3930 | return 0; | 3941 | if (err != 0) |
| 3942 | return err; | ||
| 3931 | 3943 | ||
| 3932 | /* Check the version and set the correct flag for wpa stuff, | 3944 | /* Check the version and set the correct flag for wpa stuff, |
| 3933 | old and new firmware is incompatible. | 3945 | old and new firmware is incompatible. |
| @@ -3968,10 +3980,9 @@ static int reset_atmel_card(struct net_device *dev) | |||
| 3968 | if (!priv->radio_on_broken) { | 3980 | if (!priv->radio_on_broken) { |
| 3969 | if (atmel_send_command_wait(priv, CMD_EnableRadio, NULL, 0) == | 3981 | if (atmel_send_command_wait(priv, CMD_EnableRadio, NULL, 0) == |
| 3970 | CMD_STATUS_REJECTED_RADIO_OFF) { | 3982 | CMD_STATUS_REJECTED_RADIO_OFF) { |
| 3971 | printk(KERN_INFO | 3983 | printk(KERN_INFO "%s: cannot turn the radio on.\n", |
| 3972 | "%s: cannot turn the radio on. (Hey radio, you're beautiful!)\n", | ||
| 3973 | dev->name); | 3984 | dev->name); |
| 3974 | return 0; | 3985 | return -EIO; |
| 3975 | } | 3986 | } |
| 3976 | } | 3987 | } |
| 3977 | 3988 | ||
| @@ -4006,7 +4017,7 @@ static int reset_atmel_card(struct net_device *dev) | |||
| 4006 | wireless_send_event(priv->dev, SIOCGIWAP, &wrqu, NULL); | 4017 | wireless_send_event(priv->dev, SIOCGIWAP, &wrqu, NULL); |
| 4007 | } | 4018 | } |
| 4008 | 4019 | ||
| 4009 | return 1; | 4020 | return 0; |
| 4010 | } | 4021 | } |
| 4011 | 4022 | ||
| 4012 | static void atmel_send_command(struct atmel_private *priv, int command, | 4023 | static void atmel_send_command(struct atmel_private *priv, int command, |
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index 3bf3a869361f..7205a936ec74 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | #include <linux/moduleparam.h> | 33 | #include <linux/moduleparam.h> |
| 34 | #include <linux/if_arp.h> | 34 | #include <linux/if_arp.h> |
| 35 | #include <linux/etherdevice.h> | 35 | #include <linux/etherdevice.h> |
| 36 | #include <linux/version.h> | ||
| 37 | #include <linux/firmware.h> | 36 | #include <linux/firmware.h> |
| 38 | #include <linux/wireless.h> | 37 | #include <linux/wireless.h> |
| 39 | #include <linux/workqueue.h> | 38 | #include <linux/workqueue.h> |
| @@ -4615,7 +4614,9 @@ static void b43_sprom_fixup(struct ssb_bus *bus) | |||
| 4615 | if (bus->bustype == SSB_BUSTYPE_PCI) { | 4614 | if (bus->bustype == SSB_BUSTYPE_PCI) { |
| 4616 | pdev = bus->host_pci; | 4615 | pdev = bus->host_pci; |
| 4617 | if (IS_PDEV(pdev, BROADCOM, 0x4318, ASUSTEK, 0x100F) || | 4616 | if (IS_PDEV(pdev, BROADCOM, 0x4318, ASUSTEK, 0x100F) || |
| 4617 | IS_PDEV(pdev, BROADCOM, 0x4320, DELL, 0x0003) || | ||
| 4618 | IS_PDEV(pdev, BROADCOM, 0x4320, LINKSYS, 0x0015) || | 4618 | IS_PDEV(pdev, BROADCOM, 0x4320, LINKSYS, 0x0015) || |
| 4619 | IS_PDEV(pdev, BROADCOM, 0x4320, LINKSYS, 0x0014) || | ||
| 4619 | IS_PDEV(pdev, BROADCOM, 0x4320, LINKSYS, 0x0013)) | 4620 | IS_PDEV(pdev, BROADCOM, 0x4320, LINKSYS, 0x0013)) |
| 4620 | bus->sprom.boardflags_lo &= ~B43_BFL_BTCOEXIST; | 4621 | bus->sprom.boardflags_lo &= ~B43_BFL_BTCOEXIST; |
| 4621 | } | 4622 | } |
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c index 2541c81932f0..1cb77db5c292 100644 --- a/drivers/net/wireless/b43legacy/main.c +++ b/drivers/net/wireless/b43legacy/main.c | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | #include <linux/moduleparam.h> | 34 | #include <linux/moduleparam.h> |
| 35 | #include <linux/if_arp.h> | 35 | #include <linux/if_arp.h> |
| 36 | #include <linux/etherdevice.h> | 36 | #include <linux/etherdevice.h> |
| 37 | #include <linux/version.h> | ||
| 38 | #include <linux/firmware.h> | 37 | #include <linux/firmware.h> |
| 39 | #include <linux/wireless.h> | 38 | #include <linux/wireless.h> |
| 40 | #include <linux/workqueue.h> | 39 | #include <linux/workqueue.h> |
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c index c6f886ec08a3..19a401c4a0dc 100644 --- a/drivers/net/wireless/ipw2100.c +++ b/drivers/net/wireless/ipw2100.c | |||
| @@ -157,7 +157,6 @@ that only one external action is invoked at a time. | |||
| 157 | #include <linux/stringify.h> | 157 | #include <linux/stringify.h> |
| 158 | #include <linux/tcp.h> | 158 | #include <linux/tcp.h> |
| 159 | #include <linux/types.h> | 159 | #include <linux/types.h> |
| 160 | #include <linux/version.h> | ||
| 161 | #include <linux/time.h> | 160 | #include <linux/time.h> |
| 162 | #include <linux/firmware.h> | 161 | #include <linux/firmware.h> |
| 163 | #include <linux/acpi.h> | 162 | #include <linux/acpi.h> |
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c index 36e8d2f6e7b4..dcce3542d5a7 100644 --- a/drivers/net/wireless/ipw2200.c +++ b/drivers/net/wireless/ipw2200.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | ******************************************************************************/ | 31 | ******************************************************************************/ |
| 32 | 32 | ||
| 33 | #include "ipw2200.h" | 33 | #include "ipw2200.h" |
| 34 | #include <linux/version.h> | ||
| 35 | 34 | ||
| 36 | 35 | ||
| 37 | #ifndef KBUILD_EXTMOD | 36 | #ifndef KBUILD_EXTMOD |
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-led.c b/drivers/net/wireless/iwlwifi/iwl-3945-led.c index d3336966b6b5..705c65bed9fd 100644 --- a/drivers/net/wireless/iwlwifi/iwl-3945-led.c +++ b/drivers/net/wireless/iwlwifi/iwl-3945-led.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | 27 | ||
| 28 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
| 29 | #include <linux/module.h> | 29 | #include <linux/module.h> |
| 30 | #include <linux/version.h> | ||
| 31 | #include <linux/init.h> | 30 | #include <linux/init.h> |
| 32 | #include <linux/pci.h> | 31 | #include <linux/pci.h> |
| 33 | #include <linux/dma-mapping.h> | 32 | #include <linux/dma-mapping.h> |
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c index b3931f6135a4..3f51f3635344 100644 --- a/drivers/net/wireless/iwlwifi/iwl-3945.c +++ b/drivers/net/wireless/iwlwifi/iwl-3945.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | 26 | ||
| 27 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
| 28 | #include <linux/module.h> | 28 | #include <linux/module.h> |
| 29 | #include <linux/version.h> | ||
| 30 | #include <linux/init.h> | 29 | #include <linux/init.h> |
| 31 | #include <linux/pci.h> | 30 | #include <linux/pci.h> |
| 32 | #include <linux/dma-mapping.h> | 31 | #include <linux/dma-mapping.h> |
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c index 22bb26985c2e..23fed3298962 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965.c +++ b/drivers/net/wireless/iwlwifi/iwl-4965.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | 26 | ||
| 27 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
| 28 | #include <linux/module.h> | 28 | #include <linux/module.h> |
| 29 | #include <linux/version.h> | ||
| 30 | #include <linux/init.h> | 29 | #include <linux/init.h> |
| 31 | #include <linux/pci.h> | 30 | #include <linux/pci.h> |
| 32 | #include <linux/dma-mapping.h> | 31 | #include <linux/dma-mapping.h> |
| @@ -475,8 +474,8 @@ static void iwl4965_apm_stop(struct iwl_priv *priv) | |||
| 475 | iwl_set_bit(priv, CSR_RESET, CSR_RESET_REG_FLAG_SW_RESET); | 474 | iwl_set_bit(priv, CSR_RESET, CSR_RESET_REG_FLAG_SW_RESET); |
| 476 | 475 | ||
| 477 | udelay(10); | 476 | udelay(10); |
| 478 | 477 | /* clear "init complete" move adapter D0A* --> D0U state */ | |
| 479 | iwl_set_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE); | 478 | iwl_clear_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE); |
| 480 | spin_unlock_irqrestore(&priv->lock, flags); | 479 | spin_unlock_irqrestore(&priv->lock, flags); |
| 481 | } | 480 | } |
| 482 | 481 | ||
| @@ -967,7 +966,7 @@ static int iwl4965_interpolate_chan(struct iwl_priv *priv, u32 channel, | |||
| 967 | 966 | ||
| 968 | s = iwl4965_get_sub_band(priv, channel); | 967 | s = iwl4965_get_sub_band(priv, channel); |
| 969 | if (s >= EEPROM_TX_POWER_BANDS) { | 968 | if (s >= EEPROM_TX_POWER_BANDS) { |
| 970 | IWL_ERROR("Tx Power can not find channel %d ", channel); | 969 | IWL_ERROR("Tx Power can not find channel %d\n", channel); |
| 971 | return -1; | 970 | return -1; |
| 972 | } | 971 | } |
| 973 | 972 | ||
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c index f3d139b663e6..b08036a9d894 100644 --- a/drivers/net/wireless/iwlwifi/iwl-5000.c +++ b/drivers/net/wireless/iwlwifi/iwl-5000.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | 25 | ||
| 26 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
| 27 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 28 | #include <linux/version.h> | ||
| 29 | #include <linux/init.h> | 28 | #include <linux/init.h> |
| 30 | #include <linux/pci.h> | 29 | #include <linux/pci.h> |
| 31 | #include <linux/dma-mapping.h> | 30 | #include <linux/dma-mapping.h> |
| @@ -146,7 +145,8 @@ static void iwl5000_apm_stop(struct iwl_priv *priv) | |||
| 146 | 145 | ||
| 147 | udelay(10); | 146 | udelay(10); |
| 148 | 147 | ||
| 149 | iwl_set_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE); | 148 | /* clear "init complete" move adapter D0A* --> D0U state */ |
| 149 | iwl_clear_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE); | ||
| 150 | 150 | ||
| 151 | spin_unlock_irqrestore(&priv->lock, flags); | 151 | spin_unlock_irqrestore(&priv->lock, flags); |
| 152 | } | 152 | } |
| @@ -578,14 +578,11 @@ static int iwl5000_load_section(struct iwl_priv *priv, | |||
| 578 | FH_TFDIB_CTRL0_REG(FH_SRVC_CHNL), | 578 | FH_TFDIB_CTRL0_REG(FH_SRVC_CHNL), |
| 579 | phy_addr & FH_MEM_TFDIB_DRAM_ADDR_LSB_MSK); | 579 | phy_addr & FH_MEM_TFDIB_DRAM_ADDR_LSB_MSK); |
| 580 | 580 | ||
| 581 | /* FIME: write the MSB of the phy_addr in CTRL1 | ||
| 582 | * iwl_write_direct32(priv, | ||
| 583 | IWL_FH_TFDIB_CTRL1_REG(IWL_FH_SRVC_CHNL), | ||
| 584 | ((phy_addr & MSB_MSK) | ||
| 585 | << FH_MEM_TFDIB_REG1_ADDR_BITSHIFT) | byte_count); | ||
| 586 | */ | ||
| 587 | iwl_write_direct32(priv, | 581 | iwl_write_direct32(priv, |
| 588 | FH_TFDIB_CTRL1_REG(FH_SRVC_CHNL), byte_cnt); | 582 | FH_TFDIB_CTRL1_REG(FH_SRVC_CHNL), |
| 583 | (iwl_get_dma_hi_address(phy_addr) | ||
| 584 | << FH_MEM_TFDIB_REG1_ADDR_BITSHIFT) | byte_cnt); | ||
| 585 | |||
| 589 | iwl_write_direct32(priv, | 586 | iwl_write_direct32(priv, |
| 590 | FH_TCSR_CHNL_TX_BUF_STS_REG(FH_SRVC_CHNL), | 587 | FH_TCSR_CHNL_TX_BUF_STS_REG(FH_SRVC_CHNL), |
| 591 | 1 << FH_TCSR_CHNL_TX_BUF_STS_REG_POS_TB_NUM | | 588 | 1 << FH_TCSR_CHNL_TX_BUF_STS_REG_POS_TB_NUM | |
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c index 754fef5b592f..90a2b6dee7c0 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c | |||
| @@ -1153,7 +1153,8 @@ static int rs_switch_to_mimo2(struct iwl_priv *priv, | |||
| 1153 | !sta->ht_info.ht_supported) | 1153 | !sta->ht_info.ht_supported) |
| 1154 | return -1; | 1154 | return -1; |
| 1155 | 1155 | ||
| 1156 | if (priv->current_ht_config.tx_mimo_ps_mode == IWL_MIMO_PS_STATIC) | 1156 | if (((sta->ht_info.cap & IEEE80211_HT_CAP_MIMO_PS) >> 2) |
| 1157 | == IWL_MIMO_PS_STATIC) | ||
| 1157 | return -1; | 1158 | return -1; |
| 1158 | 1159 | ||
| 1159 | /* Need both Tx chains/antennas to support MIMO */ | 1160 | /* Need both Tx chains/antennas to support MIMO */ |
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index ed09e48b1b61..e01f048a02dd 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | 29 | ||
| 30 | #include <linux/kernel.h> | 30 | #include <linux/kernel.h> |
| 31 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 32 | #include <linux/version.h> | ||
| 33 | #include <linux/init.h> | 32 | #include <linux/init.h> |
| 34 | #include <linux/pci.h> | 33 | #include <linux/pci.h> |
| 35 | #include <linux/dma-mapping.h> | 34 | #include <linux/dma-mapping.h> |
| @@ -182,14 +181,14 @@ static int iwl4965_check_rxon_cmd(struct iwl_rxon_cmd *rxon) | |||
| 182 | } | 181 | } |
| 183 | 182 | ||
| 184 | /** | 183 | /** |
| 185 | * iwl4965_full_rxon_required - check if full RXON (vs RXON_ASSOC) cmd is needed | 184 | * iwl_full_rxon_required - check if full RXON (vs RXON_ASSOC) cmd is needed |
| 186 | * @priv: staging_rxon is compared to active_rxon | 185 | * @priv: staging_rxon is compared to active_rxon |
| 187 | * | 186 | * |
| 188 | * If the RXON structure is changing enough to require a new tune, | 187 | * If the RXON structure is changing enough to require a new tune, |
| 189 | * or is clearing the RXON_FILTER_ASSOC_MSK, then return 1 to indicate that | 188 | * or is clearing the RXON_FILTER_ASSOC_MSK, then return 1 to indicate that |
| 190 | * a new tune (full RXON command, rather than RXON_ASSOC cmd) is required. | 189 | * a new tune (full RXON command, rather than RXON_ASSOC cmd) is required. |
| 191 | */ | 190 | */ |
| 192 | static int iwl4965_full_rxon_required(struct iwl_priv *priv) | 191 | static int iwl_full_rxon_required(struct iwl_priv *priv) |
| 193 | { | 192 | { |
| 194 | 193 | ||
| 195 | /* These items are only settable from the full RXON command */ | 194 | /* These items are only settable from the full RXON command */ |
| @@ -208,7 +207,6 @@ static int iwl4965_full_rxon_required(struct iwl_priv *priv) | |||
| 208 | priv->active_rxon.ofdm_ht_single_stream_basic_rates) || | 207 | priv->active_rxon.ofdm_ht_single_stream_basic_rates) || |
| 209 | (priv->staging_rxon.ofdm_ht_dual_stream_basic_rates != | 208 | (priv->staging_rxon.ofdm_ht_dual_stream_basic_rates != |
| 210 | priv->active_rxon.ofdm_ht_dual_stream_basic_rates) || | 209 | priv->active_rxon.ofdm_ht_dual_stream_basic_rates) || |
| 211 | (priv->staging_rxon.rx_chain != priv->active_rxon.rx_chain) || | ||
| 212 | (priv->staging_rxon.assoc_id != priv->active_rxon.assoc_id)) | 210 | (priv->staging_rxon.assoc_id != priv->active_rxon.assoc_id)) |
| 213 | return 1; | 211 | return 1; |
| 214 | 212 | ||
| @@ -264,7 +262,7 @@ static int iwl4965_commit_rxon(struct iwl_priv *priv) | |||
| 264 | /* If we don't need to send a full RXON, we can use | 262 | /* If we don't need to send a full RXON, we can use |
| 265 | * iwl4965_rxon_assoc_cmd which is used to reconfigure filter | 263 | * iwl4965_rxon_assoc_cmd which is used to reconfigure filter |
| 266 | * and other flags for the current radio configuration. */ | 264 | * and other flags for the current radio configuration. */ |
| 267 | if (!iwl4965_full_rxon_required(priv)) { | 265 | if (!iwl_full_rxon_required(priv)) { |
| 268 | ret = iwl_send_rxon_assoc(priv); | 266 | ret = iwl_send_rxon_assoc(priv); |
| 269 | if (ret) { | 267 | if (ret) { |
| 270 | IWL_ERROR("Error setting RXON_ASSOC (%d)\n", ret); | 268 | IWL_ERROR("Error setting RXON_ASSOC (%d)\n", ret); |
| @@ -588,8 +586,6 @@ static void iwl4965_ht_conf(struct iwl_priv *priv, | |||
| 588 | iwl_conf->supported_chan_width = 0; | 586 | iwl_conf->supported_chan_width = 0; |
| 589 | } | 587 | } |
| 590 | 588 | ||
| 591 | iwl_conf->tx_mimo_ps_mode = | ||
| 592 | (u8)((ht_conf->cap & IEEE80211_HT_CAP_MIMO_PS) >> 2); | ||
| 593 | memcpy(iwl_conf->supp_mcs_set, ht_conf->supp_mcs_set, 16); | 589 | memcpy(iwl_conf->supp_mcs_set, ht_conf->supp_mcs_set, 16); |
| 594 | 590 | ||
| 595 | iwl_conf->control_channel = ht_bss_conf->primary_channel; | 591 | iwl_conf->control_channel = ht_bss_conf->primary_channel; |
| @@ -2191,7 +2187,10 @@ static void __iwl4965_down(struct iwl_priv *priv) | |||
| 2191 | udelay(5); | 2187 | udelay(5); |
| 2192 | 2188 | ||
| 2193 | /* FIXME: apm_ops.suspend(priv) */ | 2189 | /* FIXME: apm_ops.suspend(priv) */ |
| 2194 | priv->cfg->ops->lib->apm_ops.reset(priv); | 2190 | if (exit_pending || test_bit(STATUS_IN_SUSPEND, &priv->status)) |
| 2191 | priv->cfg->ops->lib->apm_ops.stop(priv); | ||
| 2192 | else | ||
| 2193 | priv->cfg->ops->lib->apm_ops.reset(priv); | ||
| 2195 | priv->cfg->ops->lib->free_shared_mem(priv); | 2194 | priv->cfg->ops->lib->free_shared_mem(priv); |
| 2196 | 2195 | ||
| 2197 | exit: | 2196 | exit: |
| @@ -2603,6 +2602,7 @@ static int iwl4965_mac_start(struct ieee80211_hw *hw) | |||
| 2603 | { | 2602 | { |
| 2604 | struct iwl_priv *priv = hw->priv; | 2603 | struct iwl_priv *priv = hw->priv; |
| 2605 | int ret; | 2604 | int ret; |
| 2605 | u16 pci_cmd; | ||
| 2606 | 2606 | ||
| 2607 | IWL_DEBUG_MAC80211("enter\n"); | 2607 | IWL_DEBUG_MAC80211("enter\n"); |
| 2608 | 2608 | ||
| @@ -2613,6 +2613,13 @@ static int iwl4965_mac_start(struct ieee80211_hw *hw) | |||
| 2613 | pci_restore_state(priv->pci_dev); | 2613 | pci_restore_state(priv->pci_dev); |
| 2614 | pci_enable_msi(priv->pci_dev); | 2614 | pci_enable_msi(priv->pci_dev); |
| 2615 | 2615 | ||
| 2616 | /* enable interrupts if needed: hw bug w/a */ | ||
| 2617 | pci_read_config_word(priv->pci_dev, PCI_COMMAND, &pci_cmd); | ||
| 2618 | if (pci_cmd & PCI_COMMAND_INTX_DISABLE) { | ||
| 2619 | pci_cmd &= ~PCI_COMMAND_INTX_DISABLE; | ||
| 2620 | pci_write_config_word(priv->pci_dev, PCI_COMMAND, pci_cmd); | ||
| 2621 | } | ||
| 2622 | |||
| 2616 | ret = request_irq(priv->pci_dev->irq, iwl4965_isr, IRQF_SHARED, | 2623 | ret = request_irq(priv->pci_dev->irq, iwl4965_isr, IRQF_SHARED, |
| 2617 | DRV_NAME, priv); | 2624 | DRV_NAME, priv); |
| 2618 | if (ret) { | 2625 | if (ret) { |
| @@ -3581,7 +3588,7 @@ static int iwl4965_mac_beacon_update(struct ieee80211_hw *hw, struct sk_buff *sk | |||
| 3581 | 3588 | ||
| 3582 | priv->assoc_id = 0; | 3589 | priv->assoc_id = 0; |
| 3583 | timestamp = ((struct ieee80211_mgmt *)skb->data)->u.beacon.timestamp; | 3590 | timestamp = ((struct ieee80211_mgmt *)skb->data)->u.beacon.timestamp; |
| 3584 | priv->timestamp = le64_to_cpu(timestamp) + (priv->beacon_int * 1000); | 3591 | priv->timestamp = le64_to_cpu(timestamp); |
| 3585 | 3592 | ||
| 3586 | IWL_DEBUG_MAC80211("leave\n"); | 3593 | IWL_DEBUG_MAC80211("leave\n"); |
| 3587 | spin_unlock_irqrestore(&priv->lock, flags); | 3594 | spin_unlock_irqrestore(&priv->lock, flags); |
| @@ -4365,15 +4372,18 @@ static void __devexit iwl4965_pci_remove(struct pci_dev *pdev) | |||
| 4365 | iwl_dbgfs_unregister(priv); | 4372 | iwl_dbgfs_unregister(priv); |
| 4366 | sysfs_remove_group(&pdev->dev.kobj, &iwl4965_attribute_group); | 4373 | sysfs_remove_group(&pdev->dev.kobj, &iwl4965_attribute_group); |
| 4367 | 4374 | ||
| 4375 | /* ieee80211_unregister_hw call wil cause iwl4965_mac_stop to | ||
| 4376 | * to be called and iwl4965_down since we are removing the device | ||
| 4377 | * we need to set STATUS_EXIT_PENDING bit. | ||
| 4378 | */ | ||
| 4379 | set_bit(STATUS_EXIT_PENDING, &priv->status); | ||
| 4368 | if (priv->mac80211_registered) { | 4380 | if (priv->mac80211_registered) { |
| 4369 | ieee80211_unregister_hw(priv->hw); | 4381 | ieee80211_unregister_hw(priv->hw); |
| 4370 | priv->mac80211_registered = 0; | 4382 | priv->mac80211_registered = 0; |
| 4383 | } else { | ||
| 4384 | iwl4965_down(priv); | ||
| 4371 | } | 4385 | } |
| 4372 | 4386 | ||
| 4373 | set_bit(STATUS_EXIT_PENDING, &priv->status); | ||
| 4374 | |||
| 4375 | iwl4965_down(priv); | ||
| 4376 | |||
| 4377 | /* make sure we flush any pending irq or | 4387 | /* make sure we flush any pending irq or |
| 4378 | * tasklet for the driver | 4388 | * tasklet for the driver |
| 4379 | */ | 4389 | */ |
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c index 9bd61809129f..80f2f84defa8 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.c +++ b/drivers/net/wireless/iwlwifi/iwl-core.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | 28 | ||
| 29 | #include <linux/kernel.h> | 29 | #include <linux/kernel.h> |
| 30 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 31 | #include <linux/version.h> | ||
| 32 | #include <net/mac80211.h> | 31 | #include <net/mac80211.h> |
| 33 | 32 | ||
| 34 | struct iwl_priv; /* FIXME: remove */ | 33 | struct iwl_priv; /* FIXME: remove */ |
| @@ -593,12 +592,11 @@ static void iwlcore_free_geos(struct iwl_priv *priv) | |||
| 593 | clear_bit(STATUS_GEO_CONFIGURED, &priv->status); | 592 | clear_bit(STATUS_GEO_CONFIGURED, &priv->status); |
| 594 | } | 593 | } |
| 595 | 594 | ||
| 596 | static u8 is_single_rx_stream(struct iwl_priv *priv) | 595 | static bool is_single_rx_stream(struct iwl_priv *priv) |
| 597 | { | 596 | { |
| 598 | return !priv->current_ht_config.is_ht || | 597 | return !priv->current_ht_config.is_ht || |
| 599 | ((priv->current_ht_config.supp_mcs_set[1] == 0) && | 598 | ((priv->current_ht_config.supp_mcs_set[1] == 0) && |
| 600 | (priv->current_ht_config.supp_mcs_set[2] == 0)) || | 599 | (priv->current_ht_config.supp_mcs_set[2] == 0)); |
| 601 | priv->ps_mode == IWL_MIMO_PS_STATIC; | ||
| 602 | } | 600 | } |
| 603 | 601 | ||
| 604 | static u8 iwl_is_channel_extension(struct iwl_priv *priv, | 602 | static u8 iwl_is_channel_extension(struct iwl_priv *priv, |
| @@ -705,33 +703,39 @@ EXPORT_SYMBOL(iwl_set_rxon_ht); | |||
| 705 | * MIMO (dual stream) requires at least 2, but works better with 3. | 703 | * MIMO (dual stream) requires at least 2, but works better with 3. |
| 706 | * This does not determine *which* chains to use, just how many. | 704 | * This does not determine *which* chains to use, just how many. |
| 707 | */ | 705 | */ |
| 708 | static int iwlcore_get_rx_chain_counter(struct iwl_priv *priv, | 706 | static int iwl_get_active_rx_chain_count(struct iwl_priv *priv) |
| 709 | u8 *idle_state, u8 *rx_state) | ||
| 710 | { | 707 | { |
| 711 | u8 is_single = is_single_rx_stream(priv); | 708 | bool is_single = is_single_rx_stream(priv); |
| 712 | u8 is_cam = test_bit(STATUS_POWER_PMI, &priv->status) ? 0 : 1; | 709 | bool is_cam = !test_bit(STATUS_POWER_PMI, &priv->status); |
| 713 | 710 | ||
| 714 | /* # of Rx chains to use when expecting MIMO. */ | 711 | /* # of Rx chains to use when expecting MIMO. */ |
| 715 | if (is_single || (!is_cam && (priv->ps_mode == IWL_MIMO_PS_STATIC))) | 712 | if (is_single || (!is_cam && (priv->ps_mode == IWL_MIMO_PS_STATIC))) |
| 716 | *rx_state = 2; | 713 | return 2; |
| 717 | else | 714 | else |
| 718 | *rx_state = 3; | 715 | return 3; |
| 716 | } | ||
| 719 | 717 | ||
| 718 | static int iwl_get_idle_rx_chain_count(struct iwl_priv *priv, int active_cnt) | ||
| 719 | { | ||
| 720 | int idle_cnt; | ||
| 721 | bool is_cam = !test_bit(STATUS_POWER_PMI, &priv->status); | ||
| 720 | /* # Rx chains when idling and maybe trying to save power */ | 722 | /* # Rx chains when idling and maybe trying to save power */ |
| 721 | switch (priv->ps_mode) { | 723 | switch (priv->ps_mode) { |
| 722 | case IWL_MIMO_PS_STATIC: | 724 | case IWL_MIMO_PS_STATIC: |
| 723 | case IWL_MIMO_PS_DYNAMIC: | 725 | case IWL_MIMO_PS_DYNAMIC: |
| 724 | *idle_state = (is_cam) ? 2 : 1; | 726 | idle_cnt = (is_cam) ? 2 : 1; |
| 725 | break; | 727 | break; |
| 726 | case IWL_MIMO_PS_NONE: | 728 | case IWL_MIMO_PS_NONE: |
| 727 | *idle_state = (is_cam) ? *rx_state : 1; | 729 | idle_cnt = (is_cam) ? active_cnt : 1; |
| 728 | break; | 730 | break; |
| 731 | case IWL_MIMO_PS_INVALID: | ||
| 729 | default: | 732 | default: |
| 730 | *idle_state = 1; | 733 | IWL_ERROR("invalide mimo ps mode %d\n", priv->ps_mode); |
| 734 | WARN_ON(1); | ||
| 735 | idle_cnt = -1; | ||
| 731 | break; | 736 | break; |
| 732 | } | 737 | } |
| 733 | 738 | return idle_cnt; | |
| 734 | return 0; | ||
| 735 | } | 739 | } |
| 736 | 740 | ||
| 737 | /** | 741 | /** |
| @@ -742,34 +746,44 @@ static int iwlcore_get_rx_chain_counter(struct iwl_priv *priv, | |||
| 742 | */ | 746 | */ |
| 743 | void iwl_set_rxon_chain(struct iwl_priv *priv) | 747 | void iwl_set_rxon_chain(struct iwl_priv *priv) |
| 744 | { | 748 | { |
| 745 | u8 is_single = is_single_rx_stream(priv); | 749 | bool is_single = is_single_rx_stream(priv); |
| 746 | u8 idle_state, rx_state; | 750 | bool is_cam = !test_bit(STATUS_POWER_PMI, &priv->status); |
| 747 | 751 | u8 idle_rx_cnt, active_rx_cnt; | |
| 748 | priv->staging_rxon.rx_chain = 0; | 752 | u16 rx_chain; |
| 749 | rx_state = idle_state = 3; | ||
| 750 | 753 | ||
| 751 | /* Tell uCode which antennas are actually connected. | 754 | /* Tell uCode which antennas are actually connected. |
| 752 | * Before first association, we assume all antennas are connected. | 755 | * Before first association, we assume all antennas are connected. |
| 753 | * Just after first association, iwl_chain_noise_calibration() | 756 | * Just after first association, iwl_chain_noise_calibration() |
| 754 | * checks which antennas actually *are* connected. */ | 757 | * checks which antennas actually *are* connected. */ |
| 755 | priv->staging_rxon.rx_chain |= | 758 | rx_chain = priv->hw_params.valid_rx_ant << RXON_RX_CHAIN_VALID_POS; |
| 756 | cpu_to_le16(priv->hw_params.valid_rx_ant << | ||
| 757 | RXON_RX_CHAIN_VALID_POS); | ||
| 758 | 759 | ||
| 759 | /* How many receivers should we use? */ | 760 | /* How many receivers should we use? */ |
| 760 | iwlcore_get_rx_chain_counter(priv, &idle_state, &rx_state); | 761 | active_rx_cnt = iwl_get_active_rx_chain_count(priv); |
| 761 | priv->staging_rxon.rx_chain |= | 762 | idle_rx_cnt = iwl_get_idle_rx_chain_count(priv, active_rx_cnt); |
| 762 | cpu_to_le16(rx_state << RXON_RX_CHAIN_MIMO_CNT_POS); | 763 | |
| 763 | priv->staging_rxon.rx_chain |= | 764 | /* correct rx chain count accoridng hw settings */ |
| 764 | cpu_to_le16(idle_state << RXON_RX_CHAIN_CNT_POS); | 765 | if (priv->hw_params.rx_chains_num < active_rx_cnt) |
| 765 | 766 | active_rx_cnt = priv->hw_params.rx_chains_num; | |
| 766 | if (!is_single && (rx_state >= 2) && | 767 | |
| 767 | !test_bit(STATUS_POWER_PMI, &priv->status)) | 768 | if (priv->hw_params.rx_chains_num < idle_rx_cnt) |
| 769 | idle_rx_cnt = priv->hw_params.rx_chains_num; | ||
| 770 | |||
| 771 | rx_chain |= active_rx_cnt << RXON_RX_CHAIN_MIMO_CNT_POS; | ||
| 772 | rx_chain |= idle_rx_cnt << RXON_RX_CHAIN_CNT_POS; | ||
| 773 | |||
| 774 | priv->staging_rxon.rx_chain = cpu_to_le16(rx_chain); | ||
| 775 | |||
| 776 | if (!is_single && (active_rx_cnt >= 2) && is_cam) | ||
| 768 | priv->staging_rxon.rx_chain |= RXON_RX_CHAIN_MIMO_FORCE_MSK; | 777 | priv->staging_rxon.rx_chain |= RXON_RX_CHAIN_MIMO_FORCE_MSK; |
| 769 | else | 778 | else |
| 770 | priv->staging_rxon.rx_chain &= ~RXON_RX_CHAIN_MIMO_FORCE_MSK; | 779 | priv->staging_rxon.rx_chain &= ~RXON_RX_CHAIN_MIMO_FORCE_MSK; |
| 771 | 780 | ||
| 772 | IWL_DEBUG_ASSOC("rx chain %X\n", priv->staging_rxon.rx_chain); | 781 | IWL_DEBUG_ASSOC("rx_chain=0x%Xi active=%d idle=%d\n", |
| 782 | priv->staging_rxon.rx_chain, | ||
| 783 | active_rx_cnt, idle_rx_cnt); | ||
| 784 | |||
| 785 | WARN_ON(active_rx_cnt == 0 || idle_rx_cnt == 0 || | ||
| 786 | active_rx_cnt < idle_rx_cnt); | ||
| 773 | } | 787 | } |
| 774 | EXPORT_SYMBOL(iwl_set_rxon_chain); | 788 | EXPORT_SYMBOL(iwl_set_rxon_chain); |
| 775 | 789 | ||
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h index c19db438306c..cdfb343c7ec6 100644 --- a/drivers/net/wireless/iwlwifi/iwl-dev.h +++ b/drivers/net/wireless/iwlwifi/iwl-dev.h | |||
| @@ -412,7 +412,6 @@ struct iwl_ht_info { | |||
| 412 | /* self configuration data */ | 412 | /* self configuration data */ |
| 413 | u8 is_ht; | 413 | u8 is_ht; |
| 414 | u8 supported_chan_width; | 414 | u8 supported_chan_width; |
| 415 | u16 tx_mimo_ps_mode; | ||
| 416 | u8 is_green_field; | 415 | u8 is_green_field; |
| 417 | u8 sgf; /* HT_SHORT_GI_* short guard interval */ | 416 | u8 sgf; /* HT_SHORT_GI_* short guard interval */ |
| 418 | u8 max_amsdu_size; | 417 | u8 max_amsdu_size; |
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.c b/drivers/net/wireless/iwlwifi/iwl-eeprom.c index bce53830b301..37155755efc5 100644 --- a/drivers/net/wireless/iwlwifi/iwl-eeprom.c +++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.c | |||
| @@ -63,7 +63,6 @@ | |||
| 63 | 63 | ||
| 64 | #include <linux/kernel.h> | 64 | #include <linux/kernel.h> |
| 65 | #include <linux/module.h> | 65 | #include <linux/module.h> |
| 66 | #include <linux/version.h> | ||
| 67 | #include <linux/init.h> | 66 | #include <linux/init.h> |
| 68 | 67 | ||
| 69 | #include <net/mac80211.h> | 68 | #include <net/mac80211.h> |
| @@ -146,7 +145,7 @@ int iwlcore_eeprom_verify_signature(struct iwl_priv *priv) | |||
| 146 | { | 145 | { |
| 147 | u32 gp = iwl_read32(priv, CSR_EEPROM_GP); | 146 | u32 gp = iwl_read32(priv, CSR_EEPROM_GP); |
| 148 | if ((gp & CSR_EEPROM_GP_VALID_MSK) == CSR_EEPROM_GP_BAD_SIGNATURE) { | 147 | if ((gp & CSR_EEPROM_GP_VALID_MSK) == CSR_EEPROM_GP_BAD_SIGNATURE) { |
| 149 | IWL_ERROR("EEPROM not found, EEPROM_GP=0x%08x", gp); | 148 | IWL_ERROR("EEPROM not found, EEPROM_GP=0x%08x\n", gp); |
| 150 | return -ENOENT; | 149 | return -ENOENT; |
| 151 | } | 150 | } |
| 152 | return 0; | 151 | return 0; |
| @@ -227,7 +226,7 @@ int iwl_eeprom_init(struct iwl_priv *priv) | |||
| 227 | 226 | ||
| 228 | ret = priv->cfg->ops->lib->eeprom_ops.verify_signature(priv); | 227 | ret = priv->cfg->ops->lib->eeprom_ops.verify_signature(priv); |
| 229 | if (ret < 0) { | 228 | if (ret < 0) { |
| 230 | IWL_ERROR("EEPROM not found, EEPROM_GP=0x%08x", gp); | 229 | IWL_ERROR("EEPROM not found, EEPROM_GP=0x%08x\n", gp); |
| 231 | ret = -ENOENT; | 230 | ret = -ENOENT; |
| 232 | goto err; | 231 | goto err; |
| 233 | } | 232 | } |
| @@ -254,7 +253,7 @@ int iwl_eeprom_init(struct iwl_priv *priv) | |||
| 254 | } | 253 | } |
| 255 | 254 | ||
| 256 | if (!(r & CSR_EEPROM_REG_READ_VALID_MSK)) { | 255 | if (!(r & CSR_EEPROM_REG_READ_VALID_MSK)) { |
| 257 | IWL_ERROR("Time out reading EEPROM[%d]", addr); | 256 | IWL_ERROR("Time out reading EEPROM[%d]\n", addr); |
| 258 | ret = -ETIMEDOUT; | 257 | ret = -ETIMEDOUT; |
| 259 | goto done; | 258 | goto done; |
| 260 | } | 259 | } |
diff --git a/drivers/net/wireless/iwlwifi/iwl-fh.h b/drivers/net/wireless/iwlwifi/iwl-fh.h index 944642450d3d..cd11c0ca2991 100644 --- a/drivers/net/wireless/iwlwifi/iwl-fh.h +++ b/drivers/net/wireless/iwlwifi/iwl-fh.h | |||
| @@ -287,6 +287,7 @@ | |||
| 287 | 287 | ||
| 288 | #define FH_RSSR_CHNL0_RX_STATUS_CHNL_IDLE (0x01000000) | 288 | #define FH_RSSR_CHNL0_RX_STATUS_CHNL_IDLE (0x01000000) |
| 289 | 289 | ||
| 290 | #define FH_MEM_TFDIB_REG1_ADDR_BITSHIFT 28 | ||
| 290 | 291 | ||
| 291 | /** | 292 | /** |
| 292 | * Transmit DMA Channel Control/Status Registers (TCSR) | 293 | * Transmit DMA Channel Control/Status Registers (TCSR) |
diff --git a/drivers/net/wireless/iwlwifi/iwl-hcmd.c b/drivers/net/wireless/iwlwifi/iwl-hcmd.c index 6512834bb916..2eb03eea1908 100644 --- a/drivers/net/wireless/iwlwifi/iwl-hcmd.c +++ b/drivers/net/wireless/iwlwifi/iwl-hcmd.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | 28 | ||
| 29 | #include <linux/kernel.h> | 29 | #include <linux/kernel.h> |
| 30 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 31 | #include <linux/version.h> | ||
| 32 | #include <net/mac80211.h> | 31 | #include <net/mac80211.h> |
| 33 | 32 | ||
| 34 | #include "iwl-dev.h" /* FIXME: remove */ | 33 | #include "iwl-dev.h" /* FIXME: remove */ |
diff --git a/drivers/net/wireless/iwlwifi/iwl-led.c b/drivers/net/wireless/iwlwifi/iwl-led.c index cb11c4a4d691..4eee1b163cd2 100644 --- a/drivers/net/wireless/iwlwifi/iwl-led.c +++ b/drivers/net/wireless/iwlwifi/iwl-led.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | 27 | ||
| 28 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
| 29 | #include <linux/module.h> | 29 | #include <linux/module.h> |
| 30 | #include <linux/version.h> | ||
| 31 | #include <linux/init.h> | 30 | #include <linux/init.h> |
| 32 | #include <linux/pci.h> | 31 | #include <linux/pci.h> |
| 33 | #include <linux/dma-mapping.h> | 32 | #include <linux/dma-mapping.h> |
diff --git a/drivers/net/wireless/iwlwifi/iwl-power.c b/drivers/net/wireless/iwlwifi/iwl-power.c index 028e3053c0ca..a099c9e30e55 100644 --- a/drivers/net/wireless/iwlwifi/iwl-power.c +++ b/drivers/net/wireless/iwlwifi/iwl-power.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | 29 | ||
| 30 | #include <linux/kernel.h> | 30 | #include <linux/kernel.h> |
| 31 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 32 | #include <linux/version.h> | ||
| 33 | #include <linux/init.h> | 32 | #include <linux/init.h> |
| 34 | 33 | ||
| 35 | #include <net/mac80211.h> | 34 | #include <net/mac80211.h> |
diff --git a/drivers/net/wireless/iwlwifi/iwl-rfkill.c b/drivers/net/wireless/iwlwifi/iwl-rfkill.c index e5e5846e9f25..5d642298f04c 100644 --- a/drivers/net/wireless/iwlwifi/iwl-rfkill.c +++ b/drivers/net/wireless/iwlwifi/iwl-rfkill.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | *****************************************************************************/ | 27 | *****************************************************************************/ |
| 28 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
| 29 | #include <linux/module.h> | 29 | #include <linux/module.h> |
| 30 | #include <linux/version.h> | ||
| 31 | #include <linux/init.h> | 30 | #include <linux/init.h> |
| 32 | 31 | ||
| 33 | #include <net/mac80211.h> | 32 | #include <net/mac80211.h> |
diff --git a/drivers/net/wireless/iwlwifi/iwl-rx.c b/drivers/net/wireless/iwlwifi/iwl-rx.c index f3f6ea49fdd2..e81bfc42a7cb 100644 --- a/drivers/net/wireless/iwlwifi/iwl-rx.c +++ b/drivers/net/wireless/iwlwifi/iwl-rx.c | |||
| @@ -1173,7 +1173,10 @@ void iwl_rx_reply_rx(struct iwl_priv *priv, | |||
| 1173 | 1173 | ||
| 1174 | rx_status.antenna = 0; | 1174 | rx_status.antenna = 0; |
| 1175 | rx_status.flag = 0; | 1175 | rx_status.flag = 0; |
| 1176 | rx_status.flag |= RX_FLAG_TSFT; | 1176 | |
| 1177 | /* TSF isn't reliable. In order to allow smooth user experience, | ||
| 1178 | * this W/A doesn't propagate it to the mac80211 */ | ||
| 1179 | /*rx_status.flag |= RX_FLAG_TSFT;*/ | ||
| 1177 | 1180 | ||
| 1178 | if ((unlikely(rx_start->cfg_phy_cnt > 20))) { | 1181 | if ((unlikely(rx_start->cfg_phy_cnt > 20))) { |
| 1179 | IWL_DEBUG_DROP("dsp size out of range [0,20]: %d/n", | 1182 | IWL_DEBUG_DROP("dsp size out of range [0,20]: %d/n", |
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c index 9bb6adb28b73..6c8ac3a87d54 100644 --- a/drivers/net/wireless/iwlwifi/iwl-scan.c +++ b/drivers/net/wireless/iwlwifi/iwl-scan.c | |||
| @@ -421,7 +421,7 @@ static int iwl_get_channels_for_scan(struct iwl_priv *priv, | |||
| 421 | else | 421 | else |
| 422 | scan_ch->type = SCAN_CHANNEL_TYPE_ACTIVE; | 422 | scan_ch->type = SCAN_CHANNEL_TYPE_ACTIVE; |
| 423 | 423 | ||
| 424 | if ((scan_ch->type & SCAN_CHANNEL_TYPE_ACTIVE) && n_probes) | 424 | if (n_probes) |
| 425 | scan_ch->type |= IWL_SCAN_PROBE_MASK(n_probes); | 425 | scan_ch->type |= IWL_SCAN_PROBE_MASK(n_probes); |
| 426 | 426 | ||
| 427 | scan_ch->active_dwell = cpu_to_le16(active_dwell); | 427 | scan_ch->active_dwell = cpu_to_le16(active_dwell); |
diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wireless/iwlwifi/iwl-sta.c index 60a6e0106036..6283a3a707f5 100644 --- a/drivers/net/wireless/iwlwifi/iwl-sta.c +++ b/drivers/net/wireless/iwlwifi/iwl-sta.c | |||
| @@ -207,7 +207,7 @@ static void iwl_set_ht_add_station(struct iwl_priv *priv, u8 index, | |||
| 207 | case WLAN_HT_CAP_MIMO_PS_DISABLED: | 207 | case WLAN_HT_CAP_MIMO_PS_DISABLED: |
| 208 | break; | 208 | break; |
| 209 | default: | 209 | default: |
| 210 | IWL_WARNING("Invalid MIMO PS mode %d", mimo_ps_mode); | 210 | IWL_WARNING("Invalid MIMO PS mode %d\n", mimo_ps_mode); |
| 211 | break; | 211 | break; |
| 212 | } | 212 | } |
| 213 | 213 | ||
| @@ -969,7 +969,7 @@ int iwl_get_sta_id(struct iwl_priv *priv, struct ieee80211_hdr *hdr) | |||
| 969 | return priv->hw_params.bcast_sta_id; | 969 | return priv->hw_params.bcast_sta_id; |
| 970 | 970 | ||
| 971 | default: | 971 | default: |
| 972 | IWL_WARNING("Unknown mode of operation: %d", priv->iw_mode); | 972 | IWL_WARNING("Unknown mode of operation: %d\n", priv->iw_mode); |
| 973 | return priv->hw_params.bcast_sta_id; | 973 | return priv->hw_params.bcast_sta_id; |
| 974 | } | 974 | } |
| 975 | } | 975 | } |
diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c index 4108c7c8f00f..78b1a7a4ca40 100644 --- a/drivers/net/wireless/iwlwifi/iwl-tx.c +++ b/drivers/net/wireless/iwlwifi/iwl-tx.c | |||
| @@ -402,12 +402,11 @@ static int iwl_hw_tx_queue_init(struct iwl_priv *priv, | |||
| 402 | /** | 402 | /** |
| 403 | * iwl_tx_queue_init - Allocate and initialize one tx/cmd queue | 403 | * iwl_tx_queue_init - Allocate and initialize one tx/cmd queue |
| 404 | */ | 404 | */ |
| 405 | static int iwl_tx_queue_init(struct iwl_priv *priv, | 405 | static int iwl_tx_queue_init(struct iwl_priv *priv, struct iwl_tx_queue *txq, |
| 406 | struct iwl_tx_queue *txq, | ||
| 407 | int slots_num, u32 txq_id) | 406 | int slots_num, u32 txq_id) |
| 408 | { | 407 | { |
| 409 | int i, len; | 408 | int i, len; |
| 410 | int rc = 0; | 409 | int ret; |
| 411 | 410 | ||
| 412 | /* | 411 | /* |
| 413 | * Alloc buffer array for commands (Tx or other types of commands). | 412 | * Alloc buffer array for commands (Tx or other types of commands). |
| @@ -426,19 +425,16 @@ static int iwl_tx_queue_init(struct iwl_priv *priv, | |||
| 426 | continue; | 425 | continue; |
| 427 | } | 426 | } |
| 428 | 427 | ||
| 429 | txq->cmd[i] = kmalloc(len, GFP_KERNEL | GFP_DMA); | 428 | txq->cmd[i] = kmalloc(len, GFP_KERNEL); |
| 430 | if (!txq->cmd[i]) | 429 | if (!txq->cmd[i]) |
| 431 | return -ENOMEM; | 430 | goto err; |
| 432 | } | 431 | } |
| 433 | 432 | ||
| 434 | /* Alloc driver data array and TFD circular buffer */ | 433 | /* Alloc driver data array and TFD circular buffer */ |
| 435 | rc = iwl_tx_queue_alloc(priv, txq, txq_id); | 434 | ret = iwl_tx_queue_alloc(priv, txq, txq_id); |
| 436 | if (rc) { | 435 | if (ret) |
| 437 | for (i = 0; i < slots_num; i++) | 436 | goto err; |
| 438 | kfree(txq->cmd[i]); | ||
| 439 | 437 | ||
| 440 | return -ENOMEM; | ||
| 441 | } | ||
| 442 | txq->need_update = 0; | 438 | txq->need_update = 0; |
| 443 | 439 | ||
| 444 | /* TFD_QUEUE_SIZE_MAX must be power-of-two size, otherwise | 440 | /* TFD_QUEUE_SIZE_MAX must be power-of-two size, otherwise |
| @@ -452,6 +448,17 @@ static int iwl_tx_queue_init(struct iwl_priv *priv, | |||
| 452 | iwl_hw_tx_queue_init(priv, txq); | 448 | iwl_hw_tx_queue_init(priv, txq); |
| 453 | 449 | ||
| 454 | return 0; | 450 | return 0; |
| 451 | err: | ||
| 452 | for (i = 0; i < slots_num; i++) { | ||
| 453 | kfree(txq->cmd[i]); | ||
| 454 | txq->cmd[i] = NULL; | ||
| 455 | } | ||
| 456 | |||
| 457 | if (txq_id == IWL_CMD_QUEUE_NUM) { | ||
| 458 | kfree(txq->cmd[slots_num]); | ||
| 459 | txq->cmd[slots_num] = NULL; | ||
| 460 | } | ||
| 461 | return -ENOMEM; | ||
| 455 | } | 462 | } |
| 456 | /** | 463 | /** |
| 457 | * iwl_hw_txq_ctx_free - Free TXQ Context | 464 | * iwl_hw_txq_ctx_free - Free TXQ Context |
| @@ -493,7 +500,7 @@ int iwl_txq_ctx_reset(struct iwl_priv *priv) | |||
| 493 | /* Alloc keep-warm buffer */ | 500 | /* Alloc keep-warm buffer */ |
| 494 | ret = iwl_kw_alloc(priv); | 501 | ret = iwl_kw_alloc(priv); |
| 495 | if (ret) { | 502 | if (ret) { |
| 496 | IWL_ERROR("Keep Warm allocation failed"); | 503 | IWL_ERROR("Keep Warm allocation failed\n"); |
| 497 | goto error_kw; | 504 | goto error_kw; |
| 498 | } | 505 | } |
| 499 | spin_lock_irqsave(&priv->lock, flags); | 506 | spin_lock_irqsave(&priv->lock, flags); |
| @@ -1463,7 +1470,7 @@ void iwl_rx_reply_compressed_ba(struct iwl_priv *priv, | |||
| 1463 | u16 ba_resp_scd_ssn = le16_to_cpu(ba_resp->scd_ssn); | 1470 | u16 ba_resp_scd_ssn = le16_to_cpu(ba_resp->scd_ssn); |
| 1464 | 1471 | ||
| 1465 | if (scd_flow >= priv->hw_params.max_txq_num) { | 1472 | if (scd_flow >= priv->hw_params.max_txq_num) { |
| 1466 | IWL_ERROR("BUG_ON scd_flow is bigger than number of queues"); | 1473 | IWL_ERROR("BUG_ON scd_flow is bigger than number of queues\n"); |
| 1467 | return; | 1474 | return; |
| 1468 | } | 1475 | } |
| 1469 | 1476 | ||
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index 444847ab1b5a..b775d5bab668 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | 29 | ||
| 30 | #include <linux/kernel.h> | 30 | #include <linux/kernel.h> |
| 31 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 32 | #include <linux/version.h> | ||
| 33 | #include <linux/init.h> | 32 | #include <linux/init.h> |
| 34 | #include <linux/pci.h> | 33 | #include <linux/pci.h> |
| 35 | #include <linux/dma-mapping.h> | 34 | #include <linux/dma-mapping.h> |
| @@ -1558,7 +1557,7 @@ int iwl3945_eeprom_init(struct iwl3945_priv *priv) | |||
| 1558 | BUILD_BUG_ON(sizeof(priv->eeprom) != IWL_EEPROM_IMAGE_SIZE); | 1557 | BUILD_BUG_ON(sizeof(priv->eeprom) != IWL_EEPROM_IMAGE_SIZE); |
| 1559 | 1558 | ||
| 1560 | if ((gp & CSR_EEPROM_GP_VALID_MSK) == CSR_EEPROM_GP_BAD_SIGNATURE) { | 1559 | if ((gp & CSR_EEPROM_GP_VALID_MSK) == CSR_EEPROM_GP_BAD_SIGNATURE) { |
| 1561 | IWL_ERROR("EEPROM not found, EEPROM_GP=0x%08x", gp); | 1560 | IWL_ERROR("EEPROM not found, EEPROM_GP=0x%08x\n", gp); |
| 1562 | return -ENOENT; | 1561 | return -ENOENT; |
| 1563 | } | 1562 | } |
| 1564 | 1563 | ||
| @@ -1583,7 +1582,7 @@ int iwl3945_eeprom_init(struct iwl3945_priv *priv) | |||
| 1583 | } | 1582 | } |
| 1584 | 1583 | ||
| 1585 | if (!(r & CSR_EEPROM_REG_READ_VALID_MSK)) { | 1584 | if (!(r & CSR_EEPROM_REG_READ_VALID_MSK)) { |
| 1586 | IWL_ERROR("Time out reading EEPROM[%d]", addr); | 1585 | IWL_ERROR("Time out reading EEPROM[%d]\n", addr); |
| 1587 | return -ETIMEDOUT; | 1586 | return -ETIMEDOUT; |
| 1588 | } | 1587 | } |
| 1589 | e[addr / 2] = le16_to_cpu((__force __le16)(r >> 16)); | 1588 | e[addr / 2] = le16_to_cpu((__force __le16)(r >> 16)); |
| @@ -2507,7 +2506,7 @@ static int iwl3945_get_sta_id(struct iwl3945_priv *priv, struct ieee80211_hdr *h | |||
| 2507 | return priv->hw_setting.bcast_sta_id; | 2506 | return priv->hw_setting.bcast_sta_id; |
| 2508 | 2507 | ||
| 2509 | default: | 2508 | default: |
| 2510 | IWL_WARNING("Unknown mode of operation: %d", priv->iw_mode); | 2509 | IWL_WARNING("Unknown mode of operation: %d\n", priv->iw_mode); |
| 2511 | return priv->hw_setting.bcast_sta_id; | 2510 | return priv->hw_setting.bcast_sta_id; |
| 2512 | } | 2511 | } |
| 2513 | } | 2512 | } |
diff --git a/drivers/net/wireless/libertas/if_cs.c b/drivers/net/wireless/libertas/if_cs.c index 04d7a251e3f0..8941919001bb 100644 --- a/drivers/net/wireless/libertas/if_cs.c +++ b/drivers/net/wireless/libertas/if_cs.c | |||
| @@ -595,7 +595,7 @@ static int if_cs_prog_helper(struct if_cs_card *card) | |||
| 595 | if (ret < 0) { | 595 | if (ret < 0) { |
| 596 | lbs_pr_err("can't download helper at 0x%x, ret %d\n", | 596 | lbs_pr_err("can't download helper at 0x%x, ret %d\n", |
| 597 | sent, ret); | 597 | sent, ret); |
| 598 | goto done; | 598 | goto err_release; |
| 599 | } | 599 | } |
| 600 | 600 | ||
| 601 | if (count == 0) | 601 | if (count == 0) |
| @@ -604,9 +604,8 @@ static int if_cs_prog_helper(struct if_cs_card *card) | |||
| 604 | sent += count; | 604 | sent += count; |
| 605 | } | 605 | } |
| 606 | 606 | ||
| 607 | err_release: | ||
| 607 | release_firmware(fw); | 608 | release_firmware(fw); |
| 608 | ret = 0; | ||
| 609 | |||
| 610 | done: | 609 | done: |
| 611 | lbs_deb_leave_args(LBS_DEB_CS, "ret %d", ret); | 610 | lbs_deb_leave_args(LBS_DEB_CS, "ret %d", ret); |
| 612 | return ret; | 611 | return ret; |
| @@ -676,14 +675,8 @@ static int if_cs_prog_real(struct if_cs_card *card) | |||
| 676 | } | 675 | } |
| 677 | 676 | ||
| 678 | ret = if_cs_poll_while_fw_download(card, IF_CS_SCRATCH, 0x5a); | 677 | ret = if_cs_poll_while_fw_download(card, IF_CS_SCRATCH, 0x5a); |
| 679 | if (ret < 0) { | 678 | if (ret < 0) |
| 680 | lbs_pr_err("firmware download failed\n"); | 679 | lbs_pr_err("firmware download failed\n"); |
| 681 | goto err_release; | ||
| 682 | } | ||
| 683 | |||
| 684 | ret = 0; | ||
| 685 | goto done; | ||
| 686 | |||
| 687 | 680 | ||
| 688 | err_release: | 681 | err_release: |
| 689 | release_firmware(fw); | 682 | release_firmware(fw); |
diff --git a/drivers/net/wireless/orinoco.c b/drivers/net/wireless/orinoco.c index 1ebcafe7ca5f..36c004e15602 100644 --- a/drivers/net/wireless/orinoco.c +++ b/drivers/net/wireless/orinoco.c | |||
| @@ -1970,6 +1970,9 @@ __orinoco_set_multicast_list(struct net_device *dev) | |||
| 1970 | priv->promiscuous = promisc; | 1970 | priv->promiscuous = promisc; |
| 1971 | } | 1971 | } |
| 1972 | 1972 | ||
| 1973 | /* If we're not in promiscuous mode, then we need to set the | ||
| 1974 | * group address if either we want to multicast, or if we were | ||
| 1975 | * multicasting and want to stop */ | ||
| 1973 | if (! promisc && (mc_count || priv->mc_count) ) { | 1976 | if (! promisc && (mc_count || priv->mc_count) ) { |
| 1974 | struct dev_mc_list *p = dev->mc_list; | 1977 | struct dev_mc_list *p = dev->mc_list; |
| 1975 | struct hermes_multicast mclist; | 1978 | struct hermes_multicast mclist; |
| @@ -1989,9 +1992,10 @@ __orinoco_set_multicast_list(struct net_device *dev) | |||
| 1989 | printk(KERN_WARNING "%s: Multicast list is " | 1992 | printk(KERN_WARNING "%s: Multicast list is " |
| 1990 | "longer than mc_count\n", dev->name); | 1993 | "longer than mc_count\n", dev->name); |
| 1991 | 1994 | ||
| 1992 | err = hermes_write_ltv(hw, USER_BAP, HERMES_RID_CNFGROUPADDRESSES, | 1995 | err = hermes_write_ltv(hw, USER_BAP, |
| 1993 | HERMES_BYTES_TO_RECLEN(priv->mc_count * ETH_ALEN), | 1996 | HERMES_RID_CNFGROUPADDRESSES, |
| 1994 | &mclist); | 1997 | HERMES_BYTES_TO_RECLEN(mc_count * ETH_ALEN), |
| 1998 | &mclist); | ||
| 1995 | if (err) | 1999 | if (err) |
| 1996 | printk(KERN_ERR "%s: Error %d setting multicast list.\n", | 2000 | printk(KERN_ERR "%s: Error %d setting multicast list.\n", |
| 1997 | dev->name, err); | 2001 | dev->name, err); |
diff --git a/drivers/net/wireless/p54/p54common.c b/drivers/net/wireless/p54/p54common.c index 83cd85e1f847..29be3dc8ee09 100644 --- a/drivers/net/wireless/p54/p54common.c +++ b/drivers/net/wireless/p54/p54common.c | |||
| @@ -413,12 +413,12 @@ static void p54_rx_frame_sent(struct ieee80211_hw *dev, struct sk_buff *skb) | |||
| 413 | last_addr = range->end_addr; | 413 | last_addr = range->end_addr; |
| 414 | __skb_unlink(entry, &priv->tx_queue); | 414 | __skb_unlink(entry, &priv->tx_queue); |
| 415 | memset(&info->status, 0, sizeof(info->status)); | 415 | memset(&info->status, 0, sizeof(info->status)); |
| 416 | priv->tx_stats[skb_get_queue_mapping(skb)].len--; | ||
| 417 | entry_hdr = (struct p54_control_hdr *) entry->data; | 416 | entry_hdr = (struct p54_control_hdr *) entry->data; |
| 418 | entry_data = (struct p54_tx_control_allocdata *) entry_hdr->data; | 417 | entry_data = (struct p54_tx_control_allocdata *) entry_hdr->data; |
| 419 | if ((entry_hdr->magic1 & cpu_to_le16(0x4000)) != 0) | 418 | if ((entry_hdr->magic1 & cpu_to_le16(0x4000)) != 0) |
| 420 | pad = entry_data->align[0]; | 419 | pad = entry_data->align[0]; |
| 421 | 420 | ||
| 421 | priv->tx_stats[entry_data->hw_queue - 4].len--; | ||
| 422 | if (!(info->flags & IEEE80211_TX_CTL_NO_ACK)) { | 422 | if (!(info->flags & IEEE80211_TX_CTL_NO_ACK)) { |
| 423 | if (!(payload->status & 0x01)) | 423 | if (!(payload->status & 0x01)) |
| 424 | info->flags |= IEEE80211_TX_STAT_ACK; | 424 | info->flags |= IEEE80211_TX_STAT_ACK; |
| @@ -557,6 +557,7 @@ static int p54_tx(struct ieee80211_hw *dev, struct sk_buff *skb) | |||
| 557 | struct p54_tx_control_allocdata *txhdr; | 557 | struct p54_tx_control_allocdata *txhdr; |
| 558 | size_t padding, len; | 558 | size_t padding, len; |
| 559 | u8 rate; | 559 | u8 rate; |
| 560 | u8 cts_rate = 0x20; | ||
| 560 | 561 | ||
| 561 | current_queue = &priv->tx_stats[skb_get_queue_mapping(skb)]; | 562 | current_queue = &priv->tx_stats[skb_get_queue_mapping(skb)]; |
| 562 | if (unlikely(current_queue->len > current_queue->limit)) | 563 | if (unlikely(current_queue->len > current_queue->limit)) |
| @@ -581,28 +582,28 @@ static int p54_tx(struct ieee80211_hw *dev, struct sk_buff *skb) | |||
| 581 | hdr->type = (info->flags & IEEE80211_TX_CTL_NO_ACK) ? 0 : cpu_to_le16(1); | 582 | hdr->type = (info->flags & IEEE80211_TX_CTL_NO_ACK) ? 0 : cpu_to_le16(1); |
| 582 | hdr->retry1 = hdr->retry2 = info->control.retry_limit; | 583 | hdr->retry1 = hdr->retry2 = info->control.retry_limit; |
| 583 | 584 | ||
| 584 | memset(txhdr->wep_key, 0x0, 16); | ||
| 585 | txhdr->padding = 0; | ||
| 586 | txhdr->padding2 = 0; | ||
| 587 | |||
| 588 | /* TODO: add support for alternate retry TX rates */ | 585 | /* TODO: add support for alternate retry TX rates */ |
| 589 | rate = ieee80211_get_tx_rate(dev, info)->hw_value; | 586 | rate = ieee80211_get_tx_rate(dev, info)->hw_value; |
| 590 | if (info->flags & IEEE80211_TX_CTL_SHORT_PREAMBLE) | 587 | if (info->flags & IEEE80211_TX_CTL_SHORT_PREAMBLE) { |
| 591 | rate |= 0x10; | 588 | rate |= 0x10; |
| 592 | if (info->flags & IEEE80211_TX_CTL_USE_RTS_CTS) | 589 | cts_rate |= 0x10; |
| 590 | } | ||
| 591 | if (info->flags & IEEE80211_TX_CTL_USE_RTS_CTS) { | ||
| 593 | rate |= 0x40; | 592 | rate |= 0x40; |
| 594 | else if (info->flags & IEEE80211_TX_CTL_USE_CTS_PROTECT) | 593 | cts_rate |= ieee80211_get_rts_cts_rate(dev, info)->hw_value; |
| 594 | } else if (info->flags & IEEE80211_TX_CTL_USE_CTS_PROTECT) { | ||
| 595 | rate |= 0x20; | 595 | rate |= 0x20; |
| 596 | cts_rate |= ieee80211_get_rts_cts_rate(dev, info)->hw_value; | ||
| 597 | } | ||
| 596 | memset(txhdr->rateset, rate, 8); | 598 | memset(txhdr->rateset, rate, 8); |
| 597 | txhdr->wep_key_present = 0; | 599 | txhdr->key_type = 0; |
| 598 | txhdr->wep_key_len = 0; | 600 | txhdr->key_len = 0; |
| 599 | txhdr->frame_type = cpu_to_le32(skb_get_queue_mapping(skb) + 4); | 601 | txhdr->hw_queue = skb_get_queue_mapping(skb) + 4; |
| 600 | txhdr->magic4 = 0; | 602 | txhdr->tx_antenna = (info->antenna_sel_tx == 0) ? |
| 601 | txhdr->antenna = (info->antenna_sel_tx == 0) ? | ||
| 602 | 2 : info->antenna_sel_tx - 1; | 603 | 2 : info->antenna_sel_tx - 1; |
| 603 | txhdr->output_power = 0x7f; // HW Maximum | 604 | txhdr->output_power = 0x7f; // HW Maximum |
| 604 | txhdr->magic5 = (info->flags & IEEE80211_TX_CTL_NO_ACK) ? | 605 | txhdr->cts_rate = (info->flags & IEEE80211_TX_CTL_NO_ACK) ? |
| 605 | 0 : ((rate > 0x3) ? cpu_to_le32(0x33) : cpu_to_le32(0x23)); | 606 | 0 : cts_rate; |
| 606 | if (padding) | 607 | if (padding) |
| 607 | txhdr->align[0] = padding; | 608 | txhdr->align[0] = padding; |
| 608 | 609 | ||
| @@ -836,10 +837,21 @@ static int p54_start(struct ieee80211_hw *dev) | |||
| 836 | struct p54_common *priv = dev->priv; | 837 | struct p54_common *priv = dev->priv; |
| 837 | int err; | 838 | int err; |
| 838 | 839 | ||
| 840 | if (!priv->cached_vdcf) { | ||
| 841 | priv->cached_vdcf = kzalloc(sizeof(struct p54_tx_control_vdcf)+ | ||
| 842 | priv->tx_hdr_len + sizeof(struct p54_control_hdr), | ||
| 843 | GFP_KERNEL); | ||
| 844 | |||
| 845 | if (!priv->cached_vdcf) | ||
| 846 | return -ENOMEM; | ||
| 847 | } | ||
| 848 | |||
| 839 | err = priv->open(dev); | 849 | err = priv->open(dev); |
| 840 | if (!err) | 850 | if (!err) |
| 841 | priv->mode = IEEE80211_IF_TYPE_MNTR; | 851 | priv->mode = IEEE80211_IF_TYPE_MNTR; |
| 842 | 852 | ||
| 853 | p54_init_vdcf(dev); | ||
| 854 | |||
| 843 | return err; | 855 | return err; |
| 844 | } | 856 | } |
| 845 | 857 | ||
| @@ -1019,15 +1031,6 @@ struct ieee80211_hw *p54_init_common(size_t priv_data_len) | |||
| 1019 | dev->extra_tx_headroom = sizeof(struct p54_control_hdr) + 4 + | 1031 | dev->extra_tx_headroom = sizeof(struct p54_control_hdr) + 4 + |
| 1020 | sizeof(struct p54_tx_control_allocdata); | 1032 | sizeof(struct p54_tx_control_allocdata); |
| 1021 | 1033 | ||
| 1022 | priv->cached_vdcf = kzalloc(sizeof(struct p54_tx_control_vdcf) + | ||
| 1023 | priv->tx_hdr_len + sizeof(struct p54_control_hdr), GFP_KERNEL); | ||
| 1024 | |||
| 1025 | if (!priv->cached_vdcf) { | ||
| 1026 | ieee80211_free_hw(dev); | ||
| 1027 | return NULL; | ||
| 1028 | } | ||
| 1029 | |||
| 1030 | p54_init_vdcf(dev); | ||
| 1031 | mutex_init(&priv->conf_mutex); | 1034 | mutex_init(&priv->conf_mutex); |
| 1032 | 1035 | ||
| 1033 | return dev; | 1036 | return dev; |
diff --git a/drivers/net/wireless/p54/p54common.h b/drivers/net/wireless/p54/p54common.h index 2245fcce92dc..8db6c0e8e540 100644 --- a/drivers/net/wireless/p54/p54common.h +++ b/drivers/net/wireless/p54/p54common.h | |||
| @@ -183,16 +183,16 @@ struct p54_frame_sent_hdr { | |||
| 183 | 183 | ||
| 184 | struct p54_tx_control_allocdata { | 184 | struct p54_tx_control_allocdata { |
| 185 | u8 rateset[8]; | 185 | u8 rateset[8]; |
| 186 | u16 padding; | 186 | u8 unalloc0[2]; |
| 187 | u8 wep_key_present; | 187 | u8 key_type; |
| 188 | u8 wep_key_len; | 188 | u8 key_len; |
| 189 | u8 wep_key[16]; | 189 | u8 key[16]; |
| 190 | __le32 frame_type; | 190 | u8 hw_queue; |
| 191 | u32 padding2; | 191 | u8 unalloc1[9]; |
| 192 | __le16 magic4; | 192 | u8 tx_antenna; |
| 193 | u8 antenna; | ||
| 194 | u8 output_power; | 193 | u8 output_power; |
| 195 | __le32 magic5; | 194 | u8 cts_rate; |
| 195 | u8 unalloc2[3]; | ||
| 196 | u8 align[0]; | 196 | u8 align[0]; |
| 197 | } __attribute__ ((packed)); | 197 | } __attribute__ ((packed)); |
| 198 | 198 | ||
diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c index 815c095ef797..cbaca23a9453 100644 --- a/drivers/net/wireless/p54/p54usb.c +++ b/drivers/net/wireless/p54/p54usb.c | |||
| @@ -109,7 +109,17 @@ static void p54u_rx_cb(struct urb *urb) | |||
| 109 | urb->context = skb; | 109 | urb->context = skb; |
| 110 | skb_queue_tail(&priv->rx_queue, skb); | 110 | skb_queue_tail(&priv->rx_queue, skb); |
| 111 | } else { | 111 | } else { |
| 112 | if (!priv->hw_type) | ||
| 113 | skb_push(skb, sizeof(struct net2280_tx_hdr)); | ||
| 114 | |||
| 115 | skb_reset_tail_pointer(skb); | ||
| 112 | skb_trim(skb, 0); | 116 | skb_trim(skb, 0); |
| 117 | if (urb->transfer_buffer != skb_tail_pointer(skb)) { | ||
| 118 | /* this should not happen */ | ||
| 119 | WARN_ON(1); | ||
| 120 | urb->transfer_buffer = skb_tail_pointer(skb); | ||
| 121 | } | ||
| 122 | |||
| 113 | skb_queue_tail(&priv->rx_queue, skb); | 123 | skb_queue_tail(&priv->rx_queue, skb); |
| 114 | } | 124 | } |
| 115 | 125 | ||
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.h b/drivers/net/wireless/rt2x00/rt2x00queue.h index a4a8c57004db..ff78e52ce43c 100644 --- a/drivers/net/wireless/rt2x00/rt2x00queue.h +++ b/drivers/net/wireless/rt2x00/rt2x00queue.h | |||
| @@ -173,10 +173,10 @@ struct rxdone_entry_desc { | |||
| 173 | * frame transmission failed due to excessive retries. | 173 | * frame transmission failed due to excessive retries. |
| 174 | */ | 174 | */ |
| 175 | enum txdone_entry_desc_flags { | 175 | enum txdone_entry_desc_flags { |
| 176 | TXDONE_UNKNOWN = 1 << 0, | 176 | TXDONE_UNKNOWN, |
| 177 | TXDONE_SUCCESS = 1 << 1, | 177 | TXDONE_SUCCESS, |
| 178 | TXDONE_FAILURE = 1 << 2, | 178 | TXDONE_FAILURE, |
| 179 | TXDONE_EXCESSIVE_RETRY = 1 << 3, | 179 | TXDONE_EXCESSIVE_RETRY, |
| 180 | }; | 180 | }; |
| 181 | 181 | ||
| 182 | /** | 182 | /** |
diff --git a/drivers/net/wireless/rt2x00/rt2x00reg.h b/drivers/net/wireless/rt2x00/rt2x00reg.h index 7e88ce5651b9..2ea7866abd5d 100644 --- a/drivers/net/wireless/rt2x00/rt2x00reg.h +++ b/drivers/net/wireless/rt2x00/rt2x00reg.h | |||
| @@ -136,7 +136,7 @@ struct rt2x00_field32 { | |||
| 136 | */ | 136 | */ |
| 137 | #define is_power_of_two(x) ( !((x) & ((x)-1)) ) | 137 | #define is_power_of_two(x) ( !((x) & ((x)-1)) ) |
| 138 | #define low_bit_mask(x) ( ((x)-1) & ~(x) ) | 138 | #define low_bit_mask(x) ( ((x)-1) & ~(x) ) |
| 139 | #define is_valid_mask(x) is_power_of_two(1 + (x) + low_bit_mask(x)) | 139 | #define is_valid_mask(x) is_power_of_two(1LU + (x) + low_bit_mask(x)) |
| 140 | 140 | ||
| 141 | /* | 141 | /* |
| 142 | * Macro's to find first set bit in a variable. | 142 | * Macro's to find first set bit in a variable. |
| @@ -173,8 +173,7 @@ struct rt2x00_field32 { | |||
| 173 | * does not exceed the given typelimit. | 173 | * does not exceed the given typelimit. |
| 174 | */ | 174 | */ |
| 175 | #define FIELD_CHECK(__mask, __type) \ | 175 | #define FIELD_CHECK(__mask, __type) \ |
| 176 | BUILD_BUG_ON(!__builtin_constant_p(__mask) || \ | 176 | BUILD_BUG_ON(!(__mask) || \ |
| 177 | !(__mask) || \ | ||
| 178 | !is_valid_mask(__mask) || \ | 177 | !is_valid_mask(__mask) || \ |
| 179 | (__mask) != (__type)(__mask)) \ | 178 | (__mask) != (__type)(__mask)) \ |
| 180 | 179 | ||
diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wireless/rt2x00/rt2x00usb.c index 8d76bb2e0312..2050227ea530 100644 --- a/drivers/net/wireless/rt2x00/rt2x00usb.c +++ b/drivers/net/wireless/rt2x00/rt2x00usb.c | |||
| @@ -181,6 +181,7 @@ static void rt2x00usb_interrupt_txdone(struct urb *urb) | |||
| 181 | * (Only indirectly by looking at the failed TX counters | 181 | * (Only indirectly by looking at the failed TX counters |
| 182 | * in the register). | 182 | * in the register). |
| 183 | */ | 183 | */ |
| 184 | txdesc.flags = 0; | ||
| 184 | if (!urb->status) | 185 | if (!urb->status) |
| 185 | __set_bit(TXDONE_UNKNOWN, &txdesc.flags); | 186 | __set_bit(TXDONE_UNKNOWN, &txdesc.flags); |
| 186 | else | 187 | else |
diff --git a/drivers/net/wireless/rtl8187_dev.c b/drivers/net/wireless/rtl8187_dev.c index 57376fb993ed..ca5deb6244e6 100644 --- a/drivers/net/wireless/rtl8187_dev.c +++ b/drivers/net/wireless/rtl8187_dev.c | |||
| @@ -40,6 +40,7 @@ static struct usb_device_id rtl8187_table[] __devinitdata = { | |||
| 40 | /* Netgear */ | 40 | /* Netgear */ |
| 41 | {USB_DEVICE(0x0846, 0x6100), .driver_info = DEVICE_RTL8187}, | 41 | {USB_DEVICE(0x0846, 0x6100), .driver_info = DEVICE_RTL8187}, |
| 42 | {USB_DEVICE(0x0846, 0x6a00), .driver_info = DEVICE_RTL8187}, | 42 | {USB_DEVICE(0x0846, 0x6a00), .driver_info = DEVICE_RTL8187}, |
| 43 | {USB_DEVICE(0x0846, 0x4260), .driver_info = DEVICE_RTL8187B}, | ||
| 43 | /* HP */ | 44 | /* HP */ |
| 44 | {USB_DEVICE(0x03f0, 0xca02), .driver_info = DEVICE_RTL8187}, | 45 | {USB_DEVICE(0x03f0, 0xca02), .driver_info = DEVICE_RTL8187}, |
| 45 | /* Sitecom */ | 46 | /* Sitecom */ |
diff --git a/drivers/of/device.c b/drivers/of/device.c index 8a1d93a2bb81..51e5214071da 100644 --- a/drivers/of/device.c +++ b/drivers/of/device.c | |||
| @@ -57,6 +57,15 @@ static ssize_t devspec_show(struct device *dev, | |||
| 57 | return sprintf(buf, "%s\n", ofdev->node->full_name); | 57 | return sprintf(buf, "%s\n", ofdev->node->full_name); |
| 58 | } | 58 | } |
| 59 | 59 | ||
| 60 | static ssize_t name_show(struct device *dev, | ||
| 61 | struct device_attribute *attr, char *buf) | ||
| 62 | { | ||
| 63 | struct of_device *ofdev; | ||
| 64 | |||
| 65 | ofdev = to_of_device(dev); | ||
| 66 | return sprintf(buf, "%s\n", ofdev->node->name); | ||
| 67 | } | ||
| 68 | |||
| 60 | static ssize_t modalias_show(struct device *dev, | 69 | static ssize_t modalias_show(struct device *dev, |
| 61 | struct device_attribute *attr, char *buf) | 70 | struct device_attribute *attr, char *buf) |
| 62 | { | 71 | { |
| @@ -71,6 +80,7 @@ static ssize_t modalias_show(struct device *dev, | |||
| 71 | 80 | ||
| 72 | struct device_attribute of_platform_device_attrs[] = { | 81 | struct device_attribute of_platform_device_attrs[] = { |
| 73 | __ATTR_RO(devspec), | 82 | __ATTR_RO(devspec), |
| 83 | __ATTR_RO(name), | ||
| 74 | __ATTR_RO(modalias), | 84 | __ATTR_RO(modalias), |
| 75 | __ATTR_NULL | 85 | __ATTR_NULL |
| 76 | }; | 86 | }; |
diff --git a/drivers/oprofile/cpu_buffer.c b/drivers/oprofile/cpu_buffer.c index 2450b3a393ff..7ba78e6d210e 100644 --- a/drivers/oprofile/cpu_buffer.c +++ b/drivers/oprofile/cpu_buffer.c | |||
| @@ -38,8 +38,10 @@ void free_cpu_buffers(void) | |||
| 38 | { | 38 | { |
| 39 | int i; | 39 | int i; |
| 40 | 40 | ||
| 41 | for_each_online_cpu(i) | 41 | for_each_online_cpu(i) { |
| 42 | vfree(per_cpu(cpu_buffer, i).buffer); | 42 | vfree(per_cpu(cpu_buffer, i).buffer); |
| 43 | per_cpu(cpu_buffer, i).buffer = NULL; | ||
| 44 | } | ||
| 43 | } | 45 | } |
| 44 | 46 | ||
| 45 | int alloc_cpu_buffers(void) | 47 | int alloc_cpu_buffers(void) |
diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c index e7fbac529935..8d692a5c8e73 100644 --- a/drivers/oprofile/event_buffer.c +++ b/drivers/oprofile/event_buffer.c | |||
| @@ -93,6 +93,8 @@ out: | |||
| 93 | void free_event_buffer(void) | 93 | void free_event_buffer(void) |
| 94 | { | 94 | { |
| 95 | vfree(event_buffer); | 95 | vfree(event_buffer); |
| 96 | |||
| 97 | event_buffer = NULL; | ||
| 96 | } | 98 | } |
| 97 | 99 | ||
| 98 | 100 | ||
diff --git a/drivers/pci/hotplug/acpi_pcihp.c b/drivers/pci/hotplug/acpi_pcihp.c index 93e37f0666ab..e17ef54f0efc 100644 --- a/drivers/pci/hotplug/acpi_pcihp.c +++ b/drivers/pci/hotplug/acpi_pcihp.c | |||
| @@ -382,7 +382,7 @@ EXPORT_SYMBOL_GPL(acpi_get_hp_params_from_firmware); | |||
| 382 | int acpi_get_hp_hw_control_from_firmware(struct pci_dev *dev, u32 flags) | 382 | int acpi_get_hp_hw_control_from_firmware(struct pci_dev *dev, u32 flags) |
| 383 | { | 383 | { |
| 384 | acpi_status status; | 384 | acpi_status status; |
| 385 | acpi_handle chandle, handle = DEVICE_ACPI_HANDLE(&(dev->dev)); | 385 | acpi_handle chandle, handle; |
| 386 | struct pci_dev *pdev = dev; | 386 | struct pci_dev *pdev = dev; |
| 387 | struct pci_bus *parent; | 387 | struct pci_bus *parent; |
| 388 | struct acpi_buffer string = { ACPI_ALLOCATE_BUFFER, NULL }; | 388 | struct acpi_buffer string = { ACPI_ALLOCATE_BUFFER, NULL }; |
| @@ -399,10 +399,25 @@ int acpi_get_hp_hw_control_from_firmware(struct pci_dev *dev, u32 flags) | |||
| 399 | * Per PCI firmware specification, we should run the ACPI _OSC | 399 | * Per PCI firmware specification, we should run the ACPI _OSC |
| 400 | * method to get control of hotplug hardware before using it. If | 400 | * method to get control of hotplug hardware before using it. If |
| 401 | * an _OSC is missing, we look for an OSHP to do the same thing. | 401 | * an _OSC is missing, we look for an OSHP to do the same thing. |
| 402 | * To handle different BIOS behavior, we look for _OSC and OSHP | 402 | * To handle different BIOS behavior, we look for _OSC on a root |
| 403 | * within the scope of the hotplug controller and its parents, | 403 | * bridge preferentially (according to PCI fw spec). Later for |
| 404 | * OSHP within the scope of the hotplug controller and its parents, | ||
| 404 | * upto the host bridge under which this controller exists. | 405 | * upto the host bridge under which this controller exists. |
| 405 | */ | 406 | */ |
| 407 | handle = acpi_find_root_bridge_handle(pdev); | ||
| 408 | if (handle) { | ||
| 409 | acpi_get_name(handle, ACPI_FULL_PATHNAME, &string); | ||
| 410 | dbg("Trying to get hotplug control for %s\n", | ||
| 411 | (char *)string.pointer); | ||
| 412 | status = pci_osc_control_set(handle, flags); | ||
| 413 | if (ACPI_SUCCESS(status)) | ||
| 414 | goto got_one; | ||
| 415 | kfree(string.pointer); | ||
| 416 | string = (struct acpi_buffer){ ACPI_ALLOCATE_BUFFER, NULL }; | ||
| 417 | } | ||
| 418 | |||
| 419 | pdev = dev; | ||
| 420 | handle = DEVICE_ACPI_HANDLE(&dev->dev); | ||
| 406 | while (!handle) { | 421 | while (!handle) { |
| 407 | /* | 422 | /* |
| 408 | * This hotplug controller was not listed in the ACPI name | 423 | * This hotplug controller was not listed in the ACPI name |
| @@ -427,15 +442,9 @@ int acpi_get_hp_hw_control_from_firmware(struct pci_dev *dev, u32 flags) | |||
| 427 | acpi_get_name(handle, ACPI_FULL_PATHNAME, &string); | 442 | acpi_get_name(handle, ACPI_FULL_PATHNAME, &string); |
| 428 | dbg("Trying to get hotplug control for %s \n", | 443 | dbg("Trying to get hotplug control for %s \n", |
| 429 | (char *)string.pointer); | 444 | (char *)string.pointer); |
| 430 | status = pci_osc_control_set(handle, flags); | 445 | status = acpi_run_oshp(handle); |
| 431 | if (status == AE_NOT_FOUND) | 446 | if (ACPI_SUCCESS(status)) |
| 432 | status = acpi_run_oshp(handle); | 447 | goto got_one; |
| 433 | if (ACPI_SUCCESS(status)) { | ||
| 434 | dbg("Gained control for hotplug HW for pci %s (%s)\n", | ||
| 435 | pci_name(dev), (char *)string.pointer); | ||
| 436 | kfree(string.pointer); | ||
| 437 | return 0; | ||
| 438 | } | ||
| 439 | if (acpi_root_bridge(handle)) | 448 | if (acpi_root_bridge(handle)) |
| 440 | break; | 449 | break; |
| 441 | chandle = handle; | 450 | chandle = handle; |
| @@ -449,6 +458,11 @@ int acpi_get_hp_hw_control_from_firmware(struct pci_dev *dev, u32 flags) | |||
| 449 | 458 | ||
| 450 | kfree(string.pointer); | 459 | kfree(string.pointer); |
| 451 | return -ENODEV; | 460 | return -ENODEV; |
| 461 | got_one: | ||
| 462 | dbg("Gained control for hotplug HW for pci %s (%s)\n", pci_name(dev), | ||
| 463 | (char *)string.pointer); | ||
| 464 | kfree(string.pointer); | ||
| 465 | return 0; | ||
| 452 | } | 466 | } |
| 453 | EXPORT_SYMBOL(acpi_get_hp_hw_control_from_firmware); | 467 | EXPORT_SYMBOL(acpi_get_hp_hw_control_from_firmware); |
| 454 | 468 | ||
diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h index e3a1e7e7dba2..9e6cec67e1cc 100644 --- a/drivers/pci/hotplug/pciehp.h +++ b/drivers/pci/hotplug/pciehp.h | |||
| @@ -43,7 +43,6 @@ extern int pciehp_poll_mode; | |||
| 43 | extern int pciehp_poll_time; | 43 | extern int pciehp_poll_time; |
| 44 | extern int pciehp_debug; | 44 | extern int pciehp_debug; |
| 45 | extern int pciehp_force; | 45 | extern int pciehp_force; |
| 46 | extern int pciehp_slot_with_bus; | ||
| 47 | extern struct workqueue_struct *pciehp_wq; | 46 | extern struct workqueue_struct *pciehp_wq; |
| 48 | 47 | ||
| 49 | #define dbg(format, arg...) \ | 48 | #define dbg(format, arg...) \ |
diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c index 3677495c4f91..4fd5355bc3b5 100644 --- a/drivers/pci/hotplug/pciehp_core.c +++ b/drivers/pci/hotplug/pciehp_core.c | |||
| @@ -41,7 +41,6 @@ int pciehp_debug; | |||
| 41 | int pciehp_poll_mode; | 41 | int pciehp_poll_mode; |
| 42 | int pciehp_poll_time; | 42 | int pciehp_poll_time; |
| 43 | int pciehp_force; | 43 | int pciehp_force; |
| 44 | int pciehp_slot_with_bus; | ||
| 45 | struct workqueue_struct *pciehp_wq; | 44 | struct workqueue_struct *pciehp_wq; |
| 46 | 45 | ||
| 47 | #define DRIVER_VERSION "0.4" | 46 | #define DRIVER_VERSION "0.4" |
| @@ -56,12 +55,10 @@ module_param(pciehp_debug, bool, 0644); | |||
| 56 | module_param(pciehp_poll_mode, bool, 0644); | 55 | module_param(pciehp_poll_mode, bool, 0644); |
| 57 | module_param(pciehp_poll_time, int, 0644); | 56 | module_param(pciehp_poll_time, int, 0644); |
| 58 | module_param(pciehp_force, bool, 0644); | 57 | module_param(pciehp_force, bool, 0644); |
| 59 | module_param(pciehp_slot_with_bus, bool, 0644); | ||
| 60 | MODULE_PARM_DESC(pciehp_debug, "Debugging mode enabled or not"); | 58 | MODULE_PARM_DESC(pciehp_debug, "Debugging mode enabled or not"); |
| 61 | MODULE_PARM_DESC(pciehp_poll_mode, "Using polling mechanism for hot-plug events or not"); | 59 | MODULE_PARM_DESC(pciehp_poll_mode, "Using polling mechanism for hot-plug events or not"); |
| 62 | MODULE_PARM_DESC(pciehp_poll_time, "Polling mechanism frequency, in seconds"); | 60 | MODULE_PARM_DESC(pciehp_poll_time, "Polling mechanism frequency, in seconds"); |
| 63 | MODULE_PARM_DESC(pciehp_force, "Force pciehp, even if _OSC and OSHP are missing"); | 61 | MODULE_PARM_DESC(pciehp_force, "Force pciehp, even if _OSC and OSHP are missing"); |
| 64 | MODULE_PARM_DESC(pciehp_slot_with_bus, "Use bus number in the slot name"); | ||
| 65 | 62 | ||
| 66 | #define PCIE_MODULE_NAME "pciehp" | 63 | #define PCIE_MODULE_NAME "pciehp" |
| 67 | 64 | ||
| @@ -194,6 +191,7 @@ static int init_slots(struct controller *ctrl) | |||
| 194 | struct slot *slot; | 191 | struct slot *slot; |
| 195 | struct hotplug_slot *hotplug_slot; | 192 | struct hotplug_slot *hotplug_slot; |
| 196 | struct hotplug_slot_info *info; | 193 | struct hotplug_slot_info *info; |
| 194 | int len, dup = 1; | ||
| 197 | int retval = -ENOMEM; | 195 | int retval = -ENOMEM; |
| 198 | 196 | ||
| 199 | list_for_each_entry(slot, &ctrl->slot_list, slot_list) { | 197 | list_for_each_entry(slot, &ctrl->slot_list, slot_list) { |
| @@ -220,15 +218,24 @@ static int init_slots(struct controller *ctrl) | |||
| 220 | dbg("Registering bus=%x dev=%x hp_slot=%x sun=%x " | 218 | dbg("Registering bus=%x dev=%x hp_slot=%x sun=%x " |
| 221 | "slot_device_offset=%x\n", slot->bus, slot->device, | 219 | "slot_device_offset=%x\n", slot->bus, slot->device, |
| 222 | slot->hp_slot, slot->number, ctrl->slot_device_offset); | 220 | slot->hp_slot, slot->number, ctrl->slot_device_offset); |
| 221 | duplicate_name: | ||
| 223 | retval = pci_hp_register(hotplug_slot, | 222 | retval = pci_hp_register(hotplug_slot, |
| 224 | ctrl->pci_dev->subordinate, | 223 | ctrl->pci_dev->subordinate, |
| 225 | slot->device); | 224 | slot->device); |
| 226 | if (retval) { | 225 | if (retval) { |
| 226 | /* | ||
| 227 | * If slot N already exists, we'll try to create | ||
| 228 | * slot N-1, N-2 ... N-M, until we overflow. | ||
| 229 | */ | ||
| 230 | if (retval == -EEXIST) { | ||
| 231 | len = snprintf(slot->name, SLOT_NAME_SIZE, | ||
| 232 | "%d-%d", slot->number, dup++); | ||
| 233 | if (len < SLOT_NAME_SIZE) | ||
| 234 | goto duplicate_name; | ||
| 235 | else | ||
| 236 | err("duplicate slot name overflow\n"); | ||
| 237 | } | ||
| 227 | err("pci_hp_register failed with error %d\n", retval); | 238 | err("pci_hp_register failed with error %d\n", retval); |
| 228 | if (retval == -EEXIST) | ||
| 229 | err("Failed to register slot because of name " | ||
| 230 | "collision. Try \'pciehp_slot_with_bus\' " | ||
| 231 | "module option.\n"); | ||
| 232 | goto error_info; | 239 | goto error_info; |
| 233 | } | 240 | } |
| 234 | /* create additional sysfs entries */ | 241 | /* create additional sysfs entries */ |
diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c index ad27e9e225a6..ab31f5ba665d 100644 --- a/drivers/pci/hotplug/pciehp_hpc.c +++ b/drivers/pci/hotplug/pciehp_hpc.c | |||
| @@ -1030,15 +1030,6 @@ static void pcie_shutdown_notification(struct controller *ctrl) | |||
| 1030 | pciehp_free_irq(ctrl); | 1030 | pciehp_free_irq(ctrl); |
| 1031 | } | 1031 | } |
| 1032 | 1032 | ||
| 1033 | static void make_slot_name(struct slot *slot) | ||
| 1034 | { | ||
| 1035 | if (pciehp_slot_with_bus) | ||
| 1036 | snprintf(slot->name, SLOT_NAME_SIZE, "%04d_%04d", | ||
| 1037 | slot->bus, slot->number); | ||
| 1038 | else | ||
| 1039 | snprintf(slot->name, SLOT_NAME_SIZE, "%d", slot->number); | ||
| 1040 | } | ||
| 1041 | |||
| 1042 | static int pcie_init_slot(struct controller *ctrl) | 1033 | static int pcie_init_slot(struct controller *ctrl) |
| 1043 | { | 1034 | { |
| 1044 | struct slot *slot; | 1035 | struct slot *slot; |
| @@ -1053,7 +1044,7 @@ static int pcie_init_slot(struct controller *ctrl) | |||
| 1053 | slot->device = ctrl->slot_device_offset + slot->hp_slot; | 1044 | slot->device = ctrl->slot_device_offset + slot->hp_slot; |
| 1054 | slot->hpc_ops = ctrl->hpc_ops; | 1045 | slot->hpc_ops = ctrl->hpc_ops; |
| 1055 | slot->number = ctrl->first_slot; | 1046 | slot->number = ctrl->first_slot; |
| 1056 | make_slot_name(slot); | 1047 | snprintf(slot->name, SLOT_NAME_SIZE, "%d", slot->number); |
| 1057 | mutex_init(&slot->lock); | 1048 | mutex_init(&slot->lock); |
| 1058 | INIT_DELAYED_WORK(&slot->work, pciehp_queue_pushbutton_work); | 1049 | INIT_DELAYED_WORK(&slot->work, pciehp_queue_pushbutton_work); |
| 1059 | list_add(&slot->slot_list, &ctrl->slot_list); | 1050 | list_add(&slot->slot_list, &ctrl->slot_list); |
diff --git a/drivers/pci/hotplug/shpchp_core.c b/drivers/pci/hotplug/shpchp_core.c index a8cbd039b85b..cc38615395f1 100644 --- a/drivers/pci/hotplug/shpchp_core.c +++ b/drivers/pci/hotplug/shpchp_core.c | |||
| @@ -39,7 +39,6 @@ | |||
| 39 | int shpchp_debug; | 39 | int shpchp_debug; |
| 40 | int shpchp_poll_mode; | 40 | int shpchp_poll_mode; |
| 41 | int shpchp_poll_time; | 41 | int shpchp_poll_time; |
| 42 | static int shpchp_slot_with_bus; | ||
| 43 | struct workqueue_struct *shpchp_wq; | 42 | struct workqueue_struct *shpchp_wq; |
| 44 | 43 | ||
| 45 | #define DRIVER_VERSION "0.4" | 44 | #define DRIVER_VERSION "0.4" |
| @@ -53,11 +52,9 @@ MODULE_LICENSE("GPL"); | |||
| 53 | module_param(shpchp_debug, bool, 0644); | 52 | module_param(shpchp_debug, bool, 0644); |
| 54 | module_param(shpchp_poll_mode, bool, 0644); | 53 | module_param(shpchp_poll_mode, bool, 0644); |
| 55 | module_param(shpchp_poll_time, int, 0644); | 54 | module_param(shpchp_poll_time, int, 0644); |
| 56 | module_param(shpchp_slot_with_bus, bool, 0644); | ||
| 57 | MODULE_PARM_DESC(shpchp_debug, "Debugging mode enabled or not"); | 55 | MODULE_PARM_DESC(shpchp_debug, "Debugging mode enabled or not"); |
| 58 | MODULE_PARM_DESC(shpchp_poll_mode, "Using polling mechanism for hot-plug events or not"); | 56 | MODULE_PARM_DESC(shpchp_poll_mode, "Using polling mechanism for hot-plug events or not"); |
| 59 | MODULE_PARM_DESC(shpchp_poll_time, "Polling mechanism frequency, in seconds"); | 57 | MODULE_PARM_DESC(shpchp_poll_time, "Polling mechanism frequency, in seconds"); |
| 60 | MODULE_PARM_DESC(shpchp_slot_with_bus, "Use bus number in the slot name"); | ||
| 61 | 58 | ||
| 62 | #define SHPC_MODULE_NAME "shpchp" | 59 | #define SHPC_MODULE_NAME "shpchp" |
| 63 | 60 | ||
| @@ -99,23 +96,13 @@ static void release_slot(struct hotplug_slot *hotplug_slot) | |||
| 99 | kfree(slot); | 96 | kfree(slot); |
| 100 | } | 97 | } |
| 101 | 98 | ||
| 102 | static void make_slot_name(struct slot *slot) | ||
| 103 | { | ||
| 104 | if (shpchp_slot_with_bus) | ||
| 105 | snprintf(slot->hotplug_slot->name, SLOT_NAME_SIZE, "%04d_%04d", | ||
| 106 | slot->bus, slot->number); | ||
| 107 | else | ||
| 108 | snprintf(slot->hotplug_slot->name, SLOT_NAME_SIZE, "%d", | ||
| 109 | slot->number); | ||
| 110 | } | ||
| 111 | |||
| 112 | static int init_slots(struct controller *ctrl) | 99 | static int init_slots(struct controller *ctrl) |
| 113 | { | 100 | { |
| 114 | struct slot *slot; | 101 | struct slot *slot; |
| 115 | struct hotplug_slot *hotplug_slot; | 102 | struct hotplug_slot *hotplug_slot; |
| 116 | struct hotplug_slot_info *info; | 103 | struct hotplug_slot_info *info; |
| 117 | int retval = -ENOMEM; | 104 | int retval = -ENOMEM; |
| 118 | int i; | 105 | int i, len, dup = 1; |
| 119 | 106 | ||
| 120 | for (i = 0; i < ctrl->num_slots; i++) { | 107 | for (i = 0; i < ctrl->num_slots; i++) { |
| 121 | slot = kzalloc(sizeof(*slot), GFP_KERNEL); | 108 | slot = kzalloc(sizeof(*slot), GFP_KERNEL); |
| @@ -146,7 +133,7 @@ static int init_slots(struct controller *ctrl) | |||
| 146 | /* register this slot with the hotplug pci core */ | 133 | /* register this slot with the hotplug pci core */ |
| 147 | hotplug_slot->private = slot; | 134 | hotplug_slot->private = slot; |
| 148 | hotplug_slot->release = &release_slot; | 135 | hotplug_slot->release = &release_slot; |
| 149 | make_slot_name(slot); | 136 | snprintf(slot->name, SLOT_NAME_SIZE, "%d", slot->number); |
| 150 | hotplug_slot->ops = &shpchp_hotplug_slot_ops; | 137 | hotplug_slot->ops = &shpchp_hotplug_slot_ops; |
| 151 | 138 | ||
| 152 | get_power_status(hotplug_slot, &info->power_status); | 139 | get_power_status(hotplug_slot, &info->power_status); |
| @@ -157,14 +144,23 @@ static int init_slots(struct controller *ctrl) | |||
| 157 | dbg("Registering bus=%x dev=%x hp_slot=%x sun=%x " | 144 | dbg("Registering bus=%x dev=%x hp_slot=%x sun=%x " |
| 158 | "slot_device_offset=%x\n", slot->bus, slot->device, | 145 | "slot_device_offset=%x\n", slot->bus, slot->device, |
| 159 | slot->hp_slot, slot->number, ctrl->slot_device_offset); | 146 | slot->hp_slot, slot->number, ctrl->slot_device_offset); |
| 147 | duplicate_name: | ||
| 160 | retval = pci_hp_register(slot->hotplug_slot, | 148 | retval = pci_hp_register(slot->hotplug_slot, |
| 161 | ctrl->pci_dev->subordinate, slot->device); | 149 | ctrl->pci_dev->subordinate, slot->device); |
| 162 | if (retval) { | 150 | if (retval) { |
| 151 | /* | ||
| 152 | * If slot N already exists, we'll try to create | ||
| 153 | * slot N-1, N-2 ... N-M, until we overflow. | ||
| 154 | */ | ||
| 155 | if (retval == -EEXIST) { | ||
| 156 | len = snprintf(slot->name, SLOT_NAME_SIZE, | ||
| 157 | "%d-%d", slot->number, dup++); | ||
| 158 | if (len < SLOT_NAME_SIZE) | ||
| 159 | goto duplicate_name; | ||
| 160 | else | ||
| 161 | err("duplicate slot name overflow\n"); | ||
| 162 | } | ||
| 163 | err("pci_hp_register failed with error %d\n", retval); | 163 | err("pci_hp_register failed with error %d\n", retval); |
| 164 | if (retval == -EEXIST) | ||
| 165 | err("Failed to register slot because of name " | ||
| 166 | "collision. Try \'shpchp_slot_with_bus\' " | ||
| 167 | "module option.\n"); | ||
| 168 | goto error_info; | 164 | goto error_info; |
| 169 | } | 165 | } |
| 170 | 166 | ||
diff --git a/drivers/pci/pcie/aer/aerdrv_acpi.c b/drivers/pci/pcie/aer/aerdrv_acpi.c index 30f581b8791f..6dd7b13e9808 100644 --- a/drivers/pci/pcie/aer/aerdrv_acpi.c +++ b/drivers/pci/pcie/aer/aerdrv_acpi.c | |||
| @@ -36,12 +36,7 @@ int aer_osc_setup(struct pcie_device *pciedev) | |||
| 36 | if (acpi_pci_disabled) | 36 | if (acpi_pci_disabled) |
| 37 | return -1; | 37 | return -1; |
| 38 | 38 | ||
| 39 | /* Find root host bridge */ | 39 | handle = acpi_find_root_bridge_handle(pdev); |
| 40 | while (pdev->bus->self) | ||
| 41 | pdev = pdev->bus->self; | ||
| 42 | handle = acpi_get_pci_rootbridge_handle( | ||
| 43 | pci_domain_nr(pdev->bus), pdev->bus->number); | ||
| 44 | |||
| 45 | if (handle) { | 40 | if (handle) { |
| 46 | pcie_osc_support_set(OSC_EXT_PCI_CONFIG_SUPPORT); | 41 | pcie_osc_support_set(OSC_EXT_PCI_CONFIG_SUPPORT); |
| 47 | status = pci_osc_control_set(handle, | 42 | status = pci_osc_control_set(handle, |
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index a04498d390c8..cce2f4cb1fbf 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c | |||
| @@ -383,6 +383,7 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child) | |||
| 383 | res->start = base; | 383 | res->start = base; |
| 384 | if (!res->end) | 384 | if (!res->end) |
| 385 | res->end = limit + 0xfff; | 385 | res->end = limit + 0xfff; |
| 386 | printk(KERN_INFO "PCI: bridge %s io port: [%llx, %llx]\n", pci_name(dev), res->start, res->end); | ||
| 386 | } | 387 | } |
| 387 | 388 | ||
| 388 | res = child->resource[1]; | 389 | res = child->resource[1]; |
| @@ -394,6 +395,7 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child) | |||
| 394 | res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM; | 395 | res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM; |
| 395 | res->start = base; | 396 | res->start = base; |
| 396 | res->end = limit + 0xfffff; | 397 | res->end = limit + 0xfffff; |
| 398 | printk(KERN_INFO "PCI: bridge %s 32bit mmio: [%llx, %llx]\n", pci_name(dev), res->start, res->end); | ||
| 397 | } | 399 | } |
| 398 | 400 | ||
| 399 | res = child->resource[2]; | 401 | res = child->resource[2]; |
| @@ -429,6 +431,7 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child) | |||
| 429 | res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM | IORESOURCE_PREFETCH; | 431 | res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM | IORESOURCE_PREFETCH; |
| 430 | res->start = base; | 432 | res->start = base; |
| 431 | res->end = limit + 0xfffff; | 433 | res->end = limit + 0xfffff; |
| 434 | printk(KERN_INFO "PCI: bridge %s %sbit mmio pref: [%llx, %llx]\n", pci_name(dev), (res->flags & PCI_PREF_RANGE_TYPE_64)?"64":"32",res->start, res->end); | ||
| 432 | } | 435 | } |
| 433 | } | 436 | } |
| 434 | 437 | ||
diff --git a/drivers/pci/search.c b/drivers/pci/search.c index 217814fef4ef..3b3b5f178797 100644 --- a/drivers/pci/search.c +++ b/drivers/pci/search.c | |||
| @@ -280,6 +280,8 @@ static struct pci_dev *pci_get_dev_by_id(const struct pci_device_id *id, | |||
| 280 | match_pci_dev_by_id); | 280 | match_pci_dev_by_id); |
| 281 | if (dev) | 281 | if (dev) |
| 282 | pdev = to_pci_dev(dev); | 282 | pdev = to_pci_dev(dev); |
| 283 | if (from) | ||
| 284 | pci_dev_put(from); | ||
| 283 | return pdev; | 285 | return pdev; |
| 284 | } | 286 | } |
| 285 | 287 | ||
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index 827c0a520e2b..1aad599816f7 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c | |||
| @@ -352,11 +352,12 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask, unsigned long | |||
| 352 | continue; | 352 | continue; |
| 353 | r_size = r->end - r->start + 1; | 353 | r_size = r->end - r->start + 1; |
| 354 | /* For bridges size != alignment */ | 354 | /* For bridges size != alignment */ |
| 355 | align = (i < PCI_BRIDGE_RESOURCES) ? r_size : r->start; | 355 | align = resource_alignment(r); |
| 356 | order = __ffs(align) - 20; | 356 | order = __ffs(align) - 20; |
| 357 | if (order > 11) { | 357 | if (order > 11) { |
| 358 | dev_warn(&dev->dev, "BAR %d too large: " | 358 | dev_warn(&dev->dev, "BAR %d bad alignment %llx: " |
| 359 | "%#016llx-%#016llx\n", i, | 359 | "%#016llx-%#016llx\n", i, |
| 360 | (unsigned long long)align, | ||
| 360 | (unsigned long long)r->start, | 361 | (unsigned long long)r->start, |
| 361 | (unsigned long long)r->end); | 362 | (unsigned long long)r->end); |
| 362 | r->flags = 0; | 363 | r->flags = 0; |
| @@ -530,6 +531,36 @@ void __ref pci_bus_assign_resources(struct pci_bus *bus) | |||
| 530 | } | 531 | } |
| 531 | EXPORT_SYMBOL(pci_bus_assign_resources); | 532 | EXPORT_SYMBOL(pci_bus_assign_resources); |
| 532 | 533 | ||
| 534 | static void pci_bus_dump_res(struct pci_bus *bus) | ||
| 535 | { | ||
| 536 | int i; | ||
| 537 | |||
| 538 | for (i = 0; i < PCI_BUS_NUM_RESOURCES; i++) { | ||
| 539 | struct resource *res = bus->resource[i]; | ||
| 540 | if (!res) | ||
| 541 | continue; | ||
| 542 | |||
| 543 | printk(KERN_INFO "bus: %02x index %x %s: [%llx, %llx]\n", bus->number, i, (res->flags & IORESOURCE_IO)? "io port":"mmio", res->start, res->end); | ||
| 544 | } | ||
| 545 | } | ||
| 546 | |||
| 547 | static void pci_bus_dump_resources(struct pci_bus *bus) | ||
| 548 | { | ||
| 549 | struct pci_bus *b; | ||
| 550 | struct pci_dev *dev; | ||
| 551 | |||
| 552 | |||
| 553 | pci_bus_dump_res(bus); | ||
| 554 | |||
| 555 | list_for_each_entry(dev, &bus->devices, bus_list) { | ||
| 556 | b = dev->subordinate; | ||
| 557 | if (!b) | ||
| 558 | continue; | ||
| 559 | |||
| 560 | pci_bus_dump_resources(b); | ||
| 561 | } | ||
| 562 | } | ||
| 563 | |||
| 533 | void __init | 564 | void __init |
| 534 | pci_assign_unassigned_resources(void) | 565 | pci_assign_unassigned_resources(void) |
| 535 | { | 566 | { |
| @@ -545,4 +576,9 @@ pci_assign_unassigned_resources(void) | |||
| 545 | pci_bus_assign_resources(bus); | 576 | pci_bus_assign_resources(bus); |
| 546 | pci_enable_bridges(bus); | 577 | pci_enable_bridges(bus); |
| 547 | } | 578 | } |
| 579 | |||
| 580 | /* dump the resource on buses */ | ||
| 581 | list_for_each_entry(bus, &pci_root_buses, node) { | ||
| 582 | pci_bus_dump_resources(bus); | ||
| 583 | } | ||
| 548 | } | 584 | } |
diff --git a/drivers/pcmcia/pxa2xx_palmtx.c b/drivers/pcmcia/pxa2xx_palmtx.c index a8771ffc61e8..e07b5c51ec5b 100644 --- a/drivers/pcmcia/pxa2xx_palmtx.c +++ b/drivers/pcmcia/pxa2xx_palmtx.c | |||
| @@ -23,12 +23,57 @@ | |||
| 23 | 23 | ||
| 24 | static int palmtx_pcmcia_hw_init(struct soc_pcmcia_socket *skt) | 24 | static int palmtx_pcmcia_hw_init(struct soc_pcmcia_socket *skt) |
| 25 | { | 25 | { |
| 26 | skt->irq = IRQ_GPIO(GPIO_NR_PALMTX_PCMCIA_READY); | 26 | int ret; |
| 27 | |||
| 28 | ret = gpio_request(GPIO_NR_PALMTX_PCMCIA_POWER1, "PCMCIA PWR1"); | ||
| 29 | if (ret) | ||
| 30 | goto err1; | ||
| 31 | ret = gpio_direction_output(GPIO_NR_PALMTX_PCMCIA_POWER1, 0); | ||
| 32 | if (ret) | ||
| 33 | goto err2; | ||
| 34 | |||
| 35 | ret = gpio_request(GPIO_NR_PALMTX_PCMCIA_POWER2, "PCMCIA PWR2"); | ||
| 36 | if (ret) | ||
| 37 | goto err2; | ||
| 38 | ret = gpio_direction_output(GPIO_NR_PALMTX_PCMCIA_POWER2, 0); | ||
| 39 | if (ret) | ||
| 40 | goto err3; | ||
| 41 | |||
| 42 | ret = gpio_request(GPIO_NR_PALMTX_PCMCIA_RESET, "PCMCIA RST"); | ||
| 43 | if (ret) | ||
| 44 | goto err3; | ||
| 45 | ret = gpio_direction_output(GPIO_NR_PALMTX_PCMCIA_RESET, 1); | ||
| 46 | if (ret) | ||
| 47 | goto err4; | ||
| 48 | |||
| 49 | ret = gpio_request(GPIO_NR_PALMTX_PCMCIA_READY, "PCMCIA RDY"); | ||
| 50 | if (ret) | ||
| 51 | goto err4; | ||
| 52 | ret = gpio_direction_input(GPIO_NR_PALMTX_PCMCIA_READY); | ||
| 53 | if (ret) | ||
| 54 | goto err5; | ||
| 55 | |||
| 56 | skt->irq = gpio_to_irq(GPIO_NR_PALMTX_PCMCIA_READY); | ||
| 27 | return 0; | 57 | return 0; |
| 58 | |||
| 59 | err5: | ||
| 60 | gpio_free(GPIO_NR_PALMTX_PCMCIA_READY); | ||
| 61 | err4: | ||
| 62 | gpio_free(GPIO_NR_PALMTX_PCMCIA_RESET); | ||
| 63 | err3: | ||
| 64 | gpio_free(GPIO_NR_PALMTX_PCMCIA_POWER2); | ||
| 65 | err2: | ||
| 66 | gpio_free(GPIO_NR_PALMTX_PCMCIA_POWER1); | ||
| 67 | err1: | ||
| 68 | return ret; | ||
| 28 | } | 69 | } |
| 29 | 70 | ||
| 30 | static void palmtx_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt) | 71 | static void palmtx_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt) |
| 31 | { | 72 | { |
| 73 | gpio_free(GPIO_NR_PALMTX_PCMCIA_READY); | ||
| 74 | gpio_free(GPIO_NR_PALMTX_PCMCIA_RESET); | ||
| 75 | gpio_free(GPIO_NR_PALMTX_PCMCIA_POWER2); | ||
| 76 | gpio_free(GPIO_NR_PALMTX_PCMCIA_POWER1); | ||
| 32 | } | 77 | } |
| 33 | 78 | ||
| 34 | static void palmtx_pcmcia_socket_state(struct soc_pcmcia_socket *skt, | 79 | static void palmtx_pcmcia_socket_state(struct soc_pcmcia_socket *skt, |
| @@ -109,7 +154,7 @@ static void __exit palmtx_pcmcia_exit(void) | |||
| 109 | platform_device_unregister(palmtx_pcmcia_device); | 154 | platform_device_unregister(palmtx_pcmcia_device); |
| 110 | } | 155 | } |
| 111 | 156 | ||
| 112 | fs_initcall(palmtx_pcmcia_init); | 157 | module_init(palmtx_pcmcia_init); |
| 113 | module_exit(palmtx_pcmcia_exit); | 158 | module_exit(palmtx_pcmcia_exit); |
| 114 | 159 | ||
| 115 | MODULE_AUTHOR("Marek Vasut <marek.vasut@gmail.com>"); | 160 | MODULE_AUTHOR("Marek Vasut <marek.vasut@gmail.com>"); |
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index 90ab73825401..9a9755c92fad 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig | |||
| @@ -561,7 +561,7 @@ config RTC_DRV_AT91SAM9_GPBR | |||
| 561 | 561 | ||
| 562 | config RTC_DRV_BFIN | 562 | config RTC_DRV_BFIN |
| 563 | tristate "Blackfin On-Chip RTC" | 563 | tristate "Blackfin On-Chip RTC" |
| 564 | depends on BLACKFIN | 564 | depends on BLACKFIN && !BF561 |
| 565 | help | 565 | help |
| 566 | If you say yes here you will get support for the | 566 | If you say yes here you will get support for the |
| 567 | Blackfin On-Chip Real Time Clock. | 567 | Blackfin On-Chip Real Time Clock. |
diff --git a/drivers/rtc/rtc-bfin.c b/drivers/rtc/rtc-bfin.c index a1af4c27939b..34439ce3967e 100644 --- a/drivers/rtc/rtc-bfin.c +++ b/drivers/rtc/rtc-bfin.c | |||
| @@ -218,26 +218,6 @@ static irqreturn_t bfin_rtc_interrupt(int irq, void *dev_id) | |||
| 218 | return IRQ_NONE; | 218 | return IRQ_NONE; |
| 219 | } | 219 | } |
| 220 | 220 | ||
| 221 | static int bfin_rtc_open(struct device *dev) | ||
| 222 | { | ||
| 223 | int ret; | ||
| 224 | |||
| 225 | dev_dbg_stamp(dev); | ||
| 226 | |||
| 227 | ret = request_irq(IRQ_RTC, bfin_rtc_interrupt, IRQF_SHARED, to_platform_device(dev)->name, dev); | ||
| 228 | if (!ret) | ||
| 229 | bfin_rtc_reset(dev, RTC_ISTAT_WRITE_COMPLETE); | ||
| 230 | |||
| 231 | return ret; | ||
| 232 | } | ||
| 233 | |||
| 234 | static void bfin_rtc_release(struct device *dev) | ||
| 235 | { | ||
| 236 | dev_dbg_stamp(dev); | ||
| 237 | bfin_rtc_reset(dev, 0); | ||
| 238 | free_irq(IRQ_RTC, dev); | ||
| 239 | } | ||
| 240 | |||
| 241 | static void bfin_rtc_int_set(u16 rtc_int) | 221 | static void bfin_rtc_int_set(u16 rtc_int) |
| 242 | { | 222 | { |
| 243 | bfin_write_RTC_ISTAT(rtc_int); | 223 | bfin_write_RTC_ISTAT(rtc_int); |
| @@ -370,8 +350,6 @@ static int bfin_rtc_proc(struct device *dev, struct seq_file *seq) | |||
| 370 | } | 350 | } |
| 371 | 351 | ||
| 372 | static struct rtc_class_ops bfin_rtc_ops = { | 352 | static struct rtc_class_ops bfin_rtc_ops = { |
| 373 | .open = bfin_rtc_open, | ||
| 374 | .release = bfin_rtc_release, | ||
| 375 | .ioctl = bfin_rtc_ioctl, | 353 | .ioctl = bfin_rtc_ioctl, |
| 376 | .read_time = bfin_rtc_read_time, | 354 | .read_time = bfin_rtc_read_time, |
| 377 | .set_time = bfin_rtc_set_time, | 355 | .set_time = bfin_rtc_set_time, |
| @@ -383,29 +361,44 @@ static struct rtc_class_ops bfin_rtc_ops = { | |||
| 383 | static int __devinit bfin_rtc_probe(struct platform_device *pdev) | 361 | static int __devinit bfin_rtc_probe(struct platform_device *pdev) |
| 384 | { | 362 | { |
| 385 | struct bfin_rtc *rtc; | 363 | struct bfin_rtc *rtc; |
| 364 | struct device *dev = &pdev->dev; | ||
| 386 | int ret = 0; | 365 | int ret = 0; |
| 366 | unsigned long timeout; | ||
| 387 | 367 | ||
| 388 | dev_dbg_stamp(&pdev->dev); | 368 | dev_dbg_stamp(dev); |
| 389 | 369 | ||
| 370 | /* Allocate memory for our RTC struct */ | ||
| 390 | rtc = kzalloc(sizeof(*rtc), GFP_KERNEL); | 371 | rtc = kzalloc(sizeof(*rtc), GFP_KERNEL); |
| 391 | if (unlikely(!rtc)) | 372 | if (unlikely(!rtc)) |
| 392 | return -ENOMEM; | 373 | return -ENOMEM; |
| 374 | platform_set_drvdata(pdev, rtc); | ||
| 375 | device_init_wakeup(dev, 1); | ||
| 393 | 376 | ||
| 394 | rtc->rtc_dev = rtc_device_register(pdev->name, &pdev->dev, &bfin_rtc_ops, THIS_MODULE); | 377 | /* Grab the IRQ and init the hardware */ |
| 395 | if (IS_ERR(rtc)) { | 378 | ret = request_irq(IRQ_RTC, bfin_rtc_interrupt, IRQF_SHARED, pdev->name, dev); |
| 396 | ret = PTR_ERR(rtc->rtc_dev); | 379 | if (unlikely(ret)) |
| 397 | goto err; | 380 | goto err; |
| 398 | } | 381 | /* sometimes the bootloader touched things, but the write complete was not |
| 399 | 382 | * enabled, so let's just do a quick timeout here since the IRQ will not fire ... | |
| 400 | /* see comment at top of file about stopwatch/PIE */ | 383 | */ |
| 384 | timeout = jiffies + HZ; | ||
| 385 | while (bfin_read_RTC_ISTAT() & RTC_ISTAT_WRITE_PENDING) | ||
| 386 | if (time_after(jiffies, timeout)) | ||
| 387 | break; | ||
| 388 | bfin_rtc_reset(dev, RTC_ISTAT_WRITE_COMPLETE); | ||
| 401 | bfin_write_RTC_SWCNT(0); | 389 | bfin_write_RTC_SWCNT(0); |
| 402 | 390 | ||
| 403 | platform_set_drvdata(pdev, rtc); | 391 | /* Register our RTC with the RTC framework */ |
| 404 | 392 | rtc->rtc_dev = rtc_device_register(pdev->name, dev, &bfin_rtc_ops, THIS_MODULE); | |
| 405 | device_init_wakeup(&pdev->dev, 1); | 393 | if (unlikely(IS_ERR(rtc))) { |
| 394 | ret = PTR_ERR(rtc->rtc_dev); | ||
| 395 | goto err_irq; | ||
| 396 | } | ||
| 406 | 397 | ||
| 407 | return 0; | 398 | return 0; |
| 408 | 399 | ||
| 400 | err_irq: | ||
| 401 | free_irq(IRQ_RTC, dev); | ||
| 409 | err: | 402 | err: |
| 410 | kfree(rtc); | 403 | kfree(rtc); |
| 411 | return ret; | 404 | return ret; |
| @@ -414,7 +407,10 @@ static int __devinit bfin_rtc_probe(struct platform_device *pdev) | |||
| 414 | static int __devexit bfin_rtc_remove(struct platform_device *pdev) | 407 | static int __devexit bfin_rtc_remove(struct platform_device *pdev) |
| 415 | { | 408 | { |
| 416 | struct bfin_rtc *rtc = platform_get_drvdata(pdev); | 409 | struct bfin_rtc *rtc = platform_get_drvdata(pdev); |
| 410 | struct device *dev = &pdev->dev; | ||
| 417 | 411 | ||
| 412 | bfin_rtc_reset(dev, 0); | ||
| 413 | free_irq(IRQ_RTC, dev); | ||
| 418 | rtc_device_unregister(rtc->rtc_dev); | 414 | rtc_device_unregister(rtc->rtc_dev); |
| 419 | platform_set_drvdata(pdev, NULL); | 415 | platform_set_drvdata(pdev, NULL); |
| 420 | kfree(rtc); | 416 | kfree(rtc); |
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c index 6ea349aba3ba..b184367637d0 100644 --- a/drivers/rtc/rtc-cmos.c +++ b/drivers/rtc/rtc-cmos.c | |||
| @@ -800,7 +800,6 @@ static void __exit cmos_do_remove(struct device *dev) | |||
| 800 | static int cmos_suspend(struct device *dev, pm_message_t mesg) | 800 | static int cmos_suspend(struct device *dev, pm_message_t mesg) |
| 801 | { | 801 | { |
| 802 | struct cmos_rtc *cmos = dev_get_drvdata(dev); | 802 | struct cmos_rtc *cmos = dev_get_drvdata(dev); |
| 803 | int do_wake = device_may_wakeup(dev); | ||
| 804 | unsigned char tmp; | 803 | unsigned char tmp; |
| 805 | 804 | ||
| 806 | /* only the alarm might be a wakeup event source */ | 805 | /* only the alarm might be a wakeup event source */ |
| @@ -809,7 +808,7 @@ static int cmos_suspend(struct device *dev, pm_message_t mesg) | |||
| 809 | if (tmp & (RTC_PIE|RTC_AIE|RTC_UIE)) { | 808 | if (tmp & (RTC_PIE|RTC_AIE|RTC_UIE)) { |
| 810 | unsigned char mask; | 809 | unsigned char mask; |
| 811 | 810 | ||
| 812 | if (do_wake) | 811 | if (device_may_wakeup(dev)) |
| 813 | mask = RTC_IRQMASK & ~RTC_AIE; | 812 | mask = RTC_IRQMASK & ~RTC_AIE; |
| 814 | else | 813 | else |
| 815 | mask = RTC_IRQMASK; | 814 | mask = RTC_IRQMASK; |
| @@ -837,6 +836,17 @@ static int cmos_suspend(struct device *dev, pm_message_t mesg) | |||
| 837 | return 0; | 836 | return 0; |
| 838 | } | 837 | } |
| 839 | 838 | ||
| 839 | /* We want RTC alarms to wake us from e.g. ACPI G2/S5 "soft off", even | ||
| 840 | * after a detour through G3 "mechanical off", although the ACPI spec | ||
| 841 | * says wakeup should only work from G1/S4 "hibernate". To most users, | ||
| 842 | * distinctions between S4 and S5 are pointless. So when the hardware | ||
| 843 | * allows, don't draw that distinction. | ||
| 844 | */ | ||
| 845 | static inline int cmos_poweroff(struct device *dev) | ||
| 846 | { | ||
| 847 | return cmos_suspend(dev, PMSG_HIBERNATE); | ||
| 848 | } | ||
| 849 | |||
| 840 | static int cmos_resume(struct device *dev) | 850 | static int cmos_resume(struct device *dev) |
| 841 | { | 851 | { |
| 842 | struct cmos_rtc *cmos = dev_get_drvdata(dev); | 852 | struct cmos_rtc *cmos = dev_get_drvdata(dev); |
| @@ -884,6 +894,12 @@ static int cmos_resume(struct device *dev) | |||
| 884 | #else | 894 | #else |
| 885 | #define cmos_suspend NULL | 895 | #define cmos_suspend NULL |
| 886 | #define cmos_resume NULL | 896 | #define cmos_resume NULL |
| 897 | |||
| 898 | static inline int cmos_poweroff(struct device *dev) | ||
| 899 | { | ||
| 900 | return -ENOSYS; | ||
| 901 | } | ||
| 902 | |||
| 887 | #endif | 903 | #endif |
| 888 | 904 | ||
| 889 | /*----------------------------------------------------------------*/ | 905 | /*----------------------------------------------------------------*/ |
| @@ -903,10 +919,6 @@ static int cmos_resume(struct device *dev) | |||
| 903 | static int __devinit | 919 | static int __devinit |
| 904 | cmos_pnp_probe(struct pnp_dev *pnp, const struct pnp_device_id *id) | 920 | cmos_pnp_probe(struct pnp_dev *pnp, const struct pnp_device_id *id) |
| 905 | { | 921 | { |
| 906 | /* REVISIT paranoia argues for a shutdown notifier, since PNP | ||
| 907 | * drivers can't provide shutdown() methods to disable IRQs. | ||
| 908 | * Or better yet, fix PNP to allow those methods... | ||
| 909 | */ | ||
| 910 | if (pnp_port_start(pnp,0) == 0x70 && !pnp_irq_valid(pnp,0)) | 922 | if (pnp_port_start(pnp,0) == 0x70 && !pnp_irq_valid(pnp,0)) |
| 911 | /* Some machines contain a PNP entry for the RTC, but | 923 | /* Some machines contain a PNP entry for the RTC, but |
| 912 | * don't define the IRQ. It should always be safe to | 924 | * don't define the IRQ. It should always be safe to |
| @@ -942,6 +954,13 @@ static int cmos_pnp_resume(struct pnp_dev *pnp) | |||
| 942 | #define cmos_pnp_resume NULL | 954 | #define cmos_pnp_resume NULL |
| 943 | #endif | 955 | #endif |
| 944 | 956 | ||
| 957 | static void cmos_pnp_shutdown(struct device *pdev) | ||
| 958 | { | ||
| 959 | if (system_state == SYSTEM_POWER_OFF && !cmos_poweroff(pdev)) | ||
| 960 | return; | ||
| 961 | |||
| 962 | cmos_do_shutdown(); | ||
| 963 | } | ||
| 945 | 964 | ||
| 946 | static const struct pnp_device_id rtc_ids[] = { | 965 | static const struct pnp_device_id rtc_ids[] = { |
| 947 | { .id = "PNP0b00", }, | 966 | { .id = "PNP0b00", }, |
| @@ -961,6 +980,10 @@ static struct pnp_driver cmos_pnp_driver = { | |||
| 961 | .flags = PNP_DRIVER_RES_DO_NOT_CHANGE, | 980 | .flags = PNP_DRIVER_RES_DO_NOT_CHANGE, |
| 962 | .suspend = cmos_pnp_suspend, | 981 | .suspend = cmos_pnp_suspend, |
| 963 | .resume = cmos_pnp_resume, | 982 | .resume = cmos_pnp_resume, |
| 983 | .driver = { | ||
| 984 | .name = (char *)driver_name, | ||
| 985 | .shutdown = cmos_pnp_shutdown, | ||
| 986 | } | ||
| 964 | }; | 987 | }; |
| 965 | 988 | ||
| 966 | #endif /* CONFIG_PNP */ | 989 | #endif /* CONFIG_PNP */ |
| @@ -986,6 +1009,9 @@ static int __exit cmos_platform_remove(struct platform_device *pdev) | |||
| 986 | 1009 | ||
| 987 | static void cmos_platform_shutdown(struct platform_device *pdev) | 1010 | static void cmos_platform_shutdown(struct platform_device *pdev) |
| 988 | { | 1011 | { |
| 1012 | if (system_state == SYSTEM_POWER_OFF && !cmos_poweroff(&pdev->dev)) | ||
| 1013 | return; | ||
| 1014 | |||
| 989 | cmos_do_shutdown(); | 1015 | cmos_do_shutdown(); |
| 990 | } | 1016 | } |
| 991 | 1017 | ||
diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c index 856cc1af40df..f118252f3a9f 100644 --- a/drivers/rtc/rtc-dev.c +++ b/drivers/rtc/rtc-dev.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | 13 | ||
| 14 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 15 | #include <linux/rtc.h> | 15 | #include <linux/rtc.h> |
| 16 | #include <linux/smp_lock.h> | ||
| 17 | #include "rtc-core.h" | 16 | #include "rtc-core.h" |
| 18 | 17 | ||
| 19 | static dev_t rtc_devt; | 18 | static dev_t rtc_devt; |
| @@ -27,11 +26,8 @@ static int rtc_dev_open(struct inode *inode, struct file *file) | |||
| 27 | struct rtc_device, char_dev); | 26 | struct rtc_device, char_dev); |
| 28 | const struct rtc_class_ops *ops = rtc->ops; | 27 | const struct rtc_class_ops *ops = rtc->ops; |
| 29 | 28 | ||
| 30 | lock_kernel(); | 29 | if (test_and_set_bit_lock(RTC_DEV_BUSY, &rtc->flags)) |
| 31 | if (test_and_set_bit_lock(RTC_DEV_BUSY, &rtc->flags)) { | 30 | return -EBUSY; |
| 32 | err = -EBUSY; | ||
| 33 | goto out; | ||
| 34 | } | ||
| 35 | 31 | ||
| 36 | file->private_data = rtc; | 32 | file->private_data = rtc; |
| 37 | 33 | ||
| @@ -41,13 +37,11 @@ static int rtc_dev_open(struct inode *inode, struct file *file) | |||
| 41 | rtc->irq_data = 0; | 37 | rtc->irq_data = 0; |
| 42 | spin_unlock_irq(&rtc->irq_lock); | 38 | spin_unlock_irq(&rtc->irq_lock); |
| 43 | 39 | ||
| 44 | goto out; | 40 | return 0; |
| 45 | } | 41 | } |
| 46 | 42 | ||
| 47 | /* something has gone wrong */ | 43 | /* something has gone wrong */ |
| 48 | clear_bit_unlock(RTC_DEV_BUSY, &rtc->flags); | 44 | clear_bit_unlock(RTC_DEV_BUSY, &rtc->flags); |
| 49 | out: | ||
| 50 | unlock_kernel(); | ||
| 51 | return err; | 45 | return err; |
| 52 | } | 46 | } |
| 53 | 47 | ||
| @@ -409,11 +403,14 @@ static long rtc_dev_ioctl(struct file *file, | |||
| 409 | 403 | ||
| 410 | #ifdef CONFIG_RTC_INTF_DEV_UIE_EMUL | 404 | #ifdef CONFIG_RTC_INTF_DEV_UIE_EMUL |
| 411 | case RTC_UIE_OFF: | 405 | case RTC_UIE_OFF: |
| 406 | mutex_unlock(&rtc->ops_lock); | ||
| 412 | clear_uie(rtc); | 407 | clear_uie(rtc); |
| 413 | break; | 408 | return 0; |
| 414 | 409 | ||
| 415 | case RTC_UIE_ON: | 410 | case RTC_UIE_ON: |
| 411 | mutex_unlock(&rtc->ops_lock); | ||
| 416 | err = set_uie(rtc); | 412 | err = set_uie(rtc); |
| 413 | return err; | ||
| 417 | #endif | 414 | #endif |
| 418 | default: | 415 | default: |
| 419 | err = -ENOTTY; | 416 | err = -ENOTTY; |
diff --git a/drivers/rtc/rtc-ds1374.c b/drivers/rtc/rtc-ds1374.c index 640acd20fdde..a150418fba76 100644 --- a/drivers/rtc/rtc-ds1374.c +++ b/drivers/rtc/rtc-ds1374.c | |||
| @@ -173,7 +173,7 @@ static int ds1374_read_alarm(struct device *dev, struct rtc_wkalrm *alarm) | |||
| 173 | int cr, sr; | 173 | int cr, sr; |
| 174 | int ret = 0; | 174 | int ret = 0; |
| 175 | 175 | ||
| 176 | if (client->irq < 0) | 176 | if (client->irq <= 0) |
| 177 | return -EINVAL; | 177 | return -EINVAL; |
| 178 | 178 | ||
| 179 | mutex_lock(&ds1374->mutex); | 179 | mutex_lock(&ds1374->mutex); |
| @@ -212,7 +212,7 @@ static int ds1374_set_alarm(struct device *dev, struct rtc_wkalrm *alarm) | |||
| 212 | int cr; | 212 | int cr; |
| 213 | int ret = 0; | 213 | int ret = 0; |
| 214 | 214 | ||
| 215 | if (client->irq < 0) | 215 | if (client->irq <= 0) |
| 216 | return -EINVAL; | 216 | return -EINVAL; |
| 217 | 217 | ||
| 218 | ret = ds1374_read_time(dev, &now); | 218 | ret = ds1374_read_time(dev, &now); |
| @@ -381,7 +381,7 @@ static int ds1374_probe(struct i2c_client *client, | |||
| 381 | if (ret) | 381 | if (ret) |
| 382 | goto out_free; | 382 | goto out_free; |
| 383 | 383 | ||
| 384 | if (client->irq >= 0) { | 384 | if (client->irq > 0) { |
| 385 | ret = request_irq(client->irq, ds1374_irq, 0, | 385 | ret = request_irq(client->irq, ds1374_irq, 0, |
| 386 | "ds1374", client); | 386 | "ds1374", client); |
| 387 | if (ret) { | 387 | if (ret) { |
| @@ -401,7 +401,7 @@ static int ds1374_probe(struct i2c_client *client, | |||
| 401 | return 0; | 401 | return 0; |
| 402 | 402 | ||
| 403 | out_irq: | 403 | out_irq: |
| 404 | if (client->irq >= 0) | 404 | if (client->irq > 0) |
| 405 | free_irq(client->irq, client); | 405 | free_irq(client->irq, client); |
| 406 | 406 | ||
| 407 | out_free: | 407 | out_free: |
| @@ -414,7 +414,7 @@ static int __devexit ds1374_remove(struct i2c_client *client) | |||
| 414 | { | 414 | { |
| 415 | struct ds1374 *ds1374 = i2c_get_clientdata(client); | 415 | struct ds1374 *ds1374 = i2c_get_clientdata(client); |
| 416 | 416 | ||
| 417 | if (client->irq >= 0) { | 417 | if (client->irq > 0) { |
| 418 | mutex_lock(&ds1374->mutex); | 418 | mutex_lock(&ds1374->mutex); |
| 419 | ds1374->exiting = 1; | 419 | ds1374->exiting = 1; |
| 420 | mutex_unlock(&ds1374->mutex); | 420 | mutex_unlock(&ds1374->mutex); |
diff --git a/drivers/rtc/rtc-isl1208.c b/drivers/rtc/rtc-isl1208.c index fbb90b1e4098..a81adab6e515 100644 --- a/drivers/rtc/rtc-isl1208.c +++ b/drivers/rtc/rtc-isl1208.c | |||
| @@ -482,7 +482,7 @@ isl1208_sysfs_register(struct device *dev) | |||
| 482 | static int | 482 | static int |
| 483 | isl1208_sysfs_unregister(struct device *dev) | 483 | isl1208_sysfs_unregister(struct device *dev) |
| 484 | { | 484 | { |
| 485 | device_remove_file(dev, &dev_attr_atrim); | 485 | device_remove_file(dev, &dev_attr_dtrim); |
| 486 | device_remove_file(dev, &dev_attr_atrim); | 486 | device_remove_file(dev, &dev_attr_atrim); |
| 487 | device_remove_file(dev, &dev_attr_usr); | 487 | device_remove_file(dev, &dev_attr_usr); |
| 488 | 488 | ||
diff --git a/drivers/rtc/rtc-lib.c b/drivers/rtc/rtc-lib.c index 9f996ec881ce..dd70bf73ce9d 100644 --- a/drivers/rtc/rtc-lib.c +++ b/drivers/rtc/rtc-lib.c | |||
| @@ -51,10 +51,11 @@ EXPORT_SYMBOL(rtc_year_days); | |||
| 51 | */ | 51 | */ |
| 52 | void rtc_time_to_tm(unsigned long time, struct rtc_time *tm) | 52 | void rtc_time_to_tm(unsigned long time, struct rtc_time *tm) |
| 53 | { | 53 | { |
| 54 | unsigned int days, month, year; | 54 | unsigned int month, year; |
| 55 | int days; | ||
| 55 | 56 | ||
| 56 | days = time / 86400; | 57 | days = time / 86400; |
| 57 | time -= days * 86400; | 58 | time -= (unsigned int) days * 86400; |
| 58 | 59 | ||
| 59 | /* day of the week, 1970-01-01 was a Thursday */ | 60 | /* day of the week, 1970-01-01 was a Thursday */ |
| 60 | tm->tm_wday = (days + 4) % 7; | 61 | tm->tm_wday = (days + 4) % 7; |
diff --git a/drivers/rtc/rtc-max6902.c b/drivers/rtc/rtc-max6902.c index 12f0310ae89c..78b2551fb19d 100644 --- a/drivers/rtc/rtc-max6902.c +++ b/drivers/rtc/rtc-max6902.c | |||
| @@ -20,8 +20,6 @@ | |||
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/module.h> | 22 | #include <linux/module.h> |
| 23 | #include <linux/version.h> | ||
| 24 | |||
| 25 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 26 | #include <linux/platform_device.h> | 24 | #include <linux/platform_device.h> |
| 27 | #include <linux/init.h> | 25 | #include <linux/init.h> |
diff --git a/drivers/rtc/rtc-r9701.c b/drivers/rtc/rtc-r9701.c index b35f9bfa2af4..395985b339c9 100644 --- a/drivers/rtc/rtc-r9701.c +++ b/drivers/rtc/rtc-r9701.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 17 | #include <linux/version.h> | ||
| 18 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 19 | #include <linux/platform_device.h> | 18 | #include <linux/platform_device.h> |
| 20 | #include <linux/device.h> | 19 | #include <linux/device.h> |
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c index 1b6c52ef7339..acb78017e7d0 100644 --- a/drivers/s390/block/dasd.c +++ b/drivers/s390/block/dasd.c | |||
| @@ -2333,13 +2333,11 @@ int dasd_generic_notify(struct ccw_device *cdev, int event) | |||
| 2333 | { | 2333 | { |
| 2334 | struct dasd_device *device; | 2334 | struct dasd_device *device; |
| 2335 | struct dasd_ccw_req *cqr; | 2335 | struct dasd_ccw_req *cqr; |
| 2336 | unsigned long flags; | ||
| 2337 | int ret; | 2336 | int ret; |
| 2338 | 2337 | ||
| 2339 | device = dasd_device_from_cdev(cdev); | 2338 | device = dasd_device_from_cdev_locked(cdev); |
| 2340 | if (IS_ERR(device)) | 2339 | if (IS_ERR(device)) |
| 2341 | return 0; | 2340 | return 0; |
| 2342 | spin_lock_irqsave(get_ccwdev_lock(cdev), flags); | ||
| 2343 | ret = 0; | 2341 | ret = 0; |
| 2344 | switch (event) { | 2342 | switch (event) { |
| 2345 | case CIO_GONE: | 2343 | case CIO_GONE: |
| @@ -2369,7 +2367,6 @@ int dasd_generic_notify(struct ccw_device *cdev, int event) | |||
| 2369 | ret = 1; | 2367 | ret = 1; |
| 2370 | break; | 2368 | break; |
| 2371 | } | 2369 | } |
| 2372 | spin_unlock_irqrestore(get_ccwdev_lock(cdev), flags); | ||
| 2373 | dasd_put_device(device); | 2370 | dasd_put_device(device); |
| 2374 | return ret; | 2371 | return ret; |
| 2375 | } | 2372 | } |
diff --git a/drivers/s390/block/dasd_eckd.h b/drivers/s390/block/dasd_eckd.h index 4bf0aa5112c1..2476f87d21d0 100644 --- a/drivers/s390/block/dasd_eckd.h +++ b/drivers/s390/block/dasd_eckd.h | |||
| @@ -308,7 +308,7 @@ struct dasd_psf_prssd_data { | |||
| 308 | unsigned char flags; | 308 | unsigned char flags; |
| 309 | unsigned char reserved[4]; | 309 | unsigned char reserved[4]; |
| 310 | unsigned char suborder; | 310 | unsigned char suborder; |
| 311 | unsigned char varies[9]; | 311 | unsigned char varies[5]; |
| 312 | } __attribute__ ((packed)); | 312 | } __attribute__ ((packed)); |
| 313 | 313 | ||
| 314 | /* | 314 | /* |
diff --git a/drivers/s390/block/dasd_eer.c b/drivers/s390/block/dasd_eer.c index 29da4413ad43..bf512ac75b9e 100644 --- a/drivers/s390/block/dasd_eer.c +++ b/drivers/s390/block/dasd_eer.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/poll.h> | 16 | #include <linux/poll.h> |
| 17 | #include <linux/mutex.h> | 17 | #include <linux/mutex.h> |
| 18 | #include <linux/smp_lock.h> | 18 | #include <linux/smp_lock.h> |
| 19 | #include <linux/err.h> | ||
| 19 | 20 | ||
| 20 | #include <asm/uaccess.h> | 21 | #include <asm/uaccess.h> |
| 21 | #include <asm/atomic.h> | 22 | #include <asm/atomic.h> |
| @@ -457,7 +458,7 @@ int dasd_eer_enable(struct dasd_device *device) | |||
| 457 | 458 | ||
| 458 | cqr = dasd_kmalloc_request("ECKD", 1 /* SNSS */, | 459 | cqr = dasd_kmalloc_request("ECKD", 1 /* SNSS */, |
| 459 | SNSS_DATA_SIZE, device); | 460 | SNSS_DATA_SIZE, device); |
| 460 | if (!cqr) | 461 | if (IS_ERR(cqr)) |
| 461 | return -ENOMEM; | 462 | return -ENOMEM; |
| 462 | 463 | ||
| 463 | cqr->startdev = device; | 464 | cqr->startdev = device; |
diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c index 01fcdd91b846..711b3004b3e6 100644 --- a/drivers/s390/block/dcssblk.c +++ b/drivers/s390/block/dcssblk.c | |||
| @@ -384,6 +384,11 @@ dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char | |||
| 384 | * get minor, add to list | 384 | * get minor, add to list |
| 385 | */ | 385 | */ |
| 386 | down_write(&dcssblk_devices_sem); | 386 | down_write(&dcssblk_devices_sem); |
| 387 | if (dcssblk_get_device_by_name(local_buf)) { | ||
| 388 | up_write(&dcssblk_devices_sem); | ||
| 389 | rc = -EEXIST; | ||
| 390 | goto unload_seg; | ||
| 391 | } | ||
| 387 | rc = dcssblk_assign_free_minor(dev_info); | 392 | rc = dcssblk_assign_free_minor(dev_info); |
| 388 | if (rc) { | 393 | if (rc) { |
| 389 | up_write(&dcssblk_devices_sem); | 394 | up_write(&dcssblk_devices_sem); |
diff --git a/drivers/s390/char/tape_char.c b/drivers/s390/char/tape_char.c index 687720b552d1..be0ce2215c8d 100644 --- a/drivers/s390/char/tape_char.c +++ b/drivers/s390/char/tape_char.c | |||
| @@ -109,7 +109,7 @@ tapechar_check_idalbuffer(struct tape_device *device, size_t block_size) | |||
| 109 | 109 | ||
| 110 | /* The current idal buffer is not correct. Allocate a new one. */ | 110 | /* The current idal buffer is not correct. Allocate a new one. */ |
| 111 | new = idal_buffer_alloc(block_size, 0); | 111 | new = idal_buffer_alloc(block_size, 0); |
| 112 | if (new == NULL) | 112 | if (IS_ERR(new)) |
| 113 | return -ENOMEM; | 113 | return -ENOMEM; |
| 114 | 114 | ||
| 115 | if (device->char_data.idal_buf != NULL) | 115 | if (device->char_data.idal_buf != NULL) |
diff --git a/drivers/s390/char/tape_std.c b/drivers/s390/char/tape_std.c index 2a1af4e60be0..cc8fd781ee22 100644 --- a/drivers/s390/char/tape_std.c +++ b/drivers/s390/char/tape_std.c | |||
| @@ -248,7 +248,7 @@ tape_std_mtsetblk(struct tape_device *device, int count) | |||
| 248 | 248 | ||
| 249 | /* Allocate a new idal buffer. */ | 249 | /* Allocate a new idal buffer. */ |
| 250 | new = idal_buffer_alloc(count, 0); | 250 | new = idal_buffer_alloc(count, 0); |
| 251 | if (new == NULL) | 251 | if (IS_ERR(new)) |
| 252 | return -ENOMEM; | 252 | return -ENOMEM; |
| 253 | if (device->char_data.idal_buf != NULL) | 253 | if (device->char_data.idal_buf != NULL) |
| 254 | idal_buffer_free(device->char_data.idal_buf); | 254 | idal_buffer_free(device->char_data.idal_buf); |
diff --git a/drivers/s390/cio/ccwgroup.c b/drivers/s390/cio/ccwgroup.c index 26a930e832bd..e0ce65fca4e7 100644 --- a/drivers/s390/cio/ccwgroup.c +++ b/drivers/s390/cio/ccwgroup.c | |||
| @@ -112,8 +112,10 @@ ccwgroup_release (struct device *dev) | |||
| 112 | gdev = to_ccwgroupdev(dev); | 112 | gdev = to_ccwgroupdev(dev); |
| 113 | 113 | ||
| 114 | for (i = 0; i < gdev->count; i++) { | 114 | for (i = 0; i < gdev->count; i++) { |
| 115 | dev_set_drvdata(&gdev->cdev[i]->dev, NULL); | 115 | if (gdev->cdev[i]) { |
| 116 | put_device(&gdev->cdev[i]->dev); | 116 | dev_set_drvdata(&gdev->cdev[i]->dev, NULL); |
| 117 | put_device(&gdev->cdev[i]->dev); | ||
| 118 | } | ||
| 117 | } | 119 | } |
| 118 | kfree(gdev); | 120 | kfree(gdev); |
| 119 | } | 121 | } |
| @@ -221,6 +223,13 @@ int ccwgroup_create_from_string(struct device *root, unsigned int creator_id, | |||
| 221 | atomic_set(&gdev->onoff, 0); | 223 | atomic_set(&gdev->onoff, 0); |
| 222 | mutex_init(&gdev->reg_mutex); | 224 | mutex_init(&gdev->reg_mutex); |
| 223 | mutex_lock(&gdev->reg_mutex); | 225 | mutex_lock(&gdev->reg_mutex); |
| 226 | gdev->creator_id = creator_id; | ||
| 227 | gdev->count = num_devices; | ||
| 228 | gdev->dev.bus = &ccwgroup_bus_type; | ||
| 229 | gdev->dev.parent = root; | ||
| 230 | gdev->dev.release = ccwgroup_release; | ||
| 231 | device_initialize(&gdev->dev); | ||
| 232 | |||
| 224 | curr_buf = buf; | 233 | curr_buf = buf; |
| 225 | for (i = 0; i < num_devices && curr_buf; i++) { | 234 | for (i = 0; i < num_devices && curr_buf; i++) { |
| 226 | rc = __get_next_bus_id(&curr_buf, tmp_bus_id); | 235 | rc = __get_next_bus_id(&curr_buf, tmp_bus_id); |
| @@ -258,16 +267,11 @@ int ccwgroup_create_from_string(struct device *root, unsigned int creator_id, | |||
| 258 | rc = -EINVAL; | 267 | rc = -EINVAL; |
| 259 | goto error; | 268 | goto error; |
| 260 | } | 269 | } |
| 261 | gdev->creator_id = creator_id; | ||
| 262 | gdev->count = num_devices; | ||
| 263 | gdev->dev.bus = &ccwgroup_bus_type; | ||
| 264 | gdev->dev.parent = root; | ||
| 265 | gdev->dev.release = ccwgroup_release; | ||
| 266 | 270 | ||
| 267 | snprintf (gdev->dev.bus_id, BUS_ID_SIZE, "%s", | 271 | snprintf (gdev->dev.bus_id, BUS_ID_SIZE, "%s", |
| 268 | gdev->cdev[0]->dev.bus_id); | 272 | gdev->cdev[0]->dev.bus_id); |
| 269 | 273 | ||
| 270 | rc = device_register(&gdev->dev); | 274 | rc = device_add(&gdev->dev); |
| 271 | if (rc) | 275 | if (rc) |
| 272 | goto error; | 276 | goto error; |
| 273 | get_device(&gdev->dev); | 277 | get_device(&gdev->dev); |
diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c index 46c021d880dc..51489eff6b0b 100644 --- a/drivers/s390/cio/css.c +++ b/drivers/s390/cio/css.c | |||
| @@ -477,7 +477,6 @@ void css_schedule_eval_all(void) | |||
| 477 | 477 | ||
| 478 | void css_wait_for_slow_path(void) | 478 | void css_wait_for_slow_path(void) |
| 479 | { | 479 | { |
| 480 | flush_workqueue(ccw_device_notify_work); | ||
| 481 | flush_workqueue(slow_path_wq); | 480 | flush_workqueue(slow_path_wq); |
| 482 | } | 481 | } |
| 483 | 482 | ||
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c index e818d0c54c09..28221030b886 100644 --- a/drivers/s390/cio/device.c +++ b/drivers/s390/cio/device.c | |||
| @@ -150,7 +150,6 @@ static struct css_driver io_subchannel_driver = { | |||
| 150 | }; | 150 | }; |
| 151 | 151 | ||
| 152 | struct workqueue_struct *ccw_device_work; | 152 | struct workqueue_struct *ccw_device_work; |
| 153 | struct workqueue_struct *ccw_device_notify_work; | ||
| 154 | wait_queue_head_t ccw_device_init_wq; | 153 | wait_queue_head_t ccw_device_init_wq; |
| 155 | atomic_t ccw_device_init_count; | 154 | atomic_t ccw_device_init_count; |
| 156 | 155 | ||
| @@ -168,11 +167,6 @@ init_ccw_bus_type (void) | |||
| 168 | ccw_device_work = create_singlethread_workqueue("cio"); | 167 | ccw_device_work = create_singlethread_workqueue("cio"); |
| 169 | if (!ccw_device_work) | 168 | if (!ccw_device_work) |
| 170 | return -ENOMEM; /* FIXME: better errno ? */ | 169 | return -ENOMEM; /* FIXME: better errno ? */ |
| 171 | ccw_device_notify_work = create_singlethread_workqueue("cio_notify"); | ||
| 172 | if (!ccw_device_notify_work) { | ||
| 173 | ret = -ENOMEM; /* FIXME: better errno ? */ | ||
| 174 | goto out_err; | ||
| 175 | } | ||
| 176 | slow_path_wq = create_singlethread_workqueue("kslowcrw"); | 170 | slow_path_wq = create_singlethread_workqueue("kslowcrw"); |
| 177 | if (!slow_path_wq) { | 171 | if (!slow_path_wq) { |
| 178 | ret = -ENOMEM; /* FIXME: better errno ? */ | 172 | ret = -ENOMEM; /* FIXME: better errno ? */ |
| @@ -192,8 +186,6 @@ init_ccw_bus_type (void) | |||
| 192 | out_err: | 186 | out_err: |
| 193 | if (ccw_device_work) | 187 | if (ccw_device_work) |
| 194 | destroy_workqueue(ccw_device_work); | 188 | destroy_workqueue(ccw_device_work); |
| 195 | if (ccw_device_notify_work) | ||
| 196 | destroy_workqueue(ccw_device_notify_work); | ||
| 197 | if (slow_path_wq) | 189 | if (slow_path_wq) |
| 198 | destroy_workqueue(slow_path_wq); | 190 | destroy_workqueue(slow_path_wq); |
| 199 | return ret; | 191 | return ret; |
| @@ -204,7 +196,6 @@ cleanup_ccw_bus_type (void) | |||
| 204 | { | 196 | { |
| 205 | css_driver_unregister(&io_subchannel_driver); | 197 | css_driver_unregister(&io_subchannel_driver); |
| 206 | bus_unregister(&ccw_bus_type); | 198 | bus_unregister(&ccw_bus_type); |
| 207 | destroy_workqueue(ccw_device_notify_work); | ||
| 208 | destroy_workqueue(ccw_device_work); | 199 | destroy_workqueue(ccw_device_work); |
| 209 | } | 200 | } |
| 210 | 201 | ||
| @@ -1496,11 +1487,22 @@ static void device_set_disconnected(struct ccw_device *cdev) | |||
| 1496 | ccw_device_schedule_recovery(); | 1487 | ccw_device_schedule_recovery(); |
| 1497 | } | 1488 | } |
| 1498 | 1489 | ||
| 1490 | void ccw_device_set_notoper(struct ccw_device *cdev) | ||
| 1491 | { | ||
| 1492 | struct subchannel *sch = to_subchannel(cdev->dev.parent); | ||
| 1493 | |||
| 1494 | CIO_TRACE_EVENT(2, "notoper"); | ||
| 1495 | CIO_TRACE_EVENT(2, sch->dev.bus_id); | ||
| 1496 | ccw_device_set_timeout(cdev, 0); | ||
| 1497 | cio_disable_subchannel(sch); | ||
| 1498 | cdev->private->state = DEV_STATE_NOT_OPER; | ||
| 1499 | } | ||
| 1500 | |||
| 1499 | static int io_subchannel_sch_event(struct subchannel *sch, int slow) | 1501 | static int io_subchannel_sch_event(struct subchannel *sch, int slow) |
| 1500 | { | 1502 | { |
| 1501 | int event, ret, disc; | 1503 | int event, ret, disc; |
| 1502 | unsigned long flags; | 1504 | unsigned long flags; |
| 1503 | enum { NONE, UNREGISTER, UNREGISTER_PROBE, REPROBE } action; | 1505 | enum { NONE, UNREGISTER, UNREGISTER_PROBE, REPROBE, DISC } action; |
| 1504 | struct ccw_device *cdev; | 1506 | struct ccw_device *cdev; |
| 1505 | 1507 | ||
| 1506 | spin_lock_irqsave(sch->lock, flags); | 1508 | spin_lock_irqsave(sch->lock, flags); |
| @@ -1535,16 +1537,11 @@ static int io_subchannel_sch_event(struct subchannel *sch, int slow) | |||
| 1535 | } | 1537 | } |
| 1536 | /* fall through */ | 1538 | /* fall through */ |
| 1537 | case CIO_GONE: | 1539 | case CIO_GONE: |
| 1538 | /* Prevent unwanted effects when opening lock. */ | ||
| 1539 | cio_disable_subchannel(sch); | ||
| 1540 | device_set_disconnected(cdev); | ||
| 1541 | /* Ask driver what to do with device. */ | 1540 | /* Ask driver what to do with device. */ |
| 1542 | action = UNREGISTER; | 1541 | if (io_subchannel_notify(sch, event)) |
| 1543 | spin_unlock_irqrestore(sch->lock, flags); | 1542 | action = DISC; |
| 1544 | ret = io_subchannel_notify(sch, event); | 1543 | else |
| 1545 | spin_lock_irqsave(sch->lock, flags); | 1544 | action = UNREGISTER; |
| 1546 | if (ret) | ||
| 1547 | action = NONE; | ||
| 1548 | break; | 1545 | break; |
| 1549 | case CIO_REVALIDATE: | 1546 | case CIO_REVALIDATE: |
| 1550 | /* Device will be removed, so no notify necessary. */ | 1547 | /* Device will be removed, so no notify necessary. */ |
| @@ -1565,6 +1562,7 @@ static int io_subchannel_sch_event(struct subchannel *sch, int slow) | |||
| 1565 | switch (action) { | 1562 | switch (action) { |
| 1566 | case UNREGISTER: | 1563 | case UNREGISTER: |
| 1567 | case UNREGISTER_PROBE: | 1564 | case UNREGISTER_PROBE: |
| 1565 | ccw_device_set_notoper(cdev); | ||
| 1568 | /* Unregister device (will use subchannel lock). */ | 1566 | /* Unregister device (will use subchannel lock). */ |
| 1569 | spin_unlock_irqrestore(sch->lock, flags); | 1567 | spin_unlock_irqrestore(sch->lock, flags); |
| 1570 | css_sch_device_unregister(sch); | 1568 | css_sch_device_unregister(sch); |
| @@ -1577,6 +1575,9 @@ static int io_subchannel_sch_event(struct subchannel *sch, int slow) | |||
| 1577 | case REPROBE: | 1575 | case REPROBE: |
| 1578 | ccw_device_trigger_reprobe(cdev); | 1576 | ccw_device_trigger_reprobe(cdev); |
| 1579 | break; | 1577 | break; |
| 1578 | case DISC: | ||
| 1579 | device_set_disconnected(cdev); | ||
| 1580 | break; | ||
| 1580 | default: | 1581 | default: |
| 1581 | break; | 1582 | break; |
| 1582 | } | 1583 | } |
| @@ -1828,5 +1829,4 @@ EXPORT_SYMBOL(ccw_driver_unregister); | |||
| 1828 | EXPORT_SYMBOL(get_ccwdev_by_busid); | 1829 | EXPORT_SYMBOL(get_ccwdev_by_busid); |
| 1829 | EXPORT_SYMBOL(ccw_bus_type); | 1830 | EXPORT_SYMBOL(ccw_bus_type); |
| 1830 | EXPORT_SYMBOL(ccw_device_work); | 1831 | EXPORT_SYMBOL(ccw_device_work); |
| 1831 | EXPORT_SYMBOL(ccw_device_notify_work); | ||
| 1832 | EXPORT_SYMBOL_GPL(ccw_device_get_subchannel_id); | 1832 | EXPORT_SYMBOL_GPL(ccw_device_get_subchannel_id); |
diff --git a/drivers/s390/cio/device.h b/drivers/s390/cio/device.h index 9800a8335a3f..6f5c3f2b3587 100644 --- a/drivers/s390/cio/device.h +++ b/drivers/s390/cio/device.h | |||
| @@ -72,7 +72,6 @@ dev_fsm_final_state(struct ccw_device *cdev) | |||
| 72 | } | 72 | } |
| 73 | 73 | ||
| 74 | extern struct workqueue_struct *ccw_device_work; | 74 | extern struct workqueue_struct *ccw_device_work; |
| 75 | extern struct workqueue_struct *ccw_device_notify_work; | ||
| 76 | extern wait_queue_head_t ccw_device_init_wq; | 75 | extern wait_queue_head_t ccw_device_init_wq; |
| 77 | extern atomic_t ccw_device_init_count; | 76 | extern atomic_t ccw_device_init_count; |
| 78 | 77 | ||
| @@ -120,6 +119,7 @@ int ccw_device_stlck(struct ccw_device *); | |||
| 120 | void ccw_device_trigger_reprobe(struct ccw_device *); | 119 | void ccw_device_trigger_reprobe(struct ccw_device *); |
| 121 | void ccw_device_kill_io(struct ccw_device *); | 120 | void ccw_device_kill_io(struct ccw_device *); |
| 122 | int ccw_device_notify(struct ccw_device *, int); | 121 | int ccw_device_notify(struct ccw_device *, int); |
| 122 | void ccw_device_set_notoper(struct ccw_device *cdev); | ||
| 123 | 123 | ||
| 124 | /* qdio needs this. */ | 124 | /* qdio needs this. */ |
| 125 | void ccw_device_set_timeout(struct ccw_device *, int); | 125 | void ccw_device_set_timeout(struct ccw_device *, int); |
diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c index 8b5fe57fb2f3..550508df952b 100644 --- a/drivers/s390/cio/device_fsm.c +++ b/drivers/s390/cio/device_fsm.c | |||
| @@ -337,26 +337,34 @@ int ccw_device_notify(struct ccw_device *cdev, int event) | |||
| 337 | return 0; | 337 | return 0; |
| 338 | if (!cdev->online) | 338 | if (!cdev->online) |
| 339 | return 0; | 339 | return 0; |
| 340 | CIO_MSG_EVENT(2, "notify called for 0.%x.%04x, event=%d\n", | ||
| 341 | cdev->private->dev_id.ssid, cdev->private->dev_id.devno, | ||
| 342 | event); | ||
| 340 | return cdev->drv->notify ? cdev->drv->notify(cdev, event) : 0; | 343 | return cdev->drv->notify ? cdev->drv->notify(cdev, event) : 0; |
| 341 | } | 344 | } |
| 342 | 345 | ||
| 343 | static void | 346 | static void cmf_reenable_delayed(struct work_struct *work) |
| 344 | ccw_device_oper_notify(struct work_struct *work) | ||
| 345 | { | 347 | { |
| 346 | struct ccw_device_private *priv; | 348 | struct ccw_device_private *priv; |
| 347 | struct ccw_device *cdev; | 349 | struct ccw_device *cdev; |
| 348 | int ret; | ||
| 349 | 350 | ||
| 350 | priv = container_of(work, struct ccw_device_private, kick_work); | 351 | priv = container_of(work, struct ccw_device_private, kick_work); |
| 351 | cdev = priv->cdev; | 352 | cdev = priv->cdev; |
| 352 | ret = ccw_device_notify(cdev, CIO_OPER); | 353 | cmf_reenable(cdev); |
| 353 | if (ret) { | 354 | } |
| 355 | |||
| 356 | static void ccw_device_oper_notify(struct ccw_device *cdev) | ||
| 357 | { | ||
| 358 | if (ccw_device_notify(cdev, CIO_OPER)) { | ||
| 354 | /* Reenable channel measurements, if needed. */ | 359 | /* Reenable channel measurements, if needed. */ |
| 355 | cmf_reenable(cdev); | 360 | PREPARE_WORK(&cdev->private->kick_work, cmf_reenable_delayed); |
| 356 | wake_up(&cdev->private->wait_q); | 361 | queue_work(ccw_device_work, &cdev->private->kick_work); |
| 357 | } else | 362 | return; |
| 358 | /* Driver doesn't want device back. */ | 363 | } |
| 359 | ccw_device_do_unreg_rereg(work); | 364 | /* Driver doesn't want device back. */ |
| 365 | ccw_device_set_notoper(cdev); | ||
| 366 | PREPARE_WORK(&cdev->private->kick_work, ccw_device_do_unreg_rereg); | ||
| 367 | queue_work(ccw_device_work, &cdev->private->kick_work); | ||
| 360 | } | 368 | } |
| 361 | 369 | ||
| 362 | /* | 370 | /* |
| @@ -386,8 +394,7 @@ ccw_device_done(struct ccw_device *cdev, int state) | |||
| 386 | 394 | ||
| 387 | if (cdev->private->flags.donotify) { | 395 | if (cdev->private->flags.donotify) { |
| 388 | cdev->private->flags.donotify = 0; | 396 | cdev->private->flags.donotify = 0; |
| 389 | PREPARE_WORK(&cdev->private->kick_work, ccw_device_oper_notify); | 397 | ccw_device_oper_notify(cdev); |
| 390 | queue_work(ccw_device_notify_work, &cdev->private->kick_work); | ||
| 391 | } | 398 | } |
| 392 | wake_up(&cdev->private->wait_q); | 399 | wake_up(&cdev->private->wait_q); |
| 393 | 400 | ||
diff --git a/drivers/s390/cio/qdio_debug.h b/drivers/s390/cio/qdio_debug.h index 8484b83698e1..5a4d85b829ad 100644 --- a/drivers/s390/cio/qdio_debug.h +++ b/drivers/s390/cio/qdio_debug.h | |||
| @@ -61,18 +61,18 @@ | |||
| 61 | 61 | ||
| 62 | /* s390dbf views */ | 62 | /* s390dbf views */ |
| 63 | #define QDIO_DBF_SETUP_LEN 8 | 63 | #define QDIO_DBF_SETUP_LEN 8 |
| 64 | #define QDIO_DBF_SETUP_PAGES 4 | 64 | #define QDIO_DBF_SETUP_PAGES 8 |
| 65 | #define QDIO_DBF_SETUP_NR_AREAS 1 | 65 | #define QDIO_DBF_SETUP_NR_AREAS 1 |
| 66 | 66 | ||
| 67 | #define QDIO_DBF_TRACE_LEN 8 | 67 | #define QDIO_DBF_TRACE_LEN 8 |
| 68 | #define QDIO_DBF_TRACE_NR_AREAS 2 | 68 | #define QDIO_DBF_TRACE_NR_AREAS 2 |
| 69 | 69 | ||
| 70 | #ifdef CONFIG_QDIO_DEBUG | 70 | #ifdef CONFIG_QDIO_DEBUG |
| 71 | #define QDIO_DBF_TRACE_PAGES 16 | 71 | #define QDIO_DBF_TRACE_PAGES 32 |
| 72 | #define QDIO_DBF_SETUP_LEVEL 6 | 72 | #define QDIO_DBF_SETUP_LEVEL 6 |
| 73 | #define QDIO_DBF_TRACE_LEVEL 4 | 73 | #define QDIO_DBF_TRACE_LEVEL 4 |
| 74 | #else /* !CONFIG_QDIO_DEBUG */ | 74 | #else /* !CONFIG_QDIO_DEBUG */ |
| 75 | #define QDIO_DBF_TRACE_PAGES 4 | 75 | #define QDIO_DBF_TRACE_PAGES 8 |
| 76 | #define QDIO_DBF_SETUP_LEVEL 2 | 76 | #define QDIO_DBF_SETUP_LEVEL 2 |
| 77 | #define QDIO_DBF_TRACE_LEVEL 2 | 77 | #define QDIO_DBF_TRACE_LEVEL 2 |
| 78 | #endif /* CONFIG_QDIO_DEBUG */ | 78 | #endif /* CONFIG_QDIO_DEBUG */ |
diff --git a/drivers/s390/cio/qdio_main.c b/drivers/s390/cio/qdio_main.c index d15648514a0f..e6eabc853422 100644 --- a/drivers/s390/cio/qdio_main.c +++ b/drivers/s390/cio/qdio_main.c | |||
| @@ -330,6 +330,7 @@ static int qdio_siga_output(struct qdio_q *q) | |||
| 330 | int cc; | 330 | int cc; |
| 331 | u32 busy_bit; | 331 | u32 busy_bit; |
| 332 | u64 start_time = 0; | 332 | u64 start_time = 0; |
| 333 | char dbf_text[15]; | ||
| 333 | 334 | ||
| 334 | QDIO_DBF_TEXT5(0, trace, "sigaout"); | 335 | QDIO_DBF_TEXT5(0, trace, "sigaout"); |
| 335 | QDIO_DBF_HEX5(0, trace, &q, sizeof(void *)); | 336 | QDIO_DBF_HEX5(0, trace, &q, sizeof(void *)); |
| @@ -338,6 +339,9 @@ static int qdio_siga_output(struct qdio_q *q) | |||
| 338 | again: | 339 | again: |
| 339 | cc = qdio_do_siga_output(q, &busy_bit); | 340 | cc = qdio_do_siga_output(q, &busy_bit); |
| 340 | if (queue_type(q) == QDIO_IQDIO_QFMT && cc == 2 && busy_bit) { | 341 | if (queue_type(q) == QDIO_IQDIO_QFMT && cc == 2 && busy_bit) { |
| 342 | sprintf(dbf_text, "bb%4x%2x", q->irq_ptr->schid.sch_no, q->nr); | ||
| 343 | QDIO_DBF_TEXT3(0, trace, dbf_text); | ||
| 344 | |||
| 341 | if (!start_time) | 345 | if (!start_time) |
| 342 | start_time = get_usecs(); | 346 | start_time = get_usecs(); |
| 343 | else if ((get_usecs() - start_time) < QDIO_BUSY_BIT_PATIENCE) | 347 | else if ((get_usecs() - start_time) < QDIO_BUSY_BIT_PATIENCE) |
| @@ -748,16 +752,18 @@ static void qdio_kick_outbound_q(struct qdio_q *q) | |||
| 748 | rc = qdio_siga_output(q); | 752 | rc = qdio_siga_output(q); |
| 749 | switch (rc) { | 753 | switch (rc) { |
| 750 | case 0: | 754 | case 0: |
| 751 | /* went smooth this time, reset timestamp */ | ||
| 752 | q->u.out.timestamp = 0; | ||
| 753 | |||
| 754 | /* TODO: improve error handling for CC=0 case */ | 755 | /* TODO: improve error handling for CC=0 case */ |
| 755 | #ifdef CONFIG_QDIO_DEBUG | 756 | #ifdef CONFIG_QDIO_DEBUG |
| 756 | QDIO_DBF_TEXT3(0, trace, "cc2reslv"); | 757 | if (q->u.out.timestamp) { |
| 757 | sprintf(dbf_text, "%4x%2x%2x", q->irq_ptr->schid.sch_no, q->nr, | 758 | QDIO_DBF_TEXT3(0, trace, "cc2reslv"); |
| 758 | atomic_read(&q->u.out.busy_siga_counter)); | 759 | sprintf(dbf_text, "%4x%2x%2x", q->irq_ptr->schid.sch_no, |
| 759 | QDIO_DBF_TEXT3(0, trace, dbf_text); | 760 | q->nr, |
| 761 | atomic_read(&q->u.out.busy_siga_counter)); | ||
| 762 | QDIO_DBF_TEXT3(0, trace, dbf_text); | ||
| 763 | } | ||
| 760 | #endif /* CONFIG_QDIO_DEBUG */ | 764 | #endif /* CONFIG_QDIO_DEBUG */ |
| 765 | /* went smooth this time, reset timestamp */ | ||
| 766 | q->u.out.timestamp = 0; | ||
| 761 | break; | 767 | break; |
| 762 | /* cc=2 and busy bit */ | 768 | /* cc=2 and busy bit */ |
| 763 | case (2 | QDIO_ERROR_SIGA_BUSY): | 769 | case (2 | QDIO_ERROR_SIGA_BUSY): |
| @@ -1066,14 +1072,12 @@ void qdio_int_handler(struct ccw_device *cdev, unsigned long intparm, | |||
| 1066 | if (IS_ERR(irb)) { | 1072 | if (IS_ERR(irb)) { |
| 1067 | switch (PTR_ERR(irb)) { | 1073 | switch (PTR_ERR(irb)) { |
| 1068 | case -EIO: | 1074 | case -EIO: |
| 1069 | sprintf(dbf_text, "ierr%4x", | 1075 | sprintf(dbf_text, "ierr%4x", irq_ptr->schid.sch_no); |
| 1070 | cdev->private->schid.sch_no); | ||
| 1071 | QDIO_DBF_TEXT2(1, setup, dbf_text); | 1076 | QDIO_DBF_TEXT2(1, setup, dbf_text); |
| 1072 | qdio_int_error(cdev); | 1077 | qdio_int_error(cdev); |
| 1073 | return; | 1078 | return; |
| 1074 | case -ETIMEDOUT: | 1079 | case -ETIMEDOUT: |
| 1075 | sprintf(dbf_text, "qtoh%4x", | 1080 | sprintf(dbf_text, "qtoh%4x", irq_ptr->schid.sch_no); |
| 1076 | cdev->private->schid.sch_no); | ||
| 1077 | QDIO_DBF_TEXT2(1, setup, dbf_text); | 1081 | QDIO_DBF_TEXT2(1, setup, dbf_text); |
| 1078 | qdio_int_error(cdev); | 1082 | qdio_int_error(cdev); |
| 1079 | return; | 1083 | return; |
| @@ -1124,8 +1128,10 @@ void qdio_int_handler(struct ccw_device *cdev, unsigned long intparm, | |||
| 1124 | struct qdio_ssqd_desc *qdio_get_ssqd_desc(struct ccw_device *cdev) | 1128 | struct qdio_ssqd_desc *qdio_get_ssqd_desc(struct ccw_device *cdev) |
| 1125 | { | 1129 | { |
| 1126 | struct qdio_irq *irq_ptr; | 1130 | struct qdio_irq *irq_ptr; |
| 1131 | char dbf_text[15]; | ||
| 1127 | 1132 | ||
| 1128 | QDIO_DBF_TEXT0(0, setup, "getssqd"); | 1133 | sprintf(dbf_text, "qssq%4x", cdev->private->schid.sch_no); |
| 1134 | QDIO_DBF_TEXT0(0, setup, dbf_text); | ||
| 1129 | 1135 | ||
| 1130 | irq_ptr = cdev->private->qdio_data; | 1136 | irq_ptr = cdev->private->qdio_data; |
| 1131 | if (!irq_ptr) | 1137 | if (!irq_ptr) |
| @@ -1149,14 +1155,13 @@ int qdio_cleanup(struct ccw_device *cdev, int how) | |||
| 1149 | char dbf_text[15]; | 1155 | char dbf_text[15]; |
| 1150 | int rc; | 1156 | int rc; |
| 1151 | 1157 | ||
| 1158 | sprintf(dbf_text, "qcln%4x", cdev->private->schid.sch_no); | ||
| 1159 | QDIO_DBF_TEXT0(0, setup, dbf_text); | ||
| 1160 | |||
| 1152 | irq_ptr = cdev->private->qdio_data; | 1161 | irq_ptr = cdev->private->qdio_data; |
| 1153 | if (!irq_ptr) | 1162 | if (!irq_ptr) |
| 1154 | return -ENODEV; | 1163 | return -ENODEV; |
| 1155 | 1164 | ||
| 1156 | sprintf(dbf_text, "qcln%4x", irq_ptr->schid.sch_no); | ||
| 1157 | QDIO_DBF_TEXT1(0, trace, dbf_text); | ||
| 1158 | QDIO_DBF_TEXT0(0, setup, dbf_text); | ||
| 1159 | |||
| 1160 | rc = qdio_shutdown(cdev, how); | 1165 | rc = qdio_shutdown(cdev, how); |
| 1161 | if (rc == 0) | 1166 | if (rc == 0) |
| 1162 | rc = qdio_free(cdev); | 1167 | rc = qdio_free(cdev); |
| @@ -1191,6 +1196,9 @@ int qdio_shutdown(struct ccw_device *cdev, int how) | |||
| 1191 | unsigned long flags; | 1196 | unsigned long flags; |
| 1192 | char dbf_text[15]; | 1197 | char dbf_text[15]; |
| 1193 | 1198 | ||
| 1199 | sprintf(dbf_text, "qshu%4x", cdev->private->schid.sch_no); | ||
| 1200 | QDIO_DBF_TEXT0(0, setup, dbf_text); | ||
| 1201 | |||
| 1194 | irq_ptr = cdev->private->qdio_data; | 1202 | irq_ptr = cdev->private->qdio_data; |
| 1195 | if (!irq_ptr) | 1203 | if (!irq_ptr) |
| 1196 | return -ENODEV; | 1204 | return -ENODEV; |
| @@ -1205,10 +1213,6 @@ int qdio_shutdown(struct ccw_device *cdev, int how) | |||
| 1205 | return 0; | 1213 | return 0; |
| 1206 | } | 1214 | } |
| 1207 | 1215 | ||
| 1208 | sprintf(dbf_text, "qsqs%4x", irq_ptr->schid.sch_no); | ||
| 1209 | QDIO_DBF_TEXT1(0, trace, dbf_text); | ||
| 1210 | QDIO_DBF_TEXT0(0, setup, dbf_text); | ||
| 1211 | |||
| 1212 | tiqdio_remove_input_queues(irq_ptr); | 1216 | tiqdio_remove_input_queues(irq_ptr); |
| 1213 | qdio_shutdown_queues(cdev); | 1217 | qdio_shutdown_queues(cdev); |
| 1214 | qdio_shutdown_debug_entries(irq_ptr, cdev); | 1218 | qdio_shutdown_debug_entries(irq_ptr, cdev); |
| @@ -1247,7 +1251,6 @@ no_cleanup: | |||
| 1247 | 1251 | ||
| 1248 | qdio_set_state(irq_ptr, QDIO_IRQ_STATE_INACTIVE); | 1252 | qdio_set_state(irq_ptr, QDIO_IRQ_STATE_INACTIVE); |
| 1249 | mutex_unlock(&irq_ptr->setup_mutex); | 1253 | mutex_unlock(&irq_ptr->setup_mutex); |
| 1250 | module_put(THIS_MODULE); | ||
| 1251 | if (rc) | 1254 | if (rc) |
| 1252 | return rc; | 1255 | return rc; |
| 1253 | return 0; | 1256 | return 0; |
| @@ -1263,16 +1266,14 @@ int qdio_free(struct ccw_device *cdev) | |||
| 1263 | struct qdio_irq *irq_ptr; | 1266 | struct qdio_irq *irq_ptr; |
| 1264 | char dbf_text[15]; | 1267 | char dbf_text[15]; |
| 1265 | 1268 | ||
| 1269 | sprintf(dbf_text, "qfre%4x", cdev->private->schid.sch_no); | ||
| 1270 | QDIO_DBF_TEXT0(0, setup, dbf_text); | ||
| 1271 | |||
| 1266 | irq_ptr = cdev->private->qdio_data; | 1272 | irq_ptr = cdev->private->qdio_data; |
| 1267 | if (!irq_ptr) | 1273 | if (!irq_ptr) |
| 1268 | return -ENODEV; | 1274 | return -ENODEV; |
| 1269 | 1275 | ||
| 1270 | mutex_lock(&irq_ptr->setup_mutex); | 1276 | mutex_lock(&irq_ptr->setup_mutex); |
| 1271 | |||
| 1272 | sprintf(dbf_text, "qfqs%4x", irq_ptr->schid.sch_no); | ||
| 1273 | QDIO_DBF_TEXT1(0, trace, dbf_text); | ||
| 1274 | QDIO_DBF_TEXT0(0, setup, dbf_text); | ||
| 1275 | |||
| 1276 | cdev->private->qdio_data = NULL; | 1277 | cdev->private->qdio_data = NULL; |
| 1277 | mutex_unlock(&irq_ptr->setup_mutex); | 1278 | mutex_unlock(&irq_ptr->setup_mutex); |
| 1278 | 1279 | ||
| @@ -1295,7 +1296,6 @@ int qdio_initialize(struct qdio_initialize *init_data) | |||
| 1295 | 1296 | ||
| 1296 | sprintf(dbf_text, "qini%4x", init_data->cdev->private->schid.sch_no); | 1297 | sprintf(dbf_text, "qini%4x", init_data->cdev->private->schid.sch_no); |
| 1297 | QDIO_DBF_TEXT0(0, setup, dbf_text); | 1298 | QDIO_DBF_TEXT0(0, setup, dbf_text); |
| 1298 | QDIO_DBF_TEXT0(0, trace, dbf_text); | ||
| 1299 | 1299 | ||
| 1300 | rc = qdio_allocate(init_data); | 1300 | rc = qdio_allocate(init_data); |
| 1301 | if (rc) | 1301 | if (rc) |
| @@ -1319,7 +1319,6 @@ int qdio_allocate(struct qdio_initialize *init_data) | |||
| 1319 | 1319 | ||
| 1320 | sprintf(dbf_text, "qalc%4x", init_data->cdev->private->schid.sch_no); | 1320 | sprintf(dbf_text, "qalc%4x", init_data->cdev->private->schid.sch_no); |
| 1321 | QDIO_DBF_TEXT0(0, setup, dbf_text); | 1321 | QDIO_DBF_TEXT0(0, setup, dbf_text); |
| 1322 | QDIO_DBF_TEXT0(0, trace, dbf_text); | ||
| 1323 | 1322 | ||
| 1324 | if ((init_data->no_input_qs && !init_data->input_handler) || | 1323 | if ((init_data->no_input_qs && !init_data->input_handler) || |
| 1325 | (init_data->no_output_qs && !init_data->output_handler)) | 1324 | (init_data->no_output_qs && !init_data->output_handler)) |
| @@ -1389,6 +1388,9 @@ int qdio_establish(struct qdio_initialize *init_data) | |||
| 1389 | unsigned long saveflags; | 1388 | unsigned long saveflags; |
| 1390 | int rc; | 1389 | int rc; |
| 1391 | 1390 | ||
| 1391 | sprintf(dbf_text, "qest%4x", cdev->private->schid.sch_no); | ||
| 1392 | QDIO_DBF_TEXT0(0, setup, dbf_text); | ||
| 1393 | |||
| 1392 | irq_ptr = cdev->private->qdio_data; | 1394 | irq_ptr = cdev->private->qdio_data; |
| 1393 | if (!irq_ptr) | 1395 | if (!irq_ptr) |
| 1394 | return -ENODEV; | 1396 | return -ENODEV; |
| @@ -1396,13 +1398,6 @@ int qdio_establish(struct qdio_initialize *init_data) | |||
| 1396 | if (cdev->private->state != DEV_STATE_ONLINE) | 1398 | if (cdev->private->state != DEV_STATE_ONLINE) |
| 1397 | return -EINVAL; | 1399 | return -EINVAL; |
| 1398 | 1400 | ||
| 1399 | if (!try_module_get(THIS_MODULE)) | ||
| 1400 | return -EINVAL; | ||
| 1401 | |||
| 1402 | sprintf(dbf_text, "qest%4x", cdev->private->schid.sch_no); | ||
| 1403 | QDIO_DBF_TEXT0(0, setup, dbf_text); | ||
| 1404 | QDIO_DBF_TEXT0(0, trace, dbf_text); | ||
| 1405 | |||
| 1406 | mutex_lock(&irq_ptr->setup_mutex); | 1401 | mutex_lock(&irq_ptr->setup_mutex); |
| 1407 | qdio_setup_irq(init_data); | 1402 | qdio_setup_irq(init_data); |
| 1408 | 1403 | ||
| @@ -1472,6 +1467,9 @@ int qdio_activate(struct ccw_device *cdev) | |||
| 1472 | unsigned long saveflags; | 1467 | unsigned long saveflags; |
| 1473 | char dbf_text[20]; | 1468 | char dbf_text[20]; |
| 1474 | 1469 | ||
| 1470 | sprintf(dbf_text, "qact%4x", cdev->private->schid.sch_no); | ||
| 1471 | QDIO_DBF_TEXT0(0, setup, dbf_text); | ||
| 1472 | |||
| 1475 | irq_ptr = cdev->private->qdio_data; | 1473 | irq_ptr = cdev->private->qdio_data; |
| 1476 | if (!irq_ptr) | 1474 | if (!irq_ptr) |
| 1477 | return -ENODEV; | 1475 | return -ENODEV; |
| @@ -1485,10 +1483,6 @@ int qdio_activate(struct ccw_device *cdev) | |||
| 1485 | goto out; | 1483 | goto out; |
| 1486 | } | 1484 | } |
| 1487 | 1485 | ||
| 1488 | sprintf(dbf_text, "qact%4x", irq_ptr->schid.sch_no); | ||
| 1489 | QDIO_DBF_TEXT2(0, setup, dbf_text); | ||
| 1490 | QDIO_DBF_TEXT2(0, trace, dbf_text); | ||
| 1491 | |||
| 1492 | irq_ptr->ccw.cmd_code = irq_ptr->aqueue.cmd; | 1486 | irq_ptr->ccw.cmd_code = irq_ptr->aqueue.cmd; |
| 1493 | irq_ptr->ccw.flags = CCW_FLAG_SLI; | 1487 | irq_ptr->ccw.flags = CCW_FLAG_SLI; |
| 1494 | irq_ptr->ccw.count = irq_ptr->aqueue.count; | 1488 | irq_ptr->ccw.count = irq_ptr->aqueue.count; |
| @@ -1663,7 +1657,7 @@ int do_QDIO(struct ccw_device *cdev, unsigned int callflags, | |||
| 1663 | #ifdef CONFIG_QDIO_DEBUG | 1657 | #ifdef CONFIG_QDIO_DEBUG |
| 1664 | char dbf_text[20]; | 1658 | char dbf_text[20]; |
| 1665 | 1659 | ||
| 1666 | sprintf(dbf_text, "doQD%04x", cdev->private->schid.sch_no); | 1660 | sprintf(dbf_text, "doQD%4x", cdev->private->schid.sch_no); |
| 1667 | QDIO_DBF_TEXT3(0, trace, dbf_text); | 1661 | QDIO_DBF_TEXT3(0, trace, dbf_text); |
| 1668 | #endif /* CONFIG_QDIO_DEBUG */ | 1662 | #endif /* CONFIG_QDIO_DEBUG */ |
| 1669 | 1663 | ||
diff --git a/drivers/s390/cio/qdio_setup.c b/drivers/s390/cio/qdio_setup.c index 1bd2a208db28..1679e2f91c94 100644 --- a/drivers/s390/cio/qdio_setup.c +++ b/drivers/s390/cio/qdio_setup.c | |||
| @@ -165,7 +165,7 @@ static void setup_queues(struct qdio_irq *irq_ptr, | |||
| 165 | void **output_sbal_array = qdio_init->output_sbal_addr_array; | 165 | void **output_sbal_array = qdio_init->output_sbal_addr_array; |
| 166 | int i; | 166 | int i; |
| 167 | 167 | ||
| 168 | sprintf(dbf_text, "qfqs%4x", qdio_init->cdev->private->schid.sch_no); | 168 | sprintf(dbf_text, "qset%4x", qdio_init->cdev->private->schid.sch_no); |
| 169 | QDIO_DBF_TEXT0(0, setup, dbf_text); | 169 | QDIO_DBF_TEXT0(0, setup, dbf_text); |
| 170 | 170 | ||
| 171 | for_each_input_queue(irq_ptr, q, i) { | 171 | for_each_input_queue(irq_ptr, q, i) { |
| @@ -285,7 +285,7 @@ void qdio_setup_ssqd_info(struct qdio_irq *irq_ptr) | |||
| 285 | rc = __get_ssqd_info(irq_ptr); | 285 | rc = __get_ssqd_info(irq_ptr); |
| 286 | if (rc) { | 286 | if (rc) { |
| 287 | QDIO_DBF_TEXT2(0, setup, "ssqdasig"); | 287 | QDIO_DBF_TEXT2(0, setup, "ssqdasig"); |
| 288 | sprintf(dbf_text, "schno%x", irq_ptr->schid.sch_no); | 288 | sprintf(dbf_text, "schn%4x", irq_ptr->schid.sch_no); |
| 289 | QDIO_DBF_TEXT2(0, setup, dbf_text); | 289 | QDIO_DBF_TEXT2(0, setup, dbf_text); |
| 290 | sprintf(dbf_text, "rc:%d", rc); | 290 | sprintf(dbf_text, "rc:%d", rc); |
| 291 | QDIO_DBF_TEXT2(0, setup, dbf_text); | 291 | QDIO_DBF_TEXT2(0, setup, dbf_text); |
| @@ -447,7 +447,7 @@ void qdio_print_subchannel_info(struct qdio_irq *irq_ptr, | |||
| 447 | { | 447 | { |
| 448 | char s[80]; | 448 | char s[80]; |
| 449 | 449 | ||
| 450 | sprintf(s, "%s ", cdev->dev.bus_id); | 450 | sprintf(s, "%s sc:%x ", cdev->dev.bus_id, irq_ptr->schid.sch_no); |
| 451 | 451 | ||
| 452 | switch (irq_ptr->qib.qfmt) { | 452 | switch (irq_ptr->qib.qfmt) { |
| 453 | case QDIO_QETH_QFMT: | 453 | case QDIO_QETH_QFMT: |
diff --git a/drivers/s390/cio/qdio_thinint.c b/drivers/s390/cio/qdio_thinint.c index 9291a771d812..ea7f61400267 100644 --- a/drivers/s390/cio/qdio_thinint.c +++ b/drivers/s390/cio/qdio_thinint.c | |||
| @@ -113,7 +113,11 @@ void tiqdio_remove_input_queues(struct qdio_irq *irq_ptr) | |||
| 113 | struct qdio_q *q; | 113 | struct qdio_q *q; |
| 114 | int i; | 114 | int i; |
| 115 | 115 | ||
| 116 | for_each_input_queue(irq_ptr, q, i) { | 116 | for (i = 0; i < irq_ptr->nr_input_qs; i++) { |
| 117 | q = irq_ptr->input_qs[i]; | ||
| 118 | /* if establish triggered an error */ | ||
| 119 | if (!q || !q->entry.prev || !q->entry.next) | ||
| 120 | continue; | ||
| 117 | list_del_rcu(&q->entry); | 121 | list_del_rcu(&q->entry); |
| 118 | synchronize_rcu(); | 122 | synchronize_rcu(); |
| 119 | } | 123 | } |
diff --git a/drivers/s390/net/claw.c b/drivers/s390/net/claw.c index a08b1682c8e8..e10ac9ab2d44 100644 --- a/drivers/s390/net/claw.c +++ b/drivers/s390/net/claw.c | |||
| @@ -133,14 +133,14 @@ claw_register_debug_facility(void) | |||
| 133 | static inline void | 133 | static inline void |
| 134 | claw_set_busy(struct net_device *dev) | 134 | claw_set_busy(struct net_device *dev) |
| 135 | { | 135 | { |
| 136 | ((struct claw_privbk *) dev->priv)->tbusy=1; | 136 | ((struct claw_privbk *)dev->ml_priv)->tbusy = 1; |
| 137 | eieio(); | 137 | eieio(); |
| 138 | } | 138 | } |
| 139 | 139 | ||
| 140 | static inline void | 140 | static inline void |
| 141 | claw_clear_busy(struct net_device *dev) | 141 | claw_clear_busy(struct net_device *dev) |
| 142 | { | 142 | { |
| 143 | clear_bit(0, &(((struct claw_privbk *) dev->priv)->tbusy)); | 143 | clear_bit(0, &(((struct claw_privbk *) dev->ml_priv)->tbusy)); |
| 144 | netif_wake_queue(dev); | 144 | netif_wake_queue(dev); |
| 145 | eieio(); | 145 | eieio(); |
| 146 | } | 146 | } |
| @@ -149,20 +149,20 @@ static inline int | |||
| 149 | claw_check_busy(struct net_device *dev) | 149 | claw_check_busy(struct net_device *dev) |
| 150 | { | 150 | { |
| 151 | eieio(); | 151 | eieio(); |
| 152 | return ((struct claw_privbk *) dev->priv)->tbusy; | 152 | return ((struct claw_privbk *) dev->ml_priv)->tbusy; |
| 153 | } | 153 | } |
| 154 | 154 | ||
| 155 | static inline void | 155 | static inline void |
| 156 | claw_setbit_busy(int nr,struct net_device *dev) | 156 | claw_setbit_busy(int nr,struct net_device *dev) |
| 157 | { | 157 | { |
| 158 | netif_stop_queue(dev); | 158 | netif_stop_queue(dev); |
| 159 | set_bit(nr, (void *)&(((struct claw_privbk *)dev->priv)->tbusy)); | 159 | set_bit(nr, (void *)&(((struct claw_privbk *)dev->ml_priv)->tbusy)); |
| 160 | } | 160 | } |
| 161 | 161 | ||
| 162 | static inline void | 162 | static inline void |
| 163 | claw_clearbit_busy(int nr,struct net_device *dev) | 163 | claw_clearbit_busy(int nr,struct net_device *dev) |
| 164 | { | 164 | { |
| 165 | clear_bit(nr,(void *)&(((struct claw_privbk *)dev->priv)->tbusy)); | 165 | clear_bit(nr, (void *)&(((struct claw_privbk *)dev->ml_priv)->tbusy)); |
| 166 | netif_wake_queue(dev); | 166 | netif_wake_queue(dev); |
| 167 | } | 167 | } |
| 168 | 168 | ||
| @@ -171,7 +171,7 @@ claw_test_and_setbit_busy(int nr,struct net_device *dev) | |||
| 171 | { | 171 | { |
| 172 | netif_stop_queue(dev); | 172 | netif_stop_queue(dev); |
| 173 | return test_and_set_bit(nr, | 173 | return test_and_set_bit(nr, |
| 174 | (void *)&(((struct claw_privbk *) dev->priv)->tbusy)); | 174 | (void *)&(((struct claw_privbk *) dev->ml_priv)->tbusy)); |
| 175 | } | 175 | } |
| 176 | 176 | ||
| 177 | 177 | ||
| @@ -271,6 +271,7 @@ claw_probe(struct ccwgroup_device *cgdev) | |||
| 271 | if (!get_device(&cgdev->dev)) | 271 | if (!get_device(&cgdev->dev)) |
| 272 | return -ENODEV; | 272 | return -ENODEV; |
| 273 | privptr = kzalloc(sizeof(struct claw_privbk), GFP_KERNEL); | 273 | privptr = kzalloc(sizeof(struct claw_privbk), GFP_KERNEL); |
| 274 | cgdev->dev.driver_data = privptr; | ||
| 274 | if (privptr == NULL) { | 275 | if (privptr == NULL) { |
| 275 | probe_error(cgdev); | 276 | probe_error(cgdev); |
| 276 | put_device(&cgdev->dev); | 277 | put_device(&cgdev->dev); |
| @@ -305,7 +306,6 @@ claw_probe(struct ccwgroup_device *cgdev) | |||
| 305 | privptr->p_env->p_priv = privptr; | 306 | privptr->p_env->p_priv = privptr; |
| 306 | cgdev->cdev[0]->handler = claw_irq_handler; | 307 | cgdev->cdev[0]->handler = claw_irq_handler; |
| 307 | cgdev->cdev[1]->handler = claw_irq_handler; | 308 | cgdev->cdev[1]->handler = claw_irq_handler; |
| 308 | cgdev->dev.driver_data = privptr; | ||
| 309 | CLAW_DBF_TEXT(2, setup, "prbext 0"); | 309 | CLAW_DBF_TEXT(2, setup, "prbext 0"); |
| 310 | 310 | ||
| 311 | return 0; | 311 | return 0; |
| @@ -319,7 +319,7 @@ static int | |||
| 319 | claw_tx(struct sk_buff *skb, struct net_device *dev) | 319 | claw_tx(struct sk_buff *skb, struct net_device *dev) |
| 320 | { | 320 | { |
| 321 | int rc; | 321 | int rc; |
| 322 | struct claw_privbk *privptr=dev->priv; | 322 | struct claw_privbk *privptr = dev->ml_priv; |
| 323 | unsigned long saveflags; | 323 | unsigned long saveflags; |
| 324 | struct chbk *p_ch; | 324 | struct chbk *p_ch; |
| 325 | 325 | ||
| @@ -404,7 +404,7 @@ claw_pack_skb(struct claw_privbk *privptr) | |||
| 404 | static int | 404 | static int |
| 405 | claw_change_mtu(struct net_device *dev, int new_mtu) | 405 | claw_change_mtu(struct net_device *dev, int new_mtu) |
| 406 | { | 406 | { |
| 407 | struct claw_privbk *privptr=dev->priv; | 407 | struct claw_privbk *privptr = dev->ml_priv; |
| 408 | int buff_size; | 408 | int buff_size; |
| 409 | CLAW_DBF_TEXT(4, trace, "setmtu"); | 409 | CLAW_DBF_TEXT(4, trace, "setmtu"); |
| 410 | buff_size = privptr->p_env->write_size; | 410 | buff_size = privptr->p_env->write_size; |
| @@ -434,7 +434,7 @@ claw_open(struct net_device *dev) | |||
| 434 | struct ccwbk *p_buf; | 434 | struct ccwbk *p_buf; |
| 435 | 435 | ||
| 436 | CLAW_DBF_TEXT(4, trace, "open"); | 436 | CLAW_DBF_TEXT(4, trace, "open"); |
| 437 | privptr = (struct claw_privbk *)dev->priv; | 437 | privptr = (struct claw_privbk *)dev->ml_priv; |
| 438 | /* allocate and initialize CCW blocks */ | 438 | /* allocate and initialize CCW blocks */ |
| 439 | if (privptr->buffs_alloc == 0) { | 439 | if (privptr->buffs_alloc == 0) { |
| 440 | rc=init_ccw_bk(dev); | 440 | rc=init_ccw_bk(dev); |
| @@ -780,7 +780,7 @@ claw_irq_tasklet ( unsigned long data ) | |||
| 780 | p_ch = (struct chbk *) data; | 780 | p_ch = (struct chbk *) data; |
| 781 | dev = (struct net_device *)p_ch->ndev; | 781 | dev = (struct net_device *)p_ch->ndev; |
| 782 | CLAW_DBF_TEXT(4, trace, "IRQtask"); | 782 | CLAW_DBF_TEXT(4, trace, "IRQtask"); |
| 783 | privptr = (struct claw_privbk *) dev->priv; | 783 | privptr = (struct claw_privbk *)dev->ml_priv; |
| 784 | unpack_read(dev); | 784 | unpack_read(dev); |
| 785 | clear_bit(CLAW_BH_ACTIVE, (void *)&p_ch->flag_a); | 785 | clear_bit(CLAW_BH_ACTIVE, (void *)&p_ch->flag_a); |
| 786 | CLAW_DBF_TEXT(4, trace, "TskletXt"); | 786 | CLAW_DBF_TEXT(4, trace, "TskletXt"); |
| @@ -805,7 +805,7 @@ claw_release(struct net_device *dev) | |||
| 805 | 805 | ||
| 806 | if (!dev) | 806 | if (!dev) |
| 807 | return 0; | 807 | return 0; |
| 808 | privptr = (struct claw_privbk *) dev->priv; | 808 | privptr = (struct claw_privbk *)dev->ml_priv; |
| 809 | if (!privptr) | 809 | if (!privptr) |
| 810 | return 0; | 810 | return 0; |
| 811 | CLAW_DBF_TEXT(4, trace, "release"); | 811 | CLAW_DBF_TEXT(4, trace, "release"); |
| @@ -960,7 +960,7 @@ claw_write_next ( struct chbk * p_ch ) | |||
| 960 | if (p_ch->claw_state == CLAW_STOP) | 960 | if (p_ch->claw_state == CLAW_STOP) |
| 961 | return; | 961 | return; |
| 962 | dev = (struct net_device *) p_ch->ndev; | 962 | dev = (struct net_device *) p_ch->ndev; |
| 963 | privptr = (struct claw_privbk *) dev->priv; | 963 | privptr = (struct claw_privbk *) dev->ml_priv; |
| 964 | claw_free_wrt_buf( dev ); | 964 | claw_free_wrt_buf( dev ); |
| 965 | if ((privptr->write_free_count > 0) && | 965 | if ((privptr->write_free_count > 0) && |
| 966 | !skb_queue_empty(&p_ch->collect_queue)) { | 966 | !skb_queue_empty(&p_ch->collect_queue)) { |
| @@ -1042,7 +1042,7 @@ add_claw_reads(struct net_device *dev, struct ccwbk* p_first, | |||
| 1042 | struct ccw1 temp_ccw; | 1042 | struct ccw1 temp_ccw; |
| 1043 | struct endccw * p_end; | 1043 | struct endccw * p_end; |
| 1044 | CLAW_DBF_TEXT(4, trace, "addreads"); | 1044 | CLAW_DBF_TEXT(4, trace, "addreads"); |
| 1045 | privptr = dev->priv; | 1045 | privptr = dev->ml_priv; |
| 1046 | p_end = privptr->p_end_ccw; | 1046 | p_end = privptr->p_end_ccw; |
| 1047 | 1047 | ||
| 1048 | /* first CCW and last CCW contains a new set of read channel programs | 1048 | /* first CCW and last CCW contains a new set of read channel programs |
| @@ -1212,7 +1212,7 @@ find_link(struct net_device *dev, char *host_name, char *ws_name ) | |||
| 1212 | int rc=0; | 1212 | int rc=0; |
| 1213 | 1213 | ||
| 1214 | CLAW_DBF_TEXT(2, setup, "findlink"); | 1214 | CLAW_DBF_TEXT(2, setup, "findlink"); |
| 1215 | privptr=dev->priv; | 1215 | privptr = dev->ml_priv; |
| 1216 | p_env=privptr->p_env; | 1216 | p_env=privptr->p_env; |
| 1217 | switch (p_env->packing) | 1217 | switch (p_env->packing) |
| 1218 | { | 1218 | { |
| @@ -1264,7 +1264,7 @@ claw_hw_tx(struct sk_buff *skb, struct net_device *dev, long linkid) | |||
| 1264 | struct chbk *ch; | 1264 | struct chbk *ch; |
| 1265 | 1265 | ||
| 1266 | CLAW_DBF_TEXT(4, trace, "hw_tx"); | 1266 | CLAW_DBF_TEXT(4, trace, "hw_tx"); |
| 1267 | privptr = (struct claw_privbk *) (dev->priv); | 1267 | privptr = (struct claw_privbk *)(dev->ml_priv); |
| 1268 | p_ch=(struct chbk *)&privptr->channel[WRITE]; | 1268 | p_ch=(struct chbk *)&privptr->channel[WRITE]; |
| 1269 | p_env =privptr->p_env; | 1269 | p_env =privptr->p_env; |
| 1270 | claw_free_wrt_buf(dev); /* Clean up free chain if posible */ | 1270 | claw_free_wrt_buf(dev); /* Clean up free chain if posible */ |
| @@ -1483,8 +1483,8 @@ init_ccw_bk(struct net_device *dev) | |||
| 1483 | struct ccwbk*p_last_CCWB; | 1483 | struct ccwbk*p_last_CCWB; |
| 1484 | struct ccwbk*p_first_CCWB; | 1484 | struct ccwbk*p_first_CCWB; |
| 1485 | struct endccw *p_endccw=NULL; | 1485 | struct endccw *p_endccw=NULL; |
| 1486 | addr_t real_address; | 1486 | addr_t real_address; |
| 1487 | struct claw_privbk *privptr=dev->priv; | 1487 | struct claw_privbk *privptr = dev->ml_priv; |
| 1488 | struct clawh *pClawH=NULL; | 1488 | struct clawh *pClawH=NULL; |
| 1489 | addr_t real_TIC_address; | 1489 | addr_t real_TIC_address; |
| 1490 | int i,j; | 1490 | int i,j; |
| @@ -1960,19 +1960,16 @@ init_ccw_bk(struct net_device *dev) | |||
| 1960 | static void | 1960 | static void |
| 1961 | probe_error( struct ccwgroup_device *cgdev) | 1961 | probe_error( struct ccwgroup_device *cgdev) |
| 1962 | { | 1962 | { |
| 1963 | struct claw_privbk *privptr; | 1963 | struct claw_privbk *privptr; |
| 1964 | 1964 | ||
| 1965 | CLAW_DBF_TEXT(4, trace, "proberr"); | 1965 | CLAW_DBF_TEXT(4, trace, "proberr"); |
| 1966 | privptr=(struct claw_privbk *)cgdev->dev.driver_data; | 1966 | privptr = (struct claw_privbk *) cgdev->dev.driver_data; |
| 1967 | if (privptr!=NULL) { | 1967 | if (privptr != NULL) { |
| 1968 | cgdev->dev.driver_data = NULL; | ||
| 1968 | kfree(privptr->p_env); | 1969 | kfree(privptr->p_env); |
| 1969 | privptr->p_env=NULL; | 1970 | kfree(privptr->p_mtc_envelope); |
| 1970 | kfree(privptr->p_mtc_envelope); | 1971 | kfree(privptr); |
| 1971 | privptr->p_mtc_envelope=NULL; | 1972 | } |
| 1972 | kfree(privptr); | ||
| 1973 | privptr=NULL; | ||
| 1974 | } | ||
| 1975 | return; | ||
| 1976 | } /* probe_error */ | 1973 | } /* probe_error */ |
| 1977 | 1974 | ||
| 1978 | /*-------------------------------------------------------------------* | 1975 | /*-------------------------------------------------------------------* |
| @@ -2000,7 +1997,7 @@ claw_process_control( struct net_device *dev, struct ccwbk * p_ccw) | |||
| 2000 | CLAW_DBF_TEXT(2, setup, "clw_cntl"); | 1997 | CLAW_DBF_TEXT(2, setup, "clw_cntl"); |
| 2001 | udelay(1000); /* Wait a ms for the control packets to | 1998 | udelay(1000); /* Wait a ms for the control packets to |
| 2002 | *catch up to each other */ | 1999 | *catch up to each other */ |
| 2003 | privptr=dev->priv; | 2000 | privptr = dev->ml_priv; |
| 2004 | p_env=privptr->p_env; | 2001 | p_env=privptr->p_env; |
| 2005 | tdev = &privptr->channel[READ].cdev->dev; | 2002 | tdev = &privptr->channel[READ].cdev->dev; |
| 2006 | memcpy( &temp_host_name, p_env->host_name, 8); | 2003 | memcpy( &temp_host_name, p_env->host_name, 8); |
| @@ -2278,7 +2275,7 @@ claw_send_control(struct net_device *dev, __u8 type, __u8 link, | |||
| 2278 | struct sk_buff *skb; | 2275 | struct sk_buff *skb; |
| 2279 | 2276 | ||
| 2280 | CLAW_DBF_TEXT(2, setup, "sndcntl"); | 2277 | CLAW_DBF_TEXT(2, setup, "sndcntl"); |
| 2281 | privptr=dev->priv; | 2278 | privptr = dev->ml_priv; |
| 2282 | p_ctl=(struct clawctl *)&privptr->ctl_bk; | 2279 | p_ctl=(struct clawctl *)&privptr->ctl_bk; |
| 2283 | 2280 | ||
| 2284 | p_ctl->command=type; | 2281 | p_ctl->command=type; |
| @@ -2348,7 +2345,7 @@ static int | |||
| 2348 | claw_snd_conn_req(struct net_device *dev, __u8 link) | 2345 | claw_snd_conn_req(struct net_device *dev, __u8 link) |
| 2349 | { | 2346 | { |
| 2350 | int rc; | 2347 | int rc; |
| 2351 | struct claw_privbk *privptr=dev->priv; | 2348 | struct claw_privbk *privptr = dev->ml_priv; |
| 2352 | struct clawctl *p_ctl; | 2349 | struct clawctl *p_ctl; |
| 2353 | 2350 | ||
| 2354 | CLAW_DBF_TEXT(2, setup, "snd_conn"); | 2351 | CLAW_DBF_TEXT(2, setup, "snd_conn"); |
| @@ -2408,7 +2405,7 @@ claw_snd_sys_validate_rsp(struct net_device *dev, | |||
| 2408 | int rc; | 2405 | int rc; |
| 2409 | 2406 | ||
| 2410 | CLAW_DBF_TEXT(2, setup, "chkresp"); | 2407 | CLAW_DBF_TEXT(2, setup, "chkresp"); |
| 2411 | privptr = dev->priv; | 2408 | privptr = dev->ml_priv; |
| 2412 | p_env=privptr->p_env; | 2409 | p_env=privptr->p_env; |
| 2413 | rc=claw_send_control(dev, SYSTEM_VALIDATE_RESPONSE, | 2410 | rc=claw_send_control(dev, SYSTEM_VALIDATE_RESPONSE, |
| 2414 | p_ctl->linkid, | 2411 | p_ctl->linkid, |
| @@ -2446,7 +2443,7 @@ net_device_stats *claw_stats(struct net_device *dev) | |||
| 2446 | struct claw_privbk *privptr; | 2443 | struct claw_privbk *privptr; |
| 2447 | 2444 | ||
| 2448 | CLAW_DBF_TEXT(4, trace, "stats"); | 2445 | CLAW_DBF_TEXT(4, trace, "stats"); |
| 2449 | privptr = dev->priv; | 2446 | privptr = dev->ml_priv; |
| 2450 | return &privptr->stats; | 2447 | return &privptr->stats; |
| 2451 | } /* end of claw_stats */ | 2448 | } /* end of claw_stats */ |
| 2452 | 2449 | ||
| @@ -2482,7 +2479,7 @@ unpack_read(struct net_device *dev ) | |||
| 2482 | p_last_ccw=NULL; | 2479 | p_last_ccw=NULL; |
| 2483 | p_packh=NULL; | 2480 | p_packh=NULL; |
| 2484 | p_packd=NULL; | 2481 | p_packd=NULL; |
| 2485 | privptr=dev->priv; | 2482 | privptr = dev->ml_priv; |
| 2486 | 2483 | ||
| 2487 | p_dev = &privptr->channel[READ].cdev->dev; | 2484 | p_dev = &privptr->channel[READ].cdev->dev; |
| 2488 | p_env = privptr->p_env; | 2485 | p_env = privptr->p_env; |
| @@ -2651,7 +2648,7 @@ claw_strt_read (struct net_device *dev, int lock ) | |||
| 2651 | int rc = 0; | 2648 | int rc = 0; |
| 2652 | __u32 parm; | 2649 | __u32 parm; |
| 2653 | unsigned long saveflags = 0; | 2650 | unsigned long saveflags = 0; |
| 2654 | struct claw_privbk *privptr=dev->priv; | 2651 | struct claw_privbk *privptr = dev->ml_priv; |
| 2655 | struct ccwbk*p_ccwbk; | 2652 | struct ccwbk*p_ccwbk; |
| 2656 | struct chbk *p_ch; | 2653 | struct chbk *p_ch; |
| 2657 | struct clawh *p_clawh; | 2654 | struct clawh *p_clawh; |
| @@ -2708,7 +2705,7 @@ claw_strt_out_IO( struct net_device *dev ) | |||
| 2708 | if (!dev) { | 2705 | if (!dev) { |
| 2709 | return; | 2706 | return; |
| 2710 | } | 2707 | } |
| 2711 | privptr=(struct claw_privbk *)dev->priv; | 2708 | privptr = (struct claw_privbk *)dev->ml_priv; |
| 2712 | p_ch=&privptr->channel[WRITE]; | 2709 | p_ch=&privptr->channel[WRITE]; |
| 2713 | 2710 | ||
| 2714 | CLAW_DBF_TEXT(4, trace, "strt_io"); | 2711 | CLAW_DBF_TEXT(4, trace, "strt_io"); |
| @@ -2741,7 +2738,7 @@ static void | |||
| 2741 | claw_free_wrt_buf( struct net_device *dev ) | 2738 | claw_free_wrt_buf( struct net_device *dev ) |
| 2742 | { | 2739 | { |
| 2743 | 2740 | ||
| 2744 | struct claw_privbk *privptr=(struct claw_privbk *)dev->priv; | 2741 | struct claw_privbk *privptr = (struct claw_privbk *)dev->ml_priv; |
| 2745 | struct ccwbk*p_first_ccw; | 2742 | struct ccwbk*p_first_ccw; |
| 2746 | struct ccwbk*p_last_ccw; | 2743 | struct ccwbk*p_last_ccw; |
| 2747 | struct ccwbk*p_this_ccw; | 2744 | struct ccwbk*p_this_ccw; |
| @@ -2798,13 +2795,13 @@ claw_free_netdevice(struct net_device * dev, int free_dev) | |||
| 2798 | if (!dev) | 2795 | if (!dev) |
| 2799 | return; | 2796 | return; |
| 2800 | CLAW_DBF_TEXT_(2, setup, "%s", dev->name); | 2797 | CLAW_DBF_TEXT_(2, setup, "%s", dev->name); |
| 2801 | privptr = dev->priv; | 2798 | privptr = dev->ml_priv; |
| 2802 | if (dev->flags & IFF_RUNNING) | 2799 | if (dev->flags & IFF_RUNNING) |
| 2803 | claw_release(dev); | 2800 | claw_release(dev); |
| 2804 | if (privptr) { | 2801 | if (privptr) { |
| 2805 | privptr->channel[READ].ndev = NULL; /* say it's free */ | 2802 | privptr->channel[READ].ndev = NULL; /* say it's free */ |
| 2806 | } | 2803 | } |
| 2807 | dev->priv=NULL; | 2804 | dev->ml_priv = NULL; |
| 2808 | #ifdef MODULE | 2805 | #ifdef MODULE |
| 2809 | if (free_dev) { | 2806 | if (free_dev) { |
| 2810 | free_netdev(dev); | 2807 | free_netdev(dev); |
| @@ -2921,7 +2918,7 @@ claw_new_device(struct ccwgroup_device *cgdev) | |||
| 2921 | printk(KERN_WARNING "%s:alloc_netdev failed\n",__func__); | 2918 | printk(KERN_WARNING "%s:alloc_netdev failed\n",__func__); |
| 2922 | goto out; | 2919 | goto out; |
| 2923 | } | 2920 | } |
| 2924 | dev->priv = privptr; | 2921 | dev->ml_priv = privptr; |
| 2925 | cgdev->dev.driver_data = privptr; | 2922 | cgdev->dev.driver_data = privptr; |
| 2926 | cgdev->cdev[READ]->dev.driver_data = privptr; | 2923 | cgdev->cdev[READ]->dev.driver_data = privptr; |
| 2927 | cgdev->cdev[WRITE]->dev.driver_data = privptr; | 2924 | cgdev->cdev[WRITE]->dev.driver_data = privptr; |
| @@ -3002,7 +2999,7 @@ claw_shutdown_device(struct ccwgroup_device *cgdev) | |||
| 3002 | ret = claw_release(ndev); | 2999 | ret = claw_release(ndev); |
| 3003 | ndev->flags &=~IFF_RUNNING; | 3000 | ndev->flags &=~IFF_RUNNING; |
| 3004 | unregister_netdev(ndev); | 3001 | unregister_netdev(ndev); |
| 3005 | ndev->priv = NULL; /* cgdev data, not ndev's to free */ | 3002 | ndev->ml_priv = NULL; /* cgdev data, not ndev's to free */ |
| 3006 | claw_free_netdevice(ndev, 1); | 3003 | claw_free_netdevice(ndev, 1); |
| 3007 | priv->channel[READ].ndev = NULL; | 3004 | priv->channel[READ].ndev = NULL; |
| 3008 | priv->channel[WRITE].ndev = NULL; | 3005 | priv->channel[WRITE].ndev = NULL; |
diff --git a/drivers/s390/net/ctcm_fsms.c b/drivers/s390/net/ctcm_fsms.c index 0b4e6253abe4..42776550acfd 100644 --- a/drivers/s390/net/ctcm_fsms.c +++ b/drivers/s390/net/ctcm_fsms.c | |||
| @@ -245,7 +245,7 @@ static void chx_txdone(fsm_instance *fi, int event, void *arg) | |||
| 245 | { | 245 | { |
| 246 | struct channel *ch = arg; | 246 | struct channel *ch = arg; |
| 247 | struct net_device *dev = ch->netdev; | 247 | struct net_device *dev = ch->netdev; |
| 248 | struct ctcm_priv *priv = dev->priv; | 248 | struct ctcm_priv *priv = dev->ml_priv; |
| 249 | struct sk_buff *skb; | 249 | struct sk_buff *skb; |
| 250 | int first = 1; | 250 | int first = 1; |
| 251 | int i; | 251 | int i; |
| @@ -336,7 +336,7 @@ void ctcm_chx_txidle(fsm_instance *fi, int event, void *arg) | |||
| 336 | { | 336 | { |
| 337 | struct channel *ch = arg; | 337 | struct channel *ch = arg; |
| 338 | struct net_device *dev = ch->netdev; | 338 | struct net_device *dev = ch->netdev; |
| 339 | struct ctcm_priv *priv = dev->priv; | 339 | struct ctcm_priv *priv = dev->ml_priv; |
| 340 | 340 | ||
| 341 | CTCM_PR_DEBUG("%s(%s): %s\n", __func__, ch->id, dev->name); | 341 | CTCM_PR_DEBUG("%s(%s): %s\n", __func__, ch->id, dev->name); |
| 342 | 342 | ||
| @@ -357,7 +357,7 @@ static void chx_rx(fsm_instance *fi, int event, void *arg) | |||
| 357 | { | 357 | { |
| 358 | struct channel *ch = arg; | 358 | struct channel *ch = arg; |
| 359 | struct net_device *dev = ch->netdev; | 359 | struct net_device *dev = ch->netdev; |
| 360 | struct ctcm_priv *priv = dev->priv; | 360 | struct ctcm_priv *priv = dev->ml_priv; |
| 361 | int len = ch->max_bufsize - ch->irb->scsw.cmd.count; | 361 | int len = ch->max_bufsize - ch->irb->scsw.cmd.count; |
| 362 | struct sk_buff *skb = ch->trans_skb; | 362 | struct sk_buff *skb = ch->trans_skb; |
| 363 | __u16 block_len = *((__u16 *)skb->data); | 363 | __u16 block_len = *((__u16 *)skb->data); |
| @@ -459,7 +459,7 @@ static void chx_firstio(fsm_instance *fi, int event, void *arg) | |||
| 459 | chx_rxidle(fi, event, arg); | 459 | chx_rxidle(fi, event, arg); |
| 460 | } else { | 460 | } else { |
| 461 | struct net_device *dev = ch->netdev; | 461 | struct net_device *dev = ch->netdev; |
| 462 | struct ctcm_priv *priv = dev->priv; | 462 | struct ctcm_priv *priv = dev->ml_priv; |
| 463 | fsm_newstate(fi, CTC_STATE_TXIDLE); | 463 | fsm_newstate(fi, CTC_STATE_TXIDLE); |
| 464 | fsm_event(priv->fsm, DEV_EVENT_TXUP, dev); | 464 | fsm_event(priv->fsm, DEV_EVENT_TXUP, dev); |
| 465 | } | 465 | } |
| @@ -496,7 +496,7 @@ static void chx_firstio(fsm_instance *fi, int event, void *arg) | |||
| 496 | if ((CHANNEL_DIRECTION(ch->flags) == READ) && | 496 | if ((CHANNEL_DIRECTION(ch->flags) == READ) && |
| 497 | (ch->protocol == CTCM_PROTO_S390)) { | 497 | (ch->protocol == CTCM_PROTO_S390)) { |
| 498 | struct net_device *dev = ch->netdev; | 498 | struct net_device *dev = ch->netdev; |
| 499 | struct ctcm_priv *priv = dev->priv; | 499 | struct ctcm_priv *priv = dev->ml_priv; |
| 500 | fsm_event(priv->fsm, DEV_EVENT_RXUP, dev); | 500 | fsm_event(priv->fsm, DEV_EVENT_RXUP, dev); |
| 501 | } | 501 | } |
| 502 | } | 502 | } |
| @@ -514,7 +514,7 @@ static void chx_rxidle(fsm_instance *fi, int event, void *arg) | |||
| 514 | { | 514 | { |
| 515 | struct channel *ch = arg; | 515 | struct channel *ch = arg; |
| 516 | struct net_device *dev = ch->netdev; | 516 | struct net_device *dev = ch->netdev; |
| 517 | struct ctcm_priv *priv = dev->priv; | 517 | struct ctcm_priv *priv = dev->ml_priv; |
| 518 | __u16 buflen; | 518 | __u16 buflen; |
| 519 | int rc; | 519 | int rc; |
| 520 | 520 | ||
| @@ -699,7 +699,7 @@ static void ctcm_chx_cleanup(fsm_instance *fi, int state, | |||
| 699 | struct channel *ch) | 699 | struct channel *ch) |
| 700 | { | 700 | { |
| 701 | struct net_device *dev = ch->netdev; | 701 | struct net_device *dev = ch->netdev; |
| 702 | struct ctcm_priv *priv = dev->priv; | 702 | struct ctcm_priv *priv = dev->ml_priv; |
| 703 | 703 | ||
| 704 | CTCM_DBF_TEXT_(SETUP, CTC_DBF_NOTICE, | 704 | CTCM_DBF_TEXT_(SETUP, CTC_DBF_NOTICE, |
| 705 | "%s(%s): %s[%d]\n", | 705 | "%s(%s): %s[%d]\n", |
| @@ -784,7 +784,7 @@ static void ctcm_chx_setuperr(fsm_instance *fi, int event, void *arg) | |||
| 784 | { | 784 | { |
| 785 | struct channel *ch = arg; | 785 | struct channel *ch = arg; |
| 786 | struct net_device *dev = ch->netdev; | 786 | struct net_device *dev = ch->netdev; |
| 787 | struct ctcm_priv *priv = dev->priv; | 787 | struct ctcm_priv *priv = dev->ml_priv; |
| 788 | 788 | ||
| 789 | /* | 789 | /* |
| 790 | * Special case: Got UC_RCRESET on setmode. | 790 | * Special case: Got UC_RCRESET on setmode. |
| @@ -874,7 +874,7 @@ static void ctcm_chx_rxiniterr(fsm_instance *fi, int event, void *arg) | |||
| 874 | { | 874 | { |
| 875 | struct channel *ch = arg; | 875 | struct channel *ch = arg; |
| 876 | struct net_device *dev = ch->netdev; | 876 | struct net_device *dev = ch->netdev; |
| 877 | struct ctcm_priv *priv = dev->priv; | 877 | struct ctcm_priv *priv = dev->ml_priv; |
| 878 | 878 | ||
| 879 | if (event == CTC_EVENT_TIMER) { | 879 | if (event == CTC_EVENT_TIMER) { |
| 880 | if (!IS_MPCDEV(dev)) | 880 | if (!IS_MPCDEV(dev)) |
| @@ -902,7 +902,7 @@ static void ctcm_chx_rxinitfail(fsm_instance *fi, int event, void *arg) | |||
| 902 | { | 902 | { |
| 903 | struct channel *ch = arg; | 903 | struct channel *ch = arg; |
| 904 | struct net_device *dev = ch->netdev; | 904 | struct net_device *dev = ch->netdev; |
| 905 | struct ctcm_priv *priv = dev->priv; | 905 | struct ctcm_priv *priv = dev->ml_priv; |
| 906 | 906 | ||
| 907 | CTCM_DBF_TEXT_(ERROR, CTC_DBF_ERROR, | 907 | CTCM_DBF_TEXT_(ERROR, CTC_DBF_ERROR, |
| 908 | "%s(%s): RX %s busy, init. fail", | 908 | "%s(%s): RX %s busy, init. fail", |
| @@ -923,7 +923,7 @@ static void ctcm_chx_rxdisc(fsm_instance *fi, int event, void *arg) | |||
| 923 | struct channel *ch = arg; | 923 | struct channel *ch = arg; |
| 924 | struct channel *ch2; | 924 | struct channel *ch2; |
| 925 | struct net_device *dev = ch->netdev; | 925 | struct net_device *dev = ch->netdev; |
| 926 | struct ctcm_priv *priv = dev->priv; | 926 | struct ctcm_priv *priv = dev->ml_priv; |
| 927 | 927 | ||
| 928 | CTCM_DBF_TEXT_(TRACE, CTC_DBF_NOTICE, | 928 | CTCM_DBF_TEXT_(TRACE, CTC_DBF_NOTICE, |
| 929 | "%s: %s: remote disconnect - re-init ...", | 929 | "%s: %s: remote disconnect - re-init ...", |
| @@ -954,7 +954,7 @@ static void ctcm_chx_txiniterr(fsm_instance *fi, int event, void *arg) | |||
| 954 | { | 954 | { |
| 955 | struct channel *ch = arg; | 955 | struct channel *ch = arg; |
| 956 | struct net_device *dev = ch->netdev; | 956 | struct net_device *dev = ch->netdev; |
| 957 | struct ctcm_priv *priv = dev->priv; | 957 | struct ctcm_priv *priv = dev->ml_priv; |
| 958 | 958 | ||
| 959 | if (event == CTC_EVENT_TIMER) { | 959 | if (event == CTC_EVENT_TIMER) { |
| 960 | fsm_deltimer(&ch->timer); | 960 | fsm_deltimer(&ch->timer); |
| @@ -984,7 +984,7 @@ static void ctcm_chx_txretry(fsm_instance *fi, int event, void *arg) | |||
| 984 | { | 984 | { |
| 985 | struct channel *ch = arg; | 985 | struct channel *ch = arg; |
| 986 | struct net_device *dev = ch->netdev; | 986 | struct net_device *dev = ch->netdev; |
| 987 | struct ctcm_priv *priv = dev->priv; | 987 | struct ctcm_priv *priv = dev->ml_priv; |
| 988 | struct sk_buff *skb; | 988 | struct sk_buff *skb; |
| 989 | 989 | ||
| 990 | CTCM_PR_DEBUG("Enter: %s: cp=%i ch=0x%p id=%s\n", | 990 | CTCM_PR_DEBUG("Enter: %s: cp=%i ch=0x%p id=%s\n", |
| @@ -1057,7 +1057,7 @@ static void ctcm_chx_iofatal(fsm_instance *fi, int event, void *arg) | |||
| 1057 | { | 1057 | { |
| 1058 | struct channel *ch = arg; | 1058 | struct channel *ch = arg; |
| 1059 | struct net_device *dev = ch->netdev; | 1059 | struct net_device *dev = ch->netdev; |
| 1060 | struct ctcm_priv *priv = dev->priv; | 1060 | struct ctcm_priv *priv = dev->ml_priv; |
| 1061 | int rd = CHANNEL_DIRECTION(ch->flags); | 1061 | int rd = CHANNEL_DIRECTION(ch->flags); |
| 1062 | 1062 | ||
| 1063 | fsm_deltimer(&ch->timer); | 1063 | fsm_deltimer(&ch->timer); |
| @@ -1207,7 +1207,7 @@ static void ctcmpc_chx_txdone(fsm_instance *fi, int event, void *arg) | |||
| 1207 | { | 1207 | { |
| 1208 | struct channel *ch = arg; | 1208 | struct channel *ch = arg; |
| 1209 | struct net_device *dev = ch->netdev; | 1209 | struct net_device *dev = ch->netdev; |
| 1210 | struct ctcm_priv *priv = dev->priv; | 1210 | struct ctcm_priv *priv = dev->ml_priv; |
| 1211 | struct mpc_group *grp = priv->mpcg; | 1211 | struct mpc_group *grp = priv->mpcg; |
| 1212 | struct sk_buff *skb; | 1212 | struct sk_buff *skb; |
| 1213 | int first = 1; | 1213 | int first = 1; |
| @@ -1368,7 +1368,7 @@ static void ctcmpc_chx_rx(fsm_instance *fi, int event, void *arg) | |||
| 1368 | { | 1368 | { |
| 1369 | struct channel *ch = arg; | 1369 | struct channel *ch = arg; |
| 1370 | struct net_device *dev = ch->netdev; | 1370 | struct net_device *dev = ch->netdev; |
| 1371 | struct ctcm_priv *priv = dev->priv; | 1371 | struct ctcm_priv *priv = dev->ml_priv; |
| 1372 | struct mpc_group *grp = priv->mpcg; | 1372 | struct mpc_group *grp = priv->mpcg; |
| 1373 | struct sk_buff *skb = ch->trans_skb; | 1373 | struct sk_buff *skb = ch->trans_skb; |
| 1374 | struct sk_buff *new_skb; | 1374 | struct sk_buff *new_skb; |
| @@ -1471,7 +1471,7 @@ static void ctcmpc_chx_firstio(fsm_instance *fi, int event, void *arg) | |||
| 1471 | { | 1471 | { |
| 1472 | struct channel *ch = arg; | 1472 | struct channel *ch = arg; |
| 1473 | struct net_device *dev = ch->netdev; | 1473 | struct net_device *dev = ch->netdev; |
| 1474 | struct ctcm_priv *priv = dev->priv; | 1474 | struct ctcm_priv *priv = dev->ml_priv; |
| 1475 | struct mpc_group *gptr = priv->mpcg; | 1475 | struct mpc_group *gptr = priv->mpcg; |
| 1476 | 1476 | ||
| 1477 | CTCM_PR_DEBUG("Enter %s: id=%s, ch=0x%p\n", | 1477 | CTCM_PR_DEBUG("Enter %s: id=%s, ch=0x%p\n", |
| @@ -1525,7 +1525,7 @@ void ctcmpc_chx_rxidle(fsm_instance *fi, int event, void *arg) | |||
| 1525 | { | 1525 | { |
| 1526 | struct channel *ch = arg; | 1526 | struct channel *ch = arg; |
| 1527 | struct net_device *dev = ch->netdev; | 1527 | struct net_device *dev = ch->netdev; |
| 1528 | struct ctcm_priv *priv = dev->priv; | 1528 | struct ctcm_priv *priv = dev->ml_priv; |
| 1529 | struct mpc_group *grp = priv->mpcg; | 1529 | struct mpc_group *grp = priv->mpcg; |
| 1530 | int rc; | 1530 | int rc; |
| 1531 | unsigned long saveflags = 0; /* avoids compiler warning */ | 1531 | unsigned long saveflags = 0; /* avoids compiler warning */ |
| @@ -1580,7 +1580,7 @@ static void ctcmpc_chx_attn(fsm_instance *fsm, int event, void *arg) | |||
| 1580 | { | 1580 | { |
| 1581 | struct channel *ch = arg; | 1581 | struct channel *ch = arg; |
| 1582 | struct net_device *dev = ch->netdev; | 1582 | struct net_device *dev = ch->netdev; |
| 1583 | struct ctcm_priv *priv = dev->priv; | 1583 | struct ctcm_priv *priv = dev->ml_priv; |
| 1584 | struct mpc_group *grp = priv->mpcg; | 1584 | struct mpc_group *grp = priv->mpcg; |
| 1585 | 1585 | ||
| 1586 | CTCM_PR_DEBUG("%s(%s): %s(ch=0x%p), cp=%i, ChStat:%s, GrpStat:%s\n", | 1586 | CTCM_PR_DEBUG("%s(%s): %s(ch=0x%p), cp=%i, ChStat:%s, GrpStat:%s\n", |
| @@ -1639,7 +1639,7 @@ static void ctcmpc_chx_attnbusy(fsm_instance *fsm, int event, void *arg) | |||
| 1639 | { | 1639 | { |
| 1640 | struct channel *ch = arg; | 1640 | struct channel *ch = arg; |
| 1641 | struct net_device *dev = ch->netdev; | 1641 | struct net_device *dev = ch->netdev; |
| 1642 | struct ctcm_priv *priv = dev->priv; | 1642 | struct ctcm_priv *priv = dev->ml_priv; |
| 1643 | struct mpc_group *grp = priv->mpcg; | 1643 | struct mpc_group *grp = priv->mpcg; |
| 1644 | 1644 | ||
| 1645 | CTCM_PR_DEBUG("%s(%s): %s\n ChState:%s GrpState:%s\n", | 1645 | CTCM_PR_DEBUG("%s(%s): %s\n ChState:%s GrpState:%s\n", |
| @@ -1724,7 +1724,7 @@ static void ctcmpc_chx_resend(fsm_instance *fsm, int event, void *arg) | |||
| 1724 | { | 1724 | { |
| 1725 | struct channel *ch = arg; | 1725 | struct channel *ch = arg; |
| 1726 | struct net_device *dev = ch->netdev; | 1726 | struct net_device *dev = ch->netdev; |
| 1727 | struct ctcm_priv *priv = dev->priv; | 1727 | struct ctcm_priv *priv = dev->ml_priv; |
| 1728 | struct mpc_group *grp = priv->mpcg; | 1728 | struct mpc_group *grp = priv->mpcg; |
| 1729 | 1729 | ||
| 1730 | fsm_event(grp->fsm, MPCG_EVENT_XID0DO, ch); | 1730 | fsm_event(grp->fsm, MPCG_EVENT_XID0DO, ch); |
| @@ -1740,7 +1740,7 @@ static void ctcmpc_chx_send_sweep(fsm_instance *fsm, int event, void *arg) | |||
| 1740 | { | 1740 | { |
| 1741 | struct channel *ach = arg; | 1741 | struct channel *ach = arg; |
| 1742 | struct net_device *dev = ach->netdev; | 1742 | struct net_device *dev = ach->netdev; |
| 1743 | struct ctcm_priv *priv = dev->priv; | 1743 | struct ctcm_priv *priv = dev->ml_priv; |
| 1744 | struct mpc_group *grp = priv->mpcg; | 1744 | struct mpc_group *grp = priv->mpcg; |
| 1745 | struct channel *wch = priv->channel[WRITE]; | 1745 | struct channel *wch = priv->channel[WRITE]; |
| 1746 | struct channel *rch = priv->channel[READ]; | 1746 | struct channel *rch = priv->channel[READ]; |
| @@ -2050,7 +2050,7 @@ int mpc_ch_fsm_len = ARRAY_SIZE(ctcmpc_ch_fsm); | |||
| 2050 | static void dev_action_start(fsm_instance *fi, int event, void *arg) | 2050 | static void dev_action_start(fsm_instance *fi, int event, void *arg) |
| 2051 | { | 2051 | { |
| 2052 | struct net_device *dev = arg; | 2052 | struct net_device *dev = arg; |
| 2053 | struct ctcm_priv *priv = dev->priv; | 2053 | struct ctcm_priv *priv = dev->ml_priv; |
| 2054 | int direction; | 2054 | int direction; |
| 2055 | 2055 | ||
| 2056 | CTCMY_DBF_DEV_NAME(SETUP, dev, ""); | 2056 | CTCMY_DBF_DEV_NAME(SETUP, dev, ""); |
| @@ -2076,7 +2076,7 @@ static void dev_action_stop(fsm_instance *fi, int event, void *arg) | |||
| 2076 | { | 2076 | { |
| 2077 | int direction; | 2077 | int direction; |
| 2078 | struct net_device *dev = arg; | 2078 | struct net_device *dev = arg; |
| 2079 | struct ctcm_priv *priv = dev->priv; | 2079 | struct ctcm_priv *priv = dev->ml_priv; |
| 2080 | 2080 | ||
| 2081 | CTCMY_DBF_DEV_NAME(SETUP, dev, ""); | 2081 | CTCMY_DBF_DEV_NAME(SETUP, dev, ""); |
| 2082 | 2082 | ||
| @@ -2096,7 +2096,7 @@ static void dev_action_restart(fsm_instance *fi, int event, void *arg) | |||
| 2096 | { | 2096 | { |
| 2097 | int restart_timer; | 2097 | int restart_timer; |
| 2098 | struct net_device *dev = arg; | 2098 | struct net_device *dev = arg; |
| 2099 | struct ctcm_priv *priv = dev->priv; | 2099 | struct ctcm_priv *priv = dev->ml_priv; |
| 2100 | 2100 | ||
| 2101 | CTCMY_DBF_DEV_NAME(TRACE, dev, ""); | 2101 | CTCMY_DBF_DEV_NAME(TRACE, dev, ""); |
| 2102 | 2102 | ||
| @@ -2133,12 +2133,12 @@ static void dev_action_restart(fsm_instance *fi, int event, void *arg) | |||
| 2133 | static void dev_action_chup(fsm_instance *fi, int event, void *arg) | 2133 | static void dev_action_chup(fsm_instance *fi, int event, void *arg) |
| 2134 | { | 2134 | { |
| 2135 | struct net_device *dev = arg; | 2135 | struct net_device *dev = arg; |
| 2136 | struct ctcm_priv *priv = dev->priv; | 2136 | struct ctcm_priv *priv = dev->ml_priv; |
| 2137 | int dev_stat = fsm_getstate(fi); | 2137 | int dev_stat = fsm_getstate(fi); |
| 2138 | 2138 | ||
| 2139 | CTCM_DBF_TEXT_(SETUP, CTC_DBF_NOTICE, | 2139 | CTCM_DBF_TEXT_(SETUP, CTC_DBF_NOTICE, |
| 2140 | "%s(%s): priv = %p [%d,%d]\n ", CTCM_FUNTAIL, | 2140 | "%s(%s): priv = %p [%d,%d]\n ", CTCM_FUNTAIL, |
| 2141 | dev->name, dev->priv, dev_stat, event); | 2141 | dev->name, dev->ml_priv, dev_stat, event); |
| 2142 | 2142 | ||
| 2143 | switch (fsm_getstate(fi)) { | 2143 | switch (fsm_getstate(fi)) { |
| 2144 | case DEV_STATE_STARTWAIT_RXTX: | 2144 | case DEV_STATE_STARTWAIT_RXTX: |
| @@ -2195,7 +2195,7 @@ static void dev_action_chdown(fsm_instance *fi, int event, void *arg) | |||
| 2195 | { | 2195 | { |
| 2196 | 2196 | ||
| 2197 | struct net_device *dev = arg; | 2197 | struct net_device *dev = arg; |
| 2198 | struct ctcm_priv *priv = dev->priv; | 2198 | struct ctcm_priv *priv = dev->ml_priv; |
| 2199 | 2199 | ||
| 2200 | CTCMY_DBF_DEV_NAME(SETUP, dev, ""); | 2200 | CTCMY_DBF_DEV_NAME(SETUP, dev, ""); |
| 2201 | 2201 | ||
diff --git a/drivers/s390/net/ctcm_main.c b/drivers/s390/net/ctcm_main.c index 126a3ebb8ab2..b11fec24c7d2 100644 --- a/drivers/s390/net/ctcm_main.c +++ b/drivers/s390/net/ctcm_main.c | |||
| @@ -69,7 +69,7 @@ struct channel *channels; | |||
| 69 | void ctcm_unpack_skb(struct channel *ch, struct sk_buff *pskb) | 69 | void ctcm_unpack_skb(struct channel *ch, struct sk_buff *pskb) |
| 70 | { | 70 | { |
| 71 | struct net_device *dev = ch->netdev; | 71 | struct net_device *dev = ch->netdev; |
| 72 | struct ctcm_priv *priv = dev->priv; | 72 | struct ctcm_priv *priv = dev->ml_priv; |
| 73 | __u16 len = *((__u16 *) pskb->data); | 73 | __u16 len = *((__u16 *) pskb->data); |
| 74 | 74 | ||
| 75 | skb_put(pskb, 2 + LL_HEADER_LENGTH); | 75 | skb_put(pskb, 2 + LL_HEADER_LENGTH); |
| @@ -414,7 +414,7 @@ int ctcm_ch_alloc_buffer(struct channel *ch) | |||
| 414 | */ | 414 | */ |
| 415 | int ctcm_open(struct net_device *dev) | 415 | int ctcm_open(struct net_device *dev) |
| 416 | { | 416 | { |
| 417 | struct ctcm_priv *priv = dev->priv; | 417 | struct ctcm_priv *priv = dev->ml_priv; |
| 418 | 418 | ||
| 419 | CTCMY_DBF_DEV_NAME(SETUP, dev, ""); | 419 | CTCMY_DBF_DEV_NAME(SETUP, dev, ""); |
| 420 | if (!IS_MPC(priv)) | 420 | if (!IS_MPC(priv)) |
| @@ -432,7 +432,7 @@ int ctcm_open(struct net_device *dev) | |||
| 432 | */ | 432 | */ |
| 433 | int ctcm_close(struct net_device *dev) | 433 | int ctcm_close(struct net_device *dev) |
| 434 | { | 434 | { |
| 435 | struct ctcm_priv *priv = dev->priv; | 435 | struct ctcm_priv *priv = dev->ml_priv; |
| 436 | 436 | ||
| 437 | CTCMY_DBF_DEV_NAME(SETUP, dev, ""); | 437 | CTCMY_DBF_DEV_NAME(SETUP, dev, ""); |
| 438 | if (!IS_MPC(priv)) | 438 | if (!IS_MPC(priv)) |
| @@ -573,7 +573,7 @@ static int ctcm_transmit_skb(struct channel *ch, struct sk_buff *skb) | |||
| 573 | skb_pull(skb, LL_HEADER_LENGTH + 2); | 573 | skb_pull(skb, LL_HEADER_LENGTH + 2); |
| 574 | } else if (ccw_idx == 0) { | 574 | } else if (ccw_idx == 0) { |
| 575 | struct net_device *dev = ch->netdev; | 575 | struct net_device *dev = ch->netdev; |
| 576 | struct ctcm_priv *priv = dev->priv; | 576 | struct ctcm_priv *priv = dev->ml_priv; |
| 577 | priv->stats.tx_packets++; | 577 | priv->stats.tx_packets++; |
| 578 | priv->stats.tx_bytes += skb->len - LL_HEADER_LENGTH; | 578 | priv->stats.tx_bytes += skb->len - LL_HEADER_LENGTH; |
| 579 | } | 579 | } |
| @@ -592,7 +592,7 @@ static void ctcmpc_send_sweep_req(struct channel *rch) | |||
| 592 | struct channel *ch; | 592 | struct channel *ch; |
| 593 | /* int rc = 0; */ | 593 | /* int rc = 0; */ |
| 594 | 594 | ||
| 595 | priv = dev->priv; | 595 | priv = dev->ml_priv; |
| 596 | grp = priv->mpcg; | 596 | grp = priv->mpcg; |
| 597 | ch = priv->channel[WRITE]; | 597 | ch = priv->channel[WRITE]; |
| 598 | 598 | ||
| @@ -652,7 +652,7 @@ static int ctcmpc_transmit_skb(struct channel *ch, struct sk_buff *skb) | |||
| 652 | { | 652 | { |
| 653 | struct pdu *p_header; | 653 | struct pdu *p_header; |
| 654 | struct net_device *dev = ch->netdev; | 654 | struct net_device *dev = ch->netdev; |
| 655 | struct ctcm_priv *priv = dev->priv; | 655 | struct ctcm_priv *priv = dev->ml_priv; |
| 656 | struct mpc_group *grp = priv->mpcg; | 656 | struct mpc_group *grp = priv->mpcg; |
| 657 | struct th_header *header; | 657 | struct th_header *header; |
| 658 | struct sk_buff *nskb; | 658 | struct sk_buff *nskb; |
| @@ -867,7 +867,7 @@ done: | |||
| 867 | /* first merge version - leaving both functions separated */ | 867 | /* first merge version - leaving both functions separated */ |
| 868 | static int ctcm_tx(struct sk_buff *skb, struct net_device *dev) | 868 | static int ctcm_tx(struct sk_buff *skb, struct net_device *dev) |
| 869 | { | 869 | { |
| 870 | struct ctcm_priv *priv = dev->priv; | 870 | struct ctcm_priv *priv = dev->ml_priv; |
| 871 | 871 | ||
| 872 | if (skb == NULL) { | 872 | if (skb == NULL) { |
| 873 | CTCM_DBF_TEXT_(ERROR, CTC_DBF_ERROR, | 873 | CTCM_DBF_TEXT_(ERROR, CTC_DBF_ERROR, |
| @@ -911,7 +911,7 @@ static int ctcm_tx(struct sk_buff *skb, struct net_device *dev) | |||
| 911 | static int ctcmpc_tx(struct sk_buff *skb, struct net_device *dev) | 911 | static int ctcmpc_tx(struct sk_buff *skb, struct net_device *dev) |
| 912 | { | 912 | { |
| 913 | int len = 0; | 913 | int len = 0; |
| 914 | struct ctcm_priv *priv = dev->priv; | 914 | struct ctcm_priv *priv = dev->ml_priv; |
| 915 | struct mpc_group *grp = priv->mpcg; | 915 | struct mpc_group *grp = priv->mpcg; |
| 916 | struct sk_buff *newskb = NULL; | 916 | struct sk_buff *newskb = NULL; |
| 917 | 917 | ||
| @@ -1025,7 +1025,7 @@ static int ctcm_change_mtu(struct net_device *dev, int new_mtu) | |||
| 1025 | if (new_mtu < 576 || new_mtu > 65527) | 1025 | if (new_mtu < 576 || new_mtu > 65527) |
| 1026 | return -EINVAL; | 1026 | return -EINVAL; |
| 1027 | 1027 | ||
| 1028 | priv = dev->priv; | 1028 | priv = dev->ml_priv; |
| 1029 | max_bufsize = priv->channel[READ]->max_bufsize; | 1029 | max_bufsize = priv->channel[READ]->max_bufsize; |
| 1030 | 1030 | ||
| 1031 | if (IS_MPC(priv)) { | 1031 | if (IS_MPC(priv)) { |
| @@ -1050,7 +1050,7 @@ static int ctcm_change_mtu(struct net_device *dev, int new_mtu) | |||
| 1050 | */ | 1050 | */ |
| 1051 | static struct net_device_stats *ctcm_stats(struct net_device *dev) | 1051 | static struct net_device_stats *ctcm_stats(struct net_device *dev) |
| 1052 | { | 1052 | { |
| 1053 | return &((struct ctcm_priv *)dev->priv)->stats; | 1053 | return &((struct ctcm_priv *)dev->ml_priv)->stats; |
| 1054 | } | 1054 | } |
| 1055 | 1055 | ||
| 1056 | static void ctcm_free_netdevice(struct net_device *dev) | 1056 | static void ctcm_free_netdevice(struct net_device *dev) |
| @@ -1060,7 +1060,7 @@ static void ctcm_free_netdevice(struct net_device *dev) | |||
| 1060 | 1060 | ||
| 1061 | CTCM_DBF_TEXT_(SETUP, CTC_DBF_INFO, | 1061 | CTCM_DBF_TEXT_(SETUP, CTC_DBF_INFO, |
| 1062 | "%s(%s)", CTCM_FUNTAIL, dev->name); | 1062 | "%s(%s)", CTCM_FUNTAIL, dev->name); |
| 1063 | priv = dev->priv; | 1063 | priv = dev->ml_priv; |
| 1064 | if (priv) { | 1064 | if (priv) { |
| 1065 | grp = priv->mpcg; | 1065 | grp = priv->mpcg; |
| 1066 | if (grp) { | 1066 | if (grp) { |
| @@ -1125,7 +1125,7 @@ static struct net_device *ctcm_init_netdevice(struct ctcm_priv *priv) | |||
| 1125 | CTCM_FUNTAIL); | 1125 | CTCM_FUNTAIL); |
| 1126 | return NULL; | 1126 | return NULL; |
| 1127 | } | 1127 | } |
| 1128 | dev->priv = priv; | 1128 | dev->ml_priv = priv; |
| 1129 | priv->fsm = init_fsm("ctcmdev", dev_state_names, dev_event_names, | 1129 | priv->fsm = init_fsm("ctcmdev", dev_state_names, dev_event_names, |
| 1130 | CTCM_NR_DEV_STATES, CTCM_NR_DEV_EVENTS, | 1130 | CTCM_NR_DEV_STATES, CTCM_NR_DEV_EVENTS, |
| 1131 | dev_fsm, dev_fsm_len, GFP_KERNEL); | 1131 | dev_fsm, dev_fsm_len, GFP_KERNEL); |
diff --git a/drivers/s390/net/ctcm_main.h b/drivers/s390/net/ctcm_main.h index a72e0feeb27f..8e10ee86a5ee 100644 --- a/drivers/s390/net/ctcm_main.h +++ b/drivers/s390/net/ctcm_main.h | |||
| @@ -229,14 +229,14 @@ void ctcm_remove_files(struct device *dev); | |||
| 229 | */ | 229 | */ |
| 230 | static inline void ctcm_clear_busy_do(struct net_device *dev) | 230 | static inline void ctcm_clear_busy_do(struct net_device *dev) |
| 231 | { | 231 | { |
| 232 | clear_bit(0, &(((struct ctcm_priv *)dev->priv)->tbusy)); | 232 | clear_bit(0, &(((struct ctcm_priv *)dev->ml_priv)->tbusy)); |
| 233 | netif_wake_queue(dev); | 233 | netif_wake_queue(dev); |
| 234 | } | 234 | } |
| 235 | 235 | ||
| 236 | static inline void ctcm_clear_busy(struct net_device *dev) | 236 | static inline void ctcm_clear_busy(struct net_device *dev) |
| 237 | { | 237 | { |
| 238 | struct mpc_group *grp; | 238 | struct mpc_group *grp; |
| 239 | grp = ((struct ctcm_priv *)dev->priv)->mpcg; | 239 | grp = ((struct ctcm_priv *)dev->ml_priv)->mpcg; |
| 240 | 240 | ||
| 241 | if (!(grp && grp->in_sweep)) | 241 | if (!(grp && grp->in_sweep)) |
| 242 | ctcm_clear_busy_do(dev); | 242 | ctcm_clear_busy_do(dev); |
| @@ -246,7 +246,8 @@ static inline void ctcm_clear_busy(struct net_device *dev) | |||
| 246 | static inline int ctcm_test_and_set_busy(struct net_device *dev) | 246 | static inline int ctcm_test_and_set_busy(struct net_device *dev) |
| 247 | { | 247 | { |
| 248 | netif_stop_queue(dev); | 248 | netif_stop_queue(dev); |
| 249 | return test_and_set_bit(0, &(((struct ctcm_priv *)dev->priv)->tbusy)); | 249 | return test_and_set_bit(0, |
| 250 | &(((struct ctcm_priv *)dev->ml_priv)->tbusy)); | ||
| 250 | } | 251 | } |
| 251 | 252 | ||
| 252 | extern int loglevel; | 253 | extern int loglevel; |
| @@ -292,7 +293,7 @@ struct mpc_group *ctcmpc_init_mpc_group(struct ctcm_priv *priv); | |||
| 292 | #define IS_MPC(p) ((p)->protocol == CTCM_PROTO_MPC) | 293 | #define IS_MPC(p) ((p)->protocol == CTCM_PROTO_MPC) |
| 293 | 294 | ||
| 294 | /* test if struct ctcm_priv of struct net_device has MPC protocol setting */ | 295 | /* test if struct ctcm_priv of struct net_device has MPC protocol setting */ |
| 295 | #define IS_MPCDEV(d) IS_MPC((struct ctcm_priv *)d->priv) | 296 | #define IS_MPCDEV(dev) IS_MPC((struct ctcm_priv *)dev->ml_priv) |
| 296 | 297 | ||
| 297 | static inline gfp_t gfp_type(void) | 298 | static inline gfp_t gfp_type(void) |
| 298 | { | 299 | { |
diff --git a/drivers/s390/net/ctcm_mpc.c b/drivers/s390/net/ctcm_mpc.c index 49ae1cd25caa..cbe470493bf0 100644 --- a/drivers/s390/net/ctcm_mpc.c +++ b/drivers/s390/net/ctcm_mpc.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #undef DEBUGDATA | 19 | #undef DEBUGDATA |
| 20 | #undef DEBUGCCW | 20 | #undef DEBUGCCW |
| 21 | 21 | ||
| 22 | #include <linux/version.h> | ||
| 23 | #include <linux/module.h> | 22 | #include <linux/module.h> |
| 24 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 25 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
| @@ -313,10 +312,10 @@ static struct net_device *ctcmpc_get_dev(int port_num) | |||
| 313 | CTCM_FUNTAIL, device); | 312 | CTCM_FUNTAIL, device); |
| 314 | return NULL; | 313 | return NULL; |
| 315 | } | 314 | } |
| 316 | priv = dev->priv; | 315 | priv = dev->ml_priv; |
| 317 | if (priv == NULL) { | 316 | if (priv == NULL) { |
| 318 | CTCM_DBF_TEXT_(MPC_ERROR, CTC_DBF_ERROR, | 317 | CTCM_DBF_TEXT_(MPC_ERROR, CTC_DBF_ERROR, |
| 319 | "%s(%s): dev->priv is NULL", | 318 | "%s(%s): dev->ml_priv is NULL", |
| 320 | CTCM_FUNTAIL, device); | 319 | CTCM_FUNTAIL, device); |
| 321 | return NULL; | 320 | return NULL; |
| 322 | } | 321 | } |
| @@ -345,7 +344,7 @@ int ctc_mpc_alloc_channel(int port_num, void (*callback)(int, int)) | |||
| 345 | dev = ctcmpc_get_dev(port_num); | 344 | dev = ctcmpc_get_dev(port_num); |
| 346 | if (dev == NULL) | 345 | if (dev == NULL) |
| 347 | return 1; | 346 | return 1; |
| 348 | priv = dev->priv; | 347 | priv = dev->ml_priv; |
| 349 | grp = priv->mpcg; | 348 | grp = priv->mpcg; |
| 350 | 349 | ||
| 351 | grp->allochanfunc = callback; | 350 | grp->allochanfunc = callback; |
| @@ -417,7 +416,7 @@ void ctc_mpc_establish_connectivity(int port_num, | |||
| 417 | dev = ctcmpc_get_dev(port_num); | 416 | dev = ctcmpc_get_dev(port_num); |
| 418 | if (dev == NULL) | 417 | if (dev == NULL) |
| 419 | return; | 418 | return; |
| 420 | priv = dev->priv; | 419 | priv = dev->ml_priv; |
| 421 | grp = priv->mpcg; | 420 | grp = priv->mpcg; |
| 422 | rch = priv->channel[READ]; | 421 | rch = priv->channel[READ]; |
| 423 | wch = priv->channel[WRITE]; | 422 | wch = priv->channel[WRITE]; |
| @@ -535,7 +534,7 @@ void ctc_mpc_dealloc_ch(int port_num) | |||
| 535 | dev = ctcmpc_get_dev(port_num); | 534 | dev = ctcmpc_get_dev(port_num); |
| 536 | if (dev == NULL) | 535 | if (dev == NULL) |
| 537 | return; | 536 | return; |
| 538 | priv = dev->priv; | 537 | priv = dev->ml_priv; |
| 539 | grp = priv->mpcg; | 538 | grp = priv->mpcg; |
| 540 | 539 | ||
| 541 | CTCM_DBF_TEXT_(MPC_SETUP, CTC_DBF_DEBUG, | 540 | CTCM_DBF_TEXT_(MPC_SETUP, CTC_DBF_DEBUG, |
| @@ -571,7 +570,7 @@ void ctc_mpc_flow_control(int port_num, int flowc) | |||
| 571 | dev = ctcmpc_get_dev(port_num); | 570 | dev = ctcmpc_get_dev(port_num); |
| 572 | if (dev == NULL) | 571 | if (dev == NULL) |
| 573 | return; | 572 | return; |
| 574 | priv = dev->priv; | 573 | priv = dev->ml_priv; |
| 575 | grp = priv->mpcg; | 574 | grp = priv->mpcg; |
| 576 | 575 | ||
| 577 | CTCM_DBF_TEXT_(MPC_TRACE, CTC_DBF_DEBUG, | 576 | CTCM_DBF_TEXT_(MPC_TRACE, CTC_DBF_DEBUG, |
| @@ -620,7 +619,7 @@ static void mpc_rcvd_sweep_resp(struct mpcg_info *mpcginfo) | |||
| 620 | { | 619 | { |
| 621 | struct channel *rch = mpcginfo->ch; | 620 | struct channel *rch = mpcginfo->ch; |
| 622 | struct net_device *dev = rch->netdev; | 621 | struct net_device *dev = rch->netdev; |
| 623 | struct ctcm_priv *priv = dev->priv; | 622 | struct ctcm_priv *priv = dev->ml_priv; |
| 624 | struct mpc_group *grp = priv->mpcg; | 623 | struct mpc_group *grp = priv->mpcg; |
| 625 | struct channel *ch = priv->channel[WRITE]; | 624 | struct channel *ch = priv->channel[WRITE]; |
| 626 | 625 | ||
| @@ -651,7 +650,7 @@ static void mpc_rcvd_sweep_resp(struct mpcg_info *mpcginfo) | |||
| 651 | static void ctcmpc_send_sweep_resp(struct channel *rch) | 650 | static void ctcmpc_send_sweep_resp(struct channel *rch) |
| 652 | { | 651 | { |
| 653 | struct net_device *dev = rch->netdev; | 652 | struct net_device *dev = rch->netdev; |
| 654 | struct ctcm_priv *priv = dev->priv; | 653 | struct ctcm_priv *priv = dev->ml_priv; |
| 655 | struct mpc_group *grp = priv->mpcg; | 654 | struct mpc_group *grp = priv->mpcg; |
| 656 | int rc = 0; | 655 | int rc = 0; |
| 657 | struct th_sweep *header; | 656 | struct th_sweep *header; |
| @@ -713,7 +712,7 @@ static void mpc_rcvd_sweep_req(struct mpcg_info *mpcginfo) | |||
| 713 | { | 712 | { |
| 714 | struct channel *rch = mpcginfo->ch; | 713 | struct channel *rch = mpcginfo->ch; |
| 715 | struct net_device *dev = rch->netdev; | 714 | struct net_device *dev = rch->netdev; |
| 716 | struct ctcm_priv *priv = dev->priv; | 715 | struct ctcm_priv *priv = dev->ml_priv; |
| 717 | struct mpc_group *grp = priv->mpcg; | 716 | struct mpc_group *grp = priv->mpcg; |
| 718 | struct channel *ch = priv->channel[WRITE]; | 717 | struct channel *ch = priv->channel[WRITE]; |
| 719 | 718 | ||
| @@ -847,7 +846,7 @@ static int mpcg_fsm_len = ARRAY_SIZE(mpcg_fsm); | |||
| 847 | static void mpc_action_go_ready(fsm_instance *fsm, int event, void *arg) | 846 | static void mpc_action_go_ready(fsm_instance *fsm, int event, void *arg) |
| 848 | { | 847 | { |
| 849 | struct net_device *dev = arg; | 848 | struct net_device *dev = arg; |
| 850 | struct ctcm_priv *priv = dev->priv; | 849 | struct ctcm_priv *priv = dev->ml_priv; |
| 851 | struct mpc_group *grp = priv->mpcg; | 850 | struct mpc_group *grp = priv->mpcg; |
| 852 | 851 | ||
| 853 | if (grp == NULL) { | 852 | if (grp == NULL) { |
| @@ -891,7 +890,7 @@ static void mpc_action_go_ready(fsm_instance *fsm, int event, void *arg) | |||
| 891 | void mpc_group_ready(unsigned long adev) | 890 | void mpc_group_ready(unsigned long adev) |
| 892 | { | 891 | { |
| 893 | struct net_device *dev = (struct net_device *)adev; | 892 | struct net_device *dev = (struct net_device *)adev; |
| 894 | struct ctcm_priv *priv = dev->priv; | 893 | struct ctcm_priv *priv = dev->ml_priv; |
| 895 | struct mpc_group *grp = priv->mpcg; | 894 | struct mpc_group *grp = priv->mpcg; |
| 896 | struct channel *ch = NULL; | 895 | struct channel *ch = NULL; |
| 897 | 896 | ||
| @@ -947,7 +946,7 @@ void mpc_group_ready(unsigned long adev) | |||
| 947 | void mpc_channel_action(struct channel *ch, int direction, int action) | 946 | void mpc_channel_action(struct channel *ch, int direction, int action) |
| 948 | { | 947 | { |
| 949 | struct net_device *dev = ch->netdev; | 948 | struct net_device *dev = ch->netdev; |
| 950 | struct ctcm_priv *priv = dev->priv; | 949 | struct ctcm_priv *priv = dev->ml_priv; |
| 951 | struct mpc_group *grp = priv->mpcg; | 950 | struct mpc_group *grp = priv->mpcg; |
| 952 | 951 | ||
| 953 | if (grp == NULL) { | 952 | if (grp == NULL) { |
| @@ -1057,7 +1056,7 @@ done: | |||
| 1057 | static void ctcmpc_unpack_skb(struct channel *ch, struct sk_buff *pskb) | 1056 | static void ctcmpc_unpack_skb(struct channel *ch, struct sk_buff *pskb) |
| 1058 | { | 1057 | { |
| 1059 | struct net_device *dev = ch->netdev; | 1058 | struct net_device *dev = ch->netdev; |
| 1060 | struct ctcm_priv *priv = dev->priv; | 1059 | struct ctcm_priv *priv = dev->ml_priv; |
| 1061 | struct mpc_group *grp = priv->mpcg; | 1060 | struct mpc_group *grp = priv->mpcg; |
| 1062 | struct pdu *curr_pdu; | 1061 | struct pdu *curr_pdu; |
| 1063 | struct mpcg_info *mpcginfo; | 1062 | struct mpcg_info *mpcginfo; |
| @@ -1255,7 +1254,7 @@ void ctcmpc_bh(unsigned long thischan) | |||
| 1255 | struct channel *ch = (struct channel *)thischan; | 1254 | struct channel *ch = (struct channel *)thischan; |
| 1256 | struct sk_buff *skb; | 1255 | struct sk_buff *skb; |
| 1257 | struct net_device *dev = ch->netdev; | 1256 | struct net_device *dev = ch->netdev; |
| 1258 | struct ctcm_priv *priv = dev->priv; | 1257 | struct ctcm_priv *priv = dev->ml_priv; |
| 1259 | struct mpc_group *grp = priv->mpcg; | 1258 | struct mpc_group *grp = priv->mpcg; |
| 1260 | 1259 | ||
| 1261 | CTCM_PR_DEBUG("%s cp:%i enter: %s() %s\n", | 1260 | CTCM_PR_DEBUG("%s cp:%i enter: %s() %s\n", |
| @@ -1377,7 +1376,7 @@ static void mpc_action_go_inop(fsm_instance *fi, int event, void *arg) | |||
| 1377 | BUG_ON(dev == NULL); | 1376 | BUG_ON(dev == NULL); |
| 1378 | CTCM_PR_DEBUG("Enter %s: %s\n", __func__, dev->name); | 1377 | CTCM_PR_DEBUG("Enter %s: %s\n", __func__, dev->name); |
| 1379 | 1378 | ||
| 1380 | priv = dev->priv; | 1379 | priv = dev->ml_priv; |
| 1381 | grp = priv->mpcg; | 1380 | grp = priv->mpcg; |
| 1382 | grp->flow_off_called = 0; | 1381 | grp->flow_off_called = 0; |
| 1383 | fsm_deltimer(&grp->timer); | 1382 | fsm_deltimer(&grp->timer); |
| @@ -1483,7 +1482,7 @@ static void mpc_action_timeout(fsm_instance *fi, int event, void *arg) | |||
| 1483 | 1482 | ||
| 1484 | BUG_ON(dev == NULL); | 1483 | BUG_ON(dev == NULL); |
| 1485 | 1484 | ||
| 1486 | priv = dev->priv; | 1485 | priv = dev->ml_priv; |
| 1487 | grp = priv->mpcg; | 1486 | grp = priv->mpcg; |
| 1488 | wch = priv->channel[WRITE]; | 1487 | wch = priv->channel[WRITE]; |
| 1489 | rch = priv->channel[READ]; | 1488 | rch = priv->channel[READ]; |
| @@ -1521,7 +1520,7 @@ void mpc_action_discontact(fsm_instance *fi, int event, void *arg) | |||
| 1521 | if (ch) { | 1520 | if (ch) { |
| 1522 | dev = ch->netdev; | 1521 | dev = ch->netdev; |
| 1523 | if (dev) { | 1522 | if (dev) { |
| 1524 | priv = dev->priv; | 1523 | priv = dev->ml_priv; |
| 1525 | if (priv) { | 1524 | if (priv) { |
| 1526 | CTCM_DBF_TEXT_(MPC_TRACE, CTC_DBF_NOTICE, | 1525 | CTCM_DBF_TEXT_(MPC_TRACE, CTC_DBF_NOTICE, |
| 1527 | "%s: %s: %s\n", | 1526 | "%s: %s: %s\n", |
| @@ -1569,7 +1568,7 @@ static int mpc_validate_xid(struct mpcg_info *mpcginfo) | |||
| 1569 | { | 1568 | { |
| 1570 | struct channel *ch = mpcginfo->ch; | 1569 | struct channel *ch = mpcginfo->ch; |
| 1571 | struct net_device *dev = ch->netdev; | 1570 | struct net_device *dev = ch->netdev; |
| 1572 | struct ctcm_priv *priv = dev->priv; | 1571 | struct ctcm_priv *priv = dev->ml_priv; |
| 1573 | struct mpc_group *grp = priv->mpcg; | 1572 | struct mpc_group *grp = priv->mpcg; |
| 1574 | struct xid2 *xid = mpcginfo->xid; | 1573 | struct xid2 *xid = mpcginfo->xid; |
| 1575 | int rc = 0; | 1574 | int rc = 0; |
| @@ -1866,7 +1865,7 @@ static void mpc_action_doxid0(fsm_instance *fsm, int event, void *arg) | |||
| 1866 | { | 1865 | { |
| 1867 | struct channel *ch = arg; | 1866 | struct channel *ch = arg; |
| 1868 | struct net_device *dev = ch->netdev; | 1867 | struct net_device *dev = ch->netdev; |
| 1869 | struct ctcm_priv *priv = dev->priv; | 1868 | struct ctcm_priv *priv = dev->ml_priv; |
| 1870 | struct mpc_group *grp = priv->mpcg; | 1869 | struct mpc_group *grp = priv->mpcg; |
| 1871 | 1870 | ||
| 1872 | CTCM_PR_DEBUG("Enter %s: cp=%i ch=0x%p id=%s\n", | 1871 | CTCM_PR_DEBUG("Enter %s: cp=%i ch=0x%p id=%s\n", |
| @@ -1906,7 +1905,7 @@ static void mpc_action_doxid0(fsm_instance *fsm, int event, void *arg) | |||
| 1906 | static void mpc_action_doxid7(fsm_instance *fsm, int event, void *arg) | 1905 | static void mpc_action_doxid7(fsm_instance *fsm, int event, void *arg) |
| 1907 | { | 1906 | { |
| 1908 | struct net_device *dev = arg; | 1907 | struct net_device *dev = arg; |
| 1909 | struct ctcm_priv *priv = dev->priv; | 1908 | struct ctcm_priv *priv = dev->ml_priv; |
| 1910 | struct mpc_group *grp = NULL; | 1909 | struct mpc_group *grp = NULL; |
| 1911 | int direction; | 1910 | int direction; |
| 1912 | int send = 0; | 1911 | int send = 0; |
| @@ -1983,7 +1982,7 @@ static void mpc_action_rcvd_xid0(fsm_instance *fsm, int event, void *arg) | |||
| 1983 | struct mpcg_info *mpcginfo = arg; | 1982 | struct mpcg_info *mpcginfo = arg; |
| 1984 | struct channel *ch = mpcginfo->ch; | 1983 | struct channel *ch = mpcginfo->ch; |
| 1985 | struct net_device *dev = ch->netdev; | 1984 | struct net_device *dev = ch->netdev; |
| 1986 | struct ctcm_priv *priv = dev->priv; | 1985 | struct ctcm_priv *priv = dev->ml_priv; |
| 1987 | struct mpc_group *grp = priv->mpcg; | 1986 | struct mpc_group *grp = priv->mpcg; |
| 1988 | 1987 | ||
| 1989 | CTCM_PR_DEBUG("%s: ch-id:%s xid2:%i xid7:%i xidt_p2:%i \n", | 1988 | CTCM_PR_DEBUG("%s: ch-id:%s xid2:%i xid7:%i xidt_p2:%i \n", |
| @@ -2045,7 +2044,7 @@ static void mpc_action_rcvd_xid7(fsm_instance *fsm, int event, void *arg) | |||
| 2045 | struct mpcg_info *mpcginfo = arg; | 2044 | struct mpcg_info *mpcginfo = arg; |
| 2046 | struct channel *ch = mpcginfo->ch; | 2045 | struct channel *ch = mpcginfo->ch; |
| 2047 | struct net_device *dev = ch->netdev; | 2046 | struct net_device *dev = ch->netdev; |
| 2048 | struct ctcm_priv *priv = dev->priv; | 2047 | struct ctcm_priv *priv = dev->ml_priv; |
| 2049 | struct mpc_group *grp = priv->mpcg; | 2048 | struct mpc_group *grp = priv->mpcg; |
| 2050 | 2049 | ||
| 2051 | CTCM_PR_DEBUG("Enter %s: cp=%i ch=0x%p id=%s\n", | 2050 | CTCM_PR_DEBUG("Enter %s: cp=%i ch=0x%p id=%s\n", |
| @@ -2097,7 +2096,7 @@ static int mpc_send_qllc_discontact(struct net_device *dev) | |||
| 2097 | __u32 new_len = 0; | 2096 | __u32 new_len = 0; |
| 2098 | struct sk_buff *skb; | 2097 | struct sk_buff *skb; |
| 2099 | struct qllc *qllcptr; | 2098 | struct qllc *qllcptr; |
| 2100 | struct ctcm_priv *priv = dev->priv; | 2099 | struct ctcm_priv *priv = dev->ml_priv; |
| 2101 | struct mpc_group *grp = priv->mpcg; | 2100 | struct mpc_group *grp = priv->mpcg; |
| 2102 | 2101 | ||
| 2103 | CTCM_PR_DEBUG("%s: GROUP STATE: %s\n", | 2102 | CTCM_PR_DEBUG("%s: GROUP STATE: %s\n", |
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c index 6de28385b354..9bcfa04d863b 100644 --- a/drivers/s390/net/lcs.c +++ b/drivers/s390/net/lcs.c | |||
| @@ -1412,7 +1412,8 @@ lcs_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb) | |||
| 1412 | } | 1412 | } |
| 1413 | /* How far in the ccw chain have we processed? */ | 1413 | /* How far in the ccw chain have we processed? */ |
| 1414 | if ((channel->state != LCS_CH_STATE_INIT) && | 1414 | if ((channel->state != LCS_CH_STATE_INIT) && |
| 1415 | (irb->scsw.cmd.fctl & SCSW_FCTL_START_FUNC)) { | 1415 | (irb->scsw.cmd.fctl & SCSW_FCTL_START_FUNC) && |
| 1416 | (irb->scsw.cmd.cpa != 0)) { | ||
| 1416 | index = (struct ccw1 *) __va((addr_t) irb->scsw.cmd.cpa) | 1417 | index = (struct ccw1 *) __va((addr_t) irb->scsw.cmd.cpa) |
| 1417 | - channel->ccws; | 1418 | - channel->ccws; |
| 1418 | if ((irb->scsw.cmd.actl & SCSW_ACTL_SUSPENDED) || | 1419 | if ((irb->scsw.cmd.actl & SCSW_ACTL_SUSPENDED) || |
diff --git a/drivers/s390/net/qeth_core.h b/drivers/s390/net/qeth_core.h index 80971c21ea1a..bf8a75c92f28 100644 --- a/drivers/s390/net/qeth_core.h +++ b/drivers/s390/net/qeth_core.h | |||
| @@ -689,6 +689,7 @@ struct qeth_mc_mac { | |||
| 689 | struct list_head list; | 689 | struct list_head list; |
| 690 | __u8 mc_addr[MAX_ADDR_LEN]; | 690 | __u8 mc_addr[MAX_ADDR_LEN]; |
| 691 | unsigned char mc_addrlen; | 691 | unsigned char mc_addrlen; |
| 692 | int is_vmac; | ||
| 692 | }; | 693 | }; |
| 693 | 694 | ||
| 694 | struct qeth_card { | 695 | struct qeth_card { |
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c index bd420d1b9a0d..c7ab1b864516 100644 --- a/drivers/s390/net/qeth_core_main.c +++ b/drivers/s390/net/qeth_core_main.c | |||
| @@ -3024,7 +3024,7 @@ static inline void __qeth_fill_buffer(struct sk_buff *skb, | |||
| 3024 | struct qdio_buffer *buffer, int is_tso, int *next_element_to_fill, | 3024 | struct qdio_buffer *buffer, int is_tso, int *next_element_to_fill, |
| 3025 | int offset) | 3025 | int offset) |
| 3026 | { | 3026 | { |
| 3027 | int length = skb->len; | 3027 | int length = skb->len - offset; |
| 3028 | int length_here; | 3028 | int length_here; |
| 3029 | int element; | 3029 | int element; |
| 3030 | char *data; | 3030 | char *data; |
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c index b3cee032f578..3ac3cc1e03cc 100644 --- a/drivers/s390/net/qeth_l2_main.c +++ b/drivers/s390/net/qeth_l2_main.c | |||
| @@ -177,9 +177,10 @@ static int qeth_l2_send_delgroupmac(struct qeth_card *card, __u8 *mac) | |||
| 177 | qeth_l2_send_delgroupmac_cb); | 177 | qeth_l2_send_delgroupmac_cb); |
| 178 | } | 178 | } |
| 179 | 179 | ||
| 180 | static void qeth_l2_add_mc(struct qeth_card *card, __u8 *mac) | 180 | static void qeth_l2_add_mc(struct qeth_card *card, __u8 *mac, int vmac) |
| 181 | { | 181 | { |
| 182 | struct qeth_mc_mac *mc; | 182 | struct qeth_mc_mac *mc; |
| 183 | int rc; | ||
| 183 | 184 | ||
| 184 | mc = kmalloc(sizeof(struct qeth_mc_mac), GFP_ATOMIC); | 185 | mc = kmalloc(sizeof(struct qeth_mc_mac), GFP_ATOMIC); |
| 185 | 186 | ||
| @@ -188,8 +189,16 @@ static void qeth_l2_add_mc(struct qeth_card *card, __u8 *mac) | |||
| 188 | 189 | ||
| 189 | memcpy(mc->mc_addr, mac, OSA_ADDR_LEN); | 190 | memcpy(mc->mc_addr, mac, OSA_ADDR_LEN); |
| 190 | mc->mc_addrlen = OSA_ADDR_LEN; | 191 | mc->mc_addrlen = OSA_ADDR_LEN; |
| 192 | mc->is_vmac = vmac; | ||
| 193 | |||
| 194 | if (vmac) { | ||
| 195 | rc = qeth_l2_send_setdelmac(card, mac, IPA_CMD_SETVMAC, | ||
| 196 | NULL); | ||
| 197 | } else { | ||
| 198 | rc = qeth_l2_send_setgroupmac(card, mac); | ||
| 199 | } | ||
| 191 | 200 | ||
| 192 | if (!qeth_l2_send_setgroupmac(card, mac)) | 201 | if (!rc) |
| 193 | list_add_tail(&mc->list, &card->mc_list); | 202 | list_add_tail(&mc->list, &card->mc_list); |
| 194 | else | 203 | else |
| 195 | kfree(mc); | 204 | kfree(mc); |
| @@ -201,7 +210,11 @@ static void qeth_l2_del_all_mc(struct qeth_card *card) | |||
| 201 | 210 | ||
| 202 | spin_lock_bh(&card->mclock); | 211 | spin_lock_bh(&card->mclock); |
| 203 | list_for_each_entry_safe(mc, tmp, &card->mc_list, list) { | 212 | list_for_each_entry_safe(mc, tmp, &card->mc_list, list) { |
| 204 | qeth_l2_send_delgroupmac(card, mc->mc_addr); | 213 | if (mc->is_vmac) |
| 214 | qeth_l2_send_setdelmac(card, mc->mc_addr, | ||
| 215 | IPA_CMD_DELVMAC, NULL); | ||
| 216 | else | ||
| 217 | qeth_l2_send_delgroupmac(card, mc->mc_addr); | ||
| 205 | list_del(&mc->list); | 218 | list_del(&mc->list); |
| 206 | kfree(mc); | 219 | kfree(mc); |
| 207 | } | 220 | } |
| @@ -590,7 +603,7 @@ static int qeth_l2_set_mac_address(struct net_device *dev, void *p) | |||
| 590 | static void qeth_l2_set_multicast_list(struct net_device *dev) | 603 | static void qeth_l2_set_multicast_list(struct net_device *dev) |
| 591 | { | 604 | { |
| 592 | struct qeth_card *card = dev->ml_priv; | 605 | struct qeth_card *card = dev->ml_priv; |
| 593 | struct dev_mc_list *dm; | 606 | struct dev_addr_list *dm; |
| 594 | 607 | ||
| 595 | if (card->info.type == QETH_CARD_TYPE_OSN) | 608 | if (card->info.type == QETH_CARD_TYPE_OSN) |
| 596 | return ; | 609 | return ; |
| @@ -599,7 +612,11 @@ static void qeth_l2_set_multicast_list(struct net_device *dev) | |||
| 599 | qeth_l2_del_all_mc(card); | 612 | qeth_l2_del_all_mc(card); |
| 600 | spin_lock_bh(&card->mclock); | 613 | spin_lock_bh(&card->mclock); |
| 601 | for (dm = dev->mc_list; dm; dm = dm->next) | 614 | for (dm = dev->mc_list; dm; dm = dm->next) |
| 602 | qeth_l2_add_mc(card, dm->dmi_addr); | 615 | qeth_l2_add_mc(card, dm->da_addr, 0); |
| 616 | |||
| 617 | for (dm = dev->uc_list; dm; dm = dm->next) | ||
| 618 | qeth_l2_add_mc(card, dm->da_addr, 1); | ||
| 619 | |||
| 603 | spin_unlock_bh(&card->mclock); | 620 | spin_unlock_bh(&card->mclock); |
| 604 | if (!qeth_adp_supported(card, IPA_SETADP_SET_PROMISC_MODE)) | 621 | if (!qeth_adp_supported(card, IPA_SETADP_SET_PROMISC_MODE)) |
| 605 | return; | 622 | return; |
diff --git a/drivers/s390/net/qeth_l3_sys.c b/drivers/s390/net/qeth_l3_sys.c index ac1993708ae9..210ddb639748 100644 --- a/drivers/s390/net/qeth_l3_sys.c +++ b/drivers/s390/net/qeth_l3_sys.c | |||
| @@ -136,7 +136,7 @@ static ssize_t qeth_l3_dev_route6_store(struct device *dev, | |||
| 136 | return -EINVAL; | 136 | return -EINVAL; |
| 137 | 137 | ||
| 138 | if (!qeth_is_supported(card, IPA_IPV6)) { | 138 | if (!qeth_is_supported(card, IPA_IPV6)) { |
| 139 | return -ENOTSUPP; | 139 | return -EOPNOTSUPP; |
| 140 | } | 140 | } |
| 141 | 141 | ||
| 142 | return qeth_l3_dev_route_store(card, &card->options.route6, | 142 | return qeth_l3_dev_route_store(card, &card->options.route6, |
diff --git a/drivers/sbus/sbus.c b/drivers/sbus/sbus.c index 73a86d09bba8..9c129248466c 100644 --- a/drivers/sbus/sbus.c +++ b/drivers/sbus/sbus.c | |||
| @@ -7,13 +7,13 @@ | |||
| 7 | #include <linux/slab.h> | 7 | #include <linux/slab.h> |
| 8 | #include <linux/init.h> | 8 | #include <linux/init.h> |
| 9 | #include <linux/device.h> | 9 | #include <linux/device.h> |
| 10 | #include <linux/of_device.h> | ||
| 10 | 11 | ||
| 11 | #include <asm/system.h> | 12 | #include <asm/system.h> |
| 12 | #include <asm/sbus.h> | 13 | #include <asm/sbus.h> |
| 13 | #include <asm/dma.h> | 14 | #include <asm/dma.h> |
| 14 | #include <asm/oplib.h> | 15 | #include <asm/oplib.h> |
| 15 | #include <asm/prom.h> | 16 | #include <asm/prom.h> |
| 16 | #include <asm/of_device.h> | ||
| 17 | #include <asm/bpp.h> | 17 | #include <asm/bpp.h> |
| 18 | #include <asm/irq.h> | 18 | #include <asm/irq.h> |
| 19 | 19 | ||
diff --git a/drivers/scsi/device_handler/scsi_dh_alua.c b/drivers/scsi/device_handler/scsi_dh_alua.c index fcdd73f25625..994da56fffed 100644 --- a/drivers/scsi/device_handler/scsi_dh_alua.c +++ b/drivers/scsi/device_handler/scsi_dh_alua.c | |||
| @@ -680,7 +680,7 @@ static int alua_prep_fn(struct scsi_device *sdev, struct request *req) | |||
| 680 | 680 | ||
| 681 | } | 681 | } |
| 682 | 682 | ||
| 683 | const struct scsi_dh_devlist alua_dev_list[] = { | 683 | static const struct scsi_dh_devlist alua_dev_list[] = { |
| 684 | {"HP", "MSA VOLUME" }, | 684 | {"HP", "MSA VOLUME" }, |
| 685 | {"HP", "HSV101" }, | 685 | {"HP", "HSV101" }, |
| 686 | {"HP", "HSV111" }, | 686 | {"HP", "HSV111" }, |
diff --git a/drivers/scsi/device_handler/scsi_dh_emc.c b/drivers/scsi/device_handler/scsi_dh_emc.c index aa46b131b20e..b9d23e9e9a44 100644 --- a/drivers/scsi/device_handler/scsi_dh_emc.c +++ b/drivers/scsi/device_handler/scsi_dh_emc.c | |||
| @@ -562,7 +562,7 @@ done: | |||
| 562 | return result; | 562 | return result; |
| 563 | } | 563 | } |
| 564 | 564 | ||
| 565 | const struct scsi_dh_devlist clariion_dev_list[] = { | 565 | static const struct scsi_dh_devlist clariion_dev_list[] = { |
| 566 | {"DGC", "RAID"}, | 566 | {"DGC", "RAID"}, |
| 567 | {"DGC", "DISK"}, | 567 | {"DGC", "DISK"}, |
| 568 | {"DGC", "VRAID"}, | 568 | {"DGC", "VRAID"}, |
diff --git a/drivers/scsi/device_handler/scsi_dh_hp_sw.c b/drivers/scsi/device_handler/scsi_dh_hp_sw.c index 9c7a1f8ebb72..a6a4ef3ad51c 100644 --- a/drivers/scsi/device_handler/scsi_dh_hp_sw.c +++ b/drivers/scsi/device_handler/scsi_dh_hp_sw.c | |||
| @@ -282,7 +282,7 @@ static int hp_sw_activate(struct scsi_device *sdev) | |||
| 282 | return ret; | 282 | return ret; |
| 283 | } | 283 | } |
| 284 | 284 | ||
| 285 | const struct scsi_dh_devlist hp_sw_dh_data_list[] = { | 285 | static const struct scsi_dh_devlist hp_sw_dh_data_list[] = { |
| 286 | {"COMPAQ", "MSA1000 VOLUME"}, | 286 | {"COMPAQ", "MSA1000 VOLUME"}, |
| 287 | {"COMPAQ", "HSV110"}, | 287 | {"COMPAQ", "HSV110"}, |
| 288 | {"HP", "HSV100"}, | 288 | {"HP", "HSV100"}, |
diff --git a/drivers/scsi/device_handler/scsi_dh_rdac.c b/drivers/scsi/device_handler/scsi_dh_rdac.c index b093a501f8ae..2dee69da35cf 100644 --- a/drivers/scsi/device_handler/scsi_dh_rdac.c +++ b/drivers/scsi/device_handler/scsi_dh_rdac.c | |||
| @@ -376,7 +376,7 @@ static int get_lun(struct scsi_device *sdev, struct rdac_dh_data *h) | |||
| 376 | if (inqp->page_id[0] != 'e' || inqp->page_id[1] != 'd' || | 376 | if (inqp->page_id[0] != 'e' || inqp->page_id[1] != 'd' || |
| 377 | inqp->page_id[2] != 'i' || inqp->page_id[3] != 'd') | 377 | inqp->page_id[2] != 'i' || inqp->page_id[3] != 'd') |
| 378 | return SCSI_DH_NOSYS; | 378 | return SCSI_DH_NOSYS; |
| 379 | h->lun = scsilun_to_int((struct scsi_lun *)inqp->lun); | 379 | h->lun = inqp->lun[7]; /* Uses only the last byte */ |
| 380 | } | 380 | } |
| 381 | return err; | 381 | return err; |
| 382 | } | 382 | } |
| @@ -386,6 +386,7 @@ static int check_ownership(struct scsi_device *sdev, struct rdac_dh_data *h) | |||
| 386 | int err; | 386 | int err; |
| 387 | struct c9_inquiry *inqp; | 387 | struct c9_inquiry *inqp; |
| 388 | 388 | ||
| 389 | h->lun_state = RDAC_LUN_UNOWNED; | ||
| 389 | err = submit_inquiry(sdev, 0xC9, sizeof(struct c9_inquiry), h); | 390 | err = submit_inquiry(sdev, 0xC9, sizeof(struct c9_inquiry), h); |
| 390 | if (err == SCSI_DH_OK) { | 391 | if (err == SCSI_DH_OK) { |
| 391 | inqp = &h->inq.c9; | 392 | inqp = &h->inq.c9; |
| @@ -574,7 +575,7 @@ static int rdac_check_sense(struct scsi_device *sdev, | |||
| 574 | return SCSI_RETURN_NOT_HANDLED; | 575 | return SCSI_RETURN_NOT_HANDLED; |
| 575 | } | 576 | } |
| 576 | 577 | ||
| 577 | const struct scsi_dh_devlist rdac_dev_list[] = { | 578 | static const struct scsi_dh_devlist rdac_dev_list[] = { |
| 578 | {"IBM", "1722"}, | 579 | {"IBM", "1722"}, |
| 579 | {"IBM", "1724"}, | 580 | {"IBM", "1724"}, |
| 580 | {"IBM", "1726"}, | 581 | {"IBM", "1726"}, |
diff --git a/drivers/scsi/dpt/dpti_i2o.h b/drivers/scsi/dpt/dpti_i2o.h index 19406cea6d6a..179ad77f6cc9 100644 --- a/drivers/scsi/dpt/dpti_i2o.h +++ b/drivers/scsi/dpt/dpti_i2o.h | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | 21 | ||
| 22 | #include <linux/i2o-dev.h> | 22 | #include <linux/i2o-dev.h> |
| 23 | 23 | ||
| 24 | #include <linux/version.h> | ||
| 25 | #include <linux/notifier.h> | 24 | #include <linux/notifier.h> |
| 26 | #include <asm/atomic.h> | 25 | #include <asm/atomic.h> |
| 27 | 26 | ||
diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c index ae560bc04f9d..4e0b7c8eb32e 100644 --- a/drivers/scsi/ibmvscsi/ibmvfc.c +++ b/drivers/scsi/ibmvscsi/ibmvfc.c | |||
| @@ -556,11 +556,12 @@ static void ibmvfc_link_down(struct ibmvfc_host *vhost, | |||
| 556 | /** | 556 | /** |
| 557 | * ibmvfc_init_host - Start host initialization | 557 | * ibmvfc_init_host - Start host initialization |
| 558 | * @vhost: ibmvfc host struct | 558 | * @vhost: ibmvfc host struct |
| 559 | * @relogin: is this a re-login? | ||
| 559 | * | 560 | * |
| 560 | * Return value: | 561 | * Return value: |
| 561 | * nothing | 562 | * nothing |
| 562 | **/ | 563 | **/ |
| 563 | static void ibmvfc_init_host(struct ibmvfc_host *vhost) | 564 | static void ibmvfc_init_host(struct ibmvfc_host *vhost, int relogin) |
| 564 | { | 565 | { |
| 565 | struct ibmvfc_target *tgt; | 566 | struct ibmvfc_target *tgt; |
| 566 | 567 | ||
| @@ -574,6 +575,11 @@ static void ibmvfc_init_host(struct ibmvfc_host *vhost) | |||
| 574 | } | 575 | } |
| 575 | 576 | ||
| 576 | if (!ibmvfc_set_host_state(vhost, IBMVFC_INITIALIZING)) { | 577 | if (!ibmvfc_set_host_state(vhost, IBMVFC_INITIALIZING)) { |
| 578 | if (!relogin) { | ||
| 579 | memset(vhost->async_crq.msgs, 0, PAGE_SIZE); | ||
| 580 | vhost->async_crq.cur = 0; | ||
| 581 | } | ||
| 582 | |||
| 577 | list_for_each_entry(tgt, &vhost->targets, queue) | 583 | list_for_each_entry(tgt, &vhost->targets, queue) |
| 578 | tgt->need_login = 1; | 584 | tgt->need_login = 1; |
| 579 | scsi_block_requests(vhost->host); | 585 | scsi_block_requests(vhost->host); |
| @@ -1059,9 +1065,10 @@ static void ibmvfc_get_starget_port_id(struct scsi_target *starget) | |||
| 1059 | static int ibmvfc_wait_while_resetting(struct ibmvfc_host *vhost) | 1065 | static int ibmvfc_wait_while_resetting(struct ibmvfc_host *vhost) |
| 1060 | { | 1066 | { |
| 1061 | long timeout = wait_event_timeout(vhost->init_wait_q, | 1067 | long timeout = wait_event_timeout(vhost->init_wait_q, |
| 1062 | (vhost->state == IBMVFC_ACTIVE || | 1068 | ((vhost->state == IBMVFC_ACTIVE || |
| 1063 | vhost->state == IBMVFC_HOST_OFFLINE || | 1069 | vhost->state == IBMVFC_HOST_OFFLINE || |
| 1064 | vhost->state == IBMVFC_LINK_DEAD), | 1070 | vhost->state == IBMVFC_LINK_DEAD) && |
| 1071 | vhost->action == IBMVFC_HOST_ACTION_NONE), | ||
| 1065 | (init_timeout * HZ)); | 1072 | (init_timeout * HZ)); |
| 1066 | 1073 | ||
| 1067 | return timeout ? 0 : -EIO; | 1074 | return timeout ? 0 : -EIO; |
| @@ -1450,8 +1457,8 @@ static void ibmvfc_scsi_done(struct ibmvfc_event *evt) | |||
| 1450 | struct ibmvfc_cmd *vfc_cmd = &evt->xfer_iu->cmd; | 1457 | struct ibmvfc_cmd *vfc_cmd = &evt->xfer_iu->cmd; |
| 1451 | struct ibmvfc_fcp_rsp *rsp = &vfc_cmd->rsp; | 1458 | struct ibmvfc_fcp_rsp *rsp = &vfc_cmd->rsp; |
| 1452 | struct scsi_cmnd *cmnd = evt->cmnd; | 1459 | struct scsi_cmnd *cmnd = evt->cmnd; |
| 1453 | int rsp_len = 0; | 1460 | u32 rsp_len = 0; |
| 1454 | int sense_len = rsp->fcp_sense_len; | 1461 | u32 sense_len = rsp->fcp_sense_len; |
| 1455 | 1462 | ||
| 1456 | if (cmnd) { | 1463 | if (cmnd) { |
| 1457 | if (vfc_cmd->response_flags & IBMVFC_ADAPTER_RESID_VALID) | 1464 | if (vfc_cmd->response_flags & IBMVFC_ADAPTER_RESID_VALID) |
| @@ -1468,7 +1475,7 @@ static void ibmvfc_scsi_done(struct ibmvfc_event *evt) | |||
| 1468 | rsp_len = rsp->fcp_rsp_len; | 1475 | rsp_len = rsp->fcp_rsp_len; |
| 1469 | if ((sense_len + rsp_len) > SCSI_SENSE_BUFFERSIZE) | 1476 | if ((sense_len + rsp_len) > SCSI_SENSE_BUFFERSIZE) |
| 1470 | sense_len = SCSI_SENSE_BUFFERSIZE - rsp_len; | 1477 | sense_len = SCSI_SENSE_BUFFERSIZE - rsp_len; |
| 1471 | if ((rsp->flags & FCP_SNS_LEN_VALID) && rsp->fcp_sense_len) | 1478 | if ((rsp->flags & FCP_SNS_LEN_VALID) && rsp->fcp_sense_len && rsp_len <= 8) |
| 1472 | memcpy(cmnd->sense_buffer, rsp->data.sense + rsp_len, sense_len); | 1479 | memcpy(cmnd->sense_buffer, rsp->data.sense + rsp_len, sense_len); |
| 1473 | 1480 | ||
| 1474 | ibmvfc_log_error(evt); | 1481 | ibmvfc_log_error(evt); |
| @@ -2077,17 +2084,18 @@ static void ibmvfc_handle_async(struct ibmvfc_async_crq *crq, | |||
| 2077 | { | 2084 | { |
| 2078 | const char *desc = ibmvfc_get_ae_desc(crq->event); | 2085 | const char *desc = ibmvfc_get_ae_desc(crq->event); |
| 2079 | 2086 | ||
| 2080 | ibmvfc_log(vhost, 3, "%s event received\n", desc); | 2087 | ibmvfc_log(vhost, 3, "%s event received. scsi_id: %lx, wwpn: %lx," |
| 2088 | " node_name: %lx\n", desc, crq->scsi_id, crq->wwpn, crq->node_name); | ||
| 2081 | 2089 | ||
| 2082 | switch (crq->event) { | 2090 | switch (crq->event) { |
| 2083 | case IBMVFC_AE_LINK_UP: | 2091 | case IBMVFC_AE_LINK_UP: |
| 2084 | case IBMVFC_AE_RESUME: | 2092 | case IBMVFC_AE_RESUME: |
| 2085 | vhost->events_to_log |= IBMVFC_AE_LINKUP; | 2093 | vhost->events_to_log |= IBMVFC_AE_LINKUP; |
| 2086 | ibmvfc_init_host(vhost); | 2094 | ibmvfc_init_host(vhost, 1); |
| 2087 | break; | 2095 | break; |
| 2088 | case IBMVFC_AE_SCN_FABRIC: | 2096 | case IBMVFC_AE_SCN_FABRIC: |
| 2089 | vhost->events_to_log |= IBMVFC_AE_RSCN; | 2097 | vhost->events_to_log |= IBMVFC_AE_RSCN; |
| 2090 | ibmvfc_init_host(vhost); | 2098 | ibmvfc_init_host(vhost, 1); |
| 2091 | break; | 2099 | break; |
| 2092 | case IBMVFC_AE_SCN_NPORT: | 2100 | case IBMVFC_AE_SCN_NPORT: |
| 2093 | case IBMVFC_AE_SCN_GROUP: | 2101 | case IBMVFC_AE_SCN_GROUP: |
| @@ -2133,13 +2141,13 @@ static void ibmvfc_handle_crq(struct ibmvfc_crq *crq, struct ibmvfc_host *vhost) | |||
| 2133 | /* Send back a response */ | 2141 | /* Send back a response */ |
| 2134 | rc = ibmvfc_send_crq_init_complete(vhost); | 2142 | rc = ibmvfc_send_crq_init_complete(vhost); |
| 2135 | if (rc == 0) | 2143 | if (rc == 0) |
| 2136 | ibmvfc_init_host(vhost); | 2144 | ibmvfc_init_host(vhost, 0); |
| 2137 | else | 2145 | else |
| 2138 | dev_err(vhost->dev, "Unable to send init rsp. rc=%ld\n", rc); | 2146 | dev_err(vhost->dev, "Unable to send init rsp. rc=%ld\n", rc); |
| 2139 | break; | 2147 | break; |
| 2140 | case IBMVFC_CRQ_INIT_COMPLETE: | 2148 | case IBMVFC_CRQ_INIT_COMPLETE: |
| 2141 | dev_info(vhost->dev, "Partner initialization complete\n"); | 2149 | dev_info(vhost->dev, "Partner initialization complete\n"); |
| 2142 | ibmvfc_init_host(vhost); | 2150 | ibmvfc_init_host(vhost, 0); |
| 2143 | break; | 2151 | break; |
| 2144 | default: | 2152 | default: |
| 2145 | dev_err(vhost->dev, "Unknown crq message type: %d\n", crq->format); | 2153 | dev_err(vhost->dev, "Unknown crq message type: %d\n", crq->format); |
| @@ -3357,8 +3365,6 @@ static void ibmvfc_npiv_login(struct ibmvfc_host *vhost) | |||
| 3357 | mad->buffer.va = vhost->login_buf_dma; | 3365 | mad->buffer.va = vhost->login_buf_dma; |
| 3358 | mad->buffer.len = sizeof(*vhost->login_buf); | 3366 | mad->buffer.len = sizeof(*vhost->login_buf); |
| 3359 | 3367 | ||
| 3360 | memset(vhost->async_crq.msgs, 0, PAGE_SIZE); | ||
| 3361 | vhost->async_crq.cur = 0; | ||
| 3362 | ibmvfc_set_host_action(vhost, IBMVFC_HOST_ACTION_INIT_WAIT); | 3368 | ibmvfc_set_host_action(vhost, IBMVFC_HOST_ACTION_INIT_WAIT); |
| 3363 | 3369 | ||
| 3364 | if (!ibmvfc_send_event(evt, vhost, default_timeout)) | 3370 | if (!ibmvfc_send_event(evt, vhost, default_timeout)) |
| @@ -3601,8 +3607,9 @@ static void ibmvfc_do_work(struct ibmvfc_host *vhost) | |||
| 3601 | } | 3607 | } |
| 3602 | } | 3608 | } |
| 3603 | 3609 | ||
| 3604 | if (vhost->reinit) { | 3610 | if (vhost->reinit && !ibmvfc_set_host_state(vhost, IBMVFC_INITIALIZING)) { |
| 3605 | vhost->reinit = 0; | 3611 | vhost->reinit = 0; |
| 3612 | scsi_block_requests(vhost->host); | ||
| 3606 | ibmvfc_set_host_action(vhost, IBMVFC_HOST_ACTION_QUERY); | 3613 | ibmvfc_set_host_action(vhost, IBMVFC_HOST_ACTION_QUERY); |
| 3607 | } else { | 3614 | } else { |
| 3608 | ibmvfc_set_host_action(vhost, IBMVFC_HOST_ACTION_NONE); | 3615 | ibmvfc_set_host_action(vhost, IBMVFC_HOST_ACTION_NONE); |
diff --git a/drivers/scsi/ibmvscsi/ibmvfc.h b/drivers/scsi/ibmvscsi/ibmvfc.h index 4bf6e374f076..fb3177ab6691 100644 --- a/drivers/scsi/ibmvscsi/ibmvfc.h +++ b/drivers/scsi/ibmvscsi/ibmvfc.h | |||
| @@ -29,8 +29,8 @@ | |||
| 29 | #include "viosrp.h" | 29 | #include "viosrp.h" |
| 30 | 30 | ||
| 31 | #define IBMVFC_NAME "ibmvfc" | 31 | #define IBMVFC_NAME "ibmvfc" |
| 32 | #define IBMVFC_DRIVER_VERSION "1.0.1" | 32 | #define IBMVFC_DRIVER_VERSION "1.0.2" |
| 33 | #define IBMVFC_DRIVER_DATE "(July 11, 2008)" | 33 | #define IBMVFC_DRIVER_DATE "(August 14, 2008)" |
| 34 | 34 | ||
| 35 | #define IBMVFC_DEFAULT_TIMEOUT 15 | 35 | #define IBMVFC_DEFAULT_TIMEOUT 15 |
| 36 | #define IBMVFC_INIT_TIMEOUT 30 | 36 | #define IBMVFC_INIT_TIMEOUT 30 |
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c index 6b24b9cdb04c..7b1502c0ab6e 100644 --- a/drivers/scsi/ibmvscsi/ibmvscsi.c +++ b/drivers/scsi/ibmvscsi/ibmvscsi.c | |||
| @@ -1636,7 +1636,7 @@ static unsigned long ibmvscsi_get_desired_dma(struct vio_dev *vdev) | |||
| 1636 | unsigned long desired_io = max_requests * sizeof(union viosrp_iu); | 1636 | unsigned long desired_io = max_requests * sizeof(union viosrp_iu); |
| 1637 | 1637 | ||
| 1638 | /* add io space for sg data */ | 1638 | /* add io space for sg data */ |
| 1639 | desired_io += (IBMVSCSI_MAX_SECTORS_DEFAULT * | 1639 | desired_io += (IBMVSCSI_MAX_SECTORS_DEFAULT * 512 * |
| 1640 | IBMVSCSI_CMDS_PER_LUN_DEFAULT); | 1640 | IBMVSCSI_CMDS_PER_LUN_DEFAULT); |
| 1641 | 1641 | ||
| 1642 | return desired_io; | 1642 | return desired_io; |
diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c index 7c615c70ec5c..bc9e6ddf41df 100644 --- a/drivers/scsi/ips.c +++ b/drivers/scsi/ips.c | |||
| @@ -165,7 +165,6 @@ | |||
| 165 | #include <asm/byteorder.h> | 165 | #include <asm/byteorder.h> |
| 166 | #include <asm/page.h> | 166 | #include <asm/page.h> |
| 167 | #include <linux/stddef.h> | 167 | #include <linux/stddef.h> |
| 168 | #include <linux/version.h> | ||
| 169 | #include <linux/string.h> | 168 | #include <linux/string.h> |
| 170 | #include <linux/errno.h> | 169 | #include <linux/errno.h> |
| 171 | #include <linux/kernel.h> | 170 | #include <linux/kernel.h> |
diff --git a/drivers/scsi/ips.h b/drivers/scsi/ips.h index e0657b6f009c..4e49fbcfe8af 100644 --- a/drivers/scsi/ips.h +++ b/drivers/scsi/ips.h | |||
| @@ -50,7 +50,6 @@ | |||
| 50 | #ifndef _IPS_H_ | 50 | #ifndef _IPS_H_ |
| 51 | #define _IPS_H_ | 51 | #define _IPS_H_ |
| 52 | 52 | ||
| 53 | #include <linux/version.h> | ||
| 54 | #include <linux/nmi.h> | 53 | #include <linux/nmi.h> |
| 55 | #include <asm/uaccess.h> | 54 | #include <asm/uaccess.h> |
| 56 | #include <asm/io.h> | 55 | #include <asm/io.h> |
diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c index 90272e65957a..094b47e94b29 100644 --- a/drivers/scsi/lpfc/lpfc_debugfs.c +++ b/drivers/scsi/lpfc/lpfc_debugfs.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | #include <linux/pci.h> | 27 | #include <linux/pci.h> |
| 28 | #include <linux/spinlock.h> | 28 | #include <linux/spinlock.h> |
| 29 | #include <linux/ctype.h> | 29 | #include <linux/ctype.h> |
| 30 | #include <linux/version.h> | ||
| 31 | 30 | ||
| 32 | #include <scsi/scsi.h> | 31 | #include <scsi/scsi.h> |
| 33 | #include <scsi/scsi_device.h> | 32 | #include <scsi/scsi_device.h> |
diff --git a/drivers/scsi/megaraid/megaraid_sas.c b/drivers/scsi/megaraid/megaraid_sas.c index fc7ac158476c..97b763378e7d 100644 --- a/drivers/scsi/megaraid/megaraid_sas.c +++ b/drivers/scsi/megaraid/megaraid_sas.c | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | * 2 of the License, or (at your option) any later version. | 10 | * 2 of the License, or (at your option) any later version. |
| 11 | * | 11 | * |
| 12 | * FILE : megaraid_sas.c | 12 | * FILE : megaraid_sas.c |
| 13 | * Version : v00.00.03.20-rc1 | 13 | * Version : v00.00.04.01-rc1 |
| 14 | * | 14 | * |
| 15 | * Authors: | 15 | * Authors: |
| 16 | * (email-id : megaraidlinux@lsi.com) | 16 | * (email-id : megaraidlinux@lsi.com) |
| @@ -71,6 +71,10 @@ static struct pci_device_id megasas_pci_table[] = { | |||
| 71 | /* ppc IOP */ | 71 | /* ppc IOP */ |
| 72 | {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1078DE)}, | 72 | {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1078DE)}, |
| 73 | /* ppc IOP */ | 73 | /* ppc IOP */ |
| 74 | {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1078GEN2)}, | ||
| 75 | /* gen2*/ | ||
| 76 | {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS0079GEN2)}, | ||
| 77 | /* gen2*/ | ||
| 74 | {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_VERDE_ZCR)}, | 78 | {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_VERDE_ZCR)}, |
| 75 | /* xscale IOP, vega */ | 79 | /* xscale IOP, vega */ |
| 76 | {PCI_DEVICE(PCI_VENDOR_ID_DELL, PCI_DEVICE_ID_DELL_PERC5)}, | 80 | {PCI_DEVICE(PCI_VENDOR_ID_DELL, PCI_DEVICE_ID_DELL_PERC5)}, |
| @@ -198,6 +202,9 @@ megasas_clear_intr_xscale(struct megasas_register_set __iomem * regs) | |||
| 198 | */ | 202 | */ |
| 199 | writel(status, ®s->outbound_intr_status); | 203 | writel(status, ®s->outbound_intr_status); |
| 200 | 204 | ||
| 205 | /* Dummy readl to force pci flush */ | ||
| 206 | readl(®s->outbound_intr_status); | ||
| 207 | |||
| 201 | return 0; | 208 | return 0; |
| 202 | } | 209 | } |
| 203 | 210 | ||
| @@ -293,6 +300,9 @@ megasas_clear_intr_ppc(struct megasas_register_set __iomem * regs) | |||
| 293 | */ | 300 | */ |
| 294 | writel(status, ®s->outbound_doorbell_clear); | 301 | writel(status, ®s->outbound_doorbell_clear); |
| 295 | 302 | ||
| 303 | /* Dummy readl to force pci flush */ | ||
| 304 | readl(®s->outbound_doorbell_clear); | ||
| 305 | |||
| 296 | return 0; | 306 | return 0; |
| 297 | } | 307 | } |
| 298 | /** | 308 | /** |
| @@ -318,6 +328,99 @@ static struct megasas_instance_template megasas_instance_template_ppc = { | |||
| 318 | }; | 328 | }; |
| 319 | 329 | ||
| 320 | /** | 330 | /** |
| 331 | * The following functions are defined for gen2 (deviceid : 0x78 0x79) | ||
| 332 | * controllers | ||
| 333 | */ | ||
| 334 | |||
| 335 | /** | ||
| 336 | * megasas_enable_intr_gen2 - Enables interrupts | ||
| 337 | * @regs: MFI register set | ||
| 338 | */ | ||
| 339 | static inline void | ||
| 340 | megasas_enable_intr_gen2(struct megasas_register_set __iomem *regs) | ||
| 341 | { | ||
| 342 | writel(0xFFFFFFFF, &(regs)->outbound_doorbell_clear); | ||
| 343 | |||
| 344 | /* write ~0x00000005 (4 & 1) to the intr mask*/ | ||
| 345 | writel(~MFI_GEN2_ENABLE_INTERRUPT_MASK, &(regs)->outbound_intr_mask); | ||
| 346 | |||
| 347 | /* Dummy readl to force pci flush */ | ||
| 348 | readl(®s->outbound_intr_mask); | ||
| 349 | } | ||
| 350 | |||
| 351 | /** | ||
| 352 | * megasas_disable_intr_gen2 - Disables interrupt | ||
| 353 | * @regs: MFI register set | ||
| 354 | */ | ||
| 355 | static inline void | ||
| 356 | megasas_disable_intr_gen2(struct megasas_register_set __iomem *regs) | ||
| 357 | { | ||
| 358 | u32 mask = 0xFFFFFFFF; | ||
| 359 | writel(mask, ®s->outbound_intr_mask); | ||
| 360 | /* Dummy readl to force pci flush */ | ||
| 361 | readl(®s->outbound_intr_mask); | ||
| 362 | } | ||
| 363 | |||
| 364 | /** | ||
| 365 | * megasas_read_fw_status_reg_gen2 - returns the current FW status value | ||
| 366 | * @regs: MFI register set | ||
| 367 | */ | ||
| 368 | static u32 | ||
| 369 | megasas_read_fw_status_reg_gen2(struct megasas_register_set __iomem *regs) | ||
| 370 | { | ||
| 371 | return readl(&(regs)->outbound_scratch_pad); | ||
| 372 | } | ||
| 373 | |||
| 374 | /** | ||
| 375 | * megasas_clear_interrupt_gen2 - Check & clear interrupt | ||
| 376 | * @regs: MFI register set | ||
| 377 | */ | ||
| 378 | static int | ||
| 379 | megasas_clear_intr_gen2(struct megasas_register_set __iomem *regs) | ||
| 380 | { | ||
| 381 | u32 status; | ||
| 382 | /* | ||
| 383 | * Check if it is our interrupt | ||
| 384 | */ | ||
| 385 | status = readl(®s->outbound_intr_status); | ||
| 386 | |||
| 387 | if (!(status & MFI_GEN2_ENABLE_INTERRUPT_MASK)) | ||
| 388 | return 1; | ||
| 389 | |||
| 390 | /* | ||
| 391 | * Clear the interrupt by writing back the same value | ||
| 392 | */ | ||
| 393 | writel(status, ®s->outbound_doorbell_clear); | ||
| 394 | |||
| 395 | /* Dummy readl to force pci flush */ | ||
| 396 | readl(®s->outbound_intr_status); | ||
| 397 | |||
| 398 | return 0; | ||
| 399 | } | ||
| 400 | /** | ||
| 401 | * megasas_fire_cmd_gen2 - Sends command to the FW | ||
| 402 | * @frame_phys_addr : Physical address of cmd | ||
| 403 | * @frame_count : Number of frames for the command | ||
| 404 | * @regs : MFI register set | ||
| 405 | */ | ||
| 406 | static inline void | ||
| 407 | megasas_fire_cmd_gen2(dma_addr_t frame_phys_addr, u32 frame_count, | ||
| 408 | struct megasas_register_set __iomem *regs) | ||
| 409 | { | ||
| 410 | writel((frame_phys_addr | (frame_count<<1))|1, | ||
| 411 | &(regs)->inbound_queue_port); | ||
| 412 | } | ||
| 413 | |||
| 414 | static struct megasas_instance_template megasas_instance_template_gen2 = { | ||
| 415 | |||
| 416 | .fire_cmd = megasas_fire_cmd_gen2, | ||
| 417 | .enable_intr = megasas_enable_intr_gen2, | ||
| 418 | .disable_intr = megasas_disable_intr_gen2, | ||
| 419 | .clear_intr = megasas_clear_intr_gen2, | ||
| 420 | .read_fw_status_reg = megasas_read_fw_status_reg_gen2, | ||
| 421 | }; | ||
| 422 | |||
| 423 | /** | ||
| 321 | * This is the end of set of functions & definitions | 424 | * This is the end of set of functions & definitions |
| 322 | * specific to ppc (deviceid : 0x60) controllers | 425 | * specific to ppc (deviceid : 0x60) controllers |
| 323 | */ | 426 | */ |
| @@ -1976,7 +2079,12 @@ static int megasas_init_mfi(struct megasas_instance *instance) | |||
| 1976 | /* | 2079 | /* |
| 1977 | * Map the message registers | 2080 | * Map the message registers |
| 1978 | */ | 2081 | */ |
| 1979 | instance->base_addr = pci_resource_start(instance->pdev, 0); | 2082 | if ((instance->pdev->device == PCI_DEVICE_ID_LSI_SAS1078GEN2) || |
| 2083 | (instance->pdev->device == PCI_DEVICE_ID_LSI_SAS0079GEN2)) { | ||
| 2084 | instance->base_addr = pci_resource_start(instance->pdev, 1); | ||
| 2085 | } else { | ||
| 2086 | instance->base_addr = pci_resource_start(instance->pdev, 0); | ||
| 2087 | } | ||
| 1980 | 2088 | ||
| 1981 | if (pci_request_regions(instance->pdev, "megasas: LSI")) { | 2089 | if (pci_request_regions(instance->pdev, "megasas: LSI")) { |
| 1982 | printk(KERN_DEBUG "megasas: IO memory region busy!\n"); | 2090 | printk(KERN_DEBUG "megasas: IO memory region busy!\n"); |
| @@ -1998,6 +2106,10 @@ static int megasas_init_mfi(struct megasas_instance *instance) | |||
| 1998 | case PCI_DEVICE_ID_LSI_SAS1078DE: | 2106 | case PCI_DEVICE_ID_LSI_SAS1078DE: |
| 1999 | instance->instancet = &megasas_instance_template_ppc; | 2107 | instance->instancet = &megasas_instance_template_ppc; |
| 2000 | break; | 2108 | break; |
| 2109 | case PCI_DEVICE_ID_LSI_SAS1078GEN2: | ||
| 2110 | case PCI_DEVICE_ID_LSI_SAS0079GEN2: | ||
| 2111 | instance->instancet = &megasas_instance_template_gen2; | ||
| 2112 | break; | ||
| 2001 | case PCI_DEVICE_ID_LSI_SAS1064R: | 2113 | case PCI_DEVICE_ID_LSI_SAS1064R: |
| 2002 | case PCI_DEVICE_ID_DELL_PERC5: | 2114 | case PCI_DEVICE_ID_DELL_PERC5: |
| 2003 | default: | 2115 | default: |
| @@ -2857,6 +2969,7 @@ static void megasas_shutdown(struct pci_dev *pdev) | |||
| 2857 | { | 2969 | { |
| 2858 | struct megasas_instance *instance = pci_get_drvdata(pdev); | 2970 | struct megasas_instance *instance = pci_get_drvdata(pdev); |
| 2859 | megasas_flush_cache(instance); | 2971 | megasas_flush_cache(instance); |
| 2972 | megasas_shutdown_controller(instance, MR_DCMD_CTRL_SHUTDOWN); | ||
| 2860 | } | 2973 | } |
| 2861 | 2974 | ||
| 2862 | /** | 2975 | /** |
| @@ -3292,7 +3405,7 @@ megasas_sysfs_set_dbg_lvl(struct device_driver *dd, const char *buf, size_t coun | |||
| 3292 | return retval; | 3405 | return retval; |
| 3293 | } | 3406 | } |
| 3294 | 3407 | ||
| 3295 | static DRIVER_ATTR(dbg_lvl, S_IRUGO|S_IWUGO, megasas_sysfs_show_dbg_lvl, | 3408 | static DRIVER_ATTR(dbg_lvl, S_IRUGO|S_IWUSR, megasas_sysfs_show_dbg_lvl, |
| 3296 | megasas_sysfs_set_dbg_lvl); | 3409 | megasas_sysfs_set_dbg_lvl); |
| 3297 | 3410 | ||
| 3298 | static ssize_t | 3411 | static ssize_t |
diff --git a/drivers/scsi/megaraid/megaraid_sas.h b/drivers/scsi/megaraid/megaraid_sas.h index b0c41e671702..0d033248fdf1 100644 --- a/drivers/scsi/megaraid/megaraid_sas.h +++ b/drivers/scsi/megaraid/megaraid_sas.h | |||
| @@ -18,9 +18,9 @@ | |||
| 18 | /* | 18 | /* |
| 19 | * MegaRAID SAS Driver meta data | 19 | * MegaRAID SAS Driver meta data |
| 20 | */ | 20 | */ |
| 21 | #define MEGASAS_VERSION "00.00.03.20-rc1" | 21 | #define MEGASAS_VERSION "00.00.04.01" |
| 22 | #define MEGASAS_RELDATE "March 10, 2008" | 22 | #define MEGASAS_RELDATE "July 24, 2008" |
| 23 | #define MEGASAS_EXT_VERSION "Mon. March 10 11:02:31 PDT 2008" | 23 | #define MEGASAS_EXT_VERSION "Thu July 24 11:41:51 PST 2008" |
| 24 | 24 | ||
| 25 | /* | 25 | /* |
| 26 | * Device IDs | 26 | * Device IDs |
| @@ -28,6 +28,8 @@ | |||
| 28 | #define PCI_DEVICE_ID_LSI_SAS1078R 0x0060 | 28 | #define PCI_DEVICE_ID_LSI_SAS1078R 0x0060 |
| 29 | #define PCI_DEVICE_ID_LSI_SAS1078DE 0x007C | 29 | #define PCI_DEVICE_ID_LSI_SAS1078DE 0x007C |
| 30 | #define PCI_DEVICE_ID_LSI_VERDE_ZCR 0x0413 | 30 | #define PCI_DEVICE_ID_LSI_VERDE_ZCR 0x0413 |
| 31 | #define PCI_DEVICE_ID_LSI_SAS1078GEN2 0x0078 | ||
| 32 | #define PCI_DEVICE_ID_LSI_SAS0079GEN2 0x0079 | ||
| 31 | 33 | ||
| 32 | /* | 34 | /* |
| 33 | * ===================================== | 35 | * ===================================== |
| @@ -580,6 +582,8 @@ struct megasas_ctrl_info { | |||
| 580 | #define MEGASAS_COMPLETION_TIMER_INTERVAL (HZ/10) | 582 | #define MEGASAS_COMPLETION_TIMER_INTERVAL (HZ/10) |
| 581 | 583 | ||
| 582 | #define MFI_REPLY_1078_MESSAGE_INTERRUPT 0x80000000 | 584 | #define MFI_REPLY_1078_MESSAGE_INTERRUPT 0x80000000 |
| 585 | #define MFI_REPLY_GEN2_MESSAGE_INTERRUPT 0x00000001 | ||
| 586 | #define MFI_GEN2_ENABLE_INTERRUPT_MASK (0x00000001 | 0x00000004) | ||
| 583 | 587 | ||
| 584 | /* | 588 | /* |
| 585 | * register set for both 1068 and 1078 controllers | 589 | * register set for both 1068 and 1078 controllers |
diff --git a/drivers/scsi/nsp32.c b/drivers/scsi/nsp32.c index edf9fdb3cb3c..22052bb7becb 100644 --- a/drivers/scsi/nsp32.c +++ b/drivers/scsi/nsp32.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * 1.2: PowerPC (big endian) support. | 23 | * 1.2: PowerPC (big endian) support. |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/version.h> | ||
| 27 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 28 | #include <linux/init.h> | 27 | #include <linux/init.h> |
| 29 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
diff --git a/drivers/scsi/nsp32.h b/drivers/scsi/nsp32.h index 6715ecb3bfca..9565acf1aa72 100644 --- a/drivers/scsi/nsp32.h +++ b/drivers/scsi/nsp32.h | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #ifndef _NSP32_H | 16 | #ifndef _NSP32_H |
| 17 | #define _NSP32_H | 17 | #define _NSP32_H |
| 18 | 18 | ||
| 19 | #include <linux/version.h> | ||
| 20 | //#define NSP32_DEBUG 9 | 19 | //#define NSP32_DEBUG 9 |
| 21 | 20 | ||
| 22 | /* | 21 | /* |
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c index a221b6ef9fa9..24e6cb8396e3 100644 --- a/drivers/scsi/pcmcia/nsp_cs.c +++ b/drivers/scsi/pcmcia/nsp_cs.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | 25 | ||
| 26 | ***********************************************************************/ | 26 | ***********************************************************************/ |
| 27 | 27 | ||
| 28 | #include <linux/version.h> | ||
| 29 | #include <linux/module.h> | 28 | #include <linux/module.h> |
| 30 | #include <linux/kernel.h> | 29 | #include <linux/kernel.h> |
| 31 | #include <linux/init.h> | 30 | #include <linux/init.h> |
diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c index a319a20ed440..45e7dcb4b34d 100644 --- a/drivers/scsi/qla2xxx/qla_attr.c +++ b/drivers/scsi/qla2xxx/qla_attr.c | |||
| @@ -993,6 +993,17 @@ qla2x00_terminate_rport_io(struct fc_rport *rport) | |||
| 993 | { | 993 | { |
| 994 | fc_port_t *fcport = *(fc_port_t **)rport->dd_data; | 994 | fc_port_t *fcport = *(fc_port_t **)rport->dd_data; |
| 995 | 995 | ||
| 996 | /* | ||
| 997 | * At this point all fcport's software-states are cleared. Perform any | ||
| 998 | * final cleanup of firmware resources (PCBs and XCBs). | ||
| 999 | */ | ||
| 1000 | if (fcport->loop_id != FC_NO_LOOP_ID) { | ||
| 1001 | fcport->ha->isp_ops->fabric_logout(fcport->ha, fcport->loop_id, | ||
| 1002 | fcport->d_id.b.domain, fcport->d_id.b.area, | ||
| 1003 | fcport->d_id.b.al_pa); | ||
| 1004 | fcport->loop_id = FC_NO_LOOP_ID; | ||
| 1005 | } | ||
| 1006 | |||
| 996 | qla2x00_abort_fcport_cmds(fcport); | 1007 | qla2x00_abort_fcport_cmds(fcport); |
| 997 | scsi_target_unblock(&rport->dev); | 1008 | scsi_target_unblock(&rport->dev); |
| 998 | } | 1009 | } |
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h index 6da31ba94404..94a720eabfd8 100644 --- a/drivers/scsi/qla2xxx/qla_def.h +++ b/drivers/scsi/qla2xxx/qla_def.h | |||
| @@ -2237,6 +2237,7 @@ typedef struct scsi_qla_host { | |||
| 2237 | #define REGISTER_FDMI_NEEDED 26 | 2237 | #define REGISTER_FDMI_NEEDED 26 |
| 2238 | #define FCPORT_UPDATE_NEEDED 27 | 2238 | #define FCPORT_UPDATE_NEEDED 27 |
| 2239 | #define VP_DPC_NEEDED 28 /* wake up for VP dpc handling */ | 2239 | #define VP_DPC_NEEDED 28 /* wake up for VP dpc handling */ |
| 2240 | #define UNLOADING 29 | ||
| 2240 | 2241 | ||
| 2241 | uint32_t device_flags; | 2242 | uint32_t device_flags; |
| 2242 | #define DFLG_LOCAL_DEVICES BIT_0 | 2243 | #define DFLG_LOCAL_DEVICES BIT_0 |
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index 601a6b29750c..ee89ddd64aae 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c | |||
| @@ -976,8 +976,9 @@ qla2x00_setup_chip(scsi_qla_host_t *ha) | |||
| 976 | &ha->fw_attributes, &ha->fw_memory_size); | 976 | &ha->fw_attributes, &ha->fw_memory_size); |
| 977 | qla2x00_resize_request_q(ha); | 977 | qla2x00_resize_request_q(ha); |
| 978 | ha->flags.npiv_supported = 0; | 978 | ha->flags.npiv_supported = 0; |
| 979 | if ((IS_QLA24XX(ha) || IS_QLA25XX(ha)) && | 979 | if ((IS_QLA24XX(ha) || IS_QLA25XX(ha) || |
| 980 | (ha->fw_attributes & BIT_2)) { | 980 | IS_QLA84XX(ha)) && |
| 981 | (ha->fw_attributes & BIT_2)) { | ||
| 981 | ha->flags.npiv_supported = 1; | 982 | ha->flags.npiv_supported = 1; |
| 982 | if ((!ha->max_npiv_vports) || | 983 | if ((!ha->max_npiv_vports) || |
| 983 | ((ha->max_npiv_vports + 1) % | 984 | ((ha->max_npiv_vports + 1) % |
| @@ -3251,6 +3252,7 @@ qla2x00_abort_isp(scsi_qla_host_t *ha) | |||
| 3251 | { | 3252 | { |
| 3252 | int rval; | 3253 | int rval; |
| 3253 | uint8_t status = 0; | 3254 | uint8_t status = 0; |
| 3255 | scsi_qla_host_t *vha; | ||
| 3254 | 3256 | ||
| 3255 | if (ha->flags.online) { | 3257 | if (ha->flags.online) { |
| 3256 | ha->flags.online = 0; | 3258 | ha->flags.online = 0; |
| @@ -3265,6 +3267,8 @@ qla2x00_abort_isp(scsi_qla_host_t *ha) | |||
| 3265 | if (atomic_read(&ha->loop_state) != LOOP_DOWN) { | 3267 | if (atomic_read(&ha->loop_state) != LOOP_DOWN) { |
| 3266 | atomic_set(&ha->loop_state, LOOP_DOWN); | 3268 | atomic_set(&ha->loop_state, LOOP_DOWN); |
| 3267 | qla2x00_mark_all_devices_lost(ha, 0); | 3269 | qla2x00_mark_all_devices_lost(ha, 0); |
| 3270 | list_for_each_entry(vha, &ha->vp_list, vp_list) | ||
| 3271 | qla2x00_mark_all_devices_lost(vha, 0); | ||
| 3268 | } else { | 3272 | } else { |
| 3269 | if (!atomic_read(&ha->loop_down_timer)) | 3273 | if (!atomic_read(&ha->loop_down_timer)) |
| 3270 | atomic_set(&ha->loop_down_timer, | 3274 | atomic_set(&ha->loop_down_timer, |
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c index 874d802edb7d..45a3b93eed57 100644 --- a/drivers/scsi/qla2xxx/qla_isr.c +++ b/drivers/scsi/qla2xxx/qla_isr.c | |||
| @@ -879,11 +879,12 @@ qla2x00_handle_sense(srb_t *sp, uint8_t *sense_data, uint32_t sense_len) | |||
| 879 | sp->request_sense_ptr += sense_len; | 879 | sp->request_sense_ptr += sense_len; |
| 880 | sp->request_sense_length -= sense_len; | 880 | sp->request_sense_length -= sense_len; |
| 881 | if (sp->request_sense_length != 0) | 881 | if (sp->request_sense_length != 0) |
| 882 | sp->ha->status_srb = sp; | 882 | sp->fcport->ha->status_srb = sp; |
| 883 | 883 | ||
| 884 | DEBUG5(printk("%s(): Check condition Sense data, scsi(%ld:%d:%d:%d) " | 884 | DEBUG5(printk("%s(): Check condition Sense data, scsi(%ld:%d:%d:%d) " |
| 885 | "cmd=%p pid=%ld\n", __func__, sp->ha->host_no, cp->device->channel, | 885 | "cmd=%p pid=%ld\n", __func__, sp->fcport->ha->host_no, |
| 886 | cp->device->id, cp->device->lun, cp, cp->serial_number)); | 886 | cp->device->channel, cp->device->id, cp->device->lun, cp, |
| 887 | cp->serial_number)); | ||
| 887 | if (sense_len) | 888 | if (sense_len) |
| 888 | DEBUG5(qla2x00_dump_buffer(cp->sense_buffer, | 889 | DEBUG5(qla2x00_dump_buffer(cp->sense_buffer, |
| 889 | CMD_ACTUAL_SNSLEN(cp))); | 890 | CMD_ACTUAL_SNSLEN(cp))); |
| @@ -1184,9 +1185,8 @@ qla2x00_status_entry(scsi_qla_host_t *ha, void *pkt) | |||
| 1184 | atomic_read(&fcport->state))); | 1185 | atomic_read(&fcport->state))); |
| 1185 | 1186 | ||
| 1186 | cp->result = DID_BUS_BUSY << 16; | 1187 | cp->result = DID_BUS_BUSY << 16; |
| 1187 | if (atomic_read(&fcport->state) == FCS_ONLINE) { | 1188 | if (atomic_read(&fcport->state) == FCS_ONLINE) |
| 1188 | qla2x00_mark_device_lost(ha, fcport, 1, 1); | 1189 | qla2x00_mark_device_lost(fcport->ha, fcport, 1, 1); |
| 1189 | } | ||
| 1190 | break; | 1190 | break; |
| 1191 | 1191 | ||
| 1192 | case CS_RESET: | 1192 | case CS_RESET: |
| @@ -1229,7 +1229,7 @@ qla2x00_status_entry(scsi_qla_host_t *ha, void *pkt) | |||
| 1229 | 1229 | ||
| 1230 | /* Check to see if logout occurred. */ | 1230 | /* Check to see if logout occurred. */ |
| 1231 | if ((le16_to_cpu(sts->status_flags) & SF_LOGOUT_SENT)) | 1231 | if ((le16_to_cpu(sts->status_flags) & SF_LOGOUT_SENT)) |
| 1232 | qla2x00_mark_device_lost(ha, fcport, 1, 1); | 1232 | qla2x00_mark_device_lost(fcport->ha, fcport, 1, 1); |
| 1233 | break; | 1233 | break; |
| 1234 | 1234 | ||
| 1235 | default: | 1235 | default: |
diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c index bc90d6b8d0a0..813bc7784c0a 100644 --- a/drivers/scsi/qla2xxx/qla_mbx.c +++ b/drivers/scsi/qla2xxx/qla_mbx.c | |||
| @@ -2686,7 +2686,7 @@ qla24xx_report_id_acquisition(scsi_qla_host_t *ha, | |||
| 2686 | set_bit(VP_IDX_ACQUIRED, &vha->vp_flags); | 2686 | set_bit(VP_IDX_ACQUIRED, &vha->vp_flags); |
| 2687 | set_bit(VP_DPC_NEEDED, &ha->dpc_flags); | 2687 | set_bit(VP_DPC_NEEDED, &ha->dpc_flags); |
| 2688 | 2688 | ||
| 2689 | wake_up_process(ha->dpc_thread); | 2689 | qla2xxx_wake_dpc(ha); |
| 2690 | } | 2690 | } |
| 2691 | } | 2691 | } |
| 2692 | 2692 | ||
diff --git a/drivers/scsi/qla2xxx/qla_mid.c b/drivers/scsi/qla2xxx/qla_mid.c index 50baf6a1d67c..93560cd72784 100644 --- a/drivers/scsi/qla2xxx/qla_mid.c +++ b/drivers/scsi/qla2xxx/qla_mid.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | */ | 6 | */ |
| 7 | #include "qla_def.h" | 7 | #include "qla_def.h" |
| 8 | 8 | ||
| 9 | #include <linux/version.h> | ||
| 10 | #include <linux/moduleparam.h> | 9 | #include <linux/moduleparam.h> |
| 11 | #include <linux/vmalloc.h> | 10 | #include <linux/vmalloc.h> |
| 12 | #include <linux/smp_lock.h> | 11 | #include <linux/smp_lock.h> |
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 7c8af7ed2a5d..26afe44265c7 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c | |||
| @@ -780,7 +780,8 @@ qla2x00_eh_wait_for_pending_commands(scsi_qla_host_t *ha, unsigned int t, | |||
| 780 | sp = pha->outstanding_cmds[cnt]; | 780 | sp = pha->outstanding_cmds[cnt]; |
| 781 | if (!sp) | 781 | if (!sp) |
| 782 | continue; | 782 | continue; |
| 783 | if (ha->vp_idx != sp->ha->vp_idx) | 783 | |
| 784 | if (ha->vp_idx != sp->fcport->ha->vp_idx) | ||
| 784 | continue; | 785 | continue; |
| 785 | match = 0; | 786 | match = 0; |
| 786 | switch (type) { | 787 | switch (type) { |
| @@ -1080,9 +1081,7 @@ qla2x00_abort_all_cmds(scsi_qla_host_t *ha, int res) | |||
| 1080 | sp = ha->outstanding_cmds[cnt]; | 1081 | sp = ha->outstanding_cmds[cnt]; |
| 1081 | if (sp) { | 1082 | if (sp) { |
| 1082 | ha->outstanding_cmds[cnt] = NULL; | 1083 | ha->outstanding_cmds[cnt] = NULL; |
| 1083 | sp->flags = 0; | ||
| 1084 | sp->cmd->result = res; | 1084 | sp->cmd->result = res; |
| 1085 | sp->cmd->host_scribble = (unsigned char *)NULL; | ||
| 1086 | qla2x00_sp_compl(ha, sp); | 1085 | qla2x00_sp_compl(ha, sp); |
| 1087 | } | 1086 | } |
| 1088 | } | 1087 | } |
| @@ -1776,10 +1775,15 @@ probe_out: | |||
| 1776 | static void | 1775 | static void |
| 1777 | qla2x00_remove_one(struct pci_dev *pdev) | 1776 | qla2x00_remove_one(struct pci_dev *pdev) |
| 1778 | { | 1777 | { |
| 1779 | scsi_qla_host_t *ha; | 1778 | scsi_qla_host_t *ha, *vha, *temp; |
| 1780 | 1779 | ||
| 1781 | ha = pci_get_drvdata(pdev); | 1780 | ha = pci_get_drvdata(pdev); |
| 1782 | 1781 | ||
| 1782 | list_for_each_entry_safe(vha, temp, &ha->vp_list, vp_list) | ||
| 1783 | fc_vport_terminate(vha->fc_vport); | ||
| 1784 | |||
| 1785 | set_bit(UNLOADING, &ha->dpc_flags); | ||
| 1786 | |||
| 1783 | qla2x00_dfs_remove(ha); | 1787 | qla2x00_dfs_remove(ha); |
| 1784 | 1788 | ||
| 1785 | qla84xx_put_chip(ha); | 1789 | qla84xx_put_chip(ha); |
| @@ -2451,8 +2455,10 @@ qla2x00_do_dpc(void *data) | |||
| 2451 | void | 2455 | void |
| 2452 | qla2xxx_wake_dpc(scsi_qla_host_t *ha) | 2456 | qla2xxx_wake_dpc(scsi_qla_host_t *ha) |
| 2453 | { | 2457 | { |
| 2454 | if (ha->dpc_thread) | 2458 | struct task_struct *t = ha->dpc_thread; |
| 2455 | wake_up_process(ha->dpc_thread); | 2459 | |
| 2460 | if (!test_bit(UNLOADING, &ha->dpc_flags) && t) | ||
| 2461 | wake_up_process(t); | ||
| 2456 | } | 2462 | } |
| 2457 | 2463 | ||
| 2458 | /* | 2464 | /* |
diff --git a/drivers/scsi/qla2xxx/qla_version.h b/drivers/scsi/qla2xxx/qla_version.h index 676c390db354..4160e4caa7b9 100644 --- a/drivers/scsi/qla2xxx/qla_version.h +++ b/drivers/scsi/qla2xxx/qla_version.h | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | /* | 7 | /* |
| 8 | * Driver version | 8 | * Driver version |
| 9 | */ | 9 | */ |
| 10 | #define QLA2XXX_VERSION "8.02.01-k6" | 10 | #define QLA2XXX_VERSION "8.02.01-k7" |
| 11 | 11 | ||
| 12 | #define QLA_DRIVER_MAJOR_VER 8 | 12 | #define QLA_DRIVER_MAJOR_VER 8 |
| 13 | #define QLA_DRIVER_MINOR_VER 2 | 13 | #define QLA_DRIVER_MINOR_VER 2 |
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index e5e7d7856454..2a2bc89aba83 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c | |||
| @@ -1875,6 +1875,7 @@ static int sd_probe(struct device *dev) | |||
| 1875 | 1875 | ||
| 1876 | dev_set_drvdata(dev, sdkp); | 1876 | dev_set_drvdata(dev, sdkp); |
| 1877 | add_disk(gd); | 1877 | add_disk(gd); |
| 1878 | blk_register_filter(gd); | ||
| 1878 | sd_dif_config_host(sdkp); | 1879 | sd_dif_config_host(sdkp); |
| 1879 | 1880 | ||
| 1880 | sd_printk(KERN_NOTICE, sdkp, "Attached SCSI %sdisk\n", | 1881 | sd_printk(KERN_NOTICE, sdkp, "Attached SCSI %sdisk\n", |
| @@ -1908,6 +1909,7 @@ static int sd_remove(struct device *dev) | |||
| 1908 | struct scsi_disk *sdkp = dev_get_drvdata(dev); | 1909 | struct scsi_disk *sdkp = dev_get_drvdata(dev); |
| 1909 | 1910 | ||
| 1910 | device_del(&sdkp->dev); | 1911 | device_del(&sdkp->dev); |
| 1912 | blk_unregister_filter(sdkp->disk); | ||
| 1911 | del_gendisk(sdkp->disk); | 1913 | del_gendisk(sdkp->disk); |
| 1912 | sd_shutdown(dev); | 1914 | sd_shutdown(dev); |
| 1913 | 1915 | ||
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c index 3d36270a8b4d..661f9f21650a 100644 --- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c | |||
| @@ -217,6 +217,18 @@ static int sg_last_dev(void); | |||
| 217 | #define SZ_SG_IOVEC sizeof(sg_iovec_t) | 217 | #define SZ_SG_IOVEC sizeof(sg_iovec_t) |
| 218 | #define SZ_SG_REQ_INFO sizeof(sg_req_info_t) | 218 | #define SZ_SG_REQ_INFO sizeof(sg_req_info_t) |
| 219 | 219 | ||
| 220 | static int sg_allow_access(struct file *filp, unsigned char *cmd) | ||
| 221 | { | ||
| 222 | struct sg_fd *sfp = (struct sg_fd *)filp->private_data; | ||
| 223 | struct request_queue *q = sfp->parentdp->device->request_queue; | ||
| 224 | |||
| 225 | if (sfp->parentdp->device->type == TYPE_SCANNER) | ||
| 226 | return 0; | ||
| 227 | |||
| 228 | return blk_verify_command(&q->cmd_filter, | ||
| 229 | cmd, filp->f_mode & FMODE_WRITE); | ||
| 230 | } | ||
| 231 | |||
| 220 | static int | 232 | static int |
| 221 | sg_open(struct inode *inode, struct file *filp) | 233 | sg_open(struct inode *inode, struct file *filp) |
| 222 | { | 234 | { |
| @@ -689,7 +701,7 @@ sg_new_write(Sg_fd *sfp, struct file *file, const char __user *buf, | |||
| 689 | sg_remove_request(sfp, srp); | 701 | sg_remove_request(sfp, srp); |
| 690 | return -EFAULT; | 702 | return -EFAULT; |
| 691 | } | 703 | } |
| 692 | if (read_only && !blk_verify_command(file, cmnd)) { | 704 | if (read_only && sg_allow_access(file, cmnd)) { |
| 693 | sg_remove_request(sfp, srp); | 705 | sg_remove_request(sfp, srp); |
| 694 | return -EPERM; | 706 | return -EPERM; |
| 695 | } | 707 | } |
| @@ -793,6 +805,7 @@ sg_ioctl(struct inode *inode, struct file *filp, | |||
| 793 | 805 | ||
| 794 | if ((!(sfp = (Sg_fd *) filp->private_data)) || (!(sdp = sfp->parentdp))) | 806 | if ((!(sfp = (Sg_fd *) filp->private_data)) || (!(sdp = sfp->parentdp))) |
| 795 | return -ENXIO; | 807 | return -ENXIO; |
| 808 | |||
| 796 | SCSI_LOG_TIMEOUT(3, printk("sg_ioctl: %s, cmd=0x%x\n", | 809 | SCSI_LOG_TIMEOUT(3, printk("sg_ioctl: %s, cmd=0x%x\n", |
| 797 | sdp->disk->disk_name, (int) cmd_in)); | 810 | sdp->disk->disk_name, (int) cmd_in)); |
| 798 | read_only = (O_RDWR != (filp->f_flags & O_ACCMODE)); | 811 | read_only = (O_RDWR != (filp->f_flags & O_ACCMODE)); |
| @@ -1061,7 +1074,7 @@ sg_ioctl(struct inode *inode, struct file *filp, | |||
| 1061 | 1074 | ||
| 1062 | if (copy_from_user(&opcode, siocp->data, 1)) | 1075 | if (copy_from_user(&opcode, siocp->data, 1)) |
| 1063 | return -EFAULT; | 1076 | return -EFAULT; |
| 1064 | if (!blk_verify_command(filp, &opcode)) | 1077 | if (sg_allow_access(filp, &opcode)) |
| 1065 | return -EPERM; | 1078 | return -EPERM; |
| 1066 | } | 1079 | } |
| 1067 | return sg_scsi_ioctl(filp, sdp->device->request_queue, NULL, p); | 1080 | return sg_scsi_ioctl(filp, sdp->device->request_queue, NULL, p); |
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index 27f5bfd1def3..3292965bfd84 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c | |||
| @@ -656,6 +656,7 @@ static int sr_probe(struct device *dev) | |||
| 656 | dev_set_drvdata(dev, cd); | 656 | dev_set_drvdata(dev, cd); |
| 657 | disk->flags |= GENHD_FL_REMOVABLE; | 657 | disk->flags |= GENHD_FL_REMOVABLE; |
| 658 | add_disk(disk); | 658 | add_disk(disk); |
| 659 | blk_register_filter(disk); | ||
| 659 | 660 | ||
| 660 | sdev_printk(KERN_DEBUG, sdev, | 661 | sdev_printk(KERN_DEBUG, sdev, |
| 661 | "Attached scsi CD-ROM %s\n", cd->cdi.name); | 662 | "Attached scsi CD-ROM %s\n", cd->cdi.name); |
| @@ -894,6 +895,7 @@ static int sr_remove(struct device *dev) | |||
| 894 | { | 895 | { |
| 895 | struct scsi_cd *cd = dev_get_drvdata(dev); | 896 | struct scsi_cd *cd = dev_get_drvdata(dev); |
| 896 | 897 | ||
| 898 | blk_unregister_filter(cd->disk); | ||
| 897 | del_gendisk(cd->disk); | 899 | del_gendisk(cd->disk); |
| 898 | 900 | ||
| 899 | mutex_lock(&sr_ref_mutex); | 901 | mutex_lock(&sr_ref_mutex); |
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c index 342e12fb1c25..9ccc563d8730 100644 --- a/drivers/serial/8250.c +++ b/drivers/serial/8250.c | |||
| @@ -1908,15 +1908,23 @@ static int serial8250_startup(struct uart_port *port) | |||
| 1908 | * kick the UART on a regular basis. | 1908 | * kick the UART on a regular basis. |
| 1909 | */ | 1909 | */ |
| 1910 | if (!(iir1 & UART_IIR_NO_INT) && (iir & UART_IIR_NO_INT)) { | 1910 | if (!(iir1 & UART_IIR_NO_INT) && (iir & UART_IIR_NO_INT)) { |
| 1911 | up->bugs |= UART_BUG_THRE; | ||
| 1911 | pr_debug("ttyS%d - using backup timer\n", port->line); | 1912 | pr_debug("ttyS%d - using backup timer\n", port->line); |
| 1912 | up->timer.function = serial8250_backup_timeout; | ||
| 1913 | up->timer.data = (unsigned long)up; | ||
| 1914 | mod_timer(&up->timer, jiffies + | ||
| 1915 | poll_timeout(up->port.timeout) + HZ / 5); | ||
| 1916 | } | 1913 | } |
| 1917 | } | 1914 | } |
| 1918 | 1915 | ||
| 1919 | /* | 1916 | /* |
| 1917 | * The above check will only give an accurate result the first time | ||
| 1918 | * the port is opened so this value needs to be preserved. | ||
| 1919 | */ | ||
| 1920 | if (up->bugs & UART_BUG_THRE) { | ||
| 1921 | up->timer.function = serial8250_backup_timeout; | ||
| 1922 | up->timer.data = (unsigned long)up; | ||
| 1923 | mod_timer(&up->timer, jiffies + | ||
| 1924 | poll_timeout(up->port.timeout) + HZ / 5); | ||
| 1925 | } | ||
| 1926 | |||
| 1927 | /* | ||
| 1920 | * If the "interrupt" for this port doesn't correspond with any | 1928 | * If the "interrupt" for this port doesn't correspond with any |
| 1921 | * hardware interrupt, we use a timer-based system. The original | 1929 | * hardware interrupt, we use a timer-based system. The original |
| 1922 | * driver used to do this with IRQ0. | 1930 | * driver used to do this with IRQ0. |
diff --git a/drivers/serial/8250.h b/drivers/serial/8250.h index 78c00162b04e..520260326f3d 100644 --- a/drivers/serial/8250.h +++ b/drivers/serial/8250.h | |||
| @@ -47,6 +47,7 @@ struct serial8250_config { | |||
| 47 | #define UART_BUG_QUOT (1 << 0) /* UART has buggy quot LSB */ | 47 | #define UART_BUG_QUOT (1 << 0) /* UART has buggy quot LSB */ |
| 48 | #define UART_BUG_TXEN (1 << 1) /* UART has buggy TX IIR status */ | 48 | #define UART_BUG_TXEN (1 << 1) /* UART has buggy TX IIR status */ |
| 49 | #define UART_BUG_NOMSR (1 << 2) /* UART has buggy MSR status bits (Au1x00) */ | 49 | #define UART_BUG_NOMSR (1 << 2) /* UART has buggy MSR status bits (Au1x00) */ |
| 50 | #define UART_BUG_THRE (1 << 3) /* UART has buggy THRE reassertion */ | ||
| 50 | 51 | ||
| 51 | #define PROBE_RSA (1 << 0) | 52 | #define PROBE_RSA (1 << 0) |
| 52 | #define PROBE_ANY (~0) | 53 | #define PROBE_ANY (~0) |
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 3b4a14e355c1..77cb34270fc1 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig | |||
| @@ -449,6 +449,7 @@ config SERIAL_CLPS711X_CONSOLE | |||
| 449 | config SERIAL_SAMSUNG | 449 | config SERIAL_SAMSUNG |
| 450 | tristate "Samsung SoC serial support" | 450 | tristate "Samsung SoC serial support" |
| 451 | depends on ARM && PLAT_S3C24XX | 451 | depends on ARM && PLAT_S3C24XX |
| 452 | select SERIAL_CORE | ||
| 452 | help | 453 | help |
| 453 | Support for the on-chip UARTs on the Samsung S3C24XX series CPUs, | 454 | Support for the on-chip UARTs on the Samsung S3C24XX series CPUs, |
| 454 | providing /dev/ttySAC0, 1 and 2 (note, some machines may not | 455 | providing /dev/ttySAC0, 1 and 2 (note, some machines may not |
diff --git a/drivers/serial/bfin_5xx.c b/drivers/serial/bfin_5xx.c index efcd44344fb1..4a0d30bed9f1 100644 --- a/drivers/serial/bfin_5xx.c +++ b/drivers/serial/bfin_5xx.c | |||
| @@ -28,7 +28,7 @@ | |||
| 28 | #endif | 28 | #endif |
| 29 | 29 | ||
| 30 | #include <asm/gpio.h> | 30 | #include <asm/gpio.h> |
| 31 | #include <asm/mach/bfin_serial_5xx.h> | 31 | #include <mach/bfin_serial_5xx.h> |
| 32 | 32 | ||
| 33 | #ifdef CONFIG_SERIAL_BFIN_DMA | 33 | #ifdef CONFIG_SERIAL_BFIN_DMA |
| 34 | #include <linux/dma-mapping.h> | 34 | #include <linux/dma-mapping.h> |
diff --git a/drivers/serial/sunhv.c b/drivers/serial/sunhv.c index aeeec5588afd..e41766d08035 100644 --- a/drivers/serial/sunhv.c +++ b/drivers/serial/sunhv.c | |||
| @@ -17,11 +17,11 @@ | |||
| 17 | #include <linux/slab.h> | 17 | #include <linux/slab.h> |
| 18 | #include <linux/delay.h> | 18 | #include <linux/delay.h> |
| 19 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 20 | #include <linux/of_device.h> | ||
| 20 | 21 | ||
| 21 | #include <asm/hypervisor.h> | 22 | #include <asm/hypervisor.h> |
| 22 | #include <asm/spitfire.h> | 23 | #include <asm/spitfire.h> |
| 23 | #include <asm/prom.h> | 24 | #include <asm/prom.h> |
| 24 | #include <asm/of_device.h> | ||
| 25 | #include <asm/irq.h> | 25 | #include <asm/irq.h> |
| 26 | 26 | ||
| 27 | #if defined(CONFIG_MAGIC_SYSRQ) | 27 | #if defined(CONFIG_MAGIC_SYSRQ) |
diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c index 15ee497e1c78..29b4458abf74 100644 --- a/drivers/serial/sunsab.c +++ b/drivers/serial/sunsab.c | |||
| @@ -32,11 +32,11 @@ | |||
| 32 | #include <linux/slab.h> | 32 | #include <linux/slab.h> |
| 33 | #include <linux/delay.h> | 33 | #include <linux/delay.h> |
| 34 | #include <linux/init.h> | 34 | #include <linux/init.h> |
| 35 | #include <linux/of_device.h> | ||
| 35 | 36 | ||
| 36 | #include <asm/io.h> | 37 | #include <asm/io.h> |
| 37 | #include <asm/irq.h> | 38 | #include <asm/irq.h> |
| 38 | #include <asm/prom.h> | 39 | #include <asm/prom.h> |
| 39 | #include <asm/of_device.h> | ||
| 40 | 40 | ||
| 41 | #if defined(CONFIG_SERIAL_SUNSAB_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) | 41 | #if defined(CONFIG_SERIAL_SUNSAB_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) |
| 42 | #define SUPPORT_SYSRQ | 42 | #define SUPPORT_SYSRQ |
diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c index e24e68235088..a378464f9292 100644 --- a/drivers/serial/sunsu.c +++ b/drivers/serial/sunsu.c | |||
| @@ -35,11 +35,11 @@ | |||
| 35 | #include <linux/serial_reg.h> | 35 | #include <linux/serial_reg.h> |
| 36 | #include <linux/init.h> | 36 | #include <linux/init.h> |
| 37 | #include <linux/delay.h> | 37 | #include <linux/delay.h> |
| 38 | #include <linux/of_device.h> | ||
| 38 | 39 | ||
| 39 | #include <asm/io.h> | 40 | #include <asm/io.h> |
| 40 | #include <asm/irq.h> | 41 | #include <asm/irq.h> |
| 41 | #include <asm/prom.h> | 42 | #include <asm/prom.h> |
| 42 | #include <asm/of_device.h> | ||
| 43 | 43 | ||
| 44 | #if defined(CONFIG_SERIAL_SUNSU_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) | 44 | #if defined(CONFIG_SERIAL_SUNSU_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) |
| 45 | #define SUPPORT_SYSRQ | 45 | #define SUPPORT_SYSRQ |
diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c index 0f3d69b86d67..3cb4c8aee13f 100644 --- a/drivers/serial/sunzilog.c +++ b/drivers/serial/sunzilog.c | |||
| @@ -32,11 +32,11 @@ | |||
| 32 | #include <linux/serio.h> | 32 | #include <linux/serio.h> |
| 33 | #endif | 33 | #endif |
| 34 | #include <linux/init.h> | 34 | #include <linux/init.h> |
| 35 | #include <linux/of_device.h> | ||
| 35 | 36 | ||
| 36 | #include <asm/io.h> | 37 | #include <asm/io.h> |
| 37 | #include <asm/irq.h> | 38 | #include <asm/irq.h> |
| 38 | #include <asm/prom.h> | 39 | #include <asm/prom.h> |
| 39 | #include <asm/of_device.h> | ||
| 40 | 40 | ||
| 41 | #if defined(CONFIG_SERIAL_SUNZILOG_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) | 41 | #if defined(CONFIG_SERIAL_SUNZILOG_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) |
| 42 | #define SUPPORT_SYSRQ | 42 | #define SUPPORT_SYSRQ |
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 964124b60db2..75e86865234c 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c | |||
| @@ -226,10 +226,11 @@ EXPORT_SYMBOL_GPL(spi_alloc_device); | |||
| 226 | * Companion function to spi_alloc_device. Devices allocated with | 226 | * Companion function to spi_alloc_device. Devices allocated with |
| 227 | * spi_alloc_device can be added onto the spi bus with this function. | 227 | * spi_alloc_device can be added onto the spi bus with this function. |
| 228 | * | 228 | * |
| 229 | * Returns 0 on success; non-zero on failure | 229 | * Returns 0 on success; negative errno on failure |
| 230 | */ | 230 | */ |
| 231 | int spi_add_device(struct spi_device *spi) | 231 | int spi_add_device(struct spi_device *spi) |
| 232 | { | 232 | { |
| 233 | static DEFINE_MUTEX(spi_add_lock); | ||
| 233 | struct device *dev = spi->master->dev.parent; | 234 | struct device *dev = spi->master->dev.parent; |
| 234 | int status; | 235 | int status; |
| 235 | 236 | ||
| @@ -246,26 +247,43 @@ int spi_add_device(struct spi_device *spi) | |||
| 246 | "%s.%u", spi->master->dev.bus_id, | 247 | "%s.%u", spi->master->dev.bus_id, |
| 247 | spi->chip_select); | 248 | spi->chip_select); |
| 248 | 249 | ||
| 249 | /* drivers may modify this initial i/o setup */ | 250 | |
| 251 | /* We need to make sure there's no other device with this | ||
| 252 | * chipselect **BEFORE** we call setup(), else we'll trash | ||
| 253 | * its configuration. Lock against concurrent add() calls. | ||
| 254 | */ | ||
| 255 | mutex_lock(&spi_add_lock); | ||
| 256 | |||
| 257 | if (bus_find_device_by_name(&spi_bus_type, NULL, spi->dev.bus_id) | ||
| 258 | != NULL) { | ||
| 259 | dev_err(dev, "chipselect %d already in use\n", | ||
| 260 | spi->chip_select); | ||
| 261 | status = -EBUSY; | ||
| 262 | goto done; | ||
| 263 | } | ||
| 264 | |||
| 265 | /* Drivers may modify this initial i/o setup, but will | ||
| 266 | * normally rely on the device being setup. Devices | ||
| 267 | * using SPI_CS_HIGH can't coexist well otherwise... | ||
| 268 | */ | ||
| 250 | status = spi->master->setup(spi); | 269 | status = spi->master->setup(spi); |
| 251 | if (status < 0) { | 270 | if (status < 0) { |
| 252 | dev_err(dev, "can't %s %s, status %d\n", | 271 | dev_err(dev, "can't %s %s, status %d\n", |
| 253 | "setup", spi->dev.bus_id, status); | 272 | "setup", spi->dev.bus_id, status); |
| 254 | return status; | 273 | goto done; |
| 255 | } | 274 | } |
| 256 | 275 | ||
| 257 | /* driver core catches callers that misbehave by defining | 276 | /* Device may be bound to an active driver when this returns */ |
| 258 | * devices that already exist. | ||
| 259 | */ | ||
| 260 | status = device_add(&spi->dev); | 277 | status = device_add(&spi->dev); |
| 261 | if (status < 0) { | 278 | if (status < 0) |
| 262 | dev_err(dev, "can't %s %s, status %d\n", | 279 | dev_err(dev, "can't %s %s, status %d\n", |
| 263 | "add", spi->dev.bus_id, status); | 280 | "add", spi->dev.bus_id, status); |
| 264 | return status; | 281 | else |
| 265 | } | 282 | dev_dbg(dev, "registered child %s\n", spi->dev.bus_id); |
| 266 | 283 | ||
| 267 | dev_dbg(dev, "registered child %s\n", spi->dev.bus_id); | 284 | done: |
| 268 | return 0; | 285 | mutex_unlock(&spi_add_lock); |
| 286 | return status; | ||
| 269 | } | 287 | } |
| 270 | EXPORT_SYMBOL_GPL(spi_add_device); | 288 | EXPORT_SYMBOL_GPL(spi_add_device); |
| 271 | 289 | ||
diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c index d831a2beff39..87ab2443e66d 100644 --- a/drivers/ssb/main.c +++ b/drivers/ssb/main.c | |||
| @@ -1165,15 +1165,19 @@ EXPORT_SYMBOL(ssb_dma_translation); | |||
| 1165 | 1165 | ||
| 1166 | int ssb_dma_set_mask(struct ssb_device *dev, u64 mask) | 1166 | int ssb_dma_set_mask(struct ssb_device *dev, u64 mask) |
| 1167 | { | 1167 | { |
| 1168 | #ifdef CONFIG_SSB_PCIHOST | ||
| 1168 | int err; | 1169 | int err; |
| 1170 | #endif | ||
| 1169 | 1171 | ||
| 1170 | switch (dev->bus->bustype) { | 1172 | switch (dev->bus->bustype) { |
| 1171 | case SSB_BUSTYPE_PCI: | 1173 | case SSB_BUSTYPE_PCI: |
| 1174 | #ifdef CONFIG_SSB_PCIHOST | ||
| 1172 | err = pci_set_dma_mask(dev->bus->host_pci, mask); | 1175 | err = pci_set_dma_mask(dev->bus->host_pci, mask); |
| 1173 | if (err) | 1176 | if (err) |
| 1174 | return err; | 1177 | return err; |
| 1175 | err = pci_set_consistent_dma_mask(dev->bus->host_pci, mask); | 1178 | err = pci_set_consistent_dma_mask(dev->bus->host_pci, mask); |
| 1176 | return err; | 1179 | return err; |
| 1180 | #endif | ||
| 1177 | case SSB_BUSTYPE_SSB: | 1181 | case SSB_BUSTYPE_SSB: |
| 1178 | return dma_set_mask(dev->dev, mask); | 1182 | return dma_set_mask(dev->dev, mask); |
| 1179 | default: | 1183 | default: |
| @@ -1188,6 +1192,7 @@ void * ssb_dma_alloc_consistent(struct ssb_device *dev, size_t size, | |||
| 1188 | { | 1192 | { |
| 1189 | switch (dev->bus->bustype) { | 1193 | switch (dev->bus->bustype) { |
| 1190 | case SSB_BUSTYPE_PCI: | 1194 | case SSB_BUSTYPE_PCI: |
| 1195 | #ifdef CONFIG_SSB_PCIHOST | ||
| 1191 | if (gfp_flags & GFP_DMA) { | 1196 | if (gfp_flags & GFP_DMA) { |
| 1192 | /* Workaround: The PCI API does not support passing | 1197 | /* Workaround: The PCI API does not support passing |
| 1193 | * a GFP flag. */ | 1198 | * a GFP flag. */ |
| @@ -1195,6 +1200,7 @@ void * ssb_dma_alloc_consistent(struct ssb_device *dev, size_t size, | |||
| 1195 | size, dma_handle, gfp_flags); | 1200 | size, dma_handle, gfp_flags); |
| 1196 | } | 1201 | } |
| 1197 | return pci_alloc_consistent(dev->bus->host_pci, size, dma_handle); | 1202 | return pci_alloc_consistent(dev->bus->host_pci, size, dma_handle); |
| 1203 | #endif | ||
| 1198 | case SSB_BUSTYPE_SSB: | 1204 | case SSB_BUSTYPE_SSB: |
| 1199 | return dma_alloc_coherent(dev->dev, size, dma_handle, gfp_flags); | 1205 | return dma_alloc_coherent(dev->dev, size, dma_handle, gfp_flags); |
| 1200 | default: | 1206 | default: |
| @@ -1210,6 +1216,7 @@ void ssb_dma_free_consistent(struct ssb_device *dev, size_t size, | |||
| 1210 | { | 1216 | { |
| 1211 | switch (dev->bus->bustype) { | 1217 | switch (dev->bus->bustype) { |
| 1212 | case SSB_BUSTYPE_PCI: | 1218 | case SSB_BUSTYPE_PCI: |
| 1219 | #ifdef CONFIG_SSB_PCIHOST | ||
| 1213 | if (gfp_flags & GFP_DMA) { | 1220 | if (gfp_flags & GFP_DMA) { |
| 1214 | /* Workaround: The PCI API does not support passing | 1221 | /* Workaround: The PCI API does not support passing |
| 1215 | * a GFP flag. */ | 1222 | * a GFP flag. */ |
| @@ -1220,6 +1227,7 @@ void ssb_dma_free_consistent(struct ssb_device *dev, size_t size, | |||
| 1220 | pci_free_consistent(dev->bus->host_pci, size, | 1227 | pci_free_consistent(dev->bus->host_pci, size, |
| 1221 | vaddr, dma_handle); | 1228 | vaddr, dma_handle); |
| 1222 | return; | 1229 | return; |
| 1230 | #endif | ||
| 1223 | case SSB_BUSTYPE_SSB: | 1231 | case SSB_BUSTYPE_SSB: |
| 1224 | dma_free_coherent(dev->dev, size, vaddr, dma_handle); | 1232 | dma_free_coherent(dev->dev, size, vaddr, dma_handle); |
| 1225 | return; | 1233 | return; |
diff --git a/drivers/uio/Kconfig b/drivers/uio/Kconfig index 2e9079df26b3..4190be64917f 100644 --- a/drivers/uio/Kconfig +++ b/drivers/uio/Kconfig | |||
| @@ -33,6 +33,19 @@ config UIO_PDRV | |||
| 33 | 33 | ||
| 34 | If you don't know what to do here, say N. | 34 | If you don't know what to do here, say N. |
| 35 | 35 | ||
| 36 | config UIO_PDRV_GENIRQ | ||
| 37 | tristate "Userspace I/O platform driver with generic IRQ handling" | ||
| 38 | help | ||
| 39 | Platform driver for Userspace I/O devices, including generic | ||
| 40 | interrupt handling code. Shared interrupts are not supported. | ||
| 41 | |||
| 42 | This kernel driver requires that the matching userspace driver | ||
| 43 | handles interrupts in a special way. Userspace is responsible | ||
| 44 | for acknowledging the hardware device if needed, and re-enabling | ||
| 45 | interrupts in the interrupt controller using the write() syscall. | ||
| 46 | |||
| 47 | If you don't know what to do here, say N. | ||
| 48 | |||
| 36 | config UIO_SMX | 49 | config UIO_SMX |
| 37 | tristate "SMX cryptengine UIO interface" | 50 | tristate "SMX cryptengine UIO interface" |
| 38 | default n | 51 | default n |
diff --git a/drivers/uio/Makefile b/drivers/uio/Makefile index e00ce0def1a0..8667bbdef904 100644 --- a/drivers/uio/Makefile +++ b/drivers/uio/Makefile | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | obj-$(CONFIG_UIO) += uio.o | 1 | obj-$(CONFIG_UIO) += uio.o |
| 2 | obj-$(CONFIG_UIO_CIF) += uio_cif.o | 2 | obj-$(CONFIG_UIO_CIF) += uio_cif.o |
| 3 | obj-$(CONFIG_UIO_PDRV) += uio_pdrv.o | 3 | obj-$(CONFIG_UIO_PDRV) += uio_pdrv.o |
| 4 | obj-$(CONFIG_UIO_PDRV_GENIRQ) += uio_pdrv_genirq.o | ||
| 4 | obj-$(CONFIG_UIO_SMX) += uio_smx.o | 5 | obj-$(CONFIG_UIO_SMX) += uio_smx.o |
diff --git a/drivers/uio/uio_pdrv.c b/drivers/uio/uio_pdrv.c index 5d0d2e85d982..0b4ef39cd85d 100644 --- a/drivers/uio/uio_pdrv.c +++ b/drivers/uio/uio_pdrv.c | |||
| @@ -88,6 +88,8 @@ static int uio_pdrv_remove(struct platform_device *pdev) | |||
| 88 | 88 | ||
| 89 | uio_unregister_device(pdata->uioinfo); | 89 | uio_unregister_device(pdata->uioinfo); |
| 90 | 90 | ||
| 91 | kfree(pdata); | ||
| 92 | |||
| 91 | return 0; | 93 | return 0; |
| 92 | } | 94 | } |
| 93 | 95 | ||
| @@ -114,5 +116,5 @@ module_exit(uio_pdrv_exit); | |||
| 114 | 116 | ||
| 115 | MODULE_AUTHOR("Uwe Kleine-Koenig"); | 117 | MODULE_AUTHOR("Uwe Kleine-Koenig"); |
| 116 | MODULE_DESCRIPTION("Userspace I/O platform driver"); | 118 | MODULE_DESCRIPTION("Userspace I/O platform driver"); |
| 117 | MODULE_LICENSE("GPL"); | 119 | MODULE_LICENSE("GPL v2"); |
| 118 | MODULE_ALIAS("platform:" DRIVER_NAME); | 120 | MODULE_ALIAS("platform:" DRIVER_NAME); |
diff --git a/drivers/uio/uio_pdrv_genirq.c b/drivers/uio/uio_pdrv_genirq.c new file mode 100644 index 000000000000..1f82c83a92ae --- /dev/null +++ b/drivers/uio/uio_pdrv_genirq.c | |||
| @@ -0,0 +1,188 @@ | |||
| 1 | /* | ||
| 2 | * drivers/uio/uio_pdrv_genirq.c | ||
| 3 | * | ||
| 4 | * Userspace I/O platform driver with generic IRQ handling code. | ||
| 5 | * | ||
| 6 | * Copyright (C) 2008 Magnus Damm | ||
| 7 | * | ||
| 8 | * Based on uio_pdrv.c by Uwe Kleine-Koenig, | ||
| 9 | * Copyright (C) 2008 by Digi International Inc. | ||
| 10 | * All rights reserved. | ||
| 11 | * | ||
| 12 | * This program is free software; you can redistribute it and/or modify it | ||
| 13 | * under the terms of the GNU General Public License version 2 as published by | ||
| 14 | * the Free Software Foundation. | ||
| 15 | */ | ||
| 16 | |||
| 17 | #include <linux/platform_device.h> | ||
| 18 | #include <linux/uio_driver.h> | ||
| 19 | #include <linux/spinlock.h> | ||
| 20 | #include <linux/bitops.h> | ||
| 21 | #include <linux/interrupt.h> | ||
| 22 | #include <linux/stringify.h> | ||
| 23 | |||
| 24 | #define DRIVER_NAME "uio_pdrv_genirq" | ||
| 25 | |||
| 26 | struct uio_pdrv_genirq_platdata { | ||
| 27 | struct uio_info *uioinfo; | ||
| 28 | spinlock_t lock; | ||
| 29 | unsigned long flags; | ||
| 30 | }; | ||
| 31 | |||
| 32 | static irqreturn_t uio_pdrv_genirq_handler(int irq, struct uio_info *dev_info) | ||
| 33 | { | ||
| 34 | struct uio_pdrv_genirq_platdata *priv = dev_info->priv; | ||
| 35 | |||
| 36 | /* Just disable the interrupt in the interrupt controller, and | ||
| 37 | * remember the state so we can allow user space to enable it later. | ||
| 38 | */ | ||
| 39 | |||
| 40 | if (!test_and_set_bit(0, &priv->flags)) | ||
| 41 | disable_irq_nosync(irq); | ||
| 42 | |||
| 43 | return IRQ_HANDLED; | ||
| 44 | } | ||
| 45 | |||
| 46 | static int uio_pdrv_genirq_irqcontrol(struct uio_info *dev_info, s32 irq_on) | ||
| 47 | { | ||
| 48 | struct uio_pdrv_genirq_platdata *priv = dev_info->priv; | ||
| 49 | unsigned long flags; | ||
| 50 | |||
| 51 | /* Allow user space to enable and disable the interrupt | ||
| 52 | * in the interrupt controller, but keep track of the | ||
| 53 | * state to prevent per-irq depth damage. | ||
| 54 | * | ||
| 55 | * Serialize this operation to support multiple tasks. | ||
| 56 | */ | ||
| 57 | |||
| 58 | spin_lock_irqsave(&priv->lock, flags); | ||
| 59 | if (irq_on) { | ||
| 60 | if (test_and_clear_bit(0, &priv->flags)) | ||
| 61 | enable_irq(dev_info->irq); | ||
| 62 | } else { | ||
| 63 | if (!test_and_set_bit(0, &priv->flags)) | ||
| 64 | disable_irq(dev_info->irq); | ||
| 65 | } | ||
| 66 | spin_unlock_irqrestore(&priv->lock, flags); | ||
| 67 | |||
| 68 | return 0; | ||
| 69 | } | ||
| 70 | |||
| 71 | static int uio_pdrv_genirq_probe(struct platform_device *pdev) | ||
| 72 | { | ||
| 73 | struct uio_info *uioinfo = pdev->dev.platform_data; | ||
| 74 | struct uio_pdrv_genirq_platdata *priv; | ||
| 75 | struct uio_mem *uiomem; | ||
| 76 | int ret = -EINVAL; | ||
| 77 | int i; | ||
| 78 | |||
| 79 | if (!uioinfo || !uioinfo->name || !uioinfo->version) { | ||
| 80 | dev_err(&pdev->dev, "missing platform_data\n"); | ||
| 81 | goto bad0; | ||
| 82 | } | ||
| 83 | |||
| 84 | if (uioinfo->handler || uioinfo->irqcontrol || uioinfo->irq_flags) { | ||
| 85 | dev_err(&pdev->dev, "interrupt configuration error\n"); | ||
| 86 | goto bad0; | ||
| 87 | } | ||
| 88 | |||
| 89 | priv = kzalloc(sizeof(*priv), GFP_KERNEL); | ||
| 90 | if (!priv) { | ||
| 91 | ret = -ENOMEM; | ||
| 92 | dev_err(&pdev->dev, "unable to kmalloc\n"); | ||
| 93 | goto bad0; | ||
| 94 | } | ||
| 95 | |||
| 96 | priv->uioinfo = uioinfo; | ||
| 97 | spin_lock_init(&priv->lock); | ||
| 98 | priv->flags = 0; /* interrupt is enabled to begin with */ | ||
| 99 | |||
| 100 | uiomem = &uioinfo->mem[0]; | ||
| 101 | |||
| 102 | for (i = 0; i < pdev->num_resources; ++i) { | ||
| 103 | struct resource *r = &pdev->resource[i]; | ||
| 104 | |||
| 105 | if (r->flags != IORESOURCE_MEM) | ||
| 106 | continue; | ||
| 107 | |||
| 108 | if (uiomem >= &uioinfo->mem[MAX_UIO_MAPS]) { | ||
| 109 | dev_warn(&pdev->dev, "device has more than " | ||
| 110 | __stringify(MAX_UIO_MAPS) | ||
| 111 | " I/O memory resources.\n"); | ||
| 112 | break; | ||
| 113 | } | ||
| 114 | |||
| 115 | uiomem->memtype = UIO_MEM_PHYS; | ||
| 116 | uiomem->addr = r->start; | ||
| 117 | uiomem->size = r->end - r->start + 1; | ||
| 118 | ++uiomem; | ||
| 119 | } | ||
| 120 | |||
| 121 | while (uiomem < &uioinfo->mem[MAX_UIO_MAPS]) { | ||
| 122 | uiomem->size = 0; | ||
| 123 | ++uiomem; | ||
| 124 | } | ||
| 125 | |||
| 126 | /* This driver requires no hardware specific kernel code to handle | ||
| 127 | * interrupts. Instead, the interrupt handler simply disables the | ||
| 128 | * interrupt in the interrupt controller. User space is responsible | ||
| 129 | * for performing hardware specific acknowledge and re-enabling of | ||
| 130 | * the interrupt in the interrupt controller. | ||
| 131 | * | ||
| 132 | * Interrupt sharing is not supported. | ||
| 133 | */ | ||
| 134 | |||
| 135 | uioinfo->irq_flags = IRQF_DISABLED; | ||
| 136 | uioinfo->handler = uio_pdrv_genirq_handler; | ||
| 137 | uioinfo->irqcontrol = uio_pdrv_genirq_irqcontrol; | ||
| 138 | uioinfo->priv = priv; | ||
| 139 | |||
| 140 | ret = uio_register_device(&pdev->dev, priv->uioinfo); | ||
| 141 | if (ret) { | ||
| 142 | dev_err(&pdev->dev, "unable to register uio device\n"); | ||
| 143 | goto bad1; | ||
| 144 | } | ||
| 145 | |||
| 146 | platform_set_drvdata(pdev, priv); | ||
| 147 | return 0; | ||
| 148 | bad1: | ||
| 149 | kfree(priv); | ||
| 150 | bad0: | ||
| 151 | return ret; | ||
| 152 | } | ||
| 153 | |||
| 154 | static int uio_pdrv_genirq_remove(struct platform_device *pdev) | ||
| 155 | { | ||
| 156 | struct uio_pdrv_genirq_platdata *priv = platform_get_drvdata(pdev); | ||
| 157 | |||
| 158 | uio_unregister_device(priv->uioinfo); | ||
| 159 | kfree(priv); | ||
| 160 | return 0; | ||
| 161 | } | ||
| 162 | |||
| 163 | static struct platform_driver uio_pdrv_genirq = { | ||
| 164 | .probe = uio_pdrv_genirq_probe, | ||
| 165 | .remove = uio_pdrv_genirq_remove, | ||
| 166 | .driver = { | ||
| 167 | .name = DRIVER_NAME, | ||
| 168 | .owner = THIS_MODULE, | ||
| 169 | }, | ||
| 170 | }; | ||
| 171 | |||
| 172 | static int __init uio_pdrv_genirq_init(void) | ||
| 173 | { | ||
| 174 | return platform_driver_register(&uio_pdrv_genirq); | ||
| 175 | } | ||
| 176 | |||
| 177 | static void __exit uio_pdrv_genirq_exit(void) | ||
| 178 | { | ||
| 179 | platform_driver_unregister(&uio_pdrv_genirq); | ||
| 180 | } | ||
| 181 | |||
| 182 | module_init(uio_pdrv_genirq_init); | ||
| 183 | module_exit(uio_pdrv_genirq_exit); | ||
| 184 | |||
| 185 | MODULE_AUTHOR("Magnus Damm"); | ||
| 186 | MODULE_DESCRIPTION("Userspace I/O platform driver with generic IRQ handling"); | ||
| 187 | MODULE_LICENSE("GPL v2"); | ||
| 188 | MODULE_ALIAS("platform:" DRIVER_NAME); | ||
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index 755823cdf62a..bcefbddeba50 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig | |||
| @@ -95,16 +95,18 @@ config USB | |||
| 95 | 95 | ||
| 96 | source "drivers/usb/core/Kconfig" | 96 | source "drivers/usb/core/Kconfig" |
| 97 | 97 | ||
| 98 | source "drivers/usb/mon/Kconfig" | ||
| 99 | |||
| 98 | source "drivers/usb/host/Kconfig" | 100 | source "drivers/usb/host/Kconfig" |
| 99 | 101 | ||
| 102 | source "drivers/usb/musb/Kconfig" | ||
| 103 | |||
| 100 | source "drivers/usb/class/Kconfig" | 104 | source "drivers/usb/class/Kconfig" |
| 101 | 105 | ||
| 102 | source "drivers/usb/storage/Kconfig" | 106 | source "drivers/usb/storage/Kconfig" |
| 103 | 107 | ||
| 104 | source "drivers/usb/image/Kconfig" | 108 | source "drivers/usb/image/Kconfig" |
| 105 | 109 | ||
| 106 | source "drivers/usb/mon/Kconfig" | ||
| 107 | |||
| 108 | comment "USB port drivers" | 110 | comment "USB port drivers" |
| 109 | depends on USB | 111 | depends on USB |
| 110 | 112 | ||
diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c index 507a9bd0d77c..9aea43a8c4ad 100644 --- a/drivers/usb/atm/cxacru.c +++ b/drivers/usb/atm/cxacru.c | |||
| @@ -602,7 +602,7 @@ static int cxacru_cm_get_array(struct cxacru_data *instance, enum cxacru_cm_requ | |||
| 602 | offd = le32_to_cpu(buf[offb++]); | 602 | offd = le32_to_cpu(buf[offb++]); |
| 603 | if (offd >= size) { | 603 | if (offd >= size) { |
| 604 | if (printk_ratelimit()) | 604 | if (printk_ratelimit()) |
| 605 | usb_err(instance->usbatm, "wrong index #%x in response to cm #%x\n", | 605 | usb_err(instance->usbatm, "wrong index %#x in response to cm %#x\n", |
| 606 | offd, cm); | 606 | offd, cm); |
| 607 | ret = -EIO; | 607 | ret = -EIO; |
| 608 | goto cleanup; | 608 | goto cleanup; |
diff --git a/drivers/usb/atm/ueagle-atm.c b/drivers/usb/atm/ueagle-atm.c index cb01b5106efd..b6483dd98acc 100644 --- a/drivers/usb/atm/ueagle-atm.c +++ b/drivers/usb/atm/ueagle-atm.c | |||
| @@ -64,7 +64,6 @@ | |||
| 64 | #include <linux/ctype.h> | 64 | #include <linux/ctype.h> |
| 65 | #include <linux/sched.h> | 65 | #include <linux/sched.h> |
| 66 | #include <linux/kthread.h> | 66 | #include <linux/kthread.h> |
| 67 | #include <linux/version.h> | ||
| 68 | #include <linux/mutex.h> | 67 | #include <linux/mutex.h> |
| 69 | #include <linux/freezer.h> | 68 | #include <linux/freezer.h> |
| 70 | 69 | ||
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index 0725b1871f23..c257453fa9de 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c | |||
| @@ -51,6 +51,7 @@ | |||
| 51 | */ | 51 | */ |
| 52 | 52 | ||
| 53 | #undef DEBUG | 53 | #undef DEBUG |
| 54 | #undef VERBOSE_DEBUG | ||
| 54 | 55 | ||
| 55 | #include <linux/kernel.h> | 56 | #include <linux/kernel.h> |
| 56 | #include <linux/errno.h> | 57 | #include <linux/errno.h> |
| @@ -70,6 +71,9 @@ | |||
| 70 | 71 | ||
| 71 | #include "cdc-acm.h" | 72 | #include "cdc-acm.h" |
| 72 | 73 | ||
| 74 | |||
| 75 | #define ACM_CLOSE_TIMEOUT 15 /* seconds to let writes drain */ | ||
| 76 | |||
| 73 | /* | 77 | /* |
| 74 | * Version Information | 78 | * Version Information |
| 75 | */ | 79 | */ |
| @@ -85,6 +89,12 @@ static DEFINE_MUTEX(open_mutex); | |||
| 85 | 89 | ||
| 86 | #define ACM_READY(acm) (acm && acm->dev && acm->used) | 90 | #define ACM_READY(acm) (acm && acm->dev && acm->used) |
| 87 | 91 | ||
| 92 | #ifdef VERBOSE_DEBUG | ||
| 93 | #define verbose 1 | ||
| 94 | #else | ||
| 95 | #define verbose 0 | ||
| 96 | #endif | ||
| 97 | |||
| 88 | /* | 98 | /* |
| 89 | * Functions for ACM control messages. | 99 | * Functions for ACM control messages. |
| 90 | */ | 100 | */ |
| @@ -136,19 +146,17 @@ static int acm_wb_alloc(struct acm *acm) | |||
| 136 | static int acm_wb_is_avail(struct acm *acm) | 146 | static int acm_wb_is_avail(struct acm *acm) |
| 137 | { | 147 | { |
| 138 | int i, n; | 148 | int i, n; |
| 149 | unsigned long flags; | ||
| 139 | 150 | ||
| 140 | n = ACM_NW; | 151 | n = ACM_NW; |
| 152 | spin_lock_irqsave(&acm->write_lock, flags); | ||
| 141 | for (i = 0; i < ACM_NW; i++) { | 153 | for (i = 0; i < ACM_NW; i++) { |
| 142 | n -= acm->wb[i].use; | 154 | n -= acm->wb[i].use; |
| 143 | } | 155 | } |
| 156 | spin_unlock_irqrestore(&acm->write_lock, flags); | ||
| 144 | return n; | 157 | return n; |
| 145 | } | 158 | } |
| 146 | 159 | ||
| 147 | static inline int acm_wb_is_used(struct acm *acm, int wbn) | ||
| 148 | { | ||
| 149 | return acm->wb[wbn].use; | ||
| 150 | } | ||
| 151 | |||
| 152 | /* | 160 | /* |
| 153 | * Finish write. | 161 | * Finish write. |
| 154 | */ | 162 | */ |
| @@ -157,7 +165,6 @@ static void acm_write_done(struct acm *acm, struct acm_wb *wb) | |||
| 157 | unsigned long flags; | 165 | unsigned long flags; |
| 158 | 166 | ||
| 159 | spin_lock_irqsave(&acm->write_lock, flags); | 167 | spin_lock_irqsave(&acm->write_lock, flags); |
| 160 | acm->write_ready = 1; | ||
| 161 | wb->use = 0; | 168 | wb->use = 0; |
| 162 | acm->transmitting--; | 169 | acm->transmitting--; |
| 163 | spin_unlock_irqrestore(&acm->write_lock, flags); | 170 | spin_unlock_irqrestore(&acm->write_lock, flags); |
| @@ -190,40 +197,25 @@ static int acm_start_wb(struct acm *acm, struct acm_wb *wb) | |||
| 190 | static int acm_write_start(struct acm *acm, int wbn) | 197 | static int acm_write_start(struct acm *acm, int wbn) |
| 191 | { | 198 | { |
| 192 | unsigned long flags; | 199 | unsigned long flags; |
| 193 | struct acm_wb *wb; | 200 | struct acm_wb *wb = &acm->wb[wbn]; |
| 194 | int rc; | 201 | int rc; |
| 195 | 202 | ||
| 196 | spin_lock_irqsave(&acm->write_lock, flags); | 203 | spin_lock_irqsave(&acm->write_lock, flags); |
| 197 | if (!acm->dev) { | 204 | if (!acm->dev) { |
| 205 | wb->use = 0; | ||
| 198 | spin_unlock_irqrestore(&acm->write_lock, flags); | 206 | spin_unlock_irqrestore(&acm->write_lock, flags); |
| 199 | return -ENODEV; | 207 | return -ENODEV; |
| 200 | } | 208 | } |
| 201 | 209 | ||
| 202 | if (!acm->write_ready) { | ||
| 203 | spin_unlock_irqrestore(&acm->write_lock, flags); | ||
| 204 | return 0; /* A white lie */ | ||
| 205 | } | ||
| 206 | |||
| 207 | wb = &acm->wb[wbn]; | ||
| 208 | if(acm_wb_is_avail(acm) <= 1) | ||
| 209 | acm->write_ready = 0; | ||
| 210 | |||
| 211 | dbg("%s susp_count: %d", __func__, acm->susp_count); | 210 | dbg("%s susp_count: %d", __func__, acm->susp_count); |
| 212 | if (acm->susp_count) { | 211 | if (acm->susp_count) { |
| 213 | acm->old_ready = acm->write_ready; | ||
| 214 | acm->delayed_wb = wb; | 212 | acm->delayed_wb = wb; |
| 215 | acm->write_ready = 0; | ||
| 216 | schedule_work(&acm->waker); | 213 | schedule_work(&acm->waker); |
| 217 | spin_unlock_irqrestore(&acm->write_lock, flags); | 214 | spin_unlock_irqrestore(&acm->write_lock, flags); |
| 218 | return 0; /* A white lie */ | 215 | return 0; /* A white lie */ |
| 219 | } | 216 | } |
| 220 | usb_mark_last_busy(acm->dev); | 217 | usb_mark_last_busy(acm->dev); |
| 221 | 218 | ||
| 222 | if (!acm_wb_is_used(acm, wbn)) { | ||
| 223 | spin_unlock_irqrestore(&acm->write_lock, flags); | ||
| 224 | return 0; | ||
| 225 | } | ||
| 226 | |||
| 227 | rc = acm_start_wb(acm, wb); | 219 | rc = acm_start_wb(acm, wb); |
| 228 | spin_unlock_irqrestore(&acm->write_lock, flags); | 220 | spin_unlock_irqrestore(&acm->write_lock, flags); |
| 229 | 221 | ||
| @@ -488,22 +480,28 @@ urbs: | |||
| 488 | /* data interface wrote those outgoing bytes */ | 480 | /* data interface wrote those outgoing bytes */ |
| 489 | static void acm_write_bulk(struct urb *urb) | 481 | static void acm_write_bulk(struct urb *urb) |
| 490 | { | 482 | { |
| 491 | struct acm *acm; | ||
| 492 | struct acm_wb *wb = urb->context; | 483 | struct acm_wb *wb = urb->context; |
| 484 | struct acm *acm = wb->instance; | ||
| 493 | 485 | ||
| 494 | dbg("Entering acm_write_bulk with status %d", urb->status); | 486 | if (verbose || urb->status |
| 487 | || (urb->actual_length != urb->transfer_buffer_length)) | ||
| 488 | dev_dbg(&acm->data->dev, "tx %d/%d bytes -- > %d\n", | ||
| 489 | urb->actual_length, | ||
| 490 | urb->transfer_buffer_length, | ||
| 491 | urb->status); | ||
| 495 | 492 | ||
| 496 | acm = wb->instance; | ||
| 497 | acm_write_done(acm, wb); | 493 | acm_write_done(acm, wb); |
| 498 | if (ACM_READY(acm)) | 494 | if (ACM_READY(acm)) |
| 499 | schedule_work(&acm->work); | 495 | schedule_work(&acm->work); |
| 496 | else | ||
| 497 | wake_up_interruptible(&acm->drain_wait); | ||
| 500 | } | 498 | } |
| 501 | 499 | ||
| 502 | static void acm_softint(struct work_struct *work) | 500 | static void acm_softint(struct work_struct *work) |
| 503 | { | 501 | { |
| 504 | struct acm *acm = container_of(work, struct acm, work); | 502 | struct acm *acm = container_of(work, struct acm, work); |
| 505 | dbg("Entering acm_softint."); | 503 | |
| 506 | 504 | dev_vdbg(&acm->data->dev, "tx work\n"); | |
| 507 | if (!ACM_READY(acm)) | 505 | if (!ACM_READY(acm)) |
| 508 | return; | 506 | return; |
| 509 | tty_wakeup(acm->tty); | 507 | tty_wakeup(acm->tty); |
| @@ -512,7 +510,6 @@ static void acm_softint(struct work_struct *work) | |||
| 512 | static void acm_waker(struct work_struct *waker) | 510 | static void acm_waker(struct work_struct *waker) |
| 513 | { | 511 | { |
| 514 | struct acm *acm = container_of(waker, struct acm, waker); | 512 | struct acm *acm = container_of(waker, struct acm, waker); |
| 515 | long flags; | ||
| 516 | int rv; | 513 | int rv; |
| 517 | 514 | ||
| 518 | rv = usb_autopm_get_interface(acm->control); | 515 | rv = usb_autopm_get_interface(acm->control); |
| @@ -524,9 +521,6 @@ static void acm_waker(struct work_struct *waker) | |||
| 524 | acm_start_wb(acm, acm->delayed_wb); | 521 | acm_start_wb(acm, acm->delayed_wb); |
| 525 | acm->delayed_wb = NULL; | 522 | acm->delayed_wb = NULL; |
| 526 | } | 523 | } |
| 527 | spin_lock_irqsave(&acm->write_lock, flags); | ||
| 528 | acm->write_ready = acm->old_ready; | ||
| 529 | spin_unlock_irqrestore(&acm->write_lock, flags); | ||
| 530 | usb_autopm_put_interface(acm->control); | 524 | usb_autopm_put_interface(acm->control); |
| 531 | } | 525 | } |
| 532 | 526 | ||
| @@ -595,8 +589,8 @@ static int acm_tty_open(struct tty_struct *tty, struct file *filp) | |||
| 595 | tasklet_schedule(&acm->urb_task); | 589 | tasklet_schedule(&acm->urb_task); |
| 596 | 590 | ||
| 597 | done: | 591 | done: |
| 598 | err_out: | ||
| 599 | mutex_unlock(&acm->mutex); | 592 | mutex_unlock(&acm->mutex); |
| 593 | err_out: | ||
| 600 | mutex_unlock(&open_mutex); | 594 | mutex_unlock(&open_mutex); |
| 601 | return rv; | 595 | return rv; |
| 602 | 596 | ||
| @@ -628,6 +622,8 @@ static void acm_tty_unregister(struct acm *acm) | |||
| 628 | kfree(acm); | 622 | kfree(acm); |
| 629 | } | 623 | } |
| 630 | 624 | ||
| 625 | static int acm_tty_chars_in_buffer(struct tty_struct *tty); | ||
| 626 | |||
| 631 | static void acm_tty_close(struct tty_struct *tty, struct file *filp) | 627 | static void acm_tty_close(struct tty_struct *tty, struct file *filp) |
| 632 | { | 628 | { |
| 633 | struct acm *acm = tty->driver_data; | 629 | struct acm *acm = tty->driver_data; |
| @@ -642,6 +638,13 @@ static void acm_tty_close(struct tty_struct *tty, struct file *filp) | |||
| 642 | if (acm->dev) { | 638 | if (acm->dev) { |
| 643 | usb_autopm_get_interface(acm->control); | 639 | usb_autopm_get_interface(acm->control); |
| 644 | acm_set_control(acm, acm->ctrlout = 0); | 640 | acm_set_control(acm, acm->ctrlout = 0); |
| 641 | |||
| 642 | /* try letting the last writes drain naturally */ | ||
| 643 | wait_event_interruptible_timeout(acm->drain_wait, | ||
| 644 | (ACM_NW == acm_wb_is_avail(acm)) | ||
| 645 | || !acm->dev, | ||
| 646 | ACM_CLOSE_TIMEOUT * HZ); | ||
| 647 | |||
| 645 | usb_kill_urb(acm->ctrlurb); | 648 | usb_kill_urb(acm->ctrlurb); |
| 646 | for (i = 0; i < ACM_NW; i++) | 649 | for (i = 0; i < ACM_NW; i++) |
| 647 | usb_kill_urb(acm->wb[i].urb); | 650 | usb_kill_urb(acm->wb[i].urb); |
| @@ -697,7 +700,7 @@ static int acm_tty_write_room(struct tty_struct *tty) | |||
| 697 | * Do not let the line discipline to know that we have a reserve, | 700 | * Do not let the line discipline to know that we have a reserve, |
| 698 | * or it might get too enthusiastic. | 701 | * or it might get too enthusiastic. |
| 699 | */ | 702 | */ |
| 700 | return (acm->write_ready && acm_wb_is_avail(acm)) ? acm->writesize : 0; | 703 | return acm_wb_is_avail(acm) ? acm->writesize : 0; |
| 701 | } | 704 | } |
| 702 | 705 | ||
| 703 | static int acm_tty_chars_in_buffer(struct tty_struct *tty) | 706 | static int acm_tty_chars_in_buffer(struct tty_struct *tty) |
| @@ -1072,11 +1075,11 @@ skip_normal_probe: | |||
| 1072 | acm->urb_task.data = (unsigned long) acm; | 1075 | acm->urb_task.data = (unsigned long) acm; |
| 1073 | INIT_WORK(&acm->work, acm_softint); | 1076 | INIT_WORK(&acm->work, acm_softint); |
| 1074 | INIT_WORK(&acm->waker, acm_waker); | 1077 | INIT_WORK(&acm->waker, acm_waker); |
| 1078 | init_waitqueue_head(&acm->drain_wait); | ||
| 1075 | spin_lock_init(&acm->throttle_lock); | 1079 | spin_lock_init(&acm->throttle_lock); |
| 1076 | spin_lock_init(&acm->write_lock); | 1080 | spin_lock_init(&acm->write_lock); |
| 1077 | spin_lock_init(&acm->read_lock); | 1081 | spin_lock_init(&acm->read_lock); |
| 1078 | mutex_init(&acm->mutex); | 1082 | mutex_init(&acm->mutex); |
| 1079 | acm->write_ready = 1; | ||
| 1080 | acm->rx_endpoint = usb_rcvbulkpipe(usb_dev, epread->bEndpointAddress); | 1083 | acm->rx_endpoint = usb_rcvbulkpipe(usb_dev, epread->bEndpointAddress); |
| 1081 | 1084 | ||
| 1082 | buf = usb_buffer_alloc(usb_dev, ctrlsize, GFP_KERNEL, &acm->ctrl_dma); | 1085 | buf = usb_buffer_alloc(usb_dev, ctrlsize, GFP_KERNEL, &acm->ctrl_dma); |
| @@ -1108,9 +1111,11 @@ skip_normal_probe: | |||
| 1108 | rcv->instance = acm; | 1111 | rcv->instance = acm; |
| 1109 | } | 1112 | } |
| 1110 | for (i = 0; i < num_rx_buf; i++) { | 1113 | for (i = 0; i < num_rx_buf; i++) { |
| 1111 | struct acm_rb *buf = &(acm->rb[i]); | 1114 | struct acm_rb *rb = &(acm->rb[i]); |
| 1112 | 1115 | ||
| 1113 | if (!(buf->base = usb_buffer_alloc(acm->dev, readsize, GFP_KERNEL, &buf->dma))) { | 1116 | rb->base = usb_buffer_alloc(acm->dev, readsize, |
| 1117 | GFP_KERNEL, &rb->dma); | ||
| 1118 | if (!rb->base) { | ||
| 1114 | dev_dbg(&intf->dev, "out of memory (read bufs usb_buffer_alloc)\n"); | 1119 | dev_dbg(&intf->dev, "out of memory (read bufs usb_buffer_alloc)\n"); |
| 1115 | goto alloc_fail7; | 1120 | goto alloc_fail7; |
| 1116 | } | 1121 | } |
| @@ -1172,6 +1177,7 @@ skip_countries: | |||
| 1172 | acm_set_line(acm, &acm->line); | 1177 | acm_set_line(acm, &acm->line); |
| 1173 | 1178 | ||
| 1174 | usb_driver_claim_interface(&acm_driver, data_interface, acm); | 1179 | usb_driver_claim_interface(&acm_driver, data_interface, acm); |
| 1180 | usb_set_intfdata(data_interface, acm); | ||
| 1175 | 1181 | ||
| 1176 | usb_get_intf(control_interface); | 1182 | usb_get_intf(control_interface); |
| 1177 | tty_register_device(acm_tty_driver, minor, &control_interface->dev); | 1183 | tty_register_device(acm_tty_driver, minor, &control_interface->dev); |
| @@ -1221,11 +1227,11 @@ static void acm_disconnect(struct usb_interface *intf) | |||
| 1221 | struct acm *acm = usb_get_intfdata(intf); | 1227 | struct acm *acm = usb_get_intfdata(intf); |
| 1222 | struct usb_device *usb_dev = interface_to_usbdev(intf); | 1228 | struct usb_device *usb_dev = interface_to_usbdev(intf); |
| 1223 | 1229 | ||
| 1224 | mutex_lock(&open_mutex); | 1230 | /* sibling interface is already cleaning up */ |
| 1225 | if (!acm || !acm->dev) { | 1231 | if (!acm) |
| 1226 | mutex_unlock(&open_mutex); | ||
| 1227 | return; | 1232 | return; |
| 1228 | } | 1233 | |
| 1234 | mutex_lock(&open_mutex); | ||
| 1229 | if (acm->country_codes){ | 1235 | if (acm->country_codes){ |
| 1230 | device_remove_file(&acm->control->dev, | 1236 | device_remove_file(&acm->control->dev, |
| 1231 | &dev_attr_wCountryCodes); | 1237 | &dev_attr_wCountryCodes); |
| @@ -1356,6 +1362,9 @@ static struct usb_device_id acm_ids[] = { | |||
| 1356 | { USB_DEVICE(0x0803, 0x3095), /* Zoom Telephonics Model 3095F USB MODEM */ | 1362 | { USB_DEVICE(0x0803, 0x3095), /* Zoom Telephonics Model 3095F USB MODEM */ |
| 1357 | .driver_info = NO_UNION_NORMAL, /* has no union descriptor */ | 1363 | .driver_info = NO_UNION_NORMAL, /* has no union descriptor */ |
| 1358 | }, | 1364 | }, |
| 1365 | { USB_DEVICE(0x0572, 0x1321), /* Conexant USB MODEM CX93010 */ | ||
| 1366 | .driver_info = NO_UNION_NORMAL, /* has no union descriptor */ | ||
| 1367 | }, | ||
| 1359 | 1368 | ||
| 1360 | /* control interfaces with various AT-command sets */ | 1369 | /* control interfaces with various AT-command sets */ |
| 1361 | { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM, | 1370 | { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM, |
diff --git a/drivers/usb/class/cdc-acm.h b/drivers/usb/class/cdc-acm.h index 85c3aaaab7c5..1f95e7aa1b66 100644 --- a/drivers/usb/class/cdc-acm.h +++ b/drivers/usb/class/cdc-acm.h | |||
| @@ -106,8 +106,6 @@ struct acm { | |||
| 106 | struct list_head spare_read_bufs; | 106 | struct list_head spare_read_bufs; |
| 107 | struct list_head filled_read_bufs; | 107 | struct list_head filled_read_bufs; |
| 108 | int write_used; /* number of non-empty write buffers */ | 108 | int write_used; /* number of non-empty write buffers */ |
| 109 | int write_ready; /* write urb is not running */ | ||
| 110 | int old_ready; | ||
| 111 | int processing; | 109 | int processing; |
| 112 | int transmitting; | 110 | int transmitting; |
| 113 | spinlock_t write_lock; | 111 | spinlock_t write_lock; |
| @@ -115,6 +113,7 @@ struct acm { | |||
| 115 | struct usb_cdc_line_coding line; /* bits, stop, parity */ | 113 | struct usb_cdc_line_coding line; /* bits, stop, parity */ |
| 116 | struct work_struct work; /* work queue entry for line discipline waking up */ | 114 | struct work_struct work; /* work queue entry for line discipline waking up */ |
| 117 | struct work_struct waker; | 115 | struct work_struct waker; |
| 116 | wait_queue_head_t drain_wait; /* close processing */ | ||
| 118 | struct tasklet_struct urb_task; /* rx processing */ | 117 | struct tasklet_struct urb_task; /* rx processing */ |
| 119 | spinlock_t throttle_lock; /* synchronize throtteling and read callback */ | 118 | spinlock_t throttle_lock; /* synchronize throtteling and read callback */ |
| 120 | unsigned int ctrlin; /* input control lines (DCD, DSR, RI, break, overruns) */ | 119 | unsigned int ctrlin; /* input control lines (DCD, DSR, RI, break, overruns) */ |
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c index ddb54e14a5c5..5a7fa6f09958 100644 --- a/drivers/usb/core/driver.c +++ b/drivers/usb/core/driver.c | |||
| @@ -230,6 +230,13 @@ static int usb_probe_interface(struct device *dev) | |||
| 230 | */ | 230 | */ |
| 231 | intf->pm_usage_cnt = !(driver->supports_autosuspend); | 231 | intf->pm_usage_cnt = !(driver->supports_autosuspend); |
| 232 | 232 | ||
| 233 | /* Carry out a deferred switch to altsetting 0 */ | ||
| 234 | if (intf->needs_altsetting0) { | ||
| 235 | usb_set_interface(udev, intf->altsetting[0]. | ||
| 236 | desc.bInterfaceNumber, 0); | ||
| 237 | intf->needs_altsetting0 = 0; | ||
| 238 | } | ||
| 239 | |||
| 233 | error = driver->probe(intf, id); | 240 | error = driver->probe(intf, id); |
| 234 | if (error) { | 241 | if (error) { |
| 235 | mark_quiesced(intf); | 242 | mark_quiesced(intf); |
| @@ -266,8 +273,17 @@ static int usb_unbind_interface(struct device *dev) | |||
| 266 | 273 | ||
| 267 | driver->disconnect(intf); | 274 | driver->disconnect(intf); |
| 268 | 275 | ||
| 269 | /* reset other interface state */ | 276 | /* Reset other interface state. |
| 270 | usb_set_interface(udev, intf->altsetting[0].desc.bInterfaceNumber, 0); | 277 | * We cannot do a Set-Interface if the device is suspended or |
| 278 | * if it is prepared for a system sleep (since installing a new | ||
| 279 | * altsetting means creating new endpoint device entries). | ||
| 280 | * When either of these happens, defer the Set-Interface. | ||
| 281 | */ | ||
| 282 | if (!error && intf->dev.power.status == DPM_ON) | ||
| 283 | usb_set_interface(udev, intf->altsetting[0]. | ||
| 284 | desc.bInterfaceNumber, 0); | ||
| 285 | else | ||
| 286 | intf->needs_altsetting0 = 1; | ||
| 271 | usb_set_intfdata(intf, NULL); | 287 | usb_set_intfdata(intf, NULL); |
| 272 | 288 | ||
| 273 | intf->condition = USB_INTERFACE_UNBOUND; | 289 | intf->condition = USB_INTERFACE_UNBOUND; |
| @@ -774,7 +790,6 @@ void usb_deregister(struct usb_driver *driver) | |||
| 774 | } | 790 | } |
| 775 | EXPORT_SYMBOL_GPL(usb_deregister); | 791 | EXPORT_SYMBOL_GPL(usb_deregister); |
| 776 | 792 | ||
| 777 | |||
| 778 | /* Forced unbinding of a USB interface driver, either because | 793 | /* Forced unbinding of a USB interface driver, either because |
| 779 | * it doesn't support pre_reset/post_reset/reset_resume or | 794 | * it doesn't support pre_reset/post_reset/reset_resume or |
| 780 | * because it doesn't support suspend/resume. | 795 | * because it doesn't support suspend/resume. |
| @@ -799,7 +814,8 @@ void usb_forced_unbind_intf(struct usb_interface *intf) | |||
| 799 | * The caller must hold @intf's device's lock, but not its pm_mutex | 814 | * The caller must hold @intf's device's lock, but not its pm_mutex |
| 800 | * and not @intf->dev.sem. | 815 | * and not @intf->dev.sem. |
| 801 | * | 816 | * |
| 802 | * FIXME: The caller must block system sleep transitions. | 817 | * Note: Rebinds will be skipped if a system sleep transition is in |
| 818 | * progress and the PM "complete" callback hasn't occurred yet. | ||
| 803 | */ | 819 | */ |
| 804 | void usb_rebind_intf(struct usb_interface *intf) | 820 | void usb_rebind_intf(struct usb_interface *intf) |
| 805 | { | 821 | { |
| @@ -815,12 +831,16 @@ void usb_rebind_intf(struct usb_interface *intf) | |||
| 815 | } | 831 | } |
| 816 | 832 | ||
| 817 | /* Try to rebind the interface */ | 833 | /* Try to rebind the interface */ |
| 818 | intf->needs_binding = 0; | 834 | if (intf->dev.power.status == DPM_ON) { |
| 819 | rc = device_attach(&intf->dev); | 835 | intf->needs_binding = 0; |
| 820 | if (rc < 0) | 836 | rc = device_attach(&intf->dev); |
| 821 | dev_warn(&intf->dev, "rebind failed: %d\n", rc); | 837 | if (rc < 0) |
| 838 | dev_warn(&intf->dev, "rebind failed: %d\n", rc); | ||
| 839 | } | ||
| 822 | } | 840 | } |
| 823 | 841 | ||
| 842 | #ifdef CONFIG_PM | ||
| 843 | |||
| 824 | #define DO_UNBIND 0 | 844 | #define DO_UNBIND 0 |
| 825 | #define DO_REBIND 1 | 845 | #define DO_REBIND 1 |
| 826 | 846 | ||
| @@ -828,7 +848,6 @@ void usb_rebind_intf(struct usb_interface *intf) | |||
| 828 | * or rebind interfaces that have been unbound, according to @action. | 848 | * or rebind interfaces that have been unbound, according to @action. |
| 829 | * | 849 | * |
| 830 | * The caller must hold @udev's device lock. | 850 | * The caller must hold @udev's device lock. |
| 831 | * FIXME: For rebinds, the caller must block system sleep transitions. | ||
| 832 | */ | 851 | */ |
| 833 | static void do_unbind_rebind(struct usb_device *udev, int action) | 852 | static void do_unbind_rebind(struct usb_device *udev, int action) |
| 834 | { | 853 | { |
| @@ -850,30 +869,14 @@ static void do_unbind_rebind(struct usb_device *udev, int action) | |||
| 850 | } | 869 | } |
| 851 | break; | 870 | break; |
| 852 | case DO_REBIND: | 871 | case DO_REBIND: |
| 853 | if (intf->needs_binding) { | 872 | if (intf->needs_binding) |
| 854 | |||
| 855 | /* FIXME: The next line is needed because we are going to probe | ||
| 856 | * the interface, but as far as the PM core is concerned the | ||
| 857 | * interface is still suspended. The problem wouldn't exist | ||
| 858 | * if we could rebind the interface during the interface's own | ||
| 859 | * resume() call, but at the time the usb_device isn't locked! | ||
| 860 | * | ||
| 861 | * The real solution will be to carry this out during the device's | ||
| 862 | * complete() callback. Until that is implemented, we have to | ||
| 863 | * use this hack. | ||
| 864 | */ | ||
| 865 | // intf->dev.power.sleeping = 0; | ||
| 866 | |||
| 867 | usb_rebind_intf(intf); | 873 | usb_rebind_intf(intf); |
| 868 | } | ||
| 869 | break; | 874 | break; |
| 870 | } | 875 | } |
| 871 | } | 876 | } |
| 872 | } | 877 | } |
| 873 | } | 878 | } |
| 874 | 879 | ||
| 875 | #ifdef CONFIG_PM | ||
| 876 | |||
| 877 | /* Caller has locked udev's pm_mutex */ | 880 | /* Caller has locked udev's pm_mutex */ |
| 878 | static int usb_suspend_device(struct usb_device *udev, pm_message_t msg) | 881 | static int usb_suspend_device(struct usb_device *udev, pm_message_t msg) |
| 879 | { | 882 | { |
| @@ -927,14 +930,14 @@ static int usb_resume_device(struct usb_device *udev) | |||
| 927 | } | 930 | } |
| 928 | 931 | ||
| 929 | /* Caller has locked intf's usb_device's pm mutex */ | 932 | /* Caller has locked intf's usb_device's pm mutex */ |
| 930 | static int usb_suspend_interface(struct usb_interface *intf, pm_message_t msg) | 933 | static int usb_suspend_interface(struct usb_device *udev, |
| 934 | struct usb_interface *intf, pm_message_t msg) | ||
| 931 | { | 935 | { |
| 932 | struct usb_driver *driver; | 936 | struct usb_driver *driver; |
| 933 | int status = 0; | 937 | int status = 0; |
| 934 | 938 | ||
| 935 | /* with no hardware, USB interfaces only use FREEZE and ON states */ | 939 | /* with no hardware, USB interfaces only use FREEZE and ON states */ |
| 936 | if (interface_to_usbdev(intf)->state == USB_STATE_NOTATTACHED || | 940 | if (udev->state == USB_STATE_NOTATTACHED || !is_active(intf)) |
| 937 | !is_active(intf)) | ||
| 938 | goto done; | 941 | goto done; |
| 939 | 942 | ||
| 940 | if (intf->condition == USB_INTERFACE_UNBOUND) /* This can't happen */ | 943 | if (intf->condition == USB_INTERFACE_UNBOUND) /* This can't happen */ |
| @@ -945,7 +948,7 @@ static int usb_suspend_interface(struct usb_interface *intf, pm_message_t msg) | |||
| 945 | status = driver->suspend(intf, msg); | 948 | status = driver->suspend(intf, msg); |
| 946 | if (status == 0) | 949 | if (status == 0) |
| 947 | mark_quiesced(intf); | 950 | mark_quiesced(intf); |
| 948 | else if (!interface_to_usbdev(intf)->auto_pm) | 951 | else if (!udev->auto_pm) |
| 949 | dev_err(&intf->dev, "%s error %d\n", | 952 | dev_err(&intf->dev, "%s error %d\n", |
| 950 | "suspend", status); | 953 | "suspend", status); |
| 951 | } else { | 954 | } else { |
| @@ -962,13 +965,13 @@ static int usb_suspend_interface(struct usb_interface *intf, pm_message_t msg) | |||
| 962 | } | 965 | } |
| 963 | 966 | ||
| 964 | /* Caller has locked intf's usb_device's pm_mutex */ | 967 | /* Caller has locked intf's usb_device's pm_mutex */ |
| 965 | static int usb_resume_interface(struct usb_interface *intf, int reset_resume) | 968 | static int usb_resume_interface(struct usb_device *udev, |
| 969 | struct usb_interface *intf, int reset_resume) | ||
| 966 | { | 970 | { |
| 967 | struct usb_driver *driver; | 971 | struct usb_driver *driver; |
| 968 | int status = 0; | 972 | int status = 0; |
| 969 | 973 | ||
| 970 | if (interface_to_usbdev(intf)->state == USB_STATE_NOTATTACHED || | 974 | if (udev->state == USB_STATE_NOTATTACHED || is_active(intf)) |
| 971 | is_active(intf)) | ||
| 972 | goto done; | 975 | goto done; |
| 973 | 976 | ||
| 974 | /* Don't let autoresume interfere with unbinding */ | 977 | /* Don't let autoresume interfere with unbinding */ |
| @@ -976,8 +979,17 @@ static int usb_resume_interface(struct usb_interface *intf, int reset_resume) | |||
| 976 | goto done; | 979 | goto done; |
| 977 | 980 | ||
| 978 | /* Can't resume it if it doesn't have a driver. */ | 981 | /* Can't resume it if it doesn't have a driver. */ |
| 979 | if (intf->condition == USB_INTERFACE_UNBOUND) | 982 | if (intf->condition == USB_INTERFACE_UNBOUND) { |
| 983 | |||
| 984 | /* Carry out a deferred switch to altsetting 0 */ | ||
| 985 | if (intf->needs_altsetting0 && | ||
| 986 | intf->dev.power.status == DPM_ON) { | ||
| 987 | usb_set_interface(udev, intf->altsetting[0]. | ||
| 988 | desc.bInterfaceNumber, 0); | ||
| 989 | intf->needs_altsetting0 = 0; | ||
| 990 | } | ||
| 980 | goto done; | 991 | goto done; |
| 992 | } | ||
| 981 | 993 | ||
| 982 | /* Don't resume if the interface is marked for rebinding */ | 994 | /* Don't resume if the interface is marked for rebinding */ |
| 983 | if (intf->needs_binding) | 995 | if (intf->needs_binding) |
| @@ -1152,7 +1164,7 @@ static int usb_suspend_both(struct usb_device *udev, pm_message_t msg) | |||
| 1152 | if (udev->actconfig) { | 1164 | if (udev->actconfig) { |
| 1153 | for (; i < udev->actconfig->desc.bNumInterfaces; i++) { | 1165 | for (; i < udev->actconfig->desc.bNumInterfaces; i++) { |
| 1154 | intf = udev->actconfig->interface[i]; | 1166 | intf = udev->actconfig->interface[i]; |
| 1155 | status = usb_suspend_interface(intf, msg); | 1167 | status = usb_suspend_interface(udev, intf, msg); |
| 1156 | if (status != 0) | 1168 | if (status != 0) |
| 1157 | break; | 1169 | break; |
| 1158 | } | 1170 | } |
| @@ -1164,7 +1176,7 @@ static int usb_suspend_both(struct usb_device *udev, pm_message_t msg) | |||
| 1164 | if (status != 0) { | 1176 | if (status != 0) { |
| 1165 | while (--i >= 0) { | 1177 | while (--i >= 0) { |
| 1166 | intf = udev->actconfig->interface[i]; | 1178 | intf = udev->actconfig->interface[i]; |
| 1167 | usb_resume_interface(intf, 0); | 1179 | usb_resume_interface(udev, intf, 0); |
| 1168 | } | 1180 | } |
| 1169 | 1181 | ||
| 1170 | /* Try another autosuspend when the interfaces aren't busy */ | 1182 | /* Try another autosuspend when the interfaces aren't busy */ |
| @@ -1277,7 +1289,7 @@ static int usb_resume_both(struct usb_device *udev) | |||
| 1277 | if (status == 0 && udev->actconfig) { | 1289 | if (status == 0 && udev->actconfig) { |
| 1278 | for (i = 0; i < udev->actconfig->desc.bNumInterfaces; i++) { | 1290 | for (i = 0; i < udev->actconfig->desc.bNumInterfaces; i++) { |
| 1279 | intf = udev->actconfig->interface[i]; | 1291 | intf = udev->actconfig->interface[i]; |
| 1280 | usb_resume_interface(intf, udev->reset_resume); | 1292 | usb_resume_interface(udev, intf, udev->reset_resume); |
| 1281 | } | 1293 | } |
| 1282 | } | 1294 | } |
| 1283 | 1295 | ||
| @@ -1606,12 +1618,10 @@ int usb_external_resume_device(struct usb_device *udev) | |||
| 1606 | return status; | 1618 | return status; |
| 1607 | } | 1619 | } |
| 1608 | 1620 | ||
| 1609 | static int usb_suspend(struct device *dev, pm_message_t message) | 1621 | int usb_suspend(struct device *dev, pm_message_t message) |
| 1610 | { | 1622 | { |
| 1611 | struct usb_device *udev; | 1623 | struct usb_device *udev; |
| 1612 | 1624 | ||
| 1613 | if (!is_usb_device(dev)) /* Ignore PM for interfaces */ | ||
| 1614 | return 0; | ||
| 1615 | udev = to_usb_device(dev); | 1625 | udev = to_usb_device(dev); |
| 1616 | 1626 | ||
| 1617 | /* If udev is already suspended, we can skip this suspend and | 1627 | /* If udev is already suspended, we can skip this suspend and |
| @@ -1630,12 +1640,10 @@ static int usb_suspend(struct device *dev, pm_message_t message) | |||
| 1630 | return usb_external_suspend_device(udev, message); | 1640 | return usb_external_suspend_device(udev, message); |
| 1631 | } | 1641 | } |
| 1632 | 1642 | ||
| 1633 | static int usb_resume(struct device *dev) | 1643 | int usb_resume(struct device *dev) |
| 1634 | { | 1644 | { |
| 1635 | struct usb_device *udev; | 1645 | struct usb_device *udev; |
| 1636 | 1646 | ||
| 1637 | if (!is_usb_device(dev)) /* Ignore PM for interfaces */ | ||
| 1638 | return 0; | ||
| 1639 | udev = to_usb_device(dev); | 1647 | udev = to_usb_device(dev); |
| 1640 | 1648 | ||
| 1641 | /* If udev->skip_sys_resume is set then udev was already suspended | 1649 | /* If udev->skip_sys_resume is set then udev was already suspended |
| @@ -1647,17 +1655,10 @@ static int usb_resume(struct device *dev) | |||
| 1647 | return usb_external_resume_device(udev); | 1655 | return usb_external_resume_device(udev); |
| 1648 | } | 1656 | } |
| 1649 | 1657 | ||
| 1650 | #else | ||
| 1651 | |||
| 1652 | #define usb_suspend NULL | ||
| 1653 | #define usb_resume NULL | ||
| 1654 | |||
| 1655 | #endif /* CONFIG_PM */ | 1658 | #endif /* CONFIG_PM */ |
| 1656 | 1659 | ||
| 1657 | struct bus_type usb_bus_type = { | 1660 | struct bus_type usb_bus_type = { |
| 1658 | .name = "usb", | 1661 | .name = "usb", |
| 1659 | .match = usb_device_match, | 1662 | .match = usb_device_match, |
| 1660 | .uevent = usb_uevent, | 1663 | .uevent = usb_uevent, |
| 1661 | .suspend = usb_suspend, | ||
| 1662 | .resume = usb_resume, | ||
| 1663 | }; | 1664 | }; |
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c index f7bfd72ef115..8abd4e59bf4a 100644 --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c | |||
| @@ -924,15 +924,6 @@ static int register_root_hub(struct usb_hcd *hcd) | |||
| 924 | return retval; | 924 | return retval; |
| 925 | } | 925 | } |
| 926 | 926 | ||
| 927 | void usb_enable_root_hub_irq (struct usb_bus *bus) | ||
| 928 | { | ||
| 929 | struct usb_hcd *hcd; | ||
| 930 | |||
| 931 | hcd = container_of (bus, struct usb_hcd, self); | ||
| 932 | if (hcd->driver->hub_irq_enable && hcd->state != HC_STATE_HALT) | ||
| 933 | hcd->driver->hub_irq_enable (hcd); | ||
| 934 | } | ||
| 935 | |||
| 936 | 927 | ||
| 937 | /*-------------------------------------------------------------------------*/ | 928 | /*-------------------------------------------------------------------------*/ |
| 938 | 929 | ||
diff --git a/drivers/usb/core/hcd.h b/drivers/usb/core/hcd.h index 5b0b59b0d89b..e710ce04e228 100644 --- a/drivers/usb/core/hcd.h +++ b/drivers/usb/core/hcd.h | |||
| @@ -212,8 +212,6 @@ struct hc_driver { | |||
| 212 | int (*bus_suspend)(struct usb_hcd *); | 212 | int (*bus_suspend)(struct usb_hcd *); |
| 213 | int (*bus_resume)(struct usb_hcd *); | 213 | int (*bus_resume)(struct usb_hcd *); |
| 214 | int (*start_port_reset)(struct usb_hcd *, unsigned port_num); | 214 | int (*start_port_reset)(struct usb_hcd *, unsigned port_num); |
| 215 | void (*hub_irq_enable)(struct usb_hcd *); | ||
| 216 | /* Needed only if port-change IRQs are level-triggered */ | ||
| 217 | 215 | ||
| 218 | /* force handover of high-speed port to full-speed companion */ | 216 | /* force handover of high-speed port to full-speed companion */ |
| 219 | void (*relinquish_port)(struct usb_hcd *, int); | 217 | void (*relinquish_port)(struct usb_hcd *, int); |
| @@ -379,8 +377,6 @@ extern struct list_head usb_bus_list; | |||
| 379 | extern struct mutex usb_bus_list_lock; | 377 | extern struct mutex usb_bus_list_lock; |
| 380 | extern wait_queue_head_t usb_kill_urb_queue; | 378 | extern wait_queue_head_t usb_kill_urb_queue; |
| 381 | 379 | ||
| 382 | extern void usb_enable_root_hub_irq(struct usb_bus *bus); | ||
| 383 | |||
| 384 | extern int usb_find_interface_driver(struct usb_device *dev, | 380 | extern int usb_find_interface_driver(struct usb_device *dev, |
| 385 | struct usb_interface *interface); | 381 | struct usb_interface *interface); |
| 386 | 382 | ||
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 107e1d25ddec..6a5cb018383d 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c | |||
| @@ -2102,8 +2102,6 @@ int usb_port_resume(struct usb_device *udev) | |||
| 2102 | } | 2102 | } |
| 2103 | 2103 | ||
| 2104 | clear_bit(port1, hub->busy_bits); | 2104 | clear_bit(port1, hub->busy_bits); |
| 2105 | if (!hub->hdev->parent && !hub->busy_bits[0]) | ||
| 2106 | usb_enable_root_hub_irq(hub->hdev->bus); | ||
| 2107 | 2105 | ||
| 2108 | status = check_port_resume_type(udev, | 2106 | status = check_port_resume_type(udev, |
| 2109 | hub, port1, status, portchange, portstatus); | 2107 | hub, port1, status, portchange, portstatus); |
| @@ -3081,11 +3079,6 @@ static void hub_events(void) | |||
| 3081 | } | 3079 | } |
| 3082 | } | 3080 | } |
| 3083 | 3081 | ||
| 3084 | /* If this is a root hub, tell the HCD it's okay to | ||
| 3085 | * re-enable port-change interrupts now. */ | ||
| 3086 | if (!hdev->parent && !hub->busy_bits[0]) | ||
| 3087 | usb_enable_root_hub_irq(hdev->bus); | ||
| 3088 | |||
| 3089 | loop_autopm: | 3082 | loop_autopm: |
| 3090 | /* Allow autosuspend if we're not going to run again */ | 3083 | /* Allow autosuspend if we're not going to run again */ |
| 3091 | if (list_empty(&hub->event_list)) | 3084 | if (list_empty(&hub->event_list)) |
| @@ -3311,8 +3304,6 @@ static int usb_reset_and_verify_device(struct usb_device *udev) | |||
| 3311 | break; | 3304 | break; |
| 3312 | } | 3305 | } |
| 3313 | clear_bit(port1, parent_hub->busy_bits); | 3306 | clear_bit(port1, parent_hub->busy_bits); |
| 3314 | if (!parent_hdev->parent && !parent_hub->busy_bits[0]) | ||
| 3315 | usb_enable_root_hub_irq(parent_hdev->bus); | ||
| 3316 | 3307 | ||
| 3317 | if (ret < 0) | 3308 | if (ret < 0) |
| 3318 | goto re_enumerate; | 3309 | goto re_enumerate; |
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c index 586d6f1376cf..286b4431a097 100644 --- a/drivers/usb/core/message.c +++ b/drivers/usb/core/message.c | |||
| @@ -1091,8 +1091,8 @@ void usb_disable_device(struct usb_device *dev, int skip_ep0) | |||
| 1091 | continue; | 1091 | continue; |
| 1092 | dev_dbg(&dev->dev, "unregistering interface %s\n", | 1092 | dev_dbg(&dev->dev, "unregistering interface %s\n", |
| 1093 | dev_name(&interface->dev)); | 1093 | dev_name(&interface->dev)); |
| 1094 | device_del(&interface->dev); | ||
| 1095 | usb_remove_sysfs_intf_files(interface); | 1094 | usb_remove_sysfs_intf_files(interface); |
| 1095 | device_del(&interface->dev); | ||
| 1096 | } | 1096 | } |
| 1097 | 1097 | ||
| 1098 | /* Now that the interfaces are unbound, nobody should | 1098 | /* Now that the interfaces are unbound, nobody should |
diff --git a/drivers/usb/core/urb.c b/drivers/usb/core/urb.c index c0b1ae25ae2a..47111e88f791 100644 --- a/drivers/usb/core/urb.c +++ b/drivers/usb/core/urb.c | |||
| @@ -601,15 +601,20 @@ EXPORT_SYMBOL_GPL(usb_kill_anchored_urbs); | |||
| 601 | void usb_unlink_anchored_urbs(struct usb_anchor *anchor) | 601 | void usb_unlink_anchored_urbs(struct usb_anchor *anchor) |
| 602 | { | 602 | { |
| 603 | struct urb *victim; | 603 | struct urb *victim; |
| 604 | unsigned long flags; | ||
| 604 | 605 | ||
| 605 | spin_lock_irq(&anchor->lock); | 606 | spin_lock_irqsave(&anchor->lock, flags); |
| 606 | while (!list_empty(&anchor->urb_list)) { | 607 | while (!list_empty(&anchor->urb_list)) { |
| 607 | victim = list_entry(anchor->urb_list.prev, struct urb, | 608 | victim = list_entry(anchor->urb_list.prev, struct urb, |
| 608 | anchor_list); | 609 | anchor_list); |
| 610 | usb_get_urb(victim); | ||
| 611 | spin_unlock_irqrestore(&anchor->lock, flags); | ||
| 609 | /* this will unanchor the URB */ | 612 | /* this will unanchor the URB */ |
| 610 | usb_unlink_urb(victim); | 613 | usb_unlink_urb(victim); |
| 614 | usb_put_urb(victim); | ||
| 615 | spin_lock_irqsave(&anchor->lock, flags); | ||
| 611 | } | 616 | } |
| 612 | spin_unlock_irq(&anchor->lock); | 617 | spin_unlock_irqrestore(&anchor->lock, flags); |
| 613 | } | 618 | } |
| 614 | EXPORT_SYMBOL_GPL(usb_unlink_anchored_urbs); | 619 | EXPORT_SYMBOL_GPL(usb_unlink_anchored_urbs); |
| 615 | 620 | ||
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c index 84fcaa6a21ec..be1fa0723f2c 100644 --- a/drivers/usb/core/usb.c +++ b/drivers/usb/core/usb.c | |||
| @@ -219,12 +219,6 @@ static int usb_dev_uevent(struct device *dev, struct kobj_uevent_env *env) | |||
| 219 | } | 219 | } |
| 220 | #endif /* CONFIG_HOTPLUG */ | 220 | #endif /* CONFIG_HOTPLUG */ |
| 221 | 221 | ||
| 222 | struct device_type usb_device_type = { | ||
| 223 | .name = "usb_device", | ||
| 224 | .release = usb_release_dev, | ||
| 225 | .uevent = usb_dev_uevent, | ||
| 226 | }; | ||
| 227 | |||
| 228 | #ifdef CONFIG_PM | 222 | #ifdef CONFIG_PM |
| 229 | 223 | ||
| 230 | static int ksuspend_usb_init(void) | 224 | static int ksuspend_usb_init(void) |
| @@ -244,13 +238,80 @@ static void ksuspend_usb_cleanup(void) | |||
| 244 | destroy_workqueue(ksuspend_usb_wq); | 238 | destroy_workqueue(ksuspend_usb_wq); |
| 245 | } | 239 | } |
| 246 | 240 | ||
| 241 | /* USB device Power-Management thunks. | ||
| 242 | * There's no need to distinguish here between quiescing a USB device | ||
| 243 | * and powering it down; the generic_suspend() routine takes care of | ||
| 244 | * it by skipping the usb_port_suspend() call for a quiesce. And for | ||
| 245 | * USB interfaces there's no difference at all. | ||
| 246 | */ | ||
| 247 | |||
| 248 | static int usb_dev_prepare(struct device *dev) | ||
| 249 | { | ||
| 250 | return 0; /* Implement eventually? */ | ||
| 251 | } | ||
| 252 | |||
| 253 | static void usb_dev_complete(struct device *dev) | ||
| 254 | { | ||
| 255 | /* Currently used only for rebinding interfaces */ | ||
| 256 | usb_resume(dev); /* Implement eventually? */ | ||
| 257 | } | ||
| 258 | |||
| 259 | static int usb_dev_suspend(struct device *dev) | ||
| 260 | { | ||
| 261 | return usb_suspend(dev, PMSG_SUSPEND); | ||
| 262 | } | ||
| 263 | |||
| 264 | static int usb_dev_resume(struct device *dev) | ||
| 265 | { | ||
| 266 | return usb_resume(dev); | ||
| 267 | } | ||
| 268 | |||
| 269 | static int usb_dev_freeze(struct device *dev) | ||
| 270 | { | ||
| 271 | return usb_suspend(dev, PMSG_FREEZE); | ||
| 272 | } | ||
| 273 | |||
| 274 | static int usb_dev_thaw(struct device *dev) | ||
| 275 | { | ||
| 276 | return usb_resume(dev); | ||
| 277 | } | ||
| 278 | |||
| 279 | static int usb_dev_poweroff(struct device *dev) | ||
| 280 | { | ||
| 281 | return usb_suspend(dev, PMSG_HIBERNATE); | ||
| 282 | } | ||
| 283 | |||
| 284 | static int usb_dev_restore(struct device *dev) | ||
| 285 | { | ||
| 286 | return usb_resume(dev); | ||
| 287 | } | ||
| 288 | |||
| 289 | static struct pm_ops usb_device_pm_ops = { | ||
| 290 | .prepare = usb_dev_prepare, | ||
| 291 | .complete = usb_dev_complete, | ||
| 292 | .suspend = usb_dev_suspend, | ||
| 293 | .resume = usb_dev_resume, | ||
| 294 | .freeze = usb_dev_freeze, | ||
| 295 | .thaw = usb_dev_thaw, | ||
| 296 | .poweroff = usb_dev_poweroff, | ||
| 297 | .restore = usb_dev_restore, | ||
| 298 | }; | ||
| 299 | |||
| 247 | #else | 300 | #else |
| 248 | 301 | ||
| 249 | #define ksuspend_usb_init() 0 | 302 | #define ksuspend_usb_init() 0 |
| 250 | #define ksuspend_usb_cleanup() do {} while (0) | 303 | #define ksuspend_usb_cleanup() do {} while (0) |
| 304 | #define usb_device_pm_ops (*(struct pm_ops *)0) | ||
| 251 | 305 | ||
| 252 | #endif /* CONFIG_PM */ | 306 | #endif /* CONFIG_PM */ |
| 253 | 307 | ||
| 308 | struct device_type usb_device_type = { | ||
| 309 | .name = "usb_device", | ||
| 310 | .release = usb_release_dev, | ||
| 311 | .uevent = usb_dev_uevent, | ||
| 312 | .pm = &usb_device_pm_ops, | ||
| 313 | }; | ||
| 314 | |||
| 254 | 315 | ||
| 255 | /* Returns 1 if @usb_bus is WUSB, 0 otherwise */ | 316 | /* Returns 1 if @usb_bus is WUSB, 0 otherwise */ |
| 256 | static unsigned usb_bus_is_wusb(struct usb_bus *bus) | 317 | static unsigned usb_bus_is_wusb(struct usb_bus *bus) |
diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h index d9a6e16dbf84..9a1a45ac3add 100644 --- a/drivers/usb/core/usb.h +++ b/drivers/usb/core/usb.h | |||
| @@ -41,6 +41,9 @@ extern void usb_host_cleanup(void); | |||
| 41 | 41 | ||
| 42 | #ifdef CONFIG_PM | 42 | #ifdef CONFIG_PM |
| 43 | 43 | ||
| 44 | extern int usb_suspend(struct device *dev, pm_message_t msg); | ||
| 45 | extern int usb_resume(struct device *dev); | ||
| 46 | |||
| 44 | extern void usb_autosuspend_work(struct work_struct *work); | 47 | extern void usb_autosuspend_work(struct work_struct *work); |
| 45 | extern int usb_port_suspend(struct usb_device *dev); | 48 | extern int usb_port_suspend(struct usb_device *dev); |
| 46 | extern int usb_port_resume(struct usb_device *dev); | 49 | extern int usb_port_resume(struct usb_device *dev); |
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index c6a8c6b1116a..acc95b2ac6f8 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig | |||
| @@ -284,6 +284,16 @@ config USB_LH7A40X | |||
| 284 | default USB_GADGET | 284 | default USB_GADGET |
| 285 | select USB_GADGET_SELECTED | 285 | select USB_GADGET_SELECTED |
| 286 | 286 | ||
| 287 | # built in ../musb along with host support | ||
| 288 | config USB_GADGET_MUSB_HDRC | ||
| 289 | boolean "Inventra HDRC USB Peripheral (TI, ...)" | ||
| 290 | depends on USB_MUSB_HDRC && (USB_MUSB_PERIPHERAL || USB_MUSB_OTG) | ||
| 291 | select USB_GADGET_DUALSPEED | ||
| 292 | select USB_GADGET_SELECTED | ||
| 293 | help | ||
| 294 | This OTG-capable silicon IP is used in dual designs including | ||
| 295 | the TI DaVinci, OMAP 243x, OMAP 343x, and TUSB 6010. | ||
| 296 | |||
| 287 | config USB_GADGET_OMAP | 297 | config USB_GADGET_OMAP |
| 288 | boolean "OMAP USB Device Controller" | 298 | boolean "OMAP USB Device Controller" |
| 289 | depends on ARCH_OMAP | 299 | depends on ARCH_OMAP |
diff --git a/drivers/usb/gadget/amd5536udc.c b/drivers/usb/gadget/amd5536udc.c index 1500e1b3c302..abf8192f89e8 100644 --- a/drivers/usb/gadget/amd5536udc.c +++ b/drivers/usb/gadget/amd5536udc.c | |||
| @@ -44,7 +44,6 @@ | |||
| 44 | #include <linux/module.h> | 44 | #include <linux/module.h> |
| 45 | #include <linux/pci.h> | 45 | #include <linux/pci.h> |
| 46 | #include <linux/kernel.h> | 46 | #include <linux/kernel.h> |
| 47 | #include <linux/version.h> | ||
| 48 | #include <linux/delay.h> | 47 | #include <linux/delay.h> |
| 49 | #include <linux/ioport.h> | 48 | #include <linux/ioport.h> |
| 50 | #include <linux/sched.h> | 49 | #include <linux/sched.h> |
diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c index 21d1406af9ee..7600a0c78753 100644 --- a/drivers/usb/gadget/dummy_hcd.c +++ b/drivers/usb/gadget/dummy_hcd.c | |||
| @@ -542,13 +542,14 @@ dummy_queue (struct usb_ep *_ep, struct usb_request *_req, | |||
| 542 | req->req.context = dum; | 542 | req->req.context = dum; |
| 543 | req->req.complete = fifo_complete; | 543 | req->req.complete = fifo_complete; |
| 544 | 544 | ||
| 545 | list_add_tail(&req->queue, &ep->queue); | ||
| 545 | spin_unlock (&dum->lock); | 546 | spin_unlock (&dum->lock); |
| 546 | _req->actual = _req->length; | 547 | _req->actual = _req->length; |
| 547 | _req->status = 0; | 548 | _req->status = 0; |
| 548 | _req->complete (_ep, _req); | 549 | _req->complete (_ep, _req); |
| 549 | spin_lock (&dum->lock); | 550 | spin_lock (&dum->lock); |
| 550 | } | 551 | } else |
| 551 | list_add_tail (&req->queue, &ep->queue); | 552 | list_add_tail(&req->queue, &ep->queue); |
| 552 | spin_unlock_irqrestore (&dum->lock, flags); | 553 | spin_unlock_irqrestore (&dum->lock, flags); |
| 553 | 554 | ||
| 554 | /* real hardware would likely enable transfers here, in case | 555 | /* real hardware would likely enable transfers here, in case |
diff --git a/drivers/usb/gadget/f_acm.c b/drivers/usb/gadget/f_acm.c index d8faccf27895..5ee1590b8e9c 100644 --- a/drivers/usb/gadget/f_acm.c +++ b/drivers/usb/gadget/f_acm.c | |||
| @@ -47,18 +47,37 @@ struct f_acm { | |||
| 47 | u8 ctrl_id, data_id; | 47 | u8 ctrl_id, data_id; |
| 48 | u8 port_num; | 48 | u8 port_num; |
| 49 | 49 | ||
| 50 | struct usb_descriptor_header **fs_function; | 50 | u8 pending; |
| 51 | |||
| 52 | /* lock is mostly for pending and notify_req ... they get accessed | ||
| 53 | * by callbacks both from tty (open/close/break) under its spinlock, | ||
| 54 | * and notify_req.complete() which can't use that lock. | ||
| 55 | */ | ||
| 56 | spinlock_t lock; | ||
| 57 | |||
| 51 | struct acm_ep_descs fs; | 58 | struct acm_ep_descs fs; |
| 52 | struct usb_descriptor_header **hs_function; | ||
| 53 | struct acm_ep_descs hs; | 59 | struct acm_ep_descs hs; |
| 54 | 60 | ||
| 55 | struct usb_ep *notify; | 61 | struct usb_ep *notify; |
| 56 | struct usb_endpoint_descriptor *notify_desc; | 62 | struct usb_endpoint_descriptor *notify_desc; |
| 63 | struct usb_request *notify_req; | ||
| 57 | 64 | ||
| 58 | struct usb_cdc_line_coding port_line_coding; /* 8-N-1 etc */ | 65 | struct usb_cdc_line_coding port_line_coding; /* 8-N-1 etc */ |
| 66 | |||
| 67 | /* SetControlLineState request -- CDC 1.1 section 6.2.14 (INPUT) */ | ||
| 59 | u16 port_handshake_bits; | 68 | u16 port_handshake_bits; |
| 60 | #define RS232_RTS (1 << 1) /* unused with full duplex */ | 69 | #define ACM_CTRL_RTS (1 << 1) /* unused with full duplex */ |
| 61 | #define RS232_DTR (1 << 0) /* host is ready for data r/w */ | 70 | #define ACM_CTRL_DTR (1 << 0) /* host is ready for data r/w */ |
| 71 | |||
| 72 | /* SerialState notification -- CDC 1.1 section 6.3.5 (OUTPUT) */ | ||
| 73 | u16 serial_state; | ||
| 74 | #define ACM_CTRL_OVERRUN (1 << 6) | ||
| 75 | #define ACM_CTRL_PARITY (1 << 5) | ||
| 76 | #define ACM_CTRL_FRAMING (1 << 4) | ||
| 77 | #define ACM_CTRL_RI (1 << 3) | ||
| 78 | #define ACM_CTRL_BRK (1 << 2) | ||
| 79 | #define ACM_CTRL_DSR (1 << 1) | ||
| 80 | #define ACM_CTRL_DCD (1 << 0) | ||
| 62 | }; | 81 | }; |
| 63 | 82 | ||
| 64 | static inline struct f_acm *func_to_acm(struct usb_function *f) | 83 | static inline struct f_acm *func_to_acm(struct usb_function *f) |
| @@ -66,12 +85,17 @@ static inline struct f_acm *func_to_acm(struct usb_function *f) | |||
| 66 | return container_of(f, struct f_acm, port.func); | 85 | return container_of(f, struct f_acm, port.func); |
| 67 | } | 86 | } |
| 68 | 87 | ||
| 88 | static inline struct f_acm *port_to_acm(struct gserial *p) | ||
| 89 | { | ||
| 90 | return container_of(p, struct f_acm, port); | ||
| 91 | } | ||
| 92 | |||
| 69 | /*-------------------------------------------------------------------------*/ | 93 | /*-------------------------------------------------------------------------*/ |
| 70 | 94 | ||
| 71 | /* notification endpoint uses smallish and infrequent fixed-size messages */ | 95 | /* notification endpoint uses smallish and infrequent fixed-size messages */ |
| 72 | 96 | ||
| 73 | #define GS_LOG2_NOTIFY_INTERVAL 5 /* 1 << 5 == 32 msec */ | 97 | #define GS_LOG2_NOTIFY_INTERVAL 5 /* 1 << 5 == 32 msec */ |
| 74 | #define GS_NOTIFY_MAXPACKET 8 | 98 | #define GS_NOTIFY_MAXPACKET 10 /* notification + 2 bytes */ |
| 75 | 99 | ||
| 76 | /* interface and class descriptors: */ | 100 | /* interface and class descriptors: */ |
| 77 | 101 | ||
| @@ -117,7 +141,7 @@ static struct usb_cdc_acm_descriptor acm_descriptor __initdata = { | |||
| 117 | .bLength = sizeof(acm_descriptor), | 141 | .bLength = sizeof(acm_descriptor), |
| 118 | .bDescriptorType = USB_DT_CS_INTERFACE, | 142 | .bDescriptorType = USB_DT_CS_INTERFACE, |
| 119 | .bDescriptorSubType = USB_CDC_ACM_TYPE, | 143 | .bDescriptorSubType = USB_CDC_ACM_TYPE, |
| 120 | .bmCapabilities = (1 << 1), | 144 | .bmCapabilities = USB_CDC_CAP_LINE, |
| 121 | }; | 145 | }; |
| 122 | 146 | ||
| 123 | static struct usb_cdc_union_desc acm_union_desc __initdata = { | 147 | static struct usb_cdc_union_desc acm_union_desc __initdata = { |
| @@ -277,6 +301,11 @@ static int acm_setup(struct usb_function *f, const struct usb_ctrlrequest *ctrl) | |||
| 277 | 301 | ||
| 278 | /* composite driver infrastructure handles everything except | 302 | /* composite driver infrastructure handles everything except |
| 279 | * CDC class messages; interface activation uses set_alt(). | 303 | * CDC class messages; interface activation uses set_alt(). |
| 304 | * | ||
| 305 | * Note CDC spec table 4 lists the ACM request profile. It requires | ||
| 306 | * encapsulated command support ... we don't handle any, and respond | ||
| 307 | * to them by stalling. Options include get/set/clear comm features | ||
| 308 | * (not that useful) and SEND_BREAK. | ||
| 280 | */ | 309 | */ |
| 281 | switch ((ctrl->bRequestType << 8) | ctrl->bRequest) { | 310 | switch ((ctrl->bRequestType << 8) | ctrl->bRequest) { |
| 282 | 311 | ||
| @@ -312,7 +341,7 @@ static int acm_setup(struct usb_function *f, const struct usb_ctrlrequest *ctrl) | |||
| 312 | value = 0; | 341 | value = 0; |
| 313 | 342 | ||
| 314 | /* FIXME we should not allow data to flow until the | 343 | /* FIXME we should not allow data to flow until the |
| 315 | * host sets the RS232_DTR bit; and when it clears | 344 | * host sets the ACM_CTRL_DTR bit; and when it clears |
| 316 | * that bit, we should return to that no-flow state. | 345 | * that bit, we should return to that no-flow state. |
| 317 | */ | 346 | */ |
| 318 | acm->port_handshake_bits = w_value; | 347 | acm->port_handshake_bits = w_value; |
| @@ -350,9 +379,6 @@ static int acm_set_alt(struct usb_function *f, unsigned intf, unsigned alt) | |||
| 350 | /* we know alt == 0, so this is an activation or a reset */ | 379 | /* we know alt == 0, so this is an activation or a reset */ |
| 351 | 380 | ||
| 352 | if (intf == acm->ctrl_id) { | 381 | if (intf == acm->ctrl_id) { |
| 353 | /* REVISIT this may need more work when we start to | ||
| 354 | * send notifications ... | ||
| 355 | */ | ||
| 356 | if (acm->notify->driver_data) { | 382 | if (acm->notify->driver_data) { |
| 357 | VDBG(cdev, "reset acm control interface %d\n", intf); | 383 | VDBG(cdev, "reset acm control interface %d\n", intf); |
| 358 | usb_ep_disable(acm->notify); | 384 | usb_ep_disable(acm->notify); |
| @@ -397,6 +423,128 @@ static void acm_disable(struct usb_function *f) | |||
| 397 | 423 | ||
| 398 | /*-------------------------------------------------------------------------*/ | 424 | /*-------------------------------------------------------------------------*/ |
| 399 | 425 | ||
| 426 | /** | ||
| 427 | * acm_cdc_notify - issue CDC notification to host | ||
| 428 | * @acm: wraps host to be notified | ||
| 429 | * @type: notification type | ||
| 430 | * @value: Refer to cdc specs, wValue field. | ||
| 431 | * @data: data to be sent | ||
| 432 | * @length: size of data | ||
| 433 | * Context: irqs blocked, acm->lock held, acm_notify_req non-null | ||
| 434 | * | ||
| 435 | * Returns zero on sucess or a negative errno. | ||
| 436 | * | ||
| 437 | * See section 6.3.5 of the CDC 1.1 specification for information | ||
| 438 | * about the only notification we issue: SerialState change. | ||
| 439 | */ | ||
| 440 | static int acm_cdc_notify(struct f_acm *acm, u8 type, u16 value, | ||
| 441 | void *data, unsigned length) | ||
| 442 | { | ||
| 443 | struct usb_ep *ep = acm->notify; | ||
| 444 | struct usb_request *req; | ||
| 445 | struct usb_cdc_notification *notify; | ||
| 446 | const unsigned len = sizeof(*notify) + length; | ||
| 447 | void *buf; | ||
| 448 | int status; | ||
| 449 | |||
| 450 | req = acm->notify_req; | ||
| 451 | acm->notify_req = NULL; | ||
| 452 | acm->pending = false; | ||
| 453 | |||
| 454 | req->length = len; | ||
| 455 | notify = req->buf; | ||
| 456 | buf = notify + 1; | ||
| 457 | |||
| 458 | notify->bmRequestType = USB_DIR_IN | USB_TYPE_CLASS | ||
| 459 | | USB_RECIP_INTERFACE; | ||
| 460 | notify->bNotificationType = type; | ||
| 461 | notify->wValue = cpu_to_le16(value); | ||
| 462 | notify->wIndex = cpu_to_le16(acm->ctrl_id); | ||
| 463 | notify->wLength = cpu_to_le16(length); | ||
| 464 | memcpy(buf, data, length); | ||
| 465 | |||
| 466 | status = usb_ep_queue(ep, req, GFP_ATOMIC); | ||
| 467 | if (status < 0) { | ||
| 468 | ERROR(acm->port.func.config->cdev, | ||
| 469 | "acm ttyGS%d can't notify serial state, %d\n", | ||
| 470 | acm->port_num, status); | ||
| 471 | acm->notify_req = req; | ||
| 472 | } | ||
| 473 | |||
| 474 | return status; | ||
| 475 | } | ||
| 476 | |||
| 477 | static int acm_notify_serial_state(struct f_acm *acm) | ||
| 478 | { | ||
| 479 | struct usb_composite_dev *cdev = acm->port.func.config->cdev; | ||
| 480 | int status; | ||
| 481 | |||
| 482 | spin_lock(&acm->lock); | ||
| 483 | if (acm->notify_req) { | ||
| 484 | DBG(cdev, "acm ttyGS%d serial state %04x\n", | ||
| 485 | acm->port_num, acm->serial_state); | ||
| 486 | status = acm_cdc_notify(acm, USB_CDC_NOTIFY_SERIAL_STATE, | ||
| 487 | 0, &acm->serial_state, sizeof(acm->serial_state)); | ||
| 488 | } else { | ||
| 489 | acm->pending = true; | ||
| 490 | status = 0; | ||
| 491 | } | ||
| 492 | spin_unlock(&acm->lock); | ||
| 493 | return status; | ||
| 494 | } | ||
| 495 | |||
| 496 | static void acm_cdc_notify_complete(struct usb_ep *ep, struct usb_request *req) | ||
| 497 | { | ||
| 498 | struct f_acm *acm = req->context; | ||
| 499 | u8 doit = false; | ||
| 500 | |||
| 501 | /* on this call path we do NOT hold the port spinlock, | ||
| 502 | * which is why ACM needs its own spinlock | ||
| 503 | */ | ||
| 504 | spin_lock(&acm->lock); | ||
| 505 | if (req->status != -ESHUTDOWN) | ||
| 506 | doit = acm->pending; | ||
| 507 | acm->notify_req = req; | ||
| 508 | spin_unlock(&acm->lock); | ||
| 509 | |||
| 510 | if (doit) | ||
| 511 | acm_notify_serial_state(acm); | ||
| 512 | } | ||
| 513 | |||
| 514 | /* connect == the TTY link is open */ | ||
| 515 | |||
| 516 | static void acm_connect(struct gserial *port) | ||
| 517 | { | ||
| 518 | struct f_acm *acm = port_to_acm(port); | ||
| 519 | |||
| 520 | acm->serial_state |= ACM_CTRL_DSR | ACM_CTRL_DCD; | ||
| 521 | acm_notify_serial_state(acm); | ||
| 522 | } | ||
| 523 | |||
| 524 | static void acm_disconnect(struct gserial *port) | ||
| 525 | { | ||
| 526 | struct f_acm *acm = port_to_acm(port); | ||
| 527 | |||
| 528 | acm->serial_state &= ~(ACM_CTRL_DSR | ACM_CTRL_DCD); | ||
| 529 | acm_notify_serial_state(acm); | ||
| 530 | } | ||
| 531 | |||
| 532 | static int acm_send_break(struct gserial *port, int duration) | ||
| 533 | { | ||
| 534 | struct f_acm *acm = port_to_acm(port); | ||
| 535 | u16 state; | ||
| 536 | |||
| 537 | state = acm->serial_state; | ||
| 538 | state &= ~ACM_CTRL_BRK; | ||
| 539 | if (duration) | ||
| 540 | state |= ACM_CTRL_BRK; | ||
| 541 | |||
| 542 | acm->serial_state = state; | ||
| 543 | return acm_notify_serial_state(acm); | ||
| 544 | } | ||
| 545 | |||
| 546 | /*-------------------------------------------------------------------------*/ | ||
| 547 | |||
| 400 | /* ACM function driver setup/binding */ | 548 | /* ACM function driver setup/binding */ |
| 401 | static int __init | 549 | static int __init |
| 402 | acm_bind(struct usb_configuration *c, struct usb_function *f) | 550 | acm_bind(struct usb_configuration *c, struct usb_function *f) |
| @@ -445,8 +593,20 @@ acm_bind(struct usb_configuration *c, struct usb_function *f) | |||
| 445 | acm->notify = ep; | 593 | acm->notify = ep; |
| 446 | ep->driver_data = cdev; /* claim */ | 594 | ep->driver_data = cdev; /* claim */ |
| 447 | 595 | ||
| 596 | /* allocate notification */ | ||
| 597 | acm->notify_req = gs_alloc_req(ep, | ||
| 598 | sizeof(struct usb_cdc_notification) + 2, | ||
| 599 | GFP_KERNEL); | ||
| 600 | if (!acm->notify_req) | ||
| 601 | goto fail; | ||
| 602 | |||
| 603 | acm->notify_req->complete = acm_cdc_notify_complete; | ||
| 604 | acm->notify_req->context = acm; | ||
| 605 | |||
| 448 | /* copy descriptors, and track endpoint copies */ | 606 | /* copy descriptors, and track endpoint copies */ |
| 449 | f->descriptors = usb_copy_descriptors(acm_fs_function); | 607 | f->descriptors = usb_copy_descriptors(acm_fs_function); |
| 608 | if (!f->descriptors) | ||
| 609 | goto fail; | ||
| 450 | 610 | ||
| 451 | acm->fs.in = usb_find_endpoint(acm_fs_function, | 611 | acm->fs.in = usb_find_endpoint(acm_fs_function, |
| 452 | f->descriptors, &acm_fs_in_desc); | 612 | f->descriptors, &acm_fs_in_desc); |
| @@ -478,8 +638,6 @@ acm_bind(struct usb_configuration *c, struct usb_function *f) | |||
| 478 | f->hs_descriptors, &acm_hs_notify_desc); | 638 | f->hs_descriptors, &acm_hs_notify_desc); |
| 479 | } | 639 | } |
| 480 | 640 | ||
| 481 | /* FIXME provide a callback for triggering notifications */ | ||
| 482 | |||
| 483 | DBG(cdev, "acm ttyGS%d: %s speed IN/%s OUT/%s NOTIFY/%s\n", | 641 | DBG(cdev, "acm ttyGS%d: %s speed IN/%s OUT/%s NOTIFY/%s\n", |
| 484 | acm->port_num, | 642 | acm->port_num, |
| 485 | gadget_is_dualspeed(c->cdev->gadget) ? "dual" : "full", | 643 | gadget_is_dualspeed(c->cdev->gadget) ? "dual" : "full", |
| @@ -488,6 +646,9 @@ acm_bind(struct usb_configuration *c, struct usb_function *f) | |||
| 488 | return 0; | 646 | return 0; |
| 489 | 647 | ||
| 490 | fail: | 648 | fail: |
| 649 | if (acm->notify_req) | ||
| 650 | gs_free_req(acm->notify, acm->notify_req); | ||
| 651 | |||
| 491 | /* we might as well release our claims on endpoints */ | 652 | /* we might as well release our claims on endpoints */ |
| 492 | if (acm->notify) | 653 | if (acm->notify) |
| 493 | acm->notify->driver_data = NULL; | 654 | acm->notify->driver_data = NULL; |
| @@ -504,10 +665,13 @@ fail: | |||
| 504 | static void | 665 | static void |
| 505 | acm_unbind(struct usb_configuration *c, struct usb_function *f) | 666 | acm_unbind(struct usb_configuration *c, struct usb_function *f) |
| 506 | { | 667 | { |
| 668 | struct f_acm *acm = func_to_acm(f); | ||
| 669 | |||
| 507 | if (gadget_is_dualspeed(c->cdev->gadget)) | 670 | if (gadget_is_dualspeed(c->cdev->gadget)) |
| 508 | usb_free_descriptors(f->hs_descriptors); | 671 | usb_free_descriptors(f->hs_descriptors); |
| 509 | usb_free_descriptors(f->descriptors); | 672 | usb_free_descriptors(f->descriptors); |
| 510 | kfree(func_to_acm(f)); | 673 | gs_free_req(acm->notify, acm->notify_req); |
| 674 | kfree(acm); | ||
| 511 | } | 675 | } |
| 512 | 676 | ||
| 513 | /* Some controllers can't support CDC ACM ... */ | 677 | /* Some controllers can't support CDC ACM ... */ |
| @@ -571,8 +735,14 @@ int __init acm_bind_config(struct usb_configuration *c, u8 port_num) | |||
| 571 | if (!acm) | 735 | if (!acm) |
| 572 | return -ENOMEM; | 736 | return -ENOMEM; |
| 573 | 737 | ||
| 738 | spin_lock_init(&acm->lock); | ||
| 739 | |||
| 574 | acm->port_num = port_num; | 740 | acm->port_num = port_num; |
| 575 | 741 | ||
| 742 | acm->port.connect = acm_connect; | ||
| 743 | acm->port.disconnect = acm_disconnect; | ||
| 744 | acm->port.send_break = acm_send_break; | ||
| 745 | |||
| 576 | acm->port.func.name = "acm"; | 746 | acm->port.func.name = "acm"; |
| 577 | acm->port.func.strings = acm_strings; | 747 | acm->port.func.strings = acm_strings; |
| 578 | /* descriptors are per-instance copies */ | 748 | /* descriptors are per-instance copies */ |
diff --git a/drivers/usb/gadget/f_ecm.c b/drivers/usb/gadget/f_ecm.c index 0822e9d7693a..a2b5c092bda0 100644 --- a/drivers/usb/gadget/f_ecm.c +++ b/drivers/usb/gadget/f_ecm.c | |||
| @@ -63,9 +63,7 @@ struct f_ecm { | |||
| 63 | 63 | ||
| 64 | char ethaddr[14]; | 64 | char ethaddr[14]; |
| 65 | 65 | ||
| 66 | struct usb_descriptor_header **fs_function; | ||
| 67 | struct ecm_ep_descs fs; | 66 | struct ecm_ep_descs fs; |
| 68 | struct usb_descriptor_header **hs_function; | ||
| 69 | struct ecm_ep_descs hs; | 67 | struct ecm_ep_descs hs; |
| 70 | 68 | ||
| 71 | struct usb_ep *notify; | 69 | struct usb_ep *notify; |
diff --git a/drivers/usb/gadget/f_rndis.c b/drivers/usb/gadget/f_rndis.c index 61652f0f13fd..659b3d9671c4 100644 --- a/drivers/usb/gadget/f_rndis.c +++ b/drivers/usb/gadget/f_rndis.c | |||
| @@ -85,9 +85,7 @@ struct f_rndis { | |||
| 85 | u8 ethaddr[ETH_ALEN]; | 85 | u8 ethaddr[ETH_ALEN]; |
| 86 | int config; | 86 | int config; |
| 87 | 87 | ||
| 88 | struct usb_descriptor_header **fs_function; | ||
| 89 | struct rndis_ep_descs fs; | 88 | struct rndis_ep_descs fs; |
| 90 | struct usb_descriptor_header **hs_function; | ||
| 91 | struct rndis_ep_descs hs; | 89 | struct rndis_ep_descs hs; |
| 92 | 90 | ||
| 93 | struct usb_ep *notify; | 91 | struct usb_ep *notify; |
diff --git a/drivers/usb/gadget/f_serial.c b/drivers/usb/gadget/f_serial.c index 1b6bde9aaed5..fe5674db344b 100644 --- a/drivers/usb/gadget/f_serial.c +++ b/drivers/usb/gadget/f_serial.c | |||
| @@ -36,9 +36,7 @@ struct f_gser { | |||
| 36 | u8 data_id; | 36 | u8 data_id; |
| 37 | u8 port_num; | 37 | u8 port_num; |
| 38 | 38 | ||
| 39 | struct usb_descriptor_header **fs_function; | ||
| 40 | struct gser_descs fs; | 39 | struct gser_descs fs; |
| 41 | struct usb_descriptor_header **hs_function; | ||
| 42 | struct gser_descs hs; | 40 | struct gser_descs hs; |
| 43 | }; | 41 | }; |
| 44 | 42 | ||
diff --git a/drivers/usb/gadget/f_subset.c b/drivers/usb/gadget/f_subset.c index afeab9a0523f..acb8d233aa1d 100644 --- a/drivers/usb/gadget/f_subset.c +++ b/drivers/usb/gadget/f_subset.c | |||
| @@ -66,9 +66,7 @@ struct f_gether { | |||
| 66 | 66 | ||
| 67 | char ethaddr[14]; | 67 | char ethaddr[14]; |
| 68 | 68 | ||
| 69 | struct usb_descriptor_header **fs_function; | ||
| 70 | struct geth_descs fs; | 69 | struct geth_descs fs; |
| 71 | struct usb_descriptor_header **hs_function; | ||
| 72 | struct geth_descs hs; | 70 | struct geth_descs hs; |
| 73 | }; | 71 | }; |
| 74 | 72 | ||
diff --git a/drivers/usb/gadget/gadget_chips.h b/drivers/usb/gadget/gadget_chips.h index 5246e8fef2b2..17d9905101b7 100644 --- a/drivers/usb/gadget/gadget_chips.h +++ b/drivers/usb/gadget/gadget_chips.h | |||
| @@ -11,6 +11,10 @@ | |||
| 11 | * Some are available on 2.4 kernels; several are available, but not | 11 | * Some are available on 2.4 kernels; several are available, but not |
| 12 | * yet pushed in the 2.6 mainline tree. | 12 | * yet pushed in the 2.6 mainline tree. |
| 13 | */ | 13 | */ |
| 14 | |||
| 15 | #ifndef __GADGET_CHIPS_H | ||
| 16 | #define __GADGET_CHIPS_H | ||
| 17 | |||
| 14 | #ifdef CONFIG_USB_GADGET_NET2280 | 18 | #ifdef CONFIG_USB_GADGET_NET2280 |
| 15 | #define gadget_is_net2280(g) !strcmp("net2280", (g)->name) | 19 | #define gadget_is_net2280(g) !strcmp("net2280", (g)->name) |
| 16 | #else | 20 | #else |
| @@ -237,3 +241,5 @@ static inline bool gadget_supports_altsettings(struct usb_gadget *gadget) | |||
| 237 | /* Everything else is *presumably* fine ... */ | 241 | /* Everything else is *presumably* fine ... */ |
| 238 | return true; | 242 | return true; |
| 239 | } | 243 | } |
| 244 | |||
| 245 | #endif /* __GADGET_CHIPS_H */ | ||
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c index 376e80c07530..574c53831a05 100644 --- a/drivers/usb/gadget/omap_udc.c +++ b/drivers/usb/gadget/omap_udc.c | |||
| @@ -54,6 +54,7 @@ | |||
| 54 | 54 | ||
| 55 | #include <mach/dma.h> | 55 | #include <mach/dma.h> |
| 56 | #include <mach/usb.h> | 56 | #include <mach/usb.h> |
| 57 | #include <mach/control.h> | ||
| 57 | 58 | ||
| 58 | #include "omap_udc.h" | 59 | #include "omap_udc.h" |
| 59 | 60 | ||
| @@ -2310,10 +2311,10 @@ static int proc_otg_show(struct seq_file *s) | |||
| 2310 | u32 trans; | 2311 | u32 trans; |
| 2311 | char *ctrl_name; | 2312 | char *ctrl_name; |
| 2312 | 2313 | ||
| 2313 | tmp = OTG_REV_REG; | 2314 | tmp = omap_readl(OTG_REV); |
| 2314 | if (cpu_is_omap24xx()) { | 2315 | if (cpu_is_omap24xx()) { |
| 2315 | ctrl_name = "control_devconf"; | 2316 | ctrl_name = "control_devconf"; |
| 2316 | trans = CONTROL_DEVCONF_REG; | 2317 | trans = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0); |
| 2317 | } else { | 2318 | } else { |
| 2318 | ctrl_name = "tranceiver_ctrl"; | 2319 | ctrl_name = "tranceiver_ctrl"; |
| 2319 | trans = omap_readw(USB_TRANSCEIVER_CTRL); | 2320 | trans = omap_readw(USB_TRANSCEIVER_CTRL); |
diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c index a28513ecbe5b..7cbc78a6853d 100644 --- a/drivers/usb/gadget/pxa27x_udc.c +++ b/drivers/usb/gadget/pxa27x_udc.c | |||
| @@ -1622,7 +1622,7 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver) | |||
| 1622 | struct pxa_udc *udc = the_controller; | 1622 | struct pxa_udc *udc = the_controller; |
| 1623 | int retval; | 1623 | int retval; |
| 1624 | 1624 | ||
| 1625 | if (!driver || driver->speed != USB_SPEED_FULL || !driver->bind | 1625 | if (!driver || driver->speed < USB_SPEED_FULL || !driver->bind |
| 1626 | || !driver->disconnect || !driver->setup) | 1626 | || !driver->disconnect || !driver->setup) |
| 1627 | return -EINVAL; | 1627 | return -EINVAL; |
| 1628 | if (!udc) | 1628 | if (!udc) |
diff --git a/drivers/usb/gadget/s3c2410_udc.c b/drivers/usb/gadget/s3c2410_udc.c index 538807384592..29d13ebe7500 100644 --- a/drivers/usb/gadget/s3c2410_udc.c +++ b/drivers/usb/gadget/s3c2410_udc.c | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | #include <linux/list.h> | 35 | #include <linux/list.h> |
| 36 | #include <linux/interrupt.h> | 36 | #include <linux/interrupt.h> |
| 37 | #include <linux/platform_device.h> | 37 | #include <linux/platform_device.h> |
| 38 | #include <linux/version.h> | ||
| 39 | #include <linux/clk.h> | 38 | #include <linux/clk.h> |
| 40 | 39 | ||
| 41 | #include <linux/debugfs.h> | 40 | #include <linux/debugfs.h> |
diff --git a/drivers/usb/gadget/u_serial.c b/drivers/usb/gadget/u_serial.c index abf9505d3a75..53d59287f2bc 100644 --- a/drivers/usb/gadget/u_serial.c +++ b/drivers/usb/gadget/u_serial.c | |||
| @@ -52,13 +52,16 @@ | |||
| 52 | * is managed in userspace ... OBEX, PTP, and MTP have been mentioned. | 52 | * is managed in userspace ... OBEX, PTP, and MTP have been mentioned. |
| 53 | */ | 53 | */ |
| 54 | 54 | ||
| 55 | #define PREFIX "ttyGS" | ||
| 56 | |||
| 55 | /* | 57 | /* |
| 56 | * gserial is the lifecycle interface, used by USB functions | 58 | * gserial is the lifecycle interface, used by USB functions |
| 57 | * gs_port is the I/O nexus, used by the tty driver | 59 | * gs_port is the I/O nexus, used by the tty driver |
| 58 | * tty_struct links to the tty/filesystem framework | 60 | * tty_struct links to the tty/filesystem framework |
| 59 | * | 61 | * |
| 60 | * gserial <---> gs_port ... links will be null when the USB link is | 62 | * gserial <---> gs_port ... links will be null when the USB link is |
| 61 | * inactive; managed by gserial_{connect,disconnect}(). | 63 | * inactive; managed by gserial_{connect,disconnect}(). each gserial |
| 64 | * instance can wrap its own USB control protocol. | ||
| 62 | * gserial->ioport == usb_ep->driver_data ... gs_port | 65 | * gserial->ioport == usb_ep->driver_data ... gs_port |
| 63 | * gs_port->port_usb ... gserial | 66 | * gs_port->port_usb ... gserial |
| 64 | * | 67 | * |
| @@ -100,6 +103,8 @@ struct gs_port { | |||
| 100 | wait_queue_head_t close_wait; /* wait for last close */ | 103 | wait_queue_head_t close_wait; /* wait for last close */ |
| 101 | 104 | ||
| 102 | struct list_head read_pool; | 105 | struct list_head read_pool; |
| 106 | struct list_head read_queue; | ||
| 107 | unsigned n_read; | ||
| 103 | struct tasklet_struct push; | 108 | struct tasklet_struct push; |
| 104 | 109 | ||
| 105 | struct list_head write_pool; | 110 | struct list_head write_pool; |
| @@ -177,7 +182,7 @@ static void gs_buf_clear(struct gs_buf *gb) | |||
| 177 | /* | 182 | /* |
| 178 | * gs_buf_data_avail | 183 | * gs_buf_data_avail |
| 179 | * | 184 | * |
| 180 | * Return the number of bytes of data available in the circular | 185 | * Return the number of bytes of data written into the circular |
| 181 | * buffer. | 186 | * buffer. |
| 182 | */ | 187 | */ |
| 183 | static unsigned gs_buf_data_avail(struct gs_buf *gb) | 188 | static unsigned gs_buf_data_avail(struct gs_buf *gb) |
| @@ -278,7 +283,7 @@ gs_buf_get(struct gs_buf *gb, char *buf, unsigned count) | |||
| 278 | * Allocate a usb_request and its buffer. Returns a pointer to the | 283 | * Allocate a usb_request and its buffer. Returns a pointer to the |
| 279 | * usb_request or NULL if there is an error. | 284 | * usb_request or NULL if there is an error. |
| 280 | */ | 285 | */ |
| 281 | static struct usb_request * | 286 | struct usb_request * |
| 282 | gs_alloc_req(struct usb_ep *ep, unsigned len, gfp_t kmalloc_flags) | 287 | gs_alloc_req(struct usb_ep *ep, unsigned len, gfp_t kmalloc_flags) |
| 283 | { | 288 | { |
| 284 | struct usb_request *req; | 289 | struct usb_request *req; |
| @@ -302,7 +307,7 @@ gs_alloc_req(struct usb_ep *ep, unsigned len, gfp_t kmalloc_flags) | |||
| 302 | * | 307 | * |
| 303 | * Free a usb_request and its buffer. | 308 | * Free a usb_request and its buffer. |
| 304 | */ | 309 | */ |
| 305 | static void gs_free_req(struct usb_ep *ep, struct usb_request *req) | 310 | void gs_free_req(struct usb_ep *ep, struct usb_request *req) |
| 306 | { | 311 | { |
| 307 | kfree(req->buf); | 312 | kfree(req->buf); |
| 308 | usb_ep_free_request(ep, req); | 313 | usb_ep_free_request(ep, req); |
| @@ -367,11 +372,9 @@ __acquires(&port->port_lock) | |||
| 367 | req->length = len; | 372 | req->length = len; |
| 368 | list_del(&req->list); | 373 | list_del(&req->list); |
| 369 | 374 | ||
| 370 | #ifdef VERBOSE_DEBUG | 375 | pr_vdebug(PREFIX "%d: tx len=%d, 0x%02x 0x%02x 0x%02x ...\n", |
| 371 | pr_debug("%s: %s, len=%d, 0x%02x 0x%02x 0x%02x ...\n", | 376 | port->port_num, len, *((u8 *)req->buf), |
| 372 | __func__, in->name, len, *((u8 *)req->buf), | ||
| 373 | *((u8 *)req->buf+1), *((u8 *)req->buf+2)); | 377 | *((u8 *)req->buf+1), *((u8 *)req->buf+2)); |
| 374 | #endif | ||
| 375 | 378 | ||
| 376 | /* Drop lock while we call out of driver; completions | 379 | /* Drop lock while we call out of driver; completions |
| 377 | * could be issued while we do so. Disconnection may | 380 | * could be issued while we do so. Disconnection may |
| @@ -401,56 +404,6 @@ __acquires(&port->port_lock) | |||
| 401 | return status; | 404 | return status; |
| 402 | } | 405 | } |
| 403 | 406 | ||
| 404 | static void gs_rx_push(unsigned long _port) | ||
| 405 | { | ||
| 406 | struct gs_port *port = (void *)_port; | ||
| 407 | struct tty_struct *tty = port->port_tty; | ||
| 408 | |||
| 409 | /* With low_latency, tty_flip_buffer_push() doesn't put its | ||
| 410 | * real work through a workqueue, so the ldisc has a better | ||
| 411 | * chance to keep up with peak USB data rates. | ||
| 412 | */ | ||
| 413 | if (tty) { | ||
| 414 | tty_flip_buffer_push(tty); | ||
| 415 | wake_up_interruptible(&tty->read_wait); | ||
| 416 | } | ||
| 417 | } | ||
| 418 | |||
| 419 | /* | ||
| 420 | * gs_recv_packet | ||
| 421 | * | ||
| 422 | * Called for each USB packet received. Reads the packet | ||
| 423 | * header and stuffs the data in the appropriate tty buffer. | ||
| 424 | * Returns 0 if successful, or a negative error number. | ||
| 425 | * | ||
| 426 | * Called during USB completion routine, on interrupt time. | ||
| 427 | * With port_lock. | ||
| 428 | */ | ||
| 429 | static int gs_recv_packet(struct gs_port *port, char *packet, unsigned size) | ||
| 430 | { | ||
| 431 | unsigned len; | ||
| 432 | struct tty_struct *tty; | ||
| 433 | |||
| 434 | /* I/O completions can continue for a while after close(), until the | ||
| 435 | * request queue empties. Just discard any data we receive, until | ||
| 436 | * something reopens this TTY ... as if there were no HW flow control. | ||
| 437 | */ | ||
| 438 | tty = port->port_tty; | ||
| 439 | if (tty == NULL) { | ||
| 440 | pr_vdebug("%s: ttyGS%d, after close\n", | ||
| 441 | __func__, port->port_num); | ||
| 442 | return -EIO; | ||
| 443 | } | ||
| 444 | |||
| 445 | len = tty_insert_flip_string(tty, packet, size); | ||
| 446 | if (len > 0) | ||
| 447 | tasklet_schedule(&port->push); | ||
| 448 | if (len < size) | ||
| 449 | pr_debug("%s: ttyGS%d, drop %d bytes\n", | ||
| 450 | __func__, port->port_num, size - len); | ||
| 451 | return 0; | ||
| 452 | } | ||
| 453 | |||
| 454 | /* | 407 | /* |
| 455 | * Context: caller owns port_lock, and port_usb is set | 408 | * Context: caller owns port_lock, and port_usb is set |
| 456 | */ | 409 | */ |
| @@ -469,9 +422,9 @@ __acquires(&port->port_lock) | |||
| 469 | int status; | 422 | int status; |
| 470 | struct tty_struct *tty; | 423 | struct tty_struct *tty; |
| 471 | 424 | ||
| 472 | /* no more rx if closed or throttled */ | 425 | /* no more rx if closed */ |
| 473 | tty = port->port_tty; | 426 | tty = port->port_tty; |
| 474 | if (!tty || test_bit(TTY_THROTTLED, &tty->flags)) | 427 | if (!tty) |
| 475 | break; | 428 | break; |
| 476 | 429 | ||
| 477 | req = list_entry(pool->next, struct usb_request, list); | 430 | req = list_entry(pool->next, struct usb_request, list); |
| @@ -500,36 +453,134 @@ __acquires(&port->port_lock) | |||
| 500 | return started; | 453 | return started; |
| 501 | } | 454 | } |
| 502 | 455 | ||
| 503 | static void gs_read_complete(struct usb_ep *ep, struct usb_request *req) | 456 | /* |
| 457 | * RX tasklet takes data out of the RX queue and hands it up to the TTY | ||
| 458 | * layer until it refuses to take any more data (or is throttled back). | ||
| 459 | * Then it issues reads for any further data. | ||
| 460 | * | ||
| 461 | * If the RX queue becomes full enough that no usb_request is queued, | ||
| 462 | * the OUT endpoint may begin NAKing as soon as its FIFO fills up. | ||
| 463 | * So QUEUE_SIZE packets plus however many the FIFO holds (usually two) | ||
| 464 | * can be buffered before the TTY layer's buffers (currently 64 KB). | ||
| 465 | */ | ||
| 466 | static void gs_rx_push(unsigned long _port) | ||
| 504 | { | 467 | { |
| 505 | int status; | 468 | struct gs_port *port = (void *)_port; |
| 506 | struct gs_port *port = ep->driver_data; | 469 | struct tty_struct *tty; |
| 470 | struct list_head *queue = &port->read_queue; | ||
| 471 | bool disconnect = false; | ||
| 472 | bool do_push = false; | ||
| 507 | 473 | ||
| 508 | spin_lock(&port->port_lock); | 474 | /* hand any queued data to the tty */ |
| 509 | list_add(&req->list, &port->read_pool); | 475 | spin_lock_irq(&port->port_lock); |
| 476 | tty = port->port_tty; | ||
| 477 | while (!list_empty(queue)) { | ||
| 478 | struct usb_request *req; | ||
| 510 | 479 | ||
| 511 | switch (req->status) { | 480 | req = list_first_entry(queue, struct usb_request, list); |
| 512 | case 0: | ||
| 513 | /* normal completion */ | ||
| 514 | status = gs_recv_packet(port, req->buf, req->actual); | ||
| 515 | if (status && status != -EIO) | ||
| 516 | pr_debug("%s: %s %s err %d\n", | ||
| 517 | __func__, "recv", ep->name, status); | ||
| 518 | gs_start_rx(port); | ||
| 519 | break; | ||
| 520 | 481 | ||
| 521 | case -ESHUTDOWN: | 482 | /* discard data if tty was closed */ |
| 522 | /* disconnect */ | 483 | if (!tty) |
| 523 | pr_vdebug("%s: %s shutdown\n", __func__, ep->name); | 484 | goto recycle; |
| 524 | break; | ||
| 525 | 485 | ||
| 526 | default: | 486 | /* leave data queued if tty was rx throttled */ |
| 527 | /* presumably a transient fault */ | 487 | if (test_bit(TTY_THROTTLED, &tty->flags)) |
| 528 | pr_warning("%s: unexpected %s status %d\n", | 488 | break; |
| 529 | __func__, ep->name, req->status); | 489 | |
| 530 | gs_start_rx(port); | 490 | switch (req->status) { |
| 531 | break; | 491 | case -ESHUTDOWN: |
| 492 | disconnect = true; | ||
| 493 | pr_vdebug(PREFIX "%d: shutdown\n", port->port_num); | ||
| 494 | break; | ||
| 495 | |||
| 496 | default: | ||
| 497 | /* presumably a transient fault */ | ||
| 498 | pr_warning(PREFIX "%d: unexpected RX status %d\n", | ||
| 499 | port->port_num, req->status); | ||
| 500 | /* FALLTHROUGH */ | ||
| 501 | case 0: | ||
| 502 | /* normal completion */ | ||
| 503 | break; | ||
| 504 | } | ||
| 505 | |||
| 506 | /* push data to (open) tty */ | ||
| 507 | if (req->actual) { | ||
| 508 | char *packet = req->buf; | ||
| 509 | unsigned size = req->actual; | ||
| 510 | unsigned n; | ||
| 511 | int count; | ||
| 512 | |||
| 513 | /* we may have pushed part of this packet already... */ | ||
| 514 | n = port->n_read; | ||
| 515 | if (n) { | ||
| 516 | packet += n; | ||
| 517 | size -= n; | ||
| 518 | } | ||
| 519 | |||
| 520 | count = tty_insert_flip_string(tty, packet, size); | ||
| 521 | if (count) | ||
| 522 | do_push = true; | ||
| 523 | if (count != size) { | ||
| 524 | /* stop pushing; TTY layer can't handle more */ | ||
| 525 | port->n_read += count; | ||
| 526 | pr_vdebug(PREFIX "%d: rx block %d/%d\n", | ||
| 527 | port->port_num, | ||
| 528 | count, req->actual); | ||
| 529 | break; | ||
| 530 | } | ||
| 531 | port->n_read = 0; | ||
| 532 | } | ||
| 533 | recycle: | ||
| 534 | list_move(&req->list, &port->read_pool); | ||
| 532 | } | 535 | } |
| 536 | |||
| 537 | /* Push from tty to ldisc; this is immediate with low_latency, and | ||
| 538 | * may trigger callbacks to this driver ... so drop the spinlock. | ||
| 539 | */ | ||
| 540 | if (tty && do_push) { | ||
| 541 | spin_unlock_irq(&port->port_lock); | ||
| 542 | tty_flip_buffer_push(tty); | ||
| 543 | wake_up_interruptible(&tty->read_wait); | ||
| 544 | spin_lock_irq(&port->port_lock); | ||
| 545 | |||
| 546 | /* tty may have been closed */ | ||
| 547 | tty = port->port_tty; | ||
| 548 | } | ||
| 549 | |||
| 550 | |||
| 551 | /* We want our data queue to become empty ASAP, keeping data | ||
| 552 | * in the tty and ldisc (not here). If we couldn't push any | ||
| 553 | * this time around, there may be trouble unless there's an | ||
| 554 | * implicit tty_unthrottle() call on its way... | ||
| 555 | * | ||
| 556 | * REVISIT we should probably add a timer to keep the tasklet | ||
| 557 | * from starving ... but it's not clear that case ever happens. | ||
| 558 | */ | ||
| 559 | if (!list_empty(queue) && tty) { | ||
| 560 | if (!test_bit(TTY_THROTTLED, &tty->flags)) { | ||
| 561 | if (do_push) | ||
| 562 | tasklet_schedule(&port->push); | ||
| 563 | else | ||
| 564 | pr_warning(PREFIX "%d: RX not scheduled?\n", | ||
| 565 | port->port_num); | ||
| 566 | } | ||
| 567 | } | ||
| 568 | |||
| 569 | /* If we're still connected, refill the USB RX queue. */ | ||
| 570 | if (!disconnect && port->port_usb) | ||
| 571 | gs_start_rx(port); | ||
| 572 | |||
| 573 | spin_unlock_irq(&port->port_lock); | ||
| 574 | } | ||
| 575 | |||
| 576 | static void gs_read_complete(struct usb_ep *ep, struct usb_request *req) | ||
| 577 | { | ||
| 578 | struct gs_port *port = ep->driver_data; | ||
| 579 | |||
| 580 | /* Queue all received data until the tty layer is ready for it. */ | ||
| 581 | spin_lock(&port->port_lock); | ||
| 582 | list_add_tail(&req->list, &port->read_queue); | ||
| 583 | tasklet_schedule(&port->push); | ||
| 533 | spin_unlock(&port->port_lock); | 584 | spin_unlock(&port->port_lock); |
| 534 | } | 585 | } |
| 535 | 586 | ||
| @@ -625,6 +676,7 @@ static int gs_start_io(struct gs_port *port) | |||
| 625 | } | 676 | } |
| 626 | 677 | ||
| 627 | /* queue read requests */ | 678 | /* queue read requests */ |
| 679 | port->n_read = 0; | ||
| 628 | started = gs_start_rx(port); | 680 | started = gs_start_rx(port); |
| 629 | 681 | ||
| 630 | /* unblock any pending writes into our circular buffer */ | 682 | /* unblock any pending writes into our circular buffer */ |
| @@ -633,9 +685,10 @@ static int gs_start_io(struct gs_port *port) | |||
| 633 | } else { | 685 | } else { |
| 634 | gs_free_requests(ep, head); | 686 | gs_free_requests(ep, head); |
| 635 | gs_free_requests(port->port_usb->in, &port->write_pool); | 687 | gs_free_requests(port->port_usb->in, &port->write_pool); |
| 688 | status = -EIO; | ||
| 636 | } | 689 | } |
| 637 | 690 | ||
| 638 | return started ? 0 : status; | 691 | return status; |
| 639 | } | 692 | } |
| 640 | 693 | ||
| 641 | /*-------------------------------------------------------------------------*/ | 694 | /*-------------------------------------------------------------------------*/ |
| @@ -736,10 +789,13 @@ static int gs_open(struct tty_struct *tty, struct file *file) | |||
| 736 | 789 | ||
| 737 | /* if connected, start the I/O stream */ | 790 | /* if connected, start the I/O stream */ |
| 738 | if (port->port_usb) { | 791 | if (port->port_usb) { |
| 792 | struct gserial *gser = port->port_usb; | ||
| 793 | |||
| 739 | pr_debug("gs_open: start ttyGS%d\n", port->port_num); | 794 | pr_debug("gs_open: start ttyGS%d\n", port->port_num); |
| 740 | gs_start_io(port); | 795 | gs_start_io(port); |
| 741 | 796 | ||
| 742 | /* REVISIT for ACM, issue "network connected" event */ | 797 | if (gser->connect) |
| 798 | gser->connect(gser); | ||
| 743 | } | 799 | } |
| 744 | 800 | ||
| 745 | pr_debug("gs_open: ttyGS%d (%p,%p)\n", port->port_num, tty, file); | 801 | pr_debug("gs_open: ttyGS%d (%p,%p)\n", port->port_num, tty, file); |
| @@ -766,6 +822,7 @@ static int gs_writes_finished(struct gs_port *p) | |||
| 766 | static void gs_close(struct tty_struct *tty, struct file *file) | 822 | static void gs_close(struct tty_struct *tty, struct file *file) |
| 767 | { | 823 | { |
| 768 | struct gs_port *port = tty->driver_data; | 824 | struct gs_port *port = tty->driver_data; |
| 825 | struct gserial *gser; | ||
| 769 | 826 | ||
| 770 | spin_lock_irq(&port->port_lock); | 827 | spin_lock_irq(&port->port_lock); |
| 771 | 828 | ||
| @@ -785,32 +842,31 @@ static void gs_close(struct tty_struct *tty, struct file *file) | |||
| 785 | port->openclose = true; | 842 | port->openclose = true; |
| 786 | port->open_count = 0; | 843 | port->open_count = 0; |
| 787 | 844 | ||
| 788 | if (port->port_usb) | 845 | gser = port->port_usb; |
| 789 | /* REVISIT for ACM, issue "network disconnected" event */; | 846 | if (gser && gser->disconnect) |
| 847 | gser->disconnect(gser); | ||
| 790 | 848 | ||
| 791 | /* wait for circular write buffer to drain, disconnect, or at | 849 | /* wait for circular write buffer to drain, disconnect, or at |
| 792 | * most GS_CLOSE_TIMEOUT seconds; then discard the rest | 850 | * most GS_CLOSE_TIMEOUT seconds; then discard the rest |
| 793 | */ | 851 | */ |
| 794 | if (gs_buf_data_avail(&port->port_write_buf) > 0 | 852 | if (gs_buf_data_avail(&port->port_write_buf) > 0 && gser) { |
| 795 | && port->port_usb) { | ||
| 796 | spin_unlock_irq(&port->port_lock); | 853 | spin_unlock_irq(&port->port_lock); |
| 797 | wait_event_interruptible_timeout(port->drain_wait, | 854 | wait_event_interruptible_timeout(port->drain_wait, |
| 798 | gs_writes_finished(port), | 855 | gs_writes_finished(port), |
| 799 | GS_CLOSE_TIMEOUT * HZ); | 856 | GS_CLOSE_TIMEOUT * HZ); |
| 800 | spin_lock_irq(&port->port_lock); | 857 | spin_lock_irq(&port->port_lock); |
| 858 | gser = port->port_usb; | ||
| 801 | } | 859 | } |
| 802 | 860 | ||
| 803 | /* Iff we're disconnected, there can be no I/O in flight so it's | 861 | /* Iff we're disconnected, there can be no I/O in flight so it's |
| 804 | * ok to free the circular buffer; else just scrub it. And don't | 862 | * ok to free the circular buffer; else just scrub it. And don't |
| 805 | * let the push tasklet fire again until we're re-opened. | 863 | * let the push tasklet fire again until we're re-opened. |
| 806 | */ | 864 | */ |
| 807 | if (port->port_usb == NULL) | 865 | if (gser == NULL) |
| 808 | gs_buf_free(&port->port_write_buf); | 866 | gs_buf_free(&port->port_write_buf); |
| 809 | else | 867 | else |
| 810 | gs_buf_clear(&port->port_write_buf); | 868 | gs_buf_clear(&port->port_write_buf); |
| 811 | 869 | ||
| 812 | tasklet_kill(&port->push); | ||
| 813 | |||
| 814 | tty->driver_data = NULL; | 870 | tty->driver_data = NULL; |
| 815 | port->port_tty = NULL; | 871 | port->port_tty = NULL; |
| 816 | 872 | ||
| @@ -911,15 +967,35 @@ static void gs_unthrottle(struct tty_struct *tty) | |||
| 911 | { | 967 | { |
| 912 | struct gs_port *port = tty->driver_data; | 968 | struct gs_port *port = tty->driver_data; |
| 913 | unsigned long flags; | 969 | unsigned long flags; |
| 914 | unsigned started = 0; | ||
| 915 | 970 | ||
| 916 | spin_lock_irqsave(&port->port_lock, flags); | 971 | spin_lock_irqsave(&port->port_lock, flags); |
| 917 | if (port->port_usb) | 972 | if (port->port_usb) { |
| 918 | started = gs_start_rx(port); | 973 | /* Kickstart read queue processing. We don't do xon/xoff, |
| 974 | * rts/cts, or other handshaking with the host, but if the | ||
| 975 | * read queue backs up enough we'll be NAKing OUT packets. | ||
| 976 | */ | ||
| 977 | tasklet_schedule(&port->push); | ||
| 978 | pr_vdebug(PREFIX "%d: unthrottle\n", port->port_num); | ||
| 979 | } | ||
| 919 | spin_unlock_irqrestore(&port->port_lock, flags); | 980 | spin_unlock_irqrestore(&port->port_lock, flags); |
| 981 | } | ||
| 982 | |||
| 983 | static int gs_break_ctl(struct tty_struct *tty, int duration) | ||
| 984 | { | ||
| 985 | struct gs_port *port = tty->driver_data; | ||
| 986 | int status = 0; | ||
| 987 | struct gserial *gser; | ||
| 988 | |||
| 989 | pr_vdebug("gs_break_ctl: ttyGS%d, send break (%d) \n", | ||
| 990 | port->port_num, duration); | ||
| 920 | 991 | ||
| 921 | pr_vdebug("gs_unthrottle: ttyGS%d, %d packets\n", | 992 | spin_lock_irq(&port->port_lock); |
| 922 | port->port_num, started); | 993 | gser = port->port_usb; |
| 994 | if (gser && gser->send_break) | ||
| 995 | status = gser->send_break(gser, duration); | ||
| 996 | spin_unlock_irq(&port->port_lock); | ||
| 997 | |||
| 998 | return status; | ||
| 923 | } | 999 | } |
| 924 | 1000 | ||
| 925 | static const struct tty_operations gs_tty_ops = { | 1001 | static const struct tty_operations gs_tty_ops = { |
| @@ -931,6 +1007,7 @@ static const struct tty_operations gs_tty_ops = { | |||
| 931 | .write_room = gs_write_room, | 1007 | .write_room = gs_write_room, |
| 932 | .chars_in_buffer = gs_chars_in_buffer, | 1008 | .chars_in_buffer = gs_chars_in_buffer, |
| 933 | .unthrottle = gs_unthrottle, | 1009 | .unthrottle = gs_unthrottle, |
| 1010 | .break_ctl = gs_break_ctl, | ||
| 934 | }; | 1011 | }; |
| 935 | 1012 | ||
| 936 | /*-------------------------------------------------------------------------*/ | 1013 | /*-------------------------------------------------------------------------*/ |
| @@ -953,6 +1030,7 @@ gs_port_alloc(unsigned port_num, struct usb_cdc_line_coding *coding) | |||
| 953 | tasklet_init(&port->push, gs_rx_push, (unsigned long) port); | 1030 | tasklet_init(&port->push, gs_rx_push, (unsigned long) port); |
| 954 | 1031 | ||
| 955 | INIT_LIST_HEAD(&port->read_pool); | 1032 | INIT_LIST_HEAD(&port->read_pool); |
| 1033 | INIT_LIST_HEAD(&port->read_queue); | ||
| 956 | INIT_LIST_HEAD(&port->write_pool); | 1034 | INIT_LIST_HEAD(&port->write_pool); |
| 957 | 1035 | ||
| 958 | port->port_num = port_num; | 1036 | port->port_num = port_num; |
| @@ -997,7 +1075,7 @@ int __init gserial_setup(struct usb_gadget *g, unsigned count) | |||
| 997 | 1075 | ||
| 998 | gs_tty_driver->owner = THIS_MODULE; | 1076 | gs_tty_driver->owner = THIS_MODULE; |
| 999 | gs_tty_driver->driver_name = "g_serial"; | 1077 | gs_tty_driver->driver_name = "g_serial"; |
| 1000 | gs_tty_driver->name = "ttyGS"; | 1078 | gs_tty_driver->name = PREFIX; |
| 1001 | /* uses dynamically assigned dev_t values */ | 1079 | /* uses dynamically assigned dev_t values */ |
| 1002 | 1080 | ||
| 1003 | gs_tty_driver->type = TTY_DRIVER_TYPE_SERIAL; | 1081 | gs_tty_driver->type = TTY_DRIVER_TYPE_SERIAL; |
| @@ -1104,6 +1182,8 @@ void gserial_cleanup(void) | |||
| 1104 | ports[i].port = NULL; | 1182 | ports[i].port = NULL; |
| 1105 | mutex_unlock(&ports[i].lock); | 1183 | mutex_unlock(&ports[i].lock); |
| 1106 | 1184 | ||
| 1185 | tasklet_kill(&port->push); | ||
| 1186 | |||
| 1107 | /* wait for old opens to finish */ | 1187 | /* wait for old opens to finish */ |
| 1108 | wait_event(port->close_wait, gs_closed(port)); | 1188 | wait_event(port->close_wait, gs_closed(port)); |
| 1109 | 1189 | ||
| @@ -1175,14 +1255,17 @@ int gserial_connect(struct gserial *gser, u8 port_num) | |||
| 1175 | 1255 | ||
| 1176 | /* REVISIT if waiting on "carrier detect", signal. */ | 1256 | /* REVISIT if waiting on "carrier detect", signal. */ |
| 1177 | 1257 | ||
| 1178 | /* REVISIT for ACM, issue "network connection" status notification: | 1258 | /* if it's already open, start I/O ... and notify the serial |
| 1179 | * connected if open_count, else disconnected. | 1259 | * protocol about open/close status (connect/disconnect). |
| 1180 | */ | 1260 | */ |
| 1181 | |||
| 1182 | /* if it's already open, start I/O */ | ||
| 1183 | if (port->open_count) { | 1261 | if (port->open_count) { |
| 1184 | pr_debug("gserial_connect: start ttyGS%d\n", port->port_num); | 1262 | pr_debug("gserial_connect: start ttyGS%d\n", port->port_num); |
| 1185 | gs_start_io(port); | 1263 | gs_start_io(port); |
| 1264 | if (gser->connect) | ||
| 1265 | gser->connect(gser); | ||
| 1266 | } else { | ||
| 1267 | if (gser->disconnect) | ||
| 1268 | gser->disconnect(gser); | ||
| 1186 | } | 1269 | } |
| 1187 | 1270 | ||
| 1188 | spin_unlock_irqrestore(&port->port_lock, flags); | 1271 | spin_unlock_irqrestore(&port->port_lock, flags); |
| @@ -1241,6 +1324,7 @@ void gserial_disconnect(struct gserial *gser) | |||
| 1241 | if (port->open_count == 0 && !port->openclose) | 1324 | if (port->open_count == 0 && !port->openclose) |
| 1242 | gs_buf_free(&port->port_write_buf); | 1325 | gs_buf_free(&port->port_write_buf); |
| 1243 | gs_free_requests(gser->out, &port->read_pool); | 1326 | gs_free_requests(gser->out, &port->read_pool); |
| 1327 | gs_free_requests(gser->out, &port->read_queue); | ||
| 1244 | gs_free_requests(gser->in, &port->write_pool); | 1328 | gs_free_requests(gser->in, &port->write_pool); |
| 1245 | spin_unlock_irqrestore(&port->port_lock, flags); | 1329 | spin_unlock_irqrestore(&port->port_lock, flags); |
| 1246 | } | 1330 | } |
diff --git a/drivers/usb/gadget/u_serial.h b/drivers/usb/gadget/u_serial.h index 7b561138f90e..af3910d01aea 100644 --- a/drivers/usb/gadget/u_serial.h +++ b/drivers/usb/gadget/u_serial.h | |||
| @@ -23,8 +23,7 @@ | |||
| 23 | * style I/O using the USB peripheral endpoints listed here, including | 23 | * style I/O using the USB peripheral endpoints listed here, including |
| 24 | * hookups to sysfs and /dev for each logical "tty" device. | 24 | * hookups to sysfs and /dev for each logical "tty" device. |
| 25 | * | 25 | * |
| 26 | * REVISIT need TTY --> USB event flow too, so ACM can report open/close | 26 | * REVISIT at least ACM could support tiocmget() if needed. |
| 27 | * as carrier detect events. Model after ECM. There's more ACM state too. | ||
| 28 | * | 27 | * |
| 29 | * REVISIT someday, allow multiplexing several TTYs over these endpoints. | 28 | * REVISIT someday, allow multiplexing several TTYs over these endpoints. |
| 30 | */ | 29 | */ |
| @@ -41,8 +40,17 @@ struct gserial { | |||
| 41 | 40 | ||
| 42 | /* REVISIT avoid this CDC-ACM support harder ... */ | 41 | /* REVISIT avoid this CDC-ACM support harder ... */ |
| 43 | struct usb_cdc_line_coding port_line_coding; /* 9600-8-N-1 etc */ | 42 | struct usb_cdc_line_coding port_line_coding; /* 9600-8-N-1 etc */ |
| 43 | |||
| 44 | /* notification callbacks */ | ||
| 45 | void (*connect)(struct gserial *p); | ||
| 46 | void (*disconnect)(struct gserial *p); | ||
| 47 | int (*send_break)(struct gserial *p, int duration); | ||
| 44 | }; | 48 | }; |
| 45 | 49 | ||
| 50 | /* utilities to allocate/free request and buffer */ | ||
| 51 | struct usb_request *gs_alloc_req(struct usb_ep *ep, unsigned len, gfp_t flags); | ||
| 52 | void gs_free_req(struct usb_ep *, struct usb_request *req); | ||
| 53 | |||
| 46 | /* port setup/teardown is handled by gadget driver */ | 54 | /* port setup/teardown is handled by gadget driver */ |
| 47 | int gserial_setup(struct usb_gadget *g, unsigned n_ports); | 55 | int gserial_setup(struct usb_gadget *g, unsigned n_ports); |
| 48 | void gserial_cleanup(void); | 56 | void gserial_cleanup(void); |
diff --git a/drivers/usb/host/ehci-orion.c b/drivers/usb/host/ehci-orion.c index 5fbdc14e63b3..5416cf969005 100644 --- a/drivers/usb/host/ehci-orion.c +++ b/drivers/usb/host/ehci-orion.c | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 13 | #include <linux/platform_device.h> | 13 | #include <linux/platform_device.h> |
| 14 | #include <linux/mbus.h> | 14 | #include <linux/mbus.h> |
| 15 | #include <asm/plat-orion/ehci-orion.h> | 15 | #include <plat/ehci-orion.h> |
| 16 | 16 | ||
| 17 | #define rdl(off) __raw_readl(hcd->regs + (off)) | 17 | #define rdl(off) __raw_readl(hcd->regs + (off)) |
| 18 | #define wrl(off, val) __raw_writel((val), hcd->regs + (off)) | 18 | #define wrl(off, val) __raw_writel((val), hcd->regs + (off)) |
diff --git a/drivers/usb/host/isp1760-hcd.c b/drivers/usb/host/isp1760-hcd.c index c858f2adb929..8017f1cf78e2 100644 --- a/drivers/usb/host/isp1760-hcd.c +++ b/drivers/usb/host/isp1760-hcd.c | |||
| @@ -126,9 +126,8 @@ static void isp1760_writel(const unsigned int val, __u32 __iomem *regs) | |||
| 126 | * doesn't quite work because some people have to enforce 32-bit access | 126 | * doesn't quite work because some people have to enforce 32-bit access |
| 127 | */ | 127 | */ |
| 128 | static void priv_read_copy(struct isp1760_hcd *priv, u32 *src, | 128 | static void priv_read_copy(struct isp1760_hcd *priv, u32 *src, |
| 129 | __u32 __iomem *dst, u32 offset, u32 len) | 129 | __u32 __iomem *dst, u32 len) |
| 130 | { | 130 | { |
| 131 | struct usb_hcd *hcd = priv_to_hcd(priv); | ||
| 132 | u32 val; | 131 | u32 val; |
| 133 | u8 *buff8; | 132 | u8 *buff8; |
| 134 | 133 | ||
| @@ -136,11 +135,6 @@ static void priv_read_copy(struct isp1760_hcd *priv, u32 *src, | |||
| 136 | printk(KERN_ERR "ERROR: buffer: %p len: %d\n", src, len); | 135 | printk(KERN_ERR "ERROR: buffer: %p len: %d\n", src, len); |
| 137 | return; | 136 | return; |
| 138 | } | 137 | } |
| 139 | isp1760_writel(offset, hcd->regs + HC_MEMORY_REG); | ||
| 140 | /* XXX | ||
| 141 | * 90nsec delay, the spec says something how this could be avoided. | ||
| 142 | */ | ||
| 143 | mdelay(1); | ||
| 144 | 138 | ||
| 145 | while (len >= 4) { | 139 | while (len >= 4) { |
| 146 | *src = __raw_readl(dst); | 140 | *src = __raw_readl(dst); |
| @@ -987,8 +981,20 @@ static void do_atl_int(struct usb_hcd *usb_hcd) | |||
| 987 | printk(KERN_ERR "qh is 0\n"); | 981 | printk(KERN_ERR "qh is 0\n"); |
| 988 | continue; | 982 | continue; |
| 989 | } | 983 | } |
| 990 | priv_read_copy(priv, (u32 *)&ptd, usb_hcd->regs + atl_regs, | 984 | isp1760_writel(atl_regs + ISP_BANK(0), usb_hcd->regs + |
| 991 | atl_regs, sizeof(ptd)); | 985 | HC_MEMORY_REG); |
| 986 | isp1760_writel(payload + ISP_BANK(1), usb_hcd->regs + | ||
| 987 | HC_MEMORY_REG); | ||
| 988 | /* | ||
| 989 | * write bank1 address twice to ensure the 90ns delay (time | ||
| 990 | * between BANK0 write and the priv_read_copy() call is at | ||
| 991 | * least 3*t_WHWL + 2*t_w11 = 3*25ns + 2*17ns = 109ns) | ||
| 992 | */ | ||
| 993 | isp1760_writel(payload + ISP_BANK(1), usb_hcd->regs + | ||
| 994 | HC_MEMORY_REG); | ||
| 995 | |||
| 996 | priv_read_copy(priv, (u32 *)&ptd, usb_hcd->regs + atl_regs + | ||
| 997 | ISP_BANK(0), sizeof(ptd)); | ||
| 992 | 998 | ||
| 993 | dw1 = le32_to_cpu(ptd.dw1); | 999 | dw1 = le32_to_cpu(ptd.dw1); |
| 994 | dw2 = le32_to_cpu(ptd.dw2); | 1000 | dw2 = le32_to_cpu(ptd.dw2); |
| @@ -1091,7 +1097,7 @@ static void do_atl_int(struct usb_hcd *usb_hcd) | |||
| 1091 | case IN_PID: | 1097 | case IN_PID: |
| 1092 | priv_read_copy(priv, | 1098 | priv_read_copy(priv, |
| 1093 | priv->atl_ints[queue_entry].data_buffer, | 1099 | priv->atl_ints[queue_entry].data_buffer, |
| 1094 | usb_hcd->regs + payload, payload, | 1100 | usb_hcd->regs + payload + ISP_BANK(1), |
| 1095 | length); | 1101 | length); |
| 1096 | 1102 | ||
| 1097 | case OUT_PID: | 1103 | case OUT_PID: |
| @@ -1122,11 +1128,11 @@ static void do_atl_int(struct usb_hcd *usb_hcd) | |||
| 1122 | } else if (usb_pipebulk(urb->pipe) && (length < qtd->length)) { | 1128 | } else if (usb_pipebulk(urb->pipe) && (length < qtd->length)) { |
| 1123 | /* short BULK received */ | 1129 | /* short BULK received */ |
| 1124 | 1130 | ||
| 1125 | printk(KERN_ERR "short bulk, %d instead %zu\n", length, | ||
| 1126 | qtd->length); | ||
| 1127 | if (urb->transfer_flags & URB_SHORT_NOT_OK) { | 1131 | if (urb->transfer_flags & URB_SHORT_NOT_OK) { |
| 1128 | urb->status = -EREMOTEIO; | 1132 | urb->status = -EREMOTEIO; |
| 1129 | printk(KERN_ERR "not okey\n"); | 1133 | isp1760_dbg(priv, "short bulk, %d instead %zu " |
| 1134 | "with URB_SHORT_NOT_OK flag.\n", | ||
| 1135 | length, qtd->length); | ||
| 1130 | } | 1136 | } |
| 1131 | 1137 | ||
| 1132 | if (urb->status == -EINPROGRESS) | 1138 | if (urb->status == -EINPROGRESS) |
| @@ -1206,8 +1212,20 @@ static void do_intl_int(struct usb_hcd *usb_hcd) | |||
| 1206 | continue; | 1212 | continue; |
| 1207 | } | 1213 | } |
| 1208 | 1214 | ||
| 1209 | priv_read_copy(priv, (u32 *)&ptd, usb_hcd->regs + int_regs, | 1215 | isp1760_writel(int_regs + ISP_BANK(0), usb_hcd->regs + |
| 1210 | int_regs, sizeof(ptd)); | 1216 | HC_MEMORY_REG); |
| 1217 | isp1760_writel(payload + ISP_BANK(1), usb_hcd->regs + | ||
| 1218 | HC_MEMORY_REG); | ||
| 1219 | /* | ||
| 1220 | * write bank1 address twice to ensure the 90ns delay (time | ||
| 1221 | * between BANK0 write and the priv_read_copy() call is at | ||
| 1222 | * least 3*t_WHWL + 2*t_w11 = 3*25ns + 2*17ns = 92ns) | ||
| 1223 | */ | ||
| 1224 | isp1760_writel(payload + ISP_BANK(1), usb_hcd->regs + | ||
| 1225 | HC_MEMORY_REG); | ||
| 1226 | |||
| 1227 | priv_read_copy(priv, (u32 *)&ptd, usb_hcd->regs + int_regs + | ||
| 1228 | ISP_BANK(0), sizeof(ptd)); | ||
| 1211 | dw1 = le32_to_cpu(ptd.dw1); | 1229 | dw1 = le32_to_cpu(ptd.dw1); |
| 1212 | dw3 = le32_to_cpu(ptd.dw3); | 1230 | dw3 = le32_to_cpu(ptd.dw3); |
| 1213 | check_int_err_status(le32_to_cpu(ptd.dw4)); | 1231 | check_int_err_status(le32_to_cpu(ptd.dw4)); |
| @@ -1242,7 +1260,7 @@ static void do_intl_int(struct usb_hcd *usb_hcd) | |||
| 1242 | case IN_PID: | 1260 | case IN_PID: |
| 1243 | priv_read_copy(priv, | 1261 | priv_read_copy(priv, |
| 1244 | priv->int_ints[queue_entry].data_buffer, | 1262 | priv->int_ints[queue_entry].data_buffer, |
| 1245 | usb_hcd->regs + payload , payload, | 1263 | usb_hcd->regs + payload + ISP_BANK(1), |
| 1246 | length); | 1264 | length); |
| 1247 | case OUT_PID: | 1265 | case OUT_PID: |
| 1248 | 1266 | ||
| @@ -1615,8 +1633,7 @@ static int isp1760_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, | |||
| 1615 | return -EPIPE; | 1633 | return -EPIPE; |
| 1616 | } | 1634 | } |
| 1617 | 1635 | ||
| 1618 | isp1760_prepare_enqueue(priv, urb, &qtd_list, mem_flags, pe); | 1636 | return isp1760_prepare_enqueue(priv, urb, &qtd_list, mem_flags, pe); |
| 1619 | return 0; | ||
| 1620 | } | 1637 | } |
| 1621 | 1638 | ||
| 1622 | static int isp1760_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, | 1639 | static int isp1760_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, |
diff --git a/drivers/usb/host/isp1760-hcd.h b/drivers/usb/host/isp1760-hcd.h index 6473dd86993c..4377277667d9 100644 --- a/drivers/usb/host/isp1760-hcd.h +++ b/drivers/usb/host/isp1760-hcd.h | |||
| @@ -54,6 +54,8 @@ void deinit_kmem_cache(void); | |||
| 54 | #define BUFFER_MAP 0x7 | 54 | #define BUFFER_MAP 0x7 |
| 55 | 55 | ||
| 56 | #define HC_MEMORY_REG 0x33c | 56 | #define HC_MEMORY_REG 0x33c |
| 57 | #define ISP_BANK(x) ((x) << 16) | ||
| 58 | |||
| 57 | #define HC_PORT1_CTRL 0x374 | 59 | #define HC_PORT1_CTRL 0x374 |
| 58 | #define PORT1_POWER (3 << 3) | 60 | #define PORT1_POWER (3 << 3) |
| 59 | #define PORT1_INIT1 (1 << 7) | 61 | #define PORT1_INIT1 (1 << 7) |
| @@ -119,6 +121,9 @@ struct inter_packet_info { | |||
| 119 | typedef void (packet_enqueue)(struct usb_hcd *hcd, struct isp1760_qh *qh, | 121 | typedef void (packet_enqueue)(struct usb_hcd *hcd, struct isp1760_qh *qh, |
| 120 | struct isp1760_qtd *qtd); | 122 | struct isp1760_qtd *qtd); |
| 121 | 123 | ||
| 124 | #define isp1760_dbg(priv, fmt, args...) \ | ||
| 125 | dev_dbg(priv_to_hcd(priv)->self.controller, fmt, ##args) | ||
| 126 | |||
| 122 | #define isp1760_info(priv, fmt, args...) \ | 127 | #define isp1760_info(priv, fmt, args...) \ |
| 123 | dev_info(priv_to_hcd(priv)->self.controller, fmt, ##args) | 128 | dev_info(priv_to_hcd(priv)->self.controller, fmt, ##args) |
| 124 | 129 | ||
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c index 6db7a2889e66..4ed228a89943 100644 --- a/drivers/usb/host/ohci-at91.c +++ b/drivers/usb/host/ohci-at91.c | |||
| @@ -260,7 +260,6 @@ static const struct hc_driver ohci_at91_hc_driver = { | |||
| 260 | */ | 260 | */ |
| 261 | .hub_status_data = ohci_hub_status_data, | 261 | .hub_status_data = ohci_hub_status_data, |
| 262 | .hub_control = ohci_hub_control, | 262 | .hub_control = ohci_hub_control, |
| 263 | .hub_irq_enable = ohci_rhsc_enable, | ||
| 264 | #ifdef CONFIG_PM | 263 | #ifdef CONFIG_PM |
| 265 | .bus_suspend = ohci_bus_suspend, | 264 | .bus_suspend = ohci_bus_suspend, |
| 266 | .bus_resume = ohci_bus_resume, | 265 | .bus_resume = ohci_bus_resume, |
diff --git a/drivers/usb/host/ohci-au1xxx.c b/drivers/usb/host/ohci-au1xxx.c index c0948008fe3d..2ac4e022a13f 100644 --- a/drivers/usb/host/ohci-au1xxx.c +++ b/drivers/usb/host/ohci-au1xxx.c | |||
| @@ -163,7 +163,6 @@ static const struct hc_driver ohci_au1xxx_hc_driver = { | |||
| 163 | */ | 163 | */ |
| 164 | .hub_status_data = ohci_hub_status_data, | 164 | .hub_status_data = ohci_hub_status_data, |
| 165 | .hub_control = ohci_hub_control, | 165 | .hub_control = ohci_hub_control, |
| 166 | .hub_irq_enable = ohci_rhsc_enable, | ||
| 167 | #ifdef CONFIG_PM | 166 | #ifdef CONFIG_PM |
| 168 | .bus_suspend = ohci_bus_suspend, | 167 | .bus_suspend = ohci_bus_suspend, |
| 169 | .bus_resume = ohci_bus_resume, | 168 | .bus_resume = ohci_bus_resume, |
diff --git a/drivers/usb/host/ohci-ep93xx.c b/drivers/usb/host/ohci-ep93xx.c index cb0b506f8259..fb3055f084b5 100644 --- a/drivers/usb/host/ohci-ep93xx.c +++ b/drivers/usb/host/ohci-ep93xx.c | |||
| @@ -134,7 +134,6 @@ static struct hc_driver ohci_ep93xx_hc_driver = { | |||
| 134 | .get_frame_number = ohci_get_frame, | 134 | .get_frame_number = ohci_get_frame, |
| 135 | .hub_status_data = ohci_hub_status_data, | 135 | .hub_status_data = ohci_hub_status_data, |
| 136 | .hub_control = ohci_hub_control, | 136 | .hub_control = ohci_hub_control, |
| 137 | .hub_irq_enable = ohci_rhsc_enable, | ||
| 138 | #ifdef CONFIG_PM | 137 | #ifdef CONFIG_PM |
| 139 | .bus_suspend = ohci_bus_suspend, | 138 | .bus_suspend = ohci_bus_suspend, |
| 140 | .bus_resume = ohci_bus_resume, | 139 | .bus_resume = ohci_bus_resume, |
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c index 26bc47941d01..89901962cbfd 100644 --- a/drivers/usb/host/ohci-hcd.c +++ b/drivers/usb/host/ohci-hcd.c | |||
| @@ -86,6 +86,21 @@ static void ohci_stop (struct usb_hcd *hcd); | |||
| 86 | static int ohci_restart (struct ohci_hcd *ohci); | 86 | static int ohci_restart (struct ohci_hcd *ohci); |
| 87 | #endif | 87 | #endif |
| 88 | 88 | ||
| 89 | #ifdef CONFIG_PCI | ||
| 90 | static void quirk_amd_pll(int state); | ||
| 91 | static void amd_iso_dev_put(void); | ||
| 92 | #else | ||
| 93 | static inline void quirk_amd_pll(int state) | ||
| 94 | { | ||
| 95 | return; | ||
| 96 | } | ||
| 97 | static inline void amd_iso_dev_put(void) | ||
| 98 | { | ||
| 99 | return; | ||
| 100 | } | ||
| 101 | #endif | ||
| 102 | |||
| 103 | |||
| 89 | #include "ohci-hub.c" | 104 | #include "ohci-hub.c" |
| 90 | #include "ohci-dbg.c" | 105 | #include "ohci-dbg.c" |
| 91 | #include "ohci-mem.c" | 106 | #include "ohci-mem.c" |
| @@ -483,6 +498,9 @@ static int ohci_init (struct ohci_hcd *ohci) | |||
| 483 | int ret; | 498 | int ret; |
| 484 | struct usb_hcd *hcd = ohci_to_hcd(ohci); | 499 | struct usb_hcd *hcd = ohci_to_hcd(ohci); |
| 485 | 500 | ||
| 501 | if (distrust_firmware) | ||
| 502 | ohci->flags |= OHCI_QUIRK_HUB_POWER; | ||
| 503 | |||
| 486 | disable (ohci); | 504 | disable (ohci); |
| 487 | ohci->regs = hcd->regs; | 505 | ohci->regs = hcd->regs; |
| 488 | 506 | ||
| @@ -689,7 +707,8 @@ retry: | |||
| 689 | temp |= RH_A_NOCP; | 707 | temp |= RH_A_NOCP; |
| 690 | temp &= ~(RH_A_POTPGT | RH_A_NPS); | 708 | temp &= ~(RH_A_POTPGT | RH_A_NPS); |
| 691 | ohci_writel (ohci, temp, &ohci->regs->roothub.a); | 709 | ohci_writel (ohci, temp, &ohci->regs->roothub.a); |
| 692 | } else if ((ohci->flags & OHCI_QUIRK_AMD756) || distrust_firmware) { | 710 | } else if ((ohci->flags & OHCI_QUIRK_AMD756) || |
| 711 | (ohci->flags & OHCI_QUIRK_HUB_POWER)) { | ||
| 693 | /* hub power always on; required for AMD-756 and some | 712 | /* hub power always on; required for AMD-756 and some |
| 694 | * Mac platforms. ganged overcurrent reporting, if any. | 713 | * Mac platforms. ganged overcurrent reporting, if any. |
| 695 | */ | 714 | */ |
| @@ -882,6 +901,8 @@ static void ohci_stop (struct usb_hcd *hcd) | |||
| 882 | 901 | ||
| 883 | if (quirk_zfmicro(ohci)) | 902 | if (quirk_zfmicro(ohci)) |
| 884 | del_timer(&ohci->unlink_watchdog); | 903 | del_timer(&ohci->unlink_watchdog); |
| 904 | if (quirk_amdiso(ohci)) | ||
| 905 | amd_iso_dev_put(); | ||
| 885 | 906 | ||
| 886 | remove_debug_files (ohci); | 907 | remove_debug_files (ohci); |
| 887 | ohci_mem_cleanup (ohci); | 908 | ohci_mem_cleanup (ohci); |
diff --git a/drivers/usb/host/ohci-hub.c b/drivers/usb/host/ohci-hub.c index b56739221d11..7ea9a7b31155 100644 --- a/drivers/usb/host/ohci-hub.c +++ b/drivers/usb/host/ohci-hub.c | |||
| @@ -36,18 +36,6 @@ | |||
| 36 | 36 | ||
| 37 | /*-------------------------------------------------------------------------*/ | 37 | /*-------------------------------------------------------------------------*/ |
| 38 | 38 | ||
| 39 | /* hcd->hub_irq_enable() */ | ||
| 40 | static void ohci_rhsc_enable (struct usb_hcd *hcd) | ||
| 41 | { | ||
| 42 | struct ohci_hcd *ohci = hcd_to_ohci (hcd); | ||
| 43 | |||
| 44 | spin_lock_irq(&ohci->lock); | ||
| 45 | if (!ohci->autostop) | ||
| 46 | del_timer(&hcd->rh_timer); /* Prevent next poll */ | ||
| 47 | ohci_writel(ohci, OHCI_INTR_RHSC, &ohci->regs->intrenable); | ||
| 48 | spin_unlock_irq(&ohci->lock); | ||
| 49 | } | ||
| 50 | |||
| 51 | #define OHCI_SCHED_ENABLES \ | 39 | #define OHCI_SCHED_ENABLES \ |
| 52 | (OHCI_CTRL_CLE|OHCI_CTRL_BLE|OHCI_CTRL_PLE|OHCI_CTRL_IE) | 40 | (OHCI_CTRL_CLE|OHCI_CTRL_BLE|OHCI_CTRL_PLE|OHCI_CTRL_IE) |
| 53 | 41 | ||
| @@ -374,18 +362,28 @@ static int ohci_root_hub_state_changes(struct ohci_hcd *ohci, int changed, | |||
| 374 | int any_connected) | 362 | int any_connected) |
| 375 | { | 363 | { |
| 376 | int poll_rh = 1; | 364 | int poll_rh = 1; |
| 365 | int rhsc; | ||
| 377 | 366 | ||
| 367 | rhsc = ohci_readl(ohci, &ohci->regs->intrenable) & OHCI_INTR_RHSC; | ||
| 378 | switch (ohci->hc_control & OHCI_CTRL_HCFS) { | 368 | switch (ohci->hc_control & OHCI_CTRL_HCFS) { |
| 379 | 369 | ||
| 380 | case OHCI_USB_OPER: | 370 | case OHCI_USB_OPER: |
| 381 | /* keep on polling until we know a device is connected | 371 | /* If no status changes are pending, enable status-change |
| 382 | * and RHSC is enabled */ | 372 | * interrupts. |
| 373 | */ | ||
| 374 | if (!rhsc && !changed) { | ||
| 375 | rhsc = OHCI_INTR_RHSC; | ||
| 376 | ohci_writel(ohci, rhsc, &ohci->regs->intrenable); | ||
| 377 | } | ||
| 378 | |||
| 379 | /* Keep on polling until we know a device is connected | ||
| 380 | * and RHSC is enabled, or until we autostop. | ||
| 381 | */ | ||
| 383 | if (!ohci->autostop) { | 382 | if (!ohci->autostop) { |
| 384 | if (any_connected || | 383 | if (any_connected || |
| 385 | !device_may_wakeup(&ohci_to_hcd(ohci) | 384 | !device_may_wakeup(&ohci_to_hcd(ohci) |
| 386 | ->self.root_hub->dev)) { | 385 | ->self.root_hub->dev)) { |
| 387 | if (ohci_readl(ohci, &ohci->regs->intrenable) & | 386 | if (rhsc) |
| 388 | OHCI_INTR_RHSC) | ||
| 389 | poll_rh = 0; | 387 | poll_rh = 0; |
| 390 | } else { | 388 | } else { |
| 391 | ohci->autostop = 1; | 389 | ohci->autostop = 1; |
| @@ -398,12 +396,13 @@ static int ohci_root_hub_state_changes(struct ohci_hcd *ohci, int changed, | |||
| 398 | ohci->autostop = 0; | 396 | ohci->autostop = 0; |
| 399 | ohci->next_statechange = jiffies + | 397 | ohci->next_statechange = jiffies + |
| 400 | STATECHANGE_DELAY; | 398 | STATECHANGE_DELAY; |
| 401 | } else if (time_after_eq(jiffies, | 399 | } else if (rhsc && time_after_eq(jiffies, |
| 402 | ohci->next_statechange) | 400 | ohci->next_statechange) |
| 403 | && !ohci->ed_rm_list | 401 | && !ohci->ed_rm_list |
| 404 | && !(ohci->hc_control & | 402 | && !(ohci->hc_control & |
| 405 | OHCI_SCHED_ENABLES)) { | 403 | OHCI_SCHED_ENABLES)) { |
| 406 | ohci_rh_suspend(ohci, 1); | 404 | ohci_rh_suspend(ohci, 1); |
| 405 | poll_rh = 0; | ||
| 407 | } | 406 | } |
| 408 | } | 407 | } |
| 409 | break; | 408 | break; |
| @@ -417,6 +416,12 @@ static int ohci_root_hub_state_changes(struct ohci_hcd *ohci, int changed, | |||
| 417 | else | 416 | else |
| 418 | usb_hcd_resume_root_hub(ohci_to_hcd(ohci)); | 417 | usb_hcd_resume_root_hub(ohci_to_hcd(ohci)); |
| 419 | } else { | 418 | } else { |
| 419 | if (!rhsc && (ohci->autostop || | ||
| 420 | ohci_to_hcd(ohci)->self.root_hub-> | ||
| 421 | do_remote_wakeup)) | ||
| 422 | ohci_writel(ohci, OHCI_INTR_RHSC, | ||
| 423 | &ohci->regs->intrenable); | ||
| 424 | |||
| 420 | /* everything is idle, no need for polling */ | 425 | /* everything is idle, no need for polling */ |
| 421 | poll_rh = 0; | 426 | poll_rh = 0; |
| 422 | } | 427 | } |
| @@ -438,12 +443,16 @@ static inline int ohci_rh_resume(struct ohci_hcd *ohci) | |||
| 438 | static int ohci_root_hub_state_changes(struct ohci_hcd *ohci, int changed, | 443 | static int ohci_root_hub_state_changes(struct ohci_hcd *ohci, int changed, |
| 439 | int any_connected) | 444 | int any_connected) |
| 440 | { | 445 | { |
| 441 | int poll_rh = 1; | 446 | /* If RHSC is enabled, don't poll */ |
| 442 | |||
| 443 | /* keep on polling until RHSC is enabled */ | ||
| 444 | if (ohci_readl(ohci, &ohci->regs->intrenable) & OHCI_INTR_RHSC) | 447 | if (ohci_readl(ohci, &ohci->regs->intrenable) & OHCI_INTR_RHSC) |
| 445 | poll_rh = 0; | 448 | return 0; |
| 446 | return poll_rh; | 449 | |
| 450 | /* If no status changes are pending, enable status-change interrupts */ | ||
| 451 | if (!changed) { | ||
| 452 | ohci_writel(ohci, OHCI_INTR_RHSC, &ohci->regs->intrenable); | ||
| 453 | return 0; | ||
| 454 | } | ||
| 455 | return 1; | ||
| 447 | } | 456 | } |
| 448 | 457 | ||
| 449 | #endif /* CONFIG_PM */ | 458 | #endif /* CONFIG_PM */ |
| @@ -483,6 +492,13 @@ ohci_hub_status_data (struct usb_hcd *hcd, char *buf) | |||
| 483 | length++; | 492 | length++; |
| 484 | } | 493 | } |
| 485 | 494 | ||
| 495 | /* Some broken controllers never turn off RHCS in the interrupt | ||
| 496 | * status register. For their sake we won't re-enable RHSC | ||
| 497 | * interrupts if the flag is already set. | ||
| 498 | */ | ||
| 499 | if (ohci_readl(ohci, &ohci->regs->intrstatus) & OHCI_INTR_RHSC) | ||
| 500 | changed = 1; | ||
| 501 | |||
| 486 | /* look at each port */ | 502 | /* look at each port */ |
| 487 | for (i = 0; i < ohci->num_ports; i++) { | 503 | for (i = 0; i < ohci->num_ports; i++) { |
| 488 | u32 status = roothub_portstatus (ohci, i); | 504 | u32 status = roothub_portstatus (ohci, i); |
| @@ -572,8 +588,6 @@ static int ohci_start_port_reset (struct usb_hcd *hcd, unsigned port) | |||
| 572 | return 0; | 588 | return 0; |
| 573 | } | 589 | } |
| 574 | 590 | ||
| 575 | static void start_hnp(struct ohci_hcd *ohci); | ||
| 576 | |||
| 577 | #else | 591 | #else |
| 578 | 592 | ||
| 579 | #define ohci_start_port_reset NULL | 593 | #define ohci_start_port_reset NULL |
| @@ -760,7 +774,7 @@ static int ohci_hub_control ( | |||
| 760 | #ifdef CONFIG_USB_OTG | 774 | #ifdef CONFIG_USB_OTG |
| 761 | if (hcd->self.otg_port == (wIndex + 1) | 775 | if (hcd->self.otg_port == (wIndex + 1) |
| 762 | && hcd->self.b_hnp_enable) | 776 | && hcd->self.b_hnp_enable) |
| 763 | start_hnp(ohci); | 777 | ohci->start_hnp(ohci); |
| 764 | else | 778 | else |
| 765 | #endif | 779 | #endif |
| 766 | ohci_writel (ohci, RH_PS_PSS, | 780 | ohci_writel (ohci, RH_PS_PSS, |
diff --git a/drivers/usb/host/ohci-lh7a404.c b/drivers/usb/host/ohci-lh7a404.c index 9e31d440d115..de42283149c7 100644 --- a/drivers/usb/host/ohci-lh7a404.c +++ b/drivers/usb/host/ohci-lh7a404.c | |||
| @@ -193,7 +193,6 @@ static const struct hc_driver ohci_lh7a404_hc_driver = { | |||
| 193 | */ | 193 | */ |
| 194 | .hub_status_data = ohci_hub_status_data, | 194 | .hub_status_data = ohci_hub_status_data, |
| 195 | .hub_control = ohci_hub_control, | 195 | .hub_control = ohci_hub_control, |
| 196 | .hub_irq_enable = ohci_rhsc_enable, | ||
| 197 | #ifdef CONFIG_PM | 196 | #ifdef CONFIG_PM |
| 198 | .bus_suspend = ohci_bus_suspend, | 197 | .bus_suspend = ohci_bus_suspend, |
| 199 | .bus_resume = ohci_bus_resume, | 198 | .bus_resume = ohci_bus_resume, |
diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c index 94dfca02f7e1..1eb64d08b60a 100644 --- a/drivers/usb/host/ohci-omap.c +++ b/drivers/usb/host/ohci-omap.c | |||
| @@ -225,6 +225,7 @@ static int ohci_omap_init(struct usb_hcd *hcd) | |||
| 225 | dev_err(hcd->self.controller, "can't find transceiver\n"); | 225 | dev_err(hcd->self.controller, "can't find transceiver\n"); |
| 226 | return -ENODEV; | 226 | return -ENODEV; |
| 227 | } | 227 | } |
| 228 | ohci->start_hnp = start_hnp; | ||
| 228 | } | 229 | } |
| 229 | #endif | 230 | #endif |
| 230 | 231 | ||
| @@ -260,7 +261,7 @@ static int ohci_omap_init(struct usb_hcd *hcd) | |||
| 260 | omap_cfg_reg(W4_USB_HIGHZ); | 261 | omap_cfg_reg(W4_USB_HIGHZ); |
| 261 | } | 262 | } |
| 262 | ohci_writel(ohci, rh, &ohci->regs->roothub.a); | 263 | ohci_writel(ohci, rh, &ohci->regs->roothub.a); |
| 263 | distrust_firmware = 0; | 264 | ohci->flags &= ~OHCI_QUIRK_HUB_POWER; |
| 264 | } else if (machine_is_nokia770()) { | 265 | } else if (machine_is_nokia770()) { |
| 265 | /* We require a self-powered hub, which should have | 266 | /* We require a self-powered hub, which should have |
| 266 | * plenty of power. */ | 267 | * plenty of power. */ |
| @@ -469,7 +470,6 @@ static const struct hc_driver ohci_omap_hc_driver = { | |||
| 469 | */ | 470 | */ |
| 470 | .hub_status_data = ohci_hub_status_data, | 471 | .hub_status_data = ohci_hub_status_data, |
| 471 | .hub_control = ohci_hub_control, | 472 | .hub_control = ohci_hub_control, |
| 472 | .hub_irq_enable = ohci_rhsc_enable, | ||
| 473 | #ifdef CONFIG_PM | 473 | #ifdef CONFIG_PM |
| 474 | .bus_suspend = ohci_bus_suspend, | 474 | .bus_suspend = ohci_bus_suspend, |
| 475 | .bus_resume = ohci_bus_resume, | 475 | .bus_resume = ohci_bus_resume, |
diff --git a/drivers/usb/host/ohci-pci.c b/drivers/usb/host/ohci-pci.c index 4696cc912e16..a9c2ae36c7ad 100644 --- a/drivers/usb/host/ohci-pci.c +++ b/drivers/usb/host/ohci-pci.c | |||
| @@ -18,6 +18,28 @@ | |||
| 18 | #error "This file is PCI bus glue. CONFIG_PCI must be defined." | 18 | #error "This file is PCI bus glue. CONFIG_PCI must be defined." |
| 19 | #endif | 19 | #endif |
| 20 | 20 | ||
| 21 | #include <linux/pci.h> | ||
| 22 | #include <linux/io.h> | ||
| 23 | |||
| 24 | |||
| 25 | /* constants used to work around PM-related transfer | ||
| 26 | * glitches in some AMD 700 series southbridges | ||
| 27 | */ | ||
| 28 | #define AB_REG_BAR 0xf0 | ||
| 29 | #define AB_INDX(addr) ((addr) + 0x00) | ||
| 30 | #define AB_DATA(addr) ((addr) + 0x04) | ||
| 31 | #define AX_INDXC 0X30 | ||
| 32 | #define AX_DATAC 0x34 | ||
| 33 | |||
| 34 | #define NB_PCIE_INDX_ADDR 0xe0 | ||
| 35 | #define NB_PCIE_INDX_DATA 0xe4 | ||
| 36 | #define PCIE_P_CNTL 0x10040 | ||
| 37 | #define BIF_NB 0x10002 | ||
| 38 | |||
| 39 | static struct pci_dev *amd_smbus_dev; | ||
| 40 | static struct pci_dev *amd_hb_dev; | ||
| 41 | static int amd_ohci_iso_count; | ||
| 42 | |||
| 21 | /*-------------------------------------------------------------------------*/ | 43 | /*-------------------------------------------------------------------------*/ |
| 22 | 44 | ||
| 23 | static int broken_suspend(struct usb_hcd *hcd) | 45 | static int broken_suspend(struct usb_hcd *hcd) |
| @@ -143,6 +165,103 @@ static int ohci_quirk_nec(struct usb_hcd *hcd) | |||
| 143 | return 0; | 165 | return 0; |
| 144 | } | 166 | } |
| 145 | 167 | ||
| 168 | static int ohci_quirk_amd700(struct usb_hcd *hcd) | ||
| 169 | { | ||
| 170 | struct ohci_hcd *ohci = hcd_to_ohci(hcd); | ||
| 171 | u8 rev = 0; | ||
| 172 | |||
| 173 | if (!amd_smbus_dev) | ||
| 174 | amd_smbus_dev = pci_get_device(PCI_VENDOR_ID_ATI, | ||
| 175 | PCI_DEVICE_ID_ATI_SBX00_SMBUS, NULL); | ||
| 176 | if (!amd_smbus_dev) | ||
| 177 | return 0; | ||
| 178 | |||
| 179 | pci_read_config_byte(amd_smbus_dev, PCI_REVISION_ID, &rev); | ||
| 180 | if ((rev > 0x3b) || (rev < 0x30)) { | ||
| 181 | pci_dev_put(amd_smbus_dev); | ||
| 182 | amd_smbus_dev = NULL; | ||
| 183 | return 0; | ||
| 184 | } | ||
| 185 | |||
| 186 | amd_ohci_iso_count++; | ||
| 187 | |||
| 188 | if (!amd_hb_dev) | ||
| 189 | amd_hb_dev = pci_get_device(PCI_VENDOR_ID_AMD, 0x9600, NULL); | ||
| 190 | |||
| 191 | ohci->flags |= OHCI_QUIRK_AMD_ISO; | ||
| 192 | ohci_dbg(ohci, "enabled AMD ISO transfers quirk\n"); | ||
| 193 | |||
| 194 | return 0; | ||
| 195 | } | ||
| 196 | |||
| 197 | /* | ||
| 198 | * The hardware normally enables the A-link power management feature, which | ||
| 199 | * lets the system lower the power consumption in idle states. | ||
| 200 | * | ||
| 201 | * Assume the system is configured to have USB 1.1 ISO transfers going | ||
| 202 | * to or from a USB device. Without this quirk, that stream may stutter | ||
| 203 | * or have breaks occasionally. For transfers going to speakers, this | ||
| 204 | * makes a very audible mess... | ||
| 205 | * | ||
| 206 | * That audio playback corruption is due to the audio stream getting | ||
| 207 | * interrupted occasionally when the link goes in lower power state | ||
| 208 | * This USB quirk prevents the link going into that lower power state | ||
| 209 | * during audio playback or other ISO operations. | ||
| 210 | */ | ||
| 211 | static void quirk_amd_pll(int on) | ||
| 212 | { | ||
| 213 | u32 addr; | ||
| 214 | u32 val; | ||
| 215 | u32 bit = (on > 0) ? 1 : 0; | ||
| 216 | |||
| 217 | pci_read_config_dword(amd_smbus_dev, AB_REG_BAR, &addr); | ||
| 218 | |||
| 219 | /* BIT names/meanings are NDA-protected, sorry ... */ | ||
| 220 | |||
| 221 | outl(AX_INDXC, AB_INDX(addr)); | ||
| 222 | outl(0x40, AB_DATA(addr)); | ||
| 223 | outl(AX_DATAC, AB_INDX(addr)); | ||
| 224 | val = inl(AB_DATA(addr)); | ||
| 225 | val &= ~((1 << 3) | (1 << 4) | (1 << 9)); | ||
| 226 | val |= (bit << 3) | ((!bit) << 4) | ((!bit) << 9); | ||
| 227 | outl(val, AB_DATA(addr)); | ||
| 228 | |||
| 229 | if (amd_hb_dev) { | ||
| 230 | addr = PCIE_P_CNTL; | ||
| 231 | pci_write_config_dword(amd_hb_dev, NB_PCIE_INDX_ADDR, addr); | ||
| 232 | |||
| 233 | pci_read_config_dword(amd_hb_dev, NB_PCIE_INDX_DATA, &val); | ||
| 234 | val &= ~(1 | (1 << 3) | (1 << 4) | (1 << 9) | (1 << 12)); | ||
| 235 | val |= bit | (bit << 3) | (bit << 12); | ||
| 236 | val |= ((!bit) << 4) | ((!bit) << 9); | ||
| 237 | pci_write_config_dword(amd_hb_dev, NB_PCIE_INDX_DATA, val); | ||
| 238 | |||
| 239 | addr = BIF_NB; | ||
| 240 | pci_write_config_dword(amd_hb_dev, NB_PCIE_INDX_ADDR, addr); | ||
| 241 | |||
| 242 | pci_read_config_dword(amd_hb_dev, NB_PCIE_INDX_DATA, &val); | ||
| 243 | val &= ~(1 << 8); | ||
| 244 | val |= bit << 8; | ||
| 245 | pci_write_config_dword(amd_hb_dev, NB_PCIE_INDX_DATA, val); | ||
| 246 | } | ||
| 247 | } | ||
| 248 | |||
| 249 | static void amd_iso_dev_put(void) | ||
| 250 | { | ||
| 251 | amd_ohci_iso_count--; | ||
| 252 | if (amd_ohci_iso_count == 0) { | ||
| 253 | if (amd_smbus_dev) { | ||
| 254 | pci_dev_put(amd_smbus_dev); | ||
| 255 | amd_smbus_dev = NULL; | ||
| 256 | } | ||
| 257 | if (amd_hb_dev) { | ||
| 258 | pci_dev_put(amd_hb_dev); | ||
| 259 | amd_hb_dev = NULL; | ||
| 260 | } | ||
| 261 | } | ||
| 262 | |||
| 263 | } | ||
| 264 | |||
| 146 | /* List of quirks for OHCI */ | 265 | /* List of quirks for OHCI */ |
| 147 | static const struct pci_device_id ohci_pci_quirks[] = { | 266 | static const struct pci_device_id ohci_pci_quirks[] = { |
| 148 | { | 267 | { |
| @@ -181,6 +300,19 @@ static const struct pci_device_id ohci_pci_quirks[] = { | |||
| 181 | PCI_DEVICE(PCI_VENDOR_ID_ITE, 0x8152), | 300 | PCI_DEVICE(PCI_VENDOR_ID_ITE, 0x8152), |
| 182 | .driver_data = (unsigned long) broken_suspend, | 301 | .driver_data = (unsigned long) broken_suspend, |
| 183 | }, | 302 | }, |
| 303 | { | ||
| 304 | PCI_DEVICE(PCI_VENDOR_ID_ATI, 0x4397), | ||
| 305 | .driver_data = (unsigned long)ohci_quirk_amd700, | ||
| 306 | }, | ||
| 307 | { | ||
| 308 | PCI_DEVICE(PCI_VENDOR_ID_ATI, 0x4398), | ||
| 309 | .driver_data = (unsigned long)ohci_quirk_amd700, | ||
| 310 | }, | ||
| 311 | { | ||
| 312 | PCI_DEVICE(PCI_VENDOR_ID_ATI, 0x4399), | ||
| 313 | .driver_data = (unsigned long)ohci_quirk_amd700, | ||
| 314 | }, | ||
| 315 | |||
| 184 | /* FIXME for some of the early AMD 760 southbridges, OHCI | 316 | /* FIXME for some of the early AMD 760 southbridges, OHCI |
| 185 | * won't work at all. blacklist them. | 317 | * won't work at all. blacklist them. |
| 186 | */ | 318 | */ |
| @@ -327,7 +459,6 @@ static const struct hc_driver ohci_pci_hc_driver = { | |||
| 327 | */ | 459 | */ |
| 328 | .hub_status_data = ohci_hub_status_data, | 460 | .hub_status_data = ohci_hub_status_data, |
| 329 | .hub_control = ohci_hub_control, | 461 | .hub_control = ohci_hub_control, |
| 330 | .hub_irq_enable = ohci_rhsc_enable, | ||
| 331 | #ifdef CONFIG_PM | 462 | #ifdef CONFIG_PM |
| 332 | .bus_suspend = ohci_bus_suspend, | 463 | .bus_suspend = ohci_bus_suspend, |
| 333 | .bus_resume = ohci_bus_resume, | 464 | .bus_resume = ohci_bus_resume, |
diff --git a/drivers/usb/host/ohci-pnx4008.c b/drivers/usb/host/ohci-pnx4008.c index b02cd0761977..658a2a978c32 100644 --- a/drivers/usb/host/ohci-pnx4008.c +++ b/drivers/usb/host/ohci-pnx4008.c | |||
| @@ -277,7 +277,6 @@ static const struct hc_driver ohci_pnx4008_hc_driver = { | |||
| 277 | */ | 277 | */ |
| 278 | .hub_status_data = ohci_hub_status_data, | 278 | .hub_status_data = ohci_hub_status_data, |
| 279 | .hub_control = ohci_hub_control, | 279 | .hub_control = ohci_hub_control, |
| 280 | .hub_irq_enable = ohci_rhsc_enable, | ||
| 281 | #ifdef CONFIG_PM | 280 | #ifdef CONFIG_PM |
| 282 | .bus_suspend = ohci_bus_suspend, | 281 | .bus_suspend = ohci_bus_suspend, |
| 283 | .bus_resume = ohci_bus_resume, | 282 | .bus_resume = ohci_bus_resume, |
diff --git a/drivers/usb/host/ohci-pnx8550.c b/drivers/usb/host/ohci-pnx8550.c index 605d59cba28e..28467e288a93 100644 --- a/drivers/usb/host/ohci-pnx8550.c +++ b/drivers/usb/host/ohci-pnx8550.c | |||
| @@ -201,7 +201,6 @@ static const struct hc_driver ohci_pnx8550_hc_driver = { | |||
| 201 | */ | 201 | */ |
| 202 | .hub_status_data = ohci_hub_status_data, | 202 | .hub_status_data = ohci_hub_status_data, |
| 203 | .hub_control = ohci_hub_control, | 203 | .hub_control = ohci_hub_control, |
| 204 | .hub_irq_enable = ohci_rhsc_enable, | ||
| 205 | #ifdef CONFIG_PM | 204 | #ifdef CONFIG_PM |
| 206 | .bus_suspend = ohci_bus_suspend, | 205 | .bus_suspend = ohci_bus_suspend, |
| 207 | .bus_resume = ohci_bus_resume, | 206 | .bus_resume = ohci_bus_resume, |
diff --git a/drivers/usb/host/ohci-ppc-of.c b/drivers/usb/host/ohci-ppc-of.c index 91e6e101a4cc..7ac53264ead3 100644 --- a/drivers/usb/host/ohci-ppc-of.c +++ b/drivers/usb/host/ohci-ppc-of.c | |||
| @@ -72,7 +72,6 @@ static const struct hc_driver ohci_ppc_of_hc_driver = { | |||
| 72 | */ | 72 | */ |
| 73 | .hub_status_data = ohci_hub_status_data, | 73 | .hub_status_data = ohci_hub_status_data, |
| 74 | .hub_control = ohci_hub_control, | 74 | .hub_control = ohci_hub_control, |
| 75 | .hub_irq_enable = ohci_rhsc_enable, | ||
| 76 | #ifdef CONFIG_PM | 75 | #ifdef CONFIG_PM |
| 77 | .bus_suspend = ohci_bus_suspend, | 76 | .bus_suspend = ohci_bus_suspend, |
| 78 | .bus_resume = ohci_bus_resume, | 77 | .bus_resume = ohci_bus_resume, |
diff --git a/drivers/usb/host/ohci-ppc-soc.c b/drivers/usb/host/ohci-ppc-soc.c index 523c30125577..cd3398b675b2 100644 --- a/drivers/usb/host/ohci-ppc-soc.c +++ b/drivers/usb/host/ohci-ppc-soc.c | |||
| @@ -172,7 +172,6 @@ static const struct hc_driver ohci_ppc_soc_hc_driver = { | |||
| 172 | */ | 172 | */ |
| 173 | .hub_status_data = ohci_hub_status_data, | 173 | .hub_status_data = ohci_hub_status_data, |
| 174 | .hub_control = ohci_hub_control, | 174 | .hub_control = ohci_hub_control, |
| 175 | .hub_irq_enable = ohci_rhsc_enable, | ||
| 176 | #ifdef CONFIG_PM | 175 | #ifdef CONFIG_PM |
| 177 | .bus_suspend = ohci_bus_suspend, | 176 | .bus_suspend = ohci_bus_suspend, |
| 178 | .bus_resume = ohci_bus_resume, | 177 | .bus_resume = ohci_bus_resume, |
diff --git a/drivers/usb/host/ohci-ps3.c b/drivers/usb/host/ohci-ps3.c index 55c95647f008..2089d8a46c4b 100644 --- a/drivers/usb/host/ohci-ps3.c +++ b/drivers/usb/host/ohci-ps3.c | |||
| @@ -68,7 +68,6 @@ static const struct hc_driver ps3_ohci_hc_driver = { | |||
| 68 | .get_frame_number = ohci_get_frame, | 68 | .get_frame_number = ohci_get_frame, |
| 69 | .hub_status_data = ohci_hub_status_data, | 69 | .hub_status_data = ohci_hub_status_data, |
| 70 | .hub_control = ohci_hub_control, | 70 | .hub_control = ohci_hub_control, |
| 71 | .hub_irq_enable = ohci_rhsc_enable, | ||
| 72 | .start_port_reset = ohci_start_port_reset, | 71 | .start_port_reset = ohci_start_port_reset, |
| 73 | #if defined(CONFIG_PM) | 72 | #if defined(CONFIG_PM) |
| 74 | .bus_suspend = ohci_bus_suspend, | 73 | .bus_suspend = ohci_bus_suspend, |
diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c index 8c9c4849db6e..7f0f35c78185 100644 --- a/drivers/usb/host/ohci-pxa27x.c +++ b/drivers/usb/host/ohci-pxa27x.c | |||
| @@ -298,7 +298,6 @@ static const struct hc_driver ohci_pxa27x_hc_driver = { | |||
| 298 | */ | 298 | */ |
| 299 | .hub_status_data = ohci_hub_status_data, | 299 | .hub_status_data = ohci_hub_status_data, |
| 300 | .hub_control = ohci_hub_control, | 300 | .hub_control = ohci_hub_control, |
| 301 | .hub_irq_enable = ohci_rhsc_enable, | ||
| 302 | #ifdef CONFIG_PM | 301 | #ifdef CONFIG_PM |
| 303 | .bus_suspend = ohci_bus_suspend, | 302 | .bus_suspend = ohci_bus_suspend, |
| 304 | .bus_resume = ohci_bus_resume, | 303 | .bus_resume = ohci_bus_resume, |
diff --git a/drivers/usb/host/ohci-q.c b/drivers/usb/host/ohci-q.c index 6a9b4c557953..c2d80f80448b 100644 --- a/drivers/usb/host/ohci-q.c +++ b/drivers/usb/host/ohci-q.c | |||
| @@ -49,6 +49,9 @@ __acquires(ohci->lock) | |||
| 49 | switch (usb_pipetype (urb->pipe)) { | 49 | switch (usb_pipetype (urb->pipe)) { |
| 50 | case PIPE_ISOCHRONOUS: | 50 | case PIPE_ISOCHRONOUS: |
| 51 | ohci_to_hcd(ohci)->self.bandwidth_isoc_reqs--; | 51 | ohci_to_hcd(ohci)->self.bandwidth_isoc_reqs--; |
| 52 | if (ohci_to_hcd(ohci)->self.bandwidth_isoc_reqs == 0 | ||
| 53 | && quirk_amdiso(ohci)) | ||
| 54 | quirk_amd_pll(1); | ||
| 52 | break; | 55 | break; |
| 53 | case PIPE_INTERRUPT: | 56 | case PIPE_INTERRUPT: |
| 54 | ohci_to_hcd(ohci)->self.bandwidth_int_reqs--; | 57 | ohci_to_hcd(ohci)->self.bandwidth_int_reqs--; |
| @@ -677,6 +680,9 @@ static void td_submit_urb ( | |||
| 677 | data + urb->iso_frame_desc [cnt].offset, | 680 | data + urb->iso_frame_desc [cnt].offset, |
| 678 | urb->iso_frame_desc [cnt].length, urb, cnt); | 681 | urb->iso_frame_desc [cnt].length, urb, cnt); |
| 679 | } | 682 | } |
| 683 | if (ohci_to_hcd(ohci)->self.bandwidth_isoc_reqs == 0 | ||
| 684 | && quirk_amdiso(ohci)) | ||
| 685 | quirk_amd_pll(0); | ||
| 680 | periodic = ohci_to_hcd(ohci)->self.bandwidth_isoc_reqs++ == 0 | 686 | periodic = ohci_to_hcd(ohci)->self.bandwidth_isoc_reqs++ == 0 |
| 681 | && ohci_to_hcd(ohci)->self.bandwidth_int_reqs == 0; | 687 | && ohci_to_hcd(ohci)->self.bandwidth_int_reqs == 0; |
| 682 | break; | 688 | break; |
diff --git a/drivers/usb/host/ohci-s3c2410.c b/drivers/usb/host/ohci-s3c2410.c index 9e3dc4069e8b..f46af7a718d4 100644 --- a/drivers/usb/host/ohci-s3c2410.c +++ b/drivers/usb/host/ohci-s3c2410.c | |||
| @@ -466,7 +466,6 @@ static const struct hc_driver ohci_s3c2410_hc_driver = { | |||
| 466 | */ | 466 | */ |
| 467 | .hub_status_data = ohci_s3c2410_hub_status_data, | 467 | .hub_status_data = ohci_s3c2410_hub_status_data, |
| 468 | .hub_control = ohci_s3c2410_hub_control, | 468 | .hub_control = ohci_s3c2410_hub_control, |
| 469 | .hub_irq_enable = ohci_rhsc_enable, | ||
| 470 | #ifdef CONFIG_PM | 469 | #ifdef CONFIG_PM |
| 471 | .bus_suspend = ohci_bus_suspend, | 470 | .bus_suspend = ohci_bus_suspend, |
| 472 | .bus_resume = ohci_bus_resume, | 471 | .bus_resume = ohci_bus_resume, |
diff --git a/drivers/usb/host/ohci-sa1111.c b/drivers/usb/host/ohci-sa1111.c index 4626b002e670..e4bbe8e188e4 100644 --- a/drivers/usb/host/ohci-sa1111.c +++ b/drivers/usb/host/ohci-sa1111.c | |||
| @@ -231,7 +231,6 @@ static const struct hc_driver ohci_sa1111_hc_driver = { | |||
| 231 | */ | 231 | */ |
| 232 | .hub_status_data = ohci_hub_status_data, | 232 | .hub_status_data = ohci_hub_status_data, |
| 233 | .hub_control = ohci_hub_control, | 233 | .hub_control = ohci_hub_control, |
| 234 | .hub_irq_enable = ohci_rhsc_enable, | ||
| 235 | #ifdef CONFIG_PM | 234 | #ifdef CONFIG_PM |
| 236 | .bus_suspend = ohci_bus_suspend, | 235 | .bus_suspend = ohci_bus_suspend, |
| 237 | .bus_resume = ohci_bus_resume, | 236 | .bus_resume = ohci_bus_resume, |
diff --git a/drivers/usb/host/ohci-sh.c b/drivers/usb/host/ohci-sh.c index e7ee607278fe..60f03cc7ec4f 100644 --- a/drivers/usb/host/ohci-sh.c +++ b/drivers/usb/host/ohci-sh.c | |||
| @@ -68,7 +68,6 @@ static const struct hc_driver ohci_sh_hc_driver = { | |||
| 68 | */ | 68 | */ |
| 69 | .hub_status_data = ohci_hub_status_data, | 69 | .hub_status_data = ohci_hub_status_data, |
| 70 | .hub_control = ohci_hub_control, | 70 | .hub_control = ohci_hub_control, |
| 71 | .hub_irq_enable = ohci_rhsc_enable, | ||
| 72 | #ifdef CONFIG_PM | 71 | #ifdef CONFIG_PM |
| 73 | .bus_suspend = ohci_bus_suspend, | 72 | .bus_suspend = ohci_bus_suspend, |
| 74 | .bus_resume = ohci_bus_resume, | 73 | .bus_resume = ohci_bus_resume, |
diff --git a/drivers/usb/host/ohci-sm501.c b/drivers/usb/host/ohci-sm501.c index 21b164e4abeb..cff23637cfcc 100644 --- a/drivers/usb/host/ohci-sm501.c +++ b/drivers/usb/host/ohci-sm501.c | |||
| @@ -75,7 +75,6 @@ static const struct hc_driver ohci_sm501_hc_driver = { | |||
| 75 | */ | 75 | */ |
| 76 | .hub_status_data = ohci_hub_status_data, | 76 | .hub_status_data = ohci_hub_status_data, |
| 77 | .hub_control = ohci_hub_control, | 77 | .hub_control = ohci_hub_control, |
| 78 | .hub_irq_enable = ohci_rhsc_enable, | ||
| 79 | #ifdef CONFIG_PM | 78 | #ifdef CONFIG_PM |
| 80 | .bus_suspend = ohci_bus_suspend, | 79 | .bus_suspend = ohci_bus_suspend, |
| 81 | .bus_resume = ohci_bus_resume, | 80 | .bus_resume = ohci_bus_resume, |
diff --git a/drivers/usb/host/ohci-ssb.c b/drivers/usb/host/ohci-ssb.c index 3660c83d80af..23fd6a886bdd 100644 --- a/drivers/usb/host/ohci-ssb.c +++ b/drivers/usb/host/ohci-ssb.c | |||
| @@ -81,7 +81,6 @@ static const struct hc_driver ssb_ohci_hc_driver = { | |||
| 81 | 81 | ||
| 82 | .hub_status_data = ohci_hub_status_data, | 82 | .hub_status_data = ohci_hub_status_data, |
| 83 | .hub_control = ohci_hub_control, | 83 | .hub_control = ohci_hub_control, |
| 84 | .hub_irq_enable = ohci_rhsc_enable, | ||
| 85 | #ifdef CONFIG_PM | 84 | #ifdef CONFIG_PM |
| 86 | .bus_suspend = ohci_bus_suspend, | 85 | .bus_suspend = ohci_bus_suspend, |
| 87 | .bus_resume = ohci_bus_resume, | 86 | .bus_resume = ohci_bus_resume, |
diff --git a/drivers/usb/host/ohci.h b/drivers/usb/host/ohci.h index dc544ddc7849..faf622eafce7 100644 --- a/drivers/usb/host/ohci.h +++ b/drivers/usb/host/ohci.h | |||
| @@ -371,6 +371,7 @@ struct ohci_hcd { | |||
| 371 | * other external transceivers should be software-transparent | 371 | * other external transceivers should be software-transparent |
| 372 | */ | 372 | */ |
| 373 | struct otg_transceiver *transceiver; | 373 | struct otg_transceiver *transceiver; |
| 374 | void (*start_hnp)(struct ohci_hcd *ohci); | ||
| 374 | 375 | ||
| 375 | /* | 376 | /* |
| 376 | * memory management for queue data structures | 377 | * memory management for queue data structures |
| @@ -399,6 +400,8 @@ struct ohci_hcd { | |||
| 399 | #define OHCI_QUIRK_ZFMICRO 0x20 /* Compaq ZFMicro chipset*/ | 400 | #define OHCI_QUIRK_ZFMICRO 0x20 /* Compaq ZFMicro chipset*/ |
| 400 | #define OHCI_QUIRK_NEC 0x40 /* lost interrupts */ | 401 | #define OHCI_QUIRK_NEC 0x40 /* lost interrupts */ |
| 401 | #define OHCI_QUIRK_FRAME_NO 0x80 /* no big endian frame_no shift */ | 402 | #define OHCI_QUIRK_FRAME_NO 0x80 /* no big endian frame_no shift */ |
| 403 | #define OHCI_QUIRK_HUB_POWER 0x100 /* distrust firmware power/oc setup */ | ||
| 404 | #define OHCI_QUIRK_AMD_ISO 0x200 /* ISO transfers*/ | ||
| 402 | // there are also chip quirks/bugs in init logic | 405 | // there are also chip quirks/bugs in init logic |
| 403 | 406 | ||
| 404 | struct work_struct nec_work; /* Worker for NEC quirk */ | 407 | struct work_struct nec_work; /* Worker for NEC quirk */ |
| @@ -426,6 +429,10 @@ static inline int quirk_zfmicro(struct ohci_hcd *ohci) | |||
| 426 | { | 429 | { |
| 427 | return ohci->flags & OHCI_QUIRK_ZFMICRO; | 430 | return ohci->flags & OHCI_QUIRK_ZFMICRO; |
| 428 | } | 431 | } |
| 432 | static inline int quirk_amdiso(struct ohci_hcd *ohci) | ||
| 433 | { | ||
| 434 | return ohci->flags & OHCI_QUIRK_AMD_ISO; | ||
| 435 | } | ||
| 429 | #else | 436 | #else |
| 430 | static inline int quirk_nec(struct ohci_hcd *ohci) | 437 | static inline int quirk_nec(struct ohci_hcd *ohci) |
| 431 | { | 438 | { |
| @@ -435,6 +442,10 @@ static inline int quirk_zfmicro(struct ohci_hcd *ohci) | |||
| 435 | { | 442 | { |
| 436 | return 0; | 443 | return 0; |
| 437 | } | 444 | } |
| 445 | static inline int quirk_amdiso(struct ohci_hcd *ohci) | ||
| 446 | { | ||
| 447 | return 0; | ||
| 448 | } | ||
| 438 | #endif | 449 | #endif |
| 439 | 450 | ||
| 440 | /* convert between an hcd pointer and the corresponding ohci_hcd */ | 451 | /* convert between an hcd pointer and the corresponding ohci_hcd */ |
diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c index d5f02dddb120..ea7126f99cab 100644 --- a/drivers/usb/host/r8a66597-hcd.c +++ b/drivers/usb/host/r8a66597-hcd.c | |||
| @@ -964,11 +964,34 @@ static void pipe_irq_disable(struct r8a66597 *r8a66597, u16 pipenum) | |||
| 964 | disable_irq_nrdy(r8a66597, pipenum); | 964 | disable_irq_nrdy(r8a66597, pipenum); |
| 965 | } | 965 | } |
| 966 | 966 | ||
| 967 | static void r8a66597_root_hub_start_polling(struct r8a66597 *r8a66597) | ||
| 968 | { | ||
| 969 | mod_timer(&r8a66597->rh_timer, | ||
| 970 | jiffies + msecs_to_jiffies(R8A66597_RH_POLL_TIME)); | ||
| 971 | } | ||
| 972 | |||
| 973 | static void start_root_hub_sampling(struct r8a66597 *r8a66597, int port, | ||
| 974 | int connect) | ||
| 975 | { | ||
| 976 | struct r8a66597_root_hub *rh = &r8a66597->root_hub[port]; | ||
| 977 | |||
| 978 | rh->old_syssts = r8a66597_read(r8a66597, get_syssts_reg(port)) & LNST; | ||
| 979 | rh->scount = R8A66597_MAX_SAMPLING; | ||
| 980 | if (connect) | ||
| 981 | rh->port |= 1 << USB_PORT_FEAT_CONNECTION; | ||
| 982 | else | ||
| 983 | rh->port &= ~(1 << USB_PORT_FEAT_CONNECTION); | ||
| 984 | rh->port |= 1 << USB_PORT_FEAT_C_CONNECTION; | ||
| 985 | |||
| 986 | r8a66597_root_hub_start_polling(r8a66597); | ||
| 987 | } | ||
| 988 | |||
| 967 | /* this function must be called with interrupt disabled */ | 989 | /* this function must be called with interrupt disabled */ |
| 968 | static void r8a66597_check_syssts(struct r8a66597 *r8a66597, int port, | 990 | static void r8a66597_check_syssts(struct r8a66597 *r8a66597, int port, |
| 969 | u16 syssts) | 991 | u16 syssts) |
| 970 | { | 992 | { |
| 971 | if (syssts == SE0) { | 993 | if (syssts == SE0) { |
| 994 | r8a66597_write(r8a66597, ~ATTCH, get_intsts_reg(port)); | ||
| 972 | r8a66597_bset(r8a66597, ATTCHE, get_intenb_reg(port)); | 995 | r8a66597_bset(r8a66597, ATTCHE, get_intenb_reg(port)); |
| 973 | return; | 996 | return; |
| 974 | } | 997 | } |
| @@ -1002,13 +1025,10 @@ static void r8a66597_usb_disconnect(struct r8a66597 *r8a66597, int port) | |||
| 1002 | { | 1025 | { |
| 1003 | struct r8a66597_device *dev = r8a66597->root_hub[port].dev; | 1026 | struct r8a66597_device *dev = r8a66597->root_hub[port].dev; |
| 1004 | 1027 | ||
| 1005 | r8a66597->root_hub[port].port &= ~(1 << USB_PORT_FEAT_CONNECTION); | ||
| 1006 | r8a66597->root_hub[port].port |= (1 << USB_PORT_FEAT_C_CONNECTION); | ||
| 1007 | |||
| 1008 | disable_r8a66597_pipe_all(r8a66597, dev); | 1028 | disable_r8a66597_pipe_all(r8a66597, dev); |
| 1009 | free_usb_address(r8a66597, dev); | 1029 | free_usb_address(r8a66597, dev); |
| 1010 | 1030 | ||
| 1011 | r8a66597_bset(r8a66597, ATTCHE, get_intenb_reg(port)); | 1031 | start_root_hub_sampling(r8a66597, port, 0); |
| 1012 | } | 1032 | } |
| 1013 | 1033 | ||
| 1014 | /* this function must be called with interrupt disabled */ | 1034 | /* this function must be called with interrupt disabled */ |
| @@ -1551,23 +1571,6 @@ static void irq_pipe_nrdy(struct r8a66597 *r8a66597) | |||
| 1551 | } | 1571 | } |
| 1552 | } | 1572 | } |
| 1553 | 1573 | ||
| 1554 | static void r8a66597_root_hub_start_polling(struct r8a66597 *r8a66597) | ||
| 1555 | { | ||
| 1556 | mod_timer(&r8a66597->rh_timer, | ||
| 1557 | jiffies + msecs_to_jiffies(R8A66597_RH_POLL_TIME)); | ||
| 1558 | } | ||
| 1559 | |||
| 1560 | static void start_root_hub_sampling(struct r8a66597 *r8a66597, int port) | ||
| 1561 | { | ||
| 1562 | struct r8a66597_root_hub *rh = &r8a66597->root_hub[port]; | ||
| 1563 | |||
| 1564 | rh->old_syssts = r8a66597_read(r8a66597, get_syssts_reg(port)) & LNST; | ||
| 1565 | rh->scount = R8A66597_MAX_SAMPLING; | ||
| 1566 | r8a66597->root_hub[port].port |= (1 << USB_PORT_FEAT_CONNECTION) | ||
| 1567 | | (1 << USB_PORT_FEAT_C_CONNECTION); | ||
| 1568 | r8a66597_root_hub_start_polling(r8a66597); | ||
| 1569 | } | ||
| 1570 | |||
| 1571 | static irqreturn_t r8a66597_irq(struct usb_hcd *hcd) | 1574 | static irqreturn_t r8a66597_irq(struct usb_hcd *hcd) |
| 1572 | { | 1575 | { |
| 1573 | struct r8a66597 *r8a66597 = hcd_to_r8a66597(hcd); | 1576 | struct r8a66597 *r8a66597 = hcd_to_r8a66597(hcd); |
| @@ -1594,7 +1597,7 @@ static irqreturn_t r8a66597_irq(struct usb_hcd *hcd) | |||
| 1594 | r8a66597_bclr(r8a66597, ATTCHE, INTENB2); | 1597 | r8a66597_bclr(r8a66597, ATTCHE, INTENB2); |
| 1595 | 1598 | ||
| 1596 | /* start usb bus sampling */ | 1599 | /* start usb bus sampling */ |
| 1597 | start_root_hub_sampling(r8a66597, 1); | 1600 | start_root_hub_sampling(r8a66597, 1, 1); |
| 1598 | } | 1601 | } |
| 1599 | if (mask2 & DTCH) { | 1602 | if (mask2 & DTCH) { |
| 1600 | r8a66597_write(r8a66597, ~DTCH, INTSTS2); | 1603 | r8a66597_write(r8a66597, ~DTCH, INTSTS2); |
| @@ -1609,7 +1612,7 @@ static irqreturn_t r8a66597_irq(struct usb_hcd *hcd) | |||
| 1609 | r8a66597_bclr(r8a66597, ATTCHE, INTENB1); | 1612 | r8a66597_bclr(r8a66597, ATTCHE, INTENB1); |
| 1610 | 1613 | ||
| 1611 | /* start usb bus sampling */ | 1614 | /* start usb bus sampling */ |
| 1612 | start_root_hub_sampling(r8a66597, 0); | 1615 | start_root_hub_sampling(r8a66597, 0, 1); |
| 1613 | } | 1616 | } |
| 1614 | if (mask1 & DTCH) { | 1617 | if (mask1 & DTCH) { |
| 1615 | r8a66597_write(r8a66597, ~DTCH, INTSTS1); | 1618 | r8a66597_write(r8a66597, ~DTCH, INTSTS1); |
diff --git a/drivers/usb/host/u132-hcd.c b/drivers/usb/host/u132-hcd.c index 20ad3c48fcb2..228f2b070f2b 100644 --- a/drivers/usb/host/u132-hcd.c +++ b/drivers/usb/host/u132-hcd.c | |||
| @@ -2934,16 +2934,6 @@ static int u132_start_port_reset(struct usb_hcd *hcd, unsigned port_num) | |||
| 2934 | return 0; | 2934 | return 0; |
| 2935 | } | 2935 | } |
| 2936 | 2936 | ||
| 2937 | static void u132_hub_irq_enable(struct usb_hcd *hcd) | ||
| 2938 | { | ||
| 2939 | struct u132 *u132 = hcd_to_u132(hcd); | ||
| 2940 | if (u132->going > 1) { | ||
| 2941 | dev_err(&u132->platform_dev->dev, "device has been removed %d\n" | ||
| 2942 | , u132->going); | ||
| 2943 | } else if (u132->going > 0) | ||
| 2944 | dev_err(&u132->platform_dev->dev, "device is being removed\n"); | ||
| 2945 | } | ||
| 2946 | |||
| 2947 | 2937 | ||
| 2948 | #ifdef CONFIG_PM | 2938 | #ifdef CONFIG_PM |
| 2949 | static int u132_bus_suspend(struct usb_hcd *hcd) | 2939 | static int u132_bus_suspend(struct usb_hcd *hcd) |
| @@ -2995,7 +2985,6 @@ static struct hc_driver u132_hc_driver = { | |||
| 2995 | .bus_suspend = u132_bus_suspend, | 2985 | .bus_suspend = u132_bus_suspend, |
| 2996 | .bus_resume = u132_bus_resume, | 2986 | .bus_resume = u132_bus_resume, |
| 2997 | .start_port_reset = u132_start_port_reset, | 2987 | .start_port_reset = u132_start_port_reset, |
| 2998 | .hub_irq_enable = u132_hub_irq_enable, | ||
| 2999 | }; | 2988 | }; |
| 3000 | 2989 | ||
| 3001 | /* | 2990 | /* |
diff --git a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig index 001789c9a11a..4ea50e0abcbb 100644 --- a/drivers/usb/misc/Kconfig +++ b/drivers/usb/misc/Kconfig | |||
| @@ -42,16 +42,6 @@ config USB_ADUTUX | |||
| 42 | To compile this driver as a module, choose M here. The module | 42 | To compile this driver as a module, choose M here. The module |
| 43 | will be called adutux. | 43 | will be called adutux. |
| 44 | 44 | ||
| 45 | config USB_AUERSWALD | ||
| 46 | tristate "USB Auerswald ISDN support" | ||
| 47 | depends on USB | ||
| 48 | help | ||
| 49 | Say Y here if you want to connect an Auerswald USB ISDN Device | ||
| 50 | to your computer's USB port. | ||
| 51 | |||
| 52 | To compile this driver as a module, choose M here: the | ||
| 53 | module will be called auerswald. | ||
| 54 | |||
| 55 | config USB_RIO500 | 45 | config USB_RIO500 |
| 56 | tristate "USB Diamond Rio500 support" | 46 | tristate "USB Diamond Rio500 support" |
| 57 | depends on USB | 47 | depends on USB |
diff --git a/drivers/usb/misc/Makefile b/drivers/usb/misc/Makefile index aba091cb5ec0..45b4e12afb08 100644 --- a/drivers/usb/misc/Makefile +++ b/drivers/usb/misc/Makefile | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | 5 | ||
| 6 | obj-$(CONFIG_USB_ADUTUX) += adutux.o | 6 | obj-$(CONFIG_USB_ADUTUX) += adutux.o |
| 7 | obj-$(CONFIG_USB_APPLEDISPLAY) += appledisplay.o | 7 | obj-$(CONFIG_USB_APPLEDISPLAY) += appledisplay.o |
| 8 | obj-$(CONFIG_USB_AUERSWALD) += auerswald.o | ||
| 9 | obj-$(CONFIG_USB_BERRY_CHARGE) += berry_charge.o | 8 | obj-$(CONFIG_USB_BERRY_CHARGE) += berry_charge.o |
| 10 | obj-$(CONFIG_USB_CYPRESS_CY7C63)+= cypress_cy7c63.o | 9 | obj-$(CONFIG_USB_CYPRESS_CY7C63)+= cypress_cy7c63.o |
| 11 | obj-$(CONFIG_USB_CYTHERM) += cytherm.o | 10 | obj-$(CONFIG_USB_CYTHERM) += cytherm.o |
diff --git a/drivers/usb/misc/auerswald.c b/drivers/usb/misc/auerswald.c deleted file mode 100644 index d2f61d5510e7..000000000000 --- a/drivers/usb/misc/auerswald.c +++ /dev/null | |||
| @@ -1,2152 +0,0 @@ | |||
| 1 | /*****************************************************************************/ | ||
| 2 | /* | ||
| 3 | * auerswald.c -- Auerswald PBX/System Telephone usb driver. | ||
| 4 | * | ||
| 5 | * Copyright (C) 2001 Wolfgang Mües (wolfgang@iksw-muees.de) | ||
| 6 | * | ||
| 7 | * Very much code of this driver is borrowed from dabusb.c (Deti Fliegl) | ||
| 8 | * and from the USB Skeleton driver (Greg Kroah-Hartman). Thank you. | ||
| 9 | * | ||
| 10 | * This program is free software; you can redistribute it and/or modify | ||
| 11 | * it under the terms of the GNU General Public License as published by | ||
| 12 | * the Free Software Foundation; either version 2 of the License, or | ||
| 13 | * (at your option) any later version. | ||
| 14 | * | ||
| 15 | * This program is distributed in the hope that it will be useful, | ||
| 16 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 17 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 18 | * GNU General Public License for more details. | ||
| 19 | * | ||
| 20 | * You should have received a copy of the GNU General Public License | ||
| 21 | * along with this program; if not, write to the Free Software | ||
| 22 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | ||
| 23 | */ | ||
| 24 | /*****************************************************************************/ | ||
| 25 | |||
| 26 | /* Standard Linux module include files */ | ||
| 27 | #include <asm/uaccess.h> | ||
| 28 | #include <asm/byteorder.h> | ||
| 29 | #include <linux/slab.h> | ||
| 30 | #include <linux/module.h> | ||
| 31 | #include <linux/init.h> | ||
| 32 | #include <linux/wait.h> | ||
| 33 | #include <linux/usb.h> | ||
| 34 | #include <linux/mutex.h> | ||
| 35 | |||
| 36 | /*-------------------------------------------------------------------*/ | ||
| 37 | /* Debug support */ | ||
| 38 | #ifdef DEBUG | ||
| 39 | #define dump( adr, len) \ | ||
| 40 | do { \ | ||
| 41 | unsigned int u; \ | ||
| 42 | printk (KERN_DEBUG); \ | ||
| 43 | for (u = 0; u < len; u++) \ | ||
| 44 | printk (" %02X", adr[u] & 0xFF); \ | ||
| 45 | printk ("\n"); \ | ||
| 46 | } while (0) | ||
| 47 | #else | ||
| 48 | #define dump( adr, len) | ||
| 49 | #endif | ||
| 50 | |||
| 51 | /*-------------------------------------------------------------------*/ | ||
| 52 | /* Version Information */ | ||
| 53 | #define DRIVER_VERSION "0.9.11" | ||
| 54 | #define DRIVER_AUTHOR "Wolfgang Mües <wolfgang@iksw-muees.de>" | ||
| 55 | #define DRIVER_DESC "Auerswald PBX/System Telephone usb driver" | ||
| 56 | |||
| 57 | /*-------------------------------------------------------------------*/ | ||
| 58 | /* Private declarations for Auerswald USB driver */ | ||
| 59 | |||
| 60 | /* Auerswald Vendor ID */ | ||
| 61 | #define ID_AUERSWALD 0x09BF | ||
| 62 | |||
| 63 | #define AUER_MINOR_BASE 112 /* auerswald driver minor number */ | ||
| 64 | |||
| 65 | /* we can have up to this number of device plugged in at once */ | ||
| 66 | #define AUER_MAX_DEVICES 16 | ||
| 67 | |||
| 68 | |||
| 69 | /* Number of read buffers for each device */ | ||
| 70 | #define AU_RBUFFERS 10 | ||
| 71 | |||
| 72 | /* Number of chain elements for each control chain */ | ||
| 73 | #define AUCH_ELEMENTS 20 | ||
| 74 | |||
| 75 | /* Number of retries in communication */ | ||
| 76 | #define AU_RETRIES 10 | ||
| 77 | |||
| 78 | /*-------------------------------------------------------------------*/ | ||
| 79 | /* vendor specific protocol */ | ||
| 80 | /* Header Byte */ | ||
| 81 | #define AUH_INDIRMASK 0x80 /* mask for direct/indirect bit */ | ||
| 82 | #define AUH_DIRECT 0x00 /* data is for USB device */ | ||
| 83 | #define AUH_INDIRECT 0x80 /* USB device is relay */ | ||
| 84 | |||
| 85 | #define AUH_SPLITMASK 0x40 /* mask for split bit */ | ||
| 86 | #define AUH_UNSPLIT 0x00 /* data block is full-size */ | ||
| 87 | #define AUH_SPLIT 0x40 /* data block is part of a larger one, | ||
| 88 | split-byte follows */ | ||
| 89 | |||
| 90 | #define AUH_TYPEMASK 0x3F /* mask for type of data transfer */ | ||
| 91 | #define AUH_TYPESIZE 0x40 /* different types */ | ||
| 92 | #define AUH_DCHANNEL 0x00 /* D channel data */ | ||
| 93 | #define AUH_B1CHANNEL 0x01 /* B1 channel transparent */ | ||
| 94 | #define AUH_B2CHANNEL 0x02 /* B2 channel transparent */ | ||
| 95 | /* 0x03..0x0F reserved for driver internal use */ | ||
| 96 | #define AUH_COMMAND 0x10 /* Command channel */ | ||
| 97 | #define AUH_BPROT 0x11 /* Configuration block protocol */ | ||
| 98 | #define AUH_DPROTANA 0x12 /* D channel protocol analyzer */ | ||
| 99 | #define AUH_TAPI 0x13 /* telephone api data (ATD) */ | ||
| 100 | /* 0x14..0x3F reserved for other protocols */ | ||
| 101 | #define AUH_UNASSIGNED 0xFF /* if char device has no assigned service */ | ||
| 102 | #define AUH_FIRSTUSERCH 0x11 /* first channel which is available for driver users */ | ||
| 103 | |||
| 104 | #define AUH_SIZE 1 /* Size of Header Byte */ | ||
| 105 | |||
| 106 | /* Split Byte. Only present if split bit in header byte set.*/ | ||
| 107 | #define AUS_STARTMASK 0x80 /* mask for first block of splitted frame */ | ||
| 108 | #define AUS_FIRST 0x80 /* first block */ | ||
| 109 | #define AUS_FOLLOW 0x00 /* following block */ | ||
| 110 | |||
| 111 | #define AUS_ENDMASK 0x40 /* mask for last block of splitted frame */ | ||
| 112 | #define AUS_END 0x40 /* last block */ | ||
| 113 | #define AUS_NOEND 0x00 /* not the last block */ | ||
| 114 | |||
| 115 | #define AUS_LENMASK 0x3F /* mask for block length information */ | ||
| 116 | |||
| 117 | /* Request types */ | ||
| 118 | #define AUT_RREQ (USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_OTHER) /* Read Request */ | ||
| 119 | #define AUT_WREQ (USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_OTHER) /* Write Request */ | ||
| 120 | |||
| 121 | /* Vendor Requests */ | ||
| 122 | #define AUV_GETINFO 0x00 /* GetDeviceInfo */ | ||
| 123 | #define AUV_WBLOCK 0x01 /* Write Block */ | ||
| 124 | #define AUV_RBLOCK 0x02 /* Read Block */ | ||
| 125 | #define AUV_CHANNELCTL 0x03 /* Channel Control */ | ||
| 126 | #define AUV_DUMMY 0x04 /* Dummy Out for retry */ | ||
| 127 | |||
| 128 | /* Device Info Types */ | ||
| 129 | #define AUDI_NUMBCH 0x0000 /* Number of supported B channels */ | ||
| 130 | #define AUDI_OUTFSIZE 0x0001 /* Size of OUT B channel fifos */ | ||
| 131 | #define AUDI_MBCTRANS 0x0002 /* max. Blocklength of control transfer */ | ||
| 132 | |||
| 133 | /* Interrupt endpoint definitions */ | ||
| 134 | #define AU_IRQENDP 1 /* Endpoint number */ | ||
| 135 | #define AU_IRQCMDID 16 /* Command-block ID */ | ||
| 136 | #define AU_BLOCKRDY 0 /* Command: Block data ready on ctl endpoint */ | ||
| 137 | #define AU_IRQMINSIZE 5 /* Nr. of bytes decoded in this driver */ | ||
| 138 | |||
| 139 | /* Device String Descriptors */ | ||
| 140 | #define AUSI_VENDOR 1 /* "Auerswald GmbH & Co. KG" */ | ||
| 141 | #define AUSI_DEVICE 2 /* Name of the Device */ | ||
| 142 | #define AUSI_SERIALNR 3 /* Serial Number */ | ||
| 143 | #define AUSI_MSN 4 /* "MSN ..." (first) Multiple Subscriber Number */ | ||
| 144 | |||
| 145 | #define AUSI_DLEN 100 /* Max. Length of Device Description */ | ||
| 146 | |||
| 147 | #define AUV_RETRY 0x101 /* First Firmware version which can do control retries */ | ||
| 148 | |||
| 149 | /*-------------------------------------------------------------------*/ | ||
| 150 | /* External data structures / Interface */ | ||
| 151 | typedef struct | ||
| 152 | { | ||
| 153 | char __user *buf; /* return buffer for string contents */ | ||
| 154 | unsigned int bsize; /* size of return buffer */ | ||
| 155 | } audevinfo_t,*paudevinfo_t; | ||
| 156 | |||
| 157 | /* IO controls */ | ||
| 158 | #define IOCTL_AU_SLEN _IOR( 'U', 0xF0, int) /* return the max. string descriptor length */ | ||
| 159 | #define IOCTL_AU_DEVINFO _IOWR('U', 0xF1, audevinfo_t) /* get name of a specific device */ | ||
| 160 | #define IOCTL_AU_SERVREQ _IOW( 'U', 0xF2, int) /* request a service channel */ | ||
| 161 | #define IOCTL_AU_BUFLEN _IOR( 'U', 0xF3, int) /* return the max. buffer length for the device */ | ||
| 162 | #define IOCTL_AU_RXAVAIL _IOR( 'U', 0xF4, int) /* return != 0 if Receive Data available */ | ||
| 163 | #define IOCTL_AU_CONNECT _IOR( 'U', 0xF5, int) /* return != 0 if connected to a service channel */ | ||
| 164 | #define IOCTL_AU_TXREADY _IOR( 'U', 0xF6, int) /* return != 0 if Transmitt channel ready to send */ | ||
| 165 | /* 'U' 0xF7..0xFF reseved */ | ||
| 166 | |||
| 167 | /*-------------------------------------------------------------------*/ | ||
| 168 | /* Internal data structures */ | ||
| 169 | |||
| 170 | /* ..................................................................*/ | ||
| 171 | /* urb chain element */ | ||
| 172 | struct auerchain; /* forward for circular reference */ | ||
| 173 | typedef struct | ||
| 174 | { | ||
| 175 | struct auerchain *chain; /* pointer to the chain to which this element belongs */ | ||
| 176 | struct urb * urbp; /* pointer to attached urb */ | ||
| 177 | void *context; /* saved URB context */ | ||
| 178 | usb_complete_t complete; /* saved URB completion function */ | ||
| 179 | struct list_head list; /* to include element into a list */ | ||
| 180 | } auerchainelement_t,*pauerchainelement_t; | ||
| 181 | |||
| 182 | /* urb chain */ | ||
| 183 | typedef struct auerchain | ||
| 184 | { | ||
| 185 | pauerchainelement_t active; /* element which is submitted to urb */ | ||
| 186 | spinlock_t lock; /* protection agains interrupts */ | ||
| 187 | struct list_head waiting_list; /* list of waiting elements */ | ||
| 188 | struct list_head free_list; /* list of available elements */ | ||
| 189 | } auerchain_t,*pauerchain_t; | ||
| 190 | |||
| 191 | /* urb blocking completion helper struct */ | ||
| 192 | typedef struct | ||
| 193 | { | ||
| 194 | wait_queue_head_t wqh; /* wait for completion */ | ||
| 195 | unsigned int done; /* completion flag */ | ||
| 196 | } auerchain_chs_t,*pauerchain_chs_t; | ||
| 197 | |||
| 198 | /* ...................................................................*/ | ||
| 199 | /* buffer element */ | ||
| 200 | struct auerbufctl; /* forward */ | ||
| 201 | typedef struct | ||
| 202 | { | ||
| 203 | char *bufp; /* reference to allocated data buffer */ | ||
| 204 | unsigned int len; /* number of characters in data buffer */ | ||
| 205 | unsigned int retries; /* for urb retries */ | ||
| 206 | struct usb_ctrlrequest *dr; /* for setup data in control messages */ | ||
| 207 | struct urb * urbp; /* USB urb */ | ||
| 208 | struct auerbufctl *list; /* pointer to list */ | ||
| 209 | struct list_head buff_list; /* reference to next buffer in list */ | ||
| 210 | } auerbuf_t,*pauerbuf_t; | ||
| 211 | |||
| 212 | /* buffer list control block */ | ||
| 213 | typedef struct auerbufctl | ||
| 214 | { | ||
| 215 | spinlock_t lock; /* protection in interrupt */ | ||
| 216 | struct list_head free_buff_list;/* free buffers */ | ||
| 217 | struct list_head rec_buff_list; /* buffers with receive data */ | ||
| 218 | } auerbufctl_t,*pauerbufctl_t; | ||
| 219 | |||
| 220 | /* ...................................................................*/ | ||
| 221 | /* service context */ | ||
| 222 | struct auerscon; /* forward */ | ||
| 223 | typedef void (*auer_dispatch_t)(struct auerscon*, pauerbuf_t); | ||
| 224 | typedef void (*auer_disconn_t) (struct auerscon*); | ||
| 225 | typedef struct auerscon | ||
| 226 | { | ||
| 227 | unsigned int id; /* protocol service id AUH_xxxx */ | ||
| 228 | auer_dispatch_t dispatch; /* dispatch read buffer */ | ||
| 229 | auer_disconn_t disconnect; /* disconnect from device, wake up all char readers */ | ||
| 230 | } auerscon_t,*pauerscon_t; | ||
| 231 | |||
| 232 | /* ...................................................................*/ | ||
| 233 | /* USB device context */ | ||
| 234 | typedef struct | ||
| 235 | { | ||
| 236 | struct mutex mutex; /* protection in user context */ | ||
| 237 | char name[20]; /* name of the /dev/usb entry */ | ||
| 238 | unsigned int dtindex; /* index in the device table */ | ||
| 239 | struct usb_device * usbdev; /* USB device handle */ | ||
| 240 | int open_count; /* count the number of open character channels */ | ||
| 241 | char dev_desc[AUSI_DLEN];/* for storing a textual description */ | ||
| 242 | unsigned int maxControlLength; /* max. Length of control paket (without header) */ | ||
| 243 | struct urb * inturbp; /* interrupt urb */ | ||
| 244 | char * intbufp; /* data buffer for interrupt urb */ | ||
| 245 | unsigned int irqsize; /* size of interrupt endpoint 1 */ | ||
| 246 | struct auerchain controlchain; /* for chaining of control messages */ | ||
| 247 | auerbufctl_t bufctl; /* Buffer control for control transfers */ | ||
| 248 | pauerscon_t services[AUH_TYPESIZE];/* context pointers for each service */ | ||
| 249 | unsigned int version; /* Version of the device */ | ||
| 250 | wait_queue_head_t bufferwait; /* wait for a control buffer */ | ||
| 251 | } auerswald_t,*pauerswald_t; | ||
| 252 | |||
| 253 | /* ................................................................... */ | ||
| 254 | /* character device context */ | ||
| 255 | typedef struct | ||
| 256 | { | ||
| 257 | struct mutex mutex; /* protection in user context */ | ||
| 258 | pauerswald_t auerdev; /* context pointer of assigned device */ | ||
| 259 | auerbufctl_t bufctl; /* controls the buffer chain */ | ||
| 260 | auerscon_t scontext; /* service context */ | ||
| 261 | wait_queue_head_t readwait; /* for synchronous reading */ | ||
| 262 | struct mutex readmutex; /* protection against multiple reads */ | ||
| 263 | pauerbuf_t readbuf; /* buffer held for partial reading */ | ||
| 264 | unsigned int readoffset; /* current offset in readbuf */ | ||
| 265 | unsigned int removed; /* is != 0 if device is removed */ | ||
| 266 | } auerchar_t,*pauerchar_t; | ||
| 267 | |||
| 268 | |||
| 269 | /*-------------------------------------------------------------------*/ | ||
| 270 | /* Forwards */ | ||
| 271 | static void auerswald_ctrlread_complete (struct urb * urb); | ||
| 272 | static void auerswald_removeservice (pauerswald_t cp, pauerscon_t scp); | ||
| 273 | static struct usb_driver auerswald_driver; | ||
| 274 | |||
| 275 | |||
| 276 | /*-------------------------------------------------------------------*/ | ||
| 277 | /* USB chain helper functions */ | ||
| 278 | /* -------------------------- */ | ||
| 279 | |||
| 280 | /* completion function for chained urbs */ | ||
| 281 | static void auerchain_complete (struct urb * urb) | ||
| 282 | { | ||
| 283 | unsigned long flags; | ||
| 284 | int result; | ||
| 285 | |||
| 286 | /* get pointer to element and to chain */ | ||
| 287 | pauerchainelement_t acep = urb->context; | ||
| 288 | pauerchain_t acp = acep->chain; | ||
| 289 | |||
| 290 | /* restore original entries in urb */ | ||
| 291 | urb->context = acep->context; | ||
| 292 | urb->complete = acep->complete; | ||
| 293 | |||
| 294 | dbg ("auerchain_complete called"); | ||
| 295 | |||
| 296 | /* call original completion function | ||
| 297 | NOTE: this function may lead to more urbs submitted into the chain. | ||
| 298 | (no chain lock at calling complete()!) | ||
| 299 | acp->active != NULL is protecting us against recursion.*/ | ||
| 300 | urb->complete (urb); | ||
| 301 | |||
| 302 | /* detach element from chain data structure */ | ||
| 303 | spin_lock_irqsave (&acp->lock, flags); | ||
| 304 | if (acp->active != acep) /* paranoia debug check */ | ||
| 305 | dbg ("auerchain_complete: completion on non-active element called!"); | ||
| 306 | else | ||
| 307 | acp->active = NULL; | ||
| 308 | |||
| 309 | /* add the used chain element to the list of free elements */ | ||
| 310 | list_add_tail (&acep->list, &acp->free_list); | ||
| 311 | acep = NULL; | ||
| 312 | |||
| 313 | /* is there a new element waiting in the chain? */ | ||
| 314 | if (!acp->active && !list_empty (&acp->waiting_list)) { | ||
| 315 | /* yes: get the entry */ | ||
| 316 | struct list_head *tmp = acp->waiting_list.next; | ||
| 317 | list_del (tmp); | ||
| 318 | acep = list_entry (tmp, auerchainelement_t, list); | ||
| 319 | acp->active = acep; | ||
| 320 | } | ||
| 321 | spin_unlock_irqrestore (&acp->lock, flags); | ||
| 322 | |||
| 323 | /* submit the new urb */ | ||
| 324 | if (acep) { | ||
| 325 | urb = acep->urbp; | ||
| 326 | dbg ("auerchain_complete: submitting next urb from chain"); | ||
| 327 | urb->status = 0; /* needed! */ | ||
| 328 | result = usb_submit_urb(urb, GFP_ATOMIC); | ||
| 329 | |||
| 330 | /* check for submit errors */ | ||
| 331 | if (result) { | ||
| 332 | urb->status = result; | ||
| 333 | dbg("auerchain_complete: usb_submit_urb with error code %d", result); | ||
| 334 | /* and do error handling via *this* completion function (recursive) */ | ||
| 335 | auerchain_complete( urb); | ||
| 336 | } | ||
| 337 | } else { | ||
| 338 | /* simple return without submitting a new urb. | ||
| 339 | The empty chain is detected with acp->active == NULL. */ | ||
| 340 | }; | ||
| 341 | } | ||
| 342 | |||
| 343 | |||
| 344 | /* submit function for chained urbs | ||
| 345 | this function may be called from completion context or from user space! | ||
| 346 | early = 1 -> submit in front of chain | ||
| 347 | */ | ||
| 348 | static int auerchain_submit_urb_list (pauerchain_t acp, struct urb * urb, int early) | ||
| 349 | { | ||
| 350 | int result; | ||
| 351 | unsigned long flags; | ||
| 352 | pauerchainelement_t acep = NULL; | ||
| 353 | |||
| 354 | dbg ("auerchain_submit_urb called"); | ||
| 355 | |||
| 356 | /* try to get a chain element */ | ||
| 357 | spin_lock_irqsave (&acp->lock, flags); | ||
| 358 | if (!list_empty (&acp->free_list)) { | ||
| 359 | /* yes: get the entry */ | ||
| 360 | struct list_head *tmp = acp->free_list.next; | ||
| 361 | list_del (tmp); | ||
| 362 | acep = list_entry (tmp, auerchainelement_t, list); | ||
| 363 | } | ||
| 364 | spin_unlock_irqrestore (&acp->lock, flags); | ||
| 365 | |||
| 366 | /* if no chain element available: return with error */ | ||
| 367 | if (!acep) { | ||
| 368 | return -ENOMEM; | ||
| 369 | } | ||
| 370 | |||
| 371 | /* fill in the new chain element values */ | ||
| 372 | acep->chain = acp; | ||
| 373 | acep->context = urb->context; | ||
| 374 | acep->complete = urb->complete; | ||
| 375 | acep->urbp = urb; | ||
| 376 | INIT_LIST_HEAD (&acep->list); | ||
| 377 | |||
| 378 | /* modify urb */ | ||
| 379 | urb->context = acep; | ||
| 380 | urb->complete = auerchain_complete; | ||
| 381 | urb->status = -EINPROGRESS; /* usb_submit_urb does this, too */ | ||
| 382 | |||
| 383 | /* add element to chain - or start it immediately */ | ||
| 384 | spin_lock_irqsave (&acp->lock, flags); | ||
| 385 | if (acp->active) { | ||
| 386 | /* there is traffic in the chain, simple add element to chain */ | ||
| 387 | if (early) { | ||
| 388 | dbg ("adding new urb to head of chain"); | ||
| 389 | list_add (&acep->list, &acp->waiting_list); | ||
| 390 | } else { | ||
| 391 | dbg ("adding new urb to end of chain"); | ||
| 392 | list_add_tail (&acep->list, &acp->waiting_list); | ||
| 393 | } | ||
| 394 | acep = NULL; | ||
| 395 | } else { | ||
| 396 | /* the chain is empty. Prepare restart */ | ||
| 397 | acp->active = acep; | ||
| 398 | } | ||
| 399 | /* Spin has to be removed before usb_submit_urb! */ | ||
| 400 | spin_unlock_irqrestore (&acp->lock, flags); | ||
| 401 | |||
| 402 | /* Submit urb if immediate restart */ | ||
| 403 | if (acep) { | ||
| 404 | dbg("submitting urb immediate"); | ||
| 405 | urb->status = 0; /* needed! */ | ||
| 406 | result = usb_submit_urb(urb, GFP_ATOMIC); | ||
| 407 | /* check for submit errors */ | ||
| 408 | if (result) { | ||
| 409 | urb->status = result; | ||
| 410 | dbg("auerchain_submit_urb: usb_submit_urb with error code %d", result); | ||
| 411 | /* and do error handling via completion function */ | ||
| 412 | auerchain_complete( urb); | ||
| 413 | } | ||
| 414 | } | ||
| 415 | |||
| 416 | return 0; | ||
| 417 | } | ||
| 418 | |||
| 419 | /* submit function for chained urbs | ||
| 420 | this function may be called from completion context or from user space! | ||
| 421 | */ | ||
| 422 | static int auerchain_submit_urb (pauerchain_t acp, struct urb * urb) | ||
| 423 | { | ||
| 424 | return auerchain_submit_urb_list (acp, urb, 0); | ||
| 425 | } | ||
| 426 | |||
| 427 | /* cancel an urb which is submitted to the chain | ||
| 428 | the result is 0 if the urb is cancelled, or -EINPROGRESS if | ||
| 429 | the function is successfully started. | ||
| 430 | */ | ||
| 431 | static int auerchain_unlink_urb (pauerchain_t acp, struct urb * urb) | ||
| 432 | { | ||
| 433 | unsigned long flags; | ||
| 434 | struct urb * urbp; | ||
| 435 | pauerchainelement_t acep; | ||
| 436 | struct list_head *tmp; | ||
| 437 | |||
| 438 | dbg ("auerchain_unlink_urb called"); | ||
| 439 | |||
| 440 | /* search the chain of waiting elements */ | ||
| 441 | spin_lock_irqsave (&acp->lock, flags); | ||
| 442 | list_for_each (tmp, &acp->waiting_list) { | ||
| 443 | acep = list_entry (tmp, auerchainelement_t, list); | ||
| 444 | if (acep->urbp == urb) { | ||
| 445 | list_del (tmp); | ||
| 446 | urb->context = acep->context; | ||
| 447 | urb->complete = acep->complete; | ||
| 448 | list_add_tail (&acep->list, &acp->free_list); | ||
| 449 | spin_unlock_irqrestore (&acp->lock, flags); | ||
| 450 | dbg ("unlink waiting urb"); | ||
| 451 | urb->status = -ENOENT; | ||
| 452 | urb->complete (urb); | ||
| 453 | return 0; | ||
| 454 | } | ||
| 455 | } | ||
| 456 | /* not found. */ | ||
| 457 | spin_unlock_irqrestore (&acp->lock, flags); | ||
| 458 | |||
| 459 | /* get the active urb */ | ||
| 460 | acep = acp->active; | ||
| 461 | if (acep) { | ||
| 462 | urbp = acep->urbp; | ||
| 463 | |||
| 464 | /* check if we have to cancel the active urb */ | ||
| 465 | if (urbp == urb) { | ||
| 466 | /* note that there is a race condition between the check above | ||
| 467 | and the unlink() call because of no lock. This race is harmless, | ||
| 468 | because the usb module will detect the unlink() after completion. | ||
| 469 | We can't use the acp->lock here because the completion function | ||
| 470 | wants to grab it. | ||
| 471 | */ | ||
| 472 | dbg ("unlink active urb"); | ||
| 473 | return usb_unlink_urb (urbp); | ||
| 474 | } | ||
| 475 | } | ||
| 476 | |||
| 477 | /* not found anyway | ||
| 478 | ... is some kind of success | ||
| 479 | */ | ||
| 480 | dbg ("urb to unlink not found in chain"); | ||
| 481 | return 0; | ||
| 482 | } | ||
| 483 | |||
| 484 | /* cancel all urbs which are in the chain. | ||
| 485 | this function must not be called from interrupt or completion handler. | ||
| 486 | */ | ||
| 487 | static void auerchain_unlink_all (pauerchain_t acp) | ||
| 488 | { | ||
| 489 | unsigned long flags; | ||
| 490 | struct urb * urbp; | ||
| 491 | pauerchainelement_t acep; | ||
| 492 | |||
| 493 | dbg ("auerchain_unlink_all called"); | ||
| 494 | |||
| 495 | /* clear the chain of waiting elements */ | ||
| 496 | spin_lock_irqsave (&acp->lock, flags); | ||
| 497 | while (!list_empty (&acp->waiting_list)) { | ||
| 498 | /* get the next entry */ | ||
| 499 | struct list_head *tmp = acp->waiting_list.next; | ||
| 500 | list_del (tmp); | ||
| 501 | acep = list_entry (tmp, auerchainelement_t, list); | ||
| 502 | urbp = acep->urbp; | ||
| 503 | urbp->context = acep->context; | ||
| 504 | urbp->complete = acep->complete; | ||
| 505 | list_add_tail (&acep->list, &acp->free_list); | ||
| 506 | spin_unlock_irqrestore (&acp->lock, flags); | ||
| 507 | dbg ("unlink waiting urb"); | ||
| 508 | urbp->status = -ENOENT; | ||
| 509 | urbp->complete (urbp); | ||
| 510 | spin_lock_irqsave (&acp->lock, flags); | ||
| 511 | } | ||
| 512 | spin_unlock_irqrestore (&acp->lock, flags); | ||
| 513 | |||
| 514 | /* clear the active urb */ | ||
| 515 | acep = acp->active; | ||
| 516 | if (acep) { | ||
| 517 | urbp = acep->urbp; | ||
| 518 | dbg ("unlink active urb"); | ||
| 519 | usb_kill_urb (urbp); | ||
| 520 | } | ||
| 521 | } | ||
| 522 | |||
| 523 | |||
| 524 | /* free the chain. | ||
| 525 | this function must not be called from interrupt or completion handler. | ||
| 526 | */ | ||
| 527 | static void auerchain_free (pauerchain_t acp) | ||
| 528 | { | ||
| 529 | unsigned long flags; | ||
| 530 | pauerchainelement_t acep; | ||
| 531 | |||
| 532 | dbg ("auerchain_free called"); | ||
| 533 | |||
| 534 | /* first, cancel all pending urbs */ | ||
| 535 | auerchain_unlink_all (acp); | ||
| 536 | |||
| 537 | /* free the elements */ | ||
| 538 | spin_lock_irqsave (&acp->lock, flags); | ||
| 539 | while (!list_empty (&acp->free_list)) { | ||
| 540 | /* get the next entry */ | ||
| 541 | struct list_head *tmp = acp->free_list.next; | ||
| 542 | list_del (tmp); | ||
| 543 | spin_unlock_irqrestore (&acp->lock, flags); | ||
| 544 | acep = list_entry (tmp, auerchainelement_t, list); | ||
| 545 | kfree (acep); | ||
| 546 | spin_lock_irqsave (&acp->lock, flags); | ||
| 547 | } | ||
| 548 | spin_unlock_irqrestore (&acp->lock, flags); | ||
| 549 | } | ||
| 550 | |||
| 551 | |||
| 552 | /* Init the chain control structure */ | ||
| 553 | static void auerchain_init (pauerchain_t acp) | ||
| 554 | { | ||
| 555 | /* init the chain data structure */ | ||
| 556 | acp->active = NULL; | ||
| 557 | spin_lock_init (&acp->lock); | ||
| 558 | INIT_LIST_HEAD (&acp->waiting_list); | ||
| 559 | INIT_LIST_HEAD (&acp->free_list); | ||
| 560 | } | ||
| 561 | |||
| 562 | /* setup a chain. | ||
| 563 | It is assumed that there is no concurrency while setting up the chain | ||
| 564 | requirement: auerchain_init() | ||
| 565 | */ | ||
| 566 | static int auerchain_setup (pauerchain_t acp, unsigned int numElements) | ||
| 567 | { | ||
| 568 | pauerchainelement_t acep; | ||
| 569 | |||
| 570 | dbg ("auerchain_setup called with %d elements", numElements); | ||
| 571 | |||
| 572 | /* fill the list of free elements */ | ||
| 573 | for (;numElements; numElements--) { | ||
| 574 | acep = kzalloc(sizeof(auerchainelement_t), GFP_KERNEL); | ||
| 575 | if (!acep) | ||
| 576 | goto ac_fail; | ||
| 577 | INIT_LIST_HEAD (&acep->list); | ||
| 578 | list_add_tail (&acep->list, &acp->free_list); | ||
| 579 | } | ||
| 580 | return 0; | ||
| 581 | |||
| 582 | ac_fail:/* free the elements */ | ||
| 583 | while (!list_empty (&acp->free_list)) { | ||
| 584 | /* get the next entry */ | ||
| 585 | struct list_head *tmp = acp->free_list.next; | ||
| 586 | list_del (tmp); | ||
| 587 | acep = list_entry (tmp, auerchainelement_t, list); | ||
| 588 | kfree (acep); | ||
| 589 | } | ||
| 590 | return -ENOMEM; | ||
| 591 | } | ||
| 592 | |||
| 593 | |||
| 594 | /* completion handler for synchronous chained URBs */ | ||
| 595 | static void auerchain_blocking_completion (struct urb *urb) | ||
| 596 | { | ||
| 597 | pauerchain_chs_t pchs = urb->context; | ||
| 598 | pchs->done = 1; | ||
| 599 | wmb(); | ||
| 600 | wake_up (&pchs->wqh); | ||
| 601 | } | ||
| 602 | |||
| 603 | |||
| 604 | /* Starts chained urb and waits for completion or timeout */ | ||
| 605 | static int auerchain_start_wait_urb (pauerchain_t acp, struct urb *urb, int timeout, int* actual_length) | ||
| 606 | { | ||
| 607 | auerchain_chs_t chs; | ||
| 608 | int status; | ||
| 609 | |||
| 610 | dbg ("auerchain_start_wait_urb called"); | ||
| 611 | init_waitqueue_head (&chs.wqh); | ||
| 612 | chs.done = 0; | ||
| 613 | |||
| 614 | urb->context = &chs; | ||
| 615 | status = auerchain_submit_urb (acp, urb); | ||
| 616 | if (status) | ||
| 617 | /* something went wrong */ | ||
| 618 | return status; | ||
| 619 | |||
| 620 | timeout = wait_event_timeout(chs.wqh, chs.done, timeout); | ||
| 621 | |||
| 622 | if (!timeout && !chs.done) { | ||
| 623 | if (urb->status != -EINPROGRESS) { /* No callback?!! */ | ||
| 624 | dbg ("auerchain_start_wait_urb: raced timeout"); | ||
| 625 | status = urb->status; | ||
| 626 | } else { | ||
| 627 | dbg ("auerchain_start_wait_urb: timeout"); | ||
| 628 | auerchain_unlink_urb (acp, urb); /* remove urb safely */ | ||
| 629 | status = -ETIMEDOUT; | ||
| 630 | } | ||
| 631 | } else | ||
| 632 | status = urb->status; | ||
| 633 | |||
| 634 | if (status >= 0) | ||
| 635 | *actual_length = urb->actual_length; | ||
| 636 | |||
| 637 | return status; | ||
| 638 | } | ||
| 639 | |||
| 640 | |||
| 641 | /* auerchain_control_msg - Builds a control urb, sends it off and waits for completion | ||
| 642 | acp: pointer to the auerchain | ||
| 643 | dev: pointer to the usb device to send the message to | ||
| 644 | pipe: endpoint "pipe" to send the message to | ||
| 645 | request: USB message request value | ||
| 646 | requesttype: USB message request type value | ||
| 647 | value: USB message value | ||
| 648 | index: USB message index value | ||
| 649 | data: pointer to the data to send | ||
| 650 | size: length in bytes of the data to send | ||
| 651 | timeout: time to wait for the message to complete before timing out (if 0 the wait is forever) | ||
| 652 | |||
| 653 | This function sends a simple control message to a specified endpoint | ||
| 654 | and waits for the message to complete, or timeout. | ||
| 655 | |||
| 656 | If successful, it returns the transferred length, otherwise a negative error number. | ||
| 657 | |||
| 658 | Don't use this function from within an interrupt context, like a | ||
| 659 | bottom half handler. If you need an asynchronous message, or need to send | ||
| 660 | a message from within interrupt context, use auerchain_submit_urb() | ||
| 661 | */ | ||
| 662 | static int auerchain_control_msg (pauerchain_t acp, struct usb_device *dev, unsigned int pipe, __u8 request, __u8 requesttype, | ||
| 663 | __u16 value, __u16 index, void *data, __u16 size, int timeout) | ||
| 664 | { | ||
| 665 | int ret; | ||
| 666 | struct usb_ctrlrequest *dr; | ||
| 667 | struct urb *urb; | ||
| 668 | int uninitialized_var(length); | ||
| 669 | |||
| 670 | dbg ("auerchain_control_msg"); | ||
| 671 | dr = kmalloc (sizeof (struct usb_ctrlrequest), GFP_KERNEL); | ||
| 672 | if (!dr) | ||
| 673 | return -ENOMEM; | ||
| 674 | urb = usb_alloc_urb (0, GFP_KERNEL); | ||
| 675 | if (!urb) { | ||
| 676 | kfree (dr); | ||
| 677 | return -ENOMEM; | ||
| 678 | } | ||
| 679 | |||
| 680 | dr->bRequestType = requesttype; | ||
| 681 | dr->bRequest = request; | ||
| 682 | dr->wValue = cpu_to_le16 (value); | ||
| 683 | dr->wIndex = cpu_to_le16 (index); | ||
| 684 | dr->wLength = cpu_to_le16 (size); | ||
| 685 | |||
| 686 | usb_fill_control_urb (urb, dev, pipe, (unsigned char*)dr, data, size, /* build urb */ | ||
| 687 | auerchain_blocking_completion, NULL); | ||
| 688 | ret = auerchain_start_wait_urb (acp, urb, timeout, &length); | ||
| 689 | |||
| 690 | usb_free_urb (urb); | ||
| 691 | kfree (dr); | ||
| 692 | |||
| 693 | if (ret < 0) | ||
| 694 | return ret; | ||
| 695 | else | ||
| 696 | return length; | ||
| 697 | } | ||
| 698 | |||
| 699 | |||
| 700 | /*-------------------------------------------------------------------*/ | ||
| 701 | /* Buffer List helper functions */ | ||
| 702 | |||
| 703 | /* free a single auerbuf */ | ||
| 704 | static void auerbuf_free (pauerbuf_t bp) | ||
| 705 | { | ||
| 706 | kfree(bp->bufp); | ||
| 707 | kfree(bp->dr); | ||
| 708 | usb_free_urb(bp->urbp); | ||
| 709 | kfree(bp); | ||
| 710 | } | ||
| 711 | |||
| 712 | /* free the buffers from an auerbuf list */ | ||
| 713 | static void auerbuf_free_list (struct list_head *q) | ||
| 714 | { | ||
| 715 | struct list_head *tmp; | ||
| 716 | struct list_head *p; | ||
| 717 | pauerbuf_t bp; | ||
| 718 | |||
| 719 | dbg ("auerbuf_free_list"); | ||
| 720 | for (p = q->next; p != q;) { | ||
| 721 | bp = list_entry (p, auerbuf_t, buff_list); | ||
| 722 | tmp = p->next; | ||
| 723 | list_del (p); | ||
| 724 | p = tmp; | ||
| 725 | auerbuf_free (bp); | ||
| 726 | } | ||
| 727 | } | ||
| 728 | |||
| 729 | /* init the members of a list control block */ | ||
| 730 | static void auerbuf_init (pauerbufctl_t bcp) | ||
| 731 | { | ||
| 732 | dbg ("auerbuf_init"); | ||
| 733 | spin_lock_init (&bcp->lock); | ||
| 734 | INIT_LIST_HEAD (&bcp->free_buff_list); | ||
| 735 | INIT_LIST_HEAD (&bcp->rec_buff_list); | ||
| 736 | } | ||
| 737 | |||
| 738 | /* free all buffers from an auerbuf chain */ | ||
| 739 | static void auerbuf_free_buffers (pauerbufctl_t bcp) | ||
| 740 | { | ||
| 741 | unsigned long flags; | ||
| 742 | dbg ("auerbuf_free_buffers"); | ||
| 743 | |||
| 744 | spin_lock_irqsave (&bcp->lock, flags); | ||
| 745 | |||
| 746 | auerbuf_free_list (&bcp->free_buff_list); | ||
| 747 | auerbuf_free_list (&bcp->rec_buff_list); | ||
| 748 | |||
| 749 | spin_unlock_irqrestore (&bcp->lock, flags); | ||
| 750 | } | ||
| 751 | |||
| 752 | /* setup a list of buffers */ | ||
| 753 | /* requirement: auerbuf_init() */ | ||
| 754 | static int auerbuf_setup (pauerbufctl_t bcp, unsigned int numElements, unsigned int bufsize) | ||
| 755 | { | ||
| 756 | pauerbuf_t bep = NULL; | ||
| 757 | |||
| 758 | dbg ("auerbuf_setup called with %d elements of %d bytes", numElements, bufsize); | ||
| 759 | |||
| 760 | /* fill the list of free elements */ | ||
| 761 | for (;numElements; numElements--) { | ||
| 762 | bep = kzalloc(sizeof(auerbuf_t), GFP_KERNEL); | ||
| 763 | if (!bep) | ||
| 764 | goto bl_fail; | ||
| 765 | bep->list = bcp; | ||
| 766 | INIT_LIST_HEAD (&bep->buff_list); | ||
| 767 | bep->bufp = kmalloc (bufsize, GFP_KERNEL); | ||
| 768 | if (!bep->bufp) | ||
| 769 | goto bl_fail; | ||
| 770 | bep->dr = kmalloc(sizeof (struct usb_ctrlrequest), GFP_KERNEL); | ||
| 771 | if (!bep->dr) | ||
| 772 | goto bl_fail; | ||
| 773 | bep->urbp = usb_alloc_urb (0, GFP_KERNEL); | ||
| 774 | if (!bep->urbp) | ||
| 775 | goto bl_fail; | ||
| 776 | list_add_tail (&bep->buff_list, &bcp->free_buff_list); | ||
| 777 | } | ||
| 778 | return 0; | ||
| 779 | |||
| 780 | bl_fail:/* not enough memory. Free allocated elements */ | ||
| 781 | dbg ("auerbuf_setup: no more memory"); | ||
| 782 | auerbuf_free(bep); | ||
| 783 | auerbuf_free_buffers (bcp); | ||
| 784 | return -ENOMEM; | ||
| 785 | } | ||
| 786 | |||
| 787 | /* insert a used buffer into the free list */ | ||
| 788 | static void auerbuf_releasebuf( pauerbuf_t bp) | ||
| 789 | { | ||
| 790 | unsigned long flags; | ||
| 791 | pauerbufctl_t bcp = bp->list; | ||
| 792 | bp->retries = 0; | ||
| 793 | |||
| 794 | dbg ("auerbuf_releasebuf called"); | ||
| 795 | spin_lock_irqsave (&bcp->lock, flags); | ||
| 796 | list_add_tail (&bp->buff_list, &bcp->free_buff_list); | ||
| 797 | spin_unlock_irqrestore (&bcp->lock, flags); | ||
| 798 | } | ||
| 799 | |||
| 800 | |||
| 801 | /*-------------------------------------------------------------------*/ | ||
| 802 | /* Completion handlers */ | ||
| 803 | |||
| 804 | /* Values of urb->status or results of usb_submit_urb(): | ||
| 805 | 0 Initial, OK | ||
| 806 | -EINPROGRESS during submission until end | ||
| 807 | -ENOENT if urb is unlinked | ||
| 808 | -ETIME Device did not respond | ||
| 809 | -ENOMEM Memory Overflow | ||
| 810 | -ENODEV Specified USB-device or bus doesn't exist | ||
| 811 | -ENXIO URB already queued | ||
| 812 | -EINVAL a) Invalid transfer type specified (or not supported) | ||
| 813 | b) Invalid interrupt interval (0n256) | ||
| 814 | -EAGAIN a) Specified ISO start frame too early | ||
| 815 | b) (using ISO-ASAP) Too much scheduled for the future wait some time and try again. | ||
| 816 | -EFBIG Too much ISO frames requested (currently uhci900) | ||
| 817 | -EPIPE Specified pipe-handle/Endpoint is already stalled | ||
| 818 | -EMSGSIZE Endpoint message size is zero, do interface/alternate setting | ||
| 819 | -EPROTO a) Bitstuff error | ||
| 820 | b) Unknown USB error | ||
| 821 | -EILSEQ CRC mismatch | ||
| 822 | -ENOSR Buffer error | ||
| 823 | -EREMOTEIO Short packet detected | ||
| 824 | -EXDEV ISO transfer only partially completed look at individual frame status for details | ||
| 825 | -EINVAL ISO madness, if this happens: Log off and go home | ||
| 826 | -EOVERFLOW babble | ||
| 827 | */ | ||
| 828 | |||
| 829 | /* check if a status code allows a retry */ | ||
| 830 | static int auerswald_status_retry (int status) | ||
| 831 | { | ||
| 832 | switch (status) { | ||
| 833 | case 0: | ||
| 834 | case -ETIME: | ||
| 835 | case -EOVERFLOW: | ||
| 836 | case -EAGAIN: | ||
| 837 | case -EPIPE: | ||
| 838 | case -EPROTO: | ||
| 839 | case -EILSEQ: | ||
| 840 | case -ENOSR: | ||
| 841 | case -EREMOTEIO: | ||
| 842 | return 1; /* do a retry */ | ||
| 843 | } | ||
| 844 | return 0; /* no retry possible */ | ||
| 845 | } | ||
| 846 | |||
| 847 | /* Completion of asynchronous write block */ | ||
| 848 | static void auerchar_ctrlwrite_complete (struct urb * urb) | ||
| 849 | { | ||
| 850 | pauerbuf_t bp = urb->context; | ||
| 851 | pauerswald_t cp = ((pauerswald_t)((char *)(bp->list)-(unsigned long)(&((pauerswald_t)0)->bufctl))); | ||
| 852 | dbg ("auerchar_ctrlwrite_complete called"); | ||
| 853 | |||
| 854 | /* reuse the buffer */ | ||
| 855 | auerbuf_releasebuf (bp); | ||
| 856 | /* Wake up all processes waiting for a buffer */ | ||
| 857 | wake_up (&cp->bufferwait); | ||
| 858 | } | ||
| 859 | |||
| 860 | /* Completion handler for dummy retry packet */ | ||
| 861 | static void auerswald_ctrlread_wretcomplete (struct urb * urb) | ||
| 862 | { | ||
| 863 | pauerbuf_t bp = urb->context; | ||
| 864 | pauerswald_t cp; | ||
| 865 | int ret; | ||
| 866 | int status = urb->status; | ||
| 867 | |||
| 868 | dbg ("auerswald_ctrlread_wretcomplete called"); | ||
| 869 | dbg ("complete with status: %d", status); | ||
| 870 | cp = ((pauerswald_t)((char *)(bp->list)-(unsigned long)(&((pauerswald_t)0)->bufctl))); | ||
| 871 | |||
| 872 | /* check if it is possible to advance */ | ||
| 873 | if (!auerswald_status_retry(status) || !cp->usbdev) { | ||
| 874 | /* reuse the buffer */ | ||
| 875 | err ("control dummy: transmission error %d, can not retry", status); | ||
| 876 | auerbuf_releasebuf (bp); | ||
| 877 | /* Wake up all processes waiting for a buffer */ | ||
| 878 | wake_up (&cp->bufferwait); | ||
| 879 | return; | ||
| 880 | } | ||
| 881 | |||
| 882 | /* fill the control message */ | ||
| 883 | bp->dr->bRequestType = AUT_RREQ; | ||
| 884 | bp->dr->bRequest = AUV_RBLOCK; | ||
| 885 | bp->dr->wLength = bp->dr->wValue; /* temporary stored */ | ||
| 886 | bp->dr->wValue = cpu_to_le16 (1); /* Retry Flag */ | ||
| 887 | /* bp->dr->index = channel id; remains */ | ||
| 888 | usb_fill_control_urb (bp->urbp, cp->usbdev, usb_rcvctrlpipe (cp->usbdev, 0), | ||
| 889 | (unsigned char*)bp->dr, bp->bufp, le16_to_cpu (bp->dr->wLength), | ||
| 890 | auerswald_ctrlread_complete,bp); | ||
| 891 | |||
| 892 | /* submit the control msg as next paket */ | ||
| 893 | ret = auerchain_submit_urb_list (&cp->controlchain, bp->urbp, 1); | ||
| 894 | if (ret) { | ||
| 895 | dbg ("auerswald_ctrlread_complete: nonzero result of auerchain_submit_urb_list %d", ret); | ||
| 896 | bp->urbp->status = ret; | ||
| 897 | auerswald_ctrlread_complete (bp->urbp); | ||
| 898 | } | ||
| 899 | } | ||
| 900 | |||
| 901 | /* completion handler for receiving of control messages */ | ||
| 902 | static void auerswald_ctrlread_complete (struct urb * urb) | ||
| 903 | { | ||
| 904 | unsigned int serviceid; | ||
| 905 | pauerswald_t cp; | ||
| 906 | pauerscon_t scp; | ||
| 907 | pauerbuf_t bp = urb->context; | ||
| 908 | int status = urb->status; | ||
| 909 | int ret; | ||
| 910 | |||
| 911 | dbg ("auerswald_ctrlread_complete called"); | ||
| 912 | |||
| 913 | cp = ((pauerswald_t)((char *)(bp->list)-(unsigned long)(&((pauerswald_t)0)->bufctl))); | ||
| 914 | |||
| 915 | /* check if there is valid data in this urb */ | ||
| 916 | if (status) { | ||
| 917 | dbg ("complete with non-zero status: %d", status); | ||
| 918 | /* should we do a retry? */ | ||
| 919 | if (!auerswald_status_retry(status) | ||
| 920 | || !cp->usbdev | ||
| 921 | || (cp->version < AUV_RETRY) | ||
| 922 | || (bp->retries >= AU_RETRIES)) { | ||
| 923 | /* reuse the buffer */ | ||
| 924 | err ("control read: transmission error %d, can not retry", status); | ||
| 925 | auerbuf_releasebuf (bp); | ||
| 926 | /* Wake up all processes waiting for a buffer */ | ||
| 927 | wake_up (&cp->bufferwait); | ||
| 928 | return; | ||
| 929 | } | ||
| 930 | bp->retries++; | ||
| 931 | dbg ("Retry count = %d", bp->retries); | ||
| 932 | /* send a long dummy control-write-message to allow device firmware to react */ | ||
| 933 | bp->dr->bRequestType = AUT_WREQ; | ||
| 934 | bp->dr->bRequest = AUV_DUMMY; | ||
| 935 | bp->dr->wValue = bp->dr->wLength; /* temporary storage */ | ||
| 936 | // bp->dr->wIndex channel ID remains | ||
| 937 | bp->dr->wLength = cpu_to_le16 (32); /* >= 8 bytes */ | ||
| 938 | usb_fill_control_urb (bp->urbp, cp->usbdev, usb_sndctrlpipe (cp->usbdev, 0), | ||
| 939 | (unsigned char*)bp->dr, bp->bufp, 32, | ||
| 940 | auerswald_ctrlread_wretcomplete,bp); | ||
| 941 | |||
| 942 | /* submit the control msg as next paket */ | ||
| 943 | ret = auerchain_submit_urb_list (&cp->controlchain, bp->urbp, 1); | ||
| 944 | if (ret) { | ||
| 945 | dbg ("auerswald_ctrlread_complete: nonzero result of auerchain_submit_urb_list %d", ret); | ||
| 946 | bp->urbp->status = ret; | ||
| 947 | auerswald_ctrlread_wretcomplete (bp->urbp); | ||
| 948 | } | ||
| 949 | return; | ||
| 950 | } | ||
| 951 | |||
| 952 | /* get the actual bytecount (incl. headerbyte) */ | ||
| 953 | bp->len = urb->actual_length; | ||
| 954 | serviceid = bp->bufp[0] & AUH_TYPEMASK; | ||
| 955 | dbg ("Paket with serviceid %d and %d bytes received", serviceid, bp->len); | ||
| 956 | |||
| 957 | /* dispatch the paket */ | ||
| 958 | scp = cp->services[serviceid]; | ||
| 959 | if (scp) { | ||
| 960 | /* look, Ma, a listener! */ | ||
| 961 | scp->dispatch (scp, bp); | ||
| 962 | } | ||
| 963 | |||
| 964 | /* release the paket */ | ||
| 965 | auerbuf_releasebuf (bp); | ||
| 966 | /* Wake up all processes waiting for a buffer */ | ||
| 967 | wake_up (&cp->bufferwait); | ||
| 968 | } | ||
| 969 | |||
| 970 | /*-------------------------------------------------------------------*/ | ||
| 971 | /* Handling of Interrupt Endpoint */ | ||
| 972 | /* This interrupt Endpoint is used to inform the host about waiting | ||
| 973 | messages from the USB device. | ||
| 974 | */ | ||
| 975 | /* int completion handler. */ | ||
| 976 | static void auerswald_int_complete (struct urb * urb) | ||
| 977 | { | ||
| 978 | unsigned long flags; | ||
| 979 | unsigned int channelid; | ||
| 980 | unsigned int bytecount; | ||
| 981 | int ret; | ||
| 982 | int status = urb->status; | ||
| 983 | pauerbuf_t bp = NULL; | ||
| 984 | pauerswald_t cp = urb->context; | ||
| 985 | |||
| 986 | dbg ("%s called", __func__); | ||
| 987 | |||
| 988 | switch (status) { | ||
| 989 | case 0: | ||
| 990 | /* success */ | ||
| 991 | break; | ||
| 992 | case -ECONNRESET: | ||
| 993 | case -ENOENT: | ||
| 994 | case -ESHUTDOWN: | ||
| 995 | /* this urb is terminated, clean up */ | ||
| 996 | dbg("%s - urb shutting down with status: %d", __func__, status); | ||
| 997 | return; | ||
| 998 | default: | ||
| 999 | dbg("%s - nonzero urb status received: %d", __func__, status); | ||
| 1000 | goto exit; | ||
| 1001 | } | ||
| 1002 | |||
| 1003 | /* check if all needed data was received */ | ||
| 1004 | if (urb->actual_length < AU_IRQMINSIZE) { | ||
| 1005 | dbg ("invalid data length received: %d bytes", urb->actual_length); | ||
| 1006 | goto exit; | ||
| 1007 | } | ||
| 1008 | |||
| 1009 | /* check the command code */ | ||
| 1010 | if (cp->intbufp[0] != AU_IRQCMDID) { | ||
| 1011 | dbg ("invalid command received: %d", cp->intbufp[0]); | ||
| 1012 | goto exit; | ||
| 1013 | } | ||
| 1014 | |||
| 1015 | /* check the command type */ | ||
| 1016 | if (cp->intbufp[1] != AU_BLOCKRDY) { | ||
| 1017 | dbg ("invalid command type received: %d", cp->intbufp[1]); | ||
| 1018 | goto exit; | ||
| 1019 | } | ||
| 1020 | |||
| 1021 | /* now extract the information */ | ||
| 1022 | channelid = cp->intbufp[2]; | ||
| 1023 | bytecount = (unsigned char)cp->intbufp[3]; | ||
| 1024 | bytecount |= (unsigned char)cp->intbufp[4] << 8; | ||
| 1025 | |||
| 1026 | /* check the channel id */ | ||
| 1027 | if (channelid >= AUH_TYPESIZE) { | ||
| 1028 | dbg ("invalid channel id received: %d", channelid); | ||
| 1029 | goto exit; | ||
| 1030 | } | ||
| 1031 | |||
| 1032 | /* check the byte count */ | ||
| 1033 | if (bytecount > (cp->maxControlLength+AUH_SIZE)) { | ||
| 1034 | dbg ("invalid byte count received: %d", bytecount); | ||
| 1035 | goto exit; | ||
| 1036 | } | ||
| 1037 | dbg ("Service Channel = %d", channelid); | ||
| 1038 | dbg ("Byte Count = %d", bytecount); | ||
| 1039 | |||
| 1040 | /* get a buffer for the next data paket */ | ||
| 1041 | spin_lock_irqsave (&cp->bufctl.lock, flags); | ||
| 1042 | if (!list_empty (&cp->bufctl.free_buff_list)) { | ||
| 1043 | /* yes: get the entry */ | ||
| 1044 | struct list_head *tmp = cp->bufctl.free_buff_list.next; | ||
| 1045 | list_del (tmp); | ||
| 1046 | bp = list_entry (tmp, auerbuf_t, buff_list); | ||
| 1047 | } | ||
| 1048 | spin_unlock_irqrestore (&cp->bufctl.lock, flags); | ||
| 1049 | |||
| 1050 | /* if no buffer available: skip it */ | ||
| 1051 | if (!bp) { | ||
| 1052 | dbg ("auerswald_int_complete: no data buffer available"); | ||
| 1053 | /* can we do something more? | ||
| 1054 | This is a big problem: if this int packet is ignored, the | ||
| 1055 | device will wait forever and not signal any more data. | ||
| 1056 | The only real solution is: having enough buffers! | ||
| 1057 | Or perhaps temporary disabling the int endpoint? | ||
| 1058 | */ | ||
| 1059 | goto exit; | ||
| 1060 | } | ||
| 1061 | |||
| 1062 | /* fill the control message */ | ||
| 1063 | bp->dr->bRequestType = AUT_RREQ; | ||
| 1064 | bp->dr->bRequest = AUV_RBLOCK; | ||
| 1065 | bp->dr->wValue = cpu_to_le16 (0); | ||
| 1066 | bp->dr->wIndex = cpu_to_le16 (channelid | AUH_DIRECT | AUH_UNSPLIT); | ||
| 1067 | bp->dr->wLength = cpu_to_le16 (bytecount); | ||
| 1068 | usb_fill_control_urb (bp->urbp, cp->usbdev, usb_rcvctrlpipe (cp->usbdev, 0), | ||
| 1069 | (unsigned char*)bp->dr, bp->bufp, bytecount, | ||
| 1070 | auerswald_ctrlread_complete,bp); | ||
| 1071 | |||
| 1072 | /* submit the control msg */ | ||
| 1073 | ret = auerchain_submit_urb (&cp->controlchain, bp->urbp); | ||
| 1074 | if (ret) { | ||
| 1075 | dbg ("auerswald_int_complete: nonzero result of auerchain_submit_urb %d", ret); | ||
| 1076 | bp->urbp->status = ret; | ||
| 1077 | auerswald_ctrlread_complete( bp->urbp); | ||
| 1078 | /* here applies the same problem as above: device locking! */ | ||
| 1079 | } | ||
| 1080 | exit: | ||
| 1081 | ret = usb_submit_urb (urb, GFP_ATOMIC); | ||
| 1082 | if (ret) | ||
| 1083 | err ("%s - usb_submit_urb failed with result %d", | ||
| 1084 | __func__, ret); | ||
| 1085 | } | ||
| 1086 | |||
| 1087 | /* int memory deallocation | ||
| 1088 | NOTE: no mutex please! | ||
| 1089 | */ | ||
| 1090 | static void auerswald_int_free (pauerswald_t cp) | ||
| 1091 | { | ||
| 1092 | if (cp->inturbp) { | ||
| 1093 | usb_free_urb(cp->inturbp); | ||
| 1094 | cp->inturbp = NULL; | ||
| 1095 | } | ||
| 1096 | kfree(cp->intbufp); | ||
| 1097 | cp->intbufp = NULL; | ||
| 1098 | } | ||
| 1099 | |||
| 1100 | /* This function is called to activate the interrupt | ||
| 1101 | endpoint. This function returns 0 if successful or an error code. | ||
| 1102 | NOTE: no mutex please! | ||
| 1103 | */ | ||
| 1104 | static int auerswald_int_open (pauerswald_t cp) | ||
| 1105 | { | ||
| 1106 | int ret; | ||
| 1107 | struct usb_host_endpoint *ep; | ||
| 1108 | int irqsize; | ||
| 1109 | dbg ("auerswald_int_open"); | ||
| 1110 | |||
| 1111 | ep = cp->usbdev->ep_in[AU_IRQENDP]; | ||
| 1112 | if (!ep) { | ||
| 1113 | ret = -EFAULT; | ||
| 1114 | goto intoend; | ||
| 1115 | } | ||
| 1116 | irqsize = le16_to_cpu(ep->desc.wMaxPacketSize); | ||
| 1117 | cp->irqsize = irqsize; | ||
| 1118 | |||
| 1119 | /* allocate the urb and data buffer */ | ||
| 1120 | if (!cp->inturbp) { | ||
| 1121 | cp->inturbp = usb_alloc_urb (0, GFP_KERNEL); | ||
| 1122 | if (!cp->inturbp) { | ||
| 1123 | ret = -ENOMEM; | ||
| 1124 | goto intoend; | ||
| 1125 | } | ||
| 1126 | } | ||
| 1127 | if (!cp->intbufp) { | ||
| 1128 | cp->intbufp = kmalloc (irqsize, GFP_KERNEL); | ||
| 1129 | if (!cp->intbufp) { | ||
| 1130 | ret = -ENOMEM; | ||
| 1131 | goto intoend; | ||
| 1132 | } | ||
| 1133 | } | ||
| 1134 | /* setup urb */ | ||
| 1135 | usb_fill_int_urb (cp->inturbp, cp->usbdev, | ||
| 1136 | usb_rcvintpipe (cp->usbdev,AU_IRQENDP), cp->intbufp, | ||
| 1137 | irqsize, auerswald_int_complete, cp, ep->desc.bInterval); | ||
| 1138 | /* start the urb */ | ||
| 1139 | cp->inturbp->status = 0; /* needed! */ | ||
| 1140 | ret = usb_submit_urb (cp->inturbp, GFP_KERNEL); | ||
| 1141 | |||
| 1142 | intoend: | ||
| 1143 | if (ret < 0) { | ||
| 1144 | /* activation of interrupt endpoint has failed. Now clean up. */ | ||
| 1145 | dbg ("auerswald_int_open: activation of int endpoint failed"); | ||
| 1146 | |||
| 1147 | /* deallocate memory */ | ||
| 1148 | auerswald_int_free (cp); | ||
| 1149 | } | ||
| 1150 | return ret; | ||
| 1151 | } | ||
| 1152 | |||
| 1153 | /* This function is called to deactivate the interrupt | ||
| 1154 | endpoint. This function returns 0 if successful or an error code. | ||
| 1155 | NOTE: no mutex please! | ||
| 1156 | */ | ||
| 1157 | static void auerswald_int_release (pauerswald_t cp) | ||
| 1158 | { | ||
| 1159 | dbg ("auerswald_int_release"); | ||
| 1160 | |||
| 1161 | /* stop the int endpoint */ | ||
| 1162 | usb_kill_urb (cp->inturbp); | ||
| 1163 | |||
| 1164 | /* deallocate memory */ | ||
| 1165 | auerswald_int_free (cp); | ||
| 1166 | } | ||
| 1167 | |||
| 1168 | /* --------------------------------------------------------------------- */ | ||
| 1169 | /* Helper functions */ | ||
| 1170 | |||
| 1171 | /* wake up waiting readers */ | ||
| 1172 | static void auerchar_disconnect (pauerscon_t scp) | ||
| 1173 | { | ||
| 1174 | pauerchar_t ccp = ((pauerchar_t)((char *)(scp)-(unsigned long)(&((pauerchar_t)0)->scontext))); | ||
| 1175 | dbg ("auerchar_disconnect called"); | ||
| 1176 | ccp->removed = 1; | ||
| 1177 | wake_up (&ccp->readwait); | ||
| 1178 | } | ||
| 1179 | |||
| 1180 | |||
| 1181 | /* dispatch a read paket to a waiting character device */ | ||
| 1182 | static void auerchar_ctrlread_dispatch (pauerscon_t scp, pauerbuf_t bp) | ||
| 1183 | { | ||
| 1184 | unsigned long flags; | ||
| 1185 | pauerchar_t ccp; | ||
| 1186 | pauerbuf_t newbp = NULL; | ||
| 1187 | char * charp; | ||
| 1188 | dbg ("auerchar_ctrlread_dispatch called"); | ||
| 1189 | ccp = ((pauerchar_t)((char *)(scp)-(unsigned long)(&((pauerchar_t)0)->scontext))); | ||
| 1190 | |||
| 1191 | /* get a read buffer from character device context */ | ||
| 1192 | spin_lock_irqsave (&ccp->bufctl.lock, flags); | ||
| 1193 | if (!list_empty (&ccp->bufctl.free_buff_list)) { | ||
| 1194 | /* yes: get the entry */ | ||
| 1195 | struct list_head *tmp = ccp->bufctl.free_buff_list.next; | ||
| 1196 | list_del (tmp); | ||
| 1197 | newbp = list_entry (tmp, auerbuf_t, buff_list); | ||
| 1198 | } | ||
| 1199 | spin_unlock_irqrestore (&ccp->bufctl.lock, flags); | ||
| 1200 | |||
| 1201 | if (!newbp) { | ||
| 1202 | dbg ("No read buffer available, discard paket!"); | ||
| 1203 | return; /* no buffer, no dispatch */ | ||
| 1204 | } | ||
| 1205 | |||
| 1206 | /* copy information to new buffer element | ||
| 1207 | (all buffers have the same length) */ | ||
| 1208 | charp = newbp->bufp; | ||
| 1209 | newbp->bufp = bp->bufp; | ||
| 1210 | bp->bufp = charp; | ||
| 1211 | newbp->len = bp->len; | ||
| 1212 | |||
| 1213 | /* insert new buffer in read list */ | ||
| 1214 | spin_lock_irqsave (&ccp->bufctl.lock, flags); | ||
| 1215 | list_add_tail (&newbp->buff_list, &ccp->bufctl.rec_buff_list); | ||
| 1216 | spin_unlock_irqrestore (&ccp->bufctl.lock, flags); | ||
| 1217 | dbg ("read buffer appended to rec_list"); | ||
| 1218 | |||
| 1219 | /* wake up pending synchronous reads */ | ||
| 1220 | wake_up (&ccp->readwait); | ||
| 1221 | } | ||
| 1222 | |||
| 1223 | |||
| 1224 | /* Delete an auerswald driver context */ | ||
| 1225 | static void auerswald_delete( pauerswald_t cp) | ||
| 1226 | { | ||
| 1227 | dbg( "auerswald_delete"); | ||
| 1228 | if (cp == NULL) | ||
| 1229 | return; | ||
| 1230 | |||
| 1231 | /* Wake up all processes waiting for a buffer */ | ||
| 1232 | wake_up (&cp->bufferwait); | ||
| 1233 | |||
| 1234 | /* Cleaning up */ | ||
| 1235 | auerswald_int_release (cp); | ||
| 1236 | auerchain_free (&cp->controlchain); | ||
| 1237 | auerbuf_free_buffers (&cp->bufctl); | ||
| 1238 | |||
| 1239 | /* release the memory */ | ||
| 1240 | kfree( cp); | ||
| 1241 | } | ||
| 1242 | |||
| 1243 | |||
| 1244 | /* Delete an auerswald character context */ | ||
| 1245 | static void auerchar_delete( pauerchar_t ccp) | ||
| 1246 | { | ||
| 1247 | dbg ("auerchar_delete"); | ||
| 1248 | if (ccp == NULL) | ||
| 1249 | return; | ||
| 1250 | |||
| 1251 | /* wake up pending synchronous reads */ | ||
| 1252 | ccp->removed = 1; | ||
| 1253 | wake_up (&ccp->readwait); | ||
| 1254 | |||
| 1255 | /* remove the read buffer */ | ||
| 1256 | if (ccp->readbuf) { | ||
| 1257 | auerbuf_releasebuf (ccp->readbuf); | ||
| 1258 | ccp->readbuf = NULL; | ||
| 1259 | } | ||
| 1260 | |||
| 1261 | /* remove the character buffers */ | ||
| 1262 | auerbuf_free_buffers (&ccp->bufctl); | ||
| 1263 | |||
| 1264 | /* release the memory */ | ||
| 1265 | kfree( ccp); | ||
| 1266 | } | ||
| 1267 | |||
| 1268 | |||
| 1269 | /* add a new service to the device | ||
| 1270 | scp->id must be set! | ||
| 1271 | return: 0 if OK, else error code | ||
| 1272 | */ | ||
| 1273 | static int auerswald_addservice (pauerswald_t cp, pauerscon_t scp) | ||
| 1274 | { | ||
| 1275 | int ret; | ||
| 1276 | |||
| 1277 | /* is the device available? */ | ||
| 1278 | if (!cp->usbdev) { | ||
| 1279 | dbg ("usbdev == NULL"); | ||
| 1280 | return -EIO; /*no: can not add a service, sorry*/ | ||
| 1281 | } | ||
| 1282 | |||
| 1283 | /* is the service available? */ | ||
| 1284 | if (cp->services[scp->id]) { | ||
| 1285 | dbg ("service is busy"); | ||
| 1286 | return -EBUSY; | ||
| 1287 | } | ||
| 1288 | |||
| 1289 | /* device is available, service is free */ | ||
| 1290 | cp->services[scp->id] = scp; | ||
| 1291 | |||
| 1292 | /* register service in device */ | ||
| 1293 | ret = auerchain_control_msg( | ||
| 1294 | &cp->controlchain, /* pointer to control chain */ | ||
| 1295 | cp->usbdev, /* pointer to device */ | ||
| 1296 | usb_sndctrlpipe (cp->usbdev, 0), /* pipe to control endpoint */ | ||
| 1297 | AUV_CHANNELCTL, /* USB message request value */ | ||
| 1298 | AUT_WREQ, /* USB message request type value */ | ||
| 1299 | 0x01, /* open USB message value */ | ||
| 1300 | scp->id, /* USB message index value */ | ||
| 1301 | NULL, /* pointer to the data to send */ | ||
| 1302 | 0, /* length in bytes of the data to send */ | ||
| 1303 | HZ * 2); /* time to wait for the message to complete before timing out */ | ||
| 1304 | if (ret < 0) { | ||
| 1305 | dbg ("auerswald_addservice: auerchain_control_msg returned error code %d", ret); | ||
| 1306 | /* undo above actions */ | ||
| 1307 | cp->services[scp->id] = NULL; | ||
| 1308 | return ret; | ||
| 1309 | } | ||
| 1310 | |||
| 1311 | dbg ("auerswald_addservice: channel open OK"); | ||
| 1312 | return 0; | ||
| 1313 | } | ||
| 1314 | |||
| 1315 | |||
| 1316 | /* remove a service from the device | ||
| 1317 | scp->id must be set! */ | ||
| 1318 | static void auerswald_removeservice (pauerswald_t cp, pauerscon_t scp) | ||
| 1319 | { | ||
| 1320 | dbg ("auerswald_removeservice called"); | ||
| 1321 | |||
| 1322 | /* check if we have a service allocated */ | ||
| 1323 | if (scp->id == AUH_UNASSIGNED) | ||
| 1324 | return; | ||
| 1325 | |||
| 1326 | /* If there is a device: close the channel */ | ||
| 1327 | if (cp->usbdev) { | ||
| 1328 | /* Close the service channel inside the device */ | ||
| 1329 | int ret = auerchain_control_msg( | ||
| 1330 | &cp->controlchain, /* pointer to control chain */ | ||
| 1331 | cp->usbdev, /* pointer to device */ | ||
| 1332 | usb_sndctrlpipe (cp->usbdev, 0), /* pipe to control endpoint */ | ||
| 1333 | AUV_CHANNELCTL, /* USB message request value */ | ||
| 1334 | AUT_WREQ, /* USB message request type value */ | ||
| 1335 | 0x00, // close /* USB message value */ | ||
| 1336 | scp->id, /* USB message index value */ | ||
| 1337 | NULL, /* pointer to the data to send */ | ||
| 1338 | 0, /* length in bytes of the data to send */ | ||
| 1339 | HZ * 2); /* time to wait for the message to complete before timing out */ | ||
| 1340 | if (ret < 0) { | ||
| 1341 | dbg ("auerswald_removeservice: auerchain_control_msg returned error code %d", ret); | ||
| 1342 | } | ||
| 1343 | else { | ||
| 1344 | dbg ("auerswald_removeservice: channel close OK"); | ||
| 1345 | } | ||
| 1346 | } | ||
| 1347 | |||
| 1348 | /* remove the service from the device */ | ||
| 1349 | cp->services[scp->id] = NULL; | ||
| 1350 | scp->id = AUH_UNASSIGNED; | ||
| 1351 | } | ||
| 1352 | |||
| 1353 | |||
| 1354 | /* --------------------------------------------------------------------- */ | ||
| 1355 | /* Char device functions */ | ||
| 1356 | |||
| 1357 | /* Open a new character device */ | ||
| 1358 | static int auerchar_open (struct inode *inode, struct file *file) | ||
| 1359 | { | ||
| 1360 | int dtindex = iminor(inode); | ||
| 1361 | pauerswald_t cp = NULL; | ||
| 1362 | pauerchar_t ccp = NULL; | ||
| 1363 | struct usb_interface *intf; | ||
| 1364 | int ret; | ||
| 1365 | |||
| 1366 | /* minor number in range? */ | ||
| 1367 | if (dtindex < 0) { | ||
| 1368 | return -ENODEV; | ||
| 1369 | } | ||
| 1370 | intf = usb_find_interface(&auerswald_driver, dtindex); | ||
| 1371 | if (!intf) { | ||
| 1372 | return -ENODEV; | ||
| 1373 | } | ||
| 1374 | |||
| 1375 | /* usb device available? */ | ||
| 1376 | cp = usb_get_intfdata (intf); | ||
| 1377 | if (cp == NULL) { | ||
| 1378 | return -ENODEV; | ||
| 1379 | } | ||
| 1380 | if (mutex_lock_interruptible(&cp->mutex)) { | ||
| 1381 | return -ERESTARTSYS; | ||
| 1382 | } | ||
| 1383 | |||
| 1384 | /* we have access to the device. Now lets allocate memory */ | ||
| 1385 | ccp = kzalloc(sizeof(auerchar_t), GFP_KERNEL); | ||
| 1386 | if (ccp == NULL) { | ||
| 1387 | err ("out of memory"); | ||
| 1388 | ret = -ENOMEM; | ||
| 1389 | goto ofail; | ||
| 1390 | } | ||
| 1391 | |||
| 1392 | /* Initialize device descriptor */ | ||
| 1393 | mutex_init(&ccp->mutex); | ||
| 1394 | mutex_init(&ccp->readmutex); | ||
| 1395 | auerbuf_init (&ccp->bufctl); | ||
| 1396 | ccp->scontext.id = AUH_UNASSIGNED; | ||
| 1397 | ccp->scontext.dispatch = auerchar_ctrlread_dispatch; | ||
| 1398 | ccp->scontext.disconnect = auerchar_disconnect; | ||
| 1399 | init_waitqueue_head (&ccp->readwait); | ||
| 1400 | |||
| 1401 | ret = auerbuf_setup (&ccp->bufctl, AU_RBUFFERS, cp->maxControlLength+AUH_SIZE); | ||
| 1402 | if (ret) { | ||
| 1403 | goto ofail; | ||
| 1404 | } | ||
| 1405 | |||
| 1406 | cp->open_count++; | ||
| 1407 | ccp->auerdev = cp; | ||
| 1408 | dbg("open %s as /dev/%s", cp->dev_desc, cp->name); | ||
| 1409 | mutex_unlock(&cp->mutex); | ||
| 1410 | |||
| 1411 | /* file IO stuff */ | ||
| 1412 | file->f_pos = 0; | ||
| 1413 | file->private_data = ccp; | ||
| 1414 | return nonseekable_open(inode, file); | ||
| 1415 | |||
| 1416 | /* Error exit */ | ||
| 1417 | ofail: mutex_unlock(&cp->mutex); | ||
| 1418 | auerchar_delete (ccp); | ||
| 1419 | return ret; | ||
| 1420 | } | ||
| 1421 | |||
| 1422 | |||
| 1423 | /* IOCTL functions */ | ||
| 1424 | static long auerchar_ioctl(struct file *file, unsigned int cmd, | ||
| 1425 | unsigned long arg) | ||
| 1426 | { | ||
| 1427 | pauerchar_t ccp = (pauerchar_t) file->private_data; | ||
| 1428 | int ret = 0; | ||
| 1429 | audevinfo_t devinfo; | ||
| 1430 | pauerswald_t cp = NULL; | ||
| 1431 | unsigned int u; | ||
| 1432 | unsigned int __user *user_arg = (unsigned int __user *)arg; | ||
| 1433 | |||
| 1434 | dbg ("ioctl"); | ||
| 1435 | |||
| 1436 | /* get the mutexes */ | ||
| 1437 | if (mutex_lock_interruptible(&ccp->mutex)) { | ||
| 1438 | return -ERESTARTSYS; | ||
| 1439 | } | ||
| 1440 | cp = ccp->auerdev; | ||
| 1441 | if (!cp) { | ||
| 1442 | mutex_unlock(&ccp->mutex); | ||
| 1443 | return -ENODEV; | ||
| 1444 | } | ||
| 1445 | if (mutex_lock_interruptible(&cp->mutex)) { | ||
| 1446 | mutex_unlock(&ccp->mutex); | ||
| 1447 | return -ERESTARTSYS; | ||
| 1448 | } | ||
| 1449 | |||
| 1450 | /* Check for removal */ | ||
| 1451 | if (!cp->usbdev) { | ||
| 1452 | mutex_unlock(&cp->mutex); | ||
| 1453 | mutex_unlock(&ccp->mutex); | ||
| 1454 | return -ENODEV; | ||
| 1455 | } | ||
| 1456 | lock_kernel(); | ||
| 1457 | switch (cmd) { | ||
| 1458 | |||
| 1459 | /* return != 0 if Transmitt channel ready to send */ | ||
| 1460 | case IOCTL_AU_TXREADY: | ||
| 1461 | dbg ("IOCTL_AU_TXREADY"); | ||
| 1462 | u = ccp->auerdev | ||
| 1463 | && (ccp->scontext.id != AUH_UNASSIGNED) | ||
| 1464 | && !list_empty (&cp->bufctl.free_buff_list); | ||
| 1465 | ret = put_user (u, user_arg); | ||
| 1466 | break; | ||
| 1467 | |||
| 1468 | /* return != 0 if connected to a service channel */ | ||
| 1469 | case IOCTL_AU_CONNECT: | ||
| 1470 | dbg ("IOCTL_AU_CONNECT"); | ||
| 1471 | u = (ccp->scontext.id != AUH_UNASSIGNED); | ||
| 1472 | ret = put_user (u, user_arg); | ||
| 1473 | break; | ||
| 1474 | |||
| 1475 | /* return != 0 if Receive Data available */ | ||
| 1476 | case IOCTL_AU_RXAVAIL: | ||
| 1477 | dbg ("IOCTL_AU_RXAVAIL"); | ||
| 1478 | if (ccp->scontext.id == AUH_UNASSIGNED) { | ||
| 1479 | ret = -EIO; | ||
| 1480 | break; | ||
| 1481 | } | ||
| 1482 | u = 0; /* no data */ | ||
| 1483 | if (ccp->readbuf) { | ||
| 1484 | int restlen = ccp->readbuf->len - ccp->readoffset; | ||
| 1485 | if (restlen > 0) | ||
| 1486 | u = 1; | ||
| 1487 | } | ||
| 1488 | if (!u) { | ||
| 1489 | if (!list_empty (&ccp->bufctl.rec_buff_list)) { | ||
| 1490 | u = 1; | ||
| 1491 | } | ||
| 1492 | } | ||
| 1493 | ret = put_user (u, user_arg); | ||
| 1494 | break; | ||
| 1495 | |||
| 1496 | /* return the max. buffer length for the device */ | ||
| 1497 | case IOCTL_AU_BUFLEN: | ||
| 1498 | dbg ("IOCTL_AU_BUFLEN"); | ||
| 1499 | u = cp->maxControlLength; | ||
| 1500 | ret = put_user (u, user_arg); | ||
| 1501 | break; | ||
| 1502 | |||
| 1503 | /* requesting a service channel */ | ||
| 1504 | case IOCTL_AU_SERVREQ: | ||
| 1505 | dbg ("IOCTL_AU_SERVREQ"); | ||
| 1506 | /* requesting a service means: release the previous one first */ | ||
| 1507 | auerswald_removeservice (cp, &ccp->scontext); | ||
| 1508 | /* get the channel number */ | ||
| 1509 | ret = get_user (u, user_arg); | ||
| 1510 | if (ret) { | ||
| 1511 | break; | ||
| 1512 | } | ||
| 1513 | if ((u < AUH_FIRSTUSERCH) || (u >= AUH_TYPESIZE)) { | ||
| 1514 | ret = -EIO; | ||
| 1515 | break; | ||
| 1516 | } | ||
| 1517 | dbg ("auerchar service request parameters are ok"); | ||
| 1518 | ccp->scontext.id = u; | ||
| 1519 | |||
| 1520 | /* request the service now */ | ||
| 1521 | ret = auerswald_addservice (cp, &ccp->scontext); | ||
| 1522 | if (ret) { | ||
| 1523 | /* no: revert service entry */ | ||
| 1524 | ccp->scontext.id = AUH_UNASSIGNED; | ||
| 1525 | } | ||
| 1526 | break; | ||
| 1527 | |||
| 1528 | /* get a string descriptor for the device */ | ||
| 1529 | case IOCTL_AU_DEVINFO: | ||
| 1530 | dbg ("IOCTL_AU_DEVINFO"); | ||
| 1531 | if (copy_from_user (&devinfo, (void __user *) arg, sizeof (audevinfo_t))) { | ||
| 1532 | ret = -EFAULT; | ||
| 1533 | break; | ||
| 1534 | } | ||
| 1535 | u = strlen(cp->dev_desc)+1; | ||
| 1536 | if (u > devinfo.bsize) { | ||
| 1537 | u = devinfo.bsize; | ||
| 1538 | } | ||
| 1539 | ret = copy_to_user(devinfo.buf, cp->dev_desc, u) ? -EFAULT : 0; | ||
| 1540 | break; | ||
| 1541 | |||
| 1542 | /* get the max. string descriptor length */ | ||
| 1543 | case IOCTL_AU_SLEN: | ||
| 1544 | dbg ("IOCTL_AU_SLEN"); | ||
| 1545 | u = AUSI_DLEN; | ||
| 1546 | ret = put_user (u, user_arg); | ||
| 1547 | break; | ||
| 1548 | |||
| 1549 | default: | ||
| 1550 | dbg ("IOCTL_AU_UNKNOWN"); | ||
| 1551 | ret = -ENOTTY; | ||
| 1552 | break; | ||
| 1553 | } | ||
| 1554 | unlock_kernel(); | ||
| 1555 | /* release the mutexes */ | ||
| 1556 | mutex_unlock(&cp->mutex); | ||
| 1557 | mutex_unlock(&ccp->mutex); | ||
| 1558 | return ret; | ||
| 1559 | } | ||
| 1560 | |||
| 1561 | /* Read data from the device */ | ||
| 1562 | static ssize_t auerchar_read (struct file *file, char __user *buf, size_t count, loff_t * ppos) | ||
| 1563 | { | ||
| 1564 | unsigned long flags; | ||
| 1565 | pauerchar_t ccp = (pauerchar_t) file->private_data; | ||
| 1566 | pauerbuf_t bp = NULL; | ||
| 1567 | wait_queue_t wait; | ||
| 1568 | |||
| 1569 | dbg ("auerchar_read"); | ||
| 1570 | |||
| 1571 | /* Error checking */ | ||
| 1572 | if (!ccp) | ||
| 1573 | return -EIO; | ||
| 1574 | if (*ppos) | ||
| 1575 | return -ESPIPE; | ||
| 1576 | if (count == 0) | ||
| 1577 | return 0; | ||
| 1578 | |||
| 1579 | /* get the mutex */ | ||
| 1580 | if (mutex_lock_interruptible(&ccp->mutex)) | ||
| 1581 | return -ERESTARTSYS; | ||
| 1582 | |||
| 1583 | /* Can we expect to read something? */ | ||
| 1584 | if (ccp->scontext.id == AUH_UNASSIGNED) { | ||
| 1585 | mutex_unlock(&ccp->mutex); | ||
| 1586 | return -EIO; | ||
| 1587 | } | ||
| 1588 | |||
| 1589 | /* only one reader per device allowed */ | ||
| 1590 | if (mutex_lock_interruptible(&ccp->readmutex)) { | ||
| 1591 | mutex_unlock(&ccp->mutex); | ||
| 1592 | return -ERESTARTSYS; | ||
| 1593 | } | ||
| 1594 | |||
| 1595 | /* read data from readbuf, if available */ | ||
| 1596 | doreadbuf: | ||
| 1597 | bp = ccp->readbuf; | ||
| 1598 | if (bp) { | ||
| 1599 | /* read the maximum bytes */ | ||
| 1600 | int restlen = bp->len - ccp->readoffset; | ||
| 1601 | if (restlen < 0) | ||
| 1602 | restlen = 0; | ||
| 1603 | if (count > restlen) | ||
| 1604 | count = restlen; | ||
| 1605 | if (count) { | ||
| 1606 | if (copy_to_user (buf, bp->bufp+ccp->readoffset, count)) { | ||
| 1607 | dbg ("auerswald_read: copy_to_user failed"); | ||
| 1608 | mutex_unlock(&ccp->readmutex); | ||
| 1609 | mutex_unlock(&ccp->mutex); | ||
| 1610 | return -EFAULT; | ||
| 1611 | } | ||
| 1612 | } | ||
| 1613 | /* advance the read offset */ | ||
| 1614 | ccp->readoffset += count; | ||
| 1615 | restlen -= count; | ||
| 1616 | // reuse the read buffer | ||
| 1617 | if (restlen <= 0) { | ||
| 1618 | auerbuf_releasebuf (bp); | ||
| 1619 | ccp->readbuf = NULL; | ||
| 1620 | } | ||
| 1621 | /* return with number of bytes read */ | ||
| 1622 | if (count) { | ||
| 1623 | mutex_unlock(&ccp->readmutex); | ||
| 1624 | mutex_unlock(&ccp->mutex); | ||
| 1625 | return count; | ||
| 1626 | } | ||
| 1627 | } | ||
| 1628 | |||
| 1629 | /* a read buffer is not available. Try to get the next data block. */ | ||
| 1630 | doreadlist: | ||
| 1631 | /* Preparing for sleep */ | ||
| 1632 | init_waitqueue_entry (&wait, current); | ||
| 1633 | set_current_state (TASK_INTERRUPTIBLE); | ||
| 1634 | add_wait_queue (&ccp->readwait, &wait); | ||
| 1635 | |||
| 1636 | bp = NULL; | ||
| 1637 | spin_lock_irqsave (&ccp->bufctl.lock, flags); | ||
| 1638 | if (!list_empty (&ccp->bufctl.rec_buff_list)) { | ||
| 1639 | /* yes: get the entry */ | ||
| 1640 | struct list_head *tmp = ccp->bufctl.rec_buff_list.next; | ||
| 1641 | list_del (tmp); | ||
| 1642 | bp = list_entry (tmp, auerbuf_t, buff_list); | ||
| 1643 | } | ||
| 1644 | spin_unlock_irqrestore (&ccp->bufctl.lock, flags); | ||
| 1645 | |||
| 1646 | /* have we got data? */ | ||
| 1647 | if (bp) { | ||
| 1648 | ccp->readbuf = bp; | ||
| 1649 | ccp->readoffset = AUH_SIZE; /* for headerbyte */ | ||
| 1650 | set_current_state (TASK_RUNNING); | ||
| 1651 | remove_wait_queue (&ccp->readwait, &wait); | ||
| 1652 | goto doreadbuf; /* now we can read! */ | ||
| 1653 | } | ||
| 1654 | |||
| 1655 | /* no data available. Should we wait? */ | ||
| 1656 | if (file->f_flags & O_NONBLOCK) { | ||
| 1657 | dbg ("No read buffer available, returning -EAGAIN"); | ||
| 1658 | set_current_state (TASK_RUNNING); | ||
| 1659 | remove_wait_queue (&ccp->readwait, &wait); | ||
| 1660 | mutex_unlock(&ccp->readmutex); | ||
| 1661 | mutex_unlock(&ccp->mutex); | ||
| 1662 | return -EAGAIN; /* nonblocking, no data available */ | ||
| 1663 | } | ||
| 1664 | |||
| 1665 | /* yes, we should wait! */ | ||
| 1666 | mutex_unlock(&ccp->mutex); /* allow other operations while we wait */ | ||
| 1667 | schedule(); | ||
| 1668 | remove_wait_queue (&ccp->readwait, &wait); | ||
| 1669 | if (signal_pending (current)) { | ||
| 1670 | /* waked up by a signal */ | ||
| 1671 | mutex_unlock(&ccp->readmutex); | ||
| 1672 | return -ERESTARTSYS; | ||
| 1673 | } | ||
| 1674 | |||
| 1675 | /* Anything left to read? */ | ||
| 1676 | if ((ccp->scontext.id == AUH_UNASSIGNED) || ccp->removed) { | ||
| 1677 | mutex_unlock(&ccp->readmutex); | ||
| 1678 | return -EIO; | ||
| 1679 | } | ||
| 1680 | |||
| 1681 | if (mutex_lock_interruptible(&ccp->mutex)) { | ||
| 1682 | mutex_unlock(&ccp->readmutex); | ||
| 1683 | return -ERESTARTSYS; | ||
| 1684 | } | ||
| 1685 | |||
| 1686 | /* try to read the incoming data again */ | ||
| 1687 | goto doreadlist; | ||
| 1688 | } | ||
| 1689 | |||
| 1690 | |||
| 1691 | /* Write a data block into the right service channel of the device */ | ||
| 1692 | static ssize_t auerchar_write (struct file *file, const char __user *buf, size_t len, loff_t *ppos) | ||
| 1693 | { | ||
| 1694 | pauerchar_t ccp = (pauerchar_t) file->private_data; | ||
| 1695 | pauerswald_t cp = NULL; | ||
| 1696 | pauerbuf_t bp; | ||
| 1697 | unsigned long flags; | ||
| 1698 | int ret; | ||
| 1699 | wait_queue_t wait; | ||
| 1700 | |||
| 1701 | dbg ("auerchar_write %zd bytes", len); | ||
| 1702 | |||
| 1703 | /* Error checking */ | ||
| 1704 | if (!ccp) | ||
| 1705 | return -EIO; | ||
| 1706 | if (*ppos) | ||
| 1707 | return -ESPIPE; | ||
| 1708 | if (len == 0) | ||
| 1709 | return 0; | ||
| 1710 | |||
| 1711 | write_again: | ||
| 1712 | /* get the mutex */ | ||
| 1713 | if (mutex_lock_interruptible(&ccp->mutex)) | ||
| 1714 | return -ERESTARTSYS; | ||
| 1715 | |||
| 1716 | /* Can we expect to write something? */ | ||
| 1717 | if (ccp->scontext.id == AUH_UNASSIGNED) { | ||
| 1718 | mutex_unlock(&ccp->mutex); | ||
| 1719 | return -EIO; | ||
| 1720 | } | ||
| 1721 | |||
| 1722 | cp = ccp->auerdev; | ||
| 1723 | if (!cp) { | ||
| 1724 | mutex_unlock(&ccp->mutex); | ||
| 1725 | return -ERESTARTSYS; | ||
| 1726 | } | ||
| 1727 | if (mutex_lock_interruptible(&cp->mutex)) { | ||
| 1728 | mutex_unlock(&ccp->mutex); | ||
| 1729 | return -ERESTARTSYS; | ||
| 1730 | } | ||
| 1731 | if (!cp->usbdev) { | ||
| 1732 | mutex_unlock(&cp->mutex); | ||
| 1733 | mutex_unlock(&ccp->mutex); | ||
| 1734 | return -EIO; | ||
| 1735 | } | ||
| 1736 | /* Prepare for sleep */ | ||
| 1737 | init_waitqueue_entry (&wait, current); | ||
| 1738 | set_current_state (TASK_INTERRUPTIBLE); | ||
| 1739 | add_wait_queue (&cp->bufferwait, &wait); | ||
| 1740 | |||
| 1741 | /* Try to get a buffer from the device pool. | ||
| 1742 | We can't use a buffer from ccp->bufctl because the write | ||
| 1743 | command will last beond a release() */ | ||
| 1744 | bp = NULL; | ||
| 1745 | spin_lock_irqsave (&cp->bufctl.lock, flags); | ||
| 1746 | if (!list_empty (&cp->bufctl.free_buff_list)) { | ||
| 1747 | /* yes: get the entry */ | ||
| 1748 | struct list_head *tmp = cp->bufctl.free_buff_list.next; | ||
| 1749 | list_del (tmp); | ||
| 1750 | bp = list_entry (tmp, auerbuf_t, buff_list); | ||
| 1751 | } | ||
| 1752 | spin_unlock_irqrestore (&cp->bufctl.lock, flags); | ||
| 1753 | |||
| 1754 | /* are there any buffers left? */ | ||
| 1755 | if (!bp) { | ||
| 1756 | mutex_unlock(&cp->mutex); | ||
| 1757 | mutex_unlock(&ccp->mutex); | ||
| 1758 | |||
| 1759 | /* NONBLOCK: don't wait */ | ||
| 1760 | if (file->f_flags & O_NONBLOCK) { | ||
| 1761 | set_current_state (TASK_RUNNING); | ||
| 1762 | remove_wait_queue (&cp->bufferwait, &wait); | ||
| 1763 | return -EAGAIN; | ||
| 1764 | } | ||
| 1765 | |||
| 1766 | /* BLOCKING: wait */ | ||
| 1767 | schedule(); | ||
| 1768 | remove_wait_queue (&cp->bufferwait, &wait); | ||
| 1769 | if (signal_pending (current)) { | ||
| 1770 | /* waked up by a signal */ | ||
| 1771 | return -ERESTARTSYS; | ||
| 1772 | } | ||
| 1773 | goto write_again; | ||
| 1774 | } else { | ||
| 1775 | set_current_state (TASK_RUNNING); | ||
| 1776 | remove_wait_queue (&cp->bufferwait, &wait); | ||
| 1777 | } | ||
| 1778 | |||
| 1779 | /* protect against too big write requests */ | ||
| 1780 | if (len > cp->maxControlLength) | ||
| 1781 | len = cp->maxControlLength; | ||
| 1782 | |||
| 1783 | /* Fill the buffer */ | ||
| 1784 | if (copy_from_user ( bp->bufp+AUH_SIZE, buf, len)) { | ||
| 1785 | dbg ("copy_from_user failed"); | ||
| 1786 | auerbuf_releasebuf (bp); | ||
| 1787 | /* Wake up all processes waiting for a buffer */ | ||
| 1788 | wake_up (&cp->bufferwait); | ||
| 1789 | mutex_unlock(&cp->mutex); | ||
| 1790 | mutex_unlock(&ccp->mutex); | ||
| 1791 | return -EFAULT; | ||
| 1792 | } | ||
| 1793 | |||
| 1794 | /* set the header byte */ | ||
| 1795 | *(bp->bufp) = ccp->scontext.id | AUH_DIRECT | AUH_UNSPLIT; | ||
| 1796 | |||
| 1797 | /* Set the transfer Parameters */ | ||
| 1798 | bp->len = len+AUH_SIZE; | ||
| 1799 | bp->dr->bRequestType = AUT_WREQ; | ||
| 1800 | bp->dr->bRequest = AUV_WBLOCK; | ||
| 1801 | bp->dr->wValue = cpu_to_le16 (0); | ||
| 1802 | bp->dr->wIndex = cpu_to_le16 (ccp->scontext.id | AUH_DIRECT | AUH_UNSPLIT); | ||
| 1803 | bp->dr->wLength = cpu_to_le16 (len+AUH_SIZE); | ||
| 1804 | usb_fill_control_urb (bp->urbp, cp->usbdev, usb_sndctrlpipe (cp->usbdev, 0), | ||
| 1805 | (unsigned char*)bp->dr, bp->bufp, len+AUH_SIZE, | ||
| 1806 | auerchar_ctrlwrite_complete, bp); | ||
| 1807 | /* up we go */ | ||
| 1808 | ret = auerchain_submit_urb (&cp->controlchain, bp->urbp); | ||
| 1809 | mutex_unlock(&cp->mutex); | ||
| 1810 | if (ret) { | ||
| 1811 | dbg ("auerchar_write: nonzero result of auerchain_submit_urb %d", ret); | ||
| 1812 | auerbuf_releasebuf (bp); | ||
| 1813 | /* Wake up all processes waiting for a buffer */ | ||
| 1814 | wake_up (&cp->bufferwait); | ||
| 1815 | mutex_unlock(&ccp->mutex); | ||
| 1816 | return -EIO; | ||
| 1817 | } | ||
| 1818 | else { | ||
| 1819 | dbg ("auerchar_write: Write OK"); | ||
| 1820 | mutex_unlock(&ccp->mutex); | ||
| 1821 | return len; | ||
| 1822 | } | ||
| 1823 | } | ||
| 1824 | |||
| 1825 | |||
| 1826 | /* Close a character device */ | ||
| 1827 | static int auerchar_release (struct inode *inode, struct file *file) | ||
| 1828 | { | ||
| 1829 | pauerchar_t ccp = (pauerchar_t) file->private_data; | ||
| 1830 | pauerswald_t cp; | ||
| 1831 | dbg("release"); | ||
| 1832 | |||
| 1833 | mutex_lock(&ccp->mutex); | ||
| 1834 | cp = ccp->auerdev; | ||
| 1835 | if (cp) { | ||
| 1836 | mutex_lock(&cp->mutex); | ||
| 1837 | /* remove an open service */ | ||
| 1838 | auerswald_removeservice (cp, &ccp->scontext); | ||
| 1839 | /* detach from device */ | ||
| 1840 | if ((--cp->open_count <= 0) && (cp->usbdev == NULL)) { | ||
| 1841 | /* usb device waits for removal */ | ||
| 1842 | mutex_unlock(&cp->mutex); | ||
| 1843 | auerswald_delete (cp); | ||
| 1844 | } else { | ||
| 1845 | mutex_unlock(&cp->mutex); | ||
| 1846 | } | ||
| 1847 | cp = NULL; | ||
| 1848 | ccp->auerdev = NULL; | ||
| 1849 | } | ||
| 1850 | mutex_unlock(&ccp->mutex); | ||
| 1851 | auerchar_delete (ccp); | ||
| 1852 | |||
| 1853 | return 0; | ||
| 1854 | } | ||
| 1855 | |||
| 1856 | |||
| 1857 | /*----------------------------------------------------------------------*/ | ||
| 1858 | /* File operation structure */ | ||
| 1859 | static const struct file_operations auerswald_fops = | ||
| 1860 | { | ||
| 1861 | .owner = THIS_MODULE, | ||
| 1862 | .llseek = no_llseek, | ||
| 1863 | .read = auerchar_read, | ||
| 1864 | .write = auerchar_write, | ||
| 1865 | .unlocked_ioctl = auerchar_ioctl, | ||
| 1866 | .open = auerchar_open, | ||
| 1867 | .release = auerchar_release, | ||
| 1868 | }; | ||
| 1869 | |||
| 1870 | static struct usb_class_driver auerswald_class = { | ||
| 1871 | .name = "auer%d", | ||
| 1872 | .fops = &auerswald_fops, | ||
| 1873 | .minor_base = AUER_MINOR_BASE, | ||
| 1874 | }; | ||
| 1875 | |||
| 1876 | |||
| 1877 | /* --------------------------------------------------------------------- */ | ||
| 1878 | /* Special USB driver functions */ | ||
| 1879 | |||
| 1880 | /* Probe if this driver wants to serve an USB device | ||
| 1881 | |||
| 1882 | This entry point is called whenever a new device is attached to the bus. | ||
| 1883 | Then the device driver has to create a new instance of its internal data | ||
| 1884 | structures for the new device. | ||
| 1885 | |||
| 1886 | The dev argument specifies the device context, which contains pointers | ||
| 1887 | to all USB descriptors. The interface argument specifies the interface | ||
| 1888 | number. If a USB driver wants to bind itself to a particular device and | ||
| 1889 | interface it has to return a pointer. This pointer normally references | ||
| 1890 | the device driver's context structure. | ||
| 1891 | |||
| 1892 | Probing normally is done by checking the vendor and product identifications | ||
| 1893 | or the class and subclass definitions. If they match the interface number | ||
| 1894 | is compared with the ones supported by the driver. When probing is done | ||
| 1895 | class based it might be necessary to parse some more USB descriptors because | ||
| 1896 | the device properties can differ in a wide range. | ||
| 1897 | */ | ||
| 1898 | static int auerswald_probe (struct usb_interface *intf, | ||
| 1899 | const struct usb_device_id *id) | ||
| 1900 | { | ||
| 1901 | struct usb_device *usbdev = interface_to_usbdev(intf); | ||
| 1902 | pauerswald_t cp = NULL; | ||
| 1903 | unsigned int u = 0; | ||
| 1904 | __le16 *pbuf; | ||
| 1905 | int ret; | ||
| 1906 | |||
| 1907 | dbg ("probe: vendor id 0x%x, device id 0x%x", | ||
| 1908 | le16_to_cpu(usbdev->descriptor.idVendor), | ||
| 1909 | le16_to_cpu(usbdev->descriptor.idProduct)); | ||
| 1910 | |||
| 1911 | /* we use only the first -and only- interface */ | ||
| 1912 | if (intf->altsetting->desc.bInterfaceNumber != 0) | ||
| 1913 | return -ENODEV; | ||
| 1914 | |||
| 1915 | /* allocate memory for our device and initialize it */ | ||
| 1916 | cp = kzalloc (sizeof(auerswald_t), GFP_KERNEL); | ||
| 1917 | if (cp == NULL) { | ||
| 1918 | err ("out of memory"); | ||
| 1919 | goto pfail; | ||
| 1920 | } | ||
| 1921 | |||
| 1922 | /* Initialize device descriptor */ | ||
| 1923 | mutex_init(&cp->mutex); | ||
| 1924 | cp->usbdev = usbdev; | ||
| 1925 | auerchain_init (&cp->controlchain); | ||
| 1926 | auerbuf_init (&cp->bufctl); | ||
| 1927 | init_waitqueue_head (&cp->bufferwait); | ||
| 1928 | |||
| 1929 | ret = usb_register_dev(intf, &auerswald_class); | ||
| 1930 | if (ret) { | ||
| 1931 | err ("Not able to get a minor for this device."); | ||
| 1932 | goto pfail; | ||
| 1933 | } | ||
| 1934 | |||
| 1935 | /* Give the device a name */ | ||
| 1936 | sprintf (cp->name, "usb/auer%d", intf->minor); | ||
| 1937 | |||
| 1938 | /* Store the index */ | ||
| 1939 | cp->dtindex = intf->minor; | ||
| 1940 | |||
| 1941 | /* Get the usb version of the device */ | ||
| 1942 | cp->version = le16_to_cpu(cp->usbdev->descriptor.bcdDevice); | ||
| 1943 | dbg ("Version is %X", cp->version); | ||
| 1944 | |||
| 1945 | /* allow some time to settle the device */ | ||
| 1946 | msleep(334); | ||
| 1947 | |||
| 1948 | /* Try to get a suitable textual description of the device */ | ||
| 1949 | /* Device name:*/ | ||
| 1950 | ret = usb_string( cp->usbdev, AUSI_DEVICE, cp->dev_desc, AUSI_DLEN-1); | ||
| 1951 | if (ret >= 0) { | ||
| 1952 | u += ret; | ||
| 1953 | /* Append Serial Number */ | ||
| 1954 | memcpy(&cp->dev_desc[u], ",Ser# ", 6); | ||
| 1955 | u += 6; | ||
| 1956 | ret = usb_string( cp->usbdev, AUSI_SERIALNR, &cp->dev_desc[u], AUSI_DLEN-u-1); | ||
| 1957 | if (ret >= 0) { | ||
| 1958 | u += ret; | ||
| 1959 | /* Append subscriber number */ | ||
| 1960 | memcpy(&cp->dev_desc[u], ", ", 2); | ||
| 1961 | u += 2; | ||
| 1962 | ret = usb_string( cp->usbdev, AUSI_MSN, &cp->dev_desc[u], AUSI_DLEN-u-1); | ||
| 1963 | if (ret >= 0) { | ||
| 1964 | u += ret; | ||
| 1965 | } | ||
| 1966 | } | ||
| 1967 | } | ||
| 1968 | cp->dev_desc[u] = '\0'; | ||
| 1969 | info("device is a %s", cp->dev_desc); | ||
| 1970 | |||
| 1971 | /* get the maximum allowed control transfer length */ | ||
| 1972 | pbuf = kmalloc(2, GFP_KERNEL); /* use an allocated buffer because of urb target */ | ||
| 1973 | if (!pbuf) { | ||
| 1974 | err( "out of memory"); | ||
| 1975 | goto pfail; | ||
| 1976 | } | ||
| 1977 | ret = usb_control_msg(cp->usbdev, /* pointer to device */ | ||
| 1978 | usb_rcvctrlpipe( cp->usbdev, 0 ), /* pipe to control endpoint */ | ||
| 1979 | AUV_GETINFO, /* USB message request value */ | ||
| 1980 | AUT_RREQ, /* USB message request type value */ | ||
| 1981 | 0, /* USB message value */ | ||
| 1982 | AUDI_MBCTRANS, /* USB message index value */ | ||
| 1983 | pbuf, /* pointer to the receive buffer */ | ||
| 1984 | 2, /* length of the buffer */ | ||
| 1985 | 2000); /* time to wait for the message to complete before timing out */ | ||
| 1986 | if (ret == 2) { | ||
| 1987 | cp->maxControlLength = le16_to_cpup(pbuf); | ||
| 1988 | kfree(pbuf); | ||
| 1989 | dbg("setup: max. allowed control transfersize is %d bytes", cp->maxControlLength); | ||
| 1990 | } else { | ||
| 1991 | kfree(pbuf); | ||
| 1992 | err("setup: getting max. allowed control transfer length failed with error %d", ret); | ||
| 1993 | goto pfail; | ||
| 1994 | } | ||
| 1995 | |||
| 1996 | /* allocate a chain for the control messages */ | ||
| 1997 | if (auerchain_setup (&cp->controlchain, AUCH_ELEMENTS)) { | ||
| 1998 | err ("out of memory"); | ||
| 1999 | goto pfail; | ||
| 2000 | } | ||
| 2001 | |||
| 2002 | /* allocate buffers for control messages */ | ||
| 2003 | if (auerbuf_setup (&cp->bufctl, AU_RBUFFERS, cp->maxControlLength+AUH_SIZE)) { | ||
| 2004 | err ("out of memory"); | ||
| 2005 | goto pfail; | ||
| 2006 | } | ||
| 2007 | |||
| 2008 | /* start the interrupt endpoint */ | ||
| 2009 | if (auerswald_int_open (cp)) { | ||
| 2010 | err ("int endpoint failed"); | ||
| 2011 | goto pfail; | ||
| 2012 | } | ||
| 2013 | |||
| 2014 | /* all OK */ | ||
| 2015 | usb_set_intfdata (intf, cp); | ||
| 2016 | return 0; | ||
| 2017 | |||
| 2018 | /* Error exit: clean up the memory */ | ||
| 2019 | pfail: auerswald_delete (cp); | ||
| 2020 | return -EIO; | ||
| 2021 | } | ||
| 2022 | |||
| 2023 | |||
| 2024 | /* Disconnect driver from a served device | ||
| 2025 | |||
| 2026 | This function is called whenever a device which was served by this driver | ||
| 2027 | is disconnected. | ||
| 2028 | |||
| 2029 | The argument dev specifies the device context and the driver_context | ||
| 2030 | returns a pointer to the previously registered driver_context of the | ||
| 2031 | probe function. After returning from the disconnect function the USB | ||
| 2032 | framework completely deallocates all data structures associated with | ||
| 2033 | this device. So especially the usb_device structure must not be used | ||
| 2034 | any longer by the usb driver. | ||
| 2035 | */ | ||
| 2036 | static void auerswald_disconnect (struct usb_interface *intf) | ||
| 2037 | { | ||
| 2038 | pauerswald_t cp = usb_get_intfdata (intf); | ||
| 2039 | unsigned int u; | ||
| 2040 | |||
| 2041 | usb_set_intfdata (intf, NULL); | ||
| 2042 | if (!cp) | ||
| 2043 | return; | ||
| 2044 | |||
| 2045 | /* give back our USB minor number */ | ||
| 2046 | usb_deregister_dev(intf, &auerswald_class); | ||
| 2047 | |||
| 2048 | mutex_lock(&cp->mutex); | ||
| 2049 | info ("device /dev/%s now disconnecting", cp->name); | ||
| 2050 | |||
| 2051 | /* Stop the interrupt endpoint */ | ||
| 2052 | auerswald_int_release (cp); | ||
| 2053 | |||
| 2054 | /* remove the control chain allocated in auerswald_probe | ||
| 2055 | This has the benefit of | ||
| 2056 | a) all pending (a)synchronous urbs are unlinked | ||
| 2057 | b) all buffers dealing with urbs are reclaimed | ||
| 2058 | */ | ||
| 2059 | auerchain_free (&cp->controlchain); | ||
| 2060 | |||
| 2061 | if (cp->open_count == 0) { | ||
| 2062 | /* nobody is using this device. So we can clean up now */ | ||
| 2063 | mutex_unlock(&cp->mutex); | ||
| 2064 | /* mutex_unlock() is possible here because no other task | ||
| 2065 | can open the device (see above). I don't want | ||
| 2066 | to kfree() a locked mutex. */ | ||
| 2067 | |||
| 2068 | auerswald_delete (cp); | ||
| 2069 | } else { | ||
| 2070 | /* device is used. Remove the pointer to the | ||
| 2071 | usb device (it's not valid any more). The last | ||
| 2072 | release() will do the clean up */ | ||
| 2073 | cp->usbdev = NULL; | ||
| 2074 | mutex_unlock(&cp->mutex); | ||
| 2075 | /* Terminate waiting writers */ | ||
| 2076 | wake_up (&cp->bufferwait); | ||
| 2077 | /* Inform all waiting readers */ | ||
| 2078 | for ( u = 0; u < AUH_TYPESIZE; u++) { | ||
| 2079 | pauerscon_t scp = cp->services[u]; | ||
| 2080 | if (scp) | ||
| 2081 | scp->disconnect( scp); | ||
| 2082 | } | ||
| 2083 | } | ||
| 2084 | } | ||
| 2085 | |||
| 2086 | /* Descriptor for the devices which are served by this driver. | ||
| 2087 | NOTE: this struct is parsed by the usbmanager install scripts. | ||
| 2088 | Don't change without caution! | ||
| 2089 | */ | ||
| 2090 | static struct usb_device_id auerswald_ids [] = { | ||
| 2091 | { USB_DEVICE (ID_AUERSWALD, 0x00C0) }, /* COMpact 2104 USB */ | ||
| 2092 | { USB_DEVICE (ID_AUERSWALD, 0x00DB) }, /* COMpact 4410/2206 USB */ | ||
| 2093 | { USB_DEVICE (ID_AUERSWALD, 0x00DC) }, /* COMpact 4406 DSL */ | ||
| 2094 | { USB_DEVICE (ID_AUERSWALD, 0x00DD) }, /* COMpact 2204 USB */ | ||
| 2095 | { USB_DEVICE (ID_AUERSWALD, 0x00F1) }, /* Comfort 2000 System Telephone */ | ||
| 2096 | { USB_DEVICE (ID_AUERSWALD, 0x00F2) }, /* Comfort 1200 System Telephone */ | ||
| 2097 | { } /* Terminating entry */ | ||
| 2098 | }; | ||
| 2099 | |||
| 2100 | /* Standard module device table */ | ||
| 2101 | MODULE_DEVICE_TABLE (usb, auerswald_ids); | ||
| 2102 | |||
| 2103 | /* Standard usb driver struct */ | ||
| 2104 | static struct usb_driver auerswald_driver = { | ||
| 2105 | .name = "auerswald", | ||
| 2106 | .probe = auerswald_probe, | ||
| 2107 | .disconnect = auerswald_disconnect, | ||
| 2108 | .id_table = auerswald_ids, | ||
| 2109 | }; | ||
| 2110 | |||
| 2111 | |||
| 2112 | /* --------------------------------------------------------------------- */ | ||
| 2113 | /* Module loading/unloading */ | ||
| 2114 | |||
| 2115 | /* Driver initialisation. Called after module loading. | ||
| 2116 | NOTE: there is no concurrency at _init | ||
| 2117 | */ | ||
| 2118 | static int __init auerswald_init (void) | ||
| 2119 | { | ||
| 2120 | int result; | ||
| 2121 | dbg ("init"); | ||
| 2122 | |||
| 2123 | /* register driver at the USB subsystem */ | ||
| 2124 | result = usb_register (&auerswald_driver); | ||
| 2125 | if (result < 0) { | ||
| 2126 | err ("driver could not be registered"); | ||
| 2127 | return -1; | ||
| 2128 | } | ||
| 2129 | return 0; | ||
| 2130 | } | ||
| 2131 | |||
| 2132 | /* Driver deinit. Called before module removal. | ||
| 2133 | NOTE: there is no concurrency at _cleanup | ||
| 2134 | */ | ||
| 2135 | static void __exit auerswald_cleanup (void) | ||
| 2136 | { | ||
| 2137 | dbg ("cleanup"); | ||
| 2138 | usb_deregister (&auerswald_driver); | ||
| 2139 | } | ||
| 2140 | |||
| 2141 | /* --------------------------------------------------------------------- */ | ||
| 2142 | /* Linux device driver module description */ | ||
| 2143 | |||
| 2144 | MODULE_AUTHOR (DRIVER_AUTHOR); | ||
| 2145 | MODULE_DESCRIPTION (DRIVER_DESC); | ||
| 2146 | MODULE_LICENSE ("GPL"); | ||
| 2147 | |||
| 2148 | module_init (auerswald_init); | ||
| 2149 | module_exit (auerswald_cleanup); | ||
| 2150 | |||
| 2151 | /* --------------------------------------------------------------------- */ | ||
| 2152 | |||
diff --git a/drivers/usb/misc/iowarrior.c b/drivers/usb/misc/iowarrior.c index e6ca9979e3ae..a4ef77ef917d 100644 --- a/drivers/usb/misc/iowarrior.c +++ b/drivers/usb/misc/iowarrior.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #include <linux/slab.h> | 19 | #include <linux/slab.h> |
| 20 | #include <linux/sched.h> | 20 | #include <linux/sched.h> |
| 21 | #include <linux/poll.h> | 21 | #include <linux/poll.h> |
| 22 | #include <linux/version.h> | ||
| 23 | #include <linux/usb/iowarrior.h> | 22 | #include <linux/usb/iowarrior.h> |
| 24 | 23 | ||
| 25 | /* Version Information */ | 24 | /* Version Information */ |
diff --git a/drivers/usb/misc/isight_firmware.c b/drivers/usb/misc/isight_firmware.c index d94aa7387608..b897f6554ecd 100644 --- a/drivers/usb/misc/isight_firmware.c +++ b/drivers/usb/misc/isight_firmware.c | |||
| @@ -48,7 +48,8 @@ static int isight_firmware_load(struct usb_interface *intf, | |||
| 48 | 48 | ||
| 49 | if (request_firmware(&firmware, "isight.fw", &dev->dev) != 0) { | 49 | if (request_firmware(&firmware, "isight.fw", &dev->dev) != 0) { |
| 50 | printk(KERN_ERR "Unable to load isight firmware\n"); | 50 | printk(KERN_ERR "Unable to load isight firmware\n"); |
| 51 | return -ENODEV; | 51 | ret = -ENODEV; |
| 52 | goto out; | ||
| 52 | } | 53 | } |
| 53 | 54 | ||
| 54 | ptr = firmware->data; | 55 | ptr = firmware->data; |
| @@ -91,7 +92,6 @@ static int isight_firmware_load(struct usb_interface *intf, | |||
| 91 | buf, llen, 300) != llen) { | 92 | buf, llen, 300) != llen) { |
| 92 | printk(KERN_ERR | 93 | printk(KERN_ERR |
| 93 | "Failed to load isight firmware\n"); | 94 | "Failed to load isight firmware\n"); |
| 94 | kfree(buf); | ||
| 95 | ret = -ENODEV; | 95 | ret = -ENODEV; |
| 96 | goto out; | 96 | goto out; |
| 97 | } | 97 | } |
diff --git a/drivers/usb/misc/sisusbvga/sisusb.c b/drivers/usb/misc/sisusbvga/sisusb.c index fbace41a7cba..69c34a58e205 100644 --- a/drivers/usb/misc/sisusbvga/sisusb.c +++ b/drivers/usb/misc/sisusbvga/sisusb.c | |||
| @@ -3270,6 +3270,7 @@ static struct usb_device_id sisusb_table [] = { | |||
| 3270 | { USB_DEVICE(0x0711, 0x0900) }, | 3270 | { USB_DEVICE(0x0711, 0x0900) }, |
| 3271 | { USB_DEVICE(0x0711, 0x0901) }, | 3271 | { USB_DEVICE(0x0711, 0x0901) }, |
| 3272 | { USB_DEVICE(0x0711, 0x0902) }, | 3272 | { USB_DEVICE(0x0711, 0x0902) }, |
| 3273 | { USB_DEVICE(0x0711, 0x0918) }, | ||
| 3273 | { USB_DEVICE(0x182d, 0x021c) }, | 3274 | { USB_DEVICE(0x182d, 0x021c) }, |
| 3274 | { USB_DEVICE(0x182d, 0x0269) }, | 3275 | { USB_DEVICE(0x182d, 0x0269) }, |
| 3275 | { } | 3276 | { } |
diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig new file mode 100644 index 000000000000..a0017486ad4e --- /dev/null +++ b/drivers/usb/musb/Kconfig | |||
| @@ -0,0 +1,175 @@ | |||
| 1 | # | ||
| 2 | # USB Dual Role (OTG-ready) Controller Drivers | ||
| 3 | # for silicon based on Mentor Graphics INVENTRA designs | ||
| 4 | # | ||
| 5 | |||
| 6 | comment "Enable Host or Gadget support to see Inventra options" | ||
| 7 | depends on !USB && USB_GADGET=n | ||
| 8 | |||
| 9 | # (M)HDRC = (Multipoint) Highspeed Dual-Role Controller | ||
| 10 | config USB_MUSB_HDRC | ||
| 11 | depends on (USB || USB_GADGET) && HAVE_CLK | ||
| 12 | select TWL4030_USB if MACH_OMAP_3430SDP | ||
| 13 | tristate 'Inventra Highspeed Dual Role Controller (TI, ...)' | ||
| 14 | help | ||
| 15 | Say Y here if your system has a dual role high speed USB | ||
| 16 | controller based on the Mentor Graphics silicon IP. Then | ||
| 17 | configure options to match your silicon and the board | ||
| 18 | it's being used with, including the USB peripheral role, | ||
| 19 | or the USB host role, or both. | ||
| 20 | |||
| 21 | Texas Instruments parts using this IP include DaVinci 644x, | ||
| 22 | OMAP 243x, OMAP 343x, and TUSB 6010. | ||
| 23 | |||
| 24 | If you do not know what this is, please say N. | ||
| 25 | |||
| 26 | To compile this driver as a module, choose M here; the | ||
| 27 | module will be called "musb_hdrc". | ||
| 28 | |||
| 29 | config USB_MUSB_SOC | ||
| 30 | boolean | ||
| 31 | depends on USB_MUSB_HDRC | ||
| 32 | default y if ARCH_DAVINCI | ||
| 33 | default y if ARCH_OMAP2430 | ||
| 34 | default y if ARCH_OMAP34XX | ||
| 35 | help | ||
| 36 | Use a static <asm/arch/hdrc_cnf.h> file to describe how the | ||
| 37 | controller is configured (endpoints, mechanisms, etc) on the | ||
| 38 | current iteration of a given system-on-chip. | ||
| 39 | |||
| 40 | comment "DaVinci 644x USB support" | ||
| 41 | depends on USB_MUSB_HDRC && ARCH_DAVINCI | ||
| 42 | |||
| 43 | comment "OMAP 243x high speed USB support" | ||
| 44 | depends on USB_MUSB_HDRC && ARCH_OMAP2430 | ||
| 45 | |||
| 46 | comment "OMAP 343x high speed USB support" | ||
| 47 | depends on USB_MUSB_HDRC && ARCH_OMAP34XX | ||
| 48 | |||
| 49 | config USB_TUSB6010 | ||
| 50 | boolean "TUSB 6010 support" | ||
| 51 | depends on USB_MUSB_HDRC && !USB_MUSB_SOC | ||
| 52 | default y | ||
| 53 | help | ||
| 54 | The TUSB 6010 chip, from Texas Instruments, connects a discrete | ||
| 55 | HDRC core using a 16-bit parallel bus (NOR flash style) or VLYNQ | ||
| 56 | (a high speed serial link). It can use system-specific external | ||
| 57 | DMA controllers. | ||
| 58 | |||
| 59 | choice | ||
| 60 | prompt "Driver Mode" | ||
| 61 | depends on USB_MUSB_HDRC | ||
| 62 | help | ||
| 63 | Dual-Role devices can support both host and peripheral roles, | ||
| 64 | as well as a the special "OTG Device" role which can switch | ||
| 65 | between both roles as needed. | ||
| 66 | |||
| 67 | # use USB_MUSB_HDRC_HCD not USB_MUSB_HOST to #ifdef host side support; | ||
| 68 | # OTG needs both roles, not just USB_MUSB_HOST. | ||
| 69 | config USB_MUSB_HOST | ||
| 70 | depends on USB | ||
| 71 | bool "USB Host" | ||
| 72 | help | ||
| 73 | Say Y here if your system supports the USB host role. | ||
| 74 | If it has a USB "A" (rectangular), "Mini-A" (uncommon), | ||
| 75 | or "Mini-AB" connector, it supports the host role. | ||
| 76 | (With a "Mini-AB" connector, you should enable USB OTG.) | ||
| 77 | |||
| 78 | # use USB_GADGET_MUSB_HDRC not USB_MUSB_PERIPHERAL to #ifdef peripheral | ||
| 79 | # side support ... OTG needs both roles | ||
| 80 | config USB_MUSB_PERIPHERAL | ||
| 81 | depends on USB_GADGET | ||
| 82 | bool "USB Peripheral (gadget stack)" | ||
| 83 | select USB_GADGET_MUSB_HDRC | ||
| 84 | help | ||
| 85 | Say Y here if your system supports the USB peripheral role. | ||
| 86 | If it has a USB "B" (squarish), "Mini-B", or "Mini-AB" | ||
| 87 | connector, it supports the peripheral role. | ||
| 88 | (With a "Mini-AB" connector, you should enable USB OTG.) | ||
| 89 | |||
| 90 | config USB_MUSB_OTG | ||
| 91 | depends on USB && USB_GADGET && PM && EXPERIMENTAL | ||
| 92 | bool "Both host and peripheral: USB OTG (On The Go) Device" | ||
| 93 | select USB_GADGET_MUSB_HDRC | ||
| 94 | select USB_OTG | ||
| 95 | help | ||
| 96 | The most notable feature of USB OTG is support for a | ||
| 97 | "Dual-Role" device, which can act as either a device | ||
| 98 | or a host. The initial role choice can be changed | ||
| 99 | later, when two dual-role devices talk to each other. | ||
| 100 | |||
| 101 | At this writing, the OTG support in this driver is incomplete, | ||
| 102 | omitting the mandatory HNP or SRP protocols. However, some | ||
| 103 | of the cable based role switching works. (That is, grounding | ||
| 104 | the ID pin switches the controller to host mode, while leaving | ||
| 105 | it floating leaves it in peripheral mode.) | ||
| 106 | |||
| 107 | Select this if your system has a Mini-AB connector, or | ||
| 108 | to simplify certain kinds of configuration. | ||
| 109 | |||
| 110 | To implement your OTG Targeted Peripherals List (TPL), enable | ||
| 111 | USB_OTG_WHITELIST and update "drivers/usb/core/otg_whitelist.h" | ||
| 112 | to match your requirements. | ||
| 113 | |||
| 114 | endchoice | ||
| 115 | |||
| 116 | # enable peripheral support (including with OTG) | ||
| 117 | config USB_GADGET_MUSB_HDRC | ||
| 118 | bool | ||
| 119 | depends on USB_MUSB_HDRC && (USB_MUSB_PERIPHERAL || USB_MUSB_OTG) | ||
| 120 | # default y | ||
| 121 | # select USB_GADGET_DUALSPEED | ||
| 122 | # select USB_GADGET_SELECTED | ||
| 123 | |||
| 124 | # enables host support (including with OTG) | ||
| 125 | config USB_MUSB_HDRC_HCD | ||
| 126 | bool | ||
| 127 | depends on USB_MUSB_HDRC && (USB_MUSB_HOST || USB_MUSB_OTG) | ||
| 128 | select USB_OTG if USB_GADGET_MUSB_HDRC | ||
| 129 | default y | ||
| 130 | |||
| 131 | |||
| 132 | config MUSB_PIO_ONLY | ||
| 133 | bool 'Disable DMA (always use PIO)' | ||
| 134 | depends on USB_MUSB_HDRC | ||
| 135 | default y if USB_TUSB6010 | ||
| 136 | help | ||
| 137 | All data is copied between memory and FIFO by the CPU. | ||
| 138 | DMA controllers are ignored. | ||
| 139 | |||
| 140 | Do not select 'n' here unless DMA support for your SOC or board | ||
| 141 | is unavailable (or unstable). When DMA is enabled at compile time, | ||
| 142 | you can still disable it at run time using the "use_dma=n" module | ||
| 143 | parameter. | ||
| 144 | |||
| 145 | config USB_INVENTRA_DMA | ||
| 146 | bool | ||
| 147 | depends on USB_MUSB_HDRC && !MUSB_PIO_ONLY | ||
| 148 | default ARCH_OMAP2430 || ARCH_OMAP34XX | ||
| 149 | help | ||
| 150 | Enable DMA transfers using Mentor's engine. | ||
| 151 | |||
| 152 | config USB_TI_CPPI_DMA | ||
| 153 | bool | ||
| 154 | depends on USB_MUSB_HDRC && !MUSB_PIO_ONLY | ||
| 155 | default ARCH_DAVINCI | ||
| 156 | help | ||
| 157 | Enable DMA transfers when TI CPPI DMA is available. | ||
| 158 | |||
| 159 | config USB_TUSB_OMAP_DMA | ||
| 160 | bool | ||
| 161 | depends on USB_MUSB_HDRC && !MUSB_PIO_ONLY | ||
| 162 | depends on USB_TUSB6010 | ||
| 163 | depends on ARCH_OMAP | ||
| 164 | default y | ||
| 165 | help | ||
| 166 | Enable DMA transfers on TUSB 6010 when OMAP DMA is available. | ||
| 167 | |||
| 168 | config USB_MUSB_DEBUG | ||
| 169 | depends on USB_MUSB_HDRC | ||
| 170 | bool "Enable debugging messages" | ||
| 171 | default n | ||
| 172 | help | ||
| 173 | This enables musb debugging. To set the logging level use the debug | ||
| 174 | module parameter. Starting at level 3, per-transfer (urb, usb_request, | ||
| 175 | packet, or dma transfer) tracing may kick in. | ||
diff --git a/drivers/usb/musb/Makefile b/drivers/usb/musb/Makefile new file mode 100644 index 000000000000..b6af0d687a73 --- /dev/null +++ b/drivers/usb/musb/Makefile | |||
| @@ -0,0 +1,69 @@ | |||
| 1 | # | ||
| 2 | # for USB OTG silicon based on Mentor Graphics INVENTRA designs | ||
| 3 | # | ||
| 4 | |||
| 5 | musb_hdrc-objs := musb_core.o | ||
| 6 | |||
| 7 | obj-$(CONFIG_USB_MUSB_HDRC) += musb_hdrc.o | ||
| 8 | |||
| 9 | ifeq ($(CONFIG_ARCH_DAVINCI),y) | ||
| 10 | musb_hdrc-objs += davinci.o | ||
| 11 | endif | ||
| 12 | |||
| 13 | ifeq ($(CONFIG_USB_TUSB6010),y) | ||
| 14 | musb_hdrc-objs += tusb6010.o | ||
| 15 | endif | ||
| 16 | |||
| 17 | ifeq ($(CONFIG_ARCH_OMAP2430),y) | ||
| 18 | musb_hdrc-objs += omap2430.o | ||
| 19 | endif | ||
| 20 | |||
| 21 | ifeq ($(CONFIG_ARCH_OMAP3430),y) | ||
| 22 | musb_hdrc-objs += omap2430.o | ||
| 23 | endif | ||
| 24 | |||
| 25 | ifeq ($(CONFIG_USB_GADGET_MUSB_HDRC),y) | ||
| 26 | musb_hdrc-objs += musb_gadget_ep0.o musb_gadget.o | ||
| 27 | endif | ||
| 28 | |||
| 29 | ifeq ($(CONFIG_USB_MUSB_HDRC_HCD),y) | ||
| 30 | musb_hdrc-objs += musb_virthub.o musb_host.o | ||
| 31 | endif | ||
| 32 | |||
| 33 | # the kconfig must guarantee that only one of the | ||
| 34 | # possible I/O schemes will be enabled at a time ... | ||
| 35 | # PIO only, or DMA (several potential schemes). | ||
| 36 | # though PIO is always there to back up DMA, and for ep0 | ||
| 37 | |||
| 38 | ifneq ($(CONFIG_MUSB_PIO_ONLY),y) | ||
| 39 | |||
| 40 | ifeq ($(CONFIG_USB_INVENTRA_DMA),y) | ||
| 41 | musb_hdrc-objs += musbhsdma.o | ||
| 42 | |||
| 43 | else | ||
| 44 | ifeq ($(CONFIG_USB_TI_CPPI_DMA),y) | ||
| 45 | musb_hdrc-objs += cppi_dma.o | ||
| 46 | |||
| 47 | else | ||
| 48 | ifeq ($(CONFIG_USB_TUSB_OMAP_DMA),y) | ||
| 49 | musb_hdrc-objs += tusb6010_omap.o | ||
| 50 | |||
| 51 | endif | ||
| 52 | endif | ||
| 53 | endif | ||
| 54 | endif | ||
| 55 | |||
| 56 | |||
| 57 | ################################################################################ | ||
| 58 | |||
| 59 | # FIXME remove all these extra "-DMUSB_* things, stick to CONFIG_* | ||
| 60 | |||
| 61 | ifeq ($(CONFIG_USB_INVENTRA_MUSB_HAS_AHB_ID),y) | ||
| 62 | EXTRA_CFLAGS += -DMUSB_AHB_ID | ||
| 63 | endif | ||
| 64 | |||
| 65 | # Debugging | ||
| 66 | |||
| 67 | ifeq ($(CONFIG_USB_MUSB_DEBUG),y) | ||
| 68 | EXTRA_CFLAGS += -DDEBUG | ||
| 69 | endif | ||
diff --git a/drivers/usb/musb/cppi_dma.c b/drivers/usb/musb/cppi_dma.c new file mode 100644 index 000000000000..5ad6d0893cbe --- /dev/null +++ b/drivers/usb/musb/cppi_dma.c | |||
| @@ -0,0 +1,1540 @@ | |||
| 1 | /* | ||
| 2 | * Copyright (C) 2005-2006 by Texas Instruments | ||
| 3 | * | ||
| 4 | * This file implements a DMA interface using TI's CPPI DMA. | ||
| 5 | * For now it's DaVinci-only, but CPPI isn't specific to DaVinci or USB. | ||
| 6 | * The TUSB6020, using VLYNQ, has CPPI that looks much like DaVinci. | ||
| 7 | */ | ||
| 8 | |||
| 9 | #include <linux/usb.h> | ||
| 10 | |||
| 11 | #include "musb_core.h" | ||
| 12 | #include "cppi_dma.h" | ||
| 13 | |||
| 14 | |||
| 15 | /* CPPI DMA status 7-mar-2006: | ||
| 16 | * | ||
| 17 | * - See musb_{host,gadget}.c for more info | ||
| 18 | * | ||
| 19 | * - Correct RX DMA generally forces the engine into irq-per-packet mode, | ||
| 20 | * which can easily saturate the CPU under non-mass-storage loads. | ||
| 21 | * | ||
| 22 | * NOTES 24-aug-2006 (2.6.18-rc4): | ||
| 23 | * | ||
| 24 | * - peripheral RXDMA wedged in a test with packets of length 512/512/1. | ||
| 25 | * evidently after the 1 byte packet was received and acked, the queue | ||
| 26 | * of BDs got garbaged so it wouldn't empty the fifo. (rxcsr 0x2003, | ||
| 27 | * and RX DMA0: 4 left, 80000000 8feff880, 8feff860 8feff860; 8f321401 | ||
| 28 | * 004001ff 00000001 .. 8feff860) Host was just getting NAKed on tx | ||
| 29 | * of its next (512 byte) packet. IRQ issues? | ||
| 30 | * | ||
| 31 | * REVISIT: the "transfer DMA" glue between CPPI and USB fifos will | ||
| 32 | * evidently also directly update the RX and TX CSRs ... so audit all | ||
| 33 | * host and peripheral side DMA code to avoid CSR access after DMA has | ||
| 34 | * been started. | ||
| 35 | */ | ||
| 36 | |||
| 37 | /* REVISIT now we can avoid preallocating these descriptors; or | ||
| 38 | * more simply, switch to a global freelist not per-channel ones. | ||
| 39 | * Note: at full speed, 64 descriptors == 4K bulk data. | ||
| 40 | */ | ||
| 41 | #define NUM_TXCHAN_BD 64 | ||
| 42 | #define NUM_RXCHAN_BD 64 | ||
| 43 | |||
| 44 | static inline void cpu_drain_writebuffer(void) | ||
| 45 | { | ||
| 46 | wmb(); | ||
| 47 | #ifdef CONFIG_CPU_ARM926T | ||
| 48 | /* REVISIT this "should not be needed", | ||
| 49 | * but lack of it sure seemed to hurt ... | ||
| 50 | */ | ||
| 51 | asm("mcr p15, 0, r0, c7, c10, 4 @ drain write buffer\n"); | ||
| 52 | #endif | ||
| 53 | } | ||
| 54 | |||
| 55 | static inline struct cppi_descriptor *cppi_bd_alloc(struct cppi_channel *c) | ||
| 56 | { | ||
| 57 | struct cppi_descriptor *bd = c->freelist; | ||
| 58 | |||
| 59 | if (bd) | ||
| 60 | c->freelist = bd->next; | ||
| 61 | return bd; | ||
| 62 | } | ||
| 63 | |||
| 64 | static inline void | ||
| 65 | cppi_bd_free(struct cppi_channel *c, struct cppi_descriptor *bd) | ||
| 66 | { | ||
| 67 | if (!bd) | ||
| 68 | return; | ||
| 69 | bd->next = c->freelist; | ||
| 70 | c->freelist = bd; | ||
| 71 | } | ||
| 72 | |||
| 73 | /* | ||
| 74 | * Start DMA controller | ||
| 75 | * | ||
| 76 | * Initialize the DMA controller as necessary. | ||
| 77 | */ | ||
| 78 | |||
| 79 | /* zero out entire rx state RAM entry for the channel */ | ||
| 80 | static void cppi_reset_rx(struct cppi_rx_stateram __iomem *rx) | ||
| 81 | { | ||
| 82 | musb_writel(&rx->rx_skipbytes, 0, 0); | ||
| 83 | musb_writel(&rx->rx_head, 0, 0); | ||
| 84 | musb_writel(&rx->rx_sop, 0, 0); | ||
| 85 | musb_writel(&rx->rx_current, 0, 0); | ||
| 86 | musb_writel(&rx->rx_buf_current, 0, 0); | ||
| 87 | musb_writel(&rx->rx_len_len, 0, 0); | ||
| 88 | musb_writel(&rx->rx_cnt_cnt, 0, 0); | ||
| 89 | } | ||
| 90 | |||
| 91 | /* zero out entire tx state RAM entry for the channel */ | ||
| 92 | static void cppi_reset_tx(struct cppi_tx_stateram __iomem *tx, u32 ptr) | ||
| 93 | { | ||
| 94 | musb_writel(&tx->tx_head, 0, 0); | ||
| 95 | musb_writel(&tx->tx_buf, 0, 0); | ||
| 96 | musb_writel(&tx->tx_current, 0, 0); | ||
| 97 | musb_writel(&tx->tx_buf_current, 0, 0); | ||
| 98 | musb_writel(&tx->tx_info, 0, 0); | ||
| 99 | musb_writel(&tx->tx_rem_len, 0, 0); | ||
| 100 | /* musb_writel(&tx->tx_dummy, 0, 0); */ | ||
| 101 | musb_writel(&tx->tx_complete, 0, ptr); | ||
| 102 | } | ||
| 103 | |||
| 104 | static void __init cppi_pool_init(struct cppi *cppi, struct cppi_channel *c) | ||
| 105 | { | ||
| 106 | int j; | ||
| 107 | |||
| 108 | /* initialize channel fields */ | ||
| 109 | c->head = NULL; | ||
| 110 | c->tail = NULL; | ||
| 111 | c->last_processed = NULL; | ||
| 112 | c->channel.status = MUSB_DMA_STATUS_UNKNOWN; | ||
| 113 | c->controller = cppi; | ||
| 114 | c->is_rndis = 0; | ||
| 115 | c->freelist = NULL; | ||
| 116 | |||
| 117 | /* build the BD Free list for the channel */ | ||
| 118 | for (j = 0; j < NUM_TXCHAN_BD + 1; j++) { | ||
| 119 | struct cppi_descriptor *bd; | ||
| 120 | dma_addr_t dma; | ||
| 121 | |||
| 122 | bd = dma_pool_alloc(cppi->pool, GFP_KERNEL, &dma); | ||
| 123 | bd->dma = dma; | ||
| 124 | cppi_bd_free(c, bd); | ||
| 125 | } | ||
| 126 | } | ||
| 127 | |||
| 128 | static int cppi_channel_abort(struct dma_channel *); | ||
| 129 | |||
| 130 | static void cppi_pool_free(struct cppi_channel *c) | ||
| 131 | { | ||
| 132 | struct cppi *cppi = c->controller; | ||
| 133 | struct cppi_descriptor *bd; | ||
| 134 | |||
| 135 | (void) cppi_channel_abort(&c->channel); | ||
| 136 | c->channel.status = MUSB_DMA_STATUS_UNKNOWN; | ||
| 137 | c->controller = NULL; | ||
| 138 | |||
| 139 | /* free all its bds */ | ||
| 140 | bd = c->last_processed; | ||
| 141 | do { | ||
| 142 | if (bd) | ||
| 143 | dma_pool_free(cppi->pool, bd, bd->dma); | ||
| 144 | bd = cppi_bd_alloc(c); | ||
| 145 | } while (bd); | ||
| 146 | c->last_processed = NULL; | ||
| 147 | } | ||
| 148 | |||
| 149 | static int __init cppi_controller_start(struct dma_controller *c) | ||
| 150 | { | ||
| 151 | struct cppi *controller; | ||
| 152 | void __iomem *tibase; | ||
| 153 | int i; | ||
| 154 | |||
| 155 | controller = container_of(c, struct cppi, controller); | ||
| 156 | |||
| 157 | /* do whatever is necessary to start controller */ | ||
| 158 | for (i = 0; i < ARRAY_SIZE(controller->tx); i++) { | ||
| 159 | controller->tx[i].transmit = true; | ||
| 160 | controller->tx[i].index = i; | ||
| 161 | } | ||
| 162 | for (i = 0; i < ARRAY_SIZE(controller->rx); i++) { | ||
| 163 | controller->rx[i].transmit = false; | ||
| 164 | controller->rx[i].index = i; | ||
| 165 | } | ||
| 166 | |||
| 167 | /* setup BD list on a per channel basis */ | ||
| 168 | for (i = 0; i < ARRAY_SIZE(controller->tx); i++) | ||
| 169 | cppi_pool_init(controller, controller->tx + i); | ||
| 170 | for (i = 0; i < ARRAY_SIZE(controller->rx); i++) | ||
| 171 | cppi_pool_init(controller, controller->rx + i); | ||
| 172 | |||
| 173 | tibase = controller->tibase; | ||
| 174 | INIT_LIST_HEAD(&controller->tx_complete); | ||
| 175 | |||
| 176 | /* initialise tx/rx channel head pointers to zero */ | ||
| 177 | for (i = 0; i < ARRAY_SIZE(controller->tx); i++) { | ||
| 178 | struct cppi_channel *tx_ch = controller->tx + i; | ||
| 179 | struct cppi_tx_stateram __iomem *tx; | ||
| 180 | |||
| 181 | INIT_LIST_HEAD(&tx_ch->tx_complete); | ||
| 182 | |||
| 183 | tx = tibase + DAVINCI_TXCPPI_STATERAM_OFFSET(i); | ||
| 184 | tx_ch->state_ram = tx; | ||
| 185 | cppi_reset_tx(tx, 0); | ||
| 186 | } | ||
| 187 | for (i = 0; i < ARRAY_SIZE(controller->rx); i++) { | ||
| 188 | struct cppi_channel *rx_ch = controller->rx + i; | ||
| 189 | struct cppi_rx_stateram __iomem *rx; | ||
| 190 | |||
| 191 | INIT_LIST_HEAD(&rx_ch->tx_complete); | ||
| 192 | |||
| 193 | rx = tibase + DAVINCI_RXCPPI_STATERAM_OFFSET(i); | ||
| 194 | rx_ch->state_ram = rx; | ||
| 195 | cppi_reset_rx(rx); | ||
| 196 | } | ||
| 197 | |||
| 198 | /* enable individual cppi channels */ | ||
| 199 | musb_writel(tibase, DAVINCI_TXCPPI_INTENAB_REG, | ||
| 200 | DAVINCI_DMA_ALL_CHANNELS_ENABLE); | ||
| 201 | musb_writel(tibase, DAVINCI_RXCPPI_INTENAB_REG, | ||
| 202 | DAVINCI_DMA_ALL_CHANNELS_ENABLE); | ||
| 203 | |||
| 204 | /* enable tx/rx CPPI control */ | ||
| 205 | musb_writel(tibase, DAVINCI_TXCPPI_CTRL_REG, DAVINCI_DMA_CTRL_ENABLE); | ||
| 206 | musb_writel(tibase, DAVINCI_RXCPPI_CTRL_REG, DAVINCI_DMA_CTRL_ENABLE); | ||
| 207 | |||
| 208 | /* disable RNDIS mode, also host rx RNDIS autorequest */ | ||
| 209 | musb_writel(tibase, DAVINCI_RNDIS_REG, 0); | ||
| 210 | musb_writel(tibase, DAVINCI_AUTOREQ_REG, 0); | ||
| 211 | |||
| 212 | return 0; | ||
| 213 | } | ||
| 214 | |||
| 215 | /* | ||
| 216 | * Stop DMA controller | ||
| 217 | * | ||
| 218 | * De-Init the DMA controller as necessary. | ||
| 219 | */ | ||
| 220 | |||
| 221 | static int cppi_controller_stop(struct dma_controller *c) | ||
| 222 | { | ||
| 223 | struct cppi *controller; | ||
| 224 | void __iomem *tibase; | ||
| 225 | int i; | ||
| 226 | |||
| 227 | controller = container_of(c, struct cppi, controller); | ||
| 228 | |||
| 229 | tibase = controller->tibase; | ||
| 230 | /* DISABLE INDIVIDUAL CHANNEL Interrupts */ | ||
| 231 | musb_writel(tibase, DAVINCI_TXCPPI_INTCLR_REG, | ||
| 232 | DAVINCI_DMA_ALL_CHANNELS_ENABLE); | ||
| 233 | musb_writel(tibase, DAVINCI_RXCPPI_INTCLR_REG, | ||
| 234 | DAVINCI_DMA_ALL_CHANNELS_ENABLE); | ||
| 235 | |||
| 236 | DBG(1, "Tearing down RX and TX Channels\n"); | ||
| 237 | for (i = 0; i < ARRAY_SIZE(controller->tx); i++) { | ||
| 238 | /* FIXME restructure of txdma to use bds like rxdma */ | ||
| 239 | controller->tx[i].last_processed = NULL; | ||
| 240 | cppi_pool_free(controller->tx + i); | ||
| 241 | } | ||
| 242 | for (i = 0; i < ARRAY_SIZE(controller->rx); i++) | ||
| 243 | cppi_pool_free(controller->rx + i); | ||
| 244 | |||
| 245 | /* in Tx Case proper teardown is supported. We resort to disabling | ||
| 246 | * Tx/Rx CPPI after cleanup of Tx channels. Before TX teardown is | ||
| 247 | * complete TX CPPI cannot be disabled. | ||
| 248 | */ | ||
| 249 | /*disable tx/rx cppi */ | ||
| 250 | musb_writel(tibase, DAVINCI_TXCPPI_CTRL_REG, DAVINCI_DMA_CTRL_DISABLE); | ||
| 251 | musb_writel(tibase, DAVINCI_RXCPPI_CTRL_REG, DAVINCI_DMA_CTRL_DISABLE); | ||
| 252 | |||
| 253 | return 0; | ||
| 254 | } | ||
| 255 | |||
| 256 | /* While dma channel is allocated, we only want the core irqs active | ||
| 257 | * for fault reports, otherwise we'd get irqs that we don't care about. | ||
| 258 | * Except for TX irqs, where dma done != fifo empty and reusable ... | ||
| 259 | * | ||
| 260 | * NOTE: docs don't say either way, but irq masking **enables** irqs. | ||
| 261 | * | ||
| 262 | * REVISIT same issue applies to pure PIO usage too, and non-cppi dma... | ||
| 263 | */ | ||
| 264 | static inline void core_rxirq_disable(void __iomem *tibase, unsigned epnum) | ||
| 265 | { | ||
| 266 | musb_writel(tibase, DAVINCI_USB_INT_MASK_CLR_REG, 1 << (epnum + 8)); | ||
| 267 | } | ||
| 268 | |||
| 269 | static inline void core_rxirq_enable(void __iomem *tibase, unsigned epnum) | ||
| 270 | { | ||
| 271 | musb_writel(tibase, DAVINCI_USB_INT_MASK_SET_REG, 1 << (epnum + 8)); | ||
| 272 | } | ||
| 273 | |||
| 274 | |||
| 275 | /* | ||
| 276 | * Allocate a CPPI Channel for DMA. With CPPI, channels are bound to | ||
| 277 | * each transfer direction of a non-control endpoint, so allocating | ||
| 278 | * (and deallocating) is mostly a way to notice bad housekeeping on | ||
| 279 | * the software side. We assume the irqs are always active. | ||
| 280 | */ | ||
| 281 | static struct dma_channel * | ||
| 282 | cppi_channel_allocate(struct dma_controller *c, | ||
| 283 | struct musb_hw_ep *ep, u8 transmit) | ||
| 284 | { | ||
| 285 | struct cppi *controller; | ||
| 286 | u8 index; | ||
| 287 | struct cppi_channel *cppi_ch; | ||
| 288 | void __iomem *tibase; | ||
| 289 | |||
| 290 | controller = container_of(c, struct cppi, controller); | ||
| 291 | tibase = controller->tibase; | ||
| 292 | |||
| 293 | /* ep0 doesn't use DMA; remember cppi indices are 0..N-1 */ | ||
| 294 | index = ep->epnum - 1; | ||
| 295 | |||
| 296 | /* return the corresponding CPPI Channel Handle, and | ||
| 297 | * probably disable the non-CPPI irq until we need it. | ||
| 298 | */ | ||
| 299 | if (transmit) { | ||
| 300 | if (index >= ARRAY_SIZE(controller->tx)) { | ||
| 301 | DBG(1, "no %cX%d CPPI channel\n", 'T', index); | ||
| 302 | return NULL; | ||
| 303 | } | ||
| 304 | cppi_ch = controller->tx + index; | ||
| 305 | } else { | ||
| 306 | if (index >= ARRAY_SIZE(controller->rx)) { | ||
| 307 | DBG(1, "no %cX%d CPPI channel\n", 'R', index); | ||
| 308 | return NULL; | ||
| 309 | } | ||
| 310 | cppi_ch = controller->rx + index; | ||
| 311 | core_rxirq_disable(tibase, ep->epnum); | ||
| 312 | } | ||
| 313 | |||
| 314 | /* REVISIT make this an error later once the same driver code works | ||
| 315 | * with the other DMA engine too | ||
| 316 | */ | ||
| 317 | if (cppi_ch->hw_ep) | ||
| 318 | DBG(1, "re-allocating DMA%d %cX channel %p\n", | ||
| 319 | index, transmit ? 'T' : 'R', cppi_ch); | ||
| 320 | cppi_ch->hw_ep = ep; | ||
| 321 | cppi_ch->channel.status = MUSB_DMA_STATUS_FREE; | ||
| 322 | |||
| 323 | DBG(4, "Allocate CPPI%d %cX\n", index, transmit ? 'T' : 'R'); | ||
| 324 | return &cppi_ch->channel; | ||
| 325 | } | ||
| 326 | |||
| 327 | /* Release a CPPI Channel. */ | ||
| 328 | static void cppi_channel_release(struct dma_channel *channel) | ||
| 329 | { | ||
| 330 | struct cppi_channel *c; | ||
| 331 | void __iomem *tibase; | ||
| 332 | |||
| 333 | /* REVISIT: for paranoia, check state and abort if needed... */ | ||
| 334 | |||
| 335 | c = container_of(channel, struct cppi_channel, channel); | ||
| 336 | tibase = c->controller->tibase; | ||
| 337 | if (!c->hw_ep) | ||
| 338 | DBG(1, "releasing idle DMA channel %p\n", c); | ||
| 339 | else if (!c->transmit) | ||
| 340 | core_rxirq_enable(tibase, c->index + 1); | ||
| 341 | |||
| 342 | /* for now, leave its cppi IRQ enabled (we won't trigger it) */ | ||
| 343 | c->hw_ep = NULL; | ||
| 344 | channel->status = MUSB_DMA_STATUS_UNKNOWN; | ||
| 345 | } | ||
| 346 | |||
| 347 | /* Context: controller irqlocked */ | ||
| 348 | static void | ||
| 349 | cppi_dump_rx(int level, struct cppi_channel *c, const char *tag) | ||
| 350 | { | ||
| 351 | void __iomem *base = c->controller->mregs; | ||
| 352 | struct cppi_rx_stateram __iomem *rx = c->state_ram; | ||
| 353 | |||
| 354 | musb_ep_select(base, c->index + 1); | ||
| 355 | |||
| 356 | DBG(level, "RX DMA%d%s: %d left, csr %04x, " | ||
| 357 | "%08x H%08x S%08x C%08x, " | ||
| 358 | "B%08x L%08x %08x .. %08x" | ||
| 359 | "\n", | ||
| 360 | c->index, tag, | ||
| 361 | musb_readl(c->controller->tibase, | ||
| 362 | DAVINCI_RXCPPI_BUFCNT0_REG + 4 * c->index), | ||
| 363 | musb_readw(c->hw_ep->regs, MUSB_RXCSR), | ||
| 364 | |||
| 365 | musb_readl(&rx->rx_skipbytes, 0), | ||
| 366 | musb_readl(&rx->rx_head, 0), | ||
| 367 | musb_readl(&rx->rx_sop, 0), | ||
| 368 | musb_readl(&rx->rx_current, 0), | ||
| 369 | |||
| 370 | musb_readl(&rx->rx_buf_current, 0), | ||
| 371 | musb_readl(&rx->rx_len_len, 0), | ||
| 372 | musb_readl(&rx->rx_cnt_cnt, 0), | ||
| 373 | musb_readl(&rx->rx_complete, 0) | ||
| 374 | ); | ||
| 375 | } | ||
| 376 | |||
| 377 | /* Context: controller irqlocked */ | ||
| 378 | static void | ||
| 379 | cppi_dump_tx(int level, struct cppi_channel *c, const char *tag) | ||
| 380 | { | ||
| 381 | void __iomem *base = c->controller->mregs; | ||
| 382 | struct cppi_tx_stateram __iomem *tx = c->state_ram; | ||
| 383 | |||
| 384 | musb_ep_select(base, c->index + 1); | ||
| 385 | |||
| 386 | DBG(level, "TX DMA%d%s: csr %04x, " | ||
| 387 | "H%08x S%08x C%08x %08x, " | ||
| 388 | "F%08x L%08x .. %08x" | ||
| 389 | "\n", | ||
| 390 | c->index, tag, | ||
| 391 | musb_readw(c->hw_ep->regs, MUSB_TXCSR), | ||
| 392 | |||
| 393 | musb_readl(&tx->tx_head, 0), | ||
| 394 | musb_readl(&tx->tx_buf, 0), | ||
| 395 | musb_readl(&tx->tx_current, 0), | ||
| 396 | musb_readl(&tx->tx_buf_current, 0), | ||
| 397 | |||
| 398 | musb_readl(&tx->tx_info, 0), | ||
| 399 | musb_readl(&tx->tx_rem_len, 0), | ||
| 400 | /* dummy/unused word 6 */ | ||
| 401 | musb_readl(&tx->tx_complete, 0) | ||
| 402 | ); | ||
| 403 | } | ||
| 404 | |||
| 405 | /* Context: controller irqlocked */ | ||
| 406 | static inline void | ||
| 407 | cppi_rndis_update(struct cppi_channel *c, int is_rx, | ||
| 408 | void __iomem *tibase, int is_rndis) | ||
| 409 | { | ||
| 410 | /* we may need to change the rndis flag for this cppi channel */ | ||
| 411 | if (c->is_rndis != is_rndis) { | ||
| 412 | u32 value = musb_readl(tibase, DAVINCI_RNDIS_REG); | ||
| 413 | u32 temp = 1 << (c->index); | ||
| 414 | |||
| 415 | if (is_rx) | ||
| 416 | temp <<= 16; | ||
| 417 | if (is_rndis) | ||
| 418 | value |= temp; | ||
| 419 | else | ||
| 420 | value &= ~temp; | ||
| 421 | musb_writel(tibase, DAVINCI_RNDIS_REG, value); | ||
| 422 | c->is_rndis = is_rndis; | ||
| 423 | } | ||
| 424 | } | ||
| 425 | |||
| 426 | static void cppi_dump_rxbd(const char *tag, struct cppi_descriptor *bd) | ||
| 427 | { | ||
| 428 | pr_debug("RXBD/%s %08x: " | ||
| 429 | "nxt %08x buf %08x off.blen %08x opt.plen %08x\n", | ||
| 430 | tag, bd->dma, | ||
| 431 | bd->hw_next, bd->hw_bufp, bd->hw_off_len, | ||
| 432 | bd->hw_options); | ||
| 433 | } | ||
| 434 | |||
| 435 | static void cppi_dump_rxq(int level, const char *tag, struct cppi_channel *rx) | ||
| 436 | { | ||
| 437 | #if MUSB_DEBUG > 0 | ||
| 438 | struct cppi_descriptor *bd; | ||
| 439 | |||
| 440 | if (!_dbg_level(level)) | ||
| 441 | return; | ||
| 442 | cppi_dump_rx(level, rx, tag); | ||
| 443 | if (rx->last_processed) | ||
| 444 | cppi_dump_rxbd("last", rx->last_processed); | ||
| 445 | for (bd = rx->head; bd; bd = bd->next) | ||
| 446 | cppi_dump_rxbd("active", bd); | ||
| 447 | #endif | ||
| 448 | } | ||
| 449 | |||
| 450 | |||
| 451 | /* NOTE: DaVinci autoreq is ignored except for host side "RNDIS" mode RX; | ||
| 452 | * so we won't ever use it (see "CPPI RX Woes" below). | ||
| 453 | */ | ||
| 454 | static inline int cppi_autoreq_update(struct cppi_channel *rx, | ||
| 455 | void __iomem *tibase, int onepacket, unsigned n_bds) | ||
| 456 | { | ||
| 457 | u32 val; | ||
| 458 | |||
| 459 | #ifdef RNDIS_RX_IS_USABLE | ||
| 460 | u32 tmp; | ||
| 461 | /* assert(is_host_active(musb)) */ | ||
| 462 | |||
| 463 | /* start from "AutoReq never" */ | ||
| 464 | tmp = musb_readl(tibase, DAVINCI_AUTOREQ_REG); | ||
| 465 | val = tmp & ~((0x3) << (rx->index * 2)); | ||
| 466 | |||
| 467 | /* HCD arranged reqpkt for packet #1. we arrange int | ||
| 468 | * for all but the last one, maybe in two segments. | ||
| 469 | */ | ||
| 470 | if (!onepacket) { | ||
| 471 | #if 0 | ||
| 472 | /* use two segments, autoreq "all" then the last "never" */ | ||
| 473 | val |= ((0x3) << (rx->index * 2)); | ||
| 474 | n_bds--; | ||
| 475 | #else | ||
| 476 | /* one segment, autoreq "all-but-last" */ | ||
| 477 | val |= ((0x1) << (rx->index * 2)); | ||
| 478 | #endif | ||
| 479 | } | ||
| 480 | |||
| 481 | if (val != tmp) { | ||
| 482 | int n = 100; | ||
| 483 | |||
| 484 | /* make sure that autoreq is updated before continuing */ | ||
| 485 | musb_writel(tibase, DAVINCI_AUTOREQ_REG, val); | ||
| 486 | do { | ||
| 487 | tmp = musb_readl(tibase, DAVINCI_AUTOREQ_REG); | ||
| 488 | if (tmp == val) | ||
| 489 | break; | ||
| 490 | cpu_relax(); | ||
| 491 | } while (n-- > 0); | ||
| 492 | } | ||
| 493 | #endif | ||
| 494 | |||
| 495 | /* REQPKT is turned off after each segment */ | ||
| 496 | if (n_bds && rx->channel.actual_len) { | ||
| 497 | void __iomem *regs = rx->hw_ep->regs; | ||
| 498 | |||
| 499 | val = musb_readw(regs, MUSB_RXCSR); | ||
| 500 | if (!(val & MUSB_RXCSR_H_REQPKT)) { | ||
| 501 | val |= MUSB_RXCSR_H_REQPKT | MUSB_RXCSR_H_WZC_BITS; | ||
| 502 | musb_writew(regs, MUSB_RXCSR, val); | ||
| 503 | /* flush writebufer */ | ||
| 504 | val = musb_readw(regs, MUSB_RXCSR); | ||
| 505 | } | ||
| 506 | } | ||
| 507 | return n_bds; | ||
| 508 | } | ||
| 509 | |||
| 510 | |||
| 511 | /* Buffer enqueuing Logic: | ||
| 512 | * | ||
| 513 | * - RX builds new queues each time, to help handle routine "early | ||
| 514 | * termination" cases (faults, including errors and short reads) | ||
| 515 | * more correctly. | ||
| 516 | * | ||
| 517 | * - for now, TX reuses the same queue of BDs every time | ||
| 518 | * | ||
| 519 | * REVISIT long term, we want a normal dynamic model. | ||
| 520 | * ... the goal will be to append to the | ||
| 521 | * existing queue, processing completed "dma buffers" (segments) on the fly. | ||
| 522 | * | ||
| 523 | * Otherwise we force an IRQ latency between requests, which slows us a lot | ||
| 524 | * (especially in "transparent" dma). Unfortunately that model seems to be | ||
| 525 | * inherent in the DMA model from the Mentor code, except in the rare case | ||
| 526 | * of transfers big enough (~128+ KB) that we could append "middle" segments | ||
| 527 | * in the TX paths. (RX can't do this, see below.) | ||
| 528 | * | ||
| 529 | * That's true even in the CPPI- friendly iso case, where most urbs have | ||
| 530 | * several small segments provided in a group and where the "packet at a time" | ||
| 531 | * "transparent" DMA model is always correct, even on the RX side. | ||
| 532 | */ | ||
| 533 | |||
| 534 | /* | ||
| 535 | * CPPI TX: | ||
| 536 | * ======== | ||
| 537 | * TX is a lot more reasonable than RX; it doesn't need to run in | ||
| 538 | * irq-per-packet mode very often. RNDIS mode seems to behave too | ||
| 539 | * (except how it handles the exactly-N-packets case). Building a | ||
| 540 | * txdma queue with multiple requests (urb or usb_request) looks | ||
| 541 | * like it would work ... but fault handling would need much testing. | ||
| 542 | * | ||
| 543 | * The main issue with TX mode RNDIS relates to transfer lengths that | ||
| 544 | * are an exact multiple of the packet length. It appears that there's | ||
| 545 | * a hiccup in that case (maybe the DMA completes before the ZLP gets | ||
| 546 | * written?) boiling down to not being able to rely on CPPI writing any | ||
| 547 | * terminating zero length packet before the next transfer is written. | ||
| 548 | * So that's punted to PIO; better yet, gadget drivers can avoid it. | ||
| 549 | * | ||
| 550 | * Plus, there's allegedly an undocumented constraint that rndis transfer | ||
| 551 | * length be a multiple of 64 bytes ... but the chip doesn't act that | ||
| 552 | * way, and we really don't _want_ that behavior anyway. | ||
| 553 | * | ||
| 554 | * On TX, "transparent" mode works ... although experiments have shown | ||
| 555 | * problems trying to use the SOP/EOP bits in different USB packets. | ||
| 556 | * | ||
| 557 | * REVISIT try to handle terminating zero length packets using CPPI | ||
| 558 | * instead of doing it by PIO after an IRQ. (Meanwhile, make Ethernet | ||
| 559 | * links avoid that issue by forcing them to avoid zlps.) | ||
| 560 | */ | ||
| 561 | static void | ||
| 562 | cppi_next_tx_segment(struct musb *musb, struct cppi_channel *tx) | ||
| 563 | { | ||
| 564 | unsigned maxpacket = tx->maxpacket; | ||
| 565 | dma_addr_t addr = tx->buf_dma + tx->offset; | ||
| 566 | size_t length = tx->buf_len - tx->offset; | ||
| 567 | struct cppi_descriptor *bd; | ||
| 568 | unsigned n_bds; | ||
| 569 | unsigned i; | ||
| 570 | struct cppi_tx_stateram __iomem *tx_ram = tx->state_ram; | ||
| 571 | int rndis; | ||
| 572 | |||
| 573 | /* TX can use the CPPI "rndis" mode, where we can probably fit this | ||
| 574 | * transfer in one BD and one IRQ. The only time we would NOT want | ||
| 575 | * to use it is when hardware constraints prevent it, or if we'd | ||
| 576 | * trigger the "send a ZLP?" confusion. | ||
| 577 | */ | ||
| 578 | rndis = (maxpacket & 0x3f) == 0 | ||
| 579 | && length < 0xffff | ||
| 580 | && (length % maxpacket) != 0; | ||
| 581 | |||
| 582 | if (rndis) { | ||
| 583 | maxpacket = length; | ||
| 584 | n_bds = 1; | ||
| 585 | } else { | ||
| 586 | n_bds = length / maxpacket; | ||
| 587 | if (!length || (length % maxpacket)) | ||
| 588 | n_bds++; | ||
| 589 | n_bds = min(n_bds, (unsigned) NUM_TXCHAN_BD); | ||
| 590 | length = min(n_bds * maxpacket, length); | ||
| 591 | } | ||
| 592 | |||
| 593 | DBG(4, "TX DMA%d, pktSz %d %s bds %d dma 0x%x len %u\n", | ||
| 594 | tx->index, | ||
| 595 | maxpacket, | ||
| 596 | rndis ? "rndis" : "transparent", | ||
| 597 | n_bds, | ||
| 598 | addr, length); | ||
| 599 | |||
| 600 | cppi_rndis_update(tx, 0, musb->ctrl_base, rndis); | ||
| 601 | |||
| 602 | /* assuming here that channel_program is called during | ||
| 603 | * transfer initiation ... current code maintains state | ||
| 604 | * for one outstanding request only (no queues, not even | ||
| 605 | * the implicit ones of an iso urb). | ||
| 606 | */ | ||
| 607 | |||
| 608 | bd = tx->freelist; | ||
| 609 | tx->head = bd; | ||
| 610 | tx->last_processed = NULL; | ||
| 611 | |||
| 612 | /* FIXME use BD pool like RX side does, and just queue | ||
| 613 | * the minimum number for this request. | ||
| 614 | */ | ||
| 615 | |||
| 616 | /* Prepare queue of BDs first, then hand it to hardware. | ||
| 617 | * All BDs except maybe the last should be of full packet | ||
| 618 | * size; for RNDIS there _is_ only that last packet. | ||
| 619 | */ | ||
| 620 | for (i = 0; i < n_bds; ) { | ||
| 621 | if (++i < n_bds && bd->next) | ||
| 622 | bd->hw_next = bd->next->dma; | ||
| 623 | else | ||
| 624 | bd->hw_next = 0; | ||
| 625 | |||
| 626 | bd->hw_bufp = tx->buf_dma + tx->offset; | ||
| 627 | |||
| 628 | /* FIXME set EOP only on the last packet, | ||
| 629 | * SOP only on the first ... avoid IRQs | ||
| 630 | */ | ||
| 631 | if ((tx->offset + maxpacket) <= tx->buf_len) { | ||
| 632 | tx->offset += maxpacket; | ||
| 633 | bd->hw_off_len = maxpacket; | ||
| 634 | bd->hw_options = CPPI_SOP_SET | CPPI_EOP_SET | ||
| 635 | | CPPI_OWN_SET | maxpacket; | ||
| 636 | } else { | ||
| 637 | /* only this one may be a partial USB Packet */ | ||
| 638 | u32 partial_len; | ||
| 639 | |||
| 640 | partial_len = tx->buf_len - tx->offset; | ||
| 641 | tx->offset = tx->buf_len; | ||
| 642 | bd->hw_off_len = partial_len; | ||
| 643 | |||
| 644 | bd->hw_options = CPPI_SOP_SET | CPPI_EOP_SET | ||
| 645 | | CPPI_OWN_SET | partial_len; | ||
| 646 | if (partial_len == 0) | ||
| 647 | bd->hw_options |= CPPI_ZERO_SET; | ||
| 648 | } | ||
| 649 | |||
| 650 | DBG(5, "TXBD %p: nxt %08x buf %08x len %04x opt %08x\n", | ||
| 651 | bd, bd->hw_next, bd->hw_bufp, | ||
| 652 | bd->hw_off_len, bd->hw_options); | ||
| 653 | |||
| 654 | /* update the last BD enqueued to the list */ | ||
| 655 | tx->tail = bd; | ||
| 656 | bd = bd->next; | ||
| 657 | } | ||
| 658 | |||
| 659 | /* BDs live in DMA-coherent memory, but writes might be pending */ | ||
| 660 | cpu_drain_writebuffer(); | ||
| 661 | |||
| 662 | /* Write to the HeadPtr in state RAM to trigger */ | ||
| 663 | musb_writel(&tx_ram->tx_head, 0, (u32)tx->freelist->dma); | ||
| 664 | |||
| 665 | cppi_dump_tx(5, tx, "/S"); | ||
| 666 | } | ||
| 667 | |||
| 668 | /* | ||
| 669 | * CPPI RX Woes: | ||
| 670 | * ============= | ||
| 671 | * Consider a 1KB bulk RX buffer in two scenarios: (a) it's fed two 300 byte | ||
| 672 | * packets back-to-back, and (b) it's fed two 512 byte packets back-to-back. | ||
| 673 | * (Full speed transfers have similar scenarios.) | ||
| 674 | * | ||
| 675 | * The correct behavior for Linux is that (a) fills the buffer with 300 bytes, | ||
| 676 | * and the next packet goes into a buffer that's queued later; while (b) fills | ||
| 677 | * the buffer with 1024 bytes. How to do that with CPPI? | ||
| 678 | * | ||
| 679 | * - RX queues in "rndis" mode -- one single BD -- handle (a) correctly, but | ||
| 680 | * (b) loses **BADLY** because nothing (!) happens when that second packet | ||
| 681 | * fills the buffer, much less when a third one arrives. (Which makes this | ||
| 682 | * not a "true" RNDIS mode. In the RNDIS protocol short-packet termination | ||
| 683 | * is optional, and it's fine if peripherals -- not hosts! -- pad messages | ||
| 684 | * out to end-of-buffer. Standard PCI host controller DMA descriptors | ||
| 685 | * implement that mode by default ... which is no accident.) | ||
| 686 | * | ||
| 687 | * - RX queues in "transparent" mode -- two BDs with 512 bytes each -- have | ||
| 688 | * converse problems: (b) is handled right, but (a) loses badly. CPPI RX | ||
| 689 | * ignores SOP/EOP markings and processes both of those BDs; so both packets | ||
| 690 | * are loaded into the buffer (with a 212 byte gap between them), and the next | ||
| 691 | * buffer queued will NOT get its 300 bytes of data. (It seems like SOP/EOP | ||
| 692 | * are intended as outputs for RX queues, not inputs...) | ||
| 693 | * | ||
| 694 | * - A variant of "transparent" mode -- one BD at a time -- is the only way to | ||
| 695 | * reliably make both cases work, with software handling both cases correctly | ||
| 696 | * and at the significant penalty of needing an IRQ per packet. (The lack of | ||
| 697 | * I/O overlap can be slightly ameliorated by enabling double buffering.) | ||
| 698 | * | ||
| 699 | * So how to get rid of IRQ-per-packet? The transparent multi-BD case could | ||
| 700 | * be used in special cases like mass storage, which sets URB_SHORT_NOT_OK | ||
| 701 | * (or maybe its peripheral side counterpart) to flag (a) scenarios as errors | ||
| 702 | * with guaranteed driver level fault recovery and scrubbing out what's left | ||
| 703 | * of that garbaged datastream. | ||
| 704 | * | ||
| 705 | * But there seems to be no way to identify the cases where CPPI RNDIS mode | ||
| 706 | * is appropriate -- which do NOT include RNDIS host drivers, but do include | ||
| 707 | * the CDC Ethernet driver! -- and the documentation is incomplete/wrong. | ||
| 708 | * So we can't _ever_ use RX RNDIS mode ... except by using a heuristic | ||
| 709 | * that applies best on the peripheral side (and which could fail rudely). | ||
| 710 | * | ||
| 711 | * Leaving only "transparent" mode; we avoid multi-bd modes in almost all | ||
| 712 | * cases other than mass storage class. Otherwise we're correct but slow, | ||
| 713 | * since CPPI penalizes our need for a "true RNDIS" default mode. | ||
| 714 | */ | ||
| 715 | |||
| 716 | |||
| 717 | /* Heuristic, intended to kick in for ethernet/rndis peripheral ONLY | ||
| 718 | * | ||
| 719 | * IFF | ||
| 720 | * (a) peripheral mode ... since rndis peripherals could pad their | ||
| 721 | * writes to hosts, causing i/o failure; or we'd have to cope with | ||
| 722 | * a largely unknowable variety of host side protocol variants | ||
| 723 | * (b) and short reads are NOT errors ... since full reads would | ||
| 724 | * cause those same i/o failures | ||
| 725 | * (c) and read length is | ||
| 726 | * - less than 64KB (max per cppi descriptor) | ||
| 727 | * - not a multiple of 4096 (g_zero default, full reads typical) | ||
| 728 | * - N (>1) packets long, ditto (full reads not EXPECTED) | ||
| 729 | * THEN | ||
| 730 | * try rx rndis mode | ||
| 731 | * | ||
| 732 | * Cost of heuristic failing: RXDMA wedges at the end of transfers that | ||
| 733 | * fill out the whole buffer. Buggy host side usb network drivers could | ||
| 734 | * trigger that, but "in the field" such bugs seem to be all but unknown. | ||
| 735 | * | ||
| 736 | * So this module parameter lets the heuristic be disabled. When using | ||
| 737 | * gadgetfs, the heuristic will probably need to be disabled. | ||
| 738 | */ | ||
| 739 | static int cppi_rx_rndis = 1; | ||
| 740 | |||
| 741 | module_param(cppi_rx_rndis, bool, 0); | ||
| 742 | MODULE_PARM_DESC(cppi_rx_rndis, "enable/disable RX RNDIS heuristic"); | ||
| 743 | |||
| 744 | |||
| 745 | /** | ||
| 746 | * cppi_next_rx_segment - dma read for the next chunk of a buffer | ||
| 747 | * @musb: the controller | ||
| 748 | * @rx: dma channel | ||
| 749 | * @onepacket: true unless caller treats short reads as errors, and | ||
| 750 | * performs fault recovery above usbcore. | ||
| 751 | * Context: controller irqlocked | ||
| 752 | * | ||
| 753 | * See above notes about why we can't use multi-BD RX queues except in | ||
| 754 | * rare cases (mass storage class), and can never use the hardware "rndis" | ||
| 755 | * mode (since it's not a "true" RNDIS mode) with complete safety.. | ||
| 756 | * | ||
| 757 | * It's ESSENTIAL that callers specify "onepacket" mode unless they kick in | ||
| 758 | * code to recover from corrupted datastreams after each short transfer. | ||
| 759 | */ | ||
| 760 | static void | ||
| 761 | cppi_next_rx_segment(struct musb *musb, struct cppi_channel *rx, int onepacket) | ||
| 762 | { | ||
| 763 | unsigned maxpacket = rx->maxpacket; | ||
| 764 | dma_addr_t addr = rx->buf_dma + rx->offset; | ||
| 765 | size_t length = rx->buf_len - rx->offset; | ||
| 766 | struct cppi_descriptor *bd, *tail; | ||
| 767 | unsigned n_bds; | ||
| 768 | unsigned i; | ||
| 769 | void __iomem *tibase = musb->ctrl_base; | ||
| 770 | int is_rndis = 0; | ||
| 771 | struct cppi_rx_stateram __iomem *rx_ram = rx->state_ram; | ||
| 772 | |||
| 773 | if (onepacket) { | ||
| 774 | /* almost every USB driver, host or peripheral side */ | ||
| 775 | n_bds = 1; | ||
| 776 | |||
| 777 | /* maybe apply the heuristic above */ | ||
| 778 | if (cppi_rx_rndis | ||
| 779 | && is_peripheral_active(musb) | ||
| 780 | && length > maxpacket | ||
| 781 | && (length & ~0xffff) == 0 | ||
| 782 | && (length & 0x0fff) != 0 | ||
| 783 | && (length & (maxpacket - 1)) == 0) { | ||
| 784 | maxpacket = length; | ||
| 785 | is_rndis = 1; | ||
| 786 | } | ||
| 787 | } else { | ||
| 788 | /* virtually nothing except mass storage class */ | ||
| 789 | if (length > 0xffff) { | ||
| 790 | n_bds = 0xffff / maxpacket; | ||
| 791 | length = n_bds * maxpacket; | ||
| 792 | } else { | ||
| 793 | n_bds = length / maxpacket; | ||
| 794 | if (length % maxpacket) | ||
| 795 | n_bds++; | ||
| 796 | } | ||
| 797 | if (n_bds == 1) | ||
| 798 | onepacket = 1; | ||
| 799 | else | ||
| 800 | n_bds = min(n_bds, (unsigned) NUM_RXCHAN_BD); | ||
| 801 | } | ||
| 802 | |||
| 803 | /* In host mode, autorequest logic can generate some IN tokens; it's | ||
| 804 | * tricky since we can't leave REQPKT set in RXCSR after the transfer | ||
| 805 | * finishes. So: multipacket transfers involve two or more segments. | ||
| 806 | * And always at least two IRQs ... RNDIS mode is not an option. | ||
| 807 | */ | ||
| 808 | if (is_host_active(musb)) | ||
| 809 | n_bds = cppi_autoreq_update(rx, tibase, onepacket, n_bds); | ||
| 810 | |||
| 811 | cppi_rndis_update(rx, 1, musb->ctrl_base, is_rndis); | ||
| 812 | |||
| 813 | length = min(n_bds * maxpacket, length); | ||
| 814 | |||
| 815 | DBG(4, "RX DMA%d seg, maxp %d %s bds %d (cnt %d) " | ||
| 816 | "dma 0x%x len %u %u/%u\n", | ||
| 817 | rx->index, maxpacket, | ||
| 818 | onepacket | ||
| 819 | ? (is_rndis ? "rndis" : "onepacket") | ||
| 820 | : "multipacket", | ||
| 821 | n_bds, | ||
| 822 | musb_readl(tibase, | ||
| 823 | DAVINCI_RXCPPI_BUFCNT0_REG + (rx->index * 4)) | ||
| 824 | & 0xffff, | ||
| 825 | addr, length, rx->channel.actual_len, rx->buf_len); | ||
| 826 | |||
| 827 | /* only queue one segment at a time, since the hardware prevents | ||
| 828 | * correct queue shutdown after unexpected short packets | ||
| 829 | */ | ||
| 830 | bd = cppi_bd_alloc(rx); | ||
| 831 | rx->head = bd; | ||
| 832 | |||
| 833 | /* Build BDs for all packets in this segment */ | ||
| 834 | for (i = 0, tail = NULL; bd && i < n_bds; i++, tail = bd) { | ||
| 835 | u32 bd_len; | ||
| 836 | |||
| 837 | if (i) { | ||
| 838 | bd = cppi_bd_alloc(rx); | ||
| 839 | if (!bd) | ||
| 840 | break; | ||
| 841 | tail->next = bd; | ||
| 842 | tail->hw_next = bd->dma; | ||
| 843 | } | ||
| 844 | bd->hw_next = 0; | ||
| 845 | |||
| 846 | /* all but the last packet will be maxpacket size */ | ||
| 847 | if (maxpacket < length) | ||
| 848 | bd_len = maxpacket; | ||
| 849 | else | ||
| 850 | bd_len = length; | ||
| 851 | |||
| 852 | bd->hw_bufp = addr; | ||
| 853 | addr += bd_len; | ||
| 854 | rx->offset += bd_len; | ||
| 855 | |||
| 856 | bd->hw_off_len = (0 /*offset*/ << 16) + bd_len; | ||
| 857 | bd->buflen = bd_len; | ||
| 858 | |||
| 859 | bd->hw_options = CPPI_OWN_SET | (i == 0 ? length : 0); | ||
| 860 | length -= bd_len; | ||
| 861 | } | ||
| 862 | |||
| 863 | /* we always expect at least one reusable BD! */ | ||
| 864 | if (!tail) { | ||
| 865 | WARNING("rx dma%d -- no BDs? need %d\n", rx->index, n_bds); | ||
| 866 | return; | ||
| 867 | } else if (i < n_bds) | ||
| 868 | WARNING("rx dma%d -- only %d of %d BDs\n", rx->index, i, n_bds); | ||
| 869 | |||
| 870 | tail->next = NULL; | ||
| 871 | tail->hw_next = 0; | ||
| 872 | |||
| 873 | bd = rx->head; | ||
| 874 | rx->tail = tail; | ||
| 875 | |||
| 876 | /* short reads and other faults should terminate this entire | ||
| 877 | * dma segment. we want one "dma packet" per dma segment, not | ||
| 878 | * one per USB packet, terminating the whole queue at once... | ||
| 879 | * NOTE that current hardware seems to ignore SOP and EOP. | ||
| 880 | */ | ||
| 881 | bd->hw_options |= CPPI_SOP_SET; | ||
| 882 | tail->hw_options |= CPPI_EOP_SET; | ||
| 883 | |||
| 884 | if (debug >= 5) { | ||
| 885 | struct cppi_descriptor *d; | ||
| 886 | |||
| 887 | for (d = rx->head; d; d = d->next) | ||
| 888 | cppi_dump_rxbd("S", d); | ||
| 889 | } | ||
| 890 | |||
| 891 | /* in case the preceding transfer left some state... */ | ||
| 892 | tail = rx->last_processed; | ||
| 893 | if (tail) { | ||
| 894 | tail->next = bd; | ||
| 895 | tail->hw_next = bd->dma; | ||
| 896 | } | ||
| 897 | |||
| 898 | core_rxirq_enable(tibase, rx->index + 1); | ||
| 899 | |||
| 900 | /* BDs live in DMA-coherent memory, but writes might be pending */ | ||
| 901 | cpu_drain_writebuffer(); | ||
| 902 | |||
| 903 | /* REVISIT specs say to write this AFTER the BUFCNT register | ||
| 904 | * below ... but that loses badly. | ||
| 905 | */ | ||
| 906 | musb_writel(&rx_ram->rx_head, 0, bd->dma); | ||
| 907 | |||
| 908 | /* bufferCount must be at least 3, and zeroes on completion | ||
| 909 | * unless it underflows below zero, or stops at two, or keeps | ||
| 910 | * growing ... grr. | ||
| 911 | */ | ||
| 912 | i = musb_readl(tibase, | ||
| 913 | DAVINCI_RXCPPI_BUFCNT0_REG + (rx->index * 4)) | ||
| 914 | & 0xffff; | ||
| 915 | |||
| 916 | if (!i) | ||
| 917 | musb_writel(tibase, | ||
| 918 | DAVINCI_RXCPPI_BUFCNT0_REG + (rx->index * 4), | ||
| 919 | n_bds + 2); | ||
| 920 | else if (n_bds > (i - 3)) | ||
| 921 | musb_writel(tibase, | ||
| 922 | DAVINCI_RXCPPI_BUFCNT0_REG + (rx->index * 4), | ||
| 923 | n_bds - (i - 3)); | ||
| 924 | |||
| 925 | i = musb_readl(tibase, | ||
| 926 | DAVINCI_RXCPPI_BUFCNT0_REG + (rx->index * 4)) | ||
| 927 | & 0xffff; | ||
| 928 | if (i < (2 + n_bds)) { | ||
| 929 | DBG(2, "bufcnt%d underrun - %d (for %d)\n", | ||
| 930 | rx->index, i, n_bds); | ||
| 931 | musb_writel(tibase, | ||
| 932 | DAVINCI_RXCPPI_BUFCNT0_REG + (rx->index * 4), | ||
| 933 | n_bds + 2); | ||
| 934 | } | ||
| 935 | |||
| 936 | cppi_dump_rx(4, rx, "/S"); | ||
| 937 | } | ||
| 938 | |||
| 939 | /** | ||
| 940 | * cppi_channel_program - program channel for data transfer | ||
| 941 | * @ch: the channel | ||
| 942 | * @maxpacket: max packet size | ||
| 943 | * @mode: For RX, 1 unless the usb protocol driver promised to treat | ||
| 944 | * all short reads as errors and kick in high level fault recovery. | ||
| 945 | * For TX, ignored because of RNDIS mode races/glitches. | ||
| 946 | * @dma_addr: dma address of buffer | ||
| 947 | * @len: length of buffer | ||
| 948 | * Context: controller irqlocked | ||
| 949 | */ | ||
| 950 | static int cppi_channel_program(struct dma_channel *ch, | ||
| 951 | u16 maxpacket, u8 mode, | ||
| 952 | dma_addr_t dma_addr, u32 len) | ||
| 953 | { | ||
| 954 | struct cppi_channel *cppi_ch; | ||
| 955 | struct cppi *controller; | ||
| 956 | struct musb *musb; | ||
| 957 | |||
| 958 | cppi_ch = container_of(ch, struct cppi_channel, channel); | ||
| 959 | controller = cppi_ch->controller; | ||
| 960 | musb = controller->musb; | ||
| 961 | |||
| 962 | switch (ch->status) { | ||
| 963 | case MUSB_DMA_STATUS_BUS_ABORT: | ||
| 964 | case MUSB_DMA_STATUS_CORE_ABORT: | ||
| 965 | /* fault irq handler should have handled cleanup */ | ||
| 966 | WARNING("%cX DMA%d not cleaned up after abort!\n", | ||
| 967 | cppi_ch->transmit ? 'T' : 'R', | ||
| 968 | cppi_ch->index); | ||
| 969 | /* WARN_ON(1); */ | ||
| 970 | break; | ||
| 971 | case MUSB_DMA_STATUS_BUSY: | ||
| 972 | WARNING("program active channel? %cX DMA%d\n", | ||
| 973 | cppi_ch->transmit ? 'T' : 'R', | ||
| 974 | cppi_ch->index); | ||
| 975 | /* WARN_ON(1); */ | ||
| 976 | break; | ||
| 977 | case MUSB_DMA_STATUS_UNKNOWN: | ||
| 978 | DBG(1, "%cX DMA%d not allocated!\n", | ||
| 979 | cppi_ch->transmit ? 'T' : 'R', | ||
| 980 | cppi_ch->index); | ||
| 981 | /* FALLTHROUGH */ | ||
| 982 | case MUSB_DMA_STATUS_FREE: | ||
| 983 | break; | ||
| 984 | } | ||
| 985 | |||
| 986 | ch->status = MUSB_DMA_STATUS_BUSY; | ||
| 987 | |||
| 988 | /* set transfer parameters, then queue up its first segment */ | ||
| 989 | cppi_ch->buf_dma = dma_addr; | ||
| 990 | cppi_ch->offset = 0; | ||
| 991 | cppi_ch->maxpacket = maxpacket; | ||
| 992 | cppi_ch->buf_len = len; | ||
| 993 | |||
| 994 | /* TX channel? or RX? */ | ||
| 995 | if (cppi_ch->transmit) | ||
| 996 | cppi_next_tx_segment(musb, cppi_ch); | ||
| 997 | else | ||
| 998 | cppi_next_rx_segment(musb, cppi_ch, mode); | ||
| 999 | |||
| 1000 | return true; | ||
| 1001 | } | ||
| 1002 | |||
| 1003 | static bool cppi_rx_scan(struct cppi *cppi, unsigned ch) | ||
| 1004 | { | ||
| 1005 | struct cppi_channel *rx = &cppi->rx[ch]; | ||
| 1006 | struct cppi_rx_stateram __iomem *state = rx->state_ram; | ||
| 1007 | struct cppi_descriptor *bd; | ||
| 1008 | struct cppi_descriptor *last = rx->last_processed; | ||
| 1009 | bool completed = false; | ||
| 1010 | bool acked = false; | ||
| 1011 | int i; | ||
| 1012 | dma_addr_t safe2ack; | ||
| 1013 | void __iomem *regs = rx->hw_ep->regs; | ||
| 1014 | |||
| 1015 | cppi_dump_rx(6, rx, "/K"); | ||
| 1016 | |||
| 1017 | bd = last ? last->next : rx->head; | ||
| 1018 | if (!bd) | ||
| 1019 | return false; | ||
| 1020 | |||
| 1021 | /* run through all completed BDs */ | ||
| 1022 | for (i = 0, safe2ack = musb_readl(&state->rx_complete, 0); | ||
| 1023 | (safe2ack || completed) && bd && i < NUM_RXCHAN_BD; | ||
| 1024 | i++, bd = bd->next) { | ||
| 1025 | u16 len; | ||
| 1026 | |||
| 1027 | /* catch latest BD writes from CPPI */ | ||
| 1028 | rmb(); | ||
| 1029 | if (!completed && (bd->hw_options & CPPI_OWN_SET)) | ||
| 1030 | break; | ||
| 1031 | |||
| 1032 | DBG(5, "C/RXBD %08x: nxt %08x buf %08x " | ||
| 1033 | "off.len %08x opt.len %08x (%d)\n", | ||
| 1034 | bd->dma, bd->hw_next, bd->hw_bufp, | ||
| 1035 | bd->hw_off_len, bd->hw_options, | ||
| 1036 | rx->channel.actual_len); | ||
| 1037 | |||
| 1038 | /* actual packet received length */ | ||
| 1039 | if ((bd->hw_options & CPPI_SOP_SET) && !completed) | ||
| 1040 | len = bd->hw_off_len & CPPI_RECV_PKTLEN_MASK; | ||
| 1041 | else | ||
| 1042 | len = 0; | ||
| 1043 | |||
| 1044 | if (bd->hw_options & CPPI_EOQ_MASK) | ||
| 1045 | completed = true; | ||
| 1046 | |||
| 1047 | if (!completed && len < bd->buflen) { | ||
| 1048 | /* NOTE: when we get a short packet, RXCSR_H_REQPKT | ||
| 1049 | * must have been cleared, and no more DMA packets may | ||
| 1050 | * active be in the queue... TI docs didn't say, but | ||
| 1051 | * CPPI ignores those BDs even though OWN is still set. | ||
| 1052 | */ | ||
| 1053 | completed = true; | ||
| 1054 | DBG(3, "rx short %d/%d (%d)\n", | ||
| 1055 | len, bd->buflen, | ||
| 1056 | rx->channel.actual_len); | ||
| 1057 | } | ||
| 1058 | |||
| 1059 | /* If we got here, we expect to ack at least one BD; meanwhile | ||
| 1060 | * CPPI may completing other BDs while we scan this list... | ||
| 1061 | * | ||
| 1062 | * RACE: we can notice OWN cleared before CPPI raises the | ||
| 1063 | * matching irq by writing that BD as the completion pointer. | ||
| 1064 | * In such cases, stop scanning and wait for the irq, avoiding | ||
| 1065 | * lost acks and states where BD ownership is unclear. | ||
| 1066 | */ | ||
| 1067 | if (bd->dma == safe2ack) { | ||
| 1068 | musb_writel(&state->rx_complete, 0, safe2ack); | ||
| 1069 | safe2ack = musb_readl(&state->rx_complete, 0); | ||
| 1070 | acked = true; | ||
| 1071 | if (bd->dma == safe2ack) | ||
| 1072 | safe2ack = 0; | ||
| 1073 | } | ||
| 1074 | |||
| 1075 | rx->channel.actual_len += len; | ||
| 1076 | |||
| 1077 | cppi_bd_free(rx, last); | ||
| 1078 | last = bd; | ||
| 1079 | |||
| 1080 | /* stop scanning on end-of-segment */ | ||
| 1081 | if (bd->hw_next == 0) | ||
| 1082 | completed = true; | ||
| 1083 | } | ||
| 1084 | rx->last_processed = last; | ||
| 1085 | |||
| 1086 | /* dma abort, lost ack, or ... */ | ||
| 1087 | if (!acked && last) { | ||
| 1088 | int csr; | ||
| 1089 | |||
| 1090 | if (safe2ack == 0 || safe2ack == rx->last_processed->dma) | ||
| 1091 | musb_writel(&state->rx_complete, 0, safe2ack); | ||
| 1092 | if (safe2ack == 0) { | ||
| 1093 | cppi_bd_free(rx, last); | ||
| 1094 | rx->last_processed = NULL; | ||
| 1095 | |||
| 1096 | /* if we land here on the host side, H_REQPKT will | ||
| 1097 | * be clear and we need to restart the queue... | ||
| 1098 | */ | ||
| 1099 | WARN_ON(rx->head); | ||
| 1100 | } | ||
| 1101 | musb_ep_select(cppi->mregs, rx->index + 1); | ||
| 1102 | csr = musb_readw(regs, MUSB_RXCSR); | ||
| 1103 | if (csr & MUSB_RXCSR_DMAENAB) { | ||
| 1104 | DBG(4, "list%d %p/%p, last %08x%s, csr %04x\n", | ||
| 1105 | rx->index, | ||
| 1106 | rx->head, rx->tail, | ||
| 1107 | rx->last_processed | ||
| 1108 | ? rx->last_processed->dma | ||
| 1109 | : 0, | ||
| 1110 | completed ? ", completed" : "", | ||
| 1111 | csr); | ||
| 1112 | cppi_dump_rxq(4, "/what?", rx); | ||
| 1113 | } | ||
| 1114 | } | ||
| 1115 | if (!completed) { | ||
| 1116 | int csr; | ||
| 1117 | |||
| 1118 | rx->head = bd; | ||
| 1119 | |||
| 1120 | /* REVISIT seems like "autoreq all but EOP" doesn't... | ||
| 1121 | * setting it here "should" be racey, but seems to work | ||
| 1122 | */ | ||
| 1123 | csr = musb_readw(rx->hw_ep->regs, MUSB_RXCSR); | ||
| 1124 | if (is_host_active(cppi->musb) | ||
| 1125 | && bd | ||
| 1126 | && !(csr & MUSB_RXCSR_H_REQPKT)) { | ||
| 1127 | csr |= MUSB_RXCSR_H_REQPKT; | ||
| 1128 | musb_writew(regs, MUSB_RXCSR, | ||
| 1129 | MUSB_RXCSR_H_WZC_BITS | csr); | ||
| 1130 | csr = musb_readw(rx->hw_ep->regs, MUSB_RXCSR); | ||
| 1131 | } | ||
| 1132 | } else { | ||
| 1133 | rx->head = NULL; | ||
| 1134 | rx->tail = NULL; | ||
| 1135 | } | ||
| 1136 | |||
| 1137 | cppi_dump_rx(6, rx, completed ? "/completed" : "/cleaned"); | ||
| 1138 | return completed; | ||
| 1139 | } | ||
| 1140 | |||
| 1141 | void cppi_completion(struct musb *musb, u32 rx, u32 tx) | ||
| 1142 | { | ||
| 1143 | void __iomem *tibase; | ||
| 1144 | int i, index; | ||
| 1145 | struct cppi *cppi; | ||
| 1146 | struct musb_hw_ep *hw_ep = NULL; | ||
| 1147 | |||
| 1148 | cppi = container_of(musb->dma_controller, struct cppi, controller); | ||
| 1149 | |||
| 1150 | tibase = musb->ctrl_base; | ||
| 1151 | |||
| 1152 | /* process TX channels */ | ||
| 1153 | for (index = 0; tx; tx = tx >> 1, index++) { | ||
| 1154 | struct cppi_channel *tx_ch; | ||
| 1155 | struct cppi_tx_stateram __iomem *tx_ram; | ||
| 1156 | bool completed = false; | ||
| 1157 | struct cppi_descriptor *bd; | ||
| 1158 | |||
| 1159 | if (!(tx & 1)) | ||
| 1160 | continue; | ||
| 1161 | |||
| 1162 | tx_ch = cppi->tx + index; | ||
| 1163 | tx_ram = tx_ch->state_ram; | ||
| 1164 | |||
| 1165 | /* FIXME need a cppi_tx_scan() routine, which | ||
| 1166 | * can also be called from abort code | ||
| 1167 | */ | ||
| 1168 | |||
| 1169 | cppi_dump_tx(5, tx_ch, "/E"); | ||
| 1170 | |||
| 1171 | bd = tx_ch->head; | ||
| 1172 | |||
| 1173 | if (NULL == bd) { | ||
| 1174 | DBG(1, "null BD\n"); | ||
| 1175 | continue; | ||
| 1176 | } | ||
| 1177 | |||
| 1178 | /* run through all completed BDs */ | ||
| 1179 | for (i = 0; !completed && bd && i < NUM_TXCHAN_BD; | ||
| 1180 | i++, bd = bd->next) { | ||
| 1181 | u16 len; | ||
| 1182 | |||
| 1183 | /* catch latest BD writes from CPPI */ | ||
| 1184 | rmb(); | ||
| 1185 | if (bd->hw_options & CPPI_OWN_SET) | ||
| 1186 | break; | ||
| 1187 | |||
| 1188 | DBG(5, "C/TXBD %p n %x b %x off %x opt %x\n", | ||
| 1189 | bd, bd->hw_next, bd->hw_bufp, | ||
| 1190 | bd->hw_off_len, bd->hw_options); | ||
| 1191 | |||
| 1192 | len = bd->hw_off_len & CPPI_BUFFER_LEN_MASK; | ||
| 1193 | tx_ch->channel.actual_len += len; | ||
| 1194 | |||
| 1195 | tx_ch->last_processed = bd; | ||
| 1196 | |||
| 1197 | /* write completion register to acknowledge | ||
| 1198 | * processing of completed BDs, and possibly | ||
| 1199 | * release the IRQ; EOQ might not be set ... | ||
| 1200 | * | ||
| 1201 | * REVISIT use the same ack strategy as rx | ||
| 1202 | * | ||
| 1203 | * REVISIT have observed bit 18 set; huh?? | ||
| 1204 | */ | ||
| 1205 | /* if ((bd->hw_options & CPPI_EOQ_MASK)) */ | ||
| 1206 | musb_writel(&tx_ram->tx_complete, 0, bd->dma); | ||
| 1207 | |||
| 1208 | /* stop scanning on end-of-segment */ | ||
| 1209 | if (bd->hw_next == 0) | ||
| 1210 | completed = true; | ||
| 1211 | } | ||
| 1212 | |||
| 1213 | /* on end of segment, maybe go to next one */ | ||
| 1214 | if (completed) { | ||
| 1215 | /* cppi_dump_tx(4, tx_ch, "/complete"); */ | ||
| 1216 | |||
| 1217 | /* transfer more, or report completion */ | ||
| 1218 | if (tx_ch->offset >= tx_ch->buf_len) { | ||
| 1219 | tx_ch->head = NULL; | ||
| 1220 | tx_ch->tail = NULL; | ||
| 1221 | tx_ch->channel.status = MUSB_DMA_STATUS_FREE; | ||
| 1222 | |||
| 1223 | hw_ep = tx_ch->hw_ep; | ||
| 1224 | |||
| 1225 | /* Peripheral role never repurposes the | ||
| 1226 | * endpoint, so immediate completion is | ||
| 1227 | * safe. Host role waits for the fifo | ||
| 1228 | * to empty (TXPKTRDY irq) before going | ||
| 1229 | * to the next queued bulk transfer. | ||
| 1230 | */ | ||
| 1231 | if (is_host_active(cppi->musb)) { | ||
| 1232 | #if 0 | ||
| 1233 | /* WORKAROUND because we may | ||
| 1234 | * not always get TXKPTRDY ... | ||
| 1235 | */ | ||
| 1236 | int csr; | ||
| 1237 | |||
| 1238 | csr = musb_readw(hw_ep->regs, | ||
| 1239 | MUSB_TXCSR); | ||
| 1240 | if (csr & MUSB_TXCSR_TXPKTRDY) | ||
| 1241 | #endif | ||
| 1242 | completed = false; | ||
| 1243 | } | ||
| 1244 | if (completed) | ||
| 1245 | musb_dma_completion(musb, index + 1, 1); | ||
| 1246 | |||
| 1247 | } else { | ||
| 1248 | /* Bigger transfer than we could fit in | ||
| 1249 | * that first batch of descriptors... | ||
| 1250 | */ | ||
| 1251 | cppi_next_tx_segment(musb, tx_ch); | ||
| 1252 | } | ||
| 1253 | } else | ||
| 1254 | tx_ch->head = bd; | ||
| 1255 | } | ||
| 1256 | |||
| 1257 | /* Start processing the RX block */ | ||
| 1258 | for (index = 0; rx; rx = rx >> 1, index++) { | ||
| 1259 | |||
| 1260 | if (rx & 1) { | ||
| 1261 | struct cppi_channel *rx_ch; | ||
| 1262 | |||
| 1263 | rx_ch = cppi->rx + index; | ||
| 1264 | |||
| 1265 | /* let incomplete dma segments finish */ | ||
| 1266 | if (!cppi_rx_scan(cppi, index)) | ||
| 1267 | continue; | ||
| 1268 | |||
| 1269 | /* start another dma segment if needed */ | ||
| 1270 | if (rx_ch->channel.actual_len != rx_ch->buf_len | ||
| 1271 | && rx_ch->channel.actual_len | ||
| 1272 | == rx_ch->offset) { | ||
| 1273 | cppi_next_rx_segment(musb, rx_ch, 1); | ||
| 1274 | continue; | ||
| 1275 | } | ||
| 1276 | |||
| 1277 | /* all segments completed! */ | ||
| 1278 | rx_ch->channel.status = MUSB_DMA_STATUS_FREE; | ||
| 1279 | |||
| 1280 | hw_ep = rx_ch->hw_ep; | ||
| 1281 | |||
| 1282 | core_rxirq_disable(tibase, index + 1); | ||
| 1283 | musb_dma_completion(musb, index + 1, 0); | ||
| 1284 | } | ||
| 1285 | } | ||
| 1286 | |||
| 1287 | /* write to CPPI EOI register to re-enable interrupts */ | ||
| 1288 | musb_writel(tibase, DAVINCI_CPPI_EOI_REG, 0); | ||
| 1289 | } | ||
| 1290 | |||
| 1291 | /* Instantiate a software object representing a DMA controller. */ | ||
| 1292 | struct dma_controller *__init | ||
| 1293 | dma_controller_create(struct musb *musb, void __iomem *mregs) | ||
| 1294 | { | ||
| 1295 | struct cppi *controller; | ||
| 1296 | |||
| 1297 | controller = kzalloc(sizeof *controller, GFP_KERNEL); | ||
| 1298 | if (!controller) | ||
| 1299 | return NULL; | ||
| 1300 | |||
| 1301 | controller->mregs = mregs; | ||
| 1302 | controller->tibase = mregs - DAVINCI_BASE_OFFSET; | ||
| 1303 | |||
| 1304 | controller->musb = musb; | ||
| 1305 | controller->controller.start = cppi_controller_start; | ||
| 1306 | controller->controller.stop = cppi_controller_stop; | ||
| 1307 | controller->controller.channel_alloc = cppi_channel_allocate; | ||
| 1308 | controller->controller.channel_release = cppi_channel_release; | ||
| 1309 | controller->controller.channel_program = cppi_channel_program; | ||
| 1310 | controller->controller.channel_abort = cppi_channel_abort; | ||
| 1311 | |||
| 1312 | /* NOTE: allocating from on-chip SRAM would give the least | ||
| 1313 | * contention for memory access, if that ever matters here. | ||
| 1314 | */ | ||
| 1315 | |||
| 1316 | /* setup BufferPool */ | ||
| 1317 | controller->pool = dma_pool_create("cppi", | ||
| 1318 | controller->musb->controller, | ||
| 1319 | sizeof(struct cppi_descriptor), | ||
| 1320 | CPPI_DESCRIPTOR_ALIGN, 0); | ||
| 1321 | if (!controller->pool) { | ||
| 1322 | kfree(controller); | ||
| 1323 | return NULL; | ||
| 1324 | } | ||
| 1325 | |||
| 1326 | return &controller->controller; | ||
| 1327 | } | ||
| 1328 | |||
| 1329 | /* | ||
| 1330 | * Destroy a previously-instantiated DMA controller. | ||
| 1331 | */ | ||
| 1332 | void dma_controller_destroy(struct dma_controller *c) | ||
| 1333 | { | ||
| 1334 | struct cppi *cppi; | ||
| 1335 | |||
| 1336 | cppi = container_of(c, struct cppi, controller); | ||
| 1337 | |||
| 1338 | /* assert: caller stopped the controller first */ | ||
| 1339 | dma_pool_destroy(cppi->pool); | ||
| 1340 | |||
| 1341 | kfree(cppi); | ||
| 1342 | } | ||
| 1343 | |||
| 1344 | /* | ||
| 1345 | * Context: controller irqlocked, endpoint selected | ||
| 1346 | */ | ||
| 1347 | static int cppi_channel_abort(struct dma_channel *channel) | ||
| 1348 | { | ||
| 1349 | struct cppi_channel *cppi_ch; | ||
| 1350 | struct cppi *controller; | ||
| 1351 | void __iomem *mbase; | ||
| 1352 | void __iomem *tibase; | ||
| 1353 | void __iomem *regs; | ||
| 1354 | u32 value; | ||
| 1355 | struct cppi_descriptor *queue; | ||
| 1356 | |||
| 1357 | cppi_ch = container_of(channel, struct cppi_channel, channel); | ||
| 1358 | |||
| 1359 | controller = cppi_ch->controller; | ||
| 1360 | |||
| 1361 | switch (channel->status) { | ||
| 1362 | case MUSB_DMA_STATUS_BUS_ABORT: | ||
| 1363 | case MUSB_DMA_STATUS_CORE_ABORT: | ||
| 1364 | /* from RX or TX fault irq handler */ | ||
| 1365 | case MUSB_DMA_STATUS_BUSY: | ||
| 1366 | /* the hardware needs shutting down */ | ||
| 1367 | regs = cppi_ch->hw_ep->regs; | ||
| 1368 | break; | ||
| 1369 | case MUSB_DMA_STATUS_UNKNOWN: | ||
| 1370 | case MUSB_DMA_STATUS_FREE: | ||
| 1371 | return 0; | ||
| 1372 | default: | ||
| 1373 | return -EINVAL; | ||
| 1374 | } | ||
| 1375 | |||
| 1376 | if (!cppi_ch->transmit && cppi_ch->head) | ||
| 1377 | cppi_dump_rxq(3, "/abort", cppi_ch); | ||
| 1378 | |||
| 1379 | mbase = controller->mregs; | ||
| 1380 | tibase = controller->tibase; | ||
| 1381 | |||
| 1382 | queue = cppi_ch->head; | ||
| 1383 | cppi_ch->head = NULL; | ||
| 1384 | cppi_ch->tail = NULL; | ||
| 1385 | |||
| 1386 | /* REVISIT should rely on caller having done this, | ||
| 1387 | * and caller should rely on us not changing it. | ||
| 1388 | * peripheral code is safe ... check host too. | ||
| 1389 | */ | ||
| 1390 | musb_ep_select(mbase, cppi_ch->index + 1); | ||
| 1391 | |||
| 1392 | if (cppi_ch->transmit) { | ||
| 1393 | struct cppi_tx_stateram __iomem *tx_ram; | ||
| 1394 | int enabled; | ||
| 1395 | |||
| 1396 | /* mask interrupts raised to signal teardown complete. */ | ||
| 1397 | enabled = musb_readl(tibase, DAVINCI_TXCPPI_INTENAB_REG) | ||
| 1398 | & (1 << cppi_ch->index); | ||
| 1399 | if (enabled) | ||
| 1400 | musb_writel(tibase, DAVINCI_TXCPPI_INTCLR_REG, | ||
| 1401 | (1 << cppi_ch->index)); | ||
| 1402 | |||
| 1403 | /* REVISIT put timeouts on these controller handshakes */ | ||
| 1404 | |||
| 1405 | cppi_dump_tx(6, cppi_ch, " (teardown)"); | ||
| 1406 | |||
| 1407 | /* teardown DMA engine then usb core */ | ||
| 1408 | do { | ||
| 1409 | value = musb_readl(tibase, DAVINCI_TXCPPI_TEAR_REG); | ||
| 1410 | } while (!(value & CPPI_TEAR_READY)); | ||
| 1411 | musb_writel(tibase, DAVINCI_TXCPPI_TEAR_REG, cppi_ch->index); | ||
| 1412 | |||
| 1413 | tx_ram = cppi_ch->state_ram; | ||
| 1414 | do { | ||
| 1415 | value = musb_readl(&tx_ram->tx_complete, 0); | ||
| 1416 | } while (0xFFFFFFFC != value); | ||
| 1417 | musb_writel(&tx_ram->tx_complete, 0, 0xFFFFFFFC); | ||
| 1418 | |||
| 1419 | /* FIXME clean up the transfer state ... here? | ||
| 1420 | * the completion routine should get called with | ||
| 1421 | * an appropriate status code. | ||
| 1422 | */ | ||
| 1423 | |||
| 1424 | value = musb_readw(regs, MUSB_TXCSR); | ||
| 1425 | value &= ~MUSB_TXCSR_DMAENAB; | ||
| 1426 | value |= MUSB_TXCSR_FLUSHFIFO; | ||
| 1427 | musb_writew(regs, MUSB_TXCSR, value); | ||
| 1428 | musb_writew(regs, MUSB_TXCSR, value); | ||
| 1429 | |||
| 1430 | /* re-enable interrupt */ | ||
| 1431 | if (enabled) | ||
| 1432 | musb_writel(tibase, DAVINCI_TXCPPI_INTENAB_REG, | ||
| 1433 | (1 << cppi_ch->index)); | ||
| 1434 | |||
| 1435 | /* While we scrub the TX state RAM, ensure that we clean | ||
| 1436 | * up any interrupt that's currently asserted: | ||
| 1437 | * 1. Write to completion Ptr value 0x1(bit 0 set) | ||
| 1438 | * (write back mode) | ||
| 1439 | * 2. Write to completion Ptr value 0x0(bit 0 cleared) | ||
| 1440 | * (compare mode) | ||
| 1441 | * Value written is compared(for bits 31:2) and when | ||
| 1442 | * equal, interrupt is deasserted. | ||
| 1443 | */ | ||
| 1444 | cppi_reset_tx(tx_ram, 1); | ||
| 1445 | musb_writel(&tx_ram->tx_complete, 0, 0); | ||
| 1446 | |||
| 1447 | cppi_dump_tx(5, cppi_ch, " (done teardown)"); | ||
| 1448 | |||
| 1449 | /* REVISIT tx side _should_ clean up the same way | ||
| 1450 | * as the RX side ... this does no cleanup at all! | ||
| 1451 | */ | ||
| 1452 | |||
| 1453 | } else /* RX */ { | ||
| 1454 | u16 csr; | ||
| 1455 | |||
| 1456 | /* NOTE: docs don't guarantee any of this works ... we | ||
| 1457 | * expect that if the usb core stops telling the cppi core | ||
| 1458 | * to pull more data from it, then it'll be safe to flush | ||
| 1459 | * current RX DMA state iff any pending fifo transfer is done. | ||
| 1460 | */ | ||
| 1461 | |||
| 1462 | core_rxirq_disable(tibase, cppi_ch->index + 1); | ||
| 1463 | |||
| 1464 | /* for host, ensure ReqPkt is never set again */ | ||
| 1465 | if (is_host_active(cppi_ch->controller->musb)) { | ||
| 1466 | value = musb_readl(tibase, DAVINCI_AUTOREQ_REG); | ||
| 1467 | value &= ~((0x3) << (cppi_ch->index * 2)); | ||
| 1468 | musb_writel(tibase, DAVINCI_AUTOREQ_REG, value); | ||
| 1469 | } | ||
| 1470 | |||
| 1471 | csr = musb_readw(regs, MUSB_RXCSR); | ||
| 1472 | |||
| 1473 | /* for host, clear (just) ReqPkt at end of current packet(s) */ | ||
| 1474 | if (is_host_active(cppi_ch->controller->musb)) { | ||
| 1475 | csr |= MUSB_RXCSR_H_WZC_BITS; | ||
| 1476 | csr &= ~MUSB_RXCSR_H_REQPKT; | ||
| 1477 | } else | ||
| 1478 | csr |= MUSB_RXCSR_P_WZC_BITS; | ||
| 1479 | |||
| 1480 | /* clear dma enable */ | ||
| 1481 | csr &= ~(MUSB_RXCSR_DMAENAB); | ||
| 1482 | musb_writew(regs, MUSB_RXCSR, csr); | ||
| 1483 | csr = musb_readw(regs, MUSB_RXCSR); | ||
| 1484 | |||
| 1485 | /* Quiesce: wait for current dma to finish (if not cleanup). | ||
| 1486 | * We can't use bit zero of stateram->rx_sop, since that | ||
| 1487 | * refers to an entire "DMA packet" not just emptying the | ||
| 1488 | * current fifo. Most segments need multiple usb packets. | ||
| 1489 | */ | ||
| 1490 | if (channel->status == MUSB_DMA_STATUS_BUSY) | ||
| 1491 | udelay(50); | ||
| 1492 | |||
| 1493 | /* scan the current list, reporting any data that was | ||
| 1494 | * transferred and acking any IRQ | ||
| 1495 | */ | ||
| 1496 | cppi_rx_scan(controller, cppi_ch->index); | ||
| 1497 | |||
| 1498 | /* clobber the existing state once it's idle | ||
| 1499 | * | ||
| 1500 | * NOTE: arguably, we should also wait for all the other | ||
| 1501 | * RX channels to quiesce (how??) and then temporarily | ||
| 1502 | * disable RXCPPI_CTRL_REG ... but it seems that we can | ||
| 1503 | * rely on the controller restarting from state ram, with | ||
| 1504 | * only RXCPPI_BUFCNT state being bogus. BUFCNT will | ||
| 1505 | * correct itself after the next DMA transfer though. | ||
| 1506 | * | ||
| 1507 | * REVISIT does using rndis mode change that? | ||
| 1508 | */ | ||
| 1509 | cppi_reset_rx(cppi_ch->state_ram); | ||
| 1510 | |||
| 1511 | /* next DMA request _should_ load cppi head ptr */ | ||
| 1512 | |||
| 1513 | /* ... we don't "free" that list, only mutate it in place. */ | ||
| 1514 | cppi_dump_rx(5, cppi_ch, " (done abort)"); | ||
| 1515 | |||
| 1516 | /* clean up previously pending bds */ | ||
| 1517 | cppi_bd_free(cppi_ch, cppi_ch->last_processed); | ||
| 1518 | cppi_ch->last_processed = NULL; | ||
| 1519 | |||
| 1520 | while (queue) { | ||
| 1521 | struct cppi_descriptor *tmp = queue->next; | ||
| 1522 | |||
| 1523 | cppi_bd_free(cppi_ch, queue); | ||
| 1524 | queue = tmp; | ||
| 1525 | } | ||
| 1526 | } | ||
| 1527 | |||
| 1528 | channel->status = MUSB_DMA_STATUS_FREE; | ||
| 1529 | cppi_ch->buf_dma = 0; | ||
| 1530 | cppi_ch->offset = 0; | ||
| 1531 | cppi_ch->buf_len = 0; | ||
| 1532 | cppi_ch->maxpacket = 0; | ||
| 1533 | return 0; | ||
| 1534 | } | ||
| 1535 | |||
| 1536 | /* TBD Queries: | ||
| 1537 | * | ||
| 1538 | * Power Management ... probably turn off cppi during suspend, restart; | ||
| 1539 | * check state ram? Clocking is presumably shared with usb core. | ||
| 1540 | */ | ||
diff --git a/drivers/usb/musb/cppi_dma.h b/drivers/usb/musb/cppi_dma.h new file mode 100644 index 000000000000..fc5216b5d2c5 --- /dev/null +++ b/drivers/usb/musb/cppi_dma.h | |||
| @@ -0,0 +1,133 @@ | |||
| 1 | /* Copyright (C) 2005-2006 by Texas Instruments */ | ||
| 2 | |||
| 3 | #ifndef _CPPI_DMA_H_ | ||
| 4 | #define _CPPI_DMA_H_ | ||
| 5 | |||
| 6 | #include <linux/slab.h> | ||
| 7 | #include <linux/list.h> | ||
| 8 | #include <linux/smp_lock.h> | ||
| 9 | #include <linux/errno.h> | ||
| 10 | #include <linux/dmapool.h> | ||
| 11 | |||
| 12 | #include "musb_dma.h" | ||
| 13 | #include "musb_core.h" | ||
| 14 | |||
| 15 | |||
| 16 | /* FIXME fully isolate CPPI from DaVinci ... the "CPPI generic" registers | ||
| 17 | * would seem to be shared with the TUSB6020 (over VLYNQ). | ||
| 18 | */ | ||
| 19 | |||
| 20 | #include "davinci.h" | ||
| 21 | |||
| 22 | |||
| 23 | /* CPPI RX/TX state RAM */ | ||
| 24 | |||
| 25 | struct cppi_tx_stateram { | ||
| 26 | u32 tx_head; /* "DMA packet" head descriptor */ | ||
| 27 | u32 tx_buf; | ||
| 28 | u32 tx_current; /* current descriptor */ | ||
| 29 | u32 tx_buf_current; | ||
| 30 | u32 tx_info; /* flags, remaining buflen */ | ||
| 31 | u32 tx_rem_len; | ||
| 32 | u32 tx_dummy; /* unused */ | ||
| 33 | u32 tx_complete; | ||
| 34 | }; | ||
| 35 | |||
| 36 | struct cppi_rx_stateram { | ||
| 37 | u32 rx_skipbytes; | ||
| 38 | u32 rx_head; | ||
| 39 | u32 rx_sop; /* "DMA packet" head descriptor */ | ||
| 40 | u32 rx_current; /* current descriptor */ | ||
| 41 | u32 rx_buf_current; | ||
| 42 | u32 rx_len_len; | ||
| 43 | u32 rx_cnt_cnt; | ||
| 44 | u32 rx_complete; | ||
| 45 | }; | ||
| 46 | |||
| 47 | /* hw_options bits in CPPI buffer descriptors */ | ||
| 48 | #define CPPI_SOP_SET ((u32)(1 << 31)) | ||
| 49 | #define CPPI_EOP_SET ((u32)(1 << 30)) | ||
| 50 | #define CPPI_OWN_SET ((u32)(1 << 29)) /* owned by cppi */ | ||
| 51 | #define CPPI_EOQ_MASK ((u32)(1 << 28)) | ||
| 52 | #define CPPI_ZERO_SET ((u32)(1 << 23)) /* rx saw zlp; tx issues one */ | ||
| 53 | #define CPPI_RXABT_MASK ((u32)(1 << 19)) /* need more rx buffers */ | ||
| 54 | |||
| 55 | #define CPPI_RECV_PKTLEN_MASK 0xFFFF | ||
| 56 | #define CPPI_BUFFER_LEN_MASK 0xFFFF | ||
| 57 | |||
| 58 | #define CPPI_TEAR_READY ((u32)(1 << 31)) | ||
| 59 | |||
| 60 | /* CPPI data structure definitions */ | ||
| 61 | |||
| 62 | #define CPPI_DESCRIPTOR_ALIGN 16 /* bytes; 5-dec docs say 4-byte align */ | ||
| 63 | |||
| 64 | struct cppi_descriptor { | ||
| 65 | /* hardware overlay */ | ||
| 66 | u32 hw_next; /* next buffer descriptor Pointer */ | ||
| 67 | u32 hw_bufp; /* i/o buffer pointer */ | ||
| 68 | u32 hw_off_len; /* buffer_offset16, buffer_length16 */ | ||
| 69 | u32 hw_options; /* flags: SOP, EOP etc*/ | ||
| 70 | |||
| 71 | struct cppi_descriptor *next; | ||
| 72 | dma_addr_t dma; /* address of this descriptor */ | ||
| 73 | u32 buflen; /* for RX: original buffer length */ | ||
| 74 | } __attribute__ ((aligned(CPPI_DESCRIPTOR_ALIGN))); | ||
| 75 | |||
| 76 | |||
| 77 | struct cppi; | ||
| 78 | |||
| 79 | /* CPPI Channel Control structure */ | ||
| 80 | struct cppi_channel { | ||
| 81 | struct dma_channel channel; | ||
| 82 | |||
| 83 | /* back pointer to the DMA controller structure */ | ||
| 84 | struct cppi *controller; | ||
| 85 | |||
| 86 | /* which direction of which endpoint? */ | ||
| 87 | struct musb_hw_ep *hw_ep; | ||
| 88 | bool transmit; | ||
| 89 | u8 index; | ||
| 90 | |||
| 91 | /* DMA modes: RNDIS or "transparent" */ | ||
| 92 | u8 is_rndis; | ||
| 93 | |||
| 94 | /* book keeping for current transfer request */ | ||
| 95 | dma_addr_t buf_dma; | ||
| 96 | u32 buf_len; | ||
| 97 | u32 maxpacket; | ||
| 98 | u32 offset; /* dma requested */ | ||
| 99 | |||
| 100 | void __iomem *state_ram; /* CPPI state */ | ||
| 101 | |||
| 102 | struct cppi_descriptor *freelist; | ||
| 103 | |||
| 104 | /* BD management fields */ | ||
| 105 | struct cppi_descriptor *head; | ||
| 106 | struct cppi_descriptor *tail; | ||
| 107 | struct cppi_descriptor *last_processed; | ||
| 108 | |||
| 109 | /* use tx_complete in host role to track endpoints waiting for | ||
| 110 | * FIFONOTEMPTY to clear. | ||
| 111 | */ | ||
| 112 | struct list_head tx_complete; | ||
| 113 | }; | ||
| 114 | |||
| 115 | /* CPPI DMA controller object */ | ||
| 116 | struct cppi { | ||
| 117 | struct dma_controller controller; | ||
| 118 | struct musb *musb; | ||
| 119 | void __iomem *mregs; /* Mentor regs */ | ||
| 120 | void __iomem *tibase; /* TI/CPPI regs */ | ||
| 121 | |||
| 122 | struct cppi_channel tx[MUSB_C_NUM_EPT - 1]; | ||
| 123 | struct cppi_channel rx[MUSB_C_NUM_EPR - 1]; | ||
| 124 | |||
| 125 | struct dma_pool *pool; | ||
| 126 | |||
| 127 | struct list_head tx_complete; | ||
| 128 | }; | ||
| 129 | |||
| 130 | /* irq handling hook */ | ||
| 131 | extern void cppi_completion(struct musb *, u32 rx, u32 tx); | ||
| 132 | |||
| 133 | #endif /* end of ifndef _CPPI_DMA_H_ */ | ||
diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c new file mode 100644 index 000000000000..75baf181a8cd --- /dev/null +++ b/drivers/usb/musb/davinci.c | |||
| @@ -0,0 +1,462 @@ | |||
| 1 | /* | ||
| 2 | * Copyright (C) 2005-2006 by Texas Instruments | ||
| 3 | * | ||
| 4 | * This file is part of the Inventra Controller Driver for Linux. | ||
| 5 | * | ||
| 6 | * The Inventra Controller Driver for Linux is free software; you | ||
| 7 | * can redistribute it and/or modify it under the terms of the GNU | ||
| 8 | * General Public License version 2 as published by the Free Software | ||
| 9 | * Foundation. | ||
| 10 | * | ||
| 11 | * The Inventra Controller Driver for Linux is distributed in | ||
| 12 | * the hope that it will be useful, but WITHOUT ANY WARRANTY; | ||
| 13 | * without even the implied warranty of MERCHANTABILITY or | ||
| 14 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public | ||
| 15 | * License for more details. | ||
| 16 | * | ||
| 17 | * You should have received a copy of the GNU General Public License | ||
| 18 | * along with The Inventra Controller Driver for Linux ; if not, | ||
| 19 | * write to the Free Software Foundation, Inc., 59 Temple Place, | ||
| 20 | * Suite 330, Boston, MA 02111-1307 USA | ||
| 21 | * | ||
| 22 | */ | ||
| 23 | |||
| 24 | #include <linux/module.h> | ||
| 25 | #include <linux/kernel.h> | ||
| 26 | #include <linux/sched.h> | ||
| 27 | #include <linux/slab.h> | ||
| 28 | #include <linux/init.h> | ||
| 29 | #include <linux/list.h> | ||
| 30 | #include <linux/delay.h> | ||
| 31 | #include <linux/clk.h> | ||
| 32 | #include <linux/io.h> | ||
| 33 | |||
| 34 | #include <asm/arch/hardware.h> | ||
| 35 | #include <asm/arch/memory.h> | ||
| 36 | #include <asm/arch/gpio.h> | ||
| 37 | #include <asm/mach-types.h> | ||
| 38 | |||
| 39 | #include "musb_core.h" | ||
| 40 | |||
| 41 | #ifdef CONFIG_MACH_DAVINCI_EVM | ||
| 42 | #include <asm/arch/i2c-client.h> | ||
| 43 | #endif | ||
| 44 | |||
| 45 | #include "davinci.h" | ||
| 46 | #include "cppi_dma.h" | ||
| 47 | |||
| 48 | |||
| 49 | /* REVISIT (PM) we should be able to keep the PHY in low power mode most | ||
| 50 | * of the time (24 MHZ oscillator and PLL off, etc) by setting POWER.D0 | ||
| 51 | * and, when in host mode, autosuspending idle root ports... PHYPLLON | ||
| 52 | * (overriding SUSPENDM?) then likely needs to stay off. | ||
| 53 | */ | ||
| 54 | |||
| 55 | static inline void phy_on(void) | ||
| 56 | { | ||
| 57 | /* start the on-chip PHY and its PLL */ | ||
| 58 | __raw_writel(USBPHY_SESNDEN | USBPHY_VBDTCTEN | USBPHY_PHYPLLON, | ||
| 59 | (void __force __iomem *) IO_ADDRESS(USBPHY_CTL_PADDR)); | ||
| 60 | while ((__raw_readl((void __force __iomem *) | ||
| 61 | IO_ADDRESS(USBPHY_CTL_PADDR)) | ||
| 62 | & USBPHY_PHYCLKGD) == 0) | ||
| 63 | cpu_relax(); | ||
| 64 | } | ||
| 65 | |||
| 66 | static inline void phy_off(void) | ||
| 67 | { | ||
| 68 | /* powerdown the on-chip PHY and its oscillator */ | ||
| 69 | __raw_writel(USBPHY_OSCPDWN | USBPHY_PHYPDWN, (void __force __iomem *) | ||
| 70 | IO_ADDRESS(USBPHY_CTL_PADDR)); | ||
| 71 | } | ||
| 72 | |||
| 73 | static int dma_off = 1; | ||
| 74 | |||
| 75 | void musb_platform_enable(struct musb *musb) | ||
| 76 | { | ||
| 77 | u32 tmp, old, val; | ||
| 78 | |||
| 79 | /* workaround: setup irqs through both register sets */ | ||
| 80 | tmp = (musb->epmask & DAVINCI_USB_TX_ENDPTS_MASK) | ||
| 81 | << DAVINCI_USB_TXINT_SHIFT; | ||
| 82 | musb_writel(musb->ctrl_base, DAVINCI_USB_INT_MASK_SET_REG, tmp); | ||
| 83 | old = tmp; | ||
| 84 | tmp = (musb->epmask & (0xfffe & DAVINCI_USB_RX_ENDPTS_MASK)) | ||
| 85 | << DAVINCI_USB_RXINT_SHIFT; | ||
| 86 | musb_writel(musb->ctrl_base, DAVINCI_USB_INT_MASK_SET_REG, tmp); | ||
| 87 | tmp |= old; | ||
| 88 | |||
| 89 | val = ~MUSB_INTR_SOF; | ||
| 90 | tmp |= ((val & 0x01ff) << DAVINCI_USB_USBINT_SHIFT); | ||
| 91 | musb_writel(musb->ctrl_base, DAVINCI_USB_INT_MASK_SET_REG, tmp); | ||
| 92 | |||
| 93 | if (is_dma_capable() && !dma_off) | ||
| 94 | printk(KERN_WARNING "%s %s: dma not reactivated\n", | ||
| 95 | __FILE__, __func__); | ||
| 96 | else | ||
| 97 | dma_off = 0; | ||
| 98 | |||
| 99 | /* force a DRVVBUS irq so we can start polling for ID change */ | ||
| 100 | if (is_otg_enabled(musb)) | ||
| 101 | musb_writel(musb->ctrl_base, DAVINCI_USB_INT_SET_REG, | ||
| 102 | DAVINCI_INTR_DRVVBUS << DAVINCI_USB_USBINT_SHIFT); | ||
| 103 | } | ||
| 104 | |||
| 105 | /* | ||
| 106 | * Disable the HDRC and flush interrupts | ||
| 107 | */ | ||
| 108 | void musb_platform_disable(struct musb *musb) | ||
| 109 | { | ||
| 110 | /* because we don't set CTRLR.UINT, "important" to: | ||
| 111 | * - not read/write INTRUSB/INTRUSBE | ||
| 112 | * - (except during initial setup, as workaround) | ||
| 113 | * - use INTSETR/INTCLRR instead | ||
| 114 | */ | ||
| 115 | musb_writel(musb->ctrl_base, DAVINCI_USB_INT_MASK_CLR_REG, | ||
| 116 | DAVINCI_USB_USBINT_MASK | ||
| 117 | | DAVINCI_USB_TXINT_MASK | ||
| 118 | | DAVINCI_USB_RXINT_MASK); | ||
| 119 | musb_writeb(musb->mregs, MUSB_DEVCTL, 0); | ||
| 120 | musb_writel(musb->ctrl_base, DAVINCI_USB_EOI_REG, 0); | ||
| 121 | |||
| 122 | if (is_dma_capable() && !dma_off) | ||
| 123 | WARNING("dma still active\n"); | ||
| 124 | } | ||
| 125 | |||
| 126 | |||
| 127 | /* REVISIT it's not clear whether DaVinci can support full OTG. */ | ||
| 128 | |||
| 129 | static int vbus_state = -1; | ||
| 130 | |||
| 131 | #ifdef CONFIG_USB_MUSB_HDRC_HCD | ||
| 132 | #define portstate(stmt) stmt | ||
| 133 | #else | ||
| 134 | #define portstate(stmt) | ||
| 135 | #endif | ||
| 136 | |||
| 137 | |||
| 138 | /* VBUS SWITCHING IS BOARD-SPECIFIC */ | ||
| 139 | |||
| 140 | #ifdef CONFIG_MACH_DAVINCI_EVM | ||
| 141 | #ifndef CONFIG_MACH_DAVINCI_EVM_OTG | ||
| 142 | |||
| 143 | /* I2C operations are always synchronous, and require a task context. | ||
| 144 | * With unloaded systems, using the shared workqueue seems to suffice | ||
| 145 | * to satisfy the 100msec A_WAIT_VRISE timeout... | ||
| 146 | */ | ||
| 147 | static void evm_deferred_drvvbus(struct work_struct *ignored) | ||
| 148 | { | ||
| 149 | davinci_i2c_expander_op(0x3a, USB_DRVVBUS, vbus_state); | ||
| 150 | vbus_state = !vbus_state; | ||
| 151 | } | ||
| 152 | static DECLARE_WORK(evm_vbus_work, evm_deferred_drvvbus); | ||
| 153 | |||
| 154 | #endif /* modified board */ | ||
| 155 | #endif /* EVM */ | ||
| 156 | |||
| 157 | static void davinci_source_power(struct musb *musb, int is_on, int immediate) | ||
| 158 | { | ||
| 159 | if (is_on) | ||
| 160 | is_on = 1; | ||
| 161 | |||
| 162 | if (vbus_state == is_on) | ||
| 163 | return; | ||
| 164 | vbus_state = !is_on; /* 0/1 vs "-1 == unknown/init" */ | ||
| 165 | |||
| 166 | #ifdef CONFIG_MACH_DAVINCI_EVM | ||
| 167 | if (machine_is_davinci_evm()) { | ||
| 168 | #ifdef CONFIG_MACH_DAVINCI_EVM_OTG | ||
| 169 | /* modified EVM board switching VBUS with GPIO(6) not I2C | ||
| 170 | * NOTE: PINMUX0.RGB888 (bit23) must be clear | ||
| 171 | */ | ||
| 172 | if (is_on) | ||
| 173 | gpio_set(GPIO(6)); | ||
| 174 | else | ||
| 175 | gpio_clear(GPIO(6)); | ||
| 176 | immediate = 1; | ||
| 177 | #else | ||
| 178 | if (immediate) | ||
| 179 | davinci_i2c_expander_op(0x3a, USB_DRVVBUS, !is_on); | ||
| 180 | else | ||
| 181 | schedule_work(&evm_vbus_work); | ||
| 182 | #endif | ||
| 183 | } | ||
| 184 | #endif | ||
| 185 | if (immediate) | ||
| 186 | vbus_state = is_on; | ||
| 187 | } | ||
| 188 | |||
| 189 | static void davinci_set_vbus(struct musb *musb, int is_on) | ||
| 190 | { | ||
| 191 | WARN_ON(is_on && is_peripheral_active(musb)); | ||
| 192 | davinci_source_power(musb, is_on, 0); | ||
| 193 | } | ||
| 194 | |||
| 195 | |||
| 196 | #define POLL_SECONDS 2 | ||
| 197 | |||
| 198 | static struct timer_list otg_workaround; | ||
| 199 | |||
| 200 | static void otg_timer(unsigned long _musb) | ||
| 201 | { | ||
| 202 | struct musb *musb = (void *)_musb; | ||
| 203 | void __iomem *mregs = musb->mregs; | ||
| 204 | u8 devctl; | ||
| 205 | unsigned long flags; | ||
| 206 | |||
| 207 | /* We poll because DaVinci's won't expose several OTG-critical | ||
| 208 | * status change events (from the transceiver) otherwise. | ||
| 209 | */ | ||
| 210 | devctl = musb_readb(mregs, MUSB_DEVCTL); | ||
| 211 | DBG(7, "poll devctl %02x (%s)\n", devctl, otg_state_string(musb)); | ||
| 212 | |||
| 213 | spin_lock_irqsave(&musb->lock, flags); | ||
| 214 | switch (musb->xceiv.state) { | ||
| 215 | case OTG_STATE_A_WAIT_VFALL: | ||
| 216 | /* Wait till VBUS falls below SessionEnd (~0.2V); the 1.3 RTL | ||
| 217 | * seems to mis-handle session "start" otherwise (or in our | ||
| 218 | * case "recover"), in routine "VBUS was valid by the time | ||
| 219 | * VBUSERR got reported during enumeration" cases. | ||
| 220 | */ | ||
| 221 | if (devctl & MUSB_DEVCTL_VBUS) { | ||
| 222 | mod_timer(&otg_workaround, jiffies + POLL_SECONDS * HZ); | ||
| 223 | break; | ||
| 224 | } | ||
| 225 | musb->xceiv.state = OTG_STATE_A_WAIT_VRISE; | ||
| 226 | musb_writel(musb->ctrl_base, DAVINCI_USB_INT_SET_REG, | ||
| 227 | MUSB_INTR_VBUSERROR << DAVINCI_USB_USBINT_SHIFT); | ||
| 228 | break; | ||
| 229 | case OTG_STATE_B_IDLE: | ||
| 230 | if (!is_peripheral_enabled(musb)) | ||
| 231 | break; | ||
| 232 | |||
| 233 | /* There's no ID-changed IRQ, so we have no good way to tell | ||
| 234 | * when to switch to the A-Default state machine (by setting | ||
| 235 | * the DEVCTL.SESSION flag). | ||
| 236 | * | ||
| 237 | * Workaround: whenever we're in B_IDLE, try setting the | ||
| 238 | * session flag every few seconds. If it works, ID was | ||
| 239 | * grounded and we're now in the A-Default state machine. | ||
| 240 | * | ||
| 241 | * NOTE setting the session flag is _supposed_ to trigger | ||
| 242 | * SRP, but clearly it doesn't. | ||
| 243 | */ | ||
| 244 | musb_writeb(mregs, MUSB_DEVCTL, | ||
| 245 | devctl | MUSB_DEVCTL_SESSION); | ||
| 246 | devctl = musb_readb(mregs, MUSB_DEVCTL); | ||
| 247 | if (devctl & MUSB_DEVCTL_BDEVICE) | ||
| 248 | mod_timer(&otg_workaround, jiffies + POLL_SECONDS * HZ); | ||
| 249 | else | ||
| 250 | musb->xceiv.state = OTG_STATE_A_IDLE; | ||
| 251 | break; | ||
| 252 | default: | ||
| 253 | break; | ||
| 254 | } | ||
| 255 | spin_unlock_irqrestore(&musb->lock, flags); | ||
| 256 | } | ||
| 257 | |||
| 258 | static irqreturn_t davinci_interrupt(int irq, void *__hci) | ||
| 259 | { | ||
| 260 | unsigned long flags; | ||
| 261 | irqreturn_t retval = IRQ_NONE; | ||
| 262 | struct musb *musb = __hci; | ||
| 263 | void __iomem *tibase = musb->ctrl_base; | ||
| 264 | u32 tmp; | ||
| 265 | |||
| 266 | spin_lock_irqsave(&musb->lock, flags); | ||
| 267 | |||
| 268 | /* NOTE: DaVinci shadows the Mentor IRQs. Don't manage them through | ||
| 269 | * the Mentor registers (except for setup), use the TI ones and EOI. | ||
| 270 | * | ||
| 271 | * Docs describe irq "vector" registers asociated with the CPPI and | ||
| 272 | * USB EOI registers. These hold a bitmask corresponding to the | ||
| 273 | * current IRQ, not an irq handler address. Would using those bits | ||
| 274 | * resolve some of the races observed in this dispatch code?? | ||
| 275 | */ | ||
| 276 | |||
| 277 | /* CPPI interrupts share the same IRQ line, but have their own | ||
| 278 | * mask, state, "vector", and EOI registers. | ||
| 279 | */ | ||
| 280 | if (is_cppi_enabled()) { | ||
| 281 | u32 cppi_tx = musb_readl(tibase, DAVINCI_TXCPPI_MASKED_REG); | ||
| 282 | u32 cppi_rx = musb_readl(tibase, DAVINCI_RXCPPI_MASKED_REG); | ||
| 283 | |||
| 284 | if (cppi_tx || cppi_rx) { | ||
| 285 | DBG(4, "CPPI IRQ t%x r%x\n", cppi_tx, cppi_rx); | ||
| 286 | cppi_completion(musb, cppi_rx, cppi_tx); | ||
| 287 | retval = IRQ_HANDLED; | ||
| 288 | } | ||
| 289 | } | ||
| 290 | |||
| 291 | /* ack and handle non-CPPI interrupts */ | ||
| 292 | tmp = musb_readl(tibase, DAVINCI_USB_INT_SRC_MASKED_REG); | ||
| 293 | musb_writel(tibase, DAVINCI_USB_INT_SRC_CLR_REG, tmp); | ||
| 294 | DBG(4, "IRQ %08x\n", tmp); | ||
| 295 | |||
| 296 | musb->int_rx = (tmp & DAVINCI_USB_RXINT_MASK) | ||
| 297 | >> DAVINCI_USB_RXINT_SHIFT; | ||
| 298 | musb->int_tx = (tmp & DAVINCI_USB_TXINT_MASK) | ||
| 299 | >> DAVINCI_USB_TXINT_SHIFT; | ||
| 300 | musb->int_usb = (tmp & DAVINCI_USB_USBINT_MASK) | ||
| 301 | >> DAVINCI_USB_USBINT_SHIFT; | ||
| 302 | |||
| 303 | /* DRVVBUS irqs are the only proxy we have (a very poor one!) for | ||
| 304 | * DaVinci's missing ID change IRQ. We need an ID change IRQ to | ||
| 305 | * switch appropriately between halves of the OTG state machine. | ||
| 306 | * Managing DEVCTL.SESSION per Mentor docs requires we know its | ||
| 307 | * value, but DEVCTL.BDEVICE is invalid without DEVCTL.SESSION set. | ||
| 308 | * Also, DRVVBUS pulses for SRP (but not at 5V) ... | ||
| 309 | */ | ||
| 310 | if (tmp & (DAVINCI_INTR_DRVVBUS << DAVINCI_USB_USBINT_SHIFT)) { | ||
| 311 | int drvvbus = musb_readl(tibase, DAVINCI_USB_STAT_REG); | ||
| 312 | void __iomem *mregs = musb->mregs; | ||
| 313 | u8 devctl = musb_readb(mregs, MUSB_DEVCTL); | ||
| 314 | int err = musb->int_usb & MUSB_INTR_VBUSERROR; | ||
| 315 | |||
| 316 | err = is_host_enabled(musb) | ||
| 317 | && (musb->int_usb & MUSB_INTR_VBUSERROR); | ||
| 318 | if (err) { | ||
| 319 | /* The Mentor core doesn't debounce VBUS as needed | ||
| 320 | * to cope with device connect current spikes. This | ||
| 321 | * means it's not uncommon for bus-powered devices | ||
| 322 | * to get VBUS errors during enumeration. | ||
| 323 | * | ||
| 324 | * This is a workaround, but newer RTL from Mentor | ||
| 325 | * seems to allow a better one: "re"starting sessions | ||
| 326 | * without waiting (on EVM, a **long** time) for VBUS | ||
| 327 | * to stop registering in devctl. | ||
| 328 | */ | ||
| 329 | musb->int_usb &= ~MUSB_INTR_VBUSERROR; | ||
| 330 | musb->xceiv.state = OTG_STATE_A_WAIT_VFALL; | ||
| 331 | mod_timer(&otg_workaround, jiffies + POLL_SECONDS * HZ); | ||
| 332 | WARNING("VBUS error workaround (delay coming)\n"); | ||
| 333 | } else if (is_host_enabled(musb) && drvvbus) { | ||
| 334 | musb->is_active = 1; | ||
| 335 | MUSB_HST_MODE(musb); | ||
| 336 | musb->xceiv.default_a = 1; | ||
| 337 | musb->xceiv.state = OTG_STATE_A_WAIT_VRISE; | ||
| 338 | portstate(musb->port1_status |= USB_PORT_STAT_POWER); | ||
| 339 | del_timer(&otg_workaround); | ||
| 340 | } else { | ||
| 341 | musb->is_active = 0; | ||
| 342 | MUSB_DEV_MODE(musb); | ||
| 343 | musb->xceiv.default_a = 0; | ||
| 344 | musb->xceiv.state = OTG_STATE_B_IDLE; | ||
| 345 | portstate(musb->port1_status &= ~USB_PORT_STAT_POWER); | ||
| 346 | } | ||
| 347 | |||
| 348 | /* NOTE: this must complete poweron within 100 msec */ | ||
| 349 | davinci_source_power(musb, drvvbus, 0); | ||
| 350 | DBG(2, "VBUS %s (%s)%s, devctl %02x\n", | ||
| 351 | drvvbus ? "on" : "off", | ||
| 352 | otg_state_string(musb), | ||
| 353 | err ? " ERROR" : "", | ||
| 354 | devctl); | ||
| 355 | retval = IRQ_HANDLED; | ||
| 356 | } | ||
| 357 | |||
| 358 | if (musb->int_tx || musb->int_rx || musb->int_usb) | ||
| 359 | retval |= musb_interrupt(musb); | ||
| 360 | |||
| 361 | /* irq stays asserted until EOI is written */ | ||
| 362 | musb_writel(tibase, DAVINCI_USB_EOI_REG, 0); | ||
| 363 | |||
| 364 | /* poll for ID change */ | ||
| 365 | if (is_otg_enabled(musb) | ||
| 366 | && musb->xceiv.state == OTG_STATE_B_IDLE) | ||
| 367 | mod_timer(&otg_workaround, jiffies + POLL_SECONDS * HZ); | ||
| 368 | |||
| 369 | spin_unlock_irqrestore(&musb->lock, flags); | ||
| 370 | |||
| 371 | /* REVISIT we sometimes get unhandled IRQs | ||
| 372 | * (e.g. ep0). not clear why... | ||
| 373 | */ | ||
| 374 | if (retval != IRQ_HANDLED) | ||
| 375 | DBG(5, "unhandled? %08x\n", tmp); | ||
| 376 | return IRQ_HANDLED; | ||
| 377 | } | ||
| 378 | |||
| 379 | int __init musb_platform_init(struct musb *musb) | ||
| 380 | { | ||
| 381 | void __iomem *tibase = musb->ctrl_base; | ||
| 382 | u32 revision; | ||
| 383 | |||
| 384 | musb->mregs += DAVINCI_BASE_OFFSET; | ||
| 385 | #if 0 | ||
| 386 | /* REVISIT there's something odd about clocking, this | ||
| 387 | * didn't appear do the job ... | ||
| 388 | */ | ||
| 389 | musb->clock = clk_get(pDevice, "usb"); | ||
| 390 | if (IS_ERR(musb->clock)) | ||
| 391 | return PTR_ERR(musb->clock); | ||
| 392 | |||
| 393 | status = clk_enable(musb->clock); | ||
| 394 | if (status < 0) | ||
| 395 | return -ENODEV; | ||
| 396 | #endif | ||
| 397 | |||
| 398 | /* returns zero if e.g. not clocked */ | ||
| 399 | revision = musb_readl(tibase, DAVINCI_USB_VERSION_REG); | ||
| 400 | if (revision == 0) | ||
| 401 | return -ENODEV; | ||
| 402 | |||
| 403 | if (is_host_enabled(musb)) | ||
| 404 | setup_timer(&otg_workaround, otg_timer, (unsigned long) musb); | ||
| 405 | |||
| 406 | musb->board_set_vbus = davinci_set_vbus; | ||
| 407 | davinci_source_power(musb, 0, 1); | ||
| 408 | |||
| 409 | /* reset the controller */ | ||
| 410 | musb_writel(tibase, DAVINCI_USB_CTRL_REG, 0x1); | ||
| 411 | |||
| 412 | /* start the on-chip PHY and its PLL */ | ||
| 413 | phy_on(); | ||
| 414 | |||
| 415 | msleep(5); | ||
| 416 | |||
| 417 | /* NOTE: irqs are in mixed mode, not bypass to pure-musb */ | ||
| 418 | pr_debug("DaVinci OTG revision %08x phy %03x control %02x\n", | ||
| 419 | revision, __raw_readl((void __force __iomem *) | ||
| 420 | IO_ADDRESS(USBPHY_CTL_PADDR)), | ||
| 421 | musb_readb(tibase, DAVINCI_USB_CTRL_REG)); | ||
| 422 | |||
| 423 | musb->isr = davinci_interrupt; | ||
| 424 | return 0; | ||
| 425 | } | ||
| 426 | |||
| 427 | int musb_platform_exit(struct musb *musb) | ||
| 428 | { | ||
| 429 | if (is_host_enabled(musb)) | ||
| 430 | del_timer_sync(&otg_workaround); | ||
| 431 | |||
| 432 | davinci_source_power(musb, 0 /*off*/, 1); | ||
| 433 | |||
| 434 | /* delay, to avoid problems with module reload */ | ||
| 435 | if (is_host_enabled(musb) && musb->xceiv.default_a) { | ||
| 436 | int maxdelay = 30; | ||
| 437 | u8 devctl, warn = 0; | ||
| 438 | |||
| 439 | /* if there's no peripheral connected, this can take a | ||
| 440 | * long time to fall, especially on EVM with huge C133. | ||
| 441 | */ | ||
| 442 | do { | ||
| 443 | devctl = musb_readb(musb->mregs, MUSB_DEVCTL); | ||
| 444 | if (!(devctl & MUSB_DEVCTL_VBUS)) | ||
| 445 | break; | ||
| 446 | if ((devctl & MUSB_DEVCTL_VBUS) != warn) { | ||
| 447 | warn = devctl & MUSB_DEVCTL_VBUS; | ||
| 448 | DBG(1, "VBUS %d\n", | ||
| 449 | warn >> MUSB_DEVCTL_VBUS_SHIFT); | ||
| 450 | } | ||
| 451 | msleep(1000); | ||
| 452 | maxdelay--; | ||
| 453 | } while (maxdelay > 0); | ||
| 454 | |||
| 455 | /* in OTG mode, another host might be connected */ | ||
| 456 | if (devctl & MUSB_DEVCTL_VBUS) | ||
| 457 | DBG(1, "VBUS off timeout (devctl %02x)\n", devctl); | ||
| 458 | } | ||
| 459 | |||
| 460 | phy_off(); | ||
| 461 | return 0; | ||
| 462 | } | ||
diff --git a/drivers/usb/musb/davinci.h b/drivers/usb/musb/davinci.h new file mode 100644 index 000000000000..7fb6238e270f --- /dev/null +++ b/drivers/usb/musb/davinci.h | |||
| @@ -0,0 +1,100 @@ | |||
| 1 | /* | ||
| 2 | * Copyright (C) 2005-2006 by Texas Instruments | ||
| 3 | * | ||
| 4 | * The Inventra Controller Driver for Linux is free software; you | ||
| 5 | * can redistribute it and/or modify it under the terms of the GNU | ||
| 6 | * General Public License version 2 as published by the Free Software | ||
| 7 | * Foundation. | ||
| 8 | */ | ||
| 9 | |||
| 10 | #ifndef __MUSB_HDRDF_H__ | ||
| 11 | #define __MUSB_HDRDF_H__ | ||
| 12 | |||
| 13 | /* | ||
| 14 | * DaVinci-specific definitions | ||
| 15 | */ | ||
| 16 | |||
| 17 | /* Integrated highspeed/otg PHY */ | ||
| 18 | #define USBPHY_CTL_PADDR (DAVINCI_SYSTEM_MODULE_BASE + 0x34) | ||
| 19 | #define USBPHY_PHYCLKGD (1 << 8) | ||
| 20 | #define USBPHY_SESNDEN (1 << 7) /* v(sess_end) comparator */ | ||
| 21 | #define USBPHY_VBDTCTEN (1 << 6) /* v(bus) comparator */ | ||
| 22 | #define USBPHY_PHYPLLON (1 << 4) /* override pll suspend */ | ||
| 23 | #define USBPHY_CLKO1SEL (1 << 3) | ||
| 24 | #define USBPHY_OSCPDWN (1 << 2) | ||
| 25 | #define USBPHY_PHYPDWN (1 << 0) | ||
| 26 | |||
| 27 | /* For now include usb OTG module registers here */ | ||
| 28 | #define DAVINCI_USB_VERSION_REG 0x00 | ||
| 29 | #define DAVINCI_USB_CTRL_REG 0x04 | ||
| 30 | #define DAVINCI_USB_STAT_REG 0x08 | ||
| 31 | #define DAVINCI_RNDIS_REG 0x10 | ||
| 32 | #define DAVINCI_AUTOREQ_REG 0x14 | ||
| 33 | #define DAVINCI_USB_INT_SOURCE_REG 0x20 | ||
| 34 | #define DAVINCI_USB_INT_SET_REG 0x24 | ||
| 35 | #define DAVINCI_USB_INT_SRC_CLR_REG 0x28 | ||
| 36 | #define DAVINCI_USB_INT_MASK_REG 0x2c | ||
| 37 | #define DAVINCI_USB_INT_MASK_SET_REG 0x30 | ||
| 38 | #define DAVINCI_USB_INT_MASK_CLR_REG 0x34 | ||
| 39 | #define DAVINCI_USB_INT_SRC_MASKED_REG 0x38 | ||
| 40 | #define DAVINCI_USB_EOI_REG 0x3c | ||
| 41 | #define DAVINCI_USB_EOI_INTVEC 0x40 | ||
| 42 | |||
| 43 | /* BEGIN CPPI-generic (?) */ | ||
| 44 | |||
| 45 | /* CPPI related registers */ | ||
| 46 | #define DAVINCI_TXCPPI_CTRL_REG 0x80 | ||
| 47 | #define DAVINCI_TXCPPI_TEAR_REG 0x84 | ||
| 48 | #define DAVINCI_CPPI_EOI_REG 0x88 | ||
| 49 | #define DAVINCI_CPPI_INTVEC_REG 0x8c | ||
| 50 | #define DAVINCI_TXCPPI_MASKED_REG 0x90 | ||
| 51 | #define DAVINCI_TXCPPI_RAW_REG 0x94 | ||
| 52 | #define DAVINCI_TXCPPI_INTENAB_REG 0x98 | ||
| 53 | #define DAVINCI_TXCPPI_INTCLR_REG 0x9c | ||
| 54 | |||
| 55 | #define DAVINCI_RXCPPI_CTRL_REG 0xC0 | ||
| 56 | #define DAVINCI_RXCPPI_MASKED_REG 0xD0 | ||
| 57 | #define DAVINCI_RXCPPI_RAW_REG 0xD4 | ||
| 58 | #define DAVINCI_RXCPPI_INTENAB_REG 0xD8 | ||
| 59 | #define DAVINCI_RXCPPI_INTCLR_REG 0xDC | ||
| 60 | |||
| 61 | #define DAVINCI_RXCPPI_BUFCNT0_REG 0xE0 | ||
| 62 | #define DAVINCI_RXCPPI_BUFCNT1_REG 0xE4 | ||
| 63 | #define DAVINCI_RXCPPI_BUFCNT2_REG 0xE8 | ||
| 64 | #define DAVINCI_RXCPPI_BUFCNT3_REG 0xEC | ||
| 65 | |||
| 66 | /* CPPI state RAM entries */ | ||
| 67 | #define DAVINCI_CPPI_STATERAM_BASE_OFFSET 0x100 | ||
| 68 | |||
| 69 | #define DAVINCI_TXCPPI_STATERAM_OFFSET(chnum) \ | ||
| 70 | (DAVINCI_CPPI_STATERAM_BASE_OFFSET + ((chnum) * 0x40)) | ||
| 71 | #define DAVINCI_RXCPPI_STATERAM_OFFSET(chnum) \ | ||
| 72 | (DAVINCI_CPPI_STATERAM_BASE_OFFSET + 0x20 + ((chnum) * 0x40)) | ||
| 73 | |||
| 74 | /* CPPI masks */ | ||
| 75 | #define DAVINCI_DMA_CTRL_ENABLE 1 | ||
| 76 | #define DAVINCI_DMA_CTRL_DISABLE 0 | ||
| 77 | |||
| 78 | #define DAVINCI_DMA_ALL_CHANNELS_ENABLE 0xF | ||
| 79 | #define DAVINCI_DMA_ALL_CHANNELS_DISABLE 0xF | ||
| 80 | |||
| 81 | /* END CPPI-generic (?) */ | ||
| 82 | |||
| 83 | #define DAVINCI_USB_TX_ENDPTS_MASK 0x1f /* ep0 + 4 tx */ | ||
| 84 | #define DAVINCI_USB_RX_ENDPTS_MASK 0x1e /* 4 rx */ | ||
| 85 | |||
| 86 | #define DAVINCI_USB_USBINT_SHIFT 16 | ||
| 87 | #define DAVINCI_USB_TXINT_SHIFT 0 | ||
| 88 | #define DAVINCI_USB_RXINT_SHIFT 8 | ||
| 89 | |||
| 90 | #define DAVINCI_INTR_DRVVBUS 0x0100 | ||
| 91 | |||
| 92 | #define DAVINCI_USB_USBINT_MASK 0x01ff0000 /* 8 Mentor, DRVVBUS */ | ||
| 93 | #define DAVINCI_USB_TXINT_MASK \ | ||
| 94 | (DAVINCI_USB_TX_ENDPTS_MASK << DAVINCI_USB_TXINT_SHIFT) | ||
| 95 | #define DAVINCI_USB_RXINT_MASK \ | ||
| 96 | (DAVINCI_USB_RX_ENDPTS_MASK << DAVINCI_USB_RXINT_SHIFT) | ||
| 97 | |||
| 98 | #define DAVINCI_BASE_OFFSET 0x400 | ||
| 99 | |||
| 100 | #endif /* __MUSB_HDRDF_H__ */ | ||
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c new file mode 100644 index 000000000000..c5b8f0296fcf --- /dev/null +++ b/drivers/usb/musb/musb_core.c | |||
| @@ -0,0 +1,2253 @@ | |||
| 1 | /* | ||
| 2 | * MUSB OTG driver core code | ||
| 3 | * | ||
| 4 | * Copyright 2005 Mentor Graphics Corporation | ||
| 5 | * Copyright (C) 2005-2006 by Texas Instruments | ||
| 6 | * Copyright (C) 2006-2007 Nokia Corporation | ||
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or | ||
| 9 | * modify it under the terms of the GNU General Public License | ||
| 10 | * version 2 as published by the Free Software Foundation. | ||
| 11 | * | ||
| 12 | * This program is distributed in the hope that it will be useful, but | ||
| 13 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| 15 | * General Public License for more details. | ||
| 16 | * | ||
| 17 | * You should have received a copy of the GNU General Public License | ||
| 18 | * along with this program; if not, write to the Free Software | ||
| 19 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA | ||
| 20 | * 02110-1301 USA | ||
| 21 | * | ||
| 22 | * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED | ||
| 23 | * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF | ||
| 24 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN | ||
| 25 | * NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
| 26 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
| 27 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF | ||
| 28 | * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON | ||
| 29 | * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| 30 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
| 31 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| 32 | * | ||
| 33 | */ | ||
| 34 | |||
| 35 | /* | ||
| 36 | * Inventra (Multipoint) Dual-Role Controller Driver for Linux. | ||
| 37 | * | ||
| 38 | * This consists of a Host Controller Driver (HCD) and a peripheral | ||
| 39 | * controller driver implementing the "Gadget" API; OTG support is | ||
| 40 | * in the works. These are normal Linux-USB controller drivers which | ||
| 41 | * use IRQs and have no dedicated thread. | ||
| 42 | * | ||
| 43 | * This version of the driver has only been used with products from | ||
| 44 | * Texas Instruments. Those products integrate the Inventra logic | ||
| 45 | * with other DMA, IRQ, and bus modules, as well as other logic that | ||
| 46 | * needs to be reflected in this driver. | ||
| 47 | * | ||
| 48 | * | ||
| 49 | * NOTE: the original Mentor code here was pretty much a collection | ||
| 50 | * of mechanisms that don't seem to have been fully integrated/working | ||
| 51 | * for *any* Linux kernel version. This version aims at Linux 2.6.now, | ||
| 52 | * Key open issues include: | ||
| 53 | * | ||
| 54 | * - Lack of host-side transaction scheduling, for all transfer types. | ||
| 55 | * The hardware doesn't do it; instead, software must. | ||
| 56 | * | ||
| 57 | * This is not an issue for OTG devices that don't support external | ||
| 58 | * hubs, but for more "normal" USB hosts it's a user issue that the | ||
| 59 | * "multipoint" support doesn't scale in the expected ways. That | ||
| 60 | * includes DaVinci EVM in a common non-OTG mode. | ||
| 61 | * | ||
| 62 | * * Control and bulk use dedicated endpoints, and there's as | ||
| 63 | * yet no mechanism to either (a) reclaim the hardware when | ||
| 64 | * peripherals are NAKing, which gets complicated with bulk | ||
| 65 | * endpoints, or (b) use more than a single bulk endpoint in | ||
| 66 | * each direction. | ||
| 67 | * | ||
| 68 | * RESULT: one device may be perceived as blocking another one. | ||
| 69 | * | ||
| 70 | * * Interrupt and isochronous will dynamically allocate endpoint | ||
| 71 | * hardware, but (a) there's no record keeping for bandwidth; | ||
| 72 | * (b) in the common case that few endpoints are available, there | ||
| 73 | * is no mechanism to reuse endpoints to talk to multiple devices. | ||
| 74 | * | ||
| 75 | * RESULT: At one extreme, bandwidth can be overcommitted in | ||
| 76 | * some hardware configurations, no faults will be reported. | ||
| 77 | * At the other extreme, the bandwidth capabilities which do | ||
| 78 | * exist tend to be severely undercommitted. You can't yet hook | ||
| 79 | * up both a keyboard and a mouse to an external USB hub. | ||
| 80 | */ | ||
| 81 | |||
| 82 | /* | ||
| 83 | * This gets many kinds of configuration information: | ||
| 84 | * - Kconfig for everything user-configurable | ||
| 85 | * - <asm/arch/hdrc_cnf.h> for SOC or family details | ||
| 86 | * - platform_device for addressing, irq, and platform_data | ||
| 87 | * - platform_data is mostly for board-specific informarion | ||
| 88 | * | ||
| 89 | * Most of the conditional compilation will (someday) vanish. | ||
| 90 | */ | ||
| 91 | |||
| 92 | #include <linux/module.h> | ||
| 93 | #include <linux/kernel.h> | ||
| 94 | #include <linux/sched.h> | ||
| 95 | #include <linux/slab.h> | ||
| 96 | #include <linux/init.h> | ||
| 97 | #include <linux/list.h> | ||
| 98 | #include <linux/kobject.h> | ||
| 99 | #include <linux/platform_device.h> | ||
| 100 | #include <linux/io.h> | ||
| 101 | |||
| 102 | #ifdef CONFIG_ARM | ||
| 103 | #include <asm/arch/hardware.h> | ||
| 104 | #include <asm/arch/memory.h> | ||
| 105 | #include <asm/mach-types.h> | ||
| 106 | #endif | ||
| 107 | |||
| 108 | #include "musb_core.h" | ||
| 109 | |||
| 110 | |||
| 111 | #ifdef CONFIG_ARCH_DAVINCI | ||
| 112 | #include "davinci.h" | ||
| 113 | #endif | ||
| 114 | |||
| 115 | |||
| 116 | |||
| 117 | unsigned debug; | ||
| 118 | module_param(debug, uint, S_IRUGO | S_IWUSR); | ||
| 119 | MODULE_PARM_DESC(debug, "Debug message level. Default = 0"); | ||
| 120 | |||
| 121 | #define DRIVER_AUTHOR "Mentor Graphics, Texas Instruments, Nokia" | ||
| 122 | #define DRIVER_DESC "Inventra Dual-Role USB Controller Driver" | ||
| 123 | |||
| 124 | #define MUSB_VERSION "6.0" | ||
| 125 | |||
| 126 | #define DRIVER_INFO DRIVER_DESC ", v" MUSB_VERSION | ||
| 127 | |||
| 128 | #define MUSB_DRIVER_NAME "musb_hdrc" | ||
| 129 | const char musb_driver_name[] = MUSB_DRIVER_NAME; | ||
| 130 | |||
| 131 | MODULE_DESCRIPTION(DRIVER_INFO); | ||
| 132 | MODULE_AUTHOR(DRIVER_AUTHOR); | ||
| 133 | MODULE_LICENSE("GPL"); | ||
| 134 | MODULE_ALIAS("platform:" MUSB_DRIVER_NAME); | ||
| 135 | |||
| 136 | |||
| 137 | /*-------------------------------------------------------------------------*/ | ||
| 138 | |||
| 139 | static inline struct musb *dev_to_musb(struct device *dev) | ||
| 140 | { | ||
| 141 | #ifdef CONFIG_USB_MUSB_HDRC_HCD | ||
| 142 | /* usbcore insists dev->driver_data is a "struct hcd *" */ | ||
| 143 | return hcd_to_musb(dev_get_drvdata(dev)); | ||
| 144 | #else | ||
| 145 | return dev_get_drvdata(dev); | ||
| 146 | #endif | ||
| 147 | } | ||
| 148 | |||
| 149 | /*-------------------------------------------------------------------------*/ | ||
| 150 | |||
| 151 | #ifndef CONFIG_USB_TUSB6010 | ||
| 152 | /* | ||
| 153 | * Load an endpoint's FIFO | ||
| 154 | */ | ||
| 155 | void musb_write_fifo(struct musb_hw_ep *hw_ep, u16 len, const u8 *src) | ||
| 156 | { | ||
| 157 | void __iomem *fifo = hw_ep->fifo; | ||
| 158 | |||
| 159 | prefetch((u8 *)src); | ||
| 160 | |||
| 161 | DBG(4, "%cX ep%d fifo %p count %d buf %p\n", | ||
| 162 | 'T', hw_ep->epnum, fifo, len, src); | ||
| 163 | |||
| 164 | /* we can't assume unaligned reads work */ | ||
| 165 | if (likely((0x01 & (unsigned long) src) == 0)) { | ||
| 166 | u16 index = 0; | ||
| 167 | |||
| 168 | /* best case is 32bit-aligned source address */ | ||
| 169 | if ((0x02 & (unsigned long) src) == 0) { | ||
| 170 | if (len >= 4) { | ||
| 171 | writesl(fifo, src + index, len >> 2); | ||
| 172 | index += len & ~0x03; | ||
| 173 | } | ||
| 174 | if (len & 0x02) { | ||
| 175 | musb_writew(fifo, 0, *(u16 *)&src[index]); | ||
| 176 | index += 2; | ||
| 177 | } | ||
| 178 | } else { | ||
| 179 | if (len >= 2) { | ||
| 180 | writesw(fifo, src + index, len >> 1); | ||
| 181 | index += len & ~0x01; | ||
| 182 | } | ||
| 183 | } | ||
| 184 | if (len & 0x01) | ||
| 185 | musb_writeb(fifo, 0, src[index]); | ||
| 186 | } else { | ||
| 187 | /* byte aligned */ | ||
| 188 | writesb(fifo, src, len); | ||
| 189 | } | ||
| 190 | } | ||
| 191 | |||
| 192 | /* | ||
| 193 | * Unload an endpoint's FIFO | ||
| 194 | */ | ||
| 195 | void musb_read_fifo(struct musb_hw_ep *hw_ep, u16 len, u8 *dst) | ||
| 196 | { | ||
| 197 | void __iomem *fifo = hw_ep->fifo; | ||
| 198 | |||
| 199 | DBG(4, "%cX ep%d fifo %p count %d buf %p\n", | ||
| 200 | 'R', hw_ep->epnum, fifo, len, dst); | ||
| 201 | |||
| 202 | /* we can't assume unaligned writes work */ | ||
| 203 | if (likely((0x01 & (unsigned long) dst) == 0)) { | ||
| 204 | u16 index = 0; | ||
| 205 | |||
| 206 | /* best case is 32bit-aligned destination address */ | ||
| 207 | if ((0x02 & (unsigned long) dst) == 0) { | ||
| 208 | if (len >= 4) { | ||
| 209 | readsl(fifo, dst, len >> 2); | ||
| 210 | index = len & ~0x03; | ||
| 211 | } | ||
| 212 | if (len & 0x02) { | ||
| 213 | *(u16 *)&dst[index] = musb_readw(fifo, 0); | ||
| 214 | index += 2; | ||
| 215 | } | ||
| 216 | } else { | ||
| 217 | if (len >= 2) { | ||
| 218 | readsw(fifo, dst, len >> 1); | ||
| 219 | index = len & ~0x01; | ||
| 220 | } | ||
| 221 | } | ||
| 222 | if (len & 0x01) | ||
| 223 | dst[index] = musb_readb(fifo, 0); | ||
| 224 | } else { | ||
| 225 | /* byte aligned */ | ||
| 226 | readsb(fifo, dst, len); | ||
| 227 | } | ||
| 228 | } | ||
| 229 | |||
| 230 | #endif /* normal PIO */ | ||
| 231 | |||
| 232 | |||
| 233 | /*-------------------------------------------------------------------------*/ | ||
| 234 | |||
| 235 | /* for high speed test mode; see USB 2.0 spec 7.1.20 */ | ||
| 236 | static const u8 musb_test_packet[53] = { | ||
| 237 | /* implicit SYNC then DATA0 to start */ | ||
| 238 | |||
| 239 | /* JKJKJKJK x9 */ | ||
| 240 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, | ||
| 241 | /* JJKKJJKK x8 */ | ||
| 242 | 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, | ||
| 243 | /* JJJJKKKK x8 */ | ||
| 244 | 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, | ||
| 245 | /* JJJJJJJKKKKKKK x8 */ | ||
| 246 | 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, | ||
| 247 | /* JJJJJJJK x8 */ | ||
| 248 | 0x7f, 0xbf, 0xdf, 0xef, 0xf7, 0xfb, 0xfd, | ||
| 249 | /* JKKKKKKK x10, JK */ | ||
| 250 | 0xfc, 0x7e, 0xbf, 0xdf, 0xef, 0xf7, 0xfb, 0xfd, 0x7e | ||
| 251 | |||
| 252 | /* implicit CRC16 then EOP to end */ | ||
| 253 | }; | ||
| 254 | |||
| 255 | void musb_load_testpacket(struct musb *musb) | ||
| 256 | { | ||
| 257 | void __iomem *regs = musb->endpoints[0].regs; | ||
| 258 | |||
| 259 | musb_ep_select(musb->mregs, 0); | ||
| 260 | musb_write_fifo(musb->control_ep, | ||
| 261 | sizeof(musb_test_packet), musb_test_packet); | ||
| 262 | musb_writew(regs, MUSB_CSR0, MUSB_CSR0_TXPKTRDY); | ||
| 263 | } | ||
| 264 | |||
| 265 | /*-------------------------------------------------------------------------*/ | ||
| 266 | |||
| 267 | const char *otg_state_string(struct musb *musb) | ||
| 268 | { | ||
| 269 | switch (musb->xceiv.state) { | ||
| 270 | case OTG_STATE_A_IDLE: return "a_idle"; | ||
| 271 | case OTG_STATE_A_WAIT_VRISE: return "a_wait_vrise"; | ||
| 272 | case OTG_STATE_A_WAIT_BCON: return "a_wait_bcon"; | ||
| 273 | case OTG_STATE_A_HOST: return "a_host"; | ||
| 274 | case OTG_STATE_A_SUSPEND: return "a_suspend"; | ||
| 275 | case OTG_STATE_A_PERIPHERAL: return "a_peripheral"; | ||
| 276 | case OTG_STATE_A_WAIT_VFALL: return "a_wait_vfall"; | ||
| 277 | case OTG_STATE_A_VBUS_ERR: return "a_vbus_err"; | ||
| 278 | case OTG_STATE_B_IDLE: return "b_idle"; | ||
| 279 | case OTG_STATE_B_SRP_INIT: return "b_srp_init"; | ||
| 280 | case OTG_STATE_B_PERIPHERAL: return "b_peripheral"; | ||
| 281 | case OTG_STATE_B_WAIT_ACON: return "b_wait_acon"; | ||
| 282 | case OTG_STATE_B_HOST: return "b_host"; | ||
| 283 | default: return "UNDEFINED"; | ||
| 284 | } | ||
| 285 | } | ||
| 286 | |||
| 287 | #ifdef CONFIG_USB_MUSB_OTG | ||
| 288 | |||
| 289 | /* | ||
| 290 | * See also USB_OTG_1-3.pdf 6.6.5 Timers | ||
| 291 | * REVISIT: Are the other timers done in the hardware? | ||
| 292 | */ | ||
| 293 | #define TB_ASE0_BRST 100 /* Min 3.125 ms */ | ||
| 294 | |||
| 295 | /* | ||
| 296 | * Handles OTG hnp timeouts, such as b_ase0_brst | ||
| 297 | */ | ||
| 298 | void musb_otg_timer_func(unsigned long data) | ||
| 299 | { | ||
| 300 | struct musb *musb = (struct musb *)data; | ||
| 301 | unsigned long flags; | ||
| 302 | |||
| 303 | spin_lock_irqsave(&musb->lock, flags); | ||
| 304 | switch (musb->xceiv.state) { | ||
| 305 | case OTG_STATE_B_WAIT_ACON: | ||
| 306 | DBG(1, "HNP: b_wait_acon timeout; back to b_peripheral\n"); | ||
| 307 | musb_g_disconnect(musb); | ||
| 308 | musb->xceiv.state = OTG_STATE_B_PERIPHERAL; | ||
| 309 | musb->is_active = 0; | ||
| 310 | break; | ||
| 311 | case OTG_STATE_A_WAIT_BCON: | ||
| 312 | DBG(1, "HNP: a_wait_bcon timeout; back to a_host\n"); | ||
| 313 | musb_hnp_stop(musb); | ||
| 314 | break; | ||
| 315 | default: | ||
| 316 | DBG(1, "HNP: Unhandled mode %s\n", otg_state_string(musb)); | ||
| 317 | } | ||
| 318 | musb->ignore_disconnect = 0; | ||
| 319 | spin_unlock_irqrestore(&musb->lock, flags); | ||
| 320 | } | ||
| 321 | |||
| 322 | static DEFINE_TIMER(musb_otg_timer, musb_otg_timer_func, 0, 0); | ||
| 323 | |||
| 324 | /* | ||
| 325 | * Stops the B-device HNP state. Caller must take care of locking. | ||
| 326 | */ | ||
| 327 | void musb_hnp_stop(struct musb *musb) | ||
| 328 | { | ||
| 329 | struct usb_hcd *hcd = musb_to_hcd(musb); | ||
| 330 | void __iomem *mbase = musb->mregs; | ||
| 331 | u8 reg; | ||
| 332 | |||
| 333 | switch (musb->xceiv.state) { | ||
| 334 | case OTG_STATE_A_PERIPHERAL: | ||
| 335 | case OTG_STATE_A_WAIT_VFALL: | ||
| 336 | case OTG_STATE_A_WAIT_BCON: | ||
| 337 | DBG(1, "HNP: Switching back to A-host\n"); | ||
| 338 | musb_g_disconnect(musb); | ||
| 339 | musb->xceiv.state = OTG_STATE_A_IDLE; | ||
| 340 | MUSB_HST_MODE(musb); | ||
| 341 | musb->is_active = 0; | ||
| 342 | break; | ||
| 343 | case OTG_STATE_B_HOST: | ||
| 344 | DBG(1, "HNP: Disabling HR\n"); | ||
| 345 | hcd->self.is_b_host = 0; | ||
| 346 | musb->xceiv.state = OTG_STATE_B_PERIPHERAL; | ||
| 347 | MUSB_DEV_MODE(musb); | ||
| 348 | reg = musb_readb(mbase, MUSB_POWER); | ||
| 349 | reg |= MUSB_POWER_SUSPENDM; | ||
| 350 | musb_writeb(mbase, MUSB_POWER, reg); | ||
| 351 | /* REVISIT: Start SESSION_REQUEST here? */ | ||
| 352 | break; | ||
| 353 | default: | ||
| 354 | DBG(1, "HNP: Stopping in unknown state %s\n", | ||
| 355 | otg_state_string(musb)); | ||
| 356 | } | ||
| 357 | |||
| 358 | /* | ||
| 359 | * When returning to A state after HNP, avoid hub_port_rebounce(), | ||
| 360 | * which cause occasional OPT A "Did not receive reset after connect" | ||
| 361 | * errors. | ||
| 362 | */ | ||
| 363 | musb->port1_status &= | ||
| 364 | ~(1 << USB_PORT_FEAT_C_CONNECTION); | ||
| 365 | } | ||
| 366 | |||
| 367 | #endif | ||
| 368 | |||
| 369 | /* | ||
| 370 | * Interrupt Service Routine to record USB "global" interrupts. | ||
| 371 | * Since these do not happen often and signify things of | ||
| 372 | * paramount importance, it seems OK to check them individually; | ||
| 373 | * the order of the tests is specified in the manual | ||
| 374 | * | ||
| 375 | * @param musb instance pointer | ||
| 376 | * @param int_usb register contents | ||
| 377 | * @param devctl | ||
| 378 | * @param power | ||
| 379 | */ | ||
| 380 | |||
| 381 | #define STAGE0_MASK (MUSB_INTR_RESUME | MUSB_INTR_SESSREQ \ | ||
| 382 | | MUSB_INTR_VBUSERROR | MUSB_INTR_CONNECT \ | ||
| 383 | | MUSB_INTR_RESET) | ||
| 384 | |||
| 385 | static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb, | ||
| 386 | u8 devctl, u8 power) | ||
| 387 | { | ||
| 388 | irqreturn_t handled = IRQ_NONE; | ||
| 389 | void __iomem *mbase = musb->mregs; | ||
| 390 | |||
| 391 | DBG(3, "<== Power=%02x, DevCtl=%02x, int_usb=0x%x\n", power, devctl, | ||
| 392 | int_usb); | ||
| 393 | |||
| 394 | /* in host mode, the peripheral may issue remote wakeup. | ||
| 395 | * in peripheral mode, the host may resume the link. | ||
| 396 | * spurious RESUME irqs happen too, paired with SUSPEND. | ||
| 397 | */ | ||
| 398 | if (int_usb & MUSB_INTR_RESUME) { | ||
| 399 | handled = IRQ_HANDLED; | ||
| 400 | DBG(3, "RESUME (%s)\n", otg_state_string(musb)); | ||
| 401 | |||
| 402 | if (devctl & MUSB_DEVCTL_HM) { | ||
| 403 | #ifdef CONFIG_USB_MUSB_HDRC_HCD | ||
| 404 | switch (musb->xceiv.state) { | ||
| 405 | case OTG_STATE_A_SUSPEND: | ||
| 406 | /* remote wakeup? later, GetPortStatus | ||
| 407 | * will stop RESUME signaling | ||
| 408 | */ | ||
| 409 | |||
| 410 | if (power & MUSB_POWER_SUSPENDM) { | ||
| 411 | /* spurious */ | ||
| 412 | musb->int_usb &= ~MUSB_INTR_SUSPEND; | ||
| 413 | DBG(2, "Spurious SUSPENDM\n"); | ||
| 414 | break; | ||
| 415 | } | ||
| 416 | |||
| 417 | power &= ~MUSB_POWER_SUSPENDM; | ||
| 418 | musb_writeb(mbase, MUSB_POWER, | ||
| 419 | power | MUSB_POWER_RESUME); | ||
| 420 | |||
| 421 | musb->port1_status |= | ||
| 422 | (USB_PORT_STAT_C_SUSPEND << 16) | ||
| 423 | | MUSB_PORT_STAT_RESUME; | ||
| 424 | musb->rh_timer = jiffies | ||
| 425 | + msecs_to_jiffies(20); | ||
| 426 | |||
| 427 | musb->xceiv.state = OTG_STATE_A_HOST; | ||
| 428 | musb->is_active = 1; | ||
| 429 | usb_hcd_resume_root_hub(musb_to_hcd(musb)); | ||
| 430 | break; | ||
| 431 | case OTG_STATE_B_WAIT_ACON: | ||
| 432 | musb->xceiv.state = OTG_STATE_B_PERIPHERAL; | ||
| 433 | musb->is_active = 1; | ||
| 434 | MUSB_DEV_MODE(musb); | ||
| 435 | break; | ||
| 436 | default: | ||
| 437 | WARNING("bogus %s RESUME (%s)\n", | ||
| 438 | "host", | ||
| 439 | otg_state_string(musb)); | ||
| 440 | } | ||
| 441 | #endif | ||
| 442 | } else { | ||
| 443 | switch (musb->xceiv.state) { | ||
| 444 | #ifdef CONFIG_USB_MUSB_HDRC_HCD | ||
| 445 | case OTG_STATE_A_SUSPEND: | ||
| 446 | /* possibly DISCONNECT is upcoming */ | ||
| 447 | musb->xceiv.state = OTG_STATE_A_HOST; | ||
| 448 | usb_hcd_resume_root_hub(musb_to_hcd(musb)); | ||
| 449 | break; | ||
| 450 | #endif | ||
| 451 | #ifdef CONFIG_USB_GADGET_MUSB_HDRC | ||
| 452 | case OTG_STATE_B_WAIT_ACON: | ||
| 453 | case OTG_STATE_B_PERIPHERAL: | ||
| 454 | /* disconnect while suspended? we may | ||
| 455 | * not get a disconnect irq... | ||
| 456 | */ | ||
| 457 | if ((devctl & MUSB_DEVCTL_VBUS) | ||
| 458 | != (3 << MUSB_DEVCTL_VBUS_SHIFT) | ||
| 459 | ) { | ||
| 460 | musb->int_usb |= MUSB_INTR_DISCONNECT; | ||
| 461 | musb->int_usb &= ~MUSB_INTR_SUSPEND; | ||
| 462 | break; | ||
| 463 | } | ||
| 464 | musb_g_resume(musb); | ||
| 465 | break; | ||
| 466 | case OTG_STATE_B_IDLE: | ||
| 467 | musb->int_usb &= ~MUSB_INTR_SUSPEND; | ||
| 468 | break; | ||
| 469 | #endif | ||
| 470 | default: | ||
| 471 | WARNING("bogus %s RESUME (%s)\n", | ||
| 472 | "peripheral", | ||
| 473 | otg_state_string(musb)); | ||
| 474 | } | ||
| 475 | } | ||
| 476 | } | ||
| 477 | |||
| 478 | #ifdef CONFIG_USB_MUSB_HDRC_HCD | ||
| 479 | /* see manual for the order of the tests */ | ||
| 480 | if (int_usb & MUSB_INTR_SESSREQ) { | ||
| 481 | DBG(1, "SESSION_REQUEST (%s)\n", otg_state_string(musb)); | ||
| 482 | |||
| 483 | /* IRQ arrives from ID pin sense or (later, if VBUS power | ||
| 484 | * is removed) SRP. responses are time critical: | ||
| 485 | * - turn on VBUS (with silicon-specific mechanism) | ||
| 486 | * - go through A_WAIT_VRISE | ||
| 487 | * - ... to A_WAIT_BCON. | ||
| 488 | * a_wait_vrise_tmout triggers VBUS_ERROR transitions | ||
| 489 | */ | ||
| 490 | musb_writeb(mbase, MUSB_DEVCTL, MUSB_DEVCTL_SESSION); | ||
| 491 | musb->ep0_stage = MUSB_EP0_START; | ||
| 492 | musb->xceiv.state = OTG_STATE_A_IDLE; | ||
| 493 | MUSB_HST_MODE(musb); | ||
| 494 | musb_set_vbus(musb, 1); | ||
| 495 | |||
| 496 | handled = IRQ_HANDLED; | ||
| 497 | } | ||
| 498 | |||
| 499 | if (int_usb & MUSB_INTR_VBUSERROR) { | ||
| 500 | int ignore = 0; | ||
| 501 | |||
| 502 | /* During connection as an A-Device, we may see a short | ||
| 503 | * current spikes causing voltage drop, because of cable | ||
| 504 | * and peripheral capacitance combined with vbus draw. | ||
| 505 | * (So: less common with truly self-powered devices, where | ||
| 506 | * vbus doesn't act like a power supply.) | ||
| 507 | * | ||
| 508 | * Such spikes are short; usually less than ~500 usec, max | ||
| 509 | * of ~2 msec. That is, they're not sustained overcurrent | ||
| 510 | * errors, though they're reported using VBUSERROR irqs. | ||
| 511 | * | ||
| 512 | * Workarounds: (a) hardware: use self powered devices. | ||
| 513 | * (b) software: ignore non-repeated VBUS errors. | ||
| 514 | * | ||
| 515 | * REVISIT: do delays from lots of DEBUG_KERNEL checks | ||
| 516 | * make trouble here, keeping VBUS < 4.4V ? | ||
| 517 | */ | ||
| 518 | switch (musb->xceiv.state) { | ||
| 519 | case OTG_STATE_A_HOST: | ||
| 520 | /* recovery is dicey once we've gotten past the | ||
| 521 | * initial stages of enumeration, but if VBUS | ||
| 522 | * stayed ok at the other end of the link, and | ||
| 523 | * another reset is due (at least for high speed, | ||
| 524 | * to redo the chirp etc), it might work OK... | ||
| 525 | */ | ||
| 526 | case OTG_STATE_A_WAIT_BCON: | ||
| 527 | case OTG_STATE_A_WAIT_VRISE: | ||
| 528 | if (musb->vbuserr_retry) { | ||
| 529 | musb->vbuserr_retry--; | ||
| 530 | ignore = 1; | ||
| 531 | devctl |= MUSB_DEVCTL_SESSION; | ||
| 532 | musb_writeb(mbase, MUSB_DEVCTL, devctl); | ||
| 533 | } else { | ||
| 534 | musb->port1_status |= | ||
| 535 | (1 << USB_PORT_FEAT_OVER_CURRENT) | ||
| 536 | | (1 << USB_PORT_FEAT_C_OVER_CURRENT); | ||
| 537 | } | ||
| 538 | break; | ||
| 539 | default: | ||
| 540 | break; | ||
| 541 | } | ||
| 542 | |||
| 543 | DBG(1, "VBUS_ERROR in %s (%02x, %s), retry #%d, port1 %08x\n", | ||
| 544 | otg_state_string(musb), | ||
| 545 | devctl, | ||
| 546 | ({ char *s; | ||
| 547 | switch (devctl & MUSB_DEVCTL_VBUS) { | ||
| 548 | case 0 << MUSB_DEVCTL_VBUS_SHIFT: | ||
| 549 | s = "<SessEnd"; break; | ||
| 550 | case 1 << MUSB_DEVCTL_VBUS_SHIFT: | ||
| 551 | s = "<AValid"; break; | ||
| 552 | case 2 << MUSB_DEVCTL_VBUS_SHIFT: | ||
| 553 | s = "<VBusValid"; break; | ||
| 554 | /* case 3 << MUSB_DEVCTL_VBUS_SHIFT: */ | ||
| 555 | default: | ||
| 556 | s = "VALID"; break; | ||
| 557 | }; s; }), | ||
| 558 | VBUSERR_RETRY_COUNT - musb->vbuserr_retry, | ||
| 559 | musb->port1_status); | ||
| 560 | |||
| 561 | /* go through A_WAIT_VFALL then start a new session */ | ||
| 562 | if (!ignore) | ||
| 563 | musb_set_vbus(musb, 0); | ||
| 564 | handled = IRQ_HANDLED; | ||
| 565 | } | ||
| 566 | |||
| 567 | if (int_usb & MUSB_INTR_CONNECT) { | ||
| 568 | struct usb_hcd *hcd = musb_to_hcd(musb); | ||
| 569 | |||
| 570 | handled = IRQ_HANDLED; | ||
| 571 | musb->is_active = 1; | ||
| 572 | set_bit(HCD_FLAG_SAW_IRQ, &hcd->flags); | ||
| 573 | |||
| 574 | musb->ep0_stage = MUSB_EP0_START; | ||
| 575 | |||
| 576 | #ifdef CONFIG_USB_MUSB_OTG | ||
| 577 | /* flush endpoints when transitioning from Device Mode */ | ||
| 578 | if (is_peripheral_active(musb)) { | ||
| 579 | /* REVISIT HNP; just force disconnect */ | ||
| 580 | } | ||
| 581 | musb_writew(mbase, MUSB_INTRTXE, musb->epmask); | ||
| 582 | musb_writew(mbase, MUSB_INTRRXE, musb->epmask & 0xfffe); | ||
| 583 | musb_writeb(mbase, MUSB_INTRUSBE, 0xf7); | ||
| 584 | #endif | ||
| 585 | musb->port1_status &= ~(USB_PORT_STAT_LOW_SPEED | ||
| 586 | |USB_PORT_STAT_HIGH_SPEED | ||
| 587 | |USB_PORT_STAT_ENABLE | ||
| 588 | ); | ||
| 589 | musb->port1_status |= USB_PORT_STAT_CONNECTION | ||
| 590 | |(USB_PORT_STAT_C_CONNECTION << 16); | ||
| 591 | |||
| 592 | /* high vs full speed is just a guess until after reset */ | ||
| 593 | if (devctl & MUSB_DEVCTL_LSDEV) | ||
| 594 | musb->port1_status |= USB_PORT_STAT_LOW_SPEED; | ||
| 595 | |||
| 596 | if (hcd->status_urb) | ||
| 597 | usb_hcd_poll_rh_status(hcd); | ||
| 598 | else | ||
| 599 | usb_hcd_resume_root_hub(hcd); | ||
| 600 | |||
| 601 | MUSB_HST_MODE(musb); | ||
| 602 | |||
| 603 | /* indicate new connection to OTG machine */ | ||
| 604 | switch (musb->xceiv.state) { | ||
| 605 | case OTG_STATE_B_PERIPHERAL: | ||
| 606 | if (int_usb & MUSB_INTR_SUSPEND) { | ||
| 607 | DBG(1, "HNP: SUSPEND+CONNECT, now b_host\n"); | ||
| 608 | musb->xceiv.state = OTG_STATE_B_HOST; | ||
| 609 | hcd->self.is_b_host = 1; | ||
| 610 | int_usb &= ~MUSB_INTR_SUSPEND; | ||
| 611 | } else | ||
| 612 | DBG(1, "CONNECT as b_peripheral???\n"); | ||
| 613 | break; | ||
| 614 | case OTG_STATE_B_WAIT_ACON: | ||
| 615 | DBG(1, "HNP: Waiting to switch to b_host state\n"); | ||
| 616 | musb->xceiv.state = OTG_STATE_B_HOST; | ||
| 617 | hcd->self.is_b_host = 1; | ||
| 618 | break; | ||
| 619 | default: | ||
| 620 | if ((devctl & MUSB_DEVCTL_VBUS) | ||
| 621 | == (3 << MUSB_DEVCTL_VBUS_SHIFT)) { | ||
| 622 | musb->xceiv.state = OTG_STATE_A_HOST; | ||
| 623 | hcd->self.is_b_host = 0; | ||
| 624 | } | ||
| 625 | break; | ||
| 626 | } | ||
| 627 | DBG(1, "CONNECT (%s) devctl %02x\n", | ||
| 628 | otg_state_string(musb), devctl); | ||
| 629 | } | ||
| 630 | #endif /* CONFIG_USB_MUSB_HDRC_HCD */ | ||
| 631 | |||
| 632 | /* mentor saves a bit: bus reset and babble share the same irq. | ||
| 633 | * only host sees babble; only peripheral sees bus reset. | ||
| 634 | */ | ||
| 635 | if (int_usb & MUSB_INTR_RESET) { | ||
| 636 | if (is_host_capable() && (devctl & MUSB_DEVCTL_HM) != 0) { | ||
| 637 | /* | ||
| 638 | * Looks like non-HS BABBLE can be ignored, but | ||
| 639 | * HS BABBLE is an error condition. For HS the solution | ||
| 640 | * is to avoid babble in the first place and fix what | ||
| 641 | * caused BABBLE. When HS BABBLE happens we can only | ||
| 642 | * stop the session. | ||
| 643 | */ | ||
| 644 | if (devctl & (MUSB_DEVCTL_FSDEV | MUSB_DEVCTL_LSDEV)) | ||
| 645 | DBG(1, "BABBLE devctl: %02x\n", devctl); | ||
| 646 | else { | ||
| 647 | ERR("Stopping host session -- babble\n"); | ||
| 648 | musb_writeb(mbase, MUSB_DEVCTL, 0); | ||
| 649 | } | ||
| 650 | } else if (is_peripheral_capable()) { | ||
| 651 | DBG(1, "BUS RESET as %s\n", otg_state_string(musb)); | ||
| 652 | switch (musb->xceiv.state) { | ||
| 653 | #ifdef CONFIG_USB_OTG | ||
| 654 | case OTG_STATE_A_SUSPEND: | ||
| 655 | /* We need to ignore disconnect on suspend | ||
| 656 | * otherwise tusb 2.0 won't reconnect after a | ||
| 657 | * power cycle, which breaks otg compliance. | ||
| 658 | */ | ||
| 659 | musb->ignore_disconnect = 1; | ||
| 660 | musb_g_reset(musb); | ||
| 661 | /* FALLTHROUGH */ | ||
| 662 | case OTG_STATE_A_WAIT_BCON: /* OPT TD.4.7-900ms */ | ||
| 663 | DBG(1, "HNP: Setting timer as %s\n", | ||
| 664 | otg_state_string(musb)); | ||
| 665 | musb_otg_timer.data = (unsigned long)musb; | ||
| 666 | mod_timer(&musb_otg_timer, jiffies | ||
| 667 | + msecs_to_jiffies(100)); | ||
| 668 | break; | ||
| 669 | case OTG_STATE_A_PERIPHERAL: | ||
| 670 | musb_hnp_stop(musb); | ||
| 671 | break; | ||
| 672 | case OTG_STATE_B_WAIT_ACON: | ||
| 673 | DBG(1, "HNP: RESET (%s), to b_peripheral\n", | ||
| 674 | otg_state_string(musb)); | ||
| 675 | musb->xceiv.state = OTG_STATE_B_PERIPHERAL; | ||
| 676 | musb_g_reset(musb); | ||
| 677 | break; | ||
| 678 | #endif | ||
| 679 | case OTG_STATE_B_IDLE: | ||
| 680 | musb->xceiv.state = OTG_STATE_B_PERIPHERAL; | ||
| 681 | /* FALLTHROUGH */ | ||
| 682 | case OTG_STATE_B_PERIPHERAL: | ||
| 683 | musb_g_reset(musb); | ||
| 684 | break; | ||
| 685 | default: | ||
| 686 | DBG(1, "Unhandled BUS RESET as %s\n", | ||
| 687 | otg_state_string(musb)); | ||
| 688 | } | ||
| 689 | } | ||
| 690 | |||
| 691 | handled = IRQ_HANDLED; | ||
| 692 | } | ||
| 693 | schedule_work(&musb->irq_work); | ||
| 694 | |||
| 695 | return handled; | ||
| 696 | } | ||
| 697 | |||
| 698 | /* | ||
| 699 | * Interrupt Service Routine to record USB "global" interrupts. | ||
| 700 | * Since these do not happen often and signify things of | ||
| 701 | * paramount importance, it seems OK to check them individually; | ||
| 702 | * the order of the tests is specified in the manual | ||
| 703 | * | ||
| 704 | * @param musb instance pointer | ||
| 705 | * @param int_usb register contents | ||
| 706 | * @param devctl | ||
| 707 | * @param power | ||
| 708 | */ | ||
| 709 | static irqreturn_t musb_stage2_irq(struct musb *musb, u8 int_usb, | ||
| 710 | u8 devctl, u8 power) | ||
| 711 | { | ||
| 712 | irqreturn_t handled = IRQ_NONE; | ||
| 713 | |||
| 714 | #if 0 | ||
| 715 | /* REVISIT ... this would be for multiplexing periodic endpoints, or | ||
| 716 | * supporting transfer phasing to prevent exceeding ISO bandwidth | ||
| 717 | * limits of a given frame or microframe. | ||
| 718 | * | ||
| 719 | * It's not needed for peripheral side, which dedicates endpoints; | ||
| 720 | * though it _might_ use SOF irqs for other purposes. | ||
| 721 | * | ||
| 722 | * And it's not currently needed for host side, which also dedicates | ||
| 723 | * endpoints, relies on TX/RX interval registers, and isn't claimed | ||
| 724 | * to support ISO transfers yet. | ||
| 725 | */ | ||
| 726 | if (int_usb & MUSB_INTR_SOF) { | ||
| 727 | void __iomem *mbase = musb->mregs; | ||
| 728 | struct musb_hw_ep *ep; | ||
| 729 | u8 epnum; | ||
| 730 | u16 frame; | ||
| 731 | |||
| 732 | DBG(6, "START_OF_FRAME\n"); | ||
| 733 | handled = IRQ_HANDLED; | ||
| 734 | |||
| 735 | /* start any periodic Tx transfers waiting for current frame */ | ||
| 736 | frame = musb_readw(mbase, MUSB_FRAME); | ||
| 737 | ep = musb->endpoints; | ||
| 738 | for (epnum = 1; (epnum < musb->nr_endpoints) | ||
| 739 | && (musb->epmask >= (1 << epnum)); | ||
| 740 | epnum++, ep++) { | ||
| 741 | /* | ||
| 742 | * FIXME handle framecounter wraps (12 bits) | ||
| 743 | * eliminate duplicated StartUrb logic | ||
| 744 | */ | ||
| 745 | if (ep->dwWaitFrame >= frame) { | ||
| 746 | ep->dwWaitFrame = 0; | ||
| 747 | pr_debug("SOF --> periodic TX%s on %d\n", | ||
| 748 | ep->tx_channel ? " DMA" : "", | ||
| 749 | epnum); | ||
| 750 | if (!ep->tx_channel) | ||
| 751 | musb_h_tx_start(musb, epnum); | ||
| 752 | else | ||
| 753 | cppi_hostdma_start(musb, epnum); | ||
| 754 | } | ||
| 755 | } /* end of for loop */ | ||
| 756 | } | ||
| 757 | #endif | ||
| 758 | |||
| 759 | if ((int_usb & MUSB_INTR_DISCONNECT) && !musb->ignore_disconnect) { | ||
| 760 | DBG(1, "DISCONNECT (%s) as %s, devctl %02x\n", | ||
| 761 | otg_state_string(musb), | ||
| 762 | MUSB_MODE(musb), devctl); | ||
| 763 | handled = IRQ_HANDLED; | ||
| 764 | |||
| 765 | switch (musb->xceiv.state) { | ||
| 766 | #ifdef CONFIG_USB_MUSB_HDRC_HCD | ||
| 767 | case OTG_STATE_A_HOST: | ||
| 768 | case OTG_STATE_A_SUSPEND: | ||
| 769 | musb_root_disconnect(musb); | ||
| 770 | if (musb->a_wait_bcon != 0) | ||
| 771 | musb_platform_try_idle(musb, jiffies | ||
| 772 | + msecs_to_jiffies(musb->a_wait_bcon)); | ||
| 773 | break; | ||
| 774 | #endif /* HOST */ | ||
| 775 | #ifdef CONFIG_USB_MUSB_OTG | ||
| 776 | case OTG_STATE_B_HOST: | ||
| 777 | musb_hnp_stop(musb); | ||
| 778 | break; | ||
| 779 | case OTG_STATE_A_PERIPHERAL: | ||
| 780 | musb_hnp_stop(musb); | ||
| 781 | musb_root_disconnect(musb); | ||
| 782 | /* FALLTHROUGH */ | ||
| 783 | case OTG_STATE_B_WAIT_ACON: | ||
| 784 | /* FALLTHROUGH */ | ||
| 785 | #endif /* OTG */ | ||
| 786 | #ifdef CONFIG_USB_GADGET_MUSB_HDRC | ||
| 787 | case OTG_STATE_B_PERIPHERAL: | ||
| 788 | case OTG_STATE_B_IDLE: | ||
| 789 | musb_g_disconnect(musb); | ||
| 790 | break; | ||
| 791 | #endif /* GADGET */ | ||
| 792 | default: | ||
| 793 | WARNING("unhandled DISCONNECT transition (%s)\n", | ||
| 794 | otg_state_string(musb)); | ||
| 795 | break; | ||
| 796 | } | ||
| 797 | |||
| 798 | schedule_work(&musb->irq_work); | ||
| 799 | } | ||
| 800 | |||
| 801 | if (int_usb & MUSB_INTR_SUSPEND) { | ||
| 802 | DBG(1, "SUSPEND (%s) devctl %02x power %02x\n", | ||
| 803 | otg_state_string(musb), devctl, power); | ||
| 804 | handled = IRQ_HANDLED; | ||
| 805 | |||
| 806 | switch (musb->xceiv.state) { | ||
| 807 | #ifdef CONFIG_USB_MUSB_OTG | ||
| 808 | case OTG_STATE_A_PERIPHERAL: | ||
| 809 | /* | ||
| 810 | * We cannot stop HNP here, devctl BDEVICE might be | ||
| 811 | * still set. | ||
| 812 | */ | ||
| 813 | break; | ||
| 814 | #endif | ||
| 815 | case OTG_STATE_B_PERIPHERAL: | ||
| 816 | musb_g_suspend(musb); | ||
| 817 | musb->is_active = is_otg_enabled(musb) | ||
| 818 | && musb->xceiv.gadget->b_hnp_enable; | ||
| 819 | if (musb->is_active) { | ||
| 820 | #ifdef CONFIG_USB_MUSB_OTG | ||
| 821 | musb->xceiv.state = OTG_STATE_B_WAIT_ACON; | ||
| 822 | DBG(1, "HNP: Setting timer for b_ase0_brst\n"); | ||
| 823 | musb_otg_timer.data = (unsigned long)musb; | ||
| 824 | mod_timer(&musb_otg_timer, jiffies | ||
| 825 | + msecs_to_jiffies(TB_ASE0_BRST)); | ||
| 826 | #endif | ||
| 827 | } | ||
| 828 | break; | ||
| 829 | case OTG_STATE_A_WAIT_BCON: | ||
| 830 | if (musb->a_wait_bcon != 0) | ||
| 831 | musb_platform_try_idle(musb, jiffies | ||
| 832 | + msecs_to_jiffies(musb->a_wait_bcon)); | ||
| 833 | break; | ||
| 834 | case OTG_STATE_A_HOST: | ||
| 835 | musb->xceiv.state = OTG_STATE_A_SUSPEND; | ||
| 836 | musb->is_active = is_otg_enabled(musb) | ||
| 837 | && musb->xceiv.host->b_hnp_enable; | ||
| 838 | break; | ||
| 839 | case OTG_STATE_B_HOST: | ||
| 840 | /* Transition to B_PERIPHERAL, see 6.8.2.6 p 44 */ | ||
| 841 | DBG(1, "REVISIT: SUSPEND as B_HOST\n"); | ||
| 842 | break; | ||
| 843 | default: | ||
| 844 | /* "should not happen" */ | ||
| 845 | musb->is_active = 0; | ||
| 846 | break; | ||
| 847 | } | ||
| 848 | schedule_work(&musb->irq_work); | ||
| 849 | } | ||
| 850 | |||
| 851 | |||
| 852 | return handled; | ||
| 853 | } | ||
| 854 | |||
| 855 | /*-------------------------------------------------------------------------*/ | ||
| 856 | |||
| 857 | /* | ||
| 858 | * Program the HDRC to start (enable interrupts, dma, etc.). | ||
| 859 | */ | ||
| 860 | void musb_start(struct musb *musb) | ||
| 861 | { | ||
| 862 | void __iomem *regs = musb->mregs; | ||
| 863 | u8 devctl = musb_readb(regs, MUSB_DEVCTL); | ||
| 864 | |||
| 865 | DBG(2, "<== devctl %02x\n", devctl); | ||
| 866 | |||
| 867 | /* Set INT enable registers, enable interrupts */ | ||
| 868 | musb_writew(regs, MUSB_INTRTXE, musb->epmask); | ||
| 869 | musb_writew(regs, MUSB_INTRRXE, musb->epmask & 0xfffe); | ||
| 870 | musb_writeb(regs, MUSB_INTRUSBE, 0xf7); | ||
| 871 | |||
| 872 | musb_writeb(regs, MUSB_TESTMODE, 0); | ||
| 873 | |||
| 874 | /* put into basic highspeed mode and start session */ | ||
| 875 | musb_writeb(regs, MUSB_POWER, MUSB_POWER_ISOUPDATE | ||
| 876 | | MUSB_POWER_SOFTCONN | ||
| 877 | | MUSB_POWER_HSENAB | ||
| 878 | /* ENSUSPEND wedges tusb */ | ||
| 879 | /* | MUSB_POWER_ENSUSPEND */ | ||
| 880 | ); | ||
| 881 | |||
| 882 | musb->is_active = 0; | ||
| 883 | devctl = musb_readb(regs, MUSB_DEVCTL); | ||
| 884 | devctl &= ~MUSB_DEVCTL_SESSION; | ||
| 885 | |||
| 886 | if (is_otg_enabled(musb)) { | ||
| 887 | /* session started after: | ||
| 888 | * (a) ID-grounded irq, host mode; | ||
| 889 | * (b) vbus present/connect IRQ, peripheral mode; | ||
| 890 | * (c) peripheral initiates, using SRP | ||
| 891 | */ | ||
| 892 | if ((devctl & MUSB_DEVCTL_VBUS) == MUSB_DEVCTL_VBUS) | ||
| 893 | musb->is_active = 1; | ||
| 894 | else | ||
| 895 | devctl |= MUSB_DEVCTL_SESSION; | ||
| 896 | |||
| 897 | } else if (is_host_enabled(musb)) { | ||
| 898 | /* assume ID pin is hard-wired to ground */ | ||
| 899 | devctl |= MUSB_DEVCTL_SESSION; | ||
| 900 | |||
| 901 | } else /* peripheral is enabled */ { | ||
| 902 | if ((devctl & MUSB_DEVCTL_VBUS) == MUSB_DEVCTL_VBUS) | ||
| 903 | musb->is_active = 1; | ||
| 904 | } | ||
| 905 | musb_platform_enable(musb); | ||
| 906 | musb_writeb(regs, MUSB_DEVCTL, devctl); | ||
| 907 | } | ||
| 908 | |||
| 909 | |||
| 910 | static void musb_generic_disable(struct musb *musb) | ||
| 911 | { | ||
| 912 | void __iomem *mbase = musb->mregs; | ||
| 913 | u16 temp; | ||
| 914 | |||
| 915 | /* disable interrupts */ | ||
| 916 | musb_writeb(mbase, MUSB_INTRUSBE, 0); | ||
| 917 | musb_writew(mbase, MUSB_INTRTXE, 0); | ||
| 918 | musb_writew(mbase, MUSB_INTRRXE, 0); | ||
| 919 | |||
| 920 | /* off */ | ||
| 921 | musb_writeb(mbase, MUSB_DEVCTL, 0); | ||
| 922 | |||
| 923 | /* flush pending interrupts */ | ||
| 924 | temp = musb_readb(mbase, MUSB_INTRUSB); | ||
| 925 | temp = musb_readw(mbase, MUSB_INTRTX); | ||
| 926 | temp = musb_readw(mbase, MUSB_INTRRX); | ||
| 927 | |||
| 928 | } | ||
| 929 | |||
| 930 | /* | ||
| 931 | * Make the HDRC stop (disable interrupts, etc.); | ||
| 932 | * reversible by musb_start | ||
| 933 | * called on gadget driver unregister | ||
| 934 | * with controller locked, irqs blocked | ||
| 935 | * acts as a NOP unless some role activated the hardware | ||
| 936 | */ | ||
| 937 | void musb_stop(struct musb *musb) | ||
| 938 | { | ||
| 939 | /* stop IRQs, timers, ... */ | ||
| 940 | musb_platform_disable(musb); | ||
| 941 | musb_generic_disable(musb); | ||
| 942 | DBG(3, "HDRC disabled\n"); | ||
| 943 | |||
| 944 | /* FIXME | ||
| 945 | * - mark host and/or peripheral drivers unusable/inactive | ||
| 946 | * - disable DMA (and enable it in HdrcStart) | ||
| 947 | * - make sure we can musb_start() after musb_stop(); with | ||
| 948 | * OTG mode, gadget driver module rmmod/modprobe cycles that | ||
| 949 | * - ... | ||
| 950 | */ | ||
| 951 | musb_platform_try_idle(musb, 0); | ||
| 952 | } | ||
| 953 | |||
| 954 | static void musb_shutdown(struct platform_device *pdev) | ||
| 955 | { | ||
| 956 | struct musb *musb = dev_to_musb(&pdev->dev); | ||
| 957 | unsigned long flags; | ||
| 958 | |||
| 959 | spin_lock_irqsave(&musb->lock, flags); | ||
| 960 | musb_platform_disable(musb); | ||
| 961 | musb_generic_disable(musb); | ||
| 962 | if (musb->clock) { | ||
| 963 | clk_put(musb->clock); | ||
| 964 | musb->clock = NULL; | ||
| 965 | } | ||
| 966 | spin_unlock_irqrestore(&musb->lock, flags); | ||
| 967 | |||
| 968 | /* FIXME power down */ | ||
| 969 | } | ||
| 970 | |||
| 971 | |||
| 972 | /*-------------------------------------------------------------------------*/ | ||
| 973 | |||
| 974 | /* | ||
| 975 | * The silicon either has hard-wired endpoint configurations, or else | ||
| 976 | * "dynamic fifo" sizing. The driver has support for both, though at this | ||
| 977 | * writing only the dynamic sizing is very well tested. We use normal | ||
| 978 | * idioms to so both modes are compile-tested, but dead code elimination | ||
| 979 | * leaves only the relevant one in the object file. | ||
| 980 | * | ||
| 981 | * We don't currently use dynamic fifo setup capability to do anything | ||
| 982 | * more than selecting one of a bunch of predefined configurations. | ||
| 983 | */ | ||
| 984 | #if defined(CONFIG_USB_TUSB6010) || \ | ||
| 985 | defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP34XX) | ||
| 986 | static ushort __initdata fifo_mode = 4; | ||
| 987 | #else | ||
| 988 | static ushort __initdata fifo_mode = 2; | ||
| 989 | #endif | ||
| 990 | |||
| 991 | /* "modprobe ... fifo_mode=1" etc */ | ||
| 992 | module_param(fifo_mode, ushort, 0); | ||
| 993 | MODULE_PARM_DESC(fifo_mode, "initial endpoint configuration"); | ||
| 994 | |||
| 995 | |||
| 996 | enum fifo_style { FIFO_RXTX, FIFO_TX, FIFO_RX } __attribute__ ((packed)); | ||
| 997 | enum buf_mode { BUF_SINGLE, BUF_DOUBLE } __attribute__ ((packed)); | ||
| 998 | |||
| 999 | struct fifo_cfg { | ||
| 1000 | u8 hw_ep_num; | ||
| 1001 | enum fifo_style style; | ||
| 1002 | enum buf_mode mode; | ||
| 1003 | u16 maxpacket; | ||
| 1004 | }; | ||
| 1005 | |||
| 1006 | /* | ||
| 1007 | * tables defining fifo_mode values. define more if you like. | ||
| 1008 | * for host side, make sure both halves of ep1 are set up. | ||
| 1009 | */ | ||
| 1010 | |||
| 1011 | /* mode 0 - fits in 2KB */ | ||
| 1012 | static struct fifo_cfg __initdata mode_0_cfg[] = { | ||
| 1013 | { .hw_ep_num = 1, .style = FIFO_TX, .maxpacket = 512, }, | ||
| 1014 | { .hw_ep_num = 1, .style = FIFO_RX, .maxpacket = 512, }, | ||
| 1015 | { .hw_ep_num = 2, .style = FIFO_RXTX, .maxpacket = 512, }, | ||
| 1016 | { .hw_ep_num = 3, .style = FIFO_RXTX, .maxpacket = 256, }, | ||
| 1017 | { .hw_ep_num = 4, .style = FIFO_RXTX, .maxpacket = 256, }, | ||
| 1018 | }; | ||
| 1019 | |||
| 1020 | /* mode 1 - fits in 4KB */ | ||
| 1021 | static struct fifo_cfg __initdata mode_1_cfg[] = { | ||
| 1022 | { .hw_ep_num = 1, .style = FIFO_TX, .maxpacket = 512, .mode = BUF_DOUBLE, }, | ||
| 1023 | { .hw_ep_num = 1, .style = FIFO_RX, .maxpacket = 512, .mode = BUF_DOUBLE, }, | ||
| 1024 | { .hw_ep_num = 2, .style = FIFO_RXTX, .maxpacket = 512, .mode = BUF_DOUBLE, }, | ||
| 1025 | { .hw_ep_num = 3, .style = FIFO_RXTX, .maxpacket = 256, }, | ||
| 1026 | { .hw_ep_num = 4, .style = FIFO_RXTX, .maxpacket = 256, }, | ||
| 1027 | }; | ||
| 1028 | |||
| 1029 | /* mode 2 - fits in 4KB */ | ||
| 1030 | static struct fifo_cfg __initdata mode_2_cfg[] = { | ||
| 1031 | { .hw_ep_num = 1, .style = FIFO_TX, .maxpacket = 512, }, | ||
| 1032 | { .hw_ep_num = 1, .style = FIFO_RX, .maxpacket = 512, }, | ||
| 1033 | { .hw_ep_num = 2, .style = FIFO_TX, .maxpacket = 512, }, | ||
| 1034 | { .hw_ep_num = 2, .style = FIFO_RX, .maxpacket = 512, }, | ||
| 1035 | { .hw_ep_num = 3, .style = FIFO_RXTX, .maxpacket = 256, }, | ||
| 1036 | { .hw_ep_num = 4, .style = FIFO_RXTX, .maxpacket = 256, }, | ||
| 1037 | }; | ||
| 1038 | |||
| 1039 | /* mode 3 - fits in 4KB */ | ||
| 1040 | static struct fifo_cfg __initdata mode_3_cfg[] = { | ||
| 1041 | { .hw_ep_num = 1, .style = FIFO_TX, .maxpacket = 512, .mode = BUF_DOUBLE, }, | ||
| 1042 | { .hw_ep_num = 1, .style = FIFO_RX, .maxpacket = 512, .mode = BUF_DOUBLE, }, | ||
| 1043 | { .hw_ep_num = 2, .style = FIFO_TX, .maxpacket = 512, }, | ||
| 1044 | { .hw_ep_num = 2, .style = FIFO_RX, .maxpacket = 512, }, | ||
| 1045 | { .hw_ep_num = 3, .style = FIFO_RXTX, .maxpacket = 256, }, | ||
| 1046 | { .hw_ep_num = 4, .style = FIFO_RXTX, .maxpacket = 256, }, | ||
| 1047 | }; | ||
| 1048 | |||
| 1049 | /* mode 4 - fits in 16KB */ | ||
| 1050 | static struct fifo_cfg __initdata mode_4_cfg[] = { | ||
| 1051 | { .hw_ep_num = 1, .style = FIFO_TX, .maxpacket = 512, }, | ||
| 1052 | { .hw_ep_num = 1, .style = FIFO_RX, .maxpacket = 512, }, | ||
| 1053 | { .hw_ep_num = 2, .style = FIFO_TX, .maxpacket = 512, }, | ||
| 1054 | { .hw_ep_num = 2, .style = FIFO_RX, .maxpacket = 512, }, | ||
| 1055 | { .hw_ep_num = 3, .style = FIFO_TX, .maxpacket = 512, }, | ||
| 1056 | { .hw_ep_num = 3, .style = FIFO_RX, .maxpacket = 512, }, | ||
| 1057 | { .hw_ep_num = 4, .style = FIFO_TX, .maxpacket = 512, }, | ||
| 1058 | { .hw_ep_num = 4, .style = FIFO_RX, .maxpacket = 512, }, | ||
| 1059 | { .hw_ep_num = 5, .style = FIFO_TX, .maxpacket = 512, }, | ||
| 1060 | { .hw_ep_num = 5, .style = FIFO_RX, .maxpacket = 512, }, | ||
| 1061 | { .hw_ep_num = 6, .style = FIFO_TX, .maxpacket = 512, }, | ||
| 1062 | { .hw_ep_num = 6, .style = FIFO_RX, .maxpacket = 512, }, | ||
| 1063 | { .hw_ep_num = 7, .style = FIFO_TX, .maxpacket = 512, }, | ||
| 1064 | { .hw_ep_num = 7, .style = FIFO_RX, .maxpacket = 512, }, | ||
| 1065 | { .hw_ep_num = 8, .style = FIFO_TX, .maxpacket = 512, }, | ||
| 1066 | { .hw_ep_num = 8, .style = FIFO_RX, .maxpacket = 512, }, | ||
| 1067 | { .hw_ep_num = 9, .style = FIFO_TX, .maxpacket = 512, }, | ||
| 1068 | { .hw_ep_num = 9, .style = FIFO_RX, .maxpacket = 512, }, | ||
| 1069 | { .hw_ep_num = 10, .style = FIFO_TX, .maxpacket = 512, }, | ||
| 1070 | { .hw_ep_num = 10, .style = FIFO_RX, .maxpacket = 512, }, | ||
| 1071 | { .hw_ep_num = 11, .style = FIFO_TX, .maxpacket = 512, }, | ||
| 1072 | { .hw_ep_num = 11, .style = FIFO_RX, .maxpacket = 512, }, | ||
| 1073 | { .hw_ep_num = 12, .style = FIFO_TX, .maxpacket = 512, }, | ||
| 1074 | { .hw_ep_num = 12, .style = FIFO_RX, .maxpacket = 512, }, | ||
| 1075 | { .hw_ep_num = 13, .style = FIFO_TX, .maxpacket = 512, }, | ||
| 1076 | { .hw_ep_num = 13, .style = FIFO_RX, .maxpacket = 512, }, | ||
| 1077 | { .hw_ep_num = 14, .style = FIFO_RXTX, .maxpacket = 1024, }, | ||
| 1078 | { .hw_ep_num = 15, .style = FIFO_RXTX, .maxpacket = 1024, }, | ||
| 1079 | }; | ||
| 1080 | |||
| 1081 | |||
| 1082 | /* | ||
| 1083 | * configure a fifo; for non-shared endpoints, this may be called | ||
| 1084 | * once for a tx fifo and once for an rx fifo. | ||
| 1085 | * | ||
| 1086 | * returns negative errno or offset for next fifo. | ||
| 1087 | */ | ||
| 1088 | static int __init | ||
| 1089 | fifo_setup(struct musb *musb, struct musb_hw_ep *hw_ep, | ||
| 1090 | const struct fifo_cfg *cfg, u16 offset) | ||
| 1091 | { | ||
| 1092 | void __iomem *mbase = musb->mregs; | ||
| 1093 | int size = 0; | ||
| 1094 | u16 maxpacket = cfg->maxpacket; | ||
| 1095 | u16 c_off = offset >> 3; | ||
| 1096 | u8 c_size; | ||
| 1097 | |||
| 1098 | /* expect hw_ep has already been zero-initialized */ | ||
| 1099 | |||
| 1100 | size = ffs(max(maxpacket, (u16) 8)) - 1; | ||
| 1101 | maxpacket = 1 << size; | ||
| 1102 | |||
| 1103 | c_size = size - 3; | ||
| 1104 | if (cfg->mode == BUF_DOUBLE) { | ||
| 1105 | if ((offset + (maxpacket << 1)) > | ||
| 1106 | (1 << (musb->config->ram_bits + 2))) | ||
| 1107 | return -EMSGSIZE; | ||
| 1108 | c_size |= MUSB_FIFOSZ_DPB; | ||
| 1109 | } else { | ||
| 1110 | if ((offset + maxpacket) > (1 << (musb->config->ram_bits + 2))) | ||
| 1111 | return -EMSGSIZE; | ||
| 1112 | } | ||
| 1113 | |||
| 1114 | /* configure the FIFO */ | ||
| 1115 | musb_writeb(mbase, MUSB_INDEX, hw_ep->epnum); | ||
| 1116 | |||
| 1117 | #ifdef CONFIG_USB_MUSB_HDRC_HCD | ||
| 1118 | /* EP0 reserved endpoint for control, bidirectional; | ||
| 1119 | * EP1 reserved for bulk, two unidirection halves. | ||
| 1120 | */ | ||
| 1121 | if (hw_ep->epnum == 1) | ||
| 1122 | musb->bulk_ep = hw_ep; | ||
| 1123 | /* REVISIT error check: be sure ep0 can both rx and tx ... */ | ||
| 1124 | #endif | ||
| 1125 | switch (cfg->style) { | ||
| 1126 | case FIFO_TX: | ||
| 1127 | musb_writeb(mbase, MUSB_TXFIFOSZ, c_size); | ||
| 1128 | musb_writew(mbase, MUSB_TXFIFOADD, c_off); | ||
| 1129 | hw_ep->tx_double_buffered = !!(c_size & MUSB_FIFOSZ_DPB); | ||
| 1130 | hw_ep->max_packet_sz_tx = maxpacket; | ||
| 1131 | break; | ||
| 1132 | case FIFO_RX: | ||
| 1133 | musb_writeb(mbase, MUSB_RXFIFOSZ, c_size); | ||
| 1134 | musb_writew(mbase, MUSB_RXFIFOADD, c_off); | ||
| 1135 | hw_ep->rx_double_buffered = !!(c_size & MUSB_FIFOSZ_DPB); | ||
| 1136 | hw_ep->max_packet_sz_rx = maxpacket; | ||
| 1137 | break; | ||
| 1138 | case FIFO_RXTX: | ||
| 1139 | musb_writeb(mbase, MUSB_TXFIFOSZ, c_size); | ||
| 1140 | musb_writew(mbase, MUSB_TXFIFOADD, c_off); | ||
| 1141 | hw_ep->rx_double_buffered = !!(c_size & MUSB_FIFOSZ_DPB); | ||
| 1142 | hw_ep->max_packet_sz_rx = maxpacket; | ||
| 1143 | |||
| 1144 | musb_writeb(mbase, MUSB_RXFIFOSZ, c_size); | ||
| 1145 | musb_writew(mbase, MUSB_RXFIFOADD, c_off); | ||
| 1146 | hw_ep->tx_double_buffered = hw_ep->rx_double_buffered; | ||
| 1147 | hw_ep->max_packet_sz_tx = maxpacket; | ||
| 1148 | |||
| 1149 | hw_ep->is_shared_fifo = true; | ||
| 1150 | break; | ||
| 1151 | } | ||
| 1152 | |||
| 1153 | /* NOTE rx and tx endpoint irqs aren't managed separately, | ||
| 1154 | * which happens to be ok | ||
| 1155 | */ | ||
| 1156 | musb->epmask |= (1 << hw_ep->epnum); | ||
| 1157 | |||
| 1158 | return offset + (maxpacket << ((c_size & MUSB_FIFOSZ_DPB) ? 1 : 0)); | ||
| 1159 | } | ||
| 1160 | |||
| 1161 | static struct fifo_cfg __initdata ep0_cfg = { | ||
| 1162 | .style = FIFO_RXTX, .maxpacket = 64, | ||
| 1163 | }; | ||
| 1164 | |||
| 1165 | static int __init ep_config_from_table(struct musb *musb) | ||
| 1166 | { | ||
| 1167 | const struct fifo_cfg *cfg; | ||
| 1168 | unsigned i, n; | ||
| 1169 | int offset; | ||
| 1170 | struct musb_hw_ep *hw_ep = musb->endpoints; | ||
| 1171 | |||
| 1172 | switch (fifo_mode) { | ||
| 1173 | default: | ||
| 1174 | fifo_mode = 0; | ||
| 1175 | /* FALLTHROUGH */ | ||
| 1176 | case 0: | ||
| 1177 | cfg = mode_0_cfg; | ||
| 1178 | n = ARRAY_SIZE(mode_0_cfg); | ||
| 1179 | break; | ||
| 1180 | case 1: | ||
| 1181 | cfg = mode_1_cfg; | ||
| 1182 | n = ARRAY_SIZE(mode_1_cfg); | ||
| 1183 | break; | ||
| 1184 | case 2: | ||
| 1185 | cfg = mode_2_cfg; | ||
| 1186 | n = ARRAY_SIZE(mode_2_cfg); | ||
| 1187 | break; | ||
| 1188 | case 3: | ||
| 1189 | cfg = mode_3_cfg; | ||
| 1190 | n = ARRAY_SIZE(mode_3_cfg); | ||
| 1191 | break; | ||
| 1192 | case 4: | ||
| 1193 | cfg = mode_4_cfg; | ||
| 1194 | n = ARRAY_SIZE(mode_4_cfg); | ||
| 1195 | break; | ||
| 1196 | } | ||
| 1197 | |||
| 1198 | printk(KERN_DEBUG "%s: setup fifo_mode %d\n", | ||
| 1199 | musb_driver_name, fifo_mode); | ||
| 1200 | |||
| 1201 | |||
| 1202 | offset = fifo_setup(musb, hw_ep, &ep0_cfg, 0); | ||
| 1203 | /* assert(offset > 0) */ | ||
| 1204 | |||
| 1205 | /* NOTE: for RTL versions >= 1.400 EPINFO and RAMINFO would | ||
| 1206 | * be better than static musb->config->num_eps and DYN_FIFO_SIZE... | ||
| 1207 | */ | ||
| 1208 | |||
| 1209 | for (i = 0; i < n; i++) { | ||
| 1210 | u8 epn = cfg->hw_ep_num; | ||
| 1211 | |||
| 1212 | if (epn >= musb->config->num_eps) { | ||
| 1213 | pr_debug("%s: invalid ep %d\n", | ||
| 1214 | musb_driver_name, epn); | ||
| 1215 | continue; | ||
| 1216 | } | ||
| 1217 | offset = fifo_setup(musb, hw_ep + epn, cfg++, offset); | ||
| 1218 | if (offset < 0) { | ||
| 1219 | pr_debug("%s: mem overrun, ep %d\n", | ||
| 1220 | musb_driver_name, epn); | ||
| 1221 | return -EINVAL; | ||
| 1222 | } | ||
| 1223 | epn++; | ||
| 1224 | musb->nr_endpoints = max(epn, musb->nr_endpoints); | ||
| 1225 | } | ||
| 1226 | |||
| 1227 | printk(KERN_DEBUG "%s: %d/%d max ep, %d/%d memory\n", | ||
| 1228 | musb_driver_name, | ||
| 1229 | n + 1, musb->config->num_eps * 2 - 1, | ||
| 1230 | offset, (1 << (musb->config->ram_bits + 2))); | ||
| 1231 | |||
| 1232 | #ifdef CONFIG_USB_MUSB_HDRC_HCD | ||
| 1233 | if (!musb->bulk_ep) { | ||
| 1234 | pr_debug("%s: missing bulk\n", musb_driver_name); | ||
| 1235 | return -EINVAL; | ||
| 1236 | } | ||
| 1237 | #endif | ||
| 1238 | |||
| 1239 | return 0; | ||
| 1240 | } | ||
| 1241 | |||
| 1242 | |||
| 1243 | /* | ||
| 1244 | * ep_config_from_hw - when MUSB_C_DYNFIFO_DEF is false | ||
| 1245 | * @param musb the controller | ||
| 1246 | */ | ||
| 1247 | static int __init ep_config_from_hw(struct musb *musb) | ||
| 1248 | { | ||
| 1249 | u8 epnum = 0, reg; | ||
| 1250 | struct musb_hw_ep *hw_ep; | ||
| 1251 | void *mbase = musb->mregs; | ||
| 1252 | |||
| 1253 | DBG(2, "<== static silicon ep config\n"); | ||
| 1254 | |||
| 1255 | /* FIXME pick up ep0 maxpacket size */ | ||
| 1256 | |||
| 1257 | for (epnum = 1; epnum < musb->config->num_eps; epnum++) { | ||
| 1258 | musb_ep_select(mbase, epnum); | ||
| 1259 | hw_ep = musb->endpoints + epnum; | ||
| 1260 | |||
| 1261 | /* read from core using indexed model */ | ||
| 1262 | reg = musb_readb(hw_ep->regs, 0x10 + MUSB_FIFOSIZE); | ||
| 1263 | if (!reg) { | ||
| 1264 | /* 0's returned when no more endpoints */ | ||
| 1265 | break; | ||
| 1266 | } | ||
| 1267 | musb->nr_endpoints++; | ||
| 1268 | musb->epmask |= (1 << epnum); | ||
| 1269 | |||
| 1270 | hw_ep->max_packet_sz_tx = 1 << (reg & 0x0f); | ||
| 1271 | |||
| 1272 | /* shared TX/RX FIFO? */ | ||
| 1273 | if ((reg & 0xf0) == 0xf0) { | ||
| 1274 | hw_ep->max_packet_sz_rx = hw_ep->max_packet_sz_tx; | ||
| 1275 | hw_ep->is_shared_fifo = true; | ||
| 1276 | continue; | ||
| 1277 | } else { | ||
| 1278 | hw_ep->max_packet_sz_rx = 1 << ((reg & 0xf0) >> 4); | ||
| 1279 | hw_ep->is_shared_fifo = false; | ||
| 1280 | } | ||
| 1281 | |||
| 1282 | /* FIXME set up hw_ep->{rx,tx}_double_buffered */ | ||
| 1283 | |||
| 1284 | #ifdef CONFIG_USB_MUSB_HDRC_HCD | ||
| 1285 | /* pick an RX/TX endpoint for bulk */ | ||
| 1286 | if (hw_ep->max_packet_sz_tx < 512 | ||
| 1287 | || hw_ep->max_packet_sz_rx < 512) | ||
| 1288 | continue; | ||
| 1289 | |||
| 1290 | /* REVISIT: this algorithm is lazy, we should at least | ||
| 1291 | * try to pick a double buffered endpoint. | ||
| 1292 | */ | ||
| 1293 | if (musb->bulk_ep) | ||
| 1294 | continue; | ||
| 1295 | musb->bulk_ep = hw_ep; | ||
| 1296 | #endif | ||
| 1297 | } | ||
| 1298 | |||
| 1299 | #ifdef CONFIG_USB_MUSB_HDRC_HCD | ||
| 1300 | if (!musb->bulk_ep) { | ||
| 1301 | pr_debug("%s: missing bulk\n", musb_driver_name); | ||
| 1302 | return -EINVAL; | ||
| 1303 | } | ||
| 1304 | #endif | ||
| 1305 | |||
| 1306 | return 0; | ||
| 1307 | } | ||
| 1308 | |||
| 1309 | enum { MUSB_CONTROLLER_MHDRC, MUSB_CONTROLLER_HDRC, }; | ||
| 1310 | |||
| 1311 | /* Initialize MUSB (M)HDRC part of the USB hardware subsystem; | ||
| 1312 | * configure endpoints, or take their config from silicon | ||
| 1313 | */ | ||
| 1314 | static int __init musb_core_init(u16 musb_type, struct musb *musb) | ||
| 1315 | { | ||
| 1316 | #ifdef MUSB_AHB_ID | ||
| 1317 | u32 data; | ||
| 1318 | #endif | ||
| 1319 | u8 reg; | ||
| 1320 | char *type; | ||
| 1321 | u16 hwvers, rev_major, rev_minor; | ||
| 1322 | char aInfo[78], aRevision[32], aDate[12]; | ||
| 1323 | void __iomem *mbase = musb->mregs; | ||
| 1324 | int status = 0; | ||
| 1325 | int i; | ||
| 1326 | |||
| 1327 | /* log core options (read using indexed model) */ | ||
| 1328 | musb_ep_select(mbase, 0); | ||
| 1329 | reg = musb_readb(mbase, 0x10 + MUSB_CONFIGDATA); | ||
| 1330 | |||
| 1331 | strcpy(aInfo, (reg & MUSB_CONFIGDATA_UTMIDW) ? "UTMI-16" : "UTMI-8"); | ||
| 1332 | if (reg & MUSB_CONFIGDATA_DYNFIFO) | ||
| 1333 | strcat(aInfo, ", dyn FIFOs"); | ||
| 1334 | if (reg & MUSB_CONFIGDATA_MPRXE) { | ||
| 1335 | strcat(aInfo, ", bulk combine"); | ||
| 1336 | #ifdef C_MP_RX | ||
| 1337 | musb->bulk_combine = true; | ||
| 1338 | #else | ||
| 1339 | strcat(aInfo, " (X)"); /* no driver support */ | ||
| 1340 | #endif | ||
| 1341 | } | ||
| 1342 | if (reg & MUSB_CONFIGDATA_MPTXE) { | ||
| 1343 | strcat(aInfo, ", bulk split"); | ||
| 1344 | #ifdef C_MP_TX | ||
| 1345 | musb->bulk_split = true; | ||
| 1346 | #else | ||
| 1347 | strcat(aInfo, " (X)"); /* no driver support */ | ||
| 1348 | #endif | ||
| 1349 | } | ||
| 1350 | if (reg & MUSB_CONFIGDATA_HBRXE) { | ||
| 1351 | strcat(aInfo, ", HB-ISO Rx"); | ||
| 1352 | strcat(aInfo, " (X)"); /* no driver support */ | ||
| 1353 | } | ||
| 1354 | if (reg & MUSB_CONFIGDATA_HBTXE) { | ||
| 1355 | strcat(aInfo, ", HB-ISO Tx"); | ||
| 1356 | strcat(aInfo, " (X)"); /* no driver support */ | ||
| 1357 | } | ||
| 1358 | if (reg & MUSB_CONFIGDATA_SOFTCONE) | ||
| 1359 | strcat(aInfo, ", SoftConn"); | ||
| 1360 | |||
| 1361 | printk(KERN_DEBUG "%s: ConfigData=0x%02x (%s)\n", | ||
| 1362 | musb_driver_name, reg, aInfo); | ||
| 1363 | |||
| 1364 | #ifdef MUSB_AHB_ID | ||
| 1365 | data = musb_readl(mbase, 0x404); | ||
| 1366 | sprintf(aDate, "%04d-%02x-%02x", (data & 0xffff), | ||
| 1367 | (data >> 16) & 0xff, (data >> 24) & 0xff); | ||
| 1368 | /* FIXME ID2 and ID3 are unused */ | ||
| 1369 | data = musb_readl(mbase, 0x408); | ||
| 1370 | printk(KERN_DEBUG "ID2=%lx\n", (long unsigned)data); | ||
| 1371 | data = musb_readl(mbase, 0x40c); | ||
| 1372 | printk(KERN_DEBUG "ID3=%lx\n", (long unsigned)data); | ||
| 1373 | reg = musb_readb(mbase, 0x400); | ||
| 1374 | musb_type = ('M' == reg) ? MUSB_CONTROLLER_MHDRC : MUSB_CONTROLLER_HDRC; | ||
| 1375 | #else | ||
| 1376 | aDate[0] = 0; | ||
| 1377 | #endif | ||
| 1378 | if (MUSB_CONTROLLER_MHDRC == musb_type) { | ||
| 1379 | musb->is_multipoint = 1; | ||
| 1380 | type = "M"; | ||
| 1381 | } else { | ||
| 1382 | musb->is_multipoint = 0; | ||
| 1383 | type = ""; | ||
| 1384 | #ifdef CONFIG_USB_MUSB_HDRC_HCD | ||
| 1385 | #ifndef CONFIG_USB_OTG_BLACKLIST_HUB | ||
| 1386 | printk(KERN_ERR | ||
| 1387 | "%s: kernel must blacklist external hubs\n", | ||
| 1388 | musb_driver_name); | ||
| 1389 | #endif | ||
| 1390 | #endif | ||
| 1391 | } | ||
| 1392 | |||
| 1393 | /* log release info */ | ||
| 1394 | hwvers = musb_readw(mbase, MUSB_HWVERS); | ||
| 1395 | rev_major = (hwvers >> 10) & 0x1f; | ||
| 1396 | rev_minor = hwvers & 0x3ff; | ||
| 1397 | snprintf(aRevision, 32, "%d.%d%s", rev_major, | ||
| 1398 | rev_minor, (hwvers & 0x8000) ? "RC" : ""); | ||
| 1399 | printk(KERN_DEBUG "%s: %sHDRC RTL version %s %s\n", | ||
| 1400 | musb_driver_name, type, aRevision, aDate); | ||
| 1401 | |||
| 1402 | /* configure ep0 */ | ||
| 1403 | musb->endpoints[0].max_packet_sz_tx = MUSB_EP0_FIFOSIZE; | ||
| 1404 | musb->endpoints[0].max_packet_sz_rx = MUSB_EP0_FIFOSIZE; | ||
| 1405 | |||
| 1406 | /* discover endpoint configuration */ | ||
| 1407 | musb->nr_endpoints = 1; | ||
| 1408 | musb->epmask = 1; | ||
| 1409 | |||
| 1410 | if (reg & MUSB_CONFIGDATA_DYNFIFO) { | ||
| 1411 | if (musb->config->dyn_fifo) | ||
| 1412 | status = ep_config_from_table(musb); | ||
| 1413 | else { | ||
| 1414 | ERR("reconfigure software for Dynamic FIFOs\n"); | ||
| 1415 | status = -ENODEV; | ||
| 1416 | } | ||
| 1417 | } else { | ||
| 1418 | if (!musb->config->dyn_fifo) | ||
| 1419 | status = ep_config_from_hw(musb); | ||
| 1420 | else { | ||
| 1421 | ERR("reconfigure software for static FIFOs\n"); | ||
| 1422 | return -ENODEV; | ||
| 1423 | } | ||
| 1424 | } | ||
| 1425 | |||
| 1426 | if (status < 0) | ||
| 1427 | return status; | ||
| 1428 | |||
| 1429 | /* finish init, and print endpoint config */ | ||
| 1430 | for (i = 0; i < musb->nr_endpoints; i++) { | ||
| 1431 | struct musb_hw_ep *hw_ep = musb->endpoints + i; | ||
| 1432 | |||
| 1433 | hw_ep->fifo = MUSB_FIFO_OFFSET(i) + mbase; | ||
| 1434 | #ifdef CONFIG_USB_TUSB6010 | ||
| 1435 | hw_ep->fifo_async = musb->async + 0x400 + MUSB_FIFO_OFFSET(i); | ||
| 1436 | hw_ep->fifo_sync = musb->sync + 0x400 + MUSB_FIFO_OFFSET(i); | ||
| 1437 | hw_ep->fifo_sync_va = | ||
| 1438 | musb->sync_va + 0x400 + MUSB_FIFO_OFFSET(i); | ||
| 1439 | |||
| 1440 | if (i == 0) | ||
| 1441 | hw_ep->conf = mbase - 0x400 + TUSB_EP0_CONF; | ||
| 1442 | else | ||
| 1443 | hw_ep->conf = mbase + 0x400 + (((i - 1) & 0xf) << 2); | ||
| 1444 | #endif | ||
| 1445 | |||
| 1446 | hw_ep->regs = MUSB_EP_OFFSET(i, 0) + mbase; | ||
| 1447 | #ifdef CONFIG_USB_MUSB_HDRC_HCD | ||
| 1448 | hw_ep->target_regs = MUSB_BUSCTL_OFFSET(i, 0) + mbase; | ||
| 1449 | hw_ep->rx_reinit = 1; | ||
| 1450 | hw_ep->tx_reinit = 1; | ||
| 1451 | #endif | ||
| 1452 | |||
| 1453 | if (hw_ep->max_packet_sz_tx) { | ||
| 1454 | printk(KERN_DEBUG | ||
| 1455 | "%s: hw_ep %d%s, %smax %d\n", | ||
| 1456 | musb_driver_name, i, | ||
| 1457 | hw_ep->is_shared_fifo ? "shared" : "tx", | ||
| 1458 | hw_ep->tx_double_buffered | ||
| 1459 | ? "doublebuffer, " : "", | ||
| 1460 | hw_ep->max_packet_sz_tx); | ||
| 1461 | } | ||
| 1462 | if (hw_ep->max_packet_sz_rx && !hw_ep->is_shared_fifo) { | ||
| 1463 | printk(KERN_DEBUG | ||
| 1464 | "%s: hw_ep %d%s, %smax %d\n", | ||
| 1465 | musb_driver_name, i, | ||
| 1466 | "rx", | ||
| 1467 | hw_ep->rx_double_buffered | ||
| 1468 | ? "doublebuffer, " : "", | ||
| 1469 | hw_ep->max_packet_sz_rx); | ||
| 1470 | } | ||
| 1471 | if (!(hw_ep->max_packet_sz_tx || hw_ep->max_packet_sz_rx)) | ||
| 1472 | DBG(1, "hw_ep %d not configured\n", i); | ||
| 1473 | } | ||
| 1474 | |||
| 1475 | return 0; | ||
| 1476 | } | ||
| 1477 | |||
| 1478 | /*-------------------------------------------------------------------------*/ | ||
| 1479 | |||
| 1480 | #if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3430) | ||
| 1481 | |||
| 1482 | static irqreturn_t generic_interrupt(int irq, void *__hci) | ||
| 1483 | { | ||
| 1484 | unsigned long flags; | ||
| 1485 | irqreturn_t retval = IRQ_NONE; | ||
| 1486 | struct musb *musb = __hci; | ||
| 1487 | |||
| 1488 | spin_lock_irqsave(&musb->lock, flags); | ||
| 1489 | |||
| 1490 | musb->int_usb = musb_readb(musb->mregs, MUSB_INTRUSB); | ||
| 1491 | musb->int_tx = musb_readw(musb->mregs, MUSB_INTRTX); | ||
| 1492 | musb->int_rx = musb_readw(musb->mregs, MUSB_INTRRX); | ||
| 1493 | |||
| 1494 | if (musb->int_usb || musb->int_tx || musb->int_rx) | ||
| 1495 | retval = musb_interrupt(musb); | ||
| 1496 | |||
| 1497 | spin_unlock_irqrestore(&musb->lock, flags); | ||
| 1498 | |||
| 1499 | /* REVISIT we sometimes get spurious IRQs on g_ep0 | ||
| 1500 | * not clear why... | ||
| 1501 | */ | ||
| 1502 | if (retval != IRQ_HANDLED) | ||
| 1503 | DBG(5, "spurious?\n"); | ||
| 1504 | |||
| 1505 | return IRQ_HANDLED; | ||
| 1506 | } | ||
| 1507 | |||
| 1508 | #else | ||
| 1509 | #define generic_interrupt NULL | ||
| 1510 | #endif | ||
| 1511 | |||
| 1512 | /* | ||
| 1513 | * handle all the irqs defined by the HDRC core. for now we expect: other | ||
| 1514 | * irq sources (phy, dma, etc) will be handled first, musb->int_* values | ||
| 1515 | * will be assigned, and the irq will already have been acked. | ||
| 1516 | * | ||
| 1517 | * called in irq context with spinlock held, irqs blocked | ||
| 1518 | */ | ||
| 1519 | irqreturn_t musb_interrupt(struct musb *musb) | ||
| 1520 | { | ||
| 1521 | irqreturn_t retval = IRQ_NONE; | ||
| 1522 | u8 devctl, power; | ||
| 1523 | int ep_num; | ||
| 1524 | u32 reg; | ||
| 1525 | |||
| 1526 | devctl = musb_readb(musb->mregs, MUSB_DEVCTL); | ||
| 1527 | power = musb_readb(musb->mregs, MUSB_POWER); | ||
| 1528 | |||
| 1529 | DBG(4, "** IRQ %s usb%04x tx%04x rx%04x\n", | ||
| 1530 | (devctl & MUSB_DEVCTL_HM) ? "host" : "peripheral", | ||
| 1531 | musb->int_usb, musb->int_tx, musb->int_rx); | ||
| 1532 | |||
| 1533 | /* the core can interrupt us for multiple reasons; docs have | ||
| 1534 | * a generic interrupt flowchart to follow | ||
| 1535 | */ | ||
| 1536 | if (musb->int_usb & STAGE0_MASK) | ||
| 1537 | retval |= musb_stage0_irq(musb, musb->int_usb, | ||
| 1538 | devctl, power); | ||
| 1539 | |||
| 1540 | /* "stage 1" is handling endpoint irqs */ | ||
| 1541 | |||
| 1542 | /* handle endpoint 0 first */ | ||
| 1543 | if (musb->int_tx & 1) { | ||
| 1544 | if (devctl & MUSB_DEVCTL_HM) | ||
| 1545 | retval |= musb_h_ep0_irq(musb); | ||
| 1546 | else | ||
| 1547 | retval |= musb_g_ep0_irq(musb); | ||
| 1548 | } | ||
| 1549 | |||
| 1550 | /* RX on endpoints 1-15 */ | ||
| 1551 | reg = musb->int_rx >> 1; | ||
| 1552 | ep_num = 1; | ||
| 1553 | while (reg) { | ||
| 1554 | if (reg & 1) { | ||
| 1555 | /* musb_ep_select(musb->mregs, ep_num); */ | ||
| 1556 | /* REVISIT just retval = ep->rx_irq(...) */ | ||
| 1557 | retval = IRQ_HANDLED; | ||
| 1558 | if (devctl & MUSB_DEVCTL_HM) { | ||
| 1559 | if (is_host_capable()) | ||
| 1560 | musb_host_rx(musb, ep_num); | ||
| 1561 | } else { | ||
| 1562 | if (is_peripheral_capable()) | ||
| 1563 | musb_g_rx(musb, ep_num); | ||
| 1564 | } | ||
| 1565 | } | ||
| 1566 | |||
| 1567 | reg >>= 1; | ||
| 1568 | ep_num++; | ||
| 1569 | } | ||
| 1570 | |||
| 1571 | /* TX on endpoints 1-15 */ | ||
| 1572 | reg = musb->int_tx >> 1; | ||
| 1573 | ep_num = 1; | ||
| 1574 | while (reg) { | ||
| 1575 | if (reg & 1) { | ||
| 1576 | /* musb_ep_select(musb->mregs, ep_num); */ | ||
| 1577 | /* REVISIT just retval |= ep->tx_irq(...) */ | ||
| 1578 | retval = IRQ_HANDLED; | ||
| 1579 | if (devctl & MUSB_DEVCTL_HM) { | ||
| 1580 | if (is_host_capable()) | ||
| 1581 | musb_host_tx(musb, ep_num); | ||
| 1582 | } else { | ||
| 1583 | if (is_peripheral_capable()) | ||
| 1584 | musb_g_tx(musb, ep_num); | ||
| 1585 | } | ||
| 1586 | } | ||
| 1587 | reg >>= 1; | ||
| 1588 | ep_num++; | ||
| 1589 | } | ||
| 1590 | |||
| 1591 | /* finish handling "global" interrupts after handling fifos */ | ||
| 1592 | if (musb->int_usb) | ||
| 1593 | retval |= musb_stage2_irq(musb, | ||
| 1594 | musb->int_usb, devctl, power); | ||
| 1595 | |||
| 1596 | return retval; | ||
| 1597 | } | ||
| 1598 | |||
| 1599 | |||
| 1600 | #ifndef CONFIG_MUSB_PIO_ONLY | ||
| 1601 | static int __initdata use_dma = 1; | ||
| 1602 | |||
| 1603 | /* "modprobe ... use_dma=0" etc */ | ||
| 1604 | module_param(use_dma, bool, 0); | ||
| 1605 | MODULE_PARM_DESC(use_dma, "enable/disable use of DMA"); | ||
| 1606 | |||
| 1607 | void musb_dma_completion(struct musb *musb, u8 epnum, u8 transmit) | ||
| 1608 | { | ||
| 1609 | u8 devctl = musb_readb(musb->mregs, MUSB_DEVCTL); | ||
| 1610 | |||
| 1611 | /* called with controller lock already held */ | ||
| 1612 | |||
| 1613 | if (!epnum) { | ||
| 1614 | #ifndef CONFIG_USB_TUSB_OMAP_DMA | ||
| 1615 | if (!is_cppi_enabled()) { | ||
| 1616 | /* endpoint 0 */ | ||
| 1617 | if (devctl & MUSB_DEVCTL_HM) | ||
| 1618 | musb_h_ep0_irq(musb); | ||
| 1619 | else | ||
| 1620 | musb_g_ep0_irq(musb); | ||
| 1621 | } | ||
| 1622 | #endif | ||
| 1623 | } else { | ||
| 1624 | /* endpoints 1..15 */ | ||
| 1625 | if (transmit) { | ||
| 1626 | if (devctl & MUSB_DEVCTL_HM) { | ||
| 1627 | if (is_host_capable()) | ||
| 1628 | musb_host_tx(musb, epnum); | ||
| 1629 | } else { | ||
| 1630 | if (is_peripheral_capable()) | ||
| 1631 | musb_g_tx(musb, epnum); | ||
| 1632 | } | ||
| 1633 | } else { | ||
| 1634 | /* receive */ | ||
| 1635 | if (devctl & MUSB_DEVCTL_HM) { | ||
| 1636 | if (is_host_capable()) | ||
| 1637 | musb_host_rx(musb, epnum); | ||
| 1638 | } else { | ||
| 1639 | if (is_peripheral_capable()) | ||
| 1640 | musb_g_rx(musb, epnum); | ||
| 1641 | } | ||
| 1642 | } | ||
| 1643 | } | ||
| 1644 | } | ||
| 1645 | |||
| 1646 | #else | ||
| 1647 | #define use_dma 0 | ||
| 1648 | #endif | ||
| 1649 | |||
| 1650 | /*-------------------------------------------------------------------------*/ | ||
| 1651 | |||
| 1652 | #ifdef CONFIG_SYSFS | ||
| 1653 | |||
| 1654 | static ssize_t | ||
| 1655 | musb_mode_show(struct device *dev, struct device_attribute *attr, char *buf) | ||
| 1656 | { | ||
| 1657 | struct musb *musb = dev_to_musb(dev); | ||
| 1658 | unsigned long flags; | ||
| 1659 | int ret = -EINVAL; | ||
| 1660 | |||
| 1661 | spin_lock_irqsave(&musb->lock, flags); | ||
| 1662 | ret = sprintf(buf, "%s\n", otg_state_string(musb)); | ||
| 1663 | spin_unlock_irqrestore(&musb->lock, flags); | ||
| 1664 | |||
| 1665 | return ret; | ||
| 1666 | } | ||
| 1667 | |||
| 1668 | static ssize_t | ||
| 1669 | musb_mode_store(struct device *dev, struct device_attribute *attr, | ||
| 1670 | const char *buf, size_t n) | ||
| 1671 | { | ||
| 1672 | struct musb *musb = dev_to_musb(dev); | ||
| 1673 | unsigned long flags; | ||
| 1674 | |||
| 1675 | spin_lock_irqsave(&musb->lock, flags); | ||
| 1676 | if (!strncmp(buf, "host", 4)) | ||
| 1677 | musb_platform_set_mode(musb, MUSB_HOST); | ||
| 1678 | if (!strncmp(buf, "peripheral", 10)) | ||
| 1679 | musb_platform_set_mode(musb, MUSB_PERIPHERAL); | ||
| 1680 | if (!strncmp(buf, "otg", 3)) | ||
| 1681 | musb_platform_set_mode(musb, MUSB_OTG); | ||
| 1682 | spin_unlock_irqrestore(&musb->lock, flags); | ||
| 1683 | |||
| 1684 | return n; | ||
| 1685 | } | ||
| 1686 | static DEVICE_ATTR(mode, 0644, musb_mode_show, musb_mode_store); | ||
| 1687 | |||
| 1688 | static ssize_t | ||
| 1689 | musb_vbus_store(struct device *dev, struct device_attribute *attr, | ||
| 1690 | const char *buf, size_t n) | ||
| 1691 | { | ||
| 1692 | struct musb *musb = dev_to_musb(dev); | ||
| 1693 | unsigned long flags; | ||
| 1694 | unsigned long val; | ||
| 1695 | |||
| 1696 | if (sscanf(buf, "%lu", &val) < 1) { | ||
| 1697 | printk(KERN_ERR "Invalid VBUS timeout ms value\n"); | ||
| 1698 | return -EINVAL; | ||
| 1699 | } | ||
| 1700 | |||
| 1701 | spin_lock_irqsave(&musb->lock, flags); | ||
| 1702 | musb->a_wait_bcon = val; | ||
| 1703 | if (musb->xceiv.state == OTG_STATE_A_WAIT_BCON) | ||
| 1704 | musb->is_active = 0; | ||
| 1705 | musb_platform_try_idle(musb, jiffies + msecs_to_jiffies(val)); | ||
| 1706 | spin_unlock_irqrestore(&musb->lock, flags); | ||
| 1707 | |||
| 1708 | return n; | ||
| 1709 | } | ||
| 1710 | |||
| 1711 | static ssize_t | ||
| 1712 | musb_vbus_show(struct device *dev, struct device_attribute *attr, char *buf) | ||
| 1713 | { | ||
| 1714 | struct musb *musb = dev_to_musb(dev); | ||
| 1715 | unsigned long flags; | ||
| 1716 | unsigned long val; | ||
| 1717 | int vbus; | ||
| 1718 | |||
| 1719 | spin_lock_irqsave(&musb->lock, flags); | ||
| 1720 | val = musb->a_wait_bcon; | ||
| 1721 | vbus = musb_platform_get_vbus_status(musb); | ||
| 1722 | spin_unlock_irqrestore(&musb->lock, flags); | ||
| 1723 | |||
| 1724 | return sprintf(buf, "Vbus %s, timeout %lu\n", | ||
| 1725 | vbus ? "on" : "off", val); | ||
| 1726 | } | ||
| 1727 | static DEVICE_ATTR(vbus, 0644, musb_vbus_show, musb_vbus_store); | ||
| 1728 | |||
| 1729 | #ifdef CONFIG_USB_GADGET_MUSB_HDRC | ||
| 1730 | |||
| 1731 | /* Gadget drivers can't know that a host is connected so they might want | ||
| 1732 | * to start SRP, but users can. This allows userspace to trigger SRP. | ||
| 1733 | */ | ||
| 1734 | static ssize_t | ||
| 1735 | musb_srp_store(struct device *dev, struct device_attribute *attr, | ||
| 1736 | const char *buf, size_t n) | ||
| 1737 | { | ||
| 1738 | struct musb *musb = dev_to_musb(dev); | ||
| 1739 | unsigned short srp; | ||
| 1740 | |||
| 1741 | if (sscanf(buf, "%hu", &srp) != 1 | ||
| 1742 | || (srp != 1)) { | ||
| 1743 | printk(KERN_ERR "SRP: Value must be 1\n"); | ||
| 1744 | return -EINVAL; | ||
| 1745 | } | ||
| 1746 | |||
| 1747 | if (srp == 1) | ||
| 1748 | musb_g_wakeup(musb); | ||
| 1749 | |||
| 1750 | return n; | ||
| 1751 | } | ||
| 1752 | static DEVICE_ATTR(srp, 0644, NULL, musb_srp_store); | ||
| 1753 | |||
| 1754 | #endif /* CONFIG_USB_GADGET_MUSB_HDRC */ | ||
| 1755 | |||
| 1756 | #endif /* sysfs */ | ||
| 1757 | |||
| 1758 | /* Only used to provide driver mode change events */ | ||
| 1759 | static void musb_irq_work(struct work_struct *data) | ||
| 1760 | { | ||
| 1761 | struct musb *musb = container_of(data, struct musb, irq_work); | ||
| 1762 | static int old_state; | ||
| 1763 | |||
| 1764 | if (musb->xceiv.state != old_state) { | ||
| 1765 | old_state = musb->xceiv.state; | ||
| 1766 | sysfs_notify(&musb->controller->kobj, NULL, "mode"); | ||
| 1767 | } | ||
| 1768 | } | ||
| 1769 | |||
| 1770 | /* -------------------------------------------------------------------------- | ||
| 1771 | * Init support | ||
| 1772 | */ | ||
| 1773 | |||
| 1774 | static struct musb *__init | ||
| 1775 | allocate_instance(struct device *dev, | ||
| 1776 | struct musb_hdrc_config *config, void __iomem *mbase) | ||
| 1777 | { | ||
| 1778 | struct musb *musb; | ||
| 1779 | struct musb_hw_ep *ep; | ||
| 1780 | int epnum; | ||
| 1781 | #ifdef CONFIG_USB_MUSB_HDRC_HCD | ||
| 1782 | struct usb_hcd *hcd; | ||
| 1783 | |||
| 1784 | hcd = usb_create_hcd(&musb_hc_driver, dev, dev->bus_id); | ||
| 1785 | if (!hcd) | ||
| 1786 | return NULL; | ||
| 1787 | /* usbcore sets dev->driver_data to hcd, and sometimes uses that... */ | ||
| 1788 | |||
| 1789 | musb = hcd_to_musb(hcd); | ||
| 1790 | INIT_LIST_HEAD(&musb->control); | ||
| 1791 | INIT_LIST_HEAD(&musb->in_bulk); | ||
| 1792 | INIT_LIST_HEAD(&musb->out_bulk); | ||
| 1793 | |||
| 1794 | hcd->uses_new_polling = 1; | ||
| 1795 | |||
| 1796 | musb->vbuserr_retry = VBUSERR_RETRY_COUNT; | ||
| 1797 | #else | ||
| 1798 | musb = kzalloc(sizeof *musb, GFP_KERNEL); | ||
| 1799 | if (!musb) | ||
| 1800 | return NULL; | ||
| 1801 | dev_set_drvdata(dev, musb); | ||
| 1802 | |||
| 1803 | #endif | ||
| 1804 | |||
| 1805 | musb->mregs = mbase; | ||
| 1806 | musb->ctrl_base = mbase; | ||
| 1807 | musb->nIrq = -ENODEV; | ||
| 1808 | musb->config = config; | ||
| 1809 | for (epnum = 0, ep = musb->endpoints; | ||
| 1810 | epnum < musb->config->num_eps; | ||
| 1811 | epnum++, ep++) { | ||
| 1812 | |||
| 1813 | ep->musb = musb; | ||
| 1814 | ep->epnum = epnum; | ||
| 1815 | } | ||
| 1816 | |||
| 1817 | musb->controller = dev; | ||
| 1818 | return musb; | ||
| 1819 | } | ||
| 1820 | |||
| 1821 | static void musb_free(struct musb *musb) | ||
| 1822 | { | ||
| 1823 | /* this has multiple entry modes. it handles fault cleanup after | ||
| 1824 | * probe(), where things may be partially set up, as well as rmmod | ||
| 1825 | * cleanup after everything's been de-activated. | ||
| 1826 | */ | ||
| 1827 | |||
| 1828 | #ifdef CONFIG_SYSFS | ||
| 1829 | device_remove_file(musb->controller, &dev_attr_mode); | ||
| 1830 | device_remove_file(musb->controller, &dev_attr_vbus); | ||
| 1831 | #ifdef CONFIG_USB_MUSB_OTG | ||
| 1832 | device_remove_file(musb->controller, &dev_attr_srp); | ||
| 1833 | #endif | ||
| 1834 | #endif | ||
| 1835 | |||
| 1836 | #ifdef CONFIG_USB_GADGET_MUSB_HDRC | ||
| 1837 | musb_gadget_cleanup(musb); | ||
| 1838 | #endif | ||
| 1839 | |||
| 1840 | if (musb->nIrq >= 0) { | ||
| 1841 | disable_irq_wake(musb->nIrq); | ||
| 1842 | free_irq(musb->nIrq, musb); | ||
| 1843 | } | ||
| 1844 | if (is_dma_capable() && musb->dma_controller) { | ||
| 1845 | struct dma_controller *c = musb->dma_controller; | ||
| 1846 | |||
| 1847 | (void) c->stop(c); | ||
| 1848 | dma_controller_destroy(c); | ||
| 1849 | } | ||
| 1850 | |||
| 1851 | musb_writeb(musb->mregs, MUSB_DEVCTL, 0); | ||
| 1852 | musb_platform_exit(musb); | ||
| 1853 | musb_writeb(musb->mregs, MUSB_DEVCTL, 0); | ||
| 1854 | |||
| 1855 | if (musb->clock) { | ||
| 1856 | clk_disable(musb->clock); | ||
| 1857 | clk_put(musb->clock); | ||
| 1858 | } | ||
| 1859 | |||
| 1860 | #ifdef CONFIG_USB_MUSB_OTG | ||
| 1861 | put_device(musb->xceiv.dev); | ||
| 1862 | #endif | ||
| 1863 | |||
| 1864 | #ifdef CONFIG_USB_MUSB_HDRC_HCD | ||
| 1865 | usb_put_hcd(musb_to_hcd(musb)); | ||
| 1866 | #else | ||
| 1867 | kfree(musb); | ||
| 1868 | #endif | ||
| 1869 | } | ||
| 1870 | |||
| 1871 | /* | ||
| 1872 | * Perform generic per-controller initialization. | ||
| 1873 | * | ||
| 1874 | * @pDevice: the controller (already clocked, etc) | ||
| 1875 | * @nIrq: irq | ||
| 1876 | * @mregs: virtual address of controller registers, | ||
| 1877 | * not yet corrected for platform-specific offsets | ||
| 1878 | */ | ||
| 1879 | static int __init | ||
| 1880 | musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl) | ||
| 1881 | { | ||
| 1882 | int status; | ||
| 1883 | struct musb *musb; | ||
| 1884 | struct musb_hdrc_platform_data *plat = dev->platform_data; | ||
| 1885 | |||
| 1886 | /* The driver might handle more features than the board; OK. | ||
| 1887 | * Fail when the board needs a feature that's not enabled. | ||
| 1888 | */ | ||
| 1889 | if (!plat) { | ||
| 1890 | dev_dbg(dev, "no platform_data?\n"); | ||
| 1891 | return -ENODEV; | ||
| 1892 | } | ||
| 1893 | switch (plat->mode) { | ||
| 1894 | case MUSB_HOST: | ||
| 1895 | #ifdef CONFIG_USB_MUSB_HDRC_HCD | ||
| 1896 | break; | ||
| 1897 | #else | ||
| 1898 | goto bad_config; | ||
| 1899 | #endif | ||
| 1900 | case MUSB_PERIPHERAL: | ||
| 1901 | #ifdef CONFIG_USB_GADGET_MUSB_HDRC | ||
| 1902 | break; | ||
| 1903 | #else | ||
| 1904 | goto bad_config; | ||
| 1905 | #endif | ||
| 1906 | case MUSB_OTG: | ||
| 1907 | #ifdef CONFIG_USB_MUSB_OTG | ||
| 1908 | break; | ||
| 1909 | #else | ||
| 1910 | bad_config: | ||
| 1911 | #endif | ||
| 1912 | default: | ||
| 1913 | dev_err(dev, "incompatible Kconfig role setting\n"); | ||
| 1914 | return -EINVAL; | ||
| 1915 | } | ||
| 1916 | |||
| 1917 | /* allocate */ | ||
| 1918 | musb = allocate_instance(dev, plat->config, ctrl); | ||
| 1919 | if (!musb) | ||
| 1920 | return -ENOMEM; | ||
| 1921 | |||
| 1922 | spin_lock_init(&musb->lock); | ||
| 1923 | musb->board_mode = plat->mode; | ||
| 1924 | musb->board_set_power = plat->set_power; | ||
| 1925 | musb->set_clock = plat->set_clock; | ||
| 1926 | musb->min_power = plat->min_power; | ||
| 1927 | |||
| 1928 | /* Clock usage is chip-specific ... functional clock (DaVinci, | ||
| 1929 | * OMAP2430), or PHY ref (some TUSB6010 boards). All this core | ||
| 1930 | * code does is make sure a clock handle is available; platform | ||
| 1931 | * code manages it during start/stop and suspend/resume. | ||
| 1932 | */ | ||
| 1933 | if (plat->clock) { | ||
| 1934 | musb->clock = clk_get(dev, plat->clock); | ||
| 1935 | if (IS_ERR(musb->clock)) { | ||
| 1936 | status = PTR_ERR(musb->clock); | ||
| 1937 | musb->clock = NULL; | ||
| 1938 | goto fail; | ||
| 1939 | } | ||
| 1940 | } | ||
| 1941 | |||
| 1942 | /* assume vbus is off */ | ||
| 1943 | |||
| 1944 | /* platform adjusts musb->mregs and musb->isr if needed, | ||
| 1945 | * and activates clocks | ||
| 1946 | */ | ||
| 1947 | musb->isr = generic_interrupt; | ||
| 1948 | status = musb_platform_init(musb); | ||
| 1949 | |||
| 1950 | if (status < 0) | ||
| 1951 | goto fail; | ||
| 1952 | if (!musb->isr) { | ||
| 1953 | status = -ENODEV; | ||
| 1954 | goto fail2; | ||
| 1955 | } | ||
| 1956 | |||
| 1957 | #ifndef CONFIG_MUSB_PIO_ONLY | ||
| 1958 | if (use_dma && dev->dma_mask) { | ||
| 1959 | struct dma_controller *c; | ||
| 1960 | |||
| 1961 | c = dma_controller_create(musb, musb->mregs); | ||
| 1962 | musb->dma_controller = c; | ||
| 1963 | if (c) | ||
| 1964 | (void) c->start(c); | ||
| 1965 | } | ||
| 1966 | #endif | ||
| 1967 | /* ideally this would be abstracted in platform setup */ | ||
| 1968 | if (!is_dma_capable() || !musb->dma_controller) | ||
| 1969 | dev->dma_mask = NULL; | ||
| 1970 | |||
| 1971 | /* be sure interrupts are disabled before connecting ISR */ | ||
| 1972 | musb_platform_disable(musb); | ||
| 1973 | musb_generic_disable(musb); | ||
| 1974 | |||
| 1975 | /* setup musb parts of the core (especially endpoints) */ | ||
| 1976 | status = musb_core_init(plat->config->multipoint | ||
| 1977 | ? MUSB_CONTROLLER_MHDRC | ||
| 1978 | : MUSB_CONTROLLER_HDRC, musb); | ||
| 1979 | if (status < 0) | ||
| 1980 | goto fail2; | ||
| 1981 | |||
| 1982 | /* Init IRQ workqueue before request_irq */ | ||
| 1983 | INIT_WORK(&musb->irq_work, musb_irq_work); | ||
| 1984 | |||
| 1985 | /* attach to the IRQ */ | ||
| 1986 | if (request_irq(nIrq, musb->isr, 0, dev->bus_id, musb)) { | ||
| 1987 | dev_err(dev, "request_irq %d failed!\n", nIrq); | ||
| 1988 | status = -ENODEV; | ||
| 1989 | goto fail2; | ||
| 1990 | } | ||
| 1991 | musb->nIrq = nIrq; | ||
| 1992 | /* FIXME this handles wakeup irqs wrong */ | ||
| 1993 | if (enable_irq_wake(nIrq) == 0) | ||
| 1994 | device_init_wakeup(dev, 1); | ||
| 1995 | |||
| 1996 | pr_info("%s: USB %s mode controller at %p using %s, IRQ %d\n", | ||
| 1997 | musb_driver_name, | ||
| 1998 | ({char *s; | ||
| 1999 | switch (musb->board_mode) { | ||
| 2000 | case MUSB_HOST: s = "Host"; break; | ||
| 2001 | case MUSB_PERIPHERAL: s = "Peripheral"; break; | ||
| 2002 | default: s = "OTG"; break; | ||
| 2003 | }; s; }), | ||
| 2004 | ctrl, | ||
| 2005 | (is_dma_capable() && musb->dma_controller) | ||
| 2006 | ? "DMA" : "PIO", | ||
| 2007 | musb->nIrq); | ||
| 2008 | |||
| 2009 | #ifdef CONFIG_USB_MUSB_HDRC_HCD | ||
| 2010 | /* host side needs more setup, except for no-host modes */ | ||
| 2011 | if (musb->board_mode != MUSB_PERIPHERAL) { | ||
| 2012 | struct usb_hcd *hcd = musb_to_hcd(musb); | ||
| 2013 | |||
| 2014 | if (musb->board_mode == MUSB_OTG) | ||
| 2015 | hcd->self.otg_port = 1; | ||
| 2016 | musb->xceiv.host = &hcd->self; | ||
| 2017 | hcd->power_budget = 2 * (plat->power ? : 250); | ||
| 2018 | } | ||
| 2019 | #endif /* CONFIG_USB_MUSB_HDRC_HCD */ | ||
| 2020 | |||
| 2021 | /* For the host-only role, we can activate right away. | ||
| 2022 | * (We expect the ID pin to be forcibly grounded!!) | ||
| 2023 | * Otherwise, wait till the gadget driver hooks up. | ||
| 2024 | */ | ||
| 2025 | if (!is_otg_enabled(musb) && is_host_enabled(musb)) { | ||
| 2026 | MUSB_HST_MODE(musb); | ||
| 2027 | musb->xceiv.default_a = 1; | ||
| 2028 | musb->xceiv.state = OTG_STATE_A_IDLE; | ||
| 2029 | |||
| 2030 | status = usb_add_hcd(musb_to_hcd(musb), -1, 0); | ||
| 2031 | if (status) | ||
| 2032 | goto fail; | ||
| 2033 | |||
| 2034 | DBG(1, "%s mode, status %d, devctl %02x %c\n", | ||
| 2035 | "HOST", status, | ||
| 2036 | musb_readb(musb->mregs, MUSB_DEVCTL), | ||
| 2037 | (musb_readb(musb->mregs, MUSB_DEVCTL) | ||
| 2038 | & MUSB_DEVCTL_BDEVICE | ||
| 2039 | ? 'B' : 'A')); | ||
| 2040 | |||
| 2041 | } else /* peripheral is enabled */ { | ||
| 2042 | MUSB_DEV_MODE(musb); | ||
| 2043 | musb->xceiv.default_a = 0; | ||
| 2044 | musb->xceiv.state = OTG_STATE_B_IDLE; | ||
| 2045 | |||
| 2046 | status = musb_gadget_setup(musb); | ||
| 2047 | if (status) | ||
| 2048 | goto fail; | ||
| 2049 | |||
| 2050 | DBG(1, "%s mode, status %d, dev%02x\n", | ||
| 2051 | is_otg_enabled(musb) ? "OTG" : "PERIPHERAL", | ||
| 2052 | status, | ||
| 2053 | musb_readb(musb->mregs, MUSB_DEVCTL)); | ||
| 2054 | |||
| 2055 | } | ||
| 2056 | |||
| 2057 | return 0; | ||
| 2058 | |||
| 2059 | fail: | ||
| 2060 | if (musb->clock) | ||
| 2061 | clk_put(musb->clock); | ||
| 2062 | device_init_wakeup(dev, 0); | ||
| 2063 | musb_free(musb); | ||
| 2064 | return status; | ||
| 2065 | |||
| 2066 | #ifdef CONFIG_SYSFS | ||
| 2067 | status = device_create_file(dev, &dev_attr_mode); | ||
| 2068 | status = device_create_file(dev, &dev_attr_vbus); | ||
| 2069 | #ifdef CONFIG_USB_GADGET_MUSB_HDRC | ||
| 2070 | status = device_create_file(dev, &dev_attr_srp); | ||
| 2071 | #endif /* CONFIG_USB_GADGET_MUSB_HDRC */ | ||
| 2072 | status = 0; | ||
| 2073 | #endif | ||
| 2074 | |||
| 2075 | return status; | ||
| 2076 | |||
| 2077 | fail2: | ||
| 2078 | musb_platform_exit(musb); | ||
| 2079 | goto fail; | ||
| 2080 | } | ||
| 2081 | |||
| 2082 | /*-------------------------------------------------------------------------*/ | ||
| 2083 | |||
| 2084 | /* all implementations (PCI bridge to FPGA, VLYNQ, etc) should just | ||
| 2085 | * bridge to a platform device; this driver then suffices. | ||
| 2086 | */ | ||
| 2087 | |||
| 2088 | #ifndef CONFIG_MUSB_PIO_ONLY | ||
| 2089 | static u64 *orig_dma_mask; | ||
| 2090 | #endif | ||
| 2091 | |||
| 2092 | static int __init musb_probe(struct platform_device *pdev) | ||
| 2093 | { | ||
| 2094 | struct device *dev = &pdev->dev; | ||
| 2095 | int irq = platform_get_irq(pdev, 0); | ||
| 2096 | struct resource *iomem; | ||
| 2097 | void __iomem *base; | ||
| 2098 | |||
| 2099 | iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0); | ||
| 2100 | if (!iomem || irq == 0) | ||
| 2101 | return -ENODEV; | ||
| 2102 | |||
| 2103 | base = ioremap(iomem->start, iomem->end - iomem->start + 1); | ||
| 2104 | if (!base) { | ||
| 2105 | dev_err(dev, "ioremap failed\n"); | ||
| 2106 | return -ENOMEM; | ||
| 2107 | } | ||
| 2108 | |||
| 2109 | #ifndef CONFIG_MUSB_PIO_ONLY | ||
| 2110 | /* clobbered by use_dma=n */ | ||
| 2111 | orig_dma_mask = dev->dma_mask; | ||
| 2112 | #endif | ||
| 2113 | return musb_init_controller(dev, irq, base); | ||
| 2114 | } | ||
| 2115 | |||
| 2116 | static int __devexit musb_remove(struct platform_device *pdev) | ||
| 2117 | { | ||
| 2118 | struct musb *musb = dev_to_musb(&pdev->dev); | ||
| 2119 | void __iomem *ctrl_base = musb->ctrl_base; | ||
| 2120 | |||
| 2121 | /* this gets called on rmmod. | ||
| 2122 | * - Host mode: host may still be active | ||
| 2123 | * - Peripheral mode: peripheral is deactivated (or never-activated) | ||
| 2124 | * - OTG mode: both roles are deactivated (or never-activated) | ||
| 2125 | */ | ||
| 2126 | musb_shutdown(pdev); | ||
| 2127 | #ifdef CONFIG_USB_MUSB_HDRC_HCD | ||
| 2128 | if (musb->board_mode == MUSB_HOST) | ||
| 2129 | usb_remove_hcd(musb_to_hcd(musb)); | ||
| 2130 | #endif | ||
| 2131 | musb_free(musb); | ||
| 2132 | iounmap(ctrl_base); | ||
| 2133 | device_init_wakeup(&pdev->dev, 0); | ||
| 2134 | #ifndef CONFIG_MUSB_PIO_ONLY | ||
| 2135 | pdev->dev.dma_mask = orig_dma_mask; | ||
| 2136 | #endif | ||
| 2137 | return 0; | ||
| 2138 | } | ||
| 2139 | |||
| 2140 | #ifdef CONFIG_PM | ||
| 2141 | |||
| 2142 | static int musb_suspend(struct platform_device *pdev, pm_message_t message) | ||
| 2143 | { | ||
| 2144 | unsigned long flags; | ||
| 2145 | struct musb *musb = dev_to_musb(&pdev->dev); | ||
| 2146 | |||
| 2147 | if (!musb->clock) | ||
| 2148 | return 0; | ||
| 2149 | |||
| 2150 | spin_lock_irqsave(&musb->lock, flags); | ||
| 2151 | |||
| 2152 | if (is_peripheral_active(musb)) { | ||
| 2153 | /* FIXME force disconnect unless we know USB will wake | ||
| 2154 | * the system up quickly enough to respond ... | ||
| 2155 | */ | ||
| 2156 | } else if (is_host_active(musb)) { | ||
| 2157 | /* we know all the children are suspended; sometimes | ||
| 2158 | * they will even be wakeup-enabled. | ||
| 2159 | */ | ||
| 2160 | } | ||
| 2161 | |||
| 2162 | if (musb->set_clock) | ||
| 2163 | musb->set_clock(musb->clock, 0); | ||
| 2164 | else | ||
| 2165 | clk_disable(musb->clock); | ||
| 2166 | spin_unlock_irqrestore(&musb->lock, flags); | ||
| 2167 | return 0; | ||
| 2168 | } | ||
| 2169 | |||
| 2170 | static int musb_resume(struct platform_device *pdev) | ||
| 2171 | { | ||
| 2172 | unsigned long flags; | ||
| 2173 | struct musb *musb = dev_to_musb(&pdev->dev); | ||
| 2174 | |||
| 2175 | if (!musb->clock) | ||
| 2176 | return 0; | ||
| 2177 | |||
| 2178 | spin_lock_irqsave(&musb->lock, flags); | ||
| 2179 | |||
| 2180 | if (musb->set_clock) | ||
| 2181 | musb->set_clock(musb->clock, 1); | ||
| 2182 | else | ||
| 2183 | clk_enable(musb->clock); | ||
| 2184 | |||
| 2185 | /* for static cmos like DaVinci, register values were preserved | ||
| 2186 | * unless for some reason the whole soc powered down and we're | ||
| 2187 | * not treating that as a whole-system restart (e.g. swsusp) | ||
| 2188 | */ | ||
| 2189 | spin_unlock_irqrestore(&musb->lock, flags); | ||
| 2190 | return 0; | ||
| 2191 | } | ||
| 2192 | |||
| 2193 | #else | ||
| 2194 | #define musb_suspend NULL | ||
| 2195 | #define musb_resume NULL | ||
| 2196 | #endif | ||
| 2197 | |||
| 2198 | static struct platform_driver musb_driver = { | ||
| 2199 | .driver = { | ||
| 2200 | .name = (char *)musb_driver_name, | ||
| 2201 | .bus = &platform_bus_type, | ||
| 2202 | .owner = THIS_MODULE, | ||
| 2203 | }, | ||
| 2204 | .remove = __devexit_p(musb_remove), | ||
| 2205 | .shutdown = musb_shutdown, | ||
| 2206 | .suspend = musb_suspend, | ||
| 2207 | .resume = musb_resume, | ||
| 2208 | }; | ||
| 2209 | |||
| 2210 | /*-------------------------------------------------------------------------*/ | ||
| 2211 | |||
| 2212 | static int __init musb_init(void) | ||
| 2213 | { | ||
| 2214 | #ifdef CONFIG_USB_MUSB_HDRC_HCD | ||
| 2215 | if (usb_disabled()) | ||
| 2216 | return 0; | ||
| 2217 | #endif | ||
| 2218 | |||
| 2219 | pr_info("%s: version " MUSB_VERSION ", " | ||
| 2220 | #ifdef CONFIG_MUSB_PIO_ONLY | ||
| 2221 | "pio" | ||
| 2222 | #elif defined(CONFIG_USB_TI_CPPI_DMA) | ||
| 2223 | "cppi-dma" | ||
| 2224 | #elif defined(CONFIG_USB_INVENTRA_DMA) | ||
| 2225 | "musb-dma" | ||
| 2226 | #elif defined(CONFIG_USB_TUSB_OMAP_DMA) | ||
| 2227 | "tusb-omap-dma" | ||
| 2228 | #else | ||
| 2229 | "?dma?" | ||
| 2230 | #endif | ||
| 2231 | ", " | ||
| 2232 | #ifdef CONFIG_USB_MUSB_OTG | ||
| 2233 | "otg (peripheral+host)" | ||
| 2234 | #elif defined(CONFIG_USB_GADGET_MUSB_HDRC) | ||
| 2235 | "peripheral" | ||
| 2236 | #elif defined(CONFIG_USB_MUSB_HDRC_HCD) | ||
| 2237 | "host" | ||
| 2238 | #endif | ||
| 2239 | ", debug=%d\n", | ||
| 2240 | musb_driver_name, debug); | ||
| 2241 | return platform_driver_probe(&musb_driver, musb_probe); | ||
| 2242 | } | ||
| 2243 | |||
| 2244 | /* make us init after usbcore and before usb | ||
| 2245 | * gadget and host-side drivers start to register | ||
| 2246 | */ | ||
| 2247 | subsys_initcall(musb_init); | ||
| 2248 | |||
| 2249 | static void __exit musb_cleanup(void) | ||
| 2250 | { | ||
| 2251 | platform_driver_unregister(&musb_driver); | ||
| 2252 | } | ||
| 2253 | module_exit(musb_cleanup); | ||
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h new file mode 100644 index 000000000000..82227251931b --- /dev/null +++ b/drivers/usb/musb/musb_core.h | |||
| @@ -0,0 +1,488 @@ | |||
| 1 | /* | ||
| 2 | * MUSB OTG driver defines | ||
| 3 | * | ||
| 4 | * Copyright 2005 Mentor Graphics Corporation | ||
| 5 | * Copyright (C) 2005-2006 by Texas Instruments | ||
| 6 | * Copyright (C) 2006-2007 Nokia Corporation | ||
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or | ||
| 9 | * modify it under the terms of the GNU General Public License | ||
| 10 | * version 2 as published by the Free Software Foundation. | ||
| 11 | * | ||
| 12 | * This program is distributed in the hope that it will be useful, but | ||
| 13 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| 15 | * General Public License for more details. | ||
| 16 | * | ||
| 17 | * You should have received a copy of the GNU General Public License | ||
| 18 | * along with this program; if not, write to the Free Software | ||
| 19 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA | ||
| 20 | * 02110-1301 USA | ||
| 21 | * | ||
| 22 | * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED | ||
| 23 | * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF | ||
| 24 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN | ||
| 25 | * NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
| 26 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
| 27 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF | ||
| 28 | * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON | ||
| 29 | * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| 30 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
| 31 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| 32 | * | ||
| 33 | */ | ||
| 34 | |||
| 35 | #ifndef __MUSB_CORE_H__ | ||
| 36 | #define __MUSB_CORE_H__ | ||
| 37 | |||
| 38 | #include <linux/slab.h> | ||
| 39 | #include <linux/list.h> | ||
| 40 | #include <linux/interrupt.h> | ||
| 41 | #include <linux/smp_lock.h> | ||
| 42 | #include <linux/errno.h> | ||
| 43 | #include <linux/clk.h> | ||
| 44 | #include <linux/device.h> | ||
| 45 | #include <linux/usb/ch9.h> | ||
| 46 | #include <linux/usb/gadget.h> | ||
| 47 | #include <linux/usb.h> | ||
| 48 | #include <linux/usb/otg.h> | ||
| 49 | #include <linux/usb/musb.h> | ||
| 50 | |||
| 51 | struct musb; | ||
| 52 | struct musb_hw_ep; | ||
| 53 | struct musb_ep; | ||
| 54 | |||
| 55 | |||
| 56 | #include "musb_debug.h" | ||
| 57 | #include "musb_dma.h" | ||
| 58 | |||
| 59 | #include "musb_io.h" | ||
| 60 | #include "musb_regs.h" | ||
| 61 | |||
| 62 | #include "musb_gadget.h" | ||
| 63 | #include "../core/hcd.h" | ||
| 64 | #include "musb_host.h" | ||
| 65 | |||
| 66 | |||
| 67 | |||
| 68 | #ifdef CONFIG_USB_MUSB_OTG | ||
| 69 | |||
| 70 | #define is_peripheral_enabled(musb) ((musb)->board_mode != MUSB_HOST) | ||
| 71 | #define is_host_enabled(musb) ((musb)->board_mode != MUSB_PERIPHERAL) | ||
| 72 | #define is_otg_enabled(musb) ((musb)->board_mode == MUSB_OTG) | ||
| 73 | |||
| 74 | /* NOTE: otg and peripheral-only state machines start at B_IDLE. | ||
| 75 | * OTG or host-only go to A_IDLE when ID is sensed. | ||
| 76 | */ | ||
| 77 | #define is_peripheral_active(m) (!(m)->is_host) | ||
| 78 | #define is_host_active(m) ((m)->is_host) | ||
| 79 | |||
| 80 | #else | ||
| 81 | #define is_peripheral_enabled(musb) is_peripheral_capable() | ||
| 82 | #define is_host_enabled(musb) is_host_capable() | ||
| 83 | #define is_otg_enabled(musb) 0 | ||
| 84 | |||
| 85 | #define is_peripheral_active(musb) is_peripheral_capable() | ||
| 86 | #define is_host_active(musb) is_host_capable() | ||
| 87 | #endif | ||
| 88 | |||
| 89 | #if defined(CONFIG_USB_MUSB_OTG) || defined(CONFIG_USB_MUSB_PERIPHERAL) | ||
| 90 | /* for some reason, the "select USB_GADGET_MUSB_HDRC" doesn't always | ||
| 91 | * override that choice selection (often USB_GADGET_DUMMY_HCD). | ||
| 92 | */ | ||
| 93 | #ifndef CONFIG_USB_GADGET_MUSB_HDRC | ||
| 94 | #error bogus Kconfig output ... select CONFIG_USB_GADGET_MUSB_HDRC | ||
| 95 | #endif | ||
| 96 | #endif /* need MUSB gadget selection */ | ||
| 97 | |||
| 98 | |||
| 99 | #ifdef CONFIG_PROC_FS | ||
| 100 | #include <linux/fs.h> | ||
| 101 | #define MUSB_CONFIG_PROC_FS | ||
| 102 | #endif | ||
| 103 | |||
| 104 | /****************************** PERIPHERAL ROLE *****************************/ | ||
| 105 | |||
| 106 | #ifdef CONFIG_USB_GADGET_MUSB_HDRC | ||
| 107 | |||
| 108 | #define is_peripheral_capable() (1) | ||
| 109 | |||
| 110 | extern irqreturn_t musb_g_ep0_irq(struct musb *); | ||
| 111 | extern void musb_g_tx(struct musb *, u8); | ||
| 112 | extern void musb_g_rx(struct musb *, u8); | ||
| 113 | extern void musb_g_reset(struct musb *); | ||
| 114 | extern void musb_g_suspend(struct musb *); | ||
| 115 | extern void musb_g_resume(struct musb *); | ||
| 116 | extern void musb_g_wakeup(struct musb *); | ||
| 117 | extern void musb_g_disconnect(struct musb *); | ||
| 118 | |||
| 119 | #else | ||
| 120 | |||
| 121 | #define is_peripheral_capable() (0) | ||
| 122 | |||
| 123 | static inline irqreturn_t musb_g_ep0_irq(struct musb *m) { return IRQ_NONE; } | ||
| 124 | static inline void musb_g_reset(struct musb *m) {} | ||
| 125 | static inline void musb_g_suspend(struct musb *m) {} | ||
| 126 | static inline void musb_g_resume(struct musb *m) {} | ||
| 127 | static inline void musb_g_wakeup(struct musb *m) {} | ||
| 128 | static inline void musb_g_disconnect(struct musb *m) {} | ||
| 129 | |||
| 130 | #endif | ||
| 131 | |||
| 132 | /****************************** HOST ROLE ***********************************/ | ||
| 133 | |||
| 134 | #ifdef CONFIG_USB_MUSB_HDRC_HCD | ||
| 135 | |||
| 136 | #define is_host_capable() (1) | ||
| 137 | |||
| 138 | extern irqreturn_t musb_h_ep0_irq(struct musb *); | ||
| 139 | extern void musb_host_tx(struct musb *, u8); | ||
| 140 | extern void musb_host_rx(struct musb *, u8); | ||
| 141 | |||
| 142 | #else | ||
| 143 | |||
| 144 | #define is_host_capable() (0) | ||
| 145 | |||
| 146 | static inline irqreturn_t musb_h_ep0_irq(struct musb *m) { return IRQ_NONE; } | ||
| 147 | static inline void musb_host_tx(struct musb *m, u8 e) {} | ||
| 148 | static inline void musb_host_rx(struct musb *m, u8 e) {} | ||
| 149 | |||
| 150 | #endif | ||
| 151 | |||
| 152 | |||
| 153 | /****************************** CONSTANTS ********************************/ | ||
| 154 | |||
| 155 | #ifndef MUSB_C_NUM_EPS | ||
| 156 | #define MUSB_C_NUM_EPS ((u8)16) | ||
| 157 | #endif | ||
| 158 | |||
| 159 | #ifndef MUSB_MAX_END0_PACKET | ||
| 160 | #define MUSB_MAX_END0_PACKET ((u16)MUSB_EP0_FIFOSIZE) | ||
| 161 | #endif | ||
| 162 | |||
| 163 | /* host side ep0 states */ | ||
| 164 | enum musb_h_ep0_state { | ||
| 165 | MUSB_EP0_IDLE, | ||
| 166 | MUSB_EP0_START, /* expect ack of setup */ | ||
| 167 | MUSB_EP0_IN, /* expect IN DATA */ | ||
| 168 | MUSB_EP0_OUT, /* expect ack of OUT DATA */ | ||
| 169 | MUSB_EP0_STATUS, /* expect ack of STATUS */ | ||
| 170 | } __attribute__ ((packed)); | ||
| 171 | |||
| 172 | /* peripheral side ep0 states */ | ||
| 173 | enum musb_g_ep0_state { | ||
| 174 | MUSB_EP0_STAGE_SETUP, /* idle, waiting for setup */ | ||
| 175 | MUSB_EP0_STAGE_TX, /* IN data */ | ||
| 176 | MUSB_EP0_STAGE_RX, /* OUT data */ | ||
| 177 | MUSB_EP0_STAGE_STATUSIN, /* (after OUT data) */ | ||
| 178 | MUSB_EP0_STAGE_STATUSOUT, /* (after IN data) */ | ||
| 179 | MUSB_EP0_STAGE_ACKWAIT, /* after zlp, before statusin */ | ||
| 180 | } __attribute__ ((packed)); | ||
| 181 | |||
| 182 | /* OTG protocol constants */ | ||
| 183 | #define OTG_TIME_A_WAIT_VRISE 100 /* msec (max) */ | ||
| 184 | #define OTG_TIME_A_WAIT_BCON 0 /* 0=infinite; min 1000 msec */ | ||
| 185 | #define OTG_TIME_A_IDLE_BDIS 200 /* msec (min) */ | ||
| 186 | |||
| 187 | /*************************** REGISTER ACCESS ********************************/ | ||
| 188 | |||
| 189 | /* Endpoint registers (other than dynfifo setup) can be accessed either | ||
| 190 | * directly with the "flat" model, or after setting up an index register. | ||
| 191 | */ | ||
| 192 | |||
| 193 | #if defined(CONFIG_ARCH_DAVINCI) || defined(CONFIG_ARCH_OMAP2430) \ | ||
| 194 | || defined(CONFIG_ARCH_OMAP3430) | ||
| 195 | /* REVISIT indexed access seemed to | ||
| 196 | * misbehave (on DaVinci) for at least peripheral IN ... | ||
| 197 | */ | ||
| 198 | #define MUSB_FLAT_REG | ||
| 199 | #endif | ||
| 200 | |||
| 201 | /* TUSB mapping: "flat" plus ep0 special cases */ | ||
| 202 | #if defined(CONFIG_USB_TUSB6010) | ||
| 203 | #define musb_ep_select(_mbase, _epnum) \ | ||
| 204 | musb_writeb((_mbase), MUSB_INDEX, (_epnum)) | ||
| 205 | #define MUSB_EP_OFFSET MUSB_TUSB_OFFSET | ||
| 206 | |||
| 207 | /* "flat" mapping: each endpoint has its own i/o address */ | ||
| 208 | #elif defined(MUSB_FLAT_REG) | ||
| 209 | #define musb_ep_select(_mbase, _epnum) (((void)(_mbase)), ((void)(_epnum))) | ||
| 210 | #define MUSB_EP_OFFSET MUSB_FLAT_OFFSET | ||
| 211 | |||
| 212 | /* "indexed" mapping: INDEX register controls register bank select */ | ||
| 213 | #else | ||
| 214 | #define musb_ep_select(_mbase, _epnum) \ | ||
| 215 | musb_writeb((_mbase), MUSB_INDEX, (_epnum)) | ||
| 216 | #define MUSB_EP_OFFSET MUSB_INDEXED_OFFSET | ||
| 217 | #endif | ||
| 218 | |||
| 219 | /****************************** FUNCTIONS ********************************/ | ||
| 220 | |||
| 221 | #define MUSB_HST_MODE(_musb)\ | ||
| 222 | { (_musb)->is_host = true; } | ||
| 223 | #define MUSB_DEV_MODE(_musb) \ | ||
| 224 | { (_musb)->is_host = false; } | ||
| 225 | |||
| 226 | #define test_devctl_hst_mode(_x) \ | ||
| 227 | (musb_readb((_x)->mregs, MUSB_DEVCTL)&MUSB_DEVCTL_HM) | ||
| 228 | |||
| 229 | #define MUSB_MODE(musb) ((musb)->is_host ? "Host" : "Peripheral") | ||
| 230 | |||
| 231 | /******************************** TYPES *************************************/ | ||
| 232 | |||
| 233 | /* | ||
| 234 | * struct musb_hw_ep - endpoint hardware (bidirectional) | ||
| 235 | * | ||
| 236 | * Ordered slightly for better cacheline locality. | ||
| 237 | */ | ||
| 238 | struct musb_hw_ep { | ||
| 239 | struct musb *musb; | ||
| 240 | void __iomem *fifo; | ||
| 241 | void __iomem *regs; | ||
| 242 | |||
| 243 | #ifdef CONFIG_USB_TUSB6010 | ||
| 244 | void __iomem *conf; | ||
| 245 | #endif | ||
| 246 | |||
| 247 | /* index in musb->endpoints[] */ | ||
| 248 | u8 epnum; | ||
| 249 | |||
| 250 | /* hardware configuration, possibly dynamic */ | ||
| 251 | bool is_shared_fifo; | ||
| 252 | bool tx_double_buffered; | ||
| 253 | bool rx_double_buffered; | ||
| 254 | u16 max_packet_sz_tx; | ||
| 255 | u16 max_packet_sz_rx; | ||
| 256 | |||
| 257 | struct dma_channel *tx_channel; | ||
| 258 | struct dma_channel *rx_channel; | ||
| 259 | |||
| 260 | #ifdef CONFIG_USB_TUSB6010 | ||
| 261 | /* TUSB has "asynchronous" and "synchronous" dma modes */ | ||
| 262 | dma_addr_t fifo_async; | ||
| 263 | dma_addr_t fifo_sync; | ||
| 264 | void __iomem *fifo_sync_va; | ||
| 265 | #endif | ||
| 266 | |||
| 267 | #ifdef CONFIG_USB_MUSB_HDRC_HCD | ||
| 268 | void __iomem *target_regs; | ||
| 269 | |||
| 270 | /* currently scheduled peripheral endpoint */ | ||
| 271 | struct musb_qh *in_qh; | ||
| 272 | struct musb_qh *out_qh; | ||
| 273 | |||
| 274 | u8 rx_reinit; | ||
| 275 | u8 tx_reinit; | ||
| 276 | #endif | ||
| 277 | |||
| 278 | #ifdef CONFIG_USB_GADGET_MUSB_HDRC | ||
| 279 | /* peripheral side */ | ||
| 280 | struct musb_ep ep_in; /* TX */ | ||
| 281 | struct musb_ep ep_out; /* RX */ | ||
| 282 | #endif | ||
| 283 | }; | ||
| 284 | |||
| 285 | static inline struct usb_request *next_in_request(struct musb_hw_ep *hw_ep) | ||
| 286 | { | ||
| 287 | #ifdef CONFIG_USB_GADGET_MUSB_HDRC | ||
| 288 | return next_request(&hw_ep->ep_in); | ||
| 289 | #else | ||
| 290 | return NULL; | ||
| 291 | #endif | ||
| 292 | } | ||
| 293 | |||
| 294 | static inline struct usb_request *next_out_request(struct musb_hw_ep *hw_ep) | ||
| 295 | { | ||
| 296 | #ifdef CONFIG_USB_GADGET_MUSB_HDRC | ||
| 297 | return next_request(&hw_ep->ep_out); | ||
| 298 | #else | ||
| 299 | return NULL; | ||
| 300 | #endif | ||
| 301 | } | ||
| 302 | |||
| 303 | /* | ||
| 304 | * struct musb - Driver instance data. | ||
| 305 | */ | ||
| 306 | struct musb { | ||
| 307 | /* device lock */ | ||
| 308 | spinlock_t lock; | ||
| 309 | struct clk *clock; | ||
| 310 | irqreturn_t (*isr)(int, void *); | ||
| 311 | struct work_struct irq_work; | ||
| 312 | |||
| 313 | /* this hub status bit is reserved by USB 2.0 and not seen by usbcore */ | ||
| 314 | #define MUSB_PORT_STAT_RESUME (1 << 31) | ||
| 315 | |||
| 316 | u32 port1_status; | ||
| 317 | |||
| 318 | #ifdef CONFIG_USB_MUSB_HDRC_HCD | ||
| 319 | unsigned long rh_timer; | ||
| 320 | |||
| 321 | enum musb_h_ep0_state ep0_stage; | ||
| 322 | |||
| 323 | /* bulk traffic normally dedicates endpoint hardware, and each | ||
| 324 | * direction has its own ring of host side endpoints. | ||
| 325 | * we try to progress the transfer at the head of each endpoint's | ||
| 326 | * queue until it completes or NAKs too much; then we try the next | ||
| 327 | * endpoint. | ||
| 328 | */ | ||
| 329 | struct musb_hw_ep *bulk_ep; | ||
| 330 | |||
| 331 | struct list_head control; /* of musb_qh */ | ||
| 332 | struct list_head in_bulk; /* of musb_qh */ | ||
| 333 | struct list_head out_bulk; /* of musb_qh */ | ||
| 334 | struct musb_qh *periodic[32]; /* tree of interrupt+iso */ | ||
| 335 | #endif | ||
| 336 | |||
| 337 | /* called with IRQs blocked; ON/nonzero implies starting a session, | ||
| 338 | * and waiting at least a_wait_vrise_tmout. | ||
| 339 | */ | ||
| 340 | void (*board_set_vbus)(struct musb *, int is_on); | ||
| 341 | |||
| 342 | struct dma_controller *dma_controller; | ||
| 343 | |||
| 344 | struct device *controller; | ||
| 345 | void __iomem *ctrl_base; | ||
| 346 | void __iomem *mregs; | ||
| 347 | |||
| 348 | #ifdef CONFIG_USB_TUSB6010 | ||
| 349 | dma_addr_t async; | ||
| 350 | dma_addr_t sync; | ||
| 351 | void __iomem *sync_va; | ||
| 352 | #endif | ||
| 353 | |||
| 354 | /* passed down from chip/board specific irq handlers */ | ||
| 355 | u8 int_usb; | ||
| 356 | u16 int_rx; | ||
| 357 | u16 int_tx; | ||
| 358 | |||
| 359 | struct otg_transceiver xceiv; | ||
| 360 | |||
| 361 | int nIrq; | ||
| 362 | |||
| 363 | struct musb_hw_ep endpoints[MUSB_C_NUM_EPS]; | ||
| 364 | #define control_ep endpoints | ||
| 365 | |||
| 366 | #define VBUSERR_RETRY_COUNT 3 | ||
| 367 | u16 vbuserr_retry; | ||
| 368 | u16 epmask; | ||
| 369 | u8 nr_endpoints; | ||
| 370 | |||
| 371 | u8 board_mode; /* enum musb_mode */ | ||
| 372 | int (*board_set_power)(int state); | ||
| 373 | |||
| 374 | int (*set_clock)(struct clk *clk, int is_active); | ||
| 375 | |||
| 376 | u8 min_power; /* vbus for periph, in mA/2 */ | ||
| 377 | |||
| 378 | bool is_host; | ||
| 379 | |||
| 380 | int a_wait_bcon; /* VBUS timeout in msecs */ | ||
| 381 | unsigned long idle_timeout; /* Next timeout in jiffies */ | ||
| 382 | |||
| 383 | /* active means connected and not suspended */ | ||
| 384 | unsigned is_active:1; | ||
| 385 | |||
| 386 | unsigned is_multipoint:1; | ||
| 387 | unsigned ignore_disconnect:1; /* during bus resets */ | ||
| 388 | |||
| 389 | #ifdef C_MP_TX | ||
| 390 | unsigned bulk_split:1; | ||
| 391 | #define can_bulk_split(musb,type) \ | ||
| 392 | (((type) == USB_ENDPOINT_XFER_BULK) && (musb)->bulk_split) | ||
| 393 | #else | ||
| 394 | #define can_bulk_split(musb, type) 0 | ||
| 395 | #endif | ||
| 396 | |||
| 397 | #ifdef C_MP_RX | ||
| 398 | unsigned bulk_combine:1; | ||
| 399 | #define can_bulk_combine(musb,type) \ | ||
| 400 | (((type) == USB_ENDPOINT_XFER_BULK) && (musb)->bulk_combine) | ||
| 401 | #else | ||
| 402 | #define can_bulk_combine(musb, type) 0 | ||
| 403 | #endif | ||
| 404 | |||
| 405 | #ifdef CONFIG_USB_GADGET_MUSB_HDRC | ||
| 406 | /* is_suspended means USB B_PERIPHERAL suspend */ | ||
| 407 | unsigned is_suspended:1; | ||
| 408 | |||
| 409 | /* may_wakeup means remote wakeup is enabled */ | ||
| 410 | unsigned may_wakeup:1; | ||
| 411 | |||
| 412 | /* is_self_powered is reported in device status and the | ||
| 413 | * config descriptor. is_bus_powered means B_PERIPHERAL | ||
| 414 | * draws some VBUS current; both can be true. | ||
| 415 | */ | ||
| 416 | unsigned is_self_powered:1; | ||
| 417 | unsigned is_bus_powered:1; | ||
| 418 | |||
| 419 | unsigned set_address:1; | ||
| 420 | unsigned test_mode:1; | ||
| 421 | unsigned softconnect:1; | ||
| 422 | |||
| 423 | u8 address; | ||
| 424 | u8 test_mode_nr; | ||
| 425 | u16 ackpend; /* ep0 */ | ||
| 426 | enum musb_g_ep0_state ep0_state; | ||
| 427 | struct usb_gadget g; /* the gadget */ | ||
| 428 | struct usb_gadget_driver *gadget_driver; /* its driver */ | ||
| 429 | #endif | ||
| 430 | |||
| 431 | struct musb_hdrc_config *config; | ||
| 432 | |||
| 433 | #ifdef MUSB_CONFIG_PROC_FS | ||
| 434 | struct proc_dir_entry *proc_entry; | ||
| 435 | #endif | ||
| 436 | }; | ||
| 437 | |||
| 438 | static inline void musb_set_vbus(struct musb *musb, int is_on) | ||
| 439 | { | ||
| 440 | musb->board_set_vbus(musb, is_on); | ||
| 441 | } | ||
| 442 | |||
| 443 | #ifdef CONFIG_USB_GADGET_MUSB_HDRC | ||
| 444 | static inline struct musb *gadget_to_musb(struct usb_gadget *g) | ||
| 445 | { | ||
| 446 | return container_of(g, struct musb, g); | ||
| 447 | } | ||
| 448 | #endif | ||
| 449 | |||
| 450 | |||
| 451 | /***************************** Glue it together *****************************/ | ||
| 452 | |||
| 453 | extern const char musb_driver_name[]; | ||
| 454 | |||
| 455 | extern void musb_start(struct musb *musb); | ||
| 456 | extern void musb_stop(struct musb *musb); | ||
| 457 | |||
| 458 | extern void musb_write_fifo(struct musb_hw_ep *ep, u16 len, const u8 *src); | ||
| 459 | extern void musb_read_fifo(struct musb_hw_ep *ep, u16 len, u8 *dst); | ||
| 460 | |||
| 461 | extern void musb_load_testpacket(struct musb *); | ||
| 462 | |||
| 463 | extern irqreturn_t musb_interrupt(struct musb *); | ||
| 464 | |||
| 465 | extern void musb_platform_enable(struct musb *musb); | ||
| 466 | extern void musb_platform_disable(struct musb *musb); | ||
| 467 | |||
| 468 | extern void musb_hnp_stop(struct musb *musb); | ||
| 469 | |||
| 470 | extern void musb_platform_set_mode(struct musb *musb, u8 musb_mode); | ||
| 471 | |||
| 472 | #if defined(CONFIG_USB_TUSB6010) || \ | ||
| 473 | defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP34XX) | ||
| 474 | extern void musb_platform_try_idle(struct musb *musb, unsigned long timeout); | ||
| 475 | #else | ||
| 476 | #define musb_platform_try_idle(x, y) do {} while (0) | ||
| 477 | #endif | ||
| 478 | |||
| 479 | #ifdef CONFIG_USB_TUSB6010 | ||
| 480 | extern int musb_platform_get_vbus_status(struct musb *musb); | ||
| 481 | #else | ||
| 482 | #define musb_platform_get_vbus_status(x) 0 | ||
| 483 | #endif | ||
| 484 | |||
| 485 | extern int __init musb_platform_init(struct musb *musb); | ||
| 486 | extern int musb_platform_exit(struct musb *musb); | ||
| 487 | |||
| 488 | #endif /* __MUSB_CORE_H__ */ | ||
diff --git a/drivers/usb/musb/musb_debug.h b/drivers/usb/musb/musb_debug.h new file mode 100644 index 000000000000..4d2794441b15 --- /dev/null +++ b/drivers/usb/musb/musb_debug.h | |||
| @@ -0,0 +1,62 @@ | |||
| 1 | /* | ||
| 2 | * MUSB OTG driver debug defines | ||
| 3 | * | ||
| 4 | * Copyright 2005 Mentor Graphics Corporation | ||
| 5 | * Copyright (C) 2005-2006 by Texas Instruments | ||
| 6 | * Copyright (C) 2006-2007 Nokia Corporation | ||
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or | ||
| 9 | * modify it under the terms of the GNU General Public License | ||
| 10 | * version 2 as published by the Free Software Foundation. | ||
| 11 | * | ||
| 12 | * This program is distributed in the hope that it will be useful, but | ||
| 13 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| 15 | * General Public License for more details. | ||
| 16 | * | ||
| 17 | * You should have received a copy of the GNU General Public License | ||
| 18 | * along with this program; if not, write to the Free Software | ||
| 19 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA | ||
| 20 | * 02110-1301 USA | ||
| 21 | * | ||
| 22 | * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED | ||
| 23 | * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF | ||
| 24 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN | ||
| 25 | * NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
| 26 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
| 27 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF | ||
| 28 | * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON | ||
| 29 | * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| 30 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
| 31 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| 32 | * | ||
| 33 | */ | ||
| 34 | |||
| 35 | #ifndef __MUSB_LINUX_DEBUG_H__ | ||
| 36 | #define __MUSB_LINUX_DEBUG_H__ | ||
| 37 | |||
| 38 | #define yprintk(facility, format, args...) \ | ||
| 39 | do { printk(facility "%s %d: " format , \ | ||
| 40 | __func__, __LINE__ , ## args); } while (0) | ||
| 41 | #define WARNING(fmt, args...) yprintk(KERN_WARNING, fmt, ## args) | ||
| 42 | #define INFO(fmt, args...) yprintk(KERN_INFO, fmt, ## args) | ||
| 43 | #define ERR(fmt, args...) yprintk(KERN_ERR, fmt, ## args) | ||
| 44 | |||
| 45 | #define xprintk(level, facility, format, args...) do { \ | ||
| 46 | if (_dbg_level(level)) { \ | ||
| 47 | printk(facility "%s %d: " format , \ | ||
| 48 | __func__, __LINE__ , ## args); \ | ||
| 49 | } } while (0) | ||
| 50 | |||
| 51 | extern unsigned debug; | ||
| 52 | |||
| 53 | static inline int _dbg_level(unsigned l) | ||
| 54 | { | ||
| 55 | return debug >= l; | ||
| 56 | } | ||
| 57 | |||
| 58 | #define DBG(level, fmt, args...) xprintk(level, KERN_DEBUG, fmt, ## args) | ||
| 59 | |||
| 60 | extern const char *otg_state_string(struct musb *); | ||
| 61 | |||
| 62 | #endif /* __MUSB_LINUX_DEBUG_H__ */ | ||
diff --git a/drivers/usb/musb/musb_dma.h b/drivers/usb/musb/musb_dma.h new file mode 100644 index 000000000000..0a2c4e3602c1 --- /dev/null +++ b/drivers/usb/musb/musb_dma.h | |||
| @@ -0,0 +1,172 @@ | |||
| 1 | /* | ||
| 2 | * MUSB OTG driver DMA controller abstraction | ||
| 3 | * | ||
| 4 | * Copyright 2005 Mentor Graphics Corporation | ||
| 5 | * Copyright (C) 2005-2006 by Texas Instruments | ||
| 6 | * Copyright (C) 2006-2007 Nokia Corporation | ||
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or | ||
| 9 | * modify it under the terms of the GNU General Public License | ||
| 10 | * version 2 as published by the Free Software Foundation. | ||
| 11 | * | ||
| 12 | * This program is distributed in the hope that it will be useful, but | ||
| 13 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| 15 | * General Public License for more details. | ||
| 16 | * | ||
| 17 | * You should have received a copy of the GNU General Public License | ||
| 18 | * along with this program; if not, write to the Free Software | ||
| 19 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA | ||
| 20 | * 02110-1301 USA | ||
| 21 | * | ||
| 22 | * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED | ||
| 23 | * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF | ||
| 24 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN | ||
| 25 | * NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
| 26 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
| 27 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF | ||
| 28 | * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON | ||
| 29 | * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| 30 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
| 31 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| 32 | * | ||
| 33 | */ | ||
| 34 | |||
| 35 | #ifndef __MUSB_DMA_H__ | ||
| 36 | #define __MUSB_DMA_H__ | ||
| 37 | |||
| 38 | struct musb_hw_ep; | ||
| 39 | |||
| 40 | /* | ||
| 41 | * DMA Controller Abstraction | ||
| 42 | * | ||
| 43 | * DMA Controllers are abstracted to allow use of a variety of different | ||
| 44 | * implementations of DMA, as allowed by the Inventra USB cores. On the | ||
| 45 | * host side, usbcore sets up the DMA mappings and flushes caches; on the | ||
| 46 | * peripheral side, the gadget controller driver does. Responsibilities | ||
| 47 | * of a DMA controller driver include: | ||
| 48 | * | ||
| 49 | * - Handling the details of moving multiple USB packets | ||
| 50 | * in cooperation with the Inventra USB core, including especially | ||
| 51 | * the correct RX side treatment of short packets and buffer-full | ||
| 52 | * states (both of which terminate transfers). | ||
| 53 | * | ||
| 54 | * - Knowing the correlation between dma channels and the | ||
| 55 | * Inventra core's local endpoint resources and data direction. | ||
| 56 | * | ||
| 57 | * - Maintaining a list of allocated/available channels. | ||
| 58 | * | ||
| 59 | * - Updating channel status on interrupts, | ||
| 60 | * whether shared with the Inventra core or separate. | ||
| 61 | */ | ||
| 62 | |||
| 63 | #define DMA_ADDR_INVALID (~(dma_addr_t)0) | ||
| 64 | |||
| 65 | #ifndef CONFIG_MUSB_PIO_ONLY | ||
| 66 | #define is_dma_capable() (1) | ||
| 67 | #else | ||
| 68 | #define is_dma_capable() (0) | ||
| 69 | #endif | ||
| 70 | |||
| 71 | #ifdef CONFIG_USB_TI_CPPI_DMA | ||
| 72 | #define is_cppi_enabled() 1 | ||
| 73 | #else | ||
| 74 | #define is_cppi_enabled() 0 | ||
| 75 | #endif | ||
| 76 | |||
| 77 | #ifdef CONFIG_USB_TUSB_OMAP_DMA | ||
| 78 | #define tusb_dma_omap() 1 | ||
| 79 | #else | ||
| 80 | #define tusb_dma_omap() 0 | ||
| 81 | #endif | ||
| 82 | |||
| 83 | /* | ||
| 84 | * DMA channel status ... updated by the dma controller driver whenever that | ||
| 85 | * status changes, and protected by the overall controller spinlock. | ||
| 86 | */ | ||
| 87 | enum dma_channel_status { | ||
| 88 | /* unallocated */ | ||
| 89 | MUSB_DMA_STATUS_UNKNOWN, | ||
| 90 | /* allocated ... but not busy, no errors */ | ||
| 91 | MUSB_DMA_STATUS_FREE, | ||
| 92 | /* busy ... transactions are active */ | ||
| 93 | MUSB_DMA_STATUS_BUSY, | ||
| 94 | /* transaction(s) aborted due to ... dma or memory bus error */ | ||
| 95 | MUSB_DMA_STATUS_BUS_ABORT, | ||
| 96 | /* transaction(s) aborted due to ... core error or USB fault */ | ||
| 97 | MUSB_DMA_STATUS_CORE_ABORT | ||
| 98 | }; | ||
| 99 | |||
| 100 | struct dma_controller; | ||
| 101 | |||
| 102 | /** | ||
| 103 | * struct dma_channel - A DMA channel. | ||
| 104 | * @private_data: channel-private data | ||
| 105 | * @max_len: the maximum number of bytes the channel can move in one | ||
| 106 | * transaction (typically representing many USB maximum-sized packets) | ||
| 107 | * @actual_len: how many bytes have been transferred | ||
| 108 | * @status: current channel status (updated e.g. on interrupt) | ||
| 109 | * @desired_mode: true if mode 1 is desired; false if mode 0 is desired | ||
| 110 | * | ||
| 111 | * channels are associated with an endpoint for the duration of at least | ||
| 112 | * one usb transfer. | ||
| 113 | */ | ||
| 114 | struct dma_channel { | ||
| 115 | void *private_data; | ||
| 116 | /* FIXME not void* private_data, but a dma_controller * */ | ||
| 117 | size_t max_len; | ||
| 118 | size_t actual_len; | ||
| 119 | enum dma_channel_status status; | ||
| 120 | bool desired_mode; | ||
| 121 | }; | ||
| 122 | |||
| 123 | /* | ||
| 124 | * dma_channel_status - return status of dma channel | ||
| 125 | * @c: the channel | ||
| 126 | * | ||
| 127 | * Returns the software's view of the channel status. If that status is BUSY | ||
| 128 | * then it's possible that the hardware has completed (or aborted) a transfer, | ||
| 129 | * so the driver needs to update that status. | ||
| 130 | */ | ||
| 131 | static inline enum dma_channel_status | ||
| 132 | dma_channel_status(struct dma_channel *c) | ||
| 133 | { | ||
| 134 | return (is_dma_capable() && c) ? c->status : MUSB_DMA_STATUS_UNKNOWN; | ||
| 135 | } | ||
| 136 | |||
| 137 | /** | ||
| 138 | * struct dma_controller - A DMA Controller. | ||
| 139 | * @start: call this to start a DMA controller; | ||
| 140 | * return 0 on success, else negative errno | ||
| 141 | * @stop: call this to stop a DMA controller | ||
| 142 | * return 0 on success, else negative errno | ||
| 143 | * @channel_alloc: call this to allocate a DMA channel | ||
| 144 | * @channel_release: call this to release a DMA channel | ||
| 145 | * @channel_abort: call this to abort a pending DMA transaction, | ||
| 146 | * returning it to FREE (but allocated) state | ||
| 147 | * | ||
| 148 | * Controllers manage dma channels. | ||
| 149 | */ | ||
| 150 | struct dma_controller { | ||
| 151 | int (*start)(struct dma_controller *); | ||
| 152 | int (*stop)(struct dma_controller *); | ||
| 153 | struct dma_channel *(*channel_alloc)(struct dma_controller *, | ||
| 154 | struct musb_hw_ep *, u8 is_tx); | ||
| 155 | void (*channel_release)(struct dma_channel *); | ||
| 156 | int (*channel_program)(struct dma_channel *channel, | ||
| 157 | u16 maxpacket, u8 mode, | ||
| 158 | dma_addr_t dma_addr, | ||
| 159 | u32 length); | ||
| 160 | int (*channel_abort)(struct dma_channel *); | ||
| 161 | }; | ||
| 162 | |||
| 163 | /* called after channel_program(), may indicate a fault */ | ||
| 164 | extern void musb_dma_completion(struct musb *musb, u8 epnum, u8 transmit); | ||
| 165 | |||
| 166 | |||
| 167 | extern struct dma_controller *__init | ||
| 168 | dma_controller_create(struct musb *, void __iomem *); | ||
| 169 | |||
| 170 | extern void dma_controller_destroy(struct dma_controller *); | ||
| 171 | |||
| 172 | #endif /* __MUSB_DMA_H__ */ | ||
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c new file mode 100644 index 000000000000..d6a802c224fa --- /dev/null +++ b/drivers/usb/musb/musb_gadget.c | |||
| @@ -0,0 +1,2031 @@ | |||
| 1 | /* | ||
| 2 | * MUSB OTG driver peripheral support | ||
| 3 | * | ||
| 4 | * Copyright 2005 Mentor Graphics Corporation | ||
| 5 | * Copyright (C) 2005-2006 by Texas Instruments | ||
| 6 | * Copyright (C) 2006-2007 Nokia Corporation | ||
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or | ||
| 9 | * modify it under the terms of the GNU General Public License | ||
| 10 | * version 2 as published by the Free Software Foundation. | ||
| 11 | * | ||
| 12 | * This program is distributed in the hope that it will be useful, but | ||
| 13 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| 15 | * General Public License for more details. | ||
| 16 | * | ||
| 17 | * You should have received a copy of the GNU General Public License | ||
| 18 | * along with this program; if not, write to the Free Software | ||
| 19 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA | ||
| 20 | * 02110-1301 USA | ||
| 21 | * | ||
| 22 | * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED | ||
| 23 | * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF | ||
| 24 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN | ||
| 25 | * NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
| 26 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
| 27 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF | ||
| 28 | * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON | ||
| 29 | * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| 30 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
| 31 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| 32 | * | ||
| 33 | */ | ||
| 34 | |||
| 35 | #include <linux/kernel.h> | ||
| 36 | #include <linux/list.h> | ||
| 37 | #include <linux/timer.h> | ||
| 38 | #include <linux/module.h> | ||
| 39 | #include <linux/smp.h> | ||
| 40 | #include <linux/spinlock.h> | ||
| 41 | #include <linux/delay.h> | ||
| 42 | #include <linux/moduleparam.h> | ||
| 43 | #include <linux/stat.h> | ||
| 44 | #include <linux/dma-mapping.h> | ||
| 45 | |||
| 46 | #include "musb_core.h" | ||
| 47 | |||
| 48 | |||
| 49 | /* MUSB PERIPHERAL status 3-mar-2006: | ||
| 50 | * | ||
| 51 | * - EP0 seems solid. It passes both USBCV and usbtest control cases. | ||
| 52 | * Minor glitches: | ||
| 53 | * | ||
| 54 | * + remote wakeup to Linux hosts work, but saw USBCV failures; | ||
| 55 | * in one test run (operator error?) | ||
| 56 | * + endpoint halt tests -- in both usbtest and usbcv -- seem | ||
| 57 | * to break when dma is enabled ... is something wrongly | ||
| 58 | * clearing SENDSTALL? | ||
| 59 | * | ||
| 60 | * - Mass storage behaved ok when last tested. Network traffic patterns | ||
| 61 | * (with lots of short transfers etc) need retesting; they turn up the | ||
| 62 | * worst cases of the DMA, since short packets are typical but are not | ||
| 63 | * required. | ||
| 64 | * | ||
| 65 | * - TX/IN | ||
| 66 | * + both pio and dma behave in with network and g_zero tests | ||
| 67 | * + no cppi throughput issues other than no-hw-queueing | ||
| 68 | * + failed with FLAT_REG (DaVinci) | ||
| 69 | * + seems to behave with double buffering, PIO -and- CPPI | ||
| 70 | * + with gadgetfs + AIO, requests got lost? | ||
| 71 | * | ||
| 72 | * - RX/OUT | ||
| 73 | * + both pio and dma behave in with network and g_zero tests | ||
| 74 | * + dma is slow in typical case (short_not_ok is clear) | ||
| 75 | * + double buffering ok with PIO | ||
| 76 | * + double buffering *FAILS* with CPPI, wrong data bytes sometimes | ||
| 77 | * + request lossage observed with gadgetfs | ||
| 78 | * | ||
| 79 | * - ISO not tested ... might work, but only weakly isochronous | ||
| 80 | * | ||
| 81 | * - Gadget driver disabling of softconnect during bind() is ignored; so | ||
| 82 | * drivers can't hold off host requests until userspace is ready. | ||
| 83 | * (Workaround: they can turn it off later.) | ||
| 84 | * | ||
| 85 | * - PORTABILITY (assumes PIO works): | ||
| 86 | * + DaVinci, basically works with cppi dma | ||
| 87 | * + OMAP 2430, ditto with mentor dma | ||
| 88 | * + TUSB 6010, platform-specific dma in the works | ||
| 89 | */ | ||
| 90 | |||
| 91 | /* ----------------------------------------------------------------------- */ | ||
| 92 | |||
| 93 | /* | ||
| 94 | * Immediately complete a request. | ||
| 95 | * | ||
| 96 | * @param request the request to complete | ||
| 97 | * @param status the status to complete the request with | ||
| 98 | * Context: controller locked, IRQs blocked. | ||
| 99 | */ | ||
| 100 | void musb_g_giveback( | ||
| 101 | struct musb_ep *ep, | ||
| 102 | struct usb_request *request, | ||
| 103 | int status) | ||
| 104 | __releases(ep->musb->lock) | ||
| 105 | __acquires(ep->musb->lock) | ||
| 106 | { | ||
| 107 | struct musb_request *req; | ||
| 108 | struct musb *musb; | ||
| 109 | int busy = ep->busy; | ||
| 110 | |||
| 111 | req = to_musb_request(request); | ||
| 112 | |||
| 113 | list_del(&request->list); | ||
| 114 | if (req->request.status == -EINPROGRESS) | ||
| 115 | req->request.status = status; | ||
| 116 | musb = req->musb; | ||
| 117 | |||
| 118 | ep->busy = 1; | ||
| 119 | spin_unlock(&musb->lock); | ||
| 120 | if (is_dma_capable()) { | ||
| 121 | if (req->mapped) { | ||
| 122 | dma_unmap_single(musb->controller, | ||
| 123 | req->request.dma, | ||
| 124 | req->request.length, | ||
| 125 | req->tx | ||
| 126 | ? DMA_TO_DEVICE | ||
| 127 | : DMA_FROM_DEVICE); | ||
| 128 | req->request.dma = DMA_ADDR_INVALID; | ||
| 129 | req->mapped = 0; | ||
| 130 | } else if (req->request.dma != DMA_ADDR_INVALID) | ||
| 131 | dma_sync_single_for_cpu(musb->controller, | ||
| 132 | req->request.dma, | ||
| 133 | req->request.length, | ||
| 134 | req->tx | ||
| 135 | ? DMA_TO_DEVICE | ||
| 136 | : DMA_FROM_DEVICE); | ||
| 137 | } | ||
| 138 | if (request->status == 0) | ||
| 139 | DBG(5, "%s done request %p, %d/%d\n", | ||
| 140 | ep->end_point.name, request, | ||
| 141 | req->request.actual, req->request.length); | ||
| 142 | else | ||
| 143 | DBG(2, "%s request %p, %d/%d fault %d\n", | ||
| 144 | ep->end_point.name, request, | ||
| 145 | req->request.actual, req->request.length, | ||
| 146 | request->status); | ||
| 147 | req->request.complete(&req->ep->end_point, &req->request); | ||
| 148 | spin_lock(&musb->lock); | ||
| 149 | ep->busy = busy; | ||
| 150 | } | ||
| 151 | |||
| 152 | /* ----------------------------------------------------------------------- */ | ||
| 153 | |||
| 154 | /* | ||
| 155 | * Abort requests queued to an endpoint using the status. Synchronous. | ||
| 156 | * caller locked controller and blocked irqs, and selected this ep. | ||
| 157 | */ | ||
| 158 | static void nuke(struct musb_ep *ep, const int status) | ||
| 159 | { | ||
| 160 | struct musb_request *req = NULL; | ||
| 161 | void __iomem *epio = ep->musb->endpoints[ep->current_epnum].regs; | ||
| 162 | |||
| 163 | ep->busy = 1; | ||
| 164 | |||
| 165 | if (is_dma_capable() && ep->dma) { | ||
| 166 | struct dma_controller *c = ep->musb->dma_controller; | ||
| 167 | int value; | ||
| 168 | if (ep->is_in) { | ||
| 169 | musb_writew(epio, MUSB_TXCSR, | ||
| 170 | 0 | MUSB_TXCSR_FLUSHFIFO); | ||
| 171 | musb_writew(epio, MUSB_TXCSR, | ||
| 172 | 0 | MUSB_TXCSR_FLUSHFIFO); | ||
| 173 | } else { | ||
| 174 | musb_writew(epio, MUSB_RXCSR, | ||
| 175 | 0 | MUSB_RXCSR_FLUSHFIFO); | ||
| 176 | musb_writew(epio, MUSB_RXCSR, | ||
| 177 | 0 | MUSB_RXCSR_FLUSHFIFO); | ||
| 178 | } | ||
| 179 | |||
| 180 | value = c->channel_abort(ep->dma); | ||
| 181 | DBG(value ? 1 : 6, "%s: abort DMA --> %d\n", ep->name, value); | ||
| 182 | c->channel_release(ep->dma); | ||
| 183 | ep->dma = NULL; | ||
| 184 | } | ||
| 185 | |||
| 186 | while (!list_empty(&(ep->req_list))) { | ||
| 187 | req = container_of(ep->req_list.next, struct musb_request, | ||
| 188 | request.list); | ||
| 189 | musb_g_giveback(ep, &req->request, status); | ||
| 190 | } | ||
| 191 | } | ||
| 192 | |||
| 193 | /* ----------------------------------------------------------------------- */ | ||
| 194 | |||
| 195 | /* Data transfers - pure PIO, pure DMA, or mixed mode */ | ||
| 196 | |||
| 197 | /* | ||
| 198 | * This assumes the separate CPPI engine is responding to DMA requests | ||
| 199 | * from the usb core ... sequenced a bit differently from mentor dma. | ||
| 200 | */ | ||
| 201 | |||
| 202 | static inline int max_ep_writesize(struct musb *musb, struct musb_ep *ep) | ||
| 203 | { | ||
| 204 | if (can_bulk_split(musb, ep->type)) | ||
| 205 | return ep->hw_ep->max_packet_sz_tx; | ||
| 206 | else | ||
| 207 | return ep->packet_sz; | ||
| 208 | } | ||
| 209 | |||
| 210 | |||
| 211 | #ifdef CONFIG_USB_INVENTRA_DMA | ||
| 212 | |||
| 213 | /* Peripheral tx (IN) using Mentor DMA works as follows: | ||
| 214 | Only mode 0 is used for transfers <= wPktSize, | ||
| 215 | mode 1 is used for larger transfers, | ||
| 216 | |||
| 217 | One of the following happens: | ||
| 218 | - Host sends IN token which causes an endpoint interrupt | ||
| 219 | -> TxAvail | ||
| 220 | -> if DMA is currently busy, exit. | ||
| 221 | -> if queue is non-empty, txstate(). | ||
| 222 | |||
| 223 | - Request is queued by the gadget driver. | ||
| 224 | -> if queue was previously empty, txstate() | ||
| 225 | |||
| 226 | txstate() | ||
| 227 | -> start | ||
| 228 | /\ -> setup DMA | ||
| 229 | | (data is transferred to the FIFO, then sent out when | ||
| 230 | | IN token(s) are recd from Host. | ||
| 231 | | -> DMA interrupt on completion | ||
| 232 | | calls TxAvail. | ||
| 233 | | -> stop DMA, ~DmaEenab, | ||
| 234 | | -> set TxPktRdy for last short pkt or zlp | ||
| 235 | | -> Complete Request | ||
| 236 | | -> Continue next request (call txstate) | ||
| 237 | |___________________________________| | ||
| 238 | |||
| 239 | * Non-Mentor DMA engines can of course work differently, such as by | ||
| 240 | * upleveling from irq-per-packet to irq-per-buffer. | ||
| 241 | */ | ||
| 242 | |||
| 243 | #endif | ||
| 244 | |||
| 245 | /* | ||
| 246 | * An endpoint is transmitting data. This can be called either from | ||
| 247 | * the IRQ routine or from ep.queue() to kickstart a request on an | ||
| 248 | * endpoint. | ||
| 249 | * | ||
| 250 | * Context: controller locked, IRQs blocked, endpoint selected | ||
| 251 | */ | ||
| 252 | static void txstate(struct musb *musb, struct musb_request *req) | ||
| 253 | { | ||
| 254 | u8 epnum = req->epnum; | ||
| 255 | struct musb_ep *musb_ep; | ||
| 256 | void __iomem *epio = musb->endpoints[epnum].regs; | ||
| 257 | struct usb_request *request; | ||
| 258 | u16 fifo_count = 0, csr; | ||
| 259 | int use_dma = 0; | ||
| 260 | |||
| 261 | musb_ep = req->ep; | ||
| 262 | |||
| 263 | /* we shouldn't get here while DMA is active ... but we do ... */ | ||
| 264 | if (dma_channel_status(musb_ep->dma) == MUSB_DMA_STATUS_BUSY) { | ||
| 265 | DBG(4, "dma pending...\n"); | ||
| 266 | return; | ||
| 267 | } | ||
| 268 | |||
| 269 | /* read TXCSR before */ | ||
| 270 | csr = musb_readw(epio, MUSB_TXCSR); | ||
| 271 | |||
| 272 | request = &req->request; | ||
| 273 | fifo_count = min(max_ep_writesize(musb, musb_ep), | ||
| 274 | (int)(request->length - request->actual)); | ||
| 275 | |||
| 276 | if (csr & MUSB_TXCSR_TXPKTRDY) { | ||
| 277 | DBG(5, "%s old packet still ready , txcsr %03x\n", | ||
| 278 | musb_ep->end_point.name, csr); | ||
| 279 | return; | ||
| 280 | } | ||
| 281 | |||
| 282 | if (csr & MUSB_TXCSR_P_SENDSTALL) { | ||
| 283 | DBG(5, "%s stalling, txcsr %03x\n", | ||
| 284 | musb_ep->end_point.name, csr); | ||
| 285 | return; | ||
| 286 | } | ||
| 287 | |||
| 288 | DBG(4, "hw_ep%d, maxpacket %d, fifo count %d, txcsr %03x\n", | ||
| 289 | epnum, musb_ep->packet_sz, fifo_count, | ||
| 290 | csr); | ||
| 291 | |||
| 292 | #ifndef CONFIG_MUSB_PIO_ONLY | ||
| 293 | if (is_dma_capable() && musb_ep->dma) { | ||
| 294 | struct dma_controller *c = musb->dma_controller; | ||
| 295 | |||
| 296 | use_dma = (request->dma != DMA_ADDR_INVALID); | ||
| 297 | |||
| 298 | /* MUSB_TXCSR_P_ISO is still set correctly */ | ||
| 299 | |||
| 300 | #ifdef CONFIG_USB_INVENTRA_DMA | ||
| 301 | { | ||
| 302 | size_t request_size; | ||
| 303 | |||
| 304 | /* setup DMA, then program endpoint CSR */ | ||
| 305 | request_size = min(request->length, | ||
| 306 | musb_ep->dma->max_len); | ||
| 307 | if (request_size <= musb_ep->packet_sz) | ||
| 308 | musb_ep->dma->desired_mode = 0; | ||
| 309 | else | ||
| 310 | musb_ep->dma->desired_mode = 1; | ||
| 311 | |||
| 312 | use_dma = use_dma && c->channel_program( | ||
| 313 | musb_ep->dma, musb_ep->packet_sz, | ||
| 314 | musb_ep->dma->desired_mode, | ||
| 315 | request->dma, request_size); | ||
| 316 | if (use_dma) { | ||
| 317 | if (musb_ep->dma->desired_mode == 0) { | ||
| 318 | /* ASSERT: DMAENAB is clear */ | ||
| 319 | csr &= ~(MUSB_TXCSR_AUTOSET | | ||
| 320 | MUSB_TXCSR_DMAMODE); | ||
| 321 | csr |= (MUSB_TXCSR_DMAENAB | | ||
| 322 | MUSB_TXCSR_MODE); | ||
| 323 | /* against programming guide */ | ||
| 324 | } else | ||
| 325 | csr |= (MUSB_TXCSR_AUTOSET | ||
| 326 | | MUSB_TXCSR_DMAENAB | ||
| 327 | | MUSB_TXCSR_DMAMODE | ||
| 328 | | MUSB_TXCSR_MODE); | ||
| 329 | |||
| 330 | csr &= ~MUSB_TXCSR_P_UNDERRUN; | ||
| 331 | musb_writew(epio, MUSB_TXCSR, csr); | ||
| 332 | } | ||
| 333 | } | ||
| 334 | |||
| 335 | #elif defined(CONFIG_USB_TI_CPPI_DMA) | ||
| 336 | /* program endpoint CSR first, then setup DMA */ | ||
| 337 | csr &= ~(MUSB_TXCSR_AUTOSET | ||
| 338 | | MUSB_TXCSR_DMAMODE | ||
| 339 | | MUSB_TXCSR_P_UNDERRUN | ||
| 340 | | MUSB_TXCSR_TXPKTRDY); | ||
| 341 | csr |= MUSB_TXCSR_MODE | MUSB_TXCSR_DMAENAB; | ||
| 342 | musb_writew(epio, MUSB_TXCSR, | ||
| 343 | (MUSB_TXCSR_P_WZC_BITS & ~MUSB_TXCSR_P_UNDERRUN) | ||
| 344 | | csr); | ||
| 345 | |||
| 346 | /* ensure writebuffer is empty */ | ||
| 347 | csr = musb_readw(epio, MUSB_TXCSR); | ||
| 348 | |||
| 349 | /* NOTE host side sets DMAENAB later than this; both are | ||
| 350 | * OK since the transfer dma glue (between CPPI and Mentor | ||
| 351 | * fifos) just tells CPPI it could start. Data only moves | ||
| 352 | * to the USB TX fifo when both fifos are ready. | ||
| 353 | */ | ||
| 354 | |||
| 355 | /* "mode" is irrelevant here; handle terminating ZLPs like | ||
| 356 | * PIO does, since the hardware RNDIS mode seems unreliable | ||
| 357 | * except for the last-packet-is-already-short case. | ||
| 358 | */ | ||
| 359 | use_dma = use_dma && c->channel_program( | ||
| 360 | musb_ep->dma, musb_ep->packet_sz, | ||
| 361 | 0, | ||
| 362 | request->dma, | ||
| 363 | request->length); | ||
| 364 | if (!use_dma) { | ||
| 365 | c->channel_release(musb_ep->dma); | ||
| 366 | musb_ep->dma = NULL; | ||
| 367 | /* ASSERT: DMAENAB clear */ | ||
| 368 | csr &= ~(MUSB_TXCSR_DMAMODE | MUSB_TXCSR_MODE); | ||
| 369 | /* invariant: prequest->buf is non-null */ | ||
| 370 | } | ||
| 371 | #elif defined(CONFIG_USB_TUSB_OMAP_DMA) | ||
| 372 | use_dma = use_dma && c->channel_program( | ||
| 373 | musb_ep->dma, musb_ep->packet_sz, | ||
| 374 | request->zero, | ||
| 375 | request->dma, | ||
| 376 | request->length); | ||
| 377 | #endif | ||
| 378 | } | ||
| 379 | #endif | ||
| 380 | |||
| 381 | if (!use_dma) { | ||
| 382 | musb_write_fifo(musb_ep->hw_ep, fifo_count, | ||
| 383 | (u8 *) (request->buf + request->actual)); | ||
| 384 | request->actual += fifo_count; | ||
| 385 | csr |= MUSB_TXCSR_TXPKTRDY; | ||
| 386 | csr &= ~MUSB_TXCSR_P_UNDERRUN; | ||
| 387 | musb_writew(epio, MUSB_TXCSR, csr); | ||
| 388 | } | ||
| 389 | |||
| 390 | /* host may already have the data when this message shows... */ | ||
| 391 | DBG(3, "%s TX/IN %s len %d/%d, txcsr %04x, fifo %d/%d\n", | ||
| 392 | musb_ep->end_point.name, use_dma ? "dma" : "pio", | ||
| 393 | request->actual, request->length, | ||
| 394 | musb_readw(epio, MUSB_TXCSR), | ||
| 395 | fifo_count, | ||
| 396 | musb_readw(epio, MUSB_TXMAXP)); | ||
| 397 | } | ||
| 398 | |||
| 399 | /* | ||
| 400 | * FIFO state update (e.g. data ready). | ||
| 401 | * Called from IRQ, with controller locked. | ||
| 402 | */ | ||
| 403 | void musb_g_tx(struct musb *musb, u8 epnum) | ||
| 404 | { | ||
| 405 | u16 csr; | ||
| 406 | struct usb_request *request; | ||
| 407 | u8 __iomem *mbase = musb->mregs; | ||
| 408 | struct musb_ep *musb_ep = &musb->endpoints[epnum].ep_in; | ||
| 409 | void __iomem *epio = musb->endpoints[epnum].regs; | ||
| 410 | struct dma_channel *dma; | ||
| 411 | |||
| 412 | musb_ep_select(mbase, epnum); | ||
| 413 | request = next_request(musb_ep); | ||
| 414 | |||
| 415 | csr = musb_readw(epio, MUSB_TXCSR); | ||
| 416 | DBG(4, "<== %s, txcsr %04x\n", musb_ep->end_point.name, csr); | ||
| 417 | |||
| 418 | dma = is_dma_capable() ? musb_ep->dma : NULL; | ||
| 419 | do { | ||
| 420 | /* REVISIT for high bandwidth, MUSB_TXCSR_P_INCOMPTX | ||
| 421 | * probably rates reporting as a host error | ||
| 422 | */ | ||
| 423 | if (csr & MUSB_TXCSR_P_SENTSTALL) { | ||
| 424 | csr |= MUSB_TXCSR_P_WZC_BITS; | ||
| 425 | csr &= ~MUSB_TXCSR_P_SENTSTALL; | ||
| 426 | musb_writew(epio, MUSB_TXCSR, csr); | ||
| 427 | if (dma_channel_status(dma) == MUSB_DMA_STATUS_BUSY) { | ||
| 428 | dma->status = MUSB_DMA_STATUS_CORE_ABORT; | ||
| 429 | musb->dma_controller->channel_abort(dma); | ||
| 430 | } | ||
| 431 | |||
| 432 | if (request) | ||
| 433 | musb_g_giveback(musb_ep, request, -EPIPE); | ||
| 434 | |||
| 435 | break; | ||
| 436 | } | ||
| 437 | |||
| 438 | if (csr & MUSB_TXCSR_P_UNDERRUN) { | ||
| 439 | /* we NAKed, no big deal ... little reason to care */ | ||
| 440 | csr |= MUSB_TXCSR_P_WZC_BITS; | ||
| 441 | csr &= ~(MUSB_TXCSR_P_UNDERRUN | ||
| 442 | | MUSB_TXCSR_TXPKTRDY); | ||
| 443 | musb_writew(epio, MUSB_TXCSR, csr); | ||
| 444 | DBG(20, "underrun on ep%d, req %p\n", epnum, request); | ||
| 445 | } | ||
| 446 | |||
| 447 | if (dma_channel_status(dma) == MUSB_DMA_STATUS_BUSY) { | ||
| 448 | /* SHOULD NOT HAPPEN ... has with cppi though, after | ||
| 449 | * changing SENDSTALL (and other cases); harmless? | ||
| 450 | */ | ||
| 451 | DBG(5, "%s dma still busy?\n", musb_ep->end_point.name); | ||
| 452 | break; | ||
| 453 | } | ||
| 454 | |||
| 455 | if (request) { | ||
| 456 | u8 is_dma = 0; | ||
| 457 | |||
| 458 | if (dma && (csr & MUSB_TXCSR_DMAENAB)) { | ||
| 459 | is_dma = 1; | ||
| 460 | csr |= MUSB_TXCSR_P_WZC_BITS; | ||
| 461 | csr &= ~(MUSB_TXCSR_DMAENAB | ||
| 462 | | MUSB_TXCSR_P_UNDERRUN | ||
| 463 | | MUSB_TXCSR_TXPKTRDY); | ||
| 464 | musb_writew(epio, MUSB_TXCSR, csr); | ||
| 465 | /* ensure writebuffer is empty */ | ||
| 466 | csr = musb_readw(epio, MUSB_TXCSR); | ||
| 467 | request->actual += musb_ep->dma->actual_len; | ||
| 468 | DBG(4, "TXCSR%d %04x, dma off, " | ||
| 469 | "len %zu, req %p\n", | ||
| 470 | epnum, csr, | ||
| 471 | musb_ep->dma->actual_len, | ||
| 472 | request); | ||
| 473 | } | ||
| 474 | |||
| 475 | if (is_dma || request->actual == request->length) { | ||
| 476 | |||
| 477 | /* First, maybe a terminating short packet. | ||
| 478 | * Some DMA engines might handle this by | ||
| 479 | * themselves. | ||
| 480 | */ | ||
| 481 | if ((request->zero | ||
| 482 | && request->length | ||
| 483 | && (request->length | ||
| 484 | % musb_ep->packet_sz) | ||
| 485 | == 0) | ||
| 486 | #ifdef CONFIG_USB_INVENTRA_DMA | ||
| 487 | || (is_dma && | ||
| 488 | ((!dma->desired_mode) || | ||
| 489 | (request->actual & | ||
| 490 | (musb_ep->packet_sz - 1)))) | ||
| 491 | #endif | ||
| 492 | ) { | ||
| 493 | /* on dma completion, fifo may not | ||
| 494 | * be available yet ... | ||
| 495 | */ | ||
| 496 | if (csr & MUSB_TXCSR_TXPKTRDY) | ||
| 497 | break; | ||
| 498 | |||
| 499 | DBG(4, "sending zero pkt\n"); | ||
| 500 | musb_writew(epio, MUSB_TXCSR, | ||
| 501 | MUSB_TXCSR_MODE | ||
| 502 | | MUSB_TXCSR_TXPKTRDY); | ||
| 503 | request->zero = 0; | ||
| 504 | } | ||
| 505 | |||
| 506 | /* ... or if not, then complete it */ | ||
| 507 | musb_g_giveback(musb_ep, request, 0); | ||
| 508 | |||
| 509 | /* kickstart next transfer if appropriate; | ||
| 510 | * the packet that just completed might not | ||
| 511 | * be transmitted for hours or days. | ||
| 512 | * REVISIT for double buffering... | ||
| 513 | * FIXME revisit for stalls too... | ||
| 514 | */ | ||
| 515 | musb_ep_select(mbase, epnum); | ||
| 516 | csr = musb_readw(epio, MUSB_TXCSR); | ||
| 517 | if (csr & MUSB_TXCSR_FIFONOTEMPTY) | ||
| 518 | break; | ||
| 519 | request = musb_ep->desc | ||
| 520 | ? next_request(musb_ep) | ||
| 521 | : NULL; | ||
| 522 | if (!request) { | ||
| 523 | DBG(4, "%s idle now\n", | ||
| 524 | musb_ep->end_point.name); | ||
| 525 | break; | ||
| 526 | } | ||
| 527 | } | ||
| 528 | |||
| 529 | txstate(musb, to_musb_request(request)); | ||
| 530 | } | ||
| 531 | |||
| 532 | } while (0); | ||
| 533 | } | ||
| 534 | |||
| 535 | /* ------------------------------------------------------------ */ | ||
| 536 | |||
| 537 | #ifdef CONFIG_USB_INVENTRA_DMA | ||
| 538 | |||
| 539 | /* Peripheral rx (OUT) using Mentor DMA works as follows: | ||
| 540 | - Only mode 0 is used. | ||
| 541 | |||
| 542 | - Request is queued by the gadget class driver. | ||
| 543 | -> if queue was previously empty, rxstate() | ||
| 544 | |||
| 545 | - Host sends OUT token which causes an endpoint interrupt | ||
| 546 | /\ -> RxReady | ||
| 547 | | -> if request queued, call rxstate | ||
| 548 | | /\ -> setup DMA | ||
| 549 | | | -> DMA interrupt on completion | ||
| 550 | | | -> RxReady | ||
| 551 | | | -> stop DMA | ||
| 552 | | | -> ack the read | ||
| 553 | | | -> if data recd = max expected | ||
| 554 | | | by the request, or host | ||
| 555 | | | sent a short packet, | ||
| 556 | | | complete the request, | ||
| 557 | | | and start the next one. | ||
| 558 | | |_____________________________________| | ||
| 559 | | else just wait for the host | ||
| 560 | | to send the next OUT token. | ||
| 561 | |__________________________________________________| | ||
| 562 | |||
| 563 | * Non-Mentor DMA engines can of course work differently. | ||
| 564 | */ | ||
| 565 | |||
| 566 | #endif | ||
| 567 | |||
| 568 | /* | ||
| 569 | * Context: controller locked, IRQs blocked, endpoint selected | ||
| 570 | */ | ||
| 571 | static void rxstate(struct musb *musb, struct musb_request *req) | ||
| 572 | { | ||
| 573 | u16 csr = 0; | ||
| 574 | const u8 epnum = req->epnum; | ||
| 575 | struct usb_request *request = &req->request; | ||
| 576 | struct musb_ep *musb_ep = &musb->endpoints[epnum].ep_out; | ||
| 577 | void __iomem *epio = musb->endpoints[epnum].regs; | ||
| 578 | u16 fifo_count = 0; | ||
| 579 | u16 len = musb_ep->packet_sz; | ||
| 580 | |||
| 581 | csr = musb_readw(epio, MUSB_RXCSR); | ||
| 582 | |||
| 583 | if (is_cppi_enabled() && musb_ep->dma) { | ||
| 584 | struct dma_controller *c = musb->dma_controller; | ||
| 585 | struct dma_channel *channel = musb_ep->dma; | ||
| 586 | |||
| 587 | /* NOTE: CPPI won't actually stop advancing the DMA | ||
| 588 | * queue after short packet transfers, so this is almost | ||
| 589 | * always going to run as IRQ-per-packet DMA so that | ||
| 590 | * faults will be handled correctly. | ||
| 591 | */ | ||
| 592 | if (c->channel_program(channel, | ||
| 593 | musb_ep->packet_sz, | ||
| 594 | !request->short_not_ok, | ||
| 595 | request->dma + request->actual, | ||
| 596 | request->length - request->actual)) { | ||
| 597 | |||
| 598 | /* make sure that if an rxpkt arrived after the irq, | ||
| 599 | * the cppi engine will be ready to take it as soon | ||
| 600 | * as DMA is enabled | ||
| 601 | */ | ||
| 602 | csr &= ~(MUSB_RXCSR_AUTOCLEAR | ||
| 603 | | MUSB_RXCSR_DMAMODE); | ||
| 604 | csr |= MUSB_RXCSR_DMAENAB | MUSB_RXCSR_P_WZC_BITS; | ||
| 605 | musb_writew(epio, MUSB_RXCSR, csr); | ||
| 606 | return; | ||
| 607 | } | ||
| 608 | } | ||
| 609 | |||
| 610 | if (csr & MUSB_RXCSR_RXPKTRDY) { | ||
| 611 | len = musb_readw(epio, MUSB_RXCOUNT); | ||
| 612 | if (request->actual < request->length) { | ||
| 613 | #ifdef CONFIG_USB_INVENTRA_DMA | ||
| 614 | if (is_dma_capable() && musb_ep->dma) { | ||
| 615 | struct dma_controller *c; | ||
| 616 | struct dma_channel *channel; | ||
| 617 | int use_dma = 0; | ||
| 618 | |||
| 619 | c = musb->dma_controller; | ||
| 620 | channel = musb_ep->dma; | ||
| 621 | |||
| 622 | /* We use DMA Req mode 0 in rx_csr, and DMA controller operates in | ||
| 623 | * mode 0 only. So we do not get endpoint interrupts due to DMA | ||
| 624 | * completion. We only get interrupts from DMA controller. | ||
| 625 | * | ||
| 626 | * We could operate in DMA mode 1 if we knew the size of the tranfer | ||
| 627 | * in advance. For mass storage class, request->length = what the host | ||
| 628 | * sends, so that'd work. But for pretty much everything else, | ||
| 629 | * request->length is routinely more than what the host sends. For | ||
| 630 | * most these gadgets, end of is signified either by a short packet, | ||
| 631 | * or filling the last byte of the buffer. (Sending extra data in | ||
| 632 | * that last pckate should trigger an overflow fault.) But in mode 1, | ||
| 633 | * we don't get DMA completion interrrupt for short packets. | ||
| 634 | * | ||
| 635 | * Theoretically, we could enable DMAReq irq (MUSB_RXCSR_DMAMODE = 1), | ||
| 636 | * to get endpoint interrupt on every DMA req, but that didn't seem | ||
| 637 | * to work reliably. | ||
| 638 | * | ||
| 639 | * REVISIT an updated g_file_storage can set req->short_not_ok, which | ||
| 640 | * then becomes usable as a runtime "use mode 1" hint... | ||
| 641 | */ | ||
| 642 | |||
| 643 | csr |= MUSB_RXCSR_DMAENAB; | ||
| 644 | #ifdef USE_MODE1 | ||
| 645 | csr |= MUSB_RXCSR_AUTOCLEAR; | ||
| 646 | /* csr |= MUSB_RXCSR_DMAMODE; */ | ||
| 647 | |||
| 648 | /* this special sequence (enabling and then | ||
| 649 | * disabling MUSB_RXCSR_DMAMODE) is required | ||
| 650 | * to get DMAReq to activate | ||
| 651 | */ | ||
| 652 | musb_writew(epio, MUSB_RXCSR, | ||
| 653 | csr | MUSB_RXCSR_DMAMODE); | ||
| 654 | #endif | ||
| 655 | musb_writew(epio, MUSB_RXCSR, csr); | ||
| 656 | |||
| 657 | if (request->actual < request->length) { | ||
| 658 | int transfer_size = 0; | ||
| 659 | #ifdef USE_MODE1 | ||
| 660 | transfer_size = min(request->length, | ||
| 661 | channel->max_len); | ||
| 662 | #else | ||
| 663 | transfer_size = len; | ||
| 664 | #endif | ||
| 665 | if (transfer_size <= musb_ep->packet_sz) | ||
| 666 | musb_ep->dma->desired_mode = 0; | ||
| 667 | else | ||
| 668 | musb_ep->dma->desired_mode = 1; | ||
| 669 | |||
| 670 | use_dma = c->channel_program( | ||
| 671 | channel, | ||
| 672 | musb_ep->packet_sz, | ||
| 673 | channel->desired_mode, | ||
| 674 | request->dma | ||
| 675 | + request->actual, | ||
| 676 | transfer_size); | ||
| 677 | } | ||
| 678 | |||
| 679 | if (use_dma) | ||
| 680 | return; | ||
| 681 | } | ||
| 682 | #endif /* Mentor's DMA */ | ||
| 683 | |||
| 684 | fifo_count = request->length - request->actual; | ||
| 685 | DBG(3, "%s OUT/RX pio fifo %d/%d, maxpacket %d\n", | ||
| 686 | musb_ep->end_point.name, | ||
| 687 | len, fifo_count, | ||
| 688 | musb_ep->packet_sz); | ||
| 689 | |||
| 690 | fifo_count = min(len, fifo_count); | ||
| 691 | |||
| 692 | #ifdef CONFIG_USB_TUSB_OMAP_DMA | ||
| 693 | if (tusb_dma_omap() && musb_ep->dma) { | ||
| 694 | struct dma_controller *c = musb->dma_controller; | ||
| 695 | struct dma_channel *channel = musb_ep->dma; | ||
| 696 | u32 dma_addr = request->dma + request->actual; | ||
| 697 | int ret; | ||
| 698 | |||
| 699 | ret = c->channel_program(channel, | ||
| 700 | musb_ep->packet_sz, | ||
| 701 | channel->desired_mode, | ||
| 702 | dma_addr, | ||
| 703 | fifo_count); | ||
| 704 | if (ret) | ||
| 705 | return; | ||
| 706 | } | ||
| 707 | #endif | ||
| 708 | |||
| 709 | musb_read_fifo(musb_ep->hw_ep, fifo_count, (u8 *) | ||
| 710 | (request->buf + request->actual)); | ||
| 711 | request->actual += fifo_count; | ||
| 712 | |||
| 713 | /* REVISIT if we left anything in the fifo, flush | ||
| 714 | * it and report -EOVERFLOW | ||
| 715 | */ | ||
| 716 | |||
| 717 | /* ack the read! */ | ||
| 718 | csr |= MUSB_RXCSR_P_WZC_BITS; | ||
| 719 | csr &= ~MUSB_RXCSR_RXPKTRDY; | ||
| 720 | musb_writew(epio, MUSB_RXCSR, csr); | ||
| 721 | } | ||
| 722 | } | ||
| 723 | |||
| 724 | /* reach the end or short packet detected */ | ||
| 725 | if (request->actual == request->length || len < musb_ep->packet_sz) | ||
| 726 | musb_g_giveback(musb_ep, request, 0); | ||
| 727 | } | ||
| 728 | |||
| 729 | /* | ||
| 730 | * Data ready for a request; called from IRQ | ||
| 731 | */ | ||
| 732 | void musb_g_rx(struct musb *musb, u8 epnum) | ||
| 733 | { | ||
| 734 | u16 csr; | ||
| 735 | struct usb_request *request; | ||
| 736 | void __iomem *mbase = musb->mregs; | ||
| 737 | struct musb_ep *musb_ep = &musb->endpoints[epnum].ep_out; | ||
| 738 | void __iomem *epio = musb->endpoints[epnum].regs; | ||
| 739 | struct dma_channel *dma; | ||
| 740 | |||
| 741 | musb_ep_select(mbase, epnum); | ||
| 742 | |||
| 743 | request = next_request(musb_ep); | ||
| 744 | |||
| 745 | csr = musb_readw(epio, MUSB_RXCSR); | ||
| 746 | dma = is_dma_capable() ? musb_ep->dma : NULL; | ||
| 747 | |||
| 748 | DBG(4, "<== %s, rxcsr %04x%s %p\n", musb_ep->end_point.name, | ||
| 749 | csr, dma ? " (dma)" : "", request); | ||
| 750 | |||
| 751 | if (csr & MUSB_RXCSR_P_SENTSTALL) { | ||
| 752 | if (dma_channel_status(dma) == MUSB_DMA_STATUS_BUSY) { | ||
| 753 | dma->status = MUSB_DMA_STATUS_CORE_ABORT; | ||
| 754 | (void) musb->dma_controller->channel_abort(dma); | ||
| 755 | request->actual += musb_ep->dma->actual_len; | ||
| 756 | } | ||
| 757 | |||
| 758 | csr |= MUSB_RXCSR_P_WZC_BITS; | ||
| 759 | csr &= ~MUSB_RXCSR_P_SENTSTALL; | ||
| 760 | musb_writew(epio, MUSB_RXCSR, csr); | ||
| 761 | |||
| 762 | if (request) | ||
| 763 | musb_g_giveback(musb_ep, request, -EPIPE); | ||
| 764 | goto done; | ||
| 765 | } | ||
| 766 | |||
| 767 | if (csr & MUSB_RXCSR_P_OVERRUN) { | ||
| 768 | /* csr |= MUSB_RXCSR_P_WZC_BITS; */ | ||
| 769 | csr &= ~MUSB_RXCSR_P_OVERRUN; | ||
| 770 | musb_writew(epio, MUSB_RXCSR, csr); | ||
| 771 | |||
| 772 | DBG(3, "%s iso overrun on %p\n", musb_ep->name, request); | ||
| 773 | if (request && request->status == -EINPROGRESS) | ||
| 774 | request->status = -EOVERFLOW; | ||
| 775 | } | ||
| 776 | if (csr & MUSB_RXCSR_INCOMPRX) { | ||
| 777 | /* REVISIT not necessarily an error */ | ||
| 778 | DBG(4, "%s, incomprx\n", musb_ep->end_point.name); | ||
| 779 | } | ||
| 780 | |||
| 781 | if (dma_channel_status(dma) == MUSB_DMA_STATUS_BUSY) { | ||
| 782 | /* "should not happen"; likely RXPKTRDY pending for DMA */ | ||
| 783 | DBG((csr & MUSB_RXCSR_DMAENAB) ? 4 : 1, | ||
| 784 | "%s busy, csr %04x\n", | ||
| 785 | musb_ep->end_point.name, csr); | ||
| 786 | goto done; | ||
| 787 | } | ||
| 788 | |||
| 789 | if (dma && (csr & MUSB_RXCSR_DMAENAB)) { | ||
| 790 | csr &= ~(MUSB_RXCSR_AUTOCLEAR | ||
| 791 | | MUSB_RXCSR_DMAENAB | ||
| 792 | | MUSB_RXCSR_DMAMODE); | ||
| 793 | musb_writew(epio, MUSB_RXCSR, | ||
| 794 | MUSB_RXCSR_P_WZC_BITS | csr); | ||
| 795 | |||
| 796 | request->actual += musb_ep->dma->actual_len; | ||
| 797 | |||
| 798 | DBG(4, "RXCSR%d %04x, dma off, %04x, len %zu, req %p\n", | ||
| 799 | epnum, csr, | ||
| 800 | musb_readw(epio, MUSB_RXCSR), | ||
| 801 | musb_ep->dma->actual_len, request); | ||
| 802 | |||
| 803 | #if defined(CONFIG_USB_INVENTRA_DMA) || defined(CONFIG_USB_TUSB_OMAP_DMA) | ||
| 804 | /* Autoclear doesn't clear RxPktRdy for short packets */ | ||
| 805 | if ((dma->desired_mode == 0) | ||
| 806 | || (dma->actual_len | ||
| 807 | & (musb_ep->packet_sz - 1))) { | ||
| 808 | /* ack the read! */ | ||
| 809 | csr &= ~MUSB_RXCSR_RXPKTRDY; | ||
| 810 | musb_writew(epio, MUSB_RXCSR, csr); | ||
| 811 | } | ||
| 812 | |||
| 813 | /* incomplete, and not short? wait for next IN packet */ | ||
| 814 | if ((request->actual < request->length) | ||
| 815 | && (musb_ep->dma->actual_len | ||
| 816 | == musb_ep->packet_sz)) | ||
| 817 | goto done; | ||
| 818 | #endif | ||
| 819 | musb_g_giveback(musb_ep, request, 0); | ||
| 820 | |||
| 821 | request = next_request(musb_ep); | ||
| 822 | if (!request) | ||
| 823 | goto done; | ||
| 824 | |||
| 825 | /* don't start more i/o till the stall clears */ | ||
| 826 | musb_ep_select(mbase, epnum); | ||
| 827 | csr = musb_readw(epio, MUSB_RXCSR); | ||
| 828 | if (csr & MUSB_RXCSR_P_SENDSTALL) | ||
| 829 | goto done; | ||
| 830 | } | ||
| 831 | |||
| 832 | |||
| 833 | /* analyze request if the ep is hot */ | ||
| 834 | if (request) | ||
| 835 | rxstate(musb, to_musb_request(request)); | ||
| 836 | else | ||
| 837 | DBG(3, "packet waiting for %s%s request\n", | ||
| 838 | musb_ep->desc ? "" : "inactive ", | ||
| 839 | musb_ep->end_point.name); | ||
| 840 | |||
| 841 | done: | ||
| 842 | return; | ||
| 843 | } | ||
| 844 | |||
| 845 | /* ------------------------------------------------------------ */ | ||
| 846 | |||
| 847 | static int musb_gadget_enable(struct usb_ep *ep, | ||
| 848 | const struct usb_endpoint_descriptor *desc) | ||
| 849 | { | ||
| 850 | unsigned long flags; | ||
| 851 | struct musb_ep *musb_ep; | ||
| 852 | struct musb_hw_ep *hw_ep; | ||
| 853 | void __iomem *regs; | ||
| 854 | struct musb *musb; | ||
| 855 | void __iomem *mbase; | ||
| 856 | u8 epnum; | ||
| 857 | u16 csr; | ||
| 858 | unsigned tmp; | ||
| 859 | int status = -EINVAL; | ||
| 860 | |||
| 861 | if (!ep || !desc) | ||
| 862 | return -EINVAL; | ||
| 863 | |||
| 864 | musb_ep = to_musb_ep(ep); | ||
| 865 | hw_ep = musb_ep->hw_ep; | ||
| 866 | regs = hw_ep->regs; | ||
| 867 | musb = musb_ep->musb; | ||
| 868 | mbase = musb->mregs; | ||
| 869 | epnum = musb_ep->current_epnum; | ||
| 870 | |||
| 871 | spin_lock_irqsave(&musb->lock, flags); | ||
| 872 | |||
| 873 | if (musb_ep->desc) { | ||
| 874 | status = -EBUSY; | ||
| 875 | goto fail; | ||
| 876 | } | ||
| 877 | musb_ep->type = desc->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK; | ||
| 878 | |||
| 879 | /* check direction and (later) maxpacket size against endpoint */ | ||
| 880 | if ((desc->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK) != epnum) | ||
| 881 | goto fail; | ||
| 882 | |||
| 883 | /* REVISIT this rules out high bandwidth periodic transfers */ | ||
| 884 | tmp = le16_to_cpu(desc->wMaxPacketSize); | ||
| 885 | if (tmp & ~0x07ff) | ||
| 886 | goto fail; | ||
| 887 | musb_ep->packet_sz = tmp; | ||
| 888 | |||
| 889 | /* enable the interrupts for the endpoint, set the endpoint | ||
| 890 | * packet size (or fail), set the mode, clear the fifo | ||
| 891 | */ | ||
| 892 | musb_ep_select(mbase, epnum); | ||
| 893 | if (desc->bEndpointAddress & USB_DIR_IN) { | ||
| 894 | u16 int_txe = musb_readw(mbase, MUSB_INTRTXE); | ||
| 895 | |||
| 896 | if (hw_ep->is_shared_fifo) | ||
| 897 | musb_ep->is_in = 1; | ||
| 898 | if (!musb_ep->is_in) | ||
| 899 | goto fail; | ||
| 900 | if (tmp > hw_ep->max_packet_sz_tx) | ||
| 901 | goto fail; | ||
| 902 | |||
| 903 | int_txe |= (1 << epnum); | ||
| 904 | musb_writew(mbase, MUSB_INTRTXE, int_txe); | ||
| 905 | |||
| 906 | /* REVISIT if can_bulk_split(), use by updating "tmp"; | ||
| 907 | * likewise high bandwidth periodic tx | ||
| 908 | */ | ||
| 909 | musb_writew(regs, MUSB_TXMAXP, tmp); | ||
| 910 | |||
| 911 | csr = MUSB_TXCSR_MODE | MUSB_TXCSR_CLRDATATOG; | ||
| 912 | if (musb_readw(regs, MUSB_TXCSR) | ||
| 913 | & MUSB_TXCSR_FIFONOTEMPTY) | ||
| 914 | csr |= MUSB_TXCSR_FLUSHFIFO; | ||
| 915 | if (musb_ep->type == USB_ENDPOINT_XFER_ISOC) | ||
| 916 | csr |= MUSB_TXCSR_P_ISO; | ||
| 917 | |||
| 918 | /* set twice in case of double buffering */ | ||
| 919 | musb_writew(regs, MUSB_TXCSR, csr); | ||
| 920 | /* REVISIT may be inappropriate w/o FIFONOTEMPTY ... */ | ||
| 921 | musb_writew(regs, MUSB_TXCSR, csr); | ||
| 922 | |||
| 923 | } else { | ||
| 924 | u16 int_rxe = musb_readw(mbase, MUSB_INTRRXE); | ||
| 925 | |||
| 926 | if (hw_ep->is_shared_fifo) | ||
| 927 | musb_ep->is_in = 0; | ||
| 928 | if (musb_ep->is_in) | ||
| 929 | goto fail; | ||
| 930 | if (tmp > hw_ep->max_packet_sz_rx) | ||
| 931 | goto fail; | ||
| 932 | |||
| 933 | int_rxe |= (1 << epnum); | ||
| 934 | musb_writew(mbase, MUSB_INTRRXE, int_rxe); | ||
| 935 | |||
| 936 | /* REVISIT if can_bulk_combine() use by updating "tmp" | ||
| 937 | * likewise high bandwidth periodic rx | ||
| 938 | */ | ||
| 939 | musb_writew(regs, MUSB_RXMAXP, tmp); | ||
| 940 | |||
| 941 | /* force shared fifo to OUT-only mode */ | ||
| 942 | if (hw_ep->is_shared_fifo) { | ||
| 943 | csr = musb_readw(regs, MUSB_TXCSR); | ||
| 944 | csr &= ~(MUSB_TXCSR_MODE | MUSB_TXCSR_TXPKTRDY); | ||
| 945 | musb_writew(regs, MUSB_TXCSR, csr); | ||
| 946 | } | ||
| 947 | |||
| 948 | csr = MUSB_RXCSR_FLUSHFIFO | MUSB_RXCSR_CLRDATATOG; | ||
| 949 | if (musb_ep->type == USB_ENDPOINT_XFER_ISOC) | ||
| 950 | csr |= MUSB_RXCSR_P_ISO; | ||
| 951 | else if (musb_ep->type == USB_ENDPOINT_XFER_INT) | ||
| 952 | csr |= MUSB_RXCSR_DISNYET; | ||
| 953 | |||
| 954 | /* set twice in case of double buffering */ | ||
| 955 | musb_writew(regs, MUSB_RXCSR, csr); | ||
| 956 | musb_writew(regs, MUSB_RXCSR, csr); | ||
| 957 | } | ||
| 958 | |||
| 959 | /* NOTE: all the I/O code _should_ work fine without DMA, in case | ||
| 960 | * for some reason you run out of channels here. | ||
| 961 | */ | ||
| 962 | if (is_dma_capable() && musb->dma_controller) { | ||
| 963 | struct dma_controller *c = musb->dma_controller; | ||
| 964 | |||
| 965 | musb_ep->dma = c->channel_alloc(c, hw_ep, | ||
| 966 | (desc->bEndpointAddress & USB_DIR_IN)); | ||
| 967 | } else | ||
| 968 | musb_ep->dma = NULL; | ||
| 969 | |||
| 970 | musb_ep->desc = desc; | ||
| 971 | musb_ep->busy = 0; | ||
| 972 | status = 0; | ||
| 973 | |||
| 974 | pr_debug("%s periph: enabled %s for %s %s, %smaxpacket %d\n", | ||
| 975 | musb_driver_name, musb_ep->end_point.name, | ||
| 976 | ({ char *s; switch (musb_ep->type) { | ||
| 977 | case USB_ENDPOINT_XFER_BULK: s = "bulk"; break; | ||
| 978 | case USB_ENDPOINT_XFER_INT: s = "int"; break; | ||
| 979 | default: s = "iso"; break; | ||
| 980 | }; s; }), | ||
| 981 | musb_ep->is_in ? "IN" : "OUT", | ||
| 982 | musb_ep->dma ? "dma, " : "", | ||
| 983 | musb_ep->packet_sz); | ||
| 984 | |||
| 985 | schedule_work(&musb->irq_work); | ||
| 986 | |||
| 987 | fail: | ||
| 988 | spin_unlock_irqrestore(&musb->lock, flags); | ||
| 989 | return status; | ||
| 990 | } | ||
| 991 | |||
| 992 | /* | ||
| 993 | * Disable an endpoint flushing all requests queued. | ||
| 994 | */ | ||
| 995 | static int musb_gadget_disable(struct usb_ep *ep) | ||
| 996 | { | ||
| 997 | unsigned long flags; | ||
| 998 | struct musb *musb; | ||
| 999 | u8 epnum; | ||
| 1000 | struct musb_ep *musb_ep; | ||
| 1001 | void __iomem *epio; | ||
| 1002 | int status = 0; | ||
| 1003 | |||
| 1004 | musb_ep = to_musb_ep(ep); | ||
| 1005 | musb = musb_ep->musb; | ||
| 1006 | epnum = musb_ep->current_epnum; | ||
| 1007 | epio = musb->endpoints[epnum].regs; | ||
| 1008 | |||
| 1009 | spin_lock_irqsave(&musb->lock, flags); | ||
| 1010 | musb_ep_select(musb->mregs, epnum); | ||
| 1011 | |||
| 1012 | /* zero the endpoint sizes */ | ||
| 1013 | if (musb_ep->is_in) { | ||
| 1014 | u16 int_txe = musb_readw(musb->mregs, MUSB_INTRTXE); | ||
| 1015 | int_txe &= ~(1 << epnum); | ||
| 1016 | musb_writew(musb->mregs, MUSB_INTRTXE, int_txe); | ||
| 1017 | musb_writew(epio, MUSB_TXMAXP, 0); | ||
| 1018 | } else { | ||
| 1019 | u16 int_rxe = musb_readw(musb->mregs, MUSB_INTRRXE); | ||
| 1020 | int_rxe &= ~(1 << epnum); | ||
| 1021 | musb_writew(musb->mregs, MUSB_INTRRXE, int_rxe); | ||
| 1022 | musb_writew(epio, MUSB_RXMAXP, 0); | ||
| 1023 | } | ||
| 1024 | |||
| 1025 | musb_ep->desc = NULL; | ||
| 1026 | |||
| 1027 | /* abort all pending DMA and requests */ | ||
| 1028 | nuke(musb_ep, -ESHUTDOWN); | ||
| 1029 | |||
| 1030 | schedule_work(&musb->irq_work); | ||
| 1031 | |||
| 1032 | spin_unlock_irqrestore(&(musb->lock), flags); | ||
| 1033 | |||
| 1034 | DBG(2, "%s\n", musb_ep->end_point.name); | ||
| 1035 | |||
| 1036 | return status; | ||
| 1037 | } | ||
| 1038 | |||
| 1039 | /* | ||
| 1040 | * Allocate a request for an endpoint. | ||
| 1041 | * Reused by ep0 code. | ||
| 1042 | */ | ||
| 1043 | struct usb_request *musb_alloc_request(struct usb_ep *ep, gfp_t gfp_flags) | ||
| 1044 | { | ||
| 1045 | struct musb_ep *musb_ep = to_musb_ep(ep); | ||
| 1046 | struct musb_request *request = NULL; | ||
| 1047 | |||
| 1048 | request = kzalloc(sizeof *request, gfp_flags); | ||
| 1049 | if (request) { | ||
| 1050 | INIT_LIST_HEAD(&request->request.list); | ||
| 1051 | request->request.dma = DMA_ADDR_INVALID; | ||
| 1052 | request->epnum = musb_ep->current_epnum; | ||
| 1053 | request->ep = musb_ep; | ||
| 1054 | } | ||
| 1055 | |||
| 1056 | return &request->request; | ||
| 1057 | } | ||
| 1058 | |||
| 1059 | /* | ||
| 1060 | * Free a request | ||
| 1061 | * Reused by ep0 code. | ||
| 1062 | */ | ||
| 1063 | void musb_free_request(struct usb_ep *ep, struct usb_request *req) | ||
| 1064 | { | ||
| 1065 | kfree(to_musb_request(req)); | ||
| 1066 | } | ||
| 1067 | |||
| 1068 | static LIST_HEAD(buffers); | ||
| 1069 | |||
| 1070 | struct free_record { | ||
| 1071 | struct list_head list; | ||
| 1072 | struct device *dev; | ||
| 1073 | unsigned bytes; | ||
| 1074 | dma_addr_t dma; | ||
| 1075 | }; | ||
| 1076 | |||
| 1077 | /* | ||
| 1078 | * Context: controller locked, IRQs blocked. | ||
| 1079 | */ | ||
| 1080 | static void musb_ep_restart(struct musb *musb, struct musb_request *req) | ||
| 1081 | { | ||
| 1082 | DBG(3, "<== %s request %p len %u on hw_ep%d\n", | ||
| 1083 | req->tx ? "TX/IN" : "RX/OUT", | ||
| 1084 | &req->request, req->request.length, req->epnum); | ||
| 1085 | |||
| 1086 | musb_ep_select(musb->mregs, req->epnum); | ||
| 1087 | if (req->tx) | ||
| 1088 | txstate(musb, req); | ||
| 1089 | else | ||
| 1090 | rxstate(musb, req); | ||
| 1091 | } | ||
| 1092 | |||
| 1093 | static int musb_gadget_queue(struct usb_ep *ep, struct usb_request *req, | ||
| 1094 | gfp_t gfp_flags) | ||
| 1095 | { | ||
| 1096 | struct musb_ep *musb_ep; | ||
| 1097 | struct musb_request *request; | ||
| 1098 | struct musb *musb; | ||
| 1099 | int status = 0; | ||
| 1100 | unsigned long lockflags; | ||
| 1101 | |||
| 1102 | if (!ep || !req) | ||
| 1103 | return -EINVAL; | ||
| 1104 | if (!req->buf) | ||
| 1105 | return -ENODATA; | ||
| 1106 | |||
| 1107 | musb_ep = to_musb_ep(ep); | ||
| 1108 | musb = musb_ep->musb; | ||
| 1109 | |||
| 1110 | request = to_musb_request(req); | ||
| 1111 | request->musb = musb; | ||
| 1112 | |||
| 1113 | if (request->ep != musb_ep) | ||
| 1114 | return -EINVAL; | ||
| 1115 | |||
| 1116 | DBG(4, "<== to %s request=%p\n", ep->name, req); | ||
| 1117 | |||
| 1118 | /* request is mine now... */ | ||
| 1119 | request->request.actual = 0; | ||
| 1120 | request->request.status = -EINPROGRESS; | ||
| 1121 | request->epnum = musb_ep->current_epnum; | ||
| 1122 | request->tx = musb_ep->is_in; | ||
| 1123 | |||
| 1124 | if (is_dma_capable() && musb_ep->dma) { | ||
| 1125 | if (request->request.dma == DMA_ADDR_INVALID) { | ||
| 1126 | request->request.dma = dma_map_single( | ||
| 1127 | musb->controller, | ||
| 1128 | request->request.buf, | ||
| 1129 | request->request.length, | ||
| 1130 | request->tx | ||
| 1131 | ? DMA_TO_DEVICE | ||
| 1132 | : DMA_FROM_DEVICE); | ||
| 1133 | request->mapped = 1; | ||
| 1134 | } else { | ||
| 1135 | dma_sync_single_for_device(musb->controller, | ||
| 1136 | request->request.dma, | ||
| 1137 | request->request.length, | ||
| 1138 | request->tx | ||
| 1139 | ? DMA_TO_DEVICE | ||
| 1140 | : DMA_FROM_DEVICE); | ||
| 1141 | request->mapped = 0; | ||
| 1142 | } | ||
| 1143 | } else if (!req->buf) { | ||
| 1144 | return -ENODATA; | ||
| 1145 | } else | ||
| 1146 | request->mapped = 0; | ||
| 1147 | |||
| 1148 | spin_lock_irqsave(&musb->lock, lockflags); | ||
| 1149 | |||
| 1150 | /* don't queue if the ep is down */ | ||
| 1151 | if (!musb_ep->desc) { | ||
| 1152 | DBG(4, "req %p queued to %s while ep %s\n", | ||
| 1153 | req, ep->name, "disabled"); | ||
| 1154 | status = -ESHUTDOWN; | ||
| 1155 | goto cleanup; | ||
| 1156 | } | ||
| 1157 | |||
| 1158 | /* add request to the list */ | ||
| 1159 | list_add_tail(&(request->request.list), &(musb_ep->req_list)); | ||
| 1160 | |||
| 1161 | /* it this is the head of the queue, start i/o ... */ | ||
| 1162 | if (!musb_ep->busy && &request->request.list == musb_ep->req_list.next) | ||
| 1163 | musb_ep_restart(musb, request); | ||
| 1164 | |||
| 1165 | cleanup: | ||
| 1166 | spin_unlock_irqrestore(&musb->lock, lockflags); | ||
| 1167 | return status; | ||
| 1168 | } | ||
| 1169 | |||
| 1170 | static int musb_gadget_dequeue(struct usb_ep *ep, struct usb_request *request) | ||
| 1171 | { | ||
| 1172 | struct musb_ep *musb_ep = to_musb_ep(ep); | ||
| 1173 | struct usb_request *r; | ||
| 1174 | unsigned long flags; | ||
| 1175 | int status = 0; | ||
| 1176 | struct musb *musb = musb_ep->musb; | ||
| 1177 | |||
| 1178 | if (!ep || !request || to_musb_request(request)->ep != musb_ep) | ||
| 1179 | return -EINVAL; | ||
| 1180 | |||
| 1181 | spin_lock_irqsave(&musb->lock, flags); | ||
| 1182 | |||
| 1183 | list_for_each_entry(r, &musb_ep->req_list, list) { | ||
| 1184 | if (r == request) | ||
| 1185 | break; | ||
| 1186 | } | ||
| 1187 | if (r != request) { | ||
| 1188 | DBG(3, "request %p not queued to %s\n", request, ep->name); | ||
| 1189 | status = -EINVAL; | ||
| 1190 | goto done; | ||
| 1191 | } | ||
| 1192 | |||
| 1193 | /* if the hardware doesn't have the request, easy ... */ | ||
| 1194 | if (musb_ep->req_list.next != &request->list || musb_ep->busy) | ||
| 1195 | musb_g_giveback(musb_ep, request, -ECONNRESET); | ||
| 1196 | |||
| 1197 | /* ... else abort the dma transfer ... */ | ||
| 1198 | else if (is_dma_capable() && musb_ep->dma) { | ||
| 1199 | struct dma_controller *c = musb->dma_controller; | ||
| 1200 | |||
| 1201 | musb_ep_select(musb->mregs, musb_ep->current_epnum); | ||
| 1202 | if (c->channel_abort) | ||
| 1203 | status = c->channel_abort(musb_ep->dma); | ||
| 1204 | else | ||
| 1205 | status = -EBUSY; | ||
| 1206 | if (status == 0) | ||
| 1207 | musb_g_giveback(musb_ep, request, -ECONNRESET); | ||
| 1208 | } else { | ||
| 1209 | /* NOTE: by sticking to easily tested hardware/driver states, | ||
| 1210 | * we leave counting of in-flight packets imprecise. | ||
| 1211 | */ | ||
| 1212 | musb_g_giveback(musb_ep, request, -ECONNRESET); | ||
| 1213 | } | ||
| 1214 | |||
| 1215 | done: | ||
| 1216 | spin_unlock_irqrestore(&musb->lock, flags); | ||
| 1217 | return status; | ||
| 1218 | } | ||
| 1219 | |||
| 1220 | /* | ||
| 1221 | * Set or clear the halt bit of an endpoint. A halted enpoint won't tx/rx any | ||
| 1222 | * data but will queue requests. | ||
| 1223 | * | ||
| 1224 | * exported to ep0 code | ||
| 1225 | */ | ||
| 1226 | int musb_gadget_set_halt(struct usb_ep *ep, int value) | ||
| 1227 | { | ||
| 1228 | struct musb_ep *musb_ep = to_musb_ep(ep); | ||
| 1229 | u8 epnum = musb_ep->current_epnum; | ||
| 1230 | struct musb *musb = musb_ep->musb; | ||
| 1231 | void __iomem *epio = musb->endpoints[epnum].regs; | ||
| 1232 | void __iomem *mbase; | ||
| 1233 | unsigned long flags; | ||
| 1234 | u16 csr; | ||
| 1235 | struct musb_request *request = NULL; | ||
| 1236 | int status = 0; | ||
| 1237 | |||
| 1238 | if (!ep) | ||
| 1239 | return -EINVAL; | ||
| 1240 | mbase = musb->mregs; | ||
| 1241 | |||
| 1242 | spin_lock_irqsave(&musb->lock, flags); | ||
| 1243 | |||
| 1244 | if ((USB_ENDPOINT_XFER_ISOC == musb_ep->type)) { | ||
| 1245 | status = -EINVAL; | ||
| 1246 | goto done; | ||
| 1247 | } | ||
| 1248 | |||
| 1249 | musb_ep_select(mbase, epnum); | ||
| 1250 | |||
| 1251 | /* cannot portably stall with non-empty FIFO */ | ||
| 1252 | request = to_musb_request(next_request(musb_ep)); | ||
| 1253 | if (value && musb_ep->is_in) { | ||
| 1254 | csr = musb_readw(epio, MUSB_TXCSR); | ||
| 1255 | if (csr & MUSB_TXCSR_FIFONOTEMPTY) { | ||
| 1256 | DBG(3, "%s fifo busy, cannot halt\n", ep->name); | ||
| 1257 | spin_unlock_irqrestore(&musb->lock, flags); | ||
| 1258 | return -EAGAIN; | ||
| 1259 | } | ||
| 1260 | |||
| 1261 | } | ||
| 1262 | |||
| 1263 | /* set/clear the stall and toggle bits */ | ||
| 1264 | DBG(2, "%s: %s stall\n", ep->name, value ? "set" : "clear"); | ||
| 1265 | if (musb_ep->is_in) { | ||
| 1266 | csr = musb_readw(epio, MUSB_TXCSR); | ||
| 1267 | if (csr & MUSB_TXCSR_FIFONOTEMPTY) | ||
| 1268 | csr |= MUSB_TXCSR_FLUSHFIFO; | ||
| 1269 | csr |= MUSB_TXCSR_P_WZC_BITS | ||
| 1270 | | MUSB_TXCSR_CLRDATATOG; | ||
| 1271 | if (value) | ||
| 1272 | csr |= MUSB_TXCSR_P_SENDSTALL; | ||
| 1273 | else | ||
| 1274 | csr &= ~(MUSB_TXCSR_P_SENDSTALL | ||
| 1275 | | MUSB_TXCSR_P_SENTSTALL); | ||
| 1276 | csr &= ~MUSB_TXCSR_TXPKTRDY; | ||
| 1277 | musb_writew(epio, MUSB_TXCSR, csr); | ||
| 1278 | } else { | ||
| 1279 | csr = musb_readw(epio, MUSB_RXCSR); | ||
| 1280 | csr |= MUSB_RXCSR_P_WZC_BITS | ||
| 1281 | | MUSB_RXCSR_FLUSHFIFO | ||
| 1282 | | MUSB_RXCSR_CLRDATATOG; | ||
| 1283 | if (value) | ||
| 1284 | csr |= MUSB_RXCSR_P_SENDSTALL; | ||
| 1285 | else | ||
| 1286 | csr &= ~(MUSB_RXCSR_P_SENDSTALL | ||
| 1287 | | MUSB_RXCSR_P_SENTSTALL); | ||
| 1288 | musb_writew(epio, MUSB_RXCSR, csr); | ||
| 1289 | } | ||
| 1290 | |||
| 1291 | done: | ||
| 1292 | |||
| 1293 | /* maybe start the first request in the queue */ | ||
| 1294 | if (!musb_ep->busy && !value && request) { | ||
| 1295 | DBG(3, "restarting the request\n"); | ||
| 1296 | musb_ep_restart(musb, request); | ||
| 1297 | } | ||
| 1298 | |||
| 1299 | spin_unlock_irqrestore(&musb->lock, flags); | ||
| 1300 | return status; | ||
| 1301 | } | ||
| 1302 | |||
| 1303 | static int musb_gadget_fifo_status(struct usb_ep *ep) | ||
| 1304 | { | ||
| 1305 | struct musb_ep *musb_ep = to_musb_ep(ep); | ||
| 1306 | void __iomem *epio = musb_ep->hw_ep->regs; | ||
| 1307 | int retval = -EINVAL; | ||
| 1308 | |||
| 1309 | if (musb_ep->desc && !musb_ep->is_in) { | ||
| 1310 | struct musb *musb = musb_ep->musb; | ||
| 1311 | int epnum = musb_ep->current_epnum; | ||
| 1312 | void __iomem *mbase = musb->mregs; | ||
| 1313 | unsigned long flags; | ||
| 1314 | |||
| 1315 | spin_lock_irqsave(&musb->lock, flags); | ||
| 1316 | |||
| 1317 | musb_ep_select(mbase, epnum); | ||
| 1318 | /* FIXME return zero unless RXPKTRDY is set */ | ||
| 1319 | retval = musb_readw(epio, MUSB_RXCOUNT); | ||
| 1320 | |||
| 1321 | spin_unlock_irqrestore(&musb->lock, flags); | ||
| 1322 | } | ||
| 1323 | return retval; | ||
| 1324 | } | ||
| 1325 | |||
| 1326 | static void musb_gadget_fifo_flush(struct usb_ep *ep) | ||
| 1327 | { | ||
| 1328 | struct musb_ep *musb_ep = to_musb_ep(ep); | ||
| 1329 | struct musb *musb = musb_ep->musb; | ||
| 1330 | u8 epnum = musb_ep->current_epnum; | ||
| 1331 | void __iomem *epio = musb->endpoints[epnum].regs; | ||
| 1332 | void __iomem *mbase; | ||
| 1333 | unsigned long flags; | ||
| 1334 | u16 csr, int_txe; | ||
| 1335 | |||
| 1336 | mbase = musb->mregs; | ||
| 1337 | |||
| 1338 | spin_lock_irqsave(&musb->lock, flags); | ||
| 1339 | musb_ep_select(mbase, (u8) epnum); | ||
| 1340 | |||
| 1341 | /* disable interrupts */ | ||
| 1342 | int_txe = musb_readw(mbase, MUSB_INTRTXE); | ||
| 1343 | musb_writew(mbase, MUSB_INTRTXE, int_txe & ~(1 << epnum)); | ||
| 1344 | |||
| 1345 | if (musb_ep->is_in) { | ||
| 1346 | csr = musb_readw(epio, MUSB_TXCSR); | ||
| 1347 | if (csr & MUSB_TXCSR_FIFONOTEMPTY) { | ||
| 1348 | csr |= MUSB_TXCSR_FLUSHFIFO | MUSB_TXCSR_P_WZC_BITS; | ||
| 1349 | musb_writew(epio, MUSB_TXCSR, csr); | ||
| 1350 | /* REVISIT may be inappropriate w/o FIFONOTEMPTY ... */ | ||
| 1351 | musb_writew(epio, MUSB_TXCSR, csr); | ||
| 1352 | } | ||
| 1353 | } else { | ||
| 1354 | csr = musb_readw(epio, MUSB_RXCSR); | ||
| 1355 | csr |= MUSB_RXCSR_FLUSHFIFO | MUSB_RXCSR_P_WZC_BITS; | ||
| 1356 | musb_writew(epio, MUSB_RXCSR, csr); | ||
| 1357 | musb_writew(epio, MUSB_RXCSR, csr); | ||
| 1358 | } | ||
| 1359 | |||
| 1360 | /* re-enable interrupt */ | ||
| 1361 | musb_writew(mbase, MUSB_INTRTXE, int_txe); | ||
| 1362 | spin_unlock_irqrestore(&musb->lock, flags); | ||
| 1363 | } | ||
| 1364 | |||
| 1365 | static const struct usb_ep_ops musb_ep_ops = { | ||
| 1366 | .enable = musb_gadget_enable, | ||
| 1367 | .disable = musb_gadget_disable, | ||
| 1368 | .alloc_request = musb_alloc_request, | ||
| 1369 | .free_request = musb_free_request, | ||
| 1370 | .queue = musb_gadget_queue, | ||
| 1371 | .dequeue = musb_gadget_dequeue, | ||
| 1372 | .set_halt = musb_gadget_set_halt, | ||
| 1373 | .fifo_status = musb_gadget_fifo_status, | ||
| 1374 | .fifo_flush = musb_gadget_fifo_flush | ||
| 1375 | }; | ||
| 1376 | |||
| 1377 | /* ----------------------------------------------------------------------- */ | ||
| 1378 | |||
| 1379 | static int musb_gadget_get_frame(struct usb_gadget *gadget) | ||
| 1380 | { | ||
| 1381 | struct musb *musb = gadget_to_musb(gadget); | ||
| 1382 | |||
| 1383 | return (int)musb_readw(musb->mregs, MUSB_FRAME); | ||
| 1384 | } | ||
| 1385 | |||
| 1386 | static int musb_gadget_wakeup(struct usb_gadget *gadget) | ||
| 1387 | { | ||
| 1388 | struct musb *musb = gadget_to_musb(gadget); | ||
| 1389 | void __iomem *mregs = musb->mregs; | ||
| 1390 | unsigned long flags; | ||
| 1391 | int status = -EINVAL; | ||
| 1392 | u8 power, devctl; | ||
| 1393 | int retries; | ||
| 1394 | |||
| 1395 | spin_lock_irqsave(&musb->lock, flags); | ||
| 1396 | |||
| 1397 | switch (musb->xceiv.state) { | ||
| 1398 | case OTG_STATE_B_PERIPHERAL: | ||
| 1399 | /* NOTE: OTG state machine doesn't include B_SUSPENDED; | ||
| 1400 | * that's part of the standard usb 1.1 state machine, and | ||
| 1401 | * doesn't affect OTG transitions. | ||
| 1402 | */ | ||
| 1403 | if (musb->may_wakeup && musb->is_suspended) | ||
| 1404 | break; | ||
| 1405 | goto done; | ||
| 1406 | case OTG_STATE_B_IDLE: | ||
| 1407 | /* Start SRP ... OTG not required. */ | ||
| 1408 | devctl = musb_readb(mregs, MUSB_DEVCTL); | ||
| 1409 | DBG(2, "Sending SRP: devctl: %02x\n", devctl); | ||
| 1410 | devctl |= MUSB_DEVCTL_SESSION; | ||
| 1411 | musb_writeb(mregs, MUSB_DEVCTL, devctl); | ||
| 1412 | devctl = musb_readb(mregs, MUSB_DEVCTL); | ||
| 1413 | retries = 100; | ||
| 1414 | while (!(devctl & MUSB_DEVCTL_SESSION)) { | ||
| 1415 | devctl = musb_readb(mregs, MUSB_DEVCTL); | ||
| 1416 | if (retries-- < 1) | ||
| 1417 | break; | ||
| 1418 | } | ||
| 1419 | retries = 10000; | ||
| 1420 | while (devctl & MUSB_DEVCTL_SESSION) { | ||
| 1421 | devctl = musb_readb(mregs, MUSB_DEVCTL); | ||
| 1422 | if (retries-- < 1) | ||
| 1423 | break; | ||
| 1424 | } | ||
| 1425 | |||
| 1426 | /* Block idling for at least 1s */ | ||
| 1427 | musb_platform_try_idle(musb, | ||
| 1428 | jiffies + msecs_to_jiffies(1 * HZ)); | ||
| 1429 | |||
| 1430 | status = 0; | ||
| 1431 | goto done; | ||
| 1432 | default: | ||
| 1433 | DBG(2, "Unhandled wake: %s\n", otg_state_string(musb)); | ||
| 1434 | goto done; | ||
| 1435 | } | ||
| 1436 | |||
| 1437 | status = 0; | ||
| 1438 | |||
| 1439 | power = musb_readb(mregs, MUSB_POWER); | ||
| 1440 | power |= MUSB_POWER_RESUME; | ||
| 1441 | musb_writeb(mregs, MUSB_POWER, power); | ||
| 1442 | DBG(2, "issue wakeup\n"); | ||
| 1443 | |||
| 1444 | /* FIXME do this next chunk in a timer callback, no udelay */ | ||
| 1445 | mdelay(2); | ||
| 1446 | |||
| 1447 | power = musb_readb(mregs, MUSB_POWER); | ||
| 1448 | power &= ~MUSB_POWER_RESUME; | ||
| 1449 | musb_writeb(mregs, MUSB_POWER, power); | ||
| 1450 | done: | ||
| 1451 | spin_unlock_irqrestore(&musb->lock, flags); | ||
| 1452 | return status; | ||
| 1453 | } | ||
| 1454 | |||
| 1455 | static int | ||
| 1456 | musb_gadget_set_self_powered(struct usb_gadget *gadget, int is_selfpowered) | ||
| 1457 | { | ||
| 1458 | struct musb *musb = gadget_to_musb(gadget); | ||
| 1459 | |||
| 1460 | musb->is_self_powered = !!is_selfpowered; | ||
| 1461 | return 0; | ||
| 1462 | } | ||
| 1463 | |||
| 1464 | static void musb_pullup(struct musb *musb, int is_on) | ||
| 1465 | { | ||
| 1466 | u8 power; | ||
| 1467 | |||
| 1468 | power = musb_readb(musb->mregs, MUSB_POWER); | ||
| 1469 | if (is_on) | ||
| 1470 | power |= MUSB_POWER_SOFTCONN; | ||
| 1471 | else | ||
| 1472 | power &= ~MUSB_POWER_SOFTCONN; | ||
| 1473 | |||
| 1474 | /* FIXME if on, HdrcStart; if off, HdrcStop */ | ||
| 1475 | |||
| 1476 | DBG(3, "gadget %s D+ pullup %s\n", | ||
| 1477 | musb->gadget_driver->function, is_on ? "on" : "off"); | ||
| 1478 | musb_writeb(musb->mregs, MUSB_POWER, power); | ||
| 1479 | } | ||
| 1480 | |||
| 1481 | #if 0 | ||
| 1482 | static int musb_gadget_vbus_session(struct usb_gadget *gadget, int is_active) | ||
| 1483 | { | ||
| 1484 | DBG(2, "<= %s =>\n", __func__); | ||
| 1485 | |||
| 1486 | /* | ||
| 1487 | * FIXME iff driver's softconnect flag is set (as it is during probe, | ||
| 1488 | * though that can clear it), just musb_pullup(). | ||
| 1489 | */ | ||
| 1490 | |||
| 1491 | return -EINVAL; | ||
| 1492 | } | ||
| 1493 | #endif | ||
| 1494 | |||
| 1495 | static int musb_gadget_vbus_draw(struct usb_gadget *gadget, unsigned mA) | ||
| 1496 | { | ||
| 1497 | struct musb *musb = gadget_to_musb(gadget); | ||
| 1498 | |||
| 1499 | if (!musb->xceiv.set_power) | ||
| 1500 | return -EOPNOTSUPP; | ||
| 1501 | return otg_set_power(&musb->xceiv, mA); | ||
| 1502 | } | ||
| 1503 | |||
| 1504 | static int musb_gadget_pullup(struct usb_gadget *gadget, int is_on) | ||
| 1505 | { | ||
| 1506 | struct musb *musb = gadget_to_musb(gadget); | ||
| 1507 | unsigned long flags; | ||
| 1508 | |||
| 1509 | is_on = !!is_on; | ||
| 1510 | |||
| 1511 | /* NOTE: this assumes we are sensing vbus; we'd rather | ||
| 1512 | * not pullup unless the B-session is active. | ||
| 1513 | */ | ||
| 1514 | spin_lock_irqsave(&musb->lock, flags); | ||
| 1515 | if (is_on != musb->softconnect) { | ||
| 1516 | musb->softconnect = is_on; | ||
| 1517 | musb_pullup(musb, is_on); | ||
| 1518 | } | ||
| 1519 | spin_unlock_irqrestore(&musb->lock, flags); | ||
| 1520 | return 0; | ||
| 1521 | } | ||
| 1522 | |||
| 1523 | static const struct usb_gadget_ops musb_gadget_operations = { | ||
| 1524 | .get_frame = musb_gadget_get_frame, | ||
| 1525 | .wakeup = musb_gadget_wakeup, | ||
| 1526 | .set_selfpowered = musb_gadget_set_self_powered, | ||
| 1527 | /* .vbus_session = musb_gadget_vbus_session, */ | ||
| 1528 | .vbus_draw = musb_gadget_vbus_draw, | ||
| 1529 | .pullup = musb_gadget_pullup, | ||
| 1530 | }; | ||
| 1531 | |||
| 1532 | /* ----------------------------------------------------------------------- */ | ||
| 1533 | |||
| 1534 | /* Registration */ | ||
| 1535 | |||
| 1536 | /* Only this registration code "knows" the rule (from USB standards) | ||
| 1537 | * about there being only one external upstream port. It assumes | ||
| 1538 | * all peripheral ports are external... | ||
| 1539 | */ | ||
| 1540 | static struct musb *the_gadget; | ||
| 1541 | |||
| 1542 | static void musb_gadget_release(struct device *dev) | ||
| 1543 | { | ||
| 1544 | /* kref_put(WHAT) */ | ||
| 1545 | dev_dbg(dev, "%s\n", __func__); | ||
| 1546 | } | ||
| 1547 | |||
| 1548 | |||
| 1549 | static void __init | ||
| 1550 | init_peripheral_ep(struct musb *musb, struct musb_ep *ep, u8 epnum, int is_in) | ||
| 1551 | { | ||
| 1552 | struct musb_hw_ep *hw_ep = musb->endpoints + epnum; | ||
| 1553 | |||
| 1554 | memset(ep, 0, sizeof *ep); | ||
| 1555 | |||
| 1556 | ep->current_epnum = epnum; | ||
| 1557 | ep->musb = musb; | ||
| 1558 | ep->hw_ep = hw_ep; | ||
| 1559 | ep->is_in = is_in; | ||
| 1560 | |||
| 1561 | INIT_LIST_HEAD(&ep->req_list); | ||
| 1562 | |||
| 1563 | sprintf(ep->name, "ep%d%s", epnum, | ||
| 1564 | (!epnum || hw_ep->is_shared_fifo) ? "" : ( | ||
| 1565 | is_in ? "in" : "out")); | ||
| 1566 | ep->end_point.name = ep->name; | ||
| 1567 | INIT_LIST_HEAD(&ep->end_point.ep_list); | ||
| 1568 | if (!epnum) { | ||
| 1569 | ep->end_point.maxpacket = 64; | ||
| 1570 | ep->end_point.ops = &musb_g_ep0_ops; | ||
| 1571 | musb->g.ep0 = &ep->end_point; | ||
| 1572 | } else { | ||
| 1573 | if (is_in) | ||
| 1574 | ep->end_point.maxpacket = hw_ep->max_packet_sz_tx; | ||
| 1575 | else | ||
| 1576 | ep->end_point.maxpacket = hw_ep->max_packet_sz_rx; | ||
| 1577 | ep->end_point.ops = &musb_ep_ops; | ||
| 1578 | list_add_tail(&ep->end_point.ep_list, &musb->g.ep_list); | ||
| 1579 | } | ||
| 1580 | } | ||
| 1581 | |||
| 1582 | /* | ||
| 1583 | * Initialize the endpoints exposed to peripheral drivers, with backlinks | ||
| 1584 | * to the rest of the driver state. | ||
| 1585 | */ | ||
| 1586 | static inline void __init musb_g_init_endpoints(struct musb *musb) | ||
| 1587 | { | ||
| 1588 | u8 epnum; | ||
| 1589 | struct musb_hw_ep *hw_ep; | ||
| 1590 | unsigned count = 0; | ||
| 1591 | |||
| 1592 | /* intialize endpoint list just once */ | ||
| 1593 | INIT_LIST_HEAD(&(musb->g.ep_list)); | ||
| 1594 | |||
| 1595 | for (epnum = 0, hw_ep = musb->endpoints; | ||
| 1596 | epnum < musb->nr_endpoints; | ||
| 1597 | epnum++, hw_ep++) { | ||
| 1598 | if (hw_ep->is_shared_fifo /* || !epnum */) { | ||
| 1599 | init_peripheral_ep(musb, &hw_ep->ep_in, epnum, 0); | ||
| 1600 | count++; | ||
| 1601 | } else { | ||
| 1602 | if (hw_ep->max_packet_sz_tx) { | ||
| 1603 | init_peripheral_ep(musb, &hw_ep->ep_in, | ||
| 1604 | epnum, 1); | ||
| 1605 | count++; | ||
| 1606 | } | ||
| 1607 | if (hw_ep->max_packet_sz_rx) { | ||
| 1608 | init_peripheral_ep(musb, &hw_ep->ep_out, | ||
| 1609 | epnum, 0); | ||
| 1610 | count++; | ||
| 1611 | } | ||
| 1612 | } | ||
| 1613 | } | ||
| 1614 | } | ||
| 1615 | |||
| 1616 | /* called once during driver setup to initialize and link into | ||
| 1617 | * the driver model; memory is zeroed. | ||
| 1618 | */ | ||
| 1619 | int __init musb_gadget_setup(struct musb *musb) | ||
| 1620 | { | ||
| 1621 | int status; | ||
| 1622 | |||
| 1623 | /* REVISIT minor race: if (erroneously) setting up two | ||
| 1624 | * musb peripherals at the same time, only the bus lock | ||
| 1625 | * is probably held. | ||
| 1626 | */ | ||
| 1627 | if (the_gadget) | ||
| 1628 | return -EBUSY; | ||
| 1629 | the_gadget = musb; | ||
| 1630 | |||
| 1631 | musb->g.ops = &musb_gadget_operations; | ||
| 1632 | musb->g.is_dualspeed = 1; | ||
| 1633 | musb->g.speed = USB_SPEED_UNKNOWN; | ||
| 1634 | |||
| 1635 | /* this "gadget" abstracts/virtualizes the controller */ | ||
| 1636 | strcpy(musb->g.dev.bus_id, "gadget"); | ||
| 1637 | musb->g.dev.parent = musb->controller; | ||
| 1638 | musb->g.dev.dma_mask = musb->controller->dma_mask; | ||
| 1639 | musb->g.dev.release = musb_gadget_release; | ||
| 1640 | musb->g.name = musb_driver_name; | ||
| 1641 | |||
| 1642 | if (is_otg_enabled(musb)) | ||
| 1643 | musb->g.is_otg = 1; | ||
| 1644 | |||
| 1645 | musb_g_init_endpoints(musb); | ||
| 1646 | |||
| 1647 | musb->is_active = 0; | ||
| 1648 | musb_platform_try_idle(musb, 0); | ||
| 1649 | |||
| 1650 | status = device_register(&musb->g.dev); | ||
| 1651 | if (status != 0) | ||
| 1652 | the_gadget = NULL; | ||
| 1653 | return status; | ||
| 1654 | } | ||
| 1655 | |||
| 1656 | void musb_gadget_cleanup(struct musb *musb) | ||
| 1657 | { | ||
| 1658 | if (musb != the_gadget) | ||
| 1659 | return; | ||
| 1660 | |||
| 1661 | device_unregister(&musb->g.dev); | ||
| 1662 | the_gadget = NULL; | ||
| 1663 | } | ||
| 1664 | |||
| 1665 | /* | ||
| 1666 | * Register the gadget driver. Used by gadget drivers when | ||
| 1667 | * registering themselves with the controller. | ||
| 1668 | * | ||
| 1669 | * -EINVAL something went wrong (not driver) | ||
| 1670 | * -EBUSY another gadget is already using the controller | ||
| 1671 | * -ENOMEM no memeory to perform the operation | ||
| 1672 | * | ||
| 1673 | * @param driver the gadget driver | ||
| 1674 | * @return <0 if error, 0 if everything is fine | ||
| 1675 | */ | ||
| 1676 | int usb_gadget_register_driver(struct usb_gadget_driver *driver) | ||
| 1677 | { | ||
| 1678 | int retval; | ||
| 1679 | unsigned long flags; | ||
| 1680 | struct musb *musb = the_gadget; | ||
| 1681 | |||
| 1682 | if (!driver | ||
| 1683 | || driver->speed != USB_SPEED_HIGH | ||
| 1684 | || !driver->bind | ||
| 1685 | || !driver->setup) | ||
| 1686 | return -EINVAL; | ||
| 1687 | |||
| 1688 | /* driver must be initialized to support peripheral mode */ | ||
| 1689 | if (!musb || !(musb->board_mode == MUSB_OTG | ||
| 1690 | || musb->board_mode != MUSB_OTG)) { | ||
| 1691 | DBG(1, "%s, no dev??\n", __func__); | ||
| 1692 | return -ENODEV; | ||
| 1693 | } | ||
| 1694 | |||
| 1695 | DBG(3, "registering driver %s\n", driver->function); | ||
| 1696 | spin_lock_irqsave(&musb->lock, flags); | ||
| 1697 | |||
| 1698 | if (musb->gadget_driver) { | ||
| 1699 | DBG(1, "%s is already bound to %s\n", | ||
| 1700 | musb_driver_name, | ||
| 1701 | musb->gadget_driver->driver.name); | ||
| 1702 | retval = -EBUSY; | ||
| 1703 | } else { | ||
| 1704 | musb->gadget_driver = driver; | ||
| 1705 | musb->g.dev.driver = &driver->driver; | ||
| 1706 | driver->driver.bus = NULL; | ||
| 1707 | musb->softconnect = 1; | ||
| 1708 | retval = 0; | ||
| 1709 | } | ||
| 1710 | |||
| 1711 | spin_unlock_irqrestore(&musb->lock, flags); | ||
| 1712 | |||
| 1713 | if (retval == 0) { | ||
| 1714 | retval = driver->bind(&musb->g); | ||
| 1715 | if (retval != 0) { | ||
| 1716 | DBG(3, "bind to driver %s failed --> %d\n", | ||
| 1717 | driver->driver.name, retval); | ||
| 1718 | musb->gadget_driver = NULL; | ||
| 1719 | musb->g.dev.driver = NULL; | ||
| 1720 | } | ||
| 1721 | |||
| 1722 | spin_lock_irqsave(&musb->lock, flags); | ||
| 1723 | |||
| 1724 | /* REVISIT always use otg_set_peripheral(), handling | ||
| 1725 | * issues including the root hub one below ... | ||
| 1726 | */ | ||
| 1727 | musb->xceiv.gadget = &musb->g; | ||
| 1728 | musb->xceiv.state = OTG_STATE_B_IDLE; | ||
| 1729 | musb->is_active = 1; | ||
| 1730 | |||
| 1731 | /* FIXME this ignores the softconnect flag. Drivers are | ||
| 1732 | * allowed hold the peripheral inactive until for example | ||
| 1733 | * userspace hooks up printer hardware or DSP codecs, so | ||
| 1734 | * hosts only see fully functional devices. | ||
| 1735 | */ | ||
| 1736 | |||
| 1737 | if (!is_otg_enabled(musb)) | ||
| 1738 | musb_start(musb); | ||
| 1739 | |||
| 1740 | spin_unlock_irqrestore(&musb->lock, flags); | ||
| 1741 | |||
| 1742 | if (is_otg_enabled(musb)) { | ||
| 1743 | DBG(3, "OTG startup...\n"); | ||
| 1744 | |||
| 1745 | /* REVISIT: funcall to other code, which also | ||
| 1746 | * handles power budgeting ... this way also | ||
| 1747 | * ensures HdrcStart is indirectly called. | ||
| 1748 | */ | ||
| 1749 | retval = usb_add_hcd(musb_to_hcd(musb), -1, 0); | ||
| 1750 | if (retval < 0) { | ||
| 1751 | DBG(1, "add_hcd failed, %d\n", retval); | ||
| 1752 | spin_lock_irqsave(&musb->lock, flags); | ||
| 1753 | musb->xceiv.gadget = NULL; | ||
| 1754 | musb->xceiv.state = OTG_STATE_UNDEFINED; | ||
| 1755 | musb->gadget_driver = NULL; | ||
| 1756 | musb->g.dev.driver = NULL; | ||
| 1757 | spin_unlock_irqrestore(&musb->lock, flags); | ||
| 1758 | } | ||
| 1759 | } | ||
| 1760 | } | ||
| 1761 | |||
| 1762 | return retval; | ||
| 1763 | } | ||
| 1764 | EXPORT_SYMBOL(usb_gadget_register_driver); | ||
| 1765 | |||
| 1766 | static void stop_activity(struct musb *musb, struct usb_gadget_driver *driver) | ||
| 1767 | { | ||
| 1768 | int i; | ||
| 1769 | struct musb_hw_ep *hw_ep; | ||
| 1770 | |||
| 1771 | /* don't disconnect if it's not connected */ | ||
| 1772 | if (musb->g.speed == USB_SPEED_UNKNOWN) | ||
| 1773 | driver = NULL; | ||
| 1774 | else | ||
| 1775 | musb->g.speed = USB_SPEED_UNKNOWN; | ||
| 1776 | |||
| 1777 | /* deactivate the hardware */ | ||
| 1778 | if (musb->softconnect) { | ||
| 1779 | musb->softconnect = 0; | ||
| 1780 | musb_pullup(musb, 0); | ||
| 1781 | } | ||
| 1782 | musb_stop(musb); | ||
| 1783 | |||
| 1784 | /* killing any outstanding requests will quiesce the driver; | ||
| 1785 | * then report disconnect | ||
| 1786 | */ | ||
| 1787 | if (driver) { | ||
| 1788 | for (i = 0, hw_ep = musb->endpoints; | ||
| 1789 | i < musb->nr_endpoints; | ||
| 1790 | i++, hw_ep++) { | ||
| 1791 | musb_ep_select(musb->mregs, i); | ||
| 1792 | if (hw_ep->is_shared_fifo /* || !epnum */) { | ||
| 1793 | nuke(&hw_ep->ep_in, -ESHUTDOWN); | ||
| 1794 | } else { | ||
| 1795 | if (hw_ep->max_packet_sz_tx) | ||
| 1796 | nuke(&hw_ep->ep_in, -ESHUTDOWN); | ||
| 1797 | if (hw_ep->max_packet_sz_rx) | ||
| 1798 | nuke(&hw_ep->ep_out, -ESHUTDOWN); | ||
| 1799 | } | ||
| 1800 | } | ||
| 1801 | |||
| 1802 | spin_unlock(&musb->lock); | ||
| 1803 | driver->disconnect(&musb->g); | ||
| 1804 | spin_lock(&musb->lock); | ||
| 1805 | } | ||
| 1806 | } | ||
| 1807 | |||
| 1808 | /* | ||
| 1809 | * Unregister the gadget driver. Used by gadget drivers when | ||
| 1810 | * unregistering themselves from the controller. | ||
| 1811 | * | ||
| 1812 | * @param driver the gadget driver to unregister | ||
| 1813 | */ | ||
| 1814 | int usb_gadget_unregister_driver(struct usb_gadget_driver *driver) | ||
| 1815 | { | ||
| 1816 | unsigned long flags; | ||
| 1817 | int retval = 0; | ||
| 1818 | struct musb *musb = the_gadget; | ||
| 1819 | |||
| 1820 | if (!driver || !driver->unbind || !musb) | ||
| 1821 | return -EINVAL; | ||
| 1822 | |||
| 1823 | /* REVISIT always use otg_set_peripheral() here too; | ||
| 1824 | * this needs to shut down the OTG engine. | ||
| 1825 | */ | ||
| 1826 | |||
| 1827 | spin_lock_irqsave(&musb->lock, flags); | ||
| 1828 | |||
| 1829 | #ifdef CONFIG_USB_MUSB_OTG | ||
| 1830 | musb_hnp_stop(musb); | ||
| 1831 | #endif | ||
| 1832 | |||
| 1833 | if (musb->gadget_driver == driver) { | ||
| 1834 | |||
| 1835 | (void) musb_gadget_vbus_draw(&musb->g, 0); | ||
| 1836 | |||
| 1837 | musb->xceiv.state = OTG_STATE_UNDEFINED; | ||
| 1838 | stop_activity(musb, driver); | ||
| 1839 | |||
| 1840 | DBG(3, "unregistering driver %s\n", driver->function); | ||
| 1841 | spin_unlock_irqrestore(&musb->lock, flags); | ||
| 1842 | driver->unbind(&musb->g); | ||
| 1843 | spin_lock_irqsave(&musb->lock, flags); | ||
| 1844 | |||
| 1845 | musb->gadget_driver = NULL; | ||
| 1846 | musb->g.dev.driver = NULL; | ||
| 1847 | |||
| 1848 | musb->is_active = 0; | ||
| 1849 | musb_platform_try_idle(musb, 0); | ||
| 1850 | } else | ||
| 1851 | retval = -EINVAL; | ||
| 1852 | spin_unlock_irqrestore(&musb->lock, flags); | ||
| 1853 | |||
| 1854 | if (is_otg_enabled(musb) && retval == 0) { | ||
| 1855 | usb_remove_hcd(musb_to_hcd(musb)); | ||
| 1856 | /* FIXME we need to be able to register another | ||
| 1857 | * gadget driver here and have everything work; | ||
| 1858 | * that currently misbehaves. | ||
| 1859 | */ | ||
| 1860 | } | ||
| 1861 | |||
| 1862 | return retval; | ||
| 1863 | } | ||
| 1864 | EXPORT_SYMBOL(usb_gadget_unregister_driver); | ||
| 1865 | |||
| 1866 | |||
| 1867 | /* ----------------------------------------------------------------------- */ | ||
| 1868 | |||
| 1869 | /* lifecycle operations called through plat_uds.c */ | ||
| 1870 | |||
| 1871 | void musb_g_resume(struct musb *musb) | ||
| 1872 | { | ||
| 1873 | musb->is_suspended = 0; | ||
| 1874 | switch (musb->xceiv.state) { | ||
| 1875 | case OTG_STATE_B_IDLE: | ||
| 1876 | break; | ||
| 1877 | case OTG_STATE_B_WAIT_ACON: | ||
| 1878 | case OTG_STATE_B_PERIPHERAL: | ||
| 1879 | musb->is_active = 1; | ||
| 1880 | if (musb->gadget_driver && musb->gadget_driver->resume) { | ||
| 1881 | spin_unlock(&musb->lock); | ||
| 1882 | musb->gadget_driver->resume(&musb->g); | ||
| 1883 | spin_lock(&musb->lock); | ||
| 1884 | } | ||
| 1885 | break; | ||
| 1886 | default: | ||
| 1887 | WARNING("unhandled RESUME transition (%s)\n", | ||
| 1888 | otg_state_string(musb)); | ||
| 1889 | } | ||
| 1890 | } | ||
| 1891 | |||
| 1892 | /* called when SOF packets stop for 3+ msec */ | ||
| 1893 | void musb_g_suspend(struct musb *musb) | ||
| 1894 | { | ||
| 1895 | u8 devctl; | ||
| 1896 | |||
| 1897 | devctl = musb_readb(musb->mregs, MUSB_DEVCTL); | ||
| 1898 | DBG(3, "devctl %02x\n", devctl); | ||
| 1899 | |||
| 1900 | switch (musb->xceiv.state) { | ||
| 1901 | case OTG_STATE_B_IDLE: | ||
| 1902 | if ((devctl & MUSB_DEVCTL_VBUS) == MUSB_DEVCTL_VBUS) | ||
| 1903 | musb->xceiv.state = OTG_STATE_B_PERIPHERAL; | ||
| 1904 | break; | ||
| 1905 | case OTG_STATE_B_PERIPHERAL: | ||
| 1906 | musb->is_suspended = 1; | ||
| 1907 | if (musb->gadget_driver && musb->gadget_driver->suspend) { | ||
| 1908 | spin_unlock(&musb->lock); | ||
| 1909 | musb->gadget_driver->suspend(&musb->g); | ||
| 1910 | spin_lock(&musb->lock); | ||
| 1911 | } | ||
| 1912 | break; | ||
| 1913 | default: | ||
| 1914 | /* REVISIT if B_HOST, clear DEVCTL.HOSTREQ; | ||
| 1915 | * A_PERIPHERAL may need care too | ||
| 1916 | */ | ||
| 1917 | WARNING("unhandled SUSPEND transition (%s)\n", | ||
| 1918 | otg_state_string(musb)); | ||
| 1919 | } | ||
| 1920 | } | ||
| 1921 | |||
| 1922 | /* Called during SRP */ | ||
| 1923 | void musb_g_wakeup(struct musb *musb) | ||
| 1924 | { | ||
| 1925 | musb_gadget_wakeup(&musb->g); | ||
| 1926 | } | ||
| 1927 | |||
| 1928 | /* called when VBUS drops below session threshold, and in other cases */ | ||
| 1929 | void musb_g_disconnect(struct musb *musb) | ||
| 1930 | { | ||
| 1931 | void __iomem *mregs = musb->mregs; | ||
| 1932 | u8 devctl = musb_readb(mregs, MUSB_DEVCTL); | ||
| 1933 | |||
| 1934 | DBG(3, "devctl %02x\n", devctl); | ||
| 1935 | |||
| 1936 | /* clear HR */ | ||
| 1937 | musb_writeb(mregs, MUSB_DEVCTL, devctl & MUSB_DEVCTL_SESSION); | ||
| 1938 | |||
| 1939 | /* don't draw vbus until new b-default session */ | ||
| 1940 | (void) musb_gadget_vbus_draw(&musb->g, 0); | ||
| 1941 | |||
| 1942 | musb->g.speed = USB_SPEED_UNKNOWN; | ||
| 1943 | if (musb->gadget_driver && musb->gadget_driver->disconnect) { | ||
| 1944 | spin_unlock(&musb->lock); | ||
| 1945 | musb->gadget_driver->disconnect(&musb->g); | ||
| 1946 | spin_lock(&musb->lock); | ||
| 1947 | } | ||
| 1948 | |||
| 1949 | switch (musb->xceiv.state) { | ||
| 1950 | default: | ||
| 1951 | #ifdef CONFIG_USB_MUSB_OTG | ||
| 1952 | DBG(2, "Unhandled disconnect %s, setting a_idle\n", | ||
| 1953 | otg_state_string(musb)); | ||
| 1954 | musb->xceiv.state = OTG_STATE_A_IDLE; | ||
| 1955 | break; | ||
| 1956 | case OTG_STATE_A_PERIPHERAL: | ||
| 1957 | musb->xceiv.state = OTG_STATE_A_WAIT_VFALL; | ||
| 1958 | break; | ||
| 1959 | case OTG_STATE_B_WAIT_ACON: | ||
| 1960 | case OTG_STATE_B_HOST: | ||
| 1961 | #endif | ||
| 1962 | case OTG_STATE_B_PERIPHERAL: | ||
| 1963 | case OTG_STATE_B_IDLE: | ||
| 1964 | musb->xceiv.state = OTG_STATE_B_IDLE; | ||
| 1965 | break; | ||
| 1966 | case OTG_STATE_B_SRP_INIT: | ||
| 1967 | break; | ||
| 1968 | } | ||
| 1969 | |||
| 1970 | musb->is_active = 0; | ||
| 1971 | } | ||
| 1972 | |||
| 1973 | void musb_g_reset(struct musb *musb) | ||
| 1974 | __releases(musb->lock) | ||
| 1975 | __acquires(musb->lock) | ||
| 1976 | { | ||
| 1977 | void __iomem *mbase = musb->mregs; | ||
| 1978 | u8 devctl = musb_readb(mbase, MUSB_DEVCTL); | ||
| 1979 | u8 power; | ||
| 1980 | |||
| 1981 | DBG(3, "<== %s addr=%x driver '%s'\n", | ||
| 1982 | (devctl & MUSB_DEVCTL_BDEVICE) | ||
| 1983 | ? "B-Device" : "A-Device", | ||
| 1984 | musb_readb(mbase, MUSB_FADDR), | ||
| 1985 | musb->gadget_driver | ||
| 1986 | ? musb->gadget_driver->driver.name | ||
| 1987 | : NULL | ||
| 1988 | ); | ||
| 1989 | |||
| 1990 | /* report disconnect, if we didn't already (flushing EP state) */ | ||
| 1991 | if (musb->g.speed != USB_SPEED_UNKNOWN) | ||
| 1992 | musb_g_disconnect(musb); | ||
| 1993 | |||
| 1994 | /* clear HR */ | ||
| 1995 | else if (devctl & MUSB_DEVCTL_HR) | ||
| 1996 | musb_writeb(mbase, MUSB_DEVCTL, MUSB_DEVCTL_SESSION); | ||
| 1997 | |||
| 1998 | |||
| 1999 | /* what speed did we negotiate? */ | ||
| 2000 | power = musb_readb(mbase, MUSB_POWER); | ||
| 2001 | musb->g.speed = (power & MUSB_POWER_HSMODE) | ||
| 2002 | ? USB_SPEED_HIGH : USB_SPEED_FULL; | ||
| 2003 | |||
| 2004 | /* start in USB_STATE_DEFAULT */ | ||
| 2005 | musb->is_active = 1; | ||
| 2006 | musb->is_suspended = 0; | ||
| 2007 | MUSB_DEV_MODE(musb); | ||
| 2008 | musb->address = 0; | ||
| 2009 | musb->ep0_state = MUSB_EP0_STAGE_SETUP; | ||
| 2010 | |||
| 2011 | musb->may_wakeup = 0; | ||
| 2012 | musb->g.b_hnp_enable = 0; | ||
| 2013 | musb->g.a_alt_hnp_support = 0; | ||
| 2014 | musb->g.a_hnp_support = 0; | ||
| 2015 | |||
| 2016 | /* Normal reset, as B-Device; | ||
| 2017 | * or else after HNP, as A-Device | ||
| 2018 | */ | ||
| 2019 | if (devctl & MUSB_DEVCTL_BDEVICE) { | ||
| 2020 | musb->xceiv.state = OTG_STATE_B_PERIPHERAL; | ||
| 2021 | musb->g.is_a_peripheral = 0; | ||
| 2022 | } else if (is_otg_enabled(musb)) { | ||
| 2023 | musb->xceiv.state = OTG_STATE_A_PERIPHERAL; | ||
| 2024 | musb->g.is_a_peripheral = 1; | ||
| 2025 | } else | ||
| 2026 | WARN_ON(1); | ||
| 2027 | |||
| 2028 | /* start with default limits on VBUS power draw */ | ||
| 2029 | (void) musb_gadget_vbus_draw(&musb->g, | ||
| 2030 | is_otg_enabled(musb) ? 8 : 100); | ||
| 2031 | } | ||
diff --git a/drivers/usb/musb/musb_gadget.h b/drivers/usb/musb/musb_gadget.h new file mode 100644 index 000000000000..59502da9f739 --- /dev/null +++ b/drivers/usb/musb/musb_gadget.h | |||
| @@ -0,0 +1,108 @@ | |||
| 1 | /* | ||
| 2 | * MUSB OTG driver peripheral defines | ||
| 3 | * | ||
| 4 | * Copyright 2005 Mentor Graphics Corporation | ||
| 5 | * Copyright (C) 2005-2006 by Texas Instruments | ||
| 6 | * Copyright (C) 2006-2007 Nokia Corporation | ||
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or | ||
| 9 | * modify it under the terms of the GNU General Public License | ||
| 10 | * version 2 as published by the Free Software Foundation. | ||
| 11 | * | ||
| 12 | * This program is distributed in the hope that it will be useful, but | ||
| 13 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| 15 | * General Public License for more details. | ||
| 16 | * | ||
| 17 | * You should have received a copy of the GNU General Public License | ||
| 18 | * along with this program; if not, write to the Free Software | ||
| 19 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA | ||
| 20 | * 02110-1301 USA | ||
| 21 | * | ||
| 22 | * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED | ||
| 23 | * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF | ||
| 24 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN | ||
| 25 | * NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
| 26 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
| 27 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF | ||
| 28 | * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON | ||
| 29 | * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| 30 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
| 31 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| 32 | * | ||
| 33 | */ | ||
| 34 | |||
| 35 | #ifndef __MUSB_GADGET_H | ||
| 36 | #define __MUSB_GADGET_H | ||
| 37 | |||
| 38 | struct musb_request { | ||
| 39 | struct usb_request request; | ||
| 40 | struct musb_ep *ep; | ||
| 41 | struct musb *musb; | ||
| 42 | u8 tx; /* endpoint direction */ | ||
| 43 | u8 epnum; | ||
| 44 | u8 mapped; | ||
| 45 | }; | ||
| 46 | |||
| 47 | static inline struct musb_request *to_musb_request(struct usb_request *req) | ||
| 48 | { | ||
| 49 | return req ? container_of(req, struct musb_request, request) : NULL; | ||
| 50 | } | ||
| 51 | |||
| 52 | extern struct usb_request * | ||
| 53 | musb_alloc_request(struct usb_ep *ep, gfp_t gfp_flags); | ||
| 54 | extern void musb_free_request(struct usb_ep *ep, struct usb_request *req); | ||
| 55 | |||
| 56 | |||
| 57 | /* | ||
| 58 | * struct musb_ep - peripheral side view of endpoint rx or tx side | ||
| 59 | */ | ||
| 60 | struct musb_ep { | ||
| 61 | /* stuff towards the head is basically write-once. */ | ||
| 62 | struct usb_ep end_point; | ||
| 63 | char name[12]; | ||
| 64 | struct musb_hw_ep *hw_ep; | ||
| 65 | struct musb *musb; | ||
| 66 | u8 current_epnum; | ||
| 67 | |||
| 68 | /* ... when enabled/disabled ... */ | ||
| 69 | u8 type; | ||
| 70 | u8 is_in; | ||
| 71 | u16 packet_sz; | ||
| 72 | const struct usb_endpoint_descriptor *desc; | ||
| 73 | struct dma_channel *dma; | ||
| 74 | |||
| 75 | /* later things are modified based on usage */ | ||
| 76 | struct list_head req_list; | ||
| 77 | |||
| 78 | /* true if lock must be dropped but req_list may not be advanced */ | ||
| 79 | u8 busy; | ||
| 80 | }; | ||
| 81 | |||
| 82 | static inline struct musb_ep *to_musb_ep(struct usb_ep *ep) | ||
| 83 | { | ||
| 84 | return ep ? container_of(ep, struct musb_ep, end_point) : NULL; | ||
| 85 | } | ||
| 86 | |||
| 87 | static inline struct usb_request *next_request(struct musb_ep *ep) | ||
| 88 | { | ||
| 89 | struct list_head *queue = &ep->req_list; | ||
| 90 | |||
| 91 | if (list_empty(queue)) | ||
| 92 | return NULL; | ||
| 93 | return container_of(queue->next, struct usb_request, list); | ||
| 94 | } | ||
| 95 | |||
| 96 | extern void musb_g_tx(struct musb *musb, u8 epnum); | ||
| 97 | extern void musb_g_rx(struct musb *musb, u8 epnum); | ||
| 98 | |||
| 99 | extern const struct usb_ep_ops musb_g_ep0_ops; | ||
| 100 | |||
| 101 | extern int musb_gadget_setup(struct musb *); | ||
| 102 | extern void musb_gadget_cleanup(struct musb *); | ||
| 103 | |||
| 104 | extern void musb_g_giveback(struct musb_ep *, struct usb_request *, int); | ||
| 105 | |||
| 106 | extern int musb_gadget_set_halt(struct usb_ep *ep, int value); | ||
| 107 | |||
| 108 | #endif /* __MUSB_GADGET_H */ | ||
diff --git a/drivers/usb/musb/musb_gadget_ep0.c b/drivers/usb/musb/musb_gadget_ep0.c new file mode 100644 index 000000000000..a57652fff39c --- /dev/null +++ b/drivers/usb/musb/musb_gadget_ep0.c | |||
| @@ -0,0 +1,983 @@ | |||
| 1 | /* | ||
| 2 | * MUSB OTG peripheral driver ep0 handling | ||
| 3 | * | ||
| 4 | * Copyright 2005 Mentor Graphics Corporation | ||
| 5 | * Copyright (C) 2005-2006 by Texas Instruments | ||
| 6 | * Copyright (C) 2006-2007 Nokia Corporation | ||
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or | ||
| 9 | * modify it under the terms of the GNU General Public License | ||
| 10 | * version 2 as published by the Free Software Foundation. | ||
| 11 | * | ||
| 12 | * This program is distributed in the hope that it will be useful, but | ||
| 13 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| 15 | * General Public License for more details. | ||
| 16 | * | ||
| 17 | * You should have received a copy of the GNU General Public License | ||
| 18 | * along with this program; if not, write to the Free Software | ||
| 19 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA | ||
| 20 | * 02110-1301 USA | ||
| 21 | * | ||
| 22 | * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED | ||
| 23 | * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF | ||
| 24 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN | ||
| 25 | * NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
| 26 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
| 27 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF | ||
| 28 | * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON | ||
| 29 | * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| 30 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
| 31 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| 32 | * | ||
| 33 | */ | ||
| 34 | |||
| 35 | #include <linux/kernel.h> | ||
| 36 | #include <linux/list.h> | ||
| 37 | #include <linux/timer.h> | ||
| 38 | #include <linux/spinlock.h> | ||
| 39 | #include <linux/init.h> | ||
| 40 | #include <linux/device.h> | ||
| 41 | #include <linux/interrupt.h> | ||
| 42 | |||
| 43 | #include "musb_core.h" | ||
| 44 | |||
| 45 | /* ep0 is always musb->endpoints[0].ep_in */ | ||
| 46 | #define next_ep0_request(musb) next_in_request(&(musb)->endpoints[0]) | ||
| 47 | |||
| 48 | /* | ||
| 49 | * locking note: we use only the controller lock, for simpler correctness. | ||
| 50 | * It's always held with IRQs blocked. | ||
| 51 | * | ||
| 52 | * It protects the ep0 request queue as well as ep0_state, not just the | ||
| 53 | * controller and indexed registers. And that lock stays held unless it | ||
| 54 | * needs to be dropped to allow reentering this driver ... like upcalls to | ||
| 55 | * the gadget driver, or adjusting endpoint halt status. | ||
| 56 | */ | ||
| 57 | |||
| 58 | static char *decode_ep0stage(u8 stage) | ||
| 59 | { | ||
| 60 | switch (stage) { | ||
| 61 | case MUSB_EP0_STAGE_SETUP: return "idle"; | ||
| 62 | case MUSB_EP0_STAGE_TX: return "in"; | ||
| 63 | case MUSB_EP0_STAGE_RX: return "out"; | ||
| 64 | case MUSB_EP0_STAGE_ACKWAIT: return "wait"; | ||
| 65 | case MUSB_EP0_STAGE_STATUSIN: return "in/status"; | ||
| 66 | case MUSB_EP0_STAGE_STATUSOUT: return "out/status"; | ||
| 67 | default: return "?"; | ||
| 68 | } | ||
| 69 | } | ||
| 70 | |||
| 71 | /* handle a standard GET_STATUS request | ||
| 72 | * Context: caller holds controller lock | ||
| 73 | */ | ||
| 74 | static int service_tx_status_request( | ||
| 75 | struct musb *musb, | ||
| 76 | const struct usb_ctrlrequest *ctrlrequest) | ||
| 77 | { | ||
| 78 | void __iomem *mbase = musb->mregs; | ||
| 79 | int handled = 1; | ||
| 80 | u8 result[2], epnum = 0; | ||
| 81 | const u8 recip = ctrlrequest->bRequestType & USB_RECIP_MASK; | ||
| 82 | |||
| 83 | result[1] = 0; | ||
| 84 | |||
| 85 | switch (recip) { | ||
| 86 | case USB_RECIP_DEVICE: | ||
| 87 | result[0] = musb->is_self_powered << USB_DEVICE_SELF_POWERED; | ||
| 88 | result[0] |= musb->may_wakeup << USB_DEVICE_REMOTE_WAKEUP; | ||
| 89 | #ifdef CONFIG_USB_MUSB_OTG | ||
| 90 | if (musb->g.is_otg) { | ||
| 91 | result[0] |= musb->g.b_hnp_enable | ||
| 92 | << USB_DEVICE_B_HNP_ENABLE; | ||
| 93 | result[0] |= musb->g.a_alt_hnp_support | ||
| 94 | << USB_DEVICE_A_ALT_HNP_SUPPORT; | ||
| 95 | result[0] |= musb->g.a_hnp_support | ||
| 96 | << USB_DEVICE_A_HNP_SUPPORT; | ||
| 97 | } | ||
| 98 | #endif | ||
| 99 | break; | ||
| 100 | |||
| 101 | case USB_RECIP_INTERFACE: | ||
| 102 | result[0] = 0; | ||
| 103 | break; | ||
| 104 | |||
| 105 | case USB_RECIP_ENDPOINT: { | ||
| 106 | int is_in; | ||
| 107 | struct musb_ep *ep; | ||
| 108 | u16 tmp; | ||
| 109 | void __iomem *regs; | ||
| 110 | |||
| 111 | epnum = (u8) ctrlrequest->wIndex; | ||
| 112 | if (!epnum) { | ||
| 113 | result[0] = 0; | ||
| 114 | break; | ||
| 115 | } | ||
| 116 | |||
| 117 | is_in = epnum & USB_DIR_IN; | ||
| 118 | if (is_in) { | ||
| 119 | epnum &= 0x0f; | ||
| 120 | ep = &musb->endpoints[epnum].ep_in; | ||
| 121 | } else { | ||
| 122 | ep = &musb->endpoints[epnum].ep_out; | ||
| 123 | } | ||
| 124 | regs = musb->endpoints[epnum].regs; | ||
| 125 | |||
| 126 | if (epnum >= MUSB_C_NUM_EPS || !ep->desc) { | ||
| 127 | handled = -EINVAL; | ||
| 128 | break; | ||
| 129 | } | ||
| 130 | |||
| 131 | musb_ep_select(mbase, epnum); | ||
| 132 | if (is_in) | ||
| 133 | tmp = musb_readw(regs, MUSB_TXCSR) | ||
| 134 | & MUSB_TXCSR_P_SENDSTALL; | ||
| 135 | else | ||
| 136 | tmp = musb_readw(regs, MUSB_RXCSR) | ||
| 137 | & MUSB_RXCSR_P_SENDSTALL; | ||
| 138 | musb_ep_select(mbase, 0); | ||
| 139 | |||
| 140 | result[0] = tmp ? 1 : 0; | ||
| 141 | } break; | ||
| 142 | |||
| 143 | default: | ||
| 144 | /* class, vendor, etc ... delegate */ | ||
| 145 | handled = 0; | ||
| 146 | break; | ||
| 147 | } | ||
| 148 | |||
| 149 | /* fill up the fifo; caller updates csr0 */ | ||
| 150 | if (handled > 0) { | ||
| 151 | u16 len = le16_to_cpu(ctrlrequest->wLength); | ||
| 152 | |||
| 153 | if (len > 2) | ||
| 154 | len = 2; | ||
| 155 | musb_write_fifo(&musb->endpoints[0], len, result); | ||
| 156 | } | ||
| 157 | |||
| 158 | return handled; | ||
| 159 | } | ||
| 160 | |||
| 161 | /* | ||
| 162 | * handle a control-IN request, the end0 buffer contains the current request | ||
| 163 | * that is supposed to be a standard control request. Assumes the fifo to | ||
| 164 | * be at least 2 bytes long. | ||
| 165 | * | ||
| 166 | * @return 0 if the request was NOT HANDLED, | ||
| 167 | * < 0 when error | ||
| 168 | * > 0 when the request is processed | ||
| 169 | * | ||
| 170 | * Context: caller holds controller lock | ||
| 171 | */ | ||
| 172 | static int | ||
| 173 | service_in_request(struct musb *musb, const struct usb_ctrlrequest *ctrlrequest) | ||
| 174 | { | ||
| 175 | int handled = 0; /* not handled */ | ||
| 176 | |||
| 177 | if ((ctrlrequest->bRequestType & USB_TYPE_MASK) | ||
| 178 | == USB_TYPE_STANDARD) { | ||
| 179 | switch (ctrlrequest->bRequest) { | ||
| 180 | case USB_REQ_GET_STATUS: | ||
| 181 | handled = service_tx_status_request(musb, | ||
| 182 | ctrlrequest); | ||
| 183 | break; | ||
| 184 | |||
| 185 | /* case USB_REQ_SYNC_FRAME: */ | ||
| 186 | |||
| 187 | default: | ||
| 188 | break; | ||
| 189 | } | ||
| 190 | } | ||
| 191 | return handled; | ||
| 192 | } | ||
| 193 | |||
| 194 | /* | ||
| 195 | * Context: caller holds controller lock | ||
| 196 | */ | ||
| 197 | static void musb_g_ep0_giveback(struct musb *musb, struct usb_request *req) | ||
| 198 | { | ||
| 199 | musb_g_giveback(&musb->endpoints[0].ep_in, req, 0); | ||
| 200 | musb->ep0_state = MUSB_EP0_STAGE_SETUP; | ||
| 201 | } | ||
| 202 | |||
| 203 | /* | ||
| 204 | * Tries to start B-device HNP negotiation if enabled via sysfs | ||
| 205 | */ | ||
| 206 | static inline void musb_try_b_hnp_enable(struct musb *musb) | ||
| 207 | { | ||
| 208 | void __iomem *mbase = musb->mregs; | ||
| 209 | u8 devctl; | ||
| 210 | |||
| 211 | DBG(1, "HNP: Setting HR\n"); | ||
| 212 | devctl = musb_readb(mbase, MUSB_DEVCTL); | ||
| 213 | musb_writeb(mbase, MUSB_DEVCTL, devctl | MUSB_DEVCTL_HR); | ||
| 214 | } | ||
| 215 | |||
| 216 | /* | ||
| 217 | * Handle all control requests with no DATA stage, including standard | ||
| 218 | * requests such as: | ||
| 219 | * USB_REQ_SET_CONFIGURATION, USB_REQ_SET_INTERFACE, unrecognized | ||
| 220 | * always delegated to the gadget driver | ||
| 221 | * USB_REQ_SET_ADDRESS, USB_REQ_CLEAR_FEATURE, USB_REQ_SET_FEATURE | ||
| 222 | * always handled here, except for class/vendor/... features | ||
| 223 | * | ||
| 224 | * Context: caller holds controller lock | ||
| 225 | */ | ||
| 226 | static int | ||
| 227 | service_zero_data_request(struct musb *musb, | ||
| 228 | struct usb_ctrlrequest *ctrlrequest) | ||
| 229 | __releases(musb->lock) | ||
| 230 | __acquires(musb->lock) | ||
| 231 | { | ||
| 232 | int handled = -EINVAL; | ||
| 233 | void __iomem *mbase = musb->mregs; | ||
| 234 | const u8 recip = ctrlrequest->bRequestType & USB_RECIP_MASK; | ||
| 235 | |||
| 236 | /* the gadget driver handles everything except what we MUST handle */ | ||
| 237 | if ((ctrlrequest->bRequestType & USB_TYPE_MASK) | ||
| 238 | == USB_TYPE_STANDARD) { | ||
| 239 | switch (ctrlrequest->bRequest) { | ||
| 240 | case USB_REQ_SET_ADDRESS: | ||
| 241 | /* change it after the status stage */ | ||
| 242 | musb->set_address = true; | ||
| 243 | musb->address = (u8) (ctrlrequest->wValue & 0x7f); | ||
| 244 | handled = 1; | ||
| 245 | break; | ||
| 246 | |||
| 247 | case USB_REQ_CLEAR_FEATURE: | ||
| 248 | switch (recip) { | ||
| 249 | case USB_RECIP_DEVICE: | ||
| 250 | if (ctrlrequest->wValue | ||
| 251 | != USB_DEVICE_REMOTE_WAKEUP) | ||
| 252 | break; | ||
| 253 | musb->may_wakeup = 0; | ||
| 254 | handled = 1; | ||
| 255 | break; | ||
| 256 | case USB_RECIP_INTERFACE: | ||
| 257 | break; | ||
| 258 | case USB_RECIP_ENDPOINT:{ | ||
| 259 | const u8 num = ctrlrequest->wIndex & 0x0f; | ||
| 260 | struct musb_ep *musb_ep; | ||
| 261 | |||
| 262 | if (num == 0 | ||
| 263 | || num >= MUSB_C_NUM_EPS | ||
| 264 | || ctrlrequest->wValue | ||
| 265 | != USB_ENDPOINT_HALT) | ||
| 266 | break; | ||
| 267 | |||
| 268 | if (ctrlrequest->wIndex & USB_DIR_IN) | ||
| 269 | musb_ep = &musb->endpoints[num].ep_in; | ||
| 270 | else | ||
| 271 | musb_ep = &musb->endpoints[num].ep_out; | ||
| 272 | if (!musb_ep->desc) | ||
| 273 | break; | ||
| 274 | |||
| 275 | /* REVISIT do it directly, no locking games */ | ||
| 276 | spin_unlock(&musb->lock); | ||
| 277 | musb_gadget_set_halt(&musb_ep->end_point, 0); | ||
| 278 | spin_lock(&musb->lock); | ||
| 279 | |||
| 280 | /* select ep0 again */ | ||
| 281 | musb_ep_select(mbase, 0); | ||
| 282 | handled = 1; | ||
| 283 | } break; | ||
| 284 | default: | ||
| 285 | /* class, vendor, etc ... delegate */ | ||
| 286 | handled = 0; | ||
| 287 | break; | ||
| 288 | } | ||
| 289 | break; | ||
| 290 | |||
| 291 | case USB_REQ_SET_FEATURE: | ||
| 292 | switch (recip) { | ||
| 293 | case USB_RECIP_DEVICE: | ||
| 294 | handled = 1; | ||
| 295 | switch (ctrlrequest->wValue) { | ||
| 296 | case USB_DEVICE_REMOTE_WAKEUP: | ||
| 297 | musb->may_wakeup = 1; | ||
| 298 | break; | ||
| 299 | case USB_DEVICE_TEST_MODE: | ||
| 300 | if (musb->g.speed != USB_SPEED_HIGH) | ||
| 301 | goto stall; | ||
| 302 | if (ctrlrequest->wIndex & 0xff) | ||
| 303 | goto stall; | ||
| 304 | |||
| 305 | switch (ctrlrequest->wIndex >> 8) { | ||
| 306 | case 1: | ||
| 307 | pr_debug("TEST_J\n"); | ||
| 308 | /* TEST_J */ | ||
| 309 | musb->test_mode_nr = | ||
| 310 | MUSB_TEST_J; | ||
| 311 | break; | ||
| 312 | case 2: | ||
| 313 | /* TEST_K */ | ||
| 314 | pr_debug("TEST_K\n"); | ||
| 315 | musb->test_mode_nr = | ||
| 316 | MUSB_TEST_K; | ||
| 317 | break; | ||
| 318 | case 3: | ||
| 319 | /* TEST_SE0_NAK */ | ||
| 320 | pr_debug("TEST_SE0_NAK\n"); | ||
| 321 | musb->test_mode_nr = | ||
| 322 | MUSB_TEST_SE0_NAK; | ||
| 323 | break; | ||
| 324 | case 4: | ||
| 325 | /* TEST_PACKET */ | ||
| 326 | pr_debug("TEST_PACKET\n"); | ||
| 327 | musb->test_mode_nr = | ||
| 328 | MUSB_TEST_PACKET; | ||
| 329 | break; | ||
| 330 | default: | ||
| 331 | goto stall; | ||
| 332 | } | ||
| 333 | |||
| 334 | /* enter test mode after irq */ | ||
| 335 | if (handled > 0) | ||
| 336 | musb->test_mode = true; | ||
| 337 | break; | ||
| 338 | #ifdef CONFIG_USB_MUSB_OTG | ||
| 339 | case USB_DEVICE_B_HNP_ENABLE: | ||
| 340 | if (!musb->g.is_otg) | ||
| 341 | goto stall; | ||
| 342 | musb->g.b_hnp_enable = 1; | ||
| 343 | musb_try_b_hnp_enable(musb); | ||
| 344 | break; | ||
| 345 | case USB_DEVICE_A_HNP_SUPPORT: | ||
| 346 | if (!musb->g.is_otg) | ||
| 347 | goto stall; | ||
| 348 | musb->g.a_hnp_support = 1; | ||
| 349 | break; | ||
| 350 | case USB_DEVICE_A_ALT_HNP_SUPPORT: | ||
| 351 | if (!musb->g.is_otg) | ||
| 352 | goto stall; | ||
| 353 | musb->g.a_alt_hnp_support = 1; | ||
| 354 | break; | ||
| 355 | #endif | ||
| 356 | stall: | ||
| 357 | default: | ||
| 358 | handled = -EINVAL; | ||
| 359 | break; | ||
| 360 | } | ||
| 361 | break; | ||
| 362 | |||
| 363 | case USB_RECIP_INTERFACE: | ||
| 364 | break; | ||
| 365 | |||
| 366 | case USB_RECIP_ENDPOINT:{ | ||
| 367 | const u8 epnum = | ||
| 368 | ctrlrequest->wIndex & 0x0f; | ||
| 369 | struct musb_ep *musb_ep; | ||
| 370 | struct musb_hw_ep *ep; | ||
| 371 | void __iomem *regs; | ||
| 372 | int is_in; | ||
| 373 | u16 csr; | ||
| 374 | |||
| 375 | if (epnum == 0 | ||
| 376 | || epnum >= MUSB_C_NUM_EPS | ||
| 377 | || ctrlrequest->wValue | ||
| 378 | != USB_ENDPOINT_HALT) | ||
| 379 | break; | ||
| 380 | |||
| 381 | ep = musb->endpoints + epnum; | ||
| 382 | regs = ep->regs; | ||
| 383 | is_in = ctrlrequest->wIndex & USB_DIR_IN; | ||
| 384 | if (is_in) | ||
| 385 | musb_ep = &ep->ep_in; | ||
| 386 | else | ||
| 387 | musb_ep = &ep->ep_out; | ||
| 388 | if (!musb_ep->desc) | ||
| 389 | break; | ||
| 390 | |||
| 391 | musb_ep_select(mbase, epnum); | ||
| 392 | if (is_in) { | ||
| 393 | csr = musb_readw(regs, | ||
| 394 | MUSB_TXCSR); | ||
| 395 | if (csr & MUSB_TXCSR_FIFONOTEMPTY) | ||
| 396 | csr |= MUSB_TXCSR_FLUSHFIFO; | ||
| 397 | csr |= MUSB_TXCSR_P_SENDSTALL | ||
| 398 | | MUSB_TXCSR_CLRDATATOG | ||
| 399 | | MUSB_TXCSR_P_WZC_BITS; | ||
| 400 | musb_writew(regs, MUSB_TXCSR, | ||
| 401 | csr); | ||
| 402 | } else { | ||
| 403 | csr = musb_readw(regs, | ||
| 404 | MUSB_RXCSR); | ||
| 405 | csr |= MUSB_RXCSR_P_SENDSTALL | ||
| 406 | | MUSB_RXCSR_FLUSHFIFO | ||
| 407 | | MUSB_RXCSR_CLRDATATOG | ||
| 408 | | MUSB_TXCSR_P_WZC_BITS; | ||
| 409 | musb_writew(regs, MUSB_RXCSR, | ||
| 410 | csr); | ||
| 411 | } | ||
| 412 | |||
| 413 | /* select ep0 again */ | ||
| 414 | musb_ep_select(mbase, 0); | ||
| 415 | handled = 1; | ||
| 416 | } break; | ||
| 417 | |||
| 418 | default: | ||
| 419 | /* class, vendor, etc ... delegate */ | ||
| 420 | handled = 0; | ||
| 421 | break; | ||
| 422 | } | ||
| 423 | break; | ||
| 424 | default: | ||
| 425 | /* delegate SET_CONFIGURATION, etc */ | ||
| 426 | handled = 0; | ||
| 427 | } | ||
| 428 | } else | ||
| 429 | handled = 0; | ||
| 430 | return handled; | ||
| 431 | } | ||
| 432 | |||
| 433 | /* we have an ep0out data packet | ||
| 434 | * Context: caller holds controller lock | ||
| 435 | */ | ||
| 436 | static void ep0_rxstate(struct musb *musb) | ||
| 437 | { | ||
| 438 | void __iomem *regs = musb->control_ep->regs; | ||
| 439 | struct usb_request *req; | ||
| 440 | u16 tmp; | ||
| 441 | |||
| 442 | req = next_ep0_request(musb); | ||
| 443 | |||
| 444 | /* read packet and ack; or stall because of gadget driver bug: | ||
| 445 | * should have provided the rx buffer before setup() returned. | ||
| 446 | */ | ||
| 447 | if (req) { | ||
| 448 | void *buf = req->buf + req->actual; | ||
| 449 | unsigned len = req->length - req->actual; | ||
| 450 | |||
| 451 | /* read the buffer */ | ||
| 452 | tmp = musb_readb(regs, MUSB_COUNT0); | ||
| 453 | if (tmp > len) { | ||
| 454 | req->status = -EOVERFLOW; | ||
| 455 | tmp = len; | ||
| 456 | } | ||
| 457 | musb_read_fifo(&musb->endpoints[0], tmp, buf); | ||
| 458 | req->actual += tmp; | ||
| 459 | tmp = MUSB_CSR0_P_SVDRXPKTRDY; | ||
| 460 | if (tmp < 64 || req->actual == req->length) { | ||
| 461 | musb->ep0_state = MUSB_EP0_STAGE_STATUSIN; | ||
| 462 | tmp |= MUSB_CSR0_P_DATAEND; | ||
| 463 | } else | ||
| 464 | req = NULL; | ||
| 465 | } else | ||
| 466 | tmp = MUSB_CSR0_P_SVDRXPKTRDY | MUSB_CSR0_P_SENDSTALL; | ||
| 467 | |||
| 468 | |||
| 469 | /* Completion handler may choose to stall, e.g. because the | ||
| 470 | * message just received holds invalid data. | ||
| 471 | */ | ||
| 472 | if (req) { | ||
| 473 | musb->ackpend = tmp; | ||
| 474 | musb_g_ep0_giveback(musb, req); | ||
| 475 | if (!musb->ackpend) | ||
| 476 | return; | ||
| 477 | musb->ackpend = 0; | ||
| 478 | } | ||
| 479 | musb_ep_select(musb->mregs, 0); | ||
| 480 | musb_writew(regs, MUSB_CSR0, tmp); | ||
| 481 | } | ||
| 482 | |||
| 483 | /* | ||
| 484 | * transmitting to the host (IN), this code might be called from IRQ | ||
| 485 | * and from kernel thread. | ||
| 486 | * | ||
| 487 | * Context: caller holds controller lock | ||
| 488 | */ | ||
| 489 | static void ep0_txstate(struct musb *musb) | ||
| 490 | { | ||
| 491 | void __iomem *regs = musb->control_ep->regs; | ||
| 492 | struct usb_request *request = next_ep0_request(musb); | ||
| 493 | u16 csr = MUSB_CSR0_TXPKTRDY; | ||
| 494 | u8 *fifo_src; | ||
| 495 | u8 fifo_count; | ||
| 496 | |||
| 497 | if (!request) { | ||
| 498 | /* WARN_ON(1); */ | ||
| 499 | DBG(2, "odd; csr0 %04x\n", musb_readw(regs, MUSB_CSR0)); | ||
| 500 | return; | ||
| 501 | } | ||
| 502 | |||
| 503 | /* load the data */ | ||
| 504 | fifo_src = (u8 *) request->buf + request->actual; | ||
| 505 | fifo_count = min((unsigned) MUSB_EP0_FIFOSIZE, | ||
| 506 | request->length - request->actual); | ||
| 507 | musb_write_fifo(&musb->endpoints[0], fifo_count, fifo_src); | ||
| 508 | request->actual += fifo_count; | ||
| 509 | |||
| 510 | /* update the flags */ | ||
| 511 | if (fifo_count < MUSB_MAX_END0_PACKET | ||
| 512 | || request->actual == request->length) { | ||
| 513 | musb->ep0_state = MUSB_EP0_STAGE_STATUSOUT; | ||
| 514 | csr |= MUSB_CSR0_P_DATAEND; | ||
| 515 | } else | ||
| 516 | request = NULL; | ||
| 517 | |||
| 518 | /* report completions as soon as the fifo's loaded; there's no | ||
| 519 | * win in waiting till this last packet gets acked. (other than | ||
| 520 | * very precise fault reporting, needed by USB TMC; possible with | ||
| 521 | * this hardware, but not usable from portable gadget drivers.) | ||
| 522 | */ | ||
| 523 | if (request) { | ||
| 524 | musb->ackpend = csr; | ||
| 525 | musb_g_ep0_giveback(musb, request); | ||
| 526 | if (!musb->ackpend) | ||
| 527 | return; | ||
| 528 | musb->ackpend = 0; | ||
| 529 | } | ||
| 530 | |||
| 531 | /* send it out, triggering a "txpktrdy cleared" irq */ | ||
| 532 | musb_ep_select(musb->mregs, 0); | ||
| 533 | musb_writew(regs, MUSB_CSR0, csr); | ||
| 534 | } | ||
| 535 | |||
| 536 | /* | ||
| 537 | * Read a SETUP packet (struct usb_ctrlrequest) from the hardware. | ||
| 538 | * Fields are left in USB byte-order. | ||
| 539 | * | ||
| 540 | * Context: caller holds controller lock. | ||
| 541 | */ | ||
| 542 | static void | ||
| 543 | musb_read_setup(struct musb *musb, struct usb_ctrlrequest *req) | ||
| 544 | { | ||
| 545 | struct usb_request *r; | ||
| 546 | void __iomem *regs = musb->control_ep->regs; | ||
| 547 | |||
| 548 | musb_read_fifo(&musb->endpoints[0], sizeof *req, (u8 *)req); | ||
| 549 | |||
| 550 | /* NOTE: earlier 2.6 versions changed setup packets to host | ||
| 551 | * order, but now USB packets always stay in USB byte order. | ||
| 552 | */ | ||
| 553 | DBG(3, "SETUP req%02x.%02x v%04x i%04x l%d\n", | ||
| 554 | req->bRequestType, | ||
| 555 | req->bRequest, | ||
| 556 | le16_to_cpu(req->wValue), | ||
| 557 | le16_to_cpu(req->wIndex), | ||
| 558 | le16_to_cpu(req->wLength)); | ||
| 559 | |||
| 560 | /* clean up any leftover transfers */ | ||
| 561 | r = next_ep0_request(musb); | ||
| 562 | if (r) | ||
| 563 | musb_g_ep0_giveback(musb, r); | ||
| 564 | |||
| 565 | /* For zero-data requests we want to delay the STATUS stage to | ||
| 566 | * avoid SETUPEND errors. If we read data (OUT), delay accepting | ||
| 567 | * packets until there's a buffer to store them in. | ||
| 568 | * | ||
| 569 | * If we write data, the controller acts happier if we enable | ||
| 570 | * the TX FIFO right away, and give the controller a moment | ||
| 571 | * to switch modes... | ||
| 572 | */ | ||
| 573 | musb->set_address = false; | ||
| 574 | musb->ackpend = MUSB_CSR0_P_SVDRXPKTRDY; | ||
| 575 | if (req->wLength == 0) { | ||
| 576 | if (req->bRequestType & USB_DIR_IN) | ||
| 577 | musb->ackpend |= MUSB_CSR0_TXPKTRDY; | ||
| 578 | musb->ep0_state = MUSB_EP0_STAGE_ACKWAIT; | ||
| 579 | } else if (req->bRequestType & USB_DIR_IN) { | ||
| 580 | musb->ep0_state = MUSB_EP0_STAGE_TX; | ||
| 581 | musb_writew(regs, MUSB_CSR0, MUSB_CSR0_P_SVDRXPKTRDY); | ||
| 582 | while ((musb_readw(regs, MUSB_CSR0) | ||
| 583 | & MUSB_CSR0_RXPKTRDY) != 0) | ||
| 584 | cpu_relax(); | ||
| 585 | musb->ackpend = 0; | ||
| 586 | } else | ||
| 587 | musb->ep0_state = MUSB_EP0_STAGE_RX; | ||
| 588 | } | ||
| 589 | |||
| 590 | static int | ||
| 591 | forward_to_driver(struct musb *musb, const struct usb_ctrlrequest *ctrlrequest) | ||
| 592 | __releases(musb->lock) | ||
| 593 | __acquires(musb->lock) | ||
| 594 | { | ||
| 595 | int retval; | ||
| 596 | if (!musb->gadget_driver) | ||
| 597 | return -EOPNOTSUPP; | ||
| 598 | spin_unlock(&musb->lock); | ||
| 599 | retval = musb->gadget_driver->setup(&musb->g, ctrlrequest); | ||
| 600 | spin_lock(&musb->lock); | ||
| 601 | return retval; | ||
| 602 | } | ||
| 603 | |||
| 604 | /* | ||
| 605 | * Handle peripheral ep0 interrupt | ||
| 606 | * | ||
| 607 | * Context: irq handler; we won't re-enter the driver that way. | ||
| 608 | */ | ||
| 609 | irqreturn_t musb_g_ep0_irq(struct musb *musb) | ||
| 610 | { | ||
| 611 | u16 csr; | ||
| 612 | u16 len; | ||
| 613 | void __iomem *mbase = musb->mregs; | ||
| 614 | void __iomem *regs = musb->endpoints[0].regs; | ||
| 615 | irqreturn_t retval = IRQ_NONE; | ||
| 616 | |||
| 617 | musb_ep_select(mbase, 0); /* select ep0 */ | ||
| 618 | csr = musb_readw(regs, MUSB_CSR0); | ||
| 619 | len = musb_readb(regs, MUSB_COUNT0); | ||
| 620 | |||
| 621 | DBG(4, "csr %04x, count %d, myaddr %d, ep0stage %s\n", | ||
| 622 | csr, len, | ||
| 623 | musb_readb(mbase, MUSB_FADDR), | ||
| 624 | decode_ep0stage(musb->ep0_state)); | ||
| 625 | |||
| 626 | /* I sent a stall.. need to acknowledge it now.. */ | ||
| 627 | if (csr & MUSB_CSR0_P_SENTSTALL) { | ||
| 628 | musb_writew(regs, MUSB_CSR0, | ||
| 629 | csr & ~MUSB_CSR0_P_SENTSTALL); | ||
| 630 | retval = IRQ_HANDLED; | ||
| 631 | musb->ep0_state = MUSB_EP0_STAGE_SETUP; | ||
| 632 | csr = musb_readw(regs, MUSB_CSR0); | ||
| 633 | } | ||
| 634 | |||
| 635 | /* request ended "early" */ | ||
| 636 | if (csr & MUSB_CSR0_P_SETUPEND) { | ||
| 637 | musb_writew(regs, MUSB_CSR0, MUSB_CSR0_P_SVDSETUPEND); | ||
| 638 | retval = IRQ_HANDLED; | ||
| 639 | musb->ep0_state = MUSB_EP0_STAGE_SETUP; | ||
| 640 | csr = musb_readw(regs, MUSB_CSR0); | ||
| 641 | /* NOTE: request may need completion */ | ||
| 642 | } | ||
| 643 | |||
| 644 | /* docs from Mentor only describe tx, rx, and idle/setup states. | ||
| 645 | * we need to handle nuances around status stages, and also the | ||
| 646 | * case where status and setup stages come back-to-back ... | ||
| 647 | */ | ||
| 648 | switch (musb->ep0_state) { | ||
| 649 | |||
| 650 | case MUSB_EP0_STAGE_TX: | ||
| 651 | /* irq on clearing txpktrdy */ | ||
| 652 | if ((csr & MUSB_CSR0_TXPKTRDY) == 0) { | ||
| 653 | ep0_txstate(musb); | ||
| 654 | retval = IRQ_HANDLED; | ||
| 655 | } | ||
| 656 | break; | ||
| 657 | |||
| 658 | case MUSB_EP0_STAGE_RX: | ||
| 659 | /* irq on set rxpktrdy */ | ||
| 660 | if (csr & MUSB_CSR0_RXPKTRDY) { | ||
| 661 | ep0_rxstate(musb); | ||
| 662 | retval = IRQ_HANDLED; | ||
| 663 | } | ||
| 664 | break; | ||
| 665 | |||
| 666 | case MUSB_EP0_STAGE_STATUSIN: | ||
| 667 | /* end of sequence #2 (OUT/RX state) or #3 (no data) */ | ||
| 668 | |||
| 669 | /* update address (if needed) only @ the end of the | ||
| 670 | * status phase per usb spec, which also guarantees | ||
| 671 | * we get 10 msec to receive this irq... until this | ||
| 672 | * is done we won't see the next packet. | ||
| 673 | */ | ||
| 674 | if (musb->set_address) { | ||
| 675 | musb->set_address = false; | ||
| 676 | musb_writeb(mbase, MUSB_FADDR, musb->address); | ||
| 677 | } | ||
| 678 | |||
| 679 | /* enter test mode if needed (exit by reset) */ | ||
| 680 | else if (musb->test_mode) { | ||
| 681 | DBG(1, "entering TESTMODE\n"); | ||
| 682 | |||
| 683 | if (MUSB_TEST_PACKET == musb->test_mode_nr) | ||
| 684 | musb_load_testpacket(musb); | ||
| 685 | |||
| 686 | musb_writeb(mbase, MUSB_TESTMODE, | ||
| 687 | musb->test_mode_nr); | ||
| 688 | } | ||
| 689 | /* FALLTHROUGH */ | ||
| 690 | |||
| 691 | case MUSB_EP0_STAGE_STATUSOUT: | ||
| 692 | /* end of sequence #1: write to host (TX state) */ | ||
| 693 | { | ||
| 694 | struct usb_request *req; | ||
| 695 | |||
| 696 | req = next_ep0_request(musb); | ||
| 697 | if (req) | ||
| 698 | musb_g_ep0_giveback(musb, req); | ||
| 699 | } | ||
| 700 | retval = IRQ_HANDLED; | ||
| 701 | musb->ep0_state = MUSB_EP0_STAGE_SETUP; | ||
| 702 | /* FALLTHROUGH */ | ||
| 703 | |||
| 704 | case MUSB_EP0_STAGE_SETUP: | ||
| 705 | if (csr & MUSB_CSR0_RXPKTRDY) { | ||
| 706 | struct usb_ctrlrequest setup; | ||
| 707 | int handled = 0; | ||
| 708 | |||
| 709 | if (len != 8) { | ||
| 710 | ERR("SETUP packet len %d != 8 ?\n", len); | ||
| 711 | break; | ||
| 712 | } | ||
| 713 | musb_read_setup(musb, &setup); | ||
| 714 | retval = IRQ_HANDLED; | ||
| 715 | |||
| 716 | /* sometimes the RESET won't be reported */ | ||
| 717 | if (unlikely(musb->g.speed == USB_SPEED_UNKNOWN)) { | ||
| 718 | u8 power; | ||
| 719 | |||
| 720 | printk(KERN_NOTICE "%s: peripheral reset " | ||
| 721 | "irq lost!\n", | ||
| 722 | musb_driver_name); | ||
| 723 | power = musb_readb(mbase, MUSB_POWER); | ||
| 724 | musb->g.speed = (power & MUSB_POWER_HSMODE) | ||
| 725 | ? USB_SPEED_HIGH : USB_SPEED_FULL; | ||
| 726 | |||
| 727 | } | ||
| 728 | |||
| 729 | switch (musb->ep0_state) { | ||
| 730 | |||
| 731 | /* sequence #3 (no data stage), includes requests | ||
| 732 | * we can't forward (notably SET_ADDRESS and the | ||
| 733 | * device/endpoint feature set/clear operations) | ||
| 734 | * plus SET_CONFIGURATION and others we must | ||
| 735 | */ | ||
| 736 | case MUSB_EP0_STAGE_ACKWAIT: | ||
| 737 | handled = service_zero_data_request( | ||
| 738 | musb, &setup); | ||
| 739 | |||
| 740 | /* status stage might be immediate */ | ||
| 741 | if (handled > 0) { | ||
| 742 | musb->ackpend |= MUSB_CSR0_P_DATAEND; | ||
| 743 | musb->ep0_state = | ||
| 744 | MUSB_EP0_STAGE_STATUSIN; | ||
| 745 | } | ||
| 746 | break; | ||
| 747 | |||
| 748 | /* sequence #1 (IN to host), includes GET_STATUS | ||
| 749 | * requests that we can't forward, GET_DESCRIPTOR | ||
| 750 | * and others that we must | ||
| 751 | */ | ||
| 752 | case MUSB_EP0_STAGE_TX: | ||
| 753 | handled = service_in_request(musb, &setup); | ||
| 754 | if (handled > 0) { | ||
| 755 | musb->ackpend = MUSB_CSR0_TXPKTRDY | ||
| 756 | | MUSB_CSR0_P_DATAEND; | ||
| 757 | musb->ep0_state = | ||
| 758 | MUSB_EP0_STAGE_STATUSOUT; | ||
| 759 | } | ||
| 760 | break; | ||
| 761 | |||
| 762 | /* sequence #2 (OUT from host), always forward */ | ||
| 763 | default: /* MUSB_EP0_STAGE_RX */ | ||
| 764 | break; | ||
| 765 | } | ||
| 766 | |||
| 767 | DBG(3, "handled %d, csr %04x, ep0stage %s\n", | ||
| 768 | handled, csr, | ||
| 769 | decode_ep0stage(musb->ep0_state)); | ||
| 770 | |||
| 771 | /* unless we need to delegate this to the gadget | ||
| 772 | * driver, we know how to wrap this up: csr0 has | ||
| 773 | * not yet been written. | ||
| 774 | */ | ||
| 775 | if (handled < 0) | ||
| 776 | goto stall; | ||
| 777 | else if (handled > 0) | ||
| 778 | goto finish; | ||
| 779 | |||
| 780 | handled = forward_to_driver(musb, &setup); | ||
| 781 | if (handled < 0) { | ||
| 782 | musb_ep_select(mbase, 0); | ||
| 783 | stall: | ||
| 784 | DBG(3, "stall (%d)\n", handled); | ||
| 785 | musb->ackpend |= MUSB_CSR0_P_SENDSTALL; | ||
| 786 | musb->ep0_state = MUSB_EP0_STAGE_SETUP; | ||
| 787 | finish: | ||
| 788 | musb_writew(regs, MUSB_CSR0, | ||
| 789 | musb->ackpend); | ||
| 790 | musb->ackpend = 0; | ||
| 791 | } | ||
| 792 | } | ||
| 793 | break; | ||
| 794 | |||
| 795 | case MUSB_EP0_STAGE_ACKWAIT: | ||
| 796 | /* This should not happen. But happens with tusb6010 with | ||
| 797 | * g_file_storage and high speed. Do nothing. | ||
| 798 | */ | ||
| 799 | retval = IRQ_HANDLED; | ||
| 800 | break; | ||
| 801 | |||
| 802 | default: | ||
| 803 | /* "can't happen" */ | ||
| 804 | WARN_ON(1); | ||
| 805 | musb_writew(regs, MUSB_CSR0, MUSB_CSR0_P_SENDSTALL); | ||
| 806 | musb->ep0_state = MUSB_EP0_STAGE_SETUP; | ||
| 807 | break; | ||
| 808 | } | ||
| 809 | |||
| 810 | return retval; | ||
| 811 | } | ||
| 812 | |||
| 813 | |||
| 814 | static int | ||
| 815 | musb_g_ep0_enable(struct usb_ep *ep, const struct usb_endpoint_descriptor *desc) | ||
| 816 | { | ||
| 817 | /* always enabled */ | ||
| 818 | return -EINVAL; | ||
| 819 | } | ||
| 820 | |||
| 821 | static int musb_g_ep0_disable(struct usb_ep *e) | ||
| 822 | { | ||
| 823 | /* always enabled */ | ||
| 824 | return -EINVAL; | ||
| 825 | } | ||
| 826 | |||
| 827 | static int | ||
| 828 | musb_g_ep0_queue(struct usb_ep *e, struct usb_request *r, gfp_t gfp_flags) | ||
| 829 | { | ||
| 830 | struct musb_ep *ep; | ||
| 831 | struct musb_request *req; | ||
| 832 | struct musb *musb; | ||
| 833 | int status; | ||
| 834 | unsigned long lockflags; | ||
| 835 | void __iomem *regs; | ||
| 836 | |||
| 837 | if (!e || !r) | ||
| 838 | return -EINVAL; | ||
| 839 | |||
| 840 | ep = to_musb_ep(e); | ||
| 841 | musb = ep->musb; | ||
| 842 | regs = musb->control_ep->regs; | ||
| 843 | |||
| 844 | req = to_musb_request(r); | ||
| 845 | req->musb = musb; | ||
| 846 | req->request.actual = 0; | ||
| 847 | req->request.status = -EINPROGRESS; | ||
| 848 | req->tx = ep->is_in; | ||
| 849 | |||
| 850 | spin_lock_irqsave(&musb->lock, lockflags); | ||
| 851 | |||
| 852 | if (!list_empty(&ep->req_list)) { | ||
| 853 | status = -EBUSY; | ||
| 854 | goto cleanup; | ||
| 855 | } | ||
| 856 | |||
| 857 | switch (musb->ep0_state) { | ||
| 858 | case MUSB_EP0_STAGE_RX: /* control-OUT data */ | ||
| 859 | case MUSB_EP0_STAGE_TX: /* control-IN data */ | ||
| 860 | case MUSB_EP0_STAGE_ACKWAIT: /* zero-length data */ | ||
| 861 | status = 0; | ||
| 862 | break; | ||
| 863 | default: | ||
| 864 | DBG(1, "ep0 request queued in state %d\n", | ||
| 865 | musb->ep0_state); | ||
| 866 | status = -EINVAL; | ||
| 867 | goto cleanup; | ||
| 868 | } | ||
| 869 | |||
| 870 | /* add request to the list */ | ||
| 871 | list_add_tail(&(req->request.list), &(ep->req_list)); | ||
| 872 | |||
| 873 | DBG(3, "queue to %s (%s), length=%d\n", | ||
| 874 | ep->name, ep->is_in ? "IN/TX" : "OUT/RX", | ||
| 875 | req->request.length); | ||
| 876 | |||
| 877 | musb_ep_select(musb->mregs, 0); | ||
| 878 | |||
| 879 | /* sequence #1, IN ... start writing the data */ | ||
| 880 | if (musb->ep0_state == MUSB_EP0_STAGE_TX) | ||
| 881 | ep0_txstate(musb); | ||
| 882 | |||
| 883 | /* sequence #3, no-data ... issue IN status */ | ||
| 884 | else if (musb->ep0_state == MUSB_EP0_STAGE_ACKWAIT) { | ||
| 885 | if (req->request.length) | ||
| 886 | status = -EINVAL; | ||
| 887 | else { | ||
| 888 | musb->ep0_state = MUSB_EP0_STAGE_STATUSIN; | ||
| 889 | musb_writew(regs, MUSB_CSR0, | ||
| 890 | musb->ackpend | MUSB_CSR0_P_DATAEND); | ||
| 891 | musb->ackpend = 0; | ||
| 892 | musb_g_ep0_giveback(ep->musb, r); | ||
| 893 | } | ||
| 894 | |||
| 895 | /* else for sequence #2 (OUT), caller provides a buffer | ||
| 896 | * before the next packet arrives. deferred responses | ||
| 897 | * (after SETUP is acked) are racey. | ||
| 898 | */ | ||
| 899 | } else if (musb->ackpend) { | ||
| 900 | musb_writew(regs, MUSB_CSR0, musb->ackpend); | ||
| 901 | musb->ackpend = 0; | ||
| 902 | } | ||
| 903 | |||
| 904 | cleanup: | ||
| 905 | spin_unlock_irqrestore(&musb->lock, lockflags); | ||
| 906 | return status; | ||
| 907 | } | ||
| 908 | |||
| 909 | static int musb_g_ep0_dequeue(struct usb_ep *ep, struct usb_request *req) | ||
| 910 | { | ||
| 911 | /* we just won't support this */ | ||
| 912 | return -EINVAL; | ||
| 913 | } | ||
| 914 | |||
| 915 | static int musb_g_ep0_halt(struct usb_ep *e, int value) | ||
| 916 | { | ||
| 917 | struct musb_ep *ep; | ||
| 918 | struct musb *musb; | ||
| 919 | void __iomem *base, *regs; | ||
| 920 | unsigned long flags; | ||
| 921 | int status; | ||
| 922 | u16 csr; | ||
| 923 | |||
| 924 | if (!e || !value) | ||
| 925 | return -EINVAL; | ||
| 926 | |||
| 927 | ep = to_musb_ep(e); | ||
| 928 | musb = ep->musb; | ||
| 929 | base = musb->mregs; | ||
| 930 | regs = musb->control_ep->regs; | ||
| 931 | status = 0; | ||
| 932 | |||
| 933 | spin_lock_irqsave(&musb->lock, flags); | ||
| 934 | |||
| 935 | if (!list_empty(&ep->req_list)) { | ||
| 936 | status = -EBUSY; | ||
| 937 | goto cleanup; | ||
| 938 | } | ||
| 939 | |||
| 940 | musb_ep_select(base, 0); | ||
| 941 | csr = musb->ackpend; | ||
| 942 | |||
| 943 | switch (musb->ep0_state) { | ||
| 944 | |||
| 945 | /* Stalls are usually issued after parsing SETUP packet, either | ||
| 946 | * directly in irq context from setup() or else later. | ||
| 947 | */ | ||
| 948 | case MUSB_EP0_STAGE_TX: /* control-IN data */ | ||
| 949 | case MUSB_EP0_STAGE_ACKWAIT: /* STALL for zero-length data */ | ||
| 950 | case MUSB_EP0_STAGE_RX: /* control-OUT data */ | ||
| 951 | csr = musb_readw(regs, MUSB_CSR0); | ||
| 952 | /* FALLTHROUGH */ | ||
| 953 | |||
| 954 | /* It's also OK to issue stalls during callbacks when a non-empty | ||
| 955 | * DATA stage buffer has been read (or even written). | ||
| 956 | */ | ||
| 957 | case MUSB_EP0_STAGE_STATUSIN: /* control-OUT status */ | ||
| 958 | case MUSB_EP0_STAGE_STATUSOUT: /* control-IN status */ | ||
| 959 | |||
| 960 | csr |= MUSB_CSR0_P_SENDSTALL; | ||
| 961 | musb_writew(regs, MUSB_CSR0, csr); | ||
| 962 | musb->ep0_state = MUSB_EP0_STAGE_SETUP; | ||
| 963 | musb->ackpend = 0; | ||
| 964 | break; | ||
| 965 | default: | ||
| 966 | DBG(1, "ep0 can't halt in state %d\n", musb->ep0_state); | ||
| 967 | status = -EINVAL; | ||
| 968 | } | ||
| 969 | |||
| 970 | cleanup: | ||
| 971 | spin_unlock_irqrestore(&musb->lock, flags); | ||
| 972 | return status; | ||
| 973 | } | ||
| 974 | |||
| 975 | const struct usb_ep_ops musb_g_ep0_ops = { | ||
| 976 | .enable = musb_g_ep0_enable, | ||
| 977 | .disable = musb_g_ep0_disable, | ||
| 978 | .alloc_request = musb_alloc_request, | ||
| 979 | .free_request = musb_free_request, | ||
| 980 | .queue = musb_g_ep0_queue, | ||
| 981 | .dequeue = musb_g_ep0_dequeue, | ||
| 982 | .set_halt = musb_g_ep0_halt, | ||
| 983 | }; | ||
diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c new file mode 100644 index 000000000000..8b4be012669a --- /dev/null +++ b/drivers/usb/musb/musb_host.c | |||
| @@ -0,0 +1,2170 @@ | |||
| 1 | /* | ||
| 2 | * MUSB OTG driver host support | ||
| 3 | * | ||
| 4 | * Copyright 2005 Mentor Graphics Corporation | ||
| 5 | * Copyright (C) 2005-2006 by Texas Instruments | ||
| 6 | * Copyright (C) 2006-2007 Nokia Corporation | ||
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or | ||
| 9 | * modify it under the terms of the GNU General Public License | ||
| 10 | * version 2 as published by the Free Software Foundation. | ||
| 11 | * | ||
| 12 | * This program is distributed in the hope that it will be useful, but | ||
| 13 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| 15 | * General Public License for more details. | ||
| 16 | * | ||
| 17 | * You should have received a copy of the GNU General Public License | ||
| 18 | * along with this program; if not, write to the Free Software | ||
| 19 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA | ||
| 20 | * 02110-1301 USA | ||
| 21 | * | ||
| 22 | * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED | ||
| 23 | * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF | ||
| 24 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN | ||
| 25 | * NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
| 26 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
| 27 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF | ||
| 28 | * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON | ||
| 29 | * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| 30 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
| 31 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| 32 | * | ||
| 33 | */ | ||
| 34 | |||
| 35 | #include <linux/module.h> | ||
| 36 | #include <linux/kernel.h> | ||
| 37 | #include <linux/delay.h> | ||
| 38 | #include <linux/sched.h> | ||
| 39 | #include <linux/slab.h> | ||
| 40 | #include <linux/errno.h> | ||
| 41 | #include <linux/init.h> | ||
| 42 | #include <linux/list.h> | ||
| 43 | |||
| 44 | #include "musb_core.h" | ||
| 45 | #include "musb_host.h" | ||
| 46 | |||
| 47 | |||
| 48 | /* MUSB HOST status 22-mar-2006 | ||
| 49 | * | ||
| 50 | * - There's still lots of partial code duplication for fault paths, so | ||
| 51 | * they aren't handled as consistently as they need to be. | ||
| 52 | * | ||
| 53 | * - PIO mostly behaved when last tested. | ||
| 54 | * + including ep0, with all usbtest cases 9, 10 | ||
| 55 | * + usbtest 14 (ep0out) doesn't seem to run at all | ||
| 56 | * + double buffered OUT/TX endpoints saw stalls(!) with certain usbtest | ||
| 57 | * configurations, but otherwise double buffering passes basic tests. | ||
| 58 | * + for 2.6.N, for N > ~10, needs API changes for hcd framework. | ||
| 59 | * | ||
| 60 | * - DMA (CPPI) ... partially behaves, not currently recommended | ||
| 61 | * + about 1/15 the speed of typical EHCI implementations (PCI) | ||
| 62 | * + RX, all too often reqpkt seems to misbehave after tx | ||
| 63 | * + TX, no known issues (other than evident silicon issue) | ||
| 64 | * | ||
| 65 | * - DMA (Mentor/OMAP) ...has at least toggle update problems | ||
| 66 | * | ||
| 67 | * - Still no traffic scheduling code to make NAKing for bulk or control | ||
| 68 | * transfers unable to starve other requests; or to make efficient use | ||
| 69 | * of hardware with periodic transfers. (Note that network drivers | ||
| 70 | * commonly post bulk reads that stay pending for a long time; these | ||
| 71 | * would make very visible trouble.) | ||
| 72 | * | ||
| 73 | * - Not tested with HNP, but some SRP paths seem to behave. | ||
| 74 | * | ||
| 75 | * NOTE 24-August-2006: | ||
| 76 | * | ||
| 77 | * - Bulk traffic finally uses both sides of hardware ep1, freeing up an | ||
| 78 | * extra endpoint for periodic use enabling hub + keybd + mouse. That | ||
| 79 | * mostly works, except that with "usbnet" it's easy to trigger cases | ||
| 80 | * with "ping" where RX loses. (a) ping to davinci, even "ping -f", | ||
| 81 | * fine; but (b) ping _from_ davinci, even "ping -c 1", ICMP RX loses | ||
| 82 | * although ARP RX wins. (That test was done with a full speed link.) | ||
| 83 | */ | ||
| 84 | |||
| 85 | |||
| 86 | /* | ||
| 87 | * NOTE on endpoint usage: | ||
| 88 | * | ||
| 89 | * CONTROL transfers all go through ep0. BULK ones go through dedicated IN | ||
| 90 | * and OUT endpoints ... hardware is dedicated for those "async" queue(s). | ||
| 91 | * | ||
| 92 | * (Yes, bulk _could_ use more of the endpoints than that, and would even | ||
| 93 | * benefit from it ... one remote device may easily be NAKing while others | ||
| 94 | * need to perform transfers in that same direction. The same thing could | ||
| 95 | * be done in software though, assuming dma cooperates.) | ||
| 96 | * | ||
| 97 | * INTERUPPT and ISOCHRONOUS transfers are scheduled to the other endpoints. | ||
| 98 | * So far that scheduling is both dumb and optimistic: the endpoint will be | ||
| 99 | * "claimed" until its software queue is no longer refilled. No multiplexing | ||
| 100 | * of transfers between endpoints, or anything clever. | ||
| 101 | */ | ||
| 102 | |||
| 103 | |||
| 104 | static void musb_ep_program(struct musb *musb, u8 epnum, | ||
| 105 | struct urb *urb, unsigned int nOut, | ||
| 106 | u8 *buf, u32 len); | ||
| 107 | |||
| 108 | /* | ||
| 109 | * Clear TX fifo. Needed to avoid BABBLE errors. | ||
| 110 | */ | ||
| 111 | static inline void musb_h_tx_flush_fifo(struct musb_hw_ep *ep) | ||
| 112 | { | ||
| 113 | void __iomem *epio = ep->regs; | ||
| 114 | u16 csr; | ||
| 115 | int retries = 1000; | ||
| 116 | |||
| 117 | csr = musb_readw(epio, MUSB_TXCSR); | ||
| 118 | while (csr & MUSB_TXCSR_FIFONOTEMPTY) { | ||
| 119 | DBG(5, "Host TX FIFONOTEMPTY csr: %02x\n", csr); | ||
| 120 | csr |= MUSB_TXCSR_FLUSHFIFO; | ||
| 121 | musb_writew(epio, MUSB_TXCSR, csr); | ||
| 122 | csr = musb_readw(epio, MUSB_TXCSR); | ||
| 123 | if (retries-- < 1) { | ||
| 124 | ERR("Could not flush host TX fifo: csr: %04x\n", csr); | ||
| 125 | return; | ||
| 126 | } | ||
| 127 | mdelay(1); | ||
| 128 | } | ||
| 129 | } | ||
| 130 | |||
| 131 | /* | ||
| 132 | * Start transmit. Caller is responsible for locking shared resources. | ||
| 133 | * musb must be locked. | ||
| 134 | */ | ||
| 135 | static inline void musb_h_tx_start(struct musb_hw_ep *ep) | ||
| 136 | { | ||
| 137 | u16 txcsr; | ||
| 138 | |||
| 139 | /* NOTE: no locks here; caller should lock and select EP */ | ||
| 140 | if (ep->epnum) { | ||
| 141 | txcsr = musb_readw(ep->regs, MUSB_TXCSR); | ||
| 142 | txcsr |= MUSB_TXCSR_TXPKTRDY | MUSB_TXCSR_H_WZC_BITS; | ||
| 143 | musb_writew(ep->regs, MUSB_TXCSR, txcsr); | ||
| 144 | } else { | ||
| 145 | txcsr = MUSB_CSR0_H_SETUPPKT | MUSB_CSR0_TXPKTRDY; | ||
| 146 | musb_writew(ep->regs, MUSB_CSR0, txcsr); | ||
| 147 | } | ||
| 148 | |||
| 149 | } | ||
| 150 | |||
| 151 | static inline void cppi_host_txdma_start(struct musb_hw_ep *ep) | ||
| 152 | { | ||
| 153 | u16 txcsr; | ||
| 154 | |||
| 155 | /* NOTE: no locks here; caller should lock and select EP */ | ||
| 156 | txcsr = musb_readw(ep->regs, MUSB_TXCSR); | ||
| 157 | txcsr |= MUSB_TXCSR_DMAENAB | MUSB_TXCSR_H_WZC_BITS; | ||
| 158 | musb_writew(ep->regs, MUSB_TXCSR, txcsr); | ||
| 159 | } | ||
| 160 | |||
| 161 | /* | ||
| 162 | * Start the URB at the front of an endpoint's queue | ||
| 163 | * end must be claimed from the caller. | ||
| 164 | * | ||
| 165 | * Context: controller locked, irqs blocked | ||
| 166 | */ | ||
| 167 | static void | ||
| 168 | musb_start_urb(struct musb *musb, int is_in, struct musb_qh *qh) | ||
| 169 | { | ||
| 170 | u16 frame; | ||
| 171 | u32 len; | ||
| 172 | void *buf; | ||
| 173 | void __iomem *mbase = musb->mregs; | ||
| 174 | struct urb *urb = next_urb(qh); | ||
| 175 | struct musb_hw_ep *hw_ep = qh->hw_ep; | ||
| 176 | unsigned pipe = urb->pipe; | ||
| 177 | u8 address = usb_pipedevice(pipe); | ||
| 178 | int epnum = hw_ep->epnum; | ||
| 179 | |||
| 180 | /* initialize software qh state */ | ||
| 181 | qh->offset = 0; | ||
| 182 | qh->segsize = 0; | ||
| 183 | |||
| 184 | /* gather right source of data */ | ||
| 185 | switch (qh->type) { | ||
| 186 | case USB_ENDPOINT_XFER_CONTROL: | ||
| 187 | /* control transfers always start with SETUP */ | ||
| 188 | is_in = 0; | ||
| 189 | hw_ep->out_qh = qh; | ||
| 190 | musb->ep0_stage = MUSB_EP0_START; | ||
| 191 | buf = urb->setup_packet; | ||
| 192 | len = 8; | ||
| 193 | break; | ||
| 194 | case USB_ENDPOINT_XFER_ISOC: | ||
| 195 | qh->iso_idx = 0; | ||
| 196 | qh->frame = 0; | ||
| 197 | buf = urb->transfer_buffer + urb->iso_frame_desc[0].offset; | ||
| 198 | len = urb->iso_frame_desc[0].length; | ||
| 199 | break; | ||
| 200 | default: /* bulk, interrupt */ | ||
| 201 | buf = urb->transfer_buffer; | ||
| 202 | len = urb->transfer_buffer_length; | ||
| 203 | } | ||
| 204 | |||
| 205 | DBG(4, "qh %p urb %p dev%d ep%d%s%s, hw_ep %d, %p/%d\n", | ||
| 206 | qh, urb, address, qh->epnum, | ||
| 207 | is_in ? "in" : "out", | ||
| 208 | ({char *s; switch (qh->type) { | ||
| 209 | case USB_ENDPOINT_XFER_CONTROL: s = ""; break; | ||
| 210 | case USB_ENDPOINT_XFER_BULK: s = "-bulk"; break; | ||
| 211 | case USB_ENDPOINT_XFER_ISOC: s = "-iso"; break; | ||
| 212 | default: s = "-intr"; break; | ||
| 213 | }; s; }), | ||
| 214 | epnum, buf, len); | ||
| 215 | |||
| 216 | /* Configure endpoint */ | ||
| 217 | if (is_in || hw_ep->is_shared_fifo) | ||
| 218 | hw_ep->in_qh = qh; | ||
| 219 | else | ||
| 220 | hw_ep->out_qh = qh; | ||
| 221 | musb_ep_program(musb, epnum, urb, !is_in, buf, len); | ||
| 222 | |||
| 223 | /* transmit may have more work: start it when it is time */ | ||
| 224 | if (is_in) | ||
| 225 | return; | ||
| 226 | |||
| 227 | /* determine if the time is right for a periodic transfer */ | ||
| 228 | switch (qh->type) { | ||
| 229 | case USB_ENDPOINT_XFER_ISOC: | ||
| 230 | case USB_ENDPOINT_XFER_INT: | ||
| 231 | DBG(3, "check whether there's still time for periodic Tx\n"); | ||
| 232 | qh->iso_idx = 0; | ||
| 233 | frame = musb_readw(mbase, MUSB_FRAME); | ||
| 234 | /* FIXME this doesn't implement that scheduling policy ... | ||
| 235 | * or handle framecounter wrapping | ||
| 236 | */ | ||
| 237 | if ((urb->transfer_flags & URB_ISO_ASAP) | ||
| 238 | || (frame >= urb->start_frame)) { | ||
| 239 | /* REVISIT the SOF irq handler shouldn't duplicate | ||
| 240 | * this code; and we don't init urb->start_frame... | ||
| 241 | */ | ||
| 242 | qh->frame = 0; | ||
| 243 | goto start; | ||
| 244 | } else { | ||
| 245 | qh->frame = urb->start_frame; | ||
| 246 | /* enable SOF interrupt so we can count down */ | ||
| 247 | DBG(1, "SOF for %d\n", epnum); | ||
| 248 | #if 1 /* ifndef CONFIG_ARCH_DAVINCI */ | ||
| 249 | musb_writeb(mbase, MUSB_INTRUSBE, 0xff); | ||
| 250 | #endif | ||
| 251 | } | ||
| 252 | break; | ||
| 253 | default: | ||
| 254 | start: | ||
| 255 | DBG(4, "Start TX%d %s\n", epnum, | ||
| 256 | hw_ep->tx_channel ? "dma" : "pio"); | ||
| 257 | |||
| 258 | if (!hw_ep->tx_channel) | ||
| 259 | musb_h_tx_start(hw_ep); | ||
| 260 | else if (is_cppi_enabled() || tusb_dma_omap()) | ||
| 261 | cppi_host_txdma_start(hw_ep); | ||
| 262 | } | ||
| 263 | } | ||
| 264 | |||
| 265 | /* caller owns controller lock, irqs are blocked */ | ||
| 266 | static void | ||
| 267 | __musb_giveback(struct musb *musb, struct urb *urb, int status) | ||
| 268 | __releases(musb->lock) | ||
| 269 | __acquires(musb->lock) | ||
| 270 | { | ||
| 271 | DBG(({ int level; switch (urb->status) { | ||
| 272 | case 0: | ||
| 273 | level = 4; | ||
| 274 | break; | ||
| 275 | /* common/boring faults */ | ||
| 276 | case -EREMOTEIO: | ||
| 277 | case -ESHUTDOWN: | ||
| 278 | case -ECONNRESET: | ||
| 279 | case -EPIPE: | ||
| 280 | level = 3; | ||
| 281 | break; | ||
| 282 | default: | ||
| 283 | level = 2; | ||
| 284 | break; | ||
| 285 | }; level; }), | ||
| 286 | "complete %p (%d), dev%d ep%d%s, %d/%d\n", | ||
| 287 | urb, urb->status, | ||
| 288 | usb_pipedevice(urb->pipe), | ||
| 289 | usb_pipeendpoint(urb->pipe), | ||
| 290 | usb_pipein(urb->pipe) ? "in" : "out", | ||
| 291 | urb->actual_length, urb->transfer_buffer_length | ||
| 292 | ); | ||
| 293 | |||
| 294 | spin_unlock(&musb->lock); | ||
| 295 | usb_hcd_giveback_urb(musb_to_hcd(musb), urb, status); | ||
| 296 | spin_lock(&musb->lock); | ||
| 297 | } | ||
| 298 | |||
| 299 | /* for bulk/interrupt endpoints only */ | ||
| 300 | static inline void | ||
| 301 | musb_save_toggle(struct musb_hw_ep *ep, int is_in, struct urb *urb) | ||
| 302 | { | ||
| 303 | struct usb_device *udev = urb->dev; | ||
| 304 | u16 csr; | ||
| 305 | void __iomem *epio = ep->regs; | ||
| 306 | struct musb_qh *qh; | ||
| 307 | |||
| 308 | /* FIXME: the current Mentor DMA code seems to have | ||
| 309 | * problems getting toggle correct. | ||
| 310 | */ | ||
| 311 | |||
| 312 | if (is_in || ep->is_shared_fifo) | ||
| 313 | qh = ep->in_qh; | ||
| 314 | else | ||
| 315 | qh = ep->out_qh; | ||
| 316 | |||
| 317 | if (!is_in) { | ||
| 318 | csr = musb_readw(epio, MUSB_TXCSR); | ||
| 319 | usb_settoggle(udev, qh->epnum, 1, | ||
| 320 | (csr & MUSB_TXCSR_H_DATATOGGLE) | ||
| 321 | ? 1 : 0); | ||
| 322 | } else { | ||
| 323 | csr = musb_readw(epio, MUSB_RXCSR); | ||
| 324 | usb_settoggle(udev, qh->epnum, 0, | ||
| 325 | (csr & MUSB_RXCSR_H_DATATOGGLE) | ||
| 326 | ? 1 : 0); | ||
| 327 | } | ||
| 328 | } | ||
| 329 | |||
| 330 | /* caller owns controller lock, irqs are blocked */ | ||
| 331 | static struct musb_qh * | ||
| 332 | musb_giveback(struct musb_qh *qh, struct urb *urb, int status) | ||
| 333 | { | ||
| 334 | int is_in; | ||
| 335 | struct musb_hw_ep *ep = qh->hw_ep; | ||
| 336 | struct musb *musb = ep->musb; | ||
| 337 | int ready = qh->is_ready; | ||
| 338 | |||
| 339 | if (ep->is_shared_fifo) | ||
| 340 | is_in = 1; | ||
| 341 | else | ||
| 342 | is_in = usb_pipein(urb->pipe); | ||
| 343 | |||
| 344 | /* save toggle eagerly, for paranoia */ | ||
| 345 | switch (qh->type) { | ||
| 346 | case USB_ENDPOINT_XFER_BULK: | ||
| 347 | case USB_ENDPOINT_XFER_INT: | ||
| 348 | musb_save_toggle(ep, is_in, urb); | ||
| 349 | break; | ||
| 350 | case USB_ENDPOINT_XFER_ISOC: | ||
| 351 | if (status == 0 && urb->error_count) | ||
| 352 | status = -EXDEV; | ||
| 353 | break; | ||
| 354 | } | ||
| 355 | |||
| 356 | usb_hcd_unlink_urb_from_ep(musb_to_hcd(musb), urb); | ||
| 357 | |||
| 358 | qh->is_ready = 0; | ||
| 359 | __musb_giveback(musb, urb, status); | ||
| 360 | qh->is_ready = ready; | ||
| 361 | |||
| 362 | /* reclaim resources (and bandwidth) ASAP; deschedule it, and | ||
| 363 | * invalidate qh as soon as list_empty(&hep->urb_list) | ||
| 364 | */ | ||
| 365 | if (list_empty(&qh->hep->urb_list)) { | ||
| 366 | struct list_head *head; | ||
| 367 | |||
| 368 | if (is_in) | ||
| 369 | ep->rx_reinit = 1; | ||
| 370 | else | ||
| 371 | ep->tx_reinit = 1; | ||
| 372 | |||
| 373 | /* clobber old pointers to this qh */ | ||
| 374 | if (is_in || ep->is_shared_fifo) | ||
| 375 | ep->in_qh = NULL; | ||
| 376 | else | ||
| 377 | ep->out_qh = NULL; | ||
| 378 | qh->hep->hcpriv = NULL; | ||
| 379 | |||
| 380 | switch (qh->type) { | ||
| 381 | |||
| 382 | case USB_ENDPOINT_XFER_ISOC: | ||
| 383 | case USB_ENDPOINT_XFER_INT: | ||
| 384 | /* this is where periodic bandwidth should be | ||
| 385 | * de-allocated if it's tracked and allocated; | ||
| 386 | * and where we'd update the schedule tree... | ||
| 387 | */ | ||
| 388 | musb->periodic[ep->epnum] = NULL; | ||
| 389 | kfree(qh); | ||
| 390 | qh = NULL; | ||
| 391 | break; | ||
| 392 | |||
| 393 | case USB_ENDPOINT_XFER_CONTROL: | ||
| 394 | case USB_ENDPOINT_XFER_BULK: | ||
| 395 | /* fifo policy for these lists, except that NAKing | ||
| 396 | * should rotate a qh to the end (for fairness). | ||
| 397 | */ | ||
| 398 | head = qh->ring.prev; | ||
| 399 | list_del(&qh->ring); | ||
| 400 | kfree(qh); | ||
| 401 | qh = first_qh(head); | ||
| 402 | break; | ||
| 403 | } | ||
| 404 | } | ||
| 405 | return qh; | ||
| 406 | } | ||
| 407 | |||
| 408 | /* | ||
| 409 | * Advance this hardware endpoint's queue, completing the specified urb and | ||
| 410 | * advancing to either the next urb queued to that qh, or else invalidating | ||
| 411 | * that qh and advancing to the next qh scheduled after the current one. | ||
| 412 | * | ||
| 413 | * Context: caller owns controller lock, irqs are blocked | ||
| 414 | */ | ||
| 415 | static void | ||
| 416 | musb_advance_schedule(struct musb *musb, struct urb *urb, | ||
| 417 | struct musb_hw_ep *hw_ep, int is_in) | ||
| 418 | { | ||
| 419 | struct musb_qh *qh; | ||
| 420 | |||
| 421 | if (is_in || hw_ep->is_shared_fifo) | ||
| 422 | qh = hw_ep->in_qh; | ||
| 423 | else | ||
| 424 | qh = hw_ep->out_qh; | ||
| 425 | |||
| 426 | if (urb->status == -EINPROGRESS) | ||
| 427 | qh = musb_giveback(qh, urb, 0); | ||
| 428 | else | ||
| 429 | qh = musb_giveback(qh, urb, urb->status); | ||
| 430 | |||
| 431 | if (qh && qh->is_ready && !list_empty(&qh->hep->urb_list)) { | ||
| 432 | DBG(4, "... next ep%d %cX urb %p\n", | ||
| 433 | hw_ep->epnum, is_in ? 'R' : 'T', | ||
| 434 | next_urb(qh)); | ||
| 435 | musb_start_urb(musb, is_in, qh); | ||
| 436 | } | ||
| 437 | } | ||
| 438 | |||
| 439 | static inline u16 musb_h_flush_rxfifo(struct musb_hw_ep *hw_ep, u16 csr) | ||
| 440 | { | ||
| 441 | /* we don't want fifo to fill itself again; | ||
| 442 | * ignore dma (various models), | ||
| 443 | * leave toggle alone (may not have been saved yet) | ||
| 444 | */ | ||
| 445 | csr |= MUSB_RXCSR_FLUSHFIFO | MUSB_RXCSR_RXPKTRDY; | ||
| 446 | csr &= ~(MUSB_RXCSR_H_REQPKT | ||
| 447 | | MUSB_RXCSR_H_AUTOREQ | ||
| 448 | | MUSB_RXCSR_AUTOCLEAR); | ||
| 449 | |||
| 450 | /* write 2x to allow double buffering */ | ||
| 451 | musb_writew(hw_ep->regs, MUSB_RXCSR, csr); | ||
| 452 | musb_writew(hw_ep->regs, MUSB_RXCSR, csr); | ||
| 453 | |||
| 454 | /* flush writebuffer */ | ||
| 455 | return musb_readw(hw_ep->regs, MUSB_RXCSR); | ||
| 456 | } | ||
| 457 | |||
| 458 | /* | ||
| 459 | * PIO RX for a packet (or part of it). | ||
| 460 | */ | ||
| 461 | static bool | ||
| 462 | musb_host_packet_rx(struct musb *musb, struct urb *urb, u8 epnum, u8 iso_err) | ||
| 463 | { | ||
| 464 | u16 rx_count; | ||
| 465 | u8 *buf; | ||
| 466 | u16 csr; | ||
| 467 | bool done = false; | ||
| 468 | u32 length; | ||
| 469 | int do_flush = 0; | ||
| 470 | struct musb_hw_ep *hw_ep = musb->endpoints + epnum; | ||
| 471 | void __iomem *epio = hw_ep->regs; | ||
| 472 | struct musb_qh *qh = hw_ep->in_qh; | ||
| 473 | int pipe = urb->pipe; | ||
| 474 | void *buffer = urb->transfer_buffer; | ||
| 475 | |||
| 476 | /* musb_ep_select(mbase, epnum); */ | ||
| 477 | rx_count = musb_readw(epio, MUSB_RXCOUNT); | ||
| 478 | DBG(3, "RX%d count %d, buffer %p len %d/%d\n", epnum, rx_count, | ||
| 479 | urb->transfer_buffer, qh->offset, | ||
| 480 | urb->transfer_buffer_length); | ||
| 481 | |||
| 482 | /* unload FIFO */ | ||
| 483 | if (usb_pipeisoc(pipe)) { | ||
| 484 | int status = 0; | ||
| 485 | struct usb_iso_packet_descriptor *d; | ||
| 486 | |||
| 487 | if (iso_err) { | ||
| 488 | status = -EILSEQ; | ||
| 489 | urb->error_count++; | ||
| 490 | } | ||
| 491 | |||
| 492 | d = urb->iso_frame_desc + qh->iso_idx; | ||
| 493 | buf = buffer + d->offset; | ||
| 494 | length = d->length; | ||
| 495 | if (rx_count > length) { | ||
| 496 | if (status == 0) { | ||
| 497 | status = -EOVERFLOW; | ||
| 498 | urb->error_count++; | ||
| 499 | } | ||
| 500 | DBG(2, "** OVERFLOW %d into %d\n", rx_count, length); | ||
| 501 | do_flush = 1; | ||
| 502 | } else | ||
| 503 | length = rx_count; | ||
| 504 | urb->actual_length += length; | ||
| 505 | d->actual_length = length; | ||
| 506 | |||
| 507 | d->status = status; | ||
| 508 | |||
| 509 | /* see if we are done */ | ||
| 510 | done = (++qh->iso_idx >= urb->number_of_packets); | ||
| 511 | } else { | ||
| 512 | /* non-isoch */ | ||
| 513 | buf = buffer + qh->offset; | ||
| 514 | length = urb->transfer_buffer_length - qh->offset; | ||
| 515 | if (rx_count > length) { | ||
| 516 | if (urb->status == -EINPROGRESS) | ||
| 517 | urb->status = -EOVERFLOW; | ||
| 518 | DBG(2, "** OVERFLOW %d into %d\n", rx_count, length); | ||
| 519 | do_flush = 1; | ||
| 520 | } else | ||
| 521 | length = rx_count; | ||
| 522 | urb->actual_length += length; | ||
| 523 | qh->offset += length; | ||
| 524 | |||
| 525 | /* see if we are done */ | ||
| 526 | done = (urb->actual_length == urb->transfer_buffer_length) | ||
| 527 | || (rx_count < qh->maxpacket) | ||
| 528 | || (urb->status != -EINPROGRESS); | ||
| 529 | if (done | ||
| 530 | && (urb->status == -EINPROGRESS) | ||
| 531 | && (urb->transfer_flags & URB_SHORT_NOT_OK) | ||
| 532 | && (urb->actual_length | ||
| 533 | < urb->transfer_buffer_length)) | ||
| 534 | urb->status = -EREMOTEIO; | ||
| 535 | } | ||
| 536 | |||
| 537 | musb_read_fifo(hw_ep, length, buf); | ||
| 538 | |||
| 539 | csr = musb_readw(epio, MUSB_RXCSR); | ||
| 540 | csr |= MUSB_RXCSR_H_WZC_BITS; | ||
| 541 | if (unlikely(do_flush)) | ||
| 542 | musb_h_flush_rxfifo(hw_ep, csr); | ||
| 543 | else { | ||
| 544 | /* REVISIT this assumes AUTOCLEAR is never set */ | ||
| 545 | csr &= ~(MUSB_RXCSR_RXPKTRDY | MUSB_RXCSR_H_REQPKT); | ||
| 546 | if (!done) | ||
| 547 | csr |= MUSB_RXCSR_H_REQPKT; | ||
| 548 | musb_writew(epio, MUSB_RXCSR, csr); | ||
| 549 | } | ||
| 550 | |||
| 551 | return done; | ||
| 552 | } | ||
| 553 | |||
| 554 | /* we don't always need to reinit a given side of an endpoint... | ||
| 555 | * when we do, use tx/rx reinit routine and then construct a new CSR | ||
| 556 | * to address data toggle, NYET, and DMA or PIO. | ||
| 557 | * | ||
| 558 | * it's possible that driver bugs (especially for DMA) or aborting a | ||
| 559 | * transfer might have left the endpoint busier than it should be. | ||
| 560 | * the busy/not-empty tests are basically paranoia. | ||
| 561 | */ | ||
| 562 | static void | ||
| 563 | musb_rx_reinit(struct musb *musb, struct musb_qh *qh, struct musb_hw_ep *ep) | ||
| 564 | { | ||
| 565 | u16 csr; | ||
| 566 | |||
| 567 | /* NOTE: we know the "rx" fifo reinit never triggers for ep0. | ||
| 568 | * That always uses tx_reinit since ep0 repurposes TX register | ||
| 569 | * offsets; the initial SETUP packet is also a kind of OUT. | ||
| 570 | */ | ||
| 571 | |||
| 572 | /* if programmed for Tx, put it in RX mode */ | ||
| 573 | if (ep->is_shared_fifo) { | ||
| 574 | csr = musb_readw(ep->regs, MUSB_TXCSR); | ||
| 575 | if (csr & MUSB_TXCSR_MODE) { | ||
| 576 | musb_h_tx_flush_fifo(ep); | ||
| 577 | musb_writew(ep->regs, MUSB_TXCSR, | ||
| 578 | MUSB_TXCSR_FRCDATATOG); | ||
| 579 | } | ||
| 580 | /* clear mode (and everything else) to enable Rx */ | ||
| 581 | musb_writew(ep->regs, MUSB_TXCSR, 0); | ||
| 582 | |||
| 583 | /* scrub all previous state, clearing toggle */ | ||
| 584 | } else { | ||
| 585 | csr = musb_readw(ep->regs, MUSB_RXCSR); | ||
| 586 | if (csr & MUSB_RXCSR_RXPKTRDY) | ||
| 587 | WARNING("rx%d, packet/%d ready?\n", ep->epnum, | ||
| 588 | musb_readw(ep->regs, MUSB_RXCOUNT)); | ||
| 589 | |||
| 590 | musb_h_flush_rxfifo(ep, MUSB_RXCSR_CLRDATATOG); | ||
| 591 | } | ||
| 592 | |||
| 593 | /* target addr and (for multipoint) hub addr/port */ | ||
| 594 | if (musb->is_multipoint) { | ||
| 595 | musb_writeb(ep->target_regs, MUSB_RXFUNCADDR, | ||
| 596 | qh->addr_reg); | ||
| 597 | musb_writeb(ep->target_regs, MUSB_RXHUBADDR, | ||
| 598 | qh->h_addr_reg); | ||
| 599 | musb_writeb(ep->target_regs, MUSB_RXHUBPORT, | ||
| 600 | qh->h_port_reg); | ||
| 601 | } else | ||
| 602 | musb_writeb(musb->mregs, MUSB_FADDR, qh->addr_reg); | ||
| 603 | |||
| 604 | /* protocol/endpoint, interval/NAKlimit, i/o size */ | ||
| 605 | musb_writeb(ep->regs, MUSB_RXTYPE, qh->type_reg); | ||
| 606 | musb_writeb(ep->regs, MUSB_RXINTERVAL, qh->intv_reg); | ||
| 607 | /* NOTE: bulk combining rewrites high bits of maxpacket */ | ||
| 608 | musb_writew(ep->regs, MUSB_RXMAXP, qh->maxpacket); | ||
| 609 | |||
| 610 | ep->rx_reinit = 0; | ||
| 611 | } | ||
| 612 | |||
| 613 | |||
| 614 | /* | ||
| 615 | * Program an HDRC endpoint as per the given URB | ||
| 616 | * Context: irqs blocked, controller lock held | ||
| 617 | */ | ||
| 618 | static void musb_ep_program(struct musb *musb, u8 epnum, | ||
| 619 | struct urb *urb, unsigned int is_out, | ||
| 620 | u8 *buf, u32 len) | ||
| 621 | { | ||
| 622 | struct dma_controller *dma_controller; | ||
| 623 | struct dma_channel *dma_channel; | ||
| 624 | u8 dma_ok; | ||
| 625 | void __iomem *mbase = musb->mregs; | ||
| 626 | struct musb_hw_ep *hw_ep = musb->endpoints + epnum; | ||
| 627 | void __iomem *epio = hw_ep->regs; | ||
| 628 | struct musb_qh *qh; | ||
| 629 | u16 packet_sz; | ||
| 630 | |||
| 631 | if (!is_out || hw_ep->is_shared_fifo) | ||
| 632 | qh = hw_ep->in_qh; | ||
| 633 | else | ||
| 634 | qh = hw_ep->out_qh; | ||
| 635 | |||
| 636 | packet_sz = qh->maxpacket; | ||
| 637 | |||
| 638 | DBG(3, "%s hw%d urb %p spd%d dev%d ep%d%s " | ||
| 639 | "h_addr%02x h_port%02x bytes %d\n", | ||
| 640 | is_out ? "-->" : "<--", | ||
| 641 | epnum, urb, urb->dev->speed, | ||
| 642 | qh->addr_reg, qh->epnum, is_out ? "out" : "in", | ||
| 643 | qh->h_addr_reg, qh->h_port_reg, | ||
| 644 | len); | ||
| 645 | |||
| 646 | musb_ep_select(mbase, epnum); | ||
| 647 | |||
| 648 | /* candidate for DMA? */ | ||
| 649 | dma_controller = musb->dma_controller; | ||
| 650 | if (is_dma_capable() && epnum && dma_controller) { | ||
| 651 | dma_channel = is_out ? hw_ep->tx_channel : hw_ep->rx_channel; | ||
| 652 | if (!dma_channel) { | ||
| 653 | dma_channel = dma_controller->channel_alloc( | ||
| 654 | dma_controller, hw_ep, is_out); | ||
| 655 | if (is_out) | ||
| 656 | hw_ep->tx_channel = dma_channel; | ||
| 657 | else | ||
| 658 | hw_ep->rx_channel = dma_channel; | ||
| 659 | } | ||
| 660 | } else | ||
| 661 | dma_channel = NULL; | ||
| 662 | |||
| 663 | /* make sure we clear DMAEnab, autoSet bits from previous run */ | ||
| 664 | |||
| 665 | /* OUT/transmit/EP0 or IN/receive? */ | ||
| 666 | if (is_out) { | ||
| 667 | u16 csr; | ||
| 668 | u16 int_txe; | ||
| 669 | u16 load_count; | ||
| 670 | |||
| 671 | csr = musb_readw(epio, MUSB_TXCSR); | ||
| 672 | |||
| 673 | /* disable interrupt in case we flush */ | ||
| 674 | int_txe = musb_readw(mbase, MUSB_INTRTXE); | ||
| 675 | musb_writew(mbase, MUSB_INTRTXE, int_txe & ~(1 << epnum)); | ||
| 676 | |||
| 677 | /* general endpoint setup */ | ||
| 678 | if (epnum) { | ||
| 679 | /* ASSERT: TXCSR_DMAENAB was already cleared */ | ||
| 680 | |||
| 681 | /* flush all old state, set default */ | ||
| 682 | musb_h_tx_flush_fifo(hw_ep); | ||
| 683 | csr &= ~(MUSB_TXCSR_H_NAKTIMEOUT | ||
| 684 | | MUSB_TXCSR_DMAMODE | ||
| 685 | | MUSB_TXCSR_FRCDATATOG | ||
| 686 | | MUSB_TXCSR_H_RXSTALL | ||
| 687 | | MUSB_TXCSR_H_ERROR | ||
| 688 | | MUSB_TXCSR_TXPKTRDY | ||
| 689 | ); | ||
| 690 | csr |= MUSB_TXCSR_MODE; | ||
| 691 | |||
| 692 | if (usb_gettoggle(urb->dev, | ||
| 693 | qh->epnum, 1)) | ||
| 694 | csr |= MUSB_TXCSR_H_WR_DATATOGGLE | ||
| 695 | | MUSB_TXCSR_H_DATATOGGLE; | ||
| 696 | else | ||
| 697 | csr |= MUSB_TXCSR_CLRDATATOG; | ||
| 698 | |||
| 699 | /* twice in case of double packet buffering */ | ||
| 700 | musb_writew(epio, MUSB_TXCSR, csr); | ||
| 701 | /* REVISIT may need to clear FLUSHFIFO ... */ | ||
| 702 | musb_writew(epio, MUSB_TXCSR, csr); | ||
| 703 | csr = musb_readw(epio, MUSB_TXCSR); | ||
| 704 | } else { | ||
| 705 | /* endpoint 0: just flush */ | ||
| 706 | musb_writew(epio, MUSB_CSR0, | ||
| 707 | csr | MUSB_CSR0_FLUSHFIFO); | ||
| 708 | musb_writew(epio, MUSB_CSR0, | ||
| 709 | csr | MUSB_CSR0_FLUSHFIFO); | ||
| 710 | } | ||
| 711 | |||
| 712 | /* target addr and (for multipoint) hub addr/port */ | ||
| 713 | if (musb->is_multipoint) { | ||
| 714 | musb_writeb(mbase, | ||
| 715 | MUSB_BUSCTL_OFFSET(epnum, MUSB_TXFUNCADDR), | ||
| 716 | qh->addr_reg); | ||
| 717 | musb_writeb(mbase, | ||
| 718 | MUSB_BUSCTL_OFFSET(epnum, MUSB_TXHUBADDR), | ||
| 719 | qh->h_addr_reg); | ||
| 720 | musb_writeb(mbase, | ||
| 721 | MUSB_BUSCTL_OFFSET(epnum, MUSB_TXHUBPORT), | ||
| 722 | qh->h_port_reg); | ||
| 723 | /* FIXME if !epnum, do the same for RX ... */ | ||
| 724 | } else | ||
| 725 | musb_writeb(mbase, MUSB_FADDR, qh->addr_reg); | ||
| 726 | |||
| 727 | /* protocol/endpoint/interval/NAKlimit */ | ||
| 728 | if (epnum) { | ||
| 729 | musb_writeb(epio, MUSB_TXTYPE, qh->type_reg); | ||
| 730 | if (can_bulk_split(musb, qh->type)) | ||
| 731 | musb_writew(epio, MUSB_TXMAXP, | ||
| 732 | packet_sz | ||
| 733 | | ((hw_ep->max_packet_sz_tx / | ||
| 734 | packet_sz) - 1) << 11); | ||
| 735 | else | ||
| 736 | musb_writew(epio, MUSB_TXMAXP, | ||
| 737 | packet_sz); | ||
| 738 | musb_writeb(epio, MUSB_TXINTERVAL, qh->intv_reg); | ||
| 739 | } else { | ||
| 740 | musb_writeb(epio, MUSB_NAKLIMIT0, qh->intv_reg); | ||
| 741 | if (musb->is_multipoint) | ||
| 742 | musb_writeb(epio, MUSB_TYPE0, | ||
| 743 | qh->type_reg); | ||
| 744 | } | ||
| 745 | |||
| 746 | if (can_bulk_split(musb, qh->type)) | ||
| 747 | load_count = min((u32) hw_ep->max_packet_sz_tx, | ||
| 748 | len); | ||
| 749 | else | ||
| 750 | load_count = min((u32) packet_sz, len); | ||
| 751 | |||
| 752 | #ifdef CONFIG_USB_INVENTRA_DMA | ||
| 753 | if (dma_channel) { | ||
| 754 | |||
| 755 | /* clear previous state */ | ||
| 756 | csr = musb_readw(epio, MUSB_TXCSR); | ||
| 757 | csr &= ~(MUSB_TXCSR_AUTOSET | ||
| 758 | | MUSB_TXCSR_DMAMODE | ||
| 759 | | MUSB_TXCSR_DMAENAB); | ||
| 760 | csr |= MUSB_TXCSR_MODE; | ||
| 761 | musb_writew(epio, MUSB_TXCSR, | ||
| 762 | csr | MUSB_TXCSR_MODE); | ||
| 763 | |||
| 764 | qh->segsize = min(len, dma_channel->max_len); | ||
| 765 | |||
| 766 | if (qh->segsize <= packet_sz) | ||
| 767 | dma_channel->desired_mode = 0; | ||
| 768 | else | ||
| 769 | dma_channel->desired_mode = 1; | ||
| 770 | |||
| 771 | |||
| 772 | if (dma_channel->desired_mode == 0) { | ||
| 773 | csr &= ~(MUSB_TXCSR_AUTOSET | ||
| 774 | | MUSB_TXCSR_DMAMODE); | ||
| 775 | csr |= (MUSB_TXCSR_DMAENAB); | ||
| 776 | /* against programming guide */ | ||
| 777 | } else | ||
| 778 | csr |= (MUSB_TXCSR_AUTOSET | ||
| 779 | | MUSB_TXCSR_DMAENAB | ||
| 780 | | MUSB_TXCSR_DMAMODE); | ||
| 781 | |||
| 782 | musb_writew(epio, MUSB_TXCSR, csr); | ||
| 783 | |||
| 784 | dma_ok = dma_controller->channel_program( | ||
| 785 | dma_channel, packet_sz, | ||
| 786 | dma_channel->desired_mode, | ||
| 787 | urb->transfer_dma, | ||
| 788 | qh->segsize); | ||
| 789 | if (dma_ok) { | ||
| 790 | load_count = 0; | ||
| 791 | } else { | ||
| 792 | dma_controller->channel_release(dma_channel); | ||
| 793 | if (is_out) | ||
| 794 | hw_ep->tx_channel = NULL; | ||
| 795 | else | ||
| 796 | hw_ep->rx_channel = NULL; | ||
| 797 | dma_channel = NULL; | ||
| 798 | } | ||
| 799 | } | ||
| 800 | #endif | ||
| 801 | |||
| 802 | /* candidate for DMA */ | ||
| 803 | if ((is_cppi_enabled() || tusb_dma_omap()) && dma_channel) { | ||
| 804 | |||
| 805 | /* program endpoint CSRs first, then setup DMA. | ||
| 806 | * assume CPPI setup succeeds. | ||
| 807 | * defer enabling dma. | ||
| 808 | */ | ||
| 809 | csr = musb_readw(epio, MUSB_TXCSR); | ||
| 810 | csr &= ~(MUSB_TXCSR_AUTOSET | ||
| 811 | | MUSB_TXCSR_DMAMODE | ||
| 812 | | MUSB_TXCSR_DMAENAB); | ||
| 813 | csr |= MUSB_TXCSR_MODE; | ||
| 814 | musb_writew(epio, MUSB_TXCSR, | ||
| 815 | csr | MUSB_TXCSR_MODE); | ||
| 816 | |||
| 817 | dma_channel->actual_len = 0L; | ||
| 818 | qh->segsize = len; | ||
| 819 | |||
| 820 | /* TX uses "rndis" mode automatically, but needs help | ||
| 821 | * to identify the zero-length-final-packet case. | ||
| 822 | */ | ||
| 823 | dma_ok = dma_controller->channel_program( | ||
| 824 | dma_channel, packet_sz, | ||
| 825 | (urb->transfer_flags | ||
| 826 | & URB_ZERO_PACKET) | ||
| 827 | == URB_ZERO_PACKET, | ||
| 828 | urb->transfer_dma, | ||
| 829 | qh->segsize); | ||
| 830 | if (dma_ok) { | ||
| 831 | load_count = 0; | ||
| 832 | } else { | ||
| 833 | dma_controller->channel_release(dma_channel); | ||
| 834 | hw_ep->tx_channel = NULL; | ||
| 835 | dma_channel = NULL; | ||
| 836 | |||
| 837 | /* REVISIT there's an error path here that | ||
| 838 | * needs handling: can't do dma, but | ||
| 839 | * there's no pio buffer address... | ||
| 840 | */ | ||
| 841 | } | ||
| 842 | } | ||
| 843 | |||
| 844 | if (load_count) { | ||
| 845 | /* ASSERT: TXCSR_DMAENAB was already cleared */ | ||
| 846 | |||
| 847 | /* PIO to load FIFO */ | ||
| 848 | qh->segsize = load_count; | ||
| 849 | musb_write_fifo(hw_ep, load_count, buf); | ||
| 850 | csr = musb_readw(epio, MUSB_TXCSR); | ||
| 851 | csr &= ~(MUSB_TXCSR_DMAENAB | ||
| 852 | | MUSB_TXCSR_DMAMODE | ||
| 853 | | MUSB_TXCSR_AUTOSET); | ||
| 854 | /* write CSR */ | ||
| 855 | csr |= MUSB_TXCSR_MODE; | ||
| 856 | |||
| 857 | if (epnum) | ||
| 858 | musb_writew(epio, MUSB_TXCSR, csr); | ||
| 859 | } | ||
| 860 | |||
| 861 | /* re-enable interrupt */ | ||
| 862 | musb_writew(mbase, MUSB_INTRTXE, int_txe); | ||
| 863 | |||
| 864 | /* IN/receive */ | ||
| 865 | } else { | ||
| 866 | u16 csr; | ||
| 867 | |||
| 868 | if (hw_ep->rx_reinit) { | ||
| 869 | musb_rx_reinit(musb, qh, hw_ep); | ||
| 870 | |||
| 871 | /* init new state: toggle and NYET, maybe DMA later */ | ||
| 872 | if (usb_gettoggle(urb->dev, qh->epnum, 0)) | ||
| 873 | csr = MUSB_RXCSR_H_WR_DATATOGGLE | ||
| 874 | | MUSB_RXCSR_H_DATATOGGLE; | ||
| 875 | else | ||
| 876 | csr = 0; | ||
| 877 | if (qh->type == USB_ENDPOINT_XFER_INT) | ||
| 878 | csr |= MUSB_RXCSR_DISNYET; | ||
| 879 | |||
| 880 | } else { | ||
| 881 | csr = musb_readw(hw_ep->regs, MUSB_RXCSR); | ||
| 882 | |||
| 883 | if (csr & (MUSB_RXCSR_RXPKTRDY | ||
| 884 | | MUSB_RXCSR_DMAENAB | ||
| 885 | | MUSB_RXCSR_H_REQPKT)) | ||
| 886 | ERR("broken !rx_reinit, ep%d csr %04x\n", | ||
| 887 | hw_ep->epnum, csr); | ||
| 888 | |||
| 889 | /* scrub any stale state, leaving toggle alone */ | ||
| 890 | csr &= MUSB_RXCSR_DISNYET; | ||
| 891 | } | ||
| 892 | |||
| 893 | /* kick things off */ | ||
| 894 | |||
| 895 | if ((is_cppi_enabled() || tusb_dma_omap()) && dma_channel) { | ||
| 896 | /* candidate for DMA */ | ||
| 897 | if (dma_channel) { | ||
| 898 | dma_channel->actual_len = 0L; | ||
| 899 | qh->segsize = len; | ||
| 900 | |||
| 901 | /* AUTOREQ is in a DMA register */ | ||
| 902 | musb_writew(hw_ep->regs, MUSB_RXCSR, csr); | ||
| 903 | csr = musb_readw(hw_ep->regs, | ||
| 904 | MUSB_RXCSR); | ||
| 905 | |||
| 906 | /* unless caller treats short rx transfers as | ||
| 907 | * errors, we dare not queue multiple transfers. | ||
| 908 | */ | ||
| 909 | dma_ok = dma_controller->channel_program( | ||
| 910 | dma_channel, packet_sz, | ||
| 911 | !(urb->transfer_flags | ||
| 912 | & URB_SHORT_NOT_OK), | ||
| 913 | urb->transfer_dma, | ||
| 914 | qh->segsize); | ||
| 915 | if (!dma_ok) { | ||
| 916 | dma_controller->channel_release( | ||
| 917 | dma_channel); | ||
| 918 | hw_ep->rx_channel = NULL; | ||
| 919 | dma_channel = NULL; | ||
| 920 | } else | ||
| 921 | csr |= MUSB_RXCSR_DMAENAB; | ||
| 922 | } | ||
| 923 | } | ||
| 924 | |||
| 925 | csr |= MUSB_RXCSR_H_REQPKT; | ||
| 926 | DBG(7, "RXCSR%d := %04x\n", epnum, csr); | ||
| 927 | musb_writew(hw_ep->regs, MUSB_RXCSR, csr); | ||
| 928 | csr = musb_readw(hw_ep->regs, MUSB_RXCSR); | ||
| 929 | } | ||
| 930 | } | ||
| 931 | |||
| 932 | |||
| 933 | /* | ||
| 934 | * Service the default endpoint (ep0) as host. | ||
| 935 | * Return true until it's time to start the status stage. | ||
| 936 | */ | ||
| 937 | static bool musb_h_ep0_continue(struct musb *musb, u16 len, struct urb *urb) | ||
| 938 | { | ||
| 939 | bool more = false; | ||
| 940 | u8 *fifo_dest = NULL; | ||
| 941 | u16 fifo_count = 0; | ||
| 942 | struct musb_hw_ep *hw_ep = musb->control_ep; | ||
| 943 | struct musb_qh *qh = hw_ep->in_qh; | ||
| 944 | struct usb_ctrlrequest *request; | ||
| 945 | |||
| 946 | switch (musb->ep0_stage) { | ||
| 947 | case MUSB_EP0_IN: | ||
| 948 | fifo_dest = urb->transfer_buffer + urb->actual_length; | ||
| 949 | fifo_count = min(len, ((u16) (urb->transfer_buffer_length | ||
| 950 | - urb->actual_length))); | ||
| 951 | if (fifo_count < len) | ||
| 952 | urb->status = -EOVERFLOW; | ||
| 953 | |||
| 954 | musb_read_fifo(hw_ep, fifo_count, fifo_dest); | ||
| 955 | |||
| 956 | urb->actual_length += fifo_count; | ||
| 957 | if (len < qh->maxpacket) { | ||
| 958 | /* always terminate on short read; it's | ||
| 959 | * rarely reported as an error. | ||
| 960 | */ | ||
| 961 | } else if (urb->actual_length < | ||
| 962 | urb->transfer_buffer_length) | ||
| 963 | more = true; | ||
| 964 | break; | ||
| 965 | case MUSB_EP0_START: | ||
| 966 | request = (struct usb_ctrlrequest *) urb->setup_packet; | ||
| 967 | |||
| 968 | if (!request->wLength) { | ||
| 969 | DBG(4, "start no-DATA\n"); | ||
| 970 | break; | ||
| 971 | } else if (request->bRequestType & USB_DIR_IN) { | ||
| 972 | DBG(4, "start IN-DATA\n"); | ||
| 973 | musb->ep0_stage = MUSB_EP0_IN; | ||
| 974 | more = true; | ||
| 975 | break; | ||
| 976 | } else { | ||
| 977 | DBG(4, "start OUT-DATA\n"); | ||
| 978 | musb->ep0_stage = MUSB_EP0_OUT; | ||
| 979 | more = true; | ||
| 980 | } | ||
| 981 | /* FALLTHROUGH */ | ||
| 982 | case MUSB_EP0_OUT: | ||
| 983 | fifo_count = min(qh->maxpacket, ((u16) | ||
| 984 | (urb->transfer_buffer_length | ||
| 985 | - urb->actual_length))); | ||
| 986 | |||
| 987 | if (fifo_count) { | ||
| 988 | fifo_dest = (u8 *) (urb->transfer_buffer | ||
| 989 | + urb->actual_length); | ||
| 990 | DBG(3, "Sending %d bytes to %p\n", | ||
| 991 | fifo_count, fifo_dest); | ||
| 992 | musb_write_fifo(hw_ep, fifo_count, fifo_dest); | ||
| 993 | |||
| 994 | urb->actual_length += fifo_count; | ||
| 995 | more = true; | ||
| 996 | } | ||
| 997 | break; | ||
| 998 | default: | ||
| 999 | ERR("bogus ep0 stage %d\n", musb->ep0_stage); | ||
| 1000 | break; | ||
| 1001 | } | ||
| 1002 | |||
| 1003 | return more; | ||
| 1004 | } | ||
| 1005 | |||
| 1006 | /* | ||
| 1007 | * Handle default endpoint interrupt as host. Only called in IRQ time | ||
| 1008 | * from the LinuxIsr() interrupt service routine. | ||
| 1009 | * | ||
| 1010 | * called with controller irqlocked | ||
| 1011 | */ | ||
| 1012 | irqreturn_t musb_h_ep0_irq(struct musb *musb) | ||
| 1013 | { | ||
| 1014 | struct urb *urb; | ||
| 1015 | u16 csr, len; | ||
| 1016 | int status = 0; | ||
| 1017 | void __iomem *mbase = musb->mregs; | ||
| 1018 | struct musb_hw_ep *hw_ep = musb->control_ep; | ||
| 1019 | void __iomem *epio = hw_ep->regs; | ||
| 1020 | struct musb_qh *qh = hw_ep->in_qh; | ||
| 1021 | bool complete = false; | ||
| 1022 | irqreturn_t retval = IRQ_NONE; | ||
| 1023 | |||
| 1024 | /* ep0 only has one queue, "in" */ | ||
| 1025 | urb = next_urb(qh); | ||
| 1026 | |||
| 1027 | musb_ep_select(mbase, 0); | ||
| 1028 | csr = musb_readw(epio, MUSB_CSR0); | ||
| 1029 | len = (csr & MUSB_CSR0_RXPKTRDY) | ||
| 1030 | ? musb_readb(epio, MUSB_COUNT0) | ||
| 1031 | : 0; | ||
| 1032 | |||
| 1033 | DBG(4, "<== csr0 %04x, qh %p, count %d, urb %p, stage %d\n", | ||
| 1034 | csr, qh, len, urb, musb->ep0_stage); | ||
| 1035 | |||
| 1036 | /* if we just did status stage, we are done */ | ||
| 1037 | if (MUSB_EP0_STATUS == musb->ep0_stage) { | ||
| 1038 | retval = IRQ_HANDLED; | ||
| 1039 | complete = true; | ||
| 1040 | } | ||
| 1041 | |||
| 1042 | /* prepare status */ | ||
| 1043 | if (csr & MUSB_CSR0_H_RXSTALL) { | ||
| 1044 | DBG(6, "STALLING ENDPOINT\n"); | ||
| 1045 | status = -EPIPE; | ||
| 1046 | |||
| 1047 | } else if (csr & MUSB_CSR0_H_ERROR) { | ||
| 1048 | DBG(2, "no response, csr0 %04x\n", csr); | ||
| 1049 | status = -EPROTO; | ||
| 1050 | |||
| 1051 | } else if (csr & MUSB_CSR0_H_NAKTIMEOUT) { | ||
| 1052 | DBG(2, "control NAK timeout\n"); | ||
| 1053 | |||
| 1054 | /* NOTE: this code path would be a good place to PAUSE a | ||
| 1055 | * control transfer, if another one is queued, so that | ||
| 1056 | * ep0 is more likely to stay busy. | ||
| 1057 | * | ||
| 1058 | * if (qh->ring.next != &musb->control), then | ||
| 1059 | * we have a candidate... NAKing is *NOT* an error | ||
| 1060 | */ | ||
| 1061 | musb_writew(epio, MUSB_CSR0, 0); | ||
| 1062 | retval = IRQ_HANDLED; | ||
| 1063 | } | ||
| 1064 | |||
| 1065 | if (status) { | ||
| 1066 | DBG(6, "aborting\n"); | ||
| 1067 | retval = IRQ_HANDLED; | ||
| 1068 | if (urb) | ||
| 1069 | urb->status = status; | ||
| 1070 | complete = true; | ||
| 1071 | |||
| 1072 | /* use the proper sequence to abort the transfer */ | ||
| 1073 | if (csr & MUSB_CSR0_H_REQPKT) { | ||
| 1074 | csr &= ~MUSB_CSR0_H_REQPKT; | ||
| 1075 | musb_writew(epio, MUSB_CSR0, csr); | ||
| 1076 | csr &= ~MUSB_CSR0_H_NAKTIMEOUT; | ||
| 1077 | musb_writew(epio, MUSB_CSR0, csr); | ||
| 1078 | } else { | ||
| 1079 | csr |= MUSB_CSR0_FLUSHFIFO; | ||
| 1080 | musb_writew(epio, MUSB_CSR0, csr); | ||
| 1081 | musb_writew(epio, MUSB_CSR0, csr); | ||
| 1082 | csr &= ~MUSB_CSR0_H_NAKTIMEOUT; | ||
| 1083 | musb_writew(epio, MUSB_CSR0, csr); | ||
| 1084 | } | ||
| 1085 | |||
| 1086 | musb_writeb(epio, MUSB_NAKLIMIT0, 0); | ||
| 1087 | |||
| 1088 | /* clear it */ | ||
| 1089 | musb_writew(epio, MUSB_CSR0, 0); | ||
| 1090 | } | ||
| 1091 | |||
| 1092 | if (unlikely(!urb)) { | ||
| 1093 | /* stop endpoint since we have no place for its data, this | ||
| 1094 | * SHOULD NEVER HAPPEN! */ | ||
| 1095 | ERR("no URB for end 0\n"); | ||
| 1096 | |||
| 1097 | musb_writew(epio, MUSB_CSR0, MUSB_CSR0_FLUSHFIFO); | ||
| 1098 | musb_writew(epio, MUSB_CSR0, MUSB_CSR0_FLUSHFIFO); | ||
| 1099 | musb_writew(epio, MUSB_CSR0, 0); | ||
| 1100 | |||
| 1101 | goto done; | ||
| 1102 | } | ||
| 1103 | |||
| 1104 | if (!complete) { | ||
| 1105 | /* call common logic and prepare response */ | ||
| 1106 | if (musb_h_ep0_continue(musb, len, urb)) { | ||
| 1107 | /* more packets required */ | ||
| 1108 | csr = (MUSB_EP0_IN == musb->ep0_stage) | ||
| 1109 | ? MUSB_CSR0_H_REQPKT : MUSB_CSR0_TXPKTRDY; | ||
| 1110 | } else { | ||
| 1111 | /* data transfer complete; perform status phase */ | ||
| 1112 | if (usb_pipeout(urb->pipe) | ||
| 1113 | || !urb->transfer_buffer_length) | ||
| 1114 | csr = MUSB_CSR0_H_STATUSPKT | ||
| 1115 | | MUSB_CSR0_H_REQPKT; | ||
| 1116 | else | ||
| 1117 | csr = MUSB_CSR0_H_STATUSPKT | ||
| 1118 | | MUSB_CSR0_TXPKTRDY; | ||
| 1119 | |||
| 1120 | /* flag status stage */ | ||
| 1121 | musb->ep0_stage = MUSB_EP0_STATUS; | ||
| 1122 | |||
| 1123 | DBG(5, "ep0 STATUS, csr %04x\n", csr); | ||
| 1124 | |||
| 1125 | } | ||
| 1126 | musb_writew(epio, MUSB_CSR0, csr); | ||
| 1127 | retval = IRQ_HANDLED; | ||
| 1128 | } else | ||
| 1129 | musb->ep0_stage = MUSB_EP0_IDLE; | ||
| 1130 | |||
| 1131 | /* call completion handler if done */ | ||
| 1132 | if (complete) | ||
| 1133 | musb_advance_schedule(musb, urb, hw_ep, 1); | ||
| 1134 | done: | ||
| 1135 | return retval; | ||
| 1136 | } | ||
| 1137 | |||
| 1138 | |||
| 1139 | #ifdef CONFIG_USB_INVENTRA_DMA | ||
| 1140 | |||
| 1141 | /* Host side TX (OUT) using Mentor DMA works as follows: | ||
| 1142 | submit_urb -> | ||
| 1143 | - if queue was empty, Program Endpoint | ||
| 1144 | - ... which starts DMA to fifo in mode 1 or 0 | ||
| 1145 | |||
| 1146 | DMA Isr (transfer complete) -> TxAvail() | ||
| 1147 | - Stop DMA (~DmaEnab) (<--- Alert ... currently happens | ||
| 1148 | only in musb_cleanup_urb) | ||
| 1149 | - TxPktRdy has to be set in mode 0 or for | ||
| 1150 | short packets in mode 1. | ||
| 1151 | */ | ||
| 1152 | |||
| 1153 | #endif | ||
| 1154 | |||
| 1155 | /* Service a Tx-Available or dma completion irq for the endpoint */ | ||
| 1156 | void musb_host_tx(struct musb *musb, u8 epnum) | ||
| 1157 | { | ||
| 1158 | int pipe; | ||
| 1159 | bool done = false; | ||
| 1160 | u16 tx_csr; | ||
| 1161 | size_t wLength = 0; | ||
| 1162 | u8 *buf = NULL; | ||
| 1163 | struct urb *urb; | ||
| 1164 | struct musb_hw_ep *hw_ep = musb->endpoints + epnum; | ||
| 1165 | void __iomem *epio = hw_ep->regs; | ||
| 1166 | struct musb_qh *qh = hw_ep->out_qh; | ||
| 1167 | u32 status = 0; | ||
| 1168 | void __iomem *mbase = musb->mregs; | ||
| 1169 | struct dma_channel *dma; | ||
| 1170 | |||
| 1171 | urb = next_urb(qh); | ||
| 1172 | |||
| 1173 | musb_ep_select(mbase, epnum); | ||
| 1174 | tx_csr = musb_readw(epio, MUSB_TXCSR); | ||
| 1175 | |||
| 1176 | /* with CPPI, DMA sometimes triggers "extra" irqs */ | ||
| 1177 | if (!urb) { | ||
| 1178 | DBG(4, "extra TX%d ready, csr %04x\n", epnum, tx_csr); | ||
| 1179 | goto finish; | ||
| 1180 | } | ||
| 1181 | |||
| 1182 | pipe = urb->pipe; | ||
| 1183 | dma = is_dma_capable() ? hw_ep->tx_channel : NULL; | ||
| 1184 | DBG(4, "OUT/TX%d end, csr %04x%s\n", epnum, tx_csr, | ||
| 1185 | dma ? ", dma" : ""); | ||
| 1186 | |||
| 1187 | /* check for errors */ | ||
| 1188 | if (tx_csr & MUSB_TXCSR_H_RXSTALL) { | ||
| 1189 | /* dma was disabled, fifo flushed */ | ||
| 1190 | DBG(3, "TX end %d stall\n", epnum); | ||
| 1191 | |||
| 1192 | /* stall; record URB status */ | ||
| 1193 | status = -EPIPE; | ||
| 1194 | |||
| 1195 | } else if (tx_csr & MUSB_TXCSR_H_ERROR) { | ||
| 1196 | /* (NON-ISO) dma was disabled, fifo flushed */ | ||
| 1197 | DBG(3, "TX 3strikes on ep=%d\n", epnum); | ||
| 1198 | |||
| 1199 | status = -ETIMEDOUT; | ||
| 1200 | |||
| 1201 | } else if (tx_csr & MUSB_TXCSR_H_NAKTIMEOUT) { | ||
| 1202 | DBG(6, "TX end=%d device not responding\n", epnum); | ||
| 1203 | |||
| 1204 | /* NOTE: this code path would be a good place to PAUSE a | ||
| 1205 | * transfer, if there's some other (nonperiodic) tx urb | ||
| 1206 | * that could use this fifo. (dma complicates it...) | ||
| 1207 | * | ||
| 1208 | * if (bulk && qh->ring.next != &musb->out_bulk), then | ||
| 1209 | * we have a candidate... NAKing is *NOT* an error | ||
| 1210 | */ | ||
| 1211 | musb_ep_select(mbase, epnum); | ||
| 1212 | musb_writew(epio, MUSB_TXCSR, | ||
| 1213 | MUSB_TXCSR_H_WZC_BITS | ||
| 1214 | | MUSB_TXCSR_TXPKTRDY); | ||
| 1215 | goto finish; | ||
| 1216 | } | ||
| 1217 | |||
| 1218 | if (status) { | ||
| 1219 | if (dma_channel_status(dma) == MUSB_DMA_STATUS_BUSY) { | ||
| 1220 | dma->status = MUSB_DMA_STATUS_CORE_ABORT; | ||
| 1221 | (void) musb->dma_controller->channel_abort(dma); | ||
| 1222 | } | ||
| 1223 | |||
| 1224 | /* do the proper sequence to abort the transfer in the | ||
| 1225 | * usb core; the dma engine should already be stopped. | ||
| 1226 | */ | ||
| 1227 | musb_h_tx_flush_fifo(hw_ep); | ||
| 1228 | tx_csr &= ~(MUSB_TXCSR_AUTOSET | ||
| 1229 | | MUSB_TXCSR_DMAENAB | ||
| 1230 | | MUSB_TXCSR_H_ERROR | ||
| 1231 | | MUSB_TXCSR_H_RXSTALL | ||
| 1232 | | MUSB_TXCSR_H_NAKTIMEOUT | ||
| 1233 | ); | ||
| 1234 | |||
| 1235 | musb_ep_select(mbase, epnum); | ||
| 1236 | musb_writew(epio, MUSB_TXCSR, tx_csr); | ||
| 1237 | /* REVISIT may need to clear FLUSHFIFO ... */ | ||
| 1238 | musb_writew(epio, MUSB_TXCSR, tx_csr); | ||
| 1239 | musb_writeb(epio, MUSB_TXINTERVAL, 0); | ||
| 1240 | |||
| 1241 | done = true; | ||
| 1242 | } | ||
| 1243 | |||
| 1244 | /* second cppi case */ | ||
| 1245 | if (dma_channel_status(dma) == MUSB_DMA_STATUS_BUSY) { | ||
| 1246 | DBG(4, "extra TX%d ready, csr %04x\n", epnum, tx_csr); | ||
| 1247 | goto finish; | ||
| 1248 | |||
| 1249 | } | ||
| 1250 | |||
| 1251 | /* REVISIT this looks wrong... */ | ||
| 1252 | if (!status || dma || usb_pipeisoc(pipe)) { | ||
| 1253 | if (dma) | ||
| 1254 | wLength = dma->actual_len; | ||
| 1255 | else | ||
| 1256 | wLength = qh->segsize; | ||
| 1257 | qh->offset += wLength; | ||
| 1258 | |||
| 1259 | if (usb_pipeisoc(pipe)) { | ||
| 1260 | struct usb_iso_packet_descriptor *d; | ||
| 1261 | |||
| 1262 | d = urb->iso_frame_desc + qh->iso_idx; | ||
| 1263 | d->actual_length = qh->segsize; | ||
| 1264 | if (++qh->iso_idx >= urb->number_of_packets) { | ||
| 1265 | done = true; | ||
| 1266 | } else { | ||
| 1267 | d++; | ||
| 1268 | buf = urb->transfer_buffer + d->offset; | ||
| 1269 | wLength = d->length; | ||
| 1270 | } | ||
| 1271 | } else if (dma) { | ||
| 1272 | done = true; | ||
| 1273 | } else { | ||
| 1274 | /* see if we need to send more data, or ZLP */ | ||
| 1275 | if (qh->segsize < qh->maxpacket) | ||
| 1276 | done = true; | ||
| 1277 | else if (qh->offset == urb->transfer_buffer_length | ||
| 1278 | && !(urb->transfer_flags | ||
| 1279 | & URB_ZERO_PACKET)) | ||
| 1280 | done = true; | ||
| 1281 | if (!done) { | ||
| 1282 | buf = urb->transfer_buffer | ||
| 1283 | + qh->offset; | ||
| 1284 | wLength = urb->transfer_buffer_length | ||
| 1285 | - qh->offset; | ||
| 1286 | } | ||
| 1287 | } | ||
| 1288 | } | ||
| 1289 | |||
| 1290 | /* urb->status != -EINPROGRESS means request has been faulted, | ||
| 1291 | * so we must abort this transfer after cleanup | ||
| 1292 | */ | ||
| 1293 | if (urb->status != -EINPROGRESS) { | ||
| 1294 | done = true; | ||
| 1295 | if (status == 0) | ||
| 1296 | status = urb->status; | ||
| 1297 | } | ||
| 1298 | |||
| 1299 | if (done) { | ||
| 1300 | /* set status */ | ||
| 1301 | urb->status = status; | ||
| 1302 | urb->actual_length = qh->offset; | ||
| 1303 | musb_advance_schedule(musb, urb, hw_ep, USB_DIR_OUT); | ||
| 1304 | |||
| 1305 | } else if (!(tx_csr & MUSB_TXCSR_DMAENAB)) { | ||
| 1306 | /* WARN_ON(!buf); */ | ||
| 1307 | |||
| 1308 | /* REVISIT: some docs say that when hw_ep->tx_double_buffered, | ||
| 1309 | * (and presumably, fifo is not half-full) we should write TWO | ||
| 1310 | * packets before updating TXCSR ... other docs disagree ... | ||
| 1311 | */ | ||
| 1312 | /* PIO: start next packet in this URB */ | ||
| 1313 | wLength = min(qh->maxpacket, (u16) wLength); | ||
| 1314 | musb_write_fifo(hw_ep, wLength, buf); | ||
| 1315 | qh->segsize = wLength; | ||
| 1316 | |||
| 1317 | musb_ep_select(mbase, epnum); | ||
| 1318 | musb_writew(epio, MUSB_TXCSR, | ||
| 1319 | MUSB_TXCSR_H_WZC_BITS | MUSB_TXCSR_TXPKTRDY); | ||
| 1320 | } else | ||
| 1321 | DBG(1, "not complete, but dma enabled?\n"); | ||
| 1322 | |||
| 1323 | finish: | ||
| 1324 | return; | ||
| 1325 | } | ||
| 1326 | |||
| 1327 | |||
| 1328 | #ifdef CONFIG_USB_INVENTRA_DMA | ||
| 1329 | |||
| 1330 | /* Host side RX (IN) using Mentor DMA works as follows: | ||
| 1331 | submit_urb -> | ||
| 1332 | - if queue was empty, ProgramEndpoint | ||
| 1333 | - first IN token is sent out (by setting ReqPkt) | ||
| 1334 | LinuxIsr -> RxReady() | ||
| 1335 | /\ => first packet is received | ||
| 1336 | | - Set in mode 0 (DmaEnab, ~ReqPkt) | ||
| 1337 | | -> DMA Isr (transfer complete) -> RxReady() | ||
| 1338 | | - Ack receive (~RxPktRdy), turn off DMA (~DmaEnab) | ||
| 1339 | | - if urb not complete, send next IN token (ReqPkt) | ||
| 1340 | | | else complete urb. | ||
| 1341 | | | | ||
| 1342 | --------------------------- | ||
| 1343 | * | ||
| 1344 | * Nuances of mode 1: | ||
| 1345 | * For short packets, no ack (+RxPktRdy) is sent automatically | ||
| 1346 | * (even if AutoClear is ON) | ||
| 1347 | * For full packets, ack (~RxPktRdy) and next IN token (+ReqPkt) is sent | ||
| 1348 | * automatically => major problem, as collecting the next packet becomes | ||
| 1349 | * difficult. Hence mode 1 is not used. | ||
| 1350 | * | ||
| 1351 | * REVISIT | ||
| 1352 | * All we care about at this driver level is that | ||
| 1353 | * (a) all URBs terminate with REQPKT cleared and fifo(s) empty; | ||
| 1354 | * (b) termination conditions are: short RX, or buffer full; | ||
| 1355 | * (c) fault modes include | ||
| 1356 | * - iff URB_SHORT_NOT_OK, short RX status is -EREMOTEIO. | ||
| 1357 | * (and that endpoint's dma queue stops immediately) | ||
| 1358 | * - overflow (full, PLUS more bytes in the terminal packet) | ||
| 1359 | * | ||
| 1360 | * So for example, usb-storage sets URB_SHORT_NOT_OK, and would | ||
| 1361 | * thus be a great candidate for using mode 1 ... for all but the | ||
| 1362 | * last packet of one URB's transfer. | ||
| 1363 | */ | ||
| 1364 | |||
| 1365 | #endif | ||
| 1366 | |||
| 1367 | /* | ||
| 1368 | * Service an RX interrupt for the given IN endpoint; docs cover bulk, iso, | ||
| 1369 | * and high-bandwidth IN transfer cases. | ||
| 1370 | */ | ||
| 1371 | void musb_host_rx(struct musb *musb, u8 epnum) | ||
| 1372 | { | ||
| 1373 | struct urb *urb; | ||
| 1374 | struct musb_hw_ep *hw_ep = musb->endpoints + epnum; | ||
| 1375 | void __iomem *epio = hw_ep->regs; | ||
| 1376 | struct musb_qh *qh = hw_ep->in_qh; | ||
| 1377 | size_t xfer_len; | ||
| 1378 | void __iomem *mbase = musb->mregs; | ||
| 1379 | int pipe; | ||
| 1380 | u16 rx_csr, val; | ||
| 1381 | bool iso_err = false; | ||
| 1382 | bool done = false; | ||
| 1383 | u32 status; | ||
| 1384 | struct dma_channel *dma; | ||
| 1385 | |||
| 1386 | musb_ep_select(mbase, epnum); | ||
| 1387 | |||
| 1388 | urb = next_urb(qh); | ||
| 1389 | dma = is_dma_capable() ? hw_ep->rx_channel : NULL; | ||
| 1390 | status = 0; | ||
| 1391 | xfer_len = 0; | ||
| 1392 | |||
| 1393 | rx_csr = musb_readw(epio, MUSB_RXCSR); | ||
| 1394 | val = rx_csr; | ||
| 1395 | |||
| 1396 | if (unlikely(!urb)) { | ||
| 1397 | /* REVISIT -- THIS SHOULD NEVER HAPPEN ... but, at least | ||
| 1398 | * usbtest #11 (unlinks) triggers it regularly, sometimes | ||
| 1399 | * with fifo full. (Only with DMA??) | ||
| 1400 | */ | ||
| 1401 | DBG(3, "BOGUS RX%d ready, csr %04x, count %d\n", epnum, val, | ||
| 1402 | musb_readw(epio, MUSB_RXCOUNT)); | ||
| 1403 | musb_h_flush_rxfifo(hw_ep, MUSB_RXCSR_CLRDATATOG); | ||
| 1404 | return; | ||
| 1405 | } | ||
| 1406 | |||
| 1407 | pipe = urb->pipe; | ||
| 1408 | |||
| 1409 | DBG(5, "<== hw %d rxcsr %04x, urb actual %d (+dma %zu)\n", | ||
| 1410 | epnum, rx_csr, urb->actual_length, | ||
| 1411 | dma ? dma->actual_len : 0); | ||
| 1412 | |||
| 1413 | /* check for errors, concurrent stall & unlink is not really | ||
| 1414 | * handled yet! */ | ||
| 1415 | if (rx_csr & MUSB_RXCSR_H_RXSTALL) { | ||
| 1416 | DBG(3, "RX end %d STALL\n", epnum); | ||
| 1417 | |||
| 1418 | /* stall; record URB status */ | ||
| 1419 | status = -EPIPE; | ||
| 1420 | |||
| 1421 | } else if (rx_csr & MUSB_RXCSR_H_ERROR) { | ||
| 1422 | DBG(3, "end %d RX proto error\n", epnum); | ||
| 1423 | |||
| 1424 | status = -EPROTO; | ||
| 1425 | musb_writeb(epio, MUSB_RXINTERVAL, 0); | ||
| 1426 | |||
| 1427 | } else if (rx_csr & MUSB_RXCSR_DATAERROR) { | ||
| 1428 | |||
| 1429 | if (USB_ENDPOINT_XFER_ISOC != qh->type) { | ||
| 1430 | /* NOTE this code path would be a good place to PAUSE a | ||
| 1431 | * transfer, if there's some other (nonperiodic) rx urb | ||
| 1432 | * that could use this fifo. (dma complicates it...) | ||
| 1433 | * | ||
| 1434 | * if (bulk && qh->ring.next != &musb->in_bulk), then | ||
| 1435 | * we have a candidate... NAKing is *NOT* an error | ||
| 1436 | */ | ||
| 1437 | DBG(6, "RX end %d NAK timeout\n", epnum); | ||
| 1438 | musb_ep_select(mbase, epnum); | ||
| 1439 | musb_writew(epio, MUSB_RXCSR, | ||
| 1440 | MUSB_RXCSR_H_WZC_BITS | ||
| 1441 | | MUSB_RXCSR_H_REQPKT); | ||
| 1442 | |||
| 1443 | goto finish; | ||
| 1444 | } else { | ||
| 1445 | DBG(4, "RX end %d ISO data error\n", epnum); | ||
| 1446 | /* packet error reported later */ | ||
| 1447 | iso_err = true; | ||
| 1448 | } | ||
| 1449 | } | ||
| 1450 | |||
| 1451 | /* faults abort the transfer */ | ||
| 1452 | if (status) { | ||
| 1453 | /* clean up dma and collect transfer count */ | ||
| 1454 | if (dma_channel_status(dma) == MUSB_DMA_STATUS_BUSY) { | ||
| 1455 | dma->status = MUSB_DMA_STATUS_CORE_ABORT; | ||
| 1456 | (void) musb->dma_controller->channel_abort(dma); | ||
| 1457 | xfer_len = dma->actual_len; | ||
| 1458 | } | ||
| 1459 | musb_h_flush_rxfifo(hw_ep, MUSB_RXCSR_CLRDATATOG); | ||
| 1460 | musb_writeb(epio, MUSB_RXINTERVAL, 0); | ||
| 1461 | done = true; | ||
| 1462 | goto finish; | ||
| 1463 | } | ||
| 1464 | |||
| 1465 | if (unlikely(dma_channel_status(dma) == MUSB_DMA_STATUS_BUSY)) { | ||
| 1466 | /* SHOULD NEVER HAPPEN ... but at least DaVinci has done it */ | ||
| 1467 | ERR("RX%d dma busy, csr %04x\n", epnum, rx_csr); | ||
| 1468 | goto finish; | ||
| 1469 | } | ||
| 1470 | |||
| 1471 | /* thorough shutdown for now ... given more precise fault handling | ||
| 1472 | * and better queueing support, we might keep a DMA pipeline going | ||
| 1473 | * while processing this irq for earlier completions. | ||
| 1474 | */ | ||
| 1475 | |||
| 1476 | /* FIXME this is _way_ too much in-line logic for Mentor DMA */ | ||
| 1477 | |||
| 1478 | #ifndef CONFIG_USB_INVENTRA_DMA | ||
| 1479 | if (rx_csr & MUSB_RXCSR_H_REQPKT) { | ||
| 1480 | /* REVISIT this happened for a while on some short reads... | ||
| 1481 | * the cleanup still needs investigation... looks bad... | ||
| 1482 | * and also duplicates dma cleanup code above ... plus, | ||
| 1483 | * shouldn't this be the "half full" double buffer case? | ||
| 1484 | */ | ||
| 1485 | if (dma_channel_status(dma) == MUSB_DMA_STATUS_BUSY) { | ||
| 1486 | dma->status = MUSB_DMA_STATUS_CORE_ABORT; | ||
| 1487 | (void) musb->dma_controller->channel_abort(dma); | ||
| 1488 | xfer_len = dma->actual_len; | ||
| 1489 | done = true; | ||
| 1490 | } | ||
| 1491 | |||
| 1492 | DBG(2, "RXCSR%d %04x, reqpkt, len %zu%s\n", epnum, rx_csr, | ||
| 1493 | xfer_len, dma ? ", dma" : ""); | ||
| 1494 | rx_csr &= ~MUSB_RXCSR_H_REQPKT; | ||
| 1495 | |||
| 1496 | musb_ep_select(mbase, epnum); | ||
| 1497 | musb_writew(epio, MUSB_RXCSR, | ||
| 1498 | MUSB_RXCSR_H_WZC_BITS | rx_csr); | ||
| 1499 | } | ||
| 1500 | #endif | ||
| 1501 | if (dma && (rx_csr & MUSB_RXCSR_DMAENAB)) { | ||
| 1502 | xfer_len = dma->actual_len; | ||
| 1503 | |||
| 1504 | val &= ~(MUSB_RXCSR_DMAENAB | ||
| 1505 | | MUSB_RXCSR_H_AUTOREQ | ||
| 1506 | | MUSB_RXCSR_AUTOCLEAR | ||
| 1507 | | MUSB_RXCSR_RXPKTRDY); | ||
| 1508 | musb_writew(hw_ep->regs, MUSB_RXCSR, val); | ||
| 1509 | |||
| 1510 | #ifdef CONFIG_USB_INVENTRA_DMA | ||
| 1511 | /* done if urb buffer is full or short packet is recd */ | ||
| 1512 | done = (urb->actual_length + xfer_len >= | ||
| 1513 | urb->transfer_buffer_length | ||
| 1514 | || dma->actual_len < qh->maxpacket); | ||
| 1515 | |||
| 1516 | /* send IN token for next packet, without AUTOREQ */ | ||
| 1517 | if (!done) { | ||
| 1518 | val |= MUSB_RXCSR_H_REQPKT; | ||
| 1519 | musb_writew(epio, MUSB_RXCSR, | ||
| 1520 | MUSB_RXCSR_H_WZC_BITS | val); | ||
| 1521 | } | ||
| 1522 | |||
| 1523 | DBG(4, "ep %d dma %s, rxcsr %04x, rxcount %d\n", epnum, | ||
| 1524 | done ? "off" : "reset", | ||
| 1525 | musb_readw(epio, MUSB_RXCSR), | ||
| 1526 | musb_readw(epio, MUSB_RXCOUNT)); | ||
| 1527 | #else | ||
| 1528 | done = true; | ||
| 1529 | #endif | ||
| 1530 | } else if (urb->status == -EINPROGRESS) { | ||
| 1531 | /* if no errors, be sure a packet is ready for unloading */ | ||
| 1532 | if (unlikely(!(rx_csr & MUSB_RXCSR_RXPKTRDY))) { | ||
| 1533 | status = -EPROTO; | ||
| 1534 | ERR("Rx interrupt with no errors or packet!\n"); | ||
| 1535 | |||
| 1536 | /* FIXME this is another "SHOULD NEVER HAPPEN" */ | ||
| 1537 | |||
| 1538 | /* SCRUB (RX) */ | ||
| 1539 | /* do the proper sequence to abort the transfer */ | ||
| 1540 | musb_ep_select(mbase, epnum); | ||
| 1541 | val &= ~MUSB_RXCSR_H_REQPKT; | ||
| 1542 | musb_writew(epio, MUSB_RXCSR, val); | ||
| 1543 | goto finish; | ||
| 1544 | } | ||
| 1545 | |||
| 1546 | /* we are expecting IN packets */ | ||
| 1547 | #ifdef CONFIG_USB_INVENTRA_DMA | ||
| 1548 | if (dma) { | ||
| 1549 | struct dma_controller *c; | ||
| 1550 | u16 rx_count; | ||
| 1551 | int ret; | ||
| 1552 | |||
| 1553 | rx_count = musb_readw(epio, MUSB_RXCOUNT); | ||
| 1554 | |||
| 1555 | DBG(2, "RX%d count %d, buffer 0x%x len %d/%d\n", | ||
| 1556 | epnum, rx_count, | ||
| 1557 | urb->transfer_dma | ||
| 1558 | + urb->actual_length, | ||
| 1559 | qh->offset, | ||
| 1560 | urb->transfer_buffer_length); | ||
| 1561 | |||
| 1562 | c = musb->dma_controller; | ||
| 1563 | |||
| 1564 | dma->desired_mode = 0; | ||
| 1565 | #ifdef USE_MODE1 | ||
| 1566 | /* because of the issue below, mode 1 will | ||
| 1567 | * only rarely behave with correct semantics. | ||
| 1568 | */ | ||
| 1569 | if ((urb->transfer_flags & | ||
| 1570 | URB_SHORT_NOT_OK) | ||
| 1571 | && (urb->transfer_buffer_length - | ||
| 1572 | urb->actual_length) | ||
| 1573 | > qh->maxpacket) | ||
| 1574 | dma->desired_mode = 1; | ||
| 1575 | #endif | ||
| 1576 | |||
| 1577 | /* Disadvantage of using mode 1: | ||
| 1578 | * It's basically usable only for mass storage class; essentially all | ||
| 1579 | * other protocols also terminate transfers on short packets. | ||
| 1580 | * | ||
| 1581 | * Details: | ||
| 1582 | * An extra IN token is sent at the end of the transfer (due to AUTOREQ) | ||
| 1583 | * If you try to use mode 1 for (transfer_buffer_length - 512), and try | ||
| 1584 | * to use the extra IN token to grab the last packet using mode 0, then | ||
| 1585 | * the problem is that you cannot be sure when the device will send the | ||
| 1586 | * last packet and RxPktRdy set. Sometimes the packet is recd too soon | ||
| 1587 | * such that it gets lost when RxCSR is re-set at the end of the mode 1 | ||
| 1588 | * transfer, while sometimes it is recd just a little late so that if you | ||
| 1589 | * try to configure for mode 0 soon after the mode 1 transfer is | ||
| 1590 | * completed, you will find rxcount 0. Okay, so you might think why not | ||
| 1591 | * wait for an interrupt when the pkt is recd. Well, you won't get any! | ||
| 1592 | */ | ||
| 1593 | |||
| 1594 | val = musb_readw(epio, MUSB_RXCSR); | ||
| 1595 | val &= ~MUSB_RXCSR_H_REQPKT; | ||
| 1596 | |||
| 1597 | if (dma->desired_mode == 0) | ||
| 1598 | val &= ~MUSB_RXCSR_H_AUTOREQ; | ||
| 1599 | else | ||
| 1600 | val |= MUSB_RXCSR_H_AUTOREQ; | ||
| 1601 | val |= MUSB_RXCSR_AUTOCLEAR | MUSB_RXCSR_DMAENAB; | ||
| 1602 | |||
| 1603 | musb_writew(epio, MUSB_RXCSR, | ||
| 1604 | MUSB_RXCSR_H_WZC_BITS | val); | ||
| 1605 | |||
| 1606 | /* REVISIT if when actual_length != 0, | ||
| 1607 | * transfer_buffer_length needs to be | ||
| 1608 | * adjusted first... | ||
| 1609 | */ | ||
| 1610 | ret = c->channel_program( | ||
| 1611 | dma, qh->maxpacket, | ||
| 1612 | dma->desired_mode, | ||
| 1613 | urb->transfer_dma | ||
| 1614 | + urb->actual_length, | ||
| 1615 | (dma->desired_mode == 0) | ||
| 1616 | ? rx_count | ||
| 1617 | : urb->transfer_buffer_length); | ||
| 1618 | |||
| 1619 | if (!ret) { | ||
| 1620 | c->channel_release(dma); | ||
| 1621 | hw_ep->rx_channel = NULL; | ||
| 1622 | dma = NULL; | ||
| 1623 | /* REVISIT reset CSR */ | ||
| 1624 | } | ||
| 1625 | } | ||
| 1626 | #endif /* Mentor DMA */ | ||
| 1627 | |||
| 1628 | if (!dma) { | ||
| 1629 | done = musb_host_packet_rx(musb, urb, | ||
| 1630 | epnum, iso_err); | ||
| 1631 | DBG(6, "read %spacket\n", done ? "last " : ""); | ||
| 1632 | } | ||
| 1633 | } | ||
| 1634 | |||
| 1635 | if (dma && usb_pipeisoc(pipe)) { | ||
| 1636 | struct usb_iso_packet_descriptor *d; | ||
| 1637 | int iso_stat = status; | ||
| 1638 | |||
| 1639 | d = urb->iso_frame_desc + qh->iso_idx; | ||
| 1640 | d->actual_length += xfer_len; | ||
| 1641 | if (iso_err) { | ||
| 1642 | iso_stat = -EILSEQ; | ||
| 1643 | urb->error_count++; | ||
| 1644 | } | ||
| 1645 | d->status = iso_stat; | ||
| 1646 | } | ||
| 1647 | |||
| 1648 | finish: | ||
| 1649 | urb->actual_length += xfer_len; | ||
| 1650 | qh->offset += xfer_len; | ||
| 1651 | if (done) { | ||
| 1652 | if (urb->status == -EINPROGRESS) | ||
| 1653 | urb->status = status; | ||
| 1654 | musb_advance_schedule(musb, urb, hw_ep, USB_DIR_IN); | ||
| 1655 | } | ||
| 1656 | } | ||
| 1657 | |||
| 1658 | /* schedule nodes correspond to peripheral endpoints, like an OHCI QH. | ||
| 1659 | * the software schedule associates multiple such nodes with a given | ||
| 1660 | * host side hardware endpoint + direction; scheduling may activate | ||
| 1661 | * that hardware endpoint. | ||
| 1662 | */ | ||
| 1663 | static int musb_schedule( | ||
| 1664 | struct musb *musb, | ||
| 1665 | struct musb_qh *qh, | ||
| 1666 | int is_in) | ||
| 1667 | { | ||
| 1668 | int idle; | ||
| 1669 | int best_diff; | ||
| 1670 | int best_end, epnum; | ||
| 1671 | struct musb_hw_ep *hw_ep = NULL; | ||
| 1672 | struct list_head *head = NULL; | ||
| 1673 | |||
| 1674 | /* use fixed hardware for control and bulk */ | ||
| 1675 | switch (qh->type) { | ||
| 1676 | case USB_ENDPOINT_XFER_CONTROL: | ||
| 1677 | head = &musb->control; | ||
| 1678 | hw_ep = musb->control_ep; | ||
| 1679 | break; | ||
| 1680 | case USB_ENDPOINT_XFER_BULK: | ||
| 1681 | hw_ep = musb->bulk_ep; | ||
| 1682 | if (is_in) | ||
| 1683 | head = &musb->in_bulk; | ||
| 1684 | else | ||
| 1685 | head = &musb->out_bulk; | ||
| 1686 | break; | ||
| 1687 | } | ||
| 1688 | if (head) { | ||
| 1689 | idle = list_empty(head); | ||
| 1690 | list_add_tail(&qh->ring, head); | ||
| 1691 | goto success; | ||
| 1692 | } | ||
| 1693 | |||
| 1694 | /* else, periodic transfers get muxed to other endpoints */ | ||
| 1695 | |||
| 1696 | /* FIXME this doesn't consider direction, so it can only | ||
| 1697 | * work for one half of the endpoint hardware, and assumes | ||
| 1698 | * the previous cases handled all non-shared endpoints... | ||
| 1699 | */ | ||
| 1700 | |||
| 1701 | /* we know this qh hasn't been scheduled, so all we need to do | ||
| 1702 | * is choose which hardware endpoint to put it on ... | ||
| 1703 | * | ||
| 1704 | * REVISIT what we really want here is a regular schedule tree | ||
| 1705 | * like e.g. OHCI uses, but for now musb->periodic is just an | ||
| 1706 | * array of the _single_ logical endpoint associated with a | ||
| 1707 | * given physical one (identity mapping logical->physical). | ||
| 1708 | * | ||
| 1709 | * that simplistic approach makes TT scheduling a lot simpler; | ||
| 1710 | * there is none, and thus none of its complexity... | ||
| 1711 | */ | ||
| 1712 | best_diff = 4096; | ||
| 1713 | best_end = -1; | ||
| 1714 | |||
| 1715 | for (epnum = 1; epnum < musb->nr_endpoints; epnum++) { | ||
| 1716 | int diff; | ||
| 1717 | |||
| 1718 | if (musb->periodic[epnum]) | ||
| 1719 | continue; | ||
| 1720 | hw_ep = &musb->endpoints[epnum]; | ||
| 1721 | if (hw_ep == musb->bulk_ep) | ||
| 1722 | continue; | ||
| 1723 | |||
| 1724 | if (is_in) | ||
| 1725 | diff = hw_ep->max_packet_sz_rx - qh->maxpacket; | ||
| 1726 | else | ||
| 1727 | diff = hw_ep->max_packet_sz_tx - qh->maxpacket; | ||
| 1728 | |||
| 1729 | if (diff > 0 && best_diff > diff) { | ||
| 1730 | best_diff = diff; | ||
| 1731 | best_end = epnum; | ||
| 1732 | } | ||
| 1733 | } | ||
| 1734 | if (best_end < 0) | ||
| 1735 | return -ENOSPC; | ||
| 1736 | |||
| 1737 | idle = 1; | ||
| 1738 | hw_ep = musb->endpoints + best_end; | ||
| 1739 | musb->periodic[best_end] = qh; | ||
| 1740 | DBG(4, "qh %p periodic slot %d\n", qh, best_end); | ||
| 1741 | success: | ||
| 1742 | qh->hw_ep = hw_ep; | ||
| 1743 | qh->hep->hcpriv = qh; | ||
| 1744 | if (idle) | ||
| 1745 | musb_start_urb(musb, is_in, qh); | ||
| 1746 | return 0; | ||
| 1747 | } | ||
| 1748 | |||
| 1749 | static int musb_urb_enqueue( | ||
| 1750 | struct usb_hcd *hcd, | ||
| 1751 | struct urb *urb, | ||
| 1752 | gfp_t mem_flags) | ||
| 1753 | { | ||
| 1754 | unsigned long flags; | ||
| 1755 | struct musb *musb = hcd_to_musb(hcd); | ||
| 1756 | struct usb_host_endpoint *hep = urb->ep; | ||
| 1757 | struct musb_qh *qh = hep->hcpriv; | ||
| 1758 | struct usb_endpoint_descriptor *epd = &hep->desc; | ||
| 1759 | int ret; | ||
| 1760 | unsigned type_reg; | ||
| 1761 | unsigned interval; | ||
| 1762 | |||
| 1763 | /* host role must be active */ | ||
| 1764 | if (!is_host_active(musb) || !musb->is_active) | ||
| 1765 | return -ENODEV; | ||
| 1766 | |||
| 1767 | spin_lock_irqsave(&musb->lock, flags); | ||
| 1768 | ret = usb_hcd_link_urb_to_ep(hcd, urb); | ||
| 1769 | spin_unlock_irqrestore(&musb->lock, flags); | ||
| 1770 | if (ret) | ||
| 1771 | return ret; | ||
| 1772 | |||
| 1773 | /* DMA mapping was already done, if needed, and this urb is on | ||
| 1774 | * hep->urb_list ... so there's little to do unless hep wasn't | ||
| 1775 | * yet scheduled onto a live qh. | ||
| 1776 | * | ||
| 1777 | * REVISIT best to keep hep->hcpriv valid until the endpoint gets | ||
| 1778 | * disabled, testing for empty qh->ring and avoiding qh setup costs | ||
| 1779 | * except for the first urb queued after a config change. | ||
| 1780 | */ | ||
| 1781 | if (qh) { | ||
| 1782 | urb->hcpriv = qh; | ||
| 1783 | return 0; | ||
| 1784 | } | ||
| 1785 | |||
| 1786 | /* Allocate and initialize qh, minimizing the work done each time | ||
| 1787 | * hw_ep gets reprogrammed, or with irqs blocked. Then schedule it. | ||
| 1788 | * | ||
| 1789 | * REVISIT consider a dedicated qh kmem_cache, so it's harder | ||
| 1790 | * for bugs in other kernel code to break this driver... | ||
| 1791 | */ | ||
| 1792 | qh = kzalloc(sizeof *qh, mem_flags); | ||
| 1793 | if (!qh) { | ||
| 1794 | usb_hcd_unlink_urb_from_ep(hcd, urb); | ||
| 1795 | return -ENOMEM; | ||
| 1796 | } | ||
| 1797 | |||
| 1798 | qh->hep = hep; | ||
| 1799 | qh->dev = urb->dev; | ||
| 1800 | INIT_LIST_HEAD(&qh->ring); | ||
| 1801 | qh->is_ready = 1; | ||
| 1802 | |||
| 1803 | qh->maxpacket = le16_to_cpu(epd->wMaxPacketSize); | ||
| 1804 | |||
| 1805 | /* no high bandwidth support yet */ | ||
| 1806 | if (qh->maxpacket & ~0x7ff) { | ||
| 1807 | ret = -EMSGSIZE; | ||
| 1808 | goto done; | ||
| 1809 | } | ||
| 1810 | |||
| 1811 | qh->epnum = epd->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK; | ||
| 1812 | qh->type = epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK; | ||
| 1813 | |||
| 1814 | /* NOTE: urb->dev->devnum is wrong during SET_ADDRESS */ | ||
| 1815 | qh->addr_reg = (u8) usb_pipedevice(urb->pipe); | ||
| 1816 | |||
| 1817 | /* precompute rxtype/txtype/type0 register */ | ||
| 1818 | type_reg = (qh->type << 4) | qh->epnum; | ||
| 1819 | switch (urb->dev->speed) { | ||
| 1820 | case USB_SPEED_LOW: | ||
| 1821 | type_reg |= 0xc0; | ||
| 1822 | break; | ||
| 1823 | case USB_SPEED_FULL: | ||
| 1824 | type_reg |= 0x80; | ||
| 1825 | break; | ||
| 1826 | default: | ||
| 1827 | type_reg |= 0x40; | ||
| 1828 | } | ||
| 1829 | qh->type_reg = type_reg; | ||
| 1830 | |||
| 1831 | /* precompute rxinterval/txinterval register */ | ||
| 1832 | interval = min((u8)16, epd->bInterval); /* log encoding */ | ||
| 1833 | switch (qh->type) { | ||
| 1834 | case USB_ENDPOINT_XFER_INT: | ||
| 1835 | /* fullspeed uses linear encoding */ | ||
| 1836 | if (USB_SPEED_FULL == urb->dev->speed) { | ||
| 1837 | interval = epd->bInterval; | ||
| 1838 | if (!interval) | ||
| 1839 | interval = 1; | ||
| 1840 | } | ||
| 1841 | /* FALLTHROUGH */ | ||
| 1842 | case USB_ENDPOINT_XFER_ISOC: | ||
| 1843 | /* iso always uses log encoding */ | ||
| 1844 | break; | ||
| 1845 | default: | ||
| 1846 | /* REVISIT we actually want to use NAK limits, hinting to the | ||
| 1847 | * transfer scheduling logic to try some other qh, e.g. try | ||
| 1848 | * for 2 msec first: | ||
| 1849 | * | ||
| 1850 | * interval = (USB_SPEED_HIGH == urb->dev->speed) ? 16 : 2; | ||
| 1851 | * | ||
| 1852 | * The downside of disabling this is that transfer scheduling | ||
| 1853 | * gets VERY unfair for nonperiodic transfers; a misbehaving | ||
| 1854 | * peripheral could make that hurt. Or for reads, one that's | ||
| 1855 | * perfectly normal: network and other drivers keep reads | ||
| 1856 | * posted at all times, having one pending for a week should | ||
| 1857 | * be perfectly safe. | ||
| 1858 | * | ||
| 1859 | * The upside of disabling it is avoidng transfer scheduling | ||
| 1860 | * code to put this aside for while. | ||
| 1861 | */ | ||
| 1862 | interval = 0; | ||
| 1863 | } | ||
| 1864 | qh->intv_reg = interval; | ||
| 1865 | |||
| 1866 | /* precompute addressing for external hub/tt ports */ | ||
| 1867 | if (musb->is_multipoint) { | ||
| 1868 | struct usb_device *parent = urb->dev->parent; | ||
| 1869 | |||
| 1870 | if (parent != hcd->self.root_hub) { | ||
| 1871 | qh->h_addr_reg = (u8) parent->devnum; | ||
| 1872 | |||
| 1873 | /* set up tt info if needed */ | ||
| 1874 | if (urb->dev->tt) { | ||
| 1875 | qh->h_port_reg = (u8) urb->dev->ttport; | ||
| 1876 | qh->h_addr_reg |= 0x80; | ||
| 1877 | } | ||
| 1878 | } | ||
| 1879 | } | ||
| 1880 | |||
| 1881 | /* invariant: hep->hcpriv is null OR the qh that's already scheduled. | ||
| 1882 | * until we get real dma queues (with an entry for each urb/buffer), | ||
| 1883 | * we only have work to do in the former case. | ||
| 1884 | */ | ||
| 1885 | spin_lock_irqsave(&musb->lock, flags); | ||
| 1886 | if (hep->hcpriv) { | ||
| 1887 | /* some concurrent activity submitted another urb to hep... | ||
| 1888 | * odd, rare, error prone, but legal. | ||
| 1889 | */ | ||
| 1890 | kfree(qh); | ||
| 1891 | ret = 0; | ||
| 1892 | } else | ||
| 1893 | ret = musb_schedule(musb, qh, | ||
| 1894 | epd->bEndpointAddress & USB_ENDPOINT_DIR_MASK); | ||
| 1895 | |||
| 1896 | if (ret == 0) { | ||
| 1897 | urb->hcpriv = qh; | ||
| 1898 | /* FIXME set urb->start_frame for iso/intr, it's tested in | ||
| 1899 | * musb_start_urb(), but otherwise only konicawc cares ... | ||
| 1900 | */ | ||
| 1901 | } | ||
| 1902 | spin_unlock_irqrestore(&musb->lock, flags); | ||
| 1903 | |||
| 1904 | done: | ||
| 1905 | if (ret != 0) { | ||
| 1906 | usb_hcd_unlink_urb_from_ep(hcd, urb); | ||
| 1907 | kfree(qh); | ||
| 1908 | } | ||
| 1909 | return ret; | ||
| 1910 | } | ||
| 1911 | |||
| 1912 | |||
| 1913 | /* | ||
| 1914 | * abort a transfer that's at the head of a hardware queue. | ||
| 1915 | * called with controller locked, irqs blocked | ||
| 1916 | * that hardware queue advances to the next transfer, unless prevented | ||
| 1917 | */ | ||
| 1918 | static int musb_cleanup_urb(struct urb *urb, struct musb_qh *qh, int is_in) | ||
| 1919 | { | ||
| 1920 | struct musb_hw_ep *ep = qh->hw_ep; | ||
| 1921 | void __iomem *epio = ep->regs; | ||
| 1922 | unsigned hw_end = ep->epnum; | ||
| 1923 | void __iomem *regs = ep->musb->mregs; | ||
| 1924 | u16 csr; | ||
| 1925 | int status = 0; | ||
| 1926 | |||
| 1927 | musb_ep_select(regs, hw_end); | ||
| 1928 | |||
| 1929 | if (is_dma_capable()) { | ||
| 1930 | struct dma_channel *dma; | ||
| 1931 | |||
| 1932 | dma = is_in ? ep->rx_channel : ep->tx_channel; | ||
| 1933 | if (dma) { | ||
| 1934 | status = ep->musb->dma_controller->channel_abort(dma); | ||
| 1935 | DBG(status ? 1 : 3, | ||
| 1936 | "abort %cX%d DMA for urb %p --> %d\n", | ||
| 1937 | is_in ? 'R' : 'T', ep->epnum, | ||
| 1938 | urb, status); | ||
| 1939 | urb->actual_length += dma->actual_len; | ||
| 1940 | } | ||
| 1941 | } | ||
| 1942 | |||
| 1943 | /* turn off DMA requests, discard state, stop polling ... */ | ||
| 1944 | if (is_in) { | ||
| 1945 | /* giveback saves bulk toggle */ | ||
| 1946 | csr = musb_h_flush_rxfifo(ep, 0); | ||
| 1947 | |||
| 1948 | /* REVISIT we still get an irq; should likely clear the | ||
| 1949 | * endpoint's irq status here to avoid bogus irqs. | ||
| 1950 | * clearing that status is platform-specific... | ||
| 1951 | */ | ||
| 1952 | } else { | ||
| 1953 | musb_h_tx_flush_fifo(ep); | ||
| 1954 | csr = musb_readw(epio, MUSB_TXCSR); | ||
| 1955 | csr &= ~(MUSB_TXCSR_AUTOSET | ||
| 1956 | | MUSB_TXCSR_DMAENAB | ||
| 1957 | | MUSB_TXCSR_H_RXSTALL | ||
| 1958 | | MUSB_TXCSR_H_NAKTIMEOUT | ||
| 1959 | | MUSB_TXCSR_H_ERROR | ||
| 1960 | | MUSB_TXCSR_TXPKTRDY); | ||
| 1961 | musb_writew(epio, MUSB_TXCSR, csr); | ||
| 1962 | /* REVISIT may need to clear FLUSHFIFO ... */ | ||
| 1963 | musb_writew(epio, MUSB_TXCSR, csr); | ||
| 1964 | /* flush cpu writebuffer */ | ||
| 1965 | csr = musb_readw(epio, MUSB_TXCSR); | ||
| 1966 | } | ||
| 1967 | if (status == 0) | ||
| 1968 | musb_advance_schedule(ep->musb, urb, ep, is_in); | ||
| 1969 | return status; | ||
| 1970 | } | ||
| 1971 | |||
| 1972 | static int musb_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status) | ||
| 1973 | { | ||
| 1974 | struct musb *musb = hcd_to_musb(hcd); | ||
| 1975 | struct musb_qh *qh; | ||
| 1976 | struct list_head *sched; | ||
| 1977 | unsigned long flags; | ||
| 1978 | int ret; | ||
| 1979 | |||
| 1980 | DBG(4, "urb=%p, dev%d ep%d%s\n", urb, | ||
| 1981 | usb_pipedevice(urb->pipe), | ||
| 1982 | usb_pipeendpoint(urb->pipe), | ||
| 1983 | usb_pipein(urb->pipe) ? "in" : "out"); | ||
| 1984 | |||
| 1985 | spin_lock_irqsave(&musb->lock, flags); | ||
| 1986 | ret = usb_hcd_check_unlink_urb(hcd, urb, status); | ||
| 1987 | if (ret) | ||
| 1988 | goto done; | ||
| 1989 | |||
| 1990 | qh = urb->hcpriv; | ||
| 1991 | if (!qh) | ||
| 1992 | goto done; | ||
| 1993 | |||
| 1994 | /* Any URB not actively programmed into endpoint hardware can be | ||
| 1995 | * immediately given back. Such an URB must be at the head of its | ||
| 1996 | * endpoint queue, unless someday we get real DMA queues. And even | ||
| 1997 | * then, it might not be known to the hardware... | ||
| 1998 | * | ||
| 1999 | * Otherwise abort current transfer, pending dma, etc.; urb->status | ||
| 2000 | * has already been updated. This is a synchronous abort; it'd be | ||
| 2001 | * OK to hold off until after some IRQ, though. | ||
| 2002 | */ | ||
| 2003 | if (!qh->is_ready || urb->urb_list.prev != &qh->hep->urb_list) | ||
| 2004 | ret = -EINPROGRESS; | ||
| 2005 | else { | ||
| 2006 | switch (qh->type) { | ||
| 2007 | case USB_ENDPOINT_XFER_CONTROL: | ||
| 2008 | sched = &musb->control; | ||
| 2009 | break; | ||
| 2010 | case USB_ENDPOINT_XFER_BULK: | ||
| 2011 | if (usb_pipein(urb->pipe)) | ||
| 2012 | sched = &musb->in_bulk; | ||
| 2013 | else | ||
| 2014 | sched = &musb->out_bulk; | ||
| 2015 | break; | ||
| 2016 | default: | ||
| 2017 | /* REVISIT when we get a schedule tree, periodic | ||
| 2018 | * transfers won't always be at the head of a | ||
| 2019 | * singleton queue... | ||
| 2020 | */ | ||
| 2021 | sched = NULL; | ||
| 2022 | break; | ||
| 2023 | } | ||
| 2024 | } | ||
| 2025 | |||
| 2026 | /* NOTE: qh is invalid unless !list_empty(&hep->urb_list) */ | ||
| 2027 | if (ret < 0 || (sched && qh != first_qh(sched))) { | ||
| 2028 | int ready = qh->is_ready; | ||
| 2029 | |||
| 2030 | ret = 0; | ||
| 2031 | qh->is_ready = 0; | ||
| 2032 | __musb_giveback(musb, urb, 0); | ||
| 2033 | qh->is_ready = ready; | ||
| 2034 | } else | ||
| 2035 | ret = musb_cleanup_urb(urb, qh, urb->pipe & USB_DIR_IN); | ||
| 2036 | done: | ||
| 2037 | spin_unlock_irqrestore(&musb->lock, flags); | ||
| 2038 | return ret; | ||
| 2039 | } | ||
| 2040 | |||
| 2041 | /* disable an endpoint */ | ||
| 2042 | static void | ||
| 2043 | musb_h_disable(struct usb_hcd *hcd, struct usb_host_endpoint *hep) | ||
| 2044 | { | ||
| 2045 | u8 epnum = hep->desc.bEndpointAddress; | ||
| 2046 | unsigned long flags; | ||
| 2047 | struct musb *musb = hcd_to_musb(hcd); | ||
| 2048 | u8 is_in = epnum & USB_DIR_IN; | ||
| 2049 | struct musb_qh *qh = hep->hcpriv; | ||
| 2050 | struct urb *urb, *tmp; | ||
| 2051 | struct list_head *sched; | ||
| 2052 | |||
| 2053 | if (!qh) | ||
| 2054 | return; | ||
| 2055 | |||
| 2056 | spin_lock_irqsave(&musb->lock, flags); | ||
| 2057 | |||
| 2058 | switch (qh->type) { | ||
| 2059 | case USB_ENDPOINT_XFER_CONTROL: | ||
| 2060 | sched = &musb->control; | ||
| 2061 | break; | ||
| 2062 | case USB_ENDPOINT_XFER_BULK: | ||
| 2063 | if (is_in) | ||
| 2064 | sched = &musb->in_bulk; | ||
| 2065 | else | ||
| 2066 | sched = &musb->out_bulk; | ||
| 2067 | break; | ||
| 2068 | default: | ||
| 2069 | /* REVISIT when we get a schedule tree, periodic transfers | ||
| 2070 | * won't always be at the head of a singleton queue... | ||
| 2071 | */ | ||
| 2072 | sched = NULL; | ||
| 2073 | break; | ||
| 2074 | } | ||
| 2075 | |||
| 2076 | /* NOTE: qh is invalid unless !list_empty(&hep->urb_list) */ | ||
| 2077 | |||
| 2078 | /* kick first urb off the hardware, if needed */ | ||
| 2079 | qh->is_ready = 0; | ||
| 2080 | if (!sched || qh == first_qh(sched)) { | ||
| 2081 | urb = next_urb(qh); | ||
| 2082 | |||
| 2083 | /* make software (then hardware) stop ASAP */ | ||
| 2084 | if (!urb->unlinked) | ||
| 2085 | urb->status = -ESHUTDOWN; | ||
| 2086 | |||
| 2087 | /* cleanup */ | ||
| 2088 | musb_cleanup_urb(urb, qh, urb->pipe & USB_DIR_IN); | ||
| 2089 | } else | ||
| 2090 | urb = NULL; | ||
| 2091 | |||
| 2092 | /* then just nuke all the others */ | ||
| 2093 | list_for_each_entry_safe_from(urb, tmp, &hep->urb_list, urb_list) | ||
| 2094 | musb_giveback(qh, urb, -ESHUTDOWN); | ||
| 2095 | |||
| 2096 | spin_unlock_irqrestore(&musb->lock, flags); | ||
| 2097 | } | ||
| 2098 | |||
| 2099 | static int musb_h_get_frame_number(struct usb_hcd *hcd) | ||
| 2100 | { | ||
| 2101 | struct musb *musb = hcd_to_musb(hcd); | ||
| 2102 | |||
| 2103 | return musb_readw(musb->mregs, MUSB_FRAME); | ||
| 2104 | } | ||
| 2105 | |||
| 2106 | static int musb_h_start(struct usb_hcd *hcd) | ||
| 2107 | { | ||
| 2108 | struct musb *musb = hcd_to_musb(hcd); | ||
| 2109 | |||
| 2110 | /* NOTE: musb_start() is called when the hub driver turns | ||
| 2111 | * on port power, or when (OTG) peripheral starts. | ||
| 2112 | */ | ||
| 2113 | hcd->state = HC_STATE_RUNNING; | ||
| 2114 | musb->port1_status = 0; | ||
| 2115 | return 0; | ||
| 2116 | } | ||
| 2117 | |||
| 2118 | static void musb_h_stop(struct usb_hcd *hcd) | ||
| 2119 | { | ||
| 2120 | musb_stop(hcd_to_musb(hcd)); | ||
| 2121 | hcd->state = HC_STATE_HALT; | ||
| 2122 | } | ||
| 2123 | |||
| 2124 | static int musb_bus_suspend(struct usb_hcd *hcd) | ||
| 2125 | { | ||
| 2126 | struct musb *musb = hcd_to_musb(hcd); | ||
| 2127 | |||
| 2128 | if (musb->xceiv.state == OTG_STATE_A_SUSPEND) | ||
| 2129 | return 0; | ||
| 2130 | |||
| 2131 | if (is_host_active(musb) && musb->is_active) { | ||
| 2132 | WARNING("trying to suspend as %s is_active=%i\n", | ||
| 2133 | otg_state_string(musb), musb->is_active); | ||
| 2134 | return -EBUSY; | ||
| 2135 | } else | ||
| 2136 | return 0; | ||
| 2137 | } | ||
| 2138 | |||
| 2139 | static int musb_bus_resume(struct usb_hcd *hcd) | ||
| 2140 | { | ||
| 2141 | /* resuming child port does the work */ | ||
| 2142 | return 0; | ||
| 2143 | } | ||
| 2144 | |||
| 2145 | const struct hc_driver musb_hc_driver = { | ||
| 2146 | .description = "musb-hcd", | ||
| 2147 | .product_desc = "MUSB HDRC host driver", | ||
| 2148 | .hcd_priv_size = sizeof(struct musb), | ||
| 2149 | .flags = HCD_USB2 | HCD_MEMORY, | ||
| 2150 | |||
| 2151 | /* not using irq handler or reset hooks from usbcore, since | ||
| 2152 | * those must be shared with peripheral code for OTG configs | ||
| 2153 | */ | ||
| 2154 | |||
| 2155 | .start = musb_h_start, | ||
| 2156 | .stop = musb_h_stop, | ||
| 2157 | |||
| 2158 | .get_frame_number = musb_h_get_frame_number, | ||
| 2159 | |||
| 2160 | .urb_enqueue = musb_urb_enqueue, | ||
| 2161 | .urb_dequeue = musb_urb_dequeue, | ||
| 2162 | .endpoint_disable = musb_h_disable, | ||
| 2163 | |||
| 2164 | .hub_status_data = musb_hub_status_data, | ||
| 2165 | .hub_control = musb_hub_control, | ||
| 2166 | .bus_suspend = musb_bus_suspend, | ||
| 2167 | .bus_resume = musb_bus_resume, | ||
| 2168 | /* .start_port_reset = NULL, */ | ||
| 2169 | /* .hub_irq_enable = NULL, */ | ||
| 2170 | }; | ||
diff --git a/drivers/usb/musb/musb_host.h b/drivers/usb/musb/musb_host.h new file mode 100644 index 000000000000..77bcdb9d5b32 --- /dev/null +++ b/drivers/usb/musb/musb_host.h | |||
| @@ -0,0 +1,110 @@ | |||
| 1 | /* | ||
| 2 | * MUSB OTG driver host defines | ||
| 3 | * | ||
| 4 | * Copyright 2005 Mentor Graphics Corporation | ||
| 5 | * Copyright (C) 2005-2006 by Texas Instruments | ||
| 6 | * Copyright (C) 2006-2007 Nokia Corporation | ||
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or | ||
| 9 | * modify it under the terms of the GNU General Public License | ||
| 10 | * version 2 as published by the Free Software Foundation. | ||
| 11 | * | ||
| 12 | * This program is distributed in the hope that it will be useful, but | ||
| 13 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| 15 | * General Public License for more details. | ||
| 16 | * | ||
| 17 | * You should have received a copy of the GNU General Public License | ||
| 18 | * along with this program; if not, write to the Free Software | ||
| 19 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA | ||
| 20 | * 02110-1301 USA | ||
| 21 | * | ||
| 22 | * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED | ||
| 23 | * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF | ||
| 24 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN | ||
| 25 | * NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
| 26 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
| 27 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF | ||
| 28 | * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON | ||
| 29 | * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| 30 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
| 31 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| 32 | * | ||
| 33 | */ | ||
| 34 | |||
| 35 | #ifndef _MUSB_HOST_H | ||
| 36 | #define _MUSB_HOST_H | ||
| 37 | |||
| 38 | static inline struct usb_hcd *musb_to_hcd(struct musb *musb) | ||
| 39 | { | ||
| 40 | return container_of((void *) musb, struct usb_hcd, hcd_priv); | ||
| 41 | } | ||
| 42 | |||
| 43 | static inline struct musb *hcd_to_musb(struct usb_hcd *hcd) | ||
| 44 | { | ||
| 45 | return (struct musb *) (hcd->hcd_priv); | ||
| 46 | } | ||
| 47 | |||
| 48 | /* stored in "usb_host_endpoint.hcpriv" for scheduled endpoints */ | ||
| 49 | struct musb_qh { | ||
| 50 | struct usb_host_endpoint *hep; /* usbcore info */ | ||
| 51 | struct usb_device *dev; | ||
| 52 | struct musb_hw_ep *hw_ep; /* current binding */ | ||
| 53 | |||
| 54 | struct list_head ring; /* of musb_qh */ | ||
| 55 | /* struct musb_qh *next; */ /* for periodic tree */ | ||
| 56 | |||
| 57 | unsigned offset; /* in urb->transfer_buffer */ | ||
| 58 | unsigned segsize; /* current xfer fragment */ | ||
| 59 | |||
| 60 | u8 type_reg; /* {rx,tx} type register */ | ||
| 61 | u8 intv_reg; /* {rx,tx} interval register */ | ||
| 62 | u8 addr_reg; /* device address register */ | ||
| 63 | u8 h_addr_reg; /* hub address register */ | ||
| 64 | u8 h_port_reg; /* hub port register */ | ||
| 65 | |||
| 66 | u8 is_ready; /* safe to modify hw_ep */ | ||
| 67 | u8 type; /* XFERTYPE_* */ | ||
| 68 | u8 epnum; | ||
| 69 | u16 maxpacket; | ||
| 70 | u16 frame; /* for periodic schedule */ | ||
| 71 | unsigned iso_idx; /* in urb->iso_frame_desc[] */ | ||
| 72 | }; | ||
| 73 | |||
| 74 | /* map from control or bulk queue head to the first qh on that ring */ | ||
| 75 | static inline struct musb_qh *first_qh(struct list_head *q) | ||
| 76 | { | ||
| 77 | if (list_empty(q)) | ||
| 78 | return NULL; | ||
| 79 | return list_entry(q->next, struct musb_qh, ring); | ||
| 80 | } | ||
| 81 | |||
| 82 | |||
| 83 | extern void musb_root_disconnect(struct musb *musb); | ||
| 84 | |||
| 85 | struct usb_hcd; | ||
| 86 | |||
| 87 | extern int musb_hub_status_data(struct usb_hcd *hcd, char *buf); | ||
| 88 | extern int musb_hub_control(struct usb_hcd *hcd, | ||
| 89 | u16 typeReq, u16 wValue, u16 wIndex, | ||
| 90 | char *buf, u16 wLength); | ||
| 91 | |||
| 92 | extern const struct hc_driver musb_hc_driver; | ||
| 93 | |||
| 94 | static inline struct urb *next_urb(struct musb_qh *qh) | ||
| 95 | { | ||
| 96 | #ifdef CONFIG_USB_MUSB_HDRC_HCD | ||
| 97 | struct list_head *queue; | ||
| 98 | |||
| 99 | if (!qh) | ||
| 100 | return NULL; | ||
| 101 | queue = &qh->hep->urb_list; | ||
| 102 | if (list_empty(queue)) | ||
| 103 | return NULL; | ||
| 104 | return list_entry(queue->next, struct urb, urb_list); | ||
| 105 | #else | ||
| 106 | return NULL; | ||
| 107 | #endif | ||
| 108 | } | ||
| 109 | |||
| 110 | #endif /* _MUSB_HOST_H */ | ||
diff --git a/drivers/usb/musb/musb_io.h b/drivers/usb/musb/musb_io.h new file mode 100644 index 000000000000..6bbedae83af8 --- /dev/null +++ b/drivers/usb/musb/musb_io.h | |||
| @@ -0,0 +1,115 @@ | |||
| 1 | /* | ||
| 2 | * MUSB OTG driver register I/O | ||
| 3 | * | ||
| 4 | * Copyright 2005 Mentor Graphics Corporation | ||
| 5 | * Copyright (C) 2005-2006 by Texas Instruments | ||
| 6 | * Copyright (C) 2006-2007 Nokia Corporation | ||
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or | ||
| 9 | * modify it under the terms of the GNU General Public License | ||
| 10 | * version 2 as published by the Free Software Foundation. | ||
| 11 | * | ||
| 12 | * This program is distributed in the hope that it will be useful, but | ||
| 13 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| 15 | * General Public License for more details. | ||
| 16 | * | ||
| 17 | * You should have received a copy of the GNU General Public License | ||
| 18 | * along with this program; if not, write to the Free Software | ||
| 19 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA | ||
| 20 | * 02110-1301 USA | ||
| 21 | * | ||
| 22 | * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED | ||
| 23 | * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF | ||
| 24 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN | ||
| 25 | * NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
| 26 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
| 27 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF | ||
| 28 | * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON | ||
| 29 | * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| 30 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
| 31 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| 32 | * | ||
| 33 | */ | ||
| 34 | |||
| 35 | #ifndef __MUSB_LINUX_PLATFORM_ARCH_H__ | ||
| 36 | #define __MUSB_LINUX_PLATFORM_ARCH_H__ | ||
| 37 | |||
| 38 | #include <linux/io.h> | ||
| 39 | |||
| 40 | #ifndef CONFIG_ARM | ||
| 41 | static inline void readsl(const void __iomem *addr, void *buf, int len) | ||
| 42 | { insl((unsigned long)addr, buf, len); } | ||
| 43 | static inline void readsw(const void __iomem *addr, void *buf, int len) | ||
| 44 | { insw((unsigned long)addr, buf, len); } | ||
| 45 | static inline void readsb(const void __iomem *addr, void *buf, int len) | ||
| 46 | { insb((unsigned long)addr, buf, len); } | ||
| 47 | |||
| 48 | static inline void writesl(const void __iomem *addr, const void *buf, int len) | ||
| 49 | { outsl((unsigned long)addr, buf, len); } | ||
| 50 | static inline void writesw(const void __iomem *addr, const void *buf, int len) | ||
| 51 | { outsw((unsigned long)addr, buf, len); } | ||
| 52 | static inline void writesb(const void __iomem *addr, const void *buf, int len) | ||
| 53 | { outsb((unsigned long)addr, buf, len); } | ||
| 54 | |||
| 55 | #endif | ||
| 56 | |||
| 57 | /* NOTE: these offsets are all in bytes */ | ||
| 58 | |||
| 59 | static inline u16 musb_readw(const void __iomem *addr, unsigned offset) | ||
| 60 | { return __raw_readw(addr + offset); } | ||
| 61 | |||
| 62 | static inline u32 musb_readl(const void __iomem *addr, unsigned offset) | ||
| 63 | { return __raw_readl(addr + offset); } | ||
| 64 | |||
| 65 | |||
| 66 | static inline void musb_writew(void __iomem *addr, unsigned offset, u16 data) | ||
| 67 | { __raw_writew(data, addr + offset); } | ||
| 68 | |||
| 69 | static inline void musb_writel(void __iomem *addr, unsigned offset, u32 data) | ||
| 70 | { __raw_writel(data, addr + offset); } | ||
| 71 | |||
| 72 | |||
| 73 | #ifdef CONFIG_USB_TUSB6010 | ||
| 74 | |||
| 75 | /* | ||
| 76 | * TUSB6010 doesn't allow 8-bit access; 16-bit access is the minimum. | ||
| 77 | */ | ||
| 78 | static inline u8 musb_readb(const void __iomem *addr, unsigned offset) | ||
| 79 | { | ||
| 80 | u16 tmp; | ||
| 81 | u8 val; | ||
| 82 | |||
| 83 | tmp = __raw_readw(addr + (offset & ~1)); | ||
| 84 | if (offset & 1) | ||
| 85 | val = (tmp >> 8); | ||
| 86 | else | ||
| 87 | val = tmp & 0xff; | ||
| 88 | |||
| 89 | return val; | ||
| 90 | } | ||
| 91 | |||
| 92 | static inline void musb_writeb(void __iomem *addr, unsigned offset, u8 data) | ||
| 93 | { | ||
| 94 | u16 tmp; | ||
| 95 | |||
| 96 | tmp = __raw_readw(addr + (offset & ~1)); | ||
| 97 | if (offset & 1) | ||
| 98 | tmp = (data << 8) | (tmp & 0xff); | ||
| 99 | else | ||
| 100 | tmp = (tmp & 0xff00) | data; | ||
| 101 | |||
| 102 | __raw_writew(tmp, addr + (offset & ~1)); | ||
| 103 | } | ||
| 104 | |||
| 105 | #else | ||
| 106 | |||
| 107 | static inline u8 musb_readb(const void __iomem *addr, unsigned offset) | ||
| 108 | { return __raw_readb(addr + offset); } | ||
| 109 | |||
| 110 | static inline void musb_writeb(void __iomem *addr, unsigned offset, u8 data) | ||
| 111 | { __raw_writeb(data, addr + offset); } | ||
| 112 | |||
| 113 | #endif /* CONFIG_USB_TUSB6010 */ | ||
| 114 | |||
| 115 | #endif | ||
diff --git a/drivers/usb/musb/musb_regs.h b/drivers/usb/musb/musb_regs.h new file mode 100644 index 000000000000..9c228661aa5a --- /dev/null +++ b/drivers/usb/musb/musb_regs.h | |||
| @@ -0,0 +1,300 @@ | |||
| 1 | /* | ||
| 2 | * MUSB OTG driver register defines | ||
| 3 | * | ||
| 4 | * Copyright 2005 Mentor Graphics Corporation | ||
| 5 | * Copyright (C) 2005-2006 by Texas Instruments | ||
| 6 | * Copyright (C) 2006-2007 Nokia Corporation | ||
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or | ||
| 9 | * modify it under the terms of the GNU General Public License | ||
| 10 | * version 2 as published by the Free Software Foundation. | ||
| 11 | * | ||
| 12 | * This program is distributed in the hope that it will be useful, but | ||
| 13 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| 15 | * General Public License for more details. | ||
| 16 | * | ||
| 17 | * You should have received a copy of the GNU General Public License | ||
| 18 | * along with this program; if not, write to the Free Software | ||
| 19 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA | ||
| 20 | * 02110-1301 USA | ||
| 21 | * | ||
| 22 | * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED | ||
| 23 | * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF | ||
| 24 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN | ||
| 25 | * NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
| 26 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
| 27 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF | ||
| 28 | * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON | ||
| 29 | * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| 30 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
| 31 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| 32 | * | ||
| 33 | */ | ||
| 34 | |||
| 35 | #ifndef __MUSB_REGS_H__ | ||
| 36 | #define __MUSB_REGS_H__ | ||
| 37 | |||
| 38 | #define MUSB_EP0_FIFOSIZE 64 /* This is non-configurable */ | ||
| 39 | |||
| 40 | /* | ||
| 41 | * Common USB registers | ||
| 42 | */ | ||
| 43 | |||
| 44 | #define MUSB_FADDR 0x00 /* 8-bit */ | ||
| 45 | #define MUSB_POWER 0x01 /* 8-bit */ | ||
| 46 | |||
| 47 | #define MUSB_INTRTX 0x02 /* 16-bit */ | ||
| 48 | #define MUSB_INTRRX 0x04 | ||
| 49 | #define MUSB_INTRTXE 0x06 | ||
| 50 | #define MUSB_INTRRXE 0x08 | ||
| 51 | #define MUSB_INTRUSB 0x0A /* 8 bit */ | ||
| 52 | #define MUSB_INTRUSBE 0x0B /* 8 bit */ | ||
| 53 | #define MUSB_FRAME 0x0C | ||
| 54 | #define MUSB_INDEX 0x0E /* 8 bit */ | ||
| 55 | #define MUSB_TESTMODE 0x0F /* 8 bit */ | ||
| 56 | |||
| 57 | /* Get offset for a given FIFO from musb->mregs */ | ||
| 58 | #ifdef CONFIG_USB_TUSB6010 | ||
| 59 | #define MUSB_FIFO_OFFSET(epnum) (0x200 + ((epnum) * 0x20)) | ||
| 60 | #else | ||
| 61 | #define MUSB_FIFO_OFFSET(epnum) (0x20 + ((epnum) * 4)) | ||
| 62 | #endif | ||
| 63 | |||
| 64 | /* | ||
| 65 | * Additional Control Registers | ||
| 66 | */ | ||
| 67 | |||
| 68 | #define MUSB_DEVCTL 0x60 /* 8 bit */ | ||
| 69 | |||
| 70 | /* These are always controlled through the INDEX register */ | ||
| 71 | #define MUSB_TXFIFOSZ 0x62 /* 8-bit (see masks) */ | ||
| 72 | #define MUSB_RXFIFOSZ 0x63 /* 8-bit (see masks) */ | ||
| 73 | #define MUSB_TXFIFOADD 0x64 /* 16-bit offset shifted right 3 */ | ||
| 74 | #define MUSB_RXFIFOADD 0x66 /* 16-bit offset shifted right 3 */ | ||
| 75 | |||
| 76 | /* REVISIT: vctrl/vstatus: optional vendor utmi+phy register at 0x68 */ | ||
| 77 | #define MUSB_HWVERS 0x6C /* 8 bit */ | ||
| 78 | |||
| 79 | #define MUSB_EPINFO 0x78 /* 8 bit */ | ||
| 80 | #define MUSB_RAMINFO 0x79 /* 8 bit */ | ||
| 81 | #define MUSB_LINKINFO 0x7a /* 8 bit */ | ||
| 82 | #define MUSB_VPLEN 0x7b /* 8 bit */ | ||
| 83 | #define MUSB_HS_EOF1 0x7c /* 8 bit */ | ||
| 84 | #define MUSB_FS_EOF1 0x7d /* 8 bit */ | ||
| 85 | #define MUSB_LS_EOF1 0x7e /* 8 bit */ | ||
| 86 | |||
| 87 | /* Offsets to endpoint registers */ | ||
| 88 | #define MUSB_TXMAXP 0x00 | ||
| 89 | #define MUSB_TXCSR 0x02 | ||
| 90 | #define MUSB_CSR0 MUSB_TXCSR /* Re-used for EP0 */ | ||
| 91 | #define MUSB_RXMAXP 0x04 | ||
| 92 | #define MUSB_RXCSR 0x06 | ||
| 93 | #define MUSB_RXCOUNT 0x08 | ||
| 94 | #define MUSB_COUNT0 MUSB_RXCOUNT /* Re-used for EP0 */ | ||
| 95 | #define MUSB_TXTYPE 0x0A | ||
| 96 | #define MUSB_TYPE0 MUSB_TXTYPE /* Re-used for EP0 */ | ||
| 97 | #define MUSB_TXINTERVAL 0x0B | ||
| 98 | #define MUSB_NAKLIMIT0 MUSB_TXINTERVAL /* Re-used for EP0 */ | ||
| 99 | #define MUSB_RXTYPE 0x0C | ||
| 100 | #define MUSB_RXINTERVAL 0x0D | ||
| 101 | #define MUSB_FIFOSIZE 0x0F | ||
| 102 | #define MUSB_CONFIGDATA MUSB_FIFOSIZE /* Re-used for EP0 */ | ||
| 103 | |||
| 104 | /* Offsets to endpoint registers in indexed model (using INDEX register) */ | ||
| 105 | #define MUSB_INDEXED_OFFSET(_epnum, _offset) \ | ||
| 106 | (0x10 + (_offset)) | ||
| 107 | |||
| 108 | /* Offsets to endpoint registers in flat models */ | ||
| 109 | #define MUSB_FLAT_OFFSET(_epnum, _offset) \ | ||
| 110 | (0x100 + (0x10*(_epnum)) + (_offset)) | ||
| 111 | |||
| 112 | #ifdef CONFIG_USB_TUSB6010 | ||
| 113 | /* TUSB6010 EP0 configuration register is special */ | ||
| 114 | #define MUSB_TUSB_OFFSET(_epnum, _offset) \ | ||
| 115 | (0x10 + _offset) | ||
| 116 | #include "tusb6010.h" /* Needed "only" for TUSB_EP0_CONF */ | ||
| 117 | #endif | ||
| 118 | |||
| 119 | /* "bus control"/target registers, for host side multipoint (external hubs) */ | ||
| 120 | #define MUSB_TXFUNCADDR 0x00 | ||
| 121 | #define MUSB_TXHUBADDR 0x02 | ||
| 122 | #define MUSB_TXHUBPORT 0x03 | ||
| 123 | |||
| 124 | #define MUSB_RXFUNCADDR 0x04 | ||
| 125 | #define MUSB_RXHUBADDR 0x06 | ||
| 126 | #define MUSB_RXHUBPORT 0x07 | ||
| 127 | |||
| 128 | #define MUSB_BUSCTL_OFFSET(_epnum, _offset) \ | ||
| 129 | (0x80 + (8*(_epnum)) + (_offset)) | ||
| 130 | |||
| 131 | /* | ||
| 132 | * MUSB Register bits | ||
| 133 | */ | ||
| 134 | |||
| 135 | /* POWER */ | ||
| 136 | #define MUSB_POWER_ISOUPDATE 0x80 | ||
| 137 | #define MUSB_POWER_SOFTCONN 0x40 | ||
| 138 | #define MUSB_POWER_HSENAB 0x20 | ||
| 139 | #define MUSB_POWER_HSMODE 0x10 | ||
| 140 | #define MUSB_POWER_RESET 0x08 | ||
| 141 | #define MUSB_POWER_RESUME 0x04 | ||
| 142 | #define MUSB_POWER_SUSPENDM 0x02 | ||
| 143 | #define MUSB_POWER_ENSUSPEND 0x01 | ||
| 144 | |||
| 145 | /* INTRUSB */ | ||
| 146 | #define MUSB_INTR_SUSPEND 0x01 | ||
| 147 | #define MUSB_INTR_RESUME 0x02 | ||
| 148 | #define MUSB_INTR_RESET 0x04 | ||
| 149 | #define MUSB_INTR_BABBLE 0x04 | ||
| 150 | #define MUSB_INTR_SOF 0x08 | ||
| 151 | #define MUSB_INTR_CONNECT 0x10 | ||
| 152 | #define MUSB_INTR_DISCONNECT 0x20 | ||
| 153 | #define MUSB_INTR_SESSREQ 0x40 | ||
| 154 | #define MUSB_INTR_VBUSERROR 0x80 /* For SESSION end */ | ||
| 155 | |||
| 156 | /* DEVCTL */ | ||
| 157 | #define MUSB_DEVCTL_BDEVICE 0x80 | ||
| 158 | #define MUSB_DEVCTL_FSDEV 0x40 | ||
| 159 | #define MUSB_DEVCTL_LSDEV 0x20 | ||
| 160 | #define MUSB_DEVCTL_VBUS 0x18 | ||
| 161 | #define MUSB_DEVCTL_VBUS_SHIFT 3 | ||
| 162 | #define MUSB_DEVCTL_HM 0x04 | ||
| 163 | #define MUSB_DEVCTL_HR 0x02 | ||
| 164 | #define MUSB_DEVCTL_SESSION 0x01 | ||
| 165 | |||
| 166 | /* TESTMODE */ | ||
| 167 | #define MUSB_TEST_FORCE_HOST 0x80 | ||
| 168 | #define MUSB_TEST_FIFO_ACCESS 0x40 | ||
| 169 | #define MUSB_TEST_FORCE_FS 0x20 | ||
| 170 | #define MUSB_TEST_FORCE_HS 0x10 | ||
| 171 | #define MUSB_TEST_PACKET 0x08 | ||
| 172 | #define MUSB_TEST_K 0x04 | ||
| 173 | #define MUSB_TEST_J 0x02 | ||
| 174 | #define MUSB_TEST_SE0_NAK 0x01 | ||
| 175 | |||
| 176 | /* Allocate for double-packet buffering (effectively doubles assigned _SIZE) */ | ||
| 177 | #define MUSB_FIFOSZ_DPB 0x10 | ||
| 178 | /* Allocation size (8, 16, 32, ... 4096) */ | ||
| 179 | #define MUSB_FIFOSZ_SIZE 0x0f | ||
| 180 | |||
| 181 | /* CSR0 */ | ||
| 182 | #define MUSB_CSR0_FLUSHFIFO 0x0100 | ||
| 183 | #define MUSB_CSR0_TXPKTRDY 0x0002 | ||
| 184 | #define MUSB_CSR0_RXPKTRDY 0x0001 | ||
| 185 | |||
| 186 | /* CSR0 in Peripheral mode */ | ||
| 187 | #define MUSB_CSR0_P_SVDSETUPEND 0x0080 | ||
| 188 | #define MUSB_CSR0_P_SVDRXPKTRDY 0x0040 | ||
| 189 | #define MUSB_CSR0_P_SENDSTALL 0x0020 | ||
| 190 | #define MUSB_CSR0_P_SETUPEND 0x0010 | ||
| 191 | #define MUSB_CSR0_P_DATAEND 0x0008 | ||
| 192 | #define MUSB_CSR0_P_SENTSTALL 0x0004 | ||
| 193 | |||
| 194 | /* CSR0 in Host mode */ | ||
| 195 | #define MUSB_CSR0_H_DIS_PING 0x0800 | ||
| 196 | #define MUSB_CSR0_H_WR_DATATOGGLE 0x0400 /* Set to allow setting: */ | ||
| 197 | #define MUSB_CSR0_H_DATATOGGLE 0x0200 /* Data toggle control */ | ||
| 198 | #define MUSB_CSR0_H_NAKTIMEOUT 0x0080 | ||
| 199 | #define MUSB_CSR0_H_STATUSPKT 0x0040 | ||
| 200 | #define MUSB_CSR0_H_REQPKT 0x0020 | ||
| 201 | #define MUSB_CSR0_H_ERROR 0x0010 | ||
| 202 | #define MUSB_CSR0_H_SETUPPKT 0x0008 | ||
| 203 | #define MUSB_CSR0_H_RXSTALL 0x0004 | ||
| 204 | |||
| 205 | /* CSR0 bits to avoid zeroing (write zero clears, write 1 ignored) */ | ||
| 206 | #define MUSB_CSR0_P_WZC_BITS \ | ||
| 207 | (MUSB_CSR0_P_SENTSTALL) | ||
| 208 | #define MUSB_CSR0_H_WZC_BITS \ | ||
| 209 | (MUSB_CSR0_H_NAKTIMEOUT | MUSB_CSR0_H_RXSTALL \ | ||
| 210 | | MUSB_CSR0_RXPKTRDY) | ||
| 211 | |||
| 212 | /* TxType/RxType */ | ||
| 213 | #define MUSB_TYPE_SPEED 0xc0 | ||
| 214 | #define MUSB_TYPE_SPEED_SHIFT 6 | ||
| 215 | #define MUSB_TYPE_PROTO 0x30 /* Implicitly zero for ep0 */ | ||
| 216 | #define MUSB_TYPE_PROTO_SHIFT 4 | ||
| 217 | #define MUSB_TYPE_REMOTE_END 0xf /* Implicitly zero for ep0 */ | ||
| 218 | |||
| 219 | /* CONFIGDATA */ | ||
| 220 | #define MUSB_CONFIGDATA_MPRXE 0x80 /* Auto bulk pkt combining */ | ||
| 221 | #define MUSB_CONFIGDATA_MPTXE 0x40 /* Auto bulk pkt splitting */ | ||
| 222 | #define MUSB_CONFIGDATA_BIGENDIAN 0x20 | ||
| 223 | #define MUSB_CONFIGDATA_HBRXE 0x10 /* HB-ISO for RX */ | ||
| 224 | #define MUSB_CONFIGDATA_HBTXE 0x08 /* HB-ISO for TX */ | ||
| 225 | #define MUSB_CONFIGDATA_DYNFIFO 0x04 /* Dynamic FIFO sizing */ | ||
| 226 | #define MUSB_CONFIGDATA_SOFTCONE 0x02 /* SoftConnect */ | ||
| 227 | #define MUSB_CONFIGDATA_UTMIDW 0x01 /* Data width 0/1 => 8/16bits */ | ||
| 228 | |||
| 229 | /* TXCSR in Peripheral and Host mode */ | ||
| 230 | #define MUSB_TXCSR_AUTOSET 0x8000 | ||
| 231 | #define MUSB_TXCSR_MODE 0x2000 | ||
| 232 | #define MUSB_TXCSR_DMAENAB 0x1000 | ||
| 233 | #define MUSB_TXCSR_FRCDATATOG 0x0800 | ||
| 234 | #define MUSB_TXCSR_DMAMODE 0x0400 | ||
| 235 | #define MUSB_TXCSR_CLRDATATOG 0x0040 | ||
| 236 | #define MUSB_TXCSR_FLUSHFIFO 0x0008 | ||
| 237 | #define MUSB_TXCSR_FIFONOTEMPTY 0x0002 | ||
| 238 | #define MUSB_TXCSR_TXPKTRDY 0x0001 | ||
| 239 | |||
| 240 | /* TXCSR in Peripheral mode */ | ||
| 241 | #define MUSB_TXCSR_P_ISO 0x4000 | ||
| 242 | #define MUSB_TXCSR_P_INCOMPTX 0x0080 | ||
| 243 | #define MUSB_TXCSR_P_SENTSTALL 0x0020 | ||
| 244 | #define MUSB_TXCSR_P_SENDSTALL 0x0010 | ||
| 245 | #define MUSB_TXCSR_P_UNDERRUN 0x0004 | ||
| 246 | |||
| 247 | /* TXCSR in Host mode */ | ||
| 248 | #define MUSB_TXCSR_H_WR_DATATOGGLE 0x0200 | ||
| 249 | #define MUSB_TXCSR_H_DATATOGGLE 0x0100 | ||
| 250 | #define MUSB_TXCSR_H_NAKTIMEOUT 0x0080 | ||
| 251 | #define MUSB_TXCSR_H_RXSTALL 0x0020 | ||
| 252 | #define MUSB_TXCSR_H_ERROR 0x0004 | ||
| 253 | |||
| 254 | /* TXCSR bits to avoid zeroing (write zero clears, write 1 ignored) */ | ||
| 255 | #define MUSB_TXCSR_P_WZC_BITS \ | ||
| 256 | (MUSB_TXCSR_P_INCOMPTX | MUSB_TXCSR_P_SENTSTALL \ | ||
| 257 | | MUSB_TXCSR_P_UNDERRUN | MUSB_TXCSR_FIFONOTEMPTY) | ||
| 258 | #define MUSB_TXCSR_H_WZC_BITS \ | ||
| 259 | (MUSB_TXCSR_H_NAKTIMEOUT | MUSB_TXCSR_H_RXSTALL \ | ||
| 260 | | MUSB_TXCSR_H_ERROR | MUSB_TXCSR_FIFONOTEMPTY) | ||
| 261 | |||
| 262 | /* RXCSR in Peripheral and Host mode */ | ||
| 263 | #define MUSB_RXCSR_AUTOCLEAR 0x8000 | ||
| 264 | #define MUSB_RXCSR_DMAENAB 0x2000 | ||
| 265 | #define MUSB_RXCSR_DISNYET 0x1000 | ||
| 266 | #define MUSB_RXCSR_PID_ERR 0x1000 | ||
| 267 | #define MUSB_RXCSR_DMAMODE 0x0800 | ||
| 268 | #define MUSB_RXCSR_INCOMPRX 0x0100 | ||
| 269 | #define MUSB_RXCSR_CLRDATATOG 0x0080 | ||
| 270 | #define MUSB_RXCSR_FLUSHFIFO 0x0010 | ||
| 271 | #define MUSB_RXCSR_DATAERROR 0x0008 | ||
| 272 | #define MUSB_RXCSR_FIFOFULL 0x0002 | ||
| 273 | #define MUSB_RXCSR_RXPKTRDY 0x0001 | ||
| 274 | |||
| 275 | /* RXCSR in Peripheral mode */ | ||
| 276 | #define MUSB_RXCSR_P_ISO 0x4000 | ||
| 277 | #define MUSB_RXCSR_P_SENTSTALL 0x0040 | ||
| 278 | #define MUSB_RXCSR_P_SENDSTALL 0x0020 | ||
| 279 | #define MUSB_RXCSR_P_OVERRUN 0x0004 | ||
| 280 | |||
| 281 | /* RXCSR in Host mode */ | ||
| 282 | #define MUSB_RXCSR_H_AUTOREQ 0x4000 | ||
| 283 | #define MUSB_RXCSR_H_WR_DATATOGGLE 0x0400 | ||
| 284 | #define MUSB_RXCSR_H_DATATOGGLE 0x0200 | ||
| 285 | #define MUSB_RXCSR_H_RXSTALL 0x0040 | ||
| 286 | #define MUSB_RXCSR_H_REQPKT 0x0020 | ||
| 287 | #define MUSB_RXCSR_H_ERROR 0x0004 | ||
| 288 | |||
| 289 | /* RXCSR bits to avoid zeroing (write zero clears, write 1 ignored) */ | ||
| 290 | #define MUSB_RXCSR_P_WZC_BITS \ | ||
| 291 | (MUSB_RXCSR_P_SENTSTALL | MUSB_RXCSR_P_OVERRUN \ | ||
| 292 | | MUSB_RXCSR_RXPKTRDY) | ||
| 293 | #define MUSB_RXCSR_H_WZC_BITS \ | ||
| 294 | (MUSB_RXCSR_H_RXSTALL | MUSB_RXCSR_H_ERROR \ | ||
| 295 | | MUSB_RXCSR_DATAERROR | MUSB_RXCSR_RXPKTRDY) | ||
| 296 | |||
| 297 | /* HUBADDR */ | ||
| 298 | #define MUSB_HUBADDR_MULTI_TT 0x80 | ||
| 299 | |||
| 300 | #endif /* __MUSB_REGS_H__ */ | ||
diff --git a/drivers/usb/musb/musb_virthub.c b/drivers/usb/musb/musb_virthub.c new file mode 100644 index 000000000000..e0e9ce584175 --- /dev/null +++ b/drivers/usb/musb/musb_virthub.c | |||
| @@ -0,0 +1,425 @@ | |||
| 1 | /* | ||
| 2 | * MUSB OTG driver virtual root hub support | ||
| 3 | * | ||
| 4 | * Copyright 2005 Mentor Graphics Corporation | ||
| 5 | * Copyright (C) 2005-2006 by Texas Instruments | ||
| 6 | * Copyright (C) 2006-2007 Nokia Corporation | ||
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or | ||
| 9 | * modify it under the terms of the GNU General Public License | ||
| 10 | * version 2 as published by the Free Software Foundation. | ||
| 11 | * | ||
| 12 | * This program is distributed in the hope that it will be useful, but | ||
| 13 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| 15 | * General Public License for more details. | ||
| 16 | * | ||
| 17 | * You should have received a copy of the GNU General Public License | ||
| 18 | * along with this program; if not, write to the Free Software | ||
| 19 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA | ||
| 20 | * 02110-1301 USA | ||
| 21 | * | ||
| 22 | * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED | ||
| 23 | * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF | ||
| 24 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN | ||
| 25 | * NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
| 26 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
| 27 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF | ||
| 28 | * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON | ||
| 29 | * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| 30 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
| 31 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| 32 | * | ||
| 33 | */ | ||
| 34 | |||
| 35 | #include <linux/module.h> | ||
| 36 | #include <linux/kernel.h> | ||
| 37 | #include <linux/sched.h> | ||
| 38 | #include <linux/slab.h> | ||
| 39 | #include <linux/errno.h> | ||
| 40 | #include <linux/init.h> | ||
| 41 | #include <linux/time.h> | ||
| 42 | #include <linux/timer.h> | ||
| 43 | |||
| 44 | #include <asm/unaligned.h> | ||
| 45 | |||
| 46 | #include "musb_core.h" | ||
| 47 | |||
| 48 | |||
| 49 | static void musb_port_suspend(struct musb *musb, bool do_suspend) | ||
| 50 | { | ||
| 51 | u8 power; | ||
| 52 | void __iomem *mbase = musb->mregs; | ||
| 53 | |||
| 54 | if (!is_host_active(musb)) | ||
| 55 | return; | ||
| 56 | |||
| 57 | /* NOTE: this doesn't necessarily put PHY into low power mode, | ||
| 58 | * turning off its clock; that's a function of PHY integration and | ||
| 59 | * MUSB_POWER_ENSUSPEND. PHY may need a clock (sigh) to detect | ||
| 60 | * SE0 changing to connect (J) or wakeup (K) states. | ||
| 61 | */ | ||
| 62 | power = musb_readb(mbase, MUSB_POWER); | ||
| 63 | if (do_suspend) { | ||
| 64 | int retries = 10000; | ||
| 65 | |||
| 66 | power &= ~MUSB_POWER_RESUME; | ||
| 67 | power |= MUSB_POWER_SUSPENDM; | ||
| 68 | musb_writeb(mbase, MUSB_POWER, power); | ||
| 69 | |||
| 70 | /* Needed for OPT A tests */ | ||
| 71 | power = musb_readb(mbase, MUSB_POWER); | ||
| 72 | while (power & MUSB_POWER_SUSPENDM) { | ||
| 73 | power = musb_readb(mbase, MUSB_POWER); | ||
| 74 | if (retries-- < 1) | ||
| 75 | break; | ||
| 76 | } | ||
| 77 | |||
| 78 | DBG(3, "Root port suspended, power %02x\n", power); | ||
| 79 | |||
| 80 | musb->port1_status |= USB_PORT_STAT_SUSPEND; | ||
| 81 | switch (musb->xceiv.state) { | ||
| 82 | case OTG_STATE_A_HOST: | ||
| 83 | musb->xceiv.state = OTG_STATE_A_SUSPEND; | ||
| 84 | musb->is_active = is_otg_enabled(musb) | ||
| 85 | && musb->xceiv.host->b_hnp_enable; | ||
| 86 | musb_platform_try_idle(musb, 0); | ||
| 87 | break; | ||
| 88 | #ifdef CONFIG_USB_MUSB_OTG | ||
| 89 | case OTG_STATE_B_HOST: | ||
| 90 | musb->xceiv.state = OTG_STATE_B_WAIT_ACON; | ||
| 91 | musb->is_active = is_otg_enabled(musb) | ||
| 92 | && musb->xceiv.host->b_hnp_enable; | ||
| 93 | musb_platform_try_idle(musb, 0); | ||
| 94 | break; | ||
| 95 | #endif | ||
| 96 | default: | ||
| 97 | DBG(1, "bogus rh suspend? %s\n", | ||
| 98 | otg_state_string(musb)); | ||
| 99 | } | ||
| 100 | } else if (power & MUSB_POWER_SUSPENDM) { | ||
| 101 | power &= ~MUSB_POWER_SUSPENDM; | ||
| 102 | power |= MUSB_POWER_RESUME; | ||
| 103 | musb_writeb(mbase, MUSB_POWER, power); | ||
| 104 | |||
| 105 | DBG(3, "Root port resuming, power %02x\n", power); | ||
| 106 | |||
| 107 | /* later, GetPortStatus will stop RESUME signaling */ | ||
| 108 | musb->port1_status |= MUSB_PORT_STAT_RESUME; | ||
| 109 | musb->rh_timer = jiffies + msecs_to_jiffies(20); | ||
| 110 | } | ||
| 111 | } | ||
| 112 | |||
| 113 | static void musb_port_reset(struct musb *musb, bool do_reset) | ||
| 114 | { | ||
| 115 | u8 power; | ||
| 116 | void __iomem *mbase = musb->mregs; | ||
| 117 | |||
| 118 | #ifdef CONFIG_USB_MUSB_OTG | ||
| 119 | if (musb->xceiv.state == OTG_STATE_B_IDLE) { | ||
| 120 | DBG(2, "HNP: Returning from HNP; no hub reset from b_idle\n"); | ||
| 121 | musb->port1_status &= ~USB_PORT_STAT_RESET; | ||
| 122 | return; | ||
| 123 | } | ||
| 124 | #endif | ||
| 125 | |||
| 126 | if (!is_host_active(musb)) | ||
| 127 | return; | ||
| 128 | |||
| 129 | /* NOTE: caller guarantees it will turn off the reset when | ||
| 130 | * the appropriate amount of time has passed | ||
| 131 | */ | ||
| 132 | power = musb_readb(mbase, MUSB_POWER); | ||
| 133 | if (do_reset) { | ||
| 134 | |||
| 135 | /* | ||
| 136 | * If RESUME is set, we must make sure it stays minimum 20 ms. | ||
| 137 | * Then we must clear RESUME and wait a bit to let musb start | ||
| 138 | * generating SOFs. If we don't do this, OPT HS A 6.8 tests | ||
| 139 | * fail with "Error! Did not receive an SOF before suspend | ||
| 140 | * detected". | ||
| 141 | */ | ||
| 142 | if (power & MUSB_POWER_RESUME) { | ||
| 143 | while (time_before(jiffies, musb->rh_timer)) | ||
| 144 | msleep(1); | ||
| 145 | musb_writeb(mbase, MUSB_POWER, | ||
| 146 | power & ~MUSB_POWER_RESUME); | ||
| 147 | msleep(1); | ||
| 148 | } | ||
| 149 | |||
| 150 | musb->ignore_disconnect = true; | ||
| 151 | power &= 0xf0; | ||
| 152 | musb_writeb(mbase, MUSB_POWER, | ||
| 153 | power | MUSB_POWER_RESET); | ||
| 154 | |||
| 155 | musb->port1_status |= USB_PORT_STAT_RESET; | ||
| 156 | musb->port1_status &= ~USB_PORT_STAT_ENABLE; | ||
| 157 | musb->rh_timer = jiffies + msecs_to_jiffies(50); | ||
| 158 | } else { | ||
| 159 | DBG(4, "root port reset stopped\n"); | ||
| 160 | musb_writeb(mbase, MUSB_POWER, | ||
| 161 | power & ~MUSB_POWER_RESET); | ||
| 162 | |||
| 163 | musb->ignore_disconnect = false; | ||
| 164 | |||
| 165 | power = musb_readb(mbase, MUSB_POWER); | ||
| 166 | if (power & MUSB_POWER_HSMODE) { | ||
| 167 | DBG(4, "high-speed device connected\n"); | ||
| 168 | musb->port1_status |= USB_PORT_STAT_HIGH_SPEED; | ||
| 169 | } | ||
| 170 | |||
| 171 | musb->port1_status &= ~USB_PORT_STAT_RESET; | ||
| 172 | musb->port1_status |= USB_PORT_STAT_ENABLE | ||
| 173 | | (USB_PORT_STAT_C_RESET << 16) | ||
| 174 | | (USB_PORT_STAT_C_ENABLE << 16); | ||
| 175 | usb_hcd_poll_rh_status(musb_to_hcd(musb)); | ||
| 176 | |||
| 177 | musb->vbuserr_retry = VBUSERR_RETRY_COUNT; | ||
| 178 | } | ||
| 179 | } | ||
| 180 | |||
| 181 | void musb_root_disconnect(struct musb *musb) | ||
| 182 | { | ||
| 183 | musb->port1_status = (1 << USB_PORT_FEAT_POWER) | ||
| 184 | | (1 << USB_PORT_FEAT_C_CONNECTION); | ||
| 185 | |||
| 186 | usb_hcd_poll_rh_status(musb_to_hcd(musb)); | ||
| 187 | musb->is_active = 0; | ||
| 188 | |||
| 189 | switch (musb->xceiv.state) { | ||
| 190 | case OTG_STATE_A_HOST: | ||
| 191 | case OTG_STATE_A_SUSPEND: | ||
| 192 | musb->xceiv.state = OTG_STATE_A_WAIT_BCON; | ||
| 193 | musb->is_active = 0; | ||
| 194 | break; | ||
| 195 | case OTG_STATE_A_WAIT_VFALL: | ||
| 196 | musb->xceiv.state = OTG_STATE_B_IDLE; | ||
| 197 | break; | ||
| 198 | default: | ||
| 199 | DBG(1, "host disconnect (%s)\n", otg_state_string(musb)); | ||
| 200 | } | ||
| 201 | } | ||
| 202 | |||
| 203 | |||
| 204 | /*---------------------------------------------------------------------*/ | ||
| 205 | |||
| 206 | /* Caller may or may not hold musb->lock */ | ||
| 207 | int musb_hub_status_data(struct usb_hcd *hcd, char *buf) | ||
| 208 | { | ||
| 209 | struct musb *musb = hcd_to_musb(hcd); | ||
| 210 | int retval = 0; | ||
| 211 | |||
| 212 | /* called in_irq() via usb_hcd_poll_rh_status() */ | ||
| 213 | if (musb->port1_status & 0xffff0000) { | ||
| 214 | *buf = 0x02; | ||
| 215 | retval = 1; | ||
| 216 | } | ||
| 217 | return retval; | ||
| 218 | } | ||
| 219 | |||
| 220 | int musb_hub_control( | ||
| 221 | struct usb_hcd *hcd, | ||
| 222 | u16 typeReq, | ||
| 223 | u16 wValue, | ||
| 224 | u16 wIndex, | ||
| 225 | char *buf, | ||
| 226 | u16 wLength) | ||
| 227 | { | ||
| 228 | struct musb *musb = hcd_to_musb(hcd); | ||
| 229 | u32 temp; | ||
| 230 | int retval = 0; | ||
| 231 | unsigned long flags; | ||
| 232 | |||
| 233 | spin_lock_irqsave(&musb->lock, flags); | ||
| 234 | |||
| 235 | if (unlikely(!test_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags))) { | ||
| 236 | spin_unlock_irqrestore(&musb->lock, flags); | ||
| 237 | return -ESHUTDOWN; | ||
| 238 | } | ||
| 239 | |||
| 240 | /* hub features: always zero, setting is a NOP | ||
| 241 | * port features: reported, sometimes updated when host is active | ||
| 242 | * no indicators | ||
| 243 | */ | ||
| 244 | switch (typeReq) { | ||
| 245 | case ClearHubFeature: | ||
| 246 | case SetHubFeature: | ||
| 247 | switch (wValue) { | ||
| 248 | case C_HUB_OVER_CURRENT: | ||
| 249 | case C_HUB_LOCAL_POWER: | ||
| 250 | break; | ||
| 251 | default: | ||
| 252 | goto error; | ||
| 253 | } | ||
| 254 | break; | ||
| 255 | case ClearPortFeature: | ||
| 256 | if ((wIndex & 0xff) != 1) | ||
| 257 | goto error; | ||
| 258 | |||
| 259 | switch (wValue) { | ||
| 260 | case USB_PORT_FEAT_ENABLE: | ||
| 261 | break; | ||
| 262 | case USB_PORT_FEAT_SUSPEND: | ||
| 263 | musb_port_suspend(musb, false); | ||
| 264 | break; | ||
| 265 | case USB_PORT_FEAT_POWER: | ||
| 266 | if (!(is_otg_enabled(musb) && hcd->self.is_b_host)) | ||
| 267 | musb_set_vbus(musb, 0); | ||
| 268 | break; | ||
| 269 | case USB_PORT_FEAT_C_CONNECTION: | ||
| 270 | case USB_PORT_FEAT_C_ENABLE: | ||
| 271 | case USB_PORT_FEAT_C_OVER_CURRENT: | ||
| 272 | case USB_PORT_FEAT_C_RESET: | ||
| 273 | case USB_PORT_FEAT_C_SUSPEND: | ||
| 274 | break; | ||
| 275 | default: | ||
| 276 | goto error; | ||
| 277 | } | ||
| 278 | DBG(5, "clear feature %d\n", wValue); | ||
| 279 | musb->port1_status &= ~(1 << wValue); | ||
| 280 | break; | ||
| 281 | case GetHubDescriptor: | ||
| 282 | { | ||
| 283 | struct usb_hub_descriptor *desc = (void *)buf; | ||
| 284 | |||
| 285 | desc->bDescLength = 9; | ||
| 286 | desc->bDescriptorType = 0x29; | ||
| 287 | desc->bNbrPorts = 1; | ||
| 288 | desc->wHubCharacteristics = __constant_cpu_to_le16( | ||
| 289 | 0x0001 /* per-port power switching */ | ||
| 290 | | 0x0010 /* no overcurrent reporting */ | ||
| 291 | ); | ||
| 292 | desc->bPwrOn2PwrGood = 5; /* msec/2 */ | ||
| 293 | desc->bHubContrCurrent = 0; | ||
| 294 | |||
| 295 | /* workaround bogus struct definition */ | ||
| 296 | desc->DeviceRemovable[0] = 0x02; /* port 1 */ | ||
| 297 | desc->DeviceRemovable[1] = 0xff; | ||
| 298 | } | ||
| 299 | break; | ||
| 300 | case GetHubStatus: | ||
| 301 | temp = 0; | ||
| 302 | *(__le32 *) buf = cpu_to_le32(temp); | ||
| 303 | break; | ||
| 304 | case GetPortStatus: | ||
| 305 | if (wIndex != 1) | ||
| 306 | goto error; | ||
| 307 | |||
| 308 | /* finish RESET signaling? */ | ||
| 309 | if ((musb->port1_status & USB_PORT_STAT_RESET) | ||
| 310 | && time_after_eq(jiffies, musb->rh_timer)) | ||
| 311 | musb_port_reset(musb, false); | ||
| 312 | |||
| 313 | /* finish RESUME signaling? */ | ||
| 314 | if ((musb->port1_status & MUSB_PORT_STAT_RESUME) | ||
| 315 | && time_after_eq(jiffies, musb->rh_timer)) { | ||
| 316 | u8 power; | ||
| 317 | |||
| 318 | power = musb_readb(musb->mregs, MUSB_POWER); | ||
| 319 | power &= ~MUSB_POWER_RESUME; | ||
| 320 | DBG(4, "root port resume stopped, power %02x\n", | ||
| 321 | power); | ||
| 322 | musb_writeb(musb->mregs, MUSB_POWER, power); | ||
| 323 | |||
| 324 | /* ISSUE: DaVinci (RTL 1.300) disconnects after | ||
| 325 | * resume of high speed peripherals (but not full | ||
| 326 | * speed ones). | ||
| 327 | */ | ||
| 328 | |||
| 329 | musb->is_active = 1; | ||
| 330 | musb->port1_status &= ~(USB_PORT_STAT_SUSPEND | ||
| 331 | | MUSB_PORT_STAT_RESUME); | ||
| 332 | musb->port1_status |= USB_PORT_STAT_C_SUSPEND << 16; | ||
| 333 | usb_hcd_poll_rh_status(musb_to_hcd(musb)); | ||
| 334 | /* NOTE: it might really be A_WAIT_BCON ... */ | ||
| 335 | musb->xceiv.state = OTG_STATE_A_HOST; | ||
| 336 | } | ||
| 337 | |||
| 338 | put_unaligned(cpu_to_le32(musb->port1_status | ||
| 339 | & ~MUSB_PORT_STAT_RESUME), | ||
| 340 | (__le32 *) buf); | ||
| 341 | |||
| 342 | /* port change status is more interesting */ | ||
| 343 | DBG(get_unaligned((u16 *)(buf+2)) ? 2 : 5, "port status %08x\n", | ||
| 344 | musb->port1_status); | ||
| 345 | break; | ||
| 346 | case SetPortFeature: | ||
| 347 | if ((wIndex & 0xff) != 1) | ||
| 348 | goto error; | ||
| 349 | |||
| 350 | switch (wValue) { | ||
| 351 | case USB_PORT_FEAT_POWER: | ||
| 352 | /* NOTE: this controller has a strange state machine | ||
| 353 | * that involves "requesting sessions" according to | ||
| 354 | * magic side effects from incompletely-described | ||
| 355 | * rules about startup... | ||
| 356 | * | ||
| 357 | * This call is what really starts the host mode; be | ||
| 358 | * very careful about side effects if you reorder any | ||
| 359 | * initialization logic, e.g. for OTG, or change any | ||
| 360 | * logic relating to VBUS power-up. | ||
| 361 | */ | ||
| 362 | if (!(is_otg_enabled(musb) && hcd->self.is_b_host)) | ||
| 363 | musb_start(musb); | ||
| 364 | break; | ||
| 365 | case USB_PORT_FEAT_RESET: | ||
| 366 | musb_port_reset(musb, true); | ||
| 367 | break; | ||
| 368 | case USB_PORT_FEAT_SUSPEND: | ||
| 369 | musb_port_suspend(musb, true); | ||
| 370 | break; | ||
| 371 | case USB_PORT_FEAT_TEST: | ||
| 372 | if (unlikely(is_host_active(musb))) | ||
| 373 | goto error; | ||
| 374 | |||
| 375 | wIndex >>= 8; | ||
| 376 | switch (wIndex) { | ||
| 377 | case 1: | ||
| 378 | pr_debug("TEST_J\n"); | ||
| 379 | temp = MUSB_TEST_J; | ||
| 380 | break; | ||
| 381 | case 2: | ||
| 382 | pr_debug("TEST_K\n"); | ||
| 383 | temp = MUSB_TEST_K; | ||
| 384 | break; | ||
| 385 | case 3: | ||
| 386 | pr_debug("TEST_SE0_NAK\n"); | ||
| 387 | temp = MUSB_TEST_SE0_NAK; | ||
| 388 | break; | ||
| 389 | case 4: | ||
| 390 | pr_debug("TEST_PACKET\n"); | ||
| 391 | temp = MUSB_TEST_PACKET; | ||
| 392 | musb_load_testpacket(musb); | ||
| 393 | break; | ||
| 394 | case 5: | ||
| 395 | pr_debug("TEST_FORCE_ENABLE\n"); | ||
| 396 | temp = MUSB_TEST_FORCE_HOST | ||
| 397 | | MUSB_TEST_FORCE_HS; | ||
| 398 | |||
| 399 | musb_writeb(musb->mregs, MUSB_DEVCTL, | ||
| 400 | MUSB_DEVCTL_SESSION); | ||
| 401 | break; | ||
| 402 | case 6: | ||
| 403 | pr_debug("TEST_FIFO_ACCESS\n"); | ||
| 404 | temp = MUSB_TEST_FIFO_ACCESS; | ||
| 405 | break; | ||
| 406 | default: | ||
| 407 | goto error; | ||
| 408 | } | ||
| 409 | musb_writeb(musb->mregs, MUSB_TESTMODE, temp); | ||
| 410 | break; | ||
| 411 | default: | ||
| 412 | goto error; | ||
| 413 | } | ||
| 414 | DBG(5, "set feature %d\n", wValue); | ||
| 415 | musb->port1_status |= 1 << wValue; | ||
| 416 | break; | ||
| 417 | |||
| 418 | default: | ||
| 419 | error: | ||
| 420 | /* "protocol stall" on error */ | ||
| 421 | retval = -EPIPE; | ||
| 422 | } | ||
| 423 | spin_unlock_irqrestore(&musb->lock, flags); | ||
| 424 | return retval; | ||
| 425 | } | ||
diff --git a/drivers/usb/musb/musbhsdma.c b/drivers/usb/musb/musbhsdma.c new file mode 100644 index 000000000000..9ba8fb7fcd24 --- /dev/null +++ b/drivers/usb/musb/musbhsdma.c | |||
| @@ -0,0 +1,433 @@ | |||
| 1 | /* | ||
| 2 | * MUSB OTG driver - support for Mentor's DMA controller | ||
| 3 | * | ||
| 4 | * Copyright 2005 Mentor Graphics Corporation | ||
| 5 | * Copyright (C) 2005-2007 by Texas Instruments | ||
| 6 | * | ||
| 7 | * This program is free software; you can redistribute it and/or | ||
| 8 | * modify it under the terms of the GNU General Public License | ||
| 9 | * version 2 as published by the Free Software Foundation. | ||
| 10 | * | ||
| 11 | * This program is distributed in the hope that it will be useful, but | ||
| 12 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| 14 | * General Public License for more details. | ||
| 15 | * | ||
| 16 | * You should have received a copy of the GNU General Public License | ||
| 17 | * along with this program; if not, write to the Free Software | ||
| 18 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA | ||
| 19 | * 02110-1301 USA | ||
| 20 | * | ||
| 21 | * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED | ||
| 22 | * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF | ||
| 23 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN | ||
| 24 | * NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
| 25 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
| 26 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF | ||
| 27 | * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON | ||
| 28 | * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| 29 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
| 30 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| 31 | * | ||
| 32 | */ | ||
| 33 | #include <linux/device.h> | ||
| 34 | #include <linux/interrupt.h> | ||
| 35 | #include <linux/platform_device.h> | ||
| 36 | #include "musb_core.h" | ||
| 37 | |||
| 38 | #if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3430) | ||
| 39 | #include "omap2430.h" | ||
| 40 | #endif | ||
| 41 | |||
| 42 | #define MUSB_HSDMA_BASE 0x200 | ||
| 43 | #define MUSB_HSDMA_INTR (MUSB_HSDMA_BASE + 0) | ||
| 44 | #define MUSB_HSDMA_CONTROL 0x4 | ||
| 45 | #define MUSB_HSDMA_ADDRESS 0x8 | ||
| 46 | #define MUSB_HSDMA_COUNT 0xc | ||
| 47 | |||
| 48 | #define MUSB_HSDMA_CHANNEL_OFFSET(_bChannel, _offset) \ | ||
| 49 | (MUSB_HSDMA_BASE + (_bChannel << 4) + _offset) | ||
| 50 | |||
| 51 | /* control register (16-bit): */ | ||
| 52 | #define MUSB_HSDMA_ENABLE_SHIFT 0 | ||
| 53 | #define MUSB_HSDMA_TRANSMIT_SHIFT 1 | ||
| 54 | #define MUSB_HSDMA_MODE1_SHIFT 2 | ||
| 55 | #define MUSB_HSDMA_IRQENABLE_SHIFT 3 | ||
| 56 | #define MUSB_HSDMA_ENDPOINT_SHIFT 4 | ||
| 57 | #define MUSB_HSDMA_BUSERROR_SHIFT 8 | ||
| 58 | #define MUSB_HSDMA_BURSTMODE_SHIFT 9 | ||
| 59 | #define MUSB_HSDMA_BURSTMODE (3 << MUSB_HSDMA_BURSTMODE_SHIFT) | ||
| 60 | #define MUSB_HSDMA_BURSTMODE_UNSPEC 0 | ||
| 61 | #define MUSB_HSDMA_BURSTMODE_INCR4 1 | ||
| 62 | #define MUSB_HSDMA_BURSTMODE_INCR8 2 | ||
| 63 | #define MUSB_HSDMA_BURSTMODE_INCR16 3 | ||
| 64 | |||
| 65 | #define MUSB_HSDMA_CHANNELS 8 | ||
| 66 | |||
| 67 | struct musb_dma_controller; | ||
| 68 | |||
| 69 | struct musb_dma_channel { | ||
| 70 | struct dma_channel Channel; | ||
| 71 | struct musb_dma_controller *controller; | ||
| 72 | u32 dwStartAddress; | ||
| 73 | u32 len; | ||
| 74 | u16 wMaxPacketSize; | ||
| 75 | u8 bIndex; | ||
| 76 | u8 epnum; | ||
| 77 | u8 transmit; | ||
| 78 | }; | ||
| 79 | |||
| 80 | struct musb_dma_controller { | ||
| 81 | struct dma_controller Controller; | ||
| 82 | struct musb_dma_channel aChannel[MUSB_HSDMA_CHANNELS]; | ||
| 83 | void *pDmaPrivate; | ||
| 84 | void __iomem *pCoreBase; | ||
| 85 | u8 bChannelCount; | ||
| 86 | u8 bmUsedChannels; | ||
| 87 | u8 irq; | ||
| 88 | }; | ||
| 89 | |||
| 90 | static int dma_controller_start(struct dma_controller *c) | ||
| 91 | { | ||
| 92 | /* nothing to do */ | ||
| 93 | return 0; | ||
| 94 | } | ||
| 95 | |||
| 96 | static void dma_channel_release(struct dma_channel *pChannel); | ||
| 97 | |||
| 98 | static int dma_controller_stop(struct dma_controller *c) | ||
| 99 | { | ||
| 100 | struct musb_dma_controller *controller = | ||
| 101 | container_of(c, struct musb_dma_controller, Controller); | ||
| 102 | struct musb *musb = (struct musb *) controller->pDmaPrivate; | ||
| 103 | struct dma_channel *pChannel; | ||
| 104 | u8 bBit; | ||
| 105 | |||
| 106 | if (controller->bmUsedChannels != 0) { | ||
| 107 | dev_err(musb->controller, | ||
| 108 | "Stopping DMA controller while channel active\n"); | ||
| 109 | |||
| 110 | for (bBit = 0; bBit < MUSB_HSDMA_CHANNELS; bBit++) { | ||
| 111 | if (controller->bmUsedChannels & (1 << bBit)) { | ||
| 112 | pChannel = &controller->aChannel[bBit].Channel; | ||
| 113 | dma_channel_release(pChannel); | ||
| 114 | |||
| 115 | if (!controller->bmUsedChannels) | ||
| 116 | break; | ||
| 117 | } | ||
| 118 | } | ||
| 119 | } | ||
| 120 | return 0; | ||
| 121 | } | ||
| 122 | |||
| 123 | static struct dma_channel *dma_channel_allocate(struct dma_controller *c, | ||
| 124 | struct musb_hw_ep *hw_ep, u8 transmit) | ||
| 125 | { | ||
| 126 | u8 bBit; | ||
| 127 | struct dma_channel *pChannel = NULL; | ||
| 128 | struct musb_dma_channel *pImplChannel = NULL; | ||
| 129 | struct musb_dma_controller *controller = | ||
| 130 | container_of(c, struct musb_dma_controller, Controller); | ||
| 131 | |||
| 132 | for (bBit = 0; bBit < MUSB_HSDMA_CHANNELS; bBit++) { | ||
| 133 | if (!(controller->bmUsedChannels & (1 << bBit))) { | ||
| 134 | controller->bmUsedChannels |= (1 << bBit); | ||
| 135 | pImplChannel = &(controller->aChannel[bBit]); | ||
| 136 | pImplChannel->controller = controller; | ||
| 137 | pImplChannel->bIndex = bBit; | ||
| 138 | pImplChannel->epnum = hw_ep->epnum; | ||
| 139 | pImplChannel->transmit = transmit; | ||
| 140 | pChannel = &(pImplChannel->Channel); | ||
| 141 | pChannel->private_data = pImplChannel; | ||
| 142 | pChannel->status = MUSB_DMA_STATUS_FREE; | ||
| 143 | pChannel->max_len = 0x10000; | ||
| 144 | /* Tx => mode 1; Rx => mode 0 */ | ||
| 145 | pChannel->desired_mode = transmit; | ||
| 146 | pChannel->actual_len = 0; | ||
| 147 | break; | ||
| 148 | } | ||
| 149 | } | ||
| 150 | return pChannel; | ||
| 151 | } | ||
| 152 | |||
| 153 | static void dma_channel_release(struct dma_channel *pChannel) | ||
| 154 | { | ||
| 155 | struct musb_dma_channel *pImplChannel = | ||
| 156 | (struct musb_dma_channel *) pChannel->private_data; | ||
| 157 | |||
| 158 | pChannel->actual_len = 0; | ||
| 159 | pImplChannel->dwStartAddress = 0; | ||
| 160 | pImplChannel->len = 0; | ||
| 161 | |||
| 162 | pImplChannel->controller->bmUsedChannels &= | ||
| 163 | ~(1 << pImplChannel->bIndex); | ||
| 164 | |||
| 165 | pChannel->status = MUSB_DMA_STATUS_UNKNOWN; | ||
| 166 | } | ||
| 167 | |||
| 168 | static void configure_channel(struct dma_channel *pChannel, | ||
| 169 | u16 packet_sz, u8 mode, | ||
| 170 | dma_addr_t dma_addr, u32 len) | ||
| 171 | { | ||
| 172 | struct musb_dma_channel *pImplChannel = | ||
| 173 | (struct musb_dma_channel *) pChannel->private_data; | ||
| 174 | struct musb_dma_controller *controller = pImplChannel->controller; | ||
| 175 | void __iomem *mbase = controller->pCoreBase; | ||
| 176 | u8 bChannel = pImplChannel->bIndex; | ||
| 177 | u16 csr = 0; | ||
| 178 | |||
| 179 | DBG(4, "%p, pkt_sz %d, addr 0x%x, len %d, mode %d\n", | ||
| 180 | pChannel, packet_sz, dma_addr, len, mode); | ||
| 181 | |||
| 182 | if (mode) { | ||
| 183 | csr |= 1 << MUSB_HSDMA_MODE1_SHIFT; | ||
| 184 | BUG_ON(len < packet_sz); | ||
| 185 | |||
| 186 | if (packet_sz >= 64) { | ||
| 187 | csr |= MUSB_HSDMA_BURSTMODE_INCR16 | ||
| 188 | << MUSB_HSDMA_BURSTMODE_SHIFT; | ||
| 189 | } else if (packet_sz >= 32) { | ||
| 190 | csr |= MUSB_HSDMA_BURSTMODE_INCR8 | ||
| 191 | << MUSB_HSDMA_BURSTMODE_SHIFT; | ||
| 192 | } else if (packet_sz >= 16) { | ||
| 193 | csr |= MUSB_HSDMA_BURSTMODE_INCR4 | ||
| 194 | << MUSB_HSDMA_BURSTMODE_SHIFT; | ||
| 195 | } | ||
| 196 | } | ||
| 197 | |||
| 198 | csr |= (pImplChannel->epnum << MUSB_HSDMA_ENDPOINT_SHIFT) | ||
| 199 | | (1 << MUSB_HSDMA_ENABLE_SHIFT) | ||
| 200 | | (1 << MUSB_HSDMA_IRQENABLE_SHIFT) | ||
| 201 | | (pImplChannel->transmit | ||
| 202 | ? (1 << MUSB_HSDMA_TRANSMIT_SHIFT) | ||
| 203 | : 0); | ||
| 204 | |||
| 205 | /* address/count */ | ||
| 206 | musb_writel(mbase, | ||
| 207 | MUSB_HSDMA_CHANNEL_OFFSET(bChannel, MUSB_HSDMA_ADDRESS), | ||
| 208 | dma_addr); | ||
| 209 | musb_writel(mbase, | ||
| 210 | MUSB_HSDMA_CHANNEL_OFFSET(bChannel, MUSB_HSDMA_COUNT), | ||
| 211 | len); | ||
| 212 | |||
| 213 | /* control (this should start things) */ | ||
| 214 | musb_writew(mbase, | ||
| 215 | MUSB_HSDMA_CHANNEL_OFFSET(bChannel, MUSB_HSDMA_CONTROL), | ||
| 216 | csr); | ||
| 217 | } | ||
| 218 | |||
| 219 | static int dma_channel_program(struct dma_channel *pChannel, | ||
| 220 | u16 packet_sz, u8 mode, | ||
| 221 | dma_addr_t dma_addr, u32 len) | ||
| 222 | { | ||
| 223 | struct musb_dma_channel *pImplChannel = | ||
| 224 | (struct musb_dma_channel *) pChannel->private_data; | ||
| 225 | |||
| 226 | DBG(2, "ep%d-%s pkt_sz %d, dma_addr 0x%x length %d, mode %d\n", | ||
| 227 | pImplChannel->epnum, | ||
| 228 | pImplChannel->transmit ? "Tx" : "Rx", | ||
| 229 | packet_sz, dma_addr, len, mode); | ||
| 230 | |||
| 231 | BUG_ON(pChannel->status == MUSB_DMA_STATUS_UNKNOWN || | ||
| 232 | pChannel->status == MUSB_DMA_STATUS_BUSY); | ||
| 233 | |||
| 234 | pChannel->actual_len = 0; | ||
| 235 | pImplChannel->dwStartAddress = dma_addr; | ||
| 236 | pImplChannel->len = len; | ||
| 237 | pImplChannel->wMaxPacketSize = packet_sz; | ||
| 238 | pChannel->status = MUSB_DMA_STATUS_BUSY; | ||
| 239 | |||
| 240 | if ((mode == 1) && (len >= packet_sz)) | ||
| 241 | configure_channel(pChannel, packet_sz, 1, dma_addr, len); | ||
| 242 | else | ||
| 243 | configure_channel(pChannel, packet_sz, 0, dma_addr, len); | ||
| 244 | |||
| 245 | return true; | ||
| 246 | } | ||
| 247 | |||
| 248 | static int dma_channel_abort(struct dma_channel *pChannel) | ||
| 249 | { | ||
| 250 | struct musb_dma_channel *pImplChannel = | ||
| 251 | (struct musb_dma_channel *) pChannel->private_data; | ||
| 252 | u8 bChannel = pImplChannel->bIndex; | ||
| 253 | void __iomem *mbase = pImplChannel->controller->pCoreBase; | ||
| 254 | u16 csr; | ||
| 255 | |||
| 256 | if (pChannel->status == MUSB_DMA_STATUS_BUSY) { | ||
| 257 | if (pImplChannel->transmit) { | ||
| 258 | |||
| 259 | csr = musb_readw(mbase, | ||
| 260 | MUSB_EP_OFFSET(pImplChannel->epnum, | ||
| 261 | MUSB_TXCSR)); | ||
| 262 | csr &= ~(MUSB_TXCSR_AUTOSET | | ||
| 263 | MUSB_TXCSR_DMAENAB | | ||
| 264 | MUSB_TXCSR_DMAMODE); | ||
| 265 | musb_writew(mbase, | ||
| 266 | MUSB_EP_OFFSET(pImplChannel->epnum, | ||
| 267 | MUSB_TXCSR), | ||
| 268 | csr); | ||
| 269 | } else { | ||
| 270 | csr = musb_readw(mbase, | ||
| 271 | MUSB_EP_OFFSET(pImplChannel->epnum, | ||
| 272 | MUSB_RXCSR)); | ||
| 273 | csr &= ~(MUSB_RXCSR_AUTOCLEAR | | ||
| 274 | MUSB_RXCSR_DMAENAB | | ||
| 275 | MUSB_RXCSR_DMAMODE); | ||
| 276 | musb_writew(mbase, | ||
| 277 | MUSB_EP_OFFSET(pImplChannel->epnum, | ||
| 278 | MUSB_RXCSR), | ||
| 279 | csr); | ||
| 280 | } | ||
| 281 | |||
| 282 | musb_writew(mbase, | ||
| 283 | MUSB_HSDMA_CHANNEL_OFFSET(bChannel, MUSB_HSDMA_CONTROL), | ||
| 284 | 0); | ||
| 285 | musb_writel(mbase, | ||
| 286 | MUSB_HSDMA_CHANNEL_OFFSET(bChannel, MUSB_HSDMA_ADDRESS), | ||
| 287 | 0); | ||
| 288 | musb_writel(mbase, | ||
| 289 | MUSB_HSDMA_CHANNEL_OFFSET(bChannel, MUSB_HSDMA_COUNT), | ||
| 290 | 0); | ||
| 291 | |||
| 292 | pChannel->status = MUSB_DMA_STATUS_FREE; | ||
| 293 | } | ||
| 294 | return 0; | ||
| 295 | } | ||
| 296 | |||
| 297 | static irqreturn_t dma_controller_irq(int irq, void *private_data) | ||
| 298 | { | ||
| 299 | struct musb_dma_controller *controller = | ||
| 300 | (struct musb_dma_controller *)private_data; | ||
| 301 | struct musb_dma_channel *pImplChannel; | ||
| 302 | struct musb *musb = controller->pDmaPrivate; | ||
| 303 | void __iomem *mbase = controller->pCoreBase; | ||
| 304 | struct dma_channel *pChannel; | ||
| 305 | u8 bChannel; | ||
| 306 | u16 csr; | ||
| 307 | u32 dwAddress; | ||
| 308 | u8 int_hsdma; | ||
| 309 | irqreturn_t retval = IRQ_NONE; | ||
| 310 | unsigned long flags; | ||
| 311 | |||
| 312 | spin_lock_irqsave(&musb->lock, flags); | ||
| 313 | |||
| 314 | int_hsdma = musb_readb(mbase, MUSB_HSDMA_INTR); | ||
| 315 | if (!int_hsdma) | ||
| 316 | goto done; | ||
| 317 | |||
| 318 | for (bChannel = 0; bChannel < MUSB_HSDMA_CHANNELS; bChannel++) { | ||
| 319 | if (int_hsdma & (1 << bChannel)) { | ||
| 320 | pImplChannel = (struct musb_dma_channel *) | ||
| 321 | &(controller->aChannel[bChannel]); | ||
| 322 | pChannel = &pImplChannel->Channel; | ||
| 323 | |||
| 324 | csr = musb_readw(mbase, | ||
| 325 | MUSB_HSDMA_CHANNEL_OFFSET(bChannel, | ||
| 326 | MUSB_HSDMA_CONTROL)); | ||
| 327 | |||
| 328 | if (csr & (1 << MUSB_HSDMA_BUSERROR_SHIFT)) | ||
| 329 | pImplChannel->Channel.status = | ||
| 330 | MUSB_DMA_STATUS_BUS_ABORT; | ||
| 331 | else { | ||
| 332 | u8 devctl; | ||
| 333 | |||
| 334 | dwAddress = musb_readl(mbase, | ||
| 335 | MUSB_HSDMA_CHANNEL_OFFSET( | ||
| 336 | bChannel, | ||
| 337 | MUSB_HSDMA_ADDRESS)); | ||
| 338 | pChannel->actual_len = dwAddress | ||
| 339 | - pImplChannel->dwStartAddress; | ||
| 340 | |||
| 341 | DBG(2, "ch %p, 0x%x -> 0x%x (%d / %d) %s\n", | ||
| 342 | pChannel, pImplChannel->dwStartAddress, | ||
| 343 | dwAddress, pChannel->actual_len, | ||
| 344 | pImplChannel->len, | ||
| 345 | (pChannel->actual_len | ||
| 346 | < pImplChannel->len) ? | ||
| 347 | "=> reconfig 0" : "=> complete"); | ||
| 348 | |||
| 349 | devctl = musb_readb(mbase, MUSB_DEVCTL); | ||
| 350 | |||
| 351 | pChannel->status = MUSB_DMA_STATUS_FREE; | ||
| 352 | |||
| 353 | /* completed */ | ||
| 354 | if ((devctl & MUSB_DEVCTL_HM) | ||
| 355 | && (pImplChannel->transmit) | ||
| 356 | && ((pChannel->desired_mode == 0) | ||
| 357 | || (pChannel->actual_len & | ||
| 358 | (pImplChannel->wMaxPacketSize - 1))) | ||
| 359 | ) { | ||
| 360 | /* Send out the packet */ | ||
| 361 | musb_ep_select(mbase, | ||
| 362 | pImplChannel->epnum); | ||
| 363 | musb_writew(mbase, MUSB_EP_OFFSET( | ||
| 364 | pImplChannel->epnum, | ||
| 365 | MUSB_TXCSR), | ||
| 366 | MUSB_TXCSR_TXPKTRDY); | ||
| 367 | } else | ||
| 368 | musb_dma_completion( | ||
| 369 | musb, | ||
| 370 | pImplChannel->epnum, | ||
| 371 | pImplChannel->transmit); | ||
| 372 | } | ||
| 373 | } | ||
| 374 | } | ||
| 375 | retval = IRQ_HANDLED; | ||
| 376 | done: | ||
| 377 | spin_unlock_irqrestore(&musb->lock, flags); | ||
| 378 | return retval; | ||
| 379 | } | ||
| 380 | |||
| 381 | void dma_controller_destroy(struct dma_controller *c) | ||
| 382 | { | ||
| 383 | struct musb_dma_controller *controller; | ||
| 384 | |||
| 385 | controller = container_of(c, struct musb_dma_controller, Controller); | ||
| 386 | if (!controller) | ||
| 387 | return; | ||
| 388 | |||
| 389 | if (controller->irq) | ||
| 390 | free_irq(controller->irq, c); | ||
| 391 | |||
| 392 | kfree(controller); | ||
| 393 | } | ||
| 394 | |||
| 395 | struct dma_controller *__init | ||
| 396 | dma_controller_create(struct musb *musb, void __iomem *pCoreBase) | ||
| 397 | { | ||
| 398 | struct musb_dma_controller *controller; | ||
| 399 | struct device *dev = musb->controller; | ||
| 400 | struct platform_device *pdev = to_platform_device(dev); | ||
| 401 | int irq = platform_get_irq(pdev, 1); | ||
| 402 | |||
| 403 | if (irq == 0) { | ||
| 404 | dev_err(dev, "No DMA interrupt line!\n"); | ||
| 405 | return NULL; | ||
| 406 | } | ||
| 407 | |||
| 408 | controller = kzalloc(sizeof(struct musb_dma_controller), GFP_KERNEL); | ||
| 409 | if (!controller) | ||
| 410 | return NULL; | ||
| 411 | |||
| 412 | controller->bChannelCount = MUSB_HSDMA_CHANNELS; | ||
| 413 | controller->pDmaPrivate = musb; | ||
| 414 | controller->pCoreBase = pCoreBase; | ||
| 415 | |||
| 416 | controller->Controller.start = dma_controller_start; | ||
| 417 | controller->Controller.stop = dma_controller_stop; | ||
| 418 | controller->Controller.channel_alloc = dma_channel_allocate; | ||
| 419 | controller->Controller.channel_release = dma_channel_release; | ||
| 420 | controller->Controller.channel_program = dma_channel_program; | ||
| 421 | controller->Controller.channel_abort = dma_channel_abort; | ||
| 422 | |||
| 423 | if (request_irq(irq, dma_controller_irq, IRQF_DISABLED, | ||
| 424 | musb->controller->bus_id, &controller->Controller)) { | ||
| 425 | dev_err(dev, "request_irq %d failed!\n", irq); | ||
| 426 | dma_controller_destroy(&controller->Controller); | ||
| 427 | return NULL; | ||
| 428 | } | ||
| 429 | |||
| 430 | controller->irq = irq; | ||
| 431 | |||
| 432 | return &controller->Controller; | ||
| 433 | } | ||
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c new file mode 100644 index 000000000000..298b22e6ad0d --- /dev/null +++ b/drivers/usb/musb/omap2430.c | |||
| @@ -0,0 +1,324 @@ | |||
| 1 | /* | ||
| 2 | * Copyright (C) 2005-2007 by Texas Instruments | ||
| 3 | * Some code has been taken from tusb6010.c | ||
| 4 | * Copyrights for that are attributable to: | ||
| 5 | * Copyright (C) 2006 Nokia Corporation | ||
| 6 | * Jarkko Nikula <jarkko.nikula@nokia.com> | ||
| 7 | * Tony Lindgren <tony@atomide.com> | ||
| 8 | * | ||
| 9 | * This file is part of the Inventra Controller Driver for Linux. | ||
| 10 | * | ||
| 11 | * The Inventra Controller Driver for Linux is free software; you | ||
| 12 | * can redistribute it and/or modify it under the terms of the GNU | ||
| 13 | * General Public License version 2 as published by the Free Software | ||
| 14 | * Foundation. | ||
| 15 | * | ||
| 16 | * The Inventra Controller Driver for Linux is distributed in | ||
| 17 | * the hope that it will be useful, but WITHOUT ANY WARRANTY; | ||
| 18 | * without even the implied warranty of MERCHANTABILITY or | ||
| 19 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public | ||
| 20 | * License for more details. | ||
| 21 | * | ||
| 22 | * You should have received a copy of the GNU General Public License | ||
| 23 | * along with The Inventra Controller Driver for Linux ; if not, | ||
| 24 | * write to the Free Software Foundation, Inc., 59 Temple Place, | ||
| 25 | * Suite 330, Boston, MA 02111-1307 USA | ||
| 26 | * | ||
| 27 | */ | ||
| 28 | #include <linux/module.h> | ||
| 29 | #include <linux/kernel.h> | ||
| 30 | #include <linux/sched.h> | ||
| 31 | #include <linux/slab.h> | ||
| 32 | #include <linux/init.h> | ||
| 33 | #include <linux/list.h> | ||
| 34 | #include <linux/clk.h> | ||
| 35 | #include <linux/io.h> | ||
| 36 | |||
| 37 | #include <asm/mach-types.h> | ||
| 38 | #include <asm/arch/hardware.h> | ||
| 39 | #include <asm/arch/mux.h> | ||
| 40 | |||
| 41 | #include "musb_core.h" | ||
| 42 | #include "omap2430.h" | ||
| 43 | |||
| 44 | #ifdef CONFIG_ARCH_OMAP3430 | ||
| 45 | #define get_cpu_rev() 2 | ||
| 46 | #endif | ||
| 47 | |||
| 48 | #define MUSB_TIMEOUT_A_WAIT_BCON 1100 | ||
| 49 | |||
| 50 | static struct timer_list musb_idle_timer; | ||
| 51 | |||
| 52 | static void musb_do_idle(unsigned long _musb) | ||
| 53 | { | ||
| 54 | struct musb *musb = (void *)_musb; | ||
| 55 | unsigned long flags; | ||
| 56 | u8 power; | ||
| 57 | u8 devctl; | ||
| 58 | |||
| 59 | devctl = musb_readb(musb->mregs, MUSB_DEVCTL); | ||
| 60 | |||
| 61 | spin_lock_irqsave(&musb->lock, flags); | ||
| 62 | |||
| 63 | switch (musb->xceiv.state) { | ||
| 64 | case OTG_STATE_A_WAIT_BCON: | ||
| 65 | devctl &= ~MUSB_DEVCTL_SESSION; | ||
| 66 | musb_writeb(musb->mregs, MUSB_DEVCTL, devctl); | ||
| 67 | |||
| 68 | devctl = musb_readb(musb->mregs, MUSB_DEVCTL); | ||
| 69 | if (devctl & MUSB_DEVCTL_BDEVICE) { | ||
| 70 | musb->xceiv.state = OTG_STATE_B_IDLE; | ||
| 71 | MUSB_DEV_MODE(musb); | ||
| 72 | } else { | ||
| 73 | musb->xceiv.state = OTG_STATE_A_IDLE; | ||
| 74 | MUSB_HST_MODE(musb); | ||
| 75 | } | ||
| 76 | break; | ||
| 77 | #ifdef CONFIG_USB_MUSB_HDRC_HCD | ||
| 78 | case OTG_STATE_A_SUSPEND: | ||
| 79 | /* finish RESUME signaling? */ | ||
| 80 | if (musb->port1_status & MUSB_PORT_STAT_RESUME) { | ||
| 81 | power = musb_readb(musb->mregs, MUSB_POWER); | ||
| 82 | power &= ~MUSB_POWER_RESUME; | ||
| 83 | DBG(1, "root port resume stopped, power %02x\n", power); | ||
| 84 | musb_writeb(musb->mregs, MUSB_POWER, power); | ||
| 85 | musb->is_active = 1; | ||
| 86 | musb->port1_status &= ~(USB_PORT_STAT_SUSPEND | ||
| 87 | | MUSB_PORT_STAT_RESUME); | ||
| 88 | musb->port1_status |= USB_PORT_STAT_C_SUSPEND << 16; | ||
| 89 | usb_hcd_poll_rh_status(musb_to_hcd(musb)); | ||
| 90 | /* NOTE: it might really be A_WAIT_BCON ... */ | ||
| 91 | musb->xceiv.state = OTG_STATE_A_HOST; | ||
| 92 | } | ||
| 93 | break; | ||
| 94 | #endif | ||
| 95 | #ifdef CONFIG_USB_MUSB_HDRC_HCD | ||
| 96 | case OTG_STATE_A_HOST: | ||
| 97 | devctl = musb_readb(musb->mregs, MUSB_DEVCTL); | ||
| 98 | if (devctl & MUSB_DEVCTL_BDEVICE) | ||
| 99 | musb->xceiv.state = OTG_STATE_B_IDLE; | ||
| 100 | else | ||
| 101 | musb->xceiv.state = OTG_STATE_A_WAIT_BCON; | ||
| 102 | #endif | ||
| 103 | default: | ||
| 104 | break; | ||
| 105 | } | ||
| 106 | spin_unlock_irqrestore(&musb->lock, flags); | ||
| 107 | } | ||
| 108 | |||
| 109 | |||
| 110 | void musb_platform_try_idle(struct musb *musb, unsigned long timeout) | ||
| 111 | { | ||
| 112 | unsigned long default_timeout = jiffies + msecs_to_jiffies(3); | ||
| 113 | static unsigned long last_timer; | ||
| 114 | |||
| 115 | if (timeout == 0) | ||
| 116 | timeout = default_timeout; | ||
| 117 | |||
| 118 | /* Never idle if active, or when VBUS timeout is not set as host */ | ||
| 119 | if (musb->is_active || ((musb->a_wait_bcon == 0) | ||
| 120 | && (musb->xceiv.state == OTG_STATE_A_WAIT_BCON))) { | ||
| 121 | DBG(4, "%s active, deleting timer\n", otg_state_string(musb)); | ||
| 122 | del_timer(&musb_idle_timer); | ||
| 123 | last_timer = jiffies; | ||
| 124 | return; | ||
| 125 | } | ||
| 126 | |||
| 127 | if (time_after(last_timer, timeout)) { | ||
| 128 | if (!timer_pending(&musb_idle_timer)) | ||
| 129 | last_timer = timeout; | ||
| 130 | else { | ||
| 131 | DBG(4, "Longer idle timer already pending, ignoring\n"); | ||
| 132 | return; | ||
| 133 | } | ||
| 134 | } | ||
| 135 | last_timer = timeout; | ||
| 136 | |||
| 137 | DBG(4, "%s inactive, for idle timer for %lu ms\n", | ||
| 138 | otg_state_string(musb), | ||
| 139 | (unsigned long)jiffies_to_msecs(timeout - jiffies)); | ||
| 140 | mod_timer(&musb_idle_timer, timeout); | ||
| 141 | } | ||
| 142 | |||
| 143 | void musb_platform_enable(struct musb *musb) | ||
| 144 | { | ||
| 145 | } | ||
| 146 | void musb_platform_disable(struct musb *musb) | ||
| 147 | { | ||
| 148 | } | ||
| 149 | static void omap_vbus_power(struct musb *musb, int is_on, int sleeping) | ||
| 150 | { | ||
| 151 | } | ||
| 152 | |||
| 153 | static void omap_set_vbus(struct musb *musb, int is_on) | ||
| 154 | { | ||
| 155 | u8 devctl; | ||
| 156 | /* HDRC controls CPEN, but beware current surges during device | ||
| 157 | * connect. They can trigger transient overcurrent conditions | ||
| 158 | * that must be ignored. | ||
| 159 | */ | ||
| 160 | |||
| 161 | devctl = musb_readb(musb->mregs, MUSB_DEVCTL); | ||
| 162 | |||
| 163 | if (is_on) { | ||
| 164 | musb->is_active = 1; | ||
| 165 | musb->xceiv.default_a = 1; | ||
| 166 | musb->xceiv.state = OTG_STATE_A_WAIT_VRISE; | ||
| 167 | devctl |= MUSB_DEVCTL_SESSION; | ||
| 168 | |||
| 169 | MUSB_HST_MODE(musb); | ||
| 170 | } else { | ||
| 171 | musb->is_active = 0; | ||
| 172 | |||
| 173 | /* NOTE: we're skipping A_WAIT_VFALL -> A_IDLE and | ||
| 174 | * jumping right to B_IDLE... | ||
| 175 | */ | ||
| 176 | |||
| 177 | musb->xceiv.default_a = 0; | ||
| 178 | musb->xceiv.state = OTG_STATE_B_IDLE; | ||
| 179 | devctl &= ~MUSB_DEVCTL_SESSION; | ||
| 180 | |||
| 181 | MUSB_DEV_MODE(musb); | ||
| 182 | } | ||
| 183 | musb_writeb(musb->mregs, MUSB_DEVCTL, devctl); | ||
| 184 | |||
| 185 | DBG(1, "VBUS %s, devctl %02x " | ||
| 186 | /* otg %3x conf %08x prcm %08x */ "\n", | ||
| 187 | otg_state_string(musb), | ||
| 188 | musb_readb(musb->mregs, MUSB_DEVCTL)); | ||
| 189 | } | ||
| 190 | static int omap_set_power(struct otg_transceiver *x, unsigned mA) | ||
| 191 | { | ||
| 192 | return 0; | ||
| 193 | } | ||
| 194 | |||
| 195 | static int musb_platform_resume(struct musb *musb); | ||
| 196 | |||
| 197 | void musb_platform_set_mode(struct musb *musb, u8 musb_mode) | ||
| 198 | { | ||
| 199 | u8 devctl = musb_readb(musb->mregs, MUSB_DEVCTL); | ||
| 200 | |||
| 201 | devctl |= MUSB_DEVCTL_SESSION; | ||
| 202 | musb_writeb(musb->mregs, MUSB_DEVCTL, devctl); | ||
| 203 | |||
| 204 | switch (musb_mode) { | ||
| 205 | case MUSB_HOST: | ||
| 206 | otg_set_host(&musb->xceiv, musb->xceiv.host); | ||
| 207 | break; | ||
| 208 | case MUSB_PERIPHERAL: | ||
| 209 | otg_set_peripheral(&musb->xceiv, musb->xceiv.gadget); | ||
| 210 | break; | ||
| 211 | case MUSB_OTG: | ||
| 212 | break; | ||
| 213 | } | ||
| 214 | } | ||
| 215 | |||
| 216 | int __init musb_platform_init(struct musb *musb) | ||
| 217 | { | ||
| 218 | u32 l; | ||
| 219 | |||
| 220 | #if defined(CONFIG_ARCH_OMAP2430) | ||
| 221 | omap_cfg_reg(AE5_2430_USB0HS_STP); | ||
| 222 | #endif | ||
| 223 | |||
| 224 | musb_platform_resume(musb); | ||
| 225 | |||
| 226 | l = omap_readl(OTG_SYSCONFIG); | ||
| 227 | l &= ~ENABLEWAKEUP; /* disable wakeup */ | ||
| 228 | l &= ~NOSTDBY; /* remove possible nostdby */ | ||
| 229 | l |= SMARTSTDBY; /* enable smart standby */ | ||
| 230 | l &= ~AUTOIDLE; /* disable auto idle */ | ||
| 231 | l &= ~NOIDLE; /* remove possible noidle */ | ||
| 232 | l |= SMARTIDLE; /* enable smart idle */ | ||
| 233 | l |= AUTOIDLE; /* enable auto idle */ | ||
| 234 | omap_writel(l, OTG_SYSCONFIG); | ||
| 235 | |||
| 236 | l = omap_readl(OTG_INTERFSEL); | ||
| 237 | l |= ULPI_12PIN; | ||
| 238 | omap_writel(l, OTG_INTERFSEL); | ||
| 239 | |||
| 240 | pr_debug("HS USB OTG: revision 0x%x, sysconfig 0x%02x, " | ||
| 241 | "sysstatus 0x%x, intrfsel 0x%x, simenable 0x%x\n", | ||
| 242 | omap_readl(OTG_REVISION), omap_readl(OTG_SYSCONFIG), | ||
| 243 | omap_readl(OTG_SYSSTATUS), omap_readl(OTG_INTERFSEL), | ||
| 244 | omap_readl(OTG_SIMENABLE)); | ||
| 245 | |||
| 246 | omap_vbus_power(musb, musb->board_mode == MUSB_HOST, 1); | ||
| 247 | |||
| 248 | if (is_host_enabled(musb)) | ||
| 249 | musb->board_set_vbus = omap_set_vbus; | ||
| 250 | if (is_peripheral_enabled(musb)) | ||
| 251 | musb->xceiv.set_power = omap_set_power; | ||
| 252 | musb->a_wait_bcon = MUSB_TIMEOUT_A_WAIT_BCON; | ||
| 253 | |||
| 254 | setup_timer(&musb_idle_timer, musb_do_idle, (unsigned long) musb); | ||
| 255 | |||
| 256 | return 0; | ||
| 257 | } | ||
| 258 | |||
| 259 | int musb_platform_suspend(struct musb *musb) | ||
| 260 | { | ||
| 261 | u32 l; | ||
| 262 | |||
| 263 | if (!musb->clock) | ||
| 264 | return 0; | ||
| 265 | |||
| 266 | /* in any role */ | ||
| 267 | l = omap_readl(OTG_FORCESTDBY); | ||
| 268 | l |= ENABLEFORCE; /* enable MSTANDBY */ | ||
| 269 | omap_writel(l, OTG_FORCESTDBY); | ||
| 270 | |||
| 271 | l = omap_readl(OTG_SYSCONFIG); | ||
| 272 | l |= ENABLEWAKEUP; /* enable wakeup */ | ||
| 273 | omap_writel(l, OTG_SYSCONFIG); | ||
| 274 | |||
| 275 | if (musb->xceiv.set_suspend) | ||
| 276 | musb->xceiv.set_suspend(&musb->xceiv, 1); | ||
| 277 | |||
| 278 | if (musb->set_clock) | ||
| 279 | musb->set_clock(musb->clock, 0); | ||
| 280 | else | ||
| 281 | clk_disable(musb->clock); | ||
| 282 | |||
| 283 | return 0; | ||
| 284 | } | ||
| 285 | |||
| 286 | static int musb_platform_resume(struct musb *musb) | ||
| 287 | { | ||
| 288 | u32 l; | ||
| 289 | |||
| 290 | if (!musb->clock) | ||
| 291 | return 0; | ||
| 292 | |||
| 293 | if (musb->xceiv.set_suspend) | ||
| 294 | musb->xceiv.set_suspend(&musb->xceiv, 0); | ||
| 295 | |||
| 296 | if (musb->set_clock) | ||
| 297 | musb->set_clock(musb->clock, 1); | ||
| 298 | else | ||
| 299 | clk_enable(musb->clock); | ||
| 300 | |||
| 301 | l = omap_readl(OTG_SYSCONFIG); | ||
| 302 | l &= ~ENABLEWAKEUP; /* disable wakeup */ | ||
| 303 | omap_writel(l, OTG_SYSCONFIG); | ||
| 304 | |||
| 305 | l = omap_readl(OTG_FORCESTDBY); | ||
| 306 | l &= ~ENABLEFORCE; /* disable MSTANDBY */ | ||
| 307 | omap_writel(l, OTG_FORCESTDBY); | ||
| 308 | |||
| 309 | return 0; | ||
| 310 | } | ||
| 311 | |||
| 312 | |||
| 313 | int musb_platform_exit(struct musb *musb) | ||
| 314 | { | ||
| 315 | |||
| 316 | omap_vbus_power(musb, 0 /*off*/, 1); | ||
| 317 | |||
| 318 | musb_platform_suspend(musb); | ||
| 319 | |||
| 320 | clk_put(musb->clock); | ||
| 321 | musb->clock = 0; | ||
| 322 | |||
| 323 | return 0; | ||
| 324 | } | ||
diff --git a/drivers/usb/musb/omap2430.h b/drivers/usb/musb/omap2430.h new file mode 100644 index 000000000000..786a62071f72 --- /dev/null +++ b/drivers/usb/musb/omap2430.h | |||
| @@ -0,0 +1,56 @@ | |||
| 1 | /* | ||
| 2 | * Copyright (C) 2005-2006 by Texas Instruments | ||
| 3 | * | ||
| 4 | * The Inventra Controller Driver for Linux is free software; you | ||
| 5 | * can redistribute it and/or modify it under the terms of the GNU | ||
| 6 | * General Public License version 2 as published by the Free Software | ||
| 7 | * Foundation. | ||
| 8 | */ | ||
| 9 | |||
| 10 | #ifndef __MUSB_OMAP243X_H__ | ||
| 11 | #define __MUSB_OMAP243X_H__ | ||
| 12 | |||
| 13 | #if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3430) | ||
| 14 | #include <asm/arch/hardware.h> | ||
| 15 | #include <asm/arch/usb.h> | ||
| 16 | |||
| 17 | /* | ||
| 18 | * OMAP2430-specific definitions | ||
| 19 | */ | ||
| 20 | |||
| 21 | #define MENTOR_BASE_OFFSET 0 | ||
| 22 | #if defined(CONFIG_ARCH_OMAP2430) | ||
| 23 | #define OMAP_HSOTG_BASE (OMAP243X_HS_BASE) | ||
| 24 | #elif defined(CONFIG_ARCH_OMAP3430) | ||
| 25 | #define OMAP_HSOTG_BASE (OMAP34XX_HSUSB_OTG_BASE) | ||
| 26 | #endif | ||
| 27 | #define OMAP_HSOTG(offset) (OMAP_HSOTG_BASE + 0x400 + (offset)) | ||
| 28 | #define OTG_REVISION OMAP_HSOTG(0x0) | ||
| 29 | #define OTG_SYSCONFIG OMAP_HSOTG(0x4) | ||
| 30 | # define MIDLEMODE 12 /* bit position */ | ||
| 31 | # define FORCESTDBY (0 << MIDLEMODE) | ||
| 32 | # define NOSTDBY (1 << MIDLEMODE) | ||
| 33 | # define SMARTSTDBY (2 << MIDLEMODE) | ||
| 34 | # define SIDLEMODE 3 /* bit position */ | ||
| 35 | # define FORCEIDLE (0 << SIDLEMODE) | ||
| 36 | # define NOIDLE (1 << SIDLEMODE) | ||
| 37 | # define SMARTIDLE (2 << SIDLEMODE) | ||
| 38 | # define ENABLEWAKEUP (1 << 2) | ||
| 39 | # define SOFTRST (1 << 1) | ||
| 40 | # define AUTOIDLE (1 << 0) | ||
| 41 | #define OTG_SYSSTATUS OMAP_HSOTG(0x8) | ||
| 42 | # define RESETDONE (1 << 0) | ||
| 43 | #define OTG_INTERFSEL OMAP_HSOTG(0xc) | ||
| 44 | # define EXTCP (1 << 2) | ||
| 45 | # define PHYSEL 0 /* bit position */ | ||
| 46 | # define UTMI_8BIT (0 << PHYSEL) | ||
| 47 | # define ULPI_12PIN (1 << PHYSEL) | ||
| 48 | # define ULPI_8PIN (2 << PHYSEL) | ||
| 49 | #define OTG_SIMENABLE OMAP_HSOTG(0x10) | ||
| 50 | # define TM1 (1 << 0) | ||
| 51 | #define OTG_FORCESTDBY OMAP_HSOTG(0x14) | ||
| 52 | # define ENABLEFORCE (1 << 0) | ||
| 53 | |||
| 54 | #endif /* CONFIG_ARCH_OMAP2430 */ | ||
| 55 | |||
| 56 | #endif /* __MUSB_OMAP243X_H__ */ | ||
diff --git a/drivers/usb/musb/tusb6010.c b/drivers/usb/musb/tusb6010.c new file mode 100644 index 000000000000..b73b036f3d77 --- /dev/null +++ b/drivers/usb/musb/tusb6010.c | |||
| @@ -0,0 +1,1151 @@ | |||
| 1 | /* | ||
| 2 | * TUSB6010 USB 2.0 OTG Dual Role controller | ||
| 3 | * | ||
| 4 | * Copyright (C) 2006 Nokia Corporation | ||
| 5 | * Jarkko Nikula <jarkko.nikula@nokia.com> | ||
| 6 | * Tony Lindgren <tony@atomide.com> | ||
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or modify | ||
| 9 | * it under the terms of the GNU General Public License version 2 as | ||
| 10 | * published by the Free Software Foundation. | ||
| 11 | * | ||
| 12 | * Notes: | ||
| 13 | * - Driver assumes that interface to external host (main CPU) is | ||
| 14 | * configured for NOR FLASH interface instead of VLYNQ serial | ||
| 15 | * interface. | ||
| 16 | */ | ||
| 17 | |||
| 18 | #include <linux/module.h> | ||
| 19 | #include <linux/kernel.h> | ||
| 20 | #include <linux/errno.h> | ||
| 21 | #include <linux/init.h> | ||
| 22 | #include <linux/usb.h> | ||
| 23 | #include <linux/irq.h> | ||
| 24 | #include <linux/platform_device.h> | ||
| 25 | |||
| 26 | #include "musb_core.h" | ||
| 27 | |||
| 28 | static void tusb_source_power(struct musb *musb, int is_on); | ||
| 29 | |||
| 30 | #define TUSB_REV_MAJOR(reg_val) ((reg_val >> 4) & 0xf) | ||
| 31 | #define TUSB_REV_MINOR(reg_val) (reg_val & 0xf) | ||
| 32 | |||
| 33 | /* | ||
| 34 | * Checks the revision. We need to use the DMA register as 3.0 does not | ||
| 35 | * have correct versions for TUSB_PRCM_REV or TUSB_INT_CTRL_REV. | ||
| 36 | */ | ||
| 37 | u8 tusb_get_revision(struct musb *musb) | ||
| 38 | { | ||
| 39 | void __iomem *tbase = musb->ctrl_base; | ||
| 40 | u32 die_id; | ||
| 41 | u8 rev; | ||
| 42 | |||
| 43 | rev = musb_readl(tbase, TUSB_DMA_CTRL_REV) & 0xff; | ||
| 44 | if (TUSB_REV_MAJOR(rev) == 3) { | ||
| 45 | die_id = TUSB_DIDR1_HI_CHIP_REV(musb_readl(tbase, | ||
| 46 | TUSB_DIDR1_HI)); | ||
| 47 | if (die_id >= TUSB_DIDR1_HI_REV_31) | ||
| 48 | rev |= 1; | ||
| 49 | } | ||
| 50 | |||
| 51 | return rev; | ||
| 52 | } | ||
| 53 | |||
| 54 | static int __init tusb_print_revision(struct musb *musb) | ||
| 55 | { | ||
| 56 | void __iomem *tbase = musb->ctrl_base; | ||
| 57 | u8 rev; | ||
| 58 | |||
| 59 | rev = tusb_get_revision(musb); | ||
| 60 | |||
| 61 | pr_info("tusb: %s%i.%i %s%i.%i %s%i.%i %s%i.%i %s%i %s%i.%i\n", | ||
| 62 | "prcm", | ||
| 63 | TUSB_REV_MAJOR(musb_readl(tbase, TUSB_PRCM_REV)), | ||
| 64 | TUSB_REV_MINOR(musb_readl(tbase, TUSB_PRCM_REV)), | ||
| 65 | "int", | ||
| 66 | TUSB_REV_MAJOR(musb_readl(tbase, TUSB_INT_CTRL_REV)), | ||
| 67 | TUSB_REV_MINOR(musb_readl(tbase, TUSB_INT_CTRL_REV)), | ||
| 68 | "gpio", | ||
| 69 | TUSB_REV_MAJOR(musb_readl(tbase, TUSB_GPIO_REV)), | ||
| 70 | TUSB_REV_MINOR(musb_readl(tbase, TUSB_GPIO_REV)), | ||
| 71 | "dma", | ||
| 72 | TUSB_REV_MAJOR(musb_readl(tbase, TUSB_DMA_CTRL_REV)), | ||
| 73 | TUSB_REV_MINOR(musb_readl(tbase, TUSB_DMA_CTRL_REV)), | ||
| 74 | "dieid", | ||
| 75 | TUSB_DIDR1_HI_CHIP_REV(musb_readl(tbase, TUSB_DIDR1_HI)), | ||
| 76 | "rev", | ||
| 77 | TUSB_REV_MAJOR(rev), TUSB_REV_MINOR(rev)); | ||
| 78 | |||
| 79 | return tusb_get_revision(musb); | ||
| 80 | } | ||
| 81 | |||
| 82 | #define WBUS_QUIRK_MASK (TUSB_PHY_OTG_CTRL_TESTM2 | TUSB_PHY_OTG_CTRL_TESTM1 \ | ||
| 83 | | TUSB_PHY_OTG_CTRL_TESTM0) | ||
| 84 | |||
| 85 | /* | ||
| 86 | * Workaround for spontaneous WBUS wake-up issue #2 for tusb3.0. | ||
| 87 | * Disables power detection in PHY for the duration of idle. | ||
| 88 | */ | ||
| 89 | static void tusb_wbus_quirk(struct musb *musb, int enabled) | ||
| 90 | { | ||
| 91 | void __iomem *tbase = musb->ctrl_base; | ||
| 92 | static u32 phy_otg_ctrl, phy_otg_ena; | ||
| 93 | u32 tmp; | ||
| 94 | |||
| 95 | if (enabled) { | ||
| 96 | phy_otg_ctrl = musb_readl(tbase, TUSB_PHY_OTG_CTRL); | ||
| 97 | phy_otg_ena = musb_readl(tbase, TUSB_PHY_OTG_CTRL_ENABLE); | ||
| 98 | tmp = TUSB_PHY_OTG_CTRL_WRPROTECT | ||
| 99 | | phy_otg_ena | WBUS_QUIRK_MASK; | ||
| 100 | musb_writel(tbase, TUSB_PHY_OTG_CTRL, tmp); | ||
| 101 | tmp = phy_otg_ena & ~WBUS_QUIRK_MASK; | ||
| 102 | tmp |= TUSB_PHY_OTG_CTRL_WRPROTECT | TUSB_PHY_OTG_CTRL_TESTM2; | ||
| 103 | musb_writel(tbase, TUSB_PHY_OTG_CTRL_ENABLE, tmp); | ||
| 104 | DBG(2, "Enabled tusb wbus quirk ctrl %08x ena %08x\n", | ||
| 105 | musb_readl(tbase, TUSB_PHY_OTG_CTRL), | ||
| 106 | musb_readl(tbase, TUSB_PHY_OTG_CTRL_ENABLE)); | ||
| 107 | } else if (musb_readl(tbase, TUSB_PHY_OTG_CTRL_ENABLE) | ||
| 108 | & TUSB_PHY_OTG_CTRL_TESTM2) { | ||
| 109 | tmp = TUSB_PHY_OTG_CTRL_WRPROTECT | phy_otg_ctrl; | ||
| 110 | musb_writel(tbase, TUSB_PHY_OTG_CTRL, tmp); | ||
| 111 | tmp = TUSB_PHY_OTG_CTRL_WRPROTECT | phy_otg_ena; | ||
| 112 | musb_writel(tbase, TUSB_PHY_OTG_CTRL_ENABLE, tmp); | ||
| 113 | DBG(2, "Disabled tusb wbus quirk ctrl %08x ena %08x\n", | ||
| 114 | musb_readl(tbase, TUSB_PHY_OTG_CTRL), | ||
| 115 | musb_readl(tbase, TUSB_PHY_OTG_CTRL_ENABLE)); | ||
| 116 | phy_otg_ctrl = 0; | ||
| 117 | phy_otg_ena = 0; | ||
| 118 | } | ||
| 119 | } | ||
| 120 | |||
| 121 | /* | ||
| 122 | * TUSB 6010 may use a parallel bus that doesn't support byte ops; | ||
| 123 | * so both loading and unloading FIFOs need explicit byte counts. | ||
| 124 | */ | ||
| 125 | |||
| 126 | static inline void | ||
| 127 | tusb_fifo_write_unaligned(void __iomem *fifo, const u8 *buf, u16 len) | ||
| 128 | { | ||
| 129 | u32 val; | ||
| 130 | int i; | ||
| 131 | |||
| 132 | if (len > 4) { | ||
| 133 | for (i = 0; i < (len >> 2); i++) { | ||
| 134 | memcpy(&val, buf, 4); | ||
| 135 | musb_writel(fifo, 0, val); | ||
| 136 | buf += 4; | ||
| 137 | } | ||
| 138 | len %= 4; | ||
| 139 | } | ||
| 140 | if (len > 0) { | ||
| 141 | /* Write the rest 1 - 3 bytes to FIFO */ | ||
| 142 | memcpy(&val, buf, len); | ||
| 143 | musb_writel(fifo, 0, val); | ||
| 144 | } | ||
| 145 | } | ||
| 146 | |||
| 147 | static inline void tusb_fifo_read_unaligned(void __iomem *fifo, | ||
| 148 | void __iomem *buf, u16 len) | ||
| 149 | { | ||
| 150 | u32 val; | ||
| 151 | int i; | ||
| 152 | |||
| 153 | if (len > 4) { | ||
| 154 | for (i = 0; i < (len >> 2); i++) { | ||
| 155 | val = musb_readl(fifo, 0); | ||
| 156 | memcpy(buf, &val, 4); | ||
| 157 | buf += 4; | ||
| 158 | } | ||
| 159 | len %= 4; | ||
| 160 | } | ||
| 161 | if (len > 0) { | ||
| 162 | /* Read the rest 1 - 3 bytes from FIFO */ | ||
| 163 | val = musb_readl(fifo, 0); | ||
| 164 | memcpy(buf, &val, len); | ||
| 165 | } | ||
| 166 | } | ||
| 167 | |||
| 168 | void musb_write_fifo(struct musb_hw_ep *hw_ep, u16 len, const u8 *buf) | ||
| 169 | { | ||
| 170 | void __iomem *ep_conf = hw_ep->conf; | ||
| 171 | void __iomem *fifo = hw_ep->fifo; | ||
| 172 | u8 epnum = hw_ep->epnum; | ||
| 173 | |||
| 174 | prefetch(buf); | ||
| 175 | |||
| 176 | DBG(4, "%cX ep%d fifo %p count %d buf %p\n", | ||
| 177 | 'T', epnum, fifo, len, buf); | ||
| 178 | |||
| 179 | if (epnum) | ||
| 180 | musb_writel(ep_conf, TUSB_EP_TX_OFFSET, | ||
| 181 | TUSB_EP_CONFIG_XFR_SIZE(len)); | ||
| 182 | else | ||
| 183 | musb_writel(ep_conf, 0, TUSB_EP0_CONFIG_DIR_TX | | ||
| 184 | TUSB_EP0_CONFIG_XFR_SIZE(len)); | ||
| 185 | |||
| 186 | if (likely((0x01 & (unsigned long) buf) == 0)) { | ||
| 187 | |||
| 188 | /* Best case is 32bit-aligned destination address */ | ||
| 189 | if ((0x02 & (unsigned long) buf) == 0) { | ||
| 190 | if (len >= 4) { | ||
| 191 | writesl(fifo, buf, len >> 2); | ||
| 192 | buf += (len & ~0x03); | ||
| 193 | len &= 0x03; | ||
| 194 | } | ||
| 195 | } else { | ||
| 196 | if (len >= 2) { | ||
| 197 | u32 val; | ||
| 198 | int i; | ||
| 199 | |||
| 200 | /* Cannot use writesw, fifo is 32-bit */ | ||
| 201 | for (i = 0; i < (len >> 2); i++) { | ||
| 202 | val = (u32)(*(u16 *)buf); | ||
| 203 | buf += 2; | ||
| 204 | val |= (*(u16 *)buf) << 16; | ||
| 205 | buf += 2; | ||
| 206 | musb_writel(fifo, 0, val); | ||
| 207 | } | ||
| 208 | len &= 0x03; | ||
| 209 | } | ||
| 210 | } | ||
| 211 | } | ||
| 212 | |||
| 213 | if (len > 0) | ||
| 214 | tusb_fifo_write_unaligned(fifo, buf, len); | ||
| 215 | } | ||
| 216 | |||
| 217 | void musb_read_fifo(struct musb_hw_ep *hw_ep, u16 len, u8 *buf) | ||
| 218 | { | ||
| 219 | void __iomem *ep_conf = hw_ep->conf; | ||
| 220 | void __iomem *fifo = hw_ep->fifo; | ||
| 221 | u8 epnum = hw_ep->epnum; | ||
| 222 | |||
| 223 | DBG(4, "%cX ep%d fifo %p count %d buf %p\n", | ||
| 224 | 'R', epnum, fifo, len, buf); | ||
| 225 | |||
| 226 | if (epnum) | ||
| 227 | musb_writel(ep_conf, TUSB_EP_RX_OFFSET, | ||
| 228 | TUSB_EP_CONFIG_XFR_SIZE(len)); | ||
| 229 | else | ||
| 230 | musb_writel(ep_conf, 0, TUSB_EP0_CONFIG_XFR_SIZE(len)); | ||
| 231 | |||
| 232 | if (likely((0x01 & (unsigned long) buf) == 0)) { | ||
| 233 | |||
| 234 | /* Best case is 32bit-aligned destination address */ | ||
| 235 | if ((0x02 & (unsigned long) buf) == 0) { | ||
| 236 | if (len >= 4) { | ||
| 237 | readsl(fifo, buf, len >> 2); | ||
| 238 | buf += (len & ~0x03); | ||
| 239 | len &= 0x03; | ||
| 240 | } | ||
| 241 | } else { | ||
| 242 | if (len >= 2) { | ||
| 243 | u32 val; | ||
| 244 | int i; | ||
| 245 | |||
| 246 | /* Cannot use readsw, fifo is 32-bit */ | ||
| 247 | for (i = 0; i < (len >> 2); i++) { | ||
| 248 | val = musb_readl(fifo, 0); | ||
| 249 | *(u16 *)buf = (u16)(val & 0xffff); | ||
| 250 | buf += 2; | ||
| 251 | *(u16 *)buf = (u16)(val >> 16); | ||
| 252 | buf += 2; | ||
| 253 | } | ||
| 254 | len &= 0x03; | ||
| 255 | } | ||
| 256 | } | ||
| 257 | } | ||
| 258 | |||
| 259 | if (len > 0) | ||
| 260 | tusb_fifo_read_unaligned(fifo, buf, len); | ||
| 261 | } | ||
| 262 | |||
| 263 | #ifdef CONFIG_USB_GADGET_MUSB_HDRC | ||
| 264 | |||
| 265 | /* This is used by gadget drivers, and OTG transceiver logic, allowing | ||
| 266 | * at most mA current to be drawn from VBUS during a Default-B session | ||
| 267 | * (that is, while VBUS exceeds 4.4V). In Default-A (including pure host | ||
| 268 | * mode), or low power Default-B sessions, something else supplies power. | ||
| 269 | * Caller must take care of locking. | ||
| 270 | */ | ||
| 271 | static int tusb_draw_power(struct otg_transceiver *x, unsigned mA) | ||
| 272 | { | ||
| 273 | struct musb *musb = container_of(x, struct musb, xceiv); | ||
| 274 | void __iomem *tbase = musb->ctrl_base; | ||
| 275 | u32 reg; | ||
| 276 | |||
| 277 | /* | ||
| 278 | * Keep clock active when enabled. Note that this is not tied to | ||
| 279 | * drawing VBUS, as with OTG mA can be less than musb->min_power. | ||
| 280 | */ | ||
| 281 | if (musb->set_clock) { | ||
| 282 | if (mA) | ||
| 283 | musb->set_clock(musb->clock, 1); | ||
| 284 | else | ||
| 285 | musb->set_clock(musb->clock, 0); | ||
| 286 | } | ||
| 287 | |||
| 288 | /* tps65030 seems to consume max 100mA, with maybe 60mA available | ||
| 289 | * (measured on one board) for things other than tps and tusb. | ||
| 290 | * | ||
| 291 | * Boards sharing the CPU clock with CLKIN will need to prevent | ||
| 292 | * certain idle sleep states while the USB link is active. | ||
| 293 | * | ||
| 294 | * REVISIT we could use VBUS to supply only _one_ of { 1.5V, 3.3V }. | ||
| 295 | * The actual current usage would be very board-specific. For now, | ||
| 296 | * it's simpler to just use an aggregate (also board-specific). | ||
| 297 | */ | ||
| 298 | if (x->default_a || mA < (musb->min_power << 1)) | ||
| 299 | mA = 0; | ||
| 300 | |||
| 301 | reg = musb_readl(tbase, TUSB_PRCM_MNGMT); | ||
| 302 | if (mA) { | ||
| 303 | musb->is_bus_powered = 1; | ||
| 304 | reg |= TUSB_PRCM_MNGMT_15_SW_EN | TUSB_PRCM_MNGMT_33_SW_EN; | ||
| 305 | } else { | ||
| 306 | musb->is_bus_powered = 0; | ||
| 307 | reg &= ~(TUSB_PRCM_MNGMT_15_SW_EN | TUSB_PRCM_MNGMT_33_SW_EN); | ||
| 308 | } | ||
| 309 | musb_writel(tbase, TUSB_PRCM_MNGMT, reg); | ||
| 310 | |||
| 311 | DBG(2, "draw max %d mA VBUS\n", mA); | ||
| 312 | return 0; | ||
| 313 | } | ||
| 314 | |||
| 315 | #else | ||
| 316 | #define tusb_draw_power NULL | ||
| 317 | #endif | ||
| 318 | |||
| 319 | /* workaround for issue 13: change clock during chip idle | ||
| 320 | * (to be fixed in rev3 silicon) ... symptoms include disconnect | ||
| 321 | * or looping suspend/resume cycles | ||
| 322 | */ | ||
| 323 | static void tusb_set_clock_source(struct musb *musb, unsigned mode) | ||
| 324 | { | ||
| 325 | void __iomem *tbase = musb->ctrl_base; | ||
| 326 | u32 reg; | ||
| 327 | |||
| 328 | reg = musb_readl(tbase, TUSB_PRCM_CONF); | ||
| 329 | reg &= ~TUSB_PRCM_CONF_SYS_CLKSEL(0x3); | ||
| 330 | |||
| 331 | /* 0 = refclk (clkin, XI) | ||
| 332 | * 1 = PHY 60 MHz (internal PLL) | ||
| 333 | * 2 = not supported | ||
| 334 | * 3 = what? | ||
| 335 | */ | ||
| 336 | if (mode > 0) | ||
| 337 | reg |= TUSB_PRCM_CONF_SYS_CLKSEL(mode & 0x3); | ||
| 338 | |||
| 339 | musb_writel(tbase, TUSB_PRCM_CONF, reg); | ||
| 340 | |||
| 341 | /* FIXME tusb6010_platform_retime(mode == 0); */ | ||
| 342 | } | ||
| 343 | |||
| 344 | /* | ||
| 345 | * Idle TUSB6010 until next wake-up event; NOR access always wakes. | ||
| 346 | * Other code ensures that we idle unless we're connected _and_ the | ||
| 347 | * USB link is not suspended ... and tells us the relevant wakeup | ||
| 348 | * events. SW_EN for voltage is handled separately. | ||
| 349 | */ | ||
| 350 | void tusb_allow_idle(struct musb *musb, u32 wakeup_enables) | ||
| 351 | { | ||
| 352 | void __iomem *tbase = musb->ctrl_base; | ||
| 353 | u32 reg; | ||
| 354 | |||
| 355 | if ((wakeup_enables & TUSB_PRCM_WBUS) | ||
| 356 | && (tusb_get_revision(musb) == TUSB_REV_30)) | ||
| 357 | tusb_wbus_quirk(musb, 1); | ||
| 358 | |||
| 359 | tusb_set_clock_source(musb, 0); | ||
| 360 | |||
| 361 | wakeup_enables |= TUSB_PRCM_WNORCS; | ||
| 362 | musb_writel(tbase, TUSB_PRCM_WAKEUP_MASK, ~wakeup_enables); | ||
| 363 | |||
| 364 | /* REVISIT writeup of WID implies that if WID set and ID is grounded, | ||
| 365 | * TUSB_PHY_OTG_CTRL.TUSB_PHY_OTG_CTRL_OTG_ID_PULLUP must be cleared. | ||
| 366 | * Presumably that's mostly to save power, hence WID is immaterial ... | ||
| 367 | */ | ||
| 368 | |||
| 369 | reg = musb_readl(tbase, TUSB_PRCM_MNGMT); | ||
| 370 | /* issue 4: when driving vbus, use hipower (vbus_det) comparator */ | ||
| 371 | if (is_host_active(musb)) { | ||
| 372 | reg |= TUSB_PRCM_MNGMT_OTG_VBUS_DET_EN; | ||
| 373 | reg &= ~TUSB_PRCM_MNGMT_OTG_SESS_END_EN; | ||
| 374 | } else { | ||
| 375 | reg |= TUSB_PRCM_MNGMT_OTG_SESS_END_EN; | ||
| 376 | reg &= ~TUSB_PRCM_MNGMT_OTG_VBUS_DET_EN; | ||
| 377 | } | ||
| 378 | reg |= TUSB_PRCM_MNGMT_PM_IDLE | TUSB_PRCM_MNGMT_DEV_IDLE; | ||
| 379 | musb_writel(tbase, TUSB_PRCM_MNGMT, reg); | ||
| 380 | |||
| 381 | DBG(6, "idle, wake on %02x\n", wakeup_enables); | ||
| 382 | } | ||
| 383 | |||
| 384 | /* | ||
| 385 | * Updates cable VBUS status. Caller must take care of locking. | ||
| 386 | */ | ||
| 387 | int musb_platform_get_vbus_status(struct musb *musb) | ||
| 388 | { | ||
| 389 | void __iomem *tbase = musb->ctrl_base; | ||
| 390 | u32 otg_stat, prcm_mngmt; | ||
| 391 | int ret = 0; | ||
| 392 | |||
| 393 | otg_stat = musb_readl(tbase, TUSB_DEV_OTG_STAT); | ||
| 394 | prcm_mngmt = musb_readl(tbase, TUSB_PRCM_MNGMT); | ||
| 395 | |||
| 396 | /* Temporarily enable VBUS detection if it was disabled for | ||
| 397 | * suspend mode. Unless it's enabled otg_stat and devctl will | ||
| 398 | * not show correct VBUS state. | ||
| 399 | */ | ||
| 400 | if (!(prcm_mngmt & TUSB_PRCM_MNGMT_OTG_VBUS_DET_EN)) { | ||
| 401 | u32 tmp = prcm_mngmt; | ||
| 402 | tmp |= TUSB_PRCM_MNGMT_OTG_VBUS_DET_EN; | ||
| 403 | musb_writel(tbase, TUSB_PRCM_MNGMT, tmp); | ||
| 404 | otg_stat = musb_readl(tbase, TUSB_DEV_OTG_STAT); | ||
| 405 | musb_writel(tbase, TUSB_PRCM_MNGMT, prcm_mngmt); | ||
| 406 | } | ||
| 407 | |||
| 408 | if (otg_stat & TUSB_DEV_OTG_STAT_VBUS_VALID) | ||
| 409 | ret = 1; | ||
| 410 | |||
| 411 | return ret; | ||
| 412 | } | ||
| 413 | |||
| 414 | static struct timer_list musb_idle_timer; | ||
| 415 | |||
| 416 | static void musb_do_idle(unsigned long _musb) | ||
| 417 | { | ||
| 418 | struct musb *musb = (void *)_musb; | ||
| 419 | unsigned long flags; | ||
| 420 | |||
| 421 | spin_lock_irqsave(&musb->lock, flags); | ||
| 422 | |||
| 423 | switch (musb->xceiv.state) { | ||
| 424 | case OTG_STATE_A_WAIT_BCON: | ||
| 425 | if ((musb->a_wait_bcon != 0) | ||
| 426 | && (musb->idle_timeout == 0 | ||
| 427 | || time_after(jiffies, musb->idle_timeout))) { | ||
| 428 | DBG(4, "Nothing connected %s, turning off VBUS\n", | ||
| 429 | otg_state_string(musb)); | ||
| 430 | } | ||
| 431 | /* FALLTHROUGH */ | ||
| 432 | case OTG_STATE_A_IDLE: | ||
| 433 | tusb_source_power(musb, 0); | ||
| 434 | default: | ||
| 435 | break; | ||
| 436 | } | ||
| 437 | |||
| 438 | if (!musb->is_active) { | ||
| 439 | u32 wakeups; | ||
| 440 | |||
| 441 | /* wait until khubd handles port change status */ | ||
| 442 | if (is_host_active(musb) && (musb->port1_status >> 16)) | ||
| 443 | goto done; | ||
| 444 | |||
| 445 | #ifdef CONFIG_USB_GADGET_MUSB_HDRC | ||
| 446 | if (is_peripheral_enabled(musb) && !musb->gadget_driver) | ||
| 447 | wakeups = 0; | ||
| 448 | else { | ||
| 449 | wakeups = TUSB_PRCM_WHOSTDISCON | ||
| 450 | | TUSB_PRCM_WBUS | ||
| 451 | | TUSB_PRCM_WVBUS; | ||
| 452 | if (is_otg_enabled(musb)) | ||
| 453 | wakeups |= TUSB_PRCM_WID; | ||
| 454 | } | ||
| 455 | #else | ||
| 456 | wakeups = TUSB_PRCM_WHOSTDISCON | TUSB_PRCM_WBUS; | ||
| 457 | #endif | ||
| 458 | tusb_allow_idle(musb, wakeups); | ||
| 459 | } | ||
| 460 | done: | ||
| 461 | spin_unlock_irqrestore(&musb->lock, flags); | ||
| 462 | } | ||
| 463 | |||
| 464 | /* | ||
| 465 | * Maybe put TUSB6010 into idle mode mode depending on USB link status, | ||
| 466 | * like "disconnected" or "suspended". We'll be woken out of it by | ||
| 467 | * connect, resume, or disconnect. | ||
| 468 | * | ||
| 469 | * Needs to be called as the last function everywhere where there is | ||
| 470 | * register access to TUSB6010 because of NOR flash wake-up. | ||
| 471 | * Caller should own controller spinlock. | ||
| 472 | * | ||
| 473 | * Delay because peripheral enables D+ pullup 3msec after SE0, and | ||
| 474 | * we don't want to treat that full speed J as a wakeup event. | ||
| 475 | * ... peripherals must draw only suspend current after 10 msec. | ||
| 476 | */ | ||
| 477 | void musb_platform_try_idle(struct musb *musb, unsigned long timeout) | ||
| 478 | { | ||
| 479 | unsigned long default_timeout = jiffies + msecs_to_jiffies(3); | ||
| 480 | static unsigned long last_timer; | ||
| 481 | |||
| 482 | if (timeout == 0) | ||
| 483 | timeout = default_timeout; | ||
| 484 | |||
| 485 | /* Never idle if active, or when VBUS timeout is not set as host */ | ||
| 486 | if (musb->is_active || ((musb->a_wait_bcon == 0) | ||
| 487 | && (musb->xceiv.state == OTG_STATE_A_WAIT_BCON))) { | ||
| 488 | DBG(4, "%s active, deleting timer\n", otg_state_string(musb)); | ||
| 489 | del_timer(&musb_idle_timer); | ||
| 490 | last_timer = jiffies; | ||
| 491 | return; | ||
| 492 | } | ||
| 493 | |||
| 494 | if (time_after(last_timer, timeout)) { | ||
| 495 | if (!timer_pending(&musb_idle_timer)) | ||
| 496 | last_timer = timeout; | ||
| 497 | else { | ||
| 498 | DBG(4, "Longer idle timer already pending, ignoring\n"); | ||
| 499 | return; | ||
| 500 | } | ||
| 501 | } | ||
| 502 | last_timer = timeout; | ||
| 503 | |||
| 504 | DBG(4, "%s inactive, for idle timer for %lu ms\n", | ||
| 505 | otg_state_string(musb), | ||
| 506 | (unsigned long)jiffies_to_msecs(timeout - jiffies)); | ||
| 507 | mod_timer(&musb_idle_timer, timeout); | ||
| 508 | } | ||
| 509 | |||
| 510 | /* ticks of 60 MHz clock */ | ||
| 511 | #define DEVCLOCK 60000000 | ||
| 512 | #define OTG_TIMER_MS(msecs) ((msecs) \ | ||
| 513 | ? (TUSB_DEV_OTG_TIMER_VAL((DEVCLOCK/1000)*(msecs)) \ | ||
| 514 | | TUSB_DEV_OTG_TIMER_ENABLE) \ | ||
| 515 | : 0) | ||
| 516 | |||
| 517 | static void tusb_source_power(struct musb *musb, int is_on) | ||
| 518 | { | ||
| 519 | void __iomem *tbase = musb->ctrl_base; | ||
| 520 | u32 conf, prcm, timer; | ||
| 521 | u8 devctl; | ||
| 522 | |||
| 523 | /* HDRC controls CPEN, but beware current surges during device | ||
| 524 | * connect. They can trigger transient overcurrent conditions | ||
| 525 | * that must be ignored. | ||
| 526 | */ | ||
| 527 | |||
| 528 | prcm = musb_readl(tbase, TUSB_PRCM_MNGMT); | ||
| 529 | conf = musb_readl(tbase, TUSB_DEV_CONF); | ||
| 530 | devctl = musb_readb(musb->mregs, MUSB_DEVCTL); | ||
| 531 | |||
| 532 | if (is_on) { | ||
| 533 | if (musb->set_clock) | ||
| 534 | musb->set_clock(musb->clock, 1); | ||
| 535 | timer = OTG_TIMER_MS(OTG_TIME_A_WAIT_VRISE); | ||
| 536 | musb->xceiv.default_a = 1; | ||
| 537 | musb->xceiv.state = OTG_STATE_A_WAIT_VRISE; | ||
| 538 | devctl |= MUSB_DEVCTL_SESSION; | ||
| 539 | |||
| 540 | conf |= TUSB_DEV_CONF_USB_HOST_MODE; | ||
| 541 | MUSB_HST_MODE(musb); | ||
| 542 | } else { | ||
| 543 | u32 otg_stat; | ||
| 544 | |||
| 545 | timer = 0; | ||
| 546 | |||
| 547 | /* If ID pin is grounded, we want to be a_idle */ | ||
| 548 | otg_stat = musb_readl(tbase, TUSB_DEV_OTG_STAT); | ||
| 549 | if (!(otg_stat & TUSB_DEV_OTG_STAT_ID_STATUS)) { | ||
| 550 | switch (musb->xceiv.state) { | ||
| 551 | case OTG_STATE_A_WAIT_VRISE: | ||
| 552 | case OTG_STATE_A_WAIT_BCON: | ||
| 553 | musb->xceiv.state = OTG_STATE_A_WAIT_VFALL; | ||
| 554 | break; | ||
| 555 | case OTG_STATE_A_WAIT_VFALL: | ||
| 556 | musb->xceiv.state = OTG_STATE_A_IDLE; | ||
| 557 | break; | ||
| 558 | default: | ||
| 559 | musb->xceiv.state = OTG_STATE_A_IDLE; | ||
| 560 | } | ||
| 561 | musb->is_active = 0; | ||
| 562 | musb->xceiv.default_a = 1; | ||
| 563 | MUSB_HST_MODE(musb); | ||
| 564 | } else { | ||
| 565 | musb->is_active = 0; | ||
| 566 | musb->xceiv.default_a = 0; | ||
| 567 | musb->xceiv.state = OTG_STATE_B_IDLE; | ||
| 568 | MUSB_DEV_MODE(musb); | ||
| 569 | } | ||
| 570 | |||
| 571 | devctl &= ~MUSB_DEVCTL_SESSION; | ||
| 572 | conf &= ~TUSB_DEV_CONF_USB_HOST_MODE; | ||
| 573 | if (musb->set_clock) | ||
| 574 | musb->set_clock(musb->clock, 0); | ||
| 575 | } | ||
| 576 | prcm &= ~(TUSB_PRCM_MNGMT_15_SW_EN | TUSB_PRCM_MNGMT_33_SW_EN); | ||
| 577 | |||
| 578 | musb_writel(tbase, TUSB_PRCM_MNGMT, prcm); | ||
| 579 | musb_writel(tbase, TUSB_DEV_OTG_TIMER, timer); | ||
| 580 | musb_writel(tbase, TUSB_DEV_CONF, conf); | ||
| 581 | musb_writeb(musb->mregs, MUSB_DEVCTL, devctl); | ||
| 582 | |||
| 583 | DBG(1, "VBUS %s, devctl %02x otg %3x conf %08x prcm %08x\n", | ||
| 584 | otg_state_string(musb), | ||
| 585 | musb_readb(musb->mregs, MUSB_DEVCTL), | ||
| 586 | musb_readl(tbase, TUSB_DEV_OTG_STAT), | ||
| 587 | conf, prcm); | ||
| 588 | } | ||
| 589 | |||
| 590 | /* | ||
| 591 | * Sets the mode to OTG, peripheral or host by changing the ID detection. | ||
| 592 | * Caller must take care of locking. | ||
| 593 | * | ||
| 594 | * Note that if a mini-A cable is plugged in the ID line will stay down as | ||
| 595 | * the weak ID pull-up is not able to pull the ID up. | ||
| 596 | * | ||
| 597 | * REVISIT: It would be possible to add support for changing between host | ||
| 598 | * and peripheral modes in non-OTG configurations by reconfiguring hardware | ||
| 599 | * and then setting musb->board_mode. For now, only support OTG mode. | ||
| 600 | */ | ||
| 601 | void musb_platform_set_mode(struct musb *musb, u8 musb_mode) | ||
| 602 | { | ||
| 603 | void __iomem *tbase = musb->ctrl_base; | ||
| 604 | u32 otg_stat, phy_otg_ctrl, phy_otg_ena, dev_conf; | ||
| 605 | |||
| 606 | if (musb->board_mode != MUSB_OTG) { | ||
| 607 | ERR("Changing mode currently only supported in OTG mode\n"); | ||
| 608 | return; | ||
| 609 | } | ||
| 610 | |||
| 611 | otg_stat = musb_readl(tbase, TUSB_DEV_OTG_STAT); | ||
| 612 | phy_otg_ctrl = musb_readl(tbase, TUSB_PHY_OTG_CTRL); | ||
| 613 | phy_otg_ena = musb_readl(tbase, TUSB_PHY_OTG_CTRL_ENABLE); | ||
| 614 | dev_conf = musb_readl(tbase, TUSB_DEV_CONF); | ||
| 615 | |||
| 616 | switch (musb_mode) { | ||
| 617 | |||
| 618 | #ifdef CONFIG_USB_MUSB_HDRC_HCD | ||
| 619 | case MUSB_HOST: /* Disable PHY ID detect, ground ID */ | ||
| 620 | phy_otg_ctrl &= ~TUSB_PHY_OTG_CTRL_OTG_ID_PULLUP; | ||
| 621 | phy_otg_ena |= TUSB_PHY_OTG_CTRL_OTG_ID_PULLUP; | ||
| 622 | dev_conf |= TUSB_DEV_CONF_ID_SEL; | ||
| 623 | dev_conf &= ~TUSB_DEV_CONF_SOFT_ID; | ||
| 624 | break; | ||
| 625 | #endif | ||
| 626 | |||
| 627 | #ifdef CONFIG_USB_GADGET_MUSB_HDRC | ||
| 628 | case MUSB_PERIPHERAL: /* Disable PHY ID detect, keep ID pull-up on */ | ||
| 629 | phy_otg_ctrl |= TUSB_PHY_OTG_CTRL_OTG_ID_PULLUP; | ||
| 630 | phy_otg_ena |= TUSB_PHY_OTG_CTRL_OTG_ID_PULLUP; | ||
| 631 | dev_conf |= (TUSB_DEV_CONF_ID_SEL | TUSB_DEV_CONF_SOFT_ID); | ||
| 632 | break; | ||
| 633 | #endif | ||
| 634 | |||
| 635 | #ifdef CONFIG_USB_MUSB_OTG | ||
| 636 | case MUSB_OTG: /* Use PHY ID detection */ | ||
| 637 | phy_otg_ctrl |= TUSB_PHY_OTG_CTRL_OTG_ID_PULLUP; | ||
| 638 | phy_otg_ena |= TUSB_PHY_OTG_CTRL_OTG_ID_PULLUP; | ||
| 639 | dev_conf &= ~(TUSB_DEV_CONF_ID_SEL | TUSB_DEV_CONF_SOFT_ID); | ||
| 640 | break; | ||
| 641 | #endif | ||
| 642 | |||
| 643 | default: | ||
| 644 | DBG(2, "Trying to set unknown mode %i\n", musb_mode); | ||
| 645 | } | ||
| 646 | |||
| 647 | musb_writel(tbase, TUSB_PHY_OTG_CTRL, | ||
| 648 | TUSB_PHY_OTG_CTRL_WRPROTECT | phy_otg_ctrl); | ||
| 649 | musb_writel(tbase, TUSB_PHY_OTG_CTRL_ENABLE, | ||
| 650 | TUSB_PHY_OTG_CTRL_WRPROTECT | phy_otg_ena); | ||
| 651 | musb_writel(tbase, TUSB_DEV_CONF, dev_conf); | ||
| 652 | |||
| 653 | otg_stat = musb_readl(tbase, TUSB_DEV_OTG_STAT); | ||
| 654 | if ((musb_mode == MUSB_PERIPHERAL) && | ||
| 655 | !(otg_stat & TUSB_DEV_OTG_STAT_ID_STATUS)) | ||
| 656 | INFO("Cannot be peripheral with mini-A cable " | ||
| 657 | "otg_stat: %08x\n", otg_stat); | ||
| 658 | } | ||
| 659 | |||
| 660 | static inline unsigned long | ||
| 661 | tusb_otg_ints(struct musb *musb, u32 int_src, void __iomem *tbase) | ||
| 662 | { | ||
| 663 | u32 otg_stat = musb_readl(tbase, TUSB_DEV_OTG_STAT); | ||
| 664 | unsigned long idle_timeout = 0; | ||
| 665 | |||
| 666 | /* ID pin */ | ||
| 667 | if ((int_src & TUSB_INT_SRC_ID_STATUS_CHNG)) { | ||
| 668 | int default_a; | ||
| 669 | |||
| 670 | if (is_otg_enabled(musb)) | ||
| 671 | default_a = !(otg_stat & TUSB_DEV_OTG_STAT_ID_STATUS); | ||
| 672 | else | ||
| 673 | default_a = is_host_enabled(musb); | ||
| 674 | DBG(2, "Default-%c\n", default_a ? 'A' : 'B'); | ||
| 675 | musb->xceiv.default_a = default_a; | ||
| 676 | tusb_source_power(musb, default_a); | ||
| 677 | |||
| 678 | /* Don't allow idling immediately */ | ||
| 679 | if (default_a) | ||
| 680 | idle_timeout = jiffies + (HZ * 3); | ||
| 681 | } | ||
| 682 | |||
| 683 | /* VBUS state change */ | ||
| 684 | if (int_src & TUSB_INT_SRC_VBUS_SENSE_CHNG) { | ||
| 685 | |||
| 686 | /* B-dev state machine: no vbus ~= disconnect */ | ||
| 687 | if ((is_otg_enabled(musb) && !musb->xceiv.default_a) | ||
| 688 | || !is_host_enabled(musb)) { | ||
| 689 | #ifdef CONFIG_USB_MUSB_HDRC_HCD | ||
| 690 | /* ? musb_root_disconnect(musb); */ | ||
| 691 | musb->port1_status &= | ||
| 692 | ~(USB_PORT_STAT_CONNECTION | ||
| 693 | | USB_PORT_STAT_ENABLE | ||
| 694 | | USB_PORT_STAT_LOW_SPEED | ||
| 695 | | USB_PORT_STAT_HIGH_SPEED | ||
| 696 | | USB_PORT_STAT_TEST | ||
| 697 | ); | ||
| 698 | #endif | ||
| 699 | |||
| 700 | if (otg_stat & TUSB_DEV_OTG_STAT_SESS_END) { | ||
| 701 | DBG(1, "Forcing disconnect (no interrupt)\n"); | ||
| 702 | if (musb->xceiv.state != OTG_STATE_B_IDLE) { | ||
| 703 | /* INTR_DISCONNECT can hide... */ | ||
| 704 | musb->xceiv.state = OTG_STATE_B_IDLE; | ||
| 705 | musb->int_usb |= MUSB_INTR_DISCONNECT; | ||
| 706 | } | ||
| 707 | musb->is_active = 0; | ||
| 708 | } | ||
| 709 | DBG(2, "vbus change, %s, otg %03x\n", | ||
| 710 | otg_state_string(musb), otg_stat); | ||
| 711 | idle_timeout = jiffies + (1 * HZ); | ||
| 712 | schedule_work(&musb->irq_work); | ||
| 713 | |||
| 714 | } else /* A-dev state machine */ { | ||
| 715 | DBG(2, "vbus change, %s, otg %03x\n", | ||
| 716 | otg_state_string(musb), otg_stat); | ||
| 717 | |||
| 718 | switch (musb->xceiv.state) { | ||
| 719 | case OTG_STATE_A_IDLE: | ||
| 720 | DBG(2, "Got SRP, turning on VBUS\n"); | ||
| 721 | musb_set_vbus(musb, 1); | ||
| 722 | |||
| 723 | /* CONNECT can wake if a_wait_bcon is set */ | ||
| 724 | if (musb->a_wait_bcon != 0) | ||
| 725 | musb->is_active = 0; | ||
| 726 | else | ||
| 727 | musb->is_active = 1; | ||
| 728 | |||
| 729 | /* | ||
| 730 | * OPT FS A TD.4.6 needs few seconds for | ||
| 731 | * A_WAIT_VRISE | ||
| 732 | */ | ||
| 733 | idle_timeout = jiffies + (2 * HZ); | ||
| 734 | |||
| 735 | break; | ||
| 736 | case OTG_STATE_A_WAIT_VRISE: | ||
| 737 | /* ignore; A-session-valid < VBUS_VALID/2, | ||
| 738 | * we monitor this with the timer | ||
| 739 | */ | ||
| 740 | break; | ||
| 741 | case OTG_STATE_A_WAIT_VFALL: | ||
| 742 | /* REVISIT this irq triggers during short | ||
| 743 | * spikes caused by enumeration ... | ||
| 744 | */ | ||
| 745 | if (musb->vbuserr_retry) { | ||
| 746 | musb->vbuserr_retry--; | ||
| 747 | tusb_source_power(musb, 1); | ||
| 748 | } else { | ||
| 749 | musb->vbuserr_retry | ||
| 750 | = VBUSERR_RETRY_COUNT; | ||
| 751 | tusb_source_power(musb, 0); | ||
| 752 | } | ||
| 753 | break; | ||
| 754 | default: | ||
| 755 | break; | ||
| 756 | } | ||
| 757 | } | ||
| 758 | } | ||
| 759 | |||
| 760 | /* OTG timer expiration */ | ||
| 761 | if (int_src & TUSB_INT_SRC_OTG_TIMEOUT) { | ||
| 762 | u8 devctl; | ||
| 763 | |||
| 764 | DBG(4, "%s timer, %03x\n", otg_state_string(musb), otg_stat); | ||
| 765 | |||
| 766 | switch (musb->xceiv.state) { | ||
| 767 | case OTG_STATE_A_WAIT_VRISE: | ||
| 768 | /* VBUS has probably been valid for a while now, | ||
| 769 | * but may well have bounced out of range a bit | ||
| 770 | */ | ||
| 771 | devctl = musb_readb(musb->mregs, MUSB_DEVCTL); | ||
| 772 | if (otg_stat & TUSB_DEV_OTG_STAT_VBUS_VALID) { | ||
| 773 | if ((devctl & MUSB_DEVCTL_VBUS) | ||
| 774 | != MUSB_DEVCTL_VBUS) { | ||
| 775 | DBG(2, "devctl %02x\n", devctl); | ||
| 776 | break; | ||
| 777 | } | ||
| 778 | musb->xceiv.state = OTG_STATE_A_WAIT_BCON; | ||
| 779 | musb->is_active = 0; | ||
| 780 | idle_timeout = jiffies | ||
| 781 | + msecs_to_jiffies(musb->a_wait_bcon); | ||
| 782 | } else { | ||
| 783 | /* REVISIT report overcurrent to hub? */ | ||
| 784 | ERR("vbus too slow, devctl %02x\n", devctl); | ||
| 785 | tusb_source_power(musb, 0); | ||
| 786 | } | ||
| 787 | break; | ||
| 788 | case OTG_STATE_A_WAIT_BCON: | ||
| 789 | if (musb->a_wait_bcon != 0) | ||
| 790 | idle_timeout = jiffies | ||
| 791 | + msecs_to_jiffies(musb->a_wait_bcon); | ||
| 792 | break; | ||
| 793 | case OTG_STATE_A_SUSPEND: | ||
| 794 | break; | ||
| 795 | case OTG_STATE_B_WAIT_ACON: | ||
| 796 | break; | ||
| 797 | default: | ||
| 798 | break; | ||
| 799 | } | ||
| 800 | } | ||
| 801 | schedule_work(&musb->irq_work); | ||
| 802 | |||
| 803 | return idle_timeout; | ||
| 804 | } | ||
| 805 | |||
| 806 | static irqreturn_t tusb_interrupt(int irq, void *__hci) | ||
| 807 | { | ||
| 808 | struct musb *musb = __hci; | ||
| 809 | void __iomem *tbase = musb->ctrl_base; | ||
| 810 | unsigned long flags, idle_timeout = 0; | ||
| 811 | u32 int_mask, int_src; | ||
| 812 | |||
| 813 | spin_lock_irqsave(&musb->lock, flags); | ||
| 814 | |||
| 815 | /* Mask all interrupts to allow using both edge and level GPIO irq */ | ||
| 816 | int_mask = musb_readl(tbase, TUSB_INT_MASK); | ||
| 817 | musb_writel(tbase, TUSB_INT_MASK, ~TUSB_INT_MASK_RESERVED_BITS); | ||
| 818 | |||
| 819 | int_src = musb_readl(tbase, TUSB_INT_SRC) & ~TUSB_INT_SRC_RESERVED_BITS; | ||
| 820 | DBG(3, "TUSB IRQ %08x\n", int_src); | ||
| 821 | |||
| 822 | musb->int_usb = (u8) int_src; | ||
| 823 | |||
| 824 | /* Acknowledge wake-up source interrupts */ | ||
| 825 | if (int_src & TUSB_INT_SRC_DEV_WAKEUP) { | ||
| 826 | u32 reg; | ||
| 827 | u32 i; | ||
| 828 | |||
| 829 | if (tusb_get_revision(musb) == TUSB_REV_30) | ||
| 830 | tusb_wbus_quirk(musb, 0); | ||
| 831 | |||
| 832 | /* there are issues re-locking the PLL on wakeup ... */ | ||
| 833 | |||
| 834 | /* work around issue 8 */ | ||
| 835 | for (i = 0xf7f7f7; i > 0xf7f7f7 - 1000; i--) { | ||
| 836 | musb_writel(tbase, TUSB_SCRATCH_PAD, 0); | ||
| 837 | musb_writel(tbase, TUSB_SCRATCH_PAD, i); | ||
| 838 | reg = musb_readl(tbase, TUSB_SCRATCH_PAD); | ||
| 839 | if (reg == i) | ||
| 840 | break; | ||
| 841 | DBG(6, "TUSB NOR not ready\n"); | ||
| 842 | } | ||
| 843 | |||
| 844 | /* work around issue 13 (2nd half) */ | ||
| 845 | tusb_set_clock_source(musb, 1); | ||
| 846 | |||
| 847 | reg = musb_readl(tbase, TUSB_PRCM_WAKEUP_SOURCE); | ||
| 848 | musb_writel(tbase, TUSB_PRCM_WAKEUP_CLEAR, reg); | ||
| 849 | if (reg & ~TUSB_PRCM_WNORCS) { | ||
| 850 | musb->is_active = 1; | ||
| 851 | schedule_work(&musb->irq_work); | ||
| 852 | } | ||
| 853 | DBG(3, "wake %sactive %02x\n", | ||
| 854 | musb->is_active ? "" : "in", reg); | ||
| 855 | |||
| 856 | /* REVISIT host side TUSB_PRCM_WHOSTDISCON, TUSB_PRCM_WBUS */ | ||
| 857 | } | ||
| 858 | |||
| 859 | if (int_src & TUSB_INT_SRC_USB_IP_CONN) | ||
| 860 | del_timer(&musb_idle_timer); | ||
| 861 | |||
| 862 | /* OTG state change reports (annoyingly) not issued by Mentor core */ | ||
| 863 | if (int_src & (TUSB_INT_SRC_VBUS_SENSE_CHNG | ||
| 864 | | TUSB_INT_SRC_OTG_TIMEOUT | ||
| 865 | | TUSB_INT_SRC_ID_STATUS_CHNG)) | ||
| 866 | idle_timeout = tusb_otg_ints(musb, int_src, tbase); | ||
| 867 | |||
| 868 | /* TX dma callback must be handled here, RX dma callback is | ||
| 869 | * handled in tusb_omap_dma_cb. | ||
| 870 | */ | ||
| 871 | if ((int_src & TUSB_INT_SRC_TXRX_DMA_DONE)) { | ||
| 872 | u32 dma_src = musb_readl(tbase, TUSB_DMA_INT_SRC); | ||
| 873 | u32 real_dma_src = musb_readl(tbase, TUSB_DMA_INT_MASK); | ||
| 874 | |||
| 875 | DBG(3, "DMA IRQ %08x\n", dma_src); | ||
| 876 | real_dma_src = ~real_dma_src & dma_src; | ||
| 877 | if (tusb_dma_omap() && real_dma_src) { | ||
| 878 | int tx_source = (real_dma_src & 0xffff); | ||
| 879 | int i; | ||
| 880 | |||
| 881 | for (i = 1; i <= 15; i++) { | ||
| 882 | if (tx_source & (1 << i)) { | ||
| 883 | DBG(3, "completing ep%i %s\n", i, "tx"); | ||
| 884 | musb_dma_completion(musb, i, 1); | ||
| 885 | } | ||
| 886 | } | ||
| 887 | } | ||
| 888 | musb_writel(tbase, TUSB_DMA_INT_CLEAR, dma_src); | ||
| 889 | } | ||
| 890 | |||
| 891 | /* EP interrupts. In OCP mode tusb6010 mirrors the MUSB interrupts */ | ||
| 892 | if (int_src & (TUSB_INT_SRC_USB_IP_TX | TUSB_INT_SRC_USB_IP_RX)) { | ||
| 893 | u32 musb_src = musb_readl(tbase, TUSB_USBIP_INT_SRC); | ||
| 894 | |||
| 895 | musb_writel(tbase, TUSB_USBIP_INT_CLEAR, musb_src); | ||
| 896 | musb->int_rx = (((musb_src >> 16) & 0xffff) << 1); | ||
| 897 | musb->int_tx = (musb_src & 0xffff); | ||
| 898 | } else { | ||
| 899 | musb->int_rx = 0; | ||
| 900 | musb->int_tx = 0; | ||
| 901 | } | ||
| 902 | |||
| 903 | if (int_src & (TUSB_INT_SRC_USB_IP_TX | TUSB_INT_SRC_USB_IP_RX | 0xff)) | ||
| 904 | musb_interrupt(musb); | ||
| 905 | |||
| 906 | /* Acknowledge TUSB interrupts. Clear only non-reserved bits */ | ||
| 907 | musb_writel(tbase, TUSB_INT_SRC_CLEAR, | ||
| 908 | int_src & ~TUSB_INT_MASK_RESERVED_BITS); | ||
| 909 | |||
| 910 | musb_platform_try_idle(musb, idle_timeout); | ||
| 911 | |||
| 912 | musb_writel(tbase, TUSB_INT_MASK, int_mask); | ||
| 913 | spin_unlock_irqrestore(&musb->lock, flags); | ||
| 914 | |||
| 915 | return IRQ_HANDLED; | ||
| 916 | } | ||
| 917 | |||
| 918 | static int dma_off; | ||
| 919 | |||
| 920 | /* | ||
| 921 | * Enables TUSB6010. Caller must take care of locking. | ||
| 922 | * REVISIT: | ||
| 923 | * - Check what is unnecessary in MGC_HdrcStart() | ||
| 924 | */ | ||
| 925 | void musb_platform_enable(struct musb *musb) | ||
| 926 | { | ||
| 927 | void __iomem *tbase = musb->ctrl_base; | ||
| 928 | |||
| 929 | /* Setup TUSB6010 main interrupt mask. Enable all interrupts except SOF. | ||
| 930 | * REVISIT: Enable and deal with TUSB_INT_SRC_USB_IP_SOF */ | ||
| 931 | musb_writel(tbase, TUSB_INT_MASK, TUSB_INT_SRC_USB_IP_SOF); | ||
| 932 | |||
| 933 | /* Setup TUSB interrupt, disable DMA and GPIO interrupts */ | ||
| 934 | musb_writel(tbase, TUSB_USBIP_INT_MASK, 0); | ||
| 935 | musb_writel(tbase, TUSB_DMA_INT_MASK, 0x7fffffff); | ||
| 936 | musb_writel(tbase, TUSB_GPIO_INT_MASK, 0x1ff); | ||
| 937 | |||
| 938 | /* Clear all subsystem interrups */ | ||
| 939 | musb_writel(tbase, TUSB_USBIP_INT_CLEAR, 0x7fffffff); | ||
| 940 | musb_writel(tbase, TUSB_DMA_INT_CLEAR, 0x7fffffff); | ||
| 941 | musb_writel(tbase, TUSB_GPIO_INT_CLEAR, 0x1ff); | ||
| 942 | |||
| 943 | /* Acknowledge pending interrupt(s) */ | ||
| 944 | musb_writel(tbase, TUSB_INT_SRC_CLEAR, ~TUSB_INT_MASK_RESERVED_BITS); | ||
| 945 | |||
| 946 | /* Only 0 clock cycles for minimum interrupt de-assertion time and | ||
| 947 | * interrupt polarity active low seems to work reliably here */ | ||
| 948 | musb_writel(tbase, TUSB_INT_CTRL_CONF, | ||
| 949 | TUSB_INT_CTRL_CONF_INT_RELCYC(0)); | ||
| 950 | |||
| 951 | set_irq_type(musb->nIrq, IRQ_TYPE_LEVEL_LOW); | ||
| 952 | |||
| 953 | /* maybe force into the Default-A OTG state machine */ | ||
| 954 | if (!(musb_readl(tbase, TUSB_DEV_OTG_STAT) | ||
| 955 | & TUSB_DEV_OTG_STAT_ID_STATUS)) | ||
| 956 | musb_writel(tbase, TUSB_INT_SRC_SET, | ||
| 957 | TUSB_INT_SRC_ID_STATUS_CHNG); | ||
| 958 | |||
| 959 | if (is_dma_capable() && dma_off) | ||
| 960 | printk(KERN_WARNING "%s %s: dma not reactivated\n", | ||
| 961 | __FILE__, __func__); | ||
| 962 | else | ||
| 963 | dma_off = 1; | ||
| 964 | } | ||
| 965 | |||
| 966 | /* | ||
| 967 | * Disables TUSB6010. Caller must take care of locking. | ||
| 968 | */ | ||
| 969 | void musb_platform_disable(struct musb *musb) | ||
| 970 | { | ||
| 971 | void __iomem *tbase = musb->ctrl_base; | ||
| 972 | |||
| 973 | /* FIXME stop DMA, IRQs, timers, ... */ | ||
| 974 | |||
| 975 | /* disable all IRQs */ | ||
| 976 | musb_writel(tbase, TUSB_INT_MASK, ~TUSB_INT_MASK_RESERVED_BITS); | ||
| 977 | musb_writel(tbase, TUSB_USBIP_INT_MASK, 0x7fffffff); | ||
| 978 | musb_writel(tbase, TUSB_DMA_INT_MASK, 0x7fffffff); | ||
| 979 | musb_writel(tbase, TUSB_GPIO_INT_MASK, 0x1ff); | ||
| 980 | |||
| 981 | del_timer(&musb_idle_timer); | ||
| 982 | |||
| 983 | if (is_dma_capable() && !dma_off) { | ||
| 984 | printk(KERN_WARNING "%s %s: dma still active\n", | ||
| 985 | __FILE__, __func__); | ||
| 986 | dma_off = 1; | ||
| 987 | } | ||
| 988 | } | ||
| 989 | |||
| 990 | /* | ||
| 991 | * Sets up TUSB6010 CPU interface specific signals and registers | ||
| 992 | * Note: Settings optimized for OMAP24xx | ||
| 993 | */ | ||
| 994 | static void __init tusb_setup_cpu_interface(struct musb *musb) | ||
| 995 | { | ||
| 996 | void __iomem *tbase = musb->ctrl_base; | ||
| 997 | |||
| 998 | /* | ||
| 999 | * Disable GPIO[5:0] pullups (used as output DMA requests) | ||
| 1000 | * Don't disable GPIO[7:6] as they are needed for wake-up. | ||
| 1001 | */ | ||
| 1002 | musb_writel(tbase, TUSB_PULLUP_1_CTRL, 0x0000003F); | ||
| 1003 | |||
| 1004 | /* Disable all pullups on NOR IF, DMAREQ0 and DMAREQ1 */ | ||
| 1005 | musb_writel(tbase, TUSB_PULLUP_2_CTRL, 0x01FFFFFF); | ||
| 1006 | |||
| 1007 | /* Turn GPIO[5:0] to DMAREQ[5:0] signals */ | ||
| 1008 | musb_writel(tbase, TUSB_GPIO_CONF, TUSB_GPIO_CONF_DMAREQ(0x3f)); | ||
| 1009 | |||
| 1010 | /* Burst size 16x16 bits, all six DMA requests enabled, DMA request | ||
| 1011 | * de-assertion time 2 system clocks p 62 */ | ||
| 1012 | musb_writel(tbase, TUSB_DMA_REQ_CONF, | ||
| 1013 | TUSB_DMA_REQ_CONF_BURST_SIZE(2) | | ||
| 1014 | TUSB_DMA_REQ_CONF_DMA_REQ_EN(0x3f) | | ||
| 1015 | TUSB_DMA_REQ_CONF_DMA_REQ_ASSER(2)); | ||
| 1016 | |||
| 1017 | /* Set 0 wait count for synchronous burst access */ | ||
| 1018 | musb_writel(tbase, TUSB_WAIT_COUNT, 1); | ||
| 1019 | } | ||
| 1020 | |||
| 1021 | static int __init tusb_start(struct musb *musb) | ||
| 1022 | { | ||
| 1023 | void __iomem *tbase = musb->ctrl_base; | ||
| 1024 | int ret = 0; | ||
| 1025 | unsigned long flags; | ||
| 1026 | u32 reg; | ||
| 1027 | |||
| 1028 | if (musb->board_set_power) | ||
| 1029 | ret = musb->board_set_power(1); | ||
| 1030 | if (ret != 0) { | ||
| 1031 | printk(KERN_ERR "tusb: Cannot enable TUSB6010\n"); | ||
| 1032 | return ret; | ||
| 1033 | } | ||
| 1034 | |||
| 1035 | spin_lock_irqsave(&musb->lock, flags); | ||
| 1036 | |||
| 1037 | if (musb_readl(tbase, TUSB_PROD_TEST_RESET) != | ||
| 1038 | TUSB_PROD_TEST_RESET_VAL) { | ||
| 1039 | printk(KERN_ERR "tusb: Unable to detect TUSB6010\n"); | ||
| 1040 | goto err; | ||
| 1041 | } | ||
| 1042 | |||
| 1043 | ret = tusb_print_revision(musb); | ||
| 1044 | if (ret < 2) { | ||
| 1045 | printk(KERN_ERR "tusb: Unsupported TUSB6010 revision %i\n", | ||
| 1046 | ret); | ||
| 1047 | goto err; | ||
| 1048 | } | ||
| 1049 | |||
| 1050 | /* The uint bit for "USB non-PDR interrupt enable" has to be 1 when | ||
| 1051 | * NOR FLASH interface is used */ | ||
| 1052 | musb_writel(tbase, TUSB_VLYNQ_CTRL, 8); | ||
| 1053 | |||
| 1054 | /* Select PHY free running 60MHz as a system clock */ | ||
| 1055 | tusb_set_clock_source(musb, 1); | ||
| 1056 | |||
| 1057 | /* VBus valid timer 1us, disable DFT/Debug and VLYNQ clocks for | ||
| 1058 | * power saving, enable VBus detect and session end comparators, | ||
| 1059 | * enable IDpullup, enable VBus charging */ | ||
| 1060 | musb_writel(tbase, TUSB_PRCM_MNGMT, | ||
| 1061 | TUSB_PRCM_MNGMT_VBUS_VALID_TIMER(0xa) | | ||
| 1062 | TUSB_PRCM_MNGMT_VBUS_VALID_FLT_EN | | ||
| 1063 | TUSB_PRCM_MNGMT_OTG_SESS_END_EN | | ||
| 1064 | TUSB_PRCM_MNGMT_OTG_VBUS_DET_EN | | ||
| 1065 | TUSB_PRCM_MNGMT_OTG_ID_PULLUP); | ||
| 1066 | tusb_setup_cpu_interface(musb); | ||
| 1067 | |||
| 1068 | /* simplify: always sense/pullup ID pins, as if in OTG mode */ | ||
| 1069 | reg = musb_readl(tbase, TUSB_PHY_OTG_CTRL_ENABLE); | ||
| 1070 | reg |= TUSB_PHY_OTG_CTRL_WRPROTECT | TUSB_PHY_OTG_CTRL_OTG_ID_PULLUP; | ||
| 1071 | musb_writel(tbase, TUSB_PHY_OTG_CTRL_ENABLE, reg); | ||
| 1072 | |||
| 1073 | reg = musb_readl(tbase, TUSB_PHY_OTG_CTRL); | ||
| 1074 | reg |= TUSB_PHY_OTG_CTRL_WRPROTECT | TUSB_PHY_OTG_CTRL_OTG_ID_PULLUP; | ||
| 1075 | musb_writel(tbase, TUSB_PHY_OTG_CTRL, reg); | ||
| 1076 | |||
| 1077 | spin_unlock_irqrestore(&musb->lock, flags); | ||
| 1078 | |||
| 1079 | return 0; | ||
| 1080 | |||
| 1081 | err: | ||
| 1082 | spin_unlock_irqrestore(&musb->lock, flags); | ||
| 1083 | |||
| 1084 | if (musb->board_set_power) | ||
| 1085 | musb->board_set_power(0); | ||
| 1086 | |||
| 1087 | return -ENODEV; | ||
| 1088 | } | ||
| 1089 | |||
| 1090 | int __init musb_platform_init(struct musb *musb) | ||
| 1091 | { | ||
| 1092 | struct platform_device *pdev; | ||
| 1093 | struct resource *mem; | ||
| 1094 | void __iomem *sync; | ||
| 1095 | int ret; | ||
| 1096 | |||
| 1097 | pdev = to_platform_device(musb->controller); | ||
| 1098 | |||
| 1099 | /* dma address for async dma */ | ||
| 1100 | mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); | ||
| 1101 | musb->async = mem->start; | ||
| 1102 | |||
| 1103 | /* dma address for sync dma */ | ||
| 1104 | mem = platform_get_resource(pdev, IORESOURCE_MEM, 1); | ||
| 1105 | if (!mem) { | ||
| 1106 | pr_debug("no sync dma resource?\n"); | ||
| 1107 | return -ENODEV; | ||
| 1108 | } | ||
| 1109 | musb->sync = mem->start; | ||
| 1110 | |||
| 1111 | sync = ioremap(mem->start, mem->end - mem->start + 1); | ||
| 1112 | if (!sync) { | ||
| 1113 | pr_debug("ioremap for sync failed\n"); | ||
| 1114 | return -ENOMEM; | ||
| 1115 | } | ||
| 1116 | musb->sync_va = sync; | ||
| 1117 | |||
| 1118 | /* Offsets from base: VLYNQ at 0x000, MUSB regs at 0x400, | ||
| 1119 | * FIFOs at 0x600, TUSB at 0x800 | ||
| 1120 | */ | ||
| 1121 | musb->mregs += TUSB_BASE_OFFSET; | ||
| 1122 | |||
| 1123 | ret = tusb_start(musb); | ||
| 1124 | if (ret) { | ||
| 1125 | printk(KERN_ERR "Could not start tusb6010 (%d)\n", | ||
| 1126 | ret); | ||
| 1127 | return -ENODEV; | ||
| 1128 | } | ||
| 1129 | musb->isr = tusb_interrupt; | ||
| 1130 | |||
| 1131 | if (is_host_enabled(musb)) | ||
| 1132 | musb->board_set_vbus = tusb_source_power; | ||
| 1133 | if (is_peripheral_enabled(musb)) | ||
| 1134 | musb->xceiv.set_power = tusb_draw_power; | ||
| 1135 | |||
| 1136 | setup_timer(&musb_idle_timer, musb_do_idle, (unsigned long) musb); | ||
| 1137 | |||
| 1138 | return ret; | ||
| 1139 | } | ||
| 1140 | |||
| 1141 | int musb_platform_exit(struct musb *musb) | ||
| 1142 | { | ||
| 1143 | del_timer_sync(&musb_idle_timer); | ||
| 1144 | |||
| 1145 | if (musb->board_set_power) | ||
| 1146 | musb->board_set_power(0); | ||
| 1147 | |||
| 1148 | iounmap(musb->sync_va); | ||
| 1149 | |||
| 1150 | return 0; | ||
| 1151 | } | ||
diff --git a/drivers/usb/musb/tusb6010.h b/drivers/usb/musb/tusb6010.h new file mode 100644 index 000000000000..ab8c96286ce6 --- /dev/null +++ b/drivers/usb/musb/tusb6010.h | |||
| @@ -0,0 +1,233 @@ | |||
| 1 | /* | ||
| 2 | * Definitions for TUSB6010 USB 2.0 OTG Dual Role controller | ||
| 3 | * | ||
| 4 | * Copyright (C) 2006 Nokia Corporation | ||
| 5 | * Jarkko Nikula <jarkko.nikula@nokia.com> | ||
| 6 | * Tony Lindgren <tony@atomide.com> | ||
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or modify | ||
| 9 | * it under the terms of the GNU General Public License version 2 as | ||
| 10 | * published by the Free Software Foundation. | ||
| 11 | */ | ||
| 12 | |||
| 13 | #ifndef __TUSB6010_H__ | ||
| 14 | #define __TUSB6010_H__ | ||
| 15 | |||
| 16 | extern u8 tusb_get_revision(struct musb *musb); | ||
| 17 | |||
| 18 | #ifdef CONFIG_USB_TUSB6010 | ||
| 19 | #define musb_in_tusb() 1 | ||
| 20 | #else | ||
| 21 | #define musb_in_tusb() 0 | ||
| 22 | #endif | ||
| 23 | |||
| 24 | #ifdef CONFIG_USB_TUSB_OMAP_DMA | ||
| 25 | #define tusb_dma_omap() 1 | ||
| 26 | #else | ||
| 27 | #define tusb_dma_omap() 0 | ||
| 28 | #endif | ||
| 29 | |||
| 30 | /* VLYNQ control register. 32-bit at offset 0x000 */ | ||
| 31 | #define TUSB_VLYNQ_CTRL 0x004 | ||
| 32 | |||
| 33 | /* Mentor Graphics OTG core registers. 8,- 16- and 32-bit at offset 0x400 */ | ||
| 34 | #define TUSB_BASE_OFFSET 0x400 | ||
| 35 | |||
| 36 | /* FIFO registers 32-bit at offset 0x600 */ | ||
| 37 | #define TUSB_FIFO_BASE 0x600 | ||
| 38 | |||
| 39 | /* Device System & Control registers. 32-bit at offset 0x800 */ | ||
| 40 | #define TUSB_SYS_REG_BASE 0x800 | ||
| 41 | |||
| 42 | #define TUSB_DEV_CONF (TUSB_SYS_REG_BASE + 0x000) | ||
| 43 | #define TUSB_DEV_CONF_USB_HOST_MODE (1 << 16) | ||
| 44 | #define TUSB_DEV_CONF_PROD_TEST_MODE (1 << 15) | ||
| 45 | #define TUSB_DEV_CONF_SOFT_ID (1 << 1) | ||
| 46 | #define TUSB_DEV_CONF_ID_SEL (1 << 0) | ||
| 47 | |||
| 48 | #define TUSB_PHY_OTG_CTRL_ENABLE (TUSB_SYS_REG_BASE + 0x004) | ||
| 49 | #define TUSB_PHY_OTG_CTRL (TUSB_SYS_REG_BASE + 0x008) | ||
| 50 | #define TUSB_PHY_OTG_CTRL_WRPROTECT (0xa5 << 24) | ||
| 51 | #define TUSB_PHY_OTG_CTRL_OTG_ID_PULLUP (1 << 23) | ||
| 52 | #define TUSB_PHY_OTG_CTRL_OTG_VBUS_DET_EN (1 << 19) | ||
| 53 | #define TUSB_PHY_OTG_CTRL_OTG_SESS_END_EN (1 << 18) | ||
| 54 | #define TUSB_PHY_OTG_CTRL_TESTM2 (1 << 17) | ||
| 55 | #define TUSB_PHY_OTG_CTRL_TESTM1 (1 << 16) | ||
| 56 | #define TUSB_PHY_OTG_CTRL_TESTM0 (1 << 15) | ||
| 57 | #define TUSB_PHY_OTG_CTRL_TX_DATA2 (1 << 14) | ||
| 58 | #define TUSB_PHY_OTG_CTRL_TX_GZ2 (1 << 13) | ||
| 59 | #define TUSB_PHY_OTG_CTRL_TX_ENABLE2 (1 << 12) | ||
| 60 | #define TUSB_PHY_OTG_CTRL_DM_PULLDOWN (1 << 11) | ||
| 61 | #define TUSB_PHY_OTG_CTRL_DP_PULLDOWN (1 << 10) | ||
| 62 | #define TUSB_PHY_OTG_CTRL_OSC_EN (1 << 9) | ||
| 63 | #define TUSB_PHY_OTG_CTRL_PHYREF_CLKSEL(v) (((v) & 3) << 7) | ||
| 64 | #define TUSB_PHY_OTG_CTRL_PD (1 << 6) | ||
| 65 | #define TUSB_PHY_OTG_CTRL_PLL_ON (1 << 5) | ||
| 66 | #define TUSB_PHY_OTG_CTRL_EXT_RPU (1 << 4) | ||
| 67 | #define TUSB_PHY_OTG_CTRL_PWR_GOOD (1 << 3) | ||
| 68 | #define TUSB_PHY_OTG_CTRL_RESET (1 << 2) | ||
| 69 | #define TUSB_PHY_OTG_CTRL_SUSPENDM (1 << 1) | ||
| 70 | #define TUSB_PHY_OTG_CTRL_CLK_MODE (1 << 0) | ||
| 71 | |||
| 72 | /*OTG status register */ | ||
| 73 | #define TUSB_DEV_OTG_STAT (TUSB_SYS_REG_BASE + 0x00c) | ||
| 74 | #define TUSB_DEV_OTG_STAT_PWR_CLK_GOOD (1 << 8) | ||
| 75 | #define TUSB_DEV_OTG_STAT_SESS_END (1 << 7) | ||
| 76 | #define TUSB_DEV_OTG_STAT_SESS_VALID (1 << 6) | ||
| 77 | #define TUSB_DEV_OTG_STAT_VBUS_VALID (1 << 5) | ||
| 78 | #define TUSB_DEV_OTG_STAT_VBUS_SENSE (1 << 4) | ||
| 79 | #define TUSB_DEV_OTG_STAT_ID_STATUS (1 << 3) | ||
| 80 | #define TUSB_DEV_OTG_STAT_HOST_DISCON (1 << 2) | ||
| 81 | #define TUSB_DEV_OTG_STAT_LINE_STATE (3 << 0) | ||
| 82 | #define TUSB_DEV_OTG_STAT_DP_ENABLE (1 << 1) | ||
| 83 | #define TUSB_DEV_OTG_STAT_DM_ENABLE (1 << 0) | ||
| 84 | |||
| 85 | #define TUSB_DEV_OTG_TIMER (TUSB_SYS_REG_BASE + 0x010) | ||
| 86 | # define TUSB_DEV_OTG_TIMER_ENABLE (1 << 31) | ||
| 87 | # define TUSB_DEV_OTG_TIMER_VAL(v) ((v) & 0x07ffffff) | ||
| 88 | #define TUSB_PRCM_REV (TUSB_SYS_REG_BASE + 0x014) | ||
| 89 | |||
| 90 | /* PRCM configuration register */ | ||
| 91 | #define TUSB_PRCM_CONF (TUSB_SYS_REG_BASE + 0x018) | ||
| 92 | #define TUSB_PRCM_CONF_SFW_CPEN (1 << 24) | ||
| 93 | #define TUSB_PRCM_CONF_SYS_CLKSEL(v) (((v) & 3) << 16) | ||
| 94 | |||
| 95 | /* PRCM management register */ | ||
| 96 | #define TUSB_PRCM_MNGMT (TUSB_SYS_REG_BASE + 0x01c) | ||
| 97 | #define TUSB_PRCM_MNGMT_SRP_FIX_TIMER(v) (((v) & 0xf) << 25) | ||
| 98 | #define TUSB_PRCM_MNGMT_SRP_FIX_EN (1 << 24) | ||
| 99 | #define TUSB_PRCM_MNGMT_VBUS_VALID_TIMER(v) (((v) & 0xf) << 20) | ||
| 100 | #define TUSB_PRCM_MNGMT_VBUS_VALID_FLT_EN (1 << 19) | ||
| 101 | #define TUSB_PRCM_MNGMT_DFT_CLK_DIS (1 << 18) | ||
| 102 | #define TUSB_PRCM_MNGMT_VLYNQ_CLK_DIS (1 << 17) | ||
| 103 | #define TUSB_PRCM_MNGMT_OTG_SESS_END_EN (1 << 10) | ||
| 104 | #define TUSB_PRCM_MNGMT_OTG_VBUS_DET_EN (1 << 9) | ||
| 105 | #define TUSB_PRCM_MNGMT_OTG_ID_PULLUP (1 << 8) | ||
| 106 | #define TUSB_PRCM_MNGMT_15_SW_EN (1 << 4) | ||
| 107 | #define TUSB_PRCM_MNGMT_33_SW_EN (1 << 3) | ||
| 108 | #define TUSB_PRCM_MNGMT_5V_CPEN (1 << 2) | ||
| 109 | #define TUSB_PRCM_MNGMT_PM_IDLE (1 << 1) | ||
| 110 | #define TUSB_PRCM_MNGMT_DEV_IDLE (1 << 0) | ||
| 111 | |||
| 112 | /* Wake-up source clear and mask registers */ | ||
| 113 | #define TUSB_PRCM_WAKEUP_SOURCE (TUSB_SYS_REG_BASE + 0x020) | ||
| 114 | #define TUSB_PRCM_WAKEUP_CLEAR (TUSB_SYS_REG_BASE + 0x028) | ||
| 115 | #define TUSB_PRCM_WAKEUP_MASK (TUSB_SYS_REG_BASE + 0x02c) | ||
| 116 | #define TUSB_PRCM_WAKEUP_RESERVED_BITS (0xffffe << 13) | ||
| 117 | #define TUSB_PRCM_WGPIO_7 (1 << 12) | ||
| 118 | #define TUSB_PRCM_WGPIO_6 (1 << 11) | ||
| 119 | #define TUSB_PRCM_WGPIO_5 (1 << 10) | ||
| 120 | #define TUSB_PRCM_WGPIO_4 (1 << 9) | ||
| 121 | #define TUSB_PRCM_WGPIO_3 (1 << 8) | ||
| 122 | #define TUSB_PRCM_WGPIO_2 (1 << 7) | ||
| 123 | #define TUSB_PRCM_WGPIO_1 (1 << 6) | ||
| 124 | #define TUSB_PRCM_WGPIO_0 (1 << 5) | ||
| 125 | #define TUSB_PRCM_WHOSTDISCON (1 << 4) /* Host disconnect */ | ||
| 126 | #define TUSB_PRCM_WBUS (1 << 3) /* USB bus resume */ | ||
| 127 | #define TUSB_PRCM_WNORCS (1 << 2) /* NOR chip select */ | ||
| 128 | #define TUSB_PRCM_WVBUS (1 << 1) /* OTG PHY VBUS */ | ||
| 129 | #define TUSB_PRCM_WID (1 << 0) /* OTG PHY ID detect */ | ||
| 130 | |||
| 131 | #define TUSB_PULLUP_1_CTRL (TUSB_SYS_REG_BASE + 0x030) | ||
| 132 | #define TUSB_PULLUP_2_CTRL (TUSB_SYS_REG_BASE + 0x034) | ||
| 133 | #define TUSB_INT_CTRL_REV (TUSB_SYS_REG_BASE + 0x038) | ||
| 134 | #define TUSB_INT_CTRL_CONF (TUSB_SYS_REG_BASE + 0x03c) | ||
| 135 | #define TUSB_USBIP_INT_SRC (TUSB_SYS_REG_BASE + 0x040) | ||
| 136 | #define TUSB_USBIP_INT_SET (TUSB_SYS_REG_BASE + 0x044) | ||
| 137 | #define TUSB_USBIP_INT_CLEAR (TUSB_SYS_REG_BASE + 0x048) | ||
| 138 | #define TUSB_USBIP_INT_MASK (TUSB_SYS_REG_BASE + 0x04c) | ||
| 139 | #define TUSB_DMA_INT_SRC (TUSB_SYS_REG_BASE + 0x050) | ||
| 140 | #define TUSB_DMA_INT_SET (TUSB_SYS_REG_BASE + 0x054) | ||
| 141 | #define TUSB_DMA_INT_CLEAR (TUSB_SYS_REG_BASE + 0x058) | ||
| 142 | #define TUSB_DMA_INT_MASK (TUSB_SYS_REG_BASE + 0x05c) | ||
| 143 | #define TUSB_GPIO_INT_SRC (TUSB_SYS_REG_BASE + 0x060) | ||
| 144 | #define TUSB_GPIO_INT_SET (TUSB_SYS_REG_BASE + 0x064) | ||
| 145 | #define TUSB_GPIO_INT_CLEAR (TUSB_SYS_REG_BASE + 0x068) | ||
| 146 | #define TUSB_GPIO_INT_MASK (TUSB_SYS_REG_BASE + 0x06c) | ||
| 147 | |||
| 148 | /* NOR flash interrupt source registers */ | ||
| 149 | #define TUSB_INT_SRC (TUSB_SYS_REG_BASE + 0x070) | ||
| 150 | #define TUSB_INT_SRC_SET (TUSB_SYS_REG_BASE + 0x074) | ||
| 151 | #define TUSB_INT_SRC_CLEAR (TUSB_SYS_REG_BASE + 0x078) | ||
| 152 | #define TUSB_INT_MASK (TUSB_SYS_REG_BASE + 0x07c) | ||
| 153 | #define TUSB_INT_SRC_TXRX_DMA_DONE (1 << 24) | ||
| 154 | #define TUSB_INT_SRC_USB_IP_CORE (1 << 17) | ||
| 155 | #define TUSB_INT_SRC_OTG_TIMEOUT (1 << 16) | ||
| 156 | #define TUSB_INT_SRC_VBUS_SENSE_CHNG (1 << 15) | ||
| 157 | #define TUSB_INT_SRC_ID_STATUS_CHNG (1 << 14) | ||
| 158 | #define TUSB_INT_SRC_DEV_WAKEUP (1 << 13) | ||
| 159 | #define TUSB_INT_SRC_DEV_READY (1 << 12) | ||
| 160 | #define TUSB_INT_SRC_USB_IP_TX (1 << 9) | ||
| 161 | #define TUSB_INT_SRC_USB_IP_RX (1 << 8) | ||
| 162 | #define TUSB_INT_SRC_USB_IP_VBUS_ERR (1 << 7) | ||
| 163 | #define TUSB_INT_SRC_USB_IP_VBUS_REQ (1 << 6) | ||
| 164 | #define TUSB_INT_SRC_USB_IP_DISCON (1 << 5) | ||
| 165 | #define TUSB_INT_SRC_USB_IP_CONN (1 << 4) | ||
| 166 | #define TUSB_INT_SRC_USB_IP_SOF (1 << 3) | ||
| 167 | #define TUSB_INT_SRC_USB_IP_RST_BABBLE (1 << 2) | ||
| 168 | #define TUSB_INT_SRC_USB_IP_RESUME (1 << 1) | ||
| 169 | #define TUSB_INT_SRC_USB_IP_SUSPEND (1 << 0) | ||
| 170 | |||
| 171 | /* NOR flash interrupt registers reserved bits. Must be written as 0 */ | ||
| 172 | #define TUSB_INT_MASK_RESERVED_17 (0x3fff << 17) | ||
| 173 | #define TUSB_INT_MASK_RESERVED_13 (1 << 13) | ||
| 174 | #define TUSB_INT_MASK_RESERVED_8 (0xf << 8) | ||
| 175 | #define TUSB_INT_SRC_RESERVED_26 (0x1f << 26) | ||
| 176 | #define TUSB_INT_SRC_RESERVED_18 (0x3f << 18) | ||
| 177 | #define TUSB_INT_SRC_RESERVED_10 (0x03 << 10) | ||
| 178 | |||
| 179 | /* Reserved bits for NOR flash interrupt mask and clear register */ | ||
| 180 | #define TUSB_INT_MASK_RESERVED_BITS (TUSB_INT_MASK_RESERVED_17 | \ | ||
| 181 | TUSB_INT_MASK_RESERVED_13 | \ | ||
| 182 | TUSB_INT_MASK_RESERVED_8) | ||
| 183 | |||
| 184 | /* Reserved bits for NOR flash interrupt status register */ | ||
| 185 | #define TUSB_INT_SRC_RESERVED_BITS (TUSB_INT_SRC_RESERVED_26 | \ | ||
| 186 | TUSB_INT_SRC_RESERVED_18 | \ | ||
| 187 | TUSB_INT_SRC_RESERVED_10) | ||
| 188 | |||
| 189 | #define TUSB_GPIO_REV (TUSB_SYS_REG_BASE + 0x080) | ||
| 190 | #define TUSB_GPIO_CONF (TUSB_SYS_REG_BASE + 0x084) | ||
| 191 | #define TUSB_DMA_CTRL_REV (TUSB_SYS_REG_BASE + 0x100) | ||
| 192 | #define TUSB_DMA_REQ_CONF (TUSB_SYS_REG_BASE + 0x104) | ||
| 193 | #define TUSB_EP0_CONF (TUSB_SYS_REG_BASE + 0x108) | ||
| 194 | #define TUSB_DMA_EP_MAP (TUSB_SYS_REG_BASE + 0x148) | ||
| 195 | |||
| 196 | /* Offsets from each ep base register */ | ||
| 197 | #define TUSB_EP_TX_OFFSET 0x10c /* EP_IN in docs */ | ||
| 198 | #define TUSB_EP_RX_OFFSET 0x14c /* EP_OUT in docs */ | ||
| 199 | #define TUSB_EP_MAX_PACKET_SIZE_OFFSET 0x188 | ||
| 200 | |||
| 201 | #define TUSB_WAIT_COUNT (TUSB_SYS_REG_BASE + 0x1c8) | ||
| 202 | #define TUSB_SCRATCH_PAD (TUSB_SYS_REG_BASE + 0x1c4) | ||
| 203 | #define TUSB_PROD_TEST_RESET (TUSB_SYS_REG_BASE + 0x1d8) | ||
| 204 | |||
| 205 | /* Device System & Control register bitfields */ | ||
| 206 | #define TUSB_INT_CTRL_CONF_INT_RELCYC(v) (((v) & 0x7) << 18) | ||
| 207 | #define TUSB_INT_CTRL_CONF_INT_POLARITY (1 << 17) | ||
| 208 | #define TUSB_INT_CTRL_CONF_INT_MODE (1 << 16) | ||
| 209 | #define TUSB_GPIO_CONF_DMAREQ(v) (((v) & 0x3f) << 24) | ||
| 210 | #define TUSB_DMA_REQ_CONF_BURST_SIZE(v) (((v) & 3) << 26) | ||
| 211 | #define TUSB_DMA_REQ_CONF_DMA_REQ_EN(v) (((v) & 0x3f) << 20) | ||
| 212 | #define TUSB_DMA_REQ_CONF_DMA_REQ_ASSER(v) (((v) & 0xf) << 16) | ||
| 213 | #define TUSB_EP0_CONFIG_SW_EN (1 << 8) | ||
| 214 | #define TUSB_EP0_CONFIG_DIR_TX (1 << 7) | ||
| 215 | #define TUSB_EP0_CONFIG_XFR_SIZE(v) ((v) & 0x7f) | ||
| 216 | #define TUSB_EP_CONFIG_SW_EN (1 << 31) | ||
| 217 | #define TUSB_EP_CONFIG_XFR_SIZE(v) ((v) & 0x7fffffff) | ||
| 218 | #define TUSB_PROD_TEST_RESET_VAL 0xa596 | ||
| 219 | #define TUSB_EP_FIFO(ep) (TUSB_FIFO_BASE + (ep) * 0x20) | ||
| 220 | |||
| 221 | #define TUSB_DIDR1_LO (TUSB_SYS_REG_BASE + 0x1f8) | ||
| 222 | #define TUSB_DIDR1_HI (TUSB_SYS_REG_BASE + 0x1fc) | ||
| 223 | #define TUSB_DIDR1_HI_CHIP_REV(v) (((v) >> 17) & 0xf) | ||
| 224 | #define TUSB_DIDR1_HI_REV_20 0 | ||
| 225 | #define TUSB_DIDR1_HI_REV_30 1 | ||
| 226 | #define TUSB_DIDR1_HI_REV_31 2 | ||
| 227 | |||
| 228 | #define TUSB_REV_10 0x10 | ||
| 229 | #define TUSB_REV_20 0x20 | ||
| 230 | #define TUSB_REV_30 0x30 | ||
| 231 | #define TUSB_REV_31 0x31 | ||
| 232 | |||
| 233 | #endif /* __TUSB6010_H__ */ | ||
diff --git a/drivers/usb/musb/tusb6010_omap.c b/drivers/usb/musb/tusb6010_omap.c new file mode 100644 index 000000000000..52f7f29cebda --- /dev/null +++ b/drivers/usb/musb/tusb6010_omap.c | |||
| @@ -0,0 +1,719 @@ | |||
| 1 | /* | ||
| 2 | * TUSB6010 USB 2.0 OTG Dual Role controller OMAP DMA interface | ||
| 3 | * | ||
| 4 | * Copyright (C) 2006 Nokia Corporation | ||
| 5 | * Tony Lindgren <tony@atomide.com> | ||
| 6 | * | ||
| 7 | * This program is free software; you can redistribute it and/or modify | ||
| 8 | * it under the terms of the GNU General Public License version 2 as | ||
| 9 | * published by the Free Software Foundation. | ||
| 10 | */ | ||
| 11 | #include <linux/module.h> | ||
| 12 | #include <linux/kernel.h> | ||
| 13 | #include <linux/errno.h> | ||
| 14 | #include <linux/init.h> | ||
| 15 | #include <linux/usb.h> | ||
| 16 | #include <linux/platform_device.h> | ||
| 17 | #include <linux/dma-mapping.h> | ||
| 18 | #include <asm/arch/dma.h> | ||
| 19 | #include <asm/arch/mux.h> | ||
| 20 | |||
| 21 | #include "musb_core.h" | ||
| 22 | |||
| 23 | #define to_chdat(c) ((struct tusb_omap_dma_ch *)(c)->private_data) | ||
| 24 | |||
| 25 | #define MAX_DMAREQ 5 /* REVISIT: Really 6, but req5 not OK */ | ||
| 26 | |||
| 27 | struct tusb_omap_dma_ch { | ||
| 28 | struct musb *musb; | ||
| 29 | void __iomem *tbase; | ||
| 30 | unsigned long phys_offset; | ||
| 31 | int epnum; | ||
| 32 | u8 tx; | ||
| 33 | struct musb_hw_ep *hw_ep; | ||
| 34 | |||
| 35 | int ch; | ||
| 36 | s8 dmareq; | ||
| 37 | s8 sync_dev; | ||
| 38 | |||
| 39 | struct tusb_omap_dma *tusb_dma; | ||
| 40 | |||
| 41 | void __iomem *dma_addr; | ||
| 42 | |||
| 43 | u32 len; | ||
| 44 | u16 packet_sz; | ||
| 45 | u16 transfer_packet_sz; | ||
| 46 | u32 transfer_len; | ||
| 47 | u32 completed_len; | ||
| 48 | }; | ||
| 49 | |||
| 50 | struct tusb_omap_dma { | ||
| 51 | struct dma_controller controller; | ||
| 52 | struct musb *musb; | ||
| 53 | void __iomem *tbase; | ||
| 54 | |||
| 55 | int ch; | ||
| 56 | s8 dmareq; | ||
| 57 | s8 sync_dev; | ||
| 58 | unsigned multichannel:1; | ||
| 59 | }; | ||
| 60 | |||
| 61 | static int tusb_omap_dma_start(struct dma_controller *c) | ||
| 62 | { | ||
| 63 | struct tusb_omap_dma *tusb_dma; | ||
| 64 | |||
| 65 | tusb_dma = container_of(c, struct tusb_omap_dma, controller); | ||
| 66 | |||
| 67 | /* DBG(3, "ep%i ch: %i\n", chdat->epnum, chdat->ch); */ | ||
| 68 | |||
| 69 | return 0; | ||
| 70 | } | ||
| 71 | |||
| 72 | static int tusb_omap_dma_stop(struct dma_controller *c) | ||
| 73 | { | ||
| 74 | struct tusb_omap_dma *tusb_dma; | ||
| 75 | |||
| 76 | tusb_dma = container_of(c, struct tusb_omap_dma, controller); | ||
| 77 | |||
| 78 | /* DBG(3, "ep%i ch: %i\n", chdat->epnum, chdat->ch); */ | ||
| 79 | |||
| 80 | return 0; | ||
| 81 | } | ||
| 82 | |||
| 83 | /* | ||
| 84 | * Allocate dmareq0 to the current channel unless it's already taken | ||
| 85 | */ | ||
| 86 | static inline int tusb_omap_use_shared_dmareq(struct tusb_omap_dma_ch *chdat) | ||
| 87 | { | ||
| 88 | u32 reg = musb_readl(chdat->tbase, TUSB_DMA_EP_MAP); | ||
| 89 | |||
| 90 | if (reg != 0) { | ||
| 91 | DBG(3, "ep%i dmareq0 is busy for ep%i\n", | ||
| 92 | chdat->epnum, reg & 0xf); | ||
| 93 | return -EAGAIN; | ||
| 94 | } | ||
| 95 | |||
| 96 | if (chdat->tx) | ||
| 97 | reg = (1 << 4) | chdat->epnum; | ||
| 98 | else | ||
| 99 | reg = chdat->epnum; | ||
| 100 | |||
| 101 | musb_writel(chdat->tbase, TUSB_DMA_EP_MAP, reg); | ||
| 102 | |||
| 103 | return 0; | ||
| 104 | } | ||
| 105 | |||
| 106 | static inline void tusb_omap_free_shared_dmareq(struct tusb_omap_dma_ch *chdat) | ||
| 107 | { | ||
| 108 | u32 reg = musb_readl(chdat->tbase, TUSB_DMA_EP_MAP); | ||
| 109 | |||
| 110 | if ((reg & 0xf) != chdat->epnum) { | ||
| 111 | printk(KERN_ERR "ep%i trying to release dmareq0 for ep%i\n", | ||
| 112 | chdat->epnum, reg & 0xf); | ||
| 113 | return; | ||
| 114 | } | ||
| 115 | musb_writel(chdat->tbase, TUSB_DMA_EP_MAP, 0); | ||
| 116 | } | ||
| 117 | |||
| 118 | /* | ||
| 119 | * See also musb_dma_completion in plat_uds.c and musb_g_[tx|rx]() in | ||
| 120 | * musb_gadget.c. | ||
| 121 | */ | ||
| 122 | static void tusb_omap_dma_cb(int lch, u16 ch_status, void *data) | ||
| 123 | { | ||
| 124 | struct dma_channel *channel = (struct dma_channel *)data; | ||
| 125 | struct tusb_omap_dma_ch *chdat = to_chdat(channel); | ||
| 126 | struct tusb_omap_dma *tusb_dma = chdat->tusb_dma; | ||
| 127 | struct musb *musb = chdat->musb; | ||
| 128 | struct musb_hw_ep *hw_ep = chdat->hw_ep; | ||
| 129 | void __iomem *ep_conf = hw_ep->conf; | ||
| 130 | void __iomem *mbase = musb->mregs; | ||
| 131 | unsigned long remaining, flags, pio; | ||
| 132 | int ch; | ||
| 133 | |||
| 134 | spin_lock_irqsave(&musb->lock, flags); | ||
| 135 | |||
| 136 | if (tusb_dma->multichannel) | ||
| 137 | ch = chdat->ch; | ||
| 138 | else | ||
| 139 | ch = tusb_dma->ch; | ||
| 140 | |||
| 141 | if (ch_status != OMAP_DMA_BLOCK_IRQ) | ||
| 142 | printk(KERN_ERR "TUSB DMA error status: %i\n", ch_status); | ||
| 143 | |||
| 144 | DBG(3, "ep%i %s dma callback ch: %i status: %x\n", | ||
| 145 | chdat->epnum, chdat->tx ? "tx" : "rx", | ||
| 146 | ch, ch_status); | ||
| 147 | |||
| 148 | if (chdat->tx) | ||
| 149 | remaining = musb_readl(ep_conf, TUSB_EP_TX_OFFSET); | ||
| 150 | else | ||
| 151 | remaining = musb_readl(ep_conf, TUSB_EP_RX_OFFSET); | ||
| 152 | |||
| 153 | remaining = TUSB_EP_CONFIG_XFR_SIZE(remaining); | ||
| 154 | |||
| 155 | /* HW issue #10: XFR_SIZE may get corrupt on DMA (both async & sync) */ | ||
| 156 | if (unlikely(remaining > chdat->transfer_len)) { | ||
| 157 | DBG(2, "Corrupt %s dma ch%i XFR_SIZE: 0x%08lx\n", | ||
| 158 | chdat->tx ? "tx" : "rx", chdat->ch, | ||
| 159 | remaining); | ||
| 160 | remaining = 0; | ||
| 161 | } | ||
| 162 | |||
| 163 | channel->actual_len = chdat->transfer_len - remaining; | ||
| 164 | pio = chdat->len - channel->actual_len; | ||
| 165 | |||
| 166 | DBG(3, "DMA remaining %lu/%u\n", remaining, chdat->transfer_len); | ||
| 167 | |||
| 168 | /* Transfer remaining 1 - 31 bytes */ | ||
| 169 | if (pio > 0 && pio < 32) { | ||
| 170 | u8 *buf; | ||
| 171 | |||
| 172 | DBG(3, "Using PIO for remaining %lu bytes\n", pio); | ||
| 173 | buf = phys_to_virt((u32)chdat->dma_addr) + chdat->transfer_len; | ||
| 174 | if (chdat->tx) { | ||
| 175 | dma_cache_maint(phys_to_virt((u32)chdat->dma_addr), | ||
| 176 | chdat->transfer_len, DMA_TO_DEVICE); | ||
| 177 | musb_write_fifo(hw_ep, pio, buf); | ||
| 178 | } else { | ||
| 179 | musb_read_fifo(hw_ep, pio, buf); | ||
| 180 | dma_cache_maint(phys_to_virt((u32)chdat->dma_addr), | ||
| 181 | chdat->transfer_len, DMA_FROM_DEVICE); | ||
| 182 | } | ||
| 183 | channel->actual_len += pio; | ||
| 184 | } | ||
| 185 | |||
| 186 | if (!tusb_dma->multichannel) | ||
| 187 | tusb_omap_free_shared_dmareq(chdat); | ||
| 188 | |||
| 189 | channel->status = MUSB_DMA_STATUS_FREE; | ||
| 190 | |||
| 191 | /* Handle only RX callbacks here. TX callbacks must be handled based | ||
| 192 | * on the TUSB DMA status interrupt. | ||
| 193 | * REVISIT: Use both TUSB DMA status interrupt and OMAP DMA callback | ||
| 194 | * interrupt for RX and TX. | ||
| 195 | */ | ||
| 196 | if (!chdat->tx) | ||
| 197 | musb_dma_completion(musb, chdat->epnum, chdat->tx); | ||
| 198 | |||
| 199 | /* We must terminate short tx transfers manually by setting TXPKTRDY. | ||
| 200 | * REVISIT: This same problem may occur with other MUSB dma as well. | ||
| 201 | * Easy to test with g_ether by pinging the MUSB board with ping -s54. | ||
| 202 | */ | ||
| 203 | if ((chdat->transfer_len < chdat->packet_sz) | ||
| 204 | || (chdat->transfer_len % chdat->packet_sz != 0)) { | ||
| 205 | u16 csr; | ||
| 206 | |||
| 207 | if (chdat->tx) { | ||
| 208 | DBG(3, "terminating short tx packet\n"); | ||
| 209 | musb_ep_select(mbase, chdat->epnum); | ||
| 210 | csr = musb_readw(hw_ep->regs, MUSB_TXCSR); | ||
| 211 | csr |= MUSB_TXCSR_MODE | MUSB_TXCSR_TXPKTRDY | ||
| 212 | | MUSB_TXCSR_P_WZC_BITS; | ||
| 213 | musb_writew(hw_ep->regs, MUSB_TXCSR, csr); | ||
| 214 | } | ||
| 215 | } | ||
| 216 | |||
| 217 | spin_unlock_irqrestore(&musb->lock, flags); | ||
| 218 | } | ||
| 219 | |||
| 220 | static int tusb_omap_dma_program(struct dma_channel *channel, u16 packet_sz, | ||
| 221 | u8 rndis_mode, dma_addr_t dma_addr, u32 len) | ||
| 222 | { | ||
| 223 | struct tusb_omap_dma_ch *chdat = to_chdat(channel); | ||
| 224 | struct tusb_omap_dma *tusb_dma = chdat->tusb_dma; | ||
| 225 | struct musb *musb = chdat->musb; | ||
| 226 | struct musb_hw_ep *hw_ep = chdat->hw_ep; | ||
| 227 | void __iomem *mbase = musb->mregs; | ||
| 228 | void __iomem *ep_conf = hw_ep->conf; | ||
| 229 | dma_addr_t fifo = hw_ep->fifo_sync; | ||
| 230 | struct omap_dma_channel_params dma_params; | ||
| 231 | u32 dma_remaining; | ||
| 232 | int src_burst, dst_burst; | ||
| 233 | u16 csr; | ||
| 234 | int ch; | ||
| 235 | s8 dmareq; | ||
| 236 | s8 sync_dev; | ||
| 237 | |||
| 238 | if (unlikely(dma_addr & 0x1) || (len < 32) || (len > packet_sz)) | ||
| 239 | return false; | ||
| 240 | |||
| 241 | /* | ||
| 242 | * HW issue #10: Async dma will eventually corrupt the XFR_SIZE | ||
| 243 | * register which will cause missed DMA interrupt. We could try to | ||
| 244 | * use a timer for the callback, but it is unsafe as the XFR_SIZE | ||
| 245 | * register is corrupt, and we won't know if the DMA worked. | ||
| 246 | */ | ||
| 247 | if (dma_addr & 0x2) | ||
| 248 | return false; | ||
| 249 | |||
| 250 | /* | ||
| 251 | * Because of HW issue #10, it seems like mixing sync DMA and async | ||
| 252 | * PIO access can confuse the DMA. Make sure XFR_SIZE is reset before | ||
| 253 | * using the channel for DMA. | ||
| 254 | */ | ||
| 255 | if (chdat->tx) | ||
| 256 | dma_remaining = musb_readl(ep_conf, TUSB_EP_TX_OFFSET); | ||
| 257 | else | ||
| 258 | dma_remaining = musb_readl(ep_conf, TUSB_EP_RX_OFFSET); | ||
| 259 | |||
| 260 | dma_remaining = TUSB_EP_CONFIG_XFR_SIZE(dma_remaining); | ||
| 261 | if (dma_remaining) { | ||
| 262 | DBG(2, "Busy %s dma ch%i, not using: %08x\n", | ||
| 263 | chdat->tx ? "tx" : "rx", chdat->ch, | ||
| 264 | dma_remaining); | ||
| 265 | return false; | ||
| 266 | } | ||
| 267 | |||
| 268 | chdat->transfer_len = len & ~0x1f; | ||
| 269 | |||
| 270 | if (len < packet_sz) | ||
| 271 | chdat->transfer_packet_sz = chdat->transfer_len; | ||
| 272 | else | ||
| 273 | chdat->transfer_packet_sz = packet_sz; | ||
| 274 | |||
| 275 | if (tusb_dma->multichannel) { | ||
| 276 | ch = chdat->ch; | ||
| 277 | dmareq = chdat->dmareq; | ||
| 278 | sync_dev = chdat->sync_dev; | ||
| 279 | } else { | ||
| 280 | if (tusb_omap_use_shared_dmareq(chdat) != 0) { | ||
| 281 | DBG(3, "could not get dma for ep%i\n", chdat->epnum); | ||
| 282 | return false; | ||
| 283 | } | ||
| 284 | if (tusb_dma->ch < 0) { | ||
| 285 | /* REVISIT: This should get blocked earlier, happens | ||
| 286 | * with MSC ErrorRecoveryTest | ||
| 287 | */ | ||
| 288 | WARN_ON(1); | ||
| 289 | return false; | ||
| 290 | } | ||
| 291 | |||
| 292 | ch = tusb_dma->ch; | ||
| 293 | dmareq = tusb_dma->dmareq; | ||
| 294 | sync_dev = tusb_dma->sync_dev; | ||
| 295 | omap_set_dma_callback(ch, tusb_omap_dma_cb, channel); | ||
| 296 | } | ||
| 297 | |||
| 298 | chdat->packet_sz = packet_sz; | ||
| 299 | chdat->len = len; | ||
| 300 | channel->actual_len = 0; | ||
| 301 | chdat->dma_addr = (void __iomem *)dma_addr; | ||
| 302 | channel->status = MUSB_DMA_STATUS_BUSY; | ||
| 303 | |||
| 304 | /* Since we're recycling dma areas, we need to clean or invalidate */ | ||
| 305 | if (chdat->tx) | ||
| 306 | dma_cache_maint(phys_to_virt(dma_addr), len, DMA_TO_DEVICE); | ||
| 307 | else | ||
| 308 | dma_cache_maint(phys_to_virt(dma_addr), len, DMA_FROM_DEVICE); | ||
| 309 | |||
| 310 | /* Use 16-bit transfer if dma_addr is not 32-bit aligned */ | ||
| 311 | if ((dma_addr & 0x3) == 0) { | ||
| 312 | dma_params.data_type = OMAP_DMA_DATA_TYPE_S32; | ||
| 313 | dma_params.elem_count = 8; /* Elements in frame */ | ||
| 314 | } else { | ||
| 315 | dma_params.data_type = OMAP_DMA_DATA_TYPE_S16; | ||
| 316 | dma_params.elem_count = 16; /* Elements in frame */ | ||
| 317 | fifo = hw_ep->fifo_async; | ||
| 318 | } | ||
| 319 | |||
| 320 | dma_params.frame_count = chdat->transfer_len / 32; /* Burst sz frame */ | ||
| 321 | |||
| 322 | DBG(3, "ep%i %s dma ch%i dma: %08x len: %u(%u) packet_sz: %i(%i)\n", | ||
| 323 | chdat->epnum, chdat->tx ? "tx" : "rx", | ||
| 324 | ch, dma_addr, chdat->transfer_len, len, | ||
| 325 | chdat->transfer_packet_sz, packet_sz); | ||
| 326 | |||
| 327 | /* | ||
| 328 | * Prepare omap DMA for transfer | ||
| 329 | */ | ||
| 330 | if (chdat->tx) { | ||
| 331 | dma_params.src_amode = OMAP_DMA_AMODE_POST_INC; | ||
| 332 | dma_params.src_start = (unsigned long)dma_addr; | ||
| 333 | dma_params.src_ei = 0; | ||
| 334 | dma_params.src_fi = 0; | ||
| 335 | |||
| 336 | dma_params.dst_amode = OMAP_DMA_AMODE_DOUBLE_IDX; | ||
| 337 | dma_params.dst_start = (unsigned long)fifo; | ||
| 338 | dma_params.dst_ei = 1; | ||
| 339 | dma_params.dst_fi = -31; /* Loop 32 byte window */ | ||
| 340 | |||
| 341 | dma_params.trigger = sync_dev; | ||
| 342 | dma_params.sync_mode = OMAP_DMA_SYNC_FRAME; | ||
| 343 | dma_params.src_or_dst_synch = 0; /* Dest sync */ | ||
| 344 | |||
| 345 | src_burst = OMAP_DMA_DATA_BURST_16; /* 16x32 read */ | ||
| 346 | dst_burst = OMAP_DMA_DATA_BURST_8; /* 8x32 write */ | ||
| 347 | } else { | ||
| 348 | dma_params.src_amode = OMAP_DMA_AMODE_DOUBLE_IDX; | ||
| 349 | dma_params.src_start = (unsigned long)fifo; | ||
| 350 | dma_params.src_ei = 1; | ||
| 351 | dma_params.src_fi = -31; /* Loop 32 byte window */ | ||
| 352 | |||
| 353 | dma_params.dst_amode = OMAP_DMA_AMODE_POST_INC; | ||
| 354 | dma_params.dst_start = (unsigned long)dma_addr; | ||
| 355 | dma_params.dst_ei = 0; | ||
| 356 | dma_params.dst_fi = 0; | ||
| 357 | |||
| 358 | dma_params.trigger = sync_dev; | ||
| 359 | dma_params.sync_mode = OMAP_DMA_SYNC_FRAME; | ||
| 360 | dma_params.src_or_dst_synch = 1; /* Source sync */ | ||
| 361 | |||
| 362 | src_burst = OMAP_DMA_DATA_BURST_8; /* 8x32 read */ | ||
| 363 | dst_burst = OMAP_DMA_DATA_BURST_16; /* 16x32 write */ | ||
| 364 | } | ||
| 365 | |||
| 366 | DBG(3, "ep%i %s using %i-bit %s dma from 0x%08lx to 0x%08lx\n", | ||
| 367 | chdat->epnum, chdat->tx ? "tx" : "rx", | ||
| 368 | (dma_params.data_type == OMAP_DMA_DATA_TYPE_S32) ? 32 : 16, | ||
| 369 | ((dma_addr & 0x3) == 0) ? "sync" : "async", | ||
| 370 | dma_params.src_start, dma_params.dst_start); | ||
| 371 | |||
| 372 | omap_set_dma_params(ch, &dma_params); | ||
| 373 | omap_set_dma_src_burst_mode(ch, src_burst); | ||
| 374 | omap_set_dma_dest_burst_mode(ch, dst_burst); | ||
| 375 | omap_set_dma_write_mode(ch, OMAP_DMA_WRITE_LAST_NON_POSTED); | ||
| 376 | |||
| 377 | /* | ||
| 378 | * Prepare MUSB for DMA transfer | ||
| 379 | */ | ||
| 380 | if (chdat->tx) { | ||
| 381 | musb_ep_select(mbase, chdat->epnum); | ||
| 382 | csr = musb_readw(hw_ep->regs, MUSB_TXCSR); | ||
| 383 | csr |= (MUSB_TXCSR_AUTOSET | MUSB_TXCSR_DMAENAB | ||
| 384 | | MUSB_TXCSR_DMAMODE | MUSB_TXCSR_MODE); | ||
| 385 | csr &= ~MUSB_TXCSR_P_UNDERRUN; | ||
| 386 | musb_writew(hw_ep->regs, MUSB_TXCSR, csr); | ||
| 387 | } else { | ||
| 388 | musb_ep_select(mbase, chdat->epnum); | ||
| 389 | csr = musb_readw(hw_ep->regs, MUSB_RXCSR); | ||
| 390 | csr |= MUSB_RXCSR_DMAENAB; | ||
| 391 | csr &= ~(MUSB_RXCSR_AUTOCLEAR | MUSB_RXCSR_DMAMODE); | ||
| 392 | musb_writew(hw_ep->regs, MUSB_RXCSR, | ||
| 393 | csr | MUSB_RXCSR_P_WZC_BITS); | ||
| 394 | } | ||
| 395 | |||
| 396 | /* | ||
| 397 | * Start DMA transfer | ||
| 398 | */ | ||
| 399 | omap_start_dma(ch); | ||
| 400 | |||
| 401 | if (chdat->tx) { | ||
| 402 | /* Send transfer_packet_sz packets at a time */ | ||
| 403 | musb_writel(ep_conf, TUSB_EP_MAX_PACKET_SIZE_OFFSET, | ||
| 404 | chdat->transfer_packet_sz); | ||
| 405 | |||
| 406 | musb_writel(ep_conf, TUSB_EP_TX_OFFSET, | ||
| 407 | TUSB_EP_CONFIG_XFR_SIZE(chdat->transfer_len)); | ||
| 408 | } else { | ||
| 409 | /* Receive transfer_packet_sz packets at a time */ | ||
| 410 | musb_writel(ep_conf, TUSB_EP_MAX_PACKET_SIZE_OFFSET, | ||
| 411 | chdat->transfer_packet_sz << 16); | ||
| 412 | |||
| 413 | musb_writel(ep_conf, TUSB_EP_RX_OFFSET, | ||
| 414 | TUSB_EP_CONFIG_XFR_SIZE(chdat->transfer_len)); | ||
| 415 | } | ||
| 416 | |||
| 417 | return true; | ||
| 418 | } | ||
| 419 | |||
| 420 | static int tusb_omap_dma_abort(struct dma_channel *channel) | ||
| 421 | { | ||
| 422 | struct tusb_omap_dma_ch *chdat = to_chdat(channel); | ||
| 423 | struct tusb_omap_dma *tusb_dma = chdat->tusb_dma; | ||
| 424 | |||
| 425 | if (!tusb_dma->multichannel) { | ||
| 426 | if (tusb_dma->ch >= 0) { | ||
| 427 | omap_stop_dma(tusb_dma->ch); | ||
| 428 | omap_free_dma(tusb_dma->ch); | ||
| 429 | tusb_dma->ch = -1; | ||
| 430 | } | ||
| 431 | |||
| 432 | tusb_dma->dmareq = -1; | ||
| 433 | tusb_dma->sync_dev = -1; | ||
| 434 | } | ||
| 435 | |||
| 436 | channel->status = MUSB_DMA_STATUS_FREE; | ||
| 437 | |||
| 438 | return 0; | ||
| 439 | } | ||
| 440 | |||
| 441 | static inline int tusb_omap_dma_allocate_dmareq(struct tusb_omap_dma_ch *chdat) | ||
| 442 | { | ||
| 443 | u32 reg = musb_readl(chdat->tbase, TUSB_DMA_EP_MAP); | ||
| 444 | int i, dmareq_nr = -1; | ||
| 445 | |||
| 446 | const int sync_dev[6] = { | ||
| 447 | OMAP24XX_DMA_EXT_DMAREQ0, | ||
| 448 | OMAP24XX_DMA_EXT_DMAREQ1, | ||
| 449 | OMAP242X_DMA_EXT_DMAREQ2, | ||
| 450 | OMAP242X_DMA_EXT_DMAREQ3, | ||
| 451 | OMAP242X_DMA_EXT_DMAREQ4, | ||
| 452 | OMAP242X_DMA_EXT_DMAREQ5, | ||
| 453 | }; | ||
| 454 | |||
| 455 | for (i = 0; i < MAX_DMAREQ; i++) { | ||
| 456 | int cur = (reg & (0xf << (i * 5))) >> (i * 5); | ||
| 457 | if (cur == 0) { | ||
| 458 | dmareq_nr = i; | ||
| 459 | break; | ||
| 460 | } | ||
| 461 | } | ||
| 462 | |||
| 463 | if (dmareq_nr == -1) | ||
| 464 | return -EAGAIN; | ||
| 465 | |||
| 466 | reg |= (chdat->epnum << (dmareq_nr * 5)); | ||
| 467 | if (chdat->tx) | ||
| 468 | reg |= ((1 << 4) << (dmareq_nr * 5)); | ||
| 469 | musb_writel(chdat->tbase, TUSB_DMA_EP_MAP, reg); | ||
| 470 | |||
| 471 | chdat->dmareq = dmareq_nr; | ||
| 472 | chdat->sync_dev = sync_dev[chdat->dmareq]; | ||
| 473 | |||
| 474 | return 0; | ||
| 475 | } | ||
| 476 | |||
| 477 | static inline void tusb_omap_dma_free_dmareq(struct tusb_omap_dma_ch *chdat) | ||
| 478 | { | ||
| 479 | u32 reg; | ||
| 480 | |||
| 481 | if (!chdat || chdat->dmareq < 0) | ||
| 482 | return; | ||
| 483 | |||
| 484 | reg = musb_readl(chdat->tbase, TUSB_DMA_EP_MAP); | ||
| 485 | reg &= ~(0x1f << (chdat->dmareq * 5)); | ||
| 486 | musb_writel(chdat->tbase, TUSB_DMA_EP_MAP, reg); | ||
| 487 | |||
| 488 | chdat->dmareq = -1; | ||
| 489 | chdat->sync_dev = -1; | ||
| 490 | } | ||
| 491 | |||
| 492 | static struct dma_channel *dma_channel_pool[MAX_DMAREQ]; | ||
| 493 | |||
| 494 | static struct dma_channel * | ||
| 495 | tusb_omap_dma_allocate(struct dma_controller *c, | ||
| 496 | struct musb_hw_ep *hw_ep, | ||
| 497 | u8 tx) | ||
| 498 | { | ||
| 499 | int ret, i; | ||
| 500 | const char *dev_name; | ||
| 501 | struct tusb_omap_dma *tusb_dma; | ||
| 502 | struct musb *musb; | ||
| 503 | void __iomem *tbase; | ||
| 504 | struct dma_channel *channel = NULL; | ||
| 505 | struct tusb_omap_dma_ch *chdat = NULL; | ||
| 506 | u32 reg; | ||
| 507 | |||
| 508 | tusb_dma = container_of(c, struct tusb_omap_dma, controller); | ||
| 509 | musb = tusb_dma->musb; | ||
| 510 | tbase = musb->ctrl_base; | ||
| 511 | |||
| 512 | reg = musb_readl(tbase, TUSB_DMA_INT_MASK); | ||
| 513 | if (tx) | ||
| 514 | reg &= ~(1 << hw_ep->epnum); | ||
| 515 | else | ||
| 516 | reg &= ~(1 << (hw_ep->epnum + 15)); | ||
| 517 | musb_writel(tbase, TUSB_DMA_INT_MASK, reg); | ||
| 518 | |||
| 519 | /* REVISIT: Why does dmareq5 not work? */ | ||
| 520 | if (hw_ep->epnum == 0) { | ||
| 521 | DBG(3, "Not allowing DMA for ep0 %s\n", tx ? "tx" : "rx"); | ||
| 522 | return NULL; | ||
| 523 | } | ||
| 524 | |||
| 525 | for (i = 0; i < MAX_DMAREQ; i++) { | ||
| 526 | struct dma_channel *ch = dma_channel_pool[i]; | ||
| 527 | if (ch->status == MUSB_DMA_STATUS_UNKNOWN) { | ||
| 528 | ch->status = MUSB_DMA_STATUS_FREE; | ||
| 529 | channel = ch; | ||
| 530 | chdat = ch->private_data; | ||
| 531 | break; | ||
| 532 | } | ||
| 533 | } | ||
| 534 | |||
| 535 | if (!channel) | ||
| 536 | return NULL; | ||
| 537 | |||
| 538 | if (tx) { | ||
| 539 | chdat->tx = 1; | ||
| 540 | dev_name = "TUSB transmit"; | ||
| 541 | } else { | ||
| 542 | chdat->tx = 0; | ||
| 543 | dev_name = "TUSB receive"; | ||
| 544 | } | ||
| 545 | |||
| 546 | chdat->musb = tusb_dma->musb; | ||
| 547 | chdat->tbase = tusb_dma->tbase; | ||
| 548 | chdat->hw_ep = hw_ep; | ||
| 549 | chdat->epnum = hw_ep->epnum; | ||
| 550 | chdat->dmareq = -1; | ||
| 551 | chdat->completed_len = 0; | ||
| 552 | chdat->tusb_dma = tusb_dma; | ||
| 553 | |||
| 554 | channel->max_len = 0x7fffffff; | ||
| 555 | channel->desired_mode = 0; | ||
| 556 | channel->actual_len = 0; | ||
| 557 | |||
| 558 | if (tusb_dma->multichannel) { | ||
| 559 | ret = tusb_omap_dma_allocate_dmareq(chdat); | ||
| 560 | if (ret != 0) | ||
| 561 | goto free_dmareq; | ||
| 562 | |||
| 563 | ret = omap_request_dma(chdat->sync_dev, dev_name, | ||
| 564 | tusb_omap_dma_cb, channel, &chdat->ch); | ||
| 565 | if (ret != 0) | ||
| 566 | goto free_dmareq; | ||
| 567 | } else if (tusb_dma->ch == -1) { | ||
| 568 | tusb_dma->dmareq = 0; | ||
| 569 | tusb_dma->sync_dev = OMAP24XX_DMA_EXT_DMAREQ0; | ||
| 570 | |||
| 571 | /* Callback data gets set later in the shared dmareq case */ | ||
| 572 | ret = omap_request_dma(tusb_dma->sync_dev, "TUSB shared", | ||
| 573 | tusb_omap_dma_cb, NULL, &tusb_dma->ch); | ||
| 574 | if (ret != 0) | ||
| 575 | goto free_dmareq; | ||
| 576 | |||
| 577 | chdat->dmareq = -1; | ||
| 578 | chdat->ch = -1; | ||
| 579 | } | ||
| 580 | |||
| 581 | DBG(3, "ep%i %s dma: %s dma%i dmareq%i sync%i\n", | ||
| 582 | chdat->epnum, | ||
| 583 | chdat->tx ? "tx" : "rx", | ||
| 584 | chdat->ch >= 0 ? "dedicated" : "shared", | ||
| 585 | chdat->ch >= 0 ? chdat->ch : tusb_dma->ch, | ||
| 586 | chdat->dmareq >= 0 ? chdat->dmareq : tusb_dma->dmareq, | ||
| 587 | chdat->sync_dev >= 0 ? chdat->sync_dev : tusb_dma->sync_dev); | ||
| 588 | |||
| 589 | return channel; | ||
| 590 | |||
| 591 | free_dmareq: | ||
| 592 | tusb_omap_dma_free_dmareq(chdat); | ||
| 593 | |||
| 594 | DBG(3, "ep%i: Could not get a DMA channel\n", chdat->epnum); | ||
| 595 | channel->status = MUSB_DMA_STATUS_UNKNOWN; | ||
| 596 | |||
| 597 | return NULL; | ||
| 598 | } | ||
| 599 | |||
| 600 | static void tusb_omap_dma_release(struct dma_channel *channel) | ||
| 601 | { | ||
| 602 | struct tusb_omap_dma_ch *chdat = to_chdat(channel); | ||
| 603 | struct musb *musb = chdat->musb; | ||
| 604 | void __iomem *tbase = musb->ctrl_base; | ||
| 605 | u32 reg; | ||
| 606 | |||
| 607 | DBG(3, "ep%i ch%i\n", chdat->epnum, chdat->ch); | ||
| 608 | |||
| 609 | reg = musb_readl(tbase, TUSB_DMA_INT_MASK); | ||
| 610 | if (chdat->tx) | ||
| 611 | reg |= (1 << chdat->epnum); | ||
| 612 | else | ||
| 613 | reg |= (1 << (chdat->epnum + 15)); | ||
| 614 | musb_writel(tbase, TUSB_DMA_INT_MASK, reg); | ||
| 615 | |||
| 616 | reg = musb_readl(tbase, TUSB_DMA_INT_CLEAR); | ||
| 617 | if (chdat->tx) | ||
| 618 | reg |= (1 << chdat->epnum); | ||
| 619 | else | ||
| 620 | reg |= (1 << (chdat->epnum + 15)); | ||
| 621 | musb_writel(tbase, TUSB_DMA_INT_CLEAR, reg); | ||
| 622 | |||
| 623 | channel->status = MUSB_DMA_STATUS_UNKNOWN; | ||
| 624 | |||
| 625 | if (chdat->ch >= 0) { | ||
| 626 | omap_stop_dma(chdat->ch); | ||
| 627 | omap_free_dma(chdat->ch); | ||
| 628 | chdat->ch = -1; | ||
| 629 | } | ||
| 630 | |||
| 631 | if (chdat->dmareq >= 0) | ||
| 632 | tusb_omap_dma_free_dmareq(chdat); | ||
| 633 | |||
| 634 | channel = NULL; | ||
| 635 | } | ||
| 636 | |||
| 637 | void dma_controller_destroy(struct dma_controller *c) | ||
| 638 | { | ||
| 639 | struct tusb_omap_dma *tusb_dma; | ||
| 640 | int i; | ||
| 641 | |||
| 642 | tusb_dma = container_of(c, struct tusb_omap_dma, controller); | ||
| 643 | for (i = 0; i < MAX_DMAREQ; i++) { | ||
| 644 | struct dma_channel *ch = dma_channel_pool[i]; | ||
| 645 | if (ch) { | ||
| 646 | kfree(ch->private_data); | ||
| 647 | kfree(ch); | ||
| 648 | } | ||
| 649 | } | ||
| 650 | |||
| 651 | if (!tusb_dma->multichannel && tusb_dma && tusb_dma->ch >= 0) | ||
| 652 | omap_free_dma(tusb_dma->ch); | ||
| 653 | |||
| 654 | kfree(tusb_dma); | ||
| 655 | } | ||
| 656 | |||
| 657 | struct dma_controller *__init | ||
| 658 | dma_controller_create(struct musb *musb, void __iomem *base) | ||
| 659 | { | ||
| 660 | void __iomem *tbase = musb->ctrl_base; | ||
| 661 | struct tusb_omap_dma *tusb_dma; | ||
| 662 | int i; | ||
| 663 | |||
| 664 | /* REVISIT: Get dmareq lines used from board-*.c */ | ||
| 665 | |||
| 666 | musb_writel(musb->ctrl_base, TUSB_DMA_INT_MASK, 0x7fffffff); | ||
| 667 | musb_writel(musb->ctrl_base, TUSB_DMA_EP_MAP, 0); | ||
| 668 | |||
| 669 | musb_writel(tbase, TUSB_DMA_REQ_CONF, | ||
| 670 | TUSB_DMA_REQ_CONF_BURST_SIZE(2) | ||
| 671 | | TUSB_DMA_REQ_CONF_DMA_REQ_EN(0x3f) | ||
| 672 | | TUSB_DMA_REQ_CONF_DMA_REQ_ASSER(2)); | ||
| 673 | |||
| 674 | tusb_dma = kzalloc(sizeof(struct tusb_omap_dma), GFP_KERNEL); | ||
| 675 | if (!tusb_dma) | ||
| 676 | goto cleanup; | ||
| 677 | |||
| 678 | tusb_dma->musb = musb; | ||
| 679 | tusb_dma->tbase = musb->ctrl_base; | ||
| 680 | |||
| 681 | tusb_dma->ch = -1; | ||
| 682 | tusb_dma->dmareq = -1; | ||
| 683 | tusb_dma->sync_dev = -1; | ||
| 684 | |||
| 685 | tusb_dma->controller.start = tusb_omap_dma_start; | ||
| 686 | tusb_dma->controller.stop = tusb_omap_dma_stop; | ||
| 687 | tusb_dma->controller.channel_alloc = tusb_omap_dma_allocate; | ||
| 688 | tusb_dma->controller.channel_release = tusb_omap_dma_release; | ||
| 689 | tusb_dma->controller.channel_program = tusb_omap_dma_program; | ||
| 690 | tusb_dma->controller.channel_abort = tusb_omap_dma_abort; | ||
| 691 | |||
| 692 | if (tusb_get_revision(musb) >= TUSB_REV_30) | ||
| 693 | tusb_dma->multichannel = 1; | ||
| 694 | |||
| 695 | for (i = 0; i < MAX_DMAREQ; i++) { | ||
| 696 | struct dma_channel *ch; | ||
| 697 | struct tusb_omap_dma_ch *chdat; | ||
| 698 | |||
| 699 | ch = kzalloc(sizeof(struct dma_channel), GFP_KERNEL); | ||
| 700 | if (!ch) | ||
| 701 | goto cleanup; | ||
| 702 | |||
| 703 | dma_channel_pool[i] = ch; | ||
| 704 | |||
| 705 | chdat = kzalloc(sizeof(struct tusb_omap_dma_ch), GFP_KERNEL); | ||
| 706 | if (!chdat) | ||
| 707 | goto cleanup; | ||
| 708 | |||
| 709 | ch->status = MUSB_DMA_STATUS_UNKNOWN; | ||
| 710 | ch->private_data = chdat; | ||
| 711 | } | ||
| 712 | |||
| 713 | return &tusb_dma->controller; | ||
| 714 | |||
| 715 | cleanup: | ||
| 716 | dma_controller_destroy(&tusb_dma->controller); | ||
| 717 | |||
| 718 | return NULL; | ||
| 719 | } | ||
diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig index 8878c1767fc8..70338f4ec918 100644 --- a/drivers/usb/serial/Kconfig +++ b/drivers/usb/serial/Kconfig | |||
| @@ -499,9 +499,10 @@ config USB_SERIAL_SAFE_PADDED | |||
| 499 | config USB_SERIAL_SIERRAWIRELESS | 499 | config USB_SERIAL_SIERRAWIRELESS |
| 500 | tristate "USB Sierra Wireless Driver" | 500 | tristate "USB Sierra Wireless Driver" |
| 501 | help | 501 | help |
| 502 | Say M here if you want to use a Sierra Wireless device (if | 502 | Say M here if you want to use Sierra Wireless devices. |
| 503 | using an PC 5220 or AC580 please use the Airprime driver | 503 | |
| 504 | instead). | 504 | Many deviecs have a feature known as TRU-Install, for those devices |
| 505 | to work properly the USB Storage Sierra feature must be enabled. | ||
| 505 | 506 | ||
| 506 | To compile this driver as a module, choose M here: the | 507 | To compile this driver as a module, choose M here: the |
| 507 | module will be called sierra. | 508 | module will be called sierra. |
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 838717250145..984f6eff4c47 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
| @@ -563,6 +563,7 @@ static struct usb_device_id id_table_combined [] = { | |||
| 563 | { USB_DEVICE(FTDI_VID, FTDI_ELV_FHZ1300PC_PID) }, | 563 | { USB_DEVICE(FTDI_VID, FTDI_ELV_FHZ1300PC_PID) }, |
| 564 | { USB_DEVICE(FTDI_VID, FTDI_ELV_EM1010PC_PID) }, | 564 | { USB_DEVICE(FTDI_VID, FTDI_ELV_EM1010PC_PID) }, |
| 565 | { USB_DEVICE(FTDI_VID, FTDI_ELV_WS500_PID) }, | 565 | { USB_DEVICE(FTDI_VID, FTDI_ELV_WS500_PID) }, |
| 566 | { USB_DEVICE(FTDI_VID, FTDI_ELV_HS485_PID) }, | ||
| 566 | { USB_DEVICE(FTDI_VID, LINX_SDMUSBQSS_PID) }, | 567 | { USB_DEVICE(FTDI_VID, LINX_SDMUSBQSS_PID) }, |
| 567 | { USB_DEVICE(FTDI_VID, LINX_MASTERDEVEL2_PID) }, | 568 | { USB_DEVICE(FTDI_VID, LINX_MASTERDEVEL2_PID) }, |
| 568 | { USB_DEVICE(FTDI_VID, LINX_FUTURE_0_PID) }, | 569 | { USB_DEVICE(FTDI_VID, LINX_FUTURE_0_PID) }, |
| @@ -637,6 +638,7 @@ static struct usb_device_id id_table_combined [] = { | |||
| 637 | { USB_DEVICE(ELEKTOR_VID, ELEKTOR_FT323R_PID) }, | 638 | { USB_DEVICE(ELEKTOR_VID, ELEKTOR_FT323R_PID) }, |
| 638 | { USB_DEVICE(TELLDUS_VID, TELLDUS_TELLSTICK_PID) }, | 639 | { USB_DEVICE(TELLDUS_VID, TELLDUS_TELLSTICK_PID) }, |
| 639 | { USB_DEVICE(FTDI_VID, FTDI_MAXSTREAM_PID) }, | 640 | { USB_DEVICE(FTDI_VID, FTDI_MAXSTREAM_PID) }, |
| 641 | { USB_DEVICE(FTDI_VID, FTDI_PHI_FISCO_PID) }, | ||
| 640 | { USB_DEVICE(TML_VID, TML_USB_SERIAL_PID) }, | 642 | { USB_DEVICE(TML_VID, TML_USB_SERIAL_PID) }, |
| 641 | { USB_DEVICE(FTDI_VID, FTDI_ELSTER_UNICOM_PID) }, | 643 | { USB_DEVICE(FTDI_VID, FTDI_ELSTER_UNICOM_PID) }, |
| 642 | { USB_DEVICE(FTDI_VID, FTDI_PROPOX_JTAGCABLEII_PID) }, | 644 | { USB_DEVICE(FTDI_VID, FTDI_PROPOX_JTAGCABLEII_PID) }, |
| @@ -646,6 +648,10 @@ static struct usb_device_id id_table_combined [] = { | |||
| 646 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, | 648 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, |
| 647 | { USB_DEVICE(FTDI_VID, FTDI_OOCDLINK_PID), | 649 | { USB_DEVICE(FTDI_VID, FTDI_OOCDLINK_PID), |
| 648 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, | 650 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, |
| 651 | { USB_DEVICE(FTDI_VID, LMI_LM3S_DEVEL_BOARD_PID), | ||
| 652 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, | ||
| 653 | { USB_DEVICE(FTDI_VID, LMI_LM3S_EVAL_BOARD_PID), | ||
| 654 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, | ||
| 649 | { USB_DEVICE(RATOC_VENDOR_ID, RATOC_PRODUCT_ID_USB60F) }, | 655 | { USB_DEVICE(RATOC_VENDOR_ID, RATOC_PRODUCT_ID_USB60F) }, |
| 650 | { USB_DEVICE(FTDI_VID, FTDI_REU_TINY_PID) }, | 656 | { USB_DEVICE(FTDI_VID, FTDI_REU_TINY_PID) }, |
| 651 | { }, /* Optional parameter entry */ | 657 | { }, /* Optional parameter entry */ |
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h index a577ea44dcf9..382265bba969 100644 --- a/drivers/usb/serial/ftdi_sio.h +++ b/drivers/usb/serial/ftdi_sio.h | |||
| @@ -524,7 +524,9 @@ | |||
| 524 | #define FTDI_ELV_WS300PC_PID 0xE0F6 /* PC-Wetterstation (WS 300 PC) */ | 524 | #define FTDI_ELV_WS300PC_PID 0xE0F6 /* PC-Wetterstation (WS 300 PC) */ |
| 525 | #define FTDI_ELV_FHZ1300PC_PID 0xE0E8 /* FHZ 1300 PC */ | 525 | #define FTDI_ELV_FHZ1300PC_PID 0xE0E8 /* FHZ 1300 PC */ |
| 526 | #define FTDI_ELV_WS500_PID 0xE0E9 /* PC-Wetterstation (WS 500) */ | 526 | #define FTDI_ELV_WS500_PID 0xE0E9 /* PC-Wetterstation (WS 500) */ |
| 527 | #define FTDI_ELV_HS485_PID 0xE0EA /* USB to RS-485 adapter */ | ||
| 527 | #define FTDI_ELV_EM1010PC_PID 0xE0EF /* Engery monitor EM 1010 PC */ | 528 | #define FTDI_ELV_EM1010PC_PID 0xE0EF /* Engery monitor EM 1010 PC */ |
| 529 | #define FTDI_PHI_FISCO_PID 0xE40B /* PHI Fisco USB to Serial cable */ | ||
| 528 | 530 | ||
| 529 | /* | 531 | /* |
| 530 | * Definitions for ID TECH (www.idt-net.com) devices | 532 | * Definitions for ID TECH (www.idt-net.com) devices |
| @@ -815,6 +817,11 @@ | |||
| 815 | #define OLIMEX_VID 0x15BA | 817 | #define OLIMEX_VID 0x15BA |
| 816 | #define OLIMEX_ARM_USB_OCD_PID 0x0003 | 818 | #define OLIMEX_ARM_USB_OCD_PID 0x0003 |
| 817 | 819 | ||
| 820 | /* Luminary Micro Stellaris Boards, VID = FTDI_VID */ | ||
| 821 | /* FTDI 2332C Dual channel device, side A=245 FIFO (JTAG), Side B=RS232 UART */ | ||
| 822 | #define LMI_LM3S_DEVEL_BOARD_PID 0xbcd8 | ||
| 823 | #define LMI_LM3S_EVAL_BOARD_PID 0xbcd9 | ||
| 824 | |||
| 818 | /* www.elsterelectricity.com Elster Unicom III Optical Probe */ | 825 | /* www.elsterelectricity.com Elster Unicom III Optical Probe */ |
| 819 | #define FTDI_ELSTER_UNICOM_PID 0xE700 /* Product Id */ | 826 | #define FTDI_ELSTER_UNICOM_PID 0xE700 /* Product Id */ |
| 820 | 827 | ||
diff --git a/drivers/usb/serial/garmin_gps.c b/drivers/usb/serial/garmin_gps.c index 2e663f1afd5e..d95382088075 100644 --- a/drivers/usb/serial/garmin_gps.c +++ b/drivers/usb/serial/garmin_gps.c | |||
| @@ -38,8 +38,6 @@ | |||
| 38 | #include <linux/usb.h> | 38 | #include <linux/usb.h> |
| 39 | #include <linux/usb/serial.h> | 39 | #include <linux/usb/serial.h> |
| 40 | 40 | ||
| 41 | #include <linux/version.h> | ||
| 42 | |||
| 43 | /* the mode to be set when the port ist opened */ | 41 | /* the mode to be set when the port ist opened */ |
| 44 | static int initial_mode = 1; | 42 | static int initial_mode = 1; |
| 45 | 43 | ||
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c index e4eca95f2b0f..9f9cd36455f4 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c | |||
| @@ -173,6 +173,7 @@ static int option_send_setup(struct tty_struct *tty, struct usb_serial_port *po | |||
| 173 | #define KYOCERA_PRODUCT_KPC680 0x180a | 173 | #define KYOCERA_PRODUCT_KPC680 0x180a |
| 174 | 174 | ||
| 175 | #define ANYDATA_VENDOR_ID 0x16d5 | 175 | #define ANYDATA_VENDOR_ID 0x16d5 |
| 176 | #define ANYDATA_PRODUCT_ADU_620UW 0x6202 | ||
| 176 | #define ANYDATA_PRODUCT_ADU_E100A 0x6501 | 177 | #define ANYDATA_PRODUCT_ADU_E100A 0x6501 |
| 177 | #define ANYDATA_PRODUCT_ADU_500A 0x6502 | 178 | #define ANYDATA_PRODUCT_ADU_500A 0x6502 |
| 178 | 179 | ||
| @@ -186,6 +187,23 @@ static int option_send_setup(struct tty_struct *tty, struct usb_serial_port *po | |||
| 186 | #define BANDRICH_VENDOR_ID 0x1A8D | 187 | #define BANDRICH_VENDOR_ID 0x1A8D |
| 187 | #define BANDRICH_PRODUCT_C100_1 0x1002 | 188 | #define BANDRICH_PRODUCT_C100_1 0x1002 |
| 188 | #define BANDRICH_PRODUCT_C100_2 0x1003 | 189 | #define BANDRICH_PRODUCT_C100_2 0x1003 |
| 190 | #define BANDRICH_PRODUCT_1004 0x1004 | ||
| 191 | #define BANDRICH_PRODUCT_1005 0x1005 | ||
| 192 | #define BANDRICH_PRODUCT_1006 0x1006 | ||
| 193 | #define BANDRICH_PRODUCT_1007 0x1007 | ||
| 194 | #define BANDRICH_PRODUCT_1008 0x1008 | ||
| 195 | #define BANDRICH_PRODUCT_1009 0x1009 | ||
| 196 | #define BANDRICH_PRODUCT_100A 0x100a | ||
| 197 | |||
| 198 | #define BANDRICH_PRODUCT_100B 0x100b | ||
| 199 | #define BANDRICH_PRODUCT_100C 0x100c | ||
| 200 | #define BANDRICH_PRODUCT_100D 0x100d | ||
| 201 | #define BANDRICH_PRODUCT_100E 0x100e | ||
| 202 | |||
| 203 | #define BANDRICH_PRODUCT_100F 0x100f | ||
| 204 | #define BANDRICH_PRODUCT_1010 0x1010 | ||
| 205 | #define BANDRICH_PRODUCT_1011 0x1011 | ||
| 206 | #define BANDRICH_PRODUCT_1012 0x1012 | ||
| 189 | 207 | ||
| 190 | #define AMOI_VENDOR_ID 0x1614 | 208 | #define AMOI_VENDOR_ID 0x1614 |
| 191 | #define AMOI_PRODUCT_9508 0x0800 | 209 | #define AMOI_PRODUCT_9508 0x0800 |
| @@ -197,6 +215,10 @@ static int option_send_setup(struct tty_struct *tty, struct usb_serial_port *po | |||
| 197 | #define TELIT_VENDOR_ID 0x1bc7 | 215 | #define TELIT_VENDOR_ID 0x1bc7 |
| 198 | #define TELIT_PRODUCT_UC864E 0x1003 | 216 | #define TELIT_PRODUCT_UC864E 0x1003 |
| 199 | 217 | ||
| 218 | /* ZTE PRODUCTS */ | ||
| 219 | #define ZTE_VENDOR_ID 0x19d2 | ||
| 220 | #define ZTE_PRODUCT_MF628 0x0015 | ||
| 221 | |||
| 200 | static struct usb_device_id option_ids[] = { | 222 | static struct usb_device_id option_ids[] = { |
| 201 | { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) }, | 223 | { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) }, |
| 202 | { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) }, | 224 | { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) }, |
| @@ -297,17 +319,34 @@ static struct usb_device_id option_ids[] = { | |||
| 297 | { USB_DEVICE(DELL_VENDOR_ID, 0x8138) }, /* Dell Wireless 5520 Voda I Mobile Broadband (3G HSDPA) Minicard */ | 319 | { USB_DEVICE(DELL_VENDOR_ID, 0x8138) }, /* Dell Wireless 5520 Voda I Mobile Broadband (3G HSDPA) Minicard */ |
| 298 | { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_E100A) }, | 320 | { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_E100A) }, |
| 299 | { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_500A) }, | 321 | { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_500A) }, |
| 322 | { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_620UW) }, | ||
| 300 | { USB_DEVICE(AXESSTEL_VENDOR_ID, AXESSTEL_PRODUCT_MV110H) }, | 323 | { USB_DEVICE(AXESSTEL_VENDOR_ID, AXESSTEL_PRODUCT_MV110H) }, |
| 301 | { USB_DEVICE(ONDA_VENDOR_ID, ONDA_PRODUCT_MSA501HS) }, | 324 | { USB_DEVICE(ONDA_VENDOR_ID, ONDA_PRODUCT_MSA501HS) }, |
| 302 | { USB_DEVICE(ONDA_VENDOR_ID, ONDA_PRODUCT_ET502HS) }, | 325 | { USB_DEVICE(ONDA_VENDOR_ID, ONDA_PRODUCT_ET502HS) }, |
| 303 | { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_1) }, | 326 | { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_1) }, |
| 304 | { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_2) }, | 327 | { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_2) }, |
| 328 | { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_1004) }, | ||
| 329 | { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_1005) }, | ||
| 330 | { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_1006) }, | ||
| 331 | { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_1007) }, | ||
| 332 | { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_1008) }, | ||
| 333 | { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_1009) }, | ||
| 334 | { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_100A) }, | ||
| 335 | { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_100B) }, | ||
| 336 | { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_100C) }, | ||
| 337 | { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_100D) }, | ||
| 338 | { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_100E) }, | ||
| 339 | { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_100F) }, | ||
| 340 | { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_1010) }, | ||
| 341 | { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_1011) }, | ||
| 342 | { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_1012) }, | ||
| 305 | { USB_DEVICE(KYOCERA_VENDOR_ID, KYOCERA_PRODUCT_KPC650) }, | 343 | { USB_DEVICE(KYOCERA_VENDOR_ID, KYOCERA_PRODUCT_KPC650) }, |
| 306 | { USB_DEVICE(KYOCERA_VENDOR_ID, KYOCERA_PRODUCT_KPC680) }, | 344 | { USB_DEVICE(KYOCERA_VENDOR_ID, KYOCERA_PRODUCT_KPC680) }, |
| 307 | { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6000)}, /* ZTE AC8700 */ | 345 | { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6000)}, /* ZTE AC8700 */ |
| 308 | { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6613)}, /* Onda H600/ZTE MF330 */ | 346 | { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6613)}, /* Onda H600/ZTE MF330 */ |
| 309 | { USB_DEVICE(MAXON_VENDOR_ID, 0x6280) }, /* BP3-USB & BP3-EXT HSDPA */ | 347 | { USB_DEVICE(MAXON_VENDOR_ID, 0x6280) }, /* BP3-USB & BP3-EXT HSDPA */ |
| 310 | { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_UC864E) }, | 348 | { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_UC864E) }, |
| 349 | { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_MF628) }, | ||
| 311 | { } /* Terminating entry */ | 350 | { } /* Terminating entry */ |
| 312 | }; | 351 | }; |
| 313 | MODULE_DEVICE_TABLE(usb, option_ids); | 352 | MODULE_DEVICE_TABLE(usb, option_ids); |
| @@ -346,11 +385,7 @@ static struct usb_serial_driver option_1port_device = { | |||
| 346 | .read_int_callback = option_instat_callback, | 385 | .read_int_callback = option_instat_callback, |
| 347 | }; | 386 | }; |
| 348 | 387 | ||
| 349 | #ifdef CONFIG_USB_DEBUG | ||
| 350 | static int debug; | 388 | static int debug; |
| 351 | #else | ||
| 352 | #define debug 0 | ||
| 353 | #endif | ||
| 354 | 389 | ||
| 355 | /* per port private data */ | 390 | /* per port private data */ |
| 356 | 391 | ||
| @@ -954,8 +989,5 @@ MODULE_DESCRIPTION(DRIVER_DESC); | |||
| 954 | MODULE_VERSION(DRIVER_VERSION); | 989 | MODULE_VERSION(DRIVER_VERSION); |
| 955 | MODULE_LICENSE("GPL"); | 990 | MODULE_LICENSE("GPL"); |
| 956 | 991 | ||
| 957 | #ifdef CONFIG_USB_DEBUG | ||
| 958 | module_param(debug, bool, S_IRUGO | S_IWUSR); | 992 | module_param(debug, bool, S_IRUGO | S_IWUSR); |
| 959 | MODULE_PARM_DESC(debug, "Debug messages"); | 993 | MODULE_PARM_DESC(debug, "Debug messages"); |
| 960 | #endif | ||
| 961 | |||
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c index 2c9c446ad625..1ede1441cb1b 100644 --- a/drivers/usb/serial/pl2303.c +++ b/drivers/usb/serial/pl2303.c | |||
| @@ -90,7 +90,6 @@ static struct usb_device_id id_table [] = { | |||
| 90 | { USB_DEVICE(ALCOR_VENDOR_ID, ALCOR_PRODUCT_ID) }, | 90 | { USB_DEVICE(ALCOR_VENDOR_ID, ALCOR_PRODUCT_ID) }, |
| 91 | { USB_DEVICE(WS002IN_VENDOR_ID, WS002IN_PRODUCT_ID) }, | 91 | { USB_DEVICE(WS002IN_VENDOR_ID, WS002IN_PRODUCT_ID) }, |
| 92 | { USB_DEVICE(COREGA_VENDOR_ID, COREGA_PRODUCT_ID) }, | 92 | { USB_DEVICE(COREGA_VENDOR_ID, COREGA_PRODUCT_ID) }, |
| 93 | { USB_DEVICE(HL340_VENDOR_ID, HL340_PRODUCT_ID) }, | ||
| 94 | { USB_DEVICE(YCCABLE_VENDOR_ID, YCCABLE_PRODUCT_ID) }, | 93 | { USB_DEVICE(YCCABLE_VENDOR_ID, YCCABLE_PRODUCT_ID) }, |
| 95 | { } /* Terminating entry */ | 94 | { } /* Terminating entry */ |
| 96 | }; | 95 | }; |
diff --git a/drivers/usb/serial/pl2303.h b/drivers/usb/serial/pl2303.h index 6ac3bbcf7a22..a3bd039c78e9 100644 --- a/drivers/usb/serial/pl2303.h +++ b/drivers/usb/serial/pl2303.h | |||
| @@ -107,10 +107,6 @@ | |||
| 107 | #define COREGA_VENDOR_ID 0x07aa | 107 | #define COREGA_VENDOR_ID 0x07aa |
| 108 | #define COREGA_PRODUCT_ID 0x002a | 108 | #define COREGA_PRODUCT_ID 0x002a |
| 109 | 109 | ||
| 110 | /* HL HL-340 (ID: 4348:5523) */ | ||
| 111 | #define HL340_VENDOR_ID 0x4348 | ||
| 112 | #define HL340_PRODUCT_ID 0x5523 | ||
| 113 | |||
| 114 | /* Y.C. Cable U.S.A., Inc - USB to RS-232 */ | 110 | /* Y.C. Cable U.S.A., Inc - USB to RS-232 */ |
| 115 | #define YCCABLE_VENDOR_ID 0x05ad | 111 | #define YCCABLE_VENDOR_ID 0x05ad |
| 116 | #define YCCABLE_PRODUCT_ID 0x0fba | 112 | #define YCCABLE_PRODUCT_ID 0x0fba |
diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c index 2f6f1523ec56..706033753adb 100644 --- a/drivers/usb/serial/sierra.c +++ b/drivers/usb/serial/sierra.c | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | Whom based his on the Keyspan driver by Hugh Blemings <hugh@blemings.org> | 14 | Whom based his on the Keyspan driver by Hugh Blemings <hugh@blemings.org> |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #define DRIVER_VERSION "v.1.2.9c" | 17 | #define DRIVER_VERSION "v.1.2.13a" |
| 18 | #define DRIVER_AUTHOR "Kevin Lloyd <klloyd@sierrawireless.com>" | 18 | #define DRIVER_AUTHOR "Kevin Lloyd <klloyd@sierrawireless.com>" |
| 19 | #define DRIVER_DESC "USB Driver for Sierra Wireless USB modems" | 19 | #define DRIVER_DESC "USB Driver for Sierra Wireless USB modems" |
| 20 | 20 | ||
| @@ -31,6 +31,7 @@ | |||
| 31 | #define SWIMS_USB_REQUEST_SetPower 0x00 | 31 | #define SWIMS_USB_REQUEST_SetPower 0x00 |
| 32 | #define SWIMS_USB_REQUEST_SetNmea 0x07 | 32 | #define SWIMS_USB_REQUEST_SetNmea 0x07 |
| 33 | #define SWIMS_USB_REQUEST_SetMode 0x0B | 33 | #define SWIMS_USB_REQUEST_SetMode 0x0B |
| 34 | #define SWIMS_USB_REQUEST_GetSwocInfo 0x0A | ||
| 34 | #define SWIMS_SET_MODE_Modem 0x0001 | 35 | #define SWIMS_SET_MODE_Modem 0x0001 |
| 35 | 36 | ||
| 36 | /* per port private data */ | 37 | /* per port private data */ |
| @@ -40,18 +41,11 @@ | |||
| 40 | 41 | ||
| 41 | static int debug; | 42 | static int debug; |
| 42 | static int nmea; | 43 | static int nmea; |
| 43 | static int truinstall = 1; | ||
| 44 | |||
| 45 | enum devicetype { | ||
| 46 | DEVICE_3_PORT = 0, | ||
| 47 | DEVICE_1_PORT = 1, | ||
| 48 | DEVICE_INSTALLER = 2, | ||
| 49 | }; | ||
| 50 | 44 | ||
| 51 | static int sierra_set_power_state(struct usb_device *udev, __u16 swiState) | 45 | static int sierra_set_power_state(struct usb_device *udev, __u16 swiState) |
| 52 | { | 46 | { |
| 53 | int result; | 47 | int result; |
| 54 | dev_dbg(&udev->dev, "%s", "SET POWER STATE\n"); | 48 | dev_dbg(&udev->dev, "%s", __func__); |
| 55 | result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), | 49 | result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), |
| 56 | SWIMS_USB_REQUEST_SetPower, /* __u8 request */ | 50 | SWIMS_USB_REQUEST_SetPower, /* __u8 request */ |
| 57 | USB_TYPE_VENDOR, /* __u8 request type */ | 51 | USB_TYPE_VENDOR, /* __u8 request type */ |
| @@ -63,25 +57,10 @@ static int sierra_set_power_state(struct usb_device *udev, __u16 swiState) | |||
| 63 | return result; | 57 | return result; |
| 64 | } | 58 | } |
| 65 | 59 | ||
| 66 | static int sierra_set_ms_mode(struct usb_device *udev, __u16 eSWocMode) | ||
| 67 | { | ||
| 68 | int result; | ||
| 69 | dev_dbg(&udev->dev, "%s", "DEVICE MODE SWITCH\n"); | ||
| 70 | result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), | ||
| 71 | SWIMS_USB_REQUEST_SetMode, /* __u8 request */ | ||
| 72 | USB_TYPE_VENDOR, /* __u8 request type */ | ||
| 73 | eSWocMode, /* __u16 value */ | ||
| 74 | 0x0000, /* __u16 index */ | ||
| 75 | NULL, /* void *data */ | ||
| 76 | 0, /* __u16 size */ | ||
| 77 | USB_CTRL_SET_TIMEOUT); /* int timeout */ | ||
| 78 | return result; | ||
| 79 | } | ||
| 80 | |||
| 81 | static int sierra_vsc_set_nmea(struct usb_device *udev, __u16 enable) | 60 | static int sierra_vsc_set_nmea(struct usb_device *udev, __u16 enable) |
| 82 | { | 61 | { |
| 83 | int result; | 62 | int result; |
| 84 | dev_dbg(&udev->dev, "%s", "NMEA Enable sent\n"); | 63 | dev_dbg(&udev->dev, "%s", __func__); |
| 85 | result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), | 64 | result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), |
| 86 | SWIMS_USB_REQUEST_SetNmea, /* __u8 request */ | 65 | SWIMS_USB_REQUEST_SetNmea, /* __u8 request */ |
| 87 | USB_TYPE_VENDOR, /* __u8 request type */ | 66 | USB_TYPE_VENDOR, /* __u8 request type */ |
| @@ -97,6 +76,7 @@ static int sierra_calc_num_ports(struct usb_serial *serial) | |||
| 97 | { | 76 | { |
| 98 | int result; | 77 | int result; |
| 99 | int *num_ports = usb_get_serial_data(serial); | 78 | int *num_ports = usb_get_serial_data(serial); |
| 79 | dev_dbg(&serial->dev->dev, "%s", __func__); | ||
| 100 | 80 | ||
| 101 | result = *num_ports; | 81 | result = *num_ports; |
| 102 | 82 | ||
| @@ -110,22 +90,23 @@ static int sierra_calc_num_ports(struct usb_serial *serial) | |||
| 110 | 90 | ||
| 111 | static int sierra_calc_interface(struct usb_serial *serial) | 91 | static int sierra_calc_interface(struct usb_serial *serial) |
| 112 | { | 92 | { |
| 113 | int interface; | 93 | int interface; |
| 114 | struct usb_interface *p_interface; | 94 | struct usb_interface *p_interface; |
| 115 | struct usb_host_interface *p_host_interface; | 95 | struct usb_host_interface *p_host_interface; |
| 96 | dev_dbg(&serial->dev->dev, "%s", __func__); | ||
| 116 | 97 | ||
| 117 | /* Get the interface structure pointer from the serial struct */ | 98 | /* Get the interface structure pointer from the serial struct */ |
| 118 | p_interface = serial->interface; | 99 | p_interface = serial->interface; |
| 119 | 100 | ||
| 120 | /* Get a pointer to the host interface structure */ | 101 | /* Get a pointer to the host interface structure */ |
| 121 | p_host_interface = p_interface->cur_altsetting; | 102 | p_host_interface = p_interface->cur_altsetting; |
| 122 | 103 | ||
| 123 | /* read the interface descriptor for this active altsetting | 104 | /* read the interface descriptor for this active altsetting |
| 124 | * to find out the interface number we are on | 105 | * to find out the interface number we are on |
| 125 | */ | 106 | */ |
| 126 | interface = p_host_interface->desc.bInterfaceNumber; | 107 | interface = p_host_interface->desc.bInterfaceNumber; |
| 127 | 108 | ||
| 128 | return interface; | 109 | return interface; |
| 129 | } | 110 | } |
| 130 | 111 | ||
| 131 | static int sierra_probe(struct usb_serial *serial, | 112 | static int sierra_probe(struct usb_serial *serial, |
| @@ -135,43 +116,40 @@ static int sierra_probe(struct usb_serial *serial, | |||
| 135 | struct usb_device *udev; | 116 | struct usb_device *udev; |
| 136 | int *num_ports; | 117 | int *num_ports; |
| 137 | u8 ifnum; | 118 | u8 ifnum; |
| 119 | u8 numendpoints; | ||
| 120 | |||
| 121 | dev_dbg(&serial->dev->dev, "%s", __func__); | ||
| 138 | 122 | ||
| 139 | num_ports = kmalloc(sizeof(*num_ports), GFP_KERNEL); | 123 | num_ports = kmalloc(sizeof(*num_ports), GFP_KERNEL); |
| 140 | if (!num_ports) | 124 | if (!num_ports) |
| 141 | return -ENOMEM; | 125 | return -ENOMEM; |
| 142 | 126 | ||
| 143 | ifnum = serial->interface->cur_altsetting->desc.bInterfaceNumber; | 127 | ifnum = serial->interface->cur_altsetting->desc.bInterfaceNumber; |
| 128 | numendpoints = serial->interface->cur_altsetting->desc.bNumEndpoints; | ||
| 144 | udev = serial->dev; | 129 | udev = serial->dev; |
| 145 | 130 | ||
| 146 | /* Figure out the interface number from the serial structure */ | 131 | /* Figure out the interface number from the serial structure */ |
| 147 | ifnum = sierra_calc_interface(serial); | 132 | ifnum = sierra_calc_interface(serial); |
| 148 | |||
| 149 | /* | ||
| 150 | * If this interface supports more than 1 alternate | ||
| 151 | * select the 2nd one | ||
| 152 | */ | ||
| 153 | if (serial->interface->num_altsetting == 2) { | ||
| 154 | dev_dbg(&udev->dev, | ||
| 155 | "Selecting alt setting for interface %d\n", | ||
| 156 | ifnum); | ||
| 157 | 133 | ||
| 158 | /* We know the alternate setting is 1 for the MC8785 */ | 134 | /* |
| 159 | usb_set_interface(udev, ifnum, 1); | 135 | * If this interface supports more than 1 alternate |
| 160 | } | 136 | * select the 2nd one |
| 137 | */ | ||
| 138 | if (serial->interface->num_altsetting == 2) { | ||
| 139 | dev_dbg(&udev->dev, "Selecting alt setting for interface %d\n", | ||
| 140 | ifnum); | ||
| 141 | /* We know the alternate setting is 1 for the MC8785 */ | ||
| 142 | usb_set_interface(udev, ifnum, 1); | ||
| 143 | } | ||
| 161 | 144 | ||
| 162 | /* Check if in installer mode */ | 145 | /* Dummy interface present on some SKUs should be ignored */ |
| 163 | if (truinstall && id->driver_info == DEVICE_INSTALLER) { | 146 | if (ifnum == 0x99) |
| 164 | dev_dbg(&udev->dev, "%s", "FOUND TRU-INSTALL DEVICE(SW)\n"); | ||
| 165 | result = sierra_set_ms_mode(udev, SWIMS_SET_MODE_Modem); | ||
| 166 | /* Don't bind to the device when in installer mode */ | ||
| 167 | kfree(num_ports); | ||
| 168 | return -EIO; | ||
| 169 | } else if (id->driver_info == DEVICE_1_PORT) | ||
| 170 | *num_ports = 1; | ||
| 171 | else if (ifnum == 0x99) | ||
| 172 | *num_ports = 0; | 147 | *num_ports = 0; |
| 148 | else if (numendpoints <= 3) | ||
| 149 | *num_ports = 1; | ||
| 173 | else | 150 | else |
| 174 | *num_ports = 3; | 151 | *num_ports = (numendpoints-1)/2; |
| 152 | |||
| 175 | /* | 153 | /* |
| 176 | * save off our num_ports info so that we can use it in the | 154 | * save off our num_ports info so that we can use it in the |
| 177 | * calc_num_ports callback | 155 | * calc_num_ports callback |
| @@ -187,40 +165,50 @@ static struct usb_device_id id_table [] = { | |||
| 187 | { USB_DEVICE(0x1199, 0x0218) }, /* Sierra Wireless MC5720 */ | 165 | { USB_DEVICE(0x1199, 0x0218) }, /* Sierra Wireless MC5720 */ |
| 188 | { USB_DEVICE(0x0f30, 0x1b1d) }, /* Sierra Wireless MC5720 */ | 166 | { USB_DEVICE(0x0f30, 0x1b1d) }, /* Sierra Wireless MC5720 */ |
| 189 | { USB_DEVICE(0x1199, 0x0020) }, /* Sierra Wireless MC5725 */ | 167 | { USB_DEVICE(0x1199, 0x0020) }, /* Sierra Wireless MC5725 */ |
| 168 | { USB_DEVICE(0x1199, 0x0024) }, /* Sierra Wireless MC5727 */ | ||
| 190 | { USB_DEVICE(0x1199, 0x0220) }, /* Sierra Wireless MC5725 */ | 169 | { USB_DEVICE(0x1199, 0x0220) }, /* Sierra Wireless MC5725 */ |
| 191 | { USB_DEVICE(0x1199, 0x0019) }, /* Sierra Wireless AirCard 595 */ | 170 | { USB_DEVICE(0x1199, 0x0019) }, /* Sierra Wireless AirCard 595 */ |
| 192 | { USB_DEVICE(0x1199, 0x0021) }, /* Sierra Wireless AirCard 597E */ | 171 | { USB_DEVICE(0x1199, 0x0021) }, /* Sierra Wireless AirCard 597E */ |
| 193 | { USB_DEVICE(0x1199, 0x0120) }, /* Sierra Wireless USB Dongle 595U */ | 172 | { USB_DEVICE(0x1199, 0x0120) }, /* Sierra Wireless USB Dongle 595U */ |
| 194 | { USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x0023, 0xFF, 0xFF, 0xFF) }, /* Sierra Wireless C597 */ | 173 | /* Sierra Wireless C597 */ |
| 174 | { USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x0023, 0xFF, 0xFF, 0xFF) }, | ||
| 175 | /* Sierra Wireless Device */ | ||
| 176 | { USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x0025, 0xFF, 0xFF, 0xFF) }, | ||
| 177 | { USB_DEVICE(0x1199, 0x0026) }, /* Sierra Wireless Device */ | ||
| 195 | 178 | ||
| 196 | { USB_DEVICE(0x1199, 0x6802) }, /* Sierra Wireless MC8755 */ | 179 | { USB_DEVICE(0x1199, 0x6802) }, /* Sierra Wireless MC8755 */ |
| 197 | { USB_DEVICE(0x1199, 0x6804) }, /* Sierra Wireless MC8755 */ | 180 | { USB_DEVICE(0x1199, 0x6804) }, /* Sierra Wireless MC8755 */ |
| 198 | { USB_DEVICE(0x1199, 0x6803) }, /* Sierra Wireless MC8765 */ | 181 | { USB_DEVICE(0x1199, 0x6803) }, /* Sierra Wireless MC8765 */ |
| 199 | { USB_DEVICE(0x1199, 0x6812) }, /* Sierra Wireless MC8775 & AC 875U */ | 182 | { USB_DEVICE(0x1199, 0x6812) }, /* Sierra Wireless MC8775 & AC 875U */ |
| 200 | { USB_DEVICE(0x1199, 0x6813) }, /* Sierra Wireless MC8775 (Thinkpad internal) */ | 183 | { USB_DEVICE(0x1199, 0x6813) }, /* Sierra Wireless MC8775 (Lenovo) */ |
| 201 | { USB_DEVICE(0x1199, 0x6815) }, /* Sierra Wireless MC8775 */ | 184 | { USB_DEVICE(0x1199, 0x6815) }, /* Sierra Wireless MC8775 */ |
| 202 | { USB_DEVICE(0x03f0, 0x1e1d) }, /* HP hs2300 a.k.a MC8775 */ | 185 | { USB_DEVICE(0x03f0, 0x1e1d) }, /* HP hs2300 a.k.a MC8775 */ |
| 203 | { USB_DEVICE(0x1199, 0x6820) }, /* Sierra Wireless AirCard 875 */ | 186 | { USB_DEVICE(0x1199, 0x6820) }, /* Sierra Wireless AirCard 875 */ |
| 204 | { USB_DEVICE(0x1199, 0x6821) }, /* Sierra Wireless AirCard 875U */ | 187 | { USB_DEVICE(0x1199, 0x6821) }, /* Sierra Wireless AirCard 875U */ |
| 205 | { USB_DEVICE(0x1199, 0x6832) }, /* Sierra Wireless MC8780*/ | 188 | { USB_DEVICE(0x1199, 0x6832) }, /* Sierra Wireless MC8780 */ |
| 206 | { USB_DEVICE(0x1199, 0x6833) }, /* Sierra Wireless MC8781*/ | 189 | { USB_DEVICE(0x1199, 0x6833) }, /* Sierra Wireless MC8781 */ |
| 207 | { USB_DEVICE(0x1199, 0x683B), .driver_info = DEVICE_1_PORT }, /* Sierra Wireless MC8785 Composite*/ | 190 | { USB_DEVICE(0x1199, 0x683B) }, /* Sierra Wireless MC8785 Composite */ |
| 191 | { USB_DEVICE(0x1199, 0x683C) }, /* Sierra Wireless MC8790 */ | ||
| 192 | { USB_DEVICE(0x1199, 0x683D) }, /* Sierra Wireless MC8790 */ | ||
| 193 | { USB_DEVICE(0x1199, 0x683E) }, /* Sierra Wireless MC8790 */ | ||
| 208 | { USB_DEVICE(0x1199, 0x6850) }, /* Sierra Wireless AirCard 880 */ | 194 | { USB_DEVICE(0x1199, 0x6850) }, /* Sierra Wireless AirCard 880 */ |
| 209 | { USB_DEVICE(0x1199, 0x6851) }, /* Sierra Wireless AirCard 881 */ | 195 | { USB_DEVICE(0x1199, 0x6851) }, /* Sierra Wireless AirCard 881 */ |
| 210 | { USB_DEVICE(0x1199, 0x6852) }, /* Sierra Wireless AirCard 880 E */ | 196 | { USB_DEVICE(0x1199, 0x6852) }, /* Sierra Wireless AirCard 880 E */ |
| 211 | { USB_DEVICE(0x1199, 0x6853) }, /* Sierra Wireless AirCard 881 E */ | 197 | { USB_DEVICE(0x1199, 0x6853) }, /* Sierra Wireless AirCard 881 E */ |
| 212 | { USB_DEVICE(0x1199, 0x6855) }, /* Sierra Wireless AirCard 880 U */ | 198 | { USB_DEVICE(0x1199, 0x6855) }, /* Sierra Wireless AirCard 880 U */ |
| 213 | { USB_DEVICE(0x1199, 0x6856) }, /* Sierra Wireless AirCard 881 U */ | 199 | { USB_DEVICE(0x1199, 0x6856) }, /* Sierra Wireless AirCard 881 U */ |
| 214 | { USB_DEVICE(0x1199, 0x6859), .driver_info = DEVICE_1_PORT }, /* Sierra Wireless AirCard 885 E */ | 200 | { USB_DEVICE(0x1199, 0x6859) }, /* Sierra Wireless AirCard 885 E */ |
| 215 | { USB_DEVICE(0x1199, 0x685A), .driver_info = DEVICE_1_PORT }, /* Sierra Wireless AirCard 885 E */ | 201 | { USB_DEVICE(0x1199, 0x685A) }, /* Sierra Wireless AirCard 885 E */ |
| 216 | 202 | /* Sierra Wireless C885 */ | |
| 217 | { USB_DEVICE(0x1199, 0x6468) }, /* Sierra Wireless MP3G - EVDO */ | 203 | { USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x6880, 0xFF, 0xFF, 0xFF)}, |
| 218 | { USB_DEVICE(0x1199, 0x6469) }, /* Sierra Wireless MP3G - UMTS/HSPA */ | 204 | /* Sierra Wireless Device */ |
| 219 | 205 | { USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x6890, 0xFF, 0xFF, 0xFF)}, | |
| 220 | { USB_DEVICE(0x1199, 0x0112), .driver_info = DEVICE_1_PORT }, /* Sierra Wireless AirCard 580 */ | 206 | /* Sierra Wireless Device */ |
| 221 | { USB_DEVICE(0x0F3D, 0x0112), .driver_info = DEVICE_1_PORT }, /* Airprime/Sierra PC 5220 */ | 207 | { USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x6892, 0xFF, 0xFF, 0xFF)}, |
| 208 | |||
| 209 | { USB_DEVICE(0x1199, 0x0112) }, /* Sierra Wireless AirCard 580 */ | ||
| 210 | { USB_DEVICE(0x0F3D, 0x0112) }, /* Airprime/Sierra PC 5220 */ | ||
| 222 | 211 | ||
| 223 | { USB_DEVICE(0x1199, 0x0FFF), .driver_info = DEVICE_INSTALLER}, | ||
| 224 | { } | 212 | { } |
| 225 | }; | 213 | }; |
| 226 | MODULE_DEVICE_TABLE(usb, id_table); | 214 | MODULE_DEVICE_TABLE(usb, id_table); |
| @@ -268,13 +256,19 @@ static int sierra_send_setup(struct tty_struct *tty, | |||
| 268 | if (portdata->rts_state) | 256 | if (portdata->rts_state) |
| 269 | val |= 0x02; | 257 | val |= 0x02; |
| 270 | 258 | ||
| 271 | /* Determine which port is targeted */ | 259 | /* If composite device then properly report interface */ |
| 272 | if (port->bulk_out_endpointAddress == 2) | 260 | if (serial->num_ports == 1) |
| 273 | interface = 0; | 261 | interface = sierra_calc_interface(serial); |
| 274 | else if (port->bulk_out_endpointAddress == 4) | 262 | |
| 275 | interface = 1; | 263 | /* Otherwise the need to do non-composite mapping */ |
| 276 | else if (port->bulk_out_endpointAddress == 5) | 264 | else { |
| 277 | interface = 2; | 265 | if (port->bulk_out_endpointAddress == 2) |
| 266 | interface = 0; | ||
| 267 | else if (port->bulk_out_endpointAddress == 4) | ||
| 268 | interface = 1; | ||
| 269 | else if (port->bulk_out_endpointAddress == 5) | ||
| 270 | interface = 2; | ||
| 271 | } | ||
| 278 | 272 | ||
| 279 | return usb_control_msg(serial->dev, | 273 | return usb_control_msg(serial->dev, |
| 280 | usb_rcvctrlpipe(serial->dev, 0), | 274 | usb_rcvctrlpipe(serial->dev, 0), |
| @@ -713,7 +707,7 @@ static void sierra_shutdown(struct usb_serial *serial) | |||
| 713 | static struct usb_serial_driver sierra_device = { | 707 | static struct usb_serial_driver sierra_device = { |
| 714 | .driver = { | 708 | .driver = { |
| 715 | .owner = THIS_MODULE, | 709 | .owner = THIS_MODULE, |
| 716 | .name = "sierra1", | 710 | .name = "sierra", |
| 717 | }, | 711 | }, |
| 718 | .description = "Sierra USB modem", | 712 | .description = "Sierra USB modem", |
| 719 | .id_table = id_table, | 713 | .id_table = id_table, |
| @@ -769,14 +763,8 @@ MODULE_DESCRIPTION(DRIVER_DESC); | |||
| 769 | MODULE_VERSION(DRIVER_VERSION); | 763 | MODULE_VERSION(DRIVER_VERSION); |
| 770 | MODULE_LICENSE("GPL"); | 764 | MODULE_LICENSE("GPL"); |
| 771 | 765 | ||
| 772 | module_param(truinstall, bool, 0); | 766 | module_param(nmea, bool, S_IRUGO | S_IWUSR); |
| 773 | MODULE_PARM_DESC(truinstall, "TRU-Install support"); | ||
| 774 | |||
| 775 | module_param(nmea, bool, 0); | ||
| 776 | MODULE_PARM_DESC(nmea, "NMEA streaming"); | 767 | MODULE_PARM_DESC(nmea, "NMEA streaming"); |
| 777 | 768 | ||
| 778 | #ifdef CONFIG_USB_DEBUG | ||
| 779 | module_param(debug, bool, S_IRUGO | S_IWUSR); | 769 | module_param(debug, bool, S_IRUGO | S_IWUSR); |
| 780 | MODULE_PARM_DESC(debug, "Debug messages"); | 770 | MODULE_PARM_DESC(debug, "Debug messages"); |
| 781 | #endif | ||
| 782 | |||
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c index 8c2d531eedea..b157c48e8b78 100644 --- a/drivers/usb/serial/usb-serial.c +++ b/drivers/usb/serial/usb-serial.c | |||
| @@ -122,9 +122,6 @@ static void return_serial(struct usb_serial *serial) | |||
| 122 | 122 | ||
| 123 | dbg("%s", __func__); | 123 | dbg("%s", __func__); |
| 124 | 124 | ||
| 125 | if (serial == NULL) | ||
| 126 | return; | ||
| 127 | |||
| 128 | for (i = 0; i < serial->num_ports; ++i) | 125 | for (i = 0; i < serial->num_ports; ++i) |
| 129 | serial_table[serial->minor + i] = NULL; | 126 | serial_table[serial->minor + i] = NULL; |
| 130 | } | 127 | } |
| @@ -142,7 +139,8 @@ static void destroy_serial(struct kref *kref) | |||
| 142 | serial->type->shutdown(serial); | 139 | serial->type->shutdown(serial); |
| 143 | 140 | ||
| 144 | /* return the minor range that this device had */ | 141 | /* return the minor range that this device had */ |
| 145 | return_serial(serial); | 142 | if (serial->minor != SERIAL_TTY_NO_MINOR) |
| 143 | return_serial(serial); | ||
| 146 | 144 | ||
| 147 | for (i = 0; i < serial->num_ports; ++i) | 145 | for (i = 0; i < serial->num_ports; ++i) |
| 148 | serial->port[i]->port.count = 0; | 146 | serial->port[i]->port.count = 0; |
| @@ -575,6 +573,7 @@ static struct usb_serial *create_serial(struct usb_device *dev, | |||
| 575 | serial->interface = interface; | 573 | serial->interface = interface; |
| 576 | kref_init(&serial->kref); | 574 | kref_init(&serial->kref); |
| 577 | mutex_init(&serial->disc_mutex); | 575 | mutex_init(&serial->disc_mutex); |
| 576 | serial->minor = SERIAL_TTY_NO_MINOR; | ||
| 578 | 577 | ||
| 579 | return serial; | 578 | return serial; |
| 580 | } | 579 | } |
diff --git a/drivers/usb/storage/Kconfig b/drivers/usb/storage/Kconfig index 3d9249632ae1..c76034672c18 100644 --- a/drivers/usb/storage/Kconfig +++ b/drivers/usb/storage/Kconfig | |||
| @@ -146,6 +146,18 @@ config USB_STORAGE_KARMA | |||
| 146 | on the resulting scsi device node returns the Karma to normal | 146 | on the resulting scsi device node returns the Karma to normal |
| 147 | operation. | 147 | operation. |
| 148 | 148 | ||
| 149 | config USB_STORAGE_SIERRA | ||
| 150 | bool "Sierra Wireless TRU-Install Feature Support" | ||
| 151 | depends on USB_STORAGE | ||
| 152 | help | ||
| 153 | Say Y here to include additional code to support Sierra Wireless | ||
| 154 | products with the TRU-Install feature (e.g., AC597E, AC881U). | ||
| 155 | |||
| 156 | This code switches the Sierra Wireless device from being in | ||
| 157 | Mass Storage mode to Modem mode. It also has the ability to | ||
| 158 | support host software upgrades should full Linux support be added | ||
| 159 | to TRU-Install. | ||
| 160 | |||
| 149 | config USB_STORAGE_CYPRESS_ATACB | 161 | config USB_STORAGE_CYPRESS_ATACB |
| 150 | bool "SAT emulation on Cypress USB/ATA Bridge with ATACB" | 162 | bool "SAT emulation on Cypress USB/ATA Bridge with ATACB" |
| 151 | depends on USB_STORAGE | 163 | depends on USB_STORAGE |
diff --git a/drivers/usb/storage/Makefile b/drivers/usb/storage/Makefile index 4c596c766c53..bc3415b475c9 100644 --- a/drivers/usb/storage/Makefile +++ b/drivers/usb/storage/Makefile | |||
| @@ -21,6 +21,7 @@ usb-storage-obj-$(CONFIG_USB_STORAGE_JUMPSHOT) += jumpshot.o | |||
| 21 | usb-storage-obj-$(CONFIG_USB_STORAGE_ALAUDA) += alauda.o | 21 | usb-storage-obj-$(CONFIG_USB_STORAGE_ALAUDA) += alauda.o |
| 22 | usb-storage-obj-$(CONFIG_USB_STORAGE_ONETOUCH) += onetouch.o | 22 | usb-storage-obj-$(CONFIG_USB_STORAGE_ONETOUCH) += onetouch.o |
| 23 | usb-storage-obj-$(CONFIG_USB_STORAGE_KARMA) += karma.o | 23 | usb-storage-obj-$(CONFIG_USB_STORAGE_KARMA) += karma.o |
| 24 | usb-storage-obj-$(CONFIG_USB_STORAGE_SIERRA) += sierra_ms.o | ||
| 24 | usb-storage-obj-$(CONFIG_USB_STORAGE_CYPRESS_ATACB) += cypress_atacb.o | 25 | usb-storage-obj-$(CONFIG_USB_STORAGE_CYPRESS_ATACB) += cypress_atacb.o |
| 25 | 26 | ||
| 26 | usb-storage-objs := scsiglue.o protocol.o transport.o usb.o \ | 27 | usb-storage-objs := scsiglue.o protocol.o transport.o usb.o \ |
diff --git a/drivers/usb/storage/sierra_ms.c b/drivers/usb/storage/sierra_ms.c new file mode 100644 index 000000000000..4359a2cb42df --- /dev/null +++ b/drivers/usb/storage/sierra_ms.c | |||
| @@ -0,0 +1,207 @@ | |||
| 1 | #include <scsi/scsi.h> | ||
| 2 | #include <scsi/scsi_host.h> | ||
| 3 | #include <scsi/scsi_cmnd.h> | ||
| 4 | #include <scsi/scsi_device.h> | ||
| 5 | #include <linux/usb.h> | ||
| 6 | |||
| 7 | #include "usb.h" | ||
| 8 | #include "transport.h" | ||
| 9 | #include "protocol.h" | ||
| 10 | #include "scsiglue.h" | ||
| 11 | #include "sierra_ms.h" | ||
| 12 | #include "debug.h" | ||
| 13 | |||
| 14 | #define SWIMS_USB_REQUEST_SetSwocMode 0x0B | ||
| 15 | #define SWIMS_USB_REQUEST_GetSwocInfo 0x0A | ||
| 16 | #define SWIMS_USB_INDEX_SetMode 0x0000 | ||
| 17 | #define SWIMS_SET_MODE_Modem 0x0001 | ||
| 18 | |||
| 19 | #define TRU_NORMAL 0x01 | ||
| 20 | #define TRU_FORCE_MS 0x02 | ||
| 21 | #define TRU_FORCE_MODEM 0x03 | ||
| 22 | |||
| 23 | static unsigned int swi_tru_install = 1; | ||
| 24 | module_param(swi_tru_install, uint, S_IRUGO | S_IWUSR); | ||
| 25 | MODULE_PARM_DESC(swi_tru_install, "TRU-Install mode (1=Full Logic (def)," | ||
| 26 | " 2=Force CD-Rom, 3=Force Modem)"); | ||
| 27 | |||
| 28 | struct swoc_info { | ||
| 29 | __u8 rev; | ||
| 30 | __u8 reserved[8]; | ||
| 31 | __u16 LinuxSKU; | ||
| 32 | __u16 LinuxVer; | ||
| 33 | __u8 reserved2[47]; | ||
| 34 | } __attribute__((__packed__)); | ||
| 35 | |||
| 36 | static bool containsFullLinuxPackage(struct swoc_info *swocInfo) | ||
| 37 | { | ||
| 38 | if ((swocInfo->LinuxSKU >= 0x2100 && swocInfo->LinuxSKU <= 0x2FFF) || | ||
| 39 | (swocInfo->LinuxSKU >= 0x7100 && swocInfo->LinuxSKU <= 0x7FFF)) | ||
| 40 | return true; | ||
| 41 | else | ||
| 42 | return false; | ||
| 43 | } | ||
| 44 | |||
| 45 | static int sierra_set_ms_mode(struct usb_device *udev, __u16 eSWocMode) | ||
| 46 | { | ||
| 47 | int result; | ||
| 48 | US_DEBUGP("SWIMS: %s", "DEVICE MODE SWITCH\n"); | ||
| 49 | result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), | ||
| 50 | SWIMS_USB_REQUEST_SetSwocMode, /* __u8 request */ | ||
| 51 | USB_TYPE_VENDOR | USB_DIR_OUT, /* __u8 request type */ | ||
| 52 | eSWocMode, /* __u16 value */ | ||
| 53 | 0x0000, /* __u16 index */ | ||
| 54 | NULL, /* void *data */ | ||
| 55 | 0, /* __u16 size */ | ||
| 56 | USB_CTRL_SET_TIMEOUT); /* int timeout */ | ||
| 57 | return result; | ||
| 58 | } | ||
| 59 | |||
| 60 | |||
| 61 | static int sierra_get_swoc_info(struct usb_device *udev, | ||
| 62 | struct swoc_info *swocInfo) | ||
| 63 | { | ||
| 64 | int result; | ||
| 65 | |||
| 66 | US_DEBUGP("SWIMS: Attempting to get TRU-Install info.\n"); | ||
| 67 | |||
| 68 | result = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), | ||
| 69 | SWIMS_USB_REQUEST_GetSwocInfo, /* __u8 request */ | ||
| 70 | USB_TYPE_VENDOR | USB_DIR_IN, /* __u8 request type */ | ||
| 71 | 0, /* __u16 value */ | ||
| 72 | 0, /* __u16 index */ | ||
| 73 | (void *) swocInfo, /* void *data */ | ||
| 74 | sizeof(struct swoc_info), /* __u16 size */ | ||
| 75 | USB_CTRL_SET_TIMEOUT); /* int timeout */ | ||
| 76 | |||
| 77 | swocInfo->LinuxSKU = le16_to_cpu(swocInfo->LinuxSKU); | ||
| 78 | swocInfo->LinuxVer = le16_to_cpu(swocInfo->LinuxVer); | ||
| 79 | return result; | ||
| 80 | } | ||
| 81 | |||
| 82 | static void debug_swoc(struct swoc_info *swocInfo) | ||
| 83 | { | ||
| 84 | US_DEBUGP("SWIMS: SWoC Rev: %02d \n", swocInfo->rev); | ||
| 85 | US_DEBUGP("SWIMS: Linux SKU: %04X \n", swocInfo->LinuxSKU); | ||
| 86 | US_DEBUGP("SWIMS: Linux Version: %04X \n", swocInfo->LinuxVer); | ||
| 87 | } | ||
| 88 | |||
| 89 | |||
| 90 | static ssize_t show_truinst(struct device *dev, struct device_attribute *attr, | ||
| 91 | char *buf) | ||
| 92 | { | ||
| 93 | struct swoc_info *swocInfo; | ||
| 94 | struct usb_interface *intf = to_usb_interface(dev); | ||
| 95 | struct usb_device *udev = interface_to_usbdev(intf); | ||
| 96 | int result; | ||
| 97 | if (swi_tru_install == TRU_FORCE_MS) { | ||
| 98 | result = snprintf(buf, PAGE_SIZE, "Forced Mass Storage\n"); | ||
| 99 | } else { | ||
| 100 | swocInfo = kmalloc(sizeof(struct swoc_info), GFP_KERNEL); | ||
| 101 | if (!swocInfo) { | ||
| 102 | US_DEBUGP("SWIMS: Allocation failure\n"); | ||
| 103 | snprintf(buf, PAGE_SIZE, "Error\n"); | ||
| 104 | return -ENOMEM; | ||
| 105 | } | ||
| 106 | result = sierra_get_swoc_info(udev, swocInfo); | ||
| 107 | if (result < 0) { | ||
| 108 | US_DEBUGP("SWIMS: failed SWoC query\n"); | ||
| 109 | kfree(swocInfo); | ||
| 110 | snprintf(buf, PAGE_SIZE, "Error\n"); | ||
| 111 | return -EIO; | ||
| 112 | } | ||
| 113 | debug_swoc(swocInfo); | ||
| 114 | result = snprintf(buf, PAGE_SIZE, | ||
| 115 | "REV=%02d SKU=%04X VER=%04X\n", | ||
| 116 | swocInfo->rev, | ||
| 117 | swocInfo->LinuxSKU, | ||
| 118 | swocInfo->LinuxVer); | ||
| 119 | kfree(swocInfo); | ||
| 120 | } | ||
| 121 | return result; | ||
| 122 | } | ||
| 123 | static DEVICE_ATTR(truinst, S_IWUGO | S_IRUGO, show_truinst, NULL); | ||
| 124 | |||
| 125 | int sierra_ms_init(struct us_data *us) | ||
| 126 | { | ||
| 127 | int result, retries; | ||
| 128 | signed long delay_t; | ||
| 129 | struct swoc_info *swocInfo; | ||
| 130 | struct usb_device *udev; | ||
| 131 | struct Scsi_Host *sh; | ||
| 132 | struct scsi_device *sd; | ||
| 133 | |||
| 134 | delay_t = 2; | ||
| 135 | retries = 3; | ||
| 136 | result = 0; | ||
| 137 | udev = us->pusb_dev; | ||
| 138 | |||
| 139 | sh = us_to_host(us); | ||
| 140 | sd = scsi_get_host_dev(sh); | ||
| 141 | |||
| 142 | US_DEBUGP("SWIMS: sierra_ms_init called\n"); | ||
| 143 | |||
| 144 | /* Force Modem mode */ | ||
| 145 | if (swi_tru_install == TRU_FORCE_MODEM) { | ||
| 146 | US_DEBUGP("SWIMS: %s", "Forcing Modem Mode\n"); | ||
| 147 | result = sierra_set_ms_mode(udev, SWIMS_SET_MODE_Modem); | ||
| 148 | if (result < 0) | ||
| 149 | US_DEBUGP("SWIMS: Failed to switch to modem mode.\n"); | ||
| 150 | return -EIO; | ||
| 151 | } | ||
| 152 | /* Force Mass Storage mode (keep CD-Rom) */ | ||
| 153 | else if (swi_tru_install == TRU_FORCE_MS) { | ||
| 154 | US_DEBUGP("SWIMS: %s", "Forcing Mass Storage Mode\n"); | ||
| 155 | goto complete; | ||
| 156 | } | ||
| 157 | /* Normal TRU-Install Logic */ | ||
| 158 | else { | ||
| 159 | US_DEBUGP("SWIMS: %s", "Normal SWoC Logic\n"); | ||
| 160 | |||
| 161 | swocInfo = kmalloc(sizeof(struct swoc_info), | ||
| 162 | GFP_KERNEL); | ||
| 163 | if (!swocInfo) { | ||
| 164 | US_DEBUGP("SWIMS: %s", "Allocation failure\n"); | ||
| 165 | return -ENOMEM; | ||
| 166 | } | ||
| 167 | |||
| 168 | retries = 3; | ||
| 169 | do { | ||
| 170 | retries--; | ||
| 171 | result = sierra_get_swoc_info(udev, swocInfo); | ||
| 172 | if (result < 0) { | ||
| 173 | US_DEBUGP("SWIMS: %s", "Failed SWoC query\n"); | ||
| 174 | schedule_timeout_uninterruptible(2*HZ); | ||
| 175 | } | ||
| 176 | } while (retries && result < 0); | ||
| 177 | |||
| 178 | if (result < 0) { | ||
| 179 | US_DEBUGP("SWIMS: %s", | ||
| 180 | "Completely failed SWoC query\n"); | ||
| 181 | kfree(swocInfo); | ||
| 182 | return -EIO; | ||
| 183 | } | ||
| 184 | |||
| 185 | debug_swoc(swocInfo); | ||
| 186 | |||
| 187 | /* If there is not Linux software on the TRU-Install device | ||
| 188 | * then switch to modem mode | ||
| 189 | */ | ||
| 190 | if (!containsFullLinuxPackage(swocInfo)) { | ||
| 191 | US_DEBUGP("SWIMS: %s", | ||
| 192 | "Switching to Modem Mode\n"); | ||
| 193 | result = sierra_set_ms_mode(udev, | ||
| 194 | SWIMS_SET_MODE_Modem); | ||
| 195 | if (result < 0) | ||
| 196 | US_DEBUGP("SWIMS: Failed to switch modem\n"); | ||
| 197 | kfree(swocInfo); | ||
| 198 | return -EIO; | ||
| 199 | } | ||
| 200 | kfree(swocInfo); | ||
| 201 | } | ||
| 202 | complete: | ||
| 203 | result = device_create_file(&us->pusb_intf->dev, &dev_attr_truinst); | ||
| 204 | |||
| 205 | return USB_STOR_TRANSPORT_GOOD; | ||
| 206 | } | ||
| 207 | |||
diff --git a/drivers/usb/storage/sierra_ms.h b/drivers/usb/storage/sierra_ms.h new file mode 100644 index 000000000000..bb48634ac1fc --- /dev/null +++ b/drivers/usb/storage/sierra_ms.h | |||
| @@ -0,0 +1,4 @@ | |||
| 1 | #ifndef _SIERRA_MS_H_ | ||
| 2 | #define _SIERRA_MS_H_ | ||
| 3 | extern int sierra_ms_init(struct us_data *us); | ||
| 4 | #endif | ||
diff --git a/drivers/usb/storage/transport.c b/drivers/usb/storage/transport.c index fcbbfdb7b2b0..3523a0bfa0ff 100644 --- a/drivers/usb/storage/transport.c +++ b/drivers/usb/storage/transport.c | |||
| @@ -1032,8 +1032,21 @@ int usb_stor_Bulk_transport(struct scsi_cmnd *srb, struct us_data *us) | |||
| 1032 | 1032 | ||
| 1033 | /* try to compute the actual residue, based on how much data | 1033 | /* try to compute the actual residue, based on how much data |
| 1034 | * was really transferred and what the device tells us */ | 1034 | * was really transferred and what the device tells us */ |
| 1035 | if (residue) { | 1035 | if (residue && !(us->fflags & US_FL_IGNORE_RESIDUE)) { |
| 1036 | if (!(us->fflags & US_FL_IGNORE_RESIDUE)) { | 1036 | |
| 1037 | /* Heuristically detect devices that generate bogus residues | ||
| 1038 | * by seeing what happens with INQUIRY and READ CAPACITY | ||
| 1039 | * commands. | ||
| 1040 | */ | ||
| 1041 | if (bcs->Status == US_BULK_STAT_OK && | ||
| 1042 | scsi_get_resid(srb) == 0 && | ||
| 1043 | ((srb->cmnd[0] == INQUIRY && | ||
| 1044 | transfer_length == 36) || | ||
| 1045 | (srb->cmnd[0] == READ_CAPACITY && | ||
| 1046 | transfer_length == 8))) { | ||
| 1047 | us->fflags |= US_FL_IGNORE_RESIDUE; | ||
| 1048 | |||
| 1049 | } else { | ||
| 1037 | residue = min(residue, transfer_length); | 1050 | residue = min(residue, transfer_length); |
| 1038 | scsi_set_resid(srb, max(scsi_get_resid(srb), | 1051 | scsi_set_resid(srb, max(scsi_get_resid(srb), |
| 1039 | (int) residue)); | 1052 | (int) residue)); |
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h index 7ae69f55aa96..ba412e68d474 100644 --- a/drivers/usb/storage/unusual_devs.h +++ b/drivers/usb/storage/unusual_devs.h | |||
| @@ -225,6 +225,13 @@ UNUSUAL_DEV( 0x0421, 0x0495, 0x0370, 0x0370, | |||
| 225 | US_SC_DEVICE, US_PR_DEVICE, NULL, | 225 | US_SC_DEVICE, US_PR_DEVICE, NULL, |
| 226 | US_FL_MAX_SECTORS_64 ), | 226 | US_FL_MAX_SECTORS_64 ), |
| 227 | 227 | ||
| 228 | /* Reported by Cedric Godin <cedric@belbone.be> */ | ||
| 229 | UNUSUAL_DEV( 0x0421, 0x04b9, 0x0551, 0x0551, | ||
| 230 | "Nokia", | ||
| 231 | "5300", | ||
| 232 | US_SC_DEVICE, US_PR_DEVICE, NULL, | ||
| 233 | US_FL_FIX_CAPACITY ), | ||
| 234 | |||
| 228 | /* Reported by Olaf Hering <olh@suse.de> from novell bug #105878 */ | 235 | /* Reported by Olaf Hering <olh@suse.de> from novell bug #105878 */ |
| 229 | UNUSUAL_DEV( 0x0424, 0x0fdc, 0x0210, 0x0210, | 236 | UNUSUAL_DEV( 0x0424, 0x0fdc, 0x0210, 0x0210, |
| 230 | "SMSC", | 237 | "SMSC", |
| @@ -356,14 +363,14 @@ UNUSUAL_DEV( 0x04b0, 0x040f, 0x0100, 0x0200, | |||
| 356 | US_FL_FIX_CAPACITY), | 363 | US_FL_FIX_CAPACITY), |
| 357 | 364 | ||
| 358 | /* Reported by Emil Larsson <emil@swip.net> */ | 365 | /* Reported by Emil Larsson <emil@swip.net> */ |
| 359 | UNUSUAL_DEV( 0x04b0, 0x0411, 0x0100, 0x0110, | 366 | UNUSUAL_DEV( 0x04b0, 0x0411, 0x0100, 0x0111, |
| 360 | "NIKON", | 367 | "NIKON", |
| 361 | "NIKON DSC D80", | 368 | "NIKON DSC D80", |
| 362 | US_SC_DEVICE, US_PR_DEVICE, NULL, | 369 | US_SC_DEVICE, US_PR_DEVICE, NULL, |
| 363 | US_FL_FIX_CAPACITY), | 370 | US_FL_FIX_CAPACITY), |
| 364 | 371 | ||
| 365 | /* Reported by Ortwin Glueck <odi@odi.ch> */ | 372 | /* Reported by Ortwin Glueck <odi@odi.ch> */ |
| 366 | UNUSUAL_DEV( 0x04b0, 0x0413, 0x0110, 0x0110, | 373 | UNUSUAL_DEV( 0x04b0, 0x0413, 0x0110, 0x0111, |
| 367 | "NIKON", | 374 | "NIKON", |
| 368 | "NIKON DSC D40", | 375 | "NIKON DSC D40", |
| 369 | US_SC_DEVICE, US_PR_DEVICE, NULL, | 376 | US_SC_DEVICE, US_PR_DEVICE, NULL, |
| @@ -1185,6 +1192,13 @@ UNUSUAL_DEV( 0x07c4, 0xa400, 0x0000, 0xffff, | |||
| 1185 | US_SC_DEVICE, US_PR_DEVICE, NULL, | 1192 | US_SC_DEVICE, US_PR_DEVICE, NULL, |
| 1186 | US_FL_FIX_INQUIRY ), | 1193 | US_FL_FIX_INQUIRY ), |
| 1187 | 1194 | ||
| 1195 | /* Reported by Rauch Wolke <rauchwolke@gmx.net> */ | ||
| 1196 | UNUSUAL_DEV( 0x07c4, 0xa4a5, 0x0000, 0xffff, | ||
| 1197 | "Simple Tech/Datafab", | ||
| 1198 | "CF+SM Reader", | ||
| 1199 | US_SC_DEVICE, US_PR_DEVICE, NULL, | ||
| 1200 | US_FL_IGNORE_RESIDUE ), | ||
| 1201 | |||
| 1188 | /* Casio QV 2x00/3x00/4000/8000 digital still cameras are not conformant | 1202 | /* Casio QV 2x00/3x00/4000/8000 digital still cameras are not conformant |
| 1189 | * to the USB storage specification in two ways: | 1203 | * to the USB storage specification in two ways: |
| 1190 | * - They tell us they are using transport protocol CBI. In reality they | 1204 | * - They tell us they are using transport protocol CBI. In reality they |
| @@ -1562,6 +1576,7 @@ UNUSUAL_DEV( 0x10d6, 0x2200, 0x0100, 0x0100, | |||
| 1562 | US_SC_DEVICE, US_PR_DEVICE, NULL, | 1576 | US_SC_DEVICE, US_PR_DEVICE, NULL, |
| 1563 | 0), | 1577 | 0), |
| 1564 | 1578 | ||
| 1579 | #ifdef CONFIG_USB_STORAGE_SIERRA | ||
| 1565 | /* Reported by Kevin Lloyd <linux@sierrawireless.com> | 1580 | /* Reported by Kevin Lloyd <linux@sierrawireless.com> |
| 1566 | * Entry is needed for the initializer function override, | 1581 | * Entry is needed for the initializer function override, |
| 1567 | * which instructs the device to load as a modem | 1582 | * which instructs the device to load as a modem |
| @@ -1570,8 +1585,9 @@ UNUSUAL_DEV( 0x10d6, 0x2200, 0x0100, 0x0100, | |||
| 1570 | UNUSUAL_DEV( 0x1199, 0x0fff, 0x0000, 0x9999, | 1585 | UNUSUAL_DEV( 0x1199, 0x0fff, 0x0000, 0x9999, |
| 1571 | "Sierra Wireless", | 1586 | "Sierra Wireless", |
| 1572 | "USB MMC Storage", | 1587 | "USB MMC Storage", |
| 1573 | US_SC_DEVICE, US_PR_DEVICE, NULL, | 1588 | US_SC_DEVICE, US_PR_DEVICE, sierra_ms_init, |
| 1574 | US_FL_IGNORE_DEVICE), | 1589 | 0), |
| 1590 | #endif | ||
| 1575 | 1591 | ||
| 1576 | /* Reported by Jaco Kroon <jaco@kroon.co.za> | 1592 | /* Reported by Jaco Kroon <jaco@kroon.co.za> |
| 1577 | * The usb-storage module found on the Digitech GNX4 (and supposedly other | 1593 | * The usb-storage module found on the Digitech GNX4 (and supposedly other |
| @@ -1743,6 +1759,15 @@ UNUSUAL_DEV( 0x22b8, 0x4810, 0x0001, 0x0002, | |||
| 1743 | US_FL_FIX_CAPACITY), | 1759 | US_FL_FIX_CAPACITY), |
| 1744 | 1760 | ||
| 1745 | /* | 1761 | /* |
| 1762 | * Patch by Jost Diederichs <jost@qdusa.com> | ||
| 1763 | */ | ||
| 1764 | UNUSUAL_DEV(0x22b8, 0x6410, 0x0001, 0x9999, | ||
| 1765 | "Motorola Inc.", | ||
| 1766 | "Motorola Phone (RAZRV3xx)", | ||
| 1767 | US_SC_DEVICE, US_PR_DEVICE, NULL, | ||
| 1768 | US_FL_FIX_CAPACITY), | ||
| 1769 | |||
| 1770 | /* | ||
| 1746 | * Patch by Constantin Baranov <const@tltsu.ru> | 1771 | * Patch by Constantin Baranov <const@tltsu.ru> |
| 1747 | * Report by Andreas Koenecke. | 1772 | * Report by Andreas Koenecke. |
| 1748 | * Motorola ROKR Z6. | 1773 | * Motorola ROKR Z6. |
| @@ -1767,6 +1792,13 @@ UNUSUAL_DEV( 0x2770, 0x915d, 0x0010, 0x0010, | |||
| 1767 | US_SC_DEVICE, US_PR_DEVICE, NULL, | 1792 | US_SC_DEVICE, US_PR_DEVICE, NULL, |
| 1768 | US_FL_FIX_CAPACITY ), | 1793 | US_FL_FIX_CAPACITY ), |
| 1769 | 1794 | ||
| 1795 | /* Reported by Andrey Rahmatullin <wrar@altlinux.org> */ | ||
| 1796 | UNUSUAL_DEV( 0x4102, 0x1020, 0x0100, 0x0100, | ||
| 1797 | "iRiver", | ||
| 1798 | "MP3 T10", | ||
| 1799 | US_SC_DEVICE, US_PR_DEVICE, NULL, | ||
| 1800 | US_FL_IGNORE_RESIDUE ), | ||
| 1801 | |||
| 1770 | /* | 1802 | /* |
| 1771 | * David Härdeman <david@2gen.com> | 1803 | * David Härdeman <david@2gen.com> |
| 1772 | * The key makes the SCSI stack print confusing (but harmless) messages | 1804 | * The key makes the SCSI stack print confusing (but harmless) messages |
diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c index bfea851be985..73679aa506de 100644 --- a/drivers/usb/storage/usb.c +++ b/drivers/usb/storage/usb.c | |||
| @@ -102,6 +102,9 @@ | |||
| 102 | #ifdef CONFIG_USB_STORAGE_CYPRESS_ATACB | 102 | #ifdef CONFIG_USB_STORAGE_CYPRESS_ATACB |
| 103 | #include "cypress_atacb.h" | 103 | #include "cypress_atacb.h" |
| 104 | #endif | 104 | #endif |
| 105 | #ifdef CONFIG_USB_STORAGE_SIERRA | ||
| 106 | #include "sierra_ms.h" | ||
| 107 | #endif | ||
| 105 | 108 | ||
| 106 | /* Some informational data */ | 109 | /* Some informational data */ |
| 107 | MODULE_AUTHOR("Matthew Dharm <mdharm-usb@one-eyed-alien.net>"); | 110 | MODULE_AUTHOR("Matthew Dharm <mdharm-usb@one-eyed-alien.net>"); |
diff --git a/drivers/video/arkfb.c b/drivers/video/arkfb.c index 4bd569e479a7..314d18694b6a 100644 --- a/drivers/video/arkfb.c +++ b/drivers/video/arkfb.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * Code is based on s3fb | 11 | * Code is based on s3fb |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/version.h> | ||
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 17 | #include <linux/errno.h> | 16 | #include <linux/errno.h> |
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c index e7018a2f56af..9c5925927ece 100644 --- a/drivers/video/atmel_lcdfb.c +++ b/drivers/video/atmel_lcdfb.c | |||
| @@ -39,7 +39,9 @@ | |||
| 39 | #endif | 39 | #endif |
| 40 | 40 | ||
| 41 | #if defined(CONFIG_ARCH_AT91) | 41 | #if defined(CONFIG_ARCH_AT91) |
| 42 | #define ATMEL_LCDFB_FBINFO_DEFAULT FBINFO_DEFAULT | 42 | #define ATMEL_LCDFB_FBINFO_DEFAULT (FBINFO_DEFAULT \ |
| 43 | | FBINFO_PARTIAL_PAN_OK \ | ||
| 44 | | FBINFO_HWACCEL_YPAN) | ||
| 43 | 45 | ||
| 44 | static inline void atmel_lcdfb_update_dma2d(struct atmel_lcdfb_info *sinfo, | 46 | static inline void atmel_lcdfb_update_dma2d(struct atmel_lcdfb_info *sinfo, |
| 45 | struct fb_var_screeninfo *var) | 47 | struct fb_var_screeninfo *var) |
| @@ -177,7 +179,7 @@ static struct fb_fix_screeninfo atmel_lcdfb_fix __initdata = { | |||
| 177 | .type = FB_TYPE_PACKED_PIXELS, | 179 | .type = FB_TYPE_PACKED_PIXELS, |
| 178 | .visual = FB_VISUAL_TRUECOLOR, | 180 | .visual = FB_VISUAL_TRUECOLOR, |
| 179 | .xpanstep = 0, | 181 | .xpanstep = 0, |
| 180 | .ypanstep = 0, | 182 | .ypanstep = 1, |
| 181 | .ywrapstep = 0, | 183 | .ywrapstep = 0, |
| 182 | .accel = FB_ACCEL_NONE, | 184 | .accel = FB_ACCEL_NONE, |
| 183 | }; | 185 | }; |
| @@ -240,9 +242,11 @@ static int atmel_lcdfb_alloc_video_memory(struct atmel_lcdfb_info *sinfo) | |||
| 240 | { | 242 | { |
| 241 | struct fb_info *info = sinfo->info; | 243 | struct fb_info *info = sinfo->info; |
| 242 | struct fb_var_screeninfo *var = &info->var; | 244 | struct fb_var_screeninfo *var = &info->var; |
| 245 | unsigned int smem_len; | ||
| 243 | 246 | ||
| 244 | info->fix.smem_len = (var->xres_virtual * var->yres_virtual | 247 | smem_len = (var->xres_virtual * var->yres_virtual |
| 245 | * ((var->bits_per_pixel + 7) / 8)); | 248 | * ((var->bits_per_pixel + 7) / 8)); |
| 249 | info->fix.smem_len = max(smem_len, sinfo->smem_len); | ||
| 246 | 250 | ||
| 247 | info->screen_base = dma_alloc_writecombine(info->device, info->fix.smem_len, | 251 | info->screen_base = dma_alloc_writecombine(info->device, info->fix.smem_len, |
| 248 | (dma_addr_t *)&info->fix.smem_start, GFP_KERNEL); | 252 | (dma_addr_t *)&info->fix.smem_start, GFP_KERNEL); |
| @@ -794,6 +798,7 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev) | |||
| 794 | sinfo->default_monspecs = pdata_sinfo->default_monspecs; | 798 | sinfo->default_monspecs = pdata_sinfo->default_monspecs; |
| 795 | sinfo->atmel_lcdfb_power_control = pdata_sinfo->atmel_lcdfb_power_control; | 799 | sinfo->atmel_lcdfb_power_control = pdata_sinfo->atmel_lcdfb_power_control; |
| 796 | sinfo->guard_time = pdata_sinfo->guard_time; | 800 | sinfo->guard_time = pdata_sinfo->guard_time; |
| 801 | sinfo->smem_len = pdata_sinfo->smem_len; | ||
| 797 | sinfo->lcdcon_is_backlight = pdata_sinfo->lcdcon_is_backlight; | 802 | sinfo->lcdcon_is_backlight = pdata_sinfo->lcdcon_is_backlight; |
| 798 | sinfo->lcd_wiring_mode = pdata_sinfo->lcd_wiring_mode; | 803 | sinfo->lcd_wiring_mode = pdata_sinfo->lcd_wiring_mode; |
| 799 | } else { | 804 | } else { |
diff --git a/drivers/video/aty/radeon_accel.c b/drivers/video/aty/radeon_accel.c index 4d13f68436e6..aa95f8350242 100644 --- a/drivers/video/aty/radeon_accel.c +++ b/drivers/video/aty/radeon_accel.c | |||
| @@ -55,6 +55,10 @@ static void radeonfb_prim_fillrect(struct radeonfb_info *rinfo, | |||
| 55 | OUTREG(DP_WRITE_MSK, 0xffffffff); | 55 | OUTREG(DP_WRITE_MSK, 0xffffffff); |
| 56 | OUTREG(DP_CNTL, (DST_X_LEFT_TO_RIGHT | DST_Y_TOP_TO_BOTTOM)); | 56 | OUTREG(DP_CNTL, (DST_X_LEFT_TO_RIGHT | DST_Y_TOP_TO_BOTTOM)); |
| 57 | 57 | ||
| 58 | radeon_fifo_wait(2); | ||
| 59 | OUTREG(DSTCACHE_CTLSTAT, RB2D_DC_FLUSH_ALL); | ||
| 60 | OUTREG(WAIT_UNTIL, (WAIT_2D_IDLECLEAN | WAIT_DMA_GUI_IDLE)); | ||
| 61 | |||
| 58 | radeon_fifo_wait(2); | 62 | radeon_fifo_wait(2); |
| 59 | OUTREG(DST_Y_X, (region->dy << 16) | region->dx); | 63 | OUTREG(DST_Y_X, (region->dy << 16) | region->dx); |
| 60 | OUTREG(DST_WIDTH_HEIGHT, (region->width << 16) | region->height); | 64 | OUTREG(DST_WIDTH_HEIGHT, (region->width << 16) | region->height); |
| @@ -116,6 +120,10 @@ static void radeonfb_prim_copyarea(struct radeonfb_info *rinfo, | |||
| 116 | OUTREG(DP_CNTL, (xdir>=0 ? DST_X_LEFT_TO_RIGHT : 0) | 120 | OUTREG(DP_CNTL, (xdir>=0 ? DST_X_LEFT_TO_RIGHT : 0) |
| 117 | | (ydir>=0 ? DST_Y_TOP_TO_BOTTOM : 0)); | 121 | | (ydir>=0 ? DST_Y_TOP_TO_BOTTOM : 0)); |
| 118 | 122 | ||
| 123 | radeon_fifo_wait(2); | ||
| 124 | OUTREG(DSTCACHE_CTLSTAT, RB2D_DC_FLUSH_ALL); | ||
| 125 | OUTREG(WAIT_UNTIL, (WAIT_2D_IDLECLEAN | WAIT_DMA_GUI_IDLE)); | ||
| 126 | |||
| 119 | radeon_fifo_wait(3); | 127 | radeon_fifo_wait(3); |
| 120 | OUTREG(SRC_Y_X, (sy << 16) | sx); | 128 | OUTREG(SRC_Y_X, (sy << 16) | sx); |
| 121 | OUTREG(DST_Y_X, (dy << 16) | dx); | 129 | OUTREG(DST_Y_X, (dy << 16) | dx); |
diff --git a/drivers/video/bf54x-lq043fb.c b/drivers/video/bf54x-lq043fb.c index 940467aed13f..7644ed249564 100644 --- a/drivers/video/bf54x-lq043fb.c +++ b/drivers/video/bf54x-lq043fb.c | |||
| @@ -58,7 +58,7 @@ | |||
| 58 | #include <asm/gpio.h> | 58 | #include <asm/gpio.h> |
| 59 | #include <asm/portmux.h> | 59 | #include <asm/portmux.h> |
| 60 | 60 | ||
| 61 | #include <asm/mach/bf54x-lq043.h> | 61 | #include <mach/bf54x-lq043.h> |
| 62 | 62 | ||
| 63 | #define NO_BL_SUPPORT | 63 | #define NO_BL_SUPPORT |
| 64 | 64 | ||
| @@ -733,7 +733,6 @@ static int bfin_bf54x_remove(struct platform_device *pdev) | |||
| 733 | static int bfin_bf54x_suspend(struct platform_device *pdev, pm_message_t state) | 733 | static int bfin_bf54x_suspend(struct platform_device *pdev, pm_message_t state) |
| 734 | { | 734 | { |
| 735 | struct fb_info *fbinfo = platform_get_drvdata(pdev); | 735 | struct fb_info *fbinfo = platform_get_drvdata(pdev); |
| 736 | struct bfin_bf54xfb_info *info = fbinfo->par; | ||
| 737 | 736 | ||
| 738 | bfin_write_EPPI0_CONTROL(bfin_read_EPPI0_CONTROL() & ~EPPI_EN); | 737 | bfin_write_EPPI0_CONTROL(bfin_read_EPPI0_CONTROL() & ~EPPI_EN); |
| 739 | disable_dma(CH_EPPI0); | 738 | disable_dma(CH_EPPI0); |
| @@ -747,8 +746,18 @@ static int bfin_bf54x_resume(struct platform_device *pdev) | |||
| 747 | struct fb_info *fbinfo = platform_get_drvdata(pdev); | 746 | struct fb_info *fbinfo = platform_get_drvdata(pdev); |
| 748 | struct bfin_bf54xfb_info *info = fbinfo->par; | 747 | struct bfin_bf54xfb_info *info = fbinfo->par; |
| 749 | 748 | ||
| 750 | enable_dma(CH_EPPI0); | 749 | if (info->lq043_open_cnt) { |
| 751 | bfin_write_EPPI0_CONTROL(bfin_read_EPPI0_CONTROL() | EPPI_EN); | 750 | |
| 751 | bfin_write_EPPI0_CONTROL(0); | ||
| 752 | SSYNC(); | ||
| 753 | |||
| 754 | config_dma(info); | ||
| 755 | config_ppi(info); | ||
| 756 | |||
| 757 | /* start dma */ | ||
| 758 | enable_dma(CH_EPPI0); | ||
| 759 | bfin_write_EPPI0_CONTROL(bfin_read_EPPI0_CONTROL() | EPPI_EN); | ||
| 760 | } | ||
| 752 | 761 | ||
| 753 | return 0; | 762 | return 0; |
| 754 | } | 763 | } |
diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c index c14b2435d23e..e729fb279645 100644 --- a/drivers/video/cirrusfb.c +++ b/drivers/video/cirrusfb.c | |||
| @@ -628,27 +628,18 @@ static long cirrusfb_get_mclk(long freq, int bpp, long *div) | |||
| 628 | static int cirrusfb_check_var(struct fb_var_screeninfo *var, | 628 | static int cirrusfb_check_var(struct fb_var_screeninfo *var, |
| 629 | struct fb_info *info) | 629 | struct fb_info *info) |
| 630 | { | 630 | { |
| 631 | int nom, den; /* translyting from pixels->bytes */ | 631 | int yres; |
| 632 | int yres, i; | 632 | /* memory size in pixels */ |
| 633 | static struct { int xres, yres; } modes[] = | 633 | unsigned pixels = info->screen_size * 8 / var->bits_per_pixel; |
| 634 | { { 1600, 1280 }, | ||
| 635 | { 1280, 1024 }, | ||
| 636 | { 1024, 768 }, | ||
| 637 | { 800, 600 }, | ||
| 638 | { 640, 480 }, | ||
| 639 | { -1, -1 } }; | ||
| 640 | 634 | ||
| 641 | switch (var->bits_per_pixel) { | 635 | switch (var->bits_per_pixel) { |
| 642 | case 1: | 636 | case 1: |
| 643 | nom = 4; | 637 | pixels /= 4; |
| 644 | den = 8; | ||
| 645 | break; /* 8 pixel per byte, only 1/4th of mem usable */ | 638 | break; /* 8 pixel per byte, only 1/4th of mem usable */ |
| 646 | case 8: | 639 | case 8: |
| 647 | case 16: | 640 | case 16: |
| 648 | case 24: | 641 | case 24: |
| 649 | case 32: | 642 | case 32: |
| 650 | nom = var->bits_per_pixel / 8; | ||
| 651 | den = 1; | ||
| 652 | break; /* 1 pixel == 1 byte */ | 643 | break; /* 1 pixel == 1 byte */ |
| 653 | default: | 644 | default: |
| 654 | printk(KERN_ERR "cirrusfb: mode %dx%dx%d rejected..." | 645 | printk(KERN_ERR "cirrusfb: mode %dx%dx%d rejected..." |
| @@ -658,43 +649,29 @@ static int cirrusfb_check_var(struct fb_var_screeninfo *var, | |||
| 658 | return -EINVAL; | 649 | return -EINVAL; |
| 659 | } | 650 | } |
| 660 | 651 | ||
| 661 | if (var->xres * nom / den * var->yres > info->screen_size) { | 652 | if (var->xres_virtual < var->xres) |
| 662 | printk(KERN_ERR "cirrusfb: mode %dx%dx%d rejected..." | 653 | var->xres_virtual = var->xres; |
| 663 | "resolution too high to fit into video memory!\n", | ||
| 664 | var->xres, var->yres, var->bits_per_pixel); | ||
| 665 | DPRINTK("EXIT - EINVAL error\n"); | ||
| 666 | return -EINVAL; | ||
| 667 | } | ||
| 668 | |||
| 669 | /* use highest possible virtual resolution */ | 654 | /* use highest possible virtual resolution */ |
| 670 | if (var->xres_virtual == -1 && | 655 | if (var->yres_virtual == -1) { |
| 671 | var->yres_virtual == -1) { | 656 | var->yres_virtual = pixels / var->xres_virtual; |
| 672 | printk(KERN_INFO | ||
| 673 | "cirrusfb: using maximum available virtual resolution\n"); | ||
| 674 | for (i = 0; modes[i].xres != -1; i++) { | ||
| 675 | int size = modes[i].xres * nom / den * modes[i].yres; | ||
| 676 | if (size < info->screen_size / 2) | ||
| 677 | break; | ||
| 678 | } | ||
| 679 | if (modes[i].xres == -1) { | ||
| 680 | printk(KERN_ERR "cirrusfb: could not find a virtual " | ||
| 681 | "resolution that fits into video memory!!\n"); | ||
| 682 | DPRINTK("EXIT - EINVAL error\n"); | ||
| 683 | return -EINVAL; | ||
| 684 | } | ||
| 685 | var->xres_virtual = modes[i].xres; | ||
| 686 | var->yres_virtual = modes[i].yres; | ||
| 687 | 657 | ||
| 688 | printk(KERN_INFO "cirrusfb: virtual resolution set to " | 658 | printk(KERN_INFO "cirrusfb: virtual resolution set to " |
| 689 | "maximum of %dx%d\n", var->xres_virtual, | 659 | "maximum of %dx%d\n", var->xres_virtual, |
| 690 | var->yres_virtual); | 660 | var->yres_virtual); |
| 691 | } | 661 | } |
| 692 | |||
| 693 | if (var->xres_virtual < var->xres) | ||
| 694 | var->xres_virtual = var->xres; | ||
| 695 | if (var->yres_virtual < var->yres) | 662 | if (var->yres_virtual < var->yres) |
| 696 | var->yres_virtual = var->yres; | 663 | var->yres_virtual = var->yres; |
| 697 | 664 | ||
| 665 | if (var->xres_virtual * var->yres_virtual > pixels) { | ||
| 666 | printk(KERN_ERR "cirrusfb: mode %dx%dx%d rejected... " | ||
| 667 | "virtual resolution too high to fit into video memory!\n", | ||
| 668 | var->xres_virtual, var->yres_virtual, | ||
| 669 | var->bits_per_pixel); | ||
| 670 | DPRINTK("EXIT - EINVAL error\n"); | ||
| 671 | return -EINVAL; | ||
| 672 | } | ||
| 673 | |||
| 674 | |||
| 698 | if (var->xoffset < 0) | 675 | if (var->xoffset < 0) |
| 699 | var->xoffset = 0; | 676 | var->xoffset = 0; |
| 700 | if (var->yoffset < 0) | 677 | if (var->yoffset < 0) |
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c index 33859934a8e4..c6299e8a041d 100644 --- a/drivers/video/console/fbcon.c +++ b/drivers/video/console/fbcon.c | |||
| @@ -2518,7 +2518,7 @@ static int fbcon_do_set_font(struct vc_data *vc, int w, int h, | |||
| 2518 | c = vc->vc_video_erase_char; | 2518 | c = vc->vc_video_erase_char; |
| 2519 | vc->vc_video_erase_char = | 2519 | vc->vc_video_erase_char = |
| 2520 | ((c & 0xfe00) >> 1) | (c & 0xff); | 2520 | ((c & 0xfe00) >> 1) | (c & 0xff); |
| 2521 | c = vc->vc_def_color; | 2521 | c = vc->vc_scrl_erase_char; |
| 2522 | vc->vc_scrl_erase_char = | 2522 | vc->vc_scrl_erase_char = |
| 2523 | ((c & 0xFE00) >> 1) | (c & 0xFF); | 2523 | ((c & 0xFE00) >> 1) | (c & 0xFF); |
| 2524 | vc->vc_attr >>= 1; | 2524 | vc->vc_attr >>= 1; |
| @@ -2551,7 +2551,7 @@ static int fbcon_do_set_font(struct vc_data *vc, int w, int h, | |||
| 2551 | if (vc->vc_can_do_color) { | 2551 | if (vc->vc_can_do_color) { |
| 2552 | vc->vc_video_erase_char = | 2552 | vc->vc_video_erase_char = |
| 2553 | ((c & 0xff00) << 1) | (c & 0xff); | 2553 | ((c & 0xff00) << 1) | (c & 0xff); |
| 2554 | c = vc->vc_def_color; | 2554 | c = vc->vc_scrl_erase_char; |
| 2555 | vc->vc_scrl_erase_char = | 2555 | vc->vc_scrl_erase_char = |
| 2556 | ((c & 0xFF00) << 1) | (c & 0xFF); | 2556 | ((c & 0xFF00) << 1) | (c & 0xFF); |
| 2557 | vc->vc_attr <<= 1; | 2557 | vc->vc_attr <<= 1; |
diff --git a/drivers/video/fb_defio.c b/drivers/video/fb_defio.c index 59df132cc375..4835bdc4e9f1 100644 --- a/drivers/video/fb_defio.c +++ b/drivers/video/fb_defio.c | |||
| @@ -114,6 +114,17 @@ static struct vm_operations_struct fb_deferred_io_vm_ops = { | |||
| 114 | .page_mkwrite = fb_deferred_io_mkwrite, | 114 | .page_mkwrite = fb_deferred_io_mkwrite, |
| 115 | }; | 115 | }; |
| 116 | 116 | ||
| 117 | static int fb_deferred_io_set_page_dirty(struct page *page) | ||
| 118 | { | ||
| 119 | if (!PageDirty(page)) | ||
| 120 | SetPageDirty(page); | ||
| 121 | return 0; | ||
| 122 | } | ||
| 123 | |||
| 124 | static const struct address_space_operations fb_deferred_io_aops = { | ||
| 125 | .set_page_dirty = fb_deferred_io_set_page_dirty, | ||
| 126 | }; | ||
| 127 | |||
| 117 | static int fb_deferred_io_mmap(struct fb_info *info, struct vm_area_struct *vma) | 128 | static int fb_deferred_io_mmap(struct fb_info *info, struct vm_area_struct *vma) |
| 118 | { | 129 | { |
| 119 | vma->vm_ops = &fb_deferred_io_vm_ops; | 130 | vma->vm_ops = &fb_deferred_io_vm_ops; |
| @@ -163,6 +174,14 @@ void fb_deferred_io_init(struct fb_info *info) | |||
| 163 | } | 174 | } |
| 164 | EXPORT_SYMBOL_GPL(fb_deferred_io_init); | 175 | EXPORT_SYMBOL_GPL(fb_deferred_io_init); |
| 165 | 176 | ||
| 177 | void fb_deferred_io_open(struct fb_info *info, | ||
| 178 | struct inode *inode, | ||
| 179 | struct file *file) | ||
| 180 | { | ||
| 181 | file->f_mapping->a_ops = &fb_deferred_io_aops; | ||
| 182 | } | ||
| 183 | EXPORT_SYMBOL_GPL(fb_deferred_io_open); | ||
| 184 | |||
| 166 | void fb_deferred_io_cleanup(struct fb_info *info) | 185 | void fb_deferred_io_cleanup(struct fb_info *info) |
| 167 | { | 186 | { |
| 168 | void *screen_base = (void __force *) info->screen_base; | 187 | void *screen_base = (void __force *) info->screen_base; |
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c index 6b487801eeae..98843c2ecf73 100644 --- a/drivers/video/fbmem.c +++ b/drivers/video/fbmem.c | |||
| @@ -1344,6 +1344,10 @@ fb_open(struct inode *inode, struct file *file) | |||
| 1344 | if (res) | 1344 | if (res) |
| 1345 | module_put(info->fbops->owner); | 1345 | module_put(info->fbops->owner); |
| 1346 | } | 1346 | } |
| 1347 | #ifdef CONFIG_FB_DEFERRED_IO | ||
| 1348 | if (info->fbdefio) | ||
| 1349 | fb_deferred_io_open(info, inode, file); | ||
| 1350 | #endif | ||
| 1347 | out: | 1351 | out: |
| 1348 | unlock_kernel(); | 1352 | unlock_kernel(); |
| 1349 | return res; | 1353 | return res; |
diff --git a/drivers/video/fsl-diu-fb.c b/drivers/video/fsl-diu-fb.c index bd320a2bfb7c..fb51197d1c98 100644 --- a/drivers/video/fsl-diu-fb.c +++ b/drivers/video/fsl-diu-fb.c | |||
| @@ -479,6 +479,10 @@ static void adjust_aoi_size_position(struct fb_var_screeninfo *var, | |||
| 479 | base_plane_width = machine_data->fsl_diu_info[0]->var.xres; | 479 | base_plane_width = machine_data->fsl_diu_info[0]->var.xres; |
| 480 | base_plane_height = machine_data->fsl_diu_info[0]->var.yres; | 480 | base_plane_height = machine_data->fsl_diu_info[0]->var.yres; |
| 481 | 481 | ||
| 482 | if (mfbi->x_aoi_d < 0) | ||
| 483 | mfbi->x_aoi_d = 0; | ||
| 484 | if (mfbi->y_aoi_d < 0) | ||
| 485 | mfbi->y_aoi_d = 0; | ||
| 482 | switch (index) { | 486 | switch (index) { |
| 483 | case 0: | 487 | case 0: |
| 484 | if (mfbi->x_aoi_d != 0) | 488 | if (mfbi->x_aoi_d != 0) |
| @@ -778,6 +782,22 @@ static void unmap_video_memory(struct fb_info *info) | |||
| 778 | } | 782 | } |
| 779 | 783 | ||
| 780 | /* | 784 | /* |
| 785 | * Using the fb_var_screeninfo in fb_info we set the aoi of this | ||
| 786 | * particular framebuffer. It is a light version of fsl_diu_set_par. | ||
| 787 | */ | ||
| 788 | static int fsl_diu_set_aoi(struct fb_info *info) | ||
| 789 | { | ||
| 790 | struct fb_var_screeninfo *var = &info->var; | ||
| 791 | struct mfb_info *mfbi = info->par; | ||
| 792 | struct diu_ad *ad = mfbi->ad; | ||
| 793 | |||
| 794 | /* AOI should not be greater than display size */ | ||
| 795 | ad->offset_xyi = cpu_to_le32((var->yoffset << 16) | var->xoffset); | ||
| 796 | ad->offset_xyd = cpu_to_le32((mfbi->y_aoi_d << 16) | mfbi->x_aoi_d); | ||
| 797 | return 0; | ||
| 798 | } | ||
| 799 | |||
| 800 | /* | ||
| 781 | * Using the fb_var_screeninfo in fb_info we set the resolution of this | 801 | * Using the fb_var_screeninfo in fb_info we set the resolution of this |
| 782 | * particular framebuffer. This function alters the fb_fix_screeninfo stored | 802 | * particular framebuffer. This function alters the fb_fix_screeninfo stored |
| 783 | * in fb_info. It does not alter var in fb_info since we are using that | 803 | * in fb_info. It does not alter var in fb_info since we are using that |
| @@ -817,11 +837,11 @@ static int fsl_diu_set_par(struct fb_info *info) | |||
| 817 | diu_ops.get_pixel_format(var->bits_per_pixel, | 837 | diu_ops.get_pixel_format(var->bits_per_pixel, |
| 818 | machine_data->monitor_port); | 838 | machine_data->monitor_port); |
| 819 | ad->addr = cpu_to_le32(info->fix.smem_start); | 839 | ad->addr = cpu_to_le32(info->fix.smem_start); |
| 820 | ad->src_size_g_alpha = cpu_to_le32((var->yres << 12) | | 840 | ad->src_size_g_alpha = cpu_to_le32((var->yres_virtual << 12) | |
| 821 | var->xres) | mfbi->g_alpha; | 841 | var->xres_virtual) | mfbi->g_alpha; |
| 822 | /* fix me. AOI should not be greater than display size */ | 842 | /* AOI should not be greater than display size */ |
| 823 | ad->aoi_size = cpu_to_le32((var->yres << 16) | var->xres); | 843 | ad->aoi_size = cpu_to_le32((var->yres << 16) | var->xres); |
| 824 | ad->offset_xyi = 0; | 844 | ad->offset_xyi = cpu_to_le32((var->yoffset << 16) | var->xoffset); |
| 825 | ad->offset_xyd = cpu_to_le32((mfbi->y_aoi_d << 16) | mfbi->x_aoi_d); | 845 | ad->offset_xyd = cpu_to_le32((mfbi->y_aoi_d << 16) | mfbi->x_aoi_d); |
| 826 | 846 | ||
| 827 | /* Disable chroma keying function */ | 847 | /* Disable chroma keying function */ |
| @@ -921,6 +941,8 @@ static int fsl_diu_pan_display(struct fb_var_screeninfo *var, | |||
| 921 | else | 941 | else |
| 922 | info->var.vmode &= ~FB_VMODE_YWRAP; | 942 | info->var.vmode &= ~FB_VMODE_YWRAP; |
| 923 | 943 | ||
| 944 | fsl_diu_set_aoi(info); | ||
| 945 | |||
| 924 | return 0; | 946 | return 0; |
| 925 | } | 947 | } |
| 926 | 948 | ||
| @@ -989,7 +1011,7 @@ static int fsl_diu_ioctl(struct fb_info *info, unsigned int cmd, | |||
| 989 | pr_debug("set AOI display offset of index %d to (%d,%d)\n", | 1011 | pr_debug("set AOI display offset of index %d to (%d,%d)\n", |
| 990 | mfbi->index, aoi_d.x_aoi_d, aoi_d.y_aoi_d); | 1012 | mfbi->index, aoi_d.x_aoi_d, aoi_d.y_aoi_d); |
| 991 | fsl_diu_check_var(&info->var, info); | 1013 | fsl_diu_check_var(&info->var, info); |
| 992 | fsl_diu_set_par(info); | 1014 | fsl_diu_set_aoi(info); |
| 993 | break; | 1015 | break; |
| 994 | case MFB_GET_AOID: | 1016 | case MFB_GET_AOID: |
| 995 | aoi_d.x_aoi_d = mfbi->x_aoi_d; | 1017 | aoi_d.x_aoi_d = mfbi->x_aoi_d; |
diff --git a/drivers/video/matrox/i2c-matroxfb.c b/drivers/video/matrox/i2c-matroxfb.c index 75ee5a12e549..c14e3e2212b3 100644 --- a/drivers/video/matrox/i2c-matroxfb.c +++ b/drivers/video/matrox/i2c-matroxfb.c | |||
| @@ -87,13 +87,7 @@ static int matroxfb_gpio_getscl(void* data) { | |||
| 87 | return (matroxfb_read_gpio(b->minfo) & b->mask.clock) ? 1 : 0; | 87 | return (matroxfb_read_gpio(b->minfo) & b->mask.clock) ? 1 : 0; |
| 88 | } | 88 | } |
| 89 | 89 | ||
| 90 | static struct i2c_adapter matrox_i2c_adapter_template = | 90 | static const struct i2c_algo_bit_data matrox_i2c_algo_template = |
| 91 | { | ||
| 92 | .owner = THIS_MODULE, | ||
| 93 | .id = I2C_HW_B_G400, | ||
| 94 | }; | ||
| 95 | |||
| 96 | static struct i2c_algo_bit_data matrox_i2c_algo_template = | ||
| 97 | { | 91 | { |
| 98 | .setsda = matroxfb_gpio_setsda, | 92 | .setsda = matroxfb_gpio_setsda, |
| 99 | .setscl = matroxfb_gpio_setscl, | 93 | .setscl = matroxfb_gpio_setscl, |
| @@ -112,7 +106,7 @@ static int i2c_bus_reg(struct i2c_bit_adapter* b, struct matrox_fb_info* minfo, | |||
| 112 | b->minfo = minfo; | 106 | b->minfo = minfo; |
| 113 | b->mask.data = data; | 107 | b->mask.data = data; |
| 114 | b->mask.clock = clock; | 108 | b->mask.clock = clock; |
| 115 | b->adapter = matrox_i2c_adapter_template; | 109 | b->adapter.owner = THIS_MODULE; |
| 116 | snprintf(b->adapter.name, sizeof(b->adapter.name), name, | 110 | snprintf(b->adapter.name, sizeof(b->adapter.name), name, |
| 117 | minfo->fbcon.node); | 111 | minfo->fbcon.node); |
| 118 | i2c_set_adapdata(&b->adapter, b); | 112 | i2c_set_adapdata(&b->adapter, b); |
| @@ -187,6 +181,17 @@ static void* i2c_matroxfb_probe(struct matrox_fb_info* minfo) { | |||
| 187 | MAT_DATA, MAT_CLK, "MAVEN:fb%u", 0); | 181 | MAT_DATA, MAT_CLK, "MAVEN:fb%u", 0); |
| 188 | if (err) | 182 | if (err) |
| 189 | printk(KERN_INFO "i2c-matroxfb: Could not register Maven i2c bus. Continuing anyway.\n"); | 183 | printk(KERN_INFO "i2c-matroxfb: Could not register Maven i2c bus. Continuing anyway.\n"); |
| 184 | else { | ||
| 185 | struct i2c_board_info maven_info = { | ||
| 186 | I2C_BOARD_INFO("maven", 0x1b), | ||
| 187 | }; | ||
| 188 | unsigned short const addr_list[2] = { | ||
| 189 | 0x1b, I2C_CLIENT_END | ||
| 190 | }; | ||
| 191 | |||
| 192 | i2c_new_probed_device(&m2info->maven.adapter, | ||
| 193 | &maven_info, addr_list); | ||
| 194 | } | ||
| 190 | } | 195 | } |
| 191 | return m2info; | 196 | return m2info; |
| 192 | fail_ddc1:; | 197 | fail_ddc1:; |
diff --git a/drivers/video/matrox/matroxfb_maven.c b/drivers/video/matrox/matroxfb_maven.c index 89da27bd5c49..042408a8c631 100644 --- a/drivers/video/matrox/matroxfb_maven.c +++ b/drivers/video/matrox/matroxfb_maven.c | |||
| @@ -19,8 +19,6 @@ | |||
| 19 | #include <linux/matroxfb.h> | 19 | #include <linux/matroxfb.h> |
| 20 | #include <asm/div64.h> | 20 | #include <asm/div64.h> |
| 21 | 21 | ||
| 22 | #define MAVEN_I2CID (0x1B) | ||
| 23 | |||
| 24 | #define MGATVO_B 1 | 22 | #define MGATVO_B 1 |
| 25 | #define MGATVO_C 2 | 23 | #define MGATVO_C 2 |
| 26 | 24 | ||
| @@ -128,7 +126,7 @@ static int get_ctrl_id(__u32 v4l2_id) { | |||
| 128 | 126 | ||
| 129 | struct maven_data { | 127 | struct maven_data { |
| 130 | struct matrox_fb_info* primary_head; | 128 | struct matrox_fb_info* primary_head; |
| 131 | struct i2c_client client; | 129 | struct i2c_client *client; |
| 132 | int version; | 130 | int version; |
| 133 | }; | 131 | }; |
| 134 | 132 | ||
| @@ -974,7 +972,7 @@ static inline int maven_compute_timming(struct maven_data* md, | |||
| 974 | 972 | ||
| 975 | static int maven_program_timming(struct maven_data* md, | 973 | static int maven_program_timming(struct maven_data* md, |
| 976 | const struct mavenregs* m) { | 974 | const struct mavenregs* m) { |
| 977 | struct i2c_client* c = &md->client; | 975 | struct i2c_client *c = md->client; |
| 978 | 976 | ||
| 979 | if (m->mode == MATROXFB_OUTPUT_MODE_MONITOR) { | 977 | if (m->mode == MATROXFB_OUTPUT_MODE_MONITOR) { |
| 980 | LR(0x80); | 978 | LR(0x80); |
| @@ -1011,7 +1009,7 @@ static int maven_program_timming(struct maven_data* md, | |||
| 1011 | } | 1009 | } |
| 1012 | 1010 | ||
| 1013 | static inline int maven_resync(struct maven_data* md) { | 1011 | static inline int maven_resync(struct maven_data* md) { |
| 1014 | struct i2c_client* c = &md->client; | 1012 | struct i2c_client *c = md->client; |
| 1015 | maven_set_reg(c, 0x95, 0x20); /* start whole thing */ | 1013 | maven_set_reg(c, 0x95, 0x20); /* start whole thing */ |
| 1016 | return 0; | 1014 | return 0; |
| 1017 | } | 1015 | } |
| @@ -1069,48 +1067,48 @@ static int maven_set_control (struct maven_data* md, | |||
| 1069 | maven_compute_bwlevel(md, &blacklevel, &whitelevel); | 1067 | maven_compute_bwlevel(md, &blacklevel, &whitelevel); |
| 1070 | blacklevel = (blacklevel >> 2) | ((blacklevel & 3) << 8); | 1068 | blacklevel = (blacklevel >> 2) | ((blacklevel & 3) << 8); |
| 1071 | whitelevel = (whitelevel >> 2) | ((whitelevel & 3) << 8); | 1069 | whitelevel = (whitelevel >> 2) | ((whitelevel & 3) << 8); |
| 1072 | maven_set_reg_pair(&md->client, 0x0e, blacklevel); | 1070 | maven_set_reg_pair(md->client, 0x0e, blacklevel); |
| 1073 | maven_set_reg_pair(&md->client, 0x1e, whitelevel); | 1071 | maven_set_reg_pair(md->client, 0x1e, whitelevel); |
| 1074 | } | 1072 | } |
| 1075 | break; | 1073 | break; |
| 1076 | case V4L2_CID_SATURATION: | 1074 | case V4L2_CID_SATURATION: |
| 1077 | { | 1075 | { |
| 1078 | maven_set_reg(&md->client, 0x20, p->value); | 1076 | maven_set_reg(md->client, 0x20, p->value); |
| 1079 | maven_set_reg(&md->client, 0x22, p->value); | 1077 | maven_set_reg(md->client, 0x22, p->value); |
| 1080 | } | 1078 | } |
| 1081 | break; | 1079 | break; |
| 1082 | case V4L2_CID_HUE: | 1080 | case V4L2_CID_HUE: |
| 1083 | { | 1081 | { |
| 1084 | maven_set_reg(&md->client, 0x25, p->value); | 1082 | maven_set_reg(md->client, 0x25, p->value); |
| 1085 | } | 1083 | } |
| 1086 | break; | 1084 | break; |
| 1087 | case V4L2_CID_GAMMA: | 1085 | case V4L2_CID_GAMMA: |
| 1088 | { | 1086 | { |
| 1089 | const struct maven_gamma* g; | 1087 | const struct maven_gamma* g; |
| 1090 | g = maven_compute_gamma(md); | 1088 | g = maven_compute_gamma(md); |
| 1091 | maven_set_reg(&md->client, 0x83, g->reg83); | 1089 | maven_set_reg(md->client, 0x83, g->reg83); |
| 1092 | maven_set_reg(&md->client, 0x84, g->reg84); | 1090 | maven_set_reg(md->client, 0x84, g->reg84); |
| 1093 | maven_set_reg(&md->client, 0x85, g->reg85); | 1091 | maven_set_reg(md->client, 0x85, g->reg85); |
| 1094 | maven_set_reg(&md->client, 0x86, g->reg86); | 1092 | maven_set_reg(md->client, 0x86, g->reg86); |
| 1095 | maven_set_reg(&md->client, 0x87, g->reg87); | 1093 | maven_set_reg(md->client, 0x87, g->reg87); |
| 1096 | maven_set_reg(&md->client, 0x88, g->reg88); | 1094 | maven_set_reg(md->client, 0x88, g->reg88); |
| 1097 | maven_set_reg(&md->client, 0x89, g->reg89); | 1095 | maven_set_reg(md->client, 0x89, g->reg89); |
| 1098 | maven_set_reg(&md->client, 0x8a, g->reg8a); | 1096 | maven_set_reg(md->client, 0x8a, g->reg8a); |
| 1099 | maven_set_reg(&md->client, 0x8b, g->reg8b); | 1097 | maven_set_reg(md->client, 0x8b, g->reg8b); |
| 1100 | } | 1098 | } |
| 1101 | break; | 1099 | break; |
| 1102 | case MATROXFB_CID_TESTOUT: | 1100 | case MATROXFB_CID_TESTOUT: |
| 1103 | { | 1101 | { |
| 1104 | unsigned char val | 1102 | unsigned char val |
| 1105 | = maven_get_reg(&md->client,0x8d); | 1103 | = maven_get_reg(md->client, 0x8d); |
| 1106 | if (p->value) val |= 0x10; | 1104 | if (p->value) val |= 0x10; |
| 1107 | else val &= ~0x10; | 1105 | else val &= ~0x10; |
| 1108 | maven_set_reg(&md->client, 0x8d, val); | 1106 | maven_set_reg(md->client, 0x8d, val); |
| 1109 | } | 1107 | } |
| 1110 | break; | 1108 | break; |
| 1111 | case MATROXFB_CID_DEFLICKER: | 1109 | case MATROXFB_CID_DEFLICKER: |
| 1112 | { | 1110 | { |
| 1113 | maven_set_reg(&md->client, 0x93, maven_compute_deflicker(md)); | 1111 | maven_set_reg(md->client, 0x93, maven_compute_deflicker(md)); |
| 1114 | } | 1112 | } |
| 1115 | break; | 1113 | break; |
| 1116 | } | 1114 | } |
| @@ -1189,6 +1187,7 @@ static int maven_init_client(struct i2c_client* clnt) { | |||
| 1189 | MINFO_FROM(container_of(clnt->adapter, struct i2c_bit_adapter, adapter)->minfo); | 1187 | MINFO_FROM(container_of(clnt->adapter, struct i2c_bit_adapter, adapter)->minfo); |
| 1190 | 1188 | ||
| 1191 | md->primary_head = MINFO; | 1189 | md->primary_head = MINFO; |
| 1190 | md->client = clnt; | ||
| 1192 | down_write(&ACCESS_FBINFO(altout.lock)); | 1191 | down_write(&ACCESS_FBINFO(altout.lock)); |
| 1193 | ACCESS_FBINFO(outputs[1]).output = &maven_altout; | 1192 | ACCESS_FBINFO(outputs[1]).output = &maven_altout; |
| 1194 | ACCESS_FBINFO(outputs[1]).src = ACCESS_FBINFO(outputs[1]).default_src; | 1193 | ACCESS_FBINFO(outputs[1]).src = ACCESS_FBINFO(outputs[1]).default_src; |
| @@ -1232,14 +1231,11 @@ static int maven_shutdown_client(struct i2c_client* clnt) { | |||
| 1232 | return 0; | 1231 | return 0; |
| 1233 | } | 1232 | } |
| 1234 | 1233 | ||
| 1235 | static const unsigned short normal_i2c[] = { MAVEN_I2CID, I2C_CLIENT_END }; | 1234 | static int maven_probe(struct i2c_client *client, |
| 1236 | I2C_CLIENT_INSMOD; | 1235 | const struct i2c_device_id *id) |
| 1237 | 1236 | { | |
| 1238 | static struct i2c_driver maven_driver; | 1237 | struct i2c_adapter *adapter = client->adapter; |
| 1239 | 1238 | int err = -ENODEV; | |
| 1240 | static int maven_detect_client(struct i2c_adapter* adapter, int address, int kind) { | ||
| 1241 | int err = 0; | ||
| 1242 | struct i2c_client* new_client; | ||
| 1243 | struct maven_data* data; | 1239 | struct maven_data* data; |
| 1244 | 1240 | ||
| 1245 | if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_WRITE_WORD_DATA | | 1241 | if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_WRITE_WORD_DATA | |
| @@ -1250,50 +1246,37 @@ static int maven_detect_client(struct i2c_adapter* adapter, int address, int kin | |||
| 1250 | err = -ENOMEM; | 1246 | err = -ENOMEM; |
| 1251 | goto ERROR0; | 1247 | goto ERROR0; |
| 1252 | } | 1248 | } |
| 1253 | new_client = &data->client; | 1249 | i2c_set_clientdata(client, data); |
| 1254 | i2c_set_clientdata(new_client, data); | 1250 | err = maven_init_client(client); |
| 1255 | new_client->addr = address; | ||
| 1256 | new_client->adapter = adapter; | ||
| 1257 | new_client->driver = &maven_driver; | ||
| 1258 | new_client->flags = 0; | ||
| 1259 | strlcpy(new_client->name, "maven", I2C_NAME_SIZE); | ||
| 1260 | if ((err = i2c_attach_client(new_client))) | ||
| 1261 | goto ERROR3; | ||
| 1262 | err = maven_init_client(new_client); | ||
| 1263 | if (err) | 1251 | if (err) |
| 1264 | goto ERROR4; | 1252 | goto ERROR4; |
| 1265 | return 0; | 1253 | return 0; |
| 1266 | ERROR4:; | 1254 | ERROR4:; |
| 1267 | i2c_detach_client(new_client); | 1255 | kfree(data); |
| 1268 | ERROR3:; | ||
| 1269 | kfree(new_client); | ||
| 1270 | ERROR0:; | 1256 | ERROR0:; |
| 1271 | return err; | 1257 | return err; |
| 1272 | } | 1258 | } |
| 1273 | 1259 | ||
| 1274 | static int maven_attach_adapter(struct i2c_adapter* adapter) { | 1260 | static int maven_remove(struct i2c_client *client) |
| 1275 | if (adapter->id == I2C_HW_B_G400) | 1261 | { |
| 1276 | return i2c_probe(adapter, &addr_data, &maven_detect_client); | ||
| 1277 | return 0; | ||
| 1278 | } | ||
| 1279 | |||
| 1280 | static int maven_detach_client(struct i2c_client* client) { | ||
| 1281 | int err; | ||
| 1282 | |||
| 1283 | if ((err = i2c_detach_client(client))) | ||
| 1284 | return err; | ||
| 1285 | maven_shutdown_client(client); | 1262 | maven_shutdown_client(client); |
| 1286 | kfree(i2c_get_clientdata(client)); | 1263 | kfree(i2c_get_clientdata(client)); |
| 1287 | return 0; | 1264 | return 0; |
| 1288 | } | 1265 | } |
| 1289 | 1266 | ||
| 1267 | static const struct i2c_device_id maven_id[] = { | ||
| 1268 | { "maven", 0 }, | ||
| 1269 | { } | ||
| 1270 | }; | ||
| 1271 | MODULE_DEVICE_TABLE(i2c, maven_id); | ||
| 1272 | |||
| 1290 | static struct i2c_driver maven_driver={ | 1273 | static struct i2c_driver maven_driver={ |
| 1291 | .driver = { | 1274 | .driver = { |
| 1292 | .name = "maven", | 1275 | .name = "maven", |
| 1293 | }, | 1276 | }, |
| 1294 | .id = I2C_DRIVERID_MGATVO, | 1277 | .probe = maven_probe, |
| 1295 | .attach_adapter = maven_attach_adapter, | 1278 | .remove = maven_remove, |
| 1296 | .detach_client = maven_detach_client, | 1279 | .id_table = maven_id, |
| 1297 | }; | 1280 | }; |
| 1298 | 1281 | ||
| 1299 | static int __init matroxfb_maven_init(void) | 1282 | static int __init matroxfb_maven_init(void) |
diff --git a/drivers/video/pm2fb.c b/drivers/video/pm2fb.c index 3f1ca2adda3d..c6dd924976a4 100644 --- a/drivers/video/pm2fb.c +++ b/drivers/video/pm2fb.c | |||
| @@ -1746,6 +1746,7 @@ static void __devexit pm2fb_remove(struct pci_dev *pdev) | |||
| 1746 | release_mem_region(fix->mmio_start, fix->mmio_len); | 1746 | release_mem_region(fix->mmio_start, fix->mmio_len); |
| 1747 | 1747 | ||
| 1748 | pci_set_drvdata(pdev, NULL); | 1748 | pci_set_drvdata(pdev, NULL); |
| 1749 | fb_dealloc_cmap(&info->cmap); | ||
| 1749 | kfree(info->pixmap.addr); | 1750 | kfree(info->pixmap.addr); |
| 1750 | kfree(info); | 1751 | kfree(info); |
| 1751 | } | 1752 | } |
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c index e7aa7ae8fca8..97204497d9f7 100644 --- a/drivers/video/pxafb.c +++ b/drivers/video/pxafb.c | |||
| @@ -1031,7 +1031,9 @@ static void pxafb_setup_gpio(struct pxafb_info *fbi) | |||
| 1031 | pxa_gpio_mode(GPIO74_LCD_FCLK_MD); | 1031 | pxa_gpio_mode(GPIO74_LCD_FCLK_MD); |
| 1032 | pxa_gpio_mode(GPIO75_LCD_LCLK_MD); | 1032 | pxa_gpio_mode(GPIO75_LCD_LCLK_MD); |
| 1033 | pxa_gpio_mode(GPIO76_LCD_PCLK_MD); | 1033 | pxa_gpio_mode(GPIO76_LCD_PCLK_MD); |
| 1034 | pxa_gpio_mode(GPIO77_LCD_ACBIAS_MD); | 1034 | |
| 1035 | if ((lccr0 & LCCR0_PAS) == 0) | ||
| 1036 | pxa_gpio_mode(GPIO77_LCD_ACBIAS_MD); | ||
| 1035 | } | 1037 | } |
| 1036 | 1038 | ||
| 1037 | static void pxafb_enable_controller(struct pxafb_info *fbi) | 1039 | static void pxafb_enable_controller(struct pxafb_info *fbi) |
| @@ -1400,6 +1402,8 @@ static void pxafb_decode_mach_info(struct pxafb_info *fbi, | |||
| 1400 | if (lcd_conn == LCD_MONO_STN_8BPP) | 1402 | if (lcd_conn == LCD_MONO_STN_8BPP) |
| 1401 | fbi->lccr0 |= LCCR0_DPD; | 1403 | fbi->lccr0 |= LCCR0_DPD; |
| 1402 | 1404 | ||
| 1405 | fbi->lccr0 |= (lcd_conn & LCD_ALTERNATE_MAPPING) ? LCCR0_LDDALT : 0; | ||
| 1406 | |||
| 1403 | fbi->lccr3 = LCCR3_Acb((inf->lcd_conn >> 10) & 0xff); | 1407 | fbi->lccr3 = LCCR3_Acb((inf->lcd_conn >> 10) & 0xff); |
| 1404 | fbi->lccr3 |= (lcd_conn & LCD_BIAS_ACTIVE_LOW) ? LCCR3_OEP : 0; | 1408 | fbi->lccr3 |= (lcd_conn & LCD_BIAS_ACTIVE_LOW) ? LCCR3_OEP : 0; |
| 1405 | fbi->lccr3 |= (lcd_conn & LCD_PCLK_EDGE_FALL) ? LCCR3_PCP : 0; | 1409 | fbi->lccr3 |= (lcd_conn & LCD_PCLK_EDGE_FALL) ? LCCR3_PCP : 0; |
| @@ -1673,53 +1677,63 @@ MODULE_PARM_DESC(options, "LCD parameters (see Documentation/fb/pxafb.txt)"); | |||
| 1673 | #define pxafb_setup_options() (0) | 1677 | #define pxafb_setup_options() (0) |
| 1674 | #endif | 1678 | #endif |
| 1675 | 1679 | ||
| 1676 | static int __devinit pxafb_probe(struct platform_device *dev) | ||
| 1677 | { | ||
| 1678 | struct pxafb_info *fbi; | ||
| 1679 | struct pxafb_mach_info *inf; | ||
| 1680 | struct resource *r; | ||
| 1681 | int irq, ret; | ||
| 1682 | |||
| 1683 | dev_dbg(&dev->dev, "pxafb_probe\n"); | ||
| 1684 | |||
| 1685 | inf = dev->dev.platform_data; | ||
| 1686 | ret = -ENOMEM; | ||
| 1687 | fbi = NULL; | ||
| 1688 | if (!inf) | ||
| 1689 | goto failed; | ||
| 1690 | |||
| 1691 | ret = pxafb_parse_options(&dev->dev, g_options); | ||
| 1692 | if (ret < 0) | ||
| 1693 | goto failed; | ||
| 1694 | |||
| 1695 | #ifdef DEBUG_VAR | 1680 | #ifdef DEBUG_VAR |
| 1696 | /* Check for various illegal bit-combinations. Currently only | 1681 | /* Check for various illegal bit-combinations. Currently only |
| 1697 | * a warning is given. */ | 1682 | * a warning is given. */ |
| 1683 | static void __devinit pxafb_check_options(struct device *dev, | ||
| 1684 | struct pxafb_mach_info *inf) | ||
| 1685 | { | ||
| 1686 | if (inf->lcd_conn) | ||
| 1687 | return; | ||
| 1698 | 1688 | ||
| 1699 | if (inf->lccr0 & LCCR0_INVALID_CONFIG_MASK) | 1689 | if (inf->lccr0 & LCCR0_INVALID_CONFIG_MASK) |
| 1700 | dev_warn(&dev->dev, "machine LCCR0 setting contains " | 1690 | dev_warn(dev, "machine LCCR0 setting contains " |
| 1701 | "illegal bits: %08x\n", | 1691 | "illegal bits: %08x\n", |
| 1702 | inf->lccr0 & LCCR0_INVALID_CONFIG_MASK); | 1692 | inf->lccr0 & LCCR0_INVALID_CONFIG_MASK); |
| 1703 | if (inf->lccr3 & LCCR3_INVALID_CONFIG_MASK) | 1693 | if (inf->lccr3 & LCCR3_INVALID_CONFIG_MASK) |
| 1704 | dev_warn(&dev->dev, "machine LCCR3 setting contains " | 1694 | dev_warn(dev, "machine LCCR3 setting contains " |
| 1705 | "illegal bits: %08x\n", | 1695 | "illegal bits: %08x\n", |
| 1706 | inf->lccr3 & LCCR3_INVALID_CONFIG_MASK); | 1696 | inf->lccr3 & LCCR3_INVALID_CONFIG_MASK); |
| 1707 | if (inf->lccr0 & LCCR0_DPD && | 1697 | if (inf->lccr0 & LCCR0_DPD && |
| 1708 | ((inf->lccr0 & LCCR0_PAS) != LCCR0_Pas || | 1698 | ((inf->lccr0 & LCCR0_PAS) != LCCR0_Pas || |
| 1709 | (inf->lccr0 & LCCR0_SDS) != LCCR0_Sngl || | 1699 | (inf->lccr0 & LCCR0_SDS) != LCCR0_Sngl || |
| 1710 | (inf->lccr0 & LCCR0_CMS) != LCCR0_Mono)) | 1700 | (inf->lccr0 & LCCR0_CMS) != LCCR0_Mono)) |
| 1711 | dev_warn(&dev->dev, "Double Pixel Data (DPD) mode is " | 1701 | dev_warn(dev, "Double Pixel Data (DPD) mode is " |
| 1712 | "only valid in passive mono" | 1702 | "only valid in passive mono" |
| 1713 | " single panel mode\n"); | 1703 | " single panel mode\n"); |
| 1714 | if ((inf->lccr0 & LCCR0_PAS) == LCCR0_Act && | 1704 | if ((inf->lccr0 & LCCR0_PAS) == LCCR0_Act && |
| 1715 | (inf->lccr0 & LCCR0_SDS) == LCCR0_Dual) | 1705 | (inf->lccr0 & LCCR0_SDS) == LCCR0_Dual) |
| 1716 | dev_warn(&dev->dev, "Dual panel only valid in passive mode\n"); | 1706 | dev_warn(dev, "Dual panel only valid in passive mode\n"); |
| 1717 | if ((inf->lccr0 & LCCR0_PAS) == LCCR0_Pas && | 1707 | if ((inf->lccr0 & LCCR0_PAS) == LCCR0_Pas && |
| 1718 | (inf->modes->upper_margin || inf->modes->lower_margin)) | 1708 | (inf->modes->upper_margin || inf->modes->lower_margin)) |
| 1719 | dev_warn(&dev->dev, "Upper and lower margins must be 0 in " | 1709 | dev_warn(dev, "Upper and lower margins must be 0 in " |
| 1720 | "passive mode\n"); | 1710 | "passive mode\n"); |
| 1711 | } | ||
| 1712 | #else | ||
| 1713 | #define pxafb_check_options(...) do {} while (0) | ||
| 1721 | #endif | 1714 | #endif |
| 1722 | 1715 | ||
| 1716 | static int __devinit pxafb_probe(struct platform_device *dev) | ||
| 1717 | { | ||
| 1718 | struct pxafb_info *fbi; | ||
| 1719 | struct pxafb_mach_info *inf; | ||
| 1720 | struct resource *r; | ||
| 1721 | int irq, ret; | ||
| 1722 | |||
| 1723 | dev_dbg(&dev->dev, "pxafb_probe\n"); | ||
| 1724 | |||
| 1725 | inf = dev->dev.platform_data; | ||
| 1726 | ret = -ENOMEM; | ||
| 1727 | fbi = NULL; | ||
| 1728 | if (!inf) | ||
| 1729 | goto failed; | ||
| 1730 | |||
| 1731 | ret = pxafb_parse_options(&dev->dev, g_options); | ||
| 1732 | if (ret < 0) | ||
| 1733 | goto failed; | ||
| 1734 | |||
| 1735 | pxafb_check_options(&dev->dev, inf); | ||
| 1736 | |||
| 1723 | dev_dbg(&dev->dev, "got a %dx%dx%d LCD\n", | 1737 | dev_dbg(&dev->dev, "got a %dx%dx%d LCD\n", |
| 1724 | inf->modes->xres, | 1738 | inf->modes->xres, |
| 1725 | inf->modes->yres, | 1739 | inf->modes->yres, |
diff --git a/drivers/video/s3fb.c b/drivers/video/s3fb.c index 8361bd0e3df1..4dcec48a1d78 100644 --- a/drivers/video/s3fb.c +++ b/drivers/video/s3fb.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * which is based on the code of neofb. | 11 | * which is based on the code of neofb. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/version.h> | ||
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 17 | #include <linux/errno.h> | 16 | #include <linux/errno.h> |
diff --git a/drivers/video/sh_mobile_lcdcfb.c b/drivers/video/sh_mobile_lcdcfb.c index f6ef6cca73cd..4c32c06579a0 100644 --- a/drivers/video/sh_mobile_lcdcfb.c +++ b/drivers/video/sh_mobile_lcdcfb.c | |||
| @@ -595,6 +595,8 @@ static int __init sh_mobile_lcdc_probe(struct platform_device *pdev) | |||
| 595 | info->fbops = &sh_mobile_lcdc_ops; | 595 | info->fbops = &sh_mobile_lcdc_ops; |
| 596 | info->var.xres = info->var.xres_virtual = cfg->lcd_cfg.xres; | 596 | info->var.xres = info->var.xres_virtual = cfg->lcd_cfg.xres; |
| 597 | info->var.yres = info->var.yres_virtual = cfg->lcd_cfg.yres; | 597 | info->var.yres = info->var.yres_virtual = cfg->lcd_cfg.yres; |
| 598 | info->var.width = cfg->lcd_size_cfg.width; | ||
| 599 | info->var.height = cfg->lcd_size_cfg.height; | ||
| 598 | info->var.activate = FB_ACTIVATE_NOW; | 600 | info->var.activate = FB_ACTIVATE_NOW; |
| 599 | error = sh_mobile_lcdc_set_bpp(&info->var, cfg->bpp); | 601 | error = sh_mobile_lcdc_set_bpp(&info->var, cfg->bpp); |
| 600 | if (error) | 602 | if (error) |
diff --git a/drivers/video/tdfxfb.c b/drivers/video/tdfxfb.c index 77aafcfae037..4599a4385bc9 100644 --- a/drivers/video/tdfxfb.c +++ b/drivers/video/tdfxfb.c | |||
| @@ -95,7 +95,6 @@ static inline int mtrr_del(int reg, unsigned long base, | |||
| 95 | #define VOODOO5_MAX_PIXCLOCK 350000 | 95 | #define VOODOO5_MAX_PIXCLOCK 350000 |
| 96 | 96 | ||
| 97 | static struct fb_fix_screeninfo tdfx_fix __devinitdata = { | 97 | static struct fb_fix_screeninfo tdfx_fix __devinitdata = { |
| 98 | .id = "3Dfx", | ||
| 99 | .type = FB_TYPE_PACKED_PIXELS, | 98 | .type = FB_TYPE_PACKED_PIXELS, |
| 100 | .visual = FB_VISUAL_PSEUDOCOLOR, | 99 | .visual = FB_VISUAL_PSEUDOCOLOR, |
| 101 | .ypanstep = 1, | 100 | .ypanstep = 1, |
| @@ -426,7 +425,7 @@ static unsigned long do_lfb_size(struct tdfx_par *par, unsigned short dev_id) | |||
| 426 | if (dev_id < PCI_DEVICE_ID_3DFX_VOODOO5) { | 425 | if (dev_id < PCI_DEVICE_ID_3DFX_VOODOO5) { |
| 427 | /* Banshee/Voodoo3 */ | 426 | /* Banshee/Voodoo3 */ |
| 428 | chip_size = 2; | 427 | chip_size = 2; |
| 429 | if (has_sgram && (draminit0 & DRAMINIT0_SGRAM_TYPE)) | 428 | if (has_sgram && !(draminit0 & DRAMINIT0_SGRAM_TYPE)) |
| 430 | chip_size = 1; | 429 | chip_size = 1; |
| 431 | } else { | 430 | } else { |
| 432 | /* Voodoo4/5 */ | 431 | /* Voodoo4/5 */ |
| @@ -1200,15 +1199,15 @@ static int __devinit tdfxfb_probe(struct pci_dev *pdev, | |||
| 1200 | /* Configure the default fb_fix_screeninfo first */ | 1199 | /* Configure the default fb_fix_screeninfo first */ |
| 1201 | switch (pdev->device) { | 1200 | switch (pdev->device) { |
| 1202 | case PCI_DEVICE_ID_3DFX_BANSHEE: | 1201 | case PCI_DEVICE_ID_3DFX_BANSHEE: |
| 1203 | strcat(tdfx_fix.id, " Banshee"); | 1202 | strcpy(tdfx_fix.id, "3Dfx Banshee"); |
| 1204 | default_par->max_pixclock = BANSHEE_MAX_PIXCLOCK; | 1203 | default_par->max_pixclock = BANSHEE_MAX_PIXCLOCK; |
| 1205 | break; | 1204 | break; |
| 1206 | case PCI_DEVICE_ID_3DFX_VOODOO3: | 1205 | case PCI_DEVICE_ID_3DFX_VOODOO3: |
| 1207 | strcat(tdfx_fix.id, " Voodoo3"); | 1206 | strcpy(tdfx_fix.id, "3Dfx Voodoo3"); |
| 1208 | default_par->max_pixclock = VOODOO3_MAX_PIXCLOCK; | 1207 | default_par->max_pixclock = VOODOO3_MAX_PIXCLOCK; |
| 1209 | break; | 1208 | break; |
| 1210 | case PCI_DEVICE_ID_3DFX_VOODOO5: | 1209 | case PCI_DEVICE_ID_3DFX_VOODOO5: |
| 1211 | strcat(tdfx_fix.id, " Voodoo5"); | 1210 | strcpy(tdfx_fix.id, "3Dfx Voodoo5"); |
| 1212 | default_par->max_pixclock = VOODOO5_MAX_PIXCLOCK; | 1211 | default_par->max_pixclock = VOODOO5_MAX_PIXCLOCK; |
| 1213 | break; | 1212 | break; |
| 1214 | } | 1213 | } |
diff --git a/drivers/video/vermilion/vermilion.h b/drivers/video/vermilion/vermilion.h index c4aba59d4809..7491abfcf1fc 100644 --- a/drivers/video/vermilion/vermilion.h +++ b/drivers/video/vermilion/vermilion.h | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | #define _VERMILION_H_ | 30 | #define _VERMILION_H_ |
| 31 | 31 | ||
| 32 | #include <linux/kernel.h> | 32 | #include <linux/kernel.h> |
| 33 | #include <linux/version.h> | ||
| 34 | #include <linux/pci.h> | 33 | #include <linux/pci.h> |
| 35 | #include <asm/atomic.h> | 34 | #include <asm/atomic.h> |
| 36 | #include <linux/mutex.h> | 35 | #include <linux/mutex.h> |
diff --git a/drivers/video/vt8623fb.c b/drivers/video/vt8623fb.c index 34aae7a2a62b..3df17dc8c3d7 100644 --- a/drivers/video/vt8623fb.c +++ b/drivers/video/vt8623fb.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * (http://davesdomain.org.uk/viafb/) | 12 | * (http://davesdomain.org.uk/viafb/) |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/version.h> | ||
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 18 | #include <linux/errno.h> | 17 | #include <linux/errno.h> |
diff --git a/drivers/video/xilinxfb.c b/drivers/video/xilinxfb.c index 7b3a8423f485..5da3d2423cc0 100644 --- a/drivers/video/xilinxfb.c +++ b/drivers/video/xilinxfb.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | #include <linux/device.h> | 24 | #include <linux/device.h> |
| 25 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 26 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
| 27 | #include <linux/version.h> | ||
| 28 | #include <linux/errno.h> | 27 | #include <linux/errno.h> |
| 29 | #include <linux/string.h> | 28 | #include <linux/string.h> |
| 30 | #include <linux/mm.h> | 29 | #include <linux/mm.h> |
diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c index bfef604160d1..62eab43152d2 100644 --- a/drivers/virtio/virtio_balloon.c +++ b/drivers/virtio/virtio_balloon.c | |||
| @@ -158,7 +158,7 @@ static inline s64 towards_target(struct virtio_balloon *vb) | |||
| 158 | vb->vdev->config->get(vb->vdev, | 158 | vb->vdev->config->get(vb->vdev, |
| 159 | offsetof(struct virtio_balloon_config, num_pages), | 159 | offsetof(struct virtio_balloon_config, num_pages), |
| 160 | &v, sizeof(v)); | 160 | &v, sizeof(v)); |
| 161 | return v - vb->num_pages; | 161 | return (s64)v - vb->num_pages; |
| 162 | } | 162 | } |
| 163 | 163 | ||
| 164 | static void update_balloon_size(struct virtio_balloon *vb) | 164 | static void update_balloon_size(struct virtio_balloon *vb) |
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 32b9fe153641..c51036716700 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig | |||
| @@ -285,10 +285,11 @@ config ALIM1535_WDT | |||
| 285 | 285 | ||
| 286 | config ALIM7101_WDT | 286 | config ALIM7101_WDT |
| 287 | tristate "ALi M7101 PMU Computer Watchdog" | 287 | tristate "ALi M7101 PMU Computer Watchdog" |
| 288 | depends on X86 && PCI | 288 | depends on PCI |
| 289 | help | 289 | help |
| 290 | This is the driver for the hardware watchdog on the ALi M7101 PMU | 290 | This is the driver for the hardware watchdog on the ALi M7101 PMU |
| 291 | as used in the x86 Cobalt servers. | 291 | as used in the x86 Cobalt servers and also found in some |
| 292 | SPARC Netra servers too. | ||
| 292 | 293 | ||
| 293 | To compile this driver as a module, choose M here: the | 294 | To compile this driver as a module, choose M here: the |
| 294 | module will be called alim7101_wdt. | 295 | module will be called alim7101_wdt. |
| @@ -464,6 +465,16 @@ config PC87413_WDT | |||
| 464 | 465 | ||
| 465 | Most people will say N. | 466 | Most people will say N. |
| 466 | 467 | ||
| 468 | config RDC321X_WDT | ||
| 469 | tristate "RDC R-321x SoC watchdog" | ||
| 470 | depends on X86_RDC321X | ||
| 471 | help | ||
| 472 | This is the driver for the built in hardware watchdog | ||
| 473 | in the RDC R-321x SoC. | ||
| 474 | |||
| 475 | To compile this driver as a module, choose M here: the | ||
| 476 | module will be called rdc321x_wdt. | ||
| 477 | |||
| 467 | config 60XX_WDT | 478 | config 60XX_WDT |
| 468 | tristate "SBC-60XX Watchdog Timer" | 479 | tristate "SBC-60XX Watchdog Timer" |
| 469 | depends on X86 | 480 | depends on X86 |
| @@ -632,6 +643,16 @@ config SBC_EPX_C3_WATCHDOG | |||
| 632 | 643 | ||
| 633 | # MIPS Architecture | 644 | # MIPS Architecture |
| 634 | 645 | ||
| 646 | config RC32434_WDT | ||
| 647 | tristate "IDT RC32434 SoC Watchdog Timer" | ||
| 648 | depends on MIKROTIK_RB532 | ||
| 649 | help | ||
| 650 | Hardware driver for the IDT RC32434 SoC built-in | ||
| 651 | watchdog timer. | ||
| 652 | |||
| 653 | To compile this driver as a module, choose M here: the | ||
| 654 | module will be called rc32434_wdt. | ||
| 655 | |||
| 635 | config INDYDOG | 656 | config INDYDOG |
| 636 | tristate "Indy/I2 Hardware Watchdog" | 657 | tristate "Indy/I2 Hardware Watchdog" |
| 637 | depends on SGI_HAS_INDYDOG | 658 | depends on SGI_HAS_INDYDOG |
| @@ -691,10 +712,6 @@ config MPC5200_WDT | |||
| 691 | tristate "MPC5200 Watchdog Timer" | 712 | tristate "MPC5200 Watchdog Timer" |
| 692 | depends on PPC_MPC52xx | 713 | depends on PPC_MPC52xx |
| 693 | 714 | ||
| 694 | config 8xx_WDT | ||
| 695 | tristate "MPC8xx Watchdog Timer" | ||
| 696 | depends on 8xx | ||
| 697 | |||
| 698 | config 8xxx_WDT | 715 | config 8xxx_WDT |
| 699 | tristate "MPC8xxx Platform Watchdog Timer" | 716 | tristate "MPC8xxx Platform Watchdog Timer" |
| 700 | depends on PPC_8xx || PPC_83xx || PPC_86xx | 717 | depends on PPC_8xx || PPC_83xx || PPC_86xx |
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile index ca3dc043d786..e0ef123fbdea 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile | |||
| @@ -75,6 +75,7 @@ obj-$(CONFIG_HP_WATCHDOG) += hpwdt.o | |||
| 75 | obj-$(CONFIG_SC1200_WDT) += sc1200wdt.o | 75 | obj-$(CONFIG_SC1200_WDT) += sc1200wdt.o |
| 76 | obj-$(CONFIG_SCx200_WDT) += scx200_wdt.o | 76 | obj-$(CONFIG_SCx200_WDT) += scx200_wdt.o |
| 77 | obj-$(CONFIG_PC87413_WDT) += pc87413_wdt.o | 77 | obj-$(CONFIG_PC87413_WDT) += pc87413_wdt.o |
| 78 | obj-$(CONFIG_RDC321X_WDT) += rdc321x_wdt.o | ||
| 78 | obj-$(CONFIG_60XX_WDT) += sbc60xxwdt.o | 79 | obj-$(CONFIG_60XX_WDT) += sbc60xxwdt.o |
| 79 | obj-$(CONFIG_SBC8360_WDT) += sbc8360.o | 80 | obj-$(CONFIG_SBC8360_WDT) += sbc8360.o |
| 80 | obj-$(CONFIG_SBC7240_WDT) += sbc7240_wdt.o | 81 | obj-$(CONFIG_SBC7240_WDT) += sbc7240_wdt.o |
| @@ -94,6 +95,7 @@ obj-$(CONFIG_SBC_EPX_C3_WATCHDOG) += sbc_epx_c3.o | |||
| 94 | # M68KNOMMU Architecture | 95 | # M68KNOMMU Architecture |
| 95 | 96 | ||
| 96 | # MIPS Architecture | 97 | # MIPS Architecture |
| 98 | obj-$(CONFIG_RC32434_WDT) += rc32434_wdt.o | ||
| 97 | obj-$(CONFIG_INDYDOG) += indydog.o | 99 | obj-$(CONFIG_INDYDOG) += indydog.o |
| 98 | obj-$(CONFIG_WDT_MTX1) += mtx-1_wdt.o | 100 | obj-$(CONFIG_WDT_MTX1) += mtx-1_wdt.o |
| 99 | obj-$(CONFIG_WDT_RM9K_GPI) += rm9k_wdt.o | 101 | obj-$(CONFIG_WDT_RM9K_GPI) += rm9k_wdt.o |
| @@ -104,7 +106,6 @@ obj-$(CONFIG_TXX9_WDT) += txx9wdt.o | |||
| 104 | # PARISC Architecture | 106 | # PARISC Architecture |
| 105 | 107 | ||
| 106 | # POWERPC Architecture | 108 | # POWERPC Architecture |
| 107 | obj-$(CONFIG_8xx_WDT) += mpc8xx_wdt.o | ||
| 108 | obj-$(CONFIG_MPC5200_WDT) += mpc5200_wdt.o | 109 | obj-$(CONFIG_MPC5200_WDT) += mpc5200_wdt.o |
| 109 | obj-$(CONFIG_8xxx_WDT) += mpc8xxx_wdt.o | 110 | obj-$(CONFIG_8xxx_WDT) += mpc8xxx_wdt.o |
| 110 | obj-$(CONFIG_MV64X60_WDT) += mv64x60_wdt.o | 111 | obj-$(CONFIG_MV64X60_WDT) += mv64x60_wdt.o |
diff --git a/drivers/watchdog/at91rm9200_wdt.c b/drivers/watchdog/at91rm9200_wdt.c index d061f0ad2d20..993e5f52afef 100644 --- a/drivers/watchdog/at91rm9200_wdt.c +++ b/drivers/watchdog/at91rm9200_wdt.c | |||
| @@ -241,7 +241,7 @@ static int at91wdt_resume(struct platform_device *pdev) | |||
| 241 | { | 241 | { |
| 242 | if (at91wdt_busy) | 242 | if (at91wdt_busy) |
| 243 | at91_wdt_start(); | 243 | at91_wdt_start(); |
| 244 | return 0; | 244 | return 0; |
| 245 | } | 245 | } |
| 246 | 246 | ||
| 247 | #else | 247 | #else |
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c index d039d5f2fd1c..a3765e0be4a8 100644 --- a/drivers/watchdog/hpwdt.c +++ b/drivers/watchdog/hpwdt.c | |||
| @@ -116,6 +116,7 @@ static unsigned int reload; /* the computed soft_margin */ | |||
| 116 | static int nowayout = WATCHDOG_NOWAYOUT; | 116 | static int nowayout = WATCHDOG_NOWAYOUT; |
| 117 | static char expect_release; | 117 | static char expect_release; |
| 118 | static unsigned long hpwdt_is_open; | 118 | static unsigned long hpwdt_is_open; |
| 119 | static unsigned int allow_kdump; | ||
| 119 | 120 | ||
| 120 | static void __iomem *pci_mem_addr; /* the PCI-memory address */ | 121 | static void __iomem *pci_mem_addr; /* the PCI-memory address */ |
| 121 | static unsigned long __iomem *hpwdt_timer_reg; | 122 | static unsigned long __iomem *hpwdt_timer_reg; |
| @@ -221,19 +222,19 @@ static int __devinit cru_detect(unsigned long map_entry, | |||
| 221 | 222 | ||
| 222 | if (cmn_regs.u1.ral != 0) { | 223 | if (cmn_regs.u1.ral != 0) { |
| 223 | printk(KERN_WARNING | 224 | printk(KERN_WARNING |
| 224 | "hpwdt: Call succeeded but with an error: 0x%x\n", | 225 | "hpwdt: Call succeeded but with an error: 0x%x\n", |
| 225 | cmn_regs.u1.ral); | 226 | cmn_regs.u1.ral); |
| 226 | } else { | 227 | } else { |
| 227 | physical_bios_base = cmn_regs.u2.rebx; | 228 | physical_bios_base = cmn_regs.u2.rebx; |
| 228 | physical_bios_offset = cmn_regs.u4.redx; | 229 | physical_bios_offset = cmn_regs.u4.redx; |
| 229 | cru_length = cmn_regs.u3.recx; | 230 | cru_length = cmn_regs.u3.recx; |
| 230 | cru_physical_address = | 231 | cru_physical_address = |
| 231 | physical_bios_base + physical_bios_offset; | 232 | physical_bios_base + physical_bios_offset; |
| 232 | 233 | ||
| 233 | /* If the values look OK, then map it in. */ | 234 | /* If the values look OK, then map it in. */ |
| 234 | if ((physical_bios_base + physical_bios_offset)) { | 235 | if ((physical_bios_base + physical_bios_offset)) { |
| 235 | cru_rom_addr = | 236 | cru_rom_addr = |
| 236 | ioremap(cru_physical_address, cru_length); | 237 | ioremap(cru_physical_address, cru_length); |
| 237 | if (cru_rom_addr) | 238 | if (cru_rom_addr) |
| 238 | retval = 0; | 239 | retval = 0; |
| 239 | } | 240 | } |
| @@ -356,7 +357,6 @@ asm(".text \n\t" | |||
| 356 | "call *%r12 \n\t" | 357 | "call *%r12 \n\t" |
| 357 | "pushfq \n\t" | 358 | "pushfq \n\t" |
| 358 | "popq %r12 \n\t" | 359 | "popq %r12 \n\t" |
| 359 | "popfq \n\t" | ||
| 360 | "movl %eax, (%r9) \n\t" | 360 | "movl %eax, (%r9) \n\t" |
| 361 | "movl %ebx, 4(%r9) \n\t" | 361 | "movl %ebx, 4(%r9) \n\t" |
| 362 | "movl %ecx, 8(%r9) \n\t" | 362 | "movl %ecx, 8(%r9) \n\t" |
| @@ -390,10 +390,10 @@ static void __devinit dmi_find_cru(const struct dmi_header *dm) | |||
| 390 | smbios_cru64_ptr = (struct smbios_cru64_info *) dm; | 390 | smbios_cru64_ptr = (struct smbios_cru64_info *) dm; |
| 391 | if (smbios_cru64_ptr->signature == CRU_BIOS_SIGNATURE_VALUE) { | 391 | if (smbios_cru64_ptr->signature == CRU_BIOS_SIGNATURE_VALUE) { |
| 392 | cru_physical_address = | 392 | cru_physical_address = |
| 393 | smbios_cru64_ptr->physical_address + | 393 | smbios_cru64_ptr->physical_address + |
| 394 | smbios_cru64_ptr->double_offset; | 394 | smbios_cru64_ptr->double_offset; |
| 395 | cru_rom_addr = ioremap(cru_physical_address, | 395 | cru_rom_addr = ioremap(cru_physical_address, |
| 396 | smbios_cru64_ptr->double_length); | 396 | smbios_cru64_ptr->double_length); |
| 397 | } | 397 | } |
| 398 | } | 398 | } |
| 399 | } | 399 | } |
| @@ -405,7 +405,7 @@ static int __devinit detect_cru_service(void) | |||
| 405 | dmi_walk(dmi_find_cru); | 405 | dmi_walk(dmi_find_cru); |
| 406 | 406 | ||
| 407 | /* if cru_rom_addr has been set then we found a CRU service */ | 407 | /* if cru_rom_addr has been set then we found a CRU service */ |
| 408 | return ((cru_rom_addr != NULL) ? 0: -ENODEV); | 408 | return ((cru_rom_addr != NULL) ? 0 : -ENODEV); |
| 409 | } | 409 | } |
| 410 | 410 | ||
| 411 | /* ------------------------------------------------------------------------- */ | 411 | /* ------------------------------------------------------------------------- */ |
| @@ -413,34 +413,6 @@ static int __devinit detect_cru_service(void) | |||
| 413 | #endif | 413 | #endif |
| 414 | 414 | ||
| 415 | /* | 415 | /* |
| 416 | * NMI Handler | ||
| 417 | */ | ||
| 418 | static int hpwdt_pretimeout(struct notifier_block *nb, unsigned long ulReason, | ||
| 419 | void *data) | ||
| 420 | { | ||
| 421 | unsigned long rom_pl; | ||
| 422 | static int die_nmi_called; | ||
| 423 | |||
| 424 | if (ulReason != DIE_NMI && ulReason != DIE_NMI_IPI) | ||
| 425 | return NOTIFY_OK; | ||
| 426 | |||
| 427 | spin_lock_irqsave(&rom_lock, rom_pl); | ||
| 428 | if (!die_nmi_called) | ||
| 429 | asminline_call(&cmn_regs, cru_rom_addr); | ||
| 430 | die_nmi_called = 1; | ||
| 431 | spin_unlock_irqrestore(&rom_lock, rom_pl); | ||
| 432 | if (cmn_regs.u1.ral == 0) { | ||
| 433 | printk(KERN_WARNING "hpwdt: An NMI occurred, " | ||
| 434 | "but unable to determine source.\n"); | ||
| 435 | } else { | ||
| 436 | panic("An NMI occurred, please see the Integrated " | ||
| 437 | "Management Log for details.\n"); | ||
| 438 | } | ||
| 439 | |||
| 440 | return NOTIFY_STOP; | ||
| 441 | } | ||
| 442 | |||
| 443 | /* | ||
| 444 | * Watchdog operations | 416 | * Watchdog operations |
| 445 | */ | 417 | */ |
| 446 | static void hpwdt_start(void) | 418 | static void hpwdt_start(void) |
| @@ -484,6 +456,36 @@ static int hpwdt_change_timer(int new_margin) | |||
| 484 | } | 456 | } |
| 485 | 457 | ||
| 486 | /* | 458 | /* |
| 459 | * NMI Handler | ||
| 460 | */ | ||
| 461 | static int hpwdt_pretimeout(struct notifier_block *nb, unsigned long ulReason, | ||
| 462 | void *data) | ||
| 463 | { | ||
| 464 | unsigned long rom_pl; | ||
| 465 | static int die_nmi_called; | ||
| 466 | |||
| 467 | if (ulReason != DIE_NMI && ulReason != DIE_NMI_IPI) | ||
| 468 | return NOTIFY_OK; | ||
| 469 | |||
| 470 | spin_lock_irqsave(&rom_lock, rom_pl); | ||
| 471 | if (!die_nmi_called) | ||
| 472 | asminline_call(&cmn_regs, cru_rom_addr); | ||
| 473 | die_nmi_called = 1; | ||
| 474 | spin_unlock_irqrestore(&rom_lock, rom_pl); | ||
| 475 | if (cmn_regs.u1.ral == 0) { | ||
| 476 | printk(KERN_WARNING "hpwdt: An NMI occurred, " | ||
| 477 | "but unable to determine source.\n"); | ||
| 478 | } else { | ||
| 479 | if (allow_kdump) | ||
| 480 | hpwdt_stop(); | ||
| 481 | panic("An NMI occurred, please see the Integrated " | ||
| 482 | "Management Log for details.\n"); | ||
| 483 | } | ||
| 484 | |||
| 485 | return NOTIFY_STOP; | ||
| 486 | } | ||
| 487 | |||
| 488 | /* | ||
| 487 | * /dev/watchdog handling | 489 | * /dev/watchdog handling |
| 488 | */ | 490 | */ |
| 489 | static int hpwdt_open(struct inode *inode, struct file *file) | 491 | static int hpwdt_open(struct inode *inode, struct file *file) |
| @@ -625,17 +627,18 @@ static struct notifier_block die_notifier = { | |||
| 625 | */ | 627 | */ |
| 626 | 628 | ||
| 627 | static int __devinit hpwdt_init_one(struct pci_dev *dev, | 629 | static int __devinit hpwdt_init_one(struct pci_dev *dev, |
| 628 | const struct pci_device_id *ent) | 630 | const struct pci_device_id *ent) |
| 629 | { | 631 | { |
| 630 | int retval; | 632 | int retval; |
| 631 | 633 | ||
| 632 | /* | 634 | /* |
| 633 | * First let's find out if we are on an iLO2 server. We will | 635 | * First let's find out if we are on an iLO2 server. We will |
| 634 | * not run on a legacy ASM box. | 636 | * not run on a legacy ASM box. |
| 637 | * So we only support the G5 ProLiant servers and higher. | ||
| 635 | */ | 638 | */ |
| 636 | if (dev->subsystem_vendor != PCI_VENDOR_ID_HP) { | 639 | if (dev->subsystem_vendor != PCI_VENDOR_ID_HP) { |
| 637 | dev_warn(&dev->dev, | 640 | dev_warn(&dev->dev, |
| 638 | "This server does not have an iLO2 ASIC.\n"); | 641 | "This server does not have an iLO2 ASIC.\n"); |
| 639 | return -ENODEV; | 642 | return -ENODEV; |
| 640 | } | 643 | } |
| 641 | 644 | ||
| @@ -669,7 +672,7 @@ static int __devinit hpwdt_init_one(struct pci_dev *dev, | |||
| 669 | retval = detect_cru_service(); | 672 | retval = detect_cru_service(); |
| 670 | if (retval < 0) { | 673 | if (retval < 0) { |
| 671 | dev_warn(&dev->dev, | 674 | dev_warn(&dev->dev, |
| 672 | "Unable to detect the %d Bit CRU Service.\n", | 675 | "Unable to detect the %d Bit CRU Service.\n", |
| 673 | HPWDT_ARCH); | 676 | HPWDT_ARCH); |
| 674 | goto error_get_cru; | 677 | goto error_get_cru; |
| 675 | } | 678 | } |
| @@ -684,7 +687,7 @@ static int __devinit hpwdt_init_one(struct pci_dev *dev, | |||
| 684 | retval = register_die_notifier(&die_notifier); | 687 | retval = register_die_notifier(&die_notifier); |
| 685 | if (retval != 0) { | 688 | if (retval != 0) { |
| 686 | dev_warn(&dev->dev, | 689 | dev_warn(&dev->dev, |
| 687 | "Unable to register a die notifier (err=%d).\n", | 690 | "Unable to register a die notifier (err=%d).\n", |
| 688 | retval); | 691 | retval); |
| 689 | goto error_die_notifier; | 692 | goto error_die_notifier; |
| 690 | } | 693 | } |
| @@ -699,8 +702,9 @@ static int __devinit hpwdt_init_one(struct pci_dev *dev, | |||
| 699 | 702 | ||
| 700 | printk(KERN_INFO | 703 | printk(KERN_INFO |
| 701 | "hp Watchdog Timer Driver: 1.00" | 704 | "hp Watchdog Timer Driver: 1.00" |
| 702 | ", timer margin: %d seconds( nowayout=%d).\n", | 705 | ", timer margin: %d seconds (nowayout=%d)" |
| 703 | soft_margin, nowayout); | 706 | ", allow kernel dump: %s (default = 0/OFF).\n", |
| 707 | soft_margin, nowayout, (allow_kdump == 0) ? "OFF" : "ON"); | ||
| 704 | 708 | ||
| 705 | return 0; | 709 | return 0; |
| 706 | 710 | ||
| @@ -755,6 +759,9 @@ MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | |||
| 755 | module_param(soft_margin, int, 0); | 759 | module_param(soft_margin, int, 0); |
| 756 | MODULE_PARM_DESC(soft_margin, "Watchdog timeout in seconds"); | 760 | MODULE_PARM_DESC(soft_margin, "Watchdog timeout in seconds"); |
| 757 | 761 | ||
| 762 | module_param(allow_kdump, int, 0); | ||
| 763 | MODULE_PARM_DESC(allow_kdump, "Start a kernel dump after NMI occurs"); | ||
| 764 | |||
| 758 | module_param(nowayout, int, 0); | 765 | module_param(nowayout, int, 0); |
| 759 | MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" | 766 | MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" |
| 760 | __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); | 767 | __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); |
diff --git a/drivers/watchdog/mpc8xx_wdt.c b/drivers/watchdog/mpc8xx_wdt.c deleted file mode 100644 index 1336425acf20..000000000000 --- a/drivers/watchdog/mpc8xx_wdt.c +++ /dev/null | |||
| @@ -1,170 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * mpc8xx_wdt.c - MPC8xx watchdog userspace interface | ||
| 3 | * | ||
| 4 | * Author: Florian Schirmer <jolt@tuxbox.org> | ||
| 5 | * | ||
| 6 | * 2002 (c) Florian Schirmer <jolt@tuxbox.org> This file is licensed under | ||
| 7 | * the terms of the GNU General Public License version 2. This program | ||
| 8 | * is licensed "as is" without any warranty of any kind, whether express | ||
| 9 | * or implied. | ||
| 10 | */ | ||
| 11 | |||
| 12 | #include <linux/fs.h> | ||
| 13 | #include <linux/init.h> | ||
| 14 | #include <linux/kernel.h> | ||
| 15 | #include <linux/miscdevice.h> | ||
| 16 | #include <linux/module.h> | ||
| 17 | #include <linux/watchdog.h> | ||
| 18 | #include <asm/8xx_immap.h> | ||
| 19 | #include <linux/uaccess.h> | ||
| 20 | #include <linux/io.h> | ||
| 21 | #include <syslib/m8xx_wdt.h> | ||
| 22 | |||
| 23 | static unsigned long wdt_opened; | ||
| 24 | static int wdt_status; | ||
| 25 | static spinlock_t wdt_lock; | ||
| 26 | |||
| 27 | static void mpc8xx_wdt_handler_disable(void) | ||
| 28 | { | ||
| 29 | volatile uint __iomem *piscr; | ||
| 30 | piscr = (uint *)&((immap_t *)IMAP_ADDR)->im_sit.sit_piscr; | ||
| 31 | |||
| 32 | if (!m8xx_has_internal_rtc) | ||
| 33 | m8xx_wdt_stop_timer(); | ||
| 34 | else | ||
| 35 | out_be32(piscr, in_be32(piscr) & ~(PISCR_PIE | PISCR_PTE)); | ||
| 36 | printk(KERN_NOTICE "mpc8xx_wdt: keep-alive handler deactivated\n"); | ||
| 37 | } | ||
| 38 | |||
| 39 | static void mpc8xx_wdt_handler_enable(void) | ||
| 40 | { | ||
| 41 | volatile uint __iomem *piscr; | ||
| 42 | piscr = (uint *)&((immap_t *)IMAP_ADDR)->im_sit.sit_piscr; | ||
| 43 | |||
| 44 | if (!m8xx_has_internal_rtc) | ||
| 45 | m8xx_wdt_install_timer(); | ||
| 46 | else | ||
| 47 | out_be32(piscr, in_be32(piscr) | PISCR_PIE | PISCR_PTE); | ||
| 48 | printk(KERN_NOTICE "mpc8xx_wdt: keep-alive handler activated\n"); | ||
| 49 | } | ||
| 50 | |||
| 51 | static int mpc8xx_wdt_open(struct inode *inode, struct file *file) | ||
| 52 | { | ||
| 53 | if (test_and_set_bit(0, &wdt_opened)) | ||
| 54 | return -EBUSY; | ||
| 55 | m8xx_wdt_reset(); | ||
| 56 | mpc8xx_wdt_handler_disable(); | ||
| 57 | return nonseekable_open(inode, file); | ||
| 58 | } | ||
| 59 | |||
| 60 | static int mpc8xx_wdt_release(struct inode *inode, struct file *file) | ||
| 61 | { | ||
| 62 | m8xx_wdt_reset(); | ||
| 63 | #if !defined(CONFIG_WATCHDOG_NOWAYOUT) | ||
| 64 | mpc8xx_wdt_handler_enable(); | ||
| 65 | #endif | ||
| 66 | clear_bit(0, &wdt_opened); | ||
| 67 | return 0; | ||
| 68 | } | ||
| 69 | |||
| 70 | static ssize_t mpc8xx_wdt_write(struct file *file, const char *data, | ||
| 71 | size_t len, loff_t *ppos) | ||
| 72 | { | ||
| 73 | if (len) { | ||
| 74 | spin_lock(&wdt_lock); | ||
| 75 | m8xx_wdt_reset(); | ||
| 76 | spin_unlock(&wdt_lock); | ||
| 77 | } | ||
| 78 | return len; | ||
| 79 | } | ||
| 80 | |||
| 81 | static long mpc8xx_wdt_ioctl(struct file *file, | ||
| 82 | unsigned int cmd, unsigned long arg) | ||
| 83 | { | ||
| 84 | int timeout; | ||
| 85 | static struct watchdog_info info = { | ||
| 86 | .options = WDIOF_KEEPALIVEPING, | ||
| 87 | .firmware_version = 0, | ||
| 88 | .identity = "MPC8xx watchdog", | ||
| 89 | }; | ||
| 90 | |||
| 91 | switch (cmd) { | ||
| 92 | case WDIOC_GETSUPPORT: | ||
| 93 | if (copy_to_user((void *)arg, &info, sizeof(info))) | ||
| 94 | return -EFAULT; | ||
| 95 | break; | ||
| 96 | |||
| 97 | case WDIOC_GETSTATUS: | ||
| 98 | case WDIOC_GETBOOTSTATUS: | ||
| 99 | if (put_user(wdt_status, (int *)arg)) | ||
| 100 | return -EFAULT; | ||
| 101 | wdt_status &= ~WDIOF_KEEPALIVEPING; | ||
| 102 | break; | ||
| 103 | |||
| 104 | case WDIOC_GETTEMP: | ||
| 105 | return -EOPNOTSUPP; | ||
| 106 | |||
| 107 | case WDIOC_SETOPTIONS: | ||
| 108 | return -EOPNOTSUPP; | ||
| 109 | |||
| 110 | case WDIOC_KEEPALIVE: | ||
| 111 | spin_lock(&wdt_lock); | ||
| 112 | m8xx_wdt_reset(); | ||
| 113 | wdt_status |= WDIOF_KEEPALIVEPING; | ||
| 114 | spin_unlock(&wdt_lock); | ||
| 115 | break; | ||
| 116 | |||
| 117 | case WDIOC_SETTIMEOUT: | ||
| 118 | return -EOPNOTSUPP; | ||
| 119 | |||
| 120 | case WDIOC_GETTIMEOUT: | ||
| 121 | spin_lock(&wdt_lock); | ||
| 122 | timeout = m8xx_wdt_get_timeout(); | ||
| 123 | spin_unlock(&wdt_lock); | ||
| 124 | if (put_user(timeout, (int *)arg)) | ||
| 125 | return -EFAULT; | ||
| 126 | break; | ||
| 127 | |||
| 128 | default: | ||
| 129 | return -ENOTTY; | ||
| 130 | } | ||
| 131 | |||
| 132 | return 0; | ||
| 133 | } | ||
| 134 | |||
| 135 | static const struct file_operations mpc8xx_wdt_fops = { | ||
| 136 | .owner = THIS_MODULE, | ||
| 137 | .llseek = no_llseek, | ||
| 138 | .write = mpc8xx_wdt_write, | ||
| 139 | .unlocked_ioctl = mpc8xx_wdt_ioctl, | ||
| 140 | .open = mpc8xx_wdt_open, | ||
| 141 | .release = mpc8xx_wdt_release, | ||
| 142 | }; | ||
| 143 | |||
| 144 | static struct miscdevice mpc8xx_wdt_miscdev = { | ||
| 145 | .minor = WATCHDOG_MINOR, | ||
| 146 | .name = "watchdog", | ||
| 147 | .fops = &mpc8xx_wdt_fops, | ||
| 148 | }; | ||
| 149 | |||
| 150 | static int __init mpc8xx_wdt_init(void) | ||
| 151 | { | ||
| 152 | spin_lock_init(&wdt_lock); | ||
| 153 | return misc_register(&mpc8xx_wdt_miscdev); | ||
| 154 | } | ||
| 155 | |||
| 156 | static void __exit mpc8xx_wdt_exit(void) | ||
| 157 | { | ||
| 158 | misc_deregister(&mpc8xx_wdt_miscdev); | ||
| 159 | |||
| 160 | m8xx_wdt_reset(); | ||
| 161 | mpc8xx_wdt_handler_enable(); | ||
| 162 | } | ||
| 163 | |||
| 164 | module_init(mpc8xx_wdt_init); | ||
| 165 | module_exit(mpc8xx_wdt_exit); | ||
| 166 | |||
| 167 | MODULE_AUTHOR("Florian Schirmer <jolt@tuxbox.org>"); | ||
| 168 | MODULE_DESCRIPTION("MPC8xx watchdog driver"); | ||
| 169 | MODULE_LICENSE("GPL"); | ||
| 170 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
diff --git a/drivers/watchdog/mpc8xxx_wdt.c b/drivers/watchdog/mpc8xxx_wdt.c index f2094960e662..38c588ee694f 100644 --- a/drivers/watchdog/mpc8xxx_wdt.c +++ b/drivers/watchdog/mpc8xxx_wdt.c | |||
| @@ -48,6 +48,7 @@ struct mpc8xxx_wdt_type { | |||
| 48 | }; | 48 | }; |
| 49 | 49 | ||
| 50 | static struct mpc8xxx_wdt __iomem *wd_base; | 50 | static struct mpc8xxx_wdt __iomem *wd_base; |
| 51 | static int mpc8xxx_wdt_init_late(void); | ||
| 51 | 52 | ||
| 52 | static u16 timeout = 0xffff; | 53 | static u16 timeout = 0xffff; |
| 53 | module_param(timeout, ushort, 0); | 54 | module_param(timeout, ushort, 0); |
| @@ -213,6 +214,12 @@ static int __devinit mpc8xxx_wdt_probe(struct of_device *ofdev, | |||
| 213 | else | 214 | else |
| 214 | timeout_sec = timeout / freq; | 215 | timeout_sec = timeout / freq; |
| 215 | 216 | ||
| 217 | #ifdef MODULE | ||
| 218 | ret = mpc8xxx_wdt_init_late(); | ||
| 219 | if (ret) | ||
| 220 | goto err_unmap; | ||
| 221 | #endif | ||
| 222 | |||
| 216 | pr_info("WDT driver for MPC8xxx initialized. mode:%s timeout=%d " | 223 | pr_info("WDT driver for MPC8xxx initialized. mode:%s timeout=%d " |
| 217 | "(%d seconds)\n", reset ? "reset" : "interrupt", timeout, | 224 | "(%d seconds)\n", reset ? "reset" : "interrupt", timeout, |
| 218 | timeout_sec); | 225 | timeout_sec); |
| @@ -280,7 +287,7 @@ static struct of_platform_driver mpc8xxx_wdt_driver = { | |||
| 280 | * very early to start pinging the watchdog (misc devices are not yet | 287 | * very early to start pinging the watchdog (misc devices are not yet |
| 281 | * available), and later module_init() just registers the misc device. | 288 | * available), and later module_init() just registers the misc device. |
| 282 | */ | 289 | */ |
| 283 | static int __init mpc8xxx_wdt_init_late(void) | 290 | static int mpc8xxx_wdt_init_late(void) |
| 284 | { | 291 | { |
| 285 | int ret; | 292 | int ret; |
| 286 | 293 | ||
| @@ -295,7 +302,9 @@ static int __init mpc8xxx_wdt_init_late(void) | |||
| 295 | } | 302 | } |
| 296 | return 0; | 303 | return 0; |
| 297 | } | 304 | } |
| 305 | #ifndef MODULE | ||
| 298 | module_init(mpc8xxx_wdt_init_late); | 306 | module_init(mpc8xxx_wdt_init_late); |
| 307 | #endif | ||
| 299 | 308 | ||
| 300 | static int __init mpc8xxx_wdt_init(void) | 309 | static int __init mpc8xxx_wdt_init(void) |
| 301 | { | 310 | { |
diff --git a/drivers/watchdog/pc87413_wdt.c b/drivers/watchdog/pc87413_wdt.c index e91ada72da1d..484c215e9f3f 100644 --- a/drivers/watchdog/pc87413_wdt.c +++ b/drivers/watchdog/pc87413_wdt.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | #include <linux/init.h> | 30 | #include <linux/init.h> |
| 31 | #include <linux/spinlock.h> | 31 | #include <linux/spinlock.h> |
| 32 | #include <linux/moduleparam.h> | 32 | #include <linux/moduleparam.h> |
| 33 | #include <linux/version.h> | ||
| 34 | #include <linux/io.h> | 33 | #include <linux/io.h> |
| 35 | #include <linux/uaccess.h> | 34 | #include <linux/uaccess.h> |
| 36 | 35 | ||
diff --git a/drivers/watchdog/rc32434_wdt.c b/drivers/watchdog/rc32434_wdt.c new file mode 100644 index 000000000000..6756bcb009ed --- /dev/null +++ b/drivers/watchdog/rc32434_wdt.c | |||
| @@ -0,0 +1,344 @@ | |||
| 1 | /* | ||
| 2 | * IDT Interprise 79RC32434 watchdog driver | ||
| 3 | * | ||
| 4 | * Copyright (C) 2006, Ondrej Zajicek <santiago@crfreenet.org> | ||
| 5 | * Copyright (C) 2008, Florian Fainelli <florian@openwrt.org> | ||
| 6 | * | ||
| 7 | * based on | ||
| 8 | * SoftDog 0.05: A Software Watchdog Device | ||
| 9 | * | ||
| 10 | * (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved. | ||
| 11 | * | ||
| 12 | * This program is free software; you can redistribute it and/or | ||
| 13 | * modify it under the terms of the GNU General Public License | ||
| 14 | * as published by the Free Software Foundation; either version | ||
| 15 | * 2 of the License, or (at your option) any later version. | ||
| 16 | * | ||
| 17 | */ | ||
| 18 | |||
| 19 | #include <linux/module.h> | ||
| 20 | #include <linux/types.h> | ||
| 21 | #include <linux/kernel.h> | ||
| 22 | #include <linux/fs.h> | ||
| 23 | #include <linux/mm.h> | ||
| 24 | #include <linux/miscdevice.h> | ||
| 25 | #include <linux/watchdog.h> | ||
| 26 | #include <linux/reboot.h> | ||
| 27 | #include <linux/smp_lock.h> | ||
| 28 | #include <linux/init.h> | ||
| 29 | #include <linux/platform_device.h> | ||
| 30 | #include <linux/uaccess.h> | ||
| 31 | |||
| 32 | #include <asm/bootinfo.h> | ||
| 33 | #include <asm/time.h> | ||
| 34 | #include <asm/mach-rc32434/integ.h> | ||
| 35 | |||
| 36 | #define MAX_TIMEOUT 20 | ||
| 37 | #define RC32434_WDT_INTERVAL (15 * HZ) | ||
| 38 | |||
| 39 | #define VERSION "0.2" | ||
| 40 | |||
| 41 | static struct { | ||
| 42 | struct completion stop; | ||
| 43 | int running; | ||
| 44 | struct timer_list timer; | ||
| 45 | int queue; | ||
| 46 | int default_ticks; | ||
| 47 | unsigned long inuse; | ||
| 48 | } rc32434_wdt_device; | ||
| 49 | |||
| 50 | static struct integ __iomem *wdt_reg; | ||
| 51 | static int ticks = 100 * HZ; | ||
| 52 | |||
| 53 | static int expect_close; | ||
| 54 | static int timeout; | ||
| 55 | |||
| 56 | static int nowayout = WATCHDOG_NOWAYOUT; | ||
| 57 | module_param(nowayout, int, 0); | ||
| 58 | MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" | ||
| 59 | __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); | ||
| 60 | |||
| 61 | |||
| 62 | static void rc32434_wdt_start(void) | ||
| 63 | { | ||
| 64 | u32 val; | ||
| 65 | |||
| 66 | if (!rc32434_wdt_device.inuse) { | ||
| 67 | writel(0, &wdt_reg->wtcount); | ||
| 68 | |||
| 69 | val = RC32434_ERR_WRE; | ||
| 70 | writel(readl(&wdt_reg->errcs) | val, &wdt_reg->errcs); | ||
| 71 | |||
| 72 | val = RC32434_WTC_EN; | ||
| 73 | writel(readl(&wdt_reg->wtc) | val, &wdt_reg->wtc); | ||
| 74 | } | ||
| 75 | rc32434_wdt_device.running++; | ||
| 76 | } | ||
| 77 | |||
| 78 | static void rc32434_wdt_stop(void) | ||
| 79 | { | ||
| 80 | u32 val; | ||
| 81 | |||
| 82 | if (rc32434_wdt_device.running) { | ||
| 83 | |||
| 84 | val = ~RC32434_WTC_EN; | ||
| 85 | writel(readl(&wdt_reg->wtc) & val, &wdt_reg->wtc); | ||
| 86 | |||
| 87 | val = ~RC32434_ERR_WRE; | ||
| 88 | writel(readl(&wdt_reg->errcs) & val, &wdt_reg->errcs); | ||
| 89 | |||
| 90 | rc32434_wdt_device.running = 0; | ||
| 91 | } | ||
| 92 | } | ||
| 93 | |||
| 94 | static void rc32434_wdt_set(int new_timeout) | ||
| 95 | { | ||
| 96 | u32 cmp = new_timeout * HZ; | ||
| 97 | u32 state, val; | ||
| 98 | |||
| 99 | timeout = new_timeout; | ||
| 100 | /* | ||
| 101 | * store and disable WTC | ||
| 102 | */ | ||
| 103 | state = (u32)(readl(&wdt_reg->wtc) & RC32434_WTC_EN); | ||
| 104 | val = ~RC32434_WTC_EN; | ||
| 105 | writel(readl(&wdt_reg->wtc) & val, &wdt_reg->wtc); | ||
| 106 | |||
| 107 | writel(0, &wdt_reg->wtcount); | ||
| 108 | writel(cmp, &wdt_reg->wtcompare); | ||
| 109 | |||
| 110 | /* | ||
| 111 | * restore WTC | ||
| 112 | */ | ||
| 113 | |||
| 114 | writel(readl(&wdt_reg->wtc) | state, &wdt_reg); | ||
| 115 | } | ||
| 116 | |||
| 117 | static void rc32434_wdt_reset(void) | ||
| 118 | { | ||
| 119 | ticks = rc32434_wdt_device.default_ticks; | ||
| 120 | } | ||
| 121 | |||
| 122 | static void rc32434_wdt_update(unsigned long unused) | ||
| 123 | { | ||
| 124 | if (rc32434_wdt_device.running) | ||
| 125 | ticks--; | ||
| 126 | |||
| 127 | writel(0, &wdt_reg->wtcount); | ||
| 128 | |||
| 129 | if (rc32434_wdt_device.queue && ticks) | ||
| 130 | mod_timer(&rc32434_wdt_device.timer, | ||
| 131 | jiffies + RC32434_WDT_INTERVAL); | ||
| 132 | else | ||
| 133 | complete(&rc32434_wdt_device.stop); | ||
| 134 | } | ||
| 135 | |||
| 136 | static int rc32434_wdt_open(struct inode *inode, struct file *file) | ||
| 137 | { | ||
| 138 | if (test_and_set_bit(0, &rc32434_wdt_device.inuse)) | ||
| 139 | return -EBUSY; | ||
| 140 | |||
| 141 | if (nowayout) | ||
| 142 | __module_get(THIS_MODULE); | ||
| 143 | |||
| 144 | return nonseekable_open(inode, file); | ||
| 145 | } | ||
| 146 | |||
| 147 | static int rc32434_wdt_release(struct inode *inode, struct file *file) | ||
| 148 | { | ||
| 149 | if (expect_close && nowayout == 0) { | ||
| 150 | rc32434_wdt_stop(); | ||
| 151 | printk(KERN_INFO KBUILD_MODNAME ": disabling watchdog timer\n"); | ||
| 152 | module_put(THIS_MODULE); | ||
| 153 | } else | ||
| 154 | printk(KERN_CRIT KBUILD_MODNAME | ||
| 155 | ": device closed unexpectedly. WDT will not stop !\n"); | ||
| 156 | |||
| 157 | clear_bit(0, &rc32434_wdt_device.inuse); | ||
| 158 | return 0; | ||
| 159 | } | ||
| 160 | |||
| 161 | static ssize_t rc32434_wdt_write(struct file *file, const char *data, | ||
| 162 | size_t len, loff_t *ppos) | ||
| 163 | { | ||
| 164 | if (len) { | ||
| 165 | if (!nowayout) { | ||
| 166 | size_t i; | ||
| 167 | |||
| 168 | /* In case it was set long ago */ | ||
| 169 | expect_close = 0; | ||
| 170 | |||
| 171 | for (i = 0; i != len; i++) { | ||
| 172 | char c; | ||
| 173 | if (get_user(c, data + i)) | ||
| 174 | return -EFAULT; | ||
| 175 | if (c == 'V') | ||
| 176 | expect_close = 1; | ||
| 177 | } | ||
| 178 | } | ||
| 179 | rc32434_wdt_update(0); | ||
| 180 | return len; | ||
| 181 | } | ||
| 182 | return 0; | ||
| 183 | } | ||
| 184 | |||
| 185 | static int rc32434_wdt_ioctl(struct inode *inode, struct file *file, | ||
| 186 | unsigned int cmd, unsigned long arg) | ||
| 187 | { | ||
| 188 | void __user *argp = (void __user *)arg; | ||
| 189 | int new_timeout; | ||
| 190 | unsigned int value; | ||
| 191 | static struct watchdog_info ident = { | ||
| 192 | .options = WDIOF_SETTIMEOUT | | ||
| 193 | WDIOF_KEEPALIVEPING | | ||
| 194 | WDIOF_MAGICCLOSE, | ||
| 195 | .identity = "RC32434_WDT Watchdog", | ||
| 196 | }; | ||
| 197 | switch (cmd) { | ||
| 198 | case WDIOC_KEEPALIVE: | ||
| 199 | rc32434_wdt_reset(); | ||
| 200 | break; | ||
| 201 | case WDIOC_GETSTATUS: | ||
| 202 | case WDIOC_GETBOOTSTATUS: | ||
| 203 | value = readl(&wdt_reg->wtcount); | ||
| 204 | if (copy_to_user(argp, &value, sizeof(int))) | ||
| 205 | return -EFAULT; | ||
| 206 | break; | ||
| 207 | case WDIOC_GETSUPPORT: | ||
| 208 | if (copy_to_user(argp, &ident, sizeof(ident))) | ||
| 209 | return -EFAULT; | ||
| 210 | break; | ||
| 211 | case WDIOC_SETOPTIONS: | ||
| 212 | if (copy_from_user(&value, argp, sizeof(int))) | ||
| 213 | return -EFAULT; | ||
| 214 | switch (value) { | ||
| 215 | case WDIOS_ENABLECARD: | ||
| 216 | rc32434_wdt_start(); | ||
| 217 | break; | ||
| 218 | case WDIOS_DISABLECARD: | ||
| 219 | rc32434_wdt_stop(); | ||
| 220 | default: | ||
| 221 | return -EINVAL; | ||
| 222 | } | ||
| 223 | break; | ||
| 224 | case WDIOC_SETTIMEOUT: | ||
| 225 | if (copy_from_user(&new_timeout, argp, sizeof(int))) | ||
| 226 | return -EFAULT; | ||
| 227 | if (new_timeout < 1) | ||
| 228 | return -EINVAL; | ||
| 229 | if (new_timeout > MAX_TIMEOUT) | ||
| 230 | return -EINVAL; | ||
| 231 | rc32434_wdt_set(new_timeout); | ||
| 232 | case WDIOC_GETTIMEOUT: | ||
| 233 | return copy_to_user(argp, &timeout, sizeof(int)); | ||
| 234 | default: | ||
| 235 | return -ENOTTY; | ||
| 236 | } | ||
| 237 | |||
| 238 | return 0; | ||
| 239 | } | ||
| 240 | |||
| 241 | static struct file_operations rc32434_wdt_fops = { | ||
| 242 | .owner = THIS_MODULE, | ||
| 243 | .llseek = no_llseek, | ||
| 244 | .write = rc32434_wdt_write, | ||
| 245 | .ioctl = rc32434_wdt_ioctl, | ||
| 246 | .open = rc32434_wdt_open, | ||
| 247 | .release = rc32434_wdt_release, | ||
| 248 | }; | ||
| 249 | |||
| 250 | static struct miscdevice rc32434_wdt_miscdev = { | ||
| 251 | .minor = WATCHDOG_MINOR, | ||
| 252 | .name = "watchdog", | ||
| 253 | .fops = &rc32434_wdt_fops, | ||
| 254 | }; | ||
| 255 | |||
| 256 | static char banner[] = KERN_INFO KBUILD_MODNAME | ||
| 257 | ": Watchdog Timer version " VERSION ", timer margin: %d sec\n"; | ||
| 258 | |||
| 259 | static int rc32434_wdt_probe(struct platform_device *pdev) | ||
| 260 | { | ||
| 261 | int ret; | ||
| 262 | struct resource *r; | ||
| 263 | |||
| 264 | r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "rb500_wdt_res"); | ||
| 265 | if (!r) { | ||
| 266 | printk(KERN_ERR KBUILD_MODNAME | ||
| 267 | "failed to retrieve resources\n"); | ||
| 268 | return -ENODEV; | ||
| 269 | } | ||
| 270 | |||
| 271 | wdt_reg = ioremap_nocache(r->start, r->end - r->start); | ||
| 272 | if (!wdt_reg) { | ||
| 273 | printk(KERN_ERR KBUILD_MODNAME | ||
| 274 | "failed to remap I/O resources\n"); | ||
| 275 | return -ENXIO; | ||
| 276 | } | ||
| 277 | |||
| 278 | ret = misc_register(&rc32434_wdt_miscdev); | ||
| 279 | |||
| 280 | if (ret < 0) { | ||
| 281 | printk(KERN_ERR KBUILD_MODNAME | ||
| 282 | "failed to register watchdog device\n"); | ||
| 283 | goto unmap; | ||
| 284 | } | ||
| 285 | |||
| 286 | init_completion(&rc32434_wdt_device.stop); | ||
| 287 | rc32434_wdt_device.queue = 0; | ||
| 288 | |||
| 289 | clear_bit(0, &rc32434_wdt_device.inuse); | ||
| 290 | |||
| 291 | setup_timer(&rc32434_wdt_device.timer, rc32434_wdt_update, 0L); | ||
| 292 | |||
| 293 | rc32434_wdt_device.default_ticks = ticks; | ||
| 294 | |||
| 295 | rc32434_wdt_start(); | ||
| 296 | |||
| 297 | printk(banner, timeout); | ||
| 298 | |||
| 299 | return 0; | ||
| 300 | |||
| 301 | unmap: | ||
| 302 | iounmap(wdt_reg); | ||
| 303 | return ret; | ||
| 304 | } | ||
| 305 | |||
| 306 | static int rc32434_wdt_remove(struct platform_device *pdev) | ||
| 307 | { | ||
| 308 | if (rc32434_wdt_device.queue) { | ||
| 309 | rc32434_wdt_device.queue = 0; | ||
| 310 | wait_for_completion(&rc32434_wdt_device.stop); | ||
| 311 | } | ||
| 312 | misc_deregister(&rc32434_wdt_miscdev); | ||
| 313 | |||
| 314 | iounmap(wdt_reg); | ||
| 315 | |||
| 316 | return 0; | ||
| 317 | } | ||
| 318 | |||
| 319 | static struct platform_driver rc32434_wdt = { | ||
| 320 | .probe = rc32434_wdt_probe, | ||
| 321 | .remove = rc32434_wdt_remove, | ||
| 322 | .driver = { | ||
| 323 | .name = "rc32434_wdt", | ||
| 324 | } | ||
| 325 | }; | ||
| 326 | |||
| 327 | static int __init rc32434_wdt_init(void) | ||
| 328 | { | ||
| 329 | return platform_driver_register(&rc32434_wdt); | ||
| 330 | } | ||
| 331 | |||
| 332 | static void __exit rc32434_wdt_exit(void) | ||
| 333 | { | ||
| 334 | platform_driver_unregister(&rc32434_wdt); | ||
| 335 | } | ||
| 336 | |||
| 337 | module_init(rc32434_wdt_init); | ||
| 338 | module_exit(rc32434_wdt_exit); | ||
| 339 | |||
| 340 | MODULE_AUTHOR("Ondrej Zajicek <santiago@crfreenet.org>," | ||
| 341 | "Florian Fainelli <florian@openwrt.org>"); | ||
| 342 | MODULE_DESCRIPTION("Driver for the IDT RC32434 SoC watchdog"); | ||
| 343 | MODULE_LICENSE("GPL"); | ||
| 344 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
diff --git a/drivers/watchdog/rdc321x_wdt.c b/drivers/watchdog/rdc321x_wdt.c new file mode 100644 index 000000000000..9108efa73e7d --- /dev/null +++ b/drivers/watchdog/rdc321x_wdt.c | |||
| @@ -0,0 +1,285 @@ | |||
| 1 | /* | ||
| 2 | * RDC321x watchdog driver | ||
| 3 | * | ||
| 4 | * Copyright (C) 2007 Florian Fainelli <florian@openwrt.org> | ||
| 5 | * | ||
| 6 | * This driver is highly inspired from the cpu5_wdt driver | ||
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or modify | ||
| 9 | * it under the terms of the GNU General Public License as published by | ||
| 10 | * the Free Software Foundation; either version 2 of the License, or | ||
| 11 | * (at your option) any later version. | ||
| 12 | * | ||
| 13 | * This program is distributed in the hope that it will be useful, | ||
| 14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 16 | * GNU General Public License for more details. | ||
| 17 | * | ||
| 18 | * You should have received a copy of the GNU General Public License | ||
| 19 | * along with this program; if not, write to the Free Software | ||
| 20 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | ||
| 21 | * | ||
| 22 | */ | ||
| 23 | |||
| 24 | #include <linux/module.h> | ||
| 25 | #include <linux/moduleparam.h> | ||
| 26 | #include <linux/types.h> | ||
| 27 | #include <linux/errno.h> | ||
| 28 | #include <linux/miscdevice.h> | ||
| 29 | #include <linux/fs.h> | ||
| 30 | #include <linux/init.h> | ||
| 31 | #include <linux/ioport.h> | ||
| 32 | #include <linux/timer.h> | ||
| 33 | #include <linux/completion.h> | ||
| 34 | #include <linux/jiffies.h> | ||
| 35 | #include <linux/platform_device.h> | ||
| 36 | #include <linux/watchdog.h> | ||
| 37 | #include <linux/io.h> | ||
| 38 | #include <linux/uaccess.h> | ||
| 39 | |||
| 40 | #include <asm/mach-rdc321x/rdc321x_defs.h> | ||
| 41 | |||
| 42 | #define RDC_WDT_MASK 0x80000000 /* Mask */ | ||
| 43 | #define RDC_WDT_EN 0x00800000 /* Enable bit */ | ||
| 44 | #define RDC_WDT_WTI 0x00200000 /* Generate CPU reset/NMI/WDT on timeout */ | ||
| 45 | #define RDC_WDT_RST 0x00100000 /* Reset bit */ | ||
| 46 | #define RDC_WDT_WIF 0x00040000 /* WDT IRQ Flag */ | ||
| 47 | #define RDC_WDT_IRT 0x00000100 /* IRQ Routing table */ | ||
| 48 | #define RDC_WDT_CNT 0x00000001 /* WDT count */ | ||
| 49 | |||
| 50 | #define RDC_CLS_TMR 0x80003844 /* Clear timer */ | ||
| 51 | |||
| 52 | #define RDC_WDT_INTERVAL (HZ/10+1) | ||
| 53 | |||
| 54 | static int ticks = 1000; | ||
| 55 | |||
| 56 | /* some device data */ | ||
| 57 | |||
| 58 | static struct { | ||
| 59 | struct completion stop; | ||
| 60 | int running; | ||
| 61 | struct timer_list timer; | ||
| 62 | int queue; | ||
| 63 | int default_ticks; | ||
| 64 | unsigned long inuse; | ||
| 65 | spinlock_t lock; | ||
| 66 | } rdc321x_wdt_device; | ||
| 67 | |||
| 68 | /* generic helper functions */ | ||
| 69 | |||
| 70 | static void rdc321x_wdt_trigger(unsigned long unused) | ||
| 71 | { | ||
| 72 | unsigned long flags; | ||
| 73 | |||
| 74 | if (rdc321x_wdt_device.running) | ||
| 75 | ticks--; | ||
| 76 | |||
| 77 | /* keep watchdog alive */ | ||
| 78 | spin_lock_irqsave(&rdc321x_wdt_device.lock, flags); | ||
| 79 | outl(RDC_WDT_EN | inl(RDC3210_CFGREG_DATA), | ||
| 80 | RDC3210_CFGREG_DATA); | ||
| 81 | spin_unlock_irqrestore(&rdc321x_wdt_device.lock, flags); | ||
| 82 | |||
| 83 | /* requeue?? */ | ||
| 84 | if (rdc321x_wdt_device.queue && ticks) | ||
| 85 | mod_timer(&rdc321x_wdt_device.timer, | ||
| 86 | jiffies + RDC_WDT_INTERVAL); | ||
| 87 | else { | ||
| 88 | /* ticks doesn't matter anyway */ | ||
| 89 | complete(&rdc321x_wdt_device.stop); | ||
| 90 | } | ||
| 91 | |||
| 92 | } | ||
| 93 | |||
| 94 | static void rdc321x_wdt_reset(void) | ||
| 95 | { | ||
| 96 | ticks = rdc321x_wdt_device.default_ticks; | ||
| 97 | } | ||
| 98 | |||
| 99 | static void rdc321x_wdt_start(void) | ||
| 100 | { | ||
| 101 | unsigned long flags; | ||
| 102 | |||
| 103 | if (!rdc321x_wdt_device.queue) { | ||
| 104 | rdc321x_wdt_device.queue = 1; | ||
| 105 | |||
| 106 | /* Clear the timer */ | ||
| 107 | spin_lock_irqsave(&rdc321x_wdt_device.lock, flags); | ||
| 108 | outl(RDC_CLS_TMR, RDC3210_CFGREG_ADDR); | ||
| 109 | |||
| 110 | /* Enable watchdog and set the timeout to 81.92 us */ | ||
| 111 | outl(RDC_WDT_EN | RDC_WDT_CNT, RDC3210_CFGREG_DATA); | ||
| 112 | spin_unlock_irqrestore(&rdc321x_wdt_device.lock, flags); | ||
| 113 | |||
| 114 | mod_timer(&rdc321x_wdt_device.timer, | ||
| 115 | jiffies + RDC_WDT_INTERVAL); | ||
| 116 | } | ||
| 117 | |||
| 118 | /* if process dies, counter is not decremented */ | ||
| 119 | rdc321x_wdt_device.running++; | ||
| 120 | } | ||
| 121 | |||
| 122 | static int rdc321x_wdt_stop(void) | ||
| 123 | { | ||
| 124 | if (rdc321x_wdt_device.running) | ||
| 125 | rdc321x_wdt_device.running = 0; | ||
| 126 | |||
| 127 | ticks = rdc321x_wdt_device.default_ticks; | ||
| 128 | |||
| 129 | return -EIO; | ||
| 130 | } | ||
| 131 | |||
| 132 | /* filesystem operations */ | ||
| 133 | static int rdc321x_wdt_open(struct inode *inode, struct file *file) | ||
| 134 | { | ||
| 135 | if (test_and_set_bit(0, &rdc321x_wdt_device.inuse)) | ||
| 136 | return -EBUSY; | ||
| 137 | |||
| 138 | return nonseekable_open(inode, file); | ||
| 139 | } | ||
| 140 | |||
| 141 | static int rdc321x_wdt_release(struct inode *inode, struct file *file) | ||
| 142 | { | ||
| 143 | clear_bit(0, &rdc321x_wdt_device.inuse); | ||
| 144 | return 0; | ||
| 145 | } | ||
| 146 | |||
| 147 | static int rdc321x_wdt_ioctl(struct inode *inode, struct file *file, | ||
| 148 | unsigned int cmd, unsigned long arg) | ||
| 149 | { | ||
| 150 | void __user *argp = (void __user *)arg; | ||
| 151 | unsigned int value; | ||
| 152 | static struct watchdog_info ident = { | ||
| 153 | .options = WDIOF_CARDRESET, | ||
| 154 | .identity = "RDC321x WDT", | ||
| 155 | }; | ||
| 156 | unsigned long flags; | ||
| 157 | |||
| 158 | switch (cmd) { | ||
| 159 | case WDIOC_KEEPALIVE: | ||
| 160 | rdc321x_wdt_reset(); | ||
| 161 | break; | ||
| 162 | case WDIOC_GETSTATUS: | ||
| 163 | /* Read the value from the DATA register */ | ||
| 164 | spin_lock_irqsave(&rdc321x_wdt_device.lock, flags); | ||
| 165 | value = inl(RDC3210_CFGREG_DATA); | ||
| 166 | spin_unlock_irqrestore(&rdc321x_wdt_device.lock, flags); | ||
| 167 | if (copy_to_user(argp, &value, sizeof(int))) | ||
| 168 | return -EFAULT; | ||
| 169 | break; | ||
| 170 | case WDIOC_GETSUPPORT: | ||
| 171 | if (copy_to_user(argp, &ident, sizeof(ident))) | ||
| 172 | return -EFAULT; | ||
| 173 | break; | ||
| 174 | case WDIOC_SETOPTIONS: | ||
| 175 | if (copy_from_user(&value, argp, sizeof(int))) | ||
| 176 | return -EFAULT; | ||
| 177 | switch (value) { | ||
| 178 | case WDIOS_ENABLECARD: | ||
| 179 | rdc321x_wdt_start(); | ||
| 180 | break; | ||
| 181 | case WDIOS_DISABLECARD: | ||
| 182 | return rdc321x_wdt_stop(); | ||
| 183 | default: | ||
| 184 | return -EINVAL; | ||
| 185 | } | ||
| 186 | break; | ||
| 187 | default: | ||
| 188 | return -ENOTTY; | ||
| 189 | } | ||
| 190 | return 0; | ||
| 191 | } | ||
| 192 | |||
| 193 | static ssize_t rdc321x_wdt_write(struct file *file, const char __user *buf, | ||
| 194 | size_t count, loff_t *ppos) | ||
| 195 | { | ||
| 196 | if (!count) | ||
| 197 | return -EIO; | ||
| 198 | |||
| 199 | rdc321x_wdt_reset(); | ||
| 200 | |||
| 201 | return count; | ||
| 202 | } | ||
| 203 | |||
| 204 | static const struct file_operations rdc321x_wdt_fops = { | ||
| 205 | .owner = THIS_MODULE, | ||
| 206 | .llseek = no_llseek, | ||
| 207 | .ioctl = rdc321x_wdt_ioctl, | ||
| 208 | .open = rdc321x_wdt_open, | ||
| 209 | .write = rdc321x_wdt_write, | ||
| 210 | .release = rdc321x_wdt_release, | ||
| 211 | }; | ||
| 212 | |||
| 213 | static struct miscdevice rdc321x_wdt_misc = { | ||
| 214 | .minor = WATCHDOG_MINOR, | ||
| 215 | .name = "watchdog", | ||
| 216 | .fops = &rdc321x_wdt_fops, | ||
| 217 | }; | ||
| 218 | |||
| 219 | static int __devinit rdc321x_wdt_probe(struct platform_device *pdev) | ||
| 220 | { | ||
| 221 | int err; | ||
| 222 | |||
| 223 | err = misc_register(&rdc321x_wdt_misc); | ||
| 224 | if (err < 0) { | ||
| 225 | printk(KERN_ERR PFX "watchdog misc_register failed\n"); | ||
| 226 | return err; | ||
| 227 | } | ||
| 228 | |||
| 229 | spin_lock_init(&rdc321x_wdt_device.lock); | ||
| 230 | |||
| 231 | /* Reset the watchdog */ | ||
| 232 | outl(RDC_WDT_RST, RDC3210_CFGREG_DATA); | ||
| 233 | |||
| 234 | init_completion(&rdc321x_wdt_device.stop); | ||
| 235 | rdc321x_wdt_device.queue = 0; | ||
| 236 | |||
| 237 | clear_bit(0, &rdc321x_wdt_device.inuse); | ||
| 238 | |||
| 239 | setup_timer(&rdc321x_wdt_device.timer, rdc321x_wdt_trigger, 0); | ||
| 240 | |||
| 241 | rdc321x_wdt_device.default_ticks = ticks; | ||
| 242 | |||
| 243 | printk(KERN_INFO PFX "watchdog init success\n"); | ||
| 244 | |||
| 245 | return 0; | ||
| 246 | } | ||
| 247 | |||
| 248 | static int rdc321x_wdt_remove(struct platform_device *pdev) | ||
| 249 | { | ||
| 250 | if (rdc321x_wdt_device.queue) { | ||
| 251 | rdc321x_wdt_device.queue = 0; | ||
| 252 | wait_for_completion(&rdc321x_wdt_device.stop); | ||
| 253 | } | ||
| 254 | |||
| 255 | misc_deregister(&rdc321x_wdt_misc); | ||
| 256 | |||
| 257 | return 0; | ||
| 258 | } | ||
| 259 | |||
| 260 | static struct platform_driver rdc321x_wdt_driver = { | ||
| 261 | .probe = rdc321x_wdt_probe, | ||
| 262 | .remove = rdc321x_wdt_remove, | ||
| 263 | .driver = { | ||
| 264 | .owner = THIS_MODULE, | ||
| 265 | .name = "rdc321x-wdt", | ||
| 266 | }, | ||
| 267 | }; | ||
| 268 | |||
| 269 | static int __init rdc321x_wdt_init(void) | ||
| 270 | { | ||
| 271 | return platform_driver_register(&rdc321x_wdt_driver); | ||
| 272 | } | ||
| 273 | |||
| 274 | static void __exit rdc321x_wdt_exit(void) | ||
| 275 | { | ||
| 276 | platform_driver_unregister(&rdc321x_wdt_driver); | ||
| 277 | } | ||
| 278 | |||
| 279 | module_init(rdc321x_wdt_init); | ||
| 280 | module_exit(rdc321x_wdt_exit); | ||
| 281 | |||
| 282 | MODULE_AUTHOR("Florian Fainelli <florian@openwrt.org>"); | ||
| 283 | MODULE_DESCRIPTION("RDC321x watchdog driver"); | ||
| 284 | MODULE_LICENSE("GPL"); | ||
| 285 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c index 3da2b90d2fe6..86d42801de45 100644 --- a/drivers/watchdog/s3c2410_wdt.c +++ b/drivers/watchdog/s3c2410_wdt.c | |||
| @@ -21,18 +21,6 @@ | |||
| 21 | * You should have received a copy of the GNU General Public License | 21 | * You should have received a copy of the GNU General Public License |
| 22 | * along with this program; if not, write to the Free Software | 22 | * along with this program; if not, write to the Free Software |
| 23 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 23 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 24 | * | ||
| 25 | * Changelog: | ||
| 26 | * 05-Oct-2004 BJD Added semaphore init to stop crashes on open | ||
| 27 | * Fixed tmr_count / wdt_count confusion | ||
| 28 | * Added configurable debug | ||
| 29 | * | ||
| 30 | * 11-Jan-2005 BJD Fixed divide-by-2 in timeout code | ||
| 31 | * | ||
| 32 | * 25-Jan-2005 DA Added suspend/resume support | ||
| 33 | * Replaced reboot notifier with .shutdown method | ||
| 34 | * | ||
| 35 | * 10-Mar-2005 LCVR Changed S3C2410_VA to S3C24XX_VA | ||
| 36 | */ | 24 | */ |
| 37 | 25 | ||
| 38 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| @@ -157,8 +145,6 @@ static void s3c2410wdt_start(void) | |||
| 157 | writel(wdt_count, wdt_base + S3C2410_WTCNT); | 145 | writel(wdt_count, wdt_base + S3C2410_WTCNT); |
| 158 | writel(wtcon, wdt_base + S3C2410_WTCON); | 146 | writel(wtcon, wdt_base + S3C2410_WTCON); |
| 159 | spin_unlock(&wdt_lock); | 147 | spin_unlock(&wdt_lock); |
| 160 | |||
| 161 | return 0; | ||
| 162 | } | 148 | } |
| 163 | 149 | ||
| 164 | static int s3c2410wdt_set_heartbeat(int timeout) | 150 | static int s3c2410wdt_set_heartbeat(int timeout) |
| @@ -367,7 +353,7 @@ static int s3c2410wdt_probe(struct platform_device *pdev) | |||
| 367 | return -ENOENT; | 353 | return -ENOENT; |
| 368 | } | 354 | } |
| 369 | 355 | ||
| 370 | size = (res->end-res->start)+1; | 356 | size = (res->end - res->start) + 1; |
| 371 | wdt_mem = request_mem_region(res->start, size, pdev->name); | 357 | wdt_mem = request_mem_region(res->start, size, pdev->name); |
| 372 | if (wdt_mem == NULL) { | 358 | if (wdt_mem == NULL) { |
| 373 | dev_err(dev, "failed to get memory region\n"); | 359 | dev_err(dev, "failed to get memory region\n"); |
| @@ -376,7 +362,7 @@ static int s3c2410wdt_probe(struct platform_device *pdev) | |||
| 376 | } | 362 | } |
| 377 | 363 | ||
| 378 | wdt_base = ioremap(res->start, size); | 364 | wdt_base = ioremap(res->start, size); |
| 379 | if (wdt_base == 0) { | 365 | if (wdt_base == NULL) { |
| 380 | dev_err(dev, "failed to ioremap() region\n"); | 366 | dev_err(dev, "failed to ioremap() region\n"); |
| 381 | ret = -EINVAL; | 367 | ret = -EINVAL; |
| 382 | goto err_req; | 368 | goto err_req; |
diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c index a5bc91ae6ff6..d0e87cbe157c 100644 --- a/drivers/xen/manage.c +++ b/drivers/xen/manage.c | |||
| @@ -102,7 +102,7 @@ static void do_suspend(void) | |||
| 102 | /* XXX use normal device tree? */ | 102 | /* XXX use normal device tree? */ |
| 103 | xenbus_suspend(); | 103 | xenbus_suspend(); |
| 104 | 104 | ||
| 105 | err = stop_machine_run(xen_suspend, &cancelled, 0); | 105 | err = stop_machine(xen_suspend, &cancelled, &cpumask_of_cpu(0)); |
| 106 | if (err) { | 106 | if (err) { |
| 107 | printk(KERN_ERR "failed to start xen_suspend: %d\n", err); | 107 | printk(KERN_ERR "failed to start xen_suspend: %d\n", err); |
| 108 | goto out; | 108 | goto out; |
diff --git a/firmware/Makefile b/firmware/Makefile index 9fe86041f86e..da75a6fbc6ba 100644 --- a/firmware/Makefile +++ b/firmware/Makefile | |||
| @@ -146,15 +146,27 @@ $(patsubst %,$(obj)/%.gen.o, $(fw-external-y)): $(obj)/%.gen.o: $(fwdir)/% | |||
| 146 | $(obj)/%: $(obj)/%.ihex | $(objtree)/$(obj)/$$(dir %) | 146 | $(obj)/%: $(obj)/%.ihex | $(objtree)/$(obj)/$$(dir %) |
| 147 | $(call cmd,ihex) | 147 | $(call cmd,ihex) |
| 148 | 148 | ||
| 149 | # Don't depend on ihex2fw if we're installing and it already exists. | ||
| 150 | # Putting it after | in the dependencies doesn't seem sufficient when | ||
| 151 | # we're installing after a cross-compile, because ihex2fw has dependencies | ||
| 152 | # on stuff like /usr/lib/gcc/ppc64-redhat-linux/4.3.0/include/stddef.h and | ||
| 153 | # thus wants to be rebuilt. Which it can't be, if the prebuilt kernel tree | ||
| 154 | # is exported read-only for someone to run 'make install'. | ||
| 155 | ifeq ($(INSTALL):$(wildcard $(obj)/ihex2fw),install:$(obj)/ihex2fw) | ||
| 156 | ihex2fw_dep := | ||
| 157 | else | ||
| 158 | ihex2fw_dep := $(obj)/ihex2fw | ||
| 159 | endif | ||
| 160 | |||
| 149 | # .HEX is also Intel HEX, but where the offset and length in each record | 161 | # .HEX is also Intel HEX, but where the offset and length in each record |
| 150 | # is actually meaningful, because the firmware has to be loaded in a certain | 162 | # is actually meaningful, because the firmware has to be loaded in a certain |
| 151 | # order rather than as a single binary blob. Thus, we convert them into our | 163 | # order rather than as a single binary blob. Thus, we convert them into our |
| 152 | # more compact binary representation of ihex records (<linux/ihex.h>) | 164 | # more compact binary representation of ihex records (<linux/ihex.h>) |
| 153 | $(obj)/%.fw: $(obj)/%.HEX $(obj)/ihex2fw | $(objtree)/$(obj)/$$(dir %) | 165 | $(obj)/%.fw: $(obj)/%.HEX $(ihex2fw_dep) | $(objtree)/$(obj)/$$(dir %) |
| 154 | $(call cmd,ihex2fw) | 166 | $(call cmd,ihex2fw) |
| 155 | 167 | ||
| 156 | # .H16 is our own modified form of Intel HEX, with 16-bit length for records. | 168 | # .H16 is our own modified form of Intel HEX, with 16-bit length for records. |
| 157 | $(obj)/%.fw: $(obj)/%.H16 $(obj)/ihex2fw | $(objtree)/$(obj)/$$(dir %) | 169 | $(obj)/%.fw: $(obj)/%.H16 $(ihex2fw_dep) | $(objtree)/$(obj)/$$(dir %) |
| 158 | $(call cmd,h16tofw) | 170 | $(call cmd,h16tofw) |
| 159 | 171 | ||
| 160 | $(firmware-dirs): | 172 | $(firmware-dirs): |
diff --git a/fs/9p/vfs_dir.c b/fs/9p/vfs_dir.c index 88e3787c6ea9..e298fe194093 100644 --- a/fs/9p/vfs_dir.c +++ b/fs/9p/vfs_dir.c | |||
| @@ -119,6 +119,7 @@ int v9fs_dir_release(struct inode *inode, struct file *filp) | |||
| 119 | 119 | ||
| 120 | const struct file_operations v9fs_dir_operations = { | 120 | const struct file_operations v9fs_dir_operations = { |
| 121 | .read = generic_read_dir, | 121 | .read = generic_read_dir, |
| 122 | .llseek = generic_file_llseek, | ||
| 122 | .readdir = v9fs_dir_readdir, | 123 | .readdir = v9fs_dir_readdir, |
| 123 | .open = v9fs_file_open, | 124 | .open = v9fs_file_open, |
| 124 | .release = v9fs_dir_release, | 125 | .release = v9fs_dir_release, |
diff --git a/fs/Kconfig b/fs/Kconfig index d3873583360b..abccb5dab9a8 100644 --- a/fs/Kconfig +++ b/fs/Kconfig | |||
| @@ -1930,6 +1930,16 @@ config CIFS_WEAK_PW_HASH | |||
| 1930 | 1930 | ||
| 1931 | If unsure, say N. | 1931 | If unsure, say N. |
| 1932 | 1932 | ||
| 1933 | config CIFS_UPCALL | ||
| 1934 | bool "Kerberos/SPNEGO advanced session setup" | ||
| 1935 | depends on CIFS && KEYS | ||
| 1936 | help | ||
| 1937 | Enables an upcall mechanism for CIFS which accesses | ||
| 1938 | userspace helper utilities to provide SPNEGO packaged (RFC 4178) | ||
| 1939 | Kerberos tickets which are needed to mount to certain secure servers | ||
| 1940 | (for which more secure Kerberos authentication is required). If | ||
| 1941 | unsure, say N. | ||
| 1942 | |||
| 1933 | config CIFS_XATTR | 1943 | config CIFS_XATTR |
| 1934 | bool "CIFS extended attributes" | 1944 | bool "CIFS extended attributes" |
| 1935 | depends on CIFS | 1945 | depends on CIFS |
| @@ -1982,17 +1992,6 @@ config CIFS_EXPERIMENTAL | |||
| 1982 | (which is disabled by default). See the file fs/cifs/README | 1992 | (which is disabled by default). See the file fs/cifs/README |
| 1983 | for more details. If unsure, say N. | 1993 | for more details. If unsure, say N. |
| 1984 | 1994 | ||
| 1985 | config CIFS_UPCALL | ||
| 1986 | bool "Kerberos/SPNEGO advanced session setup (EXPERIMENTAL)" | ||
| 1987 | depends on CIFS_EXPERIMENTAL | ||
| 1988 | depends on KEYS | ||
| 1989 | help | ||
| 1990 | Enables an upcall mechanism for CIFS which accesses | ||
| 1991 | userspace helper utilities to provide SPNEGO packaged (RFC 4178) | ||
| 1992 | Kerberos tickets which are needed to mount to certain secure servers | ||
| 1993 | (for which more secure Kerberos authentication is required). If | ||
| 1994 | unsure, say N. | ||
| 1995 | |||
| 1996 | config CIFS_DFS_UPCALL | 1995 | config CIFS_DFS_UPCALL |
| 1997 | bool "DFS feature support (EXPERIMENTAL)" | 1996 | bool "DFS feature support (EXPERIMENTAL)" |
| 1998 | depends on CIFS_EXPERIMENTAL | 1997 | depends on CIFS_EXPERIMENTAL |
diff --git a/fs/adfs/dir.c b/fs/adfs/dir.c index fc1a8dc64d78..85a30e929800 100644 --- a/fs/adfs/dir.c +++ b/fs/adfs/dir.c | |||
| @@ -197,6 +197,7 @@ out: | |||
| 197 | 197 | ||
| 198 | const struct file_operations adfs_dir_operations = { | 198 | const struct file_operations adfs_dir_operations = { |
| 199 | .read = generic_read_dir, | 199 | .read = generic_read_dir, |
| 200 | .llseek = generic_file_llseek, | ||
| 200 | .readdir = adfs_readdir, | 201 | .readdir = adfs_readdir, |
| 201 | .fsync = file_fsync, | 202 | .fsync = file_fsync, |
| 202 | }; | 203 | }; |
diff --git a/fs/affs/dir.c b/fs/affs/dir.c index 6e3f282424b0..7b36904dbeac 100644 --- a/fs/affs/dir.c +++ b/fs/affs/dir.c | |||
| @@ -19,6 +19,7 @@ static int affs_readdir(struct file *, void *, filldir_t); | |||
| 19 | 19 | ||
| 20 | const struct file_operations affs_dir_operations = { | 20 | const struct file_operations affs_dir_operations = { |
| 21 | .read = generic_read_dir, | 21 | .read = generic_read_dir, |
| 22 | .llseek = generic_file_llseek, | ||
| 22 | .readdir = affs_readdir, | 23 | .readdir = affs_readdir, |
| 23 | .fsync = file_fsync, | 24 | .fsync = file_fsync, |
| 24 | }; | 25 | }; |
diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c index bcfb2dc0a61b..2a41c2a7fc52 100644 --- a/fs/autofs4/root.c +++ b/fs/autofs4/root.c | |||
| @@ -36,6 +36,7 @@ const struct file_operations autofs4_root_operations = { | |||
| 36 | .release = dcache_dir_close, | 36 | .release = dcache_dir_close, |
| 37 | .read = generic_read_dir, | 37 | .read = generic_read_dir, |
| 38 | .readdir = dcache_readdir, | 38 | .readdir = dcache_readdir, |
| 39 | .llseek = dcache_dir_lseek, | ||
| 39 | .ioctl = autofs4_root_ioctl, | 40 | .ioctl = autofs4_root_ioctl, |
| 40 | }; | 41 | }; |
| 41 | 42 | ||
| @@ -44,6 +45,7 @@ const struct file_operations autofs4_dir_operations = { | |||
| 44 | .release = dcache_dir_close, | 45 | .release = dcache_dir_close, |
| 45 | .read = generic_read_dir, | 46 | .read = generic_read_dir, |
| 46 | .readdir = dcache_readdir, | 47 | .readdir = dcache_readdir, |
| 48 | .llseek = dcache_dir_lseek, | ||
| 47 | }; | 49 | }; |
| 48 | 50 | ||
| 49 | const struct inode_operations autofs4_indirect_root_inode_operations = { | 51 | const struct inode_operations autofs4_indirect_root_inode_operations = { |
diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c index 02c6e62b72f8..740f53672a8a 100644 --- a/fs/befs/linuxvfs.c +++ b/fs/befs/linuxvfs.c | |||
| @@ -66,6 +66,7 @@ static struct kmem_cache *befs_inode_cachep; | |||
| 66 | static const struct file_operations befs_dir_operations = { | 66 | static const struct file_operations befs_dir_operations = { |
| 67 | .read = generic_read_dir, | 67 | .read = generic_read_dir, |
| 68 | .readdir = befs_readdir, | 68 | .readdir = befs_readdir, |
| 69 | .llseek = generic_file_llseek, | ||
| 69 | }; | 70 | }; |
| 70 | 71 | ||
| 71 | static const struct inode_operations befs_dir_inode_operations = { | 72 | static const struct inode_operations befs_dir_inode_operations = { |
diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c index 56372ecf1690..dfc0197905ca 100644 --- a/fs/binfmt_flat.c +++ b/fs/binfmt_flat.c | |||
| @@ -914,7 +914,9 @@ static int load_flat_binary(struct linux_binprm * bprm, struct pt_regs * regs) | |||
| 914 | /* Stash our initial stack pointer into the mm structure */ | 914 | /* Stash our initial stack pointer into the mm structure */ |
| 915 | current->mm->start_stack = (unsigned long )sp; | 915 | current->mm->start_stack = (unsigned long )sp; |
| 916 | 916 | ||
| 917 | 917 | #ifdef FLAT_PLAT_INIT | |
| 918 | FLAT_PLAT_INIT(regs); | ||
| 919 | #endif | ||
| 918 | DBG_FLT("start_thread(regs=0x%x, entry=0x%x, start_stack=0x%x)\n", | 920 | DBG_FLT("start_thread(regs=0x%x, entry=0x%x, start_stack=0x%x)\n", |
| 919 | (int)regs, (int)start_addr, (int)current->mm->start_stack); | 921 | (int)regs, (int)start_addr, (int)current->mm->start_stack); |
| 920 | 922 | ||
diff --git a/fs/binfmt_misc.c b/fs/binfmt_misc.c index 756205314c24..8d7e88e02e0f 100644 --- a/fs/binfmt_misc.c +++ b/fs/binfmt_misc.c | |||
| @@ -120,8 +120,6 @@ static int load_misc_binary(struct linux_binprm *bprm, struct pt_regs *regs) | |||
| 120 | if (bprm->misc_bang) | 120 | if (bprm->misc_bang) |
| 121 | goto _ret; | 121 | goto _ret; |
| 122 | 122 | ||
| 123 | bprm->misc_bang = 1; | ||
| 124 | |||
| 125 | /* to keep locking time low, we copy the interpreter string */ | 123 | /* to keep locking time low, we copy the interpreter string */ |
| 126 | read_lock(&entries_lock); | 124 | read_lock(&entries_lock); |
| 127 | fmt = check_file(bprm); | 125 | fmt = check_file(bprm); |
| @@ -199,6 +197,8 @@ static int load_misc_binary(struct linux_binprm *bprm, struct pt_regs *regs) | |||
| 199 | if (retval < 0) | 197 | if (retval < 0) |
| 200 | goto _error; | 198 | goto _error; |
| 201 | 199 | ||
| 200 | bprm->misc_bang = 1; | ||
| 201 | |||
| 202 | retval = search_binary_handler (bprm, regs); | 202 | retval = search_binary_handler (bprm, regs); |
| 203 | if (retval < 0) | 203 | if (retval < 0) |
| 204 | goto _error; | 204 | goto _error; |
| @@ -469,20 +469,21 @@ static void bio_free_map_data(struct bio_map_data *bmd) | |||
| 469 | kfree(bmd); | 469 | kfree(bmd); |
| 470 | } | 470 | } |
| 471 | 471 | ||
| 472 | static struct bio_map_data *bio_alloc_map_data(int nr_segs, int iov_count) | 472 | static struct bio_map_data *bio_alloc_map_data(int nr_segs, int iov_count, |
| 473 | gfp_t gfp_mask) | ||
| 473 | { | 474 | { |
| 474 | struct bio_map_data *bmd = kmalloc(sizeof(*bmd), GFP_KERNEL); | 475 | struct bio_map_data *bmd = kmalloc(sizeof(*bmd), gfp_mask); |
| 475 | 476 | ||
| 476 | if (!bmd) | 477 | if (!bmd) |
| 477 | return NULL; | 478 | return NULL; |
| 478 | 479 | ||
| 479 | bmd->iovecs = kmalloc(sizeof(struct bio_vec) * nr_segs, GFP_KERNEL); | 480 | bmd->iovecs = kmalloc(sizeof(struct bio_vec) * nr_segs, gfp_mask); |
| 480 | if (!bmd->iovecs) { | 481 | if (!bmd->iovecs) { |
| 481 | kfree(bmd); | 482 | kfree(bmd); |
| 482 | return NULL; | 483 | return NULL; |
| 483 | } | 484 | } |
| 484 | 485 | ||
| 485 | bmd->sgvecs = kmalloc(sizeof(struct sg_iovec) * iov_count, GFP_KERNEL); | 486 | bmd->sgvecs = kmalloc(sizeof(struct sg_iovec) * iov_count, gfp_mask); |
| 486 | if (bmd->sgvecs) | 487 | if (bmd->sgvecs) |
| 487 | return bmd; | 488 | return bmd; |
| 488 | 489 | ||
| @@ -491,8 +492,8 @@ static struct bio_map_data *bio_alloc_map_data(int nr_segs, int iov_count) | |||
| 491 | return NULL; | 492 | return NULL; |
| 492 | } | 493 | } |
| 493 | 494 | ||
| 494 | static int __bio_copy_iov(struct bio *bio, struct sg_iovec *iov, int iov_count, | 495 | static int __bio_copy_iov(struct bio *bio, struct bio_vec *iovecs, |
| 495 | int uncopy) | 496 | struct sg_iovec *iov, int iov_count, int uncopy) |
| 496 | { | 497 | { |
| 497 | int ret = 0, i; | 498 | int ret = 0, i; |
| 498 | struct bio_vec *bvec; | 499 | struct bio_vec *bvec; |
| @@ -502,7 +503,7 @@ static int __bio_copy_iov(struct bio *bio, struct sg_iovec *iov, int iov_count, | |||
| 502 | 503 | ||
| 503 | __bio_for_each_segment(bvec, bio, i, 0) { | 504 | __bio_for_each_segment(bvec, bio, i, 0) { |
| 504 | char *bv_addr = page_address(bvec->bv_page); | 505 | char *bv_addr = page_address(bvec->bv_page); |
| 505 | unsigned int bv_len = bvec->bv_len; | 506 | unsigned int bv_len = iovecs[i].bv_len; |
| 506 | 507 | ||
| 507 | while (bv_len && iov_idx < iov_count) { | 508 | while (bv_len && iov_idx < iov_count) { |
| 508 | unsigned int bytes; | 509 | unsigned int bytes; |
| @@ -554,7 +555,7 @@ int bio_uncopy_user(struct bio *bio) | |||
| 554 | struct bio_map_data *bmd = bio->bi_private; | 555 | struct bio_map_data *bmd = bio->bi_private; |
| 555 | int ret; | 556 | int ret; |
| 556 | 557 | ||
| 557 | ret = __bio_copy_iov(bio, bmd->sgvecs, bmd->nr_sgvecs, 1); | 558 | ret = __bio_copy_iov(bio, bmd->iovecs, bmd->sgvecs, bmd->nr_sgvecs, 1); |
| 558 | 559 | ||
| 559 | bio_free_map_data(bmd); | 560 | bio_free_map_data(bmd); |
| 560 | bio_put(bio); | 561 | bio_put(bio); |
| @@ -596,7 +597,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q, struct sg_iovec *iov, | |||
| 596 | len += iov[i].iov_len; | 597 | len += iov[i].iov_len; |
| 597 | } | 598 | } |
| 598 | 599 | ||
| 599 | bmd = bio_alloc_map_data(nr_pages, iov_count); | 600 | bmd = bio_alloc_map_data(nr_pages, iov_count, GFP_KERNEL); |
| 600 | if (!bmd) | 601 | if (!bmd) |
| 601 | return ERR_PTR(-ENOMEM); | 602 | return ERR_PTR(-ENOMEM); |
| 602 | 603 | ||
| @@ -633,7 +634,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q, struct sg_iovec *iov, | |||
| 633 | * success | 634 | * success |
| 634 | */ | 635 | */ |
| 635 | if (!write_to_vm) { | 636 | if (!write_to_vm) { |
| 636 | ret = __bio_copy_iov(bio, iov, iov_count, 0); | 637 | ret = __bio_copy_iov(bio, bio->bi_io_vec, iov, iov_count, 0); |
| 637 | if (ret) | 638 | if (ret) |
| 638 | goto cleanup; | 639 | goto cleanup; |
| 639 | } | 640 | } |
| @@ -942,19 +943,22 @@ static void bio_copy_kern_endio(struct bio *bio, int err) | |||
| 942 | { | 943 | { |
| 943 | struct bio_vec *bvec; | 944 | struct bio_vec *bvec; |
| 944 | const int read = bio_data_dir(bio) == READ; | 945 | const int read = bio_data_dir(bio) == READ; |
| 945 | char *p = bio->bi_private; | 946 | struct bio_map_data *bmd = bio->bi_private; |
| 946 | int i; | 947 | int i; |
| 948 | char *p = bmd->sgvecs[0].iov_base; | ||
| 947 | 949 | ||
| 948 | __bio_for_each_segment(bvec, bio, i, 0) { | 950 | __bio_for_each_segment(bvec, bio, i, 0) { |
| 949 | char *addr = page_address(bvec->bv_page); | 951 | char *addr = page_address(bvec->bv_page); |
| 952 | int len = bmd->iovecs[i].bv_len; | ||
| 950 | 953 | ||
| 951 | if (read && !err) | 954 | if (read && !err) |
| 952 | memcpy(p, addr, bvec->bv_len); | 955 | memcpy(p, addr, len); |
| 953 | 956 | ||
| 954 | __free_page(bvec->bv_page); | 957 | __free_page(bvec->bv_page); |
| 955 | p += bvec->bv_len; | 958 | p += len; |
| 956 | } | 959 | } |
| 957 | 960 | ||
| 961 | bio_free_map_data(bmd); | ||
| 958 | bio_put(bio); | 962 | bio_put(bio); |
| 959 | } | 963 | } |
| 960 | 964 | ||
| @@ -978,11 +982,21 @@ struct bio *bio_copy_kern(struct request_queue *q, void *data, unsigned int len, | |||
| 978 | const int nr_pages = end - start; | 982 | const int nr_pages = end - start; |
| 979 | struct bio *bio; | 983 | struct bio *bio; |
| 980 | struct bio_vec *bvec; | 984 | struct bio_vec *bvec; |
| 985 | struct bio_map_data *bmd; | ||
| 981 | int i, ret; | 986 | int i, ret; |
| 987 | struct sg_iovec iov; | ||
| 988 | |||
| 989 | iov.iov_base = data; | ||
| 990 | iov.iov_len = len; | ||
| 991 | |||
| 992 | bmd = bio_alloc_map_data(nr_pages, 1, gfp_mask); | ||
| 993 | if (!bmd) | ||
| 994 | return ERR_PTR(-ENOMEM); | ||
| 982 | 995 | ||
| 996 | ret = -ENOMEM; | ||
| 983 | bio = bio_alloc(gfp_mask, nr_pages); | 997 | bio = bio_alloc(gfp_mask, nr_pages); |
| 984 | if (!bio) | 998 | if (!bio) |
| 985 | return ERR_PTR(-ENOMEM); | 999 | goto out_bmd; |
| 986 | 1000 | ||
| 987 | while (len) { | 1001 | while (len) { |
| 988 | struct page *page; | 1002 | struct page *page; |
| @@ -1016,14 +1030,18 @@ struct bio *bio_copy_kern(struct request_queue *q, void *data, unsigned int len, | |||
| 1016 | } | 1030 | } |
| 1017 | } | 1031 | } |
| 1018 | 1032 | ||
| 1019 | bio->bi_private = data; | 1033 | bio->bi_private = bmd; |
| 1020 | bio->bi_end_io = bio_copy_kern_endio; | 1034 | bio->bi_end_io = bio_copy_kern_endio; |
| 1035 | |||
| 1036 | bio_set_map_data(bmd, bio, &iov, 1); | ||
| 1021 | return bio; | 1037 | return bio; |
| 1022 | cleanup: | 1038 | cleanup: |
| 1023 | bio_for_each_segment(bvec, bio, i) | 1039 | bio_for_each_segment(bvec, bio, i) |
| 1024 | __free_page(bvec->bv_page); | 1040 | __free_page(bvec->bv_page); |
| 1025 | 1041 | ||
| 1026 | bio_put(bio); | 1042 | bio_put(bio); |
| 1043 | out_bmd: | ||
| 1044 | bio_free_map_data(bmd); | ||
| 1027 | 1045 | ||
| 1028 | return ERR_PTR(ret); | 1046 | return ERR_PTR(ret); |
| 1029 | } | 1047 | } |
diff --git a/fs/buffer.c b/fs/buffer.c index 38653e36e225..ac78d4c19b3b 100644 --- a/fs/buffer.c +++ b/fs/buffer.c | |||
| @@ -2926,14 +2926,17 @@ int submit_bh(int rw, struct buffer_head * bh) | |||
| 2926 | BUG_ON(!buffer_mapped(bh)); | 2926 | BUG_ON(!buffer_mapped(bh)); |
| 2927 | BUG_ON(!bh->b_end_io); | 2927 | BUG_ON(!bh->b_end_io); |
| 2928 | 2928 | ||
| 2929 | if (buffer_ordered(bh) && (rw == WRITE)) | 2929 | /* |
| 2930 | rw = WRITE_BARRIER; | 2930 | * Mask in barrier bit for a write (could be either a WRITE or a |
| 2931 | * WRITE_SYNC | ||
| 2932 | */ | ||
| 2933 | if (buffer_ordered(bh) && (rw & WRITE)) | ||
| 2934 | rw |= WRITE_BARRIER; | ||
| 2931 | 2935 | ||
| 2932 | /* | 2936 | /* |
| 2933 | * Only clear out a write error when rewriting, should this | 2937 | * Only clear out a write error when rewriting |
| 2934 | * include WRITE_SYNC as well? | ||
| 2935 | */ | 2938 | */ |
| 2936 | if (test_set_buffer_req(bh) && (rw == WRITE || rw == WRITE_BARRIER)) | 2939 | if (test_set_buffer_req(bh) && (rw & WRITE)) |
| 2937 | clear_buffer_write_io_error(bh); | 2940 | clear_buffer_write_io_error(bh); |
| 2938 | 2941 | ||
| 2939 | /* | 2942 | /* |
diff --git a/fs/cifs/CHANGES b/fs/cifs/CHANGES index f5d0083e09fa..06e521a945c3 100644 --- a/fs/cifs/CHANGES +++ b/fs/cifs/CHANGES | |||
| @@ -4,7 +4,15 @@ Fix premature write failure on congested networks (we would give up | |||
| 4 | on EAGAIN from the socket too quickly on large writes). | 4 | on EAGAIN from the socket too quickly on large writes). |
| 5 | Cifs_mkdir and cifs_create now respect the setgid bit on parent dir. | 5 | Cifs_mkdir and cifs_create now respect the setgid bit on parent dir. |
| 6 | Fix endian problems in acl (mode from/to cifs acl) on bigendian | 6 | Fix endian problems in acl (mode from/to cifs acl) on bigendian |
| 7 | architectures. | 7 | architectures. Fix problems with preserving timestamps on copying open |
| 8 | files (e.g. "cp -a") to Windows servers. For mkdir and create honor setgid bit | ||
| 9 | on parent directory when server supports Unix Extensions but not POSIX | ||
| 10 | create. Update cifs.upcall version to handle new Kerberos sec flags | ||
| 11 | (this requires update of cifs.upcall program from Samba). Fix memory leak | ||
| 12 | on dns_upcall (resolving DFS referralls). Fix plain text password | ||
| 13 | authentication (requires setting SecurityFlags to 0x30030 to enable | ||
| 14 | lanman and plain text though). Fix writes to be at correct offset when | ||
| 15 | file is open with O_APPEND and file is on a directio (forcediretio) mount. | ||
| 8 | 16 | ||
| 9 | Version 1.53 | 17 | Version 1.53 |
| 10 | ------------ | 18 | ------------ |
diff --git a/fs/cifs/README b/fs/cifs/README index 2bd6fe556f88..bd2343d4c6a6 100644 --- a/fs/cifs/README +++ b/fs/cifs/README | |||
| @@ -542,10 +542,20 @@ SecurityFlags Flags which control security negotiation and | |||
| 542 | hashing mechanisms (as "must use") on the other hand | 542 | hashing mechanisms (as "must use") on the other hand |
| 543 | does not make much sense. Default flags are | 543 | does not make much sense. Default flags are |
| 544 | 0x07007 | 544 | 0x07007 |
| 545 | (NTLM, NTLMv2 and packet signing allowed). Maximum | 545 | (NTLM, NTLMv2 and packet signing allowed). The maximum |
| 546 | allowable flags if you want to allow mounts to servers | 546 | allowable flags if you want to allow mounts to servers |
| 547 | using weaker password hashes is 0x37037 (lanman, | 547 | using weaker password hashes is 0x37037 (lanman, |
| 548 | plaintext, ntlm, ntlmv2, signing allowed): | 548 | plaintext, ntlm, ntlmv2, signing allowed). Some |
| 549 | SecurityFlags require the corresponding menuconfig | ||
| 550 | options to be enabled (lanman and plaintext require | ||
| 551 | CONFIG_CIFS_WEAK_PW_HASH for example). Enabling | ||
| 552 | plaintext authentication currently requires also | ||
| 553 | enabling lanman authentication in the security flags | ||
| 554 | because the cifs module only supports sending | ||
| 555 | laintext passwords using the older lanman dialect | ||
| 556 | form of the session setup SMB. (e.g. for authentication | ||
| 557 | using plain text passwords, set the SecurityFlags | ||
| 558 | to 0x30030): | ||
| 549 | 559 | ||
| 550 | may use packet signing 0x00001 | 560 | may use packet signing 0x00001 |
| 551 | must use packet signing 0x01001 | 561 | must use packet signing 0x01001 |
| @@ -642,8 +652,30 @@ The statistics for the number of total SMBs and oplock breaks are different in | |||
| 642 | that they represent all for that share, not just those for which the server | 652 | that they represent all for that share, not just those for which the server |
| 643 | returned success. | 653 | returned success. |
| 644 | 654 | ||
| 645 | Also note that "cat /proc/fs/cifs/DebugData" will display information about | 655 | Also note that "cat /proc/fs/cifs/DebugData" will display information about |
| 646 | the active sessions and the shares that are mounted. | 656 | the active sessions and the shares that are mounted. |
| 647 | Enabling Kerberos (extended security) works when CONFIG_CIFS_EXPERIMENTAL is | 657 | |
| 648 | on but requires a user space helper (from the Samba project). NTLM and NTLMv2 and | 658 | Enabling Kerberos (extended security) works but requires version 1.2 or later |
| 649 | LANMAN support do not require this helper. | 659 | of the helper program cifs.upcall to be present and to be configured in the |
| 660 | /etc/request-key.conf file. The cifs.upcall helper program is from the Samba | ||
| 661 | project(http://www.samba.org). NTLM and NTLMv2 and LANMAN support do not | ||
| 662 | require this helper. Note that NTLMv2 security (which does not require the | ||
| 663 | cifs.upcall helper program), instead of using Kerberos, is sufficient for | ||
| 664 | some use cases. | ||
| 665 | |||
| 666 | Enabling DFS support (used to access shares transparently in an MS-DFS | ||
| 667 | global name space) requires that CONFIG_CIFS_EXPERIMENTAL be enabled. In | ||
| 668 | addition, DFS support for target shares which are specified as UNC | ||
| 669 | names which begin with host names (rather than IP addresses) requires | ||
| 670 | a user space helper (such as cifs.upcall) to be present in order to | ||
| 671 | translate host names to ip address, and the user space helper must also | ||
| 672 | be configured in the file /etc/request-key.conf | ||
| 673 | |||
| 674 | To use cifs Kerberos and DFS support, the Linux keyutils package should be | ||
| 675 | installed and something like the following lines should be added to the | ||
| 676 | /etc/request-key.conf file: | ||
| 677 | |||
| 678 | create cifs.spnego * * /usr/local/sbin/cifs.upcall %k | ||
| 679 | create dns_resolver * * /usr/local/sbin/cifs.upcall %k | ||
| 680 | |||
| 681 | |||
diff --git a/fs/cifs/asn1.c b/fs/cifs/asn1.c index 5fabd2caf93c..1b09f1670061 100644 --- a/fs/cifs/asn1.c +++ b/fs/cifs/asn1.c | |||
| @@ -476,6 +476,7 @@ decode_negTokenInit(unsigned char *security_blob, int length, | |||
| 476 | unsigned int cls, con, tag, oidlen, rc; | 476 | unsigned int cls, con, tag, oidlen, rc; |
| 477 | bool use_ntlmssp = false; | 477 | bool use_ntlmssp = false; |
| 478 | bool use_kerberos = false; | 478 | bool use_kerberos = false; |
| 479 | bool use_mskerberos = false; | ||
| 479 | 480 | ||
| 480 | *secType = NTLM; /* BB eventually make Kerberos or NLTMSSP the default*/ | 481 | *secType = NTLM; /* BB eventually make Kerberos or NLTMSSP the default*/ |
| 481 | 482 | ||
| @@ -574,10 +575,12 @@ decode_negTokenInit(unsigned char *security_blob, int length, | |||
| 574 | *(oid + 1), *(oid + 2), *(oid + 3))); | 575 | *(oid + 1), *(oid + 2), *(oid + 3))); |
| 575 | 576 | ||
| 576 | if (compare_oid(oid, oidlen, MSKRB5_OID, | 577 | if (compare_oid(oid, oidlen, MSKRB5_OID, |
| 577 | MSKRB5_OID_LEN)) | 578 | MSKRB5_OID_LEN) && |
| 578 | use_kerberos = true; | 579 | !use_kerberos) |
| 580 | use_mskerberos = true; | ||
| 579 | else if (compare_oid(oid, oidlen, KRB5_OID, | 581 | else if (compare_oid(oid, oidlen, KRB5_OID, |
| 580 | KRB5_OID_LEN)) | 582 | KRB5_OID_LEN) && |
| 583 | !use_mskerberos) | ||
| 581 | use_kerberos = true; | 584 | use_kerberos = true; |
| 582 | else if (compare_oid(oid, oidlen, NTLMSSP_OID, | 585 | else if (compare_oid(oid, oidlen, NTLMSSP_OID, |
| 583 | NTLMSSP_OID_LEN)) | 586 | NTLMSSP_OID_LEN)) |
| @@ -630,6 +633,8 @@ decode_negTokenInit(unsigned char *security_blob, int length, | |||
| 630 | 633 | ||
| 631 | if (use_kerberos) | 634 | if (use_kerberos) |
| 632 | *secType = Kerberos; | 635 | *secType = Kerberos; |
| 636 | else if (use_mskerberos) | ||
| 637 | *secType = MSKerberos; | ||
| 633 | else if (use_ntlmssp) | 638 | else if (use_ntlmssp) |
| 634 | *secType = NTLMSSP; | 639 | *secType = NTLMSSP; |
| 635 | 640 | ||
diff --git a/fs/cifs/cifs_spnego.c b/fs/cifs/cifs_spnego.c index 2434ab0e8791..117ef4bba68e 100644 --- a/fs/cifs/cifs_spnego.c +++ b/fs/cifs/cifs_spnego.c | |||
| @@ -114,9 +114,11 @@ cifs_get_spnego_key(struct cifsSesInfo *sesInfo) | |||
| 114 | 114 | ||
| 115 | dp = description + strlen(description); | 115 | dp = description + strlen(description); |
| 116 | 116 | ||
| 117 | /* for now, only sec=krb5 is valid */ | 117 | /* for now, only sec=krb5 and sec=mskrb5 are valid */ |
| 118 | if (server->secType == Kerberos) | 118 | if (server->secType == Kerberos) |
| 119 | sprintf(dp, ";sec=krb5"); | 119 | sprintf(dp, ";sec=krb5"); |
| 120 | else if (server->secType == MSKerberos) | ||
| 121 | sprintf(dp, ";sec=mskrb5"); | ||
| 120 | else | 122 | else |
| 121 | goto out; | 123 | goto out; |
| 122 | 124 | ||
diff --git a/fs/cifs/cifs_spnego.h b/fs/cifs/cifs_spnego.h index 05a34b17a1ab..e4041ec4d712 100644 --- a/fs/cifs/cifs_spnego.h +++ b/fs/cifs/cifs_spnego.h | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | #ifndef _CIFS_SPNEGO_H | 23 | #ifndef _CIFS_SPNEGO_H |
| 24 | #define _CIFS_SPNEGO_H | 24 | #define _CIFS_SPNEGO_H |
| 25 | 25 | ||
| 26 | #define CIFS_SPNEGO_UPCALL_VERSION 1 | 26 | #define CIFS_SPNEGO_UPCALL_VERSION 2 |
| 27 | 27 | ||
| 28 | /* | 28 | /* |
| 29 | * The version field should always be set to CIFS_SPNEGO_UPCALL_VERSION. | 29 | * The version field should always be set to CIFS_SPNEGO_UPCALL_VERSION. |
diff --git a/fs/cifs/cifsencrypt.c b/fs/cifs/cifsencrypt.c index 83fd40dc1ef0..bd5f13d38450 100644 --- a/fs/cifs/cifsencrypt.c +++ b/fs/cifs/cifsencrypt.c | |||
| @@ -294,6 +294,7 @@ void calc_lanman_hash(struct cifsSesInfo *ses, char *lnm_session_key) | |||
| 294 | 294 | ||
| 295 | if ((ses->server->secMode & SECMODE_PW_ENCRYPT) == 0) | 295 | if ((ses->server->secMode & SECMODE_PW_ENCRYPT) == 0) |
| 296 | if (extended_security & CIFSSEC_MAY_PLNTXT) { | 296 | if (extended_security & CIFSSEC_MAY_PLNTXT) { |
| 297 | memset(lnm_session_key, 0, CIFS_SESS_KEY_SIZE); | ||
| 297 | memcpy(lnm_session_key, password_with_pad, | 298 | memcpy(lnm_session_key, password_with_pad, |
| 298 | CIFS_ENCPWD_SIZE); | 299 | CIFS_ENCPWD_SIZE); |
| 299 | return; | 300 | return; |
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index e8da4ee761b5..25ecbd5b0404 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c | |||
| @@ -175,6 +175,8 @@ out_no_root: | |||
| 175 | if (inode) | 175 | if (inode) |
| 176 | iput(inode); | 176 | iput(inode); |
| 177 | 177 | ||
| 178 | cifs_umount(sb, cifs_sb); | ||
| 179 | |||
| 178 | out_mount_failed: | 180 | out_mount_failed: |
| 179 | if (cifs_sb) { | 181 | if (cifs_sb) { |
| 180 | #ifdef CONFIG_CIFS_DFS_UPCALL | 182 | #ifdef CONFIG_CIFS_DFS_UPCALL |
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h index 7e1cf262effe..8dfd6f24d488 100644 --- a/fs/cifs/cifsglob.h +++ b/fs/cifs/cifsglob.h | |||
| @@ -80,7 +80,8 @@ enum securityEnum { | |||
| 80 | NTLMv2, /* Legacy NTLM auth with NTLMv2 hash */ | 80 | NTLMv2, /* Legacy NTLM auth with NTLMv2 hash */ |
| 81 | RawNTLMSSP, /* NTLMSSP without SPNEGO */ | 81 | RawNTLMSSP, /* NTLMSSP without SPNEGO */ |
| 82 | NTLMSSP, /* NTLMSSP via SPNEGO */ | 82 | NTLMSSP, /* NTLMSSP via SPNEGO */ |
| 83 | Kerberos /* Kerberos via SPNEGO */ | 83 | Kerberos, /* Kerberos via SPNEGO */ |
| 84 | MSKerberos, /* MS Kerberos via SPNEGO */ | ||
| 84 | }; | 85 | }; |
| 85 | 86 | ||
| 86 | enum protocolEnum { | 87 | enum protocolEnum { |
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 0711db65afe8..4c13bcdb92a5 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c | |||
| @@ -3598,19 +3598,21 @@ int cifs_setup_session(unsigned int xid, struct cifsSesInfo *pSesInfo, | |||
| 3598 | char ntlm_session_key[CIFS_SESS_KEY_SIZE]; | 3598 | char ntlm_session_key[CIFS_SESS_KEY_SIZE]; |
| 3599 | bool ntlmv2_flag = false; | 3599 | bool ntlmv2_flag = false; |
| 3600 | int first_time = 0; | 3600 | int first_time = 0; |
| 3601 | struct TCP_Server_Info *server = pSesInfo->server; | ||
| 3601 | 3602 | ||
| 3602 | /* what if server changes its buffer size after dropping the session? */ | 3603 | /* what if server changes its buffer size after dropping the session? */ |
| 3603 | if (pSesInfo->server->maxBuf == 0) /* no need to send on reconnect */ { | 3604 | if (server->maxBuf == 0) /* no need to send on reconnect */ { |
| 3604 | rc = CIFSSMBNegotiate(xid, pSesInfo); | 3605 | rc = CIFSSMBNegotiate(xid, pSesInfo); |
| 3605 | if (rc == -EAGAIN) /* retry only once on 1st time connection */ { | 3606 | if (rc == -EAGAIN) { |
| 3607 | /* retry only once on 1st time connection */ | ||
| 3606 | rc = CIFSSMBNegotiate(xid, pSesInfo); | 3608 | rc = CIFSSMBNegotiate(xid, pSesInfo); |
| 3607 | if (rc == -EAGAIN) | 3609 | if (rc == -EAGAIN) |
| 3608 | rc = -EHOSTDOWN; | 3610 | rc = -EHOSTDOWN; |
| 3609 | } | 3611 | } |
| 3610 | if (rc == 0) { | 3612 | if (rc == 0) { |
| 3611 | spin_lock(&GlobalMid_Lock); | 3613 | spin_lock(&GlobalMid_Lock); |
| 3612 | if (pSesInfo->server->tcpStatus != CifsExiting) | 3614 | if (server->tcpStatus != CifsExiting) |
| 3613 | pSesInfo->server->tcpStatus = CifsGood; | 3615 | server->tcpStatus = CifsGood; |
| 3614 | else | 3616 | else |
| 3615 | rc = -EHOSTDOWN; | 3617 | rc = -EHOSTDOWN; |
| 3616 | spin_unlock(&GlobalMid_Lock); | 3618 | spin_unlock(&GlobalMid_Lock); |
| @@ -3623,23 +3625,22 @@ int cifs_setup_session(unsigned int xid, struct cifsSesInfo *pSesInfo, | |||
| 3623 | goto ss_err_exit; | 3625 | goto ss_err_exit; |
| 3624 | 3626 | ||
| 3625 | pSesInfo->flags = 0; | 3627 | pSesInfo->flags = 0; |
| 3626 | pSesInfo->capabilities = pSesInfo->server->capabilities; | 3628 | pSesInfo->capabilities = server->capabilities; |
| 3627 | if (linuxExtEnabled == 0) | 3629 | if (linuxExtEnabled == 0) |
| 3628 | pSesInfo->capabilities &= (~CAP_UNIX); | 3630 | pSesInfo->capabilities &= (~CAP_UNIX); |
| 3629 | /* pSesInfo->sequence_number = 0;*/ | 3631 | /* pSesInfo->sequence_number = 0;*/ |
| 3630 | cFYI(1, ("Security Mode: 0x%x Capabilities: 0x%x TimeAdjust: %d", | 3632 | cFYI(1, ("Security Mode: 0x%x Capabilities: 0x%x TimeAdjust: %d", |
| 3631 | pSesInfo->server->secMode, | 3633 | server->secMode, server->capabilities, server->timeAdj)); |
| 3632 | pSesInfo->server->capabilities, | 3634 | |
| 3633 | pSesInfo->server->timeAdj)); | ||
| 3634 | if (experimEnabled < 2) | 3635 | if (experimEnabled < 2) |
| 3635 | rc = CIFS_SessSetup(xid, pSesInfo, first_time, nls_info); | 3636 | rc = CIFS_SessSetup(xid, pSesInfo, first_time, nls_info); |
| 3636 | else if (extended_security | 3637 | else if (extended_security |
| 3637 | && (pSesInfo->capabilities & CAP_EXTENDED_SECURITY) | 3638 | && (pSesInfo->capabilities & CAP_EXTENDED_SECURITY) |
| 3638 | && (pSesInfo->server->secType == NTLMSSP)) { | 3639 | && (server->secType == NTLMSSP)) { |
| 3639 | rc = -EOPNOTSUPP; | 3640 | rc = -EOPNOTSUPP; |
| 3640 | } else if (extended_security | 3641 | } else if (extended_security |
| 3641 | && (pSesInfo->capabilities & CAP_EXTENDED_SECURITY) | 3642 | && (pSesInfo->capabilities & CAP_EXTENDED_SECURITY) |
| 3642 | && (pSesInfo->server->secType == RawNTLMSSP)) { | 3643 | && (server->secType == RawNTLMSSP)) { |
| 3643 | cFYI(1, ("NTLMSSP sesssetup")); | 3644 | cFYI(1, ("NTLMSSP sesssetup")); |
| 3644 | rc = CIFSNTLMSSPNegotiateSessSetup(xid, pSesInfo, &ntlmv2_flag, | 3645 | rc = CIFSNTLMSSPNegotiateSessSetup(xid, pSesInfo, &ntlmv2_flag, |
| 3645 | nls_info); | 3646 | nls_info); |
| @@ -3668,12 +3669,12 @@ int cifs_setup_session(unsigned int xid, struct cifsSesInfo *pSesInfo, | |||
| 3668 | 3669 | ||
| 3669 | } else { | 3670 | } else { |
| 3670 | SMBNTencrypt(pSesInfo->password, | 3671 | SMBNTencrypt(pSesInfo->password, |
| 3671 | pSesInfo->server->cryptKey, | 3672 | server->cryptKey, |
| 3672 | ntlm_session_key); | 3673 | ntlm_session_key); |
| 3673 | 3674 | ||
| 3674 | if (first_time) | 3675 | if (first_time) |
| 3675 | cifs_calculate_mac_key( | 3676 | cifs_calculate_mac_key( |
| 3676 | &pSesInfo->server->mac_signing_key, | 3677 | &server->mac_signing_key, |
| 3677 | ntlm_session_key, | 3678 | ntlm_session_key, |
| 3678 | pSesInfo->password); | 3679 | pSesInfo->password); |
| 3679 | } | 3680 | } |
| @@ -3686,13 +3687,13 @@ int cifs_setup_session(unsigned int xid, struct cifsSesInfo *pSesInfo, | |||
| 3686 | nls_info); | 3687 | nls_info); |
| 3687 | } | 3688 | } |
| 3688 | } else { /* old style NTLM 0.12 session setup */ | 3689 | } else { /* old style NTLM 0.12 session setup */ |
| 3689 | SMBNTencrypt(pSesInfo->password, pSesInfo->server->cryptKey, | 3690 | SMBNTencrypt(pSesInfo->password, server->cryptKey, |
| 3690 | ntlm_session_key); | 3691 | ntlm_session_key); |
| 3691 | 3692 | ||
| 3692 | if (first_time) | 3693 | if (first_time) |
| 3693 | cifs_calculate_mac_key( | 3694 | cifs_calculate_mac_key(&server->mac_signing_key, |
| 3694 | &pSesInfo->server->mac_signing_key, | 3695 | ntlm_session_key, |
| 3695 | ntlm_session_key, pSesInfo->password); | 3696 | pSesInfo->password); |
| 3696 | 3697 | ||
| 3697 | rc = CIFSSessSetup(xid, pSesInfo, ntlm_session_key, nls_info); | 3698 | rc = CIFSSessSetup(xid, pSesInfo, ntlm_session_key, nls_info); |
| 3698 | } | 3699 | } |
diff --git a/fs/cifs/dns_resolve.c b/fs/cifs/dns_resolve.c index f730ef35499e..a2e0673e1b08 100644 --- a/fs/cifs/dns_resolve.c +++ b/fs/cifs/dns_resolve.c | |||
| @@ -47,11 +47,18 @@ static int dns_resolver_instantiate(struct key *key, const void *data, | |||
| 47 | return rc; | 47 | return rc; |
| 48 | } | 48 | } |
| 49 | 49 | ||
| 50 | static void | ||
| 51 | dns_resolver_destroy(struct key *key) | ||
| 52 | { | ||
| 53 | kfree(key->payload.data); | ||
| 54 | } | ||
| 55 | |||
| 50 | struct key_type key_type_dns_resolver = { | 56 | struct key_type key_type_dns_resolver = { |
| 51 | .name = "dns_resolver", | 57 | .name = "dns_resolver", |
| 52 | .def_datalen = sizeof(struct in_addr), | 58 | .def_datalen = sizeof(struct in_addr), |
| 53 | .describe = user_describe, | 59 | .describe = user_describe, |
| 54 | .instantiate = dns_resolver_instantiate, | 60 | .instantiate = dns_resolver_instantiate, |
| 61 | .destroy = dns_resolver_destroy, | ||
| 55 | .match = user_match, | 62 | .match = user_match, |
| 56 | }; | 63 | }; |
| 57 | 64 | ||
diff --git a/fs/cifs/file.c b/fs/cifs/file.c index ff14d14903a0..cbefe1f1f9fe 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c | |||
| @@ -833,6 +833,10 @@ ssize_t cifs_user_write(struct file *file, const char __user *write_data, | |||
| 833 | return -EBADF; | 833 | return -EBADF; |
| 834 | open_file = (struct cifsFileInfo *) file->private_data; | 834 | open_file = (struct cifsFileInfo *) file->private_data; |
| 835 | 835 | ||
| 836 | rc = generic_write_checks(file, poffset, &write_size, 0); | ||
| 837 | if (rc) | ||
| 838 | return rc; | ||
| 839 | |||
| 836 | xid = GetXid(); | 840 | xid = GetXid(); |
| 837 | 841 | ||
| 838 | if (*poffset > file->f_path.dentry->d_inode->i_size) | 842 | if (*poffset > file->f_path.dentry->d_inode->i_size) |
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index 28a22092d450..9c548f110102 100644 --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c | |||
| @@ -546,7 +546,8 @@ int cifs_get_inode_info(struct inode **pinode, | |||
| 546 | if ((inode->i_mode & S_IWUGO) == 0 && | 546 | if ((inode->i_mode & S_IWUGO) == 0 && |
| 547 | (attr & ATTR_READONLY) == 0) | 547 | (attr & ATTR_READONLY) == 0) |
| 548 | inode->i_mode |= (S_IWUGO & default_mode); | 548 | inode->i_mode |= (S_IWUGO & default_mode); |
| 549 | inode->i_mode &= ~S_IFMT; | 549 | |
| 550 | inode->i_mode &= ~S_IFMT; | ||
| 550 | } | 551 | } |
| 551 | /* clear write bits if ATTR_READONLY is set */ | 552 | /* clear write bits if ATTR_READONLY is set */ |
| 552 | if (attr & ATTR_READONLY) | 553 | if (attr & ATTR_READONLY) |
| @@ -649,6 +650,7 @@ struct inode *cifs_iget(struct super_block *sb, unsigned long ino) | |||
| 649 | inode->i_fop = &simple_dir_operations; | 650 | inode->i_fop = &simple_dir_operations; |
| 650 | inode->i_uid = cifs_sb->mnt_uid; | 651 | inode->i_uid = cifs_sb->mnt_uid; |
| 651 | inode->i_gid = cifs_sb->mnt_gid; | 652 | inode->i_gid = cifs_sb->mnt_gid; |
| 653 | } else if (rc) { | ||
| 652 | _FreeXid(xid); | 654 | _FreeXid(xid); |
| 653 | iget_failed(inode); | 655 | iget_failed(inode); |
| 654 | return ERR_PTR(rc); | 656 | return ERR_PTR(rc); |
diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c index ed150efbe27c..252fdc0567f1 100644 --- a/fs/cifs/sess.c +++ b/fs/cifs/sess.c | |||
| @@ -409,6 +409,8 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time, | |||
| 409 | #ifdef CONFIG_CIFS_WEAK_PW_HASH | 409 | #ifdef CONFIG_CIFS_WEAK_PW_HASH |
| 410 | char lnm_session_key[CIFS_SESS_KEY_SIZE]; | 410 | char lnm_session_key[CIFS_SESS_KEY_SIZE]; |
| 411 | 411 | ||
| 412 | pSMB->req.hdr.Flags2 &= ~SMBFLG2_UNICODE; | ||
| 413 | |||
| 412 | /* no capabilities flags in old lanman negotiation */ | 414 | /* no capabilities flags in old lanman negotiation */ |
| 413 | 415 | ||
| 414 | pSMB->old_req.PasswordLength = cpu_to_le16(CIFS_SESS_KEY_SIZE); | 416 | pSMB->old_req.PasswordLength = cpu_to_le16(CIFS_SESS_KEY_SIZE); |
| @@ -505,7 +507,7 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time, | |||
| 505 | unicode_ssetup_strings(&bcc_ptr, ses, nls_cp); | 507 | unicode_ssetup_strings(&bcc_ptr, ses, nls_cp); |
| 506 | } else | 508 | } else |
| 507 | ascii_ssetup_strings(&bcc_ptr, ses, nls_cp); | 509 | ascii_ssetup_strings(&bcc_ptr, ses, nls_cp); |
| 508 | } else if (type == Kerberos) { | 510 | } else if (type == Kerberos || type == MSKerberos) { |
| 509 | #ifdef CONFIG_CIFS_UPCALL | 511 | #ifdef CONFIG_CIFS_UPCALL |
| 510 | struct cifs_spnego_msg *msg; | 512 | struct cifs_spnego_msg *msg; |
| 511 | spnego_key = cifs_get_spnego_key(ses); | 513 | spnego_key = cifs_get_spnego_key(ses); |
| @@ -516,6 +518,15 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time, | |||
| 516 | } | 518 | } |
| 517 | 519 | ||
| 518 | msg = spnego_key->payload.data; | 520 | msg = spnego_key->payload.data; |
| 521 | /* check version field to make sure that cifs.upcall is | ||
| 522 | sending us a response in an expected form */ | ||
| 523 | if (msg->version != CIFS_SPNEGO_UPCALL_VERSION) { | ||
| 524 | cERROR(1, ("incorrect version of cifs.upcall (expected" | ||
| 525 | " %d but got %d)", | ||
| 526 | CIFS_SPNEGO_UPCALL_VERSION, msg->version)); | ||
| 527 | rc = -EKEYREJECTED; | ||
| 528 | goto ssetup_exit; | ||
| 529 | } | ||
| 519 | /* bail out if key is too long */ | 530 | /* bail out if key is too long */ |
| 520 | if (msg->sesskey_len > | 531 | if (msg->sesskey_len > |
| 521 | sizeof(ses->server->mac_signing_key.data.krb5)) { | 532 | sizeof(ses->server->mac_signing_key.data.krb5)) { |
diff --git a/fs/compat.c b/fs/compat.c index c9d1472e65c5..075d0509970d 100644 --- a/fs/compat.c +++ b/fs/compat.c | |||
| @@ -792,8 +792,10 @@ static int compat_fillonedir(void *__buf, const char *name, int namlen, | |||
| 792 | if (buf->result) | 792 | if (buf->result) |
| 793 | return -EINVAL; | 793 | return -EINVAL; |
| 794 | d_ino = ino; | 794 | d_ino = ino; |
| 795 | if (sizeof(d_ino) < sizeof(ino) && d_ino != ino) | 795 | if (sizeof(d_ino) < sizeof(ino) && d_ino != ino) { |
| 796 | buf->result = -EOVERFLOW; | ||
| 796 | return -EOVERFLOW; | 797 | return -EOVERFLOW; |
| 798 | } | ||
| 797 | buf->result++; | 799 | buf->result++; |
| 798 | dirent = buf->dirent; | 800 | dirent = buf->dirent; |
| 799 | if (!access_ok(VERIFY_WRITE, dirent, | 801 | if (!access_ok(VERIFY_WRITE, dirent, |
| @@ -862,8 +864,10 @@ static int compat_filldir(void *__buf, const char *name, int namlen, | |||
| 862 | if (reclen > buf->count) | 864 | if (reclen > buf->count) |
| 863 | return -EINVAL; | 865 | return -EINVAL; |
| 864 | d_ino = ino; | 866 | d_ino = ino; |
| 865 | if (sizeof(d_ino) < sizeof(ino) && d_ino != ino) | 867 | if (sizeof(d_ino) < sizeof(ino) && d_ino != ino) { |
| 868 | buf->error = -EOVERFLOW; | ||
| 866 | return -EOVERFLOW; | 869 | return -EOVERFLOW; |
| 870 | } | ||
| 867 | dirent = buf->previous; | 871 | dirent = buf->previous; |
| 868 | if (dirent) { | 872 | if (dirent) { |
| 869 | if (__put_user(offset, &dirent->d_off)) | 873 | if (__put_user(offset, &dirent->d_off)) |
diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c index 7a8db78a91d2..8e93341f3e82 100644 --- a/fs/configfs/dir.c +++ b/fs/configfs/dir.c | |||
| @@ -1311,16 +1311,18 @@ static int configfs_rmdir(struct inode *dir, struct dentry *dentry) | |||
| 1311 | * Ensure that no racing symlink() will make detach_prep() fail while | 1311 | * Ensure that no racing symlink() will make detach_prep() fail while |
| 1312 | * the new link is temporarily attached | 1312 | * the new link is temporarily attached |
| 1313 | */ | 1313 | */ |
| 1314 | mutex_lock(&configfs_symlink_mutex); | ||
| 1315 | spin_lock(&configfs_dirent_lock); | ||
| 1316 | do { | 1314 | do { |
| 1317 | struct mutex *wait_mutex; | 1315 | struct mutex *wait_mutex; |
| 1318 | 1316 | ||
| 1317 | mutex_lock(&configfs_symlink_mutex); | ||
| 1318 | spin_lock(&configfs_dirent_lock); | ||
| 1319 | ret = configfs_detach_prep(dentry, &wait_mutex); | 1319 | ret = configfs_detach_prep(dentry, &wait_mutex); |
| 1320 | if (ret) { | 1320 | if (ret) |
| 1321 | configfs_detach_rollback(dentry); | 1321 | configfs_detach_rollback(dentry); |
| 1322 | spin_unlock(&configfs_dirent_lock); | 1322 | spin_unlock(&configfs_dirent_lock); |
| 1323 | mutex_unlock(&configfs_symlink_mutex); | 1323 | mutex_unlock(&configfs_symlink_mutex); |
| 1324 | |||
| 1325 | if (ret) { | ||
| 1324 | if (ret != -EAGAIN) { | 1326 | if (ret != -EAGAIN) { |
| 1325 | config_item_put(parent_item); | 1327 | config_item_put(parent_item); |
| 1326 | return ret; | 1328 | return ret; |
| @@ -1329,13 +1331,8 @@ static int configfs_rmdir(struct inode *dir, struct dentry *dentry) | |||
| 1329 | /* Wait until the racing operation terminates */ | 1331 | /* Wait until the racing operation terminates */ |
| 1330 | mutex_lock(wait_mutex); | 1332 | mutex_lock(wait_mutex); |
| 1331 | mutex_unlock(wait_mutex); | 1333 | mutex_unlock(wait_mutex); |
| 1332 | |||
| 1333 | mutex_lock(&configfs_symlink_mutex); | ||
| 1334 | spin_lock(&configfs_dirent_lock); | ||
| 1335 | } | 1334 | } |
| 1336 | } while (ret == -EAGAIN); | 1335 | } while (ret == -EAGAIN); |
| 1337 | spin_unlock(&configfs_dirent_lock); | ||
| 1338 | mutex_unlock(&configfs_symlink_mutex); | ||
| 1339 | 1336 | ||
| 1340 | /* Get a working ref for the duration of this function */ | 1337 | /* Get a working ref for the duration of this function */ |
| 1341 | item = configfs_get_config_item(dentry); | 1338 | item = configfs_get_config_item(dentry); |
diff --git a/fs/cramfs/inode.c b/fs/cramfs/inode.c index 0c3b618c15b3..f40423eb1a14 100644 --- a/fs/cramfs/inode.c +++ b/fs/cramfs/inode.c | |||
| @@ -43,58 +43,13 @@ static DEFINE_MUTEX(read_mutex); | |||
| 43 | static int cramfs_iget5_test(struct inode *inode, void *opaque) | 43 | static int cramfs_iget5_test(struct inode *inode, void *opaque) |
| 44 | { | 44 | { |
| 45 | struct cramfs_inode *cramfs_inode = opaque; | 45 | struct cramfs_inode *cramfs_inode = opaque; |
| 46 | 46 | return inode->i_ino == CRAMINO(cramfs_inode) && inode->i_ino != 1; | |
| 47 | if (inode->i_ino != CRAMINO(cramfs_inode)) | ||
| 48 | return 0; /* does not match */ | ||
| 49 | |||
| 50 | if (inode->i_ino != 1) | ||
| 51 | return 1; | ||
| 52 | |||
| 53 | /* all empty directories, char, block, pipe, and sock, share inode #1 */ | ||
| 54 | |||
| 55 | if ((inode->i_mode != cramfs_inode->mode) || | ||
| 56 | (inode->i_gid != cramfs_inode->gid) || | ||
| 57 | (inode->i_uid != cramfs_inode->uid)) | ||
| 58 | return 0; /* does not match */ | ||
| 59 | |||
| 60 | if ((S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode)) && | ||
| 61 | (inode->i_rdev != old_decode_dev(cramfs_inode->size))) | ||
| 62 | return 0; /* does not match */ | ||
| 63 | |||
| 64 | return 1; /* matches */ | ||
| 65 | } | 47 | } |
| 66 | 48 | ||
| 67 | static int cramfs_iget5_set(struct inode *inode, void *opaque) | 49 | static int cramfs_iget5_set(struct inode *inode, void *opaque) |
| 68 | { | 50 | { |
| 69 | static struct timespec zerotime; | ||
| 70 | struct cramfs_inode *cramfs_inode = opaque; | 51 | struct cramfs_inode *cramfs_inode = opaque; |
| 71 | inode->i_mode = cramfs_inode->mode; | ||
| 72 | inode->i_uid = cramfs_inode->uid; | ||
| 73 | inode->i_size = cramfs_inode->size; | ||
| 74 | inode->i_blocks = (cramfs_inode->size - 1) / 512 + 1; | ||
| 75 | inode->i_gid = cramfs_inode->gid; | ||
| 76 | /* Struct copy intentional */ | ||
| 77 | inode->i_mtime = inode->i_atime = inode->i_ctime = zerotime; | ||
| 78 | inode->i_ino = CRAMINO(cramfs_inode); | 52 | inode->i_ino = CRAMINO(cramfs_inode); |
| 79 | /* inode->i_nlink is left 1 - arguably wrong for directories, | ||
| 80 | but it's the best we can do without reading the directory | ||
| 81 | contents. 1 yields the right result in GNU find, even | ||
| 82 | without -noleaf option. */ | ||
| 83 | if (S_ISREG(inode->i_mode)) { | ||
| 84 | inode->i_fop = &generic_ro_fops; | ||
| 85 | inode->i_data.a_ops = &cramfs_aops; | ||
| 86 | } else if (S_ISDIR(inode->i_mode)) { | ||
| 87 | inode->i_op = &cramfs_dir_inode_operations; | ||
| 88 | inode->i_fop = &cramfs_directory_operations; | ||
| 89 | } else if (S_ISLNK(inode->i_mode)) { | ||
| 90 | inode->i_op = &page_symlink_inode_operations; | ||
| 91 | inode->i_data.a_ops = &cramfs_aops; | ||
| 92 | } else { | ||
| 93 | inode->i_size = 0; | ||
| 94 | inode->i_blocks = 0; | ||
| 95 | init_special_inode(inode, inode->i_mode, | ||
| 96 | old_decode_dev(cramfs_inode->size)); | ||
| 97 | } | ||
| 98 | return 0; | 53 | return 0; |
| 99 | } | 54 | } |
| 100 | 55 | ||
| @@ -104,12 +59,48 @@ static struct inode *get_cramfs_inode(struct super_block *sb, | |||
| 104 | struct inode *inode = iget5_locked(sb, CRAMINO(cramfs_inode), | 59 | struct inode *inode = iget5_locked(sb, CRAMINO(cramfs_inode), |
| 105 | cramfs_iget5_test, cramfs_iget5_set, | 60 | cramfs_iget5_test, cramfs_iget5_set, |
| 106 | cramfs_inode); | 61 | cramfs_inode); |
| 62 | static struct timespec zerotime; | ||
| 63 | |||
| 107 | if (inode && (inode->i_state & I_NEW)) { | 64 | if (inode && (inode->i_state & I_NEW)) { |
| 65 | inode->i_mode = cramfs_inode->mode; | ||
| 66 | inode->i_uid = cramfs_inode->uid; | ||
| 67 | inode->i_size = cramfs_inode->size; | ||
| 68 | inode->i_blocks = (cramfs_inode->size - 1) / 512 + 1; | ||
| 69 | inode->i_gid = cramfs_inode->gid; | ||
| 70 | /* Struct copy intentional */ | ||
| 71 | inode->i_mtime = inode->i_atime = inode->i_ctime = zerotime; | ||
| 72 | /* inode->i_nlink is left 1 - arguably wrong for directories, | ||
| 73 | but it's the best we can do without reading the directory | ||
| 74 | contents. 1 yields the right result in GNU find, even | ||
| 75 | without -noleaf option. */ | ||
| 76 | if (S_ISREG(inode->i_mode)) { | ||
| 77 | inode->i_fop = &generic_ro_fops; | ||
| 78 | inode->i_data.a_ops = &cramfs_aops; | ||
| 79 | } else if (S_ISDIR(inode->i_mode)) { | ||
| 80 | inode->i_op = &cramfs_dir_inode_operations; | ||
| 81 | inode->i_fop = &cramfs_directory_operations; | ||
| 82 | } else if (S_ISLNK(inode->i_mode)) { | ||
| 83 | inode->i_op = &page_symlink_inode_operations; | ||
| 84 | inode->i_data.a_ops = &cramfs_aops; | ||
| 85 | } else { | ||
| 86 | inode->i_size = 0; | ||
| 87 | inode->i_blocks = 0; | ||
| 88 | init_special_inode(inode, inode->i_mode, | ||
| 89 | old_decode_dev(cramfs_inode->size)); | ||
| 90 | } | ||
| 108 | unlock_new_inode(inode); | 91 | unlock_new_inode(inode); |
| 109 | } | 92 | } |
| 110 | return inode; | 93 | return inode; |
| 111 | } | 94 | } |
| 112 | 95 | ||
| 96 | static void cramfs_drop_inode(struct inode *inode) | ||
| 97 | { | ||
| 98 | if (inode->i_ino == 1) | ||
| 99 | generic_delete_inode(inode); | ||
| 100 | else | ||
| 101 | generic_drop_inode(inode); | ||
| 102 | } | ||
| 103 | |||
| 113 | /* | 104 | /* |
| 114 | * We have our own block cache: don't fill up the buffer cache | 105 | * We have our own block cache: don't fill up the buffer cache |
| 115 | * with the rom-image, because the way the filesystem is set | 106 | * with the rom-image, because the way the filesystem is set |
| @@ -534,6 +525,7 @@ static const struct super_operations cramfs_ops = { | |||
| 534 | .put_super = cramfs_put_super, | 525 | .put_super = cramfs_put_super, |
| 535 | .remount_fs = cramfs_remount, | 526 | .remount_fs = cramfs_remount, |
| 536 | .statfs = cramfs_statfs, | 527 | .statfs = cramfs_statfs, |
| 528 | .drop_inode = cramfs_drop_inode, | ||
| 537 | }; | 529 | }; |
| 538 | 530 | ||
| 539 | static int cramfs_get_sb(struct file_system_type *fs_type, | 531 | static int cramfs_get_sb(struct file_system_type *fs_type, |
diff --git a/fs/dcache.c b/fs/dcache.c index 101663d15e9f..80e93956aced 100644 --- a/fs/dcache.c +++ b/fs/dcache.c | |||
| @@ -1236,7 +1236,7 @@ struct dentry *d_splice_alias(struct inode *inode, struct dentry *dentry) | |||
| 1236 | * If no entry exists with the exact case name, allocate new dentry with | 1236 | * If no entry exists with the exact case name, allocate new dentry with |
| 1237 | * the exact case, and return the spliced entry. | 1237 | * the exact case, and return the spliced entry. |
| 1238 | */ | 1238 | */ |
| 1239 | struct dentry *d_add_ci(struct inode *inode, struct dentry *dentry, | 1239 | struct dentry *d_add_ci(struct dentry *dentry, struct inode *inode, |
| 1240 | struct qstr *name) | 1240 | struct qstr *name) |
| 1241 | { | 1241 | { |
| 1242 | int error; | 1242 | int error; |
diff --git a/fs/dlm/config.c b/fs/dlm/config.c index c4e7d721bd8d..89d2fb7b991a 100644 --- a/fs/dlm/config.c +++ b/fs/dlm/config.c | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | ******************************************************************************* | 2 | ******************************************************************************* |
| 3 | ** | 3 | ** |
| 4 | ** Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved. | 4 | ** Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved. |
| 5 | ** Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. | 5 | ** Copyright (C) 2004-2008 Red Hat, Inc. All rights reserved. |
| 6 | ** | 6 | ** |
| 7 | ** This copyrighted material is made available to anyone wishing to use, | 7 | ** This copyrighted material is made available to anyone wishing to use, |
| 8 | ** modify, copy, or redistribute it subject to the terms and conditions | 8 | ** modify, copy, or redistribute it subject to the terms and conditions |
| @@ -30,16 +30,16 @@ | |||
| 30 | 30 | ||
| 31 | static struct config_group *space_list; | 31 | static struct config_group *space_list; |
| 32 | static struct config_group *comm_list; | 32 | static struct config_group *comm_list; |
| 33 | static struct comm *local_comm; | 33 | static struct dlm_comm *local_comm; |
| 34 | 34 | ||
| 35 | struct clusters; | 35 | struct dlm_clusters; |
| 36 | struct cluster; | 36 | struct dlm_cluster; |
| 37 | struct spaces; | 37 | struct dlm_spaces; |
| 38 | struct space; | 38 | struct dlm_space; |
| 39 | struct comms; | 39 | struct dlm_comms; |
| 40 | struct comm; | 40 | struct dlm_comm; |
| 41 | struct nodes; | 41 | struct dlm_nodes; |
| 42 | struct node; | 42 | struct dlm_node; |
| 43 | 43 | ||
| 44 | static struct config_group *make_cluster(struct config_group *, const char *); | 44 | static struct config_group *make_cluster(struct config_group *, const char *); |
| 45 | static void drop_cluster(struct config_group *, struct config_item *); | 45 | static void drop_cluster(struct config_group *, struct config_item *); |
| @@ -68,17 +68,22 @@ static ssize_t show_node(struct config_item *i, struct configfs_attribute *a, | |||
| 68 | static ssize_t store_node(struct config_item *i, struct configfs_attribute *a, | 68 | static ssize_t store_node(struct config_item *i, struct configfs_attribute *a, |
| 69 | const char *buf, size_t len); | 69 | const char *buf, size_t len); |
| 70 | 70 | ||
| 71 | static ssize_t comm_nodeid_read(struct comm *cm, char *buf); | 71 | static ssize_t comm_nodeid_read(struct dlm_comm *cm, char *buf); |
| 72 | static ssize_t comm_nodeid_write(struct comm *cm, const char *buf, size_t len); | 72 | static ssize_t comm_nodeid_write(struct dlm_comm *cm, const char *buf, |
| 73 | static ssize_t comm_local_read(struct comm *cm, char *buf); | 73 | size_t len); |
| 74 | static ssize_t comm_local_write(struct comm *cm, const char *buf, size_t len); | 74 | static ssize_t comm_local_read(struct dlm_comm *cm, char *buf); |
| 75 | static ssize_t comm_addr_write(struct comm *cm, const char *buf, size_t len); | 75 | static ssize_t comm_local_write(struct dlm_comm *cm, const char *buf, |
| 76 | static ssize_t node_nodeid_read(struct node *nd, char *buf); | 76 | size_t len); |
| 77 | static ssize_t node_nodeid_write(struct node *nd, const char *buf, size_t len); | 77 | static ssize_t comm_addr_write(struct dlm_comm *cm, const char *buf, |
| 78 | static ssize_t node_weight_read(struct node *nd, char *buf); | 78 | size_t len); |
| 79 | static ssize_t node_weight_write(struct node *nd, const char *buf, size_t len); | 79 | static ssize_t node_nodeid_read(struct dlm_node *nd, char *buf); |
| 80 | 80 | static ssize_t node_nodeid_write(struct dlm_node *nd, const char *buf, | |
| 81 | struct cluster { | 81 | size_t len); |
| 82 | static ssize_t node_weight_read(struct dlm_node *nd, char *buf); | ||
| 83 | static ssize_t node_weight_write(struct dlm_node *nd, const char *buf, | ||
| 84 | size_t len); | ||
| 85 | |||
| 86 | struct dlm_cluster { | ||
| 82 | struct config_group group; | 87 | struct config_group group; |
| 83 | unsigned int cl_tcp_port; | 88 | unsigned int cl_tcp_port; |
| 84 | unsigned int cl_buffer_size; | 89 | unsigned int cl_buffer_size; |
| @@ -109,11 +114,11 @@ enum { | |||
| 109 | 114 | ||
| 110 | struct cluster_attribute { | 115 | struct cluster_attribute { |
| 111 | struct configfs_attribute attr; | 116 | struct configfs_attribute attr; |
| 112 | ssize_t (*show)(struct cluster *, char *); | 117 | ssize_t (*show)(struct dlm_cluster *, char *); |
| 113 | ssize_t (*store)(struct cluster *, const char *, size_t); | 118 | ssize_t (*store)(struct dlm_cluster *, const char *, size_t); |
| 114 | }; | 119 | }; |
| 115 | 120 | ||
| 116 | static ssize_t cluster_set(struct cluster *cl, unsigned int *cl_field, | 121 | static ssize_t cluster_set(struct dlm_cluster *cl, unsigned int *cl_field, |
| 117 | int *info_field, int check_zero, | 122 | int *info_field, int check_zero, |
| 118 | const char *buf, size_t len) | 123 | const char *buf, size_t len) |
| 119 | { | 124 | { |
| @@ -134,12 +139,12 @@ static ssize_t cluster_set(struct cluster *cl, unsigned int *cl_field, | |||
| 134 | } | 139 | } |
| 135 | 140 | ||
| 136 | #define CLUSTER_ATTR(name, check_zero) \ | 141 | #define CLUSTER_ATTR(name, check_zero) \ |
| 137 | static ssize_t name##_write(struct cluster *cl, const char *buf, size_t len) \ | 142 | static ssize_t name##_write(struct dlm_cluster *cl, const char *buf, size_t len) \ |
| 138 | { \ | 143 | { \ |
| 139 | return cluster_set(cl, &cl->cl_##name, &dlm_config.ci_##name, \ | 144 | return cluster_set(cl, &cl->cl_##name, &dlm_config.ci_##name, \ |
| 140 | check_zero, buf, len); \ | 145 | check_zero, buf, len); \ |
| 141 | } \ | 146 | } \ |
| 142 | static ssize_t name##_read(struct cluster *cl, char *buf) \ | 147 | static ssize_t name##_read(struct dlm_cluster *cl, char *buf) \ |
| 143 | { \ | 148 | { \ |
| 144 | return snprintf(buf, PAGE_SIZE, "%u\n", cl->cl_##name); \ | 149 | return snprintf(buf, PAGE_SIZE, "%u\n", cl->cl_##name); \ |
| 145 | } \ | 150 | } \ |
| @@ -181,8 +186,8 @@ enum { | |||
| 181 | 186 | ||
| 182 | struct comm_attribute { | 187 | struct comm_attribute { |
| 183 | struct configfs_attribute attr; | 188 | struct configfs_attribute attr; |
| 184 | ssize_t (*show)(struct comm *, char *); | 189 | ssize_t (*show)(struct dlm_comm *, char *); |
| 185 | ssize_t (*store)(struct comm *, const char *, size_t); | 190 | ssize_t (*store)(struct dlm_comm *, const char *, size_t); |
| 186 | }; | 191 | }; |
| 187 | 192 | ||
| 188 | static struct comm_attribute comm_attr_nodeid = { | 193 | static struct comm_attribute comm_attr_nodeid = { |
| @@ -222,8 +227,8 @@ enum { | |||
| 222 | 227 | ||
| 223 | struct node_attribute { | 228 | struct node_attribute { |
| 224 | struct configfs_attribute attr; | 229 | struct configfs_attribute attr; |
| 225 | ssize_t (*show)(struct node *, char *); | 230 | ssize_t (*show)(struct dlm_node *, char *); |
| 226 | ssize_t (*store)(struct node *, const char *, size_t); | 231 | ssize_t (*store)(struct dlm_node *, const char *, size_t); |
| 227 | }; | 232 | }; |
| 228 | 233 | ||
| 229 | static struct node_attribute node_attr_nodeid = { | 234 | static struct node_attribute node_attr_nodeid = { |
| @@ -248,26 +253,26 @@ static struct configfs_attribute *node_attrs[] = { | |||
| 248 | NULL, | 253 | NULL, |
| 249 | }; | 254 | }; |
| 250 | 255 | ||
| 251 | struct clusters { | 256 | struct dlm_clusters { |
| 252 | struct configfs_subsystem subsys; | 257 | struct configfs_subsystem subsys; |
| 253 | }; | 258 | }; |
| 254 | 259 | ||
| 255 | struct spaces { | 260 | struct dlm_spaces { |
| 256 | struct config_group ss_group; | 261 | struct config_group ss_group; |
| 257 | }; | 262 | }; |
| 258 | 263 | ||
| 259 | struct space { | 264 | struct dlm_space { |
| 260 | struct config_group group; | 265 | struct config_group group; |
| 261 | struct list_head members; | 266 | struct list_head members; |
| 262 | struct mutex members_lock; | 267 | struct mutex members_lock; |
| 263 | int members_count; | 268 | int members_count; |
| 264 | }; | 269 | }; |
| 265 | 270 | ||
| 266 | struct comms { | 271 | struct dlm_comms { |
| 267 | struct config_group cs_group; | 272 | struct config_group cs_group; |
| 268 | }; | 273 | }; |
| 269 | 274 | ||
| 270 | struct comm { | 275 | struct dlm_comm { |
| 271 | struct config_item item; | 276 | struct config_item item; |
| 272 | int nodeid; | 277 | int nodeid; |
| 273 | int local; | 278 | int local; |
| @@ -275,11 +280,11 @@ struct comm { | |||
| 275 | struct sockaddr_storage *addr[DLM_MAX_ADDR_COUNT]; | 280 | struct sockaddr_storage *addr[DLM_MAX_ADDR_COUNT]; |
| 276 | }; | 281 | }; |
| 277 | 282 | ||
| 278 | struct nodes { | 283 | struct dlm_nodes { |
| 279 | struct config_group ns_group; | 284 | struct config_group ns_group; |
| 280 | }; | 285 | }; |
| 281 | 286 | ||
| 282 | struct node { | 287 | struct dlm_node { |
| 283 | struct config_item item; | 288 | struct config_item item; |
| 284 | struct list_head list; /* space->members */ | 289 | struct list_head list; /* space->members */ |
| 285 | int nodeid; | 290 | int nodeid; |
| @@ -372,38 +377,40 @@ static struct config_item_type node_type = { | |||
| 372 | .ct_owner = THIS_MODULE, | 377 | .ct_owner = THIS_MODULE, |
| 373 | }; | 378 | }; |
| 374 | 379 | ||
| 375 | static struct cluster *to_cluster(struct config_item *i) | 380 | static struct dlm_cluster *to_cluster(struct config_item *i) |
| 376 | { | 381 | { |
| 377 | return i ? container_of(to_config_group(i), struct cluster, group):NULL; | 382 | return i ? container_of(to_config_group(i), struct dlm_cluster, group) : |
| 383 | NULL; | ||
| 378 | } | 384 | } |
| 379 | 385 | ||
| 380 | static struct space *to_space(struct config_item *i) | 386 | static struct dlm_space *to_space(struct config_item *i) |
| 381 | { | 387 | { |
| 382 | return i ? container_of(to_config_group(i), struct space, group) : NULL; | 388 | return i ? container_of(to_config_group(i), struct dlm_space, group) : |
| 389 | NULL; | ||
| 383 | } | 390 | } |
| 384 | 391 | ||
| 385 | static struct comm *to_comm(struct config_item *i) | 392 | static struct dlm_comm *to_comm(struct config_item *i) |
| 386 | { | 393 | { |
| 387 | return i ? container_of(i, struct comm, item) : NULL; | 394 | return i ? container_of(i, struct dlm_comm, item) : NULL; |
| 388 | } | 395 | } |
| 389 | 396 | ||
| 390 | static struct node *to_node(struct config_item *i) | 397 | static struct dlm_node *to_node(struct config_item *i) |
| 391 | { | 398 | { |
| 392 | return i ? container_of(i, struct node, item) : NULL; | 399 | return i ? container_of(i, struct dlm_node, item) : NULL; |
| 393 | } | 400 | } |
| 394 | 401 | ||
| 395 | static struct config_group *make_cluster(struct config_group *g, | 402 | static struct config_group *make_cluster(struct config_group *g, |
| 396 | const char *name) | 403 | const char *name) |
| 397 | { | 404 | { |
| 398 | struct cluster *cl = NULL; | 405 | struct dlm_cluster *cl = NULL; |
| 399 | struct spaces *sps = NULL; | 406 | struct dlm_spaces *sps = NULL; |
| 400 | struct comms *cms = NULL; | 407 | struct dlm_comms *cms = NULL; |
| 401 | void *gps = NULL; | 408 | void *gps = NULL; |
| 402 | 409 | ||
| 403 | cl = kzalloc(sizeof(struct cluster), GFP_KERNEL); | 410 | cl = kzalloc(sizeof(struct dlm_cluster), GFP_KERNEL); |
| 404 | gps = kcalloc(3, sizeof(struct config_group *), GFP_KERNEL); | 411 | gps = kcalloc(3, sizeof(struct config_group *), GFP_KERNEL); |
| 405 | sps = kzalloc(sizeof(struct spaces), GFP_KERNEL); | 412 | sps = kzalloc(sizeof(struct dlm_spaces), GFP_KERNEL); |
| 406 | cms = kzalloc(sizeof(struct comms), GFP_KERNEL); | 413 | cms = kzalloc(sizeof(struct dlm_comms), GFP_KERNEL); |
| 407 | 414 | ||
| 408 | if (!cl || !gps || !sps || !cms) | 415 | if (!cl || !gps || !sps || !cms) |
| 409 | goto fail; | 416 | goto fail; |
| @@ -443,7 +450,7 @@ static struct config_group *make_cluster(struct config_group *g, | |||
| 443 | 450 | ||
| 444 | static void drop_cluster(struct config_group *g, struct config_item *i) | 451 | static void drop_cluster(struct config_group *g, struct config_item *i) |
| 445 | { | 452 | { |
| 446 | struct cluster *cl = to_cluster(i); | 453 | struct dlm_cluster *cl = to_cluster(i); |
| 447 | struct config_item *tmp; | 454 | struct config_item *tmp; |
| 448 | int j; | 455 | int j; |
| 449 | 456 | ||
| @@ -461,20 +468,20 @@ static void drop_cluster(struct config_group *g, struct config_item *i) | |||
| 461 | 468 | ||
| 462 | static void release_cluster(struct config_item *i) | 469 | static void release_cluster(struct config_item *i) |
| 463 | { | 470 | { |
| 464 | struct cluster *cl = to_cluster(i); | 471 | struct dlm_cluster *cl = to_cluster(i); |
| 465 | kfree(cl->group.default_groups); | 472 | kfree(cl->group.default_groups); |
| 466 | kfree(cl); | 473 | kfree(cl); |
| 467 | } | 474 | } |
| 468 | 475 | ||
| 469 | static struct config_group *make_space(struct config_group *g, const char *name) | 476 | static struct config_group *make_space(struct config_group *g, const char *name) |
| 470 | { | 477 | { |
| 471 | struct space *sp = NULL; | 478 | struct dlm_space *sp = NULL; |
| 472 | struct nodes *nds = NULL; | 479 | struct dlm_nodes *nds = NULL; |
| 473 | void *gps = NULL; | 480 | void *gps = NULL; |
| 474 | 481 | ||
| 475 | sp = kzalloc(sizeof(struct space), GFP_KERNEL); | 482 | sp = kzalloc(sizeof(struct dlm_space), GFP_KERNEL); |
| 476 | gps = kcalloc(2, sizeof(struct config_group *), GFP_KERNEL); | 483 | gps = kcalloc(2, sizeof(struct config_group *), GFP_KERNEL); |
| 477 | nds = kzalloc(sizeof(struct nodes), GFP_KERNEL); | 484 | nds = kzalloc(sizeof(struct dlm_nodes), GFP_KERNEL); |
| 478 | 485 | ||
| 479 | if (!sp || !gps || !nds) | 486 | if (!sp || !gps || !nds) |
| 480 | goto fail; | 487 | goto fail; |
| @@ -500,7 +507,7 @@ static struct config_group *make_space(struct config_group *g, const char *name) | |||
| 500 | 507 | ||
| 501 | static void drop_space(struct config_group *g, struct config_item *i) | 508 | static void drop_space(struct config_group *g, struct config_item *i) |
| 502 | { | 509 | { |
| 503 | struct space *sp = to_space(i); | 510 | struct dlm_space *sp = to_space(i); |
| 504 | struct config_item *tmp; | 511 | struct config_item *tmp; |
| 505 | int j; | 512 | int j; |
| 506 | 513 | ||
| @@ -517,16 +524,16 @@ static void drop_space(struct config_group *g, struct config_item *i) | |||
| 517 | 524 | ||
| 518 | static void release_space(struct config_item *i) | 525 | static void release_space(struct config_item *i) |
| 519 | { | 526 | { |
| 520 | struct space *sp = to_space(i); | 527 | struct dlm_space *sp = to_space(i); |
| 521 | kfree(sp->group.default_groups); | 528 | kfree(sp->group.default_groups); |
| 522 | kfree(sp); | 529 | kfree(sp); |
| 523 | } | 530 | } |
| 524 | 531 | ||
| 525 | static struct config_item *make_comm(struct config_group *g, const char *name) | 532 | static struct config_item *make_comm(struct config_group *g, const char *name) |
| 526 | { | 533 | { |
| 527 | struct comm *cm; | 534 | struct dlm_comm *cm; |
| 528 | 535 | ||
| 529 | cm = kzalloc(sizeof(struct comm), GFP_KERNEL); | 536 | cm = kzalloc(sizeof(struct dlm_comm), GFP_KERNEL); |
| 530 | if (!cm) | 537 | if (!cm) |
| 531 | return ERR_PTR(-ENOMEM); | 538 | return ERR_PTR(-ENOMEM); |
| 532 | 539 | ||
| @@ -539,7 +546,7 @@ static struct config_item *make_comm(struct config_group *g, const char *name) | |||
| 539 | 546 | ||
| 540 | static void drop_comm(struct config_group *g, struct config_item *i) | 547 | static void drop_comm(struct config_group *g, struct config_item *i) |
| 541 | { | 548 | { |
| 542 | struct comm *cm = to_comm(i); | 549 | struct dlm_comm *cm = to_comm(i); |
| 543 | if (local_comm == cm) | 550 | if (local_comm == cm) |
| 544 | local_comm = NULL; | 551 | local_comm = NULL; |
| 545 | dlm_lowcomms_close(cm->nodeid); | 552 | dlm_lowcomms_close(cm->nodeid); |
| @@ -550,16 +557,16 @@ static void drop_comm(struct config_group *g, struct config_item *i) | |||
| 550 | 557 | ||
| 551 | static void release_comm(struct config_item *i) | 558 | static void release_comm(struct config_item *i) |
| 552 | { | 559 | { |
| 553 | struct comm *cm = to_comm(i); | 560 | struct dlm_comm *cm = to_comm(i); |
| 554 | kfree(cm); | 561 | kfree(cm); |
| 555 | } | 562 | } |
| 556 | 563 | ||
| 557 | static struct config_item *make_node(struct config_group *g, const char *name) | 564 | static struct config_item *make_node(struct config_group *g, const char *name) |
| 558 | { | 565 | { |
| 559 | struct space *sp = to_space(g->cg_item.ci_parent); | 566 | struct dlm_space *sp = to_space(g->cg_item.ci_parent); |
| 560 | struct node *nd; | 567 | struct dlm_node *nd; |
| 561 | 568 | ||
| 562 | nd = kzalloc(sizeof(struct node), GFP_KERNEL); | 569 | nd = kzalloc(sizeof(struct dlm_node), GFP_KERNEL); |
| 563 | if (!nd) | 570 | if (!nd) |
| 564 | return ERR_PTR(-ENOMEM); | 571 | return ERR_PTR(-ENOMEM); |
| 565 | 572 | ||
| @@ -578,8 +585,8 @@ static struct config_item *make_node(struct config_group *g, const char *name) | |||
| 578 | 585 | ||
| 579 | static void drop_node(struct config_group *g, struct config_item *i) | 586 | static void drop_node(struct config_group *g, struct config_item *i) |
| 580 | { | 587 | { |
| 581 | struct space *sp = to_space(g->cg_item.ci_parent); | 588 | struct dlm_space *sp = to_space(g->cg_item.ci_parent); |
| 582 | struct node *nd = to_node(i); | 589 | struct dlm_node *nd = to_node(i); |
| 583 | 590 | ||
| 584 | mutex_lock(&sp->members_lock); | 591 | mutex_lock(&sp->members_lock); |
| 585 | list_del(&nd->list); | 592 | list_del(&nd->list); |
| @@ -591,11 +598,11 @@ static void drop_node(struct config_group *g, struct config_item *i) | |||
| 591 | 598 | ||
| 592 | static void release_node(struct config_item *i) | 599 | static void release_node(struct config_item *i) |
| 593 | { | 600 | { |
| 594 | struct node *nd = to_node(i); | 601 | struct dlm_node *nd = to_node(i); |
| 595 | kfree(nd); | 602 | kfree(nd); |
| 596 | } | 603 | } |
| 597 | 604 | ||
| 598 | static struct clusters clusters_root = { | 605 | static struct dlm_clusters clusters_root = { |
| 599 | .subsys = { | 606 | .subsys = { |
| 600 | .su_group = { | 607 | .su_group = { |
| 601 | .cg_item = { | 608 | .cg_item = { |
| @@ -625,7 +632,7 @@ void dlm_config_exit(void) | |||
| 625 | static ssize_t show_cluster(struct config_item *i, struct configfs_attribute *a, | 632 | static ssize_t show_cluster(struct config_item *i, struct configfs_attribute *a, |
| 626 | char *buf) | 633 | char *buf) |
| 627 | { | 634 | { |
| 628 | struct cluster *cl = to_cluster(i); | 635 | struct dlm_cluster *cl = to_cluster(i); |
| 629 | struct cluster_attribute *cla = | 636 | struct cluster_attribute *cla = |
| 630 | container_of(a, struct cluster_attribute, attr); | 637 | container_of(a, struct cluster_attribute, attr); |
| 631 | return cla->show ? cla->show(cl, buf) : 0; | 638 | return cla->show ? cla->show(cl, buf) : 0; |
| @@ -635,7 +642,7 @@ static ssize_t store_cluster(struct config_item *i, | |||
| 635 | struct configfs_attribute *a, | 642 | struct configfs_attribute *a, |
| 636 | const char *buf, size_t len) | 643 | const char *buf, size_t len) |
| 637 | { | 644 | { |
| 638 | struct cluster *cl = to_cluster(i); | 645 | struct dlm_cluster *cl = to_cluster(i); |
| 639 | struct cluster_attribute *cla = | 646 | struct cluster_attribute *cla = |
| 640 | container_of(a, struct cluster_attribute, attr); | 647 | container_of(a, struct cluster_attribute, attr); |
| 641 | return cla->store ? cla->store(cl, buf, len) : -EINVAL; | 648 | return cla->store ? cla->store(cl, buf, len) : -EINVAL; |
| @@ -644,7 +651,7 @@ static ssize_t store_cluster(struct config_item *i, | |||
| 644 | static ssize_t show_comm(struct config_item *i, struct configfs_attribute *a, | 651 | static ssize_t show_comm(struct config_item *i, struct configfs_attribute *a, |
| 645 | char *buf) | 652 | char *buf) |
| 646 | { | 653 | { |
| 647 | struct comm *cm = to_comm(i); | 654 | struct dlm_comm *cm = to_comm(i); |
| 648 | struct comm_attribute *cma = | 655 | struct comm_attribute *cma = |
| 649 | container_of(a, struct comm_attribute, attr); | 656 | container_of(a, struct comm_attribute, attr); |
| 650 | return cma->show ? cma->show(cm, buf) : 0; | 657 | return cma->show ? cma->show(cm, buf) : 0; |
| @@ -653,29 +660,31 @@ static ssize_t show_comm(struct config_item *i, struct configfs_attribute *a, | |||
| 653 | static ssize_t store_comm(struct config_item *i, struct configfs_attribute *a, | 660 | static ssize_t store_comm(struct config_item *i, struct configfs_attribute *a, |
| 654 | const char *buf, size_t len) | 661 | const char *buf, size_t len) |
| 655 | { | 662 | { |
| 656 | struct comm *cm = to_comm(i); | 663 | struct dlm_comm *cm = to_comm(i); |
| 657 | struct comm_attribute *cma = | 664 | struct comm_attribute *cma = |
| 658 | container_of(a, struct comm_attribute, attr); | 665 | container_of(a, struct comm_attribute, attr); |
| 659 | return cma->store ? cma->store(cm, buf, len) : -EINVAL; | 666 | return cma->store ? cma->store(cm, buf, len) : -EINVAL; |
| 660 | } | 667 | } |
| 661 | 668 | ||
| 662 | static ssize_t comm_nodeid_read(struct comm *cm, char *buf) | 669 | static ssize_t comm_nodeid_read(struct dlm_comm *cm, char *buf) |
| 663 | { | 670 | { |
| 664 | return sprintf(buf, "%d\n", cm->nodeid); | 671 | return sprintf(buf, "%d\n", cm->nodeid); |
| 665 | } | 672 | } |
| 666 | 673 | ||
| 667 | static ssize_t comm_nodeid_write(struct comm *cm, const char *buf, size_t len) | 674 | static ssize_t comm_nodeid_write(struct dlm_comm *cm, const char *buf, |
| 675 | size_t len) | ||
| 668 | { | 676 | { |
| 669 | cm->nodeid = simple_strtol(buf, NULL, 0); | 677 | cm->nodeid = simple_strtol(buf, NULL, 0); |
| 670 | return len; | 678 | return len; |
| 671 | } | 679 | } |
| 672 | 680 | ||
| 673 | static ssize_t comm_local_read(struct comm *cm, char *buf) | 681 | static ssize_t comm_local_read(struct dlm_comm *cm, char *buf) |
| 674 | { | 682 | { |
| 675 | return sprintf(buf, "%d\n", cm->local); | 683 | return sprintf(buf, "%d\n", cm->local); |
| 676 | } | 684 | } |
| 677 | 685 | ||
| 678 | static ssize_t comm_local_write(struct comm *cm, const char *buf, size_t len) | 686 | static ssize_t comm_local_write(struct dlm_comm *cm, const char *buf, |
| 687 | size_t len) | ||
| 679 | { | 688 | { |
| 680 | cm->local= simple_strtol(buf, NULL, 0); | 689 | cm->local= simple_strtol(buf, NULL, 0); |
| 681 | if (cm->local && !local_comm) | 690 | if (cm->local && !local_comm) |
| @@ -683,7 +692,7 @@ static ssize_t comm_local_write(struct comm *cm, const char *buf, size_t len) | |||
| 683 | return len; | 692 | return len; |
| 684 | } | 693 | } |
| 685 | 694 | ||
| 686 | static ssize_t comm_addr_write(struct comm *cm, const char *buf, size_t len) | 695 | static ssize_t comm_addr_write(struct dlm_comm *cm, const char *buf, size_t len) |
| 687 | { | 696 | { |
| 688 | struct sockaddr_storage *addr; | 697 | struct sockaddr_storage *addr; |
| 689 | 698 | ||
| @@ -705,7 +714,7 @@ static ssize_t comm_addr_write(struct comm *cm, const char *buf, size_t len) | |||
| 705 | static ssize_t show_node(struct config_item *i, struct configfs_attribute *a, | 714 | static ssize_t show_node(struct config_item *i, struct configfs_attribute *a, |
| 706 | char *buf) | 715 | char *buf) |
| 707 | { | 716 | { |
| 708 | struct node *nd = to_node(i); | 717 | struct dlm_node *nd = to_node(i); |
| 709 | struct node_attribute *nda = | 718 | struct node_attribute *nda = |
| 710 | container_of(a, struct node_attribute, attr); | 719 | container_of(a, struct node_attribute, attr); |
| 711 | return nda->show ? nda->show(nd, buf) : 0; | 720 | return nda->show ? nda->show(nd, buf) : 0; |
| @@ -714,29 +723,31 @@ static ssize_t show_node(struct config_item *i, struct configfs_attribute *a, | |||
| 714 | static ssize_t store_node(struct config_item *i, struct configfs_attribute *a, | 723 | static ssize_t store_node(struct config_item *i, struct configfs_attribute *a, |
| 715 | const char *buf, size_t len) | 724 | const char *buf, size_t len) |
| 716 | { | 725 | { |
| 717 | struct node *nd = to_node(i); | 726 | struct dlm_node *nd = to_node(i); |
| 718 | struct node_attribute *nda = | 727 | struct node_attribute *nda = |
| 719 | container_of(a, struct node_attribute, attr); | 728 | container_of(a, struct node_attribute, attr); |
| 720 | return nda->store ? nda->store(nd, buf, len) : -EINVAL; | 729 | return nda->store ? nda->store(nd, buf, len) : -EINVAL; |
| 721 | } | 730 | } |
| 722 | 731 | ||
| 723 | static ssize_t node_nodeid_read(struct node *nd, char *buf) | 732 | static ssize_t node_nodeid_read(struct dlm_node *nd, char *buf) |
| 724 | { | 733 | { |
| 725 | return sprintf(buf, "%d\n", nd->nodeid); | 734 | return sprintf(buf, "%d\n", nd->nodeid); |
| 726 | } | 735 | } |
| 727 | 736 | ||
| 728 | static ssize_t node_nodeid_write(struct node *nd, const char *buf, size_t len) | 737 | static ssize_t node_nodeid_write(struct dlm_node *nd, const char *buf, |
| 738 | size_t len) | ||
| 729 | { | 739 | { |
| 730 | nd->nodeid = simple_strtol(buf, NULL, 0); | 740 | nd->nodeid = simple_strtol(buf, NULL, 0); |
| 731 | return len; | 741 | return len; |
| 732 | } | 742 | } |
| 733 | 743 | ||
| 734 | static ssize_t node_weight_read(struct node *nd, char *buf) | 744 | static ssize_t node_weight_read(struct dlm_node *nd, char *buf) |
| 735 | { | 745 | { |
| 736 | return sprintf(buf, "%d\n", nd->weight); | 746 | return sprintf(buf, "%d\n", nd->weight); |
| 737 | } | 747 | } |
| 738 | 748 | ||
| 739 | static ssize_t node_weight_write(struct node *nd, const char *buf, size_t len) | 749 | static ssize_t node_weight_write(struct dlm_node *nd, const char *buf, |
| 750 | size_t len) | ||
| 740 | { | 751 | { |
| 741 | nd->weight = simple_strtol(buf, NULL, 0); | 752 | nd->weight = simple_strtol(buf, NULL, 0); |
| 742 | return len; | 753 | return len; |
| @@ -746,7 +757,7 @@ static ssize_t node_weight_write(struct node *nd, const char *buf, size_t len) | |||
| 746 | * Functions for the dlm to get the info that's been configured | 757 | * Functions for the dlm to get the info that's been configured |
| 747 | */ | 758 | */ |
| 748 | 759 | ||
| 749 | static struct space *get_space(char *name) | 760 | static struct dlm_space *get_space(char *name) |
| 750 | { | 761 | { |
| 751 | struct config_item *i; | 762 | struct config_item *i; |
| 752 | 763 | ||
| @@ -760,15 +771,15 @@ static struct space *get_space(char *name) | |||
| 760 | return to_space(i); | 771 | return to_space(i); |
| 761 | } | 772 | } |
| 762 | 773 | ||
| 763 | static void put_space(struct space *sp) | 774 | static void put_space(struct dlm_space *sp) |
| 764 | { | 775 | { |
| 765 | config_item_put(&sp->group.cg_item); | 776 | config_item_put(&sp->group.cg_item); |
| 766 | } | 777 | } |
| 767 | 778 | ||
| 768 | static struct comm *get_comm(int nodeid, struct sockaddr_storage *addr) | 779 | static struct dlm_comm *get_comm(int nodeid, struct sockaddr_storage *addr) |
| 769 | { | 780 | { |
| 770 | struct config_item *i; | 781 | struct config_item *i; |
| 771 | struct comm *cm = NULL; | 782 | struct dlm_comm *cm = NULL; |
| 772 | int found = 0; | 783 | int found = 0; |
| 773 | 784 | ||
| 774 | if (!comm_list) | 785 | if (!comm_list) |
| @@ -801,7 +812,7 @@ static struct comm *get_comm(int nodeid, struct sockaddr_storage *addr) | |||
| 801 | return cm; | 812 | return cm; |
| 802 | } | 813 | } |
| 803 | 814 | ||
| 804 | static void put_comm(struct comm *cm) | 815 | static void put_comm(struct dlm_comm *cm) |
| 805 | { | 816 | { |
| 806 | config_item_put(&cm->item); | 817 | config_item_put(&cm->item); |
| 807 | } | 818 | } |
| @@ -810,8 +821,8 @@ static void put_comm(struct comm *cm) | |||
| 810 | int dlm_nodeid_list(char *lsname, int **ids_out, int *ids_count_out, | 821 | int dlm_nodeid_list(char *lsname, int **ids_out, int *ids_count_out, |
| 811 | int **new_out, int *new_count_out) | 822 | int **new_out, int *new_count_out) |
| 812 | { | 823 | { |
| 813 | struct space *sp; | 824 | struct dlm_space *sp; |
| 814 | struct node *nd; | 825 | struct dlm_node *nd; |
| 815 | int i = 0, rv = 0, ids_count = 0, new_count = 0; | 826 | int i = 0, rv = 0, ids_count = 0, new_count = 0; |
| 816 | int *ids, *new; | 827 | int *ids, *new; |
| 817 | 828 | ||
| @@ -874,8 +885,8 @@ int dlm_nodeid_list(char *lsname, int **ids_out, int *ids_count_out, | |||
| 874 | 885 | ||
| 875 | int dlm_node_weight(char *lsname, int nodeid) | 886 | int dlm_node_weight(char *lsname, int nodeid) |
| 876 | { | 887 | { |
| 877 | struct space *sp; | 888 | struct dlm_space *sp; |
| 878 | struct node *nd; | 889 | struct dlm_node *nd; |
| 879 | int w = -EEXIST; | 890 | int w = -EEXIST; |
| 880 | 891 | ||
| 881 | sp = get_space(lsname); | 892 | sp = get_space(lsname); |
| @@ -897,7 +908,7 @@ int dlm_node_weight(char *lsname, int nodeid) | |||
| 897 | 908 | ||
| 898 | int dlm_nodeid_to_addr(int nodeid, struct sockaddr_storage *addr) | 909 | int dlm_nodeid_to_addr(int nodeid, struct sockaddr_storage *addr) |
| 899 | { | 910 | { |
| 900 | struct comm *cm = get_comm(nodeid, NULL); | 911 | struct dlm_comm *cm = get_comm(nodeid, NULL); |
| 901 | if (!cm) | 912 | if (!cm) |
| 902 | return -EEXIST; | 913 | return -EEXIST; |
| 903 | if (!cm->addr_count) | 914 | if (!cm->addr_count) |
| @@ -909,7 +920,7 @@ int dlm_nodeid_to_addr(int nodeid, struct sockaddr_storage *addr) | |||
| 909 | 920 | ||
| 910 | int dlm_addr_to_nodeid(struct sockaddr_storage *addr, int *nodeid) | 921 | int dlm_addr_to_nodeid(struct sockaddr_storage *addr, int *nodeid) |
| 911 | { | 922 | { |
| 912 | struct comm *cm = get_comm(0, addr); | 923 | struct dlm_comm *cm = get_comm(0, addr); |
| 913 | if (!cm) | 924 | if (!cm) |
| 914 | return -EEXIST; | 925 | return -EEXIST; |
| 915 | *nodeid = cm->nodeid; | 926 | *nodeid = cm->nodeid; |
diff --git a/fs/dlm/user.c b/fs/dlm/user.c index 929e48ae7591..34f14a14fb4e 100644 --- a/fs/dlm/user.c +++ b/fs/dlm/user.c | |||
| @@ -527,8 +527,10 @@ static ssize_t device_write(struct file *file, const char __user *buf, | |||
| 527 | k32buf = (struct dlm_write_request32 *)kbuf; | 527 | k32buf = (struct dlm_write_request32 *)kbuf; |
| 528 | kbuf = kmalloc(count + 1 + (sizeof(struct dlm_write_request) - | 528 | kbuf = kmalloc(count + 1 + (sizeof(struct dlm_write_request) - |
| 529 | sizeof(struct dlm_write_request32)), GFP_KERNEL); | 529 | sizeof(struct dlm_write_request32)), GFP_KERNEL); |
| 530 | if (!kbuf) | 530 | if (!kbuf) { |
| 531 | kfree(k32buf); | ||
| 531 | return -ENOMEM; | 532 | return -ENOMEM; |
| 533 | } | ||
| 532 | 534 | ||
| 533 | if (proc) | 535 | if (proc) |
| 534 | set_bit(DLM_PROC_FLAGS_COMPAT, &proc->flags); | 536 | set_bit(DLM_PROC_FLAGS_COMPAT, &proc->flags); |
| @@ -539,8 +541,10 @@ static ssize_t device_write(struct file *file, const char __user *buf, | |||
| 539 | 541 | ||
| 540 | /* do we really need this? can a write happen after a close? */ | 542 | /* do we really need this? can a write happen after a close? */ |
| 541 | if ((kbuf->cmd == DLM_USER_LOCK || kbuf->cmd == DLM_USER_UNLOCK) && | 543 | if ((kbuf->cmd == DLM_USER_LOCK || kbuf->cmd == DLM_USER_UNLOCK) && |
| 542 | (proc && test_bit(DLM_PROC_FLAGS_CLOSING, &proc->flags))) | 544 | (proc && test_bit(DLM_PROC_FLAGS_CLOSING, &proc->flags))) { |
| 543 | return -EINVAL; | 545 | error = -EINVAL; |
| 546 | goto out_free; | ||
| 547 | } | ||
| 544 | 548 | ||
| 545 | sigfillset(&allsigs); | 549 | sigfillset(&allsigs); |
| 546 | sigprocmask(SIG_BLOCK, &allsigs, &tmpsig); | 550 | sigprocmask(SIG_BLOCK, &allsigs, &tmpsig); |
diff --git a/fs/efs/namei.c b/fs/efs/namei.c index 3a404e7fad53..291abb11e20e 100644 --- a/fs/efs/namei.c +++ b/fs/efs/namei.c | |||
| @@ -74,8 +74,7 @@ struct dentry *efs_lookup(struct inode *dir, struct dentry *dentry, struct namei | |||
| 74 | } | 74 | } |
| 75 | unlock_kernel(); | 75 | unlock_kernel(); |
| 76 | 76 | ||
| 77 | d_add(dentry, inode); | 77 | return d_splice_alias(inode, dentry); |
| 78 | return NULL; | ||
| 79 | } | 78 | } |
| 80 | 79 | ||
| 81 | static struct inode *efs_nfs_get_inode(struct super_block *sb, u64 ino, | 80 | static struct inode *efs_nfs_get_inode(struct super_block *sb, u64 ino, |
diff --git a/fs/eventpoll.c b/fs/eventpoll.c index 0c87474f7917..7cc0eb756b55 100644 --- a/fs/eventpoll.c +++ b/fs/eventpoll.c | |||
| @@ -1041,10 +1041,7 @@ retry: | |||
| 1041 | } | 1041 | } |
| 1042 | 1042 | ||
| 1043 | /* | 1043 | /* |
| 1044 | * It opens an eventpoll file descriptor. The "size" parameter is there | 1044 | * Open an eventpoll file descriptor. |
| 1045 | * for historical reasons, when epoll was using an hash instead of an | ||
| 1046 | * RB tree. With the current implementation, the "size" parameter is ignored | ||
| 1047 | * (besides sanity checks). | ||
| 1048 | */ | 1045 | */ |
| 1049 | asmlinkage long sys_epoll_create1(int flags) | 1046 | asmlinkage long sys_epoll_create1(int flags) |
| 1050 | { | 1047 | { |
diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c index 1ae5004e93fc..e9fa960ba6da 100644 --- a/fs/ext4/balloc.c +++ b/fs/ext4/balloc.c | |||
| @@ -1626,6 +1626,9 @@ ext4_fsblk_t ext4_has_free_blocks(struct ext4_sb_info *sbi, | |||
| 1626 | free_blocks = | 1626 | free_blocks = |
| 1627 | percpu_counter_sum_and_set(&sbi->s_freeblocks_counter); | 1627 | percpu_counter_sum_and_set(&sbi->s_freeblocks_counter); |
| 1628 | #endif | 1628 | #endif |
| 1629 | if (free_blocks <= root_blocks) | ||
| 1630 | /* we don't have free space */ | ||
| 1631 | return 0; | ||
| 1629 | if (free_blocks - root_blocks < nblocks) | 1632 | if (free_blocks - root_blocks < nblocks) |
| 1630 | return free_blocks - root_blocks; | 1633 | return free_blocks - root_blocks; |
| 1631 | return nblocks; | 1634 | return nblocks; |
diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c index d3d23d73c08b..ec8e33b45219 100644 --- a/fs/ext4/dir.c +++ b/fs/ext4/dir.c | |||
| @@ -411,7 +411,7 @@ static int call_filldir(struct file * filp, void * dirent, | |||
| 411 | get_dtype(sb, fname->file_type)); | 411 | get_dtype(sb, fname->file_type)); |
| 412 | if (error) { | 412 | if (error) { |
| 413 | filp->f_pos = curr_pos; | 413 | filp->f_pos = curr_pos; |
| 414 | info->extra_fname = fname->next; | 414 | info->extra_fname = fname; |
| 415 | return error; | 415 | return error; |
| 416 | } | 416 | } |
| 417 | fname = fname->next; | 417 | fname = fname->next; |
| @@ -450,11 +450,21 @@ static int ext4_dx_readdir(struct file * filp, | |||
| 450 | * If there are any leftover names on the hash collision | 450 | * If there are any leftover names on the hash collision |
| 451 | * chain, return them first. | 451 | * chain, return them first. |
| 452 | */ | 452 | */ |
| 453 | if (info->extra_fname && | 453 | if (info->extra_fname) { |
| 454 | call_filldir(filp, dirent, filldir, info->extra_fname)) | 454 | if (call_filldir(filp, dirent, filldir, info->extra_fname)) |
| 455 | goto finished; | 455 | goto finished; |
| 456 | 456 | ||
| 457 | if (!info->curr_node) | 457 | info->extra_fname = NULL; |
| 458 | info->curr_node = rb_next(info->curr_node); | ||
| 459 | if (!info->curr_node) { | ||
| 460 | if (info->next_hash == ~0) { | ||
| 461 | filp->f_pos = EXT4_HTREE_EOF; | ||
| 462 | goto finished; | ||
| 463 | } | ||
| 464 | info->curr_hash = info->next_hash; | ||
| 465 | info->curr_minor_hash = 0; | ||
| 466 | } | ||
| 467 | } else if (!info->curr_node) | ||
| 458 | info->curr_node = rb_first(&info->root); | 468 | info->curr_node = rb_first(&info->root); |
| 459 | 469 | ||
| 460 | while (1) { | 470 | while (1) { |
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 6c7924d9e358..295003241d3d 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h | |||
| @@ -1072,6 +1072,8 @@ extern void ext4_set_inode_flags(struct inode *); | |||
| 1072 | extern void ext4_get_inode_flags(struct ext4_inode_info *); | 1072 | extern void ext4_get_inode_flags(struct ext4_inode_info *); |
| 1073 | extern void ext4_set_aops(struct inode *inode); | 1073 | extern void ext4_set_aops(struct inode *inode); |
| 1074 | extern int ext4_writepage_trans_blocks(struct inode *); | 1074 | extern int ext4_writepage_trans_blocks(struct inode *); |
| 1075 | extern int ext4_meta_trans_blocks(struct inode *, int nrblocks, int idxblocks); | ||
| 1076 | extern int ext4_chunk_trans_blocks(struct inode *, int nrblocks); | ||
| 1075 | extern int ext4_block_truncate_page(handle_t *handle, | 1077 | extern int ext4_block_truncate_page(handle_t *handle, |
| 1076 | struct address_space *mapping, loff_t from); | 1078 | struct address_space *mapping, loff_t from); |
| 1077 | extern int ext4_page_mkwrite(struct vm_area_struct *vma, struct page *page); | 1079 | extern int ext4_page_mkwrite(struct vm_area_struct *vma, struct page *page); |
| @@ -1227,6 +1229,8 @@ extern const struct inode_operations ext4_fast_symlink_inode_operations; | |||
| 1227 | /* extents.c */ | 1229 | /* extents.c */ |
| 1228 | extern int ext4_ext_tree_init(handle_t *handle, struct inode *); | 1230 | extern int ext4_ext_tree_init(handle_t *handle, struct inode *); |
| 1229 | extern int ext4_ext_writepage_trans_blocks(struct inode *, int); | 1231 | extern int ext4_ext_writepage_trans_blocks(struct inode *, int); |
| 1232 | extern int ext4_ext_index_trans_blocks(struct inode *inode, int nrblocks, | ||
| 1233 | int chunk); | ||
| 1230 | extern int ext4_ext_get_blocks(handle_t *handle, struct inode *inode, | 1234 | extern int ext4_ext_get_blocks(handle_t *handle, struct inode *inode, |
| 1231 | ext4_lblk_t iblock, | 1235 | ext4_lblk_t iblock, |
| 1232 | unsigned long max_blocks, struct buffer_head *bh_result, | 1236 | unsigned long max_blocks, struct buffer_head *bh_result, |
diff --git a/fs/ext4/ext4_extents.h b/fs/ext4/ext4_extents.h index 6c166c0a54b7..d33dc56d6986 100644 --- a/fs/ext4/ext4_extents.h +++ b/fs/ext4/ext4_extents.h | |||
| @@ -216,7 +216,9 @@ extern int ext4_ext_calc_metadata_amount(struct inode *inode, int blocks); | |||
| 216 | extern ext4_fsblk_t idx_pblock(struct ext4_extent_idx *); | 216 | extern ext4_fsblk_t idx_pblock(struct ext4_extent_idx *); |
| 217 | extern void ext4_ext_store_pblock(struct ext4_extent *, ext4_fsblk_t); | 217 | extern void ext4_ext_store_pblock(struct ext4_extent *, ext4_fsblk_t); |
| 218 | extern int ext4_extent_tree_init(handle_t *, struct inode *); | 218 | extern int ext4_extent_tree_init(handle_t *, struct inode *); |
| 219 | extern int ext4_ext_calc_credits_for_insert(struct inode *, struct ext4_ext_path *); | 219 | extern int ext4_ext_calc_credits_for_single_extent(struct inode *inode, |
| 220 | int num, | ||
| 221 | struct ext4_ext_path *path); | ||
| 220 | extern int ext4_ext_try_to_merge(struct inode *inode, | 222 | extern int ext4_ext_try_to_merge(struct inode *inode, |
| 221 | struct ext4_ext_path *path, | 223 | struct ext4_ext_path *path, |
| 222 | struct ext4_extent *); | 224 | struct ext4_extent *); |
diff --git a/fs/ext4/ext4_jbd2.h b/fs/ext4/ext4_jbd2.h index eb8bc3afe6e9..b455c685a98b 100644 --- a/fs/ext4/ext4_jbd2.h +++ b/fs/ext4/ext4_jbd2.h | |||
| @@ -51,6 +51,14 @@ | |||
| 51 | EXT4_XATTR_TRANS_BLOCKS - 2 + \ | 51 | EXT4_XATTR_TRANS_BLOCKS - 2 + \ |
| 52 | 2*EXT4_QUOTA_TRANS_BLOCKS(sb)) | 52 | 2*EXT4_QUOTA_TRANS_BLOCKS(sb)) |
| 53 | 53 | ||
| 54 | /* | ||
| 55 | * Define the number of metadata blocks we need to account to modify data. | ||
| 56 | * | ||
| 57 | * This include super block, inode block, quota blocks and xattr blocks | ||
| 58 | */ | ||
| 59 | #define EXT4_META_TRANS_BLOCKS(sb) (EXT4_XATTR_TRANS_BLOCKS + \ | ||
| 60 | 2*EXT4_QUOTA_TRANS_BLOCKS(sb)) | ||
| 61 | |||
| 54 | /* Delete operations potentially hit one directory's namespace plus an | 62 | /* Delete operations potentially hit one directory's namespace plus an |
| 55 | * entire inode, plus arbitrary amounts of bitmap/indirection data. Be | 63 | * entire inode, plus arbitrary amounts of bitmap/indirection data. Be |
| 56 | * generous. We can grow the delete transaction later if necessary. */ | 64 | * generous. We can grow the delete transaction later if necessary. */ |
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index 612c3d2c3824..b24d3c53f20c 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c | |||
| @@ -1747,54 +1747,61 @@ static int ext4_ext_rm_idx(handle_t *handle, struct inode *inode, | |||
| 1747 | } | 1747 | } |
| 1748 | 1748 | ||
| 1749 | /* | 1749 | /* |
| 1750 | * ext4_ext_calc_credits_for_insert: | 1750 | * ext4_ext_calc_credits_for_single_extent: |
| 1751 | * This routine returns max. credits that the extent tree can consume. | 1751 | * This routine returns max. credits that needed to insert an extent |
| 1752 | * It should be OK for low-performance paths like ->writepage() | 1752 | * to the extent tree. |
| 1753 | * To allow many writing processes to fit into a single transaction, | 1753 | * When pass the actual path, the caller should calculate credits |
| 1754 | * the caller should calculate credits under i_data_sem and | 1754 | * under i_data_sem. |
| 1755 | * pass the actual path. | ||
| 1756 | */ | 1755 | */ |
| 1757 | int ext4_ext_calc_credits_for_insert(struct inode *inode, | 1756 | int ext4_ext_calc_credits_for_single_extent(struct inode *inode, int nrblocks, |
| 1758 | struct ext4_ext_path *path) | 1757 | struct ext4_ext_path *path) |
| 1759 | { | 1758 | { |
| 1760 | int depth, needed; | ||
| 1761 | |||
| 1762 | if (path) { | 1759 | if (path) { |
| 1760 | int depth = ext_depth(inode); | ||
| 1761 | int ret = 0; | ||
| 1762 | |||
| 1763 | /* probably there is space in leaf? */ | 1763 | /* probably there is space in leaf? */ |
| 1764 | depth = ext_depth(inode); | ||
| 1765 | if (le16_to_cpu(path[depth].p_hdr->eh_entries) | 1764 | if (le16_to_cpu(path[depth].p_hdr->eh_entries) |
| 1766 | < le16_to_cpu(path[depth].p_hdr->eh_max)) | 1765 | < le16_to_cpu(path[depth].p_hdr->eh_max)) { |
| 1767 | return 1; | ||
| 1768 | } | ||
| 1769 | 1766 | ||
| 1770 | /* | 1767 | /* |
| 1771 | * given 32-bit logical block (4294967296 blocks), max. tree | 1768 | * There are some space in the leaf tree, no |
| 1772 | * can be 4 levels in depth -- 4 * 340^4 == 53453440000. | 1769 | * need to account for leaf block credit |
| 1773 | * Let's also add one more level for imbalance. | 1770 | * |
| 1774 | */ | 1771 | * bitmaps and block group descriptor blocks |
| 1775 | depth = 5; | 1772 | * and other metadat blocks still need to be |
| 1776 | 1773 | * accounted. | |
| 1777 | /* allocation of new data block(s) */ | 1774 | */ |
| 1778 | needed = 2; | 1775 | /* 1 bitmap, 1 block group descriptor */ |
| 1776 | ret = 2 + EXT4_META_TRANS_BLOCKS(inode->i_sb); | ||
| 1777 | } | ||
| 1778 | } | ||
| 1779 | 1779 | ||
| 1780 | /* | 1780 | return ext4_chunk_trans_blocks(inode, nrblocks); |
| 1781 | * tree can be full, so it would need to grow in depth: | 1781 | } |
| 1782 | * we need one credit to modify old root, credits for | ||
| 1783 | * new root will be added in split accounting | ||
| 1784 | */ | ||
| 1785 | needed += 1; | ||
| 1786 | 1782 | ||
| 1787 | /* | 1783 | /* |
| 1788 | * Index split can happen, we would need: | 1784 | * How many index/leaf blocks need to change/allocate to modify nrblocks? |
| 1789 | * allocate intermediate indexes (bitmap + group) | 1785 | * |
| 1790 | * + change two blocks at each level, but root (already included) | 1786 | * if nrblocks are fit in a single extent (chunk flag is 1), then |
| 1791 | */ | 1787 | * in the worse case, each tree level index/leaf need to be changed |
| 1792 | needed += (depth * 2) + (depth * 2); | 1788 | * if the tree split due to insert a new extent, then the old tree |
| 1789 | * index/leaf need to be updated too | ||
| 1790 | * | ||
| 1791 | * If the nrblocks are discontiguous, they could cause | ||
| 1792 | * the whole tree split more than once, but this is really rare. | ||
| 1793 | */ | ||
| 1794 | int ext4_ext_index_trans_blocks(struct inode *inode, int nrblocks, int chunk) | ||
| 1795 | { | ||
| 1796 | int index; | ||
| 1797 | int depth = ext_depth(inode); | ||
| 1793 | 1798 | ||
| 1794 | /* any allocation modifies superblock */ | 1799 | if (chunk) |
| 1795 | needed += 1; | 1800 | index = depth * 2; |
| 1801 | else | ||
| 1802 | index = depth * 3; | ||
| 1796 | 1803 | ||
| 1797 | return needed; | 1804 | return index; |
| 1798 | } | 1805 | } |
| 1799 | 1806 | ||
| 1800 | static int ext4_remove_blocks(handle_t *handle, struct inode *inode, | 1807 | static int ext4_remove_blocks(handle_t *handle, struct inode *inode, |
| @@ -1921,9 +1928,7 @@ ext4_ext_rm_leaf(handle_t *handle, struct inode *inode, | |||
| 1921 | correct_index = 1; | 1928 | correct_index = 1; |
| 1922 | credits += (ext_depth(inode)) + 1; | 1929 | credits += (ext_depth(inode)) + 1; |
| 1923 | } | 1930 | } |
| 1924 | #ifdef CONFIG_QUOTA | ||
| 1925 | credits += 2 * EXT4_QUOTA_TRANS_BLOCKS(inode->i_sb); | 1931 | credits += 2 * EXT4_QUOTA_TRANS_BLOCKS(inode->i_sb); |
| 1926 | #endif | ||
| 1927 | 1932 | ||
| 1928 | err = ext4_ext_journal_restart(handle, credits); | 1933 | err = ext4_ext_journal_restart(handle, credits); |
| 1929 | if (err) | 1934 | if (err) |
| @@ -2805,7 +2810,7 @@ void ext4_ext_truncate(struct inode *inode) | |||
| 2805 | /* | 2810 | /* |
| 2806 | * probably first extent we're gonna free will be last in block | 2811 | * probably first extent we're gonna free will be last in block |
| 2807 | */ | 2812 | */ |
| 2808 | err = ext4_writepage_trans_blocks(inode) + 3; | 2813 | err = ext4_writepage_trans_blocks(inode); |
| 2809 | handle = ext4_journal_start(inode, err); | 2814 | handle = ext4_journal_start(inode, err); |
| 2810 | if (IS_ERR(handle)) | 2815 | if (IS_ERR(handle)) |
| 2811 | return; | 2816 | return; |
| @@ -2819,7 +2824,7 @@ void ext4_ext_truncate(struct inode *inode) | |||
| 2819 | down_write(&EXT4_I(inode)->i_data_sem); | 2824 | down_write(&EXT4_I(inode)->i_data_sem); |
| 2820 | ext4_ext_invalidate_cache(inode); | 2825 | ext4_ext_invalidate_cache(inode); |
| 2821 | 2826 | ||
| 2822 | ext4_mb_discard_inode_preallocations(inode); | 2827 | ext4_discard_reservation(inode); |
| 2823 | 2828 | ||
| 2824 | /* | 2829 | /* |
| 2825 | * TODO: optimization is possible here. | 2830 | * TODO: optimization is possible here. |
| @@ -2858,27 +2863,6 @@ out_stop: | |||
| 2858 | ext4_journal_stop(handle); | 2863 | ext4_journal_stop(handle); |
| 2859 | } | 2864 | } |
| 2860 | 2865 | ||
| 2861 | /* | ||
| 2862 | * ext4_ext_writepage_trans_blocks: | ||
| 2863 | * calculate max number of blocks we could modify | ||
| 2864 | * in order to allocate new block for an inode | ||
| 2865 | */ | ||
| 2866 | int ext4_ext_writepage_trans_blocks(struct inode *inode, int num) | ||
| 2867 | { | ||
| 2868 | int needed; | ||
| 2869 | |||
| 2870 | needed = ext4_ext_calc_credits_for_insert(inode, NULL); | ||
| 2871 | |||
| 2872 | /* caller wants to allocate num blocks, but note it includes sb */ | ||
| 2873 | needed = needed * num - (num - 1); | ||
| 2874 | |||
| 2875 | #ifdef CONFIG_QUOTA | ||
| 2876 | needed += 2 * EXT4_QUOTA_TRANS_BLOCKS(inode->i_sb); | ||
| 2877 | #endif | ||
| 2878 | |||
| 2879 | return needed; | ||
| 2880 | } | ||
| 2881 | |||
| 2882 | static void ext4_falloc_update_inode(struct inode *inode, | 2866 | static void ext4_falloc_update_inode(struct inode *inode, |
| 2883 | int mode, loff_t new_size, int update_ctime) | 2867 | int mode, loff_t new_size, int update_ctime) |
| 2884 | { | 2868 | { |
| @@ -2939,10 +2923,9 @@ long ext4_fallocate(struct inode *inode, int mode, loff_t offset, loff_t len) | |||
| 2939 | max_blocks = (EXT4_BLOCK_ALIGN(len + offset, blkbits) >> blkbits) | 2923 | max_blocks = (EXT4_BLOCK_ALIGN(len + offset, blkbits) >> blkbits) |
| 2940 | - block; | 2924 | - block; |
| 2941 | /* | 2925 | /* |
| 2942 | * credits to insert 1 extent into extent tree + buffers to be able to | 2926 | * credits to insert 1 extent into extent tree |
| 2943 | * modify 1 super block, 1 block bitmap and 1 group descriptor. | ||
| 2944 | */ | 2927 | */ |
| 2945 | credits = EXT4_DATA_TRANS_BLOCKS(inode->i_sb) + 3; | 2928 | credits = ext4_chunk_trans_blocks(inode, max_blocks); |
| 2946 | mutex_lock(&inode->i_mutex); | 2929 | mutex_lock(&inode->i_mutex); |
| 2947 | retry: | 2930 | retry: |
| 2948 | while (ret >= 0 && ret < max_blocks) { | 2931 | while (ret >= 0 && ret < max_blocks) { |
diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c index 655e760212b8..f344834bbf58 100644 --- a/fs/ext4/ialloc.c +++ b/fs/ext4/ialloc.c | |||
| @@ -351,7 +351,7 @@ find_close_to_parent: | |||
| 351 | goto found_flexbg; | 351 | goto found_flexbg; |
| 352 | } | 352 | } |
| 353 | 353 | ||
| 354 | if (best_flex < 0 || | 354 | if (flex_group[best_flex].free_inodes == 0 || |
| 355 | (flex_group[i].free_blocks > | 355 | (flex_group[i].free_blocks > |
| 356 | flex_group[best_flex].free_blocks && | 356 | flex_group[best_flex].free_blocks && |
| 357 | flex_group[i].free_inodes)) | 357 | flex_group[i].free_inodes)) |
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 59fbbe899acc..7e91913e325b 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c | |||
| @@ -41,6 +41,8 @@ | |||
| 41 | #include "acl.h" | 41 | #include "acl.h" |
| 42 | #include "ext4_extents.h" | 42 | #include "ext4_extents.h" |
| 43 | 43 | ||
| 44 | #define MPAGE_DA_EXTENT_TAIL 0x01 | ||
| 45 | |||
| 44 | static inline int ext4_begin_ordered_truncate(struct inode *inode, | 46 | static inline int ext4_begin_ordered_truncate(struct inode *inode, |
| 45 | loff_t new_size) | 47 | loff_t new_size) |
| 46 | { | 48 | { |
| @@ -1005,6 +1007,9 @@ static int ext4_indirect_calc_metadata_amount(struct inode *inode, int blocks) | |||
| 1005 | */ | 1007 | */ |
| 1006 | static int ext4_calc_metadata_amount(struct inode *inode, int blocks) | 1008 | static int ext4_calc_metadata_amount(struct inode *inode, int blocks) |
| 1007 | { | 1009 | { |
| 1010 | if (!blocks) | ||
| 1011 | return 0; | ||
| 1012 | |||
| 1008 | if (EXT4_I(inode)->i_flags & EXT4_EXTENTS_FL) | 1013 | if (EXT4_I(inode)->i_flags & EXT4_EXTENTS_FL) |
| 1009 | return ext4_ext_calc_metadata_amount(inode, blocks); | 1014 | return ext4_ext_calc_metadata_amount(inode, blocks); |
| 1010 | 1015 | ||
| @@ -1041,18 +1046,6 @@ static void ext4_da_update_reserve_space(struct inode *inode, int used) | |||
| 1041 | spin_unlock(&EXT4_I(inode)->i_block_reservation_lock); | 1046 | spin_unlock(&EXT4_I(inode)->i_block_reservation_lock); |
| 1042 | } | 1047 | } |
| 1043 | 1048 | ||
| 1044 | /* Maximum number of blocks we map for direct IO at once. */ | ||
| 1045 | #define DIO_MAX_BLOCKS 4096 | ||
| 1046 | /* | ||
| 1047 | * Number of credits we need for writing DIO_MAX_BLOCKS: | ||
| 1048 | * We need sb + group descriptor + bitmap + inode -> 4 | ||
| 1049 | * For B blocks with A block pointers per block we need: | ||
| 1050 | * 1 (triple ind.) + (B/A/A + 2) (doubly ind.) + (B/A + 2) (indirect). | ||
| 1051 | * If we plug in 4096 for B and 256 for A (for 1KB block size), we get 25. | ||
| 1052 | */ | ||
| 1053 | #define DIO_CREDITS 25 | ||
| 1054 | |||
| 1055 | |||
| 1056 | /* | 1049 | /* |
| 1057 | * The ext4_get_blocks_wrap() function try to look up the requested blocks, | 1050 | * The ext4_get_blocks_wrap() function try to look up the requested blocks, |
| 1058 | * and returns if the blocks are already mapped. | 1051 | * and returns if the blocks are already mapped. |
| @@ -1164,19 +1157,23 @@ int ext4_get_blocks_wrap(handle_t *handle, struct inode *inode, sector_t block, | |||
| 1164 | return retval; | 1157 | return retval; |
| 1165 | } | 1158 | } |
| 1166 | 1159 | ||
| 1160 | /* Maximum number of blocks we map for direct IO at once. */ | ||
| 1161 | #define DIO_MAX_BLOCKS 4096 | ||
| 1162 | |||
| 1167 | static int ext4_get_block(struct inode *inode, sector_t iblock, | 1163 | static int ext4_get_block(struct inode *inode, sector_t iblock, |
| 1168 | struct buffer_head *bh_result, int create) | 1164 | struct buffer_head *bh_result, int create) |
| 1169 | { | 1165 | { |
| 1170 | handle_t *handle = ext4_journal_current_handle(); | 1166 | handle_t *handle = ext4_journal_current_handle(); |
| 1171 | int ret = 0, started = 0; | 1167 | int ret = 0, started = 0; |
| 1172 | unsigned max_blocks = bh_result->b_size >> inode->i_blkbits; | 1168 | unsigned max_blocks = bh_result->b_size >> inode->i_blkbits; |
| 1169 | int dio_credits; | ||
| 1173 | 1170 | ||
| 1174 | if (create && !handle) { | 1171 | if (create && !handle) { |
| 1175 | /* Direct IO write... */ | 1172 | /* Direct IO write... */ |
| 1176 | if (max_blocks > DIO_MAX_BLOCKS) | 1173 | if (max_blocks > DIO_MAX_BLOCKS) |
| 1177 | max_blocks = DIO_MAX_BLOCKS; | 1174 | max_blocks = DIO_MAX_BLOCKS; |
| 1178 | handle = ext4_journal_start(inode, DIO_CREDITS + | 1175 | dio_credits = ext4_chunk_trans_blocks(inode, max_blocks); |
| 1179 | 2 * EXT4_QUOTA_TRANS_BLOCKS(inode->i_sb)); | 1176 | handle = ext4_journal_start(inode, dio_credits); |
| 1180 | if (IS_ERR(handle)) { | 1177 | if (IS_ERR(handle)) { |
| 1181 | ret = PTR_ERR(handle); | 1178 | ret = PTR_ERR(handle); |
| 1182 | goto out; | 1179 | goto out; |
| @@ -1559,7 +1556,25 @@ static void ext4_da_release_space(struct inode *inode, int to_free) | |||
| 1559 | struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb); | 1556 | struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb); |
| 1560 | int total, mdb, mdb_free, release; | 1557 | int total, mdb, mdb_free, release; |
| 1561 | 1558 | ||
| 1559 | if (!to_free) | ||
| 1560 | return; /* Nothing to release, exit */ | ||
| 1561 | |||
| 1562 | spin_lock(&EXT4_I(inode)->i_block_reservation_lock); | 1562 | spin_lock(&EXT4_I(inode)->i_block_reservation_lock); |
| 1563 | |||
| 1564 | if (!EXT4_I(inode)->i_reserved_data_blocks) { | ||
| 1565 | /* | ||
| 1566 | * if there is no reserved blocks, but we try to free some | ||
| 1567 | * then the counter is messed up somewhere. | ||
| 1568 | * but since this function is called from invalidate | ||
| 1569 | * page, it's harmless to return without any action | ||
| 1570 | */ | ||
| 1571 | printk(KERN_INFO "ext4 delalloc try to release %d reserved " | ||
| 1572 | "blocks for inode %lu, but there is no reserved " | ||
| 1573 | "data blocks\n", to_free, inode->i_ino); | ||
| 1574 | spin_unlock(&EXT4_I(inode)->i_block_reservation_lock); | ||
| 1575 | return; | ||
| 1576 | } | ||
| 1577 | |||
| 1563 | /* recalculate the number of metablocks still need to be reserved */ | 1578 | /* recalculate the number of metablocks still need to be reserved */ |
| 1564 | total = EXT4_I(inode)->i_reserved_data_blocks - to_free; | 1579 | total = EXT4_I(inode)->i_reserved_data_blocks - to_free; |
| 1565 | mdb = ext4_calc_metadata_amount(inode, total); | 1580 | mdb = ext4_calc_metadata_amount(inode, total); |
| @@ -1613,11 +1628,13 @@ struct mpage_da_data { | |||
| 1613 | unsigned long first_page, next_page; /* extent of pages */ | 1628 | unsigned long first_page, next_page; /* extent of pages */ |
| 1614 | get_block_t *get_block; | 1629 | get_block_t *get_block; |
| 1615 | struct writeback_control *wbc; | 1630 | struct writeback_control *wbc; |
| 1631 | int io_done; | ||
| 1632 | long pages_written; | ||
| 1616 | }; | 1633 | }; |
| 1617 | 1634 | ||
| 1618 | /* | 1635 | /* |
| 1619 | * mpage_da_submit_io - walks through extent of pages and try to write | 1636 | * mpage_da_submit_io - walks through extent of pages and try to write |
| 1620 | * them with __mpage_writepage() | 1637 | * them with writepage() call back |
| 1621 | * | 1638 | * |
| 1622 | * @mpd->inode: inode | 1639 | * @mpd->inode: inode |
| 1623 | * @mpd->first_page: first page of the extent | 1640 | * @mpd->first_page: first page of the extent |
| @@ -1632,18 +1649,11 @@ struct mpage_da_data { | |||
| 1632 | static int mpage_da_submit_io(struct mpage_da_data *mpd) | 1649 | static int mpage_da_submit_io(struct mpage_da_data *mpd) |
| 1633 | { | 1650 | { |
| 1634 | struct address_space *mapping = mpd->inode->i_mapping; | 1651 | struct address_space *mapping = mpd->inode->i_mapping; |
| 1635 | struct mpage_data mpd_pp = { | ||
| 1636 | .bio = NULL, | ||
| 1637 | .last_block_in_bio = 0, | ||
| 1638 | .get_block = mpd->get_block, | ||
| 1639 | .use_writepage = 1, | ||
| 1640 | }; | ||
| 1641 | int ret = 0, err, nr_pages, i; | 1652 | int ret = 0, err, nr_pages, i; |
| 1642 | unsigned long index, end; | 1653 | unsigned long index, end; |
| 1643 | struct pagevec pvec; | 1654 | struct pagevec pvec; |
| 1644 | 1655 | ||
| 1645 | BUG_ON(mpd->next_page <= mpd->first_page); | 1656 | BUG_ON(mpd->next_page <= mpd->first_page); |
| 1646 | |||
| 1647 | pagevec_init(&pvec, 0); | 1657 | pagevec_init(&pvec, 0); |
| 1648 | index = mpd->first_page; | 1658 | index = mpd->first_page; |
| 1649 | end = mpd->next_page - 1; | 1659 | end = mpd->next_page - 1; |
| @@ -1661,8 +1671,9 @@ static int mpage_da_submit_io(struct mpage_da_data *mpd) | |||
| 1661 | break; | 1671 | break; |
| 1662 | index++; | 1672 | index++; |
| 1663 | 1673 | ||
| 1664 | err = __mpage_writepage(page, mpd->wbc, &mpd_pp); | 1674 | err = mapping->a_ops->writepage(page, mpd->wbc); |
| 1665 | 1675 | if (!err) | |
| 1676 | mpd->pages_written++; | ||
| 1666 | /* | 1677 | /* |
| 1667 | * In error case, we have to continue because | 1678 | * In error case, we have to continue because |
| 1668 | * remaining pages are still locked | 1679 | * remaining pages are still locked |
| @@ -1673,9 +1684,6 @@ static int mpage_da_submit_io(struct mpage_da_data *mpd) | |||
| 1673 | } | 1684 | } |
| 1674 | pagevec_release(&pvec); | 1685 | pagevec_release(&pvec); |
| 1675 | } | 1686 | } |
| 1676 | if (mpd_pp.bio) | ||
| 1677 | mpage_bio_submit(WRITE, mpd_pp.bio); | ||
| 1678 | |||
| 1679 | return ret; | 1687 | return ret; |
| 1680 | } | 1688 | } |
| 1681 | 1689 | ||
| @@ -1698,7 +1706,7 @@ static void mpage_put_bnr_to_bhs(struct mpage_da_data *mpd, sector_t logical, | |||
| 1698 | int blocks = exbh->b_size >> inode->i_blkbits; | 1706 | int blocks = exbh->b_size >> inode->i_blkbits; |
| 1699 | sector_t pblock = exbh->b_blocknr, cur_logical; | 1707 | sector_t pblock = exbh->b_blocknr, cur_logical; |
| 1700 | struct buffer_head *head, *bh; | 1708 | struct buffer_head *head, *bh; |
| 1701 | unsigned long index, end; | 1709 | pgoff_t index, end; |
| 1702 | struct pagevec pvec; | 1710 | struct pagevec pvec; |
| 1703 | int nr_pages, i; | 1711 | int nr_pages, i; |
| 1704 | 1712 | ||
| @@ -1741,6 +1749,13 @@ static void mpage_put_bnr_to_bhs(struct mpage_da_data *mpd, sector_t logical, | |||
| 1741 | if (buffer_delay(bh)) { | 1749 | if (buffer_delay(bh)) { |
| 1742 | bh->b_blocknr = pblock; | 1750 | bh->b_blocknr = pblock; |
| 1743 | clear_buffer_delay(bh); | 1751 | clear_buffer_delay(bh); |
| 1752 | bh->b_bdev = inode->i_sb->s_bdev; | ||
| 1753 | } else if (buffer_unwritten(bh)) { | ||
| 1754 | bh->b_blocknr = pblock; | ||
| 1755 | clear_buffer_unwritten(bh); | ||
| 1756 | set_buffer_mapped(bh); | ||
| 1757 | set_buffer_new(bh); | ||
| 1758 | bh->b_bdev = inode->i_sb->s_bdev; | ||
| 1744 | } else if (buffer_mapped(bh)) | 1759 | } else if (buffer_mapped(bh)) |
| 1745 | BUG_ON(bh->b_blocknr != pblock); | 1760 | BUG_ON(bh->b_blocknr != pblock); |
| 1746 | 1761 | ||
| @@ -1776,13 +1791,11 @@ static inline void __unmap_underlying_blocks(struct inode *inode, | |||
| 1776 | * | 1791 | * |
| 1777 | * The function skips space we know is already mapped to disk blocks. | 1792 | * The function skips space we know is already mapped to disk blocks. |
| 1778 | * | 1793 | * |
| 1779 | * The function ignores errors ->get_block() returns, thus real | ||
| 1780 | * error handling is postponed to __mpage_writepage() | ||
| 1781 | */ | 1794 | */ |
| 1782 | static void mpage_da_map_blocks(struct mpage_da_data *mpd) | 1795 | static void mpage_da_map_blocks(struct mpage_da_data *mpd) |
| 1783 | { | 1796 | { |
| 1797 | int err = 0; | ||
| 1784 | struct buffer_head *lbh = &mpd->lbh; | 1798 | struct buffer_head *lbh = &mpd->lbh; |
| 1785 | int err = 0, remain = lbh->b_size; | ||
| 1786 | sector_t next = lbh->b_blocknr; | 1799 | sector_t next = lbh->b_blocknr; |
| 1787 | struct buffer_head new; | 1800 | struct buffer_head new; |
| 1788 | 1801 | ||
| @@ -1792,38 +1805,36 @@ static void mpage_da_map_blocks(struct mpage_da_data *mpd) | |||
| 1792 | if (buffer_mapped(lbh) && !buffer_delay(lbh)) | 1805 | if (buffer_mapped(lbh) && !buffer_delay(lbh)) |
| 1793 | return; | 1806 | return; |
| 1794 | 1807 | ||
| 1795 | while (remain) { | 1808 | new.b_state = lbh->b_state; |
| 1796 | new.b_state = lbh->b_state; | 1809 | new.b_blocknr = 0; |
| 1797 | new.b_blocknr = 0; | 1810 | new.b_size = lbh->b_size; |
| 1798 | new.b_size = remain; | ||
| 1799 | err = mpd->get_block(mpd->inode, next, &new, 1); | ||
| 1800 | if (err) { | ||
| 1801 | /* | ||
| 1802 | * Rather than implement own error handling | ||
| 1803 | * here, we just leave remaining blocks | ||
| 1804 | * unallocated and try again with ->writepage() | ||
| 1805 | */ | ||
| 1806 | break; | ||
| 1807 | } | ||
| 1808 | BUG_ON(new.b_size == 0); | ||
| 1809 | 1811 | ||
| 1810 | if (buffer_new(&new)) | 1812 | /* |
| 1811 | __unmap_underlying_blocks(mpd->inode, &new); | 1813 | * If we didn't accumulate anything |
| 1814 | * to write simply return | ||
| 1815 | */ | ||
| 1816 | if (!new.b_size) | ||
| 1817 | return; | ||
| 1818 | err = mpd->get_block(mpd->inode, next, &new, 1); | ||
| 1819 | if (err) | ||
| 1820 | return; | ||
| 1821 | BUG_ON(new.b_size == 0); | ||
| 1812 | 1822 | ||
| 1813 | /* | 1823 | if (buffer_new(&new)) |
| 1814 | * If blocks are delayed marked, we need to | 1824 | __unmap_underlying_blocks(mpd->inode, &new); |
| 1815 | * put actual blocknr and drop delayed bit | ||
| 1816 | */ | ||
| 1817 | if (buffer_delay(lbh)) | ||
| 1818 | mpage_put_bnr_to_bhs(mpd, next, &new); | ||
| 1819 | 1825 | ||
| 1820 | /* go for the remaining blocks */ | 1826 | /* |
| 1821 | next += new.b_size >> mpd->inode->i_blkbits; | 1827 | * If blocks are delayed marked, we need to |
| 1822 | remain -= new.b_size; | 1828 | * put actual blocknr and drop delayed bit |
| 1823 | } | 1829 | */ |
| 1830 | if (buffer_delay(lbh) || buffer_unwritten(lbh)) | ||
| 1831 | mpage_put_bnr_to_bhs(mpd, next, &new); | ||
| 1832 | |||
| 1833 | return; | ||
| 1824 | } | 1834 | } |
| 1825 | 1835 | ||
| 1826 | #define BH_FLAGS ((1 << BH_Uptodate) | (1 << BH_Mapped) | (1 << BH_Delay)) | 1836 | #define BH_FLAGS ((1 << BH_Uptodate) | (1 << BH_Mapped) | \ |
| 1837 | (1 << BH_Delay) | (1 << BH_Unwritten)) | ||
| 1827 | 1838 | ||
| 1828 | /* | 1839 | /* |
| 1829 | * mpage_add_bh_to_extent - try to add one more block to extent of blocks | 1840 | * mpage_add_bh_to_extent - try to add one more block to extent of blocks |
| @@ -1837,41 +1848,61 @@ static void mpage_da_map_blocks(struct mpage_da_data *mpd) | |||
| 1837 | static void mpage_add_bh_to_extent(struct mpage_da_data *mpd, | 1848 | static void mpage_add_bh_to_extent(struct mpage_da_data *mpd, |
| 1838 | sector_t logical, struct buffer_head *bh) | 1849 | sector_t logical, struct buffer_head *bh) |
| 1839 | { | 1850 | { |
| 1840 | struct buffer_head *lbh = &mpd->lbh; | ||
| 1841 | sector_t next; | 1851 | sector_t next; |
| 1852 | size_t b_size = bh->b_size; | ||
| 1853 | struct buffer_head *lbh = &mpd->lbh; | ||
| 1854 | int nrblocks = lbh->b_size >> mpd->inode->i_blkbits; | ||
| 1842 | 1855 | ||
| 1843 | next = lbh->b_blocknr + (lbh->b_size >> mpd->inode->i_blkbits); | 1856 | /* check if thereserved journal credits might overflow */ |
| 1844 | 1857 | if (!(EXT4_I(mpd->inode)->i_flags & EXT4_EXTENTS_FL)) { | |
| 1858 | if (nrblocks >= EXT4_MAX_TRANS_DATA) { | ||
| 1859 | /* | ||
| 1860 | * With non-extent format we are limited by the journal | ||
| 1861 | * credit available. Total credit needed to insert | ||
| 1862 | * nrblocks contiguous blocks is dependent on the | ||
| 1863 | * nrblocks. So limit nrblocks. | ||
| 1864 | */ | ||
| 1865 | goto flush_it; | ||
| 1866 | } else if ((nrblocks + (b_size >> mpd->inode->i_blkbits)) > | ||
| 1867 | EXT4_MAX_TRANS_DATA) { | ||
| 1868 | /* | ||
| 1869 | * Adding the new buffer_head would make it cross the | ||
| 1870 | * allowed limit for which we have journal credit | ||
| 1871 | * reserved. So limit the new bh->b_size | ||
| 1872 | */ | ||
| 1873 | b_size = (EXT4_MAX_TRANS_DATA - nrblocks) << | ||
| 1874 | mpd->inode->i_blkbits; | ||
| 1875 | /* we will do mpage_da_submit_io in the next loop */ | ||
| 1876 | } | ||
| 1877 | } | ||
| 1845 | /* | 1878 | /* |
| 1846 | * First block in the extent | 1879 | * First block in the extent |
| 1847 | */ | 1880 | */ |
| 1848 | if (lbh->b_size == 0) { | 1881 | if (lbh->b_size == 0) { |
| 1849 | lbh->b_blocknr = logical; | 1882 | lbh->b_blocknr = logical; |
| 1850 | lbh->b_size = bh->b_size; | 1883 | lbh->b_size = b_size; |
| 1851 | lbh->b_state = bh->b_state & BH_FLAGS; | 1884 | lbh->b_state = bh->b_state & BH_FLAGS; |
| 1852 | return; | 1885 | return; |
| 1853 | } | 1886 | } |
| 1854 | 1887 | ||
| 1888 | next = lbh->b_blocknr + nrblocks; | ||
| 1855 | /* | 1889 | /* |
| 1856 | * Can we merge the block to our big extent? | 1890 | * Can we merge the block to our big extent? |
| 1857 | */ | 1891 | */ |
| 1858 | if (logical == next && (bh->b_state & BH_FLAGS) == lbh->b_state) { | 1892 | if (logical == next && (bh->b_state & BH_FLAGS) == lbh->b_state) { |
| 1859 | lbh->b_size += bh->b_size; | 1893 | lbh->b_size += b_size; |
| 1860 | return; | 1894 | return; |
| 1861 | } | 1895 | } |
| 1862 | 1896 | ||
| 1897 | flush_it: | ||
| 1863 | /* | 1898 | /* |
| 1864 | * We couldn't merge the block to our extent, so we | 1899 | * We couldn't merge the block to our extent, so we |
| 1865 | * need to flush current extent and start new one | 1900 | * need to flush current extent and start new one |
| 1866 | */ | 1901 | */ |
| 1867 | mpage_da_map_blocks(mpd); | 1902 | mpage_da_map_blocks(mpd); |
| 1868 | 1903 | mpage_da_submit_io(mpd); | |
| 1869 | /* | 1904 | mpd->io_done = 1; |
| 1870 | * Now start a new extent | 1905 | return; |
| 1871 | */ | ||
| 1872 | lbh->b_size = bh->b_size; | ||
| 1873 | lbh->b_state = bh->b_state & BH_FLAGS; | ||
| 1874 | lbh->b_blocknr = logical; | ||
| 1875 | } | 1906 | } |
| 1876 | 1907 | ||
| 1877 | /* | 1908 | /* |
| @@ -1891,17 +1922,35 @@ static int __mpage_da_writepage(struct page *page, | |||
| 1891 | struct buffer_head *bh, *head, fake; | 1922 | struct buffer_head *bh, *head, fake; |
| 1892 | sector_t logical; | 1923 | sector_t logical; |
| 1893 | 1924 | ||
| 1925 | if (mpd->io_done) { | ||
| 1926 | /* | ||
| 1927 | * Rest of the page in the page_vec | ||
| 1928 | * redirty then and skip then. We will | ||
| 1929 | * try to to write them again after | ||
| 1930 | * starting a new transaction | ||
| 1931 | */ | ||
| 1932 | redirty_page_for_writepage(wbc, page); | ||
| 1933 | unlock_page(page); | ||
| 1934 | return MPAGE_DA_EXTENT_TAIL; | ||
| 1935 | } | ||
| 1894 | /* | 1936 | /* |
| 1895 | * Can we merge this page to current extent? | 1937 | * Can we merge this page to current extent? |
| 1896 | */ | 1938 | */ |
| 1897 | if (mpd->next_page != page->index) { | 1939 | if (mpd->next_page != page->index) { |
| 1898 | /* | 1940 | /* |
| 1899 | * Nope, we can't. So, we map non-allocated blocks | 1941 | * Nope, we can't. So, we map non-allocated blocks |
| 1900 | * and start IO on them using __mpage_writepage() | 1942 | * and start IO on them using writepage() |
| 1901 | */ | 1943 | */ |
| 1902 | if (mpd->next_page != mpd->first_page) { | 1944 | if (mpd->next_page != mpd->first_page) { |
| 1903 | mpage_da_map_blocks(mpd); | 1945 | mpage_da_map_blocks(mpd); |
| 1904 | mpage_da_submit_io(mpd); | 1946 | mpage_da_submit_io(mpd); |
| 1947 | /* | ||
| 1948 | * skip rest of the page in the page_vec | ||
| 1949 | */ | ||
| 1950 | mpd->io_done = 1; | ||
| 1951 | redirty_page_for_writepage(wbc, page); | ||
| 1952 | unlock_page(page); | ||
| 1953 | return MPAGE_DA_EXTENT_TAIL; | ||
| 1905 | } | 1954 | } |
| 1906 | 1955 | ||
| 1907 | /* | 1956 | /* |
| @@ -1932,6 +1981,8 @@ static int __mpage_da_writepage(struct page *page, | |||
| 1932 | set_buffer_dirty(bh); | 1981 | set_buffer_dirty(bh); |
| 1933 | set_buffer_uptodate(bh); | 1982 | set_buffer_uptodate(bh); |
| 1934 | mpage_add_bh_to_extent(mpd, logical, bh); | 1983 | mpage_add_bh_to_extent(mpd, logical, bh); |
| 1984 | if (mpd->io_done) | ||
| 1985 | return MPAGE_DA_EXTENT_TAIL; | ||
| 1935 | } else { | 1986 | } else { |
| 1936 | /* | 1987 | /* |
| 1937 | * Page with regular buffer heads, just add all dirty ones | 1988 | * Page with regular buffer heads, just add all dirty ones |
| @@ -1940,8 +1991,12 @@ static int __mpage_da_writepage(struct page *page, | |||
| 1940 | bh = head; | 1991 | bh = head; |
| 1941 | do { | 1992 | do { |
| 1942 | BUG_ON(buffer_locked(bh)); | 1993 | BUG_ON(buffer_locked(bh)); |
| 1943 | if (buffer_dirty(bh)) | 1994 | if (buffer_dirty(bh) && |
| 1995 | (!buffer_mapped(bh) || buffer_delay(bh))) { | ||
| 1944 | mpage_add_bh_to_extent(mpd, logical, bh); | 1996 | mpage_add_bh_to_extent(mpd, logical, bh); |
| 1997 | if (mpd->io_done) | ||
| 1998 | return MPAGE_DA_EXTENT_TAIL; | ||
| 1999 | } | ||
| 1945 | logical++; | 2000 | logical++; |
| 1946 | } while ((bh = bh->b_this_page) != head); | 2001 | } while ((bh = bh->b_this_page) != head); |
| 1947 | } | 2002 | } |
| @@ -1960,22 +2015,13 @@ static int __mpage_da_writepage(struct page *page, | |||
| 1960 | * | 2015 | * |
| 1961 | * This is a library function, which implements the writepages() | 2016 | * This is a library function, which implements the writepages() |
| 1962 | * address_space_operation. | 2017 | * address_space_operation. |
| 1963 | * | ||
| 1964 | * In order to avoid duplication of logic that deals with partial pages, | ||
| 1965 | * multiple bio per page, etc, we find non-allocated blocks, allocate | ||
| 1966 | * them with minimal calls to ->get_block() and re-use __mpage_writepage() | ||
| 1967 | * | ||
| 1968 | * It's important that we call __mpage_writepage() only once for each | ||
| 1969 | * involved page, otherwise we'd have to implement more complicated logic | ||
| 1970 | * to deal with pages w/o PG_lock or w/ PG_writeback and so on. | ||
| 1971 | * | ||
| 1972 | * See comments to mpage_writepages() | ||
| 1973 | */ | 2018 | */ |
| 1974 | static int mpage_da_writepages(struct address_space *mapping, | 2019 | static int mpage_da_writepages(struct address_space *mapping, |
| 1975 | struct writeback_control *wbc, | 2020 | struct writeback_control *wbc, |
| 1976 | get_block_t get_block) | 2021 | get_block_t get_block) |
| 1977 | { | 2022 | { |
| 1978 | struct mpage_da_data mpd; | 2023 | struct mpage_da_data mpd; |
| 2024 | long to_write; | ||
| 1979 | int ret; | 2025 | int ret; |
| 1980 | 2026 | ||
| 1981 | if (!get_block) | 2027 | if (!get_block) |
| @@ -1989,17 +2035,22 @@ static int mpage_da_writepages(struct address_space *mapping, | |||
| 1989 | mpd.first_page = 0; | 2035 | mpd.first_page = 0; |
| 1990 | mpd.next_page = 0; | 2036 | mpd.next_page = 0; |
| 1991 | mpd.get_block = get_block; | 2037 | mpd.get_block = get_block; |
| 2038 | mpd.io_done = 0; | ||
| 2039 | mpd.pages_written = 0; | ||
| 2040 | |||
| 2041 | to_write = wbc->nr_to_write; | ||
| 1992 | 2042 | ||
| 1993 | ret = write_cache_pages(mapping, wbc, __mpage_da_writepage, &mpd); | 2043 | ret = write_cache_pages(mapping, wbc, __mpage_da_writepage, &mpd); |
| 1994 | 2044 | ||
| 1995 | /* | 2045 | /* |
| 1996 | * Handle last extent of pages | 2046 | * Handle last extent of pages |
| 1997 | */ | 2047 | */ |
| 1998 | if (mpd.next_page != mpd.first_page) { | 2048 | if (!mpd.io_done && mpd.next_page != mpd.first_page) { |
| 1999 | mpage_da_map_blocks(&mpd); | 2049 | mpage_da_map_blocks(&mpd); |
| 2000 | mpage_da_submit_io(&mpd); | 2050 | mpage_da_submit_io(&mpd); |
| 2001 | } | 2051 | } |
| 2002 | 2052 | ||
| 2053 | wbc->nr_to_write = to_write - mpd.pages_written; | ||
| 2003 | return ret; | 2054 | return ret; |
| 2004 | } | 2055 | } |
| 2005 | 2056 | ||
| @@ -2204,63 +2255,95 @@ static int ext4_da_writepage(struct page *page, | |||
| 2204 | } | 2255 | } |
| 2205 | 2256 | ||
| 2206 | /* | 2257 | /* |
| 2207 | * For now just follow the DIO way to estimate the max credits | 2258 | * This is called via ext4_da_writepages() to |
| 2208 | * needed to write out EXT4_MAX_WRITEBACK_PAGES. | 2259 | * calulate the total number of credits to reserve to fit |
| 2209 | * todo: need to calculate the max credits need for | 2260 | * a single extent allocation into a single transaction, |
| 2210 | * extent based files, currently the DIO credits is based on | 2261 | * ext4_da_writpeages() will loop calling this before |
| 2211 | * indirect-blocks mapping way. | 2262 | * the block allocation. |
| 2212 | * | ||
| 2213 | * Probably should have a generic way to calculate credits | ||
| 2214 | * for DIO, writepages, and truncate | ||
| 2215 | */ | 2263 | */ |
| 2216 | #define EXT4_MAX_WRITEBACK_PAGES DIO_MAX_BLOCKS | 2264 | |
| 2217 | #define EXT4_MAX_WRITEBACK_CREDITS DIO_CREDITS | 2265 | static int ext4_da_writepages_trans_blocks(struct inode *inode) |
| 2266 | { | ||
| 2267 | int max_blocks = EXT4_I(inode)->i_reserved_data_blocks; | ||
| 2268 | |||
| 2269 | /* | ||
| 2270 | * With non-extent format the journal credit needed to | ||
| 2271 | * insert nrblocks contiguous block is dependent on | ||
| 2272 | * number of contiguous block. So we will limit | ||
| 2273 | * number of contiguous block to a sane value | ||
| 2274 | */ | ||
| 2275 | if (!(inode->i_flags & EXT4_EXTENTS_FL) && | ||
| 2276 | (max_blocks > EXT4_MAX_TRANS_DATA)) | ||
| 2277 | max_blocks = EXT4_MAX_TRANS_DATA; | ||
| 2278 | |||
| 2279 | return ext4_chunk_trans_blocks(inode, max_blocks); | ||
| 2280 | } | ||
| 2218 | 2281 | ||
| 2219 | static int ext4_da_writepages(struct address_space *mapping, | 2282 | static int ext4_da_writepages(struct address_space *mapping, |
| 2220 | struct writeback_control *wbc) | 2283 | struct writeback_control *wbc) |
| 2221 | { | 2284 | { |
| 2222 | struct inode *inode = mapping->host; | ||
| 2223 | handle_t *handle = NULL; | 2285 | handle_t *handle = NULL; |
| 2224 | int needed_blocks; | ||
| 2225 | int ret = 0; | ||
| 2226 | long to_write; | ||
| 2227 | loff_t range_start = 0; | 2286 | loff_t range_start = 0; |
| 2287 | struct inode *inode = mapping->host; | ||
| 2288 | int needed_blocks, ret = 0, nr_to_writebump = 0; | ||
| 2289 | long to_write, pages_skipped = 0; | ||
| 2290 | struct ext4_sb_info *sbi = EXT4_SB(mapping->host->i_sb); | ||
| 2228 | 2291 | ||
| 2229 | /* | 2292 | /* |
| 2230 | * No pages to write? This is mainly a kludge to avoid starting | 2293 | * No pages to write? This is mainly a kludge to avoid starting |
| 2231 | * a transaction for special inodes like journal inode on last iput() | 2294 | * a transaction for special inodes like journal inode on last iput() |
| 2232 | * because that could violate lock ordering on umount | 2295 | * because that could violate lock ordering on umount |
| 2233 | */ | 2296 | */ |
| 2234 | if (!mapping->nrpages) | 2297 | if (!mapping->nrpages || !mapping_tagged(mapping, PAGECACHE_TAG_DIRTY)) |
| 2235 | return 0; | 2298 | return 0; |
| 2236 | |||
| 2237 | /* | 2299 | /* |
| 2238 | * Estimate the worse case needed credits to write out | 2300 | * Make sure nr_to_write is >= sbi->s_mb_stream_request |
| 2239 | * EXT4_MAX_BUF_BLOCKS pages | 2301 | * This make sure small files blocks are allocated in |
| 2302 | * single attempt. This ensure that small files | ||
| 2303 | * get less fragmented. | ||
| 2240 | */ | 2304 | */ |
| 2241 | needed_blocks = EXT4_MAX_WRITEBACK_CREDITS; | 2305 | if (wbc->nr_to_write < sbi->s_mb_stream_request) { |
| 2306 | nr_to_writebump = sbi->s_mb_stream_request - wbc->nr_to_write; | ||
| 2307 | wbc->nr_to_write = sbi->s_mb_stream_request; | ||
| 2308 | } | ||
| 2242 | 2309 | ||
| 2243 | to_write = wbc->nr_to_write; | 2310 | if (!wbc->range_cyclic) |
| 2244 | if (!wbc->range_cyclic) { | ||
| 2245 | /* | 2311 | /* |
| 2246 | * If range_cyclic is not set force range_cont | 2312 | * If range_cyclic is not set force range_cont |
| 2247 | * and save the old writeback_index | 2313 | * and save the old writeback_index |
| 2248 | */ | 2314 | */ |
| 2249 | wbc->range_cont = 1; | 2315 | wbc->range_cont = 1; |
| 2250 | range_start = wbc->range_start; | ||
| 2251 | } | ||
| 2252 | 2316 | ||
| 2253 | while (!ret && to_write) { | 2317 | range_start = wbc->range_start; |
| 2318 | pages_skipped = wbc->pages_skipped; | ||
| 2319 | |||
| 2320 | restart_loop: | ||
| 2321 | to_write = wbc->nr_to_write; | ||
| 2322 | while (!ret && to_write > 0) { | ||
| 2323 | |||
| 2324 | /* | ||
| 2325 | * we insert one extent at a time. So we need | ||
| 2326 | * credit needed for single extent allocation. | ||
| 2327 | * journalled mode is currently not supported | ||
| 2328 | * by delalloc | ||
| 2329 | */ | ||
| 2330 | BUG_ON(ext4_should_journal_data(inode)); | ||
| 2331 | needed_blocks = ext4_da_writepages_trans_blocks(inode); | ||
| 2332 | |||
| 2254 | /* start a new transaction*/ | 2333 | /* start a new transaction*/ |
| 2255 | handle = ext4_journal_start(inode, needed_blocks); | 2334 | handle = ext4_journal_start(inode, needed_blocks); |
| 2256 | if (IS_ERR(handle)) { | 2335 | if (IS_ERR(handle)) { |
| 2257 | ret = PTR_ERR(handle); | 2336 | ret = PTR_ERR(handle); |
| 2337 | printk(KERN_EMERG "%s: jbd2_start: " | ||
| 2338 | "%ld pages, ino %lu; err %d\n", __func__, | ||
| 2339 | wbc->nr_to_write, inode->i_ino, ret); | ||
| 2340 | dump_stack(); | ||
| 2258 | goto out_writepages; | 2341 | goto out_writepages; |
| 2259 | } | 2342 | } |
| 2260 | if (ext4_should_order_data(inode)) { | 2343 | if (ext4_should_order_data(inode)) { |
| 2261 | /* | 2344 | /* |
| 2262 | * With ordered mode we need to add | 2345 | * With ordered mode we need to add |
| 2263 | * the inode to the journal handle | 2346 | * the inode to the journal handl |
| 2264 | * when we do block allocation. | 2347 | * when we do block allocation. |
| 2265 | */ | 2348 | */ |
| 2266 | ret = ext4_jbd2_file_inode(handle, inode); | 2349 | ret = ext4_jbd2_file_inode(handle, inode); |
| @@ -2268,20 +2351,20 @@ static int ext4_da_writepages(struct address_space *mapping, | |||
| 2268 | ext4_journal_stop(handle); | 2351 | ext4_journal_stop(handle); |
| 2269 | goto out_writepages; | 2352 | goto out_writepages; |
| 2270 | } | 2353 | } |
| 2271 | |||
| 2272 | } | 2354 | } |
| 2273 | /* | ||
| 2274 | * set the max dirty pages could be write at a time | ||
| 2275 | * to fit into the reserved transaction credits | ||
| 2276 | */ | ||
| 2277 | if (wbc->nr_to_write > EXT4_MAX_WRITEBACK_PAGES) | ||
| 2278 | wbc->nr_to_write = EXT4_MAX_WRITEBACK_PAGES; | ||
| 2279 | 2355 | ||
| 2280 | to_write -= wbc->nr_to_write; | 2356 | to_write -= wbc->nr_to_write; |
| 2281 | ret = mpage_da_writepages(mapping, wbc, | 2357 | ret = mpage_da_writepages(mapping, wbc, |
| 2282 | ext4_da_get_block_write); | 2358 | ext4_da_get_block_write); |
| 2283 | ext4_journal_stop(handle); | 2359 | ext4_journal_stop(handle); |
| 2284 | if (wbc->nr_to_write) { | 2360 | if (ret == MPAGE_DA_EXTENT_TAIL) { |
| 2361 | /* | ||
| 2362 | * got one extent now try with | ||
| 2363 | * rest of the pages | ||
| 2364 | */ | ||
| 2365 | to_write += wbc->nr_to_write; | ||
| 2366 | ret = 0; | ||
| 2367 | } else if (wbc->nr_to_write) { | ||
| 2285 | /* | 2368 | /* |
| 2286 | * There is no more writeout needed | 2369 | * There is no more writeout needed |
| 2287 | * or we requested for a noblocking writeout | 2370 | * or we requested for a noblocking writeout |
| @@ -2293,10 +2376,18 @@ static int ext4_da_writepages(struct address_space *mapping, | |||
| 2293 | wbc->nr_to_write = to_write; | 2376 | wbc->nr_to_write = to_write; |
| 2294 | } | 2377 | } |
| 2295 | 2378 | ||
| 2296 | out_writepages: | 2379 | if (wbc->range_cont && (pages_skipped != wbc->pages_skipped)) { |
| 2297 | wbc->nr_to_write = to_write; | 2380 | /* We skipped pages in this loop */ |
| 2298 | if (range_start) | ||
| 2299 | wbc->range_start = range_start; | 2381 | wbc->range_start = range_start; |
| 2382 | wbc->nr_to_write = to_write + | ||
| 2383 | wbc->pages_skipped - pages_skipped; | ||
| 2384 | wbc->pages_skipped = pages_skipped; | ||
| 2385 | goto restart_loop; | ||
| 2386 | } | ||
| 2387 | |||
| 2388 | out_writepages: | ||
| 2389 | wbc->nr_to_write = to_write - nr_to_writebump; | ||
| 2390 | wbc->range_start = range_start; | ||
| 2300 | return ret; | 2391 | return ret; |
| 2301 | } | 2392 | } |
| 2302 | 2393 | ||
| @@ -3486,6 +3577,9 @@ void ext4_truncate(struct inode *inode) | |||
| 3486 | * modify the block allocation tree. | 3577 | * modify the block allocation tree. |
| 3487 | */ | 3578 | */ |
| 3488 | down_write(&ei->i_data_sem); | 3579 | down_write(&ei->i_data_sem); |
| 3580 | |||
| 3581 | ext4_discard_reservation(inode); | ||
| 3582 | |||
| 3489 | /* | 3583 | /* |
| 3490 | * The orphan list entry will now protect us from any crash which | 3584 | * The orphan list entry will now protect us from any crash which |
| 3491 | * occurs before the truncate completes, so it is now safe to propagate | 3585 | * occurs before the truncate completes, so it is now safe to propagate |
| @@ -3555,8 +3649,6 @@ do_indirects: | |||
| 3555 | ; | 3649 | ; |
| 3556 | } | 3650 | } |
| 3557 | 3651 | ||
| 3558 | ext4_discard_reservation(inode); | ||
| 3559 | |||
| 3560 | up_write(&ei->i_data_sem); | 3652 | up_write(&ei->i_data_sem); |
| 3561 | inode->i_mtime = inode->i_ctime = ext4_current_time(inode); | 3653 | inode->i_mtime = inode->i_ctime = ext4_current_time(inode); |
| 3562 | ext4_mark_inode_dirty(handle, inode); | 3654 | ext4_mark_inode_dirty(handle, inode); |
| @@ -4324,57 +4416,129 @@ int ext4_getattr(struct vfsmount *mnt, struct dentry *dentry, | |||
| 4324 | return 0; | 4416 | return 0; |
| 4325 | } | 4417 | } |
| 4326 | 4418 | ||
| 4419 | static int ext4_indirect_trans_blocks(struct inode *inode, int nrblocks, | ||
| 4420 | int chunk) | ||
| 4421 | { | ||
| 4422 | int indirects; | ||
| 4423 | |||
| 4424 | /* if nrblocks are contiguous */ | ||
| 4425 | if (chunk) { | ||
| 4426 | /* | ||
| 4427 | * With N contiguous data blocks, it need at most | ||
| 4428 | * N/EXT4_ADDR_PER_BLOCK(inode->i_sb) indirect blocks | ||
| 4429 | * 2 dindirect blocks | ||
| 4430 | * 1 tindirect block | ||
| 4431 | */ | ||
| 4432 | indirects = nrblocks / EXT4_ADDR_PER_BLOCK(inode->i_sb); | ||
| 4433 | return indirects + 3; | ||
| 4434 | } | ||
| 4435 | /* | ||
| 4436 | * if nrblocks are not contiguous, worse case, each block touch | ||
| 4437 | * a indirect block, and each indirect block touch a double indirect | ||
| 4438 | * block, plus a triple indirect block | ||
| 4439 | */ | ||
| 4440 | indirects = nrblocks * 2 + 1; | ||
| 4441 | return indirects; | ||
| 4442 | } | ||
| 4443 | |||
| 4444 | static int ext4_index_trans_blocks(struct inode *inode, int nrblocks, int chunk) | ||
| 4445 | { | ||
| 4446 | if (!(EXT4_I(inode)->i_flags & EXT4_EXTENTS_FL)) | ||
| 4447 | return ext4_indirect_trans_blocks(inode, nrblocks, 0); | ||
| 4448 | return ext4_ext_index_trans_blocks(inode, nrblocks, 0); | ||
| 4449 | } | ||
| 4327 | /* | 4450 | /* |
| 4328 | * How many blocks doth make a writepage()? | 4451 | * Account for index blocks, block groups bitmaps and block group |
| 4329 | * | 4452 | * descriptor blocks if modify datablocks and index blocks |
| 4330 | * With N blocks per page, it may be: | 4453 | * worse case, the indexs blocks spread over different block groups |
| 4331 | * N data blocks | ||
| 4332 | * 2 indirect block | ||
| 4333 | * 2 dindirect | ||
| 4334 | * 1 tindirect | ||
| 4335 | * N+5 bitmap blocks (from the above) | ||
| 4336 | * N+5 group descriptor summary blocks | ||
| 4337 | * 1 inode block | ||
| 4338 | * 1 superblock. | ||
| 4339 | * 2 * EXT4_SINGLEDATA_TRANS_BLOCKS for the quote files | ||
| 4340 | * | 4454 | * |
| 4341 | * 3 * (N + 5) + 2 + 2 * EXT4_SINGLEDATA_TRANS_BLOCKS | 4455 | * If datablocks are discontiguous, they are possible to spread over |
| 4456 | * different block groups too. If they are contiugous, with flexbg, | ||
| 4457 | * they could still across block group boundary. | ||
| 4342 | * | 4458 | * |
| 4343 | * With ordered or writeback data it's the same, less the N data blocks. | 4459 | * Also account for superblock, inode, quota and xattr blocks |
| 4460 | */ | ||
| 4461 | int ext4_meta_trans_blocks(struct inode *inode, int nrblocks, int chunk) | ||
| 4462 | { | ||
| 4463 | int groups, gdpblocks; | ||
| 4464 | int idxblocks; | ||
| 4465 | int ret = 0; | ||
| 4466 | |||
| 4467 | /* | ||
| 4468 | * How many index blocks need to touch to modify nrblocks? | ||
| 4469 | * The "Chunk" flag indicating whether the nrblocks is | ||
| 4470 | * physically contiguous on disk | ||
| 4471 | * | ||
| 4472 | * For Direct IO and fallocate, they calls get_block to allocate | ||
| 4473 | * one single extent at a time, so they could set the "Chunk" flag | ||
| 4474 | */ | ||
| 4475 | idxblocks = ext4_index_trans_blocks(inode, nrblocks, chunk); | ||
| 4476 | |||
| 4477 | ret = idxblocks; | ||
| 4478 | |||
| 4479 | /* | ||
| 4480 | * Now let's see how many group bitmaps and group descriptors need | ||
| 4481 | * to account | ||
| 4482 | */ | ||
| 4483 | groups = idxblocks; | ||
| 4484 | if (chunk) | ||
| 4485 | groups += 1; | ||
| 4486 | else | ||
| 4487 | groups += nrblocks; | ||
| 4488 | |||
| 4489 | gdpblocks = groups; | ||
| 4490 | if (groups > EXT4_SB(inode->i_sb)->s_groups_count) | ||
| 4491 | groups = EXT4_SB(inode->i_sb)->s_groups_count; | ||
| 4492 | if (groups > EXT4_SB(inode->i_sb)->s_gdb_count) | ||
| 4493 | gdpblocks = EXT4_SB(inode->i_sb)->s_gdb_count; | ||
| 4494 | |||
| 4495 | /* bitmaps and block group descriptor blocks */ | ||
| 4496 | ret += groups + gdpblocks; | ||
| 4497 | |||
| 4498 | /* Blocks for super block, inode, quota and xattr blocks */ | ||
| 4499 | ret += EXT4_META_TRANS_BLOCKS(inode->i_sb); | ||
| 4500 | |||
| 4501 | return ret; | ||
| 4502 | } | ||
| 4503 | |||
| 4504 | /* | ||
| 4505 | * Calulate the total number of credits to reserve to fit | ||
| 4506 | * the modification of a single pages into a single transaction, | ||
| 4507 | * which may include multiple chunks of block allocations. | ||
| 4344 | * | 4508 | * |
| 4345 | * If the inode's direct blocks can hold an integral number of pages then a | 4509 | * This could be called via ext4_write_begin() |
| 4346 | * page cannot straddle two indirect blocks, and we can only touch one indirect | ||
| 4347 | * and dindirect block, and the "5" above becomes "3". | ||
| 4348 | * | 4510 | * |
| 4349 | * This still overestimates under most circumstances. If we were to pass the | 4511 | * We need to consider the worse case, when |
| 4350 | * start and end offsets in here as well we could do block_to_path() on each | 4512 | * one new block per extent. |
| 4351 | * block and work out the exact number of indirects which are touched. Pah. | ||
| 4352 | */ | 4513 | */ |
| 4353 | |||
| 4354 | int ext4_writepage_trans_blocks(struct inode *inode) | 4514 | int ext4_writepage_trans_blocks(struct inode *inode) |
| 4355 | { | 4515 | { |
| 4356 | int bpp = ext4_journal_blocks_per_page(inode); | 4516 | int bpp = ext4_journal_blocks_per_page(inode); |
| 4357 | int indirects = (EXT4_NDIR_BLOCKS % bpp) ? 5 : 3; | ||
| 4358 | int ret; | 4517 | int ret; |
| 4359 | 4518 | ||
| 4360 | if (EXT4_I(inode)->i_flags & EXT4_EXTENTS_FL) | 4519 | ret = ext4_meta_trans_blocks(inode, bpp, 0); |
| 4361 | return ext4_ext_writepage_trans_blocks(inode, bpp); | ||
| 4362 | 4520 | ||
| 4521 | /* Account for data blocks for journalled mode */ | ||
| 4363 | if (ext4_should_journal_data(inode)) | 4522 | if (ext4_should_journal_data(inode)) |
| 4364 | ret = 3 * (bpp + indirects) + 2; | 4523 | ret += bpp; |
| 4365 | else | ||
| 4366 | ret = 2 * (bpp + indirects) + 2; | ||
| 4367 | |||
| 4368 | #ifdef CONFIG_QUOTA | ||
| 4369 | /* We know that structure was already allocated during DQUOT_INIT so | ||
| 4370 | * we will be updating only the data blocks + inodes */ | ||
| 4371 | ret += 2*EXT4_QUOTA_TRANS_BLOCKS(inode->i_sb); | ||
| 4372 | #endif | ||
| 4373 | |||
| 4374 | return ret; | 4524 | return ret; |
| 4375 | } | 4525 | } |
| 4376 | 4526 | ||
| 4377 | /* | 4527 | /* |
| 4528 | * Calculate the journal credits for a chunk of data modification. | ||
| 4529 | * | ||
| 4530 | * This is called from DIO, fallocate or whoever calling | ||
| 4531 | * ext4_get_blocks_wrap() to map/allocate a chunk of contigous disk blocks. | ||
| 4532 | * | ||
| 4533 | * journal buffers for data blocks are not included here, as DIO | ||
| 4534 | * and fallocate do no need to journal data buffers. | ||
| 4535 | */ | ||
| 4536 | int ext4_chunk_trans_blocks(struct inode *inode, int nrblocks) | ||
| 4537 | { | ||
| 4538 | return ext4_meta_trans_blocks(inode, nrblocks, 1); | ||
| 4539 | } | ||
| 4540 | |||
| 4541 | /* | ||
| 4378 | * The caller must have previously called ext4_reserve_inode_write(). | 4542 | * The caller must have previously called ext4_reserve_inode_write(). |
| 4379 | * Give this, we know that the caller already has write access to iloc->bh. | 4543 | * Give this, we know that the caller already has write access to iloc->bh. |
| 4380 | */ | 4544 | */ |
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 865e9ddb44d4..e0e3a5eb1ddb 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c | |||
| @@ -3282,6 +3282,35 @@ static void ext4_mb_use_group_pa(struct ext4_allocation_context *ac, | |||
| 3282 | } | 3282 | } |
| 3283 | 3283 | ||
| 3284 | /* | 3284 | /* |
| 3285 | * Return the prealloc space that have minimal distance | ||
| 3286 | * from the goal block. @cpa is the prealloc | ||
| 3287 | * space that is having currently known minimal distance | ||
| 3288 | * from the goal block. | ||
| 3289 | */ | ||
| 3290 | static struct ext4_prealloc_space * | ||
| 3291 | ext4_mb_check_group_pa(ext4_fsblk_t goal_block, | ||
| 3292 | struct ext4_prealloc_space *pa, | ||
| 3293 | struct ext4_prealloc_space *cpa) | ||
| 3294 | { | ||
| 3295 | ext4_fsblk_t cur_distance, new_distance; | ||
| 3296 | |||
| 3297 | if (cpa == NULL) { | ||
| 3298 | atomic_inc(&pa->pa_count); | ||
| 3299 | return pa; | ||
| 3300 | } | ||
| 3301 | cur_distance = abs(goal_block - cpa->pa_pstart); | ||
| 3302 | new_distance = abs(goal_block - pa->pa_pstart); | ||
| 3303 | |||
| 3304 | if (cur_distance < new_distance) | ||
| 3305 | return cpa; | ||
| 3306 | |||
| 3307 | /* drop the previous reference */ | ||
| 3308 | atomic_dec(&cpa->pa_count); | ||
| 3309 | atomic_inc(&pa->pa_count); | ||
| 3310 | return pa; | ||
| 3311 | } | ||
| 3312 | |||
| 3313 | /* | ||
| 3285 | * search goal blocks in preallocated space | 3314 | * search goal blocks in preallocated space |
| 3286 | */ | 3315 | */ |
| 3287 | static noinline_for_stack int | 3316 | static noinline_for_stack int |
| @@ -3290,7 +3319,8 @@ ext4_mb_use_preallocated(struct ext4_allocation_context *ac) | |||
| 3290 | int order, i; | 3319 | int order, i; |
| 3291 | struct ext4_inode_info *ei = EXT4_I(ac->ac_inode); | 3320 | struct ext4_inode_info *ei = EXT4_I(ac->ac_inode); |
| 3292 | struct ext4_locality_group *lg; | 3321 | struct ext4_locality_group *lg; |
| 3293 | struct ext4_prealloc_space *pa; | 3322 | struct ext4_prealloc_space *pa, *cpa = NULL; |
| 3323 | ext4_fsblk_t goal_block; | ||
| 3294 | 3324 | ||
| 3295 | /* only data can be preallocated */ | 3325 | /* only data can be preallocated */ |
| 3296 | if (!(ac->ac_flags & EXT4_MB_HINT_DATA)) | 3326 | if (!(ac->ac_flags & EXT4_MB_HINT_DATA)) |
| @@ -3333,6 +3363,13 @@ ext4_mb_use_preallocated(struct ext4_allocation_context *ac) | |||
| 3333 | /* The max size of hash table is PREALLOC_TB_SIZE */ | 3363 | /* The max size of hash table is PREALLOC_TB_SIZE */ |
| 3334 | order = PREALLOC_TB_SIZE - 1; | 3364 | order = PREALLOC_TB_SIZE - 1; |
| 3335 | 3365 | ||
| 3366 | goal_block = ac->ac_g_ex.fe_group * EXT4_BLOCKS_PER_GROUP(ac->ac_sb) + | ||
| 3367 | ac->ac_g_ex.fe_start + | ||
| 3368 | le32_to_cpu(EXT4_SB(ac->ac_sb)->s_es->s_first_data_block); | ||
| 3369 | /* | ||
| 3370 | * search for the prealloc space that is having | ||
| 3371 | * minimal distance from the goal block. | ||
| 3372 | */ | ||
| 3336 | for (i = order; i < PREALLOC_TB_SIZE; i++) { | 3373 | for (i = order; i < PREALLOC_TB_SIZE; i++) { |
| 3337 | rcu_read_lock(); | 3374 | rcu_read_lock(); |
| 3338 | list_for_each_entry_rcu(pa, &lg->lg_prealloc_list[i], | 3375 | list_for_each_entry_rcu(pa, &lg->lg_prealloc_list[i], |
| @@ -3340,17 +3377,19 @@ ext4_mb_use_preallocated(struct ext4_allocation_context *ac) | |||
| 3340 | spin_lock(&pa->pa_lock); | 3377 | spin_lock(&pa->pa_lock); |
| 3341 | if (pa->pa_deleted == 0 && | 3378 | if (pa->pa_deleted == 0 && |
| 3342 | pa->pa_free >= ac->ac_o_ex.fe_len) { | 3379 | pa->pa_free >= ac->ac_o_ex.fe_len) { |
| 3343 | atomic_inc(&pa->pa_count); | 3380 | |
| 3344 | ext4_mb_use_group_pa(ac, pa); | 3381 | cpa = ext4_mb_check_group_pa(goal_block, |
| 3345 | spin_unlock(&pa->pa_lock); | 3382 | pa, cpa); |
| 3346 | ac->ac_criteria = 20; | ||
| 3347 | rcu_read_unlock(); | ||
| 3348 | return 1; | ||
| 3349 | } | 3383 | } |
| 3350 | spin_unlock(&pa->pa_lock); | 3384 | spin_unlock(&pa->pa_lock); |
| 3351 | } | 3385 | } |
| 3352 | rcu_read_unlock(); | 3386 | rcu_read_unlock(); |
| 3353 | } | 3387 | } |
| 3388 | if (cpa) { | ||
| 3389 | ext4_mb_use_group_pa(ac, cpa); | ||
| 3390 | ac->ac_criteria = 20; | ||
| 3391 | return 1; | ||
| 3392 | } | ||
| 3354 | return 0; | 3393 | return 0; |
| 3355 | } | 3394 | } |
| 3356 | 3395 | ||
diff --git a/fs/ext4/migrate.c b/fs/ext4/migrate.c index b9e077ba07e9..46fc0b5b12ba 100644 --- a/fs/ext4/migrate.c +++ b/fs/ext4/migrate.c | |||
| @@ -53,7 +53,8 @@ static int finish_range(handle_t *handle, struct inode *inode, | |||
| 53 | * credit. But below we try to not accumalate too much | 53 | * credit. But below we try to not accumalate too much |
| 54 | * of them by restarting the journal. | 54 | * of them by restarting the journal. |
| 55 | */ | 55 | */ |
| 56 | needed = ext4_ext_calc_credits_for_insert(inode, path); | 56 | needed = ext4_ext_calc_credits_for_single_extent(inode, |
| 57 | lb->last_block - lb->first_block + 1, path); | ||
| 57 | 58 | ||
| 58 | /* | 59 | /* |
| 59 | * Make sure the credit we accumalated is not really high | 60 | * Make sure the credit we accumalated is not really high |
diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c index 0a9265164265..b3d35604ea18 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c | |||
| @@ -773,7 +773,8 @@ int ext4_group_add(struct super_block *sb, struct ext4_new_group_data *input) | |||
| 773 | 773 | ||
| 774 | if (reserved_gdb || gdb_off == 0) { | 774 | if (reserved_gdb || gdb_off == 0) { |
| 775 | if (!EXT4_HAS_COMPAT_FEATURE(sb, | 775 | if (!EXT4_HAS_COMPAT_FEATURE(sb, |
| 776 | EXT4_FEATURE_COMPAT_RESIZE_INODE)){ | 776 | EXT4_FEATURE_COMPAT_RESIZE_INODE) |
| 777 | || !le16_to_cpu(es->s_reserved_gdt_blocks)) { | ||
| 777 | ext4_warning(sb, __func__, | 778 | ext4_warning(sb, __func__, |
| 778 | "No reserved GDT blocks, can't resize"); | 779 | "No reserved GDT blocks, can't resize"); |
| 779 | return -EPERM; | 780 | return -EPERM; |
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index d5d77958b861..566344b926b7 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c | |||
| @@ -568,6 +568,7 @@ static struct inode *ext4_alloc_inode(struct super_block *sb) | |||
| 568 | #endif | 568 | #endif |
| 569 | ei->i_block_alloc_info = NULL; | 569 | ei->i_block_alloc_info = NULL; |
| 570 | ei->vfs_inode.i_version = 1; | 570 | ei->vfs_inode.i_version = 1; |
| 571 | ei->vfs_inode.i_data.writeback_index = 0; | ||
| 571 | memset(&ei->i_cached_extent, 0, sizeof(struct ext4_ext_cache)); | 572 | memset(&ei->i_cached_extent, 0, sizeof(struct ext4_ext_cache)); |
| 572 | INIT_LIST_HEAD(&ei->i_prealloc_list); | 573 | INIT_LIST_HEAD(&ei->i_prealloc_list); |
| 573 | spin_lock_init(&ei->i_prealloc_lock); | 574 | spin_lock_init(&ei->i_prealloc_lock); |
diff --git a/fs/fat/inode.c b/fs/fat/inode.c index 6d266d793e2c..80ff3381fa21 100644 --- a/fs/fat/inode.c +++ b/fs/fat/inode.c | |||
| @@ -562,26 +562,23 @@ static int fat_write_inode(struct inode *inode, int wait) | |||
| 562 | struct buffer_head *bh; | 562 | struct buffer_head *bh; |
| 563 | struct msdos_dir_entry *raw_entry; | 563 | struct msdos_dir_entry *raw_entry; |
| 564 | loff_t i_pos; | 564 | loff_t i_pos; |
| 565 | int err = 0; | 565 | int err; |
| 566 | 566 | ||
| 567 | retry: | 567 | retry: |
| 568 | i_pos = MSDOS_I(inode)->i_pos; | 568 | i_pos = MSDOS_I(inode)->i_pos; |
| 569 | if (inode->i_ino == MSDOS_ROOT_INO || !i_pos) | 569 | if (inode->i_ino == MSDOS_ROOT_INO || !i_pos) |
| 570 | return 0; | 570 | return 0; |
| 571 | 571 | ||
| 572 | lock_super(sb); | ||
| 573 | bh = sb_bread(sb, i_pos >> sbi->dir_per_block_bits); | 572 | bh = sb_bread(sb, i_pos >> sbi->dir_per_block_bits); |
| 574 | if (!bh) { | 573 | if (!bh) { |
| 575 | printk(KERN_ERR "FAT: unable to read inode block " | 574 | printk(KERN_ERR "FAT: unable to read inode block " |
| 576 | "for updating (i_pos %lld)\n", i_pos); | 575 | "for updating (i_pos %lld)\n", i_pos); |
| 577 | err = -EIO; | 576 | return -EIO; |
| 578 | goto out; | ||
| 579 | } | 577 | } |
| 580 | spin_lock(&sbi->inode_hash_lock); | 578 | spin_lock(&sbi->inode_hash_lock); |
| 581 | if (i_pos != MSDOS_I(inode)->i_pos) { | 579 | if (i_pos != MSDOS_I(inode)->i_pos) { |
| 582 | spin_unlock(&sbi->inode_hash_lock); | 580 | spin_unlock(&sbi->inode_hash_lock); |
| 583 | brelse(bh); | 581 | brelse(bh); |
| 584 | unlock_super(sb); | ||
| 585 | goto retry; | 582 | goto retry; |
| 586 | } | 583 | } |
| 587 | 584 | ||
| @@ -607,11 +604,10 @@ retry: | |||
| 607 | } | 604 | } |
| 608 | spin_unlock(&sbi->inode_hash_lock); | 605 | spin_unlock(&sbi->inode_hash_lock); |
| 609 | mark_buffer_dirty(bh); | 606 | mark_buffer_dirty(bh); |
| 607 | err = 0; | ||
| 610 | if (wait) | 608 | if (wait) |
| 611 | err = sync_dirty_buffer(bh); | 609 | err = sync_dirty_buffer(bh); |
| 612 | brelse(bh); | 610 | brelse(bh); |
| 613 | out: | ||
| 614 | unlock_super(sb); | ||
| 615 | return err; | 611 | return err; |
| 616 | } | 612 | } |
| 617 | 613 | ||
diff --git a/fs/inode.c b/fs/inode.c index b6726f644530..0487ddba1397 100644 --- a/fs/inode.c +++ b/fs/inode.c | |||
| @@ -166,6 +166,7 @@ static struct inode *alloc_inode(struct super_block *sb) | |||
| 166 | mapping_set_gfp_mask(mapping, GFP_HIGHUSER_PAGECACHE); | 166 | mapping_set_gfp_mask(mapping, GFP_HIGHUSER_PAGECACHE); |
| 167 | mapping->assoc_mapping = NULL; | 167 | mapping->assoc_mapping = NULL; |
| 168 | mapping->backing_dev_info = &default_backing_dev_info; | 168 | mapping->backing_dev_info = &default_backing_dev_info; |
| 169 | mapping->writeback_index = 0; | ||
| 169 | 170 | ||
| 170 | /* | 171 | /* |
| 171 | * If the block_device provides a backing_dev_info for client | 172 | * If the block_device provides a backing_dev_info for client |
diff --git a/fs/ioprio.c b/fs/ioprio.c index c4a1c3c65aac..da3cc460d4df 100644 --- a/fs/ioprio.c +++ b/fs/ioprio.c | |||
| @@ -115,11 +115,11 @@ asmlinkage long sys_ioprio_set(int which, int who, int ioprio) | |||
| 115 | pgrp = task_pgrp(current); | 115 | pgrp = task_pgrp(current); |
| 116 | else | 116 | else |
| 117 | pgrp = find_vpid(who); | 117 | pgrp = find_vpid(who); |
| 118 | do_each_pid_task(pgrp, PIDTYPE_PGID, p) { | 118 | do_each_pid_thread(pgrp, PIDTYPE_PGID, p) { |
| 119 | ret = set_task_ioprio(p, ioprio); | 119 | ret = set_task_ioprio(p, ioprio); |
| 120 | if (ret) | 120 | if (ret) |
| 121 | break; | 121 | break; |
| 122 | } while_each_pid_task(pgrp, PIDTYPE_PGID, p); | 122 | } while_each_pid_thread(pgrp, PIDTYPE_PGID, p); |
| 123 | break; | 123 | break; |
| 124 | case IOPRIO_WHO_USER: | 124 | case IOPRIO_WHO_USER: |
| 125 | if (!who) | 125 | if (!who) |
| @@ -204,7 +204,7 @@ asmlinkage long sys_ioprio_get(int which, int who) | |||
| 204 | pgrp = task_pgrp(current); | 204 | pgrp = task_pgrp(current); |
| 205 | else | 205 | else |
| 206 | pgrp = find_vpid(who); | 206 | pgrp = find_vpid(who); |
| 207 | do_each_pid_task(pgrp, PIDTYPE_PGID, p) { | 207 | do_each_pid_thread(pgrp, PIDTYPE_PGID, p) { |
| 208 | tmpio = get_task_ioprio(p); | 208 | tmpio = get_task_ioprio(p); |
| 209 | if (tmpio < 0) | 209 | if (tmpio < 0) |
| 210 | continue; | 210 | continue; |
| @@ -212,7 +212,7 @@ asmlinkage long sys_ioprio_get(int which, int who) | |||
| 212 | ret = tmpio; | 212 | ret = tmpio; |
| 213 | else | 213 | else |
| 214 | ret = ioprio_best(ret, tmpio); | 214 | ret = ioprio_best(ret, tmpio); |
| 215 | } while_each_pid_task(pgrp, PIDTYPE_PGID, p); | 215 | } while_each_pid_thread(pgrp, PIDTYPE_PGID, p); |
| 216 | break; | 216 | break; |
| 217 | case IOPRIO_WHO_USER: | 217 | case IOPRIO_WHO_USER: |
| 218 | if (!who) | 218 | if (!who) |
diff --git a/fs/jbd/transaction.c b/fs/jbd/transaction.c index 8dee32007500..0540ca27a446 100644 --- a/fs/jbd/transaction.c +++ b/fs/jbd/transaction.c | |||
| @@ -291,7 +291,7 @@ handle_t *journal_start(journal_t *journal, int nblocks) | |||
| 291 | goto out; | 291 | goto out; |
| 292 | } | 292 | } |
| 293 | 293 | ||
| 294 | lock_acquire(&handle->h_lockdep_map, 0, 0, 0, 2, _THIS_IP_); | 294 | lock_map_acquire(&handle->h_lockdep_map); |
| 295 | 295 | ||
| 296 | out: | 296 | out: |
| 297 | return handle; | 297 | return handle; |
| @@ -1448,7 +1448,7 @@ int journal_stop(handle_t *handle) | |||
| 1448 | spin_unlock(&journal->j_state_lock); | 1448 | spin_unlock(&journal->j_state_lock); |
| 1449 | } | 1449 | } |
| 1450 | 1450 | ||
| 1451 | lock_release(&handle->h_lockdep_map, 1, _THIS_IP_); | 1451 | lock_map_release(&handle->h_lockdep_map); |
| 1452 | 1452 | ||
| 1453 | jbd_free_handle(handle); | 1453 | jbd_free_handle(handle); |
| 1454 | return err; | 1454 | return err; |
diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c index 4f7cadbb19fa..e5d540588fa9 100644 --- a/fs/jbd2/transaction.c +++ b/fs/jbd2/transaction.c | |||
| @@ -301,7 +301,7 @@ handle_t *jbd2_journal_start(journal_t *journal, int nblocks) | |||
| 301 | goto out; | 301 | goto out; |
| 302 | } | 302 | } |
| 303 | 303 | ||
| 304 | lock_acquire(&handle->h_lockdep_map, 0, 0, 0, 2, _THIS_IP_); | 304 | lock_map_acquire(&handle->h_lockdep_map); |
| 305 | out: | 305 | out: |
| 306 | return handle; | 306 | return handle; |
| 307 | } | 307 | } |
| @@ -1279,7 +1279,7 @@ int jbd2_journal_stop(handle_t *handle) | |||
| 1279 | spin_unlock(&journal->j_state_lock); | 1279 | spin_unlock(&journal->j_state_lock); |
| 1280 | } | 1280 | } |
| 1281 | 1281 | ||
| 1282 | lock_release(&handle->h_lockdep_map, 1, _THIS_IP_); | 1282 | lock_map_release(&handle->h_lockdep_map); |
| 1283 | 1283 | ||
| 1284 | jbd2_free_handle(handle); | 1284 | jbd2_free_handle(handle); |
| 1285 | return err; | 1285 | return err; |
diff --git a/fs/jffs2/jffs2_fs_i.h b/fs/jffs2/jffs2_fs_i.h index 31559f45fdde..4c41db91eaa4 100644 --- a/fs/jffs2/jffs2_fs_i.h +++ b/fs/jffs2/jffs2_fs_i.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #ifndef _JFFS2_FS_I | 12 | #ifndef _JFFS2_FS_I |
| 13 | #define _JFFS2_FS_I | 13 | #define _JFFS2_FS_I |
| 14 | 14 | ||
| 15 | #include <linux/version.h> | ||
| 16 | #include <linux/rbtree.h> | 15 | #include <linux/rbtree.h> |
| 17 | #include <linux/posix_acl.h> | 16 | #include <linux/posix_acl.h> |
| 18 | #include <linux/mutex.h> | 17 | #include <linux/mutex.h> |
diff --git a/fs/lockd/svc4proc.c b/fs/lockd/svc4proc.c index 399444639337..4a714f64515b 100644 --- a/fs/lockd/svc4proc.c +++ b/fs/lockd/svc4proc.c | |||
| @@ -83,7 +83,7 @@ nlm4svc_proc_test(struct svc_rqst *rqstp, struct nlm_args *argp, | |||
| 83 | { | 83 | { |
| 84 | struct nlm_host *host; | 84 | struct nlm_host *host; |
| 85 | struct nlm_file *file; | 85 | struct nlm_file *file; |
| 86 | int rc = rpc_success; | 86 | __be32 rc = rpc_success; |
| 87 | 87 | ||
| 88 | dprintk("lockd: TEST4 called\n"); | 88 | dprintk("lockd: TEST4 called\n"); |
| 89 | resp->cookie = argp->cookie; | 89 | resp->cookie = argp->cookie; |
| @@ -116,7 +116,7 @@ nlm4svc_proc_lock(struct svc_rqst *rqstp, struct nlm_args *argp, | |||
| 116 | { | 116 | { |
| 117 | struct nlm_host *host; | 117 | struct nlm_host *host; |
| 118 | struct nlm_file *file; | 118 | struct nlm_file *file; |
| 119 | int rc = rpc_success; | 119 | __be32 rc = rpc_success; |
| 120 | 120 | ||
| 121 | dprintk("lockd: LOCK called\n"); | 121 | dprintk("lockd: LOCK called\n"); |
| 122 | 122 | ||
diff --git a/fs/lockd/svcproc.c b/fs/lockd/svcproc.c index 76019d2ff72d..76262c1986f2 100644 --- a/fs/lockd/svcproc.c +++ b/fs/lockd/svcproc.c | |||
| @@ -112,7 +112,7 @@ nlmsvc_proc_test(struct svc_rqst *rqstp, struct nlm_args *argp, | |||
| 112 | { | 112 | { |
| 113 | struct nlm_host *host; | 113 | struct nlm_host *host; |
| 114 | struct nlm_file *file; | 114 | struct nlm_file *file; |
| 115 | int rc = rpc_success; | 115 | __be32 rc = rpc_success; |
| 116 | 116 | ||
| 117 | dprintk("lockd: TEST called\n"); | 117 | dprintk("lockd: TEST called\n"); |
| 118 | resp->cookie = argp->cookie; | 118 | resp->cookie = argp->cookie; |
| @@ -146,7 +146,7 @@ nlmsvc_proc_lock(struct svc_rqst *rqstp, struct nlm_args *argp, | |||
| 146 | { | 146 | { |
| 147 | struct nlm_host *host; | 147 | struct nlm_host *host; |
| 148 | struct nlm_file *file; | 148 | struct nlm_file *file; |
| 149 | int rc = rpc_success; | 149 | __be32 rc = rpc_success; |
| 150 | 150 | ||
| 151 | dprintk("lockd: LOCK called\n"); | 151 | dprintk("lockd: LOCK called\n"); |
| 152 | 152 | ||
diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c index 33bfcf09db46..9dc036f18356 100644 --- a/fs/nfsd/export.c +++ b/fs/nfsd/export.c | |||
| @@ -1023,7 +1023,7 @@ exp_export(struct nfsctl_export *nxp) | |||
| 1023 | /* Look up the dentry */ | 1023 | /* Look up the dentry */ |
| 1024 | err = path_lookup(nxp->ex_path, 0, &nd); | 1024 | err = path_lookup(nxp->ex_path, 0, &nd); |
| 1025 | if (err) | 1025 | if (err) |
| 1026 | goto out_unlock; | 1026 | goto out_put_clp; |
| 1027 | err = -EINVAL; | 1027 | err = -EINVAL; |
| 1028 | 1028 | ||
| 1029 | exp = exp_get_by_name(clp, nd.path.mnt, nd.path.dentry, NULL); | 1029 | exp = exp_get_by_name(clp, nd.path.mnt, nd.path.dentry, NULL); |
| @@ -1090,9 +1090,9 @@ finish: | |||
| 1090 | exp_put(exp); | 1090 | exp_put(exp); |
| 1091 | if (fsid_key && !IS_ERR(fsid_key)) | 1091 | if (fsid_key && !IS_ERR(fsid_key)) |
| 1092 | cache_put(&fsid_key->h, &svc_expkey_cache); | 1092 | cache_put(&fsid_key->h, &svc_expkey_cache); |
| 1093 | if (clp) | ||
| 1094 | auth_domain_put(clp); | ||
| 1095 | path_put(&nd.path); | 1093 | path_put(&nd.path); |
| 1094 | out_put_clp: | ||
| 1095 | auth_domain_put(clp); | ||
| 1096 | out_unlock: | 1096 | out_unlock: |
| 1097 | exp_writeunlock(); | 1097 | exp_writeunlock(); |
| 1098 | out: | 1098 | out: |
diff --git a/fs/nfsd/nfs4acl.c b/fs/nfsd/nfs4acl.c index b6ed38380ab8..54b8b4140c8f 100644 --- a/fs/nfsd/nfs4acl.c +++ b/fs/nfsd/nfs4acl.c | |||
| @@ -443,7 +443,7 @@ init_state(struct posix_acl_state *state, int cnt) | |||
| 443 | * enough space for either: | 443 | * enough space for either: |
| 444 | */ | 444 | */ |
| 445 | alloc = sizeof(struct posix_ace_state_array) | 445 | alloc = sizeof(struct posix_ace_state_array) |
| 446 | + cnt*sizeof(struct posix_ace_state); | 446 | + cnt*sizeof(struct posix_user_ace_state); |
| 447 | state->users = kzalloc(alloc, GFP_KERNEL); | 447 | state->users = kzalloc(alloc, GFP_KERNEL); |
| 448 | if (!state->users) | 448 | if (!state->users) |
| 449 | return -ENOMEM; | 449 | return -ENOMEM; |
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index 2e51adac65de..e5b51ffafc6c 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c | |||
| @@ -867,11 +867,6 @@ nfsd4_proc_compound(struct svc_rqst *rqstp, | |||
| 867 | int slack_bytes; | 867 | int slack_bytes; |
| 868 | __be32 status; | 868 | __be32 status; |
| 869 | 869 | ||
| 870 | status = nfserr_resource; | ||
| 871 | cstate = cstate_alloc(); | ||
| 872 | if (cstate == NULL) | ||
| 873 | goto out; | ||
| 874 | |||
| 875 | resp->xbuf = &rqstp->rq_res; | 870 | resp->xbuf = &rqstp->rq_res; |
| 876 | resp->p = rqstp->rq_res.head[0].iov_base + rqstp->rq_res.head[0].iov_len; | 871 | resp->p = rqstp->rq_res.head[0].iov_base + rqstp->rq_res.head[0].iov_len; |
| 877 | resp->tagp = resp->p; | 872 | resp->tagp = resp->p; |
| @@ -890,6 +885,11 @@ nfsd4_proc_compound(struct svc_rqst *rqstp, | |||
| 890 | if (args->minorversion > NFSD_SUPPORTED_MINOR_VERSION) | 885 | if (args->minorversion > NFSD_SUPPORTED_MINOR_VERSION) |
| 891 | goto out; | 886 | goto out; |
| 892 | 887 | ||
| 888 | status = nfserr_resource; | ||
| 889 | cstate = cstate_alloc(); | ||
| 890 | if (cstate == NULL) | ||
| 891 | goto out; | ||
| 892 | |||
| 893 | status = nfs_ok; | 893 | status = nfs_ok; |
| 894 | while (!status && resp->opcnt < args->opcnt) { | 894 | while (!status && resp->opcnt < args->opcnt) { |
| 895 | op = &args->ops[resp->opcnt++]; | 895 | op = &args->ops[resp->opcnt++]; |
| @@ -957,9 +957,9 @@ encode_op: | |||
| 957 | nfsd4_increment_op_stats(op->opnum); | 957 | nfsd4_increment_op_stats(op->opnum); |
| 958 | } | 958 | } |
| 959 | 959 | ||
| 960 | cstate_free(cstate); | ||
| 960 | out: | 961 | out: |
| 961 | nfsd4_release_compoundargs(args); | 962 | nfsd4_release_compoundargs(args); |
| 962 | cstate_free(cstate); | ||
| 963 | dprintk("nfsv4 compound returned %d\n", ntohl(status)); | 963 | dprintk("nfsv4 compound returned %d\n", ntohl(status)); |
| 964 | return status; | 964 | return status; |
| 965 | } | 965 | } |
diff --git a/fs/ntfs/namei.c b/fs/ntfs/namei.c index e1781c8b1650..9e8a95be7a1e 100644 --- a/fs/ntfs/namei.c +++ b/fs/ntfs/namei.c | |||
| @@ -174,7 +174,6 @@ static struct dentry *ntfs_lookup(struct inode *dir_ino, struct dentry *dent, | |||
| 174 | // TODO: Consider moving this lot to a separate function! (AIA) | 174 | // TODO: Consider moving this lot to a separate function! (AIA) |
| 175 | handle_name: | 175 | handle_name: |
| 176 | { | 176 | { |
| 177 | struct dentry *real_dent, *new_dent; | ||
| 178 | MFT_RECORD *m; | 177 | MFT_RECORD *m; |
| 179 | ntfs_attr_search_ctx *ctx; | 178 | ntfs_attr_search_ctx *ctx; |
| 180 | ntfs_inode *ni = NTFS_I(dent_inode); | 179 | ntfs_inode *ni = NTFS_I(dent_inode); |
| @@ -255,93 +254,9 @@ handle_name: | |||
| 255 | } | 254 | } |
| 256 | nls_name.hash = full_name_hash(nls_name.name, nls_name.len); | 255 | nls_name.hash = full_name_hash(nls_name.name, nls_name.len); |
| 257 | 256 | ||
| 258 | /* | 257 | dent = d_add_ci(dent, dent_inode, &nls_name); |
| 259 | * Note: No need for dent->d_lock lock as i_mutex is held on the | ||
| 260 | * parent inode. | ||
| 261 | */ | ||
| 262 | |||
| 263 | /* Does a dentry matching the nls_name exist already? */ | ||
| 264 | real_dent = d_lookup(dent->d_parent, &nls_name); | ||
| 265 | /* If not, create it now. */ | ||
| 266 | if (!real_dent) { | ||
| 267 | real_dent = d_alloc(dent->d_parent, &nls_name); | ||
| 268 | kfree(nls_name.name); | ||
| 269 | if (!real_dent) { | ||
| 270 | err = -ENOMEM; | ||
| 271 | goto err_out; | ||
| 272 | } | ||
| 273 | new_dent = d_splice_alias(dent_inode, real_dent); | ||
| 274 | if (new_dent) | ||
| 275 | dput(real_dent); | ||
| 276 | else | ||
| 277 | new_dent = real_dent; | ||
| 278 | ntfs_debug("Done. (Created new dentry.)"); | ||
| 279 | return new_dent; | ||
| 280 | } | ||
| 281 | kfree(nls_name.name); | 258 | kfree(nls_name.name); |
| 282 | /* Matching dentry exists, check if it is negative. */ | 259 | return dent; |
| 283 | if (real_dent->d_inode) { | ||
| 284 | if (unlikely(real_dent->d_inode != dent_inode)) { | ||
| 285 | /* This can happen because bad inodes are unhashed. */ | ||
| 286 | BUG_ON(!is_bad_inode(dent_inode)); | ||
| 287 | BUG_ON(!is_bad_inode(real_dent->d_inode)); | ||
| 288 | } | ||
| 289 | /* | ||
| 290 | * Already have the inode and the dentry attached, decrement | ||
| 291 | * the reference count to balance the ntfs_iget() we did | ||
| 292 | * earlier on. We found the dentry using d_lookup() so it | ||
| 293 | * cannot be disconnected and thus we do not need to worry | ||
| 294 | * about any NFS/disconnectedness issues here. | ||
| 295 | */ | ||
| 296 | iput(dent_inode); | ||
| 297 | ntfs_debug("Done. (Already had inode and dentry.)"); | ||
| 298 | return real_dent; | ||
| 299 | } | ||
| 300 | /* | ||
| 301 | * Negative dentry: instantiate it unless the inode is a directory and | ||
| 302 | * has a 'disconnected' dentry (i.e. IS_ROOT and DCACHE_DISCONNECTED), | ||
| 303 | * in which case d_move() that in place of the found dentry. | ||
| 304 | */ | ||
| 305 | if (!S_ISDIR(dent_inode->i_mode)) { | ||
| 306 | /* Not a directory; everything is easy. */ | ||
| 307 | d_instantiate(real_dent, dent_inode); | ||
| 308 | ntfs_debug("Done. (Already had negative file dentry.)"); | ||
| 309 | return real_dent; | ||
| 310 | } | ||
| 311 | spin_lock(&dcache_lock); | ||
| 312 | if (list_empty(&dent_inode->i_dentry)) { | ||
| 313 | /* | ||
| 314 | * Directory without a 'disconnected' dentry; we need to do | ||
| 315 | * d_instantiate() by hand because it takes dcache_lock which | ||
| 316 | * we already hold. | ||
| 317 | */ | ||
| 318 | list_add(&real_dent->d_alias, &dent_inode->i_dentry); | ||
| 319 | real_dent->d_inode = dent_inode; | ||
| 320 | spin_unlock(&dcache_lock); | ||
| 321 | security_d_instantiate(real_dent, dent_inode); | ||
| 322 | ntfs_debug("Done. (Already had negative directory dentry.)"); | ||
| 323 | return real_dent; | ||
| 324 | } | ||
| 325 | /* | ||
| 326 | * Directory with a 'disconnected' dentry; get a reference to the | ||
| 327 | * 'disconnected' dentry. | ||
| 328 | */ | ||
| 329 | new_dent = list_entry(dent_inode->i_dentry.next, struct dentry, | ||
| 330 | d_alias); | ||
| 331 | dget_locked(new_dent); | ||
| 332 | spin_unlock(&dcache_lock); | ||
| 333 | /* Do security vodoo. */ | ||
| 334 | security_d_instantiate(real_dent, dent_inode); | ||
| 335 | /* Move new_dent in place of real_dent. */ | ||
| 336 | d_move(new_dent, real_dent); | ||
| 337 | /* Balance the ntfs_iget() we did above. */ | ||
| 338 | iput(dent_inode); | ||
| 339 | /* Throw away real_dent. */ | ||
| 340 | dput(real_dent); | ||
| 341 | /* Use new_dent as the actual dentry. */ | ||
| 342 | ntfs_debug("Done. (Already had negative, disconnected directory " | ||
| 343 | "dentry.)"); | ||
| 344 | return new_dent; | ||
| 345 | 260 | ||
| 346 | eio_err_out: | 261 | eio_err_out: |
| 347 | ntfs_error(vol->sb, "Illegal file name attribute. Run chkdsk."); | 262 | ntfs_error(vol->sb, "Illegal file name attribute. Run chkdsk."); |
diff --git a/fs/ntfs/usnjrnl.h b/fs/ntfs/usnjrnl.h index 3a8af75351e8..4087fbdac327 100644 --- a/fs/ntfs/usnjrnl.h +++ b/fs/ntfs/usnjrnl.h | |||
| @@ -113,7 +113,7 @@ typedef struct { | |||
| 113 | * Reason flags (32-bit). Cumulative flags describing the change(s) to the | 113 | * Reason flags (32-bit). Cumulative flags describing the change(s) to the |
| 114 | * file since it was last opened. I think the names speak for themselves but | 114 | * file since it was last opened. I think the names speak for themselves but |
| 115 | * if you disagree check out the descriptions in the Linux NTFS project NTFS | 115 | * if you disagree check out the descriptions in the Linux NTFS project NTFS |
| 116 | * documentation: http://linux-ntfs.sourceforge.net/ntfs/files/usnjrnl.html | 116 | * documentation: http://www.linux-ntfs.org/ |
| 117 | */ | 117 | */ |
| 118 | enum { | 118 | enum { |
| 119 | USN_REASON_DATA_OVERWRITE = const_cpu_to_le32(0x00000001), | 119 | USN_REASON_DATA_OVERWRITE = const_cpu_to_le32(0x00000001), |
| @@ -145,7 +145,7 @@ typedef le32 USN_REASON_FLAGS; | |||
| 145 | * Source info flags (32-bit). Information about the source of the change(s) | 145 | * Source info flags (32-bit). Information about the source of the change(s) |
| 146 | * to the file. For detailed descriptions of what these mean, see the Linux | 146 | * to the file. For detailed descriptions of what these mean, see the Linux |
| 147 | * NTFS project NTFS documentation: | 147 | * NTFS project NTFS documentation: |
| 148 | * http://linux-ntfs.sourceforge.net/ntfs/files/usnjrnl.html | 148 | * http://www.linux-ntfs.org/ |
| 149 | */ | 149 | */ |
| 150 | enum { | 150 | enum { |
| 151 | USN_SOURCE_DATA_MANAGEMENT = const_cpu_to_le32(0x00000001), | 151 | USN_SOURCE_DATA_MANAGEMENT = const_cpu_to_le32(0x00000001), |
diff --git a/fs/ocfs2/cluster/netdebug.c b/fs/ocfs2/cluster/netdebug.c index d8bfa0eb41b2..52276c02f710 100644 --- a/fs/ocfs2/cluster/netdebug.c +++ b/fs/ocfs2/cluster/netdebug.c | |||
| @@ -138,20 +138,20 @@ static int nst_seq_show(struct seq_file *seq, void *v) | |||
| 138 | " message id: %d\n" | 138 | " message id: %d\n" |
| 139 | " message type: %u\n" | 139 | " message type: %u\n" |
| 140 | " message key: 0x%08x\n" | 140 | " message key: 0x%08x\n" |
| 141 | " sock acquiry: %lu.%lu\n" | 141 | " sock acquiry: %lu.%ld\n" |
| 142 | " send start: %lu.%lu\n" | 142 | " send start: %lu.%ld\n" |
| 143 | " wait start: %lu.%lu\n", | 143 | " wait start: %lu.%ld\n", |
| 144 | nst, (unsigned long)nst->st_task->pid, | 144 | nst, (unsigned long)nst->st_task->pid, |
| 145 | (unsigned long)nst->st_task->tgid, | 145 | (unsigned long)nst->st_task->tgid, |
| 146 | nst->st_task->comm, nst->st_node, | 146 | nst->st_task->comm, nst->st_node, |
| 147 | nst->st_sc, nst->st_id, nst->st_msg_type, | 147 | nst->st_sc, nst->st_id, nst->st_msg_type, |
| 148 | nst->st_msg_key, | 148 | nst->st_msg_key, |
| 149 | nst->st_sock_time.tv_sec, | 149 | nst->st_sock_time.tv_sec, |
| 150 | (unsigned long)nst->st_sock_time.tv_usec, | 150 | (long)nst->st_sock_time.tv_usec, |
| 151 | nst->st_send_time.tv_sec, | 151 | nst->st_send_time.tv_sec, |
| 152 | (unsigned long)nst->st_send_time.tv_usec, | 152 | (long)nst->st_send_time.tv_usec, |
| 153 | nst->st_status_time.tv_sec, | 153 | nst->st_status_time.tv_sec, |
| 154 | nst->st_status_time.tv_usec); | 154 | (long)nst->st_status_time.tv_usec); |
| 155 | } | 155 | } |
| 156 | 156 | ||
| 157 | spin_unlock(&o2net_debug_lock); | 157 | spin_unlock(&o2net_debug_lock); |
| @@ -276,7 +276,7 @@ static void *sc_seq_next(struct seq_file *seq, void *v, loff_t *pos) | |||
| 276 | return sc; /* unused, just needs to be null when done */ | 276 | return sc; /* unused, just needs to be null when done */ |
| 277 | } | 277 | } |
| 278 | 278 | ||
| 279 | #define TV_SEC_USEC(TV) TV.tv_sec, (unsigned long)TV.tv_usec | 279 | #define TV_SEC_USEC(TV) TV.tv_sec, (long)TV.tv_usec |
| 280 | 280 | ||
| 281 | static int sc_seq_show(struct seq_file *seq, void *v) | 281 | static int sc_seq_show(struct seq_file *seq, void *v) |
| 282 | { | 282 | { |
| @@ -309,12 +309,12 @@ static int sc_seq_show(struct seq_file *seq, void *v) | |||
| 309 | " remote node: %s\n" | 309 | " remote node: %s\n" |
| 310 | " page off: %zu\n" | 310 | " page off: %zu\n" |
| 311 | " handshake ok: %u\n" | 311 | " handshake ok: %u\n" |
| 312 | " timer: %lu.%lu\n" | 312 | " timer: %lu.%ld\n" |
| 313 | " data ready: %lu.%lu\n" | 313 | " data ready: %lu.%ld\n" |
| 314 | " advance start: %lu.%lu\n" | 314 | " advance start: %lu.%ld\n" |
| 315 | " advance stop: %lu.%lu\n" | 315 | " advance stop: %lu.%ld\n" |
| 316 | " func start: %lu.%lu\n" | 316 | " func start: %lu.%ld\n" |
| 317 | " func stop: %lu.%lu\n" | 317 | " func stop: %lu.%ld\n" |
| 318 | " func key: %u\n" | 318 | " func key: %u\n" |
| 319 | " func type: %u\n", | 319 | " func type: %u\n", |
| 320 | sc, | 320 | sc, |
diff --git a/fs/ocfs2/cluster/tcp.c b/fs/ocfs2/cluster/tcp.c index a27d61581bd6..2bcf706d9dd3 100644 --- a/fs/ocfs2/cluster/tcp.c +++ b/fs/ocfs2/cluster/tcp.c | |||
| @@ -143,8 +143,8 @@ static void o2net_sc_postpone_idle(struct o2net_sock_container *sc); | |||
| 143 | static void o2net_sc_reset_idle_timer(struct o2net_sock_container *sc); | 143 | static void o2net_sc_reset_idle_timer(struct o2net_sock_container *sc); |
| 144 | 144 | ||
| 145 | #ifdef CONFIG_DEBUG_FS | 145 | #ifdef CONFIG_DEBUG_FS |
| 146 | void o2net_init_nst(struct o2net_send_tracking *nst, u32 msgtype, | 146 | static void o2net_init_nst(struct o2net_send_tracking *nst, u32 msgtype, |
| 147 | u32 msgkey, struct task_struct *task, u8 node) | 147 | u32 msgkey, struct task_struct *task, u8 node) |
| 148 | { | 148 | { |
| 149 | INIT_LIST_HEAD(&nst->st_net_debug_item); | 149 | INIT_LIST_HEAD(&nst->st_net_debug_item); |
| 150 | nst->st_task = task; | 150 | nst->st_task = task; |
| @@ -153,31 +153,61 @@ void o2net_init_nst(struct o2net_send_tracking *nst, u32 msgtype, | |||
| 153 | nst->st_node = node; | 153 | nst->st_node = node; |
| 154 | } | 154 | } |
| 155 | 155 | ||
| 156 | void o2net_set_nst_sock_time(struct o2net_send_tracking *nst) | 156 | static void o2net_set_nst_sock_time(struct o2net_send_tracking *nst) |
| 157 | { | 157 | { |
| 158 | do_gettimeofday(&nst->st_sock_time); | 158 | do_gettimeofday(&nst->st_sock_time); |
| 159 | } | 159 | } |
| 160 | 160 | ||
| 161 | void o2net_set_nst_send_time(struct o2net_send_tracking *nst) | 161 | static void o2net_set_nst_send_time(struct o2net_send_tracking *nst) |
| 162 | { | 162 | { |
| 163 | do_gettimeofday(&nst->st_send_time); | 163 | do_gettimeofday(&nst->st_send_time); |
| 164 | } | 164 | } |
| 165 | 165 | ||
| 166 | void o2net_set_nst_status_time(struct o2net_send_tracking *nst) | 166 | static void o2net_set_nst_status_time(struct o2net_send_tracking *nst) |
| 167 | { | 167 | { |
| 168 | do_gettimeofday(&nst->st_status_time); | 168 | do_gettimeofday(&nst->st_status_time); |
| 169 | } | 169 | } |
| 170 | 170 | ||
| 171 | void o2net_set_nst_sock_container(struct o2net_send_tracking *nst, | 171 | static void o2net_set_nst_sock_container(struct o2net_send_tracking *nst, |
| 172 | struct o2net_sock_container *sc) | 172 | struct o2net_sock_container *sc) |
| 173 | { | 173 | { |
| 174 | nst->st_sc = sc; | 174 | nst->st_sc = sc; |
| 175 | } | 175 | } |
| 176 | 176 | ||
| 177 | void o2net_set_nst_msg_id(struct o2net_send_tracking *nst, u32 msg_id) | 177 | static void o2net_set_nst_msg_id(struct o2net_send_tracking *nst, u32 msg_id) |
| 178 | { | 178 | { |
| 179 | nst->st_id = msg_id; | 179 | nst->st_id = msg_id; |
| 180 | } | 180 | } |
| 181 | |||
| 182 | #else /* CONFIG_DEBUG_FS */ | ||
| 183 | |||
| 184 | static inline void o2net_init_nst(struct o2net_send_tracking *nst, u32 msgtype, | ||
| 185 | u32 msgkey, struct task_struct *task, u8 node) | ||
| 186 | { | ||
| 187 | } | ||
| 188 | |||
| 189 | static inline void o2net_set_nst_sock_time(struct o2net_send_tracking *nst) | ||
| 190 | { | ||
| 191 | } | ||
| 192 | |||
| 193 | static inline void o2net_set_nst_send_time(struct o2net_send_tracking *nst) | ||
| 194 | { | ||
| 195 | } | ||
| 196 | |||
| 197 | static inline void o2net_set_nst_status_time(struct o2net_send_tracking *nst) | ||
| 198 | { | ||
| 199 | } | ||
| 200 | |||
| 201 | static inline void o2net_set_nst_sock_container(struct o2net_send_tracking *nst, | ||
| 202 | struct o2net_sock_container *sc) | ||
| 203 | { | ||
| 204 | } | ||
| 205 | |||
| 206 | static inline void o2net_set_nst_msg_id(struct o2net_send_tracking *nst, | ||
| 207 | u32 msg_id) | ||
| 208 | { | ||
| 209 | } | ||
| 210 | |||
| 181 | #endif /* CONFIG_DEBUG_FS */ | 211 | #endif /* CONFIG_DEBUG_FS */ |
| 182 | 212 | ||
| 183 | static inline int o2net_reconnect_delay(void) | 213 | static inline int o2net_reconnect_delay(void) |
diff --git a/fs/ocfs2/cluster/tcp_internal.h b/fs/ocfs2/cluster/tcp_internal.h index 18307ff81b77..8d58cfe410b1 100644 --- a/fs/ocfs2/cluster/tcp_internal.h +++ b/fs/ocfs2/cluster/tcp_internal.h | |||
| @@ -224,42 +224,10 @@ struct o2net_send_tracking { | |||
| 224 | struct timeval st_send_time; | 224 | struct timeval st_send_time; |
| 225 | struct timeval st_status_time; | 225 | struct timeval st_status_time; |
| 226 | }; | 226 | }; |
| 227 | |||
| 228 | void o2net_init_nst(struct o2net_send_tracking *nst, u32 msgtype, | ||
| 229 | u32 msgkey, struct task_struct *task, u8 node); | ||
| 230 | void o2net_set_nst_sock_time(struct o2net_send_tracking *nst); | ||
| 231 | void o2net_set_nst_send_time(struct o2net_send_tracking *nst); | ||
| 232 | void o2net_set_nst_status_time(struct o2net_send_tracking *nst); | ||
| 233 | void o2net_set_nst_sock_container(struct o2net_send_tracking *nst, | ||
| 234 | struct o2net_sock_container *sc); | ||
| 235 | void o2net_set_nst_msg_id(struct o2net_send_tracking *nst, u32 msg_id); | ||
| 236 | |||
| 237 | #else | 227 | #else |
| 238 | struct o2net_send_tracking { | 228 | struct o2net_send_tracking { |
| 239 | u32 dummy; | 229 | u32 dummy; |
| 240 | }; | 230 | }; |
| 241 | |||
| 242 | static inline void o2net_init_nst(struct o2net_send_tracking *nst, u32 msgtype, | ||
| 243 | u32 msgkey, struct task_struct *task, u8 node) | ||
| 244 | { | ||
| 245 | } | ||
| 246 | static inline void o2net_set_nst_sock_time(struct o2net_send_tracking *nst) | ||
| 247 | { | ||
| 248 | } | ||
| 249 | static inline void o2net_set_nst_send_time(struct o2net_send_tracking *nst) | ||
| 250 | { | ||
| 251 | } | ||
| 252 | static inline void o2net_set_nst_status_time(struct o2net_send_tracking *nst) | ||
| 253 | { | ||
| 254 | } | ||
| 255 | static inline void o2net_set_nst_sock_container(struct o2net_send_tracking *nst, | ||
| 256 | struct o2net_sock_container *sc) | ||
| 257 | { | ||
| 258 | } | ||
| 259 | static inline void o2net_set_nst_msg_id(struct o2net_send_tracking *nst, | ||
| 260 | u32 msg_id) | ||
| 261 | { | ||
| 262 | } | ||
| 263 | #endif /* CONFIG_DEBUG_FS */ | 231 | #endif /* CONFIG_DEBUG_FS */ |
| 264 | 232 | ||
| 265 | #endif /* O2CLUSTER_TCP_INTERNAL_H */ | 233 | #endif /* O2CLUSTER_TCP_INTERNAL_H */ |
diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c index 8a1875848080..9cce563fd627 100644 --- a/fs/ocfs2/dir.c +++ b/fs/ocfs2/dir.c | |||
| @@ -1300,7 +1300,6 @@ static int ocfs2_expand_inline_dir(struct inode *dir, struct buffer_head *di_bh, | |||
| 1300 | di->i_size = cpu_to_le64(sb->s_blocksize); | 1300 | di->i_size = cpu_to_le64(sb->s_blocksize); |
| 1301 | di->i_ctime = di->i_mtime = cpu_to_le64(dir->i_ctime.tv_sec); | 1301 | di->i_ctime = di->i_mtime = cpu_to_le64(dir->i_ctime.tv_sec); |
| 1302 | di->i_ctime_nsec = di->i_mtime_nsec = cpu_to_le32(dir->i_ctime.tv_nsec); | 1302 | di->i_ctime_nsec = di->i_mtime_nsec = cpu_to_le32(dir->i_ctime.tv_nsec); |
| 1303 | dir->i_blocks = ocfs2_inode_sector_count(dir); | ||
| 1304 | 1303 | ||
| 1305 | /* | 1304 | /* |
| 1306 | * This should never fail as our extent list is empty and all | 1305 | * This should never fail as our extent list is empty and all |
| @@ -1310,9 +1309,15 @@ static int ocfs2_expand_inline_dir(struct inode *dir, struct buffer_head *di_bh, | |||
| 1310 | NULL); | 1309 | NULL); |
| 1311 | if (ret) { | 1310 | if (ret) { |
| 1312 | mlog_errno(ret); | 1311 | mlog_errno(ret); |
| 1313 | goto out; | 1312 | goto out_commit; |
| 1314 | } | 1313 | } |
| 1315 | 1314 | ||
| 1315 | /* | ||
| 1316 | * Set i_blocks after the extent insert for the most up to | ||
| 1317 | * date ip_clusters value. | ||
| 1318 | */ | ||
| 1319 | dir->i_blocks = ocfs2_inode_sector_count(dir); | ||
| 1320 | |||
| 1316 | ret = ocfs2_journal_dirty(handle, di_bh); | 1321 | ret = ocfs2_journal_dirty(handle, di_bh); |
| 1317 | if (ret) { | 1322 | if (ret) { |
| 1318 | mlog_errno(ret); | 1323 | mlog_errno(ret); |
| @@ -1336,7 +1341,7 @@ static int ocfs2_expand_inline_dir(struct inode *dir, struct buffer_head *di_bh, | |||
| 1336 | len, 0, NULL); | 1341 | len, 0, NULL); |
| 1337 | if (ret) { | 1342 | if (ret) { |
| 1338 | mlog_errno(ret); | 1343 | mlog_errno(ret); |
| 1339 | goto out; | 1344 | goto out_commit; |
| 1340 | } | 1345 | } |
| 1341 | } | 1346 | } |
| 1342 | 1347 | ||
diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c index 7a37240f7a31..c47bc2a809c2 100644 --- a/fs/ocfs2/journal.c +++ b/fs/ocfs2/journal.c | |||
| @@ -1418,13 +1418,13 @@ int ocfs2_mark_dead_nodes(struct ocfs2_super *osb) | |||
| 1418 | { | 1418 | { |
| 1419 | unsigned int node_num; | 1419 | unsigned int node_num; |
| 1420 | int status, i; | 1420 | int status, i; |
| 1421 | u32 gen; | ||
| 1421 | struct buffer_head *bh = NULL; | 1422 | struct buffer_head *bh = NULL; |
| 1422 | struct ocfs2_dinode *di; | 1423 | struct ocfs2_dinode *di; |
| 1423 | 1424 | ||
| 1424 | /* This is called with the super block cluster lock, so we | 1425 | /* This is called with the super block cluster lock, so we |
| 1425 | * know that the slot map can't change underneath us. */ | 1426 | * know that the slot map can't change underneath us. */ |
| 1426 | 1427 | ||
| 1427 | spin_lock(&osb->osb_lock); | ||
| 1428 | for (i = 0; i < osb->max_slots; i++) { | 1428 | for (i = 0; i < osb->max_slots; i++) { |
| 1429 | /* Read journal inode to get the recovery generation */ | 1429 | /* Read journal inode to get the recovery generation */ |
| 1430 | status = ocfs2_read_journal_inode(osb, i, &bh, NULL); | 1430 | status = ocfs2_read_journal_inode(osb, i, &bh, NULL); |
| @@ -1433,23 +1433,31 @@ int ocfs2_mark_dead_nodes(struct ocfs2_super *osb) | |||
| 1433 | goto bail; | 1433 | goto bail; |
| 1434 | } | 1434 | } |
| 1435 | di = (struct ocfs2_dinode *)bh->b_data; | 1435 | di = (struct ocfs2_dinode *)bh->b_data; |
| 1436 | osb->slot_recovery_generations[i] = | 1436 | gen = ocfs2_get_recovery_generation(di); |
| 1437 | ocfs2_get_recovery_generation(di); | ||
| 1438 | brelse(bh); | 1437 | brelse(bh); |
| 1439 | bh = NULL; | 1438 | bh = NULL; |
| 1440 | 1439 | ||
| 1440 | spin_lock(&osb->osb_lock); | ||
| 1441 | osb->slot_recovery_generations[i] = gen; | ||
| 1442 | |||
| 1441 | mlog(0, "Slot %u recovery generation is %u\n", i, | 1443 | mlog(0, "Slot %u recovery generation is %u\n", i, |
| 1442 | osb->slot_recovery_generations[i]); | 1444 | osb->slot_recovery_generations[i]); |
| 1443 | 1445 | ||
| 1444 | if (i == osb->slot_num) | 1446 | if (i == osb->slot_num) { |
| 1447 | spin_unlock(&osb->osb_lock); | ||
| 1445 | continue; | 1448 | continue; |
| 1449 | } | ||
| 1446 | 1450 | ||
| 1447 | status = ocfs2_slot_to_node_num_locked(osb, i, &node_num); | 1451 | status = ocfs2_slot_to_node_num_locked(osb, i, &node_num); |
| 1448 | if (status == -ENOENT) | 1452 | if (status == -ENOENT) { |
| 1453 | spin_unlock(&osb->osb_lock); | ||
| 1449 | continue; | 1454 | continue; |
| 1455 | } | ||
| 1450 | 1456 | ||
| 1451 | if (__ocfs2_recovery_map_test(osb, node_num)) | 1457 | if (__ocfs2_recovery_map_test(osb, node_num)) { |
| 1458 | spin_unlock(&osb->osb_lock); | ||
| 1452 | continue; | 1459 | continue; |
| 1460 | } | ||
| 1453 | spin_unlock(&osb->osb_lock); | 1461 | spin_unlock(&osb->osb_lock); |
| 1454 | 1462 | ||
| 1455 | /* Ok, we have a slot occupied by another node which | 1463 | /* Ok, we have a slot occupied by another node which |
| @@ -1465,10 +1473,7 @@ int ocfs2_mark_dead_nodes(struct ocfs2_super *osb) | |||
| 1465 | mlog_errno(status); | 1473 | mlog_errno(status); |
| 1466 | goto bail; | 1474 | goto bail; |
| 1467 | } | 1475 | } |
| 1468 | |||
| 1469 | spin_lock(&osb->osb_lock); | ||
| 1470 | } | 1476 | } |
| 1471 | spin_unlock(&osb->osb_lock); | ||
| 1472 | 1477 | ||
| 1473 | status = 0; | 1478 | status = 0; |
| 1474 | bail: | 1479 | bail: |
diff --git a/fs/ocfs2/stackglue.c b/fs/ocfs2/stackglue.c index 10e149ae5e3a..07f348b8d721 100644 --- a/fs/ocfs2/stackglue.c +++ b/fs/ocfs2/stackglue.c | |||
| @@ -97,13 +97,14 @@ static int ocfs2_stack_driver_request(const char *stack_name, | |||
| 97 | goto out; | 97 | goto out; |
| 98 | } | 98 | } |
| 99 | 99 | ||
| 100 | /* Ok, the stack is pinned */ | ||
| 101 | p->sp_count++; | ||
| 102 | active_stack = p; | 100 | active_stack = p; |
| 103 | |||
| 104 | rc = 0; | 101 | rc = 0; |
| 105 | 102 | ||
| 106 | out: | 103 | out: |
| 104 | /* If we found it, pin it */ | ||
| 105 | if (!rc) | ||
| 106 | active_stack->sp_count++; | ||
| 107 | |||
| 107 | spin_unlock(&ocfs2_stack_lock); | 108 | spin_unlock(&ocfs2_stack_lock); |
| 108 | return rc; | 109 | return rc; |
| 109 | } | 110 | } |
diff --git a/fs/omfs/bitmap.c b/fs/omfs/bitmap.c index 697663b01bae..e1c0ec0ae989 100644 --- a/fs/omfs/bitmap.c +++ b/fs/omfs/bitmap.c | |||
| @@ -92,7 +92,7 @@ int omfs_allocate_block(struct super_block *sb, u64 block) | |||
| 92 | struct buffer_head *bh; | 92 | struct buffer_head *bh; |
| 93 | struct omfs_sb_info *sbi = OMFS_SB(sb); | 93 | struct omfs_sb_info *sbi = OMFS_SB(sb); |
| 94 | int bits_per_entry = 8 * sb->s_blocksize; | 94 | int bits_per_entry = 8 * sb->s_blocksize; |
| 95 | int map, bit; | 95 | unsigned int map, bit; |
| 96 | int ret = 0; | 96 | int ret = 0; |
| 97 | u64 tmp; | 97 | u64 tmp; |
| 98 | 98 | ||
| @@ -176,7 +176,8 @@ int omfs_clear_range(struct super_block *sb, u64 block, int count) | |||
| 176 | struct omfs_sb_info *sbi = OMFS_SB(sb); | 176 | struct omfs_sb_info *sbi = OMFS_SB(sb); |
| 177 | int bits_per_entry = 8 * sb->s_blocksize; | 177 | int bits_per_entry = 8 * sb->s_blocksize; |
| 178 | u64 tmp; | 178 | u64 tmp; |
| 179 | int map, bit, ret; | 179 | unsigned int map, bit; |
| 180 | int ret; | ||
| 180 | 181 | ||
| 181 | tmp = block; | 182 | tmp = block; |
| 182 | bit = do_div(tmp, bits_per_entry); | 183 | bit = do_div(tmp, bits_per_entry); |
diff --git a/fs/omfs/file.c b/fs/omfs/file.c index 7e2499053e4d..834b2331f6b3 100644 --- a/fs/omfs/file.c +++ b/fs/omfs/file.c | |||
| @@ -26,6 +26,13 @@ static int omfs_sync_file(struct file *file, struct dentry *dentry, | |||
| 26 | return err ? -EIO : 0; | 26 | return err ? -EIO : 0; |
| 27 | } | 27 | } |
| 28 | 28 | ||
| 29 | static u32 omfs_max_extents(struct omfs_sb_info *sbi, int offset) | ||
| 30 | { | ||
| 31 | return (sbi->s_sys_blocksize - offset - | ||
| 32 | sizeof(struct omfs_extent)) / | ||
| 33 | sizeof(struct omfs_extent_entry) + 1; | ||
| 34 | } | ||
| 35 | |||
| 29 | void omfs_make_empty_table(struct buffer_head *bh, int offset) | 36 | void omfs_make_empty_table(struct buffer_head *bh, int offset) |
| 30 | { | 37 | { |
| 31 | struct omfs_extent *oe = (struct omfs_extent *) &bh->b_data[offset]; | 38 | struct omfs_extent *oe = (struct omfs_extent *) &bh->b_data[offset]; |
| @@ -45,6 +52,7 @@ int omfs_shrink_inode(struct inode *inode) | |||
| 45 | struct buffer_head *bh; | 52 | struct buffer_head *bh; |
| 46 | u64 next, last; | 53 | u64 next, last; |
| 47 | u32 extent_count; | 54 | u32 extent_count; |
| 55 | u32 max_extents; | ||
| 48 | int ret; | 56 | int ret; |
| 49 | 57 | ||
| 50 | /* traverse extent table, freeing each entry that is greater | 58 | /* traverse extent table, freeing each entry that is greater |
| @@ -62,15 +70,18 @@ int omfs_shrink_inode(struct inode *inode) | |||
| 62 | goto out; | 70 | goto out; |
| 63 | 71 | ||
| 64 | oe = (struct omfs_extent *)(&bh->b_data[OMFS_EXTENT_START]); | 72 | oe = (struct omfs_extent *)(&bh->b_data[OMFS_EXTENT_START]); |
| 73 | max_extents = omfs_max_extents(sbi, OMFS_EXTENT_START); | ||
| 65 | 74 | ||
| 66 | for (;;) { | 75 | for (;;) { |
| 67 | 76 | ||
| 68 | if (omfs_is_bad(sbi, (struct omfs_header *) bh->b_data, next)) { | 77 | if (omfs_is_bad(sbi, (struct omfs_header *) bh->b_data, next)) |
| 69 | brelse(bh); | 78 | goto out_brelse; |
| 70 | goto out; | ||
| 71 | } | ||
| 72 | 79 | ||
| 73 | extent_count = be32_to_cpu(oe->e_extent_count); | 80 | extent_count = be32_to_cpu(oe->e_extent_count); |
| 81 | |||
| 82 | if (extent_count > max_extents) | ||
| 83 | goto out_brelse; | ||
| 84 | |||
| 74 | last = next; | 85 | last = next; |
| 75 | next = be64_to_cpu(oe->e_next); | 86 | next = be64_to_cpu(oe->e_next); |
| 76 | entry = &oe->e_entry; | 87 | entry = &oe->e_entry; |
| @@ -98,10 +109,14 @@ int omfs_shrink_inode(struct inode *inode) | |||
| 98 | if (!bh) | 109 | if (!bh) |
| 99 | goto out; | 110 | goto out; |
| 100 | oe = (struct omfs_extent *) (&bh->b_data[OMFS_EXTENT_CONT]); | 111 | oe = (struct omfs_extent *) (&bh->b_data[OMFS_EXTENT_CONT]); |
| 112 | max_extents = omfs_max_extents(sbi, OMFS_EXTENT_CONT); | ||
| 101 | } | 113 | } |
| 102 | ret = 0; | 114 | ret = 0; |
| 103 | out: | 115 | out: |
| 104 | return ret; | 116 | return ret; |
| 117 | out_brelse: | ||
| 118 | brelse(bh); | ||
| 119 | return ret; | ||
| 105 | } | 120 | } |
| 106 | 121 | ||
| 107 | static void omfs_truncate(struct inode *inode) | 122 | static void omfs_truncate(struct inode *inode) |
| @@ -154,9 +169,7 @@ static int omfs_grow_extent(struct inode *inode, struct omfs_extent *oe, | |||
| 154 | goto out; | 169 | goto out; |
| 155 | } | 170 | } |
| 156 | } | 171 | } |
| 157 | max_count = (sbi->s_sys_blocksize - OMFS_EXTENT_START - | 172 | max_count = omfs_max_extents(sbi, OMFS_EXTENT_START); |
| 158 | sizeof(struct omfs_extent)) / | ||
| 159 | sizeof(struct omfs_extent_entry) + 1; | ||
| 160 | 173 | ||
| 161 | /* TODO: add a continuation block here */ | 174 | /* TODO: add a continuation block here */ |
| 162 | if (be32_to_cpu(oe->e_extent_count) > max_count-1) | 175 | if (be32_to_cpu(oe->e_extent_count) > max_count-1) |
| @@ -225,6 +238,7 @@ static int omfs_get_block(struct inode *inode, sector_t block, | |||
| 225 | sector_t next, offset; | 238 | sector_t next, offset; |
| 226 | int ret; | 239 | int ret; |
| 227 | u64 new_block; | 240 | u64 new_block; |
| 241 | u32 max_extents; | ||
| 228 | int extent_count; | 242 | int extent_count; |
| 229 | struct omfs_extent *oe; | 243 | struct omfs_extent *oe; |
| 230 | struct omfs_extent_entry *entry; | 244 | struct omfs_extent_entry *entry; |
| @@ -238,6 +252,7 @@ static int omfs_get_block(struct inode *inode, sector_t block, | |||
| 238 | goto out; | 252 | goto out; |
| 239 | 253 | ||
| 240 | oe = (struct omfs_extent *)(&bh->b_data[OMFS_EXTENT_START]); | 254 | oe = (struct omfs_extent *)(&bh->b_data[OMFS_EXTENT_START]); |
| 255 | max_extents = omfs_max_extents(sbi, OMFS_EXTENT_START); | ||
| 241 | next = inode->i_ino; | 256 | next = inode->i_ino; |
| 242 | 257 | ||
| 243 | for (;;) { | 258 | for (;;) { |
| @@ -249,6 +264,9 @@ static int omfs_get_block(struct inode *inode, sector_t block, | |||
| 249 | next = be64_to_cpu(oe->e_next); | 264 | next = be64_to_cpu(oe->e_next); |
| 250 | entry = &oe->e_entry; | 265 | entry = &oe->e_entry; |
| 251 | 266 | ||
| 267 | if (extent_count > max_extents) | ||
| 268 | goto out_brelse; | ||
| 269 | |||
| 252 | offset = find_block(inode, entry, block, extent_count, &remain); | 270 | offset = find_block(inode, entry, block, extent_count, &remain); |
| 253 | if (offset > 0) { | 271 | if (offset > 0) { |
| 254 | ret = 0; | 272 | ret = 0; |
| @@ -266,6 +284,7 @@ static int omfs_get_block(struct inode *inode, sector_t block, | |||
| 266 | if (!bh) | 284 | if (!bh) |
| 267 | goto out; | 285 | goto out; |
| 268 | oe = (struct omfs_extent *) (&bh->b_data[OMFS_EXTENT_CONT]); | 286 | oe = (struct omfs_extent *) (&bh->b_data[OMFS_EXTENT_CONT]); |
| 287 | max_extents = omfs_max_extents(sbi, OMFS_EXTENT_CONT); | ||
| 269 | } | 288 | } |
| 270 | if (create) { | 289 | if (create) { |
| 271 | ret = omfs_grow_extent(inode, oe, &new_block); | 290 | ret = omfs_grow_extent(inode, oe, &new_block); |
diff --git a/fs/omfs/inode.c b/fs/omfs/inode.c index a95fe5984f4b..d29047b1b9b0 100644 --- a/fs/omfs/inode.c +++ b/fs/omfs/inode.c | |||
| @@ -232,8 +232,7 @@ struct inode *omfs_iget(struct super_block *sb, ino_t ino) | |||
| 232 | inode->i_mode = S_IFDIR | (S_IRWXUGO & ~sbi->s_dmask); | 232 | inode->i_mode = S_IFDIR | (S_IRWXUGO & ~sbi->s_dmask); |
| 233 | inode->i_op = &omfs_dir_inops; | 233 | inode->i_op = &omfs_dir_inops; |
| 234 | inode->i_fop = &omfs_dir_operations; | 234 | inode->i_fop = &omfs_dir_operations; |
| 235 | inode->i_size = be32_to_cpu(oi->i_head.h_body_size) + | 235 | inode->i_size = sbi->s_sys_blocksize; |
| 236 | sizeof(struct omfs_header); | ||
| 237 | inc_nlink(inode); | 236 | inc_nlink(inode); |
| 238 | break; | 237 | break; |
| 239 | case OMFS_FILE: | 238 | case OMFS_FILE: |
diff --git a/fs/proc/generic.c b/fs/proc/generic.c index 4fb81e9c94e3..bca0f81eb687 100644 --- a/fs/proc/generic.c +++ b/fs/proc/generic.c | |||
| @@ -330,6 +330,7 @@ retry: | |||
| 330 | spin_lock(&proc_inum_lock); | 330 | spin_lock(&proc_inum_lock); |
| 331 | ida_remove(&proc_inum_ida, i); | 331 | ida_remove(&proc_inum_ida, i); |
| 332 | spin_unlock(&proc_inum_lock); | 332 | spin_unlock(&proc_inum_lock); |
| 333 | return 0; | ||
| 333 | } | 334 | } |
| 334 | return PROC_DYNAMIC_FIRST + i; | 335 | return PROC_DYNAMIC_FIRST + i; |
| 335 | } | 336 | } |
diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c index 79ecd281d2cb..3f87d2632947 100644 --- a/fs/proc/nommu.c +++ b/fs/proc/nommu.c | |||
| @@ -52,14 +52,14 @@ int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma) | |||
| 52 | } | 52 | } |
| 53 | 53 | ||
| 54 | seq_printf(m, | 54 | seq_printf(m, |
| 55 | "%08lx-%08lx %c%c%c%c %08lx %02x:%02x %lu %n", | 55 | "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu %n", |
| 56 | vma->vm_start, | 56 | vma->vm_start, |
| 57 | vma->vm_end, | 57 | vma->vm_end, |
| 58 | flags & VM_READ ? 'r' : '-', | 58 | flags & VM_READ ? 'r' : '-', |
| 59 | flags & VM_WRITE ? 'w' : '-', | 59 | flags & VM_WRITE ? 'w' : '-', |
| 60 | flags & VM_EXEC ? 'x' : '-', | 60 | flags & VM_EXEC ? 'x' : '-', |
| 61 | flags & VM_MAYSHARE ? flags & VM_SHARED ? 'S' : 's' : 'p', | 61 | flags & VM_MAYSHARE ? flags & VM_SHARED ? 'S' : 's' : 'p', |
| 62 | vma->vm_pgoff << PAGE_SHIFT, | 62 | ((loff_t)vma->vm_pgoff) << PAGE_SHIFT, |
| 63 | MAJOR(dev), MINOR(dev), ino, &len); | 63 | MAJOR(dev), MINOR(dev), ino, &len); |
| 64 | 64 | ||
| 65 | if (file) { | 65 | if (file) { |
diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c index ded969862960..00f10a2dcf12 100644 --- a/fs/proc/proc_misc.c +++ b/fs/proc/proc_misc.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/tty.h> | 24 | #include <linux/tty.h> |
| 25 | #include <linux/string.h> | 25 | #include <linux/string.h> |
| 26 | #include <linux/mman.h> | 26 | #include <linux/mman.h> |
| 27 | #include <linux/quicklist.h> | ||
| 27 | #include <linux/proc_fs.h> | 28 | #include <linux/proc_fs.h> |
| 28 | #include <linux/ioport.h> | 29 | #include <linux/ioport.h> |
| 29 | #include <linux/mm.h> | 30 | #include <linux/mm.h> |
| @@ -189,7 +190,8 @@ static int meminfo_read_proc(char *page, char **start, off_t off, | |||
| 189 | "Committed_AS: %8lu kB\n" | 190 | "Committed_AS: %8lu kB\n" |
| 190 | "VmallocTotal: %8lu kB\n" | 191 | "VmallocTotal: %8lu kB\n" |
| 191 | "VmallocUsed: %8lu kB\n" | 192 | "VmallocUsed: %8lu kB\n" |
| 192 | "VmallocChunk: %8lu kB\n", | 193 | "VmallocChunk: %8lu kB\n" |
| 194 | "Quicklists: %8lu kB\n", | ||
| 193 | K(i.totalram), | 195 | K(i.totalram), |
| 194 | K(i.freeram), | 196 | K(i.freeram), |
| 195 | K(i.bufferram), | 197 | K(i.bufferram), |
| @@ -221,7 +223,8 @@ static int meminfo_read_proc(char *page, char **start, off_t off, | |||
| 221 | K(committed), | 223 | K(committed), |
| 222 | (unsigned long)VMALLOC_TOTAL >> 10, | 224 | (unsigned long)VMALLOC_TOTAL >> 10, |
| 223 | vmi.used >> 10, | 225 | vmi.used >> 10, |
| 224 | vmi.largest_chunk >> 10 | 226 | vmi.largest_chunk >> 10, |
| 227 | K(quicklist_total_size()) | ||
| 225 | ); | 228 | ); |
| 226 | 229 | ||
| 227 | len += hugetlb_report_meminfo(page + len); | 230 | len += hugetlb_report_meminfo(page + len); |
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index 7546a918f790..73d1891ee625 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c | |||
| @@ -219,14 +219,14 @@ static int show_map(struct seq_file *m, void *v) | |||
| 219 | ino = inode->i_ino; | 219 | ino = inode->i_ino; |
| 220 | } | 220 | } |
| 221 | 221 | ||
| 222 | seq_printf(m, "%08lx-%08lx %c%c%c%c %08lx %02x:%02x %lu %n", | 222 | seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu %n", |
| 223 | vma->vm_start, | 223 | vma->vm_start, |
| 224 | vma->vm_end, | 224 | vma->vm_end, |
| 225 | flags & VM_READ ? 'r' : '-', | 225 | flags & VM_READ ? 'r' : '-', |
| 226 | flags & VM_WRITE ? 'w' : '-', | 226 | flags & VM_WRITE ? 'w' : '-', |
| 227 | flags & VM_EXEC ? 'x' : '-', | 227 | flags & VM_EXEC ? 'x' : '-', |
| 228 | flags & VM_MAYSHARE ? 's' : 'p', | 228 | flags & VM_MAYSHARE ? 's' : 'p', |
| 229 | vma->vm_pgoff << PAGE_SHIFT, | 229 | ((loff_t)vma->vm_pgoff) << PAGE_SHIFT, |
| 230 | MAJOR(dev), MINOR(dev), ino, &len); | 230 | MAJOR(dev), MINOR(dev), ino, &len); |
| 231 | 231 | ||
| 232 | /* | 232 | /* |
diff --git a/fs/readdir.c b/fs/readdir.c index 4e026e5407fb..93a7559bbfd8 100644 --- a/fs/readdir.c +++ b/fs/readdir.c | |||
| @@ -80,8 +80,10 @@ static int fillonedir(void * __buf, const char * name, int namlen, loff_t offset | |||
| 80 | if (buf->result) | 80 | if (buf->result) |
| 81 | return -EINVAL; | 81 | return -EINVAL; |
| 82 | d_ino = ino; | 82 | d_ino = ino; |
| 83 | if (sizeof(d_ino) < sizeof(ino) && d_ino != ino) | 83 | if (sizeof(d_ino) < sizeof(ino) && d_ino != ino) { |
| 84 | buf->result = -EOVERFLOW; | ||
| 84 | return -EOVERFLOW; | 85 | return -EOVERFLOW; |
| 86 | } | ||
| 85 | buf->result++; | 87 | buf->result++; |
| 86 | dirent = buf->dirent; | 88 | dirent = buf->dirent; |
| 87 | if (!access_ok(VERIFY_WRITE, dirent, | 89 | if (!access_ok(VERIFY_WRITE, dirent, |
| @@ -155,8 +157,10 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset, | |||
| 155 | if (reclen > buf->count) | 157 | if (reclen > buf->count) |
| 156 | return -EINVAL; | 158 | return -EINVAL; |
| 157 | d_ino = ino; | 159 | d_ino = ino; |
| 158 | if (sizeof(d_ino) < sizeof(ino) && d_ino != ino) | 160 | if (sizeof(d_ino) < sizeof(ino) && d_ino != ino) { |
| 161 | buf->error = -EOVERFLOW; | ||
| 159 | return -EOVERFLOW; | 162 | return -EOVERFLOW; |
| 163 | } | ||
| 160 | dirent = buf->previous; | 164 | dirent = buf->previous; |
| 161 | if (dirent) { | 165 | if (dirent) { |
| 162 | if (__put_user(offset, &dirent->d_off)) | 166 | if (__put_user(offset, &dirent->d_off)) |
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c index 282a13596c70..d318c7e663fa 100644 --- a/fs/reiserfs/super.c +++ b/fs/reiserfs/super.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | #include <linux/mnt_namespace.h> | 27 | #include <linux/mnt_namespace.h> |
| 28 | #include <linux/mount.h> | 28 | #include <linux/mount.h> |
| 29 | #include <linux/namei.h> | 29 | #include <linux/namei.h> |
| 30 | #include <linux/quotaops.h> | ||
| 31 | 30 | ||
| 32 | struct file_system_type reiserfs_fs_type; | 31 | struct file_system_type reiserfs_fs_type; |
| 33 | 32 | ||
diff --git a/fs/seq_file.c b/fs/seq_file.c index 3f54dbd6c49b..bd20f7f5a933 100644 --- a/fs/seq_file.c +++ b/fs/seq_file.c | |||
| @@ -108,9 +108,9 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos) | |||
| 108 | goto Done; | 108 | goto Done; |
| 109 | } | 109 | } |
| 110 | /* we need at least one record in buffer */ | 110 | /* we need at least one record in buffer */ |
| 111 | pos = m->index; | ||
| 112 | p = m->op->start(m, &pos); | ||
| 111 | while (1) { | 113 | while (1) { |
| 112 | pos = m->index; | ||
| 113 | p = m->op->start(m, &pos); | ||
| 114 | err = PTR_ERR(p); | 114 | err = PTR_ERR(p); |
| 115 | if (!p || IS_ERR(p)) | 115 | if (!p || IS_ERR(p)) |
| 116 | break; | 116 | break; |
| @@ -119,6 +119,11 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos) | |||
| 119 | break; | 119 | break; |
| 120 | if (unlikely(err)) | 120 | if (unlikely(err)) |
| 121 | m->count = 0; | 121 | m->count = 0; |
| 122 | if (unlikely(!m->count)) { | ||
| 123 | p = m->op->next(m, p, &pos); | ||
| 124 | m->index = pos; | ||
| 125 | continue; | ||
| 126 | } | ||
| 122 | if (m->count < m->size) | 127 | if (m->count < m->size) |
| 123 | goto Fill; | 128 | goto Fill; |
| 124 | m->op->stop(m, p); | 129 | m->op->stop(m, p); |
| @@ -128,6 +133,8 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos) | |||
| 128 | goto Enomem; | 133 | goto Enomem; |
| 129 | m->count = 0; | 134 | m->count = 0; |
| 130 | m->version = 0; | 135 | m->version = 0; |
| 136 | pos = m->index; | ||
| 137 | p = m->op->start(m, &pos); | ||
| 131 | } | 138 | } |
| 132 | m->op->stop(m, p); | 139 | m->op->stop(m, p); |
| 133 | m->count = 0; | 140 | m->count = 0; |
| @@ -443,6 +450,20 @@ int seq_dentry(struct seq_file *m, struct dentry *dentry, char *esc) | |||
| 443 | return -1; | 450 | return -1; |
| 444 | } | 451 | } |
| 445 | 452 | ||
| 453 | int seq_bitmap(struct seq_file *m, unsigned long *bits, unsigned int nr_bits) | ||
| 454 | { | ||
| 455 | size_t len = bitmap_scnprintf_len(nr_bits); | ||
| 456 | |||
| 457 | if (m->count + len < m->size) { | ||
| 458 | bitmap_scnprintf(m->buf + m->count, m->size - m->count, | ||
| 459 | bits, nr_bits); | ||
| 460 | m->count += len; | ||
| 461 | return 0; | ||
| 462 | } | ||
| 463 | m->count = m->size; | ||
| 464 | return -1; | ||
| 465 | } | ||
| 466 | |||
| 446 | static void *single_start(struct seq_file *p, loff_t *pos) | 467 | static void *single_start(struct seq_file *p, loff_t *pos) |
| 447 | { | 468 | { |
| 448 | return NULL + (*pos == 0); | 469 | return NULL + (*pos == 0); |
diff --git a/fs/ubifs/budget.c b/fs/ubifs/budget.c index d81fb9ed2b8e..154098157473 100644 --- a/fs/ubifs/budget.c +++ b/fs/ubifs/budget.c | |||
| @@ -263,8 +263,8 @@ int ubifs_calc_min_idx_lebs(struct ubifs_info *c) | |||
| 263 | 263 | ||
| 264 | idx_size = c->old_idx_sz + c->budg_idx_growth + c->budg_uncommitted_idx; | 264 | idx_size = c->old_idx_sz + c->budg_idx_growth + c->budg_uncommitted_idx; |
| 265 | 265 | ||
| 266 | /* And make sure we have twice the index size of space reserved */ | 266 | /* And make sure we have thrice the index size of space reserved */ |
| 267 | idx_size <<= 1; | 267 | idx_size = idx_size + (idx_size << 1); |
| 268 | 268 | ||
| 269 | /* | 269 | /* |
| 270 | * We do not maintain 'old_idx_size' as 'old_idx_lebs'/'old_idx_bytes' | 270 | * We do not maintain 'old_idx_size' as 'old_idx_lebs'/'old_idx_bytes' |
| @@ -388,11 +388,11 @@ static int can_use_rp(struct ubifs_info *c) | |||
| 388 | * This function makes sure UBIFS has enough free eraseblocks for index growth | 388 | * This function makes sure UBIFS has enough free eraseblocks for index growth |
| 389 | * and data. | 389 | * and data. |
| 390 | * | 390 | * |
| 391 | * When budgeting index space, UBIFS reserves twice as more LEBs as the index | 391 | * When budgeting index space, UBIFS reserves thrice as many LEBs as the index |
| 392 | * would take if it was consolidated and written to the flash. This guarantees | 392 | * would take if it was consolidated and written to the flash. This guarantees |
| 393 | * that the "in-the-gaps" commit method always succeeds and UBIFS will always | 393 | * that the "in-the-gaps" commit method always succeeds and UBIFS will always |
| 394 | * be able to commit dirty index. So this function basically adds amount of | 394 | * be able to commit dirty index. So this function basically adds amount of |
| 395 | * budgeted index space to the size of the current index, multiplies this by 2, | 395 | * budgeted index space to the size of the current index, multiplies this by 3, |
| 396 | * and makes sure this does not exceed the amount of free eraseblocks. | 396 | * and makes sure this does not exceed the amount of free eraseblocks. |
| 397 | * | 397 | * |
| 398 | * Notes about @c->min_idx_lebs and @c->lst.idx_lebs variables: | 398 | * Notes about @c->min_idx_lebs and @c->lst.idx_lebs variables: |
| @@ -543,8 +543,16 @@ int ubifs_budget_space(struct ubifs_info *c, struct ubifs_budget_req *req) | |||
| 543 | int err, idx_growth, data_growth, dd_growth; | 543 | int err, idx_growth, data_growth, dd_growth; |
| 544 | struct retries_info ri; | 544 | struct retries_info ri; |
| 545 | 545 | ||
| 546 | ubifs_assert(req->new_page <= 1); | ||
| 547 | ubifs_assert(req->dirtied_page <= 1); | ||
| 548 | ubifs_assert(req->new_dent <= 1); | ||
| 549 | ubifs_assert(req->mod_dent <= 1); | ||
| 550 | ubifs_assert(req->new_ino <= 1); | ||
| 551 | ubifs_assert(req->new_ino_d <= UBIFS_MAX_INO_DATA); | ||
| 546 | ubifs_assert(req->dirtied_ino <= 4); | 552 | ubifs_assert(req->dirtied_ino <= 4); |
| 547 | ubifs_assert(req->dirtied_ino_d <= UBIFS_MAX_INO_DATA * 4); | 553 | ubifs_assert(req->dirtied_ino_d <= UBIFS_MAX_INO_DATA * 4); |
| 554 | ubifs_assert(!(req->new_ino_d & 7)); | ||
| 555 | ubifs_assert(!(req->dirtied_ino_d & 7)); | ||
| 548 | 556 | ||
| 549 | data_growth = calc_data_growth(c, req); | 557 | data_growth = calc_data_growth(c, req); |
| 550 | dd_growth = calc_dd_growth(c, req); | 558 | dd_growth = calc_dd_growth(c, req); |
| @@ -618,8 +626,16 @@ again: | |||
| 618 | */ | 626 | */ |
| 619 | void ubifs_release_budget(struct ubifs_info *c, struct ubifs_budget_req *req) | 627 | void ubifs_release_budget(struct ubifs_info *c, struct ubifs_budget_req *req) |
| 620 | { | 628 | { |
| 629 | ubifs_assert(req->new_page <= 1); | ||
| 630 | ubifs_assert(req->dirtied_page <= 1); | ||
| 631 | ubifs_assert(req->new_dent <= 1); | ||
| 632 | ubifs_assert(req->mod_dent <= 1); | ||
| 633 | ubifs_assert(req->new_ino <= 1); | ||
| 634 | ubifs_assert(req->new_ino_d <= UBIFS_MAX_INO_DATA); | ||
| 621 | ubifs_assert(req->dirtied_ino <= 4); | 635 | ubifs_assert(req->dirtied_ino <= 4); |
| 622 | ubifs_assert(req->dirtied_ino_d <= UBIFS_MAX_INO_DATA * 4); | 636 | ubifs_assert(req->dirtied_ino_d <= UBIFS_MAX_INO_DATA * 4); |
| 637 | ubifs_assert(!(req->new_ino_d & 7)); | ||
| 638 | ubifs_assert(!(req->dirtied_ino_d & 7)); | ||
| 623 | if (!req->recalculate) { | 639 | if (!req->recalculate) { |
| 624 | ubifs_assert(req->idx_growth >= 0); | 640 | ubifs_assert(req->idx_growth >= 0); |
| 625 | ubifs_assert(req->data_growth >= 0); | 641 | ubifs_assert(req->data_growth >= 0); |
| @@ -647,7 +663,11 @@ void ubifs_release_budget(struct ubifs_info *c, struct ubifs_budget_req *req) | |||
| 647 | 663 | ||
| 648 | ubifs_assert(c->budg_idx_growth >= 0); | 664 | ubifs_assert(c->budg_idx_growth >= 0); |
| 649 | ubifs_assert(c->budg_data_growth >= 0); | 665 | ubifs_assert(c->budg_data_growth >= 0); |
| 666 | ubifs_assert(c->budg_dd_growth >= 0); | ||
| 650 | ubifs_assert(c->min_idx_lebs < c->main_lebs); | 667 | ubifs_assert(c->min_idx_lebs < c->main_lebs); |
| 668 | ubifs_assert(!(c->budg_idx_growth & 7)); | ||
| 669 | ubifs_assert(!(c->budg_data_growth & 7)); | ||
| 670 | ubifs_assert(!(c->budg_dd_growth & 7)); | ||
| 651 | spin_unlock(&c->space_lock); | 671 | spin_unlock(&c->space_lock); |
| 652 | } | 672 | } |
| 653 | 673 | ||
| @@ -686,9 +706,10 @@ void ubifs_convert_page_budget(struct ubifs_info *c) | |||
| 686 | void ubifs_release_dirty_inode_budget(struct ubifs_info *c, | 706 | void ubifs_release_dirty_inode_budget(struct ubifs_info *c, |
| 687 | struct ubifs_inode *ui) | 707 | struct ubifs_inode *ui) |
| 688 | { | 708 | { |
| 689 | struct ubifs_budget_req req = {.dd_growth = c->inode_budget, | 709 | struct ubifs_budget_req req; |
| 690 | .dirtied_ino_d = ui->data_len}; | ||
| 691 | 710 | ||
| 711 | memset(&req, 0, sizeof(struct ubifs_budget_req)); | ||
| 712 | req.dd_growth = c->inode_budget + ALIGN(ui->data_len, 8); | ||
| 692 | ubifs_release_budget(c, &req); | 713 | ubifs_release_budget(c, &req); |
| 693 | } | 714 | } |
| 694 | 715 | ||
diff --git a/fs/ubifs/commit.c b/fs/ubifs/commit.c index 3b516316c9b3..0a6aa2cc78f0 100644 --- a/fs/ubifs/commit.c +++ b/fs/ubifs/commit.c | |||
| @@ -74,6 +74,7 @@ static int do_commit(struct ubifs_info *c) | |||
| 74 | goto out_up; | 74 | goto out_up; |
| 75 | } | 75 | } |
| 76 | 76 | ||
| 77 | c->cmt_no += 1; | ||
| 77 | err = ubifs_gc_start_commit(c); | 78 | err = ubifs_gc_start_commit(c); |
| 78 | if (err) | 79 | if (err) |
| 79 | goto out_up; | 80 | goto out_up; |
| @@ -115,7 +116,7 @@ static int do_commit(struct ubifs_info *c) | |||
| 115 | goto out; | 116 | goto out; |
| 116 | 117 | ||
| 117 | mutex_lock(&c->mst_mutex); | 118 | mutex_lock(&c->mst_mutex); |
| 118 | c->mst_node->cmt_no = cpu_to_le64(++c->cmt_no); | 119 | c->mst_node->cmt_no = cpu_to_le64(c->cmt_no); |
| 119 | c->mst_node->log_lnum = cpu_to_le32(new_ltail_lnum); | 120 | c->mst_node->log_lnum = cpu_to_le32(new_ltail_lnum); |
| 120 | c->mst_node->root_lnum = cpu_to_le32(zroot.lnum); | 121 | c->mst_node->root_lnum = cpu_to_le32(zroot.lnum); |
| 121 | c->mst_node->root_offs = cpu_to_le32(zroot.offs); | 122 | c->mst_node->root_offs = cpu_to_le32(zroot.offs); |
diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c index 4e3aaeba4eca..b9cb77473758 100644 --- a/fs/ubifs/debug.c +++ b/fs/ubifs/debug.c | |||
| @@ -568,8 +568,8 @@ void dbg_dump_budget_req(const struct ubifs_budget_req *req) | |||
| 568 | void dbg_dump_lstats(const struct ubifs_lp_stats *lst) | 568 | void dbg_dump_lstats(const struct ubifs_lp_stats *lst) |
| 569 | { | 569 | { |
| 570 | spin_lock(&dbg_lock); | 570 | spin_lock(&dbg_lock); |
| 571 | printk(KERN_DEBUG "Lprops statistics: empty_lebs %d, idx_lebs %d\n", | 571 | printk(KERN_DEBUG "(pid %d) Lprops statistics: empty_lebs %d, " |
| 572 | lst->empty_lebs, lst->idx_lebs); | 572 | "idx_lebs %d\n", current->pid, lst->empty_lebs, lst->idx_lebs); |
| 573 | printk(KERN_DEBUG "\ttaken_empty_lebs %d, total_free %lld, " | 573 | printk(KERN_DEBUG "\ttaken_empty_lebs %d, total_free %lld, " |
| 574 | "total_dirty %lld\n", lst->taken_empty_lebs, lst->total_free, | 574 | "total_dirty %lld\n", lst->taken_empty_lebs, lst->total_free, |
| 575 | lst->total_dirty); | 575 | lst->total_dirty); |
| @@ -587,8 +587,8 @@ void dbg_dump_budg(struct ubifs_info *c) | |||
| 587 | struct ubifs_gced_idx_leb *idx_gc; | 587 | struct ubifs_gced_idx_leb *idx_gc; |
| 588 | 588 | ||
| 589 | spin_lock(&dbg_lock); | 589 | spin_lock(&dbg_lock); |
| 590 | printk(KERN_DEBUG "Budgeting info: budg_data_growth %lld, " | 590 | printk(KERN_DEBUG "(pid %d) Budgeting info: budg_data_growth %lld, " |
| 591 | "budg_dd_growth %lld, budg_idx_growth %lld\n", | 591 | "budg_dd_growth %lld, budg_idx_growth %lld\n", current->pid, |
| 592 | c->budg_data_growth, c->budg_dd_growth, c->budg_idx_growth); | 592 | c->budg_data_growth, c->budg_dd_growth, c->budg_idx_growth); |
| 593 | printk(KERN_DEBUG "\tdata budget sum %lld, total budget sum %lld, " | 593 | printk(KERN_DEBUG "\tdata budget sum %lld, total budget sum %lld, " |
| 594 | "freeable_cnt %d\n", c->budg_data_growth + c->budg_dd_growth, | 594 | "freeable_cnt %d\n", c->budg_data_growth + c->budg_dd_growth, |
| @@ -634,7 +634,7 @@ void dbg_dump_lprops(struct ubifs_info *c) | |||
| 634 | struct ubifs_lprops lp; | 634 | struct ubifs_lprops lp; |
| 635 | struct ubifs_lp_stats lst; | 635 | struct ubifs_lp_stats lst; |
| 636 | 636 | ||
| 637 | printk(KERN_DEBUG "Dumping LEB properties\n"); | 637 | printk(KERN_DEBUG "(pid %d) Dumping LEB properties\n", current->pid); |
| 638 | ubifs_get_lp_stats(c, &lst); | 638 | ubifs_get_lp_stats(c, &lst); |
| 639 | dbg_dump_lstats(&lst); | 639 | dbg_dump_lstats(&lst); |
| 640 | 640 | ||
| @@ -655,7 +655,7 @@ void dbg_dump_leb(const struct ubifs_info *c, int lnum) | |||
| 655 | if (dbg_failure_mode) | 655 | if (dbg_failure_mode) |
| 656 | return; | 656 | return; |
| 657 | 657 | ||
| 658 | printk(KERN_DEBUG "Dumping LEB %d\n", lnum); | 658 | printk(KERN_DEBUG "(pid %d) Dumping LEB %d\n", current->pid, lnum); |
| 659 | 659 | ||
| 660 | sleb = ubifs_scan(c, lnum, 0, c->dbg_buf); | 660 | sleb = ubifs_scan(c, lnum, 0, c->dbg_buf); |
| 661 | if (IS_ERR(sleb)) { | 661 | if (IS_ERR(sleb)) { |
| @@ -720,8 +720,8 @@ void dbg_dump_heap(struct ubifs_info *c, struct ubifs_lpt_heap *heap, int cat) | |||
| 720 | { | 720 | { |
| 721 | int i; | 721 | int i; |
| 722 | 722 | ||
| 723 | printk(KERN_DEBUG "Dumping heap cat %d (%d elements)\n", | 723 | printk(KERN_DEBUG "(pid %d) Dumping heap cat %d (%d elements)\n", |
| 724 | cat, heap->cnt); | 724 | current->pid, cat, heap->cnt); |
| 725 | for (i = 0; i < heap->cnt; i++) { | 725 | for (i = 0; i < heap->cnt; i++) { |
| 726 | struct ubifs_lprops *lprops = heap->arr[i]; | 726 | struct ubifs_lprops *lprops = heap->arr[i]; |
| 727 | 727 | ||
| @@ -736,7 +736,7 @@ void dbg_dump_pnode(struct ubifs_info *c, struct ubifs_pnode *pnode, | |||
| 736 | { | 736 | { |
| 737 | int i; | 737 | int i; |
| 738 | 738 | ||
| 739 | printk(KERN_DEBUG "Dumping pnode:\n"); | 739 | printk(KERN_DEBUG "(pid %d) Dumping pnode:\n", current->pid); |
| 740 | printk(KERN_DEBUG "\taddress %zx parent %zx cnext %zx\n", | 740 | printk(KERN_DEBUG "\taddress %zx parent %zx cnext %zx\n", |
| 741 | (size_t)pnode, (size_t)parent, (size_t)pnode->cnext); | 741 | (size_t)pnode, (size_t)parent, (size_t)pnode->cnext); |
| 742 | printk(KERN_DEBUG "\tflags %lu iip %d level %d num %d\n", | 742 | printk(KERN_DEBUG "\tflags %lu iip %d level %d num %d\n", |
| @@ -755,7 +755,7 @@ void dbg_dump_tnc(struct ubifs_info *c) | |||
| 755 | int level; | 755 | int level; |
| 756 | 756 | ||
| 757 | printk(KERN_DEBUG "\n"); | 757 | printk(KERN_DEBUG "\n"); |
| 758 | printk(KERN_DEBUG "Dumping the TNC tree\n"); | 758 | printk(KERN_DEBUG "(pid %d) Dumping the TNC tree\n", current->pid); |
| 759 | znode = ubifs_tnc_levelorder_next(c->zroot.znode, NULL); | 759 | znode = ubifs_tnc_levelorder_next(c->zroot.znode, NULL); |
| 760 | level = znode->level; | 760 | level = znode->level; |
| 761 | printk(KERN_DEBUG "== Level %d ==\n", level); | 761 | printk(KERN_DEBUG "== Level %d ==\n", level); |
| @@ -2208,16 +2208,17 @@ int dbg_leb_read(struct ubi_volume_desc *desc, int lnum, char *buf, int offset, | |||
| 2208 | int dbg_leb_write(struct ubi_volume_desc *desc, int lnum, const void *buf, | 2208 | int dbg_leb_write(struct ubi_volume_desc *desc, int lnum, const void *buf, |
| 2209 | int offset, int len, int dtype) | 2209 | int offset, int len, int dtype) |
| 2210 | { | 2210 | { |
| 2211 | int err; | 2211 | int err, failing; |
| 2212 | 2212 | ||
| 2213 | if (in_failure_mode(desc)) | 2213 | if (in_failure_mode(desc)) |
| 2214 | return -EIO; | 2214 | return -EIO; |
| 2215 | if (do_fail(desc, lnum, 1)) | 2215 | failing = do_fail(desc, lnum, 1); |
| 2216 | if (failing) | ||
| 2216 | cut_data(buf, len); | 2217 | cut_data(buf, len); |
| 2217 | err = ubi_leb_write(desc, lnum, buf, offset, len, dtype); | 2218 | err = ubi_leb_write(desc, lnum, buf, offset, len, dtype); |
| 2218 | if (err) | 2219 | if (err) |
| 2219 | return err; | 2220 | return err; |
| 2220 | if (in_failure_mode(desc)) | 2221 | if (failing) |
| 2221 | return -EIO; | 2222 | return -EIO; |
| 2222 | return 0; | 2223 | return 0; |
| 2223 | } | 2224 | } |
diff --git a/fs/ubifs/debug.h b/fs/ubifs/debug.h index 3c4f1e93c9e0..50315fc57185 100644 --- a/fs/ubifs/debug.h +++ b/fs/ubifs/debug.h | |||
| @@ -27,7 +27,7 @@ | |||
| 27 | 27 | ||
| 28 | #define UBIFS_DBG(op) op | 28 | #define UBIFS_DBG(op) op |
| 29 | 29 | ||
| 30 | #define ubifs_assert(expr) do { \ | 30 | #define ubifs_assert(expr) do { \ |
| 31 | if (unlikely(!(expr))) { \ | 31 | if (unlikely(!(expr))) { \ |
| 32 | printk(KERN_CRIT "UBIFS assert failed in %s at %u (pid %d)\n", \ | 32 | printk(KERN_CRIT "UBIFS assert failed in %s at %u (pid %d)\n", \ |
| 33 | __func__, __LINE__, current->pid); \ | 33 | __func__, __LINE__, current->pid); \ |
| @@ -73,50 +73,50 @@ const char *dbg_key_str1(const struct ubifs_info *c, | |||
| 73 | const union ubifs_key *key); | 73 | const union ubifs_key *key); |
| 74 | 74 | ||
| 75 | /* | 75 | /* |
| 76 | * DBGKEY macros require dbg_lock to be held, which it is in the dbg message | 76 | * DBGKEY macros require @dbg_lock to be held, which it is in the dbg message |
| 77 | * macros. | 77 | * macros. |
| 78 | */ | 78 | */ |
| 79 | #define DBGKEY(key) dbg_key_str0(c, (key)) | 79 | #define DBGKEY(key) dbg_key_str0(c, (key)) |
| 80 | #define DBGKEY1(key) dbg_key_str1(c, (key)) | 80 | #define DBGKEY1(key) dbg_key_str1(c, (key)) |
| 81 | 81 | ||
| 82 | /* General messages */ | 82 | /* General messages */ |
| 83 | #define dbg_gen(fmt, ...) dbg_do_msg(UBIFS_MSG_GEN, fmt, ##__VA_ARGS__) | 83 | #define dbg_gen(fmt, ...) dbg_do_msg(UBIFS_MSG_GEN, fmt, ##__VA_ARGS__) |
| 84 | 84 | ||
| 85 | /* Additional journal messages */ | 85 | /* Additional journal messages */ |
| 86 | #define dbg_jnl(fmt, ...) dbg_do_msg(UBIFS_MSG_JNL, fmt, ##__VA_ARGS__) | 86 | #define dbg_jnl(fmt, ...) dbg_do_msg(UBIFS_MSG_JNL, fmt, ##__VA_ARGS__) |
| 87 | 87 | ||
| 88 | /* Additional TNC messages */ | 88 | /* Additional TNC messages */ |
| 89 | #define dbg_tnc(fmt, ...) dbg_do_msg(UBIFS_MSG_TNC, fmt, ##__VA_ARGS__) | 89 | #define dbg_tnc(fmt, ...) dbg_do_msg(UBIFS_MSG_TNC, fmt, ##__VA_ARGS__) |
| 90 | 90 | ||
| 91 | /* Additional lprops messages */ | 91 | /* Additional lprops messages */ |
| 92 | #define dbg_lp(fmt, ...) dbg_do_msg(UBIFS_MSG_LP, fmt, ##__VA_ARGS__) | 92 | #define dbg_lp(fmt, ...) dbg_do_msg(UBIFS_MSG_LP, fmt, ##__VA_ARGS__) |
| 93 | 93 | ||
| 94 | /* Additional LEB find messages */ | 94 | /* Additional LEB find messages */ |
| 95 | #define dbg_find(fmt, ...) dbg_do_msg(UBIFS_MSG_FIND, fmt, ##__VA_ARGS__) | 95 | #define dbg_find(fmt, ...) dbg_do_msg(UBIFS_MSG_FIND, fmt, ##__VA_ARGS__) |
| 96 | 96 | ||
| 97 | /* Additional mount messages */ | 97 | /* Additional mount messages */ |
| 98 | #define dbg_mnt(fmt, ...) dbg_do_msg(UBIFS_MSG_MNT, fmt, ##__VA_ARGS__) | 98 | #define dbg_mnt(fmt, ...) dbg_do_msg(UBIFS_MSG_MNT, fmt, ##__VA_ARGS__) |
| 99 | 99 | ||
| 100 | /* Additional I/O messages */ | 100 | /* Additional I/O messages */ |
| 101 | #define dbg_io(fmt, ...) dbg_do_msg(UBIFS_MSG_IO, fmt, ##__VA_ARGS__) | 101 | #define dbg_io(fmt, ...) dbg_do_msg(UBIFS_MSG_IO, fmt, ##__VA_ARGS__) |
| 102 | 102 | ||
| 103 | /* Additional commit messages */ | 103 | /* Additional commit messages */ |
| 104 | #define dbg_cmt(fmt, ...) dbg_do_msg(UBIFS_MSG_CMT, fmt, ##__VA_ARGS__) | 104 | #define dbg_cmt(fmt, ...) dbg_do_msg(UBIFS_MSG_CMT, fmt, ##__VA_ARGS__) |
| 105 | 105 | ||
| 106 | /* Additional budgeting messages */ | 106 | /* Additional budgeting messages */ |
| 107 | #define dbg_budg(fmt, ...) dbg_do_msg(UBIFS_MSG_BUDG, fmt, ##__VA_ARGS__) | 107 | #define dbg_budg(fmt, ...) dbg_do_msg(UBIFS_MSG_BUDG, fmt, ##__VA_ARGS__) |
| 108 | 108 | ||
| 109 | /* Additional log messages */ | 109 | /* Additional log messages */ |
| 110 | #define dbg_log(fmt, ...) dbg_do_msg(UBIFS_MSG_LOG, fmt, ##__VA_ARGS__) | 110 | #define dbg_log(fmt, ...) dbg_do_msg(UBIFS_MSG_LOG, fmt, ##__VA_ARGS__) |
| 111 | 111 | ||
| 112 | /* Additional gc messages */ | 112 | /* Additional gc messages */ |
| 113 | #define dbg_gc(fmt, ...) dbg_do_msg(UBIFS_MSG_GC, fmt, ##__VA_ARGS__) | 113 | #define dbg_gc(fmt, ...) dbg_do_msg(UBIFS_MSG_GC, fmt, ##__VA_ARGS__) |
| 114 | 114 | ||
| 115 | /* Additional scan messages */ | 115 | /* Additional scan messages */ |
| 116 | #define dbg_scan(fmt, ...) dbg_do_msg(UBIFS_MSG_SCAN, fmt, ##__VA_ARGS__) | 116 | #define dbg_scan(fmt, ...) dbg_do_msg(UBIFS_MSG_SCAN, fmt, ##__VA_ARGS__) |
| 117 | 117 | ||
| 118 | /* Additional recovery messages */ | 118 | /* Additional recovery messages */ |
| 119 | #define dbg_rcvry(fmt, ...) dbg_do_msg(UBIFS_MSG_RCVRY, fmt, ##__VA_ARGS__) | 119 | #define dbg_rcvry(fmt, ...) dbg_do_msg(UBIFS_MSG_RCVRY, fmt, ##__VA_ARGS__) |
| 120 | 120 | ||
| 121 | /* | 121 | /* |
| 122 | * Debugging message type flags (must match msg_type_names in debug.c). | 122 | * Debugging message type flags (must match msg_type_names in debug.c). |
| @@ -239,34 +239,23 @@ typedef int (*dbg_leaf_callback)(struct ubifs_info *c, | |||
| 239 | struct ubifs_zbranch *zbr, void *priv); | 239 | struct ubifs_zbranch *zbr, void *priv); |
| 240 | typedef int (*dbg_znode_callback)(struct ubifs_info *c, | 240 | typedef int (*dbg_znode_callback)(struct ubifs_info *c, |
| 241 | struct ubifs_znode *znode, void *priv); | 241 | struct ubifs_znode *znode, void *priv); |
| 242 | |||
| 243 | int dbg_walk_index(struct ubifs_info *c, dbg_leaf_callback leaf_cb, | 242 | int dbg_walk_index(struct ubifs_info *c, dbg_leaf_callback leaf_cb, |
| 244 | dbg_znode_callback znode_cb, void *priv); | 243 | dbg_znode_callback znode_cb, void *priv); |
| 245 | 244 | ||
| 246 | /* Checking functions */ | 245 | /* Checking functions */ |
| 247 | 246 | ||
| 248 | int dbg_check_lprops(struct ubifs_info *c); | 247 | int dbg_check_lprops(struct ubifs_info *c); |
| 249 | |||
| 250 | int dbg_old_index_check_init(struct ubifs_info *c, struct ubifs_zbranch *zroot); | 248 | int dbg_old_index_check_init(struct ubifs_info *c, struct ubifs_zbranch *zroot); |
| 251 | int dbg_check_old_index(struct ubifs_info *c, struct ubifs_zbranch *zroot); | 249 | int dbg_check_old_index(struct ubifs_info *c, struct ubifs_zbranch *zroot); |
| 252 | |||
| 253 | int dbg_check_cats(struct ubifs_info *c); | 250 | int dbg_check_cats(struct ubifs_info *c); |
| 254 | |||
| 255 | int dbg_check_ltab(struct ubifs_info *c); | 251 | int dbg_check_ltab(struct ubifs_info *c); |
| 256 | |||
| 257 | int dbg_check_synced_i_size(struct inode *inode); | 252 | int dbg_check_synced_i_size(struct inode *inode); |
| 258 | |||
| 259 | int dbg_check_dir_size(struct ubifs_info *c, const struct inode *dir); | 253 | int dbg_check_dir_size(struct ubifs_info *c, const struct inode *dir); |
| 260 | |||
| 261 | int dbg_check_tnc(struct ubifs_info *c, int extra); | 254 | int dbg_check_tnc(struct ubifs_info *c, int extra); |
| 262 | |||
| 263 | int dbg_check_idx_size(struct ubifs_info *c, long long idx_size); | 255 | int dbg_check_idx_size(struct ubifs_info *c, long long idx_size); |
| 264 | |||
| 265 | int dbg_check_filesystem(struct ubifs_info *c); | 256 | int dbg_check_filesystem(struct ubifs_info *c); |
| 266 | |||
| 267 | void dbg_check_heap(struct ubifs_info *c, struct ubifs_lpt_heap *heap, int cat, | 257 | void dbg_check_heap(struct ubifs_info *c, struct ubifs_lpt_heap *heap, int cat, |
| 268 | int add_pos); | 258 | int add_pos); |
| 269 | |||
| 270 | int dbg_check_lprops(struct ubifs_info *c); | 259 | int dbg_check_lprops(struct ubifs_info *c); |
| 271 | int dbg_check_lpt_nodes(struct ubifs_info *c, struct ubifs_cnode *cnode, | 260 | int dbg_check_lpt_nodes(struct ubifs_info *c, struct ubifs_cnode *cnode, |
| 272 | int row, int col); | 261 | int row, int col); |
| @@ -329,71 +318,77 @@ static inline int dbg_change(struct ubi_volume_desc *desc, int lnum, | |||
| 329 | #else /* !CONFIG_UBIFS_FS_DEBUG */ | 318 | #else /* !CONFIG_UBIFS_FS_DEBUG */ |
| 330 | 319 | ||
| 331 | #define UBIFS_DBG(op) | 320 | #define UBIFS_DBG(op) |
| 332 | #define ubifs_assert(expr) ({}) | 321 | |
| 333 | #define ubifs_assert_cmt_locked(c) | 322 | /* Use "if (0)" to make compiler check arguments even if debugging is off */ |
| 323 | #define ubifs_assert(expr) do { \ | ||
| 324 | if (0 && (expr)) \ | ||
| 325 | printk(KERN_CRIT "UBIFS assert failed in %s at %u (pid %d)\n", \ | ||
| 326 | __func__, __LINE__, current->pid); \ | ||
| 327 | } while (0) | ||
| 328 | |||
| 329 | #define dbg_err(fmt, ...) do { \ | ||
| 330 | if (0) \ | ||
| 331 | ubifs_err(fmt, ##__VA_ARGS__); \ | ||
| 332 | } while (0) | ||
| 333 | |||
| 334 | #define dbg_msg(fmt, ...) do { \ | ||
| 335 | if (0) \ | ||
| 336 | printk(KERN_DEBUG "UBIFS DBG (pid %d): %s: " fmt "\n", \ | ||
| 337 | current->pid, __func__, ##__VA_ARGS__); \ | ||
| 338 | } while (0) | ||
| 339 | |||
| 334 | #define dbg_dump_stack() | 340 | #define dbg_dump_stack() |
| 335 | #define dbg_err(fmt, ...) ({}) | 341 | #define ubifs_assert_cmt_locked(c) |
| 336 | #define dbg_msg(fmt, ...) ({}) | ||
| 337 | #define dbg_key(c, key, fmt, ...) ({}) | ||
| 338 | |||
| 339 | #define dbg_gen(fmt, ...) ({}) | ||
| 340 | #define dbg_jnl(fmt, ...) ({}) | ||
| 341 | #define dbg_tnc(fmt, ...) ({}) | ||
| 342 | #define dbg_lp(fmt, ...) ({}) | ||
| 343 | #define dbg_find(fmt, ...) ({}) | ||
| 344 | #define dbg_mnt(fmt, ...) ({}) | ||
| 345 | #define dbg_io(fmt, ...) ({}) | ||
| 346 | #define dbg_cmt(fmt, ...) ({}) | ||
| 347 | #define dbg_budg(fmt, ...) ({}) | ||
| 348 | #define dbg_log(fmt, ...) ({}) | ||
| 349 | #define dbg_gc(fmt, ...) ({}) | ||
| 350 | #define dbg_scan(fmt, ...) ({}) | ||
| 351 | #define dbg_rcvry(fmt, ...) ({}) | ||
| 352 | |||
| 353 | #define dbg_ntype(type) "" | ||
| 354 | #define dbg_cstate(cmt_state) "" | ||
| 355 | #define dbg_get_key_dump(c, key) ({}) | ||
| 356 | #define dbg_dump_inode(c, inode) ({}) | ||
| 357 | #define dbg_dump_node(c, node) ({}) | ||
| 358 | #define dbg_dump_budget_req(req) ({}) | ||
| 359 | #define dbg_dump_lstats(lst) ({}) | ||
| 360 | #define dbg_dump_budg(c) ({}) | ||
| 361 | #define dbg_dump_lprop(c, lp) ({}) | ||
| 362 | #define dbg_dump_lprops(c) ({}) | ||
| 363 | #define dbg_dump_leb(c, lnum) ({}) | ||
| 364 | #define dbg_dump_znode(c, znode) ({}) | ||
| 365 | #define dbg_dump_heap(c, heap, cat) ({}) | ||
| 366 | #define dbg_dump_pnode(c, pnode, parent, iip) ({}) | ||
| 367 | #define dbg_dump_tnc(c) ({}) | ||
| 368 | #define dbg_dump_index(c) ({}) | ||
| 369 | 342 | ||
| 370 | #define dbg_walk_index(c, leaf_cb, znode_cb, priv) 0 | 343 | #define dbg_gen(fmt, ...) dbg_msg(fmt, ##__VA_ARGS__) |
| 344 | #define dbg_jnl(fmt, ...) dbg_msg(fmt, ##__VA_ARGS__) | ||
| 345 | #define dbg_tnc(fmt, ...) dbg_msg(fmt, ##__VA_ARGS__) | ||
| 346 | #define dbg_lp(fmt, ...) dbg_msg(fmt, ##__VA_ARGS__) | ||
| 347 | #define dbg_find(fmt, ...) dbg_msg(fmt, ##__VA_ARGS__) | ||
| 348 | #define dbg_mnt(fmt, ...) dbg_msg(fmt, ##__VA_ARGS__) | ||
| 349 | #define dbg_io(fmt, ...) dbg_msg(fmt, ##__VA_ARGS__) | ||
| 350 | #define dbg_cmt(fmt, ...) dbg_msg(fmt, ##__VA_ARGS__) | ||
| 351 | #define dbg_budg(fmt, ...) dbg_msg(fmt, ##__VA_ARGS__) | ||
| 352 | #define dbg_log(fmt, ...) dbg_msg(fmt, ##__VA_ARGS__) | ||
| 353 | #define dbg_gc(fmt, ...) dbg_msg(fmt, ##__VA_ARGS__) | ||
| 354 | #define dbg_scan(fmt, ...) dbg_msg(fmt, ##__VA_ARGS__) | ||
| 355 | #define dbg_rcvry(fmt, ...) dbg_msg(fmt, ##__VA_ARGS__) | ||
| 356 | |||
| 357 | #define DBGKEY(key) ((char *)(key)) | ||
| 358 | #define DBGKEY1(key) ((char *)(key)) | ||
| 359 | |||
| 360 | #define dbg_ntype(type) "" | ||
| 361 | #define dbg_cstate(cmt_state) "" | ||
| 362 | #define dbg_get_key_dump(c, key) ({}) | ||
| 363 | #define dbg_dump_inode(c, inode) ({}) | ||
| 364 | #define dbg_dump_node(c, node) ({}) | ||
| 365 | #define dbg_dump_budget_req(req) ({}) | ||
| 366 | #define dbg_dump_lstats(lst) ({}) | ||
| 367 | #define dbg_dump_budg(c) ({}) | ||
| 368 | #define dbg_dump_lprop(c, lp) ({}) | ||
| 369 | #define dbg_dump_lprops(c) ({}) | ||
| 370 | #define dbg_dump_leb(c, lnum) ({}) | ||
| 371 | #define dbg_dump_znode(c, znode) ({}) | ||
| 372 | #define dbg_dump_heap(c, heap, cat) ({}) | ||
| 373 | #define dbg_dump_pnode(c, pnode, parent, iip) ({}) | ||
| 374 | #define dbg_dump_tnc(c) ({}) | ||
| 375 | #define dbg_dump_index(c) ({}) | ||
| 371 | 376 | ||
| 377 | #define dbg_walk_index(c, leaf_cb, znode_cb, priv) 0 | ||
| 372 | #define dbg_old_index_check_init(c, zroot) 0 | 378 | #define dbg_old_index_check_init(c, zroot) 0 |
| 373 | #define dbg_check_old_index(c, zroot) 0 | 379 | #define dbg_check_old_index(c, zroot) 0 |
| 374 | |||
| 375 | #define dbg_check_cats(c) 0 | 380 | #define dbg_check_cats(c) 0 |
| 376 | |||
| 377 | #define dbg_check_ltab(c) 0 | 381 | #define dbg_check_ltab(c) 0 |
| 378 | |||
| 379 | #define dbg_check_synced_i_size(inode) 0 | 382 | #define dbg_check_synced_i_size(inode) 0 |
| 380 | |||
| 381 | #define dbg_check_dir_size(c, dir) 0 | 383 | #define dbg_check_dir_size(c, dir) 0 |
| 382 | |||
| 383 | #define dbg_check_tnc(c, x) 0 | 384 | #define dbg_check_tnc(c, x) 0 |
| 384 | |||
| 385 | #define dbg_check_idx_size(c, idx_size) 0 | 385 | #define dbg_check_idx_size(c, idx_size) 0 |
| 386 | |||
| 387 | #define dbg_check_filesystem(c) 0 | 386 | #define dbg_check_filesystem(c) 0 |
| 388 | |||
| 389 | #define dbg_check_heap(c, heap, cat, add_pos) ({}) | 387 | #define dbg_check_heap(c, heap, cat, add_pos) ({}) |
| 390 | |||
| 391 | #define dbg_check_lprops(c) 0 | 388 | #define dbg_check_lprops(c) 0 |
| 392 | #define dbg_check_lpt_nodes(c, cnode, row, col) 0 | 389 | #define dbg_check_lpt_nodes(c, cnode, row, col) 0 |
| 393 | |||
| 394 | #define dbg_force_in_the_gaps_enabled 0 | 390 | #define dbg_force_in_the_gaps_enabled 0 |
| 395 | #define dbg_force_in_the_gaps() 0 | 391 | #define dbg_force_in_the_gaps() 0 |
| 396 | |||
| 397 | #define dbg_failure_mode 0 | 392 | #define dbg_failure_mode 0 |
| 398 | #define dbg_failure_mode_registration(c) ({}) | 393 | #define dbg_failure_mode_registration(c) ({}) |
| 399 | #define dbg_failure_mode_deregistration(c) ({}) | 394 | #define dbg_failure_mode_deregistration(c) ({}) |
diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c index e90374be7d3b..5c96f1fb7016 100644 --- a/fs/ubifs/dir.c +++ b/fs/ubifs/dir.c | |||
| @@ -165,7 +165,6 @@ struct inode *ubifs_new_inode(struct ubifs_info *c, const struct inode *dir, | |||
| 165 | } | 165 | } |
| 166 | 166 | ||
| 167 | inode->i_ino = ++c->highest_inum; | 167 | inode->i_ino = ++c->highest_inum; |
| 168 | inode->i_generation = ++c->vfs_gen; | ||
| 169 | /* | 168 | /* |
| 170 | * The creation sequence number remains with this inode for its | 169 | * The creation sequence number remains with this inode for its |
| 171 | * lifetime. All nodes for this inode have a greater sequence number, | 170 | * lifetime. All nodes for this inode have a greater sequence number, |
| @@ -220,15 +219,7 @@ static struct dentry *ubifs_lookup(struct inode *dir, struct dentry *dentry, | |||
| 220 | 219 | ||
| 221 | err = ubifs_tnc_lookup_nm(c, &key, dent, &dentry->d_name); | 220 | err = ubifs_tnc_lookup_nm(c, &key, dent, &dentry->d_name); |
| 222 | if (err) { | 221 | if (err) { |
| 223 | /* | 222 | if (err == -ENOENT) { |
| 224 | * Do not hash the direntry if parent 'i_nlink' is zero, because | ||
| 225 | * this has side-effects - '->delete_inode()' call will not be | ||
| 226 | * called for the parent orphan inode, because 'd_count' of its | ||
| 227 | * direntry will stay 1 (it'll be negative direntry I guess) | ||
| 228 | * and prevent 'iput_final()' until the dentry is destroyed due | ||
| 229 | * to unmount or memory pressure. | ||
| 230 | */ | ||
| 231 | if (err == -ENOENT && dir->i_nlink != 0) { | ||
| 232 | dbg_gen("not found"); | 223 | dbg_gen("not found"); |
| 233 | goto done; | 224 | goto done; |
| 234 | } | 225 | } |
| @@ -525,7 +516,7 @@ static int ubifs_link(struct dentry *old_dentry, struct inode *dir, | |||
| 525 | struct ubifs_inode *dir_ui = ubifs_inode(dir); | 516 | struct ubifs_inode *dir_ui = ubifs_inode(dir); |
| 526 | int err, sz_change = CALC_DENT_SIZE(dentry->d_name.len); | 517 | int err, sz_change = CALC_DENT_SIZE(dentry->d_name.len); |
| 527 | struct ubifs_budget_req req = { .new_dent = 1, .dirtied_ino = 2, | 518 | struct ubifs_budget_req req = { .new_dent = 1, .dirtied_ino = 2, |
| 528 | .dirtied_ino_d = ui->data_len }; | 519 | .dirtied_ino_d = ALIGN(ui->data_len, 8) }; |
| 529 | 520 | ||
| 530 | /* | 521 | /* |
| 531 | * Budget request settings: new direntry, changing the target inode, | 522 | * Budget request settings: new direntry, changing the target inode, |
| @@ -727,8 +718,7 @@ static int ubifs_mkdir(struct inode *dir, struct dentry *dentry, int mode) | |||
| 727 | struct ubifs_inode *dir_ui = ubifs_inode(dir); | 718 | struct ubifs_inode *dir_ui = ubifs_inode(dir); |
| 728 | struct ubifs_info *c = dir->i_sb->s_fs_info; | 719 | struct ubifs_info *c = dir->i_sb->s_fs_info; |
| 729 | int err, sz_change = CALC_DENT_SIZE(dentry->d_name.len); | 720 | int err, sz_change = CALC_DENT_SIZE(dentry->d_name.len); |
| 730 | struct ubifs_budget_req req = { .new_ino = 1, .new_dent = 1, | 721 | struct ubifs_budget_req req = { .new_ino = 1, .new_dent = 1 }; |
| 731 | .dirtied_ino_d = 1 }; | ||
| 732 | 722 | ||
| 733 | /* | 723 | /* |
| 734 | * Budget request settings: new inode, new direntry and changing parent | 724 | * Budget request settings: new inode, new direntry and changing parent |
| @@ -789,7 +779,8 @@ static int ubifs_mknod(struct inode *dir, struct dentry *dentry, | |||
| 789 | int sz_change = CALC_DENT_SIZE(dentry->d_name.len); | 779 | int sz_change = CALC_DENT_SIZE(dentry->d_name.len); |
| 790 | int err, devlen = 0; | 780 | int err, devlen = 0; |
| 791 | struct ubifs_budget_req req = { .new_ino = 1, .new_dent = 1, | 781 | struct ubifs_budget_req req = { .new_ino = 1, .new_dent = 1, |
| 792 | .new_ino_d = devlen, .dirtied_ino = 1 }; | 782 | .new_ino_d = ALIGN(devlen, 8), |
| 783 | .dirtied_ino = 1 }; | ||
| 793 | 784 | ||
| 794 | /* | 785 | /* |
| 795 | * Budget request settings: new inode, new direntry and changing parent | 786 | * Budget request settings: new inode, new direntry and changing parent |
| @@ -863,7 +854,8 @@ static int ubifs_symlink(struct inode *dir, struct dentry *dentry, | |||
| 863 | int err, len = strlen(symname); | 854 | int err, len = strlen(symname); |
| 864 | int sz_change = CALC_DENT_SIZE(dentry->d_name.len); | 855 | int sz_change = CALC_DENT_SIZE(dentry->d_name.len); |
| 865 | struct ubifs_budget_req req = { .new_ino = 1, .new_dent = 1, | 856 | struct ubifs_budget_req req = { .new_ino = 1, .new_dent = 1, |
| 866 | .new_ino_d = len, .dirtied_ino = 1 }; | 857 | .new_ino_d = ALIGN(len, 8), |
| 858 | .dirtied_ino = 1 }; | ||
| 867 | 859 | ||
| 868 | /* | 860 | /* |
| 869 | * Budget request settings: new inode, new direntry and changing parent | 861 | * Budget request settings: new inode, new direntry and changing parent |
| @@ -1012,7 +1004,7 @@ static int ubifs_rename(struct inode *old_dir, struct dentry *old_dentry, | |||
| 1012 | struct ubifs_budget_req req = { .new_dent = 1, .mod_dent = 1, | 1004 | struct ubifs_budget_req req = { .new_dent = 1, .mod_dent = 1, |
| 1013 | .dirtied_ino = 3 }; | 1005 | .dirtied_ino = 3 }; |
| 1014 | struct ubifs_budget_req ino_req = { .dirtied_ino = 1, | 1006 | struct ubifs_budget_req ino_req = { .dirtied_ino = 1, |
| 1015 | .dirtied_ino_d = old_inode_ui->data_len }; | 1007 | .dirtied_ino_d = ALIGN(old_inode_ui->data_len, 8) }; |
| 1016 | struct timespec time; | 1008 | struct timespec time; |
| 1017 | 1009 | ||
| 1018 | /* | 1010 | /* |
diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c index 8565e586e533..4071d1cae29f 100644 --- a/fs/ubifs/file.c +++ b/fs/ubifs/file.c | |||
| @@ -890,7 +890,7 @@ static int do_setattr(struct ubifs_info *c, struct inode *inode, | |||
| 890 | loff_t new_size = attr->ia_size; | 890 | loff_t new_size = attr->ia_size; |
| 891 | struct ubifs_inode *ui = ubifs_inode(inode); | 891 | struct ubifs_inode *ui = ubifs_inode(inode); |
| 892 | struct ubifs_budget_req req = { .dirtied_ino = 1, | 892 | struct ubifs_budget_req req = { .dirtied_ino = 1, |
| 893 | .dirtied_ino_d = ui->data_len }; | 893 | .dirtied_ino_d = ALIGN(ui->data_len, 8) }; |
| 894 | 894 | ||
| 895 | err = ubifs_budget_space(c, &req); | 895 | err = ubifs_budget_space(c, &req); |
| 896 | if (err) | 896 | if (err) |
| @@ -941,7 +941,8 @@ int ubifs_setattr(struct dentry *dentry, struct iattr *attr) | |||
| 941 | struct inode *inode = dentry->d_inode; | 941 | struct inode *inode = dentry->d_inode; |
| 942 | struct ubifs_info *c = inode->i_sb->s_fs_info; | 942 | struct ubifs_info *c = inode->i_sb->s_fs_info; |
| 943 | 943 | ||
| 944 | dbg_gen("ino %lu, ia_valid %#x", inode->i_ino, attr->ia_valid); | 944 | dbg_gen("ino %lu, mode %#x, ia_valid %#x", |
| 945 | inode->i_ino, inode->i_mode, attr->ia_valid); | ||
| 945 | err = inode_change_ok(inode, attr); | 946 | err = inode_change_ok(inode, attr); |
| 946 | if (err) | 947 | if (err) |
| 947 | return err; | 948 | return err; |
| @@ -1051,7 +1052,7 @@ static int update_mctime(struct ubifs_info *c, struct inode *inode) | |||
| 1051 | if (mctime_update_needed(inode, &now)) { | 1052 | if (mctime_update_needed(inode, &now)) { |
| 1052 | int err, release; | 1053 | int err, release; |
| 1053 | struct ubifs_budget_req req = { .dirtied_ino = 1, | 1054 | struct ubifs_budget_req req = { .dirtied_ino = 1, |
| 1054 | .dirtied_ino_d = ui->data_len }; | 1055 | .dirtied_ino_d = ALIGN(ui->data_len, 8) }; |
| 1055 | 1056 | ||
| 1056 | err = ubifs_budget_space(c, &req); | 1057 | err = ubifs_budget_space(c, &req); |
| 1057 | if (err) | 1058 | if (err) |
| @@ -1270,6 +1271,7 @@ struct file_operations ubifs_file_operations = { | |||
| 1270 | .fsync = ubifs_fsync, | 1271 | .fsync = ubifs_fsync, |
| 1271 | .unlocked_ioctl = ubifs_ioctl, | 1272 | .unlocked_ioctl = ubifs_ioctl, |
| 1272 | .splice_read = generic_file_splice_read, | 1273 | .splice_read = generic_file_splice_read, |
| 1274 | .splice_write = generic_file_splice_write, | ||
| 1273 | #ifdef CONFIG_COMPAT | 1275 | #ifdef CONFIG_COMPAT |
| 1274 | .compat_ioctl = ubifs_compat_ioctl, | 1276 | .compat_ioctl = ubifs_compat_ioctl, |
| 1275 | #endif | 1277 | #endif |
diff --git a/fs/ubifs/find.c b/fs/ubifs/find.c index 10394c548367..adee7b5ddeab 100644 --- a/fs/ubifs/find.c +++ b/fs/ubifs/find.c | |||
| @@ -290,9 +290,14 @@ int ubifs_find_dirty_leb(struct ubifs_info *c, struct ubifs_lprops *ret_lp, | |||
| 290 | idx_lp = idx_heap->arr[0]; | 290 | idx_lp = idx_heap->arr[0]; |
| 291 | sum = idx_lp->free + idx_lp->dirty; | 291 | sum = idx_lp->free + idx_lp->dirty; |
| 292 | /* | 292 | /* |
| 293 | * Since we reserve twice as more space for the index than it | 293 | * Since we reserve thrice as much space for the index than it |
| 294 | * actually takes, it does not make sense to pick indexing LEBs | 294 | * actually takes, it does not make sense to pick indexing LEBs |
| 295 | * with less than half LEB of dirty space. | 295 | * with less than, say, half LEB of dirty space. May be half is |
| 296 | * not the optimal boundary - this should be tested and | ||
| 297 | * checked. This boundary should determine how much we use | ||
| 298 | * in-the-gaps to consolidate the index comparing to how much | ||
| 299 | * we use garbage collector to consolidate it. The "half" | ||
| 300 | * criteria just feels to be fine. | ||
| 296 | */ | 301 | */ |
| 297 | if (sum < min_space || sum < c->half_leb_size) | 302 | if (sum < min_space || sum < c->half_leb_size) |
| 298 | idx_lp = NULL; | 303 | idx_lp = NULL; |
diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c index 3374f91b6709..054363f2b207 100644 --- a/fs/ubifs/io.c +++ b/fs/ubifs/io.c | |||
| @@ -54,6 +54,20 @@ | |||
| 54 | #include "ubifs.h" | 54 | #include "ubifs.h" |
| 55 | 55 | ||
| 56 | /** | 56 | /** |
| 57 | * ubifs_ro_mode - switch UBIFS to read read-only mode. | ||
| 58 | * @c: UBIFS file-system description object | ||
| 59 | * @err: error code which is the reason of switching to R/O mode | ||
| 60 | */ | ||
| 61 | void ubifs_ro_mode(struct ubifs_info *c, int err) | ||
| 62 | { | ||
| 63 | if (!c->ro_media) { | ||
| 64 | c->ro_media = 1; | ||
| 65 | ubifs_warn("switched to read-only mode, error %d", err); | ||
| 66 | dbg_dump_stack(); | ||
| 67 | } | ||
| 68 | } | ||
| 69 | |||
| 70 | /** | ||
| 57 | * ubifs_check_node - check node. | 71 | * ubifs_check_node - check node. |
| 58 | * @c: UBIFS file-system description object | 72 | * @c: UBIFS file-system description object |
| 59 | * @buf: node to check | 73 | * @buf: node to check |
diff --git a/fs/ubifs/journal.c b/fs/ubifs/journal.c index 283155abe5f5..22993f867d19 100644 --- a/fs/ubifs/journal.c +++ b/fs/ubifs/journal.c | |||
| @@ -447,13 +447,11 @@ static int get_dent_type(int mode) | |||
| 447 | * @ino: buffer in which to pack inode node | 447 | * @ino: buffer in which to pack inode node |
| 448 | * @inode: inode to pack | 448 | * @inode: inode to pack |
| 449 | * @last: indicates the last node of the group | 449 | * @last: indicates the last node of the group |
| 450 | * @last_reference: non-zero if this is a deletion inode | ||
| 451 | */ | 450 | */ |
| 452 | static void pack_inode(struct ubifs_info *c, struct ubifs_ino_node *ino, | 451 | static void pack_inode(struct ubifs_info *c, struct ubifs_ino_node *ino, |
| 453 | const struct inode *inode, int last, | 452 | const struct inode *inode, int last) |
| 454 | int last_reference) | ||
| 455 | { | 453 | { |
| 456 | int data_len = 0; | 454 | int data_len = 0, last_reference = !inode->i_nlink; |
| 457 | struct ubifs_inode *ui = ubifs_inode(inode); | 455 | struct ubifs_inode *ui = ubifs_inode(inode); |
| 458 | 456 | ||
| 459 | ino->ch.node_type = UBIFS_INO_NODE; | 457 | ino->ch.node_type = UBIFS_INO_NODE; |
| @@ -596,9 +594,9 @@ int ubifs_jnl_update(struct ubifs_info *c, const struct inode *dir, | |||
| 596 | ubifs_prep_grp_node(c, dent, dlen, 0); | 594 | ubifs_prep_grp_node(c, dent, dlen, 0); |
| 597 | 595 | ||
| 598 | ino = (void *)dent + aligned_dlen; | 596 | ino = (void *)dent + aligned_dlen; |
| 599 | pack_inode(c, ino, inode, 0, last_reference); | 597 | pack_inode(c, ino, inode, 0); |
| 600 | ino = (void *)ino + aligned_ilen; | 598 | ino = (void *)ino + aligned_ilen; |
| 601 | pack_inode(c, ino, dir, 1, 0); | 599 | pack_inode(c, ino, dir, 1); |
| 602 | 600 | ||
| 603 | if (last_reference) { | 601 | if (last_reference) { |
| 604 | err = ubifs_add_orphan(c, inode->i_ino); | 602 | err = ubifs_add_orphan(c, inode->i_ino); |
| @@ -606,6 +604,7 @@ int ubifs_jnl_update(struct ubifs_info *c, const struct inode *dir, | |||
| 606 | release_head(c, BASEHD); | 604 | release_head(c, BASEHD); |
| 607 | goto out_finish; | 605 | goto out_finish; |
| 608 | } | 606 | } |
| 607 | ui->del_cmtno = c->cmt_no; | ||
| 609 | } | 608 | } |
| 610 | 609 | ||
| 611 | err = write_head(c, BASEHD, dent, len, &lnum, &dent_offs, sync); | 610 | err = write_head(c, BASEHD, dent, len, &lnum, &dent_offs, sync); |
| @@ -750,30 +749,25 @@ out_free: | |||
| 750 | * ubifs_jnl_write_inode - flush inode to the journal. | 749 | * ubifs_jnl_write_inode - flush inode to the journal. |
| 751 | * @c: UBIFS file-system description object | 750 | * @c: UBIFS file-system description object |
| 752 | * @inode: inode to flush | 751 | * @inode: inode to flush |
| 753 | * @deletion: inode has been deleted | ||
| 754 | * | 752 | * |
| 755 | * This function writes inode @inode to the journal. If the inode is | 753 | * This function writes inode @inode to the journal. If the inode is |
| 756 | * synchronous, it also synchronizes the write-buffer. Returns zero in case of | 754 | * synchronous, it also synchronizes the write-buffer. Returns zero in case of |
| 757 | * success and a negative error code in case of failure. | 755 | * success and a negative error code in case of failure. |
| 758 | */ | 756 | */ |
| 759 | int ubifs_jnl_write_inode(struct ubifs_info *c, const struct inode *inode, | 757 | int ubifs_jnl_write_inode(struct ubifs_info *c, const struct inode *inode) |
| 760 | int deletion) | ||
| 761 | { | 758 | { |
| 762 | int err, len, lnum, offs, sync = 0; | 759 | int err, lnum, offs; |
| 763 | struct ubifs_ino_node *ino; | 760 | struct ubifs_ino_node *ino; |
| 764 | struct ubifs_inode *ui = ubifs_inode(inode); | 761 | struct ubifs_inode *ui = ubifs_inode(inode); |
| 762 | int sync = 0, len = UBIFS_INO_NODE_SZ, last_reference = !inode->i_nlink; | ||
| 765 | 763 | ||
| 766 | dbg_jnl("ino %lu%s", inode->i_ino, | 764 | dbg_jnl("ino %lu, nlink %u", inode->i_ino, inode->i_nlink); |
| 767 | deletion ? " (last reference)" : ""); | ||
| 768 | if (deletion) | ||
| 769 | ubifs_assert(inode->i_nlink == 0); | ||
| 770 | 765 | ||
| 771 | len = UBIFS_INO_NODE_SZ; | ||
| 772 | /* | 766 | /* |
| 773 | * If the inode is being deleted, do not write the attached data. No | 767 | * If the inode is being deleted, do not write the attached data. No |
| 774 | * need to synchronize the write-buffer either. | 768 | * need to synchronize the write-buffer either. |
| 775 | */ | 769 | */ |
| 776 | if (!deletion) { | 770 | if (!last_reference) { |
| 777 | len += ui->data_len; | 771 | len += ui->data_len; |
| 778 | sync = IS_SYNC(inode); | 772 | sync = IS_SYNC(inode); |
| 779 | } | 773 | } |
| @@ -786,7 +780,7 @@ int ubifs_jnl_write_inode(struct ubifs_info *c, const struct inode *inode, | |||
| 786 | if (err) | 780 | if (err) |
| 787 | goto out_free; | 781 | goto out_free; |
| 788 | 782 | ||
| 789 | pack_inode(c, ino, inode, 1, deletion); | 783 | pack_inode(c, ino, inode, 1); |
| 790 | err = write_head(c, BASEHD, ino, len, &lnum, &offs, sync); | 784 | err = write_head(c, BASEHD, ino, len, &lnum, &offs, sync); |
| 791 | if (err) | 785 | if (err) |
| 792 | goto out_release; | 786 | goto out_release; |
| @@ -795,7 +789,7 @@ int ubifs_jnl_write_inode(struct ubifs_info *c, const struct inode *inode, | |||
| 795 | inode->i_ino); | 789 | inode->i_ino); |
| 796 | release_head(c, BASEHD); | 790 | release_head(c, BASEHD); |
| 797 | 791 | ||
| 798 | if (deletion) { | 792 | if (last_reference) { |
| 799 | err = ubifs_tnc_remove_ino(c, inode->i_ino); | 793 | err = ubifs_tnc_remove_ino(c, inode->i_ino); |
| 800 | if (err) | 794 | if (err) |
| 801 | goto out_ro; | 795 | goto out_ro; |
| @@ -828,6 +822,65 @@ out_free: | |||
| 828 | } | 822 | } |
| 829 | 823 | ||
| 830 | /** | 824 | /** |
| 825 | * ubifs_jnl_delete_inode - delete an inode. | ||
| 826 | * @c: UBIFS file-system description object | ||
| 827 | * @inode: inode to delete | ||
| 828 | * | ||
| 829 | * This function deletes inode @inode which includes removing it from orphans, | ||
| 830 | * deleting it from TNC and, in some cases, writing a deletion inode to the | ||
| 831 | * journal. | ||
| 832 | * | ||
| 833 | * When regular file inodes are unlinked or a directory inode is removed, the | ||
| 834 | * 'ubifs_jnl_update()' function writes a corresponding deletion inode and | ||
| 835 | * direntry to the media, and adds the inode to orphans. After this, when the | ||
| 836 | * last reference to this inode has been dropped, this function is called. In | ||
| 837 | * general, it has to write one more deletion inode to the media, because if | ||
| 838 | * a commit happened between 'ubifs_jnl_update()' and | ||
| 839 | * 'ubifs_jnl_delete_inode()', the deletion inode is not in the journal | ||
| 840 | * anymore, and in fact it might not be on the flash anymore, because it might | ||
| 841 | * have been garbage-collected already. And for optimization reasons UBIFS does | ||
| 842 | * not read the orphan area if it has been unmounted cleanly, so it would have | ||
| 843 | * no indication in the journal that there is a deleted inode which has to be | ||
| 844 | * removed from TNC. | ||
| 845 | * | ||
| 846 | * However, if there was no commit between 'ubifs_jnl_update()' and | ||
| 847 | * 'ubifs_jnl_delete_inode()', then there is no need to write the deletion | ||
| 848 | * inode to the media for the second time. And this is quite a typical case. | ||
| 849 | * | ||
| 850 | * This function returns zero in case of success and a negative error code in | ||
| 851 | * case of failure. | ||
| 852 | */ | ||
| 853 | int ubifs_jnl_delete_inode(struct ubifs_info *c, const struct inode *inode) | ||
| 854 | { | ||
| 855 | int err; | ||
| 856 | struct ubifs_inode *ui = ubifs_inode(inode); | ||
| 857 | |||
| 858 | ubifs_assert(inode->i_nlink == 0); | ||
| 859 | |||
| 860 | if (ui->del_cmtno != c->cmt_no) | ||
| 861 | /* A commit happened for sure */ | ||
| 862 | return ubifs_jnl_write_inode(c, inode); | ||
| 863 | |||
| 864 | down_read(&c->commit_sem); | ||
| 865 | /* | ||
| 866 | * Check commit number again, because the first test has been done | ||
| 867 | * without @c->commit_sem, so a commit might have happened. | ||
| 868 | */ | ||
| 869 | if (ui->del_cmtno != c->cmt_no) { | ||
| 870 | up_read(&c->commit_sem); | ||
| 871 | return ubifs_jnl_write_inode(c, inode); | ||
| 872 | } | ||
| 873 | |||
| 874 | err = ubifs_tnc_remove_ino(c, inode->i_ino); | ||
| 875 | if (err) | ||
| 876 | ubifs_ro_mode(c, err); | ||
| 877 | else | ||
| 878 | ubifs_delete_orphan(c, inode->i_ino); | ||
| 879 | up_read(&c->commit_sem); | ||
| 880 | return err; | ||
| 881 | } | ||
| 882 | |||
| 883 | /** | ||
| 831 | * ubifs_jnl_rename - rename a directory entry. | 884 | * ubifs_jnl_rename - rename a directory entry. |
| 832 | * @c: UBIFS file-system description object | 885 | * @c: UBIFS file-system description object |
| 833 | * @old_dir: parent inode of directory entry to rename | 886 | * @old_dir: parent inode of directory entry to rename |
| @@ -917,16 +970,16 @@ int ubifs_jnl_rename(struct ubifs_info *c, const struct inode *old_dir, | |||
| 917 | 970 | ||
| 918 | p = (void *)dent2 + aligned_dlen2; | 971 | p = (void *)dent2 + aligned_dlen2; |
| 919 | if (new_inode) { | 972 | if (new_inode) { |
| 920 | pack_inode(c, p, new_inode, 0, last_reference); | 973 | pack_inode(c, p, new_inode, 0); |
| 921 | p += ALIGN(ilen, 8); | 974 | p += ALIGN(ilen, 8); |
| 922 | } | 975 | } |
| 923 | 976 | ||
| 924 | if (!move) | 977 | if (!move) |
| 925 | pack_inode(c, p, old_dir, 1, 0); | 978 | pack_inode(c, p, old_dir, 1); |
| 926 | else { | 979 | else { |
| 927 | pack_inode(c, p, old_dir, 0, 0); | 980 | pack_inode(c, p, old_dir, 0); |
| 928 | p += ALIGN(plen, 8); | 981 | p += ALIGN(plen, 8); |
| 929 | pack_inode(c, p, new_dir, 1, 0); | 982 | pack_inode(c, p, new_dir, 1); |
| 930 | } | 983 | } |
| 931 | 984 | ||
| 932 | if (last_reference) { | 985 | if (last_reference) { |
| @@ -935,6 +988,7 @@ int ubifs_jnl_rename(struct ubifs_info *c, const struct inode *old_dir, | |||
| 935 | release_head(c, BASEHD); | 988 | release_head(c, BASEHD); |
| 936 | goto out_finish; | 989 | goto out_finish; |
| 937 | } | 990 | } |
| 991 | new_ui->del_cmtno = c->cmt_no; | ||
| 938 | } | 992 | } |
| 939 | 993 | ||
| 940 | err = write_head(c, BASEHD, dent, len, &lnum, &offs, sync); | 994 | err = write_head(c, BASEHD, dent, len, &lnum, &offs, sync); |
| @@ -1131,7 +1185,7 @@ int ubifs_jnl_truncate(struct ubifs_info *c, const struct inode *inode, | |||
| 1131 | if (err) | 1185 | if (err) |
| 1132 | goto out_free; | 1186 | goto out_free; |
| 1133 | 1187 | ||
| 1134 | pack_inode(c, ino, inode, 0, 0); | 1188 | pack_inode(c, ino, inode, 0); |
| 1135 | ubifs_prep_grp_node(c, trun, UBIFS_TRUN_NODE_SZ, dlen ? 0 : 1); | 1189 | ubifs_prep_grp_node(c, trun, UBIFS_TRUN_NODE_SZ, dlen ? 0 : 1); |
| 1136 | if (dlen) | 1190 | if (dlen) |
| 1137 | ubifs_prep_grp_node(c, dn, dlen, 1); | 1191 | ubifs_prep_grp_node(c, dn, dlen, 1); |
| @@ -1251,9 +1305,9 @@ int ubifs_jnl_delete_xattr(struct ubifs_info *c, const struct inode *host, | |||
| 1251 | ubifs_prep_grp_node(c, xent, xlen, 0); | 1305 | ubifs_prep_grp_node(c, xent, xlen, 0); |
| 1252 | 1306 | ||
| 1253 | ino = (void *)xent + aligned_xlen; | 1307 | ino = (void *)xent + aligned_xlen; |
| 1254 | pack_inode(c, ino, inode, 0, 1); | 1308 | pack_inode(c, ino, inode, 0); |
| 1255 | ino = (void *)ino + UBIFS_INO_NODE_SZ; | 1309 | ino = (void *)ino + UBIFS_INO_NODE_SZ; |
| 1256 | pack_inode(c, ino, host, 1, 0); | 1310 | pack_inode(c, ino, host, 1); |
| 1257 | 1311 | ||
| 1258 | err = write_head(c, BASEHD, xent, len, &lnum, &xent_offs, sync); | 1312 | err = write_head(c, BASEHD, xent, len, &lnum, &xent_offs, sync); |
| 1259 | if (!sync && !err) | 1313 | if (!sync && !err) |
| @@ -1320,7 +1374,7 @@ int ubifs_jnl_change_xattr(struct ubifs_info *c, const struct inode *inode, | |||
| 1320 | const struct inode *host) | 1374 | const struct inode *host) |
| 1321 | { | 1375 | { |
| 1322 | int err, len1, len2, aligned_len, aligned_len1, lnum, offs; | 1376 | int err, len1, len2, aligned_len, aligned_len1, lnum, offs; |
| 1323 | struct ubifs_inode *host_ui = ubifs_inode(inode); | 1377 | struct ubifs_inode *host_ui = ubifs_inode(host); |
| 1324 | struct ubifs_ino_node *ino; | 1378 | struct ubifs_ino_node *ino; |
| 1325 | union ubifs_key key; | 1379 | union ubifs_key key; |
| 1326 | int sync = IS_DIRSYNC(host); | 1380 | int sync = IS_DIRSYNC(host); |
| @@ -1344,8 +1398,8 @@ int ubifs_jnl_change_xattr(struct ubifs_info *c, const struct inode *inode, | |||
| 1344 | if (err) | 1398 | if (err) |
| 1345 | goto out_free; | 1399 | goto out_free; |
| 1346 | 1400 | ||
| 1347 | pack_inode(c, ino, host, 0, 0); | 1401 | pack_inode(c, ino, host, 0); |
| 1348 | pack_inode(c, (void *)ino + aligned_len1, inode, 1, 0); | 1402 | pack_inode(c, (void *)ino + aligned_len1, inode, 1); |
| 1349 | 1403 | ||
| 1350 | err = write_head(c, BASEHD, ino, aligned_len, &lnum, &offs, 0); | 1404 | err = write_head(c, BASEHD, ino, aligned_len, &lnum, &offs, 0); |
| 1351 | if (!sync && !err) { | 1405 | if (!sync && !err) { |
diff --git a/fs/ubifs/log.c b/fs/ubifs/log.c index 36857b9ed59e..3e0aa7367556 100644 --- a/fs/ubifs/log.c +++ b/fs/ubifs/log.c | |||
| @@ -317,6 +317,8 @@ int ubifs_add_bud_to_log(struct ubifs_info *c, int jhead, int lnum, int offs) | |||
| 317 | return 0; | 317 | return 0; |
| 318 | 318 | ||
| 319 | out_unlock: | 319 | out_unlock: |
| 320 | if (err != -EAGAIN) | ||
| 321 | ubifs_ro_mode(c, err); | ||
| 320 | mutex_unlock(&c->log_mutex); | 322 | mutex_unlock(&c->log_mutex); |
| 321 | kfree(ref); | 323 | kfree(ref); |
| 322 | kfree(bud); | 324 | kfree(bud); |
| @@ -410,7 +412,7 @@ int ubifs_log_start_commit(struct ubifs_info *c, int *ltail_lnum) | |||
| 410 | return -ENOMEM; | 412 | return -ENOMEM; |
| 411 | 413 | ||
| 412 | cs->ch.node_type = UBIFS_CS_NODE; | 414 | cs->ch.node_type = UBIFS_CS_NODE; |
| 413 | cs->cmt_no = cpu_to_le64(c->cmt_no + 1); | 415 | cs->cmt_no = cpu_to_le64(c->cmt_no); |
| 414 | ubifs_prepare_node(c, cs, UBIFS_CS_NODE_SZ, 0); | 416 | ubifs_prepare_node(c, cs, UBIFS_CS_NODE_SZ, 0); |
| 415 | 417 | ||
| 416 | /* | 418 | /* |
diff --git a/fs/ubifs/misc.h b/fs/ubifs/misc.h index 4beccfc256d2..87dabf9fe742 100644 --- a/fs/ubifs/misc.h +++ b/fs/ubifs/misc.h | |||
| @@ -80,20 +80,6 @@ static inline struct ubifs_inode *ubifs_inode(const struct inode *inode) | |||
| 80 | } | 80 | } |
| 81 | 81 | ||
| 82 | /** | 82 | /** |
| 83 | * ubifs_ro_mode - switch UBIFS to read read-only mode. | ||
| 84 | * @c: UBIFS file-system description object | ||
| 85 | * @err: error code which is the reason of switching to R/O mode | ||
| 86 | */ | ||
| 87 | static inline void ubifs_ro_mode(struct ubifs_info *c, int err) | ||
| 88 | { | ||
| 89 | if (!c->ro_media) { | ||
| 90 | c->ro_media = 1; | ||
| 91 | ubifs_warn("switched to read-only mode, error %d", err); | ||
| 92 | dbg_dump_stack(); | ||
| 93 | } | ||
| 94 | } | ||
| 95 | |||
| 96 | /** | ||
| 97 | * ubifs_compr_present - check if compressor was compiled in. | 83 | * ubifs_compr_present - check if compressor was compiled in. |
| 98 | * @compr_type: compressor type to check | 84 | * @compr_type: compressor type to check |
| 99 | * | 85 | * |
| @@ -322,7 +308,7 @@ static inline long long ubifs_reported_space(const struct ubifs_info *c, | |||
| 322 | { | 308 | { |
| 323 | int divisor, factor; | 309 | int divisor, factor; |
| 324 | 310 | ||
| 325 | divisor = UBIFS_MAX_DATA_NODE_SZ + (c->max_idx_node_sz << 1); | 311 | divisor = UBIFS_MAX_DATA_NODE_SZ + (c->max_idx_node_sz * 3); |
| 326 | factor = UBIFS_MAX_DATA_NODE_SZ - UBIFS_DATA_NODE_SZ; | 312 | factor = UBIFS_MAX_DATA_NODE_SZ - UBIFS_DATA_NODE_SZ; |
| 327 | do_div(free, divisor); | 313 | do_div(free, divisor); |
| 328 | 314 | ||
diff --git a/fs/ubifs/orphan.c b/fs/ubifs/orphan.c index 3afeb9242c6a..02d3462f4d3e 100644 --- a/fs/ubifs/orphan.c +++ b/fs/ubifs/orphan.c | |||
| @@ -310,10 +310,10 @@ static int write_orph_node(struct ubifs_info *c, int atomic) | |||
| 310 | c->cmt_orphans -= cnt; | 310 | c->cmt_orphans -= cnt; |
| 311 | spin_unlock(&c->orphan_lock); | 311 | spin_unlock(&c->orphan_lock); |
| 312 | if (c->cmt_orphans) | 312 | if (c->cmt_orphans) |
| 313 | orph->cmt_no = cpu_to_le64(c->cmt_no + 1); | 313 | orph->cmt_no = cpu_to_le64(c->cmt_no); |
| 314 | else | 314 | else |
| 315 | /* Mark the last node of the commit */ | 315 | /* Mark the last node of the commit */ |
| 316 | orph->cmt_no = cpu_to_le64((c->cmt_no + 1) | (1ULL << 63)); | 316 | orph->cmt_no = cpu_to_le64((c->cmt_no) | (1ULL << 63)); |
| 317 | ubifs_assert(c->ohead_offs + len <= c->leb_size); | 317 | ubifs_assert(c->ohead_offs + len <= c->leb_size); |
| 318 | ubifs_assert(c->ohead_lnum >= c->orph_first); | 318 | ubifs_assert(c->ohead_lnum >= c->orph_first); |
| 319 | ubifs_assert(c->ohead_lnum <= c->orph_last); | 319 | ubifs_assert(c->ohead_lnum <= c->orph_last); |
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c index ca1e2d4e03cc..f71e6b8822c4 100644 --- a/fs/ubifs/super.c +++ b/fs/ubifs/super.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | #include <linux/slab.h> | 30 | #include <linux/slab.h> |
| 31 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 32 | #include <linux/ctype.h> | 32 | #include <linux/ctype.h> |
| 33 | #include <linux/random.h> | ||
| 34 | #include <linux/kthread.h> | 33 | #include <linux/kthread.h> |
| 35 | #include <linux/parser.h> | 34 | #include <linux/parser.h> |
| 36 | #include <linux/seq_file.h> | 35 | #include <linux/seq_file.h> |
| @@ -149,7 +148,7 @@ struct inode *ubifs_iget(struct super_block *sb, unsigned long inum) | |||
| 149 | if (err) | 148 | if (err) |
| 150 | goto out_invalid; | 149 | goto out_invalid; |
| 151 | 150 | ||
| 152 | /* Disable readahead */ | 151 | /* Disable read-ahead */ |
| 153 | inode->i_mapping->backing_dev_info = &c->bdi; | 152 | inode->i_mapping->backing_dev_info = &c->bdi; |
| 154 | 153 | ||
| 155 | switch (inode->i_mode & S_IFMT) { | 154 | switch (inode->i_mode & S_IFMT) { |
| @@ -278,7 +277,7 @@ static void ubifs_destroy_inode(struct inode *inode) | |||
| 278 | */ | 277 | */ |
| 279 | static int ubifs_write_inode(struct inode *inode, int wait) | 278 | static int ubifs_write_inode(struct inode *inode, int wait) |
| 280 | { | 279 | { |
| 281 | int err; | 280 | int err = 0; |
| 282 | struct ubifs_info *c = inode->i_sb->s_fs_info; | 281 | struct ubifs_info *c = inode->i_sb->s_fs_info; |
| 283 | struct ubifs_inode *ui = ubifs_inode(inode); | 282 | struct ubifs_inode *ui = ubifs_inode(inode); |
| 284 | 283 | ||
| @@ -299,10 +298,18 @@ static int ubifs_write_inode(struct inode *inode, int wait) | |||
| 299 | return 0; | 298 | return 0; |
| 300 | } | 299 | } |
| 301 | 300 | ||
| 302 | dbg_gen("inode %lu", inode->i_ino); | 301 | /* |
| 303 | err = ubifs_jnl_write_inode(c, inode, 0); | 302 | * As an optimization, do not write orphan inodes to the media just |
| 304 | if (err) | 303 | * because this is not needed. |
| 305 | ubifs_err("can't write inode %lu, error %d", inode->i_ino, err); | 304 | */ |
| 305 | dbg_gen("inode %lu, mode %#x, nlink %u", | ||
| 306 | inode->i_ino, (int)inode->i_mode, inode->i_nlink); | ||
| 307 | if (inode->i_nlink) { | ||
| 308 | err = ubifs_jnl_write_inode(c, inode); | ||
| 309 | if (err) | ||
| 310 | ubifs_err("can't write inode %lu, error %d", | ||
| 311 | inode->i_ino, err); | ||
| 312 | } | ||
| 306 | 313 | ||
| 307 | ui->dirty = 0; | 314 | ui->dirty = 0; |
| 308 | mutex_unlock(&ui->ui_mutex); | 315 | mutex_unlock(&ui->ui_mutex); |
| @@ -314,8 +321,9 @@ static void ubifs_delete_inode(struct inode *inode) | |||
| 314 | { | 321 | { |
| 315 | int err; | 322 | int err; |
| 316 | struct ubifs_info *c = inode->i_sb->s_fs_info; | 323 | struct ubifs_info *c = inode->i_sb->s_fs_info; |
| 324 | struct ubifs_inode *ui = ubifs_inode(inode); | ||
| 317 | 325 | ||
| 318 | if (ubifs_inode(inode)->xattr) | 326 | if (ui->xattr) |
| 319 | /* | 327 | /* |
| 320 | * Extended attribute inode deletions are fully handled in | 328 | * Extended attribute inode deletions are fully handled in |
| 321 | * 'ubifs_removexattr()'. These inodes are special and have | 329 | * 'ubifs_removexattr()'. These inodes are special and have |
| @@ -323,7 +331,7 @@ static void ubifs_delete_inode(struct inode *inode) | |||
| 323 | */ | 331 | */ |
| 324 | goto out; | 332 | goto out; |
| 325 | 333 | ||
| 326 | dbg_gen("inode %lu", inode->i_ino); | 334 | dbg_gen("inode %lu, mode %#x", inode->i_ino, (int)inode->i_mode); |
| 327 | ubifs_assert(!atomic_read(&inode->i_count)); | 335 | ubifs_assert(!atomic_read(&inode->i_count)); |
| 328 | ubifs_assert(inode->i_nlink == 0); | 336 | ubifs_assert(inode->i_nlink == 0); |
| 329 | 337 | ||
| @@ -331,15 +339,19 @@ static void ubifs_delete_inode(struct inode *inode) | |||
| 331 | if (is_bad_inode(inode)) | 339 | if (is_bad_inode(inode)) |
| 332 | goto out; | 340 | goto out; |
| 333 | 341 | ||
| 334 | ubifs_inode(inode)->ui_size = inode->i_size = 0; | 342 | ui->ui_size = inode->i_size = 0; |
| 335 | err = ubifs_jnl_write_inode(c, inode, 1); | 343 | err = ubifs_jnl_delete_inode(c, inode); |
| 336 | if (err) | 344 | if (err) |
| 337 | /* | 345 | /* |
| 338 | * Worst case we have a lost orphan inode wasting space, so a | 346 | * Worst case we have a lost orphan inode wasting space, so a |
| 339 | * simple error message is ok here. | 347 | * simple error message is OK here. |
| 340 | */ | 348 | */ |
| 341 | ubifs_err("can't write inode %lu, error %d", inode->i_ino, err); | 349 | ubifs_err("can't delete inode %lu, error %d", |
| 350 | inode->i_ino, err); | ||
| 351 | |||
| 342 | out: | 352 | out: |
| 353 | if (ui->dirty) | ||
| 354 | ubifs_release_dirty_inode_budget(c, ui); | ||
| 343 | clear_inode(inode); | 355 | clear_inode(inode); |
| 344 | } | 356 | } |
| 345 | 357 | ||
| @@ -1122,8 +1134,8 @@ static int mount_ubifs(struct ubifs_info *c) | |||
| 1122 | if (err) | 1134 | if (err) |
| 1123 | goto out_infos; | 1135 | goto out_infos; |
| 1124 | 1136 | ||
| 1125 | ubifs_msg("mounted UBI device %d, volume %d", c->vi.ubi_num, | 1137 | ubifs_msg("mounted UBI device %d, volume %d, name \"%s\"", |
| 1126 | c->vi.vol_id); | 1138 | c->vi.ubi_num, c->vi.vol_id, c->vi.name); |
| 1127 | if (mounted_read_only) | 1139 | if (mounted_read_only) |
| 1128 | ubifs_msg("mounted read-only"); | 1140 | ubifs_msg("mounted read-only"); |
| 1129 | x = (long long)c->main_lebs * c->leb_size; | 1141 | x = (long long)c->main_lebs * c->leb_size; |
| @@ -1469,6 +1481,7 @@ static void ubifs_put_super(struct super_block *sb) | |||
| 1469 | */ | 1481 | */ |
| 1470 | ubifs_assert(atomic_long_read(&c->dirty_pg_cnt) == 0); | 1482 | ubifs_assert(atomic_long_read(&c->dirty_pg_cnt) == 0); |
| 1471 | ubifs_assert(c->budg_idx_growth == 0); | 1483 | ubifs_assert(c->budg_idx_growth == 0); |
| 1484 | ubifs_assert(c->budg_dd_growth == 0); | ||
| 1472 | ubifs_assert(c->budg_data_growth == 0); | 1485 | ubifs_assert(c->budg_data_growth == 0); |
| 1473 | 1486 | ||
| 1474 | /* | 1487 | /* |
| @@ -1657,7 +1670,6 @@ static int ubifs_fill_super(struct super_block *sb, void *data, int silent) | |||
| 1657 | INIT_LIST_HEAD(&c->orph_new); | 1670 | INIT_LIST_HEAD(&c->orph_new); |
| 1658 | 1671 | ||
| 1659 | c->highest_inum = UBIFS_FIRST_INO; | 1672 | c->highest_inum = UBIFS_FIRST_INO; |
| 1660 | get_random_bytes(&c->vfs_gen, sizeof(int)); | ||
| 1661 | c->lhead_lnum = c->ltail_lnum = UBIFS_LOG_LNUM; | 1673 | c->lhead_lnum = c->ltail_lnum = UBIFS_LOG_LNUM; |
| 1662 | 1674 | ||
| 1663 | ubi_get_volume_info(ubi, &c->vi); | 1675 | ubi_get_volume_info(ubi, &c->vi); |
| @@ -1671,10 +1683,10 @@ static int ubifs_fill_super(struct super_block *sb, void *data, int silent) | |||
| 1671 | } | 1683 | } |
| 1672 | 1684 | ||
| 1673 | /* | 1685 | /* |
| 1674 | * UBIFS provids 'backing_dev_info' in order to disable readahead. For | 1686 | * UBIFS provides 'backing_dev_info' in order to disable read-ahead. For |
| 1675 | * UBIFS, I/O is not deferred, it is done immediately in readpage, | 1687 | * UBIFS, I/O is not deferred, it is done immediately in readpage, |
| 1676 | * which means the user would have to wait not just for their own I/O | 1688 | * which means the user would have to wait not just for their own I/O |
| 1677 | * but the readahead I/O as well i.e. completely pointless. | 1689 | * but the read-ahead I/O as well i.e. completely pointless. |
| 1678 | * | 1690 | * |
| 1679 | * Read-ahead will be disabled because @c->bdi.ra_pages is 0. | 1691 | * Read-ahead will be disabled because @c->bdi.ra_pages is 0. |
| 1680 | */ | 1692 | */ |
diff --git a/fs/ubifs/tnc_commit.c b/fs/ubifs/tnc_commit.c index 8117e65ba2e9..8ac76b1c2d55 100644 --- a/fs/ubifs/tnc_commit.c +++ b/fs/ubifs/tnc_commit.c | |||
| @@ -372,26 +372,25 @@ static int layout_in_gaps(struct ubifs_info *c, int cnt) | |||
| 372 | written = layout_leb_in_gaps(c, p); | 372 | written = layout_leb_in_gaps(c, p); |
| 373 | if (written < 0) { | 373 | if (written < 0) { |
| 374 | err = written; | 374 | err = written; |
| 375 | if (err == -ENOSPC) { | 375 | if (err != -ENOSPC) { |
| 376 | if (!dbg_force_in_the_gaps_enabled) { | 376 | kfree(c->gap_lebs); |
| 377 | /* | 377 | c->gap_lebs = NULL; |
| 378 | * Do not print scary warnings if the | 378 | return err; |
| 379 | * debugging option which forces | ||
| 380 | * in-the-gaps is enabled. | ||
| 381 | */ | ||
| 382 | ubifs_err("out of space"); | ||
| 383 | spin_lock(&c->space_lock); | ||
| 384 | dbg_dump_budg(c); | ||
| 385 | spin_unlock(&c->space_lock); | ||
| 386 | dbg_dump_lprops(c); | ||
| 387 | } | ||
| 388 | /* Try to commit anyway */ | ||
| 389 | err = 0; | ||
| 390 | break; | ||
| 391 | } | 379 | } |
| 392 | kfree(c->gap_lebs); | 380 | if (!dbg_force_in_the_gaps_enabled) { |
| 393 | c->gap_lebs = NULL; | 381 | /* |
| 394 | return err; | 382 | * Do not print scary warnings if the debugging |
| 383 | * option which forces in-the-gaps is enabled. | ||
| 384 | */ | ||
| 385 | ubifs_err("out of space"); | ||
| 386 | spin_lock(&c->space_lock); | ||
| 387 | dbg_dump_budg(c); | ||
| 388 | spin_unlock(&c->space_lock); | ||
| 389 | dbg_dump_lprops(c); | ||
| 390 | } | ||
| 391 | /* Try to commit anyway */ | ||
| 392 | err = 0; | ||
| 393 | break; | ||
| 395 | } | 394 | } |
| 396 | p++; | 395 | p++; |
| 397 | cnt -= written; | 396 | cnt -= written; |
diff --git a/fs/ubifs/ubifs-media.h b/fs/ubifs/ubifs-media.h index 0cc7da9bed47..bd2121f3426e 100644 --- a/fs/ubifs/ubifs-media.h +++ b/fs/ubifs/ubifs-media.h | |||
| @@ -228,10 +228,10 @@ enum { | |||
| 228 | /* Minimum number of orphan area logical eraseblocks */ | 228 | /* Minimum number of orphan area logical eraseblocks */ |
| 229 | #define UBIFS_MIN_ORPH_LEBS 1 | 229 | #define UBIFS_MIN_ORPH_LEBS 1 |
| 230 | /* | 230 | /* |
| 231 | * Minimum number of main area logical eraseblocks (buds, 2 for the index, 1 | 231 | * Minimum number of main area logical eraseblocks (buds, 3 for the index, 1 |
| 232 | * for GC, 1 for deletions, and at least 1 for committed data). | 232 | * for GC, 1 for deletions, and at least 1 for committed data). |
| 233 | */ | 233 | */ |
| 234 | #define UBIFS_MIN_MAIN_LEBS (UBIFS_MIN_BUD_LEBS + 5) | 234 | #define UBIFS_MIN_MAIN_LEBS (UBIFS_MIN_BUD_LEBS + 6) |
| 235 | 235 | ||
| 236 | /* Minimum number of logical eraseblocks */ | 236 | /* Minimum number of logical eraseblocks */ |
| 237 | #define UBIFS_MIN_LEB_CNT (UBIFS_SB_LEBS + UBIFS_MST_LEBS + \ | 237 | #define UBIFS_MIN_LEB_CNT (UBIFS_SB_LEBS + UBIFS_MST_LEBS + \ |
diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h index e4f89f271827..d7f706f7a302 100644 --- a/fs/ubifs/ubifs.h +++ b/fs/ubifs/ubifs.h | |||
| @@ -20,8 +20,6 @@ | |||
| 20 | * Adrian Hunter | 20 | * Adrian Hunter |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | /* Implementation version 0.7 */ | ||
| 24 | |||
| 25 | #ifndef __UBIFS_H__ | 23 | #ifndef __UBIFS_H__ |
| 26 | #define __UBIFS_H__ | 24 | #define __UBIFS_H__ |
| 27 | 25 | ||
| @@ -322,6 +320,8 @@ struct ubifs_gced_idx_leb { | |||
| 322 | * struct ubifs_inode - UBIFS in-memory inode description. | 320 | * struct ubifs_inode - UBIFS in-memory inode description. |
| 323 | * @vfs_inode: VFS inode description object | 321 | * @vfs_inode: VFS inode description object |
| 324 | * @creat_sqnum: sequence number at time of creation | 322 | * @creat_sqnum: sequence number at time of creation |
| 323 | * @del_cmtno: commit number corresponding to the time the inode was deleted, | ||
| 324 | * protected by @c->commit_sem; | ||
| 325 | * @xattr_size: summarized size of all extended attributes in bytes | 325 | * @xattr_size: summarized size of all extended attributes in bytes |
| 326 | * @xattr_cnt: count of extended attributes this inode has | 326 | * @xattr_cnt: count of extended attributes this inode has |
| 327 | * @xattr_names: sum of lengths of all extended attribute names belonging to | 327 | * @xattr_names: sum of lengths of all extended attribute names belonging to |
| @@ -373,6 +373,7 @@ struct ubifs_gced_idx_leb { | |||
| 373 | struct ubifs_inode { | 373 | struct ubifs_inode { |
| 374 | struct inode vfs_inode; | 374 | struct inode vfs_inode; |
| 375 | unsigned long long creat_sqnum; | 375 | unsigned long long creat_sqnum; |
| 376 | unsigned long long del_cmtno; | ||
| 376 | unsigned int xattr_size; | 377 | unsigned int xattr_size; |
| 377 | unsigned int xattr_cnt; | 378 | unsigned int xattr_cnt; |
| 378 | unsigned int xattr_names; | 379 | unsigned int xattr_names; |
| @@ -779,7 +780,7 @@ struct ubifs_compressor { | |||
| 779 | /** | 780 | /** |
| 780 | * struct ubifs_budget_req - budget requirements of an operation. | 781 | * struct ubifs_budget_req - budget requirements of an operation. |
| 781 | * | 782 | * |
| 782 | * @fast: non-zero if the budgeting should try to aquire budget quickly and | 783 | * @fast: non-zero if the budgeting should try to acquire budget quickly and |
| 783 | * should not try to call write-back | 784 | * should not try to call write-back |
| 784 | * @recalculate: non-zero if @idx_growth, @data_growth, and @dd_growth fields | 785 | * @recalculate: non-zero if @idx_growth, @data_growth, and @dd_growth fields |
| 785 | * have to be re-calculated | 786 | * have to be re-calculated |
| @@ -805,21 +806,31 @@ struct ubifs_compressor { | |||
| 805 | * An inode may contain 4KiB of data at max., thus the widths of @new_ino_d | 806 | * An inode may contain 4KiB of data at max., thus the widths of @new_ino_d |
| 806 | * is 13 bits, and @dirtied_ino_d - 15, because up to 4 inodes may be made | 807 | * is 13 bits, and @dirtied_ino_d - 15, because up to 4 inodes may be made |
| 807 | * dirty by the re-name operation. | 808 | * dirty by the re-name operation. |
| 809 | * | ||
| 810 | * Note, UBIFS aligns node lengths to 8-bytes boundary, so the requester has to | ||
| 811 | * make sure the amount of inode data which contribute to @new_ino_d and | ||
| 812 | * @dirtied_ino_d fields are aligned. | ||
| 808 | */ | 813 | */ |
| 809 | struct ubifs_budget_req { | 814 | struct ubifs_budget_req { |
| 810 | unsigned int fast:1; | 815 | unsigned int fast:1; |
| 811 | unsigned int recalculate:1; | 816 | unsigned int recalculate:1; |
| 817 | #ifndef UBIFS_DEBUG | ||
| 812 | unsigned int new_page:1; | 818 | unsigned int new_page:1; |
| 813 | unsigned int dirtied_page:1; | 819 | unsigned int dirtied_page:1; |
| 814 | unsigned int new_dent:1; | 820 | unsigned int new_dent:1; |
| 815 | unsigned int mod_dent:1; | 821 | unsigned int mod_dent:1; |
| 816 | unsigned int new_ino:1; | 822 | unsigned int new_ino:1; |
| 817 | unsigned int new_ino_d:13; | 823 | unsigned int new_ino_d:13; |
| 818 | #ifndef UBIFS_DEBUG | ||
| 819 | unsigned int dirtied_ino:4; | 824 | unsigned int dirtied_ino:4; |
| 820 | unsigned int dirtied_ino_d:15; | 825 | unsigned int dirtied_ino_d:15; |
| 821 | #else | 826 | #else |
| 822 | /* Not bit-fields to check for overflows */ | 827 | /* Not bit-fields to check for overflows */ |
| 828 | unsigned int new_page; | ||
| 829 | unsigned int dirtied_page; | ||
| 830 | unsigned int new_dent; | ||
| 831 | unsigned int mod_dent; | ||
| 832 | unsigned int new_ino; | ||
| 833 | unsigned int new_ino_d; | ||
| 823 | unsigned int dirtied_ino; | 834 | unsigned int dirtied_ino; |
| 824 | unsigned int dirtied_ino_d; | 835 | unsigned int dirtied_ino_d; |
| 825 | #endif | 836 | #endif |
| @@ -860,13 +871,13 @@ struct ubifs_mount_opts { | |||
| 860 | * struct ubifs_info - UBIFS file-system description data structure | 871 | * struct ubifs_info - UBIFS file-system description data structure |
| 861 | * (per-superblock). | 872 | * (per-superblock). |
| 862 | * @vfs_sb: VFS @struct super_block object | 873 | * @vfs_sb: VFS @struct super_block object |
| 863 | * @bdi: backing device info object to make VFS happy and disable readahead | 874 | * @bdi: backing device info object to make VFS happy and disable read-ahead |
| 864 | * | 875 | * |
| 865 | * @highest_inum: highest used inode number | 876 | * @highest_inum: highest used inode number |
| 866 | * @vfs_gen: VFS inode generation counter | ||
| 867 | * @max_sqnum: current global sequence number | 877 | * @max_sqnum: current global sequence number |
| 868 | * @cmt_no: commit number (last successfully completed commit) | 878 | * @cmt_no: commit number of the last successfully completed commit, protected |
| 869 | * @cnt_lock: protects @highest_inum, @vfs_gen, and @max_sqnum counters | 879 | * by @commit_sem |
| 880 | * @cnt_lock: protects @highest_inum and @max_sqnum counters | ||
| 870 | * @fmt_version: UBIFS on-flash format version | 881 | * @fmt_version: UBIFS on-flash format version |
| 871 | * @uuid: UUID from super block | 882 | * @uuid: UUID from super block |
| 872 | * | 883 | * |
| @@ -1103,7 +1114,6 @@ struct ubifs_info { | |||
| 1103 | struct backing_dev_info bdi; | 1114 | struct backing_dev_info bdi; |
| 1104 | 1115 | ||
| 1105 | ino_t highest_inum; | 1116 | ino_t highest_inum; |
| 1106 | unsigned int vfs_gen; | ||
| 1107 | unsigned long long max_sqnum; | 1117 | unsigned long long max_sqnum; |
| 1108 | unsigned long long cmt_no; | 1118 | unsigned long long cmt_no; |
| 1109 | spinlock_t cnt_lock; | 1119 | spinlock_t cnt_lock; |
| @@ -1346,6 +1356,7 @@ extern struct backing_dev_info ubifs_backing_dev_info; | |||
| 1346 | extern struct ubifs_compressor *ubifs_compressors[UBIFS_COMPR_TYPES_CNT]; | 1356 | extern struct ubifs_compressor *ubifs_compressors[UBIFS_COMPR_TYPES_CNT]; |
| 1347 | 1357 | ||
| 1348 | /* io.c */ | 1358 | /* io.c */ |
| 1359 | void ubifs_ro_mode(struct ubifs_info *c, int err); | ||
| 1349 | int ubifs_wbuf_write_nolock(struct ubifs_wbuf *wbuf, void *buf, int len); | 1360 | int ubifs_wbuf_write_nolock(struct ubifs_wbuf *wbuf, void *buf, int len); |
| 1350 | int ubifs_wbuf_seek_nolock(struct ubifs_wbuf *wbuf, int lnum, int offs, | 1361 | int ubifs_wbuf_seek_nolock(struct ubifs_wbuf *wbuf, int lnum, int offs, |
| 1351 | int dtype); | 1362 | int dtype); |
| @@ -1399,8 +1410,8 @@ int ubifs_jnl_update(struct ubifs_info *c, const struct inode *dir, | |||
| 1399 | int deletion, int xent); | 1410 | int deletion, int xent); |
| 1400 | int ubifs_jnl_write_data(struct ubifs_info *c, const struct inode *inode, | 1411 | int ubifs_jnl_write_data(struct ubifs_info *c, const struct inode *inode, |
| 1401 | const union ubifs_key *key, const void *buf, int len); | 1412 | const union ubifs_key *key, const void *buf, int len); |
| 1402 | int ubifs_jnl_write_inode(struct ubifs_info *c, const struct inode *inode, | 1413 | int ubifs_jnl_write_inode(struct ubifs_info *c, const struct inode *inode); |
| 1403 | int last_reference); | 1414 | int ubifs_jnl_delete_inode(struct ubifs_info *c, const struct inode *inode); |
| 1404 | int ubifs_jnl_rename(struct ubifs_info *c, const struct inode *old_dir, | 1415 | int ubifs_jnl_rename(struct ubifs_info *c, const struct inode *old_dir, |
| 1405 | const struct dentry *old_dentry, | 1416 | const struct dentry *old_dentry, |
| 1406 | const struct inode *new_dir, | 1417 | const struct inode *new_dir, |
diff --git a/fs/ubifs/xattr.c b/fs/ubifs/xattr.c index 1388a078e1a9..649bec78b645 100644 --- a/fs/ubifs/xattr.c +++ b/fs/ubifs/xattr.c | |||
| @@ -61,7 +61,7 @@ | |||
| 61 | 61 | ||
| 62 | /* | 62 | /* |
| 63 | * Limit the number of extended attributes per inode so that the total size | 63 | * Limit the number of extended attributes per inode so that the total size |
| 64 | * (xattr_size) is guaranteeded to fit in an 'unsigned int'. | 64 | * (@xattr_size) is guaranteeded to fit in an 'unsigned int'. |
| 65 | */ | 65 | */ |
| 66 | #define MAX_XATTRS_PER_INODE 65535 | 66 | #define MAX_XATTRS_PER_INODE 65535 |
| 67 | 67 | ||
| @@ -103,14 +103,14 @@ static int create_xattr(struct ubifs_info *c, struct inode *host, | |||
| 103 | struct inode *inode; | 103 | struct inode *inode; |
| 104 | struct ubifs_inode *ui, *host_ui = ubifs_inode(host); | 104 | struct ubifs_inode *ui, *host_ui = ubifs_inode(host); |
| 105 | struct ubifs_budget_req req = { .new_ino = 1, .new_dent = 1, | 105 | struct ubifs_budget_req req = { .new_ino = 1, .new_dent = 1, |
| 106 | .new_ino_d = size, .dirtied_ino = 1, | 106 | .new_ino_d = ALIGN(size, 8), .dirtied_ino = 1, |
| 107 | .dirtied_ino_d = host_ui->data_len}; | 107 | .dirtied_ino_d = ALIGN(host_ui->data_len, 8) }; |
| 108 | 108 | ||
| 109 | if (host_ui->xattr_cnt >= MAX_XATTRS_PER_INODE) | 109 | if (host_ui->xattr_cnt >= MAX_XATTRS_PER_INODE) |
| 110 | return -ENOSPC; | 110 | return -ENOSPC; |
| 111 | /* | 111 | /* |
| 112 | * Linux limits the maximum size of the extended attribute names list | 112 | * Linux limits the maximum size of the extended attribute names list |
| 113 | * to %XATTR_LIST_MAX. This means we should not allow creating more* | 113 | * to %XATTR_LIST_MAX. This means we should not allow creating more |
| 114 | * extended attributes if the name list becomes larger. This limitation | 114 | * extended attributes if the name list becomes larger. This limitation |
| 115 | * is artificial for UBIFS, though. | 115 | * is artificial for UBIFS, though. |
| 116 | */ | 116 | */ |
| @@ -128,7 +128,6 @@ static int create_xattr(struct ubifs_info *c, struct inode *host, | |||
| 128 | goto out_budg; | 128 | goto out_budg; |
| 129 | } | 129 | } |
| 130 | 130 | ||
| 131 | mutex_lock(&host_ui->ui_mutex); | ||
| 132 | /* Re-define all operations to be "nothing" */ | 131 | /* Re-define all operations to be "nothing" */ |
| 133 | inode->i_mapping->a_ops = &none_address_operations; | 132 | inode->i_mapping->a_ops = &none_address_operations; |
| 134 | inode->i_op = &none_inode_operations; | 133 | inode->i_op = &none_inode_operations; |
| @@ -141,23 +140,19 @@ static int create_xattr(struct ubifs_info *c, struct inode *host, | |||
| 141 | ui->data = kmalloc(size, GFP_NOFS); | 140 | ui->data = kmalloc(size, GFP_NOFS); |
| 142 | if (!ui->data) { | 141 | if (!ui->data) { |
| 143 | err = -ENOMEM; | 142 | err = -ENOMEM; |
| 144 | goto out_unlock; | 143 | goto out_free; |
| 145 | } | 144 | } |
| 146 | |||
| 147 | memcpy(ui->data, value, size); | 145 | memcpy(ui->data, value, size); |
| 146 | inode->i_size = ui->ui_size = size; | ||
| 147 | ui->data_len = size; | ||
| 148 | |||
| 149 | mutex_lock(&host_ui->ui_mutex); | ||
| 148 | host->i_ctime = ubifs_current_time(host); | 150 | host->i_ctime = ubifs_current_time(host); |
| 149 | host_ui->xattr_cnt += 1; | 151 | host_ui->xattr_cnt += 1; |
| 150 | host_ui->xattr_size += CALC_DENT_SIZE(nm->len); | 152 | host_ui->xattr_size += CALC_DENT_SIZE(nm->len); |
| 151 | host_ui->xattr_size += CALC_XATTR_BYTES(size); | 153 | host_ui->xattr_size += CALC_XATTR_BYTES(size); |
| 152 | host_ui->xattr_names += nm->len; | 154 | host_ui->xattr_names += nm->len; |
| 153 | 155 | ||
| 154 | /* | ||
| 155 | * We do not use i_size_write() because nobody can race with us as we | ||
| 156 | * are holding host @host->i_mutex - every xattr operation for this | ||
| 157 | * inode is serialized by it. | ||
| 158 | */ | ||
| 159 | inode->i_size = ui->ui_size = size; | ||
| 160 | ui->data_len = size; | ||
| 161 | err = ubifs_jnl_update(c, host, nm, inode, 0, 1); | 156 | err = ubifs_jnl_update(c, host, nm, inode, 0, 1); |
| 162 | if (err) | 157 | if (err) |
| 163 | goto out_cancel; | 158 | goto out_cancel; |
| @@ -172,8 +167,8 @@ out_cancel: | |||
| 172 | host_ui->xattr_cnt -= 1; | 167 | host_ui->xattr_cnt -= 1; |
| 173 | host_ui->xattr_size -= CALC_DENT_SIZE(nm->len); | 168 | host_ui->xattr_size -= CALC_DENT_SIZE(nm->len); |
| 174 | host_ui->xattr_size -= CALC_XATTR_BYTES(size); | 169 | host_ui->xattr_size -= CALC_XATTR_BYTES(size); |
| 175 | out_unlock: | ||
| 176 | mutex_unlock(&host_ui->ui_mutex); | 170 | mutex_unlock(&host_ui->ui_mutex); |
| 171 | out_free: | ||
| 177 | make_bad_inode(inode); | 172 | make_bad_inode(inode); |
| 178 | iput(inode); | 173 | iput(inode); |
| 179 | out_budg: | 174 | out_budg: |
| @@ -200,29 +195,28 @@ static int change_xattr(struct ubifs_info *c, struct inode *host, | |||
| 200 | struct ubifs_inode *host_ui = ubifs_inode(host); | 195 | struct ubifs_inode *host_ui = ubifs_inode(host); |
| 201 | struct ubifs_inode *ui = ubifs_inode(inode); | 196 | struct ubifs_inode *ui = ubifs_inode(inode); |
| 202 | struct ubifs_budget_req req = { .dirtied_ino = 2, | 197 | struct ubifs_budget_req req = { .dirtied_ino = 2, |
| 203 | .dirtied_ino_d = size + host_ui->data_len }; | 198 | .dirtied_ino_d = ALIGN(size, 8) + ALIGN(host_ui->data_len, 8) }; |
| 204 | 199 | ||
| 205 | ubifs_assert(ui->data_len == inode->i_size); | 200 | ubifs_assert(ui->data_len == inode->i_size); |
| 206 | err = ubifs_budget_space(c, &req); | 201 | err = ubifs_budget_space(c, &req); |
| 207 | if (err) | 202 | if (err) |
| 208 | return err; | 203 | return err; |
| 209 | 204 | ||
| 210 | mutex_lock(&host_ui->ui_mutex); | ||
| 211 | host->i_ctime = ubifs_current_time(host); | ||
| 212 | host_ui->xattr_size -= CALC_XATTR_BYTES(ui->data_len); | ||
| 213 | host_ui->xattr_size += CALC_XATTR_BYTES(size); | ||
| 214 | |||
| 215 | kfree(ui->data); | 205 | kfree(ui->data); |
| 216 | ui->data = kmalloc(size, GFP_NOFS); | 206 | ui->data = kmalloc(size, GFP_NOFS); |
| 217 | if (!ui->data) { | 207 | if (!ui->data) { |
| 218 | err = -ENOMEM; | 208 | err = -ENOMEM; |
| 219 | goto out_unlock; | 209 | goto out_free; |
| 220 | } | 210 | } |
| 221 | |||
| 222 | memcpy(ui->data, value, size); | 211 | memcpy(ui->data, value, size); |
| 223 | inode->i_size = ui->ui_size = size; | 212 | inode->i_size = ui->ui_size = size; |
| 224 | ui->data_len = size; | 213 | ui->data_len = size; |
| 225 | 214 | ||
| 215 | mutex_lock(&host_ui->ui_mutex); | ||
| 216 | host->i_ctime = ubifs_current_time(host); | ||
| 217 | host_ui->xattr_size -= CALC_XATTR_BYTES(ui->data_len); | ||
| 218 | host_ui->xattr_size += CALC_XATTR_BYTES(size); | ||
| 219 | |||
| 226 | /* | 220 | /* |
| 227 | * It is important to write the host inode after the xattr inode | 221 | * It is important to write the host inode after the xattr inode |
| 228 | * because if the host inode gets synchronized (via 'fsync()'), then | 222 | * because if the host inode gets synchronized (via 'fsync()'), then |
| @@ -240,9 +234,9 @@ static int change_xattr(struct ubifs_info *c, struct inode *host, | |||
| 240 | out_cancel: | 234 | out_cancel: |
| 241 | host_ui->xattr_size -= CALC_XATTR_BYTES(size); | 235 | host_ui->xattr_size -= CALC_XATTR_BYTES(size); |
| 242 | host_ui->xattr_size += CALC_XATTR_BYTES(ui->data_len); | 236 | host_ui->xattr_size += CALC_XATTR_BYTES(ui->data_len); |
| 243 | make_bad_inode(inode); | ||
| 244 | out_unlock: | ||
| 245 | mutex_unlock(&host_ui->ui_mutex); | 237 | mutex_unlock(&host_ui->ui_mutex); |
| 238 | make_bad_inode(inode); | ||
| 239 | out_free: | ||
| 246 | ubifs_release_budget(c, &req); | 240 | ubifs_release_budget(c, &req); |
| 247 | return err; | 241 | return err; |
| 248 | } | 242 | } |
| @@ -312,6 +306,7 @@ int ubifs_setxattr(struct dentry *dentry, const char *name, | |||
| 312 | 306 | ||
| 313 | dbg_gen("xattr '%s', host ino %lu ('%.*s'), size %zd", name, | 307 | dbg_gen("xattr '%s', host ino %lu ('%.*s'), size %zd", name, |
| 314 | host->i_ino, dentry->d_name.len, dentry->d_name.name, size); | 308 | host->i_ino, dentry->d_name.len, dentry->d_name.name, size); |
| 309 | ubifs_assert(mutex_is_locked(&host->i_mutex)); | ||
| 315 | 310 | ||
| 316 | if (size > UBIFS_MAX_INO_DATA) | 311 | if (size > UBIFS_MAX_INO_DATA) |
| 317 | return -ERANGE; | 312 | return -ERANGE; |
| @@ -384,7 +379,6 @@ ssize_t ubifs_getxattr(struct dentry *dentry, const char *name, void *buf, | |||
| 384 | if (!xent) | 379 | if (!xent) |
| 385 | return -ENOMEM; | 380 | return -ENOMEM; |
| 386 | 381 | ||
| 387 | mutex_lock(&host->i_mutex); | ||
| 388 | xent_key_init(c, &key, host->i_ino, &nm); | 382 | xent_key_init(c, &key, host->i_ino, &nm); |
| 389 | err = ubifs_tnc_lookup_nm(c, &key, xent, &nm); | 383 | err = ubifs_tnc_lookup_nm(c, &key, xent, &nm); |
| 390 | if (err) { | 384 | if (err) { |
| @@ -419,7 +413,6 @@ ssize_t ubifs_getxattr(struct dentry *dentry, const char *name, void *buf, | |||
| 419 | out_iput: | 413 | out_iput: |
| 420 | iput(inode); | 414 | iput(inode); |
| 421 | out_unlock: | 415 | out_unlock: |
| 422 | mutex_unlock(&host->i_mutex); | ||
| 423 | kfree(xent); | 416 | kfree(xent); |
| 424 | return err; | 417 | return err; |
| 425 | } | 418 | } |
| @@ -449,8 +442,6 @@ ssize_t ubifs_listxattr(struct dentry *dentry, char *buffer, size_t size) | |||
| 449 | return -ERANGE; | 442 | return -ERANGE; |
| 450 | 443 | ||
| 451 | lowest_xent_key(c, &key, host->i_ino); | 444 | lowest_xent_key(c, &key, host->i_ino); |
| 452 | |||
| 453 | mutex_lock(&host->i_mutex); | ||
| 454 | while (1) { | 445 | while (1) { |
| 455 | int type; | 446 | int type; |
| 456 | 447 | ||
| @@ -479,7 +470,6 @@ ssize_t ubifs_listxattr(struct dentry *dentry, char *buffer, size_t size) | |||
| 479 | pxent = xent; | 470 | pxent = xent; |
| 480 | key_read(c, &xent->key, &key); | 471 | key_read(c, &xent->key, &key); |
| 481 | } | 472 | } |
| 482 | mutex_unlock(&host->i_mutex); | ||
| 483 | 473 | ||
| 484 | kfree(pxent); | 474 | kfree(pxent); |
| 485 | if (err != -ENOENT) { | 475 | if (err != -ENOENT) { |
| @@ -497,8 +487,8 @@ static int remove_xattr(struct ubifs_info *c, struct inode *host, | |||
| 497 | int err; | 487 | int err; |
| 498 | struct ubifs_inode *host_ui = ubifs_inode(host); | 488 | struct ubifs_inode *host_ui = ubifs_inode(host); |
| 499 | struct ubifs_inode *ui = ubifs_inode(inode); | 489 | struct ubifs_inode *ui = ubifs_inode(inode); |
| 500 | struct ubifs_budget_req req = { .dirtied_ino = 1, .mod_dent = 1, | 490 | struct ubifs_budget_req req = { .dirtied_ino = 2, .mod_dent = 1, |
| 501 | .dirtied_ino_d = host_ui->data_len }; | 491 | .dirtied_ino_d = ALIGN(host_ui->data_len, 8) }; |
| 502 | 492 | ||
| 503 | ubifs_assert(ui->data_len == inode->i_size); | 493 | ubifs_assert(ui->data_len == inode->i_size); |
| 504 | 494 | ||
diff --git a/fs/xfs/linux-2.6/sema.h b/fs/xfs/linux-2.6/sema.h deleted file mode 100644 index 3abe7e9ceb33..000000000000 --- a/fs/xfs/linux-2.6/sema.h +++ /dev/null | |||
| @@ -1,52 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Copyright (c) 2000-2002,2005 Silicon Graphics, Inc. | ||
| 3 | * All Rights Reserved. | ||
| 4 | * | ||
| 5 | * This program is free software; you can redistribute it and/or | ||
| 6 | * modify it under the terms of the GNU General Public License as | ||
| 7 | * published by the Free Software Foundation. | ||
| 8 | * | ||
| 9 | * This program is distributed in the hope that it would be useful, | ||
| 10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 12 | * GNU General Public License for more details. | ||
| 13 | * | ||
| 14 | * You should have received a copy of the GNU General Public License | ||
| 15 | * along with this program; if not, write the Free Software Foundation, | ||
| 16 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | ||
| 17 | */ | ||
| 18 | #ifndef __XFS_SUPPORT_SEMA_H__ | ||
| 19 | #define __XFS_SUPPORT_SEMA_H__ | ||
| 20 | |||
| 21 | #include <linux/time.h> | ||
| 22 | #include <linux/wait.h> | ||
| 23 | #include <linux/semaphore.h> | ||
| 24 | #include <asm/atomic.h> | ||
| 25 | |||
| 26 | /* | ||
| 27 | * sema_t structure just maps to struct semaphore in Linux kernel. | ||
| 28 | */ | ||
| 29 | |||
| 30 | typedef struct semaphore sema_t; | ||
| 31 | |||
| 32 | #define initnsema(sp, val, name) sema_init(sp, val) | ||
| 33 | #define psema(sp, b) down(sp) | ||
| 34 | #define vsema(sp) up(sp) | ||
| 35 | #define freesema(sema) do { } while (0) | ||
| 36 | |||
| 37 | static inline int issemalocked(sema_t *sp) | ||
| 38 | { | ||
| 39 | return down_trylock(sp) || (up(sp), 0); | ||
| 40 | } | ||
| 41 | |||
| 42 | /* | ||
| 43 | * Map cpsema (try to get the sema) to down_trylock. We need to switch | ||
| 44 | * the return values since cpsema returns 1 (acquired) 0 (failed) and | ||
| 45 | * down_trylock returns the reverse 0 (acquired) 1 (failed). | ||
| 46 | */ | ||
| 47 | static inline int cpsema(sema_t *sp) | ||
| 48 | { | ||
| 49 | return down_trylock(sp) ? 0 : 1; | ||
| 50 | } | ||
| 51 | |||
| 52 | #endif /* __XFS_SUPPORT_SEMA_H__ */ | ||
diff --git a/fs/xfs/linux-2.6/xfs_aops.c b/fs/xfs/linux-2.6/xfs_aops.c index fa47e43b8b41..f42f80a3b1fa 100644 --- a/fs/xfs/linux-2.6/xfs_aops.c +++ b/fs/xfs/linux-2.6/xfs_aops.c | |||
| @@ -73,7 +73,6 @@ xfs_page_trace( | |||
| 73 | unsigned long pgoff) | 73 | unsigned long pgoff) |
| 74 | { | 74 | { |
| 75 | xfs_inode_t *ip; | 75 | xfs_inode_t *ip; |
| 76 | bhv_vnode_t *vp = vn_from_inode(inode); | ||
| 77 | loff_t isize = i_size_read(inode); | 76 | loff_t isize = i_size_read(inode); |
| 78 | loff_t offset = page_offset(page); | 77 | loff_t offset = page_offset(page); |
| 79 | int delalloc = -1, unmapped = -1, unwritten = -1; | 78 | int delalloc = -1, unmapped = -1, unwritten = -1; |
| @@ -81,7 +80,7 @@ xfs_page_trace( | |||
| 81 | if (page_has_buffers(page)) | 80 | if (page_has_buffers(page)) |
| 82 | xfs_count_page_state(page, &delalloc, &unmapped, &unwritten); | 81 | xfs_count_page_state(page, &delalloc, &unmapped, &unwritten); |
| 83 | 82 | ||
| 84 | ip = xfs_vtoi(vp); | 83 | ip = XFS_I(inode); |
| 85 | if (!ip->i_rwtrace) | 84 | if (!ip->i_rwtrace) |
| 86 | return; | 85 | return; |
| 87 | 86 | ||
diff --git a/fs/xfs/linux-2.6/xfs_buf.c b/fs/xfs/linux-2.6/xfs_buf.c index 9cc8f0213095..986061ae1b9b 100644 --- a/fs/xfs/linux-2.6/xfs_buf.c +++ b/fs/xfs/linux-2.6/xfs_buf.c | |||
| @@ -58,7 +58,7 @@ xfs_buf_trace( | |||
| 58 | bp, id, | 58 | bp, id, |
| 59 | (void *)(unsigned long)bp->b_flags, | 59 | (void *)(unsigned long)bp->b_flags, |
| 60 | (void *)(unsigned long)bp->b_hold.counter, | 60 | (void *)(unsigned long)bp->b_hold.counter, |
| 61 | (void *)(unsigned long)bp->b_sema.count.counter, | 61 | (void *)(unsigned long)bp->b_sema.count, |
| 62 | (void *)current, | 62 | (void *)current, |
| 63 | data, ra, | 63 | data, ra, |
| 64 | (void *)(unsigned long)((bp->b_file_offset>>32) & 0xffffffff), | 64 | (void *)(unsigned long)((bp->b_file_offset>>32) & 0xffffffff), |
| @@ -253,7 +253,7 @@ _xfs_buf_initialize( | |||
| 253 | 253 | ||
| 254 | memset(bp, 0, sizeof(xfs_buf_t)); | 254 | memset(bp, 0, sizeof(xfs_buf_t)); |
| 255 | atomic_set(&bp->b_hold, 1); | 255 | atomic_set(&bp->b_hold, 1); |
| 256 | init_MUTEX_LOCKED(&bp->b_iodonesema); | 256 | init_completion(&bp->b_iowait); |
| 257 | INIT_LIST_HEAD(&bp->b_list); | 257 | INIT_LIST_HEAD(&bp->b_list); |
| 258 | INIT_LIST_HEAD(&bp->b_hash_list); | 258 | INIT_LIST_HEAD(&bp->b_hash_list); |
| 259 | init_MUTEX_LOCKED(&bp->b_sema); /* held, no waiters */ | 259 | init_MUTEX_LOCKED(&bp->b_sema); /* held, no waiters */ |
| @@ -838,6 +838,7 @@ xfs_buf_rele( | |||
| 838 | return; | 838 | return; |
| 839 | } | 839 | } |
| 840 | 840 | ||
| 841 | ASSERT(atomic_read(&bp->b_hold) > 0); | ||
| 841 | if (atomic_dec_and_lock(&bp->b_hold, &hash->bh_lock)) { | 842 | if (atomic_dec_and_lock(&bp->b_hold, &hash->bh_lock)) { |
| 842 | if (bp->b_relse) { | 843 | if (bp->b_relse) { |
| 843 | atomic_inc(&bp->b_hold); | 844 | atomic_inc(&bp->b_hold); |
| @@ -851,11 +852,6 @@ xfs_buf_rele( | |||
| 851 | spin_unlock(&hash->bh_lock); | 852 | spin_unlock(&hash->bh_lock); |
| 852 | xfs_buf_free(bp); | 853 | xfs_buf_free(bp); |
| 853 | } | 854 | } |
| 854 | } else { | ||
| 855 | /* | ||
| 856 | * Catch reference count leaks | ||
| 857 | */ | ||
| 858 | ASSERT(atomic_read(&bp->b_hold) >= 0); | ||
| 859 | } | 855 | } |
| 860 | } | 856 | } |
| 861 | 857 | ||
| @@ -1037,7 +1033,7 @@ xfs_buf_ioend( | |||
| 1037 | xfs_buf_iodone_work(&bp->b_iodone_work); | 1033 | xfs_buf_iodone_work(&bp->b_iodone_work); |
| 1038 | } | 1034 | } |
| 1039 | } else { | 1035 | } else { |
| 1040 | up(&bp->b_iodonesema); | 1036 | complete(&bp->b_iowait); |
| 1041 | } | 1037 | } |
| 1042 | } | 1038 | } |
| 1043 | 1039 | ||
| @@ -1275,7 +1271,7 @@ xfs_buf_iowait( | |||
| 1275 | XB_TRACE(bp, "iowait", 0); | 1271 | XB_TRACE(bp, "iowait", 0); |
| 1276 | if (atomic_read(&bp->b_io_remaining)) | 1272 | if (atomic_read(&bp->b_io_remaining)) |
| 1277 | blk_run_address_space(bp->b_target->bt_mapping); | 1273 | blk_run_address_space(bp->b_target->bt_mapping); |
| 1278 | down(&bp->b_iodonesema); | 1274 | wait_for_completion(&bp->b_iowait); |
| 1279 | XB_TRACE(bp, "iowaited", (long)bp->b_error); | 1275 | XB_TRACE(bp, "iowaited", (long)bp->b_error); |
| 1280 | return bp->b_error; | 1276 | return bp->b_error; |
| 1281 | } | 1277 | } |
| @@ -1799,7 +1795,7 @@ int __init | |||
| 1799 | xfs_buf_init(void) | 1795 | xfs_buf_init(void) |
| 1800 | { | 1796 | { |
| 1801 | #ifdef XFS_BUF_TRACE | 1797 | #ifdef XFS_BUF_TRACE |
| 1802 | xfs_buf_trace_buf = ktrace_alloc(XFS_BUF_TRACE_SIZE, KM_SLEEP); | 1798 | xfs_buf_trace_buf = ktrace_alloc(XFS_BUF_TRACE_SIZE, KM_NOFS); |
| 1803 | #endif | 1799 | #endif |
| 1804 | 1800 | ||
| 1805 | xfs_buf_zone = kmem_zone_init_flags(sizeof(xfs_buf_t), "xfs_buf", | 1801 | xfs_buf_zone = kmem_zone_init_flags(sizeof(xfs_buf_t), "xfs_buf", |
diff --git a/fs/xfs/linux-2.6/xfs_buf.h b/fs/xfs/linux-2.6/xfs_buf.h index 29d1d4adc078..fe0109956656 100644 --- a/fs/xfs/linux-2.6/xfs_buf.h +++ b/fs/xfs/linux-2.6/xfs_buf.h | |||
| @@ -157,7 +157,7 @@ typedef struct xfs_buf { | |||
| 157 | xfs_buf_iodone_t b_iodone; /* I/O completion function */ | 157 | xfs_buf_iodone_t b_iodone; /* I/O completion function */ |
| 158 | xfs_buf_relse_t b_relse; /* releasing function */ | 158 | xfs_buf_relse_t b_relse; /* releasing function */ |
| 159 | xfs_buf_bdstrat_t b_strat; /* pre-write function */ | 159 | xfs_buf_bdstrat_t b_strat; /* pre-write function */ |
| 160 | struct semaphore b_iodonesema; /* Semaphore for I/O waiters */ | 160 | struct completion b_iowait; /* queue for I/O waiters */ |
| 161 | void *b_fspriv; | 161 | void *b_fspriv; |
| 162 | void *b_fspriv2; | 162 | void *b_fspriv2; |
| 163 | void *b_fspriv3; | 163 | void *b_fspriv3; |
| @@ -352,7 +352,7 @@ extern void xfs_buf_trace(xfs_buf_t *, char *, void *, void *); | |||
| 352 | #define XFS_BUF_CPSEMA(bp) (xfs_buf_cond_lock(bp) == 0) | 352 | #define XFS_BUF_CPSEMA(bp) (xfs_buf_cond_lock(bp) == 0) |
| 353 | #define XFS_BUF_VSEMA(bp) xfs_buf_unlock(bp) | 353 | #define XFS_BUF_VSEMA(bp) xfs_buf_unlock(bp) |
| 354 | #define XFS_BUF_PSEMA(bp,x) xfs_buf_lock(bp) | 354 | #define XFS_BUF_PSEMA(bp,x) xfs_buf_lock(bp) |
| 355 | #define XFS_BUF_V_IODONESEMA(bp) up(&bp->b_iodonesema); | 355 | #define XFS_BUF_FINISH_IOWAIT(bp) complete(&bp->b_iowait); |
| 356 | 356 | ||
| 357 | #define XFS_BUF_SET_TARGET(bp, target) ((bp)->b_target = (target)) | 357 | #define XFS_BUF_SET_TARGET(bp, target) ((bp)->b_target = (target)) |
| 358 | #define XFS_BUF_TARGET(bp) ((bp)->b_target) | 358 | #define XFS_BUF_TARGET(bp) ((bp)->b_target) |
diff --git a/fs/xfs/linux-2.6/xfs_export.c b/fs/xfs/linux-2.6/xfs_export.c index 987fe84f7b13..24fd598af846 100644 --- a/fs/xfs/linux-2.6/xfs_export.c +++ b/fs/xfs/linux-2.6/xfs_export.c | |||
| @@ -139,7 +139,7 @@ xfs_nfs_get_inode( | |||
| 139 | } | 139 | } |
| 140 | 140 | ||
| 141 | xfs_iunlock(ip, XFS_ILOCK_SHARED); | 141 | xfs_iunlock(ip, XFS_ILOCK_SHARED); |
| 142 | return ip->i_vnode; | 142 | return VFS_I(ip); |
| 143 | } | 143 | } |
| 144 | 144 | ||
| 145 | STATIC struct dentry * | 145 | STATIC struct dentry * |
| @@ -167,7 +167,7 @@ xfs_fs_fh_to_dentry(struct super_block *sb, struct fid *fid, | |||
| 167 | if (!inode) | 167 | if (!inode) |
| 168 | return NULL; | 168 | return NULL; |
| 169 | if (IS_ERR(inode)) | 169 | if (IS_ERR(inode)) |
| 170 | return ERR_PTR(PTR_ERR(inode)); | 170 | return ERR_CAST(inode); |
| 171 | result = d_alloc_anon(inode); | 171 | result = d_alloc_anon(inode); |
| 172 | if (!result) { | 172 | if (!result) { |
| 173 | iput(inode); | 173 | iput(inode); |
| @@ -198,7 +198,7 @@ xfs_fs_fh_to_parent(struct super_block *sb, struct fid *fid, | |||
| 198 | if (!inode) | 198 | if (!inode) |
| 199 | return NULL; | 199 | return NULL; |
| 200 | if (IS_ERR(inode)) | 200 | if (IS_ERR(inode)) |
| 201 | return ERR_PTR(PTR_ERR(inode)); | 201 | return ERR_CAST(inode); |
| 202 | result = d_alloc_anon(inode); | 202 | result = d_alloc_anon(inode); |
| 203 | if (!result) { | 203 | if (!result) { |
| 204 | iput(inode); | 204 | iput(inode); |
| @@ -219,9 +219,9 @@ xfs_fs_get_parent( | |||
| 219 | if (unlikely(error)) | 219 | if (unlikely(error)) |
| 220 | return ERR_PTR(-error); | 220 | return ERR_PTR(-error); |
| 221 | 221 | ||
| 222 | parent = d_alloc_anon(cip->i_vnode); | 222 | parent = d_alloc_anon(VFS_I(cip)); |
| 223 | if (unlikely(!parent)) { | 223 | if (unlikely(!parent)) { |
| 224 | iput(cip->i_vnode); | 224 | iput(VFS_I(cip)); |
| 225 | return ERR_PTR(-ENOMEM); | 225 | return ERR_PTR(-ENOMEM); |
| 226 | } | 226 | } |
| 227 | return parent; | 227 | return parent; |
diff --git a/fs/xfs/linux-2.6/xfs_file.c b/fs/xfs/linux-2.6/xfs_file.c index 5f60363b9343..5311c1acdd40 100644 --- a/fs/xfs/linux-2.6/xfs_file.c +++ b/fs/xfs/linux-2.6/xfs_file.c | |||
| @@ -475,6 +475,7 @@ const struct file_operations xfs_invis_file_operations = { | |||
| 475 | const struct file_operations xfs_dir_file_operations = { | 475 | const struct file_operations xfs_dir_file_operations = { |
| 476 | .read = generic_read_dir, | 476 | .read = generic_read_dir, |
| 477 | .readdir = xfs_file_readdir, | 477 | .readdir = xfs_file_readdir, |
| 478 | .llseek = generic_file_llseek, | ||
| 478 | .unlocked_ioctl = xfs_file_ioctl, | 479 | .unlocked_ioctl = xfs_file_ioctl, |
| 479 | #ifdef CONFIG_COMPAT | 480 | #ifdef CONFIG_COMPAT |
| 480 | .compat_ioctl = xfs_file_compat_ioctl, | 481 | .compat_ioctl = xfs_file_compat_ioctl, |
diff --git a/fs/xfs/linux-2.6/xfs_fs_subr.c b/fs/xfs/linux-2.6/xfs_fs_subr.c index 1eefe61f0e10..36caa6d957df 100644 --- a/fs/xfs/linux-2.6/xfs_fs_subr.c +++ b/fs/xfs/linux-2.6/xfs_fs_subr.c | |||
| @@ -31,7 +31,7 @@ xfs_tosspages( | |||
| 31 | xfs_off_t last, | 31 | xfs_off_t last, |
| 32 | int fiopt) | 32 | int fiopt) |
| 33 | { | 33 | { |
| 34 | struct address_space *mapping = ip->i_vnode->i_mapping; | 34 | struct address_space *mapping = VFS_I(ip)->i_mapping; |
| 35 | 35 | ||
| 36 | if (mapping->nrpages) | 36 | if (mapping->nrpages) |
| 37 | truncate_inode_pages(mapping, first); | 37 | truncate_inode_pages(mapping, first); |
| @@ -44,7 +44,7 @@ xfs_flushinval_pages( | |||
| 44 | xfs_off_t last, | 44 | xfs_off_t last, |
| 45 | int fiopt) | 45 | int fiopt) |
| 46 | { | 46 | { |
| 47 | struct address_space *mapping = ip->i_vnode->i_mapping; | 47 | struct address_space *mapping = VFS_I(ip)->i_mapping; |
| 48 | int ret = 0; | 48 | int ret = 0; |
| 49 | 49 | ||
| 50 | if (mapping->nrpages) { | 50 | if (mapping->nrpages) { |
| @@ -64,7 +64,7 @@ xfs_flush_pages( | |||
| 64 | uint64_t flags, | 64 | uint64_t flags, |
| 65 | int fiopt) | 65 | int fiopt) |
| 66 | { | 66 | { |
| 67 | struct address_space *mapping = ip->i_vnode->i_mapping; | 67 | struct address_space *mapping = VFS_I(ip)->i_mapping; |
| 68 | int ret = 0; | 68 | int ret = 0; |
| 69 | int ret2; | 69 | int ret2; |
| 70 | 70 | ||
diff --git a/fs/xfs/linux-2.6/xfs_ioctl.c b/fs/xfs/linux-2.6/xfs_ioctl.c index acb978d9d085..48799ba7e3e6 100644 --- a/fs/xfs/linux-2.6/xfs_ioctl.c +++ b/fs/xfs/linux-2.6/xfs_ioctl.c | |||
| @@ -245,7 +245,7 @@ xfs_vget_fsop_handlereq( | |||
| 245 | 245 | ||
| 246 | xfs_iunlock(ip, XFS_ILOCK_SHARED); | 246 | xfs_iunlock(ip, XFS_ILOCK_SHARED); |
| 247 | 247 | ||
| 248 | *inode = XFS_ITOV(ip); | 248 | *inode = VFS_I(ip); |
| 249 | return 0; | 249 | return 0; |
| 250 | } | 250 | } |
| 251 | 251 | ||
| @@ -927,7 +927,7 @@ STATIC void | |||
| 927 | xfs_diflags_to_linux( | 927 | xfs_diflags_to_linux( |
| 928 | struct xfs_inode *ip) | 928 | struct xfs_inode *ip) |
| 929 | { | 929 | { |
| 930 | struct inode *inode = XFS_ITOV(ip); | 930 | struct inode *inode = VFS_I(ip); |
| 931 | unsigned int xflags = xfs_ip2xflags(ip); | 931 | unsigned int xflags = xfs_ip2xflags(ip); |
| 932 | 932 | ||
| 933 | if (xflags & XFS_XFLAG_IMMUTABLE) | 933 | if (xflags & XFS_XFLAG_IMMUTABLE) |
diff --git a/fs/xfs/linux-2.6/xfs_iops.c b/fs/xfs/linux-2.6/xfs_iops.c index e88f51028086..095d271f3434 100644 --- a/fs/xfs/linux-2.6/xfs_iops.c +++ b/fs/xfs/linux-2.6/xfs_iops.c | |||
| @@ -62,7 +62,7 @@ void | |||
| 62 | xfs_synchronize_atime( | 62 | xfs_synchronize_atime( |
| 63 | xfs_inode_t *ip) | 63 | xfs_inode_t *ip) |
| 64 | { | 64 | { |
| 65 | struct inode *inode = ip->i_vnode; | 65 | struct inode *inode = VFS_I(ip); |
| 66 | 66 | ||
| 67 | if (inode) { | 67 | if (inode) { |
| 68 | ip->i_d.di_atime.t_sec = (__int32_t)inode->i_atime.tv_sec; | 68 | ip->i_d.di_atime.t_sec = (__int32_t)inode->i_atime.tv_sec; |
| @@ -79,7 +79,7 @@ void | |||
| 79 | xfs_mark_inode_dirty_sync( | 79 | xfs_mark_inode_dirty_sync( |
| 80 | xfs_inode_t *ip) | 80 | xfs_inode_t *ip) |
| 81 | { | 81 | { |
| 82 | struct inode *inode = ip->i_vnode; | 82 | struct inode *inode = VFS_I(ip); |
| 83 | 83 | ||
| 84 | if (inode) | 84 | if (inode) |
| 85 | mark_inode_dirty_sync(inode); | 85 | mark_inode_dirty_sync(inode); |
| @@ -89,36 +89,31 @@ xfs_mark_inode_dirty_sync( | |||
| 89 | * Change the requested timestamp in the given inode. | 89 | * Change the requested timestamp in the given inode. |
| 90 | * We don't lock across timestamp updates, and we don't log them but | 90 | * We don't lock across timestamp updates, and we don't log them but |
| 91 | * we do record the fact that there is dirty information in core. | 91 | * we do record the fact that there is dirty information in core. |
| 92 | * | ||
| 93 | * NOTE -- callers MUST combine XFS_ICHGTIME_MOD or XFS_ICHGTIME_CHG | ||
| 94 | * with XFS_ICHGTIME_ACC to be sure that access time | ||
| 95 | * update will take. Calling first with XFS_ICHGTIME_ACC | ||
| 96 | * and then XFS_ICHGTIME_MOD may fail to modify the access | ||
| 97 | * timestamp if the filesystem is mounted noacctm. | ||
| 98 | */ | 92 | */ |
| 99 | void | 93 | void |
| 100 | xfs_ichgtime( | 94 | xfs_ichgtime( |
| 101 | xfs_inode_t *ip, | 95 | xfs_inode_t *ip, |
| 102 | int flags) | 96 | int flags) |
| 103 | { | 97 | { |
| 104 | struct inode *inode = vn_to_inode(XFS_ITOV(ip)); | 98 | struct inode *inode = VFS_I(ip); |
| 105 | timespec_t tv; | 99 | timespec_t tv; |
| 100 | int sync_it = 0; | ||
| 101 | |||
| 102 | tv = current_fs_time(inode->i_sb); | ||
| 106 | 103 | ||
| 107 | nanotime(&tv); | 104 | if ((flags & XFS_ICHGTIME_MOD) && |
| 108 | if (flags & XFS_ICHGTIME_MOD) { | 105 | !timespec_equal(&inode->i_mtime, &tv)) { |
| 109 | inode->i_mtime = tv; | 106 | inode->i_mtime = tv; |
| 110 | ip->i_d.di_mtime.t_sec = (__int32_t)tv.tv_sec; | 107 | ip->i_d.di_mtime.t_sec = (__int32_t)tv.tv_sec; |
| 111 | ip->i_d.di_mtime.t_nsec = (__int32_t)tv.tv_nsec; | 108 | ip->i_d.di_mtime.t_nsec = (__int32_t)tv.tv_nsec; |
| 109 | sync_it = 1; | ||
| 112 | } | 110 | } |
| 113 | if (flags & XFS_ICHGTIME_ACC) { | 111 | if ((flags & XFS_ICHGTIME_CHG) && |
| 114 | inode->i_atime = tv; | 112 | !timespec_equal(&inode->i_ctime, &tv)) { |
| 115 | ip->i_d.di_atime.t_sec = (__int32_t)tv.tv_sec; | ||
| 116 | ip->i_d.di_atime.t_nsec = (__int32_t)tv.tv_nsec; | ||
| 117 | } | ||
| 118 | if (flags & XFS_ICHGTIME_CHG) { | ||
| 119 | inode->i_ctime = tv; | 113 | inode->i_ctime = tv; |
| 120 | ip->i_d.di_ctime.t_sec = (__int32_t)tv.tv_sec; | 114 | ip->i_d.di_ctime.t_sec = (__int32_t)tv.tv_sec; |
| 121 | ip->i_d.di_ctime.t_nsec = (__int32_t)tv.tv_nsec; | 115 | ip->i_d.di_ctime.t_nsec = (__int32_t)tv.tv_nsec; |
| 116 | sync_it = 1; | ||
| 122 | } | 117 | } |
| 123 | 118 | ||
| 124 | /* | 119 | /* |
| @@ -130,55 +125,11 @@ xfs_ichgtime( | |||
| 130 | * ensure that the compiler does not reorder the update | 125 | * ensure that the compiler does not reorder the update |
| 131 | * of i_update_core above the timestamp updates above. | 126 | * of i_update_core above the timestamp updates above. |
| 132 | */ | 127 | */ |
| 133 | SYNCHRONIZE(); | 128 | if (sync_it) { |
| 134 | ip->i_update_core = 1; | 129 | SYNCHRONIZE(); |
| 135 | if (!(inode->i_state & I_NEW)) | 130 | ip->i_update_core = 1; |
| 136 | mark_inode_dirty_sync(inode); | 131 | mark_inode_dirty_sync(inode); |
| 137 | } | ||
| 138 | |||
| 139 | /* | ||
| 140 | * Variant on the above which avoids querying the system clock | ||
| 141 | * in situations where we know the Linux inode timestamps have | ||
| 142 | * just been updated (and so we can update our inode cheaply). | ||
| 143 | */ | ||
| 144 | void | ||
| 145 | xfs_ichgtime_fast( | ||
| 146 | xfs_inode_t *ip, | ||
| 147 | struct inode *inode, | ||
| 148 | int flags) | ||
| 149 | { | ||
| 150 | timespec_t *tvp; | ||
| 151 | |||
| 152 | /* | ||
| 153 | * Atime updates for read() & friends are handled lazily now, and | ||
| 154 | * explicit updates must go through xfs_ichgtime() | ||
| 155 | */ | ||
| 156 | ASSERT((flags & XFS_ICHGTIME_ACC) == 0); | ||
| 157 | |||
| 158 | if (flags & XFS_ICHGTIME_MOD) { | ||
| 159 | tvp = &inode->i_mtime; | ||
| 160 | ip->i_d.di_mtime.t_sec = (__int32_t)tvp->tv_sec; | ||
| 161 | ip->i_d.di_mtime.t_nsec = (__int32_t)tvp->tv_nsec; | ||
| 162 | } | 132 | } |
| 163 | if (flags & XFS_ICHGTIME_CHG) { | ||
| 164 | tvp = &inode->i_ctime; | ||
| 165 | ip->i_d.di_ctime.t_sec = (__int32_t)tvp->tv_sec; | ||
| 166 | ip->i_d.di_ctime.t_nsec = (__int32_t)tvp->tv_nsec; | ||
| 167 | } | ||
| 168 | |||
| 169 | /* | ||
| 170 | * We update the i_update_core field _after_ changing | ||
| 171 | * the timestamps in order to coordinate properly with | ||
| 172 | * xfs_iflush() so that we don't lose timestamp updates. | ||
| 173 | * This keeps us from having to hold the inode lock | ||
| 174 | * while doing this. We use the SYNCHRONIZE macro to | ||
| 175 | * ensure that the compiler does not reorder the update | ||
| 176 | * of i_update_core above the timestamp updates above. | ||
| 177 | */ | ||
| 178 | SYNCHRONIZE(); | ||
| 179 | ip->i_update_core = 1; | ||
| 180 | if (!(inode->i_state & I_NEW)) | ||
| 181 | mark_inode_dirty_sync(inode); | ||
| 182 | } | 133 | } |
| 183 | 134 | ||
| 184 | /* | 135 | /* |
| @@ -299,7 +250,7 @@ xfs_vn_mknod( | |||
| 299 | if (unlikely(error)) | 250 | if (unlikely(error)) |
| 300 | goto out_free_acl; | 251 | goto out_free_acl; |
| 301 | 252 | ||
| 302 | inode = ip->i_vnode; | 253 | inode = VFS_I(ip); |
| 303 | 254 | ||
| 304 | error = xfs_init_security(inode, dir); | 255 | error = xfs_init_security(inode, dir); |
| 305 | if (unlikely(error)) | 256 | if (unlikely(error)) |
| @@ -366,7 +317,7 @@ xfs_vn_lookup( | |||
| 366 | return NULL; | 317 | return NULL; |
| 367 | } | 318 | } |
| 368 | 319 | ||
| 369 | return d_splice_alias(cip->i_vnode, dentry); | 320 | return d_splice_alias(VFS_I(cip), dentry); |
| 370 | } | 321 | } |
| 371 | 322 | ||
| 372 | STATIC struct dentry * | 323 | STATIC struct dentry * |
| @@ -399,12 +350,12 @@ xfs_vn_ci_lookup( | |||
| 399 | 350 | ||
| 400 | /* if exact match, just splice and exit */ | 351 | /* if exact match, just splice and exit */ |
| 401 | if (!ci_name.name) | 352 | if (!ci_name.name) |
| 402 | return d_splice_alias(ip->i_vnode, dentry); | 353 | return d_splice_alias(VFS_I(ip), dentry); |
| 403 | 354 | ||
| 404 | /* else case-insensitive match... */ | 355 | /* else case-insensitive match... */ |
| 405 | dname.name = ci_name.name; | 356 | dname.name = ci_name.name; |
| 406 | dname.len = ci_name.len; | 357 | dname.len = ci_name.len; |
| 407 | dentry = d_add_ci(ip->i_vnode, dentry, &dname); | 358 | dentry = d_add_ci(dentry, VFS_I(ip), &dname); |
| 408 | kmem_free(ci_name.name); | 359 | kmem_free(ci_name.name); |
| 409 | return dentry; | 360 | return dentry; |
| 410 | } | 361 | } |
| @@ -478,7 +429,7 @@ xfs_vn_symlink( | |||
| 478 | if (unlikely(error)) | 429 | if (unlikely(error)) |
| 479 | goto out; | 430 | goto out; |
| 480 | 431 | ||
| 481 | inode = cip->i_vnode; | 432 | inode = VFS_I(cip); |
| 482 | 433 | ||
| 483 | error = xfs_init_security(inode, dir); | 434 | error = xfs_init_security(inode, dir); |
| 484 | if (unlikely(error)) | 435 | if (unlikely(error)) |
| @@ -710,7 +661,7 @@ out_error: | |||
| 710 | return error; | 661 | return error; |
| 711 | } | 662 | } |
| 712 | 663 | ||
| 713 | const struct inode_operations xfs_inode_operations = { | 664 | static const struct inode_operations xfs_inode_operations = { |
| 714 | .permission = xfs_vn_permission, | 665 | .permission = xfs_vn_permission, |
| 715 | .truncate = xfs_vn_truncate, | 666 | .truncate = xfs_vn_truncate, |
| 716 | .getattr = xfs_vn_getattr, | 667 | .getattr = xfs_vn_getattr, |
| @@ -722,7 +673,7 @@ const struct inode_operations xfs_inode_operations = { | |||
| 722 | .fallocate = xfs_vn_fallocate, | 673 | .fallocate = xfs_vn_fallocate, |
| 723 | }; | 674 | }; |
| 724 | 675 | ||
| 725 | const struct inode_operations xfs_dir_inode_operations = { | 676 | static const struct inode_operations xfs_dir_inode_operations = { |
| 726 | .create = xfs_vn_create, | 677 | .create = xfs_vn_create, |
| 727 | .lookup = xfs_vn_lookup, | 678 | .lookup = xfs_vn_lookup, |
| 728 | .link = xfs_vn_link, | 679 | .link = xfs_vn_link, |
| @@ -747,7 +698,7 @@ const struct inode_operations xfs_dir_inode_operations = { | |||
| 747 | .listxattr = xfs_vn_listxattr, | 698 | .listxattr = xfs_vn_listxattr, |
| 748 | }; | 699 | }; |
| 749 | 700 | ||
| 750 | const struct inode_operations xfs_dir_ci_inode_operations = { | 701 | static const struct inode_operations xfs_dir_ci_inode_operations = { |
| 751 | .create = xfs_vn_create, | 702 | .create = xfs_vn_create, |
| 752 | .lookup = xfs_vn_ci_lookup, | 703 | .lookup = xfs_vn_ci_lookup, |
| 753 | .link = xfs_vn_link, | 704 | .link = xfs_vn_link, |
| @@ -772,7 +723,7 @@ const struct inode_operations xfs_dir_ci_inode_operations = { | |||
| 772 | .listxattr = xfs_vn_listxattr, | 723 | .listxattr = xfs_vn_listxattr, |
| 773 | }; | 724 | }; |
| 774 | 725 | ||
| 775 | const struct inode_operations xfs_symlink_inode_operations = { | 726 | static const struct inode_operations xfs_symlink_inode_operations = { |
| 776 | .readlink = generic_readlink, | 727 | .readlink = generic_readlink, |
| 777 | .follow_link = xfs_vn_follow_link, | 728 | .follow_link = xfs_vn_follow_link, |
| 778 | .put_link = xfs_vn_put_link, | 729 | .put_link = xfs_vn_put_link, |
| @@ -784,3 +735,98 @@ const struct inode_operations xfs_symlink_inode_operations = { | |||
| 784 | .removexattr = generic_removexattr, | 735 | .removexattr = generic_removexattr, |
| 785 | .listxattr = xfs_vn_listxattr, | 736 | .listxattr = xfs_vn_listxattr, |
| 786 | }; | 737 | }; |
| 738 | |||
| 739 | STATIC void | ||
| 740 | xfs_diflags_to_iflags( | ||
| 741 | struct inode *inode, | ||
| 742 | struct xfs_inode *ip) | ||
| 743 | { | ||
| 744 | if (ip->i_d.di_flags & XFS_DIFLAG_IMMUTABLE) | ||
| 745 | inode->i_flags |= S_IMMUTABLE; | ||
| 746 | else | ||
| 747 | inode->i_flags &= ~S_IMMUTABLE; | ||
| 748 | if (ip->i_d.di_flags & XFS_DIFLAG_APPEND) | ||
| 749 | inode->i_flags |= S_APPEND; | ||
| 750 | else | ||
| 751 | inode->i_flags &= ~S_APPEND; | ||
| 752 | if (ip->i_d.di_flags & XFS_DIFLAG_SYNC) | ||
| 753 | inode->i_flags |= S_SYNC; | ||
| 754 | else | ||
| 755 | inode->i_flags &= ~S_SYNC; | ||
| 756 | if (ip->i_d.di_flags & XFS_DIFLAG_NOATIME) | ||
| 757 | inode->i_flags |= S_NOATIME; | ||
| 758 | else | ||
| 759 | inode->i_flags &= ~S_NOATIME; | ||
| 760 | } | ||
| 761 | |||
| 762 | /* | ||
| 763 | * Initialize the Linux inode, set up the operation vectors and | ||
| 764 | * unlock the inode. | ||
| 765 | * | ||
| 766 | * When reading existing inodes from disk this is called directly | ||
| 767 | * from xfs_iget, when creating a new inode it is called from | ||
| 768 | * xfs_ialloc after setting up the inode. | ||
| 769 | */ | ||
| 770 | void | ||
| 771 | xfs_setup_inode( | ||
| 772 | struct xfs_inode *ip) | ||
| 773 | { | ||
| 774 | struct inode *inode = ip->i_vnode; | ||
| 775 | |||
| 776 | inode->i_mode = ip->i_d.di_mode; | ||
| 777 | inode->i_nlink = ip->i_d.di_nlink; | ||
| 778 | inode->i_uid = ip->i_d.di_uid; | ||
| 779 | inode->i_gid = ip->i_d.di_gid; | ||
| 780 | |||
| 781 | switch (inode->i_mode & S_IFMT) { | ||
| 782 | case S_IFBLK: | ||
| 783 | case S_IFCHR: | ||
| 784 | inode->i_rdev = | ||
| 785 | MKDEV(sysv_major(ip->i_df.if_u2.if_rdev) & 0x1ff, | ||
| 786 | sysv_minor(ip->i_df.if_u2.if_rdev)); | ||
| 787 | break; | ||
| 788 | default: | ||
| 789 | inode->i_rdev = 0; | ||
| 790 | break; | ||
| 791 | } | ||
| 792 | |||
| 793 | inode->i_generation = ip->i_d.di_gen; | ||
| 794 | i_size_write(inode, ip->i_d.di_size); | ||
| 795 | inode->i_atime.tv_sec = ip->i_d.di_atime.t_sec; | ||
| 796 | inode->i_atime.tv_nsec = ip->i_d.di_atime.t_nsec; | ||
| 797 | inode->i_mtime.tv_sec = ip->i_d.di_mtime.t_sec; | ||
| 798 | inode->i_mtime.tv_nsec = ip->i_d.di_mtime.t_nsec; | ||
| 799 | inode->i_ctime.tv_sec = ip->i_d.di_ctime.t_sec; | ||
| 800 | inode->i_ctime.tv_nsec = ip->i_d.di_ctime.t_nsec; | ||
| 801 | xfs_diflags_to_iflags(inode, ip); | ||
| 802 | xfs_iflags_clear(ip, XFS_IMODIFIED); | ||
| 803 | |||
| 804 | switch (inode->i_mode & S_IFMT) { | ||
| 805 | case S_IFREG: | ||
| 806 | inode->i_op = &xfs_inode_operations; | ||
| 807 | inode->i_fop = &xfs_file_operations; | ||
| 808 | inode->i_mapping->a_ops = &xfs_address_space_operations; | ||
| 809 | break; | ||
| 810 | case S_IFDIR: | ||
| 811 | if (xfs_sb_version_hasasciici(&XFS_M(inode->i_sb)->m_sb)) | ||
| 812 | inode->i_op = &xfs_dir_ci_inode_operations; | ||
| 813 | else | ||
| 814 | inode->i_op = &xfs_dir_inode_operations; | ||
| 815 | inode->i_fop = &xfs_dir_file_operations; | ||
| 816 | break; | ||
| 817 | case S_IFLNK: | ||
| 818 | inode->i_op = &xfs_symlink_inode_operations; | ||
| 819 | if (!(ip->i_df.if_flags & XFS_IFINLINE)) | ||
| 820 | inode->i_mapping->a_ops = &xfs_address_space_operations; | ||
| 821 | break; | ||
| 822 | default: | ||
| 823 | inode->i_op = &xfs_inode_operations; | ||
| 824 | init_special_inode(inode, inode->i_mode, inode->i_rdev); | ||
| 825 | break; | ||
| 826 | } | ||
| 827 | |||
| 828 | xfs_iflags_clear(ip, XFS_INEW); | ||
| 829 | barrier(); | ||
| 830 | |||
| 831 | unlock_new_inode(inode); | ||
| 832 | } | ||
diff --git a/fs/xfs/linux-2.6/xfs_iops.h b/fs/xfs/linux-2.6/xfs_iops.h index d97ba934a2ac..8b1a1e31dc21 100644 --- a/fs/xfs/linux-2.6/xfs_iops.h +++ b/fs/xfs/linux-2.6/xfs_iops.h | |||
| @@ -18,10 +18,7 @@ | |||
| 18 | #ifndef __XFS_IOPS_H__ | 18 | #ifndef __XFS_IOPS_H__ |
| 19 | #define __XFS_IOPS_H__ | 19 | #define __XFS_IOPS_H__ |
| 20 | 20 | ||
| 21 | extern const struct inode_operations xfs_inode_operations; | 21 | struct xfs_inode; |
| 22 | extern const struct inode_operations xfs_dir_inode_operations; | ||
| 23 | extern const struct inode_operations xfs_dir_ci_inode_operations; | ||
| 24 | extern const struct inode_operations xfs_symlink_inode_operations; | ||
| 25 | 22 | ||
| 26 | extern const struct file_operations xfs_file_operations; | 23 | extern const struct file_operations xfs_file_operations; |
| 27 | extern const struct file_operations xfs_dir_file_operations; | 24 | extern const struct file_operations xfs_dir_file_operations; |
| @@ -29,14 +26,6 @@ extern const struct file_operations xfs_invis_file_operations; | |||
| 29 | 26 | ||
| 30 | extern ssize_t xfs_vn_listxattr(struct dentry *, char *data, size_t size); | 27 | extern ssize_t xfs_vn_listxattr(struct dentry *, char *data, size_t size); |
| 31 | 28 | ||
| 32 | struct xfs_inode; | 29 | extern void xfs_setup_inode(struct xfs_inode *); |
| 33 | extern void xfs_ichgtime(struct xfs_inode *, int); | ||
| 34 | extern void xfs_ichgtime_fast(struct xfs_inode *, struct inode *, int); | ||
| 35 | |||
| 36 | #define xfs_vtoi(vp) \ | ||
| 37 | ((struct xfs_inode *)vn_to_inode(vp)->i_private) | ||
| 38 | |||
| 39 | #define XFS_I(inode) \ | ||
| 40 | ((struct xfs_inode *)(inode)->i_private) | ||
| 41 | 30 | ||
| 42 | #endif /* __XFS_IOPS_H__ */ | 31 | #endif /* __XFS_IOPS_H__ */ |
diff --git a/fs/xfs/linux-2.6/xfs_linux.h b/fs/xfs/linux-2.6/xfs_linux.h index 4d45d9351a6c..cc0f7b3a9795 100644 --- a/fs/xfs/linux-2.6/xfs_linux.h +++ b/fs/xfs/linux-2.6/xfs_linux.h | |||
| @@ -45,13 +45,13 @@ | |||
| 45 | #include <mrlock.h> | 45 | #include <mrlock.h> |
| 46 | #include <sv.h> | 46 | #include <sv.h> |
| 47 | #include <mutex.h> | 47 | #include <mutex.h> |
| 48 | #include <sema.h> | ||
| 49 | #include <time.h> | 48 | #include <time.h> |
| 50 | 49 | ||
| 51 | #include <support/ktrace.h> | 50 | #include <support/ktrace.h> |
| 52 | #include <support/debug.h> | 51 | #include <support/debug.h> |
| 53 | #include <support/uuid.h> | 52 | #include <support/uuid.h> |
| 54 | 53 | ||
| 54 | #include <linux/semaphore.h> | ||
| 55 | #include <linux/mm.h> | 55 | #include <linux/mm.h> |
| 56 | #include <linux/kernel.h> | 56 | #include <linux/kernel.h> |
| 57 | #include <linux/blkdev.h> | 57 | #include <linux/blkdev.h> |
| @@ -126,8 +126,6 @@ | |||
| 126 | 126 | ||
| 127 | #define current_cpu() (raw_smp_processor_id()) | 127 | #define current_cpu() (raw_smp_processor_id()) |
| 128 | #define current_pid() (current->pid) | 128 | #define current_pid() (current->pid) |
| 129 | #define current_fsuid(cred) (current->fsuid) | ||
| 130 | #define current_fsgid(cred) (current->fsgid) | ||
| 131 | #define current_test_flags(f) (current->flags & (f)) | 129 | #define current_test_flags(f) (current->flags & (f)) |
| 132 | #define current_set_flags_nested(sp, f) \ | 130 | #define current_set_flags_nested(sp, f) \ |
| 133 | (*(sp) = current->flags, current->flags |= (f)) | 131 | (*(sp) = current->flags, current->flags |= (f)) |
| @@ -180,7 +178,7 @@ | |||
| 180 | #define xfs_sort(a,n,s,fn) sort(a,n,s,fn,NULL) | 178 | #define xfs_sort(a,n,s,fn) sort(a,n,s,fn,NULL) |
| 181 | #define xfs_stack_trace() dump_stack() | 179 | #define xfs_stack_trace() dump_stack() |
| 182 | #define xfs_itruncate_data(ip, off) \ | 180 | #define xfs_itruncate_data(ip, off) \ |
| 183 | (-vmtruncate(vn_to_inode(XFS_ITOV(ip)), (off))) | 181 | (-vmtruncate(VFS_I(ip), (off))) |
| 184 | 182 | ||
| 185 | 183 | ||
| 186 | /* Move the kernel do_div definition off to one side */ | 184 | /* Move the kernel do_div definition off to one side */ |
diff --git a/fs/xfs/linux-2.6/xfs_lrw.c b/fs/xfs/linux-2.6/xfs_lrw.c index 82333b3e118e..1957e5357d04 100644 --- a/fs/xfs/linux-2.6/xfs_lrw.c +++ b/fs/xfs/linux-2.6/xfs_lrw.c | |||
| @@ -137,7 +137,7 @@ xfs_iozero( | |||
| 137 | struct address_space *mapping; | 137 | struct address_space *mapping; |
| 138 | int status; | 138 | int status; |
| 139 | 139 | ||
| 140 | mapping = ip->i_vnode->i_mapping; | 140 | mapping = VFS_I(ip)->i_mapping; |
| 141 | do { | 141 | do { |
| 142 | unsigned offset, bytes; | 142 | unsigned offset, bytes; |
| 143 | void *fsdata; | 143 | void *fsdata; |
| @@ -674,9 +674,7 @@ start: | |||
| 674 | */ | 674 | */ |
| 675 | if (likely(!(ioflags & IO_INVIS) && | 675 | if (likely(!(ioflags & IO_INVIS) && |
| 676 | !mnt_want_write(file->f_path.mnt))) { | 676 | !mnt_want_write(file->f_path.mnt))) { |
| 677 | file_update_time(file); | 677 | xfs_ichgtime(xip, XFS_ICHGTIME_MOD | XFS_ICHGTIME_CHG); |
| 678 | xfs_ichgtime_fast(xip, inode, | ||
| 679 | XFS_ICHGTIME_MOD | XFS_ICHGTIME_CHG); | ||
| 680 | mnt_drop_write(file->f_path.mnt); | 678 | mnt_drop_write(file->f_path.mnt); |
| 681 | } | 679 | } |
| 682 | 680 | ||
diff --git a/fs/xfs/linux-2.6/xfs_super.c b/fs/xfs/linux-2.6/xfs_super.c index 30ae96397e31..73c65f19e549 100644 --- a/fs/xfs/linux-2.6/xfs_super.c +++ b/fs/xfs/linux-2.6/xfs_super.c | |||
| @@ -581,118 +581,6 @@ xfs_max_file_offset( | |||
| 581 | return (((__uint64_t)pagefactor) << bitshift) - 1; | 581 | return (((__uint64_t)pagefactor) << bitshift) - 1; |
| 582 | } | 582 | } |
| 583 | 583 | ||
| 584 | STATIC_INLINE void | ||
| 585 | xfs_set_inodeops( | ||
| 586 | struct inode *inode) | ||
| 587 | { | ||
| 588 | switch (inode->i_mode & S_IFMT) { | ||
| 589 | case S_IFREG: | ||
| 590 | inode->i_op = &xfs_inode_operations; | ||
| 591 | inode->i_fop = &xfs_file_operations; | ||
| 592 | inode->i_mapping->a_ops = &xfs_address_space_operations; | ||
| 593 | break; | ||
| 594 | case S_IFDIR: | ||
| 595 | if (xfs_sb_version_hasasciici(&XFS_M(inode->i_sb)->m_sb)) | ||
| 596 | inode->i_op = &xfs_dir_ci_inode_operations; | ||
| 597 | else | ||
| 598 | inode->i_op = &xfs_dir_inode_operations; | ||
| 599 | inode->i_fop = &xfs_dir_file_operations; | ||
| 600 | break; | ||
| 601 | case S_IFLNK: | ||
| 602 | inode->i_op = &xfs_symlink_inode_operations; | ||
| 603 | if (!(XFS_I(inode)->i_df.if_flags & XFS_IFINLINE)) | ||
| 604 | inode->i_mapping->a_ops = &xfs_address_space_operations; | ||
| 605 | break; | ||
| 606 | default: | ||
| 607 | inode->i_op = &xfs_inode_operations; | ||
| 608 | init_special_inode(inode, inode->i_mode, inode->i_rdev); | ||
| 609 | break; | ||
| 610 | } | ||
| 611 | } | ||
| 612 | |||
| 613 | STATIC_INLINE void | ||
| 614 | xfs_revalidate_inode( | ||
| 615 | xfs_mount_t *mp, | ||
| 616 | bhv_vnode_t *vp, | ||
| 617 | xfs_inode_t *ip) | ||
| 618 | { | ||
| 619 | struct inode *inode = vn_to_inode(vp); | ||
| 620 | |||
| 621 | inode->i_mode = ip->i_d.di_mode; | ||
| 622 | inode->i_nlink = ip->i_d.di_nlink; | ||
| 623 | inode->i_uid = ip->i_d.di_uid; | ||
| 624 | inode->i_gid = ip->i_d.di_gid; | ||
| 625 | |||
| 626 | switch (inode->i_mode & S_IFMT) { | ||
| 627 | case S_IFBLK: | ||
| 628 | case S_IFCHR: | ||
| 629 | inode->i_rdev = | ||
| 630 | MKDEV(sysv_major(ip->i_df.if_u2.if_rdev) & 0x1ff, | ||
| 631 | sysv_minor(ip->i_df.if_u2.if_rdev)); | ||
| 632 | break; | ||
| 633 | default: | ||
| 634 | inode->i_rdev = 0; | ||
| 635 | break; | ||
| 636 | } | ||
| 637 | |||
| 638 | inode->i_generation = ip->i_d.di_gen; | ||
| 639 | i_size_write(inode, ip->i_d.di_size); | ||
| 640 | inode->i_atime.tv_sec = ip->i_d.di_atime.t_sec; | ||
| 641 | inode->i_atime.tv_nsec = ip->i_d.di_atime.t_nsec; | ||
| 642 | inode->i_mtime.tv_sec = ip->i_d.di_mtime.t_sec; | ||
| 643 | inode->i_mtime.tv_nsec = ip->i_d.di_mtime.t_nsec; | ||
| 644 | inode->i_ctime.tv_sec = ip->i_d.di_ctime.t_sec; | ||
| 645 | inode->i_ctime.tv_nsec = ip->i_d.di_ctime.t_nsec; | ||
| 646 | if (ip->i_d.di_flags & XFS_DIFLAG_IMMUTABLE) | ||
| 647 | inode->i_flags |= S_IMMUTABLE; | ||
| 648 | else | ||
| 649 | inode->i_flags &= ~S_IMMUTABLE; | ||
| 650 | if (ip->i_d.di_flags & XFS_DIFLAG_APPEND) | ||
| 651 | inode->i_flags |= S_APPEND; | ||
| 652 | else | ||
| 653 | inode->i_flags &= ~S_APPEND; | ||
| 654 | if (ip->i_d.di_flags & XFS_DIFLAG_SYNC) | ||
| 655 | inode->i_flags |= S_SYNC; | ||
| 656 | else | ||
| 657 | inode->i_flags &= ~S_SYNC; | ||
| 658 | if (ip->i_d.di_flags & XFS_DIFLAG_NOATIME) | ||
| 659 | inode->i_flags |= S_NOATIME; | ||
| 660 | else | ||
| 661 | inode->i_flags &= ~S_NOATIME; | ||
| 662 | xfs_iflags_clear(ip, XFS_IMODIFIED); | ||
| 663 | } | ||
| 664 | |||
| 665 | void | ||
| 666 | xfs_initialize_vnode( | ||
| 667 | struct xfs_mount *mp, | ||
| 668 | bhv_vnode_t *vp, | ||
| 669 | struct xfs_inode *ip) | ||
| 670 | { | ||
| 671 | struct inode *inode = vn_to_inode(vp); | ||
| 672 | |||
| 673 | if (!ip->i_vnode) { | ||
| 674 | ip->i_vnode = vp; | ||
| 675 | inode->i_private = ip; | ||
| 676 | } | ||
| 677 | |||
| 678 | /* | ||
| 679 | * We need to set the ops vectors, and unlock the inode, but if | ||
| 680 | * we have been called during the new inode create process, it is | ||
| 681 | * too early to fill in the Linux inode. We will get called a | ||
| 682 | * second time once the inode is properly set up, and then we can | ||
| 683 | * finish our work. | ||
| 684 | */ | ||
| 685 | if (ip->i_d.di_mode != 0 && (inode->i_state & I_NEW)) { | ||
| 686 | xfs_revalidate_inode(mp, vp, ip); | ||
| 687 | xfs_set_inodeops(inode); | ||
| 688 | |||
| 689 | xfs_iflags_clear(ip, XFS_INEW); | ||
| 690 | barrier(); | ||
| 691 | |||
| 692 | unlock_new_inode(inode); | ||
| 693 | } | ||
| 694 | } | ||
| 695 | |||
| 696 | int | 584 | int |
| 697 | xfs_blkdev_get( | 585 | xfs_blkdev_get( |
| 698 | xfs_mount_t *mp, | 586 | xfs_mount_t *mp, |
| @@ -982,26 +870,21 @@ STATIC struct inode * | |||
| 982 | xfs_fs_alloc_inode( | 870 | xfs_fs_alloc_inode( |
| 983 | struct super_block *sb) | 871 | struct super_block *sb) |
| 984 | { | 872 | { |
| 985 | bhv_vnode_t *vp; | 873 | return kmem_zone_alloc(xfs_vnode_zone, KM_SLEEP); |
| 986 | |||
| 987 | vp = kmem_zone_alloc(xfs_vnode_zone, KM_SLEEP); | ||
| 988 | if (unlikely(!vp)) | ||
| 989 | return NULL; | ||
| 990 | return vn_to_inode(vp); | ||
| 991 | } | 874 | } |
| 992 | 875 | ||
| 993 | STATIC void | 876 | STATIC void |
| 994 | xfs_fs_destroy_inode( | 877 | xfs_fs_destroy_inode( |
| 995 | struct inode *inode) | 878 | struct inode *inode) |
| 996 | { | 879 | { |
| 997 | kmem_zone_free(xfs_vnode_zone, vn_from_inode(inode)); | 880 | kmem_zone_free(xfs_vnode_zone, inode); |
| 998 | } | 881 | } |
| 999 | 882 | ||
| 1000 | STATIC void | 883 | STATIC void |
| 1001 | xfs_fs_inode_init_once( | 884 | xfs_fs_inode_init_once( |
| 1002 | void *vnode) | 885 | void *vnode) |
| 1003 | { | 886 | { |
| 1004 | inode_init_once(vn_to_inode((bhv_vnode_t *)vnode)); | 887 | inode_init_once((struct inode *)vnode); |
| 1005 | } | 888 | } |
| 1006 | 889 | ||
| 1007 | /* | 890 | /* |
| @@ -1106,7 +989,7 @@ void | |||
| 1106 | xfs_flush_inode( | 989 | xfs_flush_inode( |
| 1107 | xfs_inode_t *ip) | 990 | xfs_inode_t *ip) |
| 1108 | { | 991 | { |
| 1109 | struct inode *inode = ip->i_vnode; | 992 | struct inode *inode = VFS_I(ip); |
| 1110 | 993 | ||
| 1111 | igrab(inode); | 994 | igrab(inode); |
| 1112 | xfs_syncd_queue_work(ip->i_mount, inode, xfs_flush_inode_work); | 995 | xfs_syncd_queue_work(ip->i_mount, inode, xfs_flush_inode_work); |
| @@ -1131,7 +1014,7 @@ void | |||
| 1131 | xfs_flush_device( | 1014 | xfs_flush_device( |
| 1132 | xfs_inode_t *ip) | 1015 | xfs_inode_t *ip) |
| 1133 | { | 1016 | { |
| 1134 | struct inode *inode = vn_to_inode(XFS_ITOV(ip)); | 1017 | struct inode *inode = VFS_I(ip); |
| 1135 | 1018 | ||
| 1136 | igrab(inode); | 1019 | igrab(inode); |
| 1137 | xfs_syncd_queue_work(ip->i_mount, inode, xfs_flush_device_work); | 1020 | xfs_syncd_queue_work(ip->i_mount, inode, xfs_flush_device_work); |
| @@ -1201,6 +1084,15 @@ xfssyncd( | |||
| 1201 | } | 1084 | } |
| 1202 | 1085 | ||
| 1203 | STATIC void | 1086 | STATIC void |
| 1087 | xfs_free_fsname( | ||
| 1088 | struct xfs_mount *mp) | ||
| 1089 | { | ||
| 1090 | kfree(mp->m_fsname); | ||
| 1091 | kfree(mp->m_rtname); | ||
| 1092 | kfree(mp->m_logname); | ||
| 1093 | } | ||
| 1094 | |||
| 1095 | STATIC void | ||
| 1204 | xfs_fs_put_super( | 1096 | xfs_fs_put_super( |
| 1205 | struct super_block *sb) | 1097 | struct super_block *sb) |
| 1206 | { | 1098 | { |
| @@ -1239,8 +1131,6 @@ xfs_fs_put_super( | |||
| 1239 | error = xfs_unmount_flush(mp, 0); | 1131 | error = xfs_unmount_flush(mp, 0); |
| 1240 | WARN_ON(error); | 1132 | WARN_ON(error); |
| 1241 | 1133 | ||
| 1242 | IRELE(rip); | ||
| 1243 | |||
| 1244 | /* | 1134 | /* |
| 1245 | * If we're forcing a shutdown, typically because of a media error, | 1135 | * If we're forcing a shutdown, typically because of a media error, |
| 1246 | * we want to make sure we invalidate dirty pages that belong to | 1136 | * we want to make sure we invalidate dirty pages that belong to |
| @@ -1257,10 +1147,12 @@ xfs_fs_put_super( | |||
| 1257 | } | 1147 | } |
| 1258 | 1148 | ||
| 1259 | xfs_unmountfs(mp); | 1149 | xfs_unmountfs(mp); |
| 1150 | xfs_freesb(mp); | ||
| 1260 | xfs_icsb_destroy_counters(mp); | 1151 | xfs_icsb_destroy_counters(mp); |
| 1261 | xfs_close_devices(mp); | 1152 | xfs_close_devices(mp); |
| 1262 | xfs_qmops_put(mp); | 1153 | xfs_qmops_put(mp); |
| 1263 | xfs_dmops_put(mp); | 1154 | xfs_dmops_put(mp); |
| 1155 | xfs_free_fsname(mp); | ||
| 1264 | kfree(mp); | 1156 | kfree(mp); |
| 1265 | } | 1157 | } |
| 1266 | 1158 | ||
| @@ -1517,6 +1409,8 @@ xfs_start_flags( | |||
| 1517 | struct xfs_mount_args *ap, | 1409 | struct xfs_mount_args *ap, |
| 1518 | struct xfs_mount *mp) | 1410 | struct xfs_mount *mp) |
| 1519 | { | 1411 | { |
| 1412 | int error; | ||
| 1413 | |||
| 1520 | /* Values are in BBs */ | 1414 | /* Values are in BBs */ |
| 1521 | if ((ap->flags & XFSMNT_NOALIGN) != XFSMNT_NOALIGN) { | 1415 | if ((ap->flags & XFSMNT_NOALIGN) != XFSMNT_NOALIGN) { |
| 1522 | /* | 1416 | /* |
| @@ -1549,17 +1443,27 @@ xfs_start_flags( | |||
| 1549 | ap->logbufsize); | 1443 | ap->logbufsize); |
| 1550 | return XFS_ERROR(EINVAL); | 1444 | return XFS_ERROR(EINVAL); |
| 1551 | } | 1445 | } |
| 1446 | |||
| 1447 | error = ENOMEM; | ||
| 1448 | |||
| 1552 | mp->m_logbsize = ap->logbufsize; | 1449 | mp->m_logbsize = ap->logbufsize; |
| 1553 | mp->m_fsname_len = strlen(ap->fsname) + 1; | 1450 | mp->m_fsname_len = strlen(ap->fsname) + 1; |
| 1554 | mp->m_fsname = kmem_alloc(mp->m_fsname_len, KM_SLEEP); | 1451 | |
| 1555 | strcpy(mp->m_fsname, ap->fsname); | 1452 | mp->m_fsname = kstrdup(ap->fsname, GFP_KERNEL); |
| 1453 | if (!mp->m_fsname) | ||
| 1454 | goto out; | ||
| 1455 | |||
| 1556 | if (ap->rtname[0]) { | 1456 | if (ap->rtname[0]) { |
| 1557 | mp->m_rtname = kmem_alloc(strlen(ap->rtname) + 1, KM_SLEEP); | 1457 | mp->m_rtname = kstrdup(ap->rtname, GFP_KERNEL); |
| 1558 | strcpy(mp->m_rtname, ap->rtname); | 1458 | if (!mp->m_rtname) |
| 1459 | goto out_free_fsname; | ||
| 1460 | |||
| 1559 | } | 1461 | } |
| 1462 | |||
| 1560 | if (ap->logname[0]) { | 1463 | if (ap->logname[0]) { |
| 1561 | mp->m_logname = kmem_alloc(strlen(ap->logname) + 1, KM_SLEEP); | 1464 | mp->m_logname = kstrdup(ap->logname, GFP_KERNEL); |
| 1562 | strcpy(mp->m_logname, ap->logname); | 1465 | if (!mp->m_logname) |
| 1466 | goto out_free_rtname; | ||
| 1563 | } | 1467 | } |
| 1564 | 1468 | ||
| 1565 | if (ap->flags & XFSMNT_WSYNC) | 1469 | if (ap->flags & XFSMNT_WSYNC) |
| @@ -1632,6 +1536,14 @@ xfs_start_flags( | |||
| 1632 | if (ap->flags & XFSMNT_DMAPI) | 1536 | if (ap->flags & XFSMNT_DMAPI) |
| 1633 | mp->m_flags |= XFS_MOUNT_DMAPI; | 1537 | mp->m_flags |= XFS_MOUNT_DMAPI; |
| 1634 | return 0; | 1538 | return 0; |
| 1539 | |||
| 1540 | |||
| 1541 | out_free_rtname: | ||
| 1542 | kfree(mp->m_rtname); | ||
| 1543 | out_free_fsname: | ||
| 1544 | kfree(mp->m_fsname); | ||
| 1545 | out: | ||
| 1546 | return error; | ||
| 1635 | } | 1547 | } |
| 1636 | 1548 | ||
| 1637 | /* | 1549 | /* |
| @@ -1792,10 +1704,10 @@ xfs_fs_fill_super( | |||
| 1792 | */ | 1704 | */ |
| 1793 | error = xfs_start_flags(args, mp); | 1705 | error = xfs_start_flags(args, mp); |
| 1794 | if (error) | 1706 | if (error) |
| 1795 | goto out_destroy_counters; | 1707 | goto out_free_fsname; |
| 1796 | error = xfs_readsb(mp, flags); | 1708 | error = xfs_readsb(mp, flags); |
| 1797 | if (error) | 1709 | if (error) |
| 1798 | goto out_destroy_counters; | 1710 | goto out_free_fsname; |
| 1799 | error = xfs_finish_flags(args, mp); | 1711 | error = xfs_finish_flags(args, mp); |
| 1800 | if (error) | 1712 | if (error) |
| 1801 | goto out_free_sb; | 1713 | goto out_free_sb; |
| @@ -1811,7 +1723,7 @@ xfs_fs_fill_super( | |||
| 1811 | if (error) | 1723 | if (error) |
| 1812 | goto out_free_sb; | 1724 | goto out_free_sb; |
| 1813 | 1725 | ||
| 1814 | error = xfs_mountfs(mp, flags); | 1726 | error = xfs_mountfs(mp); |
| 1815 | if (error) | 1727 | if (error) |
| 1816 | goto out_filestream_unmount; | 1728 | goto out_filestream_unmount; |
| 1817 | 1729 | ||
| @@ -1825,7 +1737,7 @@ xfs_fs_fill_super( | |||
| 1825 | sb->s_time_gran = 1; | 1737 | sb->s_time_gran = 1; |
| 1826 | set_posix_acl_flag(sb); | 1738 | set_posix_acl_flag(sb); |
| 1827 | 1739 | ||
| 1828 | root = igrab(mp->m_rootip->i_vnode); | 1740 | root = igrab(VFS_I(mp->m_rootip)); |
| 1829 | if (!root) { | 1741 | if (!root) { |
| 1830 | error = ENOENT; | 1742 | error = ENOENT; |
| 1831 | goto fail_unmount; | 1743 | goto fail_unmount; |
| @@ -1857,7 +1769,8 @@ xfs_fs_fill_super( | |||
| 1857 | xfs_filestream_unmount(mp); | 1769 | xfs_filestream_unmount(mp); |
| 1858 | out_free_sb: | 1770 | out_free_sb: |
| 1859 | xfs_freesb(mp); | 1771 | xfs_freesb(mp); |
| 1860 | out_destroy_counters: | 1772 | out_free_fsname: |
| 1773 | xfs_free_fsname(mp); | ||
| 1861 | xfs_icsb_destroy_counters(mp); | 1774 | xfs_icsb_destroy_counters(mp); |
| 1862 | xfs_close_devices(mp); | 1775 | xfs_close_devices(mp); |
| 1863 | out_put_qmops: | 1776 | out_put_qmops: |
| @@ -1890,10 +1803,8 @@ xfs_fs_fill_super( | |||
| 1890 | error = xfs_unmount_flush(mp, 0); | 1803 | error = xfs_unmount_flush(mp, 0); |
| 1891 | WARN_ON(error); | 1804 | WARN_ON(error); |
| 1892 | 1805 | ||
| 1893 | IRELE(mp->m_rootip); | ||
| 1894 | |||
| 1895 | xfs_unmountfs(mp); | 1806 | xfs_unmountfs(mp); |
| 1896 | goto out_destroy_counters; | 1807 | goto out_free_sb; |
| 1897 | } | 1808 | } |
| 1898 | 1809 | ||
| 1899 | STATIC int | 1810 | STATIC int |
| @@ -2014,7 +1925,7 @@ xfs_free_trace_bufs(void) | |||
| 2014 | STATIC int __init | 1925 | STATIC int __init |
| 2015 | xfs_init_zones(void) | 1926 | xfs_init_zones(void) |
| 2016 | { | 1927 | { |
| 2017 | xfs_vnode_zone = kmem_zone_init_flags(sizeof(bhv_vnode_t), "xfs_vnode", | 1928 | xfs_vnode_zone = kmem_zone_init_flags(sizeof(struct inode), "xfs_vnode", |
| 2018 | KM_ZONE_HWALIGN | KM_ZONE_RECLAIM | | 1929 | KM_ZONE_HWALIGN | KM_ZONE_RECLAIM | |
| 2019 | KM_ZONE_SPREAD, | 1930 | KM_ZONE_SPREAD, |
| 2020 | xfs_fs_inode_init_once); | 1931 | xfs_fs_inode_init_once); |
diff --git a/fs/xfs/linux-2.6/xfs_super.h b/fs/xfs/linux-2.6/xfs_super.h index b7d13da01bd6..fe2ef4e6a0f9 100644 --- a/fs/xfs/linux-2.6/xfs_super.h +++ b/fs/xfs/linux-2.6/xfs_super.h | |||
| @@ -101,9 +101,6 @@ struct block_device; | |||
| 101 | 101 | ||
| 102 | extern __uint64_t xfs_max_file_offset(unsigned int); | 102 | extern __uint64_t xfs_max_file_offset(unsigned int); |
| 103 | 103 | ||
| 104 | extern void xfs_initialize_vnode(struct xfs_mount *mp, bhv_vnode_t *vp, | ||
| 105 | struct xfs_inode *ip); | ||
| 106 | |||
| 107 | extern void xfs_flush_inode(struct xfs_inode *); | 104 | extern void xfs_flush_inode(struct xfs_inode *); |
| 108 | extern void xfs_flush_device(struct xfs_inode *); | 105 | extern void xfs_flush_device(struct xfs_inode *); |
| 109 | 106 | ||
diff --git a/fs/xfs/linux-2.6/xfs_vnode.c b/fs/xfs/linux-2.6/xfs_vnode.c index 25488b6d9881..b52528bbbfff 100644 --- a/fs/xfs/linux-2.6/xfs_vnode.c +++ b/fs/xfs/linux-2.6/xfs_vnode.c | |||
| @@ -33,7 +33,7 @@ | |||
| 33 | 33 | ||
| 34 | 34 | ||
| 35 | /* | 35 | /* |
| 36 | * Dedicated vnode inactive/reclaim sync semaphores. | 36 | * Dedicated vnode inactive/reclaim sync wait queues. |
| 37 | * Prime number of hash buckets since address is used as the key. | 37 | * Prime number of hash buckets since address is used as the key. |
| 38 | */ | 38 | */ |
| 39 | #define NVSYNC 37 | 39 | #define NVSYNC 37 |
| @@ -82,24 +82,6 @@ vn_ioerror( | |||
| 82 | xfs_do_force_shutdown(ip->i_mount, SHUTDOWN_DEVICE_REQ, f, l); | 82 | xfs_do_force_shutdown(ip->i_mount, SHUTDOWN_DEVICE_REQ, f, l); |
| 83 | } | 83 | } |
| 84 | 84 | ||
| 85 | |||
| 86 | /* | ||
| 87 | * Add a reference to a referenced vnode. | ||
| 88 | */ | ||
| 89 | bhv_vnode_t * | ||
| 90 | vn_hold( | ||
| 91 | bhv_vnode_t *vp) | ||
| 92 | { | ||
| 93 | struct inode *inode; | ||
| 94 | |||
| 95 | XFS_STATS_INC(vn_hold); | ||
| 96 | |||
| 97 | inode = igrab(vn_to_inode(vp)); | ||
| 98 | ASSERT(inode); | ||
| 99 | |||
| 100 | return vp; | ||
| 101 | } | ||
| 102 | |||
| 103 | #ifdef XFS_INODE_TRACE | 85 | #ifdef XFS_INODE_TRACE |
| 104 | 86 | ||
| 105 | /* | 87 | /* |
| @@ -108,7 +90,7 @@ vn_hold( | |||
| 108 | */ | 90 | */ |
| 109 | static inline int xfs_icount(struct xfs_inode *ip) | 91 | static inline int xfs_icount(struct xfs_inode *ip) |
| 110 | { | 92 | { |
| 111 | bhv_vnode_t *vp = XFS_ITOV_NULL(ip); | 93 | struct inode *vp = VFS_I(ip); |
| 112 | 94 | ||
| 113 | if (vp) | 95 | if (vp) |
| 114 | return vn_count(vp); | 96 | return vn_count(vp); |
diff --git a/fs/xfs/linux-2.6/xfs_vnode.h b/fs/xfs/linux-2.6/xfs_vnode.h index 41ca2cec5d31..683ce16210ff 100644 --- a/fs/xfs/linux-2.6/xfs_vnode.h +++ b/fs/xfs/linux-2.6/xfs_vnode.h | |||
| @@ -22,20 +22,6 @@ struct file; | |||
| 22 | struct xfs_iomap; | 22 | struct xfs_iomap; |
| 23 | struct attrlist_cursor_kern; | 23 | struct attrlist_cursor_kern; |
| 24 | 24 | ||
| 25 | typedef struct inode bhv_vnode_t; | ||
| 26 | |||
| 27 | /* | ||
| 28 | * Vnode to Linux inode mapping. | ||
| 29 | */ | ||
| 30 | static inline bhv_vnode_t *vn_from_inode(struct inode *inode) | ||
| 31 | { | ||
| 32 | return inode; | ||
| 33 | } | ||
| 34 | static inline struct inode *vn_to_inode(bhv_vnode_t *vnode) | ||
| 35 | { | ||
| 36 | return vnode; | ||
| 37 | } | ||
| 38 | |||
| 39 | /* | 25 | /* |
| 40 | * Return values for xfs_inactive. A return value of | 26 | * Return values for xfs_inactive. A return value of |
| 41 | * VN_INACTIVE_NOCACHE implies that the file system behavior | 27 | * VN_INACTIVE_NOCACHE implies that the file system behavior |
| @@ -76,57 +62,52 @@ extern void vn_iowait(struct xfs_inode *ip); | |||
| 76 | extern void vn_iowake(struct xfs_inode *ip); | 62 | extern void vn_iowake(struct xfs_inode *ip); |
| 77 | extern void vn_ioerror(struct xfs_inode *ip, int error, char *f, int l); | 63 | extern void vn_ioerror(struct xfs_inode *ip, int error, char *f, int l); |
| 78 | 64 | ||
| 79 | static inline int vn_count(bhv_vnode_t *vp) | 65 | static inline int vn_count(struct inode *vp) |
| 80 | { | 66 | { |
| 81 | return atomic_read(&vn_to_inode(vp)->i_count); | 67 | return atomic_read(&vp->i_count); |
| 82 | } | 68 | } |
| 83 | 69 | ||
| 84 | /* | 70 | #define IHOLD(ip) \ |
| 85 | * Vnode reference counting functions (and macros for compatibility). | 71 | do { \ |
| 86 | */ | 72 | ASSERT(atomic_read(&VFS_I(ip)->i_count) > 0) ; \ |
| 87 | extern bhv_vnode_t *vn_hold(bhv_vnode_t *); | 73 | atomic_inc(&(VFS_I(ip)->i_count)); \ |
| 74 | xfs_itrace_hold((ip), __FILE__, __LINE__, (inst_t *)__return_address); \ | ||
| 75 | } while (0) | ||
| 88 | 76 | ||
| 89 | #if defined(XFS_INODE_TRACE) | 77 | #define IRELE(ip) \ |
| 90 | #define VN_HOLD(vp) \ | 78 | do { \ |
| 91 | ((void)vn_hold(vp), \ | 79 | xfs_itrace_rele((ip), __FILE__, __LINE__, (inst_t *)__return_address); \ |
| 92 | xfs_itrace_hold(xfs_vtoi(vp), __FILE__, __LINE__, (inst_t *)__return_address)) | 80 | iput(VFS_I(ip)); \ |
| 93 | #define VN_RELE(vp) \ | 81 | } while (0) |
| 94 | (xfs_itrace_rele(xfs_vtoi(vp), __FILE__, __LINE__, (inst_t *)__return_address), \ | ||
| 95 | iput(vn_to_inode(vp))) | ||
| 96 | #else | ||
| 97 | #define VN_HOLD(vp) ((void)vn_hold(vp)) | ||
| 98 | #define VN_RELE(vp) (iput(vn_to_inode(vp))) | ||
| 99 | #endif | ||
| 100 | 82 | ||
| 101 | static inline bhv_vnode_t *vn_grab(bhv_vnode_t *vp) | 83 | static inline struct inode *vn_grab(struct inode *vp) |
| 102 | { | 84 | { |
| 103 | struct inode *inode = igrab(vn_to_inode(vp)); | 85 | return igrab(vp); |
| 104 | return inode ? vn_from_inode(inode) : NULL; | ||
| 105 | } | 86 | } |
| 106 | 87 | ||
| 107 | /* | 88 | /* |
| 108 | * Dealing with bad inodes | 89 | * Dealing with bad inodes |
| 109 | */ | 90 | */ |
| 110 | static inline int VN_BAD(bhv_vnode_t *vp) | 91 | static inline int VN_BAD(struct inode *vp) |
| 111 | { | 92 | { |
| 112 | return is_bad_inode(vn_to_inode(vp)); | 93 | return is_bad_inode(vp); |
| 113 | } | 94 | } |
| 114 | 95 | ||
| 115 | /* | 96 | /* |
| 116 | * Extracting atime values in various formats | 97 | * Extracting atime values in various formats |
| 117 | */ | 98 | */ |
| 118 | static inline void vn_atime_to_bstime(bhv_vnode_t *vp, xfs_bstime_t *bs_atime) | 99 | static inline void vn_atime_to_bstime(struct inode *vp, xfs_bstime_t *bs_atime) |
| 119 | { | 100 | { |
| 120 | bs_atime->tv_sec = vp->i_atime.tv_sec; | 101 | bs_atime->tv_sec = vp->i_atime.tv_sec; |
| 121 | bs_atime->tv_nsec = vp->i_atime.tv_nsec; | 102 | bs_atime->tv_nsec = vp->i_atime.tv_nsec; |
| 122 | } | 103 | } |
| 123 | 104 | ||
| 124 | static inline void vn_atime_to_timespec(bhv_vnode_t *vp, struct timespec *ts) | 105 | static inline void vn_atime_to_timespec(struct inode *vp, struct timespec *ts) |
| 125 | { | 106 | { |
| 126 | *ts = vp->i_atime; | 107 | *ts = vp->i_atime; |
| 127 | } | 108 | } |
| 128 | 109 | ||
| 129 | static inline void vn_atime_to_time_t(bhv_vnode_t *vp, time_t *tt) | 110 | static inline void vn_atime_to_time_t(struct inode *vp, time_t *tt) |
| 130 | { | 111 | { |
| 131 | *tt = vp->i_atime.tv_sec; | 112 | *tt = vp->i_atime.tv_sec; |
| 132 | } | 113 | } |
| @@ -134,9 +115,9 @@ static inline void vn_atime_to_time_t(bhv_vnode_t *vp, time_t *tt) | |||
| 134 | /* | 115 | /* |
| 135 | * Some useful predicates. | 116 | * Some useful predicates. |
| 136 | */ | 117 | */ |
| 137 | #define VN_MAPPED(vp) mapping_mapped(vn_to_inode(vp)->i_mapping) | 118 | #define VN_MAPPED(vp) mapping_mapped(vp->i_mapping) |
| 138 | #define VN_CACHED(vp) (vn_to_inode(vp)->i_mapping->nrpages) | 119 | #define VN_CACHED(vp) (vp->i_mapping->nrpages) |
| 139 | #define VN_DIRTY(vp) mapping_tagged(vn_to_inode(vp)->i_mapping, \ | 120 | #define VN_DIRTY(vp) mapping_tagged(vp->i_mapping, \ |
| 140 | PAGECACHE_TAG_DIRTY) | 121 | PAGECACHE_TAG_DIRTY) |
| 141 | 122 | ||
| 142 | 123 | ||
diff --git a/fs/xfs/quota/xfs_dquot.c b/fs/xfs/quota/xfs_dquot.c index fc9f3fb39b7b..f2705f2fd43c 100644 --- a/fs/xfs/quota/xfs_dquot.c +++ b/fs/xfs/quota/xfs_dquot.c | |||
| @@ -101,11 +101,18 @@ xfs_qm_dqinit( | |||
| 101 | if (brandnewdquot) { | 101 | if (brandnewdquot) { |
| 102 | dqp->dq_flnext = dqp->dq_flprev = dqp; | 102 | dqp->dq_flnext = dqp->dq_flprev = dqp; |
| 103 | mutex_init(&dqp->q_qlock); | 103 | mutex_init(&dqp->q_qlock); |
| 104 | initnsema(&dqp->q_flock, 1, "fdq"); | ||
| 105 | sv_init(&dqp->q_pinwait, SV_DEFAULT, "pdq"); | 104 | sv_init(&dqp->q_pinwait, SV_DEFAULT, "pdq"); |
| 106 | 105 | ||
| 106 | /* | ||
| 107 | * Because we want to use a counting completion, complete | ||
| 108 | * the flush completion once to allow a single access to | ||
| 109 | * the flush completion without blocking. | ||
| 110 | */ | ||
| 111 | init_completion(&dqp->q_flush); | ||
| 112 | complete(&dqp->q_flush); | ||
| 113 | |||
| 107 | #ifdef XFS_DQUOT_TRACE | 114 | #ifdef XFS_DQUOT_TRACE |
| 108 | dqp->q_trace = ktrace_alloc(DQUOT_TRACE_SIZE, KM_SLEEP); | 115 | dqp->q_trace = ktrace_alloc(DQUOT_TRACE_SIZE, KM_NOFS); |
| 109 | xfs_dqtrace_entry(dqp, "DQINIT"); | 116 | xfs_dqtrace_entry(dqp, "DQINIT"); |
| 110 | #endif | 117 | #endif |
| 111 | } else { | 118 | } else { |
| @@ -150,7 +157,6 @@ xfs_qm_dqdestroy( | |||
| 150 | ASSERT(! XFS_DQ_IS_ON_FREELIST(dqp)); | 157 | ASSERT(! XFS_DQ_IS_ON_FREELIST(dqp)); |
| 151 | 158 | ||
| 152 | mutex_destroy(&dqp->q_qlock); | 159 | mutex_destroy(&dqp->q_qlock); |
| 153 | freesema(&dqp->q_flock); | ||
| 154 | sv_destroy(&dqp->q_pinwait); | 160 | sv_destroy(&dqp->q_pinwait); |
| 155 | 161 | ||
| 156 | #ifdef XFS_DQUOT_TRACE | 162 | #ifdef XFS_DQUOT_TRACE |
| @@ -431,7 +437,7 @@ xfs_qm_dqalloc( | |||
| 431 | * when it unlocks the inode. Since we want to keep the quota | 437 | * when it unlocks the inode. Since we want to keep the quota |
| 432 | * inode around, we bump the vnode ref count now. | 438 | * inode around, we bump the vnode ref count now. |
| 433 | */ | 439 | */ |
| 434 | VN_HOLD(XFS_ITOV(quotip)); | 440 | IHOLD(quotip); |
| 435 | 441 | ||
| 436 | xfs_trans_ijoin(tp, quotip, XFS_ILOCK_EXCL); | 442 | xfs_trans_ijoin(tp, quotip, XFS_ILOCK_EXCL); |
| 437 | nmaps = 1; | 443 | nmaps = 1; |
| @@ -1211,7 +1217,7 @@ xfs_qm_dqflush( | |||
| 1211 | int error; | 1217 | int error; |
| 1212 | 1218 | ||
| 1213 | ASSERT(XFS_DQ_IS_LOCKED(dqp)); | 1219 | ASSERT(XFS_DQ_IS_LOCKED(dqp)); |
| 1214 | ASSERT(XFS_DQ_IS_FLUSH_LOCKED(dqp)); | 1220 | ASSERT(!completion_done(&dqp->q_flush)); |
| 1215 | xfs_dqtrace_entry(dqp, "DQFLUSH"); | 1221 | xfs_dqtrace_entry(dqp, "DQFLUSH"); |
| 1216 | 1222 | ||
| 1217 | /* | 1223 | /* |
| @@ -1348,34 +1354,18 @@ xfs_qm_dqflush_done( | |||
| 1348 | xfs_dqfunlock(dqp); | 1354 | xfs_dqfunlock(dqp); |
| 1349 | } | 1355 | } |
| 1350 | 1356 | ||
| 1351 | |||
| 1352 | int | ||
| 1353 | xfs_qm_dqflock_nowait( | ||
| 1354 | xfs_dquot_t *dqp) | ||
| 1355 | { | ||
| 1356 | int locked; | ||
| 1357 | |||
| 1358 | locked = cpsema(&((dqp)->q_flock)); | ||
| 1359 | |||
| 1360 | /* XXX ifdef these out */ | ||
| 1361 | if (locked) | ||
| 1362 | (dqp)->dq_flags |= XFS_DQ_FLOCKED; | ||
| 1363 | return (locked); | ||
| 1364 | } | ||
| 1365 | |||
| 1366 | |||
| 1367 | int | 1357 | int |
| 1368 | xfs_qm_dqlock_nowait( | 1358 | xfs_qm_dqlock_nowait( |
| 1369 | xfs_dquot_t *dqp) | 1359 | xfs_dquot_t *dqp) |
| 1370 | { | 1360 | { |
| 1371 | return (mutex_trylock(&((dqp)->q_qlock))); | 1361 | return mutex_trylock(&dqp->q_qlock); |
| 1372 | } | 1362 | } |
| 1373 | 1363 | ||
| 1374 | void | 1364 | void |
| 1375 | xfs_dqlock( | 1365 | xfs_dqlock( |
| 1376 | xfs_dquot_t *dqp) | 1366 | xfs_dquot_t *dqp) |
| 1377 | { | 1367 | { |
| 1378 | mutex_lock(&(dqp->q_qlock)); | 1368 | mutex_lock(&dqp->q_qlock); |
| 1379 | } | 1369 | } |
| 1380 | 1370 | ||
| 1381 | void | 1371 | void |
| @@ -1468,7 +1458,7 @@ xfs_qm_dqpurge( | |||
| 1468 | * if we're turning off quotas. Basically, we need this flush | 1458 | * if we're turning off quotas. Basically, we need this flush |
| 1469 | * lock, and are willing to block on it. | 1459 | * lock, and are willing to block on it. |
| 1470 | */ | 1460 | */ |
| 1471 | if (! xfs_qm_dqflock_nowait(dqp)) { | 1461 | if (!xfs_dqflock_nowait(dqp)) { |
| 1472 | /* | 1462 | /* |
| 1473 | * Block on the flush lock after nudging dquot buffer, | 1463 | * Block on the flush lock after nudging dquot buffer, |
| 1474 | * if it is incore. | 1464 | * if it is incore. |
diff --git a/fs/xfs/quota/xfs_dquot.h b/fs/xfs/quota/xfs_dquot.h index f7393bba4e95..8958d0faf8d3 100644 --- a/fs/xfs/quota/xfs_dquot.h +++ b/fs/xfs/quota/xfs_dquot.h | |||
| @@ -82,7 +82,7 @@ typedef struct xfs_dquot { | |||
| 82 | xfs_qcnt_t q_res_icount; /* total inos allocd+reserved */ | 82 | xfs_qcnt_t q_res_icount; /* total inos allocd+reserved */ |
| 83 | xfs_qcnt_t q_res_rtbcount;/* total realtime blks used+reserved */ | 83 | xfs_qcnt_t q_res_rtbcount;/* total realtime blks used+reserved */ |
| 84 | mutex_t q_qlock; /* quota lock */ | 84 | mutex_t q_qlock; /* quota lock */ |
| 85 | sema_t q_flock; /* flush lock */ | 85 | struct completion q_flush; /* flush completion queue */ |
| 86 | uint q_pincount; /* pin count for this dquot */ | 86 | uint q_pincount; /* pin count for this dquot */ |
| 87 | sv_t q_pinwait; /* sync var for pinning */ | 87 | sv_t q_pinwait; /* sync var for pinning */ |
| 88 | #ifdef XFS_DQUOT_TRACE | 88 | #ifdef XFS_DQUOT_TRACE |
| @@ -113,17 +113,25 @@ XFS_DQ_IS_LOCKED(xfs_dquot_t *dqp) | |||
| 113 | 113 | ||
| 114 | 114 | ||
| 115 | /* | 115 | /* |
| 116 | * The following three routines simply manage the q_flock | 116 | * Manage the q_flush completion queue embedded in the dquot. This completion |
| 117 | * semaphore embedded in the dquot. This semaphore synchronizes | 117 | * queue synchronizes processes attempting to flush the in-core dquot back to |
| 118 | * processes attempting to flush the in-core dquot back to disk. | 118 | * disk. |
| 119 | */ | 119 | */ |
| 120 | #define xfs_dqflock(dqp) { psema(&((dqp)->q_flock), PINOD | PRECALC);\ | 120 | static inline void xfs_dqflock(xfs_dquot_t *dqp) |
| 121 | (dqp)->dq_flags |= XFS_DQ_FLOCKED; } | 121 | { |
| 122 | #define xfs_dqfunlock(dqp) { ASSERT(issemalocked(&((dqp)->q_flock))); \ | 122 | wait_for_completion(&dqp->q_flush); |
| 123 | vsema(&((dqp)->q_flock)); \ | 123 | } |
| 124 | (dqp)->dq_flags &= ~(XFS_DQ_FLOCKED); } | 124 | |
| 125 | static inline int xfs_dqflock_nowait(xfs_dquot_t *dqp) | ||
| 126 | { | ||
| 127 | return try_wait_for_completion(&dqp->q_flush); | ||
| 128 | } | ||
| 129 | |||
| 130 | static inline void xfs_dqfunlock(xfs_dquot_t *dqp) | ||
| 131 | { | ||
| 132 | complete(&dqp->q_flush); | ||
| 133 | } | ||
| 125 | 134 | ||
| 126 | #define XFS_DQ_IS_FLUSH_LOCKED(dqp) (issemalocked(&((dqp)->q_flock))) | ||
| 127 | #define XFS_DQ_IS_ON_FREELIST(dqp) ((dqp)->dq_flnext != (dqp)) | 135 | #define XFS_DQ_IS_ON_FREELIST(dqp) ((dqp)->dq_flnext != (dqp)) |
| 128 | #define XFS_DQ_IS_DIRTY(dqp) ((dqp)->dq_flags & XFS_DQ_DIRTY) | 136 | #define XFS_DQ_IS_DIRTY(dqp) ((dqp)->dq_flags & XFS_DQ_DIRTY) |
| 129 | #define XFS_QM_ISUDQ(dqp) ((dqp)->dq_flags & XFS_DQ_USER) | 137 | #define XFS_QM_ISUDQ(dqp) ((dqp)->dq_flags & XFS_DQ_USER) |
| @@ -167,7 +175,6 @@ extern int xfs_qm_dqflush(xfs_dquot_t *, uint); | |||
| 167 | extern int xfs_qm_dqpurge(xfs_dquot_t *); | 175 | extern int xfs_qm_dqpurge(xfs_dquot_t *); |
| 168 | extern void xfs_qm_dqunpin_wait(xfs_dquot_t *); | 176 | extern void xfs_qm_dqunpin_wait(xfs_dquot_t *); |
| 169 | extern int xfs_qm_dqlock_nowait(xfs_dquot_t *); | 177 | extern int xfs_qm_dqlock_nowait(xfs_dquot_t *); |
| 170 | extern int xfs_qm_dqflock_nowait(xfs_dquot_t *); | ||
| 171 | extern void xfs_qm_dqflock_pushbuf_wait(xfs_dquot_t *dqp); | 178 | extern void xfs_qm_dqflock_pushbuf_wait(xfs_dquot_t *dqp); |
| 172 | extern void xfs_qm_adjust_dqtimers(xfs_mount_t *, | 179 | extern void xfs_qm_adjust_dqtimers(xfs_mount_t *, |
| 173 | xfs_disk_dquot_t *); | 180 | xfs_disk_dquot_t *); |
diff --git a/fs/xfs/quota/xfs_dquot_item.c b/fs/xfs/quota/xfs_dquot_item.c index 08d2fc89e6a1..f028644caa5e 100644 --- a/fs/xfs/quota/xfs_dquot_item.c +++ b/fs/xfs/quota/xfs_dquot_item.c | |||
| @@ -151,7 +151,7 @@ xfs_qm_dquot_logitem_push( | |||
| 151 | dqp = logitem->qli_dquot; | 151 | dqp = logitem->qli_dquot; |
| 152 | 152 | ||
| 153 | ASSERT(XFS_DQ_IS_LOCKED(dqp)); | 153 | ASSERT(XFS_DQ_IS_LOCKED(dqp)); |
| 154 | ASSERT(XFS_DQ_IS_FLUSH_LOCKED(dqp)); | 154 | ASSERT(!completion_done(&dqp->q_flush)); |
| 155 | 155 | ||
| 156 | /* | 156 | /* |
| 157 | * Since we were able to lock the dquot's flush lock and | 157 | * Since we were able to lock the dquot's flush lock and |
| @@ -245,7 +245,7 @@ xfs_qm_dquot_logitem_pushbuf( | |||
| 245 | * inode flush completed and the inode was taken off the AIL. | 245 | * inode flush completed and the inode was taken off the AIL. |
| 246 | * So, just get out. | 246 | * So, just get out. |
| 247 | */ | 247 | */ |
| 248 | if (!issemalocked(&(dqp->q_flock)) || | 248 | if (completion_done(&dqp->q_flush) || |
| 249 | ((qip->qli_item.li_flags & XFS_LI_IN_AIL) == 0)) { | 249 | ((qip->qli_item.li_flags & XFS_LI_IN_AIL) == 0)) { |
| 250 | qip->qli_pushbuf_flag = 0; | 250 | qip->qli_pushbuf_flag = 0; |
| 251 | xfs_dqunlock(dqp); | 251 | xfs_dqunlock(dqp); |
| @@ -258,7 +258,7 @@ xfs_qm_dquot_logitem_pushbuf( | |||
| 258 | if (bp != NULL) { | 258 | if (bp != NULL) { |
| 259 | if (XFS_BUF_ISDELAYWRITE(bp)) { | 259 | if (XFS_BUF_ISDELAYWRITE(bp)) { |
| 260 | dopush = ((qip->qli_item.li_flags & XFS_LI_IN_AIL) && | 260 | dopush = ((qip->qli_item.li_flags & XFS_LI_IN_AIL) && |
| 261 | issemalocked(&(dqp->q_flock))); | 261 | !completion_done(&dqp->q_flush)); |
| 262 | qip->qli_pushbuf_flag = 0; | 262 | qip->qli_pushbuf_flag = 0; |
| 263 | xfs_dqunlock(dqp); | 263 | xfs_dqunlock(dqp); |
| 264 | 264 | ||
| @@ -317,7 +317,7 @@ xfs_qm_dquot_logitem_trylock( | |||
| 317 | return (XFS_ITEM_LOCKED); | 317 | return (XFS_ITEM_LOCKED); |
| 318 | 318 | ||
| 319 | retval = XFS_ITEM_SUCCESS; | 319 | retval = XFS_ITEM_SUCCESS; |
| 320 | if (! xfs_qm_dqflock_nowait(dqp)) { | 320 | if (!xfs_dqflock_nowait(dqp)) { |
| 321 | /* | 321 | /* |
| 322 | * The dquot is already being flushed. It may have been | 322 | * The dquot is already being flushed. It may have been |
| 323 | * flushed delayed write, however, and we don't want to | 323 | * flushed delayed write, however, and we don't want to |
diff --git a/fs/xfs/quota/xfs_qm.c b/fs/xfs/quota/xfs_qm.c index 021934a3d456..df0ffef9775a 100644 --- a/fs/xfs/quota/xfs_qm.c +++ b/fs/xfs/quota/xfs_qm.c | |||
| @@ -310,8 +310,7 @@ xfs_qm_unmount_quotadestroy( | |||
| 310 | */ | 310 | */ |
| 311 | void | 311 | void |
| 312 | xfs_qm_mount_quotas( | 312 | xfs_qm_mount_quotas( |
| 313 | xfs_mount_t *mp, | 313 | xfs_mount_t *mp) |
| 314 | int mfsi_flags) | ||
| 315 | { | 314 | { |
| 316 | int error = 0; | 315 | int error = 0; |
| 317 | uint sbf; | 316 | uint sbf; |
| @@ -346,8 +345,7 @@ xfs_qm_mount_quotas( | |||
| 346 | /* | 345 | /* |
| 347 | * If any of the quotas are not consistent, do a quotacheck. | 346 | * If any of the quotas are not consistent, do a quotacheck. |
| 348 | */ | 347 | */ |
| 349 | if (XFS_QM_NEED_QUOTACHECK(mp) && | 348 | if (XFS_QM_NEED_QUOTACHECK(mp)) { |
| 350 | !(mfsi_flags & XFS_MFSI_NO_QUOTACHECK)) { | ||
| 351 | error = xfs_qm_quotacheck(mp); | 349 | error = xfs_qm_quotacheck(mp); |
| 352 | if (error) { | 350 | if (error) { |
| 353 | /* Quotacheck failed and disabled quotas. */ | 351 | /* Quotacheck failed and disabled quotas. */ |
| @@ -484,7 +482,7 @@ again: | |||
| 484 | xfs_dqtrace_entry(dqp, "FLUSHALL: DQDIRTY"); | 482 | xfs_dqtrace_entry(dqp, "FLUSHALL: DQDIRTY"); |
| 485 | /* XXX a sentinel would be better */ | 483 | /* XXX a sentinel would be better */ |
| 486 | recl = XFS_QI_MPLRECLAIMS(mp); | 484 | recl = XFS_QI_MPLRECLAIMS(mp); |
| 487 | if (! xfs_qm_dqflock_nowait(dqp)) { | 485 | if (!xfs_dqflock_nowait(dqp)) { |
| 488 | /* | 486 | /* |
| 489 | * If we can't grab the flush lock then check | 487 | * If we can't grab the flush lock then check |
| 490 | * to see if the dquot has been flushed delayed | 488 | * to see if the dquot has been flushed delayed |
| @@ -1062,7 +1060,7 @@ xfs_qm_sync( | |||
| 1062 | 1060 | ||
| 1063 | /* XXX a sentinel would be better */ | 1061 | /* XXX a sentinel would be better */ |
| 1064 | recl = XFS_QI_MPLRECLAIMS(mp); | 1062 | recl = XFS_QI_MPLRECLAIMS(mp); |
| 1065 | if (! xfs_qm_dqflock_nowait(dqp)) { | 1063 | if (!xfs_dqflock_nowait(dqp)) { |
| 1066 | if (nowait) { | 1064 | if (nowait) { |
| 1067 | xfs_dqunlock(dqp); | 1065 | xfs_dqunlock(dqp); |
| 1068 | continue; | 1066 | continue; |
| @@ -2079,7 +2077,7 @@ xfs_qm_shake_freelist( | |||
| 2079 | * Try to grab the flush lock. If this dquot is in the process of | 2077 | * Try to grab the flush lock. If this dquot is in the process of |
| 2080 | * getting flushed to disk, we don't want to reclaim it. | 2078 | * getting flushed to disk, we don't want to reclaim it. |
| 2081 | */ | 2079 | */ |
| 2082 | if (! xfs_qm_dqflock_nowait(dqp)) { | 2080 | if (!xfs_dqflock_nowait(dqp)) { |
| 2083 | xfs_dqunlock(dqp); | 2081 | xfs_dqunlock(dqp); |
| 2084 | dqp = dqp->dq_flnext; | 2082 | dqp = dqp->dq_flnext; |
| 2085 | continue; | 2083 | continue; |
| @@ -2257,7 +2255,7 @@ xfs_qm_dqreclaim_one(void) | |||
| 2257 | * Try to grab the flush lock. If this dquot is in the process of | 2255 | * Try to grab the flush lock. If this dquot is in the process of |
| 2258 | * getting flushed to disk, we don't want to reclaim it. | 2256 | * getting flushed to disk, we don't want to reclaim it. |
| 2259 | */ | 2257 | */ |
| 2260 | if (! xfs_qm_dqflock_nowait(dqp)) { | 2258 | if (!xfs_dqflock_nowait(dqp)) { |
| 2261 | xfs_dqunlock(dqp); | 2259 | xfs_dqunlock(dqp); |
| 2262 | continue; | 2260 | continue; |
| 2263 | } | 2261 | } |
diff --git a/fs/xfs/quota/xfs_qm.h b/fs/xfs/quota/xfs_qm.h index cd2300e374af..44f25349e478 100644 --- a/fs/xfs/quota/xfs_qm.h +++ b/fs/xfs/quota/xfs_qm.h | |||
| @@ -165,7 +165,7 @@ typedef struct xfs_dquot_acct { | |||
| 165 | #define XFS_QM_RELE(xqm) ((xqm)->qm_nrefs--) | 165 | #define XFS_QM_RELE(xqm) ((xqm)->qm_nrefs--) |
| 166 | 166 | ||
| 167 | extern void xfs_qm_destroy_quotainfo(xfs_mount_t *); | 167 | extern void xfs_qm_destroy_quotainfo(xfs_mount_t *); |
| 168 | extern void xfs_qm_mount_quotas(xfs_mount_t *, int); | 168 | extern void xfs_qm_mount_quotas(xfs_mount_t *); |
| 169 | extern int xfs_qm_quotacheck(xfs_mount_t *); | 169 | extern int xfs_qm_quotacheck(xfs_mount_t *); |
| 170 | extern void xfs_qm_unmount_quotadestroy(xfs_mount_t *); | 170 | extern void xfs_qm_unmount_quotadestroy(xfs_mount_t *); |
| 171 | extern int xfs_qm_unmount_quotas(xfs_mount_t *); | 171 | extern int xfs_qm_unmount_quotas(xfs_mount_t *); |
diff --git a/fs/xfs/quota/xfs_qm_bhv.c b/fs/xfs/quota/xfs_qm_bhv.c index f4f6c4c861d7..eea2e60b456b 100644 --- a/fs/xfs/quota/xfs_qm_bhv.c +++ b/fs/xfs/quota/xfs_qm_bhv.c | |||
| @@ -162,7 +162,7 @@ xfs_qm_newmount( | |||
| 162 | * mounting, and get on with the boring life | 162 | * mounting, and get on with the boring life |
| 163 | * without disk quotas. | 163 | * without disk quotas. |
| 164 | */ | 164 | */ |
| 165 | xfs_qm_mount_quotas(mp, 0); | 165 | xfs_qm_mount_quotas(mp); |
| 166 | } else { | 166 | } else { |
| 167 | /* | 167 | /* |
| 168 | * Clear the quota flags, but remember them. This | 168 | * Clear the quota flags, but remember them. This |
| @@ -184,13 +184,12 @@ STATIC int | |||
| 184 | xfs_qm_endmount( | 184 | xfs_qm_endmount( |
| 185 | xfs_mount_t *mp, | 185 | xfs_mount_t *mp, |
| 186 | uint needquotamount, | 186 | uint needquotamount, |
| 187 | uint quotaflags, | 187 | uint quotaflags) |
| 188 | int mfsi_flags) | ||
| 189 | { | 188 | { |
| 190 | if (needquotamount) { | 189 | if (needquotamount) { |
| 191 | ASSERT(mp->m_qflags == 0); | 190 | ASSERT(mp->m_qflags == 0); |
| 192 | mp->m_qflags = quotaflags; | 191 | mp->m_qflags = quotaflags; |
| 193 | xfs_qm_mount_quotas(mp, mfsi_flags); | 192 | xfs_qm_mount_quotas(mp); |
| 194 | } | 193 | } |
| 195 | 194 | ||
| 196 | #if defined(DEBUG) && defined(XFS_LOUD_RECOVERY) | 195 | #if defined(DEBUG) && defined(XFS_LOUD_RECOVERY) |
diff --git a/fs/xfs/quota/xfs_qm_syscalls.c b/fs/xfs/quota/xfs_qm_syscalls.c index adfb8723f65a..1a3b803dfa55 100644 --- a/fs/xfs/quota/xfs_qm_syscalls.c +++ b/fs/xfs/quota/xfs_qm_syscalls.c | |||
| @@ -1034,7 +1034,7 @@ xfs_qm_dqrele_all_inodes( | |||
| 1034 | { | 1034 | { |
| 1035 | xfs_inode_t *ip, *topino; | 1035 | xfs_inode_t *ip, *topino; |
| 1036 | uint ireclaims; | 1036 | uint ireclaims; |
| 1037 | bhv_vnode_t *vp; | 1037 | struct inode *vp; |
| 1038 | boolean_t vnode_refd; | 1038 | boolean_t vnode_refd; |
| 1039 | 1039 | ||
| 1040 | ASSERT(mp->m_quotainfo); | 1040 | ASSERT(mp->m_quotainfo); |
| @@ -1059,7 +1059,7 @@ again: | |||
| 1059 | ip = ip->i_mnext; | 1059 | ip = ip->i_mnext; |
| 1060 | continue; | 1060 | continue; |
| 1061 | } | 1061 | } |
| 1062 | vp = XFS_ITOV_NULL(ip); | 1062 | vp = VFS_I(ip); |
| 1063 | if (!vp) { | 1063 | if (!vp) { |
| 1064 | ASSERT(ip->i_udquot == NULL); | 1064 | ASSERT(ip->i_udquot == NULL); |
| 1065 | ASSERT(ip->i_gdquot == NULL); | 1065 | ASSERT(ip->i_gdquot == NULL); |
diff --git a/fs/xfs/xfs_acl.c b/fs/xfs/xfs_acl.c index 3e4648ad9cfc..b2f639a1416f 100644 --- a/fs/xfs/xfs_acl.c +++ b/fs/xfs/xfs_acl.c | |||
| @@ -37,15 +37,15 @@ | |||
| 37 | #include <linux/capability.h> | 37 | #include <linux/capability.h> |
| 38 | #include <linux/posix_acl_xattr.h> | 38 | #include <linux/posix_acl_xattr.h> |
| 39 | 39 | ||
| 40 | STATIC int xfs_acl_setmode(bhv_vnode_t *, xfs_acl_t *, int *); | 40 | STATIC int xfs_acl_setmode(struct inode *, xfs_acl_t *, int *); |
| 41 | STATIC void xfs_acl_filter_mode(mode_t, xfs_acl_t *); | 41 | STATIC void xfs_acl_filter_mode(mode_t, xfs_acl_t *); |
| 42 | STATIC void xfs_acl_get_endian(xfs_acl_t *); | 42 | STATIC void xfs_acl_get_endian(xfs_acl_t *); |
| 43 | STATIC int xfs_acl_access(uid_t, gid_t, xfs_acl_t *, mode_t, cred_t *); | 43 | STATIC int xfs_acl_access(uid_t, gid_t, xfs_acl_t *, mode_t, cred_t *); |
| 44 | STATIC int xfs_acl_invalid(xfs_acl_t *); | 44 | STATIC int xfs_acl_invalid(xfs_acl_t *); |
| 45 | STATIC void xfs_acl_sync_mode(mode_t, xfs_acl_t *); | 45 | STATIC void xfs_acl_sync_mode(mode_t, xfs_acl_t *); |
| 46 | STATIC void xfs_acl_get_attr(bhv_vnode_t *, xfs_acl_t *, int, int, int *); | 46 | STATIC void xfs_acl_get_attr(struct inode *, xfs_acl_t *, int, int, int *); |
| 47 | STATIC void xfs_acl_set_attr(bhv_vnode_t *, xfs_acl_t *, int, int *); | 47 | STATIC void xfs_acl_set_attr(struct inode *, xfs_acl_t *, int, int *); |
| 48 | STATIC int xfs_acl_allow_set(bhv_vnode_t *, int); | 48 | STATIC int xfs_acl_allow_set(struct inode *, int); |
| 49 | 49 | ||
| 50 | kmem_zone_t *xfs_acl_zone; | 50 | kmem_zone_t *xfs_acl_zone; |
| 51 | 51 | ||
| @@ -55,7 +55,7 @@ kmem_zone_t *xfs_acl_zone; | |||
| 55 | */ | 55 | */ |
| 56 | int | 56 | int |
| 57 | xfs_acl_vhasacl_access( | 57 | xfs_acl_vhasacl_access( |
| 58 | bhv_vnode_t *vp) | 58 | struct inode *vp) |
| 59 | { | 59 | { |
| 60 | int error; | 60 | int error; |
| 61 | 61 | ||
| @@ -68,7 +68,7 @@ xfs_acl_vhasacl_access( | |||
| 68 | */ | 68 | */ |
| 69 | int | 69 | int |
| 70 | xfs_acl_vhasacl_default( | 70 | xfs_acl_vhasacl_default( |
| 71 | bhv_vnode_t *vp) | 71 | struct inode *vp) |
| 72 | { | 72 | { |
| 73 | int error; | 73 | int error; |
| 74 | 74 | ||
| @@ -207,7 +207,7 @@ posix_acl_xfs_to_xattr( | |||
| 207 | 207 | ||
| 208 | int | 208 | int |
| 209 | xfs_acl_vget( | 209 | xfs_acl_vget( |
| 210 | bhv_vnode_t *vp, | 210 | struct inode *vp, |
| 211 | void *acl, | 211 | void *acl, |
| 212 | size_t size, | 212 | size_t size, |
| 213 | int kind) | 213 | int kind) |
| @@ -217,7 +217,6 @@ xfs_acl_vget( | |||
| 217 | posix_acl_xattr_header *ext_acl = acl; | 217 | posix_acl_xattr_header *ext_acl = acl; |
| 218 | int flags = 0; | 218 | int flags = 0; |
| 219 | 219 | ||
| 220 | VN_HOLD(vp); | ||
| 221 | if(size) { | 220 | if(size) { |
| 222 | if (!(_ACL_ALLOC(xfs_acl))) { | 221 | if (!(_ACL_ALLOC(xfs_acl))) { |
| 223 | error = ENOMEM; | 222 | error = ENOMEM; |
| @@ -239,11 +238,10 @@ xfs_acl_vget( | |||
| 239 | goto out; | 238 | goto out; |
| 240 | } | 239 | } |
| 241 | if (kind == _ACL_TYPE_ACCESS) | 240 | if (kind == _ACL_TYPE_ACCESS) |
| 242 | xfs_acl_sync_mode(xfs_vtoi(vp)->i_d.di_mode, xfs_acl); | 241 | xfs_acl_sync_mode(XFS_I(vp)->i_d.di_mode, xfs_acl); |
| 243 | error = -posix_acl_xfs_to_xattr(xfs_acl, ext_acl, size); | 242 | error = -posix_acl_xfs_to_xattr(xfs_acl, ext_acl, size); |
| 244 | } | 243 | } |
| 245 | out: | 244 | out: |
| 246 | VN_RELE(vp); | ||
| 247 | if(xfs_acl) | 245 | if(xfs_acl) |
| 248 | _ACL_FREE(xfs_acl); | 246 | _ACL_FREE(xfs_acl); |
| 249 | return -error; | 247 | return -error; |
| @@ -251,28 +249,26 @@ out: | |||
| 251 | 249 | ||
| 252 | int | 250 | int |
| 253 | xfs_acl_vremove( | 251 | xfs_acl_vremove( |
| 254 | bhv_vnode_t *vp, | 252 | struct inode *vp, |
| 255 | int kind) | 253 | int kind) |
| 256 | { | 254 | { |
| 257 | int error; | 255 | int error; |
| 258 | 256 | ||
| 259 | VN_HOLD(vp); | ||
| 260 | error = xfs_acl_allow_set(vp, kind); | 257 | error = xfs_acl_allow_set(vp, kind); |
| 261 | if (!error) { | 258 | if (!error) { |
| 262 | error = xfs_attr_remove(xfs_vtoi(vp), | 259 | error = xfs_attr_remove(XFS_I(vp), |
| 263 | kind == _ACL_TYPE_DEFAULT? | 260 | kind == _ACL_TYPE_DEFAULT? |
| 264 | SGI_ACL_DEFAULT: SGI_ACL_FILE, | 261 | SGI_ACL_DEFAULT: SGI_ACL_FILE, |
| 265 | ATTR_ROOT); | 262 | ATTR_ROOT); |
| 266 | if (error == ENOATTR) | 263 | if (error == ENOATTR) |
| 267 | error = 0; /* 'scool */ | 264 | error = 0; /* 'scool */ |
| 268 | } | 265 | } |
| 269 | VN_RELE(vp); | ||
| 270 | return -error; | 266 | return -error; |
| 271 | } | 267 | } |
| 272 | 268 | ||
| 273 | int | 269 | int |
| 274 | xfs_acl_vset( | 270 | xfs_acl_vset( |
| 275 | bhv_vnode_t *vp, | 271 | struct inode *vp, |
| 276 | void *acl, | 272 | void *acl, |
| 277 | size_t size, | 273 | size_t size, |
| 278 | int kind) | 274 | int kind) |
| @@ -298,7 +294,6 @@ xfs_acl_vset( | |||
| 298 | return 0; | 294 | return 0; |
| 299 | } | 295 | } |
| 300 | 296 | ||
| 301 | VN_HOLD(vp); | ||
| 302 | error = xfs_acl_allow_set(vp, kind); | 297 | error = xfs_acl_allow_set(vp, kind); |
| 303 | 298 | ||
| 304 | /* Incoming ACL exists, set file mode based on its value */ | 299 | /* Incoming ACL exists, set file mode based on its value */ |
| @@ -321,7 +316,6 @@ xfs_acl_vset( | |||
| 321 | } | 316 | } |
| 322 | 317 | ||
| 323 | out: | 318 | out: |
| 324 | VN_RELE(vp); | ||
| 325 | _ACL_FREE(xfs_acl); | 319 | _ACL_FREE(xfs_acl); |
| 326 | return -error; | 320 | return -error; |
| 327 | } | 321 | } |
| @@ -363,7 +357,7 @@ xfs_acl_iaccess( | |||
| 363 | 357 | ||
| 364 | STATIC int | 358 | STATIC int |
| 365 | xfs_acl_allow_set( | 359 | xfs_acl_allow_set( |
| 366 | bhv_vnode_t *vp, | 360 | struct inode *vp, |
| 367 | int kind) | 361 | int kind) |
| 368 | { | 362 | { |
| 369 | if (vp->i_flags & (S_IMMUTABLE|S_APPEND)) | 363 | if (vp->i_flags & (S_IMMUTABLE|S_APPEND)) |
| @@ -372,7 +366,7 @@ xfs_acl_allow_set( | |||
| 372 | return ENOTDIR; | 366 | return ENOTDIR; |
| 373 | if (vp->i_sb->s_flags & MS_RDONLY) | 367 | if (vp->i_sb->s_flags & MS_RDONLY) |
| 374 | return EROFS; | 368 | return EROFS; |
| 375 | if (xfs_vtoi(vp)->i_d.di_uid != current->fsuid && !capable(CAP_FOWNER)) | 369 | if (XFS_I(vp)->i_d.di_uid != current->fsuid && !capable(CAP_FOWNER)) |
| 376 | return EPERM; | 370 | return EPERM; |
| 377 | return 0; | 371 | return 0; |
| 378 | } | 372 | } |
| @@ -566,7 +560,7 @@ xfs_acl_get_endian( | |||
| 566 | */ | 560 | */ |
| 567 | STATIC void | 561 | STATIC void |
| 568 | xfs_acl_get_attr( | 562 | xfs_acl_get_attr( |
| 569 | bhv_vnode_t *vp, | 563 | struct inode *vp, |
| 570 | xfs_acl_t *aclp, | 564 | xfs_acl_t *aclp, |
| 571 | int kind, | 565 | int kind, |
| 572 | int flags, | 566 | int flags, |
| @@ -576,7 +570,7 @@ xfs_acl_get_attr( | |||
| 576 | 570 | ||
| 577 | ASSERT((flags & ATTR_KERNOVAL) ? (aclp == NULL) : 1); | 571 | ASSERT((flags & ATTR_KERNOVAL) ? (aclp == NULL) : 1); |
| 578 | flags |= ATTR_ROOT; | 572 | flags |= ATTR_ROOT; |
| 579 | *error = xfs_attr_get(xfs_vtoi(vp), | 573 | *error = xfs_attr_get(XFS_I(vp), |
| 580 | kind == _ACL_TYPE_ACCESS ? | 574 | kind == _ACL_TYPE_ACCESS ? |
| 581 | SGI_ACL_FILE : SGI_ACL_DEFAULT, | 575 | SGI_ACL_FILE : SGI_ACL_DEFAULT, |
| 582 | (char *)aclp, &len, flags); | 576 | (char *)aclp, &len, flags); |
| @@ -590,7 +584,7 @@ xfs_acl_get_attr( | |||
| 590 | */ | 584 | */ |
| 591 | STATIC void | 585 | STATIC void |
| 592 | xfs_acl_set_attr( | 586 | xfs_acl_set_attr( |
| 593 | bhv_vnode_t *vp, | 587 | struct inode *vp, |
| 594 | xfs_acl_t *aclp, | 588 | xfs_acl_t *aclp, |
| 595 | int kind, | 589 | int kind, |
| 596 | int *error) | 590 | int *error) |
| @@ -615,7 +609,7 @@ xfs_acl_set_attr( | |||
| 615 | INT_SET(newace->ae_perm, ARCH_CONVERT, ace->ae_perm); | 609 | INT_SET(newace->ae_perm, ARCH_CONVERT, ace->ae_perm); |
| 616 | } | 610 | } |
| 617 | INT_SET(newacl->acl_cnt, ARCH_CONVERT, aclp->acl_cnt); | 611 | INT_SET(newacl->acl_cnt, ARCH_CONVERT, aclp->acl_cnt); |
| 618 | *error = xfs_attr_set(xfs_vtoi(vp), | 612 | *error = xfs_attr_set(XFS_I(vp), |
| 619 | kind == _ACL_TYPE_ACCESS ? | 613 | kind == _ACL_TYPE_ACCESS ? |
| 620 | SGI_ACL_FILE: SGI_ACL_DEFAULT, | 614 | SGI_ACL_FILE: SGI_ACL_DEFAULT, |
| 621 | (char *)newacl, len, ATTR_ROOT); | 615 | (char *)newacl, len, ATTR_ROOT); |
| @@ -624,7 +618,7 @@ xfs_acl_set_attr( | |||
| 624 | 618 | ||
| 625 | int | 619 | int |
| 626 | xfs_acl_vtoacl( | 620 | xfs_acl_vtoacl( |
| 627 | bhv_vnode_t *vp, | 621 | struct inode *vp, |
| 628 | xfs_acl_t *access_acl, | 622 | xfs_acl_t *access_acl, |
| 629 | xfs_acl_t *default_acl) | 623 | xfs_acl_t *default_acl) |
| 630 | { | 624 | { |
| @@ -639,7 +633,7 @@ xfs_acl_vtoacl( | |||
| 639 | if (error) | 633 | if (error) |
| 640 | access_acl->acl_cnt = XFS_ACL_NOT_PRESENT; | 634 | access_acl->acl_cnt = XFS_ACL_NOT_PRESENT; |
| 641 | else /* We have a good ACL and the file mode, synchronize. */ | 635 | else /* We have a good ACL and the file mode, synchronize. */ |
| 642 | xfs_acl_sync_mode(xfs_vtoi(vp)->i_d.di_mode, access_acl); | 636 | xfs_acl_sync_mode(XFS_I(vp)->i_d.di_mode, access_acl); |
| 643 | } | 637 | } |
| 644 | 638 | ||
| 645 | if (default_acl) { | 639 | if (default_acl) { |
| @@ -656,7 +650,7 @@ xfs_acl_vtoacl( | |||
| 656 | */ | 650 | */ |
| 657 | int | 651 | int |
| 658 | xfs_acl_inherit( | 652 | xfs_acl_inherit( |
| 659 | bhv_vnode_t *vp, | 653 | struct inode *vp, |
| 660 | mode_t mode, | 654 | mode_t mode, |
| 661 | xfs_acl_t *pdaclp) | 655 | xfs_acl_t *pdaclp) |
| 662 | { | 656 | { |
| @@ -715,7 +709,7 @@ out_error: | |||
| 715 | */ | 709 | */ |
| 716 | STATIC int | 710 | STATIC int |
| 717 | xfs_acl_setmode( | 711 | xfs_acl_setmode( |
| 718 | bhv_vnode_t *vp, | 712 | struct inode *vp, |
| 719 | xfs_acl_t *acl, | 713 | xfs_acl_t *acl, |
| 720 | int *basicperms) | 714 | int *basicperms) |
| 721 | { | 715 | { |
| @@ -734,7 +728,7 @@ xfs_acl_setmode( | |||
| 734 | * mode. The m:: bits take precedence over the g:: bits. | 728 | * mode. The m:: bits take precedence over the g:: bits. |
| 735 | */ | 729 | */ |
| 736 | iattr.ia_valid = ATTR_MODE; | 730 | iattr.ia_valid = ATTR_MODE; |
| 737 | iattr.ia_mode = xfs_vtoi(vp)->i_d.di_mode; | 731 | iattr.ia_mode = XFS_I(vp)->i_d.di_mode; |
| 738 | iattr.ia_mode &= ~(S_IRWXU|S_IRWXG|S_IRWXO); | 732 | iattr.ia_mode &= ~(S_IRWXU|S_IRWXG|S_IRWXO); |
| 739 | ap = acl->acl_entry; | 733 | ap = acl->acl_entry; |
| 740 | for (i = 0; i < acl->acl_cnt; ++i) { | 734 | for (i = 0; i < acl->acl_cnt; ++i) { |
| @@ -764,7 +758,7 @@ xfs_acl_setmode( | |||
| 764 | if (gap && nomask) | 758 | if (gap && nomask) |
| 765 | iattr.ia_mode |= gap->ae_perm << 3; | 759 | iattr.ia_mode |= gap->ae_perm << 3; |
| 766 | 760 | ||
| 767 | return xfs_setattr(xfs_vtoi(vp), &iattr, 0, sys_cred); | 761 | return xfs_setattr(XFS_I(vp), &iattr, 0, sys_cred); |
| 768 | } | 762 | } |
| 769 | 763 | ||
| 770 | /* | 764 | /* |
diff --git a/fs/xfs/xfs_acl.h b/fs/xfs/xfs_acl.h index 323ee94cf831..a4e293b93efa 100644 --- a/fs/xfs/xfs_acl.h +++ b/fs/xfs/xfs_acl.h | |||
| @@ -59,14 +59,14 @@ extern struct kmem_zone *xfs_acl_zone; | |||
| 59 | (zone) = kmem_zone_init(sizeof(xfs_acl_t), (name)) | 59 | (zone) = kmem_zone_init(sizeof(xfs_acl_t), (name)) |
| 60 | #define xfs_acl_zone_destroy(zone) kmem_zone_destroy(zone) | 60 | #define xfs_acl_zone_destroy(zone) kmem_zone_destroy(zone) |
| 61 | 61 | ||
| 62 | extern int xfs_acl_inherit(bhv_vnode_t *, mode_t mode, xfs_acl_t *); | 62 | extern int xfs_acl_inherit(struct inode *, mode_t mode, xfs_acl_t *); |
| 63 | extern int xfs_acl_iaccess(struct xfs_inode *, mode_t, cred_t *); | 63 | extern int xfs_acl_iaccess(struct xfs_inode *, mode_t, cred_t *); |
| 64 | extern int xfs_acl_vtoacl(bhv_vnode_t *, xfs_acl_t *, xfs_acl_t *); | 64 | extern int xfs_acl_vtoacl(struct inode *, xfs_acl_t *, xfs_acl_t *); |
| 65 | extern int xfs_acl_vhasacl_access(bhv_vnode_t *); | 65 | extern int xfs_acl_vhasacl_access(struct inode *); |
| 66 | extern int xfs_acl_vhasacl_default(bhv_vnode_t *); | 66 | extern int xfs_acl_vhasacl_default(struct inode *); |
| 67 | extern int xfs_acl_vset(bhv_vnode_t *, void *, size_t, int); | 67 | extern int xfs_acl_vset(struct inode *, void *, size_t, int); |
| 68 | extern int xfs_acl_vget(bhv_vnode_t *, void *, size_t, int); | 68 | extern int xfs_acl_vget(struct inode *, void *, size_t, int); |
| 69 | extern int xfs_acl_vremove(bhv_vnode_t *, int); | 69 | extern int xfs_acl_vremove(struct inode *, int); |
| 70 | 70 | ||
| 71 | #define _ACL_PERM_INVALID(perm) ((perm) & ~(ACL_READ|ACL_WRITE|ACL_EXECUTE)) | 71 | #define _ACL_PERM_INVALID(perm) ((perm) & ~(ACL_READ|ACL_WRITE|ACL_EXECUTE)) |
| 72 | 72 | ||
diff --git a/fs/xfs/xfs_arch.h b/fs/xfs/xfs_arch.h index f9472a2076d4..0b3b5efe848c 100644 --- a/fs/xfs/xfs_arch.h +++ b/fs/xfs/xfs_arch.h | |||
| @@ -92,16 +92,6 @@ | |||
| 92 | ((__u8*)(pointer))[1] = (((value) ) & 0xff); \ | 92 | ((__u8*)(pointer))[1] = (((value) ) & 0xff); \ |
| 93 | } | 93 | } |
| 94 | 94 | ||
| 95 | /* define generic INT_ macros */ | ||
| 96 | |||
| 97 | #define INT_GET(reference,arch) \ | ||
| 98 | (((arch) == ARCH_NOCONVERT) \ | ||
| 99 | ? \ | ||
| 100 | (reference) \ | ||
| 101 | : \ | ||
| 102 | INT_SWAP((reference),(reference)) \ | ||
| 103 | ) | ||
| 104 | |||
| 105 | /* does not return a value */ | 95 | /* does not return a value */ |
| 106 | #define INT_SET(reference,arch,valueref) \ | 96 | #define INT_SET(reference,arch,valueref) \ |
| 107 | (__builtin_constant_p(valueref) ? \ | 97 | (__builtin_constant_p(valueref) ? \ |
| @@ -112,64 +102,6 @@ | |||
| 112 | ) \ | 102 | ) \ |
| 113 | ) | 103 | ) |
| 114 | 104 | ||
| 115 | /* does not return a value */ | ||
| 116 | #define INT_MOD_EXPR(reference,arch,code) \ | ||
| 117 | (((arch) == ARCH_NOCONVERT) \ | ||
| 118 | ? \ | ||
| 119 | (void)((reference) code) \ | ||
| 120 | : \ | ||
| 121 | (void)( \ | ||
| 122 | (reference) = INT_GET((reference),arch) , \ | ||
| 123 | ((reference) code), \ | ||
| 124 | INT_SET(reference, arch, reference) \ | ||
| 125 | ) \ | ||
| 126 | ) | ||
| 127 | |||
| 128 | /* does not return a value */ | ||
| 129 | #define INT_MOD(reference,arch,delta) \ | ||
| 130 | (void)( \ | ||
| 131 | INT_MOD_EXPR(reference,arch,+=(delta)) \ | ||
| 132 | ) | ||
| 133 | |||
| 134 | /* | ||
| 135 | * INT_COPY - copy a value between two locations with the | ||
| 136 | * _same architecture_ but _potentially different sizes_ | ||
| 137 | * | ||
| 138 | * if the types of the two parameters are equal or they are | ||
| 139 | * in native architecture, a simple copy is done | ||
| 140 | * | ||
| 141 | * otherwise, architecture conversions are done | ||
| 142 | * | ||
| 143 | */ | ||
| 144 | |||
| 145 | /* does not return a value */ | ||
| 146 | #define INT_COPY(dst,src,arch) \ | ||
| 147 | ( \ | ||
| 148 | ((sizeof(dst) == sizeof(src)) || ((arch) == ARCH_NOCONVERT)) \ | ||
| 149 | ? \ | ||
| 150 | (void)((dst) = (src)) \ | ||
| 151 | : \ | ||
| 152 | INT_SET(dst, arch, INT_GET(src, arch)) \ | ||
| 153 | ) | ||
| 154 | |||
| 155 | /* | ||
| 156 | * INT_XLATE - copy a value in either direction between two locations | ||
| 157 | * with different architectures | ||
| 158 | * | ||
| 159 | * dir < 0 - copy from memory to buffer (native to arch) | ||
| 160 | * dir > 0 - copy from buffer to memory (arch to native) | ||
| 161 | */ | ||
| 162 | |||
| 163 | /* does not return a value */ | ||
| 164 | #define INT_XLATE(buf,mem,dir,arch) {\ | ||
| 165 | ASSERT(dir); \ | ||
| 166 | if (dir>0) { \ | ||
| 167 | (mem)=INT_GET(buf, arch); \ | ||
| 168 | } else { \ | ||
| 169 | INT_SET(buf, arch, mem); \ | ||
| 170 | } \ | ||
| 171 | } | ||
| 172 | |||
| 173 | /* | 105 | /* |
| 174 | * In directories inode numbers are stored as unaligned arrays of unsigned | 106 | * In directories inode numbers are stored as unaligned arrays of unsigned |
| 175 | * 8bit integers on disk. | 107 | * 8bit integers on disk. |
diff --git a/fs/xfs/xfs_attr.c b/fs/xfs/xfs_attr.c index 78de80e3caa2..f7cdc28aff41 100644 --- a/fs/xfs/xfs_attr.c +++ b/fs/xfs/xfs_attr.c | |||
| @@ -194,6 +194,46 @@ xfs_attr_get( | |||
| 194 | return(error); | 194 | return(error); |
| 195 | } | 195 | } |
| 196 | 196 | ||
| 197 | /* | ||
| 198 | * Calculate how many blocks we need for the new attribute, | ||
| 199 | */ | ||
| 200 | int | ||
| 201 | xfs_attr_calc_size( | ||
| 202 | struct xfs_inode *ip, | ||
| 203 | int namelen, | ||
| 204 | int valuelen, | ||
| 205 | int *local) | ||
| 206 | { | ||
| 207 | struct xfs_mount *mp = ip->i_mount; | ||
| 208 | int size; | ||
| 209 | int nblks; | ||
| 210 | |||
| 211 | /* | ||
| 212 | * Determine space new attribute will use, and if it would be | ||
| 213 | * "local" or "remote" (note: local != inline). | ||
| 214 | */ | ||
| 215 | size = xfs_attr_leaf_newentsize(namelen, valuelen, | ||
| 216 | mp->m_sb.sb_blocksize, local); | ||
| 217 | |||
| 218 | nblks = XFS_DAENTER_SPACE_RES(mp, XFS_ATTR_FORK); | ||
| 219 | if (*local) { | ||
| 220 | if (size > (mp->m_sb.sb_blocksize >> 1)) { | ||
| 221 | /* Double split possible */ | ||
| 222 | nblks *= 2; | ||
| 223 | } | ||
| 224 | } else { | ||
| 225 | /* | ||
| 226 | * Out of line attribute, cannot double split, but | ||
| 227 | * make room for the attribute value itself. | ||
| 228 | */ | ||
| 229 | uint dblocks = XFS_B_TO_FSB(mp, valuelen); | ||
| 230 | nblks += dblocks; | ||
| 231 | nblks += XFS_NEXTENTADD_SPACE_RES(mp, dblocks, XFS_ATTR_FORK); | ||
| 232 | } | ||
| 233 | |||
| 234 | return nblks; | ||
| 235 | } | ||
| 236 | |||
| 197 | STATIC int | 237 | STATIC int |
| 198 | xfs_attr_set_int(xfs_inode_t *dp, struct xfs_name *name, | 238 | xfs_attr_set_int(xfs_inode_t *dp, struct xfs_name *name, |
| 199 | char *value, int valuelen, int flags) | 239 | char *value, int valuelen, int flags) |
| @@ -202,10 +242,9 @@ xfs_attr_set_int(xfs_inode_t *dp, struct xfs_name *name, | |||
| 202 | xfs_fsblock_t firstblock; | 242 | xfs_fsblock_t firstblock; |
| 203 | xfs_bmap_free_t flist; | 243 | xfs_bmap_free_t flist; |
| 204 | int error, err2, committed; | 244 | int error, err2, committed; |
| 205 | int local, size; | ||
| 206 | uint nblks; | ||
| 207 | xfs_mount_t *mp = dp->i_mount; | 245 | xfs_mount_t *mp = dp->i_mount; |
| 208 | int rsvd = (flags & ATTR_ROOT) != 0; | 246 | int rsvd = (flags & ATTR_ROOT) != 0; |
| 247 | int local; | ||
| 209 | 248 | ||
| 210 | /* | 249 | /* |
| 211 | * Attach the dquots to the inode. | 250 | * Attach the dquots to the inode. |
| @@ -241,30 +280,8 @@ xfs_attr_set_int(xfs_inode_t *dp, struct xfs_name *name, | |||
| 241 | args.whichfork = XFS_ATTR_FORK; | 280 | args.whichfork = XFS_ATTR_FORK; |
| 242 | args.op_flags = XFS_DA_OP_ADDNAME | XFS_DA_OP_OKNOENT; | 281 | args.op_flags = XFS_DA_OP_ADDNAME | XFS_DA_OP_OKNOENT; |
| 243 | 282 | ||
| 244 | /* | ||
| 245 | * Determine space new attribute will use, and if it would be | ||
| 246 | * "local" or "remote" (note: local != inline). | ||
| 247 | */ | ||
| 248 | size = xfs_attr_leaf_newentsize(name->len, valuelen, | ||
| 249 | mp->m_sb.sb_blocksize, &local); | ||
| 250 | |||
| 251 | nblks = XFS_DAENTER_SPACE_RES(mp, XFS_ATTR_FORK); | ||
| 252 | if (local) { | ||
| 253 | if (size > (mp->m_sb.sb_blocksize >> 1)) { | ||
| 254 | /* Double split possible */ | ||
| 255 | nblks <<= 1; | ||
| 256 | } | ||
| 257 | } else { | ||
| 258 | uint dblocks = XFS_B_TO_FSB(mp, valuelen); | ||
| 259 | /* Out of line attribute, cannot double split, but make | ||
| 260 | * room for the attribute value itself. | ||
| 261 | */ | ||
| 262 | nblks += dblocks; | ||
| 263 | nblks += XFS_NEXTENTADD_SPACE_RES(mp, dblocks, XFS_ATTR_FORK); | ||
| 264 | } | ||
| 265 | |||
| 266 | /* Size is now blocks for attribute data */ | 283 | /* Size is now blocks for attribute data */ |
| 267 | args.total = nblks; | 284 | args.total = xfs_attr_calc_size(dp, name->len, valuelen, &local); |
| 268 | 285 | ||
| 269 | /* | 286 | /* |
| 270 | * Start our first transaction of the day. | 287 | * Start our first transaction of the day. |
| @@ -286,18 +303,17 @@ xfs_attr_set_int(xfs_inode_t *dp, struct xfs_name *name, | |||
| 286 | if (rsvd) | 303 | if (rsvd) |
| 287 | args.trans->t_flags |= XFS_TRANS_RESERVE; | 304 | args.trans->t_flags |= XFS_TRANS_RESERVE; |
| 288 | 305 | ||
| 289 | if ((error = xfs_trans_reserve(args.trans, (uint) nblks, | 306 | if ((error = xfs_trans_reserve(args.trans, args.total, |
| 290 | XFS_ATTRSET_LOG_RES(mp, nblks), | 307 | XFS_ATTRSET_LOG_RES(mp, args.total), 0, |
| 291 | 0, XFS_TRANS_PERM_LOG_RES, | 308 | XFS_TRANS_PERM_LOG_RES, XFS_ATTRSET_LOG_COUNT))) { |
| 292 | XFS_ATTRSET_LOG_COUNT))) { | ||
| 293 | xfs_trans_cancel(args.trans, 0); | 309 | xfs_trans_cancel(args.trans, 0); |
| 294 | return(error); | 310 | return(error); |
| 295 | } | 311 | } |
| 296 | xfs_ilock(dp, XFS_ILOCK_EXCL); | 312 | xfs_ilock(dp, XFS_ILOCK_EXCL); |
| 297 | 313 | ||
| 298 | error = XFS_TRANS_RESERVE_QUOTA_NBLKS(mp, args.trans, dp, nblks, 0, | 314 | error = XFS_TRANS_RESERVE_QUOTA_NBLKS(mp, args.trans, dp, args.total, 0, |
| 299 | rsvd ? XFS_QMOPT_RES_REGBLKS | XFS_QMOPT_FORCE_RES : | 315 | rsvd ? XFS_QMOPT_RES_REGBLKS | XFS_QMOPT_FORCE_RES : |
| 300 | XFS_QMOPT_RES_REGBLKS); | 316 | XFS_QMOPT_RES_REGBLKS); |
| 301 | if (error) { | 317 | if (error) { |
| 302 | xfs_iunlock(dp, XFS_ILOCK_EXCL); | 318 | xfs_iunlock(dp, XFS_ILOCK_EXCL); |
| 303 | xfs_trans_cancel(args.trans, XFS_TRANS_RELEASE_LOG_RES); | 319 | xfs_trans_cancel(args.trans, XFS_TRANS_RELEASE_LOG_RES); |
| @@ -384,7 +400,9 @@ xfs_attr_set_int(xfs_inode_t *dp, struct xfs_name *name, | |||
| 384 | * Commit the leaf transformation. We'll need another (linked) | 400 | * Commit the leaf transformation. We'll need another (linked) |
| 385 | * transaction to add the new attribute to the leaf. | 401 | * transaction to add the new attribute to the leaf. |
| 386 | */ | 402 | */ |
| 387 | if ((error = xfs_attr_rolltrans(&args.trans, dp))) | 403 | |
| 404 | error = xfs_trans_roll(&args.trans, dp); | ||
| 405 | if (error) | ||
| 388 | goto out; | 406 | goto out; |
| 389 | 407 | ||
| 390 | } | 408 | } |
| @@ -964,7 +982,8 @@ xfs_attr_leaf_addname(xfs_da_args_t *args) | |||
| 964 | * Commit the current trans (including the inode) and start | 982 | * Commit the current trans (including the inode) and start |
| 965 | * a new one. | 983 | * a new one. |
| 966 | */ | 984 | */ |
| 967 | if ((error = xfs_attr_rolltrans(&args->trans, dp))) | 985 | error = xfs_trans_roll(&args->trans, dp); |
| 986 | if (error) | ||
| 968 | return (error); | 987 | return (error); |
| 969 | 988 | ||
| 970 | /* | 989 | /* |
| @@ -978,7 +997,8 @@ xfs_attr_leaf_addname(xfs_da_args_t *args) | |||
| 978 | * Commit the transaction that added the attr name so that | 997 | * Commit the transaction that added the attr name so that |
| 979 | * later routines can manage their own transactions. | 998 | * later routines can manage their own transactions. |
| 980 | */ | 999 | */ |
| 981 | if ((error = xfs_attr_rolltrans(&args->trans, dp))) | 1000 | error = xfs_trans_roll(&args->trans, dp); |
| 1001 | if (error) | ||
| 982 | return (error); | 1002 | return (error); |
| 983 | 1003 | ||
| 984 | /* | 1004 | /* |
| @@ -1067,7 +1087,7 @@ xfs_attr_leaf_addname(xfs_da_args_t *args) | |||
| 1067 | /* | 1087 | /* |
| 1068 | * Commit the remove and start the next trans in series. | 1088 | * Commit the remove and start the next trans in series. |
| 1069 | */ | 1089 | */ |
| 1070 | error = xfs_attr_rolltrans(&args->trans, dp); | 1090 | error = xfs_trans_roll(&args->trans, dp); |
| 1071 | 1091 | ||
| 1072 | } else if (args->rmtblkno > 0) { | 1092 | } else if (args->rmtblkno > 0) { |
| 1073 | /* | 1093 | /* |
| @@ -1298,7 +1318,8 @@ restart: | |||
| 1298 | * Commit the node conversion and start the next | 1318 | * Commit the node conversion and start the next |
| 1299 | * trans in the chain. | 1319 | * trans in the chain. |
| 1300 | */ | 1320 | */ |
| 1301 | if ((error = xfs_attr_rolltrans(&args->trans, dp))) | 1321 | error = xfs_trans_roll(&args->trans, dp); |
| 1322 | if (error) | ||
| 1302 | goto out; | 1323 | goto out; |
| 1303 | 1324 | ||
| 1304 | goto restart; | 1325 | goto restart; |
| @@ -1349,7 +1370,8 @@ restart: | |||
| 1349 | * Commit the leaf addition or btree split and start the next | 1370 | * Commit the leaf addition or btree split and start the next |
| 1350 | * trans in the chain. | 1371 | * trans in the chain. |
| 1351 | */ | 1372 | */ |
| 1352 | if ((error = xfs_attr_rolltrans(&args->trans, dp))) | 1373 | error = xfs_trans_roll(&args->trans, dp); |
| 1374 | if (error) | ||
| 1353 | goto out; | 1375 | goto out; |
| 1354 | 1376 | ||
| 1355 | /* | 1377 | /* |
| @@ -1449,7 +1471,8 @@ restart: | |||
| 1449 | /* | 1471 | /* |
| 1450 | * Commit and start the next trans in the chain. | 1472 | * Commit and start the next trans in the chain. |
| 1451 | */ | 1473 | */ |
| 1452 | if ((error = xfs_attr_rolltrans(&args->trans, dp))) | 1474 | error = xfs_trans_roll(&args->trans, dp); |
| 1475 | if (error) | ||
| 1453 | goto out; | 1476 | goto out; |
| 1454 | 1477 | ||
| 1455 | } else if (args->rmtblkno > 0) { | 1478 | } else if (args->rmtblkno > 0) { |
| @@ -1581,7 +1604,8 @@ xfs_attr_node_removename(xfs_da_args_t *args) | |||
| 1581 | /* | 1604 | /* |
| 1582 | * Commit the Btree join operation and start a new trans. | 1605 | * Commit the Btree join operation and start a new trans. |
| 1583 | */ | 1606 | */ |
| 1584 | if ((error = xfs_attr_rolltrans(&args->trans, dp))) | 1607 | error = xfs_trans_roll(&args->trans, dp); |
| 1608 | if (error) | ||
| 1585 | goto out; | 1609 | goto out; |
| 1586 | } | 1610 | } |
| 1587 | 1611 | ||
| @@ -2082,7 +2106,8 @@ xfs_attr_rmtval_set(xfs_da_args_t *args) | |||
| 2082 | /* | 2106 | /* |
| 2083 | * Start the next trans in the chain. | 2107 | * Start the next trans in the chain. |
| 2084 | */ | 2108 | */ |
| 2085 | if ((error = xfs_attr_rolltrans(&args->trans, dp))) | 2109 | error = xfs_trans_roll(&args->trans, dp); |
| 2110 | if (error) | ||
| 2086 | return (error); | 2111 | return (error); |
| 2087 | } | 2112 | } |
| 2088 | 2113 | ||
| @@ -2232,7 +2257,8 @@ xfs_attr_rmtval_remove(xfs_da_args_t *args) | |||
| 2232 | /* | 2257 | /* |
| 2233 | * Close out trans and start the next one in the chain. | 2258 | * Close out trans and start the next one in the chain. |
| 2234 | */ | 2259 | */ |
| 2235 | if ((error = xfs_attr_rolltrans(&args->trans, args->dp))) | 2260 | error = xfs_trans_roll(&args->trans, args->dp); |
| 2261 | if (error) | ||
| 2236 | return (error); | 2262 | return (error); |
| 2237 | } | 2263 | } |
| 2238 | return(0); | 2264 | return(0); |
diff --git a/fs/xfs/xfs_attr.h b/fs/xfs/xfs_attr.h index 8b2d31c19e4d..fb3b2a68b9b9 100644 --- a/fs/xfs/xfs_attr.h +++ b/fs/xfs/xfs_attr.h | |||
| @@ -129,6 +129,7 @@ typedef struct xfs_attr_list_context { | |||
| 129 | /* | 129 | /* |
| 130 | * Overall external interface routines. | 130 | * Overall external interface routines. |
| 131 | */ | 131 | */ |
| 132 | int xfs_attr_calc_size(struct xfs_inode *, int, int, int *); | ||
| 132 | int xfs_attr_inactive(struct xfs_inode *dp); | 133 | int xfs_attr_inactive(struct xfs_inode *dp); |
| 133 | int xfs_attr_fetch(struct xfs_inode *, struct xfs_name *, char *, int *, int); | 134 | int xfs_attr_fetch(struct xfs_inode *, struct xfs_name *, char *, int *, int); |
| 134 | int xfs_attr_rmtval_get(struct xfs_da_args *args); | 135 | int xfs_attr_rmtval_get(struct xfs_da_args *args); |
diff --git a/fs/xfs/xfs_attr_leaf.c b/fs/xfs/xfs_attr_leaf.c index 23ef5d7c87e1..79da6b2ea99e 100644 --- a/fs/xfs/xfs_attr_leaf.c +++ b/fs/xfs/xfs_attr_leaf.c | |||
| @@ -2498,9 +2498,7 @@ xfs_attr_leaf_clearflag(xfs_da_args_t *args) | |||
| 2498 | /* | 2498 | /* |
| 2499 | * Commit the flag value change and start the next trans in series. | 2499 | * Commit the flag value change and start the next trans in series. |
| 2500 | */ | 2500 | */ |
| 2501 | error = xfs_attr_rolltrans(&args->trans, args->dp); | 2501 | return xfs_trans_roll(&args->trans, args->dp); |
| 2502 | |||
| 2503 | return(error); | ||
| 2504 | } | 2502 | } |
| 2505 | 2503 | ||
| 2506 | /* | 2504 | /* |
| @@ -2547,9 +2545,7 @@ xfs_attr_leaf_setflag(xfs_da_args_t *args) | |||
| 2547 | /* | 2545 | /* |
| 2548 | * Commit the flag value change and start the next trans in series. | 2546 | * Commit the flag value change and start the next trans in series. |
| 2549 | */ | 2547 | */ |
| 2550 | error = xfs_attr_rolltrans(&args->trans, args->dp); | 2548 | return xfs_trans_roll(&args->trans, args->dp); |
| 2551 | |||
| 2552 | return(error); | ||
| 2553 | } | 2549 | } |
| 2554 | 2550 | ||
| 2555 | /* | 2551 | /* |
| @@ -2665,7 +2661,7 @@ xfs_attr_leaf_flipflags(xfs_da_args_t *args) | |||
| 2665 | /* | 2661 | /* |
| 2666 | * Commit the flag value change and start the next trans in series. | 2662 | * Commit the flag value change and start the next trans in series. |
| 2667 | */ | 2663 | */ |
| 2668 | error = xfs_attr_rolltrans(&args->trans, args->dp); | 2664 | error = xfs_trans_roll(&args->trans, args->dp); |
| 2669 | 2665 | ||
| 2670 | return(error); | 2666 | return(error); |
| 2671 | } | 2667 | } |
| @@ -2723,7 +2719,7 @@ xfs_attr_root_inactive(xfs_trans_t **trans, xfs_inode_t *dp) | |||
| 2723 | /* | 2719 | /* |
| 2724 | * Commit the invalidate and start the next transaction. | 2720 | * Commit the invalidate and start the next transaction. |
| 2725 | */ | 2721 | */ |
| 2726 | error = xfs_attr_rolltrans(trans, dp); | 2722 | error = xfs_trans_roll(trans, dp); |
| 2727 | 2723 | ||
| 2728 | return (error); | 2724 | return (error); |
| 2729 | } | 2725 | } |
| @@ -2825,7 +2821,8 @@ xfs_attr_node_inactive(xfs_trans_t **trans, xfs_inode_t *dp, xfs_dabuf_t *bp, | |||
| 2825 | /* | 2821 | /* |
| 2826 | * Atomically commit the whole invalidate stuff. | 2822 | * Atomically commit the whole invalidate stuff. |
| 2827 | */ | 2823 | */ |
| 2828 | if ((error = xfs_attr_rolltrans(trans, dp))) | 2824 | error = xfs_trans_roll(trans, dp); |
| 2825 | if (error) | ||
| 2829 | return (error); | 2826 | return (error); |
| 2830 | } | 2827 | } |
| 2831 | 2828 | ||
| @@ -2964,7 +2961,8 @@ xfs_attr_leaf_freextent(xfs_trans_t **trans, xfs_inode_t *dp, | |||
| 2964 | /* | 2961 | /* |
| 2965 | * Roll to next transaction. | 2962 | * Roll to next transaction. |
| 2966 | */ | 2963 | */ |
| 2967 | if ((error = xfs_attr_rolltrans(trans, dp))) | 2964 | error = xfs_trans_roll(trans, dp); |
| 2965 | if (error) | ||
| 2968 | return (error); | 2966 | return (error); |
| 2969 | } | 2967 | } |
| 2970 | 2968 | ||
| @@ -2974,60 +2972,3 @@ xfs_attr_leaf_freextent(xfs_trans_t **trans, xfs_inode_t *dp, | |||
| 2974 | 2972 | ||
| 2975 | return(0); | 2973 | return(0); |
| 2976 | } | 2974 | } |
| 2977 | |||
| 2978 | |||
| 2979 | /* | ||
| 2980 | * Roll from one trans in the sequence of PERMANENT transactions to the next. | ||
| 2981 | */ | ||
| 2982 | int | ||
| 2983 | xfs_attr_rolltrans(xfs_trans_t **transp, xfs_inode_t *dp) | ||
| 2984 | { | ||
| 2985 | xfs_trans_t *trans; | ||
| 2986 | unsigned int logres, count; | ||
| 2987 | int error; | ||
| 2988 | |||
| 2989 | /* | ||
| 2990 | * Ensure that the inode is always logged. | ||
| 2991 | */ | ||
| 2992 | trans = *transp; | ||
| 2993 | xfs_trans_log_inode(trans, dp, XFS_ILOG_CORE); | ||
| 2994 | |||
| 2995 | /* | ||
| 2996 | * Copy the critical parameters from one trans to the next. | ||
| 2997 | */ | ||
| 2998 | logres = trans->t_log_res; | ||
| 2999 | count = trans->t_log_count; | ||
| 3000 | *transp = xfs_trans_dup(trans); | ||
| 3001 | |||
| 3002 | /* | ||
| 3003 | * Commit the current transaction. | ||
| 3004 | * If this commit failed, then it'd just unlock those items that | ||
| 3005 | * are not marked ihold. That also means that a filesystem shutdown | ||
| 3006 | * is in progress. The caller takes the responsibility to cancel | ||
| 3007 | * the duplicate transaction that gets returned. | ||
| 3008 | */ | ||
| 3009 | if ((error = xfs_trans_commit(trans, 0))) | ||
| 3010 | return (error); | ||
| 3011 | |||
| 3012 | trans = *transp; | ||
| 3013 | |||
| 3014 | /* | ||
| 3015 | * Reserve space in the log for th next transaction. | ||
| 3016 | * This also pushes items in the "AIL", the list of logged items, | ||
| 3017 | * out to disk if they are taking up space at the tail of the log | ||
| 3018 | * that we want to use. This requires that either nothing be locked | ||
| 3019 | * across this call, or that anything that is locked be logged in | ||
| 3020 | * the prior and the next transactions. | ||
| 3021 | */ | ||
| 3022 | error = xfs_trans_reserve(trans, 0, logres, 0, | ||
| 3023 | XFS_TRANS_PERM_LOG_RES, count); | ||
| 3024 | /* | ||
| 3025 | * Ensure that the inode is in the new transaction and locked. | ||
| 3026 | */ | ||
| 3027 | if (!error) { | ||
| 3028 | xfs_trans_ijoin(trans, dp, XFS_ILOCK_EXCL); | ||
| 3029 | xfs_trans_ihold(trans, dp); | ||
| 3030 | } | ||
| 3031 | return (error); | ||
| 3032 | |||
| 3033 | } | ||
diff --git a/fs/xfs/xfs_attr_leaf.h b/fs/xfs/xfs_attr_leaf.h index 5ecf437b7825..83e9af417ca2 100644 --- a/fs/xfs/xfs_attr_leaf.h +++ b/fs/xfs/xfs_attr_leaf.h | |||
| @@ -274,6 +274,4 @@ int xfs_attr_leaf_order(struct xfs_dabuf *leaf1_bp, | |||
| 274 | struct xfs_dabuf *leaf2_bp); | 274 | struct xfs_dabuf *leaf2_bp); |
| 275 | int xfs_attr_leaf_newentsize(int namelen, int valuelen, int blocksize, | 275 | int xfs_attr_leaf_newentsize(int namelen, int valuelen, int blocksize, |
| 276 | int *local); | 276 | int *local); |
| 277 | int xfs_attr_rolltrans(struct xfs_trans **transp, struct xfs_inode *dp); | ||
| 278 | |||
| 279 | #endif /* __XFS_ATTR_LEAF_H__ */ | 277 | #endif /* __XFS_ATTR_LEAF_H__ */ |
diff --git a/fs/xfs/xfs_bit.c b/fs/xfs/xfs_bit.c index fab0b6d5a41b..48228848f5ae 100644 --- a/fs/xfs/xfs_bit.c +++ b/fs/xfs/xfs_bit.c | |||
| @@ -25,109 +25,6 @@ | |||
| 25 | * XFS bit manipulation routines, used in non-realtime code. | 25 | * XFS bit manipulation routines, used in non-realtime code. |
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #ifndef HAVE_ARCH_HIGHBIT | ||
| 29 | /* | ||
| 30 | * Index of high bit number in byte, -1 for none set, 0..7 otherwise. | ||
| 31 | */ | ||
| 32 | static const char xfs_highbit[256] = { | ||
| 33 | -1, 0, 1, 1, 2, 2, 2, 2, /* 00 .. 07 */ | ||
| 34 | 3, 3, 3, 3, 3, 3, 3, 3, /* 08 .. 0f */ | ||
| 35 | 4, 4, 4, 4, 4, 4, 4, 4, /* 10 .. 17 */ | ||
| 36 | 4, 4, 4, 4, 4, 4, 4, 4, /* 18 .. 1f */ | ||
| 37 | 5, 5, 5, 5, 5, 5, 5, 5, /* 20 .. 27 */ | ||
| 38 | 5, 5, 5, 5, 5, 5, 5, 5, /* 28 .. 2f */ | ||
| 39 | 5, 5, 5, 5, 5, 5, 5, 5, /* 30 .. 37 */ | ||
| 40 | 5, 5, 5, 5, 5, 5, 5, 5, /* 38 .. 3f */ | ||
| 41 | 6, 6, 6, 6, 6, 6, 6, 6, /* 40 .. 47 */ | ||
| 42 | 6, 6, 6, 6, 6, 6, 6, 6, /* 48 .. 4f */ | ||
| 43 | 6, 6, 6, 6, 6, 6, 6, 6, /* 50 .. 57 */ | ||
| 44 | 6, 6, 6, 6, 6, 6, 6, 6, /* 58 .. 5f */ | ||
| 45 | 6, 6, 6, 6, 6, 6, 6, 6, /* 60 .. 67 */ | ||
| 46 | 6, 6, 6, 6, 6, 6, 6, 6, /* 68 .. 6f */ | ||
| 47 | 6, 6, 6, 6, 6, 6, 6, 6, /* 70 .. 77 */ | ||
| 48 | 6, 6, 6, 6, 6, 6, 6, 6, /* 78 .. 7f */ | ||
| 49 | 7, 7, 7, 7, 7, 7, 7, 7, /* 80 .. 87 */ | ||
| 50 | 7, 7, 7, 7, 7, 7, 7, 7, /* 88 .. 8f */ | ||
| 51 | 7, 7, 7, 7, 7, 7, 7, 7, /* 90 .. 97 */ | ||
| 52 | 7, 7, 7, 7, 7, 7, 7, 7, /* 98 .. 9f */ | ||
| 53 | 7, 7, 7, 7, 7, 7, 7, 7, /* a0 .. a7 */ | ||
| 54 | 7, 7, 7, 7, 7, 7, 7, 7, /* a8 .. af */ | ||
| 55 | 7, 7, 7, 7, 7, 7, 7, 7, /* b0 .. b7 */ | ||
| 56 | 7, 7, 7, 7, 7, 7, 7, 7, /* b8 .. bf */ | ||
| 57 | 7, 7, 7, 7, 7, 7, 7, 7, /* c0 .. c7 */ | ||
| 58 | 7, 7, 7, 7, 7, 7, 7, 7, /* c8 .. cf */ | ||
| 59 | 7, 7, 7, 7, 7, 7, 7, 7, /* d0 .. d7 */ | ||
| 60 | 7, 7, 7, 7, 7, 7, 7, 7, /* d8 .. df */ | ||
| 61 | 7, 7, 7, 7, 7, 7, 7, 7, /* e0 .. e7 */ | ||
| 62 | 7, 7, 7, 7, 7, 7, 7, 7, /* e8 .. ef */ | ||
| 63 | 7, 7, 7, 7, 7, 7, 7, 7, /* f0 .. f7 */ | ||
| 64 | 7, 7, 7, 7, 7, 7, 7, 7, /* f8 .. ff */ | ||
| 65 | }; | ||
| 66 | #endif | ||
| 67 | |||
| 68 | /* | ||
| 69 | * xfs_highbit32: get high bit set out of 32-bit argument, -1 if none set. | ||
| 70 | */ | ||
| 71 | inline int | ||
| 72 | xfs_highbit32( | ||
| 73 | __uint32_t v) | ||
| 74 | { | ||
| 75 | #ifdef HAVE_ARCH_HIGHBIT | ||
| 76 | return highbit32(v); | ||
| 77 | #else | ||
| 78 | int i; | ||
| 79 | |||
| 80 | if (v & 0xffff0000) | ||
| 81 | if (v & 0xff000000) | ||
| 82 | i = 24; | ||
| 83 | else | ||
| 84 | i = 16; | ||
| 85 | else if (v & 0x0000ffff) | ||
| 86 | if (v & 0x0000ff00) | ||
| 87 | i = 8; | ||
| 88 | else | ||
| 89 | i = 0; | ||
| 90 | else | ||
| 91 | return -1; | ||
| 92 | return i + xfs_highbit[(v >> i) & 0xff]; | ||
| 93 | #endif | ||
| 94 | } | ||
| 95 | |||
| 96 | /* | ||
| 97 | * xfs_lowbit64: get low bit set out of 64-bit argument, -1 if none set. | ||
| 98 | */ | ||
| 99 | int | ||
| 100 | xfs_lowbit64( | ||
| 101 | __uint64_t v) | ||
| 102 | { | ||
| 103 | __uint32_t w = (__uint32_t)v; | ||
| 104 | int n = 0; | ||
| 105 | |||
| 106 | if (w) { /* lower bits */ | ||
| 107 | n = ffs(w); | ||
| 108 | } else { /* upper bits */ | ||
| 109 | w = (__uint32_t)(v >> 32); | ||
| 110 | if (w && (n = ffs(w))) | ||
| 111 | n += 32; | ||
| 112 | } | ||
| 113 | return n - 1; | ||
| 114 | } | ||
| 115 | |||
| 116 | /* | ||
| 117 | * xfs_highbit64: get high bit set out of 64-bit argument, -1 if none set. | ||
| 118 | */ | ||
| 119 | int | ||
| 120 | xfs_highbit64( | ||
| 121 | __uint64_t v) | ||
| 122 | { | ||
| 123 | __uint32_t h = (__uint32_t)(v >> 32); | ||
| 124 | |||
| 125 | if (h) | ||
| 126 | return xfs_highbit32(h) + 32; | ||
| 127 | return xfs_highbit32((__uint32_t)v); | ||
| 128 | } | ||
| 129 | |||
| 130 | |||
| 131 | /* | 28 | /* |
| 132 | * Return whether bitmap is empty. | 29 | * Return whether bitmap is empty. |
| 133 | * Size is number of words in the bitmap, which is padded to word boundary | 30 | * Size is number of words in the bitmap, which is padded to word boundary |
diff --git a/fs/xfs/xfs_bit.h b/fs/xfs/xfs_bit.h index 082641a9782c..8e0e463dae2d 100644 --- a/fs/xfs/xfs_bit.h +++ b/fs/xfs/xfs_bit.h | |||
| @@ -47,13 +47,39 @@ static inline __uint64_t xfs_mask64lo(int n) | |||
| 47 | } | 47 | } |
| 48 | 48 | ||
| 49 | /* Get high bit set out of 32-bit argument, -1 if none set */ | 49 | /* Get high bit set out of 32-bit argument, -1 if none set */ |
| 50 | extern int xfs_highbit32(__uint32_t v); | 50 | static inline int xfs_highbit32(__uint32_t v) |
| 51 | { | ||
| 52 | return fls(v) - 1; | ||
| 53 | } | ||
| 54 | |||
| 55 | /* Get high bit set out of 64-bit argument, -1 if none set */ | ||
| 56 | static inline int xfs_highbit64(__uint64_t v) | ||
| 57 | { | ||
| 58 | return fls64(v) - 1; | ||
| 59 | } | ||
| 60 | |||
| 61 | /* Get low bit set out of 32-bit argument, -1 if none set */ | ||
| 62 | static inline int xfs_lowbit32(__uint32_t v) | ||
| 63 | { | ||
| 64 | unsigned long t = v; | ||
| 65 | return (v) ? find_first_bit(&t, 32) : -1; | ||
| 66 | } | ||
| 51 | 67 | ||
| 52 | /* Get low bit set out of 64-bit argument, -1 if none set */ | 68 | /* Get low bit set out of 64-bit argument, -1 if none set */ |
| 53 | extern int xfs_lowbit64(__uint64_t v); | 69 | static inline int xfs_lowbit64(__uint64_t v) |
| 70 | { | ||
| 71 | __uint32_t w = (__uint32_t)v; | ||
| 72 | int n = 0; | ||
| 54 | 73 | ||
| 55 | /* Get high bit set out of 64-bit argument, -1 if none set */ | 74 | if (w) { /* lower bits */ |
| 56 | extern int xfs_highbit64(__uint64_t); | 75 | n = ffs(w); |
| 76 | } else { /* upper bits */ | ||
| 77 | w = (__uint32_t)(v >> 32); | ||
| 78 | if (w && (n = ffs(w))) | ||
| 79 | n += 32; | ||
| 80 | } | ||
| 81 | return n - 1; | ||
| 82 | } | ||
| 57 | 83 | ||
| 58 | /* Return whether bitmap is empty (1 == empty) */ | 84 | /* Return whether bitmap is empty (1 == empty) */ |
| 59 | extern int xfs_bitmap_empty(uint *map, uint size); | 85 | extern int xfs_bitmap_empty(uint *map, uint size); |
diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c index 3c4beb3a4326..a1aab9275d5a 100644 --- a/fs/xfs/xfs_bmap.c +++ b/fs/xfs/xfs_bmap.c | |||
| @@ -384,14 +384,14 @@ xfs_bmap_count_tree( | |||
| 384 | int levelin, | 384 | int levelin, |
| 385 | int *count); | 385 | int *count); |
| 386 | 386 | ||
| 387 | STATIC int | 387 | STATIC void |
| 388 | xfs_bmap_count_leaves( | 388 | xfs_bmap_count_leaves( |
| 389 | xfs_ifork_t *ifp, | 389 | xfs_ifork_t *ifp, |
| 390 | xfs_extnum_t idx, | 390 | xfs_extnum_t idx, |
| 391 | int numrecs, | 391 | int numrecs, |
| 392 | int *count); | 392 | int *count); |
| 393 | 393 | ||
| 394 | STATIC int | 394 | STATIC void |
| 395 | xfs_bmap_disk_count_leaves( | 395 | xfs_bmap_disk_count_leaves( |
| 396 | xfs_extnum_t idx, | 396 | xfs_extnum_t idx, |
| 397 | xfs_bmbt_block_t *block, | 397 | xfs_bmbt_block_t *block, |
| @@ -4000,7 +4000,7 @@ xfs_bmap_add_attrfork( | |||
| 4000 | ip->i_d.di_aformat = XFS_DINODE_FMT_EXTENTS; | 4000 | ip->i_d.di_aformat = XFS_DINODE_FMT_EXTENTS; |
| 4001 | } | 4001 | } |
| 4002 | ASSERT(ip->i_d.di_anextents == 0); | 4002 | ASSERT(ip->i_d.di_anextents == 0); |
| 4003 | VN_HOLD(XFS_ITOV(ip)); | 4003 | IHOLD(ip); |
| 4004 | xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL); | 4004 | xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL); |
| 4005 | xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE); | 4005 | xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE); |
| 4006 | switch (ip->i_d.di_format) { | 4006 | switch (ip->i_d.di_format) { |
| @@ -6096,7 +6096,7 @@ xfs_bmap_get_bp( | |||
| 6096 | tp = cur->bc_tp; | 6096 | tp = cur->bc_tp; |
| 6097 | licp = &tp->t_items; | 6097 | licp = &tp->t_items; |
| 6098 | while (!bp && licp != NULL) { | 6098 | while (!bp && licp != NULL) { |
| 6099 | if (XFS_LIC_ARE_ALL_FREE(licp)) { | 6099 | if (xfs_lic_are_all_free(licp)) { |
| 6100 | licp = licp->lic_next; | 6100 | licp = licp->lic_next; |
| 6101 | continue; | 6101 | continue; |
| 6102 | } | 6102 | } |
| @@ -6106,11 +6106,11 @@ xfs_bmap_get_bp( | |||
| 6106 | xfs_buf_log_item_t *bip; | 6106 | xfs_buf_log_item_t *bip; |
| 6107 | xfs_buf_t *lbp; | 6107 | xfs_buf_t *lbp; |
| 6108 | 6108 | ||
| 6109 | if (XFS_LIC_ISFREE(licp, i)) { | 6109 | if (xfs_lic_isfree(licp, i)) { |
| 6110 | continue; | 6110 | continue; |
| 6111 | } | 6111 | } |
| 6112 | 6112 | ||
| 6113 | lidp = XFS_LIC_SLOT(licp, i); | 6113 | lidp = xfs_lic_slot(licp, i); |
| 6114 | lip = lidp->lid_item; | 6114 | lip = lidp->lid_item; |
| 6115 | if (lip->li_type != XFS_LI_BUF) | 6115 | if (lip->li_type != XFS_LI_BUF) |
| 6116 | continue; | 6116 | continue; |
| @@ -6367,13 +6367,9 @@ xfs_bmap_count_blocks( | |||
| 6367 | mp = ip->i_mount; | 6367 | mp = ip->i_mount; |
| 6368 | ifp = XFS_IFORK_PTR(ip, whichfork); | 6368 | ifp = XFS_IFORK_PTR(ip, whichfork); |
| 6369 | if ( XFS_IFORK_FORMAT(ip, whichfork) == XFS_DINODE_FMT_EXTENTS ) { | 6369 | if ( XFS_IFORK_FORMAT(ip, whichfork) == XFS_DINODE_FMT_EXTENTS ) { |
| 6370 | if (unlikely(xfs_bmap_count_leaves(ifp, 0, | 6370 | xfs_bmap_count_leaves(ifp, 0, |
| 6371 | ifp->if_bytes / (uint)sizeof(xfs_bmbt_rec_t), | 6371 | ifp->if_bytes / (uint)sizeof(xfs_bmbt_rec_t), |
| 6372 | count) < 0)) { | 6372 | count); |
| 6373 | XFS_ERROR_REPORT("xfs_bmap_count_blocks(1)", | ||
| 6374 | XFS_ERRLEVEL_LOW, mp); | ||
| 6375 | return XFS_ERROR(EFSCORRUPTED); | ||
| 6376 | } | ||
| 6377 | return 0; | 6373 | return 0; |
| 6378 | } | 6374 | } |
| 6379 | 6375 | ||
| @@ -6454,13 +6450,7 @@ xfs_bmap_count_tree( | |||
| 6454 | for (;;) { | 6450 | for (;;) { |
| 6455 | nextbno = be64_to_cpu(block->bb_rightsib); | 6451 | nextbno = be64_to_cpu(block->bb_rightsib); |
| 6456 | numrecs = be16_to_cpu(block->bb_numrecs); | 6452 | numrecs = be16_to_cpu(block->bb_numrecs); |
| 6457 | if (unlikely(xfs_bmap_disk_count_leaves(0, | 6453 | xfs_bmap_disk_count_leaves(0, block, numrecs, count); |
| 6458 | block, numrecs, count) < 0)) { | ||
| 6459 | xfs_trans_brelse(tp, bp); | ||
| 6460 | XFS_ERROR_REPORT("xfs_bmap_count_tree(2)", | ||
| 6461 | XFS_ERRLEVEL_LOW, mp); | ||
| 6462 | return XFS_ERROR(EFSCORRUPTED); | ||
| 6463 | } | ||
| 6464 | xfs_trans_brelse(tp, bp); | 6454 | xfs_trans_brelse(tp, bp); |
| 6465 | if (nextbno == NULLFSBLOCK) | 6455 | if (nextbno == NULLFSBLOCK) |
| 6466 | break; | 6456 | break; |
| @@ -6478,7 +6468,7 @@ xfs_bmap_count_tree( | |||
| 6478 | /* | 6468 | /* |
| 6479 | * Count leaf blocks given a range of extent records. | 6469 | * Count leaf blocks given a range of extent records. |
| 6480 | */ | 6470 | */ |
| 6481 | STATIC int | 6471 | STATIC void |
| 6482 | xfs_bmap_count_leaves( | 6472 | xfs_bmap_count_leaves( |
| 6483 | xfs_ifork_t *ifp, | 6473 | xfs_ifork_t *ifp, |
| 6484 | xfs_extnum_t idx, | 6474 | xfs_extnum_t idx, |
| @@ -6491,14 +6481,13 @@ xfs_bmap_count_leaves( | |||
| 6491 | xfs_bmbt_rec_host_t *frp = xfs_iext_get_ext(ifp, idx + b); | 6481 | xfs_bmbt_rec_host_t *frp = xfs_iext_get_ext(ifp, idx + b); |
| 6492 | *count += xfs_bmbt_get_blockcount(frp); | 6482 | *count += xfs_bmbt_get_blockcount(frp); |
| 6493 | } | 6483 | } |
| 6494 | return 0; | ||
| 6495 | } | 6484 | } |
| 6496 | 6485 | ||
| 6497 | /* | 6486 | /* |
| 6498 | * Count leaf blocks given a range of extent records originally | 6487 | * Count leaf blocks given a range of extent records originally |
| 6499 | * in btree format. | 6488 | * in btree format. |
| 6500 | */ | 6489 | */ |
| 6501 | STATIC int | 6490 | STATIC void |
| 6502 | xfs_bmap_disk_count_leaves( | 6491 | xfs_bmap_disk_count_leaves( |
| 6503 | xfs_extnum_t idx, | 6492 | xfs_extnum_t idx, |
| 6504 | xfs_bmbt_block_t *block, | 6493 | xfs_bmbt_block_t *block, |
| @@ -6512,5 +6501,4 @@ xfs_bmap_disk_count_leaves( | |||
| 6512 | frp = XFS_BTREE_REC_ADDR(xfs_bmbt, block, idx + b); | 6501 | frp = XFS_BTREE_REC_ADDR(xfs_bmbt, block, idx + b); |
| 6513 | *count += xfs_bmbt_disk_get_blockcount(frp); | 6502 | *count += xfs_bmbt_disk_get_blockcount(frp); |
| 6514 | } | 6503 | } |
| 6515 | return 0; | ||
| 6516 | } | 6504 | } |
diff --git a/fs/xfs/xfs_btree.c b/fs/xfs/xfs_btree.c index aeb87ca69fcc..cc593a84c345 100644 --- a/fs/xfs/xfs_btree.c +++ b/fs/xfs/xfs_btree.c | |||
| @@ -46,38 +46,11 @@ kmem_zone_t *xfs_btree_cur_zone; | |||
| 46 | /* | 46 | /* |
| 47 | * Btree magic numbers. | 47 | * Btree magic numbers. |
| 48 | */ | 48 | */ |
| 49 | const __uint32_t xfs_magics[XFS_BTNUM_MAX] = | 49 | const __uint32_t xfs_magics[XFS_BTNUM_MAX] = { |
| 50 | { | ||
| 51 | XFS_ABTB_MAGIC, XFS_ABTC_MAGIC, XFS_BMAP_MAGIC, XFS_IBT_MAGIC | 50 | XFS_ABTB_MAGIC, XFS_ABTC_MAGIC, XFS_BMAP_MAGIC, XFS_IBT_MAGIC |
| 52 | }; | 51 | }; |
| 53 | 52 | ||
| 54 | /* | 53 | /* |
| 55 | * Prototypes for internal routines. | ||
| 56 | */ | ||
| 57 | |||
| 58 | /* | ||
| 59 | * Checking routine: return maxrecs for the block. | ||
| 60 | */ | ||
| 61 | STATIC int /* number of records fitting in block */ | ||
| 62 | xfs_btree_maxrecs( | ||
| 63 | xfs_btree_cur_t *cur, /* btree cursor */ | ||
| 64 | xfs_btree_block_t *block);/* generic btree block pointer */ | ||
| 65 | |||
| 66 | /* | ||
| 67 | * Internal routines. | ||
| 68 | */ | ||
| 69 | |||
| 70 | /* | ||
| 71 | * Retrieve the block pointer from the cursor at the given level. | ||
| 72 | * This may be a bmap btree root or from a buffer. | ||
| 73 | */ | ||
| 74 | STATIC xfs_btree_block_t * /* generic btree block pointer */ | ||
| 75 | xfs_btree_get_block( | ||
| 76 | xfs_btree_cur_t *cur, /* btree cursor */ | ||
| 77 | int level, /* level in btree */ | ||
| 78 | struct xfs_buf **bpp); /* buffer containing the block */ | ||
| 79 | |||
| 80 | /* | ||
| 81 | * Checking routine: return maxrecs for the block. | 54 | * Checking routine: return maxrecs for the block. |
| 82 | */ | 55 | */ |
| 83 | STATIC int /* number of records fitting in block */ | 56 | STATIC int /* number of records fitting in block */ |
| @@ -457,35 +430,6 @@ xfs_btree_dup_cursor( | |||
| 457 | } | 430 | } |
| 458 | 431 | ||
| 459 | /* | 432 | /* |
| 460 | * Change the cursor to point to the first record at the given level. | ||
| 461 | * Other levels are unaffected. | ||
| 462 | */ | ||
| 463 | int /* success=1, failure=0 */ | ||
| 464 | xfs_btree_firstrec( | ||
| 465 | xfs_btree_cur_t *cur, /* btree cursor */ | ||
| 466 | int level) /* level to change */ | ||
| 467 | { | ||
| 468 | xfs_btree_block_t *block; /* generic btree block pointer */ | ||
| 469 | xfs_buf_t *bp; /* buffer containing block */ | ||
| 470 | |||
| 471 | /* | ||
| 472 | * Get the block pointer for this level. | ||
| 473 | */ | ||
| 474 | block = xfs_btree_get_block(cur, level, &bp); | ||
| 475 | xfs_btree_check_block(cur, block, level, bp); | ||
| 476 | /* | ||
| 477 | * It's empty, there is no such record. | ||
| 478 | */ | ||
| 479 | if (!block->bb_h.bb_numrecs) | ||
| 480 | return 0; | ||
| 481 | /* | ||
| 482 | * Set the ptr value to 1, that's the first record/key. | ||
| 483 | */ | ||
| 484 | cur->bc_ptrs[level] = 1; | ||
| 485 | return 1; | ||
| 486 | } | ||
| 487 | |||
| 488 | /* | ||
| 489 | * Retrieve the block pointer from the cursor at the given level. | 433 | * Retrieve the block pointer from the cursor at the given level. |
| 490 | * This may be a bmap btree root or from a buffer. | 434 | * This may be a bmap btree root or from a buffer. |
| 491 | */ | 435 | */ |
| @@ -626,6 +570,13 @@ xfs_btree_init_cursor( | |||
| 626 | cur->bc_private.a.agbp = agbp; | 570 | cur->bc_private.a.agbp = agbp; |
| 627 | cur->bc_private.a.agno = agno; | 571 | cur->bc_private.a.agno = agno; |
| 628 | break; | 572 | break; |
| 573 | case XFS_BTNUM_INO: | ||
| 574 | /* | ||
| 575 | * Inode allocation btree fields. | ||
| 576 | */ | ||
| 577 | cur->bc_private.a.agbp = agbp; | ||
| 578 | cur->bc_private.a.agno = agno; | ||
| 579 | break; | ||
| 629 | case XFS_BTNUM_BMAP: | 580 | case XFS_BTNUM_BMAP: |
| 630 | /* | 581 | /* |
| 631 | * Bmap btree fields. | 582 | * Bmap btree fields. |
| @@ -638,13 +589,6 @@ xfs_btree_init_cursor( | |||
| 638 | cur->bc_private.b.flags = 0; | 589 | cur->bc_private.b.flags = 0; |
| 639 | cur->bc_private.b.whichfork = whichfork; | 590 | cur->bc_private.b.whichfork = whichfork; |
| 640 | break; | 591 | break; |
| 641 | case XFS_BTNUM_INO: | ||
| 642 | /* | ||
| 643 | * Inode allocation btree fields. | ||
| 644 | */ | ||
| 645 | cur->bc_private.i.agbp = agbp; | ||
| 646 | cur->bc_private.i.agno = agno; | ||
| 647 | break; | ||
| 648 | default: | 592 | default: |
| 649 | ASSERT(0); | 593 | ASSERT(0); |
| 650 | } | 594 | } |
| @@ -671,6 +615,35 @@ xfs_btree_islastblock( | |||
| 671 | } | 615 | } |
| 672 | 616 | ||
| 673 | /* | 617 | /* |
| 618 | * Change the cursor to point to the first record at the given level. | ||
| 619 | * Other levels are unaffected. | ||
| 620 | */ | ||
| 621 | int /* success=1, failure=0 */ | ||
| 622 | xfs_btree_firstrec( | ||
| 623 | xfs_btree_cur_t *cur, /* btree cursor */ | ||
| 624 | int level) /* level to change */ | ||
| 625 | { | ||
| 626 | xfs_btree_block_t *block; /* generic btree block pointer */ | ||
| 627 | xfs_buf_t *bp; /* buffer containing block */ | ||
| 628 | |||
| 629 | /* | ||
| 630 | * Get the block pointer for this level. | ||
| 631 | */ | ||
| 632 | block = xfs_btree_get_block(cur, level, &bp); | ||
| 633 | xfs_btree_check_block(cur, block, level, bp); | ||
| 634 | /* | ||
| 635 | * It's empty, there is no such record. | ||
| 636 | */ | ||
| 637 | if (!block->bb_h.bb_numrecs) | ||
| 638 | return 0; | ||
| 639 | /* | ||
| 640 | * Set the ptr value to 1, that's the first record/key. | ||
| 641 | */ | ||
| 642 | cur->bc_ptrs[level] = 1; | ||
| 643 | return 1; | ||
| 644 | } | ||
| 645 | |||
| 646 | /* | ||
| 674 | * Change the cursor to point to the last record in the current block | 647 | * Change the cursor to point to the last record in the current block |
| 675 | * at the given level. Other levels are unaffected. | 648 | * at the given level. Other levels are unaffected. |
| 676 | */ | 649 | */ |
| @@ -890,12 +863,12 @@ xfs_btree_readahead_core( | |||
| 890 | case XFS_BTNUM_INO: | 863 | case XFS_BTNUM_INO: |
| 891 | i = XFS_BUF_TO_INOBT_BLOCK(cur->bc_bufs[lev]); | 864 | i = XFS_BUF_TO_INOBT_BLOCK(cur->bc_bufs[lev]); |
| 892 | if ((lr & XFS_BTCUR_LEFTRA) && be32_to_cpu(i->bb_leftsib) != NULLAGBLOCK) { | 865 | if ((lr & XFS_BTCUR_LEFTRA) && be32_to_cpu(i->bb_leftsib) != NULLAGBLOCK) { |
| 893 | xfs_btree_reada_bufs(cur->bc_mp, cur->bc_private.i.agno, | 866 | xfs_btree_reada_bufs(cur->bc_mp, cur->bc_private.a.agno, |
| 894 | be32_to_cpu(i->bb_leftsib), 1); | 867 | be32_to_cpu(i->bb_leftsib), 1); |
| 895 | rval++; | 868 | rval++; |
| 896 | } | 869 | } |
| 897 | if ((lr & XFS_BTCUR_RIGHTRA) && be32_to_cpu(i->bb_rightsib) != NULLAGBLOCK) { | 870 | if ((lr & XFS_BTCUR_RIGHTRA) && be32_to_cpu(i->bb_rightsib) != NULLAGBLOCK) { |
| 898 | xfs_btree_reada_bufs(cur->bc_mp, cur->bc_private.i.agno, | 871 | xfs_btree_reada_bufs(cur->bc_mp, cur->bc_private.a.agno, |
| 899 | be32_to_cpu(i->bb_rightsib), 1); | 872 | be32_to_cpu(i->bb_rightsib), 1); |
| 900 | rval++; | 873 | rval++; |
| 901 | } | 874 | } |
diff --git a/fs/xfs/xfs_btree.h b/fs/xfs/xfs_btree.h index 7440b78f9cec..1f528a2a3754 100644 --- a/fs/xfs/xfs_btree.h +++ b/fs/xfs/xfs_btree.h | |||
| @@ -158,8 +158,8 @@ typedef struct xfs_btree_cur | |||
| 158 | __uint8_t bc_blocklog; /* log2(blocksize) of btree blocks */ | 158 | __uint8_t bc_blocklog; /* log2(blocksize) of btree blocks */ |
| 159 | xfs_btnum_t bc_btnum; /* identifies which btree type */ | 159 | xfs_btnum_t bc_btnum; /* identifies which btree type */ |
| 160 | union { | 160 | union { |
| 161 | struct { /* needed for BNO, CNT */ | 161 | struct { /* needed for BNO, CNT, INO */ |
| 162 | struct xfs_buf *agbp; /* agf buffer pointer */ | 162 | struct xfs_buf *agbp; /* agf/agi buffer pointer */ |
| 163 | xfs_agnumber_t agno; /* ag number */ | 163 | xfs_agnumber_t agno; /* ag number */ |
| 164 | } a; | 164 | } a; |
| 165 | struct { /* needed for BMAP */ | 165 | struct { /* needed for BMAP */ |
| @@ -172,10 +172,6 @@ typedef struct xfs_btree_cur | |||
| 172 | char flags; /* flags */ | 172 | char flags; /* flags */ |
| 173 | #define XFS_BTCUR_BPRV_WASDEL 1 /* was delayed */ | 173 | #define XFS_BTCUR_BPRV_WASDEL 1 /* was delayed */ |
| 174 | } b; | 174 | } b; |
| 175 | struct { /* needed for INO */ | ||
| 176 | struct xfs_buf *agbp; /* agi buffer pointer */ | ||
| 177 | xfs_agnumber_t agno; /* ag number */ | ||
| 178 | } i; | ||
| 179 | } bc_private; /* per-btree type data */ | 175 | } bc_private; /* per-btree type data */ |
| 180 | } xfs_btree_cur_t; | 176 | } xfs_btree_cur_t; |
| 181 | 177 | ||
diff --git a/fs/xfs/xfs_buf_item.c b/fs/xfs/xfs_buf_item.c index d86ca2c03a70..608c30c3f76b 100644 --- a/fs/xfs/xfs_buf_item.c +++ b/fs/xfs/xfs_buf_item.c | |||
| @@ -737,7 +737,7 @@ xfs_buf_item_init( | |||
| 737 | bip->bli_format.blf_len = (ushort)BTOBB(XFS_BUF_COUNT(bp)); | 737 | bip->bli_format.blf_len = (ushort)BTOBB(XFS_BUF_COUNT(bp)); |
| 738 | bip->bli_format.blf_map_size = map_size; | 738 | bip->bli_format.blf_map_size = map_size; |
| 739 | #ifdef XFS_BLI_TRACE | 739 | #ifdef XFS_BLI_TRACE |
| 740 | bip->bli_trace = ktrace_alloc(XFS_BLI_TRACE_SIZE, KM_SLEEP); | 740 | bip->bli_trace = ktrace_alloc(XFS_BLI_TRACE_SIZE, KM_NOFS); |
| 741 | #endif | 741 | #endif |
| 742 | 742 | ||
| 743 | #ifdef XFS_TRANS_DEBUG | 743 | #ifdef XFS_TRANS_DEBUG |
| @@ -1056,7 +1056,7 @@ xfs_buf_iodone_callbacks( | |||
| 1056 | anyway. */ | 1056 | anyway. */ |
| 1057 | XFS_BUF_SET_BRELSE_FUNC(bp,xfs_buf_error_relse); | 1057 | XFS_BUF_SET_BRELSE_FUNC(bp,xfs_buf_error_relse); |
| 1058 | XFS_BUF_DONE(bp); | 1058 | XFS_BUF_DONE(bp); |
| 1059 | XFS_BUF_V_IODONESEMA(bp); | 1059 | XFS_BUF_FINISH_IOWAIT(bp); |
| 1060 | } | 1060 | } |
| 1061 | return; | 1061 | return; |
| 1062 | } | 1062 | } |
diff --git a/fs/xfs/xfs_dfrag.c b/fs/xfs/xfs_dfrag.c index 2211e885ef24..760f4c5b5160 100644 --- a/fs/xfs/xfs_dfrag.c +++ b/fs/xfs/xfs_dfrag.c | |||
| @@ -128,10 +128,8 @@ xfs_swap_extents( | |||
| 128 | xfs_swapext_t *sxp) | 128 | xfs_swapext_t *sxp) |
| 129 | { | 129 | { |
| 130 | xfs_mount_t *mp; | 130 | xfs_mount_t *mp; |
| 131 | xfs_inode_t *ips[2]; | ||
| 132 | xfs_trans_t *tp; | 131 | xfs_trans_t *tp; |
| 133 | xfs_bstat_t *sbp = &sxp->sx_stat; | 132 | xfs_bstat_t *sbp = &sxp->sx_stat; |
| 134 | bhv_vnode_t *vp, *tvp; | ||
| 135 | xfs_ifork_t *tempifp, *ifp, *tifp; | 133 | xfs_ifork_t *tempifp, *ifp, *tifp; |
| 136 | int ilf_fields, tilf_fields; | 134 | int ilf_fields, tilf_fields; |
| 137 | static uint lock_flags = XFS_ILOCK_EXCL | XFS_IOLOCK_EXCL; | 135 | static uint lock_flags = XFS_ILOCK_EXCL | XFS_IOLOCK_EXCL; |
| @@ -150,19 +148,8 @@ xfs_swap_extents( | |||
| 150 | } | 148 | } |
| 151 | 149 | ||
| 152 | sbp = &sxp->sx_stat; | 150 | sbp = &sxp->sx_stat; |
| 153 | vp = XFS_ITOV(ip); | ||
| 154 | tvp = XFS_ITOV(tip); | ||
| 155 | |||
| 156 | /* Lock in i_ino order */ | ||
| 157 | if (ip->i_ino < tip->i_ino) { | ||
| 158 | ips[0] = ip; | ||
| 159 | ips[1] = tip; | ||
| 160 | } else { | ||
| 161 | ips[0] = tip; | ||
| 162 | ips[1] = ip; | ||
| 163 | } | ||
| 164 | 151 | ||
| 165 | xfs_lock_inodes(ips, 2, lock_flags); | 152 | xfs_lock_two_inodes(ip, tip, lock_flags); |
| 166 | locked = 1; | 153 | locked = 1; |
| 167 | 154 | ||
| 168 | /* Verify that both files have the same format */ | 155 | /* Verify that both files have the same format */ |
| @@ -184,7 +171,7 @@ xfs_swap_extents( | |||
| 184 | goto error0; | 171 | goto error0; |
| 185 | } | 172 | } |
| 186 | 173 | ||
| 187 | if (VN_CACHED(tvp) != 0) { | 174 | if (VN_CACHED(VFS_I(tip)) != 0) { |
| 188 | xfs_inval_cached_trace(tip, 0, -1, 0, -1); | 175 | xfs_inval_cached_trace(tip, 0, -1, 0, -1); |
| 189 | error = xfs_flushinval_pages(tip, 0, -1, | 176 | error = xfs_flushinval_pages(tip, 0, -1, |
| 190 | FI_REMAPF_LOCKED); | 177 | FI_REMAPF_LOCKED); |
| @@ -193,7 +180,7 @@ xfs_swap_extents( | |||
| 193 | } | 180 | } |
| 194 | 181 | ||
| 195 | /* Verify O_DIRECT for ftmp */ | 182 | /* Verify O_DIRECT for ftmp */ |
| 196 | if (VN_CACHED(tvp) != 0) { | 183 | if (VN_CACHED(VFS_I(tip)) != 0) { |
| 197 | error = XFS_ERROR(EINVAL); | 184 | error = XFS_ERROR(EINVAL); |
| 198 | goto error0; | 185 | goto error0; |
| 199 | } | 186 | } |
| @@ -237,7 +224,7 @@ xfs_swap_extents( | |||
| 237 | * vop_read (or write in the case of autogrow) they block on the iolock | 224 | * vop_read (or write in the case of autogrow) they block on the iolock |
| 238 | * until we have switched the extents. | 225 | * until we have switched the extents. |
| 239 | */ | 226 | */ |
| 240 | if (VN_MAPPED(vp)) { | 227 | if (VN_MAPPED(VFS_I(ip))) { |
| 241 | error = XFS_ERROR(EBUSY); | 228 | error = XFS_ERROR(EBUSY); |
| 242 | goto error0; | 229 | goto error0; |
| 243 | } | 230 | } |
| @@ -265,7 +252,7 @@ xfs_swap_extents( | |||
| 265 | locked = 0; | 252 | locked = 0; |
| 266 | goto error0; | 253 | goto error0; |
| 267 | } | 254 | } |
| 268 | xfs_lock_inodes(ips, 2, XFS_ILOCK_EXCL); | 255 | xfs_lock_two_inodes(ip, tip, XFS_ILOCK_EXCL); |
| 269 | 256 | ||
| 270 | /* | 257 | /* |
| 271 | * Count the number of extended attribute blocks | 258 | * Count the number of extended attribute blocks |
| @@ -350,15 +337,11 @@ xfs_swap_extents( | |||
| 350 | break; | 337 | break; |
| 351 | } | 338 | } |
| 352 | 339 | ||
| 353 | /* | ||
| 354 | * Increment vnode ref counts since xfs_trans_commit & | ||
| 355 | * xfs_trans_cancel will both unlock the inodes and | ||
| 356 | * decrement the associated ref counts. | ||
| 357 | */ | ||
| 358 | VN_HOLD(vp); | ||
| 359 | VN_HOLD(tvp); | ||
| 360 | 340 | ||
| 341 | IHOLD(ip); | ||
| 361 | xfs_trans_ijoin(tp, ip, lock_flags); | 342 | xfs_trans_ijoin(tp, ip, lock_flags); |
| 343 | |||
| 344 | IHOLD(tip); | ||
| 362 | xfs_trans_ijoin(tp, tip, lock_flags); | 345 | xfs_trans_ijoin(tp, tip, lock_flags); |
| 363 | 346 | ||
| 364 | xfs_trans_log_inode(tp, ip, ilf_fields); | 347 | xfs_trans_log_inode(tp, ip, ilf_fields); |
diff --git a/fs/xfs/xfs_dmapi.h b/fs/xfs/xfs_dmapi.h index cdc2d3464a1a..2813cdd72375 100644 --- a/fs/xfs/xfs_dmapi.h +++ b/fs/xfs/xfs_dmapi.h | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #ifndef __XFS_DMAPI_H__ | 18 | #ifndef __XFS_DMAPI_H__ |
| 19 | #define __XFS_DMAPI_H__ | 19 | #define __XFS_DMAPI_H__ |
| 20 | 20 | ||
| 21 | #include <linux/version.h> | ||
| 22 | /* Values used to define the on-disk version of dm_attrname_t. All | 21 | /* Values used to define the on-disk version of dm_attrname_t. All |
| 23 | * on-disk attribute names start with the 8-byte string "SGI_DMI_". | 22 | * on-disk attribute names start with the 8-byte string "SGI_DMI_". |
| 24 | * | 23 | * |
diff --git a/fs/xfs/xfs_error.c b/fs/xfs/xfs_error.c index f66756cfb5e8..f227ecd1a294 100644 --- a/fs/xfs/xfs_error.c +++ b/fs/xfs/xfs_error.c | |||
| @@ -58,9 +58,6 @@ xfs_error_trap(int e) | |||
| 58 | } | 58 | } |
| 59 | return e; | 59 | return e; |
| 60 | } | 60 | } |
| 61 | #endif | ||
| 62 | |||
| 63 | #if (defined(DEBUG) || defined(INDUCE_IO_ERROR)) | ||
| 64 | 61 | ||
| 65 | int xfs_etest[XFS_NUM_INJECT_ERROR]; | 62 | int xfs_etest[XFS_NUM_INJECT_ERROR]; |
| 66 | int64_t xfs_etest_fsid[XFS_NUM_INJECT_ERROR]; | 63 | int64_t xfs_etest_fsid[XFS_NUM_INJECT_ERROR]; |
| @@ -154,7 +151,7 @@ xfs_errortag_clearall(xfs_mount_t *mp, int loud) | |||
| 154 | 151 | ||
| 155 | return 0; | 152 | return 0; |
| 156 | } | 153 | } |
| 157 | #endif /* DEBUG || INDUCE_IO_ERROR */ | 154 | #endif /* DEBUG */ |
| 158 | 155 | ||
| 159 | static void | 156 | static void |
| 160 | xfs_fs_vcmn_err(int level, xfs_mount_t *mp, char *fmt, va_list ap) | 157 | xfs_fs_vcmn_err(int level, xfs_mount_t *mp, char *fmt, va_list ap) |
diff --git a/fs/xfs/xfs_error.h b/fs/xfs/xfs_error.h index d8559d132efa..11543f10b0c6 100644 --- a/fs/xfs/xfs_error.h +++ b/fs/xfs/xfs_error.h | |||
| @@ -125,22 +125,14 @@ extern void xfs_corruption_error(char *tag, int level, struct xfs_mount *mp, | |||
| 125 | #define XFS_RANDOM_DIOWRITE_IOERR (XFS_RANDOM_DEFAULT/10) | 125 | #define XFS_RANDOM_DIOWRITE_IOERR (XFS_RANDOM_DEFAULT/10) |
| 126 | #define XFS_RANDOM_BMAPIFORMAT XFS_RANDOM_DEFAULT | 126 | #define XFS_RANDOM_BMAPIFORMAT XFS_RANDOM_DEFAULT |
| 127 | 127 | ||
| 128 | #if (defined(DEBUG) || defined(INDUCE_IO_ERROR)) | 128 | #ifdef DEBUG |
| 129 | extern int xfs_error_test(int, int *, char *, int, char *, unsigned long); | 129 | extern int xfs_error_test(int, int *, char *, int, char *, unsigned long); |
| 130 | 130 | ||
| 131 | #define XFS_NUM_INJECT_ERROR 10 | 131 | #define XFS_NUM_INJECT_ERROR 10 |
| 132 | |||
| 133 | #ifdef __ANSI_CPP__ | ||
| 134 | #define XFS_TEST_ERROR(expr, mp, tag, rf) \ | ||
| 135 | ((expr) || \ | ||
| 136 | xfs_error_test((tag), (mp)->m_fixedfsid, #expr, __LINE__, __FILE__, \ | ||
| 137 | (rf))) | ||
| 138 | #else | ||
| 139 | #define XFS_TEST_ERROR(expr, mp, tag, rf) \ | 132 | #define XFS_TEST_ERROR(expr, mp, tag, rf) \ |
| 140 | ((expr) || \ | 133 | ((expr) || \ |
| 141 | xfs_error_test((tag), (mp)->m_fixedfsid, "expr", __LINE__, __FILE__, \ | 134 | xfs_error_test((tag), (mp)->m_fixedfsid, "expr", __LINE__, __FILE__, \ |
| 142 | (rf))) | 135 | (rf))) |
| 143 | #endif /* __ANSI_CPP__ */ | ||
| 144 | 136 | ||
| 145 | extern int xfs_errortag_add(int error_tag, xfs_mount_t *mp); | 137 | extern int xfs_errortag_add(int error_tag, xfs_mount_t *mp); |
| 146 | extern int xfs_errortag_clearall(xfs_mount_t *mp, int loud); | 138 | extern int xfs_errortag_clearall(xfs_mount_t *mp, int loud); |
| @@ -148,7 +140,7 @@ extern int xfs_errortag_clearall(xfs_mount_t *mp, int loud); | |||
| 148 | #define XFS_TEST_ERROR(expr, mp, tag, rf) (expr) | 140 | #define XFS_TEST_ERROR(expr, mp, tag, rf) (expr) |
| 149 | #define xfs_errortag_add(tag, mp) (ENOSYS) | 141 | #define xfs_errortag_add(tag, mp) (ENOSYS) |
| 150 | #define xfs_errortag_clearall(mp, loud) (ENOSYS) | 142 | #define xfs_errortag_clearall(mp, loud) (ENOSYS) |
| 151 | #endif /* (DEBUG || INDUCE_IO_ERROR) */ | 143 | #endif /* DEBUG */ |
| 152 | 144 | ||
| 153 | /* | 145 | /* |
| 154 | * XFS panic tags -- allow a call to xfs_cmn_err() be turned into | 146 | * XFS panic tags -- allow a call to xfs_cmn_err() be turned into |
diff --git a/fs/xfs/xfs_filestream.c b/fs/xfs/xfs_filestream.c index c38fd14fca29..f3bb75da384e 100644 --- a/fs/xfs/xfs_filestream.c +++ b/fs/xfs/xfs_filestream.c | |||
| @@ -400,7 +400,7 @@ xfs_filestream_init(void) | |||
| 400 | if (!item_zone) | 400 | if (!item_zone) |
| 401 | return -ENOMEM; | 401 | return -ENOMEM; |
| 402 | #ifdef XFS_FILESTREAMS_TRACE | 402 | #ifdef XFS_FILESTREAMS_TRACE |
| 403 | xfs_filestreams_trace_buf = ktrace_alloc(XFS_FSTRM_KTRACE_SIZE, KM_SLEEP); | 403 | xfs_filestreams_trace_buf = ktrace_alloc(XFS_FSTRM_KTRACE_SIZE, KM_NOFS); |
| 404 | #endif | 404 | #endif |
| 405 | return 0; | 405 | return 0; |
| 406 | } | 406 | } |
diff --git a/fs/xfs/xfs_ialloc_btree.c b/fs/xfs/xfs_ialloc_btree.c index e5310c90e50f..83502f3edef0 100644 --- a/fs/xfs/xfs_ialloc_btree.c +++ b/fs/xfs/xfs_ialloc_btree.c | |||
| @@ -181,7 +181,7 @@ xfs_inobt_delrec( | |||
| 181 | * then we can get rid of this level. | 181 | * then we can get rid of this level. |
| 182 | */ | 182 | */ |
| 183 | if (numrecs == 1 && level > 0) { | 183 | if (numrecs == 1 && level > 0) { |
| 184 | agbp = cur->bc_private.i.agbp; | 184 | agbp = cur->bc_private.a.agbp; |
| 185 | agi = XFS_BUF_TO_AGI(agbp); | 185 | agi = XFS_BUF_TO_AGI(agbp); |
| 186 | /* | 186 | /* |
| 187 | * pp is still set to the first pointer in the block. | 187 | * pp is still set to the first pointer in the block. |
| @@ -194,7 +194,7 @@ xfs_inobt_delrec( | |||
| 194 | * Free the block. | 194 | * Free the block. |
| 195 | */ | 195 | */ |
| 196 | if ((error = xfs_free_extent(cur->bc_tp, | 196 | if ((error = xfs_free_extent(cur->bc_tp, |
| 197 | XFS_AGB_TO_FSB(mp, cur->bc_private.i.agno, bno), 1))) | 197 | XFS_AGB_TO_FSB(mp, cur->bc_private.a.agno, bno), 1))) |
| 198 | return error; | 198 | return error; |
| 199 | xfs_trans_binval(cur->bc_tp, bp); | 199 | xfs_trans_binval(cur->bc_tp, bp); |
| 200 | xfs_ialloc_log_agi(cur->bc_tp, agbp, | 200 | xfs_ialloc_log_agi(cur->bc_tp, agbp, |
| @@ -379,7 +379,7 @@ xfs_inobt_delrec( | |||
| 379 | rrecs = be16_to_cpu(right->bb_numrecs); | 379 | rrecs = be16_to_cpu(right->bb_numrecs); |
| 380 | rbp = bp; | 380 | rbp = bp; |
| 381 | if ((error = xfs_btree_read_bufs(mp, cur->bc_tp, | 381 | if ((error = xfs_btree_read_bufs(mp, cur->bc_tp, |
| 382 | cur->bc_private.i.agno, lbno, 0, &lbp, | 382 | cur->bc_private.a.agno, lbno, 0, &lbp, |
| 383 | XFS_INO_BTREE_REF))) | 383 | XFS_INO_BTREE_REF))) |
| 384 | return error; | 384 | return error; |
| 385 | left = XFS_BUF_TO_INOBT_BLOCK(lbp); | 385 | left = XFS_BUF_TO_INOBT_BLOCK(lbp); |
| @@ -401,7 +401,7 @@ xfs_inobt_delrec( | |||
| 401 | lrecs = be16_to_cpu(left->bb_numrecs); | 401 | lrecs = be16_to_cpu(left->bb_numrecs); |
| 402 | lbp = bp; | 402 | lbp = bp; |
| 403 | if ((error = xfs_btree_read_bufs(mp, cur->bc_tp, | 403 | if ((error = xfs_btree_read_bufs(mp, cur->bc_tp, |
| 404 | cur->bc_private.i.agno, rbno, 0, &rbp, | 404 | cur->bc_private.a.agno, rbno, 0, &rbp, |
| 405 | XFS_INO_BTREE_REF))) | 405 | XFS_INO_BTREE_REF))) |
| 406 | return error; | 406 | return error; |
| 407 | right = XFS_BUF_TO_INOBT_BLOCK(rbp); | 407 | right = XFS_BUF_TO_INOBT_BLOCK(rbp); |
| @@ -484,7 +484,7 @@ xfs_inobt_delrec( | |||
| 484 | xfs_buf_t *rrbp; | 484 | xfs_buf_t *rrbp; |
| 485 | 485 | ||
| 486 | if ((error = xfs_btree_read_bufs(mp, cur->bc_tp, | 486 | if ((error = xfs_btree_read_bufs(mp, cur->bc_tp, |
| 487 | cur->bc_private.i.agno, be32_to_cpu(left->bb_rightsib), 0, | 487 | cur->bc_private.a.agno, be32_to_cpu(left->bb_rightsib), 0, |
| 488 | &rrbp, XFS_INO_BTREE_REF))) | 488 | &rrbp, XFS_INO_BTREE_REF))) |
| 489 | return error; | 489 | return error; |
| 490 | rrblock = XFS_BUF_TO_INOBT_BLOCK(rrbp); | 490 | rrblock = XFS_BUF_TO_INOBT_BLOCK(rrbp); |
| @@ -497,7 +497,7 @@ xfs_inobt_delrec( | |||
| 497 | * Free the deleting block. | 497 | * Free the deleting block. |
| 498 | */ | 498 | */ |
| 499 | if ((error = xfs_free_extent(cur->bc_tp, XFS_AGB_TO_FSB(mp, | 499 | if ((error = xfs_free_extent(cur->bc_tp, XFS_AGB_TO_FSB(mp, |
| 500 | cur->bc_private.i.agno, rbno), 1))) | 500 | cur->bc_private.a.agno, rbno), 1))) |
| 501 | return error; | 501 | return error; |
| 502 | xfs_trans_binval(cur->bc_tp, rbp); | 502 | xfs_trans_binval(cur->bc_tp, rbp); |
| 503 | /* | 503 | /* |
| @@ -854,7 +854,7 @@ xfs_inobt_lookup( | |||
| 854 | { | 854 | { |
| 855 | xfs_agi_t *agi; /* a.g. inode header */ | 855 | xfs_agi_t *agi; /* a.g. inode header */ |
| 856 | 856 | ||
| 857 | agi = XFS_BUF_TO_AGI(cur->bc_private.i.agbp); | 857 | agi = XFS_BUF_TO_AGI(cur->bc_private.a.agbp); |
| 858 | agno = be32_to_cpu(agi->agi_seqno); | 858 | agno = be32_to_cpu(agi->agi_seqno); |
| 859 | agbno = be32_to_cpu(agi->agi_root); | 859 | agbno = be32_to_cpu(agi->agi_root); |
| 860 | } | 860 | } |
| @@ -1089,7 +1089,7 @@ xfs_inobt_lshift( | |||
| 1089 | * Set up the left neighbor as "left". | 1089 | * Set up the left neighbor as "left". |
| 1090 | */ | 1090 | */ |
| 1091 | if ((error = xfs_btree_read_bufs(cur->bc_mp, cur->bc_tp, | 1091 | if ((error = xfs_btree_read_bufs(cur->bc_mp, cur->bc_tp, |
| 1092 | cur->bc_private.i.agno, be32_to_cpu(right->bb_leftsib), | 1092 | cur->bc_private.a.agno, be32_to_cpu(right->bb_leftsib), |
| 1093 | 0, &lbp, XFS_INO_BTREE_REF))) | 1093 | 0, &lbp, XFS_INO_BTREE_REF))) |
| 1094 | return error; | 1094 | return error; |
| 1095 | left = XFS_BUF_TO_INOBT_BLOCK(lbp); | 1095 | left = XFS_BUF_TO_INOBT_BLOCK(lbp); |
| @@ -1207,10 +1207,10 @@ xfs_inobt_newroot( | |||
| 1207 | /* | 1207 | /* |
| 1208 | * Get a block & a buffer. | 1208 | * Get a block & a buffer. |
| 1209 | */ | 1209 | */ |
| 1210 | agi = XFS_BUF_TO_AGI(cur->bc_private.i.agbp); | 1210 | agi = XFS_BUF_TO_AGI(cur->bc_private.a.agbp); |
| 1211 | args.tp = cur->bc_tp; | 1211 | args.tp = cur->bc_tp; |
| 1212 | args.mp = cur->bc_mp; | 1212 | args.mp = cur->bc_mp; |
| 1213 | args.fsbno = XFS_AGB_TO_FSB(args.mp, cur->bc_private.i.agno, | 1213 | args.fsbno = XFS_AGB_TO_FSB(args.mp, cur->bc_private.a.agno, |
| 1214 | be32_to_cpu(agi->agi_root)); | 1214 | be32_to_cpu(agi->agi_root)); |
| 1215 | args.mod = args.minleft = args.alignment = args.total = args.wasdel = | 1215 | args.mod = args.minleft = args.alignment = args.total = args.wasdel = |
| 1216 | args.isfl = args.userdata = args.minalignslop = 0; | 1216 | args.isfl = args.userdata = args.minalignslop = 0; |
| @@ -1233,7 +1233,7 @@ xfs_inobt_newroot( | |||
| 1233 | */ | 1233 | */ |
| 1234 | agi->agi_root = cpu_to_be32(args.agbno); | 1234 | agi->agi_root = cpu_to_be32(args.agbno); |
| 1235 | be32_add_cpu(&agi->agi_level, 1); | 1235 | be32_add_cpu(&agi->agi_level, 1); |
| 1236 | xfs_ialloc_log_agi(args.tp, cur->bc_private.i.agbp, | 1236 | xfs_ialloc_log_agi(args.tp, cur->bc_private.a.agbp, |
| 1237 | XFS_AGI_ROOT | XFS_AGI_LEVEL); | 1237 | XFS_AGI_ROOT | XFS_AGI_LEVEL); |
| 1238 | /* | 1238 | /* |
| 1239 | * At the previous root level there are now two blocks: the old | 1239 | * At the previous root level there are now two blocks: the old |
| @@ -1376,7 +1376,7 @@ xfs_inobt_rshift( | |||
| 1376 | * Set up the right neighbor as "right". | 1376 | * Set up the right neighbor as "right". |
| 1377 | */ | 1377 | */ |
| 1378 | if ((error = xfs_btree_read_bufs(cur->bc_mp, cur->bc_tp, | 1378 | if ((error = xfs_btree_read_bufs(cur->bc_mp, cur->bc_tp, |
| 1379 | cur->bc_private.i.agno, be32_to_cpu(left->bb_rightsib), | 1379 | cur->bc_private.a.agno, be32_to_cpu(left->bb_rightsib), |
| 1380 | 0, &rbp, XFS_INO_BTREE_REF))) | 1380 | 0, &rbp, XFS_INO_BTREE_REF))) |
| 1381 | return error; | 1381 | return error; |
| 1382 | right = XFS_BUF_TO_INOBT_BLOCK(rbp); | 1382 | right = XFS_BUF_TO_INOBT_BLOCK(rbp); |
| @@ -1492,7 +1492,7 @@ xfs_inobt_split( | |||
| 1492 | * Allocate the new block. | 1492 | * Allocate the new block. |
| 1493 | * If we can't do it, we're toast. Give up. | 1493 | * If we can't do it, we're toast. Give up. |
| 1494 | */ | 1494 | */ |
| 1495 | args.fsbno = XFS_AGB_TO_FSB(args.mp, cur->bc_private.i.agno, lbno); | 1495 | args.fsbno = XFS_AGB_TO_FSB(args.mp, cur->bc_private.a.agno, lbno); |
| 1496 | args.mod = args.minleft = args.alignment = args.total = args.wasdel = | 1496 | args.mod = args.minleft = args.alignment = args.total = args.wasdel = |
| 1497 | args.isfl = args.userdata = args.minalignslop = 0; | 1497 | args.isfl = args.userdata = args.minalignslop = 0; |
| 1498 | args.minlen = args.maxlen = args.prod = 1; | 1498 | args.minlen = args.maxlen = args.prod = 1; |
| @@ -1725,7 +1725,7 @@ xfs_inobt_decrement( | |||
| 1725 | 1725 | ||
| 1726 | agbno = be32_to_cpu(*XFS_INOBT_PTR_ADDR(block, cur->bc_ptrs[lev], cur)); | 1726 | agbno = be32_to_cpu(*XFS_INOBT_PTR_ADDR(block, cur->bc_ptrs[lev], cur)); |
| 1727 | if ((error = xfs_btree_read_bufs(cur->bc_mp, cur->bc_tp, | 1727 | if ((error = xfs_btree_read_bufs(cur->bc_mp, cur->bc_tp, |
| 1728 | cur->bc_private.i.agno, agbno, 0, &bp, | 1728 | cur->bc_private.a.agno, agbno, 0, &bp, |
| 1729 | XFS_INO_BTREE_REF))) | 1729 | XFS_INO_BTREE_REF))) |
| 1730 | return error; | 1730 | return error; |
| 1731 | lev--; | 1731 | lev--; |
| @@ -1897,7 +1897,7 @@ xfs_inobt_increment( | |||
| 1897 | 1897 | ||
| 1898 | agbno = be32_to_cpu(*XFS_INOBT_PTR_ADDR(block, cur->bc_ptrs[lev], cur)); | 1898 | agbno = be32_to_cpu(*XFS_INOBT_PTR_ADDR(block, cur->bc_ptrs[lev], cur)); |
| 1899 | if ((error = xfs_btree_read_bufs(cur->bc_mp, cur->bc_tp, | 1899 | if ((error = xfs_btree_read_bufs(cur->bc_mp, cur->bc_tp, |
| 1900 | cur->bc_private.i.agno, agbno, 0, &bp, | 1900 | cur->bc_private.a.agno, agbno, 0, &bp, |
| 1901 | XFS_INO_BTREE_REF))) | 1901 | XFS_INO_BTREE_REF))) |
| 1902 | return error; | 1902 | return error; |
| 1903 | lev--; | 1903 | lev--; |
diff --git a/fs/xfs/xfs_iget.c b/fs/xfs/xfs_iget.c index b07604b94d9f..e229e9e001c2 100644 --- a/fs/xfs/xfs_iget.c +++ b/fs/xfs/xfs_iget.c | |||
| @@ -216,7 +216,14 @@ finish_inode: | |||
| 216 | mrlock_init(&ip->i_iolock, MRLOCK_BARRIER, "xfsio", ip->i_ino); | 216 | mrlock_init(&ip->i_iolock, MRLOCK_BARRIER, "xfsio", ip->i_ino); |
| 217 | init_waitqueue_head(&ip->i_ipin_wait); | 217 | init_waitqueue_head(&ip->i_ipin_wait); |
| 218 | atomic_set(&ip->i_pincount, 0); | 218 | atomic_set(&ip->i_pincount, 0); |
| 219 | initnsema(&ip->i_flock, 1, "xfsfino"); | 219 | |
| 220 | /* | ||
| 221 | * Because we want to use a counting completion, complete | ||
| 222 | * the flush completion once to allow a single access to | ||
| 223 | * the flush completion without blocking. | ||
| 224 | */ | ||
| 225 | init_completion(&ip->i_flush); | ||
| 226 | complete(&ip->i_flush); | ||
| 220 | 227 | ||
| 221 | if (lock_flags) | 228 | if (lock_flags) |
| 222 | xfs_ilock(ip, lock_flags); | 229 | xfs_ilock(ip, lock_flags); |
| @@ -288,10 +295,17 @@ finish_inode: | |||
| 288 | *ipp = ip; | 295 | *ipp = ip; |
| 289 | 296 | ||
| 290 | /* | 297 | /* |
| 298 | * Set up the Linux with the Linux inode. | ||
| 299 | */ | ||
| 300 | ip->i_vnode = inode; | ||
| 301 | inode->i_private = ip; | ||
| 302 | |||
| 303 | /* | ||
| 291 | * If we have a real type for an on-disk inode, we can set ops(&unlock) | 304 | * If we have a real type for an on-disk inode, we can set ops(&unlock) |
| 292 | * now. If it's a new inode being created, xfs_ialloc will handle it. | 305 | * now. If it's a new inode being created, xfs_ialloc will handle it. |
| 293 | */ | 306 | */ |
| 294 | xfs_initialize_vnode(mp, inode, ip); | 307 | if (ip->i_d.di_mode != 0) |
| 308 | xfs_setup_inode(ip); | ||
| 295 | return 0; | 309 | return 0; |
| 296 | } | 310 | } |
| 297 | 311 | ||
| @@ -411,10 +425,11 @@ xfs_iput(xfs_inode_t *ip, | |||
| 411 | * Special iput for brand-new inodes that are still locked | 425 | * Special iput for brand-new inodes that are still locked |
| 412 | */ | 426 | */ |
| 413 | void | 427 | void |
| 414 | xfs_iput_new(xfs_inode_t *ip, | 428 | xfs_iput_new( |
| 415 | uint lock_flags) | 429 | xfs_inode_t *ip, |
| 430 | uint lock_flags) | ||
| 416 | { | 431 | { |
| 417 | struct inode *inode = ip->i_vnode; | 432 | struct inode *inode = VFS_I(ip); |
| 418 | 433 | ||
| 419 | xfs_itrace_entry(ip); | 434 | xfs_itrace_entry(ip); |
| 420 | 435 | ||
| @@ -775,26 +790,3 @@ xfs_isilocked( | |||
| 775 | } | 790 | } |
| 776 | #endif | 791 | #endif |
| 777 | 792 | ||
| 778 | /* | ||
| 779 | * The following three routines simply manage the i_flock | ||
| 780 | * semaphore embedded in the inode. This semaphore synchronizes | ||
| 781 | * processes attempting to flush the in-core inode back to disk. | ||
| 782 | */ | ||
| 783 | void | ||
| 784 | xfs_iflock(xfs_inode_t *ip) | ||
| 785 | { | ||
| 786 | psema(&(ip->i_flock), PINOD|PLTWAIT); | ||
| 787 | } | ||
| 788 | |||
| 789 | int | ||
| 790 | xfs_iflock_nowait(xfs_inode_t *ip) | ||
| 791 | { | ||
| 792 | return (cpsema(&(ip->i_flock))); | ||
| 793 | } | ||
| 794 | |||
| 795 | void | ||
| 796 | xfs_ifunlock(xfs_inode_t *ip) | ||
| 797 | { | ||
| 798 | ASSERT(issemalocked(&(ip->i_flock))); | ||
| 799 | vsema(&(ip->i_flock)); | ||
| 800 | } | ||
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index bedc66163176..00e80df9dd9d 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c | |||
| @@ -580,8 +580,8 @@ xfs_iformat_extents( | |||
| 580 | xfs_validate_extents(ifp, nex, XFS_EXTFMT_INODE(ip)); | 580 | xfs_validate_extents(ifp, nex, XFS_EXTFMT_INODE(ip)); |
| 581 | for (i = 0; i < nex; i++, dp++) { | 581 | for (i = 0; i < nex; i++, dp++) { |
| 582 | xfs_bmbt_rec_host_t *ep = xfs_iext_get_ext(ifp, i); | 582 | xfs_bmbt_rec_host_t *ep = xfs_iext_get_ext(ifp, i); |
| 583 | ep->l0 = be64_to_cpu(get_unaligned(&dp->l0)); | 583 | ep->l0 = get_unaligned_be64(&dp->l0); |
| 584 | ep->l1 = be64_to_cpu(get_unaligned(&dp->l1)); | 584 | ep->l1 = get_unaligned_be64(&dp->l1); |
| 585 | } | 585 | } |
| 586 | XFS_BMAP_TRACE_EXLIST(ip, nex, whichfork); | 586 | XFS_BMAP_TRACE_EXLIST(ip, nex, whichfork); |
| 587 | if (whichfork != XFS_DATA_FORK || | 587 | if (whichfork != XFS_DATA_FORK || |
| @@ -835,22 +835,22 @@ xfs_iread( | |||
| 835 | * Do this before xfs_iformat in case it adds entries. | 835 | * Do this before xfs_iformat in case it adds entries. |
| 836 | */ | 836 | */ |
| 837 | #ifdef XFS_INODE_TRACE | 837 | #ifdef XFS_INODE_TRACE |
| 838 | ip->i_trace = ktrace_alloc(INODE_TRACE_SIZE, KM_SLEEP); | 838 | ip->i_trace = ktrace_alloc(INODE_TRACE_SIZE, KM_NOFS); |
| 839 | #endif | 839 | #endif |
| 840 | #ifdef XFS_BMAP_TRACE | 840 | #ifdef XFS_BMAP_TRACE |
| 841 | ip->i_xtrace = ktrace_alloc(XFS_BMAP_KTRACE_SIZE, KM_SLEEP); | 841 | ip->i_xtrace = ktrace_alloc(XFS_BMAP_KTRACE_SIZE, KM_NOFS); |
| 842 | #endif | 842 | #endif |
| 843 | #ifdef XFS_BMBT_TRACE | 843 | #ifdef XFS_BMBT_TRACE |
| 844 | ip->i_btrace = ktrace_alloc(XFS_BMBT_KTRACE_SIZE, KM_SLEEP); | 844 | ip->i_btrace = ktrace_alloc(XFS_BMBT_KTRACE_SIZE, KM_NOFS); |
| 845 | #endif | 845 | #endif |
| 846 | #ifdef XFS_RW_TRACE | 846 | #ifdef XFS_RW_TRACE |
| 847 | ip->i_rwtrace = ktrace_alloc(XFS_RW_KTRACE_SIZE, KM_SLEEP); | 847 | ip->i_rwtrace = ktrace_alloc(XFS_RW_KTRACE_SIZE, KM_NOFS); |
| 848 | #endif | 848 | #endif |
| 849 | #ifdef XFS_ILOCK_TRACE | 849 | #ifdef XFS_ILOCK_TRACE |
| 850 | ip->i_lock_trace = ktrace_alloc(XFS_ILOCK_KTRACE_SIZE, KM_SLEEP); | 850 | ip->i_lock_trace = ktrace_alloc(XFS_ILOCK_KTRACE_SIZE, KM_NOFS); |
| 851 | #endif | 851 | #endif |
| 852 | #ifdef XFS_DIR2_TRACE | 852 | #ifdef XFS_DIR2_TRACE |
| 853 | ip->i_dir_trace = ktrace_alloc(XFS_DIR2_KTRACE_SIZE, KM_SLEEP); | 853 | ip->i_dir_trace = ktrace_alloc(XFS_DIR2_KTRACE_SIZE, KM_NOFS); |
| 854 | #endif | 854 | #endif |
| 855 | 855 | ||
| 856 | /* | 856 | /* |
| @@ -1046,9 +1046,9 @@ xfs_ialloc( | |||
| 1046 | { | 1046 | { |
| 1047 | xfs_ino_t ino; | 1047 | xfs_ino_t ino; |
| 1048 | xfs_inode_t *ip; | 1048 | xfs_inode_t *ip; |
| 1049 | bhv_vnode_t *vp; | ||
| 1050 | uint flags; | 1049 | uint flags; |
| 1051 | int error; | 1050 | int error; |
| 1051 | timespec_t tv; | ||
| 1052 | 1052 | ||
| 1053 | /* | 1053 | /* |
| 1054 | * Call the space management code to pick | 1054 | * Call the space management code to pick |
| @@ -1077,13 +1077,12 @@ xfs_ialloc( | |||
| 1077 | } | 1077 | } |
| 1078 | ASSERT(ip != NULL); | 1078 | ASSERT(ip != NULL); |
| 1079 | 1079 | ||
| 1080 | vp = XFS_ITOV(ip); | ||
| 1081 | ip->i_d.di_mode = (__uint16_t)mode; | 1080 | ip->i_d.di_mode = (__uint16_t)mode; |
| 1082 | ip->i_d.di_onlink = 0; | 1081 | ip->i_d.di_onlink = 0; |
| 1083 | ip->i_d.di_nlink = nlink; | 1082 | ip->i_d.di_nlink = nlink; |
| 1084 | ASSERT(ip->i_d.di_nlink == nlink); | 1083 | ASSERT(ip->i_d.di_nlink == nlink); |
| 1085 | ip->i_d.di_uid = current_fsuid(cr); | 1084 | ip->i_d.di_uid = current_fsuid(); |
| 1086 | ip->i_d.di_gid = current_fsgid(cr); | 1085 | ip->i_d.di_gid = current_fsgid(); |
| 1087 | ip->i_d.di_projid = prid; | 1086 | ip->i_d.di_projid = prid; |
| 1088 | memset(&(ip->i_d.di_pad[0]), 0, sizeof(ip->i_d.di_pad)); | 1087 | memset(&(ip->i_d.di_pad[0]), 0, sizeof(ip->i_d.di_pad)); |
| 1089 | 1088 | ||
| @@ -1130,7 +1129,13 @@ xfs_ialloc( | |||
| 1130 | ip->i_size = 0; | 1129 | ip->i_size = 0; |
| 1131 | ip->i_d.di_nextents = 0; | 1130 | ip->i_d.di_nextents = 0; |
| 1132 | ASSERT(ip->i_d.di_nblocks == 0); | 1131 | ASSERT(ip->i_d.di_nblocks == 0); |
| 1133 | xfs_ichgtime(ip, XFS_ICHGTIME_CHG|XFS_ICHGTIME_ACC|XFS_ICHGTIME_MOD); | 1132 | |
| 1133 | nanotime(&tv); | ||
| 1134 | ip->i_d.di_mtime.t_sec = (__int32_t)tv.tv_sec; | ||
| 1135 | ip->i_d.di_mtime.t_nsec = (__int32_t)tv.tv_nsec; | ||
| 1136 | ip->i_d.di_atime = ip->i_d.di_mtime; | ||
| 1137 | ip->i_d.di_ctime = ip->i_d.di_mtime; | ||
| 1138 | |||
| 1134 | /* | 1139 | /* |
| 1135 | * di_gen will have been taken care of in xfs_iread. | 1140 | * di_gen will have been taken care of in xfs_iread. |
| 1136 | */ | 1141 | */ |
| @@ -1220,7 +1225,7 @@ xfs_ialloc( | |||
| 1220 | xfs_trans_log_inode(tp, ip, flags); | 1225 | xfs_trans_log_inode(tp, ip, flags); |
| 1221 | 1226 | ||
| 1222 | /* now that we have an i_mode we can setup inode ops and unlock */ | 1227 | /* now that we have an i_mode we can setup inode ops and unlock */ |
| 1223 | xfs_initialize_vnode(tp->t_mountp, vp, ip); | 1228 | xfs_setup_inode(ip); |
| 1224 | 1229 | ||
| 1225 | *ipp = ip; | 1230 | *ipp = ip; |
| 1226 | return 0; | 1231 | return 0; |
| @@ -1399,7 +1404,6 @@ xfs_itruncate_start( | |||
| 1399 | xfs_fsize_t last_byte; | 1404 | xfs_fsize_t last_byte; |
| 1400 | xfs_off_t toss_start; | 1405 | xfs_off_t toss_start; |
| 1401 | xfs_mount_t *mp; | 1406 | xfs_mount_t *mp; |
| 1402 | bhv_vnode_t *vp; | ||
| 1403 | int error = 0; | 1407 | int error = 0; |
| 1404 | 1408 | ||
| 1405 | ASSERT(xfs_isilocked(ip, XFS_IOLOCK_EXCL)); | 1409 | ASSERT(xfs_isilocked(ip, XFS_IOLOCK_EXCL)); |
| @@ -1408,7 +1412,6 @@ xfs_itruncate_start( | |||
| 1408 | (flags == XFS_ITRUNC_MAYBE)); | 1412 | (flags == XFS_ITRUNC_MAYBE)); |
| 1409 | 1413 | ||
| 1410 | mp = ip->i_mount; | 1414 | mp = ip->i_mount; |
| 1411 | vp = XFS_ITOV(ip); | ||
| 1412 | 1415 | ||
| 1413 | /* wait for the completion of any pending DIOs */ | 1416 | /* wait for the completion of any pending DIOs */ |
| 1414 | if (new_size < ip->i_size) | 1417 | if (new_size < ip->i_size) |
| @@ -1457,7 +1460,7 @@ xfs_itruncate_start( | |||
| 1457 | 1460 | ||
| 1458 | #ifdef DEBUG | 1461 | #ifdef DEBUG |
| 1459 | if (new_size == 0) { | 1462 | if (new_size == 0) { |
| 1460 | ASSERT(VN_CACHED(vp) == 0); | 1463 | ASSERT(VN_CACHED(VFS_I(ip)) == 0); |
| 1461 | } | 1464 | } |
| 1462 | #endif | 1465 | #endif |
| 1463 | return error; | 1466 | return error; |
| @@ -2630,7 +2633,6 @@ xfs_idestroy( | |||
| 2630 | xfs_idestroy_fork(ip, XFS_ATTR_FORK); | 2633 | xfs_idestroy_fork(ip, XFS_ATTR_FORK); |
| 2631 | mrfree(&ip->i_lock); | 2634 | mrfree(&ip->i_lock); |
| 2632 | mrfree(&ip->i_iolock); | 2635 | mrfree(&ip->i_iolock); |
| 2633 | freesema(&ip->i_flock); | ||
| 2634 | 2636 | ||
| 2635 | #ifdef XFS_INODE_TRACE | 2637 | #ifdef XFS_INODE_TRACE |
| 2636 | ktrace_free(ip->i_trace); | 2638 | ktrace_free(ip->i_trace); |
| @@ -3048,10 +3050,10 @@ cluster_corrupt_out: | |||
| 3048 | /* | 3050 | /* |
| 3049 | * xfs_iflush() will write a modified inode's changes out to the | 3051 | * xfs_iflush() will write a modified inode's changes out to the |
| 3050 | * inode's on disk home. The caller must have the inode lock held | 3052 | * inode's on disk home. The caller must have the inode lock held |
| 3051 | * in at least shared mode and the inode flush semaphore must be | 3053 | * in at least shared mode and the inode flush completion must be |
| 3052 | * held as well. The inode lock will still be held upon return from | 3054 | * active as well. The inode lock will still be held upon return from |
| 3053 | * the call and the caller is free to unlock it. | 3055 | * the call and the caller is free to unlock it. |
| 3054 | * The inode flush lock will be unlocked when the inode reaches the disk. | 3056 | * The inode flush will be completed when the inode reaches the disk. |
| 3055 | * The flags indicate how the inode's buffer should be written out. | 3057 | * The flags indicate how the inode's buffer should be written out. |
| 3056 | */ | 3058 | */ |
| 3057 | int | 3059 | int |
| @@ -3070,7 +3072,7 @@ xfs_iflush( | |||
| 3070 | XFS_STATS_INC(xs_iflush_count); | 3072 | XFS_STATS_INC(xs_iflush_count); |
| 3071 | 3073 | ||
| 3072 | ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL|XFS_ILOCK_SHARED)); | 3074 | ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL|XFS_ILOCK_SHARED)); |
| 3073 | ASSERT(issemalocked(&(ip->i_flock))); | 3075 | ASSERT(!completion_done(&ip->i_flush)); |
| 3074 | ASSERT(ip->i_d.di_format != XFS_DINODE_FMT_BTREE || | 3076 | ASSERT(ip->i_d.di_format != XFS_DINODE_FMT_BTREE || |
| 3075 | ip->i_d.di_nextents > ip->i_df.if_ext_max); | 3077 | ip->i_d.di_nextents > ip->i_df.if_ext_max); |
| 3076 | 3078 | ||
| @@ -3233,7 +3235,7 @@ xfs_iflush_int( | |||
| 3233 | #endif | 3235 | #endif |
| 3234 | 3236 | ||
| 3235 | ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL|XFS_ILOCK_SHARED)); | 3237 | ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL|XFS_ILOCK_SHARED)); |
| 3236 | ASSERT(issemalocked(&(ip->i_flock))); | 3238 | ASSERT(!completion_done(&ip->i_flush)); |
| 3237 | ASSERT(ip->i_d.di_format != XFS_DINODE_FMT_BTREE || | 3239 | ASSERT(ip->i_d.di_format != XFS_DINODE_FMT_BTREE || |
| 3238 | ip->i_d.di_nextents > ip->i_df.if_ext_max); | 3240 | ip->i_d.di_nextents > ip->i_df.if_ext_max); |
| 3239 | 3241 | ||
| @@ -3465,7 +3467,6 @@ xfs_iflush_all( | |||
| 3465 | xfs_mount_t *mp) | 3467 | xfs_mount_t *mp) |
| 3466 | { | 3468 | { |
| 3467 | xfs_inode_t *ip; | 3469 | xfs_inode_t *ip; |
| 3468 | bhv_vnode_t *vp; | ||
| 3469 | 3470 | ||
| 3470 | again: | 3471 | again: |
| 3471 | XFS_MOUNT_ILOCK(mp); | 3472 | XFS_MOUNT_ILOCK(mp); |
| @@ -3480,14 +3481,13 @@ xfs_iflush_all( | |||
| 3480 | continue; | 3481 | continue; |
| 3481 | } | 3482 | } |
| 3482 | 3483 | ||
| 3483 | vp = XFS_ITOV_NULL(ip); | 3484 | if (!VFS_I(ip)) { |
| 3484 | if (!vp) { | ||
| 3485 | XFS_MOUNT_IUNLOCK(mp); | 3485 | XFS_MOUNT_IUNLOCK(mp); |
| 3486 | xfs_finish_reclaim(ip, 0, XFS_IFLUSH_ASYNC); | 3486 | xfs_finish_reclaim(ip, 0, XFS_IFLUSH_ASYNC); |
| 3487 | goto again; | 3487 | goto again; |
| 3488 | } | 3488 | } |
| 3489 | 3489 | ||
| 3490 | ASSERT(vn_count(vp) == 0); | 3490 | ASSERT(vn_count(VFS_I(ip)) == 0); |
| 3491 | 3491 | ||
| 3492 | ip = ip->i_mnext; | 3492 | ip = ip->i_mnext; |
| 3493 | } while (ip != mp->m_inodes); | 3493 | } while (ip != mp->m_inodes); |
| @@ -3707,7 +3707,7 @@ xfs_iext_add_indirect_multi( | |||
| 3707 | * (all extents past */ | 3707 | * (all extents past */ |
| 3708 | if (nex2) { | 3708 | if (nex2) { |
| 3709 | byte_diff = nex2 * sizeof(xfs_bmbt_rec_t); | 3709 | byte_diff = nex2 * sizeof(xfs_bmbt_rec_t); |
| 3710 | nex2_ep = (xfs_bmbt_rec_t *) kmem_alloc(byte_diff, KM_SLEEP); | 3710 | nex2_ep = (xfs_bmbt_rec_t *) kmem_alloc(byte_diff, KM_NOFS); |
| 3711 | memmove(nex2_ep, &erp->er_extbuf[idx], byte_diff); | 3711 | memmove(nex2_ep, &erp->er_extbuf[idx], byte_diff); |
| 3712 | erp->er_extcount -= nex2; | 3712 | erp->er_extcount -= nex2; |
| 3713 | xfs_iext_irec_update_extoffs(ifp, erp_idx + 1, -nex2); | 3713 | xfs_iext_irec_update_extoffs(ifp, erp_idx + 1, -nex2); |
| @@ -4007,8 +4007,7 @@ xfs_iext_realloc_direct( | |||
| 4007 | ifp->if_u1.if_extents = | 4007 | ifp->if_u1.if_extents = |
| 4008 | kmem_realloc(ifp->if_u1.if_extents, | 4008 | kmem_realloc(ifp->if_u1.if_extents, |
| 4009 | rnew_size, | 4009 | rnew_size, |
| 4010 | ifp->if_real_bytes, | 4010 | ifp->if_real_bytes, KM_NOFS); |
| 4011 | KM_SLEEP); | ||
| 4012 | } | 4011 | } |
| 4013 | if (rnew_size > ifp->if_real_bytes) { | 4012 | if (rnew_size > ifp->if_real_bytes) { |
| 4014 | memset(&ifp->if_u1.if_extents[ifp->if_bytes / | 4013 | memset(&ifp->if_u1.if_extents[ifp->if_bytes / |
| @@ -4067,7 +4066,7 @@ xfs_iext_inline_to_direct( | |||
| 4067 | xfs_ifork_t *ifp, /* inode fork pointer */ | 4066 | xfs_ifork_t *ifp, /* inode fork pointer */ |
| 4068 | int new_size) /* number of extents in file */ | 4067 | int new_size) /* number of extents in file */ |
| 4069 | { | 4068 | { |
| 4070 | ifp->if_u1.if_extents = kmem_alloc(new_size, KM_SLEEP); | 4069 | ifp->if_u1.if_extents = kmem_alloc(new_size, KM_NOFS); |
| 4071 | memset(ifp->if_u1.if_extents, 0, new_size); | 4070 | memset(ifp->if_u1.if_extents, 0, new_size); |
| 4072 | if (ifp->if_bytes) { | 4071 | if (ifp->if_bytes) { |
| 4073 | memcpy(ifp->if_u1.if_extents, ifp->if_u2.if_inline_ext, | 4072 | memcpy(ifp->if_u1.if_extents, ifp->if_u2.if_inline_ext, |
| @@ -4099,7 +4098,7 @@ xfs_iext_realloc_indirect( | |||
| 4099 | } else { | 4098 | } else { |
| 4100 | ifp->if_u1.if_ext_irec = (xfs_ext_irec_t *) | 4099 | ifp->if_u1.if_ext_irec = (xfs_ext_irec_t *) |
| 4101 | kmem_realloc(ifp->if_u1.if_ext_irec, | 4100 | kmem_realloc(ifp->if_u1.if_ext_irec, |
| 4102 | new_size, size, KM_SLEEP); | 4101 | new_size, size, KM_NOFS); |
| 4103 | } | 4102 | } |
| 4104 | } | 4103 | } |
| 4105 | 4104 | ||
| @@ -4341,11 +4340,10 @@ xfs_iext_irec_init( | |||
| 4341 | nextents = ifp->if_bytes / (uint)sizeof(xfs_bmbt_rec_t); | 4340 | nextents = ifp->if_bytes / (uint)sizeof(xfs_bmbt_rec_t); |
| 4342 | ASSERT(nextents <= XFS_LINEAR_EXTS); | 4341 | ASSERT(nextents <= XFS_LINEAR_EXTS); |
| 4343 | 4342 | ||
| 4344 | erp = (xfs_ext_irec_t *) | 4343 | erp = kmem_alloc(sizeof(xfs_ext_irec_t), KM_NOFS); |
| 4345 | kmem_alloc(sizeof(xfs_ext_irec_t), KM_SLEEP); | ||
| 4346 | 4344 | ||
| 4347 | if (nextents == 0) { | 4345 | if (nextents == 0) { |
| 4348 | ifp->if_u1.if_extents = kmem_alloc(XFS_IEXT_BUFSZ, KM_SLEEP); | 4346 | ifp->if_u1.if_extents = kmem_alloc(XFS_IEXT_BUFSZ, KM_NOFS); |
| 4349 | } else if (!ifp->if_real_bytes) { | 4347 | } else if (!ifp->if_real_bytes) { |
| 4350 | xfs_iext_inline_to_direct(ifp, XFS_IEXT_BUFSZ); | 4348 | xfs_iext_inline_to_direct(ifp, XFS_IEXT_BUFSZ); |
| 4351 | } else if (ifp->if_real_bytes < XFS_IEXT_BUFSZ) { | 4349 | } else if (ifp->if_real_bytes < XFS_IEXT_BUFSZ) { |
| @@ -4393,7 +4391,7 @@ xfs_iext_irec_new( | |||
| 4393 | 4391 | ||
| 4394 | /* Initialize new extent record */ | 4392 | /* Initialize new extent record */ |
| 4395 | erp = ifp->if_u1.if_ext_irec; | 4393 | erp = ifp->if_u1.if_ext_irec; |
| 4396 | erp[erp_idx].er_extbuf = kmem_alloc(XFS_IEXT_BUFSZ, KM_SLEEP); | 4394 | erp[erp_idx].er_extbuf = kmem_alloc(XFS_IEXT_BUFSZ, KM_NOFS); |
| 4397 | ifp->if_real_bytes = nlists * XFS_IEXT_BUFSZ; | 4395 | ifp->if_real_bytes = nlists * XFS_IEXT_BUFSZ; |
| 4398 | memset(erp[erp_idx].er_extbuf, 0, XFS_IEXT_BUFSZ); | 4396 | memset(erp[erp_idx].er_extbuf, 0, XFS_IEXT_BUFSZ); |
| 4399 | erp[erp_idx].er_extcount = 0; | 4397 | erp[erp_idx].er_extcount = 0; |
diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h index 17a04b6321ed..1420c49674d7 100644 --- a/fs/xfs/xfs_inode.h +++ b/fs/xfs/xfs_inode.h | |||
| @@ -87,8 +87,7 @@ typedef struct xfs_ifork { | |||
| 87 | * Flags for xfs_ichgtime(). | 87 | * Flags for xfs_ichgtime(). |
| 88 | */ | 88 | */ |
| 89 | #define XFS_ICHGTIME_MOD 0x1 /* data fork modification timestamp */ | 89 | #define XFS_ICHGTIME_MOD 0x1 /* data fork modification timestamp */ |
| 90 | #define XFS_ICHGTIME_ACC 0x2 /* data fork access timestamp */ | 90 | #define XFS_ICHGTIME_CHG 0x2 /* inode field change timestamp */ |
| 91 | #define XFS_ICHGTIME_CHG 0x4 /* inode field change timestamp */ | ||
| 92 | 91 | ||
| 93 | /* | 92 | /* |
| 94 | * Per-fork incore inode flags. | 93 | * Per-fork incore inode flags. |
| @@ -204,7 +203,7 @@ typedef struct xfs_inode { | |||
| 204 | struct xfs_inode *i_mprev; /* ptr to prev inode */ | 203 | struct xfs_inode *i_mprev; /* ptr to prev inode */ |
| 205 | struct xfs_mount *i_mount; /* fs mount struct ptr */ | 204 | struct xfs_mount *i_mount; /* fs mount struct ptr */ |
| 206 | struct list_head i_reclaim; /* reclaim list */ | 205 | struct list_head i_reclaim; /* reclaim list */ |
| 207 | bhv_vnode_t *i_vnode; /* vnode backpointer */ | 206 | struct inode *i_vnode; /* vnode backpointer */ |
| 208 | struct xfs_dquot *i_udquot; /* user dquot */ | 207 | struct xfs_dquot *i_udquot; /* user dquot */ |
| 209 | struct xfs_dquot *i_gdquot; /* group dquot */ | 208 | struct xfs_dquot *i_gdquot; /* group dquot */ |
| 210 | 209 | ||
| @@ -223,7 +222,7 @@ typedef struct xfs_inode { | |||
| 223 | struct xfs_inode_log_item *i_itemp; /* logging information */ | 222 | struct xfs_inode_log_item *i_itemp; /* logging information */ |
| 224 | mrlock_t i_lock; /* inode lock */ | 223 | mrlock_t i_lock; /* inode lock */ |
| 225 | mrlock_t i_iolock; /* inode IO lock */ | 224 | mrlock_t i_iolock; /* inode IO lock */ |
| 226 | sema_t i_flock; /* inode flush lock */ | 225 | struct completion i_flush; /* inode flush completion q */ |
| 227 | atomic_t i_pincount; /* inode pin count */ | 226 | atomic_t i_pincount; /* inode pin count */ |
| 228 | wait_queue_head_t i_ipin_wait; /* inode pinning wait queue */ | 227 | wait_queue_head_t i_ipin_wait; /* inode pinning wait queue */ |
| 229 | spinlock_t i_flags_lock; /* inode i_flags lock */ | 228 | spinlock_t i_flags_lock; /* inode i_flags lock */ |
| @@ -263,6 +262,18 @@ typedef struct xfs_inode { | |||
| 263 | #define XFS_ISIZE(ip) (((ip)->i_d.di_mode & S_IFMT) == S_IFREG) ? \ | 262 | #define XFS_ISIZE(ip) (((ip)->i_d.di_mode & S_IFMT) == S_IFREG) ? \ |
| 264 | (ip)->i_size : (ip)->i_d.di_size; | 263 | (ip)->i_size : (ip)->i_d.di_size; |
| 265 | 264 | ||
| 265 | /* Convert from vfs inode to xfs inode */ | ||
| 266 | static inline struct xfs_inode *XFS_I(struct inode *inode) | ||
| 267 | { | ||
| 268 | return (struct xfs_inode *)inode->i_private; | ||
| 269 | } | ||
| 270 | |||
| 271 | /* convert from xfs inode to vfs inode */ | ||
| 272 | static inline struct inode *VFS_I(struct xfs_inode *ip) | ||
| 273 | { | ||
| 274 | return (struct inode *)ip->i_vnode; | ||
| 275 | } | ||
| 276 | |||
| 266 | /* | 277 | /* |
| 267 | * i_flags helper functions | 278 | * i_flags helper functions |
| 268 | */ | 279 | */ |
| @@ -439,9 +450,6 @@ xfs_iflags_test_and_clear(xfs_inode_t *ip, unsigned short flags) | |||
| 439 | #define XFS_ITRUNC_DEFINITE 0x1 | 450 | #define XFS_ITRUNC_DEFINITE 0x1 |
| 440 | #define XFS_ITRUNC_MAYBE 0x2 | 451 | #define XFS_ITRUNC_MAYBE 0x2 |
| 441 | 452 | ||
| 442 | #define XFS_ITOV(ip) ((ip)->i_vnode) | ||
| 443 | #define XFS_ITOV_NULL(ip) ((ip)->i_vnode) | ||
| 444 | |||
| 445 | /* | 453 | /* |
| 446 | * For multiple groups support: if S_ISGID bit is set in the parent | 454 | * For multiple groups support: if S_ISGID bit is set in the parent |
| 447 | * directory, group of new file is set to that of the parent, and | 455 | * directory, group of new file is set to that of the parent, and |
| @@ -473,11 +481,8 @@ int xfs_ilock_nowait(xfs_inode_t *, uint); | |||
| 473 | void xfs_iunlock(xfs_inode_t *, uint); | 481 | void xfs_iunlock(xfs_inode_t *, uint); |
| 474 | void xfs_ilock_demote(xfs_inode_t *, uint); | 482 | void xfs_ilock_demote(xfs_inode_t *, uint); |
| 475 | int xfs_isilocked(xfs_inode_t *, uint); | 483 | int xfs_isilocked(xfs_inode_t *, uint); |
| 476 | void xfs_iflock(xfs_inode_t *); | ||
| 477 | int xfs_iflock_nowait(xfs_inode_t *); | ||
| 478 | uint xfs_ilock_map_shared(xfs_inode_t *); | 484 | uint xfs_ilock_map_shared(xfs_inode_t *); |
| 479 | void xfs_iunlock_map_shared(xfs_inode_t *, uint); | 485 | void xfs_iunlock_map_shared(xfs_inode_t *, uint); |
| 480 | void xfs_ifunlock(xfs_inode_t *); | ||
| 481 | void xfs_ireclaim(xfs_inode_t *); | 486 | void xfs_ireclaim(xfs_inode_t *); |
| 482 | int xfs_finish_reclaim(xfs_inode_t *, int, int); | 487 | int xfs_finish_reclaim(xfs_inode_t *, int, int); |
| 483 | int xfs_finish_reclaim_all(struct xfs_mount *, int); | 488 | int xfs_finish_reclaim_all(struct xfs_mount *, int); |
| @@ -522,6 +527,7 @@ void xfs_iflush_all(struct xfs_mount *); | |||
| 522 | void xfs_ichgtime(xfs_inode_t *, int); | 527 | void xfs_ichgtime(xfs_inode_t *, int); |
| 523 | xfs_fsize_t xfs_file_last_byte(xfs_inode_t *); | 528 | xfs_fsize_t xfs_file_last_byte(xfs_inode_t *); |
| 524 | void xfs_lock_inodes(xfs_inode_t **, int, uint); | 529 | void xfs_lock_inodes(xfs_inode_t **, int, uint); |
| 530 | void xfs_lock_two_inodes(xfs_inode_t *, xfs_inode_t *, uint); | ||
| 525 | 531 | ||
| 526 | void xfs_synchronize_atime(xfs_inode_t *); | 532 | void xfs_synchronize_atime(xfs_inode_t *); |
| 527 | void xfs_mark_inode_dirty_sync(xfs_inode_t *); | 533 | void xfs_mark_inode_dirty_sync(xfs_inode_t *); |
| @@ -570,6 +576,26 @@ extern struct kmem_zone *xfs_ifork_zone; | |||
| 570 | extern struct kmem_zone *xfs_inode_zone; | 576 | extern struct kmem_zone *xfs_inode_zone; |
| 571 | extern struct kmem_zone *xfs_ili_zone; | 577 | extern struct kmem_zone *xfs_ili_zone; |
| 572 | 578 | ||
| 579 | /* | ||
| 580 | * Manage the i_flush queue embedded in the inode. This completion | ||
| 581 | * queue synchronizes processes attempting to flush the in-core | ||
| 582 | * inode back to disk. | ||
| 583 | */ | ||
| 584 | static inline void xfs_iflock(xfs_inode_t *ip) | ||
| 585 | { | ||
| 586 | wait_for_completion(&ip->i_flush); | ||
| 587 | } | ||
| 588 | |||
| 589 | static inline int xfs_iflock_nowait(xfs_inode_t *ip) | ||
| 590 | { | ||
| 591 | return try_wait_for_completion(&ip->i_flush); | ||
| 592 | } | ||
| 593 | |||
| 594 | static inline void xfs_ifunlock(xfs_inode_t *ip) | ||
| 595 | { | ||
| 596 | complete(&ip->i_flush); | ||
| 597 | } | ||
| 598 | |||
| 573 | #endif /* __KERNEL__ */ | 599 | #endif /* __KERNEL__ */ |
| 574 | 600 | ||
| 575 | #endif /* __XFS_INODE_H__ */ | 601 | #endif /* __XFS_INODE_H__ */ |
diff --git a/fs/xfs/xfs_inode_item.c b/fs/xfs/xfs_inode_item.c index 0eee08a32c26..97c7452e2620 100644 --- a/fs/xfs/xfs_inode_item.c +++ b/fs/xfs/xfs_inode_item.c | |||
| @@ -779,11 +779,10 @@ xfs_inode_item_pushbuf( | |||
| 779 | ASSERT(iip->ili_push_owner == current_pid()); | 779 | ASSERT(iip->ili_push_owner == current_pid()); |
| 780 | 780 | ||
| 781 | /* | 781 | /* |
| 782 | * If flushlock isn't locked anymore, chances are that the | 782 | * If a flush is not in progress anymore, chances are that the |
| 783 | * inode flush completed and the inode was taken off the AIL. | 783 | * inode was taken off the AIL. So, just get out. |
| 784 | * So, just get out. | ||
| 785 | */ | 784 | */ |
| 786 | if (!issemalocked(&(ip->i_flock)) || | 785 | if (completion_done(&ip->i_flush) || |
| 787 | ((iip->ili_item.li_flags & XFS_LI_IN_AIL) == 0)) { | 786 | ((iip->ili_item.li_flags & XFS_LI_IN_AIL) == 0)) { |
| 788 | iip->ili_pushbuf_flag = 0; | 787 | iip->ili_pushbuf_flag = 0; |
| 789 | xfs_iunlock(ip, XFS_ILOCK_SHARED); | 788 | xfs_iunlock(ip, XFS_ILOCK_SHARED); |
| @@ -805,7 +804,7 @@ xfs_inode_item_pushbuf( | |||
| 805 | * If not, we can flush it async. | 804 | * If not, we can flush it async. |
| 806 | */ | 805 | */ |
| 807 | dopush = ((iip->ili_item.li_flags & XFS_LI_IN_AIL) && | 806 | dopush = ((iip->ili_item.li_flags & XFS_LI_IN_AIL) && |
| 808 | issemalocked(&(ip->i_flock))); | 807 | !completion_done(&ip->i_flush)); |
| 809 | iip->ili_pushbuf_flag = 0; | 808 | iip->ili_pushbuf_flag = 0; |
| 810 | xfs_iunlock(ip, XFS_ILOCK_SHARED); | 809 | xfs_iunlock(ip, XFS_ILOCK_SHARED); |
| 811 | xfs_buftrace("INODE ITEM PUSH", bp); | 810 | xfs_buftrace("INODE ITEM PUSH", bp); |
| @@ -858,7 +857,7 @@ xfs_inode_item_push( | |||
| 858 | ip = iip->ili_inode; | 857 | ip = iip->ili_inode; |
| 859 | 858 | ||
| 860 | ASSERT(xfs_isilocked(ip, XFS_ILOCK_SHARED)); | 859 | ASSERT(xfs_isilocked(ip, XFS_ILOCK_SHARED)); |
| 861 | ASSERT(issemalocked(&(ip->i_flock))); | 860 | ASSERT(!completion_done(&ip->i_flush)); |
| 862 | /* | 861 | /* |
| 863 | * Since we were able to lock the inode's flush lock and | 862 | * Since we were able to lock the inode's flush lock and |
| 864 | * we found it on the AIL, the inode must be dirty. This | 863 | * we found it on the AIL, the inode must be dirty. This |
diff --git a/fs/xfs/xfs_itable.c b/fs/xfs/xfs_itable.c index 9a3ef9dcaeb9..cf6754a3c5b3 100644 --- a/fs/xfs/xfs_itable.c +++ b/fs/xfs/xfs_itable.c | |||
| @@ -59,7 +59,6 @@ xfs_bulkstat_one_iget( | |||
| 59 | { | 59 | { |
| 60 | xfs_icdinode_t *dic; /* dinode core info pointer */ | 60 | xfs_icdinode_t *dic; /* dinode core info pointer */ |
| 61 | xfs_inode_t *ip; /* incore inode pointer */ | 61 | xfs_inode_t *ip; /* incore inode pointer */ |
| 62 | bhv_vnode_t *vp; | ||
| 63 | int error; | 62 | int error; |
| 64 | 63 | ||
| 65 | error = xfs_iget(mp, NULL, ino, | 64 | error = xfs_iget(mp, NULL, ino, |
| @@ -72,7 +71,6 @@ xfs_bulkstat_one_iget( | |||
| 72 | ASSERT(ip != NULL); | 71 | ASSERT(ip != NULL); |
| 73 | ASSERT(ip->i_blkno != (xfs_daddr_t)0); | 72 | ASSERT(ip->i_blkno != (xfs_daddr_t)0); |
| 74 | 73 | ||
| 75 | vp = XFS_ITOV(ip); | ||
| 76 | dic = &ip->i_d; | 74 | dic = &ip->i_d; |
| 77 | 75 | ||
| 78 | /* xfs_iget returns the following without needing | 76 | /* xfs_iget returns the following without needing |
| @@ -85,7 +83,7 @@ xfs_bulkstat_one_iget( | |||
| 85 | buf->bs_uid = dic->di_uid; | 83 | buf->bs_uid = dic->di_uid; |
| 86 | buf->bs_gid = dic->di_gid; | 84 | buf->bs_gid = dic->di_gid; |
| 87 | buf->bs_size = dic->di_size; | 85 | buf->bs_size = dic->di_size; |
| 88 | vn_atime_to_bstime(vp, &buf->bs_atime); | 86 | vn_atime_to_bstime(VFS_I(ip), &buf->bs_atime); |
| 89 | buf->bs_mtime.tv_sec = dic->di_mtime.t_sec; | 87 | buf->bs_mtime.tv_sec = dic->di_mtime.t_sec; |
| 90 | buf->bs_mtime.tv_nsec = dic->di_mtime.t_nsec; | 88 | buf->bs_mtime.tv_nsec = dic->di_mtime.t_nsec; |
| 91 | buf->bs_ctime.tv_sec = dic->di_ctime.t_sec; | 89 | buf->bs_ctime.tv_sec = dic->di_ctime.t_sec; |
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c index 91b00a5686cd..ccba14eb9dbe 100644 --- a/fs/xfs/xfs_log.c +++ b/fs/xfs/xfs_log.c | |||
| @@ -160,7 +160,7 @@ void | |||
| 160 | xlog_trace_iclog(xlog_in_core_t *iclog, uint state) | 160 | xlog_trace_iclog(xlog_in_core_t *iclog, uint state) |
| 161 | { | 161 | { |
| 162 | if (!iclog->ic_trace) | 162 | if (!iclog->ic_trace) |
| 163 | iclog->ic_trace = ktrace_alloc(256, KM_SLEEP); | 163 | iclog->ic_trace = ktrace_alloc(256, KM_NOFS); |
| 164 | ktrace_enter(iclog->ic_trace, | 164 | ktrace_enter(iclog->ic_trace, |
| 165 | (void *)((unsigned long)state), | 165 | (void *)((unsigned long)state), |
| 166 | (void *)((unsigned long)current_pid()), | 166 | (void *)((unsigned long)current_pid()), |
| @@ -336,15 +336,12 @@ xfs_log_done(xfs_mount_t *mp, | |||
| 336 | } else { | 336 | } else { |
| 337 | xlog_trace_loggrant(log, ticket, "xfs_log_done: (permanent)"); | 337 | xlog_trace_loggrant(log, ticket, "xfs_log_done: (permanent)"); |
| 338 | xlog_regrant_reserve_log_space(log, ticket); | 338 | xlog_regrant_reserve_log_space(log, ticket); |
| 339 | } | 339 | /* If this ticket was a permanent reservation and we aren't |
| 340 | 340 | * trying to release it, reset the inited flags; so next time | |
| 341 | /* If this ticket was a permanent reservation and we aren't | 341 | * we write, a start record will be written out. |
| 342 | * trying to release it, reset the inited flags; so next time | 342 | */ |
| 343 | * we write, a start record will be written out. | ||
| 344 | */ | ||
| 345 | if ((ticket->t_flags & XLOG_TIC_PERM_RESERV) && | ||
| 346 | (flags & XFS_LOG_REL_PERM_RESERV) == 0) | ||
| 347 | ticket->t_flags |= XLOG_TIC_INITED; | 343 | ticket->t_flags |= XLOG_TIC_INITED; |
| 344 | } | ||
| 348 | 345 | ||
| 349 | return lsn; | 346 | return lsn; |
| 350 | } /* xfs_log_done */ | 347 | } /* xfs_log_done */ |
| @@ -357,11 +354,11 @@ xfs_log_done(xfs_mount_t *mp, | |||
| 357 | * Asynchronous forces are implemented by setting the WANT_SYNC | 354 | * Asynchronous forces are implemented by setting the WANT_SYNC |
| 358 | * bit in the appropriate in-core log and then returning. | 355 | * bit in the appropriate in-core log and then returning. |
| 359 | * | 356 | * |
| 360 | * Synchronous forces are implemented with a semaphore. All callers | 357 | * Synchronous forces are implemented with a signal variable. All callers |
| 361 | * to force a given lsn to disk will wait on a semaphore attached to the | 358 | * to force a given lsn to disk will wait on a the sv attached to the |
| 362 | * specific in-core log. When given in-core log finally completes its | 359 | * specific in-core log. When given in-core log finally completes its |
| 363 | * write to disk, that thread will wake up all threads waiting on the | 360 | * write to disk, that thread will wake up all threads waiting on the |
| 364 | * semaphore. | 361 | * sv. |
| 365 | */ | 362 | */ |
| 366 | int | 363 | int |
| 367 | _xfs_log_force( | 364 | _xfs_log_force( |
| @@ -588,12 +585,12 @@ error: | |||
| 588 | * mp - ubiquitous xfs mount point structure | 585 | * mp - ubiquitous xfs mount point structure |
| 589 | */ | 586 | */ |
| 590 | int | 587 | int |
| 591 | xfs_log_mount_finish(xfs_mount_t *mp, int mfsi_flags) | 588 | xfs_log_mount_finish(xfs_mount_t *mp) |
| 592 | { | 589 | { |
| 593 | int error; | 590 | int error; |
| 594 | 591 | ||
| 595 | if (!(mp->m_flags & XFS_MOUNT_NORECOVERY)) | 592 | if (!(mp->m_flags & XFS_MOUNT_NORECOVERY)) |
| 596 | error = xlog_recover_finish(mp->m_log, mfsi_flags); | 593 | error = xlog_recover_finish(mp->m_log); |
| 597 | else { | 594 | else { |
| 598 | error = 0; | 595 | error = 0; |
| 599 | ASSERT(mp->m_flags & XFS_MOUNT_RDONLY); | 596 | ASSERT(mp->m_flags & XFS_MOUNT_RDONLY); |
| @@ -707,7 +704,7 @@ xfs_log_unmount_write(xfs_mount_t *mp) | |||
| 707 | if (!(iclog->ic_state == XLOG_STATE_ACTIVE || | 704 | if (!(iclog->ic_state == XLOG_STATE_ACTIVE || |
| 708 | iclog->ic_state == XLOG_STATE_DIRTY)) { | 705 | iclog->ic_state == XLOG_STATE_DIRTY)) { |
| 709 | if (!XLOG_FORCED_SHUTDOWN(log)) { | 706 | if (!XLOG_FORCED_SHUTDOWN(log)) { |
| 710 | sv_wait(&iclog->ic_forcesema, PMEM, | 707 | sv_wait(&iclog->ic_force_wait, PMEM, |
| 711 | &log->l_icloglock, s); | 708 | &log->l_icloglock, s); |
| 712 | } else { | 709 | } else { |
| 713 | spin_unlock(&log->l_icloglock); | 710 | spin_unlock(&log->l_icloglock); |
| @@ -748,7 +745,7 @@ xfs_log_unmount_write(xfs_mount_t *mp) | |||
| 748 | || iclog->ic_state == XLOG_STATE_DIRTY | 745 | || iclog->ic_state == XLOG_STATE_DIRTY |
| 749 | || iclog->ic_state == XLOG_STATE_IOERROR) ) { | 746 | || iclog->ic_state == XLOG_STATE_IOERROR) ) { |
| 750 | 747 | ||
| 751 | sv_wait(&iclog->ic_forcesema, PMEM, | 748 | sv_wait(&iclog->ic_force_wait, PMEM, |
| 752 | &log->l_icloglock, s); | 749 | &log->l_icloglock, s); |
| 753 | } else { | 750 | } else { |
| 754 | spin_unlock(&log->l_icloglock); | 751 | spin_unlock(&log->l_icloglock); |
| @@ -838,7 +835,7 @@ xfs_log_move_tail(xfs_mount_t *mp, | |||
| 838 | break; | 835 | break; |
| 839 | tail_lsn = 0; | 836 | tail_lsn = 0; |
| 840 | free_bytes -= tic->t_unit_res; | 837 | free_bytes -= tic->t_unit_res; |
| 841 | sv_signal(&tic->t_sema); | 838 | sv_signal(&tic->t_wait); |
| 842 | tic = tic->t_next; | 839 | tic = tic->t_next; |
| 843 | } while (tic != log->l_write_headq); | 840 | } while (tic != log->l_write_headq); |
| 844 | } | 841 | } |
| @@ -859,7 +856,7 @@ xfs_log_move_tail(xfs_mount_t *mp, | |||
| 859 | break; | 856 | break; |
| 860 | tail_lsn = 0; | 857 | tail_lsn = 0; |
| 861 | free_bytes -= need_bytes; | 858 | free_bytes -= need_bytes; |
| 862 | sv_signal(&tic->t_sema); | 859 | sv_signal(&tic->t_wait); |
| 863 | tic = tic->t_next; | 860 | tic = tic->t_next; |
| 864 | } while (tic != log->l_reserve_headq); | 861 | } while (tic != log->l_reserve_headq); |
| 865 | } | 862 | } |
| @@ -1285,8 +1282,8 @@ xlog_alloc_log(xfs_mount_t *mp, | |||
| 1285 | 1282 | ||
| 1286 | ASSERT(XFS_BUF_ISBUSY(iclog->ic_bp)); | 1283 | ASSERT(XFS_BUF_ISBUSY(iclog->ic_bp)); |
| 1287 | ASSERT(XFS_BUF_VALUSEMA(iclog->ic_bp) <= 0); | 1284 | ASSERT(XFS_BUF_VALUSEMA(iclog->ic_bp) <= 0); |
| 1288 | sv_init(&iclog->ic_forcesema, SV_DEFAULT, "iclog-force"); | 1285 | sv_init(&iclog->ic_force_wait, SV_DEFAULT, "iclog-force"); |
| 1289 | sv_init(&iclog->ic_writesema, SV_DEFAULT, "iclog-write"); | 1286 | sv_init(&iclog->ic_write_wait, SV_DEFAULT, "iclog-write"); |
| 1290 | 1287 | ||
| 1291 | iclogp = &iclog->ic_next; | 1288 | iclogp = &iclog->ic_next; |
| 1292 | } | 1289 | } |
| @@ -1565,8 +1562,8 @@ xlog_dealloc_log(xlog_t *log) | |||
| 1565 | 1562 | ||
| 1566 | iclog = log->l_iclog; | 1563 | iclog = log->l_iclog; |
| 1567 | for (i=0; i<log->l_iclog_bufs; i++) { | 1564 | for (i=0; i<log->l_iclog_bufs; i++) { |
| 1568 | sv_destroy(&iclog->ic_forcesema); | 1565 | sv_destroy(&iclog->ic_force_wait); |
| 1569 | sv_destroy(&iclog->ic_writesema); | 1566 | sv_destroy(&iclog->ic_write_wait); |
| 1570 | xfs_buf_free(iclog->ic_bp); | 1567 | xfs_buf_free(iclog->ic_bp); |
| 1571 | #ifdef XFS_LOG_TRACE | 1568 | #ifdef XFS_LOG_TRACE |
| 1572 | if (iclog->ic_trace != NULL) { | 1569 | if (iclog->ic_trace != NULL) { |
| @@ -1976,7 +1973,7 @@ xlog_write(xfs_mount_t * mp, | |||
| 1976 | /* Clean iclogs starting from the head. This ordering must be | 1973 | /* Clean iclogs starting from the head. This ordering must be |
| 1977 | * maintained, so an iclog doesn't become ACTIVE beyond one that | 1974 | * maintained, so an iclog doesn't become ACTIVE beyond one that |
| 1978 | * is SYNCING. This is also required to maintain the notion that we use | 1975 | * is SYNCING. This is also required to maintain the notion that we use |
| 1979 | * a counting semaphore to hold off would be writers to the log when every | 1976 | * a ordered wait queue to hold off would be writers to the log when every |
| 1980 | * iclog is trying to sync to disk. | 1977 | * iclog is trying to sync to disk. |
| 1981 | * | 1978 | * |
| 1982 | * State Change: DIRTY -> ACTIVE | 1979 | * State Change: DIRTY -> ACTIVE |
| @@ -2240,7 +2237,7 @@ xlog_state_do_callback( | |||
| 2240 | xlog_state_clean_log(log); | 2237 | xlog_state_clean_log(log); |
| 2241 | 2238 | ||
| 2242 | /* wake up threads waiting in xfs_log_force() */ | 2239 | /* wake up threads waiting in xfs_log_force() */ |
| 2243 | sv_broadcast(&iclog->ic_forcesema); | 2240 | sv_broadcast(&iclog->ic_force_wait); |
| 2244 | 2241 | ||
| 2245 | iclog = iclog->ic_next; | 2242 | iclog = iclog->ic_next; |
| 2246 | } while (first_iclog != iclog); | 2243 | } while (first_iclog != iclog); |
| @@ -2302,8 +2299,7 @@ xlog_state_do_callback( | |||
| 2302 | * the second completion goes through. | 2299 | * the second completion goes through. |
| 2303 | * | 2300 | * |
| 2304 | * Callbacks could take time, so they are done outside the scope of the | 2301 | * Callbacks could take time, so they are done outside the scope of the |
| 2305 | * global state machine log lock. Assume that the calls to cvsema won't | 2302 | * global state machine log lock. |
| 2306 | * take a long time. At least we know it won't sleep. | ||
| 2307 | */ | 2303 | */ |
| 2308 | STATIC void | 2304 | STATIC void |
| 2309 | xlog_state_done_syncing( | 2305 | xlog_state_done_syncing( |
| @@ -2339,7 +2335,7 @@ xlog_state_done_syncing( | |||
| 2339 | * iclog buffer, we wake them all, one will get to do the | 2335 | * iclog buffer, we wake them all, one will get to do the |
| 2340 | * I/O, the others get to wait for the result. | 2336 | * I/O, the others get to wait for the result. |
| 2341 | */ | 2337 | */ |
| 2342 | sv_broadcast(&iclog->ic_writesema); | 2338 | sv_broadcast(&iclog->ic_write_wait); |
| 2343 | spin_unlock(&log->l_icloglock); | 2339 | spin_unlock(&log->l_icloglock); |
| 2344 | xlog_state_do_callback(log, aborted, iclog); /* also cleans log */ | 2340 | xlog_state_do_callback(log, aborted, iclog); /* also cleans log */ |
| 2345 | } /* xlog_state_done_syncing */ | 2341 | } /* xlog_state_done_syncing */ |
| @@ -2347,11 +2343,9 @@ xlog_state_done_syncing( | |||
| 2347 | 2343 | ||
| 2348 | /* | 2344 | /* |
| 2349 | * If the head of the in-core log ring is not (ACTIVE or DIRTY), then we must | 2345 | * If the head of the in-core log ring is not (ACTIVE or DIRTY), then we must |
| 2350 | * sleep. The flush semaphore is set to the number of in-core buffers and | 2346 | * sleep. We wait on the flush queue on the head iclog as that should be |
| 2351 | * decremented around disk syncing. Therefore, if all buffers are syncing, | 2347 | * the first iclog to complete flushing. Hence if all iclogs are syncing, |
| 2352 | * this semaphore will cause new writes to sleep until a sync completes. | 2348 | * we will wait here and all new writes will sleep until a sync completes. |
| 2353 | * Otherwise, this code just does p() followed by v(). This approximates | ||
| 2354 | * a sleep/wakeup except we can't race. | ||
| 2355 | * | 2349 | * |
| 2356 | * The in-core logs are used in a circular fashion. They are not used | 2350 | * The in-core logs are used in a circular fashion. They are not used |
| 2357 | * out-of-order even when an iclog past the head is free. | 2351 | * out-of-order even when an iclog past the head is free. |
| @@ -2508,7 +2502,7 @@ xlog_grant_log_space(xlog_t *log, | |||
| 2508 | goto error_return; | 2502 | goto error_return; |
| 2509 | 2503 | ||
| 2510 | XFS_STATS_INC(xs_sleep_logspace); | 2504 | XFS_STATS_INC(xs_sleep_logspace); |
| 2511 | sv_wait(&tic->t_sema, PINOD|PLTWAIT, &log->l_grant_lock, s); | 2505 | sv_wait(&tic->t_wait, PINOD|PLTWAIT, &log->l_grant_lock, s); |
| 2512 | /* | 2506 | /* |
| 2513 | * If we got an error, and the filesystem is shutting down, | 2507 | * If we got an error, and the filesystem is shutting down, |
| 2514 | * we'll catch it down below. So just continue... | 2508 | * we'll catch it down below. So just continue... |
| @@ -2534,7 +2528,7 @@ redo: | |||
| 2534 | xlog_trace_loggrant(log, tic, | 2528 | xlog_trace_loggrant(log, tic, |
| 2535 | "xlog_grant_log_space: sleep 2"); | 2529 | "xlog_grant_log_space: sleep 2"); |
| 2536 | XFS_STATS_INC(xs_sleep_logspace); | 2530 | XFS_STATS_INC(xs_sleep_logspace); |
| 2537 | sv_wait(&tic->t_sema, PINOD|PLTWAIT, &log->l_grant_lock, s); | 2531 | sv_wait(&tic->t_wait, PINOD|PLTWAIT, &log->l_grant_lock, s); |
| 2538 | 2532 | ||
| 2539 | if (XLOG_FORCED_SHUTDOWN(log)) { | 2533 | if (XLOG_FORCED_SHUTDOWN(log)) { |
| 2540 | spin_lock(&log->l_grant_lock); | 2534 | spin_lock(&log->l_grant_lock); |
| @@ -2633,7 +2627,7 @@ xlog_regrant_write_log_space(xlog_t *log, | |||
| 2633 | if (free_bytes < ntic->t_unit_res) | 2627 | if (free_bytes < ntic->t_unit_res) |
| 2634 | break; | 2628 | break; |
| 2635 | free_bytes -= ntic->t_unit_res; | 2629 | free_bytes -= ntic->t_unit_res; |
| 2636 | sv_signal(&ntic->t_sema); | 2630 | sv_signal(&ntic->t_wait); |
| 2637 | ntic = ntic->t_next; | 2631 | ntic = ntic->t_next; |
| 2638 | } while (ntic != log->l_write_headq); | 2632 | } while (ntic != log->l_write_headq); |
| 2639 | 2633 | ||
| @@ -2644,7 +2638,7 @@ xlog_regrant_write_log_space(xlog_t *log, | |||
| 2644 | xlog_trace_loggrant(log, tic, | 2638 | xlog_trace_loggrant(log, tic, |
| 2645 | "xlog_regrant_write_log_space: sleep 1"); | 2639 | "xlog_regrant_write_log_space: sleep 1"); |
| 2646 | XFS_STATS_INC(xs_sleep_logspace); | 2640 | XFS_STATS_INC(xs_sleep_logspace); |
| 2647 | sv_wait(&tic->t_sema, PINOD|PLTWAIT, | 2641 | sv_wait(&tic->t_wait, PINOD|PLTWAIT, |
| 2648 | &log->l_grant_lock, s); | 2642 | &log->l_grant_lock, s); |
| 2649 | 2643 | ||
| 2650 | /* If we're shutting down, this tic is already | 2644 | /* If we're shutting down, this tic is already |
| @@ -2673,7 +2667,7 @@ redo: | |||
| 2673 | if ((tic->t_flags & XLOG_TIC_IN_Q) == 0) | 2667 | if ((tic->t_flags & XLOG_TIC_IN_Q) == 0) |
| 2674 | xlog_ins_ticketq(&log->l_write_headq, tic); | 2668 | xlog_ins_ticketq(&log->l_write_headq, tic); |
| 2675 | XFS_STATS_INC(xs_sleep_logspace); | 2669 | XFS_STATS_INC(xs_sleep_logspace); |
| 2676 | sv_wait(&tic->t_sema, PINOD|PLTWAIT, &log->l_grant_lock, s); | 2670 | sv_wait(&tic->t_wait, PINOD|PLTWAIT, &log->l_grant_lock, s); |
| 2677 | 2671 | ||
| 2678 | /* If we're shutting down, this tic is already off the queue */ | 2672 | /* If we're shutting down, this tic is already off the queue */ |
| 2679 | if (XLOG_FORCED_SHUTDOWN(log)) { | 2673 | if (XLOG_FORCED_SHUTDOWN(log)) { |
| @@ -2916,7 +2910,7 @@ xlog_state_switch_iclogs(xlog_t *log, | |||
| 2916 | * 2. the current iclog is drity, and the previous iclog is in the | 2910 | * 2. the current iclog is drity, and the previous iclog is in the |
| 2917 | * active or dirty state. | 2911 | * active or dirty state. |
| 2918 | * | 2912 | * |
| 2919 | * We may sleep (call psema) if: | 2913 | * We may sleep if: |
| 2920 | * | 2914 | * |
| 2921 | * 1. the current iclog is not in the active nor dirty state. | 2915 | * 1. the current iclog is not in the active nor dirty state. |
| 2922 | * 2. the current iclog dirty, and the previous iclog is not in the | 2916 | * 2. the current iclog dirty, and the previous iclog is not in the |
| @@ -3013,7 +3007,7 @@ maybe_sleep: | |||
| 3013 | return XFS_ERROR(EIO); | 3007 | return XFS_ERROR(EIO); |
| 3014 | } | 3008 | } |
| 3015 | XFS_STATS_INC(xs_log_force_sleep); | 3009 | XFS_STATS_INC(xs_log_force_sleep); |
| 3016 | sv_wait(&iclog->ic_forcesema, PINOD, &log->l_icloglock, s); | 3010 | sv_wait(&iclog->ic_force_wait, PINOD, &log->l_icloglock, s); |
| 3017 | /* | 3011 | /* |
| 3018 | * No need to grab the log lock here since we're | 3012 | * No need to grab the log lock here since we're |
| 3019 | * only deciding whether or not to return EIO | 3013 | * only deciding whether or not to return EIO |
| @@ -3096,7 +3090,7 @@ try_again: | |||
| 3096 | XLOG_STATE_SYNCING))) { | 3090 | XLOG_STATE_SYNCING))) { |
| 3097 | ASSERT(!(iclog->ic_state & XLOG_STATE_IOERROR)); | 3091 | ASSERT(!(iclog->ic_state & XLOG_STATE_IOERROR)); |
| 3098 | XFS_STATS_INC(xs_log_force_sleep); | 3092 | XFS_STATS_INC(xs_log_force_sleep); |
| 3099 | sv_wait(&iclog->ic_prev->ic_writesema, PSWP, | 3093 | sv_wait(&iclog->ic_prev->ic_write_wait, PSWP, |
| 3100 | &log->l_icloglock, s); | 3094 | &log->l_icloglock, s); |
| 3101 | *log_flushed = 1; | 3095 | *log_flushed = 1; |
| 3102 | already_slept = 1; | 3096 | already_slept = 1; |
| @@ -3116,7 +3110,7 @@ try_again: | |||
| 3116 | !(iclog->ic_state & (XLOG_STATE_ACTIVE | XLOG_STATE_DIRTY))) { | 3110 | !(iclog->ic_state & (XLOG_STATE_ACTIVE | XLOG_STATE_DIRTY))) { |
| 3117 | 3111 | ||
| 3118 | /* | 3112 | /* |
| 3119 | * Don't wait on the forcesema if we know that we've | 3113 | * Don't wait on completion if we know that we've |
| 3120 | * gotten a log write error. | 3114 | * gotten a log write error. |
| 3121 | */ | 3115 | */ |
| 3122 | if (iclog->ic_state & XLOG_STATE_IOERROR) { | 3116 | if (iclog->ic_state & XLOG_STATE_IOERROR) { |
| @@ -3124,7 +3118,7 @@ try_again: | |||
| 3124 | return XFS_ERROR(EIO); | 3118 | return XFS_ERROR(EIO); |
| 3125 | } | 3119 | } |
| 3126 | XFS_STATS_INC(xs_log_force_sleep); | 3120 | XFS_STATS_INC(xs_log_force_sleep); |
| 3127 | sv_wait(&iclog->ic_forcesema, PSWP, &log->l_icloglock, s); | 3121 | sv_wait(&iclog->ic_force_wait, PSWP, &log->l_icloglock, s); |
| 3128 | /* | 3122 | /* |
| 3129 | * No need to grab the log lock here since we're | 3123 | * No need to grab the log lock here since we're |
| 3130 | * only deciding whether or not to return EIO | 3124 | * only deciding whether or not to return EIO |
| @@ -3180,7 +3174,7 @@ STATIC void | |||
| 3180 | xlog_ticket_put(xlog_t *log, | 3174 | xlog_ticket_put(xlog_t *log, |
| 3181 | xlog_ticket_t *ticket) | 3175 | xlog_ticket_t *ticket) |
| 3182 | { | 3176 | { |
| 3183 | sv_destroy(&ticket->t_sema); | 3177 | sv_destroy(&ticket->t_wait); |
| 3184 | kmem_zone_free(xfs_log_ticket_zone, ticket); | 3178 | kmem_zone_free(xfs_log_ticket_zone, ticket); |
| 3185 | } /* xlog_ticket_put */ | 3179 | } /* xlog_ticket_put */ |
| 3186 | 3180 | ||
| @@ -3270,7 +3264,7 @@ xlog_ticket_get(xlog_t *log, | |||
| 3270 | tic->t_trans_type = 0; | 3264 | tic->t_trans_type = 0; |
| 3271 | if (xflags & XFS_LOG_PERM_RESERV) | 3265 | if (xflags & XFS_LOG_PERM_RESERV) |
| 3272 | tic->t_flags |= XLOG_TIC_PERM_RESERV; | 3266 | tic->t_flags |= XLOG_TIC_PERM_RESERV; |
| 3273 | sv_init(&(tic->t_sema), SV_DEFAULT, "logtick"); | 3267 | sv_init(&(tic->t_wait), SV_DEFAULT, "logtick"); |
| 3274 | 3268 | ||
| 3275 | xlog_tic_reset_res(tic); | 3269 | xlog_tic_reset_res(tic); |
| 3276 | 3270 | ||
| @@ -3557,14 +3551,14 @@ xfs_log_force_umount( | |||
| 3557 | */ | 3551 | */ |
| 3558 | if ((tic = log->l_reserve_headq)) { | 3552 | if ((tic = log->l_reserve_headq)) { |
| 3559 | do { | 3553 | do { |
| 3560 | sv_signal(&tic->t_sema); | 3554 | sv_signal(&tic->t_wait); |
| 3561 | tic = tic->t_next; | 3555 | tic = tic->t_next; |
| 3562 | } while (tic != log->l_reserve_headq); | 3556 | } while (tic != log->l_reserve_headq); |
| 3563 | } | 3557 | } |
| 3564 | 3558 | ||
| 3565 | if ((tic = log->l_write_headq)) { | 3559 | if ((tic = log->l_write_headq)) { |
| 3566 | do { | 3560 | do { |
| 3567 | sv_signal(&tic->t_sema); | 3561 | sv_signal(&tic->t_wait); |
| 3568 | tic = tic->t_next; | 3562 | tic = tic->t_next; |
| 3569 | } while (tic != log->l_write_headq); | 3563 | } while (tic != log->l_write_headq); |
| 3570 | } | 3564 | } |
diff --git a/fs/xfs/xfs_log.h b/fs/xfs/xfs_log.h index d1d678ecb63e..d47b91f10822 100644 --- a/fs/xfs/xfs_log.h +++ b/fs/xfs/xfs_log.h | |||
| @@ -149,7 +149,7 @@ int xfs_log_mount(struct xfs_mount *mp, | |||
| 149 | struct xfs_buftarg *log_target, | 149 | struct xfs_buftarg *log_target, |
| 150 | xfs_daddr_t start_block, | 150 | xfs_daddr_t start_block, |
| 151 | int num_bblocks); | 151 | int num_bblocks); |
| 152 | int xfs_log_mount_finish(struct xfs_mount *mp, int); | 152 | int xfs_log_mount_finish(struct xfs_mount *mp); |
| 153 | void xfs_log_move_tail(struct xfs_mount *mp, | 153 | void xfs_log_move_tail(struct xfs_mount *mp, |
| 154 | xfs_lsn_t tail_lsn); | 154 | xfs_lsn_t tail_lsn); |
| 155 | int xfs_log_notify(struct xfs_mount *mp, | 155 | int xfs_log_notify(struct xfs_mount *mp, |
diff --git a/fs/xfs/xfs_log_priv.h b/fs/xfs/xfs_log_priv.h index 6245913196b4..c8a5b22ee3e3 100644 --- a/fs/xfs/xfs_log_priv.h +++ b/fs/xfs/xfs_log_priv.h | |||
| @@ -241,7 +241,7 @@ typedef struct xlog_res { | |||
| 241 | } xlog_res_t; | 241 | } xlog_res_t; |
| 242 | 242 | ||
| 243 | typedef struct xlog_ticket { | 243 | typedef struct xlog_ticket { |
| 244 | sv_t t_sema; /* sleep on this semaphore : 20 */ | 244 | sv_t t_wait; /* ticket wait queue : 20 */ |
| 245 | struct xlog_ticket *t_next; /* :4|8 */ | 245 | struct xlog_ticket *t_next; /* :4|8 */ |
| 246 | struct xlog_ticket *t_prev; /* :4|8 */ | 246 | struct xlog_ticket *t_prev; /* :4|8 */ |
| 247 | xlog_tid_t t_tid; /* transaction identifier : 4 */ | 247 | xlog_tid_t t_tid; /* transaction identifier : 4 */ |
| @@ -314,7 +314,7 @@ typedef struct xlog_rec_ext_header { | |||
| 314 | * xlog_rec_header_t into the reserved space. | 314 | * xlog_rec_header_t into the reserved space. |
| 315 | * - ic_data follows, so a write to disk can start at the beginning of | 315 | * - ic_data follows, so a write to disk can start at the beginning of |
| 316 | * the iclog. | 316 | * the iclog. |
| 317 | * - ic_forcesema is used to implement synchronous forcing of the iclog to disk. | 317 | * - ic_forcewait is used to implement synchronous forcing of the iclog to disk. |
| 318 | * - ic_next is the pointer to the next iclog in the ring. | 318 | * - ic_next is the pointer to the next iclog in the ring. |
| 319 | * - ic_bp is a pointer to the buffer used to write this incore log to disk. | 319 | * - ic_bp is a pointer to the buffer used to write this incore log to disk. |
| 320 | * - ic_log is a pointer back to the global log structure. | 320 | * - ic_log is a pointer back to the global log structure. |
| @@ -339,8 +339,8 @@ typedef struct xlog_rec_ext_header { | |||
| 339 | * and move everything else out to subsequent cachelines. | 339 | * and move everything else out to subsequent cachelines. |
| 340 | */ | 340 | */ |
| 341 | typedef struct xlog_iclog_fields { | 341 | typedef struct xlog_iclog_fields { |
| 342 | sv_t ic_forcesema; | 342 | sv_t ic_force_wait; |
| 343 | sv_t ic_writesema; | 343 | sv_t ic_write_wait; |
| 344 | struct xlog_in_core *ic_next; | 344 | struct xlog_in_core *ic_next; |
| 345 | struct xlog_in_core *ic_prev; | 345 | struct xlog_in_core *ic_prev; |
| 346 | struct xfs_buf *ic_bp; | 346 | struct xfs_buf *ic_bp; |
| @@ -377,8 +377,8 @@ typedef struct xlog_in_core { | |||
| 377 | /* | 377 | /* |
| 378 | * Defines to save our code from this glop. | 378 | * Defines to save our code from this glop. |
| 379 | */ | 379 | */ |
| 380 | #define ic_forcesema hic_fields.ic_forcesema | 380 | #define ic_force_wait hic_fields.ic_force_wait |
| 381 | #define ic_writesema hic_fields.ic_writesema | 381 | #define ic_write_wait hic_fields.ic_write_wait |
| 382 | #define ic_next hic_fields.ic_next | 382 | #define ic_next hic_fields.ic_next |
| 383 | #define ic_prev hic_fields.ic_prev | 383 | #define ic_prev hic_fields.ic_prev |
| 384 | #define ic_bp hic_fields.ic_bp | 384 | #define ic_bp hic_fields.ic_bp |
| @@ -468,7 +468,7 @@ extern int xlog_find_tail(xlog_t *log, | |||
| 468 | xfs_daddr_t *head_blk, | 468 | xfs_daddr_t *head_blk, |
| 469 | xfs_daddr_t *tail_blk); | 469 | xfs_daddr_t *tail_blk); |
| 470 | extern int xlog_recover(xlog_t *log); | 470 | extern int xlog_recover(xlog_t *log); |
| 471 | extern int xlog_recover_finish(xlog_t *log, int mfsi_flags); | 471 | extern int xlog_recover_finish(xlog_t *log); |
| 472 | extern void xlog_pack_data(xlog_t *log, xlog_in_core_t *iclog, int); | 472 | extern void xlog_pack_data(xlog_t *log, xlog_in_core_t *iclog, int); |
| 473 | extern void xlog_recover_process_iunlinks(xlog_t *log); | 473 | extern void xlog_recover_process_iunlinks(xlog_t *log); |
| 474 | 474 | ||
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c index 9eb722ec744e..82d46ce69d5f 100644 --- a/fs/xfs/xfs_log_recover.c +++ b/fs/xfs/xfs_log_recover.c | |||
| @@ -3940,8 +3940,7 @@ xlog_recover( | |||
| 3940 | */ | 3940 | */ |
| 3941 | int | 3941 | int |
| 3942 | xlog_recover_finish( | 3942 | xlog_recover_finish( |
| 3943 | xlog_t *log, | 3943 | xlog_t *log) |
| 3944 | int mfsi_flags) | ||
| 3945 | { | 3944 | { |
| 3946 | /* | 3945 | /* |
| 3947 | * Now we're ready to do the transactions needed for the | 3946 | * Now we're ready to do the transactions needed for the |
| @@ -3969,9 +3968,7 @@ xlog_recover_finish( | |||
| 3969 | xfs_log_force(log->l_mp, (xfs_lsn_t)0, | 3968 | xfs_log_force(log->l_mp, (xfs_lsn_t)0, |
| 3970 | (XFS_LOG_FORCE | XFS_LOG_SYNC)); | 3969 | (XFS_LOG_FORCE | XFS_LOG_SYNC)); |
| 3971 | 3970 | ||
| 3972 | if ( (mfsi_flags & XFS_MFSI_NOUNLINK) == 0 ) { | 3971 | xlog_recover_process_iunlinks(log); |
| 3973 | xlog_recover_process_iunlinks(log); | ||
| 3974 | } | ||
| 3975 | 3972 | ||
| 3976 | xlog_recover_check_summary(log); | 3973 | xlog_recover_check_summary(log); |
| 3977 | 3974 | ||
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c index 6c5d1325e7f6..a4503f5e9497 100644 --- a/fs/xfs/xfs_mount.c +++ b/fs/xfs/xfs_mount.c | |||
| @@ -128,7 +128,7 @@ static const struct { | |||
| 128 | * initialized. | 128 | * initialized. |
| 129 | */ | 129 | */ |
| 130 | STATIC void | 130 | STATIC void |
| 131 | xfs_mount_free( | 131 | xfs_free_perag( |
| 132 | xfs_mount_t *mp) | 132 | xfs_mount_t *mp) |
| 133 | { | 133 | { |
| 134 | if (mp->m_perag) { | 134 | if (mp->m_perag) { |
| @@ -139,20 +139,6 @@ xfs_mount_free( | |||
| 139 | kmem_free(mp->m_perag[agno].pagb_list); | 139 | kmem_free(mp->m_perag[agno].pagb_list); |
| 140 | kmem_free(mp->m_perag); | 140 | kmem_free(mp->m_perag); |
| 141 | } | 141 | } |
| 142 | |||
| 143 | spinlock_destroy(&mp->m_ail_lock); | ||
| 144 | spinlock_destroy(&mp->m_sb_lock); | ||
| 145 | mutex_destroy(&mp->m_ilock); | ||
| 146 | mutex_destroy(&mp->m_growlock); | ||
| 147 | if (mp->m_quotainfo) | ||
| 148 | XFS_QM_DONE(mp); | ||
| 149 | |||
| 150 | if (mp->m_fsname != NULL) | ||
| 151 | kmem_free(mp->m_fsname); | ||
| 152 | if (mp->m_rtname != NULL) | ||
| 153 | kmem_free(mp->m_rtname); | ||
| 154 | if (mp->m_logname != NULL) | ||
| 155 | kmem_free(mp->m_logname); | ||
| 156 | } | 142 | } |
| 157 | 143 | ||
| 158 | /* | 144 | /* |
| @@ -704,11 +690,11 @@ xfs_initialize_perag_data(xfs_mount_t *mp, xfs_agnumber_t agcount) | |||
| 704 | * Update alignment values based on mount options and sb values | 690 | * Update alignment values based on mount options and sb values |
| 705 | */ | 691 | */ |
| 706 | STATIC int | 692 | STATIC int |
| 707 | xfs_update_alignment(xfs_mount_t *mp, int mfsi_flags, __uint64_t *update_flags) | 693 | xfs_update_alignment(xfs_mount_t *mp, __uint64_t *update_flags) |
| 708 | { | 694 | { |
| 709 | xfs_sb_t *sbp = &(mp->m_sb); | 695 | xfs_sb_t *sbp = &(mp->m_sb); |
| 710 | 696 | ||
| 711 | if (mp->m_dalign && !(mfsi_flags & XFS_MFSI_SECOND)) { | 697 | if (mp->m_dalign) { |
| 712 | /* | 698 | /* |
| 713 | * If stripe unit and stripe width are not multiples | 699 | * If stripe unit and stripe width are not multiples |
| 714 | * of the fs blocksize turn off alignment. | 700 | * of the fs blocksize turn off alignment. |
| @@ -864,7 +850,7 @@ xfs_set_inoalignment(xfs_mount_t *mp) | |||
| 864 | * Check that the data (and log if separate) are an ok size. | 850 | * Check that the data (and log if separate) are an ok size. |
| 865 | */ | 851 | */ |
| 866 | STATIC int | 852 | STATIC int |
| 867 | xfs_check_sizes(xfs_mount_t *mp, int mfsi_flags) | 853 | xfs_check_sizes(xfs_mount_t *mp) |
| 868 | { | 854 | { |
| 869 | xfs_buf_t *bp; | 855 | xfs_buf_t *bp; |
| 870 | xfs_daddr_t d; | 856 | xfs_daddr_t d; |
| @@ -887,8 +873,7 @@ xfs_check_sizes(xfs_mount_t *mp, int mfsi_flags) | |||
| 887 | return error; | 873 | return error; |
| 888 | } | 874 | } |
| 889 | 875 | ||
| 890 | if (((mfsi_flags & XFS_MFSI_CLIENT) == 0) && | 876 | if (mp->m_logdev_targp != mp->m_ddev_targp) { |
| 891 | mp->m_logdev_targp != mp->m_ddev_targp) { | ||
| 892 | d = (xfs_daddr_t)XFS_FSB_TO_BB(mp, mp->m_sb.sb_logblocks); | 877 | d = (xfs_daddr_t)XFS_FSB_TO_BB(mp, mp->m_sb.sb_logblocks); |
| 893 | if (XFS_BB_TO_FSB(mp, d) != mp->m_sb.sb_logblocks) { | 878 | if (XFS_BB_TO_FSB(mp, d) != mp->m_sb.sb_logblocks) { |
| 894 | cmn_err(CE_WARN, "XFS: size check 3 failed"); | 879 | cmn_err(CE_WARN, "XFS: size check 3 failed"); |
| @@ -923,15 +908,13 @@ xfs_check_sizes(xfs_mount_t *mp, int mfsi_flags) | |||
| 923 | */ | 908 | */ |
| 924 | int | 909 | int |
| 925 | xfs_mountfs( | 910 | xfs_mountfs( |
| 926 | xfs_mount_t *mp, | 911 | xfs_mount_t *mp) |
| 927 | int mfsi_flags) | ||
| 928 | { | 912 | { |
| 929 | xfs_sb_t *sbp = &(mp->m_sb); | 913 | xfs_sb_t *sbp = &(mp->m_sb); |
| 930 | xfs_inode_t *rip; | 914 | xfs_inode_t *rip; |
| 931 | __uint64_t resblks; | 915 | __uint64_t resblks; |
| 932 | __int64_t update_flags = 0LL; | 916 | __int64_t update_flags = 0LL; |
| 933 | uint quotamount, quotaflags; | 917 | uint quotamount, quotaflags; |
| 934 | int agno; | ||
| 935 | int uuid_mounted = 0; | 918 | int uuid_mounted = 0; |
| 936 | int error = 0; | 919 | int error = 0; |
| 937 | 920 | ||
| @@ -985,7 +968,7 @@ xfs_mountfs( | |||
| 985 | * allocator alignment is within an ag, therefore ag has | 968 | * allocator alignment is within an ag, therefore ag has |
| 986 | * to be aligned at stripe boundary. | 969 | * to be aligned at stripe boundary. |
| 987 | */ | 970 | */ |
| 988 | error = xfs_update_alignment(mp, mfsi_flags, &update_flags); | 971 | error = xfs_update_alignment(mp, &update_flags); |
| 989 | if (error) | 972 | if (error) |
| 990 | goto error1; | 973 | goto error1; |
| 991 | 974 | ||
| @@ -1004,8 +987,7 @@ xfs_mountfs( | |||
| 1004 | * since a single partition filesystem is identical to a single | 987 | * since a single partition filesystem is identical to a single |
| 1005 | * partition volume/filesystem. | 988 | * partition volume/filesystem. |
| 1006 | */ | 989 | */ |
| 1007 | if ((mfsi_flags & XFS_MFSI_SECOND) == 0 && | 990 | if ((mp->m_flags & XFS_MOUNT_NOUUID) == 0) { |
| 1008 | (mp->m_flags & XFS_MOUNT_NOUUID) == 0) { | ||
| 1009 | if (xfs_uuid_mount(mp)) { | 991 | if (xfs_uuid_mount(mp)) { |
| 1010 | error = XFS_ERROR(EINVAL); | 992 | error = XFS_ERROR(EINVAL); |
| 1011 | goto error1; | 993 | goto error1; |
| @@ -1033,7 +1015,7 @@ xfs_mountfs( | |||
| 1033 | /* | 1015 | /* |
| 1034 | * Check that the data (and log if separate) are an ok size. | 1016 | * Check that the data (and log if separate) are an ok size. |
| 1035 | */ | 1017 | */ |
| 1036 | error = xfs_check_sizes(mp, mfsi_flags); | 1018 | error = xfs_check_sizes(mp); |
| 1037 | if (error) | 1019 | if (error) |
| 1038 | goto error1; | 1020 | goto error1; |
| 1039 | 1021 | ||
| @@ -1047,13 +1029,6 @@ xfs_mountfs( | |||
| 1047 | } | 1029 | } |
| 1048 | 1030 | ||
| 1049 | /* | 1031 | /* |
| 1050 | * For client case we are done now | ||
| 1051 | */ | ||
| 1052 | if (mfsi_flags & XFS_MFSI_CLIENT) { | ||
| 1053 | return 0; | ||
| 1054 | } | ||
| 1055 | |||
| 1056 | /* | ||
| 1057 | * Copies the low order bits of the timestamp and the randomly | 1032 | * Copies the low order bits of the timestamp and the randomly |
| 1058 | * set "sequence" number out of a UUID. | 1033 | * set "sequence" number out of a UUID. |
| 1059 | */ | 1034 | */ |
| @@ -1077,8 +1052,10 @@ xfs_mountfs( | |||
| 1077 | * Allocate and initialize the per-ag data. | 1052 | * Allocate and initialize the per-ag data. |
| 1078 | */ | 1053 | */ |
| 1079 | init_rwsem(&mp->m_peraglock); | 1054 | init_rwsem(&mp->m_peraglock); |
| 1080 | mp->m_perag = | 1055 | mp->m_perag = kmem_zalloc(sbp->sb_agcount * sizeof(xfs_perag_t), |
| 1081 | kmem_zalloc(sbp->sb_agcount * sizeof(xfs_perag_t), KM_SLEEP); | 1056 | KM_MAYFAIL); |
| 1057 | if (!mp->m_perag) | ||
| 1058 | goto error1; | ||
| 1082 | 1059 | ||
| 1083 | mp->m_maxagi = xfs_initialize_perag(mp, sbp->sb_agcount); | 1060 | mp->m_maxagi = xfs_initialize_perag(mp, sbp->sb_agcount); |
| 1084 | 1061 | ||
| @@ -1190,7 +1167,7 @@ xfs_mountfs( | |||
| 1190 | * delayed until after the root and real-time bitmap inodes | 1167 | * delayed until after the root and real-time bitmap inodes |
| 1191 | * were consistently read in. | 1168 | * were consistently read in. |
| 1192 | */ | 1169 | */ |
| 1193 | error = xfs_log_mount_finish(mp, mfsi_flags); | 1170 | error = xfs_log_mount_finish(mp); |
| 1194 | if (error) { | 1171 | if (error) { |
| 1195 | cmn_err(CE_WARN, "XFS: log mount finish failed"); | 1172 | cmn_err(CE_WARN, "XFS: log mount finish failed"); |
| 1196 | goto error4; | 1173 | goto error4; |
| @@ -1199,7 +1176,7 @@ xfs_mountfs( | |||
| 1199 | /* | 1176 | /* |
| 1200 | * Complete the quota initialisation, post-log-replay component. | 1177 | * Complete the quota initialisation, post-log-replay component. |
| 1201 | */ | 1178 | */ |
| 1202 | error = XFS_QM_MOUNT(mp, quotamount, quotaflags, mfsi_flags); | 1179 | error = XFS_QM_MOUNT(mp, quotamount, quotaflags); |
| 1203 | if (error) | 1180 | if (error) |
| 1204 | goto error4; | 1181 | goto error4; |
| 1205 | 1182 | ||
| @@ -1233,12 +1210,7 @@ xfs_mountfs( | |||
| 1233 | error3: | 1210 | error3: |
| 1234 | xfs_log_unmount_dealloc(mp); | 1211 | xfs_log_unmount_dealloc(mp); |
| 1235 | error2: | 1212 | error2: |
| 1236 | for (agno = 0; agno < sbp->sb_agcount; agno++) | 1213 | xfs_free_perag(mp); |
| 1237 | if (mp->m_perag[agno].pagb_list) | ||
| 1238 | kmem_free(mp->m_perag[agno].pagb_list); | ||
| 1239 | kmem_free(mp->m_perag); | ||
| 1240 | mp->m_perag = NULL; | ||
| 1241 | /* FALLTHROUGH */ | ||
| 1242 | error1: | 1214 | error1: |
| 1243 | if (uuid_mounted) | 1215 | if (uuid_mounted) |
| 1244 | uuid_table_remove(&mp->m_sb.sb_uuid); | 1216 | uuid_table_remove(&mp->m_sb.sb_uuid); |
| @@ -1246,16 +1218,17 @@ xfs_mountfs( | |||
| 1246 | } | 1218 | } |
| 1247 | 1219 | ||
| 1248 | /* | 1220 | /* |
| 1249 | * xfs_unmountfs | ||
| 1250 | * | ||
| 1251 | * This flushes out the inodes,dquots and the superblock, unmounts the | 1221 | * This flushes out the inodes,dquots and the superblock, unmounts the |
| 1252 | * log and makes sure that incore structures are freed. | 1222 | * log and makes sure that incore structures are freed. |
| 1253 | */ | 1223 | */ |
| 1254 | int | 1224 | void |
| 1255 | xfs_unmountfs(xfs_mount_t *mp) | 1225 | xfs_unmountfs( |
| 1226 | struct xfs_mount *mp) | ||
| 1256 | { | 1227 | { |
| 1257 | __uint64_t resblks; | 1228 | __uint64_t resblks; |
| 1258 | int error = 0; | 1229 | int error; |
| 1230 | |||
| 1231 | IRELE(mp->m_rootip); | ||
| 1259 | 1232 | ||
| 1260 | /* | 1233 | /* |
| 1261 | * We can potentially deadlock here if we have an inode cluster | 1234 | * We can potentially deadlock here if we have an inode cluster |
| @@ -1312,8 +1285,6 @@ xfs_unmountfs(xfs_mount_t *mp) | |||
| 1312 | xfs_unmountfs_wait(mp); /* wait for async bufs */ | 1285 | xfs_unmountfs_wait(mp); /* wait for async bufs */ |
| 1313 | xfs_log_unmount(mp); /* Done! No more fs ops. */ | 1286 | xfs_log_unmount(mp); /* Done! No more fs ops. */ |
| 1314 | 1287 | ||
| 1315 | xfs_freesb(mp); | ||
| 1316 | |||
| 1317 | /* | 1288 | /* |
| 1318 | * All inodes from this mount point should be freed. | 1289 | * All inodes from this mount point should be freed. |
| 1319 | */ | 1290 | */ |
| @@ -1322,11 +1293,12 @@ xfs_unmountfs(xfs_mount_t *mp) | |||
| 1322 | if ((mp->m_flags & XFS_MOUNT_NOUUID) == 0) | 1293 | if ((mp->m_flags & XFS_MOUNT_NOUUID) == 0) |
| 1323 | uuid_table_remove(&mp->m_sb.sb_uuid); | 1294 | uuid_table_remove(&mp->m_sb.sb_uuid); |
| 1324 | 1295 | ||
| 1325 | #if defined(DEBUG) || defined(INDUCE_IO_ERROR) | 1296 | #if defined(DEBUG) |
| 1326 | xfs_errortag_clearall(mp, 0); | 1297 | xfs_errortag_clearall(mp, 0); |
| 1327 | #endif | 1298 | #endif |
| 1328 | xfs_mount_free(mp); | 1299 | xfs_free_perag(mp); |
| 1329 | return 0; | 1300 | if (mp->m_quotainfo) |
| 1301 | XFS_QM_DONE(mp); | ||
| 1330 | } | 1302 | } |
| 1331 | 1303 | ||
| 1332 | STATIC void | 1304 | STATIC void |
diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h index 5269bd6e3df0..f3c1024b1241 100644 --- a/fs/xfs/xfs_mount.h +++ b/fs/xfs/xfs_mount.h | |||
| @@ -114,7 +114,7 @@ struct xfs_dqtrxops; | |||
| 114 | struct xfs_quotainfo; | 114 | struct xfs_quotainfo; |
| 115 | 115 | ||
| 116 | typedef int (*xfs_qminit_t)(struct xfs_mount *, uint *, uint *); | 116 | typedef int (*xfs_qminit_t)(struct xfs_mount *, uint *, uint *); |
| 117 | typedef int (*xfs_qmmount_t)(struct xfs_mount *, uint, uint, int); | 117 | typedef int (*xfs_qmmount_t)(struct xfs_mount *, uint, uint); |
| 118 | typedef int (*xfs_qmunmount_t)(struct xfs_mount *); | 118 | typedef int (*xfs_qmunmount_t)(struct xfs_mount *); |
| 119 | typedef void (*xfs_qmdone_t)(struct xfs_mount *); | 119 | typedef void (*xfs_qmdone_t)(struct xfs_mount *); |
| 120 | typedef void (*xfs_dqrele_t)(struct xfs_dquot *); | 120 | typedef void (*xfs_dqrele_t)(struct xfs_dquot *); |
| @@ -158,8 +158,8 @@ typedef struct xfs_qmops { | |||
| 158 | 158 | ||
| 159 | #define XFS_QM_INIT(mp, mnt, fl) \ | 159 | #define XFS_QM_INIT(mp, mnt, fl) \ |
| 160 | (*(mp)->m_qm_ops->xfs_qminit)(mp, mnt, fl) | 160 | (*(mp)->m_qm_ops->xfs_qminit)(mp, mnt, fl) |
| 161 | #define XFS_QM_MOUNT(mp, mnt, fl, mfsi_flags) \ | 161 | #define XFS_QM_MOUNT(mp, mnt, fl) \ |
| 162 | (*(mp)->m_qm_ops->xfs_qmmount)(mp, mnt, fl, mfsi_flags) | 162 | (*(mp)->m_qm_ops->xfs_qmmount)(mp, mnt, fl) |
| 163 | #define XFS_QM_UNMOUNT(mp) \ | 163 | #define XFS_QM_UNMOUNT(mp) \ |
| 164 | (*(mp)->m_qm_ops->xfs_qmunmount)(mp) | 164 | (*(mp)->m_qm_ops->xfs_qmunmount)(mp) |
| 165 | #define XFS_QM_DONE(mp) \ | 165 | #define XFS_QM_DONE(mp) \ |
| @@ -442,13 +442,6 @@ void xfs_do_force_shutdown(struct xfs_mount *mp, int flags, char *fname, | |||
| 442 | /* | 442 | /* |
| 443 | * Flags for xfs_mountfs | 443 | * Flags for xfs_mountfs |
| 444 | */ | 444 | */ |
| 445 | #define XFS_MFSI_SECOND 0x01 /* Secondary mount -- skip stuff */ | ||
| 446 | #define XFS_MFSI_CLIENT 0x02 /* Is a client -- skip lots of stuff */ | ||
| 447 | /* XFS_MFSI_RRINODES */ | ||
| 448 | #define XFS_MFSI_NOUNLINK 0x08 /* Skip unlinked inode processing in */ | ||
| 449 | /* log recovery */ | ||
| 450 | #define XFS_MFSI_NO_QUOTACHECK 0x10 /* Skip quotacheck processing */ | ||
| 451 | /* XFS_MFSI_CONVERT_SUNIT */ | ||
| 452 | #define XFS_MFSI_QUIET 0x40 /* Be silent if mount errors found */ | 445 | #define XFS_MFSI_QUIET 0x40 /* Be silent if mount errors found */ |
| 453 | 446 | ||
| 454 | #define XFS_DADDR_TO_AGNO(mp,d) xfs_daddr_to_agno(mp,d) | 447 | #define XFS_DADDR_TO_AGNO(mp,d) xfs_daddr_to_agno(mp,d) |
| @@ -517,10 +510,10 @@ typedef struct xfs_mod_sb { | |||
| 517 | 510 | ||
| 518 | extern void xfs_mod_sb(xfs_trans_t *, __int64_t); | 511 | extern void xfs_mod_sb(xfs_trans_t *, __int64_t); |
| 519 | extern int xfs_log_sbcount(xfs_mount_t *, uint); | 512 | extern int xfs_log_sbcount(xfs_mount_t *, uint); |
| 520 | extern int xfs_mountfs(xfs_mount_t *mp, int); | 513 | extern int xfs_mountfs(xfs_mount_t *mp); |
| 521 | extern void xfs_mountfs_check_barriers(xfs_mount_t *mp); | 514 | extern void xfs_mountfs_check_barriers(xfs_mount_t *mp); |
| 522 | 515 | ||
| 523 | extern int xfs_unmountfs(xfs_mount_t *); | 516 | extern void xfs_unmountfs(xfs_mount_t *); |
| 524 | extern int xfs_unmountfs_writesb(xfs_mount_t *); | 517 | extern int xfs_unmountfs_writesb(xfs_mount_t *); |
| 525 | extern int xfs_unmount_flush(xfs_mount_t *, int); | 518 | extern int xfs_unmount_flush(xfs_mount_t *, int); |
| 526 | extern int xfs_mod_incore_sb(xfs_mount_t *, xfs_sb_field_t, int64_t, int); | 519 | extern int xfs_mod_incore_sb(xfs_mount_t *, xfs_sb_field_t, int64_t, int); |
diff --git a/fs/xfs/xfs_rtalloc.c b/fs/xfs/xfs_rtalloc.c index bf87a5913504..e2f68de16159 100644 --- a/fs/xfs/xfs_rtalloc.c +++ b/fs/xfs/xfs_rtalloc.c | |||
| @@ -74,18 +74,6 @@ STATIC int xfs_rtmodify_summary(xfs_mount_t *, xfs_trans_t *, int, | |||
| 74 | */ | 74 | */ |
| 75 | 75 | ||
| 76 | /* | 76 | /* |
| 77 | * xfs_lowbit32: get low bit set out of 32-bit argument, -1 if none set. | ||
| 78 | */ | ||
| 79 | STATIC int | ||
| 80 | xfs_lowbit32( | ||
| 81 | __uint32_t v) | ||
| 82 | { | ||
| 83 | if (v) | ||
| 84 | return ffs(v) - 1; | ||
| 85 | return -1; | ||
| 86 | } | ||
| 87 | |||
| 88 | /* | ||
| 89 | * Allocate space to the bitmap or summary file, and zero it, for growfs. | 77 | * Allocate space to the bitmap or summary file, and zero it, for growfs. |
| 90 | */ | 78 | */ |
| 91 | STATIC int /* error */ | 79 | STATIC int /* error */ |
| @@ -450,6 +438,7 @@ xfs_rtallocate_extent_near( | |||
| 450 | } | 438 | } |
| 451 | bbno = XFS_BITTOBLOCK(mp, bno); | 439 | bbno = XFS_BITTOBLOCK(mp, bno); |
| 452 | i = 0; | 440 | i = 0; |
| 441 | ASSERT(minlen != 0); | ||
| 453 | log2len = xfs_highbit32(minlen); | 442 | log2len = xfs_highbit32(minlen); |
| 454 | /* | 443 | /* |
| 455 | * Loop over all bitmap blocks (bbno + i is current block). | 444 | * Loop over all bitmap blocks (bbno + i is current block). |
| @@ -618,6 +607,8 @@ xfs_rtallocate_extent_size( | |||
| 618 | xfs_suminfo_t sum; /* summary information for extents */ | 607 | xfs_suminfo_t sum; /* summary information for extents */ |
| 619 | 608 | ||
| 620 | ASSERT(minlen % prod == 0 && maxlen % prod == 0); | 609 | ASSERT(minlen % prod == 0 && maxlen % prod == 0); |
| 610 | ASSERT(maxlen != 0); | ||
| 611 | |||
| 621 | /* | 612 | /* |
| 622 | * Loop over all the levels starting with maxlen. | 613 | * Loop over all the levels starting with maxlen. |
| 623 | * At each level, look at all the bitmap blocks, to see if there | 614 | * At each level, look at all the bitmap blocks, to see if there |
| @@ -675,6 +666,9 @@ xfs_rtallocate_extent_size( | |||
| 675 | *rtblock = NULLRTBLOCK; | 666 | *rtblock = NULLRTBLOCK; |
| 676 | return 0; | 667 | return 0; |
| 677 | } | 668 | } |
| 669 | ASSERT(minlen != 0); | ||
| 670 | ASSERT(maxlen != 0); | ||
| 671 | |||
| 678 | /* | 672 | /* |
| 679 | * Loop over sizes, from maxlen down to minlen. | 673 | * Loop over sizes, from maxlen down to minlen. |
| 680 | * This time, when we do the allocations, allow smaller ones | 674 | * This time, when we do the allocations, allow smaller ones |
| @@ -1961,6 +1955,7 @@ xfs_growfs_rt( | |||
| 1961 | nsbp->sb_blocksize * nsbp->sb_rextsize); | 1955 | nsbp->sb_blocksize * nsbp->sb_rextsize); |
| 1962 | nsbp->sb_rextents = nsbp->sb_rblocks; | 1956 | nsbp->sb_rextents = nsbp->sb_rblocks; |
| 1963 | do_div(nsbp->sb_rextents, nsbp->sb_rextsize); | 1957 | do_div(nsbp->sb_rextents, nsbp->sb_rextsize); |
| 1958 | ASSERT(nsbp->sb_rextents != 0); | ||
| 1964 | nsbp->sb_rextslog = xfs_highbit32(nsbp->sb_rextents); | 1959 | nsbp->sb_rextslog = xfs_highbit32(nsbp->sb_rextents); |
| 1965 | nrsumlevels = nmp->m_rsumlevels = nsbp->sb_rextslog + 1; | 1960 | nrsumlevels = nmp->m_rsumlevels = nsbp->sb_rextslog + 1; |
| 1966 | nrsumsize = | 1961 | nrsumsize = |
diff --git a/fs/xfs/xfs_rw.c b/fs/xfs/xfs_rw.c index b0f31c09a76d..3a82576dde9a 100644 --- a/fs/xfs/xfs_rw.c +++ b/fs/xfs/xfs_rw.c | |||
| @@ -314,7 +314,7 @@ xfs_bioerror_relse( | |||
| 314 | * ASYNC buffers. | 314 | * ASYNC buffers. |
| 315 | */ | 315 | */ |
| 316 | XFS_BUF_ERROR(bp, EIO); | 316 | XFS_BUF_ERROR(bp, EIO); |
| 317 | XFS_BUF_V_IODONESEMA(bp); | 317 | XFS_BUF_FINISH_IOWAIT(bp); |
| 318 | } else { | 318 | } else { |
| 319 | xfs_buf_relse(bp); | 319 | xfs_buf_relse(bp); |
| 320 | } | 320 | } |
diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c index e4ebddd3c500..4e1c22a23be5 100644 --- a/fs/xfs/xfs_trans.c +++ b/fs/xfs/xfs_trans.c | |||
| @@ -43,6 +43,7 @@ | |||
| 43 | #include "xfs_quota.h" | 43 | #include "xfs_quota.h" |
| 44 | #include "xfs_trans_priv.h" | 44 | #include "xfs_trans_priv.h" |
| 45 | #include "xfs_trans_space.h" | 45 | #include "xfs_trans_space.h" |
| 46 | #include "xfs_inode_item.h" | ||
| 46 | 47 | ||
| 47 | 48 | ||
| 48 | STATIC void xfs_trans_apply_sb_deltas(xfs_trans_t *); | 49 | STATIC void xfs_trans_apply_sb_deltas(xfs_trans_t *); |
| @@ -253,7 +254,7 @@ _xfs_trans_alloc( | |||
| 253 | tp->t_mountp = mp; | 254 | tp->t_mountp = mp; |
| 254 | tp->t_items_free = XFS_LIC_NUM_SLOTS; | 255 | tp->t_items_free = XFS_LIC_NUM_SLOTS; |
| 255 | tp->t_busy_free = XFS_LBC_NUM_SLOTS; | 256 | tp->t_busy_free = XFS_LBC_NUM_SLOTS; |
| 256 | XFS_LIC_INIT(&(tp->t_items)); | 257 | xfs_lic_init(&(tp->t_items)); |
| 257 | XFS_LBC_INIT(&(tp->t_busy)); | 258 | XFS_LBC_INIT(&(tp->t_busy)); |
| 258 | return tp; | 259 | return tp; |
| 259 | } | 260 | } |
| @@ -282,7 +283,7 @@ xfs_trans_dup( | |||
| 282 | ntp->t_mountp = tp->t_mountp; | 283 | ntp->t_mountp = tp->t_mountp; |
| 283 | ntp->t_items_free = XFS_LIC_NUM_SLOTS; | 284 | ntp->t_items_free = XFS_LIC_NUM_SLOTS; |
| 284 | ntp->t_busy_free = XFS_LBC_NUM_SLOTS; | 285 | ntp->t_busy_free = XFS_LBC_NUM_SLOTS; |
| 285 | XFS_LIC_INIT(&(ntp->t_items)); | 286 | xfs_lic_init(&(ntp->t_items)); |
| 286 | XFS_LBC_INIT(&(ntp->t_busy)); | 287 | XFS_LBC_INIT(&(ntp->t_busy)); |
| 287 | 288 | ||
| 288 | ASSERT(tp->t_flags & XFS_TRANS_PERM_LOG_RES); | 289 | ASSERT(tp->t_flags & XFS_TRANS_PERM_LOG_RES); |
| @@ -1169,7 +1170,7 @@ xfs_trans_cancel( | |||
| 1169 | while (licp != NULL) { | 1170 | while (licp != NULL) { |
| 1170 | lidp = licp->lic_descs; | 1171 | lidp = licp->lic_descs; |
| 1171 | for (i = 0; i < licp->lic_unused; i++, lidp++) { | 1172 | for (i = 0; i < licp->lic_unused; i++, lidp++) { |
| 1172 | if (XFS_LIC_ISFREE(licp, i)) { | 1173 | if (xfs_lic_isfree(licp, i)) { |
| 1173 | continue; | 1174 | continue; |
| 1174 | } | 1175 | } |
| 1175 | 1176 | ||
| @@ -1216,6 +1217,68 @@ xfs_trans_free( | |||
| 1216 | kmem_zone_free(xfs_trans_zone, tp); | 1217 | kmem_zone_free(xfs_trans_zone, tp); |
| 1217 | } | 1218 | } |
| 1218 | 1219 | ||
| 1220 | /* | ||
| 1221 | * Roll from one trans in the sequence of PERMANENT transactions to | ||
| 1222 | * the next: permanent transactions are only flushed out when | ||
| 1223 | * committed with XFS_TRANS_RELEASE_LOG_RES, but we still want as soon | ||
| 1224 | * as possible to let chunks of it go to the log. So we commit the | ||
| 1225 | * chunk we've been working on and get a new transaction to continue. | ||
| 1226 | */ | ||
| 1227 | int | ||
| 1228 | xfs_trans_roll( | ||
| 1229 | struct xfs_trans **tpp, | ||
| 1230 | struct xfs_inode *dp) | ||
| 1231 | { | ||
| 1232 | struct xfs_trans *trans; | ||
| 1233 | unsigned int logres, count; | ||
| 1234 | int error; | ||
| 1235 | |||
| 1236 | /* | ||
| 1237 | * Ensure that the inode is always logged. | ||
| 1238 | */ | ||
| 1239 | trans = *tpp; | ||
| 1240 | xfs_trans_log_inode(trans, dp, XFS_ILOG_CORE); | ||
| 1241 | |||
| 1242 | /* | ||
| 1243 | * Copy the critical parameters from one trans to the next. | ||
| 1244 | */ | ||
| 1245 | logres = trans->t_log_res; | ||
| 1246 | count = trans->t_log_count; | ||
| 1247 | *tpp = xfs_trans_dup(trans); | ||
| 1248 | |||
| 1249 | /* | ||
| 1250 | * Commit the current transaction. | ||
| 1251 | * If this commit failed, then it'd just unlock those items that | ||
| 1252 | * are not marked ihold. That also means that a filesystem shutdown | ||
| 1253 | * is in progress. The caller takes the responsibility to cancel | ||
| 1254 | * the duplicate transaction that gets returned. | ||
| 1255 | */ | ||
| 1256 | error = xfs_trans_commit(trans, 0); | ||
| 1257 | if (error) | ||
| 1258 | return (error); | ||
| 1259 | |||
| 1260 | trans = *tpp; | ||
| 1261 | |||
| 1262 | /* | ||
| 1263 | * Reserve space in the log for th next transaction. | ||
| 1264 | * This also pushes items in the "AIL", the list of logged items, | ||
| 1265 | * out to disk if they are taking up space at the tail of the log | ||
| 1266 | * that we want to use. This requires that either nothing be locked | ||
| 1267 | * across this call, or that anything that is locked be logged in | ||
| 1268 | * the prior and the next transactions. | ||
| 1269 | */ | ||
| 1270 | error = xfs_trans_reserve(trans, 0, logres, 0, | ||
| 1271 | XFS_TRANS_PERM_LOG_RES, count); | ||
| 1272 | /* | ||
| 1273 | * Ensure that the inode is in the new transaction and locked. | ||
| 1274 | */ | ||
| 1275 | if (error) | ||
| 1276 | return error; | ||
| 1277 | |||
| 1278 | xfs_trans_ijoin(trans, dp, XFS_ILOCK_EXCL); | ||
| 1279 | xfs_trans_ihold(trans, dp); | ||
| 1280 | return 0; | ||
| 1281 | } | ||
| 1219 | 1282 | ||
| 1220 | /* | 1283 | /* |
| 1221 | * THIS SHOULD BE REWRITTEN TO USE xfs_trans_next_item(). | 1284 | * THIS SHOULD BE REWRITTEN TO USE xfs_trans_next_item(). |
| @@ -1253,7 +1316,7 @@ xfs_trans_committed( | |||
| 1253 | * Special case the chunk embedded in the transaction. | 1316 | * Special case the chunk embedded in the transaction. |
| 1254 | */ | 1317 | */ |
| 1255 | licp = &(tp->t_items); | 1318 | licp = &(tp->t_items); |
| 1256 | if (!(XFS_LIC_ARE_ALL_FREE(licp))) { | 1319 | if (!(xfs_lic_are_all_free(licp))) { |
| 1257 | xfs_trans_chunk_committed(licp, tp->t_lsn, abortflag); | 1320 | xfs_trans_chunk_committed(licp, tp->t_lsn, abortflag); |
| 1258 | } | 1321 | } |
| 1259 | 1322 | ||
| @@ -1262,7 +1325,7 @@ xfs_trans_committed( | |||
| 1262 | */ | 1325 | */ |
| 1263 | licp = licp->lic_next; | 1326 | licp = licp->lic_next; |
| 1264 | while (licp != NULL) { | 1327 | while (licp != NULL) { |
| 1265 | ASSERT(!XFS_LIC_ARE_ALL_FREE(licp)); | 1328 | ASSERT(!xfs_lic_are_all_free(licp)); |
| 1266 | xfs_trans_chunk_committed(licp, tp->t_lsn, abortflag); | 1329 | xfs_trans_chunk_committed(licp, tp->t_lsn, abortflag); |
| 1267 | next_licp = licp->lic_next; | 1330 | next_licp = licp->lic_next; |
| 1268 | kmem_free(licp); | 1331 | kmem_free(licp); |
| @@ -1325,7 +1388,7 @@ xfs_trans_chunk_committed( | |||
| 1325 | 1388 | ||
| 1326 | lidp = licp->lic_descs; | 1389 | lidp = licp->lic_descs; |
| 1327 | for (i = 0; i < licp->lic_unused; i++, lidp++) { | 1390 | for (i = 0; i < licp->lic_unused; i++, lidp++) { |
| 1328 | if (XFS_LIC_ISFREE(licp, i)) { | 1391 | if (xfs_lic_isfree(licp, i)) { |
| 1329 | continue; | 1392 | continue; |
| 1330 | } | 1393 | } |
| 1331 | 1394 | ||
diff --git a/fs/xfs/xfs_trans.h b/fs/xfs/xfs_trans.h index 0804207c7391..74c80bd2b0ec 100644 --- a/fs/xfs/xfs_trans.h +++ b/fs/xfs/xfs_trans.h | |||
| @@ -210,62 +210,52 @@ typedef struct xfs_log_item_chunk { | |||
| 210 | * lic_unused to the right value (0 matches all free). The | 210 | * lic_unused to the right value (0 matches all free). The |
| 211 | * lic_descs.lid_index values are set up as each desc is allocated. | 211 | * lic_descs.lid_index values are set up as each desc is allocated. |
| 212 | */ | 212 | */ |
| 213 | #define XFS_LIC_INIT(cp) xfs_lic_init(cp) | ||
| 214 | static inline void xfs_lic_init(xfs_log_item_chunk_t *cp) | 213 | static inline void xfs_lic_init(xfs_log_item_chunk_t *cp) |
| 215 | { | 214 | { |
| 216 | cp->lic_free = XFS_LIC_FREEMASK; | 215 | cp->lic_free = XFS_LIC_FREEMASK; |
| 217 | } | 216 | } |
| 218 | 217 | ||
| 219 | #define XFS_LIC_INIT_SLOT(cp,slot) xfs_lic_init_slot(cp, slot) | ||
| 220 | static inline void xfs_lic_init_slot(xfs_log_item_chunk_t *cp, int slot) | 218 | static inline void xfs_lic_init_slot(xfs_log_item_chunk_t *cp, int slot) |
| 221 | { | 219 | { |
| 222 | cp->lic_descs[slot].lid_index = (unsigned char)(slot); | 220 | cp->lic_descs[slot].lid_index = (unsigned char)(slot); |
| 223 | } | 221 | } |
| 224 | 222 | ||
| 225 | #define XFS_LIC_VACANCY(cp) xfs_lic_vacancy(cp) | ||
| 226 | static inline int xfs_lic_vacancy(xfs_log_item_chunk_t *cp) | 223 | static inline int xfs_lic_vacancy(xfs_log_item_chunk_t *cp) |
| 227 | { | 224 | { |
| 228 | return cp->lic_free & XFS_LIC_FREEMASK; | 225 | return cp->lic_free & XFS_LIC_FREEMASK; |
| 229 | } | 226 | } |
| 230 | 227 | ||
| 231 | #define XFS_LIC_ALL_FREE(cp) xfs_lic_all_free(cp) | ||
| 232 | static inline void xfs_lic_all_free(xfs_log_item_chunk_t *cp) | 228 | static inline void xfs_lic_all_free(xfs_log_item_chunk_t *cp) |
| 233 | { | 229 | { |
| 234 | cp->lic_free = XFS_LIC_FREEMASK; | 230 | cp->lic_free = XFS_LIC_FREEMASK; |
| 235 | } | 231 | } |
| 236 | 232 | ||
| 237 | #define XFS_LIC_ARE_ALL_FREE(cp) xfs_lic_are_all_free(cp) | ||
| 238 | static inline int xfs_lic_are_all_free(xfs_log_item_chunk_t *cp) | 233 | static inline int xfs_lic_are_all_free(xfs_log_item_chunk_t *cp) |
| 239 | { | 234 | { |
| 240 | return ((cp->lic_free & XFS_LIC_FREEMASK) == XFS_LIC_FREEMASK); | 235 | return ((cp->lic_free & XFS_LIC_FREEMASK) == XFS_LIC_FREEMASK); |
| 241 | } | 236 | } |
| 242 | 237 | ||
| 243 | #define XFS_LIC_ISFREE(cp,slot) xfs_lic_isfree(cp,slot) | ||
| 244 | static inline int xfs_lic_isfree(xfs_log_item_chunk_t *cp, int slot) | 238 | static inline int xfs_lic_isfree(xfs_log_item_chunk_t *cp, int slot) |
| 245 | { | 239 | { |
| 246 | return (cp->lic_free & (1 << slot)); | 240 | return (cp->lic_free & (1 << slot)); |
| 247 | } | 241 | } |
| 248 | 242 | ||
| 249 | #define XFS_LIC_CLAIM(cp,slot) xfs_lic_claim(cp,slot) | ||
| 250 | static inline void xfs_lic_claim(xfs_log_item_chunk_t *cp, int slot) | 243 | static inline void xfs_lic_claim(xfs_log_item_chunk_t *cp, int slot) |
| 251 | { | 244 | { |
| 252 | cp->lic_free &= ~(1 << slot); | 245 | cp->lic_free &= ~(1 << slot); |
| 253 | } | 246 | } |
| 254 | 247 | ||
| 255 | #define XFS_LIC_RELSE(cp,slot) xfs_lic_relse(cp,slot) | ||
| 256 | static inline void xfs_lic_relse(xfs_log_item_chunk_t *cp, int slot) | 248 | static inline void xfs_lic_relse(xfs_log_item_chunk_t *cp, int slot) |
| 257 | { | 249 | { |
| 258 | cp->lic_free |= 1 << slot; | 250 | cp->lic_free |= 1 << slot; |
| 259 | } | 251 | } |
| 260 | 252 | ||
| 261 | #define XFS_LIC_SLOT(cp,slot) xfs_lic_slot(cp,slot) | ||
| 262 | static inline xfs_log_item_desc_t * | 253 | static inline xfs_log_item_desc_t * |
| 263 | xfs_lic_slot(xfs_log_item_chunk_t *cp, int slot) | 254 | xfs_lic_slot(xfs_log_item_chunk_t *cp, int slot) |
| 264 | { | 255 | { |
| 265 | return &(cp->lic_descs[slot]); | 256 | return &(cp->lic_descs[slot]); |
| 266 | } | 257 | } |
| 267 | 258 | ||
| 268 | #define XFS_LIC_DESC_TO_SLOT(dp) xfs_lic_desc_to_slot(dp) | ||
| 269 | static inline int xfs_lic_desc_to_slot(xfs_log_item_desc_t *dp) | 259 | static inline int xfs_lic_desc_to_slot(xfs_log_item_desc_t *dp) |
| 270 | { | 260 | { |
| 271 | return (uint)dp->lid_index; | 261 | return (uint)dp->lid_index; |
| @@ -278,7 +268,6 @@ static inline int xfs_lic_desc_to_slot(xfs_log_item_desc_t *dp) | |||
| 278 | * All of this yields the address of the chunk, which is | 268 | * All of this yields the address of the chunk, which is |
| 279 | * cast to a chunk pointer. | 269 | * cast to a chunk pointer. |
| 280 | */ | 270 | */ |
| 281 | #define XFS_LIC_DESC_TO_CHUNK(dp) xfs_lic_desc_to_chunk(dp) | ||
| 282 | static inline xfs_log_item_chunk_t * | 271 | static inline xfs_log_item_chunk_t * |
| 283 | xfs_lic_desc_to_chunk(xfs_log_item_desc_t *dp) | 272 | xfs_lic_desc_to_chunk(xfs_log_item_desc_t *dp) |
| 284 | { | 273 | { |
| @@ -986,6 +975,7 @@ int _xfs_trans_commit(xfs_trans_t *, | |||
| 986 | int *); | 975 | int *); |
| 987 | #define xfs_trans_commit(tp, flags) _xfs_trans_commit(tp, flags, NULL) | 976 | #define xfs_trans_commit(tp, flags) _xfs_trans_commit(tp, flags, NULL) |
| 988 | void xfs_trans_cancel(xfs_trans_t *, int); | 977 | void xfs_trans_cancel(xfs_trans_t *, int); |
| 978 | int xfs_trans_roll(struct xfs_trans **, struct xfs_inode *); | ||
| 989 | int xfs_trans_ail_init(struct xfs_mount *); | 979 | int xfs_trans_ail_init(struct xfs_mount *); |
| 990 | void xfs_trans_ail_destroy(struct xfs_mount *); | 980 | void xfs_trans_ail_destroy(struct xfs_mount *); |
| 991 | void xfs_trans_push_ail(struct xfs_mount *, xfs_lsn_t); | 981 | void xfs_trans_push_ail(struct xfs_mount *, xfs_lsn_t); |
diff --git a/fs/xfs/xfs_trans_buf.c b/fs/xfs/xfs_trans_buf.c index cb0c5839154b..4e855b5ced66 100644 --- a/fs/xfs/xfs_trans_buf.c +++ b/fs/xfs/xfs_trans_buf.c | |||
| @@ -1021,16 +1021,16 @@ xfs_trans_buf_item_match( | |||
| 1021 | bp = NULL; | 1021 | bp = NULL; |
| 1022 | len = BBTOB(len); | 1022 | len = BBTOB(len); |
| 1023 | licp = &tp->t_items; | 1023 | licp = &tp->t_items; |
| 1024 | if (!XFS_LIC_ARE_ALL_FREE(licp)) { | 1024 | if (!xfs_lic_are_all_free(licp)) { |
| 1025 | for (i = 0; i < licp->lic_unused; i++) { | 1025 | for (i = 0; i < licp->lic_unused; i++) { |
| 1026 | /* | 1026 | /* |
| 1027 | * Skip unoccupied slots. | 1027 | * Skip unoccupied slots. |
| 1028 | */ | 1028 | */ |
| 1029 | if (XFS_LIC_ISFREE(licp, i)) { | 1029 | if (xfs_lic_isfree(licp, i)) { |
| 1030 | continue; | 1030 | continue; |
| 1031 | } | 1031 | } |
| 1032 | 1032 | ||
| 1033 | lidp = XFS_LIC_SLOT(licp, i); | 1033 | lidp = xfs_lic_slot(licp, i); |
| 1034 | blip = (xfs_buf_log_item_t *)lidp->lid_item; | 1034 | blip = (xfs_buf_log_item_t *)lidp->lid_item; |
| 1035 | if (blip->bli_item.li_type != XFS_LI_BUF) { | 1035 | if (blip->bli_item.li_type != XFS_LI_BUF) { |
| 1036 | continue; | 1036 | continue; |
| @@ -1074,7 +1074,7 @@ xfs_trans_buf_item_match_all( | |||
| 1074 | bp = NULL; | 1074 | bp = NULL; |
| 1075 | len = BBTOB(len); | 1075 | len = BBTOB(len); |
| 1076 | for (licp = &tp->t_items; licp != NULL; licp = licp->lic_next) { | 1076 | for (licp = &tp->t_items; licp != NULL; licp = licp->lic_next) { |
| 1077 | if (XFS_LIC_ARE_ALL_FREE(licp)) { | 1077 | if (xfs_lic_are_all_free(licp)) { |
| 1078 | ASSERT(licp == &tp->t_items); | 1078 | ASSERT(licp == &tp->t_items); |
| 1079 | ASSERT(licp->lic_next == NULL); | 1079 | ASSERT(licp->lic_next == NULL); |
| 1080 | return NULL; | 1080 | return NULL; |
| @@ -1083,11 +1083,11 @@ xfs_trans_buf_item_match_all( | |||
| 1083 | /* | 1083 | /* |
| 1084 | * Skip unoccupied slots. | 1084 | * Skip unoccupied slots. |
| 1085 | */ | 1085 | */ |
| 1086 | if (XFS_LIC_ISFREE(licp, i)) { | 1086 | if (xfs_lic_isfree(licp, i)) { |
| 1087 | continue; | 1087 | continue; |
| 1088 | } | 1088 | } |
| 1089 | 1089 | ||
| 1090 | lidp = XFS_LIC_SLOT(licp, i); | 1090 | lidp = xfs_lic_slot(licp, i); |
| 1091 | blip = (xfs_buf_log_item_t *)lidp->lid_item; | 1091 | blip = (xfs_buf_log_item_t *)lidp->lid_item; |
| 1092 | if (blip->bli_item.li_type != XFS_LI_BUF) { | 1092 | if (blip->bli_item.li_type != XFS_LI_BUF) { |
| 1093 | continue; | 1093 | continue; |
diff --git a/fs/xfs/xfs_trans_item.c b/fs/xfs/xfs_trans_item.c index db5c83595526..3c666e8317f8 100644 --- a/fs/xfs/xfs_trans_item.c +++ b/fs/xfs/xfs_trans_item.c | |||
| @@ -53,11 +53,11 @@ xfs_trans_add_item(xfs_trans_t *tp, xfs_log_item_t *lip) | |||
| 53 | * Initialize the chunk, and then | 53 | * Initialize the chunk, and then |
| 54 | * claim the first slot in the newly allocated chunk. | 54 | * claim the first slot in the newly allocated chunk. |
| 55 | */ | 55 | */ |
| 56 | XFS_LIC_INIT(licp); | 56 | xfs_lic_init(licp); |
| 57 | XFS_LIC_CLAIM(licp, 0); | 57 | xfs_lic_claim(licp, 0); |
| 58 | licp->lic_unused = 1; | 58 | licp->lic_unused = 1; |
| 59 | XFS_LIC_INIT_SLOT(licp, 0); | 59 | xfs_lic_init_slot(licp, 0); |
| 60 | lidp = XFS_LIC_SLOT(licp, 0); | 60 | lidp = xfs_lic_slot(licp, 0); |
| 61 | 61 | ||
| 62 | /* | 62 | /* |
| 63 | * Link in the new chunk and update the free count. | 63 | * Link in the new chunk and update the free count. |
| @@ -88,14 +88,14 @@ xfs_trans_add_item(xfs_trans_t *tp, xfs_log_item_t *lip) | |||
| 88 | */ | 88 | */ |
| 89 | licp = &tp->t_items; | 89 | licp = &tp->t_items; |
| 90 | while (licp != NULL) { | 90 | while (licp != NULL) { |
| 91 | if (XFS_LIC_VACANCY(licp)) { | 91 | if (xfs_lic_vacancy(licp)) { |
| 92 | if (licp->lic_unused <= XFS_LIC_MAX_SLOT) { | 92 | if (licp->lic_unused <= XFS_LIC_MAX_SLOT) { |
| 93 | i = licp->lic_unused; | 93 | i = licp->lic_unused; |
| 94 | ASSERT(XFS_LIC_ISFREE(licp, i)); | 94 | ASSERT(xfs_lic_isfree(licp, i)); |
| 95 | break; | 95 | break; |
| 96 | } | 96 | } |
| 97 | for (i = 0; i <= XFS_LIC_MAX_SLOT; i++) { | 97 | for (i = 0; i <= XFS_LIC_MAX_SLOT; i++) { |
| 98 | if (XFS_LIC_ISFREE(licp, i)) | 98 | if (xfs_lic_isfree(licp, i)) |
| 99 | break; | 99 | break; |
| 100 | } | 100 | } |
| 101 | ASSERT(i <= XFS_LIC_MAX_SLOT); | 101 | ASSERT(i <= XFS_LIC_MAX_SLOT); |
| @@ -108,12 +108,12 @@ xfs_trans_add_item(xfs_trans_t *tp, xfs_log_item_t *lip) | |||
| 108 | * If we find a free descriptor, claim it, | 108 | * If we find a free descriptor, claim it, |
| 109 | * initialize it, and return it. | 109 | * initialize it, and return it. |
| 110 | */ | 110 | */ |
| 111 | XFS_LIC_CLAIM(licp, i); | 111 | xfs_lic_claim(licp, i); |
| 112 | if (licp->lic_unused <= i) { | 112 | if (licp->lic_unused <= i) { |
| 113 | licp->lic_unused = i + 1; | 113 | licp->lic_unused = i + 1; |
| 114 | XFS_LIC_INIT_SLOT(licp, i); | 114 | xfs_lic_init_slot(licp, i); |
| 115 | } | 115 | } |
| 116 | lidp = XFS_LIC_SLOT(licp, i); | 116 | lidp = xfs_lic_slot(licp, i); |
| 117 | tp->t_items_free--; | 117 | tp->t_items_free--; |
| 118 | lidp->lid_item = lip; | 118 | lidp->lid_item = lip; |
| 119 | lidp->lid_flags = 0; | 119 | lidp->lid_flags = 0; |
| @@ -136,9 +136,9 @@ xfs_trans_free_item(xfs_trans_t *tp, xfs_log_item_desc_t *lidp) | |||
| 136 | xfs_log_item_chunk_t *licp; | 136 | xfs_log_item_chunk_t *licp; |
| 137 | xfs_log_item_chunk_t **licpp; | 137 | xfs_log_item_chunk_t **licpp; |
| 138 | 138 | ||
| 139 | slot = XFS_LIC_DESC_TO_SLOT(lidp); | 139 | slot = xfs_lic_desc_to_slot(lidp); |
| 140 | licp = XFS_LIC_DESC_TO_CHUNK(lidp); | 140 | licp = xfs_lic_desc_to_chunk(lidp); |
| 141 | XFS_LIC_RELSE(licp, slot); | 141 | xfs_lic_relse(licp, slot); |
| 142 | lidp->lid_item->li_desc = NULL; | 142 | lidp->lid_item->li_desc = NULL; |
| 143 | tp->t_items_free++; | 143 | tp->t_items_free++; |
| 144 | 144 | ||
| @@ -154,7 +154,7 @@ xfs_trans_free_item(xfs_trans_t *tp, xfs_log_item_desc_t *lidp) | |||
| 154 | * Also decrement the transaction structure's count of free items | 154 | * Also decrement the transaction structure's count of free items |
| 155 | * by the number in a chunk since we are freeing an empty chunk. | 155 | * by the number in a chunk since we are freeing an empty chunk. |
| 156 | */ | 156 | */ |
| 157 | if (XFS_LIC_ARE_ALL_FREE(licp) && (licp != &(tp->t_items))) { | 157 | if (xfs_lic_are_all_free(licp) && (licp != &(tp->t_items))) { |
| 158 | licpp = &(tp->t_items.lic_next); | 158 | licpp = &(tp->t_items.lic_next); |
| 159 | while (*licpp != licp) { | 159 | while (*licpp != licp) { |
| 160 | ASSERT(*licpp != NULL); | 160 | ASSERT(*licpp != NULL); |
| @@ -207,20 +207,20 @@ xfs_trans_first_item(xfs_trans_t *tp) | |||
| 207 | /* | 207 | /* |
| 208 | * If it's not in the first chunk, skip to the second. | 208 | * If it's not in the first chunk, skip to the second. |
| 209 | */ | 209 | */ |
| 210 | if (XFS_LIC_ARE_ALL_FREE(licp)) { | 210 | if (xfs_lic_are_all_free(licp)) { |
| 211 | licp = licp->lic_next; | 211 | licp = licp->lic_next; |
| 212 | } | 212 | } |
| 213 | 213 | ||
| 214 | /* | 214 | /* |
| 215 | * Return the first non-free descriptor in the chunk. | 215 | * Return the first non-free descriptor in the chunk. |
| 216 | */ | 216 | */ |
| 217 | ASSERT(!XFS_LIC_ARE_ALL_FREE(licp)); | 217 | ASSERT(!xfs_lic_are_all_free(licp)); |
| 218 | for (i = 0; i < licp->lic_unused; i++) { | 218 | for (i = 0; i < licp->lic_unused; i++) { |
| 219 | if (XFS_LIC_ISFREE(licp, i)) { | 219 | if (xfs_lic_isfree(licp, i)) { |
| 220 | continue; | 220 | continue; |
| 221 | } | 221 | } |
| 222 | 222 | ||
| 223 | return XFS_LIC_SLOT(licp, i); | 223 | return xfs_lic_slot(licp, i); |
| 224 | } | 224 | } |
| 225 | cmn_err(CE_WARN, "xfs_trans_first_item() -- no first item"); | 225 | cmn_err(CE_WARN, "xfs_trans_first_item() -- no first item"); |
| 226 | return NULL; | 226 | return NULL; |
| @@ -242,18 +242,18 @@ xfs_trans_next_item(xfs_trans_t *tp, xfs_log_item_desc_t *lidp) | |||
| 242 | xfs_log_item_chunk_t *licp; | 242 | xfs_log_item_chunk_t *licp; |
| 243 | int i; | 243 | int i; |
| 244 | 244 | ||
| 245 | licp = XFS_LIC_DESC_TO_CHUNK(lidp); | 245 | licp = xfs_lic_desc_to_chunk(lidp); |
| 246 | 246 | ||
| 247 | /* | 247 | /* |
| 248 | * First search the rest of the chunk. The for loop keeps us | 248 | * First search the rest of the chunk. The for loop keeps us |
| 249 | * from referencing things beyond the end of the chunk. | 249 | * from referencing things beyond the end of the chunk. |
| 250 | */ | 250 | */ |
| 251 | for (i = (int)XFS_LIC_DESC_TO_SLOT(lidp) + 1; i < licp->lic_unused; i++) { | 251 | for (i = (int)xfs_lic_desc_to_slot(lidp) + 1; i < licp->lic_unused; i++) { |
| 252 | if (XFS_LIC_ISFREE(licp, i)) { | 252 | if (xfs_lic_isfree(licp, i)) { |
| 253 | continue; | 253 | continue; |
| 254 | } | 254 | } |
| 255 | 255 | ||
| 256 | return XFS_LIC_SLOT(licp, i); | 256 | return xfs_lic_slot(licp, i); |
| 257 | } | 257 | } |
| 258 | 258 | ||
| 259 | /* | 259 | /* |
| @@ -266,13 +266,13 @@ xfs_trans_next_item(xfs_trans_t *tp, xfs_log_item_desc_t *lidp) | |||
| 266 | } | 266 | } |
| 267 | 267 | ||
| 268 | licp = licp->lic_next; | 268 | licp = licp->lic_next; |
| 269 | ASSERT(!XFS_LIC_ARE_ALL_FREE(licp)); | 269 | ASSERT(!xfs_lic_are_all_free(licp)); |
| 270 | for (i = 0; i < licp->lic_unused; i++) { | 270 | for (i = 0; i < licp->lic_unused; i++) { |
| 271 | if (XFS_LIC_ISFREE(licp, i)) { | 271 | if (xfs_lic_isfree(licp, i)) { |
| 272 | continue; | 272 | continue; |
| 273 | } | 273 | } |
| 274 | 274 | ||
| 275 | return XFS_LIC_SLOT(licp, i); | 275 | return xfs_lic_slot(licp, i); |
| 276 | } | 276 | } |
| 277 | ASSERT(0); | 277 | ASSERT(0); |
| 278 | /* NOTREACHED */ | 278 | /* NOTREACHED */ |
| @@ -300,9 +300,9 @@ xfs_trans_free_items( | |||
| 300 | /* | 300 | /* |
| 301 | * Special case the embedded chunk so we don't free it below. | 301 | * Special case the embedded chunk so we don't free it below. |
| 302 | */ | 302 | */ |
| 303 | if (!XFS_LIC_ARE_ALL_FREE(licp)) { | 303 | if (!xfs_lic_are_all_free(licp)) { |
| 304 | (void) xfs_trans_unlock_chunk(licp, 1, abort, NULLCOMMITLSN); | 304 | (void) xfs_trans_unlock_chunk(licp, 1, abort, NULLCOMMITLSN); |
| 305 | XFS_LIC_ALL_FREE(licp); | 305 | xfs_lic_all_free(licp); |
| 306 | licp->lic_unused = 0; | 306 | licp->lic_unused = 0; |
| 307 | } | 307 | } |
| 308 | licp = licp->lic_next; | 308 | licp = licp->lic_next; |
| @@ -311,7 +311,7 @@ xfs_trans_free_items( | |||
| 311 | * Unlock each item in each chunk and free the chunks. | 311 | * Unlock each item in each chunk and free the chunks. |
| 312 | */ | 312 | */ |
| 313 | while (licp != NULL) { | 313 | while (licp != NULL) { |
| 314 | ASSERT(!XFS_LIC_ARE_ALL_FREE(licp)); | 314 | ASSERT(!xfs_lic_are_all_free(licp)); |
| 315 | (void) xfs_trans_unlock_chunk(licp, 1, abort, NULLCOMMITLSN); | 315 | (void) xfs_trans_unlock_chunk(licp, 1, abort, NULLCOMMITLSN); |
| 316 | next_licp = licp->lic_next; | 316 | next_licp = licp->lic_next; |
| 317 | kmem_free(licp); | 317 | kmem_free(licp); |
| @@ -347,7 +347,7 @@ xfs_trans_unlock_items(xfs_trans_t *tp, xfs_lsn_t commit_lsn) | |||
| 347 | /* | 347 | /* |
| 348 | * Special case the embedded chunk so we don't free. | 348 | * Special case the embedded chunk so we don't free. |
| 349 | */ | 349 | */ |
| 350 | if (!XFS_LIC_ARE_ALL_FREE(licp)) { | 350 | if (!xfs_lic_are_all_free(licp)) { |
| 351 | freed = xfs_trans_unlock_chunk(licp, 0, 0, commit_lsn); | 351 | freed = xfs_trans_unlock_chunk(licp, 0, 0, commit_lsn); |
| 352 | } | 352 | } |
| 353 | licpp = &(tp->t_items.lic_next); | 353 | licpp = &(tp->t_items.lic_next); |
| @@ -358,10 +358,10 @@ xfs_trans_unlock_items(xfs_trans_t *tp, xfs_lsn_t commit_lsn) | |||
| 358 | * and free empty chunks. | 358 | * and free empty chunks. |
| 359 | */ | 359 | */ |
| 360 | while (licp != NULL) { | 360 | while (licp != NULL) { |
| 361 | ASSERT(!XFS_LIC_ARE_ALL_FREE(licp)); | 361 | ASSERT(!xfs_lic_are_all_free(licp)); |
| 362 | freed += xfs_trans_unlock_chunk(licp, 0, 0, commit_lsn); | 362 | freed += xfs_trans_unlock_chunk(licp, 0, 0, commit_lsn); |
| 363 | next_licp = licp->lic_next; | 363 | next_licp = licp->lic_next; |
| 364 | if (XFS_LIC_ARE_ALL_FREE(licp)) { | 364 | if (xfs_lic_are_all_free(licp)) { |
| 365 | *licpp = next_licp; | 365 | *licpp = next_licp; |
| 366 | kmem_free(licp); | 366 | kmem_free(licp); |
| 367 | freed -= XFS_LIC_NUM_SLOTS; | 367 | freed -= XFS_LIC_NUM_SLOTS; |
| @@ -402,7 +402,7 @@ xfs_trans_unlock_chunk( | |||
| 402 | freed = 0; | 402 | freed = 0; |
| 403 | lidp = licp->lic_descs; | 403 | lidp = licp->lic_descs; |
| 404 | for (i = 0; i < licp->lic_unused; i++, lidp++) { | 404 | for (i = 0; i < licp->lic_unused; i++, lidp++) { |
| 405 | if (XFS_LIC_ISFREE(licp, i)) { | 405 | if (xfs_lic_isfree(licp, i)) { |
| 406 | continue; | 406 | continue; |
| 407 | } | 407 | } |
| 408 | lip = lidp->lid_item; | 408 | lip = lidp->lid_item; |
| @@ -421,7 +421,7 @@ xfs_trans_unlock_chunk( | |||
| 421 | */ | 421 | */ |
| 422 | if (!(freeing_chunk) && | 422 | if (!(freeing_chunk) && |
| 423 | (!(lidp->lid_flags & XFS_LID_DIRTY) || abort)) { | 423 | (!(lidp->lid_flags & XFS_LID_DIRTY) || abort)) { |
| 424 | XFS_LIC_RELSE(licp, i); | 424 | xfs_lic_relse(licp, i); |
| 425 | freed++; | 425 | freed++; |
| 426 | } | 426 | } |
| 427 | } | 427 | } |
diff --git a/fs/xfs/xfs_utils.c b/fs/xfs/xfs_utils.c index 98e5f110ba5f..35d4d414bcc2 100644 --- a/fs/xfs/xfs_utils.c +++ b/fs/xfs/xfs_utils.c | |||
| @@ -237,7 +237,7 @@ xfs_droplink( | |||
| 237 | 237 | ||
| 238 | ASSERT (ip->i_d.di_nlink > 0); | 238 | ASSERT (ip->i_d.di_nlink > 0); |
| 239 | ip->i_d.di_nlink--; | 239 | ip->i_d.di_nlink--; |
| 240 | drop_nlink(ip->i_vnode); | 240 | drop_nlink(VFS_I(ip)); |
| 241 | xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE); | 241 | xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE); |
| 242 | 242 | ||
| 243 | error = 0; | 243 | error = 0; |
| @@ -301,7 +301,7 @@ xfs_bumplink( | |||
| 301 | 301 | ||
| 302 | ASSERT(ip->i_d.di_nlink > 0); | 302 | ASSERT(ip->i_d.di_nlink > 0); |
| 303 | ip->i_d.di_nlink++; | 303 | ip->i_d.di_nlink++; |
| 304 | inc_nlink(ip->i_vnode); | 304 | inc_nlink(VFS_I(ip)); |
| 305 | if ((ip->i_d.di_version == XFS_DINODE_VERSION_1) && | 305 | if ((ip->i_d.di_version == XFS_DINODE_VERSION_1) && |
| 306 | (ip->i_d.di_nlink > XFS_MAXLINK_1)) { | 306 | (ip->i_d.di_nlink > XFS_MAXLINK_1)) { |
| 307 | /* | 307 | /* |
diff --git a/fs/xfs/xfs_utils.h b/fs/xfs/xfs_utils.h index f316cb85d8e2..ef321225d269 100644 --- a/fs/xfs/xfs_utils.h +++ b/fs/xfs/xfs_utils.h | |||
| @@ -18,9 +18,6 @@ | |||
| 18 | #ifndef __XFS_UTILS_H__ | 18 | #ifndef __XFS_UTILS_H__ |
| 19 | #define __XFS_UTILS_H__ | 19 | #define __XFS_UTILS_H__ |
| 20 | 20 | ||
| 21 | #define IRELE(ip) VN_RELE(XFS_ITOV(ip)) | ||
| 22 | #define IHOLD(ip) VN_HOLD(XFS_ITOV(ip)) | ||
| 23 | |||
| 24 | extern int xfs_truncate_file(xfs_mount_t *, xfs_inode_t *); | 21 | extern int xfs_truncate_file(xfs_mount_t *, xfs_inode_t *); |
| 25 | extern int xfs_dir_ialloc(xfs_trans_t **, xfs_inode_t *, mode_t, xfs_nlink_t, | 22 | extern int xfs_dir_ialloc(xfs_trans_t **, xfs_inode_t *, mode_t, xfs_nlink_t, |
| 26 | xfs_dev_t, cred_t *, prid_t, int, | 23 | xfs_dev_t, cred_t *, prid_t, int, |
diff --git a/fs/xfs/xfs_vfsops.c b/fs/xfs/xfs_vfsops.c index 4a9a43315a86..439dd3939dda 100644 --- a/fs/xfs/xfs_vfsops.c +++ b/fs/xfs/xfs_vfsops.c | |||
| @@ -128,7 +128,6 @@ xfs_unmount_flush( | |||
| 128 | xfs_inode_t *rip = mp->m_rootip; | 128 | xfs_inode_t *rip = mp->m_rootip; |
| 129 | xfs_inode_t *rbmip; | 129 | xfs_inode_t *rbmip; |
| 130 | xfs_inode_t *rsumip = NULL; | 130 | xfs_inode_t *rsumip = NULL; |
| 131 | bhv_vnode_t *rvp = XFS_ITOV(rip); | ||
| 132 | int error; | 131 | int error; |
| 133 | 132 | ||
| 134 | xfs_ilock(rip, XFS_ILOCK_EXCL | XFS_ILOCK_PARENT); | 133 | xfs_ilock(rip, XFS_ILOCK_EXCL | XFS_ILOCK_PARENT); |
| @@ -146,7 +145,7 @@ xfs_unmount_flush( | |||
| 146 | if (error == EFSCORRUPTED) | 145 | if (error == EFSCORRUPTED) |
| 147 | goto fscorrupt_out; | 146 | goto fscorrupt_out; |
| 148 | 147 | ||
| 149 | ASSERT(vn_count(XFS_ITOV(rbmip)) == 1); | 148 | ASSERT(vn_count(VFS_I(rbmip)) == 1); |
| 150 | 149 | ||
| 151 | rsumip = mp->m_rsumip; | 150 | rsumip = mp->m_rsumip; |
| 152 | xfs_ilock(rsumip, XFS_ILOCK_EXCL); | 151 | xfs_ilock(rsumip, XFS_ILOCK_EXCL); |
| @@ -157,7 +156,7 @@ xfs_unmount_flush( | |||
| 157 | if (error == EFSCORRUPTED) | 156 | if (error == EFSCORRUPTED) |
| 158 | goto fscorrupt_out; | 157 | goto fscorrupt_out; |
| 159 | 158 | ||
| 160 | ASSERT(vn_count(XFS_ITOV(rsumip)) == 1); | 159 | ASSERT(vn_count(VFS_I(rsumip)) == 1); |
| 161 | } | 160 | } |
| 162 | 161 | ||
| 163 | /* | 162 | /* |
| @@ -167,7 +166,7 @@ xfs_unmount_flush( | |||
| 167 | if (error == EFSCORRUPTED) | 166 | if (error == EFSCORRUPTED) |
| 168 | goto fscorrupt_out2; | 167 | goto fscorrupt_out2; |
| 169 | 168 | ||
| 170 | if (vn_count(rvp) != 1 && !relocation) { | 169 | if (vn_count(VFS_I(rip)) != 1 && !relocation) { |
| 171 | xfs_iunlock(rip, XFS_ILOCK_EXCL); | 170 | xfs_iunlock(rip, XFS_ILOCK_EXCL); |
| 172 | return XFS_ERROR(EBUSY); | 171 | return XFS_ERROR(EBUSY); |
| 173 | } | 172 | } |
| @@ -284,7 +283,7 @@ xfs_sync_inodes( | |||
| 284 | int *bypassed) | 283 | int *bypassed) |
| 285 | { | 284 | { |
| 286 | xfs_inode_t *ip = NULL; | 285 | xfs_inode_t *ip = NULL; |
| 287 | bhv_vnode_t *vp = NULL; | 286 | struct inode *vp = NULL; |
| 288 | int error; | 287 | int error; |
| 289 | int last_error; | 288 | int last_error; |
| 290 | uint64_t fflag; | 289 | uint64_t fflag; |
| @@ -404,7 +403,7 @@ xfs_sync_inodes( | |||
| 404 | continue; | 403 | continue; |
| 405 | } | 404 | } |
| 406 | 405 | ||
| 407 | vp = XFS_ITOV_NULL(ip); | 406 | vp = VFS_I(ip); |
| 408 | 407 | ||
| 409 | /* | 408 | /* |
| 410 | * If the vnode is gone then this is being torn down, | 409 | * If the vnode is gone then this is being torn down, |
| @@ -479,7 +478,7 @@ xfs_sync_inodes( | |||
| 479 | IPOINTER_INSERT(ip, mp); | 478 | IPOINTER_INSERT(ip, mp); |
| 480 | xfs_ilock(ip, lock_flags); | 479 | xfs_ilock(ip, lock_flags); |
| 481 | 480 | ||
| 482 | ASSERT(vp == XFS_ITOV(ip)); | 481 | ASSERT(vp == VFS_I(ip)); |
| 483 | ASSERT(ip->i_mount == mp); | 482 | ASSERT(ip->i_mount == mp); |
| 484 | 483 | ||
| 485 | vnode_refed = B_TRUE; | 484 | vnode_refed = B_TRUE; |
diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c index 76a1166af822..aa238c8fbd7a 100644 --- a/fs/xfs/xfs_vnodeops.c +++ b/fs/xfs/xfs_vnodeops.c | |||
| @@ -83,7 +83,7 @@ xfs_setattr( | |||
| 83 | cred_t *credp) | 83 | cred_t *credp) |
| 84 | { | 84 | { |
| 85 | xfs_mount_t *mp = ip->i_mount; | 85 | xfs_mount_t *mp = ip->i_mount; |
| 86 | struct inode *inode = XFS_ITOV(ip); | 86 | struct inode *inode = VFS_I(ip); |
| 87 | int mask = iattr->ia_valid; | 87 | int mask = iattr->ia_valid; |
| 88 | xfs_trans_t *tp; | 88 | xfs_trans_t *tp; |
| 89 | int code; | 89 | int code; |
| @@ -182,7 +182,7 @@ xfs_setattr( | |||
| 182 | xfs_ilock(ip, lock_flags); | 182 | xfs_ilock(ip, lock_flags); |
| 183 | 183 | ||
| 184 | /* boolean: are we the file owner? */ | 184 | /* boolean: are we the file owner? */ |
| 185 | file_owner = (current_fsuid(credp) == ip->i_d.di_uid); | 185 | file_owner = (current_fsuid() == ip->i_d.di_uid); |
| 186 | 186 | ||
| 187 | /* | 187 | /* |
| 188 | * Change various properties of a file. | 188 | * Change various properties of a file. |
| @@ -513,7 +513,6 @@ xfs_setattr( | |||
| 513 | ip->i_d.di_atime.t_sec = iattr->ia_atime.tv_sec; | 513 | ip->i_d.di_atime.t_sec = iattr->ia_atime.tv_sec; |
| 514 | ip->i_d.di_atime.t_nsec = iattr->ia_atime.tv_nsec; | 514 | ip->i_d.di_atime.t_nsec = iattr->ia_atime.tv_nsec; |
| 515 | ip->i_update_core = 1; | 515 | ip->i_update_core = 1; |
| 516 | timeflags &= ~XFS_ICHGTIME_ACC; | ||
| 517 | } | 516 | } |
| 518 | if (mask & ATTR_MTIME) { | 517 | if (mask & ATTR_MTIME) { |
| 519 | inode->i_mtime = iattr->ia_mtime; | 518 | inode->i_mtime = iattr->ia_mtime; |
| @@ -714,7 +713,7 @@ xfs_fsync( | |||
| 714 | return XFS_ERROR(EIO); | 713 | return XFS_ERROR(EIO); |
| 715 | 714 | ||
| 716 | /* capture size updates in I/O completion before writing the inode. */ | 715 | /* capture size updates in I/O completion before writing the inode. */ |
| 717 | error = filemap_fdatawait(vn_to_inode(XFS_ITOV(ip))->i_mapping); | 716 | error = filemap_fdatawait(VFS_I(ip)->i_mapping); |
| 718 | if (error) | 717 | if (error) |
| 719 | return XFS_ERROR(error); | 718 | return XFS_ERROR(error); |
| 720 | 719 | ||
| @@ -1160,7 +1159,6 @@ int | |||
| 1160 | xfs_release( | 1159 | xfs_release( |
| 1161 | xfs_inode_t *ip) | 1160 | xfs_inode_t *ip) |
| 1162 | { | 1161 | { |
| 1163 | bhv_vnode_t *vp = XFS_ITOV(ip); | ||
| 1164 | xfs_mount_t *mp = ip->i_mount; | 1162 | xfs_mount_t *mp = ip->i_mount; |
| 1165 | int error; | 1163 | int error; |
| 1166 | 1164 | ||
| @@ -1195,13 +1193,13 @@ xfs_release( | |||
| 1195 | * be exposed to that problem. | 1193 | * be exposed to that problem. |
| 1196 | */ | 1194 | */ |
| 1197 | truncated = xfs_iflags_test_and_clear(ip, XFS_ITRUNCATED); | 1195 | truncated = xfs_iflags_test_and_clear(ip, XFS_ITRUNCATED); |
| 1198 | if (truncated && VN_DIRTY(vp) && ip->i_delayed_blks > 0) | 1196 | if (truncated && VN_DIRTY(VFS_I(ip)) && ip->i_delayed_blks > 0) |
| 1199 | xfs_flush_pages(ip, 0, -1, XFS_B_ASYNC, FI_NONE); | 1197 | xfs_flush_pages(ip, 0, -1, XFS_B_ASYNC, FI_NONE); |
| 1200 | } | 1198 | } |
| 1201 | 1199 | ||
| 1202 | if (ip->i_d.di_nlink != 0) { | 1200 | if (ip->i_d.di_nlink != 0) { |
| 1203 | if ((((ip->i_d.di_mode & S_IFMT) == S_IFREG) && | 1201 | if ((((ip->i_d.di_mode & S_IFMT) == S_IFREG) && |
| 1204 | ((ip->i_size > 0) || (VN_CACHED(vp) > 0 || | 1202 | ((ip->i_size > 0) || (VN_CACHED(VFS_I(ip)) > 0 || |
| 1205 | ip->i_delayed_blks > 0)) && | 1203 | ip->i_delayed_blks > 0)) && |
| 1206 | (ip->i_df.if_flags & XFS_IFEXTENTS)) && | 1204 | (ip->i_df.if_flags & XFS_IFEXTENTS)) && |
| 1207 | (!(ip->i_d.di_flags & | 1205 | (!(ip->i_d.di_flags & |
| @@ -1227,7 +1225,6 @@ int | |||
| 1227 | xfs_inactive( | 1225 | xfs_inactive( |
| 1228 | xfs_inode_t *ip) | 1226 | xfs_inode_t *ip) |
| 1229 | { | 1227 | { |
| 1230 | bhv_vnode_t *vp = XFS_ITOV(ip); | ||
| 1231 | xfs_bmap_free_t free_list; | 1228 | xfs_bmap_free_t free_list; |
| 1232 | xfs_fsblock_t first_block; | 1229 | xfs_fsblock_t first_block; |
| 1233 | int committed; | 1230 | int committed; |
| @@ -1242,7 +1239,7 @@ xfs_inactive( | |||
| 1242 | * If the inode is already free, then there can be nothing | 1239 | * If the inode is already free, then there can be nothing |
| 1243 | * to clean up here. | 1240 | * to clean up here. |
| 1244 | */ | 1241 | */ |
| 1245 | if (ip->i_d.di_mode == 0 || VN_BAD(vp)) { | 1242 | if (ip->i_d.di_mode == 0 || VN_BAD(VFS_I(ip))) { |
| 1246 | ASSERT(ip->i_df.if_real_bytes == 0); | 1243 | ASSERT(ip->i_df.if_real_bytes == 0); |
| 1247 | ASSERT(ip->i_df.if_broot_bytes == 0); | 1244 | ASSERT(ip->i_df.if_broot_bytes == 0); |
| 1248 | return VN_INACTIVE_CACHE; | 1245 | return VN_INACTIVE_CACHE; |
| @@ -1272,7 +1269,7 @@ xfs_inactive( | |||
| 1272 | 1269 | ||
| 1273 | if (ip->i_d.di_nlink != 0) { | 1270 | if (ip->i_d.di_nlink != 0) { |
| 1274 | if ((((ip->i_d.di_mode & S_IFMT) == S_IFREG) && | 1271 | if ((((ip->i_d.di_mode & S_IFMT) == S_IFREG) && |
| 1275 | ((ip->i_size > 0) || (VN_CACHED(vp) > 0 || | 1272 | ((ip->i_size > 0) || (VN_CACHED(VFS_I(ip)) > 0 || |
| 1276 | ip->i_delayed_blks > 0)) && | 1273 | ip->i_delayed_blks > 0)) && |
| 1277 | (ip->i_df.if_flags & XFS_IFEXTENTS) && | 1274 | (ip->i_df.if_flags & XFS_IFEXTENTS) && |
| 1278 | (!(ip->i_d.di_flags & | 1275 | (!(ip->i_d.di_flags & |
| @@ -1536,7 +1533,7 @@ xfs_create( | |||
| 1536 | * Make sure that we have allocated dquot(s) on disk. | 1533 | * Make sure that we have allocated dquot(s) on disk. |
| 1537 | */ | 1534 | */ |
| 1538 | error = XFS_QM_DQVOPALLOC(mp, dp, | 1535 | error = XFS_QM_DQVOPALLOC(mp, dp, |
| 1539 | current_fsuid(credp), current_fsgid(credp), prid, | 1536 | current_fsuid(), current_fsgid(), prid, |
| 1540 | XFS_QMOPT_QUOTALL|XFS_QMOPT_INHERIT, &udqp, &gdqp); | 1537 | XFS_QMOPT_QUOTALL|XFS_QMOPT_INHERIT, &udqp, &gdqp); |
| 1541 | if (error) | 1538 | if (error) |
| 1542 | goto std_return; | 1539 | goto std_return; |
| @@ -1708,111 +1705,6 @@ std_return: | |||
| 1708 | } | 1705 | } |
| 1709 | 1706 | ||
| 1710 | #ifdef DEBUG | 1707 | #ifdef DEBUG |
| 1711 | /* | ||
| 1712 | * Some counters to see if (and how often) we are hitting some deadlock | ||
| 1713 | * prevention code paths. | ||
| 1714 | */ | ||
| 1715 | |||
| 1716 | int xfs_rm_locks; | ||
| 1717 | int xfs_rm_lock_delays; | ||
| 1718 | int xfs_rm_attempts; | ||
| 1719 | #endif | ||
| 1720 | |||
| 1721 | /* | ||
| 1722 | * The following routine will lock the inodes associated with the | ||
| 1723 | * directory and the named entry in the directory. The locks are | ||
| 1724 | * acquired in increasing inode number. | ||
| 1725 | * | ||
| 1726 | * If the entry is "..", then only the directory is locked. The | ||
| 1727 | * vnode ref count will still include that from the .. entry in | ||
| 1728 | * this case. | ||
| 1729 | * | ||
| 1730 | * There is a deadlock we need to worry about. If the locked directory is | ||
| 1731 | * in the AIL, it might be blocking up the log. The next inode we lock | ||
| 1732 | * could be already locked by another thread waiting for log space (e.g | ||
| 1733 | * a permanent log reservation with a long running transaction (see | ||
| 1734 | * xfs_itruncate_finish)). To solve this, we must check if the directory | ||
| 1735 | * is in the ail and use lock_nowait. If we can't lock, we need to | ||
| 1736 | * drop the inode lock on the directory and try again. xfs_iunlock will | ||
| 1737 | * potentially push the tail if we were holding up the log. | ||
| 1738 | */ | ||
| 1739 | STATIC int | ||
| 1740 | xfs_lock_dir_and_entry( | ||
| 1741 | xfs_inode_t *dp, | ||
| 1742 | xfs_inode_t *ip) /* inode of entry 'name' */ | ||
| 1743 | { | ||
| 1744 | int attempts; | ||
| 1745 | xfs_ino_t e_inum; | ||
| 1746 | xfs_inode_t *ips[2]; | ||
| 1747 | xfs_log_item_t *lp; | ||
| 1748 | |||
| 1749 | #ifdef DEBUG | ||
| 1750 | xfs_rm_locks++; | ||
| 1751 | #endif | ||
| 1752 | attempts = 0; | ||
| 1753 | |||
| 1754 | again: | ||
| 1755 | xfs_ilock(dp, XFS_ILOCK_EXCL | XFS_ILOCK_PARENT); | ||
| 1756 | |||
| 1757 | e_inum = ip->i_ino; | ||
| 1758 | |||
| 1759 | xfs_itrace_ref(ip); | ||
| 1760 | |||
| 1761 | /* | ||
| 1762 | * We want to lock in increasing inum. Since we've already | ||
| 1763 | * acquired the lock on the directory, we may need to release | ||
| 1764 | * if if the inum of the entry turns out to be less. | ||
| 1765 | */ | ||
| 1766 | if (e_inum > dp->i_ino) { | ||
| 1767 | /* | ||
| 1768 | * We are already in the right order, so just | ||
| 1769 | * lock on the inode of the entry. | ||
| 1770 | * We need to use nowait if dp is in the AIL. | ||
| 1771 | */ | ||
| 1772 | |||
| 1773 | lp = (xfs_log_item_t *)dp->i_itemp; | ||
| 1774 | if (lp && (lp->li_flags & XFS_LI_IN_AIL)) { | ||
| 1775 | if (!xfs_ilock_nowait(ip, XFS_ILOCK_EXCL)) { | ||
| 1776 | attempts++; | ||
| 1777 | #ifdef DEBUG | ||
| 1778 | xfs_rm_attempts++; | ||
| 1779 | #endif | ||
| 1780 | |||
| 1781 | /* | ||
| 1782 | * Unlock dp and try again. | ||
| 1783 | * xfs_iunlock will try to push the tail | ||
| 1784 | * if the inode is in the AIL. | ||
| 1785 | */ | ||
| 1786 | |||
| 1787 | xfs_iunlock(dp, XFS_ILOCK_EXCL); | ||
| 1788 | |||
| 1789 | if ((attempts % 5) == 0) { | ||
| 1790 | delay(1); /* Don't just spin the CPU */ | ||
| 1791 | #ifdef DEBUG | ||
| 1792 | xfs_rm_lock_delays++; | ||
| 1793 | #endif | ||
| 1794 | } | ||
| 1795 | goto again; | ||
| 1796 | } | ||
| 1797 | } else { | ||
| 1798 | xfs_ilock(ip, XFS_ILOCK_EXCL); | ||
| 1799 | } | ||
| 1800 | } else if (e_inum < dp->i_ino) { | ||
| 1801 | xfs_iunlock(dp, XFS_ILOCK_EXCL); | ||
| 1802 | |||
| 1803 | ips[0] = ip; | ||
| 1804 | ips[1] = dp; | ||
| 1805 | xfs_lock_inodes(ips, 2, XFS_ILOCK_EXCL); | ||
| 1806 | } | ||
| 1807 | /* else e_inum == dp->i_ino */ | ||
| 1808 | /* This can happen if we're asked to lock /x/.. | ||
| 1809 | * the entry is "..", which is also the parent directory. | ||
| 1810 | */ | ||
| 1811 | |||
| 1812 | return 0; | ||
| 1813 | } | ||
| 1814 | |||
| 1815 | #ifdef DEBUG | ||
| 1816 | int xfs_locked_n; | 1708 | int xfs_locked_n; |
| 1817 | int xfs_small_retries; | 1709 | int xfs_small_retries; |
| 1818 | int xfs_middle_retries; | 1710 | int xfs_middle_retries; |
| @@ -1946,6 +1838,45 @@ again: | |||
| 1946 | #endif | 1838 | #endif |
| 1947 | } | 1839 | } |
| 1948 | 1840 | ||
| 1841 | void | ||
| 1842 | xfs_lock_two_inodes( | ||
| 1843 | xfs_inode_t *ip0, | ||
| 1844 | xfs_inode_t *ip1, | ||
| 1845 | uint lock_mode) | ||
| 1846 | { | ||
| 1847 | xfs_inode_t *temp; | ||
| 1848 | int attempts = 0; | ||
| 1849 | xfs_log_item_t *lp; | ||
| 1850 | |||
| 1851 | ASSERT(ip0->i_ino != ip1->i_ino); | ||
| 1852 | |||
| 1853 | if (ip0->i_ino > ip1->i_ino) { | ||
| 1854 | temp = ip0; | ||
| 1855 | ip0 = ip1; | ||
| 1856 | ip1 = temp; | ||
| 1857 | } | ||
| 1858 | |||
| 1859 | again: | ||
| 1860 | xfs_ilock(ip0, xfs_lock_inumorder(lock_mode, 0)); | ||
| 1861 | |||
| 1862 | /* | ||
| 1863 | * If the first lock we have locked is in the AIL, we must TRY to get | ||
| 1864 | * the second lock. If we can't get it, we must release the first one | ||
| 1865 | * and try again. | ||
| 1866 | */ | ||
| 1867 | lp = (xfs_log_item_t *)ip0->i_itemp; | ||
| 1868 | if (lp && (lp->li_flags & XFS_LI_IN_AIL)) { | ||
| 1869 | if (!xfs_ilock_nowait(ip1, xfs_lock_inumorder(lock_mode, 1))) { | ||
| 1870 | xfs_iunlock(ip0, lock_mode); | ||
| 1871 | if ((++attempts % 5) == 0) | ||
| 1872 | delay(1); /* Don't just spin the CPU */ | ||
| 1873 | goto again; | ||
| 1874 | } | ||
| 1875 | } else { | ||
| 1876 | xfs_ilock(ip1, xfs_lock_inumorder(lock_mode, 1)); | ||
| 1877 | } | ||
| 1878 | } | ||
| 1879 | |||
| 1949 | int | 1880 | int |
| 1950 | xfs_remove( | 1881 | xfs_remove( |
| 1951 | xfs_inode_t *dp, | 1882 | xfs_inode_t *dp, |
| @@ -2018,9 +1949,7 @@ xfs_remove( | |||
| 2018 | goto out_trans_cancel; | 1949 | goto out_trans_cancel; |
| 2019 | } | 1950 | } |
| 2020 | 1951 | ||
| 2021 | error = xfs_lock_dir_and_entry(dp, ip); | 1952 | xfs_lock_two_inodes(dp, ip, XFS_ILOCK_EXCL); |
| 2022 | if (error) | ||
| 2023 | goto out_trans_cancel; | ||
| 2024 | 1953 | ||
| 2025 | /* | 1954 | /* |
| 2026 | * At this point, we've gotten both the directory and the entry | 1955 | * At this point, we've gotten both the directory and the entry |
| @@ -2047,9 +1976,6 @@ xfs_remove( | |||
| 2047 | } | 1976 | } |
| 2048 | } | 1977 | } |
| 2049 | 1978 | ||
| 2050 | /* | ||
| 2051 | * Entry must exist since we did a lookup in xfs_lock_dir_and_entry. | ||
| 2052 | */ | ||
| 2053 | XFS_BMAP_INIT(&free_list, &first_block); | 1979 | XFS_BMAP_INIT(&free_list, &first_block); |
| 2054 | error = xfs_dir_removename(tp, dp, name, ip->i_ino, | 1980 | error = xfs_dir_removename(tp, dp, name, ip->i_ino, |
| 2055 | &first_block, &free_list, resblks); | 1981 | &first_block, &free_list, resblks); |
| @@ -2155,7 +2081,6 @@ xfs_link( | |||
| 2155 | { | 2081 | { |
| 2156 | xfs_mount_t *mp = tdp->i_mount; | 2082 | xfs_mount_t *mp = tdp->i_mount; |
| 2157 | xfs_trans_t *tp; | 2083 | xfs_trans_t *tp; |
| 2158 | xfs_inode_t *ips[2]; | ||
| 2159 | int error; | 2084 | int error; |
| 2160 | xfs_bmap_free_t free_list; | 2085 | xfs_bmap_free_t free_list; |
| 2161 | xfs_fsblock_t first_block; | 2086 | xfs_fsblock_t first_block; |
| @@ -2203,15 +2128,7 @@ xfs_link( | |||
| 2203 | goto error_return; | 2128 | goto error_return; |
| 2204 | } | 2129 | } |
| 2205 | 2130 | ||
| 2206 | if (sip->i_ino < tdp->i_ino) { | 2131 | xfs_lock_two_inodes(sip, tdp, XFS_ILOCK_EXCL); |
| 2207 | ips[0] = sip; | ||
| 2208 | ips[1] = tdp; | ||
| 2209 | } else { | ||
| 2210 | ips[0] = tdp; | ||
| 2211 | ips[1] = sip; | ||
| 2212 | } | ||
| 2213 | |||
| 2214 | xfs_lock_inodes(ips, 2, XFS_ILOCK_EXCL); | ||
| 2215 | 2132 | ||
| 2216 | /* | 2133 | /* |
| 2217 | * Increment vnode ref counts since xfs_trans_commit & | 2134 | * Increment vnode ref counts since xfs_trans_commit & |
| @@ -2352,7 +2269,7 @@ xfs_mkdir( | |||
| 2352 | * Make sure that we have allocated dquot(s) on disk. | 2269 | * Make sure that we have allocated dquot(s) on disk. |
| 2353 | */ | 2270 | */ |
| 2354 | error = XFS_QM_DQVOPALLOC(mp, dp, | 2271 | error = XFS_QM_DQVOPALLOC(mp, dp, |
| 2355 | current_fsuid(credp), current_fsgid(credp), prid, | 2272 | current_fsuid(), current_fsgid(), prid, |
| 2356 | XFS_QMOPT_QUOTALL | XFS_QMOPT_INHERIT, &udqp, &gdqp); | 2273 | XFS_QMOPT_QUOTALL | XFS_QMOPT_INHERIT, &udqp, &gdqp); |
| 2357 | if (error) | 2274 | if (error) |
| 2358 | goto std_return; | 2275 | goto std_return; |
| @@ -2578,7 +2495,7 @@ xfs_symlink( | |||
| 2578 | * Make sure that we have allocated dquot(s) on disk. | 2495 | * Make sure that we have allocated dquot(s) on disk. |
| 2579 | */ | 2496 | */ |
| 2580 | error = XFS_QM_DQVOPALLOC(mp, dp, | 2497 | error = XFS_QM_DQVOPALLOC(mp, dp, |
| 2581 | current_fsuid(credp), current_fsgid(credp), prid, | 2498 | current_fsuid(), current_fsgid(), prid, |
| 2582 | XFS_QMOPT_QUOTALL | XFS_QMOPT_INHERIT, &udqp, &gdqp); | 2499 | XFS_QMOPT_QUOTALL | XFS_QMOPT_INHERIT, &udqp, &gdqp); |
| 2583 | if (error) | 2500 | if (error) |
| 2584 | goto std_return; | 2501 | goto std_return; |
| @@ -2873,14 +2790,13 @@ int | |||
| 2873 | xfs_reclaim( | 2790 | xfs_reclaim( |
| 2874 | xfs_inode_t *ip) | 2791 | xfs_inode_t *ip) |
| 2875 | { | 2792 | { |
| 2876 | bhv_vnode_t *vp = XFS_ITOV(ip); | ||
| 2877 | 2793 | ||
| 2878 | xfs_itrace_entry(ip); | 2794 | xfs_itrace_entry(ip); |
| 2879 | 2795 | ||
| 2880 | ASSERT(!VN_MAPPED(vp)); | 2796 | ASSERT(!VN_MAPPED(VFS_I(ip))); |
| 2881 | 2797 | ||
| 2882 | /* bad inode, get out here ASAP */ | 2798 | /* bad inode, get out here ASAP */ |
| 2883 | if (VN_BAD(vp)) { | 2799 | if (VN_BAD(VFS_I(ip))) { |
| 2884 | xfs_ireclaim(ip); | 2800 | xfs_ireclaim(ip); |
| 2885 | return 0; | 2801 | return 0; |
| 2886 | } | 2802 | } |
| @@ -2917,7 +2833,7 @@ xfs_reclaim( | |||
| 2917 | XFS_MOUNT_ILOCK(mp); | 2833 | XFS_MOUNT_ILOCK(mp); |
| 2918 | spin_lock(&ip->i_flags_lock); | 2834 | spin_lock(&ip->i_flags_lock); |
| 2919 | __xfs_iflags_set(ip, XFS_IRECLAIMABLE); | 2835 | __xfs_iflags_set(ip, XFS_IRECLAIMABLE); |
| 2920 | vn_to_inode(vp)->i_private = NULL; | 2836 | VFS_I(ip)->i_private = NULL; |
| 2921 | ip->i_vnode = NULL; | 2837 | ip->i_vnode = NULL; |
| 2922 | spin_unlock(&ip->i_flags_lock); | 2838 | spin_unlock(&ip->i_flags_lock); |
| 2923 | list_add_tail(&ip->i_reclaim, &mp->m_del_inodes); | 2839 | list_add_tail(&ip->i_reclaim, &mp->m_del_inodes); |
| @@ -2933,7 +2849,7 @@ xfs_finish_reclaim( | |||
| 2933 | int sync_mode) | 2849 | int sync_mode) |
| 2934 | { | 2850 | { |
| 2935 | xfs_perag_t *pag = xfs_get_perag(ip->i_mount, ip->i_ino); | 2851 | xfs_perag_t *pag = xfs_get_perag(ip->i_mount, ip->i_ino); |
| 2936 | bhv_vnode_t *vp = XFS_ITOV_NULL(ip); | 2852 | struct inode *vp = VFS_I(ip); |
| 2937 | 2853 | ||
| 2938 | if (vp && VN_BAD(vp)) | 2854 | if (vp && VN_BAD(vp)) |
| 2939 | goto reclaim; | 2855 | goto reclaim; |
| @@ -3321,7 +3237,6 @@ xfs_free_file_space( | |||
| 3321 | xfs_off_t len, | 3237 | xfs_off_t len, |
| 3322 | int attr_flags) | 3238 | int attr_flags) |
| 3323 | { | 3239 | { |
| 3324 | bhv_vnode_t *vp; | ||
| 3325 | int committed; | 3240 | int committed; |
| 3326 | int done; | 3241 | int done; |
| 3327 | xfs_off_t end_dmi_offset; | 3242 | xfs_off_t end_dmi_offset; |
| @@ -3341,7 +3256,6 @@ xfs_free_file_space( | |||
| 3341 | xfs_trans_t *tp; | 3256 | xfs_trans_t *tp; |
| 3342 | int need_iolock = 1; | 3257 | int need_iolock = 1; |
| 3343 | 3258 | ||
| 3344 | vp = XFS_ITOV(ip); | ||
| 3345 | mp = ip->i_mount; | 3259 | mp = ip->i_mount; |
| 3346 | 3260 | ||
| 3347 | xfs_itrace_entry(ip); | 3261 | xfs_itrace_entry(ip); |
| @@ -3378,7 +3292,7 @@ xfs_free_file_space( | |||
| 3378 | rounding = max_t(uint, 1 << mp->m_sb.sb_blocklog, PAGE_CACHE_SIZE); | 3292 | rounding = max_t(uint, 1 << mp->m_sb.sb_blocklog, PAGE_CACHE_SIZE); |
| 3379 | ioffset = offset & ~(rounding - 1); | 3293 | ioffset = offset & ~(rounding - 1); |
| 3380 | 3294 | ||
| 3381 | if (VN_CACHED(vp) != 0) { | 3295 | if (VN_CACHED(VFS_I(ip)) != 0) { |
| 3382 | xfs_inval_cached_trace(ip, ioffset, -1, ioffset, -1); | 3296 | xfs_inval_cached_trace(ip, ioffset, -1, ioffset, -1); |
| 3383 | error = xfs_flushinval_pages(ip, ioffset, -1, FI_REMAPF_LOCKED); | 3297 | error = xfs_flushinval_pages(ip, ioffset, -1, FI_REMAPF_LOCKED); |
| 3384 | if (error) | 3298 | if (error) |
diff --git a/include/acpi/acnamesp.h b/include/acpi/acnamesp.h index 9ed70a050580..c34008507b69 100644 --- a/include/acpi/acnamesp.h +++ b/include/acpi/acnamesp.h | |||
| @@ -182,7 +182,7 @@ acpi_status acpi_ns_evaluate(struct acpi_evaluate_info *info); | |||
| 182 | */ | 182 | */ |
| 183 | u32 acpi_ns_opens_scope(acpi_object_type type); | 183 | u32 acpi_ns_opens_scope(acpi_object_type type); |
| 184 | 184 | ||
| 185 | void | 185 | acpi_status |
| 186 | acpi_ns_build_external_path(struct acpi_namespace_node *node, | 186 | acpi_ns_build_external_path(struct acpi_namespace_node *node, |
| 187 | acpi_size size, char *name_buffer); | 187 | acpi_size size, char *name_buffer); |
| 188 | 188 | ||
diff --git a/include/asm-arm/plat-s3c/regs-nand.h b/include/asm-arm/plat-s3c/regs-nand.h index 09f0b5503f5b..b2caa4bca270 100644 --- a/include/asm-arm/plat-s3c/regs-nand.h +++ b/include/asm-arm/plat-s3c/regs-nand.h | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #ifndef __ASM_ARM_REGS_NAND | 13 | #ifndef __ASM_ARM_REGS_NAND |
| 14 | #define __ASM_ARM_REGS_NAND "$Id: nand.h,v 1.3 2003/12/09 11:36:29 ben Exp $" | 14 | #define __ASM_ARM_REGS_NAND |
| 15 | 15 | ||
| 16 | 16 | ||
| 17 | #define S3C2410_NFREG(x) (x) | 17 | #define S3C2410_NFREG(x) (x) |
diff --git a/include/asm-arm/plat-s3c/regs-timer.h b/include/asm-arm/plat-s3c/regs-timer.h index b4366ea39677..cc0eedd53e38 100644 --- a/include/asm-arm/plat-s3c/regs-timer.h +++ b/include/asm-arm/plat-s3c/regs-timer.h | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | 12 | ||
| 13 | 13 | ||
| 14 | #ifndef __ASM_ARCH_REGS_TIMER_H | 14 | #ifndef __ASM_ARCH_REGS_TIMER_H |
| 15 | #define __ASM_ARCH_REGS_TIMER_H "$Id: timer.h,v 1.4 2003/05/06 19:30:50 ben Exp $" | 15 | #define __ASM_ARCH_REGS_TIMER_H |
| 16 | 16 | ||
| 17 | #define S3C_TIMERREG(x) (S3C_VA_TIMER + (x)) | 17 | #define S3C_TIMERREG(x) (S3C_VA_TIMER + (x)) |
| 18 | #define S3C_TIMERREG2(tmr,reg) S3C_TIMERREG((reg)+0x0c+((tmr)*0x0c)) | 18 | #define S3C_TIMERREG2(tmr,reg) S3C_TIMERREG((reg)+0x0c+((tmr)*0x0c)) |
diff --git a/include/asm-arm/plat-s3c/regs-watchdog.h b/include/asm-arm/plat-s3c/regs-watchdog.h index 1229f076c0a0..4938492470f7 100644 --- a/include/asm-arm/plat-s3c/regs-watchdog.h +++ b/include/asm-arm/plat-s3c/regs-watchdog.h | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | 12 | ||
| 13 | 13 | ||
| 14 | #ifndef __ASM_ARCH_REGS_WATCHDOG_H | 14 | #ifndef __ASM_ARCH_REGS_WATCHDOG_H |
| 15 | #define __ASM_ARCH_REGS_WATCHDOG_H "$Id: watchdog.h,v 1.2 2003/04/29 13:31:09 ben Exp $" | 15 | #define __ASM_ARCH_REGS_WATCHDOG_H |
| 16 | 16 | ||
| 17 | #define S3C_WDOGREG(x) ((x) + S3C_VA_WATCHDOG) | 17 | #define S3C_WDOGREG(x) ((x) + S3C_VA_WATCHDOG) |
| 18 | 18 | ||
diff --git a/include/asm-arm/plat-s3c24xx/s3c2410.h b/include/asm-arm/plat-s3c24xx/s3c2410.h index 36de0b835873..3cd1ec677b3f 100644 --- a/include/asm-arm/plat-s3c24xx/s3c2410.h +++ b/include/asm-arm/plat-s3c24xx/s3c2410.h | |||
| @@ -21,11 +21,11 @@ extern void s3c2410_init_uarts(struct s3c2410_uartcfg *cfg, int no); | |||
| 21 | 21 | ||
| 22 | extern void s3c2410_init_clocks(int xtal); | 22 | extern void s3c2410_init_clocks(int xtal); |
| 23 | 23 | ||
| 24 | extern int s3c2410_baseclk_add(void); | ||
| 25 | |||
| 26 | #else | 24 | #else |
| 27 | #define s3c2410_init_clocks NULL | 25 | #define s3c2410_init_clocks NULL |
| 28 | #define s3c2410_init_uarts NULL | 26 | #define s3c2410_init_uarts NULL |
| 29 | #define s3c2410_map_io NULL | 27 | #define s3c2410_map_io NULL |
| 30 | #define s3c2410_init NULL | 28 | #define s3c2410_init NULL |
| 31 | #endif | 29 | #endif |
| 30 | |||
| 31 | extern int s3c2410_baseclk_add(void); | ||
diff --git a/include/asm-blackfin/fixed_code.h b/include/asm-blackfin/fixed_code.h deleted file mode 100644 index 37db66c7030d..000000000000 --- a/include/asm-blackfin/fixed_code.h +++ /dev/null | |||
| @@ -1,22 +0,0 @@ | |||
| 1 | /* This file defines the fixed addresses where userspace programs can find | ||
| 2 | atomic code sequences. */ | ||
| 3 | |||
| 4 | #define FIXED_CODE_START 0x400 | ||
| 5 | |||
| 6 | #define SIGRETURN_STUB 0x400 | ||
| 7 | |||
| 8 | #define ATOMIC_SEQS_START 0x410 | ||
| 9 | |||
| 10 | #define ATOMIC_XCHG32 0x410 | ||
| 11 | #define ATOMIC_CAS32 0x420 | ||
| 12 | #define ATOMIC_ADD32 0x430 | ||
| 13 | #define ATOMIC_SUB32 0x440 | ||
| 14 | #define ATOMIC_IOR32 0x450 | ||
| 15 | #define ATOMIC_AND32 0x460 | ||
| 16 | #define ATOMIC_XOR32 0x470 | ||
| 17 | |||
| 18 | #define ATOMIC_SEQS_END 0x480 | ||
| 19 | |||
| 20 | #define SAFE_USER_INSTRUCTION 0x480 | ||
| 21 | |||
| 22 | #define FIXED_CODE_END 0x490 | ||
diff --git a/include/asm-cris/Kbuild b/include/asm-cris/Kbuild index b7037d80d461..d5b631935ec8 100644 --- a/include/asm-cris/Kbuild +++ b/include/asm-cris/Kbuild | |||
| @@ -1,6 +1,5 @@ | |||
| 1 | include include/asm-generic/Kbuild.asm | 1 | include include/asm-generic/Kbuild.asm |
| 2 | 2 | ||
| 3 | header-y += arch/ | ||
| 4 | header-y += arch-v10/ | 3 | header-y += arch-v10/ |
| 5 | header-y += arch-v32/ | 4 | header-y += arch-v32/ |
| 6 | 5 | ||
diff --git a/include/asm-frv/io.h b/include/asm-frv/io.h index 20e44fe00abf..ca7475e73b5e 100644 --- a/include/asm-frv/io.h +++ b/include/asm-frv/io.h | |||
| @@ -271,6 +271,8 @@ static inline void __iomem *ioremap_fullcache(unsigned long physaddr, unsigned l | |||
| 271 | return __ioremap(physaddr, size, IOMAP_FULL_CACHING); | 271 | return __ioremap(physaddr, size, IOMAP_FULL_CACHING); |
| 272 | } | 272 | } |
| 273 | 273 | ||
| 274 | #define ioremap_wc ioremap_nocache | ||
| 275 | |||
| 274 | extern void iounmap(void volatile __iomem *addr); | 276 | extern void iounmap(void volatile __iomem *addr); |
| 275 | 277 | ||
| 276 | static inline void __iomem *ioport_map(unsigned long port, unsigned int nr) | 278 | static inline void __iomem *ioport_map(unsigned long port, unsigned int nr) |
diff --git a/include/asm-generic/ioctl.h b/include/asm-generic/ioctl.h index 864181385579..15828b2d663c 100644 --- a/include/asm-generic/ioctl.h +++ b/include/asm-generic/ioctl.h | |||
| @@ -68,12 +68,16 @@ | |||
| 68 | ((nr) << _IOC_NRSHIFT) | \ | 68 | ((nr) << _IOC_NRSHIFT) | \ |
| 69 | ((size) << _IOC_SIZESHIFT)) | 69 | ((size) << _IOC_SIZESHIFT)) |
| 70 | 70 | ||
| 71 | #ifdef __KERNEL__ | ||
| 71 | /* provoke compile error for invalid uses of size argument */ | 72 | /* provoke compile error for invalid uses of size argument */ |
| 72 | extern unsigned int __invalid_size_argument_for_IOC; | 73 | extern unsigned int __invalid_size_argument_for_IOC; |
| 73 | #define _IOC_TYPECHECK(t) \ | 74 | #define _IOC_TYPECHECK(t) \ |
| 74 | ((sizeof(t) == sizeof(t[1]) && \ | 75 | ((sizeof(t) == sizeof(t[1]) && \ |
| 75 | sizeof(t) < (1 << _IOC_SIZEBITS)) ? \ | 76 | sizeof(t) < (1 << _IOC_SIZEBITS)) ? \ |
| 76 | sizeof(t) : __invalid_size_argument_for_IOC) | 77 | sizeof(t) : __invalid_size_argument_for_IOC) |
| 78 | #else | ||
| 79 | #define _IOC_TYPECHECK(t) (sizeof(t)) | ||
| 80 | #endif | ||
| 77 | 81 | ||
| 78 | /* used to create numbers */ | 82 | /* used to create numbers */ |
| 79 | #define _IO(type,nr) _IOC(_IOC_NONE,(type),(nr),0) | 83 | #define _IO(type,nr) _IOC(_IOC_NONE,(type),(nr),0) |
diff --git a/include/asm-generic/rtc.h b/include/asm-generic/rtc.h index be4af0029ac0..71ef3f0b9685 100644 --- a/include/asm-generic/rtc.h +++ b/include/asm-generic/rtc.h | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/mc146818rtc.h> | 15 | #include <linux/mc146818rtc.h> |
| 16 | #include <linux/rtc.h> | 16 | #include <linux/rtc.h> |
| 17 | #include <linux/bcd.h> | 17 | #include <linux/bcd.h> |
| 18 | #include <linux/delay.h> | ||
| 18 | 19 | ||
| 19 | #define RTC_PIE 0x40 /* periodic interrupt enable */ | 20 | #define RTC_PIE 0x40 /* periodic interrupt enable */ |
| 20 | #define RTC_AIE 0x20 /* alarm interrupt enable */ | 21 | #define RTC_AIE 0x20 /* alarm interrupt enable */ |
| @@ -43,7 +44,6 @@ static inline unsigned char rtc_is_updating(void) | |||
| 43 | 44 | ||
| 44 | static inline unsigned int get_rtc_time(struct rtc_time *time) | 45 | static inline unsigned int get_rtc_time(struct rtc_time *time) |
| 45 | { | 46 | { |
| 46 | unsigned long uip_watchdog = jiffies; | ||
| 47 | unsigned char ctrl; | 47 | unsigned char ctrl; |
| 48 | unsigned long flags; | 48 | unsigned long flags; |
| 49 | 49 | ||
| @@ -53,19 +53,15 @@ static inline unsigned int get_rtc_time(struct rtc_time *time) | |||
| 53 | 53 | ||
| 54 | /* | 54 | /* |
| 55 | * read RTC once any update in progress is done. The update | 55 | * read RTC once any update in progress is done. The update |
| 56 | * can take just over 2ms. We wait 10 to 20ms. There is no need to | 56 | * can take just over 2ms. We wait 20ms. There is no need to |
| 57 | * to poll-wait (up to 1s - eeccch) for the falling edge of RTC_UIP. | 57 | * to poll-wait (up to 1s - eeccch) for the falling edge of RTC_UIP. |
| 58 | * If you need to know *exactly* when a second has started, enable | 58 | * If you need to know *exactly* when a second has started, enable |
| 59 | * periodic update complete interrupts, (via ioctl) and then | 59 | * periodic update complete interrupts, (via ioctl) and then |
| 60 | * immediately read /dev/rtc which will block until you get the IRQ. | 60 | * immediately read /dev/rtc which will block until you get the IRQ. |
| 61 | * Once the read clears, read the RTC time (again via ioctl). Easy. | 61 | * Once the read clears, read the RTC time (again via ioctl). Easy. |
| 62 | */ | 62 | */ |
| 63 | 63 | if (rtc_is_updating()) | |
| 64 | if (rtc_is_updating() != 0) | 64 | mdelay(20); |
| 65 | while (jiffies - uip_watchdog < 2*HZ/100) { | ||
| 66 | barrier(); | ||
| 67 | cpu_relax(); | ||
| 68 | } | ||
| 69 | 65 | ||
| 70 | /* | 66 | /* |
| 71 | * Only the values that we read from the RTC are set. We leave | 67 | * Only the values that we read from the RTC are set. We leave |
diff --git a/include/asm-mips/kexec.h b/include/asm-mips/kexec.h index cdbab43b7d3a..4314892aaebb 100644 --- a/include/asm-mips/kexec.h +++ b/include/asm-mips/kexec.h | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | /* Maximum address we can use for the control code buffer */ | 16 | /* Maximum address we can use for the control code buffer */ |
| 17 | #define KEXEC_CONTROL_MEMORY_LIMIT (0x20000000) | 17 | #define KEXEC_CONTROL_MEMORY_LIMIT (0x20000000) |
| 18 | 18 | ||
| 19 | #define KEXEC_CONTROL_CODE_SIZE 4096 | 19 | #define KEXEC_CONTROL_PAGE_SIZE 4096 |
| 20 | 20 | ||
| 21 | /* The native architecture */ | 21 | /* The native architecture */ |
| 22 | #define KEXEC_ARCH KEXEC_ARCH_MIPS | 22 | #define KEXEC_ARCH KEXEC_ARCH_MIPS |
diff --git a/include/asm-mips/unistd.h b/include/asm-mips/unistd.h index 4964c82f85f9..a73e1531e151 100644 --- a/include/asm-mips/unistd.h +++ b/include/asm-mips/unistd.h | |||
| @@ -344,16 +344,22 @@ | |||
| 344 | #define __NR_timerfd_create (__NR_Linux + 321) | 344 | #define __NR_timerfd_create (__NR_Linux + 321) |
| 345 | #define __NR_timerfd_gettime (__NR_Linux + 322) | 345 | #define __NR_timerfd_gettime (__NR_Linux + 322) |
| 346 | #define __NR_timerfd_settime (__NR_Linux + 323) | 346 | #define __NR_timerfd_settime (__NR_Linux + 323) |
| 347 | #define __NR_signalfd4 (__NR_Linux + 324) | ||
| 348 | #define __NR_eventfd2 (__NR_Linux + 325) | ||
| 349 | #define __NR_epoll_create1 (__NR_Linux + 326) | ||
| 350 | #define __NR_dup3 (__NR_Linux + 327) | ||
| 351 | #define __NR_pipe2 (__NR_Linux + 328) | ||
| 352 | #define __NR_inotify_init1 (__NR_Linux + 329) | ||
| 347 | 353 | ||
| 348 | /* | 354 | /* |
| 349 | * Offset of the last Linux o32 flavoured syscall | 355 | * Offset of the last Linux o32 flavoured syscall |
| 350 | */ | 356 | */ |
| 351 | #define __NR_Linux_syscalls 323 | 357 | #define __NR_Linux_syscalls 329 |
| 352 | 358 | ||
| 353 | #endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */ | 359 | #endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */ |
| 354 | 360 | ||
| 355 | #define __NR_O32_Linux 4000 | 361 | #define __NR_O32_Linux 4000 |
| 356 | #define __NR_O32_Linux_syscalls 323 | 362 | #define __NR_O32_Linux_syscalls 329 |
| 357 | 363 | ||
| 358 | #if _MIPS_SIM == _MIPS_SIM_ABI64 | 364 | #if _MIPS_SIM == _MIPS_SIM_ABI64 |
| 359 | 365 | ||
| @@ -644,16 +650,22 @@ | |||
| 644 | #define __NR_timerfd_create (__NR_Linux + 280) | 650 | #define __NR_timerfd_create (__NR_Linux + 280) |
| 645 | #define __NR_timerfd_gettime (__NR_Linux + 281) | 651 | #define __NR_timerfd_gettime (__NR_Linux + 281) |
| 646 | #define __NR_timerfd_settime (__NR_Linux + 282) | 652 | #define __NR_timerfd_settime (__NR_Linux + 282) |
| 653 | #define __NR_signalfd4 (__NR_Linux + 283) | ||
| 654 | #define __NR_eventfd2 (__NR_Linux + 284) | ||
| 655 | #define __NR_epoll_create1 (__NR_Linux + 285) | ||
| 656 | #define __NR_dup3 (__NR_Linux + 286) | ||
| 657 | #define __NR_pipe2 (__NR_Linux + 287) | ||
| 658 | #define __NR_inotify_init1 (__NR_Linux + 288) | ||
| 647 | 659 | ||
| 648 | /* | 660 | /* |
| 649 | * Offset of the last Linux 64-bit flavoured syscall | 661 | * Offset of the last Linux 64-bit flavoured syscall |
| 650 | */ | 662 | */ |
| 651 | #define __NR_Linux_syscalls 282 | 663 | #define __NR_Linux_syscalls 288 |
| 652 | 664 | ||
| 653 | #endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */ | 665 | #endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */ |
| 654 | 666 | ||
| 655 | #define __NR_64_Linux 5000 | 667 | #define __NR_64_Linux 5000 |
| 656 | #define __NR_64_Linux_syscalls 282 | 668 | #define __NR_64_Linux_syscalls 288 |
| 657 | 669 | ||
| 658 | #if _MIPS_SIM == _MIPS_SIM_NABI32 | 670 | #if _MIPS_SIM == _MIPS_SIM_NABI32 |
| 659 | 671 | ||
| @@ -948,16 +960,22 @@ | |||
| 948 | #define __NR_timerfd_create (__NR_Linux + 284) | 960 | #define __NR_timerfd_create (__NR_Linux + 284) |
| 949 | #define __NR_timerfd_gettime (__NR_Linux + 285) | 961 | #define __NR_timerfd_gettime (__NR_Linux + 285) |
| 950 | #define __NR_timerfd_settime (__NR_Linux + 286) | 962 | #define __NR_timerfd_settime (__NR_Linux + 286) |
| 963 | #define __NR_signalfd4 (__NR_Linux + 287) | ||
| 964 | #define __NR_eventfd2 (__NR_Linux + 288) | ||
| 965 | #define __NR_epoll_create1 (__NR_Linux + 289) | ||
| 966 | #define __NR_dup3 (__NR_Linux + 290) | ||
| 967 | #define __NR_pipe2 (__NR_Linux + 291) | ||
| 968 | #define __NR_inotify_init1 (__NR_Linux + 292) | ||
| 951 | 969 | ||
| 952 | /* | 970 | /* |
| 953 | * Offset of the last N32 flavoured syscall | 971 | * Offset of the last N32 flavoured syscall |
| 954 | */ | 972 | */ |
| 955 | #define __NR_Linux_syscalls 286 | 973 | #define __NR_Linux_syscalls 292 |
| 956 | 974 | ||
| 957 | #endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */ | 975 | #endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */ |
| 958 | 976 | ||
| 959 | #define __NR_N32_Linux 6000 | 977 | #define __NR_N32_Linux 6000 |
| 960 | #define __NR_N32_Linux_syscalls 286 | 978 | #define __NR_N32_Linux_syscalls 292 |
| 961 | 979 | ||
| 962 | #ifdef __KERNEL__ | 980 | #ifdef __KERNEL__ |
| 963 | 981 | ||
diff --git a/include/asm-mn10300/io.h b/include/asm-mn10300/io.h index b8b6dc878250..c1a4119e6497 100644 --- a/include/asm-mn10300/io.h +++ b/include/asm-mn10300/io.h | |||
| @@ -259,6 +259,8 @@ static inline void *ioremap_nocache(unsigned long offset, unsigned long size) | |||
| 259 | return (void *) (offset | 0x20000000); | 259 | return (void *) (offset | 0x20000000); |
| 260 | } | 260 | } |
| 261 | 261 | ||
| 262 | #define ioremap_wc ioremap_nocache | ||
| 263 | |||
| 262 | static inline void iounmap(void *addr) | 264 | static inline void iounmap(void *addr) |
| 263 | { | 265 | { |
| 264 | } | 266 | } |
diff --git a/include/asm-x86/amd_iommu_types.h b/include/asm-x86/amd_iommu_types.h index 22aa58ca1991..dcc812067394 100644 --- a/include/asm-x86/amd_iommu_types.h +++ b/include/asm-x86/amd_iommu_types.h | |||
| @@ -31,9 +31,6 @@ | |||
| 31 | #define ALIAS_TABLE_ENTRY_SIZE 2 | 31 | #define ALIAS_TABLE_ENTRY_SIZE 2 |
| 32 | #define RLOOKUP_TABLE_ENTRY_SIZE (sizeof(void *)) | 32 | #define RLOOKUP_TABLE_ENTRY_SIZE (sizeof(void *)) |
| 33 | 33 | ||
| 34 | /* helper macros */ | ||
| 35 | #define LOW_U32(x) ((x) & ((1ULL << 32)-1)) | ||
| 36 | |||
| 37 | /* Length of the MMIO region for the AMD IOMMU */ | 34 | /* Length of the MMIO region for the AMD IOMMU */ |
| 38 | #define MMIO_REGION_LENGTH 0x4000 | 35 | #define MMIO_REGION_LENGTH 0x4000 |
| 39 | 36 | ||
| @@ -69,6 +66,9 @@ | |||
| 69 | #define MMIO_EVT_TAIL_OFFSET 0x2018 | 66 | #define MMIO_EVT_TAIL_OFFSET 0x2018 |
| 70 | #define MMIO_STATUS_OFFSET 0x2020 | 67 | #define MMIO_STATUS_OFFSET 0x2020 |
| 71 | 68 | ||
| 69 | /* MMIO status bits */ | ||
| 70 | #define MMIO_STATUS_COM_WAIT_INT_MASK 0x04 | ||
| 71 | |||
| 72 | /* feature control bits */ | 72 | /* feature control bits */ |
| 73 | #define CONTROL_IOMMU_EN 0x00ULL | 73 | #define CONTROL_IOMMU_EN 0x00ULL |
| 74 | #define CONTROL_HT_TUN_EN 0x01ULL | 74 | #define CONTROL_HT_TUN_EN 0x01ULL |
| @@ -89,6 +89,7 @@ | |||
| 89 | #define CMD_INV_IOMMU_PAGES 0x03 | 89 | #define CMD_INV_IOMMU_PAGES 0x03 |
| 90 | 90 | ||
| 91 | #define CMD_COMPL_WAIT_STORE_MASK 0x01 | 91 | #define CMD_COMPL_WAIT_STORE_MASK 0x01 |
| 92 | #define CMD_COMPL_WAIT_INT_MASK 0x02 | ||
| 92 | #define CMD_INV_IOMMU_PAGES_SIZE_MASK 0x01 | 93 | #define CMD_INV_IOMMU_PAGES_SIZE_MASK 0x01 |
| 93 | #define CMD_INV_IOMMU_PAGES_PDE_MASK 0x02 | 94 | #define CMD_INV_IOMMU_PAGES_PDE_MASK 0x02 |
| 94 | 95 | ||
| @@ -99,6 +100,7 @@ | |||
| 99 | #define DEV_ENTRY_TRANSLATION 0x01 | 100 | #define DEV_ENTRY_TRANSLATION 0x01 |
| 100 | #define DEV_ENTRY_IR 0x3d | 101 | #define DEV_ENTRY_IR 0x3d |
| 101 | #define DEV_ENTRY_IW 0x3e | 102 | #define DEV_ENTRY_IW 0x3e |
| 103 | #define DEV_ENTRY_NO_PAGE_FAULT 0x62 | ||
| 102 | #define DEV_ENTRY_EX 0x67 | 104 | #define DEV_ENTRY_EX 0x67 |
| 103 | #define DEV_ENTRY_SYSMGT1 0x68 | 105 | #define DEV_ENTRY_SYSMGT1 0x68 |
| 104 | #define DEV_ENTRY_SYSMGT2 0x69 | 106 | #define DEV_ENTRY_SYSMGT2 0x69 |
diff --git a/include/asm-x86/atomic_64.h b/include/asm-x86/atomic_64.h index a0095191c02e..91c7d03e65bc 100644 --- a/include/asm-x86/atomic_64.h +++ b/include/asm-x86/atomic_64.h | |||
| @@ -228,7 +228,7 @@ static inline void atomic64_add(long i, atomic64_t *v) | |||
| 228 | { | 228 | { |
| 229 | asm volatile(LOCK_PREFIX "addq %1,%0" | 229 | asm volatile(LOCK_PREFIX "addq %1,%0" |
| 230 | : "=m" (v->counter) | 230 | : "=m" (v->counter) |
| 231 | : "ir" (i), "m" (v->counter)); | 231 | : "er" (i), "m" (v->counter)); |
| 232 | } | 232 | } |
| 233 | 233 | ||
| 234 | /** | 234 | /** |
| @@ -242,7 +242,7 @@ static inline void atomic64_sub(long i, atomic64_t *v) | |||
| 242 | { | 242 | { |
| 243 | asm volatile(LOCK_PREFIX "subq %1,%0" | 243 | asm volatile(LOCK_PREFIX "subq %1,%0" |
| 244 | : "=m" (v->counter) | 244 | : "=m" (v->counter) |
| 245 | : "ir" (i), "m" (v->counter)); | 245 | : "er" (i), "m" (v->counter)); |
| 246 | } | 246 | } |
| 247 | 247 | ||
| 248 | /** | 248 | /** |
| @@ -260,7 +260,7 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v) | |||
| 260 | 260 | ||
| 261 | asm volatile(LOCK_PREFIX "subq %2,%0; sete %1" | 261 | asm volatile(LOCK_PREFIX "subq %2,%0; sete %1" |
| 262 | : "=m" (v->counter), "=qm" (c) | 262 | : "=m" (v->counter), "=qm" (c) |
| 263 | : "ir" (i), "m" (v->counter) : "memory"); | 263 | : "er" (i), "m" (v->counter) : "memory"); |
| 264 | return c; | 264 | return c; |
| 265 | } | 265 | } |
| 266 | 266 | ||
| @@ -341,7 +341,7 @@ static inline int atomic64_add_negative(long i, atomic64_t *v) | |||
| 341 | 341 | ||
| 342 | asm volatile(LOCK_PREFIX "addq %2,%0; sets %1" | 342 | asm volatile(LOCK_PREFIX "addq %2,%0; sets %1" |
| 343 | : "=m" (v->counter), "=qm" (c) | 343 | : "=m" (v->counter), "=qm" (c) |
| 344 | : "ir" (i), "m" (v->counter) : "memory"); | 344 | : "er" (i), "m" (v->counter) : "memory"); |
| 345 | return c; | 345 | return c; |
| 346 | } | 346 | } |
| 347 | 347 | ||
diff --git a/include/asm-x86/cpufeature.h b/include/asm-x86/cpufeature.h index 2f5a792b0acc..762f6a6bc707 100644 --- a/include/asm-x86/cpufeature.h +++ b/include/asm-x86/cpufeature.h | |||
| @@ -91,6 +91,7 @@ | |||
| 91 | #define X86_FEATURE_CX16 (4*32+13) /* CMPXCHG16B */ | 91 | #define X86_FEATURE_CX16 (4*32+13) /* CMPXCHG16B */ |
| 92 | #define X86_FEATURE_XTPR (4*32+14) /* Send Task Priority Messages */ | 92 | #define X86_FEATURE_XTPR (4*32+14) /* Send Task Priority Messages */ |
| 93 | #define X86_FEATURE_DCA (4*32+18) /* Direct Cache Access */ | 93 | #define X86_FEATURE_DCA (4*32+18) /* Direct Cache Access */ |
| 94 | #define X86_FEATURE_XMM4_2 (4*32+20) /* Streaming SIMD Extensions-4.2 */ | ||
| 94 | 95 | ||
| 95 | /* VIA/Cyrix/Centaur-defined CPU features, CPUID level 0xC0000001, word 5 */ | 96 | /* VIA/Cyrix/Centaur-defined CPU features, CPUID level 0xC0000001, word 5 */ |
| 96 | #define X86_FEATURE_XSTORE (5*32+ 2) /* on-CPU RNG present (xstore insn) */ | 97 | #define X86_FEATURE_XSTORE (5*32+ 2) /* on-CPU RNG present (xstore insn) */ |
| @@ -189,6 +190,7 @@ extern const char * const x86_power_flags[32]; | |||
| 189 | #define cpu_has_gbpages boot_cpu_has(X86_FEATURE_GBPAGES) | 190 | #define cpu_has_gbpages boot_cpu_has(X86_FEATURE_GBPAGES) |
| 190 | #define cpu_has_arch_perfmon boot_cpu_has(X86_FEATURE_ARCH_PERFMON) | 191 | #define cpu_has_arch_perfmon boot_cpu_has(X86_FEATURE_ARCH_PERFMON) |
| 191 | #define cpu_has_pat boot_cpu_has(X86_FEATURE_PAT) | 192 | #define cpu_has_pat boot_cpu_has(X86_FEATURE_PAT) |
| 193 | #define cpu_has_xmm4_2 boot_cpu_has(X86_FEATURE_XMM4_2) | ||
| 192 | 194 | ||
| 193 | #if defined(CONFIG_X86_INVLPG) || defined(CONFIG_X86_64) | 195 | #if defined(CONFIG_X86_INVLPG) || defined(CONFIG_X86_64) |
| 194 | # define cpu_has_invlpg 1 | 196 | # define cpu_has_invlpg 1 |
diff --git a/include/asm-x86/efi.h b/include/asm-x86/efi.h index 7ed2bd7a7f51..d4f2b0abe929 100644 --- a/include/asm-x86/efi.h +++ b/include/asm-x86/efi.h | |||
| @@ -86,7 +86,7 @@ extern u64 efi_call6(void *fp, u64 arg1, u64 arg2, u64 arg3, | |||
| 86 | efi_call6((void *)(efi.systab->runtime->f), (u64)(a1), (u64)(a2), \ | 86 | efi_call6((void *)(efi.systab->runtime->f), (u64)(a1), (u64)(a2), \ |
| 87 | (u64)(a3), (u64)(a4), (u64)(a5), (u64)(a6)) | 87 | (u64)(a3), (u64)(a4), (u64)(a5), (u64)(a6)) |
| 88 | 88 | ||
| 89 | extern void *efi_ioremap(unsigned long addr, unsigned long size); | 89 | extern void __iomem *efi_ioremap(unsigned long addr, unsigned long size); |
| 90 | 90 | ||
| 91 | #endif /* CONFIG_X86_32 */ | 91 | #endif /* CONFIG_X86_32 */ |
| 92 | 92 | ||
diff --git a/include/asm-x86/genapic_32.h b/include/asm-x86/genapic_32.h index b02ea6e17de8..754d635f90ff 100644 --- a/include/asm-x86/genapic_32.h +++ b/include/asm-x86/genapic_32.h | |||
| @@ -118,6 +118,7 @@ enum uv_system_type {UV_NONE, UV_LEGACY_APIC, UV_X2APIC, UV_NON_UNIQUE_APIC}; | |||
| 118 | #define get_uv_system_type() UV_NONE | 118 | #define get_uv_system_type() UV_NONE |
| 119 | #define is_uv_system() 0 | 119 | #define is_uv_system() 0 |
| 120 | #define uv_wakeup_secondary(a, b) 1 | 120 | #define uv_wakeup_secondary(a, b) 1 |
| 121 | #define uv_system_init() do {} while (0) | ||
| 121 | 122 | ||
| 122 | 123 | ||
| 123 | #endif | 124 | #endif |
diff --git a/include/asm-x86/genapic_64.h b/include/asm-x86/genapic_64.h index 0f8504627c41..a47d63129135 100644 --- a/include/asm-x86/genapic_64.h +++ b/include/asm-x86/genapic_64.h | |||
| @@ -42,6 +42,7 @@ extern int is_uv_system(void); | |||
| 42 | extern struct genapic apic_x2apic_uv_x; | 42 | extern struct genapic apic_x2apic_uv_x; |
| 43 | DECLARE_PER_CPU(int, x2apic_extra_bits); | 43 | DECLARE_PER_CPU(int, x2apic_extra_bits); |
| 44 | extern void uv_cpu_init(void); | 44 | extern void uv_cpu_init(void); |
| 45 | extern void uv_system_init(void); | ||
| 45 | extern int uv_wakeup_secondary(int phys_apicid, unsigned int start_rip); | 46 | extern int uv_wakeup_secondary(int phys_apicid, unsigned int start_rip); |
| 46 | 47 | ||
| 47 | extern void setup_apic_routing(void); | 48 | extern void setup_apic_routing(void); |
diff --git a/include/asm-x86/geode.h b/include/asm-x86/geode.h index bb06027fc83e..2c1cda0b8a86 100644 --- a/include/asm-x86/geode.h +++ b/include/asm-x86/geode.h | |||
| @@ -50,6 +50,7 @@ extern int geode_get_dev_base(unsigned int dev); | |||
| 50 | #define MSR_PIC_YSEL_HIGH 0x51400021 | 50 | #define MSR_PIC_YSEL_HIGH 0x51400021 |
| 51 | #define MSR_PIC_ZSEL_LOW 0x51400022 | 51 | #define MSR_PIC_ZSEL_LOW 0x51400022 |
| 52 | #define MSR_PIC_ZSEL_HIGH 0x51400023 | 52 | #define MSR_PIC_ZSEL_HIGH 0x51400023 |
| 53 | #define MSR_PIC_IRQM_LPC 0x51400025 | ||
| 53 | 54 | ||
| 54 | #define MSR_MFGPT_IRQ 0x51400028 | 55 | #define MSR_MFGPT_IRQ 0x51400028 |
| 55 | #define MSR_MFGPT_NR 0x51400029 | 56 | #define MSR_MFGPT_NR 0x51400029 |
| @@ -237,7 +238,7 @@ static inline u16 geode_mfgpt_read(int timer, u16 reg) | |||
| 237 | } | 238 | } |
| 238 | 239 | ||
| 239 | extern int geode_mfgpt_toggle_event(int timer, int cmp, int event, int enable); | 240 | extern int geode_mfgpt_toggle_event(int timer, int cmp, int event, int enable); |
| 240 | extern int geode_mfgpt_set_irq(int timer, int cmp, int irq, int enable); | 241 | extern int geode_mfgpt_set_irq(int timer, int cmp, int *irq, int enable); |
| 241 | extern int geode_mfgpt_alloc_timer(int timer, int domain); | 242 | extern int geode_mfgpt_alloc_timer(int timer, int domain); |
| 242 | 243 | ||
| 243 | #define geode_mfgpt_setup_irq(t, c, i) geode_mfgpt_set_irq((t), (c), (i), 1) | 244 | #define geode_mfgpt_setup_irq(t, c, i) geode_mfgpt_set_irq((t), (c), (i), 1) |
diff --git a/include/asm-x86/hw_irq.h b/include/asm-x86/hw_irq.h index 77ba51df5668..edd0b95f14d0 100644 --- a/include/asm-x86/hw_irq.h +++ b/include/asm-x86/hw_irq.h | |||
| @@ -98,9 +98,17 @@ extern void (*const interrupt[NR_IRQS])(void); | |||
| 98 | #else | 98 | #else |
| 99 | typedef int vector_irq_t[NR_VECTORS]; | 99 | typedef int vector_irq_t[NR_VECTORS]; |
| 100 | DECLARE_PER_CPU(vector_irq_t, vector_irq); | 100 | DECLARE_PER_CPU(vector_irq_t, vector_irq); |
| 101 | extern spinlock_t vector_lock; | ||
| 102 | #endif | 101 | #endif |
| 103 | extern void setup_vector_irq(int cpu); | 102 | |
| 103 | #if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_X86_64) | ||
| 104 | extern void lock_vector_lock(void); | ||
| 105 | extern void unlock_vector_lock(void); | ||
| 106 | extern void __setup_vector_irq(int cpu); | ||
| 107 | #else | ||
| 108 | static inline void lock_vector_lock(void) {} | ||
| 109 | static inline void unlock_vector_lock(void) {} | ||
| 110 | static inline void __setup_vector_irq(int cpu) {} | ||
| 111 | #endif | ||
| 104 | 112 | ||
| 105 | #endif /* !ASSEMBLY_ */ | 113 | #endif /* !ASSEMBLY_ */ |
| 106 | 114 | ||
diff --git a/include/asm-x86/i387.h b/include/asm-x86/i387.h index 96fa8449ff11..56d00e31aec0 100644 --- a/include/asm-x86/i387.h +++ b/include/asm-x86/i387.h | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/sched.h> | 13 | #include <linux/sched.h> |
| 14 | #include <linux/kernel_stat.h> | 14 | #include <linux/kernel_stat.h> |
| 15 | #include <linux/regset.h> | 15 | #include <linux/regset.h> |
| 16 | #include <linux/hardirq.h> | ||
| 16 | #include <asm/asm.h> | 17 | #include <asm/asm.h> |
| 17 | #include <asm/processor.h> | 18 | #include <asm/processor.h> |
| 18 | #include <asm/sigcontext.h> | 19 | #include <asm/sigcontext.h> |
| @@ -62,8 +63,6 @@ static inline int restore_fpu_checking(struct i387_fxsave_struct *fx) | |||
| 62 | #else | 63 | #else |
| 63 | : [fx] "cdaSDb" (fx), "m" (*fx), "0" (0)); | 64 | : [fx] "cdaSDb" (fx), "m" (*fx), "0" (0)); |
| 64 | #endif | 65 | #endif |
| 65 | if (unlikely(err)) | ||
| 66 | init_fpu(current); | ||
| 67 | return err; | 66 | return err; |
| 68 | } | 67 | } |
| 69 | 68 | ||
| @@ -236,6 +235,37 @@ static inline void kernel_fpu_end(void) | |||
| 236 | preempt_enable(); | 235 | preempt_enable(); |
| 237 | } | 236 | } |
| 238 | 237 | ||
| 238 | /* | ||
| 239 | * Some instructions like VIA's padlock instructions generate a spurious | ||
| 240 | * DNA fault but don't modify SSE registers. And these instructions | ||
| 241 | * get used from interrupt context aswell. To prevent these kernel instructions | ||
| 242 | * in interrupt context interact wrongly with other user/kernel fpu usage, we | ||
| 243 | * should use them only in the context of irq_ts_save/restore() | ||
| 244 | */ | ||
| 245 | static inline int irq_ts_save(void) | ||
| 246 | { | ||
| 247 | /* | ||
| 248 | * If we are in process context, we are ok to take a spurious DNA fault. | ||
| 249 | * Otherwise, doing clts() in process context require pre-emption to | ||
| 250 | * be disabled or some heavy lifting like kernel_fpu_begin() | ||
| 251 | */ | ||
| 252 | if (!in_interrupt()) | ||
| 253 | return 0; | ||
| 254 | |||
| 255 | if (read_cr0() & X86_CR0_TS) { | ||
| 256 | clts(); | ||
| 257 | return 1; | ||
| 258 | } | ||
| 259 | |||
| 260 | return 0; | ||
| 261 | } | ||
| 262 | |||
| 263 | static inline void irq_ts_restore(int TS_state) | ||
| 264 | { | ||
| 265 | if (TS_state) | ||
| 266 | stts(); | ||
| 267 | } | ||
| 268 | |||
| 239 | #ifdef CONFIG_X86_64 | 269 | #ifdef CONFIG_X86_64 |
| 240 | 270 | ||
| 241 | static inline void save_init_fpu(struct task_struct *tsk) | 271 | static inline void save_init_fpu(struct task_struct *tsk) |
diff --git a/include/asm-x86/io.h b/include/asm-x86/io.h index bf5d629b3a39..0f954dc89cb3 100644 --- a/include/asm-x86/io.h +++ b/include/asm-x86/io.h | |||
| @@ -21,7 +21,7 @@ extern void __iomem *fix_ioremap(unsigned idx, unsigned long phys); | |||
| 21 | 21 | ||
| 22 | #define build_mmio_read(name, size, type, reg, barrier) \ | 22 | #define build_mmio_read(name, size, type, reg, barrier) \ |
| 23 | static inline type name(const volatile void __iomem *addr) \ | 23 | static inline type name(const volatile void __iomem *addr) \ |
| 24 | { type ret; asm volatile("mov" size " %1,%0":"=" reg (ret) \ | 24 | { type ret; asm volatile("mov" size " %1,%0":reg (ret) \ |
| 25 | :"m" (*(volatile type __force *)addr) barrier); return ret; } | 25 | :"m" (*(volatile type __force *)addr) barrier); return ret; } |
| 26 | 26 | ||
| 27 | #define build_mmio_write(name, size, type, reg, barrier) \ | 27 | #define build_mmio_write(name, size, type, reg, barrier) \ |
| @@ -29,13 +29,13 @@ static inline void name(type val, volatile void __iomem *addr) \ | |||
| 29 | { asm volatile("mov" size " %0,%1": :reg (val), \ | 29 | { asm volatile("mov" size " %0,%1": :reg (val), \ |
| 30 | "m" (*(volatile type __force *)addr) barrier); } | 30 | "m" (*(volatile type __force *)addr) barrier); } |
| 31 | 31 | ||
| 32 | build_mmio_read(readb, "b", unsigned char, "q", :"memory") | 32 | build_mmio_read(readb, "b", unsigned char, "=q", :"memory") |
| 33 | build_mmio_read(readw, "w", unsigned short, "r", :"memory") | 33 | build_mmio_read(readw, "w", unsigned short, "=r", :"memory") |
| 34 | build_mmio_read(readl, "l", unsigned int, "r", :"memory") | 34 | build_mmio_read(readl, "l", unsigned int, "=r", :"memory") |
| 35 | 35 | ||
| 36 | build_mmio_read(__readb, "b", unsigned char, "q", ) | 36 | build_mmio_read(__readb, "b", unsigned char, "=q", ) |
| 37 | build_mmio_read(__readw, "w", unsigned short, "r", ) | 37 | build_mmio_read(__readw, "w", unsigned short, "=r", ) |
| 38 | build_mmio_read(__readl, "l", unsigned int, "r", ) | 38 | build_mmio_read(__readl, "l", unsigned int, "=r", ) |
| 39 | 39 | ||
| 40 | build_mmio_write(writeb, "b", unsigned char, "q", :"memory") | 40 | build_mmio_write(writeb, "b", unsigned char, "q", :"memory") |
| 41 | build_mmio_write(writew, "w", unsigned short, "r", :"memory") | 41 | build_mmio_write(writew, "w", unsigned short, "r", :"memory") |
| @@ -59,8 +59,8 @@ build_mmio_write(__writel, "l", unsigned int, "r", ) | |||
| 59 | #define mmiowb() barrier() | 59 | #define mmiowb() barrier() |
| 60 | 60 | ||
| 61 | #ifdef CONFIG_X86_64 | 61 | #ifdef CONFIG_X86_64 |
| 62 | build_mmio_read(readq, "q", unsigned long, "r", :"memory") | 62 | build_mmio_read(readq, "q", unsigned long, "=r", :"memory") |
| 63 | build_mmio_read(__readq, "q", unsigned long, "r", ) | 63 | build_mmio_read(__readq, "q", unsigned long, "=r", ) |
| 64 | build_mmio_write(writeq, "q", unsigned long, "r", :"memory") | 64 | build_mmio_write(writeq, "q", unsigned long, "r", :"memory") |
| 65 | build_mmio_write(__writeq, "q", unsigned long, "r", ) | 65 | build_mmio_write(__writeq, "q", unsigned long, "r", ) |
| 66 | 66 | ||
diff --git a/include/asm-x86/irq_vectors.h b/include/asm-x86/irq_vectors.h index 90b1d1f12f08..a48c7f2dbdc0 100644 --- a/include/asm-x86/irq_vectors.h +++ b/include/asm-x86/irq_vectors.h | |||
| @@ -76,6 +76,7 @@ | |||
| 76 | #define CALL_FUNCTION_SINGLE_VECTOR 0xfb | 76 | #define CALL_FUNCTION_SINGLE_VECTOR 0xfb |
| 77 | #define THERMAL_APIC_VECTOR 0xfa | 77 | #define THERMAL_APIC_VECTOR 0xfa |
| 78 | #define THRESHOLD_APIC_VECTOR 0xf9 | 78 | #define THRESHOLD_APIC_VECTOR 0xf9 |
| 79 | #define UV_BAU_MESSAGE 0xf8 | ||
| 79 | #define INVALIDATE_TLB_VECTOR_END 0xf7 | 80 | #define INVALIDATE_TLB_VECTOR_END 0xf7 |
| 80 | #define INVALIDATE_TLB_VECTOR_START 0xf0 /* f0-f7 used for TLB flush */ | 81 | #define INVALIDATE_TLB_VECTOR_START 0xf0 /* f0-f7 used for TLB flush */ |
| 81 | 82 | ||
| @@ -109,7 +110,15 @@ | |||
| 109 | #define LAST_VM86_IRQ 15 | 110 | #define LAST_VM86_IRQ 15 |
| 110 | #define invalid_vm86_irq(irq) ((irq) < 3 || (irq) > 15) | 111 | #define invalid_vm86_irq(irq) ((irq) < 3 || (irq) > 15) |
| 111 | 112 | ||
| 112 | #if !defined(CONFIG_X86_VOYAGER) | 113 | #ifdef CONFIG_X86_64 |
| 114 | # if NR_CPUS < MAX_IO_APICS | ||
| 115 | # define NR_IRQS (NR_VECTORS + (32 * NR_CPUS)) | ||
| 116 | # else | ||
| 117 | # define NR_IRQS (NR_VECTORS + (32 * MAX_IO_APICS)) | ||
| 118 | # endif | ||
| 119 | # define NR_IRQ_VECTORS NR_IRQS | ||
| 120 | |||
| 121 | #elif !defined(CONFIG_X86_VOYAGER) | ||
| 113 | 122 | ||
| 114 | # if defined(CONFIG_X86_IO_APIC) || defined(CONFIG_PARAVIRT) || defined(CONFIG_X86_VISWS) | 123 | # if defined(CONFIG_X86_IO_APIC) || defined(CONFIG_PARAVIRT) || defined(CONFIG_X86_VISWS) |
| 115 | 124 | ||
diff --git a/include/asm-x86/kexec.h b/include/asm-x86/kexec.h index c0e52a14fd4d..4246ab7dc988 100644 --- a/include/asm-x86/kexec.h +++ b/include/asm-x86/kexec.h | |||
| @@ -41,6 +41,10 @@ | |||
| 41 | # define PAGES_NR 17 | 41 | # define PAGES_NR 17 |
| 42 | #endif | 42 | #endif |
| 43 | 43 | ||
| 44 | #ifdef CONFIG_X86_32 | ||
| 45 | # define KEXEC_CONTROL_CODE_MAX_SIZE 2048 | ||
| 46 | #endif | ||
| 47 | |||
| 44 | #ifndef __ASSEMBLY__ | 48 | #ifndef __ASSEMBLY__ |
| 45 | 49 | ||
| 46 | #include <linux/string.h> | 50 | #include <linux/string.h> |
| @@ -63,7 +67,7 @@ | |||
| 63 | /* Maximum address we can use for the control code buffer */ | 67 | /* Maximum address we can use for the control code buffer */ |
| 64 | # define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE | 68 | # define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE |
| 65 | 69 | ||
| 66 | # define KEXEC_CONTROL_CODE_SIZE 4096 | 70 | # define KEXEC_CONTROL_PAGE_SIZE 4096 |
| 67 | 71 | ||
| 68 | /* The native architecture */ | 72 | /* The native architecture */ |
| 69 | # define KEXEC_ARCH KEXEC_ARCH_386 | 73 | # define KEXEC_ARCH KEXEC_ARCH_386 |
| @@ -79,7 +83,7 @@ | |||
| 79 | # define KEXEC_CONTROL_MEMORY_LIMIT (0xFFFFFFFFFFUL) | 83 | # define KEXEC_CONTROL_MEMORY_LIMIT (0xFFFFFFFFFFUL) |
| 80 | 84 | ||
| 81 | /* Allocate one page for the pdp and the second for the code */ | 85 | /* Allocate one page for the pdp and the second for the code */ |
| 82 | # define KEXEC_CONTROL_CODE_SIZE (4096UL + 4096UL) | 86 | # define KEXEC_CONTROL_PAGE_SIZE (4096UL + 4096UL) |
| 83 | 87 | ||
| 84 | /* The native architecture */ | 88 | /* The native architecture */ |
| 85 | # define KEXEC_ARCH KEXEC_ARCH_X86_64 | 89 | # define KEXEC_ARCH KEXEC_ARCH_X86_64 |
diff --git a/include/asm-x86/kvm_host.h b/include/asm-x86/kvm_host.h index 0f3c53114614..c2e34c275900 100644 --- a/include/asm-x86/kvm_host.h +++ b/include/asm-x86/kvm_host.h | |||
| @@ -722,7 +722,7 @@ asmlinkage void kvm_handle_fault_on_reboot(void); | |||
| 722 | 722 | ||
| 723 | #define __kvm_handle_fault_on_reboot(insn) \ | 723 | #define __kvm_handle_fault_on_reboot(insn) \ |
| 724 | "666: " insn "\n\t" \ | 724 | "666: " insn "\n\t" \ |
| 725 | ".pushsection .text.fixup, \"ax\" \n" \ | 725 | ".pushsection .fixup, \"ax\" \n" \ |
| 726 | "667: \n\t" \ | 726 | "667: \n\t" \ |
| 727 | KVM_EX_PUSH " $666b \n\t" \ | 727 | KVM_EX_PUSH " $666b \n\t" \ |
| 728 | "jmp kvm_handle_fault_on_reboot \n\t" \ | 728 | "jmp kvm_handle_fault_on_reboot \n\t" \ |
diff --git a/include/asm-x86/mce.h b/include/asm-x86/mce.h index 94f1fd79e22a..531eaa587455 100644 --- a/include/asm-x86/mce.h +++ b/include/asm-x86/mce.h | |||
| @@ -92,6 +92,7 @@ extern int mce_disabled; | |||
| 92 | 92 | ||
| 93 | void mce_log(struct mce *m); | 93 | void mce_log(struct mce *m); |
| 94 | DECLARE_PER_CPU(struct sys_device, device_mce); | 94 | DECLARE_PER_CPU(struct sys_device, device_mce); |
| 95 | extern void (*threshold_cpu_callback)(unsigned long action, unsigned int cpu); | ||
| 95 | 96 | ||
| 96 | #ifdef CONFIG_X86_MCE_INTEL | 97 | #ifdef CONFIG_X86_MCE_INTEL |
| 97 | void mce_intel_feature_init(struct cpuinfo_x86 *c); | 98 | void mce_intel_feature_init(struct cpuinfo_x86 *c); |
diff --git a/include/asm-x86/mman.h b/include/asm-x86/mman.h index c1682b542daf..90bc4108a4fd 100644 --- a/include/asm-x86/mman.h +++ b/include/asm-x86/mman.h | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #define MAP_NORESERVE 0x4000 /* don't check for reservations */ | 12 | #define MAP_NORESERVE 0x4000 /* don't check for reservations */ |
| 13 | #define MAP_POPULATE 0x8000 /* populate (prefault) pagetables */ | 13 | #define MAP_POPULATE 0x8000 /* populate (prefault) pagetables */ |
| 14 | #define MAP_NONBLOCK 0x10000 /* do not block on IO */ | 14 | #define MAP_NONBLOCK 0x10000 /* do not block on IO */ |
| 15 | #define MAP_STACK 0x20000 /* give out an address that is best suited for process/thread stacks */ | ||
| 15 | 16 | ||
| 16 | #define MCL_CURRENT 1 /* lock all current mappings */ | 17 | #define MCL_CURRENT 1 /* lock all current mappings */ |
| 17 | #define MCL_FUTURE 2 /* lock all future mappings */ | 18 | #define MCL_FUTURE 2 /* lock all future mappings */ |
diff --git a/include/asm-x86/mmconfig.h b/include/asm-x86/mmconfig.h index 95beda07c6fa..e293ab81e850 100644 --- a/include/asm-x86/mmconfig.h +++ b/include/asm-x86/mmconfig.h | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | 3 | ||
| 4 | #ifdef CONFIG_PCI_MMCONFIG | 4 | #ifdef CONFIG_PCI_MMCONFIG |
| 5 | extern void __cpuinit fam10h_check_enable_mmcfg(void); | 5 | extern void __cpuinit fam10h_check_enable_mmcfg(void); |
| 6 | extern void __init check_enable_amd_mmconf_dmi(void); | 6 | extern void __cpuinit check_enable_amd_mmconf_dmi(void); |
| 7 | #else | 7 | #else |
| 8 | static inline void fam10h_check_enable_mmcfg(void) { } | 8 | static inline void fam10h_check_enable_mmcfg(void) { } |
| 9 | static inline void check_enable_amd_mmconf_dmi(void) { } | 9 | static inline void check_enable_amd_mmconf_dmi(void) { } |
diff --git a/include/asm-x86/mmzone_32.h b/include/asm-x86/mmzone_32.h index b2298a227567..5862e6460658 100644 --- a/include/asm-x86/mmzone_32.h +++ b/include/asm-x86/mmzone_32.h | |||
| @@ -97,10 +97,16 @@ static inline int pfn_valid(int pfn) | |||
| 97 | reserve_bootmem_node(NODE_DATA(0), (addr), (size), (flags)) | 97 | reserve_bootmem_node(NODE_DATA(0), (addr), (size), (flags)) |
| 98 | #define alloc_bootmem(x) \ | 98 | #define alloc_bootmem(x) \ |
| 99 | __alloc_bootmem_node(NODE_DATA(0), (x), SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS)) | 99 | __alloc_bootmem_node(NODE_DATA(0), (x), SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS)) |
| 100 | #define alloc_bootmem_nopanic(x) \ | ||
| 101 | __alloc_bootmem_node_nopanic(NODE_DATA(0), (x), SMP_CACHE_BYTES, \ | ||
| 102 | __pa(MAX_DMA_ADDRESS)) | ||
| 100 | #define alloc_bootmem_low(x) \ | 103 | #define alloc_bootmem_low(x) \ |
| 101 | __alloc_bootmem_node(NODE_DATA(0), (x), SMP_CACHE_BYTES, 0) | 104 | __alloc_bootmem_node(NODE_DATA(0), (x), SMP_CACHE_BYTES, 0) |
| 102 | #define alloc_bootmem_pages(x) \ | 105 | #define alloc_bootmem_pages(x) \ |
| 103 | __alloc_bootmem_node(NODE_DATA(0), (x), PAGE_SIZE, __pa(MAX_DMA_ADDRESS)) | 106 | __alloc_bootmem_node(NODE_DATA(0), (x), PAGE_SIZE, __pa(MAX_DMA_ADDRESS)) |
| 107 | #define alloc_bootmem_pages_nopanic(x) \ | ||
| 108 | __alloc_bootmem_node_nopanic(NODE_DATA(0), (x), PAGE_SIZE, \ | ||
| 109 | __pa(MAX_DMA_ADDRESS)) | ||
| 104 | #define alloc_bootmem_low_pages(x) \ | 110 | #define alloc_bootmem_low_pages(x) \ |
| 105 | __alloc_bootmem_node(NODE_DATA(0), (x), PAGE_SIZE, 0) | 111 | __alloc_bootmem_node(NODE_DATA(0), (x), PAGE_SIZE, 0) |
| 106 | #define alloc_bootmem_node(pgdat, x) \ | 112 | #define alloc_bootmem_node(pgdat, x) \ |
diff --git a/include/asm-x86/msr.h b/include/asm-x86/msr.h index ca110ee73f07..2362cfda1fbc 100644 --- a/include/asm-x86/msr.h +++ b/include/asm-x86/msr.h | |||
| @@ -52,14 +52,14 @@ static inline unsigned long long native_read_msr_safe(unsigned int msr, | |||
| 52 | { | 52 | { |
| 53 | DECLARE_ARGS(val, low, high); | 53 | DECLARE_ARGS(val, low, high); |
| 54 | 54 | ||
| 55 | asm volatile("2: rdmsr ; xor %0,%0\n" | 55 | asm volatile("2: rdmsr ; xor %[err],%[err]\n" |
| 56 | "1:\n\t" | 56 | "1:\n\t" |
| 57 | ".section .fixup,\"ax\"\n\t" | 57 | ".section .fixup,\"ax\"\n\t" |
| 58 | "3: mov %3,%0 ; jmp 1b\n\t" | 58 | "3: mov %[fault],%[err] ; jmp 1b\n\t" |
| 59 | ".previous\n\t" | 59 | ".previous\n\t" |
| 60 | _ASM_EXTABLE(2b, 3b) | 60 | _ASM_EXTABLE(2b, 3b) |
| 61 | : "=r" (*err), EAX_EDX_RET(val, low, high) | 61 | : [err] "=r" (*err), EAX_EDX_RET(val, low, high) |
| 62 | : "c" (msr), "i" (-EFAULT)); | 62 | : "c" (msr), [fault] "i" (-EFAULT)); |
| 63 | return EAX_EDX_VAL(val, low, high); | 63 | return EAX_EDX_VAL(val, low, high); |
| 64 | } | 64 | } |
| 65 | 65 | ||
| @@ -73,15 +73,15 @@ static inline int native_write_msr_safe(unsigned int msr, | |||
| 73 | unsigned low, unsigned high) | 73 | unsigned low, unsigned high) |
| 74 | { | 74 | { |
| 75 | int err; | 75 | int err; |
| 76 | asm volatile("2: wrmsr ; xor %0,%0\n" | 76 | asm volatile("2: wrmsr ; xor %[err],%[err]\n" |
| 77 | "1:\n\t" | 77 | "1:\n\t" |
| 78 | ".section .fixup,\"ax\"\n\t" | 78 | ".section .fixup,\"ax\"\n\t" |
| 79 | "3: mov %4,%0 ; jmp 1b\n\t" | 79 | "3: mov %[fault],%[err] ; jmp 1b\n\t" |
| 80 | ".previous\n\t" | 80 | ".previous\n\t" |
| 81 | _ASM_EXTABLE(2b, 3b) | 81 | _ASM_EXTABLE(2b, 3b) |
| 82 | : "=a" (err) | 82 | : [err] "=a" (err) |
| 83 | : "c" (msr), "0" (low), "d" (high), | 83 | : "c" (msr), "0" (low), "d" (high), |
| 84 | "i" (-EFAULT) | 84 | [fault] "i" (-EFAULT) |
| 85 | : "memory"); | 85 | : "memory"); |
| 86 | return err; | 86 | return err; |
| 87 | } | 87 | } |
| @@ -192,19 +192,20 @@ do { \ | |||
| 192 | #define write_rdtscp_aux(val) wrmsr(0xc0000103, (val), 0) | 192 | #define write_rdtscp_aux(val) wrmsr(0xc0000103, (val), 0) |
| 193 | 193 | ||
| 194 | #ifdef CONFIG_SMP | 194 | #ifdef CONFIG_SMP |
| 195 | void rdmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h); | 195 | int rdmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h); |
| 196 | void wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h); | 196 | int wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h); |
| 197 | int rdmsr_safe_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h); | 197 | int rdmsr_safe_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h); |
| 198 | |||
| 199 | int wrmsr_safe_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h); | 198 | int wrmsr_safe_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h); |
| 200 | #else /* CONFIG_SMP */ | 199 | #else /* CONFIG_SMP */ |
| 201 | static inline void rdmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h) | 200 | static inline int rdmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h) |
| 202 | { | 201 | { |
| 203 | rdmsr(msr_no, *l, *h); | 202 | rdmsr(msr_no, *l, *h); |
| 203 | return 0; | ||
| 204 | } | 204 | } |
| 205 | static inline void wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h) | 205 | static inline int wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h) |
| 206 | { | 206 | { |
| 207 | wrmsr(msr_no, l, h); | 207 | wrmsr(msr_no, l, h); |
| 208 | return 0; | ||
| 208 | } | 209 | } |
| 209 | static inline int rdmsr_safe_on_cpu(unsigned int cpu, u32 msr_no, | 210 | static inline int rdmsr_safe_on_cpu(unsigned int cpu, u32 msr_no, |
| 210 | u32 *l, u32 *h) | 211 | u32 *l, u32 *h) |
diff --git a/include/asm-x86/percpu.h b/include/asm-x86/percpu.h index 4e91ee1e37aa..f643a3a92da0 100644 --- a/include/asm-x86/percpu.h +++ b/include/asm-x86/percpu.h | |||
| @@ -182,7 +182,7 @@ do { \ | |||
| 182 | DEFINE_PER_CPU(_type, _name) = _initvalue; \ | 182 | DEFINE_PER_CPU(_type, _name) = _initvalue; \ |
| 183 | __typeof__(_type) _name##_early_map[NR_CPUS] __initdata = \ | 183 | __typeof__(_type) _name##_early_map[NR_CPUS] __initdata = \ |
| 184 | { [0 ... NR_CPUS-1] = _initvalue }; \ | 184 | { [0 ... NR_CPUS-1] = _initvalue }; \ |
| 185 | __typeof__(_type) *_name##_early_ptr = _name##_early_map | 185 | __typeof__(_type) *_name##_early_ptr __refdata = _name##_early_map |
| 186 | 186 | ||
| 187 | #define EXPORT_EARLY_PER_CPU_SYMBOL(_name) \ | 187 | #define EXPORT_EARLY_PER_CPU_SYMBOL(_name) \ |
| 188 | EXPORT_PER_CPU_SYMBOL(_name) | 188 | EXPORT_PER_CPU_SYMBOL(_name) |
diff --git a/include/asm-x86/pgtable_64.h b/include/asm-x86/pgtable_64.h index ac5fff4cc58a..549144d03d99 100644 --- a/include/asm-x86/pgtable_64.h +++ b/include/asm-x86/pgtable_64.h | |||
| @@ -151,7 +151,7 @@ static inline void native_pgd_clear(pgd_t *pgd) | |||
| 151 | #define VMALLOC_END _AC(0xffffe1ffffffffff, UL) | 151 | #define VMALLOC_END _AC(0xffffe1ffffffffff, UL) |
| 152 | #define VMEMMAP_START _AC(0xffffe20000000000, UL) | 152 | #define VMEMMAP_START _AC(0xffffe20000000000, UL) |
| 153 | #define MODULES_VADDR _AC(0xffffffffa0000000, UL) | 153 | #define MODULES_VADDR _AC(0xffffffffa0000000, UL) |
| 154 | #define MODULES_END _AC(0xfffffffffff00000, UL) | 154 | #define MODULES_END _AC(0xffffffffff000000, UL) |
| 155 | #define MODULES_LEN (MODULES_END - MODULES_VADDR) | 155 | #define MODULES_LEN (MODULES_END - MODULES_VADDR) |
| 156 | 156 | ||
| 157 | #ifndef __ASSEMBLY__ | 157 | #ifndef __ASSEMBLY__ |
diff --git a/include/asm-x86/processor.h b/include/asm-x86/processor.h index 5f58da401b43..4df3e2f6fb56 100644 --- a/include/asm-x86/processor.h +++ b/include/asm-x86/processor.h | |||
| @@ -728,6 +728,29 @@ extern unsigned long boot_option_idle_override; | |||
| 728 | extern unsigned long idle_halt; | 728 | extern unsigned long idle_halt; |
| 729 | extern unsigned long idle_nomwait; | 729 | extern unsigned long idle_nomwait; |
| 730 | 730 | ||
| 731 | /* | ||
| 732 | * on systems with caches, caches must be flashed as the absolute | ||
| 733 | * last instruction before going into a suspended halt. Otherwise, | ||
| 734 | * dirty data can linger in the cache and become stale on resume, | ||
| 735 | * leading to strange errors. | ||
| 736 | * | ||
| 737 | * perform a variety of operations to guarantee that the compiler | ||
| 738 | * will not reorder instructions. wbinvd itself is serializing | ||
| 739 | * so the processor will not reorder. | ||
| 740 | * | ||
| 741 | * Systems without cache can just go into halt. | ||
| 742 | */ | ||
| 743 | static inline void wbinvd_halt(void) | ||
| 744 | { | ||
| 745 | mb(); | ||
| 746 | /* check for clflush to determine if wbinvd is legal */ | ||
| 747 | if (cpu_has_clflush) | ||
| 748 | asm volatile("cli; wbinvd; 1: hlt; jmp 1b" : : : "memory"); | ||
| 749 | else | ||
| 750 | while (1) | ||
| 751 | halt(); | ||
| 752 | } | ||
| 753 | |||
| 731 | extern void enable_sep_cpu(void); | 754 | extern void enable_sep_cpu(void); |
| 732 | extern int sysenter_setup(void); | 755 | extern int sysenter_setup(void); |
| 733 | 756 | ||
diff --git a/include/asm-x86/spinlock.h b/include/asm-x86/spinlock.h index 4f9a9861799a..e39c790dbfd2 100644 --- a/include/asm-x86/spinlock.h +++ b/include/asm-x86/spinlock.h | |||
| @@ -65,7 +65,7 @@ static inline int __ticket_spin_is_contended(raw_spinlock_t *lock) | |||
| 65 | { | 65 | { |
| 66 | int tmp = ACCESS_ONCE(lock->slock); | 66 | int tmp = ACCESS_ONCE(lock->slock); |
| 67 | 67 | ||
| 68 | return (((tmp >> 8) & 0xff) - (tmp & 0xff)) > 1; | 68 | return (((tmp >> 8) - tmp) & 0xff) > 1; |
| 69 | } | 69 | } |
| 70 | 70 | ||
| 71 | static __always_inline void __ticket_spin_lock(raw_spinlock_t *lock) | 71 | static __always_inline void __ticket_spin_lock(raw_spinlock_t *lock) |
| @@ -127,7 +127,7 @@ static inline int __ticket_spin_is_contended(raw_spinlock_t *lock) | |||
| 127 | { | 127 | { |
| 128 | int tmp = ACCESS_ONCE(lock->slock); | 128 | int tmp = ACCESS_ONCE(lock->slock); |
| 129 | 129 | ||
| 130 | return (((tmp >> 16) & 0xffff) - (tmp & 0xffff)) > 1; | 130 | return (((tmp >> 16) - tmp) & 0xffff) > 1; |
| 131 | } | 131 | } |
| 132 | 132 | ||
| 133 | static __always_inline void __ticket_spin_lock(raw_spinlock_t *lock) | 133 | static __always_inline void __ticket_spin_lock(raw_spinlock_t *lock) |
diff --git a/include/asm-x86/uv/uv_bau.h b/include/asm-x86/uv/uv_bau.h index 91ac0dfb7588..610b6b308e93 100644 --- a/include/asm-x86/uv/uv_bau.h +++ b/include/asm-x86/uv/uv_bau.h | |||
| @@ -40,11 +40,6 @@ | |||
| 40 | #define UV_ACTIVATION_DESCRIPTOR_SIZE 32 | 40 | #define UV_ACTIVATION_DESCRIPTOR_SIZE 32 |
| 41 | #define UV_DISTRIBUTION_SIZE 256 | 41 | #define UV_DISTRIBUTION_SIZE 256 |
| 42 | #define UV_SW_ACK_NPENDING 8 | 42 | #define UV_SW_ACK_NPENDING 8 |
| 43 | #define UV_BAU_MESSAGE 200 | ||
| 44 | /* | ||
| 45 | * Messaging irq; see irq_64.h and include/asm-x86/hw_irq_64.h | ||
| 46 | * To be dynamically allocated in the future | ||
| 47 | */ | ||
| 48 | #define UV_NET_ENDPOINT_INTD 0x38 | 43 | #define UV_NET_ENDPOINT_INTD 0x38 |
| 49 | #define UV_DESC_BASE_PNODE_SHIFT 49 | 44 | #define UV_DESC_BASE_PNODE_SHIFT 49 |
| 50 | #define UV_PAYLOADQ_PNODE_SHIFT 49 | 45 | #define UV_PAYLOADQ_PNODE_SHIFT 49 |
diff --git a/include/asm-x86/xen/hypervisor.h b/include/asm-x86/xen/hypervisor.h index 8e15dd28c91f..04ee0610014a 100644 --- a/include/asm-x86/xen/hypervisor.h +++ b/include/asm-x86/xen/hypervisor.h | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | 35 | ||
| 36 | #include <linux/types.h> | 36 | #include <linux/types.h> |
| 37 | #include <linux/kernel.h> | 37 | #include <linux/kernel.h> |
| 38 | #include <linux/version.h> | ||
| 39 | 38 | ||
| 40 | #include <xen/interface/xen.h> | 39 | #include <xen/interface/xen.h> |
| 41 | #include <xen/interface/version.h> | 40 | #include <xen/interface/version.h> |
diff --git a/include/crypto/hash.h b/include/crypto/hash.h index d12498ec8a4e..ee48ef8fb2ea 100644 --- a/include/crypto/hash.h +++ b/include/crypto/hash.h | |||
| @@ -101,6 +101,24 @@ static inline int crypto_ahash_digest(struct ahash_request *req) | |||
| 101 | return crt->digest(req); | 101 | return crt->digest(req); |
| 102 | } | 102 | } |
| 103 | 103 | ||
| 104 | static inline int crypto_ahash_init(struct ahash_request *req) | ||
| 105 | { | ||
| 106 | struct ahash_tfm *crt = crypto_ahash_crt(crypto_ahash_reqtfm(req)); | ||
| 107 | return crt->init(req); | ||
| 108 | } | ||
| 109 | |||
| 110 | static inline int crypto_ahash_update(struct ahash_request *req) | ||
| 111 | { | ||
| 112 | struct ahash_tfm *crt = crypto_ahash_crt(crypto_ahash_reqtfm(req)); | ||
| 113 | return crt->update(req); | ||
| 114 | } | ||
| 115 | |||
| 116 | static inline int crypto_ahash_final(struct ahash_request *req) | ||
| 117 | { | ||
| 118 | struct ahash_tfm *crt = crypto_ahash_crt(crypto_ahash_reqtfm(req)); | ||
| 119 | return crt->final(req); | ||
| 120 | } | ||
| 121 | |||
| 104 | static inline void ahash_request_set_tfm(struct ahash_request *req, | 122 | static inline void ahash_request_set_tfm(struct ahash_request *req, |
| 105 | struct crypto_ahash *tfm) | 123 | struct crypto_ahash *tfm) |
| 106 | { | 124 | { |
diff --git a/include/linux/Kbuild b/include/linux/Kbuild index a26f565e8189..59391250d51c 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild | |||
| @@ -250,6 +250,8 @@ unifdef-y += isdn.h | |||
| 250 | unifdef-y += isdnif.h | 250 | unifdef-y += isdnif.h |
| 251 | unifdef-y += isdn_divertif.h | 251 | unifdef-y += isdn_divertif.h |
| 252 | unifdef-y += isdn_ppp.h | 252 | unifdef-y += isdn_ppp.h |
| 253 | unifdef-y += ivtv.h | ||
| 254 | unifdef-y += ivtvfb.h | ||
| 253 | unifdef-y += joystick.h | 255 | unifdef-y += joystick.h |
| 254 | unifdef-y += kdev_t.h | 256 | unifdef-y += kdev_t.h |
| 255 | unifdef-y += kd.h | 257 | unifdef-y += kd.h |
| @@ -295,7 +297,6 @@ unifdef-y += parport.h | |||
| 295 | unifdef-y += patchkey.h | 297 | unifdef-y += patchkey.h |
| 296 | unifdef-y += pci.h | 298 | unifdef-y += pci.h |
| 297 | unifdef-y += personality.h | 299 | unifdef-y += personality.h |
| 298 | unifdef-y += pim.h | ||
| 299 | unifdef-y += pktcdvd.h | 300 | unifdef-y += pktcdvd.h |
| 300 | unifdef-y += pmu.h | 301 | unifdef-y += pmu.h |
| 301 | unifdef-y += poll.h | 302 | unifdef-y += poll.h |
| @@ -356,6 +357,7 @@ unifdef-y += virtio_balloon.h | |||
| 356 | unifdef-y += virtio_console.h | 357 | unifdef-y += virtio_console.h |
| 357 | unifdef-y += virtio_pci.h | 358 | unifdef-y += virtio_pci.h |
| 358 | unifdef-y += virtio_ring.h | 359 | unifdef-y += virtio_ring.h |
| 360 | unifdef-y += virtio_rng.h | ||
| 359 | unifdef-y += vt.h | 361 | unifdef-y += vt.h |
| 360 | unifdef-y += wait.h | 362 | unifdef-y += wait.h |
| 361 | unifdef-y += wanrouter.h | 363 | unifdef-y += wanrouter.h |
diff --git a/include/linux/agp_backend.h b/include/linux/agp_backend.h index 972b12bcfb36..2b8df8b420fd 100644 --- a/include/linux/agp_backend.h +++ b/include/linux/agp_backend.h | |||
| @@ -30,6 +30,8 @@ | |||
| 30 | #ifndef _AGP_BACKEND_H | 30 | #ifndef _AGP_BACKEND_H |
| 31 | #define _AGP_BACKEND_H 1 | 31 | #define _AGP_BACKEND_H 1 |
| 32 | 32 | ||
| 33 | #include <linux/list.h> | ||
| 34 | |||
| 33 | enum chipset_type { | 35 | enum chipset_type { |
| 34 | NOT_SUPPORTED, | 36 | NOT_SUPPORTED, |
| 35 | SUPPORTED, | 37 | SUPPORTED, |
| @@ -78,6 +80,8 @@ struct agp_memory { | |||
| 78 | bool is_bound; | 80 | bool is_bound; |
| 79 | bool is_flushed; | 81 | bool is_flushed; |
| 80 | bool vmalloc_flag; | 82 | bool vmalloc_flag; |
| 83 | /* list of agp_memory mapped to the aperture */ | ||
| 84 | struct list_head mapped_list; | ||
| 81 | }; | 85 | }; |
| 82 | 86 | ||
| 83 | #define AGP_NORMAL_MEMORY 0 | 87 | #define AGP_NORMAL_MEMORY 0 |
| @@ -96,6 +100,7 @@ extern struct agp_memory *agp_allocate_memory(struct agp_bridge_data *, size_t, | |||
| 96 | extern int agp_copy_info(struct agp_bridge_data *, struct agp_kern_info *); | 100 | extern int agp_copy_info(struct agp_bridge_data *, struct agp_kern_info *); |
| 97 | extern int agp_bind_memory(struct agp_memory *, off_t); | 101 | extern int agp_bind_memory(struct agp_memory *, off_t); |
| 98 | extern int agp_unbind_memory(struct agp_memory *); | 102 | extern int agp_unbind_memory(struct agp_memory *); |
| 103 | extern int agp_rebind_memory(void); | ||
| 99 | extern void agp_enable(struct agp_bridge_data *, u32); | 104 | extern void agp_enable(struct agp_bridge_data *, u32); |
| 100 | extern struct agp_bridge_data *agp_backend_acquire(struct pci_dev *); | 105 | extern struct agp_bridge_data *agp_backend_acquire(struct pci_dev *); |
| 101 | extern void agp_backend_release(struct agp_bridge_data *); | 106 | extern void agp_backend_release(struct agp_bridge_data *); |
diff --git a/include/linux/ata.h b/include/linux/ata.h index 1c622e2b0504..1ce19c1ef0e9 100644 --- a/include/linux/ata.h +++ b/include/linux/ata.h | |||
| @@ -46,18 +46,48 @@ enum { | |||
| 46 | ATA_MAX_SECTORS_TAPE = 65535, | 46 | ATA_MAX_SECTORS_TAPE = 65535, |
| 47 | 47 | ||
| 48 | ATA_ID_WORDS = 256, | 48 | ATA_ID_WORDS = 256, |
| 49 | ATA_ID_CONFIG = 0, | ||
| 50 | ATA_ID_CYLS = 1, | ||
| 51 | ATA_ID_HEADS = 3, | ||
| 52 | ATA_ID_SECTORS = 6, | ||
| 49 | ATA_ID_SERNO = 10, | 53 | ATA_ID_SERNO = 10, |
| 54 | ATA_ID_BUF_SIZE = 21, | ||
| 50 | ATA_ID_FW_REV = 23, | 55 | ATA_ID_FW_REV = 23, |
| 51 | ATA_ID_PROD = 27, | 56 | ATA_ID_PROD = 27, |
| 57 | ATA_ID_MAX_MULTSECT = 47, | ||
| 58 | ATA_ID_DWORD_IO = 48, | ||
| 59 | ATA_ID_CAPABILITY = 49, | ||
| 52 | ATA_ID_OLD_PIO_MODES = 51, | 60 | ATA_ID_OLD_PIO_MODES = 51, |
| 61 | ATA_ID_OLD_DMA_MODES = 52, | ||
| 53 | ATA_ID_FIELD_VALID = 53, | 62 | ATA_ID_FIELD_VALID = 53, |
| 63 | ATA_ID_CUR_CYLS = 54, | ||
| 64 | ATA_ID_CUR_HEADS = 55, | ||
| 65 | ATA_ID_CUR_SECTORS = 56, | ||
| 66 | ATA_ID_MULTSECT = 59, | ||
| 67 | ATA_ID_LBA_CAPACITY = 60, | ||
| 68 | ATA_ID_SWDMA_MODES = 62, | ||
| 54 | ATA_ID_MWDMA_MODES = 63, | 69 | ATA_ID_MWDMA_MODES = 63, |
| 55 | ATA_ID_PIO_MODES = 64, | 70 | ATA_ID_PIO_MODES = 64, |
| 56 | ATA_ID_EIDE_DMA_MIN = 65, | 71 | ATA_ID_EIDE_DMA_MIN = 65, |
| 72 | ATA_ID_EIDE_DMA_TIME = 66, | ||
| 57 | ATA_ID_EIDE_PIO = 67, | 73 | ATA_ID_EIDE_PIO = 67, |
| 58 | ATA_ID_EIDE_PIO_IORDY = 68, | 74 | ATA_ID_EIDE_PIO_IORDY = 68, |
| 59 | ATA_ID_UDMA_MODES = 88, | 75 | ATA_ID_QUEUE_DEPTH = 75, |
| 60 | ATA_ID_MAJOR_VER = 80, | 76 | ATA_ID_MAJOR_VER = 80, |
| 77 | ATA_ID_COMMAND_SET_1 = 82, | ||
| 78 | ATA_ID_COMMAND_SET_2 = 83, | ||
| 79 | ATA_ID_CFSSE = 84, | ||
| 80 | ATA_ID_CFS_ENABLE_1 = 85, | ||
| 81 | ATA_ID_CFS_ENABLE_2 = 86, | ||
| 82 | ATA_ID_CSF_DEFAULT = 87, | ||
| 83 | ATA_ID_UDMA_MODES = 88, | ||
| 84 | ATA_ID_HW_CONFIG = 93, | ||
| 85 | ATA_ID_SPG = 98, | ||
| 86 | ATA_ID_LBA_CAPACITY_2 = 100, | ||
| 87 | ATA_ID_LAST_LUN = 126, | ||
| 88 | ATA_ID_DLF = 128, | ||
| 89 | ATA_ID_CSFO = 129, | ||
| 90 | ATA_ID_CFA_POWER = 160, | ||
| 61 | ATA_ID_PIO4 = (1 << 1), | 91 | ATA_ID_PIO4 = (1 << 1), |
| 62 | 92 | ||
| 63 | ATA_ID_SERNO_LEN = 20, | 93 | ATA_ID_SERNO_LEN = 20, |
| @@ -123,13 +153,26 @@ enum { | |||
| 123 | ATA_BUSY = (1 << 7), /* BSY status bit */ | 153 | ATA_BUSY = (1 << 7), /* BSY status bit */ |
| 124 | ATA_DRDY = (1 << 6), /* device ready */ | 154 | ATA_DRDY = (1 << 6), /* device ready */ |
| 125 | ATA_DF = (1 << 5), /* device fault */ | 155 | ATA_DF = (1 << 5), /* device fault */ |
| 156 | ATA_DSC = (1 << 4), /* drive seek complete */ | ||
| 126 | ATA_DRQ = (1 << 3), /* data request i/o */ | 157 | ATA_DRQ = (1 << 3), /* data request i/o */ |
| 158 | ATA_CORR = (1 << 2), /* corrected data error */ | ||
| 159 | ATA_IDX = (1 << 1), /* index */ | ||
| 127 | ATA_ERR = (1 << 0), /* have an error */ | 160 | ATA_ERR = (1 << 0), /* have an error */ |
| 128 | ATA_SRST = (1 << 2), /* software reset */ | 161 | ATA_SRST = (1 << 2), /* software reset */ |
| 129 | ATA_ICRC = (1 << 7), /* interface CRC error */ | 162 | ATA_ICRC = (1 << 7), /* interface CRC error */ |
| 163 | ATA_BBK = ATA_ICRC, /* pre-EIDE: block marked bad */ | ||
| 130 | ATA_UNC = (1 << 6), /* uncorrectable media error */ | 164 | ATA_UNC = (1 << 6), /* uncorrectable media error */ |
| 165 | ATA_MC = (1 << 5), /* media changed */ | ||
| 131 | ATA_IDNF = (1 << 4), /* ID not found */ | 166 | ATA_IDNF = (1 << 4), /* ID not found */ |
| 167 | ATA_MCR = (1 << 3), /* media change requested */ | ||
| 132 | ATA_ABORTED = (1 << 2), /* command aborted */ | 168 | ATA_ABORTED = (1 << 2), /* command aborted */ |
| 169 | ATA_TRK0NF = (1 << 1), /* track 0 not found */ | ||
| 170 | ATA_AMNF = (1 << 0), /* address mark not found */ | ||
| 171 | ATAPI_LFS = 0xF0, /* last failed sense */ | ||
| 172 | ATAPI_EOM = ATA_TRK0NF, /* end of media */ | ||
| 173 | ATAPI_ILI = ATA_AMNF, /* illegal length indication */ | ||
| 174 | ATAPI_IO = (1 << 1), | ||
| 175 | ATAPI_COD = (1 << 0), | ||
| 133 | 176 | ||
| 134 | /* ATA command block registers */ | 177 | /* ATA command block registers */ |
| 135 | ATA_REG_DATA = 0x00, | 178 | ATA_REG_DATA = 0x00, |
| @@ -192,6 +235,13 @@ enum { | |||
| 192 | ATA_CMD_PMP_WRITE = 0xE8, | 235 | ATA_CMD_PMP_WRITE = 0xE8, |
| 193 | ATA_CMD_CONF_OVERLAY = 0xB1, | 236 | ATA_CMD_CONF_OVERLAY = 0xB1, |
| 194 | ATA_CMD_SEC_FREEZE_LOCK = 0xF5, | 237 | ATA_CMD_SEC_FREEZE_LOCK = 0xF5, |
| 238 | ATA_CMD_SMART = 0xB0, | ||
| 239 | ATA_CMD_MEDIA_LOCK = 0xDE, | ||
| 240 | ATA_CMD_MEDIA_UNLOCK = 0xDF, | ||
| 241 | /* marked obsolete in the ATA/ATAPI-7 spec */ | ||
| 242 | ATA_CMD_RESTORE = 0x10, | ||
| 243 | /* EXABYTE specific */ | ||
| 244 | ATA_EXABYTE_ENABLE_NEST = 0xF0, | ||
| 195 | 245 | ||
| 196 | /* READ_LOG_EXT pages */ | 246 | /* READ_LOG_EXT pages */ |
| 197 | ATA_LOG_SATA_NCQ = 0x10, | 247 | ATA_LOG_SATA_NCQ = 0x10, |
| @@ -232,6 +282,10 @@ enum { | |||
| 232 | SETFEATURES_WC_ON = 0x02, /* Enable write cache */ | 282 | SETFEATURES_WC_ON = 0x02, /* Enable write cache */ |
| 233 | SETFEATURES_WC_OFF = 0x82, /* Disable write cache */ | 283 | SETFEATURES_WC_OFF = 0x82, /* Disable write cache */ |
| 234 | 284 | ||
| 285 | /* Enable/Disable Automatic Acoustic Management */ | ||
| 286 | SETFEATURES_AAM_ON = 0x42, | ||
| 287 | SETFEATURES_AAM_OFF = 0xC2, | ||
| 288 | |||
| 235 | SETFEATURES_SPINUP = 0x07, /* Spin-up drive */ | 289 | SETFEATURES_SPINUP = 0x07, /* Spin-up drive */ |
| 236 | 290 | ||
| 237 | SETFEATURES_SATA_ENABLE = 0x10, /* Enable use of SATA feature */ | 291 | SETFEATURES_SATA_ENABLE = 0x10, /* Enable use of SATA feature */ |
| @@ -254,6 +308,15 @@ enum { | |||
| 254 | ATA_DCO_IDENTIFY = 0xC2, | 308 | ATA_DCO_IDENTIFY = 0xC2, |
| 255 | ATA_DCO_SET = 0xC3, | 309 | ATA_DCO_SET = 0xC3, |
| 256 | 310 | ||
| 311 | /* feature values for SMART */ | ||
| 312 | ATA_SMART_ENABLE = 0xD8, | ||
| 313 | ATA_SMART_READ_VALUES = 0xD0, | ||
| 314 | ATA_SMART_READ_THRESHOLDS = 0xD1, | ||
| 315 | |||
| 316 | /* password used in LBA Mid / LBA High for executing SMART commands */ | ||
| 317 | ATA_SMART_LBAM_PASS = 0x4F, | ||
| 318 | ATA_SMART_LBAH_PASS = 0xC2, | ||
| 319 | |||
| 257 | /* ATAPI stuff */ | 320 | /* ATAPI stuff */ |
| 258 | ATAPI_PKT_DMA = (1 << 0), | 321 | ATAPI_PKT_DMA = (1 << 0), |
| 259 | ATAPI_DMADIR = (1 << 2), /* ATAPI data dir: | 322 | ATAPI_DMADIR = (1 << 2), /* ATAPI data dir: |
| @@ -438,17 +501,17 @@ static inline int ata_is_data(u8 prot) | |||
| 438 | /* | 501 | /* |
| 439 | * id tests | 502 | * id tests |
| 440 | */ | 503 | */ |
| 441 | #define ata_id_is_ata(id) (((id)[0] & (1 << 15)) == 0) | 504 | #define ata_id_is_ata(id) (((id)[ATA_ID_CONFIG] & (1 << 15)) == 0) |
| 442 | #define ata_id_has_lba(id) ((id)[49] & (1 << 9)) | 505 | #define ata_id_has_lba(id) ((id)[ATA_ID_CAPABILITY] & (1 << 9)) |
| 443 | #define ata_id_has_dma(id) ((id)[49] & (1 << 8)) | 506 | #define ata_id_has_dma(id) ((id)[ATA_ID_CAPABILITY] & (1 << 8)) |
| 444 | #define ata_id_has_ncq(id) ((id)[76] & (1 << 8)) | 507 | #define ata_id_has_ncq(id) ((id)[76] & (1 << 8)) |
| 445 | #define ata_id_queue_depth(id) (((id)[75] & 0x1f) + 1) | 508 | #define ata_id_queue_depth(id) (((id)[ATA_ID_QUEUE_DEPTH] & 0x1f) + 1) |
| 446 | #define ata_id_removeable(id) ((id)[0] & (1 << 7)) | 509 | #define ata_id_removeable(id) ((id)[ATA_ID_CONFIG] & (1 << 7)) |
| 447 | #define ata_id_has_atapi_AN(id) \ | 510 | #define ata_id_has_atapi_AN(id) \ |
| 448 | ( (((id)[76] != 0x0000) && ((id)[76] != 0xffff)) && \ | 511 | ( (((id)[76] != 0x0000) && ((id)[76] != 0xffff)) && \ |
| 449 | ((id)[78] & (1 << 5)) ) | 512 | ((id)[78] & (1 << 5)) ) |
| 450 | #define ata_id_iordy_disable(id) ((id)[49] & (1 << 10)) | 513 | #define ata_id_iordy_disable(id) ((id)[ATA_ID_CAPABILITY] & (1 << 10)) |
| 451 | #define ata_id_has_iordy(id) ((id)[49] & (1 << 11)) | 514 | #define ata_id_has_iordy(id) ((id)[ATA_ID_CAPABILITY] & (1 << 11)) |
| 452 | #define ata_id_u32(id,n) \ | 515 | #define ata_id_u32(id,n) \ |
| 453 | (((u32) (id)[(n) + 1] << 16) | ((u32) (id)[(n)])) | 516 | (((u32) (id)[(n) + 1] << 16) | ((u32) (id)[(n)])) |
| 454 | #define ata_id_u64(id,n) \ | 517 | #define ata_id_u64(id,n) \ |
| @@ -457,7 +520,7 @@ static inline int ata_is_data(u8 prot) | |||
| 457 | ((u64) (id)[(n) + 1] << 16) | \ | 520 | ((u64) (id)[(n) + 1] << 16) | \ |
| 458 | ((u64) (id)[(n) + 0]) ) | 521 | ((u64) (id)[(n) + 0]) ) |
| 459 | 522 | ||
| 460 | #define ata_id_cdb_intr(id) (((id)[0] & 0x60) == 0x20) | 523 | #define ata_id_cdb_intr(id) (((id)[ATA_ID_CONFIG] & 0x60) == 0x20) |
| 461 | 524 | ||
| 462 | static inline bool ata_id_has_hipm(const u16 *id) | 525 | static inline bool ata_id_has_hipm(const u16 *id) |
| 463 | { | 526 | { |
| @@ -482,75 +545,75 @@ static inline bool ata_id_has_dipm(const u16 *id) | |||
| 482 | 545 | ||
| 483 | static inline int ata_id_has_fua(const u16 *id) | 546 | static inline int ata_id_has_fua(const u16 *id) |
| 484 | { | 547 | { |
| 485 | if ((id[84] & 0xC000) != 0x4000) | 548 | if ((id[ATA_ID_CFSSE] & 0xC000) != 0x4000) |
| 486 | return 0; | 549 | return 0; |
| 487 | return id[84] & (1 << 6); | 550 | return id[ATA_ID_CFSSE] & (1 << 6); |
| 488 | } | 551 | } |
| 489 | 552 | ||
| 490 | static inline int ata_id_has_flush(const u16 *id) | 553 | static inline int ata_id_has_flush(const u16 *id) |
| 491 | { | 554 | { |
| 492 | if ((id[83] & 0xC000) != 0x4000) | 555 | if ((id[ATA_ID_COMMAND_SET_2] & 0xC000) != 0x4000) |
| 493 | return 0; | 556 | return 0; |
| 494 | return id[83] & (1 << 12); | 557 | return id[ATA_ID_COMMAND_SET_2] & (1 << 12); |
| 495 | } | 558 | } |
| 496 | 559 | ||
| 497 | static inline int ata_id_has_flush_ext(const u16 *id) | 560 | static inline int ata_id_has_flush_ext(const u16 *id) |
| 498 | { | 561 | { |
| 499 | if ((id[83] & 0xC000) != 0x4000) | 562 | if ((id[ATA_ID_COMMAND_SET_2] & 0xC000) != 0x4000) |
| 500 | return 0; | 563 | return 0; |
| 501 | return id[83] & (1 << 13); | 564 | return id[ATA_ID_COMMAND_SET_2] & (1 << 13); |
| 502 | } | 565 | } |
| 503 | 566 | ||
| 504 | static inline int ata_id_has_lba48(const u16 *id) | 567 | static inline int ata_id_has_lba48(const u16 *id) |
| 505 | { | 568 | { |
| 506 | if ((id[83] & 0xC000) != 0x4000) | 569 | if ((id[ATA_ID_COMMAND_SET_2] & 0xC000) != 0x4000) |
| 507 | return 0; | 570 | return 0; |
| 508 | if (!ata_id_u64(id, 100)) | 571 | if (!ata_id_u64(id, ATA_ID_LBA_CAPACITY_2)) |
| 509 | return 0; | 572 | return 0; |
| 510 | return id[83] & (1 << 10); | 573 | return id[ATA_ID_COMMAND_SET_2] & (1 << 10); |
| 511 | } | 574 | } |
| 512 | 575 | ||
| 513 | static inline int ata_id_hpa_enabled(const u16 *id) | 576 | static inline int ata_id_hpa_enabled(const u16 *id) |
| 514 | { | 577 | { |
| 515 | /* Yes children, word 83 valid bits cover word 82 data */ | 578 | /* Yes children, word 83 valid bits cover word 82 data */ |
| 516 | if ((id[83] & 0xC000) != 0x4000) | 579 | if ((id[ATA_ID_COMMAND_SET_2] & 0xC000) != 0x4000) |
| 517 | return 0; | 580 | return 0; |
| 518 | /* And 87 covers 85-87 */ | 581 | /* And 87 covers 85-87 */ |
| 519 | if ((id[87] & 0xC000) != 0x4000) | 582 | if ((id[ATA_ID_CSF_DEFAULT] & 0xC000) != 0x4000) |
| 520 | return 0; | 583 | return 0; |
| 521 | /* Check command sets enabled as well as supported */ | 584 | /* Check command sets enabled as well as supported */ |
| 522 | if ((id[85] & ( 1 << 10)) == 0) | 585 | if ((id[ATA_ID_CFS_ENABLE_1] & (1 << 10)) == 0) |
| 523 | return 0; | 586 | return 0; |
| 524 | return id[82] & (1 << 10); | 587 | return id[ATA_ID_COMMAND_SET_1] & (1 << 10); |
| 525 | } | 588 | } |
| 526 | 589 | ||
| 527 | static inline int ata_id_has_wcache(const u16 *id) | 590 | static inline int ata_id_has_wcache(const u16 *id) |
| 528 | { | 591 | { |
| 529 | /* Yes children, word 83 valid bits cover word 82 data */ | 592 | /* Yes children, word 83 valid bits cover word 82 data */ |
| 530 | if ((id[83] & 0xC000) != 0x4000) | 593 | if ((id[ATA_ID_COMMAND_SET_2] & 0xC000) != 0x4000) |
| 531 | return 0; | 594 | return 0; |
| 532 | return id[82] & (1 << 5); | 595 | return id[ATA_ID_COMMAND_SET_1] & (1 << 5); |
| 533 | } | 596 | } |
| 534 | 597 | ||
| 535 | static inline int ata_id_has_pm(const u16 *id) | 598 | static inline int ata_id_has_pm(const u16 *id) |
| 536 | { | 599 | { |
| 537 | if ((id[83] & 0xC000) != 0x4000) | 600 | if ((id[ATA_ID_COMMAND_SET_2] & 0xC000) != 0x4000) |
| 538 | return 0; | 601 | return 0; |
| 539 | return id[82] & (1 << 3); | 602 | return id[ATA_ID_COMMAND_SET_1] & (1 << 3); |
| 540 | } | 603 | } |
| 541 | 604 | ||
| 542 | static inline int ata_id_rahead_enabled(const u16 *id) | 605 | static inline int ata_id_rahead_enabled(const u16 *id) |
| 543 | { | 606 | { |
| 544 | if ((id[87] & 0xC000) != 0x4000) | 607 | if ((id[ATA_ID_CSF_DEFAULT] & 0xC000) != 0x4000) |
| 545 | return 0; | 608 | return 0; |
| 546 | return id[85] & (1 << 6); | 609 | return id[ATA_ID_CFS_ENABLE_1] & (1 << 6); |
| 547 | } | 610 | } |
| 548 | 611 | ||
| 549 | static inline int ata_id_wcache_enabled(const u16 *id) | 612 | static inline int ata_id_wcache_enabled(const u16 *id) |
| 550 | { | 613 | { |
| 551 | if ((id[87] & 0xC000) != 0x4000) | 614 | if ((id[ATA_ID_CSF_DEFAULT] & 0xC000) != 0x4000) |
| 552 | return 0; | 615 | return 0; |
| 553 | return id[85] & (1 << 5); | 616 | return id[ATA_ID_CFS_ENABLE_1] & (1 << 5); |
| 554 | } | 617 | } |
| 555 | 618 | ||
| 556 | /** | 619 | /** |
| @@ -581,7 +644,7 @@ static inline unsigned int ata_id_major_version(const u16 *id) | |||
| 581 | 644 | ||
| 582 | static inline int ata_id_is_sata(const u16 *id) | 645 | static inline int ata_id_is_sata(const u16 *id) |
| 583 | { | 646 | { |
| 584 | return ata_id_major_version(id) >= 5 && id[93] == 0; | 647 | return ata_id_major_version(id) >= 5 && id[ATA_ID_HW_CONFIG] == 0; |
| 585 | } | 648 | } |
| 586 | 649 | ||
| 587 | static inline int ata_id_has_tpm(const u16 *id) | 650 | static inline int ata_id_has_tpm(const u16 *id) |
| @@ -599,7 +662,7 @@ static inline int ata_id_has_dword_io(const u16 *id) | |||
| 599 | /* ATA 8 reuses this flag for "trusted" computing */ | 662 | /* ATA 8 reuses this flag for "trusted" computing */ |
| 600 | if (ata_id_major_version(id) > 7) | 663 | if (ata_id_major_version(id) > 7) |
| 601 | return 0; | 664 | return 0; |
| 602 | if (id[48] & (1 << 0)) | 665 | if (id[ATA_ID_DWORD_IO] & (1 << 0)) |
| 603 | return 1; | 666 | return 1; |
| 604 | return 0; | 667 | return 0; |
| 605 | } | 668 | } |
| @@ -608,22 +671,22 @@ static inline int ata_id_current_chs_valid(const u16 *id) | |||
| 608 | { | 671 | { |
| 609 | /* For ATA-1 devices, if the INITIALIZE DEVICE PARAMETERS command | 672 | /* For ATA-1 devices, if the INITIALIZE DEVICE PARAMETERS command |
| 610 | has not been issued to the device then the values of | 673 | has not been issued to the device then the values of |
| 611 | id[54] to id[56] are vendor specific. */ | 674 | id[ATA_ID_CUR_CYLS] to id[ATA_ID_CUR_SECTORS] are vendor specific. */ |
| 612 | return (id[53] & 0x01) && /* Current translation valid */ | 675 | return (id[ATA_ID_FIELD_VALID] & 1) && /* Current translation valid */ |
| 613 | id[54] && /* cylinders in current translation */ | 676 | id[ATA_ID_CUR_CYLS] && /* cylinders in current translation */ |
| 614 | id[55] && /* heads in current translation */ | 677 | id[ATA_ID_CUR_HEADS] && /* heads in current translation */ |
| 615 | id[55] <= 16 && | 678 | id[ATA_ID_CUR_HEADS] <= 16 && |
| 616 | id[56]; /* sectors in current translation */ | 679 | id[ATA_ID_CUR_SECTORS]; /* sectors in current translation */ |
| 617 | } | 680 | } |
| 618 | 681 | ||
| 619 | static inline int ata_id_is_cfa(const u16 *id) | 682 | static inline int ata_id_is_cfa(const u16 *id) |
| 620 | { | 683 | { |
| 621 | u16 v = id[0]; | 684 | if (id[ATA_ID_CONFIG] == 0x848A) /* Standard CF */ |
| 622 | if (v == 0x848A) /* Standard CF */ | ||
| 623 | return 1; | 685 | return 1; |
| 624 | /* Could be CF hiding as standard ATA */ | 686 | /* Could be CF hiding as standard ATA */ |
| 625 | if (ata_id_major_version(id) >= 3 && id[82] != 0xFFFF && | 687 | if (ata_id_major_version(id) >= 3 && |
| 626 | (id[82] & ( 1 << 2))) | 688 | id[ATA_ID_COMMAND_SET_1] != 0xFFFF && |
| 689 | (id[ATA_ID_COMMAND_SET_1] & (1 << 2))) | ||
| 627 | return 1; | 690 | return 1; |
| 628 | return 0; | 691 | return 0; |
| 629 | } | 692 | } |
| @@ -632,21 +695,21 @@ static inline int ata_drive_40wire(const u16 *dev_id) | |||
| 632 | { | 695 | { |
| 633 | if (ata_id_is_sata(dev_id)) | 696 | if (ata_id_is_sata(dev_id)) |
| 634 | return 0; /* SATA */ | 697 | return 0; /* SATA */ |
| 635 | if ((dev_id[93] & 0xE000) == 0x6000) | 698 | if ((dev_id[ATA_ID_HW_CONFIG] & 0xE000) == 0x6000) |
| 636 | return 0; /* 80 wire */ | 699 | return 0; /* 80 wire */ |
| 637 | return 1; | 700 | return 1; |
| 638 | } | 701 | } |
| 639 | 702 | ||
| 640 | static inline int ata_drive_40wire_relaxed(const u16 *dev_id) | 703 | static inline int ata_drive_40wire_relaxed(const u16 *dev_id) |
| 641 | { | 704 | { |
| 642 | if ((dev_id[93] & 0x2000) == 0x2000) | 705 | if ((dev_id[ATA_ID_HW_CONFIG] & 0x2000) == 0x2000) |
| 643 | return 0; /* 80 wire */ | 706 | return 0; /* 80 wire */ |
| 644 | return 1; | 707 | return 1; |
| 645 | } | 708 | } |
| 646 | 709 | ||
| 647 | static inline int atapi_cdb_len(const u16 *dev_id) | 710 | static inline int atapi_cdb_len(const u16 *dev_id) |
| 648 | { | 711 | { |
| 649 | u16 tmp = dev_id[0] & 0x3; | 712 | u16 tmp = dev_id[ATA_ID_CONFIG] & 0x3; |
| 650 | switch (tmp) { | 713 | switch (tmp) { |
| 651 | case 0: return 12; | 714 | case 0: return 12; |
| 652 | case 1: return 16; | 715 | case 1: return 16; |
| @@ -656,7 +719,7 @@ static inline int atapi_cdb_len(const u16 *dev_id) | |||
| 656 | 719 | ||
| 657 | static inline int atapi_command_packet_set(const u16 *dev_id) | 720 | static inline int atapi_command_packet_set(const u16 *dev_id) |
| 658 | { | 721 | { |
| 659 | return (dev_id[0] >> 8) & 0x1f; | 722 | return (dev_id[ATA_ID_CONFIG] >> 8) & 0x1f; |
| 660 | } | 723 | } |
| 661 | 724 | ||
| 662 | static inline int atapi_id_dmadir(const u16 *dev_id) | 725 | static inline int atapi_id_dmadir(const u16 *dev_id) |
diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h index 1abfe664c444..89781fd48859 100644 --- a/include/linux/bitmap.h +++ b/include/linux/bitmap.h | |||
| @@ -110,6 +110,7 @@ extern int __bitmap_weight(const unsigned long *bitmap, int bits); | |||
| 110 | 110 | ||
| 111 | extern int bitmap_scnprintf(char *buf, unsigned int len, | 111 | extern int bitmap_scnprintf(char *buf, unsigned int len, |
| 112 | const unsigned long *src, int nbits); | 112 | const unsigned long *src, int nbits); |
| 113 | extern int bitmap_scnprintf_len(unsigned int nr_bits); | ||
| 113 | extern int __bitmap_parse(const char *buf, unsigned int buflen, int is_user, | 114 | extern int __bitmap_parse(const char *buf, unsigned int buflen, int is_user, |
| 114 | unsigned long *dst, int nbits); | 115 | unsigned long *dst, int nbits); |
| 115 | extern int bitmap_parse_user(const char __user *ubuf, unsigned int ulen, | 116 | extern int bitmap_parse_user(const char __user *ubuf, unsigned int ulen, |
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index e61f22be4d0e..44710d7e7bff 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h | |||
| @@ -280,6 +280,15 @@ struct blk_queue_tag { | |||
| 280 | atomic_t refcnt; /* map can be shared */ | 280 | atomic_t refcnt; /* map can be shared */ |
| 281 | }; | 281 | }; |
| 282 | 282 | ||
| 283 | #define BLK_SCSI_MAX_CMDS (256) | ||
| 284 | #define BLK_SCSI_CMD_PER_LONG (BLK_SCSI_MAX_CMDS / (sizeof(long) * 8)) | ||
| 285 | |||
| 286 | struct blk_cmd_filter { | ||
| 287 | unsigned long read_ok[BLK_SCSI_CMD_PER_LONG]; | ||
| 288 | unsigned long write_ok[BLK_SCSI_CMD_PER_LONG]; | ||
| 289 | struct kobject kobj; | ||
| 290 | }; | ||
| 291 | |||
| 283 | struct request_queue | 292 | struct request_queue |
| 284 | { | 293 | { |
| 285 | /* | 294 | /* |
| @@ -398,6 +407,7 @@ struct request_queue | |||
| 398 | #if defined(CONFIG_BLK_DEV_BSG) | 407 | #if defined(CONFIG_BLK_DEV_BSG) |
| 399 | struct bsg_class_device bsg_dev; | 408 | struct bsg_class_device bsg_dev; |
| 400 | #endif | 409 | #endif |
| 410 | struct blk_cmd_filter cmd_filter; | ||
| 401 | }; | 411 | }; |
| 402 | 412 | ||
| 403 | #define QUEUE_FLAG_CLUSTER 0 /* cluster several segments into 1 */ | 413 | #define QUEUE_FLAG_CLUSTER 0 /* cluster several segments into 1 */ |
| @@ -807,8 +817,6 @@ extern void blk_put_queue(struct request_queue *); | |||
| 807 | /* | 817 | /* |
| 808 | * tag stuff | 818 | * tag stuff |
| 809 | */ | 819 | */ |
| 810 | #define blk_queue_tag_depth(q) ((q)->queue_tags->busy) | ||
| 811 | #define blk_queue_tag_queue(q) ((q)->queue_tags->busy < (q)->queue_tags->max_depth) | ||
| 812 | #define blk_rq_tagged(rq) ((rq)->cmd_flags & REQ_QUEUED) | 820 | #define blk_rq_tagged(rq) ((rq)->cmd_flags & REQ_QUEUED) |
| 813 | extern int blk_queue_start_tag(struct request_queue *, struct request *); | 821 | extern int blk_queue_start_tag(struct request_queue *, struct request *); |
| 814 | extern struct request *blk_queue_find_tag(struct request_queue *, int); | 822 | extern struct request *blk_queue_find_tag(struct request_queue *, int); |
| @@ -833,11 +841,11 @@ extern int blkdev_issue_flush(struct block_device *, sector_t *); | |||
| 833 | /* | 841 | /* |
| 834 | * command filter functions | 842 | * command filter functions |
| 835 | */ | 843 | */ |
| 836 | extern int blk_verify_command(struct file *file, unsigned char *cmd); | 844 | extern int blk_verify_command(struct blk_cmd_filter *filter, |
| 837 | extern int blk_cmd_filter_verify_command(struct blk_scsi_cmd_filter *filter, | 845 | unsigned char *cmd, int has_write_perm); |
| 838 | unsigned char *cmd, mode_t *f_mode); | ||
| 839 | extern int blk_register_filter(struct gendisk *disk); | 846 | extern int blk_register_filter(struct gendisk *disk); |
| 840 | extern void blk_unregister_filter(struct gendisk *disk); | 847 | extern void blk_unregister_filter(struct gendisk *disk); |
| 848 | extern void blk_set_cmd_filter_defaults(struct blk_cmd_filter *filter); | ||
| 841 | 849 | ||
| 842 | #define MAX_PHYS_SEGMENTS 128 | 850 | #define MAX_PHYS_SEGMENTS 128 |
| 843 | #define MAX_HW_SEGMENTS 128 | 851 | #define MAX_HW_SEGMENTS 128 |
diff --git a/include/linux/bootmem.h b/include/linux/bootmem.h index 652470b687c9..95837bfb5256 100644 --- a/include/linux/bootmem.h +++ b/include/linux/bootmem.h | |||
| @@ -97,10 +97,14 @@ extern void *__alloc_bootmem_low_node(pg_data_t *pgdat, | |||
| 97 | #ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE | 97 | #ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE |
| 98 | #define alloc_bootmem(x) \ | 98 | #define alloc_bootmem(x) \ |
| 99 | __alloc_bootmem(x, SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS)) | 99 | __alloc_bootmem(x, SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS)) |
| 100 | #define alloc_bootmem_nopanic(x) \ | ||
| 101 | __alloc_bootmem_nopanic(x, SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS)) | ||
| 100 | #define alloc_bootmem_low(x) \ | 102 | #define alloc_bootmem_low(x) \ |
| 101 | __alloc_bootmem_low(x, SMP_CACHE_BYTES, 0) | 103 | __alloc_bootmem_low(x, SMP_CACHE_BYTES, 0) |
| 102 | #define alloc_bootmem_pages(x) \ | 104 | #define alloc_bootmem_pages(x) \ |
| 103 | __alloc_bootmem(x, PAGE_SIZE, __pa(MAX_DMA_ADDRESS)) | 105 | __alloc_bootmem(x, PAGE_SIZE, __pa(MAX_DMA_ADDRESS)) |
| 106 | #define alloc_bootmem_pages_nopanic(x) \ | ||
| 107 | __alloc_bootmem_nopanic(x, PAGE_SIZE, __pa(MAX_DMA_ADDRESS)) | ||
| 104 | #define alloc_bootmem_low_pages(x) \ | 108 | #define alloc_bootmem_low_pages(x) \ |
| 105 | __alloc_bootmem_low(x, PAGE_SIZE, 0) | 109 | __alloc_bootmem_low(x, PAGE_SIZE, 0) |
| 106 | #define alloc_bootmem_node(pgdat, x) \ | 110 | #define alloc_bootmem_node(pgdat, x) \ |
diff --git a/include/linux/byteorder.h b/include/linux/byteorder.h new file mode 100644 index 000000000000..29f002d73d98 --- /dev/null +++ b/include/linux/byteorder.h | |||
| @@ -0,0 +1,372 @@ | |||
| 1 | #ifndef _LINUX_BYTEORDER_H | ||
| 2 | #define _LINUX_BYTEORDER_H | ||
| 3 | |||
| 4 | #include <linux/types.h> | ||
| 5 | #include <linux/swab.h> | ||
| 6 | |||
| 7 | #if defined(__LITTLE_ENDIAN) && defined(__BIG_ENDIAN) | ||
| 8 | # error Fix asm/byteorder.h to define one endianness | ||
| 9 | #endif | ||
| 10 | |||
| 11 | #if !defined(__LITTLE_ENDIAN) && !defined(__BIG_ENDIAN) | ||
| 12 | # error Fix asm/byteorder.h to define arch endianness | ||
| 13 | #endif | ||
| 14 | |||
| 15 | #ifdef __LITTLE_ENDIAN | ||
| 16 | # undef __LITTLE_ENDIAN | ||
| 17 | # define __LITTLE_ENDIAN 1234 | ||
| 18 | #endif | ||
| 19 | |||
| 20 | #ifdef __BIG_ENDIAN | ||
| 21 | # undef __BIG_ENDIAN | ||
| 22 | # define __BIG_ENDIAN 4321 | ||
| 23 | #endif | ||
| 24 | |||
| 25 | #if defined(__LITTLE_ENDIAN) && !defined(__LITTLE_ENDIAN_BITFIELD) | ||
| 26 | # define __LITTLE_ENDIAN_BITFIELD | ||
| 27 | #endif | ||
| 28 | |||
| 29 | #if defined(__BIG_ENDIAN) && !defined(__BIG_ENDIAN_BITFIELD) | ||
| 30 | # define __BIG_ENDIAN_BITFIELD | ||
| 31 | #endif | ||
| 32 | |||
| 33 | #ifdef __LITTLE_ENDIAN | ||
| 34 | # define __le16_to_cpu(x) ((__force __u16)(__le16)(x)) | ||
| 35 | # define __le32_to_cpu(x) ((__force __u32)(__le32)(x)) | ||
| 36 | # define __le64_to_cpu(x) ((__force __u64)(__le64)(x)) | ||
| 37 | # define __cpu_to_le16(x) ((__force __le16)(__u16)(x)) | ||
| 38 | # define __cpu_to_le32(x) ((__force __le32)(__u32)(x)) | ||
| 39 | # define __cpu_to_le64(x) ((__force __le64)(__u64)(x)) | ||
| 40 | |||
| 41 | # define __be16_to_cpu(x) __swab16((__force __u16)(__be16)(x)) | ||
| 42 | # define __be32_to_cpu(x) __swab32((__force __u32)(__be32)(x)) | ||
| 43 | # define __be64_to_cpu(x) __swab64((__force __u64)(__be64)(x)) | ||
| 44 | # define __cpu_to_be16(x) ((__force __be16)__swab16(x)) | ||
| 45 | # define __cpu_to_be32(x) ((__force __be32)__swab32(x)) | ||
| 46 | # define __cpu_to_be64(x) ((__force __be64)__swab64(x)) | ||
| 47 | #endif | ||
| 48 | |||
| 49 | #ifdef __BIG_ENDIAN | ||
| 50 | # define __be16_to_cpu(x) ((__force __u16)(__be16)(x)) | ||
| 51 | # define __be32_to_cpu(x) ((__force __u32)(__be32)(x)) | ||
| 52 | # define __be64_to_cpu(x) ((__force __u64)(__be64)(x)) | ||
| 53 | # define __cpu_to_be16(x) ((__force __be16)(__u16)(x)) | ||
| 54 | # define __cpu_to_be32(x) ((__force __be32)(__u32)(x)) | ||
| 55 | # define __cpu_to_be64(x) ((__force __be64)(__u64)(x)) | ||
| 56 | |||
| 57 | # define __le16_to_cpu(x) __swab16((__force __u16)(__le16)(x)) | ||
| 58 | # define __le32_to_cpu(x) __swab32((__force __u32)(__le32)(x)) | ||
| 59 | # define __le64_to_cpu(x) __swab64((__force __u64)(__le64)(x)) | ||
| 60 | # define __cpu_to_le16(x) ((__force __le16)__swab16(x)) | ||
| 61 | # define __cpu_to_le32(x) ((__force __le32)__swab32(x)) | ||
| 62 | # define __cpu_to_le64(x) ((__force __le64)__swab64(x)) | ||
| 63 | #endif | ||
| 64 | |||
| 65 | /* | ||
| 66 | * These helpers could be phased out over time as the base version | ||
| 67 | * handles constant folding. | ||
| 68 | */ | ||
| 69 | #define __constant_htonl(x) __cpu_to_be32(x) | ||
| 70 | #define __constant_ntohl(x) __be32_to_cpu(x) | ||
| 71 | #define __constant_htons(x) __cpu_to_be16(x) | ||
| 72 | #define __constant_ntohs(x) __be16_to_cpu(x) | ||
| 73 | |||
| 74 | #define __constant_le16_to_cpu(x) __le16_to_cpu(x) | ||
| 75 | #define __constant_le32_to_cpu(x) __le32_to_cpu(x) | ||
| 76 | #define __constant_le64_to_cpu(x) __le64_to_cpu(x) | ||
| 77 | #define __constant_be16_to_cpu(x) __be16_to_cpu(x) | ||
| 78 | #define __constant_be32_to_cpu(x) __be32_to_cpu(x) | ||
| 79 | #define __constant_be64_to_cpu(x) __be64_to_cpu(x) | ||
| 80 | |||
| 81 | #define __constant_cpu_to_le16(x) __cpu_to_le16(x) | ||
| 82 | #define __constant_cpu_to_le32(x) __cpu_to_le32(x) | ||
| 83 | #define __constant_cpu_to_le64(x) __cpu_to_le64(x) | ||
| 84 | #define __constant_cpu_to_be16(x) __cpu_to_be16(x) | ||
| 85 | #define __constant_cpu_to_be32(x) __cpu_to_be32(x) | ||
| 86 | #define __constant_cpu_to_be64(x) __cpu_to_be64(x) | ||
| 87 | |||
| 88 | static inline void __le16_to_cpus(__u16 *p) | ||
| 89 | { | ||
| 90 | #ifdef __BIG_ENDIAN | ||
| 91 | __swab16s(p); | ||
| 92 | #endif | ||
| 93 | } | ||
| 94 | |||
| 95 | static inline void __cpu_to_le16s(__u16 *p) | ||
| 96 | { | ||
| 97 | #ifdef __BIG_ENDIAN | ||
| 98 | __swab16s(p); | ||
| 99 | #endif | ||
| 100 | } | ||
| 101 | |||
| 102 | static inline void __le32_to_cpus(__u32 *p) | ||
| 103 | { | ||
| 104 | #ifdef __BIG_ENDIAN | ||
| 105 | __swab32s(p); | ||
| 106 | #endif | ||
| 107 | } | ||
| 108 | |||
| 109 | static inline void __cpu_to_le32s(__u32 *p) | ||
| 110 | { | ||
| 111 | #ifdef __BIG_ENDIAN | ||
| 112 | __swab32s(p); | ||
| 113 | #endif | ||
| 114 | } | ||
| 115 | |||
| 116 | static inline void __le64_to_cpus(__u64 *p) | ||
| 117 | { | ||
| 118 | #ifdef __BIG_ENDIAN | ||
| 119 | __swab64s(p); | ||
| 120 | #endif | ||
| 121 | } | ||
| 122 | |||
| 123 | static inline void __cpu_to_le64s(__u64 *p) | ||
| 124 | { | ||
| 125 | #ifdef __BIG_ENDIAN | ||
| 126 | __swab64s(p); | ||
| 127 | #endif | ||
| 128 | } | ||
| 129 | |||
| 130 | static inline void __be16_to_cpus(__u16 *p) | ||
| 131 | { | ||
| 132 | #ifdef __LITTLE_ENDIAN | ||
| 133 | __swab16s(p); | ||
| 134 | #endif | ||
| 135 | } | ||
| 136 | |||
| 137 | static inline void __cpu_to_be16s(__u16 *p) | ||
| 138 | { | ||
| 139 | #ifdef __LITTLE_ENDIAN | ||
| 140 | __swab16s(p); | ||
| 141 | #endif | ||
| 142 | } | ||
| 143 | |||
| 144 | static inline void __be32_to_cpus(__u32 *p) | ||
| 145 | { | ||
| 146 | #ifdef __LITTLE_ENDIAN | ||
| 147 | __swab32s(p); | ||
| 148 | #endif | ||
| 149 | } | ||
| 150 | |||
| 151 | static inline void __cpu_to_be32s(__u32 *p) | ||
| 152 | { | ||
| 153 | #ifdef __LITTLE_ENDIAN | ||
| 154 | __swab32s(p); | ||
| 155 | #endif | ||
| 156 | } | ||
| 157 | |||
| 158 | static inline void __be64_to_cpus(__u64 *p) | ||
| 159 | { | ||
| 160 | #ifdef __LITTLE_ENDIAN | ||
| 161 | __swab64s(p); | ||
| 162 | #endif | ||
| 163 | } | ||
| 164 | |||
| 165 | static inline void __cpu_to_be64s(__u64 *p) | ||
| 166 | { | ||
| 167 | #ifdef __LITTLE_ENDIAN | ||
| 168 | __swab64s(p); | ||
| 169 | #endif | ||
| 170 | } | ||
| 171 | |||
| 172 | static inline __u16 __le16_to_cpup(const __le16 *p) | ||
| 173 | { | ||
| 174 | #ifdef __LITTLE_ENDIAN | ||
| 175 | return (__force __u16)*p; | ||
| 176 | #else | ||
| 177 | return __swab16p((__force __u16 *)p); | ||
| 178 | #endif | ||
| 179 | } | ||
| 180 | |||
| 181 | static inline __u32 __le32_to_cpup(const __le32 *p) | ||
| 182 | { | ||
| 183 | #ifdef __LITTLE_ENDIAN | ||
| 184 | return (__force __u32)*p; | ||
| 185 | #else | ||
| 186 | return __swab32p((__force __u32 *)p); | ||
| 187 | #endif | ||
| 188 | } | ||
| 189 | |||
| 190 | static inline __u64 __le64_to_cpup(const __le64 *p) | ||
| 191 | { | ||
| 192 | #ifdef __LITTLE_ENDIAN | ||
| 193 | return (__force __u64)*p; | ||
| 194 | #else | ||
| 195 | return __swab64p((__force __u64 *)p); | ||
| 196 | #endif | ||
| 197 | } | ||
| 198 | |||
| 199 | static inline __le16 __cpu_to_le16p(const __u16 *p) | ||
| 200 | { | ||
| 201 | #ifdef __LITTLE_ENDIAN | ||
| 202 | return (__force __le16)*p; | ||
| 203 | #else | ||
| 204 | return (__force __le16)__swab16p(p); | ||
| 205 | #endif | ||
| 206 | } | ||
| 207 | |||
| 208 | static inline __le32 __cpu_to_le32p(const __u32 *p) | ||
| 209 | { | ||
| 210 | #ifdef __LITTLE_ENDIAN | ||
| 211 | return (__force __le32)*p; | ||
| 212 | #else | ||
| 213 | return (__force __le32)__swab32p(p); | ||
| 214 | #endif | ||
| 215 | } | ||
| 216 | |||
| 217 | static inline __le64 __cpu_to_le64p(const __u64 *p) | ||
| 218 | { | ||
| 219 | #ifdef __LITTLE_ENDIAN | ||
| 220 | return (__force __le64)*p; | ||
| 221 | #else | ||
| 222 | return (__force __le64)__swab64p(p); | ||
| 223 | #endif | ||
| 224 | } | ||
| 225 | |||
| 226 | static inline __u16 __be16_to_cpup(const __be16 *p) | ||
| 227 | { | ||
| 228 | #ifdef __BIG_ENDIAN | ||
| 229 | return (__force __u16)*p; | ||
| 230 | #else | ||
| 231 | return __swab16p((__force __u16 *)p); | ||
| 232 | #endif | ||
| 233 | } | ||
| 234 | |||
| 235 | static inline __u32 __be32_to_cpup(const __be32 *p) | ||
| 236 | { | ||
| 237 | #ifdef __BIG_ENDIAN | ||
| 238 | return (__force __u32)*p; | ||
| 239 | #else | ||
| 240 | return __swab32p((__force __u32 *)p); | ||
| 241 | #endif | ||
| 242 | } | ||
| 243 | |||
| 244 | static inline __u64 __be64_to_cpup(const __be64 *p) | ||
| 245 | { | ||
| 246 | #ifdef __BIG_ENDIAN | ||
| 247 | return (__force __u64)*p; | ||
| 248 | #else | ||
| 249 | return __swab64p((__force __u64 *)p); | ||
| 250 | #endif | ||
| 251 | } | ||
| 252 | |||
| 253 | static inline __be16 __cpu_to_be16p(const __u16 *p) | ||
| 254 | { | ||
| 255 | #ifdef __BIG_ENDIAN | ||
| 256 | return (__force __be16)*p; | ||
| 257 | #else | ||
| 258 | return (__force __be16)__swab16p(p); | ||
| 259 | #endif | ||
| 260 | } | ||
| 261 | |||
| 262 | static inline __be32 __cpu_to_be32p(const __u32 *p) | ||
| 263 | { | ||
| 264 | #ifdef __BIG_ENDIAN | ||
| 265 | return (__force __be32)*p; | ||
| 266 | #else | ||
| 267 | return (__force __be32)__swab32p(p); | ||
| 268 | #endif | ||
| 269 | } | ||
| 270 | |||
| 271 | static inline __be64 __cpu_to_be64p(const __u64 *p) | ||
| 272 | { | ||
| 273 | #ifdef __BIG_ENDIAN | ||
| 274 | return (__force __be64)*p; | ||
| 275 | #else | ||
| 276 | return (__force __be64)__swab64p(p); | ||
| 277 | #endif | ||
| 278 | } | ||
| 279 | |||
| 280 | #ifdef __KERNEL__ | ||
| 281 | |||
| 282 | # define le16_to_cpu __le16_to_cpu | ||
| 283 | # define le32_to_cpu __le32_to_cpu | ||
| 284 | # define le64_to_cpu __le64_to_cpu | ||
| 285 | # define be16_to_cpu __be16_to_cpu | ||
| 286 | # define be32_to_cpu __be32_to_cpu | ||
| 287 | # define be64_to_cpu __be64_to_cpu | ||
| 288 | # define cpu_to_le16 __cpu_to_le16 | ||
| 289 | # define cpu_to_le32 __cpu_to_le32 | ||
| 290 | # define cpu_to_le64 __cpu_to_le64 | ||
| 291 | # define cpu_to_be16 __cpu_to_be16 | ||
| 292 | # define cpu_to_be32 __cpu_to_be32 | ||
| 293 | # define cpu_to_be64 __cpu_to_be64 | ||
| 294 | |||
| 295 | # define le16_to_cpup __le16_to_cpup | ||
| 296 | # define le32_to_cpup __le32_to_cpup | ||
| 297 | # define le64_to_cpup __le64_to_cpup | ||
| 298 | # define be16_to_cpup __be16_to_cpup | ||
| 299 | # define be32_to_cpup __be32_to_cpup | ||
| 300 | # define be64_to_cpup __be64_to_cpup | ||
| 301 | # define cpu_to_le16p __cpu_to_le16p | ||
| 302 | # define cpu_to_le32p __cpu_to_le32p | ||
| 303 | # define cpu_to_le64p __cpu_to_le64p | ||
| 304 | # define cpu_to_be16p __cpu_to_be16p | ||
| 305 | # define cpu_to_be32p __cpu_to_be32p | ||
| 306 | # define cpu_to_be64p __cpu_to_be64p | ||
| 307 | |||
| 308 | # define le16_to_cpus __le16_to_cpus | ||
| 309 | # define le32_to_cpus __le32_to_cpus | ||
| 310 | # define le64_to_cpus __le64_to_cpus | ||
| 311 | # define be16_to_cpus __be16_to_cpus | ||
| 312 | # define be32_to_cpus __be32_to_cpus | ||
| 313 | # define be64_to_cpus __be64_to_cpus | ||
| 314 | # define cpu_to_le16s __cpu_to_le16s | ||
| 315 | # define cpu_to_le32s __cpu_to_le32s | ||
| 316 | # define cpu_to_le64s __cpu_to_le64s | ||
| 317 | # define cpu_to_be16s __cpu_to_be16s | ||
| 318 | # define cpu_to_be32s __cpu_to_be32s | ||
| 319 | # define cpu_to_be64s __cpu_to_be64s | ||
| 320 | |||
| 321 | /* | ||
| 322 | * They have to be macros in order to do the constant folding | ||
| 323 | * correctly - if the argument passed into a inline function | ||
| 324 | * it is no longer constant according to gcc.. | ||
| 325 | */ | ||
| 326 | # undef ntohl | ||
| 327 | # undef ntohs | ||
| 328 | # undef htonl | ||
| 329 | # undef htons | ||
| 330 | |||
| 331 | # define ___htonl(x) __cpu_to_be32(x) | ||
| 332 | # define ___htons(x) __cpu_to_be16(x) | ||
| 333 | # define ___ntohl(x) __be32_to_cpu(x) | ||
| 334 | # define ___ntohs(x) __be16_to_cpu(x) | ||
| 335 | |||
| 336 | # define htonl(x) ___htonl(x) | ||
| 337 | # define ntohl(x) ___ntohl(x) | ||
| 338 | # define htons(x) ___htons(x) | ||
| 339 | # define ntohs(x) ___ntohs(x) | ||
| 340 | |||
| 341 | static inline void le16_add_cpu(__le16 *var, u16 val) | ||
| 342 | { | ||
| 343 | *var = cpu_to_le16(le16_to_cpup(var) + val); | ||
| 344 | } | ||
| 345 | |||
| 346 | static inline void le32_add_cpu(__le32 *var, u32 val) | ||
| 347 | { | ||
| 348 | *var = cpu_to_le32(le32_to_cpup(var) + val); | ||
| 349 | } | ||
| 350 | |||
| 351 | static inline void le64_add_cpu(__le64 *var, u64 val) | ||
| 352 | { | ||
| 353 | *var = cpu_to_le64(le64_to_cpup(var) + val); | ||
| 354 | } | ||
| 355 | |||
| 356 | static inline void be16_add_cpu(__be16 *var, u16 val) | ||
| 357 | { | ||
| 358 | *var = cpu_to_be16(be16_to_cpup(var) + val); | ||
| 359 | } | ||
| 360 | |||
| 361 | static inline void be32_add_cpu(__be32 *var, u32 val) | ||
| 362 | { | ||
| 363 | *var = cpu_to_be32(be32_to_cpup(var) + val); | ||
| 364 | } | ||
| 365 | |||
| 366 | static inline void be64_add_cpu(__be64 *var, u64 val) | ||
| 367 | { | ||
| 368 | *var = cpu_to_be64(be64_to_cpup(var) + val); | ||
| 369 | } | ||
| 370 | |||
| 371 | #endif /* __KERNEL__ */ | ||
| 372 | #endif /* _LINUX_BYTEORDER_H */ | ||
diff --git a/include/linux/capability.h b/include/linux/capability.h index 02673846d205..9d1fe30b6f6c 100644 --- a/include/linux/capability.h +++ b/include/linux/capability.h | |||
| @@ -503,8 +503,19 @@ extern const kernel_cap_t __cap_init_eff_set; | |||
| 503 | 503 | ||
| 504 | kernel_cap_t cap_set_effective(const kernel_cap_t pE_new); | 504 | kernel_cap_t cap_set_effective(const kernel_cap_t pE_new); |
| 505 | 505 | ||
| 506 | int capable(int cap); | 506 | /** |
| 507 | int __capable(struct task_struct *t, int cap); | 507 | * has_capability - Determine if a task has a superior capability available |
| 508 | * @t: The task in question | ||
| 509 | * @cap: The capability to be tested for | ||
| 510 | * | ||
| 511 | * Return true if the specified task has the given superior capability | ||
| 512 | * currently in effect, false if not. | ||
| 513 | * | ||
| 514 | * Note that this does not set PF_SUPERPRIV on the task. | ||
| 515 | */ | ||
| 516 | #define has_capability(t, cap) (security_capable((t), (cap)) == 0) | ||
| 517 | |||
| 518 | extern int capable(int cap); | ||
| 508 | 519 | ||
| 509 | #endif /* __KERNEL__ */ | 520 | #endif /* __KERNEL__ */ |
| 510 | 521 | ||
diff --git a/include/linux/completion.h b/include/linux/completion.h index d2961b66d53d..02ef8835999c 100644 --- a/include/linux/completion.h +++ b/include/linux/completion.h | |||
| @@ -49,10 +49,13 @@ extern unsigned long wait_for_completion_timeout(struct completion *x, | |||
| 49 | unsigned long timeout); | 49 | unsigned long timeout); |
| 50 | extern unsigned long wait_for_completion_interruptible_timeout( | 50 | extern unsigned long wait_for_completion_interruptible_timeout( |
| 51 | struct completion *x, unsigned long timeout); | 51 | struct completion *x, unsigned long timeout); |
| 52 | extern bool try_wait_for_completion(struct completion *x); | ||
| 53 | extern bool completion_done(struct completion *x); | ||
| 52 | 54 | ||
| 53 | extern void complete(struct completion *); | 55 | extern void complete(struct completion *); |
| 54 | extern void complete_all(struct completion *); | 56 | extern void complete_all(struct completion *); |
| 55 | 57 | ||
| 56 | #define INIT_COMPLETION(x) ((x).done = 0) | 58 | #define INIT_COMPLETION(x) ((x).done = 0) |
| 57 | 59 | ||
| 60 | |||
| 58 | #endif | 61 | #endif |
diff --git a/include/linux/cred.h b/include/linux/cred.h new file mode 100644 index 000000000000..b69222cc1fd2 --- /dev/null +++ b/include/linux/cred.h | |||
| @@ -0,0 +1,50 @@ | |||
| 1 | /* Credentials management | ||
| 2 | * | ||
| 3 | * Copyright (C) 2008 Red Hat, Inc. All Rights Reserved. | ||
| 4 | * Written by David Howells (dhowells@redhat.com) | ||
| 5 | * | ||
| 6 | * This program is free software; you can redistribute it and/or | ||
| 7 | * modify it under the terms of the GNU General Public Licence | ||
| 8 | * as published by the Free Software Foundation; either version | ||
| 9 | * 2 of the Licence, or (at your option) any later version. | ||
| 10 | */ | ||
| 11 | |||
| 12 | #ifndef _LINUX_CRED_H | ||
| 13 | #define _LINUX_CRED_H | ||
| 14 | |||
| 15 | #define get_current_user() (get_uid(current->user)) | ||
| 16 | |||
| 17 | #define task_uid(task) ((task)->uid) | ||
| 18 | #define task_gid(task) ((task)->gid) | ||
| 19 | #define task_euid(task) ((task)->euid) | ||
| 20 | #define task_egid(task) ((task)->egid) | ||
| 21 | |||
| 22 | #define current_uid() (current->uid) | ||
| 23 | #define current_gid() (current->gid) | ||
| 24 | #define current_euid() (current->euid) | ||
| 25 | #define current_egid() (current->egid) | ||
| 26 | #define current_suid() (current->suid) | ||
| 27 | #define current_sgid() (current->sgid) | ||
| 28 | #define current_fsuid() (current->fsuid) | ||
| 29 | #define current_fsgid() (current->fsgid) | ||
| 30 | #define current_cap() (current->cap_effective) | ||
| 31 | |||
| 32 | #define current_uid_gid(_uid, _gid) \ | ||
| 33 | do { \ | ||
| 34 | *(_uid) = current->uid; \ | ||
| 35 | *(_gid) = current->gid; \ | ||
| 36 | } while(0) | ||
| 37 | |||
| 38 | #define current_euid_egid(_uid, _gid) \ | ||
| 39 | do { \ | ||
| 40 | *(_uid) = current->euid; \ | ||
| 41 | *(_gid) = current->egid; \ | ||
| 42 | } while(0) | ||
| 43 | |||
| 44 | #define current_fsuid_fsgid(_uid, _gid) \ | ||
| 45 | do { \ | ||
| 46 | *(_uid) = current->fsuid; \ | ||
| 47 | *(_gid) = current->fsgid; \ | ||
| 48 | } while(0) | ||
| 49 | |||
| 50 | #endif /* _LINUX_CRED_H */ | ||
diff --git a/include/linux/dcache.h b/include/linux/dcache.h index 07aa198f19ed..efba1de629ac 100644 --- a/include/linux/dcache.h +++ b/include/linux/dcache.h | |||
| @@ -230,7 +230,7 @@ extern void d_delete(struct dentry *); | |||
| 230 | extern struct dentry * d_alloc(struct dentry *, const struct qstr *); | 230 | extern struct dentry * d_alloc(struct dentry *, const struct qstr *); |
| 231 | extern struct dentry * d_alloc_anon(struct inode *); | 231 | extern struct dentry * d_alloc_anon(struct inode *); |
| 232 | extern struct dentry * d_splice_alias(struct inode *, struct dentry *); | 232 | extern struct dentry * d_splice_alias(struct inode *, struct dentry *); |
| 233 | extern struct dentry * d_add_ci(struct inode *, struct dentry *, struct qstr *); | 233 | extern struct dentry * d_add_ci(struct dentry *, struct inode *, struct qstr *); |
| 234 | extern void shrink_dcache_sb(struct super_block *); | 234 | extern void shrink_dcache_sb(struct super_block *); |
| 235 | extern void shrink_dcache_parent(struct dentry *); | 235 | extern void shrink_dcache_parent(struct dentry *); |
| 236 | extern void shrink_dcache_for_umount(struct super_block *); | 236 | extern void shrink_dcache_for_umount(struct super_block *); |
diff --git a/include/linux/device.h b/include/linux/device.h index d24a47f80f9c..4d8372d135df 100644 --- a/include/linux/device.h +++ b/include/linux/device.h | |||
| @@ -358,6 +358,7 @@ struct device { | |||
| 358 | 358 | ||
| 359 | struct kobject kobj; | 359 | struct kobject kobj; |
| 360 | char bus_id[BUS_ID_SIZE]; /* position on parent bus */ | 360 | char bus_id[BUS_ID_SIZE]; /* position on parent bus */ |
| 361 | const char *init_name; /* initial name of the device */ | ||
| 361 | struct device_type *type; | 362 | struct device_type *type; |
| 362 | unsigned uevent_suppress:1; | 363 | unsigned uevent_suppress:1; |
| 363 | 364 | ||
| @@ -406,7 +407,7 @@ struct device { | |||
| 406 | /* Get the wakeup routines, which depend on struct device */ | 407 | /* Get the wakeup routines, which depend on struct device */ |
| 407 | #include <linux/pm_wakeup.h> | 408 | #include <linux/pm_wakeup.h> |
| 408 | 409 | ||
| 409 | static inline const char *dev_name(struct device *dev) | 410 | static inline const char *dev_name(const struct device *dev) |
| 410 | { | 411 | { |
| 411 | /* will be changed into kobject_name(&dev->kobj) in the near future */ | 412 | /* will be changed into kobject_name(&dev->kobj) in the near future */ |
| 412 | return dev->bus_id; | 413 | return dev->bus_id; |
| @@ -518,7 +519,7 @@ extern void device_shutdown(void); | |||
| 518 | extern void sysdev_shutdown(void); | 519 | extern void sysdev_shutdown(void); |
| 519 | 520 | ||
| 520 | /* debugging and troubleshooting/diagnostic helpers. */ | 521 | /* debugging and troubleshooting/diagnostic helpers. */ |
| 521 | extern const char *dev_driver_string(struct device *dev); | 522 | extern const char *dev_driver_string(const struct device *dev); |
| 522 | #define dev_printk(level, dev, format, arg...) \ | 523 | #define dev_printk(level, dev, format, arg...) \ |
| 523 | printk(level "%s %s: " format , dev_driver_string(dev) , \ | 524 | printk(level "%s %s: " format , dev_driver_string(dev) , \ |
| 524 | dev_name(dev) , ## arg) | 525 | dev_name(dev) , ## arg) |
diff --git a/include/linux/exportfs.h b/include/linux/exportfs.h index f5abd1306638..27e772cefb6a 100644 --- a/include/linux/exportfs.h +++ b/include/linux/exportfs.h | |||
| @@ -35,6 +35,27 @@ enum fid_type { | |||
| 35 | FILEID_INO32_GEN_PARENT = 2, | 35 | FILEID_INO32_GEN_PARENT = 2, |
| 36 | 36 | ||
| 37 | /* | 37 | /* |
| 38 | * 64 bit object ID, 64 bit root object ID, | ||
| 39 | * 32 bit generation number. | ||
| 40 | */ | ||
| 41 | FILEID_BTRFS_WITHOUT_PARENT = 0x4d, | ||
| 42 | |||
| 43 | /* | ||
| 44 | * 64 bit object ID, 64 bit root object ID, | ||
| 45 | * 32 bit generation number, | ||
| 46 | * 64 bit parent object ID, 32 bit parent generation. | ||
| 47 | */ | ||
| 48 | FILEID_BTRFS_WITH_PARENT = 0x4e, | ||
| 49 | |||
| 50 | /* | ||
| 51 | * 64 bit object ID, 64 bit root object ID, | ||
| 52 | * 32 bit generation number, | ||
| 53 | * 64 bit parent object ID, 32 bit parent generation, | ||
| 54 | * 64 bit parent root object ID. | ||
| 55 | */ | ||
| 56 | FILEID_BTRFS_WITH_PARENT_ROOT = 0x4f, | ||
| 57 | |||
| 58 | /* | ||
| 38 | * 32 bit block number, 16 bit partition reference, | 59 | * 32 bit block number, 16 bit partition reference, |
| 39 | * 16 bit unused, 32 bit generation number. | 60 | * 16 bit unused, 32 bit generation number. |
| 40 | */ | 61 | */ |
diff --git a/include/linux/fb.h b/include/linux/fb.h index 3b8870e32afd..531ccd5f5960 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h | |||
| @@ -976,6 +976,9 @@ static inline void __fb_pad_aligned_buffer(u8 *dst, u32 d_pitch, | |||
| 976 | 976 | ||
| 977 | /* drivers/video/fb_defio.c */ | 977 | /* drivers/video/fb_defio.c */ |
| 978 | extern void fb_deferred_io_init(struct fb_info *info); | 978 | extern void fb_deferred_io_init(struct fb_info *info); |
| 979 | extern void fb_deferred_io_open(struct fb_info *info, | ||
| 980 | struct inode *inode, | ||
| 981 | struct file *file); | ||
| 979 | extern void fb_deferred_io_cleanup(struct fb_info *info); | 982 | extern void fb_deferred_io_cleanup(struct fb_info *info); |
| 980 | extern int fb_deferred_io_fsync(struct file *file, struct dentry *dentry, | 983 | extern int fb_deferred_io_fsync(struct file *file, struct dentry *dentry, |
| 981 | int datasync); | 984 | int datasync); |
diff --git a/include/linux/firmware-map.h b/include/linux/firmware-map.h index acbdbcc16051..6e199c8dfacc 100644 --- a/include/linux/firmware-map.h +++ b/include/linux/firmware-map.h | |||
| @@ -24,34 +24,8 @@ | |||
| 24 | */ | 24 | */ |
| 25 | #ifdef CONFIG_FIRMWARE_MEMMAP | 25 | #ifdef CONFIG_FIRMWARE_MEMMAP |
| 26 | 26 | ||
| 27 | /** | ||
| 28 | * Adds a firmware mapping entry. This function uses kmalloc() for memory | ||
| 29 | * allocation. Use firmware_map_add_early() if you want to use the bootmem | ||
| 30 | * allocator. | ||
| 31 | * | ||
| 32 | * That function must be called before late_initcall. | ||
| 33 | * | ||
| 34 | * @start: Start of the memory range. | ||
| 35 | * @end: End of the memory range (inclusive). | ||
| 36 | * @type: Type of the memory range. | ||
| 37 | * | ||
| 38 | * Returns 0 on success, or -ENOMEM if no memory could be allocated. | ||
| 39 | */ | ||
| 40 | int firmware_map_add(resource_size_t start, resource_size_t end, | 27 | int firmware_map_add(resource_size_t start, resource_size_t end, |
| 41 | const char *type); | 28 | const char *type); |
| 42 | |||
| 43 | /** | ||
| 44 | * Adds a firmware mapping entry. This function uses the bootmem allocator | ||
| 45 | * for memory allocation. Use firmware_map_add() if you want to use kmalloc(). | ||
| 46 | * | ||
| 47 | * That function must be called before late_initcall. | ||
| 48 | * | ||
| 49 | * @start: Start of the memory range. | ||
| 50 | * @end: End of the memory range (inclusive). | ||
| 51 | * @type: Type of the memory range. | ||
| 52 | * | ||
| 53 | * Returns 0 on success, or -ENOMEM if no memory could be allocated. | ||
| 54 | */ | ||
| 55 | int firmware_map_add_early(resource_size_t start, resource_size_t end, | 29 | int firmware_map_add_early(resource_size_t start, resource_size_t end, |
| 56 | const char *type); | 30 | const char *type); |
| 57 | 31 | ||
diff --git a/include/linux/fs_uart_pd.h b/include/linux/fs_uart_pd.h index 809bb9ffc788..36b61ff39277 100644 --- a/include/linux/fs_uart_pd.h +++ b/include/linux/fs_uart_pd.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #ifndef FS_UART_PD_H | 12 | #ifndef FS_UART_PD_H |
| 13 | #define FS_UART_PD_H | 13 | #define FS_UART_PD_H |
| 14 | 14 | ||
| 15 | #include <linux/version.h> | ||
| 16 | #include <asm/types.h> | 15 | #include <asm/types.h> |
| 17 | 16 | ||
| 18 | enum fs_uart_id { | 17 | enum fs_uart_id { |
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index f368d041e02d..bb384068272e 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h | |||
| @@ -98,6 +98,27 @@ static inline void tracer_disable(void) | |||
| 98 | #endif | 98 | #endif |
| 99 | } | 99 | } |
| 100 | 100 | ||
| 101 | /* Ftrace disable/restore without lock. Some synchronization mechanism | ||
| 102 | * must be used to prevent ftrace_enabled to be changed between | ||
| 103 | * disable/restore. */ | ||
| 104 | static inline int __ftrace_enabled_save(void) | ||
| 105 | { | ||
| 106 | #ifdef CONFIG_FTRACE | ||
| 107 | int saved_ftrace_enabled = ftrace_enabled; | ||
| 108 | ftrace_enabled = 0; | ||
| 109 | return saved_ftrace_enabled; | ||
| 110 | #else | ||
| 111 | return 0; | ||
| 112 | #endif | ||
| 113 | } | ||
| 114 | |||
| 115 | static inline void __ftrace_enabled_restore(int enabled) | ||
| 116 | { | ||
| 117 | #ifdef CONFIG_FTRACE | ||
| 118 | ftrace_enabled = enabled; | ||
| 119 | #endif | ||
| 120 | } | ||
| 121 | |||
| 101 | #ifdef CONFIG_FRAME_POINTER | 122 | #ifdef CONFIG_FRAME_POINTER |
| 102 | /* TODO: need to fix this for ARM */ | 123 | /* TODO: need to fix this for ARM */ |
| 103 | # define CALLER_ADDR0 ((unsigned long)__builtin_return_address(0)) | 124 | # define CALLER_ADDR0 ((unsigned long)__builtin_return_address(0)) |
diff --git a/include/linux/genhd.h b/include/linux/genhd.h index 118216f1bd3c..be4f5e5bfe06 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h | |||
| @@ -110,15 +110,6 @@ struct hd_struct { | |||
| 110 | #define GENHD_FL_SUPPRESS_PARTITION_INFO 32 | 110 | #define GENHD_FL_SUPPRESS_PARTITION_INFO 32 |
| 111 | #define GENHD_FL_FAIL 64 | 111 | #define GENHD_FL_FAIL 64 |
| 112 | 112 | ||
| 113 | #define BLK_SCSI_MAX_CMDS (256) | ||
| 114 | #define BLK_SCSI_CMD_PER_LONG (BLK_SCSI_MAX_CMDS / (sizeof(long) * 8)) | ||
| 115 | |||
| 116 | struct blk_scsi_cmd_filter { | ||
| 117 | unsigned long read_ok[BLK_SCSI_CMD_PER_LONG]; | ||
| 118 | unsigned long write_ok[BLK_SCSI_CMD_PER_LONG]; | ||
| 119 | struct kobject kobj; | ||
| 120 | }; | ||
| 121 | |||
| 122 | struct gendisk { | 113 | struct gendisk { |
| 123 | int major; /* major number of driver */ | 114 | int major; /* major number of driver */ |
| 124 | int first_minor; | 115 | int first_minor; |
| @@ -128,7 +119,6 @@ struct gendisk { | |||
| 128 | struct hd_struct **part; /* [indexed by minor] */ | 119 | struct hd_struct **part; /* [indexed by minor] */ |
| 129 | struct block_device_operations *fops; | 120 | struct block_device_operations *fops; |
| 130 | struct request_queue *queue; | 121 | struct request_queue *queue; |
| 131 | struct blk_scsi_cmd_filter cmd_filter; | ||
| 132 | void *private_data; | 122 | void *private_data; |
| 133 | sector_t capacity; | 123 | sector_t capacity; |
| 134 | 124 | ||
diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h index 4862398e05bf..bf34c5f4c051 100644 --- a/include/linux/i2c-id.h +++ b/include/linux/i2c-id.h | |||
| @@ -39,7 +39,6 @@ | |||
| 39 | #define I2C_DRIVERID_SAA7111A 8 /* video input processor */ | 39 | #define I2C_DRIVERID_SAA7111A 8 /* video input processor */ |
| 40 | #define I2C_DRIVERID_SAA7185B 13 /* video encoder */ | 40 | #define I2C_DRIVERID_SAA7185B 13 /* video encoder */ |
| 41 | #define I2C_DRIVERID_SAA7110 22 /* video decoder */ | 41 | #define I2C_DRIVERID_SAA7110 22 /* video decoder */ |
| 42 | #define I2C_DRIVERID_MGATVO 23 /* Matrox TVOut */ | ||
| 43 | #define I2C_DRIVERID_SAA5249 24 /* SAA5249 and compatibles */ | 42 | #define I2C_DRIVERID_SAA5249 24 /* SAA5249 and compatibles */ |
| 44 | #define I2C_DRIVERID_PCF8583 25 /* real time clock */ | 43 | #define I2C_DRIVERID_PCF8583 25 /* real time clock */ |
| 45 | #define I2C_DRIVERID_SAB3036 26 /* SAB3036 tuner */ | 44 | #define I2C_DRIVERID_SAB3036 26 /* SAB3036 tuner */ |
| @@ -95,7 +94,6 @@ | |||
| 95 | #define I2C_HW_B_BT848 0x010005 /* BT848 video boards */ | 94 | #define I2C_HW_B_BT848 0x010005 /* BT848 video boards */ |
| 96 | #define I2C_HW_B_VIA 0x010007 /* Via vt82c586b */ | 95 | #define I2C_HW_B_VIA 0x010007 /* Via vt82c586b */ |
| 97 | #define I2C_HW_B_HYDRA 0x010008 /* Apple Hydra Mac I/O */ | 96 | #define I2C_HW_B_HYDRA 0x010008 /* Apple Hydra Mac I/O */ |
| 98 | #define I2C_HW_B_G400 0x010009 /* Matrox G400 */ | ||
| 99 | #define I2C_HW_B_I810 0x01000a /* Intel I810 */ | 97 | #define I2C_HW_B_I810 0x01000a /* Intel I810 */ |
| 100 | #define I2C_HW_B_VOO 0x01000b /* 3dfx Voodoo 3 / Banshee */ | 98 | #define I2C_HW_B_VOO 0x01000b /* 3dfx Voodoo 3 / Banshee */ |
| 101 | #define I2C_HW_B_SCX200 0x01000e /* Nat'l Semi SCx200 I2C */ | 99 | #define I2C_HW_B_SCX200 0x01000e /* Nat'l Semi SCx200 I2C */ |
diff --git a/include/linux/i2c.h b/include/linux/i2c.h index 08be0d21864c..06115128047f 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h | |||
| @@ -97,7 +97,19 @@ extern s32 i2c_smbus_write_i2c_block_data(struct i2c_client * client, | |||
| 97 | 97 | ||
| 98 | /** | 98 | /** |
| 99 | * struct i2c_driver - represent an I2C device driver | 99 | * struct i2c_driver - represent an I2C device driver |
| 100 | * @id: Unique driver ID (optional) | ||
| 100 | * @class: What kind of i2c device we instantiate (for detect) | 101 | * @class: What kind of i2c device we instantiate (for detect) |
| 102 | * @attach_adapter: Callback for bus addition (for legacy drivers) | ||
| 103 | * @detach_adapter: Callback for bus removal (for legacy drivers) | ||
| 104 | * @detach_client: Callback for device removal (for legacy drivers) | ||
| 105 | * @probe: Callback for device binding (new-style drivers) | ||
| 106 | * @remove: Callback for device unbinding (new-style drivers) | ||
| 107 | * @shutdown: Callback for device shutdown | ||
| 108 | * @suspend: Callback for device suspend | ||
| 109 | * @resume: Callback for device resume | ||
| 110 | * @command: Callback for bus-wide signaling (optional) | ||
| 111 | * @driver: Device driver model driver | ||
| 112 | * @id_table: List of I2C devices supported by this driver | ||
| 101 | * @detect: Callback for device detection | 113 | * @detect: Callback for device detection |
| 102 | * @address_data: The I2C addresses to probe, ignore or force (for detect) | 114 | * @address_data: The I2C addresses to probe, ignore or force (for detect) |
| 103 | * @clients: List of detected clients we created (for i2c-core use only) | 115 | * @clients: List of detected clients we created (for i2c-core use only) |
diff --git a/include/linux/ide.h b/include/linux/ide.h index 87c12ed96954..1524829f73f2 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
| @@ -1111,7 +1111,6 @@ void ide_setup_pci_noise(struct pci_dev *, const struct ide_port_info *); | |||
| 1111 | #ifdef CONFIG_BLK_DEV_IDEDMA_PCI | 1111 | #ifdef CONFIG_BLK_DEV_IDEDMA_PCI |
| 1112 | int ide_pci_set_master(struct pci_dev *, const char *); | 1112 | int ide_pci_set_master(struct pci_dev *, const char *); |
| 1113 | unsigned long ide_pci_dma_base(ide_hwif_t *, const struct ide_port_info *); | 1113 | unsigned long ide_pci_dma_base(ide_hwif_t *, const struct ide_port_info *); |
| 1114 | extern const struct ide_dma_ops sff_dma_ops; | ||
| 1115 | int ide_pci_check_simplex(ide_hwif_t *, const struct ide_port_info *); | 1114 | int ide_pci_check_simplex(ide_hwif_t *, const struct ide_port_info *); |
| 1116 | int ide_hwif_setup_dma(ide_hwif_t *, const struct ide_port_info *); | 1115 | int ide_hwif_setup_dma(ide_hwif_t *, const struct ide_port_info *); |
| 1117 | #else | 1116 | #else |
| @@ -1275,6 +1274,7 @@ extern int __ide_dma_end(ide_drive_t *); | |||
| 1275 | int ide_dma_test_irq(ide_drive_t *); | 1274 | int ide_dma_test_irq(ide_drive_t *); |
| 1276 | extern void ide_dma_lost_irq(ide_drive_t *); | 1275 | extern void ide_dma_lost_irq(ide_drive_t *); |
| 1277 | extern void ide_dma_timeout(ide_drive_t *); | 1276 | extern void ide_dma_timeout(ide_drive_t *); |
| 1277 | extern const struct ide_dma_ops sff_dma_ops; | ||
| 1278 | #endif /* CONFIG_BLK_DEV_IDEDMA_SFF */ | 1278 | #endif /* CONFIG_BLK_DEV_IDEDMA_SFF */ |
| 1279 | 1279 | ||
| 1280 | #else | 1280 | #else |
| @@ -1448,8 +1448,7 @@ static inline void ide_dump_identify(u8 *id) | |||
| 1448 | 1448 | ||
| 1449 | static inline int hwif_to_node(ide_hwif_t *hwif) | 1449 | static inline int hwif_to_node(ide_hwif_t *hwif) |
| 1450 | { | 1450 | { |
| 1451 | struct pci_dev *dev = to_pci_dev(hwif->dev); | 1451 | return hwif->dev ? dev_to_node(hwif->dev) : -1; |
| 1452 | return hwif->dev ? pcibus_to_node(dev->bus) : -1; | ||
| 1453 | } | 1452 | } |
| 1454 | 1453 | ||
| 1455 | static inline ide_drive_t *ide_get_paired_drive(ide_drive_t *drive) | 1454 | static inline ide_drive_t *ide_get_paired_drive(ide_drive_t *drive) |
diff --git a/include/linux/if_tun.h b/include/linux/if_tun.h index 4c6307ad9fdb..8529f57ba263 100644 --- a/include/linux/if_tun.h +++ b/include/linux/if_tun.h | |||
| @@ -45,6 +45,7 @@ | |||
| 45 | #define TUNGETFEATURES _IOR('T', 207, unsigned int) | 45 | #define TUNGETFEATURES _IOR('T', 207, unsigned int) |
| 46 | #define TUNSETOFFLOAD _IOW('T', 208, unsigned int) | 46 | #define TUNSETOFFLOAD _IOW('T', 208, unsigned int) |
| 47 | #define TUNSETTXFILTER _IOW('T', 209, unsigned int) | 47 | #define TUNSETTXFILTER _IOW('T', 209, unsigned int) |
| 48 | #define TUNGETIFF _IOR('T', 210, unsigned int) | ||
| 48 | 49 | ||
| 49 | /* TUNSETIFF ifr flags */ | 50 | /* TUNSETIFF ifr flags */ |
| 50 | #define IFF_TUN 0x0001 | 51 | #define IFF_TUN 0x0001 |
diff --git a/include/linux/init.h b/include/linux/init.h index 11b84e106053..93538b696e3d 100644 --- a/include/linux/init.h +++ b/include/linux/init.h | |||
| @@ -139,6 +139,7 @@ extern initcall_t __con_initcall_start[], __con_initcall_end[]; | |||
| 139 | extern initcall_t __security_initcall_start[], __security_initcall_end[]; | 139 | extern initcall_t __security_initcall_start[], __security_initcall_end[]; |
| 140 | 140 | ||
| 141 | /* Defined in init/main.c */ | 141 | /* Defined in init/main.c */ |
| 142 | extern int do_one_initcall(initcall_t fn); | ||
| 142 | extern char __initdata boot_command_line[]; | 143 | extern char __initdata boot_command_line[]; |
| 143 | extern char *saved_command_line; | 144 | extern char *saved_command_line; |
| 144 | extern unsigned int reset_devices; | 145 | extern unsigned int reset_devices; |
diff --git a/include/linux/ioport.h b/include/linux/ioport.h index 22d2115458c6..8d3b7a9afd17 100644 --- a/include/linux/ioport.h +++ b/include/linux/ioport.h | |||
| @@ -109,6 +109,7 @@ extern struct resource iomem_resource; | |||
| 109 | extern int request_resource(struct resource *root, struct resource *new); | 109 | extern int request_resource(struct resource *root, struct resource *new); |
| 110 | extern int release_resource(struct resource *new); | 110 | extern int release_resource(struct resource *new); |
| 111 | extern int insert_resource(struct resource *parent, struct resource *new); | 111 | extern int insert_resource(struct resource *parent, struct resource *new); |
| 112 | extern void insert_resource_expand_to_fit(struct resource *root, struct resource *new); | ||
| 112 | extern int allocate_resource(struct resource *root, struct resource *new, | 113 | extern int allocate_resource(struct resource *root, struct resource *new, |
| 113 | resource_size_t size, resource_size_t min, | 114 | resource_size_t size, resource_size_t min, |
| 114 | resource_size_t max, resource_size_t align, | 115 | resource_size_t max, resource_size_t align, |
diff --git a/include/linux/ivtv.h b/include/linux/ivtv.h index 794b8daa9378..17ca64b5a66c 100644 --- a/include/linux/ivtv.h +++ b/include/linux/ivtv.h | |||
| @@ -21,11 +21,7 @@ | |||
| 21 | #ifndef __LINUX_IVTV_H__ | 21 | #ifndef __LINUX_IVTV_H__ |
| 22 | #define __LINUX_IVTV_H__ | 22 | #define __LINUX_IVTV_H__ |
| 23 | 23 | ||
| 24 | #ifdef __KERNEL__ | 24 | #include <linux/compiler.h> |
| 25 | #include <linux/compiler.h> /* need __user */ | ||
| 26 | #else | ||
| 27 | #define __user | ||
| 28 | #endif | ||
| 29 | #include <linux/types.h> | 25 | #include <linux/types.h> |
| 30 | 26 | ||
| 31 | /* ivtv knows several distinct output modes: MPEG streaming, | 27 | /* ivtv knows several distinct output modes: MPEG streaming, |
diff --git a/include/linux/ivtvfb.h b/include/linux/ivtvfb.h index e980ba62ddcc..e20af47b59ad 100644 --- a/include/linux/ivtvfb.h +++ b/include/linux/ivtvfb.h | |||
| @@ -21,11 +21,7 @@ | |||
| 21 | #ifndef __LINUX_IVTVFB_H__ | 21 | #ifndef __LINUX_IVTVFB_H__ |
| 22 | #define __LINUX_IVTVFB_H__ | 22 | #define __LINUX_IVTVFB_H__ |
| 23 | 23 | ||
| 24 | #ifdef __KERNEL__ | 24 | #include <linux/compiler.h> |
| 25 | #include <linux/compiler.h> /* need __user */ | ||
| 26 | #else | ||
| 27 | #define __user | ||
| 28 | #endif | ||
| 29 | #include <linux/types.h> | 25 | #include <linux/types.h> |
| 30 | 26 | ||
| 31 | /* Framebuffer external API */ | 27 | /* Framebuffer external API */ |
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index aaa998f65c7a..2651f805ba6d 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h | |||
| @@ -108,6 +108,13 @@ struct completion; | |||
| 108 | struct pt_regs; | 108 | struct pt_regs; |
| 109 | struct user; | 109 | struct user; |
| 110 | 110 | ||
| 111 | #ifdef CONFIG_PREEMPT_VOLUNTARY | ||
| 112 | extern int _cond_resched(void); | ||
| 113 | # define might_resched() _cond_resched() | ||
| 114 | #else | ||
| 115 | # define might_resched() do { } while (0) | ||
| 116 | #endif | ||
| 117 | |||
| 111 | /** | 118 | /** |
| 112 | * might_sleep - annotation for functions that can sleep | 119 | * might_sleep - annotation for functions that can sleep |
| 113 | * | 120 | * |
| @@ -118,13 +125,6 @@ struct user; | |||
| 118 | * be bitten later when the calling function happens to sleep when it is not | 125 | * be bitten later when the calling function happens to sleep when it is not |
| 119 | * supposed to. | 126 | * supposed to. |
| 120 | */ | 127 | */ |
| 121 | #ifdef CONFIG_PREEMPT_VOLUNTARY | ||
| 122 | extern int _cond_resched(void); | ||
| 123 | # define might_resched() _cond_resched() | ||
| 124 | #else | ||
| 125 | # define might_resched() do { } while (0) | ||
| 126 | #endif | ||
| 127 | |||
| 128 | #ifdef CONFIG_DEBUG_SPINLOCK_SLEEP | 128 | #ifdef CONFIG_DEBUG_SPINLOCK_SLEEP |
| 129 | void __might_sleep(char *file, int line); | 129 | void __might_sleep(char *file, int line); |
| 130 | # define might_sleep() \ | 130 | # define might_sleep() \ |
diff --git a/include/linux/kexec.h b/include/linux/kexec.h index 32110cede64f..17f76fc05173 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h | |||
| @@ -25,8 +25,8 @@ | |||
| 25 | #error KEXEC_CONTROL_MEMORY_LIMIT not defined | 25 | #error KEXEC_CONTROL_MEMORY_LIMIT not defined |
| 26 | #endif | 26 | #endif |
| 27 | 27 | ||
| 28 | #ifndef KEXEC_CONTROL_CODE_SIZE | 28 | #ifndef KEXEC_CONTROL_PAGE_SIZE |
| 29 | #error KEXEC_CONTROL_CODE_SIZE not defined | 29 | #error KEXEC_CONTROL_PAGE_SIZE not defined |
| 30 | #endif | 30 | #endif |
| 31 | 31 | ||
| 32 | #ifndef KEXEC_ARCH | 32 | #ifndef KEXEC_ARCH |
diff --git a/include/linux/kvm.h b/include/linux/kvm.h index 69511f74f912..70a30651cd12 100644 --- a/include/linux/kvm.h +++ b/include/linux/kvm.h | |||
| @@ -320,12 +320,12 @@ struct kvm_trace_rec { | |||
| 320 | struct { | 320 | struct { |
| 321 | __u64 cycle_u64; | 321 | __u64 cycle_u64; |
| 322 | __u32 extra_u32[KVM_TRC_EXTRA_MAX]; | 322 | __u32 extra_u32[KVM_TRC_EXTRA_MAX]; |
| 323 | } cycle; | 323 | } __attribute__((packed)) cycle; |
| 324 | struct { | 324 | struct { |
| 325 | __u32 extra_u32[KVM_TRC_EXTRA_MAX]; | 325 | __u32 extra_u32[KVM_TRC_EXTRA_MAX]; |
| 326 | } nocycle; | 326 | } nocycle; |
| 327 | } u; | 327 | } u; |
| 328 | } __attribute__((packed)); | 328 | }; |
| 329 | 329 | ||
| 330 | #define KVMIO 0xAE | 330 | #define KVMIO 0xAE |
| 331 | 331 | ||
diff --git a/include/linux/libata.h b/include/linux/libata.h index 06b80337303b..225bfc5bd9ec 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h | |||
| @@ -163,6 +163,7 @@ enum { | |||
| 163 | ATA_DEV_NONE = 9, /* no device */ | 163 | ATA_DEV_NONE = 9, /* no device */ |
| 164 | 164 | ||
| 165 | /* struct ata_link flags */ | 165 | /* struct ata_link flags */ |
| 166 | ATA_LFLAG_NO_HRST = (1 << 1), /* avoid hardreset */ | ||
| 166 | ATA_LFLAG_NO_SRST = (1 << 2), /* avoid softreset */ | 167 | ATA_LFLAG_NO_SRST = (1 << 2), /* avoid softreset */ |
| 167 | ATA_LFLAG_ASSUME_ATA = (1 << 3), /* assume ATA class */ | 168 | ATA_LFLAG_ASSUME_ATA = (1 << 3), /* assume ATA class */ |
| 168 | ATA_LFLAG_ASSUME_SEMB = (1 << 4), /* assume SEMB class */ | 169 | ATA_LFLAG_ASSUME_SEMB = (1 << 4), /* assume SEMB class */ |
| @@ -646,6 +647,7 @@ struct ata_link { | |||
| 646 | 647 | ||
| 647 | unsigned int flags; /* ATA_LFLAG_xxx */ | 648 | unsigned int flags; /* ATA_LFLAG_xxx */ |
| 648 | 649 | ||
| 650 | u32 saved_scontrol; /* SControl on probe */ | ||
| 649 | unsigned int hw_sata_spd_limit; | 651 | unsigned int hw_sata_spd_limit; |
| 650 | unsigned int sata_spd_limit; | 652 | unsigned int sata_spd_limit; |
| 651 | unsigned int sata_spd; /* current SATA PHY speed */ | 653 | unsigned int sata_spd; /* current SATA PHY speed */ |
| @@ -1427,6 +1429,28 @@ static inline unsigned long ata_deadline(unsigned long from_jiffies, | |||
| 1427 | return from_jiffies + msecs_to_jiffies(timeout_msecs); | 1429 | return from_jiffies + msecs_to_jiffies(timeout_msecs); |
| 1428 | } | 1430 | } |
| 1429 | 1431 | ||
| 1432 | /* Don't open code these in drivers as there are traps. Firstly the range may | ||
| 1433 | change in future hardware and specs, secondly 0xFF means 'no DMA' but is | ||
| 1434 | > UDMA_0. Dyma ddreigiau */ | ||
| 1435 | |||
| 1436 | static inline int ata_using_mwdma(struct ata_device *adev) | ||
| 1437 | { | ||
| 1438 | if (adev->dma_mode >= XFER_MW_DMA_0 && adev->dma_mode <= XFER_MW_DMA_4) | ||
| 1439 | return 1; | ||
| 1440 | return 0; | ||
| 1441 | } | ||
| 1442 | |||
| 1443 | static inline int ata_using_udma(struct ata_device *adev) | ||
| 1444 | { | ||
| 1445 | if (adev->dma_mode >= XFER_UDMA_0 && adev->dma_mode <= XFER_UDMA_7) | ||
| 1446 | return 1; | ||
| 1447 | return 0; | ||
| 1448 | } | ||
| 1449 | |||
| 1450 | static inline int ata_dma_enabled(struct ata_device *adev) | ||
| 1451 | { | ||
| 1452 | return (adev->dma_mode == 0xFF ? 0 : 1); | ||
| 1453 | } | ||
| 1430 | 1454 | ||
| 1431 | /************************************************************************** | 1455 | /************************************************************************** |
| 1432 | * PMP - drivers/ata/libata-pmp.c | 1456 | * PMP - drivers/ata/libata-pmp.c |
diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h index 2486eb4edbf1..331e5f1c2d8e 100644 --- a/include/linux/lockdep.h +++ b/include/linux/lockdep.h | |||
| @@ -89,6 +89,7 @@ struct lock_class { | |||
| 89 | 89 | ||
| 90 | struct lockdep_subclass_key *key; | 90 | struct lockdep_subclass_key *key; |
| 91 | unsigned int subclass; | 91 | unsigned int subclass; |
| 92 | unsigned int dep_gen_id; | ||
| 92 | 93 | ||
| 93 | /* | 94 | /* |
| 94 | * IRQ/softirq usage tracking bits: | 95 | * IRQ/softirq usage tracking bits: |
| @@ -189,6 +190,14 @@ struct lock_chain { | |||
| 189 | u64 chain_key; | 190 | u64 chain_key; |
| 190 | }; | 191 | }; |
| 191 | 192 | ||
| 193 | #define MAX_LOCKDEP_KEYS_BITS 13 | ||
| 194 | /* | ||
| 195 | * Subtract one because we offset hlock->class_idx by 1 in order | ||
| 196 | * to make 0 mean no class. This avoids overflowing the class_idx | ||
| 197 | * bitfield and hitting the BUG in hlock_class(). | ||
| 198 | */ | ||
| 199 | #define MAX_LOCKDEP_KEYS ((1UL << MAX_LOCKDEP_KEYS_BITS) - 1) | ||
| 200 | |||
| 192 | struct held_lock { | 201 | struct held_lock { |
| 193 | /* | 202 | /* |
| 194 | * One-way hash of the dependency chain up to this point. We | 203 | * One-way hash of the dependency chain up to this point. We |
| @@ -205,14 +214,14 @@ struct held_lock { | |||
| 205 | * with zero), here we store the previous hash value: | 214 | * with zero), here we store the previous hash value: |
| 206 | */ | 215 | */ |
| 207 | u64 prev_chain_key; | 216 | u64 prev_chain_key; |
| 208 | struct lock_class *class; | ||
| 209 | unsigned long acquire_ip; | 217 | unsigned long acquire_ip; |
| 210 | struct lockdep_map *instance; | 218 | struct lockdep_map *instance; |
| 211 | 219 | struct lockdep_map *nest_lock; | |
| 212 | #ifdef CONFIG_LOCK_STAT | 220 | #ifdef CONFIG_LOCK_STAT |
| 213 | u64 waittime_stamp; | 221 | u64 waittime_stamp; |
| 214 | u64 holdtime_stamp; | 222 | u64 holdtime_stamp; |
| 215 | #endif | 223 | #endif |
| 224 | unsigned int class_idx:MAX_LOCKDEP_KEYS_BITS; | ||
| 216 | /* | 225 | /* |
| 217 | * The lock-stack is unified in that the lock chains of interrupt | 226 | * The lock-stack is unified in that the lock chains of interrupt |
| 218 | * contexts nest ontop of process context chains, but we 'separate' | 227 | * contexts nest ontop of process context chains, but we 'separate' |
| @@ -226,11 +235,11 @@ struct held_lock { | |||
| 226 | * The following field is used to detect when we cross into an | 235 | * The following field is used to detect when we cross into an |
| 227 | * interrupt context: | 236 | * interrupt context: |
| 228 | */ | 237 | */ |
| 229 | int irq_context; | 238 | unsigned int irq_context:2; /* bit 0 - soft, bit 1 - hard */ |
| 230 | int trylock; | 239 | unsigned int trylock:1; |
| 231 | int read; | 240 | unsigned int read:2; /* see lock_acquire() comment */ |
| 232 | int check; | 241 | unsigned int check:2; /* see lock_acquire() comment */ |
| 233 | int hardirqs_off; | 242 | unsigned int hardirqs_off:1; |
| 234 | }; | 243 | }; |
| 235 | 244 | ||
| 236 | /* | 245 | /* |
| @@ -294,11 +303,15 @@ extern void lockdep_init_map(struct lockdep_map *lock, const char *name, | |||
| 294 | * 2: full validation | 303 | * 2: full validation |
| 295 | */ | 304 | */ |
| 296 | extern void lock_acquire(struct lockdep_map *lock, unsigned int subclass, | 305 | extern void lock_acquire(struct lockdep_map *lock, unsigned int subclass, |
| 297 | int trylock, int read, int check, unsigned long ip); | 306 | int trylock, int read, int check, |
| 307 | struct lockdep_map *nest_lock, unsigned long ip); | ||
| 298 | 308 | ||
| 299 | extern void lock_release(struct lockdep_map *lock, int nested, | 309 | extern void lock_release(struct lockdep_map *lock, int nested, |
| 300 | unsigned long ip); | 310 | unsigned long ip); |
| 301 | 311 | ||
| 312 | extern void lock_set_subclass(struct lockdep_map *lock, unsigned int subclass, | ||
| 313 | unsigned long ip); | ||
| 314 | |||
| 302 | # define INIT_LOCKDEP .lockdep_recursion = 0, | 315 | # define INIT_LOCKDEP .lockdep_recursion = 0, |
| 303 | 316 | ||
| 304 | #define lockdep_depth(tsk) (debug_locks ? (tsk)->lockdep_depth : 0) | 317 | #define lockdep_depth(tsk) (debug_locks ? (tsk)->lockdep_depth : 0) |
| @@ -313,8 +326,9 @@ static inline void lockdep_on(void) | |||
| 313 | { | 326 | { |
| 314 | } | 327 | } |
| 315 | 328 | ||
| 316 | # define lock_acquire(l, s, t, r, c, i) do { } while (0) | 329 | # define lock_acquire(l, s, t, r, c, n, i) do { } while (0) |
| 317 | # define lock_release(l, n, i) do { } while (0) | 330 | # define lock_release(l, n, i) do { } while (0) |
| 331 | # define lock_set_subclass(l, s, i) do { } while (0) | ||
| 318 | # define lockdep_init() do { } while (0) | 332 | # define lockdep_init() do { } while (0) |
| 319 | # define lockdep_info() do { } while (0) | 333 | # define lockdep_info() do { } while (0) |
| 320 | # define lockdep_init_map(lock, name, key, sub) do { (void)(key); } while (0) | 334 | # define lockdep_init_map(lock, name, key, sub) do { (void)(key); } while (0) |
| @@ -400,9 +414,11 @@ static inline void print_irqtrace_events(struct task_struct *curr) | |||
| 400 | 414 | ||
| 401 | #ifdef CONFIG_DEBUG_LOCK_ALLOC | 415 | #ifdef CONFIG_DEBUG_LOCK_ALLOC |
| 402 | # ifdef CONFIG_PROVE_LOCKING | 416 | # ifdef CONFIG_PROVE_LOCKING |
| 403 | # define spin_acquire(l, s, t, i) lock_acquire(l, s, t, 0, 2, i) | 417 | # define spin_acquire(l, s, t, i) lock_acquire(l, s, t, 0, 2, NULL, i) |
| 418 | # define spin_acquire_nest(l, s, t, n, i) lock_acquire(l, s, t, 0, 2, n, i) | ||
| 404 | # else | 419 | # else |
| 405 | # define spin_acquire(l, s, t, i) lock_acquire(l, s, t, 0, 1, i) | 420 | # define spin_acquire(l, s, t, i) lock_acquire(l, s, t, 0, 1, NULL, i) |
| 421 | # define spin_acquire_nest(l, s, t, n, i) lock_acquire(l, s, t, 0, 1, NULL, i) | ||
| 406 | # endif | 422 | # endif |
| 407 | # define spin_release(l, n, i) lock_release(l, n, i) | 423 | # define spin_release(l, n, i) lock_release(l, n, i) |
| 408 | #else | 424 | #else |
| @@ -412,11 +428,11 @@ static inline void print_irqtrace_events(struct task_struct *curr) | |||
| 412 | 428 | ||
| 413 | #ifdef CONFIG_DEBUG_LOCK_ALLOC | 429 | #ifdef CONFIG_DEBUG_LOCK_ALLOC |
| 414 | # ifdef CONFIG_PROVE_LOCKING | 430 | # ifdef CONFIG_PROVE_LOCKING |
| 415 | # define rwlock_acquire(l, s, t, i) lock_acquire(l, s, t, 0, 2, i) | 431 | # define rwlock_acquire(l, s, t, i) lock_acquire(l, s, t, 0, 2, NULL, i) |
| 416 | # define rwlock_acquire_read(l, s, t, i) lock_acquire(l, s, t, 2, 2, i) | 432 | # define rwlock_acquire_read(l, s, t, i) lock_acquire(l, s, t, 2, 2, NULL, i) |
| 417 | # else | 433 | # else |
| 418 | # define rwlock_acquire(l, s, t, i) lock_acquire(l, s, t, 0, 1, i) | 434 | # define rwlock_acquire(l, s, t, i) lock_acquire(l, s, t, 0, 1, NULL, i) |
| 419 | # define rwlock_acquire_read(l, s, t, i) lock_acquire(l, s, t, 2, 1, i) | 435 | # define rwlock_acquire_read(l, s, t, i) lock_acquire(l, s, t, 2, 1, NULL, i) |
| 420 | # endif | 436 | # endif |
| 421 | # define rwlock_release(l, n, i) lock_release(l, n, i) | 437 | # define rwlock_release(l, n, i) lock_release(l, n, i) |
| 422 | #else | 438 | #else |
| @@ -427,9 +443,9 @@ static inline void print_irqtrace_events(struct task_struct *curr) | |||
| 427 | 443 | ||
| 428 | #ifdef CONFIG_DEBUG_LOCK_ALLOC | 444 | #ifdef CONFIG_DEBUG_LOCK_ALLOC |
| 429 | # ifdef CONFIG_PROVE_LOCKING | 445 | # ifdef CONFIG_PROVE_LOCKING |
| 430 | # define mutex_acquire(l, s, t, i) lock_acquire(l, s, t, 0, 2, i) | 446 | # define mutex_acquire(l, s, t, i) lock_acquire(l, s, t, 0, 2, NULL, i) |
| 431 | # else | 447 | # else |
| 432 | # define mutex_acquire(l, s, t, i) lock_acquire(l, s, t, 0, 1, i) | 448 | # define mutex_acquire(l, s, t, i) lock_acquire(l, s, t, 0, 1, NULL, i) |
| 433 | # endif | 449 | # endif |
| 434 | # define mutex_release(l, n, i) lock_release(l, n, i) | 450 | # define mutex_release(l, n, i) lock_release(l, n, i) |
| 435 | #else | 451 | #else |
| @@ -439,11 +455,11 @@ static inline void print_irqtrace_events(struct task_struct *curr) | |||
| 439 | 455 | ||
| 440 | #ifdef CONFIG_DEBUG_LOCK_ALLOC | 456 | #ifdef CONFIG_DEBUG_LOCK_ALLOC |
| 441 | # ifdef CONFIG_PROVE_LOCKING | 457 | # ifdef CONFIG_PROVE_LOCKING |
| 442 | # define rwsem_acquire(l, s, t, i) lock_acquire(l, s, t, 0, 2, i) | 458 | # define rwsem_acquire(l, s, t, i) lock_acquire(l, s, t, 0, 2, NULL, i) |
| 443 | # define rwsem_acquire_read(l, s, t, i) lock_acquire(l, s, t, 1, 2, i) | 459 | # define rwsem_acquire_read(l, s, t, i) lock_acquire(l, s, t, 1, 2, NULL, i) |
| 444 | # else | 460 | # else |
| 445 | # define rwsem_acquire(l, s, t, i) lock_acquire(l, s, t, 0, 1, i) | 461 | # define rwsem_acquire(l, s, t, i) lock_acquire(l, s, t, 0, 1, NULL, i) |
| 446 | # define rwsem_acquire_read(l, s, t, i) lock_acquire(l, s, t, 1, 1, i) | 462 | # define rwsem_acquire_read(l, s, t, i) lock_acquire(l, s, t, 1, 1, NULL, i) |
| 447 | # endif | 463 | # endif |
| 448 | # define rwsem_release(l, n, i) lock_release(l, n, i) | 464 | # define rwsem_release(l, n, i) lock_release(l, n, i) |
| 449 | #else | 465 | #else |
| @@ -452,4 +468,16 @@ static inline void print_irqtrace_events(struct task_struct *curr) | |||
| 452 | # define rwsem_release(l, n, i) do { } while (0) | 468 | # define rwsem_release(l, n, i) do { } while (0) |
| 453 | #endif | 469 | #endif |
| 454 | 470 | ||
| 471 | #ifdef CONFIG_DEBUG_LOCK_ALLOC | ||
| 472 | # ifdef CONFIG_PROVE_LOCKING | ||
| 473 | # define lock_map_acquire(l) lock_acquire(l, 0, 0, 0, 2, NULL, _THIS_IP_) | ||
| 474 | # else | ||
| 475 | # define lock_map_acquire(l) lock_acquire(l, 0, 0, 0, 1, NULL, _THIS_IP_) | ||
| 476 | # endif | ||
| 477 | # define lock_map_release(l) lock_release(l, 1, _THIS_IP_) | ||
| 478 | #else | ||
| 479 | # define lock_map_acquire(l) do { } while (0) | ||
| 480 | # define lock_map_release(l) do { } while (0) | ||
| 481 | #endif | ||
| 482 | |||
| 455 | #endif /* __LINUX_LOCKDEP_H */ | 483 | #endif /* __LINUX_LOCKDEP_H */ |
diff --git a/include/linux/mm.h b/include/linux/mm.h index 335288bff1b7..72a15dc26bbf 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h | |||
| @@ -73,7 +73,7 @@ extern unsigned int kobjsize(const void *objp); | |||
| 73 | #endif | 73 | #endif |
| 74 | 74 | ||
| 75 | /* | 75 | /* |
| 76 | * vm_flags.. | 76 | * vm_flags in vm_area_struct, see mm_types.h. |
| 77 | */ | 77 | */ |
| 78 | #define VM_READ 0x00000001 /* currently active flags */ | 78 | #define VM_READ 0x00000001 /* currently active flags */ |
| 79 | #define VM_WRITE 0x00000002 | 79 | #define VM_WRITE 0x00000002 |
| @@ -834,7 +834,6 @@ extern int mprotect_fixup(struct vm_area_struct *vma, | |||
| 834 | struct vm_area_struct **pprev, unsigned long start, | 834 | struct vm_area_struct **pprev, unsigned long start, |
| 835 | unsigned long end, unsigned long newflags); | 835 | unsigned long end, unsigned long newflags); |
| 836 | 836 | ||
| 837 | #ifdef CONFIG_HAVE_GET_USER_PAGES_FAST | ||
| 838 | /* | 837 | /* |
| 839 | * get_user_pages_fast provides equivalent functionality to get_user_pages, | 838 | * get_user_pages_fast provides equivalent functionality to get_user_pages, |
| 840 | * operating on current and current->mm (force=0 and doesn't return any vmas). | 839 | * operating on current and current->mm (force=0 and doesn't return any vmas). |
| @@ -848,25 +847,6 @@ extern int mprotect_fixup(struct vm_area_struct *vma, | |||
| 848 | int get_user_pages_fast(unsigned long start, int nr_pages, int write, | 847 | int get_user_pages_fast(unsigned long start, int nr_pages, int write, |
| 849 | struct page **pages); | 848 | struct page **pages); |
| 850 | 849 | ||
| 851 | #else | ||
| 852 | /* | ||
| 853 | * Should probably be moved to asm-generic, and architectures can include it if | ||
| 854 | * they don't implement their own get_user_pages_fast. | ||
| 855 | */ | ||
| 856 | #define get_user_pages_fast(start, nr_pages, write, pages) \ | ||
| 857 | ({ \ | ||
| 858 | struct mm_struct *mm = current->mm; \ | ||
| 859 | int ret; \ | ||
| 860 | \ | ||
| 861 | down_read(&mm->mmap_sem); \ | ||
| 862 | ret = get_user_pages(current, mm, start, nr_pages, \ | ||
| 863 | write, 0, pages, NULL); \ | ||
| 864 | up_read(&mm->mmap_sem); \ | ||
| 865 | \ | ||
| 866 | ret; \ | ||
| 867 | }) | ||
| 868 | #endif | ||
| 869 | |||
| 870 | /* | 850 | /* |
| 871 | * A callback you can register to apply pressure to ageable caches. | 851 | * A callback you can register to apply pressure to ageable caches. |
| 872 | * | 852 | * |
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 386edbe2cb4e..bf334138c7c1 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h | |||
| @@ -113,7 +113,7 @@ struct vm_area_struct { | |||
| 113 | struct vm_area_struct *vm_next; | 113 | struct vm_area_struct *vm_next; |
| 114 | 114 | ||
| 115 | pgprot_t vm_page_prot; /* Access permissions of this VMA. */ | 115 | pgprot_t vm_page_prot; /* Access permissions of this VMA. */ |
| 116 | unsigned long vm_flags; /* Flags, listed below. */ | 116 | unsigned long vm_flags; /* Flags, see mm.h. */ |
| 117 | 117 | ||
| 118 | struct rb_node vm_rb; | 118 | struct rb_node vm_rb; |
| 119 | 119 | ||
diff --git a/include/linux/mroute.h b/include/linux/mroute.h index 07112ee9293a..8a455694d682 100644 --- a/include/linux/mroute.h +++ b/include/linux/mroute.h | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | #ifdef __KERNEL__ | 6 | #ifdef __KERNEL__ |
| 7 | #include <linux/in.h> | 7 | #include <linux/in.h> |
| 8 | #endif | 8 | #endif |
| 9 | #include <linux/pim.h> | ||
| 10 | 9 | ||
| 11 | /* | 10 | /* |
| 12 | * Based on the MROUTING 3.5 defines primarily to keep | 11 | * Based on the MROUTING 3.5 defines primarily to keep |
| @@ -130,6 +129,7 @@ struct igmpmsg | |||
| 130 | */ | 129 | */ |
| 131 | 130 | ||
| 132 | #ifdef __KERNEL__ | 131 | #ifdef __KERNEL__ |
| 132 | #include <linux/pim.h> | ||
| 133 | #include <net/sock.h> | 133 | #include <net/sock.h> |
| 134 | 134 | ||
| 135 | #ifdef CONFIG_IP_MROUTE | 135 | #ifdef CONFIG_IP_MROUTE |
diff --git a/include/linux/mroute6.h b/include/linux/mroute6.h index 5cf50473a10f..6f4c180179e2 100644 --- a/include/linux/mroute6.h +++ b/include/linux/mroute6.h | |||
| @@ -115,6 +115,7 @@ struct sioc_mif_req6 | |||
| 115 | 115 | ||
| 116 | #ifdef __KERNEL__ | 116 | #ifdef __KERNEL__ |
| 117 | 117 | ||
| 118 | #include <linux/pim.h> | ||
| 118 | #include <linux/skbuff.h> /* for struct sk_buff_head */ | 119 | #include <linux/skbuff.h> /* for struct sk_buff_head */ |
| 119 | 120 | ||
| 120 | #ifdef CONFIG_IPV6_MROUTE | 121 | #ifdef CONFIG_IPV6_MROUTE |
diff --git a/include/linux/net.h b/include/linux/net.h index 4a9a30f2d68f..6dc14a240042 100644 --- a/include/linux/net.h +++ b/include/linux/net.h | |||
| @@ -18,16 +18,9 @@ | |||
| 18 | #ifndef _LINUX_NET_H | 18 | #ifndef _LINUX_NET_H |
| 19 | #define _LINUX_NET_H | 19 | #define _LINUX_NET_H |
| 20 | 20 | ||
| 21 | #include <linux/wait.h> | ||
| 22 | #include <linux/socket.h> | 21 | #include <linux/socket.h> |
| 23 | #include <linux/fcntl.h> /* For O_CLOEXEC and O_NONBLOCK */ | ||
| 24 | #include <asm/socket.h> | 22 | #include <asm/socket.h> |
| 25 | 23 | ||
| 26 | struct poll_table_struct; | ||
| 27 | struct pipe_inode_info; | ||
| 28 | struct inode; | ||
| 29 | struct net; | ||
| 30 | |||
| 31 | #define NPROTO AF_MAX | 24 | #define NPROTO AF_MAX |
| 32 | 25 | ||
| 33 | #define SYS_SOCKET 1 /* sys_socket(2) */ | 26 | #define SYS_SOCKET 1 /* sys_socket(2) */ |
| @@ -62,6 +55,13 @@ typedef enum { | |||
| 62 | #ifdef __KERNEL__ | 55 | #ifdef __KERNEL__ |
| 63 | #include <linux/stringify.h> | 56 | #include <linux/stringify.h> |
| 64 | #include <linux/random.h> | 57 | #include <linux/random.h> |
| 58 | #include <linux/wait.h> | ||
| 59 | #include <linux/fcntl.h> /* For O_CLOEXEC and O_NONBLOCK */ | ||
| 60 | |||
| 61 | struct poll_table_struct; | ||
| 62 | struct pipe_inode_info; | ||
| 63 | struct inode; | ||
| 64 | struct net; | ||
| 65 | 65 | ||
| 66 | #define SOCK_ASYNC_NOSPACE 0 | 66 | #define SOCK_ASYNC_NOSPACE 0 |
| 67 | #define SOCK_ASYNC_WAITDATA 1 | 67 | #define SOCK_ASYNC_WAITDATA 1 |
diff --git a/include/linux/pci-acpi.h b/include/linux/pci-acpi.h index 3ba25065fa96..8837928fbf33 100644 --- a/include/linux/pci-acpi.h +++ b/include/linux/pci-acpi.h | |||
| @@ -57,6 +57,15 @@ static inline acpi_status pcie_osc_support_set(u32 flags) | |||
| 57 | { | 57 | { |
| 58 | return __pci_osc_support_set(flags, PCI_EXPRESS_ROOT_HID_STRING); | 58 | return __pci_osc_support_set(flags, PCI_EXPRESS_ROOT_HID_STRING); |
| 59 | } | 59 | } |
| 60 | static inline acpi_handle acpi_find_root_bridge_handle(struct pci_dev *pdev) | ||
| 61 | { | ||
| 62 | /* Find root host bridge */ | ||
| 63 | while (pdev->bus->self) | ||
| 64 | pdev = pdev->bus->self; | ||
| 65 | |||
| 66 | return acpi_get_pci_rootbridge_handle(pci_domain_nr(pdev->bus), | ||
| 67 | pdev->bus->number); | ||
| 68 | } | ||
| 60 | #else | 69 | #else |
| 61 | #if !defined(AE_ERROR) | 70 | #if !defined(AE_ERROR) |
| 62 | typedef u32 acpi_status; | 71 | typedef u32 acpi_status; |
| @@ -66,6 +75,8 @@ static inline acpi_status pci_osc_control_set(acpi_handle handle, u32 flags) | |||
| 66 | {return AE_ERROR;} | 75 | {return AE_ERROR;} |
| 67 | static inline acpi_status pci_osc_support_set(u32 flags) {return AE_ERROR;} | 76 | static inline acpi_status pci_osc_support_set(u32 flags) {return AE_ERROR;} |
| 68 | static inline acpi_status pcie_osc_support_set(u32 flags) {return AE_ERROR;} | 77 | static inline acpi_status pcie_osc_support_set(u32 flags) {return AE_ERROR;} |
| 78 | static inline acpi_handle acpi_find_root_bridge_handle(struct pci_dev *pdev) | ||
| 79 | { return NULL; } | ||
| 69 | #endif | 80 | #endif |
| 70 | 81 | ||
| 71 | #endif /* _PCI_ACPI_H_ */ | 82 | #endif /* _PCI_ACPI_H_ */ |
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 9ec2bcce8e83..f1624b396754 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -2428,6 +2428,9 @@ | |||
| 2428 | #define PCI_DEVICE_ID_INTEL_ICH10_3 0x3a1a | 2428 | #define PCI_DEVICE_ID_INTEL_ICH10_3 0x3a1a |
| 2429 | #define PCI_DEVICE_ID_INTEL_ICH10_4 0x3a30 | 2429 | #define PCI_DEVICE_ID_INTEL_ICH10_4 0x3a30 |
| 2430 | #define PCI_DEVICE_ID_INTEL_ICH10_5 0x3a60 | 2430 | #define PCI_DEVICE_ID_INTEL_ICH10_5 0x3a60 |
| 2431 | #define PCI_DEVICE_ID_INTEL_PCH_0 0x3b10 | ||
| 2432 | #define PCI_DEVICE_ID_INTEL_PCH_1 0x3b11 | ||
| 2433 | #define PCI_DEVICE_ID_INTEL_PCH_2 0x3b30 | ||
| 2431 | #define PCI_DEVICE_ID_INTEL_IOAT_SNB 0x402f | 2434 | #define PCI_DEVICE_ID_INTEL_IOAT_SNB 0x402f |
| 2432 | #define PCI_DEVICE_ID_INTEL_5100_16 0x65f0 | 2435 | #define PCI_DEVICE_ID_INTEL_5100_16 0x65f0 |
| 2433 | #define PCI_DEVICE_ID_INTEL_5100_21 0x65f5 | 2436 | #define PCI_DEVICE_ID_INTEL_5100_21 0x65f5 |
diff --git a/include/linux/pid.h b/include/linux/pid.h index 22921ac4cfd9..d7e98ff8021e 100644 --- a/include/linux/pid.h +++ b/include/linux/pid.h | |||
| @@ -161,4 +161,13 @@ pid_t pid_vnr(struct pid *pid); | |||
| 161 | } \ | 161 | } \ |
| 162 | } while (0) | 162 | } while (0) |
| 163 | 163 | ||
| 164 | #define do_each_pid_thread(pid, type, task) \ | ||
| 165 | do_each_pid_task(pid, type, task) { \ | ||
| 166 | struct task_struct *tg___ = task; \ | ||
| 167 | do { | ||
| 168 | |||
| 169 | #define while_each_pid_thread(pid, type, task) \ | ||
| 170 | } while_each_thread(tg___, task); \ | ||
| 171 | task = tg___; \ | ||
| 172 | } while_each_pid_task(pid, type, task) | ||
| 164 | #endif /* _LINUX_PID_H */ | 173 | #endif /* _LINUX_PID_H */ |
diff --git a/include/linux/pim.h b/include/linux/pim.h index 236ffd317394..1ba0661561a4 100644 --- a/include/linux/pim.h +++ b/include/linux/pim.h | |||
| @@ -3,22 +3,6 @@ | |||
| 3 | 3 | ||
| 4 | #include <asm/byteorder.h> | 4 | #include <asm/byteorder.h> |
| 5 | 5 | ||
| 6 | #ifndef __KERNEL__ | ||
| 7 | struct pim { | ||
| 8 | #if defined(__LITTLE_ENDIAN_BITFIELD) | ||
| 9 | __u8 pim_type:4, /* PIM message type */ | ||
| 10 | pim_ver:4; /* PIM version */ | ||
| 11 | #elif defined(__BIG_ENDIAN_BITFIELD) | ||
| 12 | __u8 pim_ver:4; /* PIM version */ | ||
| 13 | pim_type:4; /* PIM message type */ | ||
| 14 | #endif | ||
| 15 | __u8 pim_rsv; /* Reserved */ | ||
| 16 | __be16 pim_cksum; /* Checksum */ | ||
| 17 | }; | ||
| 18 | |||
| 19 | #define PIM_MINLEN 8 | ||
| 20 | #endif | ||
| 21 | |||
| 22 | /* Message types - V1 */ | 6 | /* Message types - V1 */ |
| 23 | #define PIM_V1_VERSION __constant_htonl(0x10000000) | 7 | #define PIM_V1_VERSION __constant_htonl(0x10000000) |
| 24 | #define PIM_V1_REGISTER 1 | 8 | #define PIM_V1_REGISTER 1 |
| @@ -27,7 +11,6 @@ struct pim { | |||
| 27 | #define PIM_VERSION 2 | 11 | #define PIM_VERSION 2 |
| 28 | #define PIM_REGISTER 1 | 12 | #define PIM_REGISTER 1 |
| 29 | 13 | ||
| 30 | #if defined(__KERNEL__) | ||
| 31 | #define PIM_NULL_REGISTER __constant_htonl(0x40000000) | 14 | #define PIM_NULL_REGISTER __constant_htonl(0x40000000) |
| 32 | 15 | ||
| 33 | /* PIMv2 register message header layout (ietf-draft-idmr-pimvsm-v2-00.ps */ | 16 | /* PIMv2 register message header layout (ietf-draft-idmr-pimvsm-v2-00.ps */ |
| @@ -42,4 +25,3 @@ struct pimreghdr | |||
| 42 | struct sk_buff; | 25 | struct sk_buff; |
| 43 | extern int pim_rcv_v1(struct sk_buff *); | 26 | extern int pim_rcv_v1(struct sk_buff *); |
| 44 | #endif | 27 | #endif |
| 45 | #endif | ||
diff --git a/include/linux/quicklist.h b/include/linux/quicklist.h index 39b66713a0bb..bd466439c588 100644 --- a/include/linux/quicklist.h +++ b/include/linux/quicklist.h | |||
| @@ -80,6 +80,13 @@ void quicklist_trim(int nr, void (*dtor)(void *), | |||
| 80 | 80 | ||
| 81 | unsigned long quicklist_total_size(void); | 81 | unsigned long quicklist_total_size(void); |
| 82 | 82 | ||
| 83 | #else | ||
| 84 | |||
| 85 | static inline unsigned long quicklist_total_size(void) | ||
| 86 | { | ||
| 87 | return 0; | ||
| 88 | } | ||
| 89 | |||
| 83 | #endif | 90 | #endif |
| 84 | 91 | ||
| 85 | #endif /* LINUX_QUICKLIST_H */ | 92 | #endif /* LINUX_QUICKLIST_H */ |
diff --git a/include/linux/rcuclassic.h b/include/linux/rcuclassic.h index 8c774905dcfe..4ab843622727 100644 --- a/include/linux/rcuclassic.h +++ b/include/linux/rcuclassic.h | |||
| @@ -117,7 +117,7 @@ extern int rcu_needs_cpu(int cpu); | |||
| 117 | #ifdef CONFIG_DEBUG_LOCK_ALLOC | 117 | #ifdef CONFIG_DEBUG_LOCK_ALLOC |
| 118 | extern struct lockdep_map rcu_lock_map; | 118 | extern struct lockdep_map rcu_lock_map; |
| 119 | # define rcu_read_acquire() \ | 119 | # define rcu_read_acquire() \ |
| 120 | lock_acquire(&rcu_lock_map, 0, 0, 2, 1, _THIS_IP_) | 120 | lock_acquire(&rcu_lock_map, 0, 0, 2, 1, NULL, _THIS_IP_) |
| 121 | # define rcu_read_release() lock_release(&rcu_lock_map, 1, _THIS_IP_) | 121 | # define rcu_read_release() lock_release(&rcu_lock_map, 1, _THIS_IP_) |
| 122 | #else | 122 | #else |
| 123 | # define rcu_read_acquire() do { } while (0) | 123 | # define rcu_read_acquire() do { } while (0) |
diff --git a/include/linux/reboot.h b/include/linux/reboot.h index b93b541cf111..988e55fe649b 100644 --- a/include/linux/reboot.h +++ b/include/linux/reboot.h | |||
| @@ -59,6 +59,7 @@ extern void machine_crash_shutdown(struct pt_regs *); | |||
| 59 | * Architecture independent implemenations of sys_reboot commands. | 59 | * Architecture independent implemenations of sys_reboot commands. |
| 60 | */ | 60 | */ |
| 61 | 61 | ||
| 62 | extern void kernel_restart_prepare(char *cmd); | ||
| 62 | extern void kernel_restart(char *cmd); | 63 | extern void kernel_restart(char *cmd); |
| 63 | extern void kernel_halt(void); | 64 | extern void kernel_halt(void); |
| 64 | extern void kernel_power_off(void); | 65 | extern void kernel_power_off(void); |
diff --git a/include/linux/rmap.h b/include/linux/rmap.h index 69407f85e10b..fed6f5e0b411 100644 --- a/include/linux/rmap.h +++ b/include/linux/rmap.h | |||
| @@ -102,7 +102,7 @@ int try_to_unmap(struct page *, int ignore_refs); | |||
| 102 | * Called from mm/filemap_xip.c to unmap empty zero page | 102 | * Called from mm/filemap_xip.c to unmap empty zero page |
| 103 | */ | 103 | */ |
| 104 | pte_t *page_check_address(struct page *, struct mm_struct *, | 104 | pte_t *page_check_address(struct page *, struct mm_struct *, |
| 105 | unsigned long, spinlock_t **); | 105 | unsigned long, spinlock_t **, int); |
| 106 | 106 | ||
| 107 | /* | 107 | /* |
| 108 | * Used by swapoff to help locate where page is expected in vma. | 108 | * Used by swapoff to help locate where page is expected in vma. |
diff --git a/include/linux/sched.h b/include/linux/sched.h index 5270d449ff9d..cfb0d87b99fc 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
| @@ -87,6 +87,7 @@ struct sched_param { | |||
| 87 | #include <linux/task_io_accounting.h> | 87 | #include <linux/task_io_accounting.h> |
| 88 | #include <linux/kobject.h> | 88 | #include <linux/kobject.h> |
| 89 | #include <linux/latencytop.h> | 89 | #include <linux/latencytop.h> |
| 90 | #include <linux/cred.h> | ||
| 90 | 91 | ||
| 91 | #include <asm/processor.h> | 92 | #include <asm/processor.h> |
| 92 | 93 | ||
| @@ -1551,16 +1552,10 @@ static inline int set_cpus_allowed(struct task_struct *p, cpumask_t new_mask) | |||
| 1551 | 1552 | ||
| 1552 | extern unsigned long long sched_clock(void); | 1553 | extern unsigned long long sched_clock(void); |
| 1553 | 1554 | ||
| 1554 | #ifndef CONFIG_HAVE_UNSTABLE_SCHED_CLOCK | 1555 | extern void sched_clock_init(void); |
| 1555 | static inline void sched_clock_init(void) | 1556 | extern u64 sched_clock_cpu(int cpu); |
| 1556 | { | ||
| 1557 | } | ||
| 1558 | |||
| 1559 | static inline u64 sched_clock_cpu(int cpu) | ||
| 1560 | { | ||
| 1561 | return sched_clock(); | ||
| 1562 | } | ||
| 1563 | 1557 | ||
| 1558 | #ifndef CONFIG_HAVE_UNSTABLE_SCHED_CLOCK | ||
| 1564 | static inline void sched_clock_tick(void) | 1559 | static inline void sched_clock_tick(void) |
| 1565 | { | 1560 | { |
| 1566 | } | 1561 | } |
| @@ -1572,28 +1567,11 @@ static inline void sched_clock_idle_sleep_event(void) | |||
| 1572 | static inline void sched_clock_idle_wakeup_event(u64 delta_ns) | 1567 | static inline void sched_clock_idle_wakeup_event(u64 delta_ns) |
| 1573 | { | 1568 | { |
| 1574 | } | 1569 | } |
| 1575 | 1570 | #else | |
| 1576 | #ifdef CONFIG_NO_HZ | ||
| 1577 | static inline void sched_clock_tick_stop(int cpu) | ||
| 1578 | { | ||
| 1579 | } | ||
| 1580 | |||
| 1581 | static inline void sched_clock_tick_start(int cpu) | ||
| 1582 | { | ||
| 1583 | } | ||
| 1584 | #endif | ||
| 1585 | |||
| 1586 | #else /* CONFIG_HAVE_UNSTABLE_SCHED_CLOCK */ | ||
| 1587 | extern void sched_clock_init(void); | ||
| 1588 | extern u64 sched_clock_cpu(int cpu); | ||
| 1589 | extern void sched_clock_tick(void); | 1571 | extern void sched_clock_tick(void); |
| 1590 | extern void sched_clock_idle_sleep_event(void); | 1572 | extern void sched_clock_idle_sleep_event(void); |
| 1591 | extern void sched_clock_idle_wakeup_event(u64 delta_ns); | 1573 | extern void sched_clock_idle_wakeup_event(u64 delta_ns); |
| 1592 | #ifdef CONFIG_NO_HZ | ||
| 1593 | extern void sched_clock_tick_stop(int cpu); | ||
| 1594 | extern void sched_clock_tick_start(int cpu); | ||
| 1595 | #endif | 1574 | #endif |
| 1596 | #endif /* CONFIG_HAVE_UNSTABLE_SCHED_CLOCK */ | ||
| 1597 | 1575 | ||
| 1598 | /* | 1576 | /* |
| 1599 | * For kernel-internal use: high-speed (but slightly incorrect) per-cpu | 1577 | * For kernel-internal use: high-speed (but slightly incorrect) per-cpu |
diff --git a/include/linux/security.h b/include/linux/security.h index fd96e7f8a6f9..80c4d002864c 100644 --- a/include/linux/security.h +++ b/include/linux/security.h | |||
| @@ -46,8 +46,8 @@ struct audit_krule; | |||
| 46 | */ | 46 | */ |
| 47 | extern int cap_capable(struct task_struct *tsk, int cap); | 47 | extern int cap_capable(struct task_struct *tsk, int cap); |
| 48 | extern int cap_settime(struct timespec *ts, struct timezone *tz); | 48 | extern int cap_settime(struct timespec *ts, struct timezone *tz); |
| 49 | extern int cap_ptrace(struct task_struct *parent, struct task_struct *child, | 49 | extern int cap_ptrace_may_access(struct task_struct *child, unsigned int mode); |
| 50 | unsigned int mode); | 50 | extern int cap_ptrace_traceme(struct task_struct *parent); |
| 51 | extern int cap_capget(struct task_struct *target, kernel_cap_t *effective, kernel_cap_t *inheritable, kernel_cap_t *permitted); | 51 | extern int cap_capget(struct task_struct *target, kernel_cap_t *effective, kernel_cap_t *inheritable, kernel_cap_t *permitted); |
| 52 | extern int cap_capset_check(struct task_struct *target, kernel_cap_t *effective, kernel_cap_t *inheritable, kernel_cap_t *permitted); | 52 | extern int cap_capset_check(struct task_struct *target, kernel_cap_t *effective, kernel_cap_t *inheritable, kernel_cap_t *permitted); |
| 53 | extern void cap_capset_set(struct task_struct *target, kernel_cap_t *effective, kernel_cap_t *inheritable, kernel_cap_t *permitted); | 53 | extern void cap_capset_set(struct task_struct *target, kernel_cap_t *effective, kernel_cap_t *inheritable, kernel_cap_t *permitted); |
| @@ -1157,17 +1157,24 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts) | |||
| 1157 | * @alter contains the flag indicating whether changes are to be made. | 1157 | * @alter contains the flag indicating whether changes are to be made. |
| 1158 | * Return 0 if permission is granted. | 1158 | * Return 0 if permission is granted. |
| 1159 | * | 1159 | * |
| 1160 | * @ptrace: | 1160 | * @ptrace_may_access: |
| 1161 | * Check permission before allowing the @parent process to trace the | 1161 | * Check permission before allowing the current process to trace the |
| 1162 | * @child process. | 1162 | * @child process. |
| 1163 | * Security modules may also want to perform a process tracing check | 1163 | * Security modules may also want to perform a process tracing check |
| 1164 | * during an execve in the set_security or apply_creds hooks of | 1164 | * during an execve in the set_security or apply_creds hooks of |
| 1165 | * binprm_security_ops if the process is being traced and its security | 1165 | * binprm_security_ops if the process is being traced and its security |
| 1166 | * attributes would be changed by the execve. | 1166 | * attributes would be changed by the execve. |
| 1167 | * @parent contains the task_struct structure for parent process. | 1167 | * @child contains the task_struct structure for the target process. |
| 1168 | * @child contains the task_struct structure for child process. | ||
| 1169 | * @mode contains the PTRACE_MODE flags indicating the form of access. | 1168 | * @mode contains the PTRACE_MODE flags indicating the form of access. |
| 1170 | * Return 0 if permission is granted. | 1169 | * Return 0 if permission is granted. |
| 1170 | * @ptrace_traceme: | ||
| 1171 | * Check that the @parent process has sufficient permission to trace the | ||
| 1172 | * current process before allowing the current process to present itself | ||
| 1173 | * to the @parent process for tracing. | ||
| 1174 | * The parent process will still have to undergo the ptrace_may_access | ||
| 1175 | * checks before it is allowed to trace this one. | ||
| 1176 | * @parent contains the task_struct structure for debugger process. | ||
| 1177 | * Return 0 if permission is granted. | ||
| 1171 | * @capget: | 1178 | * @capget: |
| 1172 | * Get the @effective, @inheritable, and @permitted capability sets for | 1179 | * Get the @effective, @inheritable, and @permitted capability sets for |
| 1173 | * the @target process. The hook may also perform permission checking to | 1180 | * the @target process. The hook may also perform permission checking to |
| @@ -1287,8 +1294,8 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts) | |||
| 1287 | struct security_operations { | 1294 | struct security_operations { |
| 1288 | char name[SECURITY_NAME_MAX + 1]; | 1295 | char name[SECURITY_NAME_MAX + 1]; |
| 1289 | 1296 | ||
| 1290 | int (*ptrace) (struct task_struct *parent, struct task_struct *child, | 1297 | int (*ptrace_may_access) (struct task_struct *child, unsigned int mode); |
| 1291 | unsigned int mode); | 1298 | int (*ptrace_traceme) (struct task_struct *parent); |
| 1292 | int (*capget) (struct task_struct *target, | 1299 | int (*capget) (struct task_struct *target, |
| 1293 | kernel_cap_t *effective, | 1300 | kernel_cap_t *effective, |
| 1294 | kernel_cap_t *inheritable, kernel_cap_t *permitted); | 1301 | kernel_cap_t *inheritable, kernel_cap_t *permitted); |
| @@ -1560,8 +1567,8 @@ extern struct dentry *securityfs_create_dir(const char *name, struct dentry *par | |||
| 1560 | extern void securityfs_remove(struct dentry *dentry); | 1567 | extern void securityfs_remove(struct dentry *dentry); |
| 1561 | 1568 | ||
| 1562 | /* Security operations */ | 1569 | /* Security operations */ |
| 1563 | int security_ptrace(struct task_struct *parent, struct task_struct *child, | 1570 | int security_ptrace_may_access(struct task_struct *child, unsigned int mode); |
| 1564 | unsigned int mode); | 1571 | int security_ptrace_traceme(struct task_struct *parent); |
| 1565 | int security_capget(struct task_struct *target, | 1572 | int security_capget(struct task_struct *target, |
| 1566 | kernel_cap_t *effective, | 1573 | kernel_cap_t *effective, |
| 1567 | kernel_cap_t *inheritable, | 1574 | kernel_cap_t *inheritable, |
| @@ -1742,11 +1749,15 @@ static inline int security_init(void) | |||
| 1742 | return 0; | 1749 | return 0; |
| 1743 | } | 1750 | } |
| 1744 | 1751 | ||
| 1745 | static inline int security_ptrace(struct task_struct *parent, | 1752 | static inline int security_ptrace_may_access(struct task_struct *child, |
| 1746 | struct task_struct *child, | 1753 | unsigned int mode) |
| 1747 | unsigned int mode) | 1754 | { |
| 1755 | return cap_ptrace_may_access(child, mode); | ||
| 1756 | } | ||
| 1757 | |||
| 1758 | static inline int security_ptrace_traceme(struct task_struct *parent) | ||
| 1748 | { | 1759 | { |
| 1749 | return cap_ptrace(parent, child, mode); | 1760 | return cap_ptrace_traceme(parent); |
| 1750 | } | 1761 | } |
| 1751 | 1762 | ||
| 1752 | static inline int security_capget(struct task_struct *target, | 1763 | static inline int security_capget(struct task_struct *target, |
diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h index a66304a09955..a1783b229ef4 100644 --- a/include/linux/seq_file.h +++ b/include/linux/seq_file.h | |||
| @@ -4,6 +4,8 @@ | |||
| 4 | #include <linux/types.h> | 4 | #include <linux/types.h> |
| 5 | #include <linux/string.h> | 5 | #include <linux/string.h> |
| 6 | #include <linux/mutex.h> | 6 | #include <linux/mutex.h> |
| 7 | #include <linux/cpumask.h> | ||
| 8 | #include <linux/nodemask.h> | ||
| 7 | 9 | ||
| 8 | struct seq_operations; | 10 | struct seq_operations; |
| 9 | struct file; | 11 | struct file; |
| @@ -47,6 +49,16 @@ int seq_path(struct seq_file *, struct path *, char *); | |||
| 47 | int seq_dentry(struct seq_file *, struct dentry *, char *); | 49 | int seq_dentry(struct seq_file *, struct dentry *, char *); |
| 48 | int seq_path_root(struct seq_file *m, struct path *path, struct path *root, | 50 | int seq_path_root(struct seq_file *m, struct path *path, struct path *root, |
| 49 | char *esc); | 51 | char *esc); |
| 52 | int seq_bitmap(struct seq_file *m, unsigned long *bits, unsigned int nr_bits); | ||
| 53 | static inline int seq_cpumask(struct seq_file *m, cpumask_t *mask) | ||
| 54 | { | ||
| 55 | return seq_bitmap(m, mask->bits, NR_CPUS); | ||
| 56 | } | ||
| 57 | |||
| 58 | static inline int seq_nodemask(struct seq_file *m, nodemask_t *mask) | ||
| 59 | { | ||
| 60 | return seq_bitmap(m, mask->bits, MAX_NUMNODES); | ||
| 61 | } | ||
| 50 | 62 | ||
| 51 | int single_open(struct file *, int (*)(struct seq_file *, void *), void *); | 63 | int single_open(struct file *, int (*)(struct seq_file *, void *), void *); |
| 52 | int single_release(struct inode *, struct file *); | 64 | int single_release(struct inode *, struct file *); |
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index cfcc45b3bef0..909923717830 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h | |||
| @@ -901,7 +901,7 @@ extern unsigned char *__pskb_pull_tail(struct sk_buff *skb, int delta); | |||
| 901 | static inline unsigned char *__pskb_pull(struct sk_buff *skb, unsigned int len) | 901 | static inline unsigned char *__pskb_pull(struct sk_buff *skb, unsigned int len) |
| 902 | { | 902 | { |
| 903 | if (len > skb_headlen(skb) && | 903 | if (len > skb_headlen(skb) && |
| 904 | !__pskb_pull_tail(skb, len-skb_headlen(skb))) | 904 | !__pskb_pull_tail(skb, len - skb_headlen(skb))) |
| 905 | return NULL; | 905 | return NULL; |
| 906 | skb->len -= len; | 906 | skb->len -= len; |
| 907 | return skb->data += len; | 907 | return skb->data += len; |
| @@ -918,7 +918,7 @@ static inline int pskb_may_pull(struct sk_buff *skb, unsigned int len) | |||
| 918 | return 1; | 918 | return 1; |
| 919 | if (unlikely(len > skb->len)) | 919 | if (unlikely(len > skb->len)) |
| 920 | return 0; | 920 | return 0; |
| 921 | return __pskb_pull_tail(skb, len-skb_headlen(skb)) != NULL; | 921 | return __pskb_pull_tail(skb, len - skb_headlen(skb)) != NULL; |
| 922 | } | 922 | } |
| 923 | 923 | ||
| 924 | /** | 924 | /** |
| @@ -1321,7 +1321,7 @@ static inline int skb_padto(struct sk_buff *skb, unsigned int len) | |||
| 1321 | unsigned int size = skb->len; | 1321 | unsigned int size = skb->len; |
| 1322 | if (likely(size >= len)) | 1322 | if (likely(size >= len)) |
| 1323 | return 0; | 1323 | return 0; |
| 1324 | return skb_pad(skb, len-size); | 1324 | return skb_pad(skb, len - size); |
| 1325 | } | 1325 | } |
| 1326 | 1326 | ||
| 1327 | static inline int skb_add_data(struct sk_buff *skb, | 1327 | static inline int skb_add_data(struct sk_buff *skb, |
| @@ -1452,6 +1452,10 @@ extern int skb_copy_datagram_iovec(const struct sk_buff *from, | |||
| 1452 | extern int skb_copy_and_csum_datagram_iovec(struct sk_buff *skb, | 1452 | extern int skb_copy_and_csum_datagram_iovec(struct sk_buff *skb, |
| 1453 | int hlen, | 1453 | int hlen, |
| 1454 | struct iovec *iov); | 1454 | struct iovec *iov); |
| 1455 | extern int skb_copy_datagram_from_iovec(struct sk_buff *skb, | ||
| 1456 | int offset, | ||
| 1457 | struct iovec *from, | ||
| 1458 | int len); | ||
| 1455 | extern void skb_free_datagram(struct sock *sk, struct sk_buff *skb); | 1459 | extern void skb_free_datagram(struct sock *sk, struct sk_buff *skb); |
| 1456 | extern int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, | 1460 | extern int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, |
| 1457 | unsigned int flags); | 1461 | unsigned int flags); |
diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h index 61e5610ad165..e0c0fccced46 100644 --- a/include/linux/spinlock.h +++ b/include/linux/spinlock.h | |||
| @@ -183,8 +183,14 @@ do { \ | |||
| 183 | 183 | ||
| 184 | #ifdef CONFIG_DEBUG_LOCK_ALLOC | 184 | #ifdef CONFIG_DEBUG_LOCK_ALLOC |
| 185 | # define spin_lock_nested(lock, subclass) _spin_lock_nested(lock, subclass) | 185 | # define spin_lock_nested(lock, subclass) _spin_lock_nested(lock, subclass) |
| 186 | # define spin_lock_nest_lock(lock, nest_lock) \ | ||
| 187 | do { \ | ||
| 188 | typecheck(struct lockdep_map *, &(nest_lock)->dep_map);\ | ||
| 189 | _spin_lock_nest_lock(lock, &(nest_lock)->dep_map); \ | ||
| 190 | } while (0) | ||
| 186 | #else | 191 | #else |
| 187 | # define spin_lock_nested(lock, subclass) _spin_lock(lock) | 192 | # define spin_lock_nested(lock, subclass) _spin_lock(lock) |
| 193 | # define spin_lock_nest_lock(lock, nest_lock) _spin_lock(lock) | ||
| 188 | #endif | 194 | #endif |
| 189 | 195 | ||
| 190 | #define write_lock(lock) _write_lock(lock) | 196 | #define write_lock(lock) _write_lock(lock) |
diff --git a/include/linux/spinlock_api_smp.h b/include/linux/spinlock_api_smp.h index 8a2307ce7296..d79845d034b5 100644 --- a/include/linux/spinlock_api_smp.h +++ b/include/linux/spinlock_api_smp.h | |||
| @@ -22,6 +22,8 @@ int in_lock_functions(unsigned long addr); | |||
| 22 | void __lockfunc _spin_lock(spinlock_t *lock) __acquires(lock); | 22 | void __lockfunc _spin_lock(spinlock_t *lock) __acquires(lock); |
| 23 | void __lockfunc _spin_lock_nested(spinlock_t *lock, int subclass) | 23 | void __lockfunc _spin_lock_nested(spinlock_t *lock, int subclass) |
| 24 | __acquires(lock); | 24 | __acquires(lock); |
| 25 | void __lockfunc _spin_lock_nest_lock(spinlock_t *lock, struct lockdep_map *map) | ||
| 26 | __acquires(lock); | ||
| 25 | void __lockfunc _read_lock(rwlock_t *lock) __acquires(lock); | 27 | void __lockfunc _read_lock(rwlock_t *lock) __acquires(lock); |
| 26 | void __lockfunc _write_lock(rwlock_t *lock) __acquires(lock); | 28 | void __lockfunc _write_lock(rwlock_t *lock) __acquires(lock); |
| 27 | void __lockfunc _spin_lock_bh(spinlock_t *lock) __acquires(lock); | 29 | void __lockfunc _spin_lock_bh(spinlock_t *lock) __acquires(lock); |
diff --git a/include/linux/stop_machine.h b/include/linux/stop_machine.h index f1cb0ba6d715..faf1519b5adc 100644 --- a/include/linux/stop_machine.h +++ b/include/linux/stop_machine.h | |||
| @@ -3,16 +3,13 @@ | |||
| 3 | /* "Bogolock": stop the entire machine, disable interrupts. This is a | 3 | /* "Bogolock": stop the entire machine, disable interrupts. This is a |
| 4 | very heavy lock, which is equivalent to grabbing every spinlock | 4 | very heavy lock, which is equivalent to grabbing every spinlock |
| 5 | (and more). So the "read" side to such a lock is anything which | 5 | (and more). So the "read" side to such a lock is anything which |
| 6 | diables preeempt. */ | 6 | disables preeempt. */ |
| 7 | #include <linux/cpu.h> | 7 | #include <linux/cpu.h> |
| 8 | #include <linux/cpumask.h> | 8 | #include <linux/cpumask.h> |
| 9 | #include <asm/system.h> | 9 | #include <asm/system.h> |
| 10 | 10 | ||
| 11 | #if defined(CONFIG_STOP_MACHINE) && defined(CONFIG_SMP) | 11 | #if defined(CONFIG_STOP_MACHINE) && defined(CONFIG_SMP) |
| 12 | 12 | ||
| 13 | /* Deprecated, but useful for transition. */ | ||
| 14 | #define ALL_CPUS ~0U | ||
| 15 | |||
| 16 | /** | 13 | /** |
| 17 | * stop_machine: freeze the machine on all CPUs and run this function | 14 | * stop_machine: freeze the machine on all CPUs and run this function |
| 18 | * @fn: the function to run | 15 | * @fn: the function to run |
| @@ -50,18 +47,4 @@ static inline int stop_machine(int (*fn)(void *), void *data, | |||
| 50 | return ret; | 47 | return ret; |
| 51 | } | 48 | } |
| 52 | #endif /* CONFIG_SMP */ | 49 | #endif /* CONFIG_SMP */ |
| 53 | |||
| 54 | static inline int __deprecated stop_machine_run(int (*fn)(void *), void *data, | ||
| 55 | unsigned int cpu) | ||
| 56 | { | ||
| 57 | /* If they don't care which cpu fn runs on, just pick one. */ | ||
| 58 | if (cpu == NR_CPUS) | ||
| 59 | return stop_machine(fn, data, NULL); | ||
| 60 | else if (cpu == ~0U) | ||
| 61 | return stop_machine(fn, data, &cpu_possible_map); | ||
| 62 | else { | ||
| 63 | cpumask_t cpus = cpumask_of_cpu(cpu); | ||
| 64 | return stop_machine(fn, data, &cpus); | ||
| 65 | } | ||
| 66 | } | ||
| 67 | #endif /* _LINUX_STOP_MACHINE */ | 50 | #endif /* _LINUX_STOP_MACHINE */ |
diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h index ef2e3a20bf3b..dc05b54bd3a3 100644 --- a/include/linux/sunrpc/svc_rdma.h +++ b/include/linux/sunrpc/svc_rdma.h | |||
| @@ -143,7 +143,6 @@ struct svcxprt_rdma { | |||
| 143 | unsigned long sc_flags; | 143 | unsigned long sc_flags; |
| 144 | struct list_head sc_dto_q; /* DTO tasklet I/O pending Q */ | 144 | struct list_head sc_dto_q; /* DTO tasklet I/O pending Q */ |
| 145 | struct list_head sc_read_complete_q; | 145 | struct list_head sc_read_complete_q; |
| 146 | spinlock_t sc_read_complete_lock; | ||
| 147 | struct work_struct sc_work; | 146 | struct work_struct sc_work; |
| 148 | }; | 147 | }; |
| 149 | /* sc_flags */ | 148 | /* sc_flags */ |
diff --git a/include/linux/suspend.h b/include/linux/suspend.h index c63435095970..2ce8207686e2 100644 --- a/include/linux/suspend.h +++ b/include/linux/suspend.h | |||
| @@ -217,11 +217,11 @@ struct platform_hibernation_ops { | |||
| 217 | #ifdef CONFIG_HIBERNATION | 217 | #ifdef CONFIG_HIBERNATION |
| 218 | /* kernel/power/snapshot.c */ | 218 | /* kernel/power/snapshot.c */ |
| 219 | extern void __register_nosave_region(unsigned long b, unsigned long e, int km); | 219 | extern void __register_nosave_region(unsigned long b, unsigned long e, int km); |
| 220 | static inline void register_nosave_region(unsigned long b, unsigned long e) | 220 | static inline void __init register_nosave_region(unsigned long b, unsigned long e) |
| 221 | { | 221 | { |
| 222 | __register_nosave_region(b, e, 0); | 222 | __register_nosave_region(b, e, 0); |
| 223 | } | 223 | } |
| 224 | static inline void register_nosave_region_late(unsigned long b, unsigned long e) | 224 | static inline void __init register_nosave_region_late(unsigned long b, unsigned long e) |
| 225 | { | 225 | { |
| 226 | __register_nosave_region(b, e, 1); | 226 | __register_nosave_region(b, e, 1); |
| 227 | } | 227 | } |
diff --git a/include/linux/swab.h b/include/linux/swab.h new file mode 100644 index 000000000000..270d5c208a89 --- /dev/null +++ b/include/linux/swab.h | |||
| @@ -0,0 +1,309 @@ | |||
| 1 | #ifndef _LINUX_SWAB_H | ||
| 2 | #define _LINUX_SWAB_H | ||
| 3 | |||
| 4 | #include <linux/types.h> | ||
| 5 | #include <linux/compiler.h> | ||
| 6 | #include <asm/byteorder.h> | ||
| 7 | |||
| 8 | /* | ||
| 9 | * casts are necessary for constants, because we never know how for sure | ||
| 10 | * how U/UL/ULL map to __u16, __u32, __u64. At least not in a portable way. | ||
| 11 | */ | ||
| 12 | #define __const_swab16(x) ((__u16)( \ | ||
| 13 | (((__u16)(x) & (__u16)0x00ffU) << 8) | \ | ||
| 14 | (((__u16)(x) & (__u16)0xff00U) >> 8))) | ||
| 15 | |||
| 16 | #define __const_swab32(x) ((__u32)( \ | ||
| 17 | (((__u32)(x) & (__u32)0x000000ffUL) << 24) | \ | ||
| 18 | (((__u32)(x) & (__u32)0x0000ff00UL) << 8) | \ | ||
| 19 | (((__u32)(x) & (__u32)0x00ff0000UL) >> 8) | \ | ||
| 20 | (((__u32)(x) & (__u32)0xff000000UL) >> 24))) | ||
| 21 | |||
| 22 | #define __const_swab64(x) ((__u64)( \ | ||
| 23 | (((__u64)(x) & (__u64)0x00000000000000ffULL) << 56) | \ | ||
| 24 | (((__u64)(x) & (__u64)0x000000000000ff00ULL) << 40) | \ | ||
| 25 | (((__u64)(x) & (__u64)0x0000000000ff0000ULL) << 24) | \ | ||
| 26 | (((__u64)(x) & (__u64)0x00000000ff000000ULL) << 8) | \ | ||
| 27 | (((__u64)(x) & (__u64)0x000000ff00000000ULL) >> 8) | \ | ||
| 28 | (((__u64)(x) & (__u64)0x0000ff0000000000ULL) >> 24) | \ | ||
| 29 | (((__u64)(x) & (__u64)0x00ff000000000000ULL) >> 40) | \ | ||
| 30 | (((__u64)(x) & (__u64)0xff00000000000000ULL) >> 56))) | ||
| 31 | |||
| 32 | #define __const_swahw32(x) ((__u32)( \ | ||
| 33 | (((__u32)(x) & (__u32)0x0000ffffUL) << 16) | \ | ||
| 34 | (((__u32)(x) & (__u32)0xffff0000UL) >> 16))) | ||
| 35 | |||
| 36 | #define __const_swahb32(x) ((__u32)( \ | ||
| 37 | (((__u32)(x) & (__u32)0x00ff00ffUL) << 8) | \ | ||
| 38 | (((__u32)(x) & (__u32)0xff00ff00UL) >> 8))) | ||
| 39 | |||
| 40 | /* | ||
| 41 | * Implement the following as inlines, but define the interface using | ||
| 42 | * macros to allow constant folding when possible: | ||
| 43 | * ___swab16, ___swab32, ___swab64, ___swahw32, ___swahb32 | ||
| 44 | */ | ||
| 45 | |||
| 46 | static inline __attribute_const__ __u16 ___swab16(__u16 val) | ||
| 47 | { | ||
| 48 | #ifdef __arch_swab16 | ||
| 49 | return __arch_swab16(val); | ||
| 50 | #elif defined(__arch_swab16p) | ||
| 51 | return __arch_swab16p(&val); | ||
| 52 | #else | ||
| 53 | return __const_swab16(val); | ||
| 54 | #endif | ||
| 55 | } | ||
| 56 | |||
| 57 | static inline __attribute_const__ __u32 ___swab32(__u32 val) | ||
| 58 | { | ||
| 59 | #ifdef __arch_swab32 | ||
| 60 | return __arch_swab32(val); | ||
| 61 | #elif defined(__arch_swab32p) | ||
| 62 | return __arch_swab32p(&val); | ||
| 63 | #else | ||
| 64 | return __const_swab32(val); | ||
| 65 | #endif | ||
| 66 | } | ||
| 67 | |||
| 68 | static inline __attribute_const__ __u64 ___swab64(__u64 val) | ||
| 69 | { | ||
| 70 | #ifdef __arch_swab64 | ||
| 71 | return __arch_swab64(val); | ||
| 72 | #elif defined(__arch_swab64p) | ||
| 73 | return __arch_swab64p(&val); | ||
| 74 | #elif defined(__SWAB_64_THRU_32__) | ||
| 75 | __u32 h = val >> 32; | ||
| 76 | __u32 l = val & ((1ULL << 32) - 1); | ||
| 77 | return (((__u64)___swab32(l)) << 32) | ((__u64)(___swab32(h))); | ||
| 78 | #else | ||
| 79 | return __const_swab64(val); | ||
| 80 | #endif | ||
| 81 | } | ||
| 82 | |||
| 83 | static inline __attribute_const__ __u32 ___swahw32(__u32 val) | ||
| 84 | { | ||
| 85 | #ifdef __arch_swahw32 | ||
| 86 | return __arch_swahw32(val); | ||
| 87 | #elif defined(__arch_swahw32p) | ||
| 88 | return __arch_swahw32p(&val); | ||
| 89 | #else | ||
| 90 | return __const_swahw32(val); | ||
| 91 | #endif | ||
| 92 | } | ||
| 93 | |||
| 94 | static inline __attribute_const__ __u32 ___swahb32(__u32 val) | ||
| 95 | { | ||
| 96 | #ifdef __arch_swahb32 | ||
| 97 | return __arch_swahb32(val); | ||
| 98 | #elif defined(__arch_swahb32p) | ||
| 99 | return __arch_swahb32p(&val); | ||
| 100 | #else | ||
| 101 | return __const_swahb32(val); | ||
| 102 | #endif | ||
| 103 | } | ||
| 104 | |||
| 105 | /** | ||
| 106 | * __swab16 - return a byteswapped 16-bit value | ||
| 107 | * @x: value to byteswap | ||
| 108 | */ | ||
| 109 | #define __swab16(x) \ | ||
| 110 | (__builtin_constant_p((__u16)(x)) ? \ | ||
| 111 | __const_swab16((x)) : \ | ||
| 112 | ___swab16((x))) | ||
| 113 | |||
| 114 | /** | ||
| 115 | * __swab32 - return a byteswapped 32-bit value | ||
| 116 | * @x: value to byteswap | ||
| 117 | */ | ||
| 118 | #define __swab32(x) \ | ||
| 119 | (__builtin_constant_p((__u32)(x)) ? \ | ||
| 120 | __const_swab32((x)) : \ | ||
| 121 | ___swab32((x))) | ||
| 122 | |||
| 123 | /** | ||
| 124 | * __swab64 - return a byteswapped 64-bit value | ||
| 125 | * @x: value to byteswap | ||
| 126 | */ | ||
| 127 | #define __swab64(x) \ | ||
| 128 | (__builtin_constant_p((__u64)(x)) ? \ | ||
| 129 | __const_swab64((x)) : \ | ||
| 130 | ___swab64((x))) | ||
| 131 | |||
| 132 | /** | ||
| 133 | * __swahw32 - return a word-swapped 32-bit value | ||
| 134 | * @x: value to wordswap | ||
| 135 | * | ||
| 136 | * __swahw32(0x12340000) is 0x00001234 | ||
| 137 | */ | ||
| 138 | #define __swahw32(x) \ | ||
| 139 | (__builtin_constant_p((__u32)(x)) ? \ | ||
| 140 | __const_swahw32((x)) : \ | ||
| 141 | ___swahw32((x))) | ||
| 142 | |||
| 143 | /** | ||
| 144 | * __swahb32 - return a high and low byte-swapped 32-bit value | ||
| 145 | * @x: value to byteswap | ||
| 146 | * | ||
| 147 | * __swahb32(0x12345678) is 0x34127856 | ||
| 148 | */ | ||
| 149 | #define __swahb32(x) \ | ||
| 150 | (__builtin_constant_p((__u32)(x)) ? \ | ||
| 151 | __const_swahb32((x)) : \ | ||
| 152 | ___swahb32((x))) | ||
| 153 | |||
| 154 | /** | ||
| 155 | * __swab16p - return a byteswapped 16-bit value from a pointer | ||
| 156 | * @p: pointer to a naturally-aligned 16-bit value | ||
| 157 | */ | ||
| 158 | static inline __u16 __swab16p(const __u16 *p) | ||
| 159 | { | ||
| 160 | #ifdef __arch_swab16p | ||
| 161 | return __arch_swab16p(p); | ||
| 162 | #else | ||
| 163 | return __swab16(*p); | ||
| 164 | #endif | ||
| 165 | } | ||
| 166 | |||
| 167 | /** | ||
| 168 | * __swab32p - return a byteswapped 32-bit value from a pointer | ||
| 169 | * @p: pointer to a naturally-aligned 32-bit value | ||
| 170 | */ | ||
| 171 | static inline __u32 __swab32p(const __u32 *p) | ||
| 172 | { | ||
| 173 | #ifdef __arch_swab32p | ||
| 174 | return __arch_swab32p(p); | ||
| 175 | #else | ||
| 176 | return __swab32(*p); | ||
| 177 | #endif | ||
| 178 | } | ||
| 179 | |||
| 180 | /** | ||
| 181 | * __swab64p - return a byteswapped 64-bit value from a pointer | ||
| 182 | * @p: pointer to a naturally-aligned 64-bit value | ||
| 183 | */ | ||
| 184 | static inline __u64 __swab64p(const __u64 *p) | ||
| 185 | { | ||
| 186 | #ifdef __arch_swab64p | ||
| 187 | return __arch_swab64p(p); | ||
| 188 | #else | ||
| 189 | return __swab64(*p); | ||
| 190 | #endif | ||
| 191 | } | ||
| 192 | |||
| 193 | /** | ||
| 194 | * __swahw32p - return a wordswapped 32-bit value from a pointer | ||
| 195 | * @p: pointer to a naturally-aligned 32-bit value | ||
| 196 | * | ||
| 197 | * See __swahw32() for details of wordswapping. | ||
| 198 | */ | ||
| 199 | static inline __u32 __swahw32p(const __u32 *p) | ||
| 200 | { | ||
| 201 | #ifdef __arch_swahw32p | ||
| 202 | return __arch_swahw32p(p); | ||
| 203 | #else | ||
| 204 | return __swahw32(*p); | ||
| 205 | #endif | ||
| 206 | } | ||
| 207 | |||
| 208 | /** | ||
| 209 | * __swahb32p - return a high and low byteswapped 32-bit value from a pointer | ||
| 210 | * @p: pointer to a naturally-aligned 32-bit value | ||
| 211 | * | ||
| 212 | * See __swahb32() for details of high/low byteswapping. | ||
| 213 | */ | ||
| 214 | static inline __u32 __swahb32p(const __u32 *p) | ||
| 215 | { | ||
| 216 | #ifdef __arch_swahb32p | ||
| 217 | return __arch_swahb32p(p); | ||
| 218 | #else | ||
| 219 | return __swahb32(*p); | ||
| 220 | #endif | ||
| 221 | } | ||
| 222 | |||
| 223 | /** | ||
| 224 | * __swab16s - byteswap a 16-bit value in-place | ||
| 225 | * @p: pointer to a naturally-aligned 16-bit value | ||
| 226 | */ | ||
| 227 | static inline void __swab16s(__u16 *p) | ||
| 228 | { | ||
| 229 | #ifdef __arch_swab16s | ||
| 230 | __arch_swab16s(p); | ||
| 231 | #else | ||
| 232 | *p = __swab16p(p); | ||
| 233 | #endif | ||
| 234 | } | ||
| 235 | /** | ||
| 236 | * __swab32s - byteswap a 32-bit value in-place | ||
| 237 | * @p: pointer to a naturally-aligned 32-bit value | ||
| 238 | */ | ||
| 239 | static inline void __swab32s(__u32 *p) | ||
| 240 | { | ||
| 241 | #ifdef __arch_swab32s | ||
| 242 | __arch_swab32s(p); | ||
| 243 | #else | ||
| 244 | *p = __swab32p(p); | ||
| 245 | #endif | ||
| 246 | } | ||
| 247 | |||
| 248 | /** | ||
| 249 | * __swab64s - byteswap a 64-bit value in-place | ||
| 250 | * @p: pointer to a naturally-aligned 64-bit value | ||
| 251 | */ | ||
| 252 | static inline void __swab64s(__u64 *p) | ||
| 253 | { | ||
| 254 | #ifdef __arch_swab64s | ||
| 255 | __arch_swab64s(p); | ||
| 256 | #else | ||
| 257 | *p = __swab64p(p); | ||
| 258 | #endif | ||
| 259 | } | ||
| 260 | |||
| 261 | /** | ||
| 262 | * __swahw32s - wordswap a 32-bit value in-place | ||
| 263 | * @p: pointer to a naturally-aligned 32-bit value | ||
| 264 | * | ||
| 265 | * See __swahw32() for details of wordswapping | ||
| 266 | */ | ||
| 267 | static inline void __swahw32s(__u32 *p) | ||
| 268 | { | ||
| 269 | #ifdef __arch_swahw32s | ||
| 270 | __arch_swahw32s(p); | ||
| 271 | #else | ||
| 272 | *p = __swahw32p(p); | ||
| 273 | #endif | ||
| 274 | } | ||
| 275 | |||
| 276 | /** | ||
| 277 | * __swahb32s - high and low byteswap a 32-bit value in-place | ||
| 278 | * @p: pointer to a naturally-aligned 32-bit value | ||
| 279 | * | ||
| 280 | * See __swahb32() for details of high and low byte swapping | ||
| 281 | */ | ||
| 282 | static inline void __swahb32s(__u32 *p) | ||
| 283 | { | ||
| 284 | #ifdef __arch_swahb32s | ||
| 285 | __arch_swahb32s(p); | ||
| 286 | #else | ||
| 287 | *p = __swahb32p(p); | ||
| 288 | #endif | ||
| 289 | } | ||
| 290 | |||
| 291 | #ifdef __KERNEL__ | ||
| 292 | # define swab16 __swab16 | ||
| 293 | # define swab32 __swab32 | ||
| 294 | # define swab64 __swab64 | ||
| 295 | # define swahw32 __swahw32 | ||
| 296 | # define swahb32 __swahb32 | ||
| 297 | # define swab16p __swab16p | ||
| 298 | # define swab32p __swab32p | ||
| 299 | # define swab64p __swab64p | ||
| 300 | # define swahw32p __swahw32p | ||
| 301 | # define swahb32p __swahb32p | ||
| 302 | # define swab16s __swab16s | ||
| 303 | # define swab32s __swab32s | ||
| 304 | # define swab64s __swab64s | ||
| 305 | # define swahw32s __swahw32s | ||
| 306 | # define swahb32s __swahb32s | ||
| 307 | #endif /* __KERNEL__ */ | ||
| 308 | |||
| 309 | #endif /* _LINUX_SWAB_H */ | ||
diff --git a/include/linux/tick.h b/include/linux/tick.h index d3c02695dc5d..8cf8cfe2cc97 100644 --- a/include/linux/tick.h +++ b/include/linux/tick.h | |||
| @@ -74,10 +74,13 @@ extern struct tick_device *tick_get_device(int cpu); | |||
| 74 | extern int tick_init_highres(void); | 74 | extern int tick_init_highres(void); |
| 75 | extern int tick_program_event(ktime_t expires, int force); | 75 | extern int tick_program_event(ktime_t expires, int force); |
| 76 | extern void tick_setup_sched_timer(void); | 76 | extern void tick_setup_sched_timer(void); |
| 77 | # endif | ||
| 78 | |||
| 79 | # if defined CONFIG_NO_HZ || defined CONFIG_HIGH_RES_TIMERS | ||
| 77 | extern void tick_cancel_sched_timer(int cpu); | 80 | extern void tick_cancel_sched_timer(int cpu); |
| 78 | # else | 81 | # else |
| 79 | static inline void tick_cancel_sched_timer(int cpu) { } | 82 | static inline void tick_cancel_sched_timer(int cpu) { } |
| 80 | # endif /* HIGHRES */ | 83 | # endif |
| 81 | 84 | ||
| 82 | # ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST | 85 | # ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST |
| 83 | extern struct tick_device *tick_get_broadcast_device(void); | 86 | extern struct tick_device *tick_get_broadcast_device(void); |
diff --git a/include/linux/tty.h b/include/linux/tty.h index e3579cb086e0..0cbec74ec086 100644 --- a/include/linux/tty.h +++ b/include/linux/tty.h | |||
| @@ -331,6 +331,8 @@ extern int tty_write_room(struct tty_struct *tty); | |||
| 331 | extern void tty_driver_flush_buffer(struct tty_struct *tty); | 331 | extern void tty_driver_flush_buffer(struct tty_struct *tty); |
| 332 | extern void tty_throttle(struct tty_struct *tty); | 332 | extern void tty_throttle(struct tty_struct *tty); |
| 333 | extern void tty_unthrottle(struct tty_struct *tty); | 333 | extern void tty_unthrottle(struct tty_struct *tty); |
| 334 | extern int tty_do_resize(struct tty_struct *tty, struct tty_struct *real_tty, | ||
| 335 | struct winsize *ws); | ||
| 334 | 336 | ||
| 335 | extern int is_current_pgrp_orphaned(void); | 337 | extern int is_current_pgrp_orphaned(void); |
| 336 | extern struct pid *tty_get_pgrp(struct tty_struct *tty); | 338 | extern struct pid *tty_get_pgrp(struct tty_struct *tty); |
diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h index e1065ac0d922..16d27944c321 100644 --- a/include/linux/tty_driver.h +++ b/include/linux/tty_driver.h | |||
| @@ -168,6 +168,18 @@ | |||
| 168 | * | 168 | * |
| 169 | * Optional: If not provided then the write method is called under | 169 | * Optional: If not provided then the write method is called under |
| 170 | * the atomic write lock to keep it serialized with the ldisc. | 170 | * the atomic write lock to keep it serialized with the ldisc. |
| 171 | * | ||
| 172 | * int (*resize)(struct tty_struct *tty, struct tty_struct *real_tty, | ||
| 173 | * unsigned int rows, unsigned int cols); | ||
| 174 | * | ||
| 175 | * Called when a termios request is issued which changes the | ||
| 176 | * requested terminal geometry. | ||
| 177 | * | ||
| 178 | * Optional: the default action is to update the termios structure | ||
| 179 | * without error. This is usually the correct behaviour. Drivers should | ||
| 180 | * not force errors here if they are not resizable objects (eg a serial | ||
| 181 | * line). See tty_do_resize() if you need to wrap the standard method | ||
| 182 | * in your own logic - the usual case. | ||
| 171 | */ | 183 | */ |
| 172 | 184 | ||
| 173 | #include <linux/fs.h> | 185 | #include <linux/fs.h> |
| @@ -206,6 +218,8 @@ struct tty_operations { | |||
| 206 | int (*tiocmget)(struct tty_struct *tty, struct file *file); | 218 | int (*tiocmget)(struct tty_struct *tty, struct file *file); |
| 207 | int (*tiocmset)(struct tty_struct *tty, struct file *file, | 219 | int (*tiocmset)(struct tty_struct *tty, struct file *file, |
| 208 | unsigned int set, unsigned int clear); | 220 | unsigned int set, unsigned int clear); |
| 221 | int (*resize)(struct tty_struct *tty, struct tty_struct *real_tty, | ||
| 222 | struct winsize *ws); | ||
| 209 | #ifdef CONFIG_CONSOLE_POLL | 223 | #ifdef CONFIG_CONSOLE_POLL |
| 210 | int (*poll_init)(struct tty_driver *driver, int line, char *options); | 224 | int (*poll_init)(struct tty_driver *driver, int line, char *options); |
| 211 | int (*poll_get_char)(struct tty_driver *driver, int line); | 225 | int (*poll_get_char)(struct tty_driver *driver, int line); |
diff --git a/include/linux/usb.h b/include/linux/usb.h index 5811c5da69f9..94ac74aba6b6 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h | |||
| @@ -110,6 +110,10 @@ enum usb_interface_condition { | |||
| 110 | * @sysfs_files_created: sysfs attributes exist | 110 | * @sysfs_files_created: sysfs attributes exist |
| 111 | * @needs_remote_wakeup: flag set when the driver requires remote-wakeup | 111 | * @needs_remote_wakeup: flag set when the driver requires remote-wakeup |
| 112 | * capability during autosuspend. | 112 | * capability during autosuspend. |
| 113 | * @needs_altsetting0: flag set when a set-interface request for altsetting 0 | ||
| 114 | * has been deferred. | ||
| 115 | * @needs_binding: flag set when the driver should be re-probed or unbound | ||
| 116 | * following a reset or suspend operation it doesn't support. | ||
| 113 | * @dev: driver model's view of this device | 117 | * @dev: driver model's view of this device |
| 114 | * @usb_dev: if an interface is bound to the USB major, this will point | 118 | * @usb_dev: if an interface is bound to the USB major, this will point |
| 115 | * to the sysfs representation for that device. | 119 | * to the sysfs representation for that device. |
| @@ -160,6 +164,7 @@ struct usb_interface { | |||
| 160 | unsigned is_active:1; /* the interface is not suspended */ | 164 | unsigned is_active:1; /* the interface is not suspended */ |
| 161 | unsigned sysfs_files_created:1; /* the sysfs attributes exist */ | 165 | unsigned sysfs_files_created:1; /* the sysfs attributes exist */ |
| 162 | unsigned needs_remote_wakeup:1; /* driver requires remote wakeup */ | 166 | unsigned needs_remote_wakeup:1; /* driver requires remote wakeup */ |
| 167 | unsigned needs_altsetting0:1; /* switch to altsetting 0 is pending */ | ||
| 163 | unsigned needs_binding:1; /* needs delayed unbind/rebind */ | 168 | unsigned needs_binding:1; /* needs delayed unbind/rebind */ |
| 164 | 169 | ||
| 165 | struct device dev; /* interface specific device info */ | 170 | struct device dev; /* interface specific device info */ |
diff --git a/include/linux/usb/musb.h b/include/linux/usb/musb.h new file mode 100644 index 000000000000..630962c04ca4 --- /dev/null +++ b/include/linux/usb/musb.h | |||
| @@ -0,0 +1,98 @@ | |||
| 1 | /* | ||
| 2 | * This is used to for host and peripheral modes of the driver for | ||
| 3 | * Inventra (Multidrop) Highspeed Dual-Role Controllers: (M)HDRC. | ||
| 4 | * | ||
| 5 | * Board initialization should put one of these into dev->platform_data, | ||
| 6 | * probably on some platform_device named "musb_hdrc". It encapsulates | ||
| 7 | * key configuration differences between boards. | ||
| 8 | */ | ||
| 9 | |||
| 10 | /* The USB role is defined by the connector used on the board, so long as | ||
| 11 | * standards are being followed. (Developer boards sometimes won't.) | ||
| 12 | */ | ||
| 13 | enum musb_mode { | ||
| 14 | MUSB_UNDEFINED = 0, | ||
| 15 | MUSB_HOST, /* A or Mini-A connector */ | ||
| 16 | MUSB_PERIPHERAL, /* B or Mini-B connector */ | ||
| 17 | MUSB_OTG /* Mini-AB connector */ | ||
| 18 | }; | ||
| 19 | |||
| 20 | struct clk; | ||
| 21 | |||
| 22 | struct musb_hdrc_eps_bits { | ||
| 23 | const char name[16]; | ||
| 24 | u8 bits; | ||
| 25 | }; | ||
| 26 | |||
| 27 | struct musb_hdrc_config { | ||
| 28 | /* MUSB configuration-specific details */ | ||
| 29 | unsigned multipoint:1; /* multipoint device */ | ||
| 30 | unsigned dyn_fifo:1; /* supports dynamic fifo sizing */ | ||
| 31 | unsigned soft_con:1; /* soft connect required */ | ||
| 32 | unsigned utm_16:1; /* utm data witdh is 16 bits */ | ||
| 33 | unsigned big_endian:1; /* true if CPU uses big-endian */ | ||
| 34 | unsigned mult_bulk_tx:1; /* Tx ep required for multbulk pkts */ | ||
| 35 | unsigned mult_bulk_rx:1; /* Rx ep required for multbulk pkts */ | ||
| 36 | unsigned high_iso_tx:1; /* Tx ep required for HB iso */ | ||
| 37 | unsigned high_iso_rx:1; /* Rx ep required for HD iso */ | ||
| 38 | unsigned dma:1; /* supports DMA */ | ||
| 39 | unsigned vendor_req:1; /* vendor registers required */ | ||
| 40 | |||
| 41 | u8 num_eps; /* number of endpoints _with_ ep0 */ | ||
| 42 | u8 dma_channels; /* number of dma channels */ | ||
| 43 | u8 dyn_fifo_size; /* dynamic size in bytes */ | ||
| 44 | u8 vendor_ctrl; /* vendor control reg width */ | ||
| 45 | u8 vendor_stat; /* vendor status reg witdh */ | ||
| 46 | u8 dma_req_chan; /* bitmask for required dma channels */ | ||
| 47 | u8 ram_bits; /* ram address size */ | ||
| 48 | |||
| 49 | struct musb_hdrc_eps_bits *eps_bits; | ||
| 50 | }; | ||
| 51 | |||
| 52 | struct musb_hdrc_platform_data { | ||
| 53 | /* MUSB_HOST, MUSB_PERIPHERAL, or MUSB_OTG */ | ||
| 54 | u8 mode; | ||
| 55 | |||
| 56 | /* for clk_get() */ | ||
| 57 | const char *clock; | ||
| 58 | |||
| 59 | /* (HOST or OTG) switch VBUS on/off */ | ||
| 60 | int (*set_vbus)(struct device *dev, int is_on); | ||
| 61 | |||
| 62 | /* (HOST or OTG) mA/2 power supplied on (default = 8mA) */ | ||
| 63 | u8 power; | ||
| 64 | |||
| 65 | /* (PERIPHERAL) mA/2 max power consumed (default = 100mA) */ | ||
| 66 | u8 min_power; | ||
| 67 | |||
| 68 | /* (HOST or OTG) msec/2 after VBUS on till power good */ | ||
| 69 | u8 potpgt; | ||
| 70 | |||
| 71 | /* Power the device on or off */ | ||
| 72 | int (*set_power)(int state); | ||
| 73 | |||
| 74 | /* Turn device clock on or off */ | ||
| 75 | int (*set_clock)(struct clk *clock, int is_on); | ||
| 76 | |||
| 77 | /* MUSB configuration-specific details */ | ||
| 78 | struct musb_hdrc_config *config; | ||
| 79 | }; | ||
| 80 | |||
| 81 | |||
| 82 | /* TUSB 6010 support */ | ||
| 83 | |||
| 84 | #define TUSB6010_OSCCLK_60 16667 /* psec/clk @ 60.0 MHz */ | ||
| 85 | #define TUSB6010_REFCLK_24 41667 /* psec/clk @ 24.0 MHz XI */ | ||
| 86 | #define TUSB6010_REFCLK_19 52083 /* psec/clk @ 19.2 MHz CLKIN */ | ||
| 87 | |||
| 88 | #ifdef CONFIG_ARCH_OMAP2 | ||
| 89 | |||
| 90 | extern int __init tusb6010_setup_interface( | ||
| 91 | struct musb_hdrc_platform_data *data, | ||
| 92 | unsigned ps_refclk, unsigned waitpin, | ||
| 93 | unsigned async_cs, unsigned sync_cs, | ||
| 94 | unsigned irq, unsigned dmachan); | ||
| 95 | |||
| 96 | extern int tusb6010_platform_retime(unsigned is_refclk); | ||
| 97 | |||
| 98 | #endif /* OMAP2 */ | ||
diff --git a/include/linux/usb/serial.h b/include/linux/usb/serial.h index 09a3e6a7518f..655341d0f534 100644 --- a/include/linux/usb/serial.h +++ b/include/linux/usb/serial.h | |||
| @@ -17,7 +17,8 @@ | |||
| 17 | #include <linux/mutex.h> | 17 | #include <linux/mutex.h> |
| 18 | 18 | ||
| 19 | #define SERIAL_TTY_MAJOR 188 /* Nice legal number now */ | 19 | #define SERIAL_TTY_MAJOR 188 /* Nice legal number now */ |
| 20 | #define SERIAL_TTY_MINORS 255 /* loads of devices :) */ | 20 | #define SERIAL_TTY_MINORS 254 /* loads of devices :) */ |
| 21 | #define SERIAL_TTY_NO_MINOR 255 /* No minor was assigned */ | ||
| 21 | 22 | ||
| 22 | /* The maximum number of ports one device can grab at once */ | 23 | /* The maximum number of ports one device can grab at once */ |
| 23 | #define MAX_NUM_PORTS 8 | 24 | #define MAX_NUM_PORTS 8 |
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index e466bd54a50e..e65a6bed4e3e 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h | |||
| @@ -55,13 +55,13 @@ | |||
| 55 | */ | 55 | */ |
| 56 | #ifndef __LINUX_VIDEODEV2_H | 56 | #ifndef __LINUX_VIDEODEV2_H |
| 57 | #define __LINUX_VIDEODEV2_H | 57 | #define __LINUX_VIDEODEV2_H |
| 58 | |||
| 58 | #ifdef __KERNEL__ | 59 | #ifdef __KERNEL__ |
| 59 | #include <linux/time.h> /* need struct timeval */ | 60 | #include <linux/time.h> /* need struct timeval */ |
| 60 | #include <linux/compiler.h> /* need __user */ | ||
| 61 | #else | 61 | #else |
| 62 | #define __user | ||
| 63 | #include <sys/time.h> | 62 | #include <sys/time.h> |
| 64 | #endif | 63 | #endif |
| 64 | #include <linux/compiler.h> | ||
| 65 | #include <linux/ioctl.h> | 65 | #include <linux/ioctl.h> |
| 66 | #include <linux/types.h> | 66 | #include <linux/types.h> |
| 67 | 67 | ||
diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h index 364789aae9f3..328eb4022727 100644 --- a/include/linux/vmalloc.h +++ b/include/linux/vmalloc.h | |||
| @@ -4,9 +4,9 @@ | |||
| 4 | #include <linux/spinlock.h> | 4 | #include <linux/spinlock.h> |
| 5 | #include <asm/page.h> /* pgprot_t */ | 5 | #include <asm/page.h> /* pgprot_t */ |
| 6 | 6 | ||
| 7 | struct vm_area_struct; | 7 | struct vm_area_struct; /* vma defining user mapping in mm_types.h */ |
| 8 | 8 | ||
| 9 | /* bits in vm_struct->flags */ | 9 | /* bits in flags of vmalloc's vm_struct below */ |
| 10 | #define VM_IOREMAP 0x00000001 /* ioremap() and friends */ | 10 | #define VM_IOREMAP 0x00000001 /* ioremap() and friends */ |
| 11 | #define VM_ALLOC 0x00000002 /* vmalloc() */ | 11 | #define VM_ALLOC 0x00000002 /* vmalloc() */ |
| 12 | #define VM_MAP 0x00000004 /* vmap()ed pages */ | 12 | #define VM_MAP 0x00000004 /* vmap()ed pages */ |
diff --git a/include/linux/vt_kern.h b/include/linux/vt_kern.h index 1c78d56c57e5..1cbd0a7db4e6 100644 --- a/include/linux/vt_kern.h +++ b/include/linux/vt_kern.h | |||
| @@ -35,7 +35,6 @@ extern int fg_console, last_console, want_console; | |||
| 35 | int vc_allocate(unsigned int console); | 35 | int vc_allocate(unsigned int console); |
| 36 | int vc_cons_allocated(unsigned int console); | 36 | int vc_cons_allocated(unsigned int console); |
| 37 | int vc_resize(struct vc_data *vc, unsigned int cols, unsigned int lines); | 37 | int vc_resize(struct vc_data *vc, unsigned int cols, unsigned int lines); |
| 38 | int vc_lock_resize(struct vc_data *vc, unsigned int cols, unsigned int lines); | ||
| 39 | void vc_deallocate(unsigned int console); | 38 | void vc_deallocate(unsigned int console); |
| 40 | void reset_palette(struct vc_data *vc); | 39 | void reset_palette(struct vc_data *vc); |
| 41 | void do_blank_screen(int entering_gfx); | 40 | void do_blank_screen(int entering_gfx); |
diff --git a/include/net/addrconf.h b/include/net/addrconf.h index 06b28142b3ab..c216de528b08 100644 --- a/include/net/addrconf.h +++ b/include/net/addrconf.h | |||
| @@ -80,7 +80,8 @@ extern struct inet6_ifaddr *ipv6_get_ifaddr(struct net *net, | |||
| 80 | struct net_device *dev, | 80 | struct net_device *dev, |
| 81 | int strict); | 81 | int strict); |
| 82 | 82 | ||
| 83 | extern int ipv6_dev_get_saddr(struct net_device *dev, | 83 | extern int ipv6_dev_get_saddr(struct net *net, |
| 84 | struct net_device *dev, | ||
| 84 | const struct in6_addr *daddr, | 85 | const struct in6_addr *daddr, |
| 85 | unsigned int srcprefs, | 86 | unsigned int srcprefs, |
| 86 | struct in6_addr *saddr); | 87 | struct in6_addr *saddr); |
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h index 2f8b3c06a101..5f53db7e4e57 100644 --- a/include/net/ip6_route.h +++ b/include/net/ip6_route.h | |||
| @@ -38,11 +38,6 @@ struct route_info { | |||
| 38 | #define RT6_LOOKUP_F_SRCPREF_COA 0x00000020 | 38 | #define RT6_LOOKUP_F_SRCPREF_COA 0x00000020 |
| 39 | 39 | ||
| 40 | 40 | ||
| 41 | #ifdef CONFIG_IPV6_MULTIPLE_TABLES | ||
| 42 | extern struct rt6_info *ip6_prohibit_entry; | ||
| 43 | extern struct rt6_info *ip6_blk_hole_entry; | ||
| 44 | #endif | ||
| 45 | |||
| 46 | extern void ip6_route_input(struct sk_buff *skb); | 41 | extern void ip6_route_input(struct sk_buff *skb); |
| 47 | 42 | ||
| 48 | extern struct dst_entry * ip6_route_output(struct net *net, | 43 | extern struct dst_entry * ip6_route_output(struct net *net, |
| @@ -112,13 +107,13 @@ struct rt6_rtnl_dump_arg | |||
| 112 | { | 107 | { |
| 113 | struct sk_buff *skb; | 108 | struct sk_buff *skb; |
| 114 | struct netlink_callback *cb; | 109 | struct netlink_callback *cb; |
| 110 | struct net *net; | ||
| 115 | }; | 111 | }; |
| 116 | 112 | ||
| 117 | extern int rt6_dump_route(struct rt6_info *rt, void *p_arg); | 113 | extern int rt6_dump_route(struct rt6_info *rt, void *p_arg); |
| 118 | extern void rt6_ifdown(struct net *net, struct net_device *dev); | 114 | extern void rt6_ifdown(struct net *net, struct net_device *dev); |
| 119 | extern void rt6_mtu_change(struct net_device *dev, unsigned mtu); | 115 | extern void rt6_mtu_change(struct net_device *dev, unsigned mtu); |
| 120 | 116 | ||
| 121 | extern rwlock_t rt6_lock; | ||
| 122 | 117 | ||
| 123 | /* | 118 | /* |
| 124 | * Store a destination cache entry in a socket | 119 | * Store a destination cache entry in a socket |
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h index cbb59ebed4ae..7312c3dd309f 100644 --- a/include/net/ip_vs.h +++ b/include/net/ip_vs.h | |||
| @@ -140,8 +140,24 @@ struct ip_vs_seq { | |||
| 140 | 140 | ||
| 141 | 141 | ||
| 142 | /* | 142 | /* |
| 143 | * IPVS statistics object | 143 | * IPVS statistics objects |
| 144 | */ | 144 | */ |
| 145 | struct ip_vs_estimator { | ||
| 146 | struct list_head list; | ||
| 147 | |||
| 148 | u64 last_inbytes; | ||
| 149 | u64 last_outbytes; | ||
| 150 | u32 last_conns; | ||
| 151 | u32 last_inpkts; | ||
| 152 | u32 last_outpkts; | ||
| 153 | |||
| 154 | u32 cps; | ||
| 155 | u32 inpps; | ||
| 156 | u32 outpps; | ||
| 157 | u32 inbps; | ||
| 158 | u32 outbps; | ||
| 159 | }; | ||
| 160 | |||
| 145 | struct ip_vs_stats | 161 | struct ip_vs_stats |
| 146 | { | 162 | { |
| 147 | __u32 conns; /* connections scheduled */ | 163 | __u32 conns; /* connections scheduled */ |
| @@ -156,7 +172,15 @@ struct ip_vs_stats | |||
| 156 | __u32 inbps; /* current in byte rate */ | 172 | __u32 inbps; /* current in byte rate */ |
| 157 | __u32 outbps; /* current out byte rate */ | 173 | __u32 outbps; /* current out byte rate */ |
| 158 | 174 | ||
| 175 | /* | ||
| 176 | * Don't add anything before the lock, because we use memcpy() to copy | ||
| 177 | * the members before the lock to struct ip_vs_stats_user in | ||
| 178 | * ip_vs_ctl.c. | ||
| 179 | */ | ||
| 180 | |||
| 159 | spinlock_t lock; /* spin lock */ | 181 | spinlock_t lock; /* spin lock */ |
| 182 | |||
| 183 | struct ip_vs_estimator est; /* estimator */ | ||
| 160 | }; | 184 | }; |
| 161 | 185 | ||
| 162 | struct dst_entry; | 186 | struct dst_entry; |
| @@ -440,7 +464,7 @@ struct ip_vs_app | |||
| 440 | */ | 464 | */ |
| 441 | extern const char *ip_vs_proto_name(unsigned proto); | 465 | extern const char *ip_vs_proto_name(unsigned proto); |
| 442 | extern void ip_vs_init_hash_table(struct list_head *table, int rows); | 466 | extern void ip_vs_init_hash_table(struct list_head *table, int rows); |
| 443 | #define IP_VS_INIT_HASH_TABLE(t) ip_vs_init_hash_table(t, sizeof(t)/sizeof(t[0])) | 467 | #define IP_VS_INIT_HASH_TABLE(t) ip_vs_init_hash_table((t), ARRAY_SIZE((t))) |
| 444 | 468 | ||
| 445 | #define IP_VS_APP_TYPE_FTP 1 | 469 | #define IP_VS_APP_TYPE_FTP 1 |
| 446 | 470 | ||
| @@ -620,7 +644,7 @@ extern int sysctl_ip_vs_expire_quiescent_template; | |||
| 620 | extern int sysctl_ip_vs_sync_threshold[2]; | 644 | extern int sysctl_ip_vs_sync_threshold[2]; |
| 621 | extern int sysctl_ip_vs_nat_icmp_send; | 645 | extern int sysctl_ip_vs_nat_icmp_send; |
| 622 | extern struct ip_vs_stats ip_vs_stats; | 646 | extern struct ip_vs_stats ip_vs_stats; |
| 623 | extern struct ctl_path net_vs_ctl_path[]; | 647 | extern const struct ctl_path net_vs_ctl_path[]; |
| 624 | 648 | ||
| 625 | extern struct ip_vs_service * | 649 | extern struct ip_vs_service * |
| 626 | ip_vs_service_get(__u32 fwmark, __u16 protocol, __be32 vaddr, __be16 vport); | 650 | ip_vs_service_get(__u32 fwmark, __u16 protocol, __be32 vaddr, __be16 vport); |
| @@ -659,7 +683,7 @@ extern void ip_vs_sync_conn(struct ip_vs_conn *cp); | |||
| 659 | /* | 683 | /* |
| 660 | * IPVS rate estimator prototypes (from ip_vs_est.c) | 684 | * IPVS rate estimator prototypes (from ip_vs_est.c) |
| 661 | */ | 685 | */ |
| 662 | extern int ip_vs_new_estimator(struct ip_vs_stats *stats); | 686 | extern void ip_vs_new_estimator(struct ip_vs_stats *stats); |
| 663 | extern void ip_vs_kill_estimator(struct ip_vs_stats *stats); | 687 | extern void ip_vs_kill_estimator(struct ip_vs_stats *stats); |
| 664 | extern void ip_vs_zero_estimator(struct ip_vs_stats *stats); | 688 | extern void ip_vs_zero_estimator(struct ip_vs_stats *stats); |
| 665 | 689 | ||
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index b397e4d984c7..ff137fd7714f 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h | |||
| @@ -708,10 +708,7 @@ enum ieee80211_tkip_key_type { | |||
| 708 | * rely on the host system for such buffering. This option is used | 708 | * rely on the host system for such buffering. This option is used |
| 709 | * to configure the IEEE 802.11 upper layer to buffer broadcast and | 709 | * to configure the IEEE 802.11 upper layer to buffer broadcast and |
| 710 | * multicast frames when there are power saving stations so that | 710 | * multicast frames when there are power saving stations so that |
| 711 | * the driver can fetch them with ieee80211_get_buffered_bc(). Note | 711 | * the driver can fetch them with ieee80211_get_buffered_bc(). |
| 712 | * that not setting this flag works properly only when the | ||
| 713 | * %IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE is also not set because | ||
| 714 | * otherwise the stack will not know when the DTIM beacon was sent. | ||
| 715 | * | 712 | * |
| 716 | * @IEEE80211_HW_2GHZ_SHORT_SLOT_INCAPABLE: | 713 | * @IEEE80211_HW_2GHZ_SHORT_SLOT_INCAPABLE: |
| 717 | * Hardware is not capable of short slot operation on the 2.4 GHz band. | 714 | * Hardware is not capable of short slot operation on the 2.4 GHz band. |
| @@ -1099,10 +1096,8 @@ enum ieee80211_ampdu_mlme_action { | |||
| 1099 | * See the section "Frame filtering" for more information. | 1096 | * See the section "Frame filtering" for more information. |
| 1100 | * This callback must be implemented and atomic. | 1097 | * This callback must be implemented and atomic. |
| 1101 | * | 1098 | * |
| 1102 | * @set_tim: Set TIM bit. If the hardware/firmware takes care of beacon | 1099 | * @set_tim: Set TIM bit. mac80211 calls this function when a TIM bit |
| 1103 | * generation (that is, %IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE is set) | 1100 | * must be set or cleared for a given AID. Must be atomic. |
| 1104 | * mac80211 calls this function when a TIM bit must be set or cleared | ||
| 1105 | * for a given AID. Must be atomic. | ||
| 1106 | * | 1101 | * |
| 1107 | * @set_key: See the section "Hardware crypto acceleration" | 1102 | * @set_key: See the section "Hardware crypto acceleration" |
| 1108 | * This callback can sleep, and is only called between add_interface | 1103 | * This callback can sleep, and is only called between add_interface |
diff --git a/include/net/pkt_sched.h b/include/net/pkt_sched.h index 6affcfaa123e..b786a5b09253 100644 --- a/include/net/pkt_sched.h +++ b/include/net/pkt_sched.h | |||
| @@ -78,6 +78,7 @@ extern struct Qdisc *fifo_create_dflt(struct Qdisc *sch, struct Qdisc_ops *ops, | |||
| 78 | 78 | ||
| 79 | extern int register_qdisc(struct Qdisc_ops *qops); | 79 | extern int register_qdisc(struct Qdisc_ops *qops); |
| 80 | extern int unregister_qdisc(struct Qdisc_ops *qops); | 80 | extern int unregister_qdisc(struct Qdisc_ops *qops); |
| 81 | extern void qdisc_list_del(struct Qdisc *q); | ||
| 81 | extern struct Qdisc *qdisc_lookup(struct net_device *dev, u32 handle); | 82 | extern struct Qdisc *qdisc_lookup(struct net_device *dev, u32 handle); |
| 82 | extern struct Qdisc *qdisc_lookup_class(struct net_device *dev, u32 handle); | 83 | extern struct Qdisc *qdisc_lookup_class(struct net_device *dev, u32 handle); |
| 83 | extern struct qdisc_rate_table *qdisc_get_rtab(struct tc_ratespec *r, | 84 | extern struct qdisc_rate_table *qdisc_get_rtab(struct tc_ratespec *r, |
| @@ -89,7 +90,10 @@ extern void __qdisc_run(struct Qdisc *q); | |||
| 89 | 90 | ||
| 90 | static inline void qdisc_run(struct Qdisc *q) | 91 | static inline void qdisc_run(struct Qdisc *q) |
| 91 | { | 92 | { |
| 92 | if (!test_and_set_bit(__QDISC_STATE_RUNNING, &q->state)) | 93 | struct netdev_queue *txq = q->dev_queue; |
| 94 | |||
| 95 | if (!netif_tx_queue_stopped(txq) && | ||
| 96 | !test_and_set_bit(__QDISC_STATE_RUNNING, &q->state)) | ||
| 93 | __qdisc_run(q); | 97 | __qdisc_run(q); |
| 94 | } | 98 | } |
| 95 | 99 | ||
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index a7abfda3e447..e5569625d2a5 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h | |||
| @@ -27,6 +27,7 @@ enum qdisc_state_t | |||
| 27 | { | 27 | { |
| 28 | __QDISC_STATE_RUNNING, | 28 | __QDISC_STATE_RUNNING, |
| 29 | __QDISC_STATE_SCHED, | 29 | __QDISC_STATE_SCHED, |
| 30 | __QDISC_STATE_DEACTIVATED, | ||
| 30 | }; | 31 | }; |
| 31 | 32 | ||
| 32 | struct qdisc_size_table { | 33 | struct qdisc_size_table { |
| @@ -60,7 +61,6 @@ struct Qdisc | |||
| 60 | struct gnet_stats_basic bstats; | 61 | struct gnet_stats_basic bstats; |
| 61 | struct gnet_stats_queue qstats; | 62 | struct gnet_stats_queue qstats; |
| 62 | struct gnet_stats_rate_est rate_est; | 63 | struct gnet_stats_rate_est rate_est; |
| 63 | struct rcu_head q_rcu; | ||
| 64 | int (*reshape_fail)(struct sk_buff *skb, | 64 | int (*reshape_fail)(struct sk_buff *skb, |
| 65 | struct Qdisc *q); | 65 | struct Qdisc *q); |
| 66 | 66 | ||
| @@ -193,6 +193,11 @@ static inline struct Qdisc *qdisc_root(struct Qdisc *qdisc) | |||
| 193 | return qdisc->dev_queue->qdisc; | 193 | return qdisc->dev_queue->qdisc; |
| 194 | } | 194 | } |
| 195 | 195 | ||
| 196 | static inline struct Qdisc *qdisc_root_sleeping(struct Qdisc *qdisc) | ||
| 197 | { | ||
| 198 | return qdisc->dev_queue->qdisc_sleeping; | ||
| 199 | } | ||
| 200 | |||
| 196 | /* The qdisc root lock is a mechanism by which to top level | 201 | /* The qdisc root lock is a mechanism by which to top level |
| 197 | * of a qdisc tree can be locked from any qdisc node in the | 202 | * of a qdisc tree can be locked from any qdisc node in the |
| 198 | * forest. This allows changing the configuration of some | 203 | * forest. This allows changing the configuration of some |
| @@ -212,6 +217,14 @@ static inline spinlock_t *qdisc_root_lock(struct Qdisc *qdisc) | |||
| 212 | return qdisc_lock(root); | 217 | return qdisc_lock(root); |
| 213 | } | 218 | } |
| 214 | 219 | ||
| 220 | static inline spinlock_t *qdisc_root_sleeping_lock(struct Qdisc *qdisc) | ||
| 221 | { | ||
| 222 | struct Qdisc *root = qdisc_root_sleeping(qdisc); | ||
| 223 | |||
| 224 | ASSERT_RTNL(); | ||
| 225 | return qdisc_lock(root); | ||
| 226 | } | ||
| 227 | |||
| 215 | static inline struct net_device *qdisc_dev(struct Qdisc *qdisc) | 228 | static inline struct net_device *qdisc_dev(struct Qdisc *qdisc) |
| 216 | { | 229 | { |
| 217 | return qdisc->dev_queue->dev; | 230 | return qdisc->dev_queue->dev; |
| @@ -219,12 +232,12 @@ static inline struct net_device *qdisc_dev(struct Qdisc *qdisc) | |||
| 219 | 232 | ||
| 220 | static inline void sch_tree_lock(struct Qdisc *q) | 233 | static inline void sch_tree_lock(struct Qdisc *q) |
| 221 | { | 234 | { |
| 222 | spin_lock_bh(qdisc_root_lock(q)); | 235 | spin_lock_bh(qdisc_root_sleeping_lock(q)); |
| 223 | } | 236 | } |
| 224 | 237 | ||
| 225 | static inline void sch_tree_unlock(struct Qdisc *q) | 238 | static inline void sch_tree_unlock(struct Qdisc *q) |
| 226 | { | 239 | { |
| 227 | spin_unlock_bh(qdisc_root_lock(q)); | 240 | spin_unlock_bh(qdisc_root_sleeping_lock(q)); |
| 228 | } | 241 | } |
| 229 | 242 | ||
| 230 | #define tcf_tree_lock(tp) sch_tree_lock((tp)->q) | 243 | #define tcf_tree_lock(tp) sch_tree_lock((tp)->q) |
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h index 291d56a19167..80b2e93c2936 100644 --- a/include/scsi/scsi_device.h +++ b/include/scsi/scsi_device.h | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | #include <linux/spinlock.h> | 6 | #include <linux/spinlock.h> |
| 7 | #include <linux/workqueue.h> | 7 | #include <linux/workqueue.h> |
| 8 | #include <linux/blkdev.h> | 8 | #include <linux/blkdev.h> |
| 9 | #include <scsi/scsi.h> | ||
| 9 | #include <asm/atomic.h> | 10 | #include <asm/atomic.h> |
| 10 | 11 | ||
| 11 | struct request_queue; | 12 | struct request_queue; |
| @@ -426,7 +427,7 @@ static inline int scsi_device_enclosure(struct scsi_device *sdev) | |||
| 426 | 427 | ||
| 427 | static inline int scsi_device_protection(struct scsi_device *sdev) | 428 | static inline int scsi_device_protection(struct scsi_device *sdev) |
| 428 | { | 429 | { |
| 429 | return sdev->inquiry[5] & (1<<0); | 430 | return sdev->scsi_level > SCSI_2 && sdev->inquiry[5] & (1<<0); |
| 430 | } | 431 | } |
| 431 | 432 | ||
| 432 | #define MODULE_ALIAS_SCSI_DEVICE(type) \ | 433 | #define MODULE_ALIAS_SCSI_DEVICE(type) \ |
diff --git a/include/video/atmel_lcdc.h b/include/video/atmel_lcdc.h index 613173b5db69..920c4e9cb93d 100644 --- a/include/video/atmel_lcdc.h +++ b/include/video/atmel_lcdc.h | |||
| @@ -41,6 +41,7 @@ struct atmel_lcdfb_info { | |||
| 41 | struct work_struct task; | 41 | struct work_struct task; |
| 42 | 42 | ||
| 43 | unsigned int guard_time; | 43 | unsigned int guard_time; |
| 44 | unsigned int smem_len; | ||
| 44 | struct platform_device *pdev; | 45 | struct platform_device *pdev; |
| 45 | struct clk *bus_clk; | 46 | struct clk *bus_clk; |
| 46 | struct clk *lcdc_clk; | 47 | struct clk *lcdc_clk; |
diff --git a/include/video/radeon.h b/include/video/radeon.h index 95a1f2038b1d..099ffa5e5bee 100644 --- a/include/video/radeon.h +++ b/include/video/radeon.h | |||
| @@ -742,6 +742,10 @@ | |||
| 742 | #define SOFT_RESET_RB (1 << 6) | 742 | #define SOFT_RESET_RB (1 << 6) |
| 743 | #define SOFT_RESET_HDP (1 << 7) | 743 | #define SOFT_RESET_HDP (1 << 7) |
| 744 | 744 | ||
| 745 | /* WAIT_UNTIL bit constants */ | ||
| 746 | #define WAIT_DMA_GUI_IDLE (1 << 9) | ||
| 747 | #define WAIT_2D_IDLECLEAN (1 << 16) | ||
| 748 | |||
| 745 | /* SURFACE_CNTL bit consants */ | 749 | /* SURFACE_CNTL bit consants */ |
| 746 | #define SURF_TRANSLATION_DIS (1 << 8) | 750 | #define SURF_TRANSLATION_DIS (1 << 8) |
| 747 | #define NONSURF_AP0_SWP_16BPP (1 << 20) | 751 | #define NONSURF_AP0_SWP_16BPP (1 << 20) |
diff --git a/init/Kconfig b/init/Kconfig index b678803deccf..c11da38837e5 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
| @@ -558,17 +558,6 @@ config SYSCTL_SYSCALL | |||
| 558 | 558 | ||
| 559 | If unsure say Y here. | 559 | If unsure say Y here. |
| 560 | 560 | ||
| 561 | config SYSCTL_SYSCALL_CHECK | ||
| 562 | bool "Sysctl checks" if EMBEDDED | ||
| 563 | depends on SYSCTL_SYSCALL | ||
| 564 | default y | ||
| 565 | ---help--- | ||
| 566 | sys_sysctl uses binary paths that have been found challenging | ||
| 567 | to properly maintain and use. This enables checks that help | ||
| 568 | you to keep things correct. | ||
| 569 | |||
| 570 | If unsure say Y here. | ||
| 571 | |||
| 572 | config KALLSYMS | 561 | config KALLSYMS |
| 573 | bool "Load all symbols for debugging/ksymoops" if EMBEDDED | 562 | bool "Load all symbols for debugging/ksymoops" if EMBEDDED |
| 574 | default y | 563 | default y |
diff --git a/init/main.c b/init/main.c index 0bc7e167bf45..f6f7042331dc 100644 --- a/init/main.c +++ b/init/main.c | |||
| @@ -691,7 +691,7 @@ asmlinkage void __init start_kernel(void) | |||
| 691 | rest_init(); | 691 | rest_init(); |
| 692 | } | 692 | } |
| 693 | 693 | ||
| 694 | static int __initdata initcall_debug; | 694 | static int initcall_debug; |
| 695 | 695 | ||
| 696 | static int __init initcall_debug_setup(char *str) | 696 | static int __init initcall_debug_setup(char *str) |
| 697 | { | 697 | { |
| @@ -700,7 +700,7 @@ static int __init initcall_debug_setup(char *str) | |||
| 700 | } | 700 | } |
| 701 | __setup("initcall_debug", initcall_debug_setup); | 701 | __setup("initcall_debug", initcall_debug_setup); |
| 702 | 702 | ||
| 703 | static void __init do_one_initcall(initcall_t fn) | 703 | int do_one_initcall(initcall_t fn) |
| 704 | { | 704 | { |
| 705 | int count = preempt_count(); | 705 | int count = preempt_count(); |
| 706 | ktime_t t0, t1, delta; | 706 | ktime_t t0, t1, delta; |
| @@ -740,6 +740,8 @@ static void __init do_one_initcall(initcall_t fn) | |||
| 740 | print_fn_descriptor_symbol(KERN_WARNING "initcall %s", fn); | 740 | print_fn_descriptor_symbol(KERN_WARNING "initcall %s", fn); |
| 741 | printk(" returned with %s\n", msgbuf); | 741 | printk(" returned with %s\n", msgbuf); |
| 742 | } | 742 | } |
| 743 | |||
| 744 | return result; | ||
| 743 | } | 745 | } |
| 744 | 746 | ||
| 745 | 747 | ||
diff --git a/kernel/Kconfig.hz b/kernel/Kconfig.hz index 382dd5a8b2d7..94fabd534b03 100644 --- a/kernel/Kconfig.hz +++ b/kernel/Kconfig.hz | |||
| @@ -55,4 +55,4 @@ config HZ | |||
| 55 | default 1000 if HZ_1000 | 55 | default 1000 if HZ_1000 |
| 56 | 56 | ||
| 57 | config SCHED_HRTICK | 57 | config SCHED_HRTICK |
| 58 | def_bool HIGH_RES_TIMERS && USE_GENERIC_SMP_HELPERS | 58 | def_bool HIGH_RES_TIMERS && (!SMP || USE_GENERIC_SMP_HELPERS) |
diff --git a/kernel/auditsc.c b/kernel/auditsc.c index 972f8e61d36a..59cedfb040e7 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c | |||
| @@ -243,10 +243,11 @@ static inline int open_arg(int flags, int mask) | |||
| 243 | 243 | ||
| 244 | static int audit_match_perm(struct audit_context *ctx, int mask) | 244 | static int audit_match_perm(struct audit_context *ctx, int mask) |
| 245 | { | 245 | { |
| 246 | unsigned n; | ||
| 246 | if (unlikely(!ctx)) | 247 | if (unlikely(!ctx)) |
| 247 | return 0; | 248 | return 0; |
| 248 | 249 | ||
| 249 | unsigned n = ctx->major; | 250 | n = ctx->major; |
| 250 | switch (audit_classify_syscall(ctx->arch, n)) { | 251 | switch (audit_classify_syscall(ctx->arch, n)) { |
| 251 | case 0: /* native */ | 252 | case 0: /* native */ |
| 252 | if ((mask & AUDIT_PERM_WRITE) && | 253 | if ((mask & AUDIT_PERM_WRITE) && |
diff --git a/kernel/capability.c b/kernel/capability.c index 0101e847603e..33e51e78c2d8 100644 --- a/kernel/capability.c +++ b/kernel/capability.c | |||
| @@ -486,17 +486,22 @@ asmlinkage long sys_capset(cap_user_header_t header, const cap_user_data_t data) | |||
| 486 | return ret; | 486 | return ret; |
| 487 | } | 487 | } |
| 488 | 488 | ||
| 489 | int __capable(struct task_struct *t, int cap) | 489 | /** |
| 490 | * capable - Determine if the current task has a superior capability in effect | ||
| 491 | * @cap: The capability to be tested for | ||
| 492 | * | ||
| 493 | * Return true if the current task has the given superior capability currently | ||
| 494 | * available for use, false if not. | ||
| 495 | * | ||
| 496 | * This sets PF_SUPERPRIV on the task if the capability is available on the | ||
| 497 | * assumption that it's about to be used. | ||
| 498 | */ | ||
| 499 | int capable(int cap) | ||
| 490 | { | 500 | { |
| 491 | if (security_capable(t, cap) == 0) { | 501 | if (has_capability(current, cap)) { |
| 492 | t->flags |= PF_SUPERPRIV; | 502 | current->flags |= PF_SUPERPRIV; |
| 493 | return 1; | 503 | return 1; |
| 494 | } | 504 | } |
| 495 | return 0; | 505 | return 0; |
| 496 | } | 506 | } |
| 497 | |||
| 498 | int capable(int cap) | ||
| 499 | { | ||
| 500 | return __capable(current, cap); | ||
| 501 | } | ||
| 502 | EXPORT_SYMBOL(capable); | 507 | EXPORT_SYMBOL(capable); |
diff --git a/kernel/cpu.c b/kernel/cpu.c index e202a68d1cc1..f17e9854c246 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c | |||
| @@ -349,6 +349,8 @@ static int __cpuinit _cpu_up(unsigned int cpu, int tasks_frozen) | |||
| 349 | goto out_notify; | 349 | goto out_notify; |
| 350 | BUG_ON(!cpu_online(cpu)); | 350 | BUG_ON(!cpu_online(cpu)); |
| 351 | 351 | ||
| 352 | cpu_set(cpu, cpu_active_map); | ||
| 353 | |||
| 352 | /* Now call notifier in preparation. */ | 354 | /* Now call notifier in preparation. */ |
| 353 | raw_notifier_call_chain(&cpu_chain, CPU_ONLINE | mod, hcpu); | 355 | raw_notifier_call_chain(&cpu_chain, CPU_ONLINE | mod, hcpu); |
| 354 | 356 | ||
| @@ -367,7 +369,7 @@ int __cpuinit cpu_up(unsigned int cpu) | |||
| 367 | if (!cpu_isset(cpu, cpu_possible_map)) { | 369 | if (!cpu_isset(cpu, cpu_possible_map)) { |
| 368 | printk(KERN_ERR "can't online cpu %d because it is not " | 370 | printk(KERN_ERR "can't online cpu %d because it is not " |
| 369 | "configured as may-hotadd at boot time\n", cpu); | 371 | "configured as may-hotadd at boot time\n", cpu); |
| 370 | #if defined(CONFIG_IA64) || defined(CONFIG_X86_64) || defined(CONFIG_S390) | 372 | #if defined(CONFIG_IA64) || defined(CONFIG_X86_64) |
| 371 | printk(KERN_ERR "please check additional_cpus= boot " | 373 | printk(KERN_ERR "please check additional_cpus= boot " |
| 372 | "parameter\n"); | 374 | "parameter\n"); |
| 373 | #endif | 375 | #endif |
| @@ -383,9 +385,6 @@ int __cpuinit cpu_up(unsigned int cpu) | |||
| 383 | 385 | ||
| 384 | err = _cpu_up(cpu, 0); | 386 | err = _cpu_up(cpu, 0); |
| 385 | 387 | ||
| 386 | if (cpu_online(cpu)) | ||
| 387 | cpu_set(cpu, cpu_active_map); | ||
| 388 | |||
| 389 | out: | 388 | out: |
| 390 | cpu_maps_update_done(); | 389 | cpu_maps_update_done(); |
| 391 | return err; | 390 | return err; |
diff --git a/kernel/exit.c b/kernel/exit.c index 38ec40630149..25ed2ad986df 100644 --- a/kernel/exit.c +++ b/kernel/exit.c | |||
| @@ -831,26 +831,50 @@ static void reparent_thread(struct task_struct *p, struct task_struct *father) | |||
| 831 | * the child reaper process (ie "init") in our pid | 831 | * the child reaper process (ie "init") in our pid |
| 832 | * space. | 832 | * space. |
| 833 | */ | 833 | */ |
| 834 | static struct task_struct *find_new_reaper(struct task_struct *father) | ||
| 835 | { | ||
| 836 | struct pid_namespace *pid_ns = task_active_pid_ns(father); | ||
| 837 | struct task_struct *thread; | ||
| 838 | |||
| 839 | thread = father; | ||
| 840 | while_each_thread(father, thread) { | ||
| 841 | if (thread->flags & PF_EXITING) | ||
| 842 | continue; | ||
| 843 | if (unlikely(pid_ns->child_reaper == father)) | ||
| 844 | pid_ns->child_reaper = thread; | ||
| 845 | return thread; | ||
| 846 | } | ||
| 847 | |||
| 848 | if (unlikely(pid_ns->child_reaper == father)) { | ||
| 849 | write_unlock_irq(&tasklist_lock); | ||
| 850 | if (unlikely(pid_ns == &init_pid_ns)) | ||
| 851 | panic("Attempted to kill init!"); | ||
| 852 | |||
| 853 | zap_pid_ns_processes(pid_ns); | ||
| 854 | write_lock_irq(&tasklist_lock); | ||
| 855 | /* | ||
| 856 | * We can not clear ->child_reaper or leave it alone. | ||
| 857 | * There may by stealth EXIT_DEAD tasks on ->children, | ||
| 858 | * forget_original_parent() must move them somewhere. | ||
| 859 | */ | ||
| 860 | pid_ns->child_reaper = init_pid_ns.child_reaper; | ||
| 861 | } | ||
| 862 | |||
| 863 | return pid_ns->child_reaper; | ||
| 864 | } | ||
| 865 | |||
| 834 | static void forget_original_parent(struct task_struct *father) | 866 | static void forget_original_parent(struct task_struct *father) |
| 835 | { | 867 | { |
| 836 | struct task_struct *p, *n, *reaper = father; | 868 | struct task_struct *p, *n, *reaper; |
| 837 | LIST_HEAD(ptrace_dead); | 869 | LIST_HEAD(ptrace_dead); |
| 838 | 870 | ||
| 839 | write_lock_irq(&tasklist_lock); | 871 | write_lock_irq(&tasklist_lock); |
| 840 | 872 | reaper = find_new_reaper(father); | |
| 841 | /* | 873 | /* |
| 842 | * First clean up ptrace if we were using it. | 874 | * First clean up ptrace if we were using it. |
| 843 | */ | 875 | */ |
| 844 | ptrace_exit(father, &ptrace_dead); | 876 | ptrace_exit(father, &ptrace_dead); |
| 845 | 877 | ||
| 846 | do { | ||
| 847 | reaper = next_thread(reaper); | ||
| 848 | if (reaper == father) { | ||
| 849 | reaper = task_child_reaper(father); | ||
| 850 | break; | ||
| 851 | } | ||
| 852 | } while (reaper->flags & PF_EXITING); | ||
| 853 | |||
| 854 | list_for_each_entry_safe(p, n, &father->children, sibling) { | 878 | list_for_each_entry_safe(p, n, &father->children, sibling) { |
| 855 | p->real_parent = reaper; | 879 | p->real_parent = reaper; |
| 856 | if (p->parent == father) { | 880 | if (p->parent == father) { |
| @@ -918,8 +942,8 @@ static void exit_notify(struct task_struct *tsk, int group_dead) | |||
| 918 | 942 | ||
| 919 | /* mt-exec, de_thread() is waiting for us */ | 943 | /* mt-exec, de_thread() is waiting for us */ |
| 920 | if (thread_group_leader(tsk) && | 944 | if (thread_group_leader(tsk) && |
| 921 | tsk->signal->notify_count < 0 && | 945 | tsk->signal->group_exit_task && |
| 922 | tsk->signal->group_exit_task) | 946 | tsk->signal->notify_count < 0) |
| 923 | wake_up_process(tsk->signal->group_exit_task); | 947 | wake_up_process(tsk->signal->group_exit_task); |
| 924 | 948 | ||
| 925 | write_unlock_irq(&tasklist_lock); | 949 | write_unlock_irq(&tasklist_lock); |
| @@ -959,39 +983,6 @@ static void check_stack_usage(void) | |||
| 959 | static inline void check_stack_usage(void) {} | 983 | static inline void check_stack_usage(void) {} |
| 960 | #endif | 984 | #endif |
| 961 | 985 | ||
| 962 | static inline void exit_child_reaper(struct task_struct *tsk) | ||
| 963 | { | ||
| 964 | if (likely(tsk->group_leader != task_child_reaper(tsk))) | ||
| 965 | return; | ||
| 966 | |||
| 967 | if (tsk->nsproxy->pid_ns == &init_pid_ns) | ||
| 968 | panic("Attempted to kill init!"); | ||
| 969 | |||
| 970 | /* | ||
| 971 | * @tsk is the last thread in the 'cgroup-init' and is exiting. | ||
| 972 | * Terminate all remaining processes in the namespace and reap them | ||
| 973 | * before exiting @tsk. | ||
| 974 | * | ||
| 975 | * Note that @tsk (last thread of cgroup-init) may not necessarily | ||
| 976 | * be the child-reaper (i.e main thread of cgroup-init) of the | ||
| 977 | * namespace i.e the child_reaper may have already exited. | ||
| 978 | * | ||
| 979 | * Even after a child_reaper exits, we let it inherit orphaned children, | ||
| 980 | * because, pid_ns->child_reaper remains valid as long as there is | ||
| 981 | * at least one living sub-thread in the cgroup init. | ||
| 982 | |||
| 983 | * This living sub-thread of the cgroup-init will be notified when | ||
| 984 | * a child inherited by the 'child-reaper' exits (do_notify_parent() | ||
| 985 | * uses __group_send_sig_info()). Further, when reaping child processes, | ||
| 986 | * do_wait() iterates over children of all living sub threads. | ||
| 987 | |||
| 988 | * i.e even though 'child_reaper' thread is listed as the parent of the | ||
| 989 | * orphaned children, any living sub-thread in the cgroup-init can | ||
| 990 | * perform the role of the child_reaper. | ||
| 991 | */ | ||
| 992 | zap_pid_ns_processes(tsk->nsproxy->pid_ns); | ||
| 993 | } | ||
| 994 | |||
| 995 | NORET_TYPE void do_exit(long code) | 986 | NORET_TYPE void do_exit(long code) |
| 996 | { | 987 | { |
| 997 | struct task_struct *tsk = current; | 988 | struct task_struct *tsk = current; |
| @@ -1051,7 +1042,6 @@ NORET_TYPE void do_exit(long code) | |||
| 1051 | } | 1042 | } |
| 1052 | group_dead = atomic_dec_and_test(&tsk->signal->live); | 1043 | group_dead = atomic_dec_and_test(&tsk->signal->live); |
| 1053 | if (group_dead) { | 1044 | if (group_dead) { |
| 1054 | exit_child_reaper(tsk); | ||
| 1055 | hrtimer_cancel(&tsk->signal->real_timer); | 1045 | hrtimer_cancel(&tsk->signal->real_timer); |
| 1056 | exit_itimers(tsk->signal); | 1046 | exit_itimers(tsk->signal); |
| 1057 | } | 1047 | } |
diff --git a/kernel/irq/proc.c b/kernel/irq/proc.c index 6c6d35d68ee9..a09dd29c2fd7 100644 --- a/kernel/irq/proc.c +++ b/kernel/irq/proc.c | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | 8 | ||
| 9 | #include <linux/irq.h> | 9 | #include <linux/irq.h> |
| 10 | #include <linux/proc_fs.h> | 10 | #include <linux/proc_fs.h> |
| 11 | #include <linux/seq_file.h> | ||
| 11 | #include <linux/interrupt.h> | 12 | #include <linux/interrupt.h> |
| 12 | 13 | ||
| 13 | #include "internals.h" | 14 | #include "internals.h" |
| @@ -16,23 +17,18 @@ static struct proc_dir_entry *root_irq_dir; | |||
| 16 | 17 | ||
| 17 | #ifdef CONFIG_SMP | 18 | #ifdef CONFIG_SMP |
| 18 | 19 | ||
| 19 | static int irq_affinity_read_proc(char *page, char **start, off_t off, | 20 | static int irq_affinity_proc_show(struct seq_file *m, void *v) |
| 20 | int count, int *eof, void *data) | ||
| 21 | { | 21 | { |
| 22 | struct irq_desc *desc = irq_desc + (long)data; | 22 | struct irq_desc *desc = irq_desc + (long)m->private; |
| 23 | cpumask_t *mask = &desc->affinity; | 23 | cpumask_t *mask = &desc->affinity; |
| 24 | int len; | ||
| 25 | 24 | ||
| 26 | #ifdef CONFIG_GENERIC_PENDING_IRQ | 25 | #ifdef CONFIG_GENERIC_PENDING_IRQ |
| 27 | if (desc->status & IRQ_MOVE_PENDING) | 26 | if (desc->status & IRQ_MOVE_PENDING) |
| 28 | mask = &desc->pending_mask; | 27 | mask = &desc->pending_mask; |
| 29 | #endif | 28 | #endif |
| 30 | len = cpumask_scnprintf(page, count, *mask); | 29 | seq_cpumask(m, mask); |
| 31 | 30 | seq_putc(m, '\n'); | |
| 32 | if (count - len < 2) | 31 | return 0; |
| 33 | return -EINVAL; | ||
| 34 | len += sprintf(page + len, "\n"); | ||
| 35 | return len; | ||
| 36 | } | 32 | } |
| 37 | 33 | ||
| 38 | #ifndef is_affinity_mask_valid | 34 | #ifndef is_affinity_mask_valid |
| @@ -40,11 +36,12 @@ static int irq_affinity_read_proc(char *page, char **start, off_t off, | |||
| 40 | #endif | 36 | #endif |
| 41 | 37 | ||
| 42 | int no_irq_affinity; | 38 | int no_irq_affinity; |
| 43 | static int irq_affinity_write_proc(struct file *file, const char __user *buffer, | 39 | static ssize_t irq_affinity_proc_write(struct file *file, |
| 44 | unsigned long count, void *data) | 40 | const char __user *buffer, size_t count, loff_t *pos) |
| 45 | { | 41 | { |
| 46 | unsigned int irq = (int)(long)data, full_count = count, err; | 42 | unsigned int irq = (int)(long)PDE(file->f_path.dentry->d_inode)->data; |
| 47 | cpumask_t new_value; | 43 | cpumask_t new_value; |
| 44 | int err; | ||
| 48 | 45 | ||
| 49 | if (!irq_desc[irq].chip->set_affinity || no_irq_affinity || | 46 | if (!irq_desc[irq].chip->set_affinity || no_irq_affinity || |
| 50 | irq_balancing_disabled(irq)) | 47 | irq_balancing_disabled(irq)) |
| @@ -65,28 +62,38 @@ static int irq_affinity_write_proc(struct file *file, const char __user *buffer, | |||
| 65 | if (!cpus_intersects(new_value, cpu_online_map)) | 62 | if (!cpus_intersects(new_value, cpu_online_map)) |
| 66 | /* Special case for empty set - allow the architecture | 63 | /* Special case for empty set - allow the architecture |
| 67 | code to set default SMP affinity. */ | 64 | code to set default SMP affinity. */ |
| 68 | return irq_select_affinity(irq) ? -EINVAL : full_count; | 65 | return irq_select_affinity(irq) ? -EINVAL : count; |
| 69 | 66 | ||
| 70 | irq_set_affinity(irq, new_value); | 67 | irq_set_affinity(irq, new_value); |
| 71 | 68 | ||
| 72 | return full_count; | 69 | return count; |
| 73 | } | 70 | } |
| 74 | 71 | ||
| 75 | static int default_affinity_read(char *page, char **start, off_t off, | 72 | static int irq_affinity_proc_open(struct inode *inode, struct file *file) |
| 76 | int count, int *eof, void *data) | ||
| 77 | { | 73 | { |
| 78 | int len = cpumask_scnprintf(page, count, irq_default_affinity); | 74 | return single_open(file, irq_affinity_proc_show, PDE(inode)->data); |
| 79 | if (count - len < 2) | ||
| 80 | return -EINVAL; | ||
| 81 | len += sprintf(page + len, "\n"); | ||
| 82 | return len; | ||
| 83 | } | 75 | } |
| 84 | 76 | ||
| 85 | static int default_affinity_write(struct file *file, const char __user *buffer, | 77 | static const struct file_operations irq_affinity_proc_fops = { |
| 86 | unsigned long count, void *data) | 78 | .open = irq_affinity_proc_open, |
| 79 | .read = seq_read, | ||
| 80 | .llseek = seq_lseek, | ||
| 81 | .release = single_release, | ||
| 82 | .write = irq_affinity_proc_write, | ||
| 83 | }; | ||
| 84 | |||
| 85 | static int default_affinity_show(struct seq_file *m, void *v) | ||
| 86 | { | ||
| 87 | seq_cpumask(m, &irq_default_affinity); | ||
| 88 | seq_putc(m, '\n'); | ||
| 89 | return 0; | ||
| 90 | } | ||
| 91 | |||
| 92 | static ssize_t default_affinity_write(struct file *file, | ||
| 93 | const char __user *buffer, size_t count, loff_t *ppos) | ||
| 87 | { | 94 | { |
| 88 | unsigned int full_count = count, err; | ||
| 89 | cpumask_t new_value; | 95 | cpumask_t new_value; |
| 96 | int err; | ||
| 90 | 97 | ||
| 91 | err = cpumask_parse_user(buffer, count, new_value); | 98 | err = cpumask_parse_user(buffer, count, new_value); |
| 92 | if (err) | 99 | if (err) |
| @@ -105,8 +112,21 @@ static int default_affinity_write(struct file *file, const char __user *buffer, | |||
| 105 | 112 | ||
| 106 | irq_default_affinity = new_value; | 113 | irq_default_affinity = new_value; |
| 107 | 114 | ||
| 108 | return full_count; | 115 | return count; |
| 109 | } | 116 | } |
| 117 | |||
| 118 | static int default_affinity_open(struct inode *inode, struct file *file) | ||
| 119 | { | ||
| 120 | return single_open(file, default_affinity_show, NULL); | ||
| 121 | } | ||
| 122 | |||
| 123 | static const struct file_operations default_affinity_proc_fops = { | ||
| 124 | .open = default_affinity_open, | ||
| 125 | .read = seq_read, | ||
| 126 | .llseek = seq_lseek, | ||
| 127 | .release = single_release, | ||
| 128 | .write = default_affinity_write, | ||
| 129 | }; | ||
| 110 | #endif | 130 | #endif |
| 111 | 131 | ||
| 112 | static int irq_spurious_read(char *page, char **start, off_t off, | 132 | static int irq_spurious_read(char *page, char **start, off_t off, |
| @@ -178,16 +198,9 @@ void register_irq_proc(unsigned int irq) | |||
| 178 | irq_desc[irq].dir = proc_mkdir(name, root_irq_dir); | 198 | irq_desc[irq].dir = proc_mkdir(name, root_irq_dir); |
| 179 | 199 | ||
| 180 | #ifdef CONFIG_SMP | 200 | #ifdef CONFIG_SMP |
| 181 | { | 201 | /* create /proc/irq/<irq>/smp_affinity */ |
| 182 | /* create /proc/irq/<irq>/smp_affinity */ | 202 | proc_create_data("smp_affinity", 0600, irq_desc[irq].dir, |
| 183 | entry = create_proc_entry("smp_affinity", 0600, irq_desc[irq].dir); | 203 | &irq_affinity_proc_fops, (void *)(long)irq); |
| 184 | |||
| 185 | if (entry) { | ||
| 186 | entry->data = (void *)(long)irq; | ||
| 187 | entry->read_proc = irq_affinity_read_proc; | ||
| 188 | entry->write_proc = irq_affinity_write_proc; | ||
| 189 | } | ||
| 190 | } | ||
| 191 | #endif | 204 | #endif |
| 192 | 205 | ||
| 193 | entry = create_proc_entry("spurious", 0444, irq_desc[irq].dir); | 206 | entry = create_proc_entry("spurious", 0444, irq_desc[irq].dir); |
| @@ -208,15 +221,8 @@ void unregister_handler_proc(unsigned int irq, struct irqaction *action) | |||
| 208 | void register_default_affinity_proc(void) | 221 | void register_default_affinity_proc(void) |
| 209 | { | 222 | { |
| 210 | #ifdef CONFIG_SMP | 223 | #ifdef CONFIG_SMP |
| 211 | struct proc_dir_entry *entry; | 224 | proc_create("irq/default_smp_affinity", 0600, NULL, |
| 212 | 225 | &default_affinity_proc_fops); | |
| 213 | /* create /proc/irq/default_smp_affinity */ | ||
| 214 | entry = create_proc_entry("default_smp_affinity", 0600, root_irq_dir); | ||
| 215 | if (entry) { | ||
| 216 | entry->data = NULL; | ||
| 217 | entry->read_proc = default_affinity_read; | ||
| 218 | entry->write_proc = default_affinity_write; | ||
| 219 | } | ||
| 220 | #endif | 226 | #endif |
| 221 | } | 227 | } |
| 222 | 228 | ||
diff --git a/kernel/kexec.c b/kernel/kexec.c index c8a4370e2a34..59f3f0df35d4 100644 --- a/kernel/kexec.c +++ b/kernel/kexec.c | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | #include <linux/slab.h> | 12 | #include <linux/slab.h> |
| 13 | #include <linux/fs.h> | 13 | #include <linux/fs.h> |
| 14 | #include <linux/kexec.h> | 14 | #include <linux/kexec.h> |
| 15 | #include <linux/spinlock.h> | 15 | #include <linux/mutex.h> |
| 16 | #include <linux/list.h> | 16 | #include <linux/list.h> |
| 17 | #include <linux/highmem.h> | 17 | #include <linux/highmem.h> |
| 18 | #include <linux/syscalls.h> | 18 | #include <linux/syscalls.h> |
| @@ -77,7 +77,7 @@ int kexec_should_crash(struct task_struct *p) | |||
| 77 | * | 77 | * |
| 78 | * The code for the transition from the current kernel to the | 78 | * The code for the transition from the current kernel to the |
| 79 | * the new kernel is placed in the control_code_buffer, whose size | 79 | * the new kernel is placed in the control_code_buffer, whose size |
| 80 | * is given by KEXEC_CONTROL_CODE_SIZE. In the best case only a single | 80 | * is given by KEXEC_CONTROL_PAGE_SIZE. In the best case only a single |
| 81 | * page of memory is necessary, but some architectures require more. | 81 | * page of memory is necessary, but some architectures require more. |
| 82 | * Because this memory must be identity mapped in the transition from | 82 | * Because this memory must be identity mapped in the transition from |
| 83 | * virtual to physical addresses it must live in the range | 83 | * virtual to physical addresses it must live in the range |
| @@ -242,7 +242,7 @@ static int kimage_normal_alloc(struct kimage **rimage, unsigned long entry, | |||
| 242 | */ | 242 | */ |
| 243 | result = -ENOMEM; | 243 | result = -ENOMEM; |
| 244 | image->control_code_page = kimage_alloc_control_pages(image, | 244 | image->control_code_page = kimage_alloc_control_pages(image, |
| 245 | get_order(KEXEC_CONTROL_CODE_SIZE)); | 245 | get_order(KEXEC_CONTROL_PAGE_SIZE)); |
| 246 | if (!image->control_code_page) { | 246 | if (!image->control_code_page) { |
| 247 | printk(KERN_ERR "Could not allocate control_code_buffer\n"); | 247 | printk(KERN_ERR "Could not allocate control_code_buffer\n"); |
| 248 | goto out; | 248 | goto out; |
| @@ -317,7 +317,7 @@ static int kimage_crash_alloc(struct kimage **rimage, unsigned long entry, | |||
| 317 | */ | 317 | */ |
| 318 | result = -ENOMEM; | 318 | result = -ENOMEM; |
| 319 | image->control_code_page = kimage_alloc_control_pages(image, | 319 | image->control_code_page = kimage_alloc_control_pages(image, |
| 320 | get_order(KEXEC_CONTROL_CODE_SIZE)); | 320 | get_order(KEXEC_CONTROL_PAGE_SIZE)); |
| 321 | if (!image->control_code_page) { | 321 | if (!image->control_code_page) { |
| 322 | printk(KERN_ERR "Could not allocate control_code_buffer\n"); | 322 | printk(KERN_ERR "Could not allocate control_code_buffer\n"); |
| 323 | goto out; | 323 | goto out; |
| @@ -924,19 +924,14 @@ static int kimage_load_segment(struct kimage *image, | |||
| 924 | */ | 924 | */ |
| 925 | struct kimage *kexec_image; | 925 | struct kimage *kexec_image; |
| 926 | struct kimage *kexec_crash_image; | 926 | struct kimage *kexec_crash_image; |
| 927 | /* | 927 | |
| 928 | * A home grown binary mutex. | 928 | static DEFINE_MUTEX(kexec_mutex); |
| 929 | * Nothing can wait so this mutex is safe to use | ||
| 930 | * in interrupt context :) | ||
| 931 | */ | ||
| 932 | static int kexec_lock; | ||
| 933 | 929 | ||
| 934 | asmlinkage long sys_kexec_load(unsigned long entry, unsigned long nr_segments, | 930 | asmlinkage long sys_kexec_load(unsigned long entry, unsigned long nr_segments, |
| 935 | struct kexec_segment __user *segments, | 931 | struct kexec_segment __user *segments, |
| 936 | unsigned long flags) | 932 | unsigned long flags) |
| 937 | { | 933 | { |
| 938 | struct kimage **dest_image, *image; | 934 | struct kimage **dest_image, *image; |
| 939 | int locked; | ||
| 940 | int result; | 935 | int result; |
| 941 | 936 | ||
| 942 | /* We only trust the superuser with rebooting the system. */ | 937 | /* We only trust the superuser with rebooting the system. */ |
| @@ -972,8 +967,7 @@ asmlinkage long sys_kexec_load(unsigned long entry, unsigned long nr_segments, | |||
| 972 | * | 967 | * |
| 973 | * KISS: always take the mutex. | 968 | * KISS: always take the mutex. |
| 974 | */ | 969 | */ |
| 975 | locked = xchg(&kexec_lock, 1); | 970 | if (!mutex_trylock(&kexec_mutex)) |
| 976 | if (locked) | ||
| 977 | return -EBUSY; | 971 | return -EBUSY; |
| 978 | 972 | ||
| 979 | dest_image = &kexec_image; | 973 | dest_image = &kexec_image; |
| @@ -1015,8 +1009,7 @@ asmlinkage long sys_kexec_load(unsigned long entry, unsigned long nr_segments, | |||
| 1015 | image = xchg(dest_image, image); | 1009 | image = xchg(dest_image, image); |
| 1016 | 1010 | ||
| 1017 | out: | 1011 | out: |
| 1018 | locked = xchg(&kexec_lock, 0); /* Release the mutex */ | 1012 | mutex_unlock(&kexec_mutex); |
| 1019 | BUG_ON(!locked); | ||
| 1020 | kimage_free(image); | 1013 | kimage_free(image); |
| 1021 | 1014 | ||
| 1022 | return result; | 1015 | return result; |
| @@ -1063,10 +1056,7 @@ asmlinkage long compat_sys_kexec_load(unsigned long entry, | |||
| 1063 | 1056 | ||
| 1064 | void crash_kexec(struct pt_regs *regs) | 1057 | void crash_kexec(struct pt_regs *regs) |
| 1065 | { | 1058 | { |
| 1066 | int locked; | 1059 | /* Take the kexec_mutex here to prevent sys_kexec_load |
| 1067 | |||
| 1068 | |||
| 1069 | /* Take the kexec_lock here to prevent sys_kexec_load | ||
| 1070 | * running on one cpu from replacing the crash kernel | 1060 | * running on one cpu from replacing the crash kernel |
| 1071 | * we are using after a panic on a different cpu. | 1061 | * we are using after a panic on a different cpu. |
| 1072 | * | 1062 | * |
| @@ -1074,8 +1064,7 @@ void crash_kexec(struct pt_regs *regs) | |||
| 1074 | * of memory the xchg(&kexec_crash_image) would be | 1064 | * of memory the xchg(&kexec_crash_image) would be |
| 1075 | * sufficient. But since I reuse the memory... | 1065 | * sufficient. But since I reuse the memory... |
| 1076 | */ | 1066 | */ |
| 1077 | locked = xchg(&kexec_lock, 1); | 1067 | if (mutex_trylock(&kexec_mutex)) { |
| 1078 | if (!locked) { | ||
| 1079 | if (kexec_crash_image) { | 1068 | if (kexec_crash_image) { |
| 1080 | struct pt_regs fixed_regs; | 1069 | struct pt_regs fixed_regs; |
| 1081 | crash_setup_regs(&fixed_regs, regs); | 1070 | crash_setup_regs(&fixed_regs, regs); |
| @@ -1083,8 +1072,7 @@ void crash_kexec(struct pt_regs *regs) | |||
| 1083 | machine_crash_shutdown(&fixed_regs); | 1072 | machine_crash_shutdown(&fixed_regs); |
| 1084 | machine_kexec(kexec_crash_image); | 1073 | machine_kexec(kexec_crash_image); |
| 1085 | } | 1074 | } |
| 1086 | locked = xchg(&kexec_lock, 0); | 1075 | mutex_unlock(&kexec_mutex); |
| 1087 | BUG_ON(!locked); | ||
| 1088 | } | 1076 | } |
| 1089 | } | 1077 | } |
| 1090 | 1078 | ||
| @@ -1426,25 +1414,23 @@ static int __init crash_save_vmcoreinfo_init(void) | |||
| 1426 | 1414 | ||
| 1427 | module_init(crash_save_vmcoreinfo_init) | 1415 | module_init(crash_save_vmcoreinfo_init) |
| 1428 | 1416 | ||
| 1429 | /** | 1417 | /* |
| 1430 | * kernel_kexec - reboot the system | 1418 | * Move into place and start executing a preloaded standalone |
| 1431 | * | 1419 | * executable. If nothing was preloaded return an error. |
| 1432 | * Move into place and start executing a preloaded standalone | ||
| 1433 | * executable. If nothing was preloaded return an error. | ||
| 1434 | */ | 1420 | */ |
| 1435 | int kernel_kexec(void) | 1421 | int kernel_kexec(void) |
| 1436 | { | 1422 | { |
| 1437 | int error = 0; | 1423 | int error = 0; |
| 1438 | 1424 | ||
| 1439 | if (xchg(&kexec_lock, 1)) | 1425 | if (!mutex_trylock(&kexec_mutex)) |
| 1440 | return -EBUSY; | 1426 | return -EBUSY; |
| 1441 | if (!kexec_image) { | 1427 | if (!kexec_image) { |
| 1442 | error = -EINVAL; | 1428 | error = -EINVAL; |
| 1443 | goto Unlock; | 1429 | goto Unlock; |
| 1444 | } | 1430 | } |
| 1445 | 1431 | ||
| 1446 | if (kexec_image->preserve_context) { | ||
| 1447 | #ifdef CONFIG_KEXEC_JUMP | 1432 | #ifdef CONFIG_KEXEC_JUMP |
| 1433 | if (kexec_image->preserve_context) { | ||
| 1448 | mutex_lock(&pm_mutex); | 1434 | mutex_lock(&pm_mutex); |
| 1449 | pm_prepare_console(); | 1435 | pm_prepare_console(); |
| 1450 | error = freeze_processes(); | 1436 | error = freeze_processes(); |
| @@ -1459,6 +1445,7 @@ int kernel_kexec(void) | |||
| 1459 | error = disable_nonboot_cpus(); | 1445 | error = disable_nonboot_cpus(); |
| 1460 | if (error) | 1446 | if (error) |
| 1461 | goto Resume_devices; | 1447 | goto Resume_devices; |
| 1448 | device_pm_lock(); | ||
| 1462 | local_irq_disable(); | 1449 | local_irq_disable(); |
| 1463 | /* At this point, device_suspend() has been called, | 1450 | /* At this point, device_suspend() has been called, |
| 1464 | * but *not* device_power_down(). We *must* | 1451 | * but *not* device_power_down(). We *must* |
| @@ -1470,26 +1457,22 @@ int kernel_kexec(void) | |||
| 1470 | error = device_power_down(PMSG_FREEZE); | 1457 | error = device_power_down(PMSG_FREEZE); |
| 1471 | if (error) | 1458 | if (error) |
| 1472 | goto Enable_irqs; | 1459 | goto Enable_irqs; |
| 1473 | save_processor_state(); | 1460 | } else |
| 1474 | #endif | 1461 | #endif |
| 1475 | } else { | 1462 | { |
| 1476 | blocking_notifier_call_chain(&reboot_notifier_list, | 1463 | kernel_restart_prepare(NULL); |
| 1477 | SYS_RESTART, NULL); | ||
| 1478 | system_state = SYSTEM_RESTART; | ||
| 1479 | device_shutdown(); | ||
| 1480 | sysdev_shutdown(); | ||
| 1481 | printk(KERN_EMERG "Starting new kernel\n"); | 1464 | printk(KERN_EMERG "Starting new kernel\n"); |
| 1482 | machine_shutdown(); | 1465 | machine_shutdown(); |
| 1483 | } | 1466 | } |
| 1484 | 1467 | ||
| 1485 | machine_kexec(kexec_image); | 1468 | machine_kexec(kexec_image); |
| 1486 | 1469 | ||
| 1487 | if (kexec_image->preserve_context) { | ||
| 1488 | #ifdef CONFIG_KEXEC_JUMP | 1470 | #ifdef CONFIG_KEXEC_JUMP |
| 1489 | restore_processor_state(); | 1471 | if (kexec_image->preserve_context) { |
| 1490 | device_power_up(PMSG_RESTORE); | 1472 | device_power_up(PMSG_RESTORE); |
| 1491 | Enable_irqs: | 1473 | Enable_irqs: |
| 1492 | local_irq_enable(); | 1474 | local_irq_enable(); |
| 1475 | device_pm_unlock(); | ||
| 1493 | enable_nonboot_cpus(); | 1476 | enable_nonboot_cpus(); |
| 1494 | Resume_devices: | 1477 | Resume_devices: |
| 1495 | device_resume(PMSG_RESTORE); | 1478 | device_resume(PMSG_RESTORE); |
| @@ -1499,11 +1482,10 @@ int kernel_kexec(void) | |||
| 1499 | Restore_console: | 1482 | Restore_console: |
| 1500 | pm_restore_console(); | 1483 | pm_restore_console(); |
| 1501 | mutex_unlock(&pm_mutex); | 1484 | mutex_unlock(&pm_mutex); |
| 1502 | #endif | ||
| 1503 | } | 1485 | } |
| 1486 | #endif | ||
| 1504 | 1487 | ||
| 1505 | Unlock: | 1488 | Unlock: |
| 1506 | xchg(&kexec_lock, 0); | 1489 | mutex_unlock(&kexec_mutex); |
| 1507 | |||
| 1508 | return error; | 1490 | return error; |
| 1509 | } | 1491 | } |
diff --git a/kernel/lockdep.c b/kernel/lockdep.c index d38a64362973..dbda475b13bd 100644 --- a/kernel/lockdep.c +++ b/kernel/lockdep.c | |||
| @@ -124,6 +124,15 @@ static struct lock_list list_entries[MAX_LOCKDEP_ENTRIES]; | |||
| 124 | unsigned long nr_lock_classes; | 124 | unsigned long nr_lock_classes; |
| 125 | static struct lock_class lock_classes[MAX_LOCKDEP_KEYS]; | 125 | static struct lock_class lock_classes[MAX_LOCKDEP_KEYS]; |
| 126 | 126 | ||
| 127 | static inline struct lock_class *hlock_class(struct held_lock *hlock) | ||
| 128 | { | ||
| 129 | if (!hlock->class_idx) { | ||
| 130 | DEBUG_LOCKS_WARN_ON(1); | ||
| 131 | return NULL; | ||
| 132 | } | ||
| 133 | return lock_classes + hlock->class_idx - 1; | ||
| 134 | } | ||
| 135 | |||
| 127 | #ifdef CONFIG_LOCK_STAT | 136 | #ifdef CONFIG_LOCK_STAT |
| 128 | static DEFINE_PER_CPU(struct lock_class_stats[MAX_LOCKDEP_KEYS], lock_stats); | 137 | static DEFINE_PER_CPU(struct lock_class_stats[MAX_LOCKDEP_KEYS], lock_stats); |
| 129 | 138 | ||
| @@ -222,7 +231,7 @@ static void lock_release_holdtime(struct held_lock *hlock) | |||
| 222 | 231 | ||
| 223 | holdtime = sched_clock() - hlock->holdtime_stamp; | 232 | holdtime = sched_clock() - hlock->holdtime_stamp; |
| 224 | 233 | ||
| 225 | stats = get_lock_stats(hlock->class); | 234 | stats = get_lock_stats(hlock_class(hlock)); |
| 226 | if (hlock->read) | 235 | if (hlock->read) |
| 227 | lock_time_inc(&stats->read_holdtime, holdtime); | 236 | lock_time_inc(&stats->read_holdtime, holdtime); |
| 228 | else | 237 | else |
| @@ -372,6 +381,19 @@ unsigned int nr_process_chains; | |||
| 372 | unsigned int max_lockdep_depth; | 381 | unsigned int max_lockdep_depth; |
| 373 | unsigned int max_recursion_depth; | 382 | unsigned int max_recursion_depth; |
| 374 | 383 | ||
| 384 | static unsigned int lockdep_dependency_gen_id; | ||
| 385 | |||
| 386 | static bool lockdep_dependency_visit(struct lock_class *source, | ||
| 387 | unsigned int depth) | ||
| 388 | { | ||
| 389 | if (!depth) | ||
| 390 | lockdep_dependency_gen_id++; | ||
| 391 | if (source->dep_gen_id == lockdep_dependency_gen_id) | ||
| 392 | return true; | ||
| 393 | source->dep_gen_id = lockdep_dependency_gen_id; | ||
| 394 | return false; | ||
| 395 | } | ||
| 396 | |||
| 375 | #ifdef CONFIG_DEBUG_LOCKDEP | 397 | #ifdef CONFIG_DEBUG_LOCKDEP |
| 376 | /* | 398 | /* |
| 377 | * We cannot printk in early bootup code. Not even early_printk() | 399 | * We cannot printk in early bootup code. Not even early_printk() |
| @@ -505,7 +527,7 @@ static void print_lockdep_cache(struct lockdep_map *lock) | |||
| 505 | 527 | ||
| 506 | static void print_lock(struct held_lock *hlock) | 528 | static void print_lock(struct held_lock *hlock) |
| 507 | { | 529 | { |
| 508 | print_lock_name(hlock->class); | 530 | print_lock_name(hlock_class(hlock)); |
| 509 | printk(", at: "); | 531 | printk(", at: "); |
| 510 | print_ip_sym(hlock->acquire_ip); | 532 | print_ip_sym(hlock->acquire_ip); |
| 511 | } | 533 | } |
| @@ -558,6 +580,9 @@ static void print_lock_dependencies(struct lock_class *class, int depth) | |||
| 558 | { | 580 | { |
| 559 | struct lock_list *entry; | 581 | struct lock_list *entry; |
| 560 | 582 | ||
| 583 | if (lockdep_dependency_visit(class, depth)) | ||
| 584 | return; | ||
| 585 | |||
| 561 | if (DEBUG_LOCKS_WARN_ON(depth >= 20)) | 586 | if (DEBUG_LOCKS_WARN_ON(depth >= 20)) |
| 562 | return; | 587 | return; |
| 563 | 588 | ||
| @@ -850,11 +875,11 @@ static int add_lock_to_list(struct lock_class *class, struct lock_class *this, | |||
| 850 | if (!entry) | 875 | if (!entry) |
| 851 | return 0; | 876 | return 0; |
| 852 | 877 | ||
| 853 | entry->class = this; | ||
| 854 | entry->distance = distance; | ||
| 855 | if (!save_trace(&entry->trace)) | 878 | if (!save_trace(&entry->trace)) |
| 856 | return 0; | 879 | return 0; |
| 857 | 880 | ||
| 881 | entry->class = this; | ||
| 882 | entry->distance = distance; | ||
| 858 | /* | 883 | /* |
| 859 | * Since we never remove from the dependency list, the list can | 884 | * Since we never remove from the dependency list, the list can |
| 860 | * be walked lockless by other CPUs, it's only allocation | 885 | * be walked lockless by other CPUs, it's only allocation |
| @@ -932,7 +957,7 @@ static noinline int print_circular_bug_tail(void) | |||
| 932 | if (debug_locks_silent) | 957 | if (debug_locks_silent) |
| 933 | return 0; | 958 | return 0; |
| 934 | 959 | ||
| 935 | this.class = check_source->class; | 960 | this.class = hlock_class(check_source); |
| 936 | if (!save_trace(&this.trace)) | 961 | if (!save_trace(&this.trace)) |
| 937 | return 0; | 962 | return 0; |
| 938 | 963 | ||
| @@ -959,6 +984,67 @@ static int noinline print_infinite_recursion_bug(void) | |||
| 959 | return 0; | 984 | return 0; |
| 960 | } | 985 | } |
| 961 | 986 | ||
| 987 | unsigned long __lockdep_count_forward_deps(struct lock_class *class, | ||
| 988 | unsigned int depth) | ||
| 989 | { | ||
| 990 | struct lock_list *entry; | ||
| 991 | unsigned long ret = 1; | ||
| 992 | |||
| 993 | if (lockdep_dependency_visit(class, depth)) | ||
| 994 | return 0; | ||
| 995 | |||
| 996 | /* | ||
| 997 | * Recurse this class's dependency list: | ||
| 998 | */ | ||
| 999 | list_for_each_entry(entry, &class->locks_after, entry) | ||
| 1000 | ret += __lockdep_count_forward_deps(entry->class, depth + 1); | ||
| 1001 | |||
| 1002 | return ret; | ||
| 1003 | } | ||
| 1004 | |||
| 1005 | unsigned long lockdep_count_forward_deps(struct lock_class *class) | ||
| 1006 | { | ||
| 1007 | unsigned long ret, flags; | ||
| 1008 | |||
| 1009 | local_irq_save(flags); | ||
| 1010 | __raw_spin_lock(&lockdep_lock); | ||
| 1011 | ret = __lockdep_count_forward_deps(class, 0); | ||
| 1012 | __raw_spin_unlock(&lockdep_lock); | ||
| 1013 | local_irq_restore(flags); | ||
| 1014 | |||
| 1015 | return ret; | ||
| 1016 | } | ||
| 1017 | |||
| 1018 | unsigned long __lockdep_count_backward_deps(struct lock_class *class, | ||
| 1019 | unsigned int depth) | ||
| 1020 | { | ||
| 1021 | struct lock_list *entry; | ||
| 1022 | unsigned long ret = 1; | ||
| 1023 | |||
| 1024 | if (lockdep_dependency_visit(class, depth)) | ||
| 1025 | return 0; | ||
| 1026 | /* | ||
| 1027 | * Recurse this class's dependency list: | ||
| 1028 | */ | ||
| 1029 | list_for_each_entry(entry, &class->locks_before, entry) | ||
| 1030 | ret += __lockdep_count_backward_deps(entry->class, depth + 1); | ||
| 1031 | |||
| 1032 | return ret; | ||
| 1033 | } | ||
| 1034 | |||
| 1035 | unsigned long lockdep_count_backward_deps(struct lock_class *class) | ||
| 1036 | { | ||
| 1037 | unsigned long ret, flags; | ||
| 1038 | |||
| 1039 | local_irq_save(flags); | ||
| 1040 | __raw_spin_lock(&lockdep_lock); | ||
| 1041 | ret = __lockdep_count_backward_deps(class, 0); | ||
| 1042 | __raw_spin_unlock(&lockdep_lock); | ||
| 1043 | local_irq_restore(flags); | ||
| 1044 | |||
| 1045 | return ret; | ||
| 1046 | } | ||
| 1047 | |||
| 962 | /* | 1048 | /* |
| 963 | * Prove that the dependency graph starting at <entry> can not | 1049 | * Prove that the dependency graph starting at <entry> can not |
| 964 | * lead to <target>. Print an error and return 0 if it does. | 1050 | * lead to <target>. Print an error and return 0 if it does. |
| @@ -968,6 +1054,9 @@ check_noncircular(struct lock_class *source, unsigned int depth) | |||
| 968 | { | 1054 | { |
| 969 | struct lock_list *entry; | 1055 | struct lock_list *entry; |
| 970 | 1056 | ||
| 1057 | if (lockdep_dependency_visit(source, depth)) | ||
| 1058 | return 1; | ||
| 1059 | |||
| 971 | debug_atomic_inc(&nr_cyclic_check_recursions); | 1060 | debug_atomic_inc(&nr_cyclic_check_recursions); |
| 972 | if (depth > max_recursion_depth) | 1061 | if (depth > max_recursion_depth) |
| 973 | max_recursion_depth = depth; | 1062 | max_recursion_depth = depth; |
| @@ -977,7 +1066,7 @@ check_noncircular(struct lock_class *source, unsigned int depth) | |||
| 977 | * Check this lock's dependency list: | 1066 | * Check this lock's dependency list: |
| 978 | */ | 1067 | */ |
| 979 | list_for_each_entry(entry, &source->locks_after, entry) { | 1068 | list_for_each_entry(entry, &source->locks_after, entry) { |
| 980 | if (entry->class == check_target->class) | 1069 | if (entry->class == hlock_class(check_target)) |
| 981 | return print_circular_bug_header(entry, depth+1); | 1070 | return print_circular_bug_header(entry, depth+1); |
| 982 | debug_atomic_inc(&nr_cyclic_checks); | 1071 | debug_atomic_inc(&nr_cyclic_checks); |
| 983 | if (!check_noncircular(entry->class, depth+1)) | 1072 | if (!check_noncircular(entry->class, depth+1)) |
| @@ -1011,6 +1100,9 @@ find_usage_forwards(struct lock_class *source, unsigned int depth) | |||
| 1011 | struct lock_list *entry; | 1100 | struct lock_list *entry; |
| 1012 | int ret; | 1101 | int ret; |
| 1013 | 1102 | ||
| 1103 | if (lockdep_dependency_visit(source, depth)) | ||
| 1104 | return 1; | ||
| 1105 | |||
| 1014 | if (depth > max_recursion_depth) | 1106 | if (depth > max_recursion_depth) |
| 1015 | max_recursion_depth = depth; | 1107 | max_recursion_depth = depth; |
| 1016 | if (depth >= RECURSION_LIMIT) | 1108 | if (depth >= RECURSION_LIMIT) |
| @@ -1050,6 +1142,9 @@ find_usage_backwards(struct lock_class *source, unsigned int depth) | |||
| 1050 | struct lock_list *entry; | 1142 | struct lock_list *entry; |
| 1051 | int ret; | 1143 | int ret; |
| 1052 | 1144 | ||
| 1145 | if (lockdep_dependency_visit(source, depth)) | ||
| 1146 | return 1; | ||
| 1147 | |||
| 1053 | if (!__raw_spin_is_locked(&lockdep_lock)) | 1148 | if (!__raw_spin_is_locked(&lockdep_lock)) |
| 1054 | return DEBUG_LOCKS_WARN_ON(1); | 1149 | return DEBUG_LOCKS_WARN_ON(1); |
| 1055 | 1150 | ||
| @@ -1064,6 +1159,11 @@ find_usage_backwards(struct lock_class *source, unsigned int depth) | |||
| 1064 | return 2; | 1159 | return 2; |
| 1065 | } | 1160 | } |
| 1066 | 1161 | ||
| 1162 | if (!source && debug_locks_off_graph_unlock()) { | ||
| 1163 | WARN_ON(1); | ||
| 1164 | return 0; | ||
| 1165 | } | ||
| 1166 | |||
| 1067 | /* | 1167 | /* |
| 1068 | * Check this lock's dependency list: | 1168 | * Check this lock's dependency list: |
| 1069 | */ | 1169 | */ |
| @@ -1103,9 +1203,9 @@ print_bad_irq_dependency(struct task_struct *curr, | |||
| 1103 | printk("\nand this task is already holding:\n"); | 1203 | printk("\nand this task is already holding:\n"); |
| 1104 | print_lock(prev); | 1204 | print_lock(prev); |
| 1105 | printk("which would create a new lock dependency:\n"); | 1205 | printk("which would create a new lock dependency:\n"); |
| 1106 | print_lock_name(prev->class); | 1206 | print_lock_name(hlock_class(prev)); |
| 1107 | printk(" ->"); | 1207 | printk(" ->"); |
| 1108 | print_lock_name(next->class); | 1208 | print_lock_name(hlock_class(next)); |
| 1109 | printk("\n"); | 1209 | printk("\n"); |
| 1110 | 1210 | ||
| 1111 | printk("\nbut this new dependency connects a %s-irq-safe lock:\n", | 1211 | printk("\nbut this new dependency connects a %s-irq-safe lock:\n", |
| @@ -1146,12 +1246,12 @@ check_usage(struct task_struct *curr, struct held_lock *prev, | |||
| 1146 | 1246 | ||
| 1147 | find_usage_bit = bit_backwards; | 1247 | find_usage_bit = bit_backwards; |
| 1148 | /* fills in <backwards_match> */ | 1248 | /* fills in <backwards_match> */ |
| 1149 | ret = find_usage_backwards(prev->class, 0); | 1249 | ret = find_usage_backwards(hlock_class(prev), 0); |
| 1150 | if (!ret || ret == 1) | 1250 | if (!ret || ret == 1) |
| 1151 | return ret; | 1251 | return ret; |
| 1152 | 1252 | ||
| 1153 | find_usage_bit = bit_forwards; | 1253 | find_usage_bit = bit_forwards; |
| 1154 | ret = find_usage_forwards(next->class, 0); | 1254 | ret = find_usage_forwards(hlock_class(next), 0); |
| 1155 | if (!ret || ret == 1) | 1255 | if (!ret || ret == 1) |
| 1156 | return ret; | 1256 | return ret; |
| 1157 | /* ret == 2 */ | 1257 | /* ret == 2 */ |
| @@ -1272,18 +1372,32 @@ check_deadlock(struct task_struct *curr, struct held_lock *next, | |||
| 1272 | struct lockdep_map *next_instance, int read) | 1372 | struct lockdep_map *next_instance, int read) |
| 1273 | { | 1373 | { |
| 1274 | struct held_lock *prev; | 1374 | struct held_lock *prev; |
| 1375 | struct held_lock *nest = NULL; | ||
| 1275 | int i; | 1376 | int i; |
| 1276 | 1377 | ||
| 1277 | for (i = 0; i < curr->lockdep_depth; i++) { | 1378 | for (i = 0; i < curr->lockdep_depth; i++) { |
| 1278 | prev = curr->held_locks + i; | 1379 | prev = curr->held_locks + i; |
| 1279 | if (prev->class != next->class) | 1380 | |
| 1381 | if (prev->instance == next->nest_lock) | ||
| 1382 | nest = prev; | ||
| 1383 | |||
| 1384 | if (hlock_class(prev) != hlock_class(next)) | ||
| 1280 | continue; | 1385 | continue; |
| 1386 | |||
| 1281 | /* | 1387 | /* |
| 1282 | * Allow read-after-read recursion of the same | 1388 | * Allow read-after-read recursion of the same |
| 1283 | * lock class (i.e. read_lock(lock)+read_lock(lock)): | 1389 | * lock class (i.e. read_lock(lock)+read_lock(lock)): |
| 1284 | */ | 1390 | */ |
| 1285 | if ((read == 2) && prev->read) | 1391 | if ((read == 2) && prev->read) |
| 1286 | return 2; | 1392 | return 2; |
| 1393 | |||
| 1394 | /* | ||
| 1395 | * We're holding the nest_lock, which serializes this lock's | ||
| 1396 | * nesting behaviour. | ||
| 1397 | */ | ||
| 1398 | if (nest) | ||
| 1399 | return 2; | ||
| 1400 | |||
| 1287 | return print_deadlock_bug(curr, prev, next); | 1401 | return print_deadlock_bug(curr, prev, next); |
| 1288 | } | 1402 | } |
| 1289 | return 1; | 1403 | return 1; |
| @@ -1329,7 +1443,7 @@ check_prev_add(struct task_struct *curr, struct held_lock *prev, | |||
| 1329 | */ | 1443 | */ |
| 1330 | check_source = next; | 1444 | check_source = next; |
| 1331 | check_target = prev; | 1445 | check_target = prev; |
| 1332 | if (!(check_noncircular(next->class, 0))) | 1446 | if (!(check_noncircular(hlock_class(next), 0))) |
| 1333 | return print_circular_bug_tail(); | 1447 | return print_circular_bug_tail(); |
| 1334 | 1448 | ||
| 1335 | if (!check_prev_add_irq(curr, prev, next)) | 1449 | if (!check_prev_add_irq(curr, prev, next)) |
| @@ -1353,8 +1467,8 @@ check_prev_add(struct task_struct *curr, struct held_lock *prev, | |||
| 1353 | * chains - the second one will be new, but L1 already has | 1467 | * chains - the second one will be new, but L1 already has |
| 1354 | * L2 added to its dependency list, due to the first chain.) | 1468 | * L2 added to its dependency list, due to the first chain.) |
| 1355 | */ | 1469 | */ |
| 1356 | list_for_each_entry(entry, &prev->class->locks_after, entry) { | 1470 | list_for_each_entry(entry, &hlock_class(prev)->locks_after, entry) { |
| 1357 | if (entry->class == next->class) { | 1471 | if (entry->class == hlock_class(next)) { |
| 1358 | if (distance == 1) | 1472 | if (distance == 1) |
| 1359 | entry->distance = 1; | 1473 | entry->distance = 1; |
| 1360 | return 2; | 1474 | return 2; |
| @@ -1365,26 +1479,28 @@ check_prev_add(struct task_struct *curr, struct held_lock *prev, | |||
| 1365 | * Ok, all validations passed, add the new lock | 1479 | * Ok, all validations passed, add the new lock |
| 1366 | * to the previous lock's dependency list: | 1480 | * to the previous lock's dependency list: |
| 1367 | */ | 1481 | */ |
| 1368 | ret = add_lock_to_list(prev->class, next->class, | 1482 | ret = add_lock_to_list(hlock_class(prev), hlock_class(next), |
| 1369 | &prev->class->locks_after, next->acquire_ip, distance); | 1483 | &hlock_class(prev)->locks_after, |
| 1484 | next->acquire_ip, distance); | ||
| 1370 | 1485 | ||
| 1371 | if (!ret) | 1486 | if (!ret) |
| 1372 | return 0; | 1487 | return 0; |
| 1373 | 1488 | ||
| 1374 | ret = add_lock_to_list(next->class, prev->class, | 1489 | ret = add_lock_to_list(hlock_class(next), hlock_class(prev), |
| 1375 | &next->class->locks_before, next->acquire_ip, distance); | 1490 | &hlock_class(next)->locks_before, |
| 1491 | next->acquire_ip, distance); | ||
| 1376 | if (!ret) | 1492 | if (!ret) |
| 1377 | return 0; | 1493 | return 0; |
| 1378 | 1494 | ||
| 1379 | /* | 1495 | /* |
| 1380 | * Debugging printouts: | 1496 | * Debugging printouts: |
| 1381 | */ | 1497 | */ |
| 1382 | if (verbose(prev->class) || verbose(next->class)) { | 1498 | if (verbose(hlock_class(prev)) || verbose(hlock_class(next))) { |
| 1383 | graph_unlock(); | 1499 | graph_unlock(); |
| 1384 | printk("\n new dependency: "); | 1500 | printk("\n new dependency: "); |
| 1385 | print_lock_name(prev->class); | 1501 | print_lock_name(hlock_class(prev)); |
| 1386 | printk(" => "); | 1502 | printk(" => "); |
| 1387 | print_lock_name(next->class); | 1503 | print_lock_name(hlock_class(next)); |
| 1388 | printk("\n"); | 1504 | printk("\n"); |
| 1389 | dump_stack(); | 1505 | dump_stack(); |
| 1390 | return graph_lock(); | 1506 | return graph_lock(); |
| @@ -1481,7 +1597,7 @@ static inline int lookup_chain_cache(struct task_struct *curr, | |||
| 1481 | struct held_lock *hlock, | 1597 | struct held_lock *hlock, |
| 1482 | u64 chain_key) | 1598 | u64 chain_key) |
| 1483 | { | 1599 | { |
| 1484 | struct lock_class *class = hlock->class; | 1600 | struct lock_class *class = hlock_class(hlock); |
| 1485 | struct list_head *hash_head = chainhashentry(chain_key); | 1601 | struct list_head *hash_head = chainhashentry(chain_key); |
| 1486 | struct lock_chain *chain; | 1602 | struct lock_chain *chain; |
| 1487 | struct held_lock *hlock_curr, *hlock_next; | 1603 | struct held_lock *hlock_curr, *hlock_next; |
| @@ -1554,7 +1670,7 @@ cache_hit: | |||
| 1554 | if (likely(cn + chain->depth <= MAX_LOCKDEP_CHAIN_HLOCKS)) { | 1670 | if (likely(cn + chain->depth <= MAX_LOCKDEP_CHAIN_HLOCKS)) { |
| 1555 | chain->base = cn; | 1671 | chain->base = cn; |
| 1556 | for (j = 0; j < chain->depth - 1; j++, i++) { | 1672 | for (j = 0; j < chain->depth - 1; j++, i++) { |
| 1557 | int lock_id = curr->held_locks[i].class - lock_classes; | 1673 | int lock_id = curr->held_locks[i].class_idx - 1; |
| 1558 | chain_hlocks[chain->base + j] = lock_id; | 1674 | chain_hlocks[chain->base + j] = lock_id; |
| 1559 | } | 1675 | } |
| 1560 | chain_hlocks[chain->base + j] = class - lock_classes; | 1676 | chain_hlocks[chain->base + j] = class - lock_classes; |
| @@ -1643,14 +1759,13 @@ static void check_chain_key(struct task_struct *curr) | |||
| 1643 | hlock = curr->held_locks + i; | 1759 | hlock = curr->held_locks + i; |
| 1644 | if (chain_key != hlock->prev_chain_key) { | 1760 | if (chain_key != hlock->prev_chain_key) { |
| 1645 | debug_locks_off(); | 1761 | debug_locks_off(); |
| 1646 | printk("hm#1, depth: %u [%u], %016Lx != %016Lx\n", | 1762 | WARN(1, "hm#1, depth: %u [%u], %016Lx != %016Lx\n", |
| 1647 | curr->lockdep_depth, i, | 1763 | curr->lockdep_depth, i, |
| 1648 | (unsigned long long)chain_key, | 1764 | (unsigned long long)chain_key, |
| 1649 | (unsigned long long)hlock->prev_chain_key); | 1765 | (unsigned long long)hlock->prev_chain_key); |
| 1650 | WARN_ON(1); | ||
| 1651 | return; | 1766 | return; |
| 1652 | } | 1767 | } |
| 1653 | id = hlock->class - lock_classes; | 1768 | id = hlock->class_idx - 1; |
| 1654 | if (DEBUG_LOCKS_WARN_ON(id >= MAX_LOCKDEP_KEYS)) | 1769 | if (DEBUG_LOCKS_WARN_ON(id >= MAX_LOCKDEP_KEYS)) |
| 1655 | return; | 1770 | return; |
| 1656 | 1771 | ||
| @@ -1662,11 +1777,10 @@ static void check_chain_key(struct task_struct *curr) | |||
| 1662 | } | 1777 | } |
| 1663 | if (chain_key != curr->curr_chain_key) { | 1778 | if (chain_key != curr->curr_chain_key) { |
| 1664 | debug_locks_off(); | 1779 | debug_locks_off(); |
| 1665 | printk("hm#2, depth: %u [%u], %016Lx != %016Lx\n", | 1780 | WARN(1, "hm#2, depth: %u [%u], %016Lx != %016Lx\n", |
| 1666 | curr->lockdep_depth, i, | 1781 | curr->lockdep_depth, i, |
| 1667 | (unsigned long long)chain_key, | 1782 | (unsigned long long)chain_key, |
| 1668 | (unsigned long long)curr->curr_chain_key); | 1783 | (unsigned long long)curr->curr_chain_key); |
| 1669 | WARN_ON(1); | ||
| 1670 | } | 1784 | } |
| 1671 | #endif | 1785 | #endif |
| 1672 | } | 1786 | } |
| @@ -1695,7 +1809,7 @@ print_usage_bug(struct task_struct *curr, struct held_lock *this, | |||
| 1695 | print_lock(this); | 1809 | print_lock(this); |
| 1696 | 1810 | ||
| 1697 | printk("{%s} state was registered at:\n", usage_str[prev_bit]); | 1811 | printk("{%s} state was registered at:\n", usage_str[prev_bit]); |
| 1698 | print_stack_trace(this->class->usage_traces + prev_bit, 1); | 1812 | print_stack_trace(hlock_class(this)->usage_traces + prev_bit, 1); |
| 1699 | 1813 | ||
| 1700 | print_irqtrace_events(curr); | 1814 | print_irqtrace_events(curr); |
| 1701 | printk("\nother info that might help us debug this:\n"); | 1815 | printk("\nother info that might help us debug this:\n"); |
| @@ -1714,7 +1828,7 @@ static inline int | |||
| 1714 | valid_state(struct task_struct *curr, struct held_lock *this, | 1828 | valid_state(struct task_struct *curr, struct held_lock *this, |
| 1715 | enum lock_usage_bit new_bit, enum lock_usage_bit bad_bit) | 1829 | enum lock_usage_bit new_bit, enum lock_usage_bit bad_bit) |
| 1716 | { | 1830 | { |
| 1717 | if (unlikely(this->class->usage_mask & (1 << bad_bit))) | 1831 | if (unlikely(hlock_class(this)->usage_mask & (1 << bad_bit))) |
| 1718 | return print_usage_bug(curr, this, bad_bit, new_bit); | 1832 | return print_usage_bug(curr, this, bad_bit, new_bit); |
| 1719 | return 1; | 1833 | return 1; |
| 1720 | } | 1834 | } |
| @@ -1753,7 +1867,7 @@ print_irq_inversion_bug(struct task_struct *curr, struct lock_class *other, | |||
| 1753 | lockdep_print_held_locks(curr); | 1867 | lockdep_print_held_locks(curr); |
| 1754 | 1868 | ||
| 1755 | printk("\nthe first lock's dependencies:\n"); | 1869 | printk("\nthe first lock's dependencies:\n"); |
| 1756 | print_lock_dependencies(this->class, 0); | 1870 | print_lock_dependencies(hlock_class(this), 0); |
| 1757 | 1871 | ||
| 1758 | printk("\nthe second lock's dependencies:\n"); | 1872 | printk("\nthe second lock's dependencies:\n"); |
| 1759 | print_lock_dependencies(other, 0); | 1873 | print_lock_dependencies(other, 0); |
| @@ -1776,7 +1890,7 @@ check_usage_forwards(struct task_struct *curr, struct held_lock *this, | |||
| 1776 | 1890 | ||
| 1777 | find_usage_bit = bit; | 1891 | find_usage_bit = bit; |
| 1778 | /* fills in <forwards_match> */ | 1892 | /* fills in <forwards_match> */ |
| 1779 | ret = find_usage_forwards(this->class, 0); | 1893 | ret = find_usage_forwards(hlock_class(this), 0); |
| 1780 | if (!ret || ret == 1) | 1894 | if (!ret || ret == 1) |
| 1781 | return ret; | 1895 | return ret; |
| 1782 | 1896 | ||
| @@ -1795,7 +1909,7 @@ check_usage_backwards(struct task_struct *curr, struct held_lock *this, | |||
| 1795 | 1909 | ||
| 1796 | find_usage_bit = bit; | 1910 | find_usage_bit = bit; |
| 1797 | /* fills in <backwards_match> */ | 1911 | /* fills in <backwards_match> */ |
| 1798 | ret = find_usage_backwards(this->class, 0); | 1912 | ret = find_usage_backwards(hlock_class(this), 0); |
| 1799 | if (!ret || ret == 1) | 1913 | if (!ret || ret == 1) |
| 1800 | return ret; | 1914 | return ret; |
| 1801 | 1915 | ||
| @@ -1861,7 +1975,7 @@ static int mark_lock_irq(struct task_struct *curr, struct held_lock *this, | |||
| 1861 | LOCK_ENABLED_HARDIRQS_READ, "hard-read")) | 1975 | LOCK_ENABLED_HARDIRQS_READ, "hard-read")) |
| 1862 | return 0; | 1976 | return 0; |
| 1863 | #endif | 1977 | #endif |
| 1864 | if (hardirq_verbose(this->class)) | 1978 | if (hardirq_verbose(hlock_class(this))) |
| 1865 | ret = 2; | 1979 | ret = 2; |
| 1866 | break; | 1980 | break; |
| 1867 | case LOCK_USED_IN_SOFTIRQ: | 1981 | case LOCK_USED_IN_SOFTIRQ: |
| @@ -1886,7 +2000,7 @@ static int mark_lock_irq(struct task_struct *curr, struct held_lock *this, | |||
| 1886 | LOCK_ENABLED_SOFTIRQS_READ, "soft-read")) | 2000 | LOCK_ENABLED_SOFTIRQS_READ, "soft-read")) |
| 1887 | return 0; | 2001 | return 0; |
| 1888 | #endif | 2002 | #endif |
| 1889 | if (softirq_verbose(this->class)) | 2003 | if (softirq_verbose(hlock_class(this))) |
| 1890 | ret = 2; | 2004 | ret = 2; |
| 1891 | break; | 2005 | break; |
| 1892 | case LOCK_USED_IN_HARDIRQ_READ: | 2006 | case LOCK_USED_IN_HARDIRQ_READ: |
| @@ -1899,7 +2013,7 @@ static int mark_lock_irq(struct task_struct *curr, struct held_lock *this, | |||
| 1899 | if (!check_usage_forwards(curr, this, | 2013 | if (!check_usage_forwards(curr, this, |
| 1900 | LOCK_ENABLED_HARDIRQS, "hard")) | 2014 | LOCK_ENABLED_HARDIRQS, "hard")) |
| 1901 | return 0; | 2015 | return 0; |
| 1902 | if (hardirq_verbose(this->class)) | 2016 | if (hardirq_verbose(hlock_class(this))) |
| 1903 | ret = 2; | 2017 | ret = 2; |
| 1904 | break; | 2018 | break; |
| 1905 | case LOCK_USED_IN_SOFTIRQ_READ: | 2019 | case LOCK_USED_IN_SOFTIRQ_READ: |
| @@ -1912,7 +2026,7 @@ static int mark_lock_irq(struct task_struct *curr, struct held_lock *this, | |||
| 1912 | if (!check_usage_forwards(curr, this, | 2026 | if (!check_usage_forwards(curr, this, |
| 1913 | LOCK_ENABLED_SOFTIRQS, "soft")) | 2027 | LOCK_ENABLED_SOFTIRQS, "soft")) |
| 1914 | return 0; | 2028 | return 0; |
| 1915 | if (softirq_verbose(this->class)) | 2029 | if (softirq_verbose(hlock_class(this))) |
| 1916 | ret = 2; | 2030 | ret = 2; |
| 1917 | break; | 2031 | break; |
| 1918 | case LOCK_ENABLED_HARDIRQS: | 2032 | case LOCK_ENABLED_HARDIRQS: |
| @@ -1938,7 +2052,7 @@ static int mark_lock_irq(struct task_struct *curr, struct held_lock *this, | |||
| 1938 | LOCK_USED_IN_HARDIRQ_READ, "hard-read")) | 2052 | LOCK_USED_IN_HARDIRQ_READ, "hard-read")) |
| 1939 | return 0; | 2053 | return 0; |
| 1940 | #endif | 2054 | #endif |
| 1941 | if (hardirq_verbose(this->class)) | 2055 | if (hardirq_verbose(hlock_class(this))) |
| 1942 | ret = 2; | 2056 | ret = 2; |
| 1943 | break; | 2057 | break; |
| 1944 | case LOCK_ENABLED_SOFTIRQS: | 2058 | case LOCK_ENABLED_SOFTIRQS: |
| @@ -1964,7 +2078,7 @@ static int mark_lock_irq(struct task_struct *curr, struct held_lock *this, | |||
| 1964 | LOCK_USED_IN_SOFTIRQ_READ, "soft-read")) | 2078 | LOCK_USED_IN_SOFTIRQ_READ, "soft-read")) |
| 1965 | return 0; | 2079 | return 0; |
| 1966 | #endif | 2080 | #endif |
| 1967 | if (softirq_verbose(this->class)) | 2081 | if (softirq_verbose(hlock_class(this))) |
| 1968 | ret = 2; | 2082 | ret = 2; |
| 1969 | break; | 2083 | break; |
| 1970 | case LOCK_ENABLED_HARDIRQS_READ: | 2084 | case LOCK_ENABLED_HARDIRQS_READ: |
| @@ -1979,7 +2093,7 @@ static int mark_lock_irq(struct task_struct *curr, struct held_lock *this, | |||
| 1979 | LOCK_USED_IN_HARDIRQ, "hard")) | 2093 | LOCK_USED_IN_HARDIRQ, "hard")) |
| 1980 | return 0; | 2094 | return 0; |
| 1981 | #endif | 2095 | #endif |
| 1982 | if (hardirq_verbose(this->class)) | 2096 | if (hardirq_verbose(hlock_class(this))) |
| 1983 | ret = 2; | 2097 | ret = 2; |
| 1984 | break; | 2098 | break; |
| 1985 | case LOCK_ENABLED_SOFTIRQS_READ: | 2099 | case LOCK_ENABLED_SOFTIRQS_READ: |
| @@ -1994,7 +2108,7 @@ static int mark_lock_irq(struct task_struct *curr, struct held_lock *this, | |||
| 1994 | LOCK_USED_IN_SOFTIRQ, "soft")) | 2108 | LOCK_USED_IN_SOFTIRQ, "soft")) |
| 1995 | return 0; | 2109 | return 0; |
| 1996 | #endif | 2110 | #endif |
| 1997 | if (softirq_verbose(this->class)) | 2111 | if (softirq_verbose(hlock_class(this))) |
| 1998 | ret = 2; | 2112 | ret = 2; |
| 1999 | break; | 2113 | break; |
| 2000 | default: | 2114 | default: |
| @@ -2310,7 +2424,7 @@ static int mark_lock(struct task_struct *curr, struct held_lock *this, | |||
| 2310 | * If already set then do not dirty the cacheline, | 2424 | * If already set then do not dirty the cacheline, |
| 2311 | * nor do any checks: | 2425 | * nor do any checks: |
| 2312 | */ | 2426 | */ |
| 2313 | if (likely(this->class->usage_mask & new_mask)) | 2427 | if (likely(hlock_class(this)->usage_mask & new_mask)) |
| 2314 | return 1; | 2428 | return 1; |
| 2315 | 2429 | ||
| 2316 | if (!graph_lock()) | 2430 | if (!graph_lock()) |
| @@ -2318,14 +2432,14 @@ static int mark_lock(struct task_struct *curr, struct held_lock *this, | |||
| 2318 | /* | 2432 | /* |
| 2319 | * Make sure we didnt race: | 2433 | * Make sure we didnt race: |
| 2320 | */ | 2434 | */ |
| 2321 | if (unlikely(this->class->usage_mask & new_mask)) { | 2435 | if (unlikely(hlock_class(this)->usage_mask & new_mask)) { |
| 2322 | graph_unlock(); | 2436 | graph_unlock(); |
| 2323 | return 1; | 2437 | return 1; |
| 2324 | } | 2438 | } |
| 2325 | 2439 | ||
| 2326 | this->class->usage_mask |= new_mask; | 2440 | hlock_class(this)->usage_mask |= new_mask; |
| 2327 | 2441 | ||
| 2328 | if (!save_trace(this->class->usage_traces + new_bit)) | 2442 | if (!save_trace(hlock_class(this)->usage_traces + new_bit)) |
| 2329 | return 0; | 2443 | return 0; |
| 2330 | 2444 | ||
| 2331 | switch (new_bit) { | 2445 | switch (new_bit) { |
| @@ -2405,7 +2519,7 @@ EXPORT_SYMBOL_GPL(lockdep_init_map); | |||
| 2405 | */ | 2519 | */ |
| 2406 | static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass, | 2520 | static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass, |
| 2407 | int trylock, int read, int check, int hardirqs_off, | 2521 | int trylock, int read, int check, int hardirqs_off, |
| 2408 | unsigned long ip) | 2522 | struct lockdep_map *nest_lock, unsigned long ip) |
| 2409 | { | 2523 | { |
| 2410 | struct task_struct *curr = current; | 2524 | struct task_struct *curr = current; |
| 2411 | struct lock_class *class = NULL; | 2525 | struct lock_class *class = NULL; |
| @@ -2459,14 +2573,16 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass, | |||
| 2459 | return 0; | 2573 | return 0; |
| 2460 | 2574 | ||
| 2461 | hlock = curr->held_locks + depth; | 2575 | hlock = curr->held_locks + depth; |
| 2462 | 2576 | if (DEBUG_LOCKS_WARN_ON(!class)) | |
| 2463 | hlock->class = class; | 2577 | return 0; |
| 2578 | hlock->class_idx = class - lock_classes + 1; | ||
| 2464 | hlock->acquire_ip = ip; | 2579 | hlock->acquire_ip = ip; |
| 2465 | hlock->instance = lock; | 2580 | hlock->instance = lock; |
| 2581 | hlock->nest_lock = nest_lock; | ||
| 2466 | hlock->trylock = trylock; | 2582 | hlock->trylock = trylock; |
| 2467 | hlock->read = read; | 2583 | hlock->read = read; |
| 2468 | hlock->check = check; | 2584 | hlock->check = check; |
| 2469 | hlock->hardirqs_off = hardirqs_off; | 2585 | hlock->hardirqs_off = !!hardirqs_off; |
| 2470 | #ifdef CONFIG_LOCK_STAT | 2586 | #ifdef CONFIG_LOCK_STAT |
| 2471 | hlock->waittime_stamp = 0; | 2587 | hlock->waittime_stamp = 0; |
| 2472 | hlock->holdtime_stamp = sched_clock(); | 2588 | hlock->holdtime_stamp = sched_clock(); |
| @@ -2574,6 +2690,55 @@ static int check_unlock(struct task_struct *curr, struct lockdep_map *lock, | |||
| 2574 | return 1; | 2690 | return 1; |
| 2575 | } | 2691 | } |
| 2576 | 2692 | ||
| 2693 | static int | ||
| 2694 | __lock_set_subclass(struct lockdep_map *lock, | ||
| 2695 | unsigned int subclass, unsigned long ip) | ||
| 2696 | { | ||
| 2697 | struct task_struct *curr = current; | ||
| 2698 | struct held_lock *hlock, *prev_hlock; | ||
| 2699 | struct lock_class *class; | ||
| 2700 | unsigned int depth; | ||
| 2701 | int i; | ||
| 2702 | |||
| 2703 | depth = curr->lockdep_depth; | ||
| 2704 | if (DEBUG_LOCKS_WARN_ON(!depth)) | ||
| 2705 | return 0; | ||
| 2706 | |||
| 2707 | prev_hlock = NULL; | ||
| 2708 | for (i = depth-1; i >= 0; i--) { | ||
| 2709 | hlock = curr->held_locks + i; | ||
| 2710 | /* | ||
| 2711 | * We must not cross into another context: | ||
| 2712 | */ | ||
| 2713 | if (prev_hlock && prev_hlock->irq_context != hlock->irq_context) | ||
| 2714 | break; | ||
| 2715 | if (hlock->instance == lock) | ||
| 2716 | goto found_it; | ||
| 2717 | prev_hlock = hlock; | ||
| 2718 | } | ||
| 2719 | return print_unlock_inbalance_bug(curr, lock, ip); | ||
| 2720 | |||
| 2721 | found_it: | ||
| 2722 | class = register_lock_class(lock, subclass, 0); | ||
| 2723 | hlock->class_idx = class - lock_classes + 1; | ||
| 2724 | |||
| 2725 | curr->lockdep_depth = i; | ||
| 2726 | curr->curr_chain_key = hlock->prev_chain_key; | ||
| 2727 | |||
| 2728 | for (; i < depth; i++) { | ||
| 2729 | hlock = curr->held_locks + i; | ||
| 2730 | if (!__lock_acquire(hlock->instance, | ||
| 2731 | hlock_class(hlock)->subclass, hlock->trylock, | ||
| 2732 | hlock->read, hlock->check, hlock->hardirqs_off, | ||
| 2733 | hlock->nest_lock, hlock->acquire_ip)) | ||
| 2734 | return 0; | ||
| 2735 | } | ||
| 2736 | |||
| 2737 | if (DEBUG_LOCKS_WARN_ON(curr->lockdep_depth != depth)) | ||
| 2738 | return 0; | ||
| 2739 | return 1; | ||
| 2740 | } | ||
| 2741 | |||
| 2577 | /* | 2742 | /* |
| 2578 | * Remove the lock to the list of currently held locks in a | 2743 | * Remove the lock to the list of currently held locks in a |
| 2579 | * potentially non-nested (out of order) manner. This is a | 2744 | * potentially non-nested (out of order) manner. This is a |
| @@ -2624,9 +2789,9 @@ found_it: | |||
| 2624 | for (i++; i < depth; i++) { | 2789 | for (i++; i < depth; i++) { |
| 2625 | hlock = curr->held_locks + i; | 2790 | hlock = curr->held_locks + i; |
| 2626 | if (!__lock_acquire(hlock->instance, | 2791 | if (!__lock_acquire(hlock->instance, |
| 2627 | hlock->class->subclass, hlock->trylock, | 2792 | hlock_class(hlock)->subclass, hlock->trylock, |
| 2628 | hlock->read, hlock->check, hlock->hardirqs_off, | 2793 | hlock->read, hlock->check, hlock->hardirqs_off, |
| 2629 | hlock->acquire_ip)) | 2794 | hlock->nest_lock, hlock->acquire_ip)) |
| 2630 | return 0; | 2795 | return 0; |
| 2631 | } | 2796 | } |
| 2632 | 2797 | ||
| @@ -2669,7 +2834,7 @@ static int lock_release_nested(struct task_struct *curr, | |||
| 2669 | 2834 | ||
| 2670 | #ifdef CONFIG_DEBUG_LOCKDEP | 2835 | #ifdef CONFIG_DEBUG_LOCKDEP |
| 2671 | hlock->prev_chain_key = 0; | 2836 | hlock->prev_chain_key = 0; |
| 2672 | hlock->class = NULL; | 2837 | hlock->class_idx = 0; |
| 2673 | hlock->acquire_ip = 0; | 2838 | hlock->acquire_ip = 0; |
| 2674 | hlock->irq_context = 0; | 2839 | hlock->irq_context = 0; |
| 2675 | #endif | 2840 | #endif |
| @@ -2738,18 +2903,36 @@ static void check_flags(unsigned long flags) | |||
| 2738 | #endif | 2903 | #endif |
| 2739 | } | 2904 | } |
| 2740 | 2905 | ||
| 2906 | void | ||
| 2907 | lock_set_subclass(struct lockdep_map *lock, | ||
| 2908 | unsigned int subclass, unsigned long ip) | ||
| 2909 | { | ||
| 2910 | unsigned long flags; | ||
| 2911 | |||
| 2912 | if (unlikely(current->lockdep_recursion)) | ||
| 2913 | return; | ||
| 2914 | |||
| 2915 | raw_local_irq_save(flags); | ||
| 2916 | current->lockdep_recursion = 1; | ||
| 2917 | check_flags(flags); | ||
| 2918 | if (__lock_set_subclass(lock, subclass, ip)) | ||
| 2919 | check_chain_key(current); | ||
| 2920 | current->lockdep_recursion = 0; | ||
| 2921 | raw_local_irq_restore(flags); | ||
| 2922 | } | ||
| 2923 | |||
| 2924 | EXPORT_SYMBOL_GPL(lock_set_subclass); | ||
| 2925 | |||
| 2741 | /* | 2926 | /* |
| 2742 | * We are not always called with irqs disabled - do that here, | 2927 | * We are not always called with irqs disabled - do that here, |
| 2743 | * and also avoid lockdep recursion: | 2928 | * and also avoid lockdep recursion: |
| 2744 | */ | 2929 | */ |
| 2745 | void lock_acquire(struct lockdep_map *lock, unsigned int subclass, | 2930 | void lock_acquire(struct lockdep_map *lock, unsigned int subclass, |
| 2746 | int trylock, int read, int check, unsigned long ip) | 2931 | int trylock, int read, int check, |
| 2932 | struct lockdep_map *nest_lock, unsigned long ip) | ||
| 2747 | { | 2933 | { |
| 2748 | unsigned long flags; | 2934 | unsigned long flags; |
| 2749 | 2935 | ||
| 2750 | if (unlikely(!lock_stat && !prove_locking)) | ||
| 2751 | return; | ||
| 2752 | |||
| 2753 | if (unlikely(current->lockdep_recursion)) | 2936 | if (unlikely(current->lockdep_recursion)) |
| 2754 | return; | 2937 | return; |
| 2755 | 2938 | ||
| @@ -2758,7 +2941,7 @@ void lock_acquire(struct lockdep_map *lock, unsigned int subclass, | |||
| 2758 | 2941 | ||
| 2759 | current->lockdep_recursion = 1; | 2942 | current->lockdep_recursion = 1; |
| 2760 | __lock_acquire(lock, subclass, trylock, read, check, | 2943 | __lock_acquire(lock, subclass, trylock, read, check, |
| 2761 | irqs_disabled_flags(flags), ip); | 2944 | irqs_disabled_flags(flags), nest_lock, ip); |
| 2762 | current->lockdep_recursion = 0; | 2945 | current->lockdep_recursion = 0; |
| 2763 | raw_local_irq_restore(flags); | 2946 | raw_local_irq_restore(flags); |
| 2764 | } | 2947 | } |
| @@ -2770,9 +2953,6 @@ void lock_release(struct lockdep_map *lock, int nested, | |||
| 2770 | { | 2953 | { |
| 2771 | unsigned long flags; | 2954 | unsigned long flags; |
| 2772 | 2955 | ||
| 2773 | if (unlikely(!lock_stat && !prove_locking)) | ||
| 2774 | return; | ||
| 2775 | |||
| 2776 | if (unlikely(current->lockdep_recursion)) | 2956 | if (unlikely(current->lockdep_recursion)) |
| 2777 | return; | 2957 | return; |
| 2778 | 2958 | ||
| @@ -2845,11 +3025,11 @@ __lock_contended(struct lockdep_map *lock, unsigned long ip) | |||
| 2845 | found_it: | 3025 | found_it: |
| 2846 | hlock->waittime_stamp = sched_clock(); | 3026 | hlock->waittime_stamp = sched_clock(); |
| 2847 | 3027 | ||
| 2848 | point = lock_contention_point(hlock->class, ip); | 3028 | point = lock_contention_point(hlock_class(hlock), ip); |
| 2849 | 3029 | ||
| 2850 | stats = get_lock_stats(hlock->class); | 3030 | stats = get_lock_stats(hlock_class(hlock)); |
| 2851 | if (point < ARRAY_SIZE(stats->contention_point)) | 3031 | if (point < ARRAY_SIZE(stats->contention_point)) |
| 2852 | stats->contention_point[i]++; | 3032 | stats->contention_point[point]++; |
| 2853 | if (lock->cpu != smp_processor_id()) | 3033 | if (lock->cpu != smp_processor_id()) |
| 2854 | stats->bounces[bounce_contended + !!hlock->read]++; | 3034 | stats->bounces[bounce_contended + !!hlock->read]++; |
| 2855 | put_lock_stats(stats); | 3035 | put_lock_stats(stats); |
| @@ -2893,7 +3073,7 @@ found_it: | |||
| 2893 | hlock->holdtime_stamp = now; | 3073 | hlock->holdtime_stamp = now; |
| 2894 | } | 3074 | } |
| 2895 | 3075 | ||
| 2896 | stats = get_lock_stats(hlock->class); | 3076 | stats = get_lock_stats(hlock_class(hlock)); |
| 2897 | if (waittime) { | 3077 | if (waittime) { |
| 2898 | if (hlock->read) | 3078 | if (hlock->read) |
| 2899 | lock_time_inc(&stats->read_waittime, waittime); | 3079 | lock_time_inc(&stats->read_waittime, waittime); |
| @@ -2988,6 +3168,7 @@ static void zap_class(struct lock_class *class) | |||
| 2988 | list_del_rcu(&class->hash_entry); | 3168 | list_del_rcu(&class->hash_entry); |
| 2989 | list_del_rcu(&class->lock_entry); | 3169 | list_del_rcu(&class->lock_entry); |
| 2990 | 3170 | ||
| 3171 | class->key = NULL; | ||
| 2991 | } | 3172 | } |
| 2992 | 3173 | ||
| 2993 | static inline int within(const void *addr, void *start, unsigned long size) | 3174 | static inline int within(const void *addr, void *start, unsigned long size) |
diff --git a/kernel/lockdep_internals.h b/kernel/lockdep_internals.h index c3600a091a28..56b196932c08 100644 --- a/kernel/lockdep_internals.h +++ b/kernel/lockdep_internals.h | |||
| @@ -17,9 +17,6 @@ | |||
| 17 | */ | 17 | */ |
| 18 | #define MAX_LOCKDEP_ENTRIES 8192UL | 18 | #define MAX_LOCKDEP_ENTRIES 8192UL |
| 19 | 19 | ||
| 20 | #define MAX_LOCKDEP_KEYS_BITS 11 | ||
| 21 | #define MAX_LOCKDEP_KEYS (1UL << MAX_LOCKDEP_KEYS_BITS) | ||
| 22 | |||
| 23 | #define MAX_LOCKDEP_CHAINS_BITS 14 | 20 | #define MAX_LOCKDEP_CHAINS_BITS 14 |
| 24 | #define MAX_LOCKDEP_CHAINS (1UL << MAX_LOCKDEP_CHAINS_BITS) | 21 | #define MAX_LOCKDEP_CHAINS (1UL << MAX_LOCKDEP_CHAINS_BITS) |
| 25 | 22 | ||
| @@ -53,6 +50,22 @@ extern unsigned int nr_process_chains; | |||
| 53 | extern unsigned int max_lockdep_depth; | 50 | extern unsigned int max_lockdep_depth; |
| 54 | extern unsigned int max_recursion_depth; | 51 | extern unsigned int max_recursion_depth; |
| 55 | 52 | ||
| 53 | #ifdef CONFIG_PROVE_LOCKING | ||
| 54 | extern unsigned long lockdep_count_forward_deps(struct lock_class *); | ||
| 55 | extern unsigned long lockdep_count_backward_deps(struct lock_class *); | ||
| 56 | #else | ||
| 57 | static inline unsigned long | ||
| 58 | lockdep_count_forward_deps(struct lock_class *class) | ||
| 59 | { | ||
| 60 | return 0; | ||
| 61 | } | ||
| 62 | static inline unsigned long | ||
| 63 | lockdep_count_backward_deps(struct lock_class *class) | ||
| 64 | { | ||
| 65 | return 0; | ||
| 66 | } | ||
| 67 | #endif | ||
| 68 | |||
| 56 | #ifdef CONFIG_DEBUG_LOCKDEP | 69 | #ifdef CONFIG_DEBUG_LOCKDEP |
| 57 | /* | 70 | /* |
| 58 | * Various lockdep statistics: | 71 | * Various lockdep statistics: |
diff --git a/kernel/lockdep_proc.c b/kernel/lockdep_proc.c index 9b0e940e2545..20dbcbf9c7dd 100644 --- a/kernel/lockdep_proc.c +++ b/kernel/lockdep_proc.c | |||
| @@ -63,34 +63,6 @@ static void l_stop(struct seq_file *m, void *v) | |||
| 63 | { | 63 | { |
| 64 | } | 64 | } |
| 65 | 65 | ||
| 66 | static unsigned long count_forward_deps(struct lock_class *class) | ||
| 67 | { | ||
| 68 | struct lock_list *entry; | ||
| 69 | unsigned long ret = 1; | ||
| 70 | |||
| 71 | /* | ||
| 72 | * Recurse this class's dependency list: | ||
| 73 | */ | ||
| 74 | list_for_each_entry(entry, &class->locks_after, entry) | ||
| 75 | ret += count_forward_deps(entry->class); | ||
| 76 | |||
| 77 | return ret; | ||
| 78 | } | ||
| 79 | |||
| 80 | static unsigned long count_backward_deps(struct lock_class *class) | ||
| 81 | { | ||
| 82 | struct lock_list *entry; | ||
| 83 | unsigned long ret = 1; | ||
| 84 | |||
| 85 | /* | ||
| 86 | * Recurse this class's dependency list: | ||
| 87 | */ | ||
| 88 | list_for_each_entry(entry, &class->locks_before, entry) | ||
| 89 | ret += count_backward_deps(entry->class); | ||
| 90 | |||
| 91 | return ret; | ||
| 92 | } | ||
| 93 | |||
| 94 | static void print_name(struct seq_file *m, struct lock_class *class) | 66 | static void print_name(struct seq_file *m, struct lock_class *class) |
| 95 | { | 67 | { |
| 96 | char str[128]; | 68 | char str[128]; |
| @@ -110,7 +82,6 @@ static void print_name(struct seq_file *m, struct lock_class *class) | |||
| 110 | 82 | ||
| 111 | static int l_show(struct seq_file *m, void *v) | 83 | static int l_show(struct seq_file *m, void *v) |
| 112 | { | 84 | { |
| 113 | unsigned long nr_forward_deps, nr_backward_deps; | ||
| 114 | struct lock_class *class = v; | 85 | struct lock_class *class = v; |
| 115 | struct lock_list *entry; | 86 | struct lock_list *entry; |
| 116 | char c1, c2, c3, c4; | 87 | char c1, c2, c3, c4; |
| @@ -124,11 +95,10 @@ static int l_show(struct seq_file *m, void *v) | |||
| 124 | #ifdef CONFIG_DEBUG_LOCKDEP | 95 | #ifdef CONFIG_DEBUG_LOCKDEP |
| 125 | seq_printf(m, " OPS:%8ld", class->ops); | 96 | seq_printf(m, " OPS:%8ld", class->ops); |
| 126 | #endif | 97 | #endif |
| 127 | nr_forward_deps = count_forward_deps(class); | 98 | #ifdef CONFIG_PROVE_LOCKING |
| 128 | seq_printf(m, " FD:%5ld", nr_forward_deps); | 99 | seq_printf(m, " FD:%5ld", lockdep_count_forward_deps(class)); |
| 129 | 100 | seq_printf(m, " BD:%5ld", lockdep_count_backward_deps(class)); | |
| 130 | nr_backward_deps = count_backward_deps(class); | 101 | #endif |
| 131 | seq_printf(m, " BD:%5ld", nr_backward_deps); | ||
| 132 | 102 | ||
| 133 | get_usage_chars(class, &c1, &c2, &c3, &c4); | 103 | get_usage_chars(class, &c1, &c2, &c3, &c4); |
| 134 | seq_printf(m, " %c%c%c%c", c1, c2, c3, c4); | 104 | seq_printf(m, " %c%c%c%c", c1, c2, c3, c4); |
| @@ -229,6 +199,9 @@ static int lc_show(struct seq_file *m, void *v) | |||
| 229 | 199 | ||
| 230 | for (i = 0; i < chain->depth; i++) { | 200 | for (i = 0; i < chain->depth; i++) { |
| 231 | class = lock_chain_get_class(chain, i); | 201 | class = lock_chain_get_class(chain, i); |
| 202 | if (!class->key) | ||
| 203 | continue; | ||
| 204 | |||
| 232 | seq_printf(m, "[%p] ", class->key); | 205 | seq_printf(m, "[%p] ", class->key); |
| 233 | print_name(m, class); | 206 | print_name(m, class); |
| 234 | seq_puts(m, "\n"); | 207 | seq_puts(m, "\n"); |
| @@ -350,7 +323,9 @@ static int lockdep_stats_show(struct seq_file *m, void *v) | |||
| 350 | if (class->usage_mask & LOCKF_ENABLED_HARDIRQS_READ) | 323 | if (class->usage_mask & LOCKF_ENABLED_HARDIRQS_READ) |
| 351 | nr_hardirq_read_unsafe++; | 324 | nr_hardirq_read_unsafe++; |
| 352 | 325 | ||
| 353 | sum_forward_deps += count_forward_deps(class); | 326 | #ifdef CONFIG_PROVE_LOCKING |
| 327 | sum_forward_deps += lockdep_count_forward_deps(class); | ||
| 328 | #endif | ||
| 354 | } | 329 | } |
| 355 | #ifdef CONFIG_DEBUG_LOCKDEP | 330 | #ifdef CONFIG_DEBUG_LOCKDEP |
| 356 | DEBUG_LOCKS_WARN_ON(debug_atomic_read(&nr_unused_locks) != nr_unused); | 331 | DEBUG_LOCKS_WARN_ON(debug_atomic_read(&nr_unused_locks) != nr_unused); |
| @@ -497,8 +472,9 @@ static void snprint_time(char *buf, size_t bufsiz, s64 nr) | |||
| 497 | { | 472 | { |
| 498 | unsigned long rem; | 473 | unsigned long rem; |
| 499 | 474 | ||
| 475 | nr += 5; /* for display rounding */ | ||
| 500 | rem = do_div(nr, 1000); /* XXX: do_div_signed */ | 476 | rem = do_div(nr, 1000); /* XXX: do_div_signed */ |
| 501 | snprintf(buf, bufsiz, "%lld.%02d", (long long)nr, ((int)rem+5)/10); | 477 | snprintf(buf, bufsiz, "%lld.%02d", (long long)nr, (int)rem/10); |
| 502 | } | 478 | } |
| 503 | 479 | ||
| 504 | static void seq_time(struct seq_file *m, s64 time) | 480 | static void seq_time(struct seq_file *m, s64 time) |
diff --git a/kernel/module.c b/kernel/module.c index 61d212120df4..9db11911e04b 100644 --- a/kernel/module.c +++ b/kernel/module.c | |||
| @@ -1799,7 +1799,7 @@ static void *module_alloc_update_bounds(unsigned long size) | |||
| 1799 | 1799 | ||
| 1800 | /* Allocate and load the module: note that size of section 0 is always | 1800 | /* Allocate and load the module: note that size of section 0 is always |
| 1801 | zero, and we rely on this for optional sections. */ | 1801 | zero, and we rely on this for optional sections. */ |
| 1802 | static struct module *load_module(void __user *umod, | 1802 | static noinline struct module *load_module(void __user *umod, |
| 1803 | unsigned long len, | 1803 | unsigned long len, |
| 1804 | const char __user *uargs) | 1804 | const char __user *uargs) |
| 1805 | { | 1805 | { |
| @@ -2288,7 +2288,7 @@ sys_init_module(void __user *umod, | |||
| 2288 | 2288 | ||
| 2289 | /* Start the module */ | 2289 | /* Start the module */ |
| 2290 | if (mod->init != NULL) | 2290 | if (mod->init != NULL) |
| 2291 | ret = mod->init(); | 2291 | ret = do_one_initcall(mod->init); |
| 2292 | if (ret < 0) { | 2292 | if (ret < 0) { |
| 2293 | /* Init routine failed: abort. Try to protect us from | 2293 | /* Init routine failed: abort. Try to protect us from |
| 2294 | buggy refcounters. */ | 2294 | buggy refcounters. */ |
diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c index 21575fc46d05..1d3ef29a2583 100644 --- a/kernel/nsproxy.c +++ b/kernel/nsproxy.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 17 | #include <linux/version.h> | ||
| 18 | #include <linux/nsproxy.h> | 17 | #include <linux/nsproxy.h> |
| 19 | #include <linux/init_task.h> | 18 | #include <linux/init_task.h> |
| 20 | #include <linux/mnt_namespace.h> | 19 | #include <linux/mnt_namespace.h> |
diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c index ea567b78d1aa..fab8ea86fac3 100644 --- a/kernel/pid_namespace.c +++ b/kernel/pid_namespace.c | |||
| @@ -179,9 +179,6 @@ void zap_pid_ns_processes(struct pid_namespace *pid_ns) | |||
| 179 | rc = sys_wait4(-1, NULL, __WALL, NULL); | 179 | rc = sys_wait4(-1, NULL, __WALL, NULL); |
| 180 | } while (rc != -ECHILD); | 180 | } while (rc != -ECHILD); |
| 181 | 181 | ||
| 182 | |||
| 183 | /* Child reaper for the pid namespace is going away */ | ||
| 184 | pid_ns->child_reaper = NULL; | ||
| 185 | acct_exit_ns(pid_ns); | 182 | acct_exit_ns(pid_ns); |
| 186 | return; | 183 | return; |
| 187 | } | 184 | } |
diff --git a/kernel/pm_qos_params.c b/kernel/pm_qos_params.c index da9c2dda6a4e..dfdec524d1b7 100644 --- a/kernel/pm_qos_params.c +++ b/kernel/pm_qos_params.c | |||
| @@ -43,7 +43,7 @@ | |||
| 43 | #include <linux/uaccess.h> | 43 | #include <linux/uaccess.h> |
| 44 | 44 | ||
| 45 | /* | 45 | /* |
| 46 | * locking rule: all changes to target_value or requirements or notifiers lists | 46 | * locking rule: all changes to requirements or notifiers lists |
| 47 | * or pm_qos_object list and pm_qos_objects need to happen with pm_qos_lock | 47 | * or pm_qos_object list and pm_qos_objects need to happen with pm_qos_lock |
| 48 | * held, taken with _irqsave. One lock to rule them all | 48 | * held, taken with _irqsave. One lock to rule them all |
| 49 | */ | 49 | */ |
| @@ -66,7 +66,7 @@ struct pm_qos_object { | |||
| 66 | struct miscdevice pm_qos_power_miscdev; | 66 | struct miscdevice pm_qos_power_miscdev; |
| 67 | char *name; | 67 | char *name; |
| 68 | s32 default_value; | 68 | s32 default_value; |
| 69 | s32 target_value; | 69 | atomic_t target_value; |
| 70 | s32 (*comparitor)(s32, s32); | 70 | s32 (*comparitor)(s32, s32); |
| 71 | }; | 71 | }; |
| 72 | 72 | ||
| @@ -77,7 +77,7 @@ static struct pm_qos_object cpu_dma_pm_qos = { | |||
| 77 | .notifiers = &cpu_dma_lat_notifier, | 77 | .notifiers = &cpu_dma_lat_notifier, |
| 78 | .name = "cpu_dma_latency", | 78 | .name = "cpu_dma_latency", |
| 79 | .default_value = 2000 * USEC_PER_SEC, | 79 | .default_value = 2000 * USEC_PER_SEC, |
| 80 | .target_value = 2000 * USEC_PER_SEC, | 80 | .target_value = ATOMIC_INIT(2000 * USEC_PER_SEC), |
| 81 | .comparitor = min_compare | 81 | .comparitor = min_compare |
| 82 | }; | 82 | }; |
| 83 | 83 | ||
| @@ -87,7 +87,7 @@ static struct pm_qos_object network_lat_pm_qos = { | |||
| 87 | .notifiers = &network_lat_notifier, | 87 | .notifiers = &network_lat_notifier, |
| 88 | .name = "network_latency", | 88 | .name = "network_latency", |
| 89 | .default_value = 2000 * USEC_PER_SEC, | 89 | .default_value = 2000 * USEC_PER_SEC, |
| 90 | .target_value = 2000 * USEC_PER_SEC, | 90 | .target_value = ATOMIC_INIT(2000 * USEC_PER_SEC), |
| 91 | .comparitor = min_compare | 91 | .comparitor = min_compare |
| 92 | }; | 92 | }; |
| 93 | 93 | ||
| @@ -99,7 +99,7 @@ static struct pm_qos_object network_throughput_pm_qos = { | |||
| 99 | .notifiers = &network_throughput_notifier, | 99 | .notifiers = &network_throughput_notifier, |
| 100 | .name = "network_throughput", | 100 | .name = "network_throughput", |
| 101 | .default_value = 0, | 101 | .default_value = 0, |
| 102 | .target_value = 0, | 102 | .target_value = ATOMIC_INIT(0), |
| 103 | .comparitor = max_compare | 103 | .comparitor = max_compare |
| 104 | }; | 104 | }; |
| 105 | 105 | ||
| @@ -150,11 +150,11 @@ static void update_target(int target) | |||
| 150 | extreme_value = pm_qos_array[target]->comparitor( | 150 | extreme_value = pm_qos_array[target]->comparitor( |
| 151 | extreme_value, node->value); | 151 | extreme_value, node->value); |
| 152 | } | 152 | } |
| 153 | if (pm_qos_array[target]->target_value != extreme_value) { | 153 | if (atomic_read(&pm_qos_array[target]->target_value) != extreme_value) { |
| 154 | call_notifier = 1; | 154 | call_notifier = 1; |
| 155 | pm_qos_array[target]->target_value = extreme_value; | 155 | atomic_set(&pm_qos_array[target]->target_value, extreme_value); |
| 156 | pr_debug(KERN_ERR "new target for qos %d is %d\n", target, | 156 | pr_debug(KERN_ERR "new target for qos %d is %d\n", target, |
| 157 | pm_qos_array[target]->target_value); | 157 | atomic_read(&pm_qos_array[target]->target_value)); |
| 158 | } | 158 | } |
| 159 | spin_unlock_irqrestore(&pm_qos_lock, flags); | 159 | spin_unlock_irqrestore(&pm_qos_lock, flags); |
| 160 | 160 | ||
| @@ -193,14 +193,7 @@ static int find_pm_qos_object_by_minor(int minor) | |||
| 193 | */ | 193 | */ |
| 194 | int pm_qos_requirement(int pm_qos_class) | 194 | int pm_qos_requirement(int pm_qos_class) |
| 195 | { | 195 | { |
| 196 | int ret_val; | 196 | return atomic_read(&pm_qos_array[pm_qos_class]->target_value); |
| 197 | unsigned long flags; | ||
| 198 | |||
| 199 | spin_lock_irqsave(&pm_qos_lock, flags); | ||
| 200 | ret_val = pm_qos_array[pm_qos_class]->target_value; | ||
| 201 | spin_unlock_irqrestore(&pm_qos_lock, flags); | ||
| 202 | |||
| 203 | return ret_val; | ||
| 204 | } | 197 | } |
| 205 | EXPORT_SYMBOL_GPL(pm_qos_requirement); | 198 | EXPORT_SYMBOL_GPL(pm_qos_requirement); |
| 206 | 199 | ||
diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c index 9a21681aa80f..e36d5798cbff 100644 --- a/kernel/posix-timers.c +++ b/kernel/posix-timers.c | |||
| @@ -289,21 +289,29 @@ void do_schedule_next_timer(struct siginfo *info) | |||
| 289 | else | 289 | else |
| 290 | schedule_next_timer(timr); | 290 | schedule_next_timer(timr); |
| 291 | 291 | ||
| 292 | info->si_overrun = timr->it_overrun_last; | 292 | info->si_overrun += timr->it_overrun_last; |
| 293 | } | 293 | } |
| 294 | 294 | ||
| 295 | if (timr) | 295 | if (timr) |
| 296 | unlock_timer(timr, flags); | 296 | unlock_timer(timr, flags); |
| 297 | } | 297 | } |
| 298 | 298 | ||
| 299 | int posix_timer_event(struct k_itimer *timr,int si_private) | 299 | int posix_timer_event(struct k_itimer *timr, int si_private) |
| 300 | { | 300 | { |
| 301 | memset(&timr->sigq->info, 0, sizeof(siginfo_t)); | 301 | /* |
| 302 | * FIXME: if ->sigq is queued we can race with | ||
| 303 | * dequeue_signal()->do_schedule_next_timer(). | ||
| 304 | * | ||
| 305 | * If dequeue_signal() sees the "right" value of | ||
| 306 | * si_sys_private it calls do_schedule_next_timer(). | ||
| 307 | * We re-queue ->sigq and drop ->it_lock(). | ||
| 308 | * do_schedule_next_timer() locks the timer | ||
| 309 | * and re-schedules it while ->sigq is pending. | ||
| 310 | * Not really bad, but not that we want. | ||
| 311 | */ | ||
| 302 | timr->sigq->info.si_sys_private = si_private; | 312 | timr->sigq->info.si_sys_private = si_private; |
| 303 | /* Send signal to the process that owns this timer.*/ | ||
| 304 | 313 | ||
| 305 | timr->sigq->info.si_signo = timr->it_sigev_signo; | 314 | timr->sigq->info.si_signo = timr->it_sigev_signo; |
| 306 | timr->sigq->info.si_errno = 0; | ||
| 307 | timr->sigq->info.si_code = SI_TIMER; | 315 | timr->sigq->info.si_code = SI_TIMER; |
| 308 | timr->sigq->info.si_tid = timr->it_id; | 316 | timr->sigq->info.si_tid = timr->it_id; |
| 309 | timr->sigq->info.si_value = timr->it_sigev_value; | 317 | timr->sigq->info.si_value = timr->it_sigev_value; |
| @@ -435,6 +443,7 @@ static struct k_itimer * alloc_posix_timer(void) | |||
| 435 | kmem_cache_free(posix_timers_cache, tmr); | 443 | kmem_cache_free(posix_timers_cache, tmr); |
| 436 | tmr = NULL; | 444 | tmr = NULL; |
| 437 | } | 445 | } |
| 446 | memset(&tmr->sigq->info, 0, sizeof(siginfo_t)); | ||
| 438 | return tmr; | 447 | return tmr; |
| 439 | } | 448 | } |
| 440 | 449 | ||
diff --git a/kernel/power/disk.c b/kernel/power/disk.c index f011e0870b52..bbd85c60f741 100644 --- a/kernel/power/disk.c +++ b/kernel/power/disk.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/console.h> | 21 | #include <linux/console.h> |
| 22 | #include <linux/cpu.h> | 22 | #include <linux/cpu.h> |
| 23 | #include <linux/freezer.h> | 23 | #include <linux/freezer.h> |
| 24 | #include <linux/ftrace.h> | ||
| 24 | 25 | ||
| 25 | #include "power.h" | 26 | #include "power.h" |
| 26 | 27 | ||
| @@ -255,7 +256,7 @@ static int create_image(int platform_mode) | |||
| 255 | 256 | ||
| 256 | int hibernation_snapshot(int platform_mode) | 257 | int hibernation_snapshot(int platform_mode) |
| 257 | { | 258 | { |
| 258 | int error; | 259 | int error, ftrace_save; |
| 259 | 260 | ||
| 260 | /* Free memory before shutting down devices. */ | 261 | /* Free memory before shutting down devices. */ |
| 261 | error = swsusp_shrink_memory(); | 262 | error = swsusp_shrink_memory(); |
| @@ -267,6 +268,7 @@ int hibernation_snapshot(int platform_mode) | |||
| 267 | goto Close; | 268 | goto Close; |
| 268 | 269 | ||
| 269 | suspend_console(); | 270 | suspend_console(); |
| 271 | ftrace_save = __ftrace_enabled_save(); | ||
| 270 | error = device_suspend(PMSG_FREEZE); | 272 | error = device_suspend(PMSG_FREEZE); |
| 271 | if (error) | 273 | if (error) |
| 272 | goto Recover_platform; | 274 | goto Recover_platform; |
| @@ -296,6 +298,7 @@ int hibernation_snapshot(int platform_mode) | |||
| 296 | Resume_devices: | 298 | Resume_devices: |
| 297 | device_resume(in_suspend ? | 299 | device_resume(in_suspend ? |
| 298 | (error ? PMSG_RECOVER : PMSG_THAW) : PMSG_RESTORE); | 300 | (error ? PMSG_RECOVER : PMSG_THAW) : PMSG_RESTORE); |
| 301 | __ftrace_enabled_restore(ftrace_save); | ||
| 299 | resume_console(); | 302 | resume_console(); |
| 300 | Close: | 303 | Close: |
| 301 | platform_end(platform_mode); | 304 | platform_end(platform_mode); |
| @@ -366,10 +369,11 @@ static int resume_target_kernel(void) | |||
| 366 | 369 | ||
| 367 | int hibernation_restore(int platform_mode) | 370 | int hibernation_restore(int platform_mode) |
| 368 | { | 371 | { |
| 369 | int error; | 372 | int error, ftrace_save; |
| 370 | 373 | ||
| 371 | pm_prepare_console(); | 374 | pm_prepare_console(); |
| 372 | suspend_console(); | 375 | suspend_console(); |
| 376 | ftrace_save = __ftrace_enabled_save(); | ||
| 373 | error = device_suspend(PMSG_QUIESCE); | 377 | error = device_suspend(PMSG_QUIESCE); |
| 374 | if (error) | 378 | if (error) |
| 375 | goto Finish; | 379 | goto Finish; |
| @@ -384,6 +388,7 @@ int hibernation_restore(int platform_mode) | |||
| 384 | platform_restore_cleanup(platform_mode); | 388 | platform_restore_cleanup(platform_mode); |
| 385 | device_resume(PMSG_RECOVER); | 389 | device_resume(PMSG_RECOVER); |
| 386 | Finish: | 390 | Finish: |
| 391 | __ftrace_enabled_restore(ftrace_save); | ||
| 387 | resume_console(); | 392 | resume_console(); |
| 388 | pm_restore_console(); | 393 | pm_restore_console(); |
| 389 | return error; | 394 | return error; |
| @@ -396,7 +401,7 @@ int hibernation_restore(int platform_mode) | |||
| 396 | 401 | ||
| 397 | int hibernation_platform_enter(void) | 402 | int hibernation_platform_enter(void) |
| 398 | { | 403 | { |
| 399 | int error; | 404 | int error, ftrace_save; |
| 400 | 405 | ||
| 401 | if (!hibernation_ops) | 406 | if (!hibernation_ops) |
| 402 | return -ENOSYS; | 407 | return -ENOSYS; |
| @@ -411,6 +416,7 @@ int hibernation_platform_enter(void) | |||
| 411 | goto Close; | 416 | goto Close; |
| 412 | 417 | ||
| 413 | suspend_console(); | 418 | suspend_console(); |
| 419 | ftrace_save = __ftrace_enabled_save(); | ||
| 414 | error = device_suspend(PMSG_HIBERNATE); | 420 | error = device_suspend(PMSG_HIBERNATE); |
| 415 | if (error) { | 421 | if (error) { |
| 416 | if (hibernation_ops->recover) | 422 | if (hibernation_ops->recover) |
| @@ -445,6 +451,7 @@ int hibernation_platform_enter(void) | |||
| 445 | hibernation_ops->finish(); | 451 | hibernation_ops->finish(); |
| 446 | Resume_devices: | 452 | Resume_devices: |
| 447 | device_resume(PMSG_RESTORE); | 453 | device_resume(PMSG_RESTORE); |
| 454 | __ftrace_enabled_restore(ftrace_save); | ||
| 448 | resume_console(); | 455 | resume_console(); |
| 449 | Close: | 456 | Close: |
| 450 | hibernation_ops->end(); | 457 | hibernation_ops->end(); |
diff --git a/kernel/power/main.c b/kernel/power/main.c index 0b7476f5d2a6..540b16b68565 100644 --- a/kernel/power/main.c +++ b/kernel/power/main.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/freezer.h> | 21 | #include <linux/freezer.h> |
| 22 | #include <linux/vmstat.h> | 22 | #include <linux/vmstat.h> |
| 23 | #include <linux/syscalls.h> | 23 | #include <linux/syscalls.h> |
| 24 | #include <linux/ftrace.h> | ||
| 24 | 25 | ||
| 25 | #include "power.h" | 26 | #include "power.h" |
| 26 | 27 | ||
| @@ -310,7 +311,7 @@ static int suspend_enter(suspend_state_t state) | |||
| 310 | */ | 311 | */ |
| 311 | int suspend_devices_and_enter(suspend_state_t state) | 312 | int suspend_devices_and_enter(suspend_state_t state) |
| 312 | { | 313 | { |
| 313 | int error; | 314 | int error, ftrace_save; |
| 314 | 315 | ||
| 315 | if (!suspend_ops) | 316 | if (!suspend_ops) |
| 316 | return -ENOSYS; | 317 | return -ENOSYS; |
| @@ -321,6 +322,7 @@ int suspend_devices_and_enter(suspend_state_t state) | |||
| 321 | goto Close; | 322 | goto Close; |
| 322 | } | 323 | } |
| 323 | suspend_console(); | 324 | suspend_console(); |
| 325 | ftrace_save = __ftrace_enabled_save(); | ||
| 324 | suspend_test_start(); | 326 | suspend_test_start(); |
| 325 | error = device_suspend(PMSG_SUSPEND); | 327 | error = device_suspend(PMSG_SUSPEND); |
| 326 | if (error) { | 328 | if (error) { |
| @@ -352,6 +354,7 @@ int suspend_devices_and_enter(suspend_state_t state) | |||
| 352 | suspend_test_start(); | 354 | suspend_test_start(); |
| 353 | device_resume(PMSG_RESUME); | 355 | device_resume(PMSG_RESUME); |
| 354 | suspend_test_finish("resume devices"); | 356 | suspend_test_finish("resume devices"); |
| 357 | __ftrace_enabled_restore(ftrace_save); | ||
| 355 | resume_console(); | 358 | resume_console(); |
| 356 | Close: | 359 | Close: |
| 357 | if (suspend_ops->end) | 360 | if (suspend_ops->end) |
diff --git a/kernel/power/swap.c b/kernel/power/swap.c index a0abf9a463f9..80ccac849e46 100644 --- a/kernel/power/swap.c +++ b/kernel/power/swap.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 15 | #include <linux/file.h> | 15 | #include <linux/file.h> |
| 16 | #include <linux/utsname.h> | 16 | #include <linux/utsname.h> |
| 17 | #include <linux/version.h> | ||
| 18 | #include <linux/delay.h> | 17 | #include <linux/delay.h> |
| 19 | #include <linux/bitops.h> | 18 | #include <linux/bitops.h> |
| 20 | #include <linux/genhd.h> | 19 | #include <linux/genhd.h> |
diff --git a/kernel/ptrace.c b/kernel/ptrace.c index 082b3fcb32a0..356699a96d56 100644 --- a/kernel/ptrace.c +++ b/kernel/ptrace.c | |||
| @@ -140,7 +140,7 @@ int __ptrace_may_access(struct task_struct *task, unsigned int mode) | |||
| 140 | if (!dumpable && !capable(CAP_SYS_PTRACE)) | 140 | if (!dumpable && !capable(CAP_SYS_PTRACE)) |
| 141 | return -EPERM; | 141 | return -EPERM; |
| 142 | 142 | ||
| 143 | return security_ptrace(current, task, mode); | 143 | return security_ptrace_may_access(task, mode); |
| 144 | } | 144 | } |
| 145 | 145 | ||
| 146 | bool ptrace_may_access(struct task_struct *task, unsigned int mode) | 146 | bool ptrace_may_access(struct task_struct *task, unsigned int mode) |
| @@ -499,8 +499,7 @@ repeat: | |||
| 499 | goto repeat; | 499 | goto repeat; |
| 500 | } | 500 | } |
| 501 | 501 | ||
| 502 | ret = security_ptrace(current->parent, current, | 502 | ret = security_ptrace_traceme(current->parent); |
| 503 | PTRACE_MODE_ATTACH); | ||
| 504 | 503 | ||
| 505 | /* | 504 | /* |
| 506 | * Set the ptrace bit in the process ptrace flags. | 505 | * Set the ptrace bit in the process ptrace flags. |
diff --git a/kernel/rcupdate.c b/kernel/rcupdate.c index f14f372cf6f5..467d5940f624 100644 --- a/kernel/rcupdate.c +++ b/kernel/rcupdate.c | |||
| @@ -77,6 +77,7 @@ void wakeme_after_rcu(struct rcu_head *head) | |||
| 77 | * sections are delimited by rcu_read_lock() and rcu_read_unlock(), | 77 | * sections are delimited by rcu_read_lock() and rcu_read_unlock(), |
| 78 | * and may be nested. | 78 | * and may be nested. |
| 79 | */ | 79 | */ |
| 80 | void synchronize_rcu(void); /* Makes kernel-doc tools happy */ | ||
| 80 | synchronize_rcu_xxx(synchronize_rcu, call_rcu) | 81 | synchronize_rcu_xxx(synchronize_rcu, call_rcu) |
| 81 | EXPORT_SYMBOL_GPL(synchronize_rcu); | 82 | EXPORT_SYMBOL_GPL(synchronize_rcu); |
| 82 | 83 | ||
diff --git a/kernel/resource.c b/kernel/resource.c index f5b518eabefe..03d796c1b2e9 100644 --- a/kernel/resource.c +++ b/kernel/resource.c | |||
| @@ -362,35 +362,21 @@ int allocate_resource(struct resource *root, struct resource *new, | |||
| 362 | 362 | ||
| 363 | EXPORT_SYMBOL(allocate_resource); | 363 | EXPORT_SYMBOL(allocate_resource); |
| 364 | 364 | ||
| 365 | /** | 365 | /* |
| 366 | * insert_resource - Inserts a resource in the resource tree | 366 | * Insert a resource into the resource tree. If successful, return NULL, |
| 367 | * @parent: parent of the new resource | 367 | * otherwise return the conflicting resource (compare to __request_resource()) |
| 368 | * @new: new resource to insert | ||
| 369 | * | ||
| 370 | * Returns 0 on success, -EBUSY if the resource can't be inserted. | ||
| 371 | * | ||
| 372 | * This function is equivalent to request_resource when no conflict | ||
| 373 | * happens. If a conflict happens, and the conflicting resources | ||
| 374 | * entirely fit within the range of the new resource, then the new | ||
| 375 | * resource is inserted and the conflicting resources become children of | ||
| 376 | * the new resource. | ||
| 377 | */ | 368 | */ |
| 378 | int insert_resource(struct resource *parent, struct resource *new) | 369 | static struct resource * __insert_resource(struct resource *parent, struct resource *new) |
| 379 | { | 370 | { |
| 380 | int result; | ||
| 381 | struct resource *first, *next; | 371 | struct resource *first, *next; |
| 382 | 372 | ||
| 383 | write_lock(&resource_lock); | ||
| 384 | |||
| 385 | for (;; parent = first) { | 373 | for (;; parent = first) { |
| 386 | result = 0; | ||
| 387 | first = __request_resource(parent, new); | 374 | first = __request_resource(parent, new); |
| 388 | if (!first) | 375 | if (!first) |
| 389 | goto out; | 376 | return first; |
| 390 | 377 | ||
| 391 | result = -EBUSY; | ||
| 392 | if (first == parent) | 378 | if (first == parent) |
| 393 | goto out; | 379 | return first; |
| 394 | 380 | ||
| 395 | if ((first->start > new->start) || (first->end < new->end)) | 381 | if ((first->start > new->start) || (first->end < new->end)) |
| 396 | break; | 382 | break; |
| @@ -401,15 +387,13 @@ int insert_resource(struct resource *parent, struct resource *new) | |||
| 401 | for (next = first; ; next = next->sibling) { | 387 | for (next = first; ; next = next->sibling) { |
| 402 | /* Partial overlap? Bad, and unfixable */ | 388 | /* Partial overlap? Bad, and unfixable */ |
| 403 | if (next->start < new->start || next->end > new->end) | 389 | if (next->start < new->start || next->end > new->end) |
| 404 | goto out; | 390 | return next; |
| 405 | if (!next->sibling) | 391 | if (!next->sibling) |
| 406 | break; | 392 | break; |
| 407 | if (next->sibling->start > new->end) | 393 | if (next->sibling->start > new->end) |
| 408 | break; | 394 | break; |
| 409 | } | 395 | } |
| 410 | 396 | ||
| 411 | result = 0; | ||
| 412 | |||
| 413 | new->parent = parent; | 397 | new->parent = parent; |
| 414 | new->sibling = next->sibling; | 398 | new->sibling = next->sibling; |
| 415 | new->child = first; | 399 | new->child = first; |
| @@ -426,10 +410,64 @@ int insert_resource(struct resource *parent, struct resource *new) | |||
| 426 | next = next->sibling; | 410 | next = next->sibling; |
| 427 | next->sibling = new; | 411 | next->sibling = new; |
| 428 | } | 412 | } |
| 413 | return NULL; | ||
| 414 | } | ||
| 429 | 415 | ||
| 430 | out: | 416 | /** |
| 417 | * insert_resource - Inserts a resource in the resource tree | ||
| 418 | * @parent: parent of the new resource | ||
| 419 | * @new: new resource to insert | ||
| 420 | * | ||
| 421 | * Returns 0 on success, -EBUSY if the resource can't be inserted. | ||
| 422 | * | ||
| 423 | * This function is equivalent to request_resource when no conflict | ||
| 424 | * happens. If a conflict happens, and the conflicting resources | ||
| 425 | * entirely fit within the range of the new resource, then the new | ||
| 426 | * resource is inserted and the conflicting resources become children of | ||
| 427 | * the new resource. | ||
| 428 | */ | ||
| 429 | int insert_resource(struct resource *parent, struct resource *new) | ||
| 430 | { | ||
| 431 | struct resource *conflict; | ||
| 432 | |||
| 433 | write_lock(&resource_lock); | ||
| 434 | conflict = __insert_resource(parent, new); | ||
| 435 | write_unlock(&resource_lock); | ||
| 436 | return conflict ? -EBUSY : 0; | ||
| 437 | } | ||
| 438 | |||
| 439 | /** | ||
| 440 | * insert_resource_expand_to_fit - Insert a resource into the resource tree | ||
| 441 | * @root: root resource descriptor | ||
| 442 | * @new: new resource to insert | ||
| 443 | * | ||
| 444 | * Insert a resource into the resource tree, possibly expanding it in order | ||
| 445 | * to make it encompass any conflicting resources. | ||
| 446 | */ | ||
| 447 | void insert_resource_expand_to_fit(struct resource *root, struct resource *new) | ||
| 448 | { | ||
| 449 | if (new->parent) | ||
| 450 | return; | ||
| 451 | |||
| 452 | write_lock(&resource_lock); | ||
| 453 | for (;;) { | ||
| 454 | struct resource *conflict; | ||
| 455 | |||
| 456 | conflict = __insert_resource(root, new); | ||
| 457 | if (!conflict) | ||
| 458 | break; | ||
| 459 | if (conflict == root) | ||
| 460 | break; | ||
| 461 | |||
| 462 | /* Ok, expand resource to cover the conflict, then try again .. */ | ||
| 463 | if (conflict->start < new->start) | ||
| 464 | new->start = conflict->start; | ||
| 465 | if (conflict->end > new->end) | ||
| 466 | new->end = conflict->end; | ||
| 467 | |||
| 468 | printk("Expanded resource %s due to conflict with %s\n", new->name, conflict->name); | ||
| 469 | } | ||
| 431 | write_unlock(&resource_lock); | 470 | write_unlock(&resource_lock); |
| 432 | return result; | ||
| 433 | } | 471 | } |
| 434 | 472 | ||
| 435 | /** | 473 | /** |
diff --git a/kernel/sched.c b/kernel/sched.c index 04160d277e7a..9a1ddb84e26d 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
| @@ -600,7 +600,6 @@ struct rq { | |||
| 600 | /* BKL stats */ | 600 | /* BKL stats */ |
| 601 | unsigned int bkl_count; | 601 | unsigned int bkl_count; |
| 602 | #endif | 602 | #endif |
| 603 | struct lock_class_key rq_lock_key; | ||
| 604 | }; | 603 | }; |
| 605 | 604 | ||
| 606 | static DEFINE_PER_CPU_SHARED_ALIGNED(struct rq, runqueues); | 605 | static DEFINE_PER_CPU_SHARED_ALIGNED(struct rq, runqueues); |
| @@ -809,9 +808,9 @@ const_debug unsigned int sysctl_sched_nr_migrate = 32; | |||
| 809 | 808 | ||
| 810 | /* | 809 | /* |
| 811 | * ratelimit for updating the group shares. | 810 | * ratelimit for updating the group shares. |
| 812 | * default: 0.5ms | 811 | * default: 0.25ms |
| 813 | */ | 812 | */ |
| 814 | const_debug unsigned int sysctl_sched_shares_ratelimit = 500000; | 813 | unsigned int sysctl_sched_shares_ratelimit = 250000; |
| 815 | 814 | ||
| 816 | /* | 815 | /* |
| 817 | * period over which we measure -rt task cpu usage in us. | 816 | * period over which we measure -rt task cpu usage in us. |
| @@ -834,7 +833,7 @@ static inline u64 global_rt_period(void) | |||
| 834 | 833 | ||
| 835 | static inline u64 global_rt_runtime(void) | 834 | static inline u64 global_rt_runtime(void) |
| 836 | { | 835 | { |
| 837 | if (sysctl_sched_rt_period < 0) | 836 | if (sysctl_sched_rt_runtime < 0) |
| 838 | return RUNTIME_INF; | 837 | return RUNTIME_INF; |
| 839 | 838 | ||
| 840 | return (u64)sysctl_sched_rt_runtime * NSEC_PER_USEC; | 839 | return (u64)sysctl_sched_rt_runtime * NSEC_PER_USEC; |
| @@ -2759,10 +2758,10 @@ static void double_rq_lock(struct rq *rq1, struct rq *rq2) | |||
| 2759 | } else { | 2758 | } else { |
| 2760 | if (rq1 < rq2) { | 2759 | if (rq1 < rq2) { |
| 2761 | spin_lock(&rq1->lock); | 2760 | spin_lock(&rq1->lock); |
| 2762 | spin_lock(&rq2->lock); | 2761 | spin_lock_nested(&rq2->lock, SINGLE_DEPTH_NESTING); |
| 2763 | } else { | 2762 | } else { |
| 2764 | spin_lock(&rq2->lock); | 2763 | spin_lock(&rq2->lock); |
| 2765 | spin_lock(&rq1->lock); | 2764 | spin_lock_nested(&rq1->lock, SINGLE_DEPTH_NESTING); |
| 2766 | } | 2765 | } |
| 2767 | } | 2766 | } |
| 2768 | update_rq_clock(rq1); | 2767 | update_rq_clock(rq1); |
| @@ -2805,14 +2804,21 @@ static int double_lock_balance(struct rq *this_rq, struct rq *busiest) | |||
| 2805 | if (busiest < this_rq) { | 2804 | if (busiest < this_rq) { |
| 2806 | spin_unlock(&this_rq->lock); | 2805 | spin_unlock(&this_rq->lock); |
| 2807 | spin_lock(&busiest->lock); | 2806 | spin_lock(&busiest->lock); |
| 2808 | spin_lock(&this_rq->lock); | 2807 | spin_lock_nested(&this_rq->lock, SINGLE_DEPTH_NESTING); |
| 2809 | ret = 1; | 2808 | ret = 1; |
| 2810 | } else | 2809 | } else |
| 2811 | spin_lock(&busiest->lock); | 2810 | spin_lock_nested(&busiest->lock, SINGLE_DEPTH_NESTING); |
| 2812 | } | 2811 | } |
| 2813 | return ret; | 2812 | return ret; |
| 2814 | } | 2813 | } |
| 2815 | 2814 | ||
| 2815 | static void double_unlock_balance(struct rq *this_rq, struct rq *busiest) | ||
| 2816 | __releases(busiest->lock) | ||
| 2817 | { | ||
| 2818 | spin_unlock(&busiest->lock); | ||
| 2819 | lock_set_subclass(&this_rq->lock.dep_map, 0, _RET_IP_); | ||
| 2820 | } | ||
| 2821 | |||
| 2816 | /* | 2822 | /* |
| 2817 | * If dest_cpu is allowed for this process, migrate the task to it. | 2823 | * If dest_cpu is allowed for this process, migrate the task to it. |
| 2818 | * This is accomplished by forcing the cpu_allowed mask to only | 2824 | * This is accomplished by forcing the cpu_allowed mask to only |
| @@ -3637,7 +3643,7 @@ redo: | |||
| 3637 | ld_moved = move_tasks(this_rq, this_cpu, busiest, | 3643 | ld_moved = move_tasks(this_rq, this_cpu, busiest, |
| 3638 | imbalance, sd, CPU_NEWLY_IDLE, | 3644 | imbalance, sd, CPU_NEWLY_IDLE, |
| 3639 | &all_pinned); | 3645 | &all_pinned); |
| 3640 | spin_unlock(&busiest->lock); | 3646 | double_unlock_balance(this_rq, busiest); |
| 3641 | 3647 | ||
| 3642 | if (unlikely(all_pinned)) { | 3648 | if (unlikely(all_pinned)) { |
| 3643 | cpu_clear(cpu_of(busiest), *cpus); | 3649 | cpu_clear(cpu_of(busiest), *cpus); |
| @@ -3752,7 +3758,7 @@ static void active_load_balance(struct rq *busiest_rq, int busiest_cpu) | |||
| 3752 | else | 3758 | else |
| 3753 | schedstat_inc(sd, alb_failed); | 3759 | schedstat_inc(sd, alb_failed); |
| 3754 | } | 3760 | } |
| 3755 | spin_unlock(&target_rq->lock); | 3761 | double_unlock_balance(busiest_rq, target_rq); |
| 3756 | } | 3762 | } |
| 3757 | 3763 | ||
| 3758 | #ifdef CONFIG_NO_HZ | 3764 | #ifdef CONFIG_NO_HZ |
| @@ -4663,6 +4669,52 @@ int __sched wait_for_completion_killable(struct completion *x) | |||
| 4663 | } | 4669 | } |
| 4664 | EXPORT_SYMBOL(wait_for_completion_killable); | 4670 | EXPORT_SYMBOL(wait_for_completion_killable); |
| 4665 | 4671 | ||
| 4672 | /** | ||
| 4673 | * try_wait_for_completion - try to decrement a completion without blocking | ||
| 4674 | * @x: completion structure | ||
| 4675 | * | ||
| 4676 | * Returns: 0 if a decrement cannot be done without blocking | ||
| 4677 | * 1 if a decrement succeeded. | ||
| 4678 | * | ||
| 4679 | * If a completion is being used as a counting completion, | ||
| 4680 | * attempt to decrement the counter without blocking. This | ||
| 4681 | * enables us to avoid waiting if the resource the completion | ||
| 4682 | * is protecting is not available. | ||
| 4683 | */ | ||
| 4684 | bool try_wait_for_completion(struct completion *x) | ||
| 4685 | { | ||
| 4686 | int ret = 1; | ||
| 4687 | |||
| 4688 | spin_lock_irq(&x->wait.lock); | ||
| 4689 | if (!x->done) | ||
| 4690 | ret = 0; | ||
| 4691 | else | ||
| 4692 | x->done--; | ||
| 4693 | spin_unlock_irq(&x->wait.lock); | ||
| 4694 | return ret; | ||
| 4695 | } | ||
| 4696 | EXPORT_SYMBOL(try_wait_for_completion); | ||
| 4697 | |||
| 4698 | /** | ||
| 4699 | * completion_done - Test to see if a completion has any waiters | ||
| 4700 | * @x: completion structure | ||
| 4701 | * | ||
| 4702 | * Returns: 0 if there are waiters (wait_for_completion() in progress) | ||
| 4703 | * 1 if there are no waiters. | ||
| 4704 | * | ||
| 4705 | */ | ||
| 4706 | bool completion_done(struct completion *x) | ||
| 4707 | { | ||
| 4708 | int ret = 1; | ||
| 4709 | |||
| 4710 | spin_lock_irq(&x->wait.lock); | ||
| 4711 | if (!x->done) | ||
| 4712 | ret = 0; | ||
| 4713 | spin_unlock_irq(&x->wait.lock); | ||
| 4714 | return ret; | ||
| 4715 | } | ||
| 4716 | EXPORT_SYMBOL(completion_done); | ||
| 4717 | |||
| 4666 | static long __sched | 4718 | static long __sched |
| 4667 | sleep_on_common(wait_queue_head_t *q, int state, long timeout) | 4719 | sleep_on_common(wait_queue_head_t *q, int state, long timeout) |
| 4668 | { | 4720 | { |
| @@ -5734,6 +5786,8 @@ static inline void sched_init_granularity(void) | |||
| 5734 | sysctl_sched_latency = limit; | 5786 | sysctl_sched_latency = limit; |
| 5735 | 5787 | ||
| 5736 | sysctl_sched_wakeup_granularity *= factor; | 5788 | sysctl_sched_wakeup_granularity *= factor; |
| 5789 | |||
| 5790 | sysctl_sched_shares_ratelimit *= factor; | ||
| 5737 | } | 5791 | } |
| 5738 | 5792 | ||
| 5739 | #ifdef CONFIG_SMP | 5793 | #ifdef CONFIG_SMP |
| @@ -8000,7 +8054,6 @@ void __init sched_init(void) | |||
| 8000 | 8054 | ||
| 8001 | rq = cpu_rq(i); | 8055 | rq = cpu_rq(i); |
| 8002 | spin_lock_init(&rq->lock); | 8056 | spin_lock_init(&rq->lock); |
| 8003 | lockdep_set_class(&rq->lock, &rq->rq_lock_key); | ||
| 8004 | rq->nr_running = 0; | 8057 | rq->nr_running = 0; |
| 8005 | init_cfs_rq(&rq->cfs, rq); | 8058 | init_cfs_rq(&rq->cfs, rq); |
| 8006 | init_rt_rq(&rq->rt, rq); | 8059 | init_rt_rq(&rq->rt, rq); |
| @@ -8457,8 +8510,8 @@ struct task_group *sched_create_group(struct task_group *parent) | |||
| 8457 | WARN_ON(!parent); /* root should already exist */ | 8510 | WARN_ON(!parent); /* root should already exist */ |
| 8458 | 8511 | ||
| 8459 | tg->parent = parent; | 8512 | tg->parent = parent; |
| 8460 | list_add_rcu(&tg->siblings, &parent->children); | ||
| 8461 | INIT_LIST_HEAD(&tg->children); | 8513 | INIT_LIST_HEAD(&tg->children); |
| 8514 | list_add_rcu(&tg->siblings, &parent->children); | ||
| 8462 | spin_unlock_irqrestore(&task_group_lock, flags); | 8515 | spin_unlock_irqrestore(&task_group_lock, flags); |
| 8463 | 8516 | ||
| 8464 | return tg; | 8517 | return tg; |
diff --git a/kernel/sched_clock.c b/kernel/sched_clock.c index 22ed55d1167f..e8ab096ddfe3 100644 --- a/kernel/sched_clock.c +++ b/kernel/sched_clock.c | |||
| @@ -12,19 +12,17 @@ | |||
| 12 | * | 12 | * |
| 13 | * Create a semi stable clock from a mixture of other events, including: | 13 | * Create a semi stable clock from a mixture of other events, including: |
| 14 | * - gtod | 14 | * - gtod |
| 15 | * - jiffies | ||
| 16 | * - sched_clock() | 15 | * - sched_clock() |
| 17 | * - explicit idle events | 16 | * - explicit idle events |
| 18 | * | 17 | * |
| 19 | * We use gtod as base and the unstable clock deltas. The deltas are filtered, | 18 | * We use gtod as base and the unstable clock deltas. The deltas are filtered, |
| 20 | * making it monotonic and keeping it within an expected window. This window | 19 | * making it monotonic and keeping it within an expected window. |
| 21 | * is set up using jiffies. | ||
| 22 | * | 20 | * |
| 23 | * Furthermore, explicit sleep and wakeup hooks allow us to account for time | 21 | * Furthermore, explicit sleep and wakeup hooks allow us to account for time |
| 24 | * that is otherwise invisible (TSC gets stopped). | 22 | * that is otherwise invisible (TSC gets stopped). |
| 25 | * | 23 | * |
| 26 | * The clock: sched_clock_cpu() is monotonic per cpu, and should be somewhat | 24 | * The clock: sched_clock_cpu() is monotonic per cpu, and should be somewhat |
| 27 | * consistent between cpus (never more than 1 jiffies difference). | 25 | * consistent between cpus (never more than 2 jiffies difference). |
| 28 | */ | 26 | */ |
| 29 | #include <linux/sched.h> | 27 | #include <linux/sched.h> |
| 30 | #include <linux/percpu.h> | 28 | #include <linux/percpu.h> |
| @@ -32,13 +30,19 @@ | |||
| 32 | #include <linux/ktime.h> | 30 | #include <linux/ktime.h> |
| 33 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 34 | 32 | ||
| 33 | /* | ||
| 34 | * Scheduler clock - returns current time in nanosec units. | ||
| 35 | * This is default implementation. | ||
| 36 | * Architectures and sub-architectures can override this. | ||
| 37 | */ | ||
| 38 | unsigned long long __attribute__((weak)) sched_clock(void) | ||
| 39 | { | ||
| 40 | return (unsigned long long)jiffies * (NSEC_PER_SEC / HZ); | ||
| 41 | } | ||
| 35 | 42 | ||
| 36 | #ifdef CONFIG_HAVE_UNSTABLE_SCHED_CLOCK | 43 | static __read_mostly int sched_clock_running; |
| 37 | 44 | ||
| 38 | #define MULTI_SHIFT 15 | 45 | #ifdef CONFIG_HAVE_UNSTABLE_SCHED_CLOCK |
| 39 | /* Max is double, Min is 1/2 */ | ||
| 40 | #define MAX_MULTI (2LL << MULTI_SHIFT) | ||
| 41 | #define MIN_MULTI (1LL << (MULTI_SHIFT-1)) | ||
| 42 | 46 | ||
| 43 | struct sched_clock_data { | 47 | struct sched_clock_data { |
| 44 | /* | 48 | /* |
| @@ -48,15 +52,9 @@ struct sched_clock_data { | |||
| 48 | */ | 52 | */ |
| 49 | raw_spinlock_t lock; | 53 | raw_spinlock_t lock; |
| 50 | 54 | ||
| 51 | unsigned long tick_jiffies; | ||
| 52 | u64 prev_raw; | ||
| 53 | u64 tick_raw; | 55 | u64 tick_raw; |
| 54 | u64 tick_gtod; | 56 | u64 tick_gtod; |
| 55 | u64 clock; | 57 | u64 clock; |
| 56 | s64 multi; | ||
| 57 | #ifdef CONFIG_NO_HZ | ||
| 58 | int check_max; | ||
| 59 | #endif | ||
| 60 | }; | 58 | }; |
| 61 | 59 | ||
| 62 | static DEFINE_PER_CPU_SHARED_ALIGNED(struct sched_clock_data, sched_clock_data); | 60 | static DEFINE_PER_CPU_SHARED_ALIGNED(struct sched_clock_data, sched_clock_data); |
| @@ -71,121 +69,69 @@ static inline struct sched_clock_data *cpu_sdc(int cpu) | |||
| 71 | return &per_cpu(sched_clock_data, cpu); | 69 | return &per_cpu(sched_clock_data, cpu); |
| 72 | } | 70 | } |
| 73 | 71 | ||
| 74 | static __read_mostly int sched_clock_running; | ||
| 75 | |||
| 76 | void sched_clock_init(void) | 72 | void sched_clock_init(void) |
| 77 | { | 73 | { |
| 78 | u64 ktime_now = ktime_to_ns(ktime_get()); | 74 | u64 ktime_now = ktime_to_ns(ktime_get()); |
| 79 | unsigned long now_jiffies = jiffies; | ||
| 80 | int cpu; | 75 | int cpu; |
| 81 | 76 | ||
| 82 | for_each_possible_cpu(cpu) { | 77 | for_each_possible_cpu(cpu) { |
| 83 | struct sched_clock_data *scd = cpu_sdc(cpu); | 78 | struct sched_clock_data *scd = cpu_sdc(cpu); |
| 84 | 79 | ||
| 85 | scd->lock = (raw_spinlock_t)__RAW_SPIN_LOCK_UNLOCKED; | 80 | scd->lock = (raw_spinlock_t)__RAW_SPIN_LOCK_UNLOCKED; |
| 86 | scd->tick_jiffies = now_jiffies; | ||
| 87 | scd->prev_raw = 0; | ||
| 88 | scd->tick_raw = 0; | 81 | scd->tick_raw = 0; |
| 89 | scd->tick_gtod = ktime_now; | 82 | scd->tick_gtod = ktime_now; |
| 90 | scd->clock = ktime_now; | 83 | scd->clock = ktime_now; |
| 91 | scd->multi = 1 << MULTI_SHIFT; | ||
| 92 | #ifdef CONFIG_NO_HZ | ||
| 93 | scd->check_max = 1; | ||
| 94 | #endif | ||
| 95 | } | 84 | } |
| 96 | 85 | ||
| 97 | sched_clock_running = 1; | 86 | sched_clock_running = 1; |
| 98 | } | 87 | } |
| 99 | 88 | ||
| 100 | #ifdef CONFIG_NO_HZ | ||
| 101 | /* | 89 | /* |
| 102 | * The dynamic ticks makes the delta jiffies inaccurate. This | 90 | * min,max except they take wrapping into account |
| 103 | * prevents us from checking the maximum time update. | ||
| 104 | * Disable the maximum check during stopped ticks. | ||
| 105 | */ | 91 | */ |
| 106 | void sched_clock_tick_stop(int cpu) | ||
| 107 | { | ||
| 108 | struct sched_clock_data *scd = cpu_sdc(cpu); | ||
| 109 | |||
| 110 | scd->check_max = 0; | ||
| 111 | } | ||
| 112 | 92 | ||
| 113 | void sched_clock_tick_start(int cpu) | 93 | static inline u64 wrap_min(u64 x, u64 y) |
| 114 | { | 94 | { |
| 115 | struct sched_clock_data *scd = cpu_sdc(cpu); | 95 | return (s64)(x - y) < 0 ? x : y; |
| 116 | |||
| 117 | scd->check_max = 1; | ||
| 118 | } | 96 | } |
| 119 | 97 | ||
| 120 | static int check_max(struct sched_clock_data *scd) | 98 | static inline u64 wrap_max(u64 x, u64 y) |
| 121 | { | 99 | { |
| 122 | return scd->check_max; | 100 | return (s64)(x - y) > 0 ? x : y; |
| 123 | } | 101 | } |
| 124 | #else | ||
| 125 | static int check_max(struct sched_clock_data *scd) | ||
| 126 | { | ||
| 127 | return 1; | ||
| 128 | } | ||
| 129 | #endif /* CONFIG_NO_HZ */ | ||
| 130 | 102 | ||
| 131 | /* | 103 | /* |
| 132 | * update the percpu scd from the raw @now value | 104 | * update the percpu scd from the raw @now value |
| 133 | * | 105 | * |
| 134 | * - filter out backward motion | 106 | * - filter out backward motion |
| 135 | * - use jiffies to generate a min,max window to clip the raw values | 107 | * - use the GTOD tick value to create a window to filter crazy TSC values |
| 136 | */ | 108 | */ |
| 137 | static void __update_sched_clock(struct sched_clock_data *scd, u64 now, u64 *time) | 109 | static u64 __update_sched_clock(struct sched_clock_data *scd, u64 now) |
| 138 | { | 110 | { |
| 139 | unsigned long now_jiffies = jiffies; | 111 | s64 delta = now - scd->tick_raw; |
| 140 | long delta_jiffies = now_jiffies - scd->tick_jiffies; | 112 | u64 clock, min_clock, max_clock; |
| 141 | u64 clock = scd->clock; | ||
| 142 | u64 min_clock, max_clock; | ||
| 143 | s64 delta = now - scd->prev_raw; | ||
| 144 | 113 | ||
| 145 | WARN_ON_ONCE(!irqs_disabled()); | 114 | WARN_ON_ONCE(!irqs_disabled()); |
| 146 | 115 | ||
| 147 | /* | 116 | if (unlikely(delta < 0)) |
| 148 | * At schedule tick the clock can be just under the gtod. We don't | 117 | delta = 0; |
| 149 | * want to push it too prematurely. | ||
| 150 | */ | ||
| 151 | min_clock = scd->tick_gtod + (delta_jiffies * TICK_NSEC); | ||
| 152 | if (min_clock > TICK_NSEC) | ||
| 153 | min_clock -= TICK_NSEC / 2; | ||
| 154 | |||
| 155 | if (unlikely(delta < 0)) { | ||
| 156 | clock++; | ||
| 157 | goto out; | ||
| 158 | } | ||
| 159 | 118 | ||
| 160 | /* | 119 | /* |
| 161 | * The clock must stay within a jiffie of the gtod. | 120 | * scd->clock = clamp(scd->tick_gtod + delta, |
| 162 | * But since we may be at the start of a jiffy or the end of one | 121 | * max(scd->tick_gtod, scd->clock), |
| 163 | * we add another jiffy buffer. | 122 | * scd->tick_gtod + TICK_NSEC); |
| 164 | */ | 123 | */ |
| 165 | max_clock = scd->tick_gtod + (2 + delta_jiffies) * TICK_NSEC; | ||
| 166 | 124 | ||
| 167 | delta *= scd->multi; | 125 | clock = scd->tick_gtod + delta; |
| 168 | delta >>= MULTI_SHIFT; | 126 | min_clock = wrap_max(scd->tick_gtod, scd->clock); |
| 127 | max_clock = scd->tick_gtod + TICK_NSEC; | ||
| 169 | 128 | ||
| 170 | if (unlikely(clock + delta > max_clock) && check_max(scd)) { | 129 | clock = wrap_max(clock, min_clock); |
| 171 | if (clock < max_clock) | 130 | clock = wrap_min(clock, max_clock); |
| 172 | clock = max_clock; | ||
| 173 | else | ||
| 174 | clock++; | ||
| 175 | } else { | ||
| 176 | clock += delta; | ||
| 177 | } | ||
| 178 | 131 | ||
| 179 | out: | 132 | scd->clock = clock; |
| 180 | if (unlikely(clock < min_clock)) | ||
| 181 | clock = min_clock; | ||
| 182 | 133 | ||
| 183 | if (time) | 134 | return scd->clock; |
| 184 | *time = clock; | ||
| 185 | else { | ||
| 186 | scd->prev_raw = now; | ||
| 187 | scd->clock = clock; | ||
| 188 | } | ||
| 189 | } | 135 | } |
| 190 | 136 | ||
| 191 | static void lock_double_clock(struct sched_clock_data *data1, | 137 | static void lock_double_clock(struct sched_clock_data *data1, |
| @@ -203,7 +149,7 @@ static void lock_double_clock(struct sched_clock_data *data1, | |||
| 203 | u64 sched_clock_cpu(int cpu) | 149 | u64 sched_clock_cpu(int cpu) |
| 204 | { | 150 | { |
| 205 | struct sched_clock_data *scd = cpu_sdc(cpu); | 151 | struct sched_clock_data *scd = cpu_sdc(cpu); |
| 206 | u64 now, clock; | 152 | u64 now, clock, this_clock, remote_clock; |
| 207 | 153 | ||
| 208 | if (unlikely(!sched_clock_running)) | 154 | if (unlikely(!sched_clock_running)) |
| 209 | return 0ull; | 155 | return 0ull; |
| @@ -212,43 +158,44 @@ u64 sched_clock_cpu(int cpu) | |||
| 212 | now = sched_clock(); | 158 | now = sched_clock(); |
| 213 | 159 | ||
| 214 | if (cpu != raw_smp_processor_id()) { | 160 | if (cpu != raw_smp_processor_id()) { |
| 215 | /* | ||
| 216 | * in order to update a remote cpu's clock based on our | ||
| 217 | * unstable raw time rebase it against: | ||
| 218 | * tick_raw (offset between raw counters) | ||
| 219 | * tick_gotd (tick offset between cpus) | ||
| 220 | */ | ||
| 221 | struct sched_clock_data *my_scd = this_scd(); | 161 | struct sched_clock_data *my_scd = this_scd(); |
| 222 | 162 | ||
| 223 | lock_double_clock(scd, my_scd); | 163 | lock_double_clock(scd, my_scd); |
| 224 | 164 | ||
| 225 | now -= my_scd->tick_raw; | 165 | this_clock = __update_sched_clock(my_scd, now); |
| 226 | now += scd->tick_raw; | 166 | remote_clock = scd->clock; |
| 227 | 167 | ||
| 228 | now += my_scd->tick_gtod; | 168 | /* |
| 229 | now -= scd->tick_gtod; | 169 | * Use the opportunity that we have both locks |
| 170 | * taken to couple the two clocks: we take the | ||
| 171 | * larger time as the latest time for both | ||
| 172 | * runqueues. (this creates monotonic movement) | ||
| 173 | */ | ||
| 174 | if (likely((s64)(remote_clock - this_clock) < 0)) { | ||
| 175 | clock = this_clock; | ||
| 176 | scd->clock = clock; | ||
| 177 | } else { | ||
| 178 | /* | ||
| 179 | * Should be rare, but possible: | ||
| 180 | */ | ||
| 181 | clock = remote_clock; | ||
| 182 | my_scd->clock = remote_clock; | ||
| 183 | } | ||
| 230 | 184 | ||
| 231 | __raw_spin_unlock(&my_scd->lock); | 185 | __raw_spin_unlock(&my_scd->lock); |
| 232 | |||
| 233 | __update_sched_clock(scd, now, &clock); | ||
| 234 | |||
| 235 | __raw_spin_unlock(&scd->lock); | ||
| 236 | |||
| 237 | } else { | 186 | } else { |
| 238 | __raw_spin_lock(&scd->lock); | 187 | __raw_spin_lock(&scd->lock); |
| 239 | __update_sched_clock(scd, now, NULL); | 188 | clock = __update_sched_clock(scd, now); |
| 240 | clock = scd->clock; | ||
| 241 | __raw_spin_unlock(&scd->lock); | ||
| 242 | } | 189 | } |
| 243 | 190 | ||
| 191 | __raw_spin_unlock(&scd->lock); | ||
| 192 | |||
| 244 | return clock; | 193 | return clock; |
| 245 | } | 194 | } |
| 246 | 195 | ||
| 247 | void sched_clock_tick(void) | 196 | void sched_clock_tick(void) |
| 248 | { | 197 | { |
| 249 | struct sched_clock_data *scd = this_scd(); | 198 | struct sched_clock_data *scd = this_scd(); |
| 250 | unsigned long now_jiffies = jiffies; | ||
| 251 | s64 mult, delta_gtod, delta_raw; | ||
| 252 | u64 now, now_gtod; | 199 | u64 now, now_gtod; |
| 253 | 200 | ||
| 254 | if (unlikely(!sched_clock_running)) | 201 | if (unlikely(!sched_clock_running)) |
| @@ -260,29 +207,9 @@ void sched_clock_tick(void) | |||
| 260 | now = sched_clock(); | 207 | now = sched_clock(); |
| 261 | 208 | ||
| 262 | __raw_spin_lock(&scd->lock); | 209 | __raw_spin_lock(&scd->lock); |
| 263 | __update_sched_clock(scd, now, NULL); | ||
| 264 | /* | ||
| 265 | * update tick_gtod after __update_sched_clock() because that will | ||
| 266 | * already observe 1 new jiffy; adding a new tick_gtod to that would | ||
| 267 | * increase the clock 2 jiffies. | ||
| 268 | */ | ||
| 269 | delta_gtod = now_gtod - scd->tick_gtod; | ||
| 270 | delta_raw = now - scd->tick_raw; | ||
| 271 | |||
| 272 | if ((long)delta_raw > 0) { | ||
| 273 | mult = delta_gtod << MULTI_SHIFT; | ||
| 274 | do_div(mult, delta_raw); | ||
| 275 | scd->multi = mult; | ||
| 276 | if (scd->multi > MAX_MULTI) | ||
| 277 | scd->multi = MAX_MULTI; | ||
| 278 | else if (scd->multi < MIN_MULTI) | ||
| 279 | scd->multi = MIN_MULTI; | ||
| 280 | } else | ||
| 281 | scd->multi = 1 << MULTI_SHIFT; | ||
| 282 | |||
| 283 | scd->tick_raw = now; | 210 | scd->tick_raw = now; |
| 284 | scd->tick_gtod = now_gtod; | 211 | scd->tick_gtod = now_gtod; |
| 285 | scd->tick_jiffies = now_jiffies; | 212 | __update_sched_clock(scd, now); |
| 286 | __raw_spin_unlock(&scd->lock); | 213 | __raw_spin_unlock(&scd->lock); |
| 287 | } | 214 | } |
| 288 | 215 | ||
| @@ -300,37 +227,28 @@ EXPORT_SYMBOL_GPL(sched_clock_idle_sleep_event); | |||
| 300 | */ | 227 | */ |
| 301 | void sched_clock_idle_wakeup_event(u64 delta_ns) | 228 | void sched_clock_idle_wakeup_event(u64 delta_ns) |
| 302 | { | 229 | { |
| 303 | struct sched_clock_data *scd = this_scd(); | 230 | sched_clock_tick(); |
| 304 | u64 now = sched_clock(); | ||
| 305 | |||
| 306 | /* | ||
| 307 | * Override the previous timestamp and ignore all | ||
| 308 | * sched_clock() deltas that occured while we idled, | ||
| 309 | * and use the PM-provided delta_ns to advance the | ||
| 310 | * rq clock: | ||
| 311 | */ | ||
| 312 | __raw_spin_lock(&scd->lock); | ||
| 313 | scd->prev_raw = now; | ||
| 314 | scd->clock += delta_ns; | ||
| 315 | scd->multi = 1 << MULTI_SHIFT; | ||
| 316 | __raw_spin_unlock(&scd->lock); | ||
| 317 | |||
| 318 | touch_softlockup_watchdog(); | 231 | touch_softlockup_watchdog(); |
| 319 | } | 232 | } |
| 320 | EXPORT_SYMBOL_GPL(sched_clock_idle_wakeup_event); | 233 | EXPORT_SYMBOL_GPL(sched_clock_idle_wakeup_event); |
| 321 | 234 | ||
| 322 | #endif | 235 | #else /* CONFIG_HAVE_UNSTABLE_SCHED_CLOCK */ |
| 323 | 236 | ||
| 324 | /* | 237 | void sched_clock_init(void) |
| 325 | * Scheduler clock - returns current time in nanosec units. | ||
| 326 | * This is default implementation. | ||
| 327 | * Architectures and sub-architectures can override this. | ||
| 328 | */ | ||
| 329 | unsigned long long __attribute__((weak)) sched_clock(void) | ||
| 330 | { | 238 | { |
| 331 | return (unsigned long long)jiffies * (NSEC_PER_SEC / HZ); | 239 | sched_clock_running = 1; |
| 332 | } | 240 | } |
| 333 | 241 | ||
| 242 | u64 sched_clock_cpu(int cpu) | ||
| 243 | { | ||
| 244 | if (unlikely(!sched_clock_running)) | ||
| 245 | return 0; | ||
| 246 | |||
| 247 | return sched_clock(); | ||
| 248 | } | ||
| 249 | |||
| 250 | #endif | ||
| 251 | |||
| 334 | unsigned long long cpu_clock(int cpu) | 252 | unsigned long long cpu_clock(int cpu) |
| 335 | { | 253 | { |
| 336 | unsigned long long clock; | 254 | unsigned long long clock; |
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c index cf2cd6ce4cb2..fb8994c6d4bb 100644 --- a/kernel/sched_fair.c +++ b/kernel/sched_fair.c | |||
| @@ -899,7 +899,7 @@ static void hrtick_start_fair(struct rq *rq, struct task_struct *p) | |||
| 899 | * doesn't make sense. Rely on vruntime for fairness. | 899 | * doesn't make sense. Rely on vruntime for fairness. |
| 900 | */ | 900 | */ |
| 901 | if (rq->curr != p) | 901 | if (rq->curr != p) |
| 902 | delta = max(10000LL, delta); | 902 | delta = max_t(s64, 10000LL, delta); |
| 903 | 903 | ||
| 904 | hrtick_start(rq, delta); | 904 | hrtick_start(rq, delta); |
| 905 | } | 905 | } |
| @@ -1442,18 +1442,23 @@ __load_balance_iterator(struct cfs_rq *cfs_rq, struct list_head *next) | |||
| 1442 | struct task_struct *p = NULL; | 1442 | struct task_struct *p = NULL; |
| 1443 | struct sched_entity *se; | 1443 | struct sched_entity *se; |
| 1444 | 1444 | ||
| 1445 | while (next != &cfs_rq->tasks) { | 1445 | if (next == &cfs_rq->tasks) |
| 1446 | return NULL; | ||
| 1447 | |||
| 1448 | /* Skip over entities that are not tasks */ | ||
| 1449 | do { | ||
| 1446 | se = list_entry(next, struct sched_entity, group_node); | 1450 | se = list_entry(next, struct sched_entity, group_node); |
| 1447 | next = next->next; | 1451 | next = next->next; |
| 1452 | } while (next != &cfs_rq->tasks && !entity_is_task(se)); | ||
| 1448 | 1453 | ||
| 1449 | /* Skip over entities that are not tasks */ | 1454 | if (next == &cfs_rq->tasks) |
| 1450 | if (entity_is_task(se)) { | 1455 | return NULL; |
| 1451 | p = task_of(se); | ||
| 1452 | break; | ||
| 1453 | } | ||
| 1454 | } | ||
| 1455 | 1456 | ||
| 1456 | cfs_rq->balance_iterator = next; | 1457 | cfs_rq->balance_iterator = next; |
| 1458 | |||
| 1459 | if (entity_is_task(se)) | ||
| 1460 | p = task_of(se); | ||
| 1461 | |||
| 1457 | return p; | 1462 | return p; |
| 1458 | } | 1463 | } |
| 1459 | 1464 | ||
diff --git a/kernel/sched_features.h b/kernel/sched_features.h index 862b06bd560a..9353ca78154e 100644 --- a/kernel/sched_features.h +++ b/kernel/sched_features.h | |||
| @@ -8,6 +8,6 @@ SCHED_FEAT(SYNC_WAKEUPS, 1) | |||
| 8 | SCHED_FEAT(HRTICK, 1) | 8 | SCHED_FEAT(HRTICK, 1) |
| 9 | SCHED_FEAT(DOUBLE_TICK, 0) | 9 | SCHED_FEAT(DOUBLE_TICK, 0) |
| 10 | SCHED_FEAT(ASYM_GRAN, 1) | 10 | SCHED_FEAT(ASYM_GRAN, 1) |
| 11 | SCHED_FEAT(LB_BIAS, 0) | 11 | SCHED_FEAT(LB_BIAS, 1) |
| 12 | SCHED_FEAT(LB_WAKEUP_UPDATE, 1) | 12 | SCHED_FEAT(LB_WAKEUP_UPDATE, 1) |
| 13 | SCHED_FEAT(ASYM_EFF_LOAD, 1) | 13 | SCHED_FEAT(ASYM_EFF_LOAD, 1) |
diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c index 908c04f9dad0..552310798dad 100644 --- a/kernel/sched_rt.c +++ b/kernel/sched_rt.c | |||
| @@ -199,6 +199,8 @@ static inline struct rt_rq *group_rt_rq(struct sched_rt_entity *rt_se) | |||
| 199 | 199 | ||
| 200 | static inline void sched_rt_rq_enqueue(struct rt_rq *rt_rq) | 200 | static inline void sched_rt_rq_enqueue(struct rt_rq *rt_rq) |
| 201 | { | 201 | { |
| 202 | if (rt_rq->rt_nr_running) | ||
| 203 | resched_task(rq_of_rt_rq(rt_rq)->curr); | ||
| 202 | } | 204 | } |
| 203 | 205 | ||
| 204 | static inline void sched_rt_rq_dequeue(struct rt_rq *rt_rq) | 206 | static inline void sched_rt_rq_dequeue(struct rt_rq *rt_rq) |
| @@ -298,7 +300,7 @@ static void __disable_runtime(struct rq *rq) | |||
| 298 | struct rt_rq *iter = sched_rt_period_rt_rq(rt_b, i); | 300 | struct rt_rq *iter = sched_rt_period_rt_rq(rt_b, i); |
| 299 | s64 diff; | 301 | s64 diff; |
| 300 | 302 | ||
| 301 | if (iter == rt_rq) | 303 | if (iter == rt_rq || iter->rt_runtime == RUNTIME_INF) |
| 302 | continue; | 304 | continue; |
| 303 | 305 | ||
| 304 | spin_lock(&iter->rt_runtime_lock); | 306 | spin_lock(&iter->rt_runtime_lock); |
| @@ -438,9 +440,6 @@ static int sched_rt_runtime_exceeded(struct rt_rq *rt_rq) | |||
| 438 | { | 440 | { |
| 439 | u64 runtime = sched_rt_runtime(rt_rq); | 441 | u64 runtime = sched_rt_runtime(rt_rq); |
| 440 | 442 | ||
| 441 | if (runtime == RUNTIME_INF) | ||
| 442 | return 0; | ||
| 443 | |||
| 444 | if (rt_rq->rt_throttled) | 443 | if (rt_rq->rt_throttled) |
| 445 | return rt_rq_throttled(rt_rq); | 444 | return rt_rq_throttled(rt_rq); |
| 446 | 445 | ||
| @@ -491,9 +490,11 @@ static void update_curr_rt(struct rq *rq) | |||
| 491 | rt_rq = rt_rq_of_se(rt_se); | 490 | rt_rq = rt_rq_of_se(rt_se); |
| 492 | 491 | ||
| 493 | spin_lock(&rt_rq->rt_runtime_lock); | 492 | spin_lock(&rt_rq->rt_runtime_lock); |
| 494 | rt_rq->rt_time += delta_exec; | 493 | if (sched_rt_runtime(rt_rq) != RUNTIME_INF) { |
| 495 | if (sched_rt_runtime_exceeded(rt_rq)) | 494 | rt_rq->rt_time += delta_exec; |
| 496 | resched_task(curr); | 495 | if (sched_rt_runtime_exceeded(rt_rq)) |
| 496 | resched_task(curr); | ||
| 497 | } | ||
| 497 | spin_unlock(&rt_rq->rt_runtime_lock); | 498 | spin_unlock(&rt_rq->rt_runtime_lock); |
| 498 | } | 499 | } |
| 499 | } | 500 | } |
| @@ -861,6 +862,8 @@ static void put_prev_task_rt(struct rq *rq, struct task_struct *p) | |||
| 861 | #define RT_MAX_TRIES 3 | 862 | #define RT_MAX_TRIES 3 |
| 862 | 863 | ||
| 863 | static int double_lock_balance(struct rq *this_rq, struct rq *busiest); | 864 | static int double_lock_balance(struct rq *this_rq, struct rq *busiest); |
| 865 | static void double_unlock_balance(struct rq *this_rq, struct rq *busiest); | ||
| 866 | |||
| 864 | static void deactivate_task(struct rq *rq, struct task_struct *p, int sleep); | 867 | static void deactivate_task(struct rq *rq, struct task_struct *p, int sleep); |
| 865 | 868 | ||
| 866 | static int pick_rt_task(struct rq *rq, struct task_struct *p, int cpu) | 869 | static int pick_rt_task(struct rq *rq, struct task_struct *p, int cpu) |
| @@ -1022,7 +1025,7 @@ static struct rq *find_lock_lowest_rq(struct task_struct *task, struct rq *rq) | |||
| 1022 | break; | 1025 | break; |
| 1023 | 1026 | ||
| 1024 | /* try again */ | 1027 | /* try again */ |
| 1025 | spin_unlock(&lowest_rq->lock); | 1028 | double_unlock_balance(rq, lowest_rq); |
| 1026 | lowest_rq = NULL; | 1029 | lowest_rq = NULL; |
| 1027 | } | 1030 | } |
| 1028 | 1031 | ||
| @@ -1091,7 +1094,7 @@ static int push_rt_task(struct rq *rq) | |||
| 1091 | 1094 | ||
| 1092 | resched_task(lowest_rq->curr); | 1095 | resched_task(lowest_rq->curr); |
| 1093 | 1096 | ||
| 1094 | spin_unlock(&lowest_rq->lock); | 1097 | double_unlock_balance(rq, lowest_rq); |
| 1095 | 1098 | ||
| 1096 | ret = 1; | 1099 | ret = 1; |
| 1097 | out: | 1100 | out: |
| @@ -1197,7 +1200,7 @@ static int pull_rt_task(struct rq *this_rq) | |||
| 1197 | 1200 | ||
| 1198 | } | 1201 | } |
| 1199 | skip: | 1202 | skip: |
| 1200 | spin_unlock(&src_rq->lock); | 1203 | double_unlock_balance(this_rq, src_rq); |
| 1201 | } | 1204 | } |
| 1202 | 1205 | ||
| 1203 | return ret; | 1206 | return ret; |
diff --git a/kernel/signal.c b/kernel/signal.c index 954f77d7e3bc..e661b01d340f 100644 --- a/kernel/signal.c +++ b/kernel/signal.c | |||
| @@ -1304,6 +1304,7 @@ int send_sigqueue(struct sigqueue *q, struct task_struct *t, int group) | |||
| 1304 | q->info.si_overrun++; | 1304 | q->info.si_overrun++; |
| 1305 | goto out; | 1305 | goto out; |
| 1306 | } | 1306 | } |
| 1307 | q->info.si_overrun = 0; | ||
| 1307 | 1308 | ||
| 1308 | signalfd_notify(t, sig); | 1309 | signalfd_notify(t, sig); |
| 1309 | pending = group ? &t->signal->shared_pending : &t->pending; | 1310 | pending = group ? &t->signal->shared_pending : &t->pending; |
| @@ -1337,6 +1338,7 @@ int do_notify_parent(struct task_struct *tsk, int sig) | |||
| 1337 | struct siginfo info; | 1338 | struct siginfo info; |
| 1338 | unsigned long flags; | 1339 | unsigned long flags; |
| 1339 | struct sighand_struct *psig; | 1340 | struct sighand_struct *psig; |
| 1341 | int ret = sig; | ||
| 1340 | 1342 | ||
| 1341 | BUG_ON(sig == -1); | 1343 | BUG_ON(sig == -1); |
| 1342 | 1344 | ||
| @@ -1401,7 +1403,7 @@ int do_notify_parent(struct task_struct *tsk, int sig) | |||
| 1401 | * is implementation-defined: we do (if you don't want | 1403 | * is implementation-defined: we do (if you don't want |
| 1402 | * it, just use SIG_IGN instead). | 1404 | * it, just use SIG_IGN instead). |
| 1403 | */ | 1405 | */ |
| 1404 | tsk->exit_signal = -1; | 1406 | ret = tsk->exit_signal = -1; |
| 1405 | if (psig->action[SIGCHLD-1].sa.sa_handler == SIG_IGN) | 1407 | if (psig->action[SIGCHLD-1].sa.sa_handler == SIG_IGN) |
| 1406 | sig = -1; | 1408 | sig = -1; |
| 1407 | } | 1409 | } |
| @@ -1410,7 +1412,7 @@ int do_notify_parent(struct task_struct *tsk, int sig) | |||
| 1410 | __wake_up_parent(tsk, tsk->parent); | 1412 | __wake_up_parent(tsk, tsk->parent); |
| 1411 | spin_unlock_irqrestore(&psig->siglock, flags); | 1413 | spin_unlock_irqrestore(&psig->siglock, flags); |
| 1412 | 1414 | ||
| 1413 | return sig; | 1415 | return ret; |
| 1414 | } | 1416 | } |
| 1415 | 1417 | ||
| 1416 | static void do_notify_parent_cldstop(struct task_struct *tsk, int why) | 1418 | static void do_notify_parent_cldstop(struct task_struct *tsk, int why) |
diff --git a/kernel/smp.c b/kernel/smp.c index 96fc7c0edc59..f362a8553777 100644 --- a/kernel/smp.c +++ b/kernel/smp.c | |||
| @@ -135,7 +135,8 @@ void generic_smp_call_function_interrupt(void) | |||
| 135 | */ | 135 | */ |
| 136 | smp_wmb(); | 136 | smp_wmb(); |
| 137 | data->csd.flags &= ~CSD_FLAG_WAIT; | 137 | data->csd.flags &= ~CSD_FLAG_WAIT; |
| 138 | } else | 138 | } |
| 139 | if (data->csd.flags & CSD_FLAG_ALLOC) | ||
| 139 | call_rcu(&data->rcu_head, rcu_free_call_data); | 140 | call_rcu(&data->rcu_head, rcu_free_call_data); |
| 140 | } | 141 | } |
| 141 | rcu_read_unlock(); | 142 | rcu_read_unlock(); |
| @@ -209,8 +210,10 @@ int smp_call_function_single(int cpu, void (*func) (void *info), void *info, | |||
| 209 | { | 210 | { |
| 210 | struct call_single_data d; | 211 | struct call_single_data d; |
| 211 | unsigned long flags; | 212 | unsigned long flags; |
| 212 | /* prevent preemption and reschedule on another processor */ | 213 | /* prevent preemption and reschedule on another processor, |
| 214 | as well as CPU removal */ | ||
| 213 | int me = get_cpu(); | 215 | int me = get_cpu(); |
| 216 | int err = 0; | ||
| 214 | 217 | ||
| 215 | /* Can deadlock when called with interrupts disabled */ | 218 | /* Can deadlock when called with interrupts disabled */ |
| 216 | WARN_ON(irqs_disabled()); | 219 | WARN_ON(irqs_disabled()); |
| @@ -219,7 +222,7 @@ int smp_call_function_single(int cpu, void (*func) (void *info), void *info, | |||
| 219 | local_irq_save(flags); | 222 | local_irq_save(flags); |
| 220 | func(info); | 223 | func(info); |
| 221 | local_irq_restore(flags); | 224 | local_irq_restore(flags); |
| 222 | } else { | 225 | } else if ((unsigned)cpu < NR_CPUS && cpu_online(cpu)) { |
| 223 | struct call_single_data *data = NULL; | 226 | struct call_single_data *data = NULL; |
| 224 | 227 | ||
| 225 | if (!wait) { | 228 | if (!wait) { |
| @@ -235,10 +238,12 @@ int smp_call_function_single(int cpu, void (*func) (void *info), void *info, | |||
| 235 | data->func = func; | 238 | data->func = func; |
| 236 | data->info = info; | 239 | data->info = info; |
| 237 | generic_exec_single(cpu, data); | 240 | generic_exec_single(cpu, data); |
| 241 | } else { | ||
| 242 | err = -ENXIO; /* CPU not online */ | ||
| 238 | } | 243 | } |
| 239 | 244 | ||
| 240 | put_cpu(); | 245 | put_cpu(); |
| 241 | return 0; | 246 | return err; |
| 242 | } | 247 | } |
| 243 | EXPORT_SYMBOL(smp_call_function_single); | 248 | EXPORT_SYMBOL(smp_call_function_single); |
| 244 | 249 | ||
| @@ -260,6 +265,42 @@ void __smp_call_function_single(int cpu, struct call_single_data *data) | |||
| 260 | generic_exec_single(cpu, data); | 265 | generic_exec_single(cpu, data); |
| 261 | } | 266 | } |
| 262 | 267 | ||
| 268 | /* Dummy function */ | ||
| 269 | static void quiesce_dummy(void *unused) | ||
| 270 | { | ||
| 271 | } | ||
| 272 | |||
| 273 | /* | ||
| 274 | * Ensure stack based data used in call function mask is safe to free. | ||
| 275 | * | ||
| 276 | * This is needed by smp_call_function_mask when using on-stack data, because | ||
| 277 | * a single call function queue is shared by all CPUs, and any CPU may pick up | ||
| 278 | * the data item on the queue at any time before it is deleted. So we need to | ||
| 279 | * ensure that all CPUs have transitioned through a quiescent state after | ||
| 280 | * this call. | ||
| 281 | * | ||
| 282 | * This is a very slow function, implemented by sending synchronous IPIs to | ||
| 283 | * all possible CPUs. For this reason, we have to alloc data rather than use | ||
| 284 | * stack based data even in the case of synchronous calls. The stack based | ||
| 285 | * data is then just used for deadlock/oom fallback which will be very rare. | ||
| 286 | * | ||
| 287 | * If a faster scheme can be made, we could go back to preferring stack based | ||
| 288 | * data -- the data allocation/free is non-zero cost. | ||
| 289 | */ | ||
| 290 | static void smp_call_function_mask_quiesce_stack(cpumask_t mask) | ||
| 291 | { | ||
| 292 | struct call_single_data data; | ||
| 293 | int cpu; | ||
| 294 | |||
| 295 | data.func = quiesce_dummy; | ||
| 296 | data.info = NULL; | ||
| 297 | |||
| 298 | for_each_cpu_mask(cpu, mask) { | ||
| 299 | data.flags = CSD_FLAG_WAIT; | ||
| 300 | generic_exec_single(cpu, &data); | ||
| 301 | } | ||
| 302 | } | ||
| 303 | |||
| 263 | /** | 304 | /** |
| 264 | * smp_call_function_mask(): Run a function on a set of other CPUs. | 305 | * smp_call_function_mask(): Run a function on a set of other CPUs. |
| 265 | * @mask: The set of cpus to run on. | 306 | * @mask: The set of cpus to run on. |
| @@ -285,6 +326,7 @@ int smp_call_function_mask(cpumask_t mask, void (*func)(void *), void *info, | |||
| 285 | cpumask_t allbutself; | 326 | cpumask_t allbutself; |
| 286 | unsigned long flags; | 327 | unsigned long flags; |
| 287 | int cpu, num_cpus; | 328 | int cpu, num_cpus; |
| 329 | int slowpath = 0; | ||
| 288 | 330 | ||
| 289 | /* Can deadlock when called with interrupts disabled */ | 331 | /* Can deadlock when called with interrupts disabled */ |
| 290 | WARN_ON(irqs_disabled()); | 332 | WARN_ON(irqs_disabled()); |
| @@ -306,15 +348,16 @@ int smp_call_function_mask(cpumask_t mask, void (*func)(void *), void *info, | |||
| 306 | return smp_call_function_single(cpu, func, info, wait); | 348 | return smp_call_function_single(cpu, func, info, wait); |
| 307 | } | 349 | } |
| 308 | 350 | ||
| 309 | if (!wait) { | 351 | data = kmalloc(sizeof(*data), GFP_ATOMIC); |
| 310 | data = kmalloc(sizeof(*data), GFP_ATOMIC); | 352 | if (data) { |
| 311 | if (data) | 353 | data->csd.flags = CSD_FLAG_ALLOC; |
| 312 | data->csd.flags = CSD_FLAG_ALLOC; | 354 | if (wait) |
| 313 | } | 355 | data->csd.flags |= CSD_FLAG_WAIT; |
| 314 | if (!data) { | 356 | } else { |
| 315 | data = &d; | 357 | data = &d; |
| 316 | data->csd.flags = CSD_FLAG_WAIT; | 358 | data->csd.flags = CSD_FLAG_WAIT; |
| 317 | wait = 1; | 359 | wait = 1; |
| 360 | slowpath = 1; | ||
| 318 | } | 361 | } |
| 319 | 362 | ||
| 320 | spin_lock_init(&data->lock); | 363 | spin_lock_init(&data->lock); |
| @@ -331,8 +374,11 @@ int smp_call_function_mask(cpumask_t mask, void (*func)(void *), void *info, | |||
| 331 | arch_send_call_function_ipi(mask); | 374 | arch_send_call_function_ipi(mask); |
| 332 | 375 | ||
| 333 | /* optionally wait for the CPUs to complete */ | 376 | /* optionally wait for the CPUs to complete */ |
| 334 | if (wait) | 377 | if (wait) { |
| 335 | csd_flag_wait(&data->csd); | 378 | csd_flag_wait(&data->csd); |
| 379 | if (unlikely(slowpath)) | ||
| 380 | smp_call_function_mask_quiesce_stack(mask); | ||
| 381 | } | ||
| 336 | 382 | ||
| 337 | return 0; | 383 | return 0; |
| 338 | } | 384 | } |
diff --git a/kernel/softlockup.c b/kernel/softlockup.c index b75b492fbfcf..cb838ee93a82 100644 --- a/kernel/softlockup.c +++ b/kernel/softlockup.c | |||
| @@ -233,7 +233,8 @@ static void check_hung_uninterruptible_tasks(int this_cpu) | |||
| 233 | do_each_thread(g, t) { | 233 | do_each_thread(g, t) { |
| 234 | if (!--max_count) | 234 | if (!--max_count) |
| 235 | goto unlock; | 235 | goto unlock; |
| 236 | if (t->state & TASK_UNINTERRUPTIBLE) | 236 | /* use "==" to skip the TASK_KILLABLE tasks waiting on NFS */ |
| 237 | if (t->state == TASK_UNINTERRUPTIBLE) | ||
| 237 | check_hung_task(t, now); | 238 | check_hung_task(t, now); |
| 238 | } while_each_thread(g, t); | 239 | } while_each_thread(g, t); |
| 239 | unlock: | 240 | unlock: |
diff --git a/kernel/spinlock.c b/kernel/spinlock.c index a1fb54c93cdd..29ab20749dd3 100644 --- a/kernel/spinlock.c +++ b/kernel/spinlock.c | |||
| @@ -290,8 +290,8 @@ void __lockfunc _spin_lock_nested(spinlock_t *lock, int subclass) | |||
| 290 | spin_acquire(&lock->dep_map, subclass, 0, _RET_IP_); | 290 | spin_acquire(&lock->dep_map, subclass, 0, _RET_IP_); |
| 291 | LOCK_CONTENDED(lock, _raw_spin_trylock, _raw_spin_lock); | 291 | LOCK_CONTENDED(lock, _raw_spin_trylock, _raw_spin_lock); |
| 292 | } | 292 | } |
| 293 | |||
| 294 | EXPORT_SYMBOL(_spin_lock_nested); | 293 | EXPORT_SYMBOL(_spin_lock_nested); |
| 294 | |||
| 295 | unsigned long __lockfunc _spin_lock_irqsave_nested(spinlock_t *lock, int subclass) | 295 | unsigned long __lockfunc _spin_lock_irqsave_nested(spinlock_t *lock, int subclass) |
| 296 | { | 296 | { |
| 297 | unsigned long flags; | 297 | unsigned long flags; |
| @@ -311,9 +311,17 @@ unsigned long __lockfunc _spin_lock_irqsave_nested(spinlock_t *lock, int subclas | |||
| 311 | #endif | 311 | #endif |
| 312 | return flags; | 312 | return flags; |
| 313 | } | 313 | } |
| 314 | |||
| 315 | EXPORT_SYMBOL(_spin_lock_irqsave_nested); | 314 | EXPORT_SYMBOL(_spin_lock_irqsave_nested); |
| 316 | 315 | ||
| 316 | void __lockfunc _spin_lock_nest_lock(spinlock_t *lock, | ||
| 317 | struct lockdep_map *nest_lock) | ||
| 318 | { | ||
| 319 | preempt_disable(); | ||
| 320 | spin_acquire_nest(&lock->dep_map, 0, 0, nest_lock, _RET_IP_); | ||
| 321 | LOCK_CONTENDED(lock, _raw_spin_trylock, _raw_spin_lock); | ||
| 322 | } | ||
| 323 | EXPORT_SYMBOL(_spin_lock_nest_lock); | ||
| 324 | |||
| 317 | #endif | 325 | #endif |
| 318 | 326 | ||
| 319 | void __lockfunc _spin_unlock(spinlock_t *lock) | 327 | void __lockfunc _spin_unlock(spinlock_t *lock) |
diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c index e446c7c7d6a9..af3c7cea258b 100644 --- a/kernel/stop_machine.c +++ b/kernel/stop_machine.c | |||
| @@ -65,7 +65,6 @@ static void ack_state(void) | |||
| 65 | static int stop_cpu(struct stop_machine_data *smdata) | 65 | static int stop_cpu(struct stop_machine_data *smdata) |
| 66 | { | 66 | { |
| 67 | enum stopmachine_state curstate = STOPMACHINE_NONE; | 67 | enum stopmachine_state curstate = STOPMACHINE_NONE; |
| 68 | int uninitialized_var(ret); | ||
| 69 | 68 | ||
| 70 | /* Simple state machine */ | 69 | /* Simple state machine */ |
| 71 | do { | 70 | do { |
diff --git a/kernel/sys.c b/kernel/sys.c index c01858090a98..038a7bc0901d 100644 --- a/kernel/sys.c +++ b/kernel/sys.c | |||
| @@ -169,9 +169,9 @@ asmlinkage long sys_setpriority(int which, int who, int niceval) | |||
| 169 | pgrp = find_vpid(who); | 169 | pgrp = find_vpid(who); |
| 170 | else | 170 | else |
| 171 | pgrp = task_pgrp(current); | 171 | pgrp = task_pgrp(current); |
| 172 | do_each_pid_task(pgrp, PIDTYPE_PGID, p) { | 172 | do_each_pid_thread(pgrp, PIDTYPE_PGID, p) { |
| 173 | error = set_one_prio(p, niceval, error); | 173 | error = set_one_prio(p, niceval, error); |
| 174 | } while_each_pid_task(pgrp, PIDTYPE_PGID, p); | 174 | } while_each_pid_thread(pgrp, PIDTYPE_PGID, p); |
| 175 | break; | 175 | break; |
| 176 | case PRIO_USER: | 176 | case PRIO_USER: |
| 177 | user = current->user; | 177 | user = current->user; |
| @@ -229,11 +229,11 @@ asmlinkage long sys_getpriority(int which, int who) | |||
| 229 | pgrp = find_vpid(who); | 229 | pgrp = find_vpid(who); |
| 230 | else | 230 | else |
| 231 | pgrp = task_pgrp(current); | 231 | pgrp = task_pgrp(current); |
| 232 | do_each_pid_task(pgrp, PIDTYPE_PGID, p) { | 232 | do_each_pid_thread(pgrp, PIDTYPE_PGID, p) { |
| 233 | niceval = 20 - task_nice(p); | 233 | niceval = 20 - task_nice(p); |
| 234 | if (niceval > retval) | 234 | if (niceval > retval) |
| 235 | retval = niceval; | 235 | retval = niceval; |
| 236 | } while_each_pid_task(pgrp, PIDTYPE_PGID, p); | 236 | } while_each_pid_thread(pgrp, PIDTYPE_PGID, p); |
| 237 | break; | 237 | break; |
| 238 | case PRIO_USER: | 238 | case PRIO_USER: |
| 239 | user = current->user; | 239 | user = current->user; |
| @@ -274,7 +274,7 @@ void emergency_restart(void) | |||
| 274 | } | 274 | } |
| 275 | EXPORT_SYMBOL_GPL(emergency_restart); | 275 | EXPORT_SYMBOL_GPL(emergency_restart); |
| 276 | 276 | ||
| 277 | static void kernel_restart_prepare(char *cmd) | 277 | void kernel_restart_prepare(char *cmd) |
| 278 | { | 278 | { |
| 279 | blocking_notifier_call_chain(&reboot_notifier_list, SYS_RESTART, cmd); | 279 | blocking_notifier_call_chain(&reboot_notifier_list, SYS_RESTART, cmd); |
| 280 | system_state = SYSTEM_RESTART; | 280 | system_state = SYSTEM_RESTART; |
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index fe4713347275..50ec0886fa3d 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
| @@ -159,6 +159,7 @@ static int proc_dointvec_taint(struct ctl_table *table, int write, struct file * | |||
| 159 | static struct ctl_table root_table[]; | 159 | static struct ctl_table root_table[]; |
| 160 | static struct ctl_table_root sysctl_table_root; | 160 | static struct ctl_table_root sysctl_table_root; |
| 161 | static struct ctl_table_header root_table_header = { | 161 | static struct ctl_table_header root_table_header = { |
| 162 | .count = 1, | ||
| 162 | .ctl_table = root_table, | 163 | .ctl_table = root_table, |
| 163 | .ctl_entry = LIST_HEAD_INIT(sysctl_table_root.default_set.list), | 164 | .ctl_entry = LIST_HEAD_INIT(sysctl_table_root.default_set.list), |
| 164 | .root = &sysctl_table_root, | 165 | .root = &sysctl_table_root, |
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index 825b4c00fe44..7a46bde78c66 100644 --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c | |||
| @@ -289,7 +289,6 @@ void tick_nohz_stop_sched_tick(int inidle) | |||
| 289 | ts->tick_stopped = 1; | 289 | ts->tick_stopped = 1; |
| 290 | ts->idle_jiffies = last_jiffies; | 290 | ts->idle_jiffies = last_jiffies; |
| 291 | rcu_enter_nohz(); | 291 | rcu_enter_nohz(); |
| 292 | sched_clock_tick_stop(cpu); | ||
| 293 | } | 292 | } |
| 294 | 293 | ||
| 295 | /* | 294 | /* |
| @@ -392,7 +391,6 @@ void tick_nohz_restart_sched_tick(void) | |||
| 392 | select_nohz_load_balancer(0); | 391 | select_nohz_load_balancer(0); |
| 393 | now = ktime_get(); | 392 | now = ktime_get(); |
| 394 | tick_do_update_jiffies64(now); | 393 | tick_do_update_jiffies64(now); |
| 395 | sched_clock_tick_start(cpu); | ||
| 396 | cpu_clear(cpu, nohz_cpu_mask); | 394 | cpu_clear(cpu, nohz_cpu_mask); |
| 397 | 395 | ||
| 398 | /* | 396 | /* |
| @@ -645,17 +643,21 @@ void tick_setup_sched_timer(void) | |||
| 645 | ts->nohz_mode = NOHZ_MODE_HIGHRES; | 643 | ts->nohz_mode = NOHZ_MODE_HIGHRES; |
| 646 | #endif | 644 | #endif |
| 647 | } | 645 | } |
| 646 | #endif /* HIGH_RES_TIMERS */ | ||
| 648 | 647 | ||
| 648 | #if defined CONFIG_NO_HZ || defined CONFIG_HIGH_RES_TIMERS | ||
| 649 | void tick_cancel_sched_timer(int cpu) | 649 | void tick_cancel_sched_timer(int cpu) |
| 650 | { | 650 | { |
| 651 | struct tick_sched *ts = &per_cpu(tick_cpu_sched, cpu); | 651 | struct tick_sched *ts = &per_cpu(tick_cpu_sched, cpu); |
| 652 | 652 | ||
| 653 | # ifdef CONFIG_HIGH_RES_TIMERS | ||
| 653 | if (ts->sched_timer.base) | 654 | if (ts->sched_timer.base) |
| 654 | hrtimer_cancel(&ts->sched_timer); | 655 | hrtimer_cancel(&ts->sched_timer); |
| 656 | # endif | ||
| 655 | 657 | ||
| 656 | ts->nohz_mode = NOHZ_MODE_INACTIVE; | 658 | ts->nohz_mode = NOHZ_MODE_INACTIVE; |
| 657 | } | 659 | } |
| 658 | #endif /* HIGH_RES_TIMERS */ | 660 | #endif |
| 659 | 661 | ||
| 660 | /** | 662 | /** |
| 661 | * Async notification about clocksource changes | 663 | * Async notification about clocksource changes |
diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c index a9ab0596de44..532858fa5b88 100644 --- a/kernel/user_namespace.c +++ b/kernel/user_namespace.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/module.h> | 8 | #include <linux/module.h> |
| 9 | #include <linux/version.h> | ||
| 10 | #include <linux/nsproxy.h> | 9 | #include <linux/nsproxy.h> |
| 11 | #include <linux/slab.h> | 10 | #include <linux/slab.h> |
| 12 | #include <linux/user_namespace.h> | 11 | #include <linux/user_namespace.h> |
diff --git a/kernel/utsname.c b/kernel/utsname.c index 64d398f12444..815237a55af8 100644 --- a/kernel/utsname.c +++ b/kernel/utsname.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 13 | #include <linux/uts.h> | 13 | #include <linux/uts.h> |
| 14 | #include <linux/utsname.h> | 14 | #include <linux/utsname.h> |
| 15 | #include <linux/version.h> | ||
| 16 | #include <linux/err.h> | 15 | #include <linux/err.h> |
| 17 | #include <linux/slab.h> | 16 | #include <linux/slab.h> |
| 18 | 17 | ||
diff --git a/kernel/utsname_sysctl.c b/kernel/utsname_sysctl.c index fe3a56c2256d..4ab9659d269e 100644 --- a/kernel/utsname_sysctl.c +++ b/kernel/utsname_sysctl.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 13 | #include <linux/uts.h> | 13 | #include <linux/uts.h> |
| 14 | #include <linux/utsname.h> | 14 | #include <linux/utsname.h> |
| 15 | #include <linux/version.h> | ||
| 16 | #include <linux/sysctl.h> | 15 | #include <linux/sysctl.h> |
| 17 | 16 | ||
| 18 | static void *get_uts(ctl_table *table, int write) | 17 | static void *get_uts(ctl_table *table, int write) |
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 4a26a1382df0..4048e92aa04f 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c | |||
| @@ -290,11 +290,11 @@ static void run_workqueue(struct cpu_workqueue_struct *cwq) | |||
| 290 | 290 | ||
| 291 | BUG_ON(get_wq_data(work) != cwq); | 291 | BUG_ON(get_wq_data(work) != cwq); |
| 292 | work_clear_pending(work); | 292 | work_clear_pending(work); |
| 293 | lock_acquire(&cwq->wq->lockdep_map, 0, 0, 0, 2, _THIS_IP_); | 293 | lock_map_acquire(&cwq->wq->lockdep_map); |
| 294 | lock_acquire(&lockdep_map, 0, 0, 0, 2, _THIS_IP_); | 294 | lock_map_acquire(&lockdep_map); |
| 295 | f(work); | 295 | f(work); |
| 296 | lock_release(&lockdep_map, 1, _THIS_IP_); | 296 | lock_map_release(&lockdep_map); |
| 297 | lock_release(&cwq->wq->lockdep_map, 1, _THIS_IP_); | 297 | lock_map_release(&cwq->wq->lockdep_map); |
| 298 | 298 | ||
| 299 | if (unlikely(in_atomic() || lockdep_depth(current) > 0)) { | 299 | if (unlikely(in_atomic() || lockdep_depth(current) > 0)) { |
| 300 | printk(KERN_ERR "BUG: workqueue leaked lock or atomic: " | 300 | printk(KERN_ERR "BUG: workqueue leaked lock or atomic: " |
| @@ -413,8 +413,8 @@ void flush_workqueue(struct workqueue_struct *wq) | |||
| 413 | int cpu; | 413 | int cpu; |
| 414 | 414 | ||
| 415 | might_sleep(); | 415 | might_sleep(); |
| 416 | lock_acquire(&wq->lockdep_map, 0, 0, 0, 2, _THIS_IP_); | 416 | lock_map_acquire(&wq->lockdep_map); |
| 417 | lock_release(&wq->lockdep_map, 1, _THIS_IP_); | 417 | lock_map_release(&wq->lockdep_map); |
| 418 | for_each_cpu_mask_nr(cpu, *cpu_map) | 418 | for_each_cpu_mask_nr(cpu, *cpu_map) |
| 419 | flush_cpu_workqueue(per_cpu_ptr(wq->cpu_wq, cpu)); | 419 | flush_cpu_workqueue(per_cpu_ptr(wq->cpu_wq, cpu)); |
| 420 | } | 420 | } |
| @@ -441,8 +441,8 @@ int flush_work(struct work_struct *work) | |||
| 441 | if (!cwq) | 441 | if (!cwq) |
| 442 | return 0; | 442 | return 0; |
| 443 | 443 | ||
| 444 | lock_acquire(&cwq->wq->lockdep_map, 0, 0, 0, 2, _THIS_IP_); | 444 | lock_map_acquire(&cwq->wq->lockdep_map); |
| 445 | lock_release(&cwq->wq->lockdep_map, 1, _THIS_IP_); | 445 | lock_map_release(&cwq->wq->lockdep_map); |
| 446 | 446 | ||
| 447 | prev = NULL; | 447 | prev = NULL; |
| 448 | spin_lock_irq(&cwq->lock); | 448 | spin_lock_irq(&cwq->lock); |
| @@ -536,8 +536,8 @@ static void wait_on_work(struct work_struct *work) | |||
| 536 | 536 | ||
| 537 | might_sleep(); | 537 | might_sleep(); |
| 538 | 538 | ||
| 539 | lock_acquire(&work->lockdep_map, 0, 0, 0, 2, _THIS_IP_); | 539 | lock_map_acquire(&work->lockdep_map); |
| 540 | lock_release(&work->lockdep_map, 1, _THIS_IP_); | 540 | lock_map_release(&work->lockdep_map); |
| 541 | 541 | ||
| 542 | cwq = get_wq_data(work); | 542 | cwq = get_wq_data(work); |
| 543 | if (!cwq) | 543 | if (!cwq) |
| @@ -872,8 +872,8 @@ static void cleanup_workqueue_thread(struct cpu_workqueue_struct *cwq) | |||
| 872 | if (cwq->thread == NULL) | 872 | if (cwq->thread == NULL) |
| 873 | return; | 873 | return; |
| 874 | 874 | ||
| 875 | lock_acquire(&cwq->wq->lockdep_map, 0, 0, 0, 2, _THIS_IP_); | 875 | lock_map_acquire(&cwq->wq->lockdep_map); |
| 876 | lock_release(&cwq->wq->lockdep_map, 1, _THIS_IP_); | 876 | lock_map_release(&cwq->wq->lockdep_map); |
| 877 | 877 | ||
| 878 | flush_cpu_workqueue(cwq); | 878 | flush_cpu_workqueue(cwq); |
| 879 | /* | 879 | /* |
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index e1d4764435ed..0b504814e378 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug | |||
| @@ -394,7 +394,7 @@ config LOCKDEP | |||
| 394 | bool | 394 | bool |
| 395 | depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT | 395 | depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT |
| 396 | select STACKTRACE | 396 | select STACKTRACE |
| 397 | select FRAME_POINTER if !X86 && !MIPS | 397 | select FRAME_POINTER if !X86 && !MIPS && !PPC |
| 398 | select KALLSYMS | 398 | select KALLSYMS |
| 399 | select KALLSYMS_ALL | 399 | select KALLSYMS_ALL |
| 400 | 400 | ||
| @@ -676,13 +676,13 @@ config FAULT_INJECTION_STACKTRACE_FILTER | |||
| 676 | depends on FAULT_INJECTION_DEBUG_FS && STACKTRACE_SUPPORT | 676 | depends on FAULT_INJECTION_DEBUG_FS && STACKTRACE_SUPPORT |
| 677 | depends on !X86_64 | 677 | depends on !X86_64 |
| 678 | select STACKTRACE | 678 | select STACKTRACE |
| 679 | select FRAME_POINTER | 679 | select FRAME_POINTER if !PPC |
| 680 | help | 680 | help |
| 681 | Provide stacktrace filter for fault-injection capabilities | 681 | Provide stacktrace filter for fault-injection capabilities |
| 682 | 682 | ||
| 683 | config LATENCYTOP | 683 | config LATENCYTOP |
| 684 | bool "Latency measuring infrastructure" | 684 | bool "Latency measuring infrastructure" |
| 685 | select FRAME_POINTER if !MIPS | 685 | select FRAME_POINTER if !MIPS && !PPC |
| 686 | select KALLSYMS | 686 | select KALLSYMS |
| 687 | select KALLSYMS_ALL | 687 | select KALLSYMS_ALL |
| 688 | select STACKTRACE | 688 | select STACKTRACE |
| @@ -693,6 +693,14 @@ config LATENCYTOP | |||
| 693 | Enable this option if you want to use the LatencyTOP tool | 693 | Enable this option if you want to use the LatencyTOP tool |
| 694 | to find out which userspace is blocking on what kernel operations. | 694 | to find out which userspace is blocking on what kernel operations. |
| 695 | 695 | ||
| 696 | config SYSCTL_SYSCALL_CHECK | ||
| 697 | bool "Sysctl checks" | ||
| 698 | depends on SYSCTL_SYSCALL | ||
| 699 | ---help--- | ||
| 700 | sys_sysctl uses binary paths that have been found challenging | ||
| 701 | to properly maintain and use. This enables checks that help | ||
| 702 | you to keep things correct. | ||
| 703 | |||
| 696 | source kernel/trace/Kconfig | 704 | source kernel/trace/Kconfig |
| 697 | 705 | ||
| 698 | config PROVIDE_OHCI1394_DMA_INIT | 706 | config PROVIDE_OHCI1394_DMA_INIT |
| @@ -735,6 +743,15 @@ config FIREWIRE_OHCI_REMOTE_DMA | |||
| 735 | 743 | ||
| 736 | If unsure, say N. | 744 | If unsure, say N. |
| 737 | 745 | ||
| 746 | menuconfig BUILD_DOCSRC | ||
| 747 | bool "Build targets in Documentation/ tree" | ||
| 748 | depends on HEADERS_CHECK | ||
| 749 | help | ||
| 750 | This option attempts to build objects from the source files in the | ||
| 751 | kernel Documentation/ tree. | ||
| 752 | |||
| 753 | Say N if you are unsure. | ||
| 754 | |||
| 738 | source "samples/Kconfig" | 755 | source "samples/Kconfig" |
| 739 | 756 | ||
| 740 | source "lib/Kconfig.kgdb" | 757 | source "lib/Kconfig.kgdb" |
diff --git a/lib/bitmap.c b/lib/bitmap.c index 482df94ea21e..06fb57c86de0 100644 --- a/lib/bitmap.c +++ b/lib/bitmap.c | |||
| @@ -316,6 +316,17 @@ int bitmap_scnprintf(char *buf, unsigned int buflen, | |||
| 316 | EXPORT_SYMBOL(bitmap_scnprintf); | 316 | EXPORT_SYMBOL(bitmap_scnprintf); |
| 317 | 317 | ||
| 318 | /** | 318 | /** |
| 319 | * bitmap_scnprintf_len - return buffer length needed to convert | ||
| 320 | * bitmap to an ASCII hex string | ||
| 321 | * @nr_bits: number of bits to be converted | ||
| 322 | */ | ||
| 323 | int bitmap_scnprintf_len(unsigned int nr_bits) | ||
| 324 | { | ||
| 325 | unsigned int nr_nibbles = ALIGN(nr_bits, 4) / 4; | ||
| 326 | return nr_nibbles + ALIGN(nr_nibbles, CHUNKSZ / 4) / (CHUNKSZ / 4) - 1; | ||
| 327 | } | ||
| 328 | |||
| 329 | /** | ||
| 319 | * __bitmap_parse - convert an ASCII hex string into a bitmap. | 330 | * __bitmap_parse - convert an ASCII hex string into a bitmap. |
| 320 | * @buf: pointer to buffer containing string. | 331 | * @buf: pointer to buffer containing string. |
| 321 | * @buflen: buffer size in bytes. If string is smaller than this | 332 | * @buflen: buffer size in bytes. If string is smaller than this |
diff --git a/lib/debug_locks.c b/lib/debug_locks.c index 0ef01d14727c..0218b4693dd8 100644 --- a/lib/debug_locks.c +++ b/lib/debug_locks.c | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | * | 8 | * |
| 9 | * Copyright (C) 2006 Red Hat, Inc., Ingo Molnar <mingo@redhat.com> | 9 | * Copyright (C) 2006 Red Hat, Inc., Ingo Molnar <mingo@redhat.com> |
| 10 | */ | 10 | */ |
| 11 | #include <linux/kernel.h> | ||
| 11 | #include <linux/rwsem.h> | 12 | #include <linux/rwsem.h> |
| 12 | #include <linux/mutex.h> | 13 | #include <linux/mutex.h> |
| 13 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| @@ -37,6 +38,7 @@ int debug_locks_off(void) | |||
| 37 | { | 38 | { |
| 38 | if (xchg(&debug_locks, 0)) { | 39 | if (xchg(&debug_locks, 0)) { |
| 39 | if (!debug_locks_silent) { | 40 | if (!debug_locks_silent) { |
| 41 | oops_in_progress = 1; | ||
| 40 | console_verbose(); | 42 | console_verbose(); |
| 41 | return 1; | 43 | return 1; |
| 42 | } | 44 | } |
diff --git a/lib/kobject.c b/lib/kobject.c index bd732ffebc85..fbf0ae282376 100644 --- a/lib/kobject.c +++ b/lib/kobject.c | |||
| @@ -223,8 +223,7 @@ static int kobject_set_name_vargs(struct kobject *kobj, const char *fmt, | |||
| 223 | return -ENOMEM; | 223 | return -ENOMEM; |
| 224 | 224 | ||
| 225 | /* ewww... some of these buggers have '/' in the name ... */ | 225 | /* ewww... some of these buggers have '/' in the name ... */ |
| 226 | s = strchr(kobj->name, '/'); | 226 | while ((s = strchr(kobj->name, '/'))) |
| 227 | if (s) | ||
| 228 | s[0] = '!'; | 227 | s[0] = '!'; |
| 229 | 228 | ||
| 230 | kfree(old_name); | 229 | kfree(old_name); |
| @@ -462,6 +462,8 @@ void __init lmb_enforce_memory_limit(u64 memory_limit) | |||
| 462 | if (lmb.memory.region[0].size < lmb.rmo_size) | 462 | if (lmb.memory.region[0].size < lmb.rmo_size) |
| 463 | lmb.rmo_size = lmb.memory.region[0].size; | 463 | lmb.rmo_size = lmb.memory.region[0].size; |
| 464 | 464 | ||
| 465 | memory_limit = lmb_end_of_DRAM(); | ||
| 466 | |||
| 465 | /* And truncate any reserves above the limit also. */ | 467 | /* And truncate any reserves above the limit also. */ |
| 466 | for (i = 0; i < lmb.reserved.cnt; i++) { | 468 | for (i = 0; i < lmb.reserved.cnt; i++) { |
| 467 | p = &lmb.reserved.region[i]; | 469 | p = &lmb.reserved.region[i]; |
diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 1dc2d1d18fa8..d8d1d1142248 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c | |||
| @@ -220,7 +220,7 @@ int strict_strtou##type(const char *cp, unsigned int base, valtype *res)\ | |||
| 220 | if (len == 0) \ | 220 | if (len == 0) \ |
| 221 | return -EINVAL; \ | 221 | return -EINVAL; \ |
| 222 | \ | 222 | \ |
| 223 | val = simple_strtoul(cp, &tail, base); \ | 223 | val = simple_strtou##type(cp, &tail, base); \ |
| 224 | if ((*tail == '\0') || \ | 224 | if ((*tail == '\0') || \ |
| 225 | ((len == (size_t)(tail - cp) + 1) && (*tail == '\n'))) {\ | 225 | ((len == (size_t)(tail - cp) + 1) && (*tail == '\n'))) {\ |
| 226 | *res = val; \ | 226 | *res = val; \ |
diff --git a/mm/Kconfig b/mm/Kconfig index 446c6588c753..0bd9c2dbb2a0 100644 --- a/mm/Kconfig +++ b/mm/Kconfig | |||
| @@ -77,9 +77,6 @@ config FLAT_NODE_MEM_MAP | |||
| 77 | def_bool y | 77 | def_bool y |
| 78 | depends on !SPARSEMEM | 78 | depends on !SPARSEMEM |
| 79 | 79 | ||
| 80 | config HAVE_GET_USER_PAGES_FAST | ||
| 81 | bool | ||
| 82 | |||
| 83 | # | 80 | # |
| 84 | # Both the NUMA code and DISCONTIGMEM use arrays of pg_data_t's | 81 | # Both the NUMA code and DISCONTIGMEM use arrays of pg_data_t's |
| 85 | # to represent different areas of memory. This variable allows | 82 | # to represent different areas of memory. This variable allows |
diff --git a/mm/bootmem.c b/mm/bootmem.c index 4af15d0340ad..ad8eec6e44a8 100644 --- a/mm/bootmem.c +++ b/mm/bootmem.c | |||
| @@ -405,6 +405,29 @@ int __init reserve_bootmem(unsigned long addr, unsigned long size, | |||
| 405 | } | 405 | } |
| 406 | #endif /* !CONFIG_HAVE_ARCH_BOOTMEM_NODE */ | 406 | #endif /* !CONFIG_HAVE_ARCH_BOOTMEM_NODE */ |
| 407 | 407 | ||
| 408 | static unsigned long align_idx(struct bootmem_data *bdata, unsigned long idx, | ||
| 409 | unsigned long step) | ||
| 410 | { | ||
| 411 | unsigned long base = bdata->node_min_pfn; | ||
| 412 | |||
| 413 | /* | ||
| 414 | * Align the index with respect to the node start so that the | ||
| 415 | * combination of both satisfies the requested alignment. | ||
| 416 | */ | ||
| 417 | |||
| 418 | return ALIGN(base + idx, step) - base; | ||
| 419 | } | ||
| 420 | |||
| 421 | static unsigned long align_off(struct bootmem_data *bdata, unsigned long off, | ||
| 422 | unsigned long align) | ||
| 423 | { | ||
| 424 | unsigned long base = PFN_PHYS(bdata->node_min_pfn); | ||
| 425 | |||
| 426 | /* Same as align_idx for byte offsets */ | ||
| 427 | |||
| 428 | return ALIGN(base + off, align) - base; | ||
| 429 | } | ||
| 430 | |||
| 408 | static void * __init alloc_bootmem_core(struct bootmem_data *bdata, | 431 | static void * __init alloc_bootmem_core(struct bootmem_data *bdata, |
| 409 | unsigned long size, unsigned long align, | 432 | unsigned long size, unsigned long align, |
| 410 | unsigned long goal, unsigned long limit) | 433 | unsigned long goal, unsigned long limit) |
| @@ -441,7 +464,7 @@ static void * __init alloc_bootmem_core(struct bootmem_data *bdata, | |||
| 441 | else | 464 | else |
| 442 | start = ALIGN(min, step); | 465 | start = ALIGN(min, step); |
| 443 | 466 | ||
| 444 | sidx = start - bdata->node_min_pfn;; | 467 | sidx = start - bdata->node_min_pfn; |
| 445 | midx = max - bdata->node_min_pfn; | 468 | midx = max - bdata->node_min_pfn; |
| 446 | 469 | ||
| 447 | if (bdata->hint_idx > sidx) { | 470 | if (bdata->hint_idx > sidx) { |
| @@ -450,7 +473,7 @@ static void * __init alloc_bootmem_core(struct bootmem_data *bdata, | |||
| 450 | * catch the fallback below. | 473 | * catch the fallback below. |
| 451 | */ | 474 | */ |
| 452 | fallback = sidx + 1; | 475 | fallback = sidx + 1; |
| 453 | sidx = ALIGN(bdata->hint_idx, step); | 476 | sidx = align_idx(bdata, bdata->hint_idx, step); |
| 454 | } | 477 | } |
| 455 | 478 | ||
| 456 | while (1) { | 479 | while (1) { |
| @@ -459,7 +482,7 @@ static void * __init alloc_bootmem_core(struct bootmem_data *bdata, | |||
| 459 | unsigned long eidx, i, start_off, end_off; | 482 | unsigned long eidx, i, start_off, end_off; |
| 460 | find_block: | 483 | find_block: |
| 461 | sidx = find_next_zero_bit(bdata->node_bootmem_map, midx, sidx); | 484 | sidx = find_next_zero_bit(bdata->node_bootmem_map, midx, sidx); |
| 462 | sidx = ALIGN(sidx, step); | 485 | sidx = align_idx(bdata, sidx, step); |
| 463 | eidx = sidx + PFN_UP(size); | 486 | eidx = sidx + PFN_UP(size); |
| 464 | 487 | ||
| 465 | if (sidx >= midx || eidx > midx) | 488 | if (sidx >= midx || eidx > midx) |
| @@ -467,15 +490,15 @@ find_block: | |||
| 467 | 490 | ||
| 468 | for (i = sidx; i < eidx; i++) | 491 | for (i = sidx; i < eidx; i++) |
| 469 | if (test_bit(i, bdata->node_bootmem_map)) { | 492 | if (test_bit(i, bdata->node_bootmem_map)) { |
| 470 | sidx = ALIGN(i, step); | 493 | sidx = align_idx(bdata, i, step); |
| 471 | if (sidx == i) | 494 | if (sidx == i) |
| 472 | sidx += step; | 495 | sidx += step; |
| 473 | goto find_block; | 496 | goto find_block; |
| 474 | } | 497 | } |
| 475 | 498 | ||
| 476 | if (bdata->last_end_off && | 499 | if (bdata->last_end_off & (PAGE_SIZE - 1) && |
| 477 | PFN_DOWN(bdata->last_end_off) + 1 == sidx) | 500 | PFN_DOWN(bdata->last_end_off) + 1 == sidx) |
| 478 | start_off = ALIGN(bdata->last_end_off, align); | 501 | start_off = align_off(bdata, bdata->last_end_off, align); |
| 479 | else | 502 | else |
| 480 | start_off = PFN_PHYS(sidx); | 503 | start_off = PFN_PHYS(sidx); |
| 481 | 504 | ||
| @@ -499,7 +522,7 @@ find_block: | |||
| 499 | } | 522 | } |
| 500 | 523 | ||
| 501 | if (fallback) { | 524 | if (fallback) { |
| 502 | sidx = ALIGN(fallback - 1, step); | 525 | sidx = align_idx(bdata, fallback - 1, step); |
| 503 | fallback = 0; | 526 | fallback = 0; |
| 504 | goto find_block; | 527 | goto find_block; |
| 505 | } | 528 | } |
diff --git a/mm/filemap.c b/mm/filemap.c index 54e968650855..876bc595d0f8 100644 --- a/mm/filemap.c +++ b/mm/filemap.c | |||
| @@ -2129,13 +2129,20 @@ generic_file_direct_write(struct kiocb *iocb, const struct iovec *iov, | |||
| 2129 | * After a write we want buffered reads to be sure to go to disk to get | 2129 | * After a write we want buffered reads to be sure to go to disk to get |
| 2130 | * the new data. We invalidate clean cached page from the region we're | 2130 | * the new data. We invalidate clean cached page from the region we're |
| 2131 | * about to write. We do this *before* the write so that we can return | 2131 | * about to write. We do this *before* the write so that we can return |
| 2132 | * -EIO without clobbering -EIOCBQUEUED from ->direct_IO(). | 2132 | * without clobbering -EIOCBQUEUED from ->direct_IO(). |
| 2133 | */ | 2133 | */ |
| 2134 | if (mapping->nrpages) { | 2134 | if (mapping->nrpages) { |
| 2135 | written = invalidate_inode_pages2_range(mapping, | 2135 | written = invalidate_inode_pages2_range(mapping, |
| 2136 | pos >> PAGE_CACHE_SHIFT, end); | 2136 | pos >> PAGE_CACHE_SHIFT, end); |
| 2137 | if (written) | 2137 | /* |
| 2138 | * If a page can not be invalidated, return 0 to fall back | ||
| 2139 | * to buffered write. | ||
| 2140 | */ | ||
| 2141 | if (written) { | ||
| 2142 | if (written == -EBUSY) | ||
| 2143 | return 0; | ||
| 2138 | goto out; | 2144 | goto out; |
| 2145 | } | ||
| 2139 | } | 2146 | } |
| 2140 | 2147 | ||
| 2141 | written = mapping->a_ops->direct_IO(WRITE, iocb, iov, pos, *nr_segs); | 2148 | written = mapping->a_ops->direct_IO(WRITE, iocb, iov, pos, *nr_segs); |
diff --git a/mm/filemap_xip.c b/mm/filemap_xip.c index 380ab402d711..b5167dfb2f2d 100644 --- a/mm/filemap_xip.c +++ b/mm/filemap_xip.c | |||
| @@ -15,6 +15,8 @@ | |||
| 15 | #include <linux/rmap.h> | 15 | #include <linux/rmap.h> |
| 16 | #include <linux/mmu_notifier.h> | 16 | #include <linux/mmu_notifier.h> |
| 17 | #include <linux/sched.h> | 17 | #include <linux/sched.h> |
| 18 | #include <linux/seqlock.h> | ||
| 19 | #include <linux/mutex.h> | ||
| 18 | #include <asm/tlbflush.h> | 20 | #include <asm/tlbflush.h> |
| 19 | #include <asm/io.h> | 21 | #include <asm/io.h> |
| 20 | 22 | ||
| @@ -22,22 +24,18 @@ | |||
| 22 | * We do use our own empty page to avoid interference with other users | 24 | * We do use our own empty page to avoid interference with other users |
| 23 | * of ZERO_PAGE(), such as /dev/zero | 25 | * of ZERO_PAGE(), such as /dev/zero |
| 24 | */ | 26 | */ |
| 27 | static DEFINE_MUTEX(xip_sparse_mutex); | ||
| 28 | static seqcount_t xip_sparse_seq = SEQCNT_ZERO; | ||
| 25 | static struct page *__xip_sparse_page; | 29 | static struct page *__xip_sparse_page; |
| 26 | 30 | ||
| 31 | /* called under xip_sparse_mutex */ | ||
| 27 | static struct page *xip_sparse_page(void) | 32 | static struct page *xip_sparse_page(void) |
| 28 | { | 33 | { |
| 29 | if (!__xip_sparse_page) { | 34 | if (!__xip_sparse_page) { |
| 30 | struct page *page = alloc_page(GFP_HIGHUSER | __GFP_ZERO); | 35 | struct page *page = alloc_page(GFP_HIGHUSER | __GFP_ZERO); |
| 31 | 36 | ||
| 32 | if (page) { | 37 | if (page) |
| 33 | static DEFINE_SPINLOCK(xip_alloc_lock); | 38 | __xip_sparse_page = page; |
| 34 | spin_lock(&xip_alloc_lock); | ||
| 35 | if (!__xip_sparse_page) | ||
| 36 | __xip_sparse_page = page; | ||
| 37 | else | ||
| 38 | __free_page(page); | ||
| 39 | spin_unlock(&xip_alloc_lock); | ||
| 40 | } | ||
| 41 | } | 39 | } |
| 42 | return __xip_sparse_page; | 40 | return __xip_sparse_page; |
| 43 | } | 41 | } |
| @@ -174,18 +172,23 @@ __xip_unmap (struct address_space * mapping, | |||
| 174 | pte_t pteval; | 172 | pte_t pteval; |
| 175 | spinlock_t *ptl; | 173 | spinlock_t *ptl; |
| 176 | struct page *page; | 174 | struct page *page; |
| 175 | unsigned count; | ||
| 176 | int locked = 0; | ||
| 177 | |||
| 178 | count = read_seqcount_begin(&xip_sparse_seq); | ||
| 177 | 179 | ||
| 178 | page = __xip_sparse_page; | 180 | page = __xip_sparse_page; |
| 179 | if (!page) | 181 | if (!page) |
| 180 | return; | 182 | return; |
| 181 | 183 | ||
| 184 | retry: | ||
| 182 | spin_lock(&mapping->i_mmap_lock); | 185 | spin_lock(&mapping->i_mmap_lock); |
| 183 | vma_prio_tree_foreach(vma, &iter, &mapping->i_mmap, pgoff, pgoff) { | 186 | vma_prio_tree_foreach(vma, &iter, &mapping->i_mmap, pgoff, pgoff) { |
| 184 | mm = vma->vm_mm; | 187 | mm = vma->vm_mm; |
| 185 | address = vma->vm_start + | 188 | address = vma->vm_start + |
| 186 | ((pgoff - vma->vm_pgoff) << PAGE_SHIFT); | 189 | ((pgoff - vma->vm_pgoff) << PAGE_SHIFT); |
| 187 | BUG_ON(address < vma->vm_start || address >= vma->vm_end); | 190 | BUG_ON(address < vma->vm_start || address >= vma->vm_end); |
| 188 | pte = page_check_address(page, mm, address, &ptl); | 191 | pte = page_check_address(page, mm, address, &ptl, 1); |
| 189 | if (pte) { | 192 | if (pte) { |
| 190 | /* Nuke the page table entry. */ | 193 | /* Nuke the page table entry. */ |
| 191 | flush_cache_page(vma, address, pte_pfn(*pte)); | 194 | flush_cache_page(vma, address, pte_pfn(*pte)); |
| @@ -198,6 +201,14 @@ __xip_unmap (struct address_space * mapping, | |||
| 198 | } | 201 | } |
| 199 | } | 202 | } |
| 200 | spin_unlock(&mapping->i_mmap_lock); | 203 | spin_unlock(&mapping->i_mmap_lock); |
| 204 | |||
| 205 | if (locked) { | ||
| 206 | mutex_unlock(&xip_sparse_mutex); | ||
| 207 | } else if (read_seqcount_retry(&xip_sparse_seq, count)) { | ||
| 208 | mutex_lock(&xip_sparse_mutex); | ||
| 209 | locked = 1; | ||
| 210 | goto retry; | ||
| 211 | } | ||
| 201 | } | 212 | } |
| 202 | 213 | ||
| 203 | /* | 214 | /* |
| @@ -218,7 +229,7 @@ static int xip_file_fault(struct vm_area_struct *vma, struct vm_fault *vmf) | |||
| 218 | int error; | 229 | int error; |
| 219 | 230 | ||
| 220 | /* XXX: are VM_FAULT_ codes OK? */ | 231 | /* XXX: are VM_FAULT_ codes OK? */ |
| 221 | 232 | again: | |
| 222 | size = (i_size_read(inode) + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; | 233 | size = (i_size_read(inode) + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; |
| 223 | if (vmf->pgoff >= size) | 234 | if (vmf->pgoff >= size) |
| 224 | return VM_FAULT_SIGBUS; | 235 | return VM_FAULT_SIGBUS; |
| @@ -237,8 +248,10 @@ static int xip_file_fault(struct vm_area_struct *vma, struct vm_fault *vmf) | |||
| 237 | int err; | 248 | int err; |
| 238 | 249 | ||
| 239 | /* maybe shared writable, allocate new block */ | 250 | /* maybe shared writable, allocate new block */ |
| 251 | mutex_lock(&xip_sparse_mutex); | ||
| 240 | error = mapping->a_ops->get_xip_mem(mapping, vmf->pgoff, 1, | 252 | error = mapping->a_ops->get_xip_mem(mapping, vmf->pgoff, 1, |
| 241 | &xip_mem, &xip_pfn); | 253 | &xip_mem, &xip_pfn); |
| 254 | mutex_unlock(&xip_sparse_mutex); | ||
| 242 | if (error) | 255 | if (error) |
| 243 | return VM_FAULT_SIGBUS; | 256 | return VM_FAULT_SIGBUS; |
| 244 | /* unmap sparse mappings at pgoff from all other vmas */ | 257 | /* unmap sparse mappings at pgoff from all other vmas */ |
| @@ -252,14 +265,34 @@ found: | |||
| 252 | BUG_ON(err); | 265 | BUG_ON(err); |
| 253 | return VM_FAULT_NOPAGE; | 266 | return VM_FAULT_NOPAGE; |
| 254 | } else { | 267 | } else { |
| 268 | int err, ret = VM_FAULT_OOM; | ||
| 269 | |||
| 270 | mutex_lock(&xip_sparse_mutex); | ||
| 271 | write_seqcount_begin(&xip_sparse_seq); | ||
| 272 | error = mapping->a_ops->get_xip_mem(mapping, vmf->pgoff, 0, | ||
| 273 | &xip_mem, &xip_pfn); | ||
| 274 | if (unlikely(!error)) { | ||
| 275 | write_seqcount_end(&xip_sparse_seq); | ||
| 276 | mutex_unlock(&xip_sparse_mutex); | ||
| 277 | goto again; | ||
| 278 | } | ||
| 279 | if (error != -ENODATA) | ||
| 280 | goto out; | ||
| 255 | /* not shared and writable, use xip_sparse_page() */ | 281 | /* not shared and writable, use xip_sparse_page() */ |
| 256 | page = xip_sparse_page(); | 282 | page = xip_sparse_page(); |
| 257 | if (!page) | 283 | if (!page) |
| 258 | return VM_FAULT_OOM; | 284 | goto out; |
| 285 | err = vm_insert_page(vma, (unsigned long)vmf->virtual_address, | ||
| 286 | page); | ||
| 287 | if (err == -ENOMEM) | ||
| 288 | goto out; | ||
| 259 | 289 | ||
| 260 | page_cache_get(page); | 290 | ret = VM_FAULT_NOPAGE; |
| 261 | vmf->page = page; | 291 | out: |
| 262 | return 0; | 292 | write_seqcount_end(&xip_sparse_seq); |
| 293 | mutex_unlock(&xip_sparse_mutex); | ||
| 294 | |||
| 295 | return ret; | ||
| 263 | } | 296 | } |
| 264 | } | 297 | } |
| 265 | 298 | ||
| @@ -308,8 +341,10 @@ __xip_file_write(struct file *filp, const char __user *buf, | |||
| 308 | &xip_mem, &xip_pfn); | 341 | &xip_mem, &xip_pfn); |
| 309 | if (status == -ENODATA) { | 342 | if (status == -ENODATA) { |
| 310 | /* we allocate a new page unmap it */ | 343 | /* we allocate a new page unmap it */ |
| 344 | mutex_lock(&xip_sparse_mutex); | ||
| 311 | status = a_ops->get_xip_mem(mapping, index, 1, | 345 | status = a_ops->get_xip_mem(mapping, index, 1, |
| 312 | &xip_mem, &xip_pfn); | 346 | &xip_mem, &xip_pfn); |
| 347 | mutex_unlock(&xip_sparse_mutex); | ||
| 313 | if (!status) | 348 | if (!status) |
| 314 | /* unmap page at pgoff from all other vmas */ | 349 | /* unmap page at pgoff from all other vmas */ |
| 315 | __xip_unmap(mapping, index); | 350 | __xip_unmap(mapping, index); |
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 757ca983fd99..67a71191136e 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c | |||
| @@ -565,7 +565,7 @@ static struct page *alloc_fresh_huge_page_node(struct hstate *h, int nid) | |||
| 565 | huge_page_order(h)); | 565 | huge_page_order(h)); |
| 566 | if (page) { | 566 | if (page) { |
| 567 | if (arch_prepare_hugepage(page)) { | 567 | if (arch_prepare_hugepage(page)) { |
| 568 | __free_pages(page, HUGETLB_PAGE_ORDER); | 568 | __free_pages(page, huge_page_order(h)); |
| 569 | return NULL; | 569 | return NULL; |
| 570 | } | 570 | } |
| 571 | prep_new_huge_page(h, page, nid); | 571 | prep_new_huge_page(h, page, nid); |
| @@ -665,6 +665,11 @@ static struct page *alloc_buddy_huge_page(struct hstate *h, | |||
| 665 | __GFP_REPEAT|__GFP_NOWARN, | 665 | __GFP_REPEAT|__GFP_NOWARN, |
| 666 | huge_page_order(h)); | 666 | huge_page_order(h)); |
| 667 | 667 | ||
| 668 | if (page && arch_prepare_hugepage(page)) { | ||
| 669 | __free_pages(page, huge_page_order(h)); | ||
| 670 | return NULL; | ||
| 671 | } | ||
| 672 | |||
| 668 | spin_lock(&hugetlb_lock); | 673 | spin_lock(&hugetlb_lock); |
| 669 | if (page) { | 674 | if (page) { |
| 670 | /* | 675 | /* |
| @@ -1937,6 +1942,18 @@ retry: | |||
| 1937 | lock_page(page); | 1942 | lock_page(page); |
| 1938 | } | 1943 | } |
| 1939 | 1944 | ||
| 1945 | /* | ||
| 1946 | * If we are going to COW a private mapping later, we examine the | ||
| 1947 | * pending reservations for this page now. This will ensure that | ||
| 1948 | * any allocations necessary to record that reservation occur outside | ||
| 1949 | * the spinlock. | ||
| 1950 | */ | ||
| 1951 | if (write_access && !(vma->vm_flags & VM_SHARED)) | ||
| 1952 | if (vma_needs_reservation(h, vma, address) < 0) { | ||
| 1953 | ret = VM_FAULT_OOM; | ||
| 1954 | goto backout_unlocked; | ||
| 1955 | } | ||
| 1956 | |||
| 1940 | spin_lock(&mm->page_table_lock); | 1957 | spin_lock(&mm->page_table_lock); |
| 1941 | size = i_size_read(mapping->host) >> huge_page_shift(h); | 1958 | size = i_size_read(mapping->host) >> huge_page_shift(h); |
| 1942 | if (idx >= size) | 1959 | if (idx >= size) |
| @@ -1962,6 +1979,7 @@ out: | |||
| 1962 | 1979 | ||
| 1963 | backout: | 1980 | backout: |
| 1964 | spin_unlock(&mm->page_table_lock); | 1981 | spin_unlock(&mm->page_table_lock); |
| 1982 | backout_unlocked: | ||
| 1965 | unlock_page(page); | 1983 | unlock_page(page); |
| 1966 | put_page(page); | 1984 | put_page(page); |
| 1967 | goto out; | 1985 | goto out; |
| @@ -1973,6 +1991,7 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma, | |||
| 1973 | pte_t *ptep; | 1991 | pte_t *ptep; |
| 1974 | pte_t entry; | 1992 | pte_t entry; |
| 1975 | int ret; | 1993 | int ret; |
| 1994 | struct page *pagecache_page = NULL; | ||
| 1976 | static DEFINE_MUTEX(hugetlb_instantiation_mutex); | 1995 | static DEFINE_MUTEX(hugetlb_instantiation_mutex); |
| 1977 | struct hstate *h = hstate_vma(vma); | 1996 | struct hstate *h = hstate_vma(vma); |
| 1978 | 1997 | ||
| @@ -1989,25 +2008,44 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma, | |||
| 1989 | entry = huge_ptep_get(ptep); | 2008 | entry = huge_ptep_get(ptep); |
| 1990 | if (huge_pte_none(entry)) { | 2009 | if (huge_pte_none(entry)) { |
| 1991 | ret = hugetlb_no_page(mm, vma, address, ptep, write_access); | 2010 | ret = hugetlb_no_page(mm, vma, address, ptep, write_access); |
| 1992 | mutex_unlock(&hugetlb_instantiation_mutex); | 2011 | goto out_unlock; |
| 1993 | return ret; | ||
| 1994 | } | 2012 | } |
| 1995 | 2013 | ||
| 1996 | ret = 0; | 2014 | ret = 0; |
| 1997 | 2015 | ||
| 2016 | /* | ||
| 2017 | * If we are going to COW the mapping later, we examine the pending | ||
| 2018 | * reservations for this page now. This will ensure that any | ||
| 2019 | * allocations necessary to record that reservation occur outside the | ||
| 2020 | * spinlock. For private mappings, we also lookup the pagecache | ||
| 2021 | * page now as it is used to determine if a reservation has been | ||
| 2022 | * consumed. | ||
| 2023 | */ | ||
| 2024 | if (write_access && !pte_write(entry)) { | ||
| 2025 | if (vma_needs_reservation(h, vma, address) < 0) { | ||
| 2026 | ret = VM_FAULT_OOM; | ||
| 2027 | goto out_unlock; | ||
| 2028 | } | ||
| 2029 | |||
| 2030 | if (!(vma->vm_flags & VM_SHARED)) | ||
| 2031 | pagecache_page = hugetlbfs_pagecache_page(h, | ||
| 2032 | vma, address); | ||
| 2033 | } | ||
| 2034 | |||
| 1998 | spin_lock(&mm->page_table_lock); | 2035 | spin_lock(&mm->page_table_lock); |
| 1999 | /* Check for a racing update before calling hugetlb_cow */ | 2036 | /* Check for a racing update before calling hugetlb_cow */ |
| 2000 | if (likely(pte_same(entry, huge_ptep_get(ptep)))) | 2037 | if (likely(pte_same(entry, huge_ptep_get(ptep)))) |
| 2001 | if (write_access && !pte_write(entry)) { | 2038 | if (write_access && !pte_write(entry)) |
| 2002 | struct page *page; | 2039 | ret = hugetlb_cow(mm, vma, address, ptep, entry, |
| 2003 | page = hugetlbfs_pagecache_page(h, vma, address); | 2040 | pagecache_page); |
| 2004 | ret = hugetlb_cow(mm, vma, address, ptep, entry, page); | ||
| 2005 | if (page) { | ||
| 2006 | unlock_page(page); | ||
| 2007 | put_page(page); | ||
| 2008 | } | ||
| 2009 | } | ||
| 2010 | spin_unlock(&mm->page_table_lock); | 2041 | spin_unlock(&mm->page_table_lock); |
| 2042 | |||
| 2043 | if (pagecache_page) { | ||
| 2044 | unlock_page(pagecache_page); | ||
| 2045 | put_page(pagecache_page); | ||
| 2046 | } | ||
| 2047 | |||
| 2048 | out_unlock: | ||
| 2011 | mutex_unlock(&hugetlb_instantiation_mutex); | 2049 | mutex_unlock(&hugetlb_instantiation_mutex); |
| 2012 | 2050 | ||
| 2013 | return ret; | 2051 | return ret; |
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 7056c3bdb478..0f1f7a7374ba 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c | |||
| @@ -796,6 +796,8 @@ int mem_cgroup_shrink_usage(struct mm_struct *mm, gfp_t gfp_mask) | |||
| 796 | 796 | ||
| 797 | if (mem_cgroup_subsys.disabled) | 797 | if (mem_cgroup_subsys.disabled) |
| 798 | return 0; | 798 | return 0; |
| 799 | if (!mm) | ||
| 800 | return 0; | ||
| 799 | 801 | ||
| 800 | rcu_read_lock(); | 802 | rcu_read_lock(); |
| 801 | mem = mem_cgroup_from_task(rcu_dereference(mm->owner)); | 803 | mem = mem_cgroup_from_task(rcu_dereference(mm->owner)); |
diff --git a/mm/mempolicy.c b/mm/mempolicy.c index e550bec20582..83369058ec13 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c | |||
| @@ -803,7 +803,6 @@ static int migrate_to_node(struct mm_struct *mm, int source, int dest, | |||
| 803 | int do_migrate_pages(struct mm_struct *mm, | 803 | int do_migrate_pages(struct mm_struct *mm, |
| 804 | const nodemask_t *from_nodes, const nodemask_t *to_nodes, int flags) | 804 | const nodemask_t *from_nodes, const nodemask_t *to_nodes, int flags) |
| 805 | { | 805 | { |
| 806 | LIST_HEAD(pagelist); | ||
| 807 | int busy = 0; | 806 | int busy = 0; |
| 808 | int err = 0; | 807 | int err = 0; |
| 809 | nodemask_t tmp; | 808 | nodemask_t tmp; |
diff --git a/mm/mm_init.c b/mm/mm_init.c index 936ef2efd892..4e0e26591dfa 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | #include "internal.h" | 12 | #include "internal.h" |
| 13 | 13 | ||
| 14 | #ifdef CONFIG_DEBUG_MEMORY_INIT | 14 | #ifdef CONFIG_DEBUG_MEMORY_INIT |
| 15 | int __meminitdata mminit_loglevel; | 15 | int mminit_loglevel; |
| 16 | 16 | ||
| 17 | #ifndef SECTIONS_SHIFT | 17 | #ifndef SECTIONS_SHIFT |
| 18 | #define SECTIONS_SHIFT 0 | 18 | #define SECTIONS_SHIFT 0 |
| @@ -1030,6 +1030,10 @@ unsigned long do_mmap_pgoff(struct file * file, unsigned long addr, | |||
| 1030 | } else { | 1030 | } else { |
| 1031 | switch (flags & MAP_TYPE) { | 1031 | switch (flags & MAP_TYPE) { |
| 1032 | case MAP_SHARED: | 1032 | case MAP_SHARED: |
| 1033 | /* | ||
| 1034 | * Ignore pgoff. | ||
| 1035 | */ | ||
| 1036 | pgoff = 0; | ||
| 1033 | vm_flags |= VM_SHARED | VM_MAYSHARE; | 1037 | vm_flags |= VM_SHARED | VM_MAYSHARE; |
| 1034 | break; | 1038 | break; |
| 1035 | case MAP_PRIVATE: | 1039 | case MAP_PRIVATE: |
| @@ -2273,14 +2277,14 @@ int install_special_mapping(struct mm_struct *mm, | |||
| 2273 | 2277 | ||
| 2274 | static DEFINE_MUTEX(mm_all_locks_mutex); | 2278 | static DEFINE_MUTEX(mm_all_locks_mutex); |
| 2275 | 2279 | ||
| 2276 | static void vm_lock_anon_vma(struct anon_vma *anon_vma) | 2280 | static void vm_lock_anon_vma(struct mm_struct *mm, struct anon_vma *anon_vma) |
| 2277 | { | 2281 | { |
| 2278 | if (!test_bit(0, (unsigned long *) &anon_vma->head.next)) { | 2282 | if (!test_bit(0, (unsigned long *) &anon_vma->head.next)) { |
| 2279 | /* | 2283 | /* |
| 2280 | * The LSB of head.next can't change from under us | 2284 | * The LSB of head.next can't change from under us |
| 2281 | * because we hold the mm_all_locks_mutex. | 2285 | * because we hold the mm_all_locks_mutex. |
| 2282 | */ | 2286 | */ |
| 2283 | spin_lock(&anon_vma->lock); | 2287 | spin_lock_nest_lock(&anon_vma->lock, &mm->mmap_sem); |
| 2284 | /* | 2288 | /* |
| 2285 | * We can safely modify head.next after taking the | 2289 | * We can safely modify head.next after taking the |
| 2286 | * anon_vma->lock. If some other vma in this mm shares | 2290 | * anon_vma->lock. If some other vma in this mm shares |
| @@ -2296,7 +2300,7 @@ static void vm_lock_anon_vma(struct anon_vma *anon_vma) | |||
| 2296 | } | 2300 | } |
| 2297 | } | 2301 | } |
| 2298 | 2302 | ||
| 2299 | static void vm_lock_mapping(struct address_space *mapping) | 2303 | static void vm_lock_mapping(struct mm_struct *mm, struct address_space *mapping) |
| 2300 | { | 2304 | { |
| 2301 | if (!test_bit(AS_MM_ALL_LOCKS, &mapping->flags)) { | 2305 | if (!test_bit(AS_MM_ALL_LOCKS, &mapping->flags)) { |
| 2302 | /* | 2306 | /* |
| @@ -2310,7 +2314,7 @@ static void vm_lock_mapping(struct address_space *mapping) | |||
| 2310 | */ | 2314 | */ |
| 2311 | if (test_and_set_bit(AS_MM_ALL_LOCKS, &mapping->flags)) | 2315 | if (test_and_set_bit(AS_MM_ALL_LOCKS, &mapping->flags)) |
| 2312 | BUG(); | 2316 | BUG(); |
| 2313 | spin_lock(&mapping->i_mmap_lock); | 2317 | spin_lock_nest_lock(&mapping->i_mmap_lock, &mm->mmap_sem); |
| 2314 | } | 2318 | } |
| 2315 | } | 2319 | } |
| 2316 | 2320 | ||
| @@ -2358,11 +2362,17 @@ int mm_take_all_locks(struct mm_struct *mm) | |||
| 2358 | for (vma = mm->mmap; vma; vma = vma->vm_next) { | 2362 | for (vma = mm->mmap; vma; vma = vma->vm_next) { |
| 2359 | if (signal_pending(current)) | 2363 | if (signal_pending(current)) |
| 2360 | goto out_unlock; | 2364 | goto out_unlock; |
| 2361 | if (vma->anon_vma) | ||
| 2362 | vm_lock_anon_vma(vma->anon_vma); | ||
| 2363 | if (vma->vm_file && vma->vm_file->f_mapping) | 2365 | if (vma->vm_file && vma->vm_file->f_mapping) |
| 2364 | vm_lock_mapping(vma->vm_file->f_mapping); | 2366 | vm_lock_mapping(mm, vma->vm_file->f_mapping); |
| 2367 | } | ||
| 2368 | |||
| 2369 | for (vma = mm->mmap; vma; vma = vma->vm_next) { | ||
| 2370 | if (signal_pending(current)) | ||
| 2371 | goto out_unlock; | ||
| 2372 | if (vma->anon_vma) | ||
| 2373 | vm_lock_anon_vma(mm, vma->anon_vma); | ||
| 2365 | } | 2374 | } |
| 2375 | |||
| 2366 | ret = 0; | 2376 | ret = 0; |
| 2367 | 2377 | ||
| 2368 | out_unlock: | 2378 | out_unlock: |
diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 8a5467ee6265..64e5b4bcd964 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 27 | #include <linux/notifier.h> | 27 | #include <linux/notifier.h> |
| 28 | #include <linux/memcontrol.h> | 28 | #include <linux/memcontrol.h> |
| 29 | #include <linux/security.h> | ||
| 29 | 30 | ||
| 30 | int sysctl_panic_on_oom; | 31 | int sysctl_panic_on_oom; |
| 31 | int sysctl_oom_kill_allocating_task; | 32 | int sysctl_oom_kill_allocating_task; |
| @@ -128,7 +129,8 @@ unsigned long badness(struct task_struct *p, unsigned long uptime) | |||
| 128 | * Superuser processes are usually more important, so we make it | 129 | * Superuser processes are usually more important, so we make it |
| 129 | * less likely that we kill those. | 130 | * less likely that we kill those. |
| 130 | */ | 131 | */ |
| 131 | if (__capable(p, CAP_SYS_ADMIN) || __capable(p, CAP_SYS_RESOURCE)) | 132 | if (has_capability(p, CAP_SYS_ADMIN) || |
| 133 | has_capability(p, CAP_SYS_RESOURCE)) | ||
| 132 | points /= 4; | 134 | points /= 4; |
| 133 | 135 | ||
| 134 | /* | 136 | /* |
| @@ -137,7 +139,7 @@ unsigned long badness(struct task_struct *p, unsigned long uptime) | |||
| 137 | * tend to only have this flag set on applications they think | 139 | * tend to only have this flag set on applications they think |
| 138 | * of as important. | 140 | * of as important. |
| 139 | */ | 141 | */ |
| 140 | if (__capable(p, CAP_SYS_RAWIO)) | 142 | if (has_capability(p, CAP_SYS_RAWIO)) |
| 141 | points /= 4; | 143 | points /= 4; |
| 142 | 144 | ||
| 143 | /* | 145 | /* |
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 401d104d2bb6..e293c58bea58 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
| @@ -694,6 +694,9 @@ static int move_freepages(struct zone *zone, | |||
| 694 | #endif | 694 | #endif |
| 695 | 695 | ||
| 696 | for (page = start_page; page <= end_page;) { | 696 | for (page = start_page; page <= end_page;) { |
| 697 | /* Make sure we are not inadvertently changing nodes */ | ||
| 698 | VM_BUG_ON(page_to_nid(page) != zone_to_nid(zone)); | ||
| 699 | |||
| 697 | if (!pfn_valid_within(page_to_pfn(page))) { | 700 | if (!pfn_valid_within(page_to_pfn(page))) { |
| 698 | page++; | 701 | page++; |
| 699 | continue; | 702 | continue; |
| @@ -2516,6 +2519,10 @@ static void setup_zone_migrate_reserve(struct zone *zone) | |||
| 2516 | continue; | 2519 | continue; |
| 2517 | page = pfn_to_page(pfn); | 2520 | page = pfn_to_page(pfn); |
| 2518 | 2521 | ||
| 2522 | /* Watch out for overlapping nodes */ | ||
| 2523 | if (page_to_nid(page) != zone_to_nid(zone)) | ||
| 2524 | continue; | ||
| 2525 | |||
| 2519 | /* Blocks with reserved pages will never free, skip them. */ | 2526 | /* Blocks with reserved pages will never free, skip them. */ |
| 2520 | if (PageReserved(page)) | 2527 | if (PageReserved(page)) |
| 2521 | continue; | 2528 | continue; |
| @@ -4064,7 +4071,7 @@ void __init set_dma_reserve(unsigned long new_dma_reserve) | |||
| 4064 | } | 4071 | } |
| 4065 | 4072 | ||
| 4066 | #ifndef CONFIG_NEED_MULTIPLE_NODES | 4073 | #ifndef CONFIG_NEED_MULTIPLE_NODES |
| 4067 | struct pglist_data contig_page_data = { .bdata = &bootmem_node_data[0] }; | 4074 | struct pglist_data __refdata contig_page_data = { .bdata = &bootmem_node_data[0] }; |
| 4068 | EXPORT_SYMBOL(contig_page_data); | 4075 | EXPORT_SYMBOL(contig_page_data); |
| 4069 | #endif | 4076 | #endif |
| 4070 | 4077 | ||
| @@ -4437,7 +4444,7 @@ void *__init alloc_large_system_hash(const char *tablename, | |||
| 4437 | do { | 4444 | do { |
| 4438 | size = bucketsize << log2qty; | 4445 | size = bucketsize << log2qty; |
| 4439 | if (flags & HASH_EARLY) | 4446 | if (flags & HASH_EARLY) |
| 4440 | table = alloc_bootmem(size); | 4447 | table = alloc_bootmem_nopanic(size); |
| 4441 | else if (hashdist) | 4448 | else if (hashdist) |
| 4442 | table = __vmalloc(size, GFP_ATOMIC, PAGE_KERNEL); | 4449 | table = __vmalloc(size, GFP_ATOMIC, PAGE_KERNEL); |
| 4443 | else { | 4450 | else { |
diff --git a/mm/page_isolation.c b/mm/page_isolation.c index 3444b58033c8..c69f84fe038d 100644 --- a/mm/page_isolation.c +++ b/mm/page_isolation.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * linux/mm/page_isolation.c | 2 | * linux/mm/page_isolation.c |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <stddef.h> | ||
| 6 | #include <linux/mm.h> | 5 | #include <linux/mm.h> |
| 7 | #include <linux/page-isolation.h> | 6 | #include <linux/page-isolation.h> |
| 8 | #include <linux/pageblock-flags.h> | 7 | #include <linux/pageblock-flags.h> |
diff --git a/mm/quicklist.c b/mm/quicklist.c index 3f703f7cb398..8dbb6805ef35 100644 --- a/mm/quicklist.c +++ b/mm/quicklist.c | |||
| @@ -26,7 +26,10 @@ DEFINE_PER_CPU(struct quicklist, quicklist)[CONFIG_NR_QUICK]; | |||
| 26 | static unsigned long max_pages(unsigned long min_pages) | 26 | static unsigned long max_pages(unsigned long min_pages) |
| 27 | { | 27 | { |
| 28 | unsigned long node_free_pages, max; | 28 | unsigned long node_free_pages, max; |
| 29 | struct zone *zones = NODE_DATA(numa_node_id())->node_zones; | 29 | int node = numa_node_id(); |
| 30 | struct zone *zones = NODE_DATA(node)->node_zones; | ||
| 31 | int num_cpus_on_node; | ||
| 32 | node_to_cpumask_ptr(cpumask_on_node, node); | ||
| 30 | 33 | ||
| 31 | node_free_pages = | 34 | node_free_pages = |
| 32 | #ifdef CONFIG_ZONE_DMA | 35 | #ifdef CONFIG_ZONE_DMA |
| @@ -38,6 +41,10 @@ static unsigned long max_pages(unsigned long min_pages) | |||
| 38 | zone_page_state(&zones[ZONE_NORMAL], NR_FREE_PAGES); | 41 | zone_page_state(&zones[ZONE_NORMAL], NR_FREE_PAGES); |
| 39 | 42 | ||
| 40 | max = node_free_pages / FRACTION_OF_NODE_MEM; | 43 | max = node_free_pages / FRACTION_OF_NODE_MEM; |
| 44 | |||
| 45 | num_cpus_on_node = cpus_weight_nr(*cpumask_on_node); | ||
| 46 | max /= num_cpus_on_node; | ||
| 47 | |||
| 41 | return max(max, min_pages); | 48 | return max(max, min_pages); |
| 42 | } | 49 | } |
| 43 | 50 | ||
| @@ -224,10 +224,14 @@ unsigned long page_address_in_vma(struct page *page, struct vm_area_struct *vma) | |||
| 224 | /* | 224 | /* |
| 225 | * Check that @page is mapped at @address into @mm. | 225 | * Check that @page is mapped at @address into @mm. |
| 226 | * | 226 | * |
| 227 | * If @sync is false, page_check_address may perform a racy check to avoid | ||
| 228 | * the page table lock when the pte is not present (helpful when reclaiming | ||
| 229 | * highly shared pages). | ||
| 230 | * | ||
| 227 | * On success returns with pte mapped and locked. | 231 | * On success returns with pte mapped and locked. |
| 228 | */ | 232 | */ |
| 229 | pte_t *page_check_address(struct page *page, struct mm_struct *mm, | 233 | pte_t *page_check_address(struct page *page, struct mm_struct *mm, |
| 230 | unsigned long address, spinlock_t **ptlp) | 234 | unsigned long address, spinlock_t **ptlp, int sync) |
| 231 | { | 235 | { |
| 232 | pgd_t *pgd; | 236 | pgd_t *pgd; |
| 233 | pud_t *pud; | 237 | pud_t *pud; |
| @@ -249,7 +253,7 @@ pte_t *page_check_address(struct page *page, struct mm_struct *mm, | |||
| 249 | 253 | ||
| 250 | pte = pte_offset_map(pmd, address); | 254 | pte = pte_offset_map(pmd, address); |
| 251 | /* Make a quick check before getting the lock */ | 255 | /* Make a quick check before getting the lock */ |
| 252 | if (!pte_present(*pte)) { | 256 | if (!sync && !pte_present(*pte)) { |
| 253 | pte_unmap(pte); | 257 | pte_unmap(pte); |
| 254 | return NULL; | 258 | return NULL; |
| 255 | } | 259 | } |
| @@ -281,7 +285,7 @@ static int page_referenced_one(struct page *page, | |||
| 281 | if (address == -EFAULT) | 285 | if (address == -EFAULT) |
| 282 | goto out; | 286 | goto out; |
| 283 | 287 | ||
| 284 | pte = page_check_address(page, mm, address, &ptl); | 288 | pte = page_check_address(page, mm, address, &ptl, 0); |
| 285 | if (!pte) | 289 | if (!pte) |
| 286 | goto out; | 290 | goto out; |
| 287 | 291 | ||
| @@ -450,7 +454,7 @@ static int page_mkclean_one(struct page *page, struct vm_area_struct *vma) | |||
| 450 | if (address == -EFAULT) | 454 | if (address == -EFAULT) |
| 451 | goto out; | 455 | goto out; |
| 452 | 456 | ||
| 453 | pte = page_check_address(page, mm, address, &ptl); | 457 | pte = page_check_address(page, mm, address, &ptl, 1); |
| 454 | if (!pte) | 458 | if (!pte) |
| 455 | goto out; | 459 | goto out; |
| 456 | 460 | ||
| @@ -659,23 +663,30 @@ void page_remove_rmap(struct page *page, struct vm_area_struct *vma) | |||
| 659 | } | 663 | } |
| 660 | 664 | ||
| 661 | /* | 665 | /* |
| 662 | * It would be tidy to reset the PageAnon mapping here, | 666 | * Now that the last pte has gone, s390 must transfer dirty |
| 663 | * but that might overwrite a racing page_add_anon_rmap | 667 | * flag from storage key to struct page. We can usually skip |
| 664 | * which increments mapcount after us but sets mapping | 668 | * this if the page is anon, so about to be freed; but perhaps |
| 665 | * before us: so leave the reset to free_hot_cold_page, | 669 | * not if it's in swapcache - there might be another pte slot |
| 666 | * and remember that it's only reliable while mapped. | 670 | * containing the swap entry, but page not yet written to swap. |
| 667 | * Leaving it set also helps swapoff to reinstate ptes | ||
| 668 | * faster for those pages still in swapcache. | ||
| 669 | */ | 671 | */ |
| 670 | if ((!PageAnon(page) || PageSwapCache(page)) && | 672 | if ((!PageAnon(page) || PageSwapCache(page)) && |
| 671 | page_test_dirty(page)) { | 673 | page_test_dirty(page)) { |
| 672 | page_clear_dirty(page); | 674 | page_clear_dirty(page); |
| 673 | set_page_dirty(page); | 675 | set_page_dirty(page); |
| 674 | } | 676 | } |
| 675 | mem_cgroup_uncharge_page(page); | ||
| 676 | 677 | ||
| 678 | mem_cgroup_uncharge_page(page); | ||
| 677 | __dec_zone_page_state(page, | 679 | __dec_zone_page_state(page, |
| 678 | PageAnon(page) ? NR_ANON_PAGES : NR_FILE_MAPPED); | 680 | PageAnon(page) ? NR_ANON_PAGES : NR_FILE_MAPPED); |
| 681 | /* | ||
| 682 | * It would be tidy to reset the PageAnon mapping here, | ||
| 683 | * but that might overwrite a racing page_add_anon_rmap | ||
| 684 | * which increments mapcount after us but sets mapping | ||
| 685 | * before us: so leave the reset to free_hot_cold_page, | ||
| 686 | * and remember that it's only reliable while mapped. | ||
| 687 | * Leaving it set also helps swapoff to reinstate ptes | ||
| 688 | * faster for those pages still in swapcache. | ||
| 689 | */ | ||
| 679 | } | 690 | } |
| 680 | } | 691 | } |
| 681 | 692 | ||
| @@ -697,7 +708,7 @@ static int try_to_unmap_one(struct page *page, struct vm_area_struct *vma, | |||
| 697 | if (address == -EFAULT) | 708 | if (address == -EFAULT) |
| 698 | goto out; | 709 | goto out; |
| 699 | 710 | ||
| 700 | pte = page_check_address(page, mm, address, &ptl); | 711 | pte = page_check_address(page, mm, address, &ptl, 0); |
| 701 | if (!pte) | 712 | if (!pte) |
| 702 | goto out; | 713 | goto out; |
| 703 | 714 | ||
| @@ -2312,7 +2312,7 @@ static int kmem_cache_open(struct kmem_cache *s, gfp_t gfpflags, | |||
| 2312 | 2312 | ||
| 2313 | s->refcount = 1; | 2313 | s->refcount = 1; |
| 2314 | #ifdef CONFIG_NUMA | 2314 | #ifdef CONFIG_NUMA |
| 2315 | s->remote_node_defrag_ratio = 100; | 2315 | s->remote_node_defrag_ratio = 1000; |
| 2316 | #endif | 2316 | #endif |
| 2317 | if (!init_kmem_cache_nodes(s, gfpflags & ~SLUB_DMA)) | 2317 | if (!init_kmem_cache_nodes(s, gfpflags & ~SLUB_DMA)) |
| 2318 | goto error; | 2318 | goto error; |
| @@ -4058,7 +4058,7 @@ static ssize_t remote_node_defrag_ratio_store(struct kmem_cache *s, | |||
| 4058 | if (err) | 4058 | if (err) |
| 4059 | return err; | 4059 | return err; |
| 4060 | 4060 | ||
| 4061 | if (ratio < 100) | 4061 | if (ratio <= 100) |
| 4062 | s->remote_node_defrag_ratio = ratio * 10; | 4062 | s->remote_node_defrag_ratio = ratio * 10; |
| 4063 | 4063 | ||
| 4064 | return length; | 4064 | return length; |
diff --git a/mm/sparse.c b/mm/sparse.c index 5d9dbbb9d39e..39db301b920d 100644 --- a/mm/sparse.c +++ b/mm/sparse.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #include <asm/dma.h> | 12 | #include <asm/dma.h> |
| 13 | #include <asm/pgalloc.h> | 13 | #include <asm/pgalloc.h> |
| 14 | #include <asm/pgtable.h> | 14 | #include <asm/pgtable.h> |
| 15 | #include "internal.h" | ||
| 16 | 15 | ||
| 17 | /* | 16 | /* |
| 18 | * Permanent SPARSEMEM data: | 17 | * Permanent SPARSEMEM data: |
diff --git a/mm/swap_state.c b/mm/swap_state.c index 167cf2dc8a03..797c3831cbec 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c | |||
| @@ -60,7 +60,7 @@ void show_swap_cache_info(void) | |||
| 60 | printk("Swap cache stats: add %lu, delete %lu, find %lu/%lu\n", | 60 | printk("Swap cache stats: add %lu, delete %lu, find %lu/%lu\n", |
| 61 | swap_cache_info.add_total, swap_cache_info.del_total, | 61 | swap_cache_info.add_total, swap_cache_info.del_total, |
| 62 | swap_cache_info.find_success, swap_cache_info.find_total); | 62 | swap_cache_info.find_success, swap_cache_info.find_total); |
| 63 | printk("Free swap = %lukB\n", nr_swap_pages << (PAGE_SHIFT - 10)); | 63 | printk("Free swap = %ldkB\n", nr_swap_pages << (PAGE_SHIFT - 10)); |
| 64 | printk("Total swap = %lukB\n", total_swap_pages << (PAGE_SHIFT - 10)); | 64 | printk("Total swap = %lukB\n", total_swap_pages << (PAGE_SHIFT - 10)); |
| 65 | } | 65 | } |
| 66 | 66 | ||
diff --git a/mm/truncate.c b/mm/truncate.c index 250505091d37..6650c1d878b4 100644 --- a/mm/truncate.c +++ b/mm/truncate.c | |||
| @@ -380,7 +380,7 @@ static int do_launder_page(struct address_space *mapping, struct page *page) | |||
| 380 | * Any pages which are found to be mapped into pagetables are unmapped prior to | 380 | * Any pages which are found to be mapped into pagetables are unmapped prior to |
| 381 | * invalidation. | 381 | * invalidation. |
| 382 | * | 382 | * |
| 383 | * Returns -EIO if any pages could not be invalidated. | 383 | * Returns -EBUSY if any pages could not be invalidated. |
| 384 | */ | 384 | */ |
| 385 | int invalidate_inode_pages2_range(struct address_space *mapping, | 385 | int invalidate_inode_pages2_range(struct address_space *mapping, |
| 386 | pgoff_t start, pgoff_t end) | 386 | pgoff_t start, pgoff_t end) |
| @@ -440,7 +440,7 @@ int invalidate_inode_pages2_range(struct address_space *mapping, | |||
| 440 | ret2 = do_launder_page(mapping, page); | 440 | ret2 = do_launder_page(mapping, page); |
| 441 | if (ret2 == 0) { | 441 | if (ret2 == 0) { |
| 442 | if (!invalidate_complete_page2(mapping, page)) | 442 | if (!invalidate_complete_page2(mapping, page)) |
| 443 | ret2 = -EIO; | 443 | ret2 = -EBUSY; |
| 444 | } | 444 | } |
| 445 | if (ret2 < 0) | 445 | if (ret2 < 0) |
| 446 | ret = ret2; | 446 | ret = ret2; |
| @@ -171,3 +171,18 @@ void arch_pick_mmap_layout(struct mm_struct *mm) | |||
| 171 | mm->unmap_area = arch_unmap_area; | 171 | mm->unmap_area = arch_unmap_area; |
| 172 | } | 172 | } |
| 173 | #endif | 173 | #endif |
| 174 | |||
| 175 | int __attribute__((weak)) get_user_pages_fast(unsigned long start, | ||
| 176 | int nr_pages, int write, struct page **pages) | ||
| 177 | { | ||
| 178 | struct mm_struct *mm = current->mm; | ||
| 179 | int ret; | ||
| 180 | |||
| 181 | down_read(&mm->mmap_sem); | ||
| 182 | ret = get_user_pages(current, mm, start, nr_pages, | ||
| 183 | write, 0, pages, NULL); | ||
| 184 | up_read(&mm->mmap_sem); | ||
| 185 | |||
| 186 | return ret; | ||
| 187 | } | ||
| 188 | EXPORT_SYMBOL_GPL(get_user_pages_fast); | ||
diff --git a/mm/vmstat.c b/mm/vmstat.c index b0d08e667ece..d7826af2fb07 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c | |||
| @@ -516,9 +516,26 @@ static void pagetypeinfo_showblockcount_print(struct seq_file *m, | |||
| 516 | continue; | 516 | continue; |
| 517 | 517 | ||
| 518 | page = pfn_to_page(pfn); | 518 | page = pfn_to_page(pfn); |
| 519 | #ifdef CONFIG_ARCH_FLATMEM_HAS_HOLES | ||
| 520 | /* | ||
| 521 | * Ordinarily, memory holes in flatmem still have a valid | ||
| 522 | * memmap for the PFN range. However, an architecture for | ||
| 523 | * embedded systems (e.g. ARM) can free up the memmap backing | ||
| 524 | * holes to save memory on the assumption the memmap is | ||
| 525 | * never used. The page_zone linkages are then broken even | ||
| 526 | * though pfn_valid() returns true. Skip the page if the | ||
| 527 | * linkages are broken. Even if this test passed, the impact | ||
| 528 | * is that the counters for the movable type are off but | ||
| 529 | * fragmentation monitoring is likely meaningless on small | ||
| 530 | * systems. | ||
| 531 | */ | ||
| 532 | if (page_zone(page) != zone) | ||
| 533 | continue; | ||
| 534 | #endif | ||
| 519 | mtype = get_pageblock_migratetype(page); | 535 | mtype = get_pageblock_migratetype(page); |
| 520 | 536 | ||
| 521 | count[mtype]++; | 537 | if (mtype < MIGRATE_TYPES) |
| 538 | count[mtype]++; | ||
| 522 | } | 539 | } |
| 523 | 540 | ||
| 524 | /* Print counts */ | 541 | /* Print counts */ |
diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c index 4e59df5f8e05..1edfdf4c095b 100644 --- a/net/bluetooth/af_bluetooth.c +++ b/net/bluetooth/af_bluetooth.c | |||
| @@ -456,7 +456,7 @@ static void __exit bt_exit(void) | |||
| 456 | subsys_initcall(bt_init); | 456 | subsys_initcall(bt_init); |
| 457 | module_exit(bt_exit); | 457 | module_exit(bt_exit); |
| 458 | 458 | ||
| 459 | MODULE_AUTHOR("Maxim Krasnyansky <maxk@qualcomm.com>, Marcel Holtmann <marcel@holtmann.org>"); | 459 | MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>"); |
| 460 | MODULE_DESCRIPTION("Bluetooth Core ver " VERSION); | 460 | MODULE_DESCRIPTION("Bluetooth Core ver " VERSION); |
| 461 | MODULE_VERSION(VERSION); | 461 | MODULE_VERSION(VERSION); |
| 462 | MODULE_LICENSE("GPL"); | 462 | MODULE_LICENSE("GPL"); |
diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c index 12bba6207a8d..80ba30cf4b68 100644 --- a/net/bluetooth/bnep/core.c +++ b/net/bluetooth/bnep/core.c | |||
| @@ -736,7 +736,7 @@ MODULE_PARM_DESC(compress_src, "Compress sources headers"); | |||
| 736 | module_param(compress_dst, bool, 0644); | 736 | module_param(compress_dst, bool, 0644); |
| 737 | MODULE_PARM_DESC(compress_dst, "Compress destination headers"); | 737 | MODULE_PARM_DESC(compress_dst, "Compress destination headers"); |
| 738 | 738 | ||
| 739 | MODULE_AUTHOR("David Libault <david.libault@inventel.fr>, Maxim Krasnyansky <maxk@qualcomm.com>"); | 739 | MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>"); |
| 740 | MODULE_DESCRIPTION("Bluetooth BNEP ver " VERSION); | 740 | MODULE_DESCRIPTION("Bluetooth BNEP ver " VERSION); |
| 741 | MODULE_VERSION(VERSION); | 741 | MODULE_VERSION(VERSION); |
| 742 | MODULE_LICENSE("GPL"); | 742 | MODULE_LICENSE("GPL"); |
diff --git a/net/bluetooth/hci_sysfs.c b/net/bluetooth/hci_sysfs.c index c85bf8f678dc..f4f6615cad9f 100644 --- a/net/bluetooth/hci_sysfs.c +++ b/net/bluetooth/hci_sysfs.c | |||
| @@ -3,8 +3,6 @@ | |||
| 3 | #include <linux/kernel.h> | 3 | #include <linux/kernel.h> |
| 4 | #include <linux/init.h> | 4 | #include <linux/init.h> |
| 5 | 5 | ||
| 6 | #include <linux/platform_device.h> | ||
| 7 | |||
| 8 | #include <net/bluetooth/bluetooth.h> | 6 | #include <net/bluetooth/bluetooth.h> |
| 9 | #include <net/bluetooth/hci_core.h> | 7 | #include <net/bluetooth/hci_core.h> |
| 10 | 8 | ||
| @@ -12,10 +10,164 @@ | |||
| 12 | #undef BT_DBG | 10 | #undef BT_DBG |
| 13 | #define BT_DBG(D...) | 11 | #define BT_DBG(D...) |
| 14 | #endif | 12 | #endif |
| 13 | |||
| 14 | struct class *bt_class = NULL; | ||
| 15 | EXPORT_SYMBOL_GPL(bt_class); | ||
| 16 | |||
| 15 | static struct workqueue_struct *btaddconn; | 17 | static struct workqueue_struct *btaddconn; |
| 16 | static struct workqueue_struct *btdelconn; | 18 | static struct workqueue_struct *btdelconn; |
| 17 | 19 | ||
| 18 | static inline char *typetostr(int type) | 20 | static inline char *link_typetostr(int type) |
| 21 | { | ||
| 22 | switch (type) { | ||
| 23 | case ACL_LINK: | ||
| 24 | return "ACL"; | ||
| 25 | case SCO_LINK: | ||
| 26 | return "SCO"; | ||
| 27 | case ESCO_LINK: | ||
| 28 | return "eSCO"; | ||
| 29 | default: | ||
| 30 | return "UNKNOWN"; | ||
| 31 | } | ||
| 32 | } | ||
| 33 | |||
| 34 | static ssize_t show_link_type(struct device *dev, struct device_attribute *attr, char *buf) | ||
| 35 | { | ||
| 36 | struct hci_conn *conn = dev_get_drvdata(dev); | ||
| 37 | return sprintf(buf, "%s\n", link_typetostr(conn->type)); | ||
| 38 | } | ||
| 39 | |||
| 40 | static ssize_t show_link_address(struct device *dev, struct device_attribute *attr, char *buf) | ||
| 41 | { | ||
| 42 | struct hci_conn *conn = dev_get_drvdata(dev); | ||
| 43 | bdaddr_t bdaddr; | ||
| 44 | baswap(&bdaddr, &conn->dst); | ||
| 45 | return sprintf(buf, "%s\n", batostr(&bdaddr)); | ||
| 46 | } | ||
| 47 | |||
| 48 | static ssize_t show_link_features(struct device *dev, struct device_attribute *attr, char *buf) | ||
| 49 | { | ||
| 50 | struct hci_conn *conn = dev_get_drvdata(dev); | ||
| 51 | |||
| 52 | return sprintf(buf, "0x%02x%02x%02x%02x%02x%02x%02x%02x\n", | ||
| 53 | conn->features[0], conn->features[1], | ||
| 54 | conn->features[2], conn->features[3], | ||
| 55 | conn->features[4], conn->features[5], | ||
| 56 | conn->features[6], conn->features[7]); | ||
| 57 | } | ||
| 58 | |||
| 59 | #define LINK_ATTR(_name,_mode,_show,_store) \ | ||
| 60 | struct device_attribute link_attr_##_name = __ATTR(_name,_mode,_show,_store) | ||
| 61 | |||
| 62 | static LINK_ATTR(type, S_IRUGO, show_link_type, NULL); | ||
| 63 | static LINK_ATTR(address, S_IRUGO, show_link_address, NULL); | ||
| 64 | static LINK_ATTR(features, S_IRUGO, show_link_features, NULL); | ||
| 65 | |||
| 66 | static struct attribute *bt_link_attrs[] = { | ||
| 67 | &link_attr_type.attr, | ||
| 68 | &link_attr_address.attr, | ||
| 69 | &link_attr_features.attr, | ||
| 70 | NULL | ||
| 71 | }; | ||
| 72 | |||
| 73 | static struct attribute_group bt_link_group = { | ||
| 74 | .attrs = bt_link_attrs, | ||
| 75 | }; | ||
| 76 | |||
| 77 | static struct attribute_group *bt_link_groups[] = { | ||
| 78 | &bt_link_group, | ||
| 79 | NULL | ||
| 80 | }; | ||
| 81 | |||
| 82 | static void bt_link_release(struct device *dev) | ||
| 83 | { | ||
| 84 | void *data = dev_get_drvdata(dev); | ||
| 85 | kfree(data); | ||
| 86 | } | ||
| 87 | |||
| 88 | static struct device_type bt_link = { | ||
| 89 | .name = "link", | ||
| 90 | .groups = bt_link_groups, | ||
| 91 | .release = bt_link_release, | ||
| 92 | }; | ||
| 93 | |||
| 94 | static void add_conn(struct work_struct *work) | ||
| 95 | { | ||
| 96 | struct hci_conn *conn = container_of(work, struct hci_conn, work); | ||
| 97 | |||
| 98 | flush_workqueue(btdelconn); | ||
| 99 | |||
| 100 | if (device_add(&conn->dev) < 0) { | ||
| 101 | BT_ERR("Failed to register connection device"); | ||
| 102 | return; | ||
| 103 | } | ||
| 104 | } | ||
| 105 | |||
| 106 | void hci_conn_add_sysfs(struct hci_conn *conn) | ||
| 107 | { | ||
| 108 | struct hci_dev *hdev = conn->hdev; | ||
| 109 | |||
| 110 | BT_DBG("conn %p", conn); | ||
| 111 | |||
| 112 | conn->dev.type = &bt_link; | ||
| 113 | conn->dev.class = bt_class; | ||
| 114 | conn->dev.parent = &hdev->dev; | ||
| 115 | |||
| 116 | snprintf(conn->dev.bus_id, BUS_ID_SIZE, "%s:%d", | ||
| 117 | hdev->name, conn->handle); | ||
| 118 | |||
| 119 | dev_set_drvdata(&conn->dev, conn); | ||
| 120 | |||
| 121 | device_initialize(&conn->dev); | ||
| 122 | |||
| 123 | INIT_WORK(&conn->work, add_conn); | ||
| 124 | |||
| 125 | queue_work(btaddconn, &conn->work); | ||
| 126 | } | ||
| 127 | |||
| 128 | /* | ||
| 129 | * The rfcomm tty device will possibly retain even when conn | ||
| 130 | * is down, and sysfs doesn't support move zombie device, | ||
| 131 | * so we should move the device before conn device is destroyed. | ||
| 132 | */ | ||
| 133 | static int __match_tty(struct device *dev, void *data) | ||
| 134 | { | ||
| 135 | return !strncmp(dev->bus_id, "rfcomm", 6); | ||
| 136 | } | ||
| 137 | |||
| 138 | static void del_conn(struct work_struct *work) | ||
| 139 | { | ||
| 140 | struct hci_conn *conn = container_of(work, struct hci_conn, work); | ||
| 141 | struct hci_dev *hdev = conn->hdev; | ||
| 142 | |||
| 143 | while (1) { | ||
| 144 | struct device *dev; | ||
| 145 | |||
| 146 | dev = device_find_child(&conn->dev, NULL, __match_tty); | ||
| 147 | if (!dev) | ||
| 148 | break; | ||
| 149 | device_move(dev, NULL); | ||
| 150 | put_device(dev); | ||
| 151 | } | ||
| 152 | |||
| 153 | device_del(&conn->dev); | ||
| 154 | put_device(&conn->dev); | ||
| 155 | hci_dev_put(hdev); | ||
| 156 | } | ||
| 157 | |||
| 158 | void hci_conn_del_sysfs(struct hci_conn *conn) | ||
| 159 | { | ||
| 160 | BT_DBG("conn %p", conn); | ||
| 161 | |||
| 162 | if (!device_is_registered(&conn->dev)) | ||
| 163 | return; | ||
| 164 | |||
| 165 | INIT_WORK(&conn->work, del_conn); | ||
| 166 | |||
| 167 | queue_work(btdelconn, &conn->work); | ||
| 168 | } | ||
| 169 | |||
| 170 | static inline char *host_typetostr(int type) | ||
| 19 | { | 171 | { |
| 20 | switch (type) { | 172 | switch (type) { |
| 21 | case HCI_VIRTUAL: | 173 | case HCI_VIRTUAL: |
| @@ -40,7 +192,7 @@ static inline char *typetostr(int type) | |||
| 40 | static ssize_t show_type(struct device *dev, struct device_attribute *attr, char *buf) | 192 | static ssize_t show_type(struct device *dev, struct device_attribute *attr, char *buf) |
| 41 | { | 193 | { |
| 42 | struct hci_dev *hdev = dev_get_drvdata(dev); | 194 | struct hci_dev *hdev = dev_get_drvdata(dev); |
| 43 | return sprintf(buf, "%s\n", typetostr(hdev->type)); | 195 | return sprintf(buf, "%s\n", host_typetostr(hdev->type)); |
| 44 | } | 196 | } |
| 45 | 197 | ||
| 46 | static ssize_t show_name(struct device *dev, struct device_attribute *attr, char *buf) | 198 | static ssize_t show_name(struct device *dev, struct device_attribute *attr, char *buf) |
| @@ -221,183 +373,62 @@ static DEVICE_ATTR(sniff_max_interval, S_IRUGO | S_IWUSR, | |||
| 221 | static DEVICE_ATTR(sniff_min_interval, S_IRUGO | S_IWUSR, | 373 | static DEVICE_ATTR(sniff_min_interval, S_IRUGO | S_IWUSR, |
| 222 | show_sniff_min_interval, store_sniff_min_interval); | 374 | show_sniff_min_interval, store_sniff_min_interval); |
| 223 | 375 | ||
| 224 | static struct device_attribute *bt_attrs[] = { | 376 | static struct attribute *bt_host_attrs[] = { |
| 225 | &dev_attr_type, | 377 | &dev_attr_type.attr, |
| 226 | &dev_attr_name, | 378 | &dev_attr_name.attr, |
| 227 | &dev_attr_class, | 379 | &dev_attr_class.attr, |
| 228 | &dev_attr_address, | 380 | &dev_attr_address.attr, |
| 229 | &dev_attr_features, | 381 | &dev_attr_features.attr, |
| 230 | &dev_attr_manufacturer, | 382 | &dev_attr_manufacturer.attr, |
| 231 | &dev_attr_hci_version, | 383 | &dev_attr_hci_version.attr, |
| 232 | &dev_attr_hci_revision, | 384 | &dev_attr_hci_revision.attr, |
| 233 | &dev_attr_inquiry_cache, | 385 | &dev_attr_inquiry_cache.attr, |
| 234 | &dev_attr_idle_timeout, | 386 | &dev_attr_idle_timeout.attr, |
| 235 | &dev_attr_sniff_max_interval, | 387 | &dev_attr_sniff_max_interval.attr, |
| 236 | &dev_attr_sniff_min_interval, | 388 | &dev_attr_sniff_min_interval.attr, |
| 237 | NULL | 389 | NULL |
| 238 | }; | 390 | }; |
| 239 | 391 | ||
| 240 | static ssize_t show_conn_type(struct device *dev, struct device_attribute *attr, char *buf) | 392 | static struct attribute_group bt_host_group = { |
| 241 | { | 393 | .attrs = bt_host_attrs, |
| 242 | struct hci_conn *conn = dev_get_drvdata(dev); | ||
| 243 | return sprintf(buf, "%s\n", conn->type == ACL_LINK ? "ACL" : "SCO"); | ||
| 244 | } | ||
| 245 | |||
| 246 | static ssize_t show_conn_address(struct device *dev, struct device_attribute *attr, char *buf) | ||
| 247 | { | ||
| 248 | struct hci_conn *conn = dev_get_drvdata(dev); | ||
| 249 | bdaddr_t bdaddr; | ||
| 250 | baswap(&bdaddr, &conn->dst); | ||
| 251 | return sprintf(buf, "%s\n", batostr(&bdaddr)); | ||
| 252 | } | ||
| 253 | |||
| 254 | static ssize_t show_conn_features(struct device *dev, struct device_attribute *attr, char *buf) | ||
| 255 | { | ||
| 256 | struct hci_conn *conn = dev_get_drvdata(dev); | ||
| 257 | |||
| 258 | return sprintf(buf, "0x%02x%02x%02x%02x%02x%02x%02x%02x\n", | ||
| 259 | conn->features[0], conn->features[1], | ||
| 260 | conn->features[2], conn->features[3], | ||
| 261 | conn->features[4], conn->features[5], | ||
| 262 | conn->features[6], conn->features[7]); | ||
| 263 | } | ||
| 264 | |||
| 265 | #define CONN_ATTR(_name,_mode,_show,_store) \ | ||
| 266 | struct device_attribute conn_attr_##_name = __ATTR(_name,_mode,_show,_store) | ||
| 267 | |||
| 268 | static CONN_ATTR(type, S_IRUGO, show_conn_type, NULL); | ||
| 269 | static CONN_ATTR(address, S_IRUGO, show_conn_address, NULL); | ||
| 270 | static CONN_ATTR(features, S_IRUGO, show_conn_features, NULL); | ||
| 271 | |||
| 272 | static struct device_attribute *conn_attrs[] = { | ||
| 273 | &conn_attr_type, | ||
| 274 | &conn_attr_address, | ||
| 275 | &conn_attr_features, | ||
| 276 | NULL | ||
| 277 | }; | 394 | }; |
| 278 | 395 | ||
| 279 | struct class *bt_class = NULL; | 396 | static struct attribute_group *bt_host_groups[] = { |
| 280 | EXPORT_SYMBOL_GPL(bt_class); | 397 | &bt_host_group, |
| 281 | 398 | NULL | |
| 282 | static struct bus_type bt_bus = { | ||
| 283 | .name = "bluetooth", | ||
| 284 | }; | 399 | }; |
| 285 | 400 | ||
| 286 | static struct platform_device *bt_platform; | 401 | static void bt_host_release(struct device *dev) |
| 287 | |||
| 288 | static void bt_release(struct device *dev) | ||
| 289 | { | 402 | { |
| 290 | void *data = dev_get_drvdata(dev); | 403 | void *data = dev_get_drvdata(dev); |
| 291 | kfree(data); | 404 | kfree(data); |
| 292 | } | 405 | } |
| 293 | 406 | ||
| 294 | static void add_conn(struct work_struct *work) | 407 | static struct device_type bt_host = { |
| 295 | { | 408 | .name = "host", |
| 296 | struct hci_conn *conn = container_of(work, struct hci_conn, work); | 409 | .groups = bt_host_groups, |
| 297 | int i; | 410 | .release = bt_host_release, |
| 298 | 411 | }; | |
| 299 | flush_workqueue(btdelconn); | ||
| 300 | |||
| 301 | if (device_add(&conn->dev) < 0) { | ||
| 302 | BT_ERR("Failed to register connection device"); | ||
| 303 | return; | ||
| 304 | } | ||
| 305 | |||
| 306 | for (i = 0; conn_attrs[i]; i++) | ||
| 307 | if (device_create_file(&conn->dev, conn_attrs[i]) < 0) | ||
| 308 | BT_ERR("Failed to create connection attribute"); | ||
| 309 | } | ||
| 310 | |||
| 311 | void hci_conn_add_sysfs(struct hci_conn *conn) | ||
| 312 | { | ||
| 313 | struct hci_dev *hdev = conn->hdev; | ||
| 314 | |||
| 315 | BT_DBG("conn %p", conn); | ||
| 316 | |||
| 317 | conn->dev.bus = &bt_bus; | ||
| 318 | conn->dev.parent = &hdev->dev; | ||
| 319 | |||
| 320 | conn->dev.release = bt_release; | ||
| 321 | |||
| 322 | snprintf(conn->dev.bus_id, BUS_ID_SIZE, "%s:%d", | ||
| 323 | hdev->name, conn->handle); | ||
| 324 | |||
| 325 | dev_set_drvdata(&conn->dev, conn); | ||
| 326 | |||
| 327 | device_initialize(&conn->dev); | ||
| 328 | |||
| 329 | INIT_WORK(&conn->work, add_conn); | ||
| 330 | |||
| 331 | queue_work(btaddconn, &conn->work); | ||
| 332 | } | ||
| 333 | |||
| 334 | /* | ||
| 335 | * The rfcomm tty device will possibly retain even when conn | ||
| 336 | * is down, and sysfs doesn't support move zombie device, | ||
| 337 | * so we should move the device before conn device is destroyed. | ||
| 338 | */ | ||
| 339 | static int __match_tty(struct device *dev, void *data) | ||
| 340 | { | ||
| 341 | return !strncmp(dev->bus_id, "rfcomm", 6); | ||
| 342 | } | ||
| 343 | |||
| 344 | static void del_conn(struct work_struct *work) | ||
| 345 | { | ||
| 346 | struct hci_conn *conn = container_of(work, struct hci_conn, work); | ||
| 347 | struct hci_dev *hdev = conn->hdev; | ||
| 348 | |||
| 349 | while (1) { | ||
| 350 | struct device *dev; | ||
| 351 | |||
| 352 | dev = device_find_child(&conn->dev, NULL, __match_tty); | ||
| 353 | if (!dev) | ||
| 354 | break; | ||
| 355 | device_move(dev, NULL); | ||
| 356 | put_device(dev); | ||
| 357 | } | ||
| 358 | |||
| 359 | device_del(&conn->dev); | ||
| 360 | put_device(&conn->dev); | ||
| 361 | hci_dev_put(hdev); | ||
| 362 | } | ||
| 363 | |||
| 364 | void hci_conn_del_sysfs(struct hci_conn *conn) | ||
| 365 | { | ||
| 366 | BT_DBG("conn %p", conn); | ||
| 367 | |||
| 368 | if (!device_is_registered(&conn->dev)) | ||
| 369 | return; | ||
| 370 | |||
| 371 | INIT_WORK(&conn->work, del_conn); | ||
| 372 | |||
| 373 | queue_work(btdelconn, &conn->work); | ||
| 374 | } | ||
| 375 | 412 | ||
| 376 | int hci_register_sysfs(struct hci_dev *hdev) | 413 | int hci_register_sysfs(struct hci_dev *hdev) |
| 377 | { | 414 | { |
| 378 | struct device *dev = &hdev->dev; | 415 | struct device *dev = &hdev->dev; |
| 379 | unsigned int i; | ||
| 380 | int err; | 416 | int err; |
| 381 | 417 | ||
| 382 | BT_DBG("%p name %s type %d", hdev, hdev->name, hdev->type); | 418 | BT_DBG("%p name %s type %d", hdev, hdev->name, hdev->type); |
| 383 | 419 | ||
| 384 | dev->bus = &bt_bus; | 420 | dev->type = &bt_host; |
| 421 | dev->class = bt_class; | ||
| 385 | dev->parent = hdev->parent; | 422 | dev->parent = hdev->parent; |
| 386 | 423 | ||
| 387 | strlcpy(dev->bus_id, hdev->name, BUS_ID_SIZE); | 424 | strlcpy(dev->bus_id, hdev->name, BUS_ID_SIZE); |
| 388 | 425 | ||
| 389 | dev->release = bt_release; | ||
| 390 | |||
| 391 | dev_set_drvdata(dev, hdev); | 426 | dev_set_drvdata(dev, hdev); |
| 392 | 427 | ||
| 393 | err = device_register(dev); | 428 | err = device_register(dev); |
| 394 | if (err < 0) | 429 | if (err < 0) |
| 395 | return err; | 430 | return err; |
| 396 | 431 | ||
| 397 | for (i = 0; bt_attrs[i]; i++) | ||
| 398 | if (device_create_file(dev, bt_attrs[i]) < 0) | ||
| 399 | BT_ERR("Failed to create device attribute"); | ||
| 400 | |||
| 401 | return 0; | 432 | return 0; |
| 402 | } | 433 | } |
| 403 | 434 | ||
| @@ -410,59 +441,30 @@ void hci_unregister_sysfs(struct hci_dev *hdev) | |||
| 410 | 441 | ||
| 411 | int __init bt_sysfs_init(void) | 442 | int __init bt_sysfs_init(void) |
| 412 | { | 443 | { |
| 413 | int err; | ||
| 414 | |||
| 415 | btaddconn = create_singlethread_workqueue("btaddconn"); | 444 | btaddconn = create_singlethread_workqueue("btaddconn"); |
| 416 | if (!btaddconn) { | 445 | if (!btaddconn) |
| 417 | err = -ENOMEM; | 446 | return -ENOMEM; |
| 418 | goto out; | ||
| 419 | } | ||
| 420 | 447 | ||
| 421 | btdelconn = create_singlethread_workqueue("btdelconn"); | 448 | btdelconn = create_singlethread_workqueue("btdelconn"); |
| 422 | if (!btdelconn) { | 449 | if (!btdelconn) { |
| 423 | err = -ENOMEM; | 450 | destroy_workqueue(btaddconn); |
| 424 | goto out_del; | 451 | return -ENOMEM; |
| 425 | } | ||
| 426 | |||
| 427 | bt_platform = platform_device_register_simple("bluetooth", -1, NULL, 0); | ||
| 428 | if (IS_ERR(bt_platform)) { | ||
| 429 | err = PTR_ERR(bt_platform); | ||
| 430 | goto out_platform; | ||
| 431 | } | 452 | } |
| 432 | 453 | ||
| 433 | err = bus_register(&bt_bus); | ||
| 434 | if (err < 0) | ||
| 435 | goto out_bus; | ||
| 436 | |||
| 437 | bt_class = class_create(THIS_MODULE, "bluetooth"); | 454 | bt_class = class_create(THIS_MODULE, "bluetooth"); |
| 438 | if (IS_ERR(bt_class)) { | 455 | if (IS_ERR(bt_class)) { |
| 439 | err = PTR_ERR(bt_class); | 456 | destroy_workqueue(btdelconn); |
| 440 | goto out_class; | 457 | destroy_workqueue(btaddconn); |
| 458 | return PTR_ERR(bt_class); | ||
| 441 | } | 459 | } |
| 442 | 460 | ||
| 443 | return 0; | 461 | return 0; |
| 444 | |||
| 445 | out_class: | ||
| 446 | bus_unregister(&bt_bus); | ||
| 447 | out_bus: | ||
| 448 | platform_device_unregister(bt_platform); | ||
| 449 | out_platform: | ||
| 450 | destroy_workqueue(btdelconn); | ||
| 451 | out_del: | ||
| 452 | destroy_workqueue(btaddconn); | ||
| 453 | out: | ||
| 454 | return err; | ||
| 455 | } | 462 | } |
| 456 | 463 | ||
| 457 | void bt_sysfs_cleanup(void) | 464 | void bt_sysfs_cleanup(void) |
| 458 | { | 465 | { |
| 459 | destroy_workqueue(btaddconn); | 466 | destroy_workqueue(btaddconn); |
| 460 | |||
| 461 | destroy_workqueue(btdelconn); | 467 | destroy_workqueue(btdelconn); |
| 462 | 468 | ||
| 463 | class_destroy(bt_class); | 469 | class_destroy(bt_class); |
| 464 | |||
| 465 | bus_unregister(&bt_bus); | ||
| 466 | |||
| 467 | platform_device_unregister(bt_platform); | ||
| 468 | } | 470 | } |
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c index c1239852834a..3396d5bdef1c 100644 --- a/net/bluetooth/l2cap.c +++ b/net/bluetooth/l2cap.c | |||
| @@ -2516,7 +2516,7 @@ EXPORT_SYMBOL(l2cap_load); | |||
| 2516 | module_init(l2cap_init); | 2516 | module_init(l2cap_init); |
| 2517 | module_exit(l2cap_exit); | 2517 | module_exit(l2cap_exit); |
| 2518 | 2518 | ||
| 2519 | MODULE_AUTHOR("Maxim Krasnyansky <maxk@qualcomm.com>, Marcel Holtmann <marcel@holtmann.org>"); | 2519 | MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>"); |
| 2520 | MODULE_DESCRIPTION("Bluetooth L2CAP ver " VERSION); | 2520 | MODULE_DESCRIPTION("Bluetooth L2CAP ver " VERSION); |
| 2521 | MODULE_VERSION(VERSION); | 2521 | MODULE_VERSION(VERSION); |
| 2522 | MODULE_LICENSE("GPL"); | 2522 | MODULE_LICENSE("GPL"); |
diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c index 6cfc7ba611b3..ba537fae0a4c 100644 --- a/net/bluetooth/rfcomm/core.c +++ b/net/bluetooth/rfcomm/core.c | |||
| @@ -2115,7 +2115,7 @@ MODULE_PARM_DESC(channel_mtu, "Default MTU for the RFCOMM channel"); | |||
| 2115 | module_param(l2cap_mtu, uint, 0644); | 2115 | module_param(l2cap_mtu, uint, 0644); |
| 2116 | MODULE_PARM_DESC(l2cap_mtu, "Default MTU for the L2CAP connection"); | 2116 | MODULE_PARM_DESC(l2cap_mtu, "Default MTU for the L2CAP connection"); |
| 2117 | 2117 | ||
| 2118 | MODULE_AUTHOR("Maxim Krasnyansky <maxk@qualcomm.com>, Marcel Holtmann <marcel@holtmann.org>"); | 2118 | MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>"); |
| 2119 | MODULE_DESCRIPTION("Bluetooth RFCOMM ver " VERSION); | 2119 | MODULE_DESCRIPTION("Bluetooth RFCOMM ver " VERSION); |
| 2120 | MODULE_VERSION(VERSION); | 2120 | MODULE_VERSION(VERSION); |
| 2121 | MODULE_LICENSE("GPL"); | 2121 | MODULE_LICENSE("GPL"); |
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c index 8cda49874868..a16011fedc1d 100644 --- a/net/bluetooth/sco.c +++ b/net/bluetooth/sco.c | |||
| @@ -1002,7 +1002,7 @@ module_exit(sco_exit); | |||
| 1002 | module_param(disable_esco, bool, 0644); | 1002 | module_param(disable_esco, bool, 0644); |
| 1003 | MODULE_PARM_DESC(disable_esco, "Disable eSCO connection creation"); | 1003 | MODULE_PARM_DESC(disable_esco, "Disable eSCO connection creation"); |
| 1004 | 1004 | ||
| 1005 | MODULE_AUTHOR("Maxim Krasnyansky <maxk@qualcomm.com>, Marcel Holtmann <marcel@holtmann.org>"); | 1005 | MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>"); |
| 1006 | MODULE_DESCRIPTION("Bluetooth SCO ver " VERSION); | 1006 | MODULE_DESCRIPTION("Bluetooth SCO ver " VERSION); |
| 1007 | MODULE_VERSION(VERSION); | 1007 | MODULE_VERSION(VERSION); |
| 1008 | MODULE_LICENSE("GPL"); | 1008 | MODULE_LICENSE("GPL"); |
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c index 9b58d70b0e7d..4f52c3d50ebe 100644 --- a/net/bridge/br_device.c +++ b/net/bridge/br_device.c | |||
| @@ -148,11 +148,16 @@ static int br_set_tx_csum(struct net_device *dev, u32 data) | |||
| 148 | } | 148 | } |
| 149 | 149 | ||
| 150 | static struct ethtool_ops br_ethtool_ops = { | 150 | static struct ethtool_ops br_ethtool_ops = { |
| 151 | .get_drvinfo = br_getinfo, | 151 | .get_drvinfo = br_getinfo, |
| 152 | .get_link = ethtool_op_get_link, | 152 | .get_link = ethtool_op_get_link, |
| 153 | .set_sg = br_set_sg, | 153 | .get_tx_csum = ethtool_op_get_tx_csum, |
| 154 | .set_tx_csum = br_set_tx_csum, | 154 | .set_tx_csum = br_set_tx_csum, |
| 155 | .set_tso = br_set_tso, | 155 | .get_sg = ethtool_op_get_sg, |
| 156 | .set_sg = br_set_sg, | ||
| 157 | .get_tso = ethtool_op_get_tso, | ||
| 158 | .set_tso = br_set_tso, | ||
| 159 | .get_ufo = ethtool_op_get_ufo, | ||
| 160 | .get_flags = ethtool_op_get_flags, | ||
| 156 | }; | 161 | }; |
| 157 | 162 | ||
| 158 | void br_dev_setup(struct net_device *dev) | 163 | void br_dev_setup(struct net_device *dev) |
diff --git a/net/core/datagram.c b/net/core/datagram.c index dd61dcad6019..52f577a0f544 100644 --- a/net/core/datagram.c +++ b/net/core/datagram.c | |||
| @@ -339,6 +339,93 @@ fault: | |||
| 339 | return -EFAULT; | 339 | return -EFAULT; |
| 340 | } | 340 | } |
| 341 | 341 | ||
| 342 | /** | ||
| 343 | * skb_copy_datagram_from_iovec - Copy a datagram from an iovec. | ||
| 344 | * @skb: buffer to copy | ||
| 345 | * @offset: offset in the buffer to start copying to | ||
| 346 | * @from: io vector to copy to | ||
| 347 | * @len: amount of data to copy to buffer from iovec | ||
| 348 | * | ||
| 349 | * Returns 0 or -EFAULT. | ||
| 350 | * Note: the iovec is modified during the copy. | ||
| 351 | */ | ||
| 352 | int skb_copy_datagram_from_iovec(struct sk_buff *skb, int offset, | ||
| 353 | struct iovec *from, int len) | ||
| 354 | { | ||
| 355 | int start = skb_headlen(skb); | ||
| 356 | int i, copy = start - offset; | ||
| 357 | |||
| 358 | /* Copy header. */ | ||
| 359 | if (copy > 0) { | ||
| 360 | if (copy > len) | ||
| 361 | copy = len; | ||
| 362 | if (memcpy_fromiovec(skb->data + offset, from, copy)) | ||
| 363 | goto fault; | ||
| 364 | if ((len -= copy) == 0) | ||
| 365 | return 0; | ||
| 366 | offset += copy; | ||
| 367 | } | ||
| 368 | |||
| 369 | /* Copy paged appendix. Hmm... why does this look so complicated? */ | ||
| 370 | for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) { | ||
| 371 | int end; | ||
| 372 | |||
| 373 | WARN_ON(start > offset + len); | ||
| 374 | |||
| 375 | end = start + skb_shinfo(skb)->frags[i].size; | ||
| 376 | if ((copy = end - offset) > 0) { | ||
| 377 | int err; | ||
| 378 | u8 *vaddr; | ||
| 379 | skb_frag_t *frag = &skb_shinfo(skb)->frags[i]; | ||
| 380 | struct page *page = frag->page; | ||
| 381 | |||
| 382 | if (copy > len) | ||
| 383 | copy = len; | ||
| 384 | vaddr = kmap(page); | ||
| 385 | err = memcpy_fromiovec(vaddr + frag->page_offset + | ||
| 386 | offset - start, from, copy); | ||
| 387 | kunmap(page); | ||
| 388 | if (err) | ||
| 389 | goto fault; | ||
| 390 | |||
| 391 | if (!(len -= copy)) | ||
| 392 | return 0; | ||
| 393 | offset += copy; | ||
| 394 | } | ||
| 395 | start = end; | ||
| 396 | } | ||
| 397 | |||
| 398 | if (skb_shinfo(skb)->frag_list) { | ||
| 399 | struct sk_buff *list = skb_shinfo(skb)->frag_list; | ||
| 400 | |||
| 401 | for (; list; list = list->next) { | ||
| 402 | int end; | ||
| 403 | |||
| 404 | WARN_ON(start > offset + len); | ||
| 405 | |||
| 406 | end = start + list->len; | ||
| 407 | if ((copy = end - offset) > 0) { | ||
| 408 | if (copy > len) | ||
| 409 | copy = len; | ||
| 410 | if (skb_copy_datagram_from_iovec(list, | ||
| 411 | offset - start, | ||
| 412 | from, copy)) | ||
| 413 | goto fault; | ||
| 414 | if ((len -= copy) == 0) | ||
| 415 | return 0; | ||
| 416 | offset += copy; | ||
| 417 | } | ||
| 418 | start = end; | ||
| 419 | } | ||
| 420 | } | ||
| 421 | if (!len) | ||
| 422 | return 0; | ||
| 423 | |||
| 424 | fault: | ||
| 425 | return -EFAULT; | ||
| 426 | } | ||
| 427 | EXPORT_SYMBOL(skb_copy_datagram_from_iovec); | ||
| 428 | |||
| 342 | static int skb_copy_and_csum_datagram(const struct sk_buff *skb, int offset, | 429 | static int skb_copy_and_csum_datagram(const struct sk_buff *skb, int offset, |
| 343 | u8 __user *to, int len, | 430 | u8 __user *to, int len, |
| 344 | __wsum *csump) | 431 | __wsum *csump) |
diff --git a/net/core/dev.c b/net/core/dev.c index 600bb23c4c2e..60c51f765887 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
| @@ -1339,19 +1339,23 @@ static void dev_queue_xmit_nit(struct sk_buff *skb, struct net_device *dev) | |||
| 1339 | } | 1339 | } |
| 1340 | 1340 | ||
| 1341 | 1341 | ||
| 1342 | void __netif_schedule(struct Qdisc *q) | 1342 | static inline void __netif_reschedule(struct Qdisc *q) |
| 1343 | { | 1343 | { |
| 1344 | if (!test_and_set_bit(__QDISC_STATE_SCHED, &q->state)) { | 1344 | struct softnet_data *sd; |
| 1345 | struct softnet_data *sd; | 1345 | unsigned long flags; |
| 1346 | unsigned long flags; | ||
| 1347 | 1346 | ||
| 1348 | local_irq_save(flags); | 1347 | local_irq_save(flags); |
| 1349 | sd = &__get_cpu_var(softnet_data); | 1348 | sd = &__get_cpu_var(softnet_data); |
| 1350 | q->next_sched = sd->output_queue; | 1349 | q->next_sched = sd->output_queue; |
| 1351 | sd->output_queue = q; | 1350 | sd->output_queue = q; |
| 1352 | raise_softirq_irqoff(NET_TX_SOFTIRQ); | 1351 | raise_softirq_irqoff(NET_TX_SOFTIRQ); |
| 1353 | local_irq_restore(flags); | 1352 | local_irq_restore(flags); |
| 1354 | } | 1353 | } |
| 1354 | |||
| 1355 | void __netif_schedule(struct Qdisc *q) | ||
| 1356 | { | ||
| 1357 | if (!test_and_set_bit(__QDISC_STATE_SCHED, &q->state)) | ||
| 1358 | __netif_reschedule(q); | ||
| 1355 | } | 1359 | } |
| 1356 | EXPORT_SYMBOL(__netif_schedule); | 1360 | EXPORT_SYMBOL(__netif_schedule); |
| 1357 | 1361 | ||
| @@ -1800,9 +1804,13 @@ gso: | |||
| 1800 | 1804 | ||
| 1801 | spin_lock(root_lock); | 1805 | spin_lock(root_lock); |
| 1802 | 1806 | ||
| 1803 | rc = qdisc_enqueue_root(skb, q); | 1807 | if (unlikely(test_bit(__QDISC_STATE_DEACTIVATED, &q->state))) { |
| 1804 | qdisc_run(q); | 1808 | kfree_skb(skb); |
| 1805 | 1809 | rc = NET_XMIT_DROP; | |
| 1810 | } else { | ||
| 1811 | rc = qdisc_enqueue_root(skb, q); | ||
| 1812 | qdisc_run(q); | ||
| 1813 | } | ||
| 1806 | spin_unlock(root_lock); | 1814 | spin_unlock(root_lock); |
| 1807 | 1815 | ||
| 1808 | goto out; | 1816 | goto out; |
| @@ -1974,15 +1982,17 @@ static void net_tx_action(struct softirq_action *h) | |||
| 1974 | 1982 | ||
| 1975 | head = head->next_sched; | 1983 | head = head->next_sched; |
| 1976 | 1984 | ||
| 1977 | smp_mb__before_clear_bit(); | ||
| 1978 | clear_bit(__QDISC_STATE_SCHED, &q->state); | ||
| 1979 | |||
| 1980 | root_lock = qdisc_lock(q); | 1985 | root_lock = qdisc_lock(q); |
| 1981 | if (spin_trylock(root_lock)) { | 1986 | if (spin_trylock(root_lock)) { |
| 1987 | smp_mb__before_clear_bit(); | ||
| 1988 | clear_bit(__QDISC_STATE_SCHED, | ||
| 1989 | &q->state); | ||
| 1982 | qdisc_run(q); | 1990 | qdisc_run(q); |
| 1983 | spin_unlock(root_lock); | 1991 | spin_unlock(root_lock); |
| 1984 | } else { | 1992 | } else { |
| 1985 | __netif_schedule(q); | 1993 | if (!test_bit(__QDISC_STATE_DEACTIVATED, |
| 1994 | &q->state)) | ||
| 1995 | __netif_reschedule(q); | ||
| 1986 | } | 1996 | } |
| 1987 | } | 1997 | } |
| 1988 | } | 1998 | } |
| @@ -2084,7 +2094,8 @@ static int ing_filter(struct sk_buff *skb) | |||
| 2084 | q = rxq->qdisc; | 2094 | q = rxq->qdisc; |
| 2085 | if (q != &noop_qdisc) { | 2095 | if (q != &noop_qdisc) { |
| 2086 | spin_lock(qdisc_lock(q)); | 2096 | spin_lock(qdisc_lock(q)); |
| 2087 | result = qdisc_enqueue_root(skb, q); | 2097 | if (likely(!test_bit(__QDISC_STATE_DEACTIVATED, &q->state))) |
| 2098 | result = qdisc_enqueue_root(skb, q); | ||
| 2088 | spin_unlock(qdisc_lock(q)); | 2099 | spin_unlock(qdisc_lock(q)); |
| 2089 | } | 2100 | } |
| 2090 | 2101 | ||
diff --git a/net/core/pktgen.c b/net/core/pktgen.c index 526236453908..a756847e3814 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c | |||
| @@ -1961,6 +1961,8 @@ static int pktgen_setup_dev(struct pktgen_dev *pkt_dev, const char *ifname) | |||
| 1961 | */ | 1961 | */ |
| 1962 | static void pktgen_setup_inject(struct pktgen_dev *pkt_dev) | 1962 | static void pktgen_setup_inject(struct pktgen_dev *pkt_dev) |
| 1963 | { | 1963 | { |
| 1964 | int ntxq; | ||
| 1965 | |||
| 1964 | if (!pkt_dev->odev) { | 1966 | if (!pkt_dev->odev) { |
| 1965 | printk(KERN_ERR "pktgen: ERROR: pkt_dev->odev == NULL in " | 1967 | printk(KERN_ERR "pktgen: ERROR: pkt_dev->odev == NULL in " |
| 1966 | "setup_inject.\n"); | 1968 | "setup_inject.\n"); |
| @@ -1969,6 +1971,33 @@ static void pktgen_setup_inject(struct pktgen_dev *pkt_dev) | |||
| 1969 | return; | 1971 | return; |
| 1970 | } | 1972 | } |
| 1971 | 1973 | ||
| 1974 | /* make sure that we don't pick a non-existing transmit queue */ | ||
| 1975 | ntxq = pkt_dev->odev->real_num_tx_queues; | ||
| 1976 | if (ntxq <= num_online_cpus() && (pkt_dev->flags & F_QUEUE_MAP_CPU)) { | ||
| 1977 | printk(KERN_WARNING "pktgen: WARNING: QUEUE_MAP_CPU " | ||
| 1978 | "disabled because CPU count (%d) exceeds number ", | ||
| 1979 | num_online_cpus()); | ||
| 1980 | printk(KERN_WARNING "pktgen: WARNING: of tx queues " | ||
| 1981 | "(%d) on %s \n", ntxq, pkt_dev->odev->name); | ||
| 1982 | pkt_dev->flags &= ~F_QUEUE_MAP_CPU; | ||
| 1983 | } | ||
| 1984 | if (ntxq <= pkt_dev->queue_map_min) { | ||
| 1985 | printk(KERN_WARNING "pktgen: WARNING: Requested " | ||
| 1986 | "queue_map_min (%d) exceeds number of tx\n", | ||
| 1987 | pkt_dev->queue_map_min); | ||
| 1988 | printk(KERN_WARNING "pktgen: WARNING: queues (%d) on " | ||
| 1989 | "%s, resetting\n", ntxq, pkt_dev->odev->name); | ||
| 1990 | pkt_dev->queue_map_min = ntxq - 1; | ||
| 1991 | } | ||
| 1992 | if (ntxq <= pkt_dev->queue_map_max) { | ||
| 1993 | printk(KERN_WARNING "pktgen: WARNING: Requested " | ||
| 1994 | "queue_map_max (%d) exceeds number of tx\n", | ||
| 1995 | pkt_dev->queue_map_max); | ||
| 1996 | printk(KERN_WARNING "pktgen: WARNING: queues (%d) on " | ||
| 1997 | "%s, resetting\n", ntxq, pkt_dev->odev->name); | ||
| 1998 | pkt_dev->queue_map_max = ntxq - 1; | ||
| 1999 | } | ||
| 2000 | |||
| 1972 | /* Default to the interface's mac if not explicitly set. */ | 2001 | /* Default to the interface's mac if not explicitly set. */ |
| 1973 | 2002 | ||
| 1974 | if (is_zero_ether_addr(pkt_dev->src_mac)) | 2003 | if (is_zero_ether_addr(pkt_dev->src_mac)) |
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 84640172d65d..ca1ccdf1ef76 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c | |||
| @@ -2256,14 +2256,7 @@ struct sk_buff *skb_segment(struct sk_buff *skb, int features) | |||
| 2256 | segs = nskb; | 2256 | segs = nskb; |
| 2257 | tail = nskb; | 2257 | tail = nskb; |
| 2258 | 2258 | ||
| 2259 | nskb->dev = skb->dev; | 2259 | __copy_skb_header(nskb, skb); |
| 2260 | skb_copy_queue_mapping(nskb, skb); | ||
| 2261 | nskb->priority = skb->priority; | ||
| 2262 | nskb->protocol = skb->protocol; | ||
| 2263 | nskb->vlan_tci = skb->vlan_tci; | ||
| 2264 | nskb->dst = dst_clone(skb->dst); | ||
| 2265 | memcpy(nskb->cb, skb->cb, sizeof(skb->cb)); | ||
| 2266 | nskb->pkt_type = skb->pkt_type; | ||
| 2267 | nskb->mac_len = skb->mac_len; | 2260 | nskb->mac_len = skb->mac_len; |
| 2268 | 2261 | ||
| 2269 | skb_reserve(nskb, headroom); | 2262 | skb_reserve(nskb, headroom); |
| @@ -2274,6 +2267,7 @@ struct sk_buff *skb_segment(struct sk_buff *skb, int features) | |||
| 2274 | skb_copy_from_linear_data(skb, skb_put(nskb, doffset), | 2267 | skb_copy_from_linear_data(skb, skb_put(nskb, doffset), |
| 2275 | doffset); | 2268 | doffset); |
| 2276 | if (!sg) { | 2269 | if (!sg) { |
| 2270 | nskb->ip_summed = CHECKSUM_NONE; | ||
| 2277 | nskb->csum = skb_copy_and_csum_bits(skb, offset, | 2271 | nskb->csum = skb_copy_and_csum_bits(skb, offset, |
| 2278 | skb_put(nskb, len), | 2272 | skb_put(nskb, len), |
| 2279 | len, 0); | 2273 | len, 0); |
| @@ -2283,8 +2277,6 @@ struct sk_buff *skb_segment(struct sk_buff *skb, int features) | |||
| 2283 | frag = skb_shinfo(nskb)->frags; | 2277 | frag = skb_shinfo(nskb)->frags; |
| 2284 | k = 0; | 2278 | k = 0; |
| 2285 | 2279 | ||
| 2286 | nskb->ip_summed = CHECKSUM_PARTIAL; | ||
| 2287 | nskb->csum = skb->csum; | ||
| 2288 | skb_copy_from_linear_data_offset(skb, offset, | 2280 | skb_copy_from_linear_data_offset(skb, offset, |
| 2289 | skb_put(nskb, hsize), hsize); | 2281 | skb_put(nskb, hsize), hsize); |
| 2290 | 2282 | ||
diff --git a/net/dccp/input.c b/net/dccp/input.c index df2f110df94a..803933ab396d 100644 --- a/net/dccp/input.c +++ b/net/dccp/input.c | |||
| @@ -411,12 +411,6 @@ static int dccp_rcv_request_sent_state_process(struct sock *sk, | |||
| 411 | struct dccp_sock *dp = dccp_sk(sk); | 411 | struct dccp_sock *dp = dccp_sk(sk); |
| 412 | long tstamp = dccp_timestamp(); | 412 | long tstamp = dccp_timestamp(); |
| 413 | 413 | ||
| 414 | /* Stop the REQUEST timer */ | ||
| 415 | inet_csk_clear_xmit_timer(sk, ICSK_TIME_RETRANS); | ||
| 416 | WARN_ON(sk->sk_send_head == NULL); | ||
| 417 | __kfree_skb(sk->sk_send_head); | ||
| 418 | sk->sk_send_head = NULL; | ||
| 419 | |||
| 420 | if (!between48(DCCP_SKB_CB(skb)->dccpd_ack_seq, | 414 | if (!between48(DCCP_SKB_CB(skb)->dccpd_ack_seq, |
| 421 | dp->dccps_awl, dp->dccps_awh)) { | 415 | dp->dccps_awl, dp->dccps_awh)) { |
| 422 | dccp_pr_debug("invalid ackno: S.AWL=%llu, " | 416 | dccp_pr_debug("invalid ackno: S.AWL=%llu, " |
| @@ -441,6 +435,12 @@ static int dccp_rcv_request_sent_state_process(struct sock *sk, | |||
| 441 | DCCP_ACKVEC_STATE_RECEIVED)) | 435 | DCCP_ACKVEC_STATE_RECEIVED)) |
| 442 | goto out_invalid_packet; /* FIXME: change error code */ | 436 | goto out_invalid_packet; /* FIXME: change error code */ |
| 443 | 437 | ||
| 438 | /* Stop the REQUEST timer */ | ||
| 439 | inet_csk_clear_xmit_timer(sk, ICSK_TIME_RETRANS); | ||
| 440 | WARN_ON(sk->sk_send_head == NULL); | ||
| 441 | kfree_skb(sk->sk_send_head); | ||
| 442 | sk->sk_send_head = NULL; | ||
| 443 | |||
| 444 | dp->dccps_isr = DCCP_SKB_CB(skb)->dccpd_seq; | 444 | dp->dccps_isr = DCCP_SKB_CB(skb)->dccpd_seq; |
| 445 | dccp_update_gsr(sk, dp->dccps_isr); | 445 | dccp_update_gsr(sk, dp->dccps_isr); |
| 446 | /* | 446 | /* |
diff --git a/net/dccp/proto.c b/net/dccp/proto.c index b622d9744856..1ca3b26eed0f 100644 --- a/net/dccp/proto.c +++ b/net/dccp/proto.c | |||
| @@ -474,6 +474,11 @@ static int dccp_setsockopt_change(struct sock *sk, int type, | |||
| 474 | 474 | ||
| 475 | if (copy_from_user(&opt, optval, sizeof(opt))) | 475 | if (copy_from_user(&opt, optval, sizeof(opt))) |
| 476 | return -EFAULT; | 476 | return -EFAULT; |
| 477 | /* | ||
| 478 | * rfc4340: 6.1. Change Options | ||
| 479 | */ | ||
| 480 | if (opt.dccpsf_len < 1) | ||
| 481 | return -EINVAL; | ||
| 477 | 482 | ||
| 478 | val = kmalloc(opt.dccpsf_len, GFP_KERNEL); | 483 | val = kmalloc(opt.dccpsf_len, GFP_KERNEL); |
| 479 | if (!val) | 484 | if (!val) |
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c index 91d3d96805d0..b12dae2b0b2d 100644 --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c | |||
| @@ -1029,6 +1029,11 @@ skip: | |||
| 1029 | } | 1029 | } |
| 1030 | } | 1030 | } |
| 1031 | 1031 | ||
| 1032 | static inline bool inetdev_valid_mtu(unsigned mtu) | ||
| 1033 | { | ||
| 1034 | return mtu >= 68; | ||
| 1035 | } | ||
| 1036 | |||
| 1032 | /* Called only under RTNL semaphore */ | 1037 | /* Called only under RTNL semaphore */ |
| 1033 | 1038 | ||
| 1034 | static int inetdev_event(struct notifier_block *this, unsigned long event, | 1039 | static int inetdev_event(struct notifier_block *this, unsigned long event, |
| @@ -1048,6 +1053,10 @@ static int inetdev_event(struct notifier_block *this, unsigned long event, | |||
| 1048 | IN_DEV_CONF_SET(in_dev, NOXFRM, 1); | 1053 | IN_DEV_CONF_SET(in_dev, NOXFRM, 1); |
| 1049 | IN_DEV_CONF_SET(in_dev, NOPOLICY, 1); | 1054 | IN_DEV_CONF_SET(in_dev, NOPOLICY, 1); |
| 1050 | } | 1055 | } |
| 1056 | } else if (event == NETDEV_CHANGEMTU) { | ||
| 1057 | /* Re-enabling IP */ | ||
| 1058 | if (inetdev_valid_mtu(dev->mtu)) | ||
| 1059 | in_dev = inetdev_init(dev); | ||
| 1051 | } | 1060 | } |
| 1052 | goto out; | 1061 | goto out; |
| 1053 | } | 1062 | } |
| @@ -1058,7 +1067,7 @@ static int inetdev_event(struct notifier_block *this, unsigned long event, | |||
| 1058 | dev->ip_ptr = NULL; | 1067 | dev->ip_ptr = NULL; |
| 1059 | break; | 1068 | break; |
| 1060 | case NETDEV_UP: | 1069 | case NETDEV_UP: |
| 1061 | if (dev->mtu < 68) | 1070 | if (!inetdev_valid_mtu(dev->mtu)) |
| 1062 | break; | 1071 | break; |
| 1063 | if (dev->flags & IFF_LOOPBACK) { | 1072 | if (dev->flags & IFF_LOOPBACK) { |
| 1064 | struct in_ifaddr *ifa; | 1073 | struct in_ifaddr *ifa; |
| @@ -1080,9 +1089,9 @@ static int inetdev_event(struct notifier_block *this, unsigned long event, | |||
| 1080 | ip_mc_down(in_dev); | 1089 | ip_mc_down(in_dev); |
| 1081 | break; | 1090 | break; |
| 1082 | case NETDEV_CHANGEMTU: | 1091 | case NETDEV_CHANGEMTU: |
| 1083 | if (dev->mtu >= 68) | 1092 | if (inetdev_valid_mtu(dev->mtu)) |
| 1084 | break; | 1093 | break; |
| 1085 | /* MTU falled under 68, disable IP */ | 1094 | /* disable IP when MTU is not enough */ |
| 1086 | case NETDEV_UNREGISTER: | 1095 | case NETDEV_UNREGISTER: |
| 1087 | inetdev_destroy(in_dev); | 1096 | inetdev_destroy(in_dev); |
| 1088 | break; | 1097 | break; |
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c index 860558633b2c..55c355e63234 100644 --- a/net/ipv4/icmp.c +++ b/net/ipv4/icmp.c | |||
| @@ -204,18 +204,22 @@ static struct sock *icmp_sk(struct net *net) | |||
| 204 | return net->ipv4.icmp_sk[smp_processor_id()]; | 204 | return net->ipv4.icmp_sk[smp_processor_id()]; |
| 205 | } | 205 | } |
| 206 | 206 | ||
| 207 | static inline int icmp_xmit_lock(struct sock *sk) | 207 | static inline struct sock *icmp_xmit_lock(struct net *net) |
| 208 | { | 208 | { |
| 209 | struct sock *sk; | ||
| 210 | |||
| 209 | local_bh_disable(); | 211 | local_bh_disable(); |
| 210 | 212 | ||
| 213 | sk = icmp_sk(net); | ||
| 214 | |||
| 211 | if (unlikely(!spin_trylock(&sk->sk_lock.slock))) { | 215 | if (unlikely(!spin_trylock(&sk->sk_lock.slock))) { |
| 212 | /* This can happen if the output path signals a | 216 | /* This can happen if the output path signals a |
| 213 | * dst_link_failure() for an outgoing ICMP packet. | 217 | * dst_link_failure() for an outgoing ICMP packet. |
| 214 | */ | 218 | */ |
| 215 | local_bh_enable(); | 219 | local_bh_enable(); |
| 216 | return 1; | 220 | return NULL; |
| 217 | } | 221 | } |
| 218 | return 0; | 222 | return sk; |
| 219 | } | 223 | } |
| 220 | 224 | ||
| 221 | static inline void icmp_xmit_unlock(struct sock *sk) | 225 | static inline void icmp_xmit_unlock(struct sock *sk) |
| @@ -354,15 +358,17 @@ static void icmp_reply(struct icmp_bxm *icmp_param, struct sk_buff *skb) | |||
| 354 | struct ipcm_cookie ipc; | 358 | struct ipcm_cookie ipc; |
| 355 | struct rtable *rt = skb->rtable; | 359 | struct rtable *rt = skb->rtable; |
| 356 | struct net *net = dev_net(rt->u.dst.dev); | 360 | struct net *net = dev_net(rt->u.dst.dev); |
| 357 | struct sock *sk = icmp_sk(net); | 361 | struct sock *sk; |
| 358 | struct inet_sock *inet = inet_sk(sk); | 362 | struct inet_sock *inet; |
| 359 | __be32 daddr; | 363 | __be32 daddr; |
| 360 | 364 | ||
| 361 | if (ip_options_echo(&icmp_param->replyopts, skb)) | 365 | if (ip_options_echo(&icmp_param->replyopts, skb)) |
| 362 | return; | 366 | return; |
| 363 | 367 | ||
| 364 | if (icmp_xmit_lock(sk)) | 368 | sk = icmp_xmit_lock(net); |
| 369 | if (sk == NULL) | ||
| 365 | return; | 370 | return; |
| 371 | inet = inet_sk(sk); | ||
| 366 | 372 | ||
| 367 | icmp_param->data.icmph.checksum = 0; | 373 | icmp_param->data.icmph.checksum = 0; |
| 368 | 374 | ||
| @@ -419,7 +425,6 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info) | |||
| 419 | if (!rt) | 425 | if (!rt) |
| 420 | goto out; | 426 | goto out; |
| 421 | net = dev_net(rt->u.dst.dev); | 427 | net = dev_net(rt->u.dst.dev); |
| 422 | sk = icmp_sk(net); | ||
| 423 | 428 | ||
| 424 | /* | 429 | /* |
| 425 | * Find the original header. It is expected to be valid, of course. | 430 | * Find the original header. It is expected to be valid, of course. |
| @@ -483,7 +488,8 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info) | |||
| 483 | } | 488 | } |
| 484 | } | 489 | } |
| 485 | 490 | ||
| 486 | if (icmp_xmit_lock(sk)) | 491 | sk = icmp_xmit_lock(net); |
| 492 | if (sk == NULL) | ||
| 487 | return; | 493 | return; |
| 488 | 494 | ||
| 489 | /* | 495 | /* |
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c index 6203ece53606..f70fac612596 100644 --- a/net/ipv4/igmp.c +++ b/net/ipv4/igmp.c | |||
| @@ -289,6 +289,7 @@ static struct sk_buff *igmpv3_newpack(struct net_device *dev, int size) | |||
| 289 | struct rtable *rt; | 289 | struct rtable *rt; |
| 290 | struct iphdr *pip; | 290 | struct iphdr *pip; |
| 291 | struct igmpv3_report *pig; | 291 | struct igmpv3_report *pig; |
| 292 | struct net *net = dev_net(dev); | ||
| 292 | 293 | ||
| 293 | skb = alloc_skb(size + LL_ALLOCATED_SPACE(dev), GFP_ATOMIC); | 294 | skb = alloc_skb(size + LL_ALLOCATED_SPACE(dev), GFP_ATOMIC); |
| 294 | if (skb == NULL) | 295 | if (skb == NULL) |
| @@ -299,7 +300,7 @@ static struct sk_buff *igmpv3_newpack(struct net_device *dev, int size) | |||
| 299 | .nl_u = { .ip4_u = { | 300 | .nl_u = { .ip4_u = { |
| 300 | .daddr = IGMPV3_ALL_MCR } }, | 301 | .daddr = IGMPV3_ALL_MCR } }, |
| 301 | .proto = IPPROTO_IGMP }; | 302 | .proto = IPPROTO_IGMP }; |
| 302 | if (ip_route_output_key(&init_net, &rt, &fl)) { | 303 | if (ip_route_output_key(net, &rt, &fl)) { |
| 303 | kfree_skb(skb); | 304 | kfree_skb(skb); |
| 304 | return NULL; | 305 | return NULL; |
| 305 | } | 306 | } |
| @@ -629,6 +630,7 @@ static int igmp_send_report(struct in_device *in_dev, struct ip_mc_list *pmc, | |||
| 629 | struct igmphdr *ih; | 630 | struct igmphdr *ih; |
| 630 | struct rtable *rt; | 631 | struct rtable *rt; |
| 631 | struct net_device *dev = in_dev->dev; | 632 | struct net_device *dev = in_dev->dev; |
| 633 | struct net *net = dev_net(dev); | ||
| 632 | __be32 group = pmc ? pmc->multiaddr : 0; | 634 | __be32 group = pmc ? pmc->multiaddr : 0; |
| 633 | __be32 dst; | 635 | __be32 dst; |
| 634 | 636 | ||
| @@ -643,7 +645,7 @@ static int igmp_send_report(struct in_device *in_dev, struct ip_mc_list *pmc, | |||
| 643 | struct flowi fl = { .oif = dev->ifindex, | 645 | struct flowi fl = { .oif = dev->ifindex, |
| 644 | .nl_u = { .ip4_u = { .daddr = dst } }, | 646 | .nl_u = { .ip4_u = { .daddr = dst } }, |
| 645 | .proto = IPPROTO_IGMP }; | 647 | .proto = IPPROTO_IGMP }; |
| 646 | if (ip_route_output_key(&init_net, &rt, &fl)) | 648 | if (ip_route_output_key(net, &rt, &fl)) |
| 647 | return -1; | 649 | return -1; |
| 648 | } | 650 | } |
| 649 | if (rt->rt_src == 0) { | 651 | if (rt->rt_src == 0) { |
| @@ -1196,9 +1198,6 @@ void ip_mc_inc_group(struct in_device *in_dev, __be32 addr) | |||
| 1196 | 1198 | ||
| 1197 | ASSERT_RTNL(); | 1199 | ASSERT_RTNL(); |
| 1198 | 1200 | ||
| 1199 | if (!net_eq(dev_net(in_dev->dev), &init_net)) | ||
| 1200 | return; | ||
| 1201 | |||
| 1202 | for (im=in_dev->mc_list; im; im=im->next) { | 1201 | for (im=in_dev->mc_list; im; im=im->next) { |
| 1203 | if (im->multiaddr == addr) { | 1202 | if (im->multiaddr == addr) { |
| 1204 | im->users++; | 1203 | im->users++; |
| @@ -1278,9 +1277,6 @@ void ip_mc_dec_group(struct in_device *in_dev, __be32 addr) | |||
| 1278 | 1277 | ||
| 1279 | ASSERT_RTNL(); | 1278 | ASSERT_RTNL(); |
| 1280 | 1279 | ||
| 1281 | if (!net_eq(dev_net(in_dev->dev), &init_net)) | ||
| 1282 | return; | ||
| 1283 | |||
| 1284 | for (ip=&in_dev->mc_list; (i=*ip)!=NULL; ip=&i->next) { | 1280 | for (ip=&in_dev->mc_list; (i=*ip)!=NULL; ip=&i->next) { |
| 1285 | if (i->multiaddr==addr) { | 1281 | if (i->multiaddr==addr) { |
| 1286 | if (--i->users == 0) { | 1282 | if (--i->users == 0) { |
| @@ -1308,9 +1304,6 @@ void ip_mc_down(struct in_device *in_dev) | |||
| 1308 | 1304 | ||
| 1309 | ASSERT_RTNL(); | 1305 | ASSERT_RTNL(); |
| 1310 | 1306 | ||
| 1311 | if (!net_eq(dev_net(in_dev->dev), &init_net)) | ||
| 1312 | return; | ||
| 1313 | |||
| 1314 | for (i=in_dev->mc_list; i; i=i->next) | 1307 | for (i=in_dev->mc_list; i; i=i->next) |
| 1315 | igmp_group_dropped(i); | 1308 | igmp_group_dropped(i); |
| 1316 | 1309 | ||
| @@ -1331,9 +1324,6 @@ void ip_mc_init_dev(struct in_device *in_dev) | |||
| 1331 | { | 1324 | { |
| 1332 | ASSERT_RTNL(); | 1325 | ASSERT_RTNL(); |
| 1333 | 1326 | ||
| 1334 | if (!net_eq(dev_net(in_dev->dev), &init_net)) | ||
| 1335 | return; | ||
| 1336 | |||
| 1337 | in_dev->mc_tomb = NULL; | 1327 | in_dev->mc_tomb = NULL; |
| 1338 | #ifdef CONFIG_IP_MULTICAST | 1328 | #ifdef CONFIG_IP_MULTICAST |
| 1339 | in_dev->mr_gq_running = 0; | 1329 | in_dev->mr_gq_running = 0; |
| @@ -1357,9 +1347,6 @@ void ip_mc_up(struct in_device *in_dev) | |||
| 1357 | 1347 | ||
| 1358 | ASSERT_RTNL(); | 1348 | ASSERT_RTNL(); |
| 1359 | 1349 | ||
| 1360 | if (!net_eq(dev_net(in_dev->dev), &init_net)) | ||
| 1361 | return; | ||
| 1362 | |||
| 1363 | ip_mc_inc_group(in_dev, IGMP_ALL_HOSTS); | 1350 | ip_mc_inc_group(in_dev, IGMP_ALL_HOSTS); |
| 1364 | 1351 | ||
| 1365 | for (i=in_dev->mc_list; i; i=i->next) | 1352 | for (i=in_dev->mc_list; i; i=i->next) |
| @@ -1376,9 +1363,6 @@ void ip_mc_destroy_dev(struct in_device *in_dev) | |||
| 1376 | 1363 | ||
| 1377 | ASSERT_RTNL(); | 1364 | ASSERT_RTNL(); |
| 1378 | 1365 | ||
| 1379 | if (!net_eq(dev_net(in_dev->dev), &init_net)) | ||
| 1380 | return; | ||
| 1381 | |||
| 1382 | /* Deactivate timers */ | 1366 | /* Deactivate timers */ |
| 1383 | ip_mc_down(in_dev); | 1367 | ip_mc_down(in_dev); |
| 1384 | 1368 | ||
| @@ -1395,7 +1379,7 @@ void ip_mc_destroy_dev(struct in_device *in_dev) | |||
| 1395 | write_unlock_bh(&in_dev->mc_list_lock); | 1379 | write_unlock_bh(&in_dev->mc_list_lock); |
| 1396 | } | 1380 | } |
| 1397 | 1381 | ||
| 1398 | static struct in_device * ip_mc_find_dev(struct ip_mreqn *imr) | 1382 | static struct in_device *ip_mc_find_dev(struct net *net, struct ip_mreqn *imr) |
| 1399 | { | 1383 | { |
| 1400 | struct flowi fl = { .nl_u = { .ip4_u = | 1384 | struct flowi fl = { .nl_u = { .ip4_u = |
| 1401 | { .daddr = imr->imr_multiaddr.s_addr } } }; | 1385 | { .daddr = imr->imr_multiaddr.s_addr } } }; |
| @@ -1404,19 +1388,19 @@ static struct in_device * ip_mc_find_dev(struct ip_mreqn *imr) | |||
| 1404 | struct in_device *idev = NULL; | 1388 | struct in_device *idev = NULL; |
| 1405 | 1389 | ||
| 1406 | if (imr->imr_ifindex) { | 1390 | if (imr->imr_ifindex) { |
| 1407 | idev = inetdev_by_index(&init_net, imr->imr_ifindex); | 1391 | idev = inetdev_by_index(net, imr->imr_ifindex); |
| 1408 | if (idev) | 1392 | if (idev) |
| 1409 | __in_dev_put(idev); | 1393 | __in_dev_put(idev); |
| 1410 | return idev; | 1394 | return idev; |
| 1411 | } | 1395 | } |
| 1412 | if (imr->imr_address.s_addr) { | 1396 | if (imr->imr_address.s_addr) { |
| 1413 | dev = ip_dev_find(&init_net, imr->imr_address.s_addr); | 1397 | dev = ip_dev_find(net, imr->imr_address.s_addr); |
| 1414 | if (!dev) | 1398 | if (!dev) |
| 1415 | return NULL; | 1399 | return NULL; |
| 1416 | dev_put(dev); | 1400 | dev_put(dev); |
| 1417 | } | 1401 | } |
| 1418 | 1402 | ||
| 1419 | if (!dev && !ip_route_output_key(&init_net, &rt, &fl)) { | 1403 | if (!dev && !ip_route_output_key(net, &rt, &fl)) { |
| 1420 | dev = rt->u.dst.dev; | 1404 | dev = rt->u.dst.dev; |
| 1421 | ip_rt_put(rt); | 1405 | ip_rt_put(rt); |
| 1422 | } | 1406 | } |
| @@ -1754,18 +1738,16 @@ int ip_mc_join_group(struct sock *sk , struct ip_mreqn *imr) | |||
| 1754 | struct ip_mc_socklist *iml=NULL, *i; | 1738 | struct ip_mc_socklist *iml=NULL, *i; |
| 1755 | struct in_device *in_dev; | 1739 | struct in_device *in_dev; |
| 1756 | struct inet_sock *inet = inet_sk(sk); | 1740 | struct inet_sock *inet = inet_sk(sk); |
| 1741 | struct net *net = sock_net(sk); | ||
| 1757 | int ifindex; | 1742 | int ifindex; |
| 1758 | int count = 0; | 1743 | int count = 0; |
| 1759 | 1744 | ||
| 1760 | if (!ipv4_is_multicast(addr)) | 1745 | if (!ipv4_is_multicast(addr)) |
| 1761 | return -EINVAL; | 1746 | return -EINVAL; |
| 1762 | 1747 | ||
| 1763 | if (!net_eq(sock_net(sk), &init_net)) | ||
| 1764 | return -EPROTONOSUPPORT; | ||
| 1765 | |||
| 1766 | rtnl_lock(); | 1748 | rtnl_lock(); |
| 1767 | 1749 | ||
| 1768 | in_dev = ip_mc_find_dev(imr); | 1750 | in_dev = ip_mc_find_dev(net, imr); |
| 1769 | 1751 | ||
| 1770 | if (!in_dev) { | 1752 | if (!in_dev) { |
| 1771 | iml = NULL; | 1753 | iml = NULL; |
| @@ -1827,15 +1809,13 @@ int ip_mc_leave_group(struct sock *sk, struct ip_mreqn *imr) | |||
| 1827 | struct inet_sock *inet = inet_sk(sk); | 1809 | struct inet_sock *inet = inet_sk(sk); |
| 1828 | struct ip_mc_socklist *iml, **imlp; | 1810 | struct ip_mc_socklist *iml, **imlp; |
| 1829 | struct in_device *in_dev; | 1811 | struct in_device *in_dev; |
| 1812 | struct net *net = sock_net(sk); | ||
| 1830 | __be32 group = imr->imr_multiaddr.s_addr; | 1813 | __be32 group = imr->imr_multiaddr.s_addr; |
| 1831 | u32 ifindex; | 1814 | u32 ifindex; |
| 1832 | int ret = -EADDRNOTAVAIL; | 1815 | int ret = -EADDRNOTAVAIL; |
| 1833 | 1816 | ||
| 1834 | if (!net_eq(sock_net(sk), &init_net)) | ||
| 1835 | return -EPROTONOSUPPORT; | ||
| 1836 | |||
| 1837 | rtnl_lock(); | 1817 | rtnl_lock(); |
| 1838 | in_dev = ip_mc_find_dev(imr); | 1818 | in_dev = ip_mc_find_dev(net, imr); |
| 1839 | ifindex = imr->imr_ifindex; | 1819 | ifindex = imr->imr_ifindex; |
| 1840 | for (imlp = &inet->mc_list; (iml = *imlp) != NULL; imlp = &iml->next) { | 1820 | for (imlp = &inet->mc_list; (iml = *imlp) != NULL; imlp = &iml->next) { |
| 1841 | if (iml->multi.imr_multiaddr.s_addr != group) | 1821 | if (iml->multi.imr_multiaddr.s_addr != group) |
| @@ -1873,21 +1853,19 @@ int ip_mc_source(int add, int omode, struct sock *sk, struct | |||
| 1873 | struct in_device *in_dev = NULL; | 1853 | struct in_device *in_dev = NULL; |
| 1874 | struct inet_sock *inet = inet_sk(sk); | 1854 | struct inet_sock *inet = inet_sk(sk); |
| 1875 | struct ip_sf_socklist *psl; | 1855 | struct ip_sf_socklist *psl; |
| 1856 | struct net *net = sock_net(sk); | ||
| 1876 | int leavegroup = 0; | 1857 | int leavegroup = 0; |
| 1877 | int i, j, rv; | 1858 | int i, j, rv; |
| 1878 | 1859 | ||
| 1879 | if (!ipv4_is_multicast(addr)) | 1860 | if (!ipv4_is_multicast(addr)) |
| 1880 | return -EINVAL; | 1861 | return -EINVAL; |
| 1881 | 1862 | ||
| 1882 | if (!net_eq(sock_net(sk), &init_net)) | ||
| 1883 | return -EPROTONOSUPPORT; | ||
| 1884 | |||
| 1885 | rtnl_lock(); | 1863 | rtnl_lock(); |
| 1886 | 1864 | ||
| 1887 | imr.imr_multiaddr.s_addr = mreqs->imr_multiaddr; | 1865 | imr.imr_multiaddr.s_addr = mreqs->imr_multiaddr; |
| 1888 | imr.imr_address.s_addr = mreqs->imr_interface; | 1866 | imr.imr_address.s_addr = mreqs->imr_interface; |
| 1889 | imr.imr_ifindex = ifindex; | 1867 | imr.imr_ifindex = ifindex; |
| 1890 | in_dev = ip_mc_find_dev(&imr); | 1868 | in_dev = ip_mc_find_dev(net, &imr); |
| 1891 | 1869 | ||
| 1892 | if (!in_dev) { | 1870 | if (!in_dev) { |
| 1893 | err = -ENODEV; | 1871 | err = -ENODEV; |
| @@ -2007,6 +1985,7 @@ int ip_mc_msfilter(struct sock *sk, struct ip_msfilter *msf, int ifindex) | |||
| 2007 | struct in_device *in_dev; | 1985 | struct in_device *in_dev; |
| 2008 | struct inet_sock *inet = inet_sk(sk); | 1986 | struct inet_sock *inet = inet_sk(sk); |
| 2009 | struct ip_sf_socklist *newpsl, *psl; | 1987 | struct ip_sf_socklist *newpsl, *psl; |
| 1988 | struct net *net = sock_net(sk); | ||
| 2010 | int leavegroup = 0; | 1989 | int leavegroup = 0; |
| 2011 | 1990 | ||
| 2012 | if (!ipv4_is_multicast(addr)) | 1991 | if (!ipv4_is_multicast(addr)) |
| @@ -2015,15 +1994,12 @@ int ip_mc_msfilter(struct sock *sk, struct ip_msfilter *msf, int ifindex) | |||
| 2015 | msf->imsf_fmode != MCAST_EXCLUDE) | 1994 | msf->imsf_fmode != MCAST_EXCLUDE) |
| 2016 | return -EINVAL; | 1995 | return -EINVAL; |
| 2017 | 1996 | ||
| 2018 | if (!net_eq(sock_net(sk), &init_net)) | ||
| 2019 | return -EPROTONOSUPPORT; | ||
| 2020 | |||
| 2021 | rtnl_lock(); | 1997 | rtnl_lock(); |
| 2022 | 1998 | ||
| 2023 | imr.imr_multiaddr.s_addr = msf->imsf_multiaddr; | 1999 | imr.imr_multiaddr.s_addr = msf->imsf_multiaddr; |
| 2024 | imr.imr_address.s_addr = msf->imsf_interface; | 2000 | imr.imr_address.s_addr = msf->imsf_interface; |
| 2025 | imr.imr_ifindex = ifindex; | 2001 | imr.imr_ifindex = ifindex; |
| 2026 | in_dev = ip_mc_find_dev(&imr); | 2002 | in_dev = ip_mc_find_dev(net, &imr); |
| 2027 | 2003 | ||
| 2028 | if (!in_dev) { | 2004 | if (!in_dev) { |
| 2029 | err = -ENODEV; | 2005 | err = -ENODEV; |
| @@ -2094,19 +2070,17 @@ int ip_mc_msfget(struct sock *sk, struct ip_msfilter *msf, | |||
| 2094 | struct in_device *in_dev; | 2070 | struct in_device *in_dev; |
| 2095 | struct inet_sock *inet = inet_sk(sk); | 2071 | struct inet_sock *inet = inet_sk(sk); |
| 2096 | struct ip_sf_socklist *psl; | 2072 | struct ip_sf_socklist *psl; |
| 2073 | struct net *net = sock_net(sk); | ||
| 2097 | 2074 | ||
| 2098 | if (!ipv4_is_multicast(addr)) | 2075 | if (!ipv4_is_multicast(addr)) |
| 2099 | return -EINVAL; | 2076 | return -EINVAL; |
| 2100 | 2077 | ||
| 2101 | if (!net_eq(sock_net(sk), &init_net)) | ||
| 2102 | return -EPROTONOSUPPORT; | ||
| 2103 | |||
| 2104 | rtnl_lock(); | 2078 | rtnl_lock(); |
| 2105 | 2079 | ||
| 2106 | imr.imr_multiaddr.s_addr = msf->imsf_multiaddr; | 2080 | imr.imr_multiaddr.s_addr = msf->imsf_multiaddr; |
| 2107 | imr.imr_address.s_addr = msf->imsf_interface; | 2081 | imr.imr_address.s_addr = msf->imsf_interface; |
| 2108 | imr.imr_ifindex = 0; | 2082 | imr.imr_ifindex = 0; |
| 2109 | in_dev = ip_mc_find_dev(&imr); | 2083 | in_dev = ip_mc_find_dev(net, &imr); |
| 2110 | 2084 | ||
| 2111 | if (!in_dev) { | 2085 | if (!in_dev) { |
| 2112 | err = -ENODEV; | 2086 | err = -ENODEV; |
| @@ -2163,9 +2137,6 @@ int ip_mc_gsfget(struct sock *sk, struct group_filter *gsf, | |||
| 2163 | if (!ipv4_is_multicast(addr)) | 2137 | if (!ipv4_is_multicast(addr)) |
| 2164 | return -EINVAL; | 2138 | return -EINVAL; |
| 2165 | 2139 | ||
| 2166 | if (!net_eq(sock_net(sk), &init_net)) | ||
| 2167 | return -EPROTONOSUPPORT; | ||
| 2168 | |||
| 2169 | rtnl_lock(); | 2140 | rtnl_lock(); |
| 2170 | 2141 | ||
| 2171 | err = -EADDRNOTAVAIL; | 2142 | err = -EADDRNOTAVAIL; |
| @@ -2246,19 +2217,17 @@ void ip_mc_drop_socket(struct sock *sk) | |||
| 2246 | { | 2217 | { |
| 2247 | struct inet_sock *inet = inet_sk(sk); | 2218 | struct inet_sock *inet = inet_sk(sk); |
| 2248 | struct ip_mc_socklist *iml; | 2219 | struct ip_mc_socklist *iml; |
| 2220 | struct net *net = sock_net(sk); | ||
| 2249 | 2221 | ||
| 2250 | if (inet->mc_list == NULL) | 2222 | if (inet->mc_list == NULL) |
| 2251 | return; | 2223 | return; |
| 2252 | 2224 | ||
| 2253 | if (!net_eq(sock_net(sk), &init_net)) | ||
| 2254 | return; | ||
| 2255 | |||
| 2256 | rtnl_lock(); | 2225 | rtnl_lock(); |
| 2257 | while ((iml = inet->mc_list) != NULL) { | 2226 | while ((iml = inet->mc_list) != NULL) { |
| 2258 | struct in_device *in_dev; | 2227 | struct in_device *in_dev; |
| 2259 | inet->mc_list = iml->next; | 2228 | inet->mc_list = iml->next; |
| 2260 | 2229 | ||
| 2261 | in_dev = inetdev_by_index(&init_net, iml->multi.imr_ifindex); | 2230 | in_dev = inetdev_by_index(net, iml->multi.imr_ifindex); |
| 2262 | (void) ip_mc_leave_src(sk, iml, in_dev); | 2231 | (void) ip_mc_leave_src(sk, iml, in_dev); |
| 2263 | if (in_dev != NULL) { | 2232 | if (in_dev != NULL) { |
| 2264 | ip_mc_dec_group(in_dev, iml->multi.imr_multiaddr.s_addr); | 2233 | ip_mc_dec_group(in_dev, iml->multi.imr_multiaddr.s_addr); |
diff --git a/net/ipv4/ipvs/ip_vs_app.c b/net/ipv4/ipvs/ip_vs_app.c index 1f1897a1a702..201b8ea3020d 100644 --- a/net/ipv4/ipvs/ip_vs_app.c +++ b/net/ipv4/ipvs/ip_vs_app.c | |||
| @@ -608,7 +608,7 @@ int ip_vs_skb_replace(struct sk_buff *skb, gfp_t pri, | |||
| 608 | } | 608 | } |
| 609 | 609 | ||
| 610 | 610 | ||
| 611 | int ip_vs_app_init(void) | 611 | int __init ip_vs_app_init(void) |
| 612 | { | 612 | { |
| 613 | /* we will replace it with proc_net_ipvs_create() soon */ | 613 | /* we will replace it with proc_net_ipvs_create() soon */ |
| 614 | proc_net_fops_create(&init_net, "ip_vs_app", 0, &ip_vs_app_fops); | 614 | proc_net_fops_create(&init_net, "ip_vs_app", 0, &ip_vs_app_fops); |
diff --git a/net/ipv4/ipvs/ip_vs_conn.c b/net/ipv4/ipvs/ip_vs_conn.c index f8bdae47a77f..44a6872dc245 100644 --- a/net/ipv4/ipvs/ip_vs_conn.c +++ b/net/ipv4/ipvs/ip_vs_conn.c | |||
| @@ -965,7 +965,7 @@ static void ip_vs_conn_flush(void) | |||
| 965 | } | 965 | } |
| 966 | 966 | ||
| 967 | 967 | ||
| 968 | int ip_vs_conn_init(void) | 968 | int __init ip_vs_conn_init(void) |
| 969 | { | 969 | { |
| 970 | int idx; | 970 | int idx; |
| 971 | 971 | ||
diff --git a/net/ipv4/ipvs/ip_vs_ctl.c b/net/ipv4/ipvs/ip_vs_ctl.c index 9a5ace0b4dd6..6379705a8dcb 100644 --- a/net/ipv4/ipvs/ip_vs_ctl.c +++ b/net/ipv4/ipvs/ip_vs_ctl.c | |||
| @@ -683,9 +683,22 @@ static void | |||
| 683 | ip_vs_zero_stats(struct ip_vs_stats *stats) | 683 | ip_vs_zero_stats(struct ip_vs_stats *stats) |
| 684 | { | 684 | { |
| 685 | spin_lock_bh(&stats->lock); | 685 | spin_lock_bh(&stats->lock); |
| 686 | memset(stats, 0, (char *)&stats->lock - (char *)stats); | 686 | |
| 687 | spin_unlock_bh(&stats->lock); | 687 | stats->conns = 0; |
| 688 | stats->inpkts = 0; | ||
| 689 | stats->outpkts = 0; | ||
| 690 | stats->inbytes = 0; | ||
| 691 | stats->outbytes = 0; | ||
| 692 | |||
| 693 | stats->cps = 0; | ||
| 694 | stats->inpps = 0; | ||
| 695 | stats->outpps = 0; | ||
| 696 | stats->inbps = 0; | ||
| 697 | stats->outbps = 0; | ||
| 698 | |||
| 688 | ip_vs_zero_estimator(stats); | 699 | ip_vs_zero_estimator(stats); |
| 700 | |||
| 701 | spin_unlock_bh(&stats->lock); | ||
| 689 | } | 702 | } |
| 690 | 703 | ||
| 691 | /* | 704 | /* |
| @@ -1589,7 +1602,7 @@ static struct ctl_table vs_vars[] = { | |||
| 1589 | { .ctl_name = 0 } | 1602 | { .ctl_name = 0 } |
| 1590 | }; | 1603 | }; |
| 1591 | 1604 | ||
| 1592 | struct ctl_path net_vs_ctl_path[] = { | 1605 | const struct ctl_path net_vs_ctl_path[] = { |
| 1593 | { .procname = "net", .ctl_name = CTL_NET, }, | 1606 | { .procname = "net", .ctl_name = CTL_NET, }, |
| 1594 | { .procname = "ipv4", .ctl_name = NET_IPV4, }, | 1607 | { .procname = "ipv4", .ctl_name = NET_IPV4, }, |
| 1595 | { .procname = "vs", }, | 1608 | { .procname = "vs", }, |
| @@ -1784,7 +1797,9 @@ static const struct file_operations ip_vs_info_fops = { | |||
| 1784 | 1797 | ||
| 1785 | #endif | 1798 | #endif |
| 1786 | 1799 | ||
| 1787 | struct ip_vs_stats ip_vs_stats; | 1800 | struct ip_vs_stats ip_vs_stats = { |
| 1801 | .lock = __SPIN_LOCK_UNLOCKED(ip_vs_stats.lock), | ||
| 1802 | }; | ||
| 1788 | 1803 | ||
| 1789 | #ifdef CONFIG_PROC_FS | 1804 | #ifdef CONFIG_PROC_FS |
| 1790 | static int ip_vs_stats_show(struct seq_file *seq, void *v) | 1805 | static int ip_vs_stats_show(struct seq_file *seq, void *v) |
| @@ -2306,7 +2321,7 @@ static struct nf_sockopt_ops ip_vs_sockopts = { | |||
| 2306 | }; | 2321 | }; |
| 2307 | 2322 | ||
| 2308 | 2323 | ||
| 2309 | int ip_vs_control_init(void) | 2324 | int __init ip_vs_control_init(void) |
| 2310 | { | 2325 | { |
| 2311 | int ret; | 2326 | int ret; |
| 2312 | int idx; | 2327 | int idx; |
| @@ -2333,8 +2348,6 @@ int ip_vs_control_init(void) | |||
| 2333 | INIT_LIST_HEAD(&ip_vs_rtable[idx]); | 2348 | INIT_LIST_HEAD(&ip_vs_rtable[idx]); |
| 2334 | } | 2349 | } |
| 2335 | 2350 | ||
| 2336 | memset(&ip_vs_stats, 0, sizeof(ip_vs_stats)); | ||
| 2337 | spin_lock_init(&ip_vs_stats.lock); | ||
| 2338 | ip_vs_new_estimator(&ip_vs_stats); | 2351 | ip_vs_new_estimator(&ip_vs_stats); |
| 2339 | 2352 | ||
| 2340 | /* Hook the defense timer */ | 2353 | /* Hook the defense timer */ |
diff --git a/net/ipv4/ipvs/ip_vs_dh.c b/net/ipv4/ipvs/ip_vs_dh.c index 8afc1503ed20..fa66824d264f 100644 --- a/net/ipv4/ipvs/ip_vs_dh.c +++ b/net/ipv4/ipvs/ip_vs_dh.c | |||
| @@ -233,6 +233,7 @@ static struct ip_vs_scheduler ip_vs_dh_scheduler = | |||
| 233 | .name = "dh", | 233 | .name = "dh", |
| 234 | .refcnt = ATOMIC_INIT(0), | 234 | .refcnt = ATOMIC_INIT(0), |
| 235 | .module = THIS_MODULE, | 235 | .module = THIS_MODULE, |
| 236 | .n_list = LIST_HEAD_INIT(ip_vs_dh_scheduler.n_list), | ||
| 236 | .init_service = ip_vs_dh_init_svc, | 237 | .init_service = ip_vs_dh_init_svc, |
| 237 | .done_service = ip_vs_dh_done_svc, | 238 | .done_service = ip_vs_dh_done_svc, |
| 238 | .update_service = ip_vs_dh_update_svc, | 239 | .update_service = ip_vs_dh_update_svc, |
| @@ -242,7 +243,6 @@ static struct ip_vs_scheduler ip_vs_dh_scheduler = | |||
| 242 | 243 | ||
| 243 | static int __init ip_vs_dh_init(void) | 244 | static int __init ip_vs_dh_init(void) |
| 244 | { | 245 | { |
| 245 | INIT_LIST_HEAD(&ip_vs_dh_scheduler.n_list); | ||
| 246 | return register_ip_vs_scheduler(&ip_vs_dh_scheduler); | 246 | return register_ip_vs_scheduler(&ip_vs_dh_scheduler); |
| 247 | } | 247 | } |
| 248 | 248 | ||
diff --git a/net/ipv4/ipvs/ip_vs_est.c b/net/ipv4/ipvs/ip_vs_est.c index bc04eedd6dbb..5a20f93bd7f9 100644 --- a/net/ipv4/ipvs/ip_vs_est.c +++ b/net/ipv4/ipvs/ip_vs_est.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/types.h> | 17 | #include <linux/types.h> |
| 18 | #include <linux/interrupt.h> | 18 | #include <linux/interrupt.h> |
| 19 | #include <linux/sysctl.h> | 19 | #include <linux/sysctl.h> |
| 20 | #include <linux/list.h> | ||
| 20 | 21 | ||
| 21 | #include <net/ip_vs.h> | 22 | #include <net/ip_vs.h> |
| 22 | 23 | ||
| @@ -44,28 +45,11 @@ | |||
| 44 | */ | 45 | */ |
| 45 | 46 | ||
| 46 | 47 | ||
| 47 | struct ip_vs_estimator | 48 | static void estimation_timer(unsigned long arg); |
| 48 | { | ||
| 49 | struct ip_vs_estimator *next; | ||
| 50 | struct ip_vs_stats *stats; | ||
| 51 | |||
| 52 | u32 last_conns; | ||
| 53 | u32 last_inpkts; | ||
| 54 | u32 last_outpkts; | ||
| 55 | u64 last_inbytes; | ||
| 56 | u64 last_outbytes; | ||
| 57 | |||
| 58 | u32 cps; | ||
| 59 | u32 inpps; | ||
| 60 | u32 outpps; | ||
| 61 | u32 inbps; | ||
| 62 | u32 outbps; | ||
| 63 | }; | ||
| 64 | |||
| 65 | 49 | ||
| 66 | static struct ip_vs_estimator *est_list = NULL; | 50 | static LIST_HEAD(est_list); |
| 67 | static DEFINE_RWLOCK(est_lock); | 51 | static DEFINE_SPINLOCK(est_lock); |
| 68 | static struct timer_list est_timer; | 52 | static DEFINE_TIMER(est_timer, estimation_timer, 0, 0); |
| 69 | 53 | ||
| 70 | static void estimation_timer(unsigned long arg) | 54 | static void estimation_timer(unsigned long arg) |
| 71 | { | 55 | { |
| @@ -76,9 +60,9 @@ static void estimation_timer(unsigned long arg) | |||
| 76 | u64 n_inbytes, n_outbytes; | 60 | u64 n_inbytes, n_outbytes; |
| 77 | u32 rate; | 61 | u32 rate; |
| 78 | 62 | ||
| 79 | read_lock(&est_lock); | 63 | spin_lock(&est_lock); |
| 80 | for (e = est_list; e; e = e->next) { | 64 | list_for_each_entry(e, &est_list, list) { |
| 81 | s = e->stats; | 65 | s = container_of(e, struct ip_vs_stats, est); |
| 82 | 66 | ||
| 83 | spin_lock(&s->lock); | 67 | spin_lock(&s->lock); |
| 84 | n_conns = s->conns; | 68 | n_conns = s->conns; |
| @@ -114,19 +98,16 @@ static void estimation_timer(unsigned long arg) | |||
| 114 | s->outbps = (e->outbps+0xF)>>5; | 98 | s->outbps = (e->outbps+0xF)>>5; |
| 115 | spin_unlock(&s->lock); | 99 | spin_unlock(&s->lock); |
| 116 | } | 100 | } |
| 117 | read_unlock(&est_lock); | 101 | spin_unlock(&est_lock); |
| 118 | mod_timer(&est_timer, jiffies + 2*HZ); | 102 | mod_timer(&est_timer, jiffies + 2*HZ); |
| 119 | } | 103 | } |
| 120 | 104 | ||
| 121 | int ip_vs_new_estimator(struct ip_vs_stats *stats) | 105 | void ip_vs_new_estimator(struct ip_vs_stats *stats) |
| 122 | { | 106 | { |
| 123 | struct ip_vs_estimator *est; | 107 | struct ip_vs_estimator *est = &stats->est; |
| 124 | 108 | ||
| 125 | est = kzalloc(sizeof(*est), GFP_KERNEL); | 109 | INIT_LIST_HEAD(&est->list); |
| 126 | if (est == NULL) | ||
| 127 | return -ENOMEM; | ||
| 128 | 110 | ||
| 129 | est->stats = stats; | ||
| 130 | est->last_conns = stats->conns; | 111 | est->last_conns = stats->conns; |
| 131 | est->cps = stats->cps<<10; | 112 | est->cps = stats->cps<<10; |
| 132 | 113 | ||
| @@ -142,59 +123,40 @@ int ip_vs_new_estimator(struct ip_vs_stats *stats) | |||
| 142 | est->last_outbytes = stats->outbytes; | 123 | est->last_outbytes = stats->outbytes; |
| 143 | est->outbps = stats->outbps<<5; | 124 | est->outbps = stats->outbps<<5; |
| 144 | 125 | ||
| 145 | write_lock_bh(&est_lock); | 126 | spin_lock_bh(&est_lock); |
| 146 | est->next = est_list; | 127 | if (list_empty(&est_list)) |
| 147 | if (est->next == NULL) { | 128 | mod_timer(&est_timer, jiffies + 2 * HZ); |
| 148 | setup_timer(&est_timer, estimation_timer, 0); | 129 | list_add(&est->list, &est_list); |
| 149 | est_timer.expires = jiffies + 2*HZ; | 130 | spin_unlock_bh(&est_lock); |
| 150 | add_timer(&est_timer); | ||
| 151 | } | ||
| 152 | est_list = est; | ||
| 153 | write_unlock_bh(&est_lock); | ||
| 154 | return 0; | ||
| 155 | } | 131 | } |
| 156 | 132 | ||
| 157 | void ip_vs_kill_estimator(struct ip_vs_stats *stats) | 133 | void ip_vs_kill_estimator(struct ip_vs_stats *stats) |
| 158 | { | 134 | { |
| 159 | struct ip_vs_estimator *est, **pest; | 135 | struct ip_vs_estimator *est = &stats->est; |
| 160 | int killed = 0; | 136 | |
| 161 | 137 | spin_lock_bh(&est_lock); | |
| 162 | write_lock_bh(&est_lock); | 138 | list_del(&est->list); |
| 163 | pest = &est_list; | 139 | while (list_empty(&est_list) && try_to_del_timer_sync(&est_timer) < 0) { |
| 164 | while ((est=*pest) != NULL) { | 140 | spin_unlock_bh(&est_lock); |
| 165 | if (est->stats != stats) { | 141 | cpu_relax(); |
| 166 | pest = &est->next; | 142 | spin_lock_bh(&est_lock); |
| 167 | continue; | ||
| 168 | } | ||
| 169 | *pest = est->next; | ||
| 170 | kfree(est); | ||
| 171 | killed++; | ||
| 172 | } | 143 | } |
| 173 | if (killed && est_list == NULL) | 144 | spin_unlock_bh(&est_lock); |
| 174 | del_timer_sync(&est_timer); | ||
| 175 | write_unlock_bh(&est_lock); | ||
| 176 | } | 145 | } |
| 177 | 146 | ||
| 178 | void ip_vs_zero_estimator(struct ip_vs_stats *stats) | 147 | void ip_vs_zero_estimator(struct ip_vs_stats *stats) |
| 179 | { | 148 | { |
| 180 | struct ip_vs_estimator *e; | 149 | struct ip_vs_estimator *est = &stats->est; |
| 181 | 150 | ||
| 182 | write_lock_bh(&est_lock); | 151 | /* set counters zero, caller must hold the stats->lock lock */ |
| 183 | for (e = est_list; e; e = e->next) { | 152 | est->last_inbytes = 0; |
| 184 | if (e->stats != stats) | 153 | est->last_outbytes = 0; |
| 185 | continue; | 154 | est->last_conns = 0; |
| 186 | 155 | est->last_inpkts = 0; | |
| 187 | /* set counters zero */ | 156 | est->last_outpkts = 0; |
| 188 | e->last_conns = 0; | 157 | est->cps = 0; |
| 189 | e->last_inpkts = 0; | 158 | est->inpps = 0; |
| 190 | e->last_outpkts = 0; | 159 | est->outpps = 0; |
| 191 | e->last_inbytes = 0; | 160 | est->inbps = 0; |
| 192 | e->last_outbytes = 0; | 161 | est->outbps = 0; |
| 193 | e->cps = 0; | ||
| 194 | e->inpps = 0; | ||
| 195 | e->outpps = 0; | ||
| 196 | e->inbps = 0; | ||
| 197 | e->outbps = 0; | ||
| 198 | } | ||
| 199 | write_unlock_bh(&est_lock); | ||
| 200 | } | 162 | } |
diff --git a/net/ipv4/ipvs/ip_vs_lblc.c b/net/ipv4/ipvs/ip_vs_lblc.c index 0efa3db4b180..7a6a319f544a 100644 --- a/net/ipv4/ipvs/ip_vs_lblc.c +++ b/net/ipv4/ipvs/ip_vs_lblc.c | |||
| @@ -539,6 +539,7 @@ static struct ip_vs_scheduler ip_vs_lblc_scheduler = | |||
| 539 | .name = "lblc", | 539 | .name = "lblc", |
| 540 | .refcnt = ATOMIC_INIT(0), | 540 | .refcnt = ATOMIC_INIT(0), |
| 541 | .module = THIS_MODULE, | 541 | .module = THIS_MODULE, |
| 542 | .n_list = LIST_HEAD_INIT(ip_vs_lblc_scheduler.n_list), | ||
| 542 | .init_service = ip_vs_lblc_init_svc, | 543 | .init_service = ip_vs_lblc_init_svc, |
| 543 | .done_service = ip_vs_lblc_done_svc, | 544 | .done_service = ip_vs_lblc_done_svc, |
| 544 | .update_service = ip_vs_lblc_update_svc, | 545 | .update_service = ip_vs_lblc_update_svc, |
| @@ -550,7 +551,6 @@ static int __init ip_vs_lblc_init(void) | |||
| 550 | { | 551 | { |
| 551 | int ret; | 552 | int ret; |
| 552 | 553 | ||
| 553 | INIT_LIST_HEAD(&ip_vs_lblc_scheduler.n_list); | ||
| 554 | sysctl_header = register_sysctl_paths(net_vs_ctl_path, vs_vars_table); | 554 | sysctl_header = register_sysctl_paths(net_vs_ctl_path, vs_vars_table); |
| 555 | ret = register_ip_vs_scheduler(&ip_vs_lblc_scheduler); | 555 | ret = register_ip_vs_scheduler(&ip_vs_lblc_scheduler); |
| 556 | if (ret) | 556 | if (ret) |
diff --git a/net/ipv4/ipvs/ip_vs_lblcr.c b/net/ipv4/ipvs/ip_vs_lblcr.c index 8e3bbeb45138..c234e73968a6 100644 --- a/net/ipv4/ipvs/ip_vs_lblcr.c +++ b/net/ipv4/ipvs/ip_vs_lblcr.c | |||
| @@ -728,6 +728,7 @@ static struct ip_vs_scheduler ip_vs_lblcr_scheduler = | |||
| 728 | .name = "lblcr", | 728 | .name = "lblcr", |
| 729 | .refcnt = ATOMIC_INIT(0), | 729 | .refcnt = ATOMIC_INIT(0), |
| 730 | .module = THIS_MODULE, | 730 | .module = THIS_MODULE, |
| 731 | .n_list = LIST_HEAD_INIT(ip_vs_lblcr_scheduler.n_list), | ||
| 731 | .init_service = ip_vs_lblcr_init_svc, | 732 | .init_service = ip_vs_lblcr_init_svc, |
| 732 | .done_service = ip_vs_lblcr_done_svc, | 733 | .done_service = ip_vs_lblcr_done_svc, |
| 733 | .update_service = ip_vs_lblcr_update_svc, | 734 | .update_service = ip_vs_lblcr_update_svc, |
| @@ -739,7 +740,6 @@ static int __init ip_vs_lblcr_init(void) | |||
| 739 | { | 740 | { |
| 740 | int ret; | 741 | int ret; |
| 741 | 742 | ||
| 742 | INIT_LIST_HEAD(&ip_vs_lblcr_scheduler.n_list); | ||
| 743 | sysctl_header = register_sysctl_paths(net_vs_ctl_path, vs_vars_table); | 743 | sysctl_header = register_sysctl_paths(net_vs_ctl_path, vs_vars_table); |
| 744 | ret = register_ip_vs_scheduler(&ip_vs_lblcr_scheduler); | 744 | ret = register_ip_vs_scheduler(&ip_vs_lblcr_scheduler); |
| 745 | if (ret) | 745 | if (ret) |
diff --git a/net/ipv4/ipvs/ip_vs_lc.c b/net/ipv4/ipvs/ip_vs_lc.c index ac9f08e065d5..ebcdbf75ac65 100644 --- a/net/ipv4/ipvs/ip_vs_lc.c +++ b/net/ipv4/ipvs/ip_vs_lc.c | |||
| @@ -98,6 +98,7 @@ static struct ip_vs_scheduler ip_vs_lc_scheduler = { | |||
| 98 | .name = "lc", | 98 | .name = "lc", |
| 99 | .refcnt = ATOMIC_INIT(0), | 99 | .refcnt = ATOMIC_INIT(0), |
| 100 | .module = THIS_MODULE, | 100 | .module = THIS_MODULE, |
| 101 | .n_list = LIST_HEAD_INIT(ip_vs_lc_scheduler.n_list), | ||
| 101 | .init_service = ip_vs_lc_init_svc, | 102 | .init_service = ip_vs_lc_init_svc, |
| 102 | .done_service = ip_vs_lc_done_svc, | 103 | .done_service = ip_vs_lc_done_svc, |
| 103 | .update_service = ip_vs_lc_update_svc, | 104 | .update_service = ip_vs_lc_update_svc, |
| @@ -107,7 +108,6 @@ static struct ip_vs_scheduler ip_vs_lc_scheduler = { | |||
| 107 | 108 | ||
| 108 | static int __init ip_vs_lc_init(void) | 109 | static int __init ip_vs_lc_init(void) |
| 109 | { | 110 | { |
| 110 | INIT_LIST_HEAD(&ip_vs_lc_scheduler.n_list); | ||
| 111 | return register_ip_vs_scheduler(&ip_vs_lc_scheduler) ; | 111 | return register_ip_vs_scheduler(&ip_vs_lc_scheduler) ; |
| 112 | } | 112 | } |
| 113 | 113 | ||
diff --git a/net/ipv4/ipvs/ip_vs_nq.c b/net/ipv4/ipvs/ip_vs_nq.c index a46bf258d420..92f3a6770031 100644 --- a/net/ipv4/ipvs/ip_vs_nq.c +++ b/net/ipv4/ipvs/ip_vs_nq.c | |||
| @@ -136,6 +136,7 @@ static struct ip_vs_scheduler ip_vs_nq_scheduler = | |||
| 136 | .name = "nq", | 136 | .name = "nq", |
| 137 | .refcnt = ATOMIC_INIT(0), | 137 | .refcnt = ATOMIC_INIT(0), |
| 138 | .module = THIS_MODULE, | 138 | .module = THIS_MODULE, |
| 139 | .n_list = LIST_HEAD_INIT(ip_vs_nq_scheduler.n_list), | ||
| 139 | .init_service = ip_vs_nq_init_svc, | 140 | .init_service = ip_vs_nq_init_svc, |
| 140 | .done_service = ip_vs_nq_done_svc, | 141 | .done_service = ip_vs_nq_done_svc, |
| 141 | .update_service = ip_vs_nq_update_svc, | 142 | .update_service = ip_vs_nq_update_svc, |
| @@ -145,7 +146,6 @@ static struct ip_vs_scheduler ip_vs_nq_scheduler = | |||
| 145 | 146 | ||
| 146 | static int __init ip_vs_nq_init(void) | 147 | static int __init ip_vs_nq_init(void) |
| 147 | { | 148 | { |
| 148 | INIT_LIST_HEAD(&ip_vs_nq_scheduler.n_list); | ||
| 149 | return register_ip_vs_scheduler(&ip_vs_nq_scheduler); | 149 | return register_ip_vs_scheduler(&ip_vs_nq_scheduler); |
| 150 | } | 150 | } |
| 151 | 151 | ||
diff --git a/net/ipv4/ipvs/ip_vs_proto.c b/net/ipv4/ipvs/ip_vs_proto.c index 876714f23d65..6099a88fc200 100644 --- a/net/ipv4/ipvs/ip_vs_proto.c +++ b/net/ipv4/ipvs/ip_vs_proto.c | |||
| @@ -43,7 +43,7 @@ static struct ip_vs_protocol *ip_vs_proto_table[IP_VS_PROTO_TAB_SIZE]; | |||
| 43 | /* | 43 | /* |
| 44 | * register an ipvs protocol | 44 | * register an ipvs protocol |
| 45 | */ | 45 | */ |
| 46 | static int __used register_ip_vs_protocol(struct ip_vs_protocol *pp) | 46 | static int __used __init register_ip_vs_protocol(struct ip_vs_protocol *pp) |
| 47 | { | 47 | { |
| 48 | unsigned hash = IP_VS_PROTO_HASH(pp->protocol); | 48 | unsigned hash = IP_VS_PROTO_HASH(pp->protocol); |
| 49 | 49 | ||
| @@ -190,7 +190,7 @@ ip_vs_tcpudp_debug_packet(struct ip_vs_protocol *pp, | |||
| 190 | } | 190 | } |
| 191 | 191 | ||
| 192 | 192 | ||
| 193 | int ip_vs_protocol_init(void) | 193 | int __init ip_vs_protocol_init(void) |
| 194 | { | 194 | { |
| 195 | char protocols[64]; | 195 | char protocols[64]; |
| 196 | #define REGISTER_PROTOCOL(p) \ | 196 | #define REGISTER_PROTOCOL(p) \ |
diff --git a/net/ipv4/ipvs/ip_vs_rr.c b/net/ipv4/ipvs/ip_vs_rr.c index c8db12d39e61..358110d17e59 100644 --- a/net/ipv4/ipvs/ip_vs_rr.c +++ b/net/ipv4/ipvs/ip_vs_rr.c | |||
| @@ -94,6 +94,7 @@ static struct ip_vs_scheduler ip_vs_rr_scheduler = { | |||
| 94 | .name = "rr", /* name */ | 94 | .name = "rr", /* name */ |
| 95 | .refcnt = ATOMIC_INIT(0), | 95 | .refcnt = ATOMIC_INIT(0), |
| 96 | .module = THIS_MODULE, | 96 | .module = THIS_MODULE, |
| 97 | .n_list = LIST_HEAD_INIT(ip_vs_rr_scheduler.n_list), | ||
| 97 | .init_service = ip_vs_rr_init_svc, | 98 | .init_service = ip_vs_rr_init_svc, |
| 98 | .done_service = ip_vs_rr_done_svc, | 99 | .done_service = ip_vs_rr_done_svc, |
| 99 | .update_service = ip_vs_rr_update_svc, | 100 | .update_service = ip_vs_rr_update_svc, |
| @@ -102,7 +103,6 @@ static struct ip_vs_scheduler ip_vs_rr_scheduler = { | |||
| 102 | 103 | ||
| 103 | static int __init ip_vs_rr_init(void) | 104 | static int __init ip_vs_rr_init(void) |
| 104 | { | 105 | { |
| 105 | INIT_LIST_HEAD(&ip_vs_rr_scheduler.n_list); | ||
| 106 | return register_ip_vs_scheduler(&ip_vs_rr_scheduler); | 106 | return register_ip_vs_scheduler(&ip_vs_rr_scheduler); |
| 107 | } | 107 | } |
| 108 | 108 | ||
diff --git a/net/ipv4/ipvs/ip_vs_sched.c b/net/ipv4/ipvs/ip_vs_sched.c index b64767309855..a46ad9e35016 100644 --- a/net/ipv4/ipvs/ip_vs_sched.c +++ b/net/ipv4/ipvs/ip_vs_sched.c | |||
| @@ -184,7 +184,7 @@ int register_ip_vs_scheduler(struct ip_vs_scheduler *scheduler) | |||
| 184 | 184 | ||
| 185 | write_lock_bh(&__ip_vs_sched_lock); | 185 | write_lock_bh(&__ip_vs_sched_lock); |
| 186 | 186 | ||
| 187 | if (scheduler->n_list.next != &scheduler->n_list) { | 187 | if (!list_empty(&scheduler->n_list)) { |
| 188 | write_unlock_bh(&__ip_vs_sched_lock); | 188 | write_unlock_bh(&__ip_vs_sched_lock); |
| 189 | ip_vs_use_count_dec(); | 189 | ip_vs_use_count_dec(); |
| 190 | IP_VS_ERR("register_ip_vs_scheduler(): [%s] scheduler " | 190 | IP_VS_ERR("register_ip_vs_scheduler(): [%s] scheduler " |
| @@ -229,7 +229,7 @@ int unregister_ip_vs_scheduler(struct ip_vs_scheduler *scheduler) | |||
| 229 | } | 229 | } |
| 230 | 230 | ||
| 231 | write_lock_bh(&__ip_vs_sched_lock); | 231 | write_lock_bh(&__ip_vs_sched_lock); |
| 232 | if (scheduler->n_list.next == &scheduler->n_list) { | 232 | if (list_empty(&scheduler->n_list)) { |
| 233 | write_unlock_bh(&__ip_vs_sched_lock); | 233 | write_unlock_bh(&__ip_vs_sched_lock); |
| 234 | IP_VS_ERR("unregister_ip_vs_scheduler(): [%s] scheduler " | 234 | IP_VS_ERR("unregister_ip_vs_scheduler(): [%s] scheduler " |
| 235 | "is not in the list. failed\n", scheduler->name); | 235 | "is not in the list. failed\n", scheduler->name); |
diff --git a/net/ipv4/ipvs/ip_vs_sed.c b/net/ipv4/ipvs/ip_vs_sed.c index 2a7d31358181..77663d84cbd1 100644 --- a/net/ipv4/ipvs/ip_vs_sed.c +++ b/net/ipv4/ipvs/ip_vs_sed.c | |||
| @@ -138,6 +138,7 @@ static struct ip_vs_scheduler ip_vs_sed_scheduler = | |||
| 138 | .name = "sed", | 138 | .name = "sed", |
| 139 | .refcnt = ATOMIC_INIT(0), | 139 | .refcnt = ATOMIC_INIT(0), |
| 140 | .module = THIS_MODULE, | 140 | .module = THIS_MODULE, |
| 141 | .n_list = LIST_HEAD_INIT(ip_vs_sed_scheduler.n_list), | ||
| 141 | .init_service = ip_vs_sed_init_svc, | 142 | .init_service = ip_vs_sed_init_svc, |
| 142 | .done_service = ip_vs_sed_done_svc, | 143 | .done_service = ip_vs_sed_done_svc, |
| 143 | .update_service = ip_vs_sed_update_svc, | 144 | .update_service = ip_vs_sed_update_svc, |
| @@ -147,7 +148,6 @@ static struct ip_vs_scheduler ip_vs_sed_scheduler = | |||
| 147 | 148 | ||
| 148 | static int __init ip_vs_sed_init(void) | 149 | static int __init ip_vs_sed_init(void) |
| 149 | { | 150 | { |
| 150 | INIT_LIST_HEAD(&ip_vs_sed_scheduler.n_list); | ||
| 151 | return register_ip_vs_scheduler(&ip_vs_sed_scheduler); | 151 | return register_ip_vs_scheduler(&ip_vs_sed_scheduler); |
| 152 | } | 152 | } |
| 153 | 153 | ||
diff --git a/net/ipv4/ipvs/ip_vs_sh.c b/net/ipv4/ipvs/ip_vs_sh.c index b8fdfac65001..7b979e228056 100644 --- a/net/ipv4/ipvs/ip_vs_sh.c +++ b/net/ipv4/ipvs/ip_vs_sh.c | |||
| @@ -230,6 +230,7 @@ static struct ip_vs_scheduler ip_vs_sh_scheduler = | |||
| 230 | .name = "sh", | 230 | .name = "sh", |
| 231 | .refcnt = ATOMIC_INIT(0), | 231 | .refcnt = ATOMIC_INIT(0), |
| 232 | .module = THIS_MODULE, | 232 | .module = THIS_MODULE, |
| 233 | .n_list = LIST_HEAD_INIT(ip_vs_sh_scheduler.n_list), | ||
| 233 | .init_service = ip_vs_sh_init_svc, | 234 | .init_service = ip_vs_sh_init_svc, |
| 234 | .done_service = ip_vs_sh_done_svc, | 235 | .done_service = ip_vs_sh_done_svc, |
| 235 | .update_service = ip_vs_sh_update_svc, | 236 | .update_service = ip_vs_sh_update_svc, |
| @@ -239,7 +240,6 @@ static struct ip_vs_scheduler ip_vs_sh_scheduler = | |||
| 239 | 240 | ||
| 240 | static int __init ip_vs_sh_init(void) | 241 | static int __init ip_vs_sh_init(void) |
| 241 | { | 242 | { |
| 242 | INIT_LIST_HEAD(&ip_vs_sh_scheduler.n_list); | ||
| 243 | return register_ip_vs_scheduler(&ip_vs_sh_scheduler); | 243 | return register_ip_vs_scheduler(&ip_vs_sh_scheduler); |
| 244 | } | 244 | } |
| 245 | 245 | ||
diff --git a/net/ipv4/ipvs/ip_vs_sync.c b/net/ipv4/ipvs/ip_vs_sync.c index 45e9bd96c286..a652da2c3200 100644 --- a/net/ipv4/ipvs/ip_vs_sync.c +++ b/net/ipv4/ipvs/ip_vs_sync.c | |||
| @@ -904,9 +904,9 @@ int stop_sync_thread(int state) | |||
| 904 | * progress of stopping the master sync daemon. | 904 | * progress of stopping the master sync daemon. |
| 905 | */ | 905 | */ |
| 906 | 906 | ||
| 907 | spin_lock(&ip_vs_sync_lock); | 907 | spin_lock_bh(&ip_vs_sync_lock); |
| 908 | ip_vs_sync_state &= ~IP_VS_STATE_MASTER; | 908 | ip_vs_sync_state &= ~IP_VS_STATE_MASTER; |
| 909 | spin_unlock(&ip_vs_sync_lock); | 909 | spin_unlock_bh(&ip_vs_sync_lock); |
| 910 | kthread_stop(sync_master_thread); | 910 | kthread_stop(sync_master_thread); |
| 911 | sync_master_thread = NULL; | 911 | sync_master_thread = NULL; |
| 912 | } else if (state == IP_VS_STATE_BACKUP) { | 912 | } else if (state == IP_VS_STATE_BACKUP) { |
diff --git a/net/ipv4/ipvs/ip_vs_wlc.c b/net/ipv4/ipvs/ip_vs_wlc.c index 772c3cb4eca1..9b0ef86bb1f7 100644 --- a/net/ipv4/ipvs/ip_vs_wlc.c +++ b/net/ipv4/ipvs/ip_vs_wlc.c | |||
| @@ -126,6 +126,7 @@ static struct ip_vs_scheduler ip_vs_wlc_scheduler = | |||
| 126 | .name = "wlc", | 126 | .name = "wlc", |
| 127 | .refcnt = ATOMIC_INIT(0), | 127 | .refcnt = ATOMIC_INIT(0), |
| 128 | .module = THIS_MODULE, | 128 | .module = THIS_MODULE, |
| 129 | .n_list = LIST_HEAD_INIT(ip_vs_wlc_scheduler.n_list), | ||
| 129 | .init_service = ip_vs_wlc_init_svc, | 130 | .init_service = ip_vs_wlc_init_svc, |
| 130 | .done_service = ip_vs_wlc_done_svc, | 131 | .done_service = ip_vs_wlc_done_svc, |
| 131 | .update_service = ip_vs_wlc_update_svc, | 132 | .update_service = ip_vs_wlc_update_svc, |
| @@ -135,7 +136,6 @@ static struct ip_vs_scheduler ip_vs_wlc_scheduler = | |||
| 135 | 136 | ||
| 136 | static int __init ip_vs_wlc_init(void) | 137 | static int __init ip_vs_wlc_init(void) |
| 137 | { | 138 | { |
| 138 | INIT_LIST_HEAD(&ip_vs_wlc_scheduler.n_list); | ||
| 139 | return register_ip_vs_scheduler(&ip_vs_wlc_scheduler); | 139 | return register_ip_vs_scheduler(&ip_vs_wlc_scheduler); |
| 140 | } | 140 | } |
| 141 | 141 | ||
diff --git a/net/ipv4/ipvs/ip_vs_wrr.c b/net/ipv4/ipvs/ip_vs_wrr.c index 1d6932d7dc97..0d86a79b87b5 100644 --- a/net/ipv4/ipvs/ip_vs_wrr.c +++ b/net/ipv4/ipvs/ip_vs_wrr.c | |||
| @@ -212,6 +212,7 @@ static struct ip_vs_scheduler ip_vs_wrr_scheduler = { | |||
| 212 | .name = "wrr", | 212 | .name = "wrr", |
| 213 | .refcnt = ATOMIC_INIT(0), | 213 | .refcnt = ATOMIC_INIT(0), |
| 214 | .module = THIS_MODULE, | 214 | .module = THIS_MODULE, |
| 215 | .n_list = LIST_HEAD_INIT(ip_vs_wrr_scheduler.n_list), | ||
| 215 | .init_service = ip_vs_wrr_init_svc, | 216 | .init_service = ip_vs_wrr_init_svc, |
| 216 | .done_service = ip_vs_wrr_done_svc, | 217 | .done_service = ip_vs_wrr_done_svc, |
| 217 | .update_service = ip_vs_wrr_update_svc, | 218 | .update_service = ip_vs_wrr_update_svc, |
| @@ -220,7 +221,6 @@ static struct ip_vs_scheduler ip_vs_wrr_scheduler = { | |||
| 220 | 221 | ||
| 221 | static int __init ip_vs_wrr_init(void) | 222 | static int __init ip_vs_wrr_init(void) |
| 222 | { | 223 | { |
| 223 | INIT_LIST_HEAD(&ip_vs_wrr_scheduler.n_list); | ||
| 224 | return register_ip_vs_scheduler(&ip_vs_wrr_scheduler) ; | 224 | return register_ip_vs_scheduler(&ip_vs_wrr_scheduler) ; |
| 225 | } | 225 | } |
| 226 | 226 | ||
diff --git a/net/ipv4/netfilter/ipt_addrtype.c b/net/ipv4/netfilter/ipt_addrtype.c index 49587a497229..462a22c97877 100644 --- a/net/ipv4/netfilter/ipt_addrtype.c +++ b/net/ipv4/netfilter/ipt_addrtype.c | |||
| @@ -70,7 +70,7 @@ addrtype_mt_v1(const struct sk_buff *skb, const struct net_device *in, | |||
| 70 | (info->flags & IPT_ADDRTYPE_INVERT_SOURCE); | 70 | (info->flags & IPT_ADDRTYPE_INVERT_SOURCE); |
| 71 | if (ret && info->dest) | 71 | if (ret && info->dest) |
| 72 | ret &= match_type(dev, iph->daddr, info->dest) ^ | 72 | ret &= match_type(dev, iph->daddr, info->dest) ^ |
| 73 | (info->flags & IPT_ADDRTYPE_INVERT_DEST); | 73 | !!(info->flags & IPT_ADDRTYPE_INVERT_DEST); |
| 74 | return ret; | 74 | return ret; |
| 75 | } | 75 | } |
| 76 | 76 | ||
diff --git a/net/ipv4/netfilter/nf_nat_proto_common.c b/net/ipv4/netfilter/nf_nat_proto_common.c index 91537f11273f..6c4f11f51446 100644 --- a/net/ipv4/netfilter/nf_nat_proto_common.c +++ b/net/ipv4/netfilter/nf_nat_proto_common.c | |||
| @@ -73,9 +73,13 @@ bool nf_nat_proto_unique_tuple(struct nf_conntrack_tuple *tuple, | |||
| 73 | range_size = ntohs(range->max.all) - min + 1; | 73 | range_size = ntohs(range->max.all) - min + 1; |
| 74 | } | 74 | } |
| 75 | 75 | ||
| 76 | off = *rover; | ||
| 77 | if (range->flags & IP_NAT_RANGE_PROTO_RANDOM) | 76 | if (range->flags & IP_NAT_RANGE_PROTO_RANDOM) |
| 78 | off = net_random(); | 77 | off = secure_ipv4_port_ephemeral(tuple->src.u3.ip, tuple->dst.u3.ip, |
| 78 | maniptype == IP_NAT_MANIP_SRC | ||
| 79 | ? tuple->dst.u.all | ||
| 80 | : tuple->src.u.all); | ||
| 81 | else | ||
| 82 | off = *rover; | ||
| 79 | 83 | ||
| 80 | for (i = 0; i < range_size; i++, off++) { | 84 | for (i = 0; i < range_size; i++, off++) { |
| 81 | *portptr = htons(min + off % range_size); | 85 | *portptr = htons(min + off % range_size); |
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 16fc6f454a31..6ee5354c9aa1 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c | |||
| @@ -2914,6 +2914,68 @@ static int ipv4_sysctl_rtcache_flush_strategy(ctl_table *table, | |||
| 2914 | return 0; | 2914 | return 0; |
| 2915 | } | 2915 | } |
| 2916 | 2916 | ||
| 2917 | static void rt_secret_reschedule(int old) | ||
| 2918 | { | ||
| 2919 | struct net *net; | ||
| 2920 | int new = ip_rt_secret_interval; | ||
| 2921 | int diff = new - old; | ||
| 2922 | |||
| 2923 | if (!diff) | ||
| 2924 | return; | ||
| 2925 | |||
| 2926 | rtnl_lock(); | ||
| 2927 | for_each_net(net) { | ||
| 2928 | int deleted = del_timer_sync(&net->ipv4.rt_secret_timer); | ||
| 2929 | |||
| 2930 | if (!new) | ||
| 2931 | continue; | ||
| 2932 | |||
| 2933 | if (deleted) { | ||
| 2934 | long time = net->ipv4.rt_secret_timer.expires - jiffies; | ||
| 2935 | |||
| 2936 | if (time <= 0 || (time += diff) <= 0) | ||
| 2937 | time = 0; | ||
| 2938 | |||
| 2939 | net->ipv4.rt_secret_timer.expires = time; | ||
| 2940 | } else | ||
| 2941 | net->ipv4.rt_secret_timer.expires = new; | ||
| 2942 | |||
| 2943 | net->ipv4.rt_secret_timer.expires += jiffies; | ||
| 2944 | add_timer(&net->ipv4.rt_secret_timer); | ||
| 2945 | } | ||
| 2946 | rtnl_unlock(); | ||
| 2947 | } | ||
| 2948 | |||
| 2949 | static int ipv4_sysctl_rt_secret_interval(ctl_table *ctl, int write, | ||
| 2950 | struct file *filp, | ||
| 2951 | void __user *buffer, size_t *lenp, | ||
| 2952 | loff_t *ppos) | ||
| 2953 | { | ||
| 2954 | int old = ip_rt_secret_interval; | ||
| 2955 | int ret = proc_dointvec_jiffies(ctl, write, filp, buffer, lenp, ppos); | ||
| 2956 | |||
| 2957 | rt_secret_reschedule(old); | ||
| 2958 | |||
| 2959 | return ret; | ||
| 2960 | } | ||
| 2961 | |||
| 2962 | static int ipv4_sysctl_rt_secret_interval_strategy(ctl_table *table, | ||
| 2963 | int __user *name, | ||
| 2964 | int nlen, | ||
| 2965 | void __user *oldval, | ||
| 2966 | size_t __user *oldlenp, | ||
| 2967 | void __user *newval, | ||
| 2968 | size_t newlen) | ||
| 2969 | { | ||
| 2970 | int old = ip_rt_secret_interval; | ||
| 2971 | int ret = sysctl_jiffies(table, name, nlen, oldval, oldlenp, newval, | ||
| 2972 | newlen); | ||
| 2973 | |||
| 2974 | rt_secret_reschedule(old); | ||
| 2975 | |||
| 2976 | return ret; | ||
| 2977 | } | ||
| 2978 | |||
| 2917 | static ctl_table ipv4_route_table[] = { | 2979 | static ctl_table ipv4_route_table[] = { |
| 2918 | { | 2980 | { |
| 2919 | .ctl_name = NET_IPV4_ROUTE_GC_THRESH, | 2981 | .ctl_name = NET_IPV4_ROUTE_GC_THRESH, |
| @@ -3048,20 +3110,29 @@ static ctl_table ipv4_route_table[] = { | |||
| 3048 | .data = &ip_rt_secret_interval, | 3110 | .data = &ip_rt_secret_interval, |
| 3049 | .maxlen = sizeof(int), | 3111 | .maxlen = sizeof(int), |
| 3050 | .mode = 0644, | 3112 | .mode = 0644, |
| 3051 | .proc_handler = &proc_dointvec_jiffies, | 3113 | .proc_handler = &ipv4_sysctl_rt_secret_interval, |
| 3052 | .strategy = &sysctl_jiffies, | 3114 | .strategy = &ipv4_sysctl_rt_secret_interval_strategy, |
| 3053 | }, | 3115 | }, |
| 3054 | { .ctl_name = 0 } | 3116 | { .ctl_name = 0 } |
| 3055 | }; | 3117 | }; |
| 3056 | 3118 | ||
| 3057 | static __net_initdata struct ctl_path ipv4_route_path[] = { | 3119 | static struct ctl_table empty[1]; |
| 3120 | |||
| 3121 | static struct ctl_table ipv4_skeleton[] = | ||
| 3122 | { | ||
| 3123 | { .procname = "route", .ctl_name = NET_IPV4_ROUTE, | ||
| 3124 | .mode = 0555, .child = ipv4_route_table}, | ||
| 3125 | { .procname = "neigh", .ctl_name = NET_IPV4_NEIGH, | ||
| 3126 | .mode = 0555, .child = empty}, | ||
| 3127 | { } | ||
| 3128 | }; | ||
| 3129 | |||
| 3130 | static __net_initdata struct ctl_path ipv4_path[] = { | ||
| 3058 | { .procname = "net", .ctl_name = CTL_NET, }, | 3131 | { .procname = "net", .ctl_name = CTL_NET, }, |
| 3059 | { .procname = "ipv4", .ctl_name = NET_IPV4, }, | 3132 | { .procname = "ipv4", .ctl_name = NET_IPV4, }, |
| 3060 | { .procname = "route", .ctl_name = NET_IPV4_ROUTE, }, | ||
| 3061 | { }, | 3133 | { }, |
| 3062 | }; | 3134 | }; |
| 3063 | 3135 | ||
| 3064 | |||
| 3065 | static struct ctl_table ipv4_route_flush_table[] = { | 3136 | static struct ctl_table ipv4_route_flush_table[] = { |
| 3066 | { | 3137 | { |
| 3067 | .ctl_name = NET_IPV4_ROUTE_FLUSH, | 3138 | .ctl_name = NET_IPV4_ROUTE_FLUSH, |
| @@ -3074,6 +3145,13 @@ static struct ctl_table ipv4_route_flush_table[] = { | |||
| 3074 | { .ctl_name = 0 }, | 3145 | { .ctl_name = 0 }, |
| 3075 | }; | 3146 | }; |
| 3076 | 3147 | ||
| 3148 | static __net_initdata struct ctl_path ipv4_route_path[] = { | ||
| 3149 | { .procname = "net", .ctl_name = CTL_NET, }, | ||
| 3150 | { .procname = "ipv4", .ctl_name = NET_IPV4, }, | ||
| 3151 | { .procname = "route", .ctl_name = NET_IPV4_ROUTE, }, | ||
| 3152 | { }, | ||
| 3153 | }; | ||
| 3154 | |||
| 3077 | static __net_init int sysctl_route_net_init(struct net *net) | 3155 | static __net_init int sysctl_route_net_init(struct net *net) |
| 3078 | { | 3156 | { |
| 3079 | struct ctl_table *tbl; | 3157 | struct ctl_table *tbl; |
| @@ -3126,10 +3204,12 @@ static __net_init int rt_secret_timer_init(struct net *net) | |||
| 3126 | net->ipv4.rt_secret_timer.data = (unsigned long)net; | 3204 | net->ipv4.rt_secret_timer.data = (unsigned long)net; |
| 3127 | init_timer_deferrable(&net->ipv4.rt_secret_timer); | 3205 | init_timer_deferrable(&net->ipv4.rt_secret_timer); |
| 3128 | 3206 | ||
| 3129 | net->ipv4.rt_secret_timer.expires = | 3207 | if (ip_rt_secret_interval) { |
| 3130 | jiffies + net_random() % ip_rt_secret_interval + | 3208 | net->ipv4.rt_secret_timer.expires = |
| 3131 | ip_rt_secret_interval; | 3209 | jiffies + net_random() % ip_rt_secret_interval + |
| 3132 | add_timer(&net->ipv4.rt_secret_timer); | 3210 | ip_rt_secret_interval; |
| 3211 | add_timer(&net->ipv4.rt_secret_timer); | ||
| 3212 | } | ||
| 3133 | return 0; | 3213 | return 0; |
| 3134 | } | 3214 | } |
| 3135 | 3215 | ||
| @@ -3223,7 +3303,7 @@ int __init ip_rt_init(void) | |||
| 3223 | */ | 3303 | */ |
| 3224 | void __init ip_static_sysctl_init(void) | 3304 | void __init ip_static_sysctl_init(void) |
| 3225 | { | 3305 | { |
| 3226 | register_sysctl_paths(ipv4_route_path, ipv4_route_table); | 3306 | register_sysctl_paths(ipv4_path, ipv4_skeleton); |
| 3227 | } | 3307 | } |
| 3228 | #endif | 3308 | #endif |
| 3229 | 3309 | ||
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index a00532de2a8c..8165f5aa8c71 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c | |||
| @@ -468,7 +468,8 @@ static unsigned tcp_syn_options(struct sock *sk, struct sk_buff *skb, | |||
| 468 | } | 468 | } |
| 469 | if (likely(sysctl_tcp_window_scaling)) { | 469 | if (likely(sysctl_tcp_window_scaling)) { |
| 470 | opts->ws = tp->rx_opt.rcv_wscale; | 470 | opts->ws = tp->rx_opt.rcv_wscale; |
| 471 | size += TCPOLEN_WSCALE_ALIGNED; | 471 | if(likely(opts->ws)) |
| 472 | size += TCPOLEN_WSCALE_ALIGNED; | ||
| 472 | } | 473 | } |
| 473 | if (likely(sysctl_tcp_sack)) { | 474 | if (likely(sysctl_tcp_sack)) { |
| 474 | opts->options |= OPTION_SACK_ADVERTISE; | 475 | opts->options |= OPTION_SACK_ADVERTISE; |
| @@ -509,7 +510,8 @@ static unsigned tcp_synack_options(struct sock *sk, | |||
| 509 | 510 | ||
| 510 | if (likely(ireq->wscale_ok)) { | 511 | if (likely(ireq->wscale_ok)) { |
| 511 | opts->ws = ireq->rcv_wscale; | 512 | opts->ws = ireq->rcv_wscale; |
| 512 | size += TCPOLEN_WSCALE_ALIGNED; | 513 | if(likely(opts->ws)) |
| 514 | size += TCPOLEN_WSCALE_ALIGNED; | ||
| 513 | } | 515 | } |
| 514 | if (likely(doing_ts)) { | 516 | if (likely(doing_ts)) { |
| 515 | opts->options |= OPTION_TS; | 517 | opts->options |= OPTION_TS; |
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 383d17359d01..8e42fbbd5761 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c | |||
| @@ -989,7 +989,9 @@ int udp_queue_rcv_skb(struct sock * sk, struct sk_buff *skb) | |||
| 989 | up->encap_rcv != NULL) { | 989 | up->encap_rcv != NULL) { |
| 990 | int ret; | 990 | int ret; |
| 991 | 991 | ||
| 992 | bh_unlock_sock(sk); | ||
| 992 | ret = (*up->encap_rcv)(sk, skb); | 993 | ret = (*up->encap_rcv)(sk, skb); |
| 994 | bh_lock_sock(sk); | ||
| 993 | if (ret <= 0) { | 995 | if (ret <= 0) { |
| 994 | UDP_INC_STATS_BH(sock_net(sk), | 996 | UDP_INC_STATS_BH(sock_net(sk), |
| 995 | UDP_MIB_INDATAGRAMS, | 997 | UDP_MIB_INDATAGRAMS, |
| @@ -1092,7 +1094,7 @@ static int __udp4_lib_mcast_deliver(struct net *net, struct sk_buff *skb, | |||
| 1092 | if (skb1) { | 1094 | if (skb1) { |
| 1093 | int ret = 0; | 1095 | int ret = 0; |
| 1094 | 1096 | ||
| 1095 | bh_lock_sock_nested(sk); | 1097 | bh_lock_sock(sk); |
| 1096 | if (!sock_owned_by_user(sk)) | 1098 | if (!sock_owned_by_user(sk)) |
| 1097 | ret = udp_queue_rcv_skb(sk, skb1); | 1099 | ret = udp_queue_rcv_skb(sk, skb1); |
| 1098 | else | 1100 | else |
| @@ -1194,7 +1196,7 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct hlist_head udptable[], | |||
| 1194 | 1196 | ||
| 1195 | if (sk != NULL) { | 1197 | if (sk != NULL) { |
| 1196 | int ret = 0; | 1198 | int ret = 0; |
| 1197 | bh_lock_sock_nested(sk); | 1199 | bh_lock_sock(sk); |
| 1198 | if (!sock_owned_by_user(sk)) | 1200 | if (!sock_owned_by_user(sk)) |
| 1199 | ret = udp_queue_rcv_skb(sk, skb); | 1201 | ret = udp_queue_rcv_skb(sk, skb); |
| 1200 | else | 1202 | else |
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index a7842c54f58a..7b6a584b62dd 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c | |||
| @@ -1106,13 +1106,12 @@ out: | |||
| 1106 | return ret; | 1106 | return ret; |
| 1107 | } | 1107 | } |
| 1108 | 1108 | ||
| 1109 | int ipv6_dev_get_saddr(struct net_device *dst_dev, | 1109 | int ipv6_dev_get_saddr(struct net *net, struct net_device *dst_dev, |
| 1110 | const struct in6_addr *daddr, unsigned int prefs, | 1110 | const struct in6_addr *daddr, unsigned int prefs, |
| 1111 | struct in6_addr *saddr) | 1111 | struct in6_addr *saddr) |
| 1112 | { | 1112 | { |
| 1113 | struct ipv6_saddr_score scores[2], | 1113 | struct ipv6_saddr_score scores[2], |
| 1114 | *score = &scores[0], *hiscore = &scores[1]; | 1114 | *score = &scores[0], *hiscore = &scores[1]; |
| 1115 | struct net *net = dev_net(dst_dev); | ||
| 1116 | struct ipv6_saddr_dst dst; | 1115 | struct ipv6_saddr_dst dst; |
| 1117 | struct net_device *dev; | 1116 | struct net_device *dev; |
| 1118 | int dst_type; | 1117 | int dst_type; |
| @@ -1689,6 +1688,7 @@ addrconf_prefix_route(struct in6_addr *pfx, int plen, struct net_device *dev, | |||
| 1689 | .fc_dst_len = plen, | 1688 | .fc_dst_len = plen, |
| 1690 | .fc_flags = RTF_UP | flags, | 1689 | .fc_flags = RTF_UP | flags, |
| 1691 | .fc_nlinfo.nl_net = dev_net(dev), | 1690 | .fc_nlinfo.nl_net = dev_net(dev), |
| 1691 | .fc_protocol = RTPROT_KERNEL, | ||
| 1692 | }; | 1692 | }; |
| 1693 | 1693 | ||
| 1694 | ipv6_addr_copy(&cfg.fc_dst, pfx); | 1694 | ipv6_addr_copy(&cfg.fc_dst, pfx); |
diff --git a/net/ipv6/fib6_rules.c b/net/ipv6/fib6_rules.c index 8d05527524e3..f5de3f9dc692 100644 --- a/net/ipv6/fib6_rules.c +++ b/net/ipv6/fib6_rules.c | |||
| @@ -93,7 +93,8 @@ static int fib6_rule_action(struct fib_rule *rule, struct flowi *flp, | |||
| 93 | if (flags & RT6_LOOKUP_F_SRCPREF_COA) | 93 | if (flags & RT6_LOOKUP_F_SRCPREF_COA) |
| 94 | srcprefs |= IPV6_PREFER_SRC_COA; | 94 | srcprefs |= IPV6_PREFER_SRC_COA; |
| 95 | 95 | ||
| 96 | if (ipv6_dev_get_saddr(ip6_dst_idev(&rt->u.dst)->dev, | 96 | if (ipv6_dev_get_saddr(net, |
| 97 | ip6_dst_idev(&rt->u.dst)->dev, | ||
| 97 | &flp->fl6_dst, srcprefs, | 98 | &flp->fl6_dst, srcprefs, |
| 98 | &saddr)) | 99 | &saddr)) |
| 99 | goto again; | 100 | goto again; |
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c index abedf95fdf2d..b3157a0cc15d 100644 --- a/net/ipv6/icmp.c +++ b/net/ipv6/icmp.c | |||
| @@ -91,19 +91,22 @@ static struct inet6_protocol icmpv6_protocol = { | |||
| 91 | .flags = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL, | 91 | .flags = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL, |
| 92 | }; | 92 | }; |
| 93 | 93 | ||
| 94 | static __inline__ int icmpv6_xmit_lock(struct sock *sk) | 94 | static __inline__ struct sock *icmpv6_xmit_lock(struct net *net) |
| 95 | { | 95 | { |
| 96 | struct sock *sk; | ||
| 97 | |||
| 96 | local_bh_disable(); | 98 | local_bh_disable(); |
| 97 | 99 | ||
| 100 | sk = icmpv6_sk(net); | ||
| 98 | if (unlikely(!spin_trylock(&sk->sk_lock.slock))) { | 101 | if (unlikely(!spin_trylock(&sk->sk_lock.slock))) { |
| 99 | /* This can happen if the output path (f.e. SIT or | 102 | /* This can happen if the output path (f.e. SIT or |
| 100 | * ip6ip6 tunnel) signals dst_link_failure() for an | 103 | * ip6ip6 tunnel) signals dst_link_failure() for an |
| 101 | * outgoing ICMP6 packet. | 104 | * outgoing ICMP6 packet. |
| 102 | */ | 105 | */ |
| 103 | local_bh_enable(); | 106 | local_bh_enable(); |
| 104 | return 1; | 107 | return NULL; |
| 105 | } | 108 | } |
| 106 | return 0; | 109 | return sk; |
| 107 | } | 110 | } |
| 108 | 111 | ||
| 109 | static __inline__ void icmpv6_xmit_unlock(struct sock *sk) | 112 | static __inline__ void icmpv6_xmit_unlock(struct sock *sk) |
| @@ -392,11 +395,10 @@ void icmpv6_send(struct sk_buff *skb, int type, int code, __u32 info, | |||
| 392 | fl.fl_icmp_code = code; | 395 | fl.fl_icmp_code = code; |
| 393 | security_skb_classify_flow(skb, &fl); | 396 | security_skb_classify_flow(skb, &fl); |
| 394 | 397 | ||
| 395 | sk = icmpv6_sk(net); | 398 | sk = icmpv6_xmit_lock(net); |
| 396 | np = inet6_sk(sk); | 399 | if (sk == NULL) |
| 397 | |||
| 398 | if (icmpv6_xmit_lock(sk)) | ||
| 399 | return; | 400 | return; |
| 401 | np = inet6_sk(sk); | ||
| 400 | 402 | ||
| 401 | if (!icmpv6_xrlim_allow(sk, type, &fl)) | 403 | if (!icmpv6_xrlim_allow(sk, type, &fl)) |
| 402 | goto out; | 404 | goto out; |
| @@ -539,11 +541,10 @@ static void icmpv6_echo_reply(struct sk_buff *skb) | |||
| 539 | fl.fl_icmp_type = ICMPV6_ECHO_REPLY; | 541 | fl.fl_icmp_type = ICMPV6_ECHO_REPLY; |
| 540 | security_skb_classify_flow(skb, &fl); | 542 | security_skb_classify_flow(skb, &fl); |
| 541 | 543 | ||
| 542 | sk = icmpv6_sk(net); | 544 | sk = icmpv6_xmit_lock(net); |
| 543 | np = inet6_sk(sk); | 545 | if (sk == NULL) |
| 544 | |||
| 545 | if (icmpv6_xmit_lock(sk)) | ||
| 546 | return; | 546 | return; |
| 547 | np = inet6_sk(sk); | ||
| 547 | 548 | ||
| 548 | if (!fl.oif && ipv6_addr_is_multicast(&fl.fl6_dst)) | 549 | if (!fl.oif && ipv6_addr_is_multicast(&fl.fl6_dst)) |
| 549 | fl.oif = np->mcast_oif; | 550 | fl.oif = np->mcast_oif; |
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c index 52dddc25d3e6..29c7c99e69f7 100644 --- a/net/ipv6/ip6_fib.c +++ b/net/ipv6/ip6_fib.c | |||
| @@ -378,6 +378,7 @@ static int inet6_dump_fib(struct sk_buff *skb, struct netlink_callback *cb) | |||
| 378 | 378 | ||
| 379 | arg.skb = skb; | 379 | arg.skb = skb; |
| 380 | arg.cb = cb; | 380 | arg.cb = cb; |
| 381 | arg.net = net; | ||
| 381 | w->args = &arg; | 382 | w->args = &arg; |
| 382 | 383 | ||
| 383 | for (h = s_h; h < FIB_TABLE_HASHSZ; h++, s_e = 0) { | 384 | for (h = s_h; h < FIB_TABLE_HASHSZ; h++, s_e = 0) { |
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index a4402de425d9..0e844c2736a7 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c | |||
| @@ -934,7 +934,7 @@ static int ip6_dst_lookup_tail(struct sock *sk, | |||
| 934 | goto out_err_release; | 934 | goto out_err_release; |
| 935 | 935 | ||
| 936 | if (ipv6_addr_any(&fl->fl6_src)) { | 936 | if (ipv6_addr_any(&fl->fl6_src)) { |
| 937 | err = ipv6_dev_get_saddr(ip6_dst_idev(*dst)->dev, | 937 | err = ipv6_dev_get_saddr(net, ip6_dst_idev(*dst)->dev, |
| 938 | &fl->fl6_dst, | 938 | &fl->fl6_dst, |
| 939 | sk ? inet6_sk(sk)->srcprefs : 0, | 939 | sk ? inet6_sk(sk)->srcprefs : 0, |
| 940 | &fl->fl6_src); | 940 | &fl->fl6_src); |
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c index 741cfcd96f88..4e5eac301f91 100644 --- a/net/ipv6/ipv6_sockglue.c +++ b/net/ipv6/ipv6_sockglue.c | |||
| @@ -911,7 +911,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname, | |||
| 911 | } else { | 911 | } else { |
| 912 | if (np->rxopt.bits.rxinfo) { | 912 | if (np->rxopt.bits.rxinfo) { |
| 913 | struct in6_pktinfo src_info; | 913 | struct in6_pktinfo src_info; |
| 914 | src_info.ipi6_ifindex = np->mcast_oif; | 914 | src_info.ipi6_ifindex = np->mcast_oif ? np->mcast_oif : sk->sk_bound_dev_if; |
| 915 | ipv6_addr_copy(&src_info.ipi6_addr, &np->daddr); | 915 | ipv6_addr_copy(&src_info.ipi6_addr, &np->daddr); |
| 916 | put_cmsg(&msg, SOL_IPV6, IPV6_PKTINFO, sizeof(src_info), &src_info); | 916 | put_cmsg(&msg, SOL_IPV6, IPV6_PKTINFO, sizeof(src_info), &src_info); |
| 917 | } | 917 | } |
| @@ -921,7 +921,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname, | |||
| 921 | } | 921 | } |
| 922 | if (np->rxopt.bits.rxoinfo) { | 922 | if (np->rxopt.bits.rxoinfo) { |
| 923 | struct in6_pktinfo src_info; | 923 | struct in6_pktinfo src_info; |
| 924 | src_info.ipi6_ifindex = np->mcast_oif; | 924 | src_info.ipi6_ifindex = np->mcast_oif ? np->mcast_oif : sk->sk_bound_dev_if; |
| 925 | ipv6_addr_copy(&src_info.ipi6_addr, &np->daddr); | 925 | ipv6_addr_copy(&src_info.ipi6_addr, &np->daddr); |
| 926 | put_cmsg(&msg, SOL_IPV6, IPV6_2292PKTINFO, sizeof(src_info), &src_info); | 926 | put_cmsg(&msg, SOL_IPV6, IPV6_2292PKTINFO, sizeof(src_info), &src_info); |
| 927 | } | 927 | } |
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index beb48e3f038a..f1c62ba0f56b 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c | |||
| @@ -549,7 +549,7 @@ static void ndisc_send_na(struct net_device *dev, struct neighbour *neigh, | |||
| 549 | override = 0; | 549 | override = 0; |
| 550 | in6_ifa_put(ifp); | 550 | in6_ifa_put(ifp); |
| 551 | } else { | 551 | } else { |
| 552 | if (ipv6_dev_get_saddr(dev, daddr, | 552 | if (ipv6_dev_get_saddr(dev_net(dev), dev, daddr, |
| 553 | inet6_sk(dev_net(dev)->ipv6.ndisc_sk)->srcprefs, | 553 | inet6_sk(dev_net(dev)->ipv6.ndisc_sk)->srcprefs, |
| 554 | &tmpaddr)) | 554 | &tmpaddr)) |
| 555 | return; | 555 | return; |
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c index 01d47674f7e5..e53e493606c5 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c | |||
| @@ -377,14 +377,14 @@ static inline int rawv6_rcv_skb(struct sock * sk, struct sk_buff * skb) | |||
| 377 | skb_checksum_complete(skb)) { | 377 | skb_checksum_complete(skb)) { |
| 378 | atomic_inc(&sk->sk_drops); | 378 | atomic_inc(&sk->sk_drops); |
| 379 | kfree_skb(skb); | 379 | kfree_skb(skb); |
| 380 | return 0; | 380 | return NET_RX_DROP; |
| 381 | } | 381 | } |
| 382 | 382 | ||
| 383 | /* Charge it to the socket. */ | 383 | /* Charge it to the socket. */ |
| 384 | if (sock_queue_rcv_skb(sk,skb)<0) { | 384 | if (sock_queue_rcv_skb(sk,skb)<0) { |
| 385 | atomic_inc(&sk->sk_drops); | 385 | atomic_inc(&sk->sk_drops); |
| 386 | kfree_skb(skb); | 386 | kfree_skb(skb); |
| 387 | return 0; | 387 | return NET_RX_DROP; |
| 388 | } | 388 | } |
| 389 | 389 | ||
| 390 | return 0; | 390 | return 0; |
| @@ -429,7 +429,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb) | |||
| 429 | if (skb_checksum_complete(skb)) { | 429 | if (skb_checksum_complete(skb)) { |
| 430 | atomic_inc(&sk->sk_drops); | 430 | atomic_inc(&sk->sk_drops); |
| 431 | kfree_skb(skb); | 431 | kfree_skb(skb); |
| 432 | return 0; | 432 | return NET_RX_DROP; |
| 433 | } | 433 | } |
| 434 | } | 434 | } |
| 435 | 435 | ||
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 5a3e87e4b18f..9af6115f0f50 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c | |||
| @@ -2106,7 +2106,8 @@ static inline size_t rt6_nlmsg_size(void) | |||
| 2106 | + nla_total_size(sizeof(struct rta_cacheinfo)); | 2106 | + nla_total_size(sizeof(struct rta_cacheinfo)); |
| 2107 | } | 2107 | } |
| 2108 | 2108 | ||
| 2109 | static int rt6_fill_node(struct sk_buff *skb, struct rt6_info *rt, | 2109 | static int rt6_fill_node(struct net *net, |
| 2110 | struct sk_buff *skb, struct rt6_info *rt, | ||
| 2110 | struct in6_addr *dst, struct in6_addr *src, | 2111 | struct in6_addr *dst, struct in6_addr *src, |
| 2111 | int iif, int type, u32 pid, u32 seq, | 2112 | int iif, int type, u32 pid, u32 seq, |
| 2112 | int prefix, int nowait, unsigned int flags) | 2113 | int prefix, int nowait, unsigned int flags) |
| @@ -2187,8 +2188,9 @@ static int rt6_fill_node(struct sk_buff *skb, struct rt6_info *rt, | |||
| 2187 | #endif | 2188 | #endif |
| 2188 | NLA_PUT_U32(skb, RTA_IIF, iif); | 2189 | NLA_PUT_U32(skb, RTA_IIF, iif); |
| 2189 | } else if (dst) { | 2190 | } else if (dst) { |
| 2191 | struct inet6_dev *idev = ip6_dst_idev(&rt->u.dst); | ||
| 2190 | struct in6_addr saddr_buf; | 2192 | struct in6_addr saddr_buf; |
| 2191 | if (ipv6_dev_get_saddr(ip6_dst_idev(&rt->u.dst)->dev, | 2193 | if (ipv6_dev_get_saddr(net, idev ? idev->dev : NULL, |
| 2192 | dst, 0, &saddr_buf) == 0) | 2194 | dst, 0, &saddr_buf) == 0) |
| 2193 | NLA_PUT(skb, RTA_PREFSRC, 16, &saddr_buf); | 2195 | NLA_PUT(skb, RTA_PREFSRC, 16, &saddr_buf); |
| 2194 | } | 2196 | } |
| @@ -2233,7 +2235,8 @@ int rt6_dump_route(struct rt6_info *rt, void *p_arg) | |||
| 2233 | } else | 2235 | } else |
| 2234 | prefix = 0; | 2236 | prefix = 0; |
| 2235 | 2237 | ||
| 2236 | return rt6_fill_node(arg->skb, rt, NULL, NULL, 0, RTM_NEWROUTE, | 2238 | return rt6_fill_node(arg->net, |
| 2239 | arg->skb, rt, NULL, NULL, 0, RTM_NEWROUTE, | ||
| 2237 | NETLINK_CB(arg->cb->skb).pid, arg->cb->nlh->nlmsg_seq, | 2240 | NETLINK_CB(arg->cb->skb).pid, arg->cb->nlh->nlmsg_seq, |
| 2238 | prefix, 0, NLM_F_MULTI); | 2241 | prefix, 0, NLM_F_MULTI); |
| 2239 | } | 2242 | } |
| @@ -2299,7 +2302,7 @@ static int inet6_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr* nlh, void | |||
| 2299 | rt = (struct rt6_info*) ip6_route_output(net, NULL, &fl); | 2302 | rt = (struct rt6_info*) ip6_route_output(net, NULL, &fl); |
| 2300 | skb->dst = &rt->u.dst; | 2303 | skb->dst = &rt->u.dst; |
| 2301 | 2304 | ||
| 2302 | err = rt6_fill_node(skb, rt, &fl.fl6_dst, &fl.fl6_src, iif, | 2305 | err = rt6_fill_node(net, skb, rt, &fl.fl6_dst, &fl.fl6_src, iif, |
| 2303 | RTM_NEWROUTE, NETLINK_CB(in_skb).pid, | 2306 | RTM_NEWROUTE, NETLINK_CB(in_skb).pid, |
| 2304 | nlh->nlmsg_seq, 0, 0, 0); | 2307 | nlh->nlmsg_seq, 0, 0, 0); |
| 2305 | if (err < 0) { | 2308 | if (err < 0) { |
| @@ -2326,7 +2329,7 @@ void inet6_rt_notify(int event, struct rt6_info *rt, struct nl_info *info) | |||
| 2326 | if (skb == NULL) | 2329 | if (skb == NULL) |
| 2327 | goto errout; | 2330 | goto errout; |
| 2328 | 2331 | ||
| 2329 | err = rt6_fill_node(skb, rt, NULL, NULL, 0, | 2332 | err = rt6_fill_node(net, skb, rt, NULL, NULL, 0, |
| 2330 | event, info->pid, seq, 0, 0, 0); | 2333 | event, info->pid, seq, 0, 0, 0); |
| 2331 | if (err < 0) { | 2334 | if (err < 0) { |
| 2332 | /* -EMSGSIZE implies BUG in rt6_nlmsg_size() */ | 2335 | /* -EMSGSIZE implies BUG in rt6_nlmsg_size() */ |
diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c index e6dfaeac6be3..587f8f60c489 100644 --- a/net/ipv6/sysctl_net_ipv6.c +++ b/net/ipv6/sysctl_net_ipv6.c | |||
| @@ -156,7 +156,7 @@ static struct ctl_table_header *ip6_base; | |||
| 156 | int ipv6_static_sysctl_register(void) | 156 | int ipv6_static_sysctl_register(void) |
| 157 | { | 157 | { |
| 158 | static struct ctl_table empty[1]; | 158 | static struct ctl_table empty[1]; |
| 159 | ip6_base = register_net_sysctl_rotable(net_ipv6_ctl_path, empty); | 159 | ip6_base = register_sysctl_paths(net_ipv6_ctl_path, empty); |
| 160 | if (ip6_base == NULL) | 160 | if (ip6_base == NULL) |
| 161 | return -ENOMEM; | 161 | return -ENOMEM; |
| 162 | return 0; | 162 | return 0; |
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index d1477b350f76..a6aecf76a71b 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c | |||
| @@ -379,7 +379,7 @@ static int __udp6_lib_mcast_deliver(struct net *net, struct sk_buff *skb, | |||
| 379 | uh->source, saddr, dif))) { | 379 | uh->source, saddr, dif))) { |
| 380 | struct sk_buff *buff = skb_clone(skb, GFP_ATOMIC); | 380 | struct sk_buff *buff = skb_clone(skb, GFP_ATOMIC); |
| 381 | if (buff) { | 381 | if (buff) { |
| 382 | bh_lock_sock_nested(sk2); | 382 | bh_lock_sock(sk2); |
| 383 | if (!sock_owned_by_user(sk2)) | 383 | if (!sock_owned_by_user(sk2)) |
| 384 | udpv6_queue_rcv_skb(sk2, buff); | 384 | udpv6_queue_rcv_skb(sk2, buff); |
| 385 | else | 385 | else |
| @@ -387,7 +387,7 @@ static int __udp6_lib_mcast_deliver(struct net *net, struct sk_buff *skb, | |||
| 387 | bh_unlock_sock(sk2); | 387 | bh_unlock_sock(sk2); |
| 388 | } | 388 | } |
| 389 | } | 389 | } |
| 390 | bh_lock_sock_nested(sk); | 390 | bh_lock_sock(sk); |
| 391 | if (!sock_owned_by_user(sk)) | 391 | if (!sock_owned_by_user(sk)) |
| 392 | udpv6_queue_rcv_skb(sk, skb); | 392 | udpv6_queue_rcv_skb(sk, skb); |
| 393 | else | 393 | else |
| @@ -508,7 +508,7 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct hlist_head udptable[], | |||
| 508 | 508 | ||
| 509 | /* deliver */ | 509 | /* deliver */ |
| 510 | 510 | ||
| 511 | bh_lock_sock_nested(sk); | 511 | bh_lock_sock(sk); |
| 512 | if (!sock_owned_by_user(sk)) | 512 | if (!sock_owned_by_user(sk)) |
| 513 | udpv6_queue_rcv_skb(sk, skb); | 513 | udpv6_queue_rcv_skb(sk, skb); |
| 514 | else | 514 | else |
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c index 8f1e0543b3c4..08e4cbbe3f04 100644 --- a/net/ipv6/xfrm6_policy.c +++ b/net/ipv6/xfrm6_policy.c | |||
| @@ -52,12 +52,14 @@ static struct dst_entry *xfrm6_dst_lookup(int tos, xfrm_address_t *saddr, | |||
| 52 | static int xfrm6_get_saddr(xfrm_address_t *saddr, xfrm_address_t *daddr) | 52 | static int xfrm6_get_saddr(xfrm_address_t *saddr, xfrm_address_t *daddr) |
| 53 | { | 53 | { |
| 54 | struct dst_entry *dst; | 54 | struct dst_entry *dst; |
| 55 | struct net_device *dev; | ||
| 55 | 56 | ||
| 56 | dst = xfrm6_dst_lookup(0, NULL, daddr); | 57 | dst = xfrm6_dst_lookup(0, NULL, daddr); |
| 57 | if (IS_ERR(dst)) | 58 | if (IS_ERR(dst)) |
| 58 | return -EHOSTUNREACH; | 59 | return -EHOSTUNREACH; |
| 59 | 60 | ||
| 60 | ipv6_dev_get_saddr(ip6_dst_idev(dst)->dev, | 61 | dev = ip6_dst_idev(dst)->dev; |
| 62 | ipv6_dev_get_saddr(dev_net(dev), dev, | ||
| 61 | (struct in6_addr *)&daddr->a6, 0, | 63 | (struct in6_addr *)&daddr->a6, 0, |
| 62 | (struct in6_addr *)&saddr->a6); | 64 | (struct in6_addr *)&saddr->a6); |
| 63 | dst_release(dst); | 65 | dst_release(dst); |
diff --git a/net/mac80211/debugfs_key.c b/net/mac80211/debugfs_key.c index 7439b63df5d0..cf82acec913a 100644 --- a/net/mac80211/debugfs_key.c +++ b/net/mac80211/debugfs_key.c | |||
| @@ -265,7 +265,7 @@ void ieee80211_debugfs_key_add_default(struct ieee80211_sub_if_data *sdata) | |||
| 265 | key = sdata->default_key; | 265 | key = sdata->default_key; |
| 266 | if (key) { | 266 | if (key) { |
| 267 | sprintf(buf, "../keys/%d", key->debugfs.cnt); | 267 | sprintf(buf, "../keys/%d", key->debugfs.cnt); |
| 268 | sdata->debugfs.default_key = | 268 | sdata->common_debugfs.default_key = |
| 269 | debugfs_create_symlink("default_key", | 269 | debugfs_create_symlink("default_key", |
| 270 | sdata->debugfsdir, buf); | 270 | sdata->debugfsdir, buf); |
| 271 | } else | 271 | } else |
| @@ -277,8 +277,8 @@ void ieee80211_debugfs_key_remove_default(struct ieee80211_sub_if_data *sdata) | |||
| 277 | if (!sdata) | 277 | if (!sdata) |
| 278 | return; | 278 | return; |
| 279 | 279 | ||
| 280 | debugfs_remove(sdata->debugfs.default_key); | 280 | debugfs_remove(sdata->common_debugfs.default_key); |
| 281 | sdata->debugfs.default_key = NULL; | 281 | sdata->common_debugfs.default_key = NULL; |
| 282 | } | 282 | } |
| 283 | 283 | ||
| 284 | void ieee80211_debugfs_key_sta_del(struct ieee80211_key *key, | 284 | void ieee80211_debugfs_key_sta_del(struct ieee80211_key *key, |
diff --git a/net/mac80211/debugfs_netdev.c b/net/mac80211/debugfs_netdev.c index 475f89a8aee1..8165df578c92 100644 --- a/net/mac80211/debugfs_netdev.c +++ b/net/mac80211/debugfs_netdev.c | |||
| @@ -248,8 +248,8 @@ IEEE80211_IF_WFILE(min_discovery_timeout, | |||
| 248 | static void add_sta_files(struct ieee80211_sub_if_data *sdata) | 248 | static void add_sta_files(struct ieee80211_sub_if_data *sdata) |
| 249 | { | 249 | { |
| 250 | DEBUGFS_ADD(drop_unencrypted, sta); | 250 | DEBUGFS_ADD(drop_unencrypted, sta); |
| 251 | DEBUGFS_ADD(force_unicast_rateidx, ap); | 251 | DEBUGFS_ADD(force_unicast_rateidx, sta); |
| 252 | DEBUGFS_ADD(max_ratectrl_rateidx, ap); | 252 | DEBUGFS_ADD(max_ratectrl_rateidx, sta); |
| 253 | 253 | ||
| 254 | DEBUGFS_ADD(state, sta); | 254 | DEBUGFS_ADD(state, sta); |
| 255 | DEBUGFS_ADD(bssid, sta); | 255 | DEBUGFS_ADD(bssid, sta); |
| @@ -283,8 +283,8 @@ static void add_ap_files(struct ieee80211_sub_if_data *sdata) | |||
| 283 | static void add_wds_files(struct ieee80211_sub_if_data *sdata) | 283 | static void add_wds_files(struct ieee80211_sub_if_data *sdata) |
| 284 | { | 284 | { |
| 285 | DEBUGFS_ADD(drop_unencrypted, wds); | 285 | DEBUGFS_ADD(drop_unencrypted, wds); |
| 286 | DEBUGFS_ADD(force_unicast_rateidx, ap); | 286 | DEBUGFS_ADD(force_unicast_rateidx, wds); |
| 287 | DEBUGFS_ADD(max_ratectrl_rateidx, ap); | 287 | DEBUGFS_ADD(max_ratectrl_rateidx, wds); |
| 288 | 288 | ||
| 289 | DEBUGFS_ADD(peer, wds); | 289 | DEBUGFS_ADD(peer, wds); |
| 290 | } | 290 | } |
| @@ -292,8 +292,8 @@ static void add_wds_files(struct ieee80211_sub_if_data *sdata) | |||
| 292 | static void add_vlan_files(struct ieee80211_sub_if_data *sdata) | 292 | static void add_vlan_files(struct ieee80211_sub_if_data *sdata) |
| 293 | { | 293 | { |
| 294 | DEBUGFS_ADD(drop_unencrypted, vlan); | 294 | DEBUGFS_ADD(drop_unencrypted, vlan); |
| 295 | DEBUGFS_ADD(force_unicast_rateidx, ap); | 295 | DEBUGFS_ADD(force_unicast_rateidx, vlan); |
| 296 | DEBUGFS_ADD(max_ratectrl_rateidx, ap); | 296 | DEBUGFS_ADD(max_ratectrl_rateidx, vlan); |
| 297 | } | 297 | } |
| 298 | 298 | ||
| 299 | static void add_monitor_files(struct ieee80211_sub_if_data *sdata) | 299 | static void add_monitor_files(struct ieee80211_sub_if_data *sdata) |
| @@ -381,8 +381,8 @@ static void add_files(struct ieee80211_sub_if_data *sdata) | |||
| 381 | static void del_sta_files(struct ieee80211_sub_if_data *sdata) | 381 | static void del_sta_files(struct ieee80211_sub_if_data *sdata) |
| 382 | { | 382 | { |
| 383 | DEBUGFS_DEL(drop_unencrypted, sta); | 383 | DEBUGFS_DEL(drop_unencrypted, sta); |
| 384 | DEBUGFS_DEL(force_unicast_rateidx, ap); | 384 | DEBUGFS_DEL(force_unicast_rateidx, sta); |
| 385 | DEBUGFS_DEL(max_ratectrl_rateidx, ap); | 385 | DEBUGFS_DEL(max_ratectrl_rateidx, sta); |
| 386 | 386 | ||
| 387 | DEBUGFS_DEL(state, sta); | 387 | DEBUGFS_DEL(state, sta); |
| 388 | DEBUGFS_DEL(bssid, sta); | 388 | DEBUGFS_DEL(bssid, sta); |
| @@ -416,8 +416,8 @@ static void del_ap_files(struct ieee80211_sub_if_data *sdata) | |||
| 416 | static void del_wds_files(struct ieee80211_sub_if_data *sdata) | 416 | static void del_wds_files(struct ieee80211_sub_if_data *sdata) |
| 417 | { | 417 | { |
| 418 | DEBUGFS_DEL(drop_unencrypted, wds); | 418 | DEBUGFS_DEL(drop_unencrypted, wds); |
| 419 | DEBUGFS_DEL(force_unicast_rateidx, ap); | 419 | DEBUGFS_DEL(force_unicast_rateidx, wds); |
| 420 | DEBUGFS_DEL(max_ratectrl_rateidx, ap); | 420 | DEBUGFS_DEL(max_ratectrl_rateidx, wds); |
| 421 | 421 | ||
| 422 | DEBUGFS_DEL(peer, wds); | 422 | DEBUGFS_DEL(peer, wds); |
| 423 | } | 423 | } |
| @@ -425,8 +425,8 @@ static void del_wds_files(struct ieee80211_sub_if_data *sdata) | |||
| 425 | static void del_vlan_files(struct ieee80211_sub_if_data *sdata) | 425 | static void del_vlan_files(struct ieee80211_sub_if_data *sdata) |
| 426 | { | 426 | { |
| 427 | DEBUGFS_DEL(drop_unencrypted, vlan); | 427 | DEBUGFS_DEL(drop_unencrypted, vlan); |
| 428 | DEBUGFS_DEL(force_unicast_rateidx, ap); | 428 | DEBUGFS_DEL(force_unicast_rateidx, vlan); |
| 429 | DEBUGFS_DEL(max_ratectrl_rateidx, ap); | 429 | DEBUGFS_DEL(max_ratectrl_rateidx, vlan); |
| 430 | } | 430 | } |
| 431 | 431 | ||
| 432 | static void del_monitor_files(struct ieee80211_sub_if_data *sdata) | 432 | static void del_monitor_files(struct ieee80211_sub_if_data *sdata) |
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index ec59345af65b..4498d8713652 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h | |||
| @@ -470,6 +470,8 @@ struct ieee80211_sub_if_data { | |||
| 470 | struct dentry *auth_transaction; | 470 | struct dentry *auth_transaction; |
| 471 | struct dentry *flags; | 471 | struct dentry *flags; |
| 472 | struct dentry *num_beacons_sta; | 472 | struct dentry *num_beacons_sta; |
| 473 | struct dentry *force_unicast_rateidx; | ||
| 474 | struct dentry *max_ratectrl_rateidx; | ||
| 473 | } sta; | 475 | } sta; |
| 474 | struct { | 476 | struct { |
| 475 | struct dentry *drop_unencrypted; | 477 | struct dentry *drop_unencrypted; |
| @@ -483,15 +485,21 @@ struct ieee80211_sub_if_data { | |||
| 483 | struct { | 485 | struct { |
| 484 | struct dentry *drop_unencrypted; | 486 | struct dentry *drop_unencrypted; |
| 485 | struct dentry *peer; | 487 | struct dentry *peer; |
| 488 | struct dentry *force_unicast_rateidx; | ||
| 489 | struct dentry *max_ratectrl_rateidx; | ||
| 486 | } wds; | 490 | } wds; |
| 487 | struct { | 491 | struct { |
| 488 | struct dentry *drop_unencrypted; | 492 | struct dentry *drop_unencrypted; |
| 493 | struct dentry *force_unicast_rateidx; | ||
| 494 | struct dentry *max_ratectrl_rateidx; | ||
| 489 | } vlan; | 495 | } vlan; |
| 490 | struct { | 496 | struct { |
| 491 | struct dentry *mode; | 497 | struct dentry *mode; |
| 492 | } monitor; | 498 | } monitor; |
| 493 | struct dentry *default_key; | ||
| 494 | } debugfs; | 499 | } debugfs; |
| 500 | struct { | ||
| 501 | struct dentry *default_key; | ||
| 502 | } common_debugfs; | ||
| 495 | 503 | ||
| 496 | #ifdef CONFIG_MAC80211_MESH | 504 | #ifdef CONFIG_MAC80211_MESH |
| 497 | struct dentry *mesh_stats_dir; | 505 | struct dentry *mesh_stats_dir; |
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c index b5933b271491..35f2f95f2fa7 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c | |||
| @@ -383,7 +383,7 @@ errcopy: | |||
| 383 | hlist_for_each_safe(p, q, &newtbl->hash_buckets[i]) | 383 | hlist_for_each_safe(p, q, &newtbl->hash_buckets[i]) |
| 384 | tbl->free_node(p, 0); | 384 | tbl->free_node(p, 0); |
| 385 | } | 385 | } |
| 386 | __mesh_table_free(tbl); | 386 | __mesh_table_free(newtbl); |
| 387 | endgrow: | 387 | endgrow: |
| 388 | return NULL; | 388 | return NULL; |
| 389 | } | 389 | } |
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index e1d11c9b6729..9bb68c6a8f44 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c | |||
| @@ -478,51 +478,21 @@ int ieee80211_ht_addt_info_ie_to_ht_bss_info( | |||
| 478 | static void ieee80211_sta_send_associnfo(struct net_device *dev, | 478 | static void ieee80211_sta_send_associnfo(struct net_device *dev, |
| 479 | struct ieee80211_if_sta *ifsta) | 479 | struct ieee80211_if_sta *ifsta) |
| 480 | { | 480 | { |
| 481 | char *buf; | ||
| 482 | size_t len; | ||
| 483 | int i; | ||
| 484 | union iwreq_data wrqu; | 481 | union iwreq_data wrqu; |
| 485 | 482 | ||
| 486 | if (!ifsta->assocreq_ies && !ifsta->assocresp_ies) | ||
| 487 | return; | ||
| 488 | |||
| 489 | buf = kmalloc(50 + 2 * (ifsta->assocreq_ies_len + | ||
| 490 | ifsta->assocresp_ies_len), GFP_KERNEL); | ||
| 491 | if (!buf) | ||
| 492 | return; | ||
| 493 | |||
| 494 | len = sprintf(buf, "ASSOCINFO("); | ||
| 495 | if (ifsta->assocreq_ies) { | 483 | if (ifsta->assocreq_ies) { |
| 496 | len += sprintf(buf + len, "ReqIEs="); | 484 | memset(&wrqu, 0, sizeof(wrqu)); |
| 497 | for (i = 0; i < ifsta->assocreq_ies_len; i++) { | 485 | wrqu.data.length = ifsta->assocreq_ies_len; |
| 498 | len += sprintf(buf + len, "%02x", | 486 | wireless_send_event(dev, IWEVASSOCREQIE, &wrqu, |
| 499 | ifsta->assocreq_ies[i]); | 487 | ifsta->assocreq_ies); |
| 500 | } | ||
| 501 | } | 488 | } |
| 502 | if (ifsta->assocresp_ies) { | ||
| 503 | if (ifsta->assocreq_ies) | ||
| 504 | len += sprintf(buf + len, " "); | ||
| 505 | len += sprintf(buf + len, "RespIEs="); | ||
| 506 | for (i = 0; i < ifsta->assocresp_ies_len; i++) { | ||
| 507 | len += sprintf(buf + len, "%02x", | ||
| 508 | ifsta->assocresp_ies[i]); | ||
| 509 | } | ||
| 510 | } | ||
| 511 | len += sprintf(buf + len, ")"); | ||
| 512 | 489 | ||
| 513 | if (len > IW_CUSTOM_MAX) { | 490 | if (ifsta->assocresp_ies) { |
| 514 | len = sprintf(buf, "ASSOCRESPIE="); | 491 | memset(&wrqu, 0, sizeof(wrqu)); |
| 515 | for (i = 0; i < ifsta->assocresp_ies_len; i++) { | 492 | wrqu.data.length = ifsta->assocresp_ies_len; |
| 516 | len += sprintf(buf + len, "%02x", | 493 | wireless_send_event(dev, IWEVASSOCRESPIE, &wrqu, |
| 517 | ifsta->assocresp_ies[i]); | 494 | ifsta->assocresp_ies); |
| 518 | } | ||
| 519 | } | 495 | } |
| 520 | |||
| 521 | memset(&wrqu, 0, sizeof(wrqu)); | ||
| 522 | wrqu.data.length = len; | ||
| 523 | wireless_send_event(dev, IWEVCUSTOM, &wrqu, buf); | ||
| 524 | |||
| 525 | kfree(buf); | ||
| 526 | } | 496 | } |
| 527 | 497 | ||
| 528 | 498 | ||
| @@ -813,7 +783,7 @@ static void ieee80211_send_assoc(struct net_device *dev, | |||
| 813 | } | 783 | } |
| 814 | } | 784 | } |
| 815 | 785 | ||
| 816 | if (count == 8) { | 786 | if (rates_len > count) { |
| 817 | pos = skb_put(skb, rates_len - count + 2); | 787 | pos = skb_put(skb, rates_len - count + 2); |
| 818 | *pos++ = WLAN_EID_EXT_SUPP_RATES; | 788 | *pos++ = WLAN_EID_EXT_SUPP_RATES; |
| 819 | *pos++ = rates_len - count; | 789 | *pos++ = rates_len - count; |
| @@ -2103,6 +2073,8 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata, | |||
| 2103 | rcu_read_unlock(); | 2073 | rcu_read_unlock(); |
| 2104 | return; | 2074 | return; |
| 2105 | } | 2075 | } |
| 2076 | /* update new sta with its last rx activity */ | ||
| 2077 | sta->last_rx = jiffies; | ||
| 2106 | } | 2078 | } |
| 2107 | 2079 | ||
| 2108 | /* | 2080 | /* |
| @@ -2866,7 +2838,7 @@ static void ieee80211_rx_bss_info(struct net_device *dev, | |||
| 2866 | jiffies); | 2838 | jiffies); |
| 2867 | #endif /* CONFIG_MAC80211_IBSS_DEBUG */ | 2839 | #endif /* CONFIG_MAC80211_IBSS_DEBUG */ |
| 2868 | if (beacon_timestamp > rx_timestamp) { | 2840 | if (beacon_timestamp > rx_timestamp) { |
| 2869 | #ifndef CONFIG_MAC80211_IBSS_DEBUG | 2841 | #ifdef CONFIG_MAC80211_IBSS_DEBUG |
| 2870 | printk(KERN_DEBUG "%s: beacon TSF higher than " | 2842 | printk(KERN_DEBUG "%s: beacon TSF higher than " |
| 2871 | "local TSF - IBSS merge with BSSID %s\n", | 2843 | "local TSF - IBSS merge with BSSID %s\n", |
| 2872 | dev->name, print_mac(mac, mgmt->bssid)); | 2844 | dev->name, print_mac(mac, mgmt->bssid)); |
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c index 105a616c5c78..a8752031adcb 100644 --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c | |||
| @@ -968,7 +968,7 @@ ctnetlink_change_helper(struct nf_conn *ct, struct nlattr *cda[]) | |||
| 968 | /* need to zero data of old helper */ | 968 | /* need to zero data of old helper */ |
| 969 | memset(&help->help, 0, sizeof(help->help)); | 969 | memset(&help->help, 0, sizeof(help->help)); |
| 970 | } else { | 970 | } else { |
| 971 | help = nf_ct_helper_ext_add(ct, GFP_KERNEL); | 971 | help = nf_ct_helper_ext_add(ct, GFP_ATOMIC); |
| 972 | if (help == NULL) | 972 | if (help == NULL) |
| 973 | return -ENOMEM; | 973 | return -ENOMEM; |
| 974 | } | 974 | } |
| @@ -1136,16 +1136,33 @@ ctnetlink_create_conntrack(struct nlattr *cda[], | |||
| 1136 | ct->timeout.expires = jiffies + ct->timeout.expires * HZ; | 1136 | ct->timeout.expires = jiffies + ct->timeout.expires * HZ; |
| 1137 | ct->status |= IPS_CONFIRMED; | 1137 | ct->status |= IPS_CONFIRMED; |
| 1138 | 1138 | ||
| 1139 | rcu_read_lock(); | ||
| 1140 | helper = __nf_ct_helper_find(rtuple); | ||
| 1141 | if (helper) { | ||
| 1142 | help = nf_ct_helper_ext_add(ct, GFP_ATOMIC); | ||
| 1143 | if (help == NULL) { | ||
| 1144 | rcu_read_unlock(); | ||
| 1145 | err = -ENOMEM; | ||
| 1146 | goto err; | ||
| 1147 | } | ||
| 1148 | /* not in hash table yet so not strictly necessary */ | ||
| 1149 | rcu_assign_pointer(help->helper, helper); | ||
| 1150 | } | ||
| 1151 | |||
| 1139 | if (cda[CTA_STATUS]) { | 1152 | if (cda[CTA_STATUS]) { |
| 1140 | err = ctnetlink_change_status(ct, cda); | 1153 | err = ctnetlink_change_status(ct, cda); |
| 1141 | if (err < 0) | 1154 | if (err < 0) { |
| 1155 | rcu_read_unlock(); | ||
| 1142 | goto err; | 1156 | goto err; |
| 1157 | } | ||
| 1143 | } | 1158 | } |
| 1144 | 1159 | ||
| 1145 | if (cda[CTA_PROTOINFO]) { | 1160 | if (cda[CTA_PROTOINFO]) { |
| 1146 | err = ctnetlink_change_protoinfo(ct, cda); | 1161 | err = ctnetlink_change_protoinfo(ct, cda); |
| 1147 | if (err < 0) | 1162 | if (err < 0) { |
| 1163 | rcu_read_unlock(); | ||
| 1148 | goto err; | 1164 | goto err; |
| 1165 | } | ||
| 1149 | } | 1166 | } |
| 1150 | 1167 | ||
| 1151 | nf_ct_acct_ext_add(ct, GFP_KERNEL); | 1168 | nf_ct_acct_ext_add(ct, GFP_KERNEL); |
| @@ -1155,19 +1172,6 @@ ctnetlink_create_conntrack(struct nlattr *cda[], | |||
| 1155 | ct->mark = ntohl(nla_get_be32(cda[CTA_MARK])); | 1172 | ct->mark = ntohl(nla_get_be32(cda[CTA_MARK])); |
| 1156 | #endif | 1173 | #endif |
| 1157 | 1174 | ||
| 1158 | rcu_read_lock(); | ||
| 1159 | helper = __nf_ct_helper_find(rtuple); | ||
| 1160 | if (helper) { | ||
| 1161 | help = nf_ct_helper_ext_add(ct, GFP_KERNEL); | ||
| 1162 | if (help == NULL) { | ||
| 1163 | rcu_read_unlock(); | ||
| 1164 | err = -ENOMEM; | ||
| 1165 | goto err; | ||
| 1166 | } | ||
| 1167 | /* not in hash table yet so not strictly necessary */ | ||
| 1168 | rcu_assign_pointer(help->helper, helper); | ||
| 1169 | } | ||
| 1170 | |||
| 1171 | /* setup master conntrack: this is a confirmed expectation */ | 1175 | /* setup master conntrack: this is a confirmed expectation */ |
| 1172 | if (master_ct) { | 1176 | if (master_ct) { |
| 1173 | __set_bit(IPS_EXPECTED_BIT, &ct->status); | 1177 | __set_bit(IPS_EXPECTED_BIT, &ct->status); |
diff --git a/net/rfkill/rfkill.c b/net/rfkill/rfkill.c index d2d45655cd1a..74aecc098bad 100644 --- a/net/rfkill/rfkill.c +++ b/net/rfkill/rfkill.c | |||
| @@ -150,6 +150,8 @@ static void update_rfkill_state(struct rfkill *rfkill) | |||
| 150 | * calls and handling all the red tape such as issuing notifications | 150 | * calls and handling all the red tape such as issuing notifications |
| 151 | * if the call is successful. | 151 | * if the call is successful. |
| 152 | * | 152 | * |
| 153 | * Suspended devices are not touched at all, and -EAGAIN is returned. | ||
| 154 | * | ||
| 153 | * Note that the @force parameter cannot override a (possibly cached) | 155 | * Note that the @force parameter cannot override a (possibly cached) |
| 154 | * state of RFKILL_STATE_HARD_BLOCKED. Any device making use of | 156 | * state of RFKILL_STATE_HARD_BLOCKED. Any device making use of |
| 155 | * RFKILL_STATE_HARD_BLOCKED implements either get_state() or | 157 | * RFKILL_STATE_HARD_BLOCKED implements either get_state() or |
| @@ -168,6 +170,9 @@ static int rfkill_toggle_radio(struct rfkill *rfkill, | |||
| 168 | int retval = 0; | 170 | int retval = 0; |
| 169 | enum rfkill_state oldstate, newstate; | 171 | enum rfkill_state oldstate, newstate; |
| 170 | 172 | ||
| 173 | if (unlikely(rfkill->dev.power.power_state.event & PM_EVENT_SLEEP)) | ||
| 174 | return -EBUSY; | ||
| 175 | |||
| 171 | oldstate = rfkill->state; | 176 | oldstate = rfkill->state; |
| 172 | 177 | ||
| 173 | if (rfkill->get_state && !force && | 178 | if (rfkill->get_state && !force && |
| @@ -214,7 +219,7 @@ static int rfkill_toggle_radio(struct rfkill *rfkill, | |||
| 214 | * | 219 | * |
| 215 | * This function toggles the state of all switches of given type, | 220 | * This function toggles the state of all switches of given type, |
| 216 | * unless a specific switch is claimed by userspace (in which case, | 221 | * unless a specific switch is claimed by userspace (in which case, |
| 217 | * that switch is left alone). | 222 | * that switch is left alone) or suspended. |
| 218 | */ | 223 | */ |
| 219 | void rfkill_switch_all(enum rfkill_type type, enum rfkill_state state) | 224 | void rfkill_switch_all(enum rfkill_type type, enum rfkill_state state) |
| 220 | { | 225 | { |
| @@ -239,8 +244,8 @@ EXPORT_SYMBOL(rfkill_switch_all); | |||
| 239 | /** | 244 | /** |
| 240 | * rfkill_epo - emergency power off all transmitters | 245 | * rfkill_epo - emergency power off all transmitters |
| 241 | * | 246 | * |
| 242 | * This kicks all rfkill devices to RFKILL_STATE_SOFT_BLOCKED, ignoring | 247 | * This kicks all non-suspended rfkill devices to RFKILL_STATE_SOFT_BLOCKED, |
| 243 | * everything in its path but rfkill_mutex and rfkill->mutex. | 248 | * ignoring everything in its path but rfkill_mutex and rfkill->mutex. |
| 244 | */ | 249 | */ |
| 245 | void rfkill_epo(void) | 250 | void rfkill_epo(void) |
| 246 | { | 251 | { |
| @@ -372,7 +377,7 @@ static ssize_t rfkill_claim_show(struct device *dev, | |||
| 372 | { | 377 | { |
| 373 | struct rfkill *rfkill = to_rfkill(dev); | 378 | struct rfkill *rfkill = to_rfkill(dev); |
| 374 | 379 | ||
| 375 | return sprintf(buf, "%d", rfkill->user_claim); | 380 | return sprintf(buf, "%d\n", rfkill->user_claim); |
| 376 | } | 381 | } |
| 377 | 382 | ||
| 378 | static ssize_t rfkill_claim_store(struct device *dev, | 383 | static ssize_t rfkill_claim_store(struct device *dev, |
| @@ -458,13 +463,14 @@ static int rfkill_resume(struct device *dev) | |||
| 458 | if (dev->power.power_state.event != PM_EVENT_ON) { | 463 | if (dev->power.power_state.event != PM_EVENT_ON) { |
| 459 | mutex_lock(&rfkill->mutex); | 464 | mutex_lock(&rfkill->mutex); |
| 460 | 465 | ||
| 466 | dev->power.power_state.event = PM_EVENT_ON; | ||
| 467 | |||
| 461 | /* restore radio state AND notify everybody */ | 468 | /* restore radio state AND notify everybody */ |
| 462 | rfkill_toggle_radio(rfkill, rfkill->state, 1); | 469 | rfkill_toggle_radio(rfkill, rfkill->state, 1); |
| 463 | 470 | ||
| 464 | mutex_unlock(&rfkill->mutex); | 471 | mutex_unlock(&rfkill->mutex); |
| 465 | } | 472 | } |
| 466 | 473 | ||
| 467 | dev->power.power_state = PMSG_ON; | ||
| 468 | return 0; | 474 | return 0; |
| 469 | } | 475 | } |
| 470 | #else | 476 | #else |
diff --git a/net/rxrpc/ar-accept.c b/net/rxrpc/ar-accept.c index bdfb77417794..77228f28fa36 100644 --- a/net/rxrpc/ar-accept.c +++ b/net/rxrpc/ar-accept.c | |||
| @@ -100,7 +100,7 @@ static int rxrpc_accept_incoming_call(struct rxrpc_local *local, | |||
| 100 | 100 | ||
| 101 | trans = rxrpc_get_transport(local, peer, GFP_NOIO); | 101 | trans = rxrpc_get_transport(local, peer, GFP_NOIO); |
| 102 | rxrpc_put_peer(peer); | 102 | rxrpc_put_peer(peer); |
| 103 | if (!trans) { | 103 | if (IS_ERR(trans)) { |
| 104 | _debug("no trans"); | 104 | _debug("no trans"); |
| 105 | ret = -EBUSY; | 105 | ret = -EBUSY; |
| 106 | goto error; | 106 | goto error; |
diff --git a/net/sched/act_api.c b/net/sched/act_api.c index 26c7e1f9a350..9974b3f04f05 100644 --- a/net/sched/act_api.c +++ b/net/sched/act_api.c | |||
| @@ -751,7 +751,7 @@ static int tca_action_flush(struct nlattr *nla, struct nlmsghdr *n, u32 pid) | |||
| 751 | struct nlattr *tb[TCA_ACT_MAX+1]; | 751 | struct nlattr *tb[TCA_ACT_MAX+1]; |
| 752 | struct nlattr *kind; | 752 | struct nlattr *kind; |
| 753 | struct tc_action *a = create_a(0); | 753 | struct tc_action *a = create_a(0); |
| 754 | int err = -EINVAL; | 754 | int err = -ENOMEM; |
| 755 | 755 | ||
| 756 | if (a == NULL) { | 756 | if (a == NULL) { |
| 757 | printk("tca_action_flush: couldnt create tc_action\n"); | 757 | printk("tca_action_flush: couldnt create tc_action\n"); |
| @@ -762,7 +762,7 @@ static int tca_action_flush(struct nlattr *nla, struct nlmsghdr *n, u32 pid) | |||
| 762 | if (!skb) { | 762 | if (!skb) { |
| 763 | printk("tca_action_flush: failed skb alloc\n"); | 763 | printk("tca_action_flush: failed skb alloc\n"); |
| 764 | kfree(a); | 764 | kfree(a); |
| 765 | return -ENOBUFS; | 765 | return err; |
| 766 | } | 766 | } |
| 767 | 767 | ||
| 768 | b = skb_tail_pointer(skb); | 768 | b = skb_tail_pointer(skb); |
| @@ -790,6 +790,8 @@ static int tca_action_flush(struct nlattr *nla, struct nlmsghdr *n, u32 pid) | |||
| 790 | err = a->ops->walk(skb, &dcb, RTM_DELACTION, a); | 790 | err = a->ops->walk(skb, &dcb, RTM_DELACTION, a); |
| 791 | if (err < 0) | 791 | if (err < 0) |
| 792 | goto nla_put_failure; | 792 | goto nla_put_failure; |
| 793 | if (err == 0) | ||
| 794 | goto noflush_out; | ||
| 793 | 795 | ||
| 794 | nla_nest_end(skb, nest); | 796 | nla_nest_end(skb, nest); |
| 795 | 797 | ||
| @@ -807,6 +809,7 @@ nla_put_failure: | |||
| 807 | nlmsg_failure: | 809 | nlmsg_failure: |
| 808 | module_put(a->ops->owner); | 810 | module_put(a->ops->owner); |
| 809 | err_out: | 811 | err_out: |
| 812 | noflush_out: | ||
| 810 | kfree_skb(skb); | 813 | kfree_skb(skb); |
| 811 | kfree(a); | 814 | kfree(a); |
| 812 | return err; | 815 | return err; |
| @@ -824,8 +827,10 @@ tca_action_gd(struct nlattr *nla, struct nlmsghdr *n, u32 pid, int event) | |||
| 824 | return ret; | 827 | return ret; |
| 825 | 828 | ||
| 826 | if (event == RTM_DELACTION && n->nlmsg_flags&NLM_F_ROOT) { | 829 | if (event == RTM_DELACTION && n->nlmsg_flags&NLM_F_ROOT) { |
| 827 | if (tb[0] != NULL && tb[1] == NULL) | 830 | if (tb[1] != NULL) |
| 828 | return tca_action_flush(tb[0], n, pid); | 831 | return tca_action_flush(tb[1], n, pid); |
| 832 | else | ||
| 833 | return -EINVAL; | ||
| 829 | } | 834 | } |
| 830 | 835 | ||
| 831 | for (i = 1; i <= TCA_ACT_MAX_PRIO && tb[i]; i++) { | 836 | for (i = 1; i <= TCA_ACT_MAX_PRIO && tb[i]; i++) { |
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c index d2b6f54a6261..8eb79e92e94c 100644 --- a/net/sched/cls_api.c +++ b/net/sched/cls_api.c | |||
| @@ -205,7 +205,7 @@ replay: | |||
| 205 | } | 205 | } |
| 206 | } | 206 | } |
| 207 | 207 | ||
| 208 | root_lock = qdisc_root_lock(q); | 208 | root_lock = qdisc_root_sleeping_lock(q); |
| 209 | 209 | ||
| 210 | if (tp == NULL) { | 210 | if (tp == NULL) { |
| 211 | /* Proto-tcf does not exist, create new one */ | 211 | /* Proto-tcf does not exist, create new one */ |
| @@ -280,7 +280,7 @@ replay: | |||
| 280 | if (n->nlmsg_type == RTM_DELTFILTER && t->tcm_handle == 0) { | 280 | if (n->nlmsg_type == RTM_DELTFILTER && t->tcm_handle == 0) { |
| 281 | spin_lock_bh(root_lock); | 281 | spin_lock_bh(root_lock); |
| 282 | *back = tp->next; | 282 | *back = tp->next; |
| 283 | spin_lock_bh(root_lock); | 283 | spin_unlock_bh(root_lock); |
| 284 | 284 | ||
| 285 | tfilter_notify(skb, n, tp, fh, RTM_DELTFILTER); | 285 | tfilter_notify(skb, n, tp, fh, RTM_DELTFILTER); |
| 286 | tcf_destroy(tp); | 286 | tcf_destroy(tp); |
diff --git a/net/sched/cls_route.c b/net/sched/cls_route.c index 481260a4f10f..e3d8455eebc2 100644 --- a/net/sched/cls_route.c +++ b/net/sched/cls_route.c | |||
| @@ -75,7 +75,7 @@ static __inline__ int route4_fastmap_hash(u32 id, int iif) | |||
| 75 | static inline | 75 | static inline |
| 76 | void route4_reset_fastmap(struct Qdisc *q, struct route4_head *head, u32 id) | 76 | void route4_reset_fastmap(struct Qdisc *q, struct route4_head *head, u32 id) |
| 77 | { | 77 | { |
| 78 | spinlock_t *root_lock = qdisc_root_lock(q); | 78 | spinlock_t *root_lock = qdisc_root_sleeping_lock(q); |
| 79 | 79 | ||
| 80 | spin_lock_bh(root_lock); | 80 | spin_lock_bh(root_lock); |
| 81 | memset(head->fastmap, 0, sizeof(head->fastmap)); | 81 | memset(head->fastmap, 0, sizeof(head->fastmap)); |
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c index ba1d121f3127..1122c952aa99 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/kmod.h> | 27 | #include <linux/kmod.h> |
| 28 | #include <linux/list.h> | 28 | #include <linux/list.h> |
| 29 | #include <linux/hrtimer.h> | 29 | #include <linux/hrtimer.h> |
| 30 | #include <linux/lockdep.h> | ||
| 30 | 31 | ||
| 31 | #include <net/net_namespace.h> | 32 | #include <net/net_namespace.h> |
| 32 | #include <net/sock.h> | 33 | #include <net/sock.h> |
| @@ -183,24 +184,68 @@ EXPORT_SYMBOL(unregister_qdisc); | |||
| 183 | (root qdisc, all its children, children of children etc.) | 184 | (root qdisc, all its children, children of children etc.) |
| 184 | */ | 185 | */ |
| 185 | 186 | ||
| 187 | struct Qdisc *qdisc_match_from_root(struct Qdisc *root, u32 handle) | ||
| 188 | { | ||
| 189 | struct Qdisc *q; | ||
| 190 | |||
| 191 | if (!(root->flags & TCQ_F_BUILTIN) && | ||
| 192 | root->handle == handle) | ||
| 193 | return root; | ||
| 194 | |||
| 195 | list_for_each_entry(q, &root->list, list) { | ||
| 196 | if (q->handle == handle) | ||
| 197 | return q; | ||
| 198 | } | ||
| 199 | return NULL; | ||
| 200 | } | ||
| 201 | |||
| 202 | /* | ||
| 203 | * This lock is needed until some qdiscs stop calling qdisc_tree_decrease_qlen() | ||
| 204 | * without rtnl_lock(); currently hfsc_dequeue(), netem_dequeue(), tbf_dequeue() | ||
| 205 | */ | ||
| 206 | static DEFINE_SPINLOCK(qdisc_list_lock); | ||
| 207 | |||
| 208 | static void qdisc_list_add(struct Qdisc *q) | ||
| 209 | { | ||
| 210 | if ((q->parent != TC_H_ROOT) && !(q->flags & TCQ_F_INGRESS)) { | ||
| 211 | spin_lock_bh(&qdisc_list_lock); | ||
| 212 | list_add_tail(&q->list, &qdisc_root_sleeping(q)->list); | ||
| 213 | spin_unlock_bh(&qdisc_list_lock); | ||
| 214 | } | ||
| 215 | } | ||
| 216 | |||
| 217 | void qdisc_list_del(struct Qdisc *q) | ||
| 218 | { | ||
| 219 | if ((q->parent != TC_H_ROOT) && !(q->flags & TCQ_F_INGRESS)) { | ||
| 220 | spin_lock_bh(&qdisc_list_lock); | ||
| 221 | list_del(&q->list); | ||
| 222 | spin_unlock_bh(&qdisc_list_lock); | ||
| 223 | } | ||
| 224 | } | ||
| 225 | EXPORT_SYMBOL(qdisc_list_del); | ||
| 226 | |||
| 186 | struct Qdisc *qdisc_lookup(struct net_device *dev, u32 handle) | 227 | struct Qdisc *qdisc_lookup(struct net_device *dev, u32 handle) |
| 187 | { | 228 | { |
| 188 | unsigned int i; | 229 | unsigned int i; |
| 230 | struct Qdisc *q; | ||
| 231 | |||
| 232 | spin_lock_bh(&qdisc_list_lock); | ||
| 189 | 233 | ||
| 190 | for (i = 0; i < dev->num_tx_queues; i++) { | 234 | for (i = 0; i < dev->num_tx_queues; i++) { |
| 191 | struct netdev_queue *txq = netdev_get_tx_queue(dev, i); | 235 | struct netdev_queue *txq = netdev_get_tx_queue(dev, i); |
| 192 | struct Qdisc *q, *txq_root = txq->qdisc_sleeping; | 236 | struct Qdisc *txq_root = txq->qdisc_sleeping; |
| 193 | |||
| 194 | if (!(txq_root->flags & TCQ_F_BUILTIN) && | ||
| 195 | txq_root->handle == handle) | ||
| 196 | return txq_root; | ||
| 197 | 237 | ||
| 198 | list_for_each_entry(q, &txq_root->list, list) { | 238 | q = qdisc_match_from_root(txq_root, handle); |
| 199 | if (q->handle == handle) | 239 | if (q) |
| 200 | return q; | 240 | goto unlock; |
| 201 | } | ||
| 202 | } | 241 | } |
| 203 | return NULL; | 242 | |
| 243 | q = qdisc_match_from_root(dev->rx_queue.qdisc_sleeping, handle); | ||
| 244 | |||
| 245 | unlock: | ||
| 246 | spin_unlock_bh(&qdisc_list_lock); | ||
| 247 | |||
| 248 | return q; | ||
| 204 | } | 249 | } |
| 205 | 250 | ||
| 206 | static struct Qdisc *qdisc_leaf(struct Qdisc *p, u32 classid) | 251 | static struct Qdisc *qdisc_leaf(struct Qdisc *p, u32 classid) |
| @@ -416,7 +461,7 @@ static enum hrtimer_restart qdisc_watchdog(struct hrtimer *timer) | |||
| 416 | 461 | ||
| 417 | wd->qdisc->flags &= ~TCQ_F_THROTTLED; | 462 | wd->qdisc->flags &= ~TCQ_F_THROTTLED; |
| 418 | smp_wmb(); | 463 | smp_wmb(); |
| 419 | __netif_schedule(wd->qdisc); | 464 | __netif_schedule(qdisc_root(wd->qdisc)); |
| 420 | 465 | ||
| 421 | return HRTIMER_NORESTART; | 466 | return HRTIMER_NORESTART; |
| 422 | } | 467 | } |
| @@ -433,6 +478,10 @@ void qdisc_watchdog_schedule(struct qdisc_watchdog *wd, psched_time_t expires) | |||
| 433 | { | 478 | { |
| 434 | ktime_t time; | 479 | ktime_t time; |
| 435 | 480 | ||
| 481 | if (test_bit(__QDISC_STATE_DEACTIVATED, | ||
| 482 | &qdisc_root_sleeping(wd->qdisc)->state)) | ||
| 483 | return; | ||
| 484 | |||
| 436 | wd->qdisc->flags |= TCQ_F_THROTTLED; | 485 | wd->qdisc->flags |= TCQ_F_THROTTLED; |
| 437 | time = ktime_set(0, 0); | 486 | time = ktime_set(0, 0); |
| 438 | time = ktime_add_ns(time, PSCHED_US2NS(expires)); | 487 | time = ktime_add_ns(time, PSCHED_US2NS(expires)); |
| @@ -575,7 +624,7 @@ static struct Qdisc *dev_graft_qdisc(struct netdev_queue *dev_queue, | |||
| 575 | struct Qdisc *oqdisc = dev_queue->qdisc_sleeping; | 624 | struct Qdisc *oqdisc = dev_queue->qdisc_sleeping; |
| 576 | spinlock_t *root_lock; | 625 | spinlock_t *root_lock; |
| 577 | 626 | ||
| 578 | root_lock = qdisc_root_lock(oqdisc); | 627 | root_lock = qdisc_lock(oqdisc); |
| 579 | spin_lock_bh(root_lock); | 628 | spin_lock_bh(root_lock); |
| 580 | 629 | ||
| 581 | /* Prune old scheduler */ | 630 | /* Prune old scheduler */ |
| @@ -586,7 +635,7 @@ static struct Qdisc *dev_graft_qdisc(struct netdev_queue *dev_queue, | |||
| 586 | if (qdisc == NULL) | 635 | if (qdisc == NULL) |
| 587 | qdisc = &noop_qdisc; | 636 | qdisc = &noop_qdisc; |
| 588 | dev_queue->qdisc_sleeping = qdisc; | 637 | dev_queue->qdisc_sleeping = qdisc; |
| 589 | dev_queue->qdisc = &noop_qdisc; | 638 | rcu_assign_pointer(dev_queue->qdisc, &noop_qdisc); |
| 590 | 639 | ||
| 591 | spin_unlock_bh(root_lock); | 640 | spin_unlock_bh(root_lock); |
| 592 | 641 | ||
| @@ -627,11 +676,8 @@ static void notify_and_destroy(struct sk_buff *skb, struct nlmsghdr *n, u32 clid | |||
| 627 | if (new || old) | 676 | if (new || old) |
| 628 | qdisc_notify(skb, n, clid, old, new); | 677 | qdisc_notify(skb, n, clid, old, new); |
| 629 | 678 | ||
| 630 | if (old) { | 679 | if (old) |
| 631 | spin_lock_bh(&old->q.lock); | ||
| 632 | qdisc_destroy(old); | 680 | qdisc_destroy(old); |
| 633 | spin_unlock_bh(&old->q.lock); | ||
| 634 | } | ||
| 635 | } | 681 | } |
| 636 | 682 | ||
| 637 | /* Graft qdisc "new" to class "classid" of qdisc "parent" or | 683 | /* Graft qdisc "new" to class "classid" of qdisc "parent" or |
| @@ -697,6 +743,10 @@ static int qdisc_graft(struct net_device *dev, struct Qdisc *parent, | |||
| 697 | return err; | 743 | return err; |
| 698 | } | 744 | } |
| 699 | 745 | ||
| 746 | /* lockdep annotation is needed for ingress; egress gets it only for name */ | ||
| 747 | static struct lock_class_key qdisc_tx_lock; | ||
| 748 | static struct lock_class_key qdisc_rx_lock; | ||
| 749 | |||
| 700 | /* | 750 | /* |
| 701 | Allocate and initialize new qdisc. | 751 | Allocate and initialize new qdisc. |
| 702 | 752 | ||
| @@ -757,6 +807,7 @@ qdisc_create(struct net_device *dev, struct netdev_queue *dev_queue, | |||
| 757 | if (handle == TC_H_INGRESS) { | 807 | if (handle == TC_H_INGRESS) { |
| 758 | sch->flags |= TCQ_F_INGRESS; | 808 | sch->flags |= TCQ_F_INGRESS; |
| 759 | handle = TC_H_MAKE(TC_H_INGRESS, 0); | 809 | handle = TC_H_MAKE(TC_H_INGRESS, 0); |
| 810 | lockdep_set_class(qdisc_lock(sch), &qdisc_rx_lock); | ||
| 760 | } else { | 811 | } else { |
| 761 | if (handle == 0) { | 812 | if (handle == 0) { |
| 762 | handle = qdisc_alloc_handle(dev); | 813 | handle = qdisc_alloc_handle(dev); |
| @@ -764,6 +815,7 @@ qdisc_create(struct net_device *dev, struct netdev_queue *dev_queue, | |||
| 764 | if (handle == 0) | 815 | if (handle == 0) |
| 765 | goto err_out3; | 816 | goto err_out3; |
| 766 | } | 817 | } |
| 818 | lockdep_set_class(qdisc_lock(sch), &qdisc_tx_lock); | ||
| 767 | } | 819 | } |
| 768 | 820 | ||
| 769 | sch->handle = handle; | 821 | sch->handle = handle; |
| @@ -778,9 +830,16 @@ qdisc_create(struct net_device *dev, struct netdev_queue *dev_queue, | |||
| 778 | sch->stab = stab; | 830 | sch->stab = stab; |
| 779 | } | 831 | } |
| 780 | if (tca[TCA_RATE]) { | 832 | if (tca[TCA_RATE]) { |
| 833 | spinlock_t *root_lock; | ||
| 834 | |||
| 835 | if ((sch->parent != TC_H_ROOT) && | ||
| 836 | !(sch->flags & TCQ_F_INGRESS)) | ||
| 837 | root_lock = qdisc_root_sleeping_lock(sch); | ||
| 838 | else | ||
| 839 | root_lock = qdisc_lock(sch); | ||
| 840 | |||
| 781 | err = gen_new_estimator(&sch->bstats, &sch->rate_est, | 841 | err = gen_new_estimator(&sch->bstats, &sch->rate_est, |
| 782 | qdisc_root_lock(sch), | 842 | root_lock, tca[TCA_RATE]); |
| 783 | tca[TCA_RATE]); | ||
| 784 | if (err) { | 843 | if (err) { |
| 785 | /* | 844 | /* |
| 786 | * Any broken qdiscs that would require | 845 | * Any broken qdiscs that would require |
| @@ -792,8 +851,8 @@ qdisc_create(struct net_device *dev, struct netdev_queue *dev_queue, | |||
| 792 | goto err_out3; | 851 | goto err_out3; |
| 793 | } | 852 | } |
| 794 | } | 853 | } |
| 795 | if ((parent != TC_H_ROOT) && !(sch->flags & TCQ_F_INGRESS)) | 854 | |
| 796 | list_add_tail(&sch->list, &dev_queue->qdisc_sleeping->list); | 855 | qdisc_list_add(sch); |
| 797 | 856 | ||
| 798 | return sch; | 857 | return sch; |
| 799 | } | 858 | } |
| @@ -832,7 +891,8 @@ static int qdisc_change(struct Qdisc *sch, struct nlattr **tca) | |||
| 832 | 891 | ||
| 833 | if (tca[TCA_RATE]) | 892 | if (tca[TCA_RATE]) |
| 834 | gen_replace_estimator(&sch->bstats, &sch->rate_est, | 893 | gen_replace_estimator(&sch->bstats, &sch->rate_est, |
| 835 | qdisc_root_lock(sch), tca[TCA_RATE]); | 894 | qdisc_root_sleeping_lock(sch), |
| 895 | tca[TCA_RATE]); | ||
| 836 | return 0; | 896 | return 0; |
| 837 | } | 897 | } |
| 838 | 898 | ||
| @@ -908,7 +968,7 @@ static int tc_get_qdisc(struct sk_buff *skb, struct nlmsghdr *n, void *arg) | |||
| 908 | return -ENOENT; | 968 | return -ENOENT; |
| 909 | q = qdisc_leaf(p, clid); | 969 | q = qdisc_leaf(p, clid); |
| 910 | } else { /* ingress */ | 970 | } else { /* ingress */ |
| 911 | q = dev->rx_queue.qdisc; | 971 | q = dev->rx_queue.qdisc_sleeping; |
| 912 | } | 972 | } |
| 913 | } else { | 973 | } else { |
| 914 | struct netdev_queue *dev_queue; | 974 | struct netdev_queue *dev_queue; |
| @@ -978,7 +1038,7 @@ replay: | |||
| 978 | return -ENOENT; | 1038 | return -ENOENT; |
| 979 | q = qdisc_leaf(p, clid); | 1039 | q = qdisc_leaf(p, clid); |
| 980 | } else { /*ingress */ | 1040 | } else { /*ingress */ |
| 981 | q = dev->rx_queue.qdisc; | 1041 | q = dev->rx_queue.qdisc_sleeping; |
| 982 | } | 1042 | } |
| 983 | } else { | 1043 | } else { |
| 984 | struct netdev_queue *dev_queue; | 1044 | struct netdev_queue *dev_queue; |
| @@ -1074,20 +1134,13 @@ create_n_graft: | |||
| 1074 | } | 1134 | } |
| 1075 | 1135 | ||
| 1076 | graft: | 1136 | graft: |
| 1077 | if (1) { | 1137 | err = qdisc_graft(dev, p, skb, n, clid, q, NULL); |
| 1078 | spinlock_t *root_lock; | 1138 | if (err) { |
| 1079 | 1139 | if (q) | |
| 1080 | err = qdisc_graft(dev, p, skb, n, clid, q, NULL); | 1140 | qdisc_destroy(q); |
| 1081 | if (err) { | 1141 | return err; |
| 1082 | if (q) { | ||
| 1083 | root_lock = qdisc_root_lock(q); | ||
| 1084 | spin_lock_bh(root_lock); | ||
| 1085 | qdisc_destroy(q); | ||
| 1086 | spin_unlock_bh(root_lock); | ||
| 1087 | } | ||
| 1088 | return err; | ||
| 1089 | } | ||
| 1090 | } | 1142 | } |
| 1143 | |||
| 1091 | return 0; | 1144 | return 0; |
| 1092 | } | 1145 | } |
| 1093 | 1146 | ||
| @@ -1116,8 +1169,8 @@ static int tc_fill_qdisc(struct sk_buff *skb, struct Qdisc *q, u32 clid, | |||
| 1116 | if (q->stab && qdisc_dump_stab(skb, q->stab) < 0) | 1169 | if (q->stab && qdisc_dump_stab(skb, q->stab) < 0) |
| 1117 | goto nla_put_failure; | 1170 | goto nla_put_failure; |
| 1118 | 1171 | ||
| 1119 | if (gnet_stats_start_copy_compat(skb, TCA_STATS2, TCA_STATS, | 1172 | if (gnet_stats_start_copy_compat(skb, TCA_STATS2, TCA_STATS, TCA_XSTATS, |
| 1120 | TCA_XSTATS, qdisc_root_lock(q), &d) < 0) | 1173 | qdisc_root_sleeping_lock(q), &d) < 0) |
| 1121 | goto nla_put_failure; | 1174 | goto nla_put_failure; |
| 1122 | 1175 | ||
| 1123 | if (q->ops->dump_stats && q->ops->dump_stats(q, &d) < 0) | 1176 | if (q->ops->dump_stats && q->ops->dump_stats(q, &d) < 0) |
| @@ -1408,8 +1461,8 @@ static int tc_fill_tclass(struct sk_buff *skb, struct Qdisc *q, | |||
| 1408 | if (cl_ops->dump && cl_ops->dump(q, cl, skb, tcm) < 0) | 1461 | if (cl_ops->dump && cl_ops->dump(q, cl, skb, tcm) < 0) |
| 1409 | goto nla_put_failure; | 1462 | goto nla_put_failure; |
| 1410 | 1463 | ||
| 1411 | if (gnet_stats_start_copy_compat(skb, TCA_STATS2, TCA_STATS, | 1464 | if (gnet_stats_start_copy_compat(skb, TCA_STATS2, TCA_STATS, TCA_XSTATS, |
| 1412 | TCA_XSTATS, qdisc_root_lock(q), &d) < 0) | 1465 | qdisc_root_sleeping_lock(q), &d) < 0) |
| 1413 | goto nla_put_failure; | 1466 | goto nla_put_failure; |
| 1414 | 1467 | ||
| 1415 | if (cl_ops->dump_stats && cl_ops->dump_stats(q, cl, &d) < 0) | 1468 | if (cl_ops->dump_stats && cl_ops->dump_stats(q, cl, &d) < 0) |
| @@ -1529,11 +1582,11 @@ static int tc_dump_tclass(struct sk_buff *skb, struct netlink_callback *cb) | |||
| 1529 | t = 0; | 1582 | t = 0; |
| 1530 | 1583 | ||
| 1531 | dev_queue = netdev_get_tx_queue(dev, 0); | 1584 | dev_queue = netdev_get_tx_queue(dev, 0); |
| 1532 | if (tc_dump_tclass_root(dev_queue->qdisc, skb, tcm, cb, &t, s_t) < 0) | 1585 | if (tc_dump_tclass_root(dev_queue->qdisc_sleeping, skb, tcm, cb, &t, s_t) < 0) |
| 1533 | goto done; | 1586 | goto done; |
| 1534 | 1587 | ||
| 1535 | dev_queue = &dev->rx_queue; | 1588 | dev_queue = &dev->rx_queue; |
| 1536 | if (tc_dump_tclass_root(dev_queue->qdisc, skb, tcm, cb, &t, s_t) < 0) | 1589 | if (tc_dump_tclass_root(dev_queue->qdisc_sleeping, skb, tcm, cb, &t, s_t) < 0) |
| 1537 | goto done; | 1590 | goto done; |
| 1538 | 1591 | ||
| 1539 | done: | 1592 | done: |
diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c index 4e261ce62f48..8b06fa900482 100644 --- a/net/sched/sch_cbq.c +++ b/net/sched/sch_cbq.c | |||
| @@ -521,6 +521,10 @@ static void cbq_ovl_delay(struct cbq_class *cl) | |||
| 521 | struct cbq_sched_data *q = qdisc_priv(cl->qdisc); | 521 | struct cbq_sched_data *q = qdisc_priv(cl->qdisc); |
| 522 | psched_tdiff_t delay = cl->undertime - q->now; | 522 | psched_tdiff_t delay = cl->undertime - q->now; |
| 523 | 523 | ||
| 524 | if (test_bit(__QDISC_STATE_DEACTIVATED, | ||
| 525 | &qdisc_root_sleeping(cl->qdisc)->state)) | ||
| 526 | return; | ||
| 527 | |||
| 524 | if (!cl->delayed) { | 528 | if (!cl->delayed) { |
| 525 | psched_time_t sched = q->now; | 529 | psched_time_t sched = q->now; |
| 526 | ktime_t expires; | 530 | ktime_t expires; |
| @@ -654,7 +658,7 @@ static enum hrtimer_restart cbq_undelay(struct hrtimer *timer) | |||
| 654 | } | 658 | } |
| 655 | 659 | ||
| 656 | sch->flags &= ~TCQ_F_THROTTLED; | 660 | sch->flags &= ~TCQ_F_THROTTLED; |
| 657 | __netif_schedule(sch); | 661 | __netif_schedule(qdisc_root(sch)); |
| 658 | return HRTIMER_NORESTART; | 662 | return HRTIMER_NORESTART; |
| 659 | } | 663 | } |
| 660 | 664 | ||
| @@ -1750,7 +1754,7 @@ static void cbq_put(struct Qdisc *sch, unsigned long arg) | |||
| 1750 | 1754 | ||
| 1751 | if (--cl->refcnt == 0) { | 1755 | if (--cl->refcnt == 0) { |
| 1752 | #ifdef CONFIG_NET_CLS_ACT | 1756 | #ifdef CONFIG_NET_CLS_ACT |
| 1753 | spinlock_t *root_lock = qdisc_root_lock(sch); | 1757 | spinlock_t *root_lock = qdisc_root_sleeping_lock(sch); |
| 1754 | struct cbq_sched_data *q = qdisc_priv(sch); | 1758 | struct cbq_sched_data *q = qdisc_priv(sch); |
| 1755 | 1759 | ||
| 1756 | spin_lock_bh(root_lock); | 1760 | spin_lock_bh(root_lock); |
| @@ -1835,7 +1839,7 @@ cbq_change_class(struct Qdisc *sch, u32 classid, u32 parentid, struct nlattr **t | |||
| 1835 | 1839 | ||
| 1836 | if (tca[TCA_RATE]) | 1840 | if (tca[TCA_RATE]) |
| 1837 | gen_replace_estimator(&cl->bstats, &cl->rate_est, | 1841 | gen_replace_estimator(&cl->bstats, &cl->rate_est, |
| 1838 | qdisc_root_lock(sch), | 1842 | qdisc_root_sleeping_lock(sch), |
| 1839 | tca[TCA_RATE]); | 1843 | tca[TCA_RATE]); |
| 1840 | return 0; | 1844 | return 0; |
| 1841 | } | 1845 | } |
| @@ -1926,7 +1930,7 @@ cbq_change_class(struct Qdisc *sch, u32 classid, u32 parentid, struct nlattr **t | |||
| 1926 | 1930 | ||
| 1927 | if (tca[TCA_RATE]) | 1931 | if (tca[TCA_RATE]) |
| 1928 | gen_new_estimator(&cl->bstats, &cl->rate_est, | 1932 | gen_new_estimator(&cl->bstats, &cl->rate_est, |
| 1929 | qdisc_root_lock(sch), tca[TCA_RATE]); | 1933 | qdisc_root_sleeping_lock(sch), tca[TCA_RATE]); |
| 1930 | 1934 | ||
| 1931 | *arg = (unsigned long)cl; | 1935 | *arg = (unsigned long)cl; |
| 1932 | return 0; | 1936 | return 0; |
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c index 7cf83b37459d..9634091ee2f0 100644 --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c | |||
| @@ -518,15 +518,17 @@ void qdisc_reset(struct Qdisc *qdisc) | |||
| 518 | } | 518 | } |
| 519 | EXPORT_SYMBOL(qdisc_reset); | 519 | EXPORT_SYMBOL(qdisc_reset); |
| 520 | 520 | ||
| 521 | /* this is the rcu callback function to clean up a qdisc when there | 521 | void qdisc_destroy(struct Qdisc *qdisc) |
| 522 | * are no further references to it */ | ||
| 523 | |||
| 524 | static void __qdisc_destroy(struct rcu_head *head) | ||
| 525 | { | 522 | { |
| 526 | struct Qdisc *qdisc = container_of(head, struct Qdisc, q_rcu); | ||
| 527 | const struct Qdisc_ops *ops = qdisc->ops; | 523 | const struct Qdisc_ops *ops = qdisc->ops; |
| 528 | 524 | ||
| 525 | if (qdisc->flags & TCQ_F_BUILTIN || | ||
| 526 | !atomic_dec_and_test(&qdisc->refcnt)) | ||
| 527 | return; | ||
| 528 | |||
| 529 | #ifdef CONFIG_NET_SCHED | 529 | #ifdef CONFIG_NET_SCHED |
| 530 | qdisc_list_del(qdisc); | ||
| 531 | |||
| 530 | qdisc_put_stab(qdisc->stab); | 532 | qdisc_put_stab(qdisc->stab); |
| 531 | #endif | 533 | #endif |
| 532 | gen_kill_estimator(&qdisc->bstats, &qdisc->rate_est); | 534 | gen_kill_estimator(&qdisc->bstats, &qdisc->rate_est); |
| @@ -542,20 +544,6 @@ static void __qdisc_destroy(struct rcu_head *head) | |||
| 542 | 544 | ||
| 543 | kfree((char *) qdisc - qdisc->padded); | 545 | kfree((char *) qdisc - qdisc->padded); |
| 544 | } | 546 | } |
| 545 | |||
| 546 | /* Under qdisc_lock(qdisc) and BH! */ | ||
| 547 | |||
| 548 | void qdisc_destroy(struct Qdisc *qdisc) | ||
| 549 | { | ||
| 550 | if (qdisc->flags & TCQ_F_BUILTIN || | ||
| 551 | !atomic_dec_and_test(&qdisc->refcnt)) | ||
| 552 | return; | ||
| 553 | |||
| 554 | if (qdisc->parent) | ||
| 555 | list_del(&qdisc->list); | ||
| 556 | |||
| 557 | call_rcu(&qdisc->q_rcu, __qdisc_destroy); | ||
| 558 | } | ||
| 559 | EXPORT_SYMBOL(qdisc_destroy); | 547 | EXPORT_SYMBOL(qdisc_destroy); |
| 560 | 548 | ||
| 561 | static bool dev_all_qdisc_sleeping_noop(struct net_device *dev) | 549 | static bool dev_all_qdisc_sleeping_noop(struct net_device *dev) |
| @@ -597,6 +585,9 @@ static void transition_one_qdisc(struct net_device *dev, | |||
| 597 | struct Qdisc *new_qdisc = dev_queue->qdisc_sleeping; | 585 | struct Qdisc *new_qdisc = dev_queue->qdisc_sleeping; |
| 598 | int *need_watchdog_p = _need_watchdog; | 586 | int *need_watchdog_p = _need_watchdog; |
| 599 | 587 | ||
| 588 | if (!(new_qdisc->flags & TCQ_F_BUILTIN)) | ||
| 589 | clear_bit(__QDISC_STATE_DEACTIVATED, &new_qdisc->state); | ||
| 590 | |||
| 600 | rcu_assign_pointer(dev_queue->qdisc, new_qdisc); | 591 | rcu_assign_pointer(dev_queue->qdisc, new_qdisc); |
| 601 | if (need_watchdog_p && new_qdisc != &noqueue_qdisc) | 592 | if (need_watchdog_p && new_qdisc != &noqueue_qdisc) |
| 602 | *need_watchdog_p = 1; | 593 | *need_watchdog_p = 1; |
| @@ -640,14 +631,17 @@ static void dev_deactivate_queue(struct net_device *dev, | |||
| 640 | if (qdisc) { | 631 | if (qdisc) { |
| 641 | spin_lock_bh(qdisc_lock(qdisc)); | 632 | spin_lock_bh(qdisc_lock(qdisc)); |
| 642 | 633 | ||
| 643 | dev_queue->qdisc = qdisc_default; | 634 | if (!(qdisc->flags & TCQ_F_BUILTIN)) |
| 635 | set_bit(__QDISC_STATE_DEACTIVATED, &qdisc->state); | ||
| 636 | |||
| 637 | rcu_assign_pointer(dev_queue->qdisc, qdisc_default); | ||
| 644 | qdisc_reset(qdisc); | 638 | qdisc_reset(qdisc); |
| 645 | 639 | ||
| 646 | spin_unlock_bh(qdisc_lock(qdisc)); | 640 | spin_unlock_bh(qdisc_lock(qdisc)); |
| 647 | } | 641 | } |
| 648 | } | 642 | } |
| 649 | 643 | ||
| 650 | static bool some_qdisc_is_running(struct net_device *dev, int lock) | 644 | static bool some_qdisc_is_busy(struct net_device *dev) |
| 651 | { | 645 | { |
| 652 | unsigned int i; | 646 | unsigned int i; |
| 653 | 647 | ||
| @@ -658,16 +652,15 @@ static bool some_qdisc_is_running(struct net_device *dev, int lock) | |||
| 658 | int val; | 652 | int val; |
| 659 | 653 | ||
| 660 | dev_queue = netdev_get_tx_queue(dev, i); | 654 | dev_queue = netdev_get_tx_queue(dev, i); |
| 661 | q = dev_queue->qdisc; | 655 | q = dev_queue->qdisc_sleeping; |
| 662 | root_lock = qdisc_lock(q); | 656 | root_lock = qdisc_lock(q); |
| 663 | 657 | ||
| 664 | if (lock) | 658 | spin_lock_bh(root_lock); |
| 665 | spin_lock_bh(root_lock); | ||
| 666 | 659 | ||
| 667 | val = test_bit(__QDISC_STATE_RUNNING, &q->state); | 660 | val = (test_bit(__QDISC_STATE_RUNNING, &q->state) || |
| 661 | test_bit(__QDISC_STATE_SCHED, &q->state)); | ||
| 668 | 662 | ||
| 669 | if (lock) | 663 | spin_unlock_bh(root_lock); |
| 670 | spin_unlock_bh(root_lock); | ||
| 671 | 664 | ||
| 672 | if (val) | 665 | if (val) |
| 673 | return true; | 666 | return true; |
| @@ -677,8 +670,6 @@ static bool some_qdisc_is_running(struct net_device *dev, int lock) | |||
| 677 | 670 | ||
| 678 | void dev_deactivate(struct net_device *dev) | 671 | void dev_deactivate(struct net_device *dev) |
| 679 | { | 672 | { |
| 680 | bool running; | ||
| 681 | |||
| 682 | netdev_for_each_tx_queue(dev, dev_deactivate_queue, &noop_qdisc); | 673 | netdev_for_each_tx_queue(dev, dev_deactivate_queue, &noop_qdisc); |
| 683 | dev_deactivate_queue(dev, &dev->rx_queue, &noop_qdisc); | 674 | dev_deactivate_queue(dev, &dev->rx_queue, &noop_qdisc); |
| 684 | 675 | ||
| @@ -688,25 +679,8 @@ void dev_deactivate(struct net_device *dev) | |||
| 688 | synchronize_rcu(); | 679 | synchronize_rcu(); |
| 689 | 680 | ||
| 690 | /* Wait for outstanding qdisc_run calls. */ | 681 | /* Wait for outstanding qdisc_run calls. */ |
| 691 | do { | 682 | while (some_qdisc_is_busy(dev)) |
| 692 | while (some_qdisc_is_running(dev, 0)) | 683 | yield(); |
| 693 | yield(); | ||
| 694 | |||
| 695 | /* | ||
| 696 | * Double-check inside queue lock to ensure that all effects | ||
| 697 | * of the queue run are visible when we return. | ||
| 698 | */ | ||
| 699 | running = some_qdisc_is_running(dev, 1); | ||
| 700 | |||
| 701 | /* | ||
| 702 | * The running flag should never be set at this point because | ||
| 703 | * we've already set dev->qdisc to noop_qdisc *inside* the same | ||
| 704 | * pair of spin locks. That is, if any qdisc_run starts after | ||
| 705 | * our initial test it should see the noop_qdisc and then | ||
| 706 | * clear the RUNNING bit before dropping the queue lock. So | ||
| 707 | * if it is set here then we've found a bug. | ||
| 708 | */ | ||
| 709 | } while (WARN_ON_ONCE(running)); | ||
| 710 | } | 684 | } |
| 711 | 685 | ||
| 712 | static void dev_init_scheduler_queue(struct net_device *dev, | 686 | static void dev_init_scheduler_queue(struct net_device *dev, |
| @@ -735,14 +709,10 @@ static void shutdown_scheduler_queue(struct net_device *dev, | |||
| 735 | struct Qdisc *qdisc_default = _qdisc_default; | 709 | struct Qdisc *qdisc_default = _qdisc_default; |
| 736 | 710 | ||
| 737 | if (qdisc) { | 711 | if (qdisc) { |
| 738 | spinlock_t *root_lock = qdisc_lock(qdisc); | 712 | rcu_assign_pointer(dev_queue->qdisc, qdisc_default); |
| 739 | |||
| 740 | dev_queue->qdisc = qdisc_default; | ||
| 741 | dev_queue->qdisc_sleeping = qdisc_default; | 713 | dev_queue->qdisc_sleeping = qdisc_default; |
| 742 | 714 | ||
| 743 | spin_lock_bh(root_lock); | ||
| 744 | qdisc_destroy(qdisc); | 715 | qdisc_destroy(qdisc); |
| 745 | spin_unlock_bh(root_lock); | ||
| 746 | } | 716 | } |
| 747 | } | 717 | } |
| 748 | 718 | ||
diff --git a/net/sched/sch_hfsc.c b/net/sched/sch_hfsc.c index c2b8d9cce3d2..c1e77da8cd09 100644 --- a/net/sched/sch_hfsc.c +++ b/net/sched/sch_hfsc.c | |||
| @@ -1045,7 +1045,7 @@ hfsc_change_class(struct Qdisc *sch, u32 classid, u32 parentid, | |||
| 1045 | 1045 | ||
| 1046 | if (tca[TCA_RATE]) | 1046 | if (tca[TCA_RATE]) |
| 1047 | gen_replace_estimator(&cl->bstats, &cl->rate_est, | 1047 | gen_replace_estimator(&cl->bstats, &cl->rate_est, |
| 1048 | qdisc_root_lock(sch), | 1048 | qdisc_root_sleeping_lock(sch), |
| 1049 | tca[TCA_RATE]); | 1049 | tca[TCA_RATE]); |
| 1050 | return 0; | 1050 | return 0; |
| 1051 | } | 1051 | } |
| @@ -1104,7 +1104,7 @@ hfsc_change_class(struct Qdisc *sch, u32 classid, u32 parentid, | |||
| 1104 | 1104 | ||
| 1105 | if (tca[TCA_RATE]) | 1105 | if (tca[TCA_RATE]) |
| 1106 | gen_new_estimator(&cl->bstats, &cl->rate_est, | 1106 | gen_new_estimator(&cl->bstats, &cl->rate_est, |
| 1107 | qdisc_root_lock(sch), tca[TCA_RATE]); | 1107 | qdisc_root_sleeping_lock(sch), tca[TCA_RATE]); |
| 1108 | *arg = (unsigned long)cl; | 1108 | *arg = (unsigned long)cl; |
| 1109 | return 0; | 1109 | return 0; |
| 1110 | } | 1110 | } |
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c index be35422711a3..d14f02056ae6 100644 --- a/net/sched/sch_htb.c +++ b/net/sched/sch_htb.c | |||
| @@ -577,7 +577,7 @@ static int htb_enqueue(struct sk_buff *skb, struct Qdisc *sch) | |||
| 577 | sch->qstats.drops++; | 577 | sch->qstats.drops++; |
| 578 | cl->qstats.drops++; | 578 | cl->qstats.drops++; |
| 579 | } | 579 | } |
| 580 | return NET_XMIT_DROP; | 580 | return ret; |
| 581 | } else { | 581 | } else { |
| 582 | cl->bstats.packets += | 582 | cl->bstats.packets += |
| 583 | skb_is_gso(skb)?skb_shinfo(skb)->gso_segs:1; | 583 | skb_is_gso(skb)?skb_shinfo(skb)->gso_segs:1; |
| @@ -623,7 +623,7 @@ static int htb_requeue(struct sk_buff *skb, struct Qdisc *sch) | |||
| 623 | sch->qstats.drops++; | 623 | sch->qstats.drops++; |
| 624 | cl->qstats.drops++; | 624 | cl->qstats.drops++; |
| 625 | } | 625 | } |
| 626 | return NET_XMIT_DROP; | 626 | return ret; |
| 627 | } else | 627 | } else |
| 628 | htb_activate(q, cl); | 628 | htb_activate(q, cl); |
| 629 | 629 | ||
| @@ -1043,7 +1043,7 @@ static int htb_init(struct Qdisc *sch, struct nlattr *opt) | |||
| 1043 | 1043 | ||
| 1044 | static int htb_dump(struct Qdisc *sch, struct sk_buff *skb) | 1044 | static int htb_dump(struct Qdisc *sch, struct sk_buff *skb) |
| 1045 | { | 1045 | { |
| 1046 | spinlock_t *root_lock = qdisc_root_lock(sch); | 1046 | spinlock_t *root_lock = qdisc_root_sleeping_lock(sch); |
| 1047 | struct htb_sched *q = qdisc_priv(sch); | 1047 | struct htb_sched *q = qdisc_priv(sch); |
| 1048 | struct nlattr *nest; | 1048 | struct nlattr *nest; |
| 1049 | struct tc_htb_glob gopt; | 1049 | struct tc_htb_glob gopt; |
| @@ -1075,7 +1075,7 @@ static int htb_dump_class(struct Qdisc *sch, unsigned long arg, | |||
| 1075 | struct sk_buff *skb, struct tcmsg *tcm) | 1075 | struct sk_buff *skb, struct tcmsg *tcm) |
| 1076 | { | 1076 | { |
| 1077 | struct htb_class *cl = (struct htb_class *)arg; | 1077 | struct htb_class *cl = (struct htb_class *)arg; |
| 1078 | spinlock_t *root_lock = qdisc_root_lock(sch); | 1078 | spinlock_t *root_lock = qdisc_root_sleeping_lock(sch); |
| 1079 | struct nlattr *nest; | 1079 | struct nlattr *nest; |
| 1080 | struct tc_htb_opt opt; | 1080 | struct tc_htb_opt opt; |
| 1081 | 1081 | ||
| @@ -1279,7 +1279,8 @@ static int htb_delete(struct Qdisc *sch, unsigned long arg) | |||
| 1279 | 1279 | ||
| 1280 | /* delete from hash and active; remainder in destroy_class */ | 1280 | /* delete from hash and active; remainder in destroy_class */ |
| 1281 | qdisc_class_hash_remove(&q->clhash, &cl->common); | 1281 | qdisc_class_hash_remove(&q->clhash, &cl->common); |
| 1282 | cl->parent->children--; | 1282 | if (cl->parent) |
| 1283 | cl->parent->children--; | ||
| 1283 | 1284 | ||
| 1284 | if (cl->prio_activity) | 1285 | if (cl->prio_activity) |
| 1285 | htb_deactivate(q, cl); | 1286 | htb_deactivate(q, cl); |
| @@ -1371,7 +1372,7 @@ static int htb_change_class(struct Qdisc *sch, u32 classid, | |||
| 1371 | goto failure; | 1372 | goto failure; |
| 1372 | 1373 | ||
| 1373 | gen_new_estimator(&cl->bstats, &cl->rate_est, | 1374 | gen_new_estimator(&cl->bstats, &cl->rate_est, |
| 1374 | qdisc_root_lock(sch), | 1375 | qdisc_root_sleeping_lock(sch), |
| 1375 | tca[TCA_RATE] ? : &est.nla); | 1376 | tca[TCA_RATE] ? : &est.nla); |
| 1376 | cl->refcnt = 1; | 1377 | cl->refcnt = 1; |
| 1377 | cl->children = 0; | 1378 | cl->children = 0; |
| @@ -1426,7 +1427,7 @@ static int htb_change_class(struct Qdisc *sch, u32 classid, | |||
| 1426 | } else { | 1427 | } else { |
| 1427 | if (tca[TCA_RATE]) | 1428 | if (tca[TCA_RATE]) |
| 1428 | gen_replace_estimator(&cl->bstats, &cl->rate_est, | 1429 | gen_replace_estimator(&cl->bstats, &cl->rate_est, |
| 1429 | qdisc_root_lock(sch), | 1430 | qdisc_root_sleeping_lock(sch), |
| 1430 | tca[TCA_RATE]); | 1431 | tca[TCA_RATE]); |
| 1431 | sch_tree_lock(sch); | 1432 | sch_tree_lock(sch); |
| 1432 | } | 1433 | } |
diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c index fb0294d0b55e..3781e55046d0 100644 --- a/net/sched/sch_netem.c +++ b/net/sched/sch_netem.c | |||
| @@ -341,7 +341,7 @@ static int get_dist_table(struct Qdisc *sch, const struct nlattr *attr) | |||
| 341 | for (i = 0; i < n; i++) | 341 | for (i = 0; i < n; i++) |
| 342 | d->table[i] = data[i]; | 342 | d->table[i] = data[i]; |
| 343 | 343 | ||
| 344 | root_lock = qdisc_root_lock(sch); | 344 | root_lock = qdisc_root_sleeping_lock(sch); |
| 345 | 345 | ||
| 346 | spin_lock_bh(root_lock); | 346 | spin_lock_bh(root_lock); |
| 347 | d = xchg(&q->delay_dist, d); | 347 | d = xchg(&q->delay_dist, d); |
diff --git a/net/sched/sch_prio.c b/net/sched/sch_prio.c index eac197610edf..a6697c686c7f 100644 --- a/net/sched/sch_prio.c +++ b/net/sched/sch_prio.c | |||
| @@ -113,11 +113,11 @@ prio_requeue(struct sk_buff *skb, struct Qdisc* sch) | |||
| 113 | if ((ret = qdisc->ops->requeue(skb, qdisc)) == NET_XMIT_SUCCESS) { | 113 | if ((ret = qdisc->ops->requeue(skb, qdisc)) == NET_XMIT_SUCCESS) { |
| 114 | sch->q.qlen++; | 114 | sch->q.qlen++; |
| 115 | sch->qstats.requeues++; | 115 | sch->qstats.requeues++; |
| 116 | return 0; | 116 | return NET_XMIT_SUCCESS; |
| 117 | } | 117 | } |
| 118 | if (net_xmit_drop_count(ret)) | 118 | if (net_xmit_drop_count(ret)) |
| 119 | sch->qstats.drops++; | 119 | sch->qstats.drops++; |
| 120 | return NET_XMIT_DROP; | 120 | return ret; |
| 121 | } | 121 | } |
| 122 | 122 | ||
| 123 | 123 | ||
diff --git a/net/sched/sch_tbf.c b/net/sched/sch_tbf.c index 7d3b7ff3bf07..94c61598b86a 100644 --- a/net/sched/sch_tbf.c +++ b/net/sched/sch_tbf.c | |||
| @@ -123,15 +123,8 @@ static int tbf_enqueue(struct sk_buff *skb, struct Qdisc* sch) | |||
| 123 | struct tbf_sched_data *q = qdisc_priv(sch); | 123 | struct tbf_sched_data *q = qdisc_priv(sch); |
| 124 | int ret; | 124 | int ret; |
| 125 | 125 | ||
| 126 | if (qdisc_pkt_len(skb) > q->max_size) { | 126 | if (qdisc_pkt_len(skb) > q->max_size) |
| 127 | sch->qstats.drops++; | 127 | return qdisc_reshape_fail(skb, sch); |
| 128 | #ifdef CONFIG_NET_CLS_ACT | ||
| 129 | if (sch->reshape_fail == NULL || sch->reshape_fail(skb, sch)) | ||
| 130 | #endif | ||
| 131 | kfree_skb(skb); | ||
| 132 | |||
| 133 | return NET_XMIT_DROP; | ||
| 134 | } | ||
| 135 | 128 | ||
| 136 | ret = qdisc_enqueue(skb, q->qdisc); | 129 | ret = qdisc_enqueue(skb, q->qdisc); |
| 137 | if (ret != 0) { | 130 | if (ret != 0) { |
diff --git a/net/sched/sch_teql.c b/net/sched/sch_teql.c index 2c35c678563b..d35ef059abb1 100644 --- a/net/sched/sch_teql.c +++ b/net/sched/sch_teql.c | |||
| @@ -161,7 +161,7 @@ teql_destroy(struct Qdisc* sch) | |||
| 161 | txq = netdev_get_tx_queue(master->dev, 0); | 161 | txq = netdev_get_tx_queue(master->dev, 0); |
| 162 | master->slaves = NULL; | 162 | master->slaves = NULL; |
| 163 | 163 | ||
| 164 | root_lock = qdisc_root_lock(txq->qdisc); | 164 | root_lock = qdisc_root_sleeping_lock(txq->qdisc); |
| 165 | spin_lock_bh(root_lock); | 165 | spin_lock_bh(root_lock); |
| 166 | qdisc_reset(txq->qdisc); | 166 | qdisc_reset(txq->qdisc); |
| 167 | spin_unlock_bh(root_lock); | 167 | spin_unlock_bh(root_lock); |
diff --git a/net/sctp/auth.c b/net/sctp/auth.c index 675a5c3e68a6..52db5f60daa0 100644 --- a/net/sctp/auth.c +++ b/net/sctp/auth.c | |||
| @@ -80,6 +80,10 @@ static struct sctp_auth_bytes *sctp_auth_create_key(__u32 key_len, gfp_t gfp) | |||
| 80 | { | 80 | { |
| 81 | struct sctp_auth_bytes *key; | 81 | struct sctp_auth_bytes *key; |
| 82 | 82 | ||
| 83 | /* Verify that we are not going to overflow INT_MAX */ | ||
| 84 | if ((INT_MAX - key_len) < sizeof(struct sctp_auth_bytes)) | ||
| 85 | return NULL; | ||
| 86 | |||
| 83 | /* Allocate the shared key */ | 87 | /* Allocate the shared key */ |
| 84 | key = kmalloc(sizeof(struct sctp_auth_bytes) + key_len, gfp); | 88 | key = kmalloc(sizeof(struct sctp_auth_bytes) + key_len, gfp); |
| 85 | if (!key) | 89 | if (!key) |
| @@ -782,6 +786,9 @@ int sctp_auth_ep_set_hmacs(struct sctp_endpoint *ep, | |||
| 782 | for (i = 0; i < hmacs->shmac_num_idents; i++) { | 786 | for (i = 0; i < hmacs->shmac_num_idents; i++) { |
| 783 | id = hmacs->shmac_idents[i]; | 787 | id = hmacs->shmac_idents[i]; |
| 784 | 788 | ||
| 789 | if (id > SCTP_AUTH_HMAC_ID_MAX) | ||
| 790 | return -EOPNOTSUPP; | ||
| 791 | |||
| 785 | if (SCTP_AUTH_HMAC_ID_SHA1 == id) | 792 | if (SCTP_AUTH_HMAC_ID_SHA1 == id) |
| 786 | has_sha1 = 1; | 793 | has_sha1 = 1; |
| 787 | 794 | ||
diff --git a/net/sctp/endpointola.c b/net/sctp/endpointola.c index e39a0cdef184..4c8d9f45ce09 100644 --- a/net/sctp/endpointola.c +++ b/net/sctp/endpointola.c | |||
| @@ -103,6 +103,7 @@ static struct sctp_endpoint *sctp_endpoint_init(struct sctp_endpoint *ep, | |||
| 103 | 103 | ||
| 104 | /* Initialize the CHUNKS parameter */ | 104 | /* Initialize the CHUNKS parameter */ |
| 105 | auth_chunks->param_hdr.type = SCTP_PARAM_CHUNKS; | 105 | auth_chunks->param_hdr.type = SCTP_PARAM_CHUNKS; |
| 106 | auth_chunks->param_hdr.length = htons(sizeof(sctp_paramhdr_t)); | ||
| 106 | 107 | ||
| 107 | /* If the Add-IP functionality is enabled, we must | 108 | /* If the Add-IP functionality is enabled, we must |
| 108 | * authenticate, ASCONF and ASCONF-ACK chunks | 109 | * authenticate, ASCONF and ASCONF-ACK chunks |
| @@ -110,8 +111,7 @@ static struct sctp_endpoint *sctp_endpoint_init(struct sctp_endpoint *ep, | |||
| 110 | if (sctp_addip_enable) { | 111 | if (sctp_addip_enable) { |
| 111 | auth_chunks->chunks[0] = SCTP_CID_ASCONF; | 112 | auth_chunks->chunks[0] = SCTP_CID_ASCONF; |
| 112 | auth_chunks->chunks[1] = SCTP_CID_ASCONF_ACK; | 113 | auth_chunks->chunks[1] = SCTP_CID_ASCONF_ACK; |
| 113 | auth_chunks->param_hdr.length = | 114 | auth_chunks->param_hdr.length += htons(2); |
| 114 | htons(sizeof(sctp_paramhdr_t) + 2); | ||
| 115 | } | 115 | } |
| 116 | } | 116 | } |
| 117 | 117 | ||
diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c index 483a01d0740a..47f91afa0211 100644 --- a/net/sctp/ipv6.c +++ b/net/sctp/ipv6.c | |||
| @@ -319,7 +319,8 @@ static void sctp_v6_get_saddr(struct sctp_sock *sk, | |||
| 319 | __func__, asoc, dst, NIP6(daddr->v6.sin6_addr)); | 319 | __func__, asoc, dst, NIP6(daddr->v6.sin6_addr)); |
| 320 | 320 | ||
| 321 | if (!asoc) { | 321 | if (!asoc) { |
| 322 | ipv6_dev_get_saddr(dst ? ip6_dst_idev(dst)->dev : NULL, | 322 | ipv6_dev_get_saddr(sock_net(sctp_opt2sk(sk)), |
| 323 | dst ? ip6_dst_idev(dst)->dev : NULL, | ||
| 323 | &daddr->v6.sin6_addr, | 324 | &daddr->v6.sin6_addr, |
| 324 | inet6_sk(&sk->inet.sk)->srcprefs, | 325 | inet6_sk(&sk->inet.sk)->srcprefs, |
| 325 | &saddr->v6.sin6_addr); | 326 | &saddr->v6.sin6_addr); |
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index dbb79adf8f3c..5ffb9dec1c3f 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c | |||
| @@ -3055,6 +3055,9 @@ static int sctp_setsockopt_auth_chunk(struct sock *sk, | |||
| 3055 | { | 3055 | { |
| 3056 | struct sctp_authchunk val; | 3056 | struct sctp_authchunk val; |
| 3057 | 3057 | ||
| 3058 | if (!sctp_auth_enable) | ||
| 3059 | return -EACCES; | ||
| 3060 | |||
| 3058 | if (optlen != sizeof(struct sctp_authchunk)) | 3061 | if (optlen != sizeof(struct sctp_authchunk)) |
| 3059 | return -EINVAL; | 3062 | return -EINVAL; |
| 3060 | if (copy_from_user(&val, optval, optlen)) | 3063 | if (copy_from_user(&val, optval, optlen)) |
| @@ -3083,8 +3086,12 @@ static int sctp_setsockopt_hmac_ident(struct sock *sk, | |||
| 3083 | int optlen) | 3086 | int optlen) |
| 3084 | { | 3087 | { |
| 3085 | struct sctp_hmacalgo *hmacs; | 3088 | struct sctp_hmacalgo *hmacs; |
| 3089 | u32 idents; | ||
| 3086 | int err; | 3090 | int err; |
| 3087 | 3091 | ||
| 3092 | if (!sctp_auth_enable) | ||
| 3093 | return -EACCES; | ||
| 3094 | |||
| 3088 | if (optlen < sizeof(struct sctp_hmacalgo)) | 3095 | if (optlen < sizeof(struct sctp_hmacalgo)) |
| 3089 | return -EINVAL; | 3096 | return -EINVAL; |
| 3090 | 3097 | ||
| @@ -3097,8 +3104,9 @@ static int sctp_setsockopt_hmac_ident(struct sock *sk, | |||
| 3097 | goto out; | 3104 | goto out; |
| 3098 | } | 3105 | } |
| 3099 | 3106 | ||
| 3100 | if (hmacs->shmac_num_idents == 0 || | 3107 | idents = hmacs->shmac_num_idents; |
| 3101 | hmacs->shmac_num_idents > SCTP_AUTH_NUM_HMACS) { | 3108 | if (idents == 0 || idents > SCTP_AUTH_NUM_HMACS || |
| 3109 | (idents * sizeof(u16)) > (optlen - sizeof(struct sctp_hmacalgo))) { | ||
| 3102 | err = -EINVAL; | 3110 | err = -EINVAL; |
| 3103 | goto out; | 3111 | goto out; |
| 3104 | } | 3112 | } |
| @@ -3123,6 +3131,9 @@ static int sctp_setsockopt_auth_key(struct sock *sk, | |||
| 3123 | struct sctp_association *asoc; | 3131 | struct sctp_association *asoc; |
| 3124 | int ret; | 3132 | int ret; |
| 3125 | 3133 | ||
| 3134 | if (!sctp_auth_enable) | ||
| 3135 | return -EACCES; | ||
| 3136 | |||
| 3126 | if (optlen <= sizeof(struct sctp_authkey)) | 3137 | if (optlen <= sizeof(struct sctp_authkey)) |
| 3127 | return -EINVAL; | 3138 | return -EINVAL; |
| 3128 | 3139 | ||
| @@ -3135,6 +3146,11 @@ static int sctp_setsockopt_auth_key(struct sock *sk, | |||
| 3135 | goto out; | 3146 | goto out; |
| 3136 | } | 3147 | } |
| 3137 | 3148 | ||
| 3149 | if (authkey->sca_keylength > optlen - sizeof(struct sctp_authkey)) { | ||
| 3150 | ret = -EINVAL; | ||
| 3151 | goto out; | ||
| 3152 | } | ||
| 3153 | |||
| 3138 | asoc = sctp_id2assoc(sk, authkey->sca_assoc_id); | 3154 | asoc = sctp_id2assoc(sk, authkey->sca_assoc_id); |
| 3139 | if (!asoc && authkey->sca_assoc_id && sctp_style(sk, UDP)) { | 3155 | if (!asoc && authkey->sca_assoc_id && sctp_style(sk, UDP)) { |
| 3140 | ret = -EINVAL; | 3156 | ret = -EINVAL; |
| @@ -3160,6 +3176,9 @@ static int sctp_setsockopt_active_key(struct sock *sk, | |||
| 3160 | struct sctp_authkeyid val; | 3176 | struct sctp_authkeyid val; |
| 3161 | struct sctp_association *asoc; | 3177 | struct sctp_association *asoc; |
| 3162 | 3178 | ||
| 3179 | if (!sctp_auth_enable) | ||
| 3180 | return -EACCES; | ||
| 3181 | |||
| 3163 | if (optlen != sizeof(struct sctp_authkeyid)) | 3182 | if (optlen != sizeof(struct sctp_authkeyid)) |
| 3164 | return -EINVAL; | 3183 | return -EINVAL; |
| 3165 | if (copy_from_user(&val, optval, optlen)) | 3184 | if (copy_from_user(&val, optval, optlen)) |
| @@ -3185,6 +3204,9 @@ static int sctp_setsockopt_del_key(struct sock *sk, | |||
| 3185 | struct sctp_authkeyid val; | 3204 | struct sctp_authkeyid val; |
| 3186 | struct sctp_association *asoc; | 3205 | struct sctp_association *asoc; |
| 3187 | 3206 | ||
| 3207 | if (!sctp_auth_enable) | ||
| 3208 | return -EACCES; | ||
| 3209 | |||
| 3188 | if (optlen != sizeof(struct sctp_authkeyid)) | 3210 | if (optlen != sizeof(struct sctp_authkeyid)) |
| 3189 | return -EINVAL; | 3211 | return -EINVAL; |
| 3190 | if (copy_from_user(&val, optval, optlen)) | 3212 | if (copy_from_user(&val, optval, optlen)) |
| @@ -5197,19 +5219,29 @@ static int sctp_getsockopt_maxburst(struct sock *sk, int len, | |||
| 5197 | static int sctp_getsockopt_hmac_ident(struct sock *sk, int len, | 5219 | static int sctp_getsockopt_hmac_ident(struct sock *sk, int len, |
| 5198 | char __user *optval, int __user *optlen) | 5220 | char __user *optval, int __user *optlen) |
| 5199 | { | 5221 | { |
| 5222 | struct sctp_hmacalgo __user *p = (void __user *)optval; | ||
| 5200 | struct sctp_hmac_algo_param *hmacs; | 5223 | struct sctp_hmac_algo_param *hmacs; |
| 5201 | __u16 param_len; | 5224 | __u16 data_len = 0; |
| 5225 | u32 num_idents; | ||
| 5226 | |||
| 5227 | if (!sctp_auth_enable) | ||
| 5228 | return -EACCES; | ||
| 5202 | 5229 | ||
| 5203 | hmacs = sctp_sk(sk)->ep->auth_hmacs_list; | 5230 | hmacs = sctp_sk(sk)->ep->auth_hmacs_list; |
| 5204 | param_len = ntohs(hmacs->param_hdr.length); | 5231 | data_len = ntohs(hmacs->param_hdr.length) - sizeof(sctp_paramhdr_t); |
| 5205 | 5232 | ||
| 5206 | if (len < param_len) | 5233 | if (len < sizeof(struct sctp_hmacalgo) + data_len) |
| 5207 | return -EINVAL; | 5234 | return -EINVAL; |
| 5235 | |||
| 5236 | len = sizeof(struct sctp_hmacalgo) + data_len; | ||
| 5237 | num_idents = data_len / sizeof(u16); | ||
| 5238 | |||
| 5208 | if (put_user(len, optlen)) | 5239 | if (put_user(len, optlen)) |
| 5209 | return -EFAULT; | 5240 | return -EFAULT; |
| 5210 | if (copy_to_user(optval, hmacs->hmac_ids, len)) | 5241 | if (put_user(num_idents, &p->shmac_num_idents)) |
| 5242 | return -EFAULT; | ||
| 5243 | if (copy_to_user(p->shmac_idents, hmacs->hmac_ids, data_len)) | ||
| 5211 | return -EFAULT; | 5244 | return -EFAULT; |
| 5212 | |||
| 5213 | return 0; | 5245 | return 0; |
| 5214 | } | 5246 | } |
| 5215 | 5247 | ||
| @@ -5219,6 +5251,9 @@ static int sctp_getsockopt_active_key(struct sock *sk, int len, | |||
| 5219 | struct sctp_authkeyid val; | 5251 | struct sctp_authkeyid val; |
| 5220 | struct sctp_association *asoc; | 5252 | struct sctp_association *asoc; |
| 5221 | 5253 | ||
| 5254 | if (!sctp_auth_enable) | ||
| 5255 | return -EACCES; | ||
| 5256 | |||
| 5222 | if (len < sizeof(struct sctp_authkeyid)) | 5257 | if (len < sizeof(struct sctp_authkeyid)) |
| 5223 | return -EINVAL; | 5258 | return -EINVAL; |
| 5224 | if (copy_from_user(&val, optval, sizeof(struct sctp_authkeyid))) | 5259 | if (copy_from_user(&val, optval, sizeof(struct sctp_authkeyid))) |
| @@ -5233,6 +5268,12 @@ static int sctp_getsockopt_active_key(struct sock *sk, int len, | |||
| 5233 | else | 5268 | else |
| 5234 | val.scact_keynumber = sctp_sk(sk)->ep->active_key_id; | 5269 | val.scact_keynumber = sctp_sk(sk)->ep->active_key_id; |
| 5235 | 5270 | ||
| 5271 | len = sizeof(struct sctp_authkeyid); | ||
| 5272 | if (put_user(len, optlen)) | ||
| 5273 | return -EFAULT; | ||
| 5274 | if (copy_to_user(optval, &val, len)) | ||
| 5275 | return -EFAULT; | ||
| 5276 | |||
| 5236 | return 0; | 5277 | return 0; |
| 5237 | } | 5278 | } |
| 5238 | 5279 | ||
| @@ -5243,13 +5284,16 @@ static int sctp_getsockopt_peer_auth_chunks(struct sock *sk, int len, | |||
| 5243 | struct sctp_authchunks val; | 5284 | struct sctp_authchunks val; |
| 5244 | struct sctp_association *asoc; | 5285 | struct sctp_association *asoc; |
| 5245 | struct sctp_chunks_param *ch; | 5286 | struct sctp_chunks_param *ch; |
| 5246 | u32 num_chunks; | 5287 | u32 num_chunks = 0; |
| 5247 | char __user *to; | 5288 | char __user *to; |
| 5248 | 5289 | ||
| 5249 | if (len <= sizeof(struct sctp_authchunks)) | 5290 | if (!sctp_auth_enable) |
| 5291 | return -EACCES; | ||
| 5292 | |||
| 5293 | if (len < sizeof(struct sctp_authchunks)) | ||
| 5250 | return -EINVAL; | 5294 | return -EINVAL; |
| 5251 | 5295 | ||
| 5252 | if (copy_from_user(&val, p, sizeof(struct sctp_authchunks))) | 5296 | if (copy_from_user(&val, optval, sizeof(struct sctp_authchunks))) |
| 5253 | return -EFAULT; | 5297 | return -EFAULT; |
| 5254 | 5298 | ||
| 5255 | to = p->gauth_chunks; | 5299 | to = p->gauth_chunks; |
| @@ -5258,20 +5302,21 @@ static int sctp_getsockopt_peer_auth_chunks(struct sock *sk, int len, | |||
| 5258 | return -EINVAL; | 5302 | return -EINVAL; |
| 5259 | 5303 | ||
| 5260 | ch = asoc->peer.peer_chunks; | 5304 | ch = asoc->peer.peer_chunks; |
| 5305 | if (!ch) | ||
| 5306 | goto num; | ||
| 5261 | 5307 | ||
| 5262 | /* See if the user provided enough room for all the data */ | 5308 | /* See if the user provided enough room for all the data */ |
| 5263 | num_chunks = ntohs(ch->param_hdr.length) - sizeof(sctp_paramhdr_t); | 5309 | num_chunks = ntohs(ch->param_hdr.length) - sizeof(sctp_paramhdr_t); |
| 5264 | if (len < num_chunks) | 5310 | if (len < num_chunks) |
| 5265 | return -EINVAL; | 5311 | return -EINVAL; |
| 5266 | 5312 | ||
| 5267 | len = num_chunks; | 5313 | if (copy_to_user(to, ch->chunks, num_chunks)) |
| 5268 | if (put_user(len, optlen)) | ||
| 5269 | return -EFAULT; | 5314 | return -EFAULT; |
| 5315 | num: | ||
| 5316 | len = sizeof(struct sctp_authchunks) + num_chunks; | ||
| 5317 | if (put_user(len, optlen)) return -EFAULT; | ||
| 5270 | if (put_user(num_chunks, &p->gauth_number_of_chunks)) | 5318 | if (put_user(num_chunks, &p->gauth_number_of_chunks)) |
| 5271 | return -EFAULT; | 5319 | return -EFAULT; |
| 5272 | if (copy_to_user(to, ch->chunks, len)) | ||
| 5273 | return -EFAULT; | ||
| 5274 | |||
| 5275 | return 0; | 5320 | return 0; |
| 5276 | } | 5321 | } |
| 5277 | 5322 | ||
| @@ -5282,13 +5327,16 @@ static int sctp_getsockopt_local_auth_chunks(struct sock *sk, int len, | |||
| 5282 | struct sctp_authchunks val; | 5327 | struct sctp_authchunks val; |
| 5283 | struct sctp_association *asoc; | 5328 | struct sctp_association *asoc; |
| 5284 | struct sctp_chunks_param *ch; | 5329 | struct sctp_chunks_param *ch; |
| 5285 | u32 num_chunks; | 5330 | u32 num_chunks = 0; |
| 5286 | char __user *to; | 5331 | char __user *to; |
| 5287 | 5332 | ||
| 5288 | if (len <= sizeof(struct sctp_authchunks)) | 5333 | if (!sctp_auth_enable) |
| 5334 | return -EACCES; | ||
| 5335 | |||
| 5336 | if (len < sizeof(struct sctp_authchunks)) | ||
| 5289 | return -EINVAL; | 5337 | return -EINVAL; |
| 5290 | 5338 | ||
| 5291 | if (copy_from_user(&val, p, sizeof(struct sctp_authchunks))) | 5339 | if (copy_from_user(&val, optval, sizeof(struct sctp_authchunks))) |
| 5292 | return -EFAULT; | 5340 | return -EFAULT; |
| 5293 | 5341 | ||
| 5294 | to = p->gauth_chunks; | 5342 | to = p->gauth_chunks; |
| @@ -5301,17 +5349,21 @@ static int sctp_getsockopt_local_auth_chunks(struct sock *sk, int len, | |||
| 5301 | else | 5349 | else |
| 5302 | ch = sctp_sk(sk)->ep->auth_chunk_list; | 5350 | ch = sctp_sk(sk)->ep->auth_chunk_list; |
| 5303 | 5351 | ||
| 5352 | if (!ch) | ||
| 5353 | goto num; | ||
| 5354 | |||
| 5304 | num_chunks = ntohs(ch->param_hdr.length) - sizeof(sctp_paramhdr_t); | 5355 | num_chunks = ntohs(ch->param_hdr.length) - sizeof(sctp_paramhdr_t); |
| 5305 | if (len < num_chunks) | 5356 | if (len < sizeof(struct sctp_authchunks) + num_chunks) |
| 5306 | return -EINVAL; | 5357 | return -EINVAL; |
| 5307 | 5358 | ||
| 5308 | len = num_chunks; | 5359 | if (copy_to_user(to, ch->chunks, num_chunks)) |
| 5360 | return -EFAULT; | ||
| 5361 | num: | ||
| 5362 | len = sizeof(struct sctp_authchunks) + num_chunks; | ||
| 5309 | if (put_user(len, optlen)) | 5363 | if (put_user(len, optlen)) |
| 5310 | return -EFAULT; | 5364 | return -EFAULT; |
| 5311 | if (put_user(num_chunks, &p->gauth_number_of_chunks)) | 5365 | if (put_user(num_chunks, &p->gauth_number_of_chunks)) |
| 5312 | return -EFAULT; | 5366 | return -EFAULT; |
| 5313 | if (copy_to_user(to, ch->chunks, len)) | ||
| 5314 | return -EFAULT; | ||
| 5315 | 5367 | ||
| 5316 | return 0; | 5368 | return 0; |
| 5317 | } | 5369 | } |
diff --git a/net/sunrpc/sysctl.c b/net/sunrpc/sysctl.c index 0f8c439b848a..5231f7aaac0e 100644 --- a/net/sunrpc/sysctl.c +++ b/net/sunrpc/sysctl.c | |||
| @@ -60,24 +60,14 @@ static int proc_do_xprt(ctl_table *table, int write, struct file *file, | |||
| 60 | void __user *buffer, size_t *lenp, loff_t *ppos) | 60 | void __user *buffer, size_t *lenp, loff_t *ppos) |
| 61 | { | 61 | { |
| 62 | char tmpbuf[256]; | 62 | char tmpbuf[256]; |
| 63 | int len; | 63 | size_t len; |
| 64 | |||
| 64 | if ((*ppos && !write) || !*lenp) { | 65 | if ((*ppos && !write) || !*lenp) { |
| 65 | *lenp = 0; | 66 | *lenp = 0; |
| 66 | return 0; | 67 | return 0; |
| 67 | } | 68 | } |
| 68 | if (write) | 69 | len = svc_print_xprts(tmpbuf, sizeof(tmpbuf)); |
| 69 | return -EINVAL; | 70 | return simple_read_from_buffer(buffer, *lenp, ppos, tmpbuf, len); |
| 70 | else { | ||
| 71 | len = svc_print_xprts(tmpbuf, sizeof(tmpbuf)); | ||
| 72 | if (!access_ok(VERIFY_WRITE, buffer, len)) | ||
| 73 | return -EFAULT; | ||
| 74 | |||
| 75 | if (__copy_to_user(buffer, tmpbuf, len)) | ||
| 76 | return -EFAULT; | ||
| 77 | } | ||
| 78 | *lenp -= len; | ||
| 79 | *ppos += len; | ||
| 80 | return 0; | ||
| 81 | } | 71 | } |
| 82 | 72 | ||
| 83 | static int | 73 | static int |
diff --git a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c index b4b17f44cb29..74de31a06616 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c +++ b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | |||
| @@ -443,18 +443,18 @@ int svc_rdma_recvfrom(struct svc_rqst *rqstp) | |||
| 443 | 443 | ||
| 444 | dprintk("svcrdma: rqstp=%p\n", rqstp); | 444 | dprintk("svcrdma: rqstp=%p\n", rqstp); |
| 445 | 445 | ||
| 446 | spin_lock_bh(&rdma_xprt->sc_read_complete_lock); | 446 | spin_lock_bh(&rdma_xprt->sc_rq_dto_lock); |
| 447 | if (!list_empty(&rdma_xprt->sc_read_complete_q)) { | 447 | if (!list_empty(&rdma_xprt->sc_read_complete_q)) { |
| 448 | ctxt = list_entry(rdma_xprt->sc_read_complete_q.next, | 448 | ctxt = list_entry(rdma_xprt->sc_read_complete_q.next, |
| 449 | struct svc_rdma_op_ctxt, | 449 | struct svc_rdma_op_ctxt, |
| 450 | dto_q); | 450 | dto_q); |
| 451 | list_del_init(&ctxt->dto_q); | 451 | list_del_init(&ctxt->dto_q); |
| 452 | } | 452 | } |
| 453 | spin_unlock_bh(&rdma_xprt->sc_read_complete_lock); | 453 | if (ctxt) { |
| 454 | if (ctxt) | 454 | spin_unlock_bh(&rdma_xprt->sc_rq_dto_lock); |
| 455 | return rdma_read_complete(rqstp, ctxt); | 455 | return rdma_read_complete(rqstp, ctxt); |
| 456 | } | ||
| 456 | 457 | ||
| 457 | spin_lock_bh(&rdma_xprt->sc_rq_dto_lock); | ||
| 458 | if (!list_empty(&rdma_xprt->sc_rq_dto_q)) { | 458 | if (!list_empty(&rdma_xprt->sc_rq_dto_q)) { |
| 459 | ctxt = list_entry(rdma_xprt->sc_rq_dto_q.next, | 459 | ctxt = list_entry(rdma_xprt->sc_rq_dto_q.next, |
| 460 | struct svc_rdma_op_ctxt, | 460 | struct svc_rdma_op_ctxt, |
diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c index 19ddc382b777..900cb69728c6 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_transport.c +++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c | |||
| @@ -359,11 +359,11 @@ static void sq_cq_reap(struct svcxprt_rdma *xprt) | |||
| 359 | if (test_bit(RDMACTXT_F_LAST_CTXT, &ctxt->flags)) { | 359 | if (test_bit(RDMACTXT_F_LAST_CTXT, &ctxt->flags)) { |
| 360 | struct svc_rdma_op_ctxt *read_hdr = ctxt->read_hdr; | 360 | struct svc_rdma_op_ctxt *read_hdr = ctxt->read_hdr; |
| 361 | BUG_ON(!read_hdr); | 361 | BUG_ON(!read_hdr); |
| 362 | spin_lock_bh(&xprt->sc_rq_dto_lock); | ||
| 362 | set_bit(XPT_DATA, &xprt->sc_xprt.xpt_flags); | 363 | set_bit(XPT_DATA, &xprt->sc_xprt.xpt_flags); |
| 363 | spin_lock_bh(&xprt->sc_read_complete_lock); | ||
| 364 | list_add_tail(&read_hdr->dto_q, | 364 | list_add_tail(&read_hdr->dto_q, |
| 365 | &xprt->sc_read_complete_q); | 365 | &xprt->sc_read_complete_q); |
| 366 | spin_unlock_bh(&xprt->sc_read_complete_lock); | 366 | spin_unlock_bh(&xprt->sc_rq_dto_lock); |
| 367 | svc_xprt_enqueue(&xprt->sc_xprt); | 367 | svc_xprt_enqueue(&xprt->sc_xprt); |
| 368 | } | 368 | } |
| 369 | svc_rdma_put_context(ctxt, 0); | 369 | svc_rdma_put_context(ctxt, 0); |
| @@ -428,7 +428,6 @@ static struct svcxprt_rdma *rdma_create_xprt(struct svc_serv *serv, | |||
| 428 | init_waitqueue_head(&cma_xprt->sc_send_wait); | 428 | init_waitqueue_head(&cma_xprt->sc_send_wait); |
| 429 | 429 | ||
| 430 | spin_lock_init(&cma_xprt->sc_lock); | 430 | spin_lock_init(&cma_xprt->sc_lock); |
| 431 | spin_lock_init(&cma_xprt->sc_read_complete_lock); | ||
| 432 | spin_lock_init(&cma_xprt->sc_rq_dto_lock); | 431 | spin_lock_init(&cma_xprt->sc_rq_dto_lock); |
| 433 | 432 | ||
| 434 | cma_xprt->sc_ord = svcrdma_ord; | 433 | cma_xprt->sc_ord = svcrdma_ord; |
diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c index b1ff16aa4bdb..3ddaff42d1bb 100644 --- a/net/tipc/bcast.c +++ b/net/tipc/bcast.c | |||
| @@ -96,8 +96,8 @@ struct bcbearer { | |||
| 96 | struct media media; | 96 | struct media media; |
| 97 | struct bcbearer_pair bpairs[MAX_BEARERS]; | 97 | struct bcbearer_pair bpairs[MAX_BEARERS]; |
| 98 | struct bcbearer_pair bpairs_temp[TIPC_MAX_LINK_PRI + 1]; | 98 | struct bcbearer_pair bpairs_temp[TIPC_MAX_LINK_PRI + 1]; |
| 99 | struct node_map remains; | 99 | struct tipc_node_map remains; |
| 100 | struct node_map remains_new; | 100 | struct tipc_node_map remains_new; |
| 101 | }; | 101 | }; |
| 102 | 102 | ||
| 103 | /** | 103 | /** |
| @@ -110,7 +110,7 @@ struct bcbearer { | |||
| 110 | 110 | ||
| 111 | struct bclink { | 111 | struct bclink { |
| 112 | struct link link; | 112 | struct link link; |
| 113 | struct node node; | 113 | struct tipc_node node; |
| 114 | }; | 114 | }; |
| 115 | 115 | ||
| 116 | 116 | ||
| @@ -149,7 +149,7 @@ static void bcbuf_decr_acks(struct sk_buff *buf) | |||
| 149 | * Called with 'node' locked, bc_lock unlocked | 149 | * Called with 'node' locked, bc_lock unlocked |
| 150 | */ | 150 | */ |
| 151 | 151 | ||
| 152 | static void bclink_set_gap(struct node *n_ptr) | 152 | static void bclink_set_gap(struct tipc_node *n_ptr) |
| 153 | { | 153 | { |
| 154 | struct sk_buff *buf = n_ptr->bclink.deferred_head; | 154 | struct sk_buff *buf = n_ptr->bclink.deferred_head; |
| 155 | 155 | ||
| @@ -202,7 +202,7 @@ static void bclink_retransmit_pkt(u32 after, u32 to) | |||
| 202 | * Node is locked, bc_lock unlocked. | 202 | * Node is locked, bc_lock unlocked. |
| 203 | */ | 203 | */ |
| 204 | 204 | ||
| 205 | void tipc_bclink_acknowledge(struct node *n_ptr, u32 acked) | 205 | void tipc_bclink_acknowledge(struct tipc_node *n_ptr, u32 acked) |
| 206 | { | 206 | { |
| 207 | struct sk_buff *crs; | 207 | struct sk_buff *crs; |
| 208 | struct sk_buff *next; | 208 | struct sk_buff *next; |
| @@ -250,7 +250,7 @@ void tipc_bclink_acknowledge(struct node *n_ptr, u32 acked) | |||
| 250 | * tipc_net_lock and node lock set | 250 | * tipc_net_lock and node lock set |
| 251 | */ | 251 | */ |
| 252 | 252 | ||
| 253 | static void bclink_send_ack(struct node *n_ptr) | 253 | static void bclink_send_ack(struct tipc_node *n_ptr) |
| 254 | { | 254 | { |
| 255 | struct link *l_ptr = n_ptr->active_links[n_ptr->addr & 1]; | 255 | struct link *l_ptr = n_ptr->active_links[n_ptr->addr & 1]; |
| 256 | 256 | ||
| @@ -264,7 +264,7 @@ static void bclink_send_ack(struct node *n_ptr) | |||
| 264 | * tipc_net_lock and node lock set | 264 | * tipc_net_lock and node lock set |
| 265 | */ | 265 | */ |
| 266 | 266 | ||
| 267 | static void bclink_send_nack(struct node *n_ptr) | 267 | static void bclink_send_nack(struct tipc_node *n_ptr) |
| 268 | { | 268 | { |
| 269 | struct sk_buff *buf; | 269 | struct sk_buff *buf; |
| 270 | struct tipc_msg *msg; | 270 | struct tipc_msg *msg; |
| @@ -308,7 +308,7 @@ static void bclink_send_nack(struct node *n_ptr) | |||
| 308 | * tipc_net_lock and node lock set | 308 | * tipc_net_lock and node lock set |
| 309 | */ | 309 | */ |
| 310 | 310 | ||
| 311 | void tipc_bclink_check_gap(struct node *n_ptr, u32 last_sent) | 311 | void tipc_bclink_check_gap(struct tipc_node *n_ptr, u32 last_sent) |
| 312 | { | 312 | { |
| 313 | if (!n_ptr->bclink.supported || | 313 | if (!n_ptr->bclink.supported || |
| 314 | less_eq(last_sent, mod(n_ptr->bclink.last_in))) | 314 | less_eq(last_sent, mod(n_ptr->bclink.last_in))) |
| @@ -328,7 +328,7 @@ void tipc_bclink_check_gap(struct node *n_ptr, u32 last_sent) | |||
| 328 | 328 | ||
| 329 | static void tipc_bclink_peek_nack(u32 dest, u32 sender_tag, u32 gap_after, u32 gap_to) | 329 | static void tipc_bclink_peek_nack(u32 dest, u32 sender_tag, u32 gap_after, u32 gap_to) |
| 330 | { | 330 | { |
| 331 | struct node *n_ptr = tipc_node_find(dest); | 331 | struct tipc_node *n_ptr = tipc_node_find(dest); |
| 332 | u32 my_after, my_to; | 332 | u32 my_after, my_to; |
| 333 | 333 | ||
| 334 | if (unlikely(!n_ptr || !tipc_node_is_up(n_ptr))) | 334 | if (unlikely(!n_ptr || !tipc_node_is_up(n_ptr))) |
| @@ -418,7 +418,7 @@ void tipc_bclink_recv_pkt(struct sk_buff *buf) | |||
| 418 | static int rx_count = 0; | 418 | static int rx_count = 0; |
| 419 | #endif | 419 | #endif |
| 420 | struct tipc_msg *msg = buf_msg(buf); | 420 | struct tipc_msg *msg = buf_msg(buf); |
| 421 | struct node* node = tipc_node_find(msg_prevnode(msg)); | 421 | struct tipc_node* node = tipc_node_find(msg_prevnode(msg)); |
| 422 | u32 next_in; | 422 | u32 next_in; |
| 423 | u32 seqno; | 423 | u32 seqno; |
| 424 | struct sk_buff *deferred; | 424 | struct sk_buff *deferred; |
| @@ -538,7 +538,7 @@ u32 tipc_bclink_get_last_sent(void) | |||
| 538 | return last_sent; | 538 | return last_sent; |
| 539 | } | 539 | } |
| 540 | 540 | ||
| 541 | u32 tipc_bclink_acks_missing(struct node *n_ptr) | 541 | u32 tipc_bclink_acks_missing(struct tipc_node *n_ptr) |
| 542 | { | 542 | { |
| 543 | return (n_ptr->bclink.supported && | 543 | return (n_ptr->bclink.supported && |
| 544 | (tipc_bclink_get_last_sent() != n_ptr->bclink.acked)); | 544 | (tipc_bclink_get_last_sent() != n_ptr->bclink.acked)); |
diff --git a/net/tipc/bcast.h b/net/tipc/bcast.h index a2416fa6b906..5aa024b99c55 100644 --- a/net/tipc/bcast.h +++ b/net/tipc/bcast.h | |||
| @@ -41,12 +41,12 @@ | |||
| 41 | #define WSIZE 32 | 41 | #define WSIZE 32 |
| 42 | 42 | ||
| 43 | /** | 43 | /** |
| 44 | * struct node_map - set of node identifiers | 44 | * struct tipc_node_map - set of node identifiers |
| 45 | * @count: # of nodes in set | 45 | * @count: # of nodes in set |
| 46 | * @map: bitmap of node identifiers that are in the set | 46 | * @map: bitmap of node identifiers that are in the set |
| 47 | */ | 47 | */ |
| 48 | 48 | ||
| 49 | struct node_map { | 49 | struct tipc_node_map { |
| 50 | u32 count; | 50 | u32 count; |
| 51 | u32 map[MAX_NODES / WSIZE]; | 51 | u32 map[MAX_NODES / WSIZE]; |
| 52 | }; | 52 | }; |
| @@ -68,7 +68,7 @@ struct port_list { | |||
| 68 | }; | 68 | }; |
| 69 | 69 | ||
| 70 | 70 | ||
| 71 | struct node; | 71 | struct tipc_node; |
| 72 | 72 | ||
| 73 | extern char tipc_bclink_name[]; | 73 | extern char tipc_bclink_name[]; |
| 74 | 74 | ||
| @@ -77,7 +77,7 @@ extern char tipc_bclink_name[]; | |||
| 77 | * nmap_add - add a node to a node map | 77 | * nmap_add - add a node to a node map |
| 78 | */ | 78 | */ |
| 79 | 79 | ||
| 80 | static inline void tipc_nmap_add(struct node_map *nm_ptr, u32 node) | 80 | static inline void tipc_nmap_add(struct tipc_node_map *nm_ptr, u32 node) |
| 81 | { | 81 | { |
| 82 | int n = tipc_node(node); | 82 | int n = tipc_node(node); |
| 83 | int w = n / WSIZE; | 83 | int w = n / WSIZE; |
| @@ -93,7 +93,7 @@ static inline void tipc_nmap_add(struct node_map *nm_ptr, u32 node) | |||
| 93 | * nmap_remove - remove a node from a node map | 93 | * nmap_remove - remove a node from a node map |
| 94 | */ | 94 | */ |
| 95 | 95 | ||
| 96 | static inline void tipc_nmap_remove(struct node_map *nm_ptr, u32 node) | 96 | static inline void tipc_nmap_remove(struct tipc_node_map *nm_ptr, u32 node) |
| 97 | { | 97 | { |
| 98 | int n = tipc_node(node); | 98 | int n = tipc_node(node); |
| 99 | int w = n / WSIZE; | 99 | int w = n / WSIZE; |
| @@ -109,7 +109,7 @@ static inline void tipc_nmap_remove(struct node_map *nm_ptr, u32 node) | |||
| 109 | * nmap_equal - test for equality of node maps | 109 | * nmap_equal - test for equality of node maps |
| 110 | */ | 110 | */ |
| 111 | 111 | ||
| 112 | static inline int tipc_nmap_equal(struct node_map *nm_a, struct node_map *nm_b) | 112 | static inline int tipc_nmap_equal(struct tipc_node_map *nm_a, struct tipc_node_map *nm_b) |
| 113 | { | 113 | { |
| 114 | return !memcmp(nm_a, nm_b, sizeof(*nm_a)); | 114 | return !memcmp(nm_a, nm_b, sizeof(*nm_a)); |
| 115 | } | 115 | } |
| @@ -121,8 +121,8 @@ static inline int tipc_nmap_equal(struct node_map *nm_a, struct node_map *nm_b) | |||
| 121 | * @nm_diff: output node map A-B (i.e. nodes of A that are not in B) | 121 | * @nm_diff: output node map A-B (i.e. nodes of A that are not in B) |
| 122 | */ | 122 | */ |
| 123 | 123 | ||
| 124 | static inline void tipc_nmap_diff(struct node_map *nm_a, struct node_map *nm_b, | 124 | static inline void tipc_nmap_diff(struct tipc_node_map *nm_a, struct tipc_node_map *nm_b, |
| 125 | struct node_map *nm_diff) | 125 | struct tipc_node_map *nm_diff) |
| 126 | { | 126 | { |
| 127 | int stop = sizeof(nm_a->map) / sizeof(u32); | 127 | int stop = sizeof(nm_a->map) / sizeof(u32); |
| 128 | int w; | 128 | int w; |
| @@ -195,12 +195,12 @@ static inline void tipc_port_list_free(struct port_list *pl_ptr) | |||
| 195 | 195 | ||
| 196 | int tipc_bclink_init(void); | 196 | int tipc_bclink_init(void); |
| 197 | void tipc_bclink_stop(void); | 197 | void tipc_bclink_stop(void); |
| 198 | void tipc_bclink_acknowledge(struct node *n_ptr, u32 acked); | 198 | void tipc_bclink_acknowledge(struct tipc_node *n_ptr, u32 acked); |
| 199 | int tipc_bclink_send_msg(struct sk_buff *buf); | 199 | int tipc_bclink_send_msg(struct sk_buff *buf); |
| 200 | void tipc_bclink_recv_pkt(struct sk_buff *buf); | 200 | void tipc_bclink_recv_pkt(struct sk_buff *buf); |
| 201 | u32 tipc_bclink_get_last_sent(void); | 201 | u32 tipc_bclink_get_last_sent(void); |
| 202 | u32 tipc_bclink_acks_missing(struct node *n_ptr); | 202 | u32 tipc_bclink_acks_missing(struct tipc_node *n_ptr); |
| 203 | void tipc_bclink_check_gap(struct node *n_ptr, u32 seqno); | 203 | void tipc_bclink_check_gap(struct tipc_node *n_ptr, u32 seqno); |
| 204 | int tipc_bclink_stats(char *stats_buf, const u32 buf_size); | 204 | int tipc_bclink_stats(char *stats_buf, const u32 buf_size); |
| 205 | int tipc_bclink_reset_stats(void); | 205 | int tipc_bclink_reset_stats(void); |
| 206 | int tipc_bclink_set_queue_limits(u32 limit); | 206 | int tipc_bclink_set_queue_limits(u32 limit); |
diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c index 6a9aba3edd08..a7a36779b9b3 100644 --- a/net/tipc/bearer.c +++ b/net/tipc/bearer.c | |||
| @@ -599,7 +599,7 @@ int tipc_block_bearer(const char *name) | |||
| 599 | spin_lock_bh(&b_ptr->publ.lock); | 599 | spin_lock_bh(&b_ptr->publ.lock); |
| 600 | b_ptr->publ.blocked = 1; | 600 | b_ptr->publ.blocked = 1; |
| 601 | list_for_each_entry_safe(l_ptr, temp_l_ptr, &b_ptr->links, link_list) { | 601 | list_for_each_entry_safe(l_ptr, temp_l_ptr, &b_ptr->links, link_list) { |
| 602 | struct node *n_ptr = l_ptr->owner; | 602 | struct tipc_node *n_ptr = l_ptr->owner; |
| 603 | 603 | ||
| 604 | spin_lock_bh(&n_ptr->lock); | 604 | spin_lock_bh(&n_ptr->lock); |
| 605 | tipc_link_reset(l_ptr); | 605 | tipc_link_reset(l_ptr); |
diff --git a/net/tipc/bearer.h b/net/tipc/bearer.h index 6a36b6600e6c..ca5734892713 100644 --- a/net/tipc/bearer.h +++ b/net/tipc/bearer.h | |||
| @@ -104,7 +104,7 @@ struct bearer { | |||
| 104 | u32 continue_count; | 104 | u32 continue_count; |
| 105 | int active; | 105 | int active; |
| 106 | char net_plane; | 106 | char net_plane; |
| 107 | struct node_map nodes; | 107 | struct tipc_node_map nodes; |
| 108 | }; | 108 | }; |
| 109 | 109 | ||
| 110 | struct bearer_name { | 110 | struct bearer_name { |
diff --git a/net/tipc/cluster.c b/net/tipc/cluster.c index 46ee6c58532d..689fdefe9d04 100644 --- a/net/tipc/cluster.c +++ b/net/tipc/cluster.c | |||
| @@ -48,8 +48,8 @@ static void tipc_cltr_multicast(struct cluster *c_ptr, struct sk_buff *buf, | |||
| 48 | u32 lower, u32 upper); | 48 | u32 lower, u32 upper); |
| 49 | static struct sk_buff *tipc_cltr_prepare_routing_msg(u32 data_size, u32 dest); | 49 | static struct sk_buff *tipc_cltr_prepare_routing_msg(u32 data_size, u32 dest); |
| 50 | 50 | ||
| 51 | struct node **tipc_local_nodes = NULL; | 51 | struct tipc_node **tipc_local_nodes = NULL; |
| 52 | struct node_map tipc_cltr_bcast_nodes = {0,{0,}}; | 52 | struct tipc_node_map tipc_cltr_bcast_nodes = {0,{0,}}; |
| 53 | u32 tipc_highest_allowed_slave = 0; | 53 | u32 tipc_highest_allowed_slave = 0; |
| 54 | 54 | ||
| 55 | struct cluster *tipc_cltr_create(u32 addr) | 55 | struct cluster *tipc_cltr_create(u32 addr) |
| @@ -115,7 +115,7 @@ void tipc_cltr_delete(struct cluster *c_ptr) | |||
| 115 | 115 | ||
| 116 | u32 tipc_cltr_next_node(struct cluster *c_ptr, u32 addr) | 116 | u32 tipc_cltr_next_node(struct cluster *c_ptr, u32 addr) |
| 117 | { | 117 | { |
| 118 | struct node *n_ptr; | 118 | struct tipc_node *n_ptr; |
| 119 | u32 n_num = tipc_node(addr) + 1; | 119 | u32 n_num = tipc_node(addr) + 1; |
| 120 | 120 | ||
| 121 | if (!c_ptr) | 121 | if (!c_ptr) |
| @@ -133,7 +133,7 @@ u32 tipc_cltr_next_node(struct cluster *c_ptr, u32 addr) | |||
| 133 | return 0; | 133 | return 0; |
| 134 | } | 134 | } |
| 135 | 135 | ||
| 136 | void tipc_cltr_attach_node(struct cluster *c_ptr, struct node *n_ptr) | 136 | void tipc_cltr_attach_node(struct cluster *c_ptr, struct tipc_node *n_ptr) |
| 137 | { | 137 | { |
| 138 | u32 n_num = tipc_node(n_ptr->addr); | 138 | u32 n_num = tipc_node(n_ptr->addr); |
| 139 | u32 max_n_num = tipc_max_nodes; | 139 | u32 max_n_num = tipc_max_nodes; |
| @@ -196,7 +196,7 @@ u32 tipc_cltr_select_router(struct cluster *c_ptr, u32 ref) | |||
| 196 | * Uses deterministic and fair algorithm. | 196 | * Uses deterministic and fair algorithm. |
| 197 | */ | 197 | */ |
| 198 | 198 | ||
| 199 | struct node *tipc_cltr_select_node(struct cluster *c_ptr, u32 selector) | 199 | struct tipc_node *tipc_cltr_select_node(struct cluster *c_ptr, u32 selector) |
| 200 | { | 200 | { |
| 201 | u32 n_num; | 201 | u32 n_num; |
| 202 | u32 mask = tipc_max_nodes; | 202 | u32 mask = tipc_max_nodes; |
| @@ -379,7 +379,7 @@ void tipc_cltr_recv_routing_table(struct sk_buff *buf) | |||
| 379 | { | 379 | { |
| 380 | struct tipc_msg *msg = buf_msg(buf); | 380 | struct tipc_msg *msg = buf_msg(buf); |
| 381 | struct cluster *c_ptr; | 381 | struct cluster *c_ptr; |
| 382 | struct node *n_ptr; | 382 | struct tipc_node *n_ptr; |
| 383 | unchar *node_table; | 383 | unchar *node_table; |
| 384 | u32 table_size; | 384 | u32 table_size; |
| 385 | u32 router; | 385 | u32 router; |
| @@ -499,7 +499,7 @@ static void tipc_cltr_multicast(struct cluster *c_ptr, struct sk_buff *buf, | |||
| 499 | u32 lower, u32 upper) | 499 | u32 lower, u32 upper) |
| 500 | { | 500 | { |
| 501 | struct sk_buff *buf_copy; | 501 | struct sk_buff *buf_copy; |
| 502 | struct node *n_ptr; | 502 | struct tipc_node *n_ptr; |
| 503 | u32 n_num; | 503 | u32 n_num; |
| 504 | u32 tstop; | 504 | u32 tstop; |
| 505 | 505 | ||
| @@ -534,7 +534,7 @@ void tipc_cltr_broadcast(struct sk_buff *buf) | |||
| 534 | { | 534 | { |
| 535 | struct sk_buff *buf_copy; | 535 | struct sk_buff *buf_copy; |
| 536 | struct cluster *c_ptr; | 536 | struct cluster *c_ptr; |
| 537 | struct node *n_ptr; | 537 | struct tipc_node *n_ptr; |
| 538 | u32 n_num; | 538 | u32 n_num; |
| 539 | u32 tstart; | 539 | u32 tstart; |
| 540 | u32 tstop; | 540 | u32 tstop; |
diff --git a/net/tipc/cluster.h b/net/tipc/cluster.h index 62df074afaec..333efb0b9c44 100644 --- a/net/tipc/cluster.h +++ b/net/tipc/cluster.h | |||
| @@ -54,24 +54,24 @@ | |||
| 54 | struct cluster { | 54 | struct cluster { |
| 55 | u32 addr; | 55 | u32 addr; |
| 56 | struct _zone *owner; | 56 | struct _zone *owner; |
| 57 | struct node **nodes; | 57 | struct tipc_node **nodes; |
| 58 | u32 highest_node; | 58 | u32 highest_node; |
| 59 | u32 highest_slave; | 59 | u32 highest_slave; |
| 60 | }; | 60 | }; |
| 61 | 61 | ||
| 62 | 62 | ||
| 63 | extern struct node **tipc_local_nodes; | 63 | extern struct tipc_node **tipc_local_nodes; |
| 64 | extern u32 tipc_highest_allowed_slave; | 64 | extern u32 tipc_highest_allowed_slave; |
| 65 | extern struct node_map tipc_cltr_bcast_nodes; | 65 | extern struct tipc_node_map tipc_cltr_bcast_nodes; |
| 66 | 66 | ||
| 67 | void tipc_cltr_remove_as_router(struct cluster *c_ptr, u32 router); | 67 | void tipc_cltr_remove_as_router(struct cluster *c_ptr, u32 router); |
| 68 | void tipc_cltr_send_ext_routes(struct cluster *c_ptr, u32 dest); | 68 | void tipc_cltr_send_ext_routes(struct cluster *c_ptr, u32 dest); |
| 69 | struct node *tipc_cltr_select_node(struct cluster *c_ptr, u32 selector); | 69 | struct tipc_node *tipc_cltr_select_node(struct cluster *c_ptr, u32 selector); |
| 70 | u32 tipc_cltr_select_router(struct cluster *c_ptr, u32 ref); | 70 | u32 tipc_cltr_select_router(struct cluster *c_ptr, u32 ref); |
| 71 | void tipc_cltr_recv_routing_table(struct sk_buff *buf); | 71 | void tipc_cltr_recv_routing_table(struct sk_buff *buf); |
| 72 | struct cluster *tipc_cltr_create(u32 addr); | 72 | struct cluster *tipc_cltr_create(u32 addr); |
| 73 | void tipc_cltr_delete(struct cluster *c_ptr); | 73 | void tipc_cltr_delete(struct cluster *c_ptr); |
| 74 | void tipc_cltr_attach_node(struct cluster *c_ptr, struct node *n_ptr); | 74 | void tipc_cltr_attach_node(struct cluster *c_ptr, struct tipc_node *n_ptr); |
| 75 | void tipc_cltr_send_slave_routes(struct cluster *c_ptr, u32 dest); | 75 | void tipc_cltr_send_slave_routes(struct cluster *c_ptr, u32 dest); |
| 76 | void tipc_cltr_broadcast(struct sk_buff *buf); | 76 | void tipc_cltr_broadcast(struct sk_buff *buf); |
| 77 | int tipc_cltr_init(void); | 77 | int tipc_cltr_init(void); |
diff --git a/net/tipc/discover.c b/net/tipc/discover.c index 1657f0e795ff..74b7d1e28aec 100644 --- a/net/tipc/discover.c +++ b/net/tipc/discover.c | |||
| @@ -193,7 +193,7 @@ void tipc_disc_recv_msg(struct sk_buff *buf, struct bearer *b_ptr) | |||
| 193 | /* Always accept link here */ | 193 | /* Always accept link here */ |
| 194 | struct sk_buff *rbuf; | 194 | struct sk_buff *rbuf; |
| 195 | struct tipc_media_addr *addr; | 195 | struct tipc_media_addr *addr; |
| 196 | struct node *n_ptr = tipc_node_find(orig); | 196 | struct tipc_node *n_ptr = tipc_node_find(orig); |
| 197 | int link_fully_up; | 197 | int link_fully_up; |
| 198 | 198 | ||
| 199 | dbg(" in own cluster\n"); | 199 | dbg(" in own cluster\n"); |
diff --git a/net/tipc/link.c b/net/tipc/link.c index d60113ba4b1b..dd4c18b9a35b 100644 --- a/net/tipc/link.c +++ b/net/tipc/link.c | |||
| @@ -1155,7 +1155,7 @@ int tipc_link_send_buf(struct link *l_ptr, struct sk_buff *buf) | |||
| 1155 | int tipc_link_send(struct sk_buff *buf, u32 dest, u32 selector) | 1155 | int tipc_link_send(struct sk_buff *buf, u32 dest, u32 selector) |
| 1156 | { | 1156 | { |
| 1157 | struct link *l_ptr; | 1157 | struct link *l_ptr; |
| 1158 | struct node *n_ptr; | 1158 | struct tipc_node *n_ptr; |
| 1159 | int res = -ELINKCONG; | 1159 | int res = -ELINKCONG; |
| 1160 | 1160 | ||
| 1161 | read_lock_bh(&tipc_net_lock); | 1161 | read_lock_bh(&tipc_net_lock); |
| @@ -1226,7 +1226,7 @@ static int link_send_buf_fast(struct link *l_ptr, struct sk_buff *buf, | |||
| 1226 | int tipc_send_buf_fast(struct sk_buff *buf, u32 destnode) | 1226 | int tipc_send_buf_fast(struct sk_buff *buf, u32 destnode) |
| 1227 | { | 1227 | { |
| 1228 | struct link *l_ptr; | 1228 | struct link *l_ptr; |
| 1229 | struct node *n_ptr; | 1229 | struct tipc_node *n_ptr; |
| 1230 | int res; | 1230 | int res; |
| 1231 | u32 selector = msg_origport(buf_msg(buf)) & 1; | 1231 | u32 selector = msg_origport(buf_msg(buf)) & 1; |
| 1232 | u32 dummy; | 1232 | u32 dummy; |
| @@ -1270,7 +1270,7 @@ int tipc_link_send_sections_fast(struct port *sender, | |||
| 1270 | struct tipc_msg *hdr = &sender->publ.phdr; | 1270 | struct tipc_msg *hdr = &sender->publ.phdr; |
| 1271 | struct link *l_ptr; | 1271 | struct link *l_ptr; |
| 1272 | struct sk_buff *buf; | 1272 | struct sk_buff *buf; |
| 1273 | struct node *node; | 1273 | struct tipc_node *node; |
| 1274 | int res; | 1274 | int res; |
| 1275 | u32 selector = msg_origport(hdr) & 1; | 1275 | u32 selector = msg_origport(hdr) & 1; |
| 1276 | 1276 | ||
| @@ -1364,7 +1364,7 @@ static int link_send_sections_long(struct port *sender, | |||
| 1364 | u32 destaddr) | 1364 | u32 destaddr) |
| 1365 | { | 1365 | { |
| 1366 | struct link *l_ptr; | 1366 | struct link *l_ptr; |
| 1367 | struct node *node; | 1367 | struct tipc_node *node; |
| 1368 | struct tipc_msg *hdr = &sender->publ.phdr; | 1368 | struct tipc_msg *hdr = &sender->publ.phdr; |
| 1369 | u32 dsz = msg_data_sz(hdr); | 1369 | u32 dsz = msg_data_sz(hdr); |
| 1370 | u32 max_pkt,fragm_sz,rest; | 1370 | u32 max_pkt,fragm_sz,rest; |
| @@ -1636,7 +1636,7 @@ void tipc_link_push_queue(struct link *l_ptr) | |||
| 1636 | 1636 | ||
| 1637 | static void link_reset_all(unsigned long addr) | 1637 | static void link_reset_all(unsigned long addr) |
| 1638 | { | 1638 | { |
| 1639 | struct node *n_ptr; | 1639 | struct tipc_node *n_ptr; |
| 1640 | char addr_string[16]; | 1640 | char addr_string[16]; |
| 1641 | u32 i; | 1641 | u32 i; |
| 1642 | 1642 | ||
| @@ -1682,7 +1682,7 @@ static void link_retransmit_failure(struct link *l_ptr, struct sk_buff *buf) | |||
| 1682 | 1682 | ||
| 1683 | /* Handle failure on broadcast link */ | 1683 | /* Handle failure on broadcast link */ |
| 1684 | 1684 | ||
| 1685 | struct node *n_ptr; | 1685 | struct tipc_node *n_ptr; |
| 1686 | char addr_string[16]; | 1686 | char addr_string[16]; |
| 1687 | 1687 | ||
| 1688 | tipc_printf(TIPC_OUTPUT, "Msg seq number: %u, ", msg_seqno(msg)); | 1688 | tipc_printf(TIPC_OUTPUT, "Msg seq number: %u, ", msg_seqno(msg)); |
| @@ -1843,7 +1843,7 @@ void tipc_recv_msg(struct sk_buff *head, struct tipc_bearer *tb_ptr) | |||
| 1843 | read_lock_bh(&tipc_net_lock); | 1843 | read_lock_bh(&tipc_net_lock); |
| 1844 | while (head) { | 1844 | while (head) { |
| 1845 | struct bearer *b_ptr = (struct bearer *)tb_ptr; | 1845 | struct bearer *b_ptr = (struct bearer *)tb_ptr; |
| 1846 | struct node *n_ptr; | 1846 | struct tipc_node *n_ptr; |
| 1847 | struct link *l_ptr; | 1847 | struct link *l_ptr; |
| 1848 | struct sk_buff *crs; | 1848 | struct sk_buff *crs; |
| 1849 | struct sk_buff *buf = head; | 1849 | struct sk_buff *buf = head; |
| @@ -2935,7 +2935,7 @@ void tipc_link_set_queue_limits(struct link *l_ptr, u32 window) | |||
| 2935 | * Returns pointer to link (or 0 if invalid link name). | 2935 | * Returns pointer to link (or 0 if invalid link name). |
| 2936 | */ | 2936 | */ |
| 2937 | 2937 | ||
| 2938 | static struct link *link_find_link(const char *name, struct node **node) | 2938 | static struct link *link_find_link(const char *name, struct tipc_node **node) |
| 2939 | { | 2939 | { |
| 2940 | struct link_name link_name_parts; | 2940 | struct link_name link_name_parts; |
| 2941 | struct bearer *b_ptr; | 2941 | struct bearer *b_ptr; |
| @@ -2965,7 +2965,7 @@ struct sk_buff *tipc_link_cmd_config(const void *req_tlv_area, int req_tlv_space | |||
| 2965 | struct tipc_link_config *args; | 2965 | struct tipc_link_config *args; |
| 2966 | u32 new_value; | 2966 | u32 new_value; |
| 2967 | struct link *l_ptr; | 2967 | struct link *l_ptr; |
| 2968 | struct node *node; | 2968 | struct tipc_node *node; |
| 2969 | int res; | 2969 | int res; |
| 2970 | 2970 | ||
| 2971 | if (!TLV_CHECK(req_tlv_area, req_tlv_space, TIPC_TLV_LINK_CONFIG)) | 2971 | if (!TLV_CHECK(req_tlv_area, req_tlv_space, TIPC_TLV_LINK_CONFIG)) |
| @@ -3043,7 +3043,7 @@ struct sk_buff *tipc_link_cmd_reset_stats(const void *req_tlv_area, int req_tlv_ | |||
| 3043 | { | 3043 | { |
| 3044 | char *link_name; | 3044 | char *link_name; |
| 3045 | struct link *l_ptr; | 3045 | struct link *l_ptr; |
| 3046 | struct node *node; | 3046 | struct tipc_node *node; |
| 3047 | 3047 | ||
| 3048 | if (!TLV_CHECK(req_tlv_area, req_tlv_space, TIPC_TLV_LINK_NAME)) | 3048 | if (!TLV_CHECK(req_tlv_area, req_tlv_space, TIPC_TLV_LINK_NAME)) |
| 3049 | return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR); | 3049 | return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR); |
| @@ -3091,7 +3091,7 @@ static int tipc_link_stats(const char *name, char *buf, const u32 buf_size) | |||
| 3091 | { | 3091 | { |
| 3092 | struct print_buf pb; | 3092 | struct print_buf pb; |
| 3093 | struct link *l_ptr; | 3093 | struct link *l_ptr; |
| 3094 | struct node *node; | 3094 | struct tipc_node *node; |
| 3095 | char *status; | 3095 | char *status; |
| 3096 | u32 profile_total = 0; | 3096 | u32 profile_total = 0; |
| 3097 | 3097 | ||
| @@ -3207,7 +3207,7 @@ int link_control(const char *name, u32 op, u32 val) | |||
| 3207 | int res = -EINVAL; | 3207 | int res = -EINVAL; |
| 3208 | struct link *l_ptr; | 3208 | struct link *l_ptr; |
| 3209 | u32 bearer_id; | 3209 | u32 bearer_id; |
| 3210 | struct node * node; | 3210 | struct tipc_node * node; |
| 3211 | u32 a; | 3211 | u32 a; |
| 3212 | 3212 | ||
| 3213 | a = link_name2addr(name, &bearer_id); | 3213 | a = link_name2addr(name, &bearer_id); |
| @@ -3249,7 +3249,7 @@ int link_control(const char *name, u32 op, u32 val) | |||
| 3249 | 3249 | ||
| 3250 | u32 tipc_link_get_max_pkt(u32 dest, u32 selector) | 3250 | u32 tipc_link_get_max_pkt(u32 dest, u32 selector) |
| 3251 | { | 3251 | { |
| 3252 | struct node *n_ptr; | 3252 | struct tipc_node *n_ptr; |
| 3253 | struct link *l_ptr; | 3253 | struct link *l_ptr; |
| 3254 | u32 res = MAX_PKT_DEFAULT; | 3254 | u32 res = MAX_PKT_DEFAULT; |
| 3255 | 3255 | ||
diff --git a/net/tipc/link.h b/net/tipc/link.h index 52f3e7c1871f..6a51e38ad25c 100644 --- a/net/tipc/link.h +++ b/net/tipc/link.h | |||
| @@ -116,7 +116,7 @@ struct link { | |||
| 116 | char name[TIPC_MAX_LINK_NAME]; | 116 | char name[TIPC_MAX_LINK_NAME]; |
| 117 | struct tipc_media_addr media_addr; | 117 | struct tipc_media_addr media_addr; |
| 118 | struct timer_list timer; | 118 | struct timer_list timer; |
| 119 | struct node *owner; | 119 | struct tipc_node *owner; |
| 120 | struct list_head link_list; | 120 | struct list_head link_list; |
| 121 | 121 | ||
| 122 | /* Management and link supervision data */ | 122 | /* Management and link supervision data */ |
diff --git a/net/tipc/name_table.h b/net/tipc/name_table.h index b9e7cd336d76..139882d4ed00 100644 --- a/net/tipc/name_table.h +++ b/net/tipc/name_table.h | |||
| @@ -76,7 +76,7 @@ struct publication { | |||
| 76 | u32 node; | 76 | u32 node; |
| 77 | u32 ref; | 77 | u32 ref; |
| 78 | u32 key; | 78 | u32 key; |
| 79 | struct node_subscr subscr; | 79 | struct tipc_node_subscr subscr; |
| 80 | struct list_head local_list; | 80 | struct list_head local_list; |
| 81 | struct list_head pport_list; | 81 | struct list_head pport_list; |
| 82 | struct publication *node_list_next; | 82 | struct publication *node_list_next; |
diff --git a/net/tipc/net.c b/net/tipc/net.c index ec7b04fbdc43..7906608bf510 100644 --- a/net/tipc/net.c +++ b/net/tipc/net.c | |||
| @@ -118,7 +118,7 @@ | |||
| 118 | DEFINE_RWLOCK(tipc_net_lock); | 118 | DEFINE_RWLOCK(tipc_net_lock); |
| 119 | struct network tipc_net = { NULL }; | 119 | struct network tipc_net = { NULL }; |
| 120 | 120 | ||
| 121 | struct node *tipc_net_select_remote_node(u32 addr, u32 ref) | 121 | struct tipc_node *tipc_net_select_remote_node(u32 addr, u32 ref) |
| 122 | { | 122 | { |
| 123 | return tipc_zone_select_remote_node(tipc_net.zones[tipc_zone(addr)], addr, ref); | 123 | return tipc_zone_select_remote_node(tipc_net.zones[tipc_zone(addr)], addr, ref); |
| 124 | } | 124 | } |
diff --git a/net/tipc/net.h b/net/tipc/net.h index d154ac2bda9a..de2b9ad8f646 100644 --- a/net/tipc/net.h +++ b/net/tipc/net.h | |||
| @@ -55,7 +55,7 @@ extern rwlock_t tipc_net_lock; | |||
| 55 | void tipc_net_remove_as_router(u32 router); | 55 | void tipc_net_remove_as_router(u32 router); |
| 56 | void tipc_net_send_external_routes(u32 dest); | 56 | void tipc_net_send_external_routes(u32 dest); |
| 57 | void tipc_net_route_msg(struct sk_buff *buf); | 57 | void tipc_net_route_msg(struct sk_buff *buf); |
| 58 | struct node *tipc_net_select_remote_node(u32 addr, u32 ref); | 58 | struct tipc_node *tipc_net_select_remote_node(u32 addr, u32 ref); |
| 59 | u32 tipc_net_select_router(u32 addr, u32 ref); | 59 | u32 tipc_net_select_router(u32 addr, u32 ref); |
| 60 | 60 | ||
| 61 | int tipc_net_start(u32 addr); | 61 | int tipc_net_start(u32 addr); |
diff --git a/net/tipc/node.c b/net/tipc/node.c index ee952ad60218..20d98c56e152 100644 --- a/net/tipc/node.c +++ b/net/tipc/node.c | |||
| @@ -46,11 +46,11 @@ | |||
| 46 | #include "bearer.h" | 46 | #include "bearer.h" |
| 47 | #include "name_distr.h" | 47 | #include "name_distr.h" |
| 48 | 48 | ||
| 49 | void node_print(struct print_buf *buf, struct node *n_ptr, char *str); | 49 | void node_print(struct print_buf *buf, struct tipc_node *n_ptr, char *str); |
| 50 | static void node_lost_contact(struct node *n_ptr); | 50 | static void node_lost_contact(struct tipc_node *n_ptr); |
| 51 | static void node_established_contact(struct node *n_ptr); | 51 | static void node_established_contact(struct tipc_node *n_ptr); |
| 52 | 52 | ||
| 53 | struct node *tipc_nodes = NULL; /* sorted list of nodes within cluster */ | 53 | struct tipc_node *tipc_nodes = NULL; /* sorted list of nodes within cluster */ |
| 54 | 54 | ||
| 55 | static DEFINE_SPINLOCK(node_create_lock); | 55 | static DEFINE_SPINLOCK(node_create_lock); |
| 56 | 56 | ||
| @@ -66,11 +66,11 @@ u32 tipc_own_tag = 0; | |||
| 66 | * but this is a non-trivial change.) | 66 | * but this is a non-trivial change.) |
| 67 | */ | 67 | */ |
| 68 | 68 | ||
| 69 | struct node *tipc_node_create(u32 addr) | 69 | struct tipc_node *tipc_node_create(u32 addr) |
| 70 | { | 70 | { |
| 71 | struct cluster *c_ptr; | 71 | struct cluster *c_ptr; |
| 72 | struct node *n_ptr; | 72 | struct tipc_node *n_ptr; |
| 73 | struct node **curr_node; | 73 | struct tipc_node **curr_node; |
| 74 | 74 | ||
| 75 | spin_lock_bh(&node_create_lock); | 75 | spin_lock_bh(&node_create_lock); |
| 76 | 76 | ||
| @@ -120,7 +120,7 @@ struct node *tipc_node_create(u32 addr) | |||
| 120 | return n_ptr; | 120 | return n_ptr; |
| 121 | } | 121 | } |
| 122 | 122 | ||
| 123 | void tipc_node_delete(struct node *n_ptr) | 123 | void tipc_node_delete(struct tipc_node *n_ptr) |
| 124 | { | 124 | { |
| 125 | if (!n_ptr) | 125 | if (!n_ptr) |
| 126 | return; | 126 | return; |
| @@ -146,7 +146,7 @@ void tipc_node_delete(struct node *n_ptr) | |||
| 146 | * Link becomes active (alone or shared) or standby, depending on its priority. | 146 | * Link becomes active (alone or shared) or standby, depending on its priority. |
| 147 | */ | 147 | */ |
| 148 | 148 | ||
| 149 | void tipc_node_link_up(struct node *n_ptr, struct link *l_ptr) | 149 | void tipc_node_link_up(struct tipc_node *n_ptr, struct link *l_ptr) |
| 150 | { | 150 | { |
| 151 | struct link **active = &n_ptr->active_links[0]; | 151 | struct link **active = &n_ptr->active_links[0]; |
| 152 | 152 | ||
| @@ -180,7 +180,7 @@ void tipc_node_link_up(struct node *n_ptr, struct link *l_ptr) | |||
| 180 | * node_select_active_links - select active link | 180 | * node_select_active_links - select active link |
| 181 | */ | 181 | */ |
| 182 | 182 | ||
| 183 | static void node_select_active_links(struct node *n_ptr) | 183 | static void node_select_active_links(struct tipc_node *n_ptr) |
| 184 | { | 184 | { |
| 185 | struct link **active = &n_ptr->active_links[0]; | 185 | struct link **active = &n_ptr->active_links[0]; |
| 186 | u32 i; | 186 | u32 i; |
| @@ -208,7 +208,7 @@ static void node_select_active_links(struct node *n_ptr) | |||
| 208 | * tipc_node_link_down - handle loss of link | 208 | * tipc_node_link_down - handle loss of link |
| 209 | */ | 209 | */ |
| 210 | 210 | ||
| 211 | void tipc_node_link_down(struct node *n_ptr, struct link *l_ptr) | 211 | void tipc_node_link_down(struct tipc_node *n_ptr, struct link *l_ptr) |
| 212 | { | 212 | { |
| 213 | struct link **active; | 213 | struct link **active; |
| 214 | 214 | ||
| @@ -235,30 +235,30 @@ void tipc_node_link_down(struct node *n_ptr, struct link *l_ptr) | |||
| 235 | node_lost_contact(n_ptr); | 235 | node_lost_contact(n_ptr); |
| 236 | } | 236 | } |
| 237 | 237 | ||
| 238 | int tipc_node_has_active_links(struct node *n_ptr) | 238 | int tipc_node_has_active_links(struct tipc_node *n_ptr) |
| 239 | { | 239 | { |
| 240 | return (n_ptr && | 240 | return (n_ptr && |
| 241 | ((n_ptr->active_links[0]) || (n_ptr->active_links[1]))); | 241 | ((n_ptr->active_links[0]) || (n_ptr->active_links[1]))); |
| 242 | } | 242 | } |
| 243 | 243 | ||
| 244 | int tipc_node_has_redundant_links(struct node *n_ptr) | 244 | int tipc_node_has_redundant_links(struct tipc_node *n_ptr) |
| 245 | { | 245 | { |
| 246 | return (n_ptr->working_links > 1); | 246 | return (n_ptr->working_links > 1); |
| 247 | } | 247 | } |
| 248 | 248 | ||
| 249 | static int tipc_node_has_active_routes(struct node *n_ptr) | 249 | static int tipc_node_has_active_routes(struct tipc_node *n_ptr) |
| 250 | { | 250 | { |
| 251 | return (n_ptr && (n_ptr->last_router >= 0)); | 251 | return (n_ptr && (n_ptr->last_router >= 0)); |
| 252 | } | 252 | } |
| 253 | 253 | ||
| 254 | int tipc_node_is_up(struct node *n_ptr) | 254 | int tipc_node_is_up(struct tipc_node *n_ptr) |
| 255 | { | 255 | { |
| 256 | return (tipc_node_has_active_links(n_ptr) || tipc_node_has_active_routes(n_ptr)); | 256 | return (tipc_node_has_active_links(n_ptr) || tipc_node_has_active_routes(n_ptr)); |
| 257 | } | 257 | } |
| 258 | 258 | ||
| 259 | struct node *tipc_node_attach_link(struct link *l_ptr) | 259 | struct tipc_node *tipc_node_attach_link(struct link *l_ptr) |
| 260 | { | 260 | { |
| 261 | struct node *n_ptr = tipc_node_find(l_ptr->addr); | 261 | struct tipc_node *n_ptr = tipc_node_find(l_ptr->addr); |
| 262 | 262 | ||
| 263 | if (!n_ptr) | 263 | if (!n_ptr) |
| 264 | n_ptr = tipc_node_create(l_ptr->addr); | 264 | n_ptr = tipc_node_create(l_ptr->addr); |
| @@ -285,7 +285,7 @@ struct node *tipc_node_attach_link(struct link *l_ptr) | |||
| 285 | return NULL; | 285 | return NULL; |
| 286 | } | 286 | } |
| 287 | 287 | ||
| 288 | void tipc_node_detach_link(struct node *n_ptr, struct link *l_ptr) | 288 | void tipc_node_detach_link(struct tipc_node *n_ptr, struct link *l_ptr) |
| 289 | { | 289 | { |
| 290 | n_ptr->links[l_ptr->b_ptr->identity] = NULL; | 290 | n_ptr->links[l_ptr->b_ptr->identity] = NULL; |
| 291 | tipc_net.zones[tipc_zone(l_ptr->addr)]->links--; | 291 | tipc_net.zones[tipc_zone(l_ptr->addr)]->links--; |
| @@ -338,7 +338,7 @@ void tipc_node_detach_link(struct node *n_ptr, struct link *l_ptr) | |||
| 338 | * | 338 | * |
| 339 | */ | 339 | */ |
| 340 | 340 | ||
| 341 | static void node_established_contact(struct node *n_ptr) | 341 | static void node_established_contact(struct tipc_node *n_ptr) |
| 342 | { | 342 | { |
| 343 | struct cluster *c_ptr; | 343 | struct cluster *c_ptr; |
| 344 | 344 | ||
| @@ -384,10 +384,10 @@ static void node_established_contact(struct node *n_ptr) | |||
| 384 | tipc_highest_allowed_slave); | 384 | tipc_highest_allowed_slave); |
| 385 | } | 385 | } |
| 386 | 386 | ||
| 387 | static void node_lost_contact(struct node *n_ptr) | 387 | static void node_lost_contact(struct tipc_node *n_ptr) |
| 388 | { | 388 | { |
| 389 | struct cluster *c_ptr; | 389 | struct cluster *c_ptr; |
| 390 | struct node_subscr *ns, *tns; | 390 | struct tipc_node_subscr *ns, *tns; |
| 391 | char addr_string[16]; | 391 | char addr_string[16]; |
| 392 | u32 i; | 392 | u32 i; |
| 393 | 393 | ||
| @@ -466,9 +466,9 @@ static void node_lost_contact(struct node *n_ptr) | |||
| 466 | * Called by when cluster local lookup has failed. | 466 | * Called by when cluster local lookup has failed. |
| 467 | */ | 467 | */ |
| 468 | 468 | ||
| 469 | struct node *tipc_node_select_next_hop(u32 addr, u32 selector) | 469 | struct tipc_node *tipc_node_select_next_hop(u32 addr, u32 selector) |
| 470 | { | 470 | { |
| 471 | struct node *n_ptr; | 471 | struct tipc_node *n_ptr; |
| 472 | u32 router_addr; | 472 | u32 router_addr; |
| 473 | 473 | ||
| 474 | if (!tipc_addr_domain_valid(addr)) | 474 | if (!tipc_addr_domain_valid(addr)) |
| @@ -513,7 +513,7 @@ struct node *tipc_node_select_next_hop(u32 addr, u32 selector) | |||
| 513 | * Uses a deterministic and fair algorithm for selecting router node. | 513 | * Uses a deterministic and fair algorithm for selecting router node. |
| 514 | */ | 514 | */ |
| 515 | 515 | ||
| 516 | u32 tipc_node_select_router(struct node *n_ptr, u32 ref) | 516 | u32 tipc_node_select_router(struct tipc_node *n_ptr, u32 ref) |
| 517 | { | 517 | { |
| 518 | u32 ulim; | 518 | u32 ulim; |
| 519 | u32 mask; | 519 | u32 mask; |
| @@ -551,7 +551,7 @@ u32 tipc_node_select_router(struct node *n_ptr, u32 ref) | |||
| 551 | return tipc_addr(own_zone(), own_cluster(), r); | 551 | return tipc_addr(own_zone(), own_cluster(), r); |
| 552 | } | 552 | } |
| 553 | 553 | ||
| 554 | void tipc_node_add_router(struct node *n_ptr, u32 router) | 554 | void tipc_node_add_router(struct tipc_node *n_ptr, u32 router) |
| 555 | { | 555 | { |
| 556 | u32 r_num = tipc_node(router); | 556 | u32 r_num = tipc_node(router); |
| 557 | 557 | ||
| @@ -562,7 +562,7 @@ void tipc_node_add_router(struct node *n_ptr, u32 router) | |||
| 562 | !n_ptr->routers[n_ptr->last_router]); | 562 | !n_ptr->routers[n_ptr->last_router]); |
| 563 | } | 563 | } |
| 564 | 564 | ||
| 565 | void tipc_node_remove_router(struct node *n_ptr, u32 router) | 565 | void tipc_node_remove_router(struct tipc_node *n_ptr, u32 router) |
| 566 | { | 566 | { |
| 567 | u32 r_num = tipc_node(router); | 567 | u32 r_num = tipc_node(router); |
| 568 | 568 | ||
| @@ -580,7 +580,7 @@ void tipc_node_remove_router(struct node *n_ptr, u32 router) | |||
| 580 | } | 580 | } |
| 581 | 581 | ||
| 582 | #if 0 | 582 | #if 0 |
| 583 | void node_print(struct print_buf *buf, struct node *n_ptr, char *str) | 583 | void node_print(struct print_buf *buf, struct tipc_node *n_ptr, char *str) |
| 584 | { | 584 | { |
| 585 | u32 i; | 585 | u32 i; |
| 586 | 586 | ||
| @@ -597,7 +597,7 @@ void node_print(struct print_buf *buf, struct node *n_ptr, char *str) | |||
| 597 | 597 | ||
| 598 | u32 tipc_available_nodes(const u32 domain) | 598 | u32 tipc_available_nodes(const u32 domain) |
| 599 | { | 599 | { |
| 600 | struct node *n_ptr; | 600 | struct tipc_node *n_ptr; |
| 601 | u32 cnt = 0; | 601 | u32 cnt = 0; |
| 602 | 602 | ||
| 603 | read_lock_bh(&tipc_net_lock); | 603 | read_lock_bh(&tipc_net_lock); |
| @@ -615,7 +615,7 @@ struct sk_buff *tipc_node_get_nodes(const void *req_tlv_area, int req_tlv_space) | |||
| 615 | { | 615 | { |
| 616 | u32 domain; | 616 | u32 domain; |
| 617 | struct sk_buff *buf; | 617 | struct sk_buff *buf; |
| 618 | struct node *n_ptr; | 618 | struct tipc_node *n_ptr; |
| 619 | struct tipc_node_info node_info; | 619 | struct tipc_node_info node_info; |
| 620 | u32 payload_size; | 620 | u32 payload_size; |
| 621 | 621 | ||
| @@ -667,7 +667,7 @@ struct sk_buff *tipc_node_get_links(const void *req_tlv_area, int req_tlv_space) | |||
| 667 | { | 667 | { |
| 668 | u32 domain; | 668 | u32 domain; |
| 669 | struct sk_buff *buf; | 669 | struct sk_buff *buf; |
| 670 | struct node *n_ptr; | 670 | struct tipc_node *n_ptr; |
| 671 | struct tipc_link_info link_info; | 671 | struct tipc_link_info link_info; |
| 672 | u32 payload_size; | 672 | u32 payload_size; |
| 673 | 673 | ||
diff --git a/net/tipc/node.h b/net/tipc/node.h index cd1882654bbb..6f990da5d143 100644 --- a/net/tipc/node.h +++ b/net/tipc/node.h | |||
| @@ -43,7 +43,7 @@ | |||
| 43 | #include "bearer.h" | 43 | #include "bearer.h" |
| 44 | 44 | ||
| 45 | /** | 45 | /** |
| 46 | * struct node - TIPC node structure | 46 | * struct tipc_node - TIPC node structure |
| 47 | * @addr: network address of node | 47 | * @addr: network address of node |
| 48 | * @lock: spinlock governing access to structure | 48 | * @lock: spinlock governing access to structure |
| 49 | * @owner: pointer to cluster that node belongs to | 49 | * @owner: pointer to cluster that node belongs to |
| @@ -68,11 +68,11 @@ | |||
| 68 | * @defragm: list of partially reassembled b'cast message fragments from node | 68 | * @defragm: list of partially reassembled b'cast message fragments from node |
| 69 | */ | 69 | */ |
| 70 | 70 | ||
| 71 | struct node { | 71 | struct tipc_node { |
| 72 | u32 addr; | 72 | u32 addr; |
| 73 | spinlock_t lock; | 73 | spinlock_t lock; |
| 74 | struct cluster *owner; | 74 | struct cluster *owner; |
| 75 | struct node *next; | 75 | struct tipc_node *next; |
| 76 | struct list_head nsub; | 76 | struct list_head nsub; |
| 77 | struct link *active_links[2]; | 77 | struct link *active_links[2]; |
| 78 | struct link *links[MAX_BEARERS]; | 78 | struct link *links[MAX_BEARERS]; |
| @@ -94,26 +94,26 @@ struct node { | |||
| 94 | } bclink; | 94 | } bclink; |
| 95 | }; | 95 | }; |
| 96 | 96 | ||
| 97 | extern struct node *tipc_nodes; | 97 | extern struct tipc_node *tipc_nodes; |
| 98 | extern u32 tipc_own_tag; | 98 | extern u32 tipc_own_tag; |
| 99 | 99 | ||
| 100 | struct node *tipc_node_create(u32 addr); | 100 | struct tipc_node *tipc_node_create(u32 addr); |
| 101 | void tipc_node_delete(struct node *n_ptr); | 101 | void tipc_node_delete(struct tipc_node *n_ptr); |
| 102 | struct node *tipc_node_attach_link(struct link *l_ptr); | 102 | struct tipc_node *tipc_node_attach_link(struct link *l_ptr); |
| 103 | void tipc_node_detach_link(struct node *n_ptr, struct link *l_ptr); | 103 | void tipc_node_detach_link(struct tipc_node *n_ptr, struct link *l_ptr); |
| 104 | void tipc_node_link_down(struct node *n_ptr, struct link *l_ptr); | 104 | void tipc_node_link_down(struct tipc_node *n_ptr, struct link *l_ptr); |
| 105 | void tipc_node_link_up(struct node *n_ptr, struct link *l_ptr); | 105 | void tipc_node_link_up(struct tipc_node *n_ptr, struct link *l_ptr); |
| 106 | int tipc_node_has_active_links(struct node *n_ptr); | 106 | int tipc_node_has_active_links(struct tipc_node *n_ptr); |
| 107 | int tipc_node_has_redundant_links(struct node *n_ptr); | 107 | int tipc_node_has_redundant_links(struct tipc_node *n_ptr); |
| 108 | u32 tipc_node_select_router(struct node *n_ptr, u32 ref); | 108 | u32 tipc_node_select_router(struct tipc_node *n_ptr, u32 ref); |
| 109 | struct node *tipc_node_select_next_hop(u32 addr, u32 selector); | 109 | struct tipc_node *tipc_node_select_next_hop(u32 addr, u32 selector); |
| 110 | int tipc_node_is_up(struct node *n_ptr); | 110 | int tipc_node_is_up(struct tipc_node *n_ptr); |
| 111 | void tipc_node_add_router(struct node *n_ptr, u32 router); | 111 | void tipc_node_add_router(struct tipc_node *n_ptr, u32 router); |
| 112 | void tipc_node_remove_router(struct node *n_ptr, u32 router); | 112 | void tipc_node_remove_router(struct tipc_node *n_ptr, u32 router); |
| 113 | struct sk_buff *tipc_node_get_links(const void *req_tlv_area, int req_tlv_space); | 113 | struct sk_buff *tipc_node_get_links(const void *req_tlv_area, int req_tlv_space); |
| 114 | struct sk_buff *tipc_node_get_nodes(const void *req_tlv_area, int req_tlv_space); | 114 | struct sk_buff *tipc_node_get_nodes(const void *req_tlv_area, int req_tlv_space); |
| 115 | 115 | ||
| 116 | static inline struct node *tipc_node_find(u32 addr) | 116 | static inline struct tipc_node *tipc_node_find(u32 addr) |
| 117 | { | 117 | { |
| 118 | if (likely(in_own_cluster(addr))) | 118 | if (likely(in_own_cluster(addr))) |
| 119 | return tipc_local_nodes[tipc_node(addr)]; | 119 | return tipc_local_nodes[tipc_node(addr)]; |
| @@ -126,19 +126,19 @@ static inline struct node *tipc_node_find(u32 addr) | |||
| 126 | return NULL; | 126 | return NULL; |
| 127 | } | 127 | } |
| 128 | 128 | ||
| 129 | static inline struct node *tipc_node_select(u32 addr, u32 selector) | 129 | static inline struct tipc_node *tipc_node_select(u32 addr, u32 selector) |
| 130 | { | 130 | { |
| 131 | if (likely(in_own_cluster(addr))) | 131 | if (likely(in_own_cluster(addr))) |
| 132 | return tipc_local_nodes[tipc_node(addr)]; | 132 | return tipc_local_nodes[tipc_node(addr)]; |
| 133 | return tipc_node_select_next_hop(addr, selector); | 133 | return tipc_node_select_next_hop(addr, selector); |
| 134 | } | 134 | } |
| 135 | 135 | ||
| 136 | static inline void tipc_node_lock(struct node *n_ptr) | 136 | static inline void tipc_node_lock(struct tipc_node *n_ptr) |
| 137 | { | 137 | { |
| 138 | spin_lock_bh(&n_ptr->lock); | 138 | spin_lock_bh(&n_ptr->lock); |
| 139 | } | 139 | } |
| 140 | 140 | ||
| 141 | static inline void tipc_node_unlock(struct node *n_ptr) | 141 | static inline void tipc_node_unlock(struct tipc_node *n_ptr) |
| 142 | { | 142 | { |
| 143 | spin_unlock_bh(&n_ptr->lock); | 143 | spin_unlock_bh(&n_ptr->lock); |
| 144 | } | 144 | } |
diff --git a/net/tipc/node_subscr.c b/net/tipc/node_subscr.c index 8ecbd0fb6103..19194d476a9e 100644 --- a/net/tipc/node_subscr.c +++ b/net/tipc/node_subscr.c | |||
| @@ -44,7 +44,7 @@ | |||
| 44 | * tipc_nodesub_subscribe - create "node down" subscription for specified node | 44 | * tipc_nodesub_subscribe - create "node down" subscription for specified node |
| 45 | */ | 45 | */ |
| 46 | 46 | ||
| 47 | void tipc_nodesub_subscribe(struct node_subscr *node_sub, u32 addr, | 47 | void tipc_nodesub_subscribe(struct tipc_node_subscr *node_sub, u32 addr, |
| 48 | void *usr_handle, net_ev_handler handle_down) | 48 | void *usr_handle, net_ev_handler handle_down) |
| 49 | { | 49 | { |
| 50 | if (addr == tipc_own_addr) { | 50 | if (addr == tipc_own_addr) { |
| @@ -69,7 +69,7 @@ void tipc_nodesub_subscribe(struct node_subscr *node_sub, u32 addr, | |||
| 69 | * tipc_nodesub_unsubscribe - cancel "node down" subscription (if any) | 69 | * tipc_nodesub_unsubscribe - cancel "node down" subscription (if any) |
| 70 | */ | 70 | */ |
| 71 | 71 | ||
| 72 | void tipc_nodesub_unsubscribe(struct node_subscr *node_sub) | 72 | void tipc_nodesub_unsubscribe(struct tipc_node_subscr *node_sub) |
| 73 | { | 73 | { |
| 74 | if (!node_sub->node) | 74 | if (!node_sub->node) |
| 75 | return; | 75 | return; |
diff --git a/net/tipc/node_subscr.h b/net/tipc/node_subscr.h index 5f3f5859b84c..006ed739f515 100644 --- a/net/tipc/node_subscr.h +++ b/net/tipc/node_subscr.h | |||
| @@ -42,22 +42,22 @@ | |||
| 42 | typedef void (*net_ev_handler) (void *usr_handle); | 42 | typedef void (*net_ev_handler) (void *usr_handle); |
| 43 | 43 | ||
| 44 | /** | 44 | /** |
| 45 | * struct node_subscr - "node down" subscription entry | 45 | * struct tipc_node_subscr - "node down" subscription entry |
| 46 | * @node: ptr to node structure of interest (or NULL, if none) | 46 | * @node: ptr to node structure of interest (or NULL, if none) |
| 47 | * @handle_node_down: routine to invoke when node fails | 47 | * @handle_node_down: routine to invoke when node fails |
| 48 | * @usr_handle: argument to pass to routine when node fails | 48 | * @usr_handle: argument to pass to routine when node fails |
| 49 | * @nodesub_list: adjacent entries in list of subscriptions for the node | 49 | * @nodesub_list: adjacent entries in list of subscriptions for the node |
| 50 | */ | 50 | */ |
| 51 | 51 | ||
| 52 | struct node_subscr { | 52 | struct tipc_node_subscr { |
| 53 | struct node *node; | 53 | struct tipc_node *node; |
| 54 | net_ev_handler handle_node_down; | 54 | net_ev_handler handle_node_down; |
| 55 | void *usr_handle; | 55 | void *usr_handle; |
| 56 | struct list_head nodesub_list; | 56 | struct list_head nodesub_list; |
| 57 | }; | 57 | }; |
| 58 | 58 | ||
| 59 | void tipc_nodesub_subscribe(struct node_subscr *node_sub, u32 addr, | 59 | void tipc_nodesub_subscribe(struct tipc_node_subscr *node_sub, u32 addr, |
| 60 | void *usr_handle, net_ev_handler handle_down); | 60 | void *usr_handle, net_ev_handler handle_down); |
| 61 | void tipc_nodesub_unsubscribe(struct node_subscr *node_sub); | 61 | void tipc_nodesub_unsubscribe(struct tipc_node_subscr *node_sub); |
| 62 | 62 | ||
| 63 | #endif | 63 | #endif |
diff --git a/net/tipc/port.h b/net/tipc/port.h index e5f8c16429bd..ff31ee4a1dc3 100644 --- a/net/tipc/port.h +++ b/net/tipc/port.h | |||
| @@ -105,7 +105,7 @@ struct port { | |||
| 105 | u32 probing_interval; | 105 | u32 probing_interval; |
| 106 | u32 last_in_seqno; | 106 | u32 last_in_seqno; |
| 107 | struct timer_list timer; | 107 | struct timer_list timer; |
| 108 | struct node_subscr subscription; | 108 | struct tipc_node_subscr subscription; |
| 109 | }; | 109 | }; |
| 110 | 110 | ||
| 111 | extern spinlock_t tipc_port_list_lock; | 111 | extern spinlock_t tipc_port_list_lock; |
diff --git a/net/tipc/subscr.c b/net/tipc/subscr.c index 0326d3060bc7..0747d8a9232f 100644 --- a/net/tipc/subscr.c +++ b/net/tipc/subscr.c | |||
| @@ -85,7 +85,7 @@ static struct top_srv topsrv = { 0 }; | |||
| 85 | 85 | ||
| 86 | static u32 htohl(u32 in, int swap) | 86 | static u32 htohl(u32 in, int swap) |
| 87 | { | 87 | { |
| 88 | return swap ? (u32)___constant_swab32(in) : in; | 88 | return swap ? swab32(in) : in; |
| 89 | } | 89 | } |
| 90 | 90 | ||
| 91 | /** | 91 | /** |
diff --git a/net/tipc/zone.c b/net/tipc/zone.c index 3506f8563441..2c01ba2d86bf 100644 --- a/net/tipc/zone.c +++ b/net/tipc/zone.c | |||
| @@ -111,10 +111,10 @@ void tipc_zone_send_external_routes(struct _zone *z_ptr, u32 dest) | |||
| 111 | } | 111 | } |
| 112 | } | 112 | } |
| 113 | 113 | ||
| 114 | struct node *tipc_zone_select_remote_node(struct _zone *z_ptr, u32 addr, u32 ref) | 114 | struct tipc_node *tipc_zone_select_remote_node(struct _zone *z_ptr, u32 addr, u32 ref) |
| 115 | { | 115 | { |
| 116 | struct cluster *c_ptr; | 116 | struct cluster *c_ptr; |
| 117 | struct node *n_ptr; | 117 | struct tipc_node *n_ptr; |
| 118 | u32 c_num; | 118 | u32 c_num; |
| 119 | 119 | ||
| 120 | if (!z_ptr) | 120 | if (!z_ptr) |
diff --git a/net/tipc/zone.h b/net/tipc/zone.h index 6e7a08df8af5..7bdc3406ba9b 100644 --- a/net/tipc/zone.h +++ b/net/tipc/zone.h | |||
| @@ -54,7 +54,7 @@ struct _zone { | |||
| 54 | u32 links; | 54 | u32 links; |
| 55 | }; | 55 | }; |
| 56 | 56 | ||
| 57 | struct node *tipc_zone_select_remote_node(struct _zone *z_ptr, u32 addr, u32 ref); | 57 | struct tipc_node *tipc_zone_select_remote_node(struct _zone *z_ptr, u32 addr, u32 ref); |
| 58 | u32 tipc_zone_select_router(struct _zone *z_ptr, u32 addr, u32 ref); | 58 | u32 tipc_zone_select_router(struct _zone *z_ptr, u32 addr, u32 ref); |
| 59 | void tipc_zone_remove_as_router(struct _zone *z_ptr, u32 router); | 59 | void tipc_zone_remove_as_router(struct _zone *z_ptr, u32 router); |
| 60 | void tipc_zone_send_external_routes(struct _zone *z_ptr, u32 dest); | 60 | void tipc_zone_send_external_routes(struct _zone *z_ptr, u32 dest); |
diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig index ab015c62d561..833b024f8f66 100644 --- a/net/wireless/Kconfig +++ b/net/wireless/Kconfig | |||
| @@ -39,4 +39,5 @@ config WIRELESS_EXT_SYSFS | |||
| 39 | files in /sys/class/net/*/wireless/. The same information | 39 | files in /sys/class/net/*/wireless/. The same information |
| 40 | is available via the ioctls as well. | 40 | is available via the ioctls as well. |
| 41 | 41 | ||
| 42 | Say Y if you have programs using it (we don't know of any). | 42 | Say Y if you have programs using it, like old versions of |
| 43 | hal. | ||
diff --git a/net/wireless/wext.c b/net/wireless/wext.c index df5b3886c36b..d98ffb75119a 100644 --- a/net/wireless/wext.c +++ b/net/wireless/wext.c | |||
| @@ -1277,6 +1277,7 @@ static int rtnetlink_fill_iwinfo(struct sk_buff *skb, struct net_device *dev, | |||
| 1277 | r->ifi_flags = dev_get_flags(dev); | 1277 | r->ifi_flags = dev_get_flags(dev); |
| 1278 | r->ifi_change = 0; /* Wireless changes don't affect those flags */ | 1278 | r->ifi_change = 0; /* Wireless changes don't affect those flags */ |
| 1279 | 1279 | ||
| 1280 | NLA_PUT_STRING(skb, IFLA_IFNAME, dev->name); | ||
| 1280 | /* Add the wireless events in the netlink packet */ | 1281 | /* Add the wireless events in the netlink packet */ |
| 1281 | NLA_PUT(skb, IFLA_WIRELESS, event_len, event); | 1282 | NLA_PUT(skb, IFLA_WIRELESS, event_len, event); |
| 1282 | 1283 | ||
diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c index 3f964db908a7..ac25b4c0e982 100644 --- a/net/xfrm/xfrm_output.c +++ b/net/xfrm/xfrm_output.c | |||
| @@ -112,16 +112,13 @@ error_nolock: | |||
| 112 | int xfrm_output_resume(struct sk_buff *skb, int err) | 112 | int xfrm_output_resume(struct sk_buff *skb, int err) |
| 113 | { | 113 | { |
| 114 | while (likely((err = xfrm_output_one(skb, err)) == 0)) { | 114 | while (likely((err = xfrm_output_one(skb, err)) == 0)) { |
| 115 | struct xfrm_state *x; | ||
| 116 | |||
| 117 | nf_reset(skb); | 115 | nf_reset(skb); |
| 118 | 116 | ||
| 119 | err = skb->dst->ops->local_out(skb); | 117 | err = skb->dst->ops->local_out(skb); |
| 120 | if (unlikely(err != 1)) | 118 | if (unlikely(err != 1)) |
| 121 | goto out; | 119 | goto out; |
| 122 | 120 | ||
| 123 | x = skb->dst->xfrm; | 121 | if (!skb->dst->xfrm) |
| 124 | if (!x) | ||
| 125 | return dst_output(skb); | 122 | return dst_output(skb); |
| 126 | 123 | ||
| 127 | err = nf_hook(skb->dst->ops->family, | 124 | err = nf_hook(skb->dst->ops->family, |
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index 841b32a2e680..46914b79d850 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c | |||
| @@ -1731,8 +1731,7 @@ restart: | |||
| 1731 | * We can't enlist stable bundles either. | 1731 | * We can't enlist stable bundles either. |
| 1732 | */ | 1732 | */ |
| 1733 | write_unlock_bh(&policy->lock); | 1733 | write_unlock_bh(&policy->lock); |
| 1734 | if (dst) | 1734 | dst_free(dst); |
| 1735 | dst_free(dst); | ||
| 1736 | 1735 | ||
| 1737 | if (pol_dead) | 1736 | if (pol_dead) |
| 1738 | XFRM_INC_STATS(LINUX_MIB_XFRMOUTPOLDEAD); | 1737 | XFRM_INC_STATS(LINUX_MIB_XFRMOUTPOLDEAD); |
| @@ -1748,8 +1747,7 @@ restart: | |||
| 1748 | err = xfrm_dst_update_origin(dst, fl); | 1747 | err = xfrm_dst_update_origin(dst, fl); |
| 1749 | if (unlikely(err)) { | 1748 | if (unlikely(err)) { |
| 1750 | write_unlock_bh(&policy->lock); | 1749 | write_unlock_bh(&policy->lock); |
| 1751 | if (dst) | 1750 | dst_free(dst); |
| 1752 | dst_free(dst); | ||
| 1753 | XFRM_INC_STATS(LINUX_MIB_XFRMOUTBUNDLECHECKERROR); | 1751 | XFRM_INC_STATS(LINUX_MIB_XFRMOUTBUNDLECHECKERROR); |
| 1754 | goto error; | 1752 | goto error; |
| 1755 | } | 1753 | } |
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c index 4c6914ef7d92..7bd62f61593f 100644 --- a/net/xfrm/xfrm_state.c +++ b/net/xfrm/xfrm_state.c | |||
| @@ -780,11 +780,13 @@ xfrm_state_find(xfrm_address_t *daddr, xfrm_address_t *saddr, | |||
| 780 | { | 780 | { |
| 781 | unsigned int h; | 781 | unsigned int h; |
| 782 | struct hlist_node *entry; | 782 | struct hlist_node *entry; |
| 783 | struct xfrm_state *x, *x0; | 783 | struct xfrm_state *x, *x0, *to_put; |
| 784 | int acquire_in_progress = 0; | 784 | int acquire_in_progress = 0; |
| 785 | int error = 0; | 785 | int error = 0; |
| 786 | struct xfrm_state *best = NULL; | 786 | struct xfrm_state *best = NULL; |
| 787 | 787 | ||
| 788 | to_put = NULL; | ||
| 789 | |||
| 788 | spin_lock_bh(&xfrm_state_lock); | 790 | spin_lock_bh(&xfrm_state_lock); |
| 789 | h = xfrm_dst_hash(daddr, saddr, tmpl->reqid, family); | 791 | h = xfrm_dst_hash(daddr, saddr, tmpl->reqid, family); |
| 790 | hlist_for_each_entry(x, entry, xfrm_state_bydst+h, bydst) { | 792 | hlist_for_each_entry(x, entry, xfrm_state_bydst+h, bydst) { |
| @@ -833,7 +835,7 @@ xfrm_state_find(xfrm_address_t *daddr, xfrm_address_t *saddr, | |||
| 833 | if (tmpl->id.spi && | 835 | if (tmpl->id.spi && |
| 834 | (x0 = __xfrm_state_lookup(daddr, tmpl->id.spi, | 836 | (x0 = __xfrm_state_lookup(daddr, tmpl->id.spi, |
| 835 | tmpl->id.proto, family)) != NULL) { | 837 | tmpl->id.proto, family)) != NULL) { |
| 836 | xfrm_state_put(x0); | 838 | to_put = x0; |
| 837 | error = -EEXIST; | 839 | error = -EEXIST; |
| 838 | goto out; | 840 | goto out; |
| 839 | } | 841 | } |
| @@ -849,7 +851,7 @@ xfrm_state_find(xfrm_address_t *daddr, xfrm_address_t *saddr, | |||
| 849 | error = security_xfrm_state_alloc_acquire(x, pol->security, fl->secid); | 851 | error = security_xfrm_state_alloc_acquire(x, pol->security, fl->secid); |
| 850 | if (error) { | 852 | if (error) { |
| 851 | x->km.state = XFRM_STATE_DEAD; | 853 | x->km.state = XFRM_STATE_DEAD; |
| 852 | xfrm_state_put(x); | 854 | to_put = x; |
| 853 | x = NULL; | 855 | x = NULL; |
| 854 | goto out; | 856 | goto out; |
| 855 | } | 857 | } |
| @@ -870,7 +872,7 @@ xfrm_state_find(xfrm_address_t *daddr, xfrm_address_t *saddr, | |||
| 870 | xfrm_hash_grow_check(x->bydst.next != NULL); | 872 | xfrm_hash_grow_check(x->bydst.next != NULL); |
| 871 | } else { | 873 | } else { |
| 872 | x->km.state = XFRM_STATE_DEAD; | 874 | x->km.state = XFRM_STATE_DEAD; |
| 873 | xfrm_state_put(x); | 875 | to_put = x; |
| 874 | x = NULL; | 876 | x = NULL; |
| 875 | error = -ESRCH; | 877 | error = -ESRCH; |
| 876 | } | 878 | } |
| @@ -881,6 +883,8 @@ out: | |||
| 881 | else | 883 | else |
| 882 | *err = acquire_in_progress ? -EAGAIN : error; | 884 | *err = acquire_in_progress ? -EAGAIN : error; |
| 883 | spin_unlock_bh(&xfrm_state_lock); | 885 | spin_unlock_bh(&xfrm_state_lock); |
| 886 | if (to_put) | ||
| 887 | xfrm_state_put(to_put); | ||
| 884 | return x; | 888 | return x; |
| 885 | } | 889 | } |
| 886 | 890 | ||
| @@ -1067,18 +1071,20 @@ static struct xfrm_state *__xfrm_find_acq_byseq(u32 seq); | |||
| 1067 | 1071 | ||
| 1068 | int xfrm_state_add(struct xfrm_state *x) | 1072 | int xfrm_state_add(struct xfrm_state *x) |
| 1069 | { | 1073 | { |
| 1070 | struct xfrm_state *x1; | 1074 | struct xfrm_state *x1, *to_put; |
| 1071 | int family; | 1075 | int family; |
| 1072 | int err; | 1076 | int err; |
| 1073 | int use_spi = xfrm_id_proto_match(x->id.proto, IPSEC_PROTO_ANY); | 1077 | int use_spi = xfrm_id_proto_match(x->id.proto, IPSEC_PROTO_ANY); |
| 1074 | 1078 | ||
| 1075 | family = x->props.family; | 1079 | family = x->props.family; |
| 1076 | 1080 | ||
| 1081 | to_put = NULL; | ||
| 1082 | |||
| 1077 | spin_lock_bh(&xfrm_state_lock); | 1083 | spin_lock_bh(&xfrm_state_lock); |
| 1078 | 1084 | ||
| 1079 | x1 = __xfrm_state_locate(x, use_spi, family); | 1085 | x1 = __xfrm_state_locate(x, use_spi, family); |
| 1080 | if (x1) { | 1086 | if (x1) { |
| 1081 | xfrm_state_put(x1); | 1087 | to_put = x1; |
| 1082 | x1 = NULL; | 1088 | x1 = NULL; |
| 1083 | err = -EEXIST; | 1089 | err = -EEXIST; |
| 1084 | goto out; | 1090 | goto out; |
| @@ -1088,7 +1094,7 @@ int xfrm_state_add(struct xfrm_state *x) | |||
| 1088 | x1 = __xfrm_find_acq_byseq(x->km.seq); | 1094 | x1 = __xfrm_find_acq_byseq(x->km.seq); |
| 1089 | if (x1 && ((x1->id.proto != x->id.proto) || | 1095 | if (x1 && ((x1->id.proto != x->id.proto) || |
| 1090 | xfrm_addr_cmp(&x1->id.daddr, &x->id.daddr, family))) { | 1096 | xfrm_addr_cmp(&x1->id.daddr, &x->id.daddr, family))) { |
| 1091 | xfrm_state_put(x1); | 1097 | to_put = x1; |
| 1092 | x1 = NULL; | 1098 | x1 = NULL; |
| 1093 | } | 1099 | } |
| 1094 | } | 1100 | } |
| @@ -1110,6 +1116,9 @@ out: | |||
| 1110 | xfrm_state_put(x1); | 1116 | xfrm_state_put(x1); |
| 1111 | } | 1117 | } |
| 1112 | 1118 | ||
| 1119 | if (to_put) | ||
| 1120 | xfrm_state_put(to_put); | ||
| 1121 | |||
| 1113 | return err; | 1122 | return err; |
| 1114 | } | 1123 | } |
| 1115 | EXPORT_SYMBOL(xfrm_state_add); | 1124 | EXPORT_SYMBOL(xfrm_state_add); |
| @@ -1269,10 +1278,12 @@ EXPORT_SYMBOL(xfrm_state_migrate); | |||
| 1269 | 1278 | ||
| 1270 | int xfrm_state_update(struct xfrm_state *x) | 1279 | int xfrm_state_update(struct xfrm_state *x) |
| 1271 | { | 1280 | { |
| 1272 | struct xfrm_state *x1; | 1281 | struct xfrm_state *x1, *to_put; |
| 1273 | int err; | 1282 | int err; |
| 1274 | int use_spi = xfrm_id_proto_match(x->id.proto, IPSEC_PROTO_ANY); | 1283 | int use_spi = xfrm_id_proto_match(x->id.proto, IPSEC_PROTO_ANY); |
| 1275 | 1284 | ||
| 1285 | to_put = NULL; | ||
| 1286 | |||
| 1276 | spin_lock_bh(&xfrm_state_lock); | 1287 | spin_lock_bh(&xfrm_state_lock); |
| 1277 | x1 = __xfrm_state_locate(x, use_spi, x->props.family); | 1288 | x1 = __xfrm_state_locate(x, use_spi, x->props.family); |
| 1278 | 1289 | ||
| @@ -1281,7 +1292,7 @@ int xfrm_state_update(struct xfrm_state *x) | |||
| 1281 | goto out; | 1292 | goto out; |
| 1282 | 1293 | ||
| 1283 | if (xfrm_state_kern(x1)) { | 1294 | if (xfrm_state_kern(x1)) { |
| 1284 | xfrm_state_put(x1); | 1295 | to_put = x1; |
| 1285 | err = -EEXIST; | 1296 | err = -EEXIST; |
| 1286 | goto out; | 1297 | goto out; |
| 1287 | } | 1298 | } |
| @@ -1295,6 +1306,9 @@ int xfrm_state_update(struct xfrm_state *x) | |||
| 1295 | out: | 1306 | out: |
| 1296 | spin_unlock_bh(&xfrm_state_lock); | 1307 | spin_unlock_bh(&xfrm_state_lock); |
| 1297 | 1308 | ||
| 1309 | if (to_put) | ||
| 1310 | xfrm_state_put(to_put); | ||
| 1311 | |||
| 1298 | if (err) | 1312 | if (err) |
| 1299 | return err; | 1313 | return err; |
| 1300 | 1314 | ||
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c index 4fa1f3ad2513..4c9890ec2528 100644 --- a/scripts/mod/file2alias.c +++ b/scripts/mod/file2alias.c | |||
| @@ -344,14 +344,20 @@ static void do_pnp_device_entry(void *symval, unsigned long size, | |||
| 344 | struct module *mod) | 344 | struct module *mod) |
| 345 | { | 345 | { |
| 346 | const unsigned long id_size = sizeof(struct pnp_device_id); | 346 | const unsigned long id_size = sizeof(struct pnp_device_id); |
| 347 | const struct pnp_device_id *id = symval; | 347 | const unsigned int count = (size / id_size)-1; |
| 348 | const struct pnp_device_id *devs = symval; | ||
| 349 | unsigned int i; | ||
| 348 | 350 | ||
| 349 | device_id_check(mod->name, "pnp", size, id_size, symval); | 351 | device_id_check(mod->name, "pnp", size, id_size, symval); |
| 350 | 352 | ||
| 351 | buf_printf(&mod->dev_table_buf, | 353 | for (i = 0; i < count; i++) { |
| 352 | "MODULE_ALIAS(\"pnp:d%s*\");\n", id->id); | 354 | const char *id = (char *)devs[i].id; |
| 353 | buf_printf(&mod->dev_table_buf, | 355 | |
| 354 | "MODULE_ALIAS(\"acpi*:%s:*\");\n", id->id); | 356 | buf_printf(&mod->dev_table_buf, |
| 357 | "MODULE_ALIAS(\"pnp:d%s*\");\n", id); | ||
| 358 | buf_printf(&mod->dev_table_buf, | ||
| 359 | "MODULE_ALIAS(\"acpi*:%s:*\");\n", id); | ||
| 360 | } | ||
| 355 | } | 361 | } |
| 356 | 362 | ||
| 357 | /* looks like: "pnp:dD" for every device of the card */ | 363 | /* looks like: "pnp:dD" for every device of the card */ |
diff --git a/security/capability.c b/security/capability.c index 63d10da515a5..245874819036 100644 --- a/security/capability.c +++ b/security/capability.c | |||
| @@ -811,7 +811,8 @@ struct security_operations default_security_ops = { | |||
| 811 | 811 | ||
| 812 | void security_fixup_ops(struct security_operations *ops) | 812 | void security_fixup_ops(struct security_operations *ops) |
| 813 | { | 813 | { |
| 814 | set_to_cap_if_null(ops, ptrace); | 814 | set_to_cap_if_null(ops, ptrace_may_access); |
| 815 | set_to_cap_if_null(ops, ptrace_traceme); | ||
| 815 | set_to_cap_if_null(ops, capget); | 816 | set_to_cap_if_null(ops, capget); |
| 816 | set_to_cap_if_null(ops, capset_check); | 817 | set_to_cap_if_null(ops, capset_check); |
| 817 | set_to_cap_if_null(ops, capset_set); | 818 | set_to_cap_if_null(ops, capset_set); |
diff --git a/security/commoncap.c b/security/commoncap.c index 4afbece37a08..e4c4b3fc0c04 100644 --- a/security/commoncap.c +++ b/security/commoncap.c | |||
| @@ -63,14 +63,24 @@ int cap_settime(struct timespec *ts, struct timezone *tz) | |||
| 63 | return 0; | 63 | return 0; |
| 64 | } | 64 | } |
| 65 | 65 | ||
| 66 | int cap_ptrace (struct task_struct *parent, struct task_struct *child, | 66 | int cap_ptrace_may_access(struct task_struct *child, unsigned int mode) |
| 67 | unsigned int mode) | ||
| 68 | { | 67 | { |
| 69 | /* Derived from arch/i386/kernel/ptrace.c:sys_ptrace. */ | 68 | /* Derived from arch/i386/kernel/ptrace.c:sys_ptrace. */ |
| 70 | if (!cap_issubset(child->cap_permitted, parent->cap_permitted) && | 69 | if (cap_issubset(child->cap_permitted, current->cap_permitted)) |
| 71 | !__capable(parent, CAP_SYS_PTRACE)) | 70 | return 0; |
| 72 | return -EPERM; | 71 | if (capable(CAP_SYS_PTRACE)) |
| 73 | return 0; | 72 | return 0; |
| 73 | return -EPERM; | ||
| 74 | } | ||
| 75 | |||
| 76 | int cap_ptrace_traceme(struct task_struct *parent) | ||
| 77 | { | ||
| 78 | /* Derived from arch/i386/kernel/ptrace.c:sys_ptrace. */ | ||
| 79 | if (cap_issubset(current->cap_permitted, parent->cap_permitted)) | ||
| 80 | return 0; | ||
| 81 | if (has_capability(parent, CAP_SYS_PTRACE)) | ||
| 82 | return 0; | ||
| 83 | return -EPERM; | ||
| 74 | } | 84 | } |
| 75 | 85 | ||
| 76 | int cap_capget (struct task_struct *target, kernel_cap_t *effective, | 86 | int cap_capget (struct task_struct *target, kernel_cap_t *effective, |
| @@ -534,7 +544,7 @@ int cap_task_post_setuid (uid_t old_ruid, uid_t old_euid, uid_t old_suid, | |||
| 534 | static inline int cap_safe_nice(struct task_struct *p) | 544 | static inline int cap_safe_nice(struct task_struct *p) |
| 535 | { | 545 | { |
| 536 | if (!cap_issubset(p->cap_permitted, current->cap_permitted) && | 546 | if (!cap_issubset(p->cap_permitted, current->cap_permitted) && |
| 537 | !__capable(current, CAP_SYS_NICE)) | 547 | !capable(CAP_SYS_NICE)) |
| 538 | return -EPERM; | 548 | return -EPERM; |
| 539 | return 0; | 549 | return 0; |
| 540 | } | 550 | } |
diff --git a/security/device_cgroup.c b/security/device_cgroup.c index 7bd296cca041..46f23971f7e4 100644 --- a/security/device_cgroup.c +++ b/security/device_cgroup.c | |||
| @@ -508,12 +508,11 @@ int devcgroup_inode_permission(struct inode *inode, int mask) | |||
| 508 | return 0; | 508 | return 0; |
| 509 | if (!S_ISBLK(inode->i_mode) && !S_ISCHR(inode->i_mode)) | 509 | if (!S_ISBLK(inode->i_mode) && !S_ISCHR(inode->i_mode)) |
| 510 | return 0; | 510 | return 0; |
| 511 | dev_cgroup = css_to_devcgroup(task_subsys_state(current, | ||
| 512 | devices_subsys_id)); | ||
| 513 | if (!dev_cgroup) | ||
| 514 | return 0; | ||
| 515 | 511 | ||
| 516 | rcu_read_lock(); | 512 | rcu_read_lock(); |
| 513 | |||
| 514 | dev_cgroup = task_devcgroup(current); | ||
| 515 | |||
| 517 | list_for_each_entry_rcu(wh, &dev_cgroup->whitelist, list) { | 516 | list_for_each_entry_rcu(wh, &dev_cgroup->whitelist, list) { |
| 518 | if (wh->type & DEV_ALL) | 517 | if (wh->type & DEV_ALL) |
| 519 | goto acc_check; | 518 | goto acc_check; |
| @@ -533,6 +532,7 @@ acc_check: | |||
| 533 | rcu_read_unlock(); | 532 | rcu_read_unlock(); |
| 534 | return 0; | 533 | return 0; |
| 535 | } | 534 | } |
| 535 | |||
| 536 | rcu_read_unlock(); | 536 | rcu_read_unlock(); |
| 537 | 537 | ||
| 538 | return -EPERM; | 538 | return -EPERM; |
| @@ -543,12 +543,10 @@ int devcgroup_inode_mknod(int mode, dev_t dev) | |||
| 543 | struct dev_cgroup *dev_cgroup; | 543 | struct dev_cgroup *dev_cgroup; |
| 544 | struct dev_whitelist_item *wh; | 544 | struct dev_whitelist_item *wh; |
| 545 | 545 | ||
| 546 | dev_cgroup = css_to_devcgroup(task_subsys_state(current, | ||
| 547 | devices_subsys_id)); | ||
| 548 | if (!dev_cgroup) | ||
| 549 | return 0; | ||
| 550 | |||
| 551 | rcu_read_lock(); | 546 | rcu_read_lock(); |
| 547 | |||
| 548 | dev_cgroup = task_devcgroup(current); | ||
| 549 | |||
| 552 | list_for_each_entry(wh, &dev_cgroup->whitelist, list) { | 550 | list_for_each_entry(wh, &dev_cgroup->whitelist, list) { |
| 553 | if (wh->type & DEV_ALL) | 551 | if (wh->type & DEV_ALL) |
| 554 | goto acc_check; | 552 | goto acc_check; |
| @@ -566,6 +564,8 @@ acc_check: | |||
| 566 | rcu_read_unlock(); | 564 | rcu_read_unlock(); |
| 567 | return 0; | 565 | return 0; |
| 568 | } | 566 | } |
| 567 | |||
| 569 | rcu_read_unlock(); | 568 | rcu_read_unlock(); |
| 569 | |||
| 570 | return -EPERM; | 570 | return -EPERM; |
| 571 | } | 571 | } |
diff --git a/security/root_plug.c b/security/root_plug.c index be0ebec2580b..c3f68b5b372d 100644 --- a/security/root_plug.c +++ b/security/root_plug.c | |||
| @@ -72,7 +72,8 @@ static int rootplug_bprm_check_security (struct linux_binprm *bprm) | |||
| 72 | 72 | ||
| 73 | static struct security_operations rootplug_security_ops = { | 73 | static struct security_operations rootplug_security_ops = { |
| 74 | /* Use the capability functions for some of the hooks */ | 74 | /* Use the capability functions for some of the hooks */ |
| 75 | .ptrace = cap_ptrace, | 75 | .ptrace_may_access = cap_ptrace_may_access, |
| 76 | .ptrace_traceme = cap_ptrace_traceme, | ||
| 76 | .capget = cap_capget, | 77 | .capget = cap_capget, |
| 77 | .capset_check = cap_capset_check, | 78 | .capset_check = cap_capset_check, |
| 78 | .capset_set = cap_capset_set, | 79 | .capset_set = cap_capset_set, |
diff --git a/security/security.c b/security/security.c index ff7068727757..3a4b4f55b33f 100644 --- a/security/security.c +++ b/security/security.c | |||
| @@ -127,10 +127,14 @@ int register_security(struct security_operations *ops) | |||
| 127 | 127 | ||
| 128 | /* Security operations */ | 128 | /* Security operations */ |
| 129 | 129 | ||
| 130 | int security_ptrace(struct task_struct *parent, struct task_struct *child, | 130 | int security_ptrace_may_access(struct task_struct *child, unsigned int mode) |
| 131 | unsigned int mode) | ||
| 132 | { | 131 | { |
| 133 | return security_ops->ptrace(parent, child, mode); | 132 | return security_ops->ptrace_may_access(child, mode); |
| 133 | } | ||
| 134 | |||
| 135 | int security_ptrace_traceme(struct task_struct *parent) | ||
| 136 | { | ||
| 137 | return security_ops->ptrace_traceme(parent); | ||
| 134 | } | 138 | } |
| 135 | 139 | ||
| 136 | int security_capget(struct task_struct *target, | 140 | int security_capget(struct task_struct *target, |
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 3ae9bec5a508..03fc6a81ae32 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c | |||
| @@ -1738,24 +1738,34 @@ static inline u32 file_to_av(struct file *file) | |||
| 1738 | 1738 | ||
| 1739 | /* Hook functions begin here. */ | 1739 | /* Hook functions begin here. */ |
| 1740 | 1740 | ||
| 1741 | static int selinux_ptrace(struct task_struct *parent, | 1741 | static int selinux_ptrace_may_access(struct task_struct *child, |
| 1742 | struct task_struct *child, | 1742 | unsigned int mode) |
| 1743 | unsigned int mode) | ||
| 1744 | { | 1743 | { |
| 1745 | int rc; | 1744 | int rc; |
| 1746 | 1745 | ||
| 1747 | rc = secondary_ops->ptrace(parent, child, mode); | 1746 | rc = secondary_ops->ptrace_may_access(child, mode); |
| 1748 | if (rc) | 1747 | if (rc) |
| 1749 | return rc; | 1748 | return rc; |
| 1750 | 1749 | ||
| 1751 | if (mode == PTRACE_MODE_READ) { | 1750 | if (mode == PTRACE_MODE_READ) { |
| 1752 | struct task_security_struct *tsec = parent->security; | 1751 | struct task_security_struct *tsec = current->security; |
| 1753 | struct task_security_struct *csec = child->security; | 1752 | struct task_security_struct *csec = child->security; |
| 1754 | return avc_has_perm(tsec->sid, csec->sid, | 1753 | return avc_has_perm(tsec->sid, csec->sid, |
| 1755 | SECCLASS_FILE, FILE__READ, NULL); | 1754 | SECCLASS_FILE, FILE__READ, NULL); |
| 1756 | } | 1755 | } |
| 1757 | 1756 | ||
| 1758 | return task_has_perm(parent, child, PROCESS__PTRACE); | 1757 | return task_has_perm(current, child, PROCESS__PTRACE); |
| 1758 | } | ||
| 1759 | |||
| 1760 | static int selinux_ptrace_traceme(struct task_struct *parent) | ||
| 1761 | { | ||
| 1762 | int rc; | ||
| 1763 | |||
| 1764 | rc = secondary_ops->ptrace_traceme(parent); | ||
| 1765 | if (rc) | ||
| 1766 | return rc; | ||
| 1767 | |||
| 1768 | return task_has_perm(parent, current, PROCESS__PTRACE); | ||
| 1759 | } | 1769 | } |
| 1760 | 1770 | ||
| 1761 | static int selinux_capget(struct task_struct *target, kernel_cap_t *effective, | 1771 | static int selinux_capget(struct task_struct *target, kernel_cap_t *effective, |
| @@ -5346,7 +5356,8 @@ static int selinux_key_getsecurity(struct key *key, char **_buffer) | |||
| 5346 | static struct security_operations selinux_ops = { | 5356 | static struct security_operations selinux_ops = { |
| 5347 | .name = "selinux", | 5357 | .name = "selinux", |
| 5348 | 5358 | ||
| 5349 | .ptrace = selinux_ptrace, | 5359 | .ptrace_may_access = selinux_ptrace_may_access, |
| 5360 | .ptrace_traceme = selinux_ptrace_traceme, | ||
| 5350 | .capget = selinux_capget, | 5361 | .capget = selinux_capget, |
| 5351 | .capset_check = selinux_capset_check, | 5362 | .capset_check = selinux_capset_check, |
| 5352 | .capset_set = selinux_capset_set, | 5363 | .capset_set = selinux_capset_set, |
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c index b52f923ce680..d11a8154500f 100644 --- a/security/selinux/ss/services.c +++ b/security/selinux/ss/services.c | |||
| @@ -811,11 +811,12 @@ static int string_to_context_struct(struct policydb *pol, | |||
| 811 | /* Check the validity of the new context. */ | 811 | /* Check the validity of the new context. */ |
| 812 | if (!policydb_context_isvalid(pol, ctx)) { | 812 | if (!policydb_context_isvalid(pol, ctx)) { |
| 813 | rc = -EINVAL; | 813 | rc = -EINVAL; |
| 814 | context_destroy(ctx); | ||
| 815 | goto out; | 814 | goto out; |
| 816 | } | 815 | } |
| 817 | rc = 0; | 816 | rc = 0; |
| 818 | out: | 817 | out: |
| 818 | if (rc) | ||
| 819 | context_destroy(ctx); | ||
| 819 | return rc; | 820 | return rc; |
| 820 | } | 821 | } |
| 821 | 822 | ||
| @@ -868,8 +869,7 @@ static int security_context_to_sid_core(const char *scontext, u32 scontext_len, | |||
| 868 | } else if (rc) | 869 | } else if (rc) |
| 869 | goto out; | 870 | goto out; |
| 870 | rc = sidtab_context_to_sid(&sidtab, &context, sid); | 871 | rc = sidtab_context_to_sid(&sidtab, &context, sid); |
| 871 | if (rc) | 872 | context_destroy(&context); |
| 872 | context_destroy(&context); | ||
| 873 | out: | 873 | out: |
| 874 | read_unlock(&policy_rwlock); | 874 | read_unlock(&policy_rwlock); |
| 875 | kfree(scontext2); | 875 | kfree(scontext2); |
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c index 1b40e558f983..87d75417ea93 100644 --- a/security/smack/smack_lsm.c +++ b/security/smack/smack_lsm.c | |||
| @@ -87,27 +87,46 @@ struct inode_smack *new_inode_smack(char *smack) | |||
| 87 | */ | 87 | */ |
| 88 | 88 | ||
| 89 | /** | 89 | /** |
| 90 | * smack_ptrace - Smack approval on ptrace | 90 | * smack_ptrace_may_access - Smack approval on PTRACE_ATTACH |
| 91 | * @ptp: parent task pointer | ||
| 92 | * @ctp: child task pointer | 91 | * @ctp: child task pointer |
| 93 | * | 92 | * |
| 94 | * Returns 0 if access is OK, an error code otherwise | 93 | * Returns 0 if access is OK, an error code otherwise |
| 95 | * | 94 | * |
| 96 | * Do the capability checks, and require read and write. | 95 | * Do the capability checks, and require read and write. |
| 97 | */ | 96 | */ |
| 98 | static int smack_ptrace(struct task_struct *ptp, struct task_struct *ctp, | 97 | static int smack_ptrace_may_access(struct task_struct *ctp, unsigned int mode) |
| 99 | unsigned int mode) | ||
| 100 | { | 98 | { |
| 101 | int rc; | 99 | int rc; |
| 102 | 100 | ||
| 103 | rc = cap_ptrace(ptp, ctp, mode); | 101 | rc = cap_ptrace_may_access(ctp, mode); |
| 104 | if (rc != 0) | 102 | if (rc != 0) |
| 105 | return rc; | 103 | return rc; |
| 106 | 104 | ||
| 107 | rc = smk_access(ptp->security, ctp->security, MAY_READWRITE); | 105 | rc = smk_access(current->security, ctp->security, MAY_READWRITE); |
| 108 | if (rc != 0 && __capable(ptp, CAP_MAC_OVERRIDE)) | 106 | if (rc != 0 && capable(CAP_MAC_OVERRIDE)) |
| 109 | return 0; | 107 | return 0; |
| 108 | return rc; | ||
| 109 | } | ||
| 110 | |||
| 111 | /** | ||
| 112 | * smack_ptrace_traceme - Smack approval on PTRACE_TRACEME | ||
| 113 | * @ptp: parent task pointer | ||
| 114 | * | ||
| 115 | * Returns 0 if access is OK, an error code otherwise | ||
| 116 | * | ||
| 117 | * Do the capability checks, and require read and write. | ||
| 118 | */ | ||
| 119 | static int smack_ptrace_traceme(struct task_struct *ptp) | ||
| 120 | { | ||
| 121 | int rc; | ||
| 122 | |||
| 123 | rc = cap_ptrace_traceme(ptp); | ||
| 124 | if (rc != 0) | ||
| 125 | return rc; | ||
| 110 | 126 | ||
| 127 | rc = smk_access(ptp->security, current->security, MAY_READWRITE); | ||
| 128 | if (rc != 0 && has_capability(ptp, CAP_MAC_OVERRIDE)) | ||
| 129 | return 0; | ||
| 111 | return rc; | 130 | return rc; |
| 112 | } | 131 | } |
| 113 | 132 | ||
| @@ -923,7 +942,7 @@ static int smack_file_send_sigiotask(struct task_struct *tsk, | |||
| 923 | */ | 942 | */ |
| 924 | file = container_of(fown, struct file, f_owner); | 943 | file = container_of(fown, struct file, f_owner); |
| 925 | rc = smk_access(file->f_security, tsk->security, MAY_WRITE); | 944 | rc = smk_access(file->f_security, tsk->security, MAY_WRITE); |
| 926 | if (rc != 0 && __capable(tsk, CAP_MAC_OVERRIDE)) | 945 | if (rc != 0 && has_capability(tsk, CAP_MAC_OVERRIDE)) |
| 927 | return 0; | 946 | return 0; |
| 928 | return rc; | 947 | return rc; |
| 929 | } | 948 | } |
| @@ -1164,12 +1183,12 @@ static int smack_task_wait(struct task_struct *p) | |||
| 1164 | * account for the smack labels having gotten to | 1183 | * account for the smack labels having gotten to |
| 1165 | * be different in the first place. | 1184 | * be different in the first place. |
| 1166 | * | 1185 | * |
| 1167 | * This breaks the strict subjet/object access | 1186 | * This breaks the strict subject/object access |
| 1168 | * control ideal, taking the object's privilege | 1187 | * control ideal, taking the object's privilege |
| 1169 | * state into account in the decision as well as | 1188 | * state into account in the decision as well as |
| 1170 | * the smack value. | 1189 | * the smack value. |
| 1171 | */ | 1190 | */ |
| 1172 | if (capable(CAP_MAC_OVERRIDE) || __capable(p, CAP_MAC_OVERRIDE)) | 1191 | if (capable(CAP_MAC_OVERRIDE) || has_capability(p, CAP_MAC_OVERRIDE)) |
| 1173 | return 0; | 1192 | return 0; |
| 1174 | 1193 | ||
| 1175 | return rc; | 1194 | return rc; |
| @@ -2016,9 +2035,6 @@ static int smack_setprocattr(struct task_struct *p, char *name, | |||
| 2016 | { | 2035 | { |
| 2017 | char *newsmack; | 2036 | char *newsmack; |
| 2018 | 2037 | ||
| 2019 | if (!__capable(p, CAP_MAC_ADMIN)) | ||
| 2020 | return -EPERM; | ||
| 2021 | |||
| 2022 | /* | 2038 | /* |
| 2023 | * Changing another process' Smack value is too dangerous | 2039 | * Changing another process' Smack value is too dangerous |
| 2024 | * and supports no sane use case. | 2040 | * and supports no sane use case. |
| @@ -2026,6 +2042,9 @@ static int smack_setprocattr(struct task_struct *p, char *name, | |||
| 2026 | if (p != current) | 2042 | if (p != current) |
| 2027 | return -EPERM; | 2043 | return -EPERM; |
| 2028 | 2044 | ||
| 2045 | if (!capable(CAP_MAC_ADMIN)) | ||
| 2046 | return -EPERM; | ||
| 2047 | |||
| 2029 | if (value == NULL || size == 0 || size >= SMK_LABELLEN) | 2048 | if (value == NULL || size == 0 || size >= SMK_LABELLEN) |
| 2030 | return -EINVAL; | 2049 | return -EINVAL; |
| 2031 | 2050 | ||
| @@ -2552,7 +2571,8 @@ static void smack_release_secctx(char *secdata, u32 seclen) | |||
| 2552 | struct security_operations smack_ops = { | 2571 | struct security_operations smack_ops = { |
| 2553 | .name = "smack", | 2572 | .name = "smack", |
| 2554 | 2573 | ||
| 2555 | .ptrace = smack_ptrace, | 2574 | .ptrace_may_access = smack_ptrace_may_access, |
| 2575 | .ptrace_traceme = smack_ptrace_traceme, | ||
| 2556 | .capget = cap_capget, | 2576 | .capget = cap_capget, |
| 2557 | .capset_check = cap_capset_check, | 2577 | .capset_check = cap_capset_check, |
| 2558 | .capset_set = cap_capset_set, | 2578 | .capset_set = cap_capset_set, |
| @@ -2729,4 +2749,3 @@ static __init int smack_init(void) | |||
| 2729 | * all processes and objects when they are created. | 2749 | * all processes and objects when they are created. |
| 2730 | */ | 2750 | */ |
| 2731 | security_initcall(smack_init); | 2751 | security_initcall(smack_init); |
| 2732 | |||
diff --git a/sound/mips/au1x00.c b/sound/mips/au1x00.c index ee0741f9eb53..fbef38a9604a 100644 --- a/sound/mips/au1x00.c +++ b/sound/mips/au1x00.c | |||
| @@ -38,7 +38,6 @@ | |||
| 38 | #include <linux/interrupt.h> | 38 | #include <linux/interrupt.h> |
| 39 | #include <linux/init.h> | 39 | #include <linux/init.h> |
| 40 | #include <linux/slab.h> | 40 | #include <linux/slab.h> |
| 41 | #include <linux/version.h> | ||
| 42 | #include <sound/core.h> | 41 | #include <sound/core.h> |
| 43 | #include <sound/initval.h> | 42 | #include <sound/initval.h> |
| 44 | #include <sound/pcm.h> | 43 | #include <sound/pcm.h> |
diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig index f7d95b224a98..31f52d3fc21f 100644 --- a/sound/pci/Kconfig +++ b/sound/pci/Kconfig | |||
| @@ -845,7 +845,7 @@ config SND_VIRTUOSO | |||
| 845 | select SND_OXYGEN_LIB | 845 | select SND_OXYGEN_LIB |
| 846 | help | 846 | help |
| 847 | Say Y here to include support for sound cards based on the | 847 | Say Y here to include support for sound cards based on the |
| 848 | Asus AV100/AV200 chips, i.e., Xonar D2, DX and D2X. | 848 | Asus AV100/AV200 chips, i.e., Xonar D1, DX, D2 and D2X. |
| 849 | 849 | ||
| 850 | To compile this driver as a module, choose M here: the module | 850 | To compile this driver as a module, choose M here: the module |
| 851 | will be called snd-virtuoso. | 851 | will be called snd-virtuoso. |
diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c index 2f8b28add276..6abe8a3bd365 100644 --- a/sound/pci/ca0106/ca0106_main.c +++ b/sound/pci/ca0106/ca0106_main.c | |||
| @@ -249,11 +249,12 @@ static struct snd_ca0106_details ca0106_chip_details[] = { | |||
| 249 | .name = "MSI K8N Diamond MB [SB0438]", | 249 | .name = "MSI K8N Diamond MB [SB0438]", |
| 250 | .gpio_type = 2, | 250 | .gpio_type = 2, |
| 251 | .i2c_adc = 1 } , | 251 | .i2c_adc = 1 } , |
| 252 | /* Another MSI K8N Diamond MB, which has apprently a different SSID */ | 252 | /* MSI K8N Diamond PLUS MB */ |
| 253 | { .serial = 0x10091102, | 253 | { .serial = 0x10091102, |
| 254 | .name = "MSI K8N Diamond MB", | 254 | .name = "MSI K8N Diamond MB", |
| 255 | .gpio_type = 2, | 255 | .gpio_type = 2, |
| 256 | .i2c_adc = 1 } , | 256 | .i2c_adc = 1, |
| 257 | .spi_dac = 2 }, | ||
| 257 | /* Shuttle XPC SD31P which has an onboard Creative Labs | 258 | /* Shuttle XPC SD31P which has an onboard Creative Labs |
| 258 | * Sound Blaster Live! 24-bit EAX | 259 | * Sound Blaster Live! 24-bit EAX |
| 259 | * high-definition 7.1 audio processor". | 260 | * high-definition 7.1 audio processor". |
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index ef9f072b47fc..1c53e337ecb2 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c | |||
| @@ -101,6 +101,7 @@ MODULE_SUPPORTED_DEVICE("{{Intel, ICH6}," | |||
| 101 | "{Intel, ICH8}," | 101 | "{Intel, ICH8}," |
| 102 | "{Intel, ICH9}," | 102 | "{Intel, ICH9}," |
| 103 | "{Intel, ICH10}," | 103 | "{Intel, ICH10}," |
| 104 | "{Intel, PCH}," | ||
| 104 | "{Intel, SCH}," | 105 | "{Intel, SCH}," |
| 105 | "{ATI, SB450}," | 106 | "{ATI, SB450}," |
| 106 | "{ATI, SB600}," | 107 | "{ATI, SB600}," |
| @@ -277,6 +278,9 @@ enum { | |||
| 277 | /* Defines for Nvidia HDA support */ | 278 | /* Defines for Nvidia HDA support */ |
| 278 | #define NVIDIA_HDA_TRANSREG_ADDR 0x4e | 279 | #define NVIDIA_HDA_TRANSREG_ADDR 0x4e |
| 279 | #define NVIDIA_HDA_ENABLE_COHBITS 0x0f | 280 | #define NVIDIA_HDA_ENABLE_COHBITS 0x0f |
| 281 | #define NVIDIA_HDA_ISTRM_COH 0x4d | ||
| 282 | #define NVIDIA_HDA_OSTRM_COH 0x4c | ||
| 283 | #define NVIDIA_HDA_ENABLE_COHBIT 0x01 | ||
| 280 | 284 | ||
| 281 | /* Defines for Intel SCH HDA snoop control */ | 285 | /* Defines for Intel SCH HDA snoop control */ |
| 282 | #define INTEL_SCH_HDA_DEVC 0x78 | 286 | #define INTEL_SCH_HDA_DEVC 0x78 |
| @@ -899,6 +903,12 @@ static void azx_init_pci(struct azx *chip) | |||
| 899 | update_pci_byte(chip->pci, | 903 | update_pci_byte(chip->pci, |
| 900 | NVIDIA_HDA_TRANSREG_ADDR, | 904 | NVIDIA_HDA_TRANSREG_ADDR, |
| 901 | 0x0f, NVIDIA_HDA_ENABLE_COHBITS); | 905 | 0x0f, NVIDIA_HDA_ENABLE_COHBITS); |
| 906 | update_pci_byte(chip->pci, | ||
| 907 | NVIDIA_HDA_ISTRM_COH, | ||
| 908 | 0x01, NVIDIA_HDA_ENABLE_COHBIT); | ||
| 909 | update_pci_byte(chip->pci, | ||
| 910 | NVIDIA_HDA_OSTRM_COH, | ||
| 911 | 0x01, NVIDIA_HDA_ENABLE_COHBIT); | ||
| 902 | break; | 912 | break; |
| 903 | case AZX_DRIVER_SCH: | 913 | case AZX_DRIVER_SCH: |
| 904 | pci_read_config_word(chip->pci, INTEL_SCH_HDA_DEVC, &snoop); | 914 | pci_read_config_word(chip->pci, INTEL_SCH_HDA_DEVC, &snoop); |
| @@ -2263,6 +2273,8 @@ static struct pci_device_id azx_ids[] = { | |||
| 2263 | { PCI_DEVICE(0x8086, 0x293f), .driver_data = AZX_DRIVER_ICH }, | 2273 | { PCI_DEVICE(0x8086, 0x293f), .driver_data = AZX_DRIVER_ICH }, |
| 2264 | { PCI_DEVICE(0x8086, 0x3a3e), .driver_data = AZX_DRIVER_ICH }, | 2274 | { PCI_DEVICE(0x8086, 0x3a3e), .driver_data = AZX_DRIVER_ICH }, |
| 2265 | { PCI_DEVICE(0x8086, 0x3a6e), .driver_data = AZX_DRIVER_ICH }, | 2275 | { PCI_DEVICE(0x8086, 0x3a6e), .driver_data = AZX_DRIVER_ICH }, |
| 2276 | /* PCH */ | ||
| 2277 | { PCI_DEVICE(0x8086, 0x3b56), .driver_data = AZX_DRIVER_ICH }, | ||
| 2266 | /* SCH */ | 2278 | /* SCH */ |
| 2267 | { PCI_DEVICE(0x8086, 0x811b), .driver_data = AZX_DRIVER_SCH }, | 2279 | { PCI_DEVICE(0x8086, 0x811b), .driver_data = AZX_DRIVER_SCH }, |
| 2268 | /* ATI SB 450/600 */ | 2280 | /* ATI SB 450/600 */ |
| @@ -2272,6 +2284,7 @@ static struct pci_device_id azx_ids[] = { | |||
| 2272 | { PCI_DEVICE(0x1002, 0x793b), .driver_data = AZX_DRIVER_ATIHDMI }, | 2284 | { PCI_DEVICE(0x1002, 0x793b), .driver_data = AZX_DRIVER_ATIHDMI }, |
| 2273 | { PCI_DEVICE(0x1002, 0x7919), .driver_data = AZX_DRIVER_ATIHDMI }, | 2285 | { PCI_DEVICE(0x1002, 0x7919), .driver_data = AZX_DRIVER_ATIHDMI }, |
| 2274 | { PCI_DEVICE(0x1002, 0x960f), .driver_data = AZX_DRIVER_ATIHDMI }, | 2286 | { PCI_DEVICE(0x1002, 0x960f), .driver_data = AZX_DRIVER_ATIHDMI }, |
| 2287 | { PCI_DEVICE(0x1002, 0x970f), .driver_data = AZX_DRIVER_ATIHDMI }, | ||
| 2275 | { PCI_DEVICE(0x1002, 0xaa00), .driver_data = AZX_DRIVER_ATIHDMI }, | 2288 | { PCI_DEVICE(0x1002, 0xaa00), .driver_data = AZX_DRIVER_ATIHDMI }, |
| 2276 | { PCI_DEVICE(0x1002, 0xaa08), .driver_data = AZX_DRIVER_ATIHDMI }, | 2289 | { PCI_DEVICE(0x1002, 0xaa08), .driver_data = AZX_DRIVER_ATIHDMI }, |
| 2277 | { PCI_DEVICE(0x1002, 0xaa10), .driver_data = AZX_DRIVER_ATIHDMI }, | 2290 | { PCI_DEVICE(0x1002, 0xaa10), .driver_data = AZX_DRIVER_ATIHDMI }, |
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index add4e87e0b20..66025161bd69 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
| @@ -952,7 +952,7 @@ do_sku: | |||
| 952 | tmp | 0x2010); | 952 | tmp | 0x2010); |
| 953 | break; | 953 | break; |
| 954 | case 0x10ec0888: | 954 | case 0x10ec0888: |
| 955 | alc888_coef_init(codec); | 955 | /*alc888_coef_init(codec);*/ /* called in alc_init() */ |
| 956 | break; | 956 | break; |
| 957 | case 0x10ec0267: | 957 | case 0x10ec0267: |
| 958 | case 0x10ec0268: | 958 | case 0x10ec0268: |
| @@ -2439,6 +2439,8 @@ static int alc_init(struct hda_codec *codec) | |||
| 2439 | unsigned int i; | 2439 | unsigned int i; |
| 2440 | 2440 | ||
| 2441 | alc_fix_pll(codec); | 2441 | alc_fix_pll(codec); |
| 2442 | if (codec->vendor_id == 0x10ec0888) | ||
| 2443 | alc888_coef_init(codec); | ||
| 2442 | 2444 | ||
| 2443 | for (i = 0; i < spec->num_init_verbs; i++) | 2445 | for (i = 0; i < spec->num_init_verbs; i++) |
| 2444 | snd_hda_sequence_write(codec, spec->init_verbs[i]); | 2446 | snd_hda_sequence_write(codec, spec->init_verbs[i]); |
| @@ -6195,7 +6197,6 @@ static struct snd_pci_quirk alc882_cfg_tbl[] = { | |||
| 6195 | SND_PCI_QUIRK(0x1043, 0x817f, "Asus P5LD2", ALC882_6ST_DIG), | 6197 | SND_PCI_QUIRK(0x1043, 0x817f, "Asus P5LD2", ALC882_6ST_DIG), |
| 6196 | SND_PCI_QUIRK(0x1043, 0x81d8, "Asus P5WD", ALC882_6ST_DIG), | 6198 | SND_PCI_QUIRK(0x1043, 0x81d8, "Asus P5WD", ALC882_6ST_DIG), |
| 6197 | SND_PCI_QUIRK(0x105b, 0x6668, "Foxconn", ALC882_6ST_DIG), | 6199 | SND_PCI_QUIRK(0x105b, 0x6668, "Foxconn", ALC882_6ST_DIG), |
| 6198 | SND_PCI_QUIRK(0x106b, 0x00a0, "Apple iMac 24''", ALC885_IMAC24), | ||
| 6199 | SND_PCI_QUIRK(0x1458, 0xa002, "Gigabyte P35 DS3R", ALC882_6ST_DIG), | 6200 | SND_PCI_QUIRK(0x1458, 0xa002, "Gigabyte P35 DS3R", ALC882_6ST_DIG), |
| 6200 | SND_PCI_QUIRK(0x1462, 0x28fb, "Targa T8", ALC882_TARGA), /* MSI-1049 T8 */ | 6201 | SND_PCI_QUIRK(0x1462, 0x28fb, "Targa T8", ALC882_TARGA), /* MSI-1049 T8 */ |
| 6201 | SND_PCI_QUIRK(0x1462, 0x6668, "MSI", ALC882_6ST_DIG), | 6202 | SND_PCI_QUIRK(0x1462, 0x6668, "MSI", ALC882_6ST_DIG), |
| @@ -6437,6 +6438,39 @@ static void alc882_auto_init_analog_input(struct hda_codec *codec) | |||
| 6437 | } | 6438 | } |
| 6438 | } | 6439 | } |
| 6439 | 6440 | ||
| 6441 | static void alc882_auto_init_input_src(struct hda_codec *codec) | ||
| 6442 | { | ||
| 6443 | struct alc_spec *spec = codec->spec; | ||
| 6444 | const struct hda_input_mux *imux = spec->input_mux; | ||
| 6445 | int c; | ||
| 6446 | |||
| 6447 | for (c = 0; c < spec->num_adc_nids; c++) { | ||
| 6448 | hda_nid_t conn_list[HDA_MAX_NUM_INPUTS]; | ||
| 6449 | hda_nid_t nid = spec->capsrc_nids[c]; | ||
| 6450 | int conns, mute, idx, item; | ||
| 6451 | |||
| 6452 | conns = snd_hda_get_connections(codec, nid, conn_list, | ||
| 6453 | ARRAY_SIZE(conn_list)); | ||
| 6454 | if (conns < 0) | ||
| 6455 | continue; | ||
| 6456 | for (idx = 0; idx < conns; idx++) { | ||
| 6457 | /* if the current connection is the selected one, | ||
| 6458 | * unmute it as default - otherwise mute it | ||
| 6459 | */ | ||
| 6460 | mute = AMP_IN_MUTE(idx); | ||
| 6461 | for (item = 0; item < imux->num_items; item++) { | ||
| 6462 | if (imux->items[item].index == idx) { | ||
| 6463 | if (spec->cur_mux[c] == item) | ||
| 6464 | mute = AMP_IN_UNMUTE(idx); | ||
| 6465 | break; | ||
| 6466 | } | ||
| 6467 | } | ||
| 6468 | snd_hda_codec_write(codec, nid, 0, | ||
| 6469 | AC_VERB_SET_AMP_GAIN_MUTE, mute); | ||
| 6470 | } | ||
| 6471 | } | ||
| 6472 | } | ||
| 6473 | |||
| 6440 | /* add mic boosts if needed */ | 6474 | /* add mic boosts if needed */ |
| 6441 | static int alc_auto_add_mic_boost(struct hda_codec *codec) | 6475 | static int alc_auto_add_mic_boost(struct hda_codec *codec) |
| 6442 | { | 6476 | { |
| @@ -6491,6 +6525,7 @@ static void alc882_auto_init(struct hda_codec *codec) | |||
| 6491 | alc882_auto_init_multi_out(codec); | 6525 | alc882_auto_init_multi_out(codec); |
| 6492 | alc882_auto_init_hp_out(codec); | 6526 | alc882_auto_init_hp_out(codec); |
| 6493 | alc882_auto_init_analog_input(codec); | 6527 | alc882_auto_init_analog_input(codec); |
| 6528 | alc882_auto_init_input_src(codec); | ||
| 6494 | if (spec->unsol_event) | 6529 | if (spec->unsol_event) |
| 6495 | alc_sku_automute(codec); | 6530 | alc_sku_automute(codec); |
| 6496 | } | 6531 | } |
| @@ -8285,6 +8320,8 @@ static void alc883_auto_init_analog_input(struct hda_codec *codec) | |||
| 8285 | } | 8320 | } |
| 8286 | } | 8321 | } |
| 8287 | 8322 | ||
| 8323 | #define alc883_auto_init_input_src alc882_auto_init_input_src | ||
| 8324 | |||
| 8288 | /* almost identical with ALC880 parser... */ | 8325 | /* almost identical with ALC880 parser... */ |
| 8289 | static int alc883_parse_auto_config(struct hda_codec *codec) | 8326 | static int alc883_parse_auto_config(struct hda_codec *codec) |
| 8290 | { | 8327 | { |
| @@ -8315,6 +8352,7 @@ static void alc883_auto_init(struct hda_codec *codec) | |||
| 8315 | alc883_auto_init_multi_out(codec); | 8352 | alc883_auto_init_multi_out(codec); |
| 8316 | alc883_auto_init_hp_out(codec); | 8353 | alc883_auto_init_hp_out(codec); |
| 8317 | alc883_auto_init_analog_input(codec); | 8354 | alc883_auto_init_analog_input(codec); |
| 8355 | alc883_auto_init_input_src(codec); | ||
| 8318 | if (spec->unsol_event) | 8356 | if (spec->unsol_event) |
| 8319 | alc_sku_automute(codec); | 8357 | alc_sku_automute(codec); |
| 8320 | } | 8358 | } |
| @@ -8389,8 +8427,6 @@ static int patch_alc883(struct hda_codec *codec) | |||
| 8389 | codec->patch_ops = alc_patch_ops; | 8427 | codec->patch_ops = alc_patch_ops; |
| 8390 | if (board_config == ALC883_AUTO) | 8428 | if (board_config == ALC883_AUTO) |
| 8391 | spec->init_hook = alc883_auto_init; | 8429 | spec->init_hook = alc883_auto_init; |
| 8392 | else if (codec->vendor_id == 0x10ec0888) | ||
| 8393 | spec->init_hook = alc888_coef_init; | ||
| 8394 | 8430 | ||
| 8395 | #ifdef CONFIG_SND_HDA_POWER_SAVE | 8431 | #ifdef CONFIG_SND_HDA_POWER_SAVE |
| 8396 | if (!spec->loopback.amplist) | 8432 | if (!spec->loopback.amplist) |
| @@ -9663,6 +9699,7 @@ static int alc262_parse_auto_config(struct hda_codec *codec) | |||
| 9663 | #define alc262_auto_init_multi_out alc882_auto_init_multi_out | 9699 | #define alc262_auto_init_multi_out alc882_auto_init_multi_out |
| 9664 | #define alc262_auto_init_hp_out alc882_auto_init_hp_out | 9700 | #define alc262_auto_init_hp_out alc882_auto_init_hp_out |
| 9665 | #define alc262_auto_init_analog_input alc882_auto_init_analog_input | 9701 | #define alc262_auto_init_analog_input alc882_auto_init_analog_input |
| 9702 | #define alc262_auto_init_input_src alc882_auto_init_input_src | ||
| 9666 | 9703 | ||
| 9667 | 9704 | ||
| 9668 | /* init callback for auto-configuration model -- overriding the default init */ | 9705 | /* init callback for auto-configuration model -- overriding the default init */ |
| @@ -9672,6 +9709,7 @@ static void alc262_auto_init(struct hda_codec *codec) | |||
| 9672 | alc262_auto_init_multi_out(codec); | 9709 | alc262_auto_init_multi_out(codec); |
| 9673 | alc262_auto_init_hp_out(codec); | 9710 | alc262_auto_init_hp_out(codec); |
| 9674 | alc262_auto_init_analog_input(codec); | 9711 | alc262_auto_init_analog_input(codec); |
| 9712 | alc262_auto_init_input_src(codec); | ||
| 9675 | if (spec->unsol_event) | 9713 | if (spec->unsol_event) |
| 9676 | alc_sku_automute(codec); | 9714 | alc_sku_automute(codec); |
| 9677 | } | 9715 | } |
| @@ -13330,6 +13368,8 @@ static void alc861vd_auto_init_analog_input(struct hda_codec *codec) | |||
| 13330 | } | 13368 | } |
| 13331 | } | 13369 | } |
| 13332 | 13370 | ||
| 13371 | #define alc861vd_auto_init_input_src alc882_auto_init_input_src | ||
| 13372 | |||
| 13333 | #define alc861vd_idx_to_mixer_vol(nid) ((nid) + 0x02) | 13373 | #define alc861vd_idx_to_mixer_vol(nid) ((nid) + 0x02) |
| 13334 | #define alc861vd_idx_to_mixer_switch(nid) ((nid) + 0x0c) | 13374 | #define alc861vd_idx_to_mixer_switch(nid) ((nid) + 0x0c) |
| 13335 | 13375 | ||
| @@ -13512,6 +13552,7 @@ static void alc861vd_auto_init(struct hda_codec *codec) | |||
| 13512 | alc861vd_auto_init_multi_out(codec); | 13552 | alc861vd_auto_init_multi_out(codec); |
| 13513 | alc861vd_auto_init_hp_out(codec); | 13553 | alc861vd_auto_init_hp_out(codec); |
| 13514 | alc861vd_auto_init_analog_input(codec); | 13554 | alc861vd_auto_init_analog_input(codec); |
| 13555 | alc861vd_auto_init_input_src(codec); | ||
| 13515 | if (spec->unsol_event) | 13556 | if (spec->unsol_event) |
| 13516 | alc_sku_automute(codec); | 13557 | alc_sku_automute(codec); |
| 13517 | } | 13558 | } |
| @@ -14025,6 +14066,13 @@ static struct hda_verb alc662_auto_init_verbs[] = { | |||
| 14025 | { } | 14066 | { } |
| 14026 | }; | 14067 | }; |
| 14027 | 14068 | ||
| 14069 | /* additional verbs for ALC663 */ | ||
| 14070 | static struct hda_verb alc663_auto_init_verbs[] = { | ||
| 14071 | {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, | ||
| 14072 | {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)}, | ||
| 14073 | { } | ||
| 14074 | }; | ||
| 14075 | |||
| 14028 | static struct hda_verb alc663_m51va_init_verbs[] = { | 14076 | static struct hda_verb alc663_m51va_init_verbs[] = { |
| 14029 | {0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP}, | 14077 | {0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP}, |
| 14030 | {0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, | 14078 | {0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, |
| @@ -14553,6 +14601,14 @@ static int alc662_auto_create_extra_out(struct alc_spec *spec, hda_nid_t pin, | |||
| 14553 | if (!pin) | 14601 | if (!pin) |
| 14554 | return 0; | 14602 | return 0; |
| 14555 | 14603 | ||
| 14604 | if (pin == 0x17) { | ||
| 14605 | /* ALC663 has a mono output pin on 0x17 */ | ||
| 14606 | sprintf(name, "%s Playback Switch", pfx); | ||
| 14607 | err = add_control(spec, ALC_CTL_WIDGET_MUTE, name, | ||
| 14608 | HDA_COMPOSE_AMP_VAL(pin, 2, 0, HDA_OUTPUT)); | ||
| 14609 | return err; | ||
| 14610 | } | ||
| 14611 | |||
| 14556 | if (alc880_is_fixed_pin(pin)) { | 14612 | if (alc880_is_fixed_pin(pin)) { |
| 14557 | nid = alc880_idx_to_dac(alc880_fixed_pin_idx(pin)); | 14613 | nid = alc880_idx_to_dac(alc880_fixed_pin_idx(pin)); |
| 14558 | /* printk("DAC nid=%x\n",nid); */ | 14614 | /* printk("DAC nid=%x\n",nid); */ |
| @@ -14677,6 +14733,8 @@ static void alc662_auto_init_analog_input(struct hda_codec *codec) | |||
| 14677 | } | 14733 | } |
| 14678 | } | 14734 | } |
| 14679 | 14735 | ||
| 14736 | #define alc662_auto_init_input_src alc882_auto_init_input_src | ||
| 14737 | |||
| 14680 | static int alc662_parse_auto_config(struct hda_codec *codec) | 14738 | static int alc662_parse_auto_config(struct hda_codec *codec) |
| 14681 | { | 14739 | { |
| 14682 | struct alc_spec *spec = codec->spec; | 14740 | struct alc_spec *spec = codec->spec; |
| @@ -14721,6 +14779,14 @@ static int alc662_parse_auto_config(struct hda_codec *codec) | |||
| 14721 | spec->input_mux = &spec->private_imux; | 14779 | spec->input_mux = &spec->private_imux; |
| 14722 | 14780 | ||
| 14723 | spec->init_verbs[spec->num_init_verbs++] = alc662_auto_init_verbs; | 14781 | spec->init_verbs[spec->num_init_verbs++] = alc662_auto_init_verbs; |
| 14782 | if (codec->vendor_id == 0x10ec0663) | ||
| 14783 | spec->init_verbs[spec->num_init_verbs++] = | ||
| 14784 | alc663_auto_init_verbs; | ||
| 14785 | |||
| 14786 | err = alc_auto_add_mic_boost(codec); | ||
| 14787 | if (err < 0) | ||
| 14788 | return err; | ||
| 14789 | |||
| 14724 | spec->mixers[spec->num_mixers] = alc662_capture_mixer; | 14790 | spec->mixers[spec->num_mixers] = alc662_capture_mixer; |
| 14725 | spec->num_mixers++; | 14791 | spec->num_mixers++; |
| 14726 | return 1; | 14792 | return 1; |
| @@ -14733,6 +14799,7 @@ static void alc662_auto_init(struct hda_codec *codec) | |||
| 14733 | alc662_auto_init_multi_out(codec); | 14799 | alc662_auto_init_multi_out(codec); |
| 14734 | alc662_auto_init_hp_out(codec); | 14800 | alc662_auto_init_hp_out(codec); |
| 14735 | alc662_auto_init_analog_input(codec); | 14801 | alc662_auto_init_analog_input(codec); |
| 14802 | alc662_auto_init_input_src(codec); | ||
| 14736 | if (spec->unsol_event) | 14803 | if (spec->unsol_event) |
| 14737 | alc_sku_automute(codec); | 14804 | alc_sku_automute(codec); |
| 14738 | } | 14805 | } |
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index 7fdafcb0015d..ad994fcab725 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c | |||
| @@ -560,8 +560,9 @@ static struct hda_verb dell_eq_core_init[] = { | |||
| 560 | }; | 560 | }; |
| 561 | 561 | ||
| 562 | static struct hda_verb dell_m6_core_init[] = { | 562 | static struct hda_verb dell_m6_core_init[] = { |
| 563 | /* set master volume and direct control */ | 563 | /* set master volume to max value without distortion |
| 564 | { 0x1f, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff}, | 564 | * and direct control */ |
| 565 | { 0x1f, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xec}, | ||
| 565 | /* setup audio connections */ | 566 | /* setup audio connections */ |
| 566 | { 0x0d, AC_VERB_SET_CONNECT_SEL, 0x00}, | 567 | { 0x0d, AC_VERB_SET_CONNECT_SEL, 0x00}, |
| 567 | { 0x0a, AC_VERB_SET_CONNECT_SEL, 0x01}, | 568 | { 0x0a, AC_VERB_SET_CONNECT_SEL, 0x01}, |
diff --git a/sound/pci/oxygen/hifier.c b/sound/pci/oxygen/hifier.c index 7442460583dd..dad393ae040a 100644 --- a/sound/pci/oxygen/hifier.c +++ b/sound/pci/oxygen/hifier.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 17 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | #include <linux/delay.h> | ||
| 20 | #include <linux/pci.h> | 21 | #include <linux/pci.h> |
| 21 | #include <sound/control.h> | 22 | #include <sound/control.h> |
| 22 | #include <sound/core.h> | 23 | #include <sound/core.h> |
| @@ -107,6 +108,9 @@ static void set_ak4396_params(struct oxygen *chip, | |||
| 107 | else | 108 | else |
| 108 | value |= AK4396_DFS_QUAD; | 109 | value |= AK4396_DFS_QUAD; |
| 109 | data->ak4396_ctl2 = value; | 110 | data->ak4396_ctl2 = value; |
| 111 | |||
| 112 | msleep(1); /* wait for the new MCLK to become stable */ | ||
| 113 | |||
| 110 | ak4396_write(chip, AK4396_CONTROL_1, AK4396_DIF_24_MSB); | 114 | ak4396_write(chip, AK4396_CONTROL_1, AK4396_DIF_24_MSB); |
| 111 | ak4396_write(chip, AK4396_CONTROL_2, value); | 115 | ak4396_write(chip, AK4396_CONTROL_2, value); |
| 112 | ak4396_write(chip, AK4396_CONTROL_1, AK4396_DIF_24_MSB | AK4396_RSTN); | 116 | ak4396_write(chip, AK4396_CONTROL_1, AK4396_DIF_24_MSB | AK4396_RSTN); |
diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c index 7c8ae31eb468..c5829d30ef86 100644 --- a/sound/pci/oxygen/oxygen.c +++ b/sound/pci/oxygen/oxygen.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | * GPIO 1 -> DFS1 of AK5385 | 28 | * GPIO 1 -> DFS1 of AK5385 |
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include <linux/delay.h> | ||
| 31 | #include <linux/mutex.h> | 32 | #include <linux/mutex.h> |
| 32 | #include <linux/pci.h> | 33 | #include <linux/pci.h> |
| 33 | #include <sound/ac97_codec.h> | 34 | #include <sound/ac97_codec.h> |
| @@ -213,6 +214,9 @@ static void set_ak4396_params(struct oxygen *chip, | |||
| 213 | else | 214 | else |
| 214 | value |= AK4396_DFS_QUAD; | 215 | value |= AK4396_DFS_QUAD; |
| 215 | data->ak4396_ctl2 = value; | 216 | data->ak4396_ctl2 = value; |
| 217 | |||
| 218 | msleep(1); /* wait for the new MCLK to become stable */ | ||
| 219 | |||
| 216 | for (i = 0; i < 4; ++i) { | 220 | for (i = 0; i < 4; ++i) { |
| 217 | ak4396_write(chip, i, | 221 | ak4396_write(chip, i, |
| 218 | AK4396_CONTROL_1, AK4396_DIF_24_MSB); | 222 | AK4396_CONTROL_1, AK4396_DIF_24_MSB); |
diff --git a/sound/pci/oxygen/oxygen_mixer.c b/sound/pci/oxygen/oxygen_mixer.c index 6facac5aed90..05eb8994c141 100644 --- a/sound/pci/oxygen/oxygen_mixer.c +++ b/sound/pci/oxygen/oxygen_mixer.c | |||
| @@ -512,9 +512,12 @@ static int ac97_switch_get(struct snd_kcontrol *ctl, | |||
| 512 | 512 | ||
| 513 | static void mute_ac97_ctl(struct oxygen *chip, unsigned int control) | 513 | static void mute_ac97_ctl(struct oxygen *chip, unsigned int control) |
| 514 | { | 514 | { |
| 515 | unsigned int priv_idx = chip->controls[control]->private_value & 0xff; | 515 | unsigned int priv_idx; |
| 516 | u16 value; | 516 | u16 value; |
| 517 | 517 | ||
| 518 | if (!chip->controls[control]) | ||
| 519 | return; | ||
| 520 | priv_idx = chip->controls[control]->private_value & 0xff; | ||
| 518 | value = oxygen_read_ac97(chip, 0, priv_idx); | 521 | value = oxygen_read_ac97(chip, 0, priv_idx); |
| 519 | if (!(value & 0x8000)) { | 522 | if (!(value & 0x8000)) { |
| 520 | oxygen_write_ac97(chip, 0, priv_idx, value | 0x8000); | 523 | oxygen_write_ac97(chip, 0, priv_idx, value | 0x8000); |
diff --git a/sound/pci/oxygen/virtuoso.c b/sound/pci/oxygen/virtuoso.c index 9a2c16bf94e0..01d7b75f9182 100644 --- a/sound/pci/oxygen/virtuoso.c +++ b/sound/pci/oxygen/virtuoso.c | |||
| @@ -36,15 +36,15 @@ | |||
| 36 | */ | 36 | */ |
| 37 | 37 | ||
| 38 | /* | 38 | /* |
| 39 | * Xonar DX | 39 | * Xonar D1/DX |
| 40 | * -------- | 40 | * ----------- |
| 41 | * | 41 | * |
| 42 | * CMI8788: | 42 | * CMI8788: |
| 43 | * | 43 | * |
| 44 | * I²C <-> CS4398 (front) | 44 | * I²C <-> CS4398 (front) |
| 45 | * <-> CS4362A (surround, center/LFE, back) | 45 | * <-> CS4362A (surround, center/LFE, back) |
| 46 | * | 46 | * |
| 47 | * GPI 0 <- external power present | 47 | * GPI 0 <- external power present (DX only) |
| 48 | * | 48 | * |
| 49 | * GPIO 0 -> enable output to speakers | 49 | * GPIO 0 -> enable output to speakers |
| 50 | * GPIO 1 -> enable front panel I/O | 50 | * GPIO 1 -> enable front panel I/O |
| @@ -96,6 +96,7 @@ MODULE_PARM_DESC(enable, "enable card"); | |||
| 96 | enum { | 96 | enum { |
| 97 | MODEL_D2, | 97 | MODEL_D2, |
| 98 | MODEL_D2X, | 98 | MODEL_D2X, |
| 99 | MODEL_D1, | ||
| 99 | MODEL_DX, | 100 | MODEL_DX, |
| 100 | }; | 101 | }; |
| 101 | 102 | ||
| @@ -103,6 +104,7 @@ static struct pci_device_id xonar_ids[] __devinitdata = { | |||
| 103 | { OXYGEN_PCI_SUBID(0x1043, 0x8269), .driver_data = MODEL_D2 }, | 104 | { OXYGEN_PCI_SUBID(0x1043, 0x8269), .driver_data = MODEL_D2 }, |
| 104 | { OXYGEN_PCI_SUBID(0x1043, 0x8275), .driver_data = MODEL_DX }, | 105 | { OXYGEN_PCI_SUBID(0x1043, 0x8275), .driver_data = MODEL_DX }, |
| 105 | { OXYGEN_PCI_SUBID(0x1043, 0x82b7), .driver_data = MODEL_D2X }, | 106 | { OXYGEN_PCI_SUBID(0x1043, 0x82b7), .driver_data = MODEL_D2X }, |
| 107 | { OXYGEN_PCI_SUBID(0x1043, 0x834f), .driver_data = MODEL_D1 }, | ||
| 106 | { } | 108 | { } |
| 107 | }; | 109 | }; |
| 108 | MODULE_DEVICE_TABLE(pci, xonar_ids); | 110 | MODULE_DEVICE_TABLE(pci, xonar_ids); |
| @@ -313,15 +315,12 @@ static void cs43xx_init(struct oxygen *chip) | |||
| 313 | cs4362a_write(chip, 0x01, CS4362A_CPEN); | 315 | cs4362a_write(chip, 0x01, CS4362A_CPEN); |
| 314 | } | 316 | } |
| 315 | 317 | ||
| 316 | static void xonar_dx_init(struct oxygen *chip) | 318 | static void xonar_d1_init(struct oxygen *chip) |
| 317 | { | 319 | { |
| 318 | struct xonar_data *data = chip->model_data; | 320 | struct xonar_data *data = chip->model_data; |
| 319 | 321 | ||
| 320 | data->anti_pop_delay = 800; | 322 | data->anti_pop_delay = 800; |
| 321 | data->output_enable_bit = GPIO_DX_OUTPUT_ENABLE; | 323 | data->output_enable_bit = GPIO_DX_OUTPUT_ENABLE; |
| 322 | data->ext_power_reg = OXYGEN_GPI_DATA; | ||
| 323 | data->ext_power_int_reg = OXYGEN_GPI_INTERRUPT_MASK; | ||
| 324 | data->ext_power_bit = GPI_DX_EXT_POWER; | ||
| 325 | data->cs4398_fm = CS4398_FM_SINGLE | CS4398_DEM_NONE | CS4398_DIF_LJUST; | 324 | data->cs4398_fm = CS4398_FM_SINGLE | CS4398_DEM_NONE | CS4398_DIF_LJUST; |
| 326 | data->cs4362a_fm = CS4362A_FM_SINGLE | | 325 | data->cs4362a_fm = CS4362A_FM_SINGLE | |
| 327 | CS4362A_ATAPI_B_R | CS4362A_ATAPI_A_L; | 326 | CS4362A_ATAPI_B_R | CS4362A_ATAPI_A_L; |
| @@ -345,6 +344,16 @@ static void xonar_dx_init(struct oxygen *chip) | |||
| 345 | snd_component_add(chip->card, "CS5361"); | 344 | snd_component_add(chip->card, "CS5361"); |
| 346 | } | 345 | } |
| 347 | 346 | ||
| 347 | static void xonar_dx_init(struct oxygen *chip) | ||
| 348 | { | ||
| 349 | struct xonar_data *data = chip->model_data; | ||
| 350 | |||
| 351 | data->ext_power_reg = OXYGEN_GPI_DATA; | ||
| 352 | data->ext_power_int_reg = OXYGEN_GPI_INTERRUPT_MASK; | ||
| 353 | data->ext_power_bit = GPI_DX_EXT_POWER; | ||
| 354 | xonar_d1_init(chip); | ||
| 355 | } | ||
| 356 | |||
| 348 | static void xonar_cleanup(struct oxygen *chip) | 357 | static void xonar_cleanup(struct oxygen *chip) |
| 349 | { | 358 | { |
| 350 | struct xonar_data *data = chip->model_data; | 359 | struct xonar_data *data = chip->model_data; |
| @@ -352,7 +361,7 @@ static void xonar_cleanup(struct oxygen *chip) | |||
| 352 | oxygen_clear_bits16(chip, OXYGEN_GPIO_DATA, data->output_enable_bit); | 361 | oxygen_clear_bits16(chip, OXYGEN_GPIO_DATA, data->output_enable_bit); |
| 353 | } | 362 | } |
| 354 | 363 | ||
| 355 | static void xonar_dx_cleanup(struct oxygen *chip) | 364 | static void xonar_d1_cleanup(struct oxygen *chip) |
| 356 | { | 365 | { |
| 357 | xonar_cleanup(chip); | 366 | xonar_cleanup(chip); |
| 358 | cs4362a_write(chip, 0x01, CS4362A_PDN | CS4362A_CPEN); | 367 | cs4362a_write(chip, 0x01, CS4362A_PDN | CS4362A_CPEN); |
| @@ -365,7 +374,7 @@ static void xonar_d2_resume(struct oxygen *chip) | |||
| 365 | xonar_enable_output(chip); | 374 | xonar_enable_output(chip); |
| 366 | } | 375 | } |
| 367 | 376 | ||
| 368 | static void xonar_dx_resume(struct oxygen *chip) | 377 | static void xonar_d1_resume(struct oxygen *chip) |
| 369 | { | 378 | { |
| 370 | cs43xx_init(chip); | 379 | cs43xx_init(chip); |
| 371 | xonar_enable_output(chip); | 380 | xonar_enable_output(chip); |
| @@ -513,7 +522,7 @@ static const struct snd_kcontrol_new front_panel_switch = { | |||
| 513 | .put = front_panel_put, | 522 | .put = front_panel_put, |
| 514 | }; | 523 | }; |
| 515 | 524 | ||
| 516 | static void xonar_dx_ac97_switch(struct oxygen *chip, | 525 | static void xonar_d1_ac97_switch(struct oxygen *chip, |
| 517 | unsigned int reg, unsigned int mute) | 526 | unsigned int reg, unsigned int mute) |
| 518 | { | 527 | { |
| 519 | if (reg == AC97_LINE) { | 528 | if (reg == AC97_LINE) { |
| @@ -536,7 +545,7 @@ static int xonar_d2_control_filter(struct snd_kcontrol_new *template) | |||
| 536 | return 0; | 545 | return 0; |
| 537 | } | 546 | } |
| 538 | 547 | ||
| 539 | static int xonar_dx_control_filter(struct snd_kcontrol_new *template) | 548 | static int xonar_d1_control_filter(struct snd_kcontrol_new *template) |
| 540 | { | 549 | { |
| 541 | if (!strncmp(template->name, "CD Capture ", 11)) | 550 | if (!strncmp(template->name, "CD Capture ", 11)) |
| 542 | return 1; /* no CD input */ | 551 | return 1; /* no CD input */ |
| @@ -548,7 +557,7 @@ static int xonar_mixer_init(struct oxygen *chip) | |||
| 548 | return snd_ctl_add(chip->card, snd_ctl_new1(&alt_switch, chip)); | 557 | return snd_ctl_add(chip->card, snd_ctl_new1(&alt_switch, chip)); |
| 549 | } | 558 | } |
| 550 | 559 | ||
| 551 | static int xonar_dx_mixer_init(struct oxygen *chip) | 560 | static int xonar_d1_mixer_init(struct oxygen *chip) |
| 552 | { | 561 | { |
| 553 | return snd_ctl_add(chip->card, snd_ctl_new1(&front_panel_switch, chip)); | 562 | return snd_ctl_add(chip->card, snd_ctl_new1(&front_panel_switch, chip)); |
| 554 | } | 563 | } |
| @@ -615,23 +624,51 @@ static const struct oxygen_model xonar_models[] = { | |||
| 615 | .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST, | 624 | .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST, |
| 616 | .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST, | 625 | .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST, |
| 617 | }, | 626 | }, |
| 627 | [MODEL_D1] = { | ||
| 628 | .shortname = "Xonar D1", | ||
| 629 | .longname = "Asus Virtuoso 100", | ||
| 630 | .chip = "AV200", | ||
| 631 | .owner = THIS_MODULE, | ||
| 632 | .init = xonar_d1_init, | ||
| 633 | .control_filter = xonar_d1_control_filter, | ||
| 634 | .mixer_init = xonar_d1_mixer_init, | ||
| 635 | .cleanup = xonar_d1_cleanup, | ||
| 636 | .suspend = xonar_d1_cleanup, | ||
| 637 | .resume = xonar_d1_resume, | ||
| 638 | .set_dac_params = set_cs43xx_params, | ||
| 639 | .set_adc_params = set_cs53x1_params, | ||
| 640 | .update_dac_volume = update_cs43xx_volume, | ||
| 641 | .update_dac_mute = update_cs43xx_mute, | ||
| 642 | .ac97_switch = xonar_d1_ac97_switch, | ||
| 643 | .dac_tlv = cs4362a_db_scale, | ||
| 644 | .model_data_size = sizeof(struct xonar_data), | ||
| 645 | .pcm_dev_cfg = PLAYBACK_0_TO_I2S | | ||
| 646 | PLAYBACK_1_TO_SPDIF | | ||
| 647 | CAPTURE_0_FROM_I2S_2, | ||
| 648 | .dac_channels = 8, | ||
| 649 | .dac_volume_min = 0, | ||
| 650 | .dac_volume_max = 127, | ||
| 651 | .function_flags = OXYGEN_FUNCTION_2WIRE, | ||
| 652 | .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST, | ||
| 653 | .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST, | ||
| 654 | }, | ||
| 618 | [MODEL_DX] = { | 655 | [MODEL_DX] = { |
| 619 | .shortname = "Xonar DX", | 656 | .shortname = "Xonar DX", |
| 620 | .longname = "Asus Virtuoso 100", | 657 | .longname = "Asus Virtuoso 100", |
| 621 | .chip = "AV200", | 658 | .chip = "AV200", |
| 622 | .owner = THIS_MODULE, | 659 | .owner = THIS_MODULE, |
| 623 | .init = xonar_dx_init, | 660 | .init = xonar_dx_init, |
| 624 | .control_filter = xonar_dx_control_filter, | 661 | .control_filter = xonar_d1_control_filter, |
| 625 | .mixer_init = xonar_dx_mixer_init, | 662 | .mixer_init = xonar_d1_mixer_init, |
| 626 | .cleanup = xonar_dx_cleanup, | 663 | .cleanup = xonar_d1_cleanup, |
| 627 | .suspend = xonar_dx_cleanup, | 664 | .suspend = xonar_d1_cleanup, |
| 628 | .resume = xonar_dx_resume, | 665 | .resume = xonar_d1_resume, |
| 629 | .set_dac_params = set_cs43xx_params, | 666 | .set_dac_params = set_cs43xx_params, |
| 630 | .set_adc_params = set_cs53x1_params, | 667 | .set_adc_params = set_cs53x1_params, |
| 631 | .update_dac_volume = update_cs43xx_volume, | 668 | .update_dac_volume = update_cs43xx_volume, |
| 632 | .update_dac_mute = update_cs43xx_mute, | 669 | .update_dac_mute = update_cs43xx_mute, |
| 633 | .gpio_changed = xonar_gpio_changed, | 670 | .gpio_changed = xonar_gpio_changed, |
| 634 | .ac97_switch = xonar_dx_ac97_switch, | 671 | .ac97_switch = xonar_d1_ac97_switch, |
| 635 | .dac_tlv = cs4362a_db_scale, | 672 | .dac_tlv = cs4362a_db_scale, |
| 636 | .model_data_size = sizeof(struct xonar_data), | 673 | .model_data_size = sizeof(struct xonar_data), |
| 637 | .pcm_dev_cfg = PLAYBACK_0_TO_I2S | | 674 | .pcm_dev_cfg = PLAYBACK_0_TO_I2S | |
diff --git a/sound/soc/at91/eti_b1_wm8731.c b/sound/soc/at91/eti_b1_wm8731.c index b081e83766b7..b81d6b2cfa1d 100644 --- a/sound/soc/at91/eti_b1_wm8731.c +++ b/sound/soc/at91/eti_b1_wm8731.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | 22 | ||
| 23 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 24 | #include <linux/moduleparam.h> | 24 | #include <linux/moduleparam.h> |
| 25 | #include <linux/version.h> | ||
| 26 | #include <linux/kernel.h> | 25 | #include <linux/kernel.h> |
| 27 | #include <linux/clk.h> | 26 | #include <linux/clk.h> |
| 28 | #include <linux/timer.h> | 27 | #include <linux/timer.h> |
diff --git a/sound/soc/codecs/ak4535.c b/sound/soc/codecs/ak4535.c index b26003c4f3e8..7da9f467b7b8 100644 --- a/sound/soc/codecs/ak4535.c +++ b/sound/soc/codecs/ak4535.c | |||
| @@ -562,10 +562,9 @@ static int ak4535_codec_probe(struct i2c_adapter *adap, int addr, int kind) | |||
| 562 | client_template.addr = addr; | 562 | client_template.addr = addr; |
| 563 | 563 | ||
| 564 | i2c = kmemdup(&client_template, sizeof(client_template), GFP_KERNEL); | 564 | i2c = kmemdup(&client_template, sizeof(client_template), GFP_KERNEL); |
| 565 | if (i2c == NULL) { | 565 | if (i2c == NULL) |
| 566 | kfree(codec); | ||
| 567 | return -ENOMEM; | 566 | return -ENOMEM; |
| 568 | } | 567 | |
| 569 | i2c_set_clientdata(i2c, codec); | 568 | i2c_set_clientdata(i2c, codec); |
| 570 | codec->control_data = i2c; | 569 | codec->control_data = i2c; |
| 571 | 570 | ||
| @@ -583,7 +582,6 @@ static int ak4535_codec_probe(struct i2c_adapter *adap, int addr, int kind) | |||
| 583 | return ret; | 582 | return ret; |
| 584 | 583 | ||
| 585 | err: | 584 | err: |
| 586 | kfree(codec); | ||
| 587 | kfree(i2c); | 585 | kfree(i2c); |
| 588 | return ret; | 586 | return ret; |
| 589 | } | 587 | } |
| @@ -660,6 +658,11 @@ static int ak4535_probe(struct platform_device *pdev) | |||
| 660 | #else | 658 | #else |
| 661 | /* Add other interfaces here */ | 659 | /* Add other interfaces here */ |
| 662 | #endif | 660 | #endif |
| 661 | |||
| 662 | if (ret != 0) { | ||
| 663 | kfree(codec->private_data); | ||
| 664 | kfree(codec); | ||
| 665 | } | ||
| 663 | return ret; | 666 | return ret; |
| 664 | } | 667 | } |
| 665 | 668 | ||
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c index b1dce5f459db..5f9abb199435 100644 --- a/sound/soc/codecs/tlv320aic3x.c +++ b/sound/soc/codecs/tlv320aic3x.c | |||
| @@ -1199,10 +1199,9 @@ static int aic3x_codec_probe(struct i2c_adapter *adap, int addr, int kind) | |||
| 1199 | client_template.addr = addr; | 1199 | client_template.addr = addr; |
| 1200 | 1200 | ||
| 1201 | i2c = kmemdup(&client_template, sizeof(client_template), GFP_KERNEL); | 1201 | i2c = kmemdup(&client_template, sizeof(client_template), GFP_KERNEL); |
| 1202 | if (i2c == NULL) { | 1202 | if (i2c == NULL) |
| 1203 | kfree(codec); | ||
| 1204 | return -ENOMEM; | 1203 | return -ENOMEM; |
| 1205 | } | 1204 | |
| 1206 | i2c_set_clientdata(i2c, codec); | 1205 | i2c_set_clientdata(i2c, codec); |
| 1207 | codec->control_data = i2c; | 1206 | codec->control_data = i2c; |
| 1208 | 1207 | ||
| @@ -1221,7 +1220,6 @@ static int aic3x_codec_probe(struct i2c_adapter *adap, int addr, int kind) | |||
| 1221 | return ret; | 1220 | return ret; |
| 1222 | 1221 | ||
| 1223 | err: | 1222 | err: |
| 1224 | kfree(codec); | ||
| 1225 | kfree(i2c); | 1223 | kfree(i2c); |
| 1226 | return ret; | 1224 | return ret; |
| 1227 | } | 1225 | } |
| @@ -1302,6 +1300,11 @@ static int aic3x_probe(struct platform_device *pdev) | |||
| 1302 | #else | 1300 | #else |
| 1303 | /* Add other interfaces here */ | 1301 | /* Add other interfaces here */ |
| 1304 | #endif | 1302 | #endif |
| 1303 | |||
| 1304 | if (ret != 0) { | ||
| 1305 | kfree(codec->private_data); | ||
| 1306 | kfree(codec); | ||
| 1307 | } | ||
| 1305 | return ret; | 1308 | return ret; |
| 1306 | } | 1309 | } |
| 1307 | 1310 | ||
diff --git a/sound/soc/codecs/uda1380.c b/sound/soc/codecs/uda1380.c index a52d6d9e007a..807318fbdc8f 100644 --- a/sound/soc/codecs/uda1380.c +++ b/sound/soc/codecs/uda1380.c | |||
| @@ -729,10 +729,9 @@ static int uda1380_codec_probe(struct i2c_adapter *adap, int addr, int kind) | |||
| 729 | client_template.addr = addr; | 729 | client_template.addr = addr; |
| 730 | 730 | ||
| 731 | i2c = kmemdup(&client_template, sizeof(client_template), GFP_KERNEL); | 731 | i2c = kmemdup(&client_template, sizeof(client_template), GFP_KERNEL); |
| 732 | if (i2c == NULL) { | 732 | if (i2c == NULL) |
| 733 | kfree(codec); | ||
| 734 | return -ENOMEM; | 733 | return -ENOMEM; |
| 735 | } | 734 | |
| 736 | i2c_set_clientdata(i2c, codec); | 735 | i2c_set_clientdata(i2c, codec); |
| 737 | codec->control_data = i2c; | 736 | codec->control_data = i2c; |
| 738 | 737 | ||
| @@ -750,7 +749,6 @@ static int uda1380_codec_probe(struct i2c_adapter *adap, int addr, int kind) | |||
| 750 | return ret; | 749 | return ret; |
| 751 | 750 | ||
| 752 | err: | 751 | err: |
| 753 | kfree(codec); | ||
| 754 | kfree(i2c); | 752 | kfree(i2c); |
| 755 | return ret; | 753 | return ret; |
| 756 | } | 754 | } |
| @@ -817,6 +815,9 @@ static int uda1380_probe(struct platform_device *pdev) | |||
| 817 | #else | 815 | #else |
| 818 | /* Add other interfaces here */ | 816 | /* Add other interfaces here */ |
| 819 | #endif | 817 | #endif |
| 818 | |||
| 819 | if (ret != 0) | ||
| 820 | kfree(codec); | ||
| 820 | return ret; | 821 | return ret; |
| 821 | } | 822 | } |
| 822 | 823 | ||
diff --git a/sound/soc/codecs/wm8510.c b/sound/soc/codecs/wm8510.c index 67325fd95447..3d998e6a997e 100644 --- a/sound/soc/codecs/wm8510.c +++ b/sound/soc/codecs/wm8510.c | |||
| @@ -693,10 +693,9 @@ static int wm8510_codec_probe(struct i2c_adapter *adap, int addr, int kind) | |||
| 693 | client_template.addr = addr; | 693 | client_template.addr = addr; |
| 694 | 694 | ||
| 695 | i2c = kmemdup(&client_template, sizeof(client_template), GFP_KERNEL); | 695 | i2c = kmemdup(&client_template, sizeof(client_template), GFP_KERNEL); |
| 696 | if (i2c == NULL) { | 696 | if (i2c == NULL) |
| 697 | kfree(codec); | ||
| 698 | return -ENOMEM; | 697 | return -ENOMEM; |
| 699 | } | 698 | |
| 700 | i2c_set_clientdata(i2c, codec); | 699 | i2c_set_clientdata(i2c, codec); |
| 701 | codec->control_data = i2c; | 700 | codec->control_data = i2c; |
| 702 | 701 | ||
| @@ -714,7 +713,6 @@ static int wm8510_codec_probe(struct i2c_adapter *adap, int addr, int kind) | |||
| 714 | return ret; | 713 | return ret; |
| 715 | 714 | ||
| 716 | err: | 715 | err: |
| 717 | kfree(codec); | ||
| 718 | kfree(i2c); | 716 | kfree(i2c); |
| 719 | return ret; | 717 | return ret; |
| 720 | } | 718 | } |
| @@ -782,6 +780,9 @@ static int wm8510_probe(struct platform_device *pdev) | |||
| 782 | #else | 780 | #else |
| 783 | /* Add other interfaces here */ | 781 | /* Add other interfaces here */ |
| 784 | #endif | 782 | #endif |
| 783 | |||
| 784 | if (ret != 0) | ||
| 785 | kfree(codec); | ||
| 785 | return ret; | 786 | return ret; |
| 786 | } | 787 | } |
| 787 | 788 | ||
diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c index 369d39c3f745..9402fcaf04fa 100644 --- a/sound/soc/codecs/wm8731.c +++ b/sound/soc/codecs/wm8731.c | |||
| @@ -596,10 +596,9 @@ static int wm8731_codec_probe(struct i2c_adapter *adap, int addr, int kind) | |||
| 596 | client_template.addr = addr; | 596 | client_template.addr = addr; |
| 597 | 597 | ||
| 598 | i2c = kmemdup(&client_template, sizeof(client_template), GFP_KERNEL); | 598 | i2c = kmemdup(&client_template, sizeof(client_template), GFP_KERNEL); |
| 599 | if (i2c == NULL) { | 599 | if (i2c == NULL) |
| 600 | kfree(codec); | ||
| 601 | return -ENOMEM; | 600 | return -ENOMEM; |
| 602 | } | 601 | |
| 603 | i2c_set_clientdata(i2c, codec); | 602 | i2c_set_clientdata(i2c, codec); |
| 604 | codec->control_data = i2c; | 603 | codec->control_data = i2c; |
| 605 | 604 | ||
| @@ -617,7 +616,6 @@ static int wm8731_codec_probe(struct i2c_adapter *adap, int addr, int kind) | |||
| 617 | return ret; | 616 | return ret; |
| 618 | 617 | ||
| 619 | err: | 618 | err: |
| 620 | kfree(codec); | ||
| 621 | kfree(i2c); | 619 | kfree(i2c); |
| 622 | return ret; | 620 | return ret; |
| 623 | } | 621 | } |
| @@ -693,6 +691,11 @@ static int wm8731_probe(struct platform_device *pdev) | |||
| 693 | #else | 691 | #else |
| 694 | /* Add other interfaces here */ | 692 | /* Add other interfaces here */ |
| 695 | #endif | 693 | #endif |
| 694 | |||
| 695 | if (ret != 0) { | ||
| 696 | kfree(codec->private_data); | ||
| 697 | kfree(codec); | ||
| 698 | } | ||
| 696 | return ret; | 699 | return ret; |
| 697 | } | 700 | } |
| 698 | 701 | ||
diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c index e23cb09f0d14..dd1f55404b29 100644 --- a/sound/soc/codecs/wm8750.c +++ b/sound/soc/codecs/wm8750.c | |||
| @@ -348,8 +348,9 @@ static const struct snd_soc_dapm_widget wm8750_dapm_widgets[] = { | |||
| 348 | SND_SOC_DAPM_OUTPUT("ROUT1"), | 348 | SND_SOC_DAPM_OUTPUT("ROUT1"), |
| 349 | SND_SOC_DAPM_OUTPUT("LOUT2"), | 349 | SND_SOC_DAPM_OUTPUT("LOUT2"), |
| 350 | SND_SOC_DAPM_OUTPUT("ROUT2"), | 350 | SND_SOC_DAPM_OUTPUT("ROUT2"), |
| 351 | SND_SOC_DAPM_OUTPUT("MONO"), | 351 | SND_SOC_DAPM_OUTPUT("MONO1"), |
| 352 | SND_SOC_DAPM_OUTPUT("OUT3"), | 352 | SND_SOC_DAPM_OUTPUT("OUT3"), |
| 353 | SND_SOC_DAPM_OUTPUT("VREF"), | ||
| 353 | 354 | ||
| 354 | SND_SOC_DAPM_INPUT("LINPUT1"), | 355 | SND_SOC_DAPM_INPUT("LINPUT1"), |
| 355 | SND_SOC_DAPM_INPUT("LINPUT2"), | 356 | SND_SOC_DAPM_INPUT("LINPUT2"), |
| @@ -868,10 +869,9 @@ static int wm8750_codec_probe(struct i2c_adapter *adap, int addr, int kind) | |||
| 868 | client_template.addr = addr; | 869 | client_template.addr = addr; |
| 869 | 870 | ||
| 870 | i2c = kmemdup(&client_template, sizeof(client_template), GFP_KERNEL); | 871 | i2c = kmemdup(&client_template, sizeof(client_template), GFP_KERNEL); |
| 871 | if (i2c == NULL) { | 872 | if (i2c == NULL) |
| 872 | kfree(codec); | ||
| 873 | return -ENOMEM; | 873 | return -ENOMEM; |
| 874 | } | 874 | |
| 875 | i2c_set_clientdata(i2c, codec); | 875 | i2c_set_clientdata(i2c, codec); |
| 876 | codec->control_data = i2c; | 876 | codec->control_data = i2c; |
| 877 | 877 | ||
| @@ -889,7 +889,6 @@ static int wm8750_codec_probe(struct i2c_adapter *adap, int addr, int kind) | |||
| 889 | return ret; | 889 | return ret; |
| 890 | 890 | ||
| 891 | err: | 891 | err: |
| 892 | kfree(codec); | ||
| 893 | kfree(i2c); | 892 | kfree(i2c); |
| 894 | return ret; | 893 | return ret; |
| 895 | } | 894 | } |
| @@ -965,6 +964,10 @@ static int wm8750_probe(struct platform_device *pdev) | |||
| 965 | /* Add other interfaces here */ | 964 | /* Add other interfaces here */ |
| 966 | #endif | 965 | #endif |
| 967 | 966 | ||
| 967 | if (ret != 0) { | ||
| 968 | kfree(codec->private_data); | ||
| 969 | kfree(codec); | ||
| 970 | } | ||
| 968 | return ret; | 971 | return ret; |
| 969 | } | 972 | } |
| 970 | 973 | ||
diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c index 8604809f0c36..5761164fe16d 100644 --- a/sound/soc/codecs/wm8753.c +++ b/sound/soc/codecs/wm8753.c | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | 34 | ||
| 35 | #include <linux/module.h> | 35 | #include <linux/module.h> |
| 36 | #include <linux/moduleparam.h> | 36 | #include <linux/moduleparam.h> |
| 37 | #include <linux/version.h> | ||
| 38 | #include <linux/kernel.h> | 37 | #include <linux/kernel.h> |
| 39 | #include <linux/init.h> | 38 | #include <linux/init.h> |
| 40 | #include <linux/delay.h> | 39 | #include <linux/delay.h> |
| @@ -1661,10 +1660,9 @@ static int wm8753_codec_probe(struct i2c_adapter *adap, int addr, int kind) | |||
| 1661 | client_template.addr = addr; | 1660 | client_template.addr = addr; |
| 1662 | 1661 | ||
| 1663 | i2c = kmemdup(&client_template, sizeof(client_template), GFP_KERNEL); | 1662 | i2c = kmemdup(&client_template, sizeof(client_template), GFP_KERNEL); |
| 1664 | if (!i2c) { | 1663 | if (!i2c) |
| 1665 | kfree(codec); | ||
| 1666 | return -ENOMEM; | 1664 | return -ENOMEM; |
| 1667 | } | 1665 | |
| 1668 | i2c_set_clientdata(i2c, codec); | 1666 | i2c_set_clientdata(i2c, codec); |
| 1669 | codec->control_data = i2c; | 1667 | codec->control_data = i2c; |
| 1670 | 1668 | ||
| @@ -1683,7 +1681,6 @@ static int wm8753_codec_probe(struct i2c_adapter *adap, int addr, int kind) | |||
| 1683 | return ret; | 1681 | return ret; |
| 1684 | 1682 | ||
| 1685 | err: | 1683 | err: |
| 1686 | kfree(codec); | ||
| 1687 | kfree(i2c); | 1684 | kfree(i2c); |
| 1688 | return ret; | 1685 | return ret; |
| 1689 | } | 1686 | } |
| @@ -1760,6 +1757,11 @@ static int wm8753_probe(struct platform_device *pdev) | |||
| 1760 | #else | 1757 | #else |
| 1761 | /* Add other interfaces here */ | 1758 | /* Add other interfaces here */ |
| 1762 | #endif | 1759 | #endif |
| 1760 | |||
| 1761 | if (ret != 0) { | ||
| 1762 | kfree(codec->private_data); | ||
| 1763 | kfree(codec); | ||
| 1764 | } | ||
| 1763 | return ret; | 1765 | return ret; |
| 1764 | } | 1766 | } |
| 1765 | 1767 | ||
diff --git a/sound/soc/codecs/wm8990.c b/sound/soc/codecs/wm8990.c index 3ecce5168e94..dd995ef448b4 100644 --- a/sound/soc/codecs/wm8990.c +++ b/sound/soc/codecs/wm8990.c | |||
| @@ -82,7 +82,7 @@ static const u16 wm8990_reg[] = { | |||
| 82 | 0x0003, /* R35 - ClassD1 */ | 82 | 0x0003, /* R35 - ClassD1 */ |
| 83 | 0x0000, /* R36 */ | 83 | 0x0000, /* R36 */ |
| 84 | 0x0100, /* R37 - ClassD3 */ | 84 | 0x0100, /* R37 - ClassD3 */ |
| 85 | 0x0000, /* R38 */ | 85 | 0x0079, /* R38 - ClassD4 */ |
| 86 | 0x0000, /* R39 - Input Mixer1 */ | 86 | 0x0000, /* R39 - Input Mixer1 */ |
| 87 | 0x0000, /* R40 - Input Mixer2 */ | 87 | 0x0000, /* R40 - Input Mixer2 */ |
| 88 | 0x0000, /* R41 - Input Mixer3 */ | 88 | 0x0000, /* R41 - Input Mixer3 */ |
| @@ -311,11 +311,15 @@ SOC_SINGLE("Speaker Mode Switch", WM8990_CLASSD1, | |||
| 311 | WM8990_CDMODE_BIT, 1, 0), | 311 | WM8990_CDMODE_BIT, 1, 0), |
| 312 | 312 | ||
| 313 | SOC_SINGLE("Speaker Output Attenuation Volume", WM8990_SPEAKER_VOLUME, | 313 | SOC_SINGLE("Speaker Output Attenuation Volume", WM8990_SPEAKER_VOLUME, |
| 314 | WM8990_SPKVOL_SHIFT, WM8990_SPKVOL_MASK, 0), | 314 | WM8990_SPKATTN_SHIFT, WM8990_SPKATTN_MASK, 0), |
| 315 | SOC_SINGLE("Speaker DC Boost Volume", WM8990_CLASSD3, | 315 | SOC_SINGLE("Speaker DC Boost Volume", WM8990_CLASSD3, |
| 316 | WM8990_DCGAIN_SHIFT, WM8990_DCGAIN_MASK, 0), | 316 | WM8990_DCGAIN_SHIFT, WM8990_DCGAIN_MASK, 0), |
| 317 | SOC_SINGLE("Speaker AC Boost Volume", WM8990_CLASSD3, | 317 | SOC_SINGLE("Speaker AC Boost Volume", WM8990_CLASSD3, |
| 318 | WM8990_ACGAIN_SHIFT, WM8990_ACGAIN_MASK, 0), | 318 | WM8990_ACGAIN_SHIFT, WM8990_ACGAIN_MASK, 0), |
| 319 | SOC_SINGLE_TLV("Speaker Volume", WM8990_CLASSD4, | ||
| 320 | WM8990_SPKVOL_SHIFT, WM8990_SPKVOL_MASK, 0, out_pga_tlv), | ||
| 321 | SOC_SINGLE("Speaker ZC Switch", WM8990_CLASSD4, | ||
| 322 | WM8990_SPKZC_SHIFT, WM8990_SPKZC_MASK, 0), | ||
| 319 | 323 | ||
| 320 | SOC_WM899X_OUTPGA_SINGLE_R_TLV("Left DAC Digital Volume", | 324 | SOC_WM899X_OUTPGA_SINGLE_R_TLV("Left DAC Digital Volume", |
| 321 | WM8990_LEFT_DAC_DIGITAL_VOLUME, | 325 | WM8990_LEFT_DAC_DIGITAL_VOLUME, |
| @@ -920,7 +924,7 @@ static const struct snd_soc_dapm_route audio_map[] = { | |||
| 920 | {"SPKMIX", "SPKMIX Left Mixer PGA Switch", "LOPGA"}, | 924 | {"SPKMIX", "SPKMIX Left Mixer PGA Switch", "LOPGA"}, |
| 921 | {"SPKMIX", "SPKMIX Right Mixer PGA Switch", "ROPGA"}, | 925 | {"SPKMIX", "SPKMIX Right Mixer PGA Switch", "ROPGA"}, |
| 922 | {"SPKMIX", "SPKMIX Right DAC Switch", "Right DAC"}, | 926 | {"SPKMIX", "SPKMIX Right DAC Switch", "Right DAC"}, |
| 923 | {"SPKMIX", "SPKMIX Left DAC Switch", "Right DAC"}, | 927 | {"SPKMIX", "SPKMIX Left DAC Switch", "Left DAC"}, |
| 924 | 928 | ||
| 925 | /* LONMIX */ | 929 | /* LONMIX */ |
| 926 | {"LONMIX", "LONMIX Left Mixer PGA Switch", "LOPGA"}, | 930 | {"LONMIX", "LONMIX Left Mixer PGA Switch", "LOPGA"}, |
| @@ -1496,10 +1500,9 @@ static int wm8990_codec_probe(struct i2c_adapter *adap, int addr, int kind) | |||
| 1496 | client_template.addr = addr; | 1500 | client_template.addr = addr; |
| 1497 | 1501 | ||
| 1498 | i2c = kmemdup(&client_template, sizeof(client_template), GFP_KERNEL); | 1502 | i2c = kmemdup(&client_template, sizeof(client_template), GFP_KERNEL); |
| 1499 | if (i2c == NULL) { | 1503 | if (i2c == NULL) |
| 1500 | kfree(codec); | ||
| 1501 | return -ENOMEM; | 1504 | return -ENOMEM; |
| 1502 | } | 1505 | |
| 1503 | i2c_set_clientdata(i2c, codec); | 1506 | i2c_set_clientdata(i2c, codec); |
| 1504 | codec->control_data = i2c; | 1507 | codec->control_data = i2c; |
| 1505 | 1508 | ||
| @@ -1517,7 +1520,6 @@ static int wm8990_codec_probe(struct i2c_adapter *adap, int addr, int kind) | |||
| 1517 | return ret; | 1520 | return ret; |
| 1518 | 1521 | ||
| 1519 | err: | 1522 | err: |
| 1520 | kfree(codec); | ||
| 1521 | kfree(i2c); | 1523 | kfree(i2c); |
| 1522 | return ret; | 1524 | return ret; |
| 1523 | } | 1525 | } |
| @@ -1591,6 +1593,11 @@ static int wm8990_probe(struct platform_device *pdev) | |||
| 1591 | #else | 1593 | #else |
| 1592 | /* Add other interfaces here */ | 1594 | /* Add other interfaces here */ |
| 1593 | #endif | 1595 | #endif |
| 1596 | |||
| 1597 | if (ret != 0) { | ||
| 1598 | kfree(codec->private_data); | ||
| 1599 | kfree(codec); | ||
| 1600 | } | ||
| 1594 | return ret; | 1601 | return ret; |
| 1595 | } | 1602 | } |
| 1596 | 1603 | ||
diff --git a/sound/soc/codecs/wm8990.h b/sound/soc/codecs/wm8990.h index 6bea57485283..0a08325d5443 100644 --- a/sound/soc/codecs/wm8990.h +++ b/sound/soc/codecs/wm8990.h | |||
| @@ -54,6 +54,7 @@ | |||
| 54 | #define WM8990_SPEAKER_VOLUME 0x22 | 54 | #define WM8990_SPEAKER_VOLUME 0x22 |
| 55 | #define WM8990_CLASSD1 0x23 | 55 | #define WM8990_CLASSD1 0x23 |
| 56 | #define WM8990_CLASSD3 0x25 | 56 | #define WM8990_CLASSD3 0x25 |
| 57 | #define WM8990_CLASSD4 0x26 | ||
| 57 | #define WM8990_INPUT_MIXER1 0x27 | 58 | #define WM8990_INPUT_MIXER1 0x27 |
| 58 | #define WM8990_INPUT_MIXER2 0x28 | 59 | #define WM8990_INPUT_MIXER2 0x28 |
| 59 | #define WM8990_INPUT_MIXER3 0x29 | 60 | #define WM8990_INPUT_MIXER3 0x29 |
| @@ -528,8 +529,8 @@ | |||
| 528 | /* | 529 | /* |
| 529 | * R34 (0x22) - Speaker Volume | 530 | * R34 (0x22) - Speaker Volume |
| 530 | */ | 531 | */ |
| 531 | #define WM8990_SPKVOL_MASK 0x0003 /* SPKVOL - [1:0] */ | 532 | #define WM8990_SPKATTN_MASK 0x0003 /* SPKATTN - [1:0] */ |
| 532 | #define WM8990_SPKVOL_SHIFT 0 | 533 | #define WM8990_SPKATTN_SHIFT 0 |
| 533 | 534 | ||
| 534 | /* | 535 | /* |
| 535 | * R35 (0x23) - ClassD1 | 536 | * R35 (0x23) - ClassD1 |
| @@ -544,6 +545,15 @@ | |||
| 544 | #define WM8990_DCGAIN_SHIFT 3 | 545 | #define WM8990_DCGAIN_SHIFT 3 |
| 545 | #define WM8990_ACGAIN_MASK 0x0007 /* ACGAIN - [2:0] */ | 546 | #define WM8990_ACGAIN_MASK 0x0007 /* ACGAIN - [2:0] */ |
| 546 | #define WM8990_ACGAIN_SHIFT 0 | 547 | #define WM8990_ACGAIN_SHIFT 0 |
| 548 | |||
| 549 | /* | ||
| 550 | * R38 (0x26) - ClassD4 | ||
| 551 | */ | ||
| 552 | #define WM8990_SPKZC_MASK 0x0001 /* SPKZC */ | ||
| 553 | #define WM8990_SPKZC_SHIFT 7 /* SPKZC */ | ||
| 554 | #define WM8990_SPKVOL_MASK 0x007F /* SPKVOL - [6:0] */ | ||
| 555 | #define WM8990_SPKVOL_SHIFT 0 /* SPKVOL - [6:0] */ | ||
| 556 | |||
| 547 | /* | 557 | /* |
| 548 | * R39 (0x27) - Input Mixer1 | 558 | * R39 (0x27) - Input Mixer1 |
| 549 | */ | 559 | */ |
diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c index 1fb7f9a7aecd..2f1c91b1d556 100644 --- a/sound/soc/codecs/wm9712.c +++ b/sound/soc/codecs/wm9712.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | 13 | ||
| 14 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 15 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 16 | #include <linux/version.h> | ||
| 17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 18 | #include <linux/device.h> | 17 | #include <linux/device.h> |
| 19 | #include <sound/core.h> | 18 | #include <sound/core.h> |
diff --git a/sound/soc/omap/n810.c b/sound/soc/omap/n810.c index 7694621ec40b..87d0ed01f65a 100644 --- a/sound/soc/omap/n810.c +++ b/sound/soc/omap/n810.c | |||
| @@ -329,12 +329,14 @@ static int __init n810_soc_init(void) | |||
| 329 | sys_clkout2_src = clk_get(dev, "sys_clkout2_src"); | 329 | sys_clkout2_src = clk_get(dev, "sys_clkout2_src"); |
| 330 | if (IS_ERR(sys_clkout2_src)) { | 330 | if (IS_ERR(sys_clkout2_src)) { |
| 331 | dev_err(dev, "Could not get sys_clkout2_src clock\n"); | 331 | dev_err(dev, "Could not get sys_clkout2_src clock\n"); |
| 332 | return -ENODEV; | 332 | err = PTR_ERR(sys_clkout2_src); |
| 333 | goto err2; | ||
| 333 | } | 334 | } |
| 334 | sys_clkout2 = clk_get(dev, "sys_clkout2"); | 335 | sys_clkout2 = clk_get(dev, "sys_clkout2"); |
| 335 | if (IS_ERR(sys_clkout2)) { | 336 | if (IS_ERR(sys_clkout2)) { |
| 336 | dev_err(dev, "Could not get sys_clkout2\n"); | 337 | dev_err(dev, "Could not get sys_clkout2\n"); |
| 337 | goto err1; | 338 | err = PTR_ERR(sys_clkout2); |
| 339 | goto err3; | ||
| 338 | } | 340 | } |
| 339 | /* | 341 | /* |
| 340 | * Configure 12 MHz output on SYS_CLKOUT2. Therefore we must use | 342 | * Configure 12 MHz output on SYS_CLKOUT2. Therefore we must use |
| @@ -343,7 +345,8 @@ static int __init n810_soc_init(void) | |||
| 343 | func96m_clk = clk_get(dev, "func_96m_ck"); | 345 | func96m_clk = clk_get(dev, "func_96m_ck"); |
| 344 | if (IS_ERR(func96m_clk)) { | 346 | if (IS_ERR(func96m_clk)) { |
| 345 | dev_err(dev, "Could not get func 96M clock\n"); | 347 | dev_err(dev, "Could not get func 96M clock\n"); |
| 346 | goto err2; | 348 | err = PTR_ERR(func96m_clk); |
| 349 | goto err4; | ||
| 347 | } | 350 | } |
| 348 | clk_set_parent(sys_clkout2_src, func96m_clk); | 351 | clk_set_parent(sys_clkout2_src, func96m_clk); |
| 349 | clk_set_rate(sys_clkout2, 12000000); | 352 | clk_set_rate(sys_clkout2, 12000000); |
| @@ -356,20 +359,25 @@ static int __init n810_soc_init(void) | |||
| 356 | gpio_direction_output(N810_SPEAKER_AMP_GPIO, 0); | 359 | gpio_direction_output(N810_SPEAKER_AMP_GPIO, 0); |
| 357 | 360 | ||
| 358 | return 0; | 361 | return 0; |
| 359 | err2: | 362 | err4: |
| 360 | clk_put(sys_clkout2); | 363 | clk_put(sys_clkout2); |
| 364 | err3: | ||
| 365 | clk_put(sys_clkout2_src); | ||
| 366 | err2: | ||
| 361 | platform_device_del(n810_snd_device); | 367 | platform_device_del(n810_snd_device); |
| 362 | err1: | 368 | err1: |
| 363 | platform_device_put(n810_snd_device); | 369 | platform_device_put(n810_snd_device); |
| 364 | 370 | ||
| 365 | return err; | 371 | return err; |
| 366 | |||
| 367 | } | 372 | } |
| 368 | 373 | ||
| 369 | static void __exit n810_soc_exit(void) | 374 | static void __exit n810_soc_exit(void) |
| 370 | { | 375 | { |
| 371 | gpio_free(N810_SPEAKER_AMP_GPIO); | 376 | gpio_free(N810_SPEAKER_AMP_GPIO); |
| 372 | gpio_free(N810_HEADSET_AMP_GPIO); | 377 | gpio_free(N810_HEADSET_AMP_GPIO); |
| 378 | clk_put(sys_clkout2_src); | ||
| 379 | clk_put(sys_clkout2); | ||
| 380 | clk_put(func96m_clk); | ||
| 373 | 381 | ||
| 374 | platform_device_unregister(n810_snd_device); | 382 | platform_device_unregister(n810_snd_device); |
| 375 | } | 383 | } |
diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c index 8548818eea08..c796b1882776 100644 --- a/sound/soc/pxa/pxa2xx-i2s.c +++ b/sound/soc/pxa/pxa2xx-i2s.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/device.h> | 16 | #include <linux/device.h> |
| 17 | #include <linux/delay.h> | 17 | #include <linux/delay.h> |
| 18 | #include <linux/clk.h> | 18 | #include <linux/clk.h> |
| 19 | #include <linux/platform_device.h> | ||
| 19 | #include <sound/core.h> | 20 | #include <sound/core.h> |
| 20 | #include <sound/pcm.h> | 21 | #include <sound/pcm.h> |
| 21 | #include <sound/initval.h> | 22 | #include <sound/initval.h> |
| @@ -81,7 +82,6 @@ static int pxa2xx_i2s_startup(struct snd_pcm_substream *substream) | |||
| 81 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | 82 | struct snd_soc_pcm_runtime *rtd = substream->private_data; |
| 82 | struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai; | 83 | struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai; |
| 83 | 84 | ||
| 84 | clk_i2s = clk_get(NULL, "I2SCLK"); | ||
| 85 | if (IS_ERR(clk_i2s)) | 85 | if (IS_ERR(clk_i2s)) |
| 86 | return PTR_ERR(clk_i2s); | 86 | return PTR_ERR(clk_i2s); |
| 87 | 87 | ||
| @@ -152,6 +152,7 @@ static int pxa2xx_i2s_hw_params(struct snd_pcm_substream *substream, | |||
| 152 | pxa_gpio_mode(gpio_bus[pxa_i2s.master].tx); | 152 | pxa_gpio_mode(gpio_bus[pxa_i2s.master].tx); |
| 153 | pxa_gpio_mode(gpio_bus[pxa_i2s.master].frm); | 153 | pxa_gpio_mode(gpio_bus[pxa_i2s.master].frm); |
| 154 | pxa_gpio_mode(gpio_bus[pxa_i2s.master].clk); | 154 | pxa_gpio_mode(gpio_bus[pxa_i2s.master].clk); |
| 155 | BUG_ON(IS_ERR(clk_i2s)); | ||
| 155 | clk_enable(clk_i2s); | 156 | clk_enable(clk_i2s); |
| 156 | pxa_i2s_wait(); | 157 | pxa_i2s_wait(); |
| 157 | 158 | ||
| @@ -317,6 +318,43 @@ struct snd_soc_dai pxa_i2s_dai = { | |||
| 317 | 318 | ||
| 318 | EXPORT_SYMBOL_GPL(pxa_i2s_dai); | 319 | EXPORT_SYMBOL_GPL(pxa_i2s_dai); |
| 319 | 320 | ||
| 321 | static int pxa2xx_i2s_probe(struct platform_device *dev) | ||
| 322 | { | ||
| 323 | clk_i2s = clk_get(&dev->dev, "I2SCLK"); | ||
| 324 | return IS_ERR(clk_i2s) ? PTR_ERR(clk_i2s) : 0; | ||
| 325 | } | ||
| 326 | |||
| 327 | static int __devexit pxa2xx_i2s_remove(struct platform_device *dev) | ||
| 328 | { | ||
| 329 | clk_put(clk_i2s); | ||
| 330 | clk_i2s = ERR_PTR(-ENOENT); | ||
| 331 | return 0; | ||
| 332 | } | ||
| 333 | |||
| 334 | static struct platform_driver pxa2xx_i2s_driver = { | ||
| 335 | .probe = pxa2xx_i2s_probe, | ||
| 336 | .remove = __devexit_p(pxa2xx_i2s_remove), | ||
| 337 | |||
| 338 | .driver = { | ||
| 339 | .name = "pxa2xx-i2s", | ||
| 340 | .owner = THIS_MODULE, | ||
| 341 | }, | ||
| 342 | }; | ||
| 343 | |||
| 344 | static int __init pxa2xx_i2s_init(void) | ||
| 345 | { | ||
| 346 | clk_i2s = ERR_PTR(-ENOENT); | ||
| 347 | return platform_driver_register(&pxa2xx_i2s_driver); | ||
| 348 | } | ||
| 349 | |||
| 350 | static void __exit pxa2xx_i2s_exit(void) | ||
| 351 | { | ||
| 352 | platform_driver_unregister(&pxa2xx_i2s_driver); | ||
| 353 | } | ||
| 354 | |||
| 355 | module_init(pxa2xx_i2s_init); | ||
| 356 | module_exit(pxa2xx_i2s_exit); | ||
| 357 | |||
| 320 | /* Module information */ | 358 | /* Module information */ |
| 321 | MODULE_AUTHOR("Liam Girdwood, liam.girdwood@wolfsonmicro.com, www.wolfsonmicro.com"); | 359 | MODULE_AUTHOR("Liam Girdwood, liam.girdwood@wolfsonmicro.com, www.wolfsonmicro.com"); |
| 322 | MODULE_DESCRIPTION("pxa2xx I2S SoC Interface"); | 360 | MODULE_DESCRIPTION("pxa2xx I2S SoC Interface"); |
diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c index eefc25b83514..37cb768fc933 100644 --- a/sound/soc/pxa/spitz.c +++ b/sound/soc/pxa/spitz.c | |||
| @@ -297,7 +297,7 @@ static int spitz_wm8750_init(struct snd_soc_codec *codec) | |||
| 297 | snd_soc_dapm_disable_pin(codec, "LINPUT3"); | 297 | snd_soc_dapm_disable_pin(codec, "LINPUT3"); |
| 298 | snd_soc_dapm_disable_pin(codec, "RINPUT3"); | 298 | snd_soc_dapm_disable_pin(codec, "RINPUT3"); |
| 299 | snd_soc_dapm_disable_pin(codec, "OUT3"); | 299 | snd_soc_dapm_disable_pin(codec, "OUT3"); |
| 300 | snd_soc_dapm_disable_pin(codec, "MONO"); | 300 | snd_soc_dapm_disable_pin(codec, "MONO1"); |
| 301 | 301 | ||
| 302 | /* Add spitz specific controls */ | 302 | /* Add spitz specific controls */ |
| 303 | for (i = 0; i < ARRAY_SIZE(wm8750_spitz_controls); i++) { | 303 | for (i = 0; i < ARRAY_SIZE(wm8750_spitz_controls); i++) { |